Add "one-shot" option for TransformTree updating

- Added batching to the update method so that a maximum of 2000 GameObjects are traversed each frame.
- Changed from OrderedDictionary.Remove to OrderedDictionary.RemoveAt when pruning entries as the former needs to iterate through all entries to find the index of the key, whereas the latter is constant time.

.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.
@@ -126,15 +127,13 @@ The inspector is used to see detailed information on objects of any type and man
 * 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):
@@ -146,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
 {
@@ -58,6 +62,8 @@ namespace UnityExplorer.CSConsole
 
         public static void Init()
         {
+            InitEventSystemPropertyHandlers();
+
             // Make sure console is supported on this platform
             try
             {
@@ -357,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;
@@ -368,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);
                 }
             }
@@ -378,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;
@@ -438,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++)
@@ -663,7 +720,8 @@ var x = 5;
  * 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); - starts the IEnumerator as a Coroutine
+ * 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

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,4 +1,5 @@
-using Mono.CSharp;
+using HarmonyLib;
+using Mono.CSharp;
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -28,8 +29,11 @@ namespace UnityExplorer.CSConsole
         public static void Inspect(Type 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);
@@ -51,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/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
 {

src/CacheObject/CacheMember.cs

@@ -12,6 +12,8 @@ using UnityExplorer.UI;
 using UniverseLib;
 using UniverseLib.UI;
 using UnityExplorer.UI.Widgets;
+using UniverseLib.Utility;
+using UniverseLib.UI.ObjectPool;
 
 namespace UnityExplorer.CacheObject
 {
@@ -19,7 +21,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; }
@@ -35,7 +37,8 @@ namespace UnityExplorer.CacheObject
             this.NameLabelText = this is CacheMethod 
                 ? SignatureHighlighter.HighlightMethod(member as MethodInfo) 
                 : SignatureHighlighter.Parse(member.DeclaringType, false, member);
-            this.NameForFiltering = $"{member.DeclaringType.Name}.{member.Name}";
+
+            this.NameForFiltering = SignatureHighlighter.RemoveHighlighting(NameLabelText);
             this.NameLabelTextRaw = NameForFiltering;
         }
 
@@ -92,8 +95,8 @@ 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 TryAutoEvaluateIfUnitialized(CacheObjectCell objectcell)
         {
@@ -111,14 +114,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)
@@ -162,26 +165,8 @@ namespace UnityExplorer.CacheObject
             }
         }
 
-
         #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)
         {
             var list = new List<CacheMember>();
@@ -235,12 +220,12 @@ namespace UnityExplorer.CacheObject
         {
             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;

src/CacheObject/CacheMethod.cs

@@ -5,6 +5,7 @@ using System.Reflection;
 using System.Text;
 using UnityExplorer.Inspectors;
 using UniverseLib;
+using UniverseLib.Utility;
 
 namespace UnityExplorer.CacheObject
 {

src/CacheObject/CacheObjectBase.cs

@@ -13,6 +13,8 @@ using UniverseLib.UI.Models;
 using UnityExplorer.UI;
 using UniverseLib;
 using UniverseLib.UI;
+using UniverseLib.Utility;
+using UniverseLib.UI.ObjectPool;
 
 namespace UnityExplorer.CacheObject
 {
@@ -261,7 +263,7 @@ namespace UnityExplorer.CacheObject
         {
             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);

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
 {

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
 {

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
 {

src/CacheObject/IValues/InteractiveString.cs

@@ -11,6 +11,8 @@ 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,6 +7,7 @@ using UnityEngine.UI;
 using UnityExplorer.UI;
 using UnityExplorer.UI.Widgets;
 using UniverseLib.UI;
+using UniverseLib.UI.Models;
 
 namespace UnityExplorer.CacheObject.Views
 {

src/CacheObject/Views/CacheObjectCell.cs

@@ -4,14 +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.Panels;
-using UnityExplorer.UI.Widgets;
 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
 {
@@ -103,7 +101,7 @@ namespace UnityExplorer.CacheObject.Views
         {
             this.SubContentButton.ButtonText.text = SubContentHolder.activeSelf ? "▼" : "▲";
             Color color = SubContentHolder.activeSelf ? subActiveColor : subInactiveColor;
-            RuntimeProvider.Instance.SetColorBlock(SubContentButton.Component, color, color * 1.3f);
+            RuntimeHelper.SetColorBlock(SubContentButton.Component, color, color * 1.3f);
         }
 
         protected abstract void ConstructEvaluateHolder(GameObject parent);

src/Config/ConfigManager.cs

@@ -12,11 +12,16 @@ 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,22 +31,20 @@ namespace UnityExplorer.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;
-        public static ConfigElement<string> ClipboardData;
-
-        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)
         {
@@ -79,6 +82,11 @@ namespace UnityExplorer.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);
@@ -87,13 +95,18 @@ namespace UnityExplorer.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.",
@@ -102,10 +115,7 @@ namespace UnityExplorer.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?",
@@ -124,16 +134,6 @@ namespace UnityExplorer.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);
-            ClipboardData = new ConfigElement<string>("Clipboard", "", "", true);
         }
     }
 }

src/Config/InternalConfigHandler.cs

@@ -1,24 +1,22 @@
-using IniParser.Parser;
-using System;
+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 IniDataParser _parser;
-        internal static string INI_PATH;
+        internal static string CONFIG_PATH;
 
         public override void Init()
         {
-            INI_PATH = Path.Combine(ExplorerCore.Loader.ExplorerFolder, "data.ini");
-            _parser = new IniDataParser();
-            _parser.Configuration.CommentString = "#";
+            CONFIG_PATH = Path.Combine(ExplorerCore.Loader.ExplorerFolder, "data.cfg");
         }
 
         public override void LoadConfig()
@@ -37,32 +35,24 @@ namespace UnityExplorer.Config
             // Not necessary
         }
 
-        public override T GetConfigValue<T>(ConfigElement<T> element)
-        {
-            // Not necessary, just return the value.
-            return element.Value;
-        }
+        // Not necessary, just return the value.
+        public override T GetConfigValue<T>(ConfigElement<T> element) => element.Value;
 
-        public override void OnAnyConfigChanged()
-        {
-            SaveConfig();
-        }
+        // Always just auto-save.
+        public override void OnAnyConfigChanged() => SaveConfig();
 
         public bool TryLoadConfig()
         {
             try
             {
-                if (!File.Exists(INI_PATH))
+                if (!File.Exists(CONFIG_PATH))
                     return false;
 
-                string ini = File.ReadAllText(INI_PATH);
-
-                var data = _parser.Parse(ini);
-
-                foreach (var config in data.Sections["Config"])
+                TomlDocument document = TomlParser.ParseFile(CONFIG_PATH);
+                foreach (var key in document.Keys)
                 {
-                    if (ConfigManager.InternalConfigs.TryGetValue(config.KeyName, out IConfigElement configElement))
-                        configElement.BoxedValue = StringToConfigValue(config.Value, configElement.ElementType);
+                    var panelKey = (UIManager.Panels)Enum.Parse(typeof(UIManager.Panels), key);
+                    ConfigManager.GetPanelSaveData(panelKey).Value = document.GetString(key);
                 }
 
                 return true;
@@ -79,27 +69,11 @@ namespace UnityExplorer.Config
             if (UIManager.Initializing)
                 return;
 
-            var data = new IniParser.Model.IniData();
-
-            data.Sections.AddSection("Config");
-            var sec = data.Sections["Config"];
-
+            var tomlDocument = TomlDocument.CreateEmpty();
             foreach (var entry in ConfigManager.InternalConfigs)
-                sec.AddKey(entry.Key, entry.Value.BoxedValue.ToString());
+                tomlDocument.Put(entry.Key, entry.Value.BoxedValue as string, false);
 
-            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;
+            File.WriteAllText(CONFIG_PATH, tomlDocument.SerializedValue);
         }
     }
 }

src/ExplorerCore.cs

@@ -10,13 +10,15 @@ using UnityExplorer.ObjectExplorer;
 using UnityExplorer.UI.Panels;
 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.5.0";
+        public const string VERSION = "4.5.10";
         public const string AUTHOR = "Sinai";
         public const string GUID = "com.sinai.unityexplorer";
 
@@ -42,8 +44,9 @@ 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()
             {
@@ -66,7 +69,7 @@ namespace UnityExplorer
 
             UIManager.InitUI();
 
-            Log($"{NAME} {VERSION} initialized.");
+            Log($"{NAME} {VERSION} initialized for {UniverseLib.Universe.Context}.");
 
             //InspectorManager.Inspect(typeof(Tests.TestClass));
         }

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

@@ -13,6 +13,8 @@ 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
 {
@@ -87,7 +89,7 @@ namespace UnityExplorer.Hooks
             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);

src/ILRepack.targets

@@ -6,7 +6,7 @@
         <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 -->

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)

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

@@ -9,6 +9,8 @@ using UnityExplorer.UI;
 using UniverseLib.UI;
 using UniverseLib;
 using UnityExplorer.UI.Panels;
+using UniverseLib.UI.Models;
+using UniverseLib.Utility;
 
 namespace UnityExplorer.Inspectors
 {
@@ -175,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>());
@@ -572,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)
@@ -586,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)
@@ -604,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

@@ -10,6 +10,7 @@ using UnityExplorer.UI.Widgets;
 using UniverseLib.UI;
 using UniverseLib;
 using UnityExplorer.UI.Panels;
+using UniverseLib.UI.ObjectPool;
 
 namespace UnityExplorer.Inspectors
 {
@@ -28,7 +29,7 @@ namespace UnityExplorer.Inspectors
         public void SetTabColor(bool active)
         {
             Color color = active ? enabledTabColor : disabledTabColor;
-            RuntimeProvider.Instance.SetColorBlock(TabButton.Component, color, color * 1.2f);
+            RuntimeHelper.SetColorBlock(TabButton.Component, color, color * 1.2f);
         }
 
         public GameObject CreateContent(GameObject parent)

src/Inspectors/MouseInspector.cs

@@ -12,6 +12,8 @@ using UnityExplorer.UI;
 using UnityExplorer.UI.Panels;
 using UniverseLib;
 using UniverseLib.UI;
+using UniverseLib.Utility;
+using UnityExplorer.Config;
 
 namespace UnityExplorer.Inspectors
 {
@@ -21,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;
@@ -31,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;
@@ -62,7 +59,7 @@ namespace UnityExplorer.Inspectors
         internal Text objPathLabel;
         internal Text mousePosLabel;
 
-        public InspectUnderMouse() 
+        public MouseInspector() 
         {
             Instance = this;
             worldInspector = new WorldInspector();
@@ -120,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))
@@ -164,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);
         }
 
@@ -181,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
@@ -207,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

@@ -26,7 +26,7 @@ namespace UnityExplorer.Inspectors.MouseInspectors
         public override void OnBeginMouseInspect()
         {
             SetupUIRaycast();
-            InspectUnderMouse.Instance.objPathLabel.text = "";
+            MouseInspector.Instance.objPathLabel.text = "";
         }
 
         public override void ClearHitData()
@@ -58,7 +58,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 +70,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 +91,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 +99,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 +110,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
 {
@@ -40,7 +41,7 @@ namespace UnityExplorer.Inspectors.MouseInspectors
             if (!MainCamera)
             {
                 ExplorerCore.LogWarning("No Main Camera was found, unable to inspect world!");
-                InspectUnderMouse.Instance.StopInspect();
+                MouseInspector.Instance.StopInspect();
                 return;
             }
 
@@ -50,7 +51,7 @@ namespace UnityExplorer.Inspectors.MouseInspectors
             if (hit.transform)
                 OnHitGameObject(hit.transform.gameObject);
             else if (lastHitObject)
-                InspectUnderMouse.Instance.ClearHitData();
+                MouseInspector.Instance.ClearHitData();
         }
 
         internal void OnHitGameObject(GameObject obj)
@@ -58,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

@@ -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;
 
@@ -58,11 +61,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 +77,7 @@ namespace UnityExplorer.Inspectors
 
             SetTarget(target);
 
-            RuntimeProvider.Instance.StartCoroutine(InitCoroutine());
+            RuntimeHelper.StartCoroutine(InitCoroutine());
         }
 
         private IEnumerator InitCoroutine()
@@ -130,7 +133,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))
@@ -225,11 +228,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);
             }
         }
 
@@ -477,7 +480,13 @@ 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);
+            var color = type switch
+            {
+                MemberTypes.Method => SignatureHighlighter.METHOD_INSTANCE,
+                MemberTypes.Field => SignatureHighlighter.FIELD_INSTANCE,
+                MemberTypes.Property => SignatureHighlighter.PROP_INSTANCE,
+                _ => throw new NotImplementedException()
+            };
             toggleText.text = $"<color={color}>{type}</color>";
 
             toggle.graphic.TryCast<Image>().color = color.ToColor() * 0.65f;
@@ -677,7 +686,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;
@@ -713,10 +722,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/MelonLoader/ExplorerMelonMod.cs

@@ -6,7 +6,12 @@ using UnityExplorer;
 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/Standalone/StandaloneConfigHandler.cs

@@ -4,22 +4,20 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using UnityExplorer.Config;
-using IniParser.Parser;
 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

@@ -14,6 +14,7 @@ using UnityExplorer.UI.Widgets;
 using UniverseLib.UI;
 using UniverseLib;
 using System.Collections;
+using UniverseLib.Utility;
 
 namespace UnityExplorer.ObjectExplorer
 {
@@ -26,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.
@@ -42,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;
@@ -63,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)
@@ -86,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))
             {
@@ -121,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;
@@ -157,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)
@@ -180,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
@@ -197,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
@@ -212,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;
@@ -238,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;
 
@@ -255,7 +267,7 @@ namespace UnityExplorer.ObjectExplorer
 
             ConstructSceneLoader();
 
-            RuntimeProvider.Instance.StartCoroutine(TempFixCoro());
+            RuntimeHelper.StartCoroutine(TempFixCoro());
         }
 
         // To "fix" a strange FPS drop issue with MelonLoader.
@@ -312,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
@@ -328,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);
@@ -352,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

@@ -7,6 +7,8 @@ using UnityEngine;
 using UnityEngine.SceneManagement;
 using UnityExplorer.Runtime;
 using UniverseLib;
+using UniverseLib.Input;
+using UniverseLib.Utility;
 
 namespace UnityExplorer.ObjectExplorer
 {
@@ -34,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>();
 
@@ -74,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
 
@@ -168,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>();
 

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.Runtime
 {
-    public class Il2CppProvider : RuntimeHelper
+    public class Il2CppHelper : UERuntimeHelper
     {
         public override void SetupEvents()
         {
@@ -41,7 +31,7 @@ namespace UnityExplorer.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.Runtime
 {
-    public class MonoProvider : RuntimeHelper
+    public class MonoHelper : UERuntimeHelper
     {
         public override void SetupEvents()
         {

src/Runtime/UERuntimeHelper.cs

@@ -13,16 +13,18 @@ using UniverseLib;
 
 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.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.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

@@ -146,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 Dictionary<Il2CppSystem.Object, Il2CppSystem.Object> IL2CPP_BoxedDict;
         
-        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 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";
@@ -175,6 +175,11 @@ namespace UnityExplorer.Tests
             IL2CPP_Dict.Add("key2", "value2");
             IL2CPP_Dict.Add("key3", "value3");
 
+            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");
@@ -197,17 +202,13 @@ namespace UnityExplorer.Tests
             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 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>();
@@ -248,11 +249,11 @@ namespace UnityExplorer.Tests
             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

@@ -27,7 +27,7 @@ namespace UnityExplorer.UI
             _currentNotification = message;
             _timeOfLastNotification = Time.realtimeSinceStartup;
 
-            popupLabel.transform.localPosition = UIManager.UIRootRect.InverseTransformPoint(InputManager.MousePosition) + (Vector3.up * 25);
+            popupLabel.transform.localPosition = UIManager.UIRootRect.InverseTransformPoint(DisplayManager.MousePosition) + (Vector3.up * 25);
         }
 
         public static void Update()

src/UI/Panels/CSConsolePanel.cs

@@ -11,6 +11,7 @@ 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

@@ -12,6 +12,7 @@ using UniverseLib;
 using UniverseLib.Input;
 using UniverseLib.UI;
 using UniverseLib.UI.Widgets;
+using UniverseLib.Utility;
 
 namespace UnityExplorer.UI.Panels
 {
@@ -27,8 +28,6 @@ namespace UnityExplorer.UI.Panels
         public override bool NavButtonWanted => true;
         public override bool ShouldSaveActiveState => true;
         public override bool ShowByDefault => true;
-        public override string GetSaveDataFromConfigManager() => ConfigManager.ClipboardData.Value;
-        public override void DoSaveToConfigElement() => ConfigManager.ClipboardData.Value = this.ToSaveData();
 
         private static Text CurrentPasteLabel;
 
@@ -90,7 +89,7 @@ namespace UnityExplorer.UI.Panels
 
             // Actual panel content
 
-            var firstRow = UIFactory.CreateHorizontalGroup(UIRoot, "FirstRow", false, false, true, true, 5, new(2,2,2,2), new(1,1,1,0));
+            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:"
@@ -103,7 +102,7 @@ namespace UnityExplorer.UI.Panels
             clearButton.OnClick += () => Copy(null);
 
             // Current Paste info row
-            var currentPasteHolder = UIFactory.CreateHorizontalGroup(UIRoot, "SecondRow", false, false, true, true, 0, 
+            var currentPasteHolder = UIFactory.CreateHorizontalGroup(uiContent, "SecondRow", false, false, true, true, 0, 
                 new(2, 2, 2, 2), childAlignment: TextAnchor.UpperCenter);
 
             // Actual current paste info label

src/UI/Panels/HookManagerPanel.cs

@@ -9,7 +9,9 @@ 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

@@ -44,10 +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;
@@ -58,12 +54,12 @@ namespace UnityExplorer.UI.Panels
 
         public override void ConstructPanelContent()
         {
-            var closeHolder = this.titleBar.transform.Find("CloseHolder").gameObject;
+            var closeHolder = this.TitleBar.transform.Find("CloseHolder").gameObject;
 
             // Inspect under mouse dropdown on title bar
 
-            var mouseDropdown = UIFactory.CreateDropdown(closeHolder, out MouseInspectDropdown, "Mouse Inspect", 14,
-                InspectUnderMouse.OnDropdownSelect);
+            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"));
@@ -80,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

@@ -10,7 +10,10 @@ 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

@@ -43,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()
@@ -63,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);
 
@@ -108,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

@@ -10,6 +10,7 @@ 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,6 +10,7 @@ using UniverseLib.UI.Models;
 using UnityExplorer.UI.Widgets.AutoComplete;
 using UniverseLib.UI;
 using UniverseLib;
+using UniverseLib.Utility;
 
 namespace UnityExplorer.UI.Panels
 {
@@ -67,6 +68,9 @@ namespace UnityExplorer.UI.Panels
 
         public static void UpdateInstances()
         {
+            if (!DisplayManager.MouseInTargetDisplay)
+                return;
+
             if (!resizeCursorObj)
                 CreateCursorUI();
 
@@ -78,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)
@@ -234,12 +238,12 @@ namespace UnityExplorer.UI.Panels
         {
             wasAnyDragging = true;
             WasDragging = true;
-            lastDragPosition = InputManager.MousePosition;
+            lastDragPosition = DisplayManager.MousePosition;
         }
 
         public void OnDrag()
         {
-            var mousePos = InputManager.MousePosition;
+            var mousePos = DisplayManager.MousePosition;
 
             Vector2 diff = (Vector2)mousePos - lastDragPosition;
             lastDragPosition = mousePos;
@@ -260,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 },
@@ -388,7 +392,7 @@ namespace UnityExplorer.UI.Panels
         // update the resize icon position to be above the mouse
         private void UpdateHoverImagePos()
         {
-            resizeCursorObj.transform.localPosition = UIManager.UIRootRect.InverseTransformPoint(InputManager.MousePosition);
+            resizeCursorObj.transform.localPosition = UIManager.UIRootRect.InverseTransformPoint(DisplayManager.MousePosition);
         }
 
         public void OnHoverResizeEnd()
@@ -400,26 +404,26 @@ namespace UnityExplorer.UI.Panels
         public void OnBeginResize(ResizeTypes resizeType)
         {
             currentResizeType = resizeType;
-            lastResizePos = InputManager.MousePosition;
+            lastResizePos = DisplayManager.MousePosition;
             WasResizing = true;
             Resizing = true;
         }
 
         public void OnResize()
         {
-            Vector3 mousePos = InputManager.MousePosition;
+            Vector3 mousePos = DisplayManager.MousePosition;
             Vector2 diff = lastResizePos - (Vector2)mousePos;
 
             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;
 
             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;

src/UI/Panels/UIPanel.cs

@@ -11,6 +11,7 @@ using UnityExplorer.UI.Widgets;
 using UniverseLib.UI.Models;
 using UniverseLib.UI;
 using UniverseLib;
+using System.Collections;
 
 namespace UnityExplorer.UI.Panels
 {
@@ -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,26 +87,23 @@ 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)
@@ -115,12 +114,12 @@ namespace UnityExplorer.UI.Panels
             base.SetActive(active);
 
             if (!ApplyingSaveData)
-                SaveToConfigManager();
+                SaveInternalData();
 
             if (NavButtonWanted)
             {
-                var color = active ? UniversalUI.enabledButtonColor : UniversalUI.disabledButtonColor;
-                RuntimeProvider.Instance.SetColorBlock(NavButton.Component, color, color * 1.2f);
+                var color = active ? UniversalUI.EnabledButtonColor : UniversalUI.DisabledButtonColor;
+                RuntimeHelper.SetColorBlock(NavButton.Component, color, color * 1.2f);
             }
 
             if (!active)
@@ -148,13 +147,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 +163,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 +195,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 +218,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 +240,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 +248,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 +304,7 @@ namespace UnityExplorer.UI.Panels
             // apply panel save data or revert to default
             try
             {
-                ApplySaveData(GetSaveDataFromConfigManager());
+                ApplySaveData();
             }
             catch (Exception ex)
             {
@@ -308,7 +312,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 +333,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 +389,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 +407,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
 {
@@ -58,7 +61,7 @@ namespace UnityExplorer.UI.Panels
         {
             dataHandler = new ButtonListHandler<GameObject, ButtonCell>(buttonScrollPool, GetEntries, SetCell, ShouldDisplayCell, OnCellClicked);
 
-            buttonScrollPool = UIFactory.CreateScrollPool<ButtonCell>(this.content, "ResultsList", out GameObject scrollObj,
+            buttonScrollPool = UIFactory.CreateScrollPool<ButtonCell>(this.uiContent, "ResultsList", out GameObject scrollObj,
                 out GameObject scrollContent);
 
             buttonScrollPool.Initialize(dataHandler);
@@ -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.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
 {
@@ -48,13 +43,13 @@ namespace UnityExplorer.UI
 
         public static bool Initializing { get; internal set; } = true;
 
-        private static UIBase uiBase;
-        public static GameObject UIRoot => uiBase?.RootObject;
-        public static RectTransform UIRootRect => _uiRootRect ??= UIRoot.GetComponent<RectTransform>();
-        private static RectTransform _uiRootRect;
+        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();
+        internal static readonly Dictionary<Panels, UIPanel> UIPanels = new();
 
         public static RectTransform NavBarRect;
         public static GameObject NavbarTabButtonHolder;
@@ -71,13 +66,14 @@ namespace UnityExplorer.UI
 
         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);
             }
         }
 
@@ -85,11 +81,16 @@ namespace UnityExplorer.UI
 
         internal static void InitUI()
         {
-            uiBase = UniversalUI.RegisterUI(ExplorerCore.GUID, Update);
+            UiBase = UniversalUI.RegisterUI(ExplorerCore.GUID, Update);
 
-            lastScreenWidth = Screen.width;
-            lastScreenHeight = Screen.height;
+            UIRootRect = UIRoot.GetComponent<RectTransform>();
+            UICanvas = UIRoot.GetComponent<Canvas>();
 
+            DisplayManager.Init();
+
+            var display = DisplayManager.ActiveDisplay;
+            lastScreenWidth = display.renderingWidth;
+            lastScreenHeight = display.renderingHeight;
 
             // Create UI.
             CreatePanelHolder();
@@ -105,7 +106,7 @@ namespace UnityExplorer.UI
             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();
@@ -134,12 +135,9 @@ namespace UnityExplorer.UI
             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();
@@ -169,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();
         }
 
@@ -233,8 +232,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)
             {
@@ -254,6 +254,8 @@ namespace UnityExplorer.UI
             closeBtn.ButtonText.text = val.ToString();
         }
 
+        // Time controls
+
         private static void OnTimeInputEndEdit(string val)
         {
             if (pauseButtonPausing)
@@ -284,7 +286,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 ? "►" : "||";
         }
 
@@ -352,7 +354,7 @@ namespace UnityExplorer.UI
 
             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/AutoCompleteModal.cs

@@ -11,6 +11,9 @@ 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
 {
@@ -37,7 +40,7 @@ namespace UnityExplorer.UI.Widgets.AutoComplete
         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];
@@ -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);
@@ -302,25 +305,18 @@ namespace UnityExplorer.UI.Widgets.AutoComplete
         {
             dataHandler = new ButtonListHandler<Suggestion, ButtonCell>(scrollPool, GetEntries, SetCell, ShouldDisplay, OnCellClicked);
 
-            scrollPool = UIFactory.CreateScrollPool<ButtonCell>(this.content, "AutoCompleter", out GameObject scrollObj,
+            scrollPool = UIFactory.CreateScrollPool<ButtonCell>(this.uiContent, "AutoCompleter", out GameObject scrollObj,
                 out GameObject scrollContent);
             scrollPool.Initialize(dataHandler);
             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/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/TypeCompleter.cs

@@ -1,14 +1,15 @@
-using System;
+using HarmonyLib;
+using System;
 using System.Collections.Generic;
 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 +26,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 +61,14 @@ 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)
+                    allowedTypes.Add(entry.Value);
+            }
         }
 
         public void OnSuggestionClicked(Suggestion suggestion)
@@ -112,6 +122,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,7 @@ using UnityExplorer.UI.Widgets.AutoComplete;
 using UniverseLib.UI;
 using UniverseLib;
 using UnityExplorer.CacheObject;
+using UniverseLib.UI.ObjectPool;
 
 namespace UnityExplorer.UI.Widgets
 {

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

@@ -10,6 +10,8 @@ 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
 {

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,24 @@ 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 (!SiblingIndex.Component.isFocused)
+                    SiblingIndex.Text = cached.Value.GetSiblingIndex().ToString();
+
                 int childCount = cached.Value.childCount;
                 if (childCount > 0)
                 {
@@ -111,6 +123,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 +168,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();
-
-            if (andReload)
-            {
-                if (!jumpToTop)
-                    ScrollPool.Refresh(true);
-                else
-                    ScrollPool.Refresh(true, true);
-            }
+            prevDisplayIndex = displayIndex;
+            refreshCoroutine = null;
         }   
 
-        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, false);
+        }
+
+        public void OnCellEnableToggled(CachedTransform cache)
+        {
+            cache.Value.gameObject.SetActive(!cache.Value.gameObject.activeSelf);
+
+            RefreshData(true, false, true, false);
+        }
     }
 }

src/UnityExplorer.csproj

@@ -106,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>
@@ -172,16 +175,16 @@
       <Private>False</Private>
     </Reference>
     <Reference Include="UniverseLib.Mono">
-      <HintPath>packages\UniverseLib.1.0.6\lib\net35\UniverseLib.Mono.dll</HintPath>
+      <HintPath>packages\UniverseLib.1.2.15\lib\net35\UniverseLib.Mono.dll</HintPath>
     </Reference>
   </ItemGroup>
   <!-- Il2Cpp refs -->
   <ItemGroup Condition="'$(IsCpp)'=='true'">
     <Reference Include="UniverseLib.IL2CPP">
-      <HintPath>packages\UniverseLib.1.0.6\lib\net472\UniverseLib.IL2CPP.dll</HintPath>
+      <HintPath>packages\UniverseLib.1.2.15\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">
@@ -243,7 +246,7 @@
     <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" />
@@ -256,6 +259,8 @@
     <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" />
@@ -287,9 +292,9 @@
     <Compile Include="Config\ConfigHandler.cs" />
     <Compile Include="Config\ConfigManager.cs" />
     <Compile Include="Config\IConfigElement.cs" />
-    <Compile Include="Runtime\Il2CppProvider.cs" />
-    <Compile Include="Runtime\MonoProvider.cs" />
-    <Compile Include="Runtime\RuntimeHelper.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="Tests\TestClass.cs" />
@@ -320,9 +325,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

src/nuget.config

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+    <config>
+        <add key="dependencyVersion" value="Lowest" />
+    </config>
+
+    <packageRestore>
+        <!-- Allow NuGet to download missing packages -->
+        <add key="enabled" value="True" />
+
+        <!-- Automatically check for missing packages during build in Visual Studio -->
+        <add key="automatic" value="True" />
+    </packageRestore>
+
+    <packageSources>
+        <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
+        <add key="BepInEx" value="https://nuget.bepinex.dev/v3/index.json" />
+    </packageSources>
+</configuration>

src/packages.config

@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="HarmonyX" version="2.5.2" targetFramework="net35" />
+  <package id="Iced" version="1.15.0" targetFramework="net472" />
+  <package id="Il2CppAssemblyUnhollower.BaseLib" version="0.4.22" targetFramework="net472" />
   <package id="ILRepack.Lib.MSBuild.Task" version="2.0.18.2" targetFramework="net35" />
-  <package id="ini-parser" version="2.5.2" targetFramework="net35" />
   <package id="Mono.Cecil" version="0.10.4" targetFramework="net35" />
-  <package id="UniverseLib" version="1.0.6" targetFramework="net35" />
+  <package id="Samboy063.Tomlet" version="3.1.3" targetFramework="net472" />
+  <package id="UniverseLib" version="1.2.15" targetFramework="net35" />
+  <package id="UniverseLib.Analyzers" version="1.0.3" targetFramework="net35" developmentDependency="true" />
 </packages>