diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index 4488bb645..1542752d7 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -120,7 +120,7 @@ jobs:
       matrix:
         os: [ ubuntu-latest, windows-latest, macos-latest ]
 
-    timeout-minutes: 15
+    timeout-minutes: 60
     steps:
 
     - name: Checkout code
@@ -154,35 +154,81 @@ jobs:
       shell: bash
       run: echo "VSTEST_DUMP_PATH=logs/UnitTestsParallelizable/${{ runner.os }}/" >> $GITHUB_ENV
 
-    - name: Run UnitTestsParallelizable
+    - name: Run UnitTestsParallelizable (10 iterations with varying parallelization)
       shell: bash
       run: |
-        if [ "${{ runner.os }}" == "Linux" ]; then
-          # Run with coverage on Linux only
-          dotnet test Tests/UnitTestsParallelizable \
-            --no-build \
-            --verbosity normal \
-            --collect:"XPlat Code Coverage" \
-            --settings Tests/UnitTests/runsettings.coverage.xml \
-            --diag:logs/UnitTestsParallelizable/${{ runner.os }}/logs.txt \
-            --blame \
-            --blame-crash \
-            --blame-hang \
-            --blame-hang-timeout 60s \
-            --blame-crash-collect-always
-        else
-          # Run without coverage on Windows/macOS for speed
-          dotnet test Tests/UnitTestsParallelizable \
-            --no-build \
-            --verbosity normal \
-            --settings Tests/UnitTestsParallelizable/runsettings.xml \
-            --diag:logs/UnitTestsParallelizable/${{ runner.os }}/logs.txt \
-            --blame \
-            --blame-crash \
-            --blame-hang \
-            --blame-hang-timeout 60s \
-            --blame-crash-collect-always
-        fi
+        # Run tests 10 times with different parallelization settings to expose concurrency issues
+        for RUN in {1..10}; do
+          echo "============================================"
+          echo "Starting test run $RUN of 10"
+          echo "============================================"
+          
+          # Use a combination of run number and timestamp to create different execution patterns
+          SEED=$((1000 + $RUN + $(date +%s) % 1000))
+          echo "Using randomization seed: $SEED"
+          
+          # Vary the xUnit parallelization based on run number to expose race conditions
+          # Runs 1-3: Default parallelization (2x CPU cores)
+          # Runs 4-6: Max parallelization (unlimited)
+          # Runs 7-9: Single threaded (1)
+          # Run 10: Random (1-4 threads)
+          if [ $RUN -le 3 ]; then
+            XUNIT_MAX_PARALLEL_THREADS="2x"
+            echo "Run $RUN: Using default parallelization (2x)"
+          elif [ $RUN -le 6 ]; then
+            XUNIT_MAX_PARALLEL_THREADS="unlimited"
+            echo "Run $RUN: Using maximum parallelization (unlimited)"
+          elif [ $RUN -le 9 ]; then
+            XUNIT_MAX_PARALLEL_THREADS="1"
+            echo "Run $RUN: Using single-threaded execution"
+          else
+            # Random parallelization based on seed
+            PROC_COUNT=$(( ($SEED % 4) + 1 ))
+            XUNIT_MAX_PARALLEL_THREADS="$PROC_COUNT"
+            echo "Run $RUN: Using random parallelization with $PROC_COUNT threads"
+          fi
+          
+          # Run tests with or without coverage based on OS and run number
+          if [ "${{ runner.os }}" == "Linux" ] && [ $RUN -eq 1 ]; then
+            echo "Run $RUN: Running with coverage collection"
+            dotnet test Tests/UnitTestsParallelizable \
+              --no-build \
+              --verbosity normal \
+              --collect:"XPlat Code Coverage" \
+              --settings Tests/UnitTests/runsettings.coverage.xml \
+              --diag:logs/UnitTestsParallelizable/${{ runner.os }}/run${RUN}-logs.txt \
+              --blame \
+              --blame-crash \
+              --blame-hang \
+              --blame-hang-timeout 60s \
+              --blame-crash-collect-always \
+              -- xUnit.MaxParallelThreads=${XUNIT_MAX_PARALLEL_THREADS}
+          else
+            dotnet test Tests/UnitTestsParallelizable \
+              --no-build \
+              --verbosity normal \
+              --settings Tests/UnitTestsParallelizable/runsettings.xml \
+              --diag:logs/UnitTestsParallelizable/${{ runner.os }}/run${RUN}-logs.txt \
+              --blame \
+              --blame-crash \
+              --blame-hang \
+              --blame-hang-timeout 60s \
+              --blame-crash-collect-always \
+              -- xUnit.MaxParallelThreads=${XUNIT_MAX_PARALLEL_THREADS}
+          fi
+          
+          if [ $? -ne 0 ]; then
+            echo "ERROR: Test run $RUN failed!"
+            exit 1
+          fi
+          
+          echo "Test run $RUN completed successfully"
+          echo ""
+        done
+        
+        echo "============================================"
+        echo "All 10 test runs completed successfully!"
+        echo "============================================"
 
     - name: Upload UnitTestsParallelizable Logs
       if: always()
diff --git a/.gitignore b/.gitignore
index cdec09ec2..79eff65ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -73,3 +73,4 @@ log.*
 !/Tests/coverage/.gitkeep   # keep folder in repo
 /Tests/report/
 *.cobertura.xml
+/docfx/docs/migratingfromv1.md
diff --git a/Examples/Example/Example.cs b/Examples/Example/Example.cs
index 82cd60d6e..f6c13eb6b 100644
--- a/Examples/Example/Example.cs
+++ b/Examples/Example/Example.cs
@@ -77,13 +77,13 @@ public class ExampleWindow : Window
                            {
                                if (userNameText.Text == "admin" && passwordText.Text == "password")
                                {
-                                   MessageBox.Query ("Logging In", "Login Successful", "Ok");
+                                   MessageBox.Query (App, "Logging In", "Login Successful", "Ok");
                                    UserName = userNameText.Text;
                                    Application.RequestStop ();
                                }
                                else
                                {
-                                   MessageBox.ErrorQuery ("Logging In", "Incorrect username or password", "Ok");
+                                   MessageBox.ErrorQuery (App, "Logging In", "Incorrect username or password", "Ok");
                                }
                                // When Accepting is handled, set e.Handled to true to prevent further processing.
                                e.Handled = true;
diff --git a/Examples/NativeAot/Program.cs b/Examples/NativeAot/Program.cs
index 3de9bfeec..501adb2ed 100644
--- a/Examples/NativeAot/Program.cs
+++ b/Examples/NativeAot/Program.cs
@@ -101,13 +101,13 @@ public class ExampleWindow : Window
         {
             if (userNameText.Text == "admin" && passwordText.Text == "password")
             {
-                MessageBox.Query ("Logging In", "Login Successful", "Ok");
+                MessageBox.Query (App, "Logging In", "Login Successful", "Ok");
                 UserName = userNameText.Text;
                 Application.RequestStop ();
             }
             else
             {
-                MessageBox.ErrorQuery ("Logging In", "Incorrect username or password", "Ok");
+                MessageBox.ErrorQuery (App, "Logging In", "Incorrect username or password", "Ok");
             }
             // Anytime Accepting is handled, make sure to set e.Handled to true.
             e.Handled = true;
diff --git a/Examples/RunnableWrapperExample/Program.cs b/Examples/RunnableWrapperExample/Program.cs
index 41a2df32b..8dadab75e 100644
--- a/Examples/RunnableWrapperExample/Program.cs
+++ b/Examples/RunnableWrapperExample/Program.cs
@@ -13,41 +13,42 @@ var textField = new TextField { Width = 40, Text = "Default text" };
 textField.Title = "Enter your name";
 textField.BorderStyle = LineStyle.Single;
 
-var textRunnable = textField.AsRunnable (tf => tf.Text);
+RunnableWrapper<TextField, string> textRunnable = textField.AsRunnable (tf => tf.Text);
 app.Run (textRunnable);
 
 if (textRunnable.Result is { } name)
 {
-    MessageBox.Query ("Result", $"You entered: {name}", "OK");
+    MessageBox.Query (app, "Result", $"You entered: {name}", "OK");
 }
 else
 {
-    MessageBox.Query ("Result", "Canceled", "OK");
+    MessageBox.Query (app, "Result", "Canceled", "OK");
 }
+
 textRunnable.Dispose ();
 
 // Example 2: Use IApplication.RunView() for one-liner
-var selectedColor = app.RunView (
-    new ColorPicker
-    {
-        Title = "Pick a Color",
-        BorderStyle = LineStyle.Single
-    },
-    cp => cp.SelectedColor);
+Color selectedColor = app.RunView (
+                                   new ColorPicker
+                                   {
+                                       Title = "Pick a Color",
+                                       BorderStyle = LineStyle.Single
+                                   },
+                                   cp => cp.SelectedColor);
 
-MessageBox.Query ("Result", $"Selected color: {selectedColor}", "OK");
+MessageBox.Query (app, "Result", $"Selected color: {selectedColor}", "OK");
 
 // Example 3: FlagSelector with typed enum result
-var flagSelector = new FlagSelector<SelectorStyles>
+FlagSelector<SelectorStyles> flagSelector = new()
 {
     Title = "Choose Styles",
     BorderStyle = LineStyle.Single
 };
 
-var flagsRunnable = flagSelector.AsRunnable (fs => fs.Value);
+RunnableWrapper<FlagSelector<SelectorStyles>, SelectorStyles?> flagsRunnable = flagSelector.AsRunnable (fs => fs.Value);
 app.Run (flagsRunnable);
 
-MessageBox.Query ("Result", $"Selected styles: {flagsRunnable.Result}", "OK");
+MessageBox.Query (app, "Result", $"Selected styles: {flagsRunnable.Result}", "OK");
 flagsRunnable.Dispose ();
 
 // Example 4: Any View without result extraction
@@ -58,26 +59,28 @@ var label = new Label
     Y = Pos.Center ()
 };
 
-var labelRunnable = label.AsRunnable ();
+RunnableWrapper<Label, object> labelRunnable = label.AsRunnable ();
 app.Run (labelRunnable);
 
 // Can still access the wrapped view
-MessageBox.Query ("Result", $"Label text was: {labelRunnable.WrappedView.Text}", "OK");
+MessageBox.Query (app, "Result", $"Label text was: {labelRunnable.WrappedView.Text}", "OK");
 labelRunnable.Dispose ();
 
 // Example 5: Complex custom View made runnable
-var formView = CreateCustomForm ();
-var formRunnable = formView.AsRunnable (ExtractFormData);
+View formView = CreateCustomForm ();
+RunnableWrapper<View, FormData> formRunnable = formView.AsRunnable (ExtractFormData);
 
 app.Run (formRunnable);
 
 if (formRunnable.Result is { } formData)
 {
     MessageBox.Query (
-        "Form Results",
-        $"Name: {formData.Name}\nAge: {formData.Age}\nAgreed: {formData.Agreed}",
-        "OK");
+                      app,
+                      "Form Results",
+                      $"Name: {formData.Name}\nAge: {formData.Age}\nAgreed: {formData.Agreed}",
+                      "OK");
 }
+
 formRunnable.Dispose ();
 
 app.Shutdown ();
@@ -126,10 +129,10 @@ View CreateCustomForm ()
     };
 
     okButton.Accepting += (s, e) =>
-    {
-        form.App?.RequestStop ();
-        e.Handled = true;
-    };
+                          {
+                              form.App?.RequestStop ();
+                              e.Handled = true;
+                          };
 
     form.Add (new Label { Text = "Name:", X = 2, Y = 1 });
     form.Add (nameField);
@@ -148,7 +151,7 @@ FormData ExtractFormData (View form)
     var ageField = form.SubViews.FirstOrDefault (v => v.Id == "ageField") as TextField;
     var agreeCheckbox = form.SubViews.FirstOrDefault (v => v.Id == "agreeCheckbox") as CheckBox;
 
-    return new FormData
+    return new()
     {
         Name = nameField?.Text ?? string.Empty,
         Age = int.TryParse (ageField?.Text, out int age) ? age : 0,
@@ -157,7 +160,7 @@ FormData ExtractFormData (View form)
 }
 
 // Result type for custom form
-record FormData
+internal record FormData
 {
     public string Name { get; init; } = string.Empty;
     public int Age { get; init; }
diff --git a/Examples/SelfContained/Program.cs b/Examples/SelfContained/Program.cs
index 02109bf3a..aa226273b 100644
--- a/Examples/SelfContained/Program.cs
+++ b/Examples/SelfContained/Program.cs
@@ -100,13 +100,13 @@ public class ExampleWindow : Window
                            {
                                if (userNameText.Text == "admin" && passwordText.Text == "password")
                                {
-                                   MessageBox.Query ("Logging In", "Login Successful", "Ok");
+                                   MessageBox.Query (App, "Logging In", "Login Successful", "Ok");
                                    UserName = userNameText.Text;
                                    Application.RequestStop ();
                                }
                                else
                                {
-                                   MessageBox.ErrorQuery ("Logging In", "Incorrect username or password", "Ok");
+                                   MessageBox.ErrorQuery (App, "Logging In", "Incorrect username or password", "Ok");
                                }
                                // When Accepting is handled, set e.Handled to true to prevent further processing.
                                e.Handled = true;
diff --git a/Examples/UICatalog/Scenario.cs b/Examples/UICatalog/Scenario.cs
index 4d9f0c759..d52308b84 100644
--- a/Examples/UICatalog/Scenario.cs
+++ b/Examples/UICatalog/Scenario.cs
@@ -67,7 +67,7 @@ namespace UICatalog;
 ///         };
 /// 
 ///         var button = new Button { X = Pos.Center (), Y = Pos.Center (), Text = "Press me!" };
-///         button.Accept += (s, e) => MessageBox.ErrorQuery ("Error", "You pressed the button!", "Ok");
+///         button.Accept += (s, e) => MessageBox.ErrorQuery (App, "Error", "You pressed the button!", "Ok");
 ///         appWindow.Add (button);
 /// 
 ///         // Run - Start the application.
@@ -210,12 +210,12 @@ public class Scenario : IDisposable
         void OnClearedContents (object? sender, EventArgs args) => BenchmarkResults.ClearedContentCount++;
     }
 
-    private void OnApplicationOnIteration (object? s, IterationEventArgs a)
+    private void OnApplicationOnIteration (object? s, EventArgs<IApplication?> a)
     {
         BenchmarkResults.IterationCount++;
         if (BenchmarkResults.IterationCount > BENCHMARK_MAX_NATURAL_ITERATIONS + (_demoKeys!.Count * BENCHMARK_KEY_PACING))
         {
-            Application.RequestStop ();
+            a.Value?.RequestStop ();
         }
     }
 
diff --git a/Examples/UICatalog/Scenarios/Adornments.cs b/Examples/UICatalog/Scenarios/Adornments.cs
index 938d23a53..6dd491f65 100644
--- a/Examples/UICatalog/Scenarios/Adornments.cs
+++ b/Examples/UICatalog/Scenarios/Adornments.cs
@@ -11,7 +11,7 @@ public class Adornments : Scenario
     {
         Application.Init ();
 
-        Window app = new ()
+        Window appWindow = new ()
         {
             Title = GetQuitKeyAndName (),
             BorderStyle = LineStyle.None
@@ -28,7 +28,7 @@ public class Adornments : Scenario
 
         editor.Border!.Thickness = new (1, 2, 1, 1);
 
-        app.Add (editor);
+        appWindow.Add (editor);
 
         var window = new Window
         {
@@ -38,7 +38,7 @@ public class Adornments : Scenario
             Width = Dim.Fill (Dim.Func (_ => editor.Frame.Width)),
             Height = Dim.Fill ()
         };
-        app.Add (window);
+        appWindow.Add (window);
 
         var tf1 = new TextField { Width = 10, Text = "TextField" };
         var color = new ColorPicker16 { Title = "BG", BoxHeight = 1, BoxWidth = 1, X = Pos.AnchorEnd () };
@@ -60,7 +60,7 @@ public class Adornments : Scenario
         var button = new Button { X = Pos.Center (), Y = Pos.Center (), Text = "Press me!" };
 
         button.Accepting += (s, e) =>
-                             MessageBox.Query (20, 7, "Hi", $"Am I a {window.GetType ().Name}?", "Yes", "No");
+                             MessageBox.Query (appWindow.App, 20, 7, "Hi", $"Am I a {window.GetType ().Name}?", "Yes", "No");
 
         var label = new TextView
         {
@@ -121,7 +121,7 @@ public class Adornments : Scenario
                                       Text = "text (Y = 1)",
                                       CanFocus = true
                                   };
-                                  textFieldInPadding.Accepting += (s, e) => MessageBox.Query (20, 7, "TextField", textFieldInPadding.Text, "Ok");
+                                  textFieldInPadding.Accepting += (s, e) => MessageBox.Query (appWindow.App, 20, 7, "TextField", textFieldInPadding.Text, "Ok");
                                   window.Padding.Add (textFieldInPadding);
 
                                   var btnButtonInPadding = new Button
@@ -132,7 +132,7 @@ public class Adornments : Scenario
                                       CanFocus = true,
                                       HighlightStates = MouseState.None,
                                   };
-                                  btnButtonInPadding.Accepting += (s, e) => MessageBox.Query (20, 7, "Hi", "Button in Padding Pressed!", "Ok");
+                                  btnButtonInPadding.Accepting += (s, e) => MessageBox.Query (appWindow.App, 20, 7, "Hi", "Button in Padding Pressed!", "Ok");
                                   btnButtonInPadding.BorderStyle = LineStyle.Dashed;
                                   btnButtonInPadding.Border!.Thickness = new (1, 1, 1, 1);
                                   window.Padding.Add (btnButtonInPadding);
@@ -155,8 +155,8 @@ public class Adornments : Scenario
         editor.AutoSelectSuperView = window;
         editor.AutoSelectAdornments = true;
 
-        Application.Run (app);
-        app.Dispose ();
+        Application.Run (appWindow);
+        appWindow.Dispose ();
 
         Application.Shutdown ();
     }
diff --git a/Examples/UICatalog/Scenarios/AnimationScenario/AnimationScenario.cs b/Examples/UICatalog/Scenarios/AnimationScenario/AnimationScenario.cs
index 7d1b36020..a35453970 100644
--- a/Examples/UICatalog/Scenarios/AnimationScenario/AnimationScenario.cs
+++ b/Examples/UICatalog/Scenarios/AnimationScenario/AnimationScenario.cs
@@ -78,7 +78,7 @@ public class AnimationScenario : Scenario
         if (!f.Exists)
         {
             Debug.WriteLine ($"Could not find {f.FullName}");
-            MessageBox.ErrorQuery ("Could not find gif", $"Could not find\n{f.FullName}", "Ok");
+            MessageBox.ErrorQuery (_imageView?.App, "Could not find gif", $"Could not find\n{f.FullName}", "Ok");
 
             return;
         }
diff --git a/Examples/UICatalog/Scenarios/Bars.cs b/Examples/UICatalog/Scenarios/Bars.cs
index 669f4e9c0..688af56cf 100644
--- a/Examples/UICatalog/Scenarios/Bars.cs
+++ b/Examples/UICatalog/Scenarios/Bars.cs
@@ -309,7 +309,7 @@ public class Bars : Scenario
     //                                                  new TimeSpan (0),
     //                                                  () =>
     //                                                  {
-    //                                                      MessageBox.Query ("File", "New");
+    //                                                      MessageBox.Query (App, "File", "New");
 
     //                                                      return false;
     //                                                  });
@@ -331,7 +331,7 @@ public class Bars : Scenario
     //                                               new TimeSpan (0),
     //                                               () =>
     //                                               {
-    //                                                   MessageBox.Query ("File", "Open");
+    //                                                   MessageBox.Query (App, "File", "Open");
 
     //                                                   return false;
     //                                               });
@@ -353,7 +353,7 @@ public class Bars : Scenario
     //                                               new TimeSpan (0),
     //                                               () =>
     //                                               {
-    //                                                   MessageBox.Query ("File", "Save");
+    //                                                   MessageBox.Query (App, "File", "Save");
 
     //                                                   return false;
     //                                               });
@@ -375,7 +375,7 @@ public class Bars : Scenario
     //                                                 new TimeSpan (0),
     //                                                 () =>
     //                                                 {
-    //                                                     MessageBox.Query ("File", "Save As");
+    //                                                     MessageBox.Query (App, "File", "Save As");
 
     //                                                     return false;
     //                                                 });
@@ -555,7 +555,7 @@ public class Bars : Scenario
 
         return;
 
-        void Button_Clicked (object sender, EventArgs e) { MessageBox.Query ("Hi", $"You clicked {sender}"); }
+        void Button_Clicked (object sender, EventArgs e) { MessageBox.Query ((sender as View)?.App, "Hi", $"You clicked {sender}"); }
 
     }
 
diff --git a/Examples/UICatalog/Scenarios/Buttons.cs b/Examples/UICatalog/Scenarios/Buttons.cs
index f2ea4572f..404bbf4e4 100644
--- a/Examples/UICatalog/Scenarios/Buttons.cs
+++ b/Examples/UICatalog/Scenarios/Buttons.cs
@@ -59,7 +59,7 @@ public class Buttons : Scenario
 
                                     if (e.Handled)
                                     {
-                                        MessageBox.ErrorQuery ("Error", "This button is no longer the Quit button; the Swap Default button is.", "_Ok");
+                                        MessageBox.ErrorQuery ((s as View)?.App, "Error", "This button is no longer the Quit button; the Swap Default button is.", "_Ok");
                                     }
                                 };
         main.Add (swapButton);
@@ -69,7 +69,7 @@ public class Buttons : Scenario
             button.Accepting += (s, e) =>
                              {
                                  string btnText = button.Text;
-                                 MessageBox.Query ("Message", $"Did you click {txt}?", "Yes", "No");
+                                 MessageBox.Query ((s as View)?.App, "Message", $"Did you click {txt}?", "Yes", "No");
                                  e.Handled = true;
                              };
         }
@@ -112,7 +112,7 @@ public class Buttons : Scenario
                  );
         button.Accepting += (s, e) =>
                          {
-                             MessageBox.Query ("Message", "Question?", "Yes", "No");
+                             MessageBox.Query ((s as View)?.App, "Message", "Question?", "Yes", "No");
                              e.Handled = true;
                          };
 
diff --git a/Examples/UICatalog/Scenarios/ChineseUI.cs b/Examples/UICatalog/Scenarios/ChineseUI.cs
index cc80c7ea9..26545dc8b 100644
--- a/Examples/UICatalog/Scenarios/ChineseUI.cs
+++ b/Examples/UICatalog/Scenarios/ChineseUI.cs
@@ -32,8 +32,9 @@ public class ChineseUI : Scenario
 
         btn.Accepting += (s, e) =>
                       {
-                          int result = MessageBox.Query (
-                                                         "Confirm",
+                          int? result = MessageBox.Query (
+                                                          (s as View)?.App,
+                                                          "Confirm",
                                                          "Are you sure you want to quit ui?",
                                                          0,
                                                          "Yes",
diff --git a/Examples/UICatalog/Scenarios/ConfigurationEditor.cs b/Examples/UICatalog/Scenarios/ConfigurationEditor.cs
index c0bfcb03d..600f4b98c 100644
--- a/Examples/UICatalog/Scenarios/ConfigurationEditor.cs
+++ b/Examples/UICatalog/Scenarios/ConfigurationEditor.cs
@@ -153,9 +153,9 @@ public class ConfigurationEditor : Scenario
                 continue;
             }
 
-            int result = MessageBox.Query (
+            int? result = MessageBox.Query (editor?.App,
                                            "Save Changes",
-                                           $"Save changes to {editor.FileInfo!.Name}",
+                                           $"Save changes to {editor?.FileInfo!.Name}",
                                            "_Yes",
                                            "_No",
                                            "_Cancel"
@@ -164,7 +164,7 @@ public class ConfigurationEditor : Scenario
             switch (result)
             {
                 case 0:
-                    editor.Save ();
+                    editor?.Save ();
 
                     break;
 
diff --git a/Examples/UICatalog/Scenarios/ContextMenus.cs b/Examples/UICatalog/Scenarios/ContextMenus.cs
index 5baaabded..541b11943 100644
--- a/Examples/UICatalog/Scenarios/ContextMenus.cs
+++ b/Examples/UICatalog/Scenarios/ContextMenus.cs
@@ -49,7 +49,7 @@ public class ContextMenus : Scenario
             var text = "Context Menu";
             var width = 20;
 
-            CreateWinContextMenu ();
+            CreateWinContextMenu (ApplicationImpl.Instance);
 
             var label = new Label
             {
@@ -108,7 +108,7 @@ public class ContextMenus : Scenario
         }
     }
 
-    private void CreateWinContextMenu ()
+    private void CreateWinContextMenu (IApplication? app)
     {
         _winContextMenu = new (
                                [
@@ -122,7 +122,7 @@ public class ContextMenus : Scenario
                                    {
                                        Title = "_Configuration...",
                                        HelpText = "Show configuration",
-                                       Action = () => MessageBox.Query (
+                                       Action = () => MessageBox.Query (app,
                                                                         50,
                                                                         10,
                                                                         "Configuration",
@@ -140,7 +140,7 @@ public class ContextMenus : Scenario
                                                               Title = "_Setup...",
                                                               HelpText = "Perform setup",
                                                               Action = () => MessageBox
-                                                                           .Query (
+                                                                           .Query (app,
                                                                                    50,
                                                                                    10,
                                                                                    "Setup",
@@ -154,7 +154,7 @@ public class ContextMenus : Scenario
                                                               Title = "_Maintenance...",
                                                               HelpText = "Maintenance mode",
                                                               Action = () => MessageBox
-                                                                           .Query (
+                                                                           .Query (app,
                                                                                    50,
                                                                                    10,
                                                                                    "Maintenance",
diff --git a/Examples/UICatalog/Scenarios/CsvEditor.cs b/Examples/UICatalog/Scenarios/CsvEditor.cs
index 5690a7509..5831b8feb 100644
--- a/Examples/UICatalog/Scenarios/CsvEditor.cs
+++ b/Examples/UICatalog/Scenarios/CsvEditor.cs
@@ -215,7 +215,7 @@ public class CsvEditor : Scenario
                                       _tableView.Table.Columns
                                      );
 
-            int result = MessageBox.Query (
+            int? result = MessageBox.Query (ApplicationImpl.Instance,
                                            "Column Type",
                                            "Pick a data type for the column",
                                            "Date",
@@ -225,7 +225,7 @@ public class CsvEditor : Scenario
                                            "Cancel"
                                           );
 
-            if (result <= -1 || result >= 4)
+            if (result is null || result >= 4)
             {
                 return;
             }
@@ -308,7 +308,7 @@ public class CsvEditor : Scenario
 
         if (_tableView.SelectedColumn == -1)
         {
-            MessageBox.ErrorQuery ("No Column", "No column selected", "Ok");
+            MessageBox.ErrorQuery (ApplicationImpl.Instance, "No Column", "No column selected", "Ok");
 
             return;
         }
@@ -320,7 +320,7 @@ public class CsvEditor : Scenario
         }
         catch (Exception ex)
         {
-            MessageBox.ErrorQuery ("Could not remove column", ex.Message, "Ok");
+            MessageBox.ErrorQuery (ApplicationImpl.Instance, "Could not remove column", ex.Message, "Ok");
         }
     }
 
@@ -342,7 +342,7 @@ public class CsvEditor : Scenario
             }
             catch (Exception ex)
             {
-                MessageBox.ErrorQuery (60, 20, "Failed to set text", ex.Message, "Ok");
+                MessageBox.ErrorQuery (ApplicationImpl.Instance, 60, 20, "Failed to set text", ex.Message, "Ok");
             }
 
             _tableView.Update ();
@@ -388,7 +388,7 @@ public class CsvEditor : Scenario
 
         if (_tableView.SelectedColumn == -1)
         {
-            MessageBox.ErrorQuery ("No Column", "No column selected", "Ok");
+            MessageBox.ErrorQuery (ApplicationImpl.Instance, "No Column", "No column selected", "Ok");
 
             return;
         }
@@ -413,7 +413,7 @@ public class CsvEditor : Scenario
         }
         catch (Exception ex)
         {
-            MessageBox.ErrorQuery ("Error moving column", ex.Message, "Ok");
+            MessageBox.ErrorQuery (ApplicationImpl.Instance, "Error moving column", ex.Message, "Ok");
         }
     }
 
@@ -426,7 +426,7 @@ public class CsvEditor : Scenario
 
         if (_tableView.SelectedRow == -1)
         {
-            MessageBox.ErrorQuery ("No Rows", "No row selected", "Ok");
+            MessageBox.ErrorQuery (ApplicationImpl.Instance, "No Rows", "No row selected", "Ok");
 
             return;
         }
@@ -446,7 +446,7 @@ public class CsvEditor : Scenario
                     return;
                 }
 
-                object?[] arrayItems = currentRow.ItemArray;
+                object? [] arrayItems = currentRow.ItemArray;
                 _currentTable.Rows.Remove (currentRow);
 
                 // Removing and Inserting the same DataRow seems to result in it loosing its values so we have to create a new instance
@@ -462,7 +462,7 @@ public class CsvEditor : Scenario
         }
         catch (Exception ex)
         {
-            MessageBox.ErrorQuery ("Error moving column", ex.Message, "Ok");
+            MessageBox.ErrorQuery (ApplicationImpl.Instance, "Error moving column", ex.Message, "Ok");
         }
     }
 
@@ -470,7 +470,7 @@ public class CsvEditor : Scenario
     {
         if (_tableView?.Table is null)
         {
-            MessageBox.ErrorQuery ("No Table Loaded", "No table has currently be opened", "Ok");
+            MessageBox.ErrorQuery (ApplicationImpl.Instance, "No Table Loaded", "No table has currently be opened", "Ok");
 
             return true;
         }
@@ -582,7 +582,7 @@ public class CsvEditor : Scenario
         }
         catch (Exception ex)
         {
-            MessageBox.ErrorQuery (
+            MessageBox.ErrorQuery (ApplicationImpl.Instance,
                                    "Open Failed",
                                    $"Error on line {lineNumber}{Environment.NewLine}{ex.Message}",
                                    "Ok"
@@ -612,7 +612,7 @@ public class CsvEditor : Scenario
     {
         if (_tableView?.Table is null || string.IsNullOrWhiteSpace (_currentFile) || _currentTable is null)
         {
-            MessageBox.ErrorQuery ("No file loaded", "No file is currently loaded", "Ok");
+            MessageBox.ErrorQuery (ApplicationImpl.Instance, "No file loaded", "No file is currently loaded", "Ok");
 
             return;
         }
@@ -674,7 +674,7 @@ public class CsvEditor : Scenario
 
         if (col.DataType == typeof (string))
         {
-            MessageBox.ErrorQuery (
+            MessageBox.ErrorQuery (ApplicationImpl.Instance,
                                    "Cannot Format Column",
                                    "String columns cannot be Formatted, try adding a new column to the table with a date/numerical Type",
                                    "Ok"
@@ -711,7 +711,7 @@ public class CsvEditor : Scenario
 
         if (_tableView.SelectedColumn == -1)
         {
-            MessageBox.ErrorQuery ("No Column", "No column selected", "Ok");
+            MessageBox.ErrorQuery (ApplicationImpl.Instance, "No Column", "No column selected", "Ok");
 
             return;
         }
diff --git a/Examples/UICatalog/Scenarios/Dialogs.cs b/Examples/UICatalog/Scenarios/Dialogs.cs
index e7fd1ac77..8e8a6ec99 100644
--- a/Examples/UICatalog/Scenarios/Dialogs.cs
+++ b/Examples/UICatalog/Scenarios/Dialogs.cs
@@ -266,7 +266,7 @@ public class Dialogs : Scenario
             {
                 Title = titleEdit.Text,
                 Text = "Dialog Text",
-                ButtonAlignment = (Alignment)Enum.Parse (typeof (Alignment), alignmentGroup.Labels! [(int)alignmentGroup.Value!.Value] [1..]),
+                ButtonAlignment = (Alignment)Enum.Parse (typeof (Alignment), alignmentGroup.Labels! [(int)alignmentGroup.Value!.Value] [0..]),
 
                 Buttons = buttons.ToArray ()
             };
diff --git a/Examples/UICatalog/Scenarios/DynamicStatusBar.cs b/Examples/UICatalog/Scenarios/DynamicStatusBar.cs
index 73dd3b802..a0cdb48e3 100644
--- a/Examples/UICatalog/Scenarios/DynamicStatusBar.cs
+++ b/Examples/UICatalog/Scenarios/DynamicStatusBar.cs
@@ -79,7 +79,7 @@ public class DynamicStatusBar : Scenario
             }
             catch (Exception ex)
             {
-                MessageBox.ErrorQuery ("Binding Error", $"Binding failed: {ex}.", "Ok");
+                MessageBox.ErrorQuery (ApplicationImpl.Instance, "Binding Error", $"Binding failed: {ex}.", "Ok");
             }
         }
     }
@@ -140,7 +140,7 @@ public class DynamicStatusBar : Scenario
         public TextView TextAction { get; }
         public TextField TextShortcut { get; }
         public TextField TextTitle { get; }
-        public Action CreateAction (DynamicStatusItem item) { return () => MessageBox.ErrorQuery (item.Title, item.Action, "Ok"); }
+        public Action CreateAction (DynamicStatusItem item) { return () => MessageBox.ErrorQuery (ApplicationImpl.Instance, item.Title, item.Action, "Ok"); }
 
         public void EditStatusItem (Shortcut statusItem)
         {
@@ -184,7 +184,7 @@ public class DynamicStatusBar : Scenario
                               {
                                   if (string.IsNullOrEmpty (TextTitle.Text))
                                   {
-                                      MessageBox.ErrorQuery ("Invalid title", "Must enter a valid title!.", "Ok");
+                                      MessageBox.ErrorQuery (App, "Invalid title", "Must enter a valid title!.", "Ok");
                                   }
                                   else
                                   {
@@ -200,7 +200,7 @@ public class DynamicStatusBar : Scenario
                                       TextTitle.Text = string.Empty;
                                       Application.RequestStop ();
                                   };
-            var dialog = new Dialog { Title = "Enter the menu details.", Buttons = [btnOk, btnCancel], Height = Dim.Auto (DimAutoStyle.Content, 17, Application.Screen.Height) };
+            var dialog = new Dialog { Title = "Enter the menu details.", Buttons = [btnOk, btnCancel], Height = Dim.Auto (DimAutoStyle.Content, 17, App?.Screen.Height) };
 
             Width = Dim.Fill ();
             Height = Dim.Fill () - 2;
@@ -382,7 +382,7 @@ public class DynamicStatusBar : Scenario
                               {
                                   if (string.IsNullOrEmpty (frmStatusBarDetails.TextTitle.Text) && _currentEditStatusItem != null)
                                   {
-                                      MessageBox.ErrorQuery ("Invalid title", "Must enter a valid title!.", "Ok");
+                                      MessageBox.ErrorQuery (App, "Invalid title", "Must enter a valid title!.", "Ok");
                                   }
                                   else if (_currentEditStatusItem != null)
                                   {
diff --git a/Examples/UICatalog/Scenarios/Editor.cs b/Examples/UICatalog/Scenarios/Editor.cs
index 3b2e13813..d2eac26dc 100644
--- a/Examples/UICatalog/Scenarios/Editor.cs
+++ b/Examples/UICatalog/Scenarios/Editor.cs
@@ -156,7 +156,7 @@ public class Editor : Scenario
                                        new (Key.F2, "Open", Open),
                                        new (Key.F3, "Save", () => Save ()),
                                        new (Key.F4, "Save As", () => SaveAs ()),
-                                       new (Key.Empty, $"OS Clipboard IsSupported : {Clipboard.IsSupported}", null),
+                                       new (Key.Empty, $"OS Clipboard IsSupported : {Application.Clipboard!.IsSupported}", null),
                                        siCursorPosition
                                    ]
                                   )
@@ -193,7 +193,8 @@ public class Editor : Scenario
 
         Debug.Assert (_textView.IsDirty);
 
-        int r = MessageBox.ErrorQuery (
+        int? r = MessageBox.ErrorQuery (
+                                       ApplicationImpl.Instance,
                                        "Save File",
                                        $"Do you want save changes in {_appWindow.Title}?",
                                        "Yes",
@@ -228,7 +229,7 @@ public class Editor : Scenario
         }
         catch (Exception ex)
         {
-            MessageBox.ErrorQuery ("Error", ex.Message, "Ok");
+            MessageBox.ErrorQuery (ApplicationImpl.Instance, "Error", ex.Message, "Ok");
         }
     }
 
@@ -307,11 +308,11 @@ public class Editor : Scenario
 
         if (!found)
         {
-            MessageBox.Query ("Find", $"The following specified text was not found: '{_textToFind}'", "Ok");
+            MessageBox.Query (ApplicationImpl.Instance, "Find", $"The following specified text was not found: '{_textToFind}'", "Ok");
         }
         else if (gaveFullTurn)
         {
-            MessageBox.Query (
+            MessageBox.Query (ApplicationImpl.Instance,
                               "Find",
                               $"No more occurrences were found for the following specified text: '{_textToFind}'",
                               "Ok"
@@ -887,7 +888,7 @@ public class Editor : Scenario
 
         if (_textView.ReplaceAllText (_textToFind, _matchCase, _matchWholeWord, _textToReplace))
         {
-            MessageBox.Query (
+            MessageBox.Query (ApplicationImpl.Instance,
                               "Replace All",
                               $"All occurrences were replaced for the following specified text: '{_textToReplace}'",
                               "Ok"
@@ -895,7 +896,7 @@ public class Editor : Scenario
         }
         else
         {
-            MessageBox.Query (
+            MessageBox.Query (ApplicationImpl.Instance,
                               "Replace All",
                               $"None of the following specified text was found: '{_textToFind}'",
                               "Ok"
@@ -1147,7 +1148,7 @@ public class Editor : Scenario
         {
             if (File.Exists (path))
             {
-                if (MessageBox.Query (
+                if (MessageBox.Query (ApplicationImpl.Instance,
                                       "Save File",
                                       "File already exists. Overwrite any way?",
                                       "No",
@@ -1186,11 +1187,11 @@ public class Editor : Scenario
             _originalText = Encoding.Unicode.GetBytes (_textView.Text);
             _saved = true;
             _textView.ClearHistoryChanges ();
-            MessageBox.Query ("Save File", "File was successfully saved.", "Ok");
+            MessageBox.Query (ApplicationImpl.Instance, "Save File", "File was successfully saved.", "Ok");
         }
         catch (Exception ex)
         {
-            MessageBox.ErrorQuery ("Error", ex.Message, "Ok");
+            MessageBox.ErrorQuery (ApplicationImpl.Instance, "Error", ex.Message, "Ok");
 
             return false;
         }
diff --git a/Examples/UICatalog/Scenarios/EditorsAndHelpers/DimEditor.cs b/Examples/UICatalog/Scenarios/EditorsAndHelpers/DimEditor.cs
index ff372ecc7..7f1f795c9 100644
--- a/Examples/UICatalog/Scenarios/EditorsAndHelpers/DimEditor.cs
+++ b/Examples/UICatalog/Scenarios/EditorsAndHelpers/DimEditor.cs
@@ -157,7 +157,7 @@ public class DimEditor : EditorBase
         }
         catch (Exception e)
         {
-            MessageBox.ErrorQuery ("Exception", e.Message, "Ok");
+            MessageBox.ErrorQuery (App, "Exception", e.Message, "Ok");
         }
     }
 }
diff --git a/Examples/UICatalog/Scenarios/EditorsAndHelpers/PosEditor.cs b/Examples/UICatalog/Scenarios/EditorsAndHelpers/PosEditor.cs
index 45f0ab950..467b54756 100644
--- a/Examples/UICatalog/Scenarios/EditorsAndHelpers/PosEditor.cs
+++ b/Examples/UICatalog/Scenarios/EditorsAndHelpers/PosEditor.cs
@@ -160,7 +160,7 @@ public class PosEditor : EditorBase
         }
         catch (Exception e)
         {
-            MessageBox.ErrorQuery ("Exception", e.Message, "Ok");
+            MessageBox.ErrorQuery (App, "Exception", e.Message, "Ok");
         }
     }
 }
diff --git a/Examples/UICatalog/Scenarios/FileDialogExamples.cs b/Examples/UICatalog/Scenarios/FileDialogExamples.cs
index 290e4a432..fd80d82f3 100644
--- a/Examples/UICatalog/Scenarios/FileDialogExamples.cs
+++ b/Examples/UICatalog/Scenarios/FileDialogExamples.cs
@@ -133,7 +133,7 @@ public class FileDialogExamples : Scenario
                              }
                              catch (Exception ex)
                              {
-                                 MessageBox.ErrorQuery ("Error", ex.ToString (), "_Ok");
+                                 MessageBox.ErrorQuery (ApplicationImpl.Instance, "Error", ex.ToString (), "_Ok");
                              }
                              finally
                              {
@@ -153,7 +153,7 @@ public class FileDialogExamples : Scenario
         {
             if (File.Exists (e.Dialog.Path))
             {
-                int result = MessageBox.Query ("Overwrite?", "File already exists", "_Yes", "_No");
+                int? result = MessageBox.Query (ApplicationImpl.Instance, "Overwrite?", "File already exists", "_Yes", "_No");
                 e.Cancel = result == 1;
             }
         }
@@ -248,7 +248,7 @@ public class FileDialogExamples : Scenario
 
             if (canceled)
             {
-                MessageBox.Query (
+                MessageBox.Query (ApplicationImpl.Instance,
                                   "Canceled",
                                   "You canceled navigation and did not pick anything",
                                   "Ok"
@@ -256,7 +256,7 @@ public class FileDialogExamples : Scenario
             }
             else if (_cbAllowMultipleSelection.CheckedState == CheckState.Checked)
             {
-                MessageBox.Query (
+                MessageBox.Query (ApplicationImpl.Instance,
                                   "Chosen!",
                                   "You chose:" + Environment.NewLine + string.Join (Environment.NewLine, multiSelected.Select (m => m)),
                                   "Ok"
@@ -264,7 +264,7 @@ public class FileDialogExamples : Scenario
             }
             else
             {
-                MessageBox.Query (
+                MessageBox.Query (ApplicationImpl.Instance,
                                   "Chosen!",
                                   "You chose:" + Environment.NewLine + path,
                                   "Ok"
diff --git a/Examples/UICatalog/Scenarios/Generic.cs b/Examples/UICatalog/Scenarios/Generic.cs
index f0da0dd53..a8c3c7266 100644
--- a/Examples/UICatalog/Scenarios/Generic.cs
+++ b/Examples/UICatalog/Scenarios/Generic.cs
@@ -29,7 +29,7 @@ public sealed class Generic : Scenario
                             {
                                 // When Accepting is handled, set e.Handled to true to prevent further processing.
                                 e.Handled = true;
-                                MessageBox.ErrorQuery ("Error", "You pressed the button!", "_Ok");
+                                MessageBox.ErrorQuery (ApplicationImpl.Instance, "Error", "You pressed the button!", "_Ok");
                             };
 
         appWindow.Add (button);
diff --git a/Examples/UICatalog/Scenarios/HexEditor.cs b/Examples/UICatalog/Scenarios/HexEditor.cs
index 45abe08ac..fdd4b5e83 100644
--- a/Examples/UICatalog/Scenarios/HexEditor.cs
+++ b/Examples/UICatalog/Scenarios/HexEditor.cs
@@ -181,7 +181,7 @@ public class HexEditor : Scenario
         }
     }
 
-    private void Copy () { MessageBox.ErrorQuery ("Not Implemented", "Functionality not yet implemented.", "Ok"); }
+    private void Copy () { MessageBox.ErrorQuery (ApplicationImpl.Instance, "Not Implemented", "Functionality not yet implemented.", "Ok"); }
 
     private void CreateDemoFile (string fileName)
     {
@@ -208,7 +208,7 @@ public class HexEditor : Scenario
         ms.Close ();
     }
 
-    private void Cut () { MessageBox.ErrorQuery ("Not Implemented", "Functionality not yet implemented.", "Ok"); }
+    private void Cut () { MessageBox.ErrorQuery (ApplicationImpl.Instance, "Not Implemented", "Functionality not yet implemented.", "Ok"); }
 
     private Stream LoadFile ()
     {
@@ -216,7 +216,7 @@ public class HexEditor : Scenario
 
         if (!_saved && _hexView!.Edits.Count > 0 && _hexView.Source is {})
         {
-            if (MessageBox.ErrorQuery (
+            if (MessageBox.ErrorQuery (ApplicationImpl.Instance,
                                        "Save",
                                        "The changes were not saved. Want to open without saving?",
                                        "_Yes",
@@ -267,7 +267,7 @@ public class HexEditor : Scenario
         d.Dispose ();
     }
 
-    private void Paste () { MessageBox.ErrorQuery ("Not Implemented", "Functionality not yet implemented.", "_Ok"); }
+    private void Paste () { MessageBox.ErrorQuery (ApplicationImpl.Instance, "Not Implemented", "Functionality not yet implemented.", "_Ok"); }
     private void Quit () { Application.RequestStop (); }
 
     private void Save ()
diff --git a/Examples/UICatalog/Scenarios/Images.cs b/Examples/UICatalog/Scenarios/Images.cs
index a9854092d..5791166cb 100644
--- a/Examples/UICatalog/Scenarios/Images.cs
+++ b/Examples/UICatalog/Scenarios/Images.cs
@@ -183,7 +183,7 @@ public class Images : Scenario
 
         if (!_sixelSupportResult.SupportsTransparency)
         {
-            if (MessageBox.Query (
+            if (MessageBox.Query (ApplicationImpl.Instance,
                                   "Transparency Not Supported",
                                   "It looks like your terminal does not support transparent sixel backgrounds. Do you want to try anyway?",
                                   "Yes",
@@ -288,7 +288,7 @@ public class Images : Scenario
         }
         catch (Exception ex)
         {
-            MessageBox.ErrorQuery ("Could not open file", ex.Message, "Ok");
+            MessageBox.ErrorQuery (ApplicationImpl.Instance, "Could not open file", ex.Message, "Ok");
 
             return;
         }
@@ -492,7 +492,7 @@ public class Images : Scenario
     {
         if (_imageView.FullResImage == null)
         {
-            MessageBox.Query ("No Image Loaded", "You must first open an image.  Use the 'Open Image' button above.", "Ok");
+            MessageBox.Query (ApplicationImpl.Instance, "No Image Loaded", "You must first open an image.  Use the 'Open Image' button above.", "Ok");
 
             return;
         }
diff --git a/Examples/UICatalog/Scenarios/InteractiveTree.cs b/Examples/UICatalog/Scenarios/InteractiveTree.cs
index a91448c10..d90af1fa4 100644
--- a/Examples/UICatalog/Scenarios/InteractiveTree.cs
+++ b/Examples/UICatalog/Scenarios/InteractiveTree.cs
@@ -173,7 +173,7 @@ public class InteractiveTree : Scenario
 
                 if (parent is null)
                 {
-                    MessageBox.ErrorQuery (
+                    MessageBox.ErrorQuery (ApplicationImpl.Instance,
                                            "Could not delete",
                                            $"Parent of '{toDelete}' was unexpectedly null",
                                            "Ok"
diff --git a/Examples/UICatalog/Scenarios/KeyBindings.cs b/Examples/UICatalog/Scenarios/KeyBindings.cs
index f68e67f17..635aa6f6e 100644
--- a/Examples/UICatalog/Scenarios/KeyBindings.cs
+++ b/Examples/UICatalog/Scenarios/KeyBindings.cs
@@ -164,17 +164,17 @@ public class KeyBindingsDemo : View
 
         AddCommand (Command.Save, ctx =>
                                  {
-                                     MessageBox.Query ($"{ctx.Command}", $"Ctx: {ctx}", buttons: "Ok");
+                                     MessageBox.Query (ApplicationImpl.Instance, $"{ctx.Command}", $"Ctx: {ctx}", buttons: "Ok");
                                      return true;
                                  });
         AddCommand (Command.New, ctx =>
                                 {
-                                    MessageBox.Query ($"{ctx.Command}", $"Ctx: {ctx}", buttons: "Ok");
+                                    MessageBox.Query (ApplicationImpl.Instance, $"{ctx.Command}", $"Ctx: {ctx}", buttons: "Ok");
                                     return true;
                                 });
         AddCommand (Command.HotKey, ctx =>
         {
-            MessageBox.Query ($"{ctx.Command}", $"Ctx: {ctx}\nCommand: {ctx.Command}", buttons: "Ok");
+            MessageBox.Query (ApplicationImpl.Instance, $"{ctx.Command}", $"Ctx: {ctx}\nCommand: {ctx.Command}", buttons: "Ok");
             SetFocus ();
             return true;
         });
@@ -189,7 +189,7 @@ public class KeyBindingsDemo : View
                                              {
                                                  return false;
                                              }
-                                             MessageBox.Query ($"{keyCommandContext.Binding}", $"Key: {keyCommandContext.Binding.Key}\nCommand: {ctx.Command}", buttons: "Ok");
+                                             MessageBox.Query (ApplicationImpl.Instance, $"{keyCommandContext.Binding}", $"Key: {keyCommandContext.Binding.Key}\nCommand: {ctx.Command}", buttons: "Ok");
                                              Application.RequestStop ();
                                              return true;
                                          });
diff --git a/Examples/UICatalog/Scenarios/ListColumns.cs b/Examples/UICatalog/Scenarios/ListColumns.cs
index 8ed35942e..d300b4163 100644
--- a/Examples/UICatalog/Scenarios/ListColumns.cs
+++ b/Examples/UICatalog/Scenarios/ListColumns.cs
@@ -336,7 +336,7 @@ public class ListColumns : Scenario
             }
             catch (Exception ex)
             {
-                MessageBox.ErrorQuery (60, 20, "Failed to set", ex.Message, "Ok");
+                MessageBox.ErrorQuery (ApplicationImpl.Instance, 60, 20, "Failed to set", ex.Message, "Ok");
             }
         }
     }
diff --git a/Examples/UICatalog/Scenarios/MessageBoxes.cs b/Examples/UICatalog/Scenarios/MessageBoxes.cs
index c8356a86a..fcb6488ee 100644
--- a/Examples/UICatalog/Scenarios/MessageBoxes.cs
+++ b/Examples/UICatalog/Scenarios/MessageBoxes.cs
@@ -251,7 +251,7 @@ public class MessageBoxes : Scenario
                                                {
                                                    buttonPressedLabel.Text =
                                                        $"{MessageBox.Query (
-                                                                             width,
+                                                                            ApplicationImpl.Instance, width,
                                                                              height,
                                                                              titleEdit.Text,
                                                                              messageEdit.Text,
@@ -263,14 +263,14 @@ public class MessageBoxes : Scenario
                                                else
                                                {
                                                    buttonPressedLabel.Text =
-                                                       $"{MessageBox.ErrorQuery (
-                                                                                  width,
-                                                                                  height,
-                                                                                  titleEdit.Text,
-                                                                                  messageEdit.Text,
-                                                                                  defaultButton,
-                                                                                  ckbWrapMessage.CheckedState == CheckState.Checked,
-                                                                                  btns.ToArray ()
+                                                       $"{MessageBox.ErrorQuery (ApplicationImpl.Instance,
+                                                                                 width,
+                                                                                 height,
+                                                                                 titleEdit.Text,
+                                                                                 messageEdit.Text,
+                                                                                 defaultButton,
+                                                                                 ckbWrapMessage.CheckedState == CheckState.Checked,
+                                                                                 btns.ToArray ()
                                                                                  )}";
                                                }
                                            }
diff --git a/Examples/UICatalog/Scenarios/MultiColouredTable.cs b/Examples/UICatalog/Scenarios/MultiColouredTable.cs
index 9b717d1ed..5bac4e125 100644
--- a/Examples/UICatalog/Scenarios/MultiColouredTable.cs
+++ b/Examples/UICatalog/Scenarios/MultiColouredTable.cs
@@ -99,7 +99,7 @@ public class MultiColouredTable : Scenario
             }
             catch (Exception ex)
             {
-                MessageBox.ErrorQuery (60, 20, "Failed to set text", ex.Message, "Ok");
+                MessageBox.ErrorQuery (ApplicationImpl.Instance, 60, 20, "Failed to set text", ex.Message, "Ok");
             }
 
             _tableView.Update ();
diff --git a/Examples/UICatalog/Scenarios/Navigation.cs b/Examples/UICatalog/Scenarios/Navigation.cs
index 94e7dad8e..dfedfc4d1 100644
--- a/Examples/UICatalog/Scenarios/Navigation.cs
+++ b/Examples/UICatalog/Scenarios/Navigation.cs
@@ -59,7 +59,7 @@ public class Navigation : Scenario
             Y = 0,
             Title = $"TopButton _{GetNextHotKey ()}"
         };
-        button.Accepting += (sender, args) => MessageBox.Query ("hi", button.Title, "_Ok");
+        button.Accepting += (sender, args) => MessageBox.Query (ApplicationImpl.Instance, "hi", button.Title, "_Ok");
 
         testFrame.Add (button);
 
@@ -210,7 +210,7 @@ public class Navigation : Scenario
 
         return;
 
-        void OnApplicationIteration (object sender, IterationEventArgs args)
+        void OnApplicationIteration (object sender, EventArgs<IApplication> args)
         {
             if (progressBar.Fraction == 1.0)
             {
diff --git a/Examples/UICatalog/Scenarios/Notepad.cs b/Examples/UICatalog/Scenarios/Notepad.cs
index 4a2f7d2e6..6d3ac2c82 100644
--- a/Examples/UICatalog/Scenarios/Notepad.cs
+++ b/Examples/UICatalog/Scenarios/Notepad.cs
@@ -71,7 +71,7 @@ public class Notepad : Scenario
                                        new MenuItem
                                        {
                                            Title = "_About",
-                                           Action = () => MessageBox.Query ("Notepad", "About Notepad...", "Ok")
+                                           Action = () => MessageBox.Query (ApplicationImpl.Instance,  "Notepad", "About Notepad...", "Ok")
                                        }
                                    ]
                                   )
@@ -193,15 +193,15 @@ public class Notepad : Scenario
 
         if (tab.UnsavedChanges)
         {
-            int result = MessageBox.Query (
-                                           "Save Changes",
-                                           $"Save changes to {tab.Text.TrimEnd ('*')}",
-                                           "Yes",
-                                           "No",
-                                           "Cancel"
+            int? result = MessageBox.Query (ApplicationImpl.Instance,
+                                            "Save Changes",
+                                            $"Save changes to {tab.Text.TrimEnd ('*')}",
+                                            "Yes",
+                                            "No",
+                                            "Cancel"
                                           );
 
-            if (result == -1 || result == 2)
+            if (result is null || result == 2)
             {
                 // user cancelled
                 return;
diff --git a/Examples/UICatalog/Scenarios/RunTExample.cs b/Examples/UICatalog/Scenarios/RunTExample.cs
index 6e4cfa1d7..7a66e54e5 100644
--- a/Examples/UICatalog/Scenarios/RunTExample.cs
+++ b/Examples/UICatalog/Scenarios/RunTExample.cs
@@ -63,12 +63,12 @@ public class RunTExample : Scenario
                                {
                                    if (_usernameText.Text == "admin" && passwordText.Text == "password")
                                    {
-                                       MessageBox.Query ("Login Successful", $"Username: {_usernameText.Text}", "Ok");
-                                       Application.RequestStop ();
+                                       MessageBox.Query (App, "Login Successful", $"Username: {_usernameText.Text}", "Ok");
+                                       App?.RequestStop ();
                                    }
                                    else
                                    {
-                                       MessageBox.ErrorQuery (
+                                       MessageBox.ErrorQuery (App,
                                                               "Error Logging In",
                                                               "Incorrect username or password (hint: admin/password)",
                                                               "Ok"
diff --git a/Examples/UICatalog/Scenarios/RuneWidthGreaterThanOne.cs b/Examples/UICatalog/Scenarios/RuneWidthGreaterThanOne.cs
index 512a106f0..23f2e63fa 100644
--- a/Examples/UICatalog/Scenarios/RuneWidthGreaterThanOne.cs
+++ b/Examples/UICatalog/Scenarios/RuneWidthGreaterThanOne.cs
@@ -166,7 +166,7 @@ public class RuneWidthGreaterThanOne : Scenario
     {
         if (_text is { })
         {
-            MessageBox.Query ("Say Hello 你", $"Hello {_text.Text}", "Ok");
+            MessageBox.Query (ApplicationImpl.Instance, "Say Hello 你", $"Hello {_text.Text}", "Ok");
         }
     }
 
@@ -197,7 +197,7 @@ public class RuneWidthGreaterThanOne : Scenario
     {
         if (_text is { })
         {
-            MessageBox.Query ("Say Hello", $"Hello {_text.Text}", "Ok");
+            MessageBox.Query (ApplicationImpl.Instance, "Say Hello", $"Hello {_text.Text}", "Ok");
         }
     }
 
@@ -252,7 +252,7 @@ public class RuneWidthGreaterThanOne : Scenario
     {
         if (_text is { })
         {
-            MessageBox.Query ("こんにちはと言う", $"こんにちは {_text.Text}", "Ok");
+            MessageBox.Query (ApplicationImpl.Instance, "こんにちはと言う", $"こんにちは {_text.Text}", "Ok");
         }
     }
 
diff --git a/Examples/UICatalog/Scenarios/Shortcuts.cs b/Examples/UICatalog/Scenarios/Shortcuts.cs
index 573834aa3..7af36ef92 100644
--- a/Examples/UICatalog/Scenarios/Shortcuts.cs
+++ b/Examples/UICatalog/Scenarios/Shortcuts.cs
@@ -566,6 +566,6 @@ public class Shortcuts : Scenario
     {
         e.Handled = true;
         var view = sender as View;
-        MessageBox.Query ("Hi", $"You clicked {view?.Text}", "_Ok");
+        MessageBox.Query ((sender as View)?.App, "Hi", $"You clicked {view?.Text}", "_Ok");
     }
 }
diff --git a/Examples/UICatalog/Scenarios/SingleBackgroundWorker.cs b/Examples/UICatalog/Scenarios/SingleBackgroundWorker.cs
index 5e795a9c0..e5b8c301f 100644
--- a/Examples/UICatalog/Scenarios/SingleBackgroundWorker.cs
+++ b/Examples/UICatalog/Scenarios/SingleBackgroundWorker.cs
@@ -224,7 +224,7 @@ public class SingleBackgroundWorker : Scenario
 
             bool Close ()
             {
-                int n = MessageBox.Query (
+                int? n = MessageBox.Query (App,
                                           50,
                                           7,
                                           "Close Window.",
@@ -251,7 +251,7 @@ public class SingleBackgroundWorker : Scenario
                                                         {
                                                             if (Close ())
                                                             {
-                                                                Application.RequestStop ();
+                                                                App?.RequestStop ();
                                                             }
                                                         }
                                            }
@@ -270,7 +270,7 @@ public class SingleBackgroundWorker : Scenario
                                                 {
                                                     if (Close ())
                                                     {
-                                                        Application.RequestStop ();
+                                                        App?.RequestStop ();
                                                     }
                                                 }
                                                )
@@ -304,7 +304,7 @@ public class SingleBackgroundWorker : Scenario
         {
             if (_top is { })
             {
-                Application.Run (_top);
+                App?.Run (_top);
                 _top.Dispose ();
                 _top = null;
             }
diff --git a/Examples/UICatalog/Scenarios/TableEditor.cs b/Examples/UICatalog/Scenarios/TableEditor.cs
index 12ab5e9d8..7d130da78 100644
--- a/Examples/UICatalog/Scenarios/TableEditor.cs
+++ b/Examples/UICatalog/Scenarios/TableEditor.cs
@@ -1026,7 +1026,7 @@ public class TableEditor : Scenario
             }
             catch (Exception ex)
             {
-                MessageBox.ErrorQuery (60, 20, "Failed to set text", ex.Message, "Ok");
+                MessageBox.ErrorQuery ((sender as View)?.App, 60, 20, "Failed to set text", ex.Message, "Ok");
             }
 
             _tableView!.Update ();
@@ -1165,7 +1165,7 @@ public class TableEditor : Scenario
         }
         catch (Exception e)
         {
-            MessageBox.ErrorQuery ("Could not find local drives", e.Message, "Ok");
+            MessageBox.ErrorQuery (_tableView?.App, "Could not find local drives", e.Message, "Ok");
         }
 
         _tableView!.Table = source;
@@ -1199,10 +1199,10 @@ public class TableEditor : Scenario
         ok.Accepting += (s, e) =>
                         {
                             accepted = true;
-                            Application.RequestStop ();
+                            (s as View)?.App?.RequestStop ();
                         };
         var cancel = new Button { Text = "Cancel" };
-        cancel.Accepting += (s, e) => { Application.RequestStop (); };
+        cancel.Accepting += (s, e) => { (s as View)?.App?.RequestStop (); };
 
         var d = new Dialog
         {
@@ -1218,7 +1218,7 @@ public class TableEditor : Scenario
         d.Add (lbl, tf);
         tf.SetFocus ();
 
-        Application.Run (d);
+        _tableView.App?.Run (d);
         d.Dispose ();
 
         if (accepted)
@@ -1229,7 +1229,7 @@ public class TableEditor : Scenario
             }
             catch (Exception ex)
             {
-                MessageBox.ErrorQuery (60, 20, "Failed to set", ex.Message, "Ok");
+                MessageBox.ErrorQuery (_tableView.App, 60, 20, "Failed to set", ex.Message, "Ok");
             }
 
             _tableView!.Update ();
@@ -1512,7 +1512,7 @@ public class TableEditor : Scenario
                                                                              _checkedFileSystemInfos!.Contains,
                                                                              CheckOrUncheckFile
                                                                             )
-                { UseRadioButtons = radio };
+            { UseRadioButtons = radio };
         }
         else
         {
diff --git a/Examples/UICatalog/Scenarios/Transparent.cs b/Examples/UICatalog/Scenarios/Transparent.cs
index 1b6f08df8..801372d2c 100644
--- a/Examples/UICatalog/Scenarios/Transparent.cs
+++ b/Examples/UICatalog/Scenarios/Transparent.cs
@@ -46,7 +46,7 @@ public sealed class Transparent : Scenario
         };
         appButton.Accepting += (sender, args) =>
                                {
-                                   MessageBox.Query ("AppButton", "Transparency is cool!", "_Ok");
+                                   MessageBox.Query ((sender as View)?.App, "AppButton", "Transparency is cool!", "_Ok");
                                    args.Handled = true;
                                };
         appWindow.Add (appButton);
@@ -106,7 +106,7 @@ public sealed class Transparent : Scenario
             };
             button.Accepting += (sender, args) =>
                                 {
-                                    MessageBox.Query ("Clicked!", "Button in Transparent View", "_Ok");
+                                    MessageBox.Query (App, "Clicked!", "Button in Transparent View", "_Ok");
                                     args.Handled = true;
                                 };
             //button.Visible = false;
diff --git a/Examples/UICatalog/Scenarios/ViewportSettings.cs b/Examples/UICatalog/Scenarios/ViewportSettings.cs
index 4e430171c..e687a078f 100644
--- a/Examples/UICatalog/Scenarios/ViewportSettings.cs
+++ b/Examples/UICatalog/Scenarios/ViewportSettings.cs
@@ -169,13 +169,13 @@ public class ViewportSettings : Scenario
         };
 
         charMap.Accepting += (s, e) =>
-                              MessageBox.Query (20, 7, "Hi", $"Am I a {view.GetType ().Name}?", "Yes", "No");
+                              MessageBox.Query ((s as View)?.App, 20, 7, "Hi", $"Am I a {view.GetType ().Name}?", "Yes", "No");
 
         var buttonAnchored = new Button
         {
             X = Pos.AnchorEnd () - 10, Y = Pos.AnchorEnd () - 4, Text = "Bottom Rig_ht"
         };
-        buttonAnchored.Accepting += (sender, args) => MessageBox.Query ("Hi", $"You pressed {((Button)sender)?.Text}", "_Ok");
+        buttonAnchored.Accepting += (sender, args) => MessageBox.Query ((sender as View)?.App, "Hi", $"You pressed {((Button)sender)?.Text}", "_Ok");
 
         view.Margin!.Data = "Margin";
         view.Margin!.Thickness = new (0);
diff --git a/Examples/UICatalog/Scenarios/WindowsAndFrameViews.cs b/Examples/UICatalog/Scenarios/WindowsAndFrameViews.cs
index d2b58d847..4404f8008 100644
--- a/Examples/UICatalog/Scenarios/WindowsAndFrameViews.cs
+++ b/Examples/UICatalog/Scenarios/WindowsAndFrameViews.cs
@@ -16,9 +16,9 @@ public class WindowsAndFrameViews : Scenario
             Title = GetQuitKeyAndName ()
         };
 
-        static int About ()
+        static int? About ()
         {
-            return MessageBox.Query (
+            return MessageBox.Query (ApplicationImpl.Instance,
                                      "About UI Catalog",
                                      "UI Catalog is a comprehensive sample library for Terminal.Gui",
                                      "Ok"
@@ -99,7 +99,7 @@ public class WindowsAndFrameViews : Scenario
             };
 
             pressMeButton.Accepting += (s, e) =>
-                                        MessageBox.ErrorQuery (loopWin.Title, "Neat?", "Yes", "No");
+                                        MessageBox.ErrorQuery ((s as View)?.App, loopWin.Title, "Neat?", "Yes", "No");
             loopWin.Add (pressMeButton);
 
             var subWin = new Window
diff --git a/Examples/UICatalog/Scenarios/WizardAsView.cs b/Examples/UICatalog/Scenarios/WizardAsView.cs
index 9df72b835..67e23685f 100644
--- a/Examples/UICatalog/Scenarios/WizardAsView.cs
+++ b/Examples/UICatalog/Scenarios/WizardAsView.cs
@@ -21,6 +21,7 @@ public class WizardAsView : Scenario
                                        {
                                            Title = "_Restart Configuration...",
                                            Action = () => MessageBox.Query (
+                                                                            ApplicationImpl.Instance,
                                                                             "Wizard",
                                                                             "Are you sure you want to reset the Wizard and start over?",
                                                                             "Ok",
@@ -31,6 +32,7 @@ public class WizardAsView : Scenario
                                        {
                                            Title = "Re_boot Server...",
                                            Action = () => MessageBox.Query (
+                                                                            ApplicationImpl.Instance,
                                                                             "Wizard",
                                                                             "Are you sure you want to reboot the server start over?",
                                                                             "Ok",
@@ -41,6 +43,7 @@ public class WizardAsView : Scenario
                                        {
                                            Title = "_Shutdown Server...",
                                            Action = () => MessageBox.Query (
+                                                                            ApplicationImpl.Instance,
                                                                             "Wizard",
                                                                             "Are you sure you want to cancel setup and shutdown?",
                                                                             "Ok",
@@ -80,13 +83,13 @@ public class WizardAsView : Scenario
         wizard.Finished += (s, args) =>
                            {
                                //args.Cancel = true;
-                               MessageBox.Query ("Setup Wizard", "Finished", "Ok");
+                               MessageBox.Query ((s as View)?.App, "Setup Wizard", "Finished", "Ok");
                                Application.RequestStop ();
                            };
 
         wizard.Cancelled += (s, args) =>
                             {
-                                int btn = MessageBox.Query ("Setup Wizard", "Are you sure you want to cancel?", "Yes", "No");
+                                int? btn = MessageBox.Query ((s as View)?.App, "Setup Wizard", "Are you sure you want to cancel?", "Yes", "No");
                                 args.Cancel = btn == 1;
 
                                 if (btn == 0)
@@ -123,7 +126,7 @@ public class WizardAsView : Scenario
                             {
                                 secondStep.Title = "2nd Step";
 
-                                MessageBox.Query (
+                                MessageBox.Query ((s as View)?.App,
                                                   "Wizard Scenario",
                                                   "This Wizard Step's title was changed to '2nd Step'",
                                                   "Ok"
diff --git a/Examples/UICatalog/Scenarios/Wizards.cs b/Examples/UICatalog/Scenarios/Wizards.cs
index 6263093a4..2f90c3420 100644
--- a/Examples/UICatalog/Scenarios/Wizards.cs
+++ b/Examples/UICatalog/Scenarios/Wizards.cs
@@ -1,13 +1,9 @@
-using System;
-using System.Linq;
-
-namespace UICatalog.Scenarios;
+namespace UICatalog.Scenarios;
 
 [ScenarioMetadata ("Wizards", "Demonstrates the Wizard class")]
 [ScenarioCategory ("Dialogs")]
 [ScenarioCategory ("Wizards")]
 [ScenarioCategory ("Runnable")]
-
 public class Wizards : Scenario
 {
     public override void Main ()
@@ -108,267 +104,277 @@ public class Wizards : Scenario
         };
 
         showWizardButton.Accepting += (s, e) =>
-                                   {
-                                       try
-                                       {
-                                           var width = 0;
-                                           int.TryParse (widthEdit.Text, out width);
-                                           var height = 0;
-                                           int.TryParse (heightEdit.Text, out height);
+                                      {
+                                          try
+                                          {
+                                              var width = 0;
+                                              int.TryParse (widthEdit.Text, out width);
+                                              var height = 0;
+                                              int.TryParse (heightEdit.Text, out height);
 
-                                           if (width < 1 || height < 1)
-                                           {
-                                               MessageBox.ErrorQuery (
-                                                                      "Nope",
-                                                                      "Height and width must be greater than 0 (much bigger)",
-                                                                      "Ok"
-                                                                     );
+                                              if (width < 1 || height < 1)
+                                              {
+                                                  MessageBox.ErrorQuery (
+                                                                         (s as View)?.App,
+                                                                         "Nope",
+                                                                         "Height and width must be greater than 0 (much bigger)",
+                                                                         "Ok"
+                                                                        );
 
-                                               return;
-                                           }
+                                                  return;
+                                              }
 
-                                           actionLabel.Text = string.Empty;
+                                              actionLabel.Text = string.Empty;
 
-                                           var wizard = new Wizard { Title = titleEdit.Text, Width = width, Height = height };
+                                              var wizard = new Wizard { Title = titleEdit.Text, Width = width, Height = height };
 
-                                           wizard.MovingBack += (s, args) =>
-                                                                {
-                                                                    //args.Cancel = true;
-                                                                    actionLabel.Text = "Moving Back";
-                                                                };
+                                              wizard.MovingBack += (s, args) =>
+                                                                   {
+                                                                       //args.Cancel = true;
+                                                                       actionLabel.Text = "Moving Back";
+                                                                   };
 
-                                           wizard.MovingNext += (s, args) =>
-                                                                {
-                                                                    //args.Cancel = true;
-                                                                    actionLabel.Text = "Moving Next";
-                                                                };
+                                              wizard.MovingNext += (s, args) =>
+                                                                   {
+                                                                       //args.Cancel = true;
+                                                                       actionLabel.Text = "Moving Next";
+                                                                   };
 
-                                           wizard.Finished += (s, args) =>
-                                                              {
-                                                                  //args.Cancel = true;
-                                                                  actionLabel.Text = "Finished";
-                                                              };
+                                              wizard.Finished += (s, args) =>
+                                                                 {
+                                                                     //args.Cancel = true;
+                                                                     actionLabel.Text = "Finished";
+                                                                 };
 
-                                           wizard.Cancelled += (s, args) =>
-                                                               {
-                                                                   //args.Cancel = true;
-                                                                   actionLabel.Text = "Cancelled";
-                                                               };
-
-                                           // Add 1st step
-                                           var firstStep = new WizardStep { Title = "End User License Agreement" };
-                                           firstStep.NextButtonText = "Accept!";
-
-                                           firstStep.HelpText =
-                                               "This is the End User License Agreement.\n\n\n\n\n\nThis is a test of the emergency broadcast system. This is a test of the emergency broadcast system.\nThis is a test of the emergency broadcast system.\n\n\nThis is a test of the emergency broadcast system.\n\nThis is a test of the emergency broadcast system.\n\n\n\nThe end of the EULA.";
-
-                                           OptionSelector optionSelector = new ()
-                                           {
-                                               Labels = ["_One", "_Two", "_3"]
-                                           };
-                                           firstStep.Add (optionSelector);
-
-                                           wizard.AddStep (firstStep);
-
-                                           // Add 2nd step
-                                           var secondStep = new WizardStep { Title = "Second Step" };
-                                           wizard.AddStep (secondStep);
-
-                                           secondStep.HelpText =
-                                               "This is the help text for the Second Step.\n\nPress the button to change the Title.\n\nIf First Name is empty the step will prevent moving to the next step.";
-
-                                           var buttonLbl = new Label { Text = "Second Step Button: ", X = 1, Y = 1 };
-
-                                           var button = new Button
-                                           {
-                                               Text = "Press Me to Rename Step", X = Pos.Right (buttonLbl), Y = Pos.Top (buttonLbl)
-                                           };
-
-                                           OptionSelector optionSelecor2 = new ()
-                                           {
-                                               Labels = ["_A", "_B", "_C"],
-                                               Orientation = Orientation.Horizontal
-                                           };
-                                           secondStep.Add (optionSelecor2);
-
-                                           button.Accepting += (s, e) =>
-                                                            {
-                                                                secondStep.Title = "2nd Step";
-
-                                                                MessageBox.Query (
-                                                                                  "Wizard Scenario",
-                                                                                  "This Wizard Step's title was changed to '2nd Step'"
-                                                                                 );
-                                                            };
-                                           secondStep.Add (buttonLbl, button);
-                                           var lbl = new Label { Text = "First Name: ", X = 1, Y = Pos.Bottom (buttonLbl) };
-
-                                           var firstNameField =
-                                               new TextField { Text = "Number", Width = 30, X = Pos.Right (lbl), Y = Pos.Top (lbl) };
-                                           secondStep.Add (lbl, firstNameField);
-                                           lbl = new () { Text = "Last Name:  ", X = 1, Y = Pos.Bottom (lbl) };
-                                           var lastNameField = new TextField { Text = "Six", Width = 30, X = Pos.Right (lbl), Y = Pos.Top (lbl) };
-                                           secondStep.Add (lbl, lastNameField);
-
-                                           var thirdStepEnabledCeckBox = new CheckBox
-                                           {
-                                               Text = "Enable Step _3",
-                                               CheckedState = CheckState.UnChecked,
-                                               X = Pos.Left (lastNameField),
-                                               Y = Pos.Bottom (lastNameField)
-                                           };
-                                           secondStep.Add (thirdStepEnabledCeckBox);
-
-                                           // Add a frame 
-                                           var frame = new FrameView
-                                           {
-                                               X = 0,
-                                               Y = Pos.Bottom (thirdStepEnabledCeckBox) + 2,
-                                               Width = Dim.Fill (),
-                                               Height = 4,
-                                               Title = "A Broken Frame (by Depeche Mode)",
-                                               TabStop = TabBehavior.NoStop
-                                           };
-                                           frame.Add (new TextField { Text = "This is a TextField inside of the frame." });
-                                           secondStep.Add (frame);
-
-                                           wizard.StepChanging += (s, args) =>
+                                              wizard.Cancelled += (s, args) =>
                                                                   {
-                                                                      if (args.OldStep == secondStep && string.IsNullOrEmpty (firstNameField.Text))
-                                                                      {
-                                                                          args.Cancel = true;
-
-                                                                          int btn = MessageBox.ErrorQuery (
-                                                                               "Second Step",
-                                                                               "You must enter a First Name to continue",
-                                                                               "Ok"
-                                                                              );
-                                                                      }
+                                                                      //args.Cancel = true;
+                                                                      actionLabel.Text = "Cancelled";
                                                                   };
 
-                                           // Add 3rd (optional) step
-                                           var thirdStep = new WizardStep { Title = "Third Step (Optional)" };
-                                           wizard.AddStep (thirdStep);
+                                              // Add 1st step
+                                              var firstStep = new WizardStep { Title = "End User License Agreement" };
+                                              firstStep.NextButtonText = "Accept!";
 
-                                           thirdStep.HelpText =
-                                               "This is step is optional (WizardStep.Enabled = false). Enable it with the checkbox in Step 2.";
-                                           var step3Label = new Label { Text = "This step is optional.", X = 0, Y = 0 };
-                                           thirdStep.Add (step3Label);
-                                           var progLbl = new Label { Text = "Third Step ProgressBar: ", X = 1, Y = 10 };
+                                              firstStep.HelpText =
+                                                  "This is the End User License Agreement.\n\n\n\n\n\nThis is a test of the emergency broadcast system. This is a test of the emergency broadcast system.\nThis is a test of the emergency broadcast system.\n\n\nThis is a test of the emergency broadcast system.\n\nThis is a test of the emergency broadcast system.\n\n\n\nThe end of the EULA.";
 
-                                           var progressBar = new ProgressBar
-                                           {
-                                               X = Pos.Right (progLbl), Y = Pos.Top (progLbl), Width = 40, Fraction = 0.42F
-                                           };
-                                           thirdStep.Add (progLbl, progressBar);
-                                           thirdStep.Enabled = thirdStepEnabledCeckBox.CheckedState == CheckState.Checked;
-                                           thirdStepEnabledCeckBox.CheckedStateChanged += (s, e) => { thirdStep.Enabled = thirdStepEnabledCeckBox.CheckedState == CheckState.Checked; };
+                                              OptionSelector optionSelector = new ()
+                                              {
+                                                  Labels = ["_One", "_Two", "_3"]
+                                              };
+                                              firstStep.Add (optionSelector);
 
-                                           // Add 4th step
-                                           var fourthStep = new WizardStep { Title = "Step Four" };
-                                           wizard.AddStep (fourthStep);
+                                              wizard.AddStep (firstStep);
 
-                                           var someText = new TextView
-                                           {
-                                               Text =
-                                                   "This step (Step Four) shows how to show/hide the Help pane. The step contains this TextView (but it's hard to tell it's a TextView because of Issue #1800).",
-                                               X = 0,
-                                               Y = 0,
-                                               Width = Dim.Fill (),
-                                               WordWrap = true,
-                                               AllowsTab = false,
-                                               SchemeName = "Base"
-                                           };
+                                              // Add 2nd step
+                                              var secondStep = new WizardStep { Title = "Second Step" };
+                                              wizard.AddStep (secondStep);
 
-                                           someText.Height = Dim.Fill (
-                                                                       Dim.Func (
-                                                                                 v => someText.SuperView is { IsInitialized: true }
-                                                                                          ? someText.SuperView.SubViews
-                                                                                                    .First (view => view.Y.Has<PosAnchorEnd> (out _))
-                                                                                                    .Frame.Height
-                                                                                          : 1));
-                                           var help = "This is helpful.";
-                                           fourthStep.Add (someText);
+                                              secondStep.HelpText =
+                                                  "This is the help text for the Second Step.\n\nPress the button to change the Title.\n\nIf First Name is empty the step will prevent moving to the next step.";
 
-                                           var hideHelpBtn = new Button
-                                           {
-                                               Text = "Press me to show/hide help",
-                                               X = Pos.Center (),
-                                               Y = Pos.AnchorEnd ()
-                                           };
+                                              var buttonLbl = new Label { Text = "Second Step Button: ", X = 1, Y = 1 };
 
-                                           hideHelpBtn.Accepting += (s, e) =>
-                                                                 {
-                                                                     if (fourthStep.HelpText.Length > 0)
+                                              var button = new Button
+                                              {
+                                                  Text = "Press Me to Rename Step", X = Pos.Right (buttonLbl), Y = Pos.Top (buttonLbl)
+                                              };
+
+                                              OptionSelector optionSelecor2 = new ()
+                                              {
+                                                  Labels = ["_A", "_B", "_C"],
+                                                  Orientation = Orientation.Horizontal
+                                              };
+                                              secondStep.Add (optionSelecor2);
+
+                                              button.Accepting += (s, e) =>
+                                                                  {
+                                                                      secondStep.Title = "2nd Step";
+
+                                                                      MessageBox.Query (
+                                                                                        (s as View)?.App,
+                                                                                        "Wizard Scenario",
+                                                                                        "This Wizard Step's title was changed to '2nd Step'"
+                                                                                       );
+                                                                  };
+                                              secondStep.Add (buttonLbl, button);
+                                              var lbl = new Label { Text = "First Name: ", X = 1, Y = Pos.Bottom (buttonLbl) };
+
+                                              var firstNameField =
+                                                  new TextField { Text = "Number", Width = 30, X = Pos.Right (lbl), Y = Pos.Top (lbl) };
+                                              secondStep.Add (lbl, firstNameField);
+                                              lbl = new () { Text = "Last Name:  ", X = 1, Y = Pos.Bottom (lbl) };
+                                              var lastNameField = new TextField { Text = "Six", Width = 30, X = Pos.Right (lbl), Y = Pos.Top (lbl) };
+                                              secondStep.Add (lbl, lastNameField);
+
+                                              var thirdStepEnabledCeckBox = new CheckBox
+                                              {
+                                                  Text = "Enable Step _3",
+                                                  CheckedState = CheckState.UnChecked,
+                                                  X = Pos.Left (lastNameField),
+                                                  Y = Pos.Bottom (lastNameField)
+                                              };
+                                              secondStep.Add (thirdStepEnabledCeckBox);
+
+                                              // Add a frame 
+                                              var frame = new FrameView
+                                              {
+                                                  X = 0,
+                                                  Y = Pos.Bottom (thirdStepEnabledCeckBox) + 2,
+                                                  Width = Dim.Fill (),
+                                                  Height = 4,
+                                                  Title = "A Broken Frame (by Depeche Mode)",
+                                                  TabStop = TabBehavior.NoStop
+                                              };
+                                              frame.Add (new TextField { Text = "This is a TextField inside of the frame." });
+                                              secondStep.Add (frame);
+
+                                              wizard.StepChanging += (s, args) =>
                                                                      {
-                                                                         fourthStep.HelpText = string.Empty;
-                                                                     }
-                                                                     else
-                                                                     {
-                                                                         fourthStep.HelpText = help;
-                                                                     }
-                                                                 };
-                                           fourthStep.Add (hideHelpBtn);
-                                           fourthStep.NextButtonText = "_Go To Last Step";
-                                           //var scrollBar = new ScrollBarView (someText, true);
+                                                                         if (args.OldStep == secondStep && string.IsNullOrEmpty (firstNameField.Text))
+                                                                         {
+                                                                             args.Cancel = true;
 
-                                           //scrollBar.ChangedPosition += (s, e) =>
-                                           //                             {
-                                           //                                 someText.TopRow = scrollBar.Position;
+                                                                             int? btn = MessageBox.ErrorQuery (
+                                                                                  (s as View)?.App,
+                                                                                  "Second Step",
+                                                                                  "You must enter a First Name to continue",
+                                                                                  "Ok"
+                                                                                 );
+                                                                         }
+                                                                     };
 
-                                           //                                 if (someText.TopRow != scrollBar.Position)
-                                           //                                 {
-                                           //                                     scrollBar.Position = someText.TopRow;
-                                           //                                 }
+                                              // Add 3rd (optional) step
+                                              var thirdStep = new WizardStep { Title = "Third Step (Optional)" };
+                                              wizard.AddStep (thirdStep);
 
-                                           //                                 someText.SetNeedsDraw ();
-                                           //                             };
+                                              thirdStep.HelpText =
+                                                  "This is step is optional (WizardStep.Enabled = false). Enable it with the checkbox in Step 2.";
+                                              var step3Label = new Label { Text = "This step is optional.", X = 0, Y = 0 };
+                                              thirdStep.Add (step3Label);
+                                              var progLbl = new Label { Text = "Third Step ProgressBar: ", X = 1, Y = 10 };
 
-                                           //someText.DrawingContent += (s, e) =>
-                                           //                        {
-                                           //                            scrollBar.Size = someText.Lines;
-                                           //                            scrollBar.Position = someText.TopRow;
+                                              var progressBar = new ProgressBar
+                                              {
+                                                  X = Pos.Right (progLbl), Y = Pos.Top (progLbl), Width = 40, Fraction = 0.42F
+                                              };
+                                              thirdStep.Add (progLbl, progressBar);
+                                              thirdStep.Enabled = thirdStepEnabledCeckBox.CheckedState == CheckState.Checked;
 
-                                           //                            if (scrollBar.OtherScrollBarView != null)
-                                           //                            {
-                                           //                                scrollBar.OtherScrollBarView.Size = someText.Maxlength;
-                                           //                                scrollBar.OtherScrollBarView.Position = someText.LeftColumn;
-                                           //                            }
-                                           //                        };
-                                           //fourthStep.Add (scrollBar);
+                                              thirdStepEnabledCeckBox.CheckedStateChanged += (s, e) =>
+                                                                                             {
+                                                                                                 thirdStep.Enabled =
+                                                                                                     thirdStepEnabledCeckBox.CheckedState == CheckState.Checked;
+                                                                                             };
 
-                                           // Add last step
-                                           var lastStep = new WizardStep { Title = "The last step" };
-                                           wizard.AddStep (lastStep);
+                                              // Add 4th step
+                                              var fourthStep = new WizardStep { Title = "Step Four" };
+                                              wizard.AddStep (fourthStep);
 
-                                           lastStep.HelpText =
-                                               "The wizard is complete!\n\nPress the Finish button to continue.\n\nPressing ESC will cancel the wizard.";
+                                              var someText = new TextView
+                                              {
+                                                  Text =
+                                                      "This step (Step Four) shows how to show/hide the Help pane. The step contains this TextView (but it's hard to tell it's a TextView because of Issue #1800).",
+                                                  X = 0,
+                                                  Y = 0,
+                                                  Width = Dim.Fill (),
+                                                  WordWrap = true,
+                                                  AllowsTab = false,
+                                                  SchemeName = "Base"
+                                              };
 
-                                           var finalFinalStepEnabledCeckBox =
-                                               new CheckBox { Text = "Enable _Final Final Step", CheckedState = CheckState.UnChecked, X = 0, Y = 1 };
-                                           lastStep.Add (finalFinalStepEnabledCeckBox);
+                                              someText.Height = Dim.Fill (
+                                                                          Dim.Func (v => someText.SuperView is { IsInitialized: true }
+                                                                                             ? someText.SuperView.SubViews
+                                                                                                       .First (view => view.Y.Has<PosAnchorEnd> (out _))
+                                                                                                       .Frame.Height
+                                                                                             : 1));
+                                              var help = "This is helpful.";
+                                              fourthStep.Add (someText);
 
-                                           // Add an optional FINAL last step
-                                           var finalFinalStep = new WizardStep { Title = "The VERY last step" };
-                                           wizard.AddStep (finalFinalStep);
+                                              var hideHelpBtn = new Button
+                                              {
+                                                  Text = "Press me to show/hide help",
+                                                  X = Pos.Center (),
+                                                  Y = Pos.AnchorEnd ()
+                                              };
 
-                                           finalFinalStep.HelpText =
-                                               "This step only shows if it was enabled on the other last step.";
-                                           finalFinalStep.Enabled = thirdStepEnabledCeckBox.CheckedState == CheckState.Checked;
+                                              hideHelpBtn.Accepting += (s, e) =>
+                                                                       {
+                                                                           if (fourthStep.HelpText.Length > 0)
+                                                                           {
+                                                                               fourthStep.HelpText = string.Empty;
+                                                                           }
+                                                                           else
+                                                                           {
+                                                                               fourthStep.HelpText = help;
+                                                                           }
+                                                                       };
+                                              fourthStep.Add (hideHelpBtn);
+                                              fourthStep.NextButtonText = "_Go To Last Step";
 
-                                           finalFinalStepEnabledCeckBox.CheckedStateChanged += (s, e) =>
-                                                                                   {
-                                                                                       finalFinalStep.Enabled = finalFinalStepEnabledCeckBox.CheckedState == CheckState.Checked;
-                                                                                   };
+                                              //var scrollBar = new ScrollBarView (someText, true);
 
-                                           Application.Run (wizard);
-                                           wizard.Dispose ();
-                                       }
-                                       catch (FormatException)
-                                       {
-                                           actionLabel.Text = "Invalid Options";
-                                       }
-                                   };
+                                              //scrollBar.ChangedPosition += (s, e) =>
+                                              //                             {
+                                              //                                 someText.TopRow = scrollBar.Position;
+
+                                              //                                 if (someText.TopRow != scrollBar.Position)
+                                              //                                 {
+                                              //                                     scrollBar.Position = someText.TopRow;
+                                              //                                 }
+
+                                              //                                 someText.SetNeedsDraw ();
+                                              //                             };
+
+                                              //someText.DrawingContent += (s, e) =>
+                                              //                        {
+                                              //                            scrollBar.Size = someText.Lines;
+                                              //                            scrollBar.Position = someText.TopRow;
+
+                                              //                            if (scrollBar.OtherScrollBarView != null)
+                                              //                            {
+                                              //                                scrollBar.OtherScrollBarView.Size = someText.Maxlength;
+                                              //                                scrollBar.OtherScrollBarView.Position = someText.LeftColumn;
+                                              //                            }
+                                              //                        };
+                                              //fourthStep.Add (scrollBar);
+
+                                              // Add last step
+                                              var lastStep = new WizardStep { Title = "The last step" };
+                                              wizard.AddStep (lastStep);
+
+                                              lastStep.HelpText =
+                                                  "The wizard is complete!\n\nPress the Finish button to continue.\n\nPressing ESC will cancel the wizard.";
+
+                                              var finalFinalStepEnabledCeckBox =
+                                                  new CheckBox { Text = "Enable _Final Final Step", CheckedState = CheckState.UnChecked, X = 0, Y = 1 };
+                                              lastStep.Add (finalFinalStepEnabledCeckBox);
+
+                                              // Add an optional FINAL last step
+                                              var finalFinalStep = new WizardStep { Title = "The VERY last step" };
+                                              wizard.AddStep (finalFinalStep);
+
+                                              finalFinalStep.HelpText =
+                                                  "This step only shows if it was enabled on the other last step.";
+                                              finalFinalStep.Enabled = thirdStepEnabledCeckBox.CheckedState == CheckState.Checked;
+
+                                              finalFinalStepEnabledCeckBox.CheckedStateChanged += (s, e) =>
+                                                                                                  {
+                                                                                                      finalFinalStep.Enabled =
+                                                                                                          finalFinalStepEnabledCeckBox.CheckedState
+                                                                                                          == CheckState.Checked;
+                                                                                                  };
+
+                                              Application.Run (wizard);
+                                              wizard.Dispose ();
+                                          }
+                                          catch (FormatException)
+                                          {
+                                              actionLabel.Text = "Invalid Options";
+                                          }
+                                      };
         win.Add (showWizardButton);
 
         Application.Run (win);
@@ -376,8 +382,5 @@ public class Wizards : Scenario
         Application.Shutdown ();
     }
 
-    private void Wizard_StepChanged (object sender, StepChangeEventArgs e)
-    {
-        throw new NotImplementedException ();
-    }
+    private void Wizard_StepChanged (object sender, StepChangeEventArgs e) { throw new NotImplementedException (); }
 }
diff --git a/Examples/UICatalog/UICatalogTop.cs b/Examples/UICatalog/UICatalogTop.cs
index d02a73919..0b46293bc 100644
--- a/Examples/UICatalog/UICatalogTop.cs
+++ b/Examples/UICatalog/UICatalogTop.cs
@@ -144,6 +144,7 @@ public class UICatalogTop : Toplevel
                                                               "_About...",
                                                               "About UI Catalog",
                                                               () => MessageBox.Query (
+                                                                                      App,
                                                                                       "",
                                                                                       GetAboutBoxMessage (),
                                                                                       wrapMessage: false,
diff --git a/Terminal.Gui/App/Application.Clipboard.cs b/Terminal.Gui/App/Application.Clipboard.cs
new file mode 100644
index 000000000..22cc85907
--- /dev/null
+++ b/Terminal.Gui/App/Application.Clipboard.cs
@@ -0,0 +1,15 @@
+namespace Terminal.Gui.App;
+
+public static partial class Application // Clipboard handling
+{
+    /// <summary>
+    ///     Gets the clipboard for the application.
+    /// </summary>
+    /// <remarks>
+    ///     <para>
+    ///         Provides access to the OS clipboard through the driver.
+    ///     </para>
+    /// </remarks>
+    [Obsolete ("The legacy static Application object is going away. Use IApplication.Clipboard instead.")]
+    public static IClipboard? Clipboard => ApplicationImpl.Instance.Clipboard;
+}
diff --git a/Terminal.Gui/App/Application.Driver.cs b/Terminal.Gui/App/Application.Driver.cs
index 635ff854b..427ba4de5 100644
--- a/Terminal.Gui/App/Application.Driver.cs
+++ b/Terminal.Gui/App/Application.Driver.cs
@@ -13,38 +13,44 @@ public static partial class Application // Driver abstractions
         internal set => ApplicationImpl.Instance.Driver = value;
     }
 
+    private static bool _force16Colors = false; // Resources/config.json overrides
+
     /// <inheritdoc cref="IApplication.Force16Colors"/>
     [ConfigurationProperty (Scope = typeof (SettingsScope))]
     [Obsolete ("The legacy static Application object is going away.")]
     public static bool Force16Colors
     {
-        get => ApplicationImpl.Instance.Force16Colors;
-        set => ApplicationImpl.Instance.Force16Colors = value;
+        get => _force16Colors;
+        set
+        {
+            bool oldValue = _force16Colors;
+            _force16Colors = value;
+            Force16ColorsChanged?.Invoke (null, new ValueChangedEventArgs<bool> (oldValue, _force16Colors));
+        }
     }
 
+    /// <summary>Raised when <see cref="Force16Colors"/> changes.</summary>
+    public static event EventHandler<ValueChangedEventArgs<bool>>? Force16ColorsChanged;
+
+    private static string _forceDriver = string.Empty; // Resources/config.json overrides
+
     /// <inheritdoc cref="IApplication.ForceDriver"/>
     [ConfigurationProperty (Scope = typeof (SettingsScope))]
     [Obsolete ("The legacy static Application object is going away.")]
     public static string ForceDriver
     {
-        get => ApplicationImpl.Instance.ForceDriver;
+        get => _forceDriver;
         set
         {
-            if (!string.IsNullOrEmpty (ApplicationImpl.Instance.ForceDriver) && value != Driver?.GetName ())
-            {
-                // ForceDriver cannot be changed if it has a valid value
-                return;
-            }
-
-            if (ApplicationImpl.Instance.Initialized && value != Driver?.GetName ())
-            {
-                throw new InvalidOperationException ($"The {nameof (ForceDriver)} can only be set before initialized.");
-            }
-
-            ApplicationImpl.Instance.ForceDriver = value;
+            string oldValue = _forceDriver;
+            _forceDriver = value;
+            ForceDriverChanged?.Invoke (null, new ValueChangedEventArgs<string> (oldValue, _forceDriver));
         }
     }
 
+    /// <summary>Raised when <see cref="ForceDriver"/> changes.</summary>
+    public static event EventHandler<ValueChangedEventArgs<string>>? ForceDriverChanged;
+
     /// <inheritdoc cref="IApplication.Sixel"/>
     [Obsolete ("The legacy static Application object is going away.")] 
     public static List<SixelToRender> Sixel => ApplicationImpl.Instance.Sixel;
diff --git a/Terminal.Gui/App/Application.Lifecycle.cs b/Terminal.Gui/App/Application.Lifecycle.cs
index 802ba7a53..c3c3cdf16 100644
--- a/Terminal.Gui/App/Application.Lifecycle.cs
+++ b/Terminal.Gui/App/Application.Lifecycle.cs
@@ -18,7 +18,15 @@ public static partial class Application // Lifecycle (Init/Shutdown)
     ///     <see cref="IApplication"/> instance for all subsequent application operations.
     /// </remarks>
     /// <returns>A new <see cref="IApplication"/> instance.</returns>
-    public static IApplication Create () { return new ApplicationImpl (); }
+    /// <exception cref="InvalidOperationException">
+    ///     Thrown if the legacy static Application model has already been used in this process.
+    /// </exception>
+    public static IApplication Create ()
+    {
+        ApplicationImpl.MarkInstanceBasedModelUsed ();
+
+        return new ApplicationImpl ();
+    }
 
     /// <inheritdoc cref="IApplication.Init"/>
     [RequiresUnreferencedCode ("AOT")]
@@ -26,6 +34,7 @@ public static partial class Application // Lifecycle (Init/Shutdown)
     [Obsolete ("The legacy static Application object is going away.")]
     public static void Init (string? driverName = null)
     {
+        //Debug.Fail ("Application.Init() called - parallelizable tests should not use legacy static Application model");
         ApplicationImpl.Instance.Init (driverName ?? ForceDriver);
     }
 
@@ -35,8 +44,8 @@ public static partial class Application // Lifecycle (Init/Shutdown)
     [Obsolete ("The legacy static Application object is going away.")]
     public static int? MainThreadId
     {
-        get => ((ApplicationImpl)ApplicationImpl.Instance).MainThreadId;
-        set => ((ApplicationImpl)ApplicationImpl.Instance).MainThreadId = value;
+        get => ApplicationImpl.Instance.MainThreadId;
+        internal set => ApplicationImpl.Instance.MainThreadId = value;
     }
 
     /// <inheritdoc cref="IApplication.Shutdown"/>
@@ -65,5 +74,9 @@ public static partial class Application // Lifecycle (Init/Shutdown)
     // guaranteeing that the state of this singleton is deterministic when Init
     // starts running and after Shutdown returns.
     [Obsolete ("The legacy static Application object is going away.")]
-    internal static void ResetState (bool ignoreDisposed = false) => ApplicationImpl.Instance?.ResetState (ignoreDisposed);
+    internal static void ResetState (bool ignoreDisposed = false)
+    {
+        // Use the static reset method to bypass the fence check
+        ApplicationImpl.ResetStateStatic (ignoreDisposed);
+    }
 }
diff --git a/Terminal.Gui/App/Application.Mouse.cs b/Terminal.Gui/App/Application.Mouse.cs
index 5e6ec118f..2ea9bb650 100644
--- a/Terminal.Gui/App/Application.Mouse.cs
+++ b/Terminal.Gui/App/Application.Mouse.cs
@@ -4,15 +4,25 @@ namespace Terminal.Gui.App;
 
 public static partial class Application // Mouse handling
 {
+    private static bool _isMouseDisabled = false; // Resources/config.json overrides
+
     /// <summary>Disable or enable the mouse. The mouse is enabled by default.</summary>
     [ConfigurationProperty (Scope = typeof (SettingsScope))]
     [Obsolete ("The legacy static Application object is going away.")]
     public static bool IsMouseDisabled
     {
-        get => Mouse.IsMouseDisabled;
-        set => Mouse.IsMouseDisabled = value;
+        get => _isMouseDisabled;
+        set
+        {
+            bool oldValue = _isMouseDisabled;
+            _isMouseDisabled = value;
+            IsMouseDisabledChanged?.Invoke (null, new ValueChangedEventArgs<bool> (oldValue, _isMouseDisabled));
+        }
     }
 
+    /// <summary>Raised when <see cref="IsMouseDisabled"/> changes.</summary>
+    public static event EventHandler<ValueChangedEventArgs<bool>>? IsMouseDisabledChanged;
+
     /// <summary>
     ///     Gets the <see cref="IMouse"/> instance that manages mouse event handling and state.
     /// </summary>
diff --git a/Terminal.Gui/App/Application.Navigation.cs b/Terminal.Gui/App/Application.Navigation.cs
index b1053ae42..031ebac1c 100644
--- a/Terminal.Gui/App/Application.Navigation.cs
+++ b/Terminal.Gui/App/Application.Navigation.cs
@@ -13,22 +13,42 @@ public static partial class Application // Navigation stuff
         internal set => ApplicationImpl.Instance.Navigation = value;
     }
 
+    private static Key _nextTabGroupKey = Key.F6; // Resources/config.json overrides
+
     /// <summary>Alternative key to navigate forwards through views. Ctrl+Tab is the primary key.</summary>
     [ConfigurationProperty (Scope = typeof (SettingsScope))]
-      [Obsolete ("The legacy static Application object is going away.")]public static Key NextTabGroupKey
+    public static Key NextTabGroupKey
     {
-        get => ApplicationImpl.Instance.Keyboard.NextTabGroupKey;
-        set => ApplicationImpl.Instance.Keyboard.NextTabGroupKey = value;
+        get => _nextTabGroupKey;
+        set
+        {
+            Key oldValue = _nextTabGroupKey;
+            _nextTabGroupKey = value;
+            NextTabGroupKeyChanged?.Invoke (null, new ValueChangedEventArgs<Key> (oldValue, _nextTabGroupKey));
+        }
     }
 
+    /// <summary>Raised when <see cref="NextTabGroupKey"/> changes.</summary>
+    public static event EventHandler<ValueChangedEventArgs<Key>>? NextTabGroupKeyChanged;
+
+    private static Key _nextTabKey = Key.Tab; // Resources/config.json overrides
+
     /// <summary>Alternative key to navigate forwards through views. Tab is the primary key.</summary>
     [ConfigurationProperty (Scope = typeof (SettingsScope))]
     public static Key NextTabKey
     {
-        get => ApplicationImpl.Instance.Keyboard.NextTabKey;
-        set => ApplicationImpl.Instance.Keyboard.NextTabKey = value;
+        get => _nextTabKey;
+        set
+        {
+            Key oldValue = _nextTabKey;
+            _nextTabKey = value;
+            NextTabKeyChanged?.Invoke (null, new ValueChangedEventArgs<Key> (oldValue, _nextTabKey));
+        }
     }
 
+    /// <summary>Raised when <see cref="NextTabKey"/> changes.</summary>
+    public static event EventHandler<ValueChangedEventArgs<Key>>? NextTabKeyChanged;
+
     /// <summary>
     ///     Raised when the user releases a key.
     ///     <para>
@@ -48,19 +68,39 @@ public static partial class Application // Navigation stuff
         remove => ApplicationImpl.Instance.Keyboard.KeyUp -= value;
     }
 
+    private static Key _prevTabGroupKey = Key.F6.WithShift; // Resources/config.json overrides
+
     /// <summary>Alternative key to navigate backwards through views. Shift+Ctrl+Tab is the primary key.</summary>
     [ConfigurationProperty (Scope = typeof (SettingsScope))]
     public static Key PrevTabGroupKey
     {
-        get => ApplicationImpl.Instance.Keyboard.PrevTabGroupKey;
-        set => ApplicationImpl.Instance.Keyboard.PrevTabGroupKey = value;
+        get => _prevTabGroupKey;
+        set
+        {
+            Key oldValue = _prevTabGroupKey;
+            _prevTabGroupKey = value;
+            PrevTabGroupKeyChanged?.Invoke (null, new ValueChangedEventArgs<Key> (oldValue, _prevTabGroupKey));
+        }
     }
 
+    /// <summary>Raised when <see cref="PrevTabGroupKey"/> changes.</summary>
+    public static event EventHandler<ValueChangedEventArgs<Key>>? PrevTabGroupKeyChanged;
+
+    private static Key _prevTabKey = Key.Tab.WithShift; // Resources/config.json overrides
+
     /// <summary>Alternative key to navigate backwards through views. Shift+Tab is the primary key.</summary>
     [ConfigurationProperty (Scope = typeof (SettingsScope))]
     public static Key PrevTabKey
     {
-        get => ApplicationImpl.Instance.Keyboard.PrevTabKey;
-        set => ApplicationImpl.Instance.Keyboard.PrevTabKey = value;
+        get => _prevTabKey;
+        set
+        {
+            Key oldValue = _prevTabKey;
+            _prevTabKey = value;
+            PrevTabKeyChanged?.Invoke (null, new ValueChangedEventArgs<Key> (oldValue, _prevTabKey));
+        }
     }
+
+    /// <summary>Raised when <see cref="PrevTabKey"/> changes.</summary>
+    public static event EventHandler<ValueChangedEventArgs<Key>>? PrevTabKeyChanged;
 }
diff --git a/Terminal.Gui/App/Application.Run.cs b/Terminal.Gui/App/Application.Run.cs
index 9e6b2e064..81cea2171 100644
--- a/Terminal.Gui/App/Application.Run.cs
+++ b/Terminal.Gui/App/Application.Run.cs
@@ -4,22 +4,42 @@ namespace Terminal.Gui.App;
 
 public static partial class Application // Run (Begin -> Run -> Layout/Draw -> End -> Stop)
 {
+    private static Key _quitKey = Key.Esc; // Resources/config.json overrides
+
     /// <summary>Gets or sets the key to quit the application.</summary>
     [ConfigurationProperty (Scope = typeof (SettingsScope))]
     public static Key QuitKey
     {
-        get => ApplicationImpl.Instance.Keyboard.QuitKey;
-        set => ApplicationImpl.Instance.Keyboard.QuitKey = value;
+        get => _quitKey;
+        set
+        {
+            Key oldValue = _quitKey;
+            _quitKey = value;
+            QuitKeyChanged?.Invoke (null, new ValueChangedEventArgs<Key> (oldValue, _quitKey));
+        }
     }
 
+    /// <summary>Raised when <see cref="QuitKey"/> changes.</summary>
+    public static event EventHandler<ValueChangedEventArgs<Key>>? QuitKeyChanged;
+
+    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>
     [ConfigurationProperty (Scope = typeof (SettingsScope))]
     public static Key ArrangeKey
     {
-        get => ApplicationImpl.Instance.Keyboard.ArrangeKey;
-        set => ApplicationImpl.Instance.Keyboard.ArrangeKey = value;
+        get => _arrangeKey;
+        set
+        {
+            Key oldValue = _arrangeKey;
+            _arrangeKey = value;
+            ArrangeKeyChanged?.Invoke (null, new ValueChangedEventArgs<Key> (oldValue, _arrangeKey));
+        }
     }
 
+    /// <summary>Raised when <see cref="ArrangeKey"/> changes.</summary>
+    public static event EventHandler<ValueChangedEventArgs<Key>>? ArrangeKeyChanged;
+
     /// <inheritdoc cref="IApplication.Begin(IRunnable)"/>
     [Obsolete ("The legacy static Application object is going away.")]
     public static SessionToken Begin (Toplevel toplevel) => ApplicationImpl.Instance.Begin (toplevel);
@@ -88,7 +108,7 @@ public static partial class Application // Run (Begin -> Run -> Layout/Draw -> E
 
     /// <inheritdoc cref="IApplication.Iteration"/>
     [Obsolete ("The legacy static Application object is going away.")]
-    public static event EventHandler<IterationEventArgs>? Iteration
+    public static event EventHandler<EventArgs<IApplication?>>? Iteration
     {
         add => ApplicationImpl.Instance.Iteration += value;
         remove => ApplicationImpl.Instance.Iteration -= value;
diff --git a/Terminal.Gui/App/Application.Current.cs b/Terminal.Gui/App/Application.TopRunnable.cs
similarity index 91%
rename from Terminal.Gui/App/Application.Current.cs
rename to Terminal.Gui/App/Application.TopRunnable.cs
index 1b91a45ff..85a25cd06 100644
--- a/Terminal.Gui/App/Application.Current.cs
+++ b/Terminal.Gui/App/Application.TopRunnable.cs
@@ -2,7 +2,7 @@ using System.Collections.Concurrent;
 
 namespace Terminal.Gui.App;
 
-public static partial class Application // Current handling
+public static partial class Application // TopRunnable handling
 {
     /// <inheritdoc cref="IApplication.SessionStack"/>
     [Obsolete ("The legacy static Application object is going away.")] public static ConcurrentStack<Toplevel> SessionStack => ApplicationImpl.Instance.SessionStack;
diff --git a/Terminal.Gui/App/ApplicationImpl.Lifecycle.cs b/Terminal.Gui/App/ApplicationImpl.Lifecycle.cs
index ed1e98741..e0a7390b7 100644
--- a/Terminal.Gui/App/ApplicationImpl.Lifecycle.cs
+++ b/Terminal.Gui/App/ApplicationImpl.Lifecycle.cs
@@ -1,10 +1,14 @@
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
 
 namespace Terminal.Gui.App;
 
 public partial class ApplicationImpl
 {
+    /// <inheritdoc />
+    public int? MainThreadId { get; set; }
+
     /// <inheritdoc/>
     public bool Initialized { get; set; }
 
@@ -23,6 +27,29 @@ public partial class ApplicationImpl
             throw new InvalidOperationException ("Init called multiple times without Shutdown");
         }
 
+        // Thread-safe fence check: Ensure we're not mixing application models
+        // Use lock to make check-and-set atomic
+        lock (_modelUsageLock)
+        {
+            // If this is a legacy static instance and instance-based model was used, throw
+            if (this == _instance && ModelUsage == ApplicationModelUsage.InstanceBased)
+            {
+                throw new InvalidOperationException (ERROR_LEGACY_AFTER_MODERN);
+            }
+
+            // If this is an instance-based instance and legacy static model was used, throw
+            if (this != _instance && ModelUsage == ApplicationModelUsage.LegacyStatic)
+            {
+                throw new InvalidOperationException (ERROR_MODERN_AFTER_LEGACY);
+            }
+
+            // If no model has been set yet, set it now based on which instance this is
+            if (ModelUsage == ApplicationModelUsage.None)
+            {
+                ModelUsage = this == _instance ? ApplicationModelUsage.LegacyStatic : ApplicationModelUsage.InstanceBased;
+            }
+        }
+
         if (!string.IsNullOrWhiteSpace (driverName))
         {
             _driverName = driverName;
@@ -41,26 +68,24 @@ public partial class ApplicationImpl
 
         // Preserve existing keyboard settings if they exist
         bool hasExistingKeyboard = _keyboard is { };
-        Key existingQuitKey = _keyboard?.QuitKey ?? Key.Esc;
-        Key existingArrangeKey = _keyboard?.ArrangeKey ?? Key.F5.WithCtrl;
-        Key existingNextTabKey = _keyboard?.NextTabKey ?? Key.Tab;
-        Key existingPrevTabKey = _keyboard?.PrevTabKey ?? Key.Tab.WithShift;
-        Key existingNextTabGroupKey = _keyboard?.NextTabGroupKey ?? Key.F6;
-        Key existingPrevTabGroupKey = _keyboard?.PrevTabGroupKey ?? Key.F6.WithShift;
+        Key existingQuitKey = _keyboard?.QuitKey ?? Application.QuitKey;
+        Key existingArrangeKey = _keyboard?.ArrangeKey ?? Application.ArrangeKey;
+        Key existingNextTabKey = _keyboard?.NextTabKey ?? Application.NextTabKey;
+        Key existingPrevTabKey = _keyboard?.PrevTabKey ?? Application.PrevTabKey;
+        Key existingNextTabGroupKey = _keyboard?.NextTabGroupKey ?? Application.NextTabGroupKey;
+        Key existingPrevTabGroupKey = _keyboard?.PrevTabGroupKey ?? Application.PrevTabGroupKey;
 
         // Reset keyboard to ensure fresh state with default bindings
         _keyboard = new KeyboardImpl { App = this };
 
-        // Restore previously set keys if they existed and were different from defaults
-        if (hasExistingKeyboard)
-        {
-            _keyboard.QuitKey = existingQuitKey;
-            _keyboard.ArrangeKey = existingArrangeKey;
-            _keyboard.NextTabKey = existingNextTabKey;
-            _keyboard.PrevTabKey = existingPrevTabKey;
-            _keyboard.NextTabGroupKey = existingNextTabGroupKey;
-            _keyboard.PrevTabGroupKey = existingPrevTabGroupKey;
-        }
+        // Sync keys from Application static properties (or existing keyboard if it had custom values)
+        // This ensures we respect any Application.QuitKey etc changes made before Init()
+        _keyboard.QuitKey = existingQuitKey;
+        _keyboard.ArrangeKey = existingArrangeKey;
+        _keyboard.NextTabKey = existingNextTabKey;
+        _keyboard.PrevTabKey = existingPrevTabKey;
+        _keyboard.NextTabGroupKey = existingNextTabGroupKey;
+        _keyboard.PrevTabGroupKey = existingPrevTabGroupKey;
 
         CreateDriver (_driverName);
         Screen = Driver!.Screen;
@@ -85,8 +110,8 @@ public partial class ApplicationImpl
         if (runnableToDispose is { })
         {
             // Extract the result using reflection to get the Result property value
-            var resultProperty = runnableToDispose.GetType().GetProperty("Result");
-            result = resultProperty?.GetValue(runnableToDispose);
+            PropertyInfo? resultProperty = runnableToDispose.GetType ().GetProperty ("Result");
+            result = resultProperty?.GetValue (runnableToDispose);
         }
 
         // Stop the coordinator if running
@@ -115,8 +140,9 @@ public partial class ApplicationImpl
         {
             if (runnableToDispose is IDisposable disposable)
             {
-                disposable.Dispose();
+                disposable.Dispose ();
             }
+
             FrameworkOwnedRunnable = null;
         }
 
@@ -140,36 +166,6 @@ public partial class ApplicationImpl
         return result;
     }
 
-#if DEBUG
-    /// <summary>
-    ///     DEBUG ONLY: Asserts that an event has no remaining subscribers.
-    /// </summary>
-    /// <param name="eventName">The name of the event for diagnostic purposes.</param>
-    /// <param name="eventDelegate">The event delegate to check.</param>
-    private static void AssertNoEventSubscribers (string eventName, Delegate? eventDelegate)
-    {
-        if (eventDelegate is null)
-        {
-            return;
-        }
-
-        Delegate [] subscribers = eventDelegate.GetInvocationList ();
-
-        if (subscribers.Length > 0)
-        {
-            string subscriberInfo = string.Join (
-                                                 ", ",
-                                                 subscribers.Select (d => $"{d.Method.DeclaringType?.Name}.{d.Method.Name}"
-                                                                    )
-                                                );
-
-            Debug.Fail (
-                        $"Application.{eventName} has {subscribers.Length} remaining subscriber(s) after Shutdown: {subscriberInfo}"
-                       );
-        }
-    }
-#endif
-
     /// <inheritdoc/>
     public void ResetState (bool ignoreDisposed = false)
     {
@@ -241,6 +237,17 @@ public partial class ApplicationImpl
         ClearScreenNextIteration = false;
 
         // === 6. Reset input systems ===
+        // Dispose keyboard and mouse to unsubscribe from events
+        if (_keyboard is IDisposable keyboardDisposable)
+        {
+            keyboardDisposable.Dispose ();
+        }
+
+        if (_mouse is IDisposable mouseDisposable)
+        {
+            mouseDisposable.Dispose ();
+        }
+
         // Mouse and Keyboard will be lazy-initialized on next access
         _mouse = null;
         _keyboard = null;
@@ -273,10 +280,57 @@ public partial class ApplicationImpl
         // gui.cs does no longer process any callbacks. See #1084 for more details:
         // (https://github.com/gui-cs/Terminal.Gui/issues/1084).
         SynchronizationContext.SetSynchronizationContext (null);
+
+        // === 12. Unsubscribe from Application static property change events ===
+        UnsubscribeApplicationEvents ();
     }
 
     /// <summary>
     ///     Raises the <see cref="InitializedChanged"/> event.
     /// </summary>
     internal void RaiseInitializedChanged (object sender, EventArgs<bool> e) { InitializedChanged?.Invoke (sender, e); }
+
+#if DEBUG
+    /// <summary>
+    ///     DEBUG ONLY: Asserts that an event has no remaining subscribers.
+    /// </summary>
+    /// <param name="eventName">The name of the event for diagnostic purposes.</param>
+    /// <param name="eventDelegate">The event delegate to check.</param>
+    private static void AssertNoEventSubscribers (string eventName, Delegate? eventDelegate)
+    {
+        if (eventDelegate is null)
+        {
+            return;
+        }
+
+        Delegate [] subscribers = eventDelegate.GetInvocationList ();
+
+        if (subscribers.Length > 0)
+        {
+            string subscriberInfo = string.Join (
+                                                 ", ",
+                                                 subscribers.Select (d => $"{d.Method.DeclaringType?.Name}.{d.Method.Name}"
+                                                                    )
+                                                );
+
+            Debug.Fail (
+                        $"Application.{eventName} has {subscribers.Length} remaining subscriber(s) after Shutdown: {subscriberInfo}"
+                       );
+        }
+    }
+#endif
+
+    // Event handlers for Application static property changes
+    private void OnForce16ColorsChanged (object? sender, ValueChangedEventArgs<bool> e) { Force16Colors = e.NewValue; }
+
+    private void OnForceDriverChanged (object? sender, ValueChangedEventArgs<string> e) { ForceDriver = e.NewValue; }
+
+    /// <summary>
+    ///     Unsubscribes from Application static property change events.
+    /// </summary>
+    private void UnsubscribeApplicationEvents ()
+    {
+        Application.Force16ColorsChanged -= OnForce16ColorsChanged;
+        Application.ForceDriverChanged -= OnForceDriverChanged;
+    }
 }
diff --git a/Terminal.Gui/App/ApplicationImpl.Run.cs b/Terminal.Gui/App/ApplicationImpl.Run.cs
index 944c64e09..e790e3ca0 100644
--- a/Terminal.Gui/App/ApplicationImpl.Run.cs
+++ b/Terminal.Gui/App/ApplicationImpl.Run.cs
@@ -5,15 +5,6 @@ namespace Terminal.Gui.App;
 
 public partial class ApplicationImpl
 {
-    /// <summary>
-    ///     INTERNAL: Gets or sets the managed thread ID of the application's main UI thread, which is set during
-    ///     <see cref="Init"/> and used to determine if code is executing on the main thread.
-    /// </summary>
-    /// <value>
-    ///     The managed thread ID of the main UI thread, or <see langword="null"/> if the application is not initialized.
-    /// </value>
-    internal int? MainThreadId { get; set; }
-
     #region Begin->Run->Stop->End
 
     // TODO: This API is not used anywhere; it can be deleted
@@ -156,11 +147,11 @@ public partial class ApplicationImpl
     /// <inheritdoc/>
     public void RaiseIteration ()
     {
-        Iteration?.Invoke (null, new ());
+        Iteration?.Invoke (null, new (this));
     }
 
     /// <inheritdoc/>
-    public event EventHandler<IterationEventArgs>? Iteration;
+    public event EventHandler<EventArgs<IApplication?>>? Iteration;
 
     /// <inheritdoc/>
     [RequiresUnreferencedCode ("AOT")]
diff --git a/Terminal.Gui/App/ApplicationImpl.cs b/Terminal.Gui/App/ApplicationImpl.cs
index 2dc54cbda..6e968d0d3 100644
--- a/Terminal.Gui/App/ApplicationImpl.cs
+++ b/Terminal.Gui/App/ApplicationImpl.cs
@@ -9,23 +9,72 @@ namespace Terminal.Gui.App;
 public partial class ApplicationImpl : IApplication
 {
     /// <summary>
-    ///     INTERNAL: Creates a new instance of the Application backend.
+    ///     INTERNAL: Creates a new instance of the Application backend and subscribes to Application configuration property
+    ///     events.
     /// </summary>
-    internal ApplicationImpl () { }
+    internal ApplicationImpl ()
+    {
+        // Subscribe to Application static property change events
+        Application.Force16ColorsChanged += OnForce16ColorsChanged;
+        Application.ForceDriverChanged += OnForceDriverChanged;
+    }
 
     /// <summary>
     ///     INTERNAL: Creates a new instance of the Application backend.
     /// </summary>
     /// <param name="componentFactory"></param>
-    internal ApplicationImpl (IComponentFactory componentFactory) { _componentFactory = componentFactory; }
+    internal ApplicationImpl (IComponentFactory componentFactory) : this () { _componentFactory = componentFactory; }
+
+    private string? _driverName;
+
+    #region Clipboard
+
+    /// <inheritdoc/>
+    public IClipboard? Clipboard => Driver?.Clipboard;
+
+    #endregion Clipboard
+
+    /// <inheritdoc/>
+    public new string ToString () => Driver?.ToString () ?? string.Empty;
 
     #region Singleton
 
+    /// <summary>
+    ///     Lock object for synchronizing access to ModelUsage and _instance.
+    /// </summary>
+    private static readonly object _modelUsageLock = new ();
+
+    /// <summary>
+    ///     Tracks which application model has been used in this process.
+    /// </summary>
+    public static ApplicationModelUsage ModelUsage { get; private set; } = ApplicationModelUsage.None;
+
+    /// <summary>
+    ///     Error message for when trying to use modern model after legacy static model.
+    /// </summary>
+    internal const string ERROR_MODERN_AFTER_LEGACY =
+        "Cannot use modern instance-based model (Application.Create) after using legacy static Application model (Application.Init/ApplicationImpl.Instance). "
+        + "Use only one model per process.";
+
+    /// <summary>
+    ///     Error message for when trying to use legacy static model after modern model.
+    /// </summary>
+    internal const string ERROR_LEGACY_AFTER_MODERN =
+        "Cannot use legacy static Application model (Application.Init/ApplicationImpl.Instance) after using modern instance-based model (Application.Create). "
+        + "Use only one model per process.";
+
     /// <summary>
     ///     Configures the singleton instance of <see cref="Application"/> to use the specified backend implementation.
     /// </summary>
     /// <param name="app"></param>
-    public static void SetInstance (IApplication? app) { _instance = app; }
+    public static void SetInstance (IApplication? app)
+    {
+        lock (_modelUsageLock)
+        {
+            ModelUsage = ApplicationModelUsage.LegacyStatic;
+            _instance = app;
+        }
+    }
 
     // Private static readonly Lazy instance of Application
     private static IApplication? _instance;
@@ -33,12 +82,92 @@ public partial class ApplicationImpl : IApplication
     /// <summary>
     ///     Gets the currently configured backend implementation of <see cref="Application"/> gateway methods.
     /// </summary>
-    public static IApplication Instance => _instance ??= new ApplicationImpl ();
+    public static IApplication Instance
+    {
+        get
+        {
+            //Debug.Fail ("ApplicationImpl.Instance accessed - parallelizable tests should not use legacy static Application model");
+
+            // Thread-safe: Use lock to make check-and-create atomic
+            lock (_modelUsageLock)
+            {
+                // If an instance already exists, return it without fence checking
+                // This allows for cleanup/reset operations
+                if (_instance is { })
+                {
+                    return _instance;
+                }
+
+                // Check if the instance-based model has already been used
+                if (ModelUsage == ApplicationModelUsage.InstanceBased)
+                {
+                    throw new InvalidOperationException (ERROR_LEGACY_AFTER_MODERN);
+                }
+
+                // Mark the usage and create the instance
+                ModelUsage = ApplicationModelUsage.LegacyStatic;
+
+                return _instance = new ApplicationImpl ();
+            }
+        }
+    }
+
+    /// <summary>
+    ///     INTERNAL: Marks that the instance-based model has been used. Called by Application.Create().
+    /// </summary>
+    internal static void MarkInstanceBasedModelUsed ()
+    {
+        lock (_modelUsageLock)
+        {
+            // Check if the legacy static model has already been initialized
+            if (ModelUsage == ApplicationModelUsage.LegacyStatic && _instance?.Initialized == true)
+            {
+                throw new InvalidOperationException (ERROR_MODERN_AFTER_LEGACY);
+            }
+
+            ModelUsage = ApplicationModelUsage.InstanceBased;
+        }
+    }
+
+    /// <summary>
+    ///     INTERNAL: Resets the model usage tracking. Only for testing purposes.
+    /// </summary>
+    internal static void ResetModelUsageTracking ()
+    {
+        lock (_modelUsageLock)
+        {
+            ModelUsage = ApplicationModelUsage.None;
+            _instance = null;
+        }
+    }
+
+    /// <summary>
+    ///     INTERNAL: Resets state without going through the fence-checked Instance property.
+    ///     Used by Application.ResetState() to allow cleanup regardless of which model was used.
+    /// </summary>
+    internal static void ResetStateStatic (bool ignoreDisposed = false)
+    {
+        // If an instance exists, reset it
+        _instance?.ResetState (ignoreDisposed);
+
+        // Reset Application static properties to their defaults
+        // This ensures tests start with clean state
+        Application.ForceDriver = string.Empty;
+        Application.Force16Colors = false;
+        Application.IsMouseDisabled = false;
+        Application.QuitKey = Key.Esc;
+        Application.ArrangeKey = Key.F5.WithCtrl;
+        Application.NextTabGroupKey = Key.F6;
+        Application.NextTabKey = Key.Tab;
+        Application.PrevTabGroupKey = Key.F6.WithShift;
+        Application.PrevTabKey = Key.Tab.WithShift;
+
+        // Always reset the model tracking to allow tests to use either model after reset
+        ResetModelUsageTracking ();
+    }
 
     #endregion Singleton
 
-    private string? _driverName;
-
     #region Input
 
     private IMouse? _mouse;
@@ -122,8 +251,6 @@ public partial class ApplicationImpl : IApplication
         }
     }
 
-    // BUGBUG: Technically, this is not the full lst of sessions. There be dragons here, e.g. see how Toplevel.Id is used. What
-
     /// <inheritdoc/>
     public ConcurrentStack<Toplevel> SessionStack { get; } = new ();
 
@@ -137,7 +264,4 @@ public partial class ApplicationImpl : IApplication
     public IRunnable? FrameworkOwnedRunnable { get; set; }
 
     #endregion View Management
-
-    /// <inheritdoc/>
-    public new string ToString () => Driver?.ToString () ?? string.Empty;
 }
diff --git a/Terminal.Gui/App/ApplicationModelUsage.cs b/Terminal.Gui/App/ApplicationModelUsage.cs
new file mode 100644
index 000000000..909291d70
--- /dev/null
+++ b/Terminal.Gui/App/ApplicationModelUsage.cs
@@ -0,0 +1,16 @@
+namespace Terminal.Gui.App;
+
+/// <summary>
+///     Defines the different application usage models.
+/// </summary>
+public enum ApplicationModelUsage
+{
+    /// <summary>No model has been used yet.</summary>
+    None,
+
+    /// <summary>Legacy static model (Application.Init/ApplicationImpl.Instance).</summary>
+    LegacyStatic,
+
+    /// <summary>Modern instance-based model (Application.Create).</summary>
+    InstanceBased
+}
diff --git a/Terminal.Gui/App/ApplicationNavigation.cs b/Terminal.Gui/App/ApplicationNavigation.cs
index 1149c3ad6..6012d4629 100644
--- a/Terminal.Gui/App/ApplicationNavigation.cs
+++ b/Terminal.Gui/App/ApplicationNavigation.cs
@@ -13,7 +13,7 @@ public class ApplicationNavigation
     /// </summary>
     public ApplicationNavigation ()
     {
-        // TODO: Move navigation key bindings here from AddApplicationKeyBindings
+        // TODO: Move navigation key bindings here from KeyboardImpl
     }
 
     /// <summary>
diff --git a/Terminal.Gui/App/ApplicationRunnableExtensions.cs b/Terminal.Gui/App/ApplicationRunnableExtensions.cs
index 7e706e9d5..3eb03c081 100644
--- a/Terminal.Gui/App/ApplicationRunnableExtensions.cs
+++ b/Terminal.Gui/App/ApplicationRunnableExtensions.cs
@@ -5,7 +5,7 @@ namespace Terminal.Gui.App;
 /// </summary>
 /// <remarks>
 ///     These extensions provide convenience methods for wrapping views in <see cref="RunnableWrapper{TView, TResult}"/>
-///     and running them in a single call, similar to how <see cref="IApplication.Run{TRunnable}()"/> works.
+///     and running them in a single call, similar to how <see cref="IApplication.Run(Func{Exception, bool}, string)"/> works.
 /// </remarks>
 public static class ApplicationRunnableExtensions
 {
diff --git a/Terminal.Gui/App/Clipboard/Clipboard.cs b/Terminal.Gui/App/Clipboard/Clipboard.cs
index 0db013351..42472e414 100644
--- a/Terminal.Gui/App/Clipboard/Clipboard.cs
+++ b/Terminal.Gui/App/Clipboard/Clipboard.cs
@@ -2,6 +2,9 @@ namespace Terminal.Gui.App;
 
 /// <summary>Provides cut, copy, and paste support for the OS clipboard.</summary>
 /// <remarks>
+///     <para>
+///         <b>DEPRECATED:</b> This static class is obsolete. Use <see cref="IApplication.Clipboard"/> instead.
+///     </para>
 ///     <para>On Windows, the <see cref="Clipboard"/> class uses the Windows Clipboard APIs via P/Invoke.</para>
 ///     <para>
 ///         On Linux, when not running under Windows Subsystem for Linux (WSL), the <see cref="Clipboard"/> class uses
@@ -16,6 +19,7 @@ namespace Terminal.Gui.App;
 ///         the Mac clipboard APIs vai P/Invoke.
 ///     </para>
 /// </remarks>
+[Obsolete ("Use IApplication.Clipboard instead. The static Clipboard class will be removed in a future release.")]
 public static class Clipboard
 {
     private static string? _contents = string.Empty;
@@ -65,4 +69,32 @@ public static class Clipboard
     /// <summary>Returns true if the environmental dependencies are in place to interact with the OS clipboard.</summary>
     /// <remarks></remarks>
     public static bool IsSupported => Application.Driver?.Clipboard?.IsSupported ?? false;
+
+    /// <summary>Gets the OS clipboard data if possible.</summary>
+    /// <param name="result">The clipboard data if successful.</param>
+    /// <returns><see langword="true"/> if the clipboard data was retrieved successfully; otherwise, <see langword="false"/>.</returns>
+    public static bool TryGetClipboardData (out string result)
+    {
+        result = string.Empty;
+
+        if (IsSupported && Application.Driver?.Clipboard is { })
+        {
+            return Application.Driver.Clipboard.TryGetClipboardData (out result);
+        }
+
+        return false;
+    }
+
+    /// <summary>Sets the OS clipboard data if possible.</summary>
+    /// <param name="text">The text to set.</param>
+    /// <returns><see langword="true"/> if the clipboard data was set successfully; otherwise, <see langword="false"/>.</returns>
+    public static bool TrySetClipboardData (string text)
+    {
+        if (IsSupported && Application.Driver?.Clipboard is { })
+        {
+            return Application.Driver.Clipboard.TrySetClipboardData (text);
+        }
+
+        return false;
+    }
 }
diff --git a/Terminal.Gui/App/IApplication.cs b/Terminal.Gui/App/IApplication.cs
index f663a351f..a4a8c902e 100644
--- a/Terminal.Gui/App/IApplication.cs
+++ b/Terminal.Gui/App/IApplication.cs
@@ -39,6 +39,16 @@ public interface IApplication
 
     #region Initialization and Shutdown
 
+    /// <summary>
+    ///     Gets or sets the managed thread ID of the application's main UI thread, which is set during
+    ///     <see cref="Init"/> and used to determine if code is executing on the main thread.
+    /// </summary>
+    /// <value>
+    ///     The managed thread ID of the main UI thread, or <see langword="null"/> if the application is not initialized.
+    /// </value>
+    public int? MainThreadId { get; internal set; }
+
+
     /// <summary>Initializes a new instance of <see cref="Terminal.Gui"/> Application.</summary>
     /// <param name="driverName">
     ///     The short name (e.g. "dotnet", "windows", "unix", or "fake") of the
@@ -218,7 +228,7 @@ public interface IApplication
     [RequiresUnreferencedCode ("AOT")]
     [RequiresDynamicCode ("AOT")]
     public TView Run<TView> (Func<Exception, bool>? errorHandler = null, string? driverName = null)
-        where TView : Toplevel, new ();
+        where TView : Toplevel, new();
 
     /// <summary>
     ///     Runs a new Session using the provided <see cref="Toplevel"/> view and calling
@@ -273,9 +283,11 @@ public interface IApplication
     ///     <para>
     ///         This event is raised before input processing, timeout callbacks, and rendering occur each iteration.
     ///     </para>
-    ///     <para>See also <see cref="AddTimeout"/> and <see cref="TimedEvents"/>.</para>
+    ///     <para>The event args contain the current application instance.</para>
     /// </remarks>
-    public event EventHandler<IterationEventArgs>? Iteration;
+    /// <seealso cref="AddTimeout"/>
+    /// <seealso cref="TimedEvents"/>.
+    public event EventHandler<EventArgs<IApplication?>>? Iteration;
 
     /// <summary>Runs <paramref name="action"/> on the main UI loop thread.</summary>
     /// <param name="action">The action to be invoked on the main processing thread.</param>
@@ -523,7 +535,7 @@ public interface IApplication
     ///         Supports fluent API: <c>var result = Application.Create().Init().Run&lt;MyView&gt;().Shutdown() as MyResultType</c>
     ///     </para>
     /// </remarks>
-    IApplication Run<TRunnable> (Func<Exception, bool>? errorHandler = null) where TRunnable : IRunnable, new ();
+    IApplication Run<TRunnable> (Func<Exception, bool>? errorHandler = null) where TRunnable : IRunnable, new();
 
     /// <summary>
     ///     Requests that the specified runnable session stop.
@@ -574,6 +586,17 @@ public interface IApplication
     /// </remarks>
     IDriver? Driver { get; set; }
 
+    /// <summary>
+    ///     Gets the clipboard for this application instance.
+    /// </summary>
+    /// <remarks>
+    ///     <para>
+    ///         Provides access to the OS clipboard through the driver. Returns <see langword="null"/> if
+    ///         <see cref="Driver"/> is not initialized.
+    ///     </para>
+    /// </remarks>
+    IClipboard? Clipboard { get; }
+
     /// <summary>
     ///     Gets or sets whether <see cref="Driver"/> will be forced to output only the 16 colors defined in
     ///     <see cref="ColorName16"/>. The default is <see langword="false"/>, meaning 24-bit (TrueColor) colors will be
diff --git a/Terminal.Gui/App/IterationEventArgs.cs b/Terminal.Gui/App/IterationEventArgs.cs
deleted file mode 100644
index e0c98d2ab..000000000
--- a/Terminal.Gui/App/IterationEventArgs.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-namespace Terminal.Gui.App;
-
-/// <summary>Event arguments for the <see cref="IApplication.Iteration"/> event.</summary>
-public class IterationEventArgs : EventArgs
-{ }
diff --git a/Terminal.Gui/App/Keyboard/KeyboardImpl.cs b/Terminal.Gui/App/Keyboard/KeyboardImpl.cs
index 75c37d4b8..7b4d26e2d 100644
--- a/Terminal.Gui/App/Keyboard/KeyboardImpl.cs
+++ b/Terminal.Gui/App/Keyboard/KeyboardImpl.cs
@@ -1,7 +1,10 @@
+using System.Collections.Concurrent;
+
 namespace Terminal.Gui.App;
 
 /// <summary>
 ///     INTERNAL: Implements <see cref="IKeyboard"/> to manage keyboard input and key bindings at the Application level.
+///     This implementation is thread-safe for all public operations.
 ///     <para>
 ///         This implementation decouples keyboard handling state from the static <see cref="App"/> class,
 ///         enabling parallelizable unit tests and better testability.
@@ -10,19 +13,61 @@ namespace Terminal.Gui.App;
 ///         See <see cref="IKeyboard"/> for usage details.
 ///     </para>
 /// </summary>
-internal class KeyboardImpl : IKeyboard
+internal class KeyboardImpl : IKeyboard, IDisposable
 {
-    private Key _quitKey = Key.Esc; // Resources/config.json overrides
-    private Key _arrangeKey = Key.F5.WithCtrl; // Resources/config.json overrides
-    private Key _nextTabGroupKey = Key.F6; // Resources/config.json overrides
-    private Key _nextTabKey = Key.Tab; // Resources/config.json overrides
-    private Key _prevTabGroupKey = Key.F6.WithShift; // Resources/config.json overrides
-    private Key _prevTabKey = Key.Tab.WithShift; // Resources/config.json overrides
+    /// <summary>
+    ///     Initializes keyboard bindings and subscribes to Application configuration property events.
+    /// </summary>
+    public KeyboardImpl ()
+    {
+        // DON'T access Application static properties here - they trigger ApplicationImpl.Instance
+        // which sets ModelUsage to LegacyStatic, breaking parallel tests.
+        // These will be initialized from Application static properties in Init() or when accessed.
+
+        // Initialize to reasonable defaults that match Application defaults
+        // These will be updated by property change events if Application properties change
+        _quitKey = Key.Esc;
+        _arrangeKey = Key.F5.WithCtrl;
+        _nextTabGroupKey = Key.F6;
+        _nextTabKey = Key.Tab;
+        _prevTabGroupKey = Key.F6.WithShift;
+        _prevTabKey = Key.Tab.WithShift;
+
+        // Subscribe to Application static property change events
+        // so we get updated if they change
+        Application.QuitKeyChanged += OnQuitKeyChanged;
+        Application.ArrangeKeyChanged += OnArrangeKeyChanged;
+        Application.NextTabGroupKeyChanged += OnNextTabGroupKeyChanged;
+        Application.NextTabKeyChanged += OnNextTabKeyChanged;
+        Application.PrevTabGroupKeyChanged += OnPrevTabGroupKeyChanged;
+        Application.PrevTabKeyChanged += OnPrevTabKeyChanged;
+
+        AddKeyBindings ();
+    }
 
     /// <summary>
-    ///     Commands for Application.
+    ///     Commands for Application. Thread-safe for concurrent access.
     /// </summary>
-    private readonly Dictionary<Command, View.CommandImplementation> _commandImplementations = new ();
+    private readonly ConcurrentDictionary<Command, View.CommandImplementation> _commandImplementations = new ();
+
+    private Key _quitKey;
+    private Key _arrangeKey;
+    private Key _nextTabGroupKey;
+    private Key _nextTabKey;
+    private Key _prevTabGroupKey;
+    private Key _prevTabKey;
+
+    /// <inheritdoc/>
+    public void Dispose ()
+    {
+        // Unsubscribe from Application static property change events
+        Application.QuitKeyChanged -= OnQuitKeyChanged;
+        Application.ArrangeKeyChanged -= OnArrangeKeyChanged;
+        Application.NextTabGroupKeyChanged -= OnNextTabGroupKeyChanged;
+        Application.NextTabKeyChanged -= OnNextTabKeyChanged;
+        Application.PrevTabGroupKeyChanged -= OnPrevTabGroupKeyChanged;
+        Application.PrevTabKeyChanged -= OnPrevTabKeyChanged;
+    }
 
     /// <inheritdoc/>
     public IApplication? App { get; set; }
@@ -102,14 +147,6 @@ internal class KeyboardImpl : IKeyboard
     /// <inheritdoc/>
     public event EventHandler<Key>? KeyUp;
 
-    /// <summary>
-    ///     Initializes keyboard bindings.
-    /// </summary>
-    public KeyboardImpl ()
-    {
-        AddKeyBindings ();
-    }
-
     /// <inheritdoc/>
     public bool RaiseKeyDownEvent (Key key)
     {
@@ -165,7 +202,8 @@ internal class KeyboardImpl : IKeyboard
         }
 
         bool? commandHandled = InvokeCommandsBoundToKey (key);
-        if(commandHandled is true)
+
+        if (commandHandled is true)
         {
             return true;
         }
@@ -188,7 +226,6 @@ internal class KeyboardImpl : IKeyboard
             return true;
         }
 
-
         // TODO: Add Popover support
 
         if (App?.SessionStack is { })
@@ -214,6 +251,7 @@ internal class KeyboardImpl : IKeyboard
     public bool? InvokeCommandsBoundToKey (Key key)
     {
         bool? handled = null;
+
         // Invoke any Application-scoped KeyBindings.
         // The first view that handles the key will stop the loop.
         // foreach (KeyValuePair<Key, KeyBinding> binding in KeyBindings.GetBindings (key))
@@ -264,24 +302,6 @@ internal class KeyboardImpl : IKeyboard
         return null;
     }
 
-    /// <summary>
-    ///     <para>
-    ///         Sets the function that will be invoked for a <see cref="Command"/>.
-    ///     </para>
-    ///     <para>
-    ///         If AddCommand has already been called for <paramref name="command"/> <paramref name="f"/> will
-    ///         replace the old one.
-    ///     </para>
-    /// </summary>
-    /// <remarks>
-    ///     <para>
-    ///         This version of AddCommand is for commands that do not require a <see cref="ICommandContext"/>.
-    ///     </para>
-    /// </remarks>
-    /// <param name="command">The command.</param>
-    /// <param name="f">The function.</param>
-    private void AddCommand (Command command, Func<bool?> f) { _commandImplementations [command] = ctx => f (); }
-
     internal void AddKeyBindings ()
     {
         _commandImplementations.Clear ();
@@ -296,6 +316,7 @@ internal class KeyboardImpl : IKeyboard
                         return true;
                     }
                    );
+
         AddCommand (
                     Command.Suspend,
                     () =>
@@ -305,6 +326,7 @@ internal class KeyboardImpl : IKeyboard
                         return true;
                     }
                    );
+
         AddCommand (
                     Command.NextTabStop,
                     () => App?.Navigation?.AdvanceFocus (NavigationDirection.Forward, TabBehavior.TabStop));
@@ -351,31 +373,64 @@ internal class KeyboardImpl : IKeyboard
                         return false;
                     });
 
-        //SetKeysToHardCodedDefaults ();
-
         // Need to clear after setting the above to ensure actually clear
-        // because set_QuitKey etc.. may call Add
-        KeyBindings.Clear ();
+        // because set_QuitKey etc. may call Add
+        //KeyBindings.Clear ();
 
-        KeyBindings.Add (QuitKey, Command.Quit);
-        KeyBindings.Add (NextTabKey, Command.NextTabStop);
-        KeyBindings.Add (PrevTabKey, Command.PreviousTabStop);
-        KeyBindings.Add (NextTabGroupKey, Command.NextTabGroup);
-        KeyBindings.Add (PrevTabGroupKey, Command.PreviousTabGroup);
-        KeyBindings.Add (ArrangeKey, Command.Arrange);
+        // Use ReplaceCommands instead of Add, because it's possible that
+        // during construction the Application static properties changed, and
+        // we added those keys already.
+        KeyBindings.ReplaceCommands (QuitKey, Command.Quit);
+        KeyBindings.ReplaceCommands (NextTabKey, Command.NextTabStop);
+        KeyBindings.ReplaceCommands (PrevTabKey, Command.PreviousTabStop);
+        KeyBindings.ReplaceCommands (NextTabGroupKey, Command.NextTabGroup);
+        KeyBindings.ReplaceCommands (PrevTabGroupKey, Command.PreviousTabGroup);
+        KeyBindings.ReplaceCommands (ArrangeKey, Command.Arrange);
 
-        KeyBindings.Add (Key.CursorRight, Command.NextTabStop);
-        KeyBindings.Add (Key.CursorDown, Command.NextTabStop);
-        KeyBindings.Add (Key.CursorLeft, Command.PreviousTabStop);
-        KeyBindings.Add (Key.CursorUp, Command.PreviousTabStop);
+        // TODO: Should these be configurable?
+        KeyBindings.ReplaceCommands (Key.CursorRight, Command.NextTabStop);
+        KeyBindings.ReplaceCommands (Key.CursorDown, Command.NextTabStop);
+        KeyBindings.ReplaceCommands (Key.CursorLeft, Command.PreviousTabStop);
+        KeyBindings.ReplaceCommands (Key.CursorUp, Command.PreviousTabStop);
 
         // TODO: Refresh Key should be configurable
-        KeyBindings.Add (Key.F5, Command.Refresh);
+        KeyBindings.ReplaceCommands (Key.F5, Command.Refresh);
 
         // TODO: Suspend Key should be configurable
         if (Environment.OSVersion.Platform == PlatformID.Unix)
         {
-            KeyBindings.Add (Key.Z.WithCtrl, Command.Suspend);
+            KeyBindings.ReplaceCommands (Key.Z.WithCtrl, Command.Suspend);
         }
     }
+
+    /// <summary>
+    ///     <para>
+    ///         Sets the function that will be invoked for a <see cref="Command"/>.
+    ///     </para>
+    ///     <para>
+    ///         If AddCommand has already been called for <paramref name="command"/> <paramref name="f"/> will
+    ///         replace the old one.
+    ///     </para>
+    /// </summary>
+    /// <remarks>
+    ///     <para>
+    ///         This version of AddCommand is for commands that do not require a <see cref="ICommandContext"/>.
+    ///     </para>
+    /// </remarks>
+    /// <param name="command">The command.</param>
+    /// <param name="f">The function.</param>
+    private void AddCommand (Command command, Func<bool?> f) { _commandImplementations [command] = ctx => f (); }
+
+    private void OnArrangeKeyChanged (object? sender, ValueChangedEventArgs<Key> e) { ArrangeKey = e.NewValue; }
+
+    private void OnNextTabGroupKeyChanged (object? sender, ValueChangedEventArgs<Key> e) { NextTabGroupKey = e.NewValue; }
+
+    private void OnNextTabKeyChanged (object? sender, ValueChangedEventArgs<Key> e) { NextTabKey = e.NewValue; }
+
+    private void OnPrevTabGroupKeyChanged (object? sender, ValueChangedEventArgs<Key> e) { PrevTabGroupKey = e.NewValue; }
+
+    private void OnPrevTabKeyChanged (object? sender, ValueChangedEventArgs<Key> e) { PrevTabKey = e.NewValue; }
+
+    // Event handlers for Application static property changes
+    private void OnQuitKeyChanged (object? sender, ValueChangedEventArgs<Key> e) { QuitKey = e.NewValue; }
 }
diff --git a/Terminal.Gui/App/Mouse/MouseImpl.cs b/Terminal.Gui/App/Mouse/MouseImpl.cs
index 12aa4ada9..42dc1c388 100644
--- a/Terminal.Gui/App/Mouse/MouseImpl.cs
+++ b/Terminal.Gui/App/Mouse/MouseImpl.cs
@@ -9,15 +9,25 @@ namespace Terminal.Gui.App;
 ///         enabling better testability and parallel test execution.
 ///     </para>
 /// </summary>
-internal class MouseImpl : IMouse
+internal class MouseImpl : IMouse, IDisposable
 {
     /// <summary>
-    ///     Initializes a new instance of the <see cref="MouseImpl"/> class.
+    ///     Initializes a new instance of the <see cref="MouseImpl"/> class and subscribes to Application configuration property events.
     /// </summary>
-    public MouseImpl () { }
+    public MouseImpl ()
+    {
+        // Subscribe to Application static property change events
+        Application.IsMouseDisabledChanged += OnIsMouseDisabledChanged;
+    }
+
+    private IApplication? _app;
 
     /// <inheritdoc/>
-    public IApplication? App { get; set; }
+    public IApplication? App
+    {
+        get => _app;
+        set => _app = value;
+    }
 
     /// <inheritdoc/>
     public Point? LastMousePosition { get; set; }
@@ -391,4 +401,17 @@ internal class MouseImpl : IMouse
 
         return false;
     }
+
+    // Event handler for Application static property changes
+    private void OnIsMouseDisabledChanged (object? sender, ValueChangedEventArgs<bool> e)
+    {
+        IsMouseDisabled = e.NewValue;
+    }
+
+    /// <inheritdoc/>
+    public void Dispose ()
+    {
+        // Unsubscribe from Application static property change events
+        Application.IsMouseDisabledChanged -= OnIsMouseDisabledChanged;
+    }
 }
diff --git a/Terminal.Gui/App/Runnable/IRunnable.cs b/Terminal.Gui/App/Runnable/IRunnable.cs
index 2e6711d0c..75ef00b1b 100644
--- a/Terminal.Gui/App/Runnable/IRunnable.cs
+++ b/Terminal.Gui/App/Runnable/IRunnable.cs
@@ -66,7 +66,7 @@ public interface IRunnable
     /// <summary>
     ///     Raised when <see cref="IsRunning"/> is changing (e.g., when <see cref="IApplication.Begin(IRunnable)"/> or
     ///     <see cref="IApplication.End(RunnableSessionToken)"/> is called).
-    ///     Can be canceled by setting <see cref="CancelEventArgs{T}.Cancel"/> to <see langword="true"/>.
+    ///     Can be canceled by setting `args.Cancel` to <see langword="true"/>.
     /// </summary>
     /// <remarks>
     ///     <para>
@@ -140,7 +140,7 @@ public interface IRunnable
 
     /// <summary>
     ///     Raised when this runnable is about to become modal (top of stack) or cease being modal.
-    ///     Can be canceled by setting <see cref="CancelEventArgs{T}.Cancel"/> to <see langword="true"/>.
+    ///     Can be canceled by setting `args.Cancel` to <see langword="true"/>.
     /// </summary>
     /// <remarks>
     ///     <para>
diff --git a/Terminal.Gui/Configuration/ConfigurationManager.cs b/Terminal.Gui/Configuration/ConfigurationManager.cs
index b8d3cdf5d..aa79c26e9 100644
--- a/Terminal.Gui/Configuration/ConfigurationManager.cs
+++ b/Terminal.Gui/Configuration/ConfigurationManager.cs
@@ -595,15 +595,53 @@ public static class ConfigurationManager
                                                                                   TypeInfoResolver = SourceGenerationContext.Default
                                                                               });
 
+    private static SourcesManager? _sourcesManager = new ();
+    private static readonly object _sourcesManagerLock = new ();
+
     /// <summary>
     ///     Gets the Sources Manager - manages the loading of configuration sources from files and resources.
     /// </summary>
-    public static SourcesManager? SourcesManager { get; internal set; } = new ();
+    public static SourcesManager? SourcesManager
+    {
+        get
+        {
+            lock (_sourcesManagerLock)
+            {
+                return _sourcesManager;
+            }
+        }
+        internal set
+        {
+            lock (_sourcesManagerLock)
+            {
+                _sourcesManager = value;
+            }
+        }
+    }
+
+    private static string? _runtimeConfig = """{  }""";
+    private static readonly object _runtimeConfigLock = new ();
 
     /// <summary>
     ///     Gets or sets the in-memory config.json. See <see cref="ConfigLocations.Runtime"/>.
     /// </summary>
-    public static string? RuntimeConfig { get; set; } = """{  }""";
+    public static string? RuntimeConfig
+    {
+        get
+        {
+            lock (_runtimeConfigLock)
+            {
+                return _runtimeConfig;
+            }
+        }
+        set
+        {
+            lock (_runtimeConfigLock)
+            {
+                _runtimeConfig = value;
+            }
+        }
+    }
 
     [SuppressMessage ("Style", "IDE1006:Naming Styles", Justification = "<Pending>")]
     private static readonly string _configFilename = "config.json";
@@ -678,13 +716,32 @@ public static class ConfigurationManager
     [SuppressMessage ("Style", "IDE1006:Naming Styles", Justification = "<Pending>")]
     internal static StringBuilder _jsonErrors = new ();
 
+    private static bool? _throwOnJsonErrors = false;
+    private static readonly object _throwOnJsonErrorsLock = new ();
+
     /// <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.
     /// </summary>
     [ConfigurationProperty (Scope = typeof (SettingsScope))]
-    public static bool? ThrowOnJsonErrors { get; set; } = false;
+    public static bool? ThrowOnJsonErrors
+    {
+        get
+        {
+            lock (_throwOnJsonErrorsLock)
+            {
+                return _throwOnJsonErrors;
+            }
+        }
+        set
+        {
+            lock (_throwOnJsonErrorsLock)
+            {
+                _throwOnJsonErrors = value;
+            }
+        }
+    }
 
 #pragma warning disable IDE1006 // Naming Styles
     private static readonly object _jsonErrorsLock = new ();
@@ -758,8 +815,27 @@ public static class ConfigurationManager
         return JsonSerializer.Serialize (emptyScope, typeof (SettingsScope), SerializerContext!);
     }
 
+    private static string _appName = Assembly.GetEntryAssembly ()?.FullName?.Split (',') [0]?.Trim ()!;
+    private static readonly object _appNameLock = new ();
+
     /// <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 ()!;
+    public static string AppName
+    {
+        get
+        {
+            lock (_appNameLock)
+            {
+                return _appName;
+            }
+        }
+        set
+        {
+            lock (_appNameLock)
+            {
+                _appName = value;
+            }
+        }
+    }
 
     /// <summary>
     ///     INTERNAL: Retrieves all uninitialized configuration properties that belong to a specific scope from the cache.
diff --git a/Terminal.Gui/Configuration/SourcesManager.cs b/Terminal.Gui/Configuration/SourcesManager.cs
index 541d452a2..71c32ed36 100644
--- a/Terminal.Gui/Configuration/SourcesManager.cs
+++ b/Terminal.Gui/Configuration/SourcesManager.cs
@@ -1,4 +1,5 @@
-using System.Diagnostics;
+using System.Collections.Concurrent;
+using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Reflection;
 using System.Text.Json;
@@ -13,7 +14,7 @@ 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 ();
+    public ConcurrentDictionary<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>
@@ -62,11 +63,8 @@ public class SourcesManager
 
     internal void AddSource (ConfigLocations location, string source)
     {
-        if (!Sources.TryAdd (location, source))
-        {
-            //Logging.Warning ($"{location} has already been added to Sources.");
-            Sources [location] = source;
-        }
+        // ConcurrentDictionary's AddOrUpdate is thread-safe
+        Sources.AddOrUpdate (location, source, (key, oldValue) => source);
     }
 
 
diff --git a/Terminal.Gui/Drivers/FakeDriver/FakeInputProcessor.cs b/Terminal.Gui/Drivers/FakeDriver/FakeInputProcessor.cs
index 83b0739a7..f6c777e33 100644
--- a/Terminal.Gui/Drivers/FakeDriver/FakeInputProcessor.cs
+++ b/Terminal.Gui/Drivers/FakeDriver/FakeInputProcessor.cs
@@ -1,4 +1,3 @@
-#nullable disable
 using System.Collections.Concurrent;
 
 namespace Terminal.Gui.Drivers;
@@ -27,17 +26,18 @@ public class FakeInputProcessor : InputProcessorImpl<ConsoleKeyInfo>
     }
 
     /// <inheritdoc />
-    public override void EnqueueMouseEvent (MouseEventArgs mouseEvent)
+    public override void EnqueueMouseEvent (IApplication? app, MouseEventArgs mouseEvent)
     {
         // FakeDriver uses ConsoleKeyInfo as its input record type, which cannot represent mouse events.
 
+        // TODO: Verify this is correct. This didn't check the threadId before.
         // If Application.Invoke is available (running in Application context), defer to next iteration
         // to ensure proper timing - the event is raised after views are laid out.
         // Otherwise (unit tests), raise immediately so tests can verify synchronously.
-        if (Application.MainThreadId is { })
+        if (app is {} && app.MainThreadId != Thread.CurrentThread.ManagedThreadId)
         {
             // Application is running - use Invoke to defer to next iteration
-            ApplicationImpl.Instance.Invoke ((_) => RaiseMouseEvent (mouseEvent));
+            app?.Invoke ((_) => RaiseMouseEvent (mouseEvent));
         }
         else
         {
diff --git a/Terminal.Gui/Drivers/IInputProcessor.cs b/Terminal.Gui/Drivers/IInputProcessor.cs
index 9c800946c..b10ab0842 100644
--- a/Terminal.Gui/Drivers/IInputProcessor.cs
+++ b/Terminal.Gui/Drivers/IInputProcessor.cs
@@ -1,5 +1,4 @@
-
-namespace Terminal.Gui.Drivers;
+namespace Terminal.Gui.Drivers;
 
 /// <summary>
 ///     Interface for main loop class that will process the queued input.
@@ -12,7 +11,7 @@ public interface IInputProcessor
     public event EventHandler<string>? AnsiSequenceSwallowed;
 
     /// <summary>
-    /// Gets the name of the driver associated with this input processor.
+    ///     Gets the name of the driver associated with this input processor.
     /// </summary>
     string? DriverName { get; init; }
 
@@ -58,7 +57,8 @@ public interface IInputProcessor
     ///     Called when a key up event has been dequeued. Raises the <see cref="KeyUp"/> event.
     /// </summary>
     /// <remarks>
-    ///     Drivers that do not support key release events will call this method after <see cref="RaiseKeyDownEvent"/> processing
+    ///     Drivers that do not support key release events will call this method after <see cref="RaiseKeyDownEvent"/>
+    ///     processing
     ///     is complete.
     /// </remarks>
     /// <param name="key">The key event data.</param>
@@ -89,7 +89,10 @@ public interface IInputProcessor
     /// <summary>
     ///     Adds a mouse input event to the input queue. For unit tests.
     /// </summary>
+    /// <param name="app">
+    ///     The application instance to use. Used to use Invoke to raise the mouse
+    ///     event in the case where this method is not called on the main thread.
+    /// </param>
     /// <param name="mouseEvent"></param>
-    void EnqueueMouseEvent (MouseEventArgs mouseEvent);
-
+    void EnqueueMouseEvent (IApplication? app,  MouseEventArgs mouseEvent);
 }
diff --git a/Terminal.Gui/Drivers/InputProcessorImpl.cs b/Terminal.Gui/Drivers/InputProcessorImpl.cs
index 24c249a84..57b74f1f4 100644
--- a/Terminal.Gui/Drivers/InputProcessorImpl.cs
+++ b/Terminal.Gui/Drivers/InputProcessorImpl.cs
@@ -122,7 +122,7 @@ public abstract class InputProcessorImpl<TInputRecord> : IInputProcessor, IDispo
     public event EventHandler<MouseEventArgs>? MouseEvent;
 
     /// <inheritdoc />
-    public virtual void EnqueueMouseEvent (MouseEventArgs mouseEvent)
+    public virtual void EnqueueMouseEvent (IApplication? app, MouseEventArgs mouseEvent)
     {
         // Base implementation: For drivers where TInputRecord cannot represent mouse events
         // (e.g., ConsoleKeyInfo), derived classes should override this method.
diff --git a/Terminal.Gui/Drivers/OutputBase.cs b/Terminal.Gui/Drivers/OutputBase.cs
index 6c10fad0b..ad1f4120e 100644
--- a/Terminal.Gui/Drivers/OutputBase.cs
+++ b/Terminal.Gui/Drivers/OutputBase.cs
@@ -90,14 +90,16 @@ public abstract class OutputBase
             }
         }
 
-        foreach (SixelToRender s in Application.Sixel)
-        {
-            if (!string.IsNullOrWhiteSpace (s.SixelData))
-            {
-                SetCursorPositionImpl (s.ScreenPosition.X, s.ScreenPosition.Y);
-                Console.Out.Write (s.SixelData);
-            }
-        }
+        // BUGBUG: The Sixel impl depends on the legacy static Application object
+        // BUGBUG: Disabled for now
+        //foreach (SixelToRender s in  Application.Sixel)
+        //{
+        //    if (!string.IsNullOrWhiteSpace (s.SixelData))
+        //    {
+        //        SetCursorPositionImpl (s.ScreenPosition.X, s.ScreenPosition.Y);
+        //        Console.Out.Write (s.SixelData);
+        //    }
+        //}
 
         SetCursorVisibility (savedVisibility ?? CursorVisibility.Default);
         _cachedCursorVisibility = savedVisibility;
diff --git a/Terminal.Gui/Drivers/WindowsDriver/WindowsInputProcessor.cs b/Terminal.Gui/Drivers/WindowsDriver/WindowsInputProcessor.cs
index 739a393fb..3777a034a 100644
--- a/Terminal.Gui/Drivers/WindowsDriver/WindowsInputProcessor.cs
+++ b/Terminal.Gui/Drivers/WindowsDriver/WindowsInputProcessor.cs
@@ -18,7 +18,7 @@ internal class WindowsInputProcessor : InputProcessorImpl<InputRecord>
     }
 
     /// <inheritdoc />
-    public override void EnqueueMouseEvent (MouseEventArgs mouseEvent)
+    public override void EnqueueMouseEvent (IApplication? app, MouseEventArgs mouseEvent)
     {
         InputQueue.Enqueue (new ()
         {
diff --git a/Terminal.Gui/Drivers/WindowsDriver/WindowsOutput.cs b/Terminal.Gui/Drivers/WindowsDriver/WindowsOutput.cs
index 5a81ae0ab..b351696a2 100644
--- a/Terminal.Gui/Drivers/WindowsDriver/WindowsOutput.cs
+++ b/Terminal.Gui/Drivers/WindowsDriver/WindowsOutput.cs
@@ -149,7 +149,7 @@ internal partial class WindowsOutput : OutputBase, IOutput
             // Force 16 colors if not in virtual terminal mode.
             // BUGBUG: This is bad. It does not work if the app was crated without
             // BUGBUG: Apis.
-            ApplicationImpl.Instance.Force16Colors = true;
+            //ApplicationImpl.Instance.Force16Colors = true;
 
         }
 
@@ -357,7 +357,8 @@ internal partial class WindowsOutput : OutputBase, IOutput
     {
         // BUGBUG: This is bad. It does not work if the app was crated without
         // BUGBUG: Apis.
-        bool force16Colors = ApplicationImpl.Instance.Force16Colors;
+        // bool force16Colors = ApplicationImpl.Instance.Force16Colors;
+        bool force16Colors = false;
 
         if (force16Colors)
         {
diff --git a/Terminal.Gui/FileServices/IFileOperations.cs b/Terminal.Gui/FileServices/IFileOperations.cs
index 610d097be..920f3e947 100644
--- a/Terminal.Gui/FileServices/IFileOperations.cs
+++ b/Terminal.Gui/FileServices/IFileOperations.cs
@@ -9,28 +9,31 @@ namespace Terminal.Gui.FileServices;
 public interface IFileOperations
 {
     /// <summary>Specifies how to handle file/directory deletion attempts in <see cref="FileDialog"/>.</summary>
+    /// <param name="app"></param>
     /// <param name="toDelete"></param>
     /// <returns><see langword="true"/> if operation was completed or <see langword="false"/> if cancelled</returns>
     /// <remarks>
     ///     Ensure you use a try/catch block with appropriate error handling (e.g. showing a <see cref="MessageBox"/>
     /// </remarks>
-    bool Delete (IEnumerable<IFileSystemInfo> toDelete);
+    bool Delete (IApplication? app, IEnumerable<IFileSystemInfo> toDelete);
 
     /// <summary>Specifies how to handle 'new directory' operation in <see cref="FileDialog"/>.</summary>
+    /// <param name="app"></param>
     /// <param name="fileSystem"></param>
     /// <param name="inDirectory">The parent directory in which the new directory should be created</param>
     /// <returns>The newly created directory or null if cancelled.</returns>
     /// <remarks>
     ///     Ensure you use a try/catch block with appropriate error handling (e.g. showing a <see cref="MessageBox"/>
     /// </remarks>
-    IFileSystemInfo New (IFileSystem fileSystem, IDirectoryInfo inDirectory);
+    IFileSystemInfo New (IApplication? app, IFileSystem fileSystem, IDirectoryInfo inDirectory);
 
     /// <summary>Specifies how to handle file/directory rename attempts in <see cref="FileDialog"/>.</summary>
+    /// <param name="app"></param>
     /// <param name="fileSystem"></param>
     /// <param name="toRename"></param>
     /// <returns>The new name for the file or null if cancelled</returns>
     /// <remarks>
     ///     Ensure you use a try/catch block with appropriate error handling (e.g. showing a <see cref="MessageBox"/>
     /// </remarks>
-    IFileSystemInfo Rename (IFileSystem fileSystem, IFileSystemInfo toRename);
+    IFileSystemInfo Rename (IApplication? app, IFileSystem fileSystem, IFileSystemInfo toRename);
 }
diff --git a/Terminal.Gui/Input/InputBindings.cs b/Terminal.Gui/Input/InputBindings.cs
index 8711cf87c..75e2e8aea 100644
--- a/Terminal.Gui/Input/InputBindings.cs
+++ b/Terminal.Gui/Input/InputBindings.cs
@@ -1,19 +1,15 @@
-namespace Terminal.Gui.Input;
+using System.Collections.Concurrent;
+
+namespace Terminal.Gui.Input;
 
 /// <summary>
 ///     Abstract class for <see cref="KeyBindings"/> and <see cref="MouseBindings"/>.
+///     This class is thread-safe for all public operations.
 /// </summary>
 /// <typeparam name="TEvent">The type of the event (e.g. <see cref="Key"/> or <see cref="MouseFlags"/>).</typeparam>
 /// <typeparam name="TBinding">The binding type (e.g. <see cref="KeyBinding"/>).</typeparam>
-public abstract class InputBindings<TEvent, TBinding> where TBinding : IInputBinding, new () where TEvent : notnull
+public abstract class InputBindings<TEvent, TBinding> where TBinding : IInputBinding, new() where TEvent : notnull
 {
-    /// <summary>
-    ///     The bindings.
-    /// </summary>
-    private readonly Dictionary<TEvent, TBinding> _bindings;
-
-    private readonly Func<Command [], TEvent, TBinding> _constructBinding;
-
     /// <summary>
     ///     Initializes a new instance.
     /// </summary>
@@ -26,11 +22,11 @@ public abstract class InputBindings<TEvent, TBinding> where TBinding : IInputBin
     }
 
     /// <summary>
-    ///     Tests whether <paramref name="eventArgs"/> is valid or not.
+    ///     The bindings.
     /// </summary>
-    /// <param name="eventArgs"></param>
-    /// <returns></returns>
-    public abstract bool IsValid (TEvent eventArgs);
+    private readonly ConcurrentDictionary<TEvent, TBinding> _bindings;
+
+    private readonly Func<Command [], TEvent, TBinding> _constructBinding;
 
     /// <summary>Adds a <typeparamref name="TEvent"/> bound to <typeparamref name="TBinding"/> to the collection.</summary>
     /// <param name="eventArgs"></param>
@@ -42,24 +38,21 @@ public abstract class InputBindings<TEvent, TBinding> where TBinding : IInputBin
             throw new ArgumentException (@"Invalid newEventArgs", nameof (eventArgs));
         }
 
-#pragma warning disable CS8601 // Possible null reference assignment.
-        if (TryGet (eventArgs, out TBinding _))
+        // IMPORTANT: Add a COPY of the eventArgs. This is needed because ConfigurationManager.Apply uses DeepMemberWiseCopy
+        // IMPORTANT: update the memory referenced by the key, and Dictionary uses caching for performance, and thus
+        // IMPORTANT: Apply will update the Dictionary with the new eventArgs, but the old eventArgs will still be in the dictionary.
+        // IMPORTANT: See the ConfigurationManager.Illustrate_DeepMemberWiseCopy_Breaks_Dictionary test for details.
+        if (!_bindings.TryAdd (eventArgs, binding))
         {
             throw new InvalidOperationException (@$"A binding for {eventArgs} exists ({binding}).");
         }
-#pragma warning restore CS8601 // Possible null reference assignment.
-
-        // IMPORTANT: Add a COPY of the eventArgs. This is needed because ConfigurationManager.Apply uses DeepMemberWiseCopy 
-        // IMPORTANT: update the memory referenced by the key, and Dictionary uses caching for performance, and thus 
-        // IMPORTANT: Apply will update the Dictionary with the new eventArgs, but the old eventArgs will still be in the dictionary.
-        // IMPORTANT: See the ConfigurationManager.Illustrate_DeepMemberWiseCopy_Breaks_Dictionary test for details.
-        _bindings.Add (eventArgs, binding);
     }
 
     /// <summary>
     ///     <para>Adds a new <typeparamref name="TEvent"/> that will trigger the commands in <paramref name="commands"/>.</para>
     ///     <para>
-    ///         If the <typeparamref name="TEvent"/> is already bound to a different set of <see cref="Command"/>s it will be rebound
+    ///         If the <typeparamref name="TEvent"/> is already bound to a different set of <see cref="Command"/>s it will be
+    ///         rebound
     ///         <paramref name="commands"/>.
     ///     </para>
     /// </summary>
@@ -77,31 +70,32 @@ public abstract class InputBindings<TEvent, TBinding> where TBinding : IInputBin
             throw new ArgumentException (@"At least one command must be specified", nameof (commands));
         }
 
-        if (TryGet (eventArgs, out TBinding? binding))
+        if (!IsValid (eventArgs))
+        {
+            throw new ArgumentException (@"Invalid newEventArgs", nameof (eventArgs));
+        }
+
+        TBinding binding = _constructBinding (commands, eventArgs);
+
+        if (!_bindings.TryAdd (eventArgs, binding))
         {
             throw new InvalidOperationException (@$"A binding for {eventArgs} exists ({binding}).");
         }
-
-        Add (eventArgs, _constructBinding (commands, eventArgs));
     }
 
-    /// <summary>
-    ///     Gets the bindings.
-    /// </summary>
-    /// <returns></returns>
-    public IEnumerable<KeyValuePair<TEvent, TBinding>> GetBindings () { return _bindings; }
-
     /// <summary>Removes all <typeparamref name="TEvent"/> objects from the collection.</summary>
     public void Clear () { _bindings.Clear (); }
 
     /// <summary>
-    ///     Removes all bindings that trigger the given command set. Views can have multiple different <typeparamref name="TEvent"/>
+    ///     Removes all bindings that trigger the given command set. Views can have multiple different
+    ///     <typeparamref name="TEvent"/>
     ///     bound to
     ///     the same command sets and this method will clear all of them.
     /// </summary>
     /// <param name="command"></param>
     public void Clear (params Command [] command)
     {
+        // ToArray() creates a snapshot to avoid modification during enumeration
         KeyValuePair<TEvent, TBinding> [] kvps = _bindings
                                                  .Where (kvp => kvp.Value.Commands.SequenceEqual (command))
                                                  .ToArray ();
@@ -125,16 +119,29 @@ public abstract class InputBindings<TEvent, TBinding> where TBinding : IInputBin
         throw new InvalidOperationException ($"{eventArgs} is not bound.");
     }
 
-    /// <summary>Gets the commands bound with the specified <typeparamref name="TEvent"/>.</summary>
-    /// <remarks></remarks>
-    /// <param name="eventArgs">The <typeparamref name="TEvent"/> to check.</param>
-    /// <param name="binding">
-    ///     When this method returns, contains the commands bound with the <typeparamref name="TEvent"/>, if the <typeparamref name="TEvent"/> is
-    ///     not
-    ///     found; otherwise, null. This parameter is passed uninitialized.
-    /// </param>
-    /// <returns><see langword="true"/> if the <typeparamref name="TEvent"/> is bound; otherwise <see langword="false"/>.</returns>
-    public bool TryGet (TEvent eventArgs, out TBinding? binding) { return _bindings.TryGetValue (eventArgs, out binding); }
+    /// <summary>Gets all <typeparamref name="TEvent"/> bound to the set of commands specified by <paramref name="commands"/>.</summary>
+    /// <param name="commands">The set of commands to search.</param>
+    /// <returns>
+    ///     The <typeparamref name="TEvent"/>s bound to the set of commands specified by <paramref name="commands"/>. An empty
+    ///     list if
+    ///     the
+    ///     set of commands was not found.
+    /// </returns>
+    public IEnumerable<TEvent> GetAllFromCommands (params Command [] commands)
+    {
+        // ToList() creates a snapshot to ensure thread-safe enumeration
+        return _bindings.Where (a => a.Value.Commands.SequenceEqual (commands)).Select (a => a.Key).ToList ();
+    }
+
+    /// <summary>
+    ///     Gets the bindings.
+    /// </summary>
+    /// <returns></returns>
+    public IEnumerable<KeyValuePair<TEvent, TBinding>> GetBindings ()
+    {
+        // ConcurrentDictionary provides a snapshot enumeration that is safe for concurrent access
+        return _bindings;
+    }
 
     /// <summary>Gets the array of <see cref="Command"/>s bound to <paramref name="eventArgs"/> if it exists.</summary>
     /// <param name="eventArgs">The <typeparamref name="TEvent"/> to check.</param>
@@ -163,17 +170,16 @@ public abstract class InputBindings<TEvent, TBinding> where TBinding : IInputBin
     /// </returns>
     public TEvent? GetFirstFromCommands (params Command [] commands) { return _bindings.FirstOrDefault (a => a.Value.Commands.SequenceEqual (commands)).Key; }
 
-    /// <summary>Gets all <typeparamref name="TEvent"/> bound to the set of commands specified by <paramref name="commands"/>.</summary>
-    /// <param name="commands">The set of commands to search.</param>
-    /// <returns>
-    ///     The <typeparamref name="TEvent"/>s bound to the set of commands specified by <paramref name="commands"/>. An empty list if
-    ///     the
-    ///     set of commands was not found.
-    /// </returns>
-    public IEnumerable<TEvent> GetAllFromCommands (params Command [] commands)
-    {
-        return _bindings.Where (a => a.Value.Commands.SequenceEqual (commands)).Select (a => a.Key);
-    }
+    /// <summary>
+    ///     Tests whether <paramref name="eventArgs"/> is valid or not.
+    /// </summary>
+    /// <param name="eventArgs"></param>
+    /// <returns></returns>
+    public abstract bool IsValid (TEvent eventArgs);
+
+    /// <summary>Removes a <typeparamref name="TEvent"/> from the collection.</summary>
+    /// <param name="eventArgs"></param>
+    public void Remove (TEvent eventArgs) { _bindings.TryRemove (eventArgs, out _); }
 
     /// <summary>Replaces a <typeparamref name="TEvent"/> combination already bound to a set of <see cref="Command"/>s.</summary>
     /// <remarks></remarks>
@@ -188,15 +194,28 @@ public abstract class InputBindings<TEvent, TBinding> where TBinding : IInputBin
             throw new ArgumentException (@"Invalid newEventArgs", nameof (newEventArgs));
         }
 
-        if (TryGet (oldEventArgs, out TBinding? binding))
+        // Thread-safe: Handle the case where oldEventArgs == newEventArgs
+        if (EqualityComparer<TEvent>.Default.Equals (oldEventArgs, newEventArgs))
         {
-            Remove (oldEventArgs);
-            Add (newEventArgs, binding!);
-        }
-        else
-        {
-            Add (newEventArgs, binding!);
+            // Same key - nothing to do, binding stays as-is
+            return;
         }
+
+        // Thread-safe: Get the binding from oldEventArgs, or create default if it doesn't exist
+        // This is atomic - either gets existing or adds new
+        TBinding binding = _bindings.GetOrAdd (oldEventArgs, _ => new TBinding ());
+
+        // Thread-safe: Atomically add/update newEventArgs with the binding from oldEventArgs
+        // The updateValueFactory is only called if the key already exists, ensuring we don't
+        // accidentally overwrite a binding that was added by another thread
+        _bindings.AddOrUpdate (
+            newEventArgs,
+            binding, // Add this binding if newEventArgs doesn't exist
+            (_, _) => binding);
+
+        // Thread-safe: Remove oldEventArgs only after newEventArgs has been set
+        // This ensures we don't lose the binding if another thread is reading it
+        _bindings.TryRemove (oldEventArgs, out _);
     }
 
     /// <summary>Replaces the commands already bound to a combination of <typeparamref name="TEvent"/>.</summary>
@@ -209,28 +228,21 @@ public abstract class InputBindings<TEvent, TBinding> where TBinding : IInputBin
     /// <param name="newCommands">The set of commands to replace the old ones with.</param>
     public void ReplaceCommands (TEvent eventArgs, params Command [] newCommands)
     {
-#pragma warning disable CS8601 // Possible null reference assignment.
-        if (TryGet (eventArgs, out TBinding _))
-        {
-            Remove (eventArgs);
-            Add (eventArgs, newCommands);
-        }
-        else
-        {
-            Add (eventArgs, newCommands);
-        }
-#pragma warning restore CS8601 // Possible null reference assignment.
+        TBinding newBinding = _constructBinding (newCommands, eventArgs);
+
+        // Thread-safe: Add or update atomically
+        _bindings.AddOrUpdate (eventArgs, newBinding, (_, _) => newBinding);
     }
 
-    /// <summary>Removes a <typeparamref name="TEvent"/> from the collection.</summary>
-    /// <param name="eventArgs"></param>
-    public void Remove (TEvent eventArgs)
-    {
-        if (!TryGet (eventArgs, out _))
-        {
-            return;
-        }
-
-        _bindings.Remove (eventArgs);
-    }
+    /// <summary>Gets the commands bound with the specified <typeparamref name="TEvent"/>.</summary>
+    /// <remarks></remarks>
+    /// <param name="eventArgs">The <typeparamref name="TEvent"/> to check.</param>
+    /// <param name="binding">
+    ///     When this method returns, contains the commands bound with the <typeparamref name="TEvent"/>, if the
+    ///     <typeparamref name="TEvent"/> is
+    ///     not
+    ///     found; otherwise, null. This parameter is passed uninitialized.
+    /// </param>
+    /// <returns><see langword="true"/> if the <typeparamref name="TEvent"/> is bound; otherwise <see langword="false"/>.</returns>
+    public bool TryGet (TEvent eventArgs, out TBinding? binding) { return _bindings.TryGetValue (eventArgs, out binding); }
 }
diff --git a/Terminal.Gui/ViewBase/Runnable.cs b/Terminal.Gui/ViewBase/Runnable.cs
index eedbc09f1..cb2fef4ca 100644
--- a/Terminal.Gui/ViewBase/Runnable.cs
+++ b/Terminal.Gui/ViewBase/Runnable.cs
@@ -92,7 +92,7 @@ public class Runnable<TResult> : View, IRunnable<TResult>
     ///         // Or check if user wants to save first
     ///         if (HasUnsavedChanges ())
     ///         {
-    ///             int result = MessageBox.Query ("Save?", "Save changes?", "Yes", "No", "Cancel");
+    ///             int result = MessageBox.Query (App, "Save?", "Save changes?", "Yes", "No", "Cancel");
     ///             if (result == 2) return true;  // Cancel stopping
     ///             if (result == 0) Save ();
     ///         }
diff --git a/Terminal.Gui/ViewBase/RunnableWrapper.cs b/Terminal.Gui/ViewBase/RunnableWrapper.cs
index 5f1d46136..6d030c600 100644
--- a/Terminal.Gui/ViewBase/RunnableWrapper.cs
+++ b/Terminal.Gui/ViewBase/RunnableWrapper.cs
@@ -8,7 +8,8 @@ namespace Terminal.Gui.ViewBase;
 /// <typeparam name="TResult">The type of result data returned when the session completes.</typeparam>
 /// <remarks>
 ///     <para>
-///         This class enables any View to be run as a blocking session with <see cref="IApplication.Run"/>
+///         This class enables any View to be run as a blocking session with
+///         <see cref="IApplication.Run(Func{Exception, bool}, string)"/>
 ///         without requiring the View to implement <see cref="IRunnable{TResult}"/> or derive from
 ///         <see cref="Runnable{TResult}"/>.
 ///     </para>
diff --git a/Terminal.Gui/ViewBase/View.Diagnostics.cs b/Terminal.Gui/ViewBase/View.Diagnostics.cs
index 19f77eac7..07379c5dc 100644
--- a/Terminal.Gui/ViewBase/View.Diagnostics.cs
+++ b/Terminal.Gui/ViewBase/View.Diagnostics.cs
@@ -2,6 +2,7 @@
 
 public partial class View
 {
+    // TODO: Make this a configuration property
     /// <summary>Gets or sets whether diagnostic information will be drawn. This is a bit-field of <see cref="ViewDiagnosticFlags"/>.e <see cref="View"/> diagnostics.</summary>
     /// <remarks>
     /// <para>
diff --git a/Terminal.Gui/ViewBase/View.Drawing.Attribute.cs b/Terminal.Gui/ViewBase/View.Drawing.Attribute.cs
index 81167c439..075b461f4 100644
--- a/Terminal.Gui/ViewBase/View.Drawing.Attribute.cs
+++ b/Terminal.Gui/ViewBase/View.Drawing.Attribute.cs
@@ -104,7 +104,7 @@ public partial class View
 
     /// <summary>
     ///     Selects the specified Attribute
-    ///     as the Attribute to use for subsequent calls to <see cref="AddRune(System.Text.Rune)"/> and <see cref="AddStr"/>.
+    ///     as the Attribute to use for subsequent calls to <see cref="AddRune(System.Text.Rune)"/> and <see cref="AddStr(string)"/>.
     /// </summary>
     /// <param name="attribute">THe Attribute to set.</param>
     /// <returns>The previously set Attribute.</returns>
@@ -112,7 +112,7 @@ public partial class View
 
     /// <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"/>.
+    ///     as the Attribute to use for subsequent calls to <see cref="AddRune(System.Text.Rune)"/> and <see cref="AddStr(string)"/>.
     ///     <para>
     ///         Calls <see cref="GetAttributeForRole"/> to get the Attribute associated with the specified role, which will
     ///         raise <see cref="OnGettingAttributeForRole"/>/<see cref="GettingAttributeForRole"/>.
diff --git a/Terminal.Gui/Views/Button.cs b/Terminal.Gui/Views/Button.cs
index 626af1852..b003d0c75 100644
--- a/Terminal.Gui/Views/Button.cs
+++ b/Terminal.Gui/Views/Button.cs
@@ -1,4 +1,3 @@
-
 #nullable disable
 namespace Terminal.Gui.Views;
 
@@ -24,6 +23,9 @@ namespace Terminal.Gui.Views;
 /// </remarks>
 public class Button : View, IDesignable
 {
+    private static ShadowStyle _defaultShadow = ShadowStyle.Opaque; // Resources/config.json overrides
+    private static MouseState _defaultHighlightStates = MouseState.In | MouseState.Pressed | MouseState.PressedOutside; // Resources/config.json overrides
+
     private readonly Rune _leftBracket;
     private readonly Rune _leftDefault;
     private readonly Rune _rightBracket;
@@ -34,13 +36,21 @@ public class Button : View, IDesignable
     ///     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.Opaque;
+    public static ShadowStyle DefaultShadow
+    {
+        get => _defaultShadow;
+        set => _defaultShadow = value;
+    }
 
     /// <summary>
     ///     Gets or sets the default Highlight Style.
     /// </summary>
     [ConfigurationProperty (Scope = typeof (ThemeScope))]
-    public static MouseState DefaultHighlightStates { get; set; } = MouseState.In | MouseState.Pressed | MouseState.PressedOutside;
+    public static MouseState DefaultHighlightStates
+    {
+        get => _defaultHighlightStates;
+        set => _defaultHighlightStates = value;
+    }
 
     /// <summary>Initializes a new instance of <see cref="Button"/>.</summary>
     public Button ()
diff --git a/Terminal.Gui/Views/CharMap/CharMap.cs b/Terminal.Gui/Views/CharMap/CharMap.cs
index 370c50c6b..094b7a9ba 100644
--- a/Terminal.Gui/Views/CharMap/CharMap.cs
+++ b/Terminal.Gui/Views/CharMap/CharMap.cs
@@ -281,8 +281,8 @@ public class CharMap : View, IDesignable
         }
     }
 
-    private void CopyCodePoint () { Clipboard.Contents = $"U+{SelectedCodePoint:x5}"; }
-    private void CopyGlyph () { Clipboard.Contents = $"{new Rune (SelectedCodePoint)}"; }
+    private void CopyCodePoint () { App?.Clipboard?.SetClipboardData($"U+{SelectedCodePoint:x5}"); }
+    private void CopyGlyph () { App?.Clipboard?.SetClipboardData($"{new Rune (SelectedCodePoint)}"); }
 
     private bool? Move (ICommandContext? commandContext, int cpOffset)
     {
@@ -335,7 +335,7 @@ public class CharMap : View, IDesignable
     [RequiresDynamicCode ("AOT")]
     private void ShowDetails ()
     {
-        if (!Application.Initialized)
+        if (App is not { Initialized: true })
         {
             // Some unit tests invoke Accept without Init
             return;
@@ -380,15 +380,15 @@ public class CharMap : View, IDesignable
                                    try
                                    {
                                        decResponse = await client.GetCodepointDec (SelectedCodePoint).ConfigureAwait (false);
-                                       Application.Invoke ((_) => waitIndicator.RequestStop ());
+                                       App?.Invoke ((_) => (s as Dialog)?.RequestStop ());
                                    }
                                    catch (HttpRequestException e)
                                    {
                                        getCodePointError = errorLabel.Text = e.Message;
-                                       Application.Invoke ((_) => waitIndicator.RequestStop ());
+                                       App?.Invoke ((_) => (s as Dialog)?.RequestStop ());
                                    }
                                };
-        Application.Run (waitIndicator);
+        App?.Run (waitIndicator);
         waitIndicator.Dispose ();
 
         var name = string.Empty;
@@ -521,7 +521,7 @@ public class CharMap : View, IDesignable
 
         dlg.Add (json);
 
-        Application.Run (dlg);
+        App?.Run (dlg);
         dlg.Dispose ();
     }
 
diff --git a/Terminal.Gui/Views/CheckBox.cs b/Terminal.Gui/Views/CheckBox.cs
index 2a0535469..0dfb47e51 100644
--- a/Terminal.Gui/Views/CheckBox.cs
+++ b/Terminal.Gui/Views/CheckBox.cs
@@ -1,5 +1,3 @@
-
-
 namespace Terminal.Gui.Views;
 
 /// <summary>Shows a checkbox that can be cycled between two or three states.</summary>
@@ -10,11 +8,17 @@ namespace Terminal.Gui.Views;
 /// </remarks>
 public class CheckBox : View
 {
+    private static MouseState _defaultHighlightStates = MouseState.PressedOutside | MouseState.Pressed | MouseState.In; // Resources/config.json overrides
+
     /// <summary>
     ///     Gets or sets the default Highlight Style.
     /// </summary>
     [ConfigurationProperty (Scope = typeof (ThemeScope))]
-    public static MouseState DefaultHighlightStates { get; set; } = MouseState.PressedOutside | MouseState.Pressed | MouseState.In;
+    public static MouseState DefaultHighlightStates
+    {
+        get => _defaultHighlightStates;
+        set => _defaultHighlightStates = value;
+    }
 
     /// <summary>
     ///     Initializes a new instance of <see cref="CheckBox"/>.
diff --git a/Terminal.Gui/Views/CollectionNavigation/CollectionNavigator.cs b/Terminal.Gui/Views/CollectionNavigation/CollectionNavigator.cs
index c0eb7a312..ae3626fd1 100644
--- a/Terminal.Gui/Views/CollectionNavigation/CollectionNavigator.cs
+++ b/Terminal.Gui/Views/CollectionNavigation/CollectionNavigator.cs
@@ -1,5 +1,5 @@
 #nullable disable
-using System.Collections;
+using System.Collections;
 
 namespace Terminal.Gui.Views;
 
@@ -7,6 +7,9 @@ namespace Terminal.Gui.Views;
 /// <remarks>This implementation is based on a static <see cref="Collection"/> of objects.</remarks>
 internal class CollectionNavigator : CollectionNavigatorBase, IListCollectionNavigator
 {
+    private readonly object _collectionLock = new ();
+    private IList _collection;
+
     /// <summary>Constructs a new CollectionNavigator.</summary>
     public CollectionNavigator () { }
 
@@ -15,11 +18,39 @@ internal class CollectionNavigator : CollectionNavigatorBase, IListCollectionNav
     public CollectionNavigator (IList collection) { Collection = collection; }
 
     /// <inheritdoc/>
-    public IList Collection { get; set; }
+    public IList Collection
+    {
+        get
+        {
+            lock (_collectionLock)
+            {
+                return _collection;
+            }
+        }
+        set
+        {
+            lock (_collectionLock)
+            {
+                _collection = value;
+            }
+        }
+    }
 
     /// <inheritdoc/>
-    protected override object ElementAt (int idx) { return Collection [idx]; }
+    protected override object ElementAt (int idx)
+    {
+        lock (_collectionLock)
+        {
+            return Collection [idx];
+        }
+    }
 
     /// <inheritdoc/>
-    protected override int GetCollectionLength () { return Collection.Count; }
+    protected override int GetCollectionLength ()
+    {
+        lock (_collectionLock)
+        {
+            return Collection.Count;
+        }
+    }
 }
diff --git a/Terminal.Gui/Views/CollectionNavigation/CollectionNavigatorBase.cs b/Terminal.Gui/Views/CollectionNavigation/CollectionNavigatorBase.cs
index 7fd71f491..b7abad344 100644
--- a/Terminal.Gui/Views/CollectionNavigation/CollectionNavigatorBase.cs
+++ b/Terminal.Gui/Views/CollectionNavigation/CollectionNavigatorBase.cs
@@ -1,10 +1,9 @@
-
-
 namespace Terminal.Gui.Views;
 
 /// <inheritdoc/>
 internal abstract class CollectionNavigatorBase : ICollectionNavigator
 {
+    private readonly object _lock = new ();
     private DateTime _lastKeystroke = DateTime.Now;
     private string _searchString = "";
 
@@ -14,10 +13,20 @@ internal abstract class CollectionNavigatorBase : ICollectionNavigator
     /// <inheritdoc/>
     public string SearchString
     {
-        get => _searchString;
+        get
+        {
+            lock (_lock)
+            {
+                return _searchString;
+            }
+        }
         private set
         {
-            _searchString = value;
+            lock (_lock)
+            {
+                _searchString = value;
+            }
+
             OnSearchStringChanged (new (value));
         }
     }
@@ -40,15 +49,22 @@ internal abstract class CollectionNavigatorBase : ICollectionNavigator
             // but if we find none then we must fallback on cycling
             // d instead and discard the candidate state
             var candidateState = "";
-            TimeSpan elapsedTime = DateTime.Now - _lastKeystroke;
+            TimeSpan elapsedTime;
+            string currentSearchString;
+
+            lock (_lock)
+            {
+                elapsedTime = DateTime.Now - _lastKeystroke;
+                currentSearchString = _searchString;
+            }
 
             Logging.Debug ($"CollectionNavigator began processing '{keyStruck}', it has been {elapsedTime} since last keystroke");
 
             // is it a second or third (etc) keystroke within a short time
-            if (SearchString.Length > 0 && elapsedTime < TimeSpan.FromMilliseconds (TypingDelay))
+            if (currentSearchString.Length > 0 && elapsedTime < TimeSpan.FromMilliseconds (TypingDelay))
             {
                 // "dd" is a candidate
-                candidateState = SearchString + keyStruck;
+                candidateState = currentSearchString + keyStruck;
                 Logging.Debug ($"Appending, search is now for '{candidateState}'");
             }
             else
@@ -72,7 +88,11 @@ internal abstract class CollectionNavigatorBase : ICollectionNavigator
             if (idxCandidate is { })
             {
                 // found "dd" so candidate search string is accepted
-                _lastKeystroke = DateTime.Now;
+                lock (_lock)
+                {
+                    _lastKeystroke = DateTime.Now;
+                }
+
                 SearchString = candidateState;
 
                 Logging.Debug ($"Found collection item that matched search:{idxCandidate}");
@@ -82,7 +102,11 @@ internal abstract class CollectionNavigatorBase : ICollectionNavigator
 
             //// nothing matches "dd" so discard it as a candidate
             //// and just cycle "d" instead
-            _lastKeystroke = DateTime.Now;
+            lock (_lock)
+            {
+                _lastKeystroke = DateTime.Now;
+            }
+
             idxCandidate = GetNextMatchingItem (currentIndex, candidateState);
 
             Logging.Debug ($"CollectionNavigator searching (any match) matched:{idxCandidate}");
@@ -206,6 +230,10 @@ internal abstract class CollectionNavigatorBase : ICollectionNavigator
     private void ClearSearchString ()
     {
         SearchString = "";
-        _lastKeystroke = DateTime.Now;
+
+        lock (_lock)
+        {
+            _lastKeystroke = DateTime.Now;
+        }
     }
 }
diff --git a/Terminal.Gui/Views/Color/ColorPicker.Prompt.cs b/Terminal.Gui/Views/Color/ColorPicker.Prompt.cs
index 400040e63..11609be67 100644
--- a/Terminal.Gui/Views/Color/ColorPicker.Prompt.cs
+++ b/Terminal.Gui/Views/Color/ColorPicker.Prompt.cs
@@ -37,7 +37,7 @@ public partial class ColorPicker
                         {
                             accept = true;
                             e.Handled = true;
-                            Application.RequestStop ();
+                            (s as View)?.App?.RequestStop ();
                         };
 
         var btnCancel = new Button
@@ -51,7 +51,7 @@ public partial class ColorPicker
         btnCancel.Accepting += (s, e) =>
                             {
                                 e.Handled = true;
-                                Application.RequestStop ();
+                                (s as View)?.App ?.RequestStop ();
                             };
 
         d.Add (btnOk);
diff --git a/Terminal.Gui/Views/Dialog.cs b/Terminal.Gui/Views/Dialog.cs
index 1a5b4b362..03797368d 100644
--- a/Terminal.Gui/Views/Dialog.cs
+++ b/Terminal.Gui/Views/Dialog.cs
@@ -1,4 +1,3 @@
-
 namespace Terminal.Gui.Views;
 
 /// <summary>
@@ -11,10 +10,17 @@ namespace Terminal.Gui.Views;
 ///     <see cref="IApplication.Run(Toplevel, Func{Exception, bool})"/>. This will execute the dialog until
 ///     it terminates via the <see cref="Application.QuitKey"/> (`Esc` by default),
 ///     or when one of the views or buttons added to the dialog calls
-///     <see cref="Application.RequestStop"/>.
+///     <see cref="IApplication.RequestStop()"/>.
 /// </remarks>
 public class Dialog : Window
 {
+    private static LineStyle _defaultBorderStyle = LineStyle.Heavy; // Resources/config.json overrides
+    private static Alignment _defaultButtonAlignment = Alignment.End; // Resources/config.json overrides
+    private static AlignmentModes _defaultButtonAlignmentModes = AlignmentModes.StartToEnd | AlignmentModes.AddSpaceBetweenItems; // Resources/config.json overrides
+    private static int _defaultMinimumHeight = 80; // Resources/config.json overrides
+    private static int _defaultMinimumWidth = 80; // Resources/config.json overrides
+    private static ShadowStyle _defaultShadow = ShadowStyle.Transparent; // Resources/config.json overrides
+
     /// <summary>
     ///     Initializes a new instance of the <see cref="Dialog"/> class with no <see cref="Button"/>s.
     /// </summary>
@@ -107,37 +113,61 @@ public class Dialog : Window
     /// </summary>
 
     [ConfigurationProperty (Scope = typeof (ThemeScope))]
-    public new static LineStyle DefaultBorderStyle { get; set; } = LineStyle.Heavy;
+    public new static LineStyle DefaultBorderStyle
+    {
+        get => _defaultBorderStyle;
+        set => _defaultBorderStyle = value;
+    }
 
     /// <summary>The default <see cref="Alignment"/> for <see cref="Dialog"/>.</summary>
     /// <remarks>This property can be set in a Theme.</remarks>
     [ConfigurationProperty (Scope = typeof (ThemeScope))]
-    public static Alignment DefaultButtonAlignment { get; set; } = Alignment.End;
+    public static Alignment DefaultButtonAlignment
+    {
+        get => _defaultButtonAlignment;
+        set => _defaultButtonAlignment = value;
+    }
 
     /// <summary>The default <see cref="AlignmentModes"/> for <see cref="Dialog"/>.</summary>
     /// <remarks>This property can be set in a Theme.</remarks>
     [ConfigurationProperty (Scope = typeof (ThemeScope))]
-    public static AlignmentModes DefaultButtonAlignmentModes { get; set; } = AlignmentModes.StartToEnd | AlignmentModes.AddSpaceBetweenItems;
+    public static AlignmentModes DefaultButtonAlignmentModes
+    {
+        get => _defaultButtonAlignmentModes;
+        set => _defaultButtonAlignmentModes = value;
+    }
 
     /// <summary>
     ///     Defines the default minimum Dialog height, as a percentage of the container width. Can be configured via
     ///     <see cref="ConfigurationManager"/>.
     /// </summary>
     [ConfigurationProperty (Scope = typeof (ThemeScope))]
-    public static int DefaultMinimumHeight { get; set; } = 80;
+    public static int DefaultMinimumHeight
+    {
+        get => _defaultMinimumHeight;
+        set => _defaultMinimumHeight = value;
+    }
 
     /// <summary>
     ///     Defines the default minimum Dialog width, as a percentage of the container width. Can be configured via
     ///     <see cref="ConfigurationManager"/>.
     /// </summary>
     [ConfigurationProperty (Scope = typeof (ThemeScope))]
-    public static int DefaultMinimumWidth { get; set; } = 80;
+    public static int DefaultMinimumWidth
+    {
+        get => _defaultMinimumWidth;
+        set => _defaultMinimumWidth = value;
+    }
 
     /// <summary>
     ///     Gets or sets whether all <see cref="Window"/>s are shown with a shadow effect by default.
     /// </summary>
     [ConfigurationProperty (Scope = typeof (ThemeScope))]
-    public new static ShadowStyle DefaultShadow { get; set; } = ShadowStyle.Transparent;
+    public new static ShadowStyle DefaultShadow
+    {
+        get => _defaultShadow;
+        set => _defaultShadow = value;
+    }
 
 
     // Dialogs are Modal and Focus is indicated by their Border. The following code ensures the
diff --git a/Terminal.Gui/Views/FileDialogs/DefaultFileOperations.cs b/Terminal.Gui/Views/FileDialogs/DefaultFileOperations.cs
index 467e8d74c..25214cf17 100644
--- a/Terminal.Gui/Views/FileDialogs/DefaultFileOperations.cs
+++ b/Terminal.Gui/Views/FileDialogs/DefaultFileOperations.cs
@@ -7,7 +7,7 @@ namespace Terminal.Gui.Views;
 public class DefaultFileOperations : IFileOperations
 {
     /// <inheritdoc/>
-    public bool Delete (IEnumerable<IFileSystemInfo> toDelete)
+    public bool Delete (IApplication app, IEnumerable<IFileSystemInfo> toDelete)
     {
         // Default implementation does not allow deleting multiple files
         if (toDelete.Count () != 1)
@@ -18,7 +18,7 @@ public class DefaultFileOperations : IFileOperations
         IFileSystemInfo d = toDelete.Single ();
         string adjective = d.Name;
 
-        int result = MessageBox.Query (
+        int? result = MessageBox.Query (app,
                                        string.Format (Strings.fdDeleteTitle, adjective),
                                        string.Format (Strings.fdDeleteBody, adjective),
                                        Strings.btnYes,
@@ -43,14 +43,14 @@ public class DefaultFileOperations : IFileOperations
         }
         catch (Exception ex)
         {
-            MessageBox.ErrorQuery (Strings.fdDeleteFailedTitle, ex.Message, Strings.btnOk);
+            MessageBox.ErrorQuery (app, Strings.fdDeleteFailedTitle, ex.Message, Strings.btnOk);
         }
 
         return false;
     }
 
     /// <inheritdoc/>
-    public IFileSystemInfo Rename (IFileSystem fileSystem, IFileSystemInfo toRename)
+    public IFileSystemInfo Rename (IApplication app, IFileSystem fileSystem, IFileSystemInfo toRename)
     {
         // Don't allow renaming C: or D: or / (on linux) etc
         if (toRename is IDirectoryInfo dir && dir.Parent is null)
@@ -95,7 +95,7 @@ public class DefaultFileOperations : IFileOperations
                 }
                 catch (Exception ex)
                 {
-                    MessageBox.ErrorQuery (Strings.fdRenameFailedTitle, ex.Message, "Ok");
+                    MessageBox.ErrorQuery (app, Strings.fdRenameFailedTitle, ex.Message, "Ok");
                 }
             }
         }
@@ -104,7 +104,7 @@ public class DefaultFileOperations : IFileOperations
     }
 
     /// <inheritdoc/>
-    public IFileSystemInfo New (IFileSystem fileSystem, IDirectoryInfo inDirectory)
+    public IFileSystemInfo New (IApplication app, IFileSystem fileSystem, IDirectoryInfo inDirectory)
     {
         if (Prompt (Strings.fdNewTitle, "", out string named))
         {
@@ -122,7 +122,7 @@ public class DefaultFileOperations : IFileOperations
                 }
                 catch (Exception ex)
                 {
-                    MessageBox.ErrorQuery (Strings.fdNewFailed, ex.Message, "Ok");
+                    MessageBox.ErrorQuery (app, Strings.fdNewFailed, ex.Message, "Ok");
                 }
             }
         }
@@ -138,7 +138,7 @@ public class DefaultFileOperations : IFileOperations
         btnOk.Accepting += (s, e) =>
                          {
                              confirm = true;
-                             Application.RequestStop ();
+                             (s as View)?.App?.RequestStop ();
                              // When Accepting is handled, set e.Handled to true to prevent further processing.
                              e.Handled = true;
                          };
@@ -147,7 +147,7 @@ public class DefaultFileOperations : IFileOperations
         btnCancel.Accepting += (s, e) =>
                              {
                                  confirm = false;
-                                 Application.RequestStop ();
+                                 (s as View)?.App?.RequestStop ();
                                  // When Accepting is handled, set e.Handled to true to prevent further processing.
                                  e.Handled = true;
                              };
diff --git a/Terminal.Gui/Views/FileDialogs/FileDialog.cs b/Terminal.Gui/Views/FileDialogs/FileDialog.cs
index a24c82f0a..b0dfeb9d6 100644
--- a/Terminal.Gui/Views/FileDialogs/FileDialog.cs
+++ b/Terminal.Gui/Views/FileDialogs/FileDialog.cs
@@ -108,7 +108,7 @@ public class FileDialog : Dialog, IDesignable
 
                                     if (Modal)
                                     {
-                                        Application.RequestStop ();
+                                        (s as View)?.App?.RequestStop ();
                                     }
                                 };
 
@@ -468,7 +468,6 @@ public class FileDialog : Dialog, IDesignable
         Style.IconProvider.IsOpenGetter = _treeView.IsExpanded;
 
         _treeView.AddObjects (_treeRoots.Keys);
-#if MENU_V1
 
         // if filtering on file type is configured then create the ComboBox and establish
         // initial filtering by extension(s)
@@ -479,6 +478,7 @@ public class FileDialog : Dialog, IDesignable
             // Fiddle factor
             int width = AllowedTypes.Max (a => a.ToString ()!.Length) + 6;
 
+#if MENU_V1
             _allowedTypeMenu = new (
                                     "<placeholder>",
                                     _allowedTypeMenuItems = AllowedTypes.Select (
@@ -512,8 +512,8 @@ public class FileDialog : Dialog, IDesignable
                                                   };
 
             Add (_allowedTypeMenuBar);
-        }
 #endif
+        }
 
         // if no path has been provided
         if (_tbPath.Text.Length <= 0)
@@ -849,7 +849,7 @@ public class FileDialog : Dialog, IDesignable
     {
         IFileSystemInfo [] toDelete = GetFocusedFiles ()!;
 
-        if (FileOperationsHandler.Delete (toDelete))
+        if (FileOperationsHandler.Delete (App, toDelete))
         {
             RefreshState ();
         }
@@ -879,7 +879,7 @@ public class FileDialog : Dialog, IDesignable
 
         if (Modal)
         {
-            Application.RequestStop ();
+            App?.RequestStop ();
         }
     }
 
@@ -1039,7 +1039,7 @@ public class FileDialog : Dialog, IDesignable
     private void New ()
     {
         {
-            IFileSystemInfo created = FileOperationsHandler.New (_fileSystem!, State!.Directory);
+            IFileSystemInfo created = FileOperationsHandler.New (App, _fileSystem!, State!.Directory);
 
             if (created is { })
             {
@@ -1174,13 +1174,13 @@ public class FileDialog : Dialog, IDesignable
         PushState (State, false, false, false);
     }
 
-    private void Rename ()
+    private void Rename (IApplication? app)
     {
         IFileSystemInfo [] toRename = GetFocusedFiles ()!;
 
         if (toRename?.Length == 1)
         {
-            IFileSystemInfo newNamed = FileOperationsHandler.Rename (_fileSystem!, toRename.Single ());
+            IFileSystemInfo newNamed = FileOperationsHandler.Rename (app, _fileSystem!, toRename.Single ());
 
             if (newNamed is { })
             {
@@ -1230,7 +1230,7 @@ public class FileDialog : Dialog, IDesignable
         PopoverMenu? contextMenu = new (
                                         [
                                             new (Strings.fdCtxNew, string.Empty, New),
-                                            new (Strings.fdCtxRename, string.Empty, Rename),
+                                            new (Strings.fdCtxRename, string.Empty, () => Rename (App)),
                                             new (Strings.fdCtxDelete, string.Empty, Delete)
                                         ]);
 
@@ -1327,7 +1327,7 @@ public class FileDialog : Dialog, IDesignable
 
         if (keyEvent.KeyCode == (KeyCode.CtrlMask | KeyCode.R))
         {
-            Rename ();
+            Rename (App);
 
             return true;
         }
diff --git a/Terminal.Gui/Views/FrameView.cs b/Terminal.Gui/Views/FrameView.cs
index cd99731b9..db2c0c2df 100644
--- a/Terminal.Gui/Views/FrameView.cs
+++ b/Terminal.Gui/Views/FrameView.cs
@@ -1,5 +1,3 @@
-
-
 namespace Terminal.Gui.Views;
 
 // TODO: FrameView is mis-named, really. It's far more about it being a TabGroup than a frame. 
@@ -19,6 +17,8 @@ namespace Terminal.Gui.Views;
 /// <seealso cref="Window"/>
 public class FrameView : View
 {
+    private static LineStyle _defaultBorderStyle = LineStyle.Rounded; // Resources/config.json overrides
+
     /// <summary>
     ///     Initializes a new instance of the <see cref="FrameView"/> class.
     ///     layout.
@@ -31,13 +31,17 @@ public class FrameView : View
     }
 
     /// <summary>
-    ///     The default <see cref="LineStyle"/> for <see cref="FrameView"/>'s border. The default is
-    ///     <see cref="LineStyle.Single"/>.
+    ///     Defines the default border styling for <see cref="FrameView"/>. Can be configured via
+    ///     <see cref="ConfigurationManager"/>.
     /// </summary>
     /// <remarks>
     ///     This property can be set in a Theme to change the default <see cref="LineStyle"/> for all
     ///     <see cref="FrameView"/>s.
     /// </remarks>
     [ConfigurationProperty (Scope = typeof (ThemeScope))]
-    public static LineStyle DefaultBorderStyle { get; set; } = LineStyle.Rounded;
+    public static LineStyle DefaultBorderStyle
+    {
+        get => _defaultBorderStyle;
+        set => _defaultBorderStyle = value;
+    }
 }
diff --git a/Terminal.Gui/Views/GraphView/GraphView.cs b/Terminal.Gui/Views/GraphView/GraphView.cs
index 69f708da8..03cda9fed 100644
--- a/Terminal.Gui/Views/GraphView/GraphView.cs
+++ b/Terminal.Gui/Views/GraphView/GraphView.cs
@@ -8,7 +8,6 @@ public class GraphView : View, IDesignable
     /// <summary>Creates a new graph with a 1 to 1 graph space with absolute layout.</summary>
     public GraphView ()
     {
-        App = ApplicationImpl.Instance;
         CanFocus = true;
 
         AxisX = new ();
diff --git a/Terminal.Gui/Views/Menu/MenuBar.cs b/Terminal.Gui/Views/Menu/MenuBar.cs
index 67312b01e..7e45d2d6f 100644
--- a/Terminal.Gui/Views/Menu/MenuBar.cs
+++ b/Terminal.Gui/Views/Menu/MenuBar.cs
@@ -591,7 +591,7 @@ public class MenuBar : Menu, IDesignable
                                                            {
                                                                Title = "_File Settings...",
                                                                HelpText = "More file settings",
-                                                               Action = () => MessageBox.Query (
+                                                               Action = () => MessageBox.Query (App,
                                                                                                 "File Settings",
                                                                                                 "This is the File Settings Dialog\n",
                                                                                                 "_Ok",
@@ -665,12 +665,12 @@ public class MenuBar : Menu, IDesignable
                                     new MenuItem
                                     {
                                         Title = "_Online Help...",
-                                        Action = () => MessageBox.Query ("Online Help", "https://gui-cs.github.io/Terminal.Gui", "Ok")
+                                        Action = () => MessageBox.Query (App, "Online Help", "https://gui-cs.github.io/Terminal.Gui", "Ok")
                                     },
                                     new MenuItem
                                     {
                                         Title = "About...",
-                                        Action = () => MessageBox.Query ("About", "Something About Mary.", "Ok")
+                                        Action = () => MessageBox.Query (App, "About", "Something About Mary.", "Ok")
                                     }
                                 ]
                                )
@@ -734,7 +734,7 @@ public class MenuBar : Menu, IDesignable
                 {
                     Title = "_Deeper Detail",
                     Text = "Deeper Detail",
-                    Action = () => { MessageBox.Query ("Deeper Detail", "Lots of details", "_Ok"); }
+                    Action = () => { MessageBox.Query (App, "Deeper Detail", "Lots of details", "_Ok"); }
                 };
 
                 var belowLineDetail = new MenuItem
diff --git a/Terminal.Gui/Views/MessageBox.cs b/Terminal.Gui/Views/MessageBox.cs
index bdbf323a0..e9e874285 100644
--- a/Terminal.Gui/Views/MessageBox.cs
+++ b/Terminal.Gui/Views/MessageBox.cs
@@ -1,112 +1,205 @@
-#nullable disable
-
 namespace Terminal.Gui.Views;
 
 /// <summary>
-///     MessageBox displays a modal message to the user, with a title, a message and a series of options that the user
-///     can choose from.
+///     Displays a modal message box with a title, message, and buttons. Returns the index of the selected button,
+///     or <see langword="null"/> if the user cancels with <see cref="Application.QuitKey"/>.
 /// </summary>
-/// <para>
-///     The difference between the <see cref="Query(string, string, string[])"/> and
-///     <see cref="ErrorQuery(string, string, string[])"/> method is the default set of colors used for the message box.
-/// </para>
-/// <para>
-///     The following example pops up a <see cref="MessageBox"/> with the specified title and text, plus two
-///     <see cref="Button"/>s. The value -1 is returned when the user cancels the <see cref="MessageBox"/> by pressing the
-///     ESC key.
-/// </para>
-/// <example>
-///     <code lang="c#">
-/// var n = MessageBox.Query ("Quit Demo", "Are you sure you want to quit this demo?", "Yes", "No");
-/// if (n == 0)
-///    quit = true;
-/// else
-///    quit = false;
-/// </code>
-/// </example>
+/// <remarks>
+///     <para>
+///         MessageBox provides static methods for displaying modal dialogs with customizable buttons and messages.
+///         All methods return <see langword="int?"/> where the value is the 0-based index of the button pressed,
+///         or <see langword="null"/> if the user pressed <see cref="Application.QuitKey"/> (typically Esc).
+///     </para>
+///     <para>
+///         <see cref="Query(IApplication?, string, string, string[])"/> uses the default Dialog color scheme.
+///         <see cref="ErrorQuery(IApplication?, string, string, string[])"/> uses the Error color scheme.
+///     </para>
+///     <para>
+///         <b>Important:</b> All MessageBox methods require an <see cref="IApplication"/> instance to be passed.
+///         This enables proper modal dialog management and respects the application's lifecycle. Pass your
+///         application instance (from <see cref="Application.Create()"/>) or use the legacy
+///         <see cref="ApplicationImpl.Instance"/> if using the static Application pattern.
+///     </para>
+///     <para>
+///         Example using instance-based pattern:
+///         <code>
+///     IApplication app = Application.Create();
+///     app.Init();
+///     
+///     int? result = MessageBox.Query(app, "Quit Demo", "Are you sure you want to quit?", "Yes", "No");
+///     if (result == 0) // User clicked "Yes"
+///         app.RequestStop();
+///     else if (result == null) // User pressed Esc
+///         // Handle cancellation
+///         
+///     app.Shutdown();
+///     </code>
+///     </para>
+///     <para>
+///         Example using legacy static pattern:
+///         <code>
+///     Application.Init();
+///     
+///     int? result = MessageBox.Query(ApplicationImpl.Instance, "Quit Demo", "Are you sure?", "Yes", "No");
+///     if (result == 0) // User clicked "Yes"
+///         Application.RequestStop();
+///     
+///     Application.Shutdown();
+///     </code>
+///     </para>
+///     <para>
+///         The <see cref="Clicked"/> property provides a global variable alternative for web-based consoles
+///         without SynchronizationContext. However, using the return value is preferred as it's more thread-safe
+///         and follows modern async patterns.
+///     </para>
+/// </remarks>
 public static class MessageBox
 {
+    private static LineStyle _defaultBorderStyle = LineStyle.Heavy; // Resources/config.json overrides
+    private static Alignment _defaultButtonAlignment = Alignment.Center; // Resources/config.json overrides
+    private static int _defaultMinimumWidth = 0; // Resources/config.json overrides
+    private static int _defaultMinimumHeight = 0; // Resources/config.json overrides
+
     /// <summary>
     ///     Defines the default border styling for <see cref="MessageBox"/>. Can be configured via
     ///     <see cref="ConfigurationManager"/>.
     /// </summary>
     [ConfigurationProperty (Scope = typeof (ThemeScope))]
-    public static LineStyle DefaultBorderStyle { get; set; } = LineStyle.Heavy;
+    public static LineStyle DefaultBorderStyle
+    {
+        get => _defaultBorderStyle;
+        set => _defaultBorderStyle = value;
+    }
 
     /// <summary>The default <see cref="Alignment"/> for <see cref="Dialog"/>.</summary>
     /// <remarks>This property can be set in a Theme.</remarks>
     [ConfigurationProperty (Scope = typeof (ThemeScope))]
-    public static Alignment DefaultButtonAlignment { get; set; } = Alignment.Center;
+    public static Alignment DefaultButtonAlignment
+    {
+        get => _defaultButtonAlignment;
+        set => _defaultButtonAlignment = value;
+    }
 
     /// <summary>
     ///     Defines the default minimum MessageBox width, as a percentage of the screen width. Can be configured via
     ///     <see cref="ConfigurationManager"/>.
     /// </summary>
     [ConfigurationProperty (Scope = typeof (ThemeScope))]
-    public static int DefaultMinimumWidth { get; set; } = 0;
+    public static int DefaultMinimumWidth
+    {
+        get => _defaultMinimumWidth;
+        set => _defaultMinimumWidth = value;
+    }
 
     /// <summary>
     ///     Defines the default minimum Dialog height, as a percentage of the screen width. Can be configured via
     ///     <see cref="ConfigurationManager"/>.
     /// </summary>
     [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
-    ///     based console where there is no SynchronizationContext or TaskScheduler.
-    /// </summary>
-    /// <remarks>
-    ///     Warning: This is a global variable and should be used with caution. It is not thread safe.
-    /// </remarks>
-    public static int Clicked { get; private set; } = -1;
+    public static int DefaultMinimumHeight
+    {
+        get => _defaultMinimumHeight;
+        set => _defaultMinimumHeight = value;
+    }
 
     /// <summary>
-    ///     Presents an error <see cref="MessageBox"/> with the specified title and message and a list of buttons.
+    ///     The index of the selected button, or <see langword="null"/> if the user pressed <see cref="Application.QuitKey"/>.
     /// </summary>
-    /// <returns>The index of the selected button, or -1 if the user pressed <see cref="Application.QuitKey"/> to close the MessageBox.</returns>
+    /// <remarks>
+    ///     This global variable is useful for web-based consoles without a SynchronizationContext or TaskScheduler.
+    ///     Warning: Not thread-safe.
+    /// </remarks>
+    public static int? Clicked { get; private set; }
+
+    /// <summary>
+    ///     Displays an error <see cref="MessageBox"/> with fixed dimensions.
+    /// </summary>
+    /// <param name="app">The application instance. If <see langword="null"/>, uses <see cref="IApplication.TopRunnable"/>.</param>
     /// <param name="width">Width for the MessageBox.</param>
     /// <param name="height">Height for the MessageBox.</param>
     /// <param name="title">Title for the MessageBox.</param>
-    /// <param name="message">Message to display; might contain multiple lines. The message will be word=wrapped by default.</param>
-    /// <param name="buttons">Array of buttons to add.</param>
+    /// <param name="message">Message to display. May contain multiple lines and will be word-wrapped.</param>
+    /// <param name="buttons">Array of button labels.</param>
+    /// <returns>
+    ///     The index of the selected button, or <see langword="null"/> if the user pressed
+    ///     <see cref="Application.QuitKey"/>.
+    /// </returns>
+    /// <exception cref="ArgumentNullException">Thrown if <paramref name="app"/> is <see langword="null"/>.</exception>
     /// <remarks>
-    ///     Use <see cref="ErrorQuery(string, string, string[])"/> instead; it automatically sizes the MessageBox based on
-    ///     the contents.
+    ///     Consider using <see cref="ErrorQuery(IApplication?, string, string, string[])"/> which automatically sizes the
+    ///     MessageBox.
     /// </remarks>
-    public static int ErrorQuery (int width, int height, string title, string message, params string [] buttons)
+    public static int? ErrorQuery (
+        IApplication? app,
+        int width,
+        int height,
+        string title,
+        string message,
+        params string [] buttons
+    )
     {
-        return QueryFull (true, width, height, title, message, 0, true, buttons);
+        return QueryFull (
+                          app,
+                          true,
+                          width,
+                          height,
+                          title,
+                          message,
+                          0,
+                          true,
+                          buttons);
     }
 
     /// <summary>
-    ///     Presents an error <see cref="MessageBox"/> with the specified title and message and a list of buttons to show
-    ///     to the user.
+    ///     Displays an auto-sized error <see cref="MessageBox"/>.
     /// </summary>
-    /// <returns>The index of the selected button, or -1 if the user pressed <see cref="Application.QuitKey"/> to close the MessageBox.</returns>
-    /// <param name="title">Title for the query.</param>
-    /// <param name="message">Message to display; might contain multiple lines. The message will be word=wrapped by default.</param>
-    /// <param name="buttons">Array of buttons to add.</param>
+    /// <param name="app">The application instance. If <see langword="null"/>, uses <see cref="IApplication.TopRunnable"/>.</param>
+    /// <param name="title">Title for the MessageBox.</param>
+    /// <param name="message">Message to display. May contain multiple lines and will be word-wrapped.</param>
+    /// <param name="buttons">Array of button labels.</param>
+    /// <returns>
+    ///     The index of the selected button, or <see langword="null"/> if the user pressed
+    ///     <see cref="Application.QuitKey"/>.
+    /// </returns>
+    /// <exception cref="ArgumentNullException">Thrown if <paramref name="app"/> is <see langword="null"/>.</exception>
     /// <remarks>
-    ///     The message box will be vertically and horizontally centered in the container and the size will be
-    ///     automatically determined from the size of the title, message. and buttons.
+    ///     The MessageBox is centered and auto-sized based on title, message, and buttons.
     /// </remarks>
-    public static int ErrorQuery (string title, string message, params string [] buttons) { return QueryFull (true, 0, 0, title, message, 0, true, buttons); }
+    public static int? ErrorQuery (IApplication? app, string title, string message, params string [] buttons)
+    {
+        return QueryFull (
+                          app,
+                          true,
+                          0,
+                          0,
+                          title,
+                          message,
+                          0,
+                          true,
+                          buttons);
+    }
 
     /// <summary>
-    ///     Presents an error <see cref="MessageBox"/> with the specified title and message and a list of buttons.
+    ///     Displays an error <see cref="MessageBox"/> with fixed dimensions and a default button.
     /// </summary>
-    /// <returns>The index of the selected button, or -1 if the user pressed <see cref="Application.QuitKey"/> to close the MessageBox.</returns>
+    /// <param name="app">The application instance. If <see langword="null"/>, uses <see cref="IApplication.TopRunnable"/>.</param>
     /// <param name="width">Width for the MessageBox.</param>
     /// <param name="height">Height for the MessageBox.</param>
     /// <param name="title">Title for the MessageBox.</param>
-    /// <param name="message">Message to display; might contain multiple lines. The message will be word=wrapped by default.</param>
-    /// <param name="defaultButton">Index of the default button.</param>
-    /// <param name="buttons">Array of buttons to add.</param>
+    /// <param name="message">Message to display. May contain multiple lines and will be word-wrapped.</param>
+    /// <param name="defaultButton">Index of the default button (0-based).</param>
+    /// <param name="buttons">Array of button labels.</param>
+    /// <returns>
+    ///     The index of the selected button, or <see langword="null"/> if the user pressed
+    ///     <see cref="Application.QuitKey"/>.
+    /// </returns>
+    /// <exception cref="ArgumentNullException">Thrown if <paramref name="app"/> is <see langword="null"/>.</exception>
     /// <remarks>
-    ///     Use <see cref="ErrorQuery(string, string, string[])"/> instead; it automatically sizes the MessageBox based on
-    ///     the contents.
+    ///     Consider using <see cref="ErrorQuery(IApplication?, string, string, int, string[])"/> which automatically sizes the
+    ///     MessageBox.
     /// </remarks>
-    public static int ErrorQuery (
+    public static int? ErrorQuery (
+        IApplication? app,
         int width,
         int height,
         string title,
@@ -115,184 +208,73 @@ public static class MessageBox
         params string [] buttons
     )
     {
-        return QueryFull (true, width, height, title, message, defaultButton, true, buttons);
+        return QueryFull (
+                          app,
+                          true,
+                          width,
+                          height,
+                          title,
+                          message,
+                          defaultButton,
+                          true,
+                          buttons);
     }
 
     /// <summary>
-    ///     Presents an error <see cref="MessageBox"/> with the specified title and message and a list of buttons to show
-    ///     to the user.
+    ///     Displays an auto-sized error <see cref="MessageBox"/> with a default button.
     /// </summary>
-    /// <returns>The index of the selected button, or -1 if the user pressed <see cref="Application.QuitKey"/> to close the MessageBox.</returns>
+    /// <param name="app">The application instance. If <see langword="null"/>, uses <see cref="IApplication.TopRunnable"/>.</param>
     /// <param name="title">Title for the MessageBox.</param>
-    /// <param name="message">Message to display; might contain multiple lines. The message will be word=wrapped by default.</param>
-    /// <param name="defaultButton">Index of the default button.</param>
-    /// <param name="buttons">Array of buttons to add.</param>
+    /// <param name="message">Message to display. May contain multiple lines and will be word-wrapped.</param>
+    /// <param name="defaultButton">Index of the default button (0-based).</param>
+    /// <param name="buttons">Array of button labels.</param>
+    /// <returns>
+    ///     The index of the selected button, or <see langword="null"/> if the user pressed
+    ///     <see cref="Application.QuitKey"/>.
+    /// </returns>
+    /// <exception cref="ArgumentNullException">Thrown if <paramref name="app"/> is <see langword="null"/>.</exception>
     /// <remarks>
-    ///     The message box will be vertically and horizontally centered in the container and the size will be
-    ///     automatically determined from the size of the title, message. and buttons.
+    ///     The MessageBox is centered and auto-sized based on title, message, and buttons.
     /// </remarks>
-    public static int ErrorQuery (string title, string message, int defaultButton = 0, params string [] buttons)
+    public static int? ErrorQuery (IApplication? app, string title, string message, int defaultButton = 0, params string [] buttons)
     {
-        return QueryFull (true, 0, 0, title, message, defaultButton, true, buttons);
+        return QueryFull (
+                          app,
+                          true,
+                          0,
+                          0,
+                          title,
+                          message,
+                          defaultButton,
+                          true,
+                          buttons);
     }
 
     /// <summary>
-    ///     Presents an error <see cref="MessageBox"/> with the specified title and message and a list of buttons to show
-    ///     to the user.
+    ///     Displays an error <see cref="MessageBox"/> with fixed dimensions, a default button, and word-wrap control.
     /// </summary>
-    /// <returns>The index of the selected button, or -1 if the user pressed <see cref="Application.QuitKey"/> to close the MessageBox.</returns>
-    /// <param name="width">Width for the window.</param>
-    /// <param name="height">Height for the window.</param>
-    /// <param name="title">Title for the query.</param>
-    /// <param name="message">Message to display; might contain multiple lines. The message will be word=wrapped by default.</param>
-    /// <param name="defaultButton">Index of the default button.</param>
-    /// <param name="wrapMessage">If wrap the message or not.</param>
-    /// <param name="buttons">Array of buttons to add.</param>
-    /// <remarks>
-    ///     Use <see cref="ErrorQuery(string, string, string[])"/> instead; it automatically sizes the MessageBox based on
-    ///     the contents.
-    /// </remarks>
-    public static int ErrorQuery (
-        int width,
-        int height,
-        string title,
-        string message,
-        int defaultButton = 0,
-        bool wrapMessage = true,
-        params string [] buttons
-    )
-    {
-        return QueryFull (true, width, height, title, message, defaultButton, wrapMessage, buttons);
-    }
-
-    /// <summary>
-    ///     Presents an error <see cref="MessageBox"/> with the specified title and message and a list of buttons to show
-    ///     to the user.
-    /// </summary>
-    /// <returns>The index of the selected button, or -1 if the user pressed <see cref="Application.QuitKey"/> to close the MessageBox.</returns>
-    /// <param name="title">Title for the query.</param>
-    /// <param name="message">Message to display; might contain multiple lines. The message will be word=wrapped by default.</param>
-    /// <param name="defaultButton">Index of the default button.</param>
-    /// <param name="wrapMessage">If wrap the message or not. The default is <see langword="true"/></param>
-    /// <param name="buttons">Array of buttons to add.</param>
-    /// <remarks>
-    ///     The message box will be vertically and horizontally centered in the container and the size will be
-    ///     automatically determined from the size of the title, message. and buttons.
-    /// </remarks>
-    public static int ErrorQuery (
-        string title,
-        string message,
-        int defaultButton = 0,
-        bool wrapMessage = true,
-        params string [] buttons
-    )
-    {
-        return QueryFull (true, 0, 0, title, message, defaultButton, wrapMessage, buttons);
-    }
-
-    /// <summary>
-    ///     Presents a <see cref="MessageBox"/> with the specified title and message and a list of buttons.
-    /// </summary>
-    /// <returns>The index of the selected button, or -1 if the user pressed <see cref="Application.QuitKey"/> to close the MessageBox.</returns>
+    /// <param name="app">The application instance. If <see langword="null"/>, uses <see cref="IApplication.TopRunnable"/>.</param>
     /// <param name="width">Width for the MessageBox.</param>
     /// <param name="height">Height for the MessageBox.</param>
     /// <param name="title">Title for the MessageBox.</param>
-    /// <param name="message">Message to display; might contain multiple lines. The message will be word=wrapped by default.</param>
-    /// <param name="buttons">Array of buttons to add.</param>
+    /// <param name="message">Message to display. May contain multiple lines.</param>
+    /// <param name="defaultButton">Index of the default button (0-based).</param>
+    /// <param name="wrapMessage">
+    ///     If <see langword="true"/>, word-wraps the message; otherwise displays as-is with multi-line
+    ///     support.
+    /// </param>
+    /// <param name="buttons">Array of button labels.</param>
+    /// <returns>
+    ///     The index of the selected button, or <see langword="null"/> if the user pressed
+    ///     <see cref="Application.QuitKey"/>.
+    /// </returns>
+    /// <exception cref="ArgumentNullException">Thrown if <paramref name="app"/> is <see langword="null"/>.</exception>
     /// <remarks>
-    ///     Use <see cref="Query(string, string, string[])"/> instead; it automatically sizes the MessageBox based on
-    ///     the contents.
+    ///     Consider using <see cref="ErrorQuery(IApplication?, string, string, int, bool, string[])"/> which automatically
+    ///     sizes the MessageBox.
     /// </remarks>
-    public static int Query (int width, int height, string title, string message, params string [] buttons)
-    {
-        return QueryFull (false, width, height, title, message, 0, true, buttons);
-    }
-
-    /// <summary>
-    ///     Presents a <see cref="MessageBox"/> with the specified title and message and a list of buttons.
-    /// </summary>
-    /// <returns>The index of the selected button, or -1 if the user pressed <see cref="Application.QuitKey"/> to close the MessageBox.</returns>
-    /// <param name="title">Title for the MessageBox.</param>
-    /// <param name="message">Message to display; might contain multiple lines. The message will be word=wrapped by default.</param>
-    /// <param name="buttons">Array of buttons to add.</param>
-    /// <remarks>
-    /// <para>
-    ///     The message box will be vertically and horizontally centered in the container and the size will be
-    ///     automatically determined from the size of the title, message. and buttons.
-    /// </para>
-    /// <para>
-    ///     Use <see cref="Query(string, string, string[])"/> instead; it automatically sizes the MessageBox based on
-    ///     the contents.
-    /// </para>
-    /// </remarks>
-    public static int Query (string title, string message, params string [] buttons) { return QueryFull (false, 0, 0, title, message, 0, true, buttons); }
-
-    /// <summary>
-    ///     Presents a <see cref="MessageBox"/> with the specified title and message and a list of buttons.
-    /// </summary>
-    /// <returns>The index of the selected button, or -1 if the user pressed <see cref="Application.QuitKey"/> to close the MessageBox.</returns>
-    /// <param name="width">Width for the window.</param>
-    /// <param name="height">Height for the window.</param>
-    /// <param name="title">Title for the MessageBox.</param>
-    /// <param name="message">Message to display; might contain multiple lines. The message will be word=wrapped by default.</param>
-    /// <param name="defaultButton">Index of the default button.</param>
-    /// <param name="buttons">Array of buttons to add.</param>
-    /// <remarks>
-    /// <para>
-    ///     The message box will be vertically and horizontally centered in the container and the size will be
-    ///     automatically determined from the size of the title, message. and buttons.
-    /// </para>
-    /// <para>
-    ///     Use <see cref="Query(string, string, string[])"/> instead; it automatically sizes the MessageBox based on
-    ///     the contents.
-    /// </para>
-    /// </remarks>
-    public static int Query (
-        int width,
-        int height,
-        string title,
-        string message,
-        int defaultButton = 0,
-        params string [] buttons
-    )
-    {
-        return QueryFull (false, width, height, title, message, defaultButton, true, buttons);
-    }
-
-    /// <summary>
-    ///     Presents a <see cref="MessageBox"/> with the specified title and message and a list of buttons.
-    /// </summary>
-    /// <returns>The index of the selected button, or -1 if the user pressed <see cref="Application.QuitKey"/> to close the MessageBox.</returns>
-    /// <param name="title">Title for the MessageBox.</param>
-    /// <param name="message">Message to display; might contain multiple lines. The message will be word=wrapped by default.</param>
-    /// <param name="defaultButton">Index of the default button.</param>
-    /// <param name="buttons">Array of buttons to add.</param>
-    /// <remarks>
-    ///     The message box will be vertically and horizontally centered in the container and the size will be
-    ///     automatically determined from the size of the message and buttons.
-    /// </remarks>
-    public static int Query (string title, string message, int defaultButton = 0, params string [] buttons)
-    {
-        return QueryFull (false, 0, 0, title, message, defaultButton, true, buttons);
-    }
-
-    /// <summary>
-    ///     Presents a <see cref="MessageBox"/> with the specified title and message and a list of buttons to show
-    ///     to the user.
-    /// </summary>
-    /// <returns>The index of the selected button, or -1 if the user pressed <see cref="Application.QuitKey"/> to close the MessageBox.</returns>
-    /// <param name="width">Width for the window.</param>
-    /// <param name="height">Height for the window.</param>
-    /// <param name="title">Title for the query.</param>
-    /// <param name="message">Message to display, might contain multiple lines.</param>
-    /// <param name="defaultButton">Index of the default button.</param>
-    /// <param name="wrapMessage">If wrap the message or not.</param>
-    /// <param name="buttons">Array of buttons to add.</param>
-    /// <remarks>
-    ///     Use <see cref="Query(string, string, string[])"/> instead; it automatically sizes the MessageBox based on the
-    ///     contents.
-    /// </remarks>
-    public static int Query (
+    public static int? ErrorQuery (
+        IApplication? app,
         int width,
         int height,
         string title,
@@ -302,20 +284,40 @@ public static class MessageBox
         params string [] buttons
     )
     {
-        return QueryFull (false, width, height, title, message, defaultButton, wrapMessage, buttons);
+        return QueryFull (
+                          app,
+                          true,
+                          width,
+                          height,
+                          title,
+                          message,
+                          defaultButton,
+                          wrapMessage,
+                          buttons);
     }
 
     /// <summary>
-    ///     Presents a <see cref="MessageBox"/> with the specified title and message and a list of buttons to show
-    ///     to the user.
+    ///     Displays an auto-sized error <see cref="MessageBox"/> with a default button and word-wrap control.
     /// </summary>
-    /// <returns>The index of the selected button, or -1 if the user pressed <see cref="Application.QuitKey"/> to close the MessageBox.</returns>
-    /// <param name="title">Title for the query.</param>
-    /// <param name="message">Message to display, might contain multiple lines.</param>
-    /// <param name="defaultButton">Index of the default button.</param>
-    /// <param name="wrapMessage">If wrap the message or not.</param>
-    /// <param name="buttons">Array of buttons to add.</param>
-    public static int Query (
+    /// <param name="app">The application instance. If <see langword="null"/>, uses <see cref="IApplication.TopRunnable"/>.</param>
+    /// <param name="title">Title for the MessageBox.</param>
+    /// <param name="message">Message to display. May contain multiple lines.</param>
+    /// <param name="defaultButton">Index of the default button (0-based).</param>
+    /// <param name="wrapMessage">
+    ///     If <see langword="true"/>, word-wraps the message; otherwise displays as-is with multi-line
+    ///     support.
+    /// </param>
+    /// <param name="buttons">Array of button labels.</param>
+    /// <returns>
+    ///     The index of the selected button, or <see langword="null"/> if the user pressed
+    ///     <see cref="Application.QuitKey"/>.
+    /// </returns>
+    /// <exception cref="ArgumentNullException">Thrown if <paramref name="app"/> is <see langword="null"/>.</exception>
+    /// <remarks>
+    ///     The MessageBox is centered and auto-sized based on title, message, and buttons.
+    /// </remarks>
+    public static int? ErrorQuery (
+        IApplication? app,
         string title,
         string message,
         int defaultButton = 0,
@@ -323,10 +325,239 @@ public static class MessageBox
         params string [] buttons
     )
     {
-        return QueryFull (false, 0, 0, title, message, defaultButton, wrapMessage, buttons);
+        return QueryFull (
+                          app,
+                          true,
+                          0,
+                          0,
+                          title,
+                          message,
+                          defaultButton,
+                          wrapMessage,
+                          buttons);
     }
 
-    private static int QueryFull (
+    /// <summary>
+    ///     Displays a <see cref="MessageBox"/> with fixed dimensions.
+    /// </summary>
+    /// <param name="app">The application instance. If <see langword="null"/>, uses <see cref="IApplication.TopRunnable"/>.</param>
+    /// <param name="width">Width for the MessageBox.</param>
+    /// <param name="height">Height for the MessageBox.</param>
+    /// <param name="title">Title for the MessageBox.</param>
+    /// <param name="message">Message to display. May contain multiple lines and will be word-wrapped.</param>
+    /// <param name="buttons">Array of button labels.</param>
+    /// <returns>
+    ///     The index of the selected button, or <see langword="null"/> if the user pressed
+    ///     <see cref="Application.QuitKey"/>.
+    /// </returns>
+    /// <exception cref="ArgumentNullException">Thrown if <paramref name="app"/> is <see langword="null"/>.</exception>
+    /// <remarks>
+    ///     Consider using <see cref="Query(IApplication?, string, string, string[])"/> which automatically sizes the
+    ///     MessageBox.
+    /// </remarks>
+    public static int? Query (IApplication? app, int width, int height, string title, string message, params string [] buttons)
+    {
+        return QueryFull (
+                          app,
+                          false,
+                          width,
+                          height,
+                          title,
+                          message,
+                          0,
+                          true,
+                          buttons);
+    }
+
+    /// <summary>
+    ///     Displays an auto-sized <see cref="MessageBox"/>.
+    /// </summary>
+    /// <param name="app">The application instance. If <see langword="null"/>, uses <see cref="IApplication.TopRunnable"/>.</param>
+    /// <param name="title">Title for the MessageBox.</param>
+    /// <param name="message">Message to display. May contain multiple lines and will be word-wrapped.</param>
+    /// <param name="buttons">Array of button labels.</param>
+    /// <returns>
+    ///     The index of the selected button, or <see langword="null"/> if the user pressed
+    ///     <see cref="Application.QuitKey"/>.
+    /// </returns>
+    /// <exception cref="ArgumentNullException">Thrown if <paramref name="app"/> is <see langword="null"/>.</exception>
+    /// <remarks>
+    ///     The MessageBox is centered and auto-sized based on title, message, and buttons.
+    /// </remarks>
+    public static int? Query (IApplication? app, string title, string message, params string [] buttons)
+    {
+        return QueryFull (
+                          app,
+                          false,
+                          0,
+                          0,
+                          title,
+                          message,
+                          0,
+                          true,
+                          buttons);
+    }
+
+    /// <summary>
+    ///     Displays a <see cref="MessageBox"/> with fixed dimensions and a default button.
+    /// </summary>
+    /// <param name="app">The application instance. If <see langword="null"/>, uses <see cref="IApplication.TopRunnable"/>.</param>
+    /// <param name="width">Width for the MessageBox.</param>
+    /// <param name="height">Height for the MessageBox.</param>
+    /// <param name="title">Title for the MessageBox.</param>
+    /// <param name="message">Message to display. May contain multiple lines and will be word-wrapped.</param>
+    /// <param name="defaultButton">Index of the default button (0-based).</param>
+    /// <param name="buttons">Array of button labels.</param>
+    /// <returns>
+    ///     The index of the selected button, or <see langword="null"/> if the user pressed
+    ///     <see cref="Application.QuitKey"/>.
+    /// </returns>
+    /// <exception cref="ArgumentNullException">Thrown if <paramref name="app"/> is <see langword="null"/>.</exception>
+    /// <remarks>
+    ///     Consider using <see cref="Query(IApplication?, string, string, int, string[])"/> which automatically sizes the
+    ///     MessageBox.
+    /// </remarks>
+    public static int? Query (
+        IApplication? app,
+        int width,
+        int height,
+        string title,
+        string message,
+        int defaultButton = 0,
+        params string [] buttons
+    )
+    {
+        return QueryFull (
+                          app,
+                          false,
+                          width,
+                          height,
+                          title,
+                          message,
+                          defaultButton,
+                          true,
+                          buttons);
+    }
+
+    /// <summary>
+    ///     Displays an auto-sized <see cref="MessageBox"/> with a default button.
+    /// </summary>
+    /// <param name="app">The application instance. If <see langword="null"/>, uses <see cref="IApplication.TopRunnable"/>.</param>
+    /// <param name="title">Title for the MessageBox.</param>
+    /// <param name="message">Message to display. May contain multiple lines and will be word-wrapped.</param>
+    /// <param name="defaultButton">Index of the default button (0-based).</param>
+    /// <param name="buttons">Array of button labels.</param>
+    /// <returns>
+    ///     The index of the selected button, or <see langword="null"/> if the user pressed
+    ///     <see cref="Application.QuitKey"/>.
+    /// </returns>
+    /// <exception cref="ArgumentNullException">Thrown if <paramref name="app"/> is <see langword="null"/>.</exception>
+    /// <remarks>
+    ///     The MessageBox is centered and auto-sized based on title, message, and buttons.
+    /// </remarks>
+    public static int? Query (IApplication? app, string title, string message, int defaultButton = 0, params string [] buttons)
+    {
+        return QueryFull (
+                          app,
+                          false,
+                          0,
+                          0,
+                          title,
+                          message,
+                          defaultButton,
+                          true,
+                          buttons);
+    }
+
+    /// <summary>
+    ///     Displays a <see cref="MessageBox"/> with fixed dimensions, a default button, and word-wrap control.
+    /// </summary>
+    /// <param name="app">The application instance. If <see langword="null"/>, uses <see cref="IApplication.TopRunnable"/>.</param>
+    /// <param name="width">Width for the MessageBox.</param>
+    /// <param name="height">Height for the MessageBox.</param>
+    /// <param name="title">Title for the MessageBox.</param>
+    /// <param name="message">Message to display. May contain multiple lines.</param>
+    /// <param name="defaultButton">Index of the default button (0-based).</param>
+    /// <param name="wrapMessage">
+    ///     If <see langword="true"/>, word-wraps the message; otherwise displays as-is with multi-line
+    ///     support.
+    /// </param>
+    /// <param name="buttons">Array of button labels.</param>
+    /// <returns>
+    ///     The index of the selected button, or <see langword="null"/> if the user pressed
+    ///     <see cref="Application.QuitKey"/>.
+    /// </returns>
+    /// <exception cref="ArgumentNullException">Thrown if <paramref name="app"/> is <see langword="null"/>.</exception>
+    /// <remarks>
+    ///     Consider using <see cref="Query(IApplication?, string, string, int, bool, string[])"/> which automatically sizes
+    ///     the MessageBox.
+    /// </remarks>
+    public static int? Query (
+        IApplication? app,
+        int width,
+        int height,
+        string title,
+        string message,
+        int defaultButton = 0,
+        bool wrapMessage = true,
+        params string [] buttons
+    )
+    {
+        return QueryFull (
+                          app,
+                          false,
+                          width,
+                          height,
+                          title,
+                          message,
+                          defaultButton,
+                          wrapMessage,
+                          buttons);
+    }
+
+    /// <summary>
+    ///     Displays an auto-sized <see cref="MessageBox"/> with a default button and word-wrap control.
+    /// </summary>
+    /// <param name="app">The application instance. If <see langword="null"/>, uses <see cref="IApplication.TopRunnable"/>.</param>
+    /// <param name="title">Title for the MessageBox.</param>
+    /// <param name="message">Message to display. May contain multiple lines.</param>
+    /// <param name="defaultButton">Index of the default button (0-based).</param>
+    /// <param name="wrapMessage">
+    ///     If <see langword="true"/>, word-wraps the message; otherwise displays as-is with multi-line
+    ///     support.
+    /// </param>
+    /// <param name="buttons">Array of button labels.</param>
+    /// <returns>
+    ///     The index of the selected button, or <see langword="null"/> if the user pressed
+    ///     <see cref="Application.QuitKey"/>.
+    /// </returns>
+    /// <exception cref="ArgumentNullException">Thrown if <paramref name="app"/> is <see langword="null"/>.</exception>
+    /// <remarks>
+    ///     The MessageBox is centered and auto-sized based on title, message, and buttons.
+    /// </remarks>
+    public static int? Query (
+        IApplication? app,
+        string title,
+        string message,
+        int defaultButton = 0,
+        bool wrapMessage = true,
+        params string [] buttons
+    )
+    {
+        return QueryFull (
+                          app,
+                          false,
+                          0,
+                          0,
+                          title,
+                          message,
+                          defaultButton,
+                          wrapMessage,
+                          buttons);
+    }
+
+    private static int? QueryFull (
+        IApplication? app,
         bool useErrorColors,
         int width,
         int height,
@@ -337,10 +568,12 @@ public static class MessageBox
         params string [] buttons
     )
     {
+        ArgumentNullException.ThrowIfNull (app);
+
         // Create button array for Dialog
         var count = 0;
         List<Button> buttonList = new ();
-        Clicked = -1;
+        Clicked = null;
 
         if (buttons is { })
         {
@@ -354,13 +587,14 @@ public static class MessageBox
                 var b = new Button
                 {
                     Text = s,
-                    Data = count,
+                    Data = count
                 };
 
                 if (count == defaultButton)
                 {
                     b.IsDefault = true;
-                    b.Accepting += (_, e) =>
+
+                    b.Accepting += (s, e) =>
                                    {
                                        if (e?.Context?.Source is Button button)
                                        {
@@ -376,7 +610,7 @@ public static class MessageBox
                                            e.Handled = true;
                                        }
 
-                                       Application.RequestStop ();
+                                       (s as View)?.App?.RequestStop ();
                                    };
                 }
 
@@ -388,20 +622,21 @@ public static class MessageBox
         var d = new Dialog
         {
             Title = title,
-            ButtonAlignment = MessageBox.DefaultButtonAlignment,
+            ButtonAlignment = DefaultButtonAlignment,
             ButtonAlignmentModes = AlignmentModes.StartToEnd | AlignmentModes.AddSpaceBetweenItems,
-            BorderStyle = MessageBox.DefaultBorderStyle,
-            Buttons = buttonList.ToArray (),
+            BorderStyle = DefaultBorderStyle,
+            Buttons = buttonList.ToArray ()
         };
 
-        d.Width = Dim.Auto (DimAutoStyle.Auto,
-                            minimumContentDim: Dim.Func (_ => (int)((Application.Screen.Width - d.GetAdornmentsThickness ().Horizontal) * (DefaultMinimumWidth / 100f))),
-                            maximumContentDim: Dim.Func (_ => (int)((Application.Screen.Width - d.GetAdornmentsThickness ().Horizontal) * 0.9f)));
-
-        d.Height = Dim.Auto (DimAutoStyle.Auto,
-                             minimumContentDim: Dim.Func (_ => (int)((Application.Screen.Height - d.GetAdornmentsThickness ().Vertical) * (DefaultMinimumHeight / 100f))),
-                             maximumContentDim: Dim.Func (_ => (int)((Application.Screen.Height - d.GetAdornmentsThickness ().Vertical) * 0.9f)));
+        d.Width = Dim.Auto (
+                            DimAutoStyle.Auto,
+                            Dim.Func (_ => (int)((app.Screen.Width - d.GetAdornmentsThickness ().Horizontal) * (DefaultMinimumWidth / 100f))),
+                            Dim.Func (_ => (int)((app.Screen.Width - d.GetAdornmentsThickness ().Horizontal) * 0.9f)));
 
+        d.Height = Dim.Auto (
+                             DimAutoStyle.Auto,
+                             Dim.Func (_ => (int)((app.Screen.Height - d.GetAdornmentsThickness ().Vertical) * (DefaultMinimumHeight / 100f))),
+                             Dim.Func (_ => (int)((app.Screen.Height - d.GetAdornmentsThickness ().Vertical) * 0.9f)));
 
         if (width != 0)
         {
@@ -415,7 +650,7 @@ public static class MessageBox
 
         d.SchemeName = useErrorColors ? SchemeManager.SchemesToSchemeName (Schemes.Error) : SchemeManager.SchemesToSchemeName (Schemes.Dialog);
 
-        d.HotKeySpecifier = new Rune ('\xFFFF');
+        d.HotKeySpecifier = new ('\xFFFF');
         d.Text = message;
         d.TextAlignment = Alignment.Center;
         d.VerticalTextAlignment = Alignment.Start;
@@ -423,10 +658,9 @@ public static class MessageBox
         d.TextFormatter.MultiLine = !wrapMessage;
 
         // Run the modal; do not shut down the mainloop driver when done
-        Application.Run (d);
+        app.Run (d);
         d.Dispose ();
 
         return Clicked;
-
     }
 }
diff --git a/Terminal.Gui/Views/Selectors/SelectorBase.cs b/Terminal.Gui/Views/Selectors/SelectorBase.cs
index 5747bf4b1..03b7ac2ba 100644
--- a/Terminal.Gui/Views/Selectors/SelectorBase.cs
+++ b/Terminal.Gui/Views/Selectors/SelectorBase.cs
@@ -425,7 +425,7 @@ public abstract class SelectorBase : View, IOrientation
             maxNaturalCheckBoxWidth = SubViews.OfType<CheckBox> ().Max (
                                                              v =>
                                                              {
-                                                                 v.SetRelativeLayout (Application.Screen.Size);
+                                                                 v.SetRelativeLayout (App?.Screen.Size ?? new Size (2048, 2048));
                                                                  v.Layout ();
                                                                  return v.Frame.Width;
                                                              });
diff --git a/Terminal.Gui/Views/StatusBar.cs b/Terminal.Gui/Views/StatusBar.cs
index cd97abd06..5191a90e8 100644
--- a/Terminal.Gui/Views/StatusBar.cs
+++ b/Terminal.Gui/Views/StatusBar.cs
@@ -9,6 +9,8 @@ namespace Terminal.Gui.Views;
 /// </summary>
 public class StatusBar : Bar, IDesignable
 {
+    private static LineStyle _defaultSeparatorLineStyle = LineStyle.Single; // Resources/config.json overrides
+
     /// <inheritdoc/>
     public StatusBar () : this ([]) { }
 
@@ -55,7 +57,11 @@ public class StatusBar : Bar, IDesignable
     ///     Gets or sets the default Line Style for the separators between the shortcuts of the StatusBar.
     /// </summary>
     [ConfigurationProperty (Scope = typeof (ThemeScope))]
-    public static LineStyle DefaultSeparatorLineStyle { get; set; } = LineStyle.Single;
+    public static LineStyle DefaultSeparatorLineStyle
+    {
+        get => _defaultSeparatorLineStyle;
+        set => _defaultSeparatorLineStyle = value;
+    }
 
     /// <inheritdoc />
     protected override void OnSubViewLayout (LayoutEventArgs args)
@@ -160,7 +166,7 @@ public class StatusBar : Bar, IDesignable
 
         return true;
 
-        void OnButtonClicked (object? sender, EventArgs? e) { MessageBox.Query ("Hi", $"You clicked {sender}"); }
+        void OnButtonClicked (object? sender, EventArgs? e) { MessageBox.Query (App, "Hi", $"You clicked {sender}"); }
     }
 
     /// <inheritdoc />
diff --git a/Terminal.Gui/Views/TableView/TableView.cs b/Terminal.Gui/Views/TableView/TableView.cs
index 1c5f298e0..5d1e79f7f 100644
--- a/Terminal.Gui/Views/TableView/TableView.cs
+++ b/Terminal.Gui/Views/TableView/TableView.cs
@@ -1534,7 +1534,7 @@ public class TableView : View, IDesignable
     /// <param name="width"></param>
     private void ClearLine (int row, int width)
     {
-        if (Application.Screen.Height == 0)
+        if (App?.Screen.Height == 0)
         {
             return;
         }
@@ -1810,7 +1810,7 @@ public class TableView : View, IDesignable
                 }
             }
 
-            if (Application.Screen.Height > 0)
+            if (App?.Screen.Height > 0)
             {
                 AddRuneAt (c, row, rune);
             }
diff --git a/Terminal.Gui/Views/TextInput/TextField.cs b/Terminal.Gui/Views/TextInput/TextField.cs
index c4aa19754..794b09b40 100644
--- a/Terminal.Gui/Views/TextInput/TextField.cs
+++ b/Terminal.Gui/Views/TextInput/TextField.cs
@@ -617,7 +617,7 @@ public class TextField : View, IDesignable
             return;
         }
 
-        Clipboard.Contents = SelectedText;
+        App?.Clipboard?.SetClipboardData (SelectedText);
     }
 
     /// <summary>Cut the selected text to the clipboard.</summary>
@@ -628,7 +628,7 @@ public class TextField : View, IDesignable
             return;
         }
 
-        Clipboard.Contents = SelectedText;
+        App?.Clipboard?.SetClipboardData (SelectedText);
         List<string> newText = DeleteSelectedText ();
         Text = StringExtensions.ToString (newText);
         Adjust ();
@@ -1079,7 +1079,7 @@ public class TextField : View, IDesignable
             return;
         }
 
-        string cbTxt = Clipboard.Contents.Split ("\n") [0] ?? "";
+        string cbTxt = App?.Clipboard?.GetClipboardData ()?.Split ("\n") [0];
 
         if (string.IsNullOrEmpty (cbTxt))
         {
@@ -1731,9 +1731,9 @@ public class TextField : View, IDesignable
 
     private void SetClipboard (IEnumerable<string> text)
     {
-        if (!Secret)
+        if (!Secret && App?.Clipboard is { })
         {
-            Clipboard.Contents = StringExtensions.ToString (text.ToList ());
+            App.Clipboard.SetClipboardData (StringExtensions.ToString (text.ToList ()));
         }
     }
 
diff --git a/Terminal.Gui/Views/TextInput/TextView.cs b/Terminal.Gui/Views/TextInput/TextView.cs
index 5e2124d38..23fd1e89a 100644
--- a/Terminal.Gui/Views/TextInput/TextView.cs
+++ b/Terminal.Gui/Views/TextInput/TextView.cs
@@ -1960,7 +1960,7 @@ public class TextView : View, IDesignable
         }
 
         SetWrapModel ();
-        string? contents = Clipboard.Contents;
+        string? contents = App?.Clipboard?.GetClipboardData ();
 
         if (_copyWithoutSelection && contents!.FirstOrDefault (x => x is '\n' or '\r') == 0)
         {
@@ -2363,7 +2363,7 @@ public class TextView : View, IDesignable
         OnUnwrappedCursorPosition ();
     }
 
-    private void AppendClipboard (string text) { Clipboard.Contents += text; }
+    private void AppendClipboard (string text) { App?.Clipboard?.SetClipboardData (App?.Clipboard?.GetClipboardData () + text); }
 
     private PopoverMenu CreateContextMenu ()
     {
@@ -3842,7 +3842,7 @@ public class TextView : View, IDesignable
 
             List<Cell> currentLine = GetCurrentLine ();
 
-            if (currentLine.Count > 0 && currentLine[CurrentColumn - 1].Grapheme == "\t")
+            if (currentLine.Count > 0 && currentLine [CurrentColumn - 1].Grapheme == "\t")
             {
                 _historyText.Add (new () { new (currentLine) }, CursorPosition);
 
@@ -4470,7 +4470,7 @@ public class TextView : View, IDesignable
     {
         if (text is { })
         {
-            Clipboard.Contents = text;
+            App?.Clipboard?.SetClipboardData (text);
         }
     }
 
diff --git a/Terminal.Gui/Views/Window.cs b/Terminal.Gui/Views/Window.cs
index b374459a2..597ba121d 100644
--- a/Terminal.Gui/Views/Window.cs
+++ b/Terminal.Gui/Views/Window.cs
@@ -1,5 +1,3 @@
-
-
 namespace Terminal.Gui.Views;
 
 /// <summary>
@@ -18,6 +16,9 @@ namespace Terminal.Gui.Views;
 /// <seealso cref="FrameView"/>
 public class Window : Toplevel
 {
+    private static ShadowStyle _defaultShadow = ShadowStyle.None; // Resources/config.json overrides
+    private static LineStyle _defaultBorderStyle = LineStyle.Single; // Resources/config.json overrides
+
     /// <summary>
     ///     Initializes a new instance of the <see cref="Window"/> class.
     /// </summary>
@@ -35,7 +36,11 @@ public class Window : Toplevel
     ///     Gets or sets whether all <see cref="Window"/>s are shown with a shadow effect by default.
     /// </summary>
     [ConfigurationProperty (Scope = typeof (ThemeScope))]
-    public static ShadowStyle DefaultShadow { get; set; } = ShadowStyle.None;
+    public static ShadowStyle DefaultShadow
+    {
+        get => _defaultShadow;
+        set => _defaultShadow = value;
+    }
 
     // TODO: enable this
     ///// <summary>
@@ -56,5 +61,9 @@ public class Window : Toplevel
     ///     s.
     /// </remarks>
     [ConfigurationProperty (Scope = typeof (ThemeScope))]
-    public static LineStyle DefaultBorderStyle { get; set; } = LineStyle.Single;
+    public static LineStyle DefaultBorderStyle
+    {
+        get => _defaultBorderStyle;
+        set => _defaultBorderStyle = value;
+    }
 }
diff --git a/Terminal.Gui/Views/Wizard/Wizard.cs b/Terminal.Gui/Views/Wizard/Wizard.cs
index 50b21c7ed..3415c572a 100644
--- a/Terminal.Gui/Views/Wizard/Wizard.cs
+++ b/Terminal.Gui/Views/Wizard/Wizard.cs
@@ -458,7 +458,7 @@ public class Wizard : Dialog
 
                 if (IsCurrentTop)
                 {
-                    Application.RequestStop (this);
+                    (sender as View)?.App?.RequestStop (this);
                     e.Handled = true;
                 }
 
diff --git a/Tests/IntegrationTests/FluentTests/FileDialogFluentTests.cs b/Tests/IntegrationTests/FluentTests/FileDialogFluentTests.cs
index 6cc94ec45..50aba981c 100644
--- a/Tests/IntegrationTests/FluentTests/FileDialogFluentTests.cs
+++ b/Tests/IntegrationTests/FluentTests/FileDialogFluentTests.cs
@@ -60,10 +60,10 @@ public class FileDialogFluentTests
     public void CancelFileDialog_QuitKey_Quits (TestDriver d)
     {
         SaveDialog? sd = null;
-        using var c = With.A (() => NewSaveDialog (out sd), 100, 20, d)
-            .ScreenShot ("Save dialog", _out)
-            .EnqueueKeyEvent (Application.QuitKey)
-            .AssertTrue (sd!.Canceled);
+        using GuiTestContext c = With.A (() => NewSaveDialog (out sd), 100, 20, d, logWriter: _out)
+                                     .ScreenShot ("Save dialog", _out)
+                                     .EnqueueKeyEvent (Application.QuitKey)
+                                     .AssertTrue (sd!.Canceled);
     }
 
     [Theory]
@@ -93,7 +93,7 @@ public class FileDialogFluentTests
     public void CancelFileDialog_UsingCancelButton_AltC (TestDriver d)
     {
         SaveDialog? sd = null;
-        using var c = With.A (() => NewSaveDialog (out sd), 100, 20, d)
+        using var c = With.A (() => NewSaveDialog (out sd), 100, 20, d, _out)
                           .ScreenShot ("Save dialog", _out)
                           .EnqueueKeyEvent (Key.C.WithAlt)
                           .AssertTrue (sd!.Canceled);
@@ -132,12 +132,13 @@ public class FileDialogFluentTests
     {
         SaveDialog? sd = null;
         MockFileSystem? fs = null;
-        using var c = With.A (() => NewSaveDialog (out sd, out fs, modal: false), 100, 20, d)
-                          .ScreenShot ("Save dialog", _out)
-                          .Focus<Button> (b => b.Text == "_Save")
-                          .EnqueueKeyEvent (Key.Enter)
-                          .AssertFalse (sd!.Canceled)
-                          .AssertEqual (GetFileSystemRoot (fs!), sd!.FileName);
+        using GuiTestContext c = With.A (() => NewSaveDialog (out sd, out fs, modal: false), 100, 20, d)
+                                     .ScreenShot ("Save dialog", _out)
+                                     .Focus<Button> (b => b.Text == "_Save")
+                                     .EnqueueKeyEvent (Key.Enter)
+                                     .AssertFalse (sd!.Canceled)
+                                     .AssertEqual (GetFileSystemRoot (fs!), sd!.FileName)
+                                     ;
     }
 
     private string GetFileSystemRoot (IFileSystem fs)
diff --git a/Tests/IntegrationTests/FluentTests/GuiTestContextTests.cs b/Tests/IntegrationTests/FluentTests/GuiTestContextTests.cs
index e78161774..703241508 100644
--- a/Tests/IntegrationTests/FluentTests/GuiTestContextTests.cs
+++ b/Tests/IntegrationTests/FluentTests/GuiTestContextTests.cs
@@ -18,7 +18,7 @@ public class GuiTestContextTests (ITestOutputHelper outputHelper)
     {
         using var context = new GuiTestContext (d, _out, TimeSpan.FromSeconds (10));
 
-        Assert.NotEqual (Rectangle.Empty, Application.Screen);
+        Assert.NotEqual (Rectangle.Empty, context.App?.Screen);
     }
 
     [Theory]
diff --git a/Tests/StressTests/ScenariosStressTests.cs b/Tests/StressTests/ScenariosStressTests.cs
index 467bffbb4..9c898cdcf 100644
--- a/Tests/StressTests/ScenariosStressTests.cs
+++ b/Tests/StressTests/ScenariosStressTests.cs
@@ -110,7 +110,7 @@ public class ScenariosStressTests
             _output.WriteLine ($"Initialized == {a.Value}");
         }
 
-        void OnApplicationOnIteration (object? s, IterationEventArgs a)
+        void OnApplicationOnIteration (object? s, EventArgs<IApplication?> a)
         {
             iterationCount++;
 
diff --git a/Tests/TerminalGuiFluentTesting/GuiTestContext.Input.cs b/Tests/TerminalGuiFluentTesting/GuiTestContext.Input.cs
index 6a77c0a72..01bbdade8 100644
--- a/Tests/TerminalGuiFluentTesting/GuiTestContext.Input.cs
+++ b/Tests/TerminalGuiFluentTesting/GuiTestContext.Input.cs
@@ -64,7 +64,7 @@ public partial class GuiTestContext
             {
                 mouseEvent.Position = mouseEvent.ScreenPosition;
 
-                app.Driver.InputProcessor.EnqueueMouseEvent (mouseEvent);
+                app.Driver.InputProcessor.EnqueueMouseEvent (app, mouseEvent);
             }
             else
             {
@@ -205,11 +205,6 @@ public partial class GuiTestContext
             App.Driver.EnqueueKeyEvent (key);
             WaitUntil (() => keyReceived);
         }
-        else
-        {
-            Fail ("Expected Application.Driver to be non-null.");
-        }
-
 
         return this;
 
diff --git a/Tests/TerminalGuiFluentTesting/GuiTestContext.cs b/Tests/TerminalGuiFluentTesting/GuiTestContext.cs
index 73960cd0a..5b42bdd39 100644
--- a/Tests/TerminalGuiFluentTesting/GuiTestContext.cs
+++ b/Tests/TerminalGuiFluentTesting/GuiTestContext.cs
@@ -68,7 +68,7 @@ public partial class GuiTestContext : IDisposable
 
         try
         {
-            InitializeApplication ();
+            App?.Init (GetDriverName ());
             _booting.Release ();
 
             // After Init, Application.Screen should be set by the driver
@@ -119,21 +119,36 @@ public partial class GuiTestContext : IDisposable
                              {
                                  try
                                  {
-                                     InitializeApplication ();
+                                     try
+                                     {
+                                         App?.Init (GetDriverName ());
+                                     }
+                                     catch (Exception e)
+                                     {
+                                         Logging.Error(e.Message);
+                                         _runCancellationTokenSource.Cancel ();
+                                     }
+                                     finally
+                                     {
+                                         _booting.Release ();
+                                     }
 
-                                     _booting.Release ();
+                                     if (App is { Initialized: true })
+                                     {
+                                         Toplevel t = topLevelBuilder ();
+                                         t.Closed += (s, e) => { Finished = true; };
+                                         App?.Run (t); // This will block, but it's on a background thread now
 
-                                     Toplevel t = topLevelBuilder ();
-                                     t.Closed += (s, e) => { Finished = true; };
-                                     App?.Run (t); // This will block, but it's on a background thread now
-
-                                     t.Dispose ();
-                                     Logging.Trace ("Application.Run completed");
-                                     App?.Shutdown ();
-                                     _runCancellationTokenSource.Cancel ();
+                                         t.Dispose ();
+                                         Logging.Trace ("Application.Run completed");
+                                         App?.Shutdown ();
+                                         _runCancellationTokenSource.Cancel ();
+                                     }
                                  }
                                  catch (OperationCanceledException)
-                                 { }
+                                 {
+                                     Logging.Trace ("OperationCanceledException");
+                                 }
                                  catch (Exception ex)
                                  {
                                      _backgroundException = ex;
@@ -142,7 +157,6 @@ public partial class GuiTestContext : IDisposable
                                  finally
                                  {
                                      CleanupApplication ();
-
                                      if (_logWriter != null)
                                      {
                                          WriteOutLogs (_logWriter);
@@ -165,11 +179,6 @@ public partial class GuiTestContext : IDisposable
         }
     }
 
-    private void InitializeApplication ()
-    {
-        App?.Init (GetDriverName ());
-    }
-
 
     /// <summary>
     ///     Common initialization for both constructors.
@@ -316,7 +325,7 @@ public partial class GuiTestContext : IDisposable
             throw new NotSupportedException ("Cannot WaitIteration during Invoke");
         }
 
-        Logging.Trace ($"WaitIteration started");
+        //Logging.Trace ($"WaitIteration started");
         if (action is null)
         {
             action = (app) => { };
@@ -358,8 +367,9 @@ public partial class GuiTestContext : IDisposable
         GuiTestContext? c = null;
         var sw = Stopwatch.StartNew ();
 
-        //Logging.Trace ($"WaitUntil started with timeout {_timeout}");
+        Logging.Trace ($"WaitUntil started with timeout {_timeout}");
 
+        int count = 0;
         while (!condition ())
         {
             if (sw.Elapsed > _timeout)
@@ -368,8 +378,10 @@ public partial class GuiTestContext : IDisposable
             }
 
             c = WaitIteration ();
+            count++;
         }
 
+        Logging.Trace ($"WaitUntil completed after {sw.ElapsedMilliseconds}ms and {count} iterations");
         return c ?? this;
     }
 
diff --git a/Tests/TerminalGuiFluentTesting/NetSequences.cs b/Tests/TerminalGuiFluentTesting/NetSequences.cs
deleted file mode 100644
index 10256b126..000000000
--- a/Tests/TerminalGuiFluentTesting/NetSequences.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-namespace TerminalGuiFluentTesting;
-class NetSequences
-{
-    public static ConsoleKeyInfo [] Down = new []
-    {
-        new ConsoleKeyInfo('\x1B', ConsoleKey.Enter, false, false, false),
-        new ConsoleKeyInfo('[', ConsoleKey.None, false, false, false),
-        new ConsoleKeyInfo('B', ConsoleKey.None, false, false, false),
-    };
-
-    public static ConsoleKeyInfo [] Up = new []
-    {
-        new ConsoleKeyInfo('\x1B', ConsoleKey.Enter, false, false, false),
-        new ConsoleKeyInfo('[', ConsoleKey.None, false, false, false),
-        new ConsoleKeyInfo('A', ConsoleKey.None, false, false, false),
-    };
-
-    public static ConsoleKeyInfo [] Left = new []
-    {
-        new ConsoleKeyInfo('\x1B', ConsoleKey.Enter, false, false, false),
-        new ConsoleKeyInfo('[', ConsoleKey.None, false, false, false),
-        new ConsoleKeyInfo('D', ConsoleKey.None, false, false, false),
-    };
-
-    public static ConsoleKeyInfo [] Right = new []
-    {
-        new ConsoleKeyInfo('\x1B', ConsoleKey.Enter, false, false, false),
-        new ConsoleKeyInfo('[', ConsoleKey.None, false, false, false),
-        new ConsoleKeyInfo('C', ConsoleKey.None, false, false, false),
-    };
-
-    public static IEnumerable<ConsoleKeyInfo> Click (int button, int screenX, int screenY)
-    {
-        // Adjust for 1-based coordinates
-        int adjustedX = screenX + 1;
-        int adjustedY = screenY + 1;
-
-        // Mouse press sequence
-        var sequence = $"\x1B[<{button};{adjustedX};{adjustedY}M";
-        foreach (char c in sequence)
-        {
-            yield return new ConsoleKeyInfo (c, ConsoleKey.None, false, false, false);
-        }
-
-        // Mouse release sequence
-        sequence = $"\x1B[<{button};{adjustedX};{adjustedY}m";
-        foreach (char c in sequence)
-        {
-            yield return new ConsoleKeyInfo (c, ConsoleKey.None, false, false, false);
-        }
-    }
-
-}
diff --git a/Tests/TerminalGuiFluentTesting/With.cs b/Tests/TerminalGuiFluentTesting/With.cs
index 04658d89b..48c9fcbad 100644
--- a/Tests/TerminalGuiFluentTesting/With.cs
+++ b/Tests/TerminalGuiFluentTesting/With.cs
@@ -29,10 +29,11 @@ public static class With
     /// <param name="width"></param>
     /// <param name="height"></param>
     /// <param name="testDriver"></param>
+    /// <param name="logWriter"></param>
     /// <returns></returns>
-    public static GuiTestContext A (Func<Toplevel> toplevelFactory, int width, int height, TestDriver testDriver)
+    public static GuiTestContext A (Func<Toplevel> toplevelFactory, int width, int height, TestDriver testDriver, TextWriter? logWriter = null)
     {
-        return new (toplevelFactory, width, height, testDriver, null, Timeout);
+        return new (toplevelFactory, width, height, testDriver, logWriter, Timeout);
     }
     /// <summary>
     ///     The global timeout to allow for any given application to run for before shutting down.
diff --git a/Tests/UnitTests/Application/Application.NavigationTests.cs b/Tests/UnitTests/Application/Application.NavigationTests.cs
index 083052ddd..29adca085 100644
--- a/Tests/UnitTests/Application/Application.NavigationTests.cs
+++ b/Tests/UnitTests/Application/Application.NavigationTests.cs
@@ -80,7 +80,7 @@ public class ApplicationNavigationTests (ITestOutputHelper output)
     [Fact]
     public void GetFocused_Returns_Focused_View ()
     {
-        IApplication app = Application.Create ();
+        IApplication app = ApplicationImpl.Instance;
 
         app.TopRunnable = new ()
         {
@@ -115,7 +115,7 @@ public class ApplicationNavigationTests (ITestOutputHelper output)
     [Fact]
     public void GetFocused_Returns_Null_If_No_Focused_View ()
     {
-        IApplication app = Application.Create ();
+        IApplication app = ApplicationImpl.Instance; // Force legacy
 
         app.TopRunnable = new ()
         {
diff --git a/Tests/UnitTestsParallelizable/Application/ApplicationForceDriverTests.cs b/Tests/UnitTests/Application/ApplicationForceDriverTests.cs
similarity index 86%
rename from Tests/UnitTestsParallelizable/Application/ApplicationForceDriverTests.cs
rename to Tests/UnitTests/Application/ApplicationForceDriverTests.cs
index a3136cc11..1bbb0d71f 100644
--- a/Tests/UnitTestsParallelizable/Application/ApplicationForceDriverTests.cs
+++ b/Tests/UnitTests/Application/ApplicationForceDriverTests.cs
@@ -1,10 +1,10 @@
 using UnitTests;
 
-namespace UnitTests_Parallelizable.ApplicationTests;
+namespace UnitTests.ApplicationTests;
 
 public class ApplicationForceDriverTests : FakeDriverBase
 {
-    [Fact]
+    [Fact (Skip = "Bogus test now that config properties are handled correctly")]
     public void ForceDriver_Does_Not_Changes_If_It_Has_Valid_Value ()
     {
         Assert.False (Application.Initialized);
@@ -18,7 +18,7 @@ public class ApplicationForceDriverTests : FakeDriverBase
         Assert.Equal ("fake", Application.ForceDriver);
     }
 
-    [Fact]
+    [Fact (Skip = "Bogus test now that config properties are handled correctly")]
     public void ForceDriver_Throws_If_Initialized_Changed_To_Another_Value ()
     {
         IDriver driver = CreateFakeDriver ();
diff --git a/Tests/UnitTests/Application/ApplicationImplBeginEndTests.cs b/Tests/UnitTests/Application/ApplicationImplBeginEndTests.cs
index 956964738..b1216b3bd 100644
--- a/Tests/UnitTests/Application/ApplicationImplBeginEndTests.cs
+++ b/Tests/UnitTests/Application/ApplicationImplBeginEndTests.cs
@@ -14,7 +14,7 @@ public class ApplicationImplBeginEndTests (ITestOutputHelper output)
 
     private IApplication NewApplicationImpl ()
     {
-        IApplication app = Application.Create ();
+        IApplication app = ApplicationImpl.Instance; // Force legacy
 
         return app;
     }
diff --git a/Tests/UnitTests/Application/ApplicationModelFencingTests.cs b/Tests/UnitTests/Application/ApplicationModelFencingTests.cs
new file mode 100644
index 000000000..a9009baa7
--- /dev/null
+++ b/Tests/UnitTests/Application/ApplicationModelFencingTests.cs
@@ -0,0 +1,162 @@
+namespace UnitTests.ApplicationTests;
+
+/// <summary>
+///     Tests to ensure that mixing legacy static Application and modern instance-based models
+///     throws appropriate exceptions.
+/// </summary>
+[Collection ("Global Test Setup")]
+public class ApplicationModelFencingTests
+{
+    public ApplicationModelFencingTests ()
+    {
+        // Reset the model usage tracking before each test
+        ApplicationImpl.ResetModelUsageTracking ();
+    }
+
+    [Fact]
+    public void Create_ThenInstanceAccess_ThrowsInvalidOperationException ()
+    {
+        // Create a modern instance-based application
+        IApplication app = Application.Create ();
+        app.Init ("fake");
+
+        // Attempting to initialize using the legacy static model should throw
+        InvalidOperationException ex = Assert.Throws<InvalidOperationException> (() =>
+        {
+            ApplicationImpl.Instance.Init ("fake");
+        });
+
+        Assert.Contains ("Cannot use legacy static Application model", ex.Message);
+        Assert.Contains ("after using modern instance-based model", ex.Message);
+
+        // Clean up
+        app.Shutdown ();
+        ApplicationImpl.ResetModelUsageTracking ();
+
+    }
+
+    [Fact]
+    public void InstanceAccess_ThenCreate_ThrowsInvalidOperationException ()
+    {
+        // Initialize using the legacy static model
+        IApplication staticInstance = ApplicationImpl.Instance;
+        staticInstance.Init ("fake");
+
+        // Attempting to create and initialize with modern instance-based model should throw
+        InvalidOperationException ex = Assert.Throws<InvalidOperationException> (() =>
+        {
+            IApplication app = Application.Create ();
+            app.Init ("fake");
+        });
+
+        Assert.Contains ("Cannot use modern instance-based model", ex.Message);
+        Assert.Contains ("after using legacy static Application model", ex.Message);
+
+        // Clean up
+        staticInstance.Shutdown ();
+        ApplicationImpl.ResetModelUsageTracking ();
+    }
+
+    [Fact]
+    public void Init_ThenCreate_ThrowsInvalidOperationException ()
+    {
+        // Initialize using legacy static API
+        IApplication staticInstance = ApplicationImpl.Instance;
+        staticInstance.Init ("fake");
+
+        // Attempting to create a modern instance-based application should throw
+        InvalidOperationException ex = Assert.Throws<InvalidOperationException> (() =>
+        {
+            IApplication _ = Application.Create ();
+        });
+
+        Assert.Contains ("Cannot use modern instance-based model", ex.Message);
+        Assert.Contains ("after using legacy static Application model", ex.Message);
+
+        // Clean up
+        staticInstance.Shutdown ();
+        ApplicationImpl.ResetModelUsageTracking ();
+    }
+
+    [Fact]
+    public void Create_ThenInit_ThrowsInvalidOperationException ()
+    {
+        // Create a modern instance-based application
+        IApplication app = Application.Create ();
+        app.Init ("fake");
+
+        // Attempting to initialize using the legacy static model should throw
+        InvalidOperationException ex = Assert.Throws<InvalidOperationException> (() =>
+        {
+            ApplicationImpl.Instance.Init ("fake");
+        });
+
+        Assert.Contains ("Cannot use legacy static Application model", ex.Message);
+        Assert.Contains ("after using modern instance-based model", ex.Message);
+
+        // Clean up
+        app.Shutdown ();
+        ApplicationImpl.ResetModelUsageTracking ();
+    }
+
+    [Fact]
+    public void MultipleCreate_Calls_DoNotThrow ()
+    {
+        // Multiple calls to Create should not throw
+        IApplication app1 = Application.Create ();
+        IApplication app2 = Application.Create ();
+        IApplication app3 = Application.Create ();
+
+        Assert.NotNull (app1);
+        Assert.NotNull (app2);
+        Assert.NotNull (app3);
+
+        // Clean up
+        app1.Shutdown ();
+        app2.Shutdown ();
+        app3.Shutdown ();
+        ApplicationImpl.ResetModelUsageTracking ();
+    }
+
+    [Fact]
+    public void MultipleInstanceAccess_DoesNotThrow ()
+    {
+        // Multiple accesses to Instance should not throw (it's a singleton)
+        IApplication instance1 = ApplicationImpl.Instance;
+        IApplication instance2 = ApplicationImpl.Instance;
+        IApplication instance3 = ApplicationImpl.Instance;
+
+        Assert.NotNull (instance1);
+        Assert.Same (instance1, instance2);
+        Assert.Same (instance2, instance3);
+
+        // Clean up
+        instance1.Shutdown ();
+        ApplicationImpl.ResetModelUsageTracking ();
+    }
+
+    [Fact]
+    public void ResetModelUsageTracking_AllowsSwitchingModels ()
+    {
+        // Use modern model
+        IApplication app1 = Application.Create ();
+        app1.Shutdown ();
+
+        // Reset the tracking
+        ApplicationImpl.ResetModelUsageTracking ();
+
+        // Should now be able to use legacy model
+        IApplication staticInstance = ApplicationImpl.Instance;
+        Assert.NotNull (staticInstance);
+        staticInstance.Shutdown ();
+
+        // Reset again
+        ApplicationImpl.ResetModelUsageTracking ();
+
+        // Should be able to use modern model again
+        IApplication app2 = Application.Create ();
+        Assert.NotNull (app2);
+        app2.Shutdown ();
+        ApplicationImpl.ResetModelUsageTracking ();
+    }
+}
diff --git a/Tests/UnitTests/Application/ApplicationPopoverTests.cs b/Tests/UnitTests/Application/ApplicationPopoverTests.cs
index 4d3db123a..6c3e10fc4 100644
--- a/Tests/UnitTests/Application/ApplicationPopoverTests.cs
+++ b/Tests/UnitTests/Application/ApplicationPopoverTests.cs
@@ -16,7 +16,7 @@ public class ApplicationPopoverTests
         }
         finally
         {
-            Application.ResetState (true);
+            Application.Shutdown ();
         }
     }
 
@@ -38,7 +38,7 @@ public class ApplicationPopoverTests
         }
         finally
         {
-            Application.ResetState (true);
+            Application.Shutdown ();
         }
     }
 
@@ -66,7 +66,7 @@ public class ApplicationPopoverTests
         finally
         {
             top?.Dispose ();
-            Application.ResetState (true);
+            Application.Shutdown ();
         }
     }
 
@@ -103,7 +103,7 @@ public class ApplicationPopoverTests
         finally
         {
             top?.Dispose ();
-            Application.ResetState (true);
+            Application.Shutdown ();
         }
     }
 
@@ -127,7 +127,7 @@ public class ApplicationPopoverTests
         }
         finally
         {
-            Application.ResetState (true);
+            Application.Shutdown ();
         }
     }
 
@@ -156,7 +156,7 @@ public class ApplicationPopoverTests
         }
         finally
         {
-            Application.ResetState (true);
+            Application.Shutdown ();
         }
     }
 
@@ -185,7 +185,7 @@ public class ApplicationPopoverTests
         }
         finally
         {
-            Application.ResetState (true);
+            Application.Shutdown ();
         }
     }
 
@@ -208,7 +208,8 @@ public class ApplicationPopoverTests
         }
         finally
         {
-            Application.ResetState (true);
+            Application.TopRunnable?.Dispose ();
+            Application.Shutdown ();
         }
     }
 
@@ -245,7 +246,8 @@ public class ApplicationPopoverTests
         }
         finally
         {
-            Application.ResetState (true);
+            Application.TopRunnable?.Dispose ();
+            Application.Shutdown ();
         }
     }
 
@@ -317,7 +319,7 @@ public class ApplicationPopoverTests
         {
             popover?.Dispose ();
             Application.TopRunnable?.Dispose ();
-            Application.ResetState (true);
+            Application.Shutdown();
         }
     }
 
diff --git a/Tests/UnitTests/Application/ApplicationTests.cs b/Tests/UnitTests/Application/ApplicationTests.cs
index 4ff8ecb2b..d90e567e3 100644
--- a/Tests/UnitTests/Application/ApplicationTests.cs
+++ b/Tests/UnitTests/Application/ApplicationTests.cs
@@ -1,4 +1,5 @@
-using System.Diagnostics;
+#nullable enable
+using System.Diagnostics;
 using Xunit.Abstractions;
 using static Terminal.Gui.Configuration.ConfigurationManager;
 
@@ -24,7 +25,7 @@ public class ApplicationTests
     [Fact]
     public void AddTimeout_Fires ()
     {
-        IApplication app = Application.Create ();
+        IApplication app = ApplicationImpl.Instance; // Force legacy
         app.Init ("fake");
 
         uint timeoutTime = 100;
@@ -63,7 +64,7 @@ public class ApplicationTests
     public void Begin_Null_Toplevel_Throws ()
     {
         // Test null Toplevel
-        Assert.Throws<ArgumentNullException> (() => Application.Begin (null));
+        Assert.Throws<ArgumentNullException> (() => Application.Begin (null!));
     }
 
     [Fact]
@@ -117,7 +118,7 @@ public class ApplicationTests
         var stopwatch = new Stopwatch ();
         stopwatch.Start ();
 
-        SessionToken sessionToken = null;
+        SessionToken? sessionToken = null;
 
         EventHandler<SessionTokenEventArgs> newSessionTokenFn = (s, e) =>
                                                                 {
@@ -337,7 +338,7 @@ public class ApplicationTests
 
         return;
 
-        void OnApplicationOnInitializedChanged (object s, EventArgs<bool> a)
+        void OnApplicationOnInitializedChanged (object? s, EventArgs<bool> a)
         {
             if (a.Value)
             {
@@ -377,7 +378,7 @@ public class ApplicationTests
         Toplevel topLevel = new ();
         Application.Init ("fake");
 
-        SessionToken sessionToken = null;
+        SessionToken? sessionToken = null;
 
         EventHandler<SessionTokenEventArgs> newSessionTokenFn = (s, e) =>
                                                                 {
@@ -450,7 +451,7 @@ public class ApplicationTests
 
         return;
 
-        void Application_Iteration (object sender, IterationEventArgs e)
+        void Application_Iteration (object? sender, EventArgs<IApplication?> e)
         {
             if (iteration > 0)
             {
@@ -466,7 +467,7 @@ public class ApplicationTests
     [SetupFakeApplication]
     public void Screen_Size_Changes ()
     {
-        IDriver driver = Application.Driver;
+        IDriver? driver = Application.Driver;
 
         Application.Driver!.SetScreenSize (80, 25);
 
@@ -558,7 +559,7 @@ public class ApplicationTests
 
         return;
 
-        void OnApplicationOnIteration (object s, IterationEventArgs a)
+        void OnApplicationOnIteration (object? s, EventArgs<IApplication?> a)
         {
             Assert.NotEqual (initTop, Application.TopRunnable);
 #if DEBUG_IDISPOSABLE
@@ -639,7 +640,7 @@ public class ApplicationTests
 
         return;
 
-        void OnApplicationOnIteration (object s, IterationEventArgs a) { Application.RequestStop (); }
+        void OnApplicationOnIteration (object? s, EventArgs<IApplication?> a) { Application.RequestStop (); }
     }
 
     [Fact]
@@ -658,7 +659,7 @@ public class ApplicationTests
 
         return;
 
-        void OnApplicationOnIteration (object s, IterationEventArgs a)
+        void OnApplicationOnIteration (object? s, EventArgs<IApplication?> a)
         {
             Assert.True (top.Running);
             top.RequestStop ();
@@ -681,7 +682,7 @@ public class ApplicationTests
 
         return;
 
-        void OnApplicationOnIteration (object s, IterationEventArgs a) { top.Running = false; }
+        void OnApplicationOnIteration (object? s, EventArgs<IApplication?> a) { top.Running = false; }
     }
 
     [Fact]
@@ -801,7 +802,7 @@ public class ApplicationTests
 
         return;
 
-        void OnApplicationOnIteration (object s, IterationEventArgs e) { Assert.NotNull (Application.TopRunnable); }
+        void OnApplicationOnIteration (object? s, EventArgs<IApplication?> e) { Assert.NotNull (Application.TopRunnable); }
     }
 
     [Fact]
@@ -865,7 +866,7 @@ public class ApplicationTests
 
         return;
 
-        void OnApplication_OnIteration (object s, IterationEventArgs e)
+        void OnApplication_OnIteration (object? s, EventArgs<IApplication?> e)
         {
             Assert.NotNull (Application.TopRunnable);
             Application.RequestStop ();
diff --git a/Tests/UnitTests/Application/Mouse/ApplicationMouseTests.cs b/Tests/UnitTests/Application/Mouse/ApplicationMouseTests.cs
index 08a97ea63..45926bffc 100644
--- a/Tests/UnitTests/Application/Mouse/ApplicationMouseTests.cs
+++ b/Tests/UnitTests/Application/Mouse/ApplicationMouseTests.cs
@@ -267,7 +267,7 @@ public class ApplicationMouseTests
 
         //                                 Assert.Equal (sv, Application.Mouse.MouseGrabView);
 
-        //                                 MessageBox.Query ("Title", "Test", "Ok");
+        //                                 MessageBox.Query (App, "Title", "Test", "Ok");
 
         //                                 Assert.Null (Application.Mouse.MouseGrabView);
         //                             }
diff --git a/Tests/UnitTests/Clipboard/ClipboardTests.cs b/Tests/UnitTests/Clipboard/ClipboardTests.cs
index 77a20b2d0..e829f2db6 100644
--- a/Tests/UnitTests/Clipboard/ClipboardTests.cs
+++ b/Tests/UnitTests/Clipboard/ClipboardTests.cs
@@ -20,6 +20,27 @@ public class ClipboardTests
         Assert.Throws<NotSupportedException> (() => iclip.SetClipboardData ("foo"));
     }
 
+    [Fact, AutoInitShutdown (useFakeClipboard: true)]
+    public void IApplication_Clipboard_Property_Works ()
+    {
+        if (Application.Clipboard?.IsSupported != true)
+        {
+            output.WriteLine ($"The Clipboard not supported on this platform.");
+            return;
+        }
+
+        string clipText = "The IApplication_Clipboard_Property_Works unit test pasted this to the OS clipboard.";
+        
+        // Use the new IApplication.Clipboard property
+        Application.Clipboard.SetClipboardData (clipText);
+
+        ApplicationImpl.Instance.Iteration += (s, a) => ApplicationImpl.Instance.RequestStop ();
+        ApplicationImpl.Instance.Run<Toplevel>().Dispose();
+
+        Assert.True(Application.Clipboard.TryGetClipboardData(out string result));
+        Assert.Equal (clipText, result);
+    }
+
     [Fact, AutoInitShutdown (useFakeClipboard: true)]
     public void Contents_Fake_Gets_Sets ()
     {
diff --git a/Tests/UnitTests/Configuration/ConfigurationMangerTests.cs b/Tests/UnitTests/Configuration/ConfigurationMangerTests.cs
index e1a83b4a5..12f891e12 100644
--- a/Tests/UnitTests/Configuration/ConfigurationMangerTests.cs
+++ b/Tests/UnitTests/Configuration/ConfigurationMangerTests.cs
@@ -1399,4 +1399,20 @@ public class ConfigurationManagerTests (ITestOutputHelper output)
             Disable (true);
         }
     }
+
+    [ConfigurationProperty (Scope = typeof (CMTestsScope))]
+    public static bool? TestProperty { get; set; }
+
+    private class CMTestsScope : Scope<CMTestsScope>
+    {
+    }
+
+    [Fact]
+    public void GetConfigPropertiesByScope_Gets ()
+    {
+        var props = GetUninitializedConfigPropertiesByScope ("CMTestsScope");
+
+        Assert.NotNull (props);
+        Assert.NotEmpty (props);
+    }
 }
diff --git a/Tests/UnitTests/Configuration/SourcesManagerTests.cs b/Tests/UnitTests/Configuration/SourcesManagerTests.cs
new file mode 100644
index 000000000..20e750ab0
--- /dev/null
+++ b/Tests/UnitTests/Configuration/SourcesManagerTests.cs
@@ -0,0 +1,47 @@
+using System.Reflection;
+using System.Text.Json;
+
+namespace UnitTests.ConfigurationTests;
+
+public class SourcesManagerTests
+{
+    [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;
+        }
+    }
+}
diff --git a/Tests/UnitTests/Dialogs/DialogTests.cs b/Tests/UnitTests/Dialogs/DialogTests.cs
index 72d479e1e..a8119f5fd 100644
--- a/Tests/UnitTests/Dialogs/DialogTests.cs
+++ b/Tests/UnitTests/Dialogs/DialogTests.cs
@@ -998,7 +998,7 @@ public class DialogTests (ITestOutputHelper output)
 
         return;
 
-        void OnApplicationOnIteration (object? s, IterationEventArgs a)
+        void OnApplicationOnIteration (object? s, EventArgs<IApplication?> a)
         {
             if (++iterations > 2)
             {
@@ -1085,7 +1085,7 @@ public class DialogTests (ITestOutputHelper output)
 
         return;
 
-        void OnApplicationOnIteration (object? s, IterationEventArgs a)
+        void OnApplicationOnIteration (object? s, EventArgs<IApplication?> a)
         {
             iterations++;
 
@@ -1167,7 +1167,7 @@ public class DialogTests (ITestOutputHelper output)
 
         return;
 
-        void OnApplicationOnIteration (object? s, IterationEventArgs a)
+        void OnApplicationOnIteration (object? s, EventArgs<IApplication?> a)
         {
             iterations++;
 
@@ -1348,7 +1348,7 @@ public class DialogTests (ITestOutputHelper output)
 
         return;
 
-        void OnApplicationOnIteration (object? s, IterationEventArgs a)
+        void OnApplicationOnIteration (object? s, EventArgs<IApplication?> a)
         {
             if (++iterations > 2)
             {
diff --git a/Tests/UnitTests/Dialogs/MessageBoxTests.cs b/Tests/UnitTests/Dialogs/MessageBoxTests.cs
deleted file mode 100644
index d602eef96..000000000
--- a/Tests/UnitTests/Dialogs/MessageBoxTests.cs
+++ /dev/null
@@ -1,544 +0,0 @@
-using System.Text;
-using UICatalog;
-using UnitTests;
-using Xunit.Abstractions;
-
-namespace UnitTests.DialogTests;
-
-public class MessageBoxTests (ITestOutputHelper output)
-{
-    [Fact]
-    [AutoInitShutdown]
-    public void KeyBindings_Enter_Causes_Focused_Button_Click_No_Accept ()
-    {
-        int result = -1;
-
-        var iteration = 0;
-
-        var btnAcceptCount = 0;
-
-        Application.Iteration += OnApplicationOnIteration;
-        Application.Run ().Dispose ();
-        Application.Iteration -= OnApplicationOnIteration;
-
-        Assert.Equal (1, result);
-        Assert.Equal (1, btnAcceptCount);
-
-        return;
-
-        void OnApplicationOnIteration (object s, IterationEventArgs a)
-        {
-            iteration++;
-
-            switch (iteration)
-            {
-                case 1:
-                    result = MessageBox.Query (string.Empty, string.Empty, 0, false, "btn0", "btn1");
-                    Application.RequestStop ();
-
-                    break;
-
-                case 2:
-                    // Tab to btn2
-                    Application.RaiseKeyDownEvent (Key.Tab);
-
-                    var btn = Application.Navigation!.GetFocused () as Button;
-
-                    btn.Accepting += (sender, e) => { btnAcceptCount++; };
-
-                    // Click
-                    Application.RaiseKeyDownEvent (Key.Enter);
-
-                    break;
-
-                default:
-                    Assert.Fail ();
-
-                    break;
-            }
-        }
-    }
-
-    [Fact]
-    [AutoInitShutdown]
-    public void KeyBindings_Esc_Closes ()
-    {
-        var result = 999;
-
-        var iteration = 0;
-
-        Application.Iteration += OnApplicationOnIteration;
-        Application.Run ().Dispose ();
-        Application.Iteration -= OnApplicationOnIteration;
-
-        Assert.Equal (-1, result);
-
-        return;
-
-        void OnApplicationOnIteration (object s, IterationEventArgs a)
-        {
-            iteration++;
-
-            switch (iteration)
-            {
-                case 1:
-                    result = MessageBox.Query (string.Empty, string.Empty, 0, false, "btn0", "btn1");
-                    Application.RequestStop ();
-
-                    break;
-
-                case 2:
-                    Application.RaiseKeyDownEvent (Key.Esc);
-
-                    break;
-
-                default:
-                    Assert.Fail ();
-
-                    break;
-            }
-        }
-    }
-
-    [Fact]
-    [AutoInitShutdown]
-    public void KeyBindings_Space_Causes_Focused_Button_Click_No_Accept ()
-    {
-        int result = -1;
-
-        var iteration = 0;
-
-        var btnAcceptCount = 0;
-
-        Application.Iteration += OnApplicationOnIteration;
-        Application.Run ().Dispose ();
-        Application.Iteration -= OnApplicationOnIteration;
-
-        Assert.Equal (1, result);
-        Assert.Equal (1, btnAcceptCount);
-
-        return;
-
-        void OnApplicationOnIteration (object s, IterationEventArgs a)
-        {
-            iteration++;
-
-            switch (iteration)
-            {
-                case 1:
-                    result = MessageBox.Query (string.Empty, string.Empty, 0, false, "btn0", "btn1");
-                    Application.RequestStop ();
-
-                    break;
-
-                case 2:
-                    // Tab to btn2
-                    Application.RaiseKeyDownEvent (Key.Tab);
-
-                    var btn = Application.Navigation!.GetFocused () as Button;
-
-                    btn.Accepting += (sender, e) => { btnAcceptCount++; };
-
-                    Application.RaiseKeyDownEvent (Key.Space);
-
-                    break;
-
-                default:
-                    Assert.Fail ();
-
-                    break;
-            }
-        }
-    }
-
-    [Theory]
-    [InlineData (@"", false, false, 6, 6, 2, 2)]
-    [InlineData (@"", false, true, 3, 6, 9, 3)]
-    [InlineData (@"01234\n-----\n01234", false, false, 1, 6, 13, 3)]
-    [InlineData (@"01234\n-----\n01234", true, false, 1, 5, 13, 4)]
-    [InlineData (@"0123456789", false, false, 1, 6, 12, 3)]
-    [InlineData (@"0123456789", false, true, 1, 5, 12, 4)]
-    [InlineData (@"01234567890123456789", false, true, 1, 5, 13, 4)]
-    [InlineData (@"01234567890123456789", true, true, 1, 5, 13, 5)]
-    [InlineData (@"01234567890123456789\n01234567890123456789", false, true, 1, 5, 13, 4)]
-    [InlineData (@"01234567890123456789\n01234567890123456789", true, true, 1, 4, 13, 7)]
-    [AutoInitShutdown]
-    public void Location_And_Size_Correct (string message, bool wrapMessage, bool hasButton, int expectedX, int expectedY, int expectedW, int expectedH)
-    {
-        int iterations = -1;
-
-        Application.Driver!.SetScreenSize(15, 15); // 15 x 15 gives us enough room for a button with one char (9x1)
-        Dialog.DefaultShadow = ShadowStyle.None;
-        Button.DefaultShadow = ShadowStyle.None;
-
-        var mbFrame = Rectangle.Empty;
-
-        Application.Iteration += OnApplicationOnIteration;
-
-        Application.Run ().Dispose ();
-        Application.Iteration -= OnApplicationOnIteration;
-
-        Assert.Equal (new (expectedX, expectedY, expectedW, expectedH), mbFrame);
-
-        return;
-
-        void OnApplicationOnIteration (object s, IterationEventArgs a)
-        {
-            iterations++;
-
-            if (iterations == 0)
-            {
-                MessageBox.Query (string.Empty, message, 0, wrapMessage, hasButton ? ["0"] : []);
-                Application.RequestStop ();
-            }
-            else if (iterations == 1)
-            {
-                mbFrame = Application.TopRunnable!.Frame;
-                Application.RequestStop ();
-            }
-        }
-    }
-
-    [Fact]
-    [AutoInitShutdown]
-    public void Message_With_Spaces_WrapMessage_False ()
-    {
-        int iterations = -1;
-        var top = new Toplevel ();
-        top.BorderStyle = LineStyle.None;
-        Application.Driver!.SetScreenSize(20, 10);
-
-        var btn =
-            $"{Glyphs.LeftBracket}{Glyphs.LeftDefaultIndicator} btn {Glyphs.RightDefaultIndicator}{Glyphs.RightBracket}";
-
-        // Override CM
-        MessageBox.DefaultButtonAlignment = Alignment.End;
-        MessageBox.DefaultBorderStyle = LineStyle.Double;
-        Dialog.DefaultShadow = ShadowStyle.None;
-        Button.DefaultShadow = ShadowStyle.None;
-
-        Application.Iteration += OnApplicationOnIteration;
-
-        Application.Run (top);
-        Application.Iteration -= OnApplicationOnIteration;
-        top.Dispose ();
-
-        return;
-
-        void OnApplicationOnIteration (object s, IterationEventArgs a)
-        {
-            iterations++;
-
-            if (iterations == 0)
-            {
-                var sb = new StringBuilder ();
-
-                for (var i = 0; i < 17; i++)
-                {
-                    sb.Append ("ff ");
-                }
-
-                MessageBox.Query (string.Empty, sb.ToString (), 0, false, "btn");
-
-                Application.RequestStop ();
-            }
-            else if (iterations == 2)
-            {
-                DriverAssert.AssertDriverContentsWithFrameAre (
-                                                               @"
- ╔════════════════╗
- ║ ff ff ff ff ff ║
- ║       ⟦► btn ◄⟧║
- ╚════════════════╝",
-                                                               output);
-                Application.RequestStop ();
-
-                // Really long text
-                MessageBox.Query (string.Empty, new ('f', 500), 0, false, "btn");
-            }
-            else if (iterations == 4)
-            {
-                DriverAssert.AssertDriverContentsWithFrameAre (
-                                                               @"
- ╔════════════════╗
- ║ffffffffffffffff║
- ║       ⟦► btn ◄⟧║
- ╚════════════════╝",
-                                                               output);
-                Application.RequestStop ();
-            }
-        }
-    }
-
-    [Fact]
-    [AutoInitShutdown]
-    public void Message_With_Spaces_WrapMessage_True ()
-    {
-        int iterations = -1;
-        var top = new Toplevel ();
-        top.BorderStyle = LineStyle.None;
-        Application.Driver!.SetScreenSize (20, 10);
-
-        var btn =
-            $"{Glyphs.LeftBracket}{Glyphs.LeftDefaultIndicator} btn {Glyphs.RightDefaultIndicator}{Glyphs.RightBracket}";
-
-        // Override CM
-        MessageBox.DefaultButtonAlignment = Alignment.End;
-        MessageBox.DefaultBorderStyle = LineStyle.Double;
-        Dialog.DefaultShadow = ShadowStyle.None;
-        Button.DefaultShadow = ShadowStyle.None;
-
-        Application.Iteration += OnApplicationOnIteration;
-
-        Application.Run (top);
-        Application.Iteration -= OnApplicationOnIteration;
-        top.Dispose ();
-
-        return;
-
-        void OnApplicationOnIteration (object s, IterationEventArgs a)
-        {
-            iterations++;
-
-            if (iterations == 0)
-            {
-                var sb = new StringBuilder ();
-
-                for (var i = 0; i < 17; i++)
-                {
-                    sb.Append ("ff ");
-                }
-
-                MessageBox.Query (string.Empty, sb.ToString (), 0, true, "btn");
-
-                Application.RequestStop ();
-            }
-            else if (iterations == 2)
-            {
-                DriverAssert.AssertDriverContentsWithFrameAre (
-                                                               @"
-  ╔══════════════╗
-  ║ff ff ff ff ff║
-  ║ff ff ff ff ff║
-  ║ff ff ff ff ff║
-  ║    ff ff     ║
-  ║     ⟦► btn ◄⟧║
-  ╚══════════════╝",
-                                                               output);
-                Application.RequestStop ();
-
-                // Really long text
-                MessageBox.Query (string.Empty, new ('f', 500), 0, true, "btn");
-            }
-            else if (iterations == 4)
-            {
-                DriverAssert.AssertDriverContentsWithFrameAre (
-                                                               @"
- ╔════════════════╗
- ║ffffffffffffffff║
- ║ffffffffffffffff║
- ║ffffffffffffffff║
- ║ffffffffffffffff║
- ║ffffffffffffffff║
- ║ffffffffffffffff║
- ║fffffff⟦► btn ◄⟧║
- ╚════════════════╝",
-                                                               output);
-                Application.RequestStop ();
-            }
-        }
-    }
-
-    [Theory (Skip = "Bogus test: Never does anything")]
-    [InlineData (0, 0, "1")]
-    [InlineData (1, 1, "1")]
-    [InlineData (7, 5, "1")]
-    [InlineData (50, 50, "1")]
-    [InlineData (0, 0, "message")]
-    [InlineData (1, 1, "message")]
-    [InlineData (7, 5, "message")]
-    [InlineData (50, 50, "message")]
-    [AutoInitShutdown]
-    public void Size_Not_Default_Message (int height, int width, string message)
-    {
-        int iterations = -1;
-        Application.Driver!.SetScreenSize(100, 100);
-
-        Application.Iteration += (s, a) =>
-                                 {
-                                     iterations++;
-
-                                     if (iterations == 0)
-                                     {
-                                         MessageBox.Query (height, width, string.Empty, message, null);
-
-                                         Application.RequestStop ();
-                                     }
-                                     else if (iterations == 1)
-                                     {
-                                         AutoInitShutdownAttribute.RunIteration ();
-
-                                         Assert.IsType<Dialog> (Application.TopRunnable);
-                                         Assert.Equal (new (height, width), Application.TopRunnable.Frame.Size);
-
-                                         Application.RequestStop ();
-                                     }
-                                 };
-    }
-
-    [Theory (Skip = "Bogus test: Never does anything")]
-    [InlineData (0, 0, "1")]
-    [InlineData (1, 1, "1")]
-    [InlineData (7, 5, "1")]
-    [InlineData (50, 50, "1")]
-    [InlineData (0, 0, "message")]
-    [InlineData (1, 1, "message")]
-    [InlineData (7, 5, "message")]
-    [InlineData (50, 50, "message")]
-    [AutoInitShutdown]
-    public void Size_Not_Default_Message_Button (int height, int width, string message)
-    {
-        int iterations = -1;
-        Application.Driver?.SetScreenSize(100, 100);
-
-        Application.Iteration += (s, a) =>
-                                 {
-                                     iterations++;
-
-                                     if (iterations == 0)
-                                     {
-                                         MessageBox.Query (height, width, string.Empty, message, "_Ok");
-
-                                         Application.RequestStop ();
-                                     }
-                                     else if (iterations == 1)
-                                     {
-                                         AutoInitShutdownAttribute.RunIteration ();
-
-                                         Assert.IsType<Dialog> (Application.TopRunnable);
-                                         Assert.Equal (new (height, width), Application.TopRunnable.Frame.Size);
-
-                                         Application.RequestStop ();
-                                     }
-                                 };
-    }
-
-    [Theory (Skip = "Bogus test: Never does anything")]
-    [InlineData (0, 0)]
-    [InlineData (1, 1)]
-    [InlineData (7, 5)]
-    [InlineData (50, 50)]
-    [AutoInitShutdown]
-    public void Size_Not_Default_No_Message (int height, int width)
-    {
-        int iterations = -1;
-        Application.Driver?.SetScreenSize(100, 100);
-
-        Application.Iteration += (s, a) =>
-                                 {
-                                     iterations++;
-
-                                     if (iterations == 0)
-                                     {
-                                         MessageBox.Query (height, width, string.Empty, string.Empty, null);
-
-                                         Application.RequestStop ();
-                                     }
-                                     else if (iterations == 1)
-                                     {
-                                         AutoInitShutdownAttribute.RunIteration ();
-
-                                         Assert.IsType<Dialog> (Application.TopRunnable);
-                                         Assert.Equal (new (height, width), Application.TopRunnable.Frame.Size);
-
-                                         Application.RequestStop ();
-                                     }
-                                 };
-    }
-
-    [Fact]
-    [AutoInitShutdown]
-    public void UICatalog_AboutBox ()
-    {
-        int iterations = -1;
-        Application.Driver!.SetScreenSize (70, 15);
-
-        // Override CM
-        MessageBox.DefaultButtonAlignment = Alignment.End;
-        MessageBox.DefaultBorderStyle = LineStyle.Double;
-        Dialog.DefaultShadow = ShadowStyle.None;
-        Button.DefaultShadow = ShadowStyle.None;
-
-        Application.Iteration += OnApplicationOnIteration;
-
-        var top = new Toplevel ();
-        top.BorderStyle = LineStyle.Single;
-        Application.Run (top);
-        Application.Iteration -= OnApplicationOnIteration;
-        top.Dispose ();
-
-        return;
-
-        void OnApplicationOnIteration (object s, IterationEventArgs a)
-        {
-            iterations++;
-
-            if (iterations == 0)
-            {
-                MessageBox.Query (
-                                  "",
-                                  UICatalog.UICatalogTop.GetAboutBoxMessage (),
-                                  wrapMessage: false,
-                                  buttons: "_Ok");
-
-                Application.RequestStop ();
-            }
-            else if (iterations == 2)
-            {
-                var expectedText = """
-                                   ┌────────────────────────────────────────────────────────────────────┐
-                                   │   ╔═══════════════════════════════════════════════════════════╗    │
-                                   │   ║UI Catalog: A comprehensive sample library and test app for║    │
-                                   │   ║                                                           ║    │
-                                   │   ║ _______                  _             _   _____       _  ║    │
-                                   │   ║|__   __|                (_)           | | / ____|     (_) ║    │
-                                   │   ║   | | ___ _ __ _ __ ___  _ _ __   __ _| || |  __ _   _ _  ║    │
-                                   │   ║   | |/ _ \ '__| '_ ` _ \| | '_ \ / _` | || | |_ | | | | | ║    │
-                                   │   ║   | |  __/ |  | | | | | | | | | | (_| | || |__| | |_| | | ║    │
-                                   │   ║   |_|\___|_|  |_| |_| |_|_|_| |_|\__,_|_(_)_____|\__,_|_| ║    │
-                                   │   ║                                                           ║    │
-                                   │   ║                      v2 - Pre-Alpha                       ║    │
-                                   │   ║                                                   ⟦► Ok ◄⟧║    │
-                                   │   ╚═══════════════════════════════════════════════════════════╝    │
-                                   └────────────────────────────────────────────────────────────────────┘
-                                   """;
-
-                DriverAssert.AssertDriverContentsAre (expectedText, output);
-
-                Application.RequestStop ();
-            }
-        }
-    }
-
-    [Theory]
-    [MemberData (nameof (AcceptingKeys))]
-    [AutoInitShutdown]
-    public void Button_IsDefault_True_Return_His_Index_On_Accepting (Key key)
-    {
-        Application.Iteration += OnApplicationOnIteration;
-        int res = MessageBox.Query ("hey", "IsDefault", "Yes", "No");
-        Application.Iteration -= OnApplicationOnIteration;
-
-        Assert.Equal (0, res);
-
-        return;
-
-        void OnApplicationOnIteration (object o, IterationEventArgs iterationEventArgs) => Assert.True (Application.RaiseKeyDownEvent (key));
-    }
-
-    public static IEnumerable<object []> AcceptingKeys ()
-    {
-        yield return [Key.Enter];
-        yield return [Key.Space];
-    }
-}
diff --git a/Tests/UnitTests/DriverAssert.cs b/Tests/UnitTests/DriverAssert.cs
index 7bac03f05..b837e462d 100644
--- a/Tests/UnitTests/DriverAssert.cs
+++ b/Tests/UnitTests/DriverAssert.cs
@@ -42,7 +42,12 @@ internal partial class DriverAssert
         }
 
         expectedLook = expectedLook.Trim ();
-        driver ??= Application.Driver;
+
+        if (driver is null && ApplicationImpl.ModelUsage == ApplicationModelUsage.LegacyStatic)
+        {
+            driver = Application.Driver;
+        }
+        ArgumentNullException.ThrowIfNull(driver);
 
         Cell [,] contents = driver!.Contents!;
 
@@ -152,8 +157,11 @@ internal partial class DriverAssert
     )
     {
 #pragma warning restore xUnit1013 // Public method should be marked as test
-        driver ??= Application.Driver!;
-
+        if (driver is null && ApplicationImpl.ModelUsage == ApplicationModelUsage.LegacyStatic)
+        {
+            driver = Application.Driver;
+        }
+        ArgumentNullException.ThrowIfNull (driver);
         var actualLook = driver.ToString ();
 
         if (string.Equals (expectedLook, actualLook))
@@ -200,8 +208,11 @@ internal partial class DriverAssert
     {
         List<List<string>> lines = [];
         var sb = new StringBuilder ();
-        driver ??= Application.Driver!;
-
+        if (driver is null && ApplicationImpl.ModelUsage == ApplicationModelUsage.LegacyStatic)
+        {
+            driver = Application.Driver;
+        }
+        ArgumentNullException.ThrowIfNull (driver);
         int x = -1;
         int y = -1;
         int w = -1;
@@ -338,8 +349,11 @@ internal partial class DriverAssert
     /// <param name="expectedColors"></param>
     internal static void AssertDriverUsedColors (IDriver? driver = null, params Attribute [] expectedColors)
     {
-        driver ??= Application.Driver;
-        Cell [,] contents = driver?.Contents!;
+        if (driver is null && ApplicationImpl.ModelUsage == ApplicationModelUsage.LegacyStatic)
+        {
+            driver = Application.Driver;
+        }
+        ArgumentNullException.ThrowIfNull (driver); Cell [,] contents = driver?.Contents!;
 
         List<Attribute> toFind = expectedColors.ToList ();
 
diff --git a/Tests/UnitTests/Drivers/ClipRegionTests.cs b/Tests/UnitTests/Drivers/ClipRegionTests.cs
deleted file mode 100644
index def6bdde0..000000000
--- a/Tests/UnitTests/Drivers/ClipRegionTests.cs
+++ /dev/null
@@ -1,105 +0,0 @@
-using System.Text;
-using Xunit.Abstractions;
-
-// Alias Console to MockConsole so we don't accidentally use Console
-
-namespace UnitTests.DriverTests;
-
-public class ClipRegionTests (ITestOutputHelper output)
-{
-    private readonly ITestOutputHelper _output = output;
-
-    [Fact]
-    public void AddRune_Is_Clipped ()
-    {
-        Application.Init ("fake");
-
-        Application.Driver!.Move (0, 0);
-        Application.Driver!.AddRune ('x');
-        Assert.Equal ("x", Application.Driver!.Contents! [0, 0].Grapheme);
-
-        Application.Driver?.Move (5, 5);
-        Application.Driver?.AddRune ('x');
-        Assert.Equal ("x", Application.Driver!.Contents [5, 5].Grapheme);
-
-        // Clear the contents
-        Application.Driver?.FillRect (new Rectangle (0, 0, Application.Driver.Rows, Application.Driver.Cols), ' ');
-        Assert.Equal (" ", Application.Driver?.Contents [0, 0].Grapheme);
-
-        // Setup the region with a single rectangle, fill screen with 'x'
-        Application.Driver!.Clip = new (new Rectangle (5, 5, 5, 5));
-        Application.Driver.FillRect (new Rectangle (0, 0, Application.Driver.Rows, Application.Driver.Cols), 'x');
-        Assert.Equal (" ", Application.Driver?.Contents [0, 0].Grapheme);
-        Assert.Equal (" ", Application.Driver?.Contents [4, 9].Grapheme);
-        Assert.Equal ("x", Application.Driver?.Contents [5, 5].Grapheme);
-        Assert.Equal ("x", Application.Driver?.Contents [9, 9].Grapheme);
-        Assert.Equal (" ", Application.Driver?.Contents [10, 10].Grapheme);
-
-        Application.Shutdown ();
-    }
-
-    [Fact]
-    public void Clip_Set_To_Empty_AllInvalid ()
-    {
-        Application.Init ("fake");
-
-        // Define a clip rectangle
-        Application.Driver!.Clip = new (Rectangle.Empty);
-
-        // negative
-        Assert.False (Application.Driver.IsValidLocation (default, 4, 5));
-        Assert.False (Application.Driver.IsValidLocation (default, 5, 4));
-        Assert.False (Application.Driver.IsValidLocation (default, 10, 9));
-        Assert.False (Application.Driver.IsValidLocation (default, 9, 10));
-        Assert.False (Application.Driver.IsValidLocation (default, -1, 0));
-        Assert.False (Application.Driver.IsValidLocation (default, 0, -1));
-        Assert.False (Application.Driver.IsValidLocation (default, -1, -1));
-        Assert.False (Application.Driver.IsValidLocation (default, Application.Driver.Cols, Application.Driver.Rows - 1));
-        Assert.False (Application.Driver.IsValidLocation (default, Application.Driver.Cols, Application.Driver.Rows - 1));
-        Assert.False (Application.Driver.IsValidLocation (default, Application.Driver.Cols, Application.Driver.Rows));
-
-        Application.Shutdown ();
-    }
-
-    [Fact]
-    public void IsValidLocation ()
-    {
-        Application.Init ("fake");
-        Application.Driver!.Rows = 10;
-        Application.Driver!.Cols = 10;
-
-        // positive
-        Assert.True (Application.Driver.IsValidLocation (default, 0, 0));
-        Assert.True (Application.Driver.IsValidLocation (default, 1, 1));
-        Assert.True (Application.Driver.IsValidLocation (default, Application.Driver.Cols - 1, Application.Driver.Rows - 1));
-
-        // negative
-        Assert.False (Application.Driver.IsValidLocation (default, -1, 0));
-        Assert.False (Application.Driver.IsValidLocation (default, 0, -1));
-        Assert.False (Application.Driver.IsValidLocation (default, -1, -1));
-        Assert.False (Application.Driver.IsValidLocation (default, Application.Driver.Cols, Application.Driver.Rows - 1));
-        Assert.False (Application.Driver.IsValidLocation (default, Application.Driver.Cols, Application.Driver.Rows - 1));
-        Assert.False (Application.Driver.IsValidLocation (default, Application.Driver.Cols, Application.Driver.Rows));
-
-        // Define a clip rectangle
-        Application.Driver.Clip = new (new Rectangle (5, 5, 5, 5));
-
-        // positive
-        Assert.True (Application.Driver.IsValidLocation (default, 5, 5));
-        Assert.True (Application.Driver.IsValidLocation (default, 9, 9));
-
-        // negative
-        Assert.False (Application.Driver.IsValidLocation (default, 4, 5));
-        Assert.False (Application.Driver.IsValidLocation (default, 5, 4));
-        Assert.False (Application.Driver.IsValidLocation (default, 10, 9));
-        Assert.False (Application.Driver.IsValidLocation (default, 9, 10));
-        Assert.False (Application.Driver.IsValidLocation (default, -1, 0));
-        Assert.False (Application.Driver.IsValidLocation (default, 0, -1));
-        Assert.False (Application.Driver.IsValidLocation (default, -1, -1));
-        Assert.False (Application.Driver.IsValidLocation (default, Application.Driver.Cols, Application.Driver.Rows - 1));
-        Assert.False (Application.Driver.IsValidLocation (default, Application.Driver.Cols, Application.Driver.Rows - 1));
-        Assert.False (Application.Driver.IsValidLocation (default, Application.Driver.Cols, Application.Driver.Rows));
-
-        Application.Shutdown ();
-    }
-}
diff --git a/Tests/UnitTests/Drivers/DriverTests.cs b/Tests/UnitTests/Drivers/DriverTests.cs
deleted file mode 100644
index 202ec7208..000000000
--- a/Tests/UnitTests/Drivers/DriverTests.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-#nullable enable
-using Xunit.Abstractions;
-
-namespace UnitTests.DriverTests;
-
-public class DriverTests (ITestOutputHelper output)
-{
-    private readonly ITestOutputHelper _output = output;
-
-    [Theory]
-    [InlineData ("fake")]
-    [InlineData ("windows")]
-    [InlineData ("dotnet")]
-    [InlineData ("unix")]
-    public void All_Drivers_Init_Shutdown_Cross_Platform (string driverName)
-    {
-        IApplication? app = Application.Create ();
-        app.Init (driverName);
-        app.Shutdown ();
-    }
-
-    [Theory]
-    [InlineData ("fake")]
-    [InlineData ("windows")]
-    [InlineData ("dotnet")]
-    [InlineData ("unix")]
-    public void All_Drivers_Run_Cross_Platform (string driverName)
-    {
-        IApplication? app = Application.Create ();
-        app.Init (driverName);
-        app.StopAfterFirstIteration = true;
-        app.Run ().Dispose ();
-        app.Shutdown ();
-    }
-
-    [Theory]
-    [InlineData ("fake")]
-    [InlineData ("windows")]
-    [InlineData ("dotnet")]
-    [InlineData ("unix")]
-    public void All_Drivers_LayoutAndDraw_Cross_Platform (string driverName)
-    {
-        IApplication? app = Application.Create ();
-        app.Init (driverName);
-        app.StopAfterFirstIteration = true;
-        app.Run<TestTop> ().Dispose ();
-
-        DriverAssert.AssertDriverContentsWithFrameAre (driverName!, _output, app.Driver);
-
-        app.Shutdown ();
-    }
-}
-
-public class TestTop : Toplevel
-{
-    /// <inheritdoc/>
-    public override void BeginInit ()
-    {
-        Text = Driver!.GetName ()!;
-        BorderStyle = LineStyle.None;
-        base.BeginInit ();
-    }
-}
diff --git a/Tests/TerminalGuiFluentTesting/FakeDriver/FakeApplicationFactory.cs b/Tests/UnitTests/FakeDriver/FakeApplicationFactory.cs
similarity index 100%
rename from Tests/TerminalGuiFluentTesting/FakeDriver/FakeApplicationFactory.cs
rename to Tests/UnitTests/FakeDriver/FakeApplicationFactory.cs
diff --git a/Tests/TerminalGuiFluentTesting/FakeDriver/FakeApplicationLifecycle.cs b/Tests/UnitTests/FakeDriver/FakeApplicationLifecycle.cs
similarity index 100%
rename from Tests/TerminalGuiFluentTesting/FakeDriver/FakeApplicationLifecycle.cs
rename to Tests/UnitTests/FakeDriver/FakeApplicationLifecycle.cs
diff --git a/Tests/UnitTests/FakeDriverBase.cs b/Tests/UnitTests/FakeDriverBase.cs
index 657c5a588..0e6011e34 100644
--- a/Tests/UnitTests/FakeDriverBase.cs
+++ b/Tests/UnitTests/FakeDriverBase.cs
@@ -4,7 +4,7 @@ namespace UnitTests;
 ///     Enables tests to create a FakeDriver for testing purposes.
 /// </summary>
 [Collection ("Global Test Setup")]
-public abstract class FakeDriverBase : IDisposable
+public abstract class FakeDriverBase /*: IDisposable*/
 {
     /// <summary>
     ///     Creates a new FakeDriver instance with the specified buffer size.
@@ -30,9 +30,9 @@ public abstract class FakeDriverBase : IDisposable
         return driver;
     }
 
-    /// <inheritdoc />
-    public void Dispose ()
-    {
-        Application.ResetState (true);
-    }
+    ///// <inheritdoc />
+    //public void Dispose ()
+    //{
+    //    Application.ResetState (true);
+    //}
 }
diff --git a/Tests/IntegrationTests/UICatalog/ScenarioTests.cs b/Tests/UnitTests/UICatalog/ScenarioTests.cs
similarity index 97%
rename from Tests/IntegrationTests/UICatalog/ScenarioTests.cs
rename to Tests/UnitTests/UICatalog/ScenarioTests.cs
index bd8fcb69d..b4d5849b6 100644
--- a/Tests/IntegrationTests/UICatalog/ScenarioTests.cs
+++ b/Tests/UnitTests/UICatalog/ScenarioTests.cs
@@ -1,11 +1,12 @@
+#nullable enable
 using System.Diagnostics;
 using System.Reflection;
 using System.Runtime.InteropServices;
 using UICatalog;
-using UnitTests;
 using Xunit.Abstractions;
+using Timeout = System.Threading.Timeout;
 
-namespace IntegrationTests.UICatalog;
+namespace UnitTests.UICatalog;
 
 public class ScenarioTests : TestsAllViews
 {
@@ -32,6 +33,7 @@ public class ScenarioTests : TestsAllViews
         if (RuntimeInformation.IsOSPlatform (OSPlatform.OSX))
         {
             _output.WriteLine ($"Skipping Scenario '{scenarioType}' on macOS due to random timeout failures.");
+
             return;
         }
 
@@ -42,6 +44,7 @@ public class ScenarioTests : TestsAllViews
         _output.WriteLine ($"Running Scenario '{scenarioType}'");
         Scenario? scenario = null;
         var scenarioName = string.Empty;
+
         // Do not use Application.AddTimer for out-of-band watchdogs as
         // they will be stopped by Shutdown/ResetState.
         Timer? watchdogTimer = null;
@@ -120,7 +123,7 @@ public class ScenarioTests : TestsAllViews
                 initialized = true;
 
                 // Use a System.Threading.Timer for the watchdog to ensure it's not affected by Application.StopAllTimers
-                watchdogTimer = new Timer (_ => ForceCloseCallback (), null, (int)abortTime, System.Threading.Timeout.Infinite);
+                watchdogTimer = new (_ => ForceCloseCallback (), null, (int)abortTime, Timeout.Infinite);
             }
             else
             {
@@ -152,7 +155,7 @@ public class ScenarioTests : TestsAllViews
             }
         }
 
-        void OnApplicationOnIteration (object? s, IterationEventArgs a)
+        void OnApplicationOnIteration (object? s, EventArgs<IApplication?> a)
         {
             iterationCount++;
 
@@ -394,7 +397,7 @@ public class ScenarioTests : TestsAllViews
 
         return;
 
-        void OnApplicationOnIteration (object? s, IterationEventArgs a)
+        void OnApplicationOnIteration (object? s, EventArgs<IApplication?> a)
         {
             iterations++;
 
@@ -411,7 +414,7 @@ public class ScenarioTests : TestsAllViews
             }
             else
             {
-                Application.RequestStop ();
+                a.Value?.RequestStop ();
             }
         }
 
@@ -498,7 +501,7 @@ public class ScenarioTests : TestsAllViews
             }
             catch (Exception e)
             {
-                MessageBox.ErrorQuery ("Exception", e.Message, "Ok");
+                MessageBox.ErrorQuery (ApplicationImpl.Instance, "Exception", e.Message, "Ok");
             }
 
             UpdateTitle (view);
@@ -602,7 +605,7 @@ public class ScenarioTests : TestsAllViews
                 }
                 catch (TargetInvocationException e)
                 {
-                    MessageBox.ErrorQuery ("Exception", e.InnerException!.Message, "Ok");
+                    MessageBox.ErrorQuery (ApplicationImpl.Instance, "Exception", e.InnerException!.Message, "Ok");
                     view = null;
                 }
             }
diff --git a/Tests/UnitTests/UnitTests.csproj b/Tests/UnitTests/UnitTests.csproj
index 10ee70744..6734d73b8 100644
--- a/Tests/UnitTests/UnitTests.csproj
+++ b/Tests/UnitTests/UnitTests.csproj
@@ -58,4 +58,7 @@
 		<Using Include="Terminal.Gui" />
 		<Using Include="Xunit" />
 	</ItemGroup>
+	<ItemGroup>
+	  <Folder Include="Drivers\" />
+	</ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Tests/UnitTests/View/ArrangementTests.cs b/Tests/UnitTests/View/ArrangementTests.cs
index 13e5d880a..c6b88b8ce 100644
--- a/Tests/UnitTests/View/ArrangementTests.cs
+++ b/Tests/UnitTests/View/ArrangementTests.cs
@@ -17,7 +17,7 @@ public class ArrangementTests (ITestOutputHelper output)
             Width = 80,
             Height = 25
         };
-        superView.App = Application.Create ();
+        superView.App = ApplicationImpl.Instance;
 
         var movableView = new View
         {
@@ -82,7 +82,7 @@ public class ArrangementTests (ITestOutputHelper output)
 
         var superView = new View
         {
-            App = Application.Create (),
+            App = ApplicationImpl.Instance,
             Width = 80,
             Height = 25
         };
@@ -148,7 +148,7 @@ public class ArrangementTests (ITestOutputHelper output)
         // This test verifies MouseGrabHandler properly releases when switching between views
 
         var superView = new View { Width = 80, Height = 25 };
-        superView.App = Application.Create ();
+        superView.App = ApplicationImpl.Instance;
 
         var view1 = new View
         {
diff --git a/Tests/UnitTests/View/Draw/DrawTests.cs b/Tests/UnitTests/View/Draw/DrawTests.cs
index 6a8a13325..11682d9ce 100644
--- a/Tests/UnitTests/View/Draw/DrawTests.cs
+++ b/Tests/UnitTests/View/Draw/DrawTests.cs
@@ -690,7 +690,7 @@ public class DrawTests (ITestOutputHelper output)
 
         return;
 
-        void OnApplicationOnIteration (object? s, IterationEventArgs a)
+        void OnApplicationOnIteration (object? s, EventArgs<IApplication?> a)
         {
             Assert.Equal (-2, view.X);
 
diff --git a/Tests/UnitTests/View/Layout/Pos.Tests.cs b/Tests/UnitTests/View/Layout/Pos.Tests.cs
index 256c1c6e1..4fbe3f906 100644
--- a/Tests/UnitTests/View/Layout/Pos.Tests.cs
+++ b/Tests/UnitTests/View/Layout/Pos.Tests.cs
@@ -1,7 +1,4 @@
-using UnitTests;
-using Xunit.Abstractions;
-using static Terminal.Gui.ViewBase.Dim;
-using static Terminal.Gui.ViewBase.Pos;
+#nullable enable
 
 namespace UnitTests.LayoutTests;
 
@@ -116,7 +113,7 @@ public class PosTests ()
 
         return;
 
-        void OnInstanceOnIteration (object s, IterationEventArgs a)
+        void OnInstanceOnIteration (object? s, EventArgs<IApplication?> a)
         {
             while (count < 20)
             {
@@ -191,7 +188,7 @@ public class PosTests ()
 
         return;
 
-        void OnApplicationOnIteration (object s, IterationEventArgs a)
+        void OnApplicationOnIteration (object? s, EventArgs<IApplication?> a)
         {
             while (count > 0)
             {
diff --git a/Tests/UnitTests/View/Layout/Pos.ViewTests.cs b/Tests/UnitTests/View/Layout/Pos.ViewTests.cs
index 9755fd208..2ceb85789 100644
--- a/Tests/UnitTests/View/Layout/Pos.ViewTests.cs
+++ b/Tests/UnitTests/View/Layout/Pos.ViewTests.cs
@@ -1,6 +1,6 @@
-using UnitTests;
+#nullable enable
+using JetBrains.Annotations;
 using Xunit.Abstractions;
-using static Terminal.Gui.ViewBase.Pos;
 
 namespace UnitTests.LayoutTests;
 
@@ -69,7 +69,7 @@ public class PosViewTests (ITestOutputHelper output)
 
         return;
 
-        void OnApplicationOnIteration (object s, IterationEventArgs a)
+        void OnApplicationOnIteration (object? s, EventArgs<IApplication?> a)
         {
             while (count > 0)
             {
diff --git a/Tests/UnitTests/View/Navigation/CanFocusTests.cs b/Tests/UnitTests/View/Navigation/CanFocusTests.cs
index 09b71ef0d..5ad4611b1 100644
--- a/Tests/UnitTests/View/Navigation/CanFocusTests.cs
+++ b/Tests/UnitTests/View/Navigation/CanFocusTests.cs
@@ -88,7 +88,7 @@ public class CanFocusTests
     [Fact]
     public void CanFocus_Set_True_Get_AdvanceFocus_Works ()
     {
-        IApplication app = Application.Create ();
+        IApplication app = ApplicationImpl.Instance; // Force legacy
         app.TopRunnable = new () { App = app };
 
         Label label = new () { Text = "label" };
diff --git a/Tests/UnitTests/View/Navigation/EnabledTests.cs b/Tests/UnitTests/View/Navigation/EnabledTests.cs
index de86a639e..27e9cc69e 100644
--- a/Tests/UnitTests/View/Navigation/EnabledTests.cs
+++ b/Tests/UnitTests/View/Navigation/EnabledTests.cs
@@ -1,10 +1,9 @@
-using UnitTests;
-
+#nullable enable
 namespace UnitTests.ViewTests;
 
 public class EnabledTests
 {
-  
+
     [Fact]
     [AutoInitShutdown]
     public void _Enabled_Sets_Also_Sets_SubViews ()
@@ -30,7 +29,7 @@ public class EnabledTests
 
         return;
 
-        void OnApplicationOnIteration (object s, IterationEventArgs a)
+        void OnApplicationOnIteration (object? s, EventArgs<IApplication?> a)
         {
             iterations++;
 
diff --git a/Tests/UnitTests/View/SubviewTests.cs b/Tests/UnitTests/View/SubviewTests.cs
index 21c320986..6bee76a5c 100644
--- a/Tests/UnitTests/View/SubviewTests.cs
+++ b/Tests/UnitTests/View/SubviewTests.cs
@@ -83,7 +83,7 @@ public class SubViewTests
 
     //    return;
 
-    //    void OnApplicationOnIteration (object s, IterationEventArgs a)
+    //    void OnApplicationOnIteration (object s, EventArgs<IApplication?> a)
     //    {
     //        var sv1 = new View { Id = "sv1", Width = Dim.Fill (), Height = Dim.Fill () };
 
diff --git a/Tests/UnitTests/View/ViewTests.cs b/Tests/UnitTests/View/ViewTests.cs
index f42715e6e..894fd4355 100644
--- a/Tests/UnitTests/View/ViewTests.cs
+++ b/Tests/UnitTests/View/ViewTests.cs
@@ -509,7 +509,7 @@ public class ViewTests
 
         return;
 
-        void OnApplicationOnIteration (object s, IterationEventArgs a)
+        void OnApplicationOnIteration (object s, EventArgs<IApplication> a)
         {
             iterations++;
 
diff --git a/Tests/UnitTests/Views/GraphViewTests.cs b/Tests/UnitTests/Views/GraphViewTests.cs
index 7bcb42a4e..fbe2ca8ee 100644
--- a/Tests/UnitTests/Views/GraphViewTests.cs
+++ b/Tests/UnitTests/Views/GraphViewTests.cs
@@ -607,7 +607,10 @@ public class MultiBarSeriesTests
     [AutoInitShutdown]
     public void TestRendering_MultibarSeries ()
     {
-        var gv = new GraphView ();
+        var gv = new GraphView ()
+        {
+            App = ApplicationImpl.Instance,
+        };
         //gv.Scheme = new Scheme ();
 
         // y axis goes from 0.1 to 1 across 10 console rows
@@ -851,7 +854,7 @@ public class BarSeriesTests : FakeDriverBase
         // 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.Scheme = new Scheme ();
+        //gv.Scheme = new Scheme ();
         gv.CellSize = new PointF (0.5f, 0.1f);
 
         gv.Series.Add (series = new FakeBarSeries ());
@@ -890,7 +893,7 @@ public class AxisTests
     {
         var gv = new GraphView ();
         gv.Viewport = new Rectangle (0, 0, 50, 30);
-       // gv.Scheme = new Scheme ();
+        // gv.Scheme = new Scheme ();
 
         // graph can't be completely empty or it won't draw
         gv.Series.Add (new ScatterSeries ());
@@ -1549,7 +1552,11 @@ public class PathAnnotationTests
     [AutoInitShutdown]
     public void XAxisLabels_With_MarginLeft ()
     {
-        var gv = new GraphView { Viewport = new Rectangle (0, 0, 10, 7) };
+        var gv = new GraphView
+        {
+            App = ApplicationImpl.Instance,
+            Viewport = new Rectangle (0, 0, 10, 7)
+        };
 
         gv.CellSize = new PointF (1, 0.5f);
         gv.AxisY.Increment = 1;
@@ -1588,7 +1595,11 @@ public class PathAnnotationTests
     [AutoInitShutdown]
     public void YAxisLabels_With_MarginBottom ()
     {
-        var gv = new GraphView { Viewport = new Rectangle (0, 0, 10, 7) };
+        var gv = new GraphView
+        {
+            App = ApplicationImpl.Instance,
+            Viewport = new Rectangle (0, 0, 10, 7)
+        };
 
         gv.CellSize = new PointF (1, 0.5f);
         gv.AxisY.Increment = 1;
diff --git a/Tests/UnitTests/Views/LabelTests.cs b/Tests/UnitTests/Views/LabelTests.cs
index 56b701668..1128520ff 100644
--- a/Tests/UnitTests/Views/LabelTests.cs
+++ b/Tests/UnitTests/Views/LabelTests.cs
@@ -896,7 +896,7 @@ t
 
         return;
 
-        void OnApplicationOnIteration (object s, IterationEventArgs a)
+        void OnApplicationOnIteration (object s, EventArgs<IApplication> a)
         {
             while (count > -1)
             {
@@ -1057,7 +1057,7 @@ t
 
         return;
 
-        void OnApplicationOnIteration (object s, IterationEventArgs a)
+        void OnApplicationOnIteration (object s, EventArgs<IApplication> a)
         {
             while (count < 21)
             {
diff --git a/Tests/UnitTests/Views/ShortcutTests.cs b/Tests/UnitTests/Views/ShortcutTests.cs
index df5dac215..412e41c33 100644
--- a/Tests/UnitTests/Views/ShortcutTests.cs
+++ b/Tests/UnitTests/Views/ShortcutTests.cs
@@ -349,7 +349,7 @@ public class ShortcutTests
     [InlineData (KeyCode.F1, 0)]
     public void KeyDown_App_Scope_Invokes_Accept (KeyCode key, int expectedAccept)
     {
-        Application.TopRunnable = new () { App = Application.Create () };
+        Application.TopRunnable = new () { App = ApplicationImpl.Instance };
 
         var shortcut = new Shortcut
         {
diff --git a/Tests/UnitTests/Views/StatusBarTests.cs b/Tests/UnitTests/Views/StatusBarTests.cs
index c19e99a95..987d79a7a 100644
--- a/Tests/UnitTests/Views/StatusBarTests.cs
+++ b/Tests/UnitTests/Views/StatusBarTests.cs
@@ -1,5 +1,4 @@
-using UnitTests;
-using Xunit.Abstractions;
+#nullable enable
 
 namespace UnitTests.ViewsTests;
 public class StatusBarTests
@@ -21,7 +20,7 @@ public class StatusBarTests
         Assert.Equal ("Close", sb.SubViews.ElementAt (2).Title);
         Assert.Equal ("Quit", sb.SubViews.ToArray () [^1].Title);
 
-        Assert.Equal ("Save", sb.RemoveShortcut (1).Title);
+        Assert.Equal ("Save", sb.RemoveShortcut (1)!.Title);
 
         Assert.Equal ("Open", sb.SubViews.ElementAt (0).Title);
         Assert.Equal ("Close", sb.SubViews.ElementAt (1).Title);
@@ -106,7 +105,7 @@ public class StatusBarTests
 
         return;
 
-        void OnApplicationOnIteration (object s, IterationEventArgs a)
+        void OnApplicationOnIteration (object? s, EventArgs<IApplication?> a)
         {
             if (iteration == 0)
             {
diff --git a/Tests/UnitTests/Views/TableViewTests.cs b/Tests/UnitTests/Views/TableViewTests.cs
index 7e103b591..5d45ae33b 100644
--- a/Tests/UnitTests/Views/TableViewTests.cs
+++ b/Tests/UnitTests/Views/TableViewTests.cs
@@ -59,7 +59,7 @@ public class TableViewTests (ITestOutputHelper output)
     {
         var tv = new TableView
         {
-            Driver = ApplicationImpl.Instance.Driver,
+            App = ApplicationImpl.Instance,
             Width = 20, Height = 4
         };
 
@@ -683,7 +683,7 @@ public class TableViewTests (ITestOutputHelper output)
     {
         var tableView = new TableView ()
         {
-            Driver = ApplicationImpl.Instance.Driver
+            App = ApplicationImpl.Instance
         };
         tableView.BeginInit ();
         tableView.EndInit ();
@@ -765,7 +765,7 @@ public class TableViewTests (ITestOutputHelper output)
     {
         var tableView = new TableView ()
         {
-            Driver = ApplicationImpl.Instance.Driver
+            App = ApplicationImpl.Instance
         };
         tableView.BeginInit ();
         tableView.EndInit ();
@@ -830,7 +830,7 @@ public class TableViewTests (ITestOutputHelper output)
     {
         var tableView = new TableView ()
         {
-            Driver = ApplicationImpl.Instance.Driver
+            App = ApplicationImpl.Instance
         };
 
         tableView.BeginInit ();
@@ -1579,7 +1579,7 @@ public class TableViewTests (ITestOutputHelper output)
     {
         var tv = new TableView ()
         {
-            Driver = ApplicationImpl.Instance.Driver
+            App = ApplicationImpl.Instance
         };
         tv.SchemeName = "TopLevel";
         tv.Viewport = new (0, 0, 50, 7);
@@ -2226,7 +2226,7 @@ public class TableViewTests (ITestOutputHelper output)
         ApplicationImpl.Instance.Driver!.SetScreenSize (100, 100);
         var tv = new TableView ()
         {
-            Driver = ApplicationImpl.Instance.Driver
+            App = ApplicationImpl.Instance
         };
         tv.SchemeName = "TopLevel";
         tv.Viewport = new (0, 0, 50, 6);
@@ -2433,7 +2433,7 @@ A B C
 
         var tv = new TableView ()
         {
-            Driver = ApplicationImpl.Instance.Driver
+            App = ApplicationImpl.Instance
         };
 
         //tv.BeginInit (); tv.EndInit ();
@@ -3441,7 +3441,7 @@ A B C
     {
         var tableView = new TableView ()
         {
-            Driver = ApplicationImpl.Instance.Driver
+            App = ApplicationImpl.Instance
         };
         tableView.BeginInit ();
         tableView.EndInit ();
@@ -3473,7 +3473,7 @@ A B C
     {
         var tv = new TableView ()
         {
-            Driver = ApplicationImpl.Instance.Driver,
+            App = ApplicationImpl.Instance,
             SchemeName = "TopLevel",
             Viewport = new (0, 0, 25, 6)
         };
@@ -3504,7 +3504,7 @@ A B C
     {
         var tableView = new TableView ()
         {
-            Driver = ApplicationImpl.Instance.Driver
+            App = ApplicationImpl.Instance
         };
         tableView.SchemeName = "TopLevel";
 
@@ -3537,7 +3537,7 @@ A B C
     {
         var tv = new TableView ()
         {
-            Driver = ApplicationImpl.Instance.Driver
+            App = ApplicationImpl.Instance
         };
         tv.BeginInit ();
         tv.EndInit ();
diff --git a/Tests/UnitTests/Views/TextFieldTests.cs b/Tests/UnitTests/Views/TextFieldTests.cs
index 66ad798bd..057ec6b02 100644
--- a/Tests/UnitTests/Views/TextFieldTests.cs
+++ b/Tests/UnitTests/Views/TextFieldTests.cs
@@ -521,7 +521,7 @@ public class TextFieldTests (ITestOutputHelper output)
     [SetupFakeApplication]
     public void KeyBindings_Command ()
     {
-        var tf = new TextField { Width = 20, Text = "This is a test." };
+        var tf = new TextField { Width = 20, Text = "This is a test.", App = ApplicationImpl.Instance };
         tf.BeginInit ();
         tf.EndInit ();
 
@@ -1697,7 +1697,8 @@ Les Miśerables",
                 //                1         2         3 
                 //      01234567890123456789012345678901=32 (Length)
                 Text = "TAB to jump between text fields.",
-                Width = 32
+                Width = 32,
+                App = ApplicationImpl.Instance
             };
         }
     }
diff --git a/Tests/UnitTests/Views/TextViewTests.cs b/Tests/UnitTests/Views/TextViewTests.cs
index 10764cf4c..c11227c35 100644
--- a/Tests/UnitTests/Views/TextViewTests.cs
+++ b/Tests/UnitTests/Views/TextViewTests.cs
@@ -71,7 +71,7 @@ public class TextViewTests
 
         return;
 
-        void OnApplicationOnIteration (object s, IterationEventArgs a)
+        void OnApplicationOnIteration (object s, EventArgs<IApplication> a)
         {
             int width = _textView.Viewport.Width - 1;
             Assert.Equal (30, width + 1);
@@ -1050,7 +1050,7 @@ This is the second line.
     public void HistoryText_Undo_Redo_Copy_Without_Selection_Multi_Line_Paste ()
     {
         var text = "This is the first line.\nThis is the second line.\nThis is the third line.";
-        var tv = new TextView { Text = text };
+        var tv = new TextView { App = ApplicationImpl.Instance, Text = text };
 
         tv.CursorPosition = new (23, 0);
 
@@ -1100,7 +1100,11 @@ This is the second line.
     public void HistoryText_Undo_Redo_Cut_Multi_Line_Another_Selected_Paste ()
     {
         var text = "This is the first line.\nThis is the second line.\nThis is the third line.";
-        var tv = new TextView { Text = text };
+        var tv = new TextView
+        {
+            App = ApplicationImpl.Instance,
+            Text = text
+        };
 
         tv.SelectionStartColumn = 12;
         tv.CursorPosition = new (17, 0);
@@ -1172,7 +1176,11 @@ This is the second line.
     public void HistoryText_Undo_Redo_Cut_Multi_Line_Selected_Paste ()
     {
         var text = "This is the first line.\nThis is the second line.\nThis is the third line.";
-        var tv = new TextView { Text = text };
+        var tv = new TextView
+        {
+            App = ApplicationImpl.Instance,
+            Text = text
+        };
 
         tv.SelectionStartColumn = 12;
         tv.CursorPosition = new (17, 0);
@@ -1217,7 +1225,11 @@ This is the second line.
     public void HistoryText_Undo_Redo_Cut_Simple_Paste_Starting ()
     {
         var text = "This is the first line.\nThis is the second line.\nThis is the third line.";
-        var tv = new TextView { Text = text };
+        var tv = new TextView
+        {
+            App = ApplicationImpl.Instance,
+            Text = text
+        };
 
         tv.SelectionStartColumn = 12;
         tv.CursorPosition = new (18, 1);
@@ -1261,7 +1273,11 @@ This is the second line.
     public void HistoryText_Undo_Redo_Empty_Copy_Without_Selection_Multi_Line_Selected_Paste ()
     {
         var text = "\nThis is the first line.\nThis is the second line.";
-        var tv = new TextView { Text = text };
+        var tv = new TextView
+        {
+            App = ApplicationImpl.Instance,
+            Text = text
+        };
 
         Assert.True (tv.NewKeyDownEvent (Key.C.WithCtrl));
 
@@ -1308,7 +1324,11 @@ This is the second line.
     public void HistoryText_Undo_Redo_KillToEndOfLine ()
     {
         var text = "First line.\nSecond line.";
-        var tv = new TextView { Text = text };
+        var tv = new TextView
+        {
+            App = ApplicationImpl.Instance,
+            Text = text
+        };
 
         Assert.True (tv.NewKeyDownEvent (Key.K.WithCtrl));
         Assert.Equal ($"{Environment.NewLine}Second line.", tv.Text);
@@ -1369,7 +1389,11 @@ This is the second line.
     public void HistoryText_Undo_Redo_KillToLeftStart ()
     {
         var text = "First line.\nSecond line.";
-        var tv = new TextView { Text = text };
+        var tv = new TextView
+        {
+            App = ApplicationImpl.Instance,
+            Text = text
+        };
 
         Assert.True (tv.NewKeyDownEvent (Key.End.WithCtrl));
         Assert.Equal ($"First line.{Environment.NewLine}Second line.", tv.Text);
@@ -1910,7 +1934,11 @@ This is the second line.
     public void HistoryText_Undo_Redo_Multi_Line_Selected_Copy_Simple_Paste_Starting_On_Letter ()
     {
         var text = "This is the first line.\nThis is the second line.\nThis is the third line.";
-        var tv = new TextView { Text = text };
+        var tv = new TextView
+        {
+            App = ApplicationImpl.Instance,
+            Text = text
+        };
 
         tv.SelectionStartColumn = 12;
         tv.CursorPosition = new (18, 1);
@@ -1963,7 +1991,11 @@ This is the second line.
     public void HistoryText_Undo_Redo_Multi_Line_Selected_Copy_Simple_Paste_Starting_On_Space ()
     {
         var text = "This is the first line.\nThis is the second line.\nThis is the third line.";
-        var tv = new TextView { Text = text };
+        var tv = new TextView
+        {
+            App = ApplicationImpl.Instance,
+            Text = text
+        };
 
         tv.SelectionStartColumn = 12;
         tv.CursorPosition = new (18, 1);
@@ -2951,7 +2983,11 @@ This is the second line.
     public void HistoryText_Undo_Redo_Setting_Clipboard_Multi_Line_Selected_Paste ()
     {
         var text = "This is the first line.\nThis is the second line.";
-        var tv = new TextView { Text = text };
+        var tv = new TextView
+        {
+            App = ApplicationImpl.Instance,
+            Text = text
+        };
 
         Clipboard.Contents = "Inserted\nNewLine";
 
@@ -2991,7 +3027,11 @@ This is the second line.
     public void HistoryText_Undo_Redo_Simple_Copy_Multi_Line_Selected_Paste ()
     {
         var text = "This is the first line.\nThis is the second line.\nThis is the third line.";
-        var tv = new TextView { Text = text };
+        var tv = new TextView
+        {
+            App = ApplicationImpl.Instance,
+            Text = text
+        };
 
         tv.SelectionStartColumn = 12;
         tv.CursorPosition = new (17, 0);
@@ -4916,7 +4956,7 @@ This is the second line.
 
         return;
 
-        void OnApplicationOnIteration (object s, IterationEventArgs a)
+        void OnApplicationOnIteration (object s, EventArgs<IApplication> a)
         {
             int width = _textView.Viewport.Width - 1;
             Assert.Equal (30, width + 1);
@@ -4964,7 +5004,7 @@ This is the second line.
 
         return;
 
-        void OnApplicationOnIteration (object s, IterationEventArgs a)
+        void OnApplicationOnIteration (object s, EventArgs<IApplication> a)
         {
             int width = _textView.Viewport.Width - 1;
             Assert.Equal (30, width + 1);
@@ -5012,7 +5052,7 @@ This is the second line.
 
         return;
 
-        void OnApplicationOnIteration (object s, IterationEventArgs a)
+        void OnApplicationOnIteration (object s, EventArgs<IApplication> a)
         {
             int width = _textView.Viewport.Width - 1;
             Assert.Equal (30, width + 1);
@@ -5069,7 +5109,7 @@ This is the second line.
 
         return;
 
-        void OnApplicationOnIteration (object s, IterationEventArgs a)
+        void OnApplicationOnIteration (object s, EventArgs<IApplication> a)
         {
             int width = _textView.Viewport.Width - 1;
             Assert.Equal (30, width + 1);
@@ -5128,7 +5168,7 @@ This is the second line.
 
         return;
 
-        void OnApplicationOnIteration (object s, IterationEventArgs a)
+        void OnApplicationOnIteration (object s, EventArgs<IApplication> a)
         {
             int width = _textView.Viewport.Width - 1;
             Assert.Equal (30, width + 1);
@@ -6796,7 +6836,12 @@ Line 2.",
     {
         //          0123456789
         var text = "This is the first line.\nThis is the second line.\n";
-        var tv = new TextView { Width = 11, Height = 9 };
+        var tv = new TextView
+        {
+            Width = 11,
+            Height = 9,
+            App = ApplicationImpl.Instance
+        };
         tv.Text = text;
 
         Assert.Equal (
@@ -7002,7 +7047,11 @@ line.
             //         01234567890123456789012345678901=32 (Length)
             byte [] buff = Encoding.Unicode.GetBytes (Txt);
             byte [] ms = new MemoryStream (buff).ToArray ();
-            _textView = new () { Width = 30, Height = 10, SchemeName = "Base" };
+            _textView = new ()
+            {
+                App = ApplicationImpl.Instance,
+                Width = 30, Height = 10, SchemeName = "Base"
+            };
             _textView.Text = Encoding.Unicode.GetString (ms);
         }
     }
diff --git a/Tests/UnitTests/Views/ToplevelTests.cs b/Tests/UnitTests/Views/ToplevelTests.cs
index 55a426e3d..2de19854d 100644
--- a/Tests/UnitTests/Views/ToplevelTests.cs
+++ b/Tests/UnitTests/Views/ToplevelTests.cs
@@ -128,7 +128,7 @@ public class ToplevelTests
 
         return;
 
-        void OnApplicationOnIteration (object s, IterationEventArgs a)
+        void OnApplicationOnIteration (object s, EventArgs<IApplication> a)
         {
             iterations++;
 
@@ -249,7 +249,7 @@ public class ToplevelTests
 
         return;
 
-        void OnApplicationOnIteration (object s, IterationEventArgs a)
+        void OnApplicationOnIteration (object s, EventArgs<IApplication> a)
         {
             iterations++;
 
diff --git a/Tests/UnitTests/Application/ApplicationImplTests.cs b/Tests/UnitTestsParallelizable/Application/ApplicationImplTests.cs
similarity index 99%
rename from Tests/UnitTests/Application/ApplicationImplTests.cs
rename to Tests/UnitTestsParallelizable/Application/ApplicationImplTests.cs
index c995c02e8..dd59e2eb5 100644
--- a/Tests/UnitTests/Application/ApplicationImplTests.cs
+++ b/Tests/UnitTestsParallelizable/Application/ApplicationImplTests.cs
@@ -2,7 +2,7 @@
 using System.Collections.Concurrent;
 using Moq;
 
-namespace UnitTests.ApplicationTests;
+namespace UnitTests_Parallelizable.ApplicationTests;
 
 public class ApplicationImplTests
 {
@@ -30,6 +30,22 @@ public class ApplicationImplTests
         return new ApplicationImpl (m.Object);
     }
 
+    private void SetupRunInputMockMethodToBlock (Mock<INetInput> netInput)
+    {
+        netInput.Setup (r => r.Run (It.IsAny<CancellationToken> ()))
+                .Callback<CancellationToken> (token =>
+                                              {
+                                                  // Simulate an infinite loop that checks for cancellation
+                                                  while (!token.IsCancellationRequested)
+                                                  {
+                                                      // Perform the action that should repeat in the loop
+                                                      // This could be some mock behavior or just an empty loop depending on the context
+                                                  }
+                                              })
+                .Verifiable (Times.Once);
+    }
+
+
     [Fact]
     public void Init_CreatesKeybindings ()
     {
@@ -46,21 +62,6 @@ public class ApplicationImplTests
         app?.Shutdown ();
     }
 
-    private void SetupRunInputMockMethodToBlock (Mock<INetInput> netInput)
-    {
-        netInput.Setup (r => r.Run (It.IsAny<CancellationToken> ()))
-                .Callback<CancellationToken> (token =>
-                                              {
-                                                  // Simulate an infinite loop that checks for cancellation
-                                                  while (!token.IsCancellationRequested)
-                                                  {
-                                                      // Perform the action that should repeat in the loop
-                                                      // This could be some mock behavior or just an empty loop depending on the context
-                                                  }
-                                              })
-                .Verifiable (Times.Once);
-    }
-
     [Fact]
     public void NoInitThrowOnRun ()
     {
diff --git a/Tests/UnitTestsParallelizable/Application/KeyboardImplThreadSafetyTests.cs b/Tests/UnitTestsParallelizable/Application/KeyboardImplThreadSafetyTests.cs
new file mode 100644
index 000000000..66f77dd84
--- /dev/null
+++ b/Tests/UnitTestsParallelizable/Application/KeyboardImplThreadSafetyTests.cs
@@ -0,0 +1,520 @@
+// ReSharper disable AccessToDisposedClosure
+
+#nullable enable
+namespace UnitTests_Parallelizable.ApplicationTests;
+
+/// <summary>
+///     Tests to verify that KeyboardImpl is thread-safe for concurrent access scenarios.
+/// </summary>
+public class KeyboardImplThreadSafetyTests
+{
+    [Fact]
+    public void AddCommand_ConcurrentAccess_NoExceptions ()
+    {
+        // Arrange
+        var keyboard = new KeyboardImpl ();
+        List<Exception> exceptions = [];
+        const int NUM_THREADS = 10;
+        const int OPERATIONS_PER_THREAD = 50;
+
+        // Act
+        List<Task> tasks = [];
+
+        for (var i = 0; i < NUM_THREADS; i++)
+        {
+            tasks.Add (
+                       Task.Run (() =>
+                                 {
+                                     for (var j = 0; j < OPERATIONS_PER_THREAD; j++)
+                                     {
+                                         try
+                                         {
+                                             // AddKeyBindings internally calls AddCommand multiple times
+                                             keyboard.AddKeyBindings ();
+                                         }
+                                         catch (InvalidOperationException)
+                                         {
+                                             // Expected - AddKeyBindings tries to add keys that already exist
+                                         }
+                                         catch (Exception ex)
+                                         {
+                                             exceptions.Add (ex);
+                                         }
+                                     }
+                                 }));
+        }
+
+#pragma warning disable xUnit1031 // Test methods should not use blocking task operations - intentional for stress testing
+        Task.WaitAll (tasks.ToArray ());
+#pragma warning restore xUnit1031
+
+        // Assert
+        Assert.Empty (exceptions);
+        keyboard.Dispose ();
+    }
+
+    [Fact]
+    public void Dispose_WhileOperationsInProgress_NoExceptions ()
+    {
+        // Arrange
+        IApplication? app = Application.Create ();
+        app.Init ("fake");
+        var keyboard = new KeyboardImpl { App = app };
+        keyboard.AddKeyBindings ();
+        List<Exception> exceptions = [];
+        var continueRunning = true;
+
+        // Act
+        Task operationsTask = Task.Run (() =>
+                                        {
+                                            while (continueRunning)
+                                            {
+                                                try
+                                                {
+                                                    keyboard.InvokeCommandsBoundToKey (Key.Q.WithCtrl);
+                                                    IEnumerable<KeyValuePair<Key, KeyBinding>> bindings = keyboard.KeyBindings.GetBindings ();
+                                                    int count = bindings.Count ();
+                                                }
+                                                catch (ObjectDisposedException)
+                                                {
+                                                    // Expected - keyboard was disposed
+                                                    break;
+                                                }
+                                                catch (Exception ex)
+                                                {
+                                                    exceptions.Add (ex);
+
+                                                    break;
+                                                }
+                                            }
+                                        });
+
+        // Give operations a chance to start
+        Thread.Sleep (10);
+
+        // Dispose while operations are running
+        keyboard.Dispose ();
+        continueRunning = false;
+
+#pragma warning disable xUnit1031 // Test methods should not use blocking task operations - intentional for stress testing
+        operationsTask.Wait (TimeSpan.FromSeconds (2));
+#pragma warning restore xUnit1031
+
+        // Assert
+        Assert.Empty (exceptions);
+        app.Shutdown ();
+    }
+
+    [Fact]
+    public void InvokeCommand_ConcurrentAccess_NoExceptions ()
+    {
+        // Arrange
+        IApplication? app = Application.Create ();
+        app.Init ("fake");
+        var keyboard = new KeyboardImpl { App = app };
+        keyboard.AddKeyBindings ();
+        List<Exception> exceptions = [];
+        const int NUM_THREADS = 10;
+        const int OPERATIONS_PER_THREAD = 50;
+
+        // Act
+        List<Task> tasks = new ();
+
+        for (var i = 0; i < NUM_THREADS; i++)
+        {
+            tasks.Add (
+                       Task.Run (() =>
+                                 {
+                                     for (var j = 0; j < OPERATIONS_PER_THREAD; j++)
+                                     {
+                                         try
+                                         {
+                                             var binding = new KeyBinding ([Command.Quit]);
+                                             keyboard.InvokeCommand (Command.Quit, Key.Q.WithCtrl, binding);
+                                         }
+                                         catch (Exception ex)
+                                         {
+                                             exceptions.Add (ex);
+                                         }
+                                     }
+                                 }));
+        }
+
+#pragma warning disable xUnit1031 // Test methods should not use blocking task operations - intentional for stress testing
+        Task.WaitAll (tasks.ToArray ());
+#pragma warning restore xUnit1031
+
+        // Assert
+        Assert.Empty (exceptions);
+        keyboard.Dispose ();
+        app.Shutdown ();
+    }
+
+    [Fact]
+    public void InvokeCommandsBoundToKey_ConcurrentAccess_NoExceptions ()
+    {
+        // Arrange
+        IApplication? app = Application.Create ();
+        app.Init ("fake");
+        var keyboard = new KeyboardImpl { App = app };
+        keyboard.AddKeyBindings ();
+        List<Exception> exceptions = [];
+        const int NUM_THREADS = 10;
+        const int OPERATIONS_PER_THREAD = 50;
+
+        // Act
+        List<Task> tasks = [];
+
+        for (var i = 0; i < NUM_THREADS; i++)
+        {
+            tasks.Add (
+                       Task.Run (() =>
+                                 {
+                                     for (var j = 0; j < OPERATIONS_PER_THREAD; j++)
+                                     {
+                                         try
+                                         {
+                                             keyboard.InvokeCommandsBoundToKey (Key.Q.WithCtrl);
+                                         }
+                                         catch (Exception ex)
+                                         {
+                                             exceptions.Add (ex);
+                                         }
+                                     }
+                                 }));
+        }
+
+#pragma warning disable xUnit1031 // Test methods should not use blocking task operations - intentional for stress testing
+        Task.WaitAll (tasks.ToArray ());
+#pragma warning restore xUnit1031
+
+        // Assert
+        Assert.Empty (exceptions);
+        keyboard.Dispose ();
+        app.Shutdown ();
+    }
+
+    [Fact]
+    public void KeyBindings_ConcurrentAdd_NoExceptions ()
+    {
+        // Arrange
+        var keyboard = new KeyboardImpl ();
+
+        // Don't call AddKeyBindings here to avoid conflicts
+        List<Exception> exceptions = [];
+        const int NUM_THREADS = 10;
+        const int OPERATIONS_PER_THREAD = 50;
+
+        // Act
+        List<Task> tasks = new ();
+
+        for (var i = 0; i < NUM_THREADS; i++)
+        {
+            int threadId = i;
+
+            tasks.Add (
+                       Task.Run (() =>
+                                 {
+                                     for (var j = 0; j < OPERATIONS_PER_THREAD; j++)
+                                     {
+                                         try
+                                         {
+                                             // Use unique keys per thread to avoid conflicts
+                                             Key key = Key.F1 + threadId * OPERATIONS_PER_THREAD + j;
+                                             keyboard.KeyBindings.Add (key, Command.Refresh);
+                                         }
+                                         catch (InvalidOperationException)
+                                         {
+                                             // Expected - duplicate key
+                                         }
+                                         catch (ArgumentException)
+                                         {
+                                             // Expected - invalid key
+                                         }
+                                         catch (Exception ex)
+                                         {
+                                             exceptions.Add (ex);
+                                         }
+                                     }
+                                 }));
+        }
+
+#pragma warning disable xUnit1031 // Test methods should not use blocking task operations - intentional for stress testing
+        Task.WaitAll (tasks.ToArray ());
+#pragma warning restore xUnit1031
+
+        // Assert
+        Assert.Empty (exceptions);
+        keyboard.Dispose ();
+    }
+
+    [Fact]
+    public void KeyDown_KeyUp_Events_ConcurrentSubscription_NoExceptions ()
+    {
+        // Arrange
+        var keyboard = new KeyboardImpl ();
+        keyboard.AddKeyBindings ();
+        List<Exception> exceptions = [];
+        const int NUM_THREADS = 10;
+        const int OPERATIONS_PER_THREAD = 20;
+        var keyDownCount = 0;
+        var keyUpCount = 0;
+
+        // Act
+        List<Task> tasks = new ();
+
+        // Threads subscribing to events
+        for (var i = 0; i < NUM_THREADS; i++)
+        {
+            tasks.Add (
+                       Task.Run (() =>
+                                 {
+                                     for (var j = 0; j < OPERATIONS_PER_THREAD; j++)
+                                     {
+                                         try
+                                         {
+                                             EventHandler<Key> handler = (s, e) => { Interlocked.Increment (ref keyDownCount); };
+                                             keyboard.KeyDown += handler;
+                                             keyboard.KeyDown -= handler;
+
+                                             EventHandler<Key> upHandler = (s, e) => { Interlocked.Increment (ref keyUpCount); };
+                                             keyboard.KeyUp += upHandler;
+                                             keyboard.KeyUp -= upHandler;
+                                         }
+                                         catch (Exception ex)
+                                         {
+                                             exceptions.Add (ex);
+                                         }
+                                     }
+                                 }));
+        }
+
+#pragma warning disable xUnit1031 // Test methods should not use blocking task operations - intentional for stress testing
+        Task.WaitAll (tasks.ToArray ());
+#pragma warning restore xUnit1031
+
+        // Assert
+        Assert.Empty (exceptions);
+        keyboard.Dispose ();
+    }
+
+    [Fact]
+    public void KeyProperty_Setters_ConcurrentAccess_NoExceptions ()
+    {
+        // Arrange
+        var keyboard = new KeyboardImpl ();
+
+        // Initialize once before concurrent access
+        keyboard.AddKeyBindings ();
+        List<Exception> exceptions = [];
+        const int NUM_THREADS = 10;
+        const int OPERATIONS_PER_THREAD = 20;
+
+        // Act
+        List<Task> tasks = new ();
+
+        for (var i = 0; i < NUM_THREADS; i++)
+        {
+            int threadId = i;
+
+            tasks.Add (
+                       Task.Run (() =>
+                                 {
+                                     for (var j = 0; j < OPERATIONS_PER_THREAD; j++)
+                                     {
+                                         try
+                                         {
+                                             // Cycle through different key combinations
+                                             switch (j % 6)
+                                             {
+                                                 case 0:
+                                                     keyboard.QuitKey = Key.Q.WithCtrl;
+
+                                                     break;
+                                                 case 1:
+                                                     keyboard.ArrangeKey = Key.F6.WithCtrl;
+
+                                                     break;
+                                                 case 2:
+                                                     keyboard.NextTabKey = Key.Tab;
+
+                                                     break;
+                                                 case 3:
+                                                     keyboard.PrevTabKey = Key.Tab.WithShift;
+
+                                                     break;
+                                                 case 4:
+                                                     keyboard.NextTabGroupKey = Key.F6;
+
+                                                     break;
+                                                 case 5:
+                                                     keyboard.PrevTabGroupKey = Key.F6.WithShift;
+
+                                                     break;
+                                             }
+                                         }
+                                         catch (Exception ex)
+                                         {
+                                             exceptions.Add (ex);
+                                         }
+                                     }
+                                 }));
+        }
+
+#pragma warning disable xUnit1031 // Test methods should not use blocking task operations - intentional for stress testing
+        Task.WaitAll (tasks.ToArray ());
+#pragma warning restore xUnit1031
+
+        // Assert
+        Assert.Empty (exceptions);
+        keyboard.Dispose ();
+    }
+
+    [Fact]
+    public void MixedOperations_ConcurrentAccess_NoExceptions ()
+    {
+        // Arrange
+        IApplication? app = Application.Create ();
+        app.Init ("fake");
+        var keyboard = new KeyboardImpl { App = app };
+        keyboard.AddKeyBindings ();
+        List<Exception> exceptions = [];
+        const int OPERATIONS_PER_THREAD = 30;
+
+        // Act
+        List<Task> tasks = new ();
+
+        // Thread 1: Add bindings with unique keys
+        tasks.Add (
+                   Task.Run (() =>
+                             {
+                                 for (var j = 0; j < OPERATIONS_PER_THREAD; j++)
+                                 {
+                                     try
+                                     {
+                                         // Use high key codes to avoid conflicts
+                                         var key = new Key ((KeyCode)((int)KeyCode.F20 + j));
+                                         keyboard.KeyBindings.Add (key, Command.Refresh);
+                                     }
+                                     catch (InvalidOperationException)
+                                     {
+                                         // Expected - duplicate
+                                     }
+                                     catch (ArgumentException)
+                                     {
+                                         // Expected - invalid key
+                                     }
+                                     catch (Exception ex)
+                                     {
+                                         exceptions.Add (ex);
+                                     }
+                                 }
+                             }));
+
+        // Thread 2: Invoke commands
+        tasks.Add (
+                   Task.Run (() =>
+                             {
+                                 for (var j = 0; j < OPERATIONS_PER_THREAD; j++)
+                                 {
+                                     try
+                                     {
+                                         keyboard.InvokeCommandsBoundToKey (Key.Q.WithCtrl);
+                                     }
+                                     catch (Exception ex)
+                                     {
+                                         exceptions.Add (ex);
+                                     }
+                                 }
+                             }));
+
+        // Thread 3: Read bindings
+        tasks.Add (
+                   Task.Run (() =>
+                             {
+                                 for (var j = 0; j < OPERATIONS_PER_THREAD; j++)
+                                 {
+                                     try
+                                     {
+                                         IEnumerable<KeyValuePair<Key, KeyBinding>> bindings = keyboard.KeyBindings.GetBindings ();
+                                         int count = bindings.Count ();
+                                         Assert.True (count >= 0);
+                                     }
+                                     catch (Exception ex)
+                                     {
+                                         exceptions.Add (ex);
+                                     }
+                                 }
+                             }));
+
+        // Thread 4: Change key properties
+        tasks.Add (
+                   Task.Run (() =>
+                             {
+                                 for (var j = 0; j < OPERATIONS_PER_THREAD; j++)
+                                 {
+                                     try
+                                     {
+                                         keyboard.QuitKey = j % 2 == 0 ? Key.Q.WithCtrl : Key.Esc;
+                                     }
+                                     catch (Exception ex)
+                                     {
+                                         exceptions.Add (ex);
+                                     }
+                                 }
+                             }));
+
+#pragma warning disable xUnit1031 // Test methods should not use blocking task operations - intentional for stress testing
+        Task.WaitAll (tasks.ToArray ());
+#pragma warning restore xUnit1031
+
+        // Assert
+        Assert.Empty (exceptions);
+        keyboard.Dispose ();
+        app.Shutdown ();
+    }
+
+    [Fact]
+    public void RaiseKeyDownEvent_ConcurrentAccess_NoExceptions ()
+    {
+        // Arrange
+        IApplication? app = Application.Create ();
+        app.Init ("fake");
+        var keyboard = new KeyboardImpl { App = app };
+        keyboard.AddKeyBindings ();
+        List<Exception> exceptions = [];
+        const int NUM_THREADS = 5;
+        const int OPERATIONS_PER_THREAD = 20;
+
+        // Act
+        List<Task> tasks = new ();
+
+        for (var i = 0; i < NUM_THREADS; i++)
+        {
+            tasks.Add (
+                       Task.Run (() =>
+                                 {
+                                     for (var j = 0; j < OPERATIONS_PER_THREAD; j++)
+                                     {
+                                         try
+                                         {
+                                             keyboard.RaiseKeyDownEvent (Key.A);
+                                         }
+                                         catch (Exception ex)
+                                         {
+                                             exceptions.Add (ex);
+                                         }
+                                     }
+                                 }));
+        }
+
+#pragma warning disable xUnit1031 // Test methods should not use blocking task operations - intentional for stress testing
+        Task.WaitAll (tasks.ToArray ());
+#pragma warning restore xUnit1031
+
+        // Assert
+        Assert.Empty (exceptions);
+        keyboard.Dispose ();
+        app.Shutdown ();
+    }
+}
diff --git a/Tests/UnitTestsParallelizable/Application/Runnable/RunnableEdgeCasesTests.cs b/Tests/UnitTestsParallelizable/Application/Runnable/RunnableEdgeCasesTests.cs
index 67e568984..2c0671c36 100644
--- a/Tests/UnitTestsParallelizable/Application/Runnable/RunnableEdgeCasesTests.cs
+++ b/Tests/UnitTestsParallelizable/Application/Runnable/RunnableEdgeCasesTests.cs
@@ -1,3 +1,4 @@
+#nullable enable
 using Xunit.Abstractions;
 
 namespace UnitTests_Parallelizable.ApplicationTests.RunnableTests;
diff --git a/Tests/UnitTestsParallelizable/Application/Runnable/RunnableIntegrationTests.cs b/Tests/UnitTestsParallelizable/Application/Runnable/RunnableIntegrationTests.cs
index d9ef7b6a5..3aa75af6e 100644
--- a/Tests/UnitTestsParallelizable/Application/Runnable/RunnableIntegrationTests.cs
+++ b/Tests/UnitTestsParallelizable/Application/Runnable/RunnableIntegrationTests.cs
@@ -1,6 +1,7 @@
+#nullable enable
 using Xunit.Abstractions;
 
-namespace UnitTests_Parallelizable.ApplicationTests.RunnableTests;
+namespace UnitTests_Parallelizable.ApplicationTests;
 
 /// <summary>
 ///     Integration tests for IApplication's IRunnable support.
@@ -11,17 +12,6 @@ public class ApplicationRunnableIntegrationTests (ITestOutputHelper output) : ID
     private readonly ITestOutputHelper _output = output;
     private IApplication? _app;
 
-    private IApplication GetApp ()
-    {
-        if (_app is null)
-        {
-            _app = Application.Create ();
-            _app.Init ("fake");
-        }
-
-        return _app;
-    }
-
     public void Dispose ()
     {
         _app?.Shutdown ();
@@ -50,64 +40,42 @@ public class ApplicationRunnableIntegrationTests (ITestOutputHelper output) : ID
     }
 
     [Fact]
-    public void Begin_ThrowsOnNullRunnable ()
+    public void Begin_CanBeCanceled_ByIsRunningChanging ()
     {
         // Arrange
         IApplication app = GetApp ();
-
-        // Act & Assert
-        Assert.Throws<ArgumentNullException> (() => app.Begin ((IRunnable)null!));
-    }
-
-    [Fact]
-    public void Begin_RaisesIsRunningChangingEvent ()
-    {
-        // Arrange
-        IApplication app = GetApp ();
-        Runnable<int> runnable = new ();
-        var isRunningChangingRaised = false;
-        bool? oldValue = null;
-        bool? newValue = null;
-
-        runnable.IsRunningChanging += (s, e) =>
-                                      {
-                                          isRunningChangingRaised = true;
-                                          oldValue = e.CurrentValue;
-                                          newValue = e.NewValue;
-                                      };
+        CancelableRunnable runnable = new () { CancelStart = true };
 
         // Act
         RunnableSessionToken token = app.Begin (runnable);
 
-        // Assert
-        Assert.True (isRunningChangingRaised);
-        Assert.False (oldValue);
-        Assert.True (newValue);
+        // Assert - Should not be added to stack if canceled
+        Assert.False (runnable.IsRunning);
 
-        // Cleanup
-        app.End (token);
+        // Token is still created but runnable not added to stack
+        Assert.NotNull (token);
     }
 
     [Fact]
-    public void Begin_RaisesIsRunningChangedEvent ()
+    public void Begin_RaisesIsModalChangedEvent ()
     {
         // Arrange
         IApplication app = GetApp ();
         Runnable<int> runnable = new ();
-        var isRunningChangedRaised = false;
+        var isModalChangedRaised = false;
         bool? receivedValue = null;
 
-        runnable.IsRunningChanged += (s, e) =>
-                                     {
-                                         isRunningChangedRaised = true;
-                                         receivedValue = e.Value;
-                                     };
+        runnable.IsModalChanged += (s, e) =>
+                                   {
+                                       isModalChangedRaised = true;
+                                       receivedValue = e.Value;
+                                   };
 
         // Act
         RunnableSessionToken token = app.Begin (runnable);
 
         // Assert
-        Assert.True (isRunningChangedRaised);
+        Assert.True (isModalChangedRaised);
         Assert.True (receivedValue);
 
         // Cleanup
@@ -144,25 +112,25 @@ public class ApplicationRunnableIntegrationTests (ITestOutputHelper output) : ID
     }
 
     [Fact]
-    public void Begin_RaisesIsModalChangedEvent ()
+    public void Begin_RaisesIsRunningChangedEvent ()
     {
         // Arrange
         IApplication app = GetApp ();
         Runnable<int> runnable = new ();
-        var isModalChangedRaised = false;
+        var isRunningChangedRaised = false;
         bool? receivedValue = null;
 
-        runnable.IsModalChanged += (s, e) =>
-                                   {
-                                       isModalChangedRaised = true;
-                                       receivedValue = e.Value;
-                                   };
+        runnable.IsRunningChanged += (s, e) =>
+                                     {
+                                         isRunningChangedRaised = true;
+                                         receivedValue = e.Value;
+                                     };
 
         // Act
         RunnableSessionToken token = app.Begin (runnable);
 
         // Assert
-        Assert.True (isModalChangedRaised);
+        Assert.True (isRunningChangedRaised);
         Assert.True (receivedValue);
 
         // Cleanup
@@ -170,17 +138,29 @@ public class ApplicationRunnableIntegrationTests (ITestOutputHelper output) : ID
     }
 
     [Fact]
-    public void Begin_SetsIsRunningToTrue ()
+    public void Begin_RaisesIsRunningChangingEvent ()
     {
         // Arrange
         IApplication app = GetApp ();
         Runnable<int> runnable = new ();
+        var isRunningChangingRaised = false;
+        bool? oldValue = null;
+        bool? newValue = null;
+
+        runnable.IsRunningChanging += (s, e) =>
+                                      {
+                                          isRunningChangingRaised = true;
+                                          oldValue = e.CurrentValue;
+                                          newValue = e.NewValue;
+                                      };
 
         // Act
         RunnableSessionToken token = app.Begin (runnable);
 
         // Assert
-        Assert.True (runnable.IsRunning);
+        Assert.True (isRunningChangingRaised);
+        Assert.False (oldValue);
+        Assert.True (newValue);
 
         // Cleanup
         app.End (token);
@@ -204,29 +184,89 @@ public class ApplicationRunnableIntegrationTests (ITestOutputHelper output) : ID
     }
 
     [Fact]
-    public void End_RemovesRunnableFromStack ()
+    public void Begin_SetsIsRunningToTrue ()
     {
         // Arrange
         IApplication app = GetApp ();
         Runnable<int> runnable = new ();
-        RunnableSessionToken token = app.Begin (runnable);
-        int stackCountBefore = app.RunnableSessionStack?.Count ?? 0;
 
         // Act
-        app.End (token);
+        RunnableSessionToken token = app.Begin (runnable);
 
         // Assert
-        Assert.Equal (stackCountBefore - 1, app.RunnableSessionStack?.Count ?? 0);
+        Assert.True (runnable.IsRunning);
+
+        // Cleanup
+        app.End (token);
     }
 
     [Fact]
-    public void End_ThrowsOnNullToken ()
+    public void Begin_ThrowsOnNullRunnable ()
     {
         // Arrange
         IApplication app = GetApp ();
 
         // Act & Assert
-        Assert.Throws<ArgumentNullException> (() => app.End ((RunnableSessionToken)null!));
+        Assert.Throws<ArgumentNullException> (() => app.Begin ((IRunnable)null!));
+    }
+
+    [Fact]
+    public void End_CanBeCanceled_ByIsRunningChanging ()
+    {
+        // Arrange
+        IApplication app = GetApp ();
+        CancelableRunnable runnable = new () { CancelStop = true };
+        RunnableSessionToken token = app.Begin (runnable);
+        runnable.CancelStop = true; // Enable cancellation
+
+        // Act
+        app.End (token);
+
+        // Assert - Should still be running if canceled
+        Assert.True (runnable.IsRunning);
+
+        // Force end by disabling cancellation
+        runnable.CancelStop = false;
+        app.End (token);
+    }
+
+    [Fact]
+    public void End_ClearsTokenRunnable ()
+    {
+        // Arrange
+        IApplication app = GetApp ();
+        Runnable<int> runnable = new ();
+        RunnableSessionToken token = app.Begin (runnable);
+
+        // Act
+        app.End (token);
+
+        // Assert
+        Assert.Null (token.Runnable);
+    }
+
+    [Fact]
+    public void End_RaisesIsRunningChangedEvent ()
+    {
+        // Arrange
+        IApplication app = GetApp ();
+        Runnable<int> runnable = new ();
+        RunnableSessionToken token = app.Begin (runnable);
+        var isRunningChangedRaised = false;
+        bool? receivedValue = null;
+
+        runnable.IsRunningChanged += (s, e) =>
+                                     {
+                                         isRunningChangedRaised = true;
+                                         receivedValue = e.Value;
+                                     };
+
+        // Act
+        app.End (token);
+
+        // Assert
+        Assert.True (isRunningChangedRaised);
+        Assert.False (receivedValue);
     }
 
     [Fact]
@@ -257,42 +297,19 @@ public class ApplicationRunnableIntegrationTests (ITestOutputHelper output) : ID
     }
 
     [Fact]
-    public void End_RaisesIsRunningChangedEvent ()
+    public void End_RemovesRunnableFromStack ()
     {
         // Arrange
         IApplication app = GetApp ();
         Runnable<int> runnable = new ();
         RunnableSessionToken token = app.Begin (runnable);
-        var isRunningChangedRaised = false;
-        bool? receivedValue = null;
-
-        runnable.IsRunningChanged += (s, e) =>
-                                     {
-                                         isRunningChangedRaised = true;
-                                         receivedValue = e.Value;
-                                     };
+        int stackCountBefore = app.RunnableSessionStack?.Count ?? 0;
 
         // Act
         app.End (token);
 
         // Assert
-        Assert.True (isRunningChangedRaised);
-        Assert.False (receivedValue);
-    }
-
-    [Fact]
-    public void End_SetsIsRunningToFalse ()
-    {
-        // Arrange
-        IApplication app = GetApp ();
-        Runnable<int> runnable = new ();
-        RunnableSessionToken token = app.Begin (runnable);
-
-        // Act
-        app.End (token);
-
-        // Assert
-        Assert.False (runnable.IsRunning);
+        Assert.Equal (stackCountBefore - 1, app.RunnableSessionStack?.Count ?? 0);
     }
 
     [Fact]
@@ -311,7 +328,7 @@ public class ApplicationRunnableIntegrationTests (ITestOutputHelper output) : ID
     }
 
     [Fact]
-    public void End_ClearsTokenRunnable ()
+    public void End_SetsIsRunningToFalse ()
     {
         // Arrange
         IApplication app = GetApp ();
@@ -322,7 +339,34 @@ public class ApplicationRunnableIntegrationTests (ITestOutputHelper output) : ID
         app.End (token);
 
         // Assert
-        Assert.Null (token.Runnable);
+        Assert.False (runnable.IsRunning);
+    }
+
+    [Fact]
+    public void End_ThrowsOnNullToken ()
+    {
+        // Arrange
+        IApplication app = GetApp ();
+
+        // Act & Assert
+        Assert.Throws<ArgumentNullException> (() => app.End ((RunnableSessionToken)null!));
+    }
+
+    [Fact]
+    public void MultipleRunnables_IndependentResults ()
+    {
+        // Arrange
+        IApplication app = GetApp ();
+        Runnable<int> runnable1 = new ();
+        Runnable<string> runnable2 = new ();
+
+        // Act
+        runnable1.Result = 42;
+        runnable2.Result = "test";
+
+        // Assert
+        Assert.Equal (42, runnable1.Result);
+        Assert.Equal ("test", runnable2.Result);
     }
 
     [Fact]
@@ -441,80 +485,15 @@ public class ApplicationRunnableIntegrationTests (ITestOutputHelper output) : ID
         app.Shutdown ();
     }
 
-    [Fact]
-    public void Begin_CanBeCanceled_ByIsRunningChanging ()
+    private IApplication GetApp ()
     {
-        // Arrange
-        IApplication app = GetApp ();
-        CancelableRunnable runnable = new () { CancelStart = true };
-
-        // Act
-        RunnableSessionToken token = app.Begin (runnable);
-
-        // Assert - Should not be added to stack if canceled
-        Assert.False (runnable.IsRunning);
-
-        // Token is still created but runnable not added to stack
-        Assert.NotNull (token);
-    }
-
-    [Fact]
-    public void End_CanBeCanceled_ByIsRunningChanging ()
-    {
-        // Arrange
-        IApplication app = GetApp ();
-        CancelableRunnable runnable = new () { CancelStop = true };
-        RunnableSessionToken token = app.Begin (runnable);
-        runnable.CancelStop = true; // Enable cancellation
-
-        // Act
-        app.End (token);
-
-        // Assert - Should still be running if canceled
-        Assert.True (runnable.IsRunning);
-
-        // Force end by disabling cancellation
-        runnable.CancelStop = false;
-        app.End (token);
-    }
-
-    [Fact]
-    public void MultipleRunnables_IndependentResults ()
-    {
-        // Arrange
-        IApplication app = GetApp ();
-        Runnable<int> runnable1 = new ();
-        Runnable<string> runnable2 = new ();
-
-        // Act
-        runnable1.Result = 42;
-        runnable2.Result = "test";
-
-        // Assert
-        Assert.Equal (42, runnable1.Result);
-        Assert.Equal ("test", runnable2.Result);
-    }
-
-    /// <summary>
-    ///     Test runnable that can be stopped.
-    /// </summary>
-    private class StoppableRunnable : Runnable<int>
-    {
-        public bool WasStopRequested { get; private set; }
-
-        public override void RequestStop ()
+        if (_app is null)
         {
-            WasStopRequested = true;
-            base.RequestStop ();
+            _app = Application.Create ();
+            _app.Init ("fake");
         }
-    }
 
-    /// <summary>
-    ///     Test runnable for generic Run tests.
-    /// </summary>
-    private class TestRunnable : Runnable<int>
-    {
-        public TestRunnable () { Id = "TestRunnable"; }
+        return _app;
     }
 
     /// <summary>
@@ -540,4 +519,26 @@ public class ApplicationRunnableIntegrationTests (ITestOutputHelper output) : ID
             return base.OnIsRunningChanging (oldIsRunning, newIsRunning);
         }
     }
+
+    /// <summary>
+    ///     Test runnable that can be stopped.
+    /// </summary>
+    private class StoppableRunnable : Runnable<int>
+    {
+        public override void RequestStop ()
+        {
+            WasStopRequested = true;
+            base.RequestStop ();
+        }
+
+        public bool WasStopRequested { get; private set; }
+    }
+
+    /// <summary>
+    ///     Test runnable for generic Run tests.
+    /// </summary>
+    private class TestRunnable : Runnable<int>
+    {
+        public TestRunnable () { Id = "TestRunnable"; }
+    }
 }
diff --git a/Tests/UnitTestsParallelizable/Application/Runnable/RunnableLifecycleTests.cs b/Tests/UnitTestsParallelizable/Application/Runnable/RunnableLifecycleTests.cs
index f84bb85d1..04ddaad51 100644
--- a/Tests/UnitTestsParallelizable/Application/Runnable/RunnableLifecycleTests.cs
+++ b/Tests/UnitTestsParallelizable/Application/Runnable/RunnableLifecycleTests.cs
@@ -1,3 +1,4 @@
+#nullable enable
 using Xunit.Abstractions;
 
 namespace UnitTests_Parallelizable.ApplicationTests.RunnableTests;
diff --git a/Tests/UnitTestsParallelizable/Configuration/ConfigurationMangerTests.cs b/Tests/UnitTestsParallelizable/Configuration/ConfigurationMangerTests.cs
deleted file mode 100644
index 4fa15e09e..000000000
--- a/Tests/UnitTestsParallelizable/Configuration/ConfigurationMangerTests.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-#nullable enable
-namespace UnitTests_Parallelizable.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/UnitTestsParallelizable/Configuration/SourcesManagerTests.cs b/Tests/UnitTestsParallelizable/Configuration/SourcesManagerTests.cs
index 174788369..59d34a487 100644
--- a/Tests/UnitTestsParallelizable/Configuration/SourcesManagerTests.cs
+++ b/Tests/UnitTestsParallelizable/Configuration/SourcesManagerTests.cs
@@ -515,47 +515,6 @@ public class SourcesManagerTests
         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/Drivers/ClipRegionTests.cs b/Tests/UnitTestsParallelizable/Drivers/ClipRegionTests.cs
new file mode 100644
index 000000000..1b70a4a83
--- /dev/null
+++ b/Tests/UnitTestsParallelizable/Drivers/ClipRegionTests.cs
@@ -0,0 +1,98 @@
+#nullable enable
+using UnitTests;
+using Xunit.Abstractions;
+
+namespace UnitTests_Parallelizable.DriverTests;
+
+public class ClipRegionTests (ITestOutputHelper output) : FakeDriverBase
+{
+    private readonly ITestOutputHelper _output = output;
+
+    [Fact]
+    public void AddRune_Is_Clipped ()
+    {
+        IDriver? driver = CreateFakeDriver ();
+
+        driver.Move (0, 0);
+        driver.AddRune ('x');
+        Assert.Equal ("x", driver.Contents! [0, 0].Grapheme);
+
+        driver.Move (5, 5);
+        driver.AddRune ('x');
+        Assert.Equal ("x", driver.Contents [5, 5].Grapheme);
+
+        // Clear the contents
+        driver.FillRect (new Rectangle (0, 0, driver.Rows, driver.Cols), ' ');
+        Assert.Equal (" ", driver.Contents [0, 0].Grapheme);
+
+        // Setup the region with a single rectangle, fill screen with 'x'
+        driver.Clip = new (new Rectangle (5, 5, 5, 5));
+        driver.FillRect (new Rectangle (0, 0, driver.Rows, driver.Cols), 'x');
+        Assert.Equal (" ", driver.Contents [0, 0].Grapheme);
+        Assert.Equal (" ", driver.Contents [4, 9].Grapheme);
+        Assert.Equal ("x", driver.Contents [5, 5].Grapheme);
+        Assert.Equal ("x", driver.Contents [9, 9].Grapheme);
+        Assert.Equal (" ", driver.Contents [10, 10].Grapheme);
+    }
+
+    [Fact]
+    public void Clip_Set_To_Empty_AllInvalid ()
+    {
+        IDriver? driver = CreateFakeDriver ();
+
+        // Define a clip rectangle
+        driver.Clip = new (Rectangle.Empty);
+
+        // negative
+        Assert.False (driver.IsValidLocation (null!, 4, 5));
+        Assert.False (driver.IsValidLocation (null!, 5, 4));
+        Assert.False (driver.IsValidLocation (null!, 10, 9));
+        Assert.False (driver.IsValidLocation (null!, 9, 10));
+        Assert.False (driver.IsValidLocation (null!, -1, 0));
+        Assert.False (driver.IsValidLocation (null!, 0, -1));
+        Assert.False (driver.IsValidLocation (null!, -1, -1));
+        Assert.False (driver.IsValidLocation (null!, driver.Cols, driver.Rows - 1));
+        Assert.False (driver.IsValidLocation (null!, driver.Cols, driver.Rows - 1));
+        Assert.False (driver.IsValidLocation (null!, driver.Cols, driver.Rows));
+    }
+
+    [Fact]
+    public void IsValidLocation ()
+    {
+        IDriver? driver = CreateFakeDriver ();
+        driver.Rows = 10;
+        driver.Cols = 10;
+
+        // positive
+        Assert.True (driver.IsValidLocation (null!, 0, 0));
+        Assert.True (driver.IsValidLocation (null!, 1, 1));
+        Assert.True (driver.IsValidLocation (null!, driver.Cols - 1, driver.Rows - 1));
+
+        // negative
+        Assert.False (driver.IsValidLocation (null!, -1, 0));
+        Assert.False (driver.IsValidLocation (null!, 0, -1));
+        Assert.False (driver.IsValidLocation (null!, -1, -1));
+        Assert.False (driver.IsValidLocation (null!, driver.Cols, driver.Rows - 1));
+        Assert.False (driver.IsValidLocation (null!, driver.Cols, driver.Rows - 1));
+        Assert.False (driver.IsValidLocation (null!, driver.Cols, driver.Rows));
+
+        // Define a clip rectangle
+        driver.Clip = new (new Rectangle (5, 5, 5, 5));
+
+        // positive
+        Assert.True (driver.IsValidLocation (null!, 5, 5));
+        Assert.True (driver.IsValidLocation (null!, 9, 9));
+
+        // negative
+        Assert.False (driver.IsValidLocation (null!, 4, 5));
+        Assert.False (driver.IsValidLocation (null!, 5, 4));
+        Assert.False (driver.IsValidLocation (null!, 10, 9));
+        Assert.False (driver.IsValidLocation (null!, 9, 10));
+        Assert.False (driver.IsValidLocation (null!, -1, 0));
+        Assert.False (driver.IsValidLocation (null!, 0, -1));
+        Assert.False (driver.IsValidLocation (null!, -1, -1));
+        Assert.False (driver.IsValidLocation (null!, driver.Cols, driver.Rows - 1));
+        Assert.False (driver.IsValidLocation (null!, driver.Cols, driver.Rows - 1));
+        Assert.False (driver.IsValidLocation (null!, driver.Cols, driver.Rows));
+    }
+}
diff --git a/Tests/UnitTestsParallelizable/Drivers/DriverTests.cs b/Tests/UnitTestsParallelizable/Drivers/DriverTests.cs
index 511c7e12f..254396df8 100644
--- a/Tests/UnitTestsParallelizable/Drivers/DriverTests.cs
+++ b/Tests/UnitTestsParallelizable/Drivers/DriverTests.cs
@@ -1,12 +1,12 @@
-using UnitTests;
+#nullable enable
+using UnitTests;
 using Xunit.Abstractions;
 
 namespace UnitTests_Parallelizable.DriverTests;
 
-public class DriverTests : FakeDriverBase
+public class DriverTests (ITestOutputHelper output) : FakeDriverBase
 {
     [Theory]
-    [InlineData (null, true)]
     [InlineData ("", true)]
     [InlineData ("a", true)]
     [InlineData ("👩‍❤️‍💋‍👨", false)]
@@ -49,4 +49,58 @@ public class DriverTests : FakeDriverBase
 
         driver.End ();
     }
+
+    [Theory]
+    [InlineData ("fake")]
+    [InlineData ("windows")]
+    [InlineData ("dotnet")]
+    [InlineData ("unix")]
+    public void All_Drivers_Init_Shutdown_Cross_Platform (string driverName)
+    {
+        IApplication? app = Application.Create ();
+        app.Init (driverName);
+        app.Shutdown ();
+    }
+
+    [Theory]
+    [InlineData ("fake")]
+    [InlineData ("windows")]
+    [InlineData ("dotnet")]
+    [InlineData ("unix")]
+    public void All_Drivers_Run_Cross_Platform (string driverName)
+    {
+        IApplication? app = Application.Create ();
+        app.Init (driverName);
+        app.StopAfterFirstIteration = true;
+        app.Run ().Dispose ();
+        app.Shutdown ();
+    }
+
+    [Theory]
+    [InlineData ("fake")]
+    [InlineData ("windows")]
+    [InlineData ("dotnet")]
+    [InlineData ("unix")]
+    public void All_Drivers_LayoutAndDraw_Cross_Platform (string driverName)
+    {
+        IApplication? app = Application.Create ();
+        app.Init (driverName);
+        app.StopAfterFirstIteration = true;
+        app.Run<TestTop> ().Dispose ();
+
+        DriverAssert.AssertDriverContentsWithFrameAre (driverName!, output, app.Driver);
+
+        app.Shutdown ();
+    }
+}
+
+public class TestTop : Toplevel
+{
+    /// <inheritdoc/>
+    public override void BeginInit ()
+    {
+        Text = Driver!.GetName ()!;
+        BorderStyle = LineStyle.None;
+        base.BeginInit ();
+    }
 }
diff --git a/Tests/UnitTestsParallelizable/Drivers/ToAnsiTests.cs b/Tests/UnitTestsParallelizable/Drivers/ToAnsiTests.cs
index c8b55d191..c78585e49 100644
--- a/Tests/UnitTestsParallelizable/Drivers/ToAnsiTests.cs
+++ b/Tests/UnitTestsParallelizable/Drivers/ToAnsiTests.cs
@@ -67,7 +67,7 @@ public class ToAnsiTests : FakeDriverBase
         Assert.Contains ("Blue", ansi);
     }
 
-    [Theory]
+    [Theory (Skip = "Uses Application.")]
     [InlineData (false, "\u001b[48;2;")]
     [InlineData (true, "\u001b[41m")]
     public void ToAnsi_With_Background_Colors (bool force16Colors, string expected)
@@ -204,7 +204,7 @@ public class ToAnsiTests : FakeDriverBase
         Assert.Equal (50, ansi.Count (c => c == '\n'));
     }
 
-    [Fact]
+    [Fact (Skip = "Use Application.")]
     public void ToAnsi_RGB_Colors ()
     {
         IDriver driver = CreateFakeDriver (10, 1);
@@ -228,7 +228,7 @@ public class ToAnsiTests : FakeDriverBase
         }
     }
 
-    [Fact]
+    [Fact (Skip = "Use Application.")]
     public void ToAnsi_Force16Colors ()
     {
         IDriver driver = CreateFakeDriver (10, 1);
diff --git a/Tests/UnitTestsParallelizable/Input/EnqueueMouseEventTests.cs b/Tests/UnitTestsParallelizable/Input/EnqueueMouseEventTests.cs
index f50d0fdf2..cfe478d1f 100644
--- a/Tests/UnitTestsParallelizable/Input/EnqueueMouseEventTests.cs
+++ b/Tests/UnitTestsParallelizable/Input/EnqueueMouseEventTests.cs
@@ -32,14 +32,16 @@ public class EnqueueMouseEventTests (ITestOutputHelper output)
 
         // Act - Simulate a complete click: press → release → click
         processor.EnqueueMouseEvent (
-                                     new()
+                                     null,
+                                     new ()
                                      {
                                          Position = new (10, 5),
                                          Flags = MouseFlags.Button1Pressed
                                      });
 
         processor.EnqueueMouseEvent (
-                                     new()
+                                     null,
+                                     new ()
                                      {
                                          Position = new (10, 5),
                                          Flags = MouseFlags.Button1Released
@@ -89,7 +91,8 @@ public class EnqueueMouseEventTests (ITestOutputHelper output)
                                    for (var i = 0; i < eventsPerThread; i++)
                                    {
                                        processor.EnqueueMouseEvent (
-                                                                    new()
+                                                                    null,
+                                                                    new ()
                                                                     {
                                                                         Position = new (threadId, i),
                                                                         Flags = MouseFlags.Button1Clicked
@@ -160,7 +163,7 @@ public class EnqueueMouseEventTests (ITestOutputHelper output)
         };
 
         // Act
-        processor.EnqueueMouseEvent (mouseEvent);
+        processor.EnqueueMouseEvent (null, mouseEvent);
 
         SimulateInputThread (fakeInput, queue);
         processor.ProcessQueue ();
@@ -196,7 +199,7 @@ public class EnqueueMouseEventTests (ITestOutputHelper output)
         // Act
         foreach (MouseEventArgs mouseEvent in events)
         {
-            processor.EnqueueMouseEvent (mouseEvent);
+            processor.EnqueueMouseEvent (null, mouseEvent);
         }
 
         SimulateInputThread (fakeInput, queue);
@@ -216,9 +219,9 @@ public class EnqueueMouseEventTests (ITestOutputHelper output)
         Assert.Contains (receivedEvents, e => e.Flags == MouseFlags.Button1Pressed && e.Position == new Point (10, 5));
         Assert.Contains (receivedEvents, e => e.Flags == MouseFlags.Button1Released && e.Position == new Point (10, 5));
         Assert.Contains (receivedEvents, e => e.Flags == MouseFlags.ReportMousePosition && e.Position == new Point (15, 8));
-        
+
         // There should be two clicked events: one generated, one original
-        var clickedEvents = receivedEvents.Where (e => e.Flags == MouseFlags.Button1Clicked).ToList ();
+        List<MouseEventArgs> clickedEvents = receivedEvents.Where (e => e.Flags == MouseFlags.Button1Clicked).ToList ();
         Assert.Equal (2, clickedEvents.Count);
         Assert.Contains (clickedEvents, e => e.Position == new Point (10, 5)); // Generated from press+release
         Assert.Contains (clickedEvents, e => e.Position == new Point (20, 10)); // Original
@@ -251,7 +254,7 @@ public class EnqueueMouseEventTests (ITestOutputHelper output)
         processor.MouseEvent += (_, e) => receivedEvent = e;
 
         // Act
-        processor.EnqueueMouseEvent (mouseEvent);
+        processor.EnqueueMouseEvent (null, mouseEvent);
         SimulateInputThread (fakeInput, queue);
         processor.ProcessQueue ();
 
@@ -285,7 +288,7 @@ public class EnqueueMouseEventTests (ITestOutputHelper output)
         processor.MouseEvent += (_, e) => receivedEvent = e;
 
         // Act
-        processor.EnqueueMouseEvent (mouseEvent);
+        processor.EnqueueMouseEvent (null, mouseEvent);
         SimulateInputThread (fakeInput, queue);
         processor.ProcessQueue ();
 
@@ -323,7 +326,7 @@ public class EnqueueMouseEventTests (ITestOutputHelper output)
         processor.MouseEvent += (_, e) => receivedEvent = e;
 
         // Act
-        processor.EnqueueMouseEvent (mouseEvent);
+        processor.EnqueueMouseEvent (null, mouseEvent);
         SimulateInputThread (fakeInput, queue);
         processor.ProcessQueue ();
 
@@ -372,7 +375,7 @@ public class EnqueueMouseEventTests (ITestOutputHelper output)
         processor.MouseEvent += (_, e) => receivedEvent = e;
 
         // Act
-        processor.EnqueueMouseEvent (mouseEvent);
+        processor.EnqueueMouseEvent (null, mouseEvent);
         SimulateInputThread (fakeInput, queue);
         processor.ProcessQueue ();
 
@@ -405,7 +408,7 @@ public class EnqueueMouseEventTests (ITestOutputHelper output)
         // Act
         foreach (MouseEventArgs mouseEvent in events)
         {
-            processor.EnqueueMouseEvent (mouseEvent);
+            processor.EnqueueMouseEvent (null, mouseEvent);
         }
 
         SimulateInputThread (fakeInput, queue);
@@ -435,7 +438,8 @@ public class EnqueueMouseEventTests (ITestOutputHelper output)
         Exception? exception = Record.Exception (() =>
                                                  {
                                                      processor.EnqueueMouseEvent (
-                                                                                  new()
+                                                                                  null,
+                                                                                  new ()
                                                                                   {
                                                                                       Position = new (10, 5),
                                                                                       Flags = MouseFlags.Button1Clicked
@@ -462,9 +466,9 @@ public class EnqueueMouseEventTests (ITestOutputHelper output)
         processor.MouseEvent += (_, e) => receivedEvents.Add (e);
 
         // Act - Enqueue multiple events before processing
-        processor.EnqueueMouseEvent (new() { Position = new (1, 1), Flags = MouseFlags.Button1Pressed });
-        processor.EnqueueMouseEvent (new() { Position = new (2, 2), Flags = MouseFlags.ReportMousePosition });
-        processor.EnqueueMouseEvent (new() { Position = new (3, 3), Flags = MouseFlags.Button1Released });
+        processor.EnqueueMouseEvent (null, new () { Position = new (1, 1), Flags = MouseFlags.Button1Pressed });
+        processor.EnqueueMouseEvent (null, new () { Position = new (2, 2), Flags = MouseFlags.ReportMousePosition });
+        processor.EnqueueMouseEvent (null, new () { Position = new (3, 3), Flags = MouseFlags.Button1Released });
 
         SimulateInputThread (fakeInput, queue);
         processor.ProcessQueue ();
@@ -492,7 +496,7 @@ public class EnqueueMouseEventTests (ITestOutputHelper output)
         // Act & Assert - Empty/default mouse event should not throw
         Exception? exception = Record.Exception (() =>
                                                  {
-                                                     processor.EnqueueMouseEvent (new ());
+                                                     processor.EnqueueMouseEvent (null, new ());
                                                      SimulateInputThread (fakeInput, queue);
                                                      processor.ProcessQueue ();
                                                  });
@@ -515,7 +519,8 @@ public class EnqueueMouseEventTests (ITestOutputHelper output)
         Exception? exception = Record.Exception (() =>
                                                  {
                                                      processor.EnqueueMouseEvent (
-                                                                                  new()
+                                                                                  null,
+                                                                                  new ()
                                                                                   {
                                                                                       Position = new (-10, -5),
                                                                                       Flags = MouseFlags.Button1Clicked
diff --git a/Tests/UnitTestsParallelizable/Input/InputBindingsThreadSafetyTests.cs b/Tests/UnitTestsParallelizable/Input/InputBindingsThreadSafetyTests.cs
new file mode 100644
index 000000000..5c22a96ea
--- /dev/null
+++ b/Tests/UnitTestsParallelizable/Input/InputBindingsThreadSafetyTests.cs
@@ -0,0 +1,533 @@
+namespace UnitTests_Parallelizable.InputTests;
+
+/// <summary>
+///     Tests to verify that InputBindings (KeyBindings and MouseBindings) are thread-safe
+///     for concurrent access scenarios.
+/// </summary>
+public class InputBindingsThreadSafetyTests
+{
+    [Fact]
+    public void Add_ConcurrentAccess_NoExceptions ()
+    {
+        // Arrange
+        var bindings = new TestInputBindings ();
+        const int NUM_THREADS = 10;
+        const int ITEMS_PER_THREAD = 100;
+
+        // Act
+        Parallel.For (
+                      0,
+                      NUM_THREADS,
+                      i =>
+                      {
+                          for (var j = 0; j < ITEMS_PER_THREAD; j++)
+                          {
+                              var key = $"key_{i}_{j}";
+
+                              try
+                              {
+                                  bindings.Add (key, Command.Accept);
+                              }
+                              catch (InvalidOperationException)
+                              {
+                                  // Expected if duplicate key - this is OK
+                              }
+                          }
+                      });
+
+        // Assert
+        IEnumerable<KeyValuePair<string, KeyBinding>> allBindings = bindings.GetBindings ();
+        Assert.NotEmpty (allBindings);
+        Assert.True (allBindings.Count () <= NUM_THREADS * ITEMS_PER_THREAD);
+    }
+
+    [Fact]
+    public void Clear_ConcurrentAccess_NoExceptions ()
+    {
+        // Arrange
+        var bindings = new TestInputBindings ();
+        const int NUM_THREADS = 10;
+
+        // Populate initial data
+        for (var i = 0; i < 100; i++)
+        {
+            bindings.Add ($"key_{i}", Command.Accept);
+        }
+
+        // Act - Multiple threads clearing simultaneously
+        Parallel.For (
+                      0,
+                      NUM_THREADS,
+                      i =>
+                      {
+                          try
+                          {
+                              bindings.Clear ();
+                          }
+                          catch (Exception ex)
+                          {
+                              Assert.Fail ($"Clear should not throw: {ex.Message}");
+                          }
+                      });
+
+        // Assert
+        Assert.Empty (bindings.GetBindings ());
+    }
+
+    [Fact]
+    public void GetAllFromCommands_DuringModification_NoExceptions ()
+    {
+        // Arrange
+        var bindings = new TestInputBindings ();
+        var continueRunning = true;
+        List<Exception> exceptions = new ();
+        const int MAX_ADDITIONS = 200; // Limit total additions to prevent infinite loop
+
+        // Populate initial data
+        for (var i = 0; i < 50; i++)
+        {
+            bindings.Add ($"key_{i}", Command.Accept);
+        }
+
+        // Act - Modifier thread
+        Task modifierTask = Task.Run (() =>
+                                      {
+                                          var counter = 50;
+
+                                          while (continueRunning && counter < MAX_ADDITIONS)
+                                          {
+                                              try
+                                              {
+                                                  bindings.Add ($"key_{counter++}", Command.Accept);
+                                                  Thread.Sleep (1); // Small delay to prevent CPU spinning
+                                              }
+                                              catch (InvalidOperationException)
+                                              {
+                                                  // Expected
+                                              }
+                                          }
+                                      });
+
+        // Act - Reader threads
+        List<Task> readerTasks = new ();
+
+        for (var i = 0; i < 5; i++)
+        {
+            readerTasks.Add (
+                             Task.Run (() =>
+                                       {
+                                           for (var j = 0; j < 50; j++)
+                                           {
+                                               try
+                                               {
+                                                   IEnumerable<string> results = bindings.GetAllFromCommands (Command.Accept);
+                                                   int count = results.Count ();
+                                                   Assert.True (count >= 0);
+                                               }
+                                               catch (Exception ex)
+                                               {
+                                                   exceptions.Add (ex);
+                                               }
+
+                                               Thread.Sleep (1); // Small delay between iterations
+                                           }
+                                       }));
+        }
+
+#pragma warning disable xUnit1031 // Test methods should not use blocking task operations - intentional for stress testing
+        Task.WaitAll (readerTasks.ToArray ());
+        continueRunning = false;
+        modifierTask.Wait (TimeSpan.FromSeconds (5)); // Add timeout to prevent indefinite hang
+#pragma warning restore xUnit1031
+
+        // Assert
+        Assert.Empty (exceptions);
+    }
+
+    [Fact]
+    public void GetBindings_DuringConcurrentModification_NoExceptions ()
+    {
+        // Arrange
+        var bindings = new TestInputBindings ();
+        var continueRunning = true;
+        List<Exception> exceptions = new ();
+        const int MAX_MODIFICATIONS = 200; // Limit total modifications
+
+        // Populate some initial data
+        for (var i = 0; i < 50; i++)
+        {
+            bindings.Add ($"initial_{i}", Command.Accept);
+        }
+
+        // Act - Start modifier thread
+        Task modifierTask = Task.Run (() =>
+                                      {
+                                          var counter = 0;
+
+                                          while (continueRunning && counter < MAX_MODIFICATIONS)
+                                          {
+                                              try
+                                              {
+                                                  bindings.Add ($"key_{counter++}", Command.Cancel);
+                                              }
+                                              catch (InvalidOperationException)
+                                              {
+                                                  // Expected - duplicate key
+                                              }
+                                              catch (Exception ex)
+                                              {
+                                                  exceptions.Add (ex);
+                                              }
+
+                                              if (counter % 10 == 0)
+                                              {
+                                                  bindings.Clear (Command.Accept);
+                                              }
+
+                                              Thread.Sleep (1); // Small delay to prevent CPU spinning
+                                          }
+                                      });
+
+        // Act - Start reader threads
+        List<Task> readerTasks = new ();
+
+        for (var i = 0; i < 5; i++)
+        {
+            readerTasks.Add (
+                             Task.Run (() =>
+                                       {
+                                           for (var j = 0; j < 100; j++)
+                                           {
+                                               try
+                                               {
+                                                   // This should never throw "Collection was modified" exception
+                                                   IEnumerable<KeyValuePair<string, KeyBinding>> snapshot = bindings.GetBindings ();
+                                                   int count = snapshot.Count ();
+                                                   Assert.True (count >= 0);
+                                               }
+                                               catch (InvalidOperationException ex) when (ex.Message.Contains ("Collection was modified"))
+                                               {
+                                                   exceptions.Add (ex);
+                                               }
+                                               catch (Exception ex)
+                                               {
+                                                   exceptions.Add (ex);
+                                               }
+
+                                               Thread.Sleep (1); // Small delay between iterations
+                                           }
+                                       }));
+        }
+
+        // Wait for readers to complete
+#pragma warning disable xUnit1031 // Test methods should not use blocking task operations - intentional for stress testing
+        Task.WaitAll (readerTasks.ToArray ());
+        continueRunning = false;
+        modifierTask.Wait (TimeSpan.FromSeconds (5)); // Add timeout to prevent indefinite hang
+#pragma warning restore xUnit1031
+
+        // Assert
+        Assert.Empty (exceptions);
+    }
+
+    [Fact]
+    public void KeyBindings_ConcurrentAccess_NoExceptions ()
+    {
+        // Arrange
+        var view = new View ();
+        KeyBindings keyBindings = view.KeyBindings;
+        List<Exception> exceptions = new ();
+        const int NUM_THREADS = 10;
+        const int OPERATIONS_PER_THREAD = 50;
+
+        // Act
+        List<Task> tasks = new ();
+
+        for (var i = 0; i < NUM_THREADS; i++)
+        {
+            int threadId = i;
+
+            tasks.Add (
+                       Task.Run (() =>
+                                 {
+                                     for (var j = 0; j < OPERATIONS_PER_THREAD; j++)
+                                     {
+                                         try
+                                         {
+                                             Key key = Key.A.WithShift.WithCtrl + threadId + j;
+                                             keyBindings.Add (key, Command.Accept);
+                                         }
+                                         catch (InvalidOperationException)
+                                         {
+                                             // Expected - duplicate or invalid key
+                                         }
+                                         catch (ArgumentException)
+                                         {
+                                             // Expected - invalid key
+                                         }
+                                         catch (Exception ex)
+                                         {
+                                             exceptions.Add (ex);
+                                         }
+                                     }
+                                 }));
+        }
+
+#pragma warning disable xUnit1031 // Test methods should not use blocking task operations - intentional for stress testing
+        Task.WaitAll (tasks.ToArray ());
+#pragma warning restore xUnit1031
+
+        // Assert
+        Assert.Empty (exceptions);
+        IEnumerable<KeyValuePair<Key, KeyBinding>> bindings = keyBindings.GetBindings ();
+        Assert.NotEmpty (bindings);
+
+        view.Dispose ();
+    }
+
+    [Fact]
+    public void MixedOperations_ConcurrentAccess_NoExceptions ()
+    {
+        // Arrange
+        var bindings = new TestInputBindings ();
+        List<Exception> exceptions = new ();
+        const int OPERATIONS_PER_THREAD = 100;
+
+        // Act - Multiple threads doing various operations
+        List<Task> tasks = new ();
+
+        // Adder threads
+        for (var i = 0; i < 3; i++)
+        {
+            int threadId = i;
+
+            tasks.Add (
+                       Task.Run (() =>
+                                 {
+                                     for (var j = 0; j < OPERATIONS_PER_THREAD; j++)
+                                     {
+                                         try
+                                         {
+                                             bindings.Add ($"add_{threadId}_{j}", Command.Accept);
+                                         }
+                                         catch (InvalidOperationException)
+                                         {
+                                             // Expected - duplicate
+                                         }
+                                         catch (Exception ex)
+                                         {
+                                             exceptions.Add (ex);
+                                         }
+                                     }
+                                 }));
+        }
+
+        // Reader threads
+        for (var i = 0; i < 3; i++)
+        {
+            tasks.Add (
+                       Task.Run (() =>
+                                 {
+                                     for (var j = 0; j < OPERATIONS_PER_THREAD; j++)
+                                     {
+                                         try
+                                         {
+                                             IEnumerable<KeyValuePair<string, KeyBinding>> snapshot = bindings.GetBindings ();
+                                             int count = snapshot.Count ();
+                                             Assert.True (count >= 0);
+                                         }
+                                         catch (Exception ex)
+                                         {
+                                             exceptions.Add (ex);
+                                         }
+                                     }
+                                 }));
+        }
+
+        // Remover threads
+        for (var i = 0; i < 2; i++)
+        {
+            int threadId = i;
+
+            tasks.Add (
+                       Task.Run (() =>
+                                 {
+                                     for (var j = 0; j < OPERATIONS_PER_THREAD; j++)
+                                     {
+                                         try
+                                         {
+                                             bindings.Remove ($"add_{threadId}_{j}");
+                                         }
+                                         catch (Exception ex)
+                                         {
+                                             exceptions.Add (ex);
+                                         }
+                                     }
+                                 }));
+        }
+
+#pragma warning disable xUnit1031 // Test methods should not use blocking task operations - intentional for stress testing
+        Task.WaitAll (tasks.ToArray ());
+#pragma warning restore xUnit1031
+
+        // Assert
+        Assert.Empty (exceptions);
+    }
+
+    [Fact]
+    public void MouseBindings_ConcurrentAccess_NoExceptions ()
+    {
+        // Arrange
+        var view = new View ();
+        MouseBindings mouseBindings = view.MouseBindings;
+        List<Exception> exceptions = new ();
+        const int NUM_THREADS = 10;
+        const int OPERATIONS_PER_THREAD = 50;
+
+        // Act
+        List<Task> tasks = new ();
+
+        for (var i = 0; i < NUM_THREADS; i++)
+        {
+            int threadId = i;
+
+            tasks.Add (
+                       Task.Run (() =>
+                                 {
+                                     for (var j = 0; j < OPERATIONS_PER_THREAD; j++)
+                                     {
+                                         try
+                                         {
+                                             MouseFlags flags = MouseFlags.Button1Clicked | (MouseFlags)(threadId * 1000 + j);
+                                             mouseBindings.Add (flags, Command.Accept);
+                                         }
+                                         catch (InvalidOperationException)
+                                         {
+                                             // Expected - duplicate or invalid flags
+                                         }
+                                         catch (ArgumentException)
+                                         {
+                                             // Expected - invalid mouse flags
+                                         }
+                                         catch (Exception ex)
+                                         {
+                                             exceptions.Add (ex);
+                                         }
+                                     }
+                                 }));
+        }
+
+#pragma warning disable xUnit1031 // Test methods should not use blocking task operations - intentional for stress testing
+        Task.WaitAll (tasks.ToArray ());
+#pragma warning restore xUnit1031
+
+        // Assert
+        Assert.Empty (exceptions);
+
+        view.Dispose ();
+    }
+
+    [Fact]
+    public void Remove_ConcurrentAccess_NoExceptions ()
+    {
+        // Arrange
+        var bindings = new TestInputBindings ();
+        const int NUM_ITEMS = 100;
+
+        // Populate data
+        for (var i = 0; i < NUM_ITEMS; i++)
+        {
+            bindings.Add ($"key_{i}", Command.Accept);
+        }
+
+        // Act - Multiple threads removing items
+        Parallel.For (
+                      0,
+                      NUM_ITEMS,
+                      i =>
+                      {
+                          try
+                          {
+                              bindings.Remove ($"key_{i}");
+                          }
+                          catch (Exception ex)
+                          {
+                              Assert.Fail ($"Remove should not throw: {ex.Message}");
+                          }
+                      });
+
+        // Assert
+        Assert.Empty (bindings.GetBindings ());
+    }
+
+    [Fact]
+    public void Replace_ConcurrentAccess_NoExceptions ()
+    {
+        // Arrange
+        var bindings = new TestInputBindings ();
+        const string OLD_KEY = "old_key";
+        const string NEW_KEY = "new_key";
+
+        bindings.Add (OLD_KEY, Command.Accept);
+
+        // Act - Multiple threads trying to replace
+        List<Exception> exceptions = new ();
+
+        Parallel.For (
+                      0,
+                      10,
+                      i =>
+                      {
+                          try
+                          {
+                              bindings.Replace (OLD_KEY, $"{NEW_KEY}_{i}");
+                          }
+                          catch (InvalidOperationException)
+                          {
+                              // Expected - key might already be replaced
+                          }
+                          catch (Exception ex)
+                          {
+                              exceptions.Add (ex);
+                          }
+                      });
+
+        // Assert
+        Assert.Empty (exceptions);
+    }
+
+    [Fact]
+    public void TryGet_ConcurrentAccess_ReturnsConsistentResults ()
+    {
+        // Arrange
+        var bindings = new TestInputBindings ();
+        const string TEST_KEY = "test_key";
+
+        bindings.Add (TEST_KEY, Command.Accept);
+
+        // Act
+        var results = new bool [100];
+
+        Parallel.For (
+                      0,
+                      100,
+                      i => { results [i] = bindings.TryGet (TEST_KEY, out _); });
+
+        // Assert - All threads should consistently find the binding
+        Assert.All (results, result => Assert.True (result));
+    }
+
+    /// <summary>
+    ///     Test implementation of InputBindings for testing purposes.
+    /// </summary>
+    private class TestInputBindings () : InputBindings<string, KeyBinding> (
+                                                                            (commands, evt) => new ()
+                                                                            {
+                                                                                Commands = commands,
+                                                                                Key = Key.Empty
+                                                                            },
+                                                                            StringComparer.OrdinalIgnoreCase)
+    {
+        public override bool IsValid (string eventArgs) { return !string.IsNullOrEmpty (eventArgs); }
+    }
+}
diff --git a/Tests/UnitTestsParallelizable/Input/Keyboard/KeyBindingsTests.cs b/Tests/UnitTestsParallelizable/Input/Keyboard/KeyBindingsTests.cs
index 43c888bfa..4aaeecfc8 100644
--- a/Tests/UnitTestsParallelizable/Input/Keyboard/KeyBindingsTests.cs
+++ b/Tests/UnitTestsParallelizable/Input/Keyboard/KeyBindingsTests.cs
@@ -1,8 +1,6 @@
-using Xunit.Abstractions;
+namespace UnitTests_Parallelizable.InputTests;
 
-namespace UnitTests_Parallelizable.InputTests;
-
-public class KeyBindingsTests ()
+public class KeyBindingsTests
 {
     [Fact]
     public void Add_Adds ()
@@ -28,7 +26,7 @@ public class KeyBindingsTests ()
     [Fact]
     public void Add_Invalid_Key_Throws ()
     {
-        var keyBindings = new KeyBindings (new View ());
+        var keyBindings = new KeyBindings (new ());
         List<Command> commands = new ();
         Assert.Throws<ArgumentException> (() => keyBindings.Add (Key.Empty, Command.Accept));
     }
@@ -71,40 +69,39 @@ public class KeyBindingsTests ()
         Assert.Contains (Command.HotKey, resultCommands);
     }
 
-
     // Add should not allow duplicates
     [Fact]
     public void Add_Throws_If_Exists ()
     {
-        var keyBindings = new KeyBindings (new View ());
+        var keyBindings = new KeyBindings (new ());
         keyBindings.Add (Key.A, Command.HotKey);
         Assert.Throws<InvalidOperationException> (() => keyBindings.Add (Key.A, Command.Accept));
 
         Command [] resultCommands = keyBindings.GetCommands (Key.A);
         Assert.Contains (Command.HotKey, resultCommands);
 
-        keyBindings = new (new View ());
+        keyBindings = new (new ());
         keyBindings.Add (Key.A, Command.HotKey);
         Assert.Throws<InvalidOperationException> (() => keyBindings.Add (Key.A, Command.Accept));
 
         resultCommands = keyBindings.GetCommands (Key.A);
         Assert.Contains (Command.HotKey, resultCommands);
 
-        keyBindings = new (new View ());
+        keyBindings = new (new ());
         keyBindings.Add (Key.A, Command.HotKey);
         Assert.Throws<InvalidOperationException> (() => keyBindings.Add (Key.A, Command.Accept));
 
         resultCommands = keyBindings.GetCommands (Key.A);
         Assert.Contains (Command.HotKey, resultCommands);
 
-        keyBindings = new (new View ());
+        keyBindings = new (new ());
         keyBindings.Add (Key.A, Command.Accept);
         Assert.Throws<InvalidOperationException> (() => keyBindings.Add (Key.A, Command.ScrollDown));
 
         resultCommands = keyBindings.GetCommands (Key.A);
         Assert.Contains (Command.Accept, resultCommands);
 
-        keyBindings = new (new View ());
+        keyBindings = new (new ());
         keyBindings.Add (Key.A, new KeyBinding ([Command.HotKey]));
         Assert.Throws<InvalidOperationException> (() => keyBindings.Add (Key.A, new KeyBinding (new [] { Command.Accept })));
 
@@ -142,6 +139,23 @@ public class KeyBindingsTests ()
         Assert.Throws<InvalidOperationException> (() => keyBindings.Get (Key.B));
     }
 
+    [Fact]
+    public void Get_Gets ()
+    {
+        var keyBindings = new KeyBindings (new ());
+        Command [] commands = [Command.Right, Command.Left];
+
+        var key = new Key (Key.A);
+        keyBindings.Add (key, commands);
+        KeyBinding binding = keyBindings.Get (key);
+        Assert.Contains (Command.Right, binding.Commands);
+        Assert.Contains (Command.Left, binding.Commands);
+
+        binding = keyBindings.Get (key);
+        Assert.Contains (Command.Right, binding.Commands);
+        Assert.Contains (Command.Left, binding.Commands);
+    }
+
     // GetCommands
     [Fact]
     public void GetCommands_Unknown_ReturnsEmpty ()
@@ -230,6 +244,27 @@ public class KeyBindingsTests ()
         Assert.Equal (Key.A, resultKey);
     }
 
+    [Fact]
+    public void ReplaceCommands_Replaces ()
+    {
+        var keyBindings = new KeyBindings (new ());
+        keyBindings.Add (Key.A, Command.Accept);
+
+        keyBindings.ReplaceCommands (Key.A, Command.Refresh);
+
+        bool result = keyBindings.TryGet (Key.A, out KeyBinding bindings);
+        Assert.True (result);
+        Assert.Contains (Command.Refresh, bindings.Commands);
+    }
+
+    [Fact]
+    public void ReplaceKey_Adds_If_DoesNotContain_Old ()
+    {
+        var keyBindings = new KeyBindings (new ());
+        keyBindings.Replace (Key.A, Key.B);
+        Assert.True (keyBindings.TryGet (Key.B, out _));
+    }
+
     [Fact]
     public void ReplaceKey_Replaces ()
     {
@@ -268,14 +303,6 @@ public class KeyBindingsTests ()
         Assert.Contains (Command.Accept, keyBindings.GetCommands (Key.C));
     }
 
-    [Fact]
-    public void ReplaceKey_Adds_If_DoesNotContain_Old ()
-    {
-        var keyBindings = new KeyBindings (new ());
-        keyBindings.Replace (Key.A, Key.B);
-        Assert.True (keyBindings.TryGet (Key.B, out _));
-    }
-
     [Fact]
     public void ReplaceKey_Throws_If_New_Is_Empty ()
     {
@@ -284,23 +311,6 @@ public class KeyBindingsTests ()
         Assert.Throws<ArgumentException> (() => keyBindings.Replace (Key.A, Key.Empty));
     }
 
-    [Fact]
-    public void Get_Gets ()
-    {
-        var keyBindings = new KeyBindings (new ());
-        Command [] commands = [Command.Right, Command.Left];
-
-        var key = new Key (Key.A);
-        keyBindings.Add (key, commands);
-        KeyBinding binding = keyBindings.Get (key);
-        Assert.Contains (Command.Right, binding.Commands);
-        Assert.Contains (Command.Left, binding.Commands);
-
-        binding = keyBindings.Get (key);
-        Assert.Contains (Command.Right, binding.Commands);
-        Assert.Contains (Command.Left, binding.Commands);
-    }
-
     // TryGet
     [Fact]
     public void TryGet_Succeeds ()
@@ -309,7 +319,8 @@ public class KeyBindingsTests ()
         keyBindings.Add (Key.Q.WithCtrl, Command.HotKey);
         var key = new Key (Key.Q.WithCtrl);
         bool result = keyBindings.TryGet (key, out KeyBinding _);
-        Assert.True (result); ;
+        Assert.True (result);
+        ;
     }
 
     [Fact]
@@ -329,18 +340,4 @@ public class KeyBindingsTests ()
         Assert.True (result);
         Assert.Contains (Command.HotKey, bindings.Commands);
     }
-
-    [Fact]
-    public void ReplaceCommands_Replaces ()
-    {
-        var keyBindings = new KeyBindings (new ());
-        keyBindings.Add (Key.A, Command.Accept);
-
-        keyBindings.ReplaceCommands (Key.A, Command.Refresh);
-
-        bool result = keyBindings.TryGet (Key.A, out KeyBinding bindings);
-        Assert.True (result);
-        Assert.Contains (Command.Refresh, bindings.Commands);
-
-    }
 }
diff --git a/Tests/UnitTestsParallelizable/README.md b/Tests/UnitTestsParallelizable/README.md
index b4a85152a..2de5c1be7 100644
--- a/Tests/UnitTestsParallelizable/README.md
+++ b/Tests/UnitTestsParallelizable/README.md
@@ -14,16 +14,13 @@ This project contains unit tests that can run in parallel without interference.
 - ✅ Use `View.BeginInit()` / `View.EndInit()` for initialization
 
 ### Tests CANNOT be parallelized if they:
-- ❌ Use `[AutoInitShutdown]` - requires `Application.Init/Shutdown` which creates global state
+- ❌ Use `[AutoInitShutdown]` or `[SetupFakeApplication]`- requires `Application.Init/Shutdown` which creates global state
 - ❌ Set `Application.Driver` (global singleton)
 - ❌ Call `Application.Init()`, `Application.Run/Run<T>()`, or `Application.Begin()`
-- ❌ Modify `ConfigurationManager` global state (Enable/Load/Apply/Disable)
+- ❌ Enable `ConfigurationManager` (Enable/Load/Apply/Disable)
 - ❌ Access `ConfigurationManager` including `ThemeManager` and `SchemeManager` - these rely on global state
-- ❌ Access `SchemeManager.GetSchemes()` or dictionary lookups like `schemes["Base"]` - requires module initialization
-- ❌ Access `View.Schemes` - there can be weird interactions with xunit and dotnet module initialization such that tests run before module initialization sets up the Schemes array
 - ❌ Modify static properties like `Key.Separator`, `CultureInfo.CurrentCulture`, etc.
 - ❌ Set static members on View subclasses (e.g., configuration properties like `Dialog.DefaultButtonAlignment`) or any static fields/properties - these are shared across all parallel tests
-- ❌ Use `Application.Top`, `Application.Driver`, `Application.MainLoop`, or `Application.Navigation`
 - ❌ Are true integration tests that test multiple components working together
 
 ### Important Notes
@@ -35,7 +32,7 @@ This project contains unit tests that can run in parallel without interference.
 ## How to Migrate Tests
 
 1. **Identify** tests in `UnitTests` that don't actually need Application statics
-2. **Rewrite** tests to remove `[AutoInitShutdown]`, `Application.Begin()`, etc. if not needed
+2. **Rewrite** tests to remove `[AutoInitShutdown]` or `[SetupFakeApplication]`, `Application.Begin()`, etc. if not needed
 3. **Move** the test to the equivalent file in `UnitTests.Parallelizable`
 4. **Delete** the old test from `UnitTests` to avoid duplicates
 5. **Verify** no duplicate test names exist (CI will check this)
@@ -62,11 +59,11 @@ public void Constructor_Sets_Defaults ()
 }
 ```
 
-### Remove Unnecessary [SetupFakeDriver]
+### Remove Unnecessary [SetupFakeApplication]
 ```csharp
 // Before (in UnitTests)
 [Fact]
-[SetupFakeDriver]
+[SetupFakeApplication]
 public void Event_Fires_When_Property_Changes ()
 {
     var view = new Button ();
@@ -127,5 +124,5 @@ dotnet test Tests/UnitTestsParallelizable/UnitTests.Parallelizable.csproj
 ```
 
 ## See Also
-- [Category A Migration Summary](../CATEGORY_A_MIGRATION_SUMMARY.md) - Detailed analysis and migration guidelines
+
 - [.NET Unit Testing Best Practices](https://learn.microsoft.com/en-us/dotnet/core/testing/unit-testing-best-practices)
diff --git a/Tests/UnitTests/TestDateAttribute.cs b/Tests/UnitTestsParallelizable/TestDateAttribute.cs
similarity index 95%
rename from Tests/UnitTests/TestDateAttribute.cs
rename to Tests/UnitTestsParallelizable/TestDateAttribute.cs
index 5ad857a2f..a1333389d 100644
--- a/Tests/UnitTests/TestDateAttribute.cs
+++ b/Tests/UnitTestsParallelizable/TestDateAttribute.cs
@@ -2,7 +2,7 @@
 using System.Reflection;
 using Xunit.Sdk;
 
-namespace UnitTests;
+namespace UnitTests_Parallelizable;
 
 [AttributeUsage (AttributeTargets.Class | AttributeTargets.Method)]
 public class TestDateAttribute : BeforeAfterTestAttribute
diff --git a/Tests/UnitTestsParallelizable/TestSetup.cs b/Tests/UnitTestsParallelizable/TestSetup.cs
index 47fdeeb25..a1f79c587 100644
--- a/Tests/UnitTestsParallelizable/TestSetup.cs
+++ b/Tests/UnitTestsParallelizable/TestSetup.cs
@@ -24,7 +24,7 @@ public class GlobalTestSetup : IDisposable
         // Reset application state just in case a test changed something.
         // TODO: Add an Assert to ensure none of the state of Application changed.
         // TODO: Add an Assert to ensure none of the state of ConfigurationManager changed.
-        Application.ResetState (true);
+        //Application.ResetState (true);
         CheckDefaultState ();
     }
 
@@ -39,15 +39,15 @@ public class GlobalTestSetup : IDisposable
         // Check that all Application fields and properties are set to their default values
 
         // Public Properties
-        Assert.Null (Application.TopRunnable);
-        Assert.Null (Application.Mouse.MouseGrabView);
+        //Assert.Null (Application.TopRunnable);
+        //Assert.Null (Application.Mouse.MouseGrabView);
 
-        // Don't check Application.ForceDriver
-        Assert.Empty (Application.ForceDriver);
-        // Don't check Application.Force16Colors
-        //Assert.False (Application.Force16Colors);
-        Assert.Null (Application.Driver);
-        Assert.False (Application.StopAfterFirstIteration);
+        //// Don't check Application.ForceDriver
+        //Assert.Empty (Application.ForceDriver);
+        //// Don't check Application.Force16Colors
+        ////Assert.False (Application.Force16Colors);
+        //Assert.Null (Application.Driver);
+        //Assert.False (Application.StopAfterFirstIteration);
         Assert.Equal (Key.Tab.WithShift, Application.PrevTabKey);
         Assert.Equal (Key.Tab, Application.NextTabKey);
         Assert.Equal (Key.F6.WithShift, Application.PrevTabGroupKey);
@@ -55,12 +55,12 @@ public class GlobalTestSetup : IDisposable
         Assert.Equal (Key.Esc, Application.QuitKey);
 
         // Internal properties
-        Assert.False (Application.Initialized);
-        Assert.Equal (Application.GetSupportedCultures (), Application.SupportedCultures);
-        Assert.Equal (Application.GetAvailableCulturesFromEmbeddedResources (), Application.SupportedCultures);
-        Assert.Null (Application.MainThreadId);
-        Assert.Empty (Application.SessionStack);
-        Assert.Empty (Application.CachedViewsUnderMouse);
+        //Assert.False (Application.Initialized);
+        //Assert.Equal (Application.GetSupportedCultures (), Application.SupportedCultures);
+        //Assert.Equal (Application.GetAvailableCulturesFromEmbeddedResources (), Application.SupportedCultures);
+        //Assert.Null (Application.MainThreadId);
+        //Assert.Empty (Application.SessionStack);
+        //Assert.Empty (Application.CachedViewsUnderMouse);
 
         // Mouse
         // Do not reset _lastMousePosition
diff --git a/Tests/UnitTestsParallelizable/Text/CollectionNavigatorTests.cs b/Tests/UnitTestsParallelizable/Text/CollectionNavigatorTests.cs
index 5d3923d50..f393b43d4 100644
--- a/Tests/UnitTestsParallelizable/Text/CollectionNavigatorTests.cs
+++ b/Tests/UnitTestsParallelizable/Text/CollectionNavigatorTests.cs
@@ -1,4 +1,6 @@
-using Moq;
+using System.Collections;
+using System.Collections.Concurrent;
+using Moq;
 using Xunit.Abstractions;
 
 namespace UnitTests_Parallelizable.TextTests;
@@ -41,7 +43,7 @@ public class CollectionNavigatorTests
         Assert.Equal (2, n.GetNextMatchingItem (4, 'b'));
 
         // cycling with 'a'
-        n = new CollectionNavigator (simpleStrings);
+        n = new (simpleStrings);
         Assert.Equal (0, n.GetNextMatchingItem (null, 'a'));
         Assert.Equal (1, n.GetNextMatchingItem (0, 'a'));
 
@@ -340,6 +342,7 @@ public class CollectionNavigatorTests
                       current = n.GetNextMatchingItem (current, ' ')
                      ); // match bates hotel
     }
+
     [Fact]
     public void CustomMatcher_NeverMatches ()
     {
@@ -347,7 +350,7 @@ public class CollectionNavigatorTests
         int? current = 0;
         var n = new CollectionNavigator (strings);
 
-        var matchNone = new Mock<ICollectionNavigatorMatcher> ();
+        Mock<ICollectionNavigatorMatcher> matchNone = new ();
 
         matchNone.Setup (m => m.IsMatch (It.IsAny<string> (), It.IsAny<object> ()))
                  .Returns (false);
@@ -358,4 +361,246 @@ public class CollectionNavigatorTests
         Assert.Equal (0, current = n.GetNextMatchingItem (current, 'a')); // no matches
         Assert.Equal (0, current = n.GetNextMatchingItem (current, 't')); // no matches
     }
+
+    #region Thread Safety Tests
+
+    [Fact]
+    public void ThreadSafety_ConcurrentSearchStringAccess ()
+    {
+        var strings = new [] { "apricot", "arm", "bat", "batman", "candle" };
+        var navigator = new CollectionNavigator (strings);
+        var numTasks = 20;
+        ConcurrentBag<Exception> exceptions = new ();
+
+        Parallel.For (
+                      0,
+                      numTasks,
+                      i =>
+                      {
+                          try
+                          {
+                              // Read SearchString concurrently
+                              string searchString = navigator.SearchString;
+
+                              // Perform navigation operations concurrently
+                              int? result = navigator.GetNextMatchingItem (0, 'a');
+
+                              // Read SearchString again
+                              searchString = navigator.SearchString;
+                          }
+                          catch (Exception ex)
+                          {
+                              exceptions.Add (ex);
+                          }
+                      });
+
+        Assert.Empty (exceptions);
+    }
+
+    [Fact]
+    public void ThreadSafety_ConcurrentCollectionAccess ()
+    {
+        var strings = new [] { "apricot", "arm", "bat", "batman", "candle" };
+        var navigator = new CollectionNavigator (strings);
+        var numTasks = 20;
+        ConcurrentBag<Exception> exceptions = new ();
+
+        Parallel.For (
+                      0,
+                      numTasks,
+                      i =>
+                      {
+                          try
+                          {
+                              // Access Collection property concurrently
+                              IList collection = navigator.Collection;
+
+                              // Perform navigation
+                              int? result = navigator.GetNextMatchingItem (0, (char)('a' + i % 3));
+                          }
+                          catch (Exception ex)
+                          {
+                              exceptions.Add (ex);
+                          }
+                      });
+
+        Assert.Empty (exceptions);
+    }
+
+    [Fact]
+    public void ThreadSafety_ConcurrentNavigationOperations ()
+    {
+        var strings = new [] { "apricot", "arm", "bat", "batman", "candle", "cat", "dog", "elephant" };
+        var navigator = new CollectionNavigator (strings);
+        var numTasks = 50;
+        ConcurrentBag<int?> results = new ();
+        ConcurrentBag<Exception> exceptions = new ();
+
+        Parallel.For (
+                      0,
+                      numTasks,
+                      i =>
+                      {
+                          try
+                          {
+                              var searchChar = (char)('a' + i % 5);
+                              int? result = navigator.GetNextMatchingItem (i % strings.Length, searchChar);
+                              results.Add (result);
+                          }
+                          catch (Exception ex)
+                          {
+                              exceptions.Add (ex);
+                          }
+                      });
+
+        Assert.Empty (exceptions);
+        Assert.Equal (numTasks, results.Count);
+    }
+
+    [Fact]
+    public void ThreadSafety_ConcurrentCollectionModification ()
+    {
+        var strings = new [] { "apricot", "arm", "bat", "batman", "candle" };
+        var navigator = new CollectionNavigator (strings);
+        var numReaders = 10;
+        var numWriters = 5;
+        ConcurrentBag<Exception> exceptions = new ();
+        List<Task> tasks = new ();
+
+        // Reader tasks
+        for (var i = 0; i < numReaders; i++)
+        {
+            tasks.Add (
+                       Task.Run (() =>
+                                 {
+                                     try
+                                     {
+                                         for (var j = 0; j < 100; j++)
+                                         {
+                                             int? result = navigator.GetNextMatchingItem (0, 'a');
+                                             string searchString = navigator.SearchString;
+                                         }
+                                     }
+                                     catch (Exception ex)
+                                     {
+                                         exceptions.Add (ex);
+                                     }
+                                 }));
+        }
+
+        // Writer tasks (change Collection reference)
+        for (var i = 0; i < numWriters; i++)
+        {
+            int writerIndex = i;
+
+            tasks.Add (
+                       Task.Run (() =>
+                                 {
+                                     try
+                                     {
+                                         for (var j = 0; j < 50; j++)
+                                         {
+                                             var newStrings = new [] { $"item{writerIndex}_{j}_1", $"item{writerIndex}_{j}_2" };
+                                             navigator.Collection = newStrings;
+                                             Thread.Sleep (1); // Small delay to increase contention
+                                         }
+                                     }
+                                     catch (Exception ex)
+                                     {
+                                         exceptions.Add (ex);
+                                     }
+                                 }));
+        }
+
+#pragma warning disable xUnit1031
+        Task.WaitAll (tasks.ToArray ());
+#pragma warning restore xUnit1031
+
+        // Allow some exceptions due to collection being swapped during access
+        // but verify no deadlocks occurred (all tasks completed)
+        Assert.True (tasks.All (t => t.IsCompleted));
+    }
+
+    [Fact]
+    public void ThreadSafety_ConcurrentSearchStringChanges ()
+    {
+        var strings = new [] { "apricot", "arm", "bat", "batman", "candle", "cat", "dog", "elephant", "fox", "goat" };
+        var navigator = new CollectionNavigator (strings);
+        var numTasks = 30;
+        ConcurrentBag<Exception> exceptions = new ();
+        ConcurrentBag<string> searchStrings = new ();
+
+        Parallel.For (
+                      0,
+                      numTasks,
+                      i =>
+                      {
+                          try
+                          {
+                              // Each task performs multiple searches rapidly
+                              char [] chars = { 'a', 'b', 'c', 'd', 'e', 'f' };
+
+                              foreach (char c in chars)
+                              {
+                                  navigator.GetNextMatchingItem (0, c);
+                                  searchStrings.Add (navigator.SearchString);
+                              }
+                          }
+                          catch (Exception ex)
+                          {
+                              exceptions.Add (ex);
+                          }
+                      });
+
+        Assert.Empty (exceptions);
+        Assert.NotEmpty (searchStrings);
+    }
+
+    [Fact]
+    public void ThreadSafety_StressTest_RapidOperations ()
+    {
+        var strings = new string [100];
+
+        for (var i = 0; i < 100; i++)
+        {
+            strings [i] = $"item_{i:D3}";
+        }
+
+        var navigator = new CollectionNavigator (strings);
+        var numTasks = 100;
+        var operationsPerTask = 1000;
+        ConcurrentBag<Exception> exceptions = new ();
+
+        Parallel.For (
+                      0,
+                      numTasks,
+                      i =>
+                      {
+                          try
+                          {
+                              var random = new Random (i);
+
+                              for (var j = 0; j < operationsPerTask; j++)
+                              {
+                                  int? currentIndex = random.Next (0, strings.Length);
+                                  var searchChar = (char)('a' + random.Next (0, 26));
+
+                                  navigator.GetNextMatchingItem (currentIndex, searchChar);
+
+                                  if (j % 100 == 0)
+                                  {
+                                      string searchString = navigator.SearchString;
+                                  }
+                              }
+                          }
+                          catch (Exception ex)
+                          {
+                              exceptions.Add (ex);
+                          }
+                      });
+
+        Assert.Empty (exceptions);
+    }
+
+    #endregion Thread Safety Tests
 }
diff --git a/Tests/UnitTestsParallelizable/View/Draw/ViewDrawingClippingTests.cs b/Tests/UnitTestsParallelizable/View/Draw/ViewDrawingClippingTests.cs
index ba5941efc..1d7183857 100644
--- a/Tests/UnitTestsParallelizable/View/Draw/ViewDrawingClippingTests.cs
+++ b/Tests/UnitTestsParallelizable/View/Draw/ViewDrawingClippingTests.cs
@@ -65,23 +65,18 @@ public class ViewDrawingClippingTests () : FakeDriverBase
 
         Assert.Equal (original, previous);
         Assert.NotEqual (original, driver.Clip);
-
-        Application.ResetState (true);
     }
 
     [Fact]
     public void SetClipToScreen_SetsClipToScreen ()
     {
         IDriver driver = CreateFakeDriver (80, 25);
-        Application.Driver = driver;
         View view = new () { Driver = driver };
 
         view.SetClipToScreen ();
 
         Assert.NotNull (driver.Clip);
         Assert.Equal (driver.Screen, driver.Clip.GetBounds ());
-
-        Application.ResetState (true);
     }
 
     #endregion
@@ -94,8 +89,6 @@ public class ViewDrawingClippingTests () : FakeDriverBase
         View view = new () { Driver = null };
         var exception = Record.Exception (() => view.ExcludeFromClip (new Rectangle (5, 5, 10, 10)));
         Assert.Null (exception);
-
-        Application.ResetState (true);
     }
 
     [Fact]
@@ -103,7 +96,6 @@ public class ViewDrawingClippingTests () : FakeDriverBase
     {
         IDriver driver = CreateFakeDriver (80, 25);
         driver.Clip = new Region (new Rectangle (0, 0, 80, 25));
-        Application.Driver = driver;
         View view = new () { Driver = driver };
 
         var toExclude = new Rectangle (10, 10, 20, 20);
@@ -112,8 +104,6 @@ public class ViewDrawingClippingTests () : FakeDriverBase
         // Verify the region was excluded
         Assert.NotNull (driver.Clip);
         Assert.False (driver.Clip.Contains (15, 15));
-
-        Application.ResetState (true);
     }
 
     [Fact]
@@ -123,8 +113,6 @@ public class ViewDrawingClippingTests () : FakeDriverBase
 
         var exception = Record.Exception (() => view.ExcludeFromClip (new Region (new Rectangle (5, 5, 10, 10))));
         Assert.Null (exception);
-
-        Application.ResetState (true);
     }
 
     [Fact]
@@ -141,8 +129,6 @@ public class ViewDrawingClippingTests () : FakeDriverBase
         // Verify the region was excluded
         Assert.NotNull (driver.Clip);
         Assert.False (driver.Clip.Contains (15, 15));
-
-        Application.ResetState (true);
     }
 
     #endregion
@@ -538,7 +524,6 @@ public class ViewDrawingClippingTests () : FakeDriverBase
     {
         IDriver driver = CreateFakeDriver (80, 25);
         driver.Clip = new Region (driver.Screen);
-        Application.Driver = driver;
 
         var view = new View
         {
@@ -558,7 +543,6 @@ public class ViewDrawingClippingTests () : FakeDriverBase
         Assert.NotNull (driver.Clip);
         Assert.False (driver.Clip.Contains (20, 20)); // Point inside excluded rect should not be in clip
 
-        Application.ResetState (true);
     }
 
     [Fact]
@@ -566,7 +550,6 @@ public class ViewDrawingClippingTests () : FakeDriverBase
     {
         IDriver driver = CreateFakeDriver (80, 25);
         driver.Clip = null!;
-        Application.Driver = driver;
 
         var view = new View
         {
@@ -581,7 +564,6 @@ public class ViewDrawingClippingTests () : FakeDriverBase
 
         Assert.Null (exception);
 
-        Application.ResetState (true);
     }
 
     #endregion
diff --git a/Tests/UnitTestsParallelizable/View/Draw/ViewDrawingFlowTests.cs b/Tests/UnitTestsParallelizable/View/Draw/ViewDrawingFlowTests.cs
index 58f2bbb18..1f646c292 100644
--- a/Tests/UnitTestsParallelizable/View/Draw/ViewDrawingFlowTests.cs
+++ b/Tests/UnitTestsParallelizable/View/Draw/ViewDrawingFlowTests.cs
@@ -613,7 +613,6 @@ public class ViewDrawingFlowTests () : FakeDriverBase
         IDriver driver = CreateFakeDriver (80, 25);
         var initialClip = new Region (driver.Screen);
         driver.Clip = initialClip;
-        Application.Driver = driver;
 
         var view = new View
         {
@@ -636,8 +635,6 @@ public class ViewDrawingFlowTests () : FakeDriverBase
         // Points inside the view should be excluded
         // Note: This test depends on the DrawContext tracking, which may not exclude if nothing was actually drawn
         // We're verifying the mechanism exists, not that it necessarily excludes in this specific case
-
-        Application.ResetState (true);
     }
 
     #endregion
diff --git a/Tests/UnitTests/Views/DateFieldTests.cs b/Tests/UnitTestsParallelizable/Views/DateFieldTests.cs
similarity index 92%
rename from Tests/UnitTests/Views/DateFieldTests.cs
rename to Tests/UnitTestsParallelizable/Views/DateFieldTests.cs
index c4e310fbd..78a8c899e 100644
--- a/Tests/UnitTests/Views/DateFieldTests.cs
+++ b/Tests/UnitTestsParallelizable/Views/DateFieldTests.cs
@@ -2,7 +2,7 @@
 using System.Globalization;
 using System.Runtime.InteropServices;
 
-namespace UnitTests.ViewsTests;
+namespace UnitTests_Parallelizable.ViewsTests;
 
 public class DateFieldTests
 {
@@ -35,25 +35,34 @@ public class DateFieldTests
 
     [Fact]
     [TestDate]
-    [SetupFakeApplication]
     public void Copy_Paste ()
     {
-        var df1 = new DateField (DateTime.Parse ("12/12/1971"));
-        var df2 = new DateField (DateTime.Parse ("12/31/2023"));
+        IApplication app = Application.Create();
+        app.Init("fake");
 
-        // Select all text
-        Assert.True (df2.NewKeyDownEvent (Key.End.WithShift));
-        Assert.Equal (1, df2.SelectedStart);
-        Assert.Equal (10, df2.SelectedLength);
-        Assert.Equal (11, df2.CursorPosition);
+        try
+        {
+            var df1 = new DateField (DateTime.Parse ("12/12/1971")) { App = app };
+            var df2 = new DateField (DateTime.Parse ("12/31/2023")) { App = app };
 
-        // Copy from df2
-        Assert.True (df2.NewKeyDownEvent (Key.C.WithCtrl));
+            // Select all text
+            Assert.True (df2.NewKeyDownEvent (Key.End.WithShift));
+            Assert.Equal (1, df2.SelectedStart);
+            Assert.Equal (10, df2.SelectedLength);
+            Assert.Equal (11, df2.CursorPosition);
 
-        // Paste into df1
-        Assert.True (df1.NewKeyDownEvent (Key.V.WithCtrl));
-        Assert.Equal (" 12/31/2023", df1.Text);
-        Assert.Equal (11, df1.CursorPosition);
+            // Copy from df2
+            Assert.True (df2.NewKeyDownEvent (Key.C.WithCtrl));
+
+            // Paste into df1
+            Assert.True (df1.NewKeyDownEvent (Key.V.WithCtrl));
+            Assert.Equal (" 12/31/2023", df1.Text);
+            Assert.Equal (11, df1.CursorPosition);
+        }
+        finally
+        {
+            app.Shutdown();
+        }
     }
 
     [Fact]
diff --git a/Tests/UnitTestsParallelizable/Views/MessageBoxTests.cs b/Tests/UnitTestsParallelizable/Views/MessageBoxTests.cs
new file mode 100644
index 000000000..d7c262789
--- /dev/null
+++ b/Tests/UnitTestsParallelizable/Views/MessageBoxTests.cs
@@ -0,0 +1,625 @@
+#nullable enable
+using System.Text;
+using UICatalog;
+using UnitTests;
+using Xunit.Abstractions;
+
+namespace UnitTests_Parallelizable.ViewsTests;
+
+public class MessageBoxTests (ITestOutputHelper output)
+{
+    [Fact]
+    public void KeyBindings_Enter_Causes_Focused_Button_Click_No_Accept ()
+    {
+        IApplication app = Application.Create ();
+        app.Init ("fake");
+
+        try
+        {
+            int? result = null;
+            var iteration = 0;
+            var btnAcceptCount = 0;
+
+            app.Iteration += OnApplicationOnIteration;
+            app.Run<Toplevel> ().Dispose ();
+            app.Iteration -= OnApplicationOnIteration;
+
+            Assert.Equal (1, result);
+            Assert.Equal (1, btnAcceptCount);
+
+            void OnApplicationOnIteration (object? s, EventArgs<IApplication?> a)
+            {
+                iteration++;
+
+                switch (iteration)
+                {
+                    case 1:
+                        result = MessageBox.Query (app, string.Empty, string.Empty, 0, false, "btn0", "btn1");
+                        app.RequestStop ();
+
+                        break;
+
+                    case 2:
+                        // Tab to btn2
+                        app.Keyboard.RaiseKeyDownEvent (Key.Tab);
+
+                        var btn = app.Navigation!.GetFocused () as Button;
+                        btn!.Accepting += (sender, e) => { btnAcceptCount++; };
+
+                        // Click
+                        app.Keyboard.RaiseKeyDownEvent (Key.Enter);
+
+                        break;
+
+                    default:
+                        Assert.Fail ();
+
+                        break;
+                }
+            }
+        }
+        finally
+        {
+            app.Shutdown ();
+        }
+    }
+
+    [Fact]
+    public void KeyBindings_Esc_Closes ()
+    {
+        IApplication app = Application.Create ();
+        app.Init ("fake");
+
+        try
+        {
+            int? result = 999;
+            var iteration = 0;
+
+            app.Iteration += OnApplicationOnIteration;
+            app.Run<Toplevel> ().Dispose ();
+            app.Iteration -= OnApplicationOnIteration;
+
+            Assert.Null (result);
+
+            void OnApplicationOnIteration (object? s, EventArgs<IApplication?> a)
+            {
+                iteration++;
+
+                switch (iteration)
+                {
+                    case 1:
+                        result = MessageBox.Query (app, string.Empty, string.Empty, 0, false, "btn0", "btn1");
+                        app.RequestStop ();
+
+                        break;
+
+                    case 2:
+                        app.Keyboard.RaiseKeyDownEvent (Key.Esc);
+
+                        break;
+
+                    default:
+                        Assert.Fail ();
+
+                        break;
+                }
+            }
+        }
+        finally
+        {
+            app.Shutdown ();
+        }
+    }
+
+    [Fact]
+    public void KeyBindings_Space_Causes_Focused_Button_Click_No_Accept ()
+    {
+        IApplication app = Application.Create ();
+        app.Init ("fake");
+
+        try
+        {
+            int? result = null;
+            var iteration = 0;
+            var btnAcceptCount = 0;
+
+            app.Iteration += OnApplicationOnIteration;
+            app.Run<Toplevel> ().Dispose ();
+            app.Iteration -= OnApplicationOnIteration;
+
+            Assert.Equal (1, result);
+            Assert.Equal (1, btnAcceptCount);
+
+            void OnApplicationOnIteration (object? s, EventArgs<IApplication?> a)
+            {
+                iteration++;
+
+                switch (iteration)
+                {
+                    case 1:
+                        result = MessageBox.Query (app, string.Empty, string.Empty, 0, false, "btn0", "btn1");
+                        app.RequestStop ();
+
+                        break;
+
+                    case 2:
+                        // Tab to btn2
+                        app.Keyboard.RaiseKeyDownEvent (Key.Tab);
+
+                        var btn = app.Navigation!.GetFocused () as Button;
+                        btn!.Accepting += (sender, e) => { btnAcceptCount++; };
+
+                        app.Keyboard.RaiseKeyDownEvent (Key.Space);
+
+                        break;
+
+                    default:
+                        Assert.Fail ();
+
+                        break;
+                }
+            }
+        }
+        finally
+        {
+            app.Shutdown ();
+        }
+    }
+
+    [Theory]
+    [InlineData (@"", false, false, 6, 6, 2, 2)]
+    [InlineData (@"", false, true, 3, 6, 9, 3)]
+    [InlineData (@"01234\n-----\n01234", false, false, 1, 6, 13, 3)]
+    [InlineData (@"01234\n-----\n01234", true, false, 1, 5, 13, 4)]
+    [InlineData (@"0123456789", false, false, 1, 6, 12, 3)]
+    [InlineData (@"0123456789", false, true, 1, 5, 12, 4)]
+    [InlineData (@"01234567890123456789", false, true, 1, 5, 13, 4)]
+    [InlineData (@"01234567890123456789", true, true, 1, 5, 13, 5)]
+    [InlineData (@"01234567890123456789\n01234567890123456789", false, true, 1, 5, 13, 4)]
+    [InlineData (@"01234567890123456789\n01234567890123456789", true, true, 1, 4, 13, 7)]
+    public void Location_And_Size_Correct (string message, bool wrapMessage, bool hasButton, int expectedX, int expectedY, int expectedW, int expectedH)
+    {
+        IApplication app = Application.Create ();
+        app.Init ("fake");
+
+        try
+        {
+            int iterations = -1;
+
+            app.Driver!.SetScreenSize (15, 15); // 15 x 15 gives us enough room for a button with one char (9x1)
+            Dialog.DefaultShadow = ShadowStyle.None;
+            Button.DefaultShadow = ShadowStyle.None;
+
+            var mbFrame = Rectangle.Empty;
+
+            app.Iteration += OnApplicationOnIteration;
+            app.Run<Toplevel> ().Dispose ();
+            app.Iteration -= OnApplicationOnIteration;
+
+            Assert.Equal (new (expectedX, expectedY, expectedW, expectedH), mbFrame);
+
+            void OnApplicationOnIteration (object? s, EventArgs<IApplication?> a)
+            {
+                iterations++;
+
+                if (iterations == 0)
+                {
+                    MessageBox.Query (app, string.Empty, message, 0, wrapMessage, hasButton ? ["0"] : []);
+                    app.RequestStop ();
+                }
+                else if (iterations == 1)
+                {
+                    mbFrame = app.TopRunnable!.Frame;
+                    app.RequestStop ();
+                }
+            }
+        }
+        finally
+        {
+            app.Shutdown ();
+        }
+    }
+
+    [Fact]
+    public void Message_With_Spaces_WrapMessage_False ()
+    {
+        IApplication app = Application.Create ();
+        app.Init ("fake");
+
+        try
+        {
+            int iterations = -1;
+            var top = new Toplevel ();
+            top.BorderStyle = LineStyle.None;
+            app.Driver!.SetScreenSize (20, 10);
+
+            var btn =
+                $"{Glyphs.LeftBracket}{Glyphs.LeftDefaultIndicator} btn {Glyphs.RightDefaultIndicator}{Glyphs.RightBracket}";
+
+            // Override CM
+            MessageBox.DefaultButtonAlignment = Alignment.End;
+            MessageBox.DefaultBorderStyle = LineStyle.Double;
+            Dialog.DefaultShadow = ShadowStyle.None;
+            Button.DefaultShadow = ShadowStyle.None;
+
+            app.Iteration += OnApplicationOnIteration;
+            try
+            {
+                app.Run (top);
+            }
+            finally
+            {
+                app.Iteration -= OnApplicationOnIteration;
+                top.Dispose ();
+            }
+
+            void OnApplicationOnIteration (object? s, EventArgs<IApplication?> a)
+            {
+                iterations++;
+
+                if (iterations == 0)
+                {
+                    var sb = new StringBuilder ();
+
+                    for (var i = 0; i < 17; i++)
+                    {
+                        sb.Append ("ff ");
+                    }
+
+                    MessageBox.Query (app, string.Empty, sb.ToString (), 0, false, "btn");
+                    app.RequestStop ();
+                }
+                else if (iterations == 2)
+                {
+                    DriverAssert.AssertDriverContentsWithFrameAre (
+                                                                   @"
+ ╔════════════════╗
+ ║ ff ff ff ff ff ║
+ ║       ⟦► btn ◄⟧║
+ ╚════════════════╝",
+                                                                   output,
+                                                                   app.Driver);
+                    app.RequestStop ();
+
+                    // Really long text
+                    MessageBox.Query (app, string.Empty, new ('f', 500), 0, false, "btn");
+                }
+                else if (iterations == 4)
+                {
+                    DriverAssert.AssertDriverContentsWithFrameAre (
+                                                                   @"
+ ╔════════════════╗
+ ║ffffffffffffffff║
+ ║       ⟦► btn ◄⟧║
+ ╚════════════════╝",
+                                                                   output,
+                                                                   app.Driver);
+                    app.RequestStop ();
+                }
+            }
+        }
+        finally
+        {
+            app.Shutdown ();
+        }
+    }
+
+    [Fact]
+    public void Message_With_Spaces_WrapMessage_True ()
+    {
+        IApplication app = Application.Create ();
+        app.Init ("fake");
+
+        try
+        {
+            int iterations = -1;
+            var top = new Toplevel ();
+            top.BorderStyle = LineStyle.None;
+            app.Driver!.SetScreenSize (20, 10);
+
+            var btn =
+                $"{Glyphs.LeftBracket}{Glyphs.LeftDefaultIndicator} btn {Glyphs.RightDefaultIndicator}{Glyphs.RightBracket}";
+
+            // Override CM
+            MessageBox.DefaultButtonAlignment = Alignment.End;
+            MessageBox.DefaultBorderStyle = LineStyle.Double;
+            Dialog.DefaultShadow = ShadowStyle.None;
+            Button.DefaultShadow = ShadowStyle.None;
+
+            app.Iteration += OnApplicationOnIteration;
+            try
+            {
+                app.Run (top);
+            }
+            finally
+            {
+                app.Iteration -= OnApplicationOnIteration;
+                top.Dispose ();
+            }
+
+            void OnApplicationOnIteration (object? s, EventArgs<IApplication?> a)
+            {
+                iterations++;
+
+                if (iterations == 0)
+                {
+                    var sb = new StringBuilder ();
+
+                    for (var i = 0; i < 17; i++)
+                    {
+                        sb.Append ("ff ");
+                    }
+
+                    MessageBox.Query (app, string.Empty, sb.ToString (), 0, true, "btn");
+                    app.RequestStop ();
+                }
+                else if (iterations == 2)
+                {
+                    DriverAssert.AssertDriverContentsWithFrameAre (
+                                                                   @"
+  ╔══════════════╗
+  ║ff ff ff ff ff║
+  ║ff ff ff ff ff║
+  ║ff ff ff ff ff║
+  ║    ff ff     ║
+  ║     ⟦► btn ◄⟧║
+  ╚══════════════╝",
+                                                                   output,
+                                                                   app.Driver);
+                    app.RequestStop ();
+
+                    // Really long text
+                    MessageBox.Query (app, string.Empty, new ('f', 500), 0, true, "btn");
+                }
+                else if (iterations == 4)
+                {
+                    DriverAssert.AssertDriverContentsWithFrameAre (
+                                                                   @"
+ ╔════════════════╗
+ ║ffffffffffffffff║
+ ║ffffffffffffffff║
+ ║ffffffffffffffff║
+ ║ffffffffffffffff║
+ ║ffffffffffffffff║
+ ║ffffffffffffffff║
+ ║fffffff⟦► btn ◄⟧║
+ ╚════════════════╝",
+                                                                   output,
+                                                                   app.Driver);
+                    app.RequestStop ();
+                }
+            }
+        }
+        finally
+        {
+            app.Shutdown ();
+        }
+    }
+
+    [Theory (Skip = "Bogus test: Never does anything")]
+    [InlineData (0, 0, "1")]
+    [InlineData (1, 1, "1")]
+    [InlineData (7, 5, "1")]
+    [InlineData (50, 50, "1")]
+    [InlineData (0, 0, "message")]
+    [InlineData (1, 1, "message")]
+    [InlineData (7, 5, "message")]
+    [InlineData (50, 50, "message")]
+    public void Size_Not_Default_Message (int height, int width, string message)
+    {
+        IApplication app = Application.Create ();
+        app.Init ("fake");
+
+        try
+        {
+            int iterations = -1;
+            app.Driver!.SetScreenSize (100, 100);
+
+            app.Iteration += (s, a) =>
+                             {
+                                 iterations++;
+
+                                 if (iterations == 0)
+                                 {
+                                     MessageBox.Query (app, height, width, string.Empty, message);
+                                     app.RequestStop ();
+                                 }
+                                 else if (iterations == 1)
+                                 {
+                                     Assert.IsType<Dialog> (app.TopRunnable);
+                                     Assert.Equal (new (height, width), app.TopRunnable.Frame.Size);
+                                     app.RequestStop ();
+                                 }
+                             };
+        }
+        finally
+        {
+            app.Shutdown ();
+        }
+    }
+
+    [Theory (Skip = "Bogus test: Never does anything")]
+    [InlineData (0, 0, "1")]
+    [InlineData (1, 1, "1")]
+    [InlineData (7, 5, "1")]
+    [InlineData (50, 50, "1")]
+    [InlineData (0, 0, "message")]
+    [InlineData (1, 1, "message")]
+    [InlineData (7, 5, "message")]
+    [InlineData (50, 50, "message")]
+    public void Size_Not_Default_Message_Button (int height, int width, string message)
+    {
+        IApplication app = Application.Create ();
+        app.Init ("fake");
+
+        try
+        {
+            int iterations = -1;
+
+            app.Iteration += (s, a) =>
+                             {
+                                 iterations++;
+
+                                 if (iterations == 0)
+                                 {
+                                     MessageBox.Query (app, height, width, string.Empty, message, "_Ok");
+                                     app.RequestStop ();
+                                 }
+                                 else if (iterations == 1)
+                                 {
+                                     Assert.IsType<Dialog> (app.TopRunnable);
+                                     Assert.Equal (new (height, width), app.TopRunnable.Frame.Size);
+                                     app.RequestStop ();
+                                 }
+                             };
+        }
+        finally
+        {
+            app.Shutdown ();
+        }
+    }
+
+    [Theory (Skip = "Bogus test: Never does anything")]
+    [InlineData (0, 0)]
+    [InlineData (1, 1)]
+    [InlineData (7, 5)]
+    [InlineData (50, 50)]
+    public void Size_Not_Default_No_Message (int height, int width)
+    {
+        IApplication app = Application.Create ();
+        app.Init ("fake");
+
+        try
+        {
+            int iterations = -1;
+
+            app.Iteration += (s, a) =>
+                             {
+                                 iterations++;
+
+                                 if (iterations == 0)
+                                 {
+                                     MessageBox.Query (app, height, width, string.Empty, string.Empty);
+                                     app.RequestStop ();
+                                 }
+                                 else if (iterations == 1)
+                                 {
+                                     Assert.IsType<Dialog> (app.TopRunnable);
+                                     Assert.Equal (new (height, width), app.TopRunnable.Frame.Size);
+                                     app.RequestStop ();
+                                 }
+                             };
+        }
+        finally
+        {
+            app.Shutdown ();
+        }
+    }
+
+    [Fact]
+    public void UICatalog_AboutBox ()
+    {
+        IApplication app = Application.Create ();
+        app.Init ("fake");
+
+        try
+        {
+            int iterations = -1;
+            app.Driver!.SetScreenSize (70, 15);
+
+            // Override CM
+            MessageBox.DefaultButtonAlignment = Alignment.End;
+            MessageBox.DefaultBorderStyle = LineStyle.Double;
+            Dialog.DefaultShadow = ShadowStyle.None;
+            Button.DefaultShadow = ShadowStyle.None;
+
+            app.Iteration += OnApplicationOnIteration;
+
+            var top = new Toplevel ();
+            top.BorderStyle = LineStyle.Single;
+            try
+            {
+                app.Run (top);
+            }
+            finally
+            {
+                app.Iteration -= OnApplicationOnIteration;
+                top.Dispose ();
+            }
+
+            void OnApplicationOnIteration (object? s, EventArgs<IApplication?> a)
+            {
+                iterations++;
+
+                if (iterations == 0)
+                {
+                    MessageBox.Query (
+                                      app,
+                                      "",
+                                      UICatalogTop.GetAboutBoxMessage (),
+                                      wrapMessage: false,
+                                      buttons: "_Ok");
+
+                    app.RequestStop ();
+                }
+                else if (iterations == 2)
+                {
+                    var expectedText = """
+                                       ┌────────────────────────────────────────────────────────────────────┐
+                                       │   ╔═══════════════════════════════════════════════════════════╗    │
+                                       │   ║UI Catalog: A comprehensive sample library and test app for║    │
+                                       │   ║                                                           ║    │
+                                       │   ║ _______                  _             _   _____       _  ║    │
+                                       │   ║|__   __|                (_)           | | / ____|     (_) ║    │
+                                       │   ║   | | ___ _ __ _ __ ___  _ _ __   __ _| || |  __ _   _ _  ║    │
+                                       │   ║   | |/ _ \ '__| '_ ` _ \| | '_ \ / _` | || | |_ | | | | | ║    │
+                                       │   ║   | |  __/ |  | | | | | | | | | | (_| | || |__| | |_| | | ║    │
+                                       │   ║   |_|\___|_|  |_| |_| |_|_|_| |_|\__,_|_(_)_____|\__,_|_| ║    │
+                                       │   ║                                                           ║    │
+                                       │   ║                      v2 - Pre-Alpha                       ║    │
+                                       │   ║                                                   ⟦► Ok ◄⟧║    │
+                                       │   ╚═══════════════════════════════════════════════════════════╝    │
+                                       └────────────────────────────────────────────────────────────────────┘
+                                       """;
+
+                    DriverAssert.AssertDriverContentsAre (expectedText, output, app.Driver);
+
+                    app.RequestStop ();
+                }
+            }
+        }
+        finally
+        {
+            app.Shutdown ();
+        }
+    }
+
+    [Theory]
+    [MemberData (nameof (AcceptingKeys))]
+    public void Button_IsDefault_True_Return_His_Index_On_Accepting (Key key)
+    {
+        IApplication app = Application.Create ();
+        app.Init ("fake");
+
+        try
+        {
+            app.Iteration += OnApplicationOnIteration;
+            int? res = MessageBox.Query (app, "hey", "IsDefault", "Yes", "No");
+            app.Iteration -= OnApplicationOnIteration;
+
+            Assert.Equal (0, res);
+
+            void OnApplicationOnIteration (object? o, EventArgs<IApplication?> iterationEventArgs) { Assert.True (app.Keyboard.RaiseKeyDownEvent (key)); }
+        }
+        finally
+        {
+            app.Shutdown ();
+        }
+    }
+
+    public static IEnumerable<object []> AcceptingKeys ()
+    {
+        yield return [Key.Enter];
+        yield return [Key.Space];
+    }
+}
diff --git a/Tests/UnitTestsParallelizable/Views/ScrollSliderTests.cs b/Tests/UnitTestsParallelizable/Views/ScrollSliderTests.cs
index 2f510d9a4..c28d5e7c1 100644
--- a/Tests/UnitTestsParallelizable/Views/ScrollSliderTests.cs
+++ b/Tests/UnitTestsParallelizable/Views/ScrollSliderTests.cs
@@ -679,7 +679,6 @@ public class ScrollSliderTests (ITestOutputHelper output) : FakeDriverBase
 
 
     [Theory]
-    [SetupFakeApplication]
     [InlineData (
                     3,
                     10,
diff --git a/Tests/UnitTests/Views/TimeFieldTests.cs b/Tests/UnitTestsParallelizable/Views/TimeFieldTests.cs
similarity index 87%
rename from Tests/UnitTests/Views/TimeFieldTests.cs
rename to Tests/UnitTestsParallelizable/Views/TimeFieldTests.cs
index a22f82201..f01b7cc38 100644
--- a/Tests/UnitTests/Views/TimeFieldTests.cs
+++ b/Tests/UnitTestsParallelizable/Views/TimeFieldTests.cs
@@ -1,6 +1,4 @@
-using UnitTests;
-
-namespace UnitTests.ViewsTests;
+namespace UnitTests_Parallelizable.ViewsTests;
 
 public class TimeFieldTests
 {
@@ -43,25 +41,34 @@ public class TimeFieldTests
     }
 
     [Fact]
-    [SetupFakeApplication]
     public void Copy_Paste ()
     {
-        var tf1 = new TimeField { Time = TimeSpan.Parse ("12:12:19") };
-        var tf2 = new TimeField { Time = TimeSpan.Parse ("12:59:01") };
+        IApplication app = Application.Create();
+        app.Init("fake");
 
-        // Select all text
-        Assert.True (tf2.NewKeyDownEvent (Key.End.WithShift));
-        Assert.Equal (1, tf2.SelectedStart);
-        Assert.Equal (8, tf2.SelectedLength);
-        Assert.Equal (9, tf2.CursorPosition);
+        try
+        {
+            var tf1 = new TimeField { Time = TimeSpan.Parse ("12:12:19"), App = app };
+            var tf2 = new TimeField { Time = TimeSpan.Parse ("12:59:01"), App = app };
 
-        // Copy from tf2
-        Assert.True (tf2.NewKeyDownEvent (Key.C.WithCtrl));
+            // Select all text
+            Assert.True (tf2.NewKeyDownEvent (Key.End.WithShift));
+            Assert.Equal (1, tf2.SelectedStart);
+            Assert.Equal (8, tf2.SelectedLength);
+            Assert.Equal (9, tf2.CursorPosition);
 
-        // Paste into tf1
-        Assert.True (tf1.NewKeyDownEvent (Key.V.WithCtrl));
-        Assert.Equal (" 12:59:01", tf1.Text);
-        Assert.Equal (9, tf1.CursorPosition);
+            // Copy from tf2
+            Assert.True (tf2.NewKeyDownEvent (Key.C.WithCtrl));
+
+            // Paste into tf1
+            Assert.True (tf1.NewKeyDownEvent (Key.V.WithCtrl));
+            Assert.Equal (" 12:59:01", tf1.Text);
+            Assert.Equal (9, tf1.CursorPosition);
+        }
+        finally
+        {
+            app.Shutdown();
+        }
     }
 
     [Fact]
diff --git a/Tests/UnitTestsParallelizable/xunit.runner.json b/Tests/UnitTestsParallelizable/xunit.runner.json
index 66c35c65f..8a107f065 100644
--- a/Tests/UnitTestsParallelizable/xunit.runner.json
+++ b/Tests/UnitTestsParallelizable/xunit.runner.json
@@ -2,5 +2,6 @@
   "$schema": "https://xunit.net/schema/current/xunit.runner.schema.json",
   "parallelizeTestCollections": true,
   "parallelizeAssembly": true,
-  "stopOnFail": false
+  "stopOnFail": false,
+  "maxParallelThreads": "2x"
 }
\ No newline at end of file
diff --git a/docfx/docs/migratingfromv1.md b/docfx/docs/migratingfromv1.md
deleted file mode 100644
index 527301a73..000000000
--- a/docfx/docs/migratingfromv1.md
+++ /dev/null
@@ -1,596 +0,0 @@
-# Migrating From v1 To v2
-
-This document provides an overview of the changes between Terminal.Gui v1 and v2. It is intended to help developers migrate their applications from v1 to v2.
-
-For detailed breaking change documentation check out this Discussion: https://github.com/gui-cs/Terminal.Gui/discussions/2448
-
-## View Constructors -> Initializers
-
-In v1, @Terminal.Gui.View and most sub-classes had multiple constructors that took a variety of parameters. In v2, the constructors have been replaced with initializers. This change was made to simplify the API and make it easier to use. In addition, the v1 constructors drove a false (and needlessly complex) distinction between "Absolute" and "Computed" layout. In v2, the layout system is much simpler and more intuitive.
-
-### How to Fix
-
-Replace the constructor calls with initializer calls.
-
-```diff
-- var myView = new View (new Rect (10, 10, 40, 10));
-+ var myView = new View { X = 10, Y = 10, Width = 40, Height = 10 };
-```
-
-## TrueColor Support - 24-bit Color is the default
-
-Terminal.Gui v2 now supports 24-bit color by default. This means that the colors you use in your application will be more accurate and vibrant. If you are using custom colors in your application, you may need to update them to use the new 24-bit color format.
-
-The @Terminal.Gui.Attribute class has been simplified. Color names now match the ANSI standard ('Brown' is now called 'Yellow')
-
-### How to Fix
-
-Static class `Attribute.Make` has been removed. Use constructor instead
-
-```diff
-- var c = Attribute.Make(Color.BrightMagenta, Color.Blue);
-+ var c = new Attribute(Color.BrightMagenta, Color.Blue);
-```
-
-```diff
-- var c = Color.Brown;
-+ var c = Color.Yellow;
-```
-
-## Low-Level Type Changes
-
-* `Rect` -> `Rectangle`
-* `Point` -> `Point`
-* `Size` -> `Size`
-
-### How to Fix
-
-* Replace `Rect` with `Rectangle`
-
-
-## `NStack.string` has been removed. Use `System.Rune` instead. 
-
-See [Unicode](https://gui-cs.github.io/Terminal.GuiV2Docs/docs/overview.html#unicode) for details.
-
-### How to Fix
-
-Replace `using` statements with the `System.Text` namespace
-
-```diff
-- using NStack;
-+ using System.Text;
-```
-
-Anywhere you have an implicit cast from `char` to `Rune`, replace with a constructor call 
-
-```diff
-- myView.AddRune(col, row, '▄');
-+ myView.AddRune(col, row, new Rune('▄'));
-```
-
-When measuring the screen space taken up by a `Rune` use `GetColumns()`
-
-```diff
-- Rune.ColumnWidth(rune);
-+ rune.GetColumns();
-```
-When measuring the screen space taken up by a `string` you can use the extension method `GetColumns()`
-
-```diff 
-- myString.Sum(c=>Rune.ColumnWidth(c));
-+ myString.GetColumns();
-```
-
-## View Life Cycle Management
-
-In v1, @Terminal.Gui.View was derived from `Responder` which supported `IDisposable`. In v2, `Responder` has been removed and @Terminal.Gui.View is the base-class supporting `IDisposable`. 
-
-In v1, @Terminal.Gui./Terminal.Gui.Application.Init) automatically created a toplevel view and set [Application.TopRunnable](~/api/Terminal.Gui.Application.TopRunnable. In v2, @Terminal.Gui.App.Application.Init no longer automatically creates a toplevel or sets @Terminal.Gui.App.Application.TopRunnable; app developers must explicitly create the toplevel view and pass it to @Terminal.Gui.App.Application.Run (or use `Application.Run<myTopLevel>`). Developers are responsible for calling `Dispose` on any toplevel they create before exiting. 
-
-### How to Fix
-
-* Replace `Responder` with @Terminal.Gui.View
-* Update any code that assumes `Application.Init` automatically created a toplevel view and set `Application.TopRunnable`.
-* Update any code that assumes `Application.Init` automatically disposed of the toplevel view when the application exited.
-
-## Instance-Based Application Architecture
-
-See the [Application Deep Dive](application.md) for complete details on the new application architecture.
-
-Terminal.Gui v2 introduces an instance-based application architecture. While the static `Application` class still works (marked obsolete), the recommended pattern is to use `Application.Create()` to get an `IApplication` instance.
-
-### Key Changes
-
-- **Static Application is Obsolete**: The static `Application` class delegates to `ApplicationImpl.Instance` (a singleton) and is marked `[Obsolete]` but remains functional for backward compatibility.
-- **Recommended Pattern**: Use `Application.Create()` to get a new `IApplication` instance for better testability and multiple application contexts.
-- **View.App Property**: Every view has an `App` property that references its `IApplication` context, enabling views to access application services without static dependencies.
-
-### Migration Strategies
-
-**Option 1: Continue Using Static Application (Backward Compatible)**
-
-The static `Application` class still works, so existing v1 code can continue to work with minimal changes:
-
-```csharp
-// v1 code (still works in v2, but obsolete)
-Application.Init();
-var top = new Toplevel();
-top.Add(myView);
-Application.Run(top);
-top.Dispose();
-Application.Shutdown();
-```
-
-**Option 2: Migrate to Instance-Based Pattern (Recommended)**
-
-For new code or when refactoring, use the instance-based pattern:
-
-```csharp
-// v2 recommended pattern
-var app = Application.Create();
-app.Init();
-var top = new Toplevel();
-top.Add(myView);
-app.Run(top);
-top.Dispose();
-app.Shutdown();
-```
-
-**Option 3: Use View.App Property**
-
-When accessing application services from within views, use the `App` property instead of static `Application`:
-
-```csharp
-// OLD (v1 / obsolete static):
-public void Refresh()
-{
-    Application.TopRunnable?.SetNeedsDraw();
-}
-
-// NEW (v2 - use View.App):
-public void Refresh()
-{
-    App?.Current?.SetNeedsDraw();
-}
-```
-
-### Benefits of Instance-Based Architecture
-
-- **Testability**: Views can be tested without `Application.Init()` by setting `view.App = mockApp`
-- **Multiple Contexts**: Multiple `IApplication` instances can coexist
-- **Clear Ownership**: Views explicitly know their application context
-- **Reduced Global State**: Less reliance on static singletons
-
-## @Terminal.Gui.Pos and @Terminal.Gui.Dim types now adhere to standard C# idioms
-
-* In v1, the @Terminal.Gui.Pos and @Terminal.Gui.Dim types (e.g. @Terminal.Gui.Pos.PosView) were nested classes and marked @Terminal.Gui.internal. In v2, they are no longer nested, and have appropriate public APIs. 
-* Nullabilty is enabled.
-* Methods & properties follow standards.
-* The static method that creates a @Terminal.Gui.PosAbsolute, `Pos.At`, was renamed to @Terminal.Gui.Pos.Absolute for consistency.
-* The static method that crates as @Terminal.Gui.DimAbsoulte, `Dim.Sized`, was renamed to @Terminal.Gui.Dim.Absolute for consistency.
-
-### How to Fix
-
-* Search and replace `Pos.Pos` -> `Pos`.
-* Search and replace `Dim.Dim` -> `Dim`.
-* Search and replace `Pos.At` -> `Pos.Absolute`
-* Search and replace `Dim.Sized` -> `Dim.Absolute`
-* Search and replace `Dim.Anchor` -> `Dim.GetAnchor`
-* Search and replace `Pos.Anchor` -> `Pos.GetAnchor`
-
-## Layout Improvements
-
-In v2, the layout system has been improved to make it easier to create complex user interfaces. If you are using custom layouts in your application, you may need to update them to use the new layout system.
-
-* The distinction between `Absolute Layout` and `Computed Layout` has been removed, as has the `LayoutStyle` enum. v1 drew a false distinction between these styles. 
-* @Terminal.Gui.ViewBase.View.Frame now represents the position and size of the view in the superview's coordinate system. The `Frame` property is of type `Rectangle`.
-* @Terminal.Gui.ViewBase.View.Bounds has been replaced by @Terminal.Gui.ViewBase.View.Viewport. The `Viewport` property represents the visible area of the view in its own coordinate system. The `Viewport` property is of type `Rectangle`.
-* @Terminal.Gui.ViewBase.View.GetContentSize represents the size of the view's content. This replaces `ScrollView` and `ScrollBarView` in v1. See more below.
-
-### How to Fix
-
-### `Bounds` -> `Viewport`
-
-* Remove all references ot `LayoutStyle`.
-* Rename `Bounds` to `Viewport`. The `Location` property of `Bounds` can now have non-zero values.
-* Update any code that assumed `Bounds.Location` was always `Point.Empty`.
-* Update any code that used `Bounds` to refer to the size of the view's content. Use `GetContentSize()` instead.
-* Update any code that assumed `Bounds.Size` was the same as `Frame.Size`. `Frame.Size` defines the size of the view in the superview's coordinate system, while `Viewport.Size` defines the visible area of the view in its own coordinate system.
-* Use @Terminal.Gui.ViewBase.View.GetAdornmentsThickness to get the total thickness of the view's border, margin, and padding.
-* Not assume a View can draw outside of 'Viewport'. Use the 'Margin', 'Border', and 'Padding' Adornments to do things outside of `Viewport`. View subclasses should not implement their own concept of padding or margins but leverage these `Adornments` instead. 
-* Mouse and draw events now provide coordinates relative to the `Viewport` not the `Frame`.
-
-## `View.AutoSize` has been removed. Use @Terminal.Gui.Dim.Auto for width or height instead.
-
-In v1, `View.AutoSize` was used to size a view to its `Text`. In v2, `View.AutoSize` has been removed. Use @Terminal.Gui.Dim.Auto for width or height instead.
-
-### How to Fix
-
-* Replace `View.AutoSize = true` with `View.Width = Dim.Auto` or `View.Height = Dim.Auto` as needed. See the [DimAuto Deep Dive](dimauto.md) for more information.
-
-## Adornments
-
-In v2, the `Border`, `Margin`, and `Padding` properties have been added to all views. This simplifies view development and enables a sophisticated look and feel. If you are using custom borders, margins, or padding in your application, you may need to update them to use the new properties.
-
-* `View.Border` is now of type @Terminal.Gui.Adornment. @Terminal.Gui.ViewBase.View.BorderStyle is provided as a convenience property to set the border style (`myView.BorderStyle = LineStyle.Double`).
-
-### How to Fix
-
-## Built-in Scrolling
-
-In v1, scrolling was enabled by using `ScrollView` or `ScrollBarView`. In v2, the base @Terminal.Gui.View class supports scrolling inherently. The area of a view visible to the user at a given moment was previously a rectangle called `Bounds`. `Bounds.Location` was always `Point.Empty`. In v2 the visible area is a rectangle called `Viewport` which is a protal into the Views content, which can be bigger (or smaller) than the area visible to the user. Causing a view to scroll is as simple as changing `View.Viewport.Location`. The View's content is described by @Terminal.Gui.ViewBase.View.GetContentSize. See [Layout](layout.md) for details.
-
-@Terminal.Gui.ScrollBar replaces `ScrollBarView` with a much cleaner implementation of a scrollbar. In addition, @Terminal.Gui.ViewBase.View.VerticalScrollBar and @Terminal.Gui.ViewBase.View.HorizontalScrollBar provide a simple way to enable scroll bars in any View with almost no code. See See [Scrolling Deep Dive](scrolling.md) for more.
-
-### How to Fix
-
-* Replace `ScrollView` with @Terminal.Gui.View and use `Viewport` and @Terminal.Gui.ViewBase.View.GetContentSize to control scrolling.
-* Update any code that assumed `Bounds.Location` was always `Point.Empty`.
-* Update any code that used `Bounds` to refer to the size of the view's content. Use @Terminal.Gui.ViewBase.View.GetContentSize instead.
-* Update any code that assumed `Bounds.Size` was the same as `Frame.Size`. `Frame.Size` defines the size of the view in the superview's coordinate system, while `Viewport.Size` defines the visible area of the view in its own coordinate system.
-* Replace `ScrollBarView` with @Terminal.Gui.ScrollBar. See [Scrolling Deep Dive](scrolling.md) for more.
-
-## Updated Keyboard API
-
-The API for handling keyboard input is significantly improved. See [Keyboard API](keyboard.md).
-
-* The @Terminal.Gui.Key class replaces the `KeyEvent` struct and provides a platform-independent abstraction for common keyboard operations. It is used for processing keyboard input and raising keyboard events. This class provides a high-level abstraction with helper methods and properties for common keyboard operations. Use this class instead of the low-level @Terminal.Gui.KeyCode enum when possible. See @Terminal.Gui.Key for more details.
-* The preferred way to enable Application-wide or View-heirarchy-dependent keystrokes is to use the @Terminal.Gui.Shortcut View or the built-in View's that utilize it, such as the @Terminal.Gui.Bar-based views.
-* The preferred way to handle single keystrokes is to use **Key Bindings**. Key Bindings map a key press to a @Terminal.Gui.Input.Command. A view can declare which commands it supports, and provide a lambda that implements the functionality of the command, using `View.AddCommand()`. Use the @Terminal.Gui.ViewBase.View.Keybindings to configure the key bindings.
-* For better consistency and user experience, the default key for closing an app or `Toplevel` is now `Esc` (it was previously `Ctrl+Q`).
-* The `Application.RootKeyEvent` method has been replaced with `Application.KeyDown`
-
-### How to Fix
-
-* Replace `KeyEvent` with `Key`
-* Use @Terminal.Gui.ViewBase.View.AddCommand to define commands your view supports.
-* Use @Terminal.Gui.ViewBase.View.Keybindings to configure key bindings to `Command`s.
-* It should be very uncommon for v2 code to override `OnKeyPressed` etc... 
-* Anywhere `Ctrl+Q` was hard-coded as the "quit key", replace with `Application.QuitKey`.
-* See *Navigation* below for more information on v2's navigation keys.
-* Replace `Application.RootKeyEvent` with `Application.KeyDown`.  If the reason for subscribing to RootKeyEvent was to enable an application-wide action based on a key-press, consider using Application.KeyBindings instead.
-
-```diff
-- Application.RootKeyEvent(KeyEvent arg)
-+ Application.KeyDown(object? sender, Key e)
-```
-
-## @Terminal.Gui.Input.Command has been expanded and simplified
-
-In v1, the `Command` enum had duplicate entries and inconsistent naming. In v2 it has been both expanded and simplified.
-
-### How To Fix
-
-* Update any references to old `Command` values with the updated versions.
-
-## Updated Mouse API
-
-The API for mouse input is now internally consistent and easier to use.
-
-* The @Terminal.Gui.MouseEventArgs class replaces `MouseEventEventArgs`.
-* More granular APIs are provided to ease handling specific mouse actions. See [Mouse API](mouse.md).
-* Views can use the @Terminal.Gui.ViewBase.View.Highlight event to have the view be visibly highlighted on various mouse events.
-* Views can set `View.WantContinousButtonPresses = true` to have their @Terminal.Gui.Input.Command.Accept command be invoked repeatedly as the user holds a mouse button down on the view.
-* Mouse and draw events now provide coordinates relative to the `Viewport` not the `Screen`.
-* The `Application.RootMouseEvent` method has been replaced with `Application.MouseEvent`
-
-### How to Fix
-
-* Replace `MouseEventEventArgs` with `MouseEvent`
-* Use the @Terminal.Gui.ViewBase.View.Highlight event to have the view be visibly highlighted on various mouse events.
-* Set `View.WantContinousButtonPresses = true` to have the @Terminal.Gui.Input.Command.Accept command be invoked repeatedly as the user holds a mouse button down on the view.
-* Update any code that assumed mouse events provided coordinates relative to the `Screen`.
-* Replace `Application.RootMouseEvent` with `Application.MouseEvent`.  
-
-```diff
-- Application.RootMouseEvent(KeyEvent arg)
-+ Application.MouseEvent(object? sender, MouseEventArgs mouseEvent)
-```
-
-## Navigation - `Cursor`, `Focus`, `TabStop` etc... 
-
-The cursor and focus system has been redesigned in v2 to be more consistent and easier to use. If you are using custom cursor or focus logic in your application, you may need to update it to use the new system.
-
-### Cursor
-
-In v1, whether the cursor (the flashing caret) was visible or not was controlled by `View.CursorVisibility` which was an enum extracted from Ncruses/Terminfo. It only works in some cases on Linux, and only partially with `WindowsDriver`. The position of the cursor was determined by the last call to the driver's Move method. `View.PositionCursor()` could be overridden by views to cause `Application` to call the driver's positioning method on behalf of the app and to manage setting `CursorVisibility`. This API was confusing and bug-prone.
-
-In v2, the API is (NOT YET IMPLEMENTED) simplified. A view simply reports the style of cursor it wants and the Viewport-relative location:
-
-* `public Point? CursorPosition`
-    - If `null` the cursor is not visible
-    - If `{}` the cursor is visible at the `Point`.
-* `public event EventHandler<LocationChangedEventArgs>? CursorPositionChanged`
-* `public int? CursorStyle`
-	- If `null` the default cursor style is used.
-	- If `{}` specifies the style of cursor. See [cursor.md](cursor.md) for more.
-* `Application` now has APIs for querying available cursor styles.
-* The driver details are no longer directly accessible to View subclasses.	
-
-#### How to Fix (Cursor API)
-
-* Use @Terminal.Gui.ViewBase.View.CursorPosition to set the cursor position in a view. Set @Terminal.Gui.ViewBase.View.CursorPosition to `null` to hide the cursor.
-* Set @Terminal.Gui.ViewBase.View.CursorVisibility to the cursor style you want to use.
-* Remove any overrides of `OnEnter` and `OnLeave` that explicitly change the cursor.
-
-### Driver Access
-
-In v1, Views could access `Driver` directly (e.g., `Driver.Move()`, `Driver.Rows`, `Driver.Cols`). In v2, `Driver` is internal and View subclasses should not access it directly. ViewBase provides all necessary abstractions for Views to function without needing direct driver access.
-
-#### How to Fix (Driver Access)
-
-* Replace `Driver.Rows` and `Driver.Cols` with @Terminal.Gui.App.Application.Screen.Height and @Terminal.Gui.App.Application.Screen.Width
-* Replace direct `Driver.Move(screenX, screenY)` calls with @Terminal.Gui.ViewBase.View.Move using viewport-relative coordinates
-* Use @Terminal.Gui.ViewBase.View.AddRune and @Terminal.Gui.ViewBase.View.AddStr for drawing
-* ViewBase infrastructure classes (in `Terminal.Gui/ViewBase/`) can still access Driver for framework implementation needs
-
-```diff
-- if (x >= Driver.Cols) return;
-+ if (x >= Application.Screen.Width) return;
-
-- Point screenPos = ViewportToScreen(new Point(col, row));
-- Driver.Move(screenPos.X, screenPos.Y);
-+ Move(col, row);  // Move handles viewport-to-screen conversion
-```
-
-### Focus
-
-See [navigation.md](navigation.md) for more details.
-See also [Keyboard](keyboard.md) where HotKey is covered more deeply...
-
-* In v1, `View.CanFocus` was `true` by default. In v2, it is `false`. Any `View` subclass that wants to be focusable must set `CanFocus = true`.
-* In v1 it was not possible to remove focus from a view. `HasFocus` as a get-only property. In v2, `view.HasFocus` can be set as well. Setting to `true` is equivalent to calling `view.SetFocus`. Setting to `false` is equivalent to calling `view.SuperView.AdvanceFocus` (which might not actually cause `view` to stop having focus). 
-* In v1, calling `super.Add (view)` where `view.CanFocus == true` caused all views up the hierarchy (all SuperViews) to get `CanFocus` set to `true` as well. In v2, developers need to explicitly set `CanFocus` for any view in the view-hierarchy where focus is desired. This simplifies the implementation and removes confusing automatic behavior. 
-* In v1, if `view.CanFocus == true`, `Add` would automatically set `TabStop`. In v2, the automatic setting of `TabStop` in `Add` is retained because it is not overly complex to do so and is a nice convenience for developers to not have to set both `Tabstop` and `CanFocus`. Note v2 does NOT automatically change `CanFocus` if `TabStop` is changed.
-* `view.TabStop` now describes the behavior of a view in the focus chain. the `TabBehavior` enum includes `NoStop` (the view may be focusable, but not via next/prev keyboard nav), `TabStop` (the view may be focusable, and `NextTabStop`/`PrevTabStop` keyboard nav will stop), `TabGroup` (the view may be focusable, and `NextTabGroup`/`PrevTabGroup` keyboard nav will stop). 
-* In v1, the `View.Focused` property was a cache of which view in `SubViews/TabIndexes` had `HasFocus == true`. There was a lot of logic for keeping this property in sync. In v2, `View.Focused` is a get-only, computed property. 
-* In v1, the `View.MostFocused` property recursed down the subview-hierarchy on each get. In addition, because only one View in an application can be the "most focused", it doesn't make sense for this property to be on every View. In v2, this API is removed. Use `Application.Navigation.GetFocused()` instead.
-* The v1 APIs `View.EnsureFocus`/`FocusNext`/`FocusPrev`/`FocusFirst`/`FocusLast` are replaced in v2 with these APIs that accomplish the same thing, more simply.
-  - `public bool AdvanceFocus (NavigationDirection direction, TabBehavior? behavior)`  
-  - `public bool FocusDeepest (NavigationDirection direction, TabBehavior? behavior)` 
-* In v1, the `View.OnEnter/Enter` and `View.OnLeave/Leave` virtual methods/events could be used to notify that a view had gained or lost focus, but had confusing semantics around what it mean to override (requiring calling `base`) and bug-ridden behavior on what the return values signified. The "Enter" and "Leave" terminology was confusing. In v2, `View.OnHasFocusChanging/HasFocusChanging` and `View.OnHasFocusChanged/HasFocusChanged` replace `View.OnEnter/Enter` and `View.OnLeave/Leave`. These virtual methods/events follow standard Terminal.Gui event patterns. The `View.OnHasFocusChanging/HasFocusChanging` event supports being cancelled.
-* In v1, the concept of `Mdi` views included a large amount of complex code (in `Toplevel` and `Application`) for dealing with navigation across overlapped Views. This has all been radically simplified in v2. Any View can work in an "overlapped" or "tiled" way. See [navigation.md](navigation.md) for more details.
-* The `View.TabIndex` and `View.TabIndexes` have been removed. Change the order of the views in `View.SubViews` to change the navigation order (using, for example `View.MoveSubViewTowardsStart()`).
-
-### How to Fix (Focus API)
-
-* Set @Terminal.Gui.ViewBase.View.CanFocus to `true` for any View sub-class that wants to be focusable.
-* Use @Terminal.Gui.App.Application.Navigation.GetFocused to get the most focused view in the application.
-* Use @Terminal.Gui.App.Application.Navigation.AdvanceFocus to cause focus to change.
-
-### Keyboard Navigation
-
-In v2, `HotKey`s can be used to navigate across the entire application view-hierarchy. They work independently of `Focus`. This enables a user to navigate across a complex UI of nested subviews if needed (even in overlapped scenarios). An example use-case is the `AllViewsTester` scenario.
-
-In v2, unlike v1, multiple Views in an application (even within the same SuperView) can have the same `HotKey`. Each press of the `HotKey` will invoke the next `HotKey` across the View hierarchy (NOT IMPLEMENTED YET)*
-
-In v1, the keys used for navigation were both hard-coded and configurable, but in an inconsistent way. `Tab` and `Shift+Tab` worked consistently for navigating between SubViews, but were not configurable. `Ctrl+Tab` and `Ctrl+Shift+Tab` navigated across `Overlapped` views and had configurable "alternate" versions (`Ctrl+PageDown` and `Ctrl+PageUp`).
-
-In v2, this is made consistent and configurable:
-
-- `Application.NextTabStopKey` (`Key.Tab`) - Navigates to the next subview that is a `TabStop` (see below). If there is no next, the first subview that is a `TabStop` will gain focus.
-- `Application.PrevTabStopKey` (`Key.Tab.WithShift`) - Opposite of `Application.NextTabStopKey`.
-- `Key.CursorRight` - Operates identically to `Application.NextTabStopKey`.
-- `Key.CursorDown` - Operates identically to `Application.NextTabStopKey`.
-- `Key.CursorLeft` - Operates identically to `Application.PrevTabStopKey`.
-- `Key.CursorUp` - Operates identically to `Application.PrevTabStopKey`.
-- `Application.NextTabGroupKey` (`Key.F6`) - Navigates to the next view in the view-hierarchy that is a `TabGroup` (see below). If there is no next, the first view which is a `TabGroup` will gain focus.
-- `Application.PrevTabGroupKey` (`Key.F6.WithShift`) - Opposite of `Application.NextTabGroupKey`.
-
-`F6` was chosen to match [Windows](https://learn.microsoft.com/en-us/windows/apps/design/input/keyboard-accelerators#common-keyboard-accelerators)
-
-These keys are all registered as `KeyBindingScope.Application` key bindings by `Application`. Because application-scoped key bindings have the lowest priority, Views can override the behaviors of these keys (e.g. `TextView` overrides `Key.Tab` by default, enabling the user to enter `\t` into text). The `AllViews_AtLeastOneNavKey_Leaves` unit test ensures all built-in Views have at least one of the above keys that can advance. 
-
-### How to Fix (Keyboard Navigation)
-
-...
-
-## Button.Clicked Event Renamed
-
-The `Button.Clicked` event has been renamed `Button.Accepting`
-
-## How to Fix
-
-Rename all instances of `Button.Clicked` to `Button.Accepting`.  Note the signature change to mouse events below.
-
-```diff
-- btnLogin.Clicked 
-+ btnLogin.Accepting
-```
-
-Alternatively, if you want to have key events as well as mouse events to fire an event, use `Button.Accepting`.
-
-## Events now use `object sender, EventArgs args` signature
-
-Previously events in Terminal.Gui used a mixture of `Action` (no arguments), `Action<string>` (or other raw datatype) and `Action<EventArgs>`. Now all events use the `EventHandler<EventArgs>` [standard .net design pattern](https://learn.microsoft.com/en-us/dotnet/csharp/event-pattern#event-delegate-signatures).
-
-For example, `event Action<long> TimeoutAdded` has become `event EventHandler<TimeoutEventArgs> TimeoutAdded`
-
-This change was made for the following reasons:
-
-- Event parameters are now individually named and documented (with xmldoc)
-- Future additions to event parameters can be made without being breaking changes (i.e. adding new properties to the EventArgs class)
-
-For example:
-
-```csharp
-
-public class TimeoutEventArgs : EventArgs {
-
-	/// <summary>
-	/// Gets the <see cref="DateTime.Ticks"/> in UTC time when the 
-	/// <see cref="Timeout"/> will next execute after.
-	/// </summary>
-	public long Ticks { get; }
-
-[...]
-}
-```
-
-## How To Fix
-If you previously had a lambda expression, you can simply add the extra arguments:
-
-```diff
-- btnLogin.Clicked += () => { /*do something*/ };
-+ btnLogin.Accepting += (s,e) => { /*do something*/ };
-```
-Note that the event name has also changed as noted above.
-
-If you have used a named method instead of a lamda you will need to update the signature e.g.
-
-```diff
-- private void MyButton_Clicked ()
-+ private void MyButton_Clicked (object sender, EventArgs e)
-```
-
-## `ReDraw` is now `Draw`
-
-### How to Fix
-
-* Replace `ReDraw` with `Draw`
-* Mouse and draw events now provide coordinates relative to the `Viewport` not the `Frame`.
-
-## No more nested classes
-
-All public classes that were previously [nested classes](https://learn.microsoft.com/en-us/dotnet/csharp/programming-guide/classes-and-structs/nested-types) are now in the root namespace as their own classes.
-
-### How To Fix
-Replace references to nested types with the new standalone version
-
-```diff
-- var myTab = new TabView.Tab();
-+ var myTab = new Tab();
-```
-
-## View and Text Alignment Changes
-
-In v1, both `TextAlignment` and `VerticalTextAlignment` enums were used to align text in views. In v2, these enums have been replaced with the @Terminal.Gui.Alignment enum. The @Terminal.Gui.ViewBase.View.TextAlignment property controls horizontal text alignment and the @Terminal.Gui.ViewBase.View.VerticalTextAlignment property controls vertical text alignment.
-
-v2 now supports @Terminal.Gui.Pos.Align which enables views to be easily aligned within their Superview. 
-
-The @Terminal.Gui.Aligner class makes it easy to align elements (text, Views, etc...) within a container. 
-
-### How to Fix
-
-* Replace `VerticalAlignment.Middle` is now @Terminal.Gui.Alignment.Center. 
-
-## `StatusBar`- `StatusItem` is replaced by `Shortcut`
-
-@Terminal.Gui.StatusBar has been upgraded to utilize @Terminal.Gui.Shortcut.
-
-### How to Fix
-
-```diff
--  var statusBar = new StatusBar (
--                                       new StatusItem []
--                                       {
--                                           new (
--                                                Application.QuitKey,
--                                                $"{Application.QuitKey} to Quit",
--                                                () => Quit ()
--                                               )
--                                       }
--                                      );
-+ var statusBar = new StatusBar (new Shortcut [] { new (Application.QuitKey, "Quit", Quit) });
-```
-
-## `CheckBox` - API renamed and simplified
-
-In v1 `CheckBox` used `bool?` to represent the 3 states. To support consistent behavior for the `Accept` event, `CheckBox` was refactored to use the new `CheckState` enum instead of `bool?`.
-
-Additionally, the `Toggle` event was renamed `CheckStateChanging` and made cancelable. The `Toggle` method was renamed to `AdvanceCheckState`.
-
-### How to Fix
-
-```diff
--var cb = new CheckBox ("_Checkbox", true); {
--				X = Pos.Right (label) + 1,
--				Y = Pos.Top (label) + 2
--			};
--			cb.Toggled += (e) => {
--			};
--           cb.Toggle ();
-+
-+var cb = new CheckBox ()
-+{ 
-+	Title = "_Checkbox",
-+	CheckState = CheckState.Checked
-+}
-+cb.CheckStateChanging += (s, e) =>
-+{	
-+	e.Cancel = preventChange;
-+}
-+preventChange = false;
-+cb.AdvanceCheckState ();
-```
-
-## `MainLoop` has been removed from `Application`
-
-In v1, you could add timeouts via `Application.MainLoop.AddTimeout` and access the `MainLoop` object directly. In v2, the legacy `MainLoop` class has been completely removed as part of the architectural modernization. Timeout functionality and other features previously accessed via `MainLoop` are now available directly through `Application` or `ApplicationImpl`.
-
-### How to Fix
-
-Replace any `Application.MainLoop` references:
-
-```diff
-- Application.MainLoop.AddTimeout (TimeSpan time, Func<MainLoop, bool> callback)
-+ Application.AddTimeout (TimeSpan time, Func<bool> callback)
-```
-
-```diff
-- Application.MainLoop.Wakeup ()
-+ // No replacement needed - wakeup is handled automatically by the modern architecture
-```
-
-**Note**: The legacy `MainLoop` infrastructure (including `IMainLoopDriver` and `FakeMainLoop`) has been removed. The modern v2 architecture uses `ApplicationImpl`, `MainLoopCoordinator`, and `ApplicationMainLoop` instead.
-
-## `SendSubViewXXX` renamed and corrected
-
-In v1, the `View` methods to move SubViews within the SubViews list were poorly named and actually operated in reverse of what their names suggested.
-
-In v2, these methods have been named correctly.
-
-- `SendSubViewToBack` -> `MoveSubViewToStart` - Moves the specified subview to the start of the list.
-- `SendSubViewBackward` -> `MoveSubViewTowardsStart` - Moves the specified subview one position towards the start of the list.
-- `SendSubViewToFront` -> `MoveSubViewToEnd` - Moves the specified subview to the end of the list.
-- `SendSubViewForward` -> `MoveSubViewTowardsEnd` - Moves the specified subview one position towards the end of the list.
-
-## `Mdi` Replaced by `ViewArrangement.Overlapped`
-
-In v1, it apps with multiple overlapping views could be created using a set of APIs spread across `Application` (e.g. `Application.MdiTop`) and `Toplevel` (e.g. `IsMdiContainer`). This functionality has been replaced in v2 with @Terminal.Gui.ViewBase.View.Arrangement. Specifically, overlapped views with @Terminal.Gui.ViewBase.View.Arrangement having the @Terminal.Gui.ViewBase.ViewArrangement.Overlapped flag set will be arranged in an overlapped fashion using the order in their SuperView's subview list as the Z-order. 
-
-Setting the @Terminal.Gui.ViewBase.ViewArrangement.Movable flag will enable the overlapped views to be movable with the mouse or keyboard (`Ctrl+F5` to activate).
-
-Setting the @Terminal.Gui.ViewBase.ViewArrangement.Sizable flag will enable the overlapped views to be resized with the mouse or keyboard (`Ctrl+F5` to activate).
-
-In v1, only Views derived from `Toplevel` could be overlapped. In v2, any view can be.
-
-v1 conflated the concepts of 
-
-## `PopoverMenu` replaced by `PopoverMenu`
-
-`PopoverMenu` replaces `ContrextMenu`. 
-
-## `MenuItem` is now based on `Shortcut`
-
-
-```diff
-new (
-      Strings.charMapCopyGlyph,
-      "",
-      CopyGlyph,
--      null,
--      null,
-      (KeyCode)Key.G.WithCtrl
-     ),
-```	
-
-## Others...
-
-* `View` and all subclasses support `IDisposable` and must be disposed (by calling `view.Dispose ()`) by whatever code owns the instance when the instance is longer needed. 
-
-* To simplify programming, any `View` added as a SubView another `View` will have it's lifecycle owned by the Superview; when a `View` is disposed, it will call `Dispose` on all the items in the `SubViews` property. Note this behavior is the same as it was in v1, just clarified.
-
-* In v1, `Application.End` called `Dispose ()` on @Terminal.Gui.App.Application.TopRunnable (via `Runstate.Toplevel`). This was incorrect as it meant that after `Application.Run` returned, `Application.TopRunnable` had been disposed, and any code that wanted to interrogate the results of `Run` by accessing `Application.TopRunnable` only worked by accident. This is because GC had not actually happened; if it had the application would have crashed. In v2 `Application.End` does NOT call `Dispose`, and it is the caller to `Application.Run` who is responsible for disposing the `Toplevel` that was either passed to `Application.Run (View)` or created by `Application.Run<T> ()`.
-
-* Any code that creates a `Toplevel`, either by using `top = new()` or by calling either `top = Application.Run ()` or `top = ApplicationRun<T>()` must call `top.Dispose` when complete. The exception to this is if `top` is passed to `myView.Add(top)` making it a subview of `myView`. This is because the semantics of `Add` are that the `myView` takes over responsibility for the subviews lifetimes. Of course, if someone calls `myView.Remove(top)` to remove said subview, they then re-take responsbility for `top`'s lifetime and they must call `top.Dispose`.