More accurate check if enum value has flag

- Shouldn't include ctors on abstract types
- Missing parameterless ctors for structs (implicit)

.github/FUNDING.yml

@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+ko_fi: sinaidev

.github/workflows/dotnet.yml

@@ -28,15 +28,13 @@ jobs:
           nuget-api-key: ${{ secrets.NuGetAPIKey }}
           nuget-version: '5.x'
           
-      # Build Il2CppAssemblyUnhollower
-      - run: msbuild lib\Il2CppAssemblyUnhollower\UnhollowerBaseLib\UnhollowerBaseLib.csproj -t:Restore -t:Rebuild -p:Platform="AnyCPU" -p:Configuration=Release
-      
       # Build mcs
       - run: nuget restore lib\mcs-unity\mcs.sln
       - run: msbuild lib\mcs-unity\mcs\mcs.csproj -t:Restore -t:Rebuild -p:Platform="AnyCPU" -p:Configuration=Release
         
       # Build UnityExplorer releases, and upload artifacts
       
+      - run: dotnet nuget add source https://nuget.bepinex.dev/v3/index.json
       - run: nuget restore src\UnityExplorer.sln      
       
       # BepInEx Il2Cpp

.gitmodules

@@ -1,6 +1,3 @@
-[submodule "lib/Il2CppAssemblyUnhollower"]
-	path = lib/Il2CppAssemblyUnhollower
-	url = https://github.com/knah/Il2CppAssemblyUnhollower
 [submodule "lib/mcs-unity"]
 	path = lib/mcs-unity
 	url = https://github.com/sinai-dev/mcs-unity

README.md

@@ -35,7 +35,7 @@
 | ------- | ------ | ---- |
 | ML 0.4+ | ✅ [link](https://github.com/sinai-dev/UnityExplorer/releases/latest/download/UnityExplorer.MelonLoader.Il2Cpp.zip) | ✅ [link](https://github.com/sinai-dev/UnityExplorer/releases/latest/download/UnityExplorer.MelonLoader.Mono.zip) | 
 
-1. Take the `UnityExplorer.ML.[version].dll` and the `UniverseLib.[version].dll` files and put them in the `Mods\` folder created by MelonLoader.
+1. Take the `UnityExplorer.ML.[version].dll` file and put them in the `Mods\` folder created by MelonLoader, and then put the `UniverseLib.[version].dll` file in the `UserLibs\` folder.
 
 ## Standalone
 
@@ -43,9 +43,10 @@
 | ------ | ---- |
 | ✅ [link](https://github.com/sinai-dev/UnityExplorer/releases/latest/download/UnityExplorer.Standalone.Il2Cpp.zip) | ✅ [link](https://github.com/sinai-dev/UnityExplorer/releases/latest/download/UnityExplorer.Standalone.Mono.zip) | 
 
-The standalone release can be used with any injector or loader of your choice, but it requires you to load the dependencies manually: HarmonyX, and the IL2CPP version also requires that you set up an [Il2CppAssemblyUnhollower runtime](https://github.com/knah/Il2CppAssemblyUnhollower#required-external-setup).
+The standalone release can be used with any injector or loader of your choice, but it requires you to load the dependencies manually.
 
-1. Load the required libs - UniverseLib, HarmonyX, and Il2CppAssemblyUnhollower if IL2CPP
+1. Ensure the required libs are loaded - UniverseLib, HarmonyX and MonoMod
+2. For IL2CPP, load Il2CppAssemblyUnhollower and start an [Il2CppAssemblyUnhollower runtime](https://github.com/knah/Il2CppAssemblyUnhollower#required-external-setup)
 2. Load the UnityExplorer DLL
 3. Create an instance of Unity Explorer with `UnityExplorer.ExplorerStandalone.CreateInstance();`
 4. Optionally subscribe to the `ExplorerStandalone.OnLog` event to handle logging if you wish
@@ -57,7 +58,7 @@ Although UnityExplorer should work out of the box for most Unity games, in some
 To adjust the settings, open the config file:
 * BepInEx: `BepInEx\config\com.sinai.unityexplorer.cfg`
 * MelonLoader: `UserData\MelonPreferences.cfg`
-* Standalone: `UnityExplorer\config.ini`
+* Standalone: `UnityExplorer\config.cfg`
 
 Try adjusting the following settings and see if it fixes your issues:
 * `Startup_Delay_Time` - increase to 5-10 seconds (or more as needed), can fix issues with UnityExplorer being destroyed or corrupted during startup.
@@ -109,24 +110,30 @@ The inspector is used to see detailed information on objects of any type and man
 
 ### Mouse-Inspect
 
-* The "Mouse Inspect" dropdown on the main UnityExplorer navbar allows you to inspect objects under the mouse.
+* The "Mouse Inspect" dropdown in the "Inspector" panel allows you to inspect objects under the mouse.
   * <b>World</b>: uses Physics.Raycast to look for Colliders
   * <b>UI</b>: uses GraphicRaycasters to find UI objects
 
+### Clipboard
+
+* The "Clipboard" panel allows you to see your current paste value, or clear it (resets it to `null`)
+  * Can copy the value from any member in a Reflection Inspector, Enumerable or Dictionary, and from the target of any Inspector tab
+  * Can paste values onto any member in a Reflection Inspector
+  * Non-parsable arguments in Method/Property Evaluators allow pasting values
+  * The C# Console has helper methods `Copy(obj)` and `Paste()` for accessing the Clipboard
+
 ### Settings
 
 * You can change the settings via the "Options" tab of the menu, or directly from the config file.
   * BepInEx: `BepInEx\config\com.sinai.unityexplorer.cfg`
   * MelonLoader: `UserData\MelonPreferences.cfg`
-  * Standalone `{DLL_location}\UnityExplorer\config.ini`
+  * Standalone `{DLL_location}\UnityExplorer\config.cfg`
 
 # Building
 
-For Visual Studio:
-
 0. Clone the repository and run `git submodule update --init --recursive` to get the submodules.
 1. Open the `src\UnityExplorer.sln` project.
-2. Build `mcs` (Release/AnyCPU, you may need to run `nuget restore mcs.sln`), and if using IL2CPP then build `Il2CppAssemblyUnhollower` (Release/AnyCPU) as well.
+2. Build `mcs` (Release/AnyCPU, you may need to run `nuget restore mcs.sln`)
 3. Build the UnityExplorer release(s) you want to use, either by selecting the config as the Active Config, or batch-building.
 
 If you fork the repository on GitHub you can build using the [dotnet workflow](https://github.com/sinai-dev/UnityExplorer/blob/master/.github/workflows/dotnet.yml):
@@ -138,7 +145,7 @@ If you fork the repository on GitHub you can build using the [dotnet workflow](h
 # Acknowledgments
 
 * [ManlyMarco](https://github.com/ManlyMarco) for [Runtime Unity Editor](https://github.com/ManlyMarco/RuntimeUnityEditor) \[[license](THIRDPARTY_LICENSES.md#runtimeunityeditor-license)\], the ScriptEvaluator from RUE's REPL console was used as the base for UnityExplorer's C# console.
-* [denikson](https://github.com/denikson) (aka Horse) for [mcs-unity](https://github.com/denikson/mcs-unity) \[no license\], used as the `Mono.CSharp` reference for the C# Console.
+* [Geoffrey Horsington](https://github.com/ghorsington) for [mcs-unity](https://github.com/sinai-dev/mcs-unity) \[no license\], used as the `Mono.CSharp` reference for the C# Console.
 
 ### Disclaimer
 

src/CSConsole/CSAutoCompleter.cs

@@ -8,6 +8,8 @@ using UnityExplorer.UI;
 using UnityExplorer.UI.Widgets.AutoComplete;
 using UniverseLib;
 using UniverseLib.UI;
+using UniverseLib.UI.Models;
+using UniverseLib.Utility;
 
 namespace UnityExplorer.CSConsole
 {
@@ -25,7 +27,7 @@ namespace UnityExplorer.CSConsole
             AutoCompleteModal.Instance.ReleaseOwnership(this);
         }
 
-        private readonly HashSet<char> delimiters = new HashSet<char>
+        private readonly HashSet<char> delimiters = new()
         {
             '{', '}', ',', ';', '<', '>', '(', ')', '[', ']', '=', '|', '&', '?'
         };

src/CSConsole/ConsoleController.cs

@@ -16,6 +16,10 @@ using UnityExplorer.UI.Panels;
 using UnityExplorer.UI.Widgets.AutoComplete;
 using UniverseLib.UI;
 using UniverseLib;
+using UniverseLib.UI.Models;
+using UniverseLib.Utility;
+using HarmonyLib;
+using UniverseLib.Runtime;
 
 namespace UnityExplorer.CSConsole
 {
@@ -27,6 +31,7 @@ namespace UnityExplorer.CSConsole
 
         private static HashSet<string> usingDirectives;
         private static StringBuilder evaluatorOutput;
+        private static StringWriter evaluatorStringWriter;
 
         public static CSConsolePanel Panel => UIManager.GetPanel<CSConsolePanel>(UIManager.Panels.CSConsole);
         public static InputFieldRef Input => Panel.Input;
@@ -46,6 +51,7 @@ namespace UnityExplorer.CSConsole
             "System",
             "System.Linq",
             "System.Text",
+            "System.Collections",
             "System.Collections.Generic",
             "UnityEngine",
 #if CPP
@@ -56,6 +62,8 @@ namespace UnityExplorer.CSConsole
 
         public static void Init()
         {
+            InitEventSystemPropertyHandlers();
+
             // Make sure console is supported on this platform
             try
             {
@@ -130,6 +138,12 @@ namespace UnityExplorer.CSConsole
 
         #region Evaluating
 
+        private static void GenerateTextWriter()
+        {
+            evaluatorOutput = new StringBuilder();
+            evaluatorStringWriter = new StringWriter(evaluatorOutput);
+        }
+
         public static void ResetConsole() => ResetConsole(true);
 
         public static void ResetConsole(bool logSuccess = true)
@@ -140,8 +154,8 @@ namespace UnityExplorer.CSConsole
             if (Evaluator != null)
                 Evaluator.Dispose();
 
-            evaluatorOutput = new StringBuilder();
-            Evaluator = new ScriptEvaluator(new StringWriter(evaluatorOutput))
+            GenerateTextWriter();
+            Evaluator = new ScriptEvaluator(evaluatorStringWriter)
             {
                 InteractiveBaseClass = typeof(ScriptInteraction)
             };
@@ -176,6 +190,12 @@ namespace UnityExplorer.CSConsole
             if (SRENotSupported)
                 return;
 
+            if (evaluatorStringWriter == null || evaluatorOutput == null)
+            {
+                GenerateTextWriter();
+                Evaluator._textWriter = evaluatorStringWriter;
+            }
+
             try
             {
                 // Compile the code. If it returned a CompiledMethod, it is REPL.
@@ -343,7 +363,7 @@ namespace UnityExplorer.CSConsole
                 var charTop = charInfo.cursorPos.y;
                 var charBot = charTop - CSCONSOLE_LINEHEIGHT;
 
-                var viewportMin = Input.Rect.rect.height - Input.Rect.anchoredPosition.y - (Input.Rect.rect.height * 0.5f);
+                var viewportMin = Input.Transform.rect.height - Input.Transform.anchoredPosition.y - (Input.Transform.rect.height * 0.5f);
                 var viewportMax = viewportMin - Panel.InputScroller.ViewportRect.rect.height;
 
                 float diff = 0f;
@@ -354,7 +374,7 @@ namespace UnityExplorer.CSConsole
 
                 if (Math.Abs(diff) > 1)
                 {
-                    var rect = Input.Rect;
+                    var rect = Input.Transform;
                     rect.anchoredPosition = new Vector2(rect.anchoredPosition.x, rect.anchoredPosition.y - diff);
                 }
             }
@@ -364,33 +384,84 @@ namespace UnityExplorer.CSConsole
         {
             settingCaretCoroutine = true;
             Input.Component.readOnly = true;
-            RuntimeProvider.Instance.StartCoroutine(SetCaretCoroutine(caretPosition));
+            RuntimeHelper.StartCoroutine(SetCaretCoroutine(caretPosition));
         }
 
-        internal static PropertyInfo SelectionGuardProperty => selectionGuardPropInfo ?? GetSelectionGuardPropInfo();
-
-        private static PropertyInfo GetSelectionGuardPropInfo()
+        static void InitEventSystemPropertyHandlers()
         {
-            selectionGuardPropInfo = typeof(EventSystem).GetProperty("m_SelectionGuard");
-            if (selectionGuardPropInfo == null)
-                selectionGuardPropInfo = typeof(EventSystem).GetProperty("m_selectionGuard");
-            return selectionGuardPropInfo;
+            try
+            {
+                foreach (var member in typeof(EventSystem).GetMembers(AccessTools.all))
+                {
+                    if (member.Name == "m_CurrentSelected")
+                    {
+                        Type backingType;
+                        if (member.MemberType == MemberTypes.Property)
+                            backingType = (member as PropertyInfo).PropertyType;
+                        else
+                            backingType = (member as FieldInfo).FieldType;
+
+                        usingEventSystemDictionaryMembers = ReflectionUtility.IsDictionary(backingType);
+                        break;
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                ExplorerCore.LogWarning($"Exception checking EventSystem property backing type: {ex}");
+            }
         }
 
-        private static PropertyInfo selectionGuardPropInfo;
+        static bool usingEventSystemDictionaryMembers;
+
+        static readonly AmbiguousMemberHandler<EventSystem, GameObject> m_CurrentSelected_Handler_Normal 
+            = new(true, true, "m_CurrentSelected", "m_currentSelected");
+        static readonly AmbiguousMemberHandler<EventSystem, Dictionary<int, GameObject>> m_CurrentSelected_Handler_Dictionary 
+            = new(true, true, "m_CurrentSelected", "m_currentSelected");
+
+        static readonly AmbiguousMemberHandler<EventSystem, bool> m_SelectionGuard_Handler_Normal 
+            = new(true, true, "m_SelectionGuard", "m_selectionGuard");
+        static readonly AmbiguousMemberHandler<EventSystem, Dictionary<int, bool>> m_SelectionGuard_Handler_Dictionary 
+            = new(true, true, "m_SelectionGuard", "m_selectionGuard");
+
+        static void SetCurrentSelectedGameObject(EventSystem instance, GameObject value)
+        {
+            instance.SetSelectedGameObject(value);
+
+            if (usingEventSystemDictionaryMembers)
+                m_CurrentSelected_Handler_Dictionary.GetValue(instance)[0] = value;
+            else
+                m_CurrentSelected_Handler_Normal.SetValue(instance, value);
+        }
+
+        static void SetSelectionGuard(EventSystem instance, bool value)
+        {
+            if (usingEventSystemDictionaryMembers)
+                m_SelectionGuard_Handler_Dictionary.GetValue(instance)[0] = value;
+            else
+                m_SelectionGuard_Handler_Normal.SetValue(instance, value);
+        }
 
         private static IEnumerator SetCaretCoroutine(int caretPosition)
         {
             var color = Input.Component.selectionColor;
             color.a = 0f;
             Input.Component.selectionColor = color;
-            try { EventSystem.current.SetSelectedGameObject(null, null); } catch { }
-            yield return null;
 
-            try { SelectionGuardProperty.SetValue(EventSystem.current, false, null); } catch { }
-            try { EventSystem.current.SetSelectedGameObject(Input.UIRoot, null); } catch { }
+            try { SetCurrentSelectedGameObject(CursorUnlocker.CurrentEventSystem, null); } 
+            catch (Exception ex) { ExplorerCore.Log($"Failed removing selected object: {ex}"); }
+
+            yield return null; // ~~~~~~~ YIELD FRAME ~~~~~~~~~
+
+            try { SetSelectionGuard(CursorUnlocker.CurrentEventSystem, false); }
+            catch (Exception ex) { ExplorerCore.Log($"Failed setting selection guard: {ex}"); }
+
+            try { SetCurrentSelectedGameObject(CursorUnlocker.CurrentEventSystem, Input.GameObject); } 
+            catch (Exception ex) { ExplorerCore.Log($"Failed setting selected gameobject: {ex}"); }
+
+            yield return null; // ~~~~~~~ YIELD FRAME ~~~~~~~~~
+
             Input.Component.Select();
-            yield return null;
 
             Input.Component.caretPosition = caretPosition;
             Input.Component.selectionFocusPosition = caretPosition;
@@ -424,7 +495,7 @@ namespace UnityExplorer.CSConsole
 
             // the top and bottom position of the viewport in relation to the text height
             // they need the half-height adjustment to normalize against the 'line.topY' value.
-            var viewportMin = Input.Rect.rect.height - Input.Rect.anchoredPosition.y - (Input.Rect.rect.height * 0.5f);
+            var viewportMin = Input.Transform.rect.height - Input.Transform.anchoredPosition.y - (Input.Transform.rect.height * 0.5f);
             var viewportMax = viewportMin - Panel.InputScroller.ViewportRect.rect.height;
 
             for (int i = 0; i < Input.TextGenerator.lineCount; i++)
@@ -589,7 +660,7 @@ If the game was built with Unity's stubbed netstandard 2.0 runtime, you can fix
             }
         }
 
-        private static readonly Dictionary<string, string> helpDict = new Dictionary<string, string>();
+        private static readonly Dictionary<string, string> helpDict = new();
 
         public static void SetupHelpInteraction()
         {
@@ -644,15 +715,18 @@ var x = 5;
 ++x;
 
 /* The following helpers are available in REPL mode:
+ * CurrentTarget;     - System.Object, the target of the active Inspector tab
+ * AllTargets;        - System.Object[], the targets of all Inspector tabs
+ * Log(obj);          - prints a message to the console log
+ * Inspect(obj);      - inspect the object with the Inspector
+ * Inspect(someType); - inspect a Type with static reflection
+ * Start(enumerator); - Coroutine, starts the IEnumerator as a Coroutine, and returns the Coroutine.
+ * Stop(coroutine);   - stop the Coroutine ONLY if it was started with Start(ienumerator).
+ * Copy(obj);         - copies the object to the UnityExplorer Clipboard
+ * Paste();           - System.Object, the contents of the Clipboard.
  * GetUsing();        - prints the current using directives to the console log
  * GetVars();         - prints the names and values of the REPL variables you have defined
  * GetClasses();      - prints the names and members of the classes you have defined
- * Log(obj);          - prints a message to the console log
- * CurrentTarget;     - System.Object, the target of the active Inspector tab
- * AllTargets;        - System.Object[], the targets of all Inspector tabs
- * Inspect(obj);      - inspect the object with the Inspector
- * Inspect(someType); - inspect a Type with static reflection
- * Start(enumerator); - starts the IEnumerator as a Coroutine
  * help;              - the default REPL help command, contains additional helpers.
 */";
 

src/CSConsole/LexerBuilder.cs

@@ -7,6 +7,7 @@ using UnityEngine;
 using UnityEngine.UI;
 using UnityExplorer.CSConsole.Lexers;
 using UniverseLib;
+using UniverseLib.Utility;
 
 namespace UnityExplorer.CSConsole
 {

src/CSConsole/Lexers/Lexer.cs

@@ -2,6 +2,7 @@
 using System.Linq;
 using UnityEngine;
 using UniverseLib;
+using UniverseLib.Utility;
 
 namespace UnityExplorer.CSConsole.Lexers
 {

src/CSConsole/ScriptEvaluator.cs

@@ -51,13 +51,8 @@ namespace UnityExplorer.CSConsole
             ReferenceAssembly(asm);
         }
 
-        private static CompilerContext context;
-
         private static CompilerContext BuildContext(TextWriter tw)
         {
-            if (context != null)
-                return context;
-
             _reportPrinter = new StreamReportPrinter(tw);
 
             var settings = new CompilerSettings
@@ -70,7 +65,7 @@ namespace UnityExplorer.CSConsole
                 EnhancedWarnings = false
             };
 
-            return context = new CompilerContext(settings, _reportPrinter);
+            return new CompilerContext(settings, _reportPrinter);
         }
 
         private static void ImportAppdomainAssemblies(Action<Assembly> import)

src/CSConsole/ScriptInteraction.cs

@@ -1,45 +1,48 @@
-using Mono.CSharp;
+using HarmonyLib;
+using Mono.CSharp;
 using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using UnityEngine;
-using UnityExplorer.Core.Runtime;
+using UnityExplorer.Runtime;
+using UnityExplorer.UI.Panels;
 using UniverseLib;
 
 namespace UnityExplorer.CSConsole
 {
     public class ScriptInteraction : InteractiveBase
     {
+        public static object CurrentTarget
+            => InspectorManager.ActiveInspector?.Target;
+
+        public static object[] AllTargets
+            => InspectorManager.Inspectors.Select(it => it.Target).ToArray();
+
         public static void Log(object message)
-        {
-            ExplorerCore.Log(message);
-        }
-
-        public static object CurrentTarget => InspectorManager.ActiveInspector?.Target;
-
-        public static object[] AllTargets => InspectorManager.Inspectors.Select(it => it.Target).ToArray();
+            => ExplorerCore.Log(message);
 
         public static void Inspect(object obj)
-        {
-            InspectorManager.Inspect(obj);
-        }
+            => InspectorManager.Inspect(obj);
 
         public static void Inspect(Type type)
-        {
-            InspectorManager.Inspect(type);
-        }
+            => InspectorManager.Inspect(type);
 
-        public static void Start(IEnumerator ienumerator)
-        {
-            RuntimeProvider.Instance.StartCoroutine(ienumerator);
-        }
+        public static Coroutine Start(IEnumerator ienumerator) 
+            => RuntimeHelper.StartCoroutine(ienumerator);
+
+        public static void Stop(Coroutine coro)
+            => RuntimeHelper.StopCoroutine(coro);
+
+        public static void Copy(object obj) 
+            => ClipboardPanel.Copy(obj);
+
+        public static object Paste() 
+            => ClipboardPanel.Current;
 
         public static void GetUsing()
-        {
-            Log(Evaluator.GetUsing());
-        }
+            => Log(Evaluator.GetUsing());
 
         public static void GetVars()
         {
@@ -52,7 +55,7 @@ namespace UnityExplorer.CSConsole
 
         public static void GetClasses()
         {
-            if (ReflectionUtility.GetFieldInfo(typeof(Evaluator), "source_file")
+            if (AccessTools.Field(typeof(Evaluator), "source_file")
                     .GetValue(Evaluator) is CompilationSourceFile sourceFile
                 && sourceFile.Containers.Any())
             {

src/CacheObject/CacheConfigEntry.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using UnityExplorer.Core.Config;
+using UnityExplorer.Config;
 using UnityExplorer.CacheObject.Views;
 
 namespace UnityExplorer.CacheObject
@@ -44,6 +44,6 @@ namespace UnityExplorer.CacheObject
             RefConfigElement.BoxedValue = value;
         }
 
-        protected override bool SetCellEvaluateState(CacheObjectCell cell) => false;
+        protected override bool TryAutoEvaluateIfUnitialized(CacheObjectCell cell) => true;
     }
 }

src/CacheObject/CacheConstructor.cs

@@ -0,0 +1,83 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using UnityExplorer.Inspectors;
+using UniverseLib.Utility;
+
+namespace UnityExplorer.CacheObject
+{
+    public class CacheConstructor : CacheMember
+    {
+        public ConstructorInfo CtorInfo { get; }
+        readonly Type typeForStructConstructor;
+
+        public override Type DeclaringType => typeForStructConstructor ?? CtorInfo.DeclaringType;
+        public override bool IsStatic => true;
+        public override bool ShouldAutoEvaluate => false;
+        public override bool CanWrite => false;
+
+        public CacheConstructor(ConstructorInfo ci)
+        {
+            this.CtorInfo = ci;
+        }
+
+        public CacheConstructor(Type typeForStructConstructor)
+        {
+            this.typeForStructConstructor = typeForStructConstructor;
+        }
+
+        public override void SetInspectorOwner(ReflectionInspector inspector, MemberInfo member)
+        {
+            // if is parameterless struct ctor
+            if (typeForStructConstructor != null)
+            {
+                this.Owner = inspector;
+
+                // eg. Vector3.Vector3()
+                this.NameLabelText = SignatureHighlighter.Parse(typeForStructConstructor, false);
+                NameLabelText += $".{NameLabelText}()";
+
+                this.NameForFiltering = SignatureHighlighter.RemoveHighlighting(NameLabelText);
+                this.NameLabelTextRaw = NameForFiltering;
+                return;
+            }
+
+            base.SetInspectorOwner(inspector, member);
+
+            Arguments = CtorInfo.GetParameters();
+            if (CtorInfo.DeclaringType.IsGenericTypeDefinition)
+                GenericArguments = CtorInfo.DeclaringType.GetGenericArguments();
+        }
+
+        protected override object TryEvaluate()
+        {
+            try
+            {
+                Type returnType = DeclaringType;
+
+                if (returnType.IsGenericTypeDefinition)
+                    returnType = DeclaringType.MakeGenericType(Evaluator.TryParseGenericArguments());
+
+                object ret;
+                if (HasArguments)
+                    ret = Activator.CreateInstance(returnType, Evaluator.TryParseArguments());
+                else
+                    ret = Activator.CreateInstance(returnType, ArgumentUtility.EmptyArgs);
+
+                HadException = false;
+                LastException = null;
+                return ret;
+            }
+            catch (Exception ex)
+            {
+                HadException = true;
+                LastException = ex;
+                return null;
+            }
+        }
+
+        protected override void TrySetValue(object value) => throw new NotImplementedException("You can't set a constructor");
+    }
+}

src/CacheObject/CacheField.cs

@@ -17,6 +17,11 @@ namespace UnityExplorer.CacheObject
 
         public override bool ShouldAutoEvaluate => true;
 
+        public CacheField(FieldInfo fi)
+        {
+            this.FieldInfo = fi;
+        }
+
         public override void SetInspectorOwner(ReflectionInspector inspector, MemberInfo member)
         {
             base.SetInspectorOwner(inspector, member);

src/CacheObject/CacheKeyValuePair.cs

@@ -5,6 +5,7 @@ using System.Text;
 using UnityExplorer.CacheObject.IValues;
 using UnityExplorer.CacheObject.Views;
 using UniverseLib;
+using UniverseLib.Utility;
 
 namespace UnityExplorer.CacheObject
 {
@@ -92,10 +93,6 @@ namespace UnityExplorer.CacheObject
         }
 
 
-        protected override bool SetCellEvaluateState(CacheObjectCell cell)
-        {
-            // not needed
-            return false;
-        }
+        protected override bool TryAutoEvaluateIfUnitialized(CacheObjectCell cell) => true;
     }
 }

src/CacheObject/CacheListEntry.cs

@@ -13,7 +13,7 @@ namespace UnityExplorer.CacheObject
 
         public override bool ShouldAutoEvaluate => true;
         public override bool HasArguments => false;
-        public override bool CanWrite => Owner.CanWrite;
+        public override bool CanWrite => Owner?.CanWrite ?? false;
 
         public void SetListOwner(InteractiveList list, int listIndex)
         {
@@ -37,11 +37,6 @@ namespace UnityExplorer.CacheObject
             (Owner as InteractiveList).TrySetValueToIndex(value, this.ListIndex);
         }
 
-
-        protected override bool SetCellEvaluateState(CacheObjectCell cell)
-        {
-            // not needed
-            return false;
-        }
+        protected override bool TryAutoEvaluateIfUnitialized(CacheObjectCell cell) => true;
     }
 }

src/CacheObject/CacheMember.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Reflection;
 using System.Text;
 using UnityEngine;
-using UnityExplorer.Core.Runtime;
+using UnityExplorer.Runtime;
 using UnityExplorer.CacheObject.Views;
 using UnityExplorer.Inspectors;
 using UniverseLib.UI.Models;
@@ -12,6 +12,10 @@ using UnityExplorer.UI;
 using UniverseLib;
 using UniverseLib.UI;
 using UnityExplorer.UI.Widgets;
+using UniverseLib.Utility;
+using UniverseLib.UI.ObjectPool;
+using System.Collections;
+using HarmonyLib;
 
 namespace UnityExplorer.CacheObject
 {
@@ -19,7 +23,7 @@ namespace UnityExplorer.CacheObject
     {
         public abstract Type DeclaringType { get; }
         public string NameForFiltering { get; protected set; }
-        public object DeclaringInstance => IsStatic ? null : (m_declaringInstance ?? (m_declaringInstance = Owner.Target.TryCast(DeclaringType)));
+        public object DeclaringInstance => IsStatic ? null : (m_declaringInstance ??= Owner.Target.TryCast(DeclaringType));
         private object m_declaringInstance;
 
         public abstract bool IsStatic { get; }
@@ -32,8 +36,14 @@ namespace UnityExplorer.CacheObject
         public virtual void SetInspectorOwner(ReflectionInspector inspector, MemberInfo member)
         {
             this.Owner = inspector;
-            this.NameLabelText = SignatureHighlighter.Parse(member.DeclaringType, false, member);
-            this.NameForFiltering = $"{member.DeclaringType.Name}.{member.Name}";
+            this.NameLabelText = this switch
+            {
+                CacheMethod => SignatureHighlighter.HighlightMethod(member as MethodInfo),
+                CacheConstructor => SignatureHighlighter.HighlightConstructor(member as ConstructorInfo),
+                _ => SignatureHighlighter.Parse(member.DeclaringType, false, member),
+            };
+
+            this.NameForFiltering = SignatureHighlighter.RemoveHighlighting(NameLabelText);
             this.NameLabelTextRaw = NameForFiltering;
         }
 
@@ -90,10 +100,10 @@ namespace UnityExplorer.CacheObject
             base.SetValueState(cell, args);
         }
 
-        private static readonly Color evalEnabledColor = new Color(0.15f, 0.25f, 0.15f);
-        private static readonly Color evalDisabledColor = new Color(0.15f, 0.15f, 0.15f);
+        private static readonly Color evalEnabledColor = new(0.15f, 0.25f, 0.15f);
+        private static readonly Color evalDisabledColor = new(0.15f, 0.15f, 0.15f);
 
-        protected override bool SetCellEvaluateState(CacheObjectCell objectcell)
+        protected override bool TryAutoEvaluateIfUnitialized(CacheObjectCell objectcell)
         {
             var cell = objectcell as CacheMemberCell;
 
@@ -109,14 +119,14 @@ namespace UnityExplorer.CacheObject
                     {
                         cell.EvaluateButton.ButtonText.text = "Hide";
                         Evaluator.UIRoot.transform.SetParent(cell.EvaluateHolder.transform, false);
-                        RuntimeProvider.Instance.SetColorBlock(cell.EvaluateButton.Component, evalEnabledColor, evalEnabledColor * 1.3f);
+                        RuntimeHelper.SetColorBlock(cell.EvaluateButton.Component, evalEnabledColor, evalEnabledColor * 1.3f);
                     }
                 }
                 else
                     cell.EvaluateButton.ButtonText.text = "Evaluate";
 
                 if (!Evaluating)
-                    RuntimeProvider.Instance.SetColorBlock(cell.EvaluateButton.Component, evalDisabledColor, evalDisabledColor * 1.3f);
+                    RuntimeHelper.SetColorBlock(cell.EvaluateButton.Component, evalDisabledColor, evalDisabledColor * 1.3f);
             }
 
             if (State == ValueState.NotEvaluated && !ShouldAutoEvaluate)
@@ -124,13 +134,13 @@ namespace UnityExplorer.CacheObject
                 SetValueState(cell, ValueStateArgs.Default);
                 cell.RefreshSubcontentButton();
 
-                return true;
+                return false;
             }
 
             if (State == ValueState.NotEvaluated)
                 Evaluate();
 
-            return false;
+            return true;
         }
 
         public void OnEvaluateClicked()
@@ -146,7 +156,7 @@ namespace UnityExplorer.CacheObject
                     this.Evaluator = Pool<EvaluateWidget>.Borrow();
                     Evaluator.OnBorrowedFromPool(this);
                     Evaluator.UIRoot.transform.SetParent((CellView as CacheMemberCell).EvaluateHolder.transform, false);
-                    SetCellEvaluateState(CellView);
+                    TryAutoEvaluateIfUnitialized(CellView);
                 }
                 else
                 {
@@ -155,95 +165,105 @@ namespace UnityExplorer.CacheObject
                     else
                         Evaluator.UIRoot.SetActive(true);
 
-                    SetCellEvaluateState(CellView);
+                    TryAutoEvaluateIfUnitialized(CellView);
                 }
             }
         }
 
-
         #region Cache Member Util
 
-        //public static bool CanParseArgs(ParameterInfo[] parameters)
-        //{
-        //    foreach (var param in parameters)
-        //    {
-        //        var pType = param.ParameterType;
-        //
-        //        if (pType.IsByRef && pType.HasElementType)
-        //            pType = pType.GetElementType();
-        //
-        //        if (pType != null && ParseUtility.CanParse(pType))
-        //            continue;
-        //        else
-        //            return false;
-        //    }
-        //    return true;
-        //}
-
-        public static List<CacheMember> GetCacheMembers(object inspectorTarget, Type _type, ReflectionInspector _inspector)
+        public static List<CacheMember> GetCacheMembers(object inspectorTarget, Type type, ReflectionInspector inspector)
         {
-            var list = new List<CacheMember>();
-            var cachedSigs = new HashSet<string>();
+            //var list = new List<CacheMember>();
+            HashSet<string> cachedSigs = new();
+            List<CacheMember> props = new();
+            List<CacheMember> fields = new();
+            List<CacheMember> ctors = new();
+            List<CacheMember> methods = new();
 
-            var types = ReflectionUtility.GetAllBaseTypes(_type);
+            var types = ReflectionUtility.GetAllBaseTypes(type);
 
             var flags = BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Static;
-            if (!_inspector.StaticOnly)
+            if (!inspector.StaticOnly)
                 flags |= BindingFlags.Instance;
 
-            var infos = new List<MemberInfo>();
+            if (!type.IsAbstract)
+            {
+                // Get non-static constructors of the main type.
+                // There's no reason to get the static cctor, it will be invoked when we inspect the class.
+                // Also no point getting ctors on inherited types.
+                foreach (var ctor in type.GetConstructors(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance))
+                    TryCacheMember(ctor, ctors, cachedSigs, type, inspector);
+
+                // structs always have a parameterless constructor
+                if (type.IsValueType)
+                {
+                    CacheConstructor cached = new(type);
+                    cached.SetFallbackType(type);
+                    cached.SetInspectorOwner(inspector, null);
+                    ctors.Add(cached);
+                }
+            }
 
             foreach (var declaringType in types)
             {
                 var target = inspectorTarget;
-                if (!_inspector.StaticOnly)
+                if (!inspector.StaticOnly)
                     target = target.TryCast(declaringType);
 
-                infos.Clear();
-                infos.AddRange(declaringType.GetProperties(flags));
-                infos.AddRange(declaringType.GetFields(flags));
-                infos.AddRange(declaringType.GetMethods(flags));
+                foreach (var prop in declaringType.GetProperties(flags))
+                    if (prop.DeclaringType == declaringType)
+                        TryCacheMember(prop, props, cachedSigs, declaringType, inspector);
+
+                foreach (var field in declaringType.GetFields(flags))
+                    if (field.DeclaringType == declaringType)
+                        TryCacheMember(field, fields, cachedSigs, declaringType, inspector);
+
+                foreach (var method in declaringType.GetMethods(flags))
+                    if (method.DeclaringType == declaringType)
+                        TryCacheMember(method, methods, cachedSigs, declaringType, inspector);
 
-                foreach (var member in infos)
-                {
-                    if (member.DeclaringType != declaringType)
-                        continue;
-                    TryCacheMember(member, list, cachedSigs, declaringType, _inspector);
-                }
             }
 
-            var typeList = types.ToList();
-
             var sorted = new List<CacheMember>();
-            sorted.AddRange(list.Where(it => it is CacheProperty)
-                             .OrderBy(it => typeList.IndexOf(it.DeclaringType))
-                             .ThenBy(it => it.NameForFiltering));
-            sorted.AddRange(list.Where(it => it is CacheField)
-                             .OrderBy(it => typeList.IndexOf(it.DeclaringType))
-                             .ThenBy(it => it.NameForFiltering));
-            sorted.AddRange(list.Where(it => it is CacheMethod)
-                             .OrderBy(it => typeList.IndexOf(it.DeclaringType))
-                             .ThenBy(it => it.NameForFiltering));
-
+            sorted.AddRange(props.OrderBy(it => Array.IndexOf(types, it.DeclaringType))
+                                 .ThenBy(it => it.NameForFiltering));
+            sorted.AddRange(fields.OrderBy(it => Array.IndexOf(types, it.DeclaringType))
+                                 .ThenBy(it => it.NameForFiltering));
+            sorted.AddRange(ctors.OrderBy(it => Array.IndexOf(types, it.DeclaringType))
+                                 .ThenBy(it => it.NameForFiltering));
+            sorted.AddRange(methods.OrderBy(it => Array.IndexOf(types, it.DeclaringType))
+                                 .ThenBy(it => it.NameForFiltering));
             return sorted;
         }
 
-        private static void TryCacheMember(MemberInfo member, List<CacheMember> list, HashSet<string> cachedSigs,
-            Type declaringType, ReflectionInspector _inspector, bool ignorePropertyMethodInfos = true)
+        private static void TryCacheMember(MemberInfo member, IList list, HashSet<string> cachedSigs,
+            Type declaringType, ReflectionInspector inspector, bool ignorePropertyMethodInfos = true)
         {
             try
             {
-                if (RuntimeHelper.IsBlacklisted(member))
+                if (UERuntimeHelper.IsBlacklisted(member))
                     return;
 
                 var sig = GetSig(member);
 
-                //ExplorerCore.Log($"Trying to cache member {sig}... ({member.MemberType})");
+                // ExplorerCore.Log($"Trying to cache member {sig}... ({member.MemberType})");
 
                 CacheMember cached;
                 Type returnType;
                 switch (member.MemberType)
                 {
+                    case MemberTypes.Constructor:
+                        {
+                            var ci = member as ConstructorInfo;
+                            sig += GetArgumentString(ci.GetParameters());
+                            if (cachedSigs.Contains(sig))
+                                return;
+                            cached = new CacheConstructor(ci);
+                            returnType = ci.DeclaringType;
+                        }
+                        break;
+
                     case MemberTypes.Method:
                         {
                             var mi = member as MethodInfo;
@@ -251,15 +271,11 @@ namespace UnityExplorer.CacheObject
                                 && (mi.Name.StartsWith("get_") || mi.Name.StartsWith("set_")))
                                 return;
 
-                            //var args = mi.GetParameters();
-                            //if (!CanParseArgs(args))
-                            //    return;
-
                             sig += GetArgumentString(mi.GetParameters());
                             if (cachedSigs.Contains(sig))
                                 return;
 
-                            cached = new CacheMethod() { MethodInfo = mi };
+                            cached = new CacheMethod(mi);
                             returnType = mi.ReturnType;
                             break;
                         }
@@ -268,16 +284,12 @@ namespace UnityExplorer.CacheObject
                         {
                             var pi = member as PropertyInfo;
 
-                            //var args = pi.GetIndexParameters();
-                            //if (!CanParseArgs(args))
-                            //    return;
-
                             if (!pi.CanRead && pi.CanWrite)
                             {
                                 // write-only property, cache the set method instead.
                                 var setMethod = pi.GetSetMethod(true);
                                 if (setMethod != null)
-                                    TryCacheMember(setMethod, list, cachedSigs, declaringType, _inspector, false);
+                                    TryCacheMember(setMethod, list, cachedSigs, declaringType, inspector, false);
                                 return;
                             }
 
@@ -285,7 +297,7 @@ namespace UnityExplorer.CacheObject
                             if (cachedSigs.Contains(sig))
                                 return;
 
-                            cached = new CacheProperty() { PropertyInfo = pi };
+                            cached = new CacheProperty(pi);
                             returnType = pi.PropertyType;
                             break;
                         }
@@ -293,7 +305,7 @@ namespace UnityExplorer.CacheObject
                     case MemberTypes.Field:
                         {
                             var fi = member as FieldInfo;
-                            cached = new CacheField() { FieldInfo = fi };
+                            cached = new CacheField(fi);
                             returnType = fi.FieldType;
                             break;
                         }
@@ -304,7 +316,7 @@ namespace UnityExplorer.CacheObject
                 cachedSigs.Add(sig);
 
                 cached.SetFallbackType(returnType);
-                cached.SetInspectorOwner(_inspector, member);
+                cached.SetInspectorOwner(inspector, member);
 
                 list.Add(cached);
             }

src/CacheObject/CacheMethod.cs

@@ -5,18 +5,24 @@ using System.Reflection;
 using System.Text;
 using UnityExplorer.Inspectors;
 using UniverseLib;
+using UniverseLib.Utility;
 
 namespace UnityExplorer.CacheObject
 {
     public class CacheMethod : CacheMember
     {
-        public MethodInfo MethodInfo { get; internal set; }
+        public MethodInfo MethodInfo { get; }
         public override Type DeclaringType => MethodInfo.DeclaringType;
         public override bool CanWrite => false;
         public override bool IsStatic => MethodInfo.IsStatic;
 
         public override bool ShouldAutoEvaluate => false;
 
+        public CacheMethod (MethodInfo mi)
+        {
+            this.MethodInfo = mi;
+        }
+
         public override void SetInspectorOwner(ReflectionInspector inspector, MemberInfo member)
         {
             base.SetInspectorOwner(inspector, member);

src/CacheObject/CacheObjectBase.cs

@@ -6,13 +6,15 @@ using System.Reflection;
 using System.Text;
 using UnityEngine;
 using UnityEngine.UI;
-using UnityExplorer.Core.Runtime;
+using UnityExplorer.Runtime;
 using UnityExplorer.CacheObject.IValues;
 using UnityExplorer.CacheObject.Views;
 using UniverseLib.UI.Models;
 using UnityExplorer.UI;
 using UniverseLib;
 using UniverseLib.UI;
+using UniverseLib.Utility;
+using UniverseLib.UI.ObjectPool;
 
 namespace UnityExplorer.CacheObject
 {
@@ -254,14 +256,14 @@ namespace UnityExplorer.CacheObject
 
         // Setting cell state from our model
 
-        /// <summary>Return true if SetCell should abort, false if it should continue.</summary>
-        protected abstract bool SetCellEvaluateState(CacheObjectCell cell);
+        /// <summary>Return false if SetCell should abort, true if it should continue.</summary>
+        protected abstract bool TryAutoEvaluateIfUnitialized(CacheObjectCell cell);
 
         public virtual void SetDataToCell(CacheObjectCell cell)
         {
             cell.NameLabel.text = NameLabelText;
             if (cell.HiddenNameLabel != null)
-                cell.HiddenNameLabel.Text = NameLabelTextRaw;
+                cell.HiddenNameLabel.Text = NameLabelTextRaw ?? string.Empty;
             cell.ValueLabel.gameObject.SetActive(true);
 
             cell.SubContentHolder.gameObject.SetActive(SubContentShowWanted);
@@ -271,9 +273,21 @@ namespace UnityExplorer.CacheObject
                 IValue.SetLayout();
             }
 
-            if (SetCellEvaluateState(cell))
+            bool evaluated = TryAutoEvaluateIfUnitialized(cell);
+
+            if (cell.CopyButton != null)
+            {
+                bool hasEvaluated = State != ValueState.NotEvaluated && State != ValueState.Exception;
+                cell.CopyButton.Component.gameObject.SetActive(hasEvaluated);
+                cell.PasteButton.Component.gameObject.SetActive(hasEvaluated && this.CanWrite);
+            }
+
+            if (!evaluated)
                 return;
 
+            // The following only executes if the object has evaluated.
+            // For members and properties with args, they will return by default now.
+
             switch (State)
             {
                 case ValueState.Exception:

src/CacheObject/CacheProperty.cs

@@ -3,7 +3,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using System.Text;
+using UnityEngine;
 using UnityExplorer.Inspectors;
+using UnityExplorer.Runtime;
 
 namespace UnityExplorer.CacheObject
 {
@@ -17,6 +19,11 @@ namespace UnityExplorer.CacheObject
 
         public override bool ShouldAutoEvaluate => !HasArguments;
 
+        public CacheProperty(PropertyInfo pi)
+        {
+            this.PropertyInfo = pi;
+        }
+
         public override void SetInspectorOwner(ReflectionInspector inspector, MemberInfo member)
         {
             base.SetInspectorOwner(inspector, member);

src/CacheObject/IValues/InteractiveColor.cs

@@ -7,6 +7,8 @@ using UnityEngine.UI;
 using UnityExplorer.CacheObject;
 using UnityExplorer.UI;
 using UniverseLib.UI;
+using UniverseLib.UI.Models;
+using UniverseLib;
 
 namespace UnityExplorer.CacheObject.IValues
 {
@@ -16,11 +18,11 @@ namespace UnityExplorer.CacheObject.IValues
 
         public Color EditedColor;
 
-        private Image m_colorImage;
-        private readonly InputFieldRef[] m_inputs = new InputFieldRef[4];
-        private readonly Slider[] m_sliders = new Slider[4];
+        private Image colorImage;
+        private readonly InputFieldRef[] inputs = new InputFieldRef[4];
+        private readonly Slider[] sliders = new Slider[4];
 
-        private ButtonRef m_applyButton;
+        private ButtonRef applyButton;
 
         private static readonly string[] fieldNames = new[] { "R", "G", "B", "A" };
 
@@ -28,11 +30,11 @@ namespace UnityExplorer.CacheObject.IValues
         {
             base.OnBorrowed(owner);
 
-            m_applyButton.Component.gameObject.SetActive(owner.CanWrite);
+            applyButton.Component.gameObject.SetActive(owner.CanWrite);
 
-            foreach (var slider in m_sliders)
+            foreach (var slider in sliders)
                 slider.interactable = owner.CanWrite;
-            foreach (var input in m_inputs)
+            foreach (var input in inputs)
                 input.Component.readOnly = !owner.CanWrite;
         }
 
@@ -48,27 +50,27 @@ namespace UnityExplorer.CacheObject.IValues
             {
                 IsValueColor32 = true;
                 EditedColor = c32;
-                m_inputs[0].Text = c32.r.ToString();
-                m_inputs[1].Text = c32.g.ToString();
-                m_inputs[2].Text = c32.b.ToString();
-                m_inputs[3].Text = c32.a.ToString();
-                foreach (var slider in m_sliders)
+                inputs[0].Text = c32.r.ToString();
+                inputs[1].Text = c32.g.ToString();
+                inputs[2].Text = c32.b.ToString();
+                inputs[3].Text = c32.a.ToString();
+                foreach (var slider in sliders)
                     slider.maxValue = 255;
             }
             else
             {
                 IsValueColor32 = false;
                 EditedColor = (Color)value;
-                m_inputs[0].Text = EditedColor.r.ToString();
-                m_inputs[1].Text = EditedColor.g.ToString();
-                m_inputs[2].Text = EditedColor.b.ToString();
-                m_inputs[3].Text = EditedColor.a.ToString();
-                foreach (var slider in m_sliders)
+                inputs[0].Text = EditedColor.r.ToString();
+                inputs[1].Text = EditedColor.g.ToString();
+                inputs[2].Text = EditedColor.b.ToString();
+                inputs[3].Text = EditedColor.a.ToString();
+                foreach (var slider in sliders)
                     slider.maxValue = 1;
             }
 
-            if (m_colorImage)
-                m_colorImage.color = EditedColor;
+            if (colorImage)
+                colorImage.color = EditedColor;
         }
 
         // setting value to owner
@@ -91,8 +93,8 @@ namespace UnityExplorer.CacheObject.IValues
                 case 3: EditedColor.a = val; break;
             }
 
-            if (m_colorImage)
-                m_colorImage.color = EditedColor;
+            if (colorImage)
+                colorImage.color = EditedColor;
         }
 
         private void OnInputChanged(string val, int fieldIndex)
@@ -103,13 +105,13 @@ namespace UnityExplorer.CacheObject.IValues
                 if (IsValueColor32)
                 {
                     byte value = byte.Parse(val);
-                    m_sliders[fieldIndex].value = value;
+                    sliders[fieldIndex].value = value;
                     f = (float)((decimal)value / 255);
                 }
                 else
                 {
                     f = float.Parse(val);
-                    m_sliders[fieldIndex].value = f;
+                    sliders[fieldIndex].value = f;
                 }
 
                 SetColorField(f, fieldIndex);
@@ -129,12 +131,12 @@ namespace UnityExplorer.CacheObject.IValues
             {
                 if (IsValueColor32)
                 {
-                    m_inputs[fieldIndex].Text = ((byte)val).ToString();
+                    inputs[fieldIndex].Text = ((byte)val).ToString();
                     val /= 255f;
                 }
                 else
                 {
-                    m_inputs[fieldIndex].Text = val.ToString();
+                    inputs[fieldIndex].Text = val.ToString();
                 }
 
                 SetColorField(val, fieldIndex);
@@ -167,15 +169,15 @@ namespace UnityExplorer.CacheObject.IValues
 
             // apply button
 
-            m_applyButton = UIFactory.CreateButton(horiGroup, "ApplyButton", "Apply", new Color(0.2f, 0.26f, 0.2f));
-            UIFactory.SetLayoutElement(m_applyButton.Component.gameObject, minHeight: 25, minWidth: 90);
-            m_applyButton.OnClick += SetValueToOwner;
+            applyButton = UIFactory.CreateButton(horiGroup, "ApplyButton", "Apply", new Color(0.2f, 0.26f, 0.2f));
+            UIFactory.SetLayoutElement(applyButton.Component.gameObject, minHeight: 25, minWidth: 90);
+            applyButton.OnClick += SetValueToOwner;
 
             // image of color
 
             var imgObj = UIFactory.CreateUIObject("ColorImageHelper", horiGroup);
             UIFactory.SetLayoutElement(imgObj, minHeight: 25, minWidth: 50, flexibleWidth: 50);
-            m_colorImage = imgObj.AddComponent<Image>();
+            colorImage = imgObj.AddComponent<Image>();
 
             return UIRoot;
         }
@@ -190,11 +192,11 @@ namespace UnityExplorer.CacheObject.IValues
 
             var input = UIFactory.CreateInputField(row, "Input", "...");
             UIFactory.SetLayoutElement(input.UIRoot, minWidth: 40, minHeight: 25, flexibleHeight: 0);
-            m_inputs[index] = input;
+            inputs[index] = input;
             input.OnValueChanged += (string val) => { OnInputChanged(val, index); };
 
             var sliderObj = UIFactory.CreateSlider(row, "Slider", out Slider slider);
-            m_sliders[index] = slider;
+            sliders[index] = slider;
             UIFactory.SetLayoutElement(sliderObj, minHeight: 25, minWidth: 70, flexibleWidth: 999, flexibleHeight: 0);
             slider.minValue = 0;
             slider.maxValue = 1;

src/CacheObject/IValues/InteractiveDictionary.cs

@@ -14,6 +14,8 @@ using UnityExplorer.UI.Widgets;
 using UniverseLib;
 using UniverseLib.UI;
 using UniverseLib.UI.Widgets;
+using UniverseLib.UI.Widgets.ScrollView;
+using UniverseLib.Utility;
 
 namespace UnityExplorer.CacheObject.IValues
 {

src/CacheObject/IValues/InteractiveEnum.cs

@@ -10,6 +10,8 @@ using UnityExplorer.UI;
 using UnityExplorer.UI.Widgets.AutoComplete;
 using UniverseLib;
 using UniverseLib.UI;
+using UniverseLib.UI.Models;
+using UniverseLib.Utility;
 
 namespace UnityExplorer.CacheObject.IValues
 {
@@ -27,8 +29,11 @@ namespace UnityExplorer.CacheObject.IValues
         private EnumCompleter enumCompleter;
 
         private GameObject toggleHolder;
-        private readonly List<Toggle> flagToggles = new List<Toggle>();
-        private readonly List<Text> flagTexts = new List<Text>();
+        private readonly List<Toggle> flagToggles = new();
+        private readonly List<Text> flagTexts = new();
+
+        public CachedEnumValue ValueAtIndex(int idx) => (CachedEnumValue)CurrentValues[idx];
+        public CachedEnumValue ValueAtKey(object key) => (CachedEnumValue)CurrentValues[key];
 
         // Setting value from owner
         public override void SetValue(object value)
@@ -68,13 +73,8 @@ namespace UnityExplorer.CacheObject.IValues
         {
             try
             {
-                var split = value.ToString().Split(',');
-                var set = new HashSet<string>();
-                foreach (var s in split)
-                    set.Add(s.Trim());
-
                 for (int i = 0; i < CurrentValues.Count; i++)
-                    flagToggles[i].isOn = set.Contains(ValueAtIdx(i).Name);
+                    flagToggles[i].isOn = (value as Enum).HasFlag(ValueAtIndex(i).ActualValue as Enum);
             }
             catch (Exception ex)
             {
@@ -114,7 +114,7 @@ namespace UnityExplorer.CacheObject.IValues
                 for (int i = 0; i < CurrentValues.Count; i++)
                 {
                     if (flagToggles[i].isOn)
-                        values.Add(ValueAtIdx(i).Name);
+                        values.Add(ValueAtIndex(i).Name);
                 }
 
                 CurrentOwner.SetUserValue(Enum.Parse(EnumType, string.Join(", ", values.ToArray())));
@@ -164,9 +164,6 @@ namespace UnityExplorer.CacheObject.IValues
             return UIRoot;
         }
 
-        public CachedEnumValue ValueAtIdx(int idx) => (CachedEnumValue)CurrentValues[idx];
-        public CachedEnumValue ValueAtKey(object key) => (CachedEnumValue)CurrentValues[key];
-
         private void SetupTogglesForEnumType()
         {
             toggleHolder.SetActive(true);
@@ -189,7 +186,7 @@ namespace UnityExplorer.CacheObject.IValues
                     AddToggleRow();
 
                 flagToggles[i].isOn = false;
-                flagTexts[i].text = ValueAtIdx(i).Name;
+                flagTexts[i].text = ValueAtIndex(i).Name;
             }
         }
 

src/CacheObject/IValues/InteractiveList.cs

@@ -14,6 +14,8 @@ using UnityExplorer.UI.Widgets;
 using UniverseLib;
 using UniverseLib.UI;
 using UniverseLib.UI.Widgets;
+using UniverseLib.UI.Widgets.ScrollView;
+using UniverseLib.Utility;
 
 namespace UnityExplorer.CacheObject.IValues
 {
@@ -32,11 +34,13 @@ namespace UnityExplorer.CacheObject.IValues
         private PropertyInfo genericIndexer;
 
         public int ItemCount => cachedEntries.Count;
-        private readonly List<CacheListEntry> cachedEntries = new List<CacheListEntry>();
+        private readonly List<CacheListEntry> cachedEntries = new();
 
         public ScrollPool<CacheListEntryCell> ListScrollPool { get; private set; }
 
         public Text TopLabel;
+        private LayoutElement scrollLayout;
+        private Text NotSupportedLabel;
 
         public override void OnBorrowed(CacheObjectBase owner)
         {
@@ -65,6 +69,28 @@ namespace UnityExplorer.CacheObject.IValues
             cachedEntries.Clear();
         }
 
+        // List entry scroll pool
+
+        public override void SetLayout()
+        {
+            var minHeight = 5f;
+
+            foreach (var cell in ListScrollPool.CellPool)
+            {
+                if (cell.Enabled)
+                    minHeight += cell.Rect.rect.height;
+            }
+
+            this.scrollLayout.minHeight = Math.Min(InspectorPanel.CurrentPanelHeight - 400f, minHeight);
+        }
+
+        public void OnCellBorrowed(CacheListEntryCell cell) { } // not needed
+
+        public void SetCell(CacheListEntryCell cell, int index)
+        {
+            CacheObjectControllerHelper.SetCell(cell, index, cachedEntries, null);
+        }
+
         // Setting the List value itself to this model
         public override void SetValue(object value)
         {
@@ -212,32 +238,6 @@ namespace UnityExplorer.CacheObject.IValues
             }
         }
 
-        // List entry scroll pool
-
-        public override void SetLayout()
-        {
-            var minHeight = 5f;
-
-            foreach (var cell in ListScrollPool.CellPool)
-            {
-                if (cell.Enabled)
-                    minHeight += cell.Rect.rect.height;
-            }
-
-            this.scrollLayout.minHeight = Math.Min(InspectorPanel.CurrentPanelHeight - 400f, minHeight);
-        }
-
-        public void OnCellBorrowed(CacheListEntryCell cell) { } // not needed
-
-        public void SetCell(CacheListEntryCell cell, int index)
-        {
-            CacheObjectControllerHelper.SetCell(cell, index, cachedEntries, null);
-        }
-
-        private LayoutElement scrollLayout;
-
-        private Text NotSupportedLabel;
-
         public override GameObject CreateContent(GameObject parent)
         {
             UIRoot = UIFactory.CreateVerticalGroup(parent, "InteractiveList", true, true, true, true, 6, new Vector4(10, 3, 15, 4),

src/CacheObject/IValues/InteractiveString.cs

@@ -5,12 +5,14 @@ using System.Linq;
 using System.Text;
 using UnityEngine;
 using UnityEngine.UI;
-using UnityExplorer.Core.Config;
+using UnityExplorer.Config;
 using UnityExplorer.CacheObject;
 using UnityExplorer.UI.Widgets;
 using UnityExplorer.UI;
 using UniverseLib.UI;
 using UniverseLib;
+using UniverseLib.UI.Models;
+using UniverseLib.Utility;
 
 namespace UnityExplorer.CacheObject.IValues
 {

src/CacheObject/IValues/InteractiveValue.cs

@@ -8,6 +8,7 @@ using UnityExplorer.CacheObject;
 using UnityExplorer.UI;
 using UniverseLib.UI;
 using UniverseLib.UI.Models;
+using UniverseLib.UI.ObjectPool;
 
 namespace UnityExplorer.CacheObject.IValues
 {

src/CacheObject/IValues/InteractiveValueStruct.cs

@@ -9,6 +9,8 @@ using UnityExplorer.CacheObject;
 using UnityExplorer.UI;
 using UniverseLib;
 using UniverseLib.UI;
+using UniverseLib.UI.Models;
+using UniverseLib.Utility;
 
 namespace UnityExplorer.CacheObject.IValues
 {
@@ -55,7 +57,7 @@ namespace UnityExplorer.CacheObject.IValues
             }
         }
 
-        private static readonly Dictionary<string, StructInfo> typeSupportCache = new Dictionary<string, StructInfo>();
+        private static readonly Dictionary<string, StructInfo> typeSupportCache = new();
 
         private const BindingFlags INSTANCE_FLAGS = BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public;
         private const string SYSTEM_VOID = "System.Void";

src/CacheObject/Views/CacheConfigCell.cs

@@ -7,6 +7,7 @@ using UnityEngine.UI;
 using UnityExplorer.UI;
 using UniverseLib;
 using UniverseLib.UI;
+using UniverseLib.Utility;
 
 namespace UnityExplorer.CacheObject.Views
 {

src/CacheObject/Views/CacheKeyValuePairCell.cs

@@ -9,6 +9,7 @@ using UnityExplorer.Inspectors;
 using UnityExplorer.UI;
 using UnityExplorer.UI.Widgets;
 using UniverseLib.UI;
+using UniverseLib.UI.Models;
 
 namespace UnityExplorer.CacheObject.Views
 {

src/CacheObject/Views/CacheMemberCell.cs

@@ -7,20 +7,17 @@ using UnityEngine.UI;
 using UnityExplorer.UI;
 using UnityExplorer.UI.Widgets;
 using UniverseLib.UI;
+using UniverseLib.UI.Models;
 
 namespace UnityExplorer.CacheObject.Views
 {
     public class CacheMemberCell : CacheObjectCell
     {
-        //public ReflectionInspector Owner { get; set; }
-
         public CacheMember MemberOccupant => Occupant as CacheMember;
 
         public GameObject EvaluateHolder;
         public ButtonRef EvaluateButton;
 
-        //public Toggle UpdateToggle;
-
         protected virtual void EvaluateClicked()
         {
             this.MemberOccupant.OnEvaluateClicked();
@@ -38,16 +35,5 @@ namespace UnityExplorer.CacheObject.Views
             UIFactory.SetLayoutElement(EvaluateButton.Component.gameObject, minWidth: 100, minHeight: 25);
             EvaluateButton.OnClick += EvaluateClicked;
         }
-
-        //protected override void ConstructUpdateToggle(GameObject parent)
-        //{
-        //    // Auto-update toggle
-        //
-        //    var updateToggle = UIFactory.CreateToggle(parent, "AutoUpdate", out UpdateToggle, out Text autoText);
-        //    UIFactory.SetLayoutElement(updateToggle, minHeight: 25, minWidth: 30, flexibleWidth: 0, flexibleHeight: 0);
-        //    GameObject.Destroy(autoText);
-        //    UpdateToggle.isOn = false;
-        //    UpdateToggle.onValueChanged.AddListener((bool val) => { MemberOccupant.AutoUpdateWanted = val; });
-        //}
     }
 }

src/CacheObject/Views/CacheObjectCell.cs

@@ -4,13 +4,12 @@ using System.Linq;
 using System.Text;
 using UnityEngine;
 using UnityEngine.UI;
-using UnityExplorer.CacheObject.IValues;
-using UnityExplorer.Inspectors;
-using UnityExplorer.UI;
-using UnityExplorer.UI.Widgets;
+using UnityExplorer.UI.Panels;
 using UniverseLib;
 using UniverseLib.UI;
-using UniverseLib.UI.Widgets;
+using UniverseLib.UI.Models;
+using UniverseLib.UI.Widgets.ScrollView;
+using UniverseLib.Utility;
 
 namespace UnityExplorer.CacheObject.Views
 {
@@ -45,10 +44,12 @@ namespace UnityExplorer.CacheObject.Views
         public bool SubContentActive => SubContentHolder.activeSelf;
 
         public LayoutElement NameLayout;
+        public GameObject RightGroupContent;
         public LayoutElement RightGroupLayout;
+        public GameObject SubContentHolder;
 
         public Text NameLabel;
-        public InputFieldRef HiddenNameLabel;
+        public InputFieldRef HiddenNameLabel; // for selecting the name label
         public Text TypeLabel;
         public Text ValueLabel;
         public Toggle Toggle;
@@ -59,7 +60,11 @@ namespace UnityExplorer.CacheObject.Views
         public ButtonRef SubContentButton;
         public ButtonRef ApplyButton;
 
-        public GameObject SubContentHolder;
+        public ButtonRef CopyButton;
+        public ButtonRef PasteButton;
+
+        public readonly Color subInactiveColor = new(0.23f, 0.23f, 0.23f);
+        public readonly Color subActiveColor = new(0.23f, 0.33f, 0.23f);
 
         protected virtual void ApplyClicked()
         {
@@ -81,26 +86,26 @@ namespace UnityExplorer.CacheObject.Views
             this.Occupant.OnCellSubContentToggle();
         }
 
-        public readonly Color subInactiveColor = new Color(0.23f, 0.23f, 0.23f);
-        public readonly Color subActiveColor = new Color(0.23f, 0.33f, 0.23f);
+        protected virtual void OnCopyClicked()
+        {
+            ClipboardPanel.Copy(this.Occupant.Value);
+        }
+
+        protected virtual void OnPasteClicked()
+        {
+            if (ClipboardPanel.TryPaste(this.Occupant.FallbackType, out object paste))
+                this.Occupant.SetUserValue(paste);
+        }
 
         public void RefreshSubcontentButton()
         {
-            if (!this.SubContentHolder.activeSelf)
-            {
-                this.SubContentButton.ButtonText.text = "▲";
-                RuntimeProvider.Instance.SetColorBlock(SubContentButton.Component, subInactiveColor, subInactiveColor * 1.3f);
-            }
-            else
-            {
-                this.SubContentButton.ButtonText.text = "▼";
-                RuntimeProvider.Instance.SetColorBlock(SubContentButton.Component, subActiveColor, subActiveColor * 1.3f);
-            }
+            this.SubContentButton.ButtonText.text = SubContentHolder.activeSelf ? "▼" : "▲";
+            Color color = SubContentHolder.activeSelf ? subActiveColor : subInactiveColor;
+            RuntimeHelper.SetColorBlock(SubContentButton.Component, color, color * 1.3f);
         }
 
         protected abstract void ConstructEvaluateHolder(GameObject parent);
 
-
         public virtual GameObject CreateContent(GameObject parent)
         {
             // Main layout
@@ -136,16 +141,16 @@ namespace UnityExplorer.CacheObject.Views
 
             // Right vertical group
 
-            var rightGroupHolder = UIFactory.CreateUIObject("RightGroup", horiRow);
-            UIFactory.SetLayoutGroup<VerticalLayoutGroup>(rightGroupHolder, false, false, true, true, 4, childAlignment: TextAnchor.UpperLeft);
-            UIFactory.SetLayoutElement(rightGroupHolder, minHeight: 25, minWidth: 200, flexibleWidth: 9999, flexibleHeight: 800);
-            RightGroupLayout = rightGroupHolder.GetComponent<LayoutElement>();
+            RightGroupContent = UIFactory.CreateUIObject("RightGroup", horiRow);
+            UIFactory.SetLayoutGroup<VerticalLayoutGroup>(RightGroupContent, false, false, true, true, 4, childAlignment: TextAnchor.UpperLeft);
+            UIFactory.SetLayoutElement(RightGroupContent, minHeight: 25, minWidth: 200, flexibleWidth: 9999, flexibleHeight: 800);
+            RightGroupLayout = RightGroupContent.GetComponent<LayoutElement>();
 
-            ConstructEvaluateHolder(rightGroupHolder);
+            ConstructEvaluateHolder(RightGroupContent);
 
             // Right horizontal group
 
-            var rightHoriGroup = UIFactory.CreateUIObject("RightHoriGroup", rightGroupHolder);
+            var rightHoriGroup = UIFactory.CreateUIObject("RightHoriGroup", RightGroupContent);
             UIFactory.SetLayoutGroup<HorizontalLayoutGroup>(rightHoriGroup, false, false, true, true, 4, childAlignment: TextAnchor.UpperLeft);
             UIFactory.SetLayoutElement(rightHoriGroup, minHeight: 25, minWidth: 200, flexibleWidth: 9999, flexibleHeight: 800);
 
@@ -157,7 +162,7 @@ namespace UnityExplorer.CacheObject.Views
 
             TypeLabel = UIFactory.CreateLabel(rightHoriGroup, "ReturnLabel", "<notset>", TextAnchor.MiddleLeft);
             TypeLabel.horizontalOverflow = HorizontalWrapMode.Wrap;
-            UIFactory.SetLayoutElement(TypeLabel.gameObject, minHeight: 25, flexibleHeight: 150, minWidth: 60, flexibleWidth: 0);
+            UIFactory.SetLayoutElement(TypeLabel.gameObject, minHeight: 25, flexibleHeight: 150, minWidth: 45, flexibleWidth: 0);
 
             // Bool and number value interaction
 
@@ -187,6 +192,24 @@ namespace UnityExplorer.CacheObject.Views
             ValueLabel.horizontalOverflow = HorizontalWrapMode.Wrap;
             UIFactory.SetLayoutElement(ValueLabel.gameObject, minHeight: 25, flexibleHeight: 150, flexibleWidth: 9999);
 
+            // Copy and Paste buttons
+
+            var buttonHolder = UIFactory.CreateHorizontalGroup(rightHoriGroup, "CopyPasteButtons", false, false, true, true, 4, 
+                bgColor: new(1,1,1,0), childAlignment: TextAnchor.MiddleLeft);
+            UIFactory.SetLayoutElement(buttonHolder, minWidth: 60, flexibleWidth: 0);
+
+            CopyButton = UIFactory.CreateButton(buttonHolder, "CopyButton", "Copy", new Color(0.13f, 0.13f, 0.13f, 1f));
+            UIFactory.SetLayoutElement(CopyButton.Component.gameObject, minHeight: 25, minWidth: 28, flexibleWidth: 0);
+            CopyButton.ButtonText.color = Color.yellow;
+            CopyButton.ButtonText.fontSize = 10;
+            CopyButton.OnClick += OnCopyClicked;
+
+            PasteButton = UIFactory.CreateButton(buttonHolder, "PasteButton", "Paste", new Color(0.13f, 0.13f, 0.13f, 1f));
+            UIFactory.SetLayoutElement(PasteButton.Component.gameObject, minHeight: 25, minWidth: 28, flexibleWidth: 0);
+            PasteButton.ButtonText.color = Color.green;
+            PasteButton.ButtonText.fontSize = 10;
+            PasteButton.OnClick += OnPasteClicked;
+
             // Subcontent
 
             SubContentHolder = UIFactory.CreateUIObject("SubContent", UIRoot);

src/Config/ConfigElement.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace UnityExplorer.Core.Config
+namespace UnityExplorer.Config
 {
     public class ConfigElement<T> : IConfigElement
     {

src/Config/ConfigHandler.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace UnityExplorer.Core.Config
+namespace UnityExplorer.Config
 {
     public abstract class ConfigHandler
     {

src/Config/ConfigManager.cs

@@ -8,15 +8,20 @@ using System.Text;
 using UnityEngine;
 using UnityExplorer.UI;
 
-namespace UnityExplorer.Core.Config
+namespace UnityExplorer.Config
 {
     public static class ConfigManager
     {
+        internal static readonly Dictionary<string, IConfigElement> ConfigElements = new();
+        internal static readonly Dictionary<string, IConfigElement> InternalConfigs = new();
+
         // Each Mod Loader has its own ConfigHandler.
         // See the UnityExplorer.Loader namespace for the implementations.
         public static ConfigHandler Handler { get; private set; }
 
+        // Actual UE Settings
         public static ConfigElement<KeyCode> Master_Toggle;
+        public static ConfigElement<int> Target_Display;
         public static ConfigElement<UIManager.VerticalAnchor> Main_Navbar_Anchor;
         public static ConfigElement<bool> Force_Unlock_Mouse;
         public static ConfigElement<KeyCode> Force_Unlock_Toggle;
@@ -26,21 +31,20 @@ namespace UnityExplorer.Core.Config
         public static ConfigElement<bool> Log_Unity_Debug;
         public static ConfigElement<bool> Hide_On_Startup;
         public static ConfigElement<float> Startup_Delay_Time;
-
         public static ConfigElement<string> Reflection_Signature_Blacklist;
+        public static ConfigElement<KeyCode> World_MouseInspect_Keybind;
+        public static ConfigElement<KeyCode> UI_MouseInspect_Keybind;
 
         // internal configs
         internal static InternalConfigHandler InternalHandler { get; private set; }
+        internal static readonly Dictionary<UIManager.Panels, ConfigElement<string>> PanelSaveData = new();
 
-        public static ConfigElement<string> ObjectExplorerData;
-        public static ConfigElement<string> InspectorData;
-        public static ConfigElement<string> CSConsoleData;
-        public static ConfigElement<string> OptionsPanelData;
-        public static ConfigElement<string> ConsoleLogData;
-        public static ConfigElement<string> HookManagerData;
-
-        internal static readonly Dictionary<string, IConfigElement> ConfigElements = new Dictionary<string, IConfigElement>();
-        internal static readonly Dictionary<string, IConfigElement> InternalConfigs = new Dictionary<string, IConfigElement>();
+        internal static ConfigElement<string> GetPanelSaveData(UIManager.Panels panel)
+        {
+            if (!PanelSaveData.ContainsKey(panel))
+                PanelSaveData.Add(panel, new ConfigElement<string>(panel.ToString(), string.Empty, string.Empty, true));
+            return PanelSaveData[panel];
+        }
 
         public static void Init(ConfigHandler configHandler)
         {
@@ -78,6 +82,11 @@ namespace UnityExplorer.Core.Config
                 "The key to enable or disable UnityExplorer's menu and features.",
                 KeyCode.F7);
 
+            Target_Display = new ConfigElement<int>("Target Display",
+                "The monitor index for UnityExplorer to use, if you have multiple. 0 is the default display, 1 is secondary, etc. " +
+                "Restart recommended when changing this setting. Make sure your extra monitors are the same resolution as your primary monitor.",
+                0);
+
             Main_Navbar_Anchor = new ConfigElement<UIManager.VerticalAnchor>("Main Navbar Anchor",
                 "The vertical anchor of the main UnityExplorer Navbar, in case you want to move it.",
                 UIManager.VerticalAnchor.Top);
@@ -86,13 +95,18 @@ namespace UnityExplorer.Core.Config
                 "Should UnityExplorer be hidden on startup?",
                 false);
 
+            World_MouseInspect_Keybind = new("World Mouse-Inspect Keybind",
+                "Optional keybind to being a World-mode Mouse Inspect.",
+                KeyCode.None);
+
+            UI_MouseInspect_Keybind = new("UI Mouse-Inspect Keybind", 
+                "Optional keybind to begin a UI_mode Mouse Inspect.",
+                KeyCode.None);
+
             Force_Unlock_Mouse = new ConfigElement<bool>("Force Unlock Mouse",
                 "Force the Cursor to be unlocked (visible) when the UnityExplorer menu is open.",
                 true);
-            Force_Unlock_Mouse.OnValueChanged += (bool value) =>
-            {
-                UniverseLib.Config.ConfigManager.Force_Unlock_Mouse = value;
-            };
+            Force_Unlock_Mouse.OnValueChanged += (bool value) => UniverseLib.Config.ConfigManager.Force_Unlock_Mouse = value;
 
             Force_Unlock_Toggle = new ConfigElement<KeyCode>("Force Unlock Toggle Key",
                 "The keybind to toggle the 'Force Unlock Mouse' setting. Only usable when UnityExplorer is open.",
@@ -101,10 +115,7 @@ namespace UnityExplorer.Core.Config
             Disable_EventSystem_Override = new ConfigElement<bool>("Disable EventSystem override",
                 "If enabled, UnityExplorer will not override the EventSystem from the game.\n<b>May require restart to take effect.</b>",
                 false);
-            Disable_EventSystem_Override.OnValueChanged += (bool value) => 
-            {
-                UniverseLib.Config.ConfigManager.Disable_EventSystem_Override = value;
-            };
+            Disable_EventSystem_Override.OnValueChanged += (bool value) => UniverseLib.Config.ConfigManager.Disable_EventSystem_Override = value;
 
             Log_Unity_Debug = new ConfigElement<bool>("Log Unity Debug",
                 "Should UnityEngine.Debug.Log messages be printed to UnityExplorer's log?",
@@ -123,15 +134,6 @@ namespace UnityExplorer.Core.Config
                 "Seperate signatures with a semicolon ';'.\r\n" +
                 "For example, to blacklist Camera.main, you would add 'UnityEngine.Camera.main;'",
                 "");
-
-            // Internal configs (panel save data)
-
-            ObjectExplorerData = new ConfigElement<string>("ObjectExplorer", "", "", true);
-            InspectorData = new ConfigElement<string>("Inspector", "", "", true);
-            CSConsoleData = new ConfigElement<string>("CSConsole", "", "", true);
-            OptionsPanelData = new ConfigElement<string>("OptionsPanel", "", "", true);
-            ConsoleLogData = new ConfigElement<string>("ConsoleLog", "", "", true);
-            HookManagerData = new ConfigElement<string>("HookManager", "", "", true);
         }
     }
 }

src/Config/IConfigElement.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace UnityExplorer.Core.Config
+namespace UnityExplorer.Config
 {
     public interface IConfigElement
     {

src/Config/InternalConfigHandler.cs

@@ -0,0 +1,79 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using UnityEngine;
+using UnityExplorer.UI;
+using Tomlet;
+using Tomlet.Models;
+
+namespace UnityExplorer.Config
+{
+    public class InternalConfigHandler : ConfigHandler
+    {
+        internal static string CONFIG_PATH;
+
+        public override void Init()
+        {
+            CONFIG_PATH = Path.Combine(ExplorerCore.Loader.ExplorerFolder, "data.cfg");
+        }
+
+        public override void LoadConfig()
+        {
+            if (!TryLoadConfig())
+                SaveConfig();
+        }
+
+        public override void RegisterConfigElement<T>(ConfigElement<T> element)
+        {
+            // Not necessary
+        }
+
+        public override void SetConfigValue<T>(ConfigElement<T> element, T value)
+        {
+            // Not necessary
+        }
+
+        // Not necessary, just return the value.
+        public override T GetConfigValue<T>(ConfigElement<T> element) => element.Value;
+
+        // Always just auto-save.
+        public override void OnAnyConfigChanged() => SaveConfig();
+
+        public bool TryLoadConfig()
+        {
+            try
+            {
+                if (!File.Exists(CONFIG_PATH))
+                    return false;
+
+                TomlDocument document = TomlParser.ParseFile(CONFIG_PATH);
+                foreach (var key in document.Keys)
+                {
+                    var panelKey = (UIManager.Panels)Enum.Parse(typeof(UIManager.Panels), key);
+                    ConfigManager.GetPanelSaveData(panelKey).Value = document.GetString(key);
+                }
+
+                return true;
+            }
+            catch (Exception ex)
+            {
+                ExplorerCore.LogWarning("Error loading internal data: " + ex.ToString());
+                return false;
+            }
+        }
+
+        public override void SaveConfig()
+        {
+            if (UIManager.Initializing)
+                return;
+
+            var tomlDocument = TomlDocument.CreateEmpty();
+            foreach (var entry in ConfigManager.InternalConfigs)
+                tomlDocument.Put(entry.Key, entry.Value.BoxedValue as string, false);
+
+            File.WriteAllText(CONFIG_PATH, tomlDocument.SerializedValue);
+        }
+    }
+}

src/Core/Config/InternalConfigHandler.cs

@@ -1,105 +0,0 @@
-using IniParser.Parser;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using UnityEngine;
-using UnityExplorer.UI;
-
-namespace UnityExplorer.Core.Config
-{
-    public class InternalConfigHandler : ConfigHandler
-    {
-        internal static IniDataParser _parser;
-        internal static string INI_PATH;
-
-        public override void Init()
-        {
-            INI_PATH = Path.Combine(ExplorerCore.Loader.ExplorerFolder, "data.ini");
-            _parser = new IniDataParser();
-            _parser.Configuration.CommentString = "#";
-        }
-
-        public override void LoadConfig()
-        {
-            if (!TryLoadConfig())
-                SaveConfig();
-        }
-
-        public override void RegisterConfigElement<T>(ConfigElement<T> element)
-        {
-            // Not necessary
-        }
-
-        public override void SetConfigValue<T>(ConfigElement<T> element, T value)
-        {
-            // Not necessary
-        }
-
-        public override T GetConfigValue<T>(ConfigElement<T> element)
-        {
-            // Not necessary, just return the value.
-            return element.Value;
-        }
-
-        public override void OnAnyConfigChanged()
-        {
-            SaveConfig();
-        }
-
-        public bool TryLoadConfig()
-        {
-            try
-            {
-                if (!File.Exists(INI_PATH))
-                    return false;
-
-                string ini = File.ReadAllText(INI_PATH);
-
-                var data = _parser.Parse(ini);
-
-                foreach (var config in data.Sections["Config"])
-                {
-                    if (ConfigManager.InternalConfigs.TryGetValue(config.KeyName, out IConfigElement configElement))
-                        configElement.BoxedValue = StringToConfigValue(config.Value, configElement.ElementType);
-                }
-
-                return true;
-            }
-            catch (Exception ex)
-            {
-                ExplorerCore.LogWarning("Error loading internal data: " + ex.ToString());
-                return false;
-            }
-        }
-
-        public override void SaveConfig()
-        {
-            if (UIManager.Initializing)
-                return;
-
-            var data = new IniParser.Model.IniData();
-
-            data.Sections.AddSection("Config");
-            var sec = data.Sections["Config"];
-
-            foreach (var entry in ConfigManager.InternalConfigs)
-                sec.AddKey(entry.Key, entry.Value.BoxedValue.ToString());
-
-            File.WriteAllText(INI_PATH, data.ToString());
-        }
-
-        public object StringToConfigValue(string value, Type elementType)
-        {
-            if (elementType.IsEnum)
-                return Enum.Parse(elementType, value);
-            else if (elementType == typeof(bool))
-                return bool.Parse(value);
-            else if (elementType == typeof(int))
-                return int.Parse(value);
-            else
-                return value;
-        }
-    }
-}

src/ExplorerCore.cs

@@ -4,19 +4,21 @@ using System.Collections.Generic;
 using System.IO;
 using UnityEngine;
 using UnityEngine.UI;
-using UnityExplorer.Core.Config;
+using UnityExplorer.Config;
 using UnityExplorer.UI;
 using UnityExplorer.ObjectExplorer;
 using UnityExplorer.UI.Panels;
-using UnityExplorer.Core.Runtime;
+using UnityExplorer.Runtime;
 using UniverseLib.Input;
+using UniverseLib.UI;
+using System.Reflection;
 
 namespace UnityExplorer
 {
     public static class ExplorerCore
     {
         public const string NAME = "UnityExplorer";
-        public const string VERSION = "4.4.3";
+        public const string VERSION = "4.5.12";
         public const string AUTHOR = "Sinai";
         public const string GUID = "com.sinai.unityexplorer";
 
@@ -42,17 +44,16 @@ namespace UnityExplorer
                 Directory.CreateDirectory(Loader.ExplorerFolder);
 
             ConfigManager.Init(Loader.ConfigHandler);
-            RuntimeHelper.Init();
+            UERuntimeHelper.Init();
             ExplorerBehaviour.Setup();
+            UnityCrashPrevention.Init();
 
-            UniverseLib.Universe.Init(ConfigManager.Startup_Delay_Time.Value, LateInit, Log, new UniverseLib.Config.UUConfig
+            UniverseLib.Universe.Init(ConfigManager.Startup_Delay_Time.Value, LateInit, Log, new()
             {
                 Disable_EventSystem_Override = ConfigManager.Disable_EventSystem_Override.Value,
                 Force_Unlock_Mouse = ConfigManager.Force_Unlock_Mouse.Value,
                 Unhollowed_Modules_Folder = loader.UnhollowedModulesFolder
             });
-            
-            Log($"Finished core setup, waiting for late setup...");
         }
 
         // Do a delayed setup so that objects aren't destroyed instantly.
@@ -68,7 +69,9 @@ namespace UnityExplorer
 
             UIManager.InitUI();
 
-            Log($"{NAME} {VERSION} initialized.");
+            Log($"{NAME} {VERSION} initialized for {UniverseLib.Universe.Context}.");
+
+            //InspectorManager.Inspect(typeof(Tests.TestClass));
         }
 
         /// <summary>

src/Hooks/AddHookCell.cs

@@ -7,7 +7,9 @@ using UnityEngine.UI;
 using UnityExplorer.UI;
 using UnityExplorer.UI.Widgets;
 using UniverseLib.UI;
+using UniverseLib.UI.Models;
 using UniverseLib.UI.Widgets;
+using UniverseLib.UI.Widgets.ScrollView;
 
 namespace UnityExplorer.Hooks
 {

src/Hooks/HookCell.cs

@@ -5,7 +5,9 @@ using System.Text;
 using UnityEngine;
 using UnityEngine.UI;
 using UniverseLib.UI;
+using UniverseLib.UI.Models;
 using UniverseLib.UI.Widgets;
+using UniverseLib.UI.Widgets.ScrollView;
 
 namespace UnityExplorer.Hooks
 {

src/Hooks/HookInstance.cs

@@ -52,9 +52,9 @@ namespace UnityExplorer.Hooks
         }
 
         // Evaluator.source_file 
-        private static readonly FieldInfo fi_sourceFile = ReflectionUtility.GetFieldInfo(typeof(Evaluator), "source_file");
+        private static readonly FieldInfo fi_sourceFile = AccessTools.Field(typeof(Evaluator), "source_file");
         // TypeDefinition.Definition
-        private static readonly PropertyInfo pi_Definition = ReflectionUtility.GetPropertyInfo(typeof(TypeDefinition), "Definition");
+        private static readonly PropertyInfo pi_Definition = AccessTools.Property(typeof(TypeDefinition), "Definition");
 
         public bool CompileAndGenerateProcessor(string patchSource)
         {

src/Hooks/HookManager.cs

@@ -6,13 +6,15 @@ using System.Reflection;
 using System.Text;
 using HarmonyLib;
 using UnityEngine;
-using UnityExplorer.Core.Runtime;
+using UnityExplorer.Runtime;
 using UnityExplorer.CSConsole;
 using UnityExplorer.UI;
 using UnityExplorer.UI.Panels;
 using UnityExplorer.UI.Widgets;
 using UniverseLib;
 using UniverseLib.UI.Widgets;
+using UniverseLib.UI.Widgets.ScrollView;
+using UniverseLib.Utility;
 
 namespace UnityExplorer.Hooks
 {
@@ -84,10 +86,10 @@ namespace UnityExplorer.Hooks
             cell.CurrentDisplayedIndex = index;
             var hook = (HookInstance)this.currentHooks[index];
 
-            cell.MethodNameLabel.text = HighlightMethod(hook.TargetMethod);
+            cell.MethodNameLabel.text = SignatureHighlighter.HighlightMethod(hook.TargetMethod);
 
             cell.ToggleActiveButton.ButtonText.text = hook.Enabled ? "Enabled" : "Disabled";
-            RuntimeProvider.Instance.SetColorBlockAuto(cell.ToggleActiveButton.Component,
+            RuntimeHelper.SetColorBlockAuto(cell.ToggleActiveButton.Component,
                 hook.Enabled ? new Color(0.15f, 0.2f, 0.15f) : new Color(0.2f, 0.2f, 0.15f));
         }
 
@@ -109,7 +111,7 @@ namespace UnityExplorer.Hooks
             currentAddEligableMethods.Clear();
             foreach (var method in type.GetMethods(ReflectionUtility.FLAGS))
             {
-                if (method.IsGenericMethod /* || method.IsAbstract */ || RuntimeHelper.IsBlacklisted(method))
+                if (method.IsGenericMethod || UERuntimeHelper.IsBlacklisted(method))
                     continue;
                 currentAddEligableMethods.Add(method);
                 filteredEligableMethods.Add(method);
@@ -183,7 +185,7 @@ namespace UnityExplorer.Hooks
             cell.CurrentDisplayedIndex = index;
             var method = this.filteredEligableMethods[index];
 
-            cell.MethodNameLabel.text = HighlightMethod(method);
+            cell.MethodNameLabel.text = SignatureHighlighter.HighlightMethod(method);
 
             var sig = method.FullDescription();
             if (hookedSignatures.Contains(sig))
@@ -225,50 +227,5 @@ namespace UnityExplorer.Hooks
                 Panel.SetPage(HookManagerPanel.Pages.CurrentHooks);
             }
         }
-
-        // ~~~~~~~~~~ Method syntax highlighting
-
-        private static readonly Dictionary<string, string> highlightedMethods = new Dictionary<string, string>();
-
-        private string HighlightMethod(MethodInfo method)
-        {
-            var sig = method.FullDescription();
-            if (highlightedMethods.ContainsKey(sig))
-                return highlightedMethods[sig];
-
-            var sb = new StringBuilder();
-
-            // declaring type
-            sb.Append(SignatureHighlighter.Parse(method.DeclaringType, false));
-            sb.Append('.');
-
-            // method name
-            var color = !method.IsStatic
-                    ? SignatureHighlighter.METHOD_INSTANCE
-                    : SignatureHighlighter.METHOD_STATIC;
-            sb.Append($"<color={color}>{method.Name}</color>");
-
-            // arguments
-            sb.Append('(');
-            var args = method.GetParameters();
-            if (args != null && args.Any())
-            {
-                int i = 0;
-                foreach (var param in args)
-                {
-                    sb.Append(SignatureHighlighter.Parse(param.ParameterType, false));
-                    sb.Append(' ');
-                    sb.Append($"<color={SignatureHighlighter.LOCAL_ARG}>{param.Name}</color>");
-                    i++;
-                    if (i < args.Length)
-                        sb.Append(", ");
-                }
-            }
-            sb.Append(')');
-
-            var ret = sb.ToString();
-            highlightedMethods.Add(sig, ret);
-            return ret;
-        }
     }
 }

src/ILRepack.targets

@@ -6,9 +6,9 @@
         <ItemGroup>
             <InputAssemblies Include="$(OutputPath)$(AssemblyName).dll" />
             <InputAssemblies Include="..\lib\mcs-unity\mcs\bin\Release\mcs.dll" />
-            <InputAssemblies Include="packages\ini-parser.2.5.2\lib\net20\INIFileParser.dll" />
+            <InputAssemblies Include="packages\Samboy063.Tomlet.3.1.3\lib\net35\Tomlet.dll" />
         </ItemGroup>
-        
+
         <!-- Required references for ILRepack -->
         <ItemGroup>
             <ReferenceFolders Include="packages\HarmonyX.2.5.2\lib\net35\" />

src/Inspectors/GameObjectInspector.cs

@@ -14,6 +14,8 @@ using UnityExplorer.UI.Widgets.AutoComplete;
 using UniverseLib.UI.Widgets;
 using UniverseLib.UI;
 using UniverseLib;
+using UniverseLib.UI.Widgets.ScrollView;
+using UniverseLib.Utility;
 
 namespace UnityExplorer.Inspectors
 {
@@ -44,7 +46,7 @@ namespace UnityExplorer.Inspectors
             GOControls.UpdateGameObjectInfo(true, true);
             GOControls.UpdateTransformControlValues(true);
 
-            RuntimeProvider.Instance.StartCoroutine(InitCoroutine());
+            RuntimeHelper.StartCoroutine(InitCoroutine());
         }
 
         private IEnumerator InitCoroutine()
@@ -80,7 +82,7 @@ namespace UnityExplorer.Inspectors
             this.Target = newTarget;
             GOControls.UpdateGameObjectInfo(true, true);
             GOControls.UpdateTransformControlValues(true);
-            TransformTree.RefreshData(true, false);
+            TransformTree.RefreshData(true, false, true, false);
             UpdateComponents();
         }
 
@@ -107,7 +109,7 @@ namespace UnityExplorer.Inspectors
 
                 GOControls.UpdateGameObjectInfo(false, false);
 
-                TransformTree.RefreshData(true, false);
+                TransformTree.RefreshData(true, false, false, false);
                 UpdateComponents();
             }
         }
@@ -218,7 +220,7 @@ namespace UnityExplorer.Inspectors
             var newObject = new GameObject(input);
             newObject.transform.parent = GOTarget.transform;
 
-            TransformTree.RefreshData(true, false);
+            TransformTree.RefreshData(true, false, true, false);
         }
 
         private void OnAddComponentClicked(string input)
@@ -227,7 +229,7 @@ namespace UnityExplorer.Inspectors
             {
                 try
                 {
-                    RuntimeProvider.Instance.AddComponent<Component>(GOTarget, type);
+                    RuntimeHelper.AddComponent<Component>(GOTarget, type);
                     UpdateComponents();
                 }
                 catch (Exception ex)
@@ -241,7 +243,6 @@ namespace UnityExplorer.Inspectors
             }
         }
 
-
         #region UI Construction
 
         public override GameObject CreateContent(GameObject parent)

src/Inspectors/GameObjectWidgets/ComponentCell.cs

@@ -4,10 +4,10 @@ using System.Linq;
 using System.Text;
 using UnityEngine;
 using UnityEngine.UI;
-using UnityExplorer.UI;
-using UnityExplorer.UI.Widgets;
+using UniverseLib;
 using UniverseLib.UI;
-using UniverseLib.UI.Widgets;
+using UniverseLib.UI.Models;
+using UniverseLib.UI.Widgets.ButtonList;
 
 namespace UnityExplorer.Inspectors
 {

src/Inspectors/GameObjectWidgets/ComponentList.cs

@@ -3,9 +3,10 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using UnityEngine;
-using UnityExplorer.UI.Widgets;
 using UniverseLib;
-using UniverseLib.UI.Widgets;
+using UniverseLib.UI.Widgets.ButtonList;
+using UniverseLib.UI.Widgets.ScrollView;
+using UniverseLib.Utility;
 
 namespace UnityExplorer.Inspectors
 {
@@ -113,7 +114,7 @@ namespace UnityExplorer.Inspectors
             {
                 cell.BehaviourToggle.interactable = false;
                 cell.BehaviourToggle.Set(true, false);
-                //RuntimeProvider.Instance.SetColorBlock(cell.BehaviourToggle,)
+                //RuntimeHelper.SetColorBlock(cell.BehaviourToggle,)
                 cell.BehaviourToggle.graphic.color = new Color(0.2f, 0.2f, 0.2f);
             }
 

src/Inspectors/GameObjectWidgets/GameObjectControls.cs

@@ -8,6 +8,9 @@ using UniverseLib.Input;
 using UnityExplorer.UI;
 using UniverseLib.UI;
 using UniverseLib;
+using UnityExplorer.UI.Panels;
+using UniverseLib.UI.Models;
+using UniverseLib.Utility;
 
 namespace UnityExplorer.Inspectors
 {
@@ -51,6 +54,11 @@ namespace UnityExplorer.Inspectors
             ConstructTransformControls();
         }
 
+        private void OnCopyClicked()
+        {
+            ClipboardPanel.Copy(this.GOTarget);
+        }
+
         #region GO Controls
 
         private string lastGoName;
@@ -169,7 +177,7 @@ namespace UnityExplorer.Inspectors
                 {
                     // look for inactive objects
                     var name = input.Split('/').Last();
-                    var allObjects = RuntimeProvider.Instance.FindObjectsOfTypeAll(typeof(GameObject));
+                    var allObjects = RuntimeHelper.FindObjectsOfTypeAll(typeof(GameObject));
                     var shortList = new List<GameObject>();
                     foreach (var obj in allObjects)
                         if (obj.name == name) shortList.Add(obj.TryCast<GameObject>());
@@ -467,6 +475,11 @@ namespace UnityExplorer.Inspectors
             UIFactory.SetLayoutElement(PathInput.UIRoot, minHeight: 25, minWidth: 100, flexibleWidth: 9999);
             PathInput.Component.lineType = InputField.LineType.MultiLineSubmit;
 
+            var copyButton = UIFactory.CreateButton(firstRow, "CopyButton", "Copy to Clipboard", new Color(0.2f, 0.2f, 0.2f, 1));
+            copyButton.ButtonText.color = Color.yellow;
+            UIFactory.SetLayoutElement(copyButton.Component.gameObject, minHeight: 25, minWidth: 120);
+            copyButton.OnClick += OnCopyClicked;
+
             //var pathApplyBtn = UIFactory.CreateButton(firstRow, "PathButton", "Set Parent Path", new Color(0.2f, 0.2f, 0.2f));
             //UIFactory.SetLayoutElement(pathApplyBtn.Component.gameObject, minHeight: 25, minWidth: 120);
             //pathApplyBtn.OnClick += () => { OnPathEndEdit(PathInput.Text); };
@@ -561,7 +574,7 @@ namespace UnityExplorer.Inspectors
             var layerLabel = UIFactory.CreateLabel(thirdrow, "LayerLabel", "Layer:", TextAnchor.MiddleLeft, Color.grey);
             UIFactory.SetLayoutElement(layerLabel.gameObject, minHeight: 25, minWidth: 50);
 
-            var layerDrop = UIFactory.CreateDropdown(thirdrow, out LayerDropdown, "0", 14, OnLayerDropdownChanged);
+            var layerDrop = UIFactory.CreateDropdown(thirdrow, "LayerDropdown", out LayerDropdown, "0", 14, OnLayerDropdownChanged);
             UIFactory.SetLayoutElement(layerDrop, minHeight: 25, minWidth: 110, flexibleWidth: 999);
             LayerDropdown.captionText.color = SignatureHighlighter.EnumGreen;
             if (layerToNames == null)
@@ -575,7 +588,7 @@ namespace UnityExplorer.Inspectors
             var flagsLabel = UIFactory.CreateLabel(thirdrow, "FlagsLabel", "Flags:", TextAnchor.MiddleRight, Color.grey);
             UIFactory.SetLayoutElement(flagsLabel.gameObject, minHeight: 25, minWidth: 50);
 
-            var flagsDrop = UIFactory.CreateDropdown(thirdrow, out FlagsDropdown, "None", 14, OnFlagsDropdownChanged);
+            var flagsDrop = UIFactory.CreateDropdown(thirdrow, "FlagsDropdown", out FlagsDropdown, "None", 14, OnFlagsDropdownChanged);
             FlagsDropdown.captionText.color = SignatureHighlighter.EnumGreen;
             UIFactory.SetLayoutElement(flagsDrop, minHeight: 25, minWidth: 135, flexibleWidth: 999);
             if (hideFlagsValues == null)
@@ -593,7 +606,7 @@ namespace UnityExplorer.Inspectors
             layerToNames = new List<string>();
             for (int i = 0; i < 32; i++)
             {
-                var name = RuntimeProvider.Instance.LayerToName(i);
+                var name = RuntimeHelper.LayerToName(i);
                 if (string.IsNullOrEmpty(name))
                     name = i.ToString();
                 layerToNames.Add(name);

src/Inspectors/InspectorBase.cs

@@ -8,6 +8,7 @@ using UnityExplorer.UI;
 using UniverseLib.UI.Models;
 using UnityExplorer.UI.Panels;
 using UniverseLib.UI;
+using UniverseLib.UI.ObjectPool;
 
 namespace UnityExplorer.Inspectors
 {

src/Inspectors/InspectorManager.cs

@@ -11,12 +11,14 @@ using UniverseLib.UI.Models;
 using UnityExplorer.UI.Panels;
 using UniverseLib;
 using UniverseLib.UI;
+using UniverseLib.UI.ObjectPool;
+using UniverseLib.Utility;
 
 namespace UnityExplorer
 {
     public static class InspectorManager
     {
-        public static readonly List<InspectorBase> Inspectors = new List<InspectorBase>();
+        public static readonly List<InspectorBase> Inspectors = new();
 
         public static InspectorBase ActiveInspector { get; private set; }
         private static InspectorBase lastActiveInspector;
@@ -92,17 +94,17 @@ namespace UnityExplorer
         }
 
         private static void CreateInspector<T>(object target, bool staticReflection = false,
-            CacheObjectBase sourceCache = null) where T : InspectorBase
+            CacheObjectBase parentObject = null) where T : InspectorBase
         {
             var inspector = Pool<T>.Borrow();
             Inspectors.Add(inspector);
             inspector.Target = target;
 
-            if (sourceCache != null && sourceCache.CanWrite)
+            if (parentObject != null && parentObject.CanWrite)
             {
                 // only set parent cache object if we are inspecting a struct, otherwise there is no point.
                 if (target.GetType().IsValueType && inspector is ReflectionInspector ri)
-                    ri.ParentCacheObject = sourceCache;
+                    ri.ParentCacheObject = parentObject;
             }
 
             UIManager.SetPanelActive(UIManager.Panels.Inspector, true);

src/Inspectors/InspectorTab.cs

@@ -9,52 +9,51 @@ using UniverseLib.UI.Models;
 using UnityExplorer.UI.Widgets;
 using UniverseLib.UI;
 using UniverseLib;
+using UnityExplorer.UI.Panels;
+using UniverseLib.UI.ObjectPool;
 
 namespace UnityExplorer.Inspectors
 {
     public class InspectorTab : IPooledObject
     {
         public GameObject UIRoot { get; set; }
-
         public float DefaultHeight => 25f;
 
         public ButtonRef TabButton;
         public Text TabText;
-
         public ButtonRef CloseButton;
 
-        private static readonly Color _enabledTabColor = new Color(0.15f, 0.22f, 0.15f);
-        private static readonly Color _disabledTabColor = new Color(0.13f, 0.13f, 0.13f);
+        private static readonly Color enabledTabColor = new(0.15f, 0.22f, 0.15f);
+        private static readonly Color disabledTabColor = new(0.13f, 0.13f, 0.13f);
 
         public void SetTabColor(bool active)
         {
-            if (active)
-                RuntimeProvider.Instance.SetColorBlock(TabButton.Component, _enabledTabColor, _enabledTabColor * 1.2f);
-            else
-                RuntimeProvider.Instance.SetColorBlock(TabButton.Component, _disabledTabColor, _disabledTabColor * 1.2f);
+            Color color = active ? enabledTabColor : disabledTabColor;
+            RuntimeHelper.SetColorBlock(TabButton.Component, color, color * 1.2f);
         }
 
         public GameObject CreateContent(GameObject parent)
         {
-            UIRoot = UIFactory.CreateHorizontalGroup(parent, "TabObject", false, true, true, true, 0,
+            UIRoot = UIFactory.CreateHorizontalGroup(parent, "TabObject", false, true, true, true, 1,
                 default, new Color(0.13f, 0.13f, 0.13f), childAlignment: TextAnchor.MiddleLeft);
             UIFactory.SetLayoutElement(UIRoot, minWidth: 200, flexibleWidth: 0);
             UIRoot.AddComponent<Mask>();
+            UIRoot.AddComponent<Outline>();
 
             TabButton = UIFactory.CreateButton(UIRoot, "TabButton", "");
-            UIFactory.SetLayoutElement(TabButton.Component.gameObject, minWidth: 175, flexibleWidth: 0);
+            UIFactory.SetLayoutElement(TabButton.Component.gameObject, minWidth: 173, flexibleWidth: 0);
             UIFactory.SetLayoutGroup<HorizontalLayoutGroup>(TabButton.Component.gameObject, false, false, true, true, 0, 0, 0, 3);
+            TabButton.GameObject.AddComponent<Mask>();
 
-            TabText = TabButton.Component.GetComponentInChildren<Text>();
-            UIFactory.SetLayoutElement(TabText.gameObject, minHeight: 25, minWidth: 175, flexibleWidth: 0);
+            TabText = TabButton.ButtonText;
+            UIFactory.SetLayoutElement(TabText.gameObject, minHeight: 25, minWidth: 150, flexibleWidth: 0);
             TabText.alignment = TextAnchor.MiddleLeft;
             TabText.fontSize = 12;
             TabText.horizontalOverflow = HorizontalWrapMode.Overflow;
 
-            CloseButton = UIFactory.CreateButton(UIRoot, "CloseButton", "X", new Color(0.2f, 0.2f, 0.2f, 1));
+            CloseButton = UIFactory.CreateButton(UIRoot, "CloseButton", "X", new Color(0.15f, 0.15f, 0.15f, 1));
             UIFactory.SetLayoutElement(CloseButton.Component.gameObject, minHeight: 25, minWidth: 25, flexibleWidth: 0);
-            var closeBtnText = CloseButton.Component.GetComponentInChildren<Text>();
-            closeBtnText.color = Color.red;
+            CloseButton.ButtonText.color = Color.red;
 
             return UIRoot;
         }

src/Inspectors/MouseInspector.cs

@@ -5,14 +5,15 @@ using System.Text;
 using UnityEngine;
 using UnityEngine.EventSystems;
 using UnityEngine.UI;
-using UnityExplorer.Core;
 using UniverseLib.Input;
-using UnityExplorer.Core.Runtime;
+using UnityExplorer.Runtime;
 using UnityExplorer.Inspectors.MouseInspectors;
 using UnityExplorer.UI;
 using UnityExplorer.UI.Panels;
 using UniverseLib;
 using UniverseLib.UI;
+using UniverseLib.Utility;
+using UnityExplorer.Config;
 
 namespace UnityExplorer.Inspectors
 {
@@ -22,9 +23,9 @@ namespace UnityExplorer.Inspectors
         UI
     }
 
-    public class InspectUnderMouse : UIPanel
+    public class MouseInspector : UIPanel
     {
-        public static InspectUnderMouse Instance { get; private set; }
+        public static MouseInspector Instance { get; private set; }
 
         private readonly WorldInspector worldInspector;
         private readonly UiInspector uiInspector;
@@ -32,24 +33,19 @@ namespace UnityExplorer.Inspectors
         public static bool Inspecting { get; set; }
         public static MouseInspectMode Mode { get; set; }
 
+        public MouseInspectorBase CurrentInspector => Mode switch
+        {
+            MouseInspectMode.UI => uiInspector,
+            MouseInspectMode.World => worldInspector,
+            _ => null,
+        };
+
         private static Vector3 lastMousePos;
 
-        public MouseInspectorBase CurrentInspector
-        {
-            get
-            {
-                switch (Mode)
-                {
-                    case MouseInspectMode.UI:
-                        return uiInspector;
-                    case MouseInspectMode.World:
-                        return worldInspector;
-                }
-                return null;
-            }
-        }
-
         // UIPanel
+        internal static readonly string UIBaseGUID = $"{ExplorerCore.GUID}.MouseInspector";
+        private UIBase inspectorUIBase;
+
         public override string Name => "Inspect Under Mouse";
         public override UIManager.Panels PanelType => UIManager.Panels.MouseInspector;
         public override int MinWidth => -1;
@@ -63,7 +59,7 @@ namespace UnityExplorer.Inspectors
         internal Text objPathLabel;
         internal Text mousePosLabel;
 
-        public InspectUnderMouse() 
+        public MouseInspector() 
         {
             Instance = this;
             worldInspector = new WorldInspector();
@@ -78,7 +74,7 @@ namespace UnityExplorer.Inspectors
                 case 1: Instance.StartInspect(MouseInspectMode.World); break;
                 case 2: Instance.StartInspect(MouseInspectMode.UI); break;
             }
-            UIManager.MouseInspectDropdown.value = 0;
+            InspectorPanel.Instance.MouseInspectDropdown.value = 0;
         }
 
         public void StartInspect(MouseInspectMode mode)
@@ -112,7 +108,7 @@ namespace UnityExplorer.Inspectors
             UIManager.NavBarRect.gameObject.SetActive(true);
             UIManager.PanelHolder.SetActive(true);
 
-            var drop = UIManager.MouseInspectDropdown;
+            var drop = InspectorPanel.Instance.MouseInspectDropdown;
             if (drop.transform.Find("Dropdown List") is Transform list)
                 drop.DestroyDropdownList(list.gameObject);
 
@@ -121,6 +117,26 @@ namespace UnityExplorer.Inspectors
 
         private static float timeOfLastRaycast;
 
+        public bool TryUpdate()
+        {
+            if (ConfigManager.World_MouseInspect_Keybind.Value != KeyCode.None)
+            {
+                if (InputManager.GetKeyDown(ConfigManager.World_MouseInspect_Keybind.Value))
+                    Instance.StartInspect(MouseInspectMode.World);
+            }
+
+            if (ConfigManager.World_MouseInspect_Keybind.Value != KeyCode.None)
+            {
+                if (InputManager.GetKeyDown(ConfigManager.World_MouseInspect_Keybind.Value))
+                    Instance.StartInspect(MouseInspectMode.World);
+            }
+            
+            if (Inspecting)
+                UpdateInspect();
+
+            return Inspecting;
+        }
+
         public void UpdateInspect()
         {
             if (InputManager.GetKeyDown(KeyCode.Escape))
@@ -165,7 +181,7 @@ namespace UnityExplorer.Inspectors
                 mousePos.y -= 10;
 
             // calculate and set our UI position
-            var inversePos = UIManager.UIRoot.transform.InverseTransformPoint(mousePos);
+            var inversePos = inspectorUIBase.RootObject.transform.InverseTransformPoint(mousePos);
             UIRoot.transform.localPosition = new Vector3(inversePos.x, inversePos.y, 0);
         }
 
@@ -182,10 +198,10 @@ namespace UnityExplorer.Inspectors
         public override void ConstructPanelContent()
         {
             // hide title bar
-            this.titleBar.SetActive(false);
+            this.TitleBar.SetActive(false);
             this.UIRoot.transform.SetParent(UIManager.UIRoot.transform, false);
 
-            var inspectContent = UIFactory.CreateVerticalGroup(this.content, "InspectContent", true, true, true, true, 3, new Vector4(2, 2, 2, 2));
+            var inspectContent = UIFactory.CreateVerticalGroup(this.uiContent, "InspectContent", true, true, true, true, 3, new Vector4(2, 2, 2, 2));
             UIFactory.SetLayoutElement(inspectContent, flexibleWidth: 9999, flexibleHeight: 9999);
 
             // Title text
@@ -208,10 +224,12 @@ namespace UnityExplorer.Inspectors
             UIFactory.SetLayoutElement(objPathLabel.gameObject, minHeight: 75);
 
             UIRoot.SetActive(false);
+
+            // Create a new canvas for this panel to live on.
+            // It needs to always be shown on the main display, other panels can move displays.
+
+            inspectorUIBase = UniversalUI.RegisterUI(UIBaseGUID, null);
+            UIRoot.transform.SetParent(inspectorUIBase.RootObject.transform);
         }
-
-        public override void DoSaveToConfigElement() { }
-
-        public override string GetSaveDataFromConfigManager() => null;
     }
 }

src/Inspectors/MouseInspectors/UiInspector.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -8,6 +9,7 @@ using UnityEngine.UI;
 using UnityExplorer.UI;
 using UnityExplorer.UI.Panels;
 using UniverseLib;
+using UniverseLib.Input;
 
 namespace UnityExplorer.Inspectors.MouseInspectors
 {
@@ -26,7 +28,7 @@ namespace UnityExplorer.Inspectors.MouseInspectors
         public override void OnBeginMouseInspect()
         {
             SetupUIRaycast();
-            InspectUnderMouse.Instance.objPathLabel.text = "";
+            MouseInspector.Instance.objPathLabel.text = "";
         }
 
         public override void ClearHitData()
@@ -38,6 +40,12 @@ namespace UnityExplorer.Inspectors.MouseInspectors
         {
             LastHitObjects.Clear();
             LastHitObjects.AddRange(currentHitObjects);
+            RuntimeHelper.StartCoroutine(SetPanelActiveCoro());
+        }
+
+        IEnumerator SetPanelActiveCoro()
+        {
+            yield return null;
             var panel = UIManager.GetPanel<UiInspectorResultsPanel>(UIManager.Panels.UIInspectorResults);
             panel.SetActive(true);
             panel.ShowResults();
@@ -58,7 +66,7 @@ namespace UnityExplorer.Inspectors.MouseInspectors
                     continue;
             
                 var list = new List<RaycastResult>();
-                RuntimeProvider.Instance.GraphicRaycast(gr, ped, list);
+                RuntimeHelper.GraphicRaycast(gr, ped, list);
                 if (list.Count > 0)
                 {
                     foreach (var hit in list)
@@ -70,14 +78,14 @@ namespace UnityExplorer.Inspectors.MouseInspectors
             }
             
             if (currentHitObjects.Any())
-                InspectUnderMouse.Instance.objNameLabel.text = $"Click to view UI Objects under mouse: {currentHitObjects.Count}";
+                MouseInspector.Instance.objNameLabel.text = $"Click to view UI Objects under mouse: {currentHitObjects.Count}";
             else
-                InspectUnderMouse.Instance.objNameLabel.text = $"No UI objects under mouse.";
+                MouseInspector.Instance.objNameLabel.text = $"No UI objects under mouse.";
         }
 
         private static void SetupUIRaycast()
         {
-            foreach (var obj in RuntimeProvider.Instance.FindObjectsOfTypeAll(typeof(Canvas)))
+            foreach (var obj in RuntimeHelper.FindObjectsOfTypeAll(typeof(Canvas)))
             {
                 var canvas = obj.TryCast<Canvas>();
                 if (!canvas || !canvas.enabled || !canvas.gameObject.activeInHierarchy)
@@ -91,7 +99,7 @@ namespace UnityExplorer.Inspectors.MouseInspectors
             }
 
             // recache Graphic Raycasters each time we start
-            var casters = RuntimeProvider.Instance.FindObjectsOfTypeAll(typeof(GraphicRaycaster));
+            var casters = RuntimeHelper.FindObjectsOfTypeAll(typeof(GraphicRaycaster));
             graphicRaycasters = new GraphicRaycaster[casters.Length];
             for (int i = 0; i < casters.Length; i++)
             {
@@ -99,7 +107,7 @@ namespace UnityExplorer.Inspectors.MouseInspectors
             }
 
             // enable raycastTarget on Graphics
-            foreach (var obj in RuntimeProvider.Instance.FindObjectsOfTypeAll(typeof(Graphic)))
+            foreach (var obj in RuntimeHelper.FindObjectsOfTypeAll(typeof(Graphic)))
             {
                 var graphic = obj.TryCast<Graphic>();
                 if (!graphic || !graphic.enabled || graphic.raycastTarget || !graphic.gameObject.activeInHierarchy)
@@ -110,7 +118,7 @@ namespace UnityExplorer.Inspectors.MouseInspectors
             }
 
             // enable blocksRaycasts on CanvasGroups
-            foreach (var obj in RuntimeProvider.Instance.FindObjectsOfTypeAll(typeof(CanvasGroup)))
+            foreach (var obj in RuntimeHelper.FindObjectsOfTypeAll(typeof(CanvasGroup)))
             {
                 var canvas = obj.TryCast<CanvasGroup>();
                 if (!canvas || !canvas.gameObject.activeInHierarchy || canvas.blocksRaycasts)

src/Inspectors/MouseInspectors/WorldInspector.cs

@@ -4,6 +4,7 @@ using System.Linq;
 using System.Text;
 using UnityEngine;
 using UniverseLib;
+using UniverseLib.Utility;
 
 namespace UnityExplorer.Inspectors.MouseInspectors
 {
@@ -35,13 +36,22 @@ namespace UnityExplorer.Inspectors.MouseInspectors
 
         public override void UpdateMouseInspect(Vector2 mousePos)
         {
+            if (!MainCamera)
+                MainCamera = Camera.main;
+            if (!MainCamera)
+            {
+                ExplorerCore.LogWarning("No Main Camera was found, unable to inspect world!");
+                MouseInspector.Instance.StopInspect();
+                return;
+            }
+
             var ray = MainCamera.ScreenPointToRay(mousePos);
             Physics.Raycast(ray, out RaycastHit hit, 1000f);
 
             if (hit.transform)
                 OnHitGameObject(hit.transform.gameObject);
             else if (lastHitObject)
-                InspectUnderMouse.Instance.ClearHitData();
+                MouseInspector.Instance.ClearHitData();
         }
 
         internal void OnHitGameObject(GameObject obj)
@@ -49,8 +59,8 @@ namespace UnityExplorer.Inspectors.MouseInspectors
             if (obj != lastHitObject)
             {
                 lastHitObject = obj;
-                InspectUnderMouse.Instance.objNameLabel.text = $"<b>Click to Inspect:</b> <color=cyan>{obj.name}</color>";
-                InspectUnderMouse.Instance.objPathLabel.text = $"Path: {obj.transform.GetTransformPath(true)}";
+                MouseInspector.Instance.objNameLabel.text = $"<b>Click to Inspect:</b> <color=cyan>{obj.name}</color>";
+                MouseInspector.Instance.objPathLabel.text = $"Path: {obj.transform.GetTransformPath(true)}";
             }
         }
 

src/Inspectors/ReflectionInspector.cs

@@ -8,8 +8,8 @@ using System.Reflection.Emit;
 using System.Text;
 using UnityEngine;
 using UnityEngine.UI;
-using UnityExplorer.Core.Config;
-using UnityExplorer.Core.Runtime;
+using UnityExplorer.Config;
+using UnityExplorer.Runtime;
 using UnityExplorer.CacheObject;
 using UnityExplorer.CacheObject.Views;
 using UnityExplorer.UI.Panels;
@@ -19,6 +19,9 @@ using UniverseLib.UI.Widgets;
 using UniverseLib.UI;
 using UniverseLib;
 using UniverseLib.Runtime;
+using UniverseLib.UI.Models;
+using UniverseLib.UI.Widgets.ScrollView;
+using UniverseLib.Utility;
 
 namespace UnityExplorer.Inspectors
 {
@@ -29,8 +32,8 @@ namespace UnityExplorer.Inspectors
         public bool StaticOnly { get; internal set; }
         public bool CanWrite => true;
 
-        private List<CacheMember> members = new List<CacheMember>();
-        private readonly List<CacheMember> filteredMembers = new List<CacheMember>();
+        private List<CacheMember> members = new();
+        private readonly List<CacheMember> filteredMembers = new();
 
         public bool AutoUpdateWanted => autoUpdateToggle.isOn;
 
@@ -43,8 +46,9 @@ namespace UnityExplorer.Inspectors
             None = 0,
             Property = 1,
             Field = 2,
-            Method = 4,
-            All = 7
+            Constructor = 4,
+            Method = 8,
+            All = Property | Field | Method | Constructor,
         }
 
         // UI
@@ -58,11 +62,11 @@ namespace UnityExplorer.Inspectors
 
         private string currentBaseTabText;
 
-        private readonly Color disabledButtonColor = new Color(0.24f, 0.24f, 0.24f);
-        private readonly Color enabledButtonColor = new Color(0.2f, 0.27f, 0.2f);
+        private readonly Color disabledButtonColor = new(0.24f, 0.24f, 0.24f);
+        private readonly Color enabledButtonColor = new(0.2f, 0.27f, 0.2f);
 
-        private readonly Dictionary<BindingFlags, ButtonRef> scopeFilterButtons = new Dictionary<BindingFlags, ButtonRef>();
-        private readonly List<Toggle> memberTypeToggles = new List<Toggle>();
+        private readonly Dictionary<BindingFlags, ButtonRef> scopeFilterButtons = new();
+        private readonly List<Toggle> memberTypeToggles = new();
         private InputFieldRef filterInputField;
 
         // Setup / return
@@ -74,7 +78,7 @@ namespace UnityExplorer.Inspectors
 
             SetTarget(target);
 
-            RuntimeProvider.Instance.StartCoroutine(InitCoroutine());
+            RuntimeHelper.StartCoroutine(InitCoroutine());
         }
 
         private IEnumerator InitCoroutine()
@@ -130,7 +134,7 @@ namespace UnityExplorer.Inspectors
             currentBaseTabText = $"{prefix} {SignatureHighlighter.Parse(TargetType, false)}";
             Tab.TabText.text = currentBaseTabText;
             NameText.text = SignatureHighlighter.Parse(TargetType, true);
-            HiddenNameText.Text = TargetType.FullName;
+            HiddenNameText.Text = SignatureHighlighter.RemoveHighlighting(NameText.text);
 
             string asmText;
             if (TargetType.Assembly is AssemblyBuilder || string.IsNullOrEmpty(TargetType.Assembly.Location))
@@ -150,7 +154,7 @@ namespace UnityExplorer.Inspectors
 
             this.filterInputField.Text = "";
 
-            SetFilter("", StaticOnly ? BindingFlags.Static : BindingFlags.Instance);
+            SetFilter("", StaticOnly ? BindingFlags.Static : BindingFlags.Default);
             scopeFilterButtons[BindingFlags.Default].Component.gameObject.SetActive(!StaticOnly);
             scopeFilterButtons[BindingFlags.Instance].Component.gameObject.SetActive(!StaticOnly);
 
@@ -225,11 +229,11 @@ namespace UnityExplorer.Inspectors
             if (flagsFilter != FlagsFilter)
             {
                 var btn = scopeFilterButtons[FlagsFilter].Component;
-                RuntimeProvider.Instance.SetColorBlock(btn, disabledButtonColor, disabledButtonColor * 1.3f);
+                RuntimeHelper.SetColorBlock(btn, disabledButtonColor, disabledButtonColor * 1.3f);
 
                 this.FlagsFilter = flagsFilter;
                 btn = scopeFilterButtons[FlagsFilter].Component;
-                RuntimeProvider.Instance.SetColorBlock(btn, enabledButtonColor, enabledButtonColor * 1.3f);
+                RuntimeHelper.SetColorBlock(btn, enabledButtonColor, enabledButtonColor * 1.3f);
             }
         }
 
@@ -258,7 +262,8 @@ namespace UnityExplorer.Inspectors
 
                 if ((member is CacheMethod && !MemberFilter.HasFlag(MemberFlags.Method))
                     || (member is CacheField && !MemberFilter.HasFlag(MemberFlags.Field))
-                    || (member is CacheProperty && !MemberFilter.HasFlag(MemberFlags.Property)))
+                    || (member is CacheProperty && !MemberFilter.HasFlag(MemberFlags.Property))
+                    || (member is CacheConstructor && !MemberFilter.HasFlag(MemberFlags.Constructor)))
                     continue;
 
                 if (!string.IsNullOrEmpty(NameFilter) && !member.NameForFiltering.ContainsIgnoreCase(NameFilter))
@@ -327,6 +332,11 @@ namespace UnityExplorer.Inspectors
                 cell.Occupant.IValue.SetLayout();
         }
 
+        private void OnCopyClicked()
+        {
+            ClipboardPanel.Copy(this.Target ?? this.TargetType);
+        }
+
         // UI Construction
 
         private GameObject mainContentHolder;
@@ -338,7 +348,10 @@ namespace UnityExplorer.Inspectors
 
             // Class name, assembly
 
-            var titleHolder = UIFactory.CreateUIObject("TitleHolder", UIRoot);
+            var topRow = UIFactory.CreateHorizontalGroup(UIRoot, "TopRow", false, false, true, true, 4, default, new(1, 1, 1, 0), TextAnchor.MiddleLeft);
+            UIFactory.SetLayoutElement(topRow, minHeight: 25, flexibleWidth: 9999);
+
+            var titleHolder = UIFactory.CreateUIObject("TitleHolder", topRow);
             UIFactory.SetLayoutElement(titleHolder, minHeight: 35, flexibleHeight: 0, flexibleWidth: 9999);
 
             NameText = UIFactory.CreateLabel(titleHolder, "VisibleTitle", "NotSet", TextAnchor.MiddleLeft);
@@ -360,6 +373,11 @@ namespace UnityExplorer.Inspectors
             HiddenNameText.Component.textComponent.color = Color.clear;
             UIFactory.SetLayoutElement(HiddenNameText.Component.gameObject, minHeight: 35, flexibleHeight: 0, flexibleWidth: 9999);
 
+            var copyButton = UIFactory.CreateButton(topRow, "CopyButton", "Copy to Clipboard", new Color(0.2f, 0.2f, 0.2f, 1));
+            copyButton.ButtonText.color = Color.yellow;
+            UIFactory.SetLayoutElement(copyButton.Component.gameObject, minHeight: 25, minWidth: 120, flexibleWidth: 0);
+            copyButton.OnClick += OnCopyClicked;
+
             AssemblyText = UIFactory.CreateLabel(UIRoot, "AssemblyLabel", "not set", TextAnchor.MiddleLeft);
             UIFactory.SetLayoutElement(AssemblyText.gameObject, minHeight: 25, flexibleWidth: 9999);
 
@@ -446,6 +464,7 @@ namespace UnityExplorer.Inspectors
             AddMemberTypeToggle(rowObj, MemberTypes.Property, 90);
             AddMemberTypeToggle(rowObj, MemberTypes.Field, 70);
             AddMemberTypeToggle(rowObj, MemberTypes.Method, 90);
+            AddMemberTypeToggle(rowObj, MemberTypes.Constructor, 110);
         }
 
         private void AddScopeFilterButton(GameObject parent, BindingFlags flags, bool setAsActive = false)
@@ -464,19 +483,26 @@ namespace UnityExplorer.Inspectors
         {
             var toggleObj = UIFactory.CreateToggle(parent, "Toggle_" + type, out Toggle toggle, out Text toggleText);
             UIFactory.SetLayoutElement(toggleObj, minHeight: 25, minWidth: width);
-            var color = SignatureHighlighter.GetMemberInfoColor(type);
+            string color = type switch
+            {
+                MemberTypes.Method => SignatureHighlighter.METHOD_INSTANCE,
+                MemberTypes.Field => SignatureHighlighter.FIELD_INSTANCE,
+                MemberTypes.Property => SignatureHighlighter.PROP_INSTANCE,
+                MemberTypes.Constructor => SignatureHighlighter.CLASS_INSTANCE,
+                _ => throw new NotImplementedException()
+            };
             toggleText.text = $"<color={color}>{type}</color>";
 
             toggle.graphic.TryCast<Image>().color = color.ToColor() * 0.65f;
 
-            MemberFlags flag;
-            switch (type)
+            MemberFlags flag = type switch
             {
-                case MemberTypes.Method: flag = MemberFlags.Method; break;
-                case MemberTypes.Property: flag = MemberFlags.Property; break;
-                case MemberTypes.Field: flag = MemberFlags.Field; break;
-                default: return;
-            }
+                MemberTypes.Method => MemberFlags.Method,
+                MemberTypes.Property => MemberFlags.Property,
+                MemberTypes.Field => MemberFlags.Field,
+                MemberTypes.Constructor => MemberFlags.Constructor,
+                _ => throw new NotImplementedException()
+            };
 
             toggle.onValueChanged.AddListener((bool val) => { OnMemberTypeToggled(flag, val); });
 
@@ -664,7 +690,7 @@ namespace UnityExplorer.Inspectors
 
             textureSavePathInput.Text = Path.Combine(ConfigManager.Default_Output_Path.Value, $"{name}.png");
 
-            var sprite = TextureUtilProvider.Instance.CreateSprite(TextureRef);
+            var sprite = TextureHelper.CreateSprite(TextureRef);
             textureImage.sprite = sprite;
 
             textureImageLayout.preferredHeight = sprite.rect.height;
@@ -700,10 +726,10 @@ namespace UnityExplorer.Inspectors
 
             var tex = TextureRef;
 
-            if (!TextureUtilProvider.IsReadable(tex))
-                tex = TextureUtilProvider.ForceReadTexture(tex);
+            if (!TextureHelper.IsReadable(tex))
+                tex = TextureHelper.ForceReadTexture(tex);
 
-            byte[] data = TextureUtilProvider.Instance.EncodeToPNG(tex);
+            byte[] data = TextureHelper.EncodeToPNG(tex);
             File.WriteAllBytes(path, data);
 
             if (tex != TextureRef)

src/Loader/BepInEx/BepInExConfigHandler.cs

@@ -4,7 +4,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using UnityExplorer.Core.Config;
+using UnityExplorer.Config;
 
 namespace UnityExplorer.Loader.BIE
 {

src/Loader/BepInEx/ExplorerBepInPlugin.cs

@@ -9,8 +9,7 @@ using System.Linq;
 using System.Text;
 using UnityEngine;
 using UnityEngine.EventSystems;
-using UnityExplorer.Core;
-using UnityExplorer.Core.Config;
+using UnityExplorer.Config;
 using UniverseLib.Input;
 using UnityExplorer.Loader.BIE;
 #if CPP

src/Loader/IExplorerLoader.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using UnityExplorer.Core.Config;
+using UnityExplorer.Config;
 
 namespace UnityExplorer
 {

src/Loader/MelonLoader/ExplorerMelonMod.cs

@@ -3,10 +3,15 @@ using System;
 using System.IO;
 using MelonLoader;
 using UnityExplorer;
-using UnityExplorer.Core.Config;
+using UnityExplorer.Config;
 using UnityExplorer.Loader.ML;
 
-[assembly: MelonPlatformDomain(MelonPlatformDomainAttribute.CompatibleDomains.UNIVERSAL)]
+#if CPP
+[assembly: MelonPlatformDomain(MelonPlatformDomainAttribute.CompatibleDomains.IL2CPP)]
+#else
+[assembly: MelonPlatformDomain(MelonPlatformDomainAttribute.CompatibleDomains.MONO)]
+#endif
+
 [assembly: MelonInfo(typeof(ExplorerMelonMod), ExplorerCore.NAME, ExplorerCore.VERSION, ExplorerCore.AUTHOR)]
 [assembly: MelonGame(null, null)]
 [assembly: MelonColor(ConsoleColor.DarkCyan)]
@@ -26,9 +31,9 @@ namespace UnityExplorer
         public ConfigHandler ConfigHandler => _configHandler;
         public MelonLoaderConfigHandler _configHandler;
 
-        public Action<object> OnLogMessage => MelonLogger.Msg;
-        public Action<object> OnLogWarning => MelonLogger.Warning;
-        public Action<object> OnLogError   => MelonLogger.Error;
+        public Action<object> OnLogMessage => LoggerInstance.Msg;
+        public Action<object> OnLogWarning => LoggerInstance.Warning;
+        public Action<object> OnLogError   => LoggerInstance.Error;
 
         public override void OnApplicationStart()
         {

src/Loader/MelonLoader/MelonLoaderConfigHandler.cs

@@ -5,8 +5,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using UnityEngine;
-using UnityExplorer.Core;
-using UnityExplorer.Core.Config;
+using UnityExplorer.Config;
 
 namespace UnityExplorer.Loader.ML
 {

src/Loader/Standalone/ExplorerStandalone.cs

@@ -4,11 +4,10 @@ using System;
 using System.IO;
 using System.Reflection;
 using UnityEngine;
-using UnityExplorer.Core.Config;
+using UnityExplorer.Config;
 using UnityExplorer.Loader.STANDALONE;
 using UnityEngine.EventSystems;
 using UniverseLib.Input;
-using UnityExplorer.Core;
 #if CPP
 using UnhollowerRuntimeLib;
 #endif

src/Loader/Standalone/StandaloneConfigHandler.cs

@@ -3,23 +3,21 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using UnityExplorer.Core.Config;
-using IniParser.Parser;
+using UnityExplorer.Config;
 using System.IO;
 using UnityEngine;
+using Tomlet;
+using Tomlet.Models;
 
 namespace UnityExplorer.Loader.STANDALONE
 {
     public class StandaloneConfigHandler : ConfigHandler
     {
-        internal static IniDataParser _parser;
         internal static string CONFIG_PATH;
 
         public override void Init()
         {
-            CONFIG_PATH = Path.Combine(ExplorerCore.Loader.ExplorerFolder, "config.ini");
-            _parser = new IniDataParser();
-            _parser.Configuration.CommentString = "#";
+            CONFIG_PATH = Path.Combine(ExplorerCore.Loader.ExplorerFolder, "config.cfg");
         }
 
         public override void LoadConfig()
@@ -52,14 +50,11 @@ namespace UnityExplorer.Loader.STANDALONE
                 if (!File.Exists(CONFIG_PATH))
                     return false;
 
-                string ini = File.ReadAllText(CONFIG_PATH);
-
-                var data = _parser.Parse(ini);
-
-                foreach (var config in data.Sections["Config"])
+                var document = TomlParser.ParseFile(CONFIG_PATH);
+                foreach (var key in document.Keys)
                 {
-                    if (ConfigManager.ConfigElements.TryGetValue(config.KeyName, out IConfigElement configElement))
-                        configElement.BoxedValue = StringToConfigValue(config.Value, configElement.ElementType);
+                    var config = ConfigManager.ConfigElements[key];
+                    config.BoxedValue = StringToConfigValue(document.GetValue(key).StringValue, config.ElementType);
                 }
 
                 return true;
@@ -89,18 +84,14 @@ namespace UnityExplorer.Loader.STANDALONE
 
         public override void SaveConfig()
         {
-            var data = new IniParser.Model.IniData();
-
-            data.Sections.AddSection("Config");
-            var sec = data.Sections["Config"];
-
-            foreach (var entry in ConfigManager.ConfigElements)
-                sec.AddKey(entry.Key, entry.Value.BoxedValue.ToString());
+            var document = TomlDocument.CreateEmpty();
+            foreach (var config in ConfigManager.ConfigElements)
+                document.Put(config.Key, config.Value.BoxedValue.ToString());
 
             if (!Directory.Exists(ExplorerCore.Loader.ExplorerFolder))
                 Directory.CreateDirectory(ExplorerCore.Loader.ExplorerFolder);
 
-            File.WriteAllText(CONFIG_PATH, data.ToString());
+            File.WriteAllText(CONFIG_PATH, document.SerializedValue);
         }
     }
 }

src/ObjectExplorer/ObjectSearch.cs

@@ -4,14 +4,14 @@ using System.Linq;
 using System.Text;
 using UnityEngine;
 using UnityEngine.UI;
-using UnityExplorer.UI;
 using UniverseLib.UI.Models;
 using UnityExplorer.UI.Panels;
-using UnityExplorer.UI.Widgets;
 using UnityExplorer.UI.Widgets.AutoComplete;
-using UniverseLib.UI.Widgets;
 using UniverseLib.UI;
 using UniverseLib;
+using UniverseLib.UI.Widgets.ButtonList;
+using UniverseLib.UI.Widgets.ScrollView;
+using UniverseLib.Utility;
 
 namespace UnityExplorer.ObjectExplorer
 {
@@ -24,28 +24,25 @@ namespace UnityExplorer.ObjectExplorer
             Parent = parent;
         }
 
-        private SearchContext m_context = SearchContext.UnityObject;
-        private SceneFilter m_sceneFilter = SceneFilter.Any;
-        private ChildFilter m_childFilter = ChildFilter.Any;
+        private SearchContext context = SearchContext.UnityObject;
+        private SceneFilter sceneFilter = SceneFilter.Any;
+        private ChildFilter childFilter = ChildFilter.Any;
         private string desiredTypeInput;
         private string lastCheckedTypeInput;
-        private bool lastTypeCanHaveGO;
+        private bool lastTypeCanHaveGameObject;
 
         public ButtonListHandler<object, ButtonCell> dataHandler;
-
         private ScrollPool<ButtonCell> resultsScrollPool;
-        private List<object> currentResults = new List<object>();
-
-        public TypeCompleter typeAutocompleter;
+        private List<object> currentResults = new();
 
         public override GameObject UIRoot => uiRoot;
         private GameObject uiRoot;
-
         private GameObject sceneFilterRow;
         private GameObject childFilterRow;
-        private GameObject unityObjectClassRow;
+        private GameObject classInputRow;
+        public TypeCompleter typeAutocompleter;
+        private GameObject nameInputRow;
         private InputFieldRef nameInputField;
-
         private Text resultsLabel;
 
         public List<object> GetEntries() => currentResults;
@@ -54,12 +51,12 @@ namespace UnityExplorer.ObjectExplorer
         {
             cachedCellTexts.Clear();
 
-            if (m_context == SearchContext.Singleton)
-                currentResults = SearchProvider.SingletonSearch(nameInputField.Text);
-            else if (m_context == SearchContext.Class)
-                currentResults = SearchProvider.ClassSearch(nameInputField.Text);
+            if (context == SearchContext.Singleton)
+                currentResults = SearchProvider.InstanceSearch(desiredTypeInput).ToList();
+            else if (context == SearchContext.Class)
+                currentResults = SearchProvider.ClassSearch(desiredTypeInput);
             else
-                currentResults = SearchProvider.UnityObjectSearch(nameInputField.Text, desiredTypeInput, m_context, m_childFilter, m_sceneFilter);
+                currentResults = SearchProvider.UnityObjectSearch(nameInputField.Text, desiredTypeInput, childFilter, sceneFilter);
 
             dataHandler.RefreshData();
             resultsScrollPool.Refresh(true);
@@ -69,7 +66,7 @@ namespace UnityExplorer.ObjectExplorer
 
         public void Update()
         {
-            if (m_context == SearchContext.UnityObject && lastCheckedTypeInput != desiredTypeInput)
+            if (context == SearchContext.UnityObject && lastCheckedTypeInput != desiredTypeInput)
             {
                 lastCheckedTypeInput = desiredTypeInput;
 
@@ -77,15 +74,15 @@ namespace UnityExplorer.ObjectExplorer
                 if (ReflectionUtility.GetTypeByName(desiredTypeInput) is Type cachedType)
                 {
                     var type = cachedType;
-                    lastTypeCanHaveGO = typeof(Component).IsAssignableFrom(type) || type == typeof(GameObject);
-                    sceneFilterRow.SetActive(lastTypeCanHaveGO);
-                    childFilterRow.SetActive(lastTypeCanHaveGO);
+                    lastTypeCanHaveGameObject = typeof(Component).IsAssignableFrom(type) || type == typeof(GameObject);
+                    sceneFilterRow.SetActive(lastTypeCanHaveGameObject);
+                    childFilterRow.SetActive(lastTypeCanHaveGameObject);
                 }
                 else
                 {
                     sceneFilterRow.SetActive(false);
                     childFilterRow.SetActive(false);
-                    lastTypeCanHaveGO = false;
+                    lastTypeCanHaveGameObject = false;
                 }
             }
         }
@@ -94,18 +91,27 @@ namespace UnityExplorer.ObjectExplorer
 
         private void OnContextDropdownChanged(int value)
         {
-            m_context = (SearchContext)value;
+            context = (SearchContext)value;
 
             lastCheckedTypeInput = null;
             sceneFilterRow.SetActive(false);
             childFilterRow.SetActive(false);
 
-            unityObjectClassRow.SetActive(m_context == SearchContext.UnityObject);
+            nameInputRow.SetActive(context == SearchContext.UnityObject);
+
+            if (context == SearchContext.Class)
+                typeAutocompleter.AllTypes = true;
+            else
+            {
+                typeAutocompleter.BaseType = context == SearchContext.UnityObject ? typeof(UnityEngine.Object) : typeof(object);
+                typeAutocompleter.AllTypes = false;
+            }
+            typeAutocompleter.CacheTypes();
         }
 
-        private void OnSceneFilterDropChanged(int value) => m_sceneFilter = (SceneFilter)value;
+        private void OnSceneFilterDropChanged(int value) => sceneFilter = (SceneFilter)value;
 
-        private void OnChildFilterDropChanged(int value) => m_childFilter = (ChildFilter)value;
+        private void OnChildFilterDropChanged(int value) => childFilter = (ChildFilter)value;
 
         private void OnTypeInputChanged(string val)
         {
@@ -120,14 +126,14 @@ namespace UnityExplorer.ObjectExplorer
         }
 
         // Cache the syntax-highlighted text for each search result to reduce allocs.
-        private static readonly Dictionary<int, string> cachedCellTexts = new Dictionary<int, string>();
+        private static readonly Dictionary<int, string> cachedCellTexts = new();
 
         public void SetCell(ButtonCell cell, int index)
         {
             if (!cachedCellTexts.ContainsKey(index))
             {
                 string text;
-                if (m_context == SearchContext.Class)
+                if (context == SearchContext.Class)
                 {
                     var type = currentResults[index] as Type;
                     text = $"{SignatureHighlighter.Parse(type, true)} <color=grey><i>({type.Assembly.GetName().Name})</i></color>";
@@ -143,7 +149,7 @@ namespace UnityExplorer.ObjectExplorer
 
         private void OnCellClicked(int dataIndex)
         {
-            if (m_context == SearchContext.Class)
+            if (context == SearchContext.Class)
                 InspectorManager.Inspect(currentResults[dataIndex] as Type);
             else
                 InspectorManager.Inspect(currentResults[dataIndex]);
@@ -164,20 +170,20 @@ namespace UnityExplorer.ObjectExplorer
             var contextLbl = UIFactory.CreateLabel(contextGroup, "SearchContextLabel", "Searching for:", TextAnchor.MiddleLeft);
             UIFactory.SetLayoutElement(contextLbl.gameObject, minWidth: 110, flexibleWidth: 0);
 
-            var contextDropObj = UIFactory.CreateDropdown(contextGroup, out Dropdown contextDrop, null, 14, OnContextDropdownChanged);
+            var contextDropObj = UIFactory.CreateDropdown(contextGroup, "ContextDropdown", out Dropdown contextDrop, null, 14, OnContextDropdownChanged);
             foreach (var name in Enum.GetNames(typeof(SearchContext)))
                 contextDrop.options.Add(new Dropdown.OptionData(name));
             UIFactory.SetLayoutElement(contextDropObj, minHeight: 25, flexibleHeight: 0, flexibleWidth: 9999);
 
-            // Unity class input
+            // Class input
 
-            unityObjectClassRow = UIFactory.CreateHorizontalGroup(uiRoot, "UnityClassRow", false, true, true, true, 2, new Vector4(2, 2, 2, 2));
-            UIFactory.SetLayoutElement(unityObjectClassRow, minHeight: 25, flexibleHeight: 0);
+            classInputRow = UIFactory.CreateHorizontalGroup(uiRoot, "ClassRow", false, true, true, true, 2, new Vector4(2, 2, 2, 2));
+            UIFactory.SetLayoutElement(classInputRow, minHeight: 25, flexibleHeight: 0);
 
-            var unityClassLbl = UIFactory.CreateLabel(unityObjectClassRow, "UnityClassLabel", "Class filter:", TextAnchor.MiddleLeft);
+            var unityClassLbl = UIFactory.CreateLabel(classInputRow, "ClassLabel", "Class filter:", TextAnchor.MiddleLeft);
             UIFactory.SetLayoutElement(unityClassLbl.gameObject, minWidth: 110, flexibleWidth: 0);
 
-            var classInputField = UIFactory.CreateInputField(unityObjectClassRow, "ClassInput", "...");
+            var classInputField = UIFactory.CreateInputField(classInputRow, "ClassInput", "...");
             UIFactory.SetLayoutElement(classInputField.UIRoot, minHeight: 25, flexibleHeight: 0, flexibleWidth: 9999);
 
             typeAutocompleter = new TypeCompleter(typeof(UnityEngine.Object), classInputField);
@@ -193,7 +199,7 @@ namespace UnityExplorer.ObjectExplorer
             var childLbl = UIFactory.CreateLabel(childFilterRow, "ChildLabel", "Child filter:", TextAnchor.MiddleLeft);
             UIFactory.SetLayoutElement(childLbl.gameObject, minWidth: 110, flexibleWidth: 0);
 
-            var childDropObj = UIFactory.CreateDropdown(childFilterRow, out Dropdown childDrop, null, 14, OnChildFilterDropChanged);
+            var childDropObj = UIFactory.CreateDropdown(childFilterRow, "ChildFilterDropdown", out Dropdown childDrop, null, 14, OnChildFilterDropChanged);
             foreach (var name in Enum.GetNames(typeof(ChildFilter)))
                 childDrop.options.Add(new Dropdown.OptionData(name));
             UIFactory.SetLayoutElement(childDropObj, minHeight: 25, flexibleHeight: 0, flexibleWidth: 9999);
@@ -208,22 +214,26 @@ namespace UnityExplorer.ObjectExplorer
             var sceneLbl = UIFactory.CreateLabel(sceneFilterRow, "SceneLabel", "Scene filter:", TextAnchor.MiddleLeft);
             UIFactory.SetLayoutElement(sceneLbl.gameObject, minWidth: 110, flexibleWidth: 0);
 
-            var sceneDropObj = UIFactory.CreateDropdown(sceneFilterRow, out Dropdown sceneDrop, null, 14, OnSceneFilterDropChanged);
+            var sceneDropObj = UIFactory.CreateDropdown(sceneFilterRow, "SceneFilterDropdown", out Dropdown sceneDrop, null, 14, OnSceneFilterDropChanged);
             foreach (var name in Enum.GetNames(typeof(SceneFilter)))
+            {
+                if (!SceneHandler.DontDestroyExists && name == "DontDestroyOnLoad")
+                    continue;
                 sceneDrop.options.Add(new Dropdown.OptionData(name));
+            }
             UIFactory.SetLayoutElement(sceneDropObj, minHeight: 25, flexibleHeight: 0, flexibleWidth: 9999);
 
             sceneFilterRow.SetActive(false);
 
             // Name filter input
 
-            var nameRow = UIFactory.CreateHorizontalGroup(uiRoot, "NameRow", true, true, true, true, 2, new Vector4(2, 2, 2, 2));
-            UIFactory.SetLayoutElement(nameRow, minHeight: 25, flexibleHeight: 0);
+            nameInputRow = UIFactory.CreateHorizontalGroup(uiRoot, "NameRow", true, true, true, true, 2, new Vector4(2, 2, 2, 2));
+            UIFactory.SetLayoutElement(nameInputRow, minHeight: 25, flexibleHeight: 0);
 
-            var nameLbl = UIFactory.CreateLabel(nameRow, "NameFilterLabel", "Name contains:", TextAnchor.MiddleLeft);
+            var nameLbl = UIFactory.CreateLabel(nameInputRow, "NameFilterLabel", "Name contains:", TextAnchor.MiddleLeft);
             UIFactory.SetLayoutElement(nameLbl.gameObject, minWidth: 110, flexibleWidth: 0);
 
-            nameInputField = UIFactory.CreateInputField(nameRow, "NameFilterInput", "...");
+            nameInputField = UIFactory.CreateInputField(nameInputRow, "NameFilterInput", "...");
             UIFactory.SetLayoutElement(nameInputField.UIRoot, minHeight: 25, flexibleHeight: 0, flexibleWidth: 9999);
 
             // Search button

src/ObjectExplorer/SceneExplorer.cs

@@ -7,7 +7,6 @@ using System.Text;
 using UnityEngine;
 using UnityEngine.SceneManagement;
 using UnityEngine.UI;
-using UnityExplorer.Core;
 using UnityExplorer.UI;
 using UniverseLib.UI.Models;
 using UnityExplorer.UI.Panels;
@@ -15,6 +14,7 @@ using UnityExplorer.UI.Widgets;
 using UniverseLib.UI;
 using UniverseLib;
 using System.Collections;
+using UniverseLib.Utility;
 
 namespace UnityExplorer.ObjectExplorer
 {
@@ -27,11 +27,11 @@ namespace UnityExplorer.ObjectExplorer
             Parent = parent;
 
             SceneHandler.OnInspectedSceneChanged += SceneHandler_OnInspectedSceneChanged;
-            SceneHandler.OnLoadedScenesChanged += SceneHandler_OnLoadedScenesChanged;
+            SceneHandler.OnLoadedScenesUpdated += SceneHandler_OnLoadedScenesUpdated;
         }
 
-        public override GameObject UIRoot => m_uiRoot;
-        private GameObject m_uiRoot;
+        public override GameObject UIRoot => uiRoot;
+        private GameObject uiRoot;
 
         /// <summary>
         /// Whether to automatically update per auto-update interval or not.
@@ -43,7 +43,7 @@ namespace UnityExplorer.ObjectExplorer
 
         private GameObject refreshRow;
         private Dropdown sceneDropdown;
-        private readonly Dictionary<Scene, Dropdown.OptionData> sceneToDropdownOption = new Dictionary<Scene, Dropdown.OptionData>();
+        private readonly Dictionary<Scene, Dropdown.OptionData> sceneToDropdownOption = new();
 
         // scene loader
         private Dropdown allSceneDropdown;
@@ -64,7 +64,7 @@ namespace UnityExplorer.ObjectExplorer
         public void UpdateTree()
         {
             SceneHandler.Update();
-            Tree.RefreshData(true);
+            Tree.RefreshData(true, false, false, false);
         }
 
         public void JumpToTransform(Transform transform)
@@ -87,21 +87,21 @@ namespace UnityExplorer.ObjectExplorer
             Tree.JumpAndExpandToTransform(transform);
         }
 
-        private void OnDropdownChanged(int value)
+        private void OnSceneSelectionDropdownChanged(int value)
         {
             if (value < 0 || SceneHandler.LoadedScenes.Count <= value)
                 return;
 
             SceneHandler.SelectedScene = SceneHandler.LoadedScenes[value];
             SceneHandler.Update();
-            Tree.RefreshData(true);
+            Tree.RefreshData(true, true, true, false);
             OnSelectedSceneChanged(SceneHandler.SelectedScene.Value);
         }
 
         private void SceneHandler_OnInspectedSceneChanged(Scene scene)
         {
             if (!sceneToDropdownOption.ContainsKey(scene))
-                PopulateSceneDropdown();
+                PopulateSceneDropdown(SceneHandler.LoadedScenes);
 
             if (sceneToDropdownOption.ContainsKey(scene))
             {
@@ -122,17 +122,17 @@ namespace UnityExplorer.ObjectExplorer
                 refreshRow.SetActive(!scene.IsValid());
         }
 
-        private void SceneHandler_OnLoadedScenesChanged(List<Scene> loadedScenes)
+        private void SceneHandler_OnLoadedScenesUpdated(List<Scene> loadedScenes)
         {
-            PopulateSceneDropdown();
+            PopulateSceneDropdown(loadedScenes);
         }
 
-        private void PopulateSceneDropdown()
+        private void PopulateSceneDropdown(List<Scene> loadedScenes)
         {
             sceneToDropdownOption.Clear();
             sceneDropdown.options.Clear();
 
-            foreach (var scene in SceneHandler.LoadedScenes)
+            foreach (var scene in loadedScenes)
             {
                 if (sceneToDropdownOption.ContainsKey(scene))
                     continue;
@@ -158,7 +158,7 @@ namespace UnityExplorer.ObjectExplorer
             }
 
             Tree.CurrentFilter = input;
-            Tree.RefreshData(true, true);
+            Tree.RefreshData(true, false, true, false);
         }
 
         private void TryLoadScene(LoadSceneMode mode, Dropdown allSceneDrop)
@@ -181,13 +181,13 @@ namespace UnityExplorer.ObjectExplorer
 
         public override void ConstructUI(GameObject content)
         {
-            m_uiRoot = UIFactory.CreateUIObject("SceneExplorer", content);
-            UIFactory.SetLayoutGroup<VerticalLayoutGroup>(m_uiRoot, true, true, true, true, 0, 2, 2, 2, 2);
-            UIFactory.SetLayoutElement(m_uiRoot, flexibleHeight: 9999);
+            uiRoot = UIFactory.CreateUIObject("SceneExplorer", content);
+            UIFactory.SetLayoutGroup<VerticalLayoutGroup>(uiRoot, true, true, true, true, 0, 2, 2, 2, 2);
+            UIFactory.SetLayoutElement(uiRoot, flexibleHeight: 9999);
 
             // Tool bar (top area)
 
-            var toolbar = UIFactory.CreateVerticalGroup(m_uiRoot, "Toolbar", true, true, true, true, 2, new Vector4(2, 2, 2, 2),
+            var toolbar = UIFactory.CreateVerticalGroup(uiRoot, "Toolbar", true, true, true, true, 2, new Vector4(2, 2, 2, 2),
                new Color(0.15f, 0.15f, 0.15f));
 
             // Scene selector dropdown
@@ -198,11 +198,11 @@ namespace UnityExplorer.ObjectExplorer
             var dropLabel = UIFactory.CreateLabel(dropRow, "SelectorLabel", "Scene:", TextAnchor.MiddleLeft, Color.cyan, false, 15);
             UIFactory.SetLayoutElement(dropLabel.gameObject, minHeight: 25, minWidth: 60, flexibleWidth: 0);
 
-            var dropdownObj = UIFactory.CreateDropdown(dropRow, out sceneDropdown, "<notset>", 13, OnDropdownChanged);
+            var dropdownObj = UIFactory.CreateDropdown(dropRow, "SceneDropdown", out sceneDropdown, "<notset>", 13, OnSceneSelectionDropdownChanged);
             UIFactory.SetLayoutElement(dropdownObj, minHeight: 25, flexibleHeight: 0, flexibleWidth: 9999);
 
             SceneHandler.Update();
-            PopulateSceneDropdown();
+            PopulateSceneDropdown(SceneHandler.LoadedScenes);
             sceneDropdown.captionText.text = sceneToDropdownOption.First().Value.text;
 
             // Filter row
@@ -213,7 +213,7 @@ namespace UnityExplorer.ObjectExplorer
             //Filter input field
             var inputField = UIFactory.CreateInputField(filterRow, "FilterInput", "Search and press enter...");
             inputField.Component.targetGraphic.color = new Color(0.2f, 0.2f, 0.2f);
-            RuntimeProvider.Instance.SetColorBlock(inputField.Component, new Color(0.4f, 0.4f, 0.4f), new Color(0.2f, 0.2f, 0.2f),
+            RuntimeHelper.SetColorBlock(inputField.Component, new Color(0.4f, 0.4f, 0.4f), new Color(0.2f, 0.2f, 0.2f),
                 new Color(0.08f, 0.08f, 0.08f));
             UIFactory.SetLayoutElement(inputField.UIRoot, minHeight: 25);
             //inputField.OnValueChanged += OnFilterInput;
@@ -239,16 +239,27 @@ namespace UnityExplorer.ObjectExplorer
 
             refreshRow.SetActive(false);
 
+            // tree labels row
+
+            var labelsRow = UIFactory.CreateHorizontalGroup(toolbar, "LabelsRow", true, true, true, true, 2, new Vector4(2, 2, 2, 2));
+            UIFactory.SetLayoutElement(labelsRow, minHeight: 30, flexibleHeight: 0);
+
+            var nameLabel = UIFactory.CreateLabel(labelsRow, "NameLabel", "Name", TextAnchor.MiddleLeft, color: Color.grey);
+            UIFactory.SetLayoutElement(nameLabel.gameObject, flexibleWidth: 9999, minHeight: 25);
+
+            var indexLabel = UIFactory.CreateLabel(labelsRow, "IndexLabel", "Sibling Index", TextAnchor.MiddleLeft, fontSize: 12, color: Color.grey);
+            UIFactory.SetLayoutElement(indexLabel.gameObject, minWidth: 100, flexibleWidth: 0, minHeight: 25);
+
             // Transform Tree
 
-            var scrollPool = UIFactory.CreateScrollPool<TransformCell>(m_uiRoot, "TransformTree", out GameObject scrollObj,
+            var scrollPool = UIFactory.CreateScrollPool<TransformCell>(uiRoot, "TransformTree", out GameObject scrollObj,
                 out GameObject scrollContent, new Color(0.11f, 0.11f, 0.11f));
             UIFactory.SetLayoutElement(scrollObj, flexibleHeight: 9999);
             UIFactory.SetLayoutElement(scrollContent, flexibleHeight: 9999);
 
             Tree = new TransformTree(scrollPool, GetRootEntries);
             Tree.Init();
-            Tree.RefreshData(true, true);
+            Tree.RefreshData(true, true, true, false);
             //scrollPool.Viewport.GetComponent<Mask>().enabled = false;
             //UIRoot.GetComponent<Mask>().enabled = false;
 
@@ -256,7 +267,7 @@ namespace UnityExplorer.ObjectExplorer
 
             ConstructSceneLoader();
 
-            RuntimeProvider.Instance.StartCoroutine(TempFixCoro());
+            RuntimeHelper.StartCoroutine(TempFixCoro());
         }
 
         // To "fix" a strange FPS drop issue with MelonLoader.
@@ -313,7 +324,7 @@ namespace UnityExplorer.ObjectExplorer
             {
                 if (SceneHandler.WasAbleToGetScenesInBuild)
                 {
-                    var sceneLoaderObj = UIFactory.CreateVerticalGroup(m_uiRoot, "SceneLoader", true, true, true, true);
+                    var sceneLoaderObj = UIFactory.CreateVerticalGroup(uiRoot, "SceneLoader", true, true, true, true);
                     UIFactory.SetLayoutElement(sceneLoaderObj, minHeight: 25);
 
                     // Title
@@ -329,7 +340,7 @@ namespace UnityExplorer.ObjectExplorer
 
                     // Dropdown
 
-                    var allSceneDropObj = UIFactory.CreateDropdown(sceneLoaderObj, out allSceneDropdown, "", 14, null);
+                    var allSceneDropObj = UIFactory.CreateDropdown(sceneLoaderObj, "SceneLoaderDropdown", out allSceneDropdown, "", 14, null);
                     UIFactory.SetLayoutElement(allSceneDropObj, minHeight: 25, minWidth: 150, flexibleWidth: 0, flexibleHeight: 0);
 
                     RefreshSceneLoaderOptions(string.Empty);
@@ -353,8 +364,8 @@ namespace UnityExplorer.ObjectExplorer
                     };
 
                     var disabledColor = new Color(0.24f, 0.24f, 0.24f);
-                    RuntimeProvider.Instance.SetColorBlock(loadButton.Component, disabled: disabledColor);
-                    RuntimeProvider.Instance.SetColorBlock(loadAdditiveButton.Component, disabled: disabledColor);
+                    RuntimeHelper.SetColorBlock(loadButton.Component, disabled: disabledColor);
+                    RuntimeHelper.SetColorBlock(loadAdditiveButton.Component, disabled: disabledColor);
 
                     loadButton.Component.interactable = false;
                     loadAdditiveButton.Component.interactable = false;

src/ObjectExplorer/SceneHandler.cs

@@ -11,15 +11,13 @@ namespace UnityExplorer.ObjectExplorer
 {
     public static class SceneHandler
     {
-        /// <summary>
-        /// The currently inspected Scene.
-        /// </summary>
+        /// <summary>The currently inspected Scene.</summary>
         public static Scene? SelectedScene
         {
             get => selectedScene;
             internal set
             {
-                if (selectedScene != null && selectedScene == value)
+                if (selectedScene.HasValue && selectedScene == value)
                     return;
                 selectedScene = value;
                 OnInspectedSceneChanged?.Invoke((Scene)selectedScene);
@@ -27,63 +25,39 @@ namespace UnityExplorer.ObjectExplorer
         }
         private static Scene? selectedScene;
 
-        /// <summary>
-        /// The GameObjects in the currently inspected scene.
-        /// </summary>
+        /// <summary>The GameObjects in the currently inspected scene.</summary>
         public static GameObject[] CurrentRootObjects { get; private set; } = new GameObject[0];
 
-        /// <summary>
-        /// All currently loaded Scenes.
-        /// </summary>
-        public static List<Scene> LoadedScenes { get; private set; } = new List<Scene>();
-        private static HashSet<Scene> previousLoadedScenes;
+        /// <summary>All currently loaded Scenes.</summary>
+        public static List<Scene> LoadedScenes { get; private set; } = new();
+        //private static HashSet<Scene> previousLoadedScenes;
 
-        /// <summary>
-        /// The names of all scenes in the build settings, if they could be retrieved.
-        /// </summary>
-        public static readonly List<string> AllSceneNames = new List<string>();
+        /// <summary>The names of all scenes in the build settings, if they could be retrieved.</summary>
+        public static List<string> AllSceneNames { get; private set; } = new();
 
-        /// <summary>
-        /// Whether or not we successfuly retrieved the names of the scenes in the build settings.
-        /// </summary>
-        public static bool WasAbleToGetScenesInBuild { get; private set; }
-
-        /// <summary>
-        /// Invoked when the currently inspected Scene changes. The argument is the new scene.
-        /// </summary>
+        /// <summary>Invoked when the currently inspected Scene changes. The argument is the new scene.</summary>
         public static event Action<Scene> OnInspectedSceneChanged;
 
-        /// <summary>
-        /// Invoked whenever the list of currently loaded Scenes changes. The argument contains all loaded scenes after the change.
-        /// </summary>
-        public static event Action<List<Scene>> OnLoadedScenesChanged;
+        /// <summary>Invoked whenever the list of currently loaded Scenes changes. The argument contains all loaded scenes after the change.</summary>
+        public static event Action<List<Scene>> OnLoadedScenesUpdated;
 
-        /// <summary>
-        /// Equivalent to <see cref="SceneManager.sceneCount"/> + 2, to include 'DontDestroyOnLoad' and the 'None' scene.
-        /// </summary>
-        public static int LoadedSceneCount => SceneManager.sceneCount + 2;
-
-        internal static Scene DontDestroyScene => DontDestroyMe.scene;
-        internal static int DontDestroyHandle => DontDestroyScene.handle;
-
-        internal static GameObject DontDestroyMe
-        {
-            get
-            {
-                if (!dontDestroyObject)
-                {
-                    dontDestroyObject = new GameObject("DontDestroyMe");
-                    GameObject.DontDestroyOnLoad(dontDestroyObject);
-                }
-                return dontDestroyObject;
-            }
-        }
-        private static GameObject dontDestroyObject;
+        /// <summary>Generally will be 2, unless DontDestroyExists == false, then this will be 1.</summary>
+        internal static int DefaultSceneCount => 1 + (DontDestroyExists ? 1 : 0);
 
+        /// <summary>Whether or not we are currently inspecting the "HideAndDontSave" asset scene.</summary>
         public static bool InspectingAssetScene => SelectedScene.HasValue && SelectedScene.Value == default;
 
+        /// <summary>Whether or not we successfuly retrieved the names of the scenes in the build settings.</summary>
+        public static bool WasAbleToGetScenesInBuild { get; private set; }
+
+        /// <summary>Whether or not the "DontDestroyOnLoad" scene exists in this game.</summary>
+        public static bool DontDestroyExists { get; private set; }
+
         internal static void Init()
         {
+            // Check if the game has "DontDestroyOnLoad"
+            DontDestroyExists = Scene.GetNameInternal(-12) == "DontDestroyOnLoad";
+
             // Try to get all scenes in the build settings. This may not work.
             try
             {
@@ -110,22 +84,20 @@ namespace UnityExplorer.ObjectExplorer
 
         internal static void Update()
         {
-            // check if the loaded scenes changed. always confirm DontDestroy / HideAndDontSave
-            int confirmedCount = 2;
-            bool inspectedExists = SelectedScene == DontDestroyScene || (SelectedScene.HasValue && SelectedScene.Value == default);
+            // Inspected scene will exist if it's DontDestroyOnLoad or HideAndDontSave
+            bool inspectedExists = 
+                SelectedScene.HasValue 
+                && ((DontDestroyExists && SelectedScene.Value.handle == -12) 
+                    || SelectedScene.Value.handle == -1);
 
             LoadedScenes.Clear();
 
             for (int i = 0; i < SceneManager.sceneCount; i++)
             {
                 Scene scene = SceneManager.GetSceneAt(i);
-                if (scene == default || !scene.isLoaded)
+                if (scene == default || !scene.isLoaded || !scene.IsValid())
                     continue;
 
-                // If no changes yet, ensure the previous list contained the scene
-                if (previousLoadedScenes != null && previousLoadedScenes.Contains(scene))
-                    confirmedCount++;
-
                 // If we have not yet confirmed inspectedExists, check if this scene is our currently inspected one.
                 if (!inspectedExists && scene == SelectedScene)
                     inspectedExists = true;
@@ -133,27 +105,23 @@ namespace UnityExplorer.ObjectExplorer
                 LoadedScenes.Add(scene);
             }
 
-            LoadedScenes.Add(DontDestroyScene);
-            LoadedScenes.Add(default);
-
-            bool anyChange = confirmedCount != LoadedScenes.Count;
-
-            previousLoadedScenes = new HashSet<Scene>(LoadedScenes);
+            if (DontDestroyExists)
+                LoadedScenes.Add(new Scene { m_Handle = -12 });
+            LoadedScenes.Add(new Scene { m_Handle = -1 });
 
             // Default to first scene if none selected or previous selection no longer exists.
             if (!inspectedExists)
                 SelectedScene = LoadedScenes.First();
 
             // Notify on the list changing at all
-            if (anyChange)
-                OnLoadedScenesChanged?.Invoke(LoadedScenes);
+            OnLoadedScenesUpdated?.Invoke(LoadedScenes);
 
             // Finally, update the root objects list.
             if (SelectedScene != null && ((Scene)SelectedScene).IsValid())
-                CurrentRootObjects = RuntimeProvider.Instance.GetRootGameObjects((Scene)SelectedScene);
+                CurrentRootObjects = RuntimeHelper.GetRootGameObjects((Scene)SelectedScene);
             else
             {
-                var allObjects = RuntimeProvider.Instance.FindObjectsOfTypeAll(typeof(GameObject));
+                var allObjects = RuntimeHelper.FindObjectsOfTypeAll(typeof(GameObject));
                 var objects = new List<GameObject>();
                 foreach (var obj in allObjects)
                 {

src/ObjectExplorer/SearchProvider.cs

@@ -5,9 +5,10 @@ using System.Reflection;
 using System.Text;
 using UnityEngine;
 using UnityEngine.SceneManagement;
-using UnityExplorer.Core;
-using UnityExplorer.Core.Runtime;
+using UnityExplorer.Runtime;
 using UniverseLib;
+using UniverseLib.Input;
+using UniverseLib.Utility;
 
 namespace UnityExplorer.ObjectExplorer
 {
@@ -35,26 +36,19 @@ namespace UnityExplorer.ObjectExplorer
 
     public static class SearchProvider
     {
-
         private static bool Filter(Scene scene, SceneFilter filter)
         {
-            switch (filter)
+            return filter switch
             {
-                case SceneFilter.Any:
-                    return true;
-                case SceneFilter.DontDestroyOnLoad:
-                    return scene == SceneHandler.DontDestroyScene;
-                case SceneFilter.HideAndDontSave:
-                    return scene == default;
-                case SceneFilter.ActivelyLoaded:
-                    return scene != SceneHandler.DontDestroyScene && scene != default;
-                default:
-                    return false;
-            }
+                SceneFilter.Any => true,
+                SceneFilter.DontDestroyOnLoad => scene.handle == -12,
+                SceneFilter.HideAndDontSave => scene == default,
+                SceneFilter.ActivelyLoaded => scene.buildIndex != -1,
+                _ => false,
+            };
         }
 
-        internal static List<object> UnityObjectSearch(string input, string customTypeInput, SearchContext context,
-            ChildFilter childFilter, SceneFilter sceneFilter)
+        internal static List<object> UnityObjectSearch(string input, string customTypeInput, ChildFilter childFilter, SceneFilter sceneFilter)
         {
             var results = new List<object>();
 
@@ -75,7 +69,7 @@ namespace UnityExplorer.ObjectExplorer
             if (searchType == null)
                 searchType = typeof(UnityEngine.Object);
 
-            var allObjects = RuntimeProvider.Instance.FindObjectsOfTypeAll(searchType);
+            var allObjects = RuntimeHelper.FindObjectsOfTypeAll(searchType);
 
             // perform filter comparers
 
@@ -169,7 +163,7 @@ namespace UnityExplorer.ObjectExplorer
             "<instance>k__BackingField",
         };
 
-        internal static List<object> SingletonSearch(string input)
+        internal static List<object> InstanceSearch(string input)
         {
             var instances = new List<object>();
 
@@ -178,7 +172,7 @@ namespace UnityExplorer.ObjectExplorer
                 nameFilter = input;
 
             var flags = BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static;
-
+            
             foreach (var asm in AppDomain.CurrentDomain.GetAssemblies())
             {
                 // Search all non-static, non-enum classes.
@@ -188,13 +182,13 @@ namespace UnityExplorer.ObjectExplorer
                     {
                         if (!string.IsNullOrEmpty(nameFilter) && !type.FullName.ContainsIgnoreCase(nameFilter))
                             continue;
-
+            
                         ReflectionUtility.FindSingleton(instanceNames, type, flags, instances);
                     }
                     catch { }
                 }
             }
-
+            
             return instances;
         }
 

src/Runtime/Il2CppHelper.cs

@@ -2,21 +2,11 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Reflection;
-using BF = System.Reflection.BindingFlags;
-using System.Text;
-using UnhollowerBaseLib;
-using UnhollowerRuntimeLib;
 using UnityEngine;
-using UnityEngine.Events;
-using UnityEngine.SceneManagement;
-using System.Collections;
-using UnityEngine.UI;
-using UnityEngine.EventSystems;
 
-namespace UnityExplorer.Core.Runtime
+namespace UnityExplorer.Runtime
 {
-    public class Il2CppProvider : RuntimeHelper
+    public class Il2CppHelper : UERuntimeHelper
     {
         public override void SetupEvents()
         {
@@ -41,7 +31,7 @@ namespace UnityExplorer.Core.Runtime
         // These methods currently cause a crash in most il2cpp games,
         // even from doing "GetParameters()" on the MemberInfo.
         // Blacklisting until the issue is fixed in Unhollower.
-        public static HashSet<string> defaultIl2CppBlacklist = new HashSet<string>
+        public static HashSet<string> defaultIl2CppBlacklist = new()
         {
             // These were deprecated a long time ago, still show up in some IL2CPP games for some reason
             "UnityEngine.MonoBehaviour.allowPrefabModeInPlayMode",

src/Runtime/MonoHelper.cs

@@ -1,20 +1,9 @@
 #if MONO
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Text;
 using UnityEngine;
-using UnityEngine.Events;
-using UnityEngine.EventSystems;
-using UnityEngine.SceneManagement;
-using UnityEngine.UI;
-using UnityExplorer;
 
-namespace UnityExplorer.Core.Runtime
+namespace UnityExplorer.Runtime
 {
-    public class MonoProvider : RuntimeHelper
+    public class MonoHelper : UERuntimeHelper
     {
         public override void SetupEvents()
         {

src/Runtime/UERuntimeHelper.cs

@@ -8,21 +8,23 @@ using UnityEngine;
 using UnityEngine.EventSystems;
 using UnityEngine.SceneManagement;
 using UnityEngine.UI;
-using UnityExplorer.Core.Config;
+using UnityExplorer.Config;
 using UniverseLib;
 
-namespace UnityExplorer.Core.Runtime
+namespace UnityExplorer.Runtime
 {
-    public abstract class RuntimeHelper
+    // Not really that necessary anymore, can eventually just be refactored away into the few classes that use this class.
+
+    public abstract class UERuntimeHelper
     {
-        public static RuntimeHelper Instance;
+        public static UERuntimeHelper Instance;
 
         public static void Init()
         { 
 #if CPP
-            Instance = new Il2CppProvider();
+            Instance = new Il2CppHelper();
 #else
-            Instance = new MonoProvider();
+            Instance = new MonoHelper();
 #endif
             Instance.SetupEvents();
 
@@ -35,9 +37,7 @@ namespace UnityExplorer.Core.Runtime
 
         public abstract void SetupEvents();
 
-        #region Reflection Blacklist
-
-        private static readonly HashSet<string> currentBlacklist = new HashSet<string>();
+        private static readonly HashSet<string> currentBlacklist = new();
 
         public virtual string[] DefaultReflectionBlacklist => new string[0];
 
@@ -88,7 +88,5 @@ namespace UnityExplorer.Core.Runtime
 
             return currentBlacklist.Contains(sig);
         }
-
-        #endregion
     }
 }

src/Runtime/UnityCrashPrevention.cs

@@ -0,0 +1,38 @@
+using HarmonyLib;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using UnityEngine;
+using UnityExplorer.CacheObject;
+
+namespace UnityExplorer.Runtime
+{
+    internal static class UnityCrashPrevention
+    {
+        internal static void Init()
+        {
+            try
+            {
+                ExplorerCore.Harmony.PatchAll(typeof(UnityCrashPrevention));
+                ExplorerCore.Log("Initialized UnityCrashPrevention.");
+            }
+            catch //(Exception ex)
+            {
+                //ExplorerCore.Log($"Exception setting up Canvas crash prevention patch: {ex}");
+            }
+        }
+
+        // In Unity 2020 they introduced "Canvas.renderingDisplaySize".
+        // If you try to get the value on a Canvas which has a renderMode value of WorldSpace and no worldCamera set,
+        // the game will Crash (I think from Unity trying to read from null ptr).
+        [HarmonyPatch(typeof(Canvas), "renderingDisplaySize", MethodType.Getter)]
+        [HarmonyPrefix]
+        internal static void Prefix_Canvas_renderingDisplaySize(Canvas __instance)
+        {
+            if (__instance.renderMode == RenderMode.WorldSpace && !__instance.worldCamera)
+                throw new InvalidOperationException(
+                    "Canvas is set to RenderMode.WorldSpace but not worldCamera is set, cannot get renderingDisplaySize.");
+        }
+    }
+}

src/Tests/TestClass.cs

@@ -14,7 +14,7 @@ using UnhollowerBaseLib;
 
 namespace UnityExplorer.Tests
 {
-    public static class TestClass
+    public class TestClass
     {
         static TestClass()
         {
@@ -24,13 +24,16 @@ namespace UnityExplorer.Tests
 #endif
         }
 
+        public static object LiterallyAnything = null;
+
         // Test enumerables
+        public static int[,,] MultiDimensionalArray = new int[45, 45, 45];
         public static List<object> ListOfInts;
         public static List<List<List<string>>> NestedList;
         public static IDictionary MixedDictionary;
         public static Hashtable Hashtable;
         public static byte[] ByteArray = new byte[16];
-        public static List<short> ABigList = new List<short>(10000);
+        public static List<short> ABigList = new(10000);
 
         // Test const behaviour (should be a readonly field)
         public const int ConstantInt5 = 5;
@@ -40,7 +43,12 @@ namespace UnityExplorer.Tests
         public static CameraClearFlags EnumTest2;
         public static Color Color = Color.magenta;
         public static Color32 Color32 = Color.red;
-        public static string ALongString = new string('#', 10000);
+        public static string ALongString = new('#', 10000);
+
+        public static float[] AParseTest(ref List<float[,,]> arg0, ref float[,] arg1)
+        {
+            return new float[] { 1, 2, 3 };
+        }
 
         public static List<object> RandomList
         {
@@ -54,25 +62,27 @@ namespace UnityExplorer.Tests
             }
         }
 
+        public int this[int index]
+        {
+            get => UnityEngine.Random.Range(0, int.MaxValue);
+            set => ExplorerCore.Log(index);
+        }
+
         // Test methods
 
         private static object GetRandomObject()
         {
-            object ret = null;
-
-            int ran = UnityEngine.Random.Range(0, 7);
-            switch (ran)
+            return UnityEngine.Random.Range(0, 7) switch
             {
-                case 0: return null;
-                case 1: return 123;
-                case 2: return true;
-                case 3: return "hello";
-                case 4: return 50.5f;
-                case 5: return CameraClearFlags.Color;
-                case 6: return new List<string> { "one", "two" };
-            }
-
-            return ret;
+                0 => null,
+                1 => 123,
+                2 => true,
+                3 => "hello",
+                4 => 50.5f,
+                5 => CameraClearFlags.Color,
+                6 => new List<string> { "one", "two" },
+                _ => null,
+            };
         }
 
         public static void TestComponent<T>() where T : Component
@@ -87,11 +97,12 @@ namespace UnityExplorer.Tests
                                              Vector3 vector, 
                                              Quaternion quaternion, 
                                              object obj,
-                                             Type type)
+                                             Type type,
+                                             GameObject go)
         {
             ExplorerCore.Log($"_string: {_string}, integer: {integer}, color: {color.ToString()}, flags: {flags}, " +
                 $"vector: {vector.ToString()}, quaternion: {quaternion.ToString()}, obj: {obj?.ToString() ?? "null"}," +
-                $"type: {type?.FullName ?? "null"}");
+                $"type: {type?.FullName ?? "null"}, go: {go?.ToString() ?? "null"}");
         }
 
         private static void Init_Mono()
@@ -135,22 +146,22 @@ namespace UnityExplorer.Tests
         }
 
 #if CPP
+        public static Il2CppSystem.Collections.Generic.Dictionary<string, string> IL2CPP_Dict;
+        public static Il2CppSystem.Collections.Generic.HashSet<string> IL2CPP_HashSet;
         public static Il2CppSystem.Collections.Generic.List<string> IL2CPP_ListString;
+        public static Il2CppSystem.Collections.Hashtable IL2CPP_HashTable;
         public static List<Il2CppSystem.Object> IL2CPP_listOfBoxedObjects;
         public static Il2CppStructArray<int> IL2CPP_structArray;
         public static Il2CppReferenceArray<Il2CppSystem.Object> IL2CPP_ReferenceArray;
         public static Il2CppSystem.Collections.IDictionary IL2CPP_IDict;
         public static Il2CppSystem.Collections.IList IL2CPP_IList;
-        public static Dictionary<Il2CppSystem.String, Il2CppSystem.Object> CppBoxedDict;
-
-        public static Il2CppSystem.Collections.Generic.HashSet<string> IL2CPP_HashSet;
-        public static Il2CppSystem.Collections.Generic.Dictionary<string, string> IL2CPP_Dict;
-        public static Il2CppSystem.Collections.Hashtable IL2CPP_HashTable;
-        public static Il2CppSystem.Object cppBoxedInt;
-        public static Il2CppSystem.Int32 cppInt;
-        public static Il2CppSystem.Decimal cppDecimal;
-        public static Il2CppSystem.Object cppDecimalBoxed;
-        public static Il2CppSystem.Object cppVector3Boxed;
+        public static Dictionary<Il2CppSystem.Object, Il2CppSystem.Object> IL2CPP_BoxedDict;
+        
+        public static Il2CppSystem.Object IL2CPP_BoxedInt;
+        public static Il2CppSystem.Int32 IL2CPP_Int;
+        public static Il2CppSystem.Decimal IL2CPP_Decimal;
+        public static Il2CppSystem.Object IL2CPP_DecimalBoxed;
+        public static Il2CppSystem.Object IL2CPP_Vector3Boxed;
         public static string IL2CPP_systemString = "Test";
         public static Il2CppSystem.Object IL2CPP_objectString = "string boxed as cpp object";
         public static Il2CppSystem.String IL2CPP_il2cppString = "string boxed as cpp string";
@@ -164,40 +175,41 @@ namespace UnityExplorer.Tests
             IL2CPP_Dict.Add("key2", "value2");
             IL2CPP_Dict.Add("key3", "value3");
 
-            ExplorerCore.Log($"IL2CPP 2: Il2Cpp Hashtable");
-            IL2CPP_HashTable = new Il2CppSystem.Collections.Hashtable();
-            IL2CPP_HashTable.Add("key1", "value1");
-            IL2CPP_HashTable.Add("key2", "value2");
-            IL2CPP_HashTable.Add("key3", "value3");
-
-            ExplorerCore.Log($"IL2CPP 3: Il2Cpp IDictionary");
-            var dict2 = new Il2CppSystem.Collections.Generic.Dictionary<string, string>();
-            dict2.Add("key1", "value1");
-            IL2CPP_IDict = dict2.TryCast<Il2CppSystem.Collections.IDictionary>();
-
-            ExplorerCore.Log($"IL2CPP 4: Il2Cpp List of Il2Cpp Object");
-            var list = new Il2CppSystem.Collections.Generic.List<Il2CppSystem.Object>(5);
-            list.Add("one");
-            list.Add("two");
-            IL2CPP_IList = list.TryCast<Il2CppSystem.Collections.IList>();
-
-            ExplorerCore.Log($"IL2CPP 5: Il2Cpp List of strings");
-            IL2CPP_ListString = new Il2CppSystem.Collections.Generic.List<string>();
-            IL2CPP_ListString.Add("hello,");
-            IL2CPP_ListString.Add("world!");
-
             ExplorerCore.Log($"IL2CPP 6: Il2Cpp HashSet of strings");
             IL2CPP_HashSet = new Il2CppSystem.Collections.Generic.HashSet<string>();
             IL2CPP_HashSet.Add("one");
             IL2CPP_HashSet.Add("two");
 
+            ExplorerCore.Log($"IL2CPP 2: Il2Cpp Hashtable");
+            IL2CPP_HashTable = new Il2CppSystem.Collections.Hashtable();
+            IL2CPP_HashTable.Add("key1", "value1");
+            IL2CPP_HashTable.Add("key2", "value2");
+            IL2CPP_HashTable.Add("key3", "value3");
+            
+            ExplorerCore.Log($"IL2CPP 3: Il2Cpp IDictionary");
+            var dict2 = new Il2CppSystem.Collections.Generic.Dictionary<string, string>();
+            dict2.Add("key1", "value1");
+            IL2CPP_IDict = dict2.TryCast<Il2CppSystem.Collections.IDictionary>();
+            
+            ExplorerCore.Log($"IL2CPP 4: Il2Cpp List of Il2Cpp Object");
+            var list = new Il2CppSystem.Collections.Generic.List<Il2CppSystem.Object>(5);
+            list.Add("one");
+            list.Add("two");
+            IL2CPP_IList = list.TryCast<Il2CppSystem.Collections.IList>();
+            
+            ExplorerCore.Log($"IL2CPP 5: Il2Cpp List of strings");
+            IL2CPP_ListString = new Il2CppSystem.Collections.Generic.List<string>();
+            IL2CPP_ListString.Add("hello,");
+            IL2CPP_ListString.Add("world!");
+            
+            
             ExplorerCore.Log($"IL2CPP 7: Dictionary of Il2Cpp String and Il2Cpp Object");
-            CppBoxedDict = new Dictionary<Il2CppSystem.String, Il2CppSystem.Object>();
-            CppBoxedDict.Add("1", new Il2CppSystem.Int32 { m_value = 1 }.BoxIl2CppObject());
-            CppBoxedDict.Add("2", new Il2CppSystem.Int32 { m_value = 2 }.BoxIl2CppObject());
-            CppBoxedDict.Add("3", new Il2CppSystem.Int32 { m_value = 3 }.BoxIl2CppObject());
-            CppBoxedDict.Add("4", new Il2CppSystem.Int32 { m_value = 4 }.BoxIl2CppObject());
-
+            IL2CPP_BoxedDict = new();
+            IL2CPP_BoxedDict[(Il2CppSystem.String)"one"] = new Il2CppSystem.Int32 { m_value = 1 }.BoxIl2CppObject();
+            IL2CPP_BoxedDict[(Il2CppSystem.String)"two"] = new Il2CppSystem.Int32 { m_value = 2 }.BoxIl2CppObject();
+            IL2CPP_BoxedDict[(Il2CppSystem.String)"three"] = new Il2CppSystem.Int32 { m_value = 3 }.BoxIl2CppObject();
+            IL2CPP_BoxedDict[(Il2CppSystem.String)"four"] = new Il2CppSystem.Int32 { m_value = 4 }.BoxIl2CppObject();
+            
             ExplorerCore.Log($"IL2CPP 8: List of boxed Il2Cpp Objects");
             IL2CPP_listOfBoxedObjects = new List<Il2CppSystem.Object>();
             IL2CPP_listOfBoxedObjects.Add((Il2CppSystem.String)"boxedString");
@@ -212,16 +224,16 @@ namespace UnityExplorer.Tests
                     var boxedEnum = Il2CppSystem.Enum.Parse(cppType, "Color");
                     IL2CPP_listOfBoxedObjects.Add(boxedEnum);
                 }
-
+            
                 var structBox = Vector3.one.BoxIl2CppObject();
                 IL2CPP_listOfBoxedObjects.Add(structBox);
-
+            
             }
             catch (Exception ex)
             {
                 ExplorerCore.LogWarning($"Boxed enum test fail: {ex}");
             }
-
+            
             ExplorerCore.Log($"IL2CPP 9: Il2Cpp struct array of ints");
             IL2CPP_structArray = new UnhollowerBaseLib.Il2CppStructArray<int>(5);
             IL2CPP_structArray[0] = 0;
@@ -229,19 +241,19 @@ namespace UnityExplorer.Tests
             IL2CPP_structArray[2] = 2;
             IL2CPP_structArray[3] = 3;
             IL2CPP_structArray[4] = 4;
-
+            
             ExplorerCore.Log($"IL2CPP 10: Il2Cpp reference array of boxed objects");
             IL2CPP_ReferenceArray = new UnhollowerBaseLib.Il2CppReferenceArray<Il2CppSystem.Object>(3);
             IL2CPP_ReferenceArray[0] = new Il2CppSystem.Int32 { m_value = 5 }.BoxIl2CppObject();
             IL2CPP_ReferenceArray[1] = null;
             IL2CPP_ReferenceArray[2] = (Il2CppSystem.String)"whats up";
-
+            
             ExplorerCore.Log($"IL2CPP 11: Misc il2cpp members");
-            cppBoxedInt = new Il2CppSystem.Int32() { m_value = 5 }.BoxIl2CppObject();
-            cppInt = new Il2CppSystem.Int32 { m_value = 420 };
-            cppDecimal = new Il2CppSystem.Decimal(1f);
-            cppDecimalBoxed = new Il2CppSystem.Decimal(1f).BoxIl2CppObject();
-            cppVector3Boxed = Vector3.down.BoxIl2CppObject();
+            IL2CPP_BoxedInt = new Il2CppSystem.Int32() { m_value = 5 }.BoxIl2CppObject();
+            IL2CPP_Int = new Il2CppSystem.Int32 { m_value = 420 };
+            IL2CPP_Decimal = new Il2CppSystem.Decimal(1f);
+            IL2CPP_DecimalBoxed = new Il2CppSystem.Decimal(1f).BoxIl2CppObject();
+            IL2CPP_Vector3Boxed = Vector3.down.BoxIl2CppObject();
 
             ExplorerCore.Log($"Finished Init_Il2Cpp");
         }

src/UI/DisplayManager.cs

@@ -0,0 +1,80 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using UnityEngine;
+using UnityExplorer.Config;
+using UniverseLib;
+using UniverseLib.Input;
+
+namespace UnityExplorer.UI
+{
+    public static class DisplayManager
+    {
+        public static int ActiveDisplayIndex { get; private set; }
+        public static Display ActiveDisplay => Display.displays[ActiveDisplayIndex];
+
+        public static int Width => ActiveDisplay.renderingWidth;
+        public static int Height => ActiveDisplay.renderingHeight;
+
+        public static Vector3 MousePosition => Display.RelativeMouseAt(InputManager.MousePosition);
+        public static bool MouseInTargetDisplay => MousePosition.z == ActiveDisplayIndex;
+
+        private static Camera canvasCamera;
+
+        internal static void Init()
+        {
+            SetDisplay(ConfigManager.Target_Display.Value);
+            ConfigManager.Target_Display.OnValueChanged += SetDisplay;
+        }
+
+        public static void SetDisplay(int display)
+        {
+            if (ActiveDisplayIndex == display)
+                return;
+
+            if (Display.displays.Length <= display)
+            {
+                ExplorerCore.LogWarning($"Cannot set display index to {display} as there are not enough monitors connected!");
+
+                if (ConfigManager.Target_Display.Value == display)
+                    ConfigManager.Target_Display.Value = 0;
+
+                return;
+            } 
+
+            ActiveDisplayIndex = display;
+            ActiveDisplay.Activate();
+
+            UIManager.UICanvas.targetDisplay = display;
+
+            // ensure a camera is targeting the display
+            if (!Camera.main || Camera.main.targetDisplay != display)
+            {
+                if (!canvasCamera)
+                {
+                    canvasCamera = new GameObject("UnityExplorer_CanvasCamera").AddComponent<Camera>();
+                    GameObject.DontDestroyOnLoad(canvasCamera.gameObject);
+                    canvasCamera.hideFlags = HideFlags.HideAndDontSave;
+                }
+                canvasCamera.targetDisplay = display;
+            }
+
+            RuntimeHelper.StartCoroutine(FixPanels());
+        }
+
+        private static IEnumerator FixPanels()
+        {
+            yield return null;
+            yield return null;
+
+            foreach (var panel in UIManager.UIPanels.Values)
+            {
+                panel.EnsureValidSize();
+                panel.EnsureValidPosition();
+                panel.Dragger.OnEndResize();
+            }
+        }
+    }
+}

src/UI/Notification.cs

@@ -0,0 +1,55 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using UnityEngine;
+using UnityEngine.UI;
+using UniverseLib.Input;
+using UniverseLib.UI;
+
+namespace UnityExplorer.UI
+{
+    public static class Notification
+    {
+        private static Text popupLabel;
+
+        private static string _currentNotification;
+        private static float _timeOfLastNotification;
+
+        public static void Init()
+        {
+            ConstructUI();
+        }
+
+        public static void ShowMessage(string message)
+        {
+            popupLabel.text = message;
+            _currentNotification = message;
+            _timeOfLastNotification = Time.realtimeSinceStartup;
+
+            popupLabel.transform.localPosition = UIManager.UIRootRect.InverseTransformPoint(DisplayManager.MousePosition) + (Vector3.up * 25);
+        }
+
+        public static void Update()
+        {
+            if (_currentNotification != null)
+            {
+                if (Time.realtimeSinceStartup - _timeOfLastNotification > 2f)
+                {
+                    _currentNotification = null;
+                    popupLabel.text = "";
+                }
+            }
+        }
+
+        private static void ConstructUI()
+        {
+
+            popupLabel = UIFactory.CreateLabel(UIManager.UIRoot, "ClipboardNotification", "", TextAnchor.MiddleCenter);
+            popupLabel.rectTransform.sizeDelta = new(500, 100);
+            popupLabel.gameObject.AddComponent<Outline>();
+            var popupGroup = popupLabel.gameObject.AddComponent<CanvasGroup>();
+            popupGroup.blocksRaycasts = false;
+        }
+    }
+}

src/UI/Panels/AutoCompleteModal.cs

@@ -5,12 +5,15 @@ using UnityEngine;
 using UnityEngine.EventSystems;
 using UnityEngine.UI;
 using UniverseLib.Input;
-using UnityExplorer.Core.Runtime;
+using UnityExplorer.Runtime;
 using UnityExplorer.UI;
 using UnityExplorer.UI.Panels;
 using UniverseLib.UI.Widgets;
 using UniverseLib;
 using UniverseLib.UI;
+using UniverseLib.UI.Widgets.ButtonList;
+using UniverseLib.UI.Widgets.ScrollView;
+using UniverseLib.Utility;
 
 namespace UnityExplorer.UI.Widgets.AutoComplete
 {
@@ -27,17 +30,17 @@ namespace UnityExplorer.UI.Widgets.AutoComplete
         public override int MinWidth => -1;
         public override int MinHeight => -1;
 
-        public override bool CanDragAndResize => false;
+        public override bool CanDragAndResize => true;
         public override bool ShouldSaveActiveState => false;
         public override bool NavButtonWanted => false;
 
         public static ISuggestionProvider CurrentHandler { get; private set; }
 
-        public static ButtonListHandler<Suggestion, ButtonCell> dataHandler;
+        public static ButtonListHandler<Suggestion, ButtonCell> buttonListDataHandler;
         public static ScrollPool<ButtonCell> scrollPool;
         private static GameObject navigationTipRow;
 
-        private static List<Suggestion> Suggestions = new List<Suggestion>();
+        private static List<Suggestion> Suggestions = new();
         private static int SelectedIndex = 0;
 
         public static Suggestion SelectedSuggestion => Suggestions[SelectedIndex];
@@ -79,7 +82,7 @@ namespace UnityExplorer.UI.Widgets.AutoComplete
             {
                 base.UIRoot.SetActive(true);
                 base.UIRoot.transform.SetAsLastSibling();
-                dataHandler.RefreshData();
+                buttonListDataHandler.RefreshData();
                 scrollPool.Refresh(true, true);
             }
         }
@@ -213,10 +216,10 @@ namespace UnityExplorer.UI.Widgets.AutoComplete
                     scrollPool.Content.anchoredPosition = pos;
                 }
 
-                RuntimeProvider.Instance.SetColorBlock(cell.Button.Component, selectedSuggestionColor);
+                RuntimeHelper.SetColorBlock(cell.Button.Component, selectedSuggestionColor);
             }
             else
-                RuntimeProvider.Instance.SetColorBlock(cell.Button.Component, inactiveSuggestionColor);
+                RuntimeHelper.SetColorBlock(cell.Button.Component, inactiveSuggestionColor);
 
             setFirstCell = true;
         }
@@ -247,13 +250,13 @@ namespace UnityExplorer.UI.Widgets.AutoComplete
                 Vector3 caretPos = textGen.characters[caretIdx].cursorPos;
                 // transform to world point
                 caretPos = input.UIRoot.transform.TransformPoint(caretPos);
-                caretPos += new Vector3(input.Rect.rect.width * 0.5f, -(input.Rect.rect.height * 0.5f), 0);
+                caretPos += new Vector3(input.Transform.rect.width * 0.5f, -(input.Transform.rect.height * 0.5f), 0);
 
                 uiRoot.transform.position = new Vector3(caretPos.x + 10, caretPos.y - 30, 0);
             }
             else
             {
-                uiRoot.transform.position = input.Rect.position + new Vector3(-(input.Rect.rect.width / 2) + 10, -20, 0);
+                uiRoot.transform.position = input.Transform.position + new Vector3(-(input.Transform.rect.width / 2) + 10, -20, 0);
                 //var textGen = input.Component.textComponent.cachedTextGenerator;
                 //var pos = input.UIRoot.transform.TransformPoint(textGen.characters[0].cursorPos);
                 //uiRoot.transform.position = new Vector3(pos.x + 10, pos.y - 20, 0);
@@ -291,36 +294,49 @@ namespace UnityExplorer.UI.Widgets.AutoComplete
 
         // UI Construction
 
+        const float MIN_X = 0.42f;
+        const float MAX_Y = 0.6f;
+
         protected internal override void DoSetDefaultPosAndAnchors()
         {
             Rect.pivot = new Vector2(0f, 1f);
-            Rect.anchorMin = new Vector2(0.42f, 0.4f);
-            Rect.anchorMax = new Vector2(0.68f, 0.6f);
+            Rect.anchorMin = new Vector2(MIN_X, 0.4f);
+            Rect.anchorMax = new Vector2(0.68f, MAX_Y);
+        }
+
+        public override void OnFinishResize(RectTransform panel)
+        {
+            float xDiff = panel.anchorMin.x - MIN_X;
+            float yDiff = panel.anchorMax.y - MAX_Y;
+
+            if (xDiff != 0 || yDiff != 0)
+            {
+                panel.anchorMin = new(MIN_X, panel.anchorMin.y - yDiff);
+                panel.anchorMax = new(panel.anchorMax.x - xDiff, MAX_Y);
+            }
+
+            base.OnFinishResize(panel);
         }
 
         public override void ConstructPanelContent()
         {
-            dataHandler = new ButtonListHandler<Suggestion, ButtonCell>(scrollPool, GetEntries, SetCell, ShouldDisplay, OnCellClicked);
+            // hide the titlebar
+            this.TitleBar.gameObject.SetActive(false);
 
-            scrollPool = UIFactory.CreateScrollPool<ButtonCell>(this.content, "AutoCompleter", out GameObject scrollObj,
+            buttonListDataHandler = new ButtonListHandler<Suggestion, ButtonCell>(scrollPool, GetEntries, SetCell, ShouldDisplay, OnCellClicked);
+
+            scrollPool = UIFactory.CreateScrollPool<ButtonCell>(this.uiContent, "AutoCompleter", out GameObject scrollObj,
                 out GameObject scrollContent);
-            scrollPool.Initialize(dataHandler);
+            scrollPool.Initialize(buttonListDataHandler);
             UIFactory.SetLayoutElement(scrollObj, flexibleHeight: 9999);
             UIFactory.SetLayoutGroup<VerticalLayoutGroup>(scrollContent, true, false, true, false);
 
-            navigationTipRow = UIFactory.CreateHorizontalGroup(this.content, "BottomRow", true, true, true, true, 0, new Vector4(2, 2, 2, 2));
+            navigationTipRow = UIFactory.CreateHorizontalGroup(this.uiContent, "BottomRow", true, true, true, true, 0, new Vector4(2, 2, 2, 2));
             UIFactory.SetLayoutElement(navigationTipRow, minHeight: 20, flexibleWidth: 9999);
             UIFactory.CreateLabel(navigationTipRow, "HelpText", "Up/Down to select, Enter to use, Esc to close",
                 TextAnchor.MiddleLeft, Color.grey, false, 13);
 
             UIRoot.SetActive(false);
         }
-
-        public override void DoSaveToConfigElement()
-        {
-            // not savable
-        }
-
-        public override string GetSaveDataFromConfigManager() => null;
     }
 }

src/UI/Panels/CSConsolePanel.cs

@@ -6,11 +6,12 @@ using System.Text;
 using UnityEngine;
 using UnityEngine.EventSystems;
 using UnityEngine.UI;
-using UnityExplorer.Core.Config;
+using UnityExplorer.Config;
 using UnityExplorer.CSConsole;
 using UnityExplorer.UI.Widgets;
 using UniverseLib;
 using UniverseLib.UI;
+using UniverseLib.UI.Models;
 using UniverseLib.UI.Widgets;
 
 namespace UnityExplorer.UI.Panels
@@ -55,15 +56,6 @@ namespace UnityExplorer.UI.Panels
             ConsoleController.Update();
         }
 
-        // Saving
-
-        public override void DoSaveToConfigElement()
-        {
-            ConfigManager.CSConsoleData.Value = this.ToSaveData();
-        }
-
-        public override string GetSaveDataFromConfigManager() => ConfigManager.CSConsoleData.Value;
-
         // UI Construction
 
         public override void OnFinishResize(RectTransform panel)
@@ -83,7 +75,7 @@ namespace UnityExplorer.UI.Panels
         {
             // Tools Row
 
-            var toolsRow = UIFactory.CreateHorizontalGroup(this.content, "ToggleRow", false, false, true, true, 5, new Vector4(8, 8, 10, 5),
+            var toolsRow = UIFactory.CreateHorizontalGroup(this.uiContent, "ToggleRow", false, false, true, true, 5, new Vector4(8, 8, 10, 5),
                 default, TextAnchor.MiddleLeft);
             UIFactory.SetLayoutElement(toolsRow, minHeight: 25, flexibleHeight: 0, flexibleWidth: 9999);
 
@@ -101,7 +93,7 @@ namespace UnityExplorer.UI.Panels
 
             // Help dropdown
 
-            var helpDrop = UIFactory.CreateDropdown(toolsRow, out var dropdown, "Help", 14, null);
+            var helpDrop = UIFactory.CreateDropdown(toolsRow, "HelpDropdown", out var dropdown, "Help", 14, null);
             UIFactory.SetLayoutElement(helpDrop, minHeight: 25, minWidth: 100);
             HelpDropdown = dropdown;
             HelpDropdown.onValueChanged.AddListener((int val) => { this.OnHelpDropdownChanged?.Invoke(val); });
@@ -132,7 +124,7 @@ namespace UnityExplorer.UI.Panels
 
             // Console Input
 
-            var inputArea = UIFactory.CreateUIObject("InputGroup", content);
+            var inputArea = UIFactory.CreateUIObject("InputGroup", uiContent);
             UIFactory.SetLayoutElement(inputArea, flexibleWidth: 9999, flexibleHeight: 9999);
             UIFactory.SetLayoutGroup<HorizontalLayoutGroup>(inputArea, false, true, true, true);
             inputArea.AddComponent<Image>().color = Color.white;
@@ -199,7 +191,7 @@ namespace UnityExplorer.UI.Panels
             Input.PlaceholderText.font = UniversalUI.ConsoleFont;
             HighlightText.font = UniversalUI.ConsoleFont;
 
-            RuntimeProvider.Instance.StartCoroutine(DelayedLayoutSetup());
+            RuntimeHelper.StartCoroutine(DelayedLayoutSetup());
         }
 
         private IEnumerator DelayedLayoutSetup()
@@ -210,8 +202,8 @@ namespace UnityExplorer.UI.Panels
 
         public void SetInputLayout()
         {
-            Input.Rect.offsetMin = new Vector2(52, Input.Rect.offsetMin.y);
-            Input.Rect.offsetMax = new Vector2(2, Input.Rect.offsetMax.y);
+            Input.Transform.offsetMin = new Vector2(52, Input.Transform.offsetMin.y);
+            Input.Transform.offsetMax = new Vector2(2, Input.Transform.offsetMax.y);
         }
     }
 }

src/UI/Panels/ClipboardPanel.cs

@@ -0,0 +1,119 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using UnityEngine;
+using UnityEngine.UI;
+using UnityExplorer.CacheObject;
+using UnityExplorer.CacheObject.Views;
+using UnityExplorer.Config;
+using UniverseLib;
+using UniverseLib.Input;
+using UniverseLib.UI;
+using UniverseLib.UI.Widgets;
+using UniverseLib.Utility;
+
+namespace UnityExplorer.UI.Panels
+{
+    public class ClipboardPanel : UIPanel
+    {
+        public static object Current { get; private set; }
+
+        public override UIManager.Panels PanelType => UIManager.Panels.Clipboard;
+        public override string Name => "Clipboard";
+        public override int MinWidth => 500;
+        public override int MinHeight => 95;
+        public override bool CanDragAndResize => true;
+        public override bool NavButtonWanted => true;
+        public override bool ShouldSaveActiveState => true;
+        public override bool ShowByDefault => true;
+
+        private static Text CurrentPasteLabel;
+
+        public static void Copy(object obj)
+        {
+            Current = obj;
+            Notification.ShowMessage("Copied!");
+            UpdateCurrentPasteInfo();
+        }
+
+        public static bool TryPaste(Type targetType, out object paste)
+        {
+            paste = Current;
+            var pasteType = Current?.GetActualType();
+
+            if (Current != null && !targetType.IsAssignableFrom(pasteType))
+            {
+                Notification.ShowMessage($"Cannot assign '{pasteType.Name}' to '{targetType.Name}'!");
+                return false;
+            }
+            
+            Notification.ShowMessage("Pasted!");
+            return true;
+        }
+
+        public static void ClearClipboard()
+        {
+            Current = null;
+            UpdateCurrentPasteInfo();
+        }
+
+        private static void UpdateCurrentPasteInfo()
+        {
+            CurrentPasteLabel.text = ToStringUtility.ToStringWithType(Current, typeof(object), false);
+        }
+
+        private static void InspectClipboard()
+        {
+            if (Current.IsNullOrDestroyed())
+            {
+                Notification.ShowMessage("Cannot inspect a null or destroyed object!");
+                return;
+            }
+
+            InspectorManager.Inspect(Current);
+        }
+        
+        protected internal override void DoSetDefaultPosAndAnchors()
+        {
+            this.Rect.SetSizeWithCurrentAnchors(RectTransform.Axis.Horizontal, MinWidth);
+            this.Rect.SetSizeWithCurrentAnchors(RectTransform.Axis.Vertical, MinHeight);
+            this.Rect.anchorMin = new Vector2(0.1f, 0.05f);
+            this.Rect.anchorMax = new Vector2(0.4f, 0.15f);
+        }
+
+        public override void ConstructPanelContent()
+        {
+            this.UIRoot.GetComponent<Image>().color = new(0.1f, 0.1f, 0.1f);
+
+            // Actual panel content
+
+            var firstRow = UIFactory.CreateHorizontalGroup(uiContent, "FirstRow", false, false, true, true, 5, new(2,2,2,2), new(1,1,1,0));
+            UIFactory.SetLayoutElement(firstRow, minHeight: 25, flexibleWidth: 999);
+
+            // Title for "Current Paste:"
+            var currentPasteTitle = UIFactory.CreateLabel(firstRow, "CurrentPasteTitle", "Current paste:", TextAnchor.MiddleLeft, color: Color.grey);
+            UIFactory.SetLayoutElement(currentPasteTitle.gameObject, minHeight: 25, minWidth: 100, flexibleWidth: 999);
+
+            // Clear clipboard button
+            var clearButton = UIFactory.CreateButton(firstRow, "ClearPasteButton", "Clear Clipboard");
+            UIFactory.SetLayoutElement(clearButton.Component.gameObject, minWidth: 120, minHeight: 25, flexibleWidth: 0);
+            clearButton.OnClick += () => Copy(null);
+
+            // Current Paste info row
+            var currentPasteHolder = UIFactory.CreateHorizontalGroup(uiContent, "SecondRow", false, false, true, true, 0, 
+                new(2, 2, 2, 2), childAlignment: TextAnchor.UpperCenter);
+
+            // Actual current paste info label
+            CurrentPasteLabel = UIFactory.CreateLabel(currentPasteHolder, "CurrentPasteInfo", "not set", TextAnchor.UpperLeft);
+            UIFactory.SetLayoutElement(CurrentPasteLabel.gameObject, minHeight: 25, minWidth: 100, flexibleWidth: 999, flexibleHeight: 999);
+            UpdateCurrentPasteInfo();
+
+            // Inspect button
+            var inspectButton = UIFactory.CreateButton(currentPasteHolder, "InspectButton", "Inspect");
+            UIFactory.SetLayoutElement(inspectButton.Component.gameObject, minHeight: 25, flexibleHeight: 0, minWidth: 80, flexibleWidth: 0);
+            inspectButton.OnClick += InspectClipboard;
+        }
+    }
+}

src/UI/Panels/HookManagerPanel.cs

@@ -4,12 +4,14 @@ using System.Linq;
 using System.Text;
 using UnityEngine;
 using UnityEngine.UI;
-using UnityExplorer.Core.Config;
+using UnityExplorer.Config;
 using UnityExplorer.Hooks;
 using UnityExplorer.UI.Widgets;
 using UnityExplorer.UI.Widgets.AutoComplete;
 using UniverseLib.UI;
+using UniverseLib.UI.Models;
 using UniverseLib.UI.Widgets;
+using UniverseLib.UI.Widgets.ScrollView;
 
 namespace UnityExplorer.UI.Panels
 {
@@ -46,10 +48,6 @@ namespace UnityExplorer.UI.Panels
         public Text EditorInputText { get; private set; }
         public Text EditorHighlightText { get; private set; }
 
-        public override string GetSaveDataFromConfigManager() => ConfigManager.HookManagerData.Value;
-
-        public override void DoSaveToConfigElement() => ConfigManager.HookManagerData.Value = this.ToSaveData();
-
         private void OnClassInputAddClicked()
         {
             HookManager.Instance.OnClassSelectedForHooks(this.classSelectorInputField.Text);
@@ -85,7 +83,7 @@ namespace UnityExplorer.UI.Panels
         {
             // ~~~~~~~~~ Active hooks scroll pool
 
-            currentHooksPanel = UIFactory.CreateUIObject("CurrentHooksPanel", this.content);
+            currentHooksPanel = UIFactory.CreateUIObject("CurrentHooksPanel", this.uiContent);
             UIFactory.SetLayoutElement(currentHooksPanel, flexibleHeight: 9999, flexibleWidth: 9999);
             UIFactory.SetLayoutGroup<VerticalLayoutGroup>(currentHooksPanel, true, true, true, true);
 
@@ -111,7 +109,7 @@ namespace UnityExplorer.UI.Panels
 
             // ~~~~~~~~~ Add hooks panel
 
-            addHooksPanel = UIFactory.CreateUIObject("AddHooksPanel", this.content);
+            addHooksPanel = UIFactory.CreateUIObject("AddHooksPanel", this.uiContent);
             UIFactory.SetLayoutElement(addHooksPanel, flexibleHeight: 9999, flexibleWidth: 9999);
             UIFactory.SetLayoutGroup<VerticalLayoutGroup>(addHooksPanel, true, true, true, true);
 
@@ -138,7 +136,7 @@ namespace UnityExplorer.UI.Panels
 
             // ~~~~~~~~~ Hook source editor panel
 
-            editorPanel = UIFactory.CreateUIObject("HookSourceEditor", this.content);
+            editorPanel = UIFactory.CreateUIObject("HookSourceEditor", this.uiContent);
             UIFactory.SetLayoutElement(editorPanel, flexibleHeight: 9999, flexibleWidth: 9999);
             UIFactory.SetLayoutGroup<VerticalLayoutGroup>(editorPanel, true, true, true, true);
 

src/UI/Panels/InspectorPanel.cs

@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;
 using UnityEngine;
 using UnityEngine.UI;
-using UnityExplorer.Core.Config;
+using UnityExplorer.Config;
 using UnityExplorer.Inspectors;
 using UniverseLib.UI;
 
@@ -24,6 +24,7 @@ namespace UnityExplorer.UI.Panels
         public override int MinHeight => 350;
 
         public GameObject NavbarHolder;
+        public Dropdown MouseInspectDropdown;
         public GameObject ContentHolder;
         public RectTransform ContentRect;
 
@@ -43,13 +44,6 @@ namespace UnityExplorer.UI.Panels
             InspectorManager.OnPanelResized(panel.rect.width);
         }
 
-        public override string GetSaveDataFromConfigManager() => ConfigManager.InspectorData.Value;
-
-        public override void DoSaveToConfigElement()
-        {
-            ConfigManager.InspectorData.Value = this.ToSaveData();
-        }
-
         protected internal override void DoSetDefaultPosAndAnchors()
         {
             Rect.localPosition = Vector2.zero;
@@ -60,9 +54,21 @@ namespace UnityExplorer.UI.Panels
 
         public override void ConstructPanelContent()
         {
+            var closeHolder = this.TitleBar.transform.Find("CloseHolder").gameObject;
+
+            // Inspect under mouse dropdown on title bar
+
+            var mouseDropdown = UIFactory.CreateDropdown(closeHolder, "MouseInspectDropdown", out MouseInspectDropdown, "Mouse Inspect", 14,
+                MouseInspector.OnDropdownSelect);
+            UIFactory.SetLayoutElement(mouseDropdown, minHeight: 25, minWidth: 140);
+            MouseInspectDropdown.options.Add(new Dropdown.OptionData("Mouse Inspect"));
+            MouseInspectDropdown.options.Add(new Dropdown.OptionData("World"));
+            MouseInspectDropdown.options.Add(new Dropdown.OptionData("UI"));
+            mouseDropdown.transform.SetSiblingIndex(0);
+
             // add close all button to titlebar
 
-            var closeAllBtn = UIFactory.CreateButton(this.titleBar.transform.Find("CloseHolder").gameObject, "CloseAllBtn", "Close All",
+            var closeAllBtn = UIFactory.CreateButton(closeHolder.gameObject, "CloseAllBtn", "Close All",
                 new Color(0.3f, 0.2f, 0.2f));
             UIFactory.SetLayoutElement(closeAllBtn.Component.gameObject, minHeight: 25, minWidth: 80);
             closeAllBtn.Component.transform.SetSiblingIndex(closeAllBtn.Component.transform.GetSiblingIndex() - 1);
@@ -70,14 +76,14 @@ namespace UnityExplorer.UI.Panels
 
             // this.UIRoot.GetComponent<Mask>().enabled = false;
 
-            UIFactory.SetLayoutGroup<VerticalLayoutGroup>(this.content, true, true, true, true, 4, padLeft: 5, padRight: 5);
+            UIFactory.SetLayoutGroup<VerticalLayoutGroup>(this.uiContent, true, true, true, true, 4, padLeft: 5, padRight: 5);
 
-            this.NavbarHolder = UIFactory.CreateGridGroup(this.content, "Navbar", new Vector2(200, 22), new Vector2(4, 4),
+            this.NavbarHolder = UIFactory.CreateGridGroup(this.uiContent, "Navbar", new Vector2(200, 22), new Vector2(4, 4),
                 new Color(0.05f, 0.05f, 0.05f));
             //UIFactory.SetLayoutElement(NavbarHolder, flexibleWidth: 9999, minHeight: 0, preferredHeight: 0, flexibleHeight: 9999);
             NavbarHolder.AddComponent<ContentSizeFitter>().verticalFit = ContentSizeFitter.FitMode.PreferredSize;
 
-            this.ContentHolder = UIFactory.CreateVerticalGroup(this.content, "ContentHolder", true, true, true, true, 0, default,
+            this.ContentHolder = UIFactory.CreateVerticalGroup(this.uiContent, "ContentHolder", true, true, true, true, 0, default,
                 new Color(0.1f, 0.1f, 0.1f));
             UIFactory.SetLayoutElement(ContentHolder, flexibleHeight: 9999);
             ContentRect = ContentHolder.GetComponent<RectTransform>();

src/UI/Panels/LogPanel.cs

@@ -6,11 +6,14 @@ using System.Linq;
 using System.Text;
 using UnityEngine;
 using UnityEngine.UI;
-using UnityExplorer.Core.Config;
+using UnityExplorer.Config;
 using UnityExplorer.UI.Widgets;
 using UniverseLib;
 using UniverseLib.UI;
+using UniverseLib.UI.Models;
 using UniverseLib.UI.Widgets;
+using UniverseLib.UI.Widgets.ScrollView;
+using UniverseLib.Utility;
 
 namespace UnityExplorer.UI.Panels
 {
@@ -141,19 +144,7 @@ namespace UnityExplorer.UI.Panels
             cell.Input.Component.textComponent.color = logColors[log.type];
 
             var color = index % 2 == 0 ? logEvenColor : logOddColor;
-            RuntimeProvider.Instance.SetColorBlock(cell.Input.Component, color);
-        }
-
-        // Panel save data
-
-        public override string GetSaveDataFromConfigManager()
-        {
-            return ConfigManager.ConsoleLogData.Value;
-        }
-
-        public override void DoSaveToConfigElement()
-        {
-            ConfigManager.ConsoleLogData.Value = this.ToSaveData();
+            RuntimeHelper.SetColorBlock(cell.Input.Component, color);
         }
 
         protected internal override void DoSetDefaultPosAndAnchors()
@@ -170,13 +161,13 @@ namespace UnityExplorer.UI.Panels
         {
             // Log scroll pool
 
-            logScrollPool = UIFactory.CreateScrollPool<ConsoleLogCell>(this.content, "Logs", out GameObject scrollObj,
+            logScrollPool = UIFactory.CreateScrollPool<ConsoleLogCell>(this.uiContent, "Logs", out GameObject scrollObj,
                 out GameObject scrollContent, new Color(0.03f, 0.03f, 0.03f));
             UIFactory.SetLayoutElement(scrollObj, flexibleWidth: 9999, flexibleHeight: 9999);
 
             // Buttons and toggles
 
-            var optionsRow = UIFactory.CreateUIObject("OptionsRow", this.content);
+            var optionsRow = UIFactory.CreateUIObject("OptionsRow", this.uiContent);
             UIFactory.SetLayoutElement(optionsRow, minHeight: 25, flexibleWidth: 9999);
             UIFactory.SetLayoutGroup<HorizontalLayoutGroup>(optionsRow, false, false, true, true, 5, 2, 2, 2, 2);
 
@@ -229,7 +220,7 @@ namespace UnityExplorer.UI.Panels
             Input = UIFactory.CreateInputField(UIRoot, "Input", "");
             //Input.Component.gameObject.AddComponent<ContentSizeFitter>().verticalFit = ContentSizeFitter.FitMode.PreferredSize;
             UIFactory.SetLayoutElement(Input.UIRoot, minHeight: 25, flexibleWidth: 9999);
-            RuntimeProvider.Instance.SetColorBlock(Input.Component, new Color(0.1f, 0.1f, 0.1f), new Color(0.13f, 0.13f, 0.13f),
+            RuntimeHelper.SetColorBlock(Input.Component, new Color(0.1f, 0.1f, 0.1f), new Color(0.13f, 0.13f, 0.13f),
                 new Color(0.07f, 0.07f, 0.07f));
             Input.Component.GetComponent<Image>().color = new Color(0.2f, 0.2f, 0.2f);
 

src/UI/Panels/ObjectExplorerPanel.cs

@@ -8,8 +8,7 @@ using System.Text;
 using UnityEngine;
 using UnityEngine.SceneManagement;
 using UnityEngine.UI;
-using UnityExplorer.Core;
-using UnityExplorer.Core.Config;
+using UnityExplorer.Config;
 using UniverseLib.UI.Models;
 using UnityExplorer.ObjectExplorer;
 using UnityExplorer.UI.Widgets;
@@ -44,16 +43,16 @@ namespace UnityExplorer.UI.Panels
             content.SetActive(true);
 
             var button = tabButtons[tabIndex];
-            RuntimeProvider.Instance.SetColorBlock(button.Component, UniversalUI.enabledButtonColor, UniversalUI.enabledButtonColor * 1.2f);
+            RuntimeHelper.SetColorBlock(button.Component, UniversalUI.EnabledButtonColor, UniversalUI.EnabledButtonColor * 1.2f);
 
             SelectedTab = tabIndex;
-            SaveToConfigManager();
+            SaveInternalData();
         }
 
         private void DisableTab(int tabIndex)
         {
             tabPages[tabIndex].SetActive(false);
-            RuntimeProvider.Instance.SetColorBlock(tabButtons[tabIndex].Component, UniversalUI.disabledButtonColor, UniversalUI.disabledButtonColor * 1.2f);
+            RuntimeHelper.SetColorBlock(tabButtons[tabIndex].Component, UniversalUI.DisabledButtonColor, UniversalUI.DisabledButtonColor * 1.2f);
         }
 
         public override void Update()
@@ -64,21 +63,12 @@ namespace UnityExplorer.UI.Panels
                 ObjectSearch.Update();
         }
 
-        public override string GetSaveDataFromConfigManager() => ConfigManager.ObjectExplorerData.Value;
-
-        public override void DoSaveToConfigElement()
-        {
-            ConfigManager.ObjectExplorerData.Value = this.ToSaveData();
-        }
-
         public override string ToSaveData()
         {
-            string ret = base.ToSaveData();
-            ret += "|" + SelectedTab;
-            return ret;
+            return string.Join("|", new string[] { base.ToSaveData(), SelectedTab.ToString() });
         }
 
-        public override void ApplySaveData(string data)
+        protected override void ApplySaveData(string data)
         {
             base.ApplySaveData(data);
 
@@ -109,17 +99,17 @@ namespace UnityExplorer.UI.Panels
         public override void ConstructPanelContent()
         {
             // Tab bar
-            var tabGroup = UIFactory.CreateHorizontalGroup(content, "TabBar", true, true, true, true, 2, new Vector4(2, 2, 2, 2));
+            var tabGroup = UIFactory.CreateHorizontalGroup(uiContent, "TabBar", true, true, true, true, 2, new Vector4(2, 2, 2, 2));
             UIFactory.SetLayoutElement(tabGroup, minHeight: 25, flexibleHeight: 0);
 
             // Scene Explorer
             SceneExplorer = new SceneExplorer(this);
-            SceneExplorer.ConstructUI(content);
+            SceneExplorer.ConstructUI(uiContent);
             tabPages.Add(SceneExplorer);
 
             // Object search
             ObjectSearch = new ObjectSearch(this);
-            ObjectSearch.ConstructUI(content);
+            ObjectSearch.ConstructUI(uiContent);
             tabPages.Add(ObjectSearch);
 
             // set up tabs

src/UI/Panels/OptionsPanel.cs

@@ -4,12 +4,13 @@ using System.Linq;
 using System.Text;
 using UnityEngine;
 using UnityEngine.UI;
-using UnityExplorer.Core.Config;
+using UnityExplorer.Config;
 using UnityExplorer.CacheObject;
 using UnityExplorer.CacheObject.Views;
 using UnityExplorer.UI.Widgets;
 using UniverseLib.UI.Widgets;
 using UniverseLib.UI;
+using UniverseLib.UI.Widgets.ScrollView;
 
 namespace UnityExplorer.UI.Panels
 {
@@ -55,17 +56,7 @@ namespace UnityExplorer.UI.Panels
             CacheObjectControllerHelper.SetCell(cell, index, this.configEntries, null);
         }
 
-        // Panel save data
-
-        public override string GetSaveDataFromConfigManager()
-        {
-            return ConfigManager.OptionsPanelData.Value;
-        }
-
-        public override void DoSaveToConfigElement()
-        {
-            ConfigManager.OptionsPanelData.Value = this.ToSaveData();
-        }
+        // UI Construction
 
         protected internal override void DoSetDefaultPosAndAnchors()
         {
@@ -76,19 +67,17 @@ namespace UnityExplorer.UI.Panels
             Rect.SetSizeWithCurrentAnchors(RectTransform.Axis.Horizontal, 600f);
         }
 
-        // UI Construction
-
         public override void ConstructPanelContent()
         {
             // Save button
 
-            var saveBtn = UIFactory.CreateButton(this.content, "Save", "Save Options", new Color(0.2f, 0.3f, 0.2f));
+            var saveBtn = UIFactory.CreateButton(this.uiContent, "Save", "Save Options", new Color(0.2f, 0.3f, 0.2f));
             UIFactory.SetLayoutElement(saveBtn.Component.gameObject, flexibleWidth: 9999, minHeight: 30, flexibleHeight: 0);
             saveBtn.OnClick += ConfigManager.Handler.SaveConfig;
 
             // Config entries
 
-            var scrollPool = UIFactory.CreateScrollPool<ConfigEntryCell>(this.content, "ConfigEntries", out GameObject scrollObj,
+            var scrollPool = UIFactory.CreateScrollPool<ConfigEntryCell>(this.uiContent, "ConfigEntries", out GameObject scrollObj,
                 out GameObject scrollContent);
 
             scrollPool.Initialize(this);

src/UI/Panels/PanelDragger.cs

@@ -10,20 +10,39 @@ using UniverseLib.UI.Models;
 using UnityExplorer.UI.Widgets.AutoComplete;
 using UniverseLib.UI;
 using UniverseLib;
+using UniverseLib.Utility;
 
 namespace UnityExplorer.UI.Panels
 {
     public class PanelDragger
     {
+        private enum MouseState
+        {
+            Down,
+            Held,
+            NotPressed
+        }
+
         #region Static
 
         public static bool Resizing { get; private set; }
+        public static bool ResizePrompting => resizeCursorObj && resizeCursorObj.activeSelf;
 
-        public static bool ResizePrompting => s_resizeCursorObj && s_resizeCursorObj.activeSelf;
+        public static GameObject resizeCursorObj;
+        internal static bool wasAnyDragging;
+
+        internal static List<PanelDragger> Instances = new();
+
+        private static bool handledInstanceThisFrame;
+
+        static PanelDragger()
+        {
+            UIPanel.OnPanelsReordered += OnPanelsReordered;
+        }
 
         internal static void ForceEnd()
         {
-            s_resizeCursorObj.SetActive(false);
+            resizeCursorObj.SetActive(false);
             wasAnyDragging = false;
             Resizing = false;
 
@@ -34,13 +53,6 @@ namespace UnityExplorer.UI.Panels
             }
         }
 
-        internal static List<PanelDragger> Instances = new List<PanelDragger>();
-
-        static PanelDragger()
-        {
-            UIPanel.OnPanelsReordered += OnPanelsReordered;
-        }
-
         public static void OnPanelsReordered()
         {
             Instances.Sort((a, b) => b.Panel.GetSiblingIndex().CompareTo(a.Panel.GetSiblingIndex()));
@@ -54,18 +66,12 @@ namespace UnityExplorer.UI.Panels
             }
         }
 
-        private enum MouseState
-        {
-            Down,
-            Held,
-            NotPressed
-        }
-
-        private static bool handledInstanceThisFrame;
-
         public static void UpdateInstances()
         {
-            if (!s_resizeCursorObj)
+            if (!DisplayManager.MouseInTargetDisplay)
+                return;
+
+            if (!resizeCursorObj)
                 CreateCursorUI();
 
             MouseState state;
@@ -76,7 +82,7 @@ namespace UnityExplorer.UI.Panels
             else
                 state = MouseState.NotPressed;
 
-            var mousePos = InputManager.MousePosition;
+            var mousePos = DisplayManager.MousePosition;
 
             handledInstanceThisFrame = false;
             foreach (var instance in Instances)
@@ -99,10 +105,6 @@ namespace UnityExplorer.UI.Panels
 
         #endregion
 
-        public static GameObject s_resizeCursorObj;
-
-        internal static bool wasAnyDragging;
-
         // Instance
 
         public UIPanel UIPanel { get; private set; }
@@ -112,27 +114,23 @@ namespace UnityExplorer.UI.Panels
         public event Action<RectTransform> OnFinishResize;
         public event Action<RectTransform> OnFinishDrag;
 
-        private readonly RectTransform canvasTransform;
-
         // Dragging
         public RectTransform DragableArea { get; set; }
         public bool WasDragging { get; set; }
-        private Vector2 m_lastDragPosition;
+        private Vector2 lastDragPosition;
 
         // Resizing
         private const int RESIZE_THICKNESS = 10;
 
-        //internal readonly Vector2 minResize = new Vector2(200, 50);
-
         private bool WasResizing { get; set; }
-        private ResizeTypes m_currentResizeType = ResizeTypes.NONE;
-        private Vector2 m_lastResizePos;
+        private ResizeTypes currentResizeType = ResizeTypes.NONE;
+        private Vector2 lastResizePos;
 
-        private bool WasHoveringResize => s_resizeCursorObj.activeInHierarchy;
+        private bool WasHoveringResize => resizeCursorObj.activeInHierarchy;
 
-        private ResizeTypes m_lastResizeHoverType;
+        private ResizeTypes lastResizeHoverType;
 
-        private Rect m_totalResizeRect;
+        private Rect totalResizeRect;
 
         public PanelDragger(RectTransform dragArea, RectTransform panelToDrag, UIPanel panel)
         {
@@ -141,16 +139,13 @@ namespace UnityExplorer.UI.Panels
             DragableArea = dragArea;
             Panel = panelToDrag;
 
-            if (!canvasTransform)
-                canvasTransform = Panel.GetComponentInParent<Canvas>().GetComponent<RectTransform>();
-
             UpdateResizeCache();
         }
 
         public void Destroy()
         {
-            if (s_resizeCursorObj)
-                GameObject.Destroy(s_resizeCursorObj);
+            if (resizeCursorObj)
+                GameObject.Destroy(resizeCursorObj);
 
             if (Instances.Contains(this))
                 Instances.Remove(this);
@@ -166,7 +161,7 @@ namespace UnityExplorer.UI.Panels
             Vector3 dragPos = DragableArea.InverseTransformPoint(rawMousePos);
             bool inDragPos = DragableArea.rect.Contains(dragPos);
 
-            if (WasHoveringResize && s_resizeCursorObj)
+            if (WasHoveringResize && resizeCursorObj)
                 UpdateHoverImagePos();
 
             switch (state)
@@ -243,15 +238,15 @@ namespace UnityExplorer.UI.Panels
         {
             wasAnyDragging = true;
             WasDragging = true;
-            m_lastDragPosition = InputManager.MousePosition;
+            lastDragPosition = DisplayManager.MousePosition;
         }
 
         public void OnDrag()
         {
-            var mousePos = InputManager.MousePosition;
+            var mousePos = DisplayManager.MousePosition;
 
-            Vector2 diff = (Vector2)mousePos - m_lastDragPosition;
-            m_lastDragPosition = mousePos;
+            Vector2 diff = (Vector2)mousePos - lastDragPosition;
+            lastDragPosition = mousePos;
 
             Panel.localPosition = Panel.localPosition + (Vector3)diff;
 
@@ -269,7 +264,7 @@ namespace UnityExplorer.UI.Panels
 
         #region RESIZE
 
-        private readonly Dictionary<ResizeTypes, Rect> m_resizeMask = new Dictionary<ResizeTypes, Rect>
+        private readonly Dictionary<ResizeTypes, Rect> m_resizeMask = new()
         {
             { ResizeTypes.Top,      default },
             { ResizeTypes.Left,     default },
@@ -296,7 +291,7 @@ namespace UnityExplorer.UI.Panels
 
         private void UpdateResizeCache()
         {
-            m_totalResizeRect = new Rect(Panel.rect.x - RESIZE_THICKNESS + 1,
+            totalResizeRect = new Rect(Panel.rect.x - RESIZE_THICKNESS + 1,
                 Panel.rect.y - RESIZE_THICKNESS + 1,
                 Panel.rect.width + DBL_THICKESS - 2,
                 Panel.rect.height + DBL_THICKESS - 2);
@@ -305,34 +300,34 @@ namespace UnityExplorer.UI.Panels
             if (AllowDragAndResize)
             {
                 m_resizeMask[ResizeTypes.Bottom] = new Rect(
-                    m_totalResizeRect.x,
-                    m_totalResizeRect.y,
-                    m_totalResizeRect.width,
+                    totalResizeRect.x,
+                    totalResizeRect.y,
+                    totalResizeRect.width,
                     RESIZE_THICKNESS);
 
                 m_resizeMask[ResizeTypes.Left] = new Rect(
-                    m_totalResizeRect.x,
-                    m_totalResizeRect.y,
+                    totalResizeRect.x,
+                    totalResizeRect.y,
                     RESIZE_THICKNESS,
-                    m_totalResizeRect.height);
+                    totalResizeRect.height);
 
                 m_resizeMask[ResizeTypes.Top] = new Rect(
-                    m_totalResizeRect.x,
+                    totalResizeRect.x,
                     Panel.rect.y + Panel.rect.height - 2,
-                    m_totalResizeRect.width,
+                    totalResizeRect.width,
                     RESIZE_THICKNESS);
 
                 m_resizeMask[ResizeTypes.Right] = new Rect(
-                    m_totalResizeRect.x + Panel.rect.width + RESIZE_THICKNESS - 2,
-                    m_totalResizeRect.y,
+                    totalResizeRect.x + Panel.rect.width + RESIZE_THICKNESS - 2,
+                    totalResizeRect.y,
                     RESIZE_THICKNESS,
-                    m_totalResizeRect.height);
+                    totalResizeRect.height);
             }
         }
 
         private bool MouseInResizeArea(Vector2 mousePos)
         {
-            return m_totalResizeRect.Contains(mousePos);
+            return totalResizeRect.Contains(mousePos);
         }
 
         private ResizeTypes GetResizeType(Vector2 mousePos)
@@ -361,16 +356,16 @@ namespace UnityExplorer.UI.Panels
 
         public void OnHoverResize(ResizeTypes resizeType)
         {
-            if (WasHoveringResize && m_lastResizeHoverType == resizeType)
+            if (WasHoveringResize && lastResizeHoverType == resizeType)
                 return;
 
             // we are entering resize, or the resize type has changed.
 
             //WasHoveringResize = true;
-            m_lastResizeHoverType = resizeType;
+            lastResizeHoverType = resizeType;
 
-            s_resizeCursorObj.SetActive(true);
-            s_resizeCursorObj.transform.SetAsLastSibling();
+            resizeCursorObj.SetActive(true);
+            resizeCursorObj.transform.SetAsLastSibling();
 
             // set the rotation for the resize icon
             float iconRotation = 0f;
@@ -387,9 +382,9 @@ namespace UnityExplorer.UI.Panels
                     iconRotation = 135f; break;
             }
 
-            Quaternion rot = s_resizeCursorObj.transform.rotation;
+            Quaternion rot = resizeCursorObj.transform.rotation;
             rot.eulerAngles = new Vector3(0, 0, iconRotation);
-            s_resizeCursorObj.transform.rotation = rot;
+            resizeCursorObj.transform.rotation = rot;
 
             UpdateHoverImagePos();
         }
@@ -397,50 +392,50 @@ namespace UnityExplorer.UI.Panels
         // update the resize icon position to be above the mouse
         private void UpdateHoverImagePos()
         {
-            s_resizeCursorObj.transform.localPosition = canvasTransform.InverseTransformPoint(InputManager.MousePosition);
+            resizeCursorObj.transform.localPosition = UIManager.UIRootRect.InverseTransformPoint(DisplayManager.MousePosition);
         }
 
         public void OnHoverResizeEnd()
         {
             //WasHoveringResize = false;
-            s_resizeCursorObj.SetActive(false);
+            resizeCursorObj.SetActive(false);
         }
 
         public void OnBeginResize(ResizeTypes resizeType)
         {
-            m_currentResizeType = resizeType;
-            m_lastResizePos = InputManager.MousePosition;
+            currentResizeType = resizeType;
+            lastResizePos = DisplayManager.MousePosition;
             WasResizing = true;
             Resizing = true;
         }
 
         public void OnResize()
         {
-            Vector3 mousePos = InputManager.MousePosition;
-            Vector2 diff = m_lastResizePos - (Vector2)mousePos;
+            Vector3 mousePos = DisplayManager.MousePosition;
+            Vector2 diff = lastResizePos - (Vector2)mousePos;
 
-            if ((Vector2)mousePos == m_lastResizePos)
+            if ((Vector2)mousePos == lastResizePos)
                 return;
 
-            if (mousePos.x < 0 || mousePos.y < 0 || mousePos.x > Screen.width || mousePos.y > Screen.height)
+            if (mousePos.x < 0 || mousePos.y < 0 || mousePos.x > DisplayManager.Width || mousePos.y > DisplayManager.Height)
                 return;
 
-            m_lastResizePos = mousePos;
+            lastResizePos = mousePos;
 
-            float diffX = (float)((decimal)diff.x / Screen.width);
-            float diffY = (float)((decimal)diff.y / Screen.height);
+            float diffX = (float)((decimal)diff.x / DisplayManager.Width);
+            float diffY = (float)((decimal)diff.y / DisplayManager.Height);
 
             Vector2 anchorMin = Panel.anchorMin;
             Vector2 anchorMax = Panel.anchorMax;
 
-            if (m_currentResizeType.HasFlag(ResizeTypes.Left))
+            if (currentResizeType.HasFlag(ResizeTypes.Left))
                 anchorMin.x -= diffX;
-            else if (m_currentResizeType.HasFlag(ResizeTypes.Right))
+            else if (currentResizeType.HasFlag(ResizeTypes.Right))
                 anchorMax.x -= diffX;
 
-            if (m_currentResizeType.HasFlag(ResizeTypes.Top))
+            if (currentResizeType.HasFlag(ResizeTypes.Top))
                 anchorMax.y -= diffY;
-            else if (m_currentResizeType.HasFlag(ResizeTypes.Bottom))
+            else if (currentResizeType.HasFlag(ResizeTypes.Bottom))
                 anchorMin.y -= diffY;
 
             var prevMin = Panel.anchorMin;
@@ -475,13 +470,13 @@ namespace UnityExplorer.UI.Panels
             try
             {
                 var text = UIFactory.CreateLabel(UIManager.UIRoot, "ResizeCursor", "↔", TextAnchor.MiddleCenter, Color.white, true, 35);
-                s_resizeCursorObj = text.gameObject;
+                resizeCursorObj = text.gameObject;
 
-                RectTransform rect = s_resizeCursorObj.GetComponent<RectTransform>();
+                RectTransform rect = resizeCursorObj.GetComponent<RectTransform>();
                 rect.SetSizeWithCurrentAnchors(RectTransform.Axis.Horizontal, 64);
                 rect.SetSizeWithCurrentAnchors(RectTransform.Axis.Vertical, 64);
 
-                s_resizeCursorObj.SetActive(false);
+                resizeCursorObj.SetActive(false);
             }
             catch (Exception e)
             {

src/UI/Panels/UIPanel.cs

@@ -5,12 +5,13 @@ using System.Linq;
 using System.Text;
 using UnityEngine;
 using UnityEngine.UI;
-using UnityExplorer.Core.Config;
+using UnityExplorer.Config;
 using UniverseLib.Input;
 using UnityExplorer.UI.Widgets;
 using UniverseLib.UI.Models;
 using UniverseLib.UI;
 using UniverseLib;
+using System.Collections;
 
 namespace UnityExplorer.UI.Panels
 {
@@ -23,8 +24,8 @@ namespace UnityExplorer.UI.Panels
         public static event Action OnPanelsReordered;
         public static event Action OnClickedOutsidePanels;
 
-        internal static readonly List<UIPanel> instances = new List<UIPanel>();
-        internal static readonly Dictionary<int, UIPanel> transformToPanelDict = new Dictionary<int, UIPanel>();
+        internal static readonly List<UIPanel> instances = new();
+        internal static readonly Dictionary<int, UIPanel> transformToPanelDict = new();
 
         public static void UpdateFocus()
         {
@@ -32,10 +33,11 @@ namespace UnityExplorer.UI.Panels
                 return;
 
             // if the user is clicking
-            if (InputManager.GetMouseButtonDown(0) || InputManager.GetMouseButtonDown(1))
+            if (DisplayManager.MouseInTargetDisplay 
+                && (InputManager.GetMouseButtonDown(0) || InputManager.GetMouseButtonDown(1)))
             {
                 int count = UIManager.PanelHolder.transform.childCount;
-                var mousePos = InputManager.MousePosition;
+                var mousePos = DisplayManager.MousePosition;
                 bool clickedInAny = false;
 
                 for (int i = count - 1; i >= 0; i--)
@@ -85,46 +87,48 @@ namespace UnityExplorer.UI.Panels
         public virtual bool CanDragAndResize => true;
         public virtual bool NavButtonWanted => true;
 
-        public ButtonRef NavButton;
-        public PanelDragger Dragger;
+        public ButtonRef NavButton { get; internal set; }
+        public PanelDragger Dragger { get; internal set; }
 
         public override GameObject UIRoot => uiRoot;
         protected GameObject uiRoot;
-        public RectTransform Rect;
-        public GameObject content;
-
-        public GameObject titleBar;
-
-        public abstract void ConstructPanelContent();
+        protected GameObject uiContent;
+        public RectTransform Rect { get; private set; }
+        public GameObject TitleBar { get; private set; }
 
         public virtual void OnFinishResize(RectTransform panel)
         {
-            SaveToConfigManager();
+            SaveInternalData();
         }
 
         public virtual void OnFinishDrag(RectTransform panel)
         {
-            SaveToConfigManager();
+            SaveInternalData();
         }
 
         public override void SetActive(bool active)
         {
-            if (this.Enabled == active)
-                return;
-
-            base.SetActive(active);
-
-            if (!ApplyingSaveData)
-                SaveToConfigManager();
-
-            if (NavButtonWanted)
+            if (this.Enabled != active)
             {
-                var color = active ? UniversalUI.enabledButtonColor : UniversalUI.disabledButtonColor;
-                RuntimeProvider.Instance.SetColorBlock(NavButton.Component, color, color * 1.2f);
+                base.SetActive(active);
+
+                if (!ApplyingSaveData)
+                    SaveInternalData();
+
+                if (NavButtonWanted)
+                {
+                    var color = active ? UniversalUI.EnabledButtonColor : UniversalUI.DisabledButtonColor;
+                    RuntimeHelper.SetColorBlock(NavButton.Component, color, color * 1.2f);
+                }
             }
 
             if (!active)
                 this.Dragger.WasDragging = false;
+            else
+            {
+                this.UIRoot.transform.SetAsLastSibling();
+                InvokeOnPanelsReordered();
+            }
         }
 
         public override void Destroy()
@@ -148,13 +152,15 @@ namespace UnityExplorer.UI.Panels
                 Rect.SetSizeWithCurrentAnchors(RectTransform.Axis.Vertical, MinHeight);
         }
 
+        public void EnsureValidPosition() => EnsureValidPosition(this.Rect);
+
         public static void EnsureValidPosition(RectTransform panel)
         {
             var pos = panel.localPosition;
 
             // Prevent panel going oustide screen bounds
-            var halfW = Screen.width * 0.5f;
-            var halfH = Screen.height * 0.5f;
+            var halfW = DisplayManager.Width * 0.5f;
+            var halfH = DisplayManager.Height * 0.5f;
 
             pos.x = Math.Max(-halfW - panel.rect.width + 50, Math.Min(pos.x, halfW - 50));
             pos.y = Math.Max(-halfH + 50, Math.Min(pos.y, halfH));
@@ -162,29 +168,30 @@ namespace UnityExplorer.UI.Panels
             panel.localPosition = pos;
         }
 
-        #region Save Data
+        // Save Data
 
-        public abstract void DoSaveToConfigElement();
+        public bool ApplyingSaveData { get; set; }
 
-        public void SaveToConfigManager()
+        public void SaveInternalData()
         {
             if (UIManager.Initializing)
                 return;
 
-            DoSaveToConfigElement();
+            SetSaveDataToConfigValue();
         }
 
-        public abstract string GetSaveDataFromConfigManager();
-
-        public bool ApplyingSaveData { get; set; }
+        private void SetSaveDataToConfigValue() => ConfigManager.GetPanelSaveData(this.PanelType).Value = this.ToSaveData();
 
         public virtual string ToSaveData()
         {
             try
             {
-                return $"{ShouldSaveActiveState && Enabled}" +
-                $"|{Rect.RectAnchorsToString()}" +
-                $"|{Rect.RectPositionToString()}";
+                return string.Join("|", new string[] 
+                { 
+                    $"{ShouldSaveActiveState && Enabled}", 
+                    Rect.RectAnchorsToString(), 
+                    Rect.RectPositionToString() 
+                });
             }
             catch (Exception ex)
             {
@@ -193,7 +200,13 @@ namespace UnityExplorer.UI.Panels
             }
         }
 
-        public virtual void ApplySaveData(string data)
+        public virtual void ApplySaveData()
+        {
+            string data = ConfigManager.GetPanelSaveData(this.PanelType).Value;
+            ApplySaveData(data);
+        }
+
+        protected virtual void ApplySaveData(string data)
         {
             if (string.IsNullOrEmpty(data))
                 return;
@@ -210,17 +223,14 @@ namespace UnityExplorer.UI.Panels
             {
                 ExplorerCore.LogWarning("Invalid or corrupt panel save data! Restoring to default.");
                 SetTransformDefaults();
-                UIManager.Initializing = false;
-                DoSaveToConfigElement();
-                ConfigManager.InternalHandler.SaveConfig();
-                UIManager.Initializing = true;
+                SetSaveDataToConfigValue();
             }
         }
 
-        #endregion
-
         // UI Construction
 
+        public abstract void ConstructPanelContent();
+
         public void ConstructUI()
         {
             //this.Enabled = true;
@@ -235,7 +245,7 @@ namespace UnityExplorer.UI.Panels
                 UIFactory.SetLayoutGroup<HorizontalLayoutGroup>(navBtn, false, true, true, true, 0, 0, 0, 5, 5, TextAnchor.MiddleCenter);
                 UIFactory.SetLayoutElement(navBtn, minWidth: 80);
 
-                RuntimeProvider.Instance.SetColorBlock(NavButton.Component, UniversalUI.disabledButtonColor, UniversalUI.disabledButtonColor * 1.2f);
+                RuntimeHelper.SetColorBlock(NavButton.Component, UniversalUI.DisabledButtonColor, UniversalUI.DisabledButtonColor * 1.2f);
                 NavButton.OnClick += () => { UIManager.TogglePanel(PanelType); };
 
                 var txtObj = navBtn.transform.Find("Text").gameObject;
@@ -243,47 +253,46 @@ namespace UnityExplorer.UI.Panels
             }
 
             // create core canvas 
-            uiRoot = UIFactory.CreatePanel(Name, UIManager.PanelHolder, out GameObject panelContent);
+            uiRoot = UIFactory.CreatePanel(Name, UIManager.PanelHolder, out uiContent);
             Rect = this.uiRoot.GetComponent<RectTransform>();
-            UIFactory.SetLayoutGroup<VerticalLayoutGroup>(this.uiRoot, false, false, true, true, 0, 2, 2, 2, 2, TextAnchor.UpperLeft);
+            //UIFactory.SetLayoutGroup<VerticalLayoutGroup>(this.uiRoot, false, false, true, true, 0, 2, 2, 2, 2, TextAnchor.UpperLeft);
 
             int id = this.uiRoot.transform.GetInstanceID();
             transformToPanelDict.Add(id, this);
 
-            content = panelContent;
-            UIFactory.SetLayoutGroup<VerticalLayoutGroup>(this.content, false, false, true, true, 2, 2, 2, 2, 2, TextAnchor.UpperLeft);
+            UIFactory.SetLayoutGroup<VerticalLayoutGroup>(this.uiContent, false, false, true, true, 2, 2, 2, 2, 2, TextAnchor.UpperLeft);
 
             // Title bar
-            titleBar = UIFactory.CreateHorizontalGroup(content, "TitleBar", false, true, true, true, 2,
+            TitleBar = UIFactory.CreateHorizontalGroup(uiContent, "TitleBar", false, true, true, true, 2,
                 new Vector4(2, 2, 2, 2), new Color(0.06f, 0.06f, 0.06f));
-            UIFactory.SetLayoutElement(titleBar, minHeight: 25, flexibleHeight: 0);
+            UIFactory.SetLayoutElement(TitleBar, minHeight: 25, flexibleHeight: 0);
 
             // Title text
 
-            var titleTxt = UIFactory.CreateLabel(titleBar, "TitleBar", Name, TextAnchor.MiddleLeft);
+            var titleTxt = UIFactory.CreateLabel(TitleBar, "TitleBar", Name, TextAnchor.MiddleLeft);
             UIFactory.SetLayoutElement(titleTxt.gameObject, minWidth: 250, minHeight: 25, flexibleHeight: 0);
 
             // close button
 
-            var closeHolder = UIFactory.CreateUIObject("CloseHolder", titleBar);
+            var closeHolder = UIFactory.CreateUIObject("CloseHolder", TitleBar);
             UIFactory.SetLayoutElement(closeHolder, minHeight: 25, flexibleHeight: 0, minWidth: 30, flexibleWidth: 9999);
             UIFactory.SetLayoutGroup<HorizontalLayoutGroup>(closeHolder, false, false, true, true, 3, childAlignment: TextAnchor.MiddleRight);
             var closeBtn = UIFactory.CreateButton(closeHolder, "CloseButton", "—");
             UIFactory.SetLayoutElement(closeBtn.Component.gameObject, minHeight: 25, minWidth: 25, flexibleWidth: 0);
-            RuntimeProvider.Instance.SetColorBlock(closeBtn.Component, new Color(0.33f, 0.32f, 0.31f));
+            RuntimeHelper.SetColorBlock(closeBtn.Component, new Color(0.33f, 0.32f, 0.31f));
 
             closeBtn.OnClick += () =>
             {
                 UIManager.SetPanelActive(this.PanelType, false);
-                SaveToConfigManager();
+                SaveInternalData();
             };
 
             if (!CanDragAndResize)
-                titleBar.SetActive(false);
+                TitleBar.SetActive(false);
 
             // Panel dragger
 
-            Dragger = new PanelDragger(titleBar.GetComponent<RectTransform>(), Rect, this);
+            Dragger = new PanelDragger(TitleBar.GetComponent<RectTransform>(), Rect, this);
             Dragger.OnFinishResize += OnFinishResize;
             Dragger.OnFinishDrag += OnFinishDrag;
 
@@ -300,7 +309,7 @@ namespace UnityExplorer.UI.Panels
             // apply panel save data or revert to default
             try
             {
-                ApplySaveData(GetSaveDataFromConfigManager());
+                ApplySaveData();
             }
             catch (Exception ex)
             {
@@ -308,7 +317,20 @@ namespace UnityExplorer.UI.Panels
                 SetTransformDefaults();
             }
 
-            LayoutRebuilder.ForceRebuildLayoutImmediate(this.Rect);
+            RuntimeHelper.StartCoroutine(LateSetupCoroutine());
+
+            // simple listener for saving enabled state
+            this.OnToggleEnabled += (bool val) =>
+            {
+                SaveInternalData();
+            };
+
+            ApplyingSaveData = false;
+        }
+
+        private IEnumerator LateSetupCoroutine()
+        {
+            yield return null;
 
             // ensure initialized position is valid
             EnsureValidSize();
@@ -316,14 +338,6 @@ namespace UnityExplorer.UI.Panels
 
             // update dragger and save data
             Dragger.OnEndResize();
-
-            // simple listener for saving enabled state
-            this.OnToggleEnabled += (bool val) =>
-            {
-                SaveToConfigManager();
-            };
-
-            ApplyingSaveData = false;
         }
 
         public override void ConstructUI(GameObject parent) => ConstructUI();
@@ -380,7 +394,7 @@ namespace UnityExplorer.UI.Panels
 
             return string.Format(CultureInfo.InvariantCulture, "{0},{1}", new object[]
             {
-                rect.localPosition.x, rect.localPosition.y
+                rect.anchoredPosition.x, rect.anchoredPosition.y
             });
         }
 
@@ -398,10 +412,10 @@ namespace UnityExplorer.UI.Panels
             if (split.Length != 2)
                 throw new Exception($"stringPosition split is unexpected length: {split.Length}");
 
-            Vector3 vector = rect.localPosition;
+            Vector3 vector = rect.anchoredPosition;
             vector.x = float.Parse(split[0], CultureInfo.InvariantCulture);
             vector.y = float.Parse(split[1], CultureInfo.InvariantCulture);
-            rect.localPosition = vector;
+            rect.anchoredPosition = vector;
         }
     }
 

src/UI/Panels/UiInspectorResultsPanel.cs

@@ -8,6 +8,9 @@ using UnityExplorer.UI.Widgets;
 using UniverseLib;
 using UniverseLib.UI;
 using UniverseLib.UI.Widgets;
+using UniverseLib.UI.Widgets.ButtonList;
+using UniverseLib.UI.Widgets.ScrollView;
+using UniverseLib.Utility;
 
 namespace UnityExplorer.UI.Panels
 {
@@ -27,17 +30,6 @@ namespace UnityExplorer.UI.Panels
         private ButtonListHandler<GameObject, ButtonCell> dataHandler;
         private ScrollPool<ButtonCell> buttonScrollPool;
 
-        public override void ConstructPanelContent()
-        {
-            dataHandler = new ButtonListHandler<GameObject, ButtonCell>(buttonScrollPool, GetEntries, SetCell, ShouldDisplayCell, OnCellClicked);
-
-            buttonScrollPool = UIFactory.CreateScrollPool<ButtonCell>(this.content, "ResultsList", out GameObject scrollObj,
-                out GameObject scrollContent);
-
-            buttonScrollPool.Initialize(dataHandler);
-            UIFactory.SetLayoutElement(scrollObj, flexibleHeight: 9999);
-        }
-
         public void ShowResults()
         {
             dataHandler.RefreshData();
@@ -65,6 +57,17 @@ namespace UnityExplorer.UI.Panels
             cell.Button.ButtonText.text = $"<color=cyan>{obj.name}</color> ({obj.transform.GetTransformPath(true)})";
         }
 
+        public override void ConstructPanelContent()
+        {
+            dataHandler = new ButtonListHandler<GameObject, ButtonCell>(buttonScrollPool, GetEntries, SetCell, ShouldDisplayCell, OnCellClicked);
+
+            buttonScrollPool = UIFactory.CreateScrollPool<ButtonCell>(this.uiContent, "ResultsList", out GameObject scrollObj,
+                out GameObject scrollContent);
+
+            buttonScrollPool.Initialize(dataHandler);
+            UIFactory.SetLayoutElement(scrollObj, flexibleHeight: 9999);
+        }
+
         protected internal override void DoSetDefaultPosAndAnchors()
         {
             this.Rect.anchorMin = new Vector2(0.5f, 0.5f);
@@ -72,8 +75,5 @@ namespace UnityExplorer.UI.Panels
             this.Rect.SetSizeWithCurrentAnchors(RectTransform.Axis.Horizontal, 500f);
             this.Rect.SetSizeWithCurrentAnchors(RectTransform.Axis.Vertical, 500f);
         }
-
-        public override void DoSaveToConfigElement() { }
-        public override string GetSaveDataFromConfigManager() => null;
     }
 }

src/UI/UIManager.cs

@@ -1,24 +1,19 @@
-using HarmonyLib;
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-using System.Text;
+using System.Collections.Generic;
 using UnityEngine;
-using UnityEngine.EventSystems;
 using UnityEngine.UI;
-using UnityExplorer.Core.Config;
+using UnityExplorer.Config;
 using UnityExplorer.CSConsole;
 using UnityExplorer.Inspectors;
 using UnityExplorer.UI.Panels;
-using UnityExplorer.UI.Widgets;
 using UnityExplorer.UI.Widgets.AutoComplete;
 using UniverseLib;
 using UniverseLib.Input;
 using UniverseLib.UI;
+using UniverseLib.UI.Models;
+using UniverseLib.UI.ObjectPool;
 using UniverseLib.UI.Widgets;
+using UniverseLib.UI.Widgets.ScrollView;
+using UniverseLib.Utility;
 
 namespace UnityExplorer.UI
 {
@@ -35,6 +30,7 @@ namespace UnityExplorer.UI
             MouseInspector,
             UIInspectorResults,
             HookManager,
+            Clipboard
         }
 
         public enum VerticalAnchor
@@ -47,15 +43,17 @@ namespace UnityExplorer.UI
 
         public static bool Initializing { get; internal set; } = true;
 
-        private static UIBase uiBase;
-        public static GameObject UIRoot => uiBase?.RootObject;
+        internal static UIBase UiBase { get; private set; }
+        public static GameObject UIRoot => UiBase?.RootObject;
+        public static RectTransform UIRootRect { get; private set; }
+        public static Canvas UICanvas { get; private set; }
 
         internal static GameObject PanelHolder { get; private set; }
-        private static readonly Dictionary<Panels, UIPanel> UIPanels = new Dictionary<Panels, UIPanel>();
+        internal static readonly Dictionary<Panels, UIPanel> UIPanels = new();
 
         public static RectTransform NavBarRect;
         public static GameObject NavbarTabButtonHolder;
-        public static Dropdown MouseInspectDropdown;
+        private static readonly Vector2 NAVBAR_DIMENSIONS = new(1020f, 35f);
 
         private static ButtonRef closeBtn;
         private static ButtonRef pauseBtn;
@@ -63,15 +61,19 @@ namespace UnityExplorer.UI
         private static bool pauseButtonPausing;
         private static float lastTimeScale;
 
+        private static int lastScreenWidth;
+        private static int lastScreenHeight;
+
         public static bool ShowMenu
         {
-            get => uiBase != null && uiBase.Enabled;
+            get => UiBase != null && UiBase.Enabled;
             set
             {
-                if (uiBase == null || !UIRoot || uiBase.Enabled == value)
+                if (UiBase == null || !UIRoot || UiBase.Enabled == value)
                     return;
 
                 UniversalUI.SetUIActive(ExplorerCore.GUID, value);
+                UniversalUI.SetUIActive(MouseInspector.UIBaseGUID, value);
             }
         }
 
@@ -79,59 +81,66 @@ namespace UnityExplorer.UI
 
         internal static void InitUI()
         {
-            uiBase = UniversalUI.RegisterUI(ExplorerCore.GUID, Update);
+            UiBase = UniversalUI.RegisterUI(ExplorerCore.GUID, Update);
 
+            UIRootRect = UIRoot.GetComponent<RectTransform>();
+            UICanvas = UIRoot.GetComponent<Canvas>();
+
+            DisplayManager.Init();
+
+            var display = DisplayManager.ActiveDisplay;
+            lastScreenWidth = display.renderingWidth;
+            lastScreenHeight = display.renderingHeight;
+
+            // Create UI.
             CreatePanelHolder();
-
             CreateTopNavBar();
-
+            // This could be automated with Assembly.GetTypes(),
+            // but the order is important and I'd have to write something to handle the order.
             UIPanels.Add(Panels.AutoCompleter, new AutoCompleteModal());
             UIPanels.Add(Panels.ObjectExplorer, new ObjectExplorerPanel());
             UIPanels.Add(Panels.Inspector, new InspectorPanel());
             UIPanels.Add(Panels.CSConsole, new CSConsolePanel());
             UIPanels.Add(Panels.HookManager, new HookManagerPanel());
+            UIPanels.Add(Panels.Clipboard, new ClipboardPanel());
             UIPanels.Add(Panels.ConsoleLog, new LogPanel());
             UIPanels.Add(Panels.Options, new OptionsPanel());
             UIPanels.Add(Panels.UIInspectorResults, new UiInspectorResultsPanel());
-            UIPanels.Add(Panels.MouseInspector, new InspectUnderMouse());
+            UIPanels.Add(Panels.MouseInspector, new MouseInspector());
 
             foreach (var panel in UIPanels.Values)
                 panel.ConstructUI();
 
+            // Call some initialize methods
+            Notification.Init();
             ConsoleController.Init();
 
+            // Add this listener to prevent ScrollPool doing anything while we are resizing panels
+            ScrollPool<ICell>.writingLockedListeners.Add(() => !PanelDragger.Resizing);
+
+            // Set default menu visibility
             ShowMenu = !ConfigManager.Hide_On_Startup.Value;
 
-            lastScreenWidth = Screen.width;
-            lastScreenHeight = Screen.height;
-
-            // Failsafe fix
+            // Failsafe fix, in some games all dropdowns displayed values are blank on startup for some reason.
             foreach (var dropdown in UIRoot.GetComponentsInChildren<Dropdown>(true))
                 dropdown.RefreshShownValue();
-            timeInput.Text = string.Empty;
-            timeInput.Text = Time.timeScale.ToString();
-
-            ScrollPool<ICell>.writingLockedListeners.Add(() => !PanelDragger.Resizing);
 
             Initializing = false;
         }
 
         // Main UI Update loop
 
-        private static int lastScreenWidth;
-        private static int lastScreenHeight;
-
         public static void Update()
         {
             if (!UIRoot)
                 return;
 
-            // if doing Mouse Inspect, update that and return.
-            if (InspectUnderMouse.Inspecting)
-            {
-                InspectUnderMouse.Instance.UpdateInspect();
+            // If we are doing a Mouse Inspect, we don't need to update anything else.
+            if (MouseInspector.Instance.TryUpdate())
                 return;
-            }
+
+            // Update Notification modal
+            Notification.Update();
 
             // Check forceUnlockMouse toggle
             if (InputManager.GetKeyDown(ConfigManager.Force_Unlock_Toggle.Value))
@@ -158,7 +167,8 @@ namespace UnityExplorer.UI
             }
 
             // check screen dimension change
-            if (Screen.width != lastScreenWidth || Screen.height != lastScreenHeight)
+            var display = DisplayManager.ActiveDisplay;
+            if (display.renderingWidth != lastScreenWidth || display.renderingHeight != lastScreenHeight)
                 OnScreenDimensionsChanged();
         }
 
@@ -174,26 +184,21 @@ namespace UnityExplorer.UI
             SetPanelActive(panel, !uiPanel.Enabled);
         }
 
-        public static void SetPanelActive(Panels panel, bool active)
+        public static void SetPanelActive(Panels panelType, bool active)
         {
-            var obj = GetPanel(panel);
-            SetPanelActive(obj, active);
+            GetPanel(panelType)
+                .SetActive(active);
         }
 
         public static void SetPanelActive(UIPanel panel, bool active)
         {
             panel.SetActive(active);
-            if (active)
-            {
-                panel.UIRoot.transform.SetAsLastSibling();
-                UIPanel.InvokeOnPanelsReordered();
-            }
         }
 
         internal static void SetPanelActive(Transform transform, bool value)
         {
             if (UIPanel.transformToPanelDict.TryGetValue(transform.GetInstanceID(), out UIPanel panel))
-                SetPanelActive(panel, value);
+                panel.SetActive(value);
         }
 
         // navbar
@@ -206,14 +211,14 @@ namespace UnityExplorer.UI
                     NavBarRect.anchorMin = new Vector2(0.5f, 1f);
                     NavBarRect.anchorMax = new Vector2(0.5f, 1f);
                     NavBarRect.anchoredPosition = new Vector2(NavBarRect.anchoredPosition.x, 0);
-                    NavBarRect.sizeDelta = new Vector2(1080f, 35f);
+                    NavBarRect.sizeDelta = NAVBAR_DIMENSIONS;
                     break;
 
                 case VerticalAnchor.Bottom:
                     NavBarRect.anchorMin = new Vector2(0.5f, 0f);
                     NavBarRect.anchorMax = new Vector2(0.5f, 0f);
                     NavBarRect.anchoredPosition = new Vector2(NavBarRect.anchoredPosition.x, 35);
-                    NavBarRect.sizeDelta = new Vector2(1080f, 35f);
+                    NavBarRect.sizeDelta = NAVBAR_DIMENSIONS;
                     break;
             }
         }
@@ -222,8 +227,9 @@ namespace UnityExplorer.UI
 
         private static void OnScreenDimensionsChanged()
         {
-            lastScreenWidth = Screen.width;
-            lastScreenHeight = Screen.height;
+            var display = DisplayManager.ActiveDisplay;
+            lastScreenWidth = display.renderingWidth;
+            lastScreenHeight = display.renderingHeight;
 
             foreach (var panel in UIPanels)
             {
@@ -243,6 +249,8 @@ namespace UnityExplorer.UI
             closeBtn.ButtonText.text = val.ToString();
         }
 
+        // Time controls
+
         private static void OnTimeInputEndEdit(string val)
         {
             if (pauseButtonPausing)
@@ -273,7 +281,7 @@ namespace UnityExplorer.UI
             timeInput.Component.textComponent.color = pauseButtonPausing ? Color.grey : Color.white;
 
             Color color = pauseButtonPausing ? new Color(0.3f, 0.3f, 0.2f) : new Color(0.2f, 0.2f, 0.2f);
-            RuntimeProvider.Instance.SetColorBlock(pauseBtn.Component, color, color * 1.2f, color * 0.7f);
+            RuntimeHelper.SetColorBlock(pauseBtn.Component, color, color * 1.2f, color * 0.7f);
             pauseBtn.ButtonText.text = pauseButtonPausing ? "►" : "||";
         }
 
@@ -328,27 +336,20 @@ namespace UnityExplorer.UI
 
             timeInput = UIFactory.CreateInputField(navbarPanel, "TimeInput", "timeScale");
             UIFactory.SetLayoutElement(timeInput.Component.gameObject, minHeight: 25, minWidth: 40);
-            timeInput.Text = Time.timeScale.ToString("F2");
             timeInput.Component.GetOnEndEdit().AddListener(OnTimeInputEndEdit);
 
+            timeInput.Text = string.Empty;
+            timeInput.Text = Time.timeScale.ToString();
+
             pauseBtn = UIFactory.CreateButton(navbarPanel, "PauseButton", "||", new Color(0.2f, 0.2f, 0.2f));
             UIFactory.SetLayoutElement(pauseBtn.Component.gameObject, minHeight: 25, minWidth: 25);
             pauseBtn.OnClick += OnPauseButtonClicked;
 
-            // Inspect under mouse dropdown
-
-            var mouseDropdown = UIFactory.CreateDropdown(navbarPanel, out MouseInspectDropdown, "Mouse Inspect", 14,
-                InspectUnderMouse.OnDropdownSelect);
-            UIFactory.SetLayoutElement(mouseDropdown, minHeight: 25, minWidth: 140);
-            MouseInspectDropdown.options.Add(new Dropdown.OptionData("Mouse Inspect"));
-            MouseInspectDropdown.options.Add(new Dropdown.OptionData("World"));
-            MouseInspectDropdown.options.Add(new Dropdown.OptionData("UI"));
-
             // Hide menu button
 
             closeBtn = UIFactory.CreateButton(navbarPanel, "CloseButton", ConfigManager.Master_Toggle.Value.ToString());
             UIFactory.SetLayoutElement(closeBtn.Component.gameObject, minHeight: 25, minWidth: 80, flexibleWidth: 0);
-            RuntimeProvider.Instance.SetColorBlock(closeBtn.Component, new Color(0.63f, 0.32f, 0.31f),
+            RuntimeHelper.SetColorBlock(closeBtn.Component, new Color(0.63f, 0.32f, 0.31f),
                 new Color(0.81f, 0.25f, 0.2f), new Color(0.6f, 0.18f, 0.16f));
 
             ConfigManager.Master_Toggle.OnValueChanged += Master_Toggle_OnValueChanged;

src/UI/Widgets/AutoComplete/EnumCompleter.cs

@@ -4,6 +4,8 @@ using System.Collections.Specialized;
 using UnityExplorer.CacheObject.IValues;
 using UniverseLib;
 using UniverseLib.UI;
+using UniverseLib.UI.Models;
+using UniverseLib.Utility;
 
 namespace UnityExplorer.UI.Widgets.AutoComplete
 {

src/UI/Widgets/AutoComplete/ISuggestionProvider.cs

@@ -5,6 +5,7 @@ using System.Text;
 using UnityEngine;
 using UnityEngine.UI;
 using UniverseLib.UI;
+using UniverseLib.UI.Models;
 
 namespace UnityExplorer.UI.Widgets.AutoComplete
 {

src/UI/Widgets/AutoComplete/Suggestion.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using UnityEngine;
-using UnityExplorer.Core;
 
 namespace UnityExplorer.UI.Widgets.AutoComplete
 {

src/UI/Widgets/AutoComplete/TypeCompleter.cs

@@ -1,14 +1,16 @@
-using System;
+using HarmonyLib;
+using System;
 using System.Collections.Generic;
+using System.Linq;
 using UniverseLib;
 using UniverseLib.UI;
+using UniverseLib.UI.Models;
+using UniverseLib.Utility;
 
 namespace UnityExplorer.UI.Widgets.AutoComplete
 {
     public class TypeCompleter : ISuggestionProvider
     {
-        internal static readonly Dictionary<string, string> sharedTypeToLabel = new Dictionary<string, string>(4096);
-
         public bool Enabled
         {
             get => _enabled;
@@ -25,14 +27,16 @@ namespace UnityExplorer.UI.Widgets.AutoComplete
 
         public Type BaseType { get; set; }
         public Type[] GenericConstraints { get; set; }
+        public bool AllTypes { get; set; }
+
         private readonly bool allowAbstract;
         private readonly bool allowEnum;
 
         public InputFieldRef InputField { get; }
         public bool AnchorToCaretPosition => false;
 
-        private readonly List<Suggestion> suggestions = new List<Suggestion>();
-        private readonly HashSet<string> suggestedNames = new HashSet<string>();
+        private readonly List<Suggestion> suggestions = new();
+        private readonly HashSet<string> suggestedNames = new();
 
         private HashSet<Type> allowedTypes;
 
@@ -58,7 +62,24 @@ namespace UnityExplorer.UI.Widgets.AutoComplete
 
         public void CacheTypes()
         {
-            allowedTypes = ReflectionUtility.GetImplementationsOf(BaseType, allowAbstract, allowEnum, false);
+            if (!AllTypes)
+                allowedTypes = ReflectionUtility.GetImplementationsOf(BaseType, allowAbstract, allowEnum, false);
+            else
+            {
+                allowedTypes = new();
+                foreach (var entry in ReflectionUtility.AllTypes)
+                {
+                    // skip <PrivateImplementationDetails> and <AnonymousClass> classes
+                    var type = entry.Value;
+                    if (type.FullName.Contains("PrivateImplementationDetails")
+                             || type.FullName.Contains("DisplayClass")
+                             || type.FullName.Contains('<'))
+                    {
+                        continue;
+                    }
+                    allowedTypes.Add(type);
+                }
+            }
         }
 
         public void OnSuggestionClicked(Suggestion suggestion)
@@ -112,6 +133,8 @@ namespace UnityExplorer.UI.Widgets.AutoComplete
             }
         }
 
+        internal static readonly Dictionary<string, string> sharedTypeToLabel = new();
+
         void AddSuggestion(Type type)
         {
             if (suggestedNames.Contains(type.FullName))

src/UI/Widgets/EvaluateWidget/BaseArgumentHandler.cs

@@ -7,6 +7,7 @@ using UnityEngine.UI;
 using UnityExplorer.UI.Widgets.AutoComplete;
 using UniverseLib.UI;
 using UniverseLib.UI.Models;
+using UniverseLib.UI.ObjectPool;
 
 namespace UnityExplorer.UI.Widgets
 {

src/UI/Widgets/EvaluateWidget/EvaluateWidget.cs

@@ -11,6 +11,8 @@ using UnityExplorer.UI.Widgets.AutoComplete;
 using UniverseLib.UI;
 using UniverseLib;
 using UnityExplorer.CacheObject;
+using UniverseLib.UI.ObjectPool;
+using UniverseLib.Utility;
 
 namespace UnityExplorer.UI.Widgets
 {
@@ -42,8 +44,6 @@ namespace UnityExplorer.UI.Widgets
             SetArgRows();
 
             this.UIRoot.SetActive(true);
-
-            InspectorManager.OnInspectedTabsChanged += InspectorManager_OnInspectedTabsChanged;
         }
 
         public void OnReturnToPool()
@@ -63,14 +63,6 @@ namespace UnityExplorer.UI.Widgets
             genericHandlers = null;
 
             this.Owner = null;
-
-            InspectorManager.OnInspectedTabsChanged -= InspectorManager_OnInspectedTabsChanged;
-        }
-
-        private void InspectorManager_OnInspectedTabsChanged()
-        {
-            foreach (var handler in this.paramHandlers)
-                handler.PopulateDropdown();
         }
 
         public Type[] TryParseGenericArguments()
@@ -85,6 +77,9 @@ namespace UnityExplorer.UI.Widgets
 
         public object[] TryParseArguments()
         {
+            if (!parameters.Any())
+                return ArgumentUtility.EmptyArgs;
+
             object[] outArgs = new object[parameters.Length];
 
             for (int i = 0; i < parameters.Length; i++)

src/UI/Widgets/EvaluateWidget/GenericArgumentHandler.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using UniverseLib;
+using UniverseLib.Utility;
 
 namespace UnityExplorer.UI.Widgets
 {

src/UI/Widgets/EvaluateWidget/ParameterHandler.cs

@@ -1,12 +1,17 @@
-using System;
+using HarmonyLib;
+using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.Reflection;
+using UnityEngine;
 using UnityEngine.UI;
 using UnityExplorer.CacheObject.IValues;
+using UnityExplorer.UI.Panels;
 using UnityExplorer.UI.Widgets.AutoComplete;
 using UniverseLib;
 using UniverseLib.UI;
+using UniverseLib.UI.Models;
+using UniverseLib.Utility;
 
 namespace UnityExplorer.UI.Widgets
 {
@@ -15,11 +20,15 @@ namespace UnityExplorer.UI.Widgets
         private ParameterInfo paramInfo;
         private Type paramType;
 
-        internal Dropdown dropdown;
-        private bool usingDropdown;
         internal EnumCompleter enumCompleter;
         private ButtonRef enumHelperButton;
 
+        private bool usingBasicLabel;
+        private object basicValue;
+        private GameObject basicLabelHolder;
+        private Text basicLabel;
+        private ButtonRef pasteButton;
+
         public void OnBorrowed(EvaluateWidget evaluator, ParameterInfo paramInfo)
         {
             this.evaluator = evaluator;
@@ -34,8 +43,10 @@ namespace UnityExplorer.UI.Widgets
 
             if (ParseUtility.CanParse(paramType) || typeof(Type).IsAssignableFrom(paramType))
             {
+                usingBasicLabel = false;
+
                 this.inputField.Component.gameObject.SetActive(true);
-                this.dropdown.gameObject.SetActive(false);
+                this.basicLabelHolder.SetActive(false);
                 this.typeCompleter.Enabled = typeof(Type).IsAssignableFrom(paramType);
                 this.enumCompleter.Enabled = paramType.IsEnum;
                 this.enumHelperButton.Component.gameObject.SetActive(paramType.IsEnum);
@@ -63,16 +74,15 @@ namespace UnityExplorer.UI.Widgets
             else
             {
                 // non-parsable, and not a Type
+                usingBasicLabel = true;
+
                 this.inputField.Component.gameObject.SetActive(false);
-                this.dropdown.gameObject.SetActive(true);
+                this.basicLabelHolder.SetActive(true);
                 this.typeCompleter.Enabled = false;
                 this.enumCompleter.Enabled = false;
                 this.enumHelperButton.Component.gameObject.SetActive(false);
 
-                usingDropdown = true;
-                PopulateDropdown();
-
-                InspectorManager.OnInspectedTabsChanged += PopulateDropdown;
+                SetDisplayedValueFromPaste();
             }
         }
 
@@ -81,109 +91,89 @@ namespace UnityExplorer.UI.Widgets
             this.evaluator = null;
             this.paramInfo = null;
 
-            usingDropdown = false;
-
             this.enumCompleter.Enabled = false;
             this.typeCompleter.Enabled = false;
 
             this.inputField.Text = "";
 
-            InspectorManager.OnInspectedTabsChanged -= PopulateDropdown;
+            this.usingBasicLabel = false;
+            this.basicValue = null;
         }
 
         public object Evaluate()
         {
-            if (!usingDropdown)
+            if (usingBasicLabel)
+                return basicValue;
+
+            var input = this.inputField.Text;
+
+            if (typeof(Type).IsAssignableFrom(paramType))
+                return ReflectionUtility.GetTypeByName(input);
+
+            if (paramType == typeof(string))
+                return input;
+
+            if (string.IsNullOrEmpty(input))
             {
-                var input = this.inputField.Text;
-
-                if (typeof(Type).IsAssignableFrom(paramType))
-                    return ReflectionUtility.GetTypeByName(input);
-
-                if (paramType == typeof(string))
-                    return input;
-
-                if (string.IsNullOrEmpty(input))
-                {
-                    if (paramInfo.IsOptional)
-                        return paramInfo.DefaultValue;
-                    else
-                        return null;
-                }
-
-                if (!ParseUtility.TryParse(input, paramType, out object parsed, out Exception ex))
-                {
-                    ExplorerCore.LogWarning($"Cannot parse argument '{paramInfo.Name}' ({paramInfo.ParameterType.Name})" +
-                        $"{(ex == null ? "" : $", {ex.GetType().Name}: {ex.Message}")}");
-                    return null;
-                }
+                if (paramInfo.IsOptional)
+                    return paramInfo.DefaultValue;
                 else
-                    return parsed;
+                    return null;
+            }
+
+            if (!ParseUtility.TryParse(input, paramType, out object parsed, out Exception ex))
+            {
+                ExplorerCore.LogWarning($"Cannot parse argument '{paramInfo.Name}' ({paramInfo.ParameterType.Name})" +
+                    $"{(ex == null ? "" : $", {ex.GetType().Name}: {ex.Message}")}");
+                return null;
             }
             else
+                return parsed;
+        }
+
+        private void OnPasteClicked()
+        {
+            if (ClipboardPanel.TryPaste(this.paramType, out object paste))
             {
-                if (dropdown.value == 0)
-                    return null;
+                basicValue = paste;
+                SetDisplayedValueFromPaste();
+            }
+        }
+
+        private void SetDisplayedValueFromPaste()
+        {
+            if (usingBasicLabel)
+                basicLabel.text = ToStringUtility.ToStringWithType(basicValue, paramType, false);
+            else
+            {
+                if (typeof(Type).IsAssignableFrom(paramType))
+                    inputField.Text = (basicValue as Type).FullDescription();
                 else
-                    return dropdownUnderlyingValues[dropdown.value];
+                    inputField.Text = ParseUtility.ToStringForInput(basicValue, paramType);
             }
         }
 
-        private object[] dropdownUnderlyingValues;
-
-        internal void PopulateDropdown()
-        {
-            if (!usingDropdown)
-                return;
-
-            dropdown.options.Clear();
-            var underlyingValues = new List<object>();
-
-            dropdown.options.Add(new Dropdown.OptionData("null"));
-            underlyingValues.Add(null);
-
-            var argType = paramType;
-
-            int tabIndex = 0;
-            foreach (var tab in InspectorManager.Inspectors)
-            {
-                tabIndex++;
-
-                if (argType.IsAssignableFrom(tab.Target.GetActualType()))
-                {
-                    dropdown.options.Add(new Dropdown.OptionData($"Tab {tabIndex}: {tab.Tab.TabText.text}"));
-                    underlyingValues.Add(tab.Target);
-                }
-            }
-
-            dropdownUnderlyingValues = underlyingValues.ToArray();
-        }
-
-        private void EnumHelper_OnClick()
-        {
-            enumCompleter.HelperButtonClicked();
-        }
-
         public override void CreateSpecialContent()
         {
+            enumCompleter = new(paramType, this.inputField)
+            {
+                Enabled = false
+            };
+
             enumHelperButton = UIFactory.CreateButton(UIRoot, "EnumHelper", "▼");
             UIFactory.SetLayoutElement(enumHelperButton.Component.gameObject, minWidth: 25, minHeight: 25, flexibleWidth: 0, flexibleHeight: 0);
-            enumHelperButton.OnClick += EnumHelper_OnClick;
+            enumHelperButton.OnClick += enumCompleter.HelperButtonClicked;
 
-            var dropdownObj = UIFactory.CreateDropdown(UIRoot, out dropdown, "Select argument...", 14, (int val) =>
-            {
-                //ArgDropdownChanged(val);
-            });
-            UIFactory.SetLayoutElement(dropdownObj, minHeight: 25, flexibleHeight: 50, minWidth: 100, flexibleWidth: 1000);
-            dropdownObj.AddComponent<ContentSizeFitter>().verticalFit = ContentSizeFitter.FitMode.PreferredSize;
+            basicLabelHolder = UIFactory.CreateHorizontalGroup(UIRoot, "BasicLabelHolder", true, true, true, true, bgColor: new(0.1f, 0.1f, 0.1f));
+            UIFactory.SetLayoutElement(basicLabelHolder, minHeight: 25, flexibleHeight: 50, minWidth: 100, flexibleWidth: 1000);
+            basicLabel = UIFactory.CreateLabel(basicLabelHolder, "BasicLabel", "null", TextAnchor.MiddleLeft);
+            basicLabel.gameObject.AddComponent<ContentSizeFitter>().verticalFit = ContentSizeFitter.FitMode.PreferredSize;
 
-            enumCompleter = new EnumCompleter(paramType, this.inputField);
-            enumCompleter.Enabled = false;
+            pasteButton = UIFactory.CreateButton(UIRoot, "PasteButton", "Paste", new Color(0.13f, 0.13f, 0.13f, 1f));
+            UIFactory.SetLayoutElement(pasteButton.Component.gameObject, minHeight: 25, minWidth: 28, flexibleWidth: 0);
+            pasteButton.ButtonText.color = Color.green;
+            pasteButton.ButtonText.fontSize = 10;
+            pasteButton.OnClick += OnPasteClicked;
         }
-
-        //private void ArgDropdownChanged(int value)
-        //{
-        //    // not needed
-        //}
     }
 }

src/UI/Widgets/TransformTree/CachedTransform.cs

@@ -17,8 +17,9 @@ namespace UnityExplorer.UI.Widgets
         public int ChildCount { get; internal set; }
         public string Name { get; internal set; }
         public bool Enabled { get; internal set; }
+        public int SiblingIndex { get; internal set; }
 
-        public bool Expanded => Tree.IsCellExpanded(InstanceID);
+        public bool Expanded => Tree.IsTransformExpanded(InstanceID);
 
         public CachedTransform(TransformTree tree, Transform transform, int depth, CachedTransform parent = null)
         {
@@ -26,27 +27,32 @@ namespace UnityExplorer.UI.Widgets
             Value = transform;
             Parent = parent;
             InstanceID = transform.GetInstanceID();
+            SiblingIndex = transform.GetSiblingIndex();
             Update(transform, depth);
         }
 
         public bool Update(Transform transform, int depth)
         {
-            bool ret = false;
+            bool changed = false;
 
             if (Value != transform
                 || depth != Depth
                 || ChildCount != transform.childCount
                 || Name != transform.name
-                || Enabled != transform.gameObject.activeSelf)
+                || Enabled != transform.gameObject.activeSelf
+                || SiblingIndex != transform.GetSiblingIndex())
             {
+                changed = true;
+
                 Value = transform;
                 Depth = depth;
                 ChildCount = transform.childCount;
                 Name = transform.name;
                 Enabled = transform.gameObject.activeSelf;
-                ret = true;
+                SiblingIndex = transform.GetSiblingIndex();
             }
-            return ret;
+
+            return changed;
         }
     }
 }

src/UI/Widgets/TransformTree/TransformCell.cs

@@ -1,6 +1,8 @@
-using System;
+using HarmonyLib;
+using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 using System.Text;
 using UnityEngine;
 using UnityEngine.UI;
@@ -8,7 +10,10 @@ using UnityExplorer.Inspectors;
 using UnityExplorer.UI.Widgets;
 using UniverseLib;
 using UniverseLib.UI;
+using UniverseLib.UI.Models;
 using UniverseLib.UI.Widgets;
+using UniverseLib.UI.Widgets.ScrollView;
+using UniverseLib.Utility;
 
 namespace UnityExplorer.UI.Widgets
 {
@@ -16,15 +21,15 @@ namespace UnityExplorer.UI.Widgets
     {
         public float DefaultHeight => 25f;
 
-        public bool Enabled => m_enabled;
-        private bool m_enabled;
+        public bool Enabled => enabled;
+        private bool enabled;
 
         public Action<CachedTransform> OnExpandToggled;
         public Action<CachedTransform> OnEnableToggled;
         public Action<GameObject> OnGameObjectClicked;
 
         public CachedTransform cachedTransform;
-        public int _cellIndex;
+        public int cellIndex;
 
         public GameObject UIRoot { get; set; }
         public RectTransform Rect { get; set; }
@@ -32,18 +37,19 @@ namespace UnityExplorer.UI.Widgets
         public ButtonRef ExpandButton;
         public ButtonRef NameButton;
         public Toggle EnabledToggle;
+        public InputFieldRef SiblingIndex;
 
         public LayoutElement spacer;
 
         public void Enable()
         {
-            m_enabled = true;
+            enabled = true;
             UIRoot.SetActive(true);
         }
 
         public void Disable()
         {
-            m_enabled = false;
+            enabled = false;
             UIRoot.SetActive(false);
         }
 
@@ -58,18 +64,30 @@ namespace UnityExplorer.UI.Widgets
             if (!Enabled)
                 Enable();
 
-            _cellIndex = cellIndex;
+            this.cellIndex = cellIndex;
             cachedTransform = cached;
 
             spacer.minWidth = cached.Depth * 15;
 
             if (cached.Value)
             {
-                NameButton.ButtonText.text = cached.Value.name;
+                string name = cached.Value.name?.Trim();
+                if (string.IsNullOrEmpty(name))
+                    name = "<i><color=grey>untitled</color></i>";
+                NameButton.ButtonText.text = name;
                 NameButton.ButtonText.color = cached.Value.gameObject.activeSelf ? Color.white : Color.grey;
 
                 EnabledToggle.Set(cached.Value.gameObject.activeSelf, false);
 
+                if (!cached.Value.parent)
+                    SiblingIndex.GameObject.SetActive(false);
+                else
+                {
+                    SiblingIndex.GameObject.SetActive(true);
+                    if (!SiblingIndex.Component.isFocused)
+                        SiblingIndex.Text = cached.Value.GetSiblingIndex().ToString();
+                }
+
                 int childCount = cached.Value.childCount;
                 if (childCount > 0)
                 {
@@ -90,6 +108,8 @@ namespace UnityExplorer.UI.Widgets
             {
                 NameButton.ButtonText.text = $"[Destroyed]";
                 NameButton.ButtonText.color = Color.red;
+
+                SiblingIndex.GameObject.SetActive(false);
             }
         }
 
@@ -111,6 +131,17 @@ namespace UnityExplorer.UI.Widgets
             OnEnableToggled?.Invoke(cachedTransform);
         }
 
+        private void OnSiblingIndexEndEdit(string input)
+        {
+            if (this.cachedTransform == null || !this.cachedTransform.Value)
+                return;
+
+            if (int.TryParse(input.Trim(), out int index))
+                this.cachedTransform.Value.SetSiblingIndex(index);
+            
+            this.SiblingIndex.Text = this.cachedTransform.Value.GetSiblingIndex().ToString();
+        }
+
         public GameObject CreateContent(GameObject parent)
         {
             UIRoot = UIFactory.CreateUIObject("TransformCell", parent);
@@ -145,12 +176,24 @@ namespace UnityExplorer.UI.Widgets
             nameLabel.horizontalOverflow = HorizontalWrapMode.Overflow;
             nameLabel.alignment = TextAnchor.MiddleLeft;
 
-            Color normal = new Color(0.11f, 0.11f, 0.11f);
-            Color highlight = new Color(0.25f, 0.25f, 0.25f);
-            Color pressed = new Color(0.05f, 0.05f, 0.05f);
-            Color disabled = new Color(1, 1, 1, 0);
-            RuntimeProvider.Instance.SetColorBlock(ExpandButton.Component, normal, highlight, pressed, disabled);
-            RuntimeProvider.Instance.SetColorBlock(NameButton.Component, normal, highlight, pressed, disabled);
+            // Sibling index input
+
+            SiblingIndex = UIFactory.CreateInputField(this.UIRoot, "SiblingIndexInput", string.Empty);
+            SiblingIndex.Component.textComponent.fontSize = 11;
+            SiblingIndex.Component.textComponent.alignment = TextAnchor.MiddleRight;
+            var siblingImage = SiblingIndex.GameObject.GetComponent<Image>();
+            siblingImage.color = new(0f, 0f, 0f, 0.25f);
+            UIFactory.SetLayoutElement(SiblingIndex.GameObject, 35, 20, 0, 0);
+            SiblingIndex.Component.GetOnEndEdit().AddListener(OnSiblingIndexEndEdit);
+
+            // Setup selectables
+
+            Color normal = new(0.11f, 0.11f, 0.11f);
+            Color highlight = new(0.25f, 0.25f, 0.25f);
+            Color pressed = new(0.05f, 0.05f, 0.05f);
+            Color disabled = new(1, 1, 1, 0);
+            RuntimeHelper.SetColorBlock(ExpandButton.Component, normal, highlight, pressed, disabled);
+            RuntimeHelper.SetColorBlock(NameButton.Component, normal, highlight, pressed, disabled);
 
             NameButton.OnClick += OnMainButtonClicked;
             ExpandButton.OnClick += OnExpandClicked;

src/UI/Widgets/TransformTree/TransformTree.cs

@@ -2,12 +2,11 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.Specialized;
-using System.Linq;
-using System.Text;
+using System.Diagnostics;
 using UnityEngine;
-using UnityEngine.UI;
 using UniverseLib;
-using UniverseLib.UI.Widgets;
+using UniverseLib.UI.Widgets.ScrollView;
+using UniverseLib.Utility;
 
 namespace UnityExplorer.UI.Widgets
 {
@@ -18,22 +17,36 @@ namespace UnityExplorer.UI.Widgets
 
         public ScrollPool<TransformCell> ScrollPool;
 
+        // IMPORTANT CAVEAT WITH OrderedDictionary:
+        // While the performance is mostly good, there are two methods we should NEVER use:
+        // - Remove(object)
+        // - set_Item[object]
+        // These two methods have extremely bad performance due to using IndexOfKey(), which iterates the whole dictionary.
+        // Currently we do not use either of these methods, so everything should be constant time hash lookups.
+        // We DO make use of get_Item[object], get_Item[index], Add, Insert and RemoveAt, which OrderedDictionary perfectly meets our needs for.
         /// <summary>
         /// Key: UnityEngine.Transform instance ID<br/>
         /// Value: CachedTransform
         /// </summary>
-        internal readonly OrderedDictionary cachedTransforms = new OrderedDictionary();
+        internal readonly OrderedDictionary cachedTransforms = new();
 
         // for keeping track of which actual transforms are expanded or not, outside of the cache data.
-        private readonly HashSet<int> expandedInstanceIDs = new HashSet<int>();
-        private readonly HashSet<int> autoExpandedIDs = new HashSet<int>();
+        private readonly HashSet<int> expandedInstanceIDs = new();
+        private readonly HashSet<int> autoExpandedIDs = new();
 
-        private readonly HashSet<int> visited = new HashSet<int>();
-        private bool needRefresh;
+        // state for Traverse parse
+        private readonly HashSet<int> visited = new();
+        private bool needRefreshUI;
         private int displayIndex;
+        int prevDisplayIndex;
 
-        public int ItemCount => cachedTransforms.Count;
+        private Coroutine refreshCoroutine;
+        private readonly Stopwatch traversedThisFrame = new();
 
+        // ScrollPool item count. PrevDisplayIndex is the highest index + 1 from our last traverse.
+        public int ItemCount => prevDisplayIndex;
+
+        // Search filter
         public bool Filtering => !string.IsNullOrEmpty(currentFilter);
         private bool wasFiltering;
 
@@ -60,44 +73,24 @@ namespace UnityExplorer.UI.Widgets
             GetRootEntriesMethod = getRootEntriesMethod;
         }
 
-        public void OnCellBorrowed(TransformCell cell)
-        {
-            cell.OnExpandToggled += OnCellExpandToggled;
-            cell.OnGameObjectClicked += OnGameObjectClicked;
-            cell.OnEnableToggled += OnCellEnableToggled;
-        }
-
-        private void OnGameObjectClicked(GameObject obj)
-        {
-            if (OnClickOverrideHandler != null)
-                OnClickOverrideHandler.Invoke(obj);
-            else
-                InspectorManager.Inspect(obj);
-        }
-
-        public void OnCellExpandToggled(CachedTransform cache)
-        {
-            var instanceID = cache.InstanceID;
-            if (expandedInstanceIDs.Contains(instanceID))
-                expandedInstanceIDs.Remove(instanceID);
-            else
-                expandedInstanceIDs.Add(instanceID);
-
-            RefreshData(true);
-        }
-
-        public void OnCellEnableToggled(CachedTransform cache)
-        {
-            cache.Value.gameObject.SetActive(!cache.Value.gameObject.activeSelf);
-
-            RefreshData(true);
-        }
+        // Initialize and reset
 
+        // Must be called externally from owner of this TransformTree
         public void Init()
         {
             ScrollPool.Initialize(this);
         }
 
+        // Called to completely reset the tree, ie. switching inspected GameObject
+        public void Rebuild()
+        {
+            autoExpandedIDs.Clear();
+            expandedInstanceIDs.Clear();
+
+            RefreshData(true, true, true, false);
+        }
+
+        // Called to completely wipe our data (ie, GameObject inspector returning to pool)
         public void Clear()
         {
             this.cachedTransforms.Clear();
@@ -105,14 +98,21 @@ namespace UnityExplorer.UI.Widgets
             autoExpandedIDs.Clear();
             expandedInstanceIDs.Clear();
             this.ScrollPool.Refresh(true, true);
+            if (refreshCoroutine != null)
+            {
+                RuntimeHelper.StopCoroutine(refreshCoroutine);
+                refreshCoroutine = null;
+            }
         }
 
-        public bool IsCellExpanded(int instanceID)
+        // Checks if the given Instance ID is expanded or not
+        public bool IsTransformExpanded(int instanceID)
         {
             return Filtering ? autoExpandedIDs.Contains(instanceID)
                              : expandedInstanceIDs.Contains(instanceID);
         }
 
+        // Jumps to a specific Transform in the tree and highlights it.
         public void JumpAndExpandToTransform(Transform transform)
         {
             // make sure all parents of the object are expanded
@@ -126,8 +126,9 @@ namespace UnityExplorer.UI.Widgets
                 parent = parent.parent;
             }
 
-            // Refresh cached transforms (no UI rebuild yet)
-            RefreshData(false);
+            // Refresh cached transforms (no UI rebuild yet).
+            // Stop existing coroutine and do it oneshot.
+            RefreshData(false, false, true, true);
 
             int transformID = transform.GetInstanceID();
 
@@ -145,7 +146,7 @@ namespace UnityExplorer.UI.Widgets
 
         private void OnCellJumpedTo(TransformCell cell)
         {
-            RuntimeProvider.Instance.StartCoroutine(HighlightCellCoroutine(cell));
+            RuntimeHelper.StartCoroutine(HighlightCellCoroutine(cell));
         }
 
         private IEnumerator HighlightCellCoroutine(TransformCell cell)
@@ -160,62 +161,88 @@ namespace UnityExplorer.UI.Widgets
             button.OnDeselect(null);
         }
 
-        public void Rebuild()
+        // Perform a Traverse and optionally refresh the ScrollPool as well.
+        // If oneShot, then this happens instantly with no yield.
+        public void RefreshData(bool andRefreshUI, bool jumpToTop, bool stopExistingCoroutine, bool oneShot)
         {
-            autoExpandedIDs.Clear();
-            expandedInstanceIDs.Clear();
+            if (refreshCoroutine != null)
+            {
+                if (stopExistingCoroutine)
+                {
+                    RuntimeHelper.StopCoroutine(refreshCoroutine);
+                    refreshCoroutine = null;
+                }
+                else
+                    return;
+            }
 
-            RefreshData(true, true);
-        }
-
-        public void RefreshData(bool andReload = false, bool jumpToTop = false)
-        {
             visited.Clear();
             displayIndex = 0;
-            needRefresh = false;
+            needRefreshUI = false;
+            traversedThisFrame.Reset();
+            traversedThisFrame.Start();
 
-            var rootObjects = GetRootEntriesMethod.Invoke();
+            IEnumerable<GameObject> rootObjects = GetRootEntriesMethod.Invoke();
 
-            //int displayIndex = 0;
-            foreach (var obj in rootObjects)
-                if (obj) Traverse(obj.transform);
+            refreshCoroutine = RuntimeHelper.StartCoroutine(RefreshCoroutine(rootObjects, andRefreshUI, jumpToTop, oneShot));
+        }
+
+        // Coroutine for batched updates, max 2000 gameobjects per frame so FPS doesn't get tanked when there is like 100k gameobjects.
+        // if "oneShot", then this will NOT be batched (if we need an immediate full update).
+        IEnumerator RefreshCoroutine(IEnumerable<GameObject> rootObjects, bool andRefreshUI, bool jumpToTop, bool oneShot)
+        {
+            foreach (var gameObj in rootObjects)
+            {
+                if (gameObj)
+                {
+                    var enumerator = Traverse(gameObj.transform, null, 0, oneShot);
+                    while (enumerator.MoveNext())
+                    {
+                        if (!oneShot)
+                            yield return enumerator.Current;
+                    }
+                }
+            }
 
             // Prune displayed transforms that we didnt visit in that traverse
             for (int i = cachedTransforms.Count - 1; i >= 0; i--)
             {
-                var obj = (CachedTransform)cachedTransforms[i];
-                if (!visited.Contains(obj.InstanceID))
+                var cached = (CachedTransform)cachedTransforms[i];
+                if (!visited.Contains(cached.InstanceID))
                 {
-                    cachedTransforms.Remove(obj.InstanceID);
-                    needRefresh = true;
+                    cachedTransforms.RemoveAt(i);
+                    needRefreshUI = true;
                 }
             }
 
-            if (!needRefresh)
-                return;
+            if (andRefreshUI && needRefreshUI)
+                ScrollPool.Refresh(true, jumpToTop);
 
-            //displayedObjects.Clear();
+            prevDisplayIndex = displayIndex;
+            refreshCoroutine = null;
+        }   
 
-            if (andReload)
-            {
-                if (!jumpToTop)
-                    ScrollPool.Refresh(true);
-                else
-                    ScrollPool.Refresh(true, true);
-            }
-        }
-
-        private void Traverse(Transform transform, CachedTransform parent = null, int depth = 0)
+        // Recursive method to check a Transform and its children (if expanded).
+        // Parent and depth can be null/default.
+        private IEnumerator Traverse(Transform transform, CachedTransform parent, int depth, bool oneShot)
         {
+            // Let's only tank 2ms of each frame (60->53fps)
+            if (traversedThisFrame.ElapsedMilliseconds > 2)
+            {
+                yield return null;
+                traversedThisFrame.Reset();
+                traversedThisFrame.Start();
+            }
+
             int instanceID = transform.GetInstanceID();
 
             if (visited.Contains(instanceID))
-                return;
+                yield break;
 
             if (Filtering)
             {
                 if (!FilterHierarchy(transform))
-                    return;
+                    yield break;
 
                 visited.Add(instanceID);
 
@@ -229,12 +256,25 @@ namespace UnityExplorer.UI.Widgets
             if (cachedTransforms.Contains(instanceID))
             {
                 cached = (CachedTransform)cachedTransforms[(object)instanceID];
+                int prevSiblingIdx = cached.SiblingIndex;
                 if (cached.Update(transform, depth))
-                    needRefresh = true;
+                {
+                    needRefreshUI = true;
+
+                    // If the sibling index changed, we need to shuffle it in our cached transforms list.
+                    if (prevSiblingIdx != cached.SiblingIndex)
+                    {
+                        cachedTransforms.Remove(instanceID);
+                        if (cachedTransforms.Count <= displayIndex)
+                            cachedTransforms.Add(instanceID, cached);
+                        else
+                            cachedTransforms.Insert(displayIndex, instanceID, cached);
+                    }
+                }
             }
             else
             {
-                needRefresh = true;
+                needRefreshUI = true;
                 cached = new CachedTransform(this, transform, depth, parent);
                 if (cachedTransforms.Count <= displayIndex)
                     cachedTransforms.Add(instanceID, cached);
@@ -244,10 +284,17 @@ namespace UnityExplorer.UI.Widgets
 
             displayIndex++;
 
-            if (IsCellExpanded(instanceID) && cached.Value.childCount > 0)
+            if (IsTransformExpanded(instanceID) && cached.Value.childCount > 0)
             {
                 for (int i = 0; i < transform.childCount; i++)
-                    Traverse(transform.GetChild(i), cached, depth + 1);
+                {
+                    var enumerator = Traverse(transform.GetChild(i), cached, depth + 1, oneShot);
+                    while (enumerator.MoveNext())
+                    {
+                        if (!oneShot)
+                            yield return enumerator.Current;
+                    }
+                }
             }
         }
 
@@ -274,13 +321,44 @@ namespace UnityExplorer.UI.Widgets
                 if (Filtering)
                 {
                     if (cell.cachedTransform.Name.ContainsIgnoreCase(currentFilter))
-                    {
                         cell.NameButton.ButtonText.color = Color.green;
-                    }
                 }
             }
             else
                 cell.Disable();
         }
+
+        public void OnCellBorrowed(TransformCell cell)
+        {
+            cell.OnExpandToggled += OnCellExpandToggled;
+            cell.OnGameObjectClicked += OnGameObjectClicked;
+            cell.OnEnableToggled += OnCellEnableToggled;
+        }
+
+        private void OnGameObjectClicked(GameObject obj)
+        {
+            if (OnClickOverrideHandler != null)
+                OnClickOverrideHandler.Invoke(obj);
+            else
+                InspectorManager.Inspect(obj);
+        }
+
+        public void OnCellExpandToggled(CachedTransform cache)
+        {
+            var instanceID = cache.InstanceID;
+            if (expandedInstanceIDs.Contains(instanceID))
+                expandedInstanceIDs.Remove(instanceID);
+            else
+                expandedInstanceIDs.Add(instanceID);
+
+            RefreshData(true, false, true, true);
+        }
+
+        public void OnCellEnableToggled(CachedTransform cache)
+        {
+            cache.Value.gameObject.SetActive(!cache.Value.gameObject.activeSelf);
+
+            RefreshData(true, false, true, true);
+        }
     }
 }

src/UnityExplorer.csproj

@@ -6,6 +6,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{B21DBDE3-5D6F-4726-93AB-CC3CC68BAE7D}</ProjectGuid>
     <OutputType>Library</OutputType>
+    <LangVersion>9.0</LangVersion>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>
@@ -105,8 +106,11 @@
       <HintPath>..\lib\mcs-unity\mcs\bin\Release\mcs.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="INIFileParser, Version=2.5.2.0, Culture=neutral, PublicKeyToken=79af7b307b65cf3c, processorArchitecture=MSIL">
-      <HintPath>packages\ini-parser.2.5.2\lib\net20\INIFileParser.dll</HintPath>
+  </ItemGroup>
+  <!-- Non-MelonLoader (it includes Tomlet) -->
+  <ItemGroup Condition="'$(IsMelonLoader)'=='false'">
+    <Reference Include="Tomlet, Version=3.1.3.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>packages\Samboy063.Tomlet.3.1.3\lib\net35\Tomlet.dll</HintPath>
       <Private>False</Private>
     </Reference>
   </ItemGroup>
@@ -162,9 +166,6 @@
   </ItemGroup>
   <!-- Mono refs -->
   <ItemGroup Condition="'$(IsCpp)'=='false'">
-    <Reference Include="UniverseLib.Mono">
-      <HintPath>packages\UniverseLib.1.0.1\lib\net35\UniverseLib.Mono.dll</HintPath>
-    </Reference>
     <Reference Include="UnityEngine">
       <HintPath>..\lib\mono\UnityEngine.dll</HintPath>
       <Private>False</Private>
@@ -173,14 +174,17 @@
       <HintPath>..\lib\mono\UnityEngine.UI.dll</HintPath>
       <Private>False</Private>
     </Reference>
+    <Reference Include="UniverseLib.Mono">
+      <HintPath>packages\UniverseLib.1.2.16\lib\net35\UniverseLib.Mono.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <!-- Il2Cpp refs -->
   <ItemGroup Condition="'$(IsCpp)'=='true'">
     <Reference Include="UniverseLib.IL2CPP">
-      <HintPath>packages\UniverseLib.1.0.1\lib\net472\UniverseLib.IL2CPP.dll</HintPath>
+      <HintPath>packages\UniverseLib.1.2.16\lib\net472\UniverseLib.IL2CPP.dll</HintPath>
     </Reference>
-    <Reference Include="UnhollowerBaseLib">
-      <HintPath>..\lib\Il2CppAssemblyUnhollower\UnhollowerBaseLib\bin\Release\net4.7.2\UnhollowerBaseLib.dll</HintPath>
+    <Reference Include="UnhollowerBaseLib, Version=0.4.22.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>packages\Il2CppAssemblyUnhollower.BaseLib.0.4.22\lib\net472\UnhollowerBaseLib.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="Il2Cppmscorlib">
@@ -221,10 +225,11 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="CacheObject\CacheConstructor.cs" />
     <Compile Include="Hooks\HookCell.cs" />
     <Compile Include="Hooks\HookInstance.cs" />
     <Compile Include="Hooks\HookManager.cs" />
-    <Compile Include="Core\Config\InternalConfigHandler.cs" />
+    <Compile Include="Config\InternalConfigHandler.cs" />
     <Compile Include="CacheObject\CacheConfigEntry.cs" />
     <Compile Include="CacheObject\Views\CacheConfigCell.cs" />
     <Compile Include="CSConsole\CSAutoCompleter.cs" />
@@ -237,12 +242,12 @@
     <Compile Include="CSConsole\Lexers\SymbolLexer.cs" />
     <Compile Include="CSConsole\ScriptEvaluator.cs" />
     <Compile Include="CSConsole\ScriptInteraction.cs" />
-    <Compile Include="Core\ExplorerBehaviour.cs" />
+    <Compile Include="ExplorerBehaviour.cs" />
     <Compile Include="Hooks\AddHookCell.cs" />
     <Compile Include="Inspectors\GameObjectWidgets\ComponentCell.cs" />
     <Compile Include="Inspectors\GameObjectWidgets\ComponentList.cs" />
     <Compile Include="Inspectors\GameObjectWidgets\GameObjectControls.cs" />
-    <Compile Include="Inspectors\InspectUnderMouse.cs" />
+    <Compile Include="Inspectors\MouseInspector.cs" />
     <Compile Include="CSConsole\ConsoleController.cs" />
     <Compile Include="CacheObject\CacheField.cs" />
     <Compile Include="CacheObject\CacheKeyValuePair.cs" />
@@ -255,6 +260,10 @@
     <Compile Include="CacheObject\Views\CacheListEntryCell.cs" />
     <Compile Include="CacheObject\Views\CacheMemberCell.cs" />
     <Compile Include="CacheObject\Views\CacheObjectCell.cs" />
+    <Compile Include="Runtime\UnityCrashPrevention.cs" />
+    <Compile Include="UI\DisplayManager.cs" />
+    <Compile Include="UI\Notification.cs" />
+    <Compile Include="UI\Panels\ClipboardPanel.cs" />
     <Compile Include="UI\Widgets\AutoComplete\EnumCompleter.cs" />
     <Compile Include="UI\Widgets\EvaluateWidget\EvaluateWidget.cs" />
     <Compile Include="Inspectors\GameObjectInspector.cs" />
@@ -274,22 +283,22 @@
     <Compile Include="Inspectors\ReflectionInspector.cs" />
     <Compile Include="CacheObject\IValues\InteractiveValueStruct.cs" />
     <Compile Include="UI\Panels\HookManagerPanel.cs" />
-    <Compile Include="UI\Panels\UiInspectorResultsPanel.cs" />
+    <Compile Include="UI\Panels\UIInspectorResultsPanel.cs" />
     <Compile Include="UI\Panels\LogPanel.cs" />
     <Compile Include="UI\Panels\CSConsolePanel.cs" />
     <Compile Include="UI\Panels\OptionsPanel.cs" />
     <Compile Include="UI\Widgets\AutoComplete\ISuggestionProvider.cs" />
     <Compile Include="UI\Widgets\AutoComplete\Suggestion.cs" />
-    <Compile Include="Core\Config\ConfigElement.cs" />
-    <Compile Include="Core\Config\ConfigHandler.cs" />
-    <Compile Include="Core\Config\ConfigManager.cs" />
-    <Compile Include="Core\Config\IConfigElement.cs" />
-    <Compile Include="Core\Runtime\Il2CppProvider.cs" />
-    <Compile Include="Core\Runtime\MonoProvider.cs" />
-    <Compile Include="Core\Runtime\RuntimeHelper.cs" />
+    <Compile Include="Config\ConfigElement.cs" />
+    <Compile Include="Config\ConfigHandler.cs" />
+    <Compile Include="Config\ConfigManager.cs" />
+    <Compile Include="Config\IConfigElement.cs" />
+    <Compile Include="Runtime\Il2CppHelper.cs" />
+    <Compile Include="Runtime\MonoHelper.cs" />
+    <Compile Include="Runtime\UERuntimeHelper.cs" />
     <Compile Include="ObjectExplorer\SceneHandler.cs" />
     <Compile Include="ObjectExplorer\SearchProvider.cs" />
-    <Compile Include="Core\Tests\TestClass.cs" />
+    <Compile Include="Tests\TestClass.cs" />
     <Compile Include="ExplorerCore.cs" />
     <Compile Include="Loader\BepInEx\BepInExConfigHandler.cs" />
     <Compile Include="Loader\BepInEx\ExplorerBepInPlugin.cs" />
@@ -304,7 +313,7 @@
     <Compile Include="UI\Panels\ObjectExplorerPanel.cs" />
     <Compile Include="UI\UIManager.cs" />
     <Compile Include="UI\Panels\PanelDragger.cs" />
-    <Compile Include="UI\Widgets\AutoComplete\AutoCompleteModal.cs" />
+    <Compile Include="UI\Panels\AutoCompleteModal.cs" />
     <Compile Include="UI\Widgets\AutoComplete\TypeCompleter.cs" />
     <Compile Include="ObjectExplorer\ObjectSearch.cs" />
     <Compile Include="ObjectExplorer\SceneExplorer.cs" />
@@ -317,9 +326,12 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="ILRepack.targets" />
+    <None Include="nuget.config" />
     <None Include="packages.config" />
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Analyzer Include="packages\UniverseLib.Analyzers.1.0.3\analyzers\dotnet\cs\UniverseLib.Analyzers.dll" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="packages\ILRepack.Lib.MSBuild.Task.2.0.18.2\build\ILRepack.Lib.MSBuild.Task.targets" Condition="Exists('packages\ILRepack.Lib.MSBuild.Task.2.0.18.2\build\ILRepack.Lib.MSBuild.Task.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

src/UnityExplorer.sln

@@ -3,8 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.30128.74
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnhollowerBaseLib", "..\lib\Il2CppAssemblyUnhollower\UnhollowerBaseLib\UnhollowerBaseLib.csproj", "{7B7E5024-385D-4A46-9196-A6AF8F7FBDD5}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "mcs", "..\lib\mcs-unity\mcs\mcs.csproj", "{E4989E4C-0875-4528-9031-08E2C0E70103}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnityExplorer", "UnityExplorer.csproj", "{B21DBDE3-5D6F-4726-93AB-CC3CC68BAE7D}"
@@ -20,20 +18,6 @@ Global
 		Release_STANDALONE_Mono|Any CPU = Release_STANDALONE_Mono|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{7B7E5024-385D-4A46-9196-A6AF8F7FBDD5}.Release_BIE_Cpp|Any CPU.ActiveCfg = Release|Any CPU
-		{7B7E5024-385D-4A46-9196-A6AF8F7FBDD5}.Release_BIE_Cpp|Any CPU.Build.0 = Release|Any CPU
-		{7B7E5024-385D-4A46-9196-A6AF8F7FBDD5}.Release_BIE5_Mono|Any CPU.ActiveCfg = Release|Any CPU
-		{7B7E5024-385D-4A46-9196-A6AF8F7FBDD5}.Release_BIE5_Mono|Any CPU.Build.0 = Release|Any CPU
-		{7B7E5024-385D-4A46-9196-A6AF8F7FBDD5}.Release_BIE6_Mono|Any CPU.ActiveCfg = Release|Any CPU
-		{7B7E5024-385D-4A46-9196-A6AF8F7FBDD5}.Release_BIE6_Mono|Any CPU.Build.0 = Release|Any CPU
-		{7B7E5024-385D-4A46-9196-A6AF8F7FBDD5}.Release_ML_Cpp|Any CPU.ActiveCfg = Release|Any CPU
-		{7B7E5024-385D-4A46-9196-A6AF8F7FBDD5}.Release_ML_Cpp|Any CPU.Build.0 = Release|Any CPU
-		{7B7E5024-385D-4A46-9196-A6AF8F7FBDD5}.Release_ML_Mono|Any CPU.ActiveCfg = Release|Any CPU
-		{7B7E5024-385D-4A46-9196-A6AF8F7FBDD5}.Release_ML_Mono|Any CPU.Build.0 = Release|Any CPU
-		{7B7E5024-385D-4A46-9196-A6AF8F7FBDD5}.Release_STANDALONE_Cpp|Any CPU.ActiveCfg = Release|Any CPU
-		{7B7E5024-385D-4A46-9196-A6AF8F7FBDD5}.Release_STANDALONE_Cpp|Any CPU.Build.0 = Release|Any CPU
-		{7B7E5024-385D-4A46-9196-A6AF8F7FBDD5}.Release_STANDALONE_Mono|Any CPU.ActiveCfg = Release|Any CPU
-		{7B7E5024-385D-4A46-9196-A6AF8F7FBDD5}.Release_STANDALONE_Mono|Any CPU.Build.0 = Release|Any CPU
 		{E4989E4C-0875-4528-9031-08E2C0E70103}.Release_BIE_Cpp|Any CPU.ActiveCfg = Release|Any CPU
 		{E4989E4C-0875-4528-9031-08E2C0E70103}.Release_BIE_Cpp|Any CPU.Build.0 = Release|Any CPU
 		{E4989E4C-0875-4528-9031-08E2C0E70103}.Release_BIE5_Mono|Any CPU.ActiveCfg = Release|Any CPU