diff --git a/samples/Myra.Samples.AllWidgets/AllWidgets.Generated.cs b/samples/Myra.Samples.AllWidgets/AllWidgets.Generated.cs
index 4ab42fe7..daff3477 100644
--- a/samples/Myra.Samples.AllWidgets/AllWidgets.Generated.cs
+++ b/samples/Myra.Samples.AllWidgets/AllWidgets.Generated.cs
@@ -1,4 +1,4 @@
-/* Generated by MyraPad at 12/6/2023 3:29:08 AM */
+/* Generated by MyraPad at 2/21/2026 7:18:26 AM */
 using Myra;
 using Myra.Graphics2D;
 using Myra.Graphics2D.TextureAtlases;
@@ -129,9 +129,8 @@ private void BuildUI()
 			_buttonSaveFile.Id = "_buttonSaveFile";
 			Grid.SetColumn(_buttonSaveFile, 1);
 			_buttonSaveFile.Content = horizontalStackPanel1;
-            _buttonSaveFile.MouseCursor = MouseCursorType.Hand;
 
-            _textSaveFile = new TextBox();
+			_textSaveFile = new TextBox();
 			_textSaveFile.Id = "_textSaveFile";
 			Grid.SetColumn(_textSaveFile, 2);
 
@@ -272,8 +271,9 @@ private void BuildUI()
 			label16.Text = "Spin Button:";
 			Grid.SetRow(label16, 9);
 
-			var spinButton1 = new SpinButton();
-			spinButton1.Value = 1;
+			var spinButton1 = new SpinButton<int>();
+			spinButton1.Value = 5;
+			spinButton1.DecimalPlaces = 0;
 			spinButton1.Width = 100;
 			Grid.SetColumn(spinButton1, 1);
 			Grid.SetRow(spinButton1, 9);
@@ -376,6 +376,7 @@ private void BuildUI()
 			_gridRight.Widgets.Add(label22);
 
 			var scrollViewer1 = new ScrollViewer();
+			scrollViewer1.ScrollMultiplier = 10;
 			scrollViewer1.ShowHorizontalScrollBar = false;
 			scrollViewer1.Content = _gridRight;
 
diff --git a/samples/Myra.Samples.AllWidgets/AllWidgets.cs b/samples/Myra.Samples.AllWidgets/AllWidgets.cs
index 1f1817b7..34c799c7 100644
--- a/samples/Myra.Samples.AllWidgets/AllWidgets.cs
+++ b/samples/Myra.Samples.AllWidgets/AllWidgets.cs
@@ -133,7 +133,7 @@ public AllWidgets()
 				Content = imageButtonContent
 			});
 			node3.AddSubNode(new HorizontalSlider());
-			node3.AddSubNode(new SpinButton());
+			node3.AddSubNode(new SpinButton<float>());
 
 			var imageButtonContent2 = new HorizontalStackPanel
 			{
diff --git a/samples/Myra.Samples.AllWidgets/allControls.xmmp b/samples/Myra.Samples.AllWidgets/allControls.xmmp
index f439c335..1684c66b 100644
--- a/samples/Myra.Samples.AllWidgets/allControls.xmmp
+++ b/samples/Myra.Samples.AllWidgets/allControls.xmmp
@@ -23,7 +23,7 @@
         </MenuItem>
       </HorizontalMenu>
       <HorizontalSplitPane StackPanel.ProportionType="Fill">
-        <ScrollViewer ShowHorizontalScrollBar="False">
+        <ScrollViewer ScrollMultiplier="10" ShowHorizontalScrollBar="False">
           <Grid ColumnSpacing="8" RowSpacing="8" Id="_gridRight">
             <Grid.DefaultRowProportion Type="Auto" />
             <Grid.ColumnsProportions>
@@ -77,7 +77,7 @@
             <Label Text="Text Field:" Grid.Row="8" />
             <TextBox Grid.Column="1" Grid.Row="8" Grid.ColumnSpan="2" />
             <Label Text="Spin Button:" Grid.Row="9" />
-            <SpinButton Value="1" Width="100" Grid.Column="1" Grid.Row="9" />
+            <SpinButton GenericTypeArg="int" Value="5" DecimalPlaces="0" Width="100" Grid.Column="1" Grid.Row="9" />
             <Label Text="List View:" Grid.Row="10" />
             <ListView Width="200" Grid.Column="1" Grid.Row="10" Grid.ColumnSpan="2">
               <Label Text="Red" TextColor="#FF0000FF" />
diff --git a/samples/Myra.Samples.GridContainer/GridGame.cs b/samples/Myra.Samples.GridContainer/GridGame.cs
index 8ae181c2..5e0128c2 100644
--- a/samples/Myra.Samples.GridContainer/GridGame.cs
+++ b/samples/Myra.Samples.GridContainer/GridGame.cs
@@ -222,10 +222,10 @@ protected override void LoadContent()
 
 			grid.Widgets.Add(textField);
 
-			var spinButton2 = new SpinButton
+			var spinButton2 = new SpinButton<int>
 			{
 				Width = 100,
-				Integer = true
+				Value = 0,
 			};
 			Grid.SetColumn(spinButton2, 5);
 			Grid.SetRow(spinButton2, 2);
diff --git a/samples/Myra.Samples.Inspector/.config/dotnet-tools.json b/samples/Myra.Samples.Inspector/.config/dotnet-tools.json
new file mode 100644
index 00000000..afd4e2c4
--- /dev/null
+++ b/samples/Myra.Samples.Inspector/.config/dotnet-tools.json
@@ -0,0 +1,36 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "dotnet-mgcb": {
+      "version": "3.8.3",
+      "commands": [
+        "mgcb"
+      ]
+    },
+    "dotnet-mgcb-editor": {
+      "version": "3.8.3",
+      "commands": [
+        "mgcb-editor"
+      ]
+    },
+    "dotnet-mgcb-editor-linux": {
+      "version": "3.8.3",
+      "commands": [
+        "mgcb-editor-linux"
+      ]
+    },
+    "dotnet-mgcb-editor-windows": {
+      "version": "3.8.3",
+      "commands": [
+        "mgcb-editor-windows"
+      ]
+    },
+    "dotnet-mgcb-editor-mac": {
+      "version": "3.8.3",
+      "commands": [
+        "mgcb-editor-mac"
+      ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/samples/Myra.Samples.Inspector/.vscode/launch.json b/samples/Myra.Samples.Inspector/.vscode/launch.json
new file mode 100644
index 00000000..99933d02
--- /dev/null
+++ b/samples/Myra.Samples.Inspector/.vscode/launch.json
@@ -0,0 +1,14 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+      {
+        "name": "C#: Myra.Samples.Inspector Debug",
+        "type": "dotnet",
+        "request": "launch",
+        "projectPath": "${workspaceFolder}/Myra.Samples.Inspector.csproj"
+      }
+    ],
+  }
\ No newline at end of file
diff --git a/samples/Myra.Samples.Inspector/Input.cs b/samples/Myra.Samples.Inspector/Input.cs
new file mode 100644
index 00000000..9a09f21c
--- /dev/null
+++ b/samples/Myra.Samples.Inspector/Input.cs
@@ -0,0 +1,86 @@
+using System;
+using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework.Input;
+
+namespace Myra.Samples.Inspector
+{
+    public class Input
+    {
+        public int SelectedIndex => selectedIndex;
+        public int TextInfoIndex => infoIndex;
+        
+        private int selectedIndex, infoIndex;
+        private bool lastDown, lastUp, lastLeft, lastRight;
+
+        private readonly Func<int> _maxSelectionsGetter;
+        private readonly Func<int> _maxInfosGetter;
+
+        public Action<int> OnSelectionChanged;
+        public Action<int> OnTextInfoChanged;
+        
+        public Input(Func<int> maxSelectionsGetter, Func<int> maxInfosGetter)
+        {
+            _maxSelectionsGetter = maxSelectionsGetter;
+            _maxInfosGetter = maxInfosGetter;
+        }
+        
+        public void Update(KeyboardState state)
+        {
+            // Prevent spam cycling by only triggering an input change once.
+            bool thisDown = state[Keys.Down] == KeyState.Down;
+            bool thisUp = state[Keys.Up] == KeyState.Down;
+            bool thisLeft = state[Keys.Left] == KeyState.Down;
+            bool thisRight = state[Keys.Right] == KeyState.Down;
+			
+            if (thisDown & !lastDown)
+                CycleSelection(false);
+            else if(thisUp & !lastUp)
+                CycleSelection(true);
+			
+            if (thisLeft & !lastLeft)
+                CycleInfo(false);
+            else if(thisRight & !lastRight)
+                CycleInfo(true);
+			
+            lastDown = thisDown;
+            lastUp = thisUp;
+            lastLeft = thisLeft;
+            lastRight = thisRight;
+        }
+        
+        private void CycleSelection(bool forward)
+        {
+            if (forward)
+            {
+                selectedIndex++;
+                if (selectedIndex >= _maxSelectionsGetter.Invoke())
+                    selectedIndex = 0;
+            }
+            else
+            {
+                selectedIndex--;
+                if (selectedIndex < 0)
+                    selectedIndex = _maxSelectionsGetter.Invoke() - 1;
+            }
+            OnSelectionChanged?.Invoke(selectedIndex); //widgets.Inspect( widgets.inspectables[selectedIndex] );
+        }
+
+        private void CycleInfo(bool forward)
+        {
+            if (forward)
+            {
+                infoIndex++;
+                if (infoIndex >= _maxInfosGetter.Invoke())
+                    infoIndex = 0;
+            }
+            else
+            {
+                infoIndex--;
+                if (infoIndex < 0)
+                    infoIndex = _maxInfosGetter.Invoke() - 1;
+            }
+            OnTextInfoChanged?.Invoke(infoIndex);
+        }
+    }
+    
+}
\ No newline at end of file
diff --git a/samples/Myra.Samples.Inspector/InspectGame.cs b/samples/Myra.Samples.Inspector/InspectGame.cs
new file mode 100644
index 00000000..ce781b79
--- /dev/null
+++ b/samples/Myra.Samples.Inspector/InspectGame.cs
@@ -0,0 +1,118 @@
+using Myra.Graphics2D.UI;
+
+#if !STRIDE
+using System.Text;
+using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework.Input;
+#if ANDROID
+#endif
+#else
+using System.Threading.Tasks;
+using Stride.Engine;
+using Stride.Games;
+using Stride.Graphics;
+using Stride.Core.Mathematics;
+#endif
+
+namespace Myra.Samples.Inspector
+{
+	public class InspectGame : Game
+	{
+#if !STRIDE
+		private readonly GraphicsDeviceManager _graphics;
+#endif
+
+		private Input _input;
+		private RootWidgets _widgets;
+		private Desktop _desktop;
+		
+		public static InspectGame Instance { get; private set; }
+
+		public InspectGame()
+		{
+			Instance = this;
+#if !STRIDE
+			_graphics = new GraphicsDeviceManager(this)
+			{
+				PreferredBackBufferWidth = 1200,
+				PreferredBackBufferHeight = 800
+			};
+			Window.AllowUserResizing = false;
+#else
+#endif
+
+			IsMouseVisible = true;
+		}
+
+#if STRIDE
+		protected override Task LoadContent()
+		{
+			MyraEnvironment.Game = this;
+
+			_widgets = new RootWidgets();
+
+			_desktop = new Desktop();
+			_desktop.Widgets.Add(_allWidgets);
+
+			return base.LoadContent();
+		}
+#else
+		protected override void LoadContent()
+		{
+			base.LoadContent();
+
+			MyraEnvironment.Game = this;
+			MyraEnvironment.EnableModalDarkening = true;
+
+//			Stylesheet.Current = DefaultAssets.DefaultStylesheet2X;
+
+			_widgets = new RootWidgets();
+
+			_desktop = new Desktop();
+			_desktop.Root = _widgets;
+			
+			_input = new Input(() => _widgets.inspectables.Count, () => _widgets.infos.Count)
+			{
+				OnSelectionChanged = (int i) => { _widgets.SetSelectedIndex(i); },
+				OnTextInfoChanged = (int i) => { _widgets.SetInfoIndex(i); },
+			};
+			
+#if MONOGAME && !ANDROID
+			// Inform Myra that external text input is available
+			// So it stops translating Keys to chars
+			_desktop.HasExternalTextInput = true;
+
+			// Provide that text input
+			Window.TextInput += (s, a) =>
+			{
+				_desktop.OnChar(a.Character);
+			};
+#endif
+		}
+#endif
+		protected override void Update(GameTime gameTime)
+		{
+			base.Update(gameTime);
+			_input.Update(Keyboard.GetState());
+			_widgets.Update(gameTime);
+		}
+		
+		protected override void Draw(GameTime gameTime)
+		{
+			base.Draw(gameTime);
+
+#if !STRIDE
+			GraphicsDevice.Clear(Color.Black);
+#else
+			// Clear screen
+			GraphicsContext.CommandList.Clear(GraphicsDevice.Presenter.BackBuffer, Color.Black);
+			GraphicsContext.CommandList.Clear(GraphicsDevice.Presenter.DepthStencilBuffer, DepthStencilClearOptions.DepthBuffer | DepthStencilClearOptions.Stencil);
+
+			// Set render target
+			GraphicsContext.CommandList.SetRenderTargetAndViewport(GraphicsDevice.Presenter.DepthStencilBuffer, GraphicsDevice.Presenter.BackBuffer);
+#endif
+			_widgets.OnPreRender();
+			_desktop.Render();
+		}
+	}
+}
\ No newline at end of file
diff --git a/samples/Myra.Samples.Inspector/Myra.Samples.Inspector.csproj b/samples/Myra.Samples.Inspector/Myra.Samples.Inspector.csproj
new file mode 100644
index 00000000..72e10f60
--- /dev/null
+++ b/samples/Myra.Samples.Inspector/Myra.Samples.Inspector.csproj
@@ -0,0 +1,22 @@
+<Project Sdk="Microsoft.NET.Sdk">
+    <PropertyGroup>
+        <OutputType>Exe</OutputType>
+        <TargetFramework>$(AppTargetFramework)</TargetFramework>
+        <OutputPath>bin\MonoGame\$(Configuration)</OutputPath>
+        <LangVersion>9</LangVersion>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="MonoGame.Framework.DesktopGL" Version="$(AppMonoGameVersion)" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\..\src\Myra\Myra.MonoGame.csproj" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <Reference Include="Myra">
+        <HintPath>..\..\src\Myra\bin\MonoGame\Debug\netstandard2.0\Myra.dll</HintPath>
+      </Reference>
+    </ItemGroup>
+</Project>
diff --git a/samples/Myra.Samples.Inspector/Myra.Samples.Inspector.sln b/samples/Myra.Samples.Inspector/Myra.Samples.Inspector.sln
new file mode 100644
index 00000000..d4b5d063
--- /dev/null
+++ b/samples/Myra.Samples.Inspector/Myra.Samples.Inspector.sln
@@ -0,0 +1,16 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Myra.Samples.Inspector", "Myra.Samples.Inspector.csproj", "{916D1C19-828B-4324-926F-6409D096DBA8}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{916D1C19-828B-4324-926F-6409D096DBA8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{916D1C19-828B-4324-926F-6409D096DBA8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{916D1C19-828B-4324-926F-6409D096DBA8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{916D1C19-828B-4324-926F-6409D096DBA8}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+EndGlobal
diff --git a/samples/Myra.Samples.Inspector/Program.cs b/samples/Myra.Samples.Inspector/Program.cs
new file mode 100644
index 00000000..8cdf01ee
--- /dev/null
+++ b/samples/Myra.Samples.Inspector/Program.cs
@@ -0,0 +1,2 @@
+using var game = new Myra.Samples.Inspector.InspectGame();
+game.Run();
\ No newline at end of file
diff --git a/samples/Myra.Samples.Inspector/RootWidgets.cs b/samples/Myra.Samples.Inspector/RootWidgets.cs
new file mode 100644
index 00000000..6e3fb9a1
--- /dev/null
+++ b/samples/Myra.Samples.Inspector/RootWidgets.cs
@@ -0,0 +1,168 @@
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Text;
+using Microsoft.Xna.Framework;
+using Myra.Graphics2D;
+using Myra.Graphics2D.UI;
+using Myra.Graphics2D.UI.Properties;
+
+namespace Myra.Samples.Inspector
+{
+    // All the widgets for this sample project are children of this Widget.
+    public class RootWidgets : HorizontalStackPanel
+    {
+        private Label headerLabel;
+        private Label infoLabel;
+        private PropertyGrid propertyGrid;
+
+        private bool _init;
+        private int select_index, info_index;
+        public readonly List<object> inspectables;
+        public readonly List<StringGenerator> infos;
+        private readonly StringGenerator headerInfo;
+
+        private readonly SomeChangingValues _changingValues;
+        
+        public RootWidgets()
+        {
+            BuildUI();
+
+            _changingValues = new SomeChangingValues();
+            inspectables = BuildInspectables();
+            infos = BuildInfoGenerators();
+            headerInfo = new StringGenerator(() =>
+            {
+                Type inspectedType = inspectables[select_index].GetType();
+                return $"\nInspecting object [{select_index+1}] of [{inspectables.Count}]:\n\nType: {inspectedType.Name}\nin: {inspectedType.Namespace}\nBaseType: {inspectedType.BaseType?.Name}\n\nAssembly:\n{inspectedType.Assembly.GetName().Name}\n";
+            });
+            
+            Inspect(inspectables[0]);
+        }
+
+        /// <summary>
+        /// Build the list of objects whose properties can be viewed
+        /// </summary>
+        private List<object> BuildInspectables()
+        {
+            return new List<object>()
+            {
+                new SomeTypesInAClass(),
+                new SomeNumerics(),
+                new SomeNullableNumerics(),
+                _changingValues,
+                new SpinButton<int>(),
+                this,
+                propertyGrid,
+                InspectGame.Instance
+            };
+        }
+
+        /// <summary>
+        /// Build the list of info-outputs which generate strings
+        /// </summary>
+        private List<StringGenerator> BuildInfoGenerators()
+        {
+            return new List<StringGenerator>()
+            {
+                new StringGenerator(() =>
+                {
+                    return "\n=== Controls ===\nArrowUp/ArrowDown:\n  Cycle inspected object\n\nArrowLeft/ArrowRight:\n  Cycle this info display";
+                }),
+                new StringGenerator(() =>
+                {
+                    // List loaded assemblies
+                    List<Assembly> assemblies = new List<Assembly>(AppDomain.CurrentDomain.GetAssemblies());
+                    assemblies.Sort(
+                        (a, b) => Comparer<string>.Default.Compare(a.GetName().Name, b.GetName().Name)
+                    );
+                    StringBuilder builder = new StringBuilder();
+                    int i = 0;
+                    foreach (Assembly asm in assemblies)
+                    {
+                        builder.AppendLine($" [{i}]: {asm.GetName().Name}");
+                        i++;
+                    }
+                    return $"\n=== Loaded Assemblies ===\n{builder}";
+                }),
+            };
+        }
+
+        private void BuildUI()
+        {
+            ScrollViewer scroll;
+            int scrollBarWidth = 30;
+
+            int uiWidth = 500;
+            headerLabel = new Label()
+            {
+                Width = uiWidth - scrollBarWidth,
+                SingleLine = false,
+            };
+            infoLabel = new Label()
+            {
+                Width = uiWidth - scrollBarWidth,
+                SingleLine = false,
+            };
+
+            var vert = new VerticalStackPanel()
+            {
+                Width = uiWidth - scrollBarWidth,
+            };
+            vert.Widgets.Add(headerLabel);
+            vert.Widgets.Add(new HorizontalSeparator());
+            vert.Widgets.Add(infoLabel);
+
+            scroll = new ScrollViewer()
+            {
+                ShowHorizontalScrollBar = false,
+                Content = vert,
+                Padding = new Thickness(8),
+                Width = uiWidth,
+            };
+            Widgets.Add(scroll);
+
+            uiWidth = 700;
+            propertyGrid = new PropertyGrid()
+            {
+                Width = uiWidth - scrollBarWidth,
+            };
+            scroll = new ScrollViewer()
+            {
+                ShowHorizontalScrollBar = false,
+                Content = propertyGrid,
+                Padding = new Thickness(8),
+                Width = uiWidth,
+            };
+            Widgets.Add(scroll);
+        }
+        
+        public void Inspect(object obj)
+        {
+            propertyGrid.Object = obj;
+        }
+
+        public void SetSelectedIndex(int index)
+        {
+            select_index = index;
+            propertyGrid.Object = inspectables[index];
+            headerInfo.MarkDirty();
+        }
+        public void SetInfoIndex(int index)
+        {
+            info_index = index;
+            infos[info_index].MarkDirty();
+        }
+        
+        public void OnPreRender()
+        {
+            headerLabel.Text = headerInfo.Text;
+            infoLabel.Text = infos[info_index].Text;
+        }
+
+        public void Update(GameTime time)
+        {
+            _changingValues.Update(time);
+        }
+    }
+}
\ No newline at end of file
diff --git a/samples/Myra.Samples.Inspector/StringGenerator.cs b/samples/Myra.Samples.Inspector/StringGenerator.cs
new file mode 100644
index 00000000..8cb47b30
--- /dev/null
+++ b/samples/Myra.Samples.Inspector/StringGenerator.cs
@@ -0,0 +1,36 @@
+using System;
+
+namespace Myra.Samples.Inspector
+{
+    /// <summary>
+    /// Caches generated strings and only regenerates them on a dirty-pattern basis.
+    /// </summary>
+    public class StringGenerator
+    {
+        private readonly Func<string> _textGenerator;
+        private string _textCache;
+        private bool _isDirty = true;
+
+        public string Text
+        {
+            get
+            {
+                if(_isDirty)
+                    Clean();
+                return _textCache;
+            }
+        }
+
+        public StringGenerator(Func<string> generator)
+        {
+            _textGenerator = generator;
+        }
+            
+        public void MarkDirty() => _isDirty = true;
+        private void Clean()
+        {
+            _isDirty = false;
+            _textCache = _textGenerator.Invoke();
+        }
+    }
+}
\ No newline at end of file
diff --git a/samples/Myra.Samples.Inspector/TestObjects/SomeChangingValues.cs b/samples/Myra.Samples.Inspector/TestObjects/SomeChangingValues.cs
new file mode 100644
index 00000000..8aeb793a
--- /dev/null
+++ b/samples/Myra.Samples.Inspector/TestObjects/SomeChangingValues.cs
@@ -0,0 +1,18 @@
+using Microsoft.Xna.Framework;
+
+namespace Myra.Samples.Inspector
+{
+    public class SomeChangingValues
+    {
+        public int tick;
+        public double Time { get; private set; }
+        public string EvenOrOdd { get; private set; }
+        
+        public void Update(GameTime time)
+        {
+            tick++;
+            Time = time.ElapsedGameTime.TotalSeconds;
+            EvenOrOdd = time.ElapsedGameTime.Seconds % 2 == 0 ? "Even" : "Odd";
+        }
+    }
+}
\ No newline at end of file
diff --git a/samples/Myra.Samples.Inspector/TestObjects/SomeNullableNumerics.cs b/samples/Myra.Samples.Inspector/TestObjects/SomeNullableNumerics.cs
new file mode 100644
index 00000000..c639a183
--- /dev/null
+++ b/samples/Myra.Samples.Inspector/TestObjects/SomeNullableNumerics.cs
@@ -0,0 +1,19 @@
+using System;
+
+namespace Myra.Samples.Inspector
+{
+    public class SomeNullableNumerics
+    {
+        public byte? @byte = null;
+        public sbyte? @sbyte = 100;
+        public short? @short = short.MaxValue;
+        public ushort? @ushort = 13;
+        public int? @int = null;
+        public uint? @uint = 353;
+        public long? @long = null;
+        public ulong? @ulong = ulong.MaxValue;
+        public float? @float = 1.14f;
+        public double? @double = Math.PI * 40;
+        public decimal? @decimal = decimal.MinusOne;
+    }
+}
\ No newline at end of file
diff --git a/samples/Myra.Samples.Inspector/TestObjects/SomeNumerics.cs b/samples/Myra.Samples.Inspector/TestObjects/SomeNumerics.cs
new file mode 100644
index 00000000..b2a1ca97
--- /dev/null
+++ b/samples/Myra.Samples.Inspector/TestObjects/SomeNumerics.cs
@@ -0,0 +1,19 @@
+using System;
+
+namespace Myra.Samples.Inspector
+{
+    public class SomeNumerics
+    {
+        public byte @byte = 250;
+        public sbyte @sbyte = -43;
+        public short @short = short.MaxValue - 4;
+        public ushort @ushort = 333;
+        public int @int = -30;
+        public uint @uint = 30;
+        public long @long = 0;
+        public ulong @ulong = ulong.MaxValue - 4;
+        public float @float = 1.0f;
+        public double @double = Math.PI;
+        public decimal @decimal = decimal.MinusOne;
+    }
+}
\ No newline at end of file
diff --git a/samples/Myra.Samples.Inspector/TestObjects/SomeTypesInAClass.cs b/samples/Myra.Samples.Inspector/TestObjects/SomeTypesInAClass.cs
new file mode 100644
index 00000000..d0232c99
--- /dev/null
+++ b/samples/Myra.Samples.Inspector/TestObjects/SomeTypesInAClass.cs
@@ -0,0 +1,28 @@
+using System.Collections.Generic;
+using Microsoft.Xna.Framework;
+
+namespace Myra.Samples.Inspector
+{
+    public enum MyEnum
+    {
+        One = 1,
+        Five = 5,
+        Twenty = 20
+    }
+    
+    public class SomeTypesInAClass
+    {
+        public MyEnum enumValue = MyEnum.Five;
+
+        public bool checkbox = true;
+        public bool? nullableBool = null;
+
+        public string stringValue = "Hotdog";
+
+        public Color colorValue = Color.Honeydew;
+
+        public List<string> stringCollection = new List<string>();
+
+        public byte @byte = 250;
+    }
+}
\ No newline at end of file
diff --git a/samples/Myra.Samples.NonModalWindows/UI/Window1.Generated.cs b/samples/Myra.Samples.NonModalWindows/UI/Window1.Generated.cs
index a5c62c49..074ffa62 100644
--- a/samples/Myra.Samples.NonModalWindows/UI/Window1.Generated.cs
+++ b/samples/Myra.Samples.NonModalWindows/UI/Window1.Generated.cs
@@ -1,4 +1,4 @@
-/* Generated by MyraPad at 9/8/2022 6:36:42 AM */
+/* Generated by MyraPad at 2/22/2026 2:31:20 AM */
 using Myra;
 using Myra.Graphics2D;
 using Myra.Graphics2D.TextureAtlases;
@@ -6,8 +6,19 @@
 using Myra.Graphics2D.Brushes;
 using Myra.Graphics2D.UI.Properties;
 using FontStashSharp.RichText;
+using AssetManagementBase;
+
+#if STRIDE
+using Stride.Core.Mathematics;
+#elif PLATFORM_AGNOSTIC
+using System.Drawing;
+using System.Numerics;
+using Color = FontStashSharp.FSColor;
+#else
+// MonoGame/FNA
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
+#endif
 
 namespace Myra.Samples.NonModalWindows.UI
 {
@@ -21,8 +32,11 @@ private void BuildUI()
 			var label2 = new Label();
 			label2.Text = "Strength";
 
-			var spinButton1 = new SpinButton();
+			var spinButton1 = new SpinButton<float>();
 			spinButton1.Value = 5;
+			spinButton1.Increment = 1;
+			spinButton1.Mul_Increment = 1;
+			spinButton1.DecimalPlaces = 0;
 			spinButton1.Width = 50;
 			Grid.SetColumn(spinButton1, 1);
 
@@ -30,8 +44,11 @@ private void BuildUI()
 			label3.Text = "Dexterity";
 			Grid.SetRow(label3, 1);
 
-			var spinButton2 = new SpinButton();
+			var spinButton2 = new SpinButton<float>();
 			spinButton2.Value = 5;
+			spinButton2.Increment = 1;
+			spinButton2.Mul_Increment = 1;
+			spinButton2.DecimalPlaces = 0;
 			spinButton2.Width = 50;
 			Grid.SetColumn(spinButton2, 1);
 			Grid.SetRow(spinButton2, 1);
@@ -40,8 +57,11 @@ private void BuildUI()
 			label4.Text = "Constitution";
 			Grid.SetRow(label4, 2);
 
-			var spinButton3 = new SpinButton();
+			var spinButton3 = new SpinButton<float>();
 			spinButton3.Value = 5;
+			spinButton3.Increment = 1;
+			spinButton3.Mul_Increment = 1;
+			spinButton3.DecimalPlaces = 0;
 			spinButton3.Width = 50;
 			Grid.SetColumn(spinButton3, 1);
 			Grid.SetRow(spinButton3, 2);
@@ -50,8 +70,11 @@ private void BuildUI()
 			label5.Text = "Intelligence";
 			Grid.SetRow(label5, 3);
 
-			var spinButton4 = new SpinButton();
+			var spinButton4 = new SpinButton<float>();
 			spinButton4.Value = 5;
+			spinButton4.Increment = 1;
+			spinButton4.Mul_Increment = 1;
+			spinButton4.DecimalPlaces = 0;
 			spinButton4.Width = 50;
 			Grid.SetColumn(spinButton4, 1);
 			Grid.SetRow(spinButton4, 3);
@@ -60,8 +83,11 @@ private void BuildUI()
 			label6.Text = "Wisdom";
 			Grid.SetRow(label6, 4);
 
-			var spinButton5 = new SpinButton();
+			var spinButton5 = new SpinButton<float>();
 			spinButton5.Value = 5;
+			spinButton5.Increment = 1;
+			spinButton5.Mul_Increment = 1;
+			spinButton5.DecimalPlaces = 0;
 			spinButton5.Width = 50;
 			Grid.SetColumn(spinButton5, 1);
 			Grid.SetRow(spinButton5, 4);
@@ -70,8 +96,11 @@ private void BuildUI()
 			label7.Text = "Charisma";
 			Grid.SetRow(label7, 5);
 
-			var spinButton6 = new SpinButton();
+			var spinButton6 = new SpinButton<float>();
 			spinButton6.Value = 5;
+			spinButton6.Increment = 1;
+			spinButton6.Mul_Increment = 1;
+			spinButton6.DecimalPlaces = 0;
 			spinButton6.Width = 50;
 			Grid.SetColumn(spinButton6, 1);
 			Grid.SetRow(spinButton6, 5);
@@ -107,8 +136,8 @@ private void BuildUI()
 
 			
 			Title = "Window 1";
-			Left = 395;
-			Top = 210;
+			Left = 179;
+			Top = 168;
 			Content = verticalStackPanel1;
 		}
 
diff --git a/samples/Myra.Samples.NonModalWindows/UI/window1.xmmp b/samples/Myra.Samples.NonModalWindows/UI/window1.xmmp
index df91b837..7a71f3ef 100644
--- a/samples/Myra.Samples.NonModalWindows/UI/window1.xmmp
+++ b/samples/Myra.Samples.NonModalWindows/UI/window1.xmmp
@@ -7,17 +7,17 @@
         <Grid.DefaultColumnProportion Type="Auto" />
         <Grid.DefaultRowProportion Type="Auto" />
         <Label Text="Strength" />
-        <SpinButton Value="5" Width="50" Grid.Column="1" />
+        <SpinButton GenericTypeArg="float" Value="5" Increment="1" Mul_Increment="1" DecimalPlaces="0" Width="50" Grid.Column="1" />
         <Label Text="Dexterity" Grid.Row="1" />
-        <SpinButton Value="5" Width="50" Grid.Column="1" Grid.Row="1" />
+        <SpinButton GenericTypeArg="float" Value="5" Increment="1" Mul_Increment="1" DecimalPlaces="0" Width="50" Grid.Column="1" Grid.Row="1" />
         <Label Text="Constitution" Grid.Row="2" />
-        <SpinButton Value="5" Width="50" Grid.Column="1" Grid.Row="2" />
+        <SpinButton GenericTypeArg="float" Value="5" Increment="1" Mul_Increment="1" DecimalPlaces="0" Width="50" Grid.Column="1" Grid.Row="2" />
         <Label Text="Intelligence" Grid.Row="3" />
-        <SpinButton Value="5" Width="50" Grid.Column="1" Grid.Row="3" />
+        <SpinButton GenericTypeArg="float" Value="5" Increment="1" Mul_Increment="1" DecimalPlaces="0" Width="50" Grid.Column="1" Grid.Row="3" />
         <Label Text="Wisdom" Grid.Row="4" />
-        <SpinButton Value="5" Width="50" Grid.Column="1" Grid.Row="4" />
+        <SpinButton GenericTypeArg="float" Value="5" Increment="1" Mul_Increment="1" DecimalPlaces="0" Width="50" Grid.Column="1" Grid.Row="4" />
         <Label Text="Charisma" Grid.Row="5" />
-        <SpinButton Value="5" Width="50" Grid.Column="1" Grid.Row="5" />
+        <SpinButton GenericTypeArg="float" Value="5" Increment="1" Mul_Increment="1" DecimalPlaces="0" Width="50" Grid.Column="1" Grid.Row="5" />
       </Grid>
     </VerticalStackPanel>
   </Window>
diff --git a/samples/Myra.Samples.TextRendering/UI/MainPanel.Generated.cs b/samples/Myra.Samples.TextRendering/UI/MainPanel.Generated.cs
index 081e76ca..500dfb40 100644
--- a/samples/Myra.Samples.TextRendering/UI/MainPanel.Generated.cs
+++ b/samples/Myra.Samples.TextRendering/UI/MainPanel.Generated.cs
@@ -1,4 +1,4 @@
-/* Generated by MyraPad at 1/4/2024 7:37:43 AM */
+/* Generated by MyraPad at 2/22/2026 10:32:19 AM */
 using Myra;
 using Myra.Graphics2D;
 using Myra.Graphics2D.TextureAtlases;
@@ -71,8 +71,11 @@ private void BuildUI()
 			var label4 = new Label();
 			label4.Text = "Font Size:";
 
-			_spinButtonFontSize = new SpinButton();
-			_spinButtonFontSize.Value = 32;
+			_spinButtonFontSize = new SpinButton<float>();
+			_spinButtonFontSize.Value = 32f;
+			_spinButtonFontSize.Increment = 1f;
+			_spinButtonFontSize.Mul_Increment = 1f;
+			_spinButtonFontSize.DecimalPlaces = 0;
 			_spinButtonFontSize.Width = 40;
 			_spinButtonFontSize.Id = "_spinButtonFontSize";
 
@@ -84,8 +87,8 @@ private void BuildUI()
 
 			_sliderScale = new HorizontalSlider();
 			_sliderScale.Minimum = 0.1f;
-			_sliderScale.Maximum = 10;
-			_sliderScale.Value = 1;
+			_sliderScale.Maximum = 10f;
+			_sliderScale.Value = 1f;
 			_sliderScale.Width = 200;
 			_sliderScale.Id = "_sliderScale";
 
@@ -153,25 +156,36 @@ private void BuildUI()
 			var label14 = new Label();
 			label14.Text = "Resolution Factor:";
 
-			_spinButtonResolutionFactor = new SpinButton();
-			_spinButtonResolutionFactor.Minimum = 1;
-			_spinButtonResolutionFactor.Value = 1;
+			_spinButtonResolutionFactor = new SpinButton<float>();
+			_spinButtonResolutionFactor.Minimum = 1f;
+			_spinButtonResolutionFactor.Value = 1f;
+			_spinButtonResolutionFactor.Increment = 1f;
+			_spinButtonResolutionFactor.Mul_Increment = 1f;
+			_spinButtonResolutionFactor.DecimalPlaces = 0;
 			_spinButtonResolutionFactor.Width = 40;
 			_spinButtonResolutionFactor.Id = "_spinButtonResolutionFactor";
 
 			var label15 = new Label();
 			label15.Text = "Kernel Width:";
 
-			_spinButtonKernelWidth = new SpinButton();
-			_spinButtonKernelWidth.Minimum = 0;
+			_spinButtonKernelWidth = new SpinButton<float>();
+			_spinButtonKernelWidth.Minimum = 0f;
+			_spinButtonKernelWidth.Value = 0f;
+			_spinButtonKernelWidth.Increment = 1f;
+			_spinButtonKernelWidth.Mul_Increment = 1f;
+			_spinButtonKernelWidth.DecimalPlaces = 0;
 			_spinButtonKernelWidth.Width = 40;
 			_spinButtonKernelWidth.Id = "_spinButtonKernelWidth";
 
 			var label16 = new Label();
 			label16.Text = "Kernel Height:";
 
-			_spinButtonKernelHeight = new SpinButton();
-			_spinButtonKernelHeight.Minimum = 0;
+			_spinButtonKernelHeight = new SpinButton<float>();
+			_spinButtonKernelHeight.Minimum = 0f;
+			_spinButtonKernelHeight.Value = 0f;
+			_spinButtonKernelHeight.Increment = 1f;
+			_spinButtonKernelHeight.Mul_Increment = 1f;
+			_spinButtonKernelHeight.DecimalPlaces = 0;
 			_spinButtonKernelHeight.Width = 40;
 			_spinButtonKernelHeight.Id = "_spinButtonKernelHeight";
 
@@ -201,6 +215,7 @@ private void BuildUI()
 			_textBoxText.Id = "_textBoxText";
 
 			var scrollViewer1 = new ScrollViewer();
+			scrollViewer1.ScrollMultiplier = 10;
 			scrollViewer1.Content = _textBoxText;
 
 			_imageTexture = new Image();
@@ -231,16 +246,16 @@ private void BuildUI()
 		public TextBox _textBoxFont;
 		public Button _buttonBrowseFont;
 		public Button _buttonReset;
-		public SpinButton _spinButtonFontSize;
+		public SpinButton<float> _spinButtonFontSize;
 		public HorizontalSlider _sliderScale;
 		public Label _labelScaleValue;
 		public ComboView _comboRasterizer;
 		public ComboView _comboRenderer;
 		public CheckButton _checkBoxSmoothText;
 		public CheckButton _checkBoxShowTexture;
-		public SpinButton _spinButtonResolutionFactor;
-		public SpinButton _spinButtonKernelWidth;
-		public SpinButton _spinButtonKernelHeight;
+		public SpinButton<float> _spinButtonResolutionFactor;
+		public SpinButton<float> _spinButtonKernelWidth;
+		public SpinButton<float> _spinButtonKernelHeight;
 		public TextBox _textBoxText;
 		public Image _imageTexture;
 	}
diff --git a/samples/Myra.Samples.TextRendering/UI/mainPanel.xmmp b/samples/Myra.Samples.TextRendering/UI/mainPanel.xmmp
index 4af3bbfd..86c67559 100644
--- a/samples/Myra.Samples.TextRendering/UI/mainPanel.xmmp
+++ b/samples/Myra.Samples.TextRendering/UI/mainPanel.xmmp
@@ -19,7 +19,7 @@
         </HorizontalStackPanel>
         <HorizontalStackPanel Spacing="8">
           <Label Text="Font Size:" />
-          <SpinButton Value="32" Width="40" Id="_spinButtonFontSize" />
+          <SpinButton GenericTypeArg="float" Value="32" Increment="1" Mul_Increment="1" DecimalPlaces="0" Width="40" Id="_spinButtonFontSize" />
           <Label Text="Scale:" />
           <Label Text="0.1" />
           <VerticalStackPanel>
@@ -44,17 +44,17 @@
         </HorizontalStackPanel>
         <HorizontalStackPanel Spacing="8">
           <Label Text="Resolution Factor:" />
-          <SpinButton Minimum="1" Value="1" Width="40" Id="_spinButtonResolutionFactor" />
+          <SpinButton GenericTypeArg="float" Minimum="1" Value="1" Increment="1" Mul_Increment="1" DecimalPlaces="0" Width="40" Id="_spinButtonResolutionFactor" />
           <Label Text="Kernel Width:" />
-          <SpinButton Minimum="0" Width="40" Id="_spinButtonKernelWidth" />
+          <SpinButton GenericTypeArg="float" Minimum="0" Value="0" Increment="1" Mul_Increment="1" DecimalPlaces="0" Width="40" Id="_spinButtonKernelWidth" />
           <Label Text="Kernel Height:" />
-          <SpinButton Minimum="0" Width="40" Id="_spinButtonKernelHeight" />
+          <SpinButton GenericTypeArg="float" Minimum="0" Value="0" Increment="1" Mul_Increment="1" DecimalPlaces="0" Width="40" Id="_spinButtonKernelHeight" />
         </HorizontalStackPanel>
       </VerticalStackPanel>
       <HorizontalSeparator />
       <HorizontalStackPanel StackPanel.ProportionType="Part">
         <HorizontalStackPanel.DefaultProportion Type="Part" />
-        <ScrollViewer>
+        <ScrollViewer ScrollMultiplier="10">
           <TextBox Text="/tuThe quick brown/n/ts/c[blue]fox jumps over/n/td/c[green]the lazy dog" Multiline="True" Wrap="True" VerticalAlignment="Stretch" Id="_textBoxText" />
         </ScrollViewer>
         <Image Id="_imageTexture" />
diff --git a/src/Myra/Graphics2D/UI/Project.cs b/src/Myra/Graphics2D/UI/Project.cs
index 1ce17b71..e5430591 100644
--- a/src/Myra/Graphics2D/UI/Project.cs
+++ b/src/Myra/Graphics2D/UI/Project.cs
@@ -7,6 +7,7 @@
 using System;
 using Myra.MML;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using Myra.Attributes;
 using System.Linq;
 using Myra.Graphics2D.TextureAtlases;
@@ -44,7 +45,7 @@ public ObjectPosition(object obj, int start, int end)
 
 	public class Project
 	{
-		private struct StylesheetChanger: IDisposable
+		private struct StylesheetChanger : IDisposable
 		{
 			private readonly Stylesheet _oldStylesheet;
 
@@ -64,8 +65,21 @@ public void Dispose()
 		public const string DefaultProportionName = "DefaultProportion";
 		public const string DefaultColumnProportionName = "DefaultColumnProportion";
 		public const string DefaultRowProportionName = "DefaultRowProportion";
-
-		private static readonly Dictionary<string, string> LegacyClassNames = new Dictionary<string, string>();
+		
+		public const string GenericTypeArgName = "GenericTypeArg";
+		internal const char LegacySeparator = ':';
+		internal const string LegacyClassToGeneric = "TO_GENERIC";
+		internal const string LegacyToGenericDefaultType = "DEFAULT_TYPE";
+		private static readonly ReadOnlyDictionary<string, string> LegacyClassNames = new ReadOnlyDictionary<string, string>(new Dictionary<string, string>
+		{
+			{"VerticalBox",   "VerticalStackPanel"},
+			{"HorizontalBox", "HorizontalStackPanel"},
+			{"TextField",     "TextBox"},
+			{"TextBlock",     "Label"},
+			{"ScrollPane",    "ScrollViewer"},
+			// SpinButton was made generic, default to SpinButton<float> if using legacy format:
+			{"SpinButton", $"{LegacyClassToGeneric}{LegacySeparator}SpinButton<>{LegacySeparator}{LegacyToGenericDefaultType}{LegacySeparator}Single"},
+		});
 
 		private readonly ExportOptions _exportOptions = new ExportOptions();
 
@@ -95,16 +109,7 @@ public ExportOptions ExportOptions
 		[Browsable(false)]
 		[XmlIgnore]
 		public List<Tuple<object, XElement>> ObjectsNodes { get; internal set; }
-
-		static Project()
-		{
-			LegacyClassNames["VerticalBox"] = "VerticalStackPanel";
-			LegacyClassNames["HorizontalBox"] = "HorizontalStackPanel";
-			LegacyClassNames["TextField"] = "TextBox";
-			LegacyClassNames["TextBlock"] = "Label";
-			LegacyClassNames["ScrollPane"] = "ScrollViewer";
-		}
-
+		
 		public Project()
 		{
 			Stylesheet = Stylesheet.Current;
@@ -208,11 +213,12 @@ internal static LoadContext CreateLoadContext(AssetManager assetManager)
 			};
 
 			Dictionary<Assembly, string[]> assemblies = new Dictionary<Assembly, string[]>(ExtraWidgetAssembliesAndNamespaces);
+			assemblies.Add(typeof(float).Assembly, new string[] { typeof(float).Namespace });
 			assemblies.Add(typeof(Widget).Assembly, new string[] { typeof(Widget).Namespace, typeof(PropertyGrid).Namespace });
 			return new LoadContext
 			{
 				Assemblies = assemblies,
-				LegacyClassNames = LegacyClassNames,
+				LegacyClassNames = new Dictionary<string, string>(LegacyClassNames),
 				ObjectCreator = (t, el) => CreateItem(t, el),
 				ResourceGetter = resourceGetter
 			};
diff --git a/src/Myra/Graphics2D/UI/Properties/Editors/BooleanPropertyEditor.cs b/src/Myra/Graphics2D/UI/Properties/Editors/BooleanPropertyEditor.cs
new file mode 100644
index 00000000..9865f917
--- /dev/null
+++ b/src/Myra/Graphics2D/UI/Properties/Editors/BooleanPropertyEditor.cs
@@ -0,0 +1,64 @@
+using System;
+using Myra.Utility.Types;
+
+namespace Myra.Graphics2D.UI.Properties.Editors
+{
+    [PropertyEditor(typeof(BooleanPropertyEditor), typeof(bool))]
+    public sealed class BooleanPropertyEditor : StructPropertyEditor<bool>
+    {
+        private readonly bool _hasSetter;
+        private readonly bool _nullable;
+        public bool IsNullable => _nullable;
+        
+        public BooleanPropertyEditor(IInspector owner, Record methodInfo) : base(owner, methodInfo)
+        {
+            Type type = methodInfo.Type;
+            _nullable = TypeHelper.GetNullableTypeOrPassThrough(ref type);
+            _hasSetter = methodInfo.HasSetter;
+        }
+        
+        protected override bool CreatorPicker(out WidgetCreatorDelegate creatorDelegate)
+        {
+            creatorDelegate = CreateCheckBox;
+            return true;
+        }
+
+        private bool CreateCheckBox(out Widget widget)
+        {
+            if (_owner.SelectedField == null)
+            {
+                widget = null;
+                return false;
+            }
+            
+            var cb = new CheckButton
+            {
+                IsChecked = GetValue(_owner.SelectedField)
+            };
+            
+            if (_record.HasSetter)
+            {
+                cb.Click += (sender, args) =>
+                {
+                    SetValue(_owner.SelectedField, !cb.IsChecked);
+                };
+            }
+            else
+            {
+                cb.Enabled = false;
+            }
+
+            Widget = widget = cb;
+            return true;
+        }
+        
+        /// <inheritdoc />
+        public override void SetWidgetValue(bool? value)
+        {
+            var cb = Widget as CheckButton;
+            if (!_nullable && !value.HasValue)
+                value = false;
+            cb.IsChecked = value.Value;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Myra/Graphics2D/UI/Properties/Editors/BrushPropertyEditor.cs b/src/Myra/Graphics2D/UI/Properties/Editors/BrushPropertyEditor.cs
new file mode 100644
index 00000000..b45fc8e6
--- /dev/null
+++ b/src/Myra/Graphics2D/UI/Properties/Editors/BrushPropertyEditor.cs
@@ -0,0 +1,140 @@
+using System;
+using FontStashSharp.RichText;
+using Myra.Graphics2D.Brushes;
+using Myra.Graphics2D.UI.ColorPicker;
+using Myra.Graphics2D.UI.Styles;
+using Myra.MML;
+
+#if MONOGAME || FNA
+using Microsoft.Xna.Framework;
+#elif STRIDE
+using Stride.Core.Mathematics;
+#else
+using Color = FontStashSharp.FSColor;
+#endif
+
+namespace Myra.Graphics2D.UI.Properties.Editors
+{
+	[PropertyEditor(typeof(BrushPropertyEditor), typeof(IBrush))]
+	public class BrushPropertyEditor : PropertyEditor<IBrush>
+	{
+		private Image _imgDisplay;
+		public BrushPropertyEditor(IInspector owner, Record methodInfo) : base(owner, methodInfo)
+		{
+			
+		}
+		
+		protected override bool CreatorPicker(out WidgetCreatorDelegate creatorDelegate)
+		{
+			creatorDelegate = CreateBrushEditor;
+			return true;
+		}
+		
+        private bool CreateBrushEditor(out Widget widget)
+        {
+			var value = GetValue(_owner.SelectedField) as SolidBrush;
+
+			var subGrid = new Grid
+			{
+				ColumnSpacing = 8,
+				HorizontalAlignment = HorizontalAlignment.Stretch
+			};
+
+			subGrid.ColumnsProportions.Add(new Proportion());
+			subGrid.ColumnsProportions.Add(new Proportion(ProportionType.Fill));
+
+			var color = Color.Transparent;
+			if (value != null)
+			{
+				color = value.Color;
+			}
+
+			var image = new Image
+			{
+				Renderable = Stylesheet.Current.WhiteRegion,
+				VerticalAlignment = VerticalAlignment.Center,
+				Width = 32,
+				Height = 16,
+				Color = color
+			};
+
+			subGrid.Widgets.Add(image);
+
+			var button = new Button
+			{
+				Tag = value,
+				HorizontalAlignment = HorizontalAlignment.Stretch,
+				Content = new Label
+				{
+					Text = "Change...",
+					HorizontalAlignment = HorizontalAlignment.Center,
+				}
+			};
+			Grid.SetColumn(button, 1);
+
+			subGrid.Widgets.Add(button);
+
+			if (_record.HasSetter)
+			{
+				button.Click += (sender, args) =>
+				{
+					var dlg = new ColorPickerDialog()
+					{
+						Color = image.Color
+					};
+
+					dlg.Closed += (s, a) =>
+					{
+						if (!dlg.Result)
+						{
+							return;
+						}
+
+						image.Color = dlg.Color;
+						SetValue(_owner.SelectedField, new SolidBrush(dlg.Color));
+						var baseObject = _owner.SelectedField as BaseObject;
+						if (baseObject != null)
+						{
+							baseObject.Resources[_record.Name] = dlg.Color.ToHexString();
+						}
+						_owner.FireChanged(_record.Type.Name);
+					};
+
+					dlg.ShowModal(_owner.Desktop);
+				};
+			}
+			else
+			{
+				button.Enabled = false;
+			}
+
+			_imgDisplay = image;
+			Widget = widget = subGrid;
+			return true;
+        }
+        
+        /// <inheritdoc />
+        public override void SetWidgetValue(object value)
+        {
+	        if(_imgDisplay == null || value == null)
+		        return;
+	        
+	        if (value is Color color)
+		        _imgDisplay.Color = color;
+	        else if(value is IBrush brush)
+		        SetWidgetValue(brush);
+        }
+
+        /// <inheritdoc />
+        public override void SetWidgetValue(IBrush value)
+        {
+	        if(_imgDisplay == null)
+		        return;
+	        
+	        if (value is SolidBrush sBrush)
+		        _imgDisplay.Color = sBrush.Color;
+	        else if(value is IBrush otherBrush)
+		        Console.WriteLine($"Can't display IBrush type: {otherBrush.GetType()}");
+        }
+	}
+}
\ No newline at end of file
diff --git a/src/Myra/Graphics2D/UI/Properties/Editors/CollectionPropertyEditor.cs b/src/Myra/Graphics2D/UI/Properties/Editors/CollectionPropertyEditor.cs
new file mode 100644
index 00000000..7be17e0b
--- /dev/null
+++ b/src/Myra/Graphics2D/UI/Properties/Editors/CollectionPropertyEditor.cs
@@ -0,0 +1,95 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+
+namespace Myra.Graphics2D.UI.Properties.Editors
+{
+	[PropertyEditor(typeof(CollectionPropertyEditor), typeof(IList))]
+	public class CollectionPropertyEditor : PropertyEditor<IList>
+	{
+		private readonly Type collectionKind;
+	    
+		public CollectionPropertyEditor(IInspector owner, Record methodInfo) : base(owner, methodInfo)
+		{
+			collectionKind = methodInfo.Type.GenericTypeArguments[0];
+		}
+		
+		protected override bool CreatorPicker(out WidgetCreatorDelegate creatorDelegate)
+		{
+			creatorDelegate = CreateCollectionPropEditor;
+			return true;
+		}
+		
+        private bool CreateCollectionPropEditor(out Widget widget)
+        {
+            object value = _record.GetValue(_owner.SelectedField);
+            IList items = (IList)value;
+
+            var subGrid = new Grid
+            {
+            	ColumnSpacing = 8,
+            	HorizontalAlignment = HorizontalAlignment.Stretch
+            };
+
+            subGrid.ColumnsProportions.Add(new Proportion());
+            subGrid.ColumnsProportions.Add(new Proportion(ProportionType.Fill));
+
+            var label = new Label
+            {
+            	VerticalAlignment = VerticalAlignment.Center,
+            };
+            UpdateLabelCount(label, items.Count);
+
+            subGrid.Widgets.Add(label);
+
+            var button = new Button
+            {
+            	Tag = value,
+            	HorizontalAlignment = HorizontalAlignment.Stretch,
+            	Content = new Label
+            	{
+            		Text = "Change...",
+            		HorizontalAlignment = HorizontalAlignment.Center,
+            	}
+            };
+            Grid.SetColumn(button, 1);
+
+            button.Click += (sender, args) =>
+            {
+            	var collectionEditor = new CollectionEditor(items, collectionKind);
+
+            	var dialog = Dialog.CreateMessageBox("Edit", collectionEditor);
+
+            	dialog.ButtonOk.Click += (o, eventArgs) =>
+            	{
+            		collectionEditor.SaveChanges();
+            		UpdateLabelCount(label, items.Count);
+            	};
+
+            	dialog.ShowModal(_owner.Desktop);
+            };
+
+            subGrid.Widgets.Add(button);
+
+            widget = subGrid;
+            return true;
+        }
+        
+        private static void UpdateLabelCount(Label textBlock, int count)
+        {
+	        textBlock.Text = string.Format("{0} Items", count);
+        }
+        
+        /// <inheritdoc />
+        public override void SetWidgetValue(object value)
+        {
+	        Console.WriteLine("CollectionPropertyEditor SetWidgetValue Not implemented"); //TODO
+        }
+
+        /// <inheritdoc />
+        public override void SetWidgetValue(IList value)
+        {
+	        throw new NotImplementedException();
+        }
+	}
+}
\ No newline at end of file
diff --git a/src/Myra/Graphics2D/UI/Properties/Editors/ColorPropertyEditor.cs b/src/Myra/Graphics2D/UI/Properties/Editors/ColorPropertyEditor.cs
new file mode 100644
index 00000000..1122cf4e
--- /dev/null
+++ b/src/Myra/Graphics2D/UI/Properties/Editors/ColorPropertyEditor.cs
@@ -0,0 +1,127 @@
+using Myra.Graphics2D.UI.ColorPicker;
+using Myra.Graphics2D.UI.Styles;
+
+#if MONOGAME || FNA
+using Microsoft.Xna.Framework;
+#elif STRIDE
+using Stride.Core.Mathematics;
+#else
+using Color = FontStashSharp.FSColor;
+#endif
+
+namespace Myra.Graphics2D.UI.Properties.Editors
+{
+    [PropertyEditor(typeof(ColorPropertyEditor), typeof(Color))]
+    public sealed class ColorPropertyEditor : StructPropertyEditor<Color>
+    {
+        private Image _colorDisplay;
+        public ColorPropertyEditor(IInspector owner, Record methodInfo) : base(owner, methodInfo)
+        {
+
+        }
+
+        protected override bool CreatorPicker(out WidgetCreatorDelegate creatorDelegate)
+        {
+            creatorDelegate = CreateEditor;
+            return true;
+        }
+
+        private bool CreateEditor(out Widget widget)
+        {
+            if (_owner.SelectedField == null)
+            {
+                widget = null;
+                return false;
+            }
+            
+            var propertyType = _record.Type;
+            var value = _record.GetValue(_owner.SelectedField);
+            
+            var subGrid = new Grid
+            {
+                ColumnSpacing = 8,
+                HorizontalAlignment = HorizontalAlignment.Stretch
+            };
+
+            var isColor = propertyType == typeof(Color);
+
+            subGrid.ColumnsProportions.Add(new Proportion());
+            subGrid.ColumnsProportions.Add(new Proportion(ProportionType.Fill));
+
+            var color = Color.Transparent;
+            if (isColor)
+            {
+                color = (Color)value;
+            }
+            else if (value != null)
+            {
+                color = ((Color?)value).Value;
+            }
+
+            var image = new Image
+            {
+                Renderable = Stylesheet.Current.WhiteRegion,
+                VerticalAlignment = VerticalAlignment.Center,
+                Width = 32,
+                Height = 16,
+                Color = color
+            };
+            _colorDisplay = image;
+            subGrid.Widgets.Add(image);
+
+            var button = new Button
+            {
+                Tag = value,
+                HorizontalAlignment = HorizontalAlignment.Stretch,
+                Content = new Label
+                {
+                    HorizontalAlignment = HorizontalAlignment.Center,
+                    Text = "Change..."
+                }
+            };
+            Grid.SetColumn(button, 1);
+
+            subGrid.Widgets.Add(button);
+            widget = subGrid;
+            
+            if (_record.HasSetter)
+            {
+                button.Click += (sender, args) =>
+                {
+                    var dlg = new ColorPickerDialog()
+                    {
+                        Color = image.Color
+                    };
+
+                    dlg.Closed += (s, a) =>
+                    {
+                        if (!dlg.Result)
+                        {
+                            return;
+                        }
+
+                        image.Color = dlg.Color;
+                        SetValue(_owner.SelectedField, dlg.Color);
+
+                        _owner.FireChanged(propertyType.Name);
+                    };
+
+                    dlg.ShowModal(_owner.Desktop);
+                };
+            }
+            else
+            {
+                button.Enabled = false;
+            }
+
+            return true;
+        }
+        
+        public override void SetWidgetValue(Color? value)
+        {
+            if (!value.HasValue)
+                value = Color.Magenta;
+            _colorDisplay.Color = value.Value;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Myra/Graphics2D/UI/Properties/Editors/EnumPropertyEditor.cs b/src/Myra/Graphics2D/UI/Properties/Editors/EnumPropertyEditor.cs
new file mode 100644
index 00000000..a8214d62
--- /dev/null
+++ b/src/Myra/Graphics2D/UI/Properties/Editors/EnumPropertyEditor.cs
@@ -0,0 +1,96 @@
+using System;
+using Myra.Utility;
+using Myra.Utility.Types;
+
+namespace Myra.Graphics2D.UI.Properties.Editors
+{
+    [PropertyEditor(typeof(EnumPropertyEditor<>), typeof(Enum))]
+    public sealed class EnumPropertyEditor<TEnum> : StructPropertyEditor<TEnum> where TEnum : struct, Enum
+    {
+        private Array _values;
+        private bool _nullable;
+        
+        public EnumPropertyEditor(IInspector owner, Record methodInfo) : base(owner, methodInfo)
+        {
+            if (!methodInfo.Type.IsEnum)
+                throw new TypeLoadException($"Record is not an enum: {methodInfo.Type}");
+        }
+        
+        protected override void Initialize()
+        {
+            Type type = typeof(TEnum);
+            _nullable = TypeHelper.GetNullableTypeOrPassThrough(ref type);
+            _values = Enum.GetValues(type);
+        }
+
+        protected override bool CreatorPicker(out WidgetCreatorDelegate creatorDelegate)
+        {
+            //TODO - support flags enums
+            creatorDelegate = CreateComboView;
+            return true;
+        }
+
+        private bool CreateComboView(out Widget widget)
+        {
+            if (_owner.SelectedField == null)
+            {
+                widget = null;
+                return false;
+            }
+            
+            var cv = new ComboView();
+            
+            if (_nullable)
+            {
+                cv.Widgets.Add(new Label
+                {
+                    Text = string.Empty,
+                    Tag = null
+                });
+            }
+
+            foreach (var v in _values)
+            {
+                cv.Widgets.Add(new Label
+                {
+                    Text = v.ToString(),
+                    Tag = v
+                });
+            }
+
+            object obj = _record.GetValue(_owner.SelectedField);
+            
+            int selectedIndex = Array.IndexOf(_values, obj);
+            if (_nullable)
+            {
+                ++selectedIndex;
+            }
+            cv.SelectedIndex = selectedIndex;
+            
+            if (_record.HasSetter)
+            {
+                cv.SelectedIndexChanged += (sender, args) =>
+                {
+                    if (cv.SelectedIndex != -1)
+                    { 
+                        SetValue(_owner.SelectedField, cv.SelectedItem.Tag);
+                    }
+                };
+            }
+            else
+            {
+                cv.Enabled = false;
+            }
+
+            widget = cv;
+            return true;
+        }
+        
+        public override void SetWidgetValue(TEnum? value)
+        {
+            var cb = Widget as ComboView;
+            int i = Array.IndexOf(_values, value);
+            cb.SelectedIndex = i;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Myra/Graphics2D/UI/Properties/Editors/NumericPropertyEditor.cs b/src/Myra/Graphics2D/UI/Properties/Editors/NumericPropertyEditor.cs
new file mode 100644
index 00000000..8b26ce48
--- /dev/null
+++ b/src/Myra/Graphics2D/UI/Properties/Editors/NumericPropertyEditor.cs
@@ -0,0 +1,203 @@
+using System;
+using Myra.Utility.Types;
+#if MATH_IFACES
+using System.Numerics;
+#endif
+
+namespace Myra.Graphics2D.UI.Properties.Editors
+{
+	[PropertyEditor(typeof(NumericPropertyEditor<>), 
+		typeof(byte), typeof(sbyte), typeof(byte?), typeof(sbyte?),
+		typeof(short), typeof(ushort), typeof(short?), typeof(ushort?), 
+		typeof(int), typeof(uint), typeof(int?), typeof(uint?), 
+		typeof(long), typeof(ulong), typeof(long?), typeof(ulong?),
+		typeof(float), typeof(float?), typeof(double), typeof(double?), 
+		typeof(decimal), typeof(decimal?))]
+	public sealed class NumericPropertyEditor<TNum> : StructPropertyEditor<TNum>, INumberRecordReference<TNum> 
+#if MATH_IFACES
+		where TNum : struct, INumber<TNum>, IMinMaxValue<TNum>
+#else
+		where TNum : struct
+#endif
+	{
+		private Type _underlyingType;
+		private bool _nullable;
+		private bool _doByteDodge;
+		public bool IsNullable => _nullable;
+	    public NumericPropertyEditor(IInspector owner, Record methodInfo) : base(owner, methodInfo)
+	    {
+	    }
+	    protected override void Initialize()
+	    {
+		    _underlyingType = Type;
+		    _nullable = TypeHelper.GetNullableTypeOrPassThrough(ref _underlyingType);
+		    _doByteDodge = _underlyingType == typeof(byte) | _underlyingType == typeof(sbyte);
+		    
+		    Type selfType = typeof(TNum);
+		    Type copy = selfType;
+		    TypeHelper.GetNullableTypeOrPassThrough(ref copy);
+		    if (_underlyingType != copy)
+			    throw new TypeLoadException($"Type mismatch: Generic type arg '{selfType}' is unequatable to assigned Record type '{Type}'");
+		    if (selfType.IsGenericType)
+			    throw new TypeLoadException($"Generic types are not a valid generic argument for this type: {selfType}");
+		    if (Type.IsGenericType && Type.GetGenericTypeDefinition() != typeof(Nullable<>))
+			    throw new TypeLoadException($"Record provided is a generic but not Nullable: {Type}");
+	    }
+	    
+	    protected override bool CreatorPicker(out WidgetCreatorDelegate creatorDelegate)
+	    {
+		    creatorDelegate = CreateNumericEditor;
+		    return true;
+	    }
+	    private bool CreateNumericEditor(out Widget widget)
+        {
+	        if (_owner.SelectedField == null)
+	        {
+		        widget = null;
+		        return false;
+	        }
+	        
+	        object obj = _record.GetValue(_owner.SelectedField);
+	        TNum? convert;
+	        if (_nullable)
+	        {
+		        convert = (TNum?)obj;
+	        }
+	        else
+	        {
+		        if (obj == null)
+			        convert = MathHelper<TNum>.Zero;
+		        else
+			        convert = (TNum)obj;
+	        }
+
+	        if (_doByteDodge)
+	        {
+		        widget = CreateByteDodge(convert);
+	        }
+	        else
+	        {
+		        widget = CreateNativeType(convert);
+	        }
+
+	        Widget = widget;
+	        return true;
+        }
+
+        private Widget CreateNativeType(TNum? val)
+        {
+	        var spinButton = new SpinButton<TNum>()
+	        {
+		        Nullable = _nullable,
+		        Value = val,
+	        };
+
+	        if (_record.HasSetter)
+	        {
+		        spinButton.ValueChanged += (sender, args) =>
+		        {
+			        try
+			        {
+				        if (IsNullable)
+					        SetValue(_owner.SelectedField, args.NewValue);
+				        else
+					        SetValue(_owner.SelectedField, args.NewValue.GetValueOrDefault());
+
+				        _owner.FireChanged(_record.Name);
+			        }
+			        catch (Exception ex)
+			        {
+				        spinButton.Value = args.OldValue;
+				        var dialog = Dialog.CreateMessageBox("Error", ex.ToString());
+				        dialog.ShowModal(_owner.Desktop);
+			        }
+		        };
+	        }
+	        else
+	        {
+		        spinButton.Enabled = false;
+	        }
+	        return spinButton;
+        }
+
+        private Widget CreateByteDodge(TNum? val)
+        {
+	        // val is byte or sbyte which doesn't have math ops
+	        var spinButton = new SpinButton<short>()
+	        {
+		        Nullable = _nullable,
+		        Value = NullableConvert(val),
+		        Minimum = 0,
+		        Maximum = 255,
+	        };
+
+	        if (_record.HasSetter)
+	        {
+		        spinButton.ValueChanged += (sender, args) =>
+		        {
+			        try
+			        {
+				        short? newShort = args.NewValue;
+				        if (!newShort.HasValue)
+				        {
+					        if(IsNullable)
+					        {
+						        SetValue(_owner.SelectedField, null);
+						        _owner.FireChanged(_record.Name);
+						        return;
+					        }
+					        else
+					        {
+						        SetValue(_owner.SelectedField, MathHelper<TNum>.Zero);
+						        _owner.FireChanged(_record.Name);
+						        return;
+					        }
+				        }
+				        
+				        newShort = MathHelper<short>.Clamp(newShort.Value, 0, 255);
+				        SetValue(_owner.SelectedField, MathHelper<short, TNum>.Convert(newShort.Value));
+				        _owner.FireChanged(_record.Name);
+			        }
+			        catch (Exception ex)
+			        {
+				        spinButton.Value = args.OldValue;
+				        var dialog = Dialog.CreateMessageBox("Error", ex.ToString());
+				        dialog.ShowModal(_owner.Desktop);
+			        }
+		        };
+	        }
+	        else
+	        {
+		        spinButton.Enabled = false;
+	        }
+	        return spinButton;
+        }
+        
+        public override void SetWidgetValue(TNum? value)
+        {
+	        if (Widget is SpinButton<TNum> native)
+		        native.Value = value;
+	        else if(Widget is SpinButton<short> dodge)
+	        {
+		        short? val;
+		        if (!IsNullable && !value.HasValue)
+		        {
+			        val = 0;
+		        }
+		        else
+		        {
+			        val = NullableConvert(value);
+		        }
+		        dodge.Value = val;
+	        }
+        }
+
+        private static short? NullableConvert(TNum? value)
+        {
+	        short? convert = null;
+	        if (value.HasValue)
+		        convert = MathHelper<TNum, short>.Convert(value.Value);
+	        return convert;
+        }
+	}
+}
\ No newline at end of file
diff --git a/src/Myra/Graphics2D/UI/Properties/Editors/PropertyEditor.Registry.cs b/src/Myra/Graphics2D/UI/Properties/Editors/PropertyEditor.Registry.cs
new file mode 100644
index 00000000..60a96b6b
--- /dev/null
+++ b/src/Myra/Graphics2D/UI/Properties/Editors/PropertyEditor.Registry.cs
@@ -0,0 +1,108 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Myra.Utility;
+
+namespace Myra.Graphics2D.UI.Properties.Editors
+{
+    public partial class PropertyEditor
+    {
+        /// <summary>
+        /// Relationship data for an editor and its supported types
+        /// </summary>
+        internal sealed class Registry
+        {
+            private readonly Type _editorType;
+            private readonly Type[] _types;
+            private readonly string[] _typeNames;
+            private readonly Func<Type, bool> _extraTypeChecks;
+            public Type EditorType => _editorType;
+
+            /// <summary>
+            /// Return true if the editor type is Generic and not yet complete.
+            /// </summary>
+            public bool IsOpenGenericType => _editorType.IsGenericTypeDefinition;
+
+            public Registry(Type editorType, params Type[] propertyTypes)
+            {
+                _editorType = editorType;
+                _types = propertyTypes;
+                _typeNames = TypeToString(propertyTypes);
+
+                if (propertyTypes.Length > 0 && propertyTypes[0] == typeof(Enum))
+                {
+                    _extraTypeChecks = _enumCheck;
+                }
+                else
+                {
+                    _extraTypeChecks = _falseCheck;
+                }
+            }
+
+            /// <summary>
+            /// Returns true if this editor type can support <paramref name="type"/>.
+            /// </summary>
+            /// <param name="allowCasts">Allow casting <paramref name="type"/> to an intermediate type? (Like interfaces)</param>
+            public bool CanEditType(Type type, bool allowCasts = true)
+            {
+                if (!allowCasts)
+                {
+                    for (int i = 0; i < _types.Length; i++)
+                    {
+                        Type supported = _types[i];
+                        if (object.ReferenceEquals(supported, type))
+                            return true;
+                    }
+
+                    return CanEditType(TypeToString(type));
+                }
+                else
+                {
+                    for (int i = 0; i < _types.Length; i++)
+                    {
+                        Type supported = _types[i];
+                        if (object.ReferenceEquals(supported, type))
+                            return true;
+                        if (supported.IsInterface && supported.IsAssignableFrom(type))
+                            return true;
+                        if (_extraTypeChecks.Invoke(type))
+                            return true;
+                    }
+
+                    return CanEditType(TypeToString(type));
+                }
+            }
+
+            private bool CanEditType(string value)
+            {
+                foreach (string supported in _typeNames)
+                {
+                    if (StringComparer.InvariantCultureIgnoreCase.Equals(supported, value))
+                        return true;
+                }
+
+                return false;
+            }
+
+            //TODO use a less expensive conversion here.
+            //We only use string for the purpose of testing type/type equality across assembly
+            private static string TypeToString(Type value) => value.GetFriendlyName();
+
+            private static string[] TypeToString(params Type[] args)
+            {
+                if (args == null || args.Length == 0)
+                    return null;
+                HashSet<string> result = new HashSet<string>();
+                for (int i = 0; i < args.Length; i++)
+                {
+                    result.Add(TypeToString(args[i]));
+                }
+
+                return result.ToArray();
+            }
+
+            private static bool _falseCheck(Type t) => false;
+            private static bool _enumCheck(Type t) => t.IsEnum;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Myra/Graphics2D/UI/Properties/Editors/PropertyEditor.Statics.cs b/src/Myra/Graphics2D/UI/Properties/Editors/PropertyEditor.Statics.cs
new file mode 100644
index 00000000..1a54ea91
--- /dev/null
+++ b/src/Myra/Graphics2D/UI/Properties/Editors/PropertyEditor.Statics.cs
@@ -0,0 +1,127 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Reflection;
+using Myra.Utility;
+using Myra.Utility.Types;
+
+namespace Myra.Graphics2D.UI.Properties.Editors
+{
+    public partial class PropertyEditor
+    {
+        // Statics/internals for PropertyEditor types
+        
+        protected delegate bool WidgetCreatorDelegate(out Widget widget);
+        
+        private static readonly Type[] ActivatorTypeArgs = { typeof(IInspector), typeof(Record) };
+        private static ReadOnlyCollection<Registry> _registry;
+        private static bool _init;
+        
+        public static bool TryCreate(IInspector inspector, Record bindProperty, out PropertyEditor result)
+        {
+            if (TryGetEditorTypeForType(bindProperty.Type, out Type editorType))
+            {
+                // TODO mayble cache a lookup of known constructor-info objects instead of calling GetConstructor each time?
+                ConstructorInfo ctor = editorType.GetConstructor(ActivatorTypeArgs);
+                if (ctor == null)
+                {
+                    Console.WriteLine($"PropertyEditor type '{editorType}' has an invalid constructor pattern. Expected: public ctor({ActivatorTypeArgs[0]}, {ActivatorTypeArgs[1]})");
+                    result = null;
+                    return false;
+                }
+
+                try
+                {
+                    //This also creates the widget
+                    object obj = Activator.CreateInstance(editorType, inspector, bindProperty);
+                    result = obj as PropertyEditor;
+                    return result != null;
+                }
+                catch (Exception e)
+                {
+                    Console.WriteLine($"Activator Reflection Error: {e}");
+                }
+            }
+            else
+            {
+                Console.WriteLine("Could not find property editor for type: "+bindProperty.Type);
+            }
+            result = null;
+            return false;
+        }
+        
+        private static bool TryGetEditorTypeForType(Type propertyKind, out Type editorType)
+        {
+            if (!_init)
+                InitializeRegistry();
+
+            foreach (Registry reg in _registry)
+            {
+                if (reg.CanEditType(propertyKind))
+                {
+                    if (reg.IsOpenGenericType)
+                    {
+                        TypeHelper.GetNullableTypeOrPassThrough(ref propertyKind);
+                        editorType = reg.EditorType.MakeGenericType(propertyKind);
+                    }
+                    else
+                    {
+                        editorType = reg.EditorType;
+                    }
+                    return true;
+                }
+            }
+
+            editorType = null;
+            return false;
+        }
+        
+        /// <summary>
+        /// Initialize the <see cref="PropertyEditor"/>-<see cref="Type"/> relationship registry.
+        /// </summary>
+        /// <param name="predictedCount">Internal editor-array alloc size.</param>
+        /// <param name="fromAssemblies">The assemblies which are scanned for concrete inheritors of <see cref="PropertyEditor"/>. Any <see cref="PropertyEditor"/> without <see cref="PropertyEditorAttribute"/> are ignored. Null will scan all assemblies in the current <see cref="AppDomain"/>.</param>
+        public static void InitializeRegistry(int predictedCount = 16, params Assembly[] fromAssemblies)
+        {
+            Assembly[] scanAsm;
+            if (fromAssemblies == null || fromAssemblies.Length <= 0)
+                scanAsm = AppDomain.CurrentDomain.GetAssemblies(); //this scans way more assemblies than needed, but works
+            else
+            {
+                scanAsm = fromAssemblies;
+                if(!fromAssemblies.Contains(typeof(PropertyEditor).Assembly))
+                    Console.WriteLine("PropertyEditor.InitializeRegistry() warning: Myra's Assembly was not included.");
+                //maybe ensure fromAssemblies contains Myra (this) assembly?
+            }
+            
+            Reflective_LoadTypeRegistry(predictedCount, scanAsm, out List<Registry> registry);
+
+            _registry = registry.AsReadOnly();
+            _init = true;
+        }
+        
+        /// <summary>
+        /// Generate <see cref="PropertyEditor.Registry"/> objects for each concrete <see cref="PropertyEditor"/> implementation found.
+        /// That implementation must also have a <see cref="PropertyEditorAttribute"/>.
+        /// </summary>
+        private static void Reflective_LoadTypeRegistry(int predictedCount, IEnumerable<Assembly> assemblies, out List<Registry> registry)
+        {
+            registry = new List<Registry>(predictedCount);
+            foreach (Assembly asm in assemblies)
+            {
+                foreach (Type type in asm.GetTypes()
+                    .Where(myType => myType.IsClass && !myType.IsAbstract && myType.IsSubclassOf(typeof(PropertyEditor)) ))
+                {
+                    PropertyEditorAttribute att = type.FindAttribute<PropertyEditorAttribute>();
+                    if (att == null)
+                        continue;
+                    Registry reg = att.GetRegistry();
+                    if(reg == null)
+                        continue;
+                    registry.Add(reg);
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Myra/Graphics2D/UI/Properties/Editors/PropertyEditor.cs b/src/Myra/Graphics2D/UI/Properties/Editors/PropertyEditor.cs
new file mode 100644
index 00000000..4ff9020c
--- /dev/null
+++ b/src/Myra/Graphics2D/UI/Properties/Editors/PropertyEditor.cs
@@ -0,0 +1,155 @@
+using System;
+using Myra.Utility.Types;
+
+namespace Myra.Graphics2D.UI.Properties.Editors
+{
+    /// <summary>
+    /// Attribute that ties a concrete <see cref="PropertyEditor"/> to one or more property types.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class, AllowMultiple = false)]
+    public class PropertyEditorAttribute : Attribute
+    {
+        private readonly Type attached;
+        private readonly Type[] editTypes;
+        
+        public PropertyEditorAttribute(Type attached, params Type[] editTypes)
+        {
+            this.attached = attached;
+            this.editTypes = editTypes;
+        }
+        internal PropertyEditor.Registry GetRegistry() => new PropertyEditor.Registry(attached, editTypes);
+    }
+    
+    /// <summary>
+    /// Encapsulates a <see cref="Widget"/> (UI element) and <see cref="Record"/> (.Net property or field), for the purposes of display or editing by the user.
+    /// </summary>
+    public abstract partial class PropertyEditor : IRecordReference
+    {
+        protected readonly IInspector _owner;
+        protected readonly Record _record;
+        
+        public Type Type => _record.Type;
+        public Widget Widget { get; protected set; }
+        
+        /// <summary>
+        /// Creates a new widget attached to the given Record
+        /// </summary>
+        protected PropertyEditor(IInspector owner, Record methodInfo)
+        {
+            _owner = owner;
+            _record = methodInfo ?? throw new NullReferenceException(nameof(methodInfo));
+            _DoInit();
+            if (_TryCreateWidget(out Widget editor))
+                Widget = editor;
+        }
+        
+        private void _DoInit() => Initialize();
+        protected virtual void Initialize() { }
+
+        private bool _TryCreateWidget(out Widget widget) => TryCreateWidget(out widget);
+        /// <summary>
+        /// Attempt to create a widget with the current setup.
+        /// </summary>
+        protected abstract bool TryCreateWidget(out Widget widget);
+        /// <summary>
+        /// Tell the widget to update the displayed data to <paramref name="value"/>.
+        /// </summary>
+        /// <param name="value">data to set</param>
+        public abstract void SetWidgetValue(object value);
+        
+        /// <summary>
+        /// Changes the data in the record
+        /// </summary>
+        public void SetValue(object field, object value)
+        {
+            _record.SetValue(field, value);
+            _owner.FireChanged(_record.Name);
+        }
+        
+        /// <summary>
+        /// Updates the widget's displayed value to be what's in the record
+        /// </summary>
+        public void UpdateDisplay()
+        {
+            if(Widget.Desktop.FocusedKeyboardWidget == Widget)
+                return;
+            SetWidgetValue(_record.GetValue(_owner.SelectedField));
+        }
+
+        object IRecordReference.GetValue(object field) => _record.GetValue(field);
+        Record IRecordReference.Record => _record;
+        bool IRecordReference.IsReadOnly => !_record.HasSetter;
+    }
+    
+    /// <inheritdoc cref="PropertyEditor"/>
+    public abstract class PropertyEditor<T> : PropertyEditor, IRecordReference<T>
+    {
+        protected PropertyEditor(IInspector owner, Record methodInfo) : base(owner, methodInfo)
+        {
+        }
+        
+        protected sealed override bool TryCreateWidget(out Widget widget)
+        {
+            if (CreatorPicker(out var func))
+                return func.Invoke(out widget);
+            widget = null;
+            return false;
+        }
+        
+        protected abstract bool CreatorPicker(out WidgetCreatorDelegate creatorDelegate);
+        
+        /// <summary>
+        /// Gets the value from the field
+        /// </summary>
+        public virtual T GetValue(object field)
+        {
+            object o = _record.GetValue(field);
+            if (o is T ot)
+                return ot;
+            return default;
+        }
+        /// <summary>
+        /// Tries to set the value to to the field
+        /// </summary>
+        public virtual void SetValue(object field, T value)
+        {
+            base.SetValue(field, value);
+        }
+        
+        /// <inheritdoc />
+        public override void SetWidgetValue(object value)
+        {
+            if(value is T kind)
+                SetWidgetValue(kind);
+        }
+
+        /// <inheritdoc cref="SetWidgetValue(object)"/>
+        public abstract void SetWidgetValue(T value);
+    }
+
+    public abstract class StructPropertyEditor<T> : PropertyEditor<T>, IStructRecordReference<T> where T : struct
+    {
+        public bool IsNullable { get; }
+        
+        protected StructPropertyEditor(IInspector owner, Record methodInfo) : base(owner, methodInfo)
+        {
+            Type type = methodInfo.Type;
+            IsNullable = TypeHelper.GetNullableTypeOrPassThrough(ref type);
+        }
+        
+        /// <inheritdoc />
+        public sealed override void SetWidgetValue(object value)
+        {
+            if(value == null)
+                SetWidgetValue(null);
+            if(value is T kind)
+                SetWidgetValue(kind);
+        }
+        
+        /// <inheritdoc />
+        public sealed override void SetWidgetValue(T value) => SetWidgetValue(value);
+
+        /// <inheritdoc cref="SetWidgetValue(object)"/>
+        public abstract void SetWidgetValue(T? value);
+    }
+}
\ No newline at end of file
diff --git a/src/Myra/Graphics2D/UI/Properties/Editors/StringPropertyEditor.cs b/src/Myra/Graphics2D/UI/Properties/Editors/StringPropertyEditor.cs
new file mode 100644
index 00000000..1d3ecc40
--- /dev/null
+++ b/src/Myra/Graphics2D/UI/Properties/Editors/StringPropertyEditor.cs
@@ -0,0 +1,228 @@
+using System;
+using System.IO;
+using Myra.Attributes;
+using Myra.Graphics2D.UI.File;
+using Myra.Utility;
+
+namespace Myra.Graphics2D.UI.Properties.Editors
+{
+    [PropertyEditor(typeof(StringPropertyEditor), typeof(string))]
+    public sealed class StringPropertyEditor : PropertyEditor<string>
+    {
+        private readonly FilePathAttribute _filePath;
+        
+        public StringPropertyEditor(IInspector owner, Record methodInfo) : base(owner, methodInfo)
+        {
+            _filePath = methodInfo.FindAttribute<FilePathAttribute>();
+        }
+
+        protected override bool CreatorPicker(out WidgetCreatorDelegate creatorDelegate)
+        {
+            if (_filePath == null)
+                creatorDelegate = CreateTextBox;
+            else
+                creatorDelegate = CreateTextBoxAsFilePath;
+            return true;
+        }
+        
+        private bool CreateTextBox(out Widget widget)
+        {
+            if (_owner.SelectedField == null)
+            {
+                widget = null;
+                return false;
+            }
+            
+            var propertyType = _record.Type;
+            var value = GetValue(_owner.SelectedField);
+
+            var tf = new TextBox
+            {
+                Text = value != null ? value : string.Empty
+            };
+
+            if (_record.HasSetter)
+            {
+                tf.TextChanged += (sender, args) =>
+                {
+                    try
+                    {
+                        object result;
+
+                        if (propertyType.IsNullablePrimitive())
+                        {
+                            if (string.IsNullOrEmpty(tf.Text))
+                            {
+                                result = null;
+                            }
+                            else
+                            {
+                                result = Convert.ChangeType(tf.Text, _record.Type.GetNullableType());
+                            }
+                        }
+                        else
+                        {
+                            result = Convert.ChangeType(tf.Text, _record.Type);
+                        }
+
+                        SetValue(_owner.SelectedField, result);
+                        /*
+                        if (record.Type.IsValueType)
+                        {
+                            var tg = this;
+                            var pg = tg._parentGrid;
+                            while (pg != null && tg._parentProperty != null)
+                            {
+                                tg._parentProperty.SetValue(pg._object, tg._object);
+
+                                if (!tg._parentProperty.Type.IsValueType)
+                                {
+                                    break;
+                                }
+
+                                tg = pg;
+                                pg = tg._parentGrid;
+                            }
+                        }*/
+                    }
+                    catch (Exception)
+                    {
+                        // TODO: Rework this ugly type conversion solution
+                    }
+                };
+            }
+            else
+            {
+                tf.Enabled = false;
+            }
+
+            widget = tf;
+            return true;
+        }
+        
+        private bool CreateTextBoxAsFilePath(out Widget widget)
+        {
+            var propertyType = _record.Type;
+            var value = _record.GetValue(_owner.SelectedField);
+
+            var result = new HorizontalStackPanel
+            {
+                Spacing = 8
+            };
+
+            TextBox path = null;
+            if (_filePath.ShowPath)
+            {
+                path = new TextBox
+                {
+                    Readonly = true,
+                    HorizontalAlignment = HorizontalAlignment.Stretch
+                };
+
+                if (value != null)
+                {
+                    path.Text = value.ToString();
+                }
+
+                StackPanel.SetProportionType(path, ProportionType.Fill);
+                result.Widgets.Add(path);
+            }
+
+            var button = new Button
+            {
+                Tag = value,
+                HorizontalAlignment = HorizontalAlignment.Stretch,
+                Content = new Label
+                {
+                    Text = "Change...",
+                    HorizontalAlignment = HorizontalAlignment.Center,
+                }
+            };
+            Grid.SetColumn(button, 1);
+
+            if (_record.HasSetter)
+            {
+                button.Click += (sender, args) =>
+                {
+                    var dlg = new FileDialog(_filePath.DialogMode)
+                    {
+                        Filter = _filePath.Filter
+                    };
+
+                    if (value != null)
+                    {
+                        var filePath = value.ToString();
+                        if (!Path.IsPathRooted(filePath) && !string.IsNullOrEmpty(_owner.BasePath))
+                        {
+                            filePath = Path.Combine(_owner.BasePath, filePath);
+                        }
+                        dlg.FilePath = filePath;
+                    }
+                    else if (!string.IsNullOrEmpty(_owner.BasePath))
+                    {
+                        dlg.Folder = _owner.BasePath;
+                    }
+
+                    dlg.Closed += (s, a) =>
+                    {
+                        if (!dlg.Result)
+                        {
+                            return;
+                        }
+
+                        try
+                        {
+                            var filePath = dlg.FilePath;
+                            if (!string.IsNullOrEmpty(_owner.BasePath))
+                            {
+                                filePath = PathUtils.TryToMakePathRelativeTo(filePath, _owner.BasePath);
+                            }
+
+                            if (path != null)
+                            {
+                                path.Text = filePath;
+                            }
+
+                            SetValue(_owner.SelectedField, filePath);
+
+                            _owner.FireChanged(propertyType.Name);
+                        }
+                        catch (Exception)
+                        {
+                        }
+                    };
+
+                    dlg.ShowModal(_owner.Desktop);
+                };
+            }
+            else
+            {
+                button.Enabled = false;
+            }
+
+            result.Widgets.Add(button);
+            widget = result;
+            return true;
+        }
+        
+        /// <inheritdoc />
+        public override void SetWidgetValue(object value)
+        {
+            var tb = Widget as TextBox;
+            if (value == null)
+                tb.Text = string.Empty;
+            else if (value is string str)
+                tb.Text = str;
+        }
+
+        /// <inheritdoc />
+        public override void SetWidgetValue(string value)
+        {
+            var tb = Widget as TextBox;
+            if (value == null)
+                tb.Text = string.Empty;
+            else
+                tb.Text = value;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Myra/Graphics2D/UI/Properties/IInspector.cs b/src/Myra/Graphics2D/UI/Properties/IInspector.cs
new file mode 100644
index 00000000..f0bdfb82
--- /dev/null
+++ b/src/Myra/Graphics2D/UI/Properties/IInspector.cs
@@ -0,0 +1,22 @@
+using AssetManagementBase;
+
+namespace Myra.Graphics2D.UI.Properties
+{
+    public interface IInspector
+    {
+        Desktop Desktop { get; }
+        
+        /// <summary>
+        /// The selected field object.
+        /// </summary>
+        object SelectedField { get; }
+        
+        /// <summary>
+        /// Base file path content is chosen from
+        /// </summary>
+        string BasePath { get; }
+        AssetManager AssetManager { get; }
+        
+        void FireChanged(string propertyName);
+    }
+}
\ No newline at end of file
diff --git a/src/Myra/Graphics2D/UI/Properties/PropertyGrid.SubGrid.cs b/src/Myra/Graphics2D/UI/Properties/PropertyGrid.SubGrid.cs
new file mode 100644
index 00000000..4f3d37b5
--- /dev/null
+++ b/src/Myra/Graphics2D/UI/Properties/PropertyGrid.SubGrid.cs
@@ -0,0 +1,137 @@
+using System.ComponentModel;
+using System.Xml.Serialization;
+using Myra.Attributes;
+
+#if MONOGAME || FNA
+using Microsoft.Xna.Framework;
+#elif STRIDE
+using Stride.Core.Mathematics;
+#elif PLATFORM_AGNOSTIC
+using System.Drawing;
+#endif
+
+namespace Myra.Graphics2D.UI.Properties
+{
+    public partial class PropertyGrid
+    {
+        private class SubGrid : Widget
+		{
+			private readonly GridLayout _layout = new GridLayout();
+
+			private readonly ToggleButton _mark;
+			private readonly PropertyGrid _propertyGrid;
+
+			public ToggleButton Mark => _mark;
+			public PropertyGrid PropertyGrid => _propertyGrid;
+			
+			public Rectangle HeaderBounds => new Rectangle(0, 0, ActualBounds.Width, _layout.GetRowHeight(0));
+			
+			[Browsable(false)]
+			[XmlIgnore]
+			public bool IsEmpty => _propertyGrid.IsEmpty;
+
+			public SubGrid(PropertyGrid parent, object value, string header, string category, string filter, Record parentProperty)
+			{
+				ChildrenLayout = _layout;
+
+				_layout.ColumnSpacing = 4;
+				_layout.RowSpacing = 4;
+
+				_layout.ColumnsProportions.Add(new Proportion(ProportionType.Auto));
+				_layout.ColumnsProportions.Add(new Proportion(ProportionType.Fill));
+				_layout.RowsProportions.Add(new Proportion(ProportionType.Auto));
+				_layout.RowsProportions.Add(new Proportion(ProportionType.Auto));
+
+				_propertyGrid = new PropertyGrid(parent.PropertyGridStyle, category, parentProperty, parent)
+				{
+					Object = value,
+					Filter = filter,
+					HorizontalAlignment = HorizontalAlignment.Stretch,
+				};
+				Grid.SetColumn(_propertyGrid, 1);
+				Grid.SetRow(_propertyGrid, 1);
+
+				// Mark
+				var markImage = new Image();
+				var imageStyle = parent.PropertyGridStyle.MarkStyle.ImageStyle;
+				if (imageStyle != null)
+				{
+					markImage.ApplyPressableImageStyle(imageStyle);
+				}
+
+				_mark = new ToggleButton(null)
+				{
+					HorizontalAlignment = HorizontalAlignment.Left,
+					VerticalAlignment = VerticalAlignment.Center,
+					Content = markImage
+				};
+
+				Children.Add(_mark);
+
+				_mark.PressedChanged += (sender, args) =>
+				{
+					if (_mark.IsPressed)
+					{
+						Children.Add(_propertyGrid);
+						parent._expandedCategories.Add(category);
+					}
+					else
+					{
+						Children.Remove(_propertyGrid);
+						parent._expandedCategories.Remove(category);
+					}
+				};
+
+				var expanded = true;
+				if (parentProperty != null && parentProperty.FindAttribute<DesignerFoldedAttribute>() != null)
+				{
+					expanded = false;
+				}
+
+				if (expanded)
+				{
+					_mark.IsPressed = true;
+				}
+
+				var label = new Label(null)
+				{
+					Text = header,
+				};
+				Grid.SetColumn(label, 1);
+				label.ApplyLabelStyle(parent.PropertyGridStyle.LabelStyle);
+
+				Children.Add(label);
+
+				HorizontalAlignment = HorizontalAlignment.Stretch;
+				VerticalAlignment = VerticalAlignment.Stretch;
+			}
+
+			public override void OnTouchDoubleClick()
+			{
+				base.OnTouchDoubleClick();
+
+				var mousePosition = ToLocal(Desktop.MousePosition);
+				if (!HeaderBounds.Contains(mousePosition) || _mark.Bounds.Contains(mousePosition))
+				{
+					return;
+				}
+
+				_mark.IsPressed = !_mark.IsPressed;
+			}
+
+			public override void InternalRender(RenderContext context)
+			{
+				if (_propertyGrid.PropertyGridStyle.SelectionHoverBackground != null && IsMouseInside)
+				{
+					var headerBounds = HeaderBounds;
+					if (headerBounds.Contains(ToLocal(Desktop.MousePosition)))
+					{
+						_propertyGrid.PropertyGridStyle.SelectionHoverBackground.Draw(context, headerBounds);
+					}
+				}
+
+				base.InternalRender(context);
+			}
+		}
+    }
+}
\ No newline at end of file
diff --git a/src/Myra/Graphics2D/UI/Properties/PropertyGrid.cs b/src/Myra/Graphics2D/UI/Properties/PropertyGrid.cs
index 4cb0caff..d3ac4cab 100644
--- a/src/Myra/Graphics2D/UI/Properties/PropertyGrid.cs
+++ b/src/Myra/Graphics2D/UI/Properties/PropertyGrid.cs
@@ -1,24 +1,22 @@
 using System;
-using System.Collections;
+using System.IO;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
-using Myra.Graphics2D.UI.ColorPicker;
-using Myra.Graphics2D.UI.Styles;
-using Myra.Utility;
 using System.Xml.Serialization;
+using Myra.Attributes;
+using Myra.Utility;
 using Myra.MML;
+using Myra.Events;
 using Myra.Graphics2D.UI.File;
-using System.IO;
-using Myra.Attributes;
-using FontStashSharp;
-using FontStashSharp.RichText;
+using Myra.Graphics2D.UI.Styles;
+using Myra.Graphics2D.UI.Properties.Editors;
 using Myra.Graphics2D.Brushes;
 using AssetManagementBase;
-using Myra.Events;
+using FontStashSharp;
+using FontStashSharp.RichText;
 
 #if MONOGAME || FNA
-using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 #elif STRIDE
 using Stride.Core.Mathematics;
@@ -31,162 +29,25 @@
 
 namespace Myra.Graphics2D.UI.Properties
 {
-	public class PropertyGrid : Widget
+	public partial class PropertyGrid : Widget, IInspector
 	{
 		private const string DefaultCategoryName = "Miscellaneous";
-
-		private class SubGrid : Widget
-		{
-			private readonly GridLayout _layout = new GridLayout();
-
-			private readonly ToggleButton _mark;
-			private readonly PropertyGrid _propertyGrid;
-
-			public ToggleButton Mark
-			{
-				get { return _mark; }
-			}
-
-			public PropertyGrid PropertyGrid
-			{
-				get { return _propertyGrid; }
-			}
-
-			public Rectangle HeaderBounds
-			{
-				get
-				{
-					var headerBounds = new Rectangle(0, 0, ActualBounds.Width, _layout.GetRowHeight(0));
-
-					return headerBounds;
-				}
-			}
-
-			[Browsable(false)]
-			[XmlIgnore]
-			public bool IsEmpty
-			{
-				get
-				{
-					return _propertyGrid.IsEmpty;
-				}
-			}
-
-			public SubGrid(PropertyGrid parent, object value, string header, string category, string filter, Record parentProperty)
-			{
-				ChildrenLayout = _layout;
-
-				_layout.ColumnSpacing = 4;
-				_layout.RowSpacing = 4;
-
-				_layout.ColumnsProportions.Add(new Proportion(ProportionType.Auto));
-				_layout.ColumnsProportions.Add(new Proportion(ProportionType.Fill));
-				_layout.RowsProportions.Add(new Proportion(ProportionType.Auto));
-				_layout.RowsProportions.Add(new Proportion(ProportionType.Auto));
-
-				_propertyGrid = new PropertyGrid(parent.PropertyGridStyle, category, parentProperty, parent)
-				{
-					Object = value,
-					Filter = filter,
-					HorizontalAlignment = HorizontalAlignment.Stretch,
-				};
-				Grid.SetColumn(_propertyGrid, 1);
-				Grid.SetRow(_propertyGrid, 1);
-
-				// Mark
-				var markImage = new Image();
-				var imageStyle = parent.PropertyGridStyle.MarkStyle.ImageStyle;
-				if (imageStyle != null)
-				{
-					markImage.ApplyPressableImageStyle(imageStyle);
-				}
-
-				_mark = new ToggleButton(null)
-				{
-					HorizontalAlignment = HorizontalAlignment.Left,
-					VerticalAlignment = VerticalAlignment.Center,
-					Content = markImage
-				};
-
-				Children.Add(_mark);
-
-				_mark.PressedChanged += (sender, args) =>
-				{
-					if (_mark.IsPressed)
-					{
-						Children.Add(_propertyGrid);
-						parent._expandedCategories.Add(category);
-					}
-					else
-					{
-						Children.Remove(_propertyGrid);
-						parent._expandedCategories.Remove(category);
-					}
-				};
-
-				var expanded = true;
-				if (parentProperty != null && parentProperty.FindAttribute<DesignerFoldedAttribute>() != null)
-				{
-					expanded = false;
-				}
-
-				if (expanded)
-				{
-					_mark.IsPressed = true;
-				}
-
-				var label = new Label(null)
-				{
-					Text = header,
-				};
-				Grid.SetColumn(label, 1);
-				label.ApplyLabelStyle(parent.PropertyGridStyle.LabelStyle);
-
-				Children.Add(label);
-
-				HorizontalAlignment = HorizontalAlignment.Stretch;
-				VerticalAlignment = VerticalAlignment.Stretch;
-			}
-
-			public override void OnTouchDoubleClick()
-			{
-				base.OnTouchDoubleClick();
-
-				var mousePosition = ToLocal(Desktop.MousePosition);
-				if (!HeaderBounds.Contains(mousePosition) || _mark.Bounds.Contains(mousePosition))
-				{
-					return;
-				}
-
-				_mark.IsPressed = !_mark.IsPressed;
-			}
-
-			public override void InternalRender(RenderContext context)
-			{
-				if (_propertyGrid.PropertyGridStyle.SelectionHoverBackground != null && IsMouseInside)
-				{
-					var headerBounds = HeaderBounds;
-					if (headerBounds.Contains(ToLocal(Desktop.MousePosition)))
-					{
-						_propertyGrid.PropertyGridStyle.SelectionHoverBackground.Draw(context, headerBounds);
-					}
-				}
-
-				base.InternalRender(context);
-			}
-		}
+		private const int ALLOC = 32;
 
 		private readonly GridLayout _layout = new GridLayout();
 		private readonly PropertyGrid _parentGrid;
-		private Record _parentProperty;
+		private readonly Record _parentProperty;
 		private readonly Dictionary<string, List<Record>> _records = new Dictionary<string, List<Record>>();
+		private readonly List<Record> _recMemory = new List<Record>(ALLOC);
+		private readonly List<PropertyEditor> _editors = new List<PropertyEditor>(ALLOC);
 		private readonly HashSet<string> _expandedCategories = new HashSet<string>();
+		private readonly PropertyGridSettings _settings = new PropertyGridSettings();
 		private object _object;
 		private bool _ignoreCollections;
-		private readonly PropertyGridSettings _settings = new PropertyGridSettings();
+		private bool _doFancyLayout = true;
 		private string _filter;
 		private Type _parentType;
-
+		
 		[Browsable(false)]
 		[XmlIgnore]
 		public TreeStyle PropertyGridStyle { get; private set; }
@@ -199,6 +60,7 @@ public object Object
 
 			set
 			{
+				// TODO send notification to active editors before changing selection
 				if (value == _object)
 				{
 					return;
@@ -221,17 +83,10 @@ public Type ParentType
 			get
 			{
 				if (_parentGrid != null)
-				{
 					return _parentGrid.ParentType;
-				}
-
 				return _parentType;
 			}
-
-			set
-			{
-				_parentType = value;
-			}
+			set => _parentType = value;
 		}
 
 		[Browsable(false)]
@@ -245,28 +100,37 @@ public bool IgnoreCollections
 			get
 			{
 				if (_parentGrid != null)
-				{
 					return _parentGrid.IgnoreCollections;
-				}
-
 				return _ignoreCollections;
 			}
+			set => _ignoreCollections = value;
+		}
 
+		[Category("Behavior")]
+		[DefaultValue(true)]
+		public bool DoFancyLayout
+		{
+			get
+			{
+				if (_parentGrid != null)
+					return _parentGrid.DoFancyLayout;
+				return _doFancyLayout;
+			}
 			set
 			{
-				_ignoreCollections = value;
+				if (_parentGrid != null)
+					return;
+				if (_doFancyLayout != value)
+				{
+					_doFancyLayout = value;
+					Rebuild();
+				}
 			}
 		}
 
 		[Browsable(false)]
 		[XmlIgnore]
-		public bool IsEmpty
-		{
-			get
-			{
-				return Children.Count == 0;
-			}
-		}
+		public bool IsEmpty => Children.Count == 0;
 
 		[Browsable(false)]
 		[XmlIgnore]
@@ -340,7 +204,7 @@ public string Filter
 		[Browsable(false)]
 		[XmlIgnore]
 		public Func<Record, object, Widget> CustomWidgetProvider;
-
+		
 		public event EventHandler<GenericEventArgs<string>> PropertyChanged;
 		public event EventHandler ObjectChanged;
 
@@ -383,8 +247,14 @@ public PropertyGrid(string category) : this(Stylesheet.Current.TreeStyle, catego
 		public PropertyGrid() : this(DefaultCategoryName)
 		{
 		}
-
-		private void FireChanged(string name)
+		
+		object IInspector.SelectedField => _object;
+		/// <inheritdoc />
+		string IInspector.BasePath => Settings.BasePath;
+		
+		AssetManager IInspector.AssetManager => Settings.AssetManager;
+
+		void IInspector.FireChanged(string name)
 		{
 			var ev = PropertyChanged;
 
@@ -400,18 +270,11 @@ private void FireChanged(string name)
 				ev(this, new GenericEventArgs<string>(name));
 			}
 		}
-
-		private static void UpdateLabelCount(Label textBlock, int count)
-		{
-			textBlock.Text = string.Format("{0} Items", count);
-		}
-
+		
 		private void SetValue(Record record, object obj, object value)
 		{
-			if (CustomSetter != null && CustomSetter(record, obj, value))
-			{
+			if (CustomSetter != null && CustomSetter(record, obj, value)) //TODO reimplement custom setter
 				return;
-			}
 
 			record.SetValue(obj, value);
 		}
@@ -425,490 +288,31 @@ private ComboView CreateCustomValuesEditor(Record record, CustomValues customVal
 			foreach (var v in customValues.Values)
 			{
 				var label = new Label
-				{
-					Text = v.Name,
-					Tag = v.Value
-				};
-
-				cv.Widgets.Add(label);
-			}
-
-			cv.SelectedIndex = customValues.SelectedIndex;
-			if (hasSetter)
-			{
-				cv.SelectedIndexChanged += (sender, args) =>
-				{
-					var item = cv.SelectedIndex != null ? customValues.Values[cv.SelectedIndex.Value].Value : null;
-					SetValue(record, _object, item);
-					FireChanged(record.Name);
-				};
-			}
-			else
-			{
-				cv.Enabled = false;
-			}
-
-			return cv;
-		}
-
-		private CheckButton CreateBooleanEditor(Record record, bool hasSetter)
-		{
-			var propertyType = record.Type;
-			var value = record.GetValue(_object);
-
-			var isChecked = (bool)value;
-			var cb = new CheckButton
-			{
-				IsChecked = isChecked
-			};
-
-			if (hasSetter)
-			{
-				cb.Click += (sender, args) =>
-				{
-					SetValue(record, _object, cb.IsChecked);
-					FireChanged(propertyType.Name);
-				};
-			}
-			else
-			{
-				cb.Enabled = false;
-			}
-
-			return cb;
-		}
-
-		private Grid CreateColorEditor(Record record, bool hasSetter)
-		{
-			var propertyType = record.Type;
-			var value = record.GetValue(_object);
-
-			var subGrid = new Grid
-			{
-				ColumnSpacing = 8,
-				HorizontalAlignment = HorizontalAlignment.Stretch
-			};
-
-			var isColor = propertyType == typeof(Color);
-
-			subGrid.ColumnsProportions.Add(new Proportion());
-			subGrid.ColumnsProportions.Add(new Proportion(ProportionType.Fill));
-
-			var color = Color.Transparent;
-			if (isColor)
-			{
-				color = (Color)value;
-			}
-			else if (value != null)
-			{
-				color = ((Color?)value).Value;
-			}
-
-			var image = new Image
-			{
-				Renderable = Stylesheet.Current.WhiteRegion,
-				VerticalAlignment = VerticalAlignment.Center,
-				Width = 32,
-				Height = 16,
-				Color = color
-			};
-
-			subGrid.Widgets.Add(image);
-
-			var button = new Button
-			{
-				Tag = value,
-				HorizontalAlignment = HorizontalAlignment.Stretch,
-				Content = new Label
-				{
-					HorizontalAlignment = HorizontalAlignment.Center,
-					Text = "Change..."
-				}
-			};
-			Grid.SetColumn(button, 1);
-
-			subGrid.Widgets.Add(button);
-
-			if (hasSetter)
-			{
-				button.Click += (sender, args) =>
-				{
-					var dlg = new ColorPickerDialog()
-					{
-						Color = image.Color
-					};
-
-					dlg.Closed += (s, a) =>
-					{
-						if (!dlg.Result)
-						{
-							return;
-						}
-
-						image.Color = dlg.Color;
-						SetValue(record, _object, dlg.Color);
-
-						FireChanged(propertyType.Name);
-					};
-
-					dlg.ShowModal(Desktop);
-				};
-			}
-			else
-			{
-				button.Enabled = false;
-			}
-
-			return subGrid;
-		}
-
-		private Grid CreateBrushEditor(Record record, bool hasSetter)
-		{
-			var propertyType = record.Type;
-
-			var value = record.GetValue(_object) as SolidBrush;
-
-			var subGrid = new Grid
-			{
-				ColumnSpacing = 8,
-				HorizontalAlignment = HorizontalAlignment.Stretch
-			};
-
-			subGrid.ColumnsProportions.Add(new Proportion());
-			subGrid.ColumnsProportions.Add(new Proportion(ProportionType.Fill));
-
-			var color = Color.Transparent;
-			if (value != null)
-			{
-				color = value.Color;
-			}
-
-			var image = new Image
-			{
-				Renderable = Stylesheet.Current.WhiteRegion,
-				VerticalAlignment = VerticalAlignment.Center,
-				Width = 32,
-				Height = 16,
-				Color = color
-			};
-
-			subGrid.Widgets.Add(image);
-
-			var button = new Button
-			{
-				Tag = value,
-				HorizontalAlignment = HorizontalAlignment.Stretch,
-				Content = new Label
-				{
-					Text = "Change...",
-					HorizontalAlignment = HorizontalAlignment.Center,
-				}
-			};
-			Grid.SetColumn(button, 1);
-
-			subGrid.Widgets.Add(button);
-
-			if (hasSetter)
-			{
-				button.Click += (sender, args) =>
-				{
-					var dlg = new ColorPickerDialog()
-					{
-						Color = image.Color
-					};
-
-					dlg.Closed += (s, a) =>
-					{
-						if (!dlg.Result)
-						{
-							return;
-						}
-
-						image.Color = dlg.Color;
-						SetValue(record, _object, new SolidBrush(dlg.Color));
-						var baseObject = _object as BaseObject;
-						if (baseObject != null)
-						{
-							baseObject.Resources[record.Name] = dlg.Color.ToHexString();
-						}
-						FireChanged(propertyType.Name);
-					};
-
-					dlg.ShowModal(Desktop);
-				};
-			}
-			else
-			{
-				button.Enabled = false;
-			}
-
-			return subGrid;
-		}
-
-		private ComboView CreateEnumEditor(Record record, bool hasSetter)
-		{
-			var propertyType = record.Type;
-			var value = record.GetValue(_object);
-
-			var isNullable = propertyType.IsNullableEnum();
-			var enumType = isNullable ? propertyType.GetNullableType() : propertyType;
-			var values = Enum.GetValues(enumType);
-
-			var cv = new ComboView();
-
-			if (isNullable)
-			{
-				cv.Widgets.Add(new Label
-				{
-					Text = string.Empty
-				});
-			}
-
-			foreach (var v in values)
-			{
-				cv.Widgets.Add(new Label
-				{
-					Text = v.ToString(),
-					Tag = v
-				});
-			}
-
-			var selectedIndex = Array.IndexOf(values, value);
-			if (isNullable)
-			{
-				++selectedIndex;
-			}
-			cv.SelectedIndex = selectedIndex;
-
-			if (hasSetter)
-			{
-				cv.SelectedIndexChanged += (sender, args) =>
-				{
-					if (cv.SelectedIndex != -1)
-					{
-						SetValue(record, _object, cv.SelectedItem.Tag);
-						FireChanged(record.Name);
-					}
-				};
-			}
-			else
-			{
-				cv.Enabled = false;
-			}
-
-			return cv;
-		}
-
-		private SpinButton CreateNumericEditor(Record record, bool hasSetter)
-		{
-			var propertyType = record.Type;
-			var value = record.GetValue(_object);
-
-			var numericType = propertyType;
-			if (propertyType.IsNullablePrimitive())
-			{
-				numericType = propertyType.GetNullableType();
-			}
-
-			var spinButton = new SpinButton
-			{
-				Integer = numericType.IsNumericInteger(),
-				Nullable = propertyType.IsNullablePrimitive(),
-				Value = value != null ? (float)Convert.ChangeType(value, typeof(float)) : default(float?)
-			};
-
-			var rangeAttribute = record.FindAttribute<RangeAttribute>();
-			if (rangeAttribute != null)
-			{
-				spinButton.Minimum = rangeAttribute.Minimum;
-				spinButton.Maximum = rangeAttribute.Maximum;
-			}
-
-			if (hasSetter)
-			{
-				spinButton.ValueChanged += (sender, args) =>
-				{
-					try
-					{
-						object result;
-
-						if (spinButton.Value != null)
-						{
-							result = Convert.ChangeType(spinButton.Value.Value, numericType);
-						}
-						else
-						{
-							result = null;
-						}
-
-						SetValue(record, _object, result);
-
-						if (record.Type.IsValueType)
-						{
-							// Handle structs
-							var tg = this;
-							var pg = tg._parentGrid;
-							while (pg != null && tg._parentProperty != null && tg._parentProperty.Type.IsValueType)
-							{
-								tg._parentProperty.SetValue(pg._object, tg._object);
-
-								if (!tg._parentProperty.Type.IsValueType)
-								{
-									break;
-								}
-
-								tg = pg;
-								pg = tg._parentGrid;
-							}
-						}
-
-						FireChanged(record.Name);
-					}
-					catch (InvalidCastException)
-					{
-						// TODO: Rework this ugly type conversion solution
-					}
-					catch (Exception ex)
-					{
-						spinButton.Value = args.OldValue;
-						var dialog = Dialog.CreateMessageBox("Error", ex.ToString());
-						dialog.ShowModal(Desktop);
-					}
-				};
-			}
-			else
-			{
-				spinButton.Enabled = false;
-			}
-
-			return spinButton;
-		}
-
-		private TextBox CreateStringEditor(Record record, bool hasSetter)
-		{
-			var propertyType = record.Type;
-			var value = record.GetValue(_object);
-
-			var tf = new TextBox
-			{
-				Text = value != null ? value.ToString() : string.Empty
-			};
-
-			if (hasSetter)
-			{
-				tf.TextChanged += (sender, args) =>
-				{
-					try
-					{
-						object result;
-
-						if (propertyType.IsNullablePrimitive())
-						{
-							if (string.IsNullOrEmpty(tf.Text))
-							{
-								result = null;
-							}
-							else
-							{
-								result = Convert.ChangeType(tf.Text, record.Type.GetNullableType());
-							}
-						}
-						else
-						{
-							result = Convert.ChangeType(tf.Text, record.Type);
-						}
-
-						SetValue(record, _object, result);
-
-						if (record.Type.IsValueType)
-						{
-							var tg = this;
-							var pg = tg._parentGrid;
-							while (pg != null && tg._parentProperty != null)
-							{
-								tg._parentProperty.SetValue(pg._object, tg._object);
-
-								if (!tg._parentProperty.Type.IsValueType)
-								{
-									break;
-								}
-
-								tg = pg;
-								pg = tg._parentGrid;
-							}
-						}
-
-						FireChanged(record.Name);
-					}
-					catch (Exception)
-					{
-						// TODO: Rework this ugly type conversion solution
-					}
-				};
-			}
-			else
-			{
-				tf.Enabled = false;
-			}
-
-			return tf;
-		}
-
-		private Grid CreateCollectionEditor(Record record, Type itemType)
-		{
-			var value = record.GetValue(_object);
-
-			var items = (IList)value;
-
-			var subGrid = new Grid
-			{
-				ColumnSpacing = 8,
-				HorizontalAlignment = HorizontalAlignment.Stretch
-			};
-
-			subGrid.ColumnsProportions.Add(new Proportion());
-			subGrid.ColumnsProportions.Add(new Proportion(ProportionType.Fill));
-
-			var label = new Label
-			{
-				VerticalAlignment = VerticalAlignment.Center,
-			};
-			UpdateLabelCount(label, items.Count);
-
-			subGrid.Widgets.Add(label);
-
-			var button = new Button
-			{
-				Tag = value,
-				HorizontalAlignment = HorizontalAlignment.Stretch,
-				Content = new Label
-				{
-					Text = "Change...",
-					HorizontalAlignment = HorizontalAlignment.Center,
-				}
-			};
-			Grid.SetColumn(button, 1);
-
-			button.Click += (sender, args) =>
-			{
-				var collectionEditor = new CollectionEditor(items, itemType);
-
-				var dialog = Dialog.CreateMessageBox("Edit", collectionEditor);
-
-				dialog.ButtonOk.Click += (o, eventArgs) =>
-				{
-					collectionEditor.SaveChanges();
-					UpdateLabelCount(label, items.Count);
+				{
+					Text = v.Name,
+					Tag = v.Value
 				};
 
-				dialog.ShowModal(Desktop);
-			};
+				cv.Widgets.Add(label);
+			}
 
-			subGrid.Widgets.Add(button);
+			cv.SelectedIndex = customValues.SelectedIndex;
+			if (hasSetter)
+			{
+				cv.SelectedIndexChanged += (sender, args) =>
+				{
+					var item = cv.SelectedIndex != null ? customValues.Values[cv.SelectedIndex.Value].Value : null;
+					SetValue(record, _object, item);
+					(this as IInspector).FireChanged(record.Name);
+				};
+			}
+			else
+			{
+				cv.Enabled = false;
+			}
 
-			return subGrid;
+			return cv;
 		}
-
 		private Grid CreateFileEditor<T>(Record record, bool hasSetter, string filter, Func<string, T> loader)
 		{
 			if (Settings.AssetManager == null)
@@ -1010,7 +414,7 @@ private Grid CreateFileEditor<T>(Record record, bool hasSetter, string filter, F
 								Settings.ImagePropertyValueSetter(record.Name, filePath);
 							}
 
-							FireChanged(propertyType.Name);
+							(this as IInspector).FireChanged(propertyType.Name);
 						}
 						catch (Exception)
 						{
@@ -1028,34 +432,29 @@ private Grid CreateFileEditor<T>(Record record, bool hasSetter, string filter, F
 
 			return subGrid;
 		}
-
-		private Widget CreateAttributeFileEditor(Record record, bool hasSetter, FilePathAttribute attribute)
+/*
+		private Grid CreateCollectionEditor(Record record, Type itemType)
 		{
-			var propertyType = record.Type;
 			var value = record.GetValue(_object);
 
-			var result = new HorizontalStackPanel
+			var items = (IList)value;
+
+			var subGrid = new Grid
 			{
-				Spacing = 8
+				ColumnSpacing = 8,
+				HorizontalAlignment = HorizontalAlignment.Stretch
 			};
 
-			TextBox path = null;
-			if (attribute.ShowPath)
-			{
-				path = new TextBox
-				{
-					Readonly = true,
-					HorizontalAlignment = HorizontalAlignment.Stretch
-				};
+			subGrid.ColumnsProportions.Add(new Proportion());
+			subGrid.ColumnsProportions.Add(new Proportion(ProportionType.Fill));
 
-				if (value != null)
-				{
-					path.Text = value.ToString();
-				}
+			var label = new Label
+			{
+				VerticalAlignment = VerticalAlignment.Center,
+			};
+			UpdateLabelCount(label, items.Count);
 
-				StackPanel.SetProportionType(path, ProportionType.Fill);
-				result.Widgets.Add(path);
-			}
+			subGrid.Widgets.Add(label);
 
 			var button = new Button
 			{
@@ -1069,70 +468,25 @@ private Widget CreateAttributeFileEditor(Record record, bool hasSetter, FilePath
 			};
 			Grid.SetColumn(button, 1);
 
-			if (hasSetter)
+			button.Click += (sender, args) =>
 			{
-				button.Click += (sender, args) =>
-				{
-					var dlg = new FileDialog(attribute.DialogMode)
-					{
-						Filter = attribute.Filter
-					};
-
-					if (value != null)
-					{
-						var filePath = value.ToString();
-						if (!Path.IsPathRooted(filePath) && !string.IsNullOrEmpty(Settings.BasePath))
-						{
-							filePath = Path.Combine(Settings.BasePath, filePath);
-						}
-						dlg.FilePath = filePath;
-					}
-					else if (!string.IsNullOrEmpty(Settings.BasePath))
-					{
-						dlg.Folder = Settings.BasePath;
-					}
-
-					dlg.Closed += (s, a) =>
-					{
-						if (!dlg.Result)
-						{
-							return;
-						}
-
-						try
-						{
-							var filePath = dlg.FilePath;
-							if (!string.IsNullOrEmpty(Settings.BasePath))
-							{
-								filePath = PathUtils.TryToMakePathRelativeTo(filePath, Settings.BasePath);
-							}
-
-							if (path != null)
-							{
-								path.Text = filePath;
-							}
-
-							SetValue(record, _object, filePath);
+				var collectionEditor = new CollectionEditor(items, itemType);
 
-							FireChanged(propertyType.Name);
-						}
-						catch (Exception)
-						{
-						}
-					};
+				var dialog = Dialog.CreateMessageBox("Edit", collectionEditor);
 
-					dlg.ShowModal(Desktop);
+				dialog.ButtonOk.Click += (o, eventArgs) =>
+				{
+					collectionEditor.SaveChanges();
+					UpdateLabelCount(label, items.Count);
 				};
-			}
-			else
-			{
-				button.Enabled = false;
-			}
 
-			result.Widgets.Add(button);
+				dialog.ShowModal(Desktop);
+			};
 
-			return result;
-		}
+			subGrid.Widgets.Add(button);
+
+			return subGrid;
+		}*/
 
 		private void FillSubGrid(ref int y, IReadOnlyList<Record> records)
 		{
@@ -1157,9 +511,9 @@ private void FillSubGrid(ref int y, IReadOnlyList<Record> records)
 				CustomValues customValues = null;
 
 				var needsSubGrid = false;
+				
 				if ((valueWidget = CustomWidgetProvider?.Invoke(record, _object)) != null)
 				{
-
 				}
 				else if (CustomValuesProvider != null && (customValues = CustomValuesProvider(_object, record)) != null)
 				{
@@ -1173,33 +527,7 @@ private void FillSubGrid(ref int y, IReadOnlyList<Record> records)
 					{
 						needsSubGrid = true;
 					}
-				}
-				else if (propertyType == typeof(bool))
-				{
-					valueWidget = CreateBooleanEditor(record, hasSetter);
-				}
-				else if (propertyType == typeof(Color) || propertyType == typeof(Color?))
-				{
-					valueWidget = CreateColorEditor(record, hasSetter);
-				}
-				else if (propertyType.IsEnum || propertyType.IsNullableEnum())
-				{
-					valueWidget = CreateEnumEditor(record, hasSetter);
-				}
-				else if (propertyType.IsNumericType() ||
-						 (propertyType.IsNullablePrimitive() && propertyType.GetNullableType().IsNumericType()))
-				{
-					valueWidget = CreateNumericEditor(record, hasSetter);
-				}
-				else if (propertyType == typeof(string) && record.FindAttribute<FilePathAttribute>() != null)
-				{
-					var filePathAttr = record.FindAttribute<FilePathAttribute>();
-					valueWidget = CreateAttributeFileEditor(record, hasSetter, filePathAttr);
-				}
-				else if (propertyType == typeof(string) || propertyType.IsPrimitive || propertyType.IsNullablePrimitive())
-				{
-					valueWidget = CreateStringEditor(record, hasSetter);
-				}
+				} /*
 				else if (typeof(IList).IsAssignableFrom(propertyType))
 				{
 					if (!IgnoreCollections)
@@ -1214,15 +542,11 @@ private void FillSubGrid(ref int y, IReadOnlyList<Record> records)
 							}
 						}
 					}
-				}
+				}*/
 				else if (propertyType == typeof(SpriteFontBase))
 				{
 					valueWidget = CreateFileEditor(record, hasSetter, "*.fnt", name => Settings.AssetManager.LoadFont(name));
 				}
-				else if (propertyType == typeof(IBrush))
-				{
-					valueWidget = CreateBrushEditor(record, hasSetter);
-				}
 				else if (propertyType == typeof(IImage))
 				{
 					valueWidget = CreateFileEditor(record, hasSetter, "*.png|*.jpg|*.bmp|*.gif", name => Settings.AssetManager.LoadTextureRegion(name));
@@ -1239,6 +563,11 @@ private void FillSubGrid(ref int y, IReadOnlyList<Record> records)
 				}
 #endif
 #endif
+				else if (PropertyEditor.TryCreate(this, record, out PropertyEditor editor))
+				{
+					_editors.Add(editor);
+					valueWidget = editor.Widget;
+				}
 				else
 				{
 					if (value == null)
@@ -1248,13 +577,15 @@ private void FillSubGrid(ref int y, IReadOnlyList<Record> records)
 						tb.Text = "null";
 
 						valueWidget = tb;
-					} else
+					} 
+					else
 					{
 						needsSubGrid = true;
 					}
 				}
-
-				if (valueWidget != null)
+				
+				
+				if (valueWidget != null) //Add single value display
 				{
 					var name = record.Name;
 					var dn = record.FindAttribute<DisplayNameAttribute>();
@@ -1309,13 +640,11 @@ private void FillSubGrid(ref int y, IReadOnlyList<Record> records)
 							_layout.RowsProportions.Add(rowProportion);
 							++y;
 						}
-
-						continue;
 					}
 				}
 			}
 		}
-
+		
 		public bool PassesFilter(string name)
 		{
 			if (string.IsNullOrEmpty(Filter) || string.IsNullOrEmpty(name))
@@ -1331,16 +660,90 @@ public void Rebuild()
 			_layout.RowsProportions.Clear();
 			Children.Clear();
 			_records.Clear();
+			_editors.Clear();
 			_expandedCategories.Clear();
 
-			if (_object == null)
+			if(!RecordAggregator(in _object, in _parentType, _recMemory, _doFancyLayout))
+				return;
+			
+			// Sort by categories
+			for (var i = 0; i < _recMemory.Count; ++i)
+			{
+				var record = _recMemory[i];
+
+				List<Record> categoryRecords;
+				if (!_records.TryGetValue(record.Category, out categoryRecords))
+				{
+					categoryRecords = new List<Record>();
+					_records[record.Category] = categoryRecords;
+				}
+
+				categoryRecords.Add(record);
+			}
+
+			if (_doFancyLayout)
+			{
+				// Sort by names within categories
+				foreach (var category in _records)
+				{
+					category.Value.Sort((a, b) => Comparer<string>.Default.Compare(a.Name, b.Name));
+				}
+			}
+
+			var ordered = _records.OrderBy(key => key.Key);
+
+			var y = 0;
+			List<Record> defaultCategoryRecords;
+			if (_records.TryGetValue(Category, out defaultCategoryRecords))
+			{
+				FillSubGrid(ref y, defaultCategoryRecords);
+			}
+
+			if (Category != DefaultCategoryName)
 			{
 				return;
 			}
 
+			foreach (var category in ordered)
+			{
+				if (category.Key == DefaultCategoryName)
+				{
+					continue;
+				}
+
+				var subGrid = new SubGrid(this, Object, category.Key, category.Key, Filter, null);
+				Grid.SetColumnSpan(subGrid, 2);
+				Grid.SetRow(subGrid, y);
+
+				if (subGrid.IsEmpty)
+				{
+					continue;
+				}
+
+				Children.Add(subGrid);
+
+				if (_expandedCategories.Contains(category.Key))
+				{
+					subGrid.Mark.IsPressed = true;
+				}
+
+				var rp = new Proportion(ProportionType.Auto);
+				_layout.RowsProportions.Add(rp);
+
+				y++;
+			}
+		}
+		
+		private static bool RecordAggregator(in object target, in Type parentType, List<Record> result, bool categorize = true)
+		{
+			result.Clear();
+			if (target == null)
+				return false;
+
+			Type targetType = target.GetType();
+			
 			// Properties
-			var properties = from p in _object.GetType().GetProperties() select p;
-			var records = new List<Record>();
+			var properties = from p in targetType.GetProperties() select p;
 			foreach (var property in properties)
 			{
 				if (property.GetGetMethod() == null ||
@@ -1369,15 +772,15 @@ public void Rebuild()
 				{
 					HasSetter = hasSetter
 				};
-
+				
 				var categoryAttr = property.FindAttribute<CategoryAttribute>();
-				record.Category = categoryAttr != null ? categoryAttr.Category : DefaultCategoryName;
+				record.Category = (categoryAttr != null & categorize) ? categoryAttr.Category : DefaultCategoryName;
 
-				records.Add(record);
+				result.Add(record);
 			}
 
 			// Fields
-			var fields = from f in _object.GetType().GetFields() select f;
+			var fields = from f in targetType.GetFields() select f;
 			foreach (var field in fields)
 			{
 				if (!field.IsPublic || field.IsStatic)
@@ -1403,17 +806,17 @@ public void Rebuild()
 				var record = new FieldRecord(field)
 				{
 					HasSetter = hasSetter,
-					Category = categoryAttr != null ? categoryAttr.Category : DefaultCategoryName
+					Category = (categoryAttr != null & categorize) ? categoryAttr.Category : DefaultCategoryName
 				};
 
-				records.Add(record);
+				result.Add(record);
 			}
 
 			// Attached properties
-			var asWidget = _object as Widget;
-			if (asWidget != null && ParentType != null)
+			var asWidget = target as Widget;
+			if (asWidget != null && parentType != null)
 			{
-				var attachedProperties = AttachedPropertiesRegistry.GetPropertiesOfType(ParentType);
+				var attachedProperties = AttachedPropertiesRegistry.GetPropertiesOfType(parentType);
 				foreach (var attachedProperty in attachedProperties)
 				{
 					var record = new AttachedPropertyRecord(attachedProperty)
@@ -1421,74 +824,16 @@ public void Rebuild()
 						Category = attachedProperty.OwnerType.Name
 					};
 
-					records.Add(record);
-				}
-			}
-
-			// Sort by categories
-			for (var i = 0; i < records.Count; ++i)
-			{
-				var record = records[i];
-
-				List<Record> categoryRecords;
-				if (!_records.TryGetValue(record.Category, out categoryRecords))
-				{
-					categoryRecords = new List<Record>();
-					_records[record.Category] = categoryRecords;
+					result.Add(record);
 				}
-
-				categoryRecords.Add(record);
-			}
-
-			// Sort by names within categories
-			foreach (var category in _records)
-			{
-				category.Value.Sort((a, b) => Comparer<string>.Default.Compare(a.Name, b.Name));
-			}
-
-			var ordered = _records.OrderBy(key => key.Key);
-
-			var y = 0;
-			List<Record> defaultCategoryRecords;
-			if (_records.TryGetValue(Category, out defaultCategoryRecords))
-			{
-				FillSubGrid(ref y, defaultCategoryRecords);
-			}
-
-			if (Category != DefaultCategoryName)
-			{
-				return;
 			}
 
-			foreach (var category in ordered)
-			{
-				if (category.Key == DefaultCategoryName)
-				{
-					continue;
-				}
-
-				var subGrid = new SubGrid(this, Object, category.Key, category.Key, Filter, null);
-				Grid.SetColumnSpan(subGrid, 2);
-				Grid.SetRow(subGrid, y); ;
-
-
-				if (subGrid.IsEmpty)
-				{
-					continue;
-				}
-
-				Children.Add(subGrid);
-
-				if (_expandedCategories.Contains(category.Key))
-				{
-					subGrid.Mark.IsPressed = true;
-				}
-
-				var rp = new Proportion(ProportionType.Auto);
-				_layout.RowsProportions.Add(rp);
+			return true;
+		}
 
-				y++;
-			}
+		private void RecordSorter(ref List<Record> collection)
+		{
+			
 		}
 
 		public void ApplyPropertyGridStyle(TreeStyle style)
@@ -1497,5 +842,14 @@ public void ApplyPropertyGridStyle(TreeStyle style)
 
 			PropertyGridStyle = style;
 		}
+		
+		public override void InternalRender(RenderContext context)
+		{
+			foreach (var editor in _editors)
+			{
+				editor.UpdateDisplay();
+			}
+			base.InternalRender(context);
+		}
 	}
 }
diff --git a/src/Myra/Graphics2D/UI/Properties/PropertyGridSettings.cs b/src/Myra/Graphics2D/UI/Properties/PropertyGridSettings.cs
index 2abe9111..195bd33d 100644
--- a/src/Myra/Graphics2D/UI/Properties/PropertyGridSettings.cs
+++ b/src/Myra/Graphics2D/UI/Properties/PropertyGridSettings.cs
@@ -5,6 +5,7 @@
 
 namespace Myra.Graphics2D.UI.Properties
 {
+	[Obsolete("Properties moved to IInspector")]
 	public class PropertyGridSettings
 	{
 		[Browsable(false)]
diff --git a/src/Myra/Graphics2D/UI/Properties/Record.cs b/src/Myra/Graphics2D/UI/Properties/Record.cs
deleted file mode 100644
index e6bfdf08..00000000
--- a/src/Myra/Graphics2D/UI/Properties/Record.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System;
-
-namespace Myra.Graphics2D.UI.Properties
-{
-	public abstract class Record
-	{
-		public bool HasSetter { get; set; }
-
-		public abstract string Name { get; }
-		public abstract Type Type { get; }
-		public string Category { get; set; }
-
-		public abstract object GetValue(object obj);
-		public abstract void SetValue(object obj, object value);
-
-		public abstract T FindAttribute<T>() where T : Attribute;
-	}
-}
diff --git a/src/Myra/Graphics2D/UI/Properties/AttachedPropertyRecord.cs b/src/Myra/Graphics2D/UI/Properties/Records/AttachedPropertyRecord.cs
similarity index 77%
rename from src/Myra/Graphics2D/UI/Properties/AttachedPropertyRecord.cs
rename to src/Myra/Graphics2D/UI/Properties/Records/AttachedPropertyRecord.cs
index e0ae15ea..1f6f1b68 100644
--- a/src/Myra/Graphics2D/UI/Properties/AttachedPropertyRecord.cs
+++ b/src/Myra/Graphics2D/UI/Properties/Records/AttachedPropertyRecord.cs
@@ -7,7 +7,7 @@ namespace Myra.Graphics2D.UI.Properties
 	internal class AttachedPropertyRecord : Record
 	{
 		private readonly BaseAttachedPropertyInfo _property;
-
+		
 		public AttachedPropertyRecord(BaseAttachedPropertyInfo property)
 		{
 			_property = property ?? throw new ArgumentNullException(nameof(property));
@@ -17,9 +17,8 @@ public AttachedPropertyRecord(BaseAttachedPropertyInfo property)
 		public override string Name => _property.Name;
 
 		public override Type Type => _property.PropertyType;
-		public override object GetValue(object obj) => _property.GetValueObject((Widget)obj);
-
-		public override void SetValue(object obj, object value) => _property.SetValueObject((Widget)obj, value);
+		public override object GetValue(object field) => _property.GetValueObject((Widget)field);
+		public override void SetValue(object field, object value) => _property.SetValueObject((Widget)field, value);
 
 		public override T FindAttribute<T>()
 		{
diff --git a/src/Myra/Graphics2D/UI/Properties/FieldRecord.cs b/src/Myra/Graphics2D/UI/Properties/Records/FieldRecord.cs
similarity index 50%
rename from src/Myra/Graphics2D/UI/Properties/FieldRecord.cs
rename to src/Myra/Graphics2D/UI/Properties/Records/FieldRecord.cs
index aeb63596..d2e0e1b2 100644
--- a/src/Myra/Graphics2D/UI/Properties/FieldRecord.cs
+++ b/src/Myra/Graphics2D/UI/Properties/Records/FieldRecord.cs
@@ -7,16 +7,8 @@ internal class FieldRecord : ReflectionRecord
 	{
 		private readonly FieldInfo _fieldInfo;
 
-		public override string Name
-		{
-			get { return _fieldInfo.Name; }
-		}
-
-		public override Type Type
-		{
-			get { return _fieldInfo.FieldType; }
-		}
-
+		public override string Name => _fieldInfo.Name;
+		public override Type Type => _fieldInfo.FieldType;
 		public override MemberInfo MemberInfo => _fieldInfo;
 
 		public FieldRecord(FieldInfo fieldInfo)
@@ -24,14 +16,14 @@ public FieldRecord(FieldInfo fieldInfo)
 			_fieldInfo = fieldInfo;
 		}
 
-		public override object GetValue(object obj)
+		public override object GetValue(object field)
 		{
-			return _fieldInfo.GetValue(obj);
+			return _fieldInfo.GetValue(field);
 		}
 
-		public override void SetValue(object obj, object value)
+		public override void SetValue(object field, object value)
 		{
-			_fieldInfo.SetValue(obj, value);
+			_fieldInfo.SetValue(field, value);
 		}
 	}
 }
diff --git a/src/Myra/Graphics2D/UI/Properties/Records/IRecordReference.cs b/src/Myra/Graphics2D/UI/Properties/Records/IRecordReference.cs
new file mode 100644
index 00000000..ec439059
--- /dev/null
+++ b/src/Myra/Graphics2D/UI/Properties/Records/IRecordReference.cs
@@ -0,0 +1,30 @@
+using System;
+using Myra.Utility.Types;
+
+namespace Myra.Graphics2D.UI.Properties
+{
+    public interface IRecordReference
+    {
+        Record Record { get; }
+        Type Type { get; }
+        bool IsReadOnly { get; }
+        object GetValue(object field);
+        void SetValue(object field, object value);
+    }
+
+    public interface IRecordReference<T> : IRecordReference
+    {
+        new T GetValue(object field);
+        void SetValue(object field, T value);
+    }
+    
+    public interface IStructRecordReference<T> : IRecordReference<T> where T : struct
+    {
+        bool IsNullable { get; }
+    }
+
+    public interface INumberRecordReference<T> : IStructRecordReference<T> where T : struct
+    {
+        // todo include min/max T limiters
+    }
+}
\ No newline at end of file
diff --git a/src/Myra/Graphics2D/UI/Properties/PropertyRecord.cs b/src/Myra/Graphics2D/UI/Properties/Records/PropertyRecord.cs
similarity index 50%
rename from src/Myra/Graphics2D/UI/Properties/PropertyRecord.cs
rename to src/Myra/Graphics2D/UI/Properties/Records/PropertyRecord.cs
index ca3d6ba4..345089e0 100644
--- a/src/Myra/Graphics2D/UI/Properties/PropertyRecord.cs
+++ b/src/Myra/Graphics2D/UI/Properties/Records/PropertyRecord.cs
@@ -7,16 +7,8 @@ internal class PropertyRecord : ReflectionRecord
 	{
 		private readonly PropertyInfo _propertyInfo;
 
-		public override string Name
-		{
-			get { return _propertyInfo.Name; }
-		}
-
-		public override Type Type
-		{
-			get { return _propertyInfo.PropertyType; }
-		}
-
+		public override string Name => _propertyInfo.Name;
+		public override Type Type => _propertyInfo.PropertyType;
 		public override MemberInfo MemberInfo => _propertyInfo;
 
 		public PropertyRecord(PropertyInfo propertyInfo)
@@ -24,14 +16,14 @@ public PropertyRecord(PropertyInfo propertyInfo)
 			_propertyInfo = propertyInfo;
 		}
 
-		public override object GetValue(object obj)
+		public override object GetValue(object field)
 		{
-			return _propertyInfo.GetValue(obj, new object[0]);
+			return _propertyInfo.GetValue(field, Array.Empty<object>());
 		}
 
-		public override void SetValue(object obj, object value)
+		public override void SetValue(object field, object value)
 		{
-			_propertyInfo.SetValue(obj, value);
+			_propertyInfo.SetValue(field, value);
 		}
 	}
 }
diff --git a/src/Myra/Graphics2D/UI/Properties/Records/Record.cs b/src/Myra/Graphics2D/UI/Properties/Records/Record.cs
new file mode 100644
index 00000000..10f0cfa9
--- /dev/null
+++ b/src/Myra/Graphics2D/UI/Properties/Records/Record.cs
@@ -0,0 +1,23 @@
+using Myra.Utility;
+using System;
+using System.Reflection;
+
+namespace Myra.Graphics2D.UI.Properties
+{
+	/// <summary>
+	/// Base for encapsulating reflective information using <see cref="MemberInfo"/>.
+	/// </summary>
+	public abstract class Record
+	{
+		public bool HasSetter { get; set; }
+		public string Category { get; set; }
+		public abstract string Name { get; }
+		public abstract Type Type { get; }
+		public virtual MemberInfo MemberInfo { get; }
+
+		public abstract object GetValue(object field);
+		public abstract void SetValue(object field, object value);
+
+		public abstract T FindAttribute<T>() where T : Attribute;
+	}
+}
diff --git a/src/Myra/Graphics2D/UI/Properties/ReflectionRecord.cs b/src/Myra/Graphics2D/UI/Properties/Records/ReflectionRecord.cs
similarity index 80%
rename from src/Myra/Graphics2D/UI/Properties/ReflectionRecord.cs
rename to src/Myra/Graphics2D/UI/Properties/Records/ReflectionRecord.cs
index 946c7cf9..94aec198 100644
--- a/src/Myra/Graphics2D/UI/Properties/ReflectionRecord.cs
+++ b/src/Myra/Graphics2D/UI/Properties/Records/ReflectionRecord.cs
@@ -5,7 +5,7 @@ namespace Myra.Graphics2D.UI.Properties
 {
 	internal abstract class ReflectionRecord : Record
 	{
-		public abstract MemberInfo MemberInfo { get; }
+		public abstract override MemberInfo MemberInfo { get; }
 
 		public override T FindAttribute<T>()
 		{
diff --git a/src/Myra/Graphics2D/UI/Range/SpinButton.cs b/src/Myra/Graphics2D/UI/Range/SpinButton.cs
index e865e6aa..58f4d854 100644
--- a/src/Myra/Graphics2D/UI/Range/SpinButton.cs
+++ b/src/Myra/Graphics2D/UI/Range/SpinButton.cs
@@ -1,9 +1,12 @@
 using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.ComponentModel;
-using System.Linq;
-using Myra.Graphics2D.UI.Styles;
+using System.Globalization;
 using System.Xml.Serialization;
+using Myra.Graphics2D.UI.Styles;
 using Myra.Events;
+using Myra.Utility.Types;
 
 #if MONOGAME || FNA
 using Microsoft.Xna.Framework.Input;
@@ -12,127 +15,232 @@
 #else
 using Myra.Platform;
 #endif
+#if MATH_IFACES
+using System.Numerics;
+#endif
 
 namespace Myra.Graphics2D.UI
 {
-	public class SpinButton : Widget
+	/// <summary>
+	/// An UI element that edits a numeric data type <paramref name="TNum"/>, with up and down buttons.
+	/// </summary>
+	/// <typeparam name="TNum">The standard number-based value type to hold.</typeparam>
+	/// <exception cref="TypeLoadException">Generic <typeparamref name="TNum"/> cannot be <see cref="byte"/> or <see cref="sbyte"/> as they lack math operators and cannot be used.<para/>OR an unknown type was provided.</exception>
+	public class SpinButton<TNum> : Widget 
+#if MATH_IFACES
+		where TNum : struct, INumber<TNum>, IMinMaxValue<TNum>
+#else
+		where TNum : struct
+#endif
 	{
+#region Statics
+		private const string DefaultStringWhole = "0";
+		private const string DefaultStringFloat = "0.0";
+		private static readonly bool _numTypeHasSign;
+		private static readonly bool _numTypeIsFloating;
+		private static readonly string _defaultString;
+		private static readonly Func<TNum, NumberFormatInfo, string> _strConverter;
+		
+		static SpinButton() //Static ctor on generics is invoked once per type-instance
+		{
+			Type arg = typeof(TNum); //Validate generic arg
+			if (arg == typeof(byte) || arg == typeof(sbyte))
+			{
+				throw new TypeLoadException($"Invalid Generic-Type Argument: '{arg}' does not have full math support. Convert to another type first");
+			}
+
+			TypeInfo info = TypeHelper<TNum>.Info;
+			_numTypeHasSign = info.IsSignedNumber;
+			_numTypeIsFloating = info.IsFractionalNumber;
+			_defaultString = _numTypeIsFloating ? DefaultStringFloat : DefaultStringWhole;
+			
+			// Assign strConverter depending on TNum type. object.ToString() can't accept IFormatProvider...
+			switch (info.Code)
+			{
+				// Handle floating point types
+				case TypeCode.Single:
+					_strConverter = (TNum num, NumberFormatInfo formatter) =>
+					{
+						if (num is float value)
+							return value.ToString(formatter);
+						throw new TypeAccessException();
+					};
+					break;
+				case TypeCode.Double:
+					_strConverter = (TNum num, NumberFormatInfo formatter) =>
+					{
+						if (num is double value)
+							return value.ToString(formatter);
+						throw new TypeAccessException();
+					};
+					break;
+				case TypeCode.Decimal:
+					_strConverter = (TNum num, NumberFormatInfo formatter) =>
+					{
+						if (num is decimal value)
+							return value.ToString(formatter);
+						throw new TypeAccessException();
+					};
+					break;
+				
+				// Handle signed whole number types
+				case TypeCode.Int16:
+					_strConverter = (TNum num, NumberFormatInfo formatter) =>
+					{
+						if (num is short value)
+							return value.ToString(formatter);
+						throw new TypeAccessException();
+					};
+					break;
+				case TypeCode.Int32:
+					_strConverter = (TNum num, NumberFormatInfo formatter) =>
+					{
+						if (num is int value)
+							return value.ToString(formatter);
+						throw new TypeAccessException();
+					};
+					break;
+				case TypeCode.Int64:
+					_strConverter = (TNum num, NumberFormatInfo formatter) =>
+					{
+						if (num is long value)
+							return value.ToString(formatter);
+						throw new TypeAccessException();
+					};
+					break;
+				
+				// Handle unsigned whole number types
+				case TypeCode.UInt16:
+					_strConverter = (TNum num, NumberFormatInfo formatter) =>
+					{
+						if (num is ushort value)
+							return value.ToString(formatter);
+						throw new TypeAccessException();
+					};
+					break;
+				case TypeCode.UInt32:
+					_strConverter = (TNum num, NumberFormatInfo formatter) =>
+					{
+						if (num is uint value)
+							return value.ToString(formatter);
+						throw new TypeAccessException();
+					};
+					break;
+				case TypeCode.UInt64:
+					_strConverter = (TNum num, NumberFormatInfo formatter) =>
+					{
+						if (num is ulong value)
+							return value.ToString(formatter);
+						throw new TypeAccessException();
+					};
+					break;
+
+				default:
+					throw new TypeLoadException($"Unknown generic numerical type: {arg}");
+			}
+		}
+#endregion
 		private readonly GridLayout _layout = new GridLayout();
 		private readonly TextBox _textField;
 		private readonly Button _upButton;
 		private readonly Button _downButton;
-		private bool _integer = false;
-		private int _decimalPlaces = 0;
-		private float _increment = 1f;
-
-		[Category("Behavior")]
-		[DefaultValue(false)]
-		public bool Nullable { get; set; }
-
-		[Category("Behavior")]
-		[DefaultValue(null)]
-		public float? Maximum { get; set; }
-
-		[Category("Behavior")]
-		[DefaultValue(null)]
-		public float? Minimum { get; set; }
+		private readonly NumberFormatInfo _formatter;
+		private int _decimalPlaces;
+		private bool _fixedDigits;
+		private TNum _increment;
+		private Range<TNum> _range;
 
 		[DefaultValue(HorizontalAlignment.Left)]
 		public override HorizontalAlignment HorizontalAlignment
 		{
-			get
-			{
-				return base.HorizontalAlignment;
-			}
-			set
-			{
-				base.HorizontalAlignment = value;
-			}
+			get => base.HorizontalAlignment;
+			set => base.HorizontalAlignment = value;
 		}
 
 		[DefaultValue(VerticalAlignment.Top)]
 		public override VerticalAlignment VerticalAlignment
 		{
-			get
-			{
-				return base.VerticalAlignment;
-			}
-			set
-			{
-				base.VerticalAlignment = value;
-			}
+			get => base.VerticalAlignment;
+			set => base.VerticalAlignment = value;
 		}
+		
+		[Category("Behavior")]
+		[DefaultValue(false)]
+		public bool Nullable { get; set; }
 
 		[Category("Behavior")]
-		[DefaultValue(0.0f)]
-		public float? Value
+		[DefaultValue(null)]
+		public TNum? Minimum
+		{
+			get => _range.Min; 
+			set => _range.Min = value;
+		}
+		[Category("Behavior")]
+		[DefaultValue(null)]
+		public TNum? Maximum
+		{
+			get => _range.Max;
+			set => _range.Max = value;
+		}
+		[Category("Behavior")]
+		[DefaultValue(null)]
+		public TNum? Value
 		{
 			get
 			{
-				if (string.IsNullOrEmpty(_textField.Text))
-				{
-					return Nullable ? default(float?) : 0.0f;
-				}
-
-				float result;
-				if (float.TryParse(_textField.Text, out result))
-				{
-					return result;
-				}
-
-				return null;
+				return StringToNumber(_textField.Text, Nullable);
 			}
 
 			set
 			{
-				if (value == null && !Nullable)
-				{
-					throw new Exception("value can't be null when Nullable is false");
-				}
-
-				if (value.HasValue && Minimum.HasValue && value.Value < Minimum.Value)
+				if (!value.HasValue && !Nullable)
 				{
-					throw new Exception("Value can't be lower than Minimum");
+					value = default(TNum);
 				}
 
-				if (value.HasValue && Maximum.HasValue && value.Value > Maximum.Value)
+				if (value.HasValue)
 				{
-					throw new Exception("Value can't be higher than Maximum");
+					value = _range.Clamp(value.Value);
 				}
 
+				_textField.Text = NumberToString(value, Nullable, _formatter);
+				
+				/*
 				if (FixedNumberSize)
 				{
-					string MajorString = "";
+					throw new NotImplementedException();
+					string majorString = "";
 					int k = 0;
 					int k2 = 0;
 					if (Maximum.HasValue)
 					{
-						k = Math.Abs(Maximum.Value).ToString().Count();
+						k = MathHelper<TNum>.Abs(Maximum.Value).ToString().Length;
 					}
 					if (Minimum.HasValue)
 					{
-						k2 = Math.Abs(Minimum.Value).ToString().Count();
+						k2 = MathHelper<TNum>.Abs(Minimum.Value).ToString().Length;
 					}
 					k = k > k2 ? k : k2;
 					for (int i = 0; i < k; i++)
 					{
-						MajorString += "0";
+						majorString += ZeroChar;
 					}
-					if (value.HasValue && value.Value >= 0)
+					if (value.HasValue && MathHelper<TNum>.GreaterThanOrEqual(value.Value, MathHelper<TNum>.Zero))
 					{
-						MajorString = " " + MajorString;
+						majorString = SpaceChar + majorString;
 					}
-					string MinorString = ".";
+
+					string minorString = DecimalChar.ToString();
 					for (int i = 0; i < _decimalPlaces; i++)
 					{
-						MinorString += "0";
+						minorString += ZeroChar;
 					}
-					_textField.Text = value.HasValue ? value.Value.ToString(MajorString + MinorString) : string.Empty;
+					//_textField.Text = value.HasValue ? value.Value.ToString(MajorString + MinorString) : string.Empty;
 				}
 				else
 				{
 					_textField.Text = value.HasValue ? value.Value.ToString() : string.Empty;
-				}
+				}*/
 
 				if (_textField.Text != null)
 				{
@@ -142,77 +250,45 @@ public float? Value
 		}
 
 		[Category("Behavior")]
-		[DefaultValue(1f)]
-		public float Increment
+		[DefaultValue(1)]
+		public TNum Increment
 		{
-			get
-			{
-				return _increment;
-			}
-
-			set
-			{
-				if (Integer)
-				{
-					_increment = (int)value;
-				}
-				else
-				{
-					_increment = value;
-				}
-			}
+			get => _increment;
+			set => _increment = value;
 		}
+		
+		[Category("Behavior")]
+		[DefaultValue(1)]
+		public TNum Mul_Increment { get; set; }
 
 		[Category("Behavior")]
-		[DefaultValue(0)]
+		[DefaultValue(2)]
 		public int DecimalPlaces
 		{
-			get
-			{
-				return _decimalPlaces;
-			}
-
+			get => _fixedDigits ? _decimalPlaces : 0;
 			set
 			{
-				if (Integer)
-				{
-					_decimalPlaces = 0;
-				}
+				if (_fixedDigits & _numTypeIsFloating)
+					value = Math.Abs(value);
 				else
-				{
-					_decimalPlaces = value;
-				}
+					value = 0;
+				_decimalPlaces = value;
+				_formatter.NumberDecimalDigits = value;
 			}
 		}
 
 		[Category("Behavior")]
 		[DefaultValue(false)]
-		public bool FixedNumberSize { get; set; }
-
-		[Category("Behavior")]
-		[DefaultValue(false)]
-		public bool Integer
+		public bool FixedNumberSize
 		{
-			get
-			{
-				return _integer;
-			}
-
+			get => _fixedDigits;
 			set
 			{
-				_integer = value;
-				if (Integer)
-				{
-					_increment = (int)_increment;
-					Value = (int)Value;
-				}
+				_fixedDigits = value;
+				DecimalPlaces = _decimalPlaces;
 			}
 		}
 
-		[Category("Behavior")]
-		[DefaultValue(1f)]
-		public float Mul_Increment { get; set; } = 1f;
-
 		[XmlIgnore]
 		[Browsable(false)]
 		public TextBox TextBox => _textField;
@@ -223,17 +299,17 @@ public bool Integer
 		/// Fires when the value is about to be changed
 		/// Set Cancel to true if you want to cancel the change
 		/// </summary>
-		public event EventHandler<ValueChangingEventArgs<float?>> ValueChanging;
+		public event EventHandler<ValueChangingEventArgs<TNum?>> ValueChanging;
 
 		/// <summary>
 		/// Fires when the value had been changed
 		/// </summary>
-		public event EventHandler<ValueChangedEventArgs<float?>> ValueChanged;
+		public event EventHandler<ValueChangedEventArgs<TNum?>> ValueChanged;
 
 		/// <summary>
 		/// Fires only when the value had been changed by user(doesnt fire if it had been assigned through code)
 		/// </summary>
-		public event EventHandler<ValueChangedEventArgs<float?>> ValueChangedByUser;
+		public event EventHandler<ValueChangedEventArgs<TNum?>> ValueChangedByUser;
 
 		public SpinButton(string styleName = Stylesheet.DefaultStyleName)
 		{
@@ -294,148 +370,94 @@ public SpinButton(string styleName = Stylesheet.DefaultStyleName)
 
 			SetStyle(styleName);
 
-			Value = 0;
+			_formatter = new NumberFormatInfo();
+			Value = MathHelper<TNum>.Zero;
+			Increment = MathHelper<TNum>.One;
+			Mul_Increment = MathHelper<TNum>.One;
 		}
 
-		private static float? StringToFloat(string s)
+		private static TNum? StringToNumber(string str, bool isNullable)
 		{
-			if (string.IsNullOrEmpty(s))
-			{
-				return null;
-			}
-
-			float f;
-			if (!float.TryParse(s, out f))
+			if (!string.IsNullOrEmpty(str))
 			{
-				return null;
+				if (TypeHelper<TNum>.TryParse(str, out TNum value))
+				{
+					return value;
+				}
 			}
-
-			return f;
+			return isNullable ? default(TNum?) : MathHelper<TNum>.Zero;
 		}
 
-		private string NumberToString(float? v)
+		private static string NumberToString(TNum? value, bool isNullable, NumberFormatInfo formatter)
 		{
-			if (v == null)
+			if(formatter == null)
+				formatter = NumberFormatInfo.CurrentInfo;
+			
+			if (value.HasValue)
 			{
-				if (Nullable)
-				{
-					return string.Empty;
-				}
-
-				// Default value
-				return "0";
+				TNum num = value.Value;
+				return _strConverter.Invoke(num, formatter);
 			}
 
-			if (Integer)
+			if (isNullable)
 			{
-				return ((int)v.Value).ToString();
+				return string.Empty;
 			}
-
-			return v.Value.ToString();
+			return _defaultString; // Default value
 		}
 
 		private void _textField_ValueChanging(object sender, ValueChangingEventArgs<string> e)
 		{
-			var s = e.NewValue;
-			if (string.IsNullOrEmpty(s))
+			string str = e.NewValue;
+			if (string.IsNullOrEmpty(str))
 			{
+				return;
 			}
-			else if (s == "-")
+			
+			if (str == "-")
 			{
 				// Allow prefix 'minus' only if Minimum lower than zero
-				if (Minimum != null && Minimum.Value >= 0)
+				if (Minimum.HasValue && MathHelper<TNum>.GreaterThanOrEqual(Minimum.Value, MathHelper<TNum>.Zero))
 				{
 					e.Cancel = true;
 				}
 			}
 			else
 			{
-				float? newValue = null;
-				if (Integer)
+				TNum? newValue = null;
+				if (TypeHelper<TNum>.TryParse(str, out TNum num) && _range.IsInRange(num))
 				{
-					int i;
-					if (!int.TryParse(s, out i))
-					{
-						e.Cancel = true;
-					}
-					else
-					{
-						if ((Minimum != null && i < (int)Minimum) ||
-							(Maximum != null && i > (int)Maximum))
-						{
-							e.Cancel = true;
-						}
-						else
-						{
-							newValue = i;
-						}
-					}
+					newValue = num;
 				}
 				else
 				{
-					float f;
-					if (!float.TryParse(s, out f))
-					{
-						e.Cancel = true;
-					}
-					else
-					{
-						if ((Minimum != null && f < Minimum) ||
-							(Maximum != null && f > Maximum))
-						{
-							e.Cancel = true;
-						}
-						else
-						{
-							newValue = f;
-						}
-					}
+					e.Cancel = true;
 				}
 
-				if (newValue != null)
+				if (ValueChanging == null)
+					return;
+				
+				var args = new ValueChangingEventArgs<TNum?>(Value, newValue);
+				ValueChanging.Invoke(this, args);
+				if (args.Cancel)
 				{
+					e.Cancel = true;
 				}
-
-				// Now SpinButton's 
-				if (ValueChanging != null)
+				else
 				{
-					var args = new ValueChangingEventArgs<float?>(Value, newValue);
-					ValueChanging(this, args);
-					if (args.Cancel)
-					{
-						e.Cancel = true;
-					}
-					else
-					{
-						e.NewValue = args.NewValue.HasValue ? NumberToString(args.NewValue) : null;
-					}
+					e.NewValue = args.NewValue.HasValue ? NumberToString(args.NewValue, Nullable, _formatter) : null;
 				}
 			}
 		}
 
 		private void TextBoxOnTextChanged(object sender, ValueChangedEventArgs<string> eventArgs)
 		{
-			ValueChanged?.Invoke(this, new ValueChangedEventArgs<float?>(StringToFloat(eventArgs.OldValue), StringToFloat(eventArgs.NewValue)));
+			ValueChanged?.Invoke(this, new ValueChangedEventArgs<TNum?>(StringToNumber(eventArgs.OldValue, Nullable), StringToNumber(eventArgs.NewValue, Nullable)));
 		}
 
 		private void TextBoxOnTextChangedByUser(object sender, ValueChangedEventArgs<string> eventArgs)
 		{
-			ValueChangedByUser?.Invoke(this, new ValueChangedEventArgs<float?>(StringToFloat(eventArgs.OldValue), StringToFloat(eventArgs.NewValue)));
-		}
-
-		private bool InRange(float value)
-		{
-			if (Minimum.HasValue && value < Minimum.Value)
-			{
-				return false;
-			}
-
-			if (Maximum.HasValue && value > Maximum.Value)
-			{
-				return false;
-			}
-
-			return true;
+			ValueChangedByUser?.Invoke(this, new ValueChangedEventArgs<TNum?>(StringToNumber(eventArgs.OldValue, Nullable), StringToNumber(eventArgs.NewValue, Nullable)));
 		}
 
 		public void ApplySpinButtonStyle(SpinButtonStyle style)
@@ -463,94 +485,52 @@ protected override void InternalSetStyle(Stylesheet stylesheet, string name)
 			ApplySpinButtonStyle(stylesheet.SpinButtonStyles.SafelyGetStyle(name));
 		}
 
-		private void UpButtonOnUp(object sender, EventArgs eventArgs)
+		private void SpinValue(bool spinUpward, bool isMouseWheel)
 		{
-			float value;
-			if (!float.TryParse(_textField.Text, out value))
+			TNum newValue, delta;
+			if (!TypeHelper<TNum>.TryParse(_textField.Text, out newValue))
 			{
-				value = 0;
+				newValue = MathHelper<TNum>.Zero;
 			}
-			value += _increment;
-			if (InRange(value))
-			{
-				var changed = Value != value;
-				var oldValue = Value;
-				Value = value;
 
-				if (changed)
-				{
-					var ev = ValueChangedByUser;
-					if (ev != null)
-					{
-						ev(this, new ValueChangedEventArgs<float?>(oldValue, value));
-					}
-				}
-			}
-		}
-		private void DownButtonOnUp(object sender, EventArgs eventArgs)
-		{
-			float value;
-			if (!float.TryParse(_textField.Text, out value))
-			{
-				value = 0;
-			}
+			if (isMouseWheel)
+				delta = MathHelper<TNum>.Multiply(_increment, Mul_Increment);
+			else
+				delta = _increment;
+
+			if (spinUpward)
+				MathHelper<TNum>.Add(ref newValue, delta);
+			else
+				MathHelper<TNum>.Subtract(ref newValue, delta);
 
-			value -= _increment;
-			if (InRange(value))
+			if (_range.IsInRange(newValue))
 			{
-				var changed = Value != value;
-				var oldValue = Value;
-				Value = value;
+				bool changed = MathHelper<TNum>.UnEqual(Value.GetValueOrDefault(), newValue);
+				TNum? oldValue = Value;
+				Value = newValue;
 
 				if (changed)
 				{
-					var ev = ValueChangedByUser;
-					if (ev != null)
-					{
-						ev(this, new ValueChangedEventArgs<float?>(oldValue, value));
-					}
+					ValueChangedByUser?.Invoke(this, new ValueChangedEventArgs<TNum?>(oldValue, newValue));
 				}
 			}
 		}
+		private void UpButtonOnUp(object sender, EventArgs eventArgs) 
+			=> SpinValue(true, false);
+		private void DownButtonOnUp(object sender, EventArgs eventArgs) 
+			=> SpinValue(false, false);
 
 		public override void OnMouseWheel(float delta)
 		{
 			base.OnMouseWheel(delta);
-			float value;
-			if (!float.TryParse(_textField.Text, out value))
-			{
-				value = 0;
-			}
 
 			if (delta < 0 && _downButton.Visible && _downButton.Enabled)
 			{
-				value -= _increment * Mul_Increment;
-				if (InRange(value))
-				{
-					var changed = Value != value;
-					var oldValue = Value;
-					Value = value;
-
-					if (changed)
-					{
-						ValueChangedByUser?.Invoke(this, new ValueChangedEventArgs<float?>(oldValue, value));
-					}
-				}
+				SpinValue(false, true);
 			}
-			else if (delta > 0 && _upButton.Visible && _upButton.Enabled)
+			else if(delta > 0 && _upButton.Visible && _upButton.Enabled)
 			{
-				value += _increment * Mul_Increment;
-				if (InRange(value))
-				{
-					var changed = Value != value;
-					var oldValue = Value;
-					Value = value;
-
-					if (changed)
-					{
-						ValueChangedByUser?.Invoke(this, new ValueChangedEventArgs<float?>(oldValue, value));
-					}
-				}
+				SpinValue(true, true);
 			}
 		}
 
@@ -567,17 +547,17 @@ public override void OnLostKeyboardFocus()
 
 			if (string.IsNullOrEmpty(_textField.Text) && !Nullable)
 			{
-				var defaultValue = "0";
-				if (Minimum != null && Minimum.Value > 0)
+				string textValue = _defaultString;
+				if (Minimum.HasValue && MathHelper<TNum>.GreaterThan(Minimum.Value, MathHelper<TNum>.Zero))
 				{
-					defaultValue = NumberToString(Minimum.Value);
+					textValue = NumberToString(Minimum.Value, Nullable, _formatter);
 				}
-				else if (Maximum != null && Maximum.Value < 0)
+				else if (Maximum.HasValue && MathHelper<TNum>.LessThan(Maximum.Value, MathHelper<TNum>.Zero))
 				{
-					defaultValue = NumberToString(Maximum.Value);
+					textValue = NumberToString(Maximum.Value, Nullable, _formatter);
 				}
 
-				_textField.Text = defaultValue;
+				_textField.Text = textValue;
 			}
 
 			_textField.OnLostKeyboardFocus();
@@ -593,15 +573,35 @@ public override void OnKeyDown(Keys k)
 		public override void OnChar(char c)
 		{
 			base.OnChar(c);
-
-			_textField.OnChar(c);
+			
+			const char sign = '-';
+			bool isNegSign = c == sign;
+			bool doPrint = false;
+			if (_numTypeHasSign)
+			{
+				if (isNegSign)
+				{
+					if (_textField.Text.Length == 0 || (_textField.CursorPosition == 0 && _textField.Text[0] != sign))
+						doPrint = true;
+				}
+				else
+					doPrint = true;
+			}
+			else
+			{
+				if (!isNegSign)
+					doPrint = true;
+			}
+			
+			if(doPrint)
+				_textField.OnChar(c);
 		}
 
 		protected internal override void CopyFrom(Widget w)
 		{
 			base.CopyFrom(w);
 
-			var spinButton = (SpinButton)w;
+			var spinButton = (SpinButton<TNum>)w;
 
 			Nullable = spinButton.Nullable;
 			Minimum = spinButton.Minimum;
@@ -610,7 +610,6 @@ protected internal override void CopyFrom(Widget w)
 			Increment = spinButton.Increment;
 			DecimalPlaces = spinButton.DecimalPlaces;
 			FixedNumberSize = spinButton.FixedNumberSize;
-			Integer = spinButton.Integer;
 			Mul_Increment = spinButton.Mul_Increment;
 		}
 	}
diff --git a/src/Myra/MML/BaseContext.cs b/src/Myra/MML/BaseContext.cs
index c769272c..f64c8847 100644
--- a/src/Myra/MML/BaseContext.cs
+++ b/src/Myra/MML/BaseContext.cs
@@ -22,22 +22,6 @@ internal class BaseContext
 	{
 		public const string IdName = "Id";
 
-		public static ITypeSerializer FindSerializer(Type type)
-		{
-			if (type.IsNullablePrimitive())
-			{
-				type = type.GetNullableType();
-			}
-
-			ITypeSerializer result;
-			if (Serialization._serializers.TryGetValue(type, out result))
-			{
-				return result;
-			}
-
-			return null;
-		}
-
 		protected static void ParseProperties(Type type, bool checkSkipSave,
 			out List<PropertyInfo> complexProperties, 
 			out List<PropertyInfo> simpleProperties)
@@ -76,6 +60,7 @@ protected static void ParseProperties(Type type, bool checkSkipSave,
 					propertyType.IsEnum || 
 					propertyType.IsNullableEnum() ||
 					propertyType == typeof(string) ||
+					propertyType == typeof(decimal) ||
 					propertyType == typeof(Vector2) ||
 					propertyType == typeof(Color) ||
 					propertyType == typeof(Color?) ||
diff --git a/src/Myra/MML/LoadContext.cs b/src/Myra/MML/LoadContext.cs
index fdd3d1fa..cba6179f 100644
--- a/src/Myra/MML/LoadContext.cs
+++ b/src/Myra/MML/LoadContext.cs
@@ -11,6 +11,7 @@
 using FontStashSharp;
 using Myra.Utility;
 using FontStashSharp.RichText;
+using Myra.Utility.Types;
 
 #if MONOGAME || FNA
 using Microsoft.Xna.Framework;
@@ -22,7 +23,7 @@
 
 namespace Myra.MML
 {
-	internal class LoadContext: BaseContext
+	internal class LoadContext : BaseContext
 	{
 		struct SimplePropertyInfo
 		{
@@ -71,6 +72,7 @@ public void SetValue(object obj, object value)
 		public readonly List<Tuple<object, XElement>> ObjectsNodes = new List<Tuple<object, XElement>>();
 
 		private const string UserDataAttributePrefix = "_";
+		private static readonly char[] LegacySplitChar = new char[] { Project.LegacySeparator };
 
 		public void Load<T>(object obj, XElement el, T handler) where T : class
 		{
@@ -83,9 +85,9 @@ public void Load<T>(object obj, XElement el, T handler) where T : class
 
 			List<PropertyInfo> complexProperties, simpleProperties;
 			ParseProperties(type, false, out complexProperties, out simpleProperties);
-
+			
 			string newName;
-			foreach (var attr in el.Attributes())
+			foreach (XAttribute attr in el.Attributes())
 			{
 				var propertyName = attr.Name.ToString();
 				if (LegacyPropertyNames != null && LegacyPropertyNames.TryGetValue(propertyName, out newName))
@@ -130,13 +132,11 @@ public void Load<T>(object obj, XElement el, T handler) where T : class
 					object value = null;
 
 					var propertyType = simplePropertyInfo.Value.PropertyType;
-					var serializer = FindSerializer(propertyType);
-					if (serializer != null)
+					if (Serialization.TryFindSerializer(propertyType, out var serializer))
 					{
 						value = serializer.Deserialize(attr.Value);
-					} else 
-					if (propertyType.IsEnum ||
-						propertyType.IsNullableEnum())
+					}
+					else if (propertyType.IsEnum || propertyType.IsNullableEnum())
 					{
 						if (propertyType.IsNullableEnum())
 						{
@@ -185,12 +185,8 @@ public void Load<T>(object obj, XElement el, T handler) where T : class
 					}
 					else
 					{
-						if (propertyType.IsNullablePrimitive())
-						{
-							propertyType = propertyType.GetNullableType();
-						}
-
-						value = Convert.ChangeType(attr.Value, propertyType, CultureInfo.InvariantCulture);
+						TypeHelper.GetNullableTypeOrPassThrough(ref propertyType);
+						value = Convert.ChangeType(attr.Value, propertyType, CultureInfo.InvariantCulture);	
 					}
 
 					simplePropertyInfo.Value.SetValue(obj, value);
@@ -217,14 +213,13 @@ public void Load<T>(object obj, XElement el, T handler) where T : class
 				}
 			}
 			
-
 			var contentProperty = (from p in complexProperties
-								   where p.FindAttribute<ContentAttribute>() 
-								   != null select p).FirstOrDefault();
+								   where p.FindAttribute<ContentAttribute>() != null 
+								   select p).FirstOrDefault();
 
-			foreach (var child in el.Elements())
+			foreach (XElement child in el.Elements())
 			{
-				var childName = child.Name.ToString();
+				string childName = child.Name.ToString();
 				if (NodesToIgnore != null && NodesToIgnore.Contains(childName))
 				{
 					continue;
@@ -305,31 +300,39 @@ where p.FindAttribute<ContentAttribute>()
 					// Property not found
 					if (isProperty)
 					{
-						throw new Exception(string.Format("Class {0} doesnt have property {1}", type.Name, childName));
+						throw new Exception($"Class '{type.Name}' doesn't have property '{childName}'");
 					}
 
 					// Should be widget class name then
-					var widgetName = childName;
-					if (LegacyClassNames != null && LegacyClassNames.TryGetValue(widgetName, out newName))
-					{
-						widgetName = newName;
-					}
-
-					Type itemType = null;
-					foreach (var pair in Assemblies)
+					string widgetName = childName;
+					bool isGeneric = TypeHelper.IsGenericTypeName_FrontEnd(widgetName);
+					string genericTypeArgName = null;
+					
+					LegacyClassNameReplace(child, ref widgetName, ref isGeneric, ref genericTypeArgName);
+					
+					Type itemType;
+					if (isGeneric)
 					{
-						foreach (var ns in pair.Value)
+						if (!TryResolveType(widgetName, out itemType))
 						{
-							var widgetType = pair.Key.GetType(ns + "." + widgetName);
-							if (widgetType != null)
+							throw new Exception($"Could not resolve open-generic type name: '{widgetName}'");
+						}
+						if (!TryResolveType(genericTypeArgName, out Type genericTypeArg))
+						{
+							// The type might be a keyword, convert it to internal and try again
+							TypeHelper.NameSwap_KeywordToDotNet(ref genericTypeArgName);
+							if (!TryResolveType(genericTypeArgName, out genericTypeArg))
 							{
-								itemType = widgetType;
-								break;
+								throw new Exception($"Could not resolve generic argument type: '{genericTypeArgName}' of '{widgetName}'");
 							}
 						}
 
-						if (itemType != null)
-							break;
+						TypeHelper.SwapGenericTypeNameFormat(ref widgetName);
+						itemType = itemType.MakeGenericType(genericTypeArg);
+					}
+					else
+					{
+						TryResolveType(widgetName, out itemType);
 					}
 
 					if (itemType != null)
@@ -339,7 +342,7 @@ where p.FindAttribute<ContentAttribute>()
 
 						if (contentProperty == null)
 						{
-							throw new Exception(string.Format("Class {0} lacks property marked with ContentAttribute", type.Name));
+							throw new Exception($"Class '{type.Name}' lacks property marked with ContentAttribute");
 						}
 
 						var containerValue = contentProperty.GetValue(obj);
@@ -348,7 +351,8 @@ where p.FindAttribute<ContentAttribute>()
 						{
 							// List
 							asList.Add(item);
-						} else
+						} 
+						else
 						{
 							// Simple
 							contentProperty.SetValue(obj, item);
@@ -356,8 +360,69 @@ where p.FindAttribute<ContentAttribute>()
 					}
 					else
 					{
-						throw new Exception(string.Format("Could not resolve tag '{0}'", widgetName));
+						throw new Exception($"Could not resolve type '{widgetName}'");
+					}
+				}
+			}
+		}
+
+		private bool TryResolveType(string typeName, out Type itemType)
+		{
+			itemType = null;
+			foreach (var pair in Assemblies)
+			{
+				foreach (var ns in pair.Value)
+				{
+					var type = pair.Key.GetType(ns + "." + typeName);
+					if (type != null)
+					{
+						itemType = type;
+						return true;
+					}
+				}
+			}
+			return false;
+		}
+		
+		private void LegacyClassNameReplace(XElement element, ref string typeName, ref bool isGeneric, ref string genericTypeArgName)
+		{
+			if(LegacyClassNames == null)
+				return;
+			
+			if (LegacyClassNames.TryGetValue(typeName, out string replace))
+			{
+				if (!replace.StartsWith(Project.LegacyClassToGeneric))
+				{
+					typeName = replace;
+					return;
+				}
+
+				string[] split = replace.Split(LegacySplitChar, StringSplitOptions.RemoveEmptyEntries);
+				
+				isGeneric = TypeHelper.IsGenericTypeName(split[1]);
+				if (isGeneric)
+				{
+					XAttribute attr = element.Attribute(Project.GenericTypeArgName);
+					if (attr == null)
+					{
+						for (int i = 0; i < split.Length - 1; i++)
+						{
+							if (split[i] == Project.LegacyToGenericDefaultType)
+								genericTypeArgName = split[i + 1]; //Set a default fallback type arg (LEGACY)
+						}
+						
+						if (!string.IsNullOrEmpty(genericTypeArgName))
+						{
+							element.SetAttributeValue(Project.GenericTypeArgName, genericTypeArgName);
+						}
+					}
+					else
+					{
+						genericTypeArgName = attr.Value;
 					}
+					
+					typeName = split[1];
+					TypeHelper.SwapGenericTypeNameFormat(ref typeName); //Swap end "<>" -> "`1"
 				}
 			}
 		}
diff --git a/src/Myra/MML/SaveContext.cs b/src/Myra/MML/SaveContext.cs
index 3c4f27ac..8c65d950 100644
--- a/src/Myra/MML/SaveContext.cs
+++ b/src/Myra/MML/SaveContext.cs
@@ -11,6 +11,8 @@
 using FontStashSharp;
 using FontStashSharp.RichText;
 using info.lundin.math;
+using Myra.Graphics2D.UI;
+using Myra.Utility.Types;
 
 #if MONOGAME || FNA
 using Microsoft.Xna.Framework;
@@ -22,16 +24,15 @@
 
 namespace Myra.MML
 {
-	internal class SaveContext: BaseContext
+	internal class SaveContext : BaseContext
 	{
 		public Func<object, PropertyInfo, bool> ShouldSerializeProperty = HasDefaultValue;
 
 		private static string SaveSimpleProperty(BaseObject baseObject, object value, Type propertyType, string propertyName)
 		{
 			string str = null;
-
-			var serializer = FindSerializer(propertyType);
-			if (serializer != null)
+			
+			if (Serialization.TryFindSerializer(propertyType, out var serializer))
 			{
 				str = serializer.Serialize(value);
 			}
@@ -39,8 +40,7 @@ private static string SaveSimpleProperty(BaseObject baseObject, object value, Ty
 			{
 				str = ((Color?)value).Value.ToHexString();
 			}
-			else
-			if (propertyType == typeof(Color))
+			else if (propertyType == typeof(Color))
 			{
 				str = ((Color)value).ToHexString();
 			}
@@ -62,14 +62,28 @@ private static string SaveSimpleProperty(BaseObject baseObject, object value, Ty
 		public XElement Save(object obj, bool skipComplex = false, string tagName = null, Type parentType = null)
 		{
 			var type = obj.GetType();
-
 			var baseObject = obj as BaseObject;
 
 			List<PropertyInfo> complexProperties, simpleProperties;
 			ParseProperties(type, true, out complexProperties, out simpleProperties);
+			
+			if (string.IsNullOrEmpty(tagName))
+			{
+				tagName = type.Name;
+			}
 
-			var el = new XElement(tagName ?? type.Name);
+			bool isGeneric = type.IsGenericType;
+			TypeHelper.StripGenericFromString(ref tagName);
+			
+			XElement el = new XElement(tagName);
 
+			if (isGeneric)
+			{
+				string genericTypeArg = type.GenericTypeArguments[0].Name.Split('.').Last();
+				TypeHelper.NameSwap_DotNetToKeyword(ref genericTypeArg);
+				el.SetAttributeValue(Project.GenericTypeArgName, genericTypeArg);
+			}
+			
 			foreach (var property in simpleProperties)
 			{
 				if (!ShouldSerializeProperty(obj, property))
@@ -117,8 +131,7 @@ public XElement Save(object obj, bool skipComplex = false, string tagName = null
 			if (!skipComplex)
 			{
 				var contentProperty = (from p in complexProperties
-									   where p.FindAttribute<ContentAttribute>()
-									   != null
+									   where p.FindAttribute<ContentAttribute>() != null
 									   select p).FirstOrDefault();
 
 				foreach (var property in complexProperties)
@@ -139,7 +152,7 @@ where p.FindAttribute<ContentAttribute>()
 					var asList = value as IList;
 					if (asList == null)
 					{
-						el.Add(isContent?Save(value):Save(value, false, propertyName));
+						el.Add(isContent ? Save(value) : Save(value, false, propertyName));
 					}
 					else
 					{
diff --git a/src/Myra/Myra.FNA.Core.csproj b/src/Myra/Myra.FNA.Core.csproj
index a168114f..cf7b5e21 100644
--- a/src/Myra/Myra.FNA.Core.csproj
+++ b/src/Myra/Myra.FNA.Core.csproj
@@ -7,6 +7,22 @@
     <OutputPath>bin\FNA.Core\$(Configuration)</OutputPath>
   </PropertyGroup>
 
+  <Choose>
+    <!-- Define MATH_IFACES if net 7, 8, 9, or 10 -->
+    <When Condition="'$(TargetFramework.TrimEnd(`0123456789.`))' == 'net' And ('$(TargetFramework)' == 'net7.0' Or '$(TargetFramework)' == 'net8.0' Or '$(TargetFramework)' == 'net9.0' Or '$(TargetFramework)' == 'net10.0')">
+      <PropertyGroup>
+        <DefineConstants>$(DefineConstants);MATH_IFACES</DefineConstants>
+      </PropertyGroup>
+    </When>
+
+    <!-- Include Generic.Math lib if MATH_IFACES is NOT defined -->
+    <When Condition="!$([System.Text.RegularExpressions.Regex]::IsMatch($(DefineConstants), '^(.*;)*MATH_IFACES(;.*)*$'))">
+      <ItemGroup>
+        <PackageReference Include="Generic.Math" Version="1.0.2" />
+      </ItemGroup>
+    </When>
+  </Choose>
+  
   <ItemGroup>
     <EmbeddedResource Include="Resources\**\*.*" />
   </ItemGroup>
diff --git a/src/Myra/Myra.MonoGame.csproj b/src/Myra/Myra.MonoGame.csproj
index 73ba2460..793ce008 100644
--- a/src/Myra/Myra.MonoGame.csproj
+++ b/src/Myra/Myra.MonoGame.csproj
@@ -1,11 +1,27 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <DefineConstants>$(DefineConstants);MONOGAME</DefineConstants>
-    <TargetFramework>netstandard2.0</TargetFramework>
     <AssemblyName>Myra</AssemblyName>
     <PackageId>Myra</PackageId>
     <OutputPath>bin\MonoGame\$(Configuration)</OutputPath>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
+  
+  <Choose>
+    <!-- Define MATH_IFACES if net 7, 8, 9, or 10 -->
+    <When Condition="'$(TargetFramework.TrimEnd(`0123456789.`))' == 'net' And ('$(TargetFramework)' == 'net7.0' Or '$(TargetFramework)' == 'net8.0' Or '$(TargetFramework)' == 'net9.0' Or '$(TargetFramework)' == 'net10.0')">
+      <PropertyGroup>
+        <DefineConstants>$(DefineConstants);MATH_IFACES</DefineConstants>
+      </PropertyGroup>
+    </When>
+
+    <!-- Include Generic.Math lib if MATH_IFACES is NOT defined -->
+    <When Condition="!$([System.Text.RegularExpressions.Regex]::IsMatch($(DefineConstants), '^(.*;)*MATH_IFACES(;.*)*$'))">
+      <ItemGroup>
+        <PackageReference Include="Generic.Math" Version="1.0.2" />
+      </ItemGroup>
+    </When>
+  </Choose>
 
   <PropertyGroup Condition="'$(Configuration)'=='Release'">
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
@@ -23,6 +39,9 @@
     <Compile Update="Graphics2D\UI\File\FileDialog.Util.cs">
       <DependentUpon>FileDialog.cs</DependentUpon>
     </Compile>
+    <Compile Update="Graphics2D\UI\Properties\PropertyGrid.SubGrid.cs">
+      <DependentUpon>PropertyGrid.cs</DependentUpon>
+    </Compile>
   </ItemGroup>
 
   <ItemGroup>
@@ -31,4 +50,4 @@
     <PackageReference Include="info.lundin.math.dll" Version="$(InfoLundinMathVersion)" />
     <PackageReference Include="MonoGame.Framework.DesktopGL" PrivateAssets="All" Version="$(MonoGameVersion)" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/Myra/Myra.PlatformAgnostic.csproj b/src/Myra/Myra.PlatformAgnostic.csproj
index 0a18ed3e..b937501d 100644
--- a/src/Myra/Myra.PlatformAgnostic.csproj
+++ b/src/Myra/Myra.PlatformAgnostic.csproj
@@ -7,6 +7,22 @@
     <OutputPath>bin\PlatformAgnostic\$(Configuration)</OutputPath>
   </PropertyGroup>
 
+  <Choose>
+    <!-- Define MATH_IFACES if net 7, 8, 9, or 10 -->
+    <When Condition="'$(TargetFramework.TrimEnd(`0123456789.`))' == 'net' And ('$(TargetFramework)' == 'net7.0' Or '$(TargetFramework)' == 'net8.0' Or '$(TargetFramework)' == 'net9.0' Or '$(TargetFramework)' == 'net10.0')">
+      <PropertyGroup>
+        <DefineConstants>$(DefineConstants);MATH_IFACES</DefineConstants>
+      </PropertyGroup>
+    </When>
+
+    <!-- Include Generic.Math lib if MATH_IFACES is NOT defined -->
+    <When Condition="!$([System.Text.RegularExpressions.Regex]::IsMatch($(DefineConstants), '^(.*;)*MATH_IFACES(;.*)*$'))">
+      <ItemGroup>
+        <PackageReference Include="Generic.Math" Version="1.0.2" />
+      </ItemGroup>
+    </When>
+  </Choose>
+  
   <PropertyGroup Condition="'$(Configuration)'=='Release'">
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
   </PropertyGroup>
diff --git a/src/Myra/Myra.Stride.csproj b/src/Myra/Myra.Stride.csproj
index 11b77a8b..ffa5c534 100644
--- a/src/Myra/Myra.Stride.csproj
+++ b/src/Myra/Myra.Stride.csproj
@@ -7,6 +7,22 @@
     <OutputPath>bin\Stride\$(Configuration)</OutputPath>
   </PropertyGroup>
 
+  <Choose>
+    <!-- Define MATH_IFACES if net 7, 8, 9, or 10 -->
+    <When Condition="'$(TargetFramework.TrimEnd(`0123456789.`))' == 'net' And ('$(TargetFramework)' == 'net7.0' Or '$(TargetFramework)' == 'net8.0' Or '$(TargetFramework)' == 'net9.0' Or '$(TargetFramework)' == 'net10.0')">
+      <PropertyGroup>
+        <DefineConstants>$(DefineConstants);MATH_IFACES</DefineConstants>
+      </PropertyGroup>
+    </When>
+
+    <!-- Include Generic.Math lib if MATH_IFACES is NOT defined -->
+    <When Condition="!$([System.Text.RegularExpressions.Regex]::IsMatch($(DefineConstants), '^(.*;)*MATH_IFACES(;.*)*$'))">
+      <ItemGroup>
+        <PackageReference Include="Generic.Math" Version="1.0.2" />
+      </ItemGroup>
+    </When>
+  </Choose>
+  
   <PropertyGroup Condition="'$(Configuration)'=='Release'">
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
   </PropertyGroup>
@@ -17,6 +33,9 @@
 
   <ItemGroup>
     <Compile Remove="Platform\**\*.*" />
+    <Compile Update="Graphics2D\UI\Properties\PropertyGrid.SubGrid.cs">
+      <DependentUpon>PropertyGrid.cs</DependentUpon>
+    </Compile>
   </ItemGroup>  
 
   <ItemGroup>
diff --git a/src/Myra/MyraAssetManagerExtensions.PlatformAgnostic.cs b/src/Myra/MyraAssetManagerExtensions.PlatformAgnostic.cs
index fa2b5bf1..fa277cd0 100644
--- a/src/Myra/MyraAssetManagerExtensions.PlatformAgnostic.cs
+++ b/src/Myra/MyraAssetManagerExtensions.PlatformAgnostic.cs
@@ -10,7 +10,7 @@
 
 namespace AssetManagementBase
 {
-	partial class MyraAssetManagerExtensions
+	public static partial class MyraAssetManagerExtensions
 	{
 		internal class Texture2DWrapper
 		{
diff --git a/src/Myra/MyraAssetManagerExtensions.cs b/src/Myra/MyraAssetManagerExtensions.cs
index df3e2bad..80ebcd3f 100644
--- a/src/Myra/MyraAssetManagerExtensions.cs
+++ b/src/Myra/MyraAssetManagerExtensions.cs
@@ -168,7 +168,7 @@ public static SpriteFontBase LoadFont(this AssetManager assetManager, string ass
 				var parts = assetName.Split(':');
 				if (parts.Length < 2)
 				{
-					throw new Exception("Missing font size");
+					throw new ArgumentException("Missing font size");
 				}
 
 				var fontSize = int.Parse(parts[1].Trim());
@@ -177,7 +177,7 @@ public static SpriteFontBase LoadFont(this AssetManager assetManager, string ass
 				return fontSystem.GetFont(fontSize);
 			}
 
-			throw new Exception(string.Format("Can't load font '{0}'", assetName));
+			throw new ArgumentException(string.Format("Can't load font '{0}'", assetName));
 		}
 
 		public static Stylesheet LoadStylesheet(this AssetManager assetManager, string assetName) => assetManager.UseLoader(_stylesheetLoader, assetName);
diff --git a/src/Myra/Utility/Reflection.cs b/src/Myra/Utility/Reflection.cs
index 1aada931..0d4a64a5 100644
--- a/src/Myra/Utility/Reflection.cs
+++ b/src/Myra/Utility/Reflection.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Linq;
 using System.Reflection;
+using Myra.Utility.Types;
 
 namespace Myra.Utility
 {
@@ -78,6 +79,7 @@ public static string GetFriendlyName(this Type type)
 				for (int i = 0; i < typeParameters.Length; ++i)
 				{
 					string typeParamName = typeParameters[i].Name;
+					TypeHelper.NameSwap_DotNetToKeyword(ref typeParamName);
 					friendlyName += (i == 0 ? typeParamName : "," + typeParamName);
 				}
 				friendlyName += ">";
@@ -120,9 +122,14 @@ public static Type FindGenericType(this Type givenType, Type genericType)
 			return FindGenericType(baseType, genericType);
 		}
 
-		public static bool IsNumericInteger(this Type t)
+		public static bool IsNumericType(this Type t) => IsNumericType(Type.GetTypeCode(t));
+		public static bool IsNumericType(this TypeCode t) => IsNumericInteger(t) || IsNumericFractional(t);
+		
+		public static bool IsNumericInteger(this Type t) => IsNumericInteger(Type.GetTypeCode(t));
+		public static bool IsNumericFractional(this Type t) => IsNumericFractional(Type.GetTypeCode(t));
+		public static bool IsNumericInteger(this TypeCode t)
 		{
-			switch (Type.GetTypeCode(t))
+			switch (t)
 			{
 				case TypeCode.Byte:
 				case TypeCode.SByte:
@@ -137,15 +144,9 @@ public static bool IsNumericInteger(this Type t)
 					return false;
 			}
 		}
-
-		public static bool IsNumericType(this Type t)
+		public static bool IsNumericFractional(this TypeCode t)
 		{
-			if (IsNumericInteger(t))
-			{
-				return true;
-			}
-
-			switch (Type.GetTypeCode(t))
+			switch (t)
 			{
 				case TypeCode.Decimal:
 				case TypeCode.Double:
@@ -155,5 +156,22 @@ public static bool IsNumericType(this Type t)
 					return false;
 			}
 		}
+		public static bool IsSigned(this TypeCode t)
+		{
+			// https://learn.microsoft.com/en-us/dotnet/api/system.typecode
+			int val = (int)t;
+			if (val < 5)
+				return false;
+			
+			if (val > 12)
+			{
+				if (val <= 15) // 13-15 are floating point
+					return true;
+				return false;
+			}
+			
+			val -= 5;
+			return val % 2 == 0; // Test even/odd
+		}
 	}
 }
diff --git a/src/Myra/Utility/Serialization.cs b/src/Myra/Utility/Serialization.cs
index 1dc227fa..149bd170 100644
--- a/src/Myra/Utility/Serialization.cs
+++ b/src/Myra/Utility/Serialization.cs
@@ -3,6 +3,7 @@
 using Myra.Graphics2D;
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using Myra.MML;
 using FontStashSharp.RichText;
 
@@ -20,11 +21,19 @@ namespace Myra.Utility
 {
 	internal static class Serialization
 	{
-		public static readonly Dictionary<Type, ITypeSerializer> _serializers = new Dictionary<Type, ITypeSerializer>
+		private static readonly ReadOnlyDictionary<Type, ITypeSerializer> _serializers = new ReadOnlyDictionary<Type, ITypeSerializer>(new Dictionary<Type, ITypeSerializer>
 		{
-			{typeof(Vector2), new Vector2Serializer()},
+			{typeof(Vector2),   new Vector2Serializer()},
 			{typeof(Thickness), new ThicknessSerializer()},
-		};
+		});
+		
+		public static bool TryFindSerializer(Type type, out ITypeSerializer result)
+		{
+			if (type.IsNullablePrimitive())
+				type = type.GetNullableType();
+			
+			return _serializers.TryGetValue(type, out result);
+		}
 
 		public static bool HasDefaultValue(this PropertyInfo property, object value)
 		{
@@ -79,7 +88,7 @@ public static Rectangle ParseRectangle(this string s)
 				throw new Exception("Rectangle should consist of 4 numbers");
 			}
 
-			Rectangle result;
+			Rectangle result = default;
 			result.X = int.Parse(parts[0].Trim());
 			result.Y = int.Parse(parts[1].Trim());
 			result.Width = int.Parse(parts[2].Trim());
diff --git a/src/Myra/Utility/Types/MathHelper.cs b/src/Myra/Utility/Types/MathHelper.cs
new file mode 100644
index 00000000..d7819532
--- /dev/null
+++ b/src/Myra/Utility/Types/MathHelper.cs
@@ -0,0 +1,399 @@
+using System;
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+
+#if MATH_IFACES
+using System.Numerics;
+#else
+using Generic.Math;
+#endif
+
+namespace Myra.Utility.Types
+{
+    /// <summary>
+    /// Generic math methods for <typeparamref name="TNum"/>.<para/>
+    /// If project is less than .net7, uses Generic.Math library which relies on Reflection.Emit and codegen.
+    /// </summary>
+    internal static class MathHelper<TNum>
+#if MATH_IFACES
+        where TNum : struct, INumber<TNum>, IMinMaxValue<TNum>
+#else
+        where TNum : struct
+#endif
+    {
+        private static readonly bool NumIsSigned;
+        
+        /// <summary>Value that represents 0 for <typeparamref name="TNum"/></summary>
+        public static readonly TNum Zero;
+        /// <summary>Value that represents 1 for <typeparamref name="TNum"/></summary>
+        public static readonly TNum One;
+        
+#if MATH_IFACES //TODO find a way to get these values without interfaces
+        public static readonly TNum MinValue;
+        public static readonly TNum MaxValue;
+#endif
+        
+        static MathHelper()
+        {
+            Type arg = typeof(TNum);
+            TypeInfo info = TypeHelper<TNum>.Info;
+            
+            if(info.IsNullable)
+                throw new ArgumentException($"Invalid Generic-Type Argument: '{arg}', Nullable types are not supported");
+            if(!info.IsNumber)
+                throw new ArgumentException($"Invalid Generic-Type Argument: '{arg}', Only numeric types are supported");
+            if(arg == typeof(byte) || arg == typeof(sbyte))
+                throw new ArgumentException($"Invalid Generic-Type Argument: '{arg}' does not have full math support. Convert to another type first");
+
+            NumIsSigned = info.IsSignedNumber;
+
+#if MATH_IFACES
+            Zero = TNum.Zero;
+            One = TNum.One;
+            MinValue = TNum.MinValue;
+            MaxValue = TNum.MaxValue;
+#else
+            Zero = GenericMath<TNum>.Zero;
+            One = MathHelper<int, TNum>.Convert( 1 );
+#endif
+        }
+        
+#region Internals
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private static TNum Add_Internal(TNum lhs, TNum rhs)
+        {
+#if MATH_IFACES
+            return lhs + rhs;
+#else
+            return GenericMath<TNum>.Add(lhs, rhs);
+#endif
+        }
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private static TNum Subtract_Internal(TNum lhs, TNum rhs)
+        {
+#if MATH_IFACES
+            return lhs - rhs;
+#else
+            return GenericMath<TNum>.Subtract(lhs, rhs);
+#endif
+        }
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private static TNum Multiply_Internal(TNum lhs, TNum rhs)
+        {
+#if MATH_IFACES
+            return lhs * rhs;
+#else
+            return GenericMath<TNum>.Multiply(lhs, rhs);
+#endif
+        }
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private static TNum Divide_Internal(TNum lhs, TNum rhs)
+        {
+#if MATH_IFACES
+            return lhs / rhs;
+#else
+            return GenericMath<TNum>.Divide(lhs, rhs);
+#endif
+        }
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private static TNum Negate_Internal(TNum value)
+        {
+#if MATH_IFACES
+            return -value;
+#else
+            return GenericMath<TNum>.Negate(value);
+#endif
+        }
+        
+        /// <summary>
+        /// Equivalent to operator: <paramref name="lhs"/> == <paramref name="rhs"/>
+        /// </summary>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static bool Equal_Internal(TNum lhs, TNum rhs)
+        {
+#if MATH_IFACES
+            return lhs.Equals(rhs);
+#else
+            return GenericMath<TNum>.Equal(lhs, rhs);
+#endif
+        }
+        
+#endregion Internals
+
+        /// <summary>
+        /// Equivalent to operator: <paramref name="lhs"/> + <paramref name="rhs"/>
+        /// </summary>
+        public static TNum Add(TNum lhs, TNum rhs) => Add_Internal(lhs, rhs);
+        /// <summary>
+        /// Equivalent to operator: <paramref name="lhs"/> += <paramref name="rhs"/>
+        /// </summary>
+        public static void Add(ref TNum lhs, TNum rhs) => lhs = Add_Internal(lhs, rhs);
+        /// <summary>
+        /// Equivalent to operator: <paramref name="lhs"/> - <paramref name="rhs"/>
+        /// </summary>
+        public static TNum Subtract(TNum lhs, TNum rhs) => Subtract_Internal(lhs, rhs);
+        /// <summary>
+        /// Equivalent to operator: <paramref name="lhs"/> -= <paramref name="rhs"/>
+        /// </summary>
+        public static void Subtract(ref TNum lhs, TNum rhs) => lhs = Subtract_Internal(lhs, rhs);
+        /// <summary>
+        /// Equivalent to operator: <paramref name="lhs"/> * <paramref name="rhs"/>
+        /// </summary>
+        public static TNum Multiply(TNum lhs, TNum rhs) => Multiply_Internal(lhs, rhs);
+        /// <summary>
+        /// Equivalent to operator: <paramref name="lhs"/> *= <paramref name="rhs"/>
+        /// </summary>
+        public static void Multiply(ref TNum lhs, TNum rhs) => lhs = Multiply_Internal(lhs, rhs);
+        /// <summary>
+        /// Equivalent to operator: <paramref name="lhs"/> / <paramref name="rhs"/>
+        /// </summary>
+        public static TNum Divide(TNum lhs, TNum rhs) => Divide_Internal(lhs, rhs);
+        /// <summary>
+        /// Equivalent to operator: <paramref name="lhs"/> /= <paramref name="rhs"/>
+        /// </summary>
+        public static void Divide(ref TNum lhs, TNum rhs) => lhs = Divide_Internal(lhs, rhs);
+
+#region Compare
+        /// <summary>
+        /// Equivalent to operator: <paramref name="lhs"/> == <paramref name="rhs"/>
+        /// </summary>
+        public static bool Equal(TNum lhs, TNum rhs) => Equal_Internal(lhs, rhs);
+        /// <summary>
+        /// Equivalent to operator: <paramref name="lhs"/> != <paramref name="rhs"/>
+        /// </summary>
+        public static bool UnEqual(TNum lhs, TNum rhs) => !Equal_Internal(lhs, rhs);
+        
+        /// <summary>
+        /// Equivalent to operator: <paramref name="lhs"/> &lt; <paramref name="rhs"/>
+        /// </summary>
+        public static bool LessThan(TNum lhs, TNum rhs)
+        {
+#if MATH_IFACES
+            return lhs < rhs;
+#else
+            return GenericMath<TNum>.LessThan(lhs, rhs);
+#endif
+        }
+        /// <summary>
+        /// Equivalent to operator: <paramref name="lhs"/> &lt;= <paramref name="rhs"/>
+        /// </summary>
+        public static bool LessThanOrEqual(TNum lhs, TNum rhs)
+        {
+#if MATH_IFACES
+            return lhs <= rhs;
+#else
+            return GenericMath<TNum>.LessThanOrEqual(lhs, rhs);
+#endif
+        }
+        /// <summary>
+        /// Equivalent to operator: <paramref name="lhs"/> &gt; <paramref name="rhs"/>
+        /// </summary>
+        public static bool GreaterThan(TNum lhs, TNum rhs)
+        {
+#if MATH_IFACES
+            return lhs > rhs;
+#else
+            return GenericMath<TNum>.GreaterThan(lhs, rhs);
+#endif
+        }
+        /// <summary>
+        /// Equivalent to operator: <paramref name="lhs"/> &gt;= <paramref name="rhs"/>
+        /// </summary>
+        public static bool GreaterThanOrEqual(TNum lhs, TNum rhs)
+        {
+#if MATH_IFACES
+            return lhs >= rhs;
+#else
+            return GenericMath<TNum>.GreaterThanOrEqual(lhs, rhs);
+#endif
+        }
+#endregion Compare
+
+        /// <summary>
+        /// Returns the absolute positive value of <paramref name="value"/>.<para/>
+        /// Returns <paramref name="value"/> unchanged if <typeparamref name="TNum"/> does not support negatives.
+        /// </summary>
+        public static TNum Abs(TNum value)
+        {
+#if MATH_IFACES
+            return TNum.Abs(value);
+#else
+            if (NumIsSigned && LessThan(value, Zero))
+                value = Negate_Internal(value);
+            return value;
+#endif
+        }
+
+        /// <summary>
+        /// Equivalent to operator: -<paramref name="value"/><para/>
+        /// Returns <paramref name="value"/> unchanged if <typeparamref name="TNum"/> does not support negatives.
+        /// </summary>
+        public static TNum Negate(TNum value) => Negate_Internal(value);
+        
+        /// <summary>
+        /// Returns the smallest of two values.
+        /// </summary>
+        public static TNum Min(TNum lhs, TNum rhs)
+        {
+            return LessThan(lhs, rhs) ? lhs : rhs;
+        }
+        /// <summary>
+        /// Returns the smallest element in an array of values.
+        /// </summary>
+        public static TNum Min(params TNum[] values)
+        {
+            if (values == null || values.Length <= 0)
+                throw new ArgumentException("Values array must have at least one element.");
+            if (values.Length == 1)
+                return values[0];
+            
+            TNum value = values[0];
+            for (int i = 1; i < values.Length; i++)
+            {
+                if (LessThan(values[i], value))
+                {
+                    value = values[i];
+                }
+            }
+            return value;
+        }
+        /// <summary>
+        /// Returns the smallest element in an array of values.
+        /// </summary>
+        public static TNum Min(IReadOnlyList<TNum> values)
+        {
+            if (values == null || values.Count <= 0)
+                throw new ArgumentException("Values array must have at least one element.");
+            if (values.Count == 1)
+                return values[0];
+            
+            TNum value = values[0];
+            for (int i = 1; i < values.Count; i++)
+            {
+                if (LessThan(values[i], value))
+                {
+                    value = values[i];
+                }
+            }
+            return value;
+        }
+
+        /// <summary>
+        /// Returns the largest of two values.
+        /// </summary>
+        public static TNum Max(TNum lhs, TNum rhs)
+        {
+            return GreaterThan(lhs, rhs) ? lhs : rhs;
+        }
+        /// <summary>
+        /// Returns the largest element in an array of values.
+        /// </summary>
+        public static TNum Max(params TNum[] values)
+        {
+            if (values == null || values.Length <= 0)
+                throw new ArgumentException("Values array must have at least one element.");
+            if (values.Length == 1)
+                return values[0];
+            
+            TNum value = values[0];
+            for (int i = 1; i < values.Length; i++)
+            {
+                if (GreaterThan(values[i], value))
+                {
+                    value = values[i];
+                }
+            }
+            return value;
+        }
+        /// <summary>
+        /// Returns the largest element in an array of values.
+        /// </summary>
+        public static TNum Max(IReadOnlyList<TNum> values)
+        {
+            if (values == null || values.Count <= 0)
+                throw new ArgumentException("Values array must have at least one element.");
+            if (values.Count == 1)
+                return values[0];
+            
+            TNum value = values[0];
+            for (int i = 1; i < values.Count; i++)
+            {
+                if (GreaterThan(values[i], value))
+                {
+                    value = values[i];
+                }
+            }
+            return value;
+        }
+
+        /// <summary>
+        /// Clamp <paramref name="value"/> between <paramref name="minValue"/> and <paramref name="maxValue"/>.
+        /// </summary>
+        /// <param name="value">The value to limit.</param>
+        /// <param name="minValue">The minimum range. (inclusive) If null, there will be no lower limit applied.</param>
+        /// <param name="maxValue">The maximum range. (inclusive) If null, there will be no upper limit applied.</param>
+        public static TNum Clamp(TNum value, TNum? minValue, TNum? maxValue)
+        {
+            bool limitMin = minValue.HasValue, limitMax = maxValue.HasValue;
+            if (limitMin & limitMax)
+                return Clamp(value, minValue.Value, maxValue.Value);
+            if (!limitMin & !limitMax)
+                return value;
+            
+            // limitMin != limitMax...
+            if (limitMin && LessThanOrEqual(value, minValue.Value))
+                return minValue.Value;
+            if (limitMax && GreaterThanOrEqual(value, maxValue.Value))
+                return maxValue.Value;
+            return value;
+        }
+        /// <summary>
+        /// Clamp <paramref name="value"/> between <paramref name="minValue"/> and <paramref name="maxValue"/>.
+        /// </summary>
+        /// <param name="value">The value to limit.</param>
+        /// <param name="minValue">The minimum range. (inclusive)</param>
+        /// <param name="maxValue">The maximum range. (inclusive)</param>
+        public static TNum Clamp(TNum value, TNum minValue, TNum maxValue)
+        {
+            if (Equal_Internal(minValue, maxValue))
+                return minValue;
+            if (GreaterThan(minValue, maxValue))
+                SwapValues(ref minValue, ref maxValue);
+#if MATH_IFACES
+            return TNum.Clamp(value, minValue, maxValue);
+#else
+            if (LessThanOrEqual(value, minValue))
+                return minValue;
+            if (GreaterThanOrEqual(value, maxValue))
+                return maxValue;
+            return value;
+#endif
+        }
+        private static void SwapValues(ref TNum a, ref TNum b)
+        {
+            TNum c = a;
+            TNum d = b;
+            b = c;
+            a = d;
+        }
+    }
+
+    internal static class MathHelper<TNum, TResult>
+#if MATH_IFACES
+        where TNum    : struct, INumber<TNum>
+        where TResult : struct, INumber<TResult>
+#else
+        where TNum    : struct
+        where TResult : struct
+#endif
+    {
+        public static TResult Convert(TNum value)
+        {
+#if MATH_IFACES
+            return TResult.CreateTruncating<TNum>(value);
+#else
+            return GenericMath<TNum, TResult>.Convert(value);
+#endif
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Myra/Utility/Types/Range.cs b/src/Myra/Utility/Types/Range.cs
new file mode 100644
index 00000000..8ecb0078
--- /dev/null
+++ b/src/Myra/Utility/Types/Range.cs
@@ -0,0 +1,93 @@
+using System;
+
+#if MATH_IFACES
+using System.Numerics;
+#endif
+
+namespace Myra.Utility.Types
+{
+    /// <summary>
+    /// Represents a generic-number value range with optional minimum and maximum clamp.
+    /// </summary>
+    public struct Range<TNum>
+#if MATH_IFACES
+        where TNum : struct, INumber<TNum>, IMinMaxValue<TNum>
+#else
+        where TNum : struct
+#endif
+    {
+        static Range()
+        {
+            Type arg = typeof(TNum);
+            TypeInfo info = TypeHelper<TNum>.Info;
+            
+            if(info.IsNullable)
+                throw new ArgumentException($"Invalid Generic-Type Argument: '{arg}', Nullable types are unsupported");
+            if(!info.IsNumber)
+                throw new ArgumentException($"Invalid Generic-Type Argument: '{arg}', Only numeric types are supported");
+        }
+        /// <summary>
+        /// Returns a range that spans the entire TNum data type
+        /// </summary>
+        public static Range<TNum> ValueTypeRange
+        {
+#if MATH_IFACES
+            get => new Range<TNum>(MathHelper<TNum>.MinValue, MathHelper<TNum>.MaxValue);
+#else
+            get => new Range<TNum>(null, null);
+#endif
+        }
+        /// <summary>
+        /// Returns a range from zero to one.
+        /// </summary>
+        public static Range<TNum> ZeroOne => new Range<TNum>(MathHelper<TNum>.Zero, MathHelper<TNum>.One);
+        
+        public Range(TNum min, TNum max)
+        {
+            _min = min;
+            _max = max;
+        }
+        public Range(TNum? min = null, TNum? max = null)
+        {
+            _min = min;
+            _max = max;
+        }
+        
+        private TNum? _min, _max;
+
+        public TNum? Min
+        {
+            get => _min;
+            set => _min = value;
+        }
+        public TNum? Max
+        {
+            get => _max;
+            set => _max = value;
+        }
+
+        public bool InsideMinBound(TNum value)
+        {
+            if (_min.HasValue && MathHelper<TNum>.LessThan(value, _min.Value))
+                return false;
+            return true;
+        }
+        public bool InsideMaxBound(TNum value)
+        {
+            if (_max.HasValue && MathHelper<TNum>.GreaterThan(value, _max.Value))
+                return false;
+            return true;
+        }
+        
+        public bool IsInRange(TNum value)
+        {
+            if (_min.HasValue && MathHelper<TNum>.LessThan(value, _min.Value))
+                return false;
+            if (_max.HasValue && MathHelper<TNum>.GreaterThan(value, _max.Value))
+                return false;
+            return true;
+        }
+        /// <inheritdoc cref="MathHelper{TNum}.Clamp(TNum, TNum?, TNum?)"/>
+        public TNum Clamp(TNum value) => MathHelper<TNum>.Clamp(value, _min, _max);
+    }
+}
\ No newline at end of file
diff --git a/src/Myra/Utility/Types/TypeHelper.cs b/src/Myra/Utility/Types/TypeHelper.cs
new file mode 100644
index 00000000..657eaabc
--- /dev/null
+++ b/src/Myra/Utility/Types/TypeHelper.cs
@@ -0,0 +1,292 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Reflection;
+
+namespace Myra.Utility.Types
+{
+    public static class TypeHelper
+    {
+        private static readonly ReadOnlyCollection<KeyValuePair<string, string>> _typeKeywordPairs =
+            new ReadOnlyCollection<KeyValuePair<string, string>>(new List<KeyValuePair<string, string>>
+            {   //Key is DotNet, Value is C# keyword
+                new KeyValuePair<string, string>("Single",  "float"),
+                new KeyValuePair<string, string>("Double",  "double"),
+                new KeyValuePair<string, string>("Decimal", "decimal"),
+                
+                new KeyValuePair<string, string>("SByte",   "sbyte"),
+                new KeyValuePair<string, string>("Byte",    "byte"),
+                new KeyValuePair<string, string>("Int16",   "short"),
+                new KeyValuePair<string, string>("UInt16",  "ushort"),
+                new KeyValuePair<string, string>("Int32",   "int"),
+                new KeyValuePair<string, string>("UInt32",  "uint"),
+                new KeyValuePair<string, string>("Int64",   "long"),
+                new KeyValuePair<string, string>("UInt64",  "ulong"),
+                
+                new KeyValuePair<string, string>("Boolean", "bool"),
+                new KeyValuePair<string, string>("Char",    "char"),
+                new KeyValuePair<string, string>("Object",  "object"),
+                new KeyValuePair<string, string>("String",  "string"),
+            });
+        private static readonly ReadOnlyDictionary<Type, string> _typeSuffixLiterals = 
+            new ReadOnlyDictionary<Type, string>(new Dictionary<Type, string>
+            {
+                {typeof(float),   "f"},
+                {typeof(double),  "d"},
+                {typeof(decimal), "m"},
+                {typeof(byte),    string.Empty},
+                {typeof(sbyte),   string.Empty},
+                {typeof(short),   string.Empty},
+                {typeof(ushort),  string.Empty},
+                {typeof(int),     string.Empty},
+                {typeof(uint),    "u"},
+                {typeof(long),    "L"},
+                {typeof(ulong),   "uL"},
+            });
+        private static Dictionary<Type, Func<TypeInfo>> _lookup;
+        
+        internal static void RegisterHelperForType<T>()
+        {
+            if(_lookup == null)
+                _lookup = new Dictionary<Type, Func<TypeInfo>>(16);
+
+            Type helpingType = typeof(T);
+            _lookup.Add(helpingType, () => TypeHelper<T>.Info);
+        }
+        public static bool TryGetInfoForType(Type type, out TypeInfo result)
+        {
+            if (_lookup != null)
+            {
+                if (_lookup.TryGetValue(type, out var getterFunc))
+                {
+                    result = getterFunc.Invoke();
+                    return (int)result.Code > 0;
+                }
+            }
+            result = default;
+            return false;
+        }
+        
+        /// <summary>
+        /// If type is <see cref="System.Nullable{}"/>, return the generic type the nullable holds (T), else return type unchanged. Also returns boolean for if type was changed
+        /// </summary>
+        public static bool GetNullableTypeOrPassThrough(ref Type type)
+        {
+            bool changed = false;
+            if (type.IsGenericType)
+            {
+                Type genericType = type.GetGenericTypeDefinition();
+                if (genericType == typeof(Nullable<>))
+                {
+                    type = type.GenericTypeArguments[0];
+                    changed = true;
+                }
+            }
+            return changed;
+        }
+        
+#region Strings
+        private const string FrontendGeneric = "<>";
+        private const string BackendGeneric = "`1";
+        public static bool IsGenericTypeName(string str) => IsGenericTypeName_FrontEnd(str) || IsGenericTypeName_BackEnd(str);
+        /// <summary>
+        /// Returns if the string ends with a front-end C# generic pattern
+        /// </summary>
+        public static bool IsGenericTypeName_FrontEnd(string str)
+        {
+            return str.Contains(FrontendGeneric);
+        }
+        /// <summary>
+        /// Returns if the string ends with a back-end C# generic pattern
+        /// </summary>
+        public static bool IsGenericTypeName_BackEnd(string str)
+        {
+            return str.Contains(BackendGeneric);
+        }
+        public static void SwapGenericTypeNameFormat(ref string str)
+        {
+            if (IsGenericTypeName_FrontEnd(str))
+            {
+                str = str.Replace(FrontendGeneric, BackendGeneric);
+            }
+            else if (IsGenericTypeName_BackEnd(str))
+            {
+                str = str.Replace(BackendGeneric, FrontendGeneric);
+            }
+        }
+        public static bool MakeFancyGenericTypeName(Type forType, out string result, bool avoidInternalTypeNames = true)
+        {
+            if (forType.IsGenericType)
+            {
+                string genericArgName;
+                try
+                {
+                    genericArgName = forType.GetGenericArguments()[0].Name;
+                }
+                catch
+                {
+                    genericArgName = "?";
+                }
+                
+                // Assume that starting uppercase is an internal type name
+                if (avoidInternalTypeNames && char.IsUpper(genericArgName[0])) 
+                {
+                    NameSwap_DotNetToKeyword(ref genericArgName);
+                }
+                
+                result = forType.Name;
+                MakeFancyGenericTypeName(ref result, genericArgName);
+                return true;
+            }
+            result = null;
+            return false;
+        }
+        public static void MakeFancyGenericTypeName(ref string str, string genericTypeName)
+        {
+            if(!IsGenericTypeName_BackEnd(str))
+                return;
+            if (string.IsNullOrWhiteSpace(genericTypeName))
+                genericTypeName = string.Empty;
+            else if (genericTypeName.Contains(".")) //remove namespace
+                genericTypeName = genericTypeName.Split('.').Last();
+            
+            str = str.Replace(BackendGeneric, $"<{genericTypeName}>");
+        }
+        
+        public static void StripGenericFromString(ref string str, string replace = null)
+        {
+            if (string.IsNullOrEmpty(replace))
+            {
+                replace = string.Empty;
+            }
+
+            if (IsGenericTypeName_BackEnd(str))
+            {
+                str = str.Replace(BackendGeneric, replace);
+            }
+            else if (IsGenericTypeName_FrontEnd(str))
+            {
+                str = str.Replace(FrontendGeneric, replace);
+            }
+        }
+
+        public static void NameSwap_DotNetToKeyword(ref string str)
+        {
+            foreach (var pair in _typeKeywordPairs)
+            {
+                if (pair.Key == str)
+                {
+                    str = pair.Value;
+                    return;
+                }
+            }
+        }
+        public static void NameSwap_KeywordToDotNet(ref string str)
+        {
+            foreach (var pair in _typeKeywordPairs)
+            {
+                if (pair.Value == str)
+                {
+                    str = pair.Key;
+                    return;
+                }
+            }
+        }
+        public static bool TryGetValueSuffixLiteral(Type forType, out string result)
+        {
+            if (_typeSuffixLiterals.TryGetValue(forType, out string str))
+            {
+                result = str;
+                return true;
+            }
+            result = string.Empty;
+            return false;
+        }
+#endregion Strings
+    }
+    
+    /// <summary>
+    /// Provides static helpers and cached info about a generic type <typeparamref name="T"/>.
+    /// Accessing a type via this class will load a <see cref="TypeInfo"/> associated with that type.
+    /// </summary>
+    internal static class TypeHelper<T>
+    {
+        static TypeHelper()
+        {
+            _type = typeof(T);
+            _info = new TypeInfo(_type);
+            TypeHelper.RegisterHelperForType<T>();
+
+            FindMethodTryParse();
+        }
+
+        private static readonly Type _type;
+        private static readonly TypeInfo _info;
+        
+        /// <summary>
+        /// Cached information about generic type <typeparamref name="T"/>.
+        /// </summary>
+        public static TypeInfo Info => _info;
+
+        /// <summary>
+        /// If <typeparamref name="T"/> is <see cref="System.Nullable{}"/>, return the generic type the nullable holds, else return type <typeparamref name="T"/>.
+        /// </summary>
+        public static Type GetNullableTypeOrPassThrough()
+        {
+            if (!_info.IsNullable)
+                return _type;
+            return _type.GenericTypeArguments[0];
+        }
+        
+        public static bool CanAssign(Type other) => _type.IsAssignableFrom(other);
+
+        private static MethodInfo _tryParse;
+        private static void FindMethodTryParse()
+        {
+            const string METHOD_NAME = "TryParse";
+            Type type = typeof(T);
+            try
+            {
+                // public static bool TryParse(string str, out TData value)
+                _tryParse = type.GetMethod(METHOD_NAME,
+                    BindingFlags.Static | BindingFlags.Public, null,
+                    new[] { typeof(string), type.MakeByRefType() }, null);
+                
+                if (_tryParse == null)
+                {
+                    throw new Exception($"Reflection Error: '{type.Name}' does not contain a public static method '{METHOD_NAME}'");
+                }
+            }
+            catch (Exception e)
+            {
+                throw new Exception($"Unhandled Reflection Error: {e}");
+            }
+        }
+        
+        /// <summary>
+        /// Attempts find and invoke <typeparamref name="T"/>'s static TryParse() method using Reflection.
+        /// </summary>
+        public static bool TryParse(string str, out T data)
+        {
+            if (_tryParse == null)
+                throw new NotSupportedException($"Not supported: {typeof(T)}.TryParse()");
+            
+            // public static bool TryParse(string str, out TData value)
+            // The method's "out TData" gets written to object[] array.
+            object[] param = new object[] { str, default(T) }; 
+            object result = _tryParse.Invoke(null, param); 
+                
+            if (result is bool didConvert)
+            {
+                // Read what the method wrote as "out T"
+                data = didConvert ? (T)param[1] : default;
+                return didConvert;
+            }
+            
+            // We really might want to throw an exception here instead
+            data = default;
+            return false;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Myra/Utility/Types/TypeInfo.cs b/src/Myra/Utility/Types/TypeInfo.cs
new file mode 100644
index 00000000..e11d6541
--- /dev/null
+++ b/src/Myra/Utility/Types/TypeInfo.cs
@@ -0,0 +1,81 @@
+using System;
+
+namespace Myra.Utility.Types
+{
+    public readonly struct TypeInfo
+    {
+        public readonly TypeCode Code;
+        
+        /// <inheritdoc cref="Type.IsClass"/>
+        public readonly bool IsClass;
+        /// <inheritdoc cref="Type.IsInterface"/>
+        public readonly bool IsInterface;
+        /// <inheritdoc cref="Type.IsValueType"/>
+        public readonly bool IsValue;
+        /// <summary>
+        /// If true, the type is a basic .Net primitive type.
+        /// </summary>
+        public readonly bool IsPrimitive;
+        /// <summary>
+        /// True if: <para/>
+        /// The type <see cref="Type.IsValueType"/> contained inside a <see cref="System.Nullable{}"/>.<para/>
+        /// The type is any other complex class or object.
+        /// </summary>
+        public readonly bool IsNullable;
+        
+        /// <summary>
+        /// If true, the type represents a numerical .Net value. This value is based off <see cref="TypeCode"/>.
+        /// </summary>
+        public readonly bool IsNumber;
+        /// <summary>
+        /// If true, the type represents a numerical .Net value that can be negative. This value is based off <see cref="TypeCode"/>.
+        /// </summary>
+        public readonly bool IsSignedNumber;
+        /// <summary>
+        /// If true, the type represents an integer-based numerical .Net value. This value is based off <see cref="TypeCode"/>.
+        /// </summary>
+        public readonly bool IsWholeNumber;
+        /// <summary>
+        /// If true, the type represents a floating-point numerical .Net value. This value is based off <see cref="TypeCode"/>.
+        /// </summary>
+        public readonly bool IsFractionalNumber;
+        
+        internal TypeInfo(Type type)
+        {
+            Code = Type.GetTypeCode(type);
+
+            IsNumber = false;
+            IsSignedNumber = false;
+            IsWholeNumber = false;
+            IsFractionalNumber = false;
+            
+            IsPrimitive = type.IsPrimitive;
+            IsValue = type.IsValueType;
+            IsInterface = type.IsInterface;
+            IsClass = type.IsClass;
+            
+            if (IsClass)
+            {
+                // The type is a class or delegate 
+                IsNullable = true;
+            }
+            else
+            {
+                // The type is a value or interface
+                if (IsInterface)
+                {
+                    IsNullable = true;
+                }
+                else
+                {
+                    IsNullable = type.IsGenericType && type.GetGenericTypeDefinition() == typeof(Nullable<>);
+                    
+                    IsNumber = Code.IsNumericType();
+                    IsSignedNumber = Code.IsSigned();
+                    IsWholeNumber = Code.IsNumericInteger();
+                    IsFractionalNumber = Code.IsNumericFractional();
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/MyraPad/AsyncTasksQueue.cs b/src/MyraPad/AsyncTasksQueue.cs
index 9b65cf5d..367a9e1c 100644
--- a/src/MyraPad/AsyncTasksQueue.cs
+++ b/src/MyraPad/AsyncTasksQueue.cs
@@ -62,6 +62,7 @@ private void RefreshProc(object state)
 					{
 						Studio.MainForm.QueueClearExplorer();
 						Studio.MainForm.QueueSetStatusText(ex.Message);
+						Console.WriteLine(ex);
 					}
 				}
 
@@ -84,6 +85,7 @@ private void RefreshProc(object state)
 						{
 							Studio.MainForm.QueueClearExplorer();
 							Studio.MainForm.QueueSetStatusText(ex.Message);
+							Console.WriteLine(ex);
 						}
 					}
 				}
diff --git a/src/MyraPad/ExporterCS.cs b/src/MyraPad/ExporterCS.cs
index 660a7280..c232cea7 100644
--- a/src/MyraPad/ExporterCS.cs
+++ b/src/MyraPad/ExporterCS.cs
@@ -16,11 +16,14 @@
 using Myra.Graphics2D.UI;
 using Myra.MML;
 using Myra.Utility;
+using Myra.Utility.Types;
 
 namespace MyraPad
 {
 	public class ExporterCS : IDisposable
 	{
+		private const char Quote = '"';
+		
 		private readonly Project _project;
 		private readonly Dictionary<string, int> ids = new Dictionary<string, int>();
 		private readonly StringBuilder sbFields = new StringBuilder();
@@ -144,17 +147,18 @@ where i.IsGenericType &&
 
 			isFirst = false;
 
-			string id;
-			var typeName = w.GetType().GetFriendlyName();
+			string varName; //Explictly named (ID'd) widgets
+			string typeName = w.GetType().GetFriendlyName();
 			if (_project.Root == w)
 			{
-				id = string.Empty;
+				varName = string.Empty;
 			}
 			else
 			{
-				id = w.Id;
-				if (string.IsNullOrEmpty(id))
+				varName = w.Id;
+				if (string.IsNullOrEmpty(varName))
 				{
+					//Unnamed widgets (without IDs)
 					var onlyTypeName = LowercaseFirstLetter(w.GetType().GetOnlyTypeName());
 					int count;
 					if (!ids.TryGetValue(onlyTypeName, out count))
@@ -167,9 +171,9 @@ where i.IsGenericType &&
 					}
 					ids[onlyTypeName] = count;
 
-					id = onlyTypeName + count;
+					varName = onlyTypeName + count;
 
-					sbBuild.Append("var " + id);
+					sbBuild.Append("var " + varName);
 				}
 				else
 				{
@@ -177,20 +181,21 @@ where i.IsGenericType &&
 				}
 			}
 
-			var idPrefix = string.IsNullOrEmpty(id) ? string.Empty : id + ".";
-			if (!string.IsNullOrEmpty(id))
+			var idPrefix = string.IsNullOrEmpty(varName) ? string.Empty : varName + '.';
+			if (!string.IsNullOrEmpty(varName))
 			{
-				sbBuild.Append(" = new " + typeName + "(" +
-					(string.IsNullOrEmpty(styleName) ? string.Empty : ("\"" + styleName + "\"")) + ");");
+				string style = string.IsNullOrEmpty(styleName) ? string.Empty : $"{Quote}{styleName}{Quote}";
+				sbBuild.Append($" = new {typeName}({style});");
 			}
 
+			// Widget-Variable declaration
 			if (!string.IsNullOrEmpty(w.Id) && _project.Root != w)
 			{
 				if (!isFirst)
 				{
 					sbFields.Append("\n\t\t");
 				}
-				sbFields.Append("public " + w.GetType().Name + " " + w.Id + ";");
+				sbFields.Append($"public {typeName} {w.Id};");
 			}
 
 			foreach (var property in simpleProperties)
@@ -217,7 +222,7 @@ where i.IsGenericType &&
 					if (value != null && !value.Equals(property.DefaultValueObject))
 					{
 						value = BuildValue(value, converter);
-						sbBuild.Append($"\n\t\t\t{property.OwnerType.Name}.Set{property.Name}({id}, {value});");
+						sbBuild.Append($"\n\t\t\t{property.OwnerType.Name}.Set{property.Name}({varName}, {value});");
 					}
 				}
 			}
@@ -227,10 +232,10 @@ where i.IsGenericType &&
 				sbBuild.Append("\n\t\t\t");
 				sbBuild.Append(idPrefix);
 				sbBuild.Append(subItem);
-				sbBuild.Append(";");
+				sbBuild.Append(';');
 			}
 
-			return id;
+			return varName;
 		}
 
 		public string ExportDesigner()
@@ -306,8 +311,7 @@ private string BuildPropertyCode(PropertyInfo property, object o, string idPrefi
 					property.PropertyType == typeof(SpriteFontBase))
 				{
 					var baseObject = o as BaseObject;
-					string s;
-					if (baseObject != null && baseObject.Resources.TryGetValue(property.Name, out s))
+					if (baseObject != null && baseObject.Resources.TryGetValue(property.Name, out string s))
 					{
 						var typeName = property.PropertyType.Name;
 						if (typeof(IImage).IsAssignableFrom(property.PropertyType))
@@ -321,18 +325,17 @@ private string BuildPropertyCode(PropertyInfo property, object o, string idPrefi
 							{
 								typeName = "Font";
 							}
-							strValue = "MyraEnvironment.DefaultAssetManager.Load" + typeName + "(\"" + s + "\")";
+							strValue = $"MyraEnvironment.DefaultAssetManager.Load{typeName}({Quote}{s}{Quote})";
 						}
 						else
 						{
-							strValue = "new SolidBrush(\"" + s + "\")";
+							strValue = $"new SolidBrush({Quote}{s}{Quote})";
 						}
 					}
 				}
 				else if (property.PropertyType == typeof(Thickness))
 				{
-					var thickness = (Thickness)value;
-					strValue = "new Thickness(" + thickness.ToString() + ")";
+					strValue = $"new Thickness({(Thickness)value})";
 				}
 				else
 				{
@@ -344,19 +347,14 @@ private string BuildPropertyCode(PropertyInfo property, object o, string idPrefi
 					return null;
 				}
 
-				sb.Append("\n\t\t\t" + idPrefix + property.Name);
-				sb.Append(" = ");
-				sb.Append(strValue);
-				sb.Append(";");
+				sb.Append($"\n\t\t\t{idPrefix}{property.Name} = {strValue};");
 			}
 			else
 			{
 				foreach (var comp in asList)
 				{
-					sb.Append("\n\t\t\t" + idPrefix + property.Name);
-					sb.Append(".Add(");
-					sb.Append(BuildValue(comp, converter));
-					sb.Append(");");
+					string strValue = BuildValue(comp, converter);
+					sb.Append($"\n\t\t\t{idPrefix}{property.Name}.Add({strValue});");
 				}
 			}
 
@@ -370,7 +368,8 @@ private static string BuildValue(object value, PrimitiveConverter converter)
 				return "null";
 			}
 
-			if (value is Color)
+			Type type = value.GetType();
+			if (type == typeof(Color))
 			{
 				var name = ((Color)value).GetColorName();
 				if (!string.IsNullOrEmpty(name))
@@ -385,24 +384,32 @@ private static string BuildValue(object value, PrimitiveConverter converter)
 				}
 			}
 
-			if (value is string || value.GetType().IsPrimitive)
+			if (type == typeof(string) || type == typeof(char) || type == typeof(bool))
 			{
 				return converter.PrimitiveToLiteral(value);
 			}
+			
+			if (type.IsPrimitive || type == typeof(decimal)) //Numerical types
+			{
+				if (TypeHelper.TryGetValueSuffixLiteral(type, out string suffix))
+				{
+					return $"{value}{suffix}";
+				}
+			}
 
 			var sb = new StringBuilder();
-			if (value.GetType().IsEnum)
+			if (type.IsEnum) //Enum types
 			{
 				sb.Append(value.GetType());
-				sb.Append(".");
+				sb.Append('.');
 				sb.Append(value);
-				return sb.ToString().Replace("+", ".");
+				return sb.ToString().Replace('+', '.');
 			}
 
-			sb.Append("new " + value.GetType().GetFriendlyName());
+			sb.Append("new " + type.GetFriendlyName());
 
 			var isEmpty = true;
-			var properties = from p in value.GetType().GetProperties() select p;
+			var properties = from p in type.GetProperties() select p;
 			foreach (var property in properties)
 			{
 				if (property.GetGetMethod() == null ||
@@ -426,7 +433,7 @@ private static string BuildValue(object value, PrimitiveConverter converter)
 					continue;
 				}
 
-				if (value.GetType().Name == "Color" && property.Name == "PackedValue")
+				if (type.Name == "Color" && property.Name == "PackedValue")
 				{
 					// Skip unused properties of MG
 					continue;
@@ -438,10 +445,8 @@ private static string BuildValue(object value, PrimitiveConverter converter)
 					isEmpty = false;
 				}
 
-				sb.Append("\n\t\t\t\t" + property.Name);
-				sb.Append(" = ");
-				sb.Append(BuildValue(subValue, converter));
-				sb.Append(",");
+				string strValue = BuildValue(subValue, converter);
+				sb.Append($"\n\t\t\t\t{property.Name} = {strValue},");
 			}
 
 			if (!isEmpty)
@@ -502,19 +507,7 @@ public string PrimitiveToLiteral(object input)
 			using (var writer = new StringWriter())
 			{
 				provider.GenerateCodeFromExpression(new CodePrimitiveExpression(input), writer, null);
-				var result = writer.ToString();
-
-				// Remove trailing 'f' from float
-				if (input is float && !string.IsNullOrEmpty(result))
-				{
-					result = result.ToLower();
-					if (result.EndsWith("f"))
-					{
-						result = result.Substring(0, result.Length - 1);
-					}
-				}
-
-				return result;
+				return writer.ToString();
 			}
 		}
 
diff --git a/src/MyraPad/UI/MainForm.cs b/src/MyraPad/UI/MainForm.cs
index a4750bee..c33609f2 100644
--- a/src/MyraPad/UI/MainForm.cs
+++ b/src/MyraPad/UI/MainForm.cs
@@ -21,8 +21,10 @@
 using System.Reflection;
 using Myra.Attributes;
 using System.Collections;
+using System.Collections.ObjectModel;
 using System.Xml.Linq;
 using System.Xml;
+using Myra.Utility.Types;
 
 namespace MyraPad.UI
 {
@@ -37,7 +39,7 @@ public partial class MainForm
 		private static readonly string[] SimpleWidgets = new[]
 		{
 			"ImageTextButton",
-			"SpinButton",
+			"SpinButton<>",
 			"HorizontalProgressBar",
 			"VerticalProgressBar",
 			"HorizontalSeparator",
@@ -69,12 +71,18 @@ public partial class MainForm
 		};
 
 		private static readonly string[] SpecialContainers = new[]
-{
+		{
 			"HorizontalMenu",
 			"VerticalMenu",
 			"TabControl",
 		};
 
+		private static readonly ReadOnlyDictionary<string, string[]> GenericTypesLookup = //TODO use this for type lookup in auto-predict
+			new ReadOnlyDictionary<string, string[]>(new Dictionary<string, string[]>
+		{	// The first entry is always used as a default.
+			{"SpinButton<>", new []{"Single", "Double", "Decimal", "Int16", "Int32", "Int64", "UInt16", "UInt32", "UInt64"}} 
+		});
+
 		private static readonly Regex TagResolver = new Regex("<([A-Za-z0-9\\.]+)");
 
 		private readonly AsyncTasksQueue _queue = new AsyncTasksQueue();
@@ -1000,81 +1008,98 @@ private void HandleAutoComplete()
 					all = (from a in all where a.StartsWith(typed, StringComparison.OrdinalIgnoreCase) select a).ToList();
 				}
 
-				if (all.Count > 0)
-				{
-					var lastStartPos = _currentTagStart.Value;
-					var lastEndPos = cursorPos;
-					// Build context menu
-					_autoCompleteMenu = new VerticalMenu();
-					foreach (var a in all)
+				if (all.Count <= 0)
+					return;
+				
+				var lastStartPos = _currentTagStart.Value;
+				var lastEndPos = cursorPos;
+				// Build context menu
+				_autoCompleteMenu = new VerticalMenu();
+				foreach (string item in all)
+				{
+					var menuItem = new MenuItem
 					{
-						var menuItem = new MenuItem
-						{
-							Text = a
-						};
+						Text = item,
+					};
 
-						menuItem.Selected += (s, args) =>
+					menuItem.Selected += (s, args) =>
+					{
+						int skip;
+						bool needsClose = false;
+						string result = "<";
+						if (menuItem.Text.EndsWith("<>")) // Is generic?
 						{
-							var result = "<" + menuItem.Text;
-							var skip = result.Length;
-							var needsClose = false;
-
-							if (SimpleWidgets.Contains(menuItem.Text) ||
-								Project.IsProportionName(menuItem.Text) ||
-								menuItem.Text == MenuItemName ||
-								menuItem.Text == ListItemName)
-							{
-								result += "/>";
-								skip += 2;
-							}
-							else
+							const char quote = '"';
+							// Remove the <> from the item name, while also appending GenericTypeArg="Type"
+							if (GenericTypesLookup.TryGetValue(menuItem.Text, out var strs))
 							{
-								result += ">";
-								++skip;
-
-								if (Options.AutoIndent && Options.IndentSpacesSize > 0)
-								{
-									// Indent before cursor pos
-									result += "\n";
-									var indentSize = Options.IndentSpacesSize * (_indentLevel + 1);
-									result += new string(' ', indentSize);
-									skip += indentSize;
-
-									// Indent before closing tag
-									result += "\n";
-									indentSize = Options.IndentSpacesSize * _indentLevel;
-									result += new string(' ', indentSize);
-								}
-								result += "</" + menuItem.Text + ">";
-								++skip;
-								needsClose = true;
+								string genericType = strs[0];
+								TypeHelper.NameSwap_DotNetToKeyword(ref genericType);
+								result += menuItem.Text.Replace("<>", $" {Project.GenericTypeArgName}={quote}{genericType}{quote}");
 							}
+							skip = result.Length;
+						}
+						else
+						{
+							result += menuItem.Text;
+							skip = result.Length;
+						}
+						
+						if (SimpleWidgets.Contains(menuItem.Text) ||
+						    Project.IsProportionName(menuItem.Text) ||
+						    menuItem.Text == MenuItemName ||
+						    menuItem.Text == ListItemName)
+						{
+							result += "/>";
+							skip += 2;
+						}
+						else
+						{
+							result += ">";
+							++skip;
 
-							_textSource.Replace(lastStartPos, lastEndPos - lastStartPos, result);
-							_textSource.CursorPosition = lastStartPos + skip;
-							if (needsClose)
+							if (Options.AutoIndent && Options.IndentSpacesSize > 0)
 							{
-								//								_textSource.OnKeyDown(Keys.Enter);
+								// Indent before cursor pos
+								result += "\n";
+								var indentSize = Options.IndentSpacesSize * (_indentLevel + 1);
+								result += new string(' ', indentSize);
+								skip += indentSize;
+
+								// Indent before closing tag
+								result += "\n";
+								indentSize = Options.IndentSpacesSize * _indentLevel;
+								result += new string(' ', indentSize);
 							}
-						};
-
-						_autoCompleteMenu.Items.Add(menuItem);
-					}
+							result += "</" + menuItem.Text + ">";
+							++skip;
+							needsClose = true;
+						}
 
-					var screen = _textSource.ToGlobal(_textSource.CursorCoords);
-					screen.Y += _textSource.Font.LineHeight;
+						_textSource.Replace(lastStartPos, lastEndPos - lastStartPos, result);
+						_textSource.CursorPosition = lastStartPos + skip;
+						if (needsClose)
+						{
+							//								_textSource.OnKeyDown(Keys.Enter);
+						}
+					};
 
-					if (_autoCompleteMenu.Items.Count > 0)
-					{
-						_autoCompleteMenu.HoverIndex = 0;
-					}
+					_autoCompleteMenu.Items.Add(menuItem);
+				}
 
-					Desktop.ShowContextMenu(_autoCompleteMenu, screen);
-					// Keep focus at text field
-					Desktop.FocusedKeyboardWidget = _textSource;
+				var screen = _textSource.ToGlobal(_textSource.CursorCoords);
+				screen.Y += _textSource.Font.LineHeight;
 
-					_refreshInitiated = null;
+				if (_autoCompleteMenu.Items.Count > 0)
+				{
+					_autoCompleteMenu.HoverIndex = 0;
 				}
+
+				Desktop.ShowContextMenu(_autoCompleteMenu, screen);
+				// Keep focus at text field
+				Desktop.FocusedKeyboardWidget = _textSource;
+
+				_refreshInitiated = null;
 			}
 		}
 
@@ -1261,7 +1286,7 @@ private void ExportCsItemOnSelected(object sender1, EventArgs eventArgs)
 					{
 						var strings = new List<string>
 						{
-							"Success. Following files had been written:"
+							"Success. The following files were written:"
 						};
 						strings.AddRange(export.Export());
 
@@ -1273,6 +1298,7 @@ private void ExportCsItemOnSelected(object sender1, EventArgs eventArgs)
 				{
 					var msg = Dialog.CreateMessageBox("Error", ex.Message);
 					msg.ShowModal(Desktop);
+					Console.WriteLine(ex);
 				}
 			};
 		}
@@ -1645,19 +1671,25 @@ public void Quit()
 		private void BuildExplorerTreeRecursive(ITreeViewNode node, IItemWithId root)
 		{
 			if (root == null)
-			{
 				return;
+
+			Type type = root.GetType();
+			string label = type.Name;
+			
+			// Display generic class type in the tree
+			if (TypeHelper.MakeFancyGenericTypeName(type, out string newName))
+			{
+				label = newName;
 			}
 
-			var id = root.GetType().Name;
 			if (!string.IsNullOrEmpty(root.Id))
 			{
-				id += $" (#{root.Id})";
+				label += $" (#{root.Id})";
 			}
 
 			var newNode = node.AddSubNode(new Label
 			{
-				Text = id
+				Text = label
 			});
 
 			newNode.Tag = root;