Fixes concurrency issues with `Application.Toplevels` (#4106)

* touching publish.yml

* Fixes #4000. Named colors as enums. (#4005)

* Add W3C color enum with the RGB as numeric value

* Add transform helper class for W3cColor enum

For the sake of backwards compatibility prioritize parsing 16 color mode color names over the W3C colors because the previous resource-based color names/values had a mix of W3C and 16 color mode RGB values.

Mechanism for choosing/prioritizing one color scheme over the other is currently only available at higher application/driver/output level.

* IColorNameResolver enable null analysis

* Remove obsolete color name related ResourceManagerTests

* Replace remains of W3CColors with direct W3C color name resolver

Temporarily breaks backwards compatibility and tests even further.

* Add ANSI 4-bit (ColorName16) color name resolver

* Add multi-standard color name resolver

Combined resolver for both ANSI 4-bit (ColorName16) and W3C colors while trying to maintain backwards compatibility for ColorPicker.

* Split conditional name resolver test cases

* Change W3C colors tests to be similar to name resolvers

* Change W3cColorsTests to W3cColorNameResolverTests

More consistent when all the tests refer to the color name resolver layer.

* Make W3cColors internal

Color name resolver is the public interface.

* W3cColors: Use Color.Argb instead of individual RGB components

* MultiStandardColorNameResolver: Substitute instead of blocking alternative W3C names

Changes color picker behavior a bit, e.g. Aqua will match to Cyan instead of jumping to Aquamarine.

* Remove leftover color string resources

* Consistent position for IColorNameResolver #nullable enable directive

* Add missing XML comments to ColorScheme.Colors.cs

* Fixes #3691 - Adds `ViewArrangement.Popover` (#3852)

* Added Applicaton.Popover.
Refactored FindDeepestView

* Popover prototype

* Testing highlight

* Fixed click outside issue

* Fixed DialogTests

* Fixed click outside issue (agbain)

* Enabled mouse wheel in Bar

* Enabled mouse wheel in Bar

* Progress. Broke arrangement

* Added popover tests.
Fixed a bunch more CM issues related ot unreliable unit tests.
Updated config.json to include Glyphs.

* Can't set ForceDriver to empty in Resources/config.json.

* added BUGBUG

* Made Position/ScreenPosition clear

* Added View.IsInHierarchy tests

* Added Contextmenuv2 scenario.

* Implemented CM2 in TextView

* Removed unneeded CM stuff from testhelpers

* Shortcut API docs

* Fixed keybinding unit tests

* Fixed mouse handling

* Fighting with CM related unit test failures

* Unit tests pass. I think.

* Shortcut code cleanup

* TextView uses new CM2

* Starting on OnSelect etc...

* Starting on OnSelect etc...

* Fixed ContextMenuv2

* ContextMenu is working again.

* Ugh. ANd fixed button api docs

* Fixed DrawHorizontalShadowTransparent (vertical was already fixed).

* Made Scenarios compatible with #nullable enable

* Undid some keybinding stuff

* Fixed stuff

* Sped up unit tests

* Sped up unit tests 2

* Sped up unit tests 3

* Messing with menus

* merged latest v2_develop

* Added more Popover unit tests

* Added more Popover unit tests2

* Fixed positioning bug

* Fixed mouse bug

* Fixed Bar draw issue

* WIP

* merge v2_develop

* CM2 sorta works

* Enabled Bar subclasses to have IDesignable

* Added ViewportSettings.Transparent

* Region -> nullable enable

* Added ViewportSettigs Editor

* merged v2_develop part 2

* merged v2_develop part 3

* WIP: GetViewsUnderMouse

* WIP: More GetViewsUnderMouse work

* Bars works again

* Added unit tests

* CM now works

* MenuItemv2 POC

* SubMenu POC

* CommandNotBound

* More POC

* Optimize Margin to not defer draw if there's no shadow

* Logger cleanup

* Reverted Generic

* Cascading mostly working

* fixed layout bug

* API docs

* API docs

* Fixed cascade

* Events basically work

* code cleanup

* Fixed IsDefault bug;

* Enabled hotkey support

* Made context-menu-like

* Improved usability

* Refactored ApplicationPopover again

* Cleanup

* Menuv2 POC basically complete

* Code Cleanup

* Made menu API simpler

* Fixed Strings bugs

* Got old ContextMenu scenario mostly working

* ContextMenu scenario now works

* ContextMenu fixes

* ContextMenu fixes

* Tons of menu cleanup

* ContextMenu works in TextView

* Fixed unit tes

* Added unit tests

* Fixed tests

* code cleanup

* More code cleanup

* Deep dive

* scenario

* typos

* Demo colorpicker in a Menu

* Added Region tests proving Region is broken in some Union cases

* fixed v2win/net

* Partially Fixes #2975 - Replaces old `ContextMenu` with new `Bar/Shortcut` based implementation (#4008)

* touching publish.yml

* Nuked ContextMenuv2 - use PopverMenu instead

* WIP context menu stuff

* More robust dispose

* Removed ConextMenu; use PopoverMenu instead

* Code cleanup

* Code cleanup2

* Partially Fixes #2975 - Upgrades UICatalog to `Menuv2` (#4011)

* Fixes #4009 - fix tree ordering (#4015)

* Fixes #4022 file dialog tests and bugfix for cancellation (#4024)

* Add class for detecting information about console in extensible way

* WIP - Create test for reordering

* Change Dictionary to List and preserve TreeBuilder order

* Add test to ensure branch expansion/status remains consistent despite reorder

* Cleanup code

* Fix regression when removed child was the selected one

* Revert "Add class for detecting information about console in extensible way"

This reverts commit 7e4253cf28428ea80a4773b137d4bd89cf321746.

* Code cleanup and enable nullable on Branch

* Remove color scheme and driver from Branch draw

* Add xunit context extensions

* Investigate codegen for xunit

* Getting closer to something that works

* Fix code generation

* Further explore code gen

* Generate all methods in single class for easier extensibility

* Simplify code gen by moving parameter creation to its own method

* Implement asserts A-I

* Add remaining assert calls that are not obsolete

* Fix unit test

* Roll back versions to be compatible with CI version of csharp

* Handle params and ref etc

* Fix null warning

* WIP - start to add integration tests for FileDialog

* Add ability to tab focus to specific control with simple one line delegate

* Clarify test criteria

* Add unit tests for Ok and other ways of canceling dialog

* Fix other buttons also triggering save

* Fix for linux environment tests

* Fix for linux again

* Fix application null race condition - add better way of knowing if stuff is finished

* Better fix for shutdown detection

* Add test that shows #4026 is not an issue

* Switch to `_fileSystem.Directory.GetLogicalDrives ()`

* Don't show duplicate MyDocuments etc

* Partial on #2975 - Replaces Menu v1 in many places with v2 (#4040)

* touching publish.yml

* Fixed UICatalog bugs. Added fluent tests.

* marked v1 menu stuff as obsolte

* Tweaks.
Added View.GetSubMenus<type>().

* fixed unit tests

* general messing around

* general messing around

* Playing with Fluent

* ColorScheme tweaks

* WIP: ColorScheme tweaks

* Playing with Fluent

* Merged from laptop2

* Hacky-ish fixes to:
- #4016
- #4014

* Fixed Region bug preventing menus without borders from working

* Tweaks

* Fixed a bunch of CM issues

* Fixed OoptionSelector

* ip

* FixedCM issues

* Fixed CM issues2

* Revert "FixedCM issues"

This reverts commit dd6c6a70a3d16a6a13b572b80f9a41c8a721ed1c.

* Reverted stuff

* Found and fixed bug in AllViews_Center_Properly

* Fixed CM issues2

* removed menuv2 onapplied.
Changed how UICatalog Applys CM

* changed test time out to see if it helkps with ubuntu fails

* reset app on fail?

* back to 1500ms

* Made StatusBar nullable.

* Code Cleanup.

* HexEditor Code Cleanup.

* HexEditor Code Cleanup.

* Back to 3000ms. Sigh.

* Trying different logic

* Trying different logic2

* Fixed potential crash in runlop

* Fixed potential crash in runlop2

* Tweaked Spinner stuff

* Removed TabView from TextEffects scenario. Not needed and possible culprit.

* back to 2000ms

* WIP: Revamping menu scenarios

* Menu Scenario refinements.
Fixed a few bugs.
Code cleanup.

* fixed unit test

* Fixed warnings

* Fixed warnings2

* Fixed File.Exit

* WIP: Dealing with QuitKey struggles

* WIP: Dealing with QuitKey struggles 2

* WIP: Dealing with QuitKey struggles 3

* Fixed ListView collection nav bug

* Fixed a bunch of menu stuff.
Fixed Appv2 stuff.

* Lots of refactoring and fixing

* Lots of unit test issues

* Fixed DebugIDisposable issues

* Fixed release build issue

* Fixed release build issue 2

* DebugIDisposable -> EnableDebugIDisposableAsserts and more

* DebugIDisposable -> EnableDebugIDisposableAsserts and more 2

* Fixed Menus scenario - context menu

* Added @bdisp suggested assert. Commented it out as it breaks tests.

* Code cleanup

* Fixed disposed but

* Fixed UICatalog exit

* Fixed Unit test I broke.
Added 'Minimal' Theme that turns off all borders etc...

* Fixes #3966. TextField crashes app when pasting unicode surrogate pair (#3982)

* Add constructor Key(int) and operator for handled with non-Bmp.

* Fix TextField non-BMP issues

* Fix TextField PositionCursor.

* Reformat

* Add IsValidInput method to handle clipboard paste when pressing CTRL+V in WT

* Add handle IsValidInput in FakeDriver and unit tests

* Fixes #3984 - `Margin` w/out shadow should not force draw (#3985)

* shortcut tests

* Generic demos

* Optimize Margin to not defer draw if there's no shadow

* Fixes #4041. WSLClipboard doesn't handles well with surrogate pairs

* Avoid running Clipboard.Contents twice

* Fixes #4042. Microsoft.VisualStudio.TestPlatform.ObjectModel.TestPlatformException: Could not find testhost

* Moving tests to the parallelizable unit tests

* Remove unused folder

* Prevent warnings about not installed nuget packages

* Using Toplevel instead of Application.Top

* Cleanup code

---------

Co-authored-by: Tig <[email protected]>

* Goblin fighter (#4037)

* touching publish.yml

* WIP Investigate how to build random maze

* Fix maze rendering

* Use line canvas for rendering

* Move around the maze

* Code cleanup

* Infinite maze

* Fight goblins

* Generate new npcs on new maps

* Code cleanup

* Make it possible to die

* Fix variable naming

* Refactored Mazing to use Commmands and KeyBindings.
Code cleanup of Mazing.
Refactored Snake to use KeyBindings/Commmands + some code cleanup

* Fix bug where your health would regenerate when reaching end making it impossible to loose.

---------

Co-authored-by: Tig <[email protected]>

* Fixes #4046 - Moves examples into `./Examples` and fixes `./Tests` (#4047)

* touching publish.yml

* Moved Examples into ./Examples

* Moved Benchmarks into ./Tests

* Moved Benchmarks into ./Tests

* Moved UICatalog into ./Examples

* Moved UICatalog into ./Examples 2

* Moved tests into ./Tests

* Updated nuget

* Fixes #4027. Add collection search matcher (#4029)

* Add collection search matcher

* Fix naming

* fix naming

* Move FileDialogCollectionNavigator to its own file (no longer private class)
Add class diagram for collectionNavigation

* Add ICollectionNavigator interface

* Move to separate file IListCollectionNavigator

* Update class diagram

* update class diagram

* Add tests for overriding ICollectionNavigatorMatcher

* xmldoc and nullability warning fixes

* Code Cleanup

* Make requested changes to naming and terminology

* Move to seperate namespace

* Update class diagram and change TreeView to reference the interface not concrete class

* Switch to implicit new

* highlight that this class also works with tree view

* Apply tig patch to ensure keybindings get priority over navigator

See: https://github.com/gui-cs/Terminal.Gui/issues/4027#issuecomment-2810020893

* Apply 'keybinding has priority' fix to TreeView too

* Apply 'keybindngs priority over navigation' fix to TableView

* Remove entire branch for selectively returning false now that it is default when there is a keybinding collision

* Make classes internal and remove 'custom' navigator that was configured in UICatlaogToplevel

* Change logging in collection navigator from Trace to Debug

* Switch to NewKeyDownEvent and directly setting HasFocus

* Remove application top dependency

* Remove references to application

* Remove Application

* Move new tests to parallel

---------

Co-authored-by: Tig <[email protected]>

* Fixes #4051 - Adds `cancellable_work_pattern.md` (#4052)

* touching publish.yml

* Updated md files

* Updated md files 2

* Updated md files 3

* Updated API docs to point

* commmand->command

* Update Terminal.Gui/View/View.Command.cs

Co-authored-by: Copilot <[email protected]>

---------

Co-authored-by: Copilot <[email protected]>

* Update getting-started.md (#4063)

* Fixes #4035 - FileDialog keeps path when selecting folder (optionally) (#4065)

* WIP keep path

* Make new 'sticky filename' behaviour optional

* Tests for new behaviour when selecting in TreeView

* Add more tests, this time for table view navigation

* Add the new style option into UICatalog scenario

* Allow hotkey specifier to be at any position in label (#4067)

Allow hotkey specifier to be at any position in label

"D_irectory" doesn't work because hotPos is hardcoded 0

* Fixes #4053. v2 WindowsDriver and v2win doesn't show any scenario in the UICatalog with cmd or conhost (#4055)

* Fix WindowsDriver to work with non-WindowsTerminal

* Fix unit test failure

* Fix v2win to work with non-WindowsTerminal

* Force16Colors isn't being setting in v2win driver on changing.

---------

Co-authored-by: Tig <[email protected]>

* Fixes #4023 - Changes `CommandEventArgs` to be based on `HandledEventArgs` instead of `CancelEventArgs` (#4054)

* touching publish.yml

* CancelEventArgs->HandledEventArgs

* Fixed Handled issues

* Fixes #4076 cursor text field (#4077)

* Add test for TextField cursor position

* Add comment and one more assert

* Fix cursor position at the end

* Remove unused local field

---------

Co-authored-by: BDisp <[email protected]>

* Fixes #4074 - Popover eats `Key.Space` (#4075)

* touching publish.yml

* Added unit tests.
Fixed

* Actually fixed bug.

* Addres Bdisp feedback

* Addres Bdisp feedback2

* Addresses #4058. Basic support for non-color text styles. (#4071)

* TextStyle enum

* CSI_AppendTextStyleChange

* Add TextStyle to Attribute

* Apply text style in NetOutput.Write()

* Don't append escape code if nothing to change

* Make TextStyle an init property

* Apply TextStyle to OutputBuffer attributes

* Fix flag checking

Misunderstood how Enum.HasFlag worked, fixed now

* Allow bold-faint text

Also adds remarks to TextStyle noting that they may be incompatible depending on terminal settings.

* Remove unnecessary check

Realized it's actually impossible for no escape codes to be added, as this is only the case when prev and next are the same, which is already accounted for.

* Remove redundant check

Attributes are records, and thus already use equality-by-value, meaning attr != redrawAttr will already be false when the TextStyle changes.

* WindowsOutput support for text style

---------

Co-authored-by: Tig <[email protected]>

* More on #4058 - Adds `TextStyle` Scenario (#4079)

* Fixed Generic.cs.
Added TextStyles Scenario.

* Code cleanup

* Fixes #4070 - `GetContentSize()` api docs (#4081)

* touching publish.yml

* Fixed api docs

* Fixes #4070 - `GetContentSize()` API docs -2nd try (#4082)

* Fixed api docs again

* Fixes 4088 mouse released flag cannot be combined safely with report position (#4091)

* added more mouse under tests

* Fixes #4057 - MASSIVE! Fully implements `ColorScheme`->`Scheme` + `VisualRole` + `Colors.`->`SchemeManager.`  (#4062)

* touching publish.yml

* ColorScheme->Scheme

* ColorScheme->Scheme 2

* Prototype of GetAttributeForRole

* Badly broke CM

* Further Badly broke CM

* Refactored CM big-time. View still broken

* All unit test pass again. Tons added. CM is still WIP, but Schemes is not mostly refactored and working.

* Actually:
All unit test pass again.
Tons added.
CM is still WIP, but Schemes is not mostly refactored and working.

* Bug fixes.
DeepMemberWiseClone cleanup

* Further cleanup of Scope<T>, ConfigProperty, etc.

* Made ConfigManager thread safe.

* WIP: Broken

* WIP: new deep clone impl

* WIP: new deep clone impl is done. Now fixing CM

* WIP:
- config.md
- Working on AOT clean up
- Core CM is broken; but known.

* WIP

* Merged.
Removed CM from Application.Init

* WIP

* More WIP; Less broke

* All CM unit tests pass... Not sure if it actually works though

* All unit tests pass... Themes are broken though in UI Cat

* CM Ready for review?

* Fixed failures due to TextStyles PR

* Working on Scheme/Attribute

* Working on Scheme/Attribute 2

* Working on Scheme/Attribute 3

* Working on Scheme/Attribute 4

* Working on Scheme/Attribute 5

* Working on Scheme/Attribute 6

* Added test to show how awful memory usage is

* Improved schema. Updated config.json

* Nade Scope<T> concurrentdictionary and added test to prove

* Made Themes ConcrurrentDictionary. Added bunches of tests

* Code cleanup

* Code cleanup 2

* Code cleanup 3

* Tweaking Scheme

* ClearJsonErrors

* ClearJsonErrors2

* Updated Attribute API

* It all (mostly) works!

* Skip odd unit test

* Messed with Themes

* Theme tweaks

* Code reorg. New .md stuff

* Fixed Enabled. Added mock driver

* Fixed a bunch of View.Enabled related issues

* Scheme -> Get/SetScheme()

* Cleanup

* Cleanup2

* Broke something

* Fixed everything

* Made CM.Enable better

* Text Style Scenario

* Added comments

* Fixed UI Catalog Theme Changing

* Fixed more dynamic CM update stuff

* Warning cleanup

* New Default Theme

* fixed unit test

* Refactoring Scheme and Attribute to fix inheritance

* more unit tests

* ConfigProperty is not updating schemes correctly

* All unit tests pass.
Code cleanup

* All unit tests pass.
Code cleanup2

* Fixed unit tests

* Upgraded TextField and TextView

* Fixed TextView !Enabled bug

* More updates to TextView. More unit tests for SchemeManager

* Upgraded CharMap

* API docs

* Fixe HexView API

* upgrade HexView

* Fixed shortcut KeyView

* Fixed more bugs. Added new themes

* updated themes

* upgraded Border

* Fixed themes memory usage...mostly

* Fixed themes memory usage...mostly2

* Fixed themes memory usage...2

* Fixed themes memory usage...3

* Added new colors

* Fixed GetHardCodedConfig bug

* Added Themes Scenario - WIP

* Added Themes Scenario

* Tweaked Themes Scenario

* Code cleanup

* Fixed json schmea

* updated deepdives

* updated deepdives

* Tweaked Themes Scenario

* Made Schemes a concurrent dict

* Test cleanup

* Thread safe ConfigProperty tests

* trying to make things more thread safe

* more trying to make things more thread safe

* Fixing bugs in shadowview

* Fixing bugs in shadowview 2

* Refactored GetViewsUnderMouse to GetViewsUnderLocation etc...

* Fixed dupe unit tests?

* Added better description of layout and coordiantes to deep dive

* Added better description of layout and coordiantes to deep dive

* Modified tests that call v2.AddTimeout; they were returning true which means restart the timer!
This was causing mac/linux unit test failures.
I think

* Fixed auto scheme.
Broke TextView/TextField selection

* Realized Attribute.IsExplicitlySet is stupid; just use nullable

* Fixed Attribute. Simplified. MOre theme testing

* Updated themes again

* GetViewsUnderMouse to GetViewsUnderLocation broke TransparentMouse.

* Fixing mouseunder bugs

* rewriting...

* All working again.
Shadows are now slick as snot.
GetViewsUnderLocation is rewritten to actually work and be readable.
Tons more low-level unit tests.
Margin is now actually ViewportSettings.Transparent.

* Code cleanup

* Code cleanup

* Code cleanup of color apis

* Fixed Hover/Highlight

* Update Examples/UICatalog/Scenarios/AllViewsTester.cs

Co-authored-by: Copilot <[email protected]>

* Update Examples/UICatalog/Scenarios/CharacterMap/CharacterMap.cs

Co-authored-by: Copilot <[email protected]>

* Update Examples/UICatalog/Scenarios/Clipping.cs

Co-authored-by: Copilot <[email protected]>

* Fixed race condition?

* reverted

* Simplified Attribute API by removing events from SetAttributeForRole

* Removed recursion from GetViewsAtLocation

* Removed unneeded code

* Code clean up.
Fixed Scheme bug.

* reverted temporary disable

* Adjusted scheme algo

* Upgraded TextValidateField

* Fixed TextValidate bugs

* Tweaks

* Frameview rounded border by default

* API doc cleanup

* Readme fix

* Addressed tznind feeback

* Fixed more unit test issues by protecting Application statics from being set if Application.Initialized is not true

* Fixed more unit test issues by protecting Application statics from being set if Application.Initialized is not true 2

* cleanup

---------

Co-authored-by: Copilot <[email protected]>

* Removed dead code

* Fixed concurrency issues

* Fixed namespace issues

* Fixed namespace issues 2

* Fixed namespace issues 3

* Fixed concurrency issues 2

* Fixed error due to merge

---------

Co-authored-by: Tonttu <[email protected]>
Co-authored-by: Thomas Nind <[email protected]>
Co-authored-by: BDisp <[email protected]>
Co-authored-by: Copilot <[email protected]>
Co-authored-by: Brandon G <[email protected]>
Co-authored-by: M3Logic <[email protected]>
Co-authored-by: Error-String-Expected-Got-Nil <[email protected]>

Examples/UICatalog/Scenarios/VkeyPacketSimulator.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 using Terminal.Gui;
-using Terminal.Gui.ConsoleDrivers;
 
 namespace UICatalog.Scenarios;
 

Terminal.Gui/Application/Application.Run.cs

@@ -150,10 +150,10 @@ public static partial class Application // Run (Begin, Run, End, Stop)
                 }
             }
 
-            if (TopLevels.FindDuplicates (new ToplevelEqualityComparer ()).Count > 0)
-            {
-                throw new ArgumentException ("There are duplicates Toplevel IDs");
-            }
+            //if (TopLevels.FindDuplicates (new ToplevelEqualityComparer ()).Count > 0)
+            //{
+            //    throw new ArgumentException ("There are duplicates Toplevel IDs");
+            //}
         }
 
         if (Top is null)
@@ -588,25 +588,23 @@ public static partial class Application // Run (Begin, Run, End, Stop)
 
         // End the RunState.Toplevel
         // First, take it off the Toplevel Stack
-        if (TopLevels.Count > 0)
+        if (TopLevels.TryPop (out Toplevel? topOfStack))
         {
-            if (TopLevels.Peek () != runState.Toplevel)
+            if (topOfStack != runState.Toplevel)
             {
                 // If the top of the stack is not the RunState.Toplevel then
                 // this call to End is not balanced with the call to Begin that started the RunState
                 throw new ArgumentException ("End must be balanced with calls to Begin");
             }
-
-            TopLevels.Pop ();
         }
 
         // Notify that it is closing
         runState.Toplevel?.OnClosed (runState.Toplevel);
 
-        if (TopLevels.Count > 0)
+        if (TopLevels.TryPeek (out Toplevel? newTop))
         {
-            Top = TopLevels.Peek ();
-            Top.SetNeedsDraw ();
+            Top = newTop;
+            Top?.SetNeedsDraw ();
         }
 
         if (runState.Toplevel is { HasFocus: true })

Terminal.Gui/Application/Application.Toplevel.cs

@@ -1,12 +1,26 @@
 #nullable enable
+using System.Collections.Concurrent;
+
 namespace Terminal.Gui;
 
 public static partial class Application // Toplevel handling
 {
     // BUGBUG: Technically, this is not the full lst of TopLevels. There be dragons here, e.g. see how Toplevel.Id is used. What
 
+    private static readonly ConcurrentStack<Toplevel> _topLevels = new ();
+    private static readonly object _topLevelsLock = new ();
+
     /// <summary>Holds the stack of TopLevel views.</summary>
-    internal static Stack<Toplevel> TopLevels { get; } = new ();
+    internal static ConcurrentStack<Toplevel> TopLevels
+    {
+        get
+        {
+            lock (_topLevelsLock)
+            {
+                return _topLevels;
+            }
+        }
+    }
 
     /// <summary>The <see cref="Toplevel"/> that is currently active.</summary>
     /// <value>The top.</value>

Terminal.Gui/Configuration/ConfigurationManager.cs

@@ -8,7 +8,6 @@ using System.Reflection;
 using System.Text.Encodings.Web;
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using Terminal.Gui.Configuration;
 
 namespace Terminal.Gui;
 
@@ -150,7 +149,7 @@ public static class ConfigurationManager
     private static ImmutableSortedDictionary<string, ConfigProperty>? _uninitializedConfigPropertiesCache;
 
 #pragma warning disable IDE1006 // Naming Styles
-    private static readonly object __uninitializedConfigPropertiesCacheCacheLock = new ();
+    private static readonly object _uninitializedConfigPropertiesCacheCacheLock = new ();
 #pragma warning restore IDE1006 // Naming Styles
 
     /// <summary>
@@ -181,7 +180,7 @@ public static class ConfigurationManager
         ConfigProperty.Initialize ();
 
         // Cache all configuration properties
-        lock (__uninitializedConfigPropertiesCacheCacheLock)
+        lock (_uninitializedConfigPropertiesCacheCacheLock)
         {
             // _allConfigProperties: for ordered, iterable access (LINQ-friendly)
             // _frozenConfigPropertyCache: for high-speed key lookup (frozen)
@@ -777,15 +776,17 @@ public static class ConfigurationManager
             return _uninitializedConfigPropertiesCache;
         }
 
-        // Filter properties by scope using the cached ScopeType property instead of reflection
-        IEnumerable<KeyValuePair<string, ConfigProperty>>? filtered = _uninitializedConfigPropertiesCache?.Where (cp => cp.Value.ScopeType == scopeType);
-
-        Debug.Assert (filtered is { });
+        lock (_uninitializedConfigPropertiesCacheCacheLock)
+        {
+            // Filter properties by scope using the cached ScopeType property instead of reflection
+            IEnumerable<KeyValuePair<string, ConfigProperty>>? filtered = _uninitializedConfigPropertiesCache?.Where (cp => cp.Value.ScopeType == scopeType);
 
-        IEnumerable<KeyValuePair<string, ConfigProperty>> configPropertiesByScope = filtered as KeyValuePair<string, ConfigProperty> [] ?? filtered.ToArray ();
-        Debug.Assert (configPropertiesByScope.All (v => !v.Value.HasValue));
+            Debug.Assert (filtered is { });
 
-        return configPropertiesByScope;
+            IEnumerable<KeyValuePair<string, ConfigProperty>> configPropertiesByScope = filtered as KeyValuePair<string, ConfigProperty> [] ?? filtered.ToArray ();
+            Debug.Assert (configPropertiesByScope.All (v => !v.Value.HasValue));
+            return configPropertiesByScope;
+        }
     }
 
     /// <summary>

Terminal.Gui/Configuration/DeepCloner.cs

@@ -285,21 +285,32 @@ public static class DeepCloner
         IDictionary tempDict = CreateDictionaryInstance (dictType, comparer);
         visited.TryAdd (source, tempDict);
 
-        // Clone all key-value pairs
-        foreach (object? key in sourceDict.Keys)
-        {
-            object? clonedKey = DeepCloneInternal (key, visited);
-            object? clonedValue = DeepCloneInternal (sourceDict [key], visited);
 
-            if (tempDict.Contains (clonedKey!))
-            {
-                tempDict [clonedKey!] = clonedValue;
-            }
-            else
+        object? lastKey = null;
+        try
+        {
+            // Clone all key-value pairs
+            foreach (object? key in sourceDict.Keys)
             {
-                tempDict.Add (clonedKey!, clonedValue);
+                lastKey = key;
+                object? clonedKey = DeepCloneInternal (key, visited);
+                object? clonedValue = DeepCloneInternal (sourceDict [key], visited);
+
+                if (tempDict.Contains (clonedKey!))
+                {
+                    tempDict [clonedKey!] = clonedValue;
+                }
+                else
+                {
+                    tempDict.Add (clonedKey!, clonedValue);
+                }
             }
         }
+        catch (InvalidOperationException ex)
+        {
+            // Handle cases where the dictionary is modified during enumeration
+            throw new InvalidOperationException ($"Error cloning dictionary ({source}) (last key was \"{lastKey}\"). Ensure the source dictionary is not modified during cloning.", ex);
+        }
 
         // If the original dictionary type has a parameterless constructor, create a new instance
         if (type.GetConstructor (Type.EmptyTypes) != null)

Terminal.Gui/Configuration/SourcesManager.cs

@@ -4,7 +4,7 @@ using System.Diagnostics.CodeAnalysis;
 using System.Reflection;
 using System.Text.Json;
 
-namespace Terminal.Gui.Configuration;
+namespace Terminal.Gui;
 
 /// <summary>
 ///    Manages the <see cref="ConfigurationManager"/> Sources and provides the API for loading them. Source is a location where a configuration can be stored. Sources are defined in <see cref="ConfigLocations"/>.

Terminal.Gui/Configuration/ThemeManager.cs

@@ -101,6 +101,10 @@ public static class ThemeManager
     /// <returns></returns>
     public static string GetCurrentThemeName () { return Theme!; }
 
+    // TODO: Add a lock around Theme and Themes
+    // TODO: For now, this test can't run in parallel with other tests that access Theme or Themes.
+    // TODO: ThemeScopeList_WithThemes_ClonesSuccessfully
+
     /// <summary>
     ///     Gets the Themes dictionary. <see cref="GetThemes"/> is preferred.
     ///     The backing store is <c><see cref="ConfigurationManager.Settings"/> ["Themes"]</c>.

Terminal.Gui/ConsoleDrivers/ConsoleKeyMapping.cs

@@ -1,7 +1,7 @@
 using System.Globalization;
 using System.Runtime.InteropServices;
 
-namespace Terminal.Gui.ConsoleDrivers;
+namespace Terminal.Gui;
 
 // QUESTION: This class combines Windows specific code with cross-platform code. Should this be split into two classes?
 /// <summary>Helper class to handle the scan code and virtual key from a <see cref="ConsoleKey"/>.</summary>

Terminal.Gui/ConsoleDrivers/CursesDriver/CursesDriver.cs

@@ -4,7 +4,6 @@
 //
 
 using System.Runtime.InteropServices;
-using Terminal.Gui.ConsoleDrivers;
 using Unix.Terminal;
 
 namespace Terminal.Gui;

Terminal.Gui/ConsoleDrivers/EscSeqUtils/EscSeqUtils.cs

@@ -1,6 +1,5 @@
 #nullable enable
 using System.Globalization;
-using static Terminal.Gui.ConsoleDrivers.ConsoleKeyMapping;
 
 namespace Terminal.Gui;
 
@@ -1159,7 +1158,7 @@ public static class EscSeqUtils
 
                 break;
             default:
-                uint ck = MapKeyCodeToConsoleKey ((KeyCode)consoleKeyInfo.KeyChar, out bool isConsoleKey);
+                uint ck = ConsoleKeyMapping.MapKeyCodeToConsoleKey ((KeyCode)consoleKeyInfo.KeyChar, out bool isConsoleKey);
 
                 if (isConsoleKey)
                 {
@@ -1415,12 +1414,12 @@ public static class EscSeqUtils
                 if (keyInfo.Modifiers != ConsoleModifiers.Shift)
                 {
                     // If Shift wasn't down we don't need to do anything but return the keyInfo.KeyChar
-                    return MapToKeyCodeModifiers (keyInfo.Modifiers, (KeyCode)keyInfo.KeyChar);
+                    return ConsoleKeyMapping.MapToKeyCodeModifiers (keyInfo.Modifiers, (KeyCode)keyInfo.KeyChar);
                 }
 
                 // Strip off Shift - We got here because they KeyChar from Windows is the shifted char (e.g. "Ç")
                 // and passing on Shift would be redundant.
-                return MapToKeyCodeModifiers (keyInfo.Modifiers & ~ConsoleModifiers.Shift, (KeyCode)keyInfo.KeyChar);
+                return ConsoleKeyMapping.MapToKeyCodeModifiers (keyInfo.Modifiers & ~ConsoleModifiers.Shift, (KeyCode)keyInfo.KeyChar);
         }
 
         // Handle control keys whose VK codes match the related ASCII value (those below ASCII 33) like ESC
@@ -1431,14 +1430,14 @@ public static class EscSeqUtils
                 return KeyCode.Tab;
             }
 
-            return MapToKeyCodeModifiers (keyInfo.Modifiers, (KeyCode)(uint)keyInfo.Key);
+            return ConsoleKeyMapping.MapToKeyCodeModifiers (keyInfo.Modifiers, (KeyCode)(uint)keyInfo.Key);
         }
 
         // Handle control keys (e.g. CursorUp)
         if (keyInfo.Key != ConsoleKey.None
             && Enum.IsDefined (typeof (KeyCode), (uint)keyInfo.Key + (uint)KeyCode.MaxCodePoint))
         {
-            return MapToKeyCodeModifiers (keyInfo.Modifiers, (KeyCode)((uint)keyInfo.Key + (uint)KeyCode.MaxCodePoint));
+            return ConsoleKeyMapping.MapToKeyCodeModifiers (keyInfo.Modifiers, (KeyCode)((uint)keyInfo.Key + (uint)KeyCode.MaxCodePoint));
         }
 
         if ((ConsoleKey)keyInfo.KeyChar is >= ConsoleKey.A and <= ConsoleKey.Z)
@@ -1469,7 +1468,7 @@ public static class EscSeqUtils
                 || keyInfo.Modifiers.HasFlag (ConsoleModifiers.Control))
             {
                 // NetDriver doesn't support Shift-Ctrl/Shift-Alt combos
-                return MapToKeyCodeModifiers (keyInfo.Modifiers & ~ConsoleModifiers.Shift, (KeyCode)keyInfo.Key);
+                return ConsoleKeyMapping.MapToKeyCodeModifiers (keyInfo.Modifiers & ~ConsoleModifiers.Shift, (KeyCode)keyInfo.Key);
             }
 
             if (keyInfo.Modifiers == ConsoleModifiers.Shift)
@@ -1484,7 +1483,7 @@ public static class EscSeqUtils
             return (KeyCode)keyInfo.Key;
         }
 
-        return MapToKeyCodeModifiers (keyInfo.Modifiers, (KeyCode)keyInfo.KeyChar);
+        return ConsoleKeyMapping.MapToKeyCodeModifiers (keyInfo.Modifiers, (KeyCode)keyInfo.KeyChar);
     }
 
     private static async Task ProcessButtonClickedAsync ()

Terminal.Gui/ConsoleDrivers/FakeDriver/FakeConsole.cs

@@ -2,8 +2,6 @@
 // FakeConsole.cs: A fake .NET Windows Console API implementation for unit tests.
 //
 
-using Terminal.Gui.ConsoleDrivers;
-
 namespace Terminal.Gui;
 
 #pragma warning disable RCS1138 // Add summary to documentation comment.

Terminal.Gui/ConsoleDrivers/FakeDriver/FakeDriver.cs

@@ -4,7 +4,6 @@
 
 using System.Diagnostics;
 using System.Runtime.InteropServices;
-using Terminal.Gui.ConsoleDrivers;
 
 // Alias Console to MockConsole so we don't accidentally use Console
 

Terminal.Gui/ConsoleDrivers/V2/WindowsKeyConverter.cs

@@ -1,5 +1,4 @@
 #nullable enable
-using Terminal.Gui.ConsoleDrivers;
 
 namespace Terminal.Gui;
 

Terminal.Gui/ConsoleDrivers/WindowsDriver/WindowsConsole.cs

@@ -2,7 +2,6 @@
 using System.Collections.Concurrent;
 using System.ComponentModel;
 using System.Runtime.InteropServices;
-using Terminal.Gui.ConsoleDrivers;
 
 namespace Terminal.Gui;
 

Terminal.Gui/ConsoleDrivers/WindowsDriver/WindowsDriver.cs

@@ -19,8 +19,6 @@
 using System.ComponentModel;
 using System.Diagnostics;
 using System.Runtime.InteropServices;
-using static Terminal.Gui.ConsoleDrivers.ConsoleKeyMapping;
-using static Terminal.Gui.SpinnerStyle;
 
 namespace Terminal.Gui;
 
@@ -76,7 +74,7 @@ internal class WindowsDriver : ConsoleDriver
 
     public static WindowsConsole.KeyEventRecord FromVKPacketToKeyEventRecord (WindowsConsole.KeyEventRecord keyEvent)
     {
-        if (keyEvent.wVirtualKeyCode != (VK)ConsoleKey.Packet)
+        if (keyEvent.wVirtualKeyCode != (ConsoleKeyMapping.VK)ConsoleKey.Packet)
         {
             return keyEvent;
         }
@@ -106,8 +104,8 @@ internal class WindowsDriver : ConsoleDriver
                                            mod.HasFlag (ConsoleModifiers.Shift),
                                            mod.HasFlag (ConsoleModifiers.Alt),
                                            mod.HasFlag (ConsoleModifiers.Control));
-        cKeyInfo = DecodeVKPacketToKConsoleKeyInfo (cKeyInfo);
-        uint scanCode = GetScanCodeFromConsoleKeyInfo (cKeyInfo);
+        cKeyInfo = ConsoleKeyMapping.DecodeVKPacketToKConsoleKeyInfo (cKeyInfo);
+        uint scanCode = ConsoleKeyMapping.GetScanCodeFromConsoleKeyInfo (cKeyInfo);
 
         return new WindowsConsole.KeyEventRecord
         {
@@ -115,7 +113,7 @@ internal class WindowsDriver : ConsoleDriver
             bKeyDown = keyEvent.bKeyDown,
             dwControlKeyState = keyEvent.dwControlKeyState,
             wRepeatCount = keyEvent.wRepeatCount,
-            wVirtualKeyCode = (VK)cKeyInfo.Key,
+            wVirtualKeyCode = (ConsoleKeyMapping.VK)cKeyInfo.Key,
             wVirtualScanCode = (ushort)scanCode
         };
     }
@@ -139,7 +137,7 @@ internal class WindowsDriver : ConsoleDriver
         {
             controlKey |= WindowsConsole.ControlKeyState.ShiftPressed;
             keyEvent.UnicodeChar = '\0';
-            keyEvent.wVirtualKeyCode = VK.SHIFT;
+            keyEvent.wVirtualKeyCode = ConsoleKeyMapping.VK.SHIFT;
         }
 
         if (alt)
@@ -147,7 +145,7 @@ internal class WindowsDriver : ConsoleDriver
             controlKey |= WindowsConsole.ControlKeyState.LeftAltPressed;
             controlKey |= WindowsConsole.ControlKeyState.RightAltPressed;
             keyEvent.UnicodeChar = '\0';
-            keyEvent.wVirtualKeyCode = VK.MENU;
+            keyEvent.wVirtualKeyCode = ConsoleKeyMapping.VK.MENU;
         }
 
         if (control)
@@ -155,7 +153,7 @@ internal class WindowsDriver : ConsoleDriver
             controlKey |= WindowsConsole.ControlKeyState.LeftControlPressed;
             controlKey |= WindowsConsole.ControlKeyState.RightControlPressed;
             keyEvent.UnicodeChar = '\0';
-            keyEvent.wVirtualKeyCode = VK.CONTROL;
+            keyEvent.wVirtualKeyCode = ConsoleKeyMapping.VK.CONTROL;
         }
 
         keyEvent.dwControlKeyState = controlKey;
@@ -174,7 +172,7 @@ internal class WindowsDriver : ConsoleDriver
         //} else {
         //	keyEvent.wVirtualKeyCode = '\0';
         //}
-        keyEvent.wVirtualKeyCode = (VK)key;
+        keyEvent.wVirtualKeyCode = (ConsoleKeyMapping.VK)key;
 
         input.KeyEvent = keyEvent;
 
@@ -492,7 +490,7 @@ internal class WindowsDriver : ConsoleDriver
         switch (inputEvent.EventType)
         {
             case WindowsConsole.EventType.Key:
-                if (inputEvent.KeyEvent.wVirtualKeyCode == (VK)ConsoleKey.Packet)
+                if (inputEvent.KeyEvent.wVirtualKeyCode == (ConsoleKeyMapping.VK)ConsoleKey.Packet)
                 {
                     // Used to pass Unicode characters as if they were keystrokes.
                     // The VK_PACKET key is the low word of a 32-bit
@@ -681,7 +679,7 @@ internal class WindowsDriver : ConsoleDriver
             case ConsoleKey.OemMinus:
                 // These virtual key codes are mapped differently depending on the keyboard layout in use.
                 // We use the Win32 API to map them to the correct character.
-                uint mapResult = MapVKtoChar ((VK)keyInfo.Key);
+                uint mapResult = ConsoleKeyMapping.MapVKtoChar ((ConsoleKeyMapping.VK)keyInfo.Key);
 
                 if (mapResult == 0)
                 {
@@ -738,7 +736,7 @@ internal class WindowsDriver : ConsoleDriver
 
                     // Return the mappedChar with modifiers. Because mappedChar is un-shifted, if Shift was down
                     // we should keep it
-                    return MapToKeyCodeModifiers (keyInfo.Modifiers, (KeyCode)mappedChar);
+                    return ConsoleKeyMapping.MapToKeyCodeModifiers (keyInfo.Modifiers, (KeyCode)mappedChar);
                 }
 
                 // KeyChar is printable
@@ -751,12 +749,12 @@ internal class WindowsDriver : ConsoleDriver
                 if (keyInfo.Modifiers != ConsoleModifiers.Shift)
                 {
                     // If Shift wasn't down we don't need to do anything but return the mappedChar
-                    return MapToKeyCodeModifiers (keyInfo.Modifiers, (KeyCode)mappedChar);
+                    return ConsoleKeyMapping.MapToKeyCodeModifiers (keyInfo.Modifiers, (KeyCode)mappedChar);
                 }
 
                 // Strip off Shift - We got here because they KeyChar from Windows is the shifted char (e.g. "�")
                 // and passing on Shift would be redundant.
-                return MapToKeyCodeModifiers (keyInfo.Modifiers & ~ConsoleModifiers.Shift, (KeyCode)keyInfo.KeyChar);
+                return ConsoleKeyMapping.MapToKeyCodeModifiers (keyInfo.Modifiers & ~ConsoleModifiers.Shift, (KeyCode)keyInfo.KeyChar);
         }
 
         // A..Z are special cased:
@@ -772,13 +770,13 @@ internal class WindowsDriver : ConsoleDriver
                 // AltGr support - AltGr is equivalent to Ctrl+Alt
                 if (keyInfo.Modifiers.HasFlag (ConsoleModifiers.Alt) && keyInfo.Modifiers.HasFlag (ConsoleModifiers.Control))
                 {
-                    return MapToKeyCodeModifiers (keyInfo.Modifiers, (KeyCode)(uint)keyInfo.Key);
+                    return ConsoleKeyMapping.MapToKeyCodeModifiers (keyInfo.Modifiers, (KeyCode)(uint)keyInfo.Key);
                 }
             }
 
             if (keyInfo.Modifiers.HasFlag (ConsoleModifiers.Alt) || keyInfo.Modifiers.HasFlag (ConsoleModifiers.Control))
             {
-                return MapToKeyCodeModifiers (keyInfo.Modifiers, (KeyCode)(uint)keyInfo.Key);
+                return ConsoleKeyMapping.MapToKeyCodeModifiers (keyInfo.Modifiers, (KeyCode)(uint)keyInfo.Key);
             }
 
             if ((keyInfo.Modifiers == ConsoleModifiers.Shift) ^ keyInfoEx.CapsLock)
@@ -810,47 +808,47 @@ internal class WindowsDriver : ConsoleDriver
         if (Enum.IsDefined (typeof (KeyCode), (uint)keyInfo.Key))
         {
             // If the key is JUST a modifier, return it as just that key
-            if (keyInfo.Key == (ConsoleKey)VK.SHIFT)
+            if (keyInfo.Key == (ConsoleKey)ConsoleKeyMapping.VK.SHIFT)
             { // Shift 16
                 return KeyCode.ShiftMask;
             }
 
-            if (keyInfo.Key == (ConsoleKey)VK.CONTROL)
+            if (keyInfo.Key == (ConsoleKey)ConsoleKeyMapping.VK.CONTROL)
             { // Ctrl 17
                 return KeyCode.CtrlMask;
             }
 
-            if (keyInfo.Key == (ConsoleKey)VK.MENU)
+            if (keyInfo.Key == (ConsoleKey)ConsoleKeyMapping.VK.MENU)
             { // Alt 18
                 return KeyCode.AltMask;
             }
 
             if (keyInfo.KeyChar == 0)
             {
-                return MapToKeyCodeModifiers (keyInfo.Modifiers, (KeyCode)keyInfo.KeyChar);
+                return ConsoleKeyMapping.MapToKeyCodeModifiers (keyInfo.Modifiers, (KeyCode)keyInfo.KeyChar);
             }
 
             // Backspace (ASCII 127)
             if (keyInfo.KeyChar == '\u007f')
             {
-                return MapToKeyCodeModifiers (keyInfo.Modifiers, (KeyCode)keyInfo.Key);
+                return ConsoleKeyMapping.MapToKeyCodeModifiers (keyInfo.Modifiers, (KeyCode)keyInfo.Key);
             }
 
             if (keyInfo.Key != ConsoleKey.None)
             {
-                return MapToKeyCodeModifiers (keyInfo.Modifiers, (KeyCode)keyInfo.KeyChar);
+                return ConsoleKeyMapping.MapToKeyCodeModifiers (keyInfo.Modifiers, (KeyCode)keyInfo.KeyChar);
             }
 
-            return MapToKeyCodeModifiers (keyInfo.Modifiers & ~ConsoleModifiers.Shift, (KeyCode)keyInfo.KeyChar);
+            return ConsoleKeyMapping.MapToKeyCodeModifiers (keyInfo.Modifiers & ~ConsoleModifiers.Shift, (KeyCode)keyInfo.KeyChar);
         }
 
         // Handle control keys (e.g. CursorUp)
         if (Enum.IsDefined (typeof (KeyCode), (uint)keyInfo.Key + (uint)KeyCode.MaxCodePoint))
         {
-            return MapToKeyCodeModifiers (keyInfo.Modifiers, (KeyCode)((uint)keyInfo.Key + (uint)KeyCode.MaxCodePoint));
+            return ConsoleKeyMapping.MapToKeyCodeModifiers (keyInfo.Modifiers, (KeyCode)((uint)keyInfo.Key + (uint)KeyCode.MaxCodePoint));
         }
 
-        return MapToKeyCodeModifiers (keyInfo.Modifiers, (KeyCode)keyInfo.KeyChar);
+        return ConsoleKeyMapping.MapToKeyCodeModifiers (keyInfo.Modifiers, (KeyCode)keyInfo.KeyChar);
     }
 
     private MouseFlags ProcessButtonClick (WindowsConsole.MouseEventRecord mouseEvent)

Terminal.Gui/View/View.Layout.cs

@@ -800,14 +800,6 @@ public partial class View // Layout APIs
             SuperView?.SetNeedsLayout ();
         }
 
-        if (SuperView is null)
-        {
-            foreach (Toplevel tl in Application.TopLevels)
-            {
-                // tl.SetNeedsDraw ();
-            }
-        }
-
         if (this is not Adornment adornment)
         {
             return;

Tests/TerminalGuiFluentTesting/GuiTestContext.cs

@@ -2,7 +2,6 @@
 using System.Text;
 using Microsoft.Extensions.Logging;
 using Terminal.Gui;
-using Terminal.Gui.ConsoleDrivers;
 
 namespace TerminalGuiFluentTesting;
 

Tests/UnitTests/Configuration/ConfigurationMangerTests.cs

@@ -414,7 +414,7 @@ public class ConfigurationManagerTests (ITestOutputHelper output)
                                 """;
 
             // Update default config first (lower precedence)
-            SourcesManager?.Load (Settings, defaultConfig, "default-test", ConfigLocations.LibraryResources);
+            ConfigurationManager.SourcesManager?.Load (Settings, defaultConfig, "default-test", ConfigLocations.LibraryResources);
 
             // Then load runtime config, which should override default
             Load (ConfigLocations.Runtime);
@@ -447,7 +447,7 @@ public class ConfigurationManagerTests (ITestOutputHelper output)
             ResetToHardCodedDefaults ();
 
             // Serialize to a JSON string
-            string json = SourcesManager?.ToJson (Settings);
+            string json = ConfigurationManager.SourcesManager?.ToJson (Settings);
 
             // Write the JSON string to the file
             File.WriteAllText ("hard_coded_defaults_config.json", json);
@@ -476,7 +476,7 @@ public class ConfigurationManagerTests (ITestOutputHelper output)
             Enable (ConfigLocations.LibraryResources);
 
             // Serialize to a JSON string
-            string json = SourcesManager?.ToJson (Settings);
+            string json = ConfigurationManager.SourcesManager?.ToJson (Settings);
 
             // Write the JSON string to the file
             File.WriteAllText ("library_defaults_config.json", json);
@@ -688,7 +688,7 @@ public class ConfigurationManagerTests (ITestOutputHelper output)
 				}
 			}";
 
-        SourcesManager?.Load (Settings, json, "test", ConfigLocations.Runtime);
+        ConfigurationManager.SourcesManager?.Load (Settings, json, "test", ConfigLocations.Runtime);
 
         // AbNormal is not a Scheme attribute
         json = @"
@@ -711,7 +711,7 @@ public class ConfigurationManagerTests (ITestOutputHelper output)
 				}
 			}";
 
-        SourcesManager?.Load (Settings, json, "test", ConfigLocations.Runtime);
+        ConfigurationManager.SourcesManager?.Load (Settings, json, "test", ConfigLocations.Runtime);
 
         // Modify hotNormal background only
         json = @"
@@ -733,9 +733,9 @@ public class ConfigurationManagerTests (ITestOutputHelper output)
 				}
 			}";
 
-        SourcesManager?.Load (Settings, json, "test", ConfigLocations.Runtime);
+        ConfigurationManager.SourcesManager?.Load (Settings, json, "test", ConfigLocations.Runtime);
 
-        SourcesManager?.Load (Settings, "{}}", "test", ConfigLocations.Runtime);
+        ConfigurationManager.SourcesManager?.Load (Settings, "{}}", "test", ConfigLocations.Runtime);
 
         Assert.NotEqual (0, _jsonErrors.Length);
 
@@ -773,7 +773,7 @@ public class ConfigurationManagerTests (ITestOutputHelper output)
 				]
 			}";
 
-        var jsonException = Assert.Throws<JsonException> (() => SourcesManager?.Load (Settings, json, "test", ConfigLocations.Runtime));
+        var jsonException = Assert.Throws<JsonException> (() => ConfigurationManager.SourcesManager?.Load (Settings, json, "test", ConfigLocations.Runtime));
         Assert.StartsWith ("foreground: \"\"brownish\"\"", jsonException.Message);
 
         // AbNormal is not a Scheme attribute
@@ -797,7 +797,7 @@ public class ConfigurationManagerTests (ITestOutputHelper output)
 				]
 			}";
 
-        jsonException = Assert.Throws<JsonException> (() => SourcesManager?.Load (Settings, json, "test", ConfigLocations.Runtime));
+        jsonException = Assert.Throws<JsonException> (() => ConfigurationManager.SourcesManager?.Load (Settings, json, "test", ConfigLocations.Runtime));
         Assert.StartsWith ("AbNormal:", jsonException.Message);
 
         // Modify hotNormal background only
@@ -820,7 +820,7 @@ public class ConfigurationManagerTests (ITestOutputHelper output)
 				]
 			}";
 
-        jsonException = Assert.Throws<JsonException> (() => SourcesManager?.Load (Settings, json, "test", ConfigLocations.Runtime));
+        jsonException = Assert.Throws<JsonException> (() => ConfigurationManager.SourcesManager?.Load (Settings, json, "test", ConfigLocations.Runtime));
         Assert.StartsWith ("background:", jsonException.Message);
 
         // Unknown property
@@ -829,7 +829,7 @@ public class ConfigurationManagerTests (ITestOutputHelper output)
 				""Unknown"" : ""Not known""
 			}";
 
-        jsonException = Assert.Throws<JsonException> (() => SourcesManager?.Load (Settings, json, "test", ConfigLocations.Runtime));
+        jsonException = Assert.Throws<JsonException> (() => ConfigurationManager.SourcesManager?.Load (Settings, json, "test", ConfigLocations.Runtime));
         Assert.StartsWith ("Unknown:", jsonException.Message);
 
         Assert.Equal (0, _jsonErrors.Length);
@@ -989,7 +989,7 @@ public class ConfigurationManagerTests (ITestOutputHelper output)
             ResetToCurrentValues ();
             ThrowOnJsonErrors = true;
 
-            SourcesManager?.Load (Settings, json, "UpdateFromJson", ConfigLocations.Runtime);
+            ConfigurationManager.SourcesManager?.Load (Settings, json, "UpdateFromJson", ConfigLocations.Runtime);
 
             Assert.Equal ("Default", ThemeManager.Theme);
 

Tests/UnitTests/Configuration/SettingsScopeTests.cs

@@ -1,5 +1,5 @@
-using System.Collections.Concurrent;
-using UnitTests;
+#nullable enable
+using System.Collections.Concurrent;
 using static Terminal.Gui.ConfigurationManager;
 
 namespace Terminal.Gui.ConfigurationTests;
@@ -12,7 +12,7 @@ public class SettingsScopeTests
         // arrange
         Enable (ConfigLocations.HardCoded);
 
-        Assert.Equal (Key.Esc, (Key)Settings! ["Application.QuitKey"].PropertyValue);
+        Assert.Equal (Key.Esc, (Key)Settings! ["Application.QuitKey"].PropertyValue!);
 
         ThrowOnJsonErrors = true;
 
@@ -27,7 +27,7 @@ public class SettingsScopeTests
         Load (ConfigLocations.Runtime);
 
         // assert
-        Assert.Equal (Key.Q.WithCtrl, (Key)Settings ["Application.QuitKey"].PropertyValue);
+        Assert.Equal (Key.Q.WithCtrl, (Key)Settings ["Application.QuitKey"].PropertyValue!);
 
         // clean up
         Disable (resetToHardCodedDefaults: true);
@@ -43,11 +43,11 @@ public class SettingsScopeTests
         ThrowOnJsonErrors = true;
 
         ConfigProperty themesConfigProperty = Settings! ["Themes"];
-        ConcurrentDictionary<string, ThemeScope> dict = themesConfigProperty.PropertyValue as ConcurrentDictionary<string, ThemeScope>;
+        ConcurrentDictionary<string, ThemeScope> dict = (themesConfigProperty.PropertyValue as ConcurrentDictionary<string, ThemeScope>)!;
 
         Assert.NotNull (dict);
         Assert.Single (dict);
-        Assert.NotEmpty ((ConcurrentDictionary<string, ThemeScope>)themesConfigProperty.PropertyValue);
+        Assert.NotEmpty (((ConcurrentDictionary<string, ThemeScope>)themesConfigProperty.PropertyValue!)!);
 
         ThemeScope scope = dict [ThemeManager.DEFAULT_THEME_NAME];
         Assert.NotNull (scope);
@@ -111,16 +111,16 @@ public class SettingsScopeTests
         Load (ConfigLocations.LibraryResources);
 
         // arrange
-        Assert.Equal (Key.Esc, (Key)Settings! ["Application.QuitKey"].PropertyValue);
+        Assert.Equal (Key.Esc, (Key)Settings!["Application.QuitKey"].PropertyValue!);
 
         Assert.Equal (
                       Key.F6,
-                      (Key)Settings ["Application.NextTabGroupKey"].PropertyValue
+                      (Key)Settings["Application.NextTabGroupKey"].PropertyValue!
                      );
 
         Assert.Equal (
                       Key.F6.WithShift,
-                      (Key)Settings ["Application.PrevTabGroupKey"].PropertyValue
+                      (Key)Settings["Application.PrevTabGroupKey"].PropertyValue!
                      );
 
         // act
@@ -154,9 +154,9 @@ public class SettingsScopeTests
         updatedSettings ["Application.PrevTabGroupKey"].PropertyValue = Key.B;
 
         Settings.UpdateFrom (updatedSettings);
-        Assert.Equal (KeyCode.End, ((Key)Settings ["Application.QuitKey"].PropertyValue).KeyCode);
-        Assert.Equal (KeyCode.F, ((Key)updatedSettings ["Application.NextTabGroupKey"].PropertyValue).KeyCode);
-        Assert.Equal (KeyCode.B, ((Key)updatedSettings ["Application.PrevTabGroupKey"].PropertyValue).KeyCode);
+        Assert.Equal (KeyCode.End, ((Key)Settings["Application.QuitKey"].PropertyValue!).KeyCode);
+        Assert.Equal (KeyCode.F, ((Key)updatedSettings["Application.NextTabGroupKey"].PropertyValue!).KeyCode);
+        Assert.Equal (KeyCode.B, ((Key)updatedSettings["Application.PrevTabGroupKey"].PropertyValue!).KeyCode);
         Disable (resetToHardCodedDefaults: true);
     }
 
@@ -218,4 +218,134 @@ public class SettingsScopeTests
 
         Disable (resetToHardCodedDefaults: true);
     }
+    
+    private class ConfigPropertyMock
+    {
+        public object? PropertyValue { get; init; }
+        public bool Immutable { get; init; }
+    }
+
+    private class SettingsScopeMock : Dictionary<string, ConfigPropertyMock>
+    {
+        public string? Theme { get; set; }
+    }
+
+
+    [Fact]
+    public void SettingsScopeMockWithKey_CreatesDeepCopy ()
+    {
+        SettingsScopeMock? source = new ()
+        {
+            Theme = "Dark",
+            ["KeyBinding"] = new () { PropertyValue = new Key (KeyCode.A) { Handled = true } },
+            ["Counts"] = new () { PropertyValue = new Dictionary<string, int> { { "X", 1 } } }
+        };
+        SettingsScopeMock? result = DeepCloner.DeepClone (source);
+
+        Assert.NotNull (result);
+        Assert.NotSame (source, result);
+        Assert.Equal (source.Theme, result!.Theme);
+        Assert.NotSame (source ["KeyBinding"], result ["KeyBinding"]);
+        Assert.NotSame (source ["Counts"], result ["Counts"]);
+
+        ConfigPropertyMock clonedKeyProp = result ["KeyBinding"];
+        var clonedKey = (Key)clonedKeyProp.PropertyValue!;
+        Assert.NotSame (source ["KeyBinding"].PropertyValue, clonedKey);
+        Assert.Equal (((Key)source ["KeyBinding"].PropertyValue!).KeyCode, clonedKey.KeyCode);
+        Assert.Equal (((Key)source ["KeyBinding"].PropertyValue!).Handled, clonedKey.Handled);
+
+        Assert.Equal ((Dictionary<string, int>)source ["Counts"].PropertyValue!, (Dictionary<string, int>)result ["Counts"].PropertyValue!);
+
+        // Modify result, ensure source unchanged
+        result.Theme = "Light";
+        clonedKey.Handled = false;
+        ((Dictionary<string, int>)result ["Counts"].PropertyValue!).Add ("Y", 2);
+        Assert.Equal ("Dark", source.Theme);
+        Assert.True (((Key)source ["KeyBinding"].PropertyValue!).Handled);
+        Assert.Single ((Dictionary<string, int>)source ["Counts"].PropertyValue!);
+        Disable (resetToHardCodedDefaults: true);
+    }
+
+    [Fact /*(Skip = "This test randomly fails due to a concurrent change to something. Needs to be moved to non-parallel tests.")*/]
+    public void ThemeScopeList_WithThemes_ClonesSuccessfully ()
+    {
+        // Arrange: Create a ThemeScope and verify a property exists
+        ThemeScope defaultThemeScope = new ThemeScope ();
+        defaultThemeScope.LoadHardCodedDefaults ();
+        Assert.True (defaultThemeScope.ContainsKey ("Button.DefaultHighlightStyle"));
+
+        ThemeScope darkThemeScope = new ThemeScope ();
+        darkThemeScope.LoadHardCodedDefaults ();
+        Assert.True (darkThemeScope.ContainsKey ("Button.DefaultHighlightStyle"));
+
+        // Create a Themes list with two themes
+        List<Dictionary<string, ThemeScope>> themesList =
+        [
+            new () { { "Default", defaultThemeScope } },
+            new () { { "Dark", darkThemeScope } }
+        ];
+
+        // Create a SettingsScope and set the Themes property
+        SettingsScope settingsScope = new SettingsScope ();
+        settingsScope.LoadHardCodedDefaults ();
+        Assert.True (settingsScope.ContainsKey ("Themes"));
+        settingsScope ["Themes"].PropertyValue = themesList;
+
+        // Act
+        SettingsScope? result = DeepCloner.DeepClone (settingsScope);
+
+        // Assert
+        Assert.NotNull (result);
+        Assert.IsType<SettingsScope> (result);
+        SettingsScope resultScope = (SettingsScope)result;
+        Assert.True (resultScope.ContainsKey ("Themes"));
+
+        Assert.NotNull (resultScope ["Themes"].PropertyValue);
+
+        List<Dictionary<string, ThemeScope>> clonedThemes = (List<Dictionary<string, ThemeScope>>)resultScope ["Themes"].PropertyValue!;
+        Assert.Equal (2, clonedThemes.Count);
+        Disable (resetToHardCodedDefaults: true);
+    }
+
+    [Fact]
+    public void Empty_SettingsScope_ClonesSuccessfully ()
+    {
+        // Arrange: Create a SettingsScope 
+        var settingsScope = new SettingsScope ();
+        Assert.True (settingsScope.ContainsKey ("Themes"));
+
+        // Act
+        SettingsScope? result = DeepCloner.DeepClone (settingsScope);
+
+        // Assert
+        Assert.NotNull (result);
+        Assert.IsType<SettingsScope> (result);
+
+        Assert.True (result.ContainsKey ("Themes"));
+        Disable (resetToHardCodedDefaults: true);
+    }
+
+    [Fact]
+    public void SettingsScope_With_Themes_Set_ClonesSuccessfully ()
+    {
+        // Arrange: Create a SettingsScope 
+        var settingsScope = new SettingsScope ();
+        Assert.True (settingsScope.ContainsKey ("Themes"));
+
+        settingsScope ["Themes"].PropertyValue = new List<Dictionary<string, ThemeScope>>
+        {
+            new() { { "Default", new () } },
+            new() { { "Dark", new () } }
+        };
+
+        // Act
+        SettingsScope? result = DeepCloner.DeepClone (settingsScope);
+
+        // Assert
+        Assert.NotNull (result);
+        Assert.IsType<SettingsScope> (result);
+        Assert.True (result.ContainsKey ("Themes"));
+        Assert.NotNull (result ["Themes"].PropertyValue);
+        Disable (resetToHardCodedDefaults: true);
+    }
 }

Tests/UnitTests/Configuration/ThemeManagerTests.cs

@@ -272,7 +272,7 @@ public class ThemeManagerTests (ITestOutputHelper output)
 
         output.WriteLine ($"Total Settings Size: {(MemorySizeEstimator.EstimateSize (Settings!)) / 1024} Kb");
 
-        string json = SourcesManager?.ToJson (Settings)!;
+        string json = ConfigurationManager.SourcesManager?.ToJson (Settings)!;
 
         // In memory size should be less than the size of the json
         output.WriteLine ($"JSON size: {json.Length / 1024} Kb");

Tests/UnitTests/ConsoleDrivers/ConsoleKeyMappingTests.cs

@@ -1,6 +1,5 @@
-using static Terminal.Gui.ConsoleDrivers.ConsoleKeyMapping;
 
-namespace Terminal.Gui.ConsoleDrivers;
+namespace Terminal.Gui.ConsoleDriverTests;
 
 public class ConsoleKeyMappingTests
 {
@@ -365,7 +364,7 @@ public class ConsoleKeyMappingTests
     )
     {
         var consoleKeyInfo = new ConsoleKeyInfo (keyChar, consoleKey, shift, alt, control);
-        KeyCode keyCode = MapConsoleKeyInfoToKeyCode (consoleKeyInfo);
+        KeyCode keyCode = ConsoleKeyMapping.MapConsoleKeyInfoToKeyCode (consoleKeyInfo);
 
         Assert.Equal (keyCode, expectedKeyCode);
     }
@@ -395,9 +394,9 @@ public class ConsoleKeyMappingTests
         KeyCode expectedKeyCode
     )
     {
-        ConsoleModifiers modifiers = GetModifiers (shift, alt, control);
+        ConsoleModifiers modifiers = ConsoleKeyMapping.GetModifiers (shift, alt, control);
         var keyCode = (KeyCode)keyChar;
-        keyCode = MapToKeyCodeModifiers (modifiers, keyCode);
+        keyCode = ConsoleKeyMapping.MapToKeyCodeModifiers (modifiers, keyCode);
 
         Assert.Equal (keyCode, expectedKeyCode);
     }
@@ -414,7 +413,7 @@ public class ConsoleKeyMappingTests
     )
     {
         var consoleKeyInfo = new ConsoleKeyInfo (keyChar, consoleKey, shift, alt, control);
-        uint scanCode = GetScanCodeFromConsoleKeyInfo (consoleKeyInfo);
+        uint scanCode = ConsoleKeyMapping.GetScanCodeFromConsoleKeyInfo (consoleKeyInfo);
 
         Assert.Equal (scanCode, expectedScanCode);
     }
@@ -492,12 +491,12 @@ public class ConsoleKeyMappingTests
         KeyCode expectedKeyCode
     )
     {
-        ConsoleModifiers modifiers = GetModifiers (true, false, false);
-        uint keyChar = GetKeyChar (unicodeChar, modifiers);
+        ConsoleModifiers modifiers = ConsoleKeyMapping.GetModifiers (true, false, false);
+        uint keyChar = ConsoleKeyMapping.GetKeyChar (unicodeChar, modifiers);
         Assert.Equal (keyChar, expectedKeyChar);
 
         var keyCode = (KeyCode)keyChar;
-        keyCode = MapToKeyCodeModifiers (modifiers, keyCode);
+        keyCode = ConsoleKeyMapping.MapToKeyCodeModifiers (modifiers, keyCode);
 
         Assert.Equal (keyCode, expectedKeyCode);
     }
@@ -541,12 +540,12 @@ public class ConsoleKeyMappingTests
         KeyCode expectedKeyCode
     )
     {
-        ConsoleModifiers modifiers = GetModifiers (false, false, false);
-        uint keyChar = GetKeyChar (unicodeChar, modifiers);
+        ConsoleModifiers modifiers = ConsoleKeyMapping.GetModifiers (false, false, false);
+        uint keyChar = ConsoleKeyMapping.GetKeyChar (unicodeChar, modifiers);
         Assert.Equal (keyChar, expectedKeyChar);
 
         var keyCode = (KeyCode)keyChar;
-        keyCode = MapToKeyCodeModifiers (modifiers, keyCode);
+        keyCode = ConsoleKeyMapping.MapToKeyCodeModifiers (modifiers, keyCode);
 
         Assert.Equal (keyCode, expectedKeyCode);
     }

Tests/UnitTests/ConsoleDrivers/V2/WindowsInputProcessorTests.cs

@@ -1,5 +1,4 @@
 using System.Collections.Concurrent;
-using Terminal.Gui.ConsoleDrivers;
 using InputRecord = Terminal.Gui.WindowsConsole.InputRecord;
 using ButtonState = Terminal.Gui.WindowsConsole.ButtonState;
 using EventFlags = Terminal.Gui.WindowsConsole.EventFlags;

Tests/UnitTests/Views/ToplevelTests.cs

@@ -743,7 +743,6 @@ public class ToplevelTests
     }
 
     [Fact]
-    [TestRespondersDisposed]
     public void Multi_Thread_Toplevels ()
     {
         Application.Init (new FakeDriver ());

Tests/UnitTestsParallelizable/Configuration/DeepClonerTests.cs

@@ -56,11 +56,6 @@ public class DeepClonerTests
         public bool Immutable { get; init; }
     }
 
-    private class SettingsScopeMock : Dictionary<string, ConfigPropertyMock>
-    {
-        public string? Theme { get; set; }
-    }
-
     private class ComplexKey
     {
         public int Id { get; init; }
@@ -544,120 +539,6 @@ public class DeepClonerTests
         Assert.Equal (source.Immutable, result.Immutable);
     }
 
-    [Fact]
-    public void SettingsScopeMockWithKey_CreatesDeepCopy ()
-    {
-        SettingsScopeMock? source = new ()
-        {
-            Theme = "Dark",
-            ["KeyBinding"] = new () { PropertyValue = new Key (KeyCode.A) { Handled = true } },
-            ["Counts"] = new () { PropertyValue = new Dictionary<string, int> { { "X", 1 } } }
-        };
-        SettingsScopeMock? result = DeepCloner.DeepClone (source);
-
-        Assert.NotNull (result);
-        Assert.NotSame (source, result);
-        Assert.Equal (source.Theme, result!.Theme);
-        Assert.NotSame (source ["KeyBinding"], result ["KeyBinding"]);
-        Assert.NotSame (source ["Counts"], result ["Counts"]);
-
-        ConfigPropertyMock clonedKeyProp = result ["KeyBinding"];
-        var clonedKey = (Key)clonedKeyProp.PropertyValue!;
-        Assert.NotSame (source ["KeyBinding"].PropertyValue, clonedKey);
-        Assert.Equal (((Key)source ["KeyBinding"].PropertyValue!).KeyCode, clonedKey.KeyCode);
-        Assert.Equal (((Key)source ["KeyBinding"].PropertyValue!).Handled, clonedKey.Handled);
-
-        Assert.Equal ((Dictionary<string, int>)source ["Counts"].PropertyValue!, (Dictionary<string, int>)result ["Counts"].PropertyValue!);
-
-        // Modify result, ensure source unchanged
-        result.Theme = "Light";
-        clonedKey.Handled = false;
-        ((Dictionary<string, int>)result ["Counts"].PropertyValue!).Add ("Y", 2);
-        Assert.Equal ("Dark", source.Theme);
-        Assert.True (((Key)source ["KeyBinding"].PropertyValue!).Handled);
-        Assert.Single ((Dictionary<string, int>)source ["Counts"].PropertyValue!);
-    }
-
-    [Fact]
-    public void ThemeScopeList_WithThemes_ClonesSuccessfully ()
-    {
-        // Arrange: Create a ThemeScope and verify a property exists
-        var defaultThemeScope = new ThemeScope ();
-        defaultThemeScope.LoadHardCodedDefaults ();
-        Assert.True (defaultThemeScope.ContainsKey ("Button.DefaultHighlightStyle"));
-
-        var darkThemeScope = new ThemeScope ();
-        darkThemeScope.LoadHardCodedDefaults ();
-        Assert.True (darkThemeScope.ContainsKey ("Button.DefaultHighlightStyle"));
-
-        // Create a Themes list with two themes
-        List<Dictionary<string, ThemeScope>> themesList =
-        [
-            new () { { "Default", defaultThemeScope } },
-            new () { { "Dark", darkThemeScope } }
-        ];
-
-        // Create a SettingsScope and set the Themes property
-        var settingsScope = new SettingsScope ();
-        settingsScope.LoadHardCodedDefaults ();
-        Assert.True (settingsScope.ContainsKey ("Themes"));
-        settingsScope ["Themes"].PropertyValue = themesList;
-
-        // Act
-        SettingsScope? result = DeepCloner.DeepClone (settingsScope);
-
-        // Assert
-        Assert.NotNull (result);
-        Assert.IsType<SettingsScope> (result);
-        var resultScope = (SettingsScope)result;
-        Assert.True (resultScope.ContainsKey ("Themes"));
-
-        Assert.NotNull (resultScope ["Themes"].PropertyValue);
-
-        List<Dictionary<string, ThemeScope>> clonedThemes = (List<Dictionary<string, ThemeScope>>)resultScope ["Themes"].PropertyValue!;
-        Assert.Equal (2, clonedThemes.Count);
-    }
-
-    [Fact]
-    public void Empty_SettingsScope_ClonesSuccessfully ()
-    {
-        // Arrange: Create a SettingsScope 
-        var settingsScope = new SettingsScope ();
-        Assert.True (settingsScope.ContainsKey ("Themes"));
-
-        // Act
-        SettingsScope? result = DeepCloner.DeepClone (settingsScope);
-
-        // Assert
-        Assert.NotNull (result);
-        Assert.IsType<SettingsScope> (result);
-
-        Assert.True (result.ContainsKey ("Themes"));
-    }
-
-    [Fact]
-    public void SettingsScope_With_Themes_Set_ClonesSuccessfully ()
-    {
-        // Arrange: Create a SettingsScope 
-        var settingsScope = new SettingsScope ();
-        Assert.True (settingsScope.ContainsKey ("Themes"));
-
-        settingsScope ["Themes"].PropertyValue = new List<Dictionary<string, ThemeScope>>
-        {
-            new() { { "Default", new () } },
-            new() { { "Dark", new () } }
-        };
-
-        // Act
-        SettingsScope? result = DeepCloner.DeepClone (settingsScope);
-
-        // Assert
-        Assert.NotNull (result);
-        Assert.IsType<SettingsScope> (result);
-        Assert.True (result.ContainsKey ("Themes"));
-        Assert.NotNull (result ["Themes"].PropertyValue);
-    }
-
     [Fact]
     public void LargeObject_PerformsWithinLimit ()
     {

Tests/UnitTestsParallelizable/Configuration/SourcesManagerTests.cs

@@ -1,6 +1,5 @@
 using System.Reflection;
 using System.Text.Json;
-using Terminal.Gui.Configuration;
 
 public class SourcesManagerTests
 {