Bump version

Not sure if this ever happens but just in case

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -0,0 +1,62 @@
+name: Bug Report
+description: File a bug or crash report
+title: "[Bug]: "
+labels: [bug]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for submitting a bug report, please fill out as much detail as possible.
+  - type: checkboxes
+    id: latestversion
+    attributes:
+      label: Are you on the latest version of UnityExplorer?
+      description: If not, you must update first.
+      options:
+        - label: Yes, I'm on the latest version of UnityExplorer.
+          required: true
+  - type: dropdown
+    id: version
+    attributes:
+      label: Which release are you using?
+      description: Please select your environment for UnityExplorer.
+      options:
+        - BepInEx IL2CPP
+        - BepInEx 6.X Mono
+        - BepInEx 5.X Mono
+        - MelonLoader 0.4+ IL2CPP
+        - MelonLoader 0.4+ Mono
+        - MelonLoader 0.3 IL2CPP
+        - MelonLoader 0.3 Mono
+        - Standalone IL2CPP
+        - Standalone Mono
+    validations:
+      required: true
+  - type: textarea
+    id: game
+    attributes:
+      label: Which game did this occur on?
+      description: Please tell us the name of the game. If it's a personal or private project, just let us know the Unity version.
+    validations:
+      required: true
+  - type: textarea
+    id: what-happened
+    attributes:
+      label: Describe the issue.
+      description: What happened? Should something else have happened instead? Please provide steps to reproduce the issue if possible.
+      placeholder: Tell us what you see! 
+    validations:
+      required: true
+  - type: textarea
+    id: logs
+    attributes:
+      label: Relevant log output
+      description: |
+        Please copy and paste any relevant logs and stack traces.
+        * Unity log: `%userprofile%\AppData\LocalLow\{Company}\{Game}\Player.log` or `output_log.txt`
+        * BepInEx: `BepInEx\LogOutput.log`
+        * MelonLoader: `MelonLoader\latest.log`
+        * Standalone: `{DLL_Location}\UnityExplorer\Logs\` (pick the most recent one)
+      render: shell
+    validations:
+      required: false

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1 @@
+blank_issues_enabled: false

.github/ISSUE_TEMPLATE/enhancement.yaml

@@ -0,0 +1,18 @@
+name: New feature or enhancement
+description: Suggest or discuss a feature or enhancement for UnityExplorer
+title: "[Enhancement]: "
+labels: [enhancement]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to discuss UnityExplorer, please provide as much detail as possible.
+  - type: textarea
+    id: description
+    attributes:
+      label: Describe the new feature or enhancement
+      description: |
+        Please go into as much detail as necessary in describing the new feature or enhancement.
+        If providing examples or suggestions for the required C# code, please use syntax-highlighted code blocks.
+    validations:
+      required: true

.github/ISSUE_TEMPLATE/other.yaml

@@ -0,0 +1,13 @@
+name: Other
+description: Something else?
+title: "[Other]: "
+labels: [Other]
+body:
+  - type: textarea
+    id: description
+    attributes:
+      label: Describe the issue
+      description: |
+        Please describe the issue in as much detail as possible.
+    validations:
+      required: true

README.md

@@ -6,10 +6,10 @@
   🔍 An in-game UI for exploring, debugging and modifying Unity games.
 </p>
 <p align="center">
-  ✔️ Supports most Unity versions from 5.2 to 2020+ (IL2CPP and Mono).
+  ✔️ Supports most Unity versions from 5.2 to 2021+ (IL2CPP and Mono).
 </p>
 <p align="center">
-  ☕ Enjoy this tool? Consider supporting me on <a href="https://ko-fi.com/sinaidev">ko-fi</a>!
+  ⚡ UnityExplorer is on <a href="https://thunderstore.io/package/sinai-dev/UnityExplorer/">Thunderstore</a>! (and as <a href="https://gtfo.thunderstore.io/package/sinai-dev/UnityExplorer_IL2CPP/">IL2CPP</a>)
 </p>
 
 # Releases  [![](https://img.shields.io/github/downloads/sinai-dev/UnityExplorer/total.svg)](../../releases)
@@ -32,8 +32,8 @@
 
 | Release | IL2CPP | Mono |
 | ------- | ------ | ---- |
-| ML 0.4.0 | ✅ [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) | 
-| ML 0.3.0 | ✅ [link](https://github.com/sinai-dev/UnityExplorer/releases/latest/download/UnityExplorer.MelonLoader_Legacy.Il2Cpp.zip) | ✅ [link](https://github.com/sinai-dev/UnityExplorer/releases/latest/download/UnityExplorer.MelonLoader_Legacy.Mono.zip) | 
+| 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) | 
+| ML 0.3 | ✅ [link](https://github.com/sinai-dev/UnityExplorer/releases/latest/download/UnityExplorer.MelonLoader_Legacy.Il2Cpp.zip) | ✅ [link](https://github.com/sinai-dev/UnityExplorer/releases/latest/download/UnityExplorer.MelonLoader_Legacy.Mono.zip) | 
 
 1. Take the `UnityExplorer.ML.[version].dll` file and put it in the `Mods\` folder created by MelonLoader.
 
@@ -50,11 +50,6 @@ The standalone release can be used with any injector or loader of your choice, b
 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
 
-# Known issues
-* Any `MissingMethodException` or `NotSupportedException`: please report the issue and provide a copy of your mod loader log and/or Unity log.
-* In IL2CPP, some IEnumerable and IDictionary types may fail enumeration. Waiting for the Unhollower rewrite to address this any further.
-* The C# Console's completions have some minor issues such as not suggestion global classes which have no namespace, and erronously suggesting classes from using directives when they shouldn't be suggested. These are issues with mcs itself which I am looking into.
-
 # Features
 
 <p align="center">
@@ -88,6 +83,7 @@ The inspector is used to see detailed information on objects of any type and man
 ### C# Console
 
 * The C# Console uses the `Mono.CSharp.Evaluator` to define temporary classes or run immediate REPL code.
+* You can execute a script automatically on startup by naming it `startup.cs` and placing it in the `UnityExplorer\Scripts\` folder (this folder will be created where you placed the DLL file).
 * See the "Help" dropdown in the C# console menu for more detailed information.
 
 ### Mouse-Inspect
@@ -115,7 +111,7 @@ 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`, and if using IL2CPP then build `UnhollowerBaseLib` as well.
+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.
 3. Build the UnityExplorer release(s) you want to use, either by selecting the config as the Active Config, or batch-building.
 
 # Acknowledgments

src/CSConsole/CSAutoCompleter.cs

@@ -3,10 +3,11 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using UnityEngine;
-using UnityExplorer.UI.CSConsole.Lexers;
+using UnityExplorer.CSConsole.Lexers;
+using UnityExplorer.UI;
 using UnityExplorer.UI.Widgets.AutoComplete;
 
-namespace UnityExplorer.UI.CSConsole
+namespace UnityExplorer.CSConsole
 {
     public class CSAutoCompleter : ISuggestionProvider
     {
@@ -22,7 +23,6 @@ namespace UnityExplorer.UI.CSConsole
             AutoCompleteModal.Instance.ReleaseOwnership(this);
         }
 
-        // Delimiters for completions, notably does not include '.'
         private readonly HashSet<char> delimiters = new HashSet<char>
         {
             '{', '}', ',', ';', '<', '>', '(', ')', '[', ']', '=', '|', '&', '?'
@@ -67,11 +67,10 @@ namespace UnityExplorer.UI.CSConsole
             }
             string input = InputField.Text.Substring(startIdx, caret - startIdx + 1);
 
-
             // Get MCS completions
 
             string[] evaluatorCompletions = ConsoleController.Evaluator.GetCompletions(input, out string prefix);
-            
+
             if (evaluatorCompletions != null && evaluatorCompletions.Any())
             {
                 suggestions.AddRange(from completion in evaluatorCompletions
@@ -100,7 +99,7 @@ namespace UnityExplorer.UI.CSConsole
                 {
                     if (!keywordHighlights.ContainsKey(kw))
                         keywordHighlights.Add(kw, $"<color=#{SignatureHighlighter.keywordBlueHex}>{kw}</color>");
-            
+
                     string completion = kw.Substring(input.Length, kw.Length - input.Length);
                     suggestions.Add(new Suggestion(keywordHighlights[kw], completion));
                 }
@@ -124,7 +123,7 @@ namespace UnityExplorer.UI.CSConsole
 
         private readonly StringBuilder highlightBuilder = new StringBuilder();
         private const string OPEN_HIGHLIGHT = "<color=cyan>";
-        
+
         private string GetHighlightString(string prefix, string completion)
         {
             highlightBuilder.Clear();

src/CSConsole/ConsoleController.cs

@@ -1,20 +1,21 @@
-using System;
+using Mono.CSharp;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Reflection;
 using System.Text;
 using UnityEngine;
 using UnityEngine.EventSystems;
 using UnityEngine.UI;
-using UnityExplorer.UI.CSConsole;
 using UnityExplorer.Core.Input;
+using UnityExplorer.CSConsole;
+using UnityExplorer.UI;
 using UnityExplorer.UI.Panels;
 using UnityExplorer.UI.Widgets.AutoComplete;
-using System.Reflection;
-using Mono.CSharp;
 
-namespace UnityExplorer.UI.CSConsole
+namespace UnityExplorer.CSConsole
 {
     public static class ConsoleController
     {
@@ -36,6 +37,8 @@ namespace UnityExplorer.UI.CSConsole
         public static bool EnableAutoIndent { get; private set; } = true;
         public static bool EnableSuggestions { get; private set; } = true;
 
+        internal static string ScriptsFolder => Path.Combine(ExplorerCore.Loader.ExplorerFolder, "Scripts");
+
         internal static readonly string[] DefaultUsing = new string[]
         {
             "System",
@@ -51,6 +54,7 @@ namespace UnityExplorer.UI.CSConsole
 
         public static void Init()
         {
+            // Make sure console is supported on this platform
             try
             {
                 ResetConsole(false);
@@ -63,19 +67,41 @@ namespace UnityExplorer.UI.CSConsole
                 return;
             }
 
+            // Setup console
             Lexer = new LexerBuilder();
             Completer = new CSAutoCompleter();
 
             SetupHelpInteraction();
 
             Panel.OnInputChanged += OnInputChanged;
-            Panel.InputScroll.OnScroll += OnInputScrolled;
+            Panel.InputScroller.OnScroll += OnInputScrolled;
             Panel.OnCompileClicked += Evaluate;
             Panel.OnResetClicked += ResetConsole;
             Panel.OnHelpDropdownChanged += HelpSelected;
             Panel.OnAutoIndentToggled += OnToggleAutoIndent;
             Panel.OnCtrlRToggled += OnToggleCtrlRShortcut;
             Panel.OnSuggestionsToggled += OnToggleSuggestions;
+            Panel.OnPanelResized += OnInputScrolled;
+
+            // Run startup script
+            try
+            {
+                if (!Directory.Exists(ScriptsFolder))
+                    Directory.CreateDirectory(ScriptsFolder);
+
+                var startupPath = Path.Combine(ScriptsFolder, "startup.cs");
+                if (File.Exists(startupPath))
+                {
+                    ExplorerCore.Log($"Executing startup script from '{startupPath}'...");
+                    var text = File.ReadAllText(startupPath);
+                    Input.Text = text;
+                    Evaluate();
+                }
+            }
+            catch (Exception ex)
+            {
+                ExplorerCore.LogWarning($"Exception executing startup script: {ex}");
+            }
         }
 
 
@@ -221,7 +247,7 @@ namespace UnityExplorer.UI.CSConsole
             if (InputManager.GetKeyDown(KeyCode.Escape))
             {
                 Input.Text = previousInput;
-                
+
                 if (EnableSuggestions && AutoCompleteModal.CheckEscape(Completer))
                     OnAutocompleteEscaped();
 
@@ -240,7 +266,7 @@ namespace UnityExplorer.UI.CSConsole
             }
 
             var inStringOrComment = HighlightVisibleInput();
-            
+
             if (!settingCaretCoroutine)
             {
                 if (EnableSuggestions)
@@ -317,7 +343,7 @@ namespace UnityExplorer.UI.CSConsole
                 var charBot = charTop - CSCONSOLE_LINEHEIGHT;
 
                 var viewportMin = Input.Rect.rect.height - Input.Rect.anchoredPosition.y - (Input.Rect.rect.height * 0.5f);
-                var viewportMax = viewportMin - Panel.InputScroll.ViewportRect.rect.height;
+                var viewportMax = viewportMin - Panel.InputScroller.ViewportRect.rect.height;
 
                 float diff = 0f;
                 if (charTop > viewportMin)
@@ -337,7 +363,7 @@ namespace UnityExplorer.UI.CSConsole
         {
             settingCaretCoroutine = true;
             Input.Component.readOnly = true;
-            RuntimeProvider.Instance.StartCoroutine(SetAutocompleteCaretCoro(caretPosition));
+            RuntimeProvider.Instance.StartCoroutine(SetCaretCoroutine(caretPosition));
         }
 
         internal static PropertyInfo SelectionGuardProperty => selectionGuardPropInfo ?? GetSelectionGuardPropInfo();
@@ -352,7 +378,7 @@ namespace UnityExplorer.UI.CSConsole
 
         private static PropertyInfo selectionGuardPropInfo;
 
-        private static IEnumerator SetAutocompleteCaretCoro(int caretPosition)
+        private static IEnumerator SetCaretCoroutine(int caretPosition)
         {
             var color = Input.Component.selectionColor;
             color.a = 0f;
@@ -376,7 +402,6 @@ namespace UnityExplorer.UI.CSConsole
             settingCaretCoroutine = false;
         }
 
-
         #region Lexer Highlighting
 
         /// <summary>
@@ -384,43 +409,83 @@ namespace UnityExplorer.UI.CSConsole
         /// </summary>
         private static bool HighlightVisibleInput()
         {
-            int startIdx = 0;
-            int endIdx = Input.Text.Length - 1;
-            int topLine = 0;
-
-            // Calculate visible text if necessary
-            if (Input.Rect.rect.height > Panel.InputScroll.ViewportRect.rect.height)
+            if (string.IsNullOrEmpty(Input.Text))
             {
-                topLine = -1;
-                int bottomLine = -1;
-
-                // 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 viewportMax = viewportMin - Panel.InputScroll.ViewportRect.rect.height;
-
-                for (int i = 0; i < Input.TextGenerator.lineCount; i++)
-                {
-                    var line = Input.TextGenerator.lines[i];
-                    // if not set the top line yet, and top of line is below the viewport top
-                    if (topLine == -1 && line.topY <= viewportMin)
-                        topLine = i;
-                    // if bottom of line is below the viewport bottom
-                    if ((line.topY - line.height) >= viewportMax)
-                        bottomLine = i;
-                }
-
-                topLine = Math.Max(0, topLine - 1);
-                bottomLine = Math.Min(Input.TextGenerator.lineCount - 1, bottomLine + 1);
-
-                startIdx = Input.TextGenerator.lines[topLine].startCharIdx;
-                endIdx = (bottomLine >= Input.TextGenerator.lineCount - 1)
-                    ? Input.Text.Length - 1
-                    : (Input.TextGenerator.lines[bottomLine + 1].startCharIdx - 1);
+                Panel.HighlightText.text = "";
+                Panel.LineNumberText.text = "1";
+                return false;
             }
 
+            // Calculate the visible lines
+
+            int topLine = -1;
+            int bottomLine = -1;
+
+            // 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 viewportMax = viewportMin - Panel.InputScroller.ViewportRect.rect.height;
+
+            for (int i = 0; i < Input.TextGenerator.lineCount; i++)
+            {
+                var line = Input.TextGenerator.lines[i];
+                // if not set the top line yet, and top of line is below the viewport top
+                if (topLine == -1 && line.topY <= viewportMin)
+                    topLine = i;
+                // if bottom of line is below the viewport bottom
+                if ((line.topY - line.height) >= viewportMax)
+                    bottomLine = i;
+            }
+
+            topLine = Math.Max(0, topLine - 1);
+            bottomLine = Math.Min(Input.TextGenerator.lineCount - 1, bottomLine + 1);
+
+            int startIdx = Input.TextGenerator.lines[topLine].startCharIdx;
+            int endIdx = (bottomLine >= Input.TextGenerator.lineCount - 1)
+                ? Input.Text.Length - 1
+                : (Input.TextGenerator.lines[bottomLine + 1].startCharIdx - 1);
+
+
             // Highlight the visible text with the LexerBuilder
+
             Panel.HighlightText.text = Lexer.BuildHighlightedString(Input.Text, startIdx, endIdx, topLine, LastCaretPosition, out bool ret);
+
+            // Set the line numbers
+
+            // determine true starting line number (not the same as the cached TextGenerator line numbers)
+            int realStartLine = 0;
+            for (int i = 0; i < startIdx; i++)
+            {
+                if (LexerBuilder.IsNewLine(Input.Text[i]))
+                    realStartLine++;
+            }
+            realStartLine++;
+            char lastPrev = '\n';
+
+            var sb = new StringBuilder();
+
+            // append leading new lines for spacing (no point rendering line numbers we cant see)
+            for (int i = 0; i < topLine; i++)
+                sb.Append('\n');
+
+            // append the displayed line numbers
+            for (int i = topLine; i <= bottomLine; i++)
+            {
+                if (i > 0)
+                    lastPrev = Input.Text[Input.TextGenerator.lines[i].startCharIdx - 1];
+
+                // previous line ended with a newline character, this is an actual new line.
+                if (LexerBuilder.IsNewLine(lastPrev))
+                {
+                    sb.Append(realStartLine.ToString());
+                    realStartLine++;
+                }
+
+                sb.Append('\n');
+            }
+
+            Panel.LineNumberText.text = sb.ToString();
+
             return ret;
         }
 
@@ -555,7 +620,9 @@ If the game was built with Unity's stubbed netstandard 2.0 runtime, you can fix
         internal const string STARTUP_TEXT = @"<color=#5d8556>// Welcome to the UnityExplorer C# Console!
 
 // It is recommended to use the Log panel (or a console log window) while using this tool.
-// Use the Help dropdown to see detailed examples of how to use the console.</color>";
+// Use the Help dropdown to see detailed examples of how to use the console.
+
+// To execute a script automatically on startup, put the script at 'UnityExplorer\Scripts\startup.cs'</color>";
 
         internal const string HELP_USINGS = @"// You can add a using directive to any namespace, but you must compile for it to take effect.
 // It will remain in effect until you Reset the console.

src/CSConsole/LexerBuilder.cs

@@ -5,16 +5,17 @@ using System.Linq;
 using System.Text;
 using UnityEngine;
 using UnityEngine.UI;
-using UnityExplorer.UI.CSConsole.Lexers;
+using UnityExplorer.CSConsole.Lexers;
 
-namespace UnityExplorer.UI.CSConsole
+namespace UnityExplorer.CSConsole
 {
     public struct MatchInfo
     {
         public int startIndex;
         public int endIndex;
-        public string htmlColorTag;
         public bool isStringOrComment;
+        public bool matchToEndOfLine;
+        public string htmlColorTag;
     }
 
     public class LexerBuilder
@@ -112,12 +113,24 @@ namespace UnityExplorer.UI.CSConsole
                     sb.Append(input[i]);
                 sb.Append(SignatureHighlighter.CLOSE_COLOR);
 
-                // check caretIdx to determine inStringOrComment state
-                if (caretIdx >= match.startIndex && (caretIdx <= match.endIndex || (caretIdx >= input.Length && match.endIndex >= input.Length - 1)))
-                    caretInStringOrComment = match.isStringOrComment;
-
                 // update the last unhighlighted start index
                 lastUnhighlighted = match.endIndex + 1;
+
+                int matchEndIdx = match.endIndex;
+                if (match.matchToEndOfLine)
+                {
+                    while (input.Length - 1 >= matchEndIdx)
+                    {
+                        if (IsNewLine(input[matchEndIdx]))
+                            break;
+                        matchEndIdx++;
+                    }
+                }
+
+                // check caretIdx to determine inStringOrComment state
+                if (caretIdx >= match.startIndex && (caretIdx <= matchEndIdx || (caretIdx >= input.Length && matchEndIdx >= input.Length - 1)))
+                    caretInStringOrComment = match.isStringOrComment;
+
             }
 
             // Append trailing unhighlighted input

src/CSConsole/Lexers/CommentLexer.cs

@@ -2,7 +2,7 @@
 using System.Linq;
 using UnityEngine;
 
-namespace UnityExplorer.UI.CSConsole.Lexers
+namespace UnityExplorer.CSConsole.Lexers
 {
     public class CommentLexer : Lexer
     {
@@ -44,7 +44,7 @@ namespace UnityExplorer.UI.CSConsole.Lexers
                     while (!lexer.EndOfInput && !(lexer.Current == '/' && lexer.Previous == '*'));
 
                     return true;
-                }  
+                }
             }
 
             return false;

src/CSConsole/Lexers/KeywordLexer.cs

@@ -2,7 +2,7 @@
 using System.Text;
 using UnityEngine;
 
-namespace UnityExplorer.UI.CSConsole.Lexers
+namespace UnityExplorer.CSConsole.Lexers
 {
     public class KeywordLexer : Lexer
     {
@@ -12,12 +12,12 @@ namespace UnityExplorer.UI.CSConsole.Lexers
         public static readonly HashSet<string> keywords = new HashSet<string>
         {
 // reserved keywords
-"abstract", "as", "base", "bool", "break", "byte", "case", "catch", "char", "checked", "class", "const", "continue", 
+"abstract", "as", "base", "bool", "break", "byte", "case", "catch", "char", "checked", "class", "const", "continue",
 "decimal", "default", "delegate", "do", "double", "else", "enum", "event", "explicit", "extern", "false", "finally",
-"fixed", "float", "for", "foreach", "goto", "if", "implicit", "in", "int", "interface", "internal", "is", "lock", 
-"long", "namespace", "new", "null", "object", "operator", "out", "override", "params", "private", "protected", "public", 
-"readonly", "ref", "return", "sbyte", "sealed", "short", "sizeof", "stackalloc", "static", "string", "struct", "switch", 
-"this", "throw", "true", "try", "typeof", "uint", "ulong", "unchecked", "unsafe", "ushort", "using", "virtual", "void", 
+"fixed", "float", "for", "foreach", "goto", "if", "implicit", "in", "int", "interface", "internal", "is", "lock",
+"long", "namespace", "new", "null", "object", "operator", "out", "override", "params", "private", "protected", "public",
+"readonly", "ref", "return", "sbyte", "sealed", "short", "sizeof", "stackalloc", "static", "string", "struct", "switch",
+"this", "throw", "true", "try", "typeof", "uint", "ulong", "unchecked", "unsafe", "ushort", "using", "virtual", "void",
 "volatile", "while",
 // contextual keywords
 "add", "and", "alias", "ascending", "async", "await", "by", "descending", "dynamic", "equals", "from", "get",

src/CSConsole/Lexers/Lexer.cs

@@ -1,8 +1,8 @@
 using System.Collections.Generic;
-using UnityEngine;
 using System.Linq;
+using UnityEngine;
 
-namespace UnityExplorer.UI.CSConsole.Lexers
+namespace UnityExplorer.CSConsole.Lexers
 {
     public abstract class Lexer
     {

src/CSConsole/Lexers/NumberLexer.cs

@@ -1,6 +1,6 @@
 using UnityEngine;
 
-namespace UnityExplorer.UI.CSConsole.Lexers
+namespace UnityExplorer.CSConsole.Lexers
 {
     public class NumberLexer : Lexer
     {

src/CSConsole/Lexers/StringLexer.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-namespace UnityExplorer.UI.CSConsole.Lexers
+namespace UnityExplorer.CSConsole.Lexers
 {
     public class StringLexer : Lexer
     {

src/CSConsole/Lexers/SymbolLexer.cs

@@ -3,7 +3,7 @@ using System.Linq;
 using System.Text;
 using UnityEngine;
 
-namespace UnityExplorer.UI.CSConsole.Lexers
+namespace UnityExplorer.CSConsole.Lexers
 {
     public class SymbolLexer : Lexer
     {

src/CSConsole/ScriptEvaluator.cs

@@ -1,13 +1,13 @@
-using System;
+using Mono.CSharp;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
 using System.Text;
-using Mono.CSharp;
 
 // Thanks to ManlyMarco for this
 
-namespace UnityExplorer.UI.CSConsole
+namespace UnityExplorer.CSConsole
 {
     public class ScriptEvaluator : Evaluator, IDisposable
     {

src/CSConsole/ScriptInteraction.cs

@@ -1,19 +1,13 @@
-using System;
-using Mono.CSharp;
+using Mono.CSharp;
+using System;
 using System.Collections;
-using UnityEngine;
 using System.Collections.Generic;
 using System.Linq;
-using UnityExplorer.Core.Runtime;
 using System.Text;
+using UnityEngine;
+using UnityExplorer.Core.Runtime;
 
-/*
-    Welcome to the UnityExplorer C# Console!
-    Use the Help dropdown to see detailed examples of how to use this console.
-    To see your output, use the Log panel or a Console Log window.
-*/
-
-namespace UnityExplorer.UI.CSConsole
+namespace UnityExplorer.CSConsole
 {
     public class ScriptInteraction : InteractiveBase
     {
@@ -58,7 +52,7 @@ namespace UnityExplorer.UI.CSConsole
         public static void GetClasses()
         {
             if (ReflectionUtility.GetFieldInfo(typeof(Evaluator), "source_file")
-                    .GetValue(Evaluator) is CompilationSourceFile sourceFile 
+                    .GetValue(Evaluator) is CompilationSourceFile sourceFile
                 && sourceFile.Containers.Any())
             {
                 var sb = new StringBuilder();
@@ -76,4 +70,4 @@ namespace UnityExplorer.UI.CSConsole
 
         }
     }
-}
+}

src/CacheObject/CacheConfigEntry.cs

@@ -3,9 +3,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using UnityExplorer.Core.Config;
-using UnityExplorer.UI.CacheObject.Views;
+using UnityExplorer.CacheObject.Views;
 
-namespace UnityExplorer.UI.CacheObject
+namespace UnityExplorer.CacheObject
 {
     public class CacheConfigEntry : CacheObjectBase
     {

src/CacheObject/CacheField.cs

@@ -3,9 +3,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using System.Text;
-using UnityExplorer.UI.Inspectors;
+using UnityExplorer.Inspectors;
 
-namespace UnityExplorer.UI.CacheObject
+namespace UnityExplorer.CacheObject
 {
     public class CacheField : CacheMember
     {

src/CacheObject/CacheKeyValuePair.cs

@@ -2,10 +2,10 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using UnityExplorer.UI.CacheObject.Views;
-using UnityExplorer.UI.CacheObject.IValues;
+using UnityExplorer.CacheObject.IValues;
+using UnityExplorer.CacheObject.Views;
 
-namespace UnityExplorer.UI.CacheObject
+namespace UnityExplorer.CacheObject
 {
     public class CacheKeyValuePair : CacheObjectBase
     {

src/CacheObject/CacheListEntry.cs

@@ -2,10 +2,10 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using UnityExplorer.UI.CacheObject.Views;
-using UnityExplorer.UI.CacheObject.IValues;
+using UnityExplorer.CacheObject.IValues;
+using UnityExplorer.CacheObject.Views;
 
-namespace UnityExplorer.UI.CacheObject
+namespace UnityExplorer.CacheObject
 {
     public class CacheListEntry : CacheObjectBase
     {

src/CacheObject/CacheMember.cs

@@ -5,17 +5,18 @@ using System.Reflection;
 using System.Text;
 using UnityEngine;
 using UnityExplorer.Core.Runtime;
-using UnityExplorer.UI.CacheObject.Views;
-using UnityExplorer.UI.Inspectors;
+using UnityExplorer.CacheObject.Views;
+using UnityExplorer.Inspectors;
 using UnityExplorer.UI.Models;
+using UnityExplorer.UI;
 
-namespace UnityExplorer.UI.CacheObject
+namespace UnityExplorer.CacheObject
 {
     public abstract class CacheMember : CacheObjectBase
     {
         //public ReflectionInspector ParentInspector { get; internal set; }
         //public bool AutoUpdateWanted { get; internal set; }
-        
+
         public abstract Type DeclaringType { get; }
         public string NameForFiltering { get; protected set; }
         public object DeclaringInstance => IsStatic ? null : (m_declaringInstance ?? (m_declaringInstance = Owner.Target.TryCast(DeclaringType)));
@@ -27,7 +28,7 @@ namespace UnityExplorer.UI.CacheObject
         public Type[] GenericArguments { get; protected set; } = ArgumentUtility.EmptyTypes;
         public EvaluateWidget Evaluator { get; protected set; }
         public bool Evaluating => Evaluator != null && Evaluator.UIRoot.activeSelf;
-        
+
         public virtual void SetInspectorOwner(ReflectionInspector inspector, MemberInfo member)
         {
             this.Owner = inspector;
@@ -234,7 +235,7 @@ namespace UnityExplorer.UI.CacheObject
             return sorted;
         }
 
-        private static void TryCacheMember(MemberInfo member, List<CacheMember> list, HashSet<string> cachedSigs, 
+        private static void TryCacheMember(MemberInfo member, List<CacheMember> list, HashSet<string> cachedSigs,
             Type declaringType, ReflectionInspector _inspector, bool ignorePropertyMethodInfos = true)
         {
             try
@@ -253,7 +254,7 @@ namespace UnityExplorer.UI.CacheObject
                     case MemberTypes.Method:
                         {
                             var mi = member as MethodInfo;
-                            if (ignorePropertyMethodInfos 
+                            if (ignorePropertyMethodInfos
                                 && (mi.Name.StartsWith("get_") || mi.Name.StartsWith("set_")))
                                 return;
 
@@ -322,7 +323,7 @@ namespace UnityExplorer.UI.CacheObject
             }
         }
 
-        internal static string GetSig(MemberInfo member) 
+        internal static string GetSig(MemberInfo member)
             => $"{member.DeclaringType.Name}.{member.Name}";
 
         internal static string GetArgumentString(ParameterInfo[] args)

src/CacheObject/CacheMethod.cs

@@ -3,9 +3,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using System.Text;
-using UnityExplorer.UI.Inspectors;
+using UnityExplorer.Inspectors;
 
-namespace UnityExplorer.UI.CacheObject
+namespace UnityExplorer.CacheObject
 {
     public class CacheMethod : CacheMember
     {

src/CacheObject/CacheObjectBase.cs

@@ -7,11 +7,12 @@ using System.Text;
 using UnityEngine;
 using UnityEngine.UI;
 using UnityExplorer.Core.Runtime;
-using UnityExplorer.UI.CacheObject.Views;
-using UnityExplorer.UI.CacheObject.IValues;
+using UnityExplorer.CacheObject.IValues;
+using UnityExplorer.CacheObject.Views;
 using UnityExplorer.UI.Models;
+using UnityExplorer.UI;
 
-namespace UnityExplorer.UI.CacheObject
+namespace UnityExplorer.CacheObject
 {
     public enum ValueState
     {
@@ -180,8 +181,8 @@ namespace UnityExplorer.UI.CacheObject
                 return ValueState.Enum;
             else if (type == typeof(Color) || type == typeof(Color32))
                 return ValueState.Color;
-             else if (InteractiveValueStruct.SupportsType(type))
-                 return ValueState.ValueStruct;
+            else if (InteractiveValueStruct.SupportsType(type))
+                return ValueState.ValueStruct;
             else if (ReflectionUtility.IsDictionary(type))
                 return ValueState.Dictionary;
             else if (!typeof(Transform).IsAssignableFrom(type) && ReflectionUtility.IsEnumerable(type))
@@ -197,7 +198,7 @@ namespace UnityExplorer.UI.CacheObject
             switch (State)
             {
                 case ValueState.NotEvaluated:
-                    return $"<i>{NOT_YET_EVAL} ({SignatureHighlighter.Parse(FallbackType, true)})</i>"; 
+                    return $"<i>{NOT_YET_EVAL} ({SignatureHighlighter.Parse(FallbackType, true)})</i>";
 
                 case ValueState.Exception:
                     return $"<i><color=red>{LastException.ReflectionExToString()}</color></i>";
@@ -221,7 +222,7 @@ namespace UnityExplorer.UI.CacheObject
                         return $"\"{ToStringUtility.PruneString(s, 200, 5)}\"";
                     }
                     break;
-                
+
                 // try to prefix the count of the collection for lists and dicts
                 case ValueState.Collection:
                     if (!LastValueWasNull)
@@ -263,7 +264,7 @@ namespace UnityExplorer.UI.CacheObject
 
             cell.SubContentHolder.gameObject.SetActive(SubContentShowWanted);
             if (IValue != null)
-            { 
+            {
                 IValue.UIRoot.transform.SetParent(cell.SubContentHolder.transform, false);
                 IValue.SetLayout();
             }

src/CacheObject/CacheProperty.cs

@@ -3,9 +3,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using System.Text;
-using UnityExplorer.UI.Inspectors;
+using UnityExplorer.Inspectors;
 
-namespace UnityExplorer.UI.CacheObject
+namespace UnityExplorer.CacheObject
 {
     public class CacheProperty : CacheMember
     {
@@ -31,7 +31,7 @@ namespace UnityExplorer.UI.CacheObject
                 object ret;
                 if (HasArguments)
                     ret = PropertyInfo.GetValue(DeclaringInstance, this.Evaluator.TryParseArguments());
-                else 
+                else
                     ret = PropertyInfo.GetValue(DeclaringInstance, null);
                 HadException = false;
                 LastException = null;

src/CacheObject/ICacheObjectController.cs

@@ -3,10 +3,10 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using UnityExplorer.UI.CacheObject;
-using UnityExplorer.UI.CacheObject.Views;
+using UnityExplorer.CacheObject;
+using UnityExplorer.CacheObject.Views;
 
-namespace UnityExplorer.UI.CacheObject
+namespace UnityExplorer.CacheObject
 {
     public interface ICacheObjectController
     {

src/CacheObject/IValues/InteractiveColor.cs

@@ -4,9 +4,10 @@ using System.Linq;
 using System.Text;
 using UnityEngine;
 using UnityEngine.UI;
-using UnityExplorer.UI.CacheObject;
+using UnityExplorer.CacheObject;
+using UnityExplorer.UI;
 
-namespace UnityExplorer.UI.CacheObject.IValues
+namespace UnityExplorer.CacheObject.IValues
 {
     public class InteractiveColor : InteractiveValue
     {

src/CacheObject/IValues/InteractiveDictionary.cs

@@ -5,13 +5,14 @@ using System.Linq;
 using System.Reflection;
 using UnityEngine;
 using UnityEngine.UI;
-using UnityExplorer.UI.CacheObject;
-using UnityExplorer.UI.CacheObject.Views;
-using UnityExplorer.UI.Inspectors;
+using UnityExplorer.CacheObject;
+using UnityExplorer.CacheObject.Views;
+using UnityExplorer.Inspectors;
+using UnityExplorer.UI;
 using UnityExplorer.UI.Panels;
 using UnityExplorer.UI.Widgets;
 
-namespace UnityExplorer.UI.CacheObject.IValues
+namespace UnityExplorer.CacheObject.IValues
 {
     public class InteractiveDictionary : InteractiveValue, ICellPoolDataSource<CacheKeyValuePairCell>, ICacheObjectController
     {

src/CacheObject/IValues/InteractiveEnum.cs

@@ -5,9 +5,10 @@ using System.Linq;
 using System.Text;
 using UnityEngine;
 using UnityEngine.UI;
-using UnityExplorer.UI.CacheObject;
+using UnityExplorer.CacheObject;
+using UnityExplorer.UI;
 
-namespace UnityExplorer.UI.CacheObject.IValues
+namespace UnityExplorer.CacheObject.IValues
 {
     public class InteractiveEnum : InteractiveValue
     {
@@ -20,7 +21,7 @@ namespace UnityExplorer.UI.CacheObject.IValues
 
         public CachedEnumValue ValueAtIdx(int idx) => (CachedEnumValue)CurrentValues[idx];
         public CachedEnumValue ValueAtKey(object key) => (CachedEnumValue)CurrentValues[key];
-        
+
         private Dropdown enumDropdown;
         private GameObject toggleHolder;
         private readonly List<Toggle> flagToggles = new List<Toggle>();

src/CacheObject/IValues/InteractiveList.cs

@@ -5,13 +5,14 @@ using System.Linq;
 using System.Reflection;
 using UnityEngine;
 using UnityEngine.UI;
-using UnityExplorer.UI.CacheObject;
-using UnityExplorer.UI.CacheObject.Views;
-using UnityExplorer.UI.Inspectors;
+using UnityExplorer.CacheObject;
+using UnityExplorer.CacheObject.Views;
+using UnityExplorer.Inspectors;
+using UnityExplorer.UI;
 using UnityExplorer.UI.Panels;
 using UnityExplorer.UI.Widgets;
 
-namespace UnityExplorer.UI.CacheObject.IValues
+namespace UnityExplorer.CacheObject.IValues
 {
     public class InteractiveList : InteractiveValue, ICellPoolDataSource<CacheListEntryCell>, ICacheObjectController
     {
@@ -206,7 +207,7 @@ namespace UnityExplorer.UI.CacheObject.IValues
             {
                 ExplorerCore.LogWarning($"Exception setting IList value: {ex}");
             }
-        } 
+        }
 
         // List entry scroll pool
 
@@ -254,8 +255,8 @@ namespace UnityExplorer.UI.CacheObject.IValues
             ListScrollPool.Initialize(this, SetLayout);
             scrollLayout = scrollObj.GetComponent<LayoutElement>();
 
-            NotSupportedLabel = UIFactory.CreateLabel(ListScrollPool.Content.gameObject, "NotSupportedMessage", 
-                "The IEnumerable failed to enumerate. This is likely due to an issue with Unhollowed interfaces.", 
+            NotSupportedLabel = UIFactory.CreateLabel(ListScrollPool.Content.gameObject, "NotSupportedMessage",
+                "The IEnumerable failed to enumerate. This is likely due to an issue with Unhollowed interfaces.",
                 TextAnchor.MiddleLeft, Color.red);
 
             UIFactory.SetLayoutElement(NotSupportedLabel.gameObject, minHeight: 25, flexibleWidth: 9999);

src/CacheObject/IValues/InteractiveString.cs

@@ -6,10 +6,11 @@ using System.Text;
 using UnityEngine;
 using UnityEngine.UI;
 using UnityExplorer.Core.Config;
-using UnityExplorer.UI.CacheObject;
+using UnityExplorer.CacheObject;
 using UnityExplorer.UI.Widgets;
+using UnityExplorer.UI;
 
-namespace UnityExplorer.UI.CacheObject.IValues
+namespace UnityExplorer.CacheObject.IValues
 {
     public class InteractiveString : InteractiveValue
     {
@@ -18,7 +19,7 @@ namespace UnityExplorer.UI.CacheObject.IValues
 
         public InputFieldRef inputField;
         public ButtonRef ApplyButton;
-        
+
         public GameObject SaveFileRow;
         public InputFieldRef SaveFilePath;
 
@@ -36,7 +37,7 @@ namespace UnityExplorer.UI.CacheObject.IValues
         {
             if (s == null)
                 return false;
-        
+
             return s.Length >= UIManager.MAX_INPUTFIELD_CHARS;
         }
 
@@ -83,7 +84,7 @@ namespace UnityExplorer.UI.CacheObject.IValues
 
             if (File.Exists(path))
                 File.Delete(path);
-            
+
             File.WriteAllText(path, RealValue);
         }
 
@@ -98,7 +99,7 @@ namespace UnityExplorer.UI.CacheObject.IValues
             UIFactory.SetLayoutElement(SaveFileRow, flexibleWidth: 9999);
             UIFactory.SetLayoutGroup<VerticalLayoutGroup>(SaveFileRow, false, true, true, true, 3);
 
-            UIFactory.CreateLabel(SaveFileRow, "Info", "<color=red>String is too long! Save to file if you want to see the full string.</color>", 
+            UIFactory.CreateLabel(SaveFileRow, "Info", "<color=red>String is too long! Save to file if you want to see the full string.</color>",
                 TextAnchor.MiddleLeft);
 
             var horizRow = UIFactory.CreateUIObject("Horiz", SaveFileRow);

src/CacheObject/IValues/InteractiveValue.cs

@@ -4,10 +4,11 @@ using System.Linq;
 using System.Text;
 using UnityEngine;
 using UnityEngine.UI;
-using UnityExplorer.UI.CacheObject;
+using UnityExplorer.CacheObject;
+using UnityExplorer.UI;
 using UnityExplorer.UI.Models;
 
-namespace UnityExplorer.UI.CacheObject.IValues
+namespace UnityExplorer.CacheObject.IValues
 {
     public abstract class InteractiveValue : IPooledObject
     {

src/CacheObject/IValues/InteractiveValueStruct.cs

@@ -5,9 +5,10 @@ using System.Reflection;
 using System.Text;
 using UnityEngine;
 using UnityEngine.UI;
-using UnityExplorer.UI.CacheObject;
+using UnityExplorer.CacheObject;
+using UnityExplorer.UI;
 
-namespace UnityExplorer.UI.CacheObject.IValues
+namespace UnityExplorer.CacheObject.IValues
 {
     public class InteractiveValueStruct : InteractiveValue
     {
@@ -143,7 +144,7 @@ namespace UnityExplorer.UI.CacheObject.IValues
                 ExplorerCore.LogWarning("Exception setting value: " + ex);
             }
         }
-        
+
         // UI Setup for type
 
         private void SetupUIForType()

src/CacheObject/Views/CacheConfigCell.cs

@@ -4,8 +4,9 @@ using System.Linq;
 using System.Text;
 using UnityEngine;
 using UnityEngine.UI;
+using UnityExplorer.UI;
 
-namespace UnityExplorer.UI.CacheObject.Views
+namespace UnityExplorer.CacheObject.Views
 {
     public class ConfigEntryCell : CacheObjectCell
     {

src/CacheObject/Views/CacheKeyValuePairCell.cs

@@ -4,11 +4,12 @@ using System.Linq;
 using System.Text;
 using UnityEngine;
 using UnityEngine.UI;
-using UnityExplorer.UI.Inspectors;
-using UnityExplorer.UI.CacheObject.IValues;
+using UnityExplorer.CacheObject.IValues;
+using UnityExplorer.Inspectors;
+using UnityExplorer.UI;
 using UnityExplorer.UI.Widgets;
 
-namespace UnityExplorer.UI.CacheObject.Views
+namespace UnityExplorer.CacheObject.Views
 {
     public class CacheKeyValuePairCell : CacheObjectCell
     {

src/CacheObject/Views/CacheListEntryCell.cs

@@ -4,9 +4,9 @@ using System.Linq;
 using System.Text;
 using UnityEngine;
 using UnityEngine.UI;
-using UnityExplorer.UI.CacheObject.IValues;
+using UnityExplorer.CacheObject.IValues;
 
-namespace UnityExplorer.UI.CacheObject.Views
+namespace UnityExplorer.CacheObject.Views
 {
     public class CacheListEntryCell : CacheObjectCell
     {

src/CacheObject/Views/CacheMemberCell.cs

@@ -4,9 +4,10 @@ using System.Linq;
 using System.Text;
 using UnityEngine;
 using UnityEngine.UI;
+using UnityExplorer.UI;
 using UnityExplorer.UI.Widgets;
 
-namespace UnityExplorer.UI.CacheObject.Views
+namespace UnityExplorer.CacheObject.Views
 {
     public class CacheMemberCell : CacheObjectCell
     {

src/CacheObject/Views/CacheObjectCell.cs

@@ -4,11 +4,12 @@ using System.Linq;
 using System.Text;
 using UnityEngine;
 using UnityEngine.UI;
-using UnityExplorer.UI.Inspectors;
-using UnityExplorer.UI.CacheObject.IValues;
+using UnityExplorer.CacheObject.IValues;
+using UnityExplorer.Inspectors;
+using UnityExplorer.UI;
 using UnityExplorer.UI.Widgets;
 
-namespace UnityExplorer.UI.CacheObject.Views
+namespace UnityExplorer.CacheObject.Views
 {
     public abstract class CacheObjectCell : ICell
     {

src/CacheObject/Views/EvaluateWidget.cs

@@ -5,10 +5,11 @@ using System.Reflection;
 using System.Text;
 using UnityEngine;
 using UnityEngine.UI;
+using UnityExplorer.UI;
 using UnityExplorer.UI.Models;
 using UnityExplorer.UI.Widgets.AutoComplete;
 
-namespace UnityExplorer.UI.CacheObject.Views
+namespace UnityExplorer.CacheObject.Views
 {
     public class EvaluateWidget : IPooledObject
     {
@@ -67,7 +68,7 @@ namespace UnityExplorer.UI.CacheObject.Views
 
             for (int i = 0; i < genericArguments.Length; i++)
             {
-                outArgs[i] = ReflectionUtility.GetTypeByName(genericInput[i]) 
+                outArgs[i] = ReflectionUtility.GetTypeByName(genericInput[i])
                     ?? throw new Exception($"Could not find any type by name '{genericInput[i]}'!");
             }
 
@@ -206,7 +207,7 @@ namespace UnityExplorer.UI.CacheObject.Views
                     var elemType = arg.ParameterType;
                     if (elemType.IsByRef)
                         elemType = elemType.GetElementType();
-                    argInputFields[i].PlaceholderText.text = $"eg. {ParseUtility.GetExampleInput(elemType)}"; 
+                    argInputFields[i].PlaceholderText.text = $"eg. {ParseUtility.GetExampleInput(elemType)}";
                 }
             }
         }
@@ -249,7 +250,7 @@ namespace UnityExplorer.UI.CacheObject.Views
 
         public GameObject CreateContent(GameObject parent)
         {
-            UIRoot = UIFactory.CreateVerticalGroup(parent, "EvaluateWidget", false, false, true, true, 3, new Vector4(2, 2, 2, 2), 
+            UIRoot = UIFactory.CreateVerticalGroup(parent, "EvaluateWidget", false, false, true, true, 3, new Vector4(2, 2, 2, 2),
                 new Color(0.15f, 0.15f, 0.15f));
             UIFactory.SetLayoutElement(UIRoot, minWidth: 50, flexibleWidth: 9999, minHeight: 50, flexibleHeight: 800);
             //UIRoot.AddComponent<ContentSizeFitter>().verticalFit = ContentSizeFitter.FitMode.PreferredSize;
@@ -275,7 +276,7 @@ namespace UnityExplorer.UI.CacheObject.Views
             // evaluate button
             var evalButton = UIFactory.CreateButton(UIRoot, "EvaluateButton", "Evaluate", new Color(0.2f, 0.2f, 0.2f));
             UIFactory.SetLayoutElement(evalButton.Component.gameObject, minHeight: 25, minWidth: 150, flexibleWidth: 0);
-            evalButton.OnClick += () => 
+            evalButton.OnClick += () =>
             {
                 Owner.EvaluateAndSetCell();
             };

src/Core/Config/ConfigManager.cs

@@ -16,18 +16,18 @@ namespace UnityExplorer.Core.Config
         // See the UnityExplorer.Loader namespace for the implementations.
         public static ConfigHandler Handler { get; private set; }
 
-        public static ConfigElement<KeyCode>    Master_Toggle;
+        public static ConfigElement<KeyCode> Master_Toggle;
         public static ConfigElement<UIManager.VerticalAnchor> Main_Navbar_Anchor;
-        public static ConfigElement<bool>       Force_Unlock_Mouse;
-        public static ConfigElement<KeyCode>    Force_Unlock_Toggle;
-        public static ConfigElement<bool>       Aggressive_Mouse_Unlock;
-        public static ConfigElement<bool>       Disable_EventSystem_Override;
-        public static ConfigElement<string>     Default_Output_Path;
-        public static ConfigElement<bool>       Log_Unity_Debug;
-        public static ConfigElement<bool>       Hide_On_Startup;
-        public static ConfigElement<float>      Startup_Delay_Time;
+        public static ConfigElement<bool> Force_Unlock_Mouse;
+        public static ConfigElement<KeyCode> Force_Unlock_Toggle;
+        public static ConfigElement<bool> Aggressive_Mouse_Unlock;
+        public static ConfigElement<bool> Disable_EventSystem_Override;
+        public static ConfigElement<string> Default_Output_Path;
+        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<string> Reflection_Signature_Blacklist;
 
         // internal configs
         internal static InternalConfigHandler InternalHandler { get; private set; }
@@ -116,7 +116,7 @@ namespace UnityExplorer.Core.Config
             Reflection_Signature_Blacklist = new ConfigElement<string>("Member Signature Blacklist",
                 "Use this to blacklist certain member signatures if they are known to cause a crash or other issues.\r\n" +
                 "Seperate signatures with a semicolon ';'.\r\n" +
-                "For example, to blacklist Camera.main, you would add 'Camera.main;'",
+                "For example, to blacklist Camera.main, you would add 'UnityEngine.Camera.main;'",
                 "");
 
             // Internal configs (panel save data)

src/Core/Config/InternalConfigHandler.cs

@@ -87,9 +87,6 @@ namespace UnityExplorer.Core.Config
             foreach (var entry in ConfigManager.InternalConfigs)
                 sec.AddKey(entry.Key, entry.Value.BoxedValue.ToString());
 
-            if (!Directory.Exists(ExplorerCore.Loader.ConfigFolder))
-                Directory.CreateDirectory(ExplorerCore.Loader.ConfigFolder);
-
             File.WriteAllText(INI_PATH, data.ToString());
         }
 

src/Core/Input/CursorUnlocker.cs

@@ -1,12 +1,12 @@
 using System;
+using System.Collections;
 using UnityEngine;
 using UnityEngine.EventSystems;
-using UnityExplorer.Core.Input;
-using BF = System.Reflection.BindingFlags;
-using UnityExplorer.Core.Config;
 using UnityExplorer.Core;
+using UnityExplorer.Core.Config;
+using UnityExplorer.Core.Input;
 using UnityExplorer.UI;
-using System.Collections;
+using BF = System.Reflection.BindingFlags;
 
 
 namespace UnityExplorer.Core.Input

src/Core/Input/InputManager.cs

@@ -1,6 +1,6 @@
 using System;
-using UnityEngine;
 using System.Diagnostics.CodeAnalysis;
+using UnityEngine;
 using UnityEngine.EventSystems;
 
 namespace UnityExplorer.Core.Input
@@ -74,7 +74,7 @@ namespace UnityExplorer.Core.Input
                     ExplorerCore.Log("Initialized Legacy Input support");
                     return;
                 }
-                catch 
+                catch
                 {
                     // It's not working, we'll fall back to InputSystem.
                 }

src/Core/Input/InputSystem.cs

@@ -1,10 +1,10 @@
 using System;
+using System.Collections.Generic;
+using System.Linq;
 using System.Reflection;
 using UnityEngine;
 using UnityEngine.EventSystems;
 using UnityExplorer.UI;
-using System.Collections.Generic;
-using System.Linq;
 
 namespace UnityExplorer.Core.Input
 {
@@ -12,6 +12,8 @@ namespace UnityExplorer.Core.Input
     {
         public InputSystem()
         {
+            SetupSupportedDevices();
+
             m_kbCurrentProp = TKeyboard.GetProperty("current");
             m_kbIndexer = TKeyboard.GetProperty("Item", new Type[] { TKey });
 
@@ -32,7 +34,37 @@ namespace UnityExplorer.Core.Input
                                       .GetMethod("ReadValue");
         }
 
-        #region reflection cache
+        internal static void SetupSupportedDevices()
+        {
+            try
+            {
+                // typeof(InputSystem)
+                Type TInputSystem = ReflectionUtility.GetTypeByName("UnityEngine.InputSystem.InputSystem");
+                // InputSystem.settings
+                var settings = TInputSystem.GetProperty("settings", BindingFlags.Public | BindingFlags.Static).GetValue(null, null);
+                // typeof(InputSettings)
+                Type TSettings = settings.GetActualType();
+                // InputSettings.supportedDevices
+                PropertyInfo supportedProp = TSettings.GetProperty("supportedDevices", BindingFlags.Public | BindingFlags.Instance);
+                var supportedDevices = supportedProp.GetValue(settings, null);
+                // An empty supportedDevices list means all devices are supported.
+#if CPP
+                // weird hack for il2cpp, use the implicit operator and cast Il2CppStringArray to ReadOnlyArray<string>
+                var args = new object[] { new UnhollowerBaseLib.Il2CppStringArray(0) };
+                var method = supportedDevices.GetActualType().GetMethod("op_Implicit", BindingFlags.Static | BindingFlags.Public);
+                supportedProp.SetValue(settings, method.Invoke(null, args), null);
+#else
+                supportedProp.SetValue(settings, Activator.CreateInstance(supportedDevices.GetActualType(), new object[] { new string[0] }), null);
+#endif
+            }
+            catch (Exception ex)
+            {
+                ExplorerCore.LogWarning($"Exception setting up InputSystem.settings.supportedDevices list!");
+                ExplorerCore.Log(ex);
+            }
+        }
+
+#region reflection cache
 
         public static Type TKeyboard => m_tKeyboard ?? (m_tKeyboard = ReflectionUtility.GetTypeByName("UnityEngine.InputSystem.Keyboard"));
         private static Type m_tKeyboard;
@@ -73,7 +105,7 @@ namespace UnityExplorer.Core.Input
         private static object m_scrollInfo;
         private static PropertyInfo m_scrollDeltaProp;
 
-        #endregion
+#endregion
 
         public Vector2 MousePosition
         {
@@ -138,6 +170,8 @@ namespace UnityExplorer.Core.Input
 
         public bool GetMouseButtonDown(int btn)
         {
+            if (CurrentMouse == null)
+                return false;
             switch (btn)
             {
                 case 0: return (bool)m_btnWasPressedProp.GetValue(LeftMouseButton, null);
@@ -149,6 +183,8 @@ namespace UnityExplorer.Core.Input
 
         public bool GetMouseButton(int btn)
         {
+            if (CurrentMouse == null)
+                return false;
             switch (btn)
             {
                 case 0: return (bool)m_btnIsPressedProp.GetValue(LeftMouseButton, null);

src/Core/Reflection/Extensions.cs

@@ -99,8 +99,10 @@ namespace UnityExplorer
 
         public static Exception GetInnerMostException(this Exception e)
         {
-            while (e.InnerException != null)
+            while (e != null)
             {
+                if (e.InnerException == null)
+                    break;
 #if CPP
                 if (e.InnerException is System.Runtime.CompilerServices.RuntimeWrappedException)
                     break;

src/Core/Reflection/Il2CppReflection.cs

@@ -37,7 +37,7 @@ namespace UnityExplorer
                 $"deobfuscated types count: {DeobfuscatedTypes.Count}");
         }
 
-        #region IL2CPP Extern and pointers
+#region IL2CPP Extern and pointers
 
         // Extern C++ methods 
         [DllImport("GameAssembly", CallingConvention = CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
@@ -63,10 +63,10 @@ namespace UnityExplorer
             return il2cppPtr != IntPtr.Zero;
         }
 
-        #endregion
+#endregion
 
 
-        #region Deobfuscation cache
+#region Deobfuscation cache
 
         private static readonly Dictionary<string, Type> DeobfuscatedTypes = new Dictionary<string, Type>();
         private static readonly Dictionary<string, string> reverseDeobCache = new Dictionary<string, string>();
@@ -111,7 +111,7 @@ namespace UnityExplorer
             return theString;
         }
 
-        #endregion
+#endregion
 
 
         // Get type by name
@@ -124,7 +124,7 @@ namespace UnityExplorer
             return base.Internal_GetTypeByName(fullName);
         }
 
-        #region Get actual type
+#region Get actual type
 
         internal override Type Internal_GetActualType(object obj)
         {
@@ -132,7 +132,6 @@ namespace UnityExplorer
                 return null;
 
             var type = obj.GetType();
-
             try
             {
                 if (IsString(obj))
@@ -183,10 +182,10 @@ namespace UnityExplorer
             return monoType;
         }
 
-        #endregion
+#endregion
 
 
-        #region Casting
+#region Casting
 
         private static readonly Dictionary<string, IntPtr> cppClassPointers = new Dictionary<string, IntPtr>();
 
@@ -216,7 +215,7 @@ namespace UnityExplorer
                 // from other structs to il2cpp object
                 else if (typeof(Il2CppSystem.Object).IsAssignableFrom(castTo))
                 {
-                    return BoxIl2CppObject(obj);
+                    return BoxIl2CppObject(obj).TryCast(castTo);
                 }
                 else
                     return obj;
@@ -278,10 +277,10 @@ namespace UnityExplorer
         //    return il2cpp_class_is_assignable_from(thisTypePtr, fromTypePtr);
         //}
 
-        #endregion
+#endregion
 
 
-        #region Boxing and unboxing ValueTypes
+#region Boxing and unboxing ValueTypes
 
         // cached il2cpp unbox methods
         internal static readonly Dictionary<string, MethodInfo> unboxMethods = new Dictionary<string, MethodInfo>();
@@ -295,7 +294,27 @@ namespace UnityExplorer
             try
             {
                 if (toType.IsEnum)
+                {
+                    // Check for nullable enums
+                    var type = cppObj.GetType();
+                    if (type.IsGenericType && type.GetGenericTypeDefinition() == typeof(Il2CppSystem.Nullable<>))
+                    {
+                        var nullable = cppObj.TryCast(type);
+                        var nullableHasValueProperty = type.GetProperty("HasValue");
+                        if ((bool)nullableHasValueProperty.GetValue(nullable, null))
+                        {
+                            // nullable has a value.
+                            var nullableValueProperty = type.GetProperty("Value");
+                            return Enum.Parse(toType, nullableValueProperty.GetValue(nullable, null).ToString());
+                        }
+                        // nullable and no current value.
+                        return cppObj;
+                    }
+
                     return Enum.Parse(toType, cppObj.ToString());
+                }
+
+                // Not enum, unbox with Il2CppObjectBase.Unbox
 
                 var name = toType.AssemblyQualifiedName;
 
@@ -384,10 +403,10 @@ namespace UnityExplorer
             return cppStruct;
         }
 
-        #endregion
+#endregion
 
 
-        #region String boxing/unboxing
+#region String boxing/unboxing
 
         private const string IL2CPP_STRING_FULLNAME = "Il2CppSystem.String";
         private const string STRING_FULLNAME = "System.String";
@@ -428,10 +447,10 @@ namespace UnityExplorer
             return s;
         }
 
-        #endregion
+#endregion
 
 
-        #region Singleton finder
+#region Singleton finder
 
         internal override void Internal_FindSingleton(string[] possibleNames, Type type, BF flags, List<object> instances)
         {
@@ -453,16 +472,16 @@ namespace UnityExplorer
             base.Internal_FindSingleton(possibleNames, type, flags, instances);
         }
 
-        #endregion
+#endregion
 
 
-        #region Force-loading game modules
+#region Force-loading game modules
 
         internal static string UnhollowedFolderPath => Path.GetFullPath(
 #if ML
                     Path.Combine("MelonLoader", "Managed")
 #elif BIE
-                    Path.Combine("BepInEx", "unhollowed")
+                    Path.Combine(BepInEx.Paths.BepInExRootPath, "unhollowed")
 #else
                     Path.Combine(ExplorerCore.Loader.ExplorerFolder, "Modules")
 #endif
@@ -513,10 +532,10 @@ namespace UnityExplorer
             return false;
         }
 
-        #endregion
+#endregion
 
 
-        #region Il2cpp reflection blacklist
+#region Il2cpp reflection blacklist
 
         public override string[] DefaultReflectionBlacklist => defaultIl2CppBlacklist.ToArray();
 
@@ -665,10 +684,10 @@ namespace UnityExplorer
             "UnityEngine.XR.InputDevice.SendHapticImpulse",
         };
 
-        #endregion
+#endregion
 
 
-        #region IL2CPP IEnumerable and IDictionary
+#region IL2CPP IEnumerable and IDictionary
 
         protected override bool Internal_TryGetEntryType(Type enumerableType, out Type type)
         {
@@ -780,21 +799,24 @@ namespace UnityExplorer
 
             // Some ugly reflection to use the il2cpp interface for the instance type
 
-            var type = list.GetType();
+            var type = list.GetActualType();
             var key = type.AssemblyQualifiedName;
 
             if (!getEnumeratorMethods.ContainsKey(key))
             {
-                getEnumeratorMethods.Add(key, type.GetMethod("GetEnumerator"));
+                var method = type.GetMethod("GetEnumerator")
+                             ?? type.GetMethod("System_Collections_IEnumerable_GetEnumerator", FLAGS);
+                getEnumeratorMethods.Add(key, method);
 
                 // ensure the enumerator type is supported
                 try
                 {
                     var test = getEnumeratorMethods[key].Invoke(list, null);
-                    test.GetType().GetMethod("MoveNext").Invoke(test, null);
+                    test.GetActualType().GetMethod("MoveNext").Invoke(test, null);
                 }
-                catch
+                catch (Exception ex)
                 {
+                    ExplorerCore.Log($"IEnumerable failed to enumerate: {ex}");
                     notSupportedTypes.Add(key);
                 }
             }
@@ -803,7 +825,7 @@ namespace UnityExplorer
                 throw new NotSupportedException($"The IEnumerable type '{type.FullName}' does not support MoveNext.");
 
             cppEnumerator = getEnumeratorMethods[key].Invoke(list, null);
-            var enumeratorType = cppEnumerator.GetType();
+            var enumeratorType = cppEnumerator.GetActualType();
 
             var enumInfoKey = enumeratorType.AssemblyQualifiedName;
 
@@ -857,7 +879,7 @@ namespace UnityExplorer
 
             try
             {
-                var type = dictionary.GetType();
+                var type = dictionary.GetActualType();
 
                 if (typeof(Il2CppSystem.Collections.Hashtable).IsAssignableFrom(type))
                 {
@@ -867,20 +889,23 @@ namespace UnityExplorer
 
                 var keys = type.GetProperty("Keys").GetValue(dictionary, null);
 
-                var keyCollType = keys.GetType();
-                var cacheKey = keys.GetType().AssemblyQualifiedName;
+                var keyCollType = keys.GetActualType();
+                var cacheKey = keyCollType.AssemblyQualifiedName;
                 if (!getEnumeratorMethods.ContainsKey(cacheKey))
                 {
-                    getEnumeratorMethods.Add(cacheKey, keyCollType.GetMethod("GetEnumerator"));
+                    var method = keyCollType.GetMethod("GetEnumerator")
+                                 ?? keyCollType.GetMethod("System_Collections_IDictionary_GetEnumerator", FLAGS);
+                    getEnumeratorMethods.Add(cacheKey, method);
 
                     // test support
                     try
                     {
                         var test = getEnumeratorMethods[cacheKey].Invoke(keys, null);
-                        test.GetType().GetMethod("MoveNext").Invoke(test, null);
+                        test.GetActualType().GetMethod("MoveNext").Invoke(test, null);
                     }
-                    catch
+                    catch (Exception ex)
                     {
+                        ExplorerCore.Log($"IDictionary failed to enumerate: {ex}");
                         notSupportedTypes.Add(cacheKey);
                     }
                 }
@@ -891,16 +916,16 @@ namespace UnityExplorer
                 var keyEnumerator = getEnumeratorMethods[cacheKey].Invoke(keys, null);
                 var keyInfo = new EnumeratorInfo
                 {
-                    current = keyEnumerator.GetType().GetProperty("Current"),
-                    moveNext = keyEnumerator.GetType().GetMethod("MoveNext"),
+                    current = keyEnumerator.GetActualType().GetProperty("Current"),
+                    moveNext = keyEnumerator.GetActualType().GetMethod("MoveNext"),
                 };
 
                 var values = type.GetProperty("Values").GetValue(dictionary, null);
-                var valueEnumerator = values.GetType().GetMethod("GetEnumerator").Invoke(values, null);
+                var valueEnumerator = values.GetActualType().GetMethod("GetEnumerator").Invoke(values, null);
                 var valueInfo = new EnumeratorInfo
                 {
-                    current = valueEnumerator.GetType().GetProperty("Current"),
-                    moveNext = valueEnumerator.GetType().GetMethod("MoveNext"),
+                    current = valueEnumerator.GetActualType().GetProperty("Current"),
+                    moveNext = valueEnumerator.GetActualType().GetMethod("MoveNext"),
                 };
 
                 dictEnumerator = EnumerateCppDict(keyInfo, keyEnumerator, valueInfo, valueEnumerator);

src/Core/Reflection/ReflectionUtility.cs

@@ -4,11 +4,11 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Reflection;
-using BF = System.Reflection.BindingFlags;
-using UnityExplorer.Core.Runtime;
 using System.Text;
 using UnityEngine;
 using UnityExplorer.Core.Config;
+using UnityExplorer.Core.Runtime;
+using BF = System.Reflection.BindingFlags;
 
 namespace UnityExplorer
 {
@@ -42,7 +42,7 @@ namespace UnityExplorer
         public static Action<Type> OnTypeLoaded;
 
         /// <summary>Key: Type.FullName</summary>
-        public static readonly SortedDictionary<string, Type> AllTypes = new SortedDictionary<string, Type>(StringComparer.OrdinalIgnoreCase);
+        protected static readonly SortedDictionary<string, Type> AllTypes = new SortedDictionary<string, Type>(StringComparer.OrdinalIgnoreCase);
 
         public static readonly List<string> AllNamespaces = new List<string>();
         private static readonly HashSet<string> uniqueNamespaces = new HashSet<string>();
@@ -87,6 +87,7 @@ namespace UnityExplorer
         {
             foreach (var type in asm.TryGetTypes())
             {
+                // Cache namespace if there is one
                 if (!string.IsNullOrEmpty(type.Namespace) && !uniqueNamespaces.Contains(type.Namespace))
                 {
                     uniqueNamespaces.Add(type.Namespace);
@@ -100,16 +101,16 @@ namespace UnityExplorer
                     AllNamespaces.Insert(i, type.Namespace);
                 }
 
+                // Cache the type. Overwrite type if one exists with the full name
                 if (AllTypes.ContainsKey(type.FullName))
                     AllTypes[type.FullName] = type;
                 else
-                {
                     AllTypes.Add(type.FullName, type);
-                    //allTypeNames.Add(type.FullName);
-                }
 
+                // Invoke listener
                 OnTypeLoaded?.Invoke(type);
 
+                // Check type inheritance cache, add this to any lists it should be in
                 foreach (var key in typeInheritance.Keys)
                 {
                     try
@@ -154,13 +155,6 @@ namespace UnityExplorer
         internal virtual string Internal_ProcessTypeInString(string theString, Type type)
             => theString;
 
-        //// Force loading modules
-        //public static bool LoadModule(string moduleName)
-        //    => Instance.Internal_LoadModule(moduleName);
-        //
-        //internal virtual bool Internal_LoadModule(string moduleName) 
-        //    => false;
-
         // Singleton finder
 
         public static void FindSingleton(string[] possibleNames, Type type, BindingFlags flags, List<object> instances)
@@ -225,7 +219,7 @@ namespace UnityExplorer
             return ret;
         }
 
-#endregion
+        #endregion
 
 
         #region Type and Generic Parameter implementation cache
@@ -360,7 +354,7 @@ namespace UnityExplorer
             return genericParameterInheritance[key];
         }
 
-#endregion
+        #endregion
 
 
         #region Internal MemberInfo Cache
@@ -493,7 +487,7 @@ namespace UnityExplorer
 
 
         // Temp fix for IL2CPP until interface support improves
-        
+
         // IsEnumerable 
 
         public static bool IsEnumerable(Type type) => Instance.Internal_IsEnumerable(type);
@@ -505,7 +499,7 @@ namespace UnityExplorer
 
         // TryGetEnumerator (list)
 
-        public static bool TryGetEnumerator(object list, out IEnumerator enumerator) 
+        public static bool TryGetEnumerator(object list, out IEnumerator enumerator)
             => Instance.Internal_TryGetEnumerator(list, out enumerator);
 
         protected virtual bool Internal_TryGetEnumerator(object list, out IEnumerator enumerator)
@@ -546,7 +540,7 @@ namespace UnityExplorer
             type = typeof(object);
             return false;
         }
-        
+
         // IsDictionary
 
         public static bool IsDictionary(Type type) => Instance.Internal_IsDictionary(type);
@@ -558,7 +552,7 @@ namespace UnityExplorer
 
         // TryGetEnumerator (dictionary)
 
-        public static bool TryGetDictEnumerator(object dictionary, out IEnumerator<DictionaryEntry> dictEnumerator) 
+        public static bool TryGetDictEnumerator(object dictionary, out IEnumerator<DictionaryEntry> dictEnumerator)
             => Instance.Internal_TryGetDictEnumerator(dictionary, out dictEnumerator);
 
         protected virtual bool Internal_TryGetDictEnumerator(object dictionary, out IEnumerator<DictionaryEntry> dictEnumerator)

src/Core/Runtime/Mono/MonoProvider.cs

@@ -143,7 +143,7 @@ public static class MonoExtensions
     {
         if (pi_childControlHeight == null)
             pi_childControlHeight = group.GetType().GetProperty("childControlHeight");
-        
+
         pi_childControlHeight?.SetValue(group, value, null);
     }
 

src/Core/Tests/TestClass.cs

@@ -2,11 +2,11 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 using System.Text;
 using UnityEngine;
-using UnityExplorer.UI.CacheObject.IValues;
-using System.Reflection;
 using UnityExplorer.UI;
+using UnityExplorer.CacheObject.IValues;
 #if CPP
 using UnhollowerRuntimeLib;
 using UnhollowerBaseLib;
@@ -16,7 +16,7 @@ namespace UnityExplorer.Tests
 {
     public class TestIndexer : IList<int>
     {
-        private readonly List<int> list = new List<int>() { 1,2,3,4,5 };
+        private readonly List<int> list = new List<int>() { 1, 2, 3, 4, 5 };
 
         public int Count => list.Count;
         public bool IsReadOnly => false;
@@ -133,21 +133,21 @@ namespace UnityExplorer.Tests
             }
         }
 
-        private static void TestGeneric<T>() 
+        private static void TestGeneric<T>()
         {
             ExplorerCore.Log("Test1 " + typeof(T).FullName);
         }
-        
+
         private static void TestGenericClass<T>() where T : class
         {
             ExplorerCore.Log("Test2 " + typeof(T).FullName);
         }
-        
+
         private static void TestComponent<T>() where T : Component
         {
             ExplorerCore.Log("Test3 " + typeof(T).FullName);
         }
-        
+
         private static void TestStruct<T>() where T : struct
         {
             ExplorerCore.Log("Test3 " + typeof(T).FullName);

src/Core/Utility/ParseUtility.cs

@@ -22,7 +22,7 @@ namespace UnityExplorer
         public const string NUMBER_FORMAT = "0.####";
 
         private static readonly Dictionary<int, string> numSequenceStrings = new Dictionary<int, string>();
-        
+
         // Helper for formatting float/double/decimal numbers to maximum of 4 decimal points.
         public static string FormatDecimalSequence(params object[] numbers)
         {
@@ -100,7 +100,7 @@ namespace UnityExplorer
                     obj = ReflectionUtility.GetMethodInfo(type, "Parse", ArgumentUtility.ParseArgs)
                         .Invoke(null, new object[] { input });
                 }
-                
+
                 return true;
             }
             catch (Exception ex)
@@ -148,7 +148,7 @@ namespace UnityExplorer
                 }
                 else
                     return obj.ToString();
-                
+
             }
             catch (Exception ex)
             {

src/Core/Utility/SignatureHighlighter.cs

@@ -151,10 +151,10 @@ namespace UnityExplorer
         private static string HighlightType(Type type)
         {
             string key = type.ToString();
-         
+
             if (typeToRichType.ContainsKey(key))
                 return typeToRichType[key];
-            
+
             var sb = new StringBuilder(type.Name);
 
             bool isArray = false;
@@ -212,7 +212,7 @@ namespace UnityExplorer
         {
             if (args.Length < 1)
                 return string.Empty;
-            
+
             var sb = new StringBuilder();
 
             for (int i = 0; i < args.Length; i++)
@@ -254,7 +254,7 @@ namespace UnityExplorer
                     isStatic = true;
                     return FIELD_STATIC;
                 }
-                
+
                 return FIELD_INSTANCE;
             }
             else if (memberInfo is MethodInfo mi)
@@ -264,7 +264,7 @@ namespace UnityExplorer
                     isStatic = true;
                     return METHOD_STATIC;
                 }
-                
+
                 return METHOD_INSTANCE;
             }
             else if (memberInfo is PropertyInfo pi)
@@ -274,7 +274,7 @@ namespace UnityExplorer
                     isStatic = true;
                     return PROP_STATIC;
                 }
-                
+
                 return PROP_INSTANCE;
             }
             //else if (memberInfo is EventInfo ei)
@@ -284,7 +284,7 @@ namespace UnityExplorer
             //        isStatic = true;
             //        return EVENT_STATIC;
             //    }
-               
+
             //    return EVENT_INSTANCE;
             //}
 

src/Core/Utility/ToStringUtility.cs

@@ -81,7 +81,7 @@ namespace UnityExplorer
                     sb.Append(PruneString(obj.name, 50, 1));
                     sb.Append('"');
                 }
-                
+
                 AppendRichType(sb, richType);
             }
             else if (type.FullName.StartsWith(eventSystemNamespace))
@@ -93,8 +93,8 @@ namespace UnityExplorer
             {
                 var toString = ToString(value);
 
-                if (type.IsGenericType 
-                    || toString == type.FullName 
+                if (type.IsGenericType
+                    || toString == type.FullName
                     || toString == $"{type.FullName} {type.FullName}"
                     || toString == $"Il2Cpp{type.FullName}" || type.FullName == $"Il2Cpp{toString}")
                 {

src/Core/Utility/UnityHelpers.cs

@@ -2,9 +2,11 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
+using System.Reflection;
 using System.Text;
 using UnityEngine;
 using UnityEngine.Events;
+using UnityEngine.UI;
 using Object = UnityEngine.Object;
 
 // Project-wide namespace for accessibility
@@ -107,5 +109,16 @@ namespace UnityExplorer
 
             return color;
         }
+
+        private static PropertyInfo onEndEdit;
+
+        public static UnityEvent<string> GetOnEndEdit(this InputField _this)
+        {
+            if (onEndEdit == null)
+                onEndEdit = typeof(InputField).GetProperty("onEndEdit")
+                            ?? throw new Exception("Could not get InputField.onEndEdit property!");
+
+            return onEndEdit.GetValue(_this, null).TryCast<UnityEvent<string>>();
+        }
     }
 }

src/ExplorerCore.cs

@@ -11,8 +11,8 @@ using UnityExplorer.Core.Input;
 using UnityExplorer.Core.Runtime;
 using UnityExplorer.Tests;
 using UnityExplorer.UI;
-using UnityExplorer.UI.Inspectors;
-using UnityExplorer.UI.ObjectExplorer;
+using UnityExplorer.Inspectors;
+using UnityExplorer.ObjectExplorer;
 using UnityExplorer.UI.Panels;
 
 namespace UnityExplorer
@@ -20,7 +20,7 @@ namespace UnityExplorer
     public static class ExplorerCore
     {
         public const string NAME = "UnityExplorer";
-        public const string VERSION = "4.1.3";
+        public const string VERSION = "4.1.10";
         public const string AUTHOR = "Sinai";
         public const string GUID = "com.sinai.unityexplorer";
 
@@ -103,15 +103,15 @@ namespace UnityExplorer
             RuntimeProvider.Instance.ProcessOnPostRender();
         }
 
-#region LOGGING
+        #region LOGGING
 
-        public static void Log(object message) 
+        public static void Log(object message)
             => Log(message, LogType.Log);
 
-        public static void LogWarning(object message) 
+        public static void LogWarning(object message)
             => Log(message, LogType.Warning);
 
-        public static void LogError(object message) 
+        public static void LogError(object message)
             => Log(message, LogType.Error);
 
         public static void LogUnity(object message, LogType logType)
@@ -146,6 +146,6 @@ namespace UnityExplorer
             }
         }
 
-#endregion
+        #endregion
     }
 }

src/Inspectors/GameObjectInspector.cs

@@ -6,12 +6,13 @@ using System.Text;
 using UnityEngine;
 using UnityEngine.UI;
 using UnityExplorer.Core.Input;
+using UnityExplorer.UI;
 using UnityExplorer.UI.Models;
 using UnityExplorer.UI.Panels;
 using UnityExplorer.UI.Widgets;
 using UnityExplorer.UI.Widgets.AutoComplete;
 
-namespace UnityExplorer.UI.Inspectors
+namespace UnityExplorer.Inspectors
 {
     public class GameObjectInspector : InspectorBase
     {
@@ -147,32 +148,39 @@ namespace UnityExplorer.UI.Inspectors
             var behaviours = GOTarget.GetComponents<Behaviour>();
 
             bool needRefresh = false;
-            if (comps.Length != componentEntries.Count || behaviours.Length != behaviourEntries.Count)
-            {
-                needRefresh = true;
-            }
-            else
-            {
-                foreach (var comp in comps)
-                {
-                    if (!compInstanceIDs.Contains(comp.GetInstanceID()))
-                    {
-                        needRefresh = true;
-                        break;
-                    }
-                }
 
-                if (!needRefresh)
+            int count = 0;
+            foreach (var comp in comps)
+            {
+                if (!comp)
+                    continue;
+                count++;
+                if (!compInstanceIDs.Contains(comp.GetInstanceID()))
                 {
-                    for (int i = 0; i < behaviours.Length; i++)
+                    needRefresh = true;
+                    break;
+                }
+            }
+            if (!needRefresh)
+            {
+                if (count != componentEntries.Count)
+                    needRefresh = true;
+                else
+                {
+                    count = 0;
+                    foreach (var behaviour in behaviours)
                     {
-                        var behaviour = behaviours[i];
-                        if (behaviour.enabled != behaviourEnabledStates[i])
+                        if (!behaviour)
+                            continue;
+                        if (count >= behaviourEnabledStates.Count || behaviour.enabled != behaviourEnabledStates[count])
                         {
                             needRefresh = true;
                             break;
                         }
+                        count++;
                     }
+                    if (!needRefresh && count != behaviourEntries.Count)
+                        needRefresh = true;
                 }
             }
 
@@ -181,9 +189,9 @@ namespace UnityExplorer.UI.Inspectors
 
             componentEntries.Clear();
             compInstanceIDs.Clear();
-
             foreach (var comp in comps)
             {
+                if (!comp) continue;
                 componentEntries.Add(comp);
                 compInstanceIDs.Add(comp.GetInstanceID());
             }
@@ -192,6 +200,7 @@ namespace UnityExplorer.UI.Inspectors
             behaviourEnabledStates.Clear();
             foreach (var behaviour in behaviours)
             {
+                if (!behaviour) continue;
                 behaviourEntries.Add(behaviour);
                 behaviourEnabledStates.Add(behaviour.enabled);
             }
@@ -208,10 +217,10 @@ namespace UnityExplorer.UI.Inspectors
 
             TransformTree.RefreshData(true, false);
         }
-        
+
         private void OnAddComponentClicked(string input)
         {
-            if (ReflectionUtility.AllTypes.TryGetValue(input, out Type type))
+            if (ReflectionUtility.GetTypeByName(input) is Type type)
             {
                 try
                 {
@@ -234,10 +243,10 @@ namespace UnityExplorer.UI.Inspectors
 
         public override GameObject CreateContent(GameObject parent)
         {
-            UIRoot = UIFactory.CreateVerticalGroup(parent, "GameObjectInspector", true, false, true, true, 5, 
+            UIRoot = UIFactory.CreateVerticalGroup(parent, "GameObjectInspector", true, false, true, true, 5,
                 new Vector4(4, 4, 4, 4), new Color(0.065f, 0.065f, 0.065f));
 
-            var scrollObj = UIFactory.CreateScrollView(UIRoot, "GameObjectInspector", out Content, out var scrollbar, 
+            var scrollObj = UIFactory.CreateScrollView(UIRoot, "GameObjectInspector", out Content, out var scrollbar,
                 new Color(0.065f, 0.065f, 0.065f));
             UIFactory.SetLayoutElement(scrollObj, minHeight: 250, preferredHeight: 300, flexibleHeight: 0, flexibleWidth: 9999);
 
@@ -245,7 +254,7 @@ namespace UnityExplorer.UI.Inspectors
 
             // Construct GO Controls
             GOControls = new GameObjectControls(this);
-            
+
             ConstructLists();
 
             return UIRoot;

src/Inspectors/GameObjectWidgets/ComponentCell.cs

@@ -4,9 +4,10 @@ using System.Linq;
 using System.Text;
 using UnityEngine;
 using UnityEngine.UI;
+using UnityExplorer.UI;
 using UnityExplorer.UI.Widgets;
 
-namespace UnityExplorer.UI.Inspectors
+namespace UnityExplorer.Inspectors
 {
     public class ComponentCell : ButtonCell
     {

src/Inspectors/GameObjectWidgets/ComponentList.cs

@@ -5,13 +5,13 @@ using System.Text;
 using UnityEngine;
 using UnityExplorer.UI.Widgets;
 
-namespace UnityExplorer.UI.Inspectors
+namespace UnityExplorer.Inspectors
 {
     public class ComponentList : ButtonListHandler<Component, ComponentCell>
     {
         public GameObjectInspector Parent;
 
-        public ComponentList(ScrollPool<ComponentCell> scrollPool, Func<List<Component>> getEntriesMethod) 
+        public ComponentList(ScrollPool<ComponentCell> scrollPool, Func<List<Component>> getEntriesMethod)
             : base(scrollPool, getEntriesMethod, null, null, null)
         {
             base.SetICell = SetComponentCell;
@@ -112,7 +112,7 @@ namespace UnityExplorer.UI.Inspectors
                 cell.BehaviourToggle.interactable = false;
                 cell.BehaviourToggle.Set(true, false);
                 //RuntimeProvider.Instance.SetColorBlock(cell.BehaviourToggle,)
-                cell.BehaviourToggle.graphic.color = new Color(0.2f, 0.2f, 0.2f); 
+                cell.BehaviourToggle.graphic.color = new Color(0.2f, 0.2f, 0.2f);
             }
 
             // if component is the first index it must be the transform, dont show Destroy button for it.

src/Inspectors/GameObjectWidgets/GameObjectControls.cs

@@ -5,8 +5,9 @@ using System.Text;
 using UnityEngine;
 using UnityEngine.UI;
 using UnityExplorer.Core.Input;
+using UnityExplorer.UI;
 
-namespace UnityExplorer.UI.Inspectors
+namespace UnityExplorer.Inspectors
 {
     public class GameObjectControls
     {
@@ -186,7 +187,7 @@ namespace UnityExplorer.UI.Inspectors
                 if (parentToSet)
                     DoSetParent(parentToSet);
                 else
-                { 
+                {
                     ExplorerCore.LogWarning($"Could not find any GameObject name or path '{input}'!");
                     UpdateGameObjectInfo(false, true);
                 }
@@ -234,7 +235,7 @@ namespace UnityExplorer.UI.Inspectors
 
         private void OnExploreButtonClicked()
         {
-            var panel = UIManager.GetPanel<Panels.ObjectExplorerPanel>(UIManager.Panels.ObjectExplorer);
+            var panel = UIManager.GetPanel<UI.Panels.ObjectExplorerPanel>(UIManager.Panels.ObjectExplorer);
             panel.SceneExplorer.JumpToTransform(this.Parent.GOTarget.transform);
         }
 
@@ -442,7 +443,7 @@ namespace UnityExplorer.UI.Inspectors
 
         private void ConstructTopInfo()
         {
-            var topInfoHolder = UIFactory.CreateVerticalGroup(Parent.Content, "TopInfoHolder", false, false, true, true, 3, 
+            var topInfoHolder = UIFactory.CreateVerticalGroup(Parent.Content, "TopInfoHolder", false, false, true, true, 3,
                 new Vector4(3, 3, 3, 3), new Color(0.1f, 0.1f, 0.1f), TextAnchor.MiddleLeft);
             UIFactory.SetLayoutElement(topInfoHolder, minHeight: 100, flexibleWidth: 9999);
             topInfoHolder.AddComponent<ContentSizeFitter>().verticalFit = ContentSizeFitter.FitMode.PreferredSize;
@@ -468,7 +469,7 @@ namespace UnityExplorer.UI.Inspectors
             //UIFactory.SetLayoutElement(pathApplyBtn.Component.gameObject, minHeight: 25, minWidth: 120);
             //pathApplyBtn.OnClick += () => { OnPathEndEdit(PathInput.Text); };
 
-            PathInput.Component.onEndEdit.AddListener((string val) => { OnPathEndEdit(val); });
+            PathInput.Component.GetOnEndEdit().AddListener((string val) => { OnPathEndEdit(val); });
 
             // Title and update row
 
@@ -484,7 +485,7 @@ namespace UnityExplorer.UI.Inspectors
             NameInput = UIFactory.CreateInputField(titleRow, "NameInput", "untitled");
             UIFactory.SetLayoutElement(NameInput.Component.gameObject, minHeight: 30, minWidth: 100, flexibleWidth: 9999);
             NameInput.Component.textComponent.fontSize = 15;
-            NameInput.Component.onEndEdit.AddListener((string val) => { OnNameEndEdit(val); });
+            NameInput.Component.GetOnEndEdit().AddListener((string val) => { OnNameEndEdit(val); });
 
             // second row (toggles, instanceID, tag, buttons)
 
@@ -521,7 +522,7 @@ namespace UnityExplorer.UI.Inspectors
             TagInput = UIFactory.CreateInputField(secondRow, "TagInput", "none");
             UIFactory.SetLayoutElement(TagInput.Component.gameObject, minHeight: 25, minWidth: 100, flexibleWidth: 999);
             TagInput.Component.textComponent.color = Color.white;
-            TagInput.Component.onEndEdit.AddListener((string val) => { OnTagEndEdit(val); });
+            TagInput.Component.GetOnEndEdit().AddListener((string val) => { OnTagEndEdit(val); });
 
             // Instantiate
             var instantiateBtn = UIFactory.CreateButton(secondRow, "InstantiateBtn", "Instantiate", new Color(0.2f, 0.2f, 0.2f));
@@ -575,7 +576,7 @@ namespace UnityExplorer.UI.Inspectors
             var flagsDrop = UIFactory.CreateDropdown(thirdrow, out FlagsDropdown, "None", 14, OnFlagsDropdownChanged);
             FlagsDropdown.captionText.color = SignatureHighlighter.EnumGreen;
             UIFactory.SetLayoutElement(flagsDrop, minHeight: 25, minWidth: 135, flexibleWidth: 999);
-            if (hideFlagsValues == null) 
+            if (hideFlagsValues == null)
                 GetHideFlagNames();
             foreach (var name in hideFlagsValues.Keys)
                 FlagsDropdown.options.Add(new Dropdown.OptionData(name));
@@ -644,7 +645,7 @@ namespace UnityExplorer.UI.Inspectors
             var inputField = UIFactory.CreateInputField(rowObj, "InputField", "...");
             UIFactory.SetLayoutElement(inputField.Component.gameObject, minHeight: 25, minWidth: 100, flexibleWidth: 999);
 
-            inputField.Component.onEndEdit.AddListener((string value) => { OnTransformInputEndEdit(type, value); });
+            inputField.Component.GetOnEndEdit().AddListener((string value) => { OnTransformInputEndEdit(type, value); });
 
             var control = new TransformControl(type, inputField);
 

src/Inspectors/InspectUnderMouse.cs

@@ -11,7 +11,7 @@ using UnityExplorer.Core.Runtime;
 using UnityExplorer.UI;
 using UnityExplorer.UI.Panels;
 
-namespace UnityExplorer.UI.Inspectors
+namespace UnityExplorer.Inspectors
 {
     public enum MouseInspectMode
     {
@@ -67,9 +67,13 @@ namespace UnityExplorer.UI.Inspectors
         public void StartInspect(MouseInspectMode mode)
         {
             MainCamera = Camera.main;
-            if (!MainCamera)
-                return; 
             
+            if (!MainCamera && mode == MouseInspectMode.World)
+            {
+                ExplorerCore.LogWarning("No MainCamera found! Cannot inspect world!");
+                return;
+            }
+
             PanelDragger.ForceEnd();
 
             Mode = mode;
@@ -95,8 +99,8 @@ namespace UnityExplorer.UI.Inspectors
             Inspecting = false;
 
             UIManager.NavBarRect.gameObject.SetActive(true);
-            UIManager.PanelHolder.SetActive(true); 
-            
+            UIManager.PanelHolder.SetActive(true);
+
             var drop = UIManager.MouseInspectDropdown;
             if (drop.transform.Find("Dropdown List") is Transform list)
                 drop.DestroyDropdownList(list.gameObject);

src/Inspectors/InspectorBase.cs

@@ -4,10 +4,11 @@ using System.Linq;
 using System.Text;
 using UnityEngine;
 using UnityEngine.UI;
+using UnityExplorer.UI;
 using UnityExplorer.UI.Models;
 using UnityExplorer.UI.Panels;
 
-namespace UnityExplorer.UI.Inspectors
+namespace UnityExplorer.Inspectors
 {
     public abstract class InspectorBase : IPooledObject
     {

src/Inspectors/InspectorManager.cs

@@ -5,8 +5,8 @@ using System.Text;
 using UnityEngine;
 using UnityEngine.UI;
 using UnityExplorer.UI;
-using UnityExplorer.UI.CacheObject;
-using UnityExplorer.UI.Inspectors;
+using UnityExplorer.CacheObject;
+using UnityExplorer.Inspectors;
 using UnityExplorer.UI.Models;
 using UnityExplorer.UI.Panels;
 
@@ -87,7 +87,7 @@ namespace UnityExplorer
             }
         }
 
-        private static void CreateInspector<T>(object target, bool staticReflection = false, 
+        private static void CreateInspector<T>(object target, bool staticReflection = false,
             CacheObjectBase sourceCache = null) where T : InspectorBase
         {
             var inspector = Pool<T>.Borrow();

src/Inspectors/InspectorTab.cs

@@ -4,10 +4,11 @@ using System.Linq;
 using System.Text;
 using UnityEngine;
 using UnityEngine.UI;
+using UnityExplorer.UI;
 using UnityExplorer.UI.Models;
 using UnityExplorer.UI.Widgets;
 
-namespace UnityExplorer.UI.Inspectors
+namespace UnityExplorer.Inspectors
 {
     public class InspectorTab : IPooledObject
     {
@@ -33,7 +34,7 @@ namespace UnityExplorer.UI.Inspectors
 
         public GameObject CreateContent(GameObject parent)
         {
-            UIRoot = UIFactory.CreateHorizontalGroup(parent, "TabObject", false, true, true, true, 0, 
+            UIRoot = UIFactory.CreateHorizontalGroup(parent, "TabObject", false, true, true, true, 0,
                 default, new Color(0.13f, 0.13f, 0.13f), childAlignment: TextAnchor.MiddleLeft);
             UIFactory.SetLayoutElement(UIRoot, minWidth: 200, flexibleWidth: 0);
             UIRoot.AddComponent<Mask>();

src/Inspectors/ReflectionInspector.cs

@@ -10,12 +10,13 @@ using UnityEngine;
 using UnityEngine.UI;
 using UnityExplorer.Core.Config;
 using UnityExplorer.Core.Runtime;
-using UnityExplorer.UI.CacheObject;
-using UnityExplorer.UI.CacheObject.Views;
+using UnityExplorer.CacheObject;
+using UnityExplorer.CacheObject.Views;
 using UnityExplorer.UI.Panels;
 using UnityExplorer.UI.Widgets;
+using UnityExplorer.UI;
 
-namespace UnityExplorer.UI.Inspectors
+namespace UnityExplorer.Inspectors
 {
     public class ReflectionInspector : InspectorBase, ICellPoolDataSource<CacheMemberCell>, ICacheObjectController
     {
@@ -54,6 +55,7 @@ namespace UnityExplorer.UI.Inspectors
 
         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 Dictionary<BindingFlags, ButtonRef> scopeFilterButtons = new Dictionary<BindingFlags, ButtonRef>();
         private readonly List<Toggle> memberTypeToggles = new List<Toggle>();
         private InputFieldRef filterInputField;
@@ -73,7 +75,6 @@ namespace UnityExplorer.UI.Inspectors
         private IEnumerator InitCoroutine()
         {
             yield return null;
-
             LayoutRebuilder.ForceRebuildLayoutImmediate(InspectorPanel.Instance.ContentRect);
         }
 
@@ -142,7 +143,7 @@ namespace UnityExplorer.UI.Inspectors
             // reset filters
 
             this.filterInputField.Text = "";
-            
+
             SetFilter("", StaticOnly ? BindingFlags.Static : BindingFlags.Instance);
             scopeFilterButtons[BindingFlags.Default].Component.gameObject.SetActive(!StaticOnly);
             scopeFilterButtons[BindingFlags.Instance].Component.gameObject.SetActive(!StaticOnly);
@@ -307,11 +308,8 @@ namespace UnityExplorer.UI.Inspectors
 
         private void CalculateLayouts()
         {
-            // Calculate sizes
-            LeftGroupWidth = (int)Math.Max(200, (0.4f * InspectorManager.PanelWidth) - 5);// Math.Min(450f, 0.4f * InspectorManager.PanelWidth - 5));
+            LeftGroupWidth = (int)Math.Max(200, (0.4f * InspectorManager.PanelWidth) - 5);
             RightGroupWidth = (int)Math.Max(200, InspectorManager.PanelWidth - LeftGroupWidth - 65);
-
-            //memberTitleLayout.minWidth = LeftGroupWidth;
         }
 
         private void SetCellLayout(CacheObjectCell cell)
@@ -342,7 +340,7 @@ namespace UnityExplorer.UI.Inspectors
 
             ConstructUnityObjectRow();
 
-            mainContentHolder = UIFactory.CreateVerticalGroup(UIRoot, "MemberHolder", false, false, true, true, 5, new Vector4(2,2,2,2),
+            mainContentHolder = UIFactory.CreateVerticalGroup(UIRoot, "MemberHolder", false, false, true, true, 5, new Vector4(2, 2, 2, 2),
                 new Color(0.12f, 0.12f, 0.12f));
             UIFactory.SetLayoutElement(mainContentHolder, flexibleWidth: 9999, flexibleHeight: 9999);
 
@@ -352,7 +350,7 @@ namespace UnityExplorer.UI.Inspectors
 
             // Member scroll pool
 
-            var memberBorder = UIFactory.CreateVerticalGroup(mainContentHolder, "ScrollPoolHolder", false, false, true, true, padding: new Vector4(2,2,2,2),
+            var memberBorder = UIFactory.CreateVerticalGroup(mainContentHolder, "ScrollPoolHolder", false, false, true, true, padding: new Vector4(2, 2, 2, 2),
                 bgColor: new Color(0.05f, 0.05f, 0.05f));
             UIFactory.SetLayoutElement(memberBorder, flexibleWidth: 9999, flexibleHeight: 9999);
 
@@ -546,7 +544,7 @@ namespace UnityExplorer.UI.Inspectors
                 textureButton.ButtonText.text = "Hide Texture";
             }
         }
-        
+
         // UI construction
 
         private void ConstructUnityObjectRow()

src/Loader/BIE/BepInExConfigHandler.cs

@@ -21,13 +21,9 @@ namespace UnityExplorer.Loader.BIE
 
         public override void RegisterConfigElement<T>(ConfigElement<T> config)
         {
-            object[] tags = null;
-            if (config.IsInternal)
-                tags = new[] { "Advanced" };
+            var entry = Config.Bind(CTG_NAME, config.Name, config.Value, config.Description);
 
-            var entry = Config.Bind(CTG_NAME, config.Name, config.Value, new ConfigDescription(config.Description, null, tags));
-
-            entry.SettingChanged += (object o, EventArgs e) => 
+            entry.SettingChanged += (object o, EventArgs e) =>
             {
                 config.Value = entry.Value;
             };

src/Loader/BIE/ExplorerBepInPlugin.cs

@@ -7,12 +7,12 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text;
-using UnityExplorer.Core.Config;
-using UnityExplorer.Loader.BIE;
 using UnityEngine;
-using UnityExplorer.Core;
 using UnityEngine.EventSystems;
+using UnityExplorer.Core;
+using UnityExplorer.Core.Config;
 using UnityExplorer.Core.Input;
+using UnityExplorer.Loader.BIE;
 #if CPP
 using BepInEx.IL2CPP;
 using UnhollowerRuntimeLib;
@@ -46,11 +46,10 @@ namespace UnityExplorer
         private static readonly Harmony s_harmony = new Harmony(ExplorerCore.GUID);
 
         public string ExplorerFolder => Path.Combine(Paths.PluginPath, ExplorerCore.NAME);
-        public string ConfigFolder => Path.Combine(Paths.ConfigPath, ExplorerCore.NAME);
 
         public Action<object> OnLogMessage => LogSource.LogMessage;
         public Action<object> OnLogWarning => LogSource.LogWarning;
-        public Action<object> OnLogError   => LogSource.LogError;
+        public Action<object> OnLogError => LogSource.LogError;
 
         // Init common to Mono and Il2Cpp
         internal void UniversalInit()

src/Loader/IExplorerLoader.cs

@@ -10,7 +10,6 @@ namespace UnityExplorer
     {
         string ExplorerFolder { get; }
 
-        string ConfigFolder { get; }
         ConfigHandler ConfigHandler { get; }
 
         Action<object> OnLogMessage { get; }

src/Loader/ML/ExplorerMelonMod.cs

@@ -27,7 +27,6 @@ namespace UnityExplorer
         public static ExplorerMelonMod Instance;
 
         public string ExplorerFolder => Path.Combine("Mods", ExplorerCore.NAME);
-        public string ConfigFolder => ExplorerFolder;
 
         public ConfigHandler ConfigHandler => _configHandler;
         public MelonLoaderConfigHandler _configHandler;

src/Loader/STANDALONE/ExplorerStandalone.cs

@@ -76,8 +76,6 @@ namespace UnityExplorer
         }
         private static string s_explorerFolder;
         
-        public string ConfigFolder => ExplorerFolder;
-
         Action<object> IExplorerLoader.OnLogMessage => (object log) => { OnLog?.Invoke(log?.ToString() ?? "", LogType.Log); };
         Action<object> IExplorerLoader.OnLogWarning => (object log) => { OnLog?.Invoke(log?.ToString() ?? "", LogType.Warning); };
         Action<object> IExplorerLoader.OnLogError   => (object log) => { OnLog?.Invoke(log?.ToString() ?? "", LogType.Error); };

src/Loader/STANDALONE/StandaloneConfigHandler.cs

@@ -13,11 +13,11 @@ namespace UnityExplorer.Loader.STANDALONE
     public class StandaloneConfigHandler : 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.ConfigFolder, "config.ini");
+            CONFIG_PATH = Path.Combine(ExplorerCore.Loader.ExplorerFolder, "config.ini");
             _parser = new IniDataParser();
             _parser.Configuration.CommentString = "#";
         }
@@ -49,10 +49,10 @@ namespace UnityExplorer.Loader.STANDALONE
         {
             try
             {
-                if (!File.Exists(INI_PATH))
+                if (!File.Exists(CONFIG_PATH))
                     return false;
 
-                string ini = File.ReadAllText(INI_PATH);
+                string ini = File.ReadAllText(CONFIG_PATH);
 
                 var data = _parser.Parse(ini);
 
@@ -97,10 +97,10 @@ namespace UnityExplorer.Loader.STANDALONE
             foreach (var entry in ConfigManager.ConfigElements)
                 sec.AddKey(entry.Key, entry.Value.BoxedValue.ToString());
 
-            if (!Directory.Exists(ExplorerCore.Loader.ConfigFolder))
-                Directory.CreateDirectory(ExplorerCore.Loader.ConfigFolder);
+            if (!Directory.Exists(ExplorerCore.Loader.ExplorerFolder))
+                Directory.CreateDirectory(ExplorerCore.Loader.ExplorerFolder);
 
-            File.WriteAllText(INI_PATH, data.ToString());
+            File.WriteAllText(CONFIG_PATH, data.ToString());
         }
     }
 }

src/ObjectExplorer/ObjectSearch.cs

@@ -4,12 +4,13 @@ using System.Linq;
 using System.Text;
 using UnityEngine;
 using UnityEngine.UI;
+using UnityExplorer.UI;
 using UnityExplorer.UI.Models;
 using UnityExplorer.UI.Panels;
 using UnityExplorer.UI.Widgets;
 using UnityExplorer.UI.Widgets.AutoComplete;
 
-namespace UnityExplorer.UI.ObjectExplorer
+namespace UnityExplorer.ObjectExplorer
 {
     public class ObjectSearch : UIModel
     {
@@ -25,7 +26,7 @@ namespace UnityExplorer.UI.ObjectExplorer
         private ChildFilter m_childFilter = ChildFilter.Any;
         private string desiredTypeInput;
         private string lastCheckedTypeInput;
-        private bool lastTypeCanHaveGO; 
+        private bool lastTypeCanHaveGO;
 
         public ButtonListHandler<object, ButtonCell> dataHandler;
 
@@ -52,8 +53,8 @@ namespace UnityExplorer.UI.ObjectExplorer
 
             if (m_context == SearchContext.Singleton)
                 currentResults = SearchProvider.SingletonSearch(nameInputField.Text);
-            else if (m_context == SearchContext.StaticClass)
-                currentResults = SearchProvider.StaticClassSearch(nameInputField.Text);
+            else if (m_context == SearchContext.Class)
+                currentResults = SearchProvider.ClassSearch(nameInputField.Text);
             else
             {
                 string compType = "";
@@ -76,7 +77,7 @@ namespace UnityExplorer.UI.ObjectExplorer
                 lastCheckedTypeInput = desiredTypeInput;
 
                 //var type = ReflectionUtility.GetTypeByName(desiredTypeInput);
-                if (ReflectionUtility.AllTypes.TryGetValue(desiredTypeInput, out var cachedType))
+                if (ReflectionUtility.GetTypeByName(desiredTypeInput) is Type cachedType)
                 {
                     var type = cachedType;
                     lastTypeCanHaveGO = typeof(Component).IsAssignableFrom(type) || type == typeof(GameObject);
@@ -129,8 +130,11 @@ namespace UnityExplorer.UI.ObjectExplorer
             if (!cachedCellTexts.ContainsKey(index))
             {
                 string text;
-                if (m_context == SearchContext.StaticClass)
-                    text = SignatureHighlighter.Parse(currentResults[index] as Type, true);
+                if (m_context == SearchContext.Class)
+                {
+                    var type = currentResults[index] as Type;
+                    text = $"{SignatureHighlighter.Parse(type, true)} <color=grey><i>({type.Assembly.GetName().Name})</i></color>";
+                }
                 else
                     text = ToStringUtility.ToStringWithType(currentResults[index], currentResults[index]?.GetActualType());
 
@@ -142,7 +146,7 @@ namespace UnityExplorer.UI.ObjectExplorer
 
         private void OnCellClicked(int dataIndex)
         {
-            if (m_context == SearchContext.StaticClass)
+            if (m_context == SearchContext.Class)
                 InspectorManager.Inspect(currentResults[dataIndex] as Type);
             else
                 InspectorManager.Inspect(currentResults[dataIndex]);
@@ -241,7 +245,7 @@ namespace UnityExplorer.UI.ObjectExplorer
             // RESULTS SCROLL POOL
 
             dataHandler = new ButtonListHandler<object, ButtonCell>(resultsScrollPool, GetEntries, SetCell, ShouldDisplayCell, OnCellClicked);
-            resultsScrollPool = UIFactory.CreateScrollPool<ButtonCell>(uiRoot, "ResultsList", out GameObject scrollObj, 
+            resultsScrollPool = UIFactory.CreateScrollPool<ButtonCell>(uiRoot, "ResultsList", out GameObject scrollObj,
                 out GameObject scrollContent);
 
             resultsScrollPool.Initialize(dataHandler);

src/ObjectExplorer/SceneExplorer.cs

@@ -8,11 +8,12 @@ using UnityEngine;
 using UnityEngine.SceneManagement;
 using UnityEngine.UI;
 using UnityExplorer.Core;
+using UnityExplorer.UI;
 using UnityExplorer.UI.Models;
 using UnityExplorer.UI.Panels;
 using UnityExplorer.UI.Widgets;
 
-namespace UnityExplorer.UI.ObjectExplorer
+namespace UnityExplorer.ObjectExplorer
 {
     public class SceneExplorer : UIModel
     {
@@ -201,7 +202,7 @@ namespace UnityExplorer.UI.ObjectExplorer
             //Filter input field
             var inputField = UIFactory.CreateInputField(filterRow, "FilterInput", "Search...");
             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), 
+            RuntimeProvider.Instance.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;

src/ObjectExplorer/SceneHandler.cs

@@ -6,14 +6,14 @@ using System.Text;
 using UnityEngine;
 using UnityEngine.SceneManagement;
 
-namespace UnityExplorer.UI.ObjectExplorer
+namespace UnityExplorer.ObjectExplorer
 {
     public static class SceneHandler
     {
         /// <summary>
         /// The currently inspected Scene.
         /// </summary>
-        public static Scene? SelectedScene 
+        public static Scene? SelectedScene
         {
             get => selectedScene;
             internal set
@@ -93,7 +93,7 @@ namespace UnityExplorer.UI.ObjectExplorer
                 Type sceneUtil = ReflectionUtility.GetTypeByName("UnityEngine.SceneManagement.SceneUtility");
                 if (sceneUtil == null)
                     throw new Exception("This version of Unity does not ship with the 'SceneUtility' class, or it was not unstripped.");
-                
+
                 var method = sceneUtil.GetMethod("GetScenePathByBuildIndex", ReflectionUtility.FLAGS);
                 int sceneCount = SceneManager.sceneCountInBuildSettings;
                 for (int i = 0; i < sceneCount; i++)

src/ObjectExplorer/SearchProvider.cs

@@ -8,14 +8,13 @@ using UnityEngine.SceneManagement;
 using UnityExplorer.Core;
 using UnityExplorer.Core.Runtime;
 
-namespace UnityExplorer.UI.ObjectExplorer
+namespace UnityExplorer.ObjectExplorer
 {
     public enum SearchContext
     {
         UnityObject,
-        // GameObject,
         Singleton,
-        StaticClass
+        Class
     }
 
     public enum ChildFilter
@@ -35,7 +34,7 @@ namespace UnityExplorer.UI.ObjectExplorer
 
     public static class SearchProvider
     {
-       
+
         private static bool Filter(Scene scene, SceneFilter filter)
         {
             switch (filter)
@@ -53,7 +52,7 @@ namespace UnityExplorer.UI.ObjectExplorer
             }
         }
 
-        internal static List<object> UnityObjectSearch(string input, string customTypeInput, SearchContext context, 
+        internal static List<object> UnityObjectSearch(string input, string customTypeInput, SearchContext context,
             ChildFilter childFilter, SceneFilter sceneFilter)
         {
             var results = new List<object>();
@@ -134,7 +133,7 @@ namespace UnityExplorer.UI.ObjectExplorer
             return results;
         }
 
-        internal static List<object> StaticClassSearch(string input)
+        internal static List<object> ClassSearch(string input)
         {
             var list = new List<object>();
 
@@ -144,11 +143,10 @@ namespace UnityExplorer.UI.ObjectExplorer
 
             foreach (var asm in AppDomain.CurrentDomain.GetAssemblies())
             {
-                foreach (var type in asm.TryGetTypes().Where(it => it.IsSealed && it.IsAbstract))
+                foreach (var type in asm.TryGetTypes())
                 {
                     if (!string.IsNullOrEmpty(nameFilter) && !type.FullName.ContainsIgnoreCase(nameFilter))
                         continue;
-
                     list.Add(type);
                 }
             }

src/UI/Models/InputFieldRef.cs

@@ -29,8 +29,8 @@ namespace UnityExplorer.UI
             }
         }
 
-        public InputFieldRef(InputField component) 
-        { 
+        public InputFieldRef(InputField component)
+        {
             this.Component = component;
             Rect = component.GetComponent<RectTransform>();
             PlaceholderText = component.placeholder.TryCast<Text>();

src/UI/Panels/CSConsolePanel.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -6,7 +7,7 @@ using UnityEngine;
 using UnityEngine.EventSystems;
 using UnityEngine.UI;
 using UnityExplorer.Core.Config;
-using UnityExplorer.UI.CSConsole;
+using UnityExplorer.CSConsole;
 using UnityExplorer.UI.Widgets;
 
 namespace UnityExplorer.UI.Panels
@@ -18,10 +19,11 @@ namespace UnityExplorer.UI.Panels
         public override int MinWidth => 750;
         public override int MinHeight => 300;
 
-        public InputFieldScroller InputScroll { get; private set; }
-        public InputFieldRef Input => InputScroll.InputField;
+        public InputFieldScroller InputScroller { get; private set; }
+        public InputFieldRef Input => InputScroller.InputField;
         public Text InputText { get; private set; }
         public Text HighlightText { get; private set; }
+        public Text LineNumberText { get; private set; }
 
         public Dropdown HelpDropdown { get; private set; }
 
@@ -33,6 +35,7 @@ namespace UnityExplorer.UI.Panels
         public Action<bool> OnCtrlRToggled;
         public Action<bool> OnSuggestionsToggled;
         public Action<bool> OnAutoIndentToggled;
+        public Action OnPanelResized;
 
         private void InvokeOnValueChanged(string value)
         {
@@ -60,6 +63,11 @@ namespace UnityExplorer.UI.Panels
 
         // UI Construction
 
+        public override void OnFinishResize(RectTransform panel)
+        {
+            OnPanelResized?.Invoke();
+        }
+
         protected internal override void DoSetDefaultPosAndAnchors()
         {
             Rect.localPosition = Vector2.zero;
@@ -121,19 +129,53 @@ namespace UnityExplorer.UI.Panels
 
             // Console Input
 
+            var inputArea = UIFactory.CreateUIObject("InputGroup", content);
+            UIFactory.SetLayoutElement(inputArea, flexibleWidth: 9999, flexibleHeight: 9999);
+            UIFactory.SetLayoutGroup<HorizontalLayoutGroup>(inputArea, false, true, true, true);
+            inputArea.AddComponent<Image>().color = Color.white;
+            inputArea.AddComponent<Mask>().showMaskGraphic = false;
+
+            // line numbers
+
+            var linesHolder = UIFactory.CreateUIObject("LinesHolder", inputArea);
+            var linesRect = linesHolder.GetComponent<RectTransform>();
+            linesRect.pivot = new Vector2(0, 1);
+            linesRect.anchorMin = new Vector2(0, 0);
+            linesRect.anchorMax = new Vector2(0, 1);
+            linesRect.sizeDelta = new Vector2(0, 305000);
+            linesRect.SetInsetAndSizeFromParentEdge(RectTransform.Edge.Left, 0, 50);
+            linesHolder.AddComponent<Image>().color = new Color(0.05f, 0.05f, 0.05f);
+            UIFactory.SetLayoutGroup<VerticalLayoutGroup>(linesHolder, true, true, true, true);
+
+            LineNumberText = UIFactory.CreateLabel(linesHolder, "LineNumbers", "1", TextAnchor.UpperCenter, Color.grey, fontSize: 16);
+            LineNumberText.font = UIManager.ConsoleFont;
+
+            // input field
+
             int fontSize = 16;
 
-            var inputObj = UIFactory.CreateScrollInputField(this.content, "ConsoleInput", ConsoleController.STARTUP_TEXT, out var inputScroller, fontSize);
-            InputScroll = inputScroller;
+            var inputObj = UIFactory.CreateScrollInputField(inputArea, "ConsoleInput", ConsoleController.STARTUP_TEXT, 
+                out var inputScroller, fontSize);
+            InputScroller = inputScroller;
             ConsoleController.defaultInputFieldAlpha = Input.Component.selectionColor.a;
             Input.OnValueChanged += InvokeOnValueChanged;
 
+            // move line number text with input field
+            linesRect.transform.SetParent(inputObj.transform.Find("Viewport"), false);
+            inputScroller.Slider.Scrollbar.onValueChanged.AddListener((float val) => { SetLinesPosition(); });
+            inputScroller.Slider.Slider.onValueChanged.AddListener((float val) => { SetLinesPosition(); });
+            void SetLinesPosition()
+            {
+                linesRect.anchoredPosition = new Vector2(linesRect.anchoredPosition.x, inputScroller.ContentRect.anchoredPosition.y);
+                //SetInputLayout();
+            }
+
             InputText = Input.Component.textComponent;
             InputText.supportRichText = false;
-            Input.PlaceholderText.fontSize = fontSize;
             InputText.color = Color.clear;
             Input.Component.customCaretColor = true;
             Input.Component.caretColor = Color.white;
+            Input.PlaceholderText.fontSize = fontSize;
 
             // Lexer highlight text overlay
             var highlightTextObj = UIFactory.CreateUIObject("HighlightText", InputText.gameObject);
@@ -154,7 +196,19 @@ namespace UnityExplorer.UI.Panels
             Input.PlaceholderText.font = UIManager.ConsoleFont;
             HighlightText.font = UIManager.ConsoleFont;
 
+            RuntimeProvider.Instance.StartCoroutine(DelayedLayoutSetup());
+        }
 
+        private IEnumerator DelayedLayoutSetup()
+        {
+            yield return null;
+            SetInputLayout();
+        }
+
+        public void SetInputLayout()
+        {
+            Input.Rect.offsetMin = new Vector2(52, Input.Rect.offsetMin.y);
+            Input.Rect.offsetMax = new Vector2(2, Input.Rect.offsetMax.y);
         }
     }
 }

src/UI/Panels/InspectorPanel.cs

@@ -6,7 +6,7 @@ using System.Text;
 using UnityEngine;
 using UnityEngine.UI;
 using UnityExplorer.Core.Config;
-using UnityExplorer.UI.Inspectors;
+using UnityExplorer.Inspectors;
 
 namespace UnityExplorer.UI.Panels
 {
@@ -61,7 +61,7 @@ namespace UnityExplorer.UI.Panels
         {
             // add close all button to titlebar
 
-            var closeAllBtn = UIFactory.CreateButton(this.titleBar.transform.Find("CloseHolder").gameObject, "CloseAllBtn", "Close All", 
+            var closeAllBtn = UIFactory.CreateButton(this.titleBar.transform.Find("CloseHolder").gameObject, "CloseAllBtn", "Close All",
                 new Color(0.3f, 0.2f, 0.2f));
             UIFactory.SetLayoutElement(closeAllBtn.Component.gameObject, minHeight: 25, minWidth: 80);
             closeAllBtn.Component.transform.SetSiblingIndex(closeAllBtn.Component.transform.GetSiblingIndex() - 1);

src/UI/Panels/ObjectExplorerPanel.cs

@@ -11,7 +11,7 @@ using UnityEngine.UI;
 using UnityExplorer.Core;
 using UnityExplorer.Core.Config;
 using UnityExplorer.UI.Models;
-using UnityExplorer.UI.ObjectExplorer;
+using UnityExplorer.ObjectExplorer;
 using UnityExplorer.UI.Widgets;
 
 namespace UnityExplorer.UI.Panels

src/UI/Panels/OptionsPanel.cs

@@ -5,8 +5,8 @@ using System.Text;
 using UnityEngine;
 using UnityEngine.UI;
 using UnityExplorer.Core.Config;
-using UnityExplorer.UI.CacheObject;
-using UnityExplorer.UI.CacheObject.Views;
+using UnityExplorer.CacheObject;
+using UnityExplorer.CacheObject.Views;
 using UnityExplorer.UI.Widgets;
 
 namespace UnityExplorer.UI.Panels

src/UI/Panels/PanelDragger.cs

@@ -1,17 +1,17 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
 using UnityEngine;
 using UnityEngine.UI;
 using UnityExplorer.Core.Input;
-using System.IO;
-using System.Diagnostics;
 using UnityExplorer.UI.Models;
-using System.Linq;
 using UnityExplorer.UI.Widgets.AutoComplete;
 
 namespace UnityExplorer.UI.Panels
 {
-    public class PanelDragger 
+    public class PanelDragger
     {
         #region Static
 
@@ -23,6 +23,7 @@ namespace UnityExplorer.UI.Panels
         {
             s_resizeCursorObj.SetActive(false);
             wasAnyDragging = false;
+            Resizing = false;
 
             foreach (var instance in Instances)
             {
@@ -137,7 +138,7 @@ namespace UnityExplorer.UI.Panels
             Instances.Add(this);
             DragableArea = dragArea;
             Panel = panelToDrag;
-            
+
             if (!canvasTransform)
                 canvasTransform = Panel.GetComponentInParent<Canvas>().GetComponent<RectTransform>();
 

src/UI/Panels/UIPanel.cs

@@ -146,22 +146,21 @@ namespace UnityExplorer.UI.Panels
             if (Rect.rect.height < MinHeight)
                 Rect.SetSizeWithCurrentAnchors(RectTransform.Axis.Vertical, MinHeight);
         }
-        
+
         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;
-            pos.x = Math.Max(-halfW, Math.Min(pos.x, halfW - panel.rect.width));
-            pos.y = Math.Max(-halfH + panel.rect.height, Math.Min(pos.y, halfH));
-        
+
+            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));
+
             panel.localPosition = pos;
         }
 
-
-
         #region Save Data
 
         public abstract void DoSaveToConfigElement();

src/UI/UIFactory.cs

@@ -409,56 +409,49 @@ namespace UnityExplorer.UI
         /// <summary>
         /// Create a Toggle control.
         /// </summary>
-        public static GameObject CreateToggle(GameObject parent, string name, out Toggle toggle, out Text text, Color bgColor = default)
+        public static GameObject CreateToggle(GameObject parent, string name, out Toggle toggle, out Text text, Color bgColor = default, 
+            int checkWidth = 20, int checkHeight = 20)
         {
+            // Main obj
             GameObject toggleObj = CreateUIObject(name, parent, _smallElementSize);
-
-            GameObject bgObj = CreateUIObject("Background", toggleObj);
-            GameObject checkObj = CreateUIObject("Checkmark", bgObj);
-            GameObject labelObj = CreateUIObject("Label", toggleObj);
-
+            SetLayoutGroup<HorizontalLayoutGroup>(toggleObj, false, false, true, true, 5, 0,0,0,0, childAlignment: TextAnchor.MiddleLeft);
             toggle = toggleObj.AddComponent<Toggle>();
             toggle.isOn = true;
-            
-            // second reference so we can use it inside the lambda, 'toggle' is an out var.
-            Toggle toggleComp = toggle;
-            toggle.onValueChanged.AddListener(Deselect);
-            void Deselect(bool _)
-            {
-                toggleComp.OnDeselect(null);
-            }
+            SetDefaultSelectableColors(toggle);
+            // need a second reference so we can use it inside the lambda, since 'toggle' is an out var.
+            Toggle t2 = toggle;
+            toggle.onValueChanged.AddListener((bool _) => { t2.OnDeselect(null); });
 
-            Image bgImage = bgObj.AddComponent<Image>();
+            // Check mark background
+
+            GameObject checkBgObj = CreateUIObject("Background", toggleObj);
+            Image bgImage = checkBgObj.AddComponent<Image>();
             bgImage.color = bgColor == default ? new Color(0.04f, 0.04f, 0.04f, 0.75f) : bgColor;
 
-            Image checkImage = checkObj.AddComponent<Image>();
+            SetLayoutGroup<HorizontalLayoutGroup>(checkBgObj, true, true, true, true, 0, 2, 2, 2, 2);
+            SetLayoutElement(checkBgObj, minWidth: checkWidth, flexibleWidth: 0, minHeight: checkHeight, flexibleHeight: 0);
+
+            // Check mark image
+
+            GameObject checkMarkObj = CreateUIObject("Checkmark", checkBgObj);
+            Image checkImage = checkMarkObj.AddComponent<Image>();
             checkImage.color = new Color(0.8f, 1, 0.8f, 0.3f);
 
+            // Label 
+
+            GameObject labelObj = CreateUIObject("Label", toggleObj);
             text = labelObj.AddComponent<Text>();
-            text.text = "Toggle";
+            text.text = "";
+            text.alignment = TextAnchor.MiddleLeft;
             SetDefaultTextValues(text);
 
+            SetLayoutElement(labelObj, minWidth: 0, flexibleWidth: 0, minHeight: checkHeight, flexibleHeight: 0);
+
+            // References
+
             toggle.graphic = checkImage;
             toggle.targetGraphic = bgImage;
-            SetDefaultSelectableColors(toggle);
 
-            RectTransform bgRect = bgObj.GetComponent<RectTransform>();
-            bgRect.anchorMin = new Vector2(0f, 1f);
-            bgRect.anchorMax = new Vector2(0f, 1f);
-            bgRect.anchoredPosition = new Vector2(13f, -13f);
-            bgRect.sizeDelta = new Vector2(20f, 20f);
-
-            RectTransform checkRect = checkObj.GetComponent<RectTransform>();
-            checkRect.anchorMin = new Vector2(0.5f, 0.5f);
-            checkRect.anchorMax = new Vector2(0.5f, 0.5f);
-            checkRect.anchoredPosition = Vector2.zero;
-            checkRect.sizeDelta = new Vector2(14f, 14f);
-
-            RectTransform labelRect = labelObj.GetComponent<RectTransform>();
-            labelRect.anchorMin = new Vector2(0f, 0f);
-            labelRect.anchorMax = new Vector2(1f, 1f);
-            labelRect.offsetMin = new Vector2(28f, 2f);
-            labelRect.offsetMax = new Vector2(-5f, -5f);
             return toggleObj;
         }
 
@@ -729,7 +722,7 @@ namespace UnityExplorer.UI
 
             var sliderContainer = CreateVerticalGroup(mainObj, "SliderContainer",
                 false, false, true, true, 0, default, new Color(0.05f, 0.05f, 0.05f));
-            SetLayoutElement(sliderContainer, minWidth: 25, flexibleWidth:0, flexibleHeight: 9999);
+            SetLayoutElement(sliderContainer, minWidth: 25, flexibleWidth: 0, flexibleHeight: 9999);
             sliderContainer.AddComponent<Mask>();
 
             CreateSliderScrollbar(sliderContainer, out Slider slider);
@@ -837,7 +830,7 @@ namespace UnityExplorer.UI
             content.AddComponent<ContentSizeFitter>().verticalFit = ContentSizeFitter.FitMode.PreferredSize;
 
             // Slider
-        
+
             GameObject scrollBarObj = CreateUIObject("AutoSliderScrollbar", mainObj);
             var scrollBarRect = scrollBarObj.GetComponent<RectTransform>();
             scrollBarRect.anchorMin = new Vector2(1, 0);
@@ -846,22 +839,22 @@ namespace UnityExplorer.UI
             SetLayoutGroup<VerticalLayoutGroup>(scrollBarObj, false, true, true, true);
             scrollBarObj.AddComponent<Image>().color = Color.white;
             scrollBarObj.AddComponent<Mask>().showMaskGraphic = false;
-            
+
             GameObject hiddenBar = CreateScrollbar(scrollBarObj, "HiddenScrollviewScroller", out var hiddenScrollbar);
             hiddenScrollbar.SetDirection(Scrollbar.Direction.BottomToTop, true);
-        
+
             for (int i = 0; i < hiddenBar.transform.childCount; i++)
             {
                 var child = hiddenBar.transform.GetChild(i);
                 child.gameObject.SetActive(false);
             }
-        
+
             CreateSliderScrollbar(scrollBarObj, out Slider scrollSlider);
-        
+
             autoScrollbar = new AutoSliderScrollbar(hiddenScrollbar, scrollSlider, contentRect, viewportRect);
-        
+
             // Set up the ScrollRect component
-        
+
             var scrollRect = mainObj.AddComponent<ScrollRect>();
             scrollRect.horizontal = false;
             scrollRect.vertical = true;
@@ -870,10 +863,10 @@ namespace UnityExplorer.UI
             scrollRect.scrollSensitivity = 35;
             scrollRect.horizontalScrollbarVisibility = ScrollRect.ScrollbarVisibility.AutoHideAndExpandViewport;
             scrollRect.verticalScrollbarVisibility = ScrollRect.ScrollbarVisibility.Permanent;
-        
+
             scrollRect.viewport = viewportRect;
             scrollRect.content = contentRect;
-        
+
             return mainObj;
         }
 

src/UI/UIManager.cs

@@ -8,8 +8,8 @@ using UnityEngine.EventSystems;
 using UnityEngine.UI;
 using UnityExplorer.Core.Config;
 using UnityExplorer.Core.Input;
-using UnityExplorer.UI.CSConsole;
-using UnityExplorer.UI.Inspectors;
+using UnityExplorer.CSConsole;
+using UnityExplorer.Inspectors;
 using UnityExplorer.UI.Models;
 using UnityExplorer.UI.Panels;
 using UnityExplorer.UI.Widgets;
@@ -121,6 +121,12 @@ namespace UnityExplorer.UI
             lastScreenWidth = Screen.width;
             lastScreenHeight = Screen.height;
 
+            // Failsafe fix
+            foreach (var dropdown in CanvasRoot.GetComponentsInChildren<Dropdown>(true))
+                dropdown.RefreshShownValue();
+            timeInput.Text = string.Empty;
+            timeInput.Text = Time.timeScale.ToString();
+
             Initializing = false;
         }
 
@@ -352,7 +358,7 @@ namespace UnityExplorer.UI
 
             NavbarAnchor = ConfigManager.Main_Navbar_Anchor.Value;
             SetNavBarAnchor();
-            ConfigManager.Main_Navbar_Anchor.OnValueChanged += (VerticalAnchor val) => 
+            ConfigManager.Main_Navbar_Anchor.OnValueChanged += (VerticalAnchor val) =>
             {
                 NavbarAnchor = val;
                 SetNavBarAnchor();
@@ -378,7 +384,7 @@ namespace UnityExplorer.UI
             timeInput = UIFactory.CreateInputField(navbarPanel, "TimeInput", "timeScale");
             UIFactory.SetLayoutElement(timeInput.Component.gameObject, minHeight: 25, minWidth: 40);
             timeInput.Text = Time.timeScale.ToString("F2");
-            timeInput.Component.onEndEdit.AddListener(OnTimeInputEndEdit);
+            timeInput.Component.GetOnEndEdit().AddListener(OnTimeInputEndEdit);
 
             pauseBtn = UIFactory.CreateButton(navbarPanel, "PauseButton", "||", new Color(0.2f, 0.2f, 0.2f));
             UIFactory.SetLayoutElement(pauseBtn.Component.gameObject, minHeight: 25, minWidth: 25);
@@ -404,18 +410,43 @@ namespace UnityExplorer.UI
             closeBtn.OnClick += OnCloseButtonClicked;
         }
 
-        #region UI AssetBundle
+        // UI AssetBundle
 
         private static void LoadBundle()
         {
-            AssetBundle bundle = null;
+            AssetBundle bundle;
             try
             {
-                bundle = LoadBundle("modern");
-                if (bundle == null)
-                    bundle = LoadBundle("legacy");
+                // Get the Major and Minor of the Unity version
+                var split = Application.unityVersion.Split('.');
+                int major = int.Parse(split[0]);
+                int minor = int.Parse(split[1]);
+
+                // Use appropriate AssetBundle for Unity version
+                // >= 2017.3
+                if (major > 2017 || (major == 2017 && minor >= 3))
+                    bundle = LoadBundle("modern");
+                // 5.6.0 to 2017.3
+                else if (major == 2017 || (major == 5 && minor >= 6))
+                    bundle = LoadBundle("legacy.5.6");
+                // < 5.6.0
+                else
+                    bundle = LoadBundle("legacy");      
+            }
+            catch
+            {
+                ExplorerCore.LogWarning($"Exception parsing Unity version, falling back to old AssetBundle load method...");
+                bundle = LoadBundle("modern") ?? LoadBundle("legacy.5.6") ?? LoadBundle("legacy");
+            }
+
+            AssetBundle LoadBundle(string id)
+            {
+                ExplorerCore.Log($"Loading {id} bundle for Unity {Application.unityVersion}");
+
+                return AssetBundle.LoadFromMemory(ReadFully(typeof(ExplorerCore)
+                        .Assembly
+                        .GetManifestResourceStream($"UnityExplorer.Resources.{id}.bundle")));
             }
-            catch { }
 
             if (bundle == null)
             {
@@ -438,14 +469,6 @@ namespace UnityExplorer.UI
             ConsoleFont = bundle.LoadAsset<Font>("CONSOLA");
         }
 
-        private static AssetBundle LoadBundle(string id)
-        {
-            var stream = typeof(ExplorerCore).Assembly
-                .GetManifestResourceStream($"UnityExplorer.Resources.explorerui.{id}.bundle");
-
-            return AssetBundle.LoadFromMemory(ReadFully(stream));
-        }
-
         private static byte[] ReadFully(Stream input)
         {
             using (var ms = new MemoryStream())
@@ -457,7 +480,5 @@ namespace UnityExplorer.UI
                 return ms.ToArray();
             }
         }
-
-        #endregion
     }
 }

src/UI/Widgets/AutoComplete/AutoCompleteModal.cs

@@ -169,7 +169,7 @@ namespace UnityExplorer.UI.Widgets.AutoComplete
 
         // Setting autocomplete cell buttons
 
-        private readonly Color selectedSuggestionColor = new Color(45/255f, 75/255f, 80/255f);
+        private readonly Color selectedSuggestionColor = new Color(45 / 255f, 75 / 255f, 80 / 255f);
         private readonly Color inactiveSuggestionColor = new Color(0.11f, 0.11f, 0.11f);
 
         private List<Suggestion> GetEntries() => Suggestions;
@@ -300,7 +300,7 @@ 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.content, "AutoCompleter", out GameObject scrollObj,
                 out GameObject scrollContent);
             scrollPool.Initialize(dataHandler);
             UIFactory.SetLayoutElement(scrollObj, flexibleHeight: 9999);
@@ -308,7 +308,7 @@ namespace UnityExplorer.UI.Widgets.AutoComplete
 
             navigationTipRow = UIFactory.CreateHorizontalGroup(this.content, "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", 
+            UIFactory.CreateLabel(navigationTipRow, "HelpText", "Up/Down to select, Enter to use, Esc to close",
                 TextAnchor.MiddleLeft, Color.grey, false, 13);
 
             UIRoot.SetActive(false);

src/UI/Widgets/AutoComplete/TypeCompleter.cs

@@ -87,7 +87,7 @@ namespace UnityExplorer.UI.Widgets.AutoComplete
             }
 
             // Check for exact match first
-            if (ReflectionUtility.AllTypes.TryGetValue(value, out Type t) && allowedTypes.Contains(t))
+            if (ReflectionUtility.GetTypeByName(value) is Type t && allowedTypes.Contains(t))
                 AddSuggestion(t);
 
             foreach (var entry in allowedTypes)

src/UI/Widgets/AutoSliderScrollbar.cs

@@ -91,7 +91,7 @@ namespace UnityExplorer.UI.Widgets
                 Slider.interactable = false;
                 return;
             }
-            
+
             var handleHeight = viewportHeight * Math.Min(1, viewportHeight / totalHeight);
             handleHeight = Math.Max(15f, handleHeight);
 

src/UI/Widgets/ButtonList/ButtonListHandler.cs

@@ -26,7 +26,7 @@ namespace UnityExplorer.UI.Widgets
         }
         private string currentFilter;
 
-        public ButtonListHandler(ScrollPool<TCell> scrollPool, Func<List<TData>> getEntriesMethod, 
+        public ButtonListHandler(ScrollPool<TCell> scrollPool, Func<List<TData>> getEntriesMethod,
             Action<TCell, int> setICellMethod, Func<TData, string, bool> shouldDisplayMethod,
             Action<int> onCellClickedMethod)
         {

src/UI/Widgets/InputFieldScroller.cs

@@ -4,9 +4,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using UnityEngine;
-using UnityEngine.UI;
-using UnityEngine.EventSystems;
 using UnityEngine.Events;
+using UnityEngine.EventSystems;
+using UnityEngine.UI;
 using UnityExplorer.UI.Models;
 
 namespace UnityExplorer.UI.Widgets
@@ -80,12 +80,12 @@ namespace UnityExplorer.UI.Widgets
 
                 if (ContentRect.rect.height < desiredHeight)
                 {
-                    ContentRect.sizeDelta = new Vector2(0, desiredHeight);
+                    ContentRect.sizeDelta = new Vector2(ContentRect.sizeDelta.x, desiredHeight);
                     this.Slider.UpdateSliderHandle();
                 }
                 else if (ContentRect.rect.height > desiredHeight)
                 {
-                    ContentRect.sizeDelta = new Vector2(0, desiredHeight);
+                    ContentRect.sizeDelta = new Vector2(ContentRect.sizeDelta.x, desiredHeight);
                     this.Slider.UpdateSliderHandle();
                 }
             }

src/UI/Widgets/ScrollPool/DataHeightCache.cs

@@ -118,7 +118,7 @@ namespace UnityExplorer.UI.Widgets
             if (!heightCache.Any())
                 return;
 
-            totalHeight -= heightCache[heightCache.Count - 1];            
+            totalHeight -= heightCache[heightCache.Count - 1];
             heightCache.RemoveAt(heightCache.Count - 1);
 
             int idx = heightCache.Count;

src/UI/Widgets/ScrollPool/ScrollPool.cs

@@ -11,7 +11,7 @@ using UnityExplorer.UI.Panels;
 
 namespace UnityExplorer.UI.Widgets
 {
-    public struct CellInfo 
+    public struct CellInfo
     {
         public int cellIndex, dataIndex;
     }
@@ -120,7 +120,7 @@ namespace UnityExplorer.UI.Widgets
                     OnHeightChanged?.Invoke();
                 }
             }
-            
+
         }
         #endregion
 
@@ -129,7 +129,7 @@ namespace UnityExplorer.UI.Widgets
         public void Refresh(bool setCellData, bool jumpToTop = false)
         {
             if (jumpToTop)
-            { 
+            {
                 bottomDataIndex = CellPool.Count - 1;
                 Content.anchoredPosition = Vector2.zero;
             }
@@ -193,12 +193,11 @@ namespace UnityExplorer.UI.Widgets
             RuntimeProvider.Instance.StartCoroutine(InitCoroutine(onHeightChangedListener));
         }
 
-        private WaitForEndOfFrame waitForEndOfFrame = new WaitForEndOfFrame();
-
         private IEnumerator InitCoroutine(Action onHeightChangedListener)
         {
             ScrollRect.content.anchoredPosition = Vector2.zero;
-            yield return waitForEndOfFrame ?? (waitForEndOfFrame = new WaitForEndOfFrame());
+            yield return null;
+            yield return null;
 
             LayoutRebuilder.ForceRebuildLayoutImmediate(Content);
 

src/UI/Widgets/TransformTree/CachedTransform.cs

@@ -33,10 +33,10 @@ namespace UnityExplorer.UI.Widgets
         {
             bool ret = false;
 
-            if (Value != transform 
-                || depth != Depth 
-                || ChildCount != transform.childCount 
-                || Name != transform.name 
+            if (Value != transform
+                || depth != Depth
+                || ChildCount != transform.childCount
+                || Name != transform.name
                 || Enabled != transform.gameObject.activeSelf)
             {
                 Value = transform;

src/UI/Widgets/TransformTree/TransformCell.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using UnityEngine;
 using UnityEngine.UI;
-using UnityExplorer.UI.Inspectors;
+using UnityExplorer.Inspectors;
 using UnityExplorer.UI.Widgets;
 
 namespace UnityExplorer.UI.Widgets
@@ -17,6 +17,7 @@ namespace UnityExplorer.UI.Widgets
         private bool m_enabled;
 
         public Action<CachedTransform> OnExpandToggled;
+        public Action<CachedTransform> OnEnableToggled;
         public Action<GameObject> OnGameObjectClicked;
 
         public CachedTransform cachedTransform;
@@ -27,15 +28,20 @@ namespace UnityExplorer.UI.Widgets
 
         public ButtonRef ExpandButton;
         public ButtonRef NameButton;
+        public Toggle EnabledToggle;
 
         public LayoutElement spacer;
 
-        public void OnMainButtonClicked()
+        public void Enable()
         {
-            if (cachedTransform.Value)
-                OnGameObjectClicked?.Invoke(cachedTransform.Value.gameObject);
-            else
-                ExplorerCore.LogWarning("The object was destroyed!");
+            m_enabled = true;
+            UIRoot.SetActive(true);
+        }
+
+        public void Disable()
+        {
+            m_enabled = false;
+            UIRoot.SetActive(false);
         }
 
         public void ConfigureCell(CachedTransform cached, int cellIndex)
@@ -59,6 +65,8 @@ namespace UnityExplorer.UI.Widgets
                 NameButton.ButtonText.text = cached.Value.name;
                 NameButton.ButtonText.color = cached.Value.gameObject.activeSelf ? Color.white : Color.grey;
 
+                EnabledToggle.Set(cached.Value.gameObject.activeSelf, false);
+
                 int childCount = cached.Value.childCount;
                 if (childCount > 0)
                 {
@@ -82,16 +90,12 @@ namespace UnityExplorer.UI.Widgets
             }
         }
 
-        public void Disable()
+        public void OnMainButtonClicked()
         {
-            m_enabled = false;
-            UIRoot.SetActive(false);
-        }
-
-        public void Enable()
-        {
-            m_enabled = true;
-            UIRoot.SetActive(true);
+            if (cachedTransform.Value)
+                OnGameObjectClicked?.Invoke(cachedTransform.Value.gameObject);
+            else
+                ExplorerCore.LogWarning("The object was destroyed!");
         }
 
         public void OnExpandClicked()
@@ -99,10 +103,15 @@ namespace UnityExplorer.UI.Widgets
             OnExpandToggled?.Invoke(cachedTransform);
         }
 
+        private void OnEnableClicked(bool value)
+        {
+            OnEnableToggled?.Invoke(cachedTransform);
+        }
+
         public GameObject CreateContent(GameObject parent)
         {
             UIRoot = UIFactory.CreateUIObject("TransformCell", parent);
-            UIFactory.SetLayoutGroup<HorizontalLayoutGroup>(UIRoot, true, true, true, true, 2, childAlignment: TextAnchor.MiddleCenter);
+            UIFactory.SetLayoutGroup<HorizontalLayoutGroup>(UIRoot, false, false, true, true, 2, childAlignment: TextAnchor.MiddleCenter);
             Rect = UIRoot.GetComponent<RectTransform>();
             Rect.anchorMin = new Vector2(0, 1);
             Rect.anchorMax = new Vector2(0, 1);
@@ -114,9 +123,19 @@ namespace UnityExplorer.UI.Widgets
             UIFactory.SetLayoutElement(spacerObj, minWidth: 0, flexibleWidth: 0, minHeight: 0, flexibleHeight: 0);
             this.spacer = spacerObj.GetComponent<LayoutElement>();
 
+            // Expand arrow
+
             ExpandButton = UIFactory.CreateButton(this.UIRoot, "ExpandButton", "►");
             UIFactory.SetLayoutElement(ExpandButton.Component.gameObject, minWidth: 15, flexibleWidth: 0, minHeight: 25, flexibleHeight: 0);
 
+            // Enabled toggle
+
+            var toggleObj = UIFactory.CreateToggle(UIRoot, "BehaviourToggle", out EnabledToggle, out var behavText, default, 17, 17);
+            UIFactory.SetLayoutElement(toggleObj, minHeight: 17, flexibleHeight: 0, minWidth: 17);
+            EnabledToggle.onValueChanged.AddListener(OnEnableClicked);
+
+            // Name button
+
             NameButton = UIFactory.CreateButton(this.UIRoot, "NameButton", "Name", null);
             UIFactory.SetLayoutElement(NameButton.Component.gameObject, flexibleWidth: 9999, minHeight: 25, flexibleHeight: 0);
             var nameLabel = NameButton.Component.GetComponentInChildren<Text>();

src/UI/Widgets/TransformTree/TransformTree.cs

@@ -60,8 +60,9 @@ namespace UnityExplorer.UI.Widgets
 
         public void OnCellBorrowed(TransformCell cell)
         {
-            cell.OnExpandToggled += ToggleExpandCell;
+            cell.OnExpandToggled += OnCellExpandToggled;
             cell.OnGameObjectClicked += OnGameObjectClicked;
+            cell.OnEnableToggled += OnCellEnableToggled;
         }
 
         private void OnGameObjectClicked(GameObject obj)
@@ -72,6 +73,24 @@ namespace UnityExplorer.UI.Widgets
                 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);
+        }
+
         public void Init()
         {
             ScrollPool.Initialize(this);
@@ -261,16 +280,5 @@ namespace UnityExplorer.UI.Widgets
             else
                 cell.Disable();
         }
-
-        public void ToggleExpandCell(CachedTransform cache)
-        {
-            var instanceID = cache.InstanceID;
-            if (expandedInstanceIDs.Contains(instanceID))
-                expandedInstanceIDs.Remove(instanceID);
-            else
-                expandedInstanceIDs.Add(instanceID);
-
-            RefreshData(true);
-        }
     }
 }

src/UnityExplorer.csproj

@@ -143,12 +143,12 @@
     </Reference>
   </ItemGroup>
   <!-- BepInEx universal refs -->
-    <ItemGroup Condition="'$(IsBepInEx)'=='true'">
-        <Reference Include="0Harmony">
-            <HintPath>packages\HarmonyX.2.4.2\lib\net35\0Harmony.dll</HintPath>
-            <Private>False</Private>
-        </Reference>
-    </ItemGroup>
+  <ItemGroup Condition="'$(IsBepInEx)'=='true'">
+    <Reference Include="0Harmony">
+      <HintPath>packages\HarmonyX.2.4.2\lib\net35\0Harmony.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
   <!-- BepInEx 5 Mono refs -->
   <ItemGroup Condition="'$(IsBepInEx)|$(IsCpp)|$(Configuration)'=='true|false|Release_BIE5_Mono'">
     <Reference Include="BepInEx">
@@ -180,10 +180,10 @@
   </ItemGroup>
   <!-- Standalone refs -->
   <ItemGroup Condition="'$(IsStandalone)'=='true'">
-      <Reference Include="0Harmony">
-          <HintPath>packages\HarmonyX.2.4.2\lib\net35\0Harmony.dll</HintPath>
-          <Private>False</Private>
-      </Reference>
+    <Reference Include="0Harmony">
+      <HintPath>packages\HarmonyX.2.4.2\lib\net35\0Harmony.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
   </ItemGroup>
   <!-- Mono refs -->
   <ItemGroup Condition="'$(IsCpp)'=='false'">
@@ -241,54 +241,54 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Core\Config\InternalConfigHandler.cs" />
-    <Compile Include="UI\CacheObject\CacheConfigEntry.cs" />
-    <Compile Include="UI\CacheObject\Views\CacheConfigCell.cs" />
-    <Compile Include="UI\CSConsole\CSAutoCompleter.cs" />
-    <Compile Include="UI\CSConsole\LexerBuilder.cs" />
-    <Compile Include="UI\CSConsole\Lexers\CommentLexer.cs" />
-    <Compile Include="UI\CSConsole\Lexers\KeywordLexer.cs" />
-    <Compile Include="UI\CSConsole\Lexers\Lexer.cs" />
-    <Compile Include="UI\CSConsole\Lexers\NumberLexer.cs" />
-    <Compile Include="UI\CSConsole\Lexers\StringLexer.cs" />
-    <Compile Include="UI\CSConsole\Lexers\SymbolLexer.cs" />
-    <Compile Include="UI\CSConsole\ScriptEvaluator.cs" />
-    <Compile Include="UI\CSConsole\ScriptInteraction.cs" />
+    <Compile Include="CacheObject\CacheConfigEntry.cs" />
+    <Compile Include="CacheObject\Views\CacheConfigCell.cs" />
+    <Compile Include="CSConsole\CSAutoCompleter.cs" />
+    <Compile Include="CSConsole\LexerBuilder.cs" />
+    <Compile Include="CSConsole\Lexers\CommentLexer.cs" />
+    <Compile Include="CSConsole\Lexers\KeywordLexer.cs" />
+    <Compile Include="CSConsole\Lexers\Lexer.cs" />
+    <Compile Include="CSConsole\Lexers\NumberLexer.cs" />
+    <Compile Include="CSConsole\Lexers\StringLexer.cs" />
+    <Compile Include="CSConsole\Lexers\SymbolLexer.cs" />
+    <Compile Include="CSConsole\ScriptEvaluator.cs" />
+    <Compile Include="CSConsole\ScriptInteraction.cs" />
     <Compile Include="Core\ExplorerBehaviour.cs" />
     <Compile Include="Core\Reflection\Extensions.cs" />
     <Compile Include="Core\Reflection\Il2CppReflection.cs" />
     <Compile Include="Core\Utility\ArgumentUtility.cs" />
     <Compile Include="Core\Utility\MiscUtility.cs" />
     <Compile Include="Core\Utility\ParseUtility.cs" />
-    <Compile Include="UI\Inspectors\GameObjectWidgets\ComponentCell.cs" />
-    <Compile Include="UI\Inspectors\GameObjectWidgets\ComponentList.cs" />
-    <Compile Include="UI\Inspectors\GameObjectWidgets\GameObjectControls.cs" />
-    <Compile Include="UI\Inspectors\InspectUnderMouse.cs" />
-    <Compile Include="UI\CSConsole\ConsoleController.cs" />
-    <Compile Include="UI\CacheObject\CacheField.cs" />
-    <Compile Include="UI\CacheObject\CacheKeyValuePair.cs" />
-    <Compile Include="UI\CacheObject\CacheListEntry.cs" />
-    <Compile Include="UI\CacheObject\CacheMember.cs" />
-    <Compile Include="UI\CacheObject\CacheMethod.cs" />
-    <Compile Include="UI\CacheObject\CacheObjectBase.cs" />
-    <Compile Include="UI\CacheObject\CacheProperty.cs" />
-    <Compile Include="UI\CacheObject\Views\CacheKeyValuePairCell.cs" />
-    <Compile Include="UI\CacheObject\Views\CacheListEntryCell.cs" />
-    <Compile Include="UI\CacheObject\Views\CacheMemberCell.cs" />
-    <Compile Include="UI\CacheObject\Views\CacheObjectCell.cs" />
-    <Compile Include="UI\CacheObject\Views\EvaluateWidget.cs" />
-    <Compile Include="UI\Inspectors\GameObjectInspector.cs" />
-    <Compile Include="UI\CacheObject\ICacheObjectController.cs" />
-    <Compile Include="UI\Inspectors\InspectorManager.cs" />
-    <Compile Include="UI\Inspectors\InspectorTab.cs" />
-    <Compile Include="UI\Inspectors\InspectorBase.cs" />
-    <Compile Include="UI\CacheObject\IValues\InteractiveColor.cs" />
-    <Compile Include="UI\CacheObject\IValues\InteractiveDictionary.cs" />
-    <Compile Include="UI\CacheObject\IValues\InteractiveEnum.cs" />
-    <Compile Include="UI\CacheObject\IValues\InteractiveList.cs" />
-    <Compile Include="UI\CacheObject\IValues\InteractiveString.cs" />
-    <Compile Include="UI\CacheObject\IValues\InteractiveValue.cs" />
-    <Compile Include="UI\Inspectors\ReflectionInspector.cs" />
-    <Compile Include="UI\CacheObject\IValues\InteractiveValueStruct.cs" />
+    <Compile Include="Inspectors\GameObjectWidgets\ComponentCell.cs" />
+    <Compile Include="Inspectors\GameObjectWidgets\ComponentList.cs" />
+    <Compile Include="Inspectors\GameObjectWidgets\GameObjectControls.cs" />
+    <Compile Include="Inspectors\InspectUnderMouse.cs" />
+    <Compile Include="CSConsole\ConsoleController.cs" />
+    <Compile Include="CacheObject\CacheField.cs" />
+    <Compile Include="CacheObject\CacheKeyValuePair.cs" />
+    <Compile Include="CacheObject\CacheListEntry.cs" />
+    <Compile Include="CacheObject\CacheMember.cs" />
+    <Compile Include="CacheObject\CacheMethod.cs" />
+    <Compile Include="CacheObject\CacheObjectBase.cs" />
+    <Compile Include="CacheObject\CacheProperty.cs" />
+    <Compile Include="CacheObject\Views\CacheKeyValuePairCell.cs" />
+    <Compile Include="CacheObject\Views\CacheListEntryCell.cs" />
+    <Compile Include="CacheObject\Views\CacheMemberCell.cs" />
+    <Compile Include="CacheObject\Views\CacheObjectCell.cs" />
+    <Compile Include="CacheObject\Views\EvaluateWidget.cs" />
+    <Compile Include="Inspectors\GameObjectInspector.cs" />
+    <Compile Include="CacheObject\ICacheObjectController.cs" />
+    <Compile Include="Inspectors\InspectorManager.cs" />
+    <Compile Include="Inspectors\InspectorTab.cs" />
+    <Compile Include="Inspectors\InspectorBase.cs" />
+    <Compile Include="CacheObject\IValues\InteractiveColor.cs" />
+    <Compile Include="CacheObject\IValues\InteractiveDictionary.cs" />
+    <Compile Include="CacheObject\IValues\InteractiveEnum.cs" />
+    <Compile Include="CacheObject\IValues\InteractiveList.cs" />
+    <Compile Include="CacheObject\IValues\InteractiveString.cs" />
+    <Compile Include="CacheObject\IValues\InteractiveValue.cs" />
+    <Compile Include="Inspectors\ReflectionInspector.cs" />
+    <Compile Include="CacheObject\IValues\InteractiveValueStruct.cs" />
     <Compile Include="UI\Models\InputFieldRef.cs" />
     <Compile Include="UI\Pool.cs" />
     <Compile Include="UI\Panels\LogPanel.cs" />
@@ -318,8 +318,8 @@
     <Compile Include="Core\Runtime\RuntimeContext.cs" />
     <Compile Include="Core\Runtime\RuntimeProvider.cs" />
     <Compile Include="Core\Runtime\TextureUtilProvider.cs" />
-    <Compile Include="UI\ObjectExplorer\SceneHandler.cs" />
-    <Compile Include="UI\ObjectExplorer\SearchProvider.cs" />
+    <Compile Include="ObjectExplorer\SceneHandler.cs" />
+    <Compile Include="ObjectExplorer\SearchProvider.cs" />
     <Compile Include="Core\Tests\TestClass.cs" />
     <Compile Include="Core\Utility\UnityHelpers.cs" />
     <Compile Include="ExplorerCore.cs" />
@@ -344,8 +344,8 @@
     <Compile Include="UI\Widgets\AutoComplete\AutoCompleteModal.cs" />
     <Compile Include="UI\Widgets\AutoComplete\TypeCompleter.cs" />
     <Compile Include="UI\Models\ButtonRef.cs" />
-    <Compile Include="UI\ObjectExplorer\ObjectSearch.cs" />
-    <Compile Include="UI\ObjectExplorer\SceneExplorer.cs" />
+    <Compile Include="ObjectExplorer\ObjectSearch.cs" />
+    <Compile Include="ObjectExplorer\SceneExplorer.cs" />
     <Compile Include="UI\Widgets\ScrollPool\DataHeightCache.cs" />
     <Compile Include="UI\Widgets\ScrollPool\ICell.cs" />
     <Compile Include="UI\Widgets\ScrollPool\ICellPoolDataSource.cs" />