From a1022d455ca60ca4ae664a07e0e01e48f52504ba Mon Sep 17 00:00:00 2001
From: Kace <lakacey03@gmail.com>
Date: Sat, 16 Nov 2024 16:55:34 -0500
Subject: [PATCH 01/51] avalonia upgrade wip

---
 RogueEssence.Editor.Avalonia/App.axaml        | 12 +++++++---
 RogueEssence.Editor.Avalonia/App.axaml.cs     | 17 ++++++++++---
 .../DataEditor/CategorySpawnBox.axaml         |  2 +-
 .../DataEditor/CategorySpawnBox.axaml.cs      |  9 ++-----
 .../DataEditor/ClassBox.axaml.cs              |  9 ++-----
 .../DataEditor/CollectionBox.axaml            |  2 +-
 .../DataEditor/CollectionBox.axaml.cs         |  9 ++-----
 .../DataEditor/DataEditForm.axaml.cs          | 15 +++---------
 .../DataEditor/DataEditRootForm.axaml.cs      |  9 ++-----
 .../DataEditor/DictionaryBox.axaml            |  2 +-
 .../DataEditor/DictionaryBox.axaml.cs         |  7 +-----
 .../DataEditor/Editors/DataFolderEditor.cs    |  3 +--
 .../DataEditor/Editors/Editor.cs              | 15 ++++++------
 .../Editors/Primitive/DoubleEditor.cs         |  2 +-
 .../Editors/Primitive/SingleEditor.cs         |  2 +-
 .../RogueElements/PriorityListEditor.cs       |  5 ++--
 .../Editors/RogueElements/RangeDictEditor.cs  |  3 ++-
 .../Editors/RogueElements/SpawnListEditor.cs  |  3 ++-
 .../RogueElements/SpawnRangeListEditor.cs     |  3 ++-
 .../Editors/RogueEssence/AliasDataEditor.cs   |  3 +--
 .../Editors/RogueEssence/AnimDataEditor.cs    |  3 +--
 .../Editors/RogueEssence/EntryDataEditor.cs   |  3 +--
 .../Editors/RogueEssence/FlagTypeEditor.cs    |  2 +-
 .../Editors/RogueEssence/FrameTypeEditor.cs   |  3 +--
 .../Editors/RogueEssence/InvItemEditor.cs     |  4 +---
 .../Editors/RogueEssence/MapItemEditor.cs     |  5 ++--
 .../Editors/RogueEssence/MonsterIDEditor.cs   | 16 ++++---------
 .../Editors/RogueEssence/MusicEditor.cs       |  3 +--
 .../Editors/RogueEssence/SoundEditor.cs       |  3 +--
 .../Editors/RogueEssence/StringKeyEditor.cs   |  3 +--
 .../RogueEssence/Tiles/AutotileBrowser.axaml  |  2 +-
 .../Tiles/AutotileBrowser.axaml.cs            |  9 ++-----
 .../RogueEssence/Tiles/TileBox.axaml.cs       |  8 +------
 .../RogueEssence/Tiles/TileBrowser.axaml      |  2 +-
 .../RogueEssence/Tiles/TileBrowser.axaml.cs   | 12 +++-------
 .../RogueEssence/Tiles/TileEditForm.axaml.cs  | 11 +--------
 .../DataEditor/Editors/System/ArrayEditor.cs  |  2 +-
 .../Editors/System/DictionaryEditor.cs        |  3 ++-
 .../DataEditor/Editors/System/EnumEditor.cs   |  3 +--
 .../Editors/System/HashSetEditor.cs           |  2 +-
 .../DataEditor/Editors/System/ListEditor.cs   |  5 ++--
 .../Editors/System/NoDupeListEditor.cs        |  2 +-
 .../DataEditor/Editors/System/TypeEditor.cs   |  2 +-
 .../DataEditor/PriorityListBox.axaml          |  2 +-
 .../DataEditor/PriorityListBox.axaml.cs       |  8 ++-----
 .../DataEditor/RangeDictBox.axaml             |  2 +-
 .../DataEditor/RangeDictBox.axaml.cs          |  8 ++-----
 .../DataEditor/RankedCollectionBox.axaml      |  2 +-
 .../DataEditor/RankedCollectionBox.axaml.cs   |  9 ++-----
 .../DataEditor/SpawnListBox.axaml             |  2 +-
 .../DataEditor/SpawnListBox.axaml.cs          |  9 ++-----
 .../DataEditor/SpawnListViewBox.axaml         |  2 +-
 .../DataEditor/SpawnListViewBox.axaml.cs      |  7 +-----
 .../DataEditor/SpawnRangeListBox.axaml        |  2 +-
 .../DataEditor/SpawnRangeListBox.axaml.cs     |  9 ++-----
 RogueEssence.Editor.Avalonia/ReactiveExt.cs   |  4 ++--
 .../RogueEssence.Editor.Avalonia.csproj       | 11 +++++----
 RogueEssence.Editor.Avalonia/ViewLocator.cs   |  2 +-
 .../ViewModels/DevForm/DevTabDataViewModel.cs |  3 ++-
 .../GroundEditForm/EntScriptItem.cs           |  2 +-
 .../GroundEditForm/GroundEditViewModel.cs     |  6 ++---
 .../ViewModels/GroundEditForm/ScriptItem.cs   |  3 ++-
 .../Views/Content/AnimEditForm.axaml.cs       | 13 ++--------
 .../Views/Content/SpeciesEditForm.axaml       |  4 ++--
 .../Views/Content/SpeciesEditForm.axaml.cs    | 11 +--------
 .../Views/Content/StringsEditForm.axaml       |  2 +-
 .../Views/Content/StringsEditForm.axaml.cs    | 12 +---------
 .../Views/Content/TilesetEditForm.axaml.cs    | 10 +-------
 .../Views/DataListForm.axaml                  |  4 ++--
 .../Views/DataListForm.axaml.cs               | 12 ++--------
 .../Views/DevForm/DevForm.axaml.cs            | 12 ++--------
 .../Views/DevForm/DevTabConstants.axaml.cs    |  7 +-----
 .../Views/DevForm/DevTabData.axaml.cs         |  7 +-----
 .../Views/DevForm/DevTabGame.axaml            | 22 +++++++++++++----
 .../Views/DevForm/DevTabGame.axaml.cs         |  7 +-----
 .../Views/DevForm/DevTabMods.axaml            |  2 +-
 .../Views/DevForm/DevTabMods.axaml.cs         |  8 +------
 .../Views/DevForm/DevTabPlayer.axaml          | 10 ++++----
 .../Views/DevForm/DevTabPlayer.axaml.cs       |  9 +------
 .../Views/DevForm/DevTabScript.axaml.cs       |  8 +------
 .../Views/DevForm/DevTabSprites.axaml.cs      |  7 +-----
 .../Views/DevForm/DevTabTravel.axaml          |  8 +++----
 .../Views/DevForm/DevTabTravel.axaml.cs       | 10 ++------
 .../Views/DialogBoxes/AnimChoiceWindow.axaml  |  2 +-
 .../DialogBoxes/AnimChoiceWindow.axaml.cs     | 15 ++----------
 .../DialogBoxes/MapResizeWindow.axaml.cs      | 12 ++--------
 .../DialogBoxes/MapRetileWindow.axaml.cs      | 11 +--------
 .../Views/DialogBoxes/MessageBox.axaml.cs     | 12 ++--------
 .../Views/DialogBoxes/ModConfigWindow.axaml   |  2 +-
 .../DialogBoxes/ModConfigWindow.axaml.cs      | 13 +---------
 .../Views/DialogBoxes/RenameWindow.axaml.cs   | 13 +---------
 .../Views/GroundEditForm/EntityBrowser.axaml  | 22 ++++++++---------
 .../GroundEditForm/EntityBrowser.axaml.cs     |  8 +------
 .../GroundEditForm/GroundEditForm.axaml.cs    | 14 +++--------
 .../GroundEditForm/GroundTabDecorations.axaml |  6 ++---
 .../GroundTabDecorations.axaml.cs             |  7 +-----
 .../GroundEditForm/GroundTabEntities.axaml.cs |  7 +-----
 .../GroundEditForm/GroundTabProperties.axaml  |  4 ++--
 .../GroundTabProperties.axaml.cs              |  7 +-----
 .../GroundEditForm/GroundTabScript.axaml      |  5 ++--
 .../GroundEditForm/GroundTabScript.axaml.cs   |  7 +-----
 .../GroundEditForm/GroundTabStrings.axaml     |  2 +-
 .../GroundEditForm/GroundTabStrings.axaml.cs  |  7 +-----
 .../GroundEditForm/GroundTabTextures.axaml.cs |  7 +-----
 .../GroundEditForm/GroundTabWalls.axaml.cs    |  7 +-----
 .../Layers/AnimLayerWindow.axaml.cs           | 14 ++---------
 .../Layers/EntityLayerWindow.axaml.cs         | 14 ++---------
 .../Layers/GroundLayerWindow.axaml.cs         | 14 ++---------
 .../Layers/MapLayerWindow.axaml.cs            | 15 ++----------
 .../Views/MapEditForm/MapEditForm.axaml.cs    | 18 +++-----------
 .../Views/MapEditForm/MapTabDecorations.axaml |  6 ++---
 .../MapEditForm/MapTabDecorations.axaml.cs    |  7 +-----
 .../Views/MapEditForm/MapTabEffects.axaml.cs  |  7 +-----
 .../Views/MapEditForm/MapTabEntities.axaml    | 24 +++++++++----------
 .../Views/MapEditForm/MapTabEntities.axaml.cs |  7 +-----
 .../Views/MapEditForm/MapTabEntrances.axaml   |  2 +-
 .../MapEditForm/MapTabEntrances.axaml.cs      |  7 +-----
 .../Views/MapEditForm/MapTabItems.axaml       |  2 +-
 .../Views/MapEditForm/MapTabItems.axaml.cs    |  8 ++-----
 .../Views/MapEditForm/MapTabProperties.axaml  | 10 ++++----
 .../MapEditForm/MapTabProperties.axaml.cs     |  7 +-----
 .../Views/MapEditForm/MapTabSpawns.axaml.cs   |  7 +-----
 .../Views/MapEditForm/MapTabTerrain.axaml     |  2 +-
 .../Views/MapEditForm/MapTabTerrain.axaml.cs  |  7 +-----
 .../Views/MapEditForm/MapTabTextures.axaml.cs |  7 +-----
 .../Views/MapEditForm/MapTabTiles.axaml       |  4 ++--
 .../Views/MapEditForm/MapTabTiles.axaml.cs    |  7 +-----
 .../MapEditForm/Teams/TeamWindow.axaml.cs     | 14 ++---------
 .../Views/SearchListBox.axaml                 |  2 +-
 .../Views/SearchListBox.axaml.cs              |  9 ++-----
 .../Views/Testing/TextTestForm.axaml.cs       | 12 ++--------
 .../Views/UserControls/LayerBox.axaml         |  2 +-
 .../Views/UserControls/LayerBox.axaml.cs      |  9 ++-----
 .../Views/UserControls/SearchComboBox.cs      |  6 ++++-
 .../Views/UserControls/TeamBox.axaml          |  2 +-
 .../Views/UserControls/TeamBox.axaml.cs       |  9 ++-----
 136 files changed, 285 insertions(+), 684 deletions(-)

diff --git a/RogueEssence.Editor.Avalonia/App.axaml b/RogueEssence.Editor.Avalonia/App.axaml
index f6e04e48..3fbb7b3c 100644
--- a/RogueEssence.Editor.Avalonia/App.axaml
+++ b/RogueEssence.Editor.Avalonia/App.axaml
@@ -1,15 +1,15 @@
 <Application xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:RogueEssence.Dev"
+             RequestedThemeVariant="Light"
              x:Class="RogueEssence.Dev.App">
     <Application.DataTemplates>
         <local:ViewLocator/>
     </Application.DataTemplates>
 
     <Application.Styles>
-        <StyleInclude Source="avares://Avalonia.Themes.Default/DefaultTheme.xaml"/>
-        <StyleInclude Source="avares://Avalonia.Themes.Default/Accents/BaseLight.xaml"/>
-        <StyleInclude Source="avares://Avalonia.Controls.DataGrid/Themes/Default.xaml"/>
+        <SimpleTheme/>
+        <StyleInclude Source="avares://Avalonia.Controls.DataGrid/Themes/Simple.xaml"/>
         <Style Selector="TabItem">
             <Setter Property="Foreground" Value="Black" />
             <Setter Property="FontSize" Value="12"/>
@@ -17,8 +17,14 @@
       <Style Selector="DataGridRow">
         <Setter Property="Background" Value="#FFFFFF"/>
       </Style>
+        <Style Selector="Button:pressed  /template/ ContentPresenter#PART_ContentPresenter">
+            <!-- <Setter Property="Background" Value="" /> -->
+            <!-- <Setter Property="BorderBrush" Value="{DynamicResource ButtonBorderBrushPressed}" /> -->
+            <Setter Property="TextBlock.Foreground" Value="#454545" />
+        </Style>
       <Style Selector="DataGridTextColumn">
         <Setter Property="TextBlock.TextWrapping" Value="Wrap"/>
       </Style>
     </Application.Styles>
+
 </Application>
diff --git a/RogueEssence.Editor.Avalonia/App.axaml.cs b/RogueEssence.Editor.Avalonia/App.axaml.cs
index 976f85d3..f858788f 100644
--- a/RogueEssence.Editor.Avalonia/App.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/App.axaml.cs
@@ -1,5 +1,7 @@
-using Avalonia;
+using System;
+using Avalonia;
 using Avalonia.Controls.ApplicationLifetimes;
+using Avalonia.Input.Platform;
 using Avalonia.Markup.Xaml;
 using RogueEssence.Dev.ViewModels;
 using RogueEssence.Dev.Views;
@@ -8,11 +10,20 @@ namespace RogueEssence.Dev
 {
     public class App : Application
     {
-        public override void Initialize()
+
+        
+        public static async void CopyText(string data)
         {
-            AvaloniaXamlLoader.Load(this);
+            if (Current.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
+            {
+                if (desktop.MainWindow.Clipboard is IClipboard clipbord)
+                {
+                    await clipbord.SetTextAsync(data);
+                }
+            }
         }
 
+        
         public override void OnFrameworkInitializationCompleted()
         {
             if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/CategorySpawnBox.axaml b/RogueEssence.Editor.Avalonia/DataEditor/CategorySpawnBox.axaml
index 123ca3fc..f6d54116 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/CategorySpawnBox.axaml
+++ b/RogueEssence.Editor.Avalonia/DataEditor/CategorySpawnBox.axaml
@@ -33,7 +33,7 @@
         <ColumnDefinition/>
         <ColumnDefinition Width="40"/>
       </Grid.ColumnDefinitions>
-      <DataGrid IsReadOnly="true" Items="{Binding Collection}" SelectedIndex="{Binding CurrentElement, Mode=TwoWay}" DoubleTapped="doubleClickStart" PointerReleased="gridCollection_DoubleClick" Margin="4" Grid.RowSpan="2" Grid.ColumnSpan="1" MinHeight="50">
+      <DataGrid IsReadOnly="true" ItemsSource="{Binding Collection}" SelectedIndex="{Binding CurrentElement, Mode=TwoWay}" DoubleTapped="doubleClickStart" PointerReleased="gridCollection_DoubleClick" Margin="4" Grid.RowSpan="2" Grid.ColumnSpan="1" MinHeight="50">
         <DataGrid.Columns>
           <DataGridTextColumn Header="Weight"
                         Binding="{Binding DisplayWeight}" />
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/CategorySpawnBox.axaml.cs b/RogueEssence.Editor.Avalonia/DataEditor/CategorySpawnBox.axaml.cs
index cd24a4c3..24cf935d 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/CategorySpawnBox.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/CategorySpawnBox.axaml.cs
@@ -12,7 +12,7 @@
 
 namespace RogueEssence.Dev.Views
 {
-    public class CategorySpawnBox : UserControl
+    public partial class CategorySpawnBox : UserControl
     {
         
         public CategorySpawnBox()
@@ -23,12 +23,7 @@ public CategorySpawnBox()
             Button addItemButtom = this.FindControl<Button>("CategorySpawnBoxAddItemButton");
             addItemButtom.AddHandler(PointerReleasedEvent, CategorySpawnBoxAddItemButton_OnPointerReleased, RoutingStrategies.Tunnel);
         }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-
+        
         bool doubleclick;
         public void doubleClickStart(object sender, RoutedEventArgs e)
         {
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/ClassBox.axaml.cs b/RogueEssence.Editor.Avalonia/DataEditor/ClassBox.axaml.cs
index e4258e76..79adcf46 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/ClassBox.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/ClassBox.axaml.cs
@@ -8,7 +8,7 @@
 
 namespace RogueEssence.Dev.Views
 {
-    public class ClassBox : UserControl
+    public partial class ClassBox : UserControl
     {
         public ClassBox()
         {
@@ -16,12 +16,7 @@ public ClassBox()
             Button button = this.FindControl<Button>("ClassBoxEditButton");
             button.AddHandler(PointerReleasedEvent, ClassBoxEditButton_OnPointerReleased, RoutingStrategies.Tunnel);
         }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-
+        
         private void ClassBoxEditButton_OnPointerReleased(object sender, PointerReleasedEventArgs e)
         {
             KeyModifiers modifiers = e.KeyModifiers;
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/CollectionBox.axaml b/RogueEssence.Editor.Avalonia/DataEditor/CollectionBox.axaml
index 1a78231c..4b99cbcb 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/CollectionBox.axaml
+++ b/RogueEssence.Editor.Avalonia/DataEditor/CollectionBox.axaml
@@ -22,7 +22,7 @@
       <ColumnDefinition/>
       <ColumnDefinition Width="30"/>
     </Grid.ColumnDefinitions>
-    <ListBox Name="lbxItems" Items="{Binding Collection}" SelectedIndex="{Binding SelectedIndex}" DoubleTapped="doubleClickStart" PointerReleased="lbxCollection_DoubleClick" Margin="4" Grid.RowSpan="2" Grid.ColumnSpan="2" MinHeight="50">
+    <ListBox Name="lbxItems" ItemsSource="{Binding Collection}" SelectedIndex="{Binding SelectedIndex}" DoubleTapped="doubleClickStart" PointerReleased="lbxCollection_DoubleClick" Margin="4" Grid.RowSpan="2" Grid.ColumnSpan="2" MinHeight="50">
       <ListBox.ItemTemplate>
         <DataTemplate>
           <TextBlock Text="{Binding Path=DisplayValue}"/>
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/CollectionBox.axaml.cs b/RogueEssence.Editor.Avalonia/DataEditor/CollectionBox.axaml.cs
index 94bff17b..c9fd8c6b 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/CollectionBox.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/CollectionBox.axaml.cs
@@ -10,7 +10,7 @@
 
 namespace RogueEssence.Dev.Views
 {
-    public class CollectionBox : UserControl
+    public partial class CollectionBox : UserControl
     {
         public CollectionBox()
         {
@@ -18,12 +18,7 @@ public CollectionBox()
             Button button = this.FindControl<Button>("CollectionBoxAddButton");
             button.AddHandler(PointerReleasedEvent, CollectionBoxAddButton_OnPointerReleased, RoutingStrategies.Tunnel);
         }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-
+        
         //TODO: there has to be some way to set the ItemTemplate's text binding in code-behind...
         //public void SetConv(IValueConverter conv)
         //{
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/DataEditForm.axaml.cs b/RogueEssence.Editor.Avalonia/DataEditor/DataEditForm.axaml.cs
index 3ff999d9..2eae4e86 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/DataEditForm.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/DataEditForm.axaml.cs
@@ -16,7 +16,7 @@
 
 namespace RogueEssence.Dev.Views
 {
-    public class DataEditForm : ParentForm
+    public partial class DataEditForm : ParentForm
     {
         public delegate Task<bool> OKEvent();
         public OKEvent SelectedOKEvent;
@@ -30,17 +30,8 @@ public DataEditForm()
             InitializeComponent();
 
             ControlPanel = this.FindControl<StackPanel>("stkContent");
-            
-#if DEBUG
-            this.AttachDevTools();
-#endif
         }
-
-        protected virtual void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-
+        
         public async Task SaveChildren()
         {
             for (int ii = children.Count - 1; ii >= 0; ii--)
@@ -65,7 +56,7 @@ public void Window_Loaded(object sender, EventArgs e)
             this.Width = this.Width + 10;
         }
 
-        public virtual async void Window_Closing(object sender, CancelEventArgs e)
+        public virtual async void Window_Closing(object sender, WindowClosingEventArgs e)
         {
             if (Design.IsDesignMode)
                 return;
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/DataEditRootForm.axaml.cs b/RogueEssence.Editor.Avalonia/DataEditor/DataEditRootForm.axaml.cs
index 95c321df..b23eccd8 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/DataEditRootForm.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/DataEditRootForm.axaml.cs
@@ -15,13 +15,8 @@
 
 namespace RogueEssence.Dev.Views
 {
-    public class DataEditRootForm : DataEditForm
+    public partial class DataEditRootForm : DataEditForm
     {
-        protected override void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-
         public async void btnApply_Click(object sender, RoutedEventArgs e)
         {
             await SaveChildren();
@@ -29,7 +24,7 @@ public async void btnApply_Click(object sender, RoutedEventArgs e)
                 await SelectedOKEvent.Invoke();
         }
 
-        public override async void Window_Closing(object sender, CancelEventArgs e)
+        public override async void Window_Closing(object sender, WindowClosingEventArgs e)
         {
             base.Window_Closing(sender, e);
 
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/DictionaryBox.axaml b/RogueEssence.Editor.Avalonia/DataEditor/DictionaryBox.axaml
index 90205e03..42f084fe 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/DictionaryBox.axaml
+++ b/RogueEssence.Editor.Avalonia/DataEditor/DictionaryBox.axaml
@@ -21,7 +21,7 @@
       <ColumnDefinition/>
       <ColumnDefinition/>
     </Grid.ColumnDefinitions>
-    <DataGrid Name="gridItems" IsReadOnly="true" Items="{Binding Collection}" SelectedIndex="{Binding SelectedIndex, Mode=TwoWay}" DoubleTapped="doubleClickStart" PointerReleased="lbxCollection_DoubleClick" Margin="4" Grid.RowSpan="2" Grid.ColumnSpan="2" MinHeight="60">
+    <DataGrid Name="gridItems" IsReadOnly="true" ItemsSource="{Binding Collection}" SelectedIndex="{Binding SelectedIndex, Mode=TwoWay}" DoubleTapped="doubleClickStart" PointerReleased="lbxCollection_DoubleClick" Margin="4" Grid.RowSpan="2" Grid.ColumnSpan="2" MinHeight="60">
       <DataGrid.Columns>
         <DataGridTextColumn Header="Key"
                       Binding="{Binding Key}" />
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/DictionaryBox.axaml.cs b/RogueEssence.Editor.Avalonia/DataEditor/DictionaryBox.axaml.cs
index ba438475..b832bd2d 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/DictionaryBox.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/DictionaryBox.axaml.cs
@@ -12,7 +12,7 @@
 
 namespace RogueEssence.Dev.Views
 {
-    public class DictionaryBox : UserControl
+    public partial class DictionaryBox : UserControl
     {
         public DictionaryBox()
         {
@@ -21,11 +21,6 @@ public DictionaryBox()
             button.AddHandler(PointerReleasedEvent, DictionaryBoxAddButton_OnPointerReleased, RoutingStrategies.Tunnel);
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-
         bool doubleclick;
         public void doubleClickStart(object sender, RoutedEventArgs e)
         {
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/DataFolderEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/DataFolderEditor.cs
index 84f00896..af53320b 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/DataFolderEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/DataFolderEditor.cs
@@ -27,7 +27,6 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
         {
             DataFolderAttribute animAtt = ReflectionExt.FindAttribute<DataFolderAttribute>(attributes);
             ComboBox cbValue = new SearchComboBox();
-            cbValue.VirtualizationMode = ItemVirtualizationMode.Simple;
             string choice = member;
 
             List<string> items = new List<string>();
@@ -44,7 +43,7 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
             }
 
             var subject = new Subject<List<string>>();
-            cbValue.Bind(ComboBox.ItemsProperty, subject);
+            cbValue.Bind(ComboBox.ItemsSourceProperty, subject);
             subject.OnNext(items);
             cbValue.SelectedIndex = chosenIndex;
             control.Children.Add(cbValue);
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/Editor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/Editor.cs
index 5682e129..85d30e72 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/Editor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/Editor.cs
@@ -279,11 +279,12 @@ void IEditor.LoadClassControls(StackPanel control, string parent, Type parentTyp
                     MenuItem copyToolStripMenuItem = new MenuItem();
                     MenuItem pasteToolStripMenuItem = new MenuItem();
 
-                    Avalonia.Collections.AvaloniaList<object> list = (Avalonia.Collections.AvaloniaList<object>)copyPasteStrip.Items;
+                    Avalonia.Collections.AvaloniaList<object> list = new Avalonia.Collections.AvaloniaList<object>();
                     list.AddRange(new MenuItem[] {
                             copyToolStripMenuItem,
                             pasteToolStripMenuItem});
 
+                    copyPasteStrip.ItemsSource = list;
                     copyToolStripMenuItem.Header = "Copy " + type.Name;
                     pasteToolStripMenuItem.Header = "Paste " + type.Name;
 
@@ -384,11 +385,12 @@ void IEditor.LoadClassControls(StackPanel control, string parent, Type parentTyp
                         MenuItem copyToolStripMenuItem = new MenuItem();
                         MenuItem pasteToolStripMenuItem = new MenuItem();
 
-                        Avalonia.Collections.AvaloniaList<object> list = (Avalonia.Collections.AvaloniaList<object>)copyPasteStrip.Items;
+                        Avalonia.Collections.AvaloniaList<object> list = new Avalonia.Collections.AvaloniaList<object>();
                         list.AddRange(new MenuItem[] {
                             copyToolStripMenuItem,
                             pasteToolStripMenuItem});
 
+                        copyPasteStrip.ItemsSource = list;
                         copyToolStripMenuItem.Header = "Copy " + type.Name;
                         pasteToolStripMenuItem.Header = "Paste " + type.Name;
 
@@ -489,11 +491,12 @@ void IEditor.LoadClassControls(StackPanel control, string parent, Type parentTyp
                         MenuItem copyToolStripMenuItem = new MenuItem();
                         MenuItem pasteToolStripMenuItem = new MenuItem();
 
-                        Avalonia.Collections.AvaloniaList<object> list = (Avalonia.Collections.AvaloniaList<object>)copyPasteStrip.Items;
+                        Avalonia.Collections.AvaloniaList<object> list = new Avalonia.Collections.AvaloniaList<object>();
                         list.AddRange(new MenuItem[] {
                             copyToolStripMenuItem,
                             pasteToolStripMenuItem});
 
+                        copyPasteStrip.ItemsSource = list;
                         copyToolStripMenuItem.Header = "Copy " + type.Name;
                         pasteToolStripMenuItem.Header = "Paste " + type.Name;
 
@@ -722,7 +725,6 @@ private void populateTypeChoice(StackPanel typeContainer, Action initNewConstruc
 
             ComboBox cbType = new SearchComboBox();
             cbType.Margin = new Thickness(4, 0, 0, 0);
-            cbType.VirtualizationMode = ItemVirtualizationMode.Simple;
             sharedRowPanel.Children.Add(cbType);
             cbType.SetValue(Grid.ColumnProperty, 1);
 
@@ -793,7 +795,7 @@ private void populateTypeChoice(StackPanel typeContainer, Action initNewConstruc
                 throw new TargetException("Types do not match.");
 
             var subject = new Subject<List<string>>();
-            cbType.Bind(ComboBox.ItemsProperty, subject);
+            cbType.Bind(ComboBox.ItemsSourceProperty, subject);
             subject.OnNext(items);
             cbType.SelectedIndex = selection;
 
@@ -861,7 +863,6 @@ private void populateTypeArgChoice(StackPanel templatePanel, Action initNewConst
 
             ComboBox cbArgType = new SearchComboBox();
             cbArgType.Margin = new Thickness(4, 0, 0, 0);
-            cbArgType.VirtualizationMode = ItemVirtualizationMode.Simple;
             sharedRowPanel.Children.Add(cbArgType);
             cbArgType.SetValue(Grid.ColumnProperty, 1);
 
@@ -886,7 +887,7 @@ private void populateTypeArgChoice(StackPanel templatePanel, Action initNewConst
 
 
             var subject = new Subject<List<string>>();
-            cbArgType.Bind(ComboBox.ItemsProperty, subject);
+            cbArgType.Bind(ComboBox.ItemsSourceProperty, subject);
             subject.OnNext(items);
             cbArgType.SelectedIndex = selection;
 
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/Primitive/DoubleEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/Primitive/DoubleEditor.cs
index 68376cfb..698ed9c0 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/Primitive/DoubleEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/Primitive/DoubleEditor.cs
@@ -31,7 +31,7 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
                 nudValue.Minimum = attribute.Min;
                 nudValue.Maximum = attribute.Max;
             }
-            nudValue.Value = (double)member;
+            nudValue.Value = (decimal)member;
             control.Children.Add(nudValue);
         }
 
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/Primitive/SingleEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/Primitive/SingleEditor.cs
index 2da6e360..f511389d 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/Primitive/SingleEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/Primitive/SingleEditor.cs
@@ -31,7 +31,7 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
                 nudValue.Minimum = attribute.Min;
                 nudValue.Maximum = attribute.Max;
             }
-            nudValue.Value = (double)member;
+            nudValue.Value = (int)member;
             control.Children.Add(nudValue);
         }
 
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/PriorityListEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/PriorityListEditor.cs
index 29244751..58a9818f 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/PriorityListEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/PriorityListEditor.cs
@@ -118,11 +118,12 @@ private static ContextMenu createContextMenu(StackPanel control, Type type, Prio
             MenuItem copyToolStripMenuItem = new MenuItem();
             MenuItem pasteToolStripMenuItem = new MenuItem();
 
-            Avalonia.Collections.AvaloniaList<object> list = (Avalonia.Collections.AvaloniaList<object>)copyPasteStrip.Items;
+            Avalonia.Collections.AvaloniaList<object> list = new Avalonia.Collections.AvaloniaList<object>();
             list.AddRange(new MenuItem[] {
                             copyToolStripMenuItem,
                             pasteToolStripMenuItem});
-
+            copyPasteStrip.ItemsSource = list;
+            
             copyToolStripMenuItem.Header = "Copy List Element: " + elementType.Name;
             pasteToolStripMenuItem.Header = "Insert List Element: " + elementType.Name;
 
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/RangeDictEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/RangeDictEditor.cs
index 15404ca2..a8bb3189 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/RangeDictEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/RangeDictEditor.cs
@@ -129,11 +129,12 @@ private static ContextMenu createContextMenu(StackPanel control, Type type, Rang
             MenuItem copyToolStripMenuItem = new MenuItem();
             MenuItem pasteToolStripMenuItem = new MenuItem();
 
-            Avalonia.Collections.AvaloniaList<object> list = (Avalonia.Collections.AvaloniaList<object>)copyPasteStrip.Items;
+            Avalonia.Collections.AvaloniaList<object> list = new Avalonia.Collections.AvaloniaList<object>();
             list.AddRange(new MenuItem[] {
                             copyToolStripMenuItem,
                             pasteToolStripMenuItem});
 
+            copyPasteStrip.ItemsSource = list;
             copyToolStripMenuItem.Header = "Copy List Element: " + elementType.Name;
             pasteToolStripMenuItem.Header = "Insert List Element: " + elementType.Name;
 
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/SpawnListEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/SpawnListEditor.cs
index aa27820f..d903c87f 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/SpawnListEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/SpawnListEditor.cs
@@ -76,11 +76,12 @@ private static ContextMenu createContextMenu(StackPanel control, Type type, Spaw
             MenuItem copyToolStripMenuItem = new MenuItem();
             MenuItem pasteToolStripMenuItem = new MenuItem();
 
-            Avalonia.Collections.AvaloniaList<object> list = (Avalonia.Collections.AvaloniaList<object>)copyPasteStrip.Items;
+            Avalonia.Collections.AvaloniaList<object> list = new Avalonia.Collections.AvaloniaList<object>();
             list.AddRange(new MenuItem[] {
                             copyToolStripMenuItem,
                             pasteToolStripMenuItem});
 
+            copyPasteStrip.ItemsSource = list;
             copyToolStripMenuItem.Header = "Copy List Element: " + elementType.Name;
             pasteToolStripMenuItem.Header = "Insert List Element: " + elementType.Name;
 
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/SpawnRangeListEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/SpawnRangeListEditor.cs
index cda71687..4fa23ac7 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/SpawnRangeListEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/SpawnRangeListEditor.cs
@@ -102,11 +102,12 @@ private static ContextMenu createContextMenu(StackPanel control, Type type, Spaw
             MenuItem copyToolStripMenuItem = new MenuItem();
             MenuItem pasteToolStripMenuItem = new MenuItem();
 
-            Avalonia.Collections.AvaloniaList<object> list = (Avalonia.Collections.AvaloniaList<object>)copyPasteStrip.Items;
+            Avalonia.Collections.AvaloniaList<object> list = new Avalonia.Collections.AvaloniaList<object>();
             list.AddRange(new MenuItem[] {
                             copyToolStripMenuItem,
                             pasteToolStripMenuItem});
 
+            copyPasteStrip.ItemsSource = list;
             copyToolStripMenuItem.Header = "Copy List Element: " + elementType.Name;
             pasteToolStripMenuItem.Header = "Insert List Element: " + elementType.Name;
 
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/AliasDataEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/AliasDataEditor.cs
index bc1db9c6..1ca0cfb7 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/AliasDataEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/AliasDataEditor.cs
@@ -34,7 +34,6 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
             }
             
             ComboBox cbValue = new SearchComboBox();
-            cbValue.VirtualizationMode = ItemVirtualizationMode.Simple;
             int chosenIndex = -1;
 
             List<string> items = new List<string>();
@@ -46,7 +45,7 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
             }
 
             var subject = new Subject<List<string>>();
-            cbValue.Bind(ComboBox.ItemsProperty, subject);
+            cbValue.Bind(ComboBox.ItemsSourceProperty, subject);
             subject.OnNext(items);
             if (chosenIndex > -1)
                 cbValue.SelectedIndex = chosenIndex;
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/AnimDataEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/AnimDataEditor.cs
index ef7e59ab..21824db3 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/AnimDataEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/AnimDataEditor.cs
@@ -27,7 +27,6 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
         {
             AnimAttribute animAtt = ReflectionExt.FindAttribute<AnimAttribute>(attributes);
             ComboBox cbValue = new SearchComboBox();
-            cbValue.VirtualizationMode = ItemVirtualizationMode.Simple;
             string choice = member;
 
             List<string> items = new List<string>();
@@ -45,7 +44,7 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
             }
 
             var subject = new Subject<List<string>>();
-            cbValue.Bind(ComboBox.ItemsProperty, subject);
+            cbValue.Bind(ComboBox.ItemsSourceProperty, subject);
             subject.OnNext(items);
             cbValue.SelectedIndex = chosenIndex;
             control.Children.Add(cbValue);
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/EntryDataEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/EntryDataEditor.cs
index ded92669..0017ec8d 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/EntryDataEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/EntryDataEditor.cs
@@ -28,7 +28,6 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
             DataTypeAttribute dataAtt = ReflectionExt.FindAttribute<DataTypeAttribute>(attributes);
 
             ComboBox cbValue = new SearchComboBox();
-            cbValue.VirtualizationMode = ItemVirtualizationMode.Simple;
 
 
             List<string> items = new List<string>();
@@ -46,7 +45,7 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
                 items.Add(key + ": " + nameIndex.Get(key).GetLocalString(true));
 
             var subject = new Subject<List<string>>();
-            cbValue.Bind(ComboBox.ItemsProperty, subject);
+            cbValue.Bind(ComboBox.ItemsSourceProperty, subject);
             subject.OnNext(items);
             cbValue.SelectedIndex = Math.Min(Math.Max(0, chosenIndex), items.Count - 1);
             control.Children.Add(cbValue);
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/FlagTypeEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/FlagTypeEditor.cs
index 716341dd..1e7155ae 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/FlagTypeEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/FlagTypeEditor.cs
@@ -57,7 +57,7 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
                 }
 
                 var subject = new Subject<List<string>>();
-                cbValue.Bind(ComboBox.ItemsProperty, subject);
+                cbValue.Bind(ComboBox.ItemsSourceProperty, subject);
                 subject.OnNext(items);
                 cbValue.SelectedIndex = selection;
 
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/FrameTypeEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/FrameTypeEditor.cs
index 90437a5c..2bf9557c 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/FrameTypeEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/FrameTypeEditor.cs
@@ -27,7 +27,6 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
             FrameTypeAttribute frameAtt = ReflectionExt.FindAttribute<FrameTypeAttribute>(attributes);
 
             ComboBox cbValue = new SearchComboBox();
-            cbValue.VirtualizationMode = ItemVirtualizationMode.Simple;
             int chosenIndex = 0;
 
             List<string> items = new List<string>();
@@ -42,7 +41,7 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
             }
 
             var subject = new Subject<List<string>>();
-            cbValue.Bind(ComboBox.ItemsProperty, subject);
+            cbValue.Bind(ComboBox.ItemsSourceProperty, subject);
             subject.OnNext(items);
             cbValue.SelectedIndex = Math.Min(Math.Max(0, chosenIndex), items.Count - 1);
             control.Children.Add(cbValue);
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/InvItemEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/InvItemEditor.cs
index 4bd1e46c..72b4ef0a 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/InvItemEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/InvItemEditor.cs
@@ -27,8 +27,6 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
 
             ComboBox cbItem = new SearchComboBox();
 
-            cbItem.VirtualizationMode = ItemVirtualizationMode.Simple;
-
             EntryDataIndex nameIndex = DataManager.Instance.DataIndices[DataManager.DataType.Item];
             List<string> itemKeys = nameIndex.GetOrderedKeys(false);
             int chosenItem = itemKeys.IndexOf(member.ID);
@@ -40,7 +38,7 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
 
             var itemsSubject = new Subject<List<string>>();
 
-            cbItem.Bind(ComboBox.ItemsProperty, itemsSubject);
+            cbItem.Bind(ComboBox.ItemsSourceProperty, itemsSubject);
             itemsSubject.OnNext(items);
 
             innerPanel1.ColumnDefinitions[0].Width = new GridLength(70);
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/MapItemEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/MapItemEditor.cs
index 02316fcd..70ece608 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/MapItemEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/MapItemEditor.cs
@@ -32,8 +32,7 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
             lblItem.HorizontalAlignment = Avalonia.Layout.HorizontalAlignment.Right;
 
             ComboBox cbItem = new SearchComboBox();
-
-            cbItem.VirtualizationMode = ItemVirtualizationMode.Simple;
+            
 
             EntryDataIndex nameIndex = DataManager.Instance.DataIndices[DataManager.DataType.Item];
             List<string> itemKeys = nameIndex.GetOrderedKeys(false);
@@ -50,7 +49,7 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
 
             var itemsSubject = new Subject<List<string>>();
 
-            cbItem.Bind(ComboBox.ItemsProperty, itemsSubject);
+            cbItem.Bind(ComboBox.ItemsSourceProperty, itemsSubject);
             itemsSubject.OnNext(items);
 
             innerPanel1.ColumnDefinitions[0].Width = new GridLength(70);
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/MonsterIDEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/MonsterIDEditor.cs
index 5e6f75fc..7417103d 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/MonsterIDEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/MonsterIDEditor.cs
@@ -37,8 +37,6 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
                 ComboBox cbSpecies = new SearchComboBox();
                 ComboBox cbForms = new SearchComboBox();
 
-                cbSpecies.VirtualizationMode = ItemVirtualizationMode.Simple;
-
                 EntryDataIndex nameIndex = DataManager.Instance.DataIndices[DataManager.DataType.Monster];
                 List<string> monsterKeys = nameIndex.GetOrderedKeys(false);
                 int chosenSpecies = monsterKeys.IndexOf(member.Species);
@@ -61,7 +59,7 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
                 var speciesSubject = new Subject<List<string>>();
                 var formSubject = new Subject<List<string>>();
 
-                cbSpecies.Bind(ComboBox.ItemsProperty, speciesSubject);
+                cbSpecies.Bind(ComboBox.ItemsSourceProperty, speciesSubject);
                 speciesSubject.OnNext(species);
                 cbSpecies.SelectedIndex = chosenSpecies;
                 cbSpecies.SelectionChanged += (object sender, SelectionChangedEventArgs e) =>
@@ -88,9 +86,7 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
                 innerPanel2.Children.Add(lblForm);
                 innerPanel2.ColumnDefinitions[0].Width = new GridLength(46);
                 lblForm.SetValue(Avalonia.Controls.Grid.ColumnProperty, 0);
-
-
-                cbForms.VirtualizationMode = ItemVirtualizationMode.Simple;
+                
                 int chosenForm = member.Form;
 
                 loadForms(dataAtt, (chosenSpecies < 0) ? "" : monsterKeys[chosenSpecies], forms);
@@ -98,7 +94,7 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
                 if (dataAtt != null && dataAtt.InvalidForm)
                     chosenForm++;
 
-                cbForms.Bind(ComboBox.ItemsProperty, formSubject);
+                cbForms.Bind(ComboBox.ItemsSourceProperty, formSubject);
                 formSubject.OnNext(forms);
                 cbForms.SelectedIndex = Math.Min(Math.Max(0, chosenForm), forms.Count - 1);
                 innerPanel2.Children.Add(cbForms);
@@ -119,7 +115,6 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
                 lblSkin.SetValue(Avalonia.Controls.Grid.ColumnProperty, 0);
 
                 ComboBox cbSkin = new SearchComboBox();
-                cbSkin.VirtualizationMode = ItemVirtualizationMode.Simple;
 
                 List<string> items = new List<string>();
                 if (dataAtt != null && dataAtt.InvalidSkin)
@@ -136,7 +131,7 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
                 }
 
                 var subject = new Subject<List<string>>();
-                cbSkin.Bind(ComboBox.ItemsProperty, subject);
+                cbSkin.Bind(ComboBox.ItemsSourceProperty, subject);
                 subject.OnNext(items);
                 cbSkin.SelectedIndex = Math.Min(Math.Max(0, chosenIndex), items.Count - 1);
                 innerPanel3.Children.Add(cbSkin);
@@ -154,7 +149,6 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
                 lblGender.SetValue(Avalonia.Controls.Grid.ColumnProperty, 2);
 
                 ComboBox cbGender = new SearchComboBox();
-                cbGender.VirtualizationMode = ItemVirtualizationMode.Simple;
                 int chosenIndex = (int)member.Gender;
 
                 List<string> items = new List<string>();
@@ -168,7 +162,7 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
                     items.Add(((Gender)ii).ToLocal());
 
                 var subject = new Subject<List<string>>();
-                cbGender.Bind(ComboBox.ItemsProperty, subject);
+                cbGender.Bind(ComboBox.ItemsSourceProperty, subject);
                 subject.OnNext(items);
                 cbGender.SelectedIndex = Math.Min(Math.Max(0, chosenIndex), items.Count - 1);
                 innerPanel3.Children.Add(cbGender);
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/MusicEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/MusicEditor.cs
index f03f265d..e0622c42 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/MusicEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/MusicEditor.cs
@@ -26,7 +26,6 @@ public class MusicEditor : StringEditor
         public override void LoadWindowControls(StackPanel control, string parent, Type parentType, string name, Type type, object[] attributes, String member, Type[] subGroupStack)
         {
             ComboBox cbValue = new SearchComboBox();
-            cbValue.VirtualizationMode = ItemVirtualizationMode.Simple;
             string choice = member;
 
             List<string> items = new List<string>();
@@ -44,7 +43,7 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
             }
 
             var subject = new Subject<List<string>>();
-            cbValue.Bind(ComboBox.ItemsProperty, subject);
+            cbValue.Bind(ComboBox.ItemsSourceProperty, subject);
             subject.OnNext(items);
             cbValue.SelectedIndex = chosenIndex;
             control.Children.Add(cbValue);
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/SoundEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/SoundEditor.cs
index c1ca6249..26562ae5 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/SoundEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/SoundEditor.cs
@@ -26,7 +26,6 @@ public class SoundEditor : StringEditor
         public override void LoadWindowControls(StackPanel control, string parent, Type parentType, string name, Type type, object[] attributes, String member, Type[] subGroupStack)
         {
             ComboBox cbValue = new SearchComboBox();
-            cbValue.VirtualizationMode = ItemVirtualizationMode.Simple;
             string choice = member;
 
             List<string> items = new List<string>();
@@ -44,7 +43,7 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
             }
 
             var subject = new Subject<List<string>>();
-            cbValue.Bind(ComboBox.ItemsProperty, subject);
+            cbValue.Bind(ComboBox.ItemsSourceProperty, subject);
             subject.OnNext(items);
             cbValue.SelectionChanged += CbValue_PlaySound;
             cbValue.SelectedIndex = chosenIndex;
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/StringKeyEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/StringKeyEditor.cs
index ae441c47..4e827bc4 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/StringKeyEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/StringKeyEditor.cs
@@ -28,7 +28,6 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
             StringKeyAttribute dataAtt = ReflectionExt.FindAttribute<StringKeyAttribute>(attributes);
 
             ComboBox cbValue = new SearchComboBox();
-            cbValue.VirtualizationMode = ItemVirtualizationMode.Simple;
 
             List<string> items = new List<string>();
 
@@ -49,7 +48,7 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
             }
 
             var subject = new Subject<List<string>>();
-            cbValue.Bind(ComboBox.ItemsProperty, subject);
+            cbValue.Bind(ComboBox.ItemsSourceProperty, subject);
             subject.OnNext(items);
             cbValue.SelectedIndex = Math.Min(Math.Max(0, chosenIndex), items.Count - 1);
             control.Children.Add(cbValue);
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Tiles/AutotileBrowser.axaml b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Tiles/AutotileBrowser.axaml
index 4577d42c..cd42fde1 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Tiles/AutotileBrowser.axaml
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Tiles/AutotileBrowser.axaml
@@ -41,7 +41,7 @@
         <ColumnDefinition/>
         <ColumnDefinition/>
       </Grid.ColumnDefinitions>
-      <ListBox SelectionMode="AlwaysSelected" Items="{Binding Associates}" SelectedIndex="{Binding ChosenAssociate}" Margin="4,2" Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" ToolTip.Tip="The actual list of associate tiles.">
+      <ListBox SelectionMode="AlwaysSelected" ItemsSource="{Binding Associates}" SelectedIndex="{Binding ChosenAssociate}" Margin="4,2" Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" ToolTip.Tip="The actual list of associate tiles.">
         <ListBox.ItemTemplate>
           <DataTemplate>
             <TextBlock Text="{Binding Converter={StaticResource DataEntryConverter}, ConverterParameter=1024}"/>
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Tiles/AutotileBrowser.axaml.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Tiles/AutotileBrowser.axaml.cs
index 6ef20da5..d095f7a1 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Tiles/AutotileBrowser.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Tiles/AutotileBrowser.axaml.cs
@@ -9,17 +9,12 @@
 
 namespace RogueEssence.Dev.Views
 {
-    public class AutotileBrowser : UserControl
+    public partial class AutotileBrowser : UserControl
     {
         public AutotileBrowser()
         {
             this.InitializeComponent();
         }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-
+        
     }
 }
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Tiles/TileBox.axaml.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Tiles/TileBox.axaml.cs
index 357a3515..c2b83b0f 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Tiles/TileBox.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Tiles/TileBox.axaml.cs
@@ -6,17 +6,11 @@
 
 namespace RogueEssence.Dev.Views
 {
-    public class TileBox : UserControl
+    public partial class TileBox : UserControl
     {
         public TileBox()
         {
             this.InitializeComponent();
         }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-
     }
 }
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Tiles/TileBrowser.axaml b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Tiles/TileBrowser.axaml
index d4a018ef..c38f442a 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Tiles/TileBrowser.axaml
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Tiles/TileBrowser.axaml
@@ -55,7 +55,7 @@
         </Grid.ColumnDefinitions>
         <TextBlock Margin="4" VerticalAlignment="Center" HorizontalAlignment="Right" Text="Frame Length:" Grid.Row="0" Grid.Column="0"/>
         <NumericUpDown Value="{Binding FrameLength}" Minimum="1" Margin="4" Grid.Row="0" Grid.Column="1" />
-        <ListBox SelectionMode="AlwaysSelected" Items="{Binding Frames}" SelectedIndex="{Binding ChosenFrame}" Margin="4" Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2">
+        <ListBox SelectionMode="AlwaysSelected" ItemsSource="{Binding Frames}" SelectedIndex="{Binding ChosenFrame}" Margin="4" Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2">
           <ListBox.ItemTemplate>
             <DataTemplate>
               <TextBlock Text="{Binding Converter={StaticResource FrameConverter}}"/>
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Tiles/TileBrowser.axaml.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Tiles/TileBrowser.axaml.cs
index ed85fc0e..29c909e3 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Tiles/TileBrowser.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Tiles/TileBrowser.axaml.cs
@@ -9,22 +9,16 @@
 
 namespace RogueEssence.Dev.Views
 {
-    public class TileBrowser : UserControl
+    public partial class TileBrowser : UserControl
     {
         public TileBrowser()
         {
             this.InitializeComponent();
         }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-
-
+    
         public void picTileset_Click(object sender, PointerPressedEventArgs e)
         {
-            PointerPoint pt = e.GetCurrentPoint((IVisual)sender);
+            PointerPoint pt = e.GetCurrentPoint((Visual)sender);
             TileBrowserViewModel vm = (TileBrowserViewModel)DataContext;
             
             Loc clickedLoc = new Loc((int)pt.Position.X / vm.TileSize, (int)pt.Position.Y / vm.TileSize);
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Tiles/TileEditForm.axaml.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Tiles/TileEditForm.axaml.cs
index 58969b4b..79e99dfc 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Tiles/TileEditForm.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Tiles/TileEditForm.axaml.cs
@@ -17,22 +17,13 @@
 
 namespace RogueEssence.Dev.Views
 {
-    public class TileEditForm : Window
+    public partial class TileEditForm : Window
     {
 
         public TileEditForm()
         {
             InitializeComponent();
-#if DEBUG
-            this.AttachDevTools();
-#endif
 
-
-        }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
         }
     }
 }
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/ArrayEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/ArrayEditor.cs
index e050b3ff..5b88ce20 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/ArrayEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/ArrayEditor.cs
@@ -105,7 +105,7 @@ public override Array SaveWindowControls(StackPanel control, string name, Type t
             //TODO: 2D array grid support
             //if (type.GetElementType().IsArray)
 
-            IControl lbxValue = control.Children[controlIndex];
+            Control lbxValue = control.Children[controlIndex];
             CollectionBoxViewModel mv = (CollectionBoxViewModel)lbxValue.DataContext;
             List<object> objList = (List<object>)mv.GetList(typeof(List<object>));
 
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/DictionaryEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/DictionaryEditor.cs
index b6cab4e3..6491eb93 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/DictionaryEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/DictionaryEditor.cs
@@ -97,10 +97,11 @@ public static ContextMenu CreateContextMenu(StackPanel control, Type type, Dicti
 
             MenuItem renameToolStripMenuItem = new MenuItem();
 
-            Avalonia.Collections.AvaloniaList<object> list = (Avalonia.Collections.AvaloniaList<object>)copyPasteStrip.Items;
+            Avalonia.Collections.AvaloniaList<object> list = new Avalonia.Collections.AvaloniaList<object>();
             list.AddRange(new MenuItem[] {
                             renameToolStripMenuItem});
 
+            copyPasteStrip.ItemsSource = list;
             renameToolStripMenuItem.Header = "Rename " + elementType.Name;
 
             renameToolStripMenuItem.Click += async (object copySender, RoutedEventArgs copyE) =>
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/EnumEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/EnumEditor.cs
index e4ded5e8..d2c5525d 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/EnumEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/EnumEditor.cs
@@ -60,7 +60,6 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
             {
                 //for enums, use a combobox
                 ComboBox cbValue = new SearchComboBox();
-                cbValue.VirtualizationMode = ItemVirtualizationMode.Simple;
 
                 List<string> items = new List<string>();
                 int selection = 0;
@@ -72,7 +71,7 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
                 }
 
                 var subject = new Subject<List<string>>();
-                cbValue.Bind(ComboBox.ItemsProperty, subject);
+                cbValue.Bind(ComboBox.ItemsSourceProperty, subject);
                 subject.OnNext(items);
                 cbValue.SelectedIndex = selection;
                 {
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/HashSetEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/HashSetEditor.cs
index febf70cb..b8cd4738 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/HashSetEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/HashSetEditor.cs
@@ -99,7 +99,7 @@ public override HashSet<T> SaveWindowControls(StackPanel control, string name, T
         {
             int controlIndex = 0;
 
-            IControl lbxValue = control.Children[controlIndex];
+            Control lbxValue = control.Children[controlIndex];
             HashSet<T> member = (HashSet<T>)Activator.CreateInstance(type);
             CollectionBoxViewModel mv = (CollectionBoxViewModel)lbxValue.DataContext;
             List<object> states = (List<object>)mv.GetList(typeof(List<object>));
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/ListEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/ListEditor.cs
index 0c698c4e..34d8ac57 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/ListEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/ListEditor.cs
@@ -67,11 +67,12 @@ public static ContextMenu CreateContextMenu(StackPanel control, Type type, Colle
             MenuItem copyToolStripMenuItem = new MenuItem();
             MenuItem pasteToolStripMenuItem = new MenuItem();
 
-            Avalonia.Collections.AvaloniaList<object> list = (Avalonia.Collections.AvaloniaList<object>)copyPasteStrip.Items;
+            Avalonia.Collections.AvaloniaList<object> list = new Avalonia.Collections.AvaloniaList<object>();
             list.AddRange(new MenuItem[] {
                             copyToolStripMenuItem,
                             pasteToolStripMenuItem});
 
+            copyPasteStrip.ItemsSource = list;
             copyToolStripMenuItem.Header = "Copy List Element: " + elementType.Name;
             pasteToolStripMenuItem.Header = "Insert List Element: " + elementType.Name;
 
@@ -142,7 +143,7 @@ public override IList SaveWindowControls(StackPanel control, string name, Type t
         {
             int controlIndex = 0;
 
-            IControl lbxValue = control.Children[controlIndex];
+            Control lbxValue = control.Children[controlIndex];
             CollectionBoxViewModel mv = (CollectionBoxViewModel)lbxValue.DataContext;
             return mv.GetList(type);
         }
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/NoDupeListEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/NoDupeListEditor.cs
index cc2dab81..0ce775a4 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/NoDupeListEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/NoDupeListEditor.cs
@@ -100,7 +100,7 @@ public override IList SaveWindowControls(StackPanel control, string name, Type t
         {
             int controlIndex = 0;
 
-            IControl lbxValue = control.Children[controlIndex];
+            Control lbxValue = control.Children[controlIndex];
             CollectionBoxViewModel mv = (CollectionBoxViewModel)lbxValue.DataContext;
             return mv.GetList(type);
         }
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/TypeEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/TypeEditor.cs
index 6db114b0..941a91dc 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/TypeEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/TypeEditor.cs
@@ -55,7 +55,7 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
             }
 
             var subject = new Subject<List<string>>();
-            cbValue.Bind(ComboBox.ItemsProperty, subject);
+            cbValue.Bind(ComboBox.ItemsSourceProperty, subject);
             subject.OnNext(items);
             cbValue.SelectedIndex = selection;
 
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/PriorityListBox.axaml b/RogueEssence.Editor.Avalonia/DataEditor/PriorityListBox.axaml
index 567093bc..28f3d818 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/PriorityListBox.axaml
+++ b/RogueEssence.Editor.Avalonia/DataEditor/PriorityListBox.axaml
@@ -23,7 +23,7 @@
       <ColumnDefinition/>
       <ColumnDefinition Width="30"/>
     </Grid.ColumnDefinitions>
-    <DataGrid Name="gridItems" IsReadOnly="true" Items="{Binding Collection}" SelectedIndex="{Binding SelectedIndex, Mode=TwoWay}" DoubleTapped="doubleClickStart" PointerReleased="lbxCollection_DoubleClick" Margin="4" Grid.RowSpan="3" Grid.ColumnSpan="2" MinHeight="50">
+    <DataGrid Name="gridItems" IsReadOnly="true" ItemsSource="{Binding Collection}" SelectedIndex="{Binding SelectedIndex, Mode=TwoWay}" DoubleTapped="doubleClickStart" PointerReleased="lbxCollection_DoubleClick" Margin="4" Grid.RowSpan="3" Grid.ColumnSpan="2" MinHeight="50">
       <DataGrid.Columns>
         <DataGridTextColumn Header="Priority"
                       Binding="{Binding PriorityObj}" />
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/PriorityListBox.axaml.cs b/RogueEssence.Editor.Avalonia/DataEditor/PriorityListBox.axaml.cs
index 9f09b3fb..abef21ea 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/PriorityListBox.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/PriorityListBox.axaml.cs
@@ -12,7 +12,7 @@
 
 namespace RogueEssence.Dev.Views
 {
-    public class PriorityListBox : UserControl
+    public partial class PriorityListBox : UserControl
     {
         public PriorityListBox()
         {
@@ -23,11 +23,7 @@ public PriorityListBox()
             Button editButton = this.FindControl<Button>("PriorityListBoxEditButton");
             editButton.AddHandler(PointerReleasedEvent, PriorityListBoxEditButton_OnPointerReleased, RoutingStrategies.Tunnel);
         }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
+        
 
         bool doubleclick;
         public void doubleClickStart(object sender, RoutedEventArgs e)
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/RangeDictBox.axaml b/RogueEssence.Editor.Avalonia/DataEditor/RangeDictBox.axaml
index 76fb57a0..4ddc66f2 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/RangeDictBox.axaml
+++ b/RogueEssence.Editor.Avalonia/DataEditor/RangeDictBox.axaml
@@ -28,7 +28,7 @@
       <Grid.ColumnDefinitions>
         <ColumnDefinition/>
       </Grid.ColumnDefinitions>
-      <DataGrid Name="gridItems" IsReadOnly="true" Items="{Binding Collection}" SelectedIndex="{Binding CurrentElement, Mode=TwoWay}" DoubleTapped="doubleClickStart" PointerReleased="lbxCollection_DoubleClick" Margin="4" Grid.RowSpan="2" Grid.ColumnSpan="2" MinHeight="60">
+      <DataGrid Name="gridItems" IsReadOnly="true" ItemsSource="{Binding Collection}" SelectedIndex="{Binding CurrentElement, Mode=TwoWay}" DoubleTapped="doubleClickStart" PointerReleased="lbxCollection_DoubleClick" Margin="4" Grid.RowSpan="2" Grid.ColumnSpan="2" MinHeight="60">
         <DataGrid.Columns>
           <DataGridTextColumn Header="Start"
                         Binding="{Binding DisplayStart}" />
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/RangeDictBox.axaml.cs b/RogueEssence.Editor.Avalonia/DataEditor/RangeDictBox.axaml.cs
index e866378a..bba066f3 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/RangeDictBox.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/RangeDictBox.axaml.cs
@@ -11,17 +11,13 @@
 
 namespace RogueEssence.Dev.Views
 {
-    public class RangeDictBox : UserControl
+    public partial class RangeDictBox : UserControl
     {
         public RangeDictBox()
         {
             this.InitializeComponent();
         }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
+        
 
         bool doubleclick;
         public void doubleClickStart(object sender, RoutedEventArgs e)
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/RankedCollectionBox.axaml b/RogueEssence.Editor.Avalonia/DataEditor/RankedCollectionBox.axaml
index 4204782a..631879a7 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/RankedCollectionBox.axaml
+++ b/RogueEssence.Editor.Avalonia/DataEditor/RankedCollectionBox.axaml
@@ -22,7 +22,7 @@
       <ColumnDefinition/>
       <ColumnDefinition Width="30"/>
     </Grid.ColumnDefinitions>
-    <DataGrid Name="gridItems" IsReadOnly="true" Items="{Binding Collection}" SelectedIndex="{Binding SelectedIndex, Mode=TwoWay}" DoubleTapped="doubleClickStart" PointerReleased="lbxCollection_DoubleClick" Margin="4" Grid.RowSpan="2" Grid.ColumnSpan="2" MinHeight="60">
+    <DataGrid Name="gridItems" IsReadOnly="true" ItemsSource="{Binding Collection}" SelectedIndex="{Binding SelectedIndex, Mode=TwoWay}" DoubleTapped="doubleClickStart" PointerReleased="lbxCollection_DoubleClick" Margin="4" Grid.RowSpan="2" Grid.ColumnSpan="2" MinHeight="60">
       <DataGrid.Columns>
         <DataGridTextColumn Header="#"
                       Binding="{Binding DisplayKey}" />
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/RankedCollectionBox.axaml.cs b/RogueEssence.Editor.Avalonia/DataEditor/RankedCollectionBox.axaml.cs
index a84cceb5..93e8ccec 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/RankedCollectionBox.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/RankedCollectionBox.axaml.cs
@@ -14,7 +14,7 @@
 
 namespace RogueEssence.Dev.Views
 {
-    public class RankedCollectionBox : UserControl
+    public partial class RankedCollectionBox : UserControl
     {
         public RankedCollectionBox()
         {
@@ -22,12 +22,7 @@ public RankedCollectionBox()
             Button button = this.FindControl<Button>("RankedCollectionBoxAddButton");
             button.AddHandler(PointerReleasedEvent, RankedCollectionBoxAddButton_OnPointerReleased, RoutingStrategies.Tunnel);
         }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-
+        
         //TODO: there has to be some way to set the ItemTemplate's text binding in code-behind...
         //public void SetConv(IValueConverter conv)
         //{
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/SpawnListBox.axaml b/RogueEssence.Editor.Avalonia/DataEditor/SpawnListBox.axaml
index f06f8fef..71165b34 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/SpawnListBox.axaml
+++ b/RogueEssence.Editor.Avalonia/DataEditor/SpawnListBox.axaml
@@ -33,7 +33,7 @@
         <ColumnDefinition/>
         <ColumnDefinition Width="40"/>
       </Grid.ColumnDefinitions>
-      <DataGrid Name="gridItems" IsReadOnly="true" Items="{Binding Collection}" SelectedIndex="{Binding CurrentElement, Mode=TwoWay}" DoubleTapped="doubleClickStart" PointerReleased="gridCollection_DoubleClick" Margin="4" Grid.RowSpan="2" Grid.ColumnSpan="1" MinHeight="50">
+      <DataGrid Name="gridItems" IsReadOnly="true" ItemsSource="{Binding Collection}" SelectedIndex="{Binding CurrentElement, Mode=TwoWay}" DoubleTapped="doubleClickStart" PointerReleased="gridCollection_DoubleClick" Margin="4" Grid.RowSpan="2" Grid.ColumnSpan="1" MinHeight="50">
         <DataGrid.Columns>
           <DataGridTextColumn Header="Weight"
                         Binding="{Binding Weight}" />
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/SpawnListBox.axaml.cs b/RogueEssence.Editor.Avalonia/DataEditor/SpawnListBox.axaml.cs
index ee06c2f0..d5d141fb 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/SpawnListBox.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/SpawnListBox.axaml.cs
@@ -12,7 +12,7 @@
 
 namespace RogueEssence.Dev.Views
 {
-    public class SpawnListBox : UserControl
+    public partial class SpawnListBox : UserControl
     {
         
         public SpawnListBox()
@@ -21,12 +21,7 @@ public SpawnListBox()
             Button button = this.FindControl<Button>("SpawnListBoxAddButton");
             button.AddHandler(PointerReleasedEvent, SpawnListBoxAddButton_OnPointerReleased, RoutingStrategies.Tunnel);
         }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-
+        
         bool doubleclick;
         public void doubleClickStart(object sender, RoutedEventArgs e)
         {
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/SpawnListViewBox.axaml b/RogueEssence.Editor.Avalonia/DataEditor/SpawnListViewBox.axaml
index 10611c8a..932ad34b 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/SpawnListViewBox.axaml
+++ b/RogueEssence.Editor.Avalonia/DataEditor/SpawnListViewBox.axaml
@@ -22,7 +22,7 @@
     <Grid.ColumnDefinitions>
       <ColumnDefinition/>
     </Grid.ColumnDefinitions>
-    <DataGrid IsReadOnly="true" Items="{Binding Collection}" SelectedIndex="{Binding CurrentElement, Mode=TwoWay}" Margin="4" Grid.RowSpan="2" Grid.ColumnSpan="1" MinHeight="50">
+    <DataGrid IsReadOnly="true" ItemsSource="{Binding Collection}" SelectedIndex="{Binding CurrentElement, Mode=TwoWay}" Margin="4" Grid.RowSpan="2" Grid.ColumnSpan="1" MinHeight="50">
       <DataGrid.Columns>
         <DataGridTextColumn Header="Chance"
                       Binding="{Binding Path=Chance, Converter={StaticResource PercentConverter}, Mode=OneWay}" />
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/SpawnListViewBox.axaml.cs b/RogueEssence.Editor.Avalonia/DataEditor/SpawnListViewBox.axaml.cs
index 7685edbd..e82f476b 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/SpawnListViewBox.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/SpawnListViewBox.axaml.cs
@@ -11,17 +11,12 @@
 
 namespace RogueEssence.Dev.Views
 {
-    public class SpawnListViewBox : UserControl
+    public partial class SpawnListViewBox : UserControl
     {
         
         public SpawnListViewBox()
         {
             this.InitializeComponent();
         }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
     }
 }
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/SpawnRangeListBox.axaml b/RogueEssence.Editor.Avalonia/DataEditor/SpawnRangeListBox.axaml
index ed6477e1..2d6b4288 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/SpawnRangeListBox.axaml
+++ b/RogueEssence.Editor.Avalonia/DataEditor/SpawnRangeListBox.axaml
@@ -31,7 +31,7 @@
         <ColumnDefinition/>
         <ColumnDefinition Width="40"/>
       </Grid.ColumnDefinitions>
-      <DataGrid Name="gridItems" IsReadOnly="true" Items="{Binding Collection}" SelectedIndex="{Binding CurrentElement, Mode=TwoWay}" DoubleTapped="doubleClickStart" PointerReleased="gridCollection_DoubleClick" Margin="4" Grid.RowSpan="2" Grid.ColumnSpan="1" MinHeight="50">
+      <DataGrid Name="gridItems" IsReadOnly="true" ItemsSource="{Binding Collection}" SelectedIndex="{Binding CurrentElement, Mode=TwoWay}" DoubleTapped="doubleClickStart" PointerReleased="gridCollection_DoubleClick" Margin="4" Grid.RowSpan="2" Grid.ColumnSpan="1" MinHeight="50">
         <DataGrid.Columns>
           <DataGridTextColumn Header="Start"
                         Binding="{Binding DisplayStart}" />
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/SpawnRangeListBox.axaml.cs b/RogueEssence.Editor.Avalonia/DataEditor/SpawnRangeListBox.axaml.cs
index d073aadf..a3100c08 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/SpawnRangeListBox.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/SpawnRangeListBox.axaml.cs
@@ -12,7 +12,7 @@
 
 namespace RogueEssence.Dev.Views
 {
-    public class SpawnRangeListBox : UserControl
+    public partial class SpawnRangeListBox : UserControl
     {
         
         public SpawnRangeListBox()
@@ -21,12 +21,7 @@ public SpawnRangeListBox()
             Button button = this.FindControl<Button>("SpawnRangeListBoxAddButton");
             button.AddHandler(PointerReleasedEvent, SpawnRangeListBoxAddButton_OnPointerReleased, RoutingStrategies.Tunnel);
         }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-
+        
         bool doubleclick;
         public void doubleClickStart(object sender, RoutedEventArgs e)
         {
diff --git a/RogueEssence.Editor.Avalonia/ReactiveExt.cs b/RogueEssence.Editor.Avalonia/ReactiveExt.cs
index f1c87e13..0c9a3bb7 100644
--- a/RogueEssence.Editor.Avalonia/ReactiveExt.cs
+++ b/RogueEssence.Editor.Avalonia/ReactiveExt.cs
@@ -42,10 +42,10 @@ public static void RaiseAndSet<TObj, TRet>(
             reactiveObject.RaisePropertyChanged(propertyName);
         }
 
-        public static ParentForm GetOwningForm(this IControl control)
+        public static ParentForm GetOwningForm(this Control control)
         {
             while (control.Parent != null)
-                control = control.Parent;
+                control = (Control) control.Parent;
             return (ParentForm)control;
         }
     }
diff --git a/RogueEssence.Editor.Avalonia/RogueEssence.Editor.Avalonia.csproj b/RogueEssence.Editor.Avalonia/RogueEssence.Editor.Avalonia.csproj
index 49ba75c1..b43319cc 100644
--- a/RogueEssence.Editor.Avalonia/RogueEssence.Editor.Avalonia.csproj
+++ b/RogueEssence.Editor.Avalonia/RogueEssence.Editor.Avalonia.csproj
@@ -10,11 +10,12 @@
     <AvaloniaResource Include="Assets\**" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="0.10.0" />
-    <PackageReference Include="Avalonia.Controls.DataGrid" Version="0.10.0" />
-    <PackageReference Include="Avalonia.Desktop" Version="0.10.0" />
-    <PackageReference Include="Avalonia.Diagnostics" Version="0.10.0" />
-    <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.0" />
+    <PackageReference Include="Avalonia" Version="11.2.0" />
+    <PackageReference Include="Avalonia.Controls.DataGrid" Version="11.2.0" />
+    <PackageReference Include="Avalonia.Desktop" Version="11.2.0" />
+    <PackageReference Include="Avalonia.Diagnostics" Version="11.2.0" />
+    <PackageReference Include="Avalonia.ReactiveUI" Version="11.2.0" />
+    <PackageReference Include="Avalonia.Themes.Simple" Version="11.2.0" />
     <PackageReference Include="ResXResourceReader.NetStandard" Version="1.0.1" />
   </ItemGroup>
   <ItemGroup>
diff --git a/RogueEssence.Editor.Avalonia/ViewLocator.cs b/RogueEssence.Editor.Avalonia/ViewLocator.cs
index c86ebad7..82688454 100644
--- a/RogueEssence.Editor.Avalonia/ViewLocator.cs
+++ b/RogueEssence.Editor.Avalonia/ViewLocator.cs
@@ -9,7 +9,7 @@ public class ViewLocator : IDataTemplate
     {
         public bool SupportsRecycling => false;
 
-        public IControl Build(object data)
+        public Control Build(object data)
         {
             var name = data.GetType().FullName.Replace("ViewModel", "View");
             var type = Type.GetType(name);
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevTabDataViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevTabDataViewModel.cs
index a6a6a3a0..1c75487a 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevTabDataViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevTabDataViewModel.cs
@@ -469,10 +469,11 @@ public static ContextMenu CreateContextMenu(DataListFormViewModel vm)
             MenuItem saveAsFileMenuItem = new MenuItem();
             MenuItem saveAsDiffMenuItem = new MenuItem();
 
-            Avalonia.Collections.AvaloniaList<object> list = (Avalonia.Collections.AvaloniaList<object>)saveAsStrip.Items;
+            Avalonia.Collections.AvaloniaList<object> list = new Avalonia.Collections.AvaloniaList<object>();
             list.AddRange(new MenuItem[] {
                             saveAsFileMenuItem,
                             saveAsDiffMenuItem});
+            saveAsStrip.ItemsSource = list;
 
             saveAsFileMenuItem.Header = "Resave as File";
             saveAsDiffMenuItem.Header = "Resave as Patch";
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/EntScriptItem.cs b/RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/EntScriptItem.cs
index b537da51..09b0f2a6 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/EntScriptItem.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/EntScriptItem.cs
@@ -43,7 +43,7 @@ public string Definition
 
         public async void mnuCopyFun_Click()
         {
-            await Application.Current.Clipboard.SetTextAsync(Definition);
+            App.CopyText(Definition);
         }
 
         private GroundEntity baseEnt;
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/GroundEditViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/GroundEditViewModel.cs
index cd6d5b42..87119596 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/GroundEditViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/GroundEditViewModel.cs
@@ -17,6 +17,7 @@
 using System.Collections.ObjectModel;
 using System.Diagnostics;
 using System.Threading.Tasks;
+using Avalonia.Platform.Storage;
 
 namespace RogueEssence.Dev.ViewModels
 {
@@ -79,11 +80,10 @@ public async void mnuOpen_Click()
             filter.Name = "Ground Files";
             filter.Extensions.Add(DataManager.GROUND_EXT.Substring(1));
             openFileDialog.Filters.Add(filter);
-
             DevForm form = (DevForm)DiagManager.Instance.DevEditor;
-
+            
             string[] results = await openFileDialog.ShowAsync(form.GroundEditForm);
-
+            
             if (results != null && results.Length > 0)
             {
                 bool legalPath = false;
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/ScriptItem.cs b/RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/ScriptItem.cs
index 6c17c524..062a69a1 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/ScriptItem.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/ScriptItem.cs
@@ -41,7 +41,8 @@ public string Definition
 
         public async void mnuCopyFun_Click()
         {
-            await Application.Current.Clipboard.SetTextAsync(Definition);
+            // await Application.Current.Clipboard.SetTextAsync(Definition);
+            App.CopyText(Definition);
         }
     }
 }
diff --git a/RogueEssence.Editor.Avalonia/Views/Content/AnimEditForm.axaml.cs b/RogueEssence.Editor.Avalonia/Views/Content/AnimEditForm.axaml.cs
index ee3725fe..e1be2953 100644
--- a/RogueEssence.Editor.Avalonia/Views/Content/AnimEditForm.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/Content/AnimEditForm.axaml.cs
@@ -13,23 +13,14 @@
 
 namespace RogueEssence.Dev.Views
 {
-    public class AnimEditForm : Window
+    public partial class AnimEditForm : Window
     {
 
         public AnimEditForm()
         {
             InitializeComponent();
-#if DEBUG
-            this.AttachDevTools();
-#endif
         }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-
-
+        
         public void Window_Closed(object sender, EventArgs e)
         {
             lock (GameBase.lockObj)
diff --git a/RogueEssence.Editor.Avalonia/Views/Content/SpeciesEditForm.axaml b/RogueEssence.Editor.Avalonia/Views/Content/SpeciesEditForm.axaml
index 5f442c4a..eadb4147 100644
--- a/RogueEssence.Editor.Avalonia/Views/Content/SpeciesEditForm.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/Content/SpeciesEditForm.axaml
@@ -36,7 +36,7 @@
         <ColumnDefinition/>
         <ColumnDefinition/>
       </Grid.ColumnDefinitions>
-      <TreeView Items="{Binding Monsters}" SelectedItem="{Binding ChosenMonster}" SelectionMode="AlwaysSelected" Margin="4" Grid.ColumnSpan="4">
+      <TreeView ItemsSource="{Binding Monsters}" SelectedItem="{Binding ChosenMonster}" SelectionMode="AlwaysSelected" Margin="4" Grid.ColumnSpan="4">
         <TreeView.DataTemplates>
           <TreeDataTemplate DataType="vm:MonsterNodeViewModel" ItemsSource="{Binding Nodes}">
             <Grid>
@@ -50,7 +50,7 @@
           </TreeDataTemplate>
         </TreeView.DataTemplates>
         <TreeView.ContextMenu>
-          <ContextMenu Items="{Binding OpList}">
+          <ContextMenu ItemsSource="{Binding OpList}">
             <ContextMenu.Styles>
               <Style Selector="MenuItem">
                 <Setter Property="Header" Value="{Binding Name}"/>
diff --git a/RogueEssence.Editor.Avalonia/Views/Content/SpeciesEditForm.axaml.cs b/RogueEssence.Editor.Avalonia/Views/Content/SpeciesEditForm.axaml.cs
index 11c53751..b72076e3 100644
--- a/RogueEssence.Editor.Avalonia/Views/Content/SpeciesEditForm.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/Content/SpeciesEditForm.axaml.cs
@@ -12,21 +12,12 @@
 
 namespace RogueEssence.Dev.Views
 {
-    public class SpeciesEditForm : Window
+    public partial class SpeciesEditForm : Window
     {
 
         public SpeciesEditForm()
         {
             InitializeComponent();
-#if DEBUG
-            this.AttachDevTools();
-#endif
         }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-
     }
 }
diff --git a/RogueEssence.Editor.Avalonia/Views/Content/StringsEditForm.axaml b/RogueEssence.Editor.Avalonia/Views/Content/StringsEditForm.axaml
index a4533c24..df56604c 100644
--- a/RogueEssence.Editor.Avalonia/Views/Content/StringsEditForm.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/Content/StringsEditForm.axaml
@@ -25,7 +25,7 @@
         <ColumnDefinition/>
         <ColumnDefinition/>
       </Grid.ColumnDefinitions>
-      <DataGrid Grid.ColumnSpan="3" Items="{Binding GameStrings}" SelectedIndex="{Binding CurrentString, Mode=TwoWay}"
+      <DataGrid Grid.ColumnSpan="3" ItemsSource="{Binding GameStrings}" SelectedIndex="{Binding CurrentString, Mode=TwoWay}"
                 CanUserResizeColumns="True" HorizontalScrollBarVisibility="Disabled" Margin="4">
 
         <DataGrid.Styles>
diff --git a/RogueEssence.Editor.Avalonia/Views/Content/StringsEditForm.axaml.cs b/RogueEssence.Editor.Avalonia/Views/Content/StringsEditForm.axaml.cs
index 61d6a5f0..803f78d9 100644
--- a/RogueEssence.Editor.Avalonia/Views/Content/StringsEditForm.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/Content/StringsEditForm.axaml.cs
@@ -13,22 +13,12 @@
 
 namespace RogueEssence.Dev.Views
 {
-    public class StringsEditForm : Window
+    public partial class StringsEditForm : Window
     {
 
         public StringsEditForm()
         {
             InitializeComponent();
-#if DEBUG
-            this.AttachDevTools();
-#endif
         }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-
-
     }
 }
diff --git a/RogueEssence.Editor.Avalonia/Views/Content/TilesetEditForm.axaml.cs b/RogueEssence.Editor.Avalonia/Views/Content/TilesetEditForm.axaml.cs
index faf6a323..44919bc3 100644
--- a/RogueEssence.Editor.Avalonia/Views/Content/TilesetEditForm.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/Content/TilesetEditForm.axaml.cs
@@ -13,20 +13,12 @@
 
 namespace RogueEssence.Dev.Views
 {
-    public class TilesetEditForm : Window
+    public partial class TilesetEditForm : Window
     {
 
         public TilesetEditForm()
         {
             InitializeComponent();
-#if DEBUG
-            this.AttachDevTools();
-#endif
-        }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
         }
     }
 }
diff --git a/RogueEssence.Editor.Avalonia/Views/DataListForm.axaml b/RogueEssence.Editor.Avalonia/Views/DataListForm.axaml
index dc7f104d..4ff7d6c1 100644
--- a/RogueEssence.Editor.Avalonia/Views/DataListForm.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/DataListForm.axaml
@@ -19,12 +19,12 @@
       </MenuItem>
     </Menu-->
 
-    <Menu DockPanel.Dock="Top" Items="{Binding OpList}">
+    <Menu DockPanel.Dock="Top" ItemsSource="{Binding OpList}">
       <Menu.Styles>
         <Style Selector="MenuItem">
           <Setter Property="Header" Value="{Binding Name}"/>
           <Setter Property="Command" Value="{Binding Command}"/>
-          <Setter Property="Items" Value="{Binding Items}"/>
+          <Setter Property="ItemsSource" Value="{Binding Items}"/>
         </Style>
       </Menu.Styles>
     </Menu>
diff --git a/RogueEssence.Editor.Avalonia/Views/DataListForm.axaml.cs b/RogueEssence.Editor.Avalonia/Views/DataListForm.axaml.cs
index da8caf43..16d39fc0 100644
--- a/RogueEssence.Editor.Avalonia/Views/DataListForm.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/DataListForm.axaml.cs
@@ -12,22 +12,14 @@
 
 namespace RogueEssence.Dev.Views
 {
-    public class DataListForm : Window
+    public partial class DataListForm : Window
     {
 
         public DataListForm()
         {
             InitializeComponent();
-#if DEBUG
-            this.AttachDevTools();
-#endif
         }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-
+        
         public void SetListContextMenu(ContextMenu menu)
         {
             SearchListBox lbx = this.FindControl<SearchListBox>("lbxItems");
diff --git a/RogueEssence.Editor.Avalonia/Views/DevForm/DevForm.axaml.cs b/RogueEssence.Editor.Avalonia/Views/DevForm/DevForm.axaml.cs
index ae5ef793..1cf7d341 100644
--- a/RogueEssence.Editor.Avalonia/Views/DevForm/DevForm.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/DevForm/DevForm.axaml.cs
@@ -17,7 +17,7 @@
 
 namespace RogueEssence.Dev.Views
 {
-    public class DevForm : Window, IRootEditor
+    public partial class DevForm : Window, IRootEditor
     {
         public bool LoadComplete { get; private set; }
 
@@ -40,16 +40,8 @@ public class DevForm : Window, IRootEditor
         public DevForm()
         {
             InitializeComponent();
-#if DEBUG
-            this.AttachDevTools();
-#endif
         }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-
+        
         void IRootEditor.Load(GameBase game)
         {
             ExecuteOrInvoke(load);
diff --git a/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabConstants.axaml.cs b/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabConstants.axaml.cs
index 012310a8..4656d618 100644
--- a/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabConstants.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabConstants.axaml.cs
@@ -4,16 +4,11 @@
 
 namespace RogueEssence.Dev.Views
 {
-    public class DevTabConstants : UserControl
+    public partial class DevTabConstants : UserControl
     {
         public DevTabConstants()
         {
             this.InitializeComponent();
         }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
     }
 }
diff --git a/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabData.axaml.cs b/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabData.axaml.cs
index aeac4d4b..85b43b25 100644
--- a/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabData.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabData.axaml.cs
@@ -4,16 +4,11 @@
 
 namespace RogueEssence.Dev.Views
 {
-    public class DevTabData : UserControl
+    public partial class DevTabData : UserControl
     {
         public DevTabData()
         {
             this.InitializeComponent();
         }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
     }
 }
diff --git a/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabGame.axaml b/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabGame.axaml
index 29876c95..507b8891 100644
--- a/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabGame.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabGame.axaml
@@ -30,15 +30,29 @@
       <CheckBox Name="chkSprites" Margin="4" IsChecked="{Binding HideSprites}" VerticalAlignment="Center" Grid.Row="0" Grid.Column="1">Hide Sprites</CheckBox>
       <Button Name="btnSpawnClone" Command="{Binding btnSpawn_Click}" Margin="4" Grid.Row="1" Grid.Column="0">Create Clone</Button>
       <Button Name="btnDespawnAll" Command="{Binding btnDespawn_Click}" Margin="4" Grid.Row="1" Grid.Column="1">Clear All Foes</Button>
-      <views:SearchComboBox Name="cbSkills" Items="{Binding Skills}" SelectedIndex="{Binding ChosenSkill}" VirtualizationMode="Simple" Margin="4" Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2"/>
+      <views:SearchComboBox Name="cbSkills" ItemsSource="{Binding Skills}" SelectedIndex="{Binding ChosenSkill}" Margin="4" Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2"/>
       <Button Name="btnLearnSkill" Command="{Binding btnLearnSkill_Click}" Margin="4" Grid.Row="3" Grid.Column="0">Learn Skill</Button>
       <Button Name="btnGiveSkill" Command="{Binding btnGiveSkill_Click}" Margin="4" Grid.Row="3" Grid.Column="1">Teach Foes</Button>
-      <views:SearchComboBox Name="cbIntrinsics" Items="{Binding Intrinsics}" SelectedIndex="{Binding ChosenIntrinsic}" VirtualizationMode="Simple" Margin="4" Grid.Row="4" Grid.Column="0" Grid.ColumnSpan="2"/>
+      <views:SearchComboBox Name="cbIntrinsics" ItemsSource="{Binding Intrinsics}" SelectedIndex="{Binding ChosenIntrinsic}" Margin="4" Grid.Row="4" Grid.Column="0" Grid.ColumnSpan="2"/>
       <Button Name="btnSetIntrinsic" Command="{Binding btnSetIntrinsic_Click}" Margin="4" Grid.Row="5" Grid.Column="0">Set Intrinsic</Button>
       <Button Name="btnGiveFoes" Command="{Binding btnGiveFoes_Click}" Margin="4" Grid.Row="5" Grid.Column="1">Give Foes</Button>
-      <views:SearchComboBox Name="cbStatus" Items="{Binding Statuses}" SelectedIndex="{Binding ChosenStatus}" VirtualizationMode="Simple" Margin="4" Grid.Row="6" Grid.Column="0" Grid.ColumnSpan="2"/>
+      <views:SearchComboBox Name="cbStatus" ItemsSource="{Binding Statuses}" SelectedIndex="{Binding ChosenStatus}" Margin="4" Grid.Row="6" Grid.Column="0" Grid.ColumnSpan="2"/>
       <Button Name="btnToggleStatus" Command="{Binding btnToggleStatus_Click}" Margin="4" Grid.Row="7" Grid.Column="0" Grid.ColumnSpan="2">Toggle Status</Button>
-      <views:SearchComboBox Name="cbSpawnItem" Items="{Binding Items}" SelectedIndex="{Binding ChosenItem}" VirtualizationMode="Simple" Margin="4" Grid.Row="8" Grid.Column="0" Grid.ColumnSpan="2"/>
+      <views:SearchComboBox 
+        Name="cbSpawnItem" 
+        ItemsSource="{Binding Items}" 
+        SelectedIndex="{Binding ChosenItem}" 
+        Margin="4" 
+        Grid.Row="8" 
+        Grid.Column="0" 
+        Grid.ColumnSpan="2">
+        <ComboBox.ItemsPanel>
+          <ItemsPanelTemplate>
+            <!-- Using VirtualizingStackPanel to enable virtualization -->
+            <VirtualizingStackPanel />
+          </ItemsPanelTemplate>
+        </ComboBox.ItemsPanel>
+      </views:SearchComboBox>
       <Button Name="btnSpawnItem" Command="{Binding btnSpawnItem_Click}" Margin="4" Grid.Row="10" Grid.ColumnSpan="2">Create Item</Button>
     </Grid>
 </UserControl>
diff --git a/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabGame.axaml.cs b/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabGame.axaml.cs
index e8594d99..3470f64d 100644
--- a/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabGame.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabGame.axaml.cs
@@ -4,16 +4,11 @@
 
 namespace RogueEssence.Dev.Views
 {
-    public class DevTabGame : UserControl
+    public partial class DevTabGame : UserControl
     {
         public DevTabGame()
         {
             this.InitializeComponent();
         }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
     }
 }
diff --git a/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabMods.axaml b/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabMods.axaml
index 9a368a9b..9f119069 100644
--- a/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabMods.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabMods.axaml
@@ -25,7 +25,7 @@
     </Grid.ColumnDefinitions>
     <TextBlock VerticalAlignment="Bottom" Text="{Binding CurrentMod, Converter={StaticResource NullableToStringConverter}, StringFormat=Currently Editing Mod: {0}}" Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2"></TextBlock>
     <Button Command="{Binding btnEdit_Click}" IsEnabled="{Binding CurrentMod, Converter={x:Static StringConverters.IsNotNullOrEmpty}}" Margin="4" Grid.Row="0" Grid.Column="2">Edit</Button>
-    <TreeView Items="{Binding Mods}" SelectedItem="{Binding ChosenMod}" SelectionMode="AlwaysSelected" Margin="4" Grid.Row="1" Grid.ColumnSpan="3">
+    <TreeView ItemsSource="{Binding Mods}" SelectedItem="{Binding ChosenMod}" SelectionMode="AlwaysSelected" Margin="4" Grid.Row="1" Grid.ColumnSpan="3">
       <TreeView.DataTemplates>
         <TreeDataTemplate DataType="vm:ModsNodeViewModel" ItemsSource="{Binding Nodes}">
           <TextBlock VerticalAlignment="Center">
diff --git a/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabMods.axaml.cs b/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabMods.axaml.cs
index a0c50e3c..d11d9e5d 100644
--- a/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabMods.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabMods.axaml.cs
@@ -6,17 +6,11 @@
 
 namespace RogueEssence.Dev.Views
 {
-    public class DevTabMods : UserControl
+    public partial class DevTabMods : UserControl
     {
         public DevTabMods()
         {
             this.InitializeComponent();
         }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-
     }
 }
diff --git a/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabPlayer.axaml b/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabPlayer.axaml
index c2aed6e4..0ac9fac8 100644
--- a/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabPlayer.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabPlayer.axaml
@@ -37,7 +37,7 @@
         <ColumnDefinition/>
         <ColumnDefinition Width="40"/>
       </Grid.ColumnDefinitions>
-	  <views:SearchComboBox Name="cbDexNum" Items="{Binding Monsters}" SelectedIndex="{Binding ChosenMonster}" VirtualizationMode="Simple" Margin="4"/>
+	  <views:SearchComboBox Name="cbDexNum" ItemsSource="{Binding Monsters}" SelectedIndex="{Binding ChosenMonster}" Margin="4"/>
 	  <Button Name="btnChangeOrder" Command="{Binding btnChangeOrder_Click}" Margin="4" Grid.Column="1" ToolTip.Tip="Switch Ordering">
         <Panel>
           <Image Source="/Assets/AssetOrder.png" Width="26"
@@ -46,13 +46,13 @@
 	  </Button>
     </Grid>
     <TextBlock Margin="4,0" VerticalAlignment="Bottom" Grid.Row="4">Form</TextBlock>
-	  <views:SearchComboBox Name="cbForm" Items="{Binding Forms}" SelectedIndex="{Binding ChosenForm}" Margin="4" Grid.Row="5" Grid.ColumnSpan="2"/>
+	  <views:SearchComboBox Name="cbForm" ItemsSource="{Binding Forms}" SelectedIndex="{Binding ChosenForm}" Margin="4" Grid.Row="5" Grid.ColumnSpan="2"/>
     <TextBlock Margin="4,0" VerticalAlignment="Bottom" Grid.Row="6" Grid.Column="0">Skin</TextBlock>
     <TextBlock Margin="4,0" VerticalAlignment="Bottom" Grid.Row="6" Grid.Column="1" >Gender</TextBlock>
-    <views:SearchComboBox Name="cbSkin" Items="{Binding Skins}" SelectedIndex="{Binding ChosenSkin}" Margin="4" Grid.Row="7" Grid.Column="0"/>
-    <views:SearchComboBox Name="cbGender" Items="{Binding Genders}" SelectedIndex="{Binding ChosenGender}" Margin="4" Grid.Row="7" Grid.Column="1"/>
+    <views:SearchComboBox Name="cbSkin" ItemsSource="{Binding Skins}" SelectedIndex="{Binding ChosenSkin}" Margin="4" Grid.Row="7" Grid.Column="0"/>
+    <views:SearchComboBox Name="cbGender" ItemsSource="{Binding Genders}" SelectedIndex="{Binding ChosenGender}" Margin="4" Grid.Row="7" Grid.Column="1"/>
     <TextBlock Margin="4,0" VerticalAlignment="Bottom" Grid.Row="8" Grid.Column="0">Animation</TextBlock>
-    <views:SearchComboBox Name="cbAnim" Items="{Binding Anims}" SelectedIndex="{Binding ChosenAnim}" Margin="4" Grid.Row="9" Grid.Column="0" Grid.ColumnSpan="2"/>
+    <views:SearchComboBox Name="cbAnim" ItemsSource="{Binding Anims}" SelectedIndex="{Binding ChosenAnim}" Margin="4" Grid.Row="9" Grid.Column="0" Grid.ColumnSpan="2"/>
     <CheckBox Name="chkJustMe" Margin="4" IsChecked="{Binding JustMe}" VerticalAlignment="Center" Grid.Row="10" Grid.Column="0">Just Me</CheckBox>
     <CheckBox Name="chkJustOnce" Margin="4" IsChecked="{Binding JustOnce}" VerticalAlignment="Center" Grid.Row="10" Grid.Column="1">Just Once</CheckBox>
     <Button Name="btnResetAnim" Command="{Binding btnResetAnim_Click}" Margin="4" Grid.Row="11" Grid.Column="0" Grid.ColumnSpan="2">Restart All Anims</Button>
diff --git a/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabPlayer.axaml.cs b/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabPlayer.axaml.cs
index 65eb8bac..95bb67b5 100644
--- a/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabPlayer.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabPlayer.axaml.cs
@@ -4,18 +4,11 @@
 
 namespace RogueEssence.Dev.Views
 {
-    public class DevTabPlayer : UserControl
+    public partial class DevTabPlayer : UserControl
     {
         public DevTabPlayer()
         {
             this.InitializeComponent();
         }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-
-
     }
 }
diff --git a/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabScript.axaml.cs b/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabScript.axaml.cs
index e909c707..e355e11d 100644
--- a/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabScript.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabScript.axaml.cs
@@ -6,19 +6,13 @@
 
 namespace RogueEssence.Dev.Views
 {
-    public class DevTabScript : UserControl
+    public partial class DevTabScript : UserControl
     {
         public DevTabScript()
         {
             this.InitializeComponent();
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-
-
         public void txtScriptInput_KeyDown(object sender, KeyEventArgs args)
         {
             if ((args.KeyModifiers & KeyModifiers.Shift) != KeyModifiers.None || (args.KeyModifiers & KeyModifiers.Control) != KeyModifiers.None)
diff --git a/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabSprites.axaml.cs b/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabSprites.axaml.cs
index 36f71a80..a73be737 100644
--- a/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabSprites.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabSprites.axaml.cs
@@ -4,16 +4,11 @@
 
 namespace RogueEssence.Dev.Views
 {
-    public class DevTabSprites : UserControl
+    public partial class DevTabSprites : UserControl
     {
         public DevTabSprites()
         {
             this.InitializeComponent();
         }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
     }
 }
diff --git a/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabTravel.axaml b/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabTravel.axaml
index c5a92a74..7bb3d87c 100644
--- a/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabTravel.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabTravel.axaml
@@ -32,14 +32,14 @@
     <Button Margin="4" Command="{Binding btnReloadMap_Click}" Grid.Row="0" Grid.ColumnSpan="2">Reload Current Map</Button>
     <CheckBox Name="chkDebugGen" Margin="4" IsChecked="{Binding DebugGen}" VerticalAlignment="Center" Grid.Row="1" Grid.ColumnSpan="2">Show Generation Steps</CheckBox>
     <TextBlock Margin="4,0" VerticalAlignment="Bottom" Grid.Row="2">Zone:</TextBlock>
-    <views:SearchComboBox Margin="4" Items="{Binding Zones}" SelectedIndex="{Binding ChosenZone}" VirtualizationMode="Simple" Grid.Row="3" Grid.ColumnSpan="2"/>
+    <views:SearchComboBox Margin="4" ItemsSource="{Binding Zones}" SelectedIndex="{Binding ChosenZone}" Grid.Row="3" Grid.ColumnSpan="2"/>
     <TextBlock Margin="4,0" VerticalAlignment="Bottom" Grid.Row="4" Grid.ColumnSpan="2" >Structure:</TextBlock>
-    <views:SearchComboBox Margin="4" Items="{Binding Structures}" IsEnabled="{Binding Path=Structures, Converter={StaticResource ListNotEmptyConverter}}" SelectedIndex="{Binding ChosenStructure}" Grid.Row="5" Grid.ColumnSpan="2" />
+    <views:SearchComboBox Margin="4" ItemsSource="{Binding Structures}" IsEnabled="{Binding Path=Structures, Converter={StaticResource ListNotEmptyConverter}}" SelectedIndex="{Binding ChosenStructure}" Grid.Row="5" Grid.ColumnSpan="2" />
     <TextBlock Margin="4,0" VerticalAlignment="Bottom" Grid.Row="6" Grid.Column="0">Ground:</TextBlock>
-    <views:SearchComboBox Margin="4" Items="{Binding Grounds}" SelectedIndex="{Binding ChosenGround}" IsEnabled="{Binding Path=Grounds, Converter={StaticResource ListNotEmptyConverter}}" VirtualizationMode="Simple" Grid.Row="7" Grid.Column="0"/>
+    <views:SearchComboBox Margin="4" ItemsSource="{Binding Grounds}" SelectedIndex="{Binding ChosenGround}" IsEnabled="{Binding Path=Grounds, Converter={StaticResource ListNotEmptyConverter}}" Grid.Row="7" Grid.Column="0"/>
     <Button Margin="4" Command="{Binding btnEnterGround_Click}" IsEnabled="{Binding Path=Grounds, Converter={StaticResource ListNotEmptyConverter}}" Grid.Row="8" Grid.Column="0">Enter Ground</Button>
     <TextBlock Margin="4,0" VerticalAlignment="Bottom" Grid.Row="6" Grid.Column="1" >Floor:</TextBlock>
-    <views:SearchComboBox Margin="4" Items="{Binding Floors}" IsEnabled="{Binding Path=Floors, Converter={StaticResource ListNotEmptyConverter}}" SelectedIndex="{Binding ChosenFloor}" VirtualizationMode="Simple" Grid.Row="7" Grid.Column="1"/>
+    <views:SearchComboBox Margin="4" ItemsSource="{Binding Floors}" IsEnabled="{Binding Path=Floors, Converter={StaticResource ListNotEmptyConverter}}" SelectedIndex="{Binding ChosenFloor}" Grid.Row="7" Grid.Column="1"/>
     <Button Margin="4" Command="{Binding btnEnterDungeon_Click}" IsEnabled="{Binding Path=Floors, Converter={StaticResource ListNotEmptyConverter}}" Grid.Row="8" Grid.Column="1">Enter Map</Button>
   </Grid>
 </UserControl>
diff --git a/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabTravel.axaml.cs b/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabTravel.axaml.cs
index f999c2df..5f18c843 100644
--- a/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabTravel.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabTravel.axaml.cs
@@ -4,18 +4,12 @@
 
 namespace RogueEssence.Dev.Views
 {
-    public class DevTabTravel : UserControl
+    public partial class DevTabTravel : UserControl
     {
         public DevTabTravel()
         {
             this.InitializeComponent();
         }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-
-
+        
     }
 }
diff --git a/RogueEssence.Editor.Avalonia/Views/DialogBoxes/AnimChoiceWindow.axaml b/RogueEssence.Editor.Avalonia/Views/DialogBoxes/AnimChoiceWindow.axaml
index d03306ff..ff31bb07 100644
--- a/RogueEssence.Editor.Avalonia/Views/DialogBoxes/AnimChoiceWindow.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/DialogBoxes/AnimChoiceWindow.axaml
@@ -19,7 +19,7 @@
       <ColumnDefinition/>
       <ColumnDefinition/>
     </Grid.ColumnDefinitions>
-    <views:SearchComboBox Items="{Binding Anims}" SelectedIndex="{Binding ChosenAnim}" Margin="4" Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2"/>
+    <views:SearchComboBox ItemsSource="{Binding Anims}" SelectedIndex="{Binding ChosenAnim}" Margin="4" Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2"/>
     <Button Click="btnOK_Click" Margin="4" Grid.Row="1" Grid.Column="0">OK</Button>
     <Button Click="btnCancel_Click" Margin="4" Grid.Row="1" Grid.Column="1">Cancel</Button>
   </Grid>
diff --git a/RogueEssence.Editor.Avalonia/Views/DialogBoxes/AnimChoiceWindow.axaml.cs b/RogueEssence.Editor.Avalonia/Views/DialogBoxes/AnimChoiceWindow.axaml.cs
index 3ca41572..6ece2c8a 100644
--- a/RogueEssence.Editor.Avalonia/Views/DialogBoxes/AnimChoiceWindow.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/DialogBoxes/AnimChoiceWindow.axaml.cs
@@ -5,24 +5,13 @@
 
 namespace RogueEssence.Dev.Views
 {
-    public class AnimChoiceWindow : Window
+    public partial class AnimChoiceWindow : Window
     {
         public AnimChoiceWindow()
         {
             this.InitializeComponent();
-#if DEBUG
-            this.AttachDevTools();
-#endif
         }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-
-
-
-
+        
         public void btnOK_Click(object sender, RoutedEventArgs e)
         {
             this.Close(true);
diff --git a/RogueEssence.Editor.Avalonia/Views/DialogBoxes/MapResizeWindow.axaml.cs b/RogueEssence.Editor.Avalonia/Views/DialogBoxes/MapResizeWindow.axaml.cs
index d50c8de0..ac506f22 100644
--- a/RogueEssence.Editor.Avalonia/Views/DialogBoxes/MapResizeWindow.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/DialogBoxes/MapResizeWindow.axaml.cs
@@ -5,22 +5,14 @@
 
 namespace RogueEssence.Dev.Views
 {
-    public class MapResizeWindow : Window
+    public partial class MapResizeWindow : Window
     {
         public MapResizeWindow()
         {
             this.InitializeComponent();
-#if DEBUG
-            this.AttachDevTools();
-#endif
-        }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
         }
-
-
+        
         public void btnOK_Click(object sender, RoutedEventArgs e)
         {
             this.Close(true);
diff --git a/RogueEssence.Editor.Avalonia/Views/DialogBoxes/MapRetileWindow.axaml.cs b/RogueEssence.Editor.Avalonia/Views/DialogBoxes/MapRetileWindow.axaml.cs
index aab640f0..909135fa 100644
--- a/RogueEssence.Editor.Avalonia/Views/DialogBoxes/MapRetileWindow.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/DialogBoxes/MapRetileWindow.axaml.cs
@@ -6,22 +6,13 @@
 
 namespace RogueEssence.Dev.Views
 {
-    public class MapRetileWindow : Window
+    public partial class MapRetileWindow : Window
     {
         public MapRetileWindow()
         {
             this.InitializeComponent();
-#if DEBUG
-            this.AttachDevTools();
-#endif
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-
-
         //TODO: this is a workaround to a bug in text wrapping
         //the window size must be modified in order to invalidate a cached value for width
         //remove this once the bug is fixed
diff --git a/RogueEssence.Editor.Avalonia/Views/DialogBoxes/MessageBox.axaml.cs b/RogueEssence.Editor.Avalonia/Views/DialogBoxes/MessageBox.axaml.cs
index 9f209919..addebcd6 100644
--- a/RogueEssence.Editor.Avalonia/Views/DialogBoxes/MessageBox.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/DialogBoxes/MessageBox.axaml.cs
@@ -6,7 +6,7 @@
 
 namespace RogueEssence.Dev.Views
 {
-    public class MessageBox : Window
+    public partial class MessageBox : Window
     {
         public enum MessageBoxButtons
         {
@@ -27,16 +27,8 @@ public enum MessageBoxResult
         public MessageBox()
         {
             this.InitializeComponent();
-#if DEBUG
-            this.AttachDevTools();
-#endif
         }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-
+        
         // https://stackoverflow.com/questions/55706291/how-to-show-a-message-box-in-avaloniaui-beta
         public static Task<MessageBoxResult> Show(Window parent, string text, string title, MessageBoxButtons buttons)
         {
diff --git a/RogueEssence.Editor.Avalonia/Views/DialogBoxes/ModConfigWindow.axaml b/RogueEssence.Editor.Avalonia/Views/DialogBoxes/ModConfigWindow.axaml
index 6b26eadd..0fa2e467 100644
--- a/RogueEssence.Editor.Avalonia/Views/DialogBoxes/ModConfigWindow.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/DialogBoxes/ModConfigWindow.axaml
@@ -39,7 +39,7 @@
       </Grid.ColumnDefinitions>
       <TextBox Text="{Binding Name}" VerticalAlignment="Center" Margin="4"/>
       <TextBlock Margin="4,2" Text="Type:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Column="1"/>
-      <views:SearchComboBox Margin="4,2" Items="{Binding ModTypes}" SelectedIndex="{Binding ChosenModType}" Grid.Column="2"/>
+      <views:SearchComboBox Margin="4,2" ItemsSource="{Binding ModTypes}" SelectedIndex="{Binding ChosenModType}" Grid.Column="2"/>
     </Grid>
 
     <TextBlock Margin="4,2" Text="Namespace:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="1"/>
diff --git a/RogueEssence.Editor.Avalonia/Views/DialogBoxes/ModConfigWindow.axaml.cs b/RogueEssence.Editor.Avalonia/Views/DialogBoxes/ModConfigWindow.axaml.cs
index 2362da89..8d0bba96 100644
--- a/RogueEssence.Editor.Avalonia/Views/DialogBoxes/ModConfigWindow.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/DialogBoxes/ModConfigWindow.axaml.cs
@@ -7,24 +7,13 @@
 
 namespace RogueEssence.Dev.Views
 {
-    public class ModConfigWindow : Window
+    public partial class ModConfigWindow : Window
     {
         public ModConfigWindow()
         {
             this.InitializeComponent();
-#if DEBUG
-            this.AttachDevTools();
-#endif
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-
-
-
-
         public async void btnOK_Click(object sender, RoutedEventArgs e)
         {
             ModConfigViewModel vm = (ModConfigViewModel)DataContext;
diff --git a/RogueEssence.Editor.Avalonia/Views/DialogBoxes/RenameWindow.axaml.cs b/RogueEssence.Editor.Avalonia/Views/DialogBoxes/RenameWindow.axaml.cs
index e69dcfd1..6000c354 100644
--- a/RogueEssence.Editor.Avalonia/Views/DialogBoxes/RenameWindow.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/DialogBoxes/RenameWindow.axaml.cs
@@ -5,24 +5,13 @@
 
 namespace RogueEssence.Dev.Views
 {
-    public class RenameWindow : Window
+    public partial class RenameWindow : Window
     {
         public RenameWindow()
         {
             this.InitializeComponent();
-#if DEBUG
-            this.AttachDevTools();
-#endif
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-
-
-
-
         public void btnOK_Click(object sender, RoutedEventArgs e)
         {
             this.Close(true);
diff --git a/RogueEssence.Editor.Avalonia/Views/GroundEditForm/EntityBrowser.axaml b/RogueEssence.Editor.Avalonia/Views/GroundEditForm/EntityBrowser.axaml
index ce878642..7f679138 100644
--- a/RogueEssence.Editor.Avalonia/Views/GroundEditForm/EntityBrowser.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/GroundEditForm/EntityBrowser.axaml
@@ -30,7 +30,7 @@
         <ColumnDefinition/>
       </Grid.ColumnDefinitions>
       <TextBlock Margin="4,2" Text="Type:" VerticalAlignment="Center" HorizontalAlignment="Right"/>
-      <views:SearchComboBox Margin="4,2" Grid.Column="1" Items="{Binding EntityTypes}" SelectedIndex="{Binding ChosenEntityType}" IsEnabled="{Binding AllowEntTypes}"/>
+      <views:SearchComboBox Margin="4,2" Grid.Column="1" ItemsSource="{Binding EntityTypes}" SelectedIndex="{Binding ChosenEntityType}" IsEnabled="{Binding AllowEntTypes}"/>
     </Grid>
     <Grid Grid.Row="1" IsVisible="True">
       <Grid.ColumnDefinitions>
@@ -46,7 +46,7 @@
         <ColumnDefinition/>
       </Grid.ColumnDefinitions>
       <TextBlock Margin="4,2" Text="Direction:" VerticalAlignment="Center" HorizontalAlignment="Right"/>
-      <views:SearchComboBox Margin="4,2" Grid.Column="1" Items="{Binding Directions}" SelectedIndex="{Binding ChosenDirection}" IsEnabled="{Binding Path=ChosenEntityType, Converter={StaticResource IntInSetConverter}, ConverterParameter=0|1|2|3}"/>
+      <views:SearchComboBox Margin="4,2" Grid.Column="1" ItemsSource="{Binding Directions}" SelectedIndex="{Binding ChosenDirection}" IsEnabled="{Binding Path=ChosenEntityType, Converter={StaticResource IntInSetConverter}, ConverterParameter=0|1|2|3}"/>
     </Grid>
     <Grid Grid.Row="3" IsVisible="True">
       <Grid.ColumnDefinitions>
@@ -80,10 +80,10 @@
             <ColumnDefinition/>
           </Grid.ColumnDefinitions>
           <TextBlock Margin="4,2" Text="Trigger Type:" VerticalAlignment="Center" HorizontalAlignment="Right"/>
-          <views:SearchComboBox Items="{Binding TriggerTypes}" SelectedItem="{Binding ChosenTriggerType}" IsEnabled="{Binding Path=ChosenEntityType, Converter={StaticResource IntInSetConverter}, ConverterParameter=0|1}" VerticalAlignment="Center" Margin="4,2" Grid.Column="1"/>
+          <views:SearchComboBox ItemsSource="{Binding TriggerTypes}" SelectedItem="{Binding ChosenTriggerType}" IsEnabled="{Binding Path=ChosenEntityType, Converter={StaticResource IntInSetConverter}, ConverterParameter=0|1}" VerticalAlignment="Center" Margin="4,2" Grid.Column="1"/>
           <TextBlock Margin="4,2" Text="Callbacks:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="1"/>
           <Border Margin="4,2" BorderThickness="1" BorderBrush="Black" Grid.Row="1" Grid.Column="1">
-            <ItemsControl Items="{Binding ScriptItems}">
+            <ItemsControl ItemsSource="{Binding ScriptItems}">
               <ItemsControl.ItemTemplate>
                 <DataTemplate>
                   <Grid>
@@ -110,7 +110,7 @@
           </Border>
           <TextBlock Margin="4,2" Text="Spawn&#xA;Callbacks:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="2" IsVisible="{Binding Path=ChosenEntityType, Converter={StaticResource IntInSetConverter}, ConverterParameter=3}"/>
           <Border Margin="4,2" BorderThickness="1" BorderBrush="Black" Grid.Row="2" Grid.Column="1" IsVisible="{Binding Path=ChosenEntityType, Converter={StaticResource IntInSetConverter}, ConverterParameter=3}">
-            <ItemsControl Items="{Binding SpawnScriptItems}">
+            <ItemsControl ItemsSource="{Binding SpawnScriptItems}">
               <ItemsControl.ItemTemplate>
                 <DataTemplate>
                   <CheckBox Margin="4"
@@ -136,13 +136,13 @@
             <ColumnDefinition/>
           </Grid.ColumnDefinitions>
           <TextBlock Margin="4,2" Text="Species:" VerticalAlignment="Center" HorizontalAlignment="Right"/>
-          <views:SearchComboBox Items="{Binding Monsters}" SelectedIndex="{Binding ChosenMonster}" VerticalAlignment="Center" VirtualizationMode="Simple" Margin="4,2" Grid.Row="0" Grid.Column="1"/>
+          <views:SearchComboBox ItemsSource="{Binding Monsters}" SelectedIndex="{Binding ChosenMonster}" VerticalAlignment="Center" Margin="4,2" Grid.Row="0" Grid.Column="1"/>
           <TextBlock Margin="4,2" Text="Form:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="1"/>
-          <views:SearchComboBox Items="{Binding Forms}" SelectedIndex="{Binding ChosenForm}" VerticalAlignment="Center" VirtualizationMode="Simple" Margin="4,2" Grid.Row="1" Grid.Column="1"/>
+          <views:SearchComboBox ItemsSource="{Binding Forms}" SelectedIndex="{Binding ChosenForm}" VerticalAlignment="Center" Margin="4,2" Grid.Row="1" Grid.Column="1"/>
           <TextBlock Margin="4,2" Text="Skin:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="2"/>
-          <views:SearchComboBox Items="{Binding Skins}" SelectedIndex="{Binding ChosenSkin}" VerticalAlignment="Center" Margin="4,2" Grid.Row="2" Grid.Column="1"/>
+          <views:SearchComboBox ItemsSource="{Binding Skins}" SelectedIndex="{Binding ChosenSkin}" VerticalAlignment="Center" Margin="4,2" Grid.Row="2" Grid.Column="1"/>
           <TextBlock Margin="4,2" Text="Gender:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="3"/>
-          <views:SearchComboBox Items="{Binding Genders}" SelectedIndex="{Binding ChosenGender}" VerticalAlignment="Center" Margin="4,2" Grid.Row="3" Grid.Column="1"/>
+          <views:SearchComboBox ItemsSource="{Binding Genders}" SelectedIndex="{Binding ChosenGender}" VerticalAlignment="Center" Margin="4,2" Grid.Row="3" Grid.Column="1"/>
         </Grid>
       </TabItem>
       <TabItem Header="Char Data" IsVisible="{Binding Path=ChosenEntityType, Converter={StaticResource IntInSetConverter}, ConverterParameter=1}">
@@ -178,9 +178,9 @@
             <ColumnDefinition/>
           </Grid.ColumnDefinitions>
           <TextBlock Margin="4,2" Text="Type:" VerticalAlignment="Center" HorizontalAlignment="Right"/>
-          <views:SearchComboBox Items="{Binding AnimTypes}" SelectedIndex="{Binding ChosenAnimType}" VerticalAlignment="Center" VirtualizationMode="Simple" Margin="4,2" Grid.Row="0" Grid.Column="1" Grid.ColumnSpan="3"/>
+          <views:SearchComboBox ItemsSource="{Binding AnimTypes}" SelectedIndex="{Binding ChosenAnimType}" VerticalAlignment="Center" Margin="4,2" Grid.Row="0" Grid.Column="1" Grid.ColumnSpan="3"/>
           <TextBlock Margin="4,2" Text="Sprite:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="1"/>
-          <views:SearchComboBox Items="{Binding ObjectAnims}" SelectedIndex="{Binding ChosenObjectAnim}" VerticalAlignment="Center" VirtualizationMode="Simple" Margin="4,2" Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="3"/>
+          <views:SearchComboBox ItemsSource="{Binding ObjectAnims}" SelectedIndex="{Binding ChosenObjectAnim}" VerticalAlignment="Center" Margin="4,2" Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="3"/>
           <TextBlock Margin="4,2" Text="X Offset:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="2"/>
           <NumericUpDown Value="{Binding OffsetX}" VerticalAlignment="Center" Margin="4,2" Grid.Row="2" Grid.Column="1"/>
           <TextBlock Margin="4,2" Text="Y Offset:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="2" Grid.Column="2"/>
diff --git a/RogueEssence.Editor.Avalonia/Views/GroundEditForm/EntityBrowser.axaml.cs b/RogueEssence.Editor.Avalonia/Views/GroundEditForm/EntityBrowser.axaml.cs
index 69125845..eec77af9 100644
--- a/RogueEssence.Editor.Avalonia/Views/GroundEditForm/EntityBrowser.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/GroundEditForm/EntityBrowser.axaml.cs
@@ -9,17 +9,11 @@
 
 namespace RogueEssence.Dev.Views
 {
-    public class EntityBrowser : UserControl
+    public partial class EntityBrowser : UserControl
     {
         public EntityBrowser()
         {
             this.InitializeComponent();
         }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-
     }
 }
diff --git a/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundEditForm.axaml.cs b/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundEditForm.axaml.cs
index 52910095..6472ef07 100644
--- a/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundEditForm.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundEditForm.axaml.cs
@@ -17,7 +17,7 @@
 
 namespace RogueEssence.Dev.Views
 {
-    public class GroundEditForm : ParentForm, IGroundEditor
+    public partial class GroundEditForm : ParentForm, IGroundEditor
     {
 
         public bool Active { get; private set; }
@@ -27,19 +27,11 @@ public class GroundEditForm : ParentForm, IGroundEditor
         public GroundEditForm()
         {
             InitializeComponent();
-#if DEBUG
-            this.AttachDevTools();
-#endif
-            Edits = new UndoStack();
 
-        }
+            Edits = new UndoStack();
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
         }
-
-
+        
         public void ProcessInput(InputManager input)
         {
             DevForm.ExecuteOrInvoke(() => ((GroundEditViewModel)DataContext).ProcessInput(input));
diff --git a/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabDecorations.axaml b/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabDecorations.axaml
index c5bc5c21..fa6dfc37 100644
--- a/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabDecorations.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabDecorations.axaml
@@ -41,11 +41,11 @@
         <ColumnDefinition/>
       </Grid.ColumnDefinitions>
       <TextBlock Margin="4,2" Text="Type:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="0"/>
-      <views:SearchComboBox Items="{Binding AnimTypes}" SelectedIndex="{Binding ChosenAnimType}" VerticalAlignment="Center" VirtualizationMode="Simple" Margin="4,2" Grid.Row="0" Grid.Column="1"/>
+      <views:SearchComboBox ItemsSource="{Binding AnimTypes}" SelectedIndex="{Binding ChosenAnimType}" VerticalAlignment="Center" Margin="4,2" Grid.Row="0" Grid.Column="1"/>
       <TextBlock Margin="4,2" Text="Sprite:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="1"/>
-      <views:SearchComboBox Items="{Binding ObjectAnims}" SelectedIndex="{Binding ChosenObjectAnim}" VerticalAlignment="Center" VirtualizationMode="Simple" Margin="4,2" Grid.Row="1" Grid.Column="1"/>
+      <views:SearchComboBox ItemsSource="{Binding ObjectAnims}" SelectedIndex="{Binding ChosenObjectAnim}" VerticalAlignment="Center" Margin="4,2" Grid.Row="1" Grid.Column="1"/>
       <TextBlock Margin="4,2" Text="Direction:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="1" Grid.Column="2"/>
-      <views:SearchComboBox Margin="4,2" Items="{Binding Directions}" SelectedIndex="{Binding ChosenDirection}" Grid.Row="1" Grid.Column="3"/>
+      <views:SearchComboBox Margin="4,2" ItemsSource="{Binding Directions}" SelectedIndex="{Binding ChosenDirection}" Grid.Row="1" Grid.Column="3"/>
       <TextBlock Margin="4,2" Text="Start Frame:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="2"/>
       <NumericUpDown Minimum="-1" Value="{Binding StartFrame}" VerticalAlignment="Center" Margin="4,2" Grid.Row="2" Grid.Column="1"/>
       <TextBlock Margin="4,2" Text="End Frame:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="2" Grid.Column="2"/>
diff --git a/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabDecorations.axaml.cs b/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabDecorations.axaml.cs
index e1a483d0..13798ae2 100644
--- a/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabDecorations.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabDecorations.axaml.cs
@@ -4,16 +4,11 @@
 
 namespace RogueEssence.Dev.Views
 {
-    public class GroundTabDecorations : UserControl
+    public partial class GroundTabDecorations : UserControl
     {
         public GroundTabDecorations()
         {
             this.InitializeComponent();
         }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
     }
 }
diff --git a/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabEntities.axaml.cs b/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabEntities.axaml.cs
index 5655a379..f4140cff 100644
--- a/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabEntities.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabEntities.axaml.cs
@@ -4,16 +4,11 @@
 
 namespace RogueEssence.Dev.Views
 {
-    public class GroundTabEntities : UserControl
+    public partial class GroundTabEntities : UserControl
     {
         public GroundTabEntities()
         {
             this.InitializeComponent();
         }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
     }
 }
diff --git a/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabProperties.axaml b/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabProperties.axaml
index 95b163b4..aac0ecc1 100644
--- a/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabProperties.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabProperties.axaml
@@ -32,7 +32,7 @@
       <TextBlock Margin="4" VerticalAlignment="Center" HorizontalAlignment="Right" ToolTip.Tip="Map name in the current language.">Map Name:</TextBlock>
       <TextBox Text="{Binding MapName}" VerticalAlignment="Center" Margin="4" Grid.Column="1" Grid.ColumnSpan="3"/>
       <TextBlock Margin="4" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="1" ToolTip.Tip="Choose how the edge of the map is handled.">Scroll Edge:</TextBlock>
-      <views:SearchComboBox Items="{Binding ScrollEdges}" SelectedIndex="{Binding ChosenScroll}" Margin="4" Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="3"/>
+      <views:SearchComboBox ItemsSource="{Binding ScrollEdges}" SelectedIndex="{Binding ChosenScroll}" Margin="4" Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="3"/>
       <CheckBox Margin="4,2" IsChecked="{Binding NoSwitch}" Grid.Row="2" Grid.Column="1" Grid.ColumnSpan="3" ToolTip.Tip="Prevents leader switching.">No Switch</CheckBox>
       <TextBlock Margin="4,2" VerticalAlignment="Bottom" Grid.Row="3" Grid.ColumnSpan="2" ToolTip.Tip="Graphics to use for the background.">Background:</TextBlock>
       <views:ClassBox DataContext="{Binding BG}" Margin="4,2" Grid.Row="4" Grid.ColumnSpan="2"/>
@@ -50,7 +50,7 @@
       </Grid.RowDefinitions>
 
       <TextBlock Margin="4" VerticalAlignment="Bottom" Grid.Row="0">Music:</TextBlock>
-      <ListBox Name="lbxMusic" SelectionMode="AlwaysSelected" Items="{Binding Music}" SelectedIndex="{Binding ChosenMusic}" Margin="4" Grid.Row="1"/>
+      <ListBox Name="lbxMusic" SelectionMode="AlwaysSelected" ItemsSource="{Binding Music}" SelectedIndex="{Binding ChosenMusic}" Margin="4" Grid.Row="1"/>
       <Button Name="btnReloadMusic" Command="{Binding btnReloadMusic_Click}" Margin="4" Grid.Row="2">Reload Music</Button>
     </Grid>
   </Grid>
diff --git a/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabProperties.axaml.cs b/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabProperties.axaml.cs
index 7856b8b6..a0fcb1d0 100644
--- a/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabProperties.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabProperties.axaml.cs
@@ -4,16 +4,11 @@
 
 namespace RogueEssence.Dev.Views
 {
-    public class GroundTabProperties : UserControl
+    public partial class GroundTabProperties : UserControl
     {
         public GroundTabProperties()
         {
             this.InitializeComponent();
         }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
     }
 }
diff --git a/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabScript.axaml b/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabScript.axaml
index 98b0488d..b0da0a5e 100644
--- a/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabScript.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabScript.axaml
@@ -30,7 +30,7 @@
     <Button Name="btnReloadScripts" Command="{Binding btnReloadScripts_Click}" IsEnabled="{Binding Path=CurrentFile, Converter={StaticResource StringNotEmptyConverter}}" Margin="4" Grid.Row="1" Grid.Column="1">Reload Scripts</Button>
     <TextBlock Margin="4" VerticalAlignment="Bottom" Grid.Row="2" Grid.Column="0">Map Callbacks</TextBlock>
     <Border Grid.Row="3" Grid.ColumnSpan="2" Margin="4" BorderThickness="1" BorderBrush="Black">
-      <ItemsControl Items="{Binding ScriptItems}" IsEnabled="{Binding Path=CurrentFile, Converter={StaticResource StringNotEmptyConverter}}">
+      <ItemsControl ItemsSource="{Binding ScriptItems}" IsEnabled="{Binding Path=CurrentFile, Converter={StaticResource StringNotEmptyConverter}}">
         <ItemsControl.ItemTemplate>
           <DataTemplate>
             <Grid>
@@ -38,7 +38,8 @@
                 <ColumnDefinition Width="28"/>
                 <ColumnDefinition/>
               </Grid.ColumnDefinitions>
-              <CheckBox Margin="4"
+              <CheckBox
+                Margin="4"
                         IsEnabled="False"
                         IsChecked="{Binding IsChecked}"/>
               <TextBlock Margin="0,4" Grid.Column="1" VerticalAlignment="Center"
diff --git a/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabScript.axaml.cs b/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabScript.axaml.cs
index 3a7f53fe..029c9483 100644
--- a/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabScript.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabScript.axaml.cs
@@ -4,16 +4,11 @@
 
 namespace RogueEssence.Dev.Views
 {
-    public class GroundTabScript : UserControl
+    public partial class GroundTabScript : UserControl
     {
         public GroundTabScript()
         {
             this.InitializeComponent();
         }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
     }
 }
diff --git a/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabStrings.axaml b/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabStrings.axaml
index 579e3d62..604d008b 100644
--- a/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabStrings.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabStrings.axaml
@@ -20,7 +20,7 @@
 
     <TextBlock Margin="4" VerticalAlignment="Bottom" Grid.Row="0" TextWrapping="Wrap">Add, edit, or remove localized strings to be used by scripts on the map.</TextBlock>
 
-    <DataGrid Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="5" Items="{Binding MapStrings}" SelectedIndex="{Binding CurrentString, Mode=TwoWay}"
+    <DataGrid Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="5" ItemsSource="{Binding MapStrings}" SelectedIndex="{Binding CurrentString, Mode=TwoWay}"
               CanUserResizeColumns="True" HorizontalScrollBarVisibility="Disabled">
 
       <DataGrid.Styles>
diff --git a/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabStrings.axaml.cs b/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabStrings.axaml.cs
index 4293c787..12f10166 100644
--- a/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabStrings.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabStrings.axaml.cs
@@ -4,16 +4,11 @@
 
 namespace RogueEssence.Dev.Views
 {
-    public class GroundTabStrings : UserControl
+    public partial class GroundTabStrings : UserControl
     {
         public GroundTabStrings()
         {
             this.InitializeComponent();
         }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
     }
 }
diff --git a/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabTextures.axaml.cs b/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabTextures.axaml.cs
index 9a816c25..456e67e0 100644
--- a/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabTextures.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabTextures.axaml.cs
@@ -4,16 +4,11 @@
 
 namespace RogueEssence.Dev.Views
 {
-    public class GroundTabTextures : UserControl
+    public partial class GroundTabTextures : UserControl
     {
         public GroundTabTextures()
         {
             this.InitializeComponent();
         }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
     }
 }
diff --git a/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabWalls.axaml.cs b/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabWalls.axaml.cs
index 5c387602..f2d0a6b1 100644
--- a/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabWalls.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabWalls.axaml.cs
@@ -4,16 +4,11 @@
 
 namespace RogueEssence.Dev.Views
 {
-    public class GroundTabWalls : UserControl
+    public partial class GroundTabWalls : UserControl
     {
         public GroundTabWalls()
         {
             this.InitializeComponent();
         }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
     }
 }
diff --git a/RogueEssence.Editor.Avalonia/Views/GroundEditForm/Layers/AnimLayerWindow.axaml.cs b/RogueEssence.Editor.Avalonia/Views/GroundEditForm/Layers/AnimLayerWindow.axaml.cs
index e70757e8..18b5b1e1 100644
--- a/RogueEssence.Editor.Avalonia/Views/GroundEditForm/Layers/AnimLayerWindow.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/GroundEditForm/Layers/AnimLayerWindow.axaml.cs
@@ -5,23 +5,13 @@
 
 namespace RogueEssence.Dev.Views
 {
-    public class AnimLayerWindow : Window
+    public partial class AnimLayerWindow : Window
     {
         public AnimLayerWindow()
         {
             this.InitializeComponent();
-#if DEBUG
-            this.AttachDevTools();
-#endif
         }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-
-
-
+        
         public void btnOK_Click(object sender, RoutedEventArgs e)
         {
             this.Close(true);
diff --git a/RogueEssence.Editor.Avalonia/Views/GroundEditForm/Layers/EntityLayerWindow.axaml.cs b/RogueEssence.Editor.Avalonia/Views/GroundEditForm/Layers/EntityLayerWindow.axaml.cs
index 07a50ba5..0f52112c 100644
--- a/RogueEssence.Editor.Avalonia/Views/GroundEditForm/Layers/EntityLayerWindow.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/GroundEditForm/Layers/EntityLayerWindow.axaml.cs
@@ -5,23 +5,13 @@
 
 namespace RogueEssence.Dev.Views
 {
-    public class EntityLayerWindow : Window
+    public partial class EntityLayerWindow : Window
     {
         public EntityLayerWindow()
         {
             this.InitializeComponent();
-#if DEBUG
-            this.AttachDevTools();
-#endif
         }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-
-
-
+        
         public void btnOK_Click(object sender, RoutedEventArgs e)
         {
             this.Close(true);
diff --git a/RogueEssence.Editor.Avalonia/Views/GroundEditForm/Layers/GroundLayerWindow.axaml.cs b/RogueEssence.Editor.Avalonia/Views/GroundEditForm/Layers/GroundLayerWindow.axaml.cs
index 6964344b..6eec9903 100644
--- a/RogueEssence.Editor.Avalonia/Views/GroundEditForm/Layers/GroundLayerWindow.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/GroundEditForm/Layers/GroundLayerWindow.axaml.cs
@@ -5,23 +5,13 @@
 
 namespace RogueEssence.Dev.Views
 {
-    public class GroundLayerWindow : Window
+    public partial class GroundLayerWindow : Window
     {
         public GroundLayerWindow()
         {
             this.InitializeComponent();
-#if DEBUG
-            this.AttachDevTools();
-#endif
         }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-
-
-
+        
 
         public void btnOK_Click(object sender, RoutedEventArgs e)
         {
diff --git a/RogueEssence.Editor.Avalonia/Views/GroundEditForm/Layers/MapLayerWindow.axaml.cs b/RogueEssence.Editor.Avalonia/Views/GroundEditForm/Layers/MapLayerWindow.axaml.cs
index 69d84a35..0df88ed6 100644
--- a/RogueEssence.Editor.Avalonia/Views/GroundEditForm/Layers/MapLayerWindow.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/GroundEditForm/Layers/MapLayerWindow.axaml.cs
@@ -5,24 +5,13 @@
 
 namespace RogueEssence.Dev.Views
 {
-    public class MapLayerWindow : Window
+    public partial class MapLayerWindow : Window
     {
         public MapLayerWindow()
         {
             this.InitializeComponent();
-#if DEBUG
-            this.AttachDevTools();
-#endif
         }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-
-
-
-
+        
         public void btnOK_Click(object sender, RoutedEventArgs e)
         {
             this.Close(true);
diff --git a/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapEditForm.axaml.cs b/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapEditForm.axaml.cs
index 8d8c2671..a0676768 100644
--- a/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapEditForm.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapEditForm.axaml.cs
@@ -17,7 +17,7 @@
 
 namespace RogueEssence.Dev.Views
 {
-    public class MapEditForm : ParentForm, IMapEditor
+    public partial class MapEditForm : ParentForm, IMapEditor
     {
 
         public bool Active { get; private set; }
@@ -25,27 +25,15 @@ public class MapEditForm : ParentForm, IMapEditor
         public MapEditForm()
         {
             InitializeComponent();
-#if DEBUG
-            this.AttachDevTools();
-#endif
             Edits = new UndoStack();
 
         }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-
-
+        
         public void ProcessInput(InputManager input)
         {
             DevForm.ExecuteOrInvoke(() => ((MapEditViewModel)DataContext).ProcessInput(input));
         }
-
-
-
-
+        
         public void Window_Loaded(object sender, EventArgs e)
         {
             Active = true;
diff --git a/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabDecorations.axaml b/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabDecorations.axaml
index 5a5b2130..58e82540 100644
--- a/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabDecorations.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabDecorations.axaml
@@ -41,11 +41,11 @@
         <ColumnDefinition/>
       </Grid.ColumnDefinitions>
       <TextBlock Margin="4,2" Text="Type:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="0"/>
-      <views:SearchComboBox Items="{Binding AnimTypes}" SelectedIndex="{Binding ChosenAnimType}" VerticalAlignment="Center" VirtualizationMode="Simple" Margin="4,2" Grid.Row="0" Grid.Column="1"/>
+      <views:SearchComboBox ItemsSource="{Binding AnimTypes}" SelectedIndex="{Binding ChosenAnimType}" VerticalAlignment="Center" Margin="4,2" Grid.Row="0" Grid.Column="1"/>
       <TextBlock Margin="4,2" Text="Sprite:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="1"/>
-      <views:SearchComboBox Items="{Binding ObjectAnims}" SelectedIndex="{Binding ChosenObjectAnim}" VerticalAlignment="Center" VirtualizationMode="Simple" Margin="4,2" Grid.Row="1" Grid.Column="1"/>
+      <views:SearchComboBox ItemsSource="{Binding ObjectAnims}" SelectedIndex="{Binding ChosenObjectAnim}" VerticalAlignment="Center" Margin="4,2" Grid.Row="1" Grid.Column="1"/>
       <TextBlock Margin="4,2" Text="Direction:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="1" Grid.Column="2"/>
-      <views:SearchComboBox Margin="4,2" Items="{Binding Directions}" SelectedIndex="{Binding ChosenDirection}" Grid.Row="1" Grid.Column="3"/>
+      <views:SearchComboBox Margin="4,2" ItemsSource="{Binding Directions}" SelectedIndex="{Binding ChosenDirection}" Grid.Row="1" Grid.Column="3"/>
       <TextBlock Margin="4,2" Text="Start Frame:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="2"/>
       <NumericUpDown Minimum="-1" Value="{Binding StartFrame}" VerticalAlignment="Center" Margin="4,2" Grid.Row="2" Grid.Column="1"/>
       <TextBlock Margin="4,2" Text="End Frame:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="2" Grid.Column="2"/>
diff --git a/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabDecorations.axaml.cs b/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabDecorations.axaml.cs
index e2646f98..d91ad164 100644
--- a/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabDecorations.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabDecorations.axaml.cs
@@ -4,16 +4,11 @@
 
 namespace RogueEssence.Dev.Views
 {
-    public class MapTabDecorations : UserControl
+    public partial class MapTabDecorations : UserControl
     {
         public MapTabDecorations()
         {
             this.InitializeComponent();
         }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
     }
 }
diff --git a/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabEffects.axaml.cs b/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabEffects.axaml.cs
index e831962f..76031339 100644
--- a/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabEffects.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabEffects.axaml.cs
@@ -4,16 +4,11 @@
 
 namespace RogueEssence.Dev.Views
 {
-    public class MapTabEffects : UserControl
+    public partial class MapTabEffects : UserControl
     {
         public MapTabEffects()
         {
             this.InitializeComponent();
         }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
     }
 }
diff --git a/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabEntities.axaml b/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabEntities.axaml
index f21ae222..881755c8 100644
--- a/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabEntities.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabEntities.axaml
@@ -62,9 +62,9 @@
           <ColumnDefinition/>
         </Grid.ColumnDefinitions>
         <TextBlock Margin="4,2" Text="Direction:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="0" Grid.Column="0"/>
-        <views:SearchComboBox Items="{Binding Directions}" SelectedIndex="{Binding ChosenDir}" VerticalAlignment="Center" VirtualizationMode="Simple" Margin="4,2" Grid.Row="0" Grid.Column="1"/>
+        <views:SearchComboBox ItemsSource="{Binding Directions}" SelectedIndex="{Binding ChosenDir}" VerticalAlignment="Center" Margin="4,2" Grid.Row="0" Grid.Column="1"/>
         <TextBlock Margin="4,2" Text="Tactic:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="0" Grid.Column="2"/>
-        <views:SearchComboBox Items="{Binding Tactics}" SelectedIndex="{Binding ChosenTactic}" VerticalAlignment="Center" VirtualizationMode="Simple" Margin="4,2" Grid.Row="0" Grid.Column="3"/>
+        <views:SearchComboBox ItemsSource="{Binding Tactics}" SelectedIndex="{Binding ChosenTactic}" VerticalAlignment="Center" Margin="4,2" Grid.Row="0" Grid.Column="3"/>
         <TextBlock Margin="4,2" Text="Name:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="0" Grid.Column="4"/>
         <TextBox Text="{Binding Nickname}" VerticalAlignment="Center" Margin="4,2" Grid.Row="0" Grid.Column="5"/>
       </Grid>
@@ -81,13 +81,13 @@
           <ColumnDefinition/>
         </Grid.ColumnDefinitions>
         <TextBlock Margin="4,2" Text="Species:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="0"/>
-        <views:SearchComboBox Items="{Binding Monsters}" SelectedIndex="{Binding ChosenMonster}" VerticalAlignment="Center" VirtualizationMode="Simple" Margin="4,2" Grid.Row="0" Grid.Column="1"/>
+        <views:SearchComboBox ItemsSource="{Binding Monsters}" SelectedIndex="{Binding ChosenMonster}" VerticalAlignment="Center" Margin="4,2" Grid.Row="0" Grid.Column="1"/>
         <TextBlock Margin="4,2" Text="Form:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="0" Grid.Column="2"/>
-        <views:SearchComboBox Items="{Binding Forms}" SelectedIndex="{Binding ChosenForm}" VerticalAlignment="Center" VirtualizationMode="Simple" Margin="4,2" Grid.Row="0" Grid.Column="3"/>
+        <views:SearchComboBox ItemsSource="{Binding Forms}" SelectedIndex="{Binding ChosenForm}" VerticalAlignment="Center"  Margin="4,2" Grid.Row="0" Grid.Column="3"/>
         <TextBlock Margin="4,2" Text="Skin:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="1"/>
-        <views:SearchComboBox Items="{Binding Skins}" SelectedIndex="{Binding ChosenSkin}" VerticalAlignment="Center" Margin="4,2" Grid.Row="1" Grid.Column="1"/>
+        <views:SearchComboBox ItemsSource="{Binding Skins}" SelectedIndex="{Binding ChosenSkin}" VerticalAlignment="Center" Margin="4,2" Grid.Row="1" Grid.Column="1"/>
         <TextBlock Margin="4,2" Text="Gender:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="1" Grid.Column="2"/>
-        <views:SearchComboBox Items="{Binding Genders}" SelectedIndex="{Binding ChosenGender}" VerticalAlignment="Center" Margin="4,2" Grid.Row="1" Grid.Column="3"/>
+        <views:SearchComboBox ItemsSource="{Binding Genders}" SelectedIndex="{Binding ChosenGender}" VerticalAlignment="Center" Margin="4,2" Grid.Row="1" Grid.Column="3"/>
       </Grid>
 
       <Grid Grid.Row="2">
@@ -105,9 +105,9 @@
         <TextBlock Margin="4,2" Text="Level:" VerticalAlignment="Center" HorizontalAlignment="Right"/>
         <NumericUpDown Value="{Binding Level}" Minimum="1" VerticalAlignment="Center" Margin="4,2" Grid.Row="0" Grid.Column="1"/>
         <TextBlock Margin="4,2" Text="Intrinsic:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Column="2"/>
-        <views:SearchComboBox Items="{Binding Intrinsics}" SelectedIndex="{Binding ChosenIntrinsic}" VerticalAlignment="Center" VirtualizationMode="Simple" Margin="4,2" Grid.Column="3"/>
+        <views:SearchComboBox ItemsSource="{Binding Intrinsics}" SelectedIndex="{Binding ChosenIntrinsic}" VerticalAlignment="Center" Margin="4,2" Grid.Column="3"/>
         <TextBlock Margin="4,2" Text="Equip:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Column="4"/>
-        <views:SearchComboBox Items="{Binding Equips}" SelectedIndex="{Binding ChosenEquip}" VerticalAlignment="Center" VirtualizationMode="Simple" Margin="4,2" Grid.Column="5"/>
+        <views:SearchComboBox ItemsSource="{Binding Equips}" SelectedIndex="{Binding ChosenEquip}" VerticalAlignment="Center" Margin="4,2" Grid.Column="5"/>
       </Grid>
       <Grid Grid.Row="3">
         <Grid.RowDefinitions>
@@ -131,16 +131,16 @@
           <ColumnDefinition Width="180"/>
         </Grid.ColumnDefinitions>
         <TextBlock Margin="4,2" Text="Skill 1:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="0"/>
-        <views:SearchComboBox Items="{Binding Skills}" SelectedIndex="{Binding ChosenSkill0}" VerticalAlignment="Center" Margin="4,2" Grid.Row="0" Grid.Column="1" Grid.ColumnSpan="4"/>
+        <views:SearchComboBox ItemsSource="{Binding Skills}" SelectedIndex="{Binding ChosenSkill0}" VerticalAlignment="Center" Margin="4,2" Grid.Row="0" Grid.Column="1" Grid.ColumnSpan="4"/>
         <CheckBox Margin="4" IsChecked="{Binding SkillsOn0}" Grid.Row="0" Grid.Column="5">Enable</CheckBox>
         <TextBlock Margin="4,2" Text="Skill 2:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="1"/>
-        <views:SearchComboBox Items="{Binding Skills}" SelectedIndex="{Binding ChosenSkill1}" VerticalAlignment="Center" Margin="4,2" Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="4"/>
+        <views:SearchComboBox ItemsSource="{Binding Skills}" SelectedIndex="{Binding ChosenSkill1}" VerticalAlignment="Center" Margin="4,2" Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="4"/>
         <CheckBox Margin="4" IsChecked="{Binding SkillsOn1}" Grid.Row="1" Grid.Column="5">Enable</CheckBox>
         <TextBlock Margin="4,2" Text="Skill 3:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="2"/>
-        <views:SearchComboBox Items="{Binding Skills}" SelectedIndex="{Binding ChosenSkill2}" VerticalAlignment="Center" Margin="4,2" Grid.Row="2" Grid.Column="1" Grid.ColumnSpan="4"/>
+        <views:SearchComboBox ItemsSource="{Binding Skills}" SelectedIndex="{Binding ChosenSkill2}" VerticalAlignment="Center" Margin="4,2" Grid.Row="2" Grid.Column="1" Grid.ColumnSpan="4"/>
         <CheckBox Margin="4" IsChecked="{Binding SkillsOn2}" Grid.Row="2" Grid.Column="5">Enable</CheckBox>
         <TextBlock Margin="4,2" Text="Skill 4:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="3"/>
-        <views:SearchComboBox Items="{Binding Skills}" SelectedIndex="{Binding ChosenSkill3}" VerticalAlignment="Center" Margin="4,2" Grid.Row="3" Grid.Column="1" Grid.ColumnSpan="4"/>
+        <views:SearchComboBox ItemsSource="{Binding Skills}" SelectedIndex="{Binding ChosenSkill3}" VerticalAlignment="Center" Margin="4,2" Grid.Row="3" Grid.Column="1" Grid.ColumnSpan="4"/>
         <CheckBox Margin="4" IsChecked="{Binding SkillsOn3}" Grid.Row="3" Grid.Column="5">Enable</CheckBox>
         <TextBlock Margin="4,2" Text="+HP:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="4"/>
         <NumericUpDown Value="{Binding HPBonus}" VerticalAlignment="Center" Margin="4,2" Grid.Row="4" Grid.Column="1"/>
diff --git a/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabEntities.axaml.cs b/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabEntities.axaml.cs
index 5e3f2c00..95246e19 100644
--- a/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabEntities.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabEntities.axaml.cs
@@ -4,16 +4,11 @@
 
 namespace RogueEssence.Dev.Views
 {
-    public class MapTabEntities : UserControl
+    public partial class MapTabEntities : UserControl
     {
         public MapTabEntities()
         {
             this.InitializeComponent();
         }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
     }
 }
diff --git a/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabEntrances.axaml b/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabEntrances.axaml
index 12a4fb3b..2beff3b8 100644
--- a/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabEntrances.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabEntrances.axaml
@@ -39,6 +39,6 @@
       <RadioButton IsChecked="{Binding Path=EntMode, Converter={StaticResource ComparisonConverter}, ConverterParameter={x:Static local:EntEditMode.PlaceEntity}}" VerticalAlignment="Top" Margin="2" Grid.Row="1" Grid.Column="1">Add/Delete</RadioButton>
     </Grid>
     <TextBlock Margin="4,2" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="1" Grid.Column="0">Direction:</TextBlock>
-    <views:SearchComboBox Items="{Binding Directions}" SelectedIndex="{Binding ChosenDir}" VirtualizationMode="Simple" VerticalAlignment="Center" Margin="4,2" Grid.Row="1" Grid.Column="1"/>
+    <views:SearchComboBox ItemsSource="{Binding Directions}" SelectedIndex="{Binding ChosenDir}" VerticalAlignment="Center" Margin="4,2" Grid.Row="1" Grid.Column="1"/>
   </Grid>
 </UserControl>
diff --git a/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabEntrances.axaml.cs b/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabEntrances.axaml.cs
index 5812f66f..60cecd18 100644
--- a/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabEntrances.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabEntrances.axaml.cs
@@ -4,16 +4,11 @@
 
 namespace RogueEssence.Dev.Views
 {
-    public class MapTabEntrances : UserControl
+    public partial class MapTabEntrances : UserControl
     {
         public MapTabEntrances()
         {
             this.InitializeComponent();
         }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
     }
 }
diff --git a/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabItems.axaml b/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabItems.axaml
index 4bc8f25b..b6ff3848 100644
--- a/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabItems.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabItems.axaml
@@ -46,7 +46,7 @@
         <ColumnDefinition/>
       </Grid.ColumnDefinitions>
       <TextBlock Margin="4,2" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Column="0">Item:</TextBlock>
-      <views:SearchComboBox Items="{Binding ItemTypes}" SelectedIndex="{Binding ChosenItem}" VirtualizationMode="Simple" VerticalAlignment="Center" Margin="4,2" Grid.Column="1"/>
+      <views:SearchComboBox ItemsSource="{Binding ItemTypes}" SelectedIndex="{Binding ChosenItem}"  VerticalAlignment="Center" Margin="4,2" Grid.Column="1"/>
       <TabControl TabStripPlacement="Top" SelectedIndex="{Binding TabIndex}" Margin="4" Grid.Row="1" Grid.ColumnSpan="2">
         <TabItem Header="Money" IsVisible="{Binding Path=ChosenItem, Converter={StaticResource ValidIdxConverter}, ConverterParameter=true}">
           <Grid>
diff --git a/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabItems.axaml.cs b/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabItems.axaml.cs
index 9324139f..444bf807 100644
--- a/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabItems.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabItems.axaml.cs
@@ -4,16 +4,12 @@
 
 namespace RogueEssence.Dev.Views
 {
-    public class MapTabItems : UserControl
+    public partial class MapTabItems : UserControl
     {
         public MapTabItems()
         {
             this.InitializeComponent();
         }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
+        
     }
 }
diff --git a/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabProperties.axaml b/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabProperties.axaml
index 83ea1930..0f127595 100644
--- a/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabProperties.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabProperties.axaml
@@ -37,13 +37,13 @@
       <TextBlock Margin="4,2" VerticalAlignment="Center" HorizontalAlignment="Right" ToolTip.Tip="Map name in the current language.">Map Name:</TextBlock>
       <TextBox Text="{Binding MapName}" VerticalAlignment="Center" Margin="4" Grid.Column="1" Grid.ColumnSpan="3"/>
       <TextBlock Margin="4,2" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="1" ToolTip.Tip="The darkness of the map, for seeing tiles.">Tile Sight:</TextBlock>
-      <views:SearchComboBox Items="{Binding Sights}" SelectedIndex="{Binding ChosenTileSight}" VerticalAlignment="Center" Margin="4,2" Grid.Row="1" Grid.Column="1"/>
+      <views:SearchComboBox ItemsSource="{Binding Sights}" SelectedIndex="{Binding ChosenTileSight}" VerticalAlignment="Center" Margin="4,2" Grid.Row="1" Grid.Column="1"/>
       <TextBlock Margin="4,2" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="1" Grid.Column="2" ToolTip.Tip="The darkness of the map, for seeing enemies.">Char Sight:</TextBlock>
-      <views:SearchComboBox Items="{Binding Sights}" SelectedIndex="{Binding ChosenCharSight}" VerticalAlignment="Center" Margin="4,2" Grid.Row="1" Grid.Column="3"/>
+      <views:SearchComboBox ItemsSource="{Binding Sights}" SelectedIndex="{Binding ChosenCharSight}" VerticalAlignment="Center" Margin="4,2" Grid.Row="1" Grid.Column="3"/>
       <TextBlock Margin="4,2" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="3" ToolTip.Tip="Elemental attribute of the map.">Element:</TextBlock>
-      <views:SearchComboBox Items="{Binding Elements}" SelectedIndex="{Binding ChosenElement}" VerticalAlignment="Center" Margin="4,2" Grid.Row="3" Grid.Column="1" Grid.ColumnSpan="3"/>
+      <views:SearchComboBox ItemsSource="{Binding Elements}" SelectedIndex="{Binding ChosenElement}" VerticalAlignment="Center" Margin="4,2" Grid.Row="3" Grid.Column="1" Grid.ColumnSpan="3"/>
       <TextBlock Margin="4,2" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="4" ToolTip.Tip="Choose how the edge of the map is handled.">Scroll Edge:</TextBlock>
-      <views:SearchComboBox Items="{Binding ScrollEdges}" SelectedIndex="{Binding ChosenScroll}" Margin="4" Grid.Row="4" Grid.Column="1" Grid.ColumnSpan="3"/>
+      <views:SearchComboBox ItemsSource="{Binding ScrollEdges}" SelectedIndex="{Binding ChosenScroll}" Margin="4" Grid.Row="4" Grid.Column="1" Grid.ColumnSpan="3"/>
       <TextBlock Margin="4,2" VerticalAlignment="Bottom" Grid.Row="5" Grid.ColumnSpan="2" ToolTip.Tip="Graphics to use for the background.">Background:</TextBlock>
       <views:ClassBox DataContext="{Binding BG}" Margin="4,2" Grid.Row="6" Grid.ColumnSpan="2"/>
       <TextBlock Margin="4,2" VerticalAlignment="Bottom" Grid.Row="5" Grid.Column="2" Grid.ColumnSpan="2" ToolTip.Tip="The tile to repeat when showing out-of-bounds tiles.&#x0a;Only used when Scroll Edge is set to Blank.">Blank Tiles:</TextBlock>
@@ -64,7 +64,7 @@
         <RowDefinition Height="34"/>
       </Grid.RowDefinitions>
       <TextBlock Margin="4" VerticalAlignment="Bottom" Grid.Row="0">Music:</TextBlock>
-      <ListBox Name="lbxMusic" SelectionMode="AlwaysSelected" Items="{Binding Music}" SelectedIndex="{Binding ChosenMusic}" Margin="4" Grid.Row="1"/>
+      <ListBox Name="lbxMusic" SelectionMode="AlwaysSelected" ItemsSource="{Binding Music}" SelectedIndex="{Binding ChosenMusic}" Margin="4" Grid.Row="1"/>
       <Button Name="btnReloadMusic" Command="{Binding btnReloadMusic_Click}" Margin="4" Grid.Row="2">Reload Music</Button>
     </Grid>
   </Grid>
diff --git a/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabProperties.axaml.cs b/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabProperties.axaml.cs
index ceb052fd..d1d7ce9c 100644
--- a/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabProperties.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabProperties.axaml.cs
@@ -4,16 +4,11 @@
 
 namespace RogueEssence.Dev.Views
 {
-    public class MapTabProperties : UserControl
+    public partial class MapTabProperties : UserControl
     {
         public MapTabProperties()
         {
             this.InitializeComponent();
         }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
     }
 }
diff --git a/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabSpawns.axaml.cs b/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabSpawns.axaml.cs
index 5a9b89ce..a1b530ce 100644
--- a/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabSpawns.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabSpawns.axaml.cs
@@ -4,16 +4,11 @@
 
 namespace RogueEssence.Dev.Views
 {
-    public class MapTabSpawns : UserControl
+    public partial class MapTabSpawns : UserControl
     {
         public MapTabSpawns()
         {
             this.InitializeComponent();
         }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
     }
 }
diff --git a/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabTerrain.axaml b/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabTerrain.axaml
index 339e6424..f407c31f 100644
--- a/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabTerrain.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabTerrain.axaml
@@ -49,7 +49,7 @@
         <ColumnDefinition/>
         <ColumnDefinition Width="120"/>
       </Grid.ColumnDefinitions>
-      <views:SearchComboBox Items="{Binding TerrainTypes}" SelectedIndex="{Binding ChosenTerrain}" VirtualizationMode="Simple" VerticalAlignment="Center" Margin="4,2" Grid.Column="0"/>
+      <views:SearchComboBox ItemsSource="{Binding TerrainTypes}" SelectedIndex="{Binding ChosenTerrain}" VerticalAlignment="Center" Margin="4,2" Grid.Column="0"/>
       <CheckBox Margin="4" IsChecked="{Binding StableTex}" Grid.Column="1" ToolTip.Tip="Prevents the texture from being overwritten by the Texture Map.">Stable Texture</CheckBox>
     </Grid>
     <TabControl TabStripPlacement="Top" SelectedIndex="{Binding TabIndex}" Margin="4" Grid.Row="2" Grid.ColumnSpan="2">
diff --git a/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabTerrain.axaml.cs b/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabTerrain.axaml.cs
index b29b4d89..57562e72 100644
--- a/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabTerrain.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabTerrain.axaml.cs
@@ -4,16 +4,11 @@
 
 namespace RogueEssence.Dev.Views
 {
-    public class MapTabTerrain : UserControl
+    public partial class MapTabTerrain : UserControl
     {
         public MapTabTerrain()
         {
             this.InitializeComponent();
         }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
     }
 }
diff --git a/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabTextures.axaml.cs b/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabTextures.axaml.cs
index 06096d71..b6d2993b 100644
--- a/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabTextures.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabTextures.axaml.cs
@@ -4,16 +4,11 @@
 
 namespace RogueEssence.Dev.Views
 {
-    public class MapTabTextures : UserControl
+    public partial class MapTabTextures : UserControl
     {
         public MapTabTextures()
         {
             this.InitializeComponent();
         }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
     }
 }
diff --git a/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabTiles.axaml b/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabTiles.axaml
index da91621b..944dd81b 100644
--- a/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabTiles.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabTiles.axaml
@@ -49,9 +49,9 @@
         <ColumnDefinition/>
       </Grid.ColumnDefinitions>
       <TextBlock Margin="4,2" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Column="0">Tile:</TextBlock>
-      <views:SearchComboBox Items="{Binding TileTypes}" SelectedIndex="{Binding ChosenTile}" VirtualizationMode="Simple" VerticalAlignment="Center" Margin="4,2" Grid.Column="1"/>
+      <views:SearchComboBox ItemsSource="{Binding TileTypes}" SelectedIndex="{Binding ChosenTile}"  VerticalAlignment="Center" Margin="4,2" Grid.Column="1"/>
       <TextBlock Margin="4,2" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Column="2">Owner:</TextBlock>
-      <views:SearchComboBox Items="{Binding Owners}" SelectedIndex="{Binding ChosenOwner}" VerticalAlignment="Center" Margin="4,2" Grid.Column="3"/>
+      <views:SearchComboBox ItemsSource="{Binding Owners}" SelectedIndex="{Binding ChosenOwner}" VerticalAlignment="Center" Margin="4,2" Grid.Column="3"/>
     </Grid>
     <Grid Grid.Row="2">
       <Grid.ColumnDefinitions>
diff --git a/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabTiles.axaml.cs b/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabTiles.axaml.cs
index 50dab1e6..8cb0f861 100644
--- a/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabTiles.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabTiles.axaml.cs
@@ -4,16 +4,11 @@
 
 namespace RogueEssence.Dev.Views
 {
-    public class MapTabTiles : UserControl
+    public partial class MapTabTiles : UserControl
     {
         public MapTabTiles()
         {
             this.InitializeComponent();
         }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
     }
 }
diff --git a/RogueEssence.Editor.Avalonia/Views/MapEditForm/Teams/TeamWindow.axaml.cs b/RogueEssence.Editor.Avalonia/Views/MapEditForm/Teams/TeamWindow.axaml.cs
index 32434360..e2bd766a 100644
--- a/RogueEssence.Editor.Avalonia/Views/MapEditForm/Teams/TeamWindow.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/MapEditForm/Teams/TeamWindow.axaml.cs
@@ -5,23 +5,13 @@
 
 namespace RogueEssence.Dev.Views
 {
-    public class TeamWindow : Window
+    public partial class TeamWindow : Window
     {
         public TeamWindow()
         {
             this.InitializeComponent();
-#if DEBUG
-            this.AttachDevTools();
-#endif
         }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-
-
-
+        
         public void btnOK_Click(object sender, RoutedEventArgs e)
         {
             this.Close(true);
diff --git a/RogueEssence.Editor.Avalonia/Views/SearchListBox.axaml b/RogueEssence.Editor.Avalonia/Views/SearchListBox.axaml
index 5bf56874..fb9d2e37 100644
--- a/RogueEssence.Editor.Avalonia/Views/SearchListBox.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/SearchListBox.axaml
@@ -17,6 +17,6 @@
     </Grid.RowDefinitions>
     <TextBlock VerticalAlignment="Bottom" Text="{Binding DataName}" Grid.Row="0" Grid.Column="0"></TextBlock>
     <TextBox Name="txtSearch" TextWrapping="Wrap" VerticalAlignment="Center" Text="{Binding SearchText}" Margin="0,2" Grid.Row="1" Grid.Column="0"/>
-    <ListBox Name="lbxItems" SelectionMode="AlwaysSelected" Items="{Binding SearchItems}" SelectedIndex="{Binding SelectedSearchIndex}" DoubleTapped="doubleClickStart" PointerReleased="lbxItems_DoubleClick" Grid.Row="2" Grid.Column="0"/>
+    <ListBox Name="lbxItems" SelectionMode="AlwaysSelected" ItemsSource="{Binding SearchItems}" SelectedIndex="{Binding SelectedSearchIndex}" DoubleTapped="doubleClickStart" PointerReleased="lbxItems_DoubleClick" Grid.Row="2" Grid.Column="0"/>
   </Grid>
 </UserControl>
diff --git a/RogueEssence.Editor.Avalonia/Views/SearchListBox.axaml.cs b/RogueEssence.Editor.Avalonia/Views/SearchListBox.axaml.cs
index 7fd5663b..dcbebb48 100644
--- a/RogueEssence.Editor.Avalonia/Views/SearchListBox.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/SearchListBox.axaml.cs
@@ -7,19 +7,14 @@
 
 namespace RogueEssence.Dev.Views
 {
-    public class SearchListBox : UserControl
+    public partial class SearchListBox : UserControl
     {
         public SearchListBox()
         {
             this.InitializeComponent();
 
         }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-
+        
         public void slb_DataContextChanged(object sender, EventArgs e)
         {
             ViewModels.SearchListBoxViewModel viewModel = (ViewModels.SearchListBoxViewModel)DataContext;
diff --git a/RogueEssence.Editor.Avalonia/Views/Testing/TextTestForm.axaml.cs b/RogueEssence.Editor.Avalonia/Views/Testing/TextTestForm.axaml.cs
index 3e8bdbb9..a67341cc 100644
--- a/RogueEssence.Editor.Avalonia/Views/Testing/TextTestForm.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/Testing/TextTestForm.axaml.cs
@@ -13,21 +13,13 @@
 
 namespace RogueEssence.Dev.Views
 {
-    public class TextTestForm : Window
+    public partial class TextTestForm : Window
     {
 
         public TextTestForm()
         {
             InitializeComponent();
-#if DEBUG
-            this.AttachDevTools();
-#endif
         }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-
+        
     }
 }
diff --git a/RogueEssence.Editor.Avalonia/Views/UserControls/LayerBox.axaml b/RogueEssence.Editor.Avalonia/Views/UserControls/LayerBox.axaml
index 6daf7d7b..ce99e30f 100644
--- a/RogueEssence.Editor.Avalonia/Views/UserControls/LayerBox.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/UserControls/LayerBox.axaml
@@ -22,7 +22,7 @@
       <ColumnDefinition/>
     </Grid.ColumnDefinitions>
     <TextBlock Margin="4,2" VerticalAlignment="Bottom" Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="6">Layers:</TextBlock>
-    <ListBox Margin="2" SelectionMode="AlwaysSelected" Items="{Binding Layers}" SelectedIndex="{Binding ChosenLayer, Mode=TwoWay}" DoubleTapped="doubleClickStart" PointerReleased="lbxItems_DoubleClick" Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="6">
+    <ListBox Margin="2" SelectionMode="AlwaysSelected" ItemsSource="{Binding Layers}" SelectedIndex="{Binding ChosenLayer, Mode=TwoWay}" DoubleTapped="doubleClickStart" PointerReleased="lbxItems_DoubleClick" Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="6">
       <ListBox.ItemTemplate>
         <DataTemplate>
           <Grid>
diff --git a/RogueEssence.Editor.Avalonia/Views/UserControls/LayerBox.axaml.cs b/RogueEssence.Editor.Avalonia/Views/UserControls/LayerBox.axaml.cs
index 1873b6cd..a06ec56c 100644
--- a/RogueEssence.Editor.Avalonia/Views/UserControls/LayerBox.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/UserControls/LayerBox.axaml.cs
@@ -8,18 +8,13 @@
 
 namespace RogueEssence.Dev.Views
 {
-    public class LayerBox : UserControl
+    public partial class LayerBox : UserControl
     {
         public LayerBox()
         {
             this.InitializeComponent();
         }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-
+        
         bool doubleclick;
         public void doubleClickStart(object sender, RoutedEventArgs e)
         {
diff --git a/RogueEssence.Editor.Avalonia/Views/UserControls/SearchComboBox.cs b/RogueEssence.Editor.Avalonia/Views/UserControls/SearchComboBox.cs
index 065da7f9..aede150d 100644
--- a/RogueEssence.Editor.Avalonia/Views/UserControls/SearchComboBox.cs
+++ b/RogueEssence.Editor.Avalonia/Views/UserControls/SearchComboBox.cs
@@ -8,13 +8,14 @@
 using System;
 using System.Collections.Generic;
 using System.Collections;
+using Avalonia.Controls.Templates;
 using Avalonia.Styling;
 
 namespace RogueEssence.Dev.Views
 {
     public class SearchComboBox : ComboBox, IStyleable
     {
-        Type IStyleable.StyleKey => typeof(ComboBox);
+        protected override Type StyleKeyOverride => typeof(ComboBox);
 
         private string workingSearch;
         private bool[] processedKey;
@@ -22,6 +23,9 @@ public SearchComboBox() : base()
         {
             workingSearch = "";
             processedKey = new bool[26];
+            
+            var itemsPanelTemplate = new FuncTemplate<Panel>(() => new VirtualizingStackPanel());
+            ItemsPanel = itemsPanelTemplate;
         }
 
         protected override void OnKeyDown(KeyEventArgs e)
diff --git a/RogueEssence.Editor.Avalonia/Views/UserControls/TeamBox.axaml b/RogueEssence.Editor.Avalonia/Views/UserControls/TeamBox.axaml
index fb62fa3f..6a9f6669 100644
--- a/RogueEssence.Editor.Avalonia/Views/UserControls/TeamBox.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/UserControls/TeamBox.axaml
@@ -20,7 +20,7 @@
       <ColumnDefinition/>
     </Grid.ColumnDefinitions>
     <TextBlock Margin="4,2" VerticalAlignment="Bottom" Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="4">Teams:</TextBlock>
-    <TreeView Margin="2" Items="{Binding Teams}" SelectedItem="{Binding ChosenTeam}" DoubleTapped="doubleClickStart" PointerReleased="lbxItems_DoubleClick" Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="6">
+    <TreeView Margin="2" ItemsSource="{Binding Teams}" SelectedItem="{Binding ChosenTeam}" DoubleTapped="doubleClickStart" PointerReleased="lbxItems_DoubleClick" Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="6">
       
       <TreeView.DataTemplates>
         <TreeDataTemplate DataType="vm:TeamNodeViewModel" ItemsSource="{Binding Players}">
diff --git a/RogueEssence.Editor.Avalonia/Views/UserControls/TeamBox.axaml.cs b/RogueEssence.Editor.Avalonia/Views/UserControls/TeamBox.axaml.cs
index 156976ad..4cd151cd 100644
--- a/RogueEssence.Editor.Avalonia/Views/UserControls/TeamBox.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/UserControls/TeamBox.axaml.cs
@@ -8,18 +8,13 @@
 
 namespace RogueEssence.Dev.Views
 {
-    public class TeamBox : UserControl
+    public partial class TeamBox : UserControl
     {
         public TeamBox()
         {
             this.InitializeComponent();
         }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-
+        
         bool doubleclick;
         public void doubleClickStart(object sender, RoutedEventArgs e)
         {

From 1f41c2d8e30086925690fef8514e88cad9f81c84 Mon Sep 17 00:00:00 2001
From: Kace <41309226+DoubleTrio@users.noreply.github.com>
Date: Fri, 12 Sep 2025 19:46:31 -0400
Subject: [PATCH 02/51] replace file dialog with top level

---
 .../ViewModels/Content/AnimEditViewModel.cs   | 91 +++++++++--------
 .../Content/TilesetEditViewModel.cs           | 99 +++++++++++--------
 .../GroundEditForm/GroundEditViewModel.cs     | 93 +++++++++++------
 .../MapEditForm/MapEditViewModel.cs           | 92 ++++++++++-------
 4 files changed, 226 insertions(+), 149 deletions(-)

diff --git a/RogueEssence.Editor.Avalonia/ViewModels/Content/AnimEditViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/Content/AnimEditViewModel.cs
index eb697f80..a6c9e45f 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/Content/AnimEditViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/Content/AnimEditViewModel.cs
@@ -9,7 +9,10 @@
 using RogueEssence.Data;
 using RogueEssence.Content;
 using System.IO;
+using System.Linq;
 using Avalonia.Media.Imaging;
+using Avalonia.Platform.Storage;
+using Avalonia.Threading;
 using RogueElements;
 using RogueEssence.Dev.Views;
 
@@ -130,53 +133,59 @@ public async void btnImport_Click()
             string folderName = DevForm.GetConfig(Name + "Dir", Directory.GetCurrentDirectory());
 
             //open window to choose directory
-            OpenFileDialog openFileDialog = new OpenFileDialog();
-            openFileDialog.Directory = folderName;
-
-            {
-                FileDialogFilter filter = new FileDialogFilter();
-                filter.Name = "PNG Files";
-                filter.Extensions.Add("png");
-                openFileDialog.Filters.Add(filter);
-            }
-            {
-                FileDialogFilter filter = new FileDialogFilter();
-                filter.Name = "DirData XML";
-                filter.Extensions.Add("xml");
-                openFileDialog.Filters.Add(filter);
-            }
-
-            string[] results = await openFileDialog.ShowAsync(parent);
-
-            if (results != null && results.Length > 0)
+            IStorageFolder directory = await parent.StorageProvider.TryGetFolderFromPathAsync(folderName);
+            await Dispatcher.UIThread.InvokeAsync(async () =>
             {
-                string animName = Path.GetFileNameWithoutExtension(results[0]);
+                IReadOnlyList<IStorageFile> results = await parent.StorageProvider.OpenFilePickerAsync(new FilePickerOpenOptions 
+                {
+                    Title = "Open .png or .xml File",
+                    SuggestedStartLocation = directory,
+                    AllowMultiple = false,
+                    FileTypeFilter =
+                    [
+                        new FilePickerFileType("PNG Files")
+                        {
+                            Patterns = ["*.png"]
+                        },
+                        new FilePickerFileType("DirData XML")
+                        {
+                            Patterns = ["*.xml"]
+                        }
+                    ]
+                });
 
-                if (anims.Contains(animName))
+                if (results.Count > 0)
                 {
-                    MessageBox.MessageBoxResult result = await MessageBox.Show(parent, "Are you sure you want to overwrite the existing sheet:\n" + animName, "Sprite Sheet already exists.",
-                        MessageBox.MessageBoxButtons.YesNo);
-                    if (result == MessageBox.MessageBoxResult.No)
-                        return;
-                }
+                    string filePath = results.First().Path.LocalPath;
+                    string animName = Path.GetFileNameWithoutExtension(filePath);
 
-                DevForm.SetConfig(Name + "Dir", Path.GetDirectoryName(results[0]));
-                if (Path.GetExtension(results[0]) == ".xml")
-                    CachedPath = Path.GetDirectoryName(results[0]);
-                else
-                    CachedPath = results[0];
+                    if (anims.Contains(animName))
+                    {
+                        MessageBox.MessageBoxResult result = await MessageBox.Show(parent,
+                            "Are you sure you want to overwrite the existing sheet:\n" + animName,
+                            "Sprite Sheet already exists.",
+                            MessageBox.MessageBoxButtons.YesNo);
+                        if (result == MessageBox.MessageBoxResult.No)
+                            return;
+                    }
+                    DevForm.SetConfig(Name + "Dir", Path.GetDirectoryName(filePath));
+                    if (Path.GetExtension(filePath) == ".xml")
+                        CachedPath = Path.GetDirectoryName(filePath);
+                    else
+                        CachedPath = filePath;
 
-                try
-                {
-                    Import(CachedPath);
-                }
-                catch (Exception ex)
-                {
-                    DiagManager.Instance.LogError(ex, false);
-                    await MessageBox.Show(parent, "Error importing from\n" + CachedPath + "\n\n" + ex.Message, "Import Failed", MessageBox.MessageBoxButtons.Ok);
-                    return;
+                    try
+                    {
+                        Import(CachedPath);
+                    }
+                    catch (Exception ex)
+                    {
+                        DiagManager.Instance.LogError(ex, false);
+                        await MessageBox.Show(parent, "Error importing from\n" + CachedPath + "\n\n" + ex.Message, "Import Failed", MessageBox.MessageBoxButtons.Ok);
+                        return;
+                    }
                 }
-            }
+            });
         }
 
         public async void btnReImport_Click()
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/Content/TilesetEditViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/Content/TilesetEditViewModel.cs
index 0aa69058..4023b8ae 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/Content/TilesetEditViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/Content/TilesetEditViewModel.cs
@@ -9,10 +9,12 @@
 using RogueEssence.Data;
 using RogueEssence.Content;
 using System.IO;
+using System.Linq;
 using Avalonia.Media.Imaging;
 using RogueElements;
 using RogueEssence.Dev.Views;
-using System.Threading.Tasks;
+using Avalonia.Platform.Storage;
+using Avalonia.Threading;
 
 namespace RogueEssence.Dev.ViewModels
 {
@@ -147,55 +149,68 @@ public async void btnImport_Click()
             string folderName = DevForm.GetConfig("TilesetDir", Directory.GetCurrentDirectory());
 
             //open window to choose directory
-            OpenFileDialog openFileDialog = new OpenFileDialog();
-            openFileDialog.Directory = folderName;
-
-            FileDialogFilter filter = new FileDialogFilter();
-            filter.Name = "PNG Files";
-            filter.Extensions.Add("png");
-            openFileDialog.Filters.Add(filter);
-
-            string[] results = await openFileDialog.ShowAsync(parent);
-
-            if (results == null || results.Length == 0)
-                return;
-            
-            string animName = Path.GetFileNameWithoutExtension(results[0]);
-
-            if (tileIndices.Contains(animName))
+            IStorageFolder directory = await parent.StorageProvider.TryGetFolderFromPathAsync(folderName);
+            await Dispatcher.UIThread.InvokeAsync(async () =>
             {
-                MessageBox.MessageBoxResult result = await MessageBox.Show(parent, "Are you sure you want to overwrite the existing sheet:\n" + animName, "Sprite Sheet already exists.",
-                    MessageBox.MessageBoxButtons.YesNo);
-                if (result == MessageBox.MessageBoxResult.No)
+                IReadOnlyList<IStorageFile> results = await parent.StorageProvider.OpenFilePickerAsync(new FilePickerOpenOptions 
+                    {
+                        Title = "Open .png File",
+                        SuggestedStartLocation = directory,
+                        AllowMultiple = false,
+                        FileTypeFilter =
+                        [
+                            new FilePickerFileType("PNG Files")
+                            {
+                                Patterns = ["*.PNG"]
+                            }
+                        ]
+                    }
+                );
+
+
+
+                if (results.Count <= 0)
                     return;
-            }
 
-            MapRetileWindow window = new MapRetileWindow();
-            MapRetileViewModel viewModel = new MapRetileViewModel(GraphicsManager.TileSize, "Tile size must be divisible by 8.");
-            window.DataContext = viewModel;
+                string animName = Path.GetFileNameWithoutExtension(results.First().Path.LocalPath);
 
-            bool sizeResult = await window.ShowDialog<bool>(parent);
-            int size = viewModel.TileSize;
+                if (tileIndices.Contains(animName))
+                {
+                    MessageBox.MessageBoxResult result = await MessageBox.Show(parent,
+                        "Are you sure you want to overwrite the existing sheet:\n" + animName,
+                        "Sprite Sheet already exists.",
+                        MessageBox.MessageBoxButtons.YesNo);
+                    if (result == MessageBox.MessageBoxResult.No)
+                        return;
+                }
 
-            if (!sizeResult || size == 0)
-                return;
+                MapRetileWindow window = new MapRetileWindow();
+                MapRetileViewModel viewModel =
+                    new MapRetileViewModel(GraphicsManager.TileSize, "Tile size must be divisible by 8.");
+                window.DataContext = viewModel;
 
-            DevForm.SetConfig("TilesetDir", Path.GetDirectoryName(results[0]));
-            CachedPath = results[0];
-            cachedSize = size;
+                bool sizeResult = await window.ShowDialog<bool>(parent);
+                int size = viewModel.TileSize;
 
+                if (!sizeResult || size == 0)
+                    return;
 
-            try
-            {
-                Import(CachedPath, cachedSize);
-            }
-            catch (Exception ex)
-            {
-                DiagManager.Instance.LogError(ex, false);
-                await MessageBox.Show(parent, "Error importing from\n" + CachedPath + "\n\n" + ex.Message, "Import Failed", MessageBox.MessageBoxButtons.Ok);
-                return;
-            }
-            
+                DevForm.SetConfig("TilesetDir", Path.GetDirectoryName(results.First().Path.LocalPath));
+                CachedPath = results.First().Path.LocalPath;
+                cachedSize = size;
+                
+                try
+                {
+                    Import(CachedPath, cachedSize);
+                }
+                catch (Exception ex)
+                {
+                    DiagManager.Instance.LogError(ex, false);
+                    await MessageBox.Show(parent, "Error importing from\n" + CachedPath + "\n\n" + ex.Message,
+                        "Import Failed", MessageBox.MessageBoxButtons.Ok);
+                    return;
+                }
+            });
         }
 
         public async void btnReImport_Click()
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/GroundEditViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/GroundEditViewModel.cs
index 87119596..fd59fa2e 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/GroundEditViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/GroundEditViewModel.cs
@@ -18,6 +18,7 @@
 using System.Diagnostics;
 using System.Threading.Tasks;
 using Avalonia.Platform.Storage;
+using Avalonia.Threading;
 
 namespace RogueEssence.Dev.ViewModels
 {
@@ -72,34 +73,49 @@ public void mnuNew_Click()
 
         public async void mnuOpen_Click()
         {
-            string mapDir = Path.GetFullPath(PathMod.ModPath(DataManager.GROUND_PATH));
-            OpenFileDialog openFileDialog = new OpenFileDialog();
-            openFileDialog.Directory = mapDir;
 
-            FileDialogFilter filter = new FileDialogFilter();
-            filter.Name = "Ground Files";
-            filter.Extensions.Add(DataManager.GROUND_EXT.Substring(1));
-            openFileDialog.Filters.Add(filter);
+            string mapDir = Path.GetFullPath(PathMod.ModPath(DataManager.GROUND_PATH));
             DevForm form = (DevForm)DiagManager.Instance.DevEditor;
-            
-            string[] results = await openFileDialog.ShowAsync(form.GroundEditForm);
-            
-            if (results != null && results.Length > 0)
+            IStorageFolder directory = await form.GroundEditForm.StorageProvider.TryGetFolderFromPathAsync(mapDir);
+            await Dispatcher.UIThread.InvokeAsync(async () =>
             {
-                bool legalPath = false;
-                foreach (string proposedPath in PathMod.FallbackPaths(DataManager.GROUND_PATH))
+                IReadOnlyList<IStorageFile> results = await form.GroundEditForm.StorageProvider.OpenFilePickerAsync(new FilePickerOpenOptions
                 {
-                    if (comparePaths(proposedPath, Path.GetDirectoryName(results[0])))
-                        legalPath = true;
-                }
-                if (!legalPath)
-                    await MessageBox.Show(form.GroundEditForm, String.Format("Map can only be loaded from:\n{0}\nOr one of its parents.", PathMod.ModPath(DataManager.GROUND_PATH)), "Error", MessageBox.MessageBoxButtons.Ok);
-                else
+                    Title = "Open .rsground File",
+                    SuggestedStartLocation = directory,
+                    AllowMultiple = false,
+                    FileTypeFilter =
+                    [
+                        new FilePickerFileType("Ground Files")
+                        {
+                            Patterns = ["*." + DataManager.GROUND_EXT.Substring(1)]
+                        }
+                    ]
+                });
+                
+                if (results.Count > 0)
                 {
-                    lock (GameBase.lockObj)
-                        DoLoad(Path.GetFileNameWithoutExtension(results[0]));
+                    IStorageFile result = results.First();
+                   
+                    bool legalPath = false;
+                    foreach (string proposedPath in PathMod.FallbackPaths(DataManager.GROUND_PATH))
+                    {
+                        if (comparePaths(proposedPath, Path.GetDirectoryName(result.Path.LocalPath)))
+                            legalPath = true;
+                    }
+
+                    if (!legalPath)
+                        await MessageBox.Show(form.GroundEditForm,
+                            String.Format("Map can only be loaded from:\n{0}\nOr one of its parents.",
+                                PathMod.ModPath(DataManager.GROUND_PATH)), "Error",
+                            MessageBox.MessageBoxButtons.Ok);
+                    else
+                    {
+                        lock (GameBase.lockObj)
+                            DoLoad(Path.GetFileNameWithoutExtension(result.Name));
+                    }
                 }
-            }
+            });
         }
 
         public async Task<bool> mnuSave_Click()
@@ -173,20 +189,33 @@ public async void mnuTest_Click()
         public async void mnuImportFromPng_Click()
         {
             string mapDir = Path.GetFullPath(PathMod.ModPath(DataManager.GROUND_PATH));
-            OpenFileDialog openFileDialog = new OpenFileDialog();
-            openFileDialog.Directory = mapDir;
 
-            FileDialogFilter filter = new FileDialogFilter();
-            filter.Name = "PNG Files";
-            filter.Extensions.Add("png");
-            openFileDialog.Filters.Add(filter);
 
             DevForm form = (DevForm)DiagManager.Instance.DevEditor;
 
-            string[] results = await openFileDialog.ShowAsync(form.GroundEditForm);
-
-            if (results != null && results.Length > 0)
-                DoImportPng(results[0]);
+            
+            IStorageFolder directory = await form.GroundEditForm.StorageProvider.TryGetFolderFromPathAsync(mapDir);
+            await Dispatcher.UIThread.InvokeAsync(async () =>
+            {
+                IReadOnlyList<IStorageFile> results = await form.GroundEditForm.StorageProvider.OpenFilePickerAsync(new FilePickerOpenOptions 
+                    {
+                        Title = "Open .png File",
+                        SuggestedStartLocation = directory,
+                        AllowMultiple = false,
+                        FileTypeFilter =
+                        [
+                            new FilePickerFileType("PNG Files")
+                            {
+                                Patterns = ["*.PNG"]
+                            }
+                        ]
+                    }
+                );
+                
+                if (results.Count > 0)
+                    DoImportPng(results.First().Path.LocalPath);
+  
+            });
         }
 
 
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/MapEditForm/MapEditViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/MapEditForm/MapEditViewModel.cs
index 0b4f9fb7..1106c2cd 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/MapEditForm/MapEditViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/MapEditForm/MapEditViewModel.cs
@@ -19,6 +19,8 @@
 using System.Threading.Tasks;
 using Microsoft.VisualBasic;
 using System.Reflection.Emit;
+using Avalonia.Platform.Storage;
+using Avalonia.Threading;
 
 namespace RogueEssence.Dev.ViewModels
 {
@@ -80,34 +82,44 @@ public void mnuNew_Click()
         public async void mnuOpen_Click()
         {
             string mapDir = Path.GetFullPath(PathMod.ModPath(DataManager.MAP_PATH));
-            OpenFileDialog openFileDialog = new OpenFileDialog();
-            openFileDialog.Directory = mapDir;
-
-            FileDialogFilter filter = new FileDialogFilter();
-            filter.Name = "Map Files";
-            filter.Extensions.Add(DataManager.MAP_EXT.Substring(1));
-            openFileDialog.Filters.Add(filter);
-
             DevForm form = (DevForm)DiagManager.Instance.DevEditor;
-
-            string[] results = await openFileDialog.ShowAsync(form.MapEditForm);
-
-            if (results != null && results.Length > 0)
+            IStorageFolder directory = await form.GroundEditForm.StorageProvider.TryGetFolderFromPathAsync(mapDir);
+            
+            await Dispatcher.UIThread.InvokeAsync(async () =>
             {
-                bool legalPath = false;
-                foreach (string proposedPath in PathMod.FallbackPaths(DataManager.MAP_PATH))
+                IReadOnlyList<IStorageFile> results = await form.StorageProvider.OpenFilePickerAsync(new FilePickerOpenOptions
                 {
-                    if (comparePaths(proposedPath, Path.GetDirectoryName(results[0])))
-                        legalPath = true;
-                }
-                if (!legalPath)
-                    await MessageBox.Show(form.MapEditForm, String.Format("Map can only be loaded from:\n{0}\nOr one of its parents.", PathMod.ModPath(DataManager.MAP_PATH)), "Error", MessageBox.MessageBoxButtons.Ok);
-                else
+                    Title = "Open .rsmap File",
+                    SuggestedStartLocation = directory,
+                    AllowMultiple = false,
+                    FileTypeFilter =
+                    [
+                        new FilePickerFileType("Map Files")
+                        {
+                            Patterns = ["*." + DataManager.MAP_EXT.Substring(1)]
+                        }
+                    ]
+                });
+                if (results.Count > 0)
                 {
-                    lock (GameBase.lockObj)
-                        DoLoad(Path.GetFileNameWithoutExtension(results[0]));
+                    IStorageFile result = results.First();
+                    
+                    bool legalPath = false;
+                    foreach (string proposedPath in PathMod.FallbackPaths(DataManager.MAP_PATH))
+                    {
+                        if (comparePaths(proposedPath, Path.GetDirectoryName(result.Path.LocalPath)))
+                            legalPath = true;
+                    }
+                    if (!legalPath)
+                        await MessageBox.Show(form.MapEditForm, String.Format("Map can only be loaded from:\n{0}\nOr one of its parents.", PathMod.ModPath(DataManager.MAP_PATH)), "Error", MessageBox.MessageBoxButtons.Ok);
+                    else
+                    {
+                        lock (GameBase.lockObj)
+                            DoLoad(Path.GetFileNameWithoutExtension(results.First().Name));
+                    }
                 }
-            }
+                
+            });
         }
 
 
@@ -216,20 +228,32 @@ public async void mnuTest_Click()
         public async void mnuImportFromPng_Click()
         {
             string mapDir = Path.GetFullPath(PathMod.ModPath(DataManager.MAP_PATH));
-            OpenFileDialog openFileDialog = new OpenFileDialog();
-            openFileDialog.Directory = mapDir;
-
-            FileDialogFilter filter = new FileDialogFilter();
-            filter.Name = "PNG Files";
-            filter.Extensions.Add("png");
-            openFileDialog.Filters.Add(filter);
-
             DevForm form = (DevForm)DiagManager.Instance.DevEditor;
+            IStorageFolder directory = await form.MapEditForm.StorageProvider.TryGetFolderFromPathAsync(mapDir);
 
-            string[] results = await openFileDialog.ShowAsync(form.MapEditForm);
+            await Dispatcher.UIThread.InvokeAsync(async () =>
+            {
+                IReadOnlyList<IStorageFile> results = await form.MapEditForm.StorageProvider.OpenFilePickerAsync(new FilePickerOpenOptions
+                {
+                    Title = "Open .png File",
+                    SuggestedStartLocation = directory,
+                    AllowMultiple = false,
+                    FileTypeFilter =
+                    [
+                        new FilePickerFileType("PNG Files")
+                        {
+                            Patterns = ["*.PNG"]
+                        }
+                    ]
+                });
+                
+                if (results.Count > 0)
+                {
+                    IStorageFile result = results.First();
+                    DoImportPng(result.Path.LocalPath);
 
-            if (results != null && results.Length > 0)
-                DoImportPng(results[0]);
+                }
+            });
         }
 
         public void mnuClearLayer_Click()

From 2b707fd8029bbc07da5a0261bd4a00c67948ac78 Mon Sep 17 00:00:00 2001
From: Kace <41309226+DoubleTrio@users.noreply.github.com>
Date: Fri, 12 Sep 2025 22:31:57 -0400
Subject: [PATCH 03/51] upgrade folderdialogue

---
 .../ViewModels/Content/AnimEditViewModel.cs   |  42 ++++--
 .../ViewModels/Content/BeamEditViewModel.cs   |  88 +++++++++----
 .../Content/SpeciesEditViewModel.cs           | 121 ++++++++++--------
 .../Content/TilesetEditViewModel.cs           |  83 +++++++-----
 .../ViewModels/DevForm/DevTabDataViewModel.cs |  48 +++++--
 5 files changed, 242 insertions(+), 140 deletions(-)

diff --git a/RogueEssence.Editor.Avalonia/ViewModels/Content/AnimEditViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/Content/AnimEditViewModel.cs
index a6c9e45f..5b80b6ea 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/Content/AnimEditViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/Content/AnimEditViewModel.cs
@@ -82,13 +82,22 @@ public async void mnuMassImport_Click()
             string folderName = DevForm.GetConfig(Name + "Dir", Directory.GetCurrentDirectory());
 
             //open window to choose directory
-            OpenFolderDialog openFileDialog = new OpenFolderDialog();
-            openFileDialog.Directory = folderName;
+            IStorageFolder directory = await parent.StorageProvider.TryGetFolderFromPathAsync(folderName);
+            await Dispatcher.UIThread.InvokeAsync(async () =>
+            {
+                IReadOnlyList<IStorageFolder> results = await parent.StorageProvider.OpenFolderPickerAsync(new FolderPickerOpenOptions
+                {
+                    Title = "Select folder to mass import",
+                    SuggestedStartLocation = directory,
+                    AllowMultiple = false,
+                    
 
-            string folder = await openFileDialog.ShowAsync(parent);
+                });
 
-            if (!String.IsNullOrEmpty(folder))
-            {
+                if (results.Count <= 0) 
+                    return;
+
+                string folder = results.First().Path.LocalPath;
                 DevForm.SetConfig(Name + "Dir", folder);
                 CachedPath = folder + "/";
 
@@ -102,7 +111,7 @@ public async void mnuMassImport_Click()
                     await MessageBox.Show(parent, "Error importing from\n" + CachedPath + "\n\n" + ex.Message, "Import Failed", MessageBox.MessageBoxButtons.Ok);
                     return;
                 }
-            }
+            });
         }
 
         public async void mnuMassExport_Click()
@@ -111,20 +120,29 @@ public async void mnuMassExport_Click()
             string folderName = DevForm.GetConfig(Name + "Dir", Directory.GetCurrentDirectory());
 
             //open window to choose directory
-            OpenFolderDialog openFileDialog = new OpenFolderDialog();
-            openFileDialog.Directory = folderName;
+            IStorageFolder directory = await parent.StorageProvider.TryGetFolderFromPathAsync(folderName);
+            await Dispatcher.UIThread.InvokeAsync(async () =>
+            {
+                IReadOnlyList<IStorageFolder> results = await parent.StorageProvider.OpenFolderPickerAsync(
+                    new FolderPickerOpenOptions
+                    {
+                        Title = "Select folder to mass export to",
+                        SuggestedStartLocation = directory,
+                        AllowMultiple = false,
+                    });
 
-            string folder = await openFileDialog.ShowAsync(parent);
+                if (results.Count <= 0)
+                    return;
 
-            if (!String.IsNullOrEmpty(folder))
-            {
+                string folder = results.First().Path.LocalPath;
+                
                 DevForm.SetConfig(Name + "Dir", folder);
                 CachedPath = folder + "/";
 
                 bool success = MassExport(CachedPath);
                 if (!success)
                     await MessageBox.Show(parent, "Errors found exporting to\n" + CachedPath + "\n\nCheck logs for more info.", "Mass Export Failed", MessageBox.MessageBoxButtons.Ok);
-            }
+            });
         }
 
         public async void btnImport_Click()
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/Content/BeamEditViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/Content/BeamEditViewModel.cs
index b8beba1b..29f99a55 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/Content/BeamEditViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/Content/BeamEditViewModel.cs
@@ -9,7 +9,10 @@
 using RogueEssence.Data;
 using RogueEssence.Content;
 using System.IO;
+using System.Linq;
 using Avalonia.Media.Imaging;
+using Avalonia.Platform.Storage;
+using Avalonia.Threading;
 using RogueElements;
 using RogueEssence.Dev.Views;
 
@@ -78,15 +81,24 @@ public async void mnuMassImport_Click()
 
             //remember addresses in registry
             string folderName = DevForm.GetConfig(Name + "Dir", Directory.GetCurrentDirectory());
-
+            
             //open window to choose directory
-            OpenFolderDialog openFileDialog = new OpenFolderDialog();
-            openFileDialog.Directory = folderName;
+            IStorageFolder directory = await parent.StorageProvider.TryGetFolderFromPathAsync(folderName);
+            await Dispatcher.UIThread.InvokeAsync(async () =>
+            {
+                IReadOnlyList<IStorageFolder> results = await parent.StorageProvider.OpenFolderPickerAsync(
+                    new FolderPickerOpenOptions
+                    {
+                        Title = "Select folder to mass import",
+                        SuggestedStartLocation = directory,
+                        AllowMultiple = false,
+                    });
 
-            string folder = await openFileDialog.ShowAsync(parent);
+                if (results.Count <= 0)
+                    return;
 
-            if (!String.IsNullOrEmpty(folder))
-            {
+                string folder = results.First().Path.LocalPath;
+                
                 DevForm.SetConfig(Name + "Dir", folder);
                 CachedPath = folder + "/";
 
@@ -101,7 +113,9 @@ public async void mnuMassImport_Click()
                     await MessageBox.Show(parent, "Error importing from\n" + CachedPath + "\n\n" + ex.Message, "Import Failed", MessageBox.MessageBoxButtons.Ok);
                     return;
                 }
-            }
+
+            });
+
         }
 
         public async void mnuMassExport_Click()
@@ -110,20 +124,28 @@ public async void mnuMassExport_Click()
             string folderName = DevForm.GetConfig(Name + "Dir", Directory.GetCurrentDirectory());
 
             //open window to choose directory
-            OpenFolderDialog openFileDialog = new OpenFolderDialog();
-            openFileDialog.Directory = folderName;
+            IStorageFolder directory = await parent.StorageProvider.TryGetFolderFromPathAsync(folderName);
+            await Dispatcher.UIThread.InvokeAsync(async () =>
+            {
+                IReadOnlyList<IStorageFolder> results = await parent.StorageProvider.OpenFolderPickerAsync(
+                    new FolderPickerOpenOptions
+                    {
+                        Title = "Select folder to mass export to",
+                        SuggestedStartLocation = directory,
+                        AllowMultiple = false,
+                    });
 
-            string folder = await openFileDialog.ShowAsync(parent);
+                if (results.Count <= 0)
+                    return;
 
-            if (!String.IsNullOrEmpty(folder))
-            {
+                string folder = results.First().Path.LocalPath;
                 DevForm.SetConfig(Name + "Dir", folder);
                 CachedPath = folder + "/";
 
                 bool success = MassExport(CachedPath);
                 if (!success)
                     await MessageBox.Show(parent, "Errors found exporting to\n" + CachedPath + "\n\nCheck logs for more info.", "Mass Export Failed", MessageBox.MessageBoxButtons.Ok);
-            }
+            });
         }
 
         public async void btnImport_Click()
@@ -132,13 +154,21 @@ public async void btnImport_Click()
             string folderName = DevForm.GetConfig(Name + "Dir", Directory.GetCurrentDirectory());
 
             //open window to choose directory
-            OpenFolderDialog openFileDialog = new OpenFolderDialog();
-            openFileDialog.Directory = folderName;
+            IStorageFolder directory = await parent.StorageProvider.TryGetFolderFromPathAsync(folderName);
+            await Dispatcher.UIThread.InvokeAsync(async () =>
+            {
+                IReadOnlyList<IStorageFolder> results = await parent.StorageProvider.OpenFolderPickerAsync(
+                    new FolderPickerOpenOptions
+                    {
+                        Title = "Select folder to import",
+                        SuggestedStartLocation = directory,
+                        AllowMultiple = false,
+                    });
 
-            string folder = await openFileDialog.ShowAsync(parent);
+                if (results.Count <= 0)
+                    return;
 
-            if (!String.IsNullOrEmpty(folder))
-            {
+                string folder = results.First().Path.LocalPath;
                 string animName = Path.GetFileNameWithoutExtension(folder);
 
                 if (anims.Contains(animName))
@@ -162,7 +192,7 @@ public async void btnImport_Click()
                     await MessageBox.Show(parent, "Error importing from\n" + CachedPath + "\n\n" + ex.Message, "Import Failed", MessageBox.MessageBoxButtons.Ok);
                     return;
                 }
-            }
+            });
         }
 
         public async void btnReImport_Click()
@@ -188,13 +218,21 @@ public async void btnExport_Click()
             string folderName = DevForm.GetConfig(Name + "Dir", Directory.GetCurrentDirectory());
 
             //open window to choose directory
-            OpenFolderDialog openFileDialog = new OpenFolderDialog();
-            openFileDialog.Directory = folderName;
+            IStorageFolder directory = await parent.StorageProvider.TryGetFolderFromPathAsync(folderName);
+            await Dispatcher.UIThread.InvokeAsync(async () =>
+            {
+                IReadOnlyList<IStorageFolder> results = await parent.StorageProvider.OpenFolderPickerAsync(
+                    new FolderPickerOpenOptions
+                    {
+                        Title = "Select folder to export to",
+                        SuggestedStartLocation = directory,
+                        AllowMultiple = false,
+                    });
 
-            string folder = await openFileDialog.ShowAsync(parent);
+                if (results.Count <= 0)
+                    return;
 
-            if (!String.IsNullOrEmpty(folder))
-            {
+                string folder = results.First().Path.LocalPath;
                 DevForm.SetConfig(Name + "Dir", Path.GetDirectoryName(folder));
                 //CachedPath = folder;
 
@@ -208,7 +246,7 @@ public async void btnExport_Click()
                     await MessageBox.Show(parent, "Error exporting to\n" + CachedPath + "\n\n" + ex.Message, "Export Failed", MessageBox.MessageBoxButtons.Ok);
                     return;
                 }
-            }
+            });
         }
 
         public async void btnDelete_Click()
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/Content/SpeciesEditViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/Content/SpeciesEditViewModel.cs
index c41eba17..4e70e64c 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/Content/SpeciesEditViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/Content/SpeciesEditViewModel.cs
@@ -9,7 +9,10 @@
 using RogueEssence.Data;
 using RogueEssence.Content;
 using System.IO;
+using System.Linq;
 using Avalonia.Media.Imaging;
+using Avalonia.Platform.Storage;
+using Avalonia.Threading;
 using RogueElements;
 using RogueEssence.Dev.Views;
 
@@ -201,21 +204,23 @@ public async void mnuMassImport_Click()
             string folderName = DevForm.GetConfig(Name + "Dir", Directory.GetCurrentDirectory());
 
             //open window to choose directory
-            OpenFolderDialog openFileDialog = new OpenFolderDialog();
-            openFileDialog.Directory = folderName;
-
-            string folder = "";
-            try
-            {
-                folder = await openFileDialog.ShowAsync(parent);
-            }
-            catch (Exception ex)
+            IStorageFolder directory = await parent.StorageProvider.TryGetFolderFromPathAsync(folderName);
+            await Dispatcher.UIThread.InvokeAsync(async () =>
             {
-                DiagManager.Instance.LogError(ex, true);
-            }
+            
+                IReadOnlyList<IStorageFolder> results = await parent.StorageProvider.OpenFolderPickerAsync(
+                    new FolderPickerOpenOptions
+                    {
+                        Title = "Select sprite folder to mass import",
+                        SuggestedStartLocation = directory,
+                        AllowMultiple = false,
+                    });
 
-            if (!String.IsNullOrEmpty(folder))
-            {
+                if (results.Count <= 0)
+                    return;
+
+                string folder = results.First().Path.LocalPath;
+                
                 DevForm.SetConfig(Name + "Dir", folder);
                 CachedPath = folder + "/";
 
@@ -229,7 +234,10 @@ public async void mnuMassImport_Click()
                     await MessageBox.Show(parent, "Error importing from\n" + CachedPath + "\n\n" + ex.Message, "Import Failed", MessageBox.MessageBoxButtons.Ok);
                     return;
                 }
-            }
+                
+
+
+            });
         }
 
         public void mnuMassExportMulti_Click()
@@ -247,28 +255,28 @@ public async void MassExportFlow(bool singleSheet)
             string folderName = DevForm.GetConfig(Name + "Dir", Directory.GetCurrentDirectory());
 
             //open window to choose directory
-            OpenFolderDialog openFileDialog = new OpenFolderDialog();
-            openFileDialog.Directory = folderName;
-
-            string folder = "";
-            try
-            {
-                folder = await openFileDialog.ShowAsync(parent);
-            }
-            catch (Exception ex)
+            IStorageFolder directory = await parent.StorageProvider.TryGetFolderFromPathAsync(folderName);
+            await Dispatcher.UIThread.InvokeAsync(async () =>
             {
-                DiagManager.Instance.LogError(ex, true);
-            }
+                IReadOnlyList<IStorageFolder> results = await parent.StorageProvider.OpenFolderPickerAsync(
+                    new FolderPickerOpenOptions
+                    {
+                        Title = "Select folder to mass export to",
+                        SuggestedStartLocation = directory,
+                        AllowMultiple = false,
+                    });
 
-            if (!String.IsNullOrEmpty(folder))
-            {
+                if (results.Count <= 0)
+                    return;
+
+                string folder = results.First().Path.LocalPath;
                 DevForm.SetConfig(Name + "Dir", folder);
                 CachedPath = folder + "/";
 
                 bool success = MassExport(CachedPath, singleSheet);
                 if (!success)
                     await MessageBox.Show(parent, "Errors found exporting to\n" + CachedPath + "\n\nCheck logs for more info.", "Mass Export Failed", MessageBox.MessageBoxButtons.Ok);
-            }
+            });
         }
 
         public async void mnuReIndex_Click()
@@ -311,21 +319,21 @@ await MessageBox.Show(parent, "When importing sprites, " +
             string folderName = DevForm.GetConfig(Name + "Dir", Directory.GetCurrentDirectory());
 
             //open window to choose directory
-            OpenFolderDialog openFileDialog = new OpenFolderDialog();
-            openFileDialog.Directory = folderName;
-
-            string folder = "";
-            try
-            {
-                folder = await openFileDialog.ShowAsync(parent);
-            }
-            catch (Exception ex)
+            IStorageFolder directory = await parent.StorageProvider.TryGetFolderFromPathAsync(folderName);
+            await Dispatcher.UIThread.InvokeAsync(async () =>
             {
-                DiagManager.Instance.LogError(ex, true);
-            }
+                IReadOnlyList<IStorageFolder> results = await parent.StorageProvider.OpenFolderPickerAsync(
+                    new FolderPickerOpenOptions
+                    {
+                        Title = "Select folder to mass export to",
+                        SuggestedStartLocation = directory,
+                        AllowMultiple = false,
+                    });
 
-            if (!String.IsNullOrEmpty(folder))
-            {
+                if (results.Count <= 0)
+                    return;
+
+                string folder = results.First().Path.LocalPath;
                 DevForm.SetConfig(Name + "Dir", folder);
                 CachedPath = folder + "/";
 
@@ -339,7 +347,7 @@ await MessageBox.Show(parent, "When importing sprites, " +
                     await MessageBox.Show(parent, "Error importing from\n" + CachedPath + "\n\n" + ex.Message, "Import Failed", MessageBox.MessageBoxButtons.Ok);
                     return;
                 }
-            }
+            });
         }
 
         public async void btnReImport_Click()
@@ -381,21 +389,22 @@ public async void ExportFlow(bool singleSheet)
             string folderName = DevForm.GetConfig(Name + "Dir", Directory.GetCurrentDirectory());
 
             //open window to choose directory
-            OpenFolderDialog openFileDialog = new OpenFolderDialog();
-            openFileDialog.Directory = folderName;
-
-            string folder = "";
-            try
-            {
-                folder = await openFileDialog.ShowAsync(parent);
-            }
-            catch (Exception ex)
+            IStorageFolder directory = await parent.StorageProvider.TryGetFolderFromPathAsync(folderName);
+            await Dispatcher.UIThread.InvokeAsync(async () =>
             {
-                DiagManager.Instance.LogError(ex, true);
-            }
+                IReadOnlyList<IStorageFolder> results = await parent.StorageProvider.OpenFolderPickerAsync(
+                    new FolderPickerOpenOptions
+                    {
+                        Title = "Select folder to export to",
+                        SuggestedStartLocation = directory,
+                        AllowMultiple = false,
+                    });
 
-            if (!String.IsNullOrEmpty(folder))
-            {
+                if (results.Count <= 0)
+                    return;
+
+                string folder = results.First().Path.LocalPath;
+                
                 DevForm.SetConfig(Name + "Dir", folder);
                 CachedPath = folder + "/";
 
@@ -409,7 +418,7 @@ public async void ExportFlow(bool singleSheet)
                     await MessageBox.Show(parent, "Error exporting to\n" + CachedPath + "\n\n" + ex.Message, "Export Failed", MessageBox.MessageBoxButtons.Ok);
                     return;
                 }
-            }
+            });
         }
 
         public async void btnDelete_Click()
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/Content/TilesetEditViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/Content/TilesetEditViewModel.cs
index 4023b8ae..84547905 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/Content/TilesetEditViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/Content/TilesetEditViewModel.cs
@@ -71,39 +71,47 @@ public async void mnuMassImport_Click()
             string folderName = DevForm.GetConfig("TilesetDir", Directory.GetCurrentDirectory());
 
             //open window to choose directory
-            OpenFolderDialog openFileDialog = new OpenFolderDialog();
-            openFileDialog.Directory = folderName;
-
-            string folder = await openFileDialog.ShowAsync(parent);
-
-            if (!String.IsNullOrEmpty(folder))
-                return;
+            IStorageFolder directory = await parent.StorageProvider.TryGetFolderFromPathAsync(folderName);
+            await Dispatcher.UIThread.InvokeAsync(async () =>
+            {
+                IReadOnlyList<IStorageFolder> results = await parent.StorageProvider.OpenFolderPickerAsync(
+                    new FolderPickerOpenOptions
+                    {
+                        Title = "Select tileset folder to mass import",
+                        SuggestedStartLocation = directory,
+                        AllowMultiple = false,
+                    });
 
+                if (results.Count <= 0)
+                    return;
 
-            MapRetileWindow window = new MapRetileWindow();
-            MapRetileViewModel viewModel = new MapRetileViewModel(GraphicsManager.TileSize, "Tile size must be divisible by 8.");
-            window.DataContext = viewModel;
+                string folder = results.First().Path.LocalPath;
+                
+                MapRetileWindow window = new MapRetileWindow();
+                MapRetileViewModel viewModel = new MapRetileViewModel(GraphicsManager.TileSize, "Tile size must be divisible by 8.");
+                window.DataContext = viewModel;
 
-            bool sizeResult = await window.ShowDialog<bool>(parent);
-            int size = viewModel.TileSize;
+                bool sizeResult = await window.ShowDialog<bool>(parent);
+                int size = viewModel.TileSize;
 
-            if (!sizeResult || size == 0)
-                return;
+                if (!sizeResult || size == 0)
+                    return;
 
-            DevForm.SetConfig("TilesetDir", folder);
-            CachedPath = folder + "/";
-            cachedSize = size;
+                DevForm.SetConfig("TilesetDir", folder);
+                CachedPath = folder + "/";
+                cachedSize = size;
 
-            try
-            {
-                MassImport(CachedPath, cachedSize);
-            }
-            catch (Exception ex)
-            {
-                DiagManager.Instance.LogError(ex, false);
-                await MessageBox.Show(parent, "Error importing from\n" + CachedPath + "\n\n" + ex.Message, "Import Failed", MessageBox.MessageBoxButtons.Ok);
-                return;
-            }
+                try
+                {
+                    MassImport(CachedPath, cachedSize);
+                }
+                catch (Exception ex)
+                {
+                    DiagManager.Instance.LogError(ex, false);
+                    await MessageBox.Show(parent, "Error importing from\n" + CachedPath + "\n\n" + ex.Message, "Import Failed", MessageBox.MessageBoxButtons.Ok);
+                    return;
+                }
+            });
         }
 
 
@@ -112,21 +120,30 @@ public async void mnuMassExport_Click()
             //remember addresses in registry
             string folderName = DevForm.GetConfig("TilesetDir", Directory.GetCurrentDirectory());
 
+   
             //open window to choose directory
-            OpenFolderDialog openFileDialog = new OpenFolderDialog();
-            openFileDialog.Directory = folderName;
+            IStorageFolder directory = await parent.StorageProvider.TryGetFolderFromPathAsync(folderName);
+            await Dispatcher.UIThread.InvokeAsync(async () =>
+            {
+                IReadOnlyList<IStorageFolder> results = await parent.StorageProvider.OpenFolderPickerAsync(
+                    new FolderPickerOpenOptions
+                    {
+                        Title = "Select folder to mass export to",
+                        SuggestedStartLocation = directory,
+                        AllowMultiple = false,
+                    });
 
-            string folder = await openFileDialog.ShowAsync(parent);
+                if (results.Count <= 0)
+                    return;
 
-            if (!String.IsNullOrEmpty(folder))
-            {
+                string folder = results.First().Path.LocalPath;
                 DevForm.SetConfig("TilesetDir", folder);
                 CachedPath = folder + "/";
 
                 bool success = MassExport(CachedPath);
                 if (!success)
                     await MessageBox.Show(parent, "Errors found exporting to\n" + CachedPath + "\n\nCheck logs for more info.", "Mass Export Failed", MessageBox.MessageBoxButtons.Ok);
-            }
+            });
         }
 
         public async void mnuReIndex_Click()
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevTabDataViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevTabDataViewModel.cs
index 060f1291..49d86b57 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevTabDataViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevTabDataViewModel.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Avalonia.Controls;
@@ -12,6 +13,8 @@
 using RogueEssence.Menu;
 using RogueEssence.Script;
 using Avalonia.Interactivity;
+using Avalonia.Platform.Storage;
+using Avalonia.Threading;
 
 namespace RogueEssence.Dev.ViewModels
 {
@@ -86,13 +89,22 @@ private async Task importDtef(DataListForm listForm, DataListFormViewModel choic
             string folderName = DevForm.GetConfig("TilesetDir", Directory.GetCurrentDirectory());
 
             //open window to choose directory
-            OpenFolderDialog openFileDialog = new OpenFolderDialog();
-            openFileDialog.Directory = folderName;
-
-            string folder = await openFileDialog.ShowAsync(listForm);
-
-            if (!String.IsNullOrEmpty(folder))
+            IStorageFolder directory = await listForm.StorageProvider.TryGetFolderFromPathAsync(folderName);
+            await Dispatcher.UIThread.InvokeAsync(async () =>
             {
+                IReadOnlyList<IStorageFolder> results = await listForm.StorageProvider.OpenFolderPickerAsync(
+                    new FolderPickerOpenOptions
+                    {
+                        Title = "Select DTEF folder",
+                        SuggestedStartLocation = directory,
+                        AllowMultiple = false,
+                    });
+
+                if (results.Count <= 0)
+                    return;
+                
+                string folder = results.First().Path.LocalPath;
+                
                 string animName = Path.GetFileNameWithoutExtension(folder);
 
                 bool conflict = false;
@@ -125,7 +137,8 @@ private async Task importDtef(DataListForm listForm, DataListFormViewModel choic
                     await MessageBox.Show(listForm, "Error importing from\n" + folder + "\n\n" + ex.Message, "Import Failed", MessageBox.MessageBoxButtons.Ok);
                     return;
                 }
-            }
+            });
+            
         }
 
         private void tryImportDtef(DataListFormViewModel choices, string folder, string animName)
@@ -159,18 +172,25 @@ private async Task exportDtef(DataListForm listForm, int entryIndex)
                 //remember addresses in registry
                 string folderName = DevForm.GetConfig("TilesetDir", Directory.GetCurrentDirectory());
 
-                //open window to choose directory
-                OpenFolderDialog openFileDialog = new OpenFolderDialog();
-                openFileDialog.Directory = folderName;
+                IStorageFolder directory = await listForm.StorageProvider.TryGetFolderFromPathAsync(folderName);
+                await Dispatcher.UIThread.InvokeAsync(async () =>
+                {
+                    IReadOnlyList<IStorageFolder> results = await listForm.StorageProvider.OpenFolderPickerAsync(
+                        new FolderPickerOpenOptions
+                        {
+                            Title = "Select folder to export the DTEF to",
+                            SuggestedStartLocation = directory,
+                            AllowMultiple = false,
+                        });
 
-                string folder = await openFileDialog.ShowAsync(listForm);
+                    if (results.Count <= 0)
+                        return;
 
-                if (!String.IsNullOrEmpty(folder))
-                {
+                    string folder = results.First().Path.LocalPath;
                     DevForm.SetConfig("TilesetDir", Path.GetDirectoryName(folder));
 
                     DevForm.ExecuteOrPend(() => { tryExportDtef(entryIndex, folder); });
-                }
+                });
             }
         }
         private void tryExportDtef(int entryIndex, string folder)

From 7b5151e28f88cfdfcff32dc7eade46e895b3910f Mon Sep 17 00:00:00 2001
From: Kace <41309226+DoubleTrio@users.noreply.github.com>
Date: Sat, 15 Nov 2025 21:57:22 -0500
Subject: [PATCH 04/51] port over

---
 RogueEssence.Editor.Avalonia/App.axaml        |   66 +-
 RogueEssence.Editor.Avalonia/App.axaml.cs     |  200 +-
 .../Assets/Icons.axaml                        | 1688 +++++++++++++++++
 .../Assets/NodeTemplates.axaml                |   98 +
 .../Assets/Styles.axaml                       |  892 +++++++++
 .../Assets/Themes.axaml                       |   79 +
 .../Assets/TreeStyles.axaml                   |   24 +
 .../New/IconKeyToGeometryConverter.cs         |   37 +
 .../New/ObjectToColorKeyConverter.cs          |   52 +
 .../Converters/New/StringConverters.cs        |   51 +
 .../New/WindowStateToColumnConverter.cs       |   24 +
 .../Models/Locales.cs                         |   21 +
 .../Models/ModHeader.cs                       |   15 +
 RogueEssence.Editor.Avalonia/Native/Linux.cs  |   36 +
 RogueEssence.Editor.Avalonia/Native/MacOS.cs  |   31 +
 RogueEssence.Editor.Avalonia/Native/OS.cs     |   81 +
 .../Native/Windows.cs                         |  135 ++
 RogueEssence.Editor.Avalonia/NodeFactory.cs   |   48 +
 RogueEssence.Editor.Avalonia/PageFactory.cs   |   89 +
 RogueEssence.Editor.Avalonia/Program.cs       |   20 +-
 .../RogueEssence.Editor.Avalonia.csproj       |   14 +-
 .../Services/DialogService.cs                 |   87 +
 RogueEssence.Editor.Avalonia/TabEvents.cs     |   50 +
 .../Utility/NodeHelper.cs                     |   58 +
 RogueEssence.Editor.Avalonia/ViewLocator.cs   |   21 +-
 .../New/DialogBoxes/DialogViewModel.cs        |   38 +
 .../DialogBoxes/MessageBoxWindowViewModel.cs  |   46 +
 .../DialogBoxes/PreferencesWindowViewModel.cs |  110 ++
 .../New/DialogBoxes/RenameWindowViewModel.cs  |   23 +
 .../New/Editors/DevControlViewModel.cs        |   24 +
 .../New/Editors/EditorPageViewModel.cs        |  222 +++
 .../New/Editors/GroundEditorPageViewModel.cs  |   12 +
 .../New/Editors/ModInfoEditorViewModel.cs     |   26 +
 .../New/Editors/RandomInfoPageViewModel.cs    |   14 +
 .../New/Editors/SpritePageViewModel.cs        |   40 +
 .../New/Editors/ZoneEditorPageViewModel.cs    |   16 +
 .../ViewModels/New/MainWindowViewModel.cs     |  456 +++++
 .../ViewModels/New/ModSwitcherViewModel.cs    |   90 +
 .../ViewModels/New/NodeBase.cs                |  405 ++++
 .../ViewModels/New/TabSwitcherViewModel.cs    |  103 +
 .../ViewModels/New/TestComboBoxViewModel.cs   |   41 +
 .../ViewModels/New/TreeSearchViewModel.cs     |  123 ++
 .../ViewModels/ViewModelBase.cs               |    2 +-
 .../Views/New/CaptionButtons.axaml            |   19 +
 .../Views/New/CaptionButtons.axaml.cs         |   50 +
 .../Views/New/ChromelessWindow.cs             |   92 +
 .../Views/New/Components/IconText.axaml       |   27 +
 .../Views/New/Components/IconText.axaml.cs    |   41 +
 .../DialogBoxes/MessageBoxWindowView.axaml    |   57 +
 .../DialogBoxes/MessageBoxWindowView.axaml.cs |   73 +
 .../DialogBoxes/PreferencesWindowView.axaml   |   84 +
 .../PreferencesWindowView.axaml.cs            |   28 +
 .../New/DialogBoxes/RenameWindowView.axaml    |   52 +
 .../New/DialogBoxes/RenameWindowView.axaml.cs |   27 +
 .../Views/New/Editors/DevControlView.axaml    |  218 +++
 .../Views/New/Editors/DevControlView.axaml.cs |   13 +
 .../New/Editors/GroundEditorPageView.axaml    |   10 +
 .../New/Editors/GroundEditorPageView.axaml.cs |   13 +
 .../Views/New/Editors/ModInfoEditorView.axaml |   10 +
 .../New/Editors/ModInfoEditorView.axaml.cs    |   13 +
 .../New/Editors/RandomInfoPageView.axaml      |   10 +
 .../New/Editors/RandomInfoPageView.axaml.cs   |   13 +
 .../Views/New/Editors/SpritePageView.axaml    |   19 +
 .../Views/New/Editors/SpritePageView.axaml.cs |   13 +
 .../New/Editors/ZoneEditorPageView.axaml      |   10 +
 .../New/Editors/ZoneEditorPageView.axaml.cs   |   13 +
 .../Views/New/MainWindow.axaml                |  186 ++
 .../Views/New/MainWindow.axaml.cs             |  241 +++
 .../Views/New/ModSwitcherView.axaml           |   64 +
 .../Views/New/ModSwitcherView.axaml.cs        |  103 +
 .../Views/New/TabBarView.axaml                |  268 +++
 .../Views/New/TabBarView.axaml.cs             |   51 +
 .../Views/New/TabSwitcherView.axaml           |  165 ++
 .../Views/New/TabSwitcherView.axaml.cs        |  439 +++++
 .../Views/UserControls/AutoCompleteBinder.cs  |   73 +
 .../UserControls/AutoCompleteBinderBox.cs     |   81 +
 RogueEssence/RogueEssence.csproj              |    3 +
 77 files changed, 8234 insertions(+), 53 deletions(-)
 create mode 100644 RogueEssence.Editor.Avalonia/Assets/Icons.axaml
 create mode 100644 RogueEssence.Editor.Avalonia/Assets/NodeTemplates.axaml
 create mode 100644 RogueEssence.Editor.Avalonia/Assets/Styles.axaml
 create mode 100644 RogueEssence.Editor.Avalonia/Assets/Themes.axaml
 create mode 100644 RogueEssence.Editor.Avalonia/Assets/TreeStyles.axaml
 create mode 100644 RogueEssence.Editor.Avalonia/Converters/New/IconKeyToGeometryConverter.cs
 create mode 100644 RogueEssence.Editor.Avalonia/Converters/New/ObjectToColorKeyConverter.cs
 create mode 100644 RogueEssence.Editor.Avalonia/Converters/New/StringConverters.cs
 create mode 100644 RogueEssence.Editor.Avalonia/Converters/New/WindowStateToColumnConverter.cs
 create mode 100644 RogueEssence.Editor.Avalonia/Models/Locales.cs
 create mode 100644 RogueEssence.Editor.Avalonia/Models/ModHeader.cs
 create mode 100644 RogueEssence.Editor.Avalonia/Native/Linux.cs
 create mode 100644 RogueEssence.Editor.Avalonia/Native/MacOS.cs
 create mode 100644 RogueEssence.Editor.Avalonia/Native/OS.cs
 create mode 100644 RogueEssence.Editor.Avalonia/Native/Windows.cs
 create mode 100644 RogueEssence.Editor.Avalonia/NodeFactory.cs
 create mode 100644 RogueEssence.Editor.Avalonia/PageFactory.cs
 create mode 100644 RogueEssence.Editor.Avalonia/Services/DialogService.cs
 create mode 100644 RogueEssence.Editor.Avalonia/TabEvents.cs
 create mode 100644 RogueEssence.Editor.Avalonia/Utility/NodeHelper.cs
 create mode 100644 RogueEssence.Editor.Avalonia/ViewModels/New/DialogBoxes/DialogViewModel.cs
 create mode 100644 RogueEssence.Editor.Avalonia/ViewModels/New/DialogBoxes/MessageBoxWindowViewModel.cs
 create mode 100644 RogueEssence.Editor.Avalonia/ViewModels/New/DialogBoxes/PreferencesWindowViewModel.cs
 create mode 100644 RogueEssence.Editor.Avalonia/ViewModels/New/DialogBoxes/RenameWindowViewModel.cs
 create mode 100644 RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DevControlViewModel.cs
 create mode 100644 RogueEssence.Editor.Avalonia/ViewModels/New/Editors/EditorPageViewModel.cs
 create mode 100644 RogueEssence.Editor.Avalonia/ViewModels/New/Editors/GroundEditorPageViewModel.cs
 create mode 100644 RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ModInfoEditorViewModel.cs
 create mode 100644 RogueEssence.Editor.Avalonia/ViewModels/New/Editors/RandomInfoPageViewModel.cs
 create mode 100644 RogueEssence.Editor.Avalonia/ViewModels/New/Editors/SpritePageViewModel.cs
 create mode 100644 RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ZoneEditorPageViewModel.cs
 create mode 100644 RogueEssence.Editor.Avalonia/ViewModels/New/MainWindowViewModel.cs
 create mode 100644 RogueEssence.Editor.Avalonia/ViewModels/New/ModSwitcherViewModel.cs
 create mode 100644 RogueEssence.Editor.Avalonia/ViewModels/New/NodeBase.cs
 create mode 100644 RogueEssence.Editor.Avalonia/ViewModels/New/TabSwitcherViewModel.cs
 create mode 100644 RogueEssence.Editor.Avalonia/ViewModels/New/TestComboBoxViewModel.cs
 create mode 100644 RogueEssence.Editor.Avalonia/ViewModels/New/TreeSearchViewModel.cs
 create mode 100644 RogueEssence.Editor.Avalonia/Views/New/CaptionButtons.axaml
 create mode 100644 RogueEssence.Editor.Avalonia/Views/New/CaptionButtons.axaml.cs
 create mode 100644 RogueEssence.Editor.Avalonia/Views/New/ChromelessWindow.cs
 create mode 100644 RogueEssence.Editor.Avalonia/Views/New/Components/IconText.axaml
 create mode 100644 RogueEssence.Editor.Avalonia/Views/New/Components/IconText.axaml.cs
 create mode 100644 RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/MessageBoxWindowView.axaml
 create mode 100644 RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/MessageBoxWindowView.axaml.cs
 create mode 100644 RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/PreferencesWindowView.axaml
 create mode 100644 RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/PreferencesWindowView.axaml.cs
 create mode 100644 RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/RenameWindowView.axaml
 create mode 100644 RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/RenameWindowView.axaml.cs
 create mode 100644 RogueEssence.Editor.Avalonia/Views/New/Editors/DevControlView.axaml
 create mode 100644 RogueEssence.Editor.Avalonia/Views/New/Editors/DevControlView.axaml.cs
 create mode 100644 RogueEssence.Editor.Avalonia/Views/New/Editors/GroundEditorPageView.axaml
 create mode 100644 RogueEssence.Editor.Avalonia/Views/New/Editors/GroundEditorPageView.axaml.cs
 create mode 100644 RogueEssence.Editor.Avalonia/Views/New/Editors/ModInfoEditorView.axaml
 create mode 100644 RogueEssence.Editor.Avalonia/Views/New/Editors/ModInfoEditorView.axaml.cs
 create mode 100644 RogueEssence.Editor.Avalonia/Views/New/Editors/RandomInfoPageView.axaml
 create mode 100644 RogueEssence.Editor.Avalonia/Views/New/Editors/RandomInfoPageView.axaml.cs
 create mode 100644 RogueEssence.Editor.Avalonia/Views/New/Editors/SpritePageView.axaml
 create mode 100644 RogueEssence.Editor.Avalonia/Views/New/Editors/SpritePageView.axaml.cs
 create mode 100644 RogueEssence.Editor.Avalonia/Views/New/Editors/ZoneEditorPageView.axaml
 create mode 100644 RogueEssence.Editor.Avalonia/Views/New/Editors/ZoneEditorPageView.axaml.cs
 create mode 100644 RogueEssence.Editor.Avalonia/Views/New/MainWindow.axaml
 create mode 100644 RogueEssence.Editor.Avalonia/Views/New/MainWindow.axaml.cs
 create mode 100644 RogueEssence.Editor.Avalonia/Views/New/ModSwitcherView.axaml
 create mode 100644 RogueEssence.Editor.Avalonia/Views/New/ModSwitcherView.axaml.cs
 create mode 100644 RogueEssence.Editor.Avalonia/Views/New/TabBarView.axaml
 create mode 100644 RogueEssence.Editor.Avalonia/Views/New/TabBarView.axaml.cs
 create mode 100644 RogueEssence.Editor.Avalonia/Views/New/TabSwitcherView.axaml
 create mode 100644 RogueEssence.Editor.Avalonia/Views/New/TabSwitcherView.axaml.cs
 create mode 100644 RogueEssence.Editor.Avalonia/Views/UserControls/AutoCompleteBinder.cs
 create mode 100644 RogueEssence.Editor.Avalonia/Views/UserControls/AutoCompleteBinderBox.cs

diff --git a/RogueEssence.Editor.Avalonia/App.axaml b/RogueEssence.Editor.Avalonia/App.axaml
index 3fbb7b3c..970e731c 100644
--- a/RogueEssence.Editor.Avalonia/App.axaml
+++ b/RogueEssence.Editor.Avalonia/App.axaml
@@ -1,30 +1,50 @@
 <Application xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:local="clr-namespace:RogueEssence.Dev"
-             RequestedThemeVariant="Light"
-             x:Class="RogueEssence.Dev.App">
+             x:Class="RogueEssence.Dev.App"
+             xmlns:local="using:RogueEssence.Dev"
+             xmlns:fluent="clr-namespace:Tabalonia.Themes.Custom;assembly=Tabalonia"
+             RequestedThemeVariant="Dark">
+
     <Application.DataTemplates>
         <local:ViewLocator/>
     </Application.DataTemplates>
+  
 
-    <Application.Styles>
-        <SimpleTheme/>
-        <StyleInclude Source="avares://Avalonia.Controls.DataGrid/Themes/Simple.xaml"/>
-        <Style Selector="TabItem">
-            <Setter Property="Foreground" Value="Black" />
-            <Setter Property="FontSize" Value="12"/>
-        </Style>
-      <Style Selector="DataGridRow">
-        <Setter Property="Background" Value="#FFFFFF"/>
-      </Style>
-        <Style Selector="Button:pressed  /template/ ContentPresenter#PART_ContentPresenter">
-            <!-- <Setter Property="Background" Value="" /> -->
-            <!-- <Setter Property="BorderBrush" Value="{DynamicResource ButtonBorderBrushPressed}" /> -->
-            <Setter Property="TextBlock.Foreground" Value="#454545" />
-        </Style>
-      <Style Selector="DataGridTextColumn">
-        <Setter Property="TextBlock.TextWrapping" Value="Wrap"/>
-      </Style>
-    </Application.Styles>
+    <Application.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceInclude Source="/Assets/Icons.axaml"/>
+                <ResourceInclude Source="/Assets/Themes.axaml"/>
+                <ResourceInclude Source="/Assets/NodeTemplates.axaml"/>
+            </ResourceDictionary.MergedDictionaries>
+            <ResourceDictionary.ThemeDictionaries>
+                <ResourceDictionary x:Key="Light">
+                    <SolidColorBrush x:Key="TabControlWindowActiveBackgroundBrush" Color="#FFF6F6F6" />
+                    <SolidColorBrush x:Key="TabControlWindowInactiveBackgroundBrush" Color="#FFF6F6F6" />
+                    <SolidColorBrush x:Key="TabItemBackgroundBrush" Color="#FFF6F6F6" />
+                    <SolidColorBrush x:Key="TabItemBackgroundBrushWindowInactive" Color="#FFF6F6F6" />
+                    <SolidColorBrush x:Key="SelectedTabItemBackgroundBrush" Color="#FFFDFDFD" />
+                    <SolidColorBrush x:Key="TabItemHeaderBackgroundUnselectedPointerOver" Color="#FFDFDFDF" />
+                    
+                </ResourceDictionary>
+                
+                <ResourceDictionary x:Key="Dark">
+                    <SolidColorBrush x:Key="TabControlWindowActiveBackgroundBrush" Color="#202020" />
+                    <SolidColorBrush x:Key="TabControlWindowInactiveBackgroundBrush" Color="#202020" />
+                    <SolidColorBrush x:Key="TabItemBackgroundBrush" Color="#202020" />
+                    <SolidColorBrush x:Key="TabItemBackgroundBrushWindowInactive" Color="#202020" />
+                </ResourceDictionary>
+            </ResourceDictionary.ThemeDictionaries>
+        </ResourceDictionary>
+        
+    </Application.Resources>
+     
+     <Application.Styles>
+         <FluentTheme />
+         <fluent:CustomTheme/>
+         <StyleInclude Source="/Assets/Styles.axaml"/>
 
-</Application>
+         <StyleInclude Source="/Assets/TreeStyles.axaml"/>
+     </Application.Styles>
+             
+</Application>
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/App.axaml.cs b/RogueEssence.Editor.Avalonia/App.axaml.cs
index f858788f..cf3c3e1e 100644
--- a/RogueEssence.Editor.Avalonia/App.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/App.axaml.cs
@@ -1,17 +1,98 @@
 using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Reactive.Linq;
+using System.Text.Json;
 using Avalonia;
+using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Input.Platform;
 using Avalonia.Markup.Xaml;
+using Avalonia.Media;
+using Avalonia.Styling;
+using RogueEssence.Dev.Services;
 using RogueEssence.Dev.ViewModels;
 using RogueEssence.Dev.Views;
+using Microsoft.Extensions.DependencyInjection;
+using ReactiveUI;
 
 namespace RogueEssence.Dev
 {
-    public class App : Application
+
+    public static class ServiceCollectionExtensions
     {
+        public static void AddCommonServices(this IServiceCollection collection)
+        {
+            collection.AddSingleton<TabEvents>();
+            collection.AddSingleton<PageFactory>();
+            collection.AddSingleton<NodeFactory>();
+            collection.AddSingleton<MainWindowViewModel>();
+
+
+            collection.AddTransient<TabSwitcherViewModel>(sp =>
+            {
+                var mainVm = sp.GetRequiredService<MainWindowViewModel>();
+                return new TabSwitcherViewModel(mainVm);
+            });
+
+            collection.AddTransient<ModSwitcherViewModel>();
+
+
+            collection.AddTransient<NodeBase>();
+            collection.AddTransient<DataRootNode>();
+            collection.AddTransient<DataItemNode>();
+            collection.AddTransient<OpenEditorNode>();
+            collection.AddTransient<PageNode>();
+
+            // TODO: remove?
+            // collection.AddSingleton<Func<Type, NodeBase>>(x => type => type switch
+            // {
+            //     _ when type == typeof(NodeBase) => x.GetRequiredService<NodeBase>(),
+            //     _ when type == typeof(DataRootNode) => x.GetRequiredService<DataRootNode>(),
+            //     _ when type == typeof(DataItemNode) => x.GetRequiredService<DataItemNode>(),
+            //     _ when type == typeof(OpenEditorNode) => x.GetRequiredService<OpenEditorNode>(),
+            //     _ when type == typeof(PageNode) => x.GetRequiredService<PageNode>(),
+            //     _ => throw new InvalidOperationException($"Page of type {type?.FullName} has no view model"),
+            // });
+
+            collection.AddSingleton<ViewLocator>();
+            collection.AddSingleton<IDialogService, DialogService>();
+
+            collection.AddTransient<DevControlViewModel>();
+            collection.AddTransient<ZoneEditorPageViewModel>();
+            collection.AddTransient<GroundEditorPageViewModel>();
+            collection.AddTransient<RandomInfoPageViewModel>();
+            collection.AddTransient<SpritePageViewModel>();
+            collection.AddTransient<ModInfoEditorViewModel>();
+        }
+
+        public static void RegisterPages(this IServiceProvider provider)
+        {
+            var pageFactory = provider.GetRequiredService<PageFactory>();
+
+            pageFactory.Register<DevControlViewModel>("DevControl");
+            pageFactory.Register<ZoneEditorPageViewModel>("ZoneEditor");
+            pageFactory.Register<GroundEditorPageViewModel>("GroundEditor");
+            pageFactory.Register<RandomInfoPageViewModel>("RandomInfo");
+            pageFactory.Register<SpritePageViewModel>("SpritePage");
+            pageFactory.Register<ModInfoEditorViewModel>("ModInfoEditor");
+        }
+    }
+
+    public partial class App : Application
+    {
+        public override void Initialize()
+        {
+            AvaloniaXamlLoader.Load(this);
+            var pref = PreferencesWindowViewModel.Instance;
+
+            // SetLocale(pref.Locale);
+
+            pref.Changed
+                .Where(_ => !pref.IsLoading)
+                .Subscribe(_ => { pref.Save(); });
+        }
 
-        
         public static async void CopyText(string data)
         {
             if (Current.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
@@ -26,15 +107,124 @@ public static async void CopyText(string data)
         
         public override void OnFrameworkInitializationCompleted()
         {
+            var collection = new ServiceCollection();
+            collection.AddCommonServices();
+
+            // TopLevel provider
+            collection.AddSingleton<Func<TopLevel?>>(x => () =>
+            {
+                if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime topWindow)
+                    return TopLevel.GetTopLevel(topWindow.MainWindow);
+
+                if (ApplicationLifetime is ISingleViewApplicationLifetime singleViewPlatform)
+                    return TopLevel.GetTopLevel(singleViewPlatform.MainView);
+
+                return null;
+            });
+
+            var services = collection.BuildServiceProvider();
+
+            services.RegisterPages();
+
+
+            var vm = services.GetRequiredService<MainWindowViewModel>();
+
             if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
             {
-                desktop.MainWindow = new DevForm
+                desktop.MainWindow = new MainWindow
+                {
+                    DataContext = vm
+                };
+            }
+            else if (ApplicationLifetime is ISingleViewApplicationLifetime singleViewPlatform)
+            {
+                singleViewPlatform.MainView = new MainWindow
                 {
-                    DataContext = new DevFormViewModel(),
+                    DataContext = vm
                 };
             }
 
             base.OnFrameworkInitializationCompleted();
         }
+
+
+        public static void SetLocale(string localeKey)
+        {
+            if (Current is not App app ||
+                app.Resources[localeKey] is not ResourceDictionary targetLocale ||
+                targetLocale == app._activeLocale)
+                return;
+
+            if (app._activeLocale != null)
+                app.Resources.MergedDictionaries.Remove(app._activeLocale);
+
+            app.Resources.MergedDictionaries.Add(targetLocale);
+            app._activeLocale = targetLocale;
+        }
+
+        public static Avalonia.Controls.Shapes.Path CreateMenuIcon(string key)
+        {
+            Console.WriteLine($"Icon???");
+            var icon = new Avalonia.Controls.Shapes.Path();
+            icon.Width = 12;
+            icon.Height = 12;
+            icon.Stretch = Stretch.Uniform;
+
+            if (Current?.FindResource(key) is StreamGeometry geo)
+                icon.Data = geo;
+
+            return icon;
+        }
+
+        public static void SetTheme(string theme, string _)
+        {
+            if (Current is not App app)
+                return;
+            if (theme.Equals("Light", StringComparison.OrdinalIgnoreCase))
+                app.RequestedThemeVariant = ThemeVariant.Light;
+            else if (theme.Equals("Dark", StringComparison.OrdinalIgnoreCase))
+                app.RequestedThemeVariant = ThemeVariant.Dark;
+            else
+                app.RequestedThemeVariant = ThemeVariant.Default;
+
+            if (app._themeOverrides != null)
+            {
+                app.Resources.MergedDictionaries.Remove(app._themeOverrides);
+                app._themeOverrides = null;
+            }
+            // if (app._themeOverrides != null)
+            // {
+            //     app.Resources.MergedDictionaries.Remove(app._themeOverrides);
+            //     app._themeOverrides = null;
+            // }
+            //
+            // if (!string.IsNullOrEmpty(themeOverridesFile) && File.Exists(themeOverridesFile))
+            // {
+            //     try
+            //     {
+            //         var resDic = new ResourceDictionary();
+            //         using var stream = File.OpenRead(themeOverridesFile);
+            //         var overrides = JsonSerializer.Deserialize(stream, JsonCodeGen.Default.ThemeOverrides);
+            //         foreach (var kv in overrides.BasicColors)
+            //         {
+            //             if (kv.Key.Equals("SystemAccentColor", StringComparison.Ordinal))
+            //                 resDic["SystemAccentColor"] = kv.Value;
+            //             else
+            //                 resDic[$"Color.{kv.Key}"] = kv.Value;
+            //         }
+            //
+            //         app.Resources.MergedDictionaries.Add(resDic);
+            //         app._themeOverrides = resDic;
+            //     }
+            //     catch
+            //     {
+            //         // ignore
+            //     }
+            // }
+            //
+        }
+
+        private ResourceDictionary _activeLocale = null;
+        private ResourceDictionary _themeOverrides = null;
     }
-}
+}
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Assets/Icons.axaml b/RogueEssence.Editor.Avalonia/Assets/Icons.axaml
new file mode 100644
index 00000000..cf4b822c
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/Assets/Icons.axaml
@@ -0,0 +1,1688 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <StreamGeometry x:Key="Icons.Action">M41 512c0-128 46-241 138-333C271 87 384 41 512 41s241 46 333 138c92 92 138 205 138 333s-46 241-138 333c-92 92-205 138-333 138s-241-46-333-138C87 753 41 640 41 512zm87 0c0 108 36 195 113 271s164 113 271 113c108 0 195-36 271-113s113-164 113-271-36-195-113-271c-77-77-164-113-271-113-108 0-195 36-271 113C164 317 128 404 128 512zm256 148V292l195 113L768 512l-195 113-195 113v-77zm148-113-61 36V440l61 36 61 36-61 36z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.AIAssist">M304 464a128 128 0 01128-128c71 0 128 57 128 128v224a32 32 0 01-64 0V592h-128v95a32 32 0 01-64 0v-224zm64 1v64h128v-64a64 64 0 00-64-64c-35 0-64 29-64 64zM688 337c18 0 32 14 32 32v319a32 32 0 01-32 32c-18 0-32-14-32-32v-319a32 32 0 0132-32zM84 911l60-143A446 446 0 0164 512C64 265 265 64 512 64s448 201 448 448-201 448-448 448c-54 0-105-9-153-27l-242 22a32 32 0 01-32-44zm133-150-53 126 203-18 13 5c41 15 85 23 131 23 212 0 384-172 384-384S724 128 512 128 128 300 128 512c0 82 26 157 69 220l20 29z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Archive">M296 392h64v64h-64zM296 582v160h128V582h-64v-62h-64v62zm80 48v64h-32v-64h32zM360 328h64v64h-64zM296 264h64v64h-64zM360 456h64v64h-64zM360 200h64v64h-64zM855 289 639 73c-6-6-14-9-23-9H192c-18 0-32 14-32 32v832c0 18 14 32 32 32h640c18 0 32-14 32-32V311c0-9-3-17-9-23zM790 326H602V138L790 326zm2 562H232V136h64v64h64v-64h174v216c0 23 19 42 42 42h216v494z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Bad">M851 755q0 23-16 39l-78 78q-16 16-39 16t-39-16l-168-168-168 168q-16 16-39 16t-39-16l-78-78q-16-16-16-39t16-39l168-168-168-168q-16-16-16-39t16-39l78-78q16-16 39-16t39 16l168 168 168-168q16-16 39-16t39 16l78 78q16 16 16 39t-16 39l-168 168 168 168q16 16 16 39z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Binary">M71 1024V0h661L953 219V1024H71zm808-731-220-219H145V951h735V293zM439 512h-220V219h220V512zm-74-219H292v146h74v-146zm0 512h74v73h-220v-73H292v-146H218V585h147v219zm294-366h74V512H512v-73h74v-146H512V219h147v219zm74 439H512V585h220v293zm-74-219h-74v146h74v-146z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Bisect">M128 384a43 43 0 0043-43V213a43 43 0 0143-43h128a43 43 0 000-85H213a128 128 0 00-128 128v128a43 43 0 0043 43zm213 469H213a43 43 0 01-43-43v-128a43 43 0 00-85 0v128a128 128 0 00128 128h128a43 43 0 000-85zm384-299a43 43 0 000-85h-49A171 171 0 00555 347V299a43 43 0 00-85 0v49A171 171 0 00347 469H299a43 43 0 000 85h49A171 171 0 00469 677V725a43 43 0 0085 0v-49A171 171 0 00677 555zm-213 43a85 85 0 1185-85 85 85 0 01-85 85zm384 43a43 43 0 00-43 43v128a43 43 0 01-43 43h-128a43 43 0 000 85h128a128 128 0 00128-128v-128a43 43 0 00-43-43zM811 85h-128a43 43 0 000 85h128a43 43 0 0143 43v128a43 43 0 0085 0V213a128 128 0 00-128-128z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Blame">M128 256h192a64 64 0 110 128H128a64 64 0 110-128zm576 192h192a64 64 0 010 128h-192a64 64 0 010-128zm-576 192h192a64 64 0 010 128H128a64 64 0 010-128zm576 0h192a64 64 0 010 128h-192a64 64 0 010-128zm0-384h192a64 64 0 010 128h-192a64 64 0 010-128zM128 448h192a64 64 0 110 128H128a64 64 0 110-128zm384-320a64 64 0 0164 64v640a64 64 0 01-128 0V192a64 64 0 0164-64z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Bookmark">M832 64H192c-18 0-32 14-32 32v832c0 18 14 32 32 32h640c18 0 32-14 32-32V96c0-18-14-32-32-32zM736 596 624 502 506 596V131h230v318z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Bottom">M509 546 780 275 871 366 509 728 147 366 238 275zM509 728h-362v128h724v-128z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Branch">M757 226a143 143 0 00-55 276 96 96 0 01-88 59h-191a187 187 0 00-96 27V312a143 143 0 10-96 0v399a143 143 0 10103 2 96 96 0 0188-59h191a191 191 0 00187-151 143 143 0 00-43-279zM280 130a48 48 0 110 96 48 48 0 010-96zm0 764a48 48 0 110-96 48 48 0 010 96zM757 417a48 48 0 110-96 48 48 0 010 96z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Branch.Add">M896 128h-64V64c0-35-29-64-64-64s-64 29-64 64v64h-64c-35 0-64 29-64 64s29 64 64 64h64v64c0 35 29 64 64 64s64-29 64-64V256h64c35 0 64-29 64-64s-29-64-64-64zm-204 307C673 481 628 512 576 512H448c-47 0-90 13-128 35V372C394 346 448 275 448 192c0-106-86-192-192-192S64 86 64 192c0 83 54 154 128 180v280c-74 26-128 97-128 180c0 106 86 192 192 192s192-86 192-192c0-67-34-125-84-159c22-20 52-33 84-33h128c122 0 223-85 249-199c-19 4-37 7-57 7c-26 0-51-5-76-13zM256 128c35 0 64 29 64 64s-29 64-64 64s-64-29-64-64s29-64 64-64zm0 768c-35 0-64-29-64-64s29-64 64-64s64 29 64 64s-29 64-64 64z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Check">M512 597m-1 0a1 1 0 103 0a1 1 0 10-3 0ZM810 393 732 315 448 600 293 444 214 522l156 156 78 78 362-362z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CheckCircled">M512 32C246 32 32 250 32 512s218 480 480 480 480-218 480-480S774 32 512 32zm269 381L496 698c-26 26-61 26-83 0L243 528c-26-26-26-61 0-83s61-26 83 0l128 128 240-240c26-26 61-26 83 0 26 19 26 54 3 80z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Changes">M747 467c29 0 56 4 82 12v-363c0-47-38-84-84-84H125c-47 0-84 38-84 84v707c0 47 38 84 84 84h375a287 287 0 01-43-152c0-160 129-289 289-289zm-531-250h438c19 0 34 15 34 34s-15 34-34 34H216c-19 0-34-15-34-34s15-34 34-34zm0 179h263c19 0 34 15 34 34s-15 34-34 34H216c-19 0-34-15-34-34s15-34 34-34zm131 247h-131c-19 0-34-15-34-34s15-34 34-34h131c19 0 34 15 34 34s-15 34-34 34zM747 521c-130 0-236 106-236 236S617 992 747 992s236-106 236-236S877 521 747 521zm11 386v-65h-130c-12 0-22-10-22-22s10-22 22-22h260l-130 108zm108-192H606l130-108v65h130c12 0 22 10 22 22s-10 22-22 22z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CherryPick">M529 511c115 0 212 79 239 185h224a62 62 0 017 123l-7 0-224 0a247 247 0 01-479 0H65a62 62 0 01-7-123l7-0h224a247 247 0 01239-185zm0 124a124 124 0 100 247 124 124 0 000-247zm0-618c32 0 58 24 61 55l0 7V206c89 11 165 45 225 103a74 74 0 0122 45l0 9v87a62 62 0 01-123 7l-0-7v-65l-6-4c-43-33-97-51-163-53l-17-0c-74 0-133 18-180 54l-6 4v65a62 62 0 01-55 61l-7 0a62 62 0 01-61-55l-0-7V362c0-20 8-39 23-53 60-58 135-92 224-103V79c0-34 28-62 62-62z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Clear">M512 57c251 0 455 204 455 455S763 967 512 967 57 763 57 512 261 57 512 57zm181 274c-11-11-29-11-40 0L512 472 371 331c-11-11-29-11-40 0-11 11-11 29 0 40L471 512 331 653c-11 11-11 29 0 40 11 11 29 11 40 0l141-141 141 141c11 11 29 11 40 0 11-11 11-29 0-40L552 512l141-141c11-11 11-29 0-40z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ClearNotifications">M591 907A85 85 0 01427 875h114a299 299 0 0050 32zM725 405c130 0 235 105 235 235s-105 235-235 235-235-105-235-235 105-235 235-235zM512 64a43 43 0 0143 43v24c126 17 229 107 264 225A298 298 0 00725 341l-4 0A235 235 0 00512 213l-5 0c-125 4-224 104-228 229l-0 6v167a211 211 0 01-26 101l-4 7-14 23h211a298 298 0 0050 85l-276-0a77 77 0 01-66-39c-13-22-14-50-2-73l2-4 22-36c10-17 16-37 17-57l0-7v-167C193 287 313 153 469 131V107a43 43 0 0139-43zm345 505L654 771a149 149 0 00202-202zM725 491a149 149 0 00-131 220l202-202A149 149 0 00725 491z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Clean">M797 829a49 49 0 1049 49 49 49 0 00-49-49zm147-114A49 49 0 10992 764a49 49 0 00-49-49zM928 861a49 49 0 1049 49A49 49 0 00928 861zm-5-586L992 205 851 64l-71 71a67 67 0 00-94 0l235 235a67 67 0 000-94zm-853 128a32 32 0 00-32 50 1291 1291 0 0075 112L288 552c20 0 25 21 8 37l-93 86a1282 1282 0 00120 114l100-32c19-6 28 15 14 34l-40 55c26 19 53 36 82 53a89 89 0 00115-20 1391 1391 0 00256-485l-188-188s-306 224-595 198z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Clone">M1280 704c0 141-115 256-256 256H288C129 960 0 831 0 672c0-126 80-232 192-272A327 327 0 01192 384c0-177 143-320 320-320 119 0 222 64 277 160C820 204 857 192 896 192c106 0 192 86 192 192 0 24-5 48-13 69C1192 477 1280 580 1280 704zm-493-128H656V352c0-18-14-32-32-32h-96c-18 0-32 14-32 32v224h-131c-29 0-43 34-23 55l211 211c12 12 33 12 45 0l211-211c20-20 6-55-23-55z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Close">M523 398 918 3l113 113-396 396 397 397-113 113-397-397-397 397-113-113 397-397L14 116l113-113 396 396z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Code">M853 102H171C133 102 102 133 102 171v683C102 891 133 922 171 922h683C891 922 922 891 922 853V171C922 133 891 102 853 102zM390 600l-48 48L205 512l137-137 48 48L301 512l88 88zM465 819l-66-18L559 205l66 18L465 819zm218-171L634 600 723 512l-88-88 48-48L819 512 683 649z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ColorPicker">M128 854h768v86H128zM390 797c13 13 29 19 48 19s35-6 45-19l291-288c26-22 26-64 0-90L435 83l-61 61L426 192l-272 269c-22 22-22 64 0 90l237 246zm93-544 211 211-32 32H240l243-243zM707 694c0 48 38 86 86 86 48 0 86-38 86-86 0-22-10-45-26-61L794 576l-61 61c-13 13-26 35-26 58z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Commit">M0 512M1024 512M512 0M512 1024M796 471A292 292 0 00512 256a293 293 0 00-284 215H0v144h228A293 293 0 00512 832a291 291 0 00284-217H1024V471h-228M512 688A146 146 0 01366 544A145 145 0 01512 400c80 0 146 63 146 144A146 146 0 01512 688</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CommitMessageGenerator">M796 561a5 5 0 014 7l-39 90a5 5 0 004 7h100a5 5 0 014 8l-178 247a5 5 0 01-9-4l32-148a5 5 0 00-5-6h-89a5 5 0 01-4-7l86-191a5 5 0 014-3h88zM731 122a73 73 0 0173 73v318a54 54 0 00-8-1H731V195H244v634h408l-16 73H244a73 73 0 01-73-73V195a73 73 0 0173-73h488zm-219 366v73h-195v-73h195zm146-146v73H317v-73h341z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Compare">M645 448l64 64 220-221L704 64l-64 64 115 115H128v90h628zM375 576l-64-64-220 224L314 960l64-64-116-115H896v-90H262z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Conflict">M608 0q48 0 88 23t63 63 23 87v70h55q35 0 67 14t57 38 38 57 14 67V831q0 34-14 66t-38 57-57 38-67 13H426q-34 0-66-13t-57-38-38-57-14-66v-70h-56q-34 0-66-14t-57-38-38-57-13-67V174q0-47 23-87T109 23 196 0h412m175 244H426q-46 0-86 22T278 328t-26 85v348H608q47 0 86-22t63-62 25-85l1-348m-269 318q18 0 31 13t13 31-13 31-31 13-31-13-13-31 13-31 31-13m0-212q13 0 22 9t11 22v125q0 14-9 23t-22 10-23-7-11-22l-1-126q0-13 10-23t23-10z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Copy">M896 811l-128 0c-23 0-43-19-43-43 0-23 19-43 43-43l107 0c13 0 21-9 21-21L896 107c0-13-9-21-21-21L448 85c-13 0-21 9-21 21l0 21c0 23-19 43-43 43-23 0-43-19-43-43L341 85c0-47 38-85 85-85l469 0c47 0 85 38 85 85l0 640C981 772 943 811 896 811zM683 299l0 640c0 47-38 85-85 85L128 1024c-47 0-85-38-85-85L43 299c0-47 38-85 85-85l469 0C644 213 683 252 683 299zM576 299 149 299c-13 0-21 9-21 21l0 597c0 13 9 21 21 21l427 0c13 0 21-9 21-21L597 320C597 307 589 299 576 299z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Cut">M280 145l243 341 0-0 45 63-0 0 79 110a143 143 0 11-36 75l-88-123-92 126c1 4 1 9 1 13l0 5a143 143 0 11-36-95l82-113L221 188l60-43zm473 541a70 70 0 100 140 70 70 0 000-140zm-463 0a70 70 0 100 140 70 70 0 000-140zM772 145l59 43-232 319-45-63L772 145z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Detached">M128 183C128 154 154 128 183 128h521c30 0 55 26 55 55v38c0 17-17 34-34 34s-34-17-34-34v-26H196v495h26c17 0 34 17 34 34s-17 34-34 34h-38c-30 0-55-26-55-55V183zM380 896h-34c-26 0-47-21-47-47v-90h68V828h64V896H380c4 0 0 0 0 0zM759 828V896h90c26 0 47-21 47-47v-90h-68V828h-68zM828 435H896V346c0-26-21-47-47-47h-90v68H828v68zM435 299v68H367V439H299V346C299 320 320 299 346 299h90zM367 649H299v-107h68v107zM546 367V299h107v68h-107zM828 546H896v107h-68v-107zM649 828V896h-107v-68h107zM730 508v188c0 17-17 34-34 34h-188c-17 0-34-17-34-34s17-34 34-34h102l-124-124c-13-13-13-34 0-47 13-13 34-13 47 0l124 124V512c0-17 17-34 34-34 21-4 38 9 38 30z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Detail">M889 0H135c-32 0-59 26-59 59v906c0 32 26 59 59 59h753c32 0 59-26 59-59v-906c1-33-26-59-58-59zm-165 177c31 0 56 25 56 56s-25 56-56 56-56-25-56-56 25-56 56-56zm-212 0c31 0 56 25 56 56S543 288 512 288s-56-25-56-56S481 177 512 177zm-212 0c31 0 56 25 56 56s-25 56-56 56-56-25-56-56 25-56 56-56zm209 606H285c-25 0-44-20-44-44 0-25 20-44 44-44h224c25 0 44 20 44 44 0 24-20 44-44 44zm230-212H285c-25 0-44-20-44-44 0-25 20-44 44-44h453c25 0 44 20 44 44 1 24-20 44-44 44z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Diff">M854 307 611 73c-6-6-14-9-22-9H296c-4 0-8 4-8 8v56c0 4 4 8 8 8h277l219 211V824c0 4 4 8 8 8h56c4 0 8-4 8-8V330c0-9-4-17-10-23zM553 201c-6-6-14-9-23-9H192c-18 0-32 14-32 32v704c0 18 14 32 32 32h512c18 0 32-14 32-32V397c0-9-3-17-9-23L553 201zM568 753c0 4-3 7-8 7h-225c-4 0-8-3-8-7v-42c0-4 3-7 8-7h225c4 0 8 3 8 7v42zm0-220c0 4-3 7-8 7H476v85c0 4-3 7-7 7h-42c-4 0-7-3-7-7V540h-85c-4 0-8-3-8-7v-42c0-4 3-7 8-7H420v-85c0-4 3-7 7-7h42c4 0 7 3 7 7V484h85c4 0 8 3 8 7v42z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.DoubleDown">M256 224l0 115L512 544l256-205 0-115-256 205L256 224zM512 685l-256-205L256 595 512 800 768 595l0-115L512 685z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.DoubleUp">M768 800V685L512 480 256 685V800l256-205L768 800zM512 339 768 544V429L512 224 256 429V544l256-205z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Down">M509 546l271-271 91 91-348 349-1-1-13 13-363-361 91-91z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Edit">M652 157a113 113 0 11156 161L731 395 572 236l80-80 1 1zM334 792v0H175v-159l358-358 159 159-358 358zM62 850h900v113H62v-113z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Email">M926 356V780a73 73 0 01-73 73H171a73 73 0 01-73-73V356l304 258a171 171 0 00221 0L926 356zM853 171a74 74 0 0126 5 73 73 0 0131 22 74 74 0 0111 18c3 8 5 16 6 24L926 244v24L559 581a73 73 0 01-91 3l-4-3L98 268v-24a73 73 0 0140-65A73 73 0 01171 171h683z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Empty">M469 235V107h85v128h-85zm-162-94 85 85-60 60-85-85 60-60zm469 60-85 85-60-60 85-85 60 60zm-549 183A85 85 0 01302 341H722a85 85 0 0174 42l131 225A85 85 0 01939 652V832a85 85 0 01-85 85H171a85 85 0 01-85-85v-180a85 85 0 0112-43l131-225zM722 427H302l-100 171h255l10 29a59 59 0 002 5c2 4 5 9 9 14 8 9 18 17 34 17 16 0 26-7 34-17a72 72 0 0011-18l0-0 10-29h255l-100-171zM853 683H624a155 155 0 01-12 17C593 722 560 747 512 747c-48 0-81-25-99-47a155 155 0 01-12-17H171v149h683v-149z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Error">M576 832C576 867 547 896 512 896 477 896 448 867 448 832 448 797 477 768 512 768 547 768 576 797 576 832ZM512 256C477 256 448 285 448 320L448 640C448 675 477 704 512 704 547 704 576 675 576 640L576 320C576 285 547 256 512 256ZM1024 896C1024 967 967 1024 896 1024L128 1024C57 1024 0 967 0 896 0 875 5 855 14 837L14 837 398 69 398 69C420 28 462 0 512 0 562 0 604 28 626 69L1008 835C1018 853 1024 874 1024 896ZM960 896C960 885 957 875 952 865L952 864 951 863 569 98C557 77 536 64 512 64 488 64 466 77 455 99L452 105 92 825 93 825 71 867C66 876 64 886 64 896 64 931 93 960 128 960L896 960C931 960 960 931 960 896Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Explore">M928 128l-416 0-32-64-352 0-64 128 896 0zM904 704l75 0 45-448-1024 0 64 640 484 0c-105-38-180-138-180-256 0-150 122-272 272-272s272 122 272 272c0 22-3 43-8 64zM1003 914l-198-175c17-29 27-63 27-99 0-106-86-192-192-192s-192 86-192 192 86 192 192 192c36 0 70-10 99-27l175 198c23 27 62 28 87 3l6-6c25-25 23-64-3-87zM640 764c-68 0-124-56-124-124s56-124 124-124 124 56 124 124-56 124-124 124z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Eye">M0 512M1024 512M512 0M512 1024M520 168C291 168 95 311 16 512c79 201 275 344 504 344 229 0 425-143 504-344-79-201-275-344-504-344zm0 573c-126 0-229-103-229-229s103-229 229-229c126 0 229 103 229 229s-103 229-229 229zm0-367c-76 0-137 62-137 137s62 137 137 137S657 588 657 512s-62-137-137-137z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.EyeClose">M734 128c-33-19-74-8-93 25l-41 70c-28-6-58-9-90-9-294 0-445 298-445 298s82 149 231 236l-31 54c-19 33-8 74 25 93 33 19 74 8 93-25L759 222C778 189 767 147 734 128zM305 512c0-115 93-208 207-208 14 0 27 1 40 4l-37 64c-1 0-2 0-2 0-77 0-140 63-140 140 0 26 7 51 20 71l-37 64C324 611 305 564 305 512zM771 301 700 423c13 27 20 57 20 89 0 110-84 200-192 208l-51 89c12 1 24 2 36 2 292 0 446-298 446-298S895 388 771 301z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FastForward">M826 498 538 250c-11-9-26-1-26 14v496c0 15 16 23 26 14L826 526c8-7 8-21 0-28zm-320 0L218 250c-11-9-26-1-26 14v496c0 15 16 23 26 14L506 526c4-4 6-9 6-14 0-5-2-10-6-14z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Fetch">M1024 896v128H0V704h128v192h768V704h128v192zM576 555 811 320 896 405l-384 384-384-384L213 320 448 555V0h128v555z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.File">M959 320H960v640A64 64 0 01896 1024H192A64 64 0 01128 960V64A64 64 0 01192 0H640v321h320L959 320zM320 544c0 17 14 32 32 32h384A32 32 0 00768 544c0-17-14-32-32-32H352A32 32 0 00320 544zm0 128c0 17 14 32 32 32h384a32 32 0 0032-32c0-17-14-32-32-32H352a32 32 0 00-32 32zm0 128c0 17 14 32 32 32h384a32 32 0 0032-32c0-17-14-32-32-32H352a32 32 0 00-32 32z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.File.Add">M683 85l213 213v598a42 42 0 01-42 42H170A43 43 0 01128 896V128C128 104 147 85 170 85H683zm-213 384H341v85h128v128h85v-128h128v-85h-128V341h-85v128z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.File.Checkout">M949 727l-217-231a33 33 0 00-48 0 33 33 0 000 48l157 172H389a35 35 0 00-35 35c0 19 16 34 35 34h452l-160 179a34 34 0 005 54c14 10 33 7 45-5l219-237a33 33 0 000-49zM719 196h131c-24-91-95-160-185-185v131c0 27 25 54 54 54zM129 846l1-747s-7-37 36-33h359v52s-7 76 32 133a191 191 0 00146 84h91v126h66v-191H719a126 126 0 01-127-127V0H155c-51 0-91 40-91 91v767c0 51 40 91 91 91h193v-66H155c0-0-26 4-26-36z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.File.Ignore">M416 832H128V128h384v192C512 355 541 384 576 384L768 384v32c0 19 13 32 32 32S832 435 832 416v-64c0-6 0-19-6-25l-256-256c-6-6-19-6-25-6H128A64 64 0 0064 128v704C64 867 93 896 129 896h288c19 0 32-13 32-32S435 832 416 832zM576 172 722 320H576V172zM736 512C614 512 512 614 512 736S614 960 736 960s224-102 224-224S858 512 736 512zM576 736C576 646 646 576 736 576c32 0 58 6 83 26l-218 218c-19-26-26-51-26-83zm160 160c-32 0-64-13-96-32l224-224c19 26 32 58 32 96 0 90-70 160-160 160z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.File.Remove">M896 320c0-19-6-32-19-45l-192-192c-13-13-26-19-45-19H192c-38 0-64 26-64 64v768c0 38 26 64 64 64h640c38 0 64-26 64-64V320zm-256 384H384c-19 0-32-13-32-32s13-32 32-32h256c19 0 32 13 32 32s-13 32-32 32zm166-384H640V128l192 192h-26z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Filter">M599 425 599 657 425 832 425 425 192 192 832 192Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Fix">M320 239 213 299l60-107L213 85l107 60L427 85 367 192 427 299 320 239m512 418L939 597l-60 107L939 811l-107-60L725 811l60-107L725 597l107 60M939 85l-60 107L939 299l-107-60L725 299l60-107L725 85l107 60L939 85m-369 460 104-104-90-90-104 104 90 90m44-234 100 100c17 16 17 44 0 60L215 969c-17 17-44 17-60 0l-100-100c-17-16-17-44 0-60L553 311c17-17 44-17 60 0z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Folder">M853 267H514c-4 0-6-2-9-4l-38-66c-13-21-38-36-64-36H171c-41 0-75 34-75 75v555c0 41 34 75 75 75h683c41 0 75-34 75-75V341c0-41-34-75-75-75zm-683-43h233c4 0 6 2 9 4l38 66c13 21 38 36 64 36H853c6 0 11 4 11 11v75h-704V235c0-6 4-11 11-11zm683 576H171c-6 0-11-4-11-11V480h704V789c0 6-4 11-11 11z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Folder.Add">M1088 227H609L453 78a11 11 0 00-7-3H107a43 43 0 00-43 43v789a43 43 0 0043 43h981a43 43 0 0043-43V270a43 43 0 00-43-43zM757 599c0 5-5 9-10 9h-113v113c0 5-4 9-9 9h-56c-5 0-9-4-9-9V608h-113c-5 0-10-4-10-9V543c0-5 5-9 10-9h113V420c0-5 4-9 9-9h56c5 0 9 4 9 9V533h113c5 0 10 4 10 9v56z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Folder.Open">M922 450c-6-9-15-13-26-13h-11V341c0-41-34-75-75-75H514c-4 0-6-2-9-4l-38-66c-13-21-38-36-64-36H171c-41 0-75 34-75 75v597c0 6 2 13 6 19 6 9 15 13 26 13h640c13 0 26-9 30-21l128-363c4-11 2-21-4-30zM171 224h233c4 0 6 2 9 4l38 66c13 21 38 36 64 36H811c6 0 11 4 11 11v96H256c-13 0-26 9-30 21l-66 186V235c0-6 4-11 11-11zm574 576H173l105-299h572l-105 299z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.GitFlow">M509 556l93 149h124l-80-79 49-50 165 164-165 163-49-50 79-79h-163l-96-153 41-65zm187-395 165 164-165 163-49-50L726 360H530l-136 224H140v-70h215l136-224h236l-80-79 49-50z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.GitFlow.Feature">M939 94v710L512 998 85 805V94h-64A21 21 0 010 73v-0C0 61 10 51 21 51h981c12 0 21 10 21 21v0c0 12-10 21-21 21h-64zm-536 588L512 624l109 58c6 3 13 4 20 3a32 32 0 0026-37l-21-122 88-87c5-5 8-11 9-18a32 32 0 00-27-37l-122-18-54-111a32 32 0 00-57 0l-54 111-122 18c-7 1-13 4-18 9a33 33 0 001 46l88 87-21 122c-1 7-0 14 3 20a32 32 0 0043 14z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.GitFlow.Hotfix">M236 542a32 32 0 109 63l86-12a180 180 0 0022 78l-71 47a32 32 0 1035 53l75-50a176 176 0 00166 40L326 529zM512 16C238 16 16 238 16 512s222 496 496 496 496-222 496-496S786 16 512 16zm0 896c-221 0-400-179-400-400a398 398 0 0186-247l561 561A398 398 0 01512 912zm314-154L690 622a179 179 0 004-29l85 12a32 32 0 109-63l-94-13v-49l94-13a32 32 0 10-9-63l-87 12a180 180 0 00-20-62l71-47A32 32 0 10708 252l-75 50a181 181 0 00-252 10l-115-115A398 398 0 01512 112c221 0 400 179 400 400a398 398 0 01-86 247z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.GitFlow.Release">M884 159l-18-18a43 43 0 00-38-12l-235 43a166 166 0 00-101 60L400 349a128 128 0 00-148 47l-120 171a21 21 0 005 29l17 12a128 128 0 00178-32l27-38 124 124-38 27a128 128 0 00-32 178l12 17a21 21 0 0029 5l171-120a128 128 0 0047-148l117-92A166 166 0 00853 431l43-235a43 43 0 00-12-38zm-177 249a64 64 0 110-90 64 64 0 010 90zm-373 312a21 21 0 010 30l-139 139a21 21 0 01-30 0l-30-30a21 21 0 010-30l139-139a21 21 0 0130 0z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.GitHub">M525 0C235 0 0 235 0 525c0 232 150 429 359 498 26 5 36-11 36-25 0-12-1-54-1-97-146 31-176-63-176-63-23-61-58-76-58-76-48-32 3-32 3-32 53 3 81 54 81 54 47 80 123 57 153 43 4-34 18-57 33-70-116-12-239-57-239-259 0-57 21-104 54-141-5-13-23-67 5-139 0 0 44-14 144 54 42-11 87-17 131-17s90 6 131 17C756 203 801 217 801 217c29 72 10 126 5 139 34 37 54 83 54 141 0 202-123 246-240 259 19 17 36 48 36 97 0 70-1 127-1 144 0 14 10 30 36 25 209-70 359-266 359-498C1050 235 814 0 525 0z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.GitIgnore">M590 74 859 342V876c0 38-31 68-68 68H233c-38 0-68-31-68-68V142c0-38 31-68 68-68h357zm-12 28H233a40 40 0 00-40 38L193 142v734a40 40 0 0038 40L233 916h558a40 40 0 0040-38L831 876V354L578 102zM855 371h-215c-46 0-83-36-84-82l0-2V74h28v213c0 30 24 54 54 55l2 0h215v28zM57 489m28 0 853 0q28 0 28 28l0 284q0 28-28 28l-853 0q-28 0-28-28l0-284q0-28 28-28ZM157 717c15 0 29-6 37-13v-51h-41v22h17v18c-2 2-6 3-10 3-21 0-30-13-30-34 0-21 12-34 28-34 9 0 15 4 20 9l14-17C184 610 172 603 156 603c-29 0-54 21-54 57 0 37 24 56 54 56zM245 711v-108h-34v108h34zm69 0v-86H341V603H262v22h28V711h24zM393 711v-108h-34v108h34zm66 6c15 0 29-6 37-13v-51h-41v22h17v18c-2 2-6 3-10 3-21 0-30-13-30-34 0-21 12-34 28-34 9 0 15 4 20 9l14-17C485 610 474 603 458 603c-29 0-54 21-54 57 0 37 24 56 54 56zm88-6v-36c0-13-2-28-3-40h1l10 24 25 52H603v-108h-23v36c0 13 2 28 3 40h-1l-10-24L548 603H523v108h23zM677 717c30 0 51-22 51-57 0-36-21-56-51-56-30 0-51 20-51 56 0 36 21 57 51 57zm3-23c-16 0-26-12-26-32 0-19 10-31 26-31 16 0 26 11 26 31S696 694 680 694zm93 17v-38h13l21 38H836l-25-43c12-5 19-15 19-31 0-26-20-34-44-34H745v108h27zm16-51H774v-34h15c16 0 25 4 25 16s-9 18-25 18zM922 711v-22h-43v-23h35v-22h-35V625h41V603H853v108h68z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Grid">M30 271l241 0 0-241-241 0 0 241zM392 271l241 0 0-241-241 0 0 241zM753 30l0 241 241 0 0-241-241 0zM30 632l241 0 0-241-241 0 0 241zM392 632l241 0 0-241-241 0 0 241zM753 632l241 0 0-241-241 0 0 241zM30 994l241 0 0-241-241 0 0 241zM392 994l241 0 0-241-241 0 0 241zM753 994l241 0 0-241-241 0 0 241z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Hash">M566 585l37-146-145 0-37 146 145 0zM1005 297l-32 128q-4 14-18 14l-187 0-37 146 178 0q9 0 14 7 6 8 3 16l-32 128q-3 14-18 14l-187 0-46 187q-4 14-18 14l-128 0q-9 0-15-7-5-7-3-16l45-178-145 0-46 187q-4 14-18 14l-129 0q-9 0-14-7-5-7-3-16l45-178-178 0q-9 0-14-7-5-7-3-16l32-128q4-14 18-14l187 0 37-146-178 0q-9 0-14-7-6-8-3-16l32-128q3-14 18-14l187 0 46-187q4-14 18-14l128 0q9 0 14 7 5 7 3 16l-45 178 145 0 46-187q4-14 18-14l128 0q9 0 14 7 5 7 3 16l-45 178 178 0q9 0 14 7 5 7 3 16z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Head">M0 512M1024 512M512 0M512 1024M955 323q0 23-16 39l-414 414-78 78q-16 16-39 16t-39-16l-78-78-207-207q-16-16-16-39t16-39l78-78q16-16 39-16t39 16l168 169 375-375q16-16 39-16t39 16l78 78q16 16 16 39z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.HiddenSymbol">M416 64H768v64h-64v704h64v64H448v-64h64V512H416a224 224 0 1 1 0-448zM576 832h64V128H576v704zM416 128H512v320H416a160 160 0 0 1 0-320z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Histories">M24 512A488 488 0 01512 24A488 488 0 011000 512A488 488 0 01512 1000A488 488 0 0124 512zm447-325v327L243 619l51 111 300-138V187H471z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Home">M832 64h128v278l-128-146V64zm64 448L512 73 128 512H0L448 0h128l448 512h-128zm0 83V1024H640V704c0-35-29-64-64-64h-128a64 64 0 00-64 64v320H128V595l384-424 384 424z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Hotkeys">M512 0C229 0 0 229 0 512c0 283 229 512 512 512s512-229 512-512c0-283-229-512-512-512zm0 958C266 958 66 758 66 512S266 66 512 66 958 266 958 512 758 958 512 958zM192 416h96a32 32 0 0032-32v-32a32 32 0 00-32-32H192a32 32 0 00-32 32v32a32 32 0 0032 32zM384 416h96a32 32 0 0032-32v-32a32 32 0 00-32-32h-96a32 32 0 00-32 32v32a32 32 0 0032 32zM576 416h96a32 32 0 0032-32v-32a32 32 0 00-32-32h-96a32 32 0 00-32 32v32a32 32 0 0032 32zM832 320h-64a32 32 0 00-32 32v128h-160a32 32 0 00-32 32v32a32 32 0 0032 32h256a32 32 0 0032-32v-192a32 32 0 00-32-32zM320 544v-32a32 32 0 00-32-32H192a32 32 0 00-32 32v32a32 32 0 0032 32h96a32 32 0 0032-32zM384 576h96a32 32 0 0032-32v-32a32 32 0 00-32-32h-96a32 32 0 00-32 32v32a32 32 0 0032 32zM800 640H256a32 32 0 00-32 32v32a32 32 0 0032 32h544a32 32 0 0032-32v-32a32 32 0 00-32-32z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Incoming">M973 358a51 51 0 0151 51v563a51 51 0 01-51 51H51a51 51 0 01-51-51V410a51 51 0 0151-51h256a51 51 0 110 102H102v461h819V461h-205a51 51 0 110-102h256zM51 102a51 51 0 110-102h256c141 0 256 115 256 256v388l66-66a51 51 0 1172 72l-154 154a51 51 0 01-72 0l-154-154a51 51 0 1172-72L461 644V256c0-85-69-154-154-154H51z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Info">M512 0C229 0 0 229 0 512s229 512 512 512 512-229 512-512S795 0 512 0zM512 928c-230 0-416-186-416-416S282 96 512 96s416 186 416 416S742 928 512 928zM538 343c47 0 83-38 83-78 0-32-21-61-62-61-55 0-82 45-82 77C475 320 498 343 538 343zM533 729c-8 0-11-10-3-40l43-166c16-61 11-100-22-100-39 0-131 40-211 108l16 27c25-17 68-35 78-35 8 0 7 10 0 36l-38 158c-23 89 1 110 34 110 33 0 118-30 196-110l-19-25C575 717 543 729 533 729z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Init">M412 66C326 132 271 233 271 347c0 17 1 34 4 50-41-48-98-79-162-83a444 444 0 00-46 196c0 207 142 382 337 439h2c19 0 34 15 34 33 0 11-6 21-14 26l1 14C183 973 0 763 0 511 0 272 166 70 393 7A35 35 0 01414 0c19 0 34 15 34 33a33 33 0 01-36 33zm200 893c86-66 141-168 141-282 0-17-1-34-4-50 41 48 98 79 162 83a444 444 0 0046-196c0-207-142-382-337-439h-2a33 33 0 01-34-33c0-11 6-21 14-26L596 0C841 51 1024 261 1024 513c0 239-166 441-393 504A35 35 0 01610 1024a33 33 0 01-34-33 33 33 0 0136-33zM512 704a192 192 0 110-384 192 192 0 010 384z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.InteractiveRebase">M512 64A447 447 0 0064 512c0 248 200 448 448 448s448-200 448-448S760 64 512 64zM218 295h31c54 0 105 19 145 55 13 12 13 31 3 43a35 35 0 01-22 10 36 36 0 01-21-7 155 155 0 00-103-39h-31a32 32 0 01-31-31c0-18 13-31 30-31zm31 433h-31a32 32 0 01-31-31c0-16 13-31 31-31h31A154 154 0 00403 512 217 217 0 01620 295h75l-93-67a33 33 0 01-7-43 33 33 0 0143-7l205 148-205 148a29 29 0 01-18 6 32 32 0 01-31-31c0-10 4-19 13-25l93-67H620a154 154 0 00-154 154c0 122-97 220-217 220zm390 118a29 29 0 01-18 6 32 32 0 01-31-31c0-10 4-19 13-25l93-67h-75c-52 0-103-19-143-54-12-12-13-31-1-43a30 30 0 0142-3 151 151 0 00102 39h75L602 599a33 33 0 01-7-43 33 33 0 0143-7l205 148-203 151z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Issue">M922 39H102A65 65 0 0039 106v609a65 65 0 0063 68h94v168a34 34 0 0019 31 30 30 0 0012 3 30 30 0 0022-10l182-192H922a65 65 0 0063-68V106A65 65 0 00922 39zM288 378h479a34 34 0 010 68H288a34 34 0 010-68zm0-135h479a34 34 0 010 68H288a34 34 0 010-68zm0 270h310a34 34 0 010 68H288a34 34 0 010-68z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Layout">M875 117H149C109 117 75 151 75 192v640c0 41 34 75 75 75h725c41 0 75-34 75-75V192c0-41-34-75-75-75zM139 832V192c0-6 4-11 11-11h331v661H149c-6 0-11-4-11-11zm747 0c0 6-4 11-11 11H544v-661H875c6 0 11 4 11 11v640z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.LFS">M40 9 15 23 15 31 9 28 9 20 34 5 24 0 0 14 0 34 25 48 25 28 49 14zM26 29 26 48 49 34 49 15z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.LightOn">M892 251c-5-11-18-18-30-18H162c-12 0-23 7-30 18-5 11-5 26 2 35l179 265v320c0 56 44 102 99 102h200c55 0 99-46 99-102v-320l179-266c9-11 9-24 4-34zm-345 540c0 18-14 35-34 35-18 0-34-14-34-35v-157c0-18 14-34 34-34 18 0 34 14 34 34v157zM512 205c18 0 34-14 34-35V87c0-20-16-35-34-35s-34 14-34 35v84c1 20 16 34 34 34zM272 179c5 18 23 30 40 24 17-6 28-24 23-42l-25-51c-5-18-23-30-40-24s-28 24-23 42L272 179zM777 127c5-18-6-36-23-42-17-6-35 5-40 24l-25 51c-5 18 6 37 23 42 17 6 35-5 40-24l25-52z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Lines.All">M416 192m32 0 448 0q32 0 32 32l0 0q0 32-32 32l-448 0q-32 0-32-32l0 0q0-32 32-32ZM416 448m32 0 448 0q32 0 32 32l0 0q0 32-32 32l-448 0q-32 0-32-32l0 0q0-32 32-32ZM416 704m32 0 448 0q32 0 32 32l0 0q0 32-32 32l-448 0q-32 0-32-32l0 0q0-32 32-32ZM96 320l128-192 128 192h-256zM96 640l128 192 128-192h-256zM190 320h64v320H190z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Lines.Incr">M408 232C408 210 426 192 448 192h416a40 40 0 110 80H448a40 40 0 01-40-40zM408 512c0-22 18-40 40-40h416a40 40 0 110 80H448A40 40 0 01408 512zM448 752A40 40 0 00448 832h416a40 40 0 100-80H448zM32 480l132 0 0-128 64 0 0 128 132 0 0 64-132 0 0 128-64 0 0-128-132 0Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Lines.Decr">M408 232C408 210 426 192 448 192h416a40 40 0 110 80H448a40 40 0 01-40-40zM408 512c0-22 18-40 40-40h416a40 40 0 110 80H448A40 40 0 01408 512zM448 752A40 40 0 00448 832h416a40 40 0 100-80H448zM32 480l328 0 0 64-328 0Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Link">M 968 418 l -95 94 c -59 59 -146 71 -218 37 L 874 331 a 64 64 0 0 0 0 -90 L 783 150 a 64 64 0 0 0 -90 0 L 475 368 c -34 -71 -22 -159 37 -218 l 94 -94 c 75 -75 196 -75 271 0 l 90 90 c 75 75 75 196 0 271 z M 332 693 a 64 64 0 0 1 0 -90 l 271 -271 c 25 -25 65 -25 90 0 s 25 65 0 90 L 422 693 a 64 64 0 0 1 -90 0 z M 151 783 l 90 90 a 64 64 0 0 0 90 0 l 218 -218 c 34 71 22 159 -37 218 l -86 94 a 192 192 0 0 1 -271 0 l -98 -98 a 192 192 0 0 1 0 -271 l 94 -86 c 59 -59 146 -71 218 -37 L 151 693 a 64 64 0 0 0 0 90 z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.List">M0 33h1024v160H0zM0 432h1024v160H0zM0 831h1024v160H0z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Loading">M512 0C233 0 7 223 0 500C6 258 190 64 416 64c230 0 416 200 416 448c0 53 43 96 96 96s96-43 96-96c0-283-229-512-512-512zm0 1023c279 0 505-223 512-500c-6 242-190 436-416 436c-230 0-416-200-416-448c0-53-43-96-96-96s-96 43-96 96c0 283 229 512 512 512z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Local">M976 0h-928A48 48 0 000 48v652a48 48 0 0048 48h416V928H200a48 48 0 000 96h624a48 48 0 000-96H560v-180h416a48 48 0 0048-48V48A48 48 0 00976 0zM928 652H96V96h832v556z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Lock">M832 464h-68V240a128 128 0 00-128-128h-248a128 128 0 00-128 128v224H192c-18 0-32 14-32 32v384c0 18 14 32 32 32h640c18 0 32-14 32-32v-384c0-18-14-32-32-32zm-292 237v53a8 8 0 01-8 8h-40a8 8 0 01-8-8v-53a48 48 0 1156 0zm152-237H332V240a56 56 0 0156-56h248a56 56 0 0156 56v224z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Logs">M908 366h-25V248a18 18 0 00-0-2 20 20 0 00-5-13L681 7 681 7a19 19 0 00-4-3c-0-0-1-1-1-1a29 29 0 00-4-2L671 1a24 24 0 00-5-1H181a40 40 0 00-40 40v326h-25c-32 0-57 26-57 57v298c0 32 26 57 57 57h25v204c0 22 18 40 40 40H843a40 40 0 0040-40v-204h25c32 0 57-26 57-57V424a57 57 0 00-57-57zM181 40h465v205c0 11 9 20 20 20h177v101H181V40zm413 527c0 89-54 143-134 143-81 0-128-61-128-138 0-82 52-143 132-143 84 0 129 63 129 138zm-440 139V433h62v220h108v52h-170zm690 267H181v-193H843l0 193zm18-280a305 305 0 01-91 15c-50 0-86-12-111-37-25-23-39-59-38-99 0-90 66-142 155-142 35 0 62 7 76 13l-13 49c-15-6-33-12-63-12-51 0-90 29-90 88 0 56 35 89 86 89 14 0 25-2 30-4v-57h-42v-48h101v143zM397 570c0 53 25 91 66 91 42 0 65-40 65-92 0-49-23-91-66-91-42 0-66 40-66 93z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Menu">M192 192m-64 0a64 64 0 1 0 128 0 64 64 0 1 0-128 0ZM192 512m-64 0a64 64 0 1 0 128 0 64 64 0 1 0-128 0ZM192 832m-64 0a64 64 0 1 0 128 0 64 64 0 1 0-128 0ZM864 160H352c-17.7 0-32 14.3-32 32s14.3 32 32 32h512c17.7 0 32-14.3 32-32s-14.3-32-32-32zM864 480H352c-17.7 0-32 14.3-32 32s14.3 32 32 32h512c17.7 0 32-14.3 32-32s-14.3-32-32-32zM864 800H352c-17.7 0-32 14.3-32 32s14.3 32 32 32h512c17.7 0 32-14.3 32-32s-14.3-32-32-32z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Merge">M824 645V307c0-56-46-102-102-102h-102V102l-154 154 154 154V307h102v338c-46 20-82 67-82 123 0 72 61 133 133 133 72 0 133-61 133-133 0-56-36-102-82-123zm-51 195c-41 0-72-31-72-72s31-72 72-72c41 0 72 31 72 72s-31 72-72 72zM384 256c0-72-61-133-133-133-72 0-133 61-133 133 0 56 36 102 82 123v266C154 666 118 712 118 768c0 72 61 133 133 133 72 0 133-61 133-133 0-56-36-102-82-123V379C348 358 384 312 384 256zM323 768c0 41-31 72-72 72-41 0-72-31-72-72s31-72 72-72c41 0 72 31 72 72zM251 328c-41 0-72-31-72-72s31-72 72-72c41 0 72 31 72 72s-31 72-72 72z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Minus">M0 512M1024 512M512 0M512 1024M64 576h896V448H64z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Modified">M896 64H128C96 64 64 96 64 128v768c0 32 32 64 64 64h768c32 0 64-32 64-64V128c0-32-32-64-64-64z m-64 736c0 16-17 32-32 32H224c-18 0-32-12-32-32V224c0-16 16-32 32-32h576c15 0 32 16 32 32v576zM512 384c-71 0-128 57-128 128s57 128 128 128 128-57 128-128-57-128-128-128z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.More">M0 512M1024 512M512 0M512 1024M813 448c-46 0-83 37-83 83 0 46 37 83 83 83 46 0 83-37 83-83 0-46-37-83-83-83zM211 448C165 448 128 485 128 531c0 46 37 83 83 83 46 0 83-37 83-83 0-46-37-83-83-83zM512 448c-46 0-83 37-83 83 0 46 37 83 83 83 46 0 83-37 83-83C595 485 558 448 512 448z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Move">M299 811 299 725 384 725 384 811 299 811M469 811 469 725 555 725 555 811 469 811M640 811 640 725 725 725 725 811 640 811M299 640 299 555 384 555 384 640 299 640M469 640 469 555 555 555 555 640 469 640M640 640 640 555 725 555 725 640 640 640M299 469 299 384 384 384 384 469 299 469M469 469 469 384 555 384 555 469 469 469M640 469 640 384 725 384 725 469 640 469M299 299 299 213 384 213 384 299 299 299M469 299 469 213 555 213 555 299 469 299M640 299 640 213 725 213 725 299 640 299Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.MoveTo">M64 363l0 204 265 0L329 460c0-11 6-18 14-20C349 437 355 437 362 441c93 60 226 149 226 149 33 22 34 60 0 82 0 0-133 89-226 149-14 9-32-3-32-18l-1-110L64 693l0 117c0 41 34 75 75 75l746 0c41 0 75-34 75-74L960 364c0-0 0-1 0-1L64 363zM64 214l0 75 650 0-33-80c-16-38-62-69-103-69l-440 0C97 139 64 173 64 214z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.OpenWith">M683 409v204L1024 308 683 0v191c-413 0-427 526-427 526c117-229 203-307 427-307zm85 492H102V327h153s38-63 114-122H51c-28 0-51 27-51 61v697c0 34 23 61 51 61h768c28 0 51-27 51-61V614l-102 100v187z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.OrderByName">M841 627A43 43 0 00811 555h-299v85h196l-183 183A43 43 0 00555 896h299v-85h-196l183-183zM299 170H213v512H85l171 171 171-171H299zM725 128h-85c-18 0-34 11-40 28l-117 313h91L606 384h154l32 85h91l-117-313A43 43 0 00725 128zm-88 171 32-85h26l32 85h-90z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.OrderByTime">M512 0a512 512 0 01512 512 57 57 0 01-114 0 398 398 0 10-398 398 57 57 0 010 114A512 512 0 01512 0zm367 600 121 120a57 57 0 01-80 81l-40-40V967a57 57 0 01-50 57l-7 0a57 57 0 01-57-57v-205l-40 40a57 57 0 01-75 5l-5-5a57 57 0 01-0-80l120-121a80 80 0 01113-0zM512 272a57 57 0 0157 57V499h114a57 57 0 0156 50L740 556a57 57 0 01-57 57H512a57 57 0 01-57-57v-228a57 57 0 0150-57L512 272z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Parameter">M834 0H190C85 0 0 85 0 189v646c0 104 85 189 189 189h645c104 0 189-85 189-189V189C1024 85 939 0 834 0zM658 748c-25 29-62 47-111 54v54h-66v-56c-38-4-72-19-101-44-29-26-43-71-43-135v-28h144v35c0 39 1 63 4 72 3 9 10 14 22 14 10 0 17-3 22-10 5-7 7-16 7-29 0-32-2-55-7-69-5-14-20-29-46-45-44-28-74-48-90-61-16-13-29-31-41-55-12-24-17-50-17-80 0-43 12-77 37-101 24-24 61-40 110-45v-46h66v46c44 6 78 21 100 45 22 24 33 57 33 100 0 6-0 15-1 27H535v-24c0-25-2-42-5-50-3-8-10-12-21-12-9 0-15 3-20 10-4 7-7 17-7 30 0 23 5 38 14 47 9 9 35 27 78 53 37 22 62 39 75 51 13 12 25 28 34 50 9 22 14 48 14 80 0 51-12 92-37 121z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Password">M640 96c-158 0-288 130-288 288 0 17 3 31 5 46L105 681 96 691V928h224v-96h96v-96h96v-95c38 18 82 31 128 31 158 0 288-130 288-288s-130-288-288-288zm0 64c123 0 224 101 224 224s-101 224-224 224a235 235 0 01-109-28l-8-4H448v96h-96v96H256v96H160v-146l253-254 12-11-3-17C419 417 416 400 416 384c0-123 101-224 224-224zm64 96a64 64 0 100 128 64 64 0 100-128z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Paste">M544 85c49 0 90 37 95 85h75a96 96 0 0196 89L811 267a32 32 0 01-28 32L779 299a32 32 0 01-32-28L747 267a32 32 0 00-28-32L715 235h-91a96 96 0 01-80 42H395c-33 0-62-17-80-42L224 235a32 32 0 00-32 28L192 267v576c0 16 12 30 28 32l4 0h128a32 32 0 0132 28l0 4a32 32 0 01-32 32h-128a96 96 0 01-96-89L128 843V267a96 96 0 0189-96L224 171h75a96 96 0 0195-85h150zm256 256a96 96 0 0196 89l0 7v405a96 96 0 01-89 96L800 939h-277a96 96 0 01-96-89L427 843v-405a96 96 0 0189-96L523 341h277zm-256-192H395a32 32 0 000 64h150a32 32 0 100-64z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Pattern">M470 722q-23 3-43 3T384 722v-150l-106 106q-34-26-60-59L324 512H174q-3-23-3-43t3-42h150L218 320q16-20 28-32t32-27L384 367V217q23-4 43-4t43 4v150l106-106q34 26 60 59l-106 107h150q3 22 3 42T680 512h-150l106 107q-16 20-28 32t-32 27l-106-106v150zM0 811q0-36 25-61t61-25 61 25 25 61-25 61-61 25-61-25T0 811z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Plus">M576 64H448v384H64v128h384v384h128V576h384V448H576z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Pull">M432 0h160c27 0 48 21 48 48v336h175c36 0 53 43 28 68L539 757c-15 15-40 15-55 0L180 452c-25-25-7-68 28-68H384V48c0-27 21-48 48-48zm592 752v224c0 27-21 48-48 48H48c-27 0-48-21-48-48V752c0-27 21-48 48-48h293l98 98c40 40 105 40 145 0l98-98H976c27 0 48 21 48 48zm-248 176c0-22-18-40-40-40s-40 18-40 40s18 40 40 40s40-18 40-40zm128 0c0-22-18-40-40-40s-40 18-40 40s18 40 40 40s40-18 40-40z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Push">M592 768h-160c-27 0-48-21-48-48V384h-175c-36 0-53-43-28-68L485 11c15-15 40-15 55 0l304 304c25 25 7 68-28 68H640v336c0 27-21 48-48 48zm432-16v224c0 27-21 48-48 48H48c-27 0-48-21-48-48V752c0-27 21-48 48-48h272v16c0 62 50 112 112 112h160c62 0 112-50 112-112v-16h272c27 0 48 21 48 48zm-248 176c0-22-18-40-40-40s-40 18-40 40s18 40 40 40s40-18 40-40zm128 0c0-22-18-40-40-40s-40 18-40 40s18 40 40 40s40-18 40-40z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Quit">M563 555c0 28-23 51-51 51-28 0-51-23-51-51L461 113c0-28 23-51 51-51s51 23 51 51L563 555 563 555zM85 535c0-153 81-287 201-362 24-15 55-8 70 16C371 214 363 245 340 260 248 318 187 419 187 535c0 180 146 325 325 325 180-0 325-146 325-325 0-119-64-223-160-280-24-14-32-46-18-70 14-24 46-32 70-18 125 74 210 211 210 367 0 236-191 427-427 427C276 963 85 772 85 535</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Rebase">M277 85a149 149 0 00-43 292v230a32 32 0 0064 0V555h267A160 160 0 00725 395v-12a149 149 0 10-64-5v17a96 96 0 01-96 96H299V383A149 149 0 00277 85zM228 720a32 32 0 00-37-52 150 150 0 00-53 68 32 32 0 1060 23 85 85 0 0130-39zm136-52a32 32 0 00-37 52 86 86 0 0130 39 32 32 0 1060-23 149 149 0 00-53-68zM204 833a32 32 0 10-55 32 149 149 0 0063 58 32 32 0 0028-57 85 85 0 01-36-33zm202 32a32 32 0 00-55-32 85 85 0 01-36 33 32 32 0 0028 57 149 149 0 0063-58z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Relation">m224 154a166 166 0 00-166 166v192a166 166 0 00166 166h64v-76h-64a90 90 0 01-90-90v-192a90 90 0 0190-90h320a90 90 0 0190 90v192a90 90 0 01-90 90h-128v77h128a166 166 0 00166-167v-192a166 166 0 00-166-166h-320zm166 390a90 90 0 0190-90h128v-76h-128a166 166 0 00-166 166v192a166 166 0 00166 166h320a166 166 0 00166-166v-192a166 166 0 00-166-166h-64v77h64a90 90 0 0190 90v192a90 90 0 01-90 90h-320a90 90 0 01-90-90v-192z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Remote">M512 128M706 302a289 289 0 00-173 44 27 27 0 1029 46 234 234 0 01125-36c23 0 45 3 66 9 93 28 161 114 161 215C914 704 813 805 687 805H337C211 805 110 704 110 580c0-96 61-178 147-210C282 263 379 183 495 183a245 245 0 01210 119z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Remote.Add">M364 512h67v108h108v67h-108v108h-67v-108h-108v-67h108v-108zm298-64A107 107 0 01768 555C768 614 720 660 660 660h-108v-54h-108v-108h-94v108h-94c4-21 22-47 44-51l-1-12a75 75 0 0171-75a128 128 0 01239-7a106 106 0 0153-14z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Remotes">M115 386l19 33c17 29 44 50 76 60l116 33c34 10 58 41 58 77v80c0 22 12 42 32 52s32 30 32 52v78c0 31 30 54 60 45 32-9 57-35 65-68l6-22c8-34 30-63 61-80l16-9c30-17 48-49 48-83v-17c0-25-10-50-28-68l-8-8c-18-18-42-28-68-28H514c-22 0-44-6-64-17l-69-39c-9-5-15-13-18-22-6-19 2-40 20-49l12-6c13-7 29-8 43-3l46 15c16 5 34-1 44-15 9-14 8-33-2-46l-27-33c-20-24-20-59 1-83l31-37c18-21 20-50 7-73l-5-8c-7-0-14-1-21-1-186 0-343 122-396 290zM928 512c0-74-19-143-53-203L824 330c-31 13-48 48-37 80l34 101c7 21 24 37 45 42l58 15c2-18 4-36 4-55zM0 512a512 512 0 111024 0 512 512 0 11-1024 0z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.RemoveAll">M1024 64v704h-128v128h-128v128h-768v-704h128v-128h128v-128zM64 960h640v-576h-640zM320 128v64h576v512h64v-576zM192 256v64h576v512h64v-576zM432 688L576 832H480L384 736 288 832H192l144-144L192 544h96L384 640l96-96H576z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Rename">M853 256h-43v512h43c47 0 85-38 85-85v-341c0-47-38-85-85-85zM725 768V171h128V85h-341v85H640v85H171c-47 0-85 38-85 85v341c0 47 38 85 85 85h469V853h-128v85h341v-85H725v-86zm-469-171v-171h384v171H256z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Repositories">M960 146v91C960 318 759 384 512 384S64 318 64 238V146C64 66 265 0 512 0s448 66 448 146zM960 352v206C960 638 759 704 512 704S64 638 64 558V352c96 66 272 97 448 97S864 418 960 352zm0 320v206C960 958 759 1024 512 1024S64 958 64 878V672c96 66 272 97 448 97S864 738 960 672z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Reset">M883 567l-128-128c-17-17-43-17-60 0l-128 128c-17 17-17 43 0 60 17 17 43 17 60 0l55-55V683c0 21-21 43-43 43H418c-13-38-43-64-77-77V375c51-17 85-64 85-119 0-73-60-128-128-128-73 0-128 55-128 128 0 55 34 102 85 119v269c-51 17-85 64-85 119 0 73 55 128 128 128 55 0 102-34 119-85H640c73 0 128-55 128-128v-111l55 55c9 9 17 13 30 13 13 0 21-4 30-13 17-13 17-43 0-55zM299 213c26 0 43 17 43 43 0 21-21 43-43 43-26 0-43-21-43-43 0-26 17-43 43-43zm0 597c-26 0-43-21-43-43 0-26 17-43 43-43s43 17 43 43c0 21-17 43-43 43zM725 384c-73 0-128-60-128-128 0-73 55-128 128-128s128 55 128 128c0 68-55 128-128 128zm0-171c-26 0-43 17-43 43s17 43 43 43 43-17 43-43-17-43-43-43z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Save">M293 122v244h439V146l171 175V829a73 73 0 01-73 73h-98V536H293v366H195a73 73 0 01-73-73V195a73 73 0 0173-73h98zm366 512v268H366V634h293zm-49 49h-195v73h195v-73zm49-561v171H366V122h293z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Scan">M0 551V472c0-11 9-19 19-19h984c11 0 19 9 19 19v79c0 11-9 19-19 19H19c-11 0-19-9-19-19zM114 154v240c0 11-9 19-19 19H19C9 413 0 404 0 394V79C0 35 35 0 79 0h315c11 0 19 9 19 19v75c0 11-9 19-19 19H154c-21 0-39 18-39 39zm795 0c0-22-17-39-39-39h-240c-11 0-19-9-19-19V19c0-11 9-19 19-19h315c43 0 79 35 79 79v315c0 11-9 19-19 19h-75c-11 0-19-9-19-19l-1-240zm0 716v-240c0-11 9-19 19-19h75c11 0 19 9 19 19v315c0 43-35 79-79 79h-315c-11 0-19-9-19-19v-75c0-11 9-19 19-19H870c21-1 39-18 39-40zm-795 0c0 21 18 39 39 39h240c11 0 19 9 19 19v75c0 11-9 19-19 19H79C35 1023 0 988 0 945v-315c0-11 9-19 19-19h75c11 0 19 9 19 19V870z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ScrollToTop">M155 143h715v81H155V143zm358 94 358 369H662l1 278H363V605H155l358-369z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Search">M702 677 590 565a148 148 0 10-25 27L676 703zm-346-200a115 115 0 11115 115A115 115 0 01355 478z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Settings">M928 500a21 21 0 00-19-20L858 472a11 11 0 01-9-9c-1-6-2-13-3-19a11 11 0 015-12l46-25a21 21 0 0010-26l-8-22a21 21 0 00-24-13l-51 10a11 11 0 01-12-6c-3-6-6-11-10-17a11 11 0 011-13l34-39a21 21 0 001-28l-15-18a20 20 0 00-27-4l-45 27a11 11 0 01-13-1c-5-4-10-9-15-12a11 11 0 01-3-12l19-49a21 21 0 00-9-26l-20-12a21 21 0 00-27 6L650 193a9 9 0 01-11 3c-1-1-12-5-20-7a11 11 0 01-7-10l1-52a21 21 0 00-17-22l-23-4a21 21 0 00-24 14L532 164a11 11 0 01-11 7h-20a11 11 0 01-11-7l-17-49a21 21 0 00-24-15l-23 4a21 21 0 00-17 22l1 52a11 11 0 01-8 11c-5 2-15 6-19 7c-4 1-8 0-12-4l-33-40A21 21 0 00313 146l-20 12A21 21 0 00285 184l19 49a11 11 0 01-3 12c-5 4-10 8-15 12a11 11 0 01-13 1L228 231a21 21 0 00-27 4L186 253a21 21 0 001 28L221 320a11 11 0 011 13c-3 5-7 11-10 17a11 11 0 01-12 6l-51-10a21 21 0 00-24 13l-8 22a21 21 0 0010 26l46 25a11 11 0 015 12l0 3c-1 6-2 11-3 16a11 11 0 01-9 9l-51 8A21 21 0 0096 500v23A21 21 0 00114 544l51 8a11 11 0 019 9c1 6 2 13 3 19a11 11 0 01-5 12l-46 25a21 21 0 00-10 26l8 22a21 21 0 0024 13l51-10a11 11 0 0112 6c3 6 6 11 10 17a11 11 0 01-1 13l-34 39a21 21 0 00-1 28l15 18a20 20 0 0027 4l45-27a11 11 0 0113 1c5 4 10 9 15 12a11 11 0 013 12l-19 49a21 21 0 009 26l20 12a21 21 0 0027-6L374 832c3-3 7-5 10-4c7 3 12 5 20 7a11 11 0 018 10l-1 52a21 21 0 0017 22l23 4a21 21 0 0024-14l17-50a11 11 0 0111-7h20a11 11 0 0111 7l17 49a21 21 0 0020 15a19 19 0 004 0l23-4a21 21 0 0017-22l-1-52a11 11 0 018-10c8-3 13-5 18-7l1 0c6-2 9 0 11 3l34 41A21 21 0 00710 878l20-12a21 21 0 009-26l-18-49a11 11 0 013-12c5-4 10-8 15-12a11 11 0 0113-1l45 27a21 21 0 0027-4l15-18a21 21 0 00-1-28l-34-39a11 11 0 01-1-13c3-5 7-11 10-17a11 11 0 0112-6l51 10a21 21 0 0024-13l8-22a21 21 0 00-10-26l-46-25a11 11 0 01-5-12l0-3c1-6 2-11 3-16a11 11 0 019-9l51-8a21 21 0 0018-21v-23zm-565 188a32 32 0 01-51 5a270 270 0 011-363a32 32 0 0151 6l91 161a32 32 0 010 31zM512 782a270 270 0 01-57-6a32 32 0 01-20-47l92-160a32 32 0 0127-16h184a32 32 0 0130 41c-35 109-137 188-257 188zm15-328L436 294a32 32 0 0121-47a268 268 0 0155-6c120 0 222 79 257 188a32 32 0 01-30 41h-184a32 32 0 01-28-16z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ShaAndSubject">M653 435l-26 119H725c9 0 13 4 13 13v47c0 9-4 13-13 13h-107l-21 115c0 9-4 13-13 13h-47c-9 0-13-4-13-13l21-111H427l-21 115c0 9-4 13-13 13H346c-9 0-13-4-13-13l21-107h-85c-4-9-9-21-13-34v-38c0-9 4-13 13-13h98l26-119H294c-9 0-13-4-13-13V375c0-9 4-13 13-13h115l13-81c0-9 4-13 13-13h43c9 0 13 4 13 13L469 363h119l13-81c0-9 4-13 13-13h47c9 0 13 4 13 13l-13 77h85c9 0 13 4 13 13v47c0 9-4 13-13 13h-98v4zM512 0C230 0 0 230 0 512c0 145 60 282 166 375L90 1024H512c282 0 512-230 512-512S794 0 512 0zm-73 559h124l26-119h-128l-21 119z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SoftwareUpdate">M900 287c40 69 60 144 60 225s-20 156-60 225c-40 69-94 123-163 163-69 40-144 60-225 60s-156-20-225-60c-69-40-123-94-163-163C84 668 64 593 64 512s20-156 60-225 94-123 163-163c69-40 144-60 225-60s156 20 225 60 123 94 163 163zM762 512c0-9-3-16-9-22L578 315l-44-44c-6-6-13-9-22-9s-16 3-22 9l-44 44-176 176c-6 6-9 13-9 22s3 16 9 22l44 44c6 6 13 9 22 9s16-3 22-9l92-92v269c0 9 3 16 9 22 6 6 13 9 22 9h62c8 0 16-3 22-9 6-6 9-13 9-22V486l92 92c6 6 13 9 22 9 8 0 16-3 22-9l44-44c6-6 9-13 9-22z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SquashIntoParent">M512 939C465 939 427 900 427 853 427 806 465 768 512 768 559 768 597 806 597 853 597 900 559 939 512 939M555 85 555 555 747 363 807 423 512 719 217 423 277 363 469 555 469 85 555 85Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Stashes">M961 320 512 577 63 320 512 62l449 258zM512 628 185 442 63 512 512 770 961 512l-123-70L512 628zM512 821 185 634 63 704 512 962l449-258L839 634 512 821z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Stashes.Add">M363 491h64v107h107v64h-107v107h-64v-107h-107v-64h107v-107zm149-235 256 128-256 128-64-32v-11H427l-171-85 256-128zm256 384-256 128-64-32v-53h64l0 0 0-0h43v-21l128-64 85 43zm0-128-213 107v-43h-107v-53l64 32 171-85 85 43zm-512 0 85-43v85l-85-43z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Statistics">M447 561a26 26 0 0126 26v171H421v-171a26 26 0 0126-26zm-98 65a26 26 0 0126 26v104H323v-104a26 26 0 0126-26zm0 0M561 268a32 32 0 0132 30v457h-65V299a32 32 0 0132-32zm0 0M675 384a26 26 0 0126 26v348H649v-350a26 26 0 0126-24zm0 0M801 223v579H223V223h579M805 171H219A49 49 0 00171 219v585A49 49 0 00219 853h585A49 49 0 00853 805V219A49 49 0 00805 171z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Stopwatch">M576 160H448c-18 0-32-14-32-32s14-32 32-32h128c18 0 32 14 32 32s-14 32-32 32zm243 186 36-36c13-13 13-33 0-45s-33-13-45 0l-33 33C708 233 614 192 512 192c-212 0-384 172-384 384s172 384 384 384 384-172 384-384c0-86-29-166-77-230zM544 894V864c0-18-14-32-32-32s-32 14-32 32v30C329 879 209 759 194 608H224c18 0 32-14 32-32s-14-32-32-32h-30C209 393 329 273 480 258V288c0 18 14 32 32 32s32-14 32-32v-30C695 273 815 393 830 544H800c-18 0-32 14-32 32s14 32 32 32h30C815 759 695 879 544 894zm108-471-160 128c-14 11-16 31-5 45 6 8 16 12 25 12 7 0 14-2 20-7l160-128c14-11 16-31 5-45-11-14-31-16-45-5z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Submodule">M558 545 790 403c24-15 31-47 16-71-15-24-46-31-70-17L507 457 277 315c-24-15-56-7-71 17-15 24-7 56 17 71l232 143V819c0 28 23 51 51 51 28 0 51-23 51-51V545h0zM507 0l443 256v512L507 1024 63 768v-512L507 0z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Submodule.Add">M770 320a41 41 0 00-56-14l-252 153L207 306a41 41 0 10-43 70l255 153 2 296a41 41 0 0082 0l-2-295 255-155a41 41 0 0014-56zM481 935a42 42 0 01-42 0L105 741a42 42 0 01-21-36v-386a42 42 0 0121-36L439 89a42 42 0 0142 0l335 193a42 42 0 0121 36v87h84v-87a126 126 0 00-63-109L523 17a126 126 0 00-126 0L63 210a126 126 0 00-63 109v386a126 126 0 0063 109l335 193a126 126 0 00126 0l94-54-42-72zM1029 700h-126v-125a42 42 0 00-84 0v126h-126a42 42 0 000 84h126v126a42 42 0 1084 0v-126h126a42 42 0 000-84z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Submodules">M416 587c21 0 37 17 37 37v299A37 37 0 01416 960h-299a37 37 0 01-37-37v-299c0-21 17-37 37-37h299zm448 0c21 0 37 17 37 37v299A37 37 0 01864 960h-299a37 37 0 01-37-37v-299c0-21 17-37 37-37h299zM758 91l183 189a37 37 0 010 52l-182 188a37 37 0 01-53 1l-183-189a37 37 0 010-52l182-188a37 37 0 0153-1zM416 139c21 0 37 17 37 37v299A37 37 0 01416 512h-299a37 37 0 01-37-37v-299c0-21 17-37 37-37h299z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Subject">M512 0C230 0 0 230 0 512c0 145 60 282 166 375L90 1024H512c282 0 512-230 512-512S794 0 512 0z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SyntaxHighlight">M875 128h-725A107 107 0 0043 235v555A107 107 0 00149 896h725a107 107 0 00107-107v-555A107 107 0 00875 128zm-115 640h-183v-58l25-3c15 0 19-8 14-24l-22-61H419l-28 82 39 2V768h-166v-58l18-3c18-2 22-11 26-24l125-363-40-4V256h168l160 448 39 3zM506 340l-72 218h145l-71-218h-2z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Tabs">M1097 372h-460l-146-299H146a73 73 0 00-73 73v731a73 73 0 0073 73h878a73 73 0 0073-73V372zM146 0h390l146 299h488V878a146 146 0 01-146 146H146a146 146 0 01-146-146V146a146 146 0 01146-146zm439 0h195l146 246h-195l-146-246zm244 0h195a146 146 0 01146 146v100h-195l-146-246z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Tag">M177 156c-22 5-33 17-36 37c-10 57-33 258-13 278l445 445c23 23 61 23 84 0l246-246c23-23 23-61 0-84l-445-445C437 120 231 145 177 156zM331 344c-26 26-69 26-95 0c-26-26-26-69 0-95s69-26 95 0C357 276 357 318 331 344z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Tag.Add">M683 537h-144v-142h-142V283H239a44 44 0 00-41 41v171a56 56 0 0014 34l321 321a41 41 0 0058 0l174-174a41 41 0 000-58zm-341-109a41 41 0 110-58a41 41 0 010 58zM649 284V142h-69v142h-142v68h142v142h69v-142h142v-68h-142z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Tags">M996 452 572 28A96 96 0 00504 0H96C43 0 0 43 0 96v408a96 96 0 0028 68l424 424c37 37 98 37 136 0l408-408c37-37 37-98 0-136zM224 320c-53 0-96-43-96-96s43-96 96-96 96 43 96 96-43 96-96 96zm1028 268L844 996c-37 37-98 37-136 0l-1-1L1055 647c34-34 53-79 53-127s-19-93-53-127L663 0h97a96 96 0 0168 28l424 424c37 37 37 98 0 136z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Target">M765 118 629 239l-16 137-186 160 54 59 183-168 144 4 136-129 47-43-175-12L827 67zM489 404c-66 0-124 55-124 125s54 121 124 121c66 0 120-55 120-121H489l23-121c-8-4-16-4-23-4zM695 525c0 114-93 207-206 207s-206-94-206-207 93-207 206-207c16 0 27 0 43 4l43-207c-27-4-54-8-85-8-229 0-416 188-416 419s187 419 416 419c225 0 408-180 416-403v-12l-210-4z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Terminal">M144 112h736c18 0 32 14 32 32v736c0 18-14 32-32 32H144c-18 0-32-14-32-32V144c0-18 14-32 32-32zm112 211v72a9 9 0 003 7L386 509 259 615a9 9 0 00-3 7v72a9 9 0 0015 7L493 516a9 9 0 000-14l-222-186a9 9 0 00-15 7zM522 624a10 10 0 00-10 10v60a10 10 0 0010 10h237a10 10 0 0010-10v-60a10 10 0 00-10-10H522z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Top">M170 831 513 489 855 831 960 726 512 278 64 726 170 831zM512 278h448v-128h-896v128h448z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Track">M897 673v13c0 51-42 93-93 93h-10c-1 0-2 0-2 0H220c-23 0-42 19-42 42v13c0 23 19 42 42 42h552c14 0 26 12 26 26 0 14-12 26-26 26H220c-51 0-93-42-93-93v-13c0-51 42-93 93-93h20c1-0 2-0 2-0h562c23 0 42-19 42-42v-13c0-11-5-22-13-29-8-7-17-11-28-10H660c-14 0-26-12-26-26 0-14 12-26 26-26h144c24-1 47 7 65 24 18 17 29 42 29 67zM479 98c-112 0-203 91-203 203 0 44 14 85 38 118l132 208c15 24 50 24 66 0l133-209c23-33 37-73 37-117 0-112-91-203-203-203zm0 327c-68 0-122-55-122-122s55-122 122-122 122 55 122 122-55 122-122 122z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Tree">M912 800a48 48 0 1 1 0 96h-416a48 48 0 1 1 0-96h416z m-704-704A112 112 0 0 1 256 309.184V480h80a48 48 0 0 1 0 96H256v224h81.664a48 48 0 1 1 0 96H256a96 96 0 0 1-96-96V309.248A112 112 0 0 1 208 96z m704 384a48 48 0 1 1 0 96h-416a48 48 0 0 1 0-96h416z m0-320a48 48 0 1 1 0 96h-416a48 48 0 0 1 0-96h416z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.TriangleLeft">M30 0 30 30 0 15z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.TriangleRight">M0 0 0 30 30 15z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Undo">M762 1024C876 818 895 504 448 514V768L64 384l384-384v248c535-14 595 472 314 776z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Unlock">M832 464H332V240c0-31 25-56 56-56h248c31 0 56 25 56 56v68c0 4 4 8 8 8h56c4 0 8-4 8-8v-68c0-71-57-128-128-128H388c-71 0-128 57-128 128v224h-68c-18 0-32 14-32 32v384c0 18 14 32 32 32h640c18 0 32-14 32-32V496c0-18-14-32-32-32zM540 701v53c0 4-4 8-8 8h-40c-4 0-8-4-8-8v-53c-12-9-20-23-20-39 0-27 22-48 48-48s48 22 48 48c0 16-8 30-20 39z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Up">M170 831l343-342L855 831l105-105-448-448L64 726 170 831z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.User">M667 607c-3-2-7-14-0-38 73-77 118-187 118-290C784 115 668 0 508 0 348 0 236 114 236 278c0 104 45 215 119 292 7 24-2 33-8 35C274 631 0 725 0 854L0 1024l1024 0 0-192C989 714 730 627 667 607L667 607z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Verified">M880 128A722 722 0 01555 13a77 77 0 00-85 0 719 719 0 01-325 115c-40 4-71 38-71 80v369c0 246 329 446 439 446 110 0 439-200 439-446V207c0-41-31-76-71-80zM465 692a36 36 0 01-53 0L305 579a42 42 0 010-57 36 36 0 0153 0l80 85L678 353a36 36 0 0153 0 42 42 0 01-0 57L465 692z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Waiting">M812 864h-29V654c0-21-11-40-28-52l-133-88 134-89c18-12 28-31 28-52V164h28c18 0 32-14 32-32s-14-32-32-32H212c-18 0-32 14-32 32s14 32 32 32h30v210c0 21 11 40 28 52l133 88-134 89c-18 12-28 31-28 52V864H212c-18 0-32 14-32 32s14 32 32 32h600c18 0 32-14 32-32s-14-32-32-32zM441 566c18-12 28-31 28-52s-11-40-28-52L306 373V164h414v209l-136 90c-18 12-28 31-28 52 0 21 11 40 28 52l135 89V695c-9-7-20-13-32-19-30-15-93-41-176-41-63 0-125 14-175 38-12 6-22 12-31 18v-36l136-90z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Whitespace">M0 512M1024 512M512 0M512 1024M762 412v100h-500v-100h-150v200h800v-200h-150z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Window.Close">M519 459 222 162a37 37 0 10-52 52l297 297L169 809a37 37 0 1052 52l297-297 297 297a37 37 0 1052-52l-297-297 297-297a37 37 0 10-52-52L519 459z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Window.Minimize">M0 0M32 512H936v96H32z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Window.Maximize">M153 154h768v768h-768v-768zm64 64v640h640v-640h-640z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Window.Restore">M796 231v727H64V231h732zm-82 78H146V880h567V309zM229 66H960v732H796v-82h82V148h-567v82h-82V66z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.WordWrap">M248 221a77 77 0 00-30-21c-18-7-40-10-68-5a224 224 0 00-45 13c-5 2-10 5-15 8l-3 2v68l11-9c10-8 21-14 34-19 13-5 26-7 39-7 12 0 21 3 28 10 6 6 9 16 9 29l-62 9c-14 2-26 6-36 11a80 80 0 00-25 20c-7 8-12 17-15 27-6 21-6 44 1 65a70 70 0 0041 43c10 4 21 6 34 6a80 80 0 0063-28v22h64V298c0-16-2-31-6-44a91 91 0 00-18-33zm-41 121v15c0 8-1 15-4 22a48 48 0 01-24 29 44 44 0 01-33 2 29 29 0 01-10-6 25 25 0 01-6-9 30 30 0 01-2-12c0-5 1-9 2-14a21 21 0 015-9 28 28 0 0110-7 83 83 0 0120-5l42-6zm323-68a144 144 0 00-16-42 87 87 0 00-28-29 75 75 0 00-41-11 73 73 0 00-44 14c-6 5-12 11-17 17V64H326v398h59v-18c8 10 18 17 30 21 6 2 13 3 21 3 16 0 31-4 43-11 12-7 23-18 31-31a147 147 0 0019-46 248 248 0 006-57c0-17-2-33-5-49zm-55 49c0 15-1 28-4 39-2 11-6 20-10 27a41 41 0 01-15 15 37 37 0 01-36 1 44 44 0 01-13-12 59 59 0 01-9-18A76 76 0 01384 352v-33c0-10 1-20 4-29 2-8 6-15 10-22a43 43 0 0115-13 37 37 0 0119-5 35 35 0 0132 18c4 6 7 14 9 23 2 9 3 20 3 31zM154 634a58 58 0 0120-15c14-6 35-7 49-1 7 3 13 6 20 12l21 17V572l-6-4a124 124 0 00-58-14c-20 0-38 4-54 11-16 7-30 17-41 30-12 13-20 29-26 46-6 17-9 36-9 57 0 18 3 36 8 52 6 16 14 30 24 42 10 12 23 21 38 28 15 7 32 10 50 10 15 0 28-2 39-5 11-3 21-8 30-14l5-4v-57l-13 6a26 26 0 01-5 2c-3 1-6 2-8 3-2 1-15 6-15 6-4 2-9 3-14 4a63 63 0 01-38-4 53 53 0 01-20-14 70 70 0 01-13-24 111 111 0 01-5-34c0-13 2-26 5-36 3-10 8-19 14-26zM896 384h-256V320h288c21 1 32 12 32 32v384c0 18-12 32-32 32H504l132 133-45 45-185-185c-16-21-16-25 0-45l185-185L637 576l-128 128H896V384z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Workspace">M0 512M1024 512M512 0M512 1024M128 691H6V38h838v160h-64V102H70v525H128zM973 806H154V250h819v557zm-755-64h691V314H218v429zM365 877h448v64h-448z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Worktree">M853 267H514c-4 0-6-2-9-4l-38-66c-13-21-38-36-64-36H171c-41 0-75 34-75 75v555c0 41 34 75 75 75h683c41 0 75-34 75-75V341c0-41-34-75-75-75zm-683-43h233c4 0 6 2 9 4l38 66c13 21 38 36 64 36H853c6 0 11 4 11 11v75h-704V235c0-6 4-11 11-11zm683 576H171c-6 0-11-4-11-11V480h704V789c0 6-4 11-11 11z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Worktree.Add">M896 96 614 96c-58 0-128-19-179-51C422 38 390 19 358 19L262 19 128 19c-70 0-128 58-128 128l0 736c0 70 58 128 128 128l768 0c70 0 128-58 128-128L1024 224C1024 154 966 96 896 96zM704 685 544 685l0 160c0 19-13 32-32 32s-32-13-32-32l0-160L320 685c-19 0-32-13-32-32 0-19 13-32 32-32l160 0L480 461c0-19 13-32 32-32s32 13 32 32l0 160L704 621c19 0 32 13 32 32C736 666 723 685 704 685zM890 326 102 326 102 250c0-32 32-64 64-64l659 0c38 0 64 32 64 64L890 326z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Worktrees">M1182 527a91 91 0 00-88-117H92a91 91 0 00-88 117l137 441A80 80 0 00217 1024h752a80 80 0 0076-56zM133 295a31 31 0 0031 31h858a31 31 0 0031-31A93 93 0 00959 203H226a93 93 0 00-94 92zM359 123h467a31 31 0 0031-31A92 92 0 00765 0H421a92 92 0 00-92 92 31 31 0 0031 31z</StreamGeometry>
+  
+  
+  <StreamGeometry x:Key="Icons.ReceiptXFill">M216,40H40A16,16,0,0,0,24,56V208a8,8,0,0,0,11.58,7.15L64,200.94l28.42,14.21a8,8,0,0,0,7.16,0L128,200.94l28.42,14.21a8,8,0,0,0,7.16,0L192,200.94l28.42,14.21A8,8,0,0,0,232,208V56A16,16,0,0,0,216,40Zm-58.34,98.34a8,8,0,0,1-11.32,11.32L128,131.31l-18.34,18.35a8,8,0,0,1-11.32-11.32L116.69,120,98.34,101.66a8,8,0,0,1,11.32-11.32L128,108.69l18.34-18.35a8,8,0,0,1,11.32,11.32L139.31,120Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.GoodreadsLogoFill">M200,24H56A16,16,0,0,0,40,40V216a16,16,0,0,0,16,16H200a16,16,0,0,0,16-16V40A16,16,0,0,0,200,24ZM176,160a48,48,0,0,1-86.4,28.8,8,8,0,1,1,12.8-9.6A32,32,0,0,0,160,160V147.74A48,48,0,0,1,80,112v-8a48,48,0,0,1,80-35.74V64a8,8,0,0,1,16,0Zm-16-56v8a32,32,0,0,1-64,0v-8a32,32,0,0,1,64,0Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CopySimpleFill">M192,72V216a8,8,0,0,1-8,8H40a8,8,0,0,1-8-8V72a8,8,0,0,1,8-8H184A8,8,0,0,1,192,72Zm24-40H72a8,8,0,0,0,0,16H208V184a8,8,0,0,0,16,0V40A8,8,0,0,0,216,32Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowBendUpRightFill">M229.66,109.66l-48,48A8,8,0,0,1,168,152V112H128a88.1,88.1,0,0,0-88,88,8,8,0,0,1-16,0A104.11,104.11,0,0,1,128,96h40V56a8,8,0,0,1,13.66-5.66l48,48A8,8,0,0,1,229.66,109.66Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FolderFill">M216,72H131.31L104,44.69A15.88,15.88,0,0,0,92.69,40H40A16,16,0,0,0,24,56V200.62A15.41,15.41,0,0,0,39.39,216h177.5A15.13,15.13,0,0,0,232,200.89V88A16,16,0,0,0,216,72ZM40,56H92.69l16,16H40Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BookOpenUserFill">M240,80V200a8,8,0,0,1-8,8H160a24,24,0,0,0-24,23.94,7.9,7.9,0,0,1-5.12,7.55A8,8,0,0,1,120,232a24,24,0,0,0-24-24H24a8,8,0,0,1-8-8V80a8,8,0,0,1,8-8H88a32,32,0,0,1,32,32v63.73a8.17,8.17,0,0,0,7.47,8.25,8,8,0,0,0,8.53-8V104a32,32,0,0,1,32-32h64A8,8,0,0,1,240,80ZM88.81,56H89a47.92,47.92,0,0,1,36,17.4,4,4,0,0,0,6.08,0A47.92,47.92,0,0,1,167,56h.19a4,4,0,0,0,3.54-5.84,48,48,0,0,0-85.46,0A4,4,0,0,0,88.81,56Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PencilSimpleSlashFill">M227.32,73.37,182.63,28.69a16,16,0,0,0-22.63,0L115.64,73.05a4,4,0,0,0-.14,5.52l58.73,64.6a4,4,0,0,0,5.79.13L227.32,96A16,16,0,0,0,227.32,73.37ZM192,108.69,147.32,64l24-24L216,84.69Zm21.92,101.93a8,8,0,1,1-11.84,10.76L154.4,168.92,104,219.31A15.86,15.86,0,0,1,92.69,224H48a16,16,0,0,1-16-16V163.31A15.89,15.89,0,0,1,36.68,152l53.6-53.6-48-52.82a8.18,8.18,0,0,1-.37-10.75,8,8,0,0,1,12-.21Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.DiceFiveFill">M192,32H64A32,32,0,0,0,32,64V192a32,32,0,0,0,32,32H192a32,32,0,0,0,32-32V64A32,32,0,0,0,192,32ZM92,176a12,12,0,1,1,12-12A12,12,0,0,1,92,176Zm0-72a12,12,0,1,1,12-12A12,12,0,0,1,92,104Zm36,36a12,12,0,1,1,12-12A12,12,0,0,1,128,140Zm36,36a12,12,0,1,1,12-12A12,12,0,0,1,164,176Zm0-72a12,12,0,1,1,12-12A12,12,0,0,1,164,104Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.HighlighterCircleFill">M201.54,54.46A104,104,0,0,0,54.46,201.54,104,104,0,0,0,201.54,54.46ZM96,210V152h64v58a88.33,88.33,0,0,1-64,0Zm94.22-19.78A88.09,88.09,0,0,1,176,201.77V152a16,16,0,0,0-16-16V72a8,8,0,0,0-11.58-7.16l-48,24A8,8,0,0,0,96,96v40a16,16,0,0,0-16,16v49.77a88,88,0,1,1,110.22-11.55Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.NotionLogoFill">M224,48a8,8,0,0,1-8,8H200V208a8,8,0,0,1-8,8H152a8,8,0,0,1-7-4.14L72,79.15V200H88a8,8,0,0,1,0,16H40a8,8,0,0,1,0-16H56V56H40a8,8,0,0,1,0-16h64a8,8,0,0,1,7,4.14l73,132.71V56H168a8,8,0,0,1,0-16h48A8,8,0,0,1,224,48Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FlashlightFill">M184,16H72A16,16,0,0,0,56,32V77.33a16.12,16.12,0,0,0,3.2,9.6L80,114.67V224a16,16,0,0,0,16,16h64a16,16,0,0,0,16-16V114.67l20.8-27.74a16.12,16.12,0,0,0,3.2-9.6V32A16,16,0,0,0,184,16ZM136,152a8,8,0,0,1-16,0V120a8,8,0,0,1,16,0ZM72,56V32H184V56Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.HardDrivesFill">M208,40H48A16,16,0,0,0,32,56v48a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V56A16,16,0,0,0,208,40ZM180,92a12,12,0,1,1,12-12A12,12,0,0,1,180,92Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.HardDrivesFill2">M208,136H48a16,16,0,0,0-16,16v48a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V152A16,16,0,0,0,208,136Zm-28,52a12,12,0,1,1,12-12A12,12,0,0,1,180,188Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CurrencyRubFill">M168,104a24,24,0,0,1-24,24H112V80h32A24,24,0,0,1,168,104Zm64,24A104,104,0,1,1,128,24,104.11,104.11,0,0,1,232,128Zm-48-24a40,40,0,0,0-40-40H104a8,8,0,0,0-8,8v56H88a8,8,0,0,0,0,16h8v16H88a8,8,0,0,0,0,16h8v16a8,8,0,0,0,16,0V176h40a8,8,0,0,0,0-16H112V144h32A40,40,0,0,0,184,104Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ChalkboardSimpleFill">M240,192h-8V56a16,16,0,0,0-16-16H40A16,16,0,0,0,24,56V192H16a8,8,0,0,0,0,16H240a8,8,0,0,0,0-16Zm-24,0H144V176a8,8,0,0,1,8-8h56a8,8,0,0,1,8,8Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.GitBranchFill">M232,64a32,32,0,1,0-40,31v17a8,8,0,0,1-8,8H96a23.84,23.84,0,0,0-8,1.38V95a32,32,0,1,0-16,0v66a32,32,0,1,0,16,0V144a8,8,0,0,1,8-8h88a24,24,0,0,0,24-24V95A32.06,32.06,0,0,0,232,64ZM64,64A16,16,0,1,1,80,80,16,16,0,0,1,64,64ZM96,192a16,16,0,1,1-16-16A16,16,0,0,1,96,192Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ChatsTeardropFill">M169.57,72.59A80,80,0,0,0,16,104v64a16,16,0,0,0,16,16H86.67A80.15,80.15,0,0,0,160,232h64a16,16,0,0,0,16-16V152A80,80,0,0,0,169.57,72.59ZM224,216H160a64.14,64.14,0,0,1-55.68-32.43A79.93,79.93,0,0,0,174.7,89.71,64,64,0,0,1,224,152Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.NotchesFill">M200,40V192a8,8,0,0,1-8,8H40a8,8,0,0,1-5.66-13.66l152-152A8,8,0,0,1,200,40Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.GlobeStandFill">M56,104a80,80,0,1,1,80,80A80.09,80.09,0,0,1,56,104Zm146.46,69.28A96,96,0,0,1,66.72,37.54,8,8,0,1,0,55.18,26.46,112,112,0,0,0,128,215.71V232H104a8,8,0,0,0,0,16h64a8,8,0,0,0,0-16H144V215.72a111.21,111.21,0,0,0,69.54-30.9,8,8,0,1,0-11.08-11.54Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.TidalLogoFill">M253.66,101.66l-36,36a8,8,0,0,1-11.32,0l-36-36-.34-.38-.34.38L135.31,136l34.35,34.34a8,8,0,0,1,0,11.32l-36,36a8,8,0,0,1-11.32,0l-36-36a8,8,0,0,1,0-11.32L120.69,136,86.34,101.66l-.34-.38-.34.38-36,36a8,8,0,0,1-11.32,0l-36-36a8,8,0,0,1,0-11.32l36-36a8,8,0,0,1,11.32,0l36,36,.34.38.34-.38,36-36a8,8,0,0,1,11.32,0l36,36,.34.38.34-.38,36-36a8,8,0,0,1,11.32,0l36,36A8,8,0,0,1,253.66,101.66Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ChartBarFill">M232,208a8,8,0,0,1-8,8H32a8,8,0,0,1,0-16h8V136a8,8,0,0,1,8-8H72a8,8,0,0,1,8,8v64H96V88a8,8,0,0,1,8-8h32a8,8,0,0,1,8,8V200h16V40a8,8,0,0,1,8-8h40a8,8,0,0,1,8,8V200h8A8,8,0,0,1,232,208Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.NumberSquareNineFill">M145.33,118l0,0A20,20,0,1,1,138,90.68,20,20,0,0,1,145.31,118ZM224,48V208a16,16,0,0,1-16,16H48a16,16,0,0,1-16-16V48A16,16,0,0,1,48,32H208A16,16,0,0,1,224,48ZM146,76.82A36,36,0,1,0,127.94,144q.94,0,1.89-.06l-16.7,28a8,8,0,0,0,2.77,11,8,8,0,0,0,11-2.77L159.18,126A36.05,36.05,0,0,0,146,76.82Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.VectorTwoFill">M229.66,197.66l-32,32A8,8,0,0,1,184,224V200H80a8,8,0,0,1-8-8V80H48a8,8,0,0,1-5.66-13.66l32-32a8,8,0,0,1,11.32,0l32,32A8,8,0,0,1,112,80H88V184h96V160a8,8,0,0,1,13.66-5.66l32,32A8,8,0,0,1,229.66,197.66Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.MapPinSimpleAreaFill">M88,64a40,40,0,1,1,48,39.19V176a8,8,0,0,1-16,0V103.19A40.05,40.05,0,0,1,88,64Zm130,82.59c-12.26-6.94-29.12-12.27-48.77-15.42A8,8,0,1,0,166.73,147c17.54,2.82,33,7.63,43.42,13.55C219,165.5,224,171.14,224,176c0,13.36-36.52,32-96,32s-96-18.64-96-32c0-4.86,5-10.5,13.85-15.49,10.46-5.92,25.88-10.73,43.42-13.55a8,8,0,1,0-2.54-15.79c-19.65,3.15-36.51,8.48-48.77,15.42C19.81,156.87,16,168.26,16,176c0,31.18,57.71,48,112,48s112-16.82,112-48C240,168.26,236.19,156.87,218,146.59Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowBendRightDownFill">M205.66,181.66l-48,48a8,8,0,0,1-11.32,0l-48-48A8,8,0,0,1,104,168h40V128A88.1,88.1,0,0,0,56,40a8,8,0,0,1,0-16A104.11,104.11,0,0,1,160,128v40h40a8,8,0,0,1,5.66,13.66Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.EscalatorUpFill">M240,56V96a16,16,0,0,1-16,16H187.5L93.88,213.43A8,8,0,0,1,88,216H32a16,16,0,0,1-16-16V160a16,16,0,0,1,16-16H68.5L162.12,42.57A8,8,0,0,1,168,40h56A16,16,0,0,1,240,56Zm-34.34,90.34a8,8,0,0,0-11.32,0l-24,24a8,8,0,0,0,11.32,11.32L192,171.31V208a8,8,0,0,0,16,0V171.31l10.34,10.35a8,8,0,0,0,11.32-11.32Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CrosshairFill">M232,120h-8.34A96.14,96.14,0,0,0,136,32.34V24a8,8,0,0,0-16,0v8.34A96.14,96.14,0,0,0,32.34,120H24a8,8,0,0,0,0,16h8.34A96.14,96.14,0,0,0,120,223.66V232a8,8,0,0,0,16,0v-8.34A96.14,96.14,0,0,0,223.66,136H232a8,8,0,0,0,0-16Zm-96,87.6V200a8,8,0,0,0-16,0v7.6A80.15,80.15,0,0,1,48.4,136H56a8,8,0,0,0,0-16H48.4A80.15,80.15,0,0,1,120,48.4V56a8,8,0,0,0,16,0V48.4A80.15,80.15,0,0,1,207.6,120H200a8,8,0,0,0,0,16h7.6A80.15,80.15,0,0,1,136,207.6ZM168,128a40,40,0,1,1-40-40A40,40,0,0,1,168,128Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.RecordFill">M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24Zm0,192a88,88,0,1,1,88-88A88.1,88.1,0,0,1,128,216Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PipeWrenchFill">M220.28,55l-.17-.17-44.9-42.28a16,16,0,0,0-22.5.08L108.17,56.87l-1.54-1.56A25,25,0,0,0,71.27,90.58l1.46,1.48L52.69,112a16,16,0,0,0,0,22.63l12.68,12.68a16,16,0,0,0,22.59,0l19.93-19.65L120,140h0l0,0L55.31,205.37a25,25,0,1,0,35.34,35.29l88.67-89.35a16,16,0,0,0,0-22.6L143.63,92.66,156.56,80l.1.09L194,115.4a16,16,0,0,0,22.53-.09l3.71-3.71a40,40,0,0,0,0-56.57ZM76.69,136,64,123.33l20-19.88,12.69,12.86ZM209,100.28,205.25,104a1.21,1.21,0,0,0-.16-.16L167.69,68.5a16.05,16.05,0,0,0-22.39.12L132.37,81.29,119.43,68.23,164,24l.17.16,44.88,42.26a24,24,0,0,1-.08,33.86Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SpeedometerFill">M221.87,90.86a4,4,0,0,0-6.17-.62l-75.42,75.42A8,8,0,0,1,129,154.35l92.7-92.69a8,8,0,0,0-11.32-11.32L197,63.73A112.05,112.05,0,0,0,22.34,189.25,16.09,16.09,0,0,0,37.46,200H218.53a16,16,0,0,0,15.11-10.71,112.28,112.28,0,0,0-11.77-98.43ZM57.44,166.41a8,8,0,0,1-6.25,9.43,7.89,7.89,0,0,1-1.6.16,8,8,0,0,1-7.83-6.41A88.06,88.06,0,0,1,143.59,65.38a8,8,0,0,1-2.82,15.75,72.07,72.07,0,0,0-83.33,85.28Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FilmStripFill">M216,40H40A16,16,0,0,0,24,56V200a16,16,0,0,0,16,16H216a16,16,0,0,0,16-16V56A16,16,0,0,0,216,40ZM184,56h32V72H184ZM72,200H40V184H72ZM72,72H40V56H72Zm48,128H88V184h32Zm0-128H88V56h32Zm48,128H136V184h32Zm0-128H136V56h32Zm48,128H184V184h32v16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ListPlusFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM64,72H192a8,8,0,0,1,0,16H64a8,8,0,0,1,0-16Zm56,112H64a8,8,0,0,1,0-16h56a8,8,0,0,1,0,16Zm16-48H64a8,8,0,0,1,0-16h72a8,8,0,0,1,0,16Zm64,32H184v16a8,8,0,0,1-16,0V168H152a8,8,0,0,1,0-16h16V136a8,8,0,0,1,16,0v16h16a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.StripeLogoFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM128,184c-22.06,0-40-14.35-40-32a8,8,0,0,1,16,0c0,8.67,11,16,24,16s24-7.33,24-16c0-9.48-8.61-13-26.88-18.26C109.37,129.2,89.78,123.55,89.78,104c0-18.24,16.43-32,38.22-32,15.72,0,29.18,7.3,35.12,19a8,8,0,1,1-14.27,7.22C145.64,91.94,137.65,88,128,88c-12.67,0-22.22,6.88-22.22,16,0,7,9,10.1,23.77,14.36C145.78,123,168,129.45,168,152,168,169.65,150.06,184,128,184Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.NetworkFill">M240,120a8,8,0,0,1-8,8H200v32h8a16,16,0,0,1,16,16v32a16,16,0,0,1-16,16H176a16,16,0,0,1-16-16V176a16,16,0,0,1,16-16h8V128H72v32h8a16,16,0,0,1,16,16v32a16,16,0,0,1-16,16H48a16,16,0,0,1-16-16V176a16,16,0,0,1,16-16h8V128H24a8,8,0,0,1,0-16h96V88h-8A16,16,0,0,1,96,72V40a16,16,0,0,1,16-16h32a16,16,0,0,1,16,16V72a16,16,0,0,1-16,16h-8v24h96A8,8,0,0,1,240,120Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PhoneOutgoingFill">M146.34,109.66a8,8,0,0,1,0-11.32L180.69,64H160a8,8,0,0,1,0-16h40a8,8,0,0,1,8,8V96a8,8,0,0,1-16,0V75.31l-34.34,34.35a8,8,0,0,1-11.32,0Zm68,56.8-47.11-21.11-.13-.06a16,16,0,0,0-15.17,1.4,8.12,8.12,0,0,0-.75.56L126.87,168c-15.42-7.49-31.34-23.29-38.83-38.51l20.78-24.71c.2-.25.39-.5.57-.77a16,16,0,0,0,1.32-15.06l0-.12L89.54,41.64a16,16,0,0,0-16.62-9.52A56.26,56.26,0,0,0,24,88c0,79.4,64.6,144,144,144a56.26,56.26,0,0,0,55.88-48.92A16,16,0,0,0,214.37,166.46Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.DivideFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM128,64a16,16,0,1,1-16,16A16,16,0,0,1,128,64Zm0,128a16,16,0,1,1,16-16A16,16,0,0,1,128,192Zm56-56H72a8,8,0,0,1,0-16H184a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BoxingGloveFill">M168,16H120A56,56,0,0,0,64,72v31.73A8.17,8.17,0,0,1,56.53,112,8,8,0,0,1,48,104V78.7a4,4,0,0,0-5.63-3.65A32,32,0,0,0,24,104v29.19a16.14,16.14,0,0,0,3.5,10q.3.36.63.69L64,179.34V216a16,16,0,0,0,16,16H192a16,16,0,0,0,16-16V177.12l15.38-53.84a16,16,0,0,0,.62-4.4V72A56,56,0,0,0,168,16Zm3.58,168.84a8,8,0,0,1-7.16,14.32L136,184.94l-28.42,14.22a8,8,0,1,1-7.16-14.32L118.11,176l-17.69-8.84a8,8,0,1,1,7.16-14.32L136,167.06l28.42-14.22a8,8,0,1,1,7.16,14.32L153.89,176Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SubsetOfFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM176,184H80a8,8,0,0,1,0-16h96a8,8,0,0,1,0,16Zm-64-48h64a8,8,0,0,1,0,16H112a40,40,0,0,1,0-80h64a8,8,0,0,1,0,16H112a24,24,0,0,0,0,48Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.TrafficSignFill">M243.15,116.29,139.71,12.85a16.56,16.56,0,0,0-23.42,0L12.85,116.29a16.56,16.56,0,0,0,0,23.42L116.29,243.15h0a16.56,16.56,0,0,0,23.42,0L243.15,139.71a16.56,16.56,0,0,0,0-23.42Zm-69.49,9.37-24,24a8,8,0,0,1-11.32-11.32L148.69,128H112a16,16,0,0,0-16,16v8a8,8,0,0,1-16,0v-8a32,32,0,0,1,32-32h36.69l-10.35-10.34a8,8,0,0,1,11.32-11.32l24,24A8,8,0,0,1,173.66,125.66Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CodepenLogoFill">M235.79,89l-104-56a8,8,0,0,0-7.58,0l-104,56A8,8,0,0,0,16,96v64a8,8,0,0,0,4.21,7L114.1,217.6a4,4,0,0,0,5.9-3.52v-57.3L66.55,128,32,146.61V109.39L66.55,128l16.88-9.09L40.87,96,120,53.39V99.22L83.43,118.91l44.57,24,44.57-24L189.45,128,224,109.39v37.22L189.45,128,136,156.78v57.3a4,4,0,0,0,5.9,3.52L235.79,167a8,8,0,0,0,4.21-7V96A8,8,0,0,0,235.79,89Zm-63.22,30L136,99.22V53.39L215.13,96Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.WindowsLogoFill">M104,144v51.64a8,8,0,0,1-8,8,8.54,8.54,0,0,1-1.43-.13l-64-11.64A8,8,0,0,1,24,184V144a8,8,0,0,1,8-8H96A8,8,0,0,1,104,144Zm-2.87-89.78a8,8,0,0,0-6.56-1.73l-64,11.64A8,8,0,0,0,24,72v40a8,8,0,0,0,8,8H96a8,8,0,0,0,8-8V60.36A8,8,0,0,0,101.13,54.22ZM208,136H128a8,8,0,0,0-8,8v57.45a8,8,0,0,0,6.57,7.88l80,14.54A7.61,7.61,0,0,0,208,224a8,8,0,0,0,8-8V144A8,8,0,0,0,208,136Zm5.13-102.14a8,8,0,0,0-6.56-1.73l-80,14.55A8,8,0,0,0,120,54.55V112a8,8,0,0,0,8,8h80a8,8,0,0,0,8-8V40A8,8,0,0,0,213.13,33.86Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowsOutSimpleFill">M216,48V96a8,8,0,0,1-13.66,5.66L184,83.31l-34.34,34.35a8,8,0,0,1-11.32-11.32L172.69,72,154.34,53.66A8,8,0,0,1,160,40h48A8,8,0,0,1,216,48ZM106.34,138.34,72,172.69,53.66,154.34A8,8,0,0,0,40,160v48a8,8,0,0,0,8,8H96a8,8,0,0,0,5.66-13.66L83.31,184l34.35-34.34a8,8,0,0,0-11.32-11.32Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CheeseFill">M184,32a7.81,7.81,0,0,0-2.3.34l-160,48h0A8,8,0,0,0,16,88v16a8,8,0,0,0,8,8h7.46c13.45,0,24.79,11,24.54,24.46A24,24,0,0,1,32,160H24a8,8,0,0,0-8,8v24a8,8,0,0,0,8,8H224a16,16,0,0,0,16-16V88A56.06,56.06,0,0,0,184,32ZM80,184a32,32,0,0,1,64,0Zm88-48a32,32,0,0,1-31-40h62a32,32,0,0,1-31,40ZM78.51,80,185.12,48a40.06,40.06,0,0,1,38.07,32Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.HandFill">M216,64v90.93c0,46.2-36.85,84.55-83,85.06A83.71,83.71,0,0,1,72.6,215.4C50.79,192.33,26.15,136,26.15,136a16,16,0,0,1,6.53-22.23c7.66-4,17.1-.84,21.4,6.62l21,36.44a6.09,6.09,0,0,0,6,3.09l.12,0A8.19,8.19,0,0,0,88,151.74V48a16,16,0,0,1,16.77-16c8.61.4,15.23,7.82,15.23,16.43V112a8,8,0,0,0,8.53,8,8.17,8.17,0,0,0,7.47-8.25V32a16,16,0,0,1,16.77-16c8.61.4,15.23,7.82,15.23,16.43V120a8,8,0,0,0,8.53,8,8.17,8.17,0,0,0,7.47-8.25V64.45c0-8.61,6.62-16,15.23-16.43A16,16,0,0,1,216,64Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.HeartBreakFill">M239.81,107.5c-5.19,67.42-103.7,121.23-108,123.54a8,8,0,0,1-7.58,0C119.8,228.67,16,172,16,102a62,62,0,0,1,96.47-51.55,4,4,0,0,1,.61,6.17L99.72,70a8,8,0,0,0,0,11.31l32.53,32.53L111,135a8,8,0,1,0,11.31,11.31l26.88-26.87a8,8,0,0,0,0-11.31L116.7,75.63l17.47-17.47h0A61.63,61.63,0,0,1,178.41,40C214.73,40.23,242.59,71.29,239.81,107.5Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FlipHorizontalFill">M120,40V200a16,16,0,0,1-16,16H40a16,16,0,0,1-14.78-22.15l64-159.93.06-.14A16,16,0,0,1,120,40ZM229.33,208.84A16,16,0,0,1,216,216H152a16,16,0,0,1-16-16V40a16,16,0,0,1,30.74-6.23l.06.14,64,159.93A16,16,0,0,1,229.33,208.84ZM216,200l-.06-.15L152,40V200Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.EarSlashFill">M213.92,210.62a8,8,0,1,1-11.84,10.76L191.8,210.07a103.18,103.18,0,0,0,11.83-10.77ZM64.2,45.93,53.92,34.62A8,8,0,1,0,42.08,45.38L52.37,56.7A103.18,103.18,0,0,1,64.2,45.93ZM203.63,199.3,64.2,45.93A103.94,103.94,0,0,1,203.63,199.3ZM159,104a32,32,0,0,0-20.08-22.09,8,8,0,0,0-5.45,15,16,16,0,0,1,10,11,8,8,0,0,0,7.74,6,7.68,7.68,0,0,0,2-.26A8,8,0,0,0,159,104Zm33,8a64,64,0,0,0-85.89-60.16,8,8,0,0,0,5.47,15A48,48,0,0,1,176,112a8,8,0,0,0,16,0Zm-44,56a20,20,0,0,1-20-20,24.11,24.11,0,0,1,1-7l-20.45-22.5A7.91,7.91,0,0,1,104,120a8,8,0,0,1-8-8,32,32,0,0,1,.68-6.56L84.39,91.92A47.59,47.59,0,0,0,80,112c0,11.9,6.71,20.5,13.82,29.6,7,8.92,14.18,18.15,14.18,30.4a20,20,0,0,0,34,14.29,8,8,0,1,1,11.19,11.42A36,36,0,0,1,92,172c0-6.74-5-13.14-10.79-20.55C73.54,141.63,64,129.41,64,112a63.5,63.5,0,0,1,9-32.66L52.37,56.7A103.94,103.94,0,0,0,191.8,210.07L153,167.37A19.82,19.82,0,0,1,148,168Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SlideshowFill">M208,64V192a16,16,0,0,1-16,16H64a16,16,0,0,1-16-16V64A16,16,0,0,1,64,48H192A16,16,0,0,1,208,64Zm24-16a8,8,0,0,0-8,8V200a8,8,0,0,0,16,0V56A8,8,0,0,0,232,48ZM24,48a8,8,0,0,0-8,8V200a8,8,0,0,0,16,0V56A8,8,0,0,0,24,48Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CassetteTapeFill">M156.3,96a31.92,31.92,0,0,0,0,32H99.7a31.92,31.92,0,0,0,0-32ZM72,96a16,16,0,1,0,16,16A16,16,0,0,0,72,96ZM240,64V192a16,16,0,0,1-16,16H32a16,16,0,0,1-16-16V64A16,16,0,0,1,32,48H224A16,16,0,0,1,240,64ZM186,192l-15.6-20.8A8,8,0,0,0,164,168H92a8,8,0,0,0-6.4,3.2L70,192Zm30-80a32,32,0,0,0-32-32H72a32,32,0,0,0,0,64H184A32,32,0,0,0,216,112ZM184,96a16,16,0,1,0,16,16A16,16,0,0,0,184,96Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CircleHalfFill">M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24ZM40,128a88.1,88.1,0,0,1,88-88V216A88.1,88.1,0,0,1,40,128Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ScribbleLoopFill">M128,128a81.4,81.4,0,0,1,25.69,4.28C151.56,154.87,137.33,176,112,176c-15.8,0-24.06-10.85-24.06-21.58,0-6.59,3-12.75,8.56-17.35C103.62,131.14,114.52,128,128,128Zm96-80V208a16,16,0,0,1-16,16H48a16,16,0,0,1-16-16V48A16,16,0,0,1,48,32H208A16,16,0,0,1,224,48Zm-18.11,98.59a120.21,120.21,0,0,0-36.08-25.21c-.9-14.35-5.75-27.54-13.89-37.55C145.38,70.86,130.19,64,112,64,76.44,64,50.68,97.76,49.6,99.2a8,8,0,0,0,12.79,9.62C62.61,108.53,84.51,80,112,80c13.4,0,24,4.68,31.5,13.92a47.54,47.54,0,0,1,9.48,21.4A96.75,96.75,0,0,0,128,112c-17.27,0-31.71,4.42-41.74,12.78C77,132.47,71.94,143,71.94,154.42,71.94,172.64,86,192,112,192a54,54,0,0,0,43.53-21.23A70,70,0,0,0,169,138.89a106.24,106.24,0,0,1,25.13,18.52,8,8,0,1,0,11.78-10.82Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.DresserFill">M200,24H56A16,16,0,0,0,40,40V80a4,4,0,0,0,4,4H212a4,4,0,0,0,4-4V40A16,16,0,0,0,200,24ZM136,64H120a8,8,0,0,1,0-16h16a8,8,0,0,1,0,16Zm76,36H44a4,4,0,0,0-4,4v48a4,4,0,0,0,4,4H212a4,4,0,0,0,4-4V104A4,4,0,0,0,212,100Zm-76,36H120.27a8.18,8.18,0,0,1-8.25-7.47,8,8,0,0,1,8-8.53h15.73a8.18,8.18,0,0,1,8.25,7.47A8,8,0,0,1,136,136Zm76,36H44a4,4,0,0,0-4,4v40a16,16,0,0,0,16,16H200a16,16,0,0,0,16-16V176A4,4,0,0,0,212,172Zm-76,36H120a8,8,0,0,1,0-16h16a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CaretCircleDoubleUpFill">M201.58,201.57a104,104,0,1,0-147.15,0A104.17,104.17,0,0,0,201.58,201.57Zm-99.93-83.92a8,8,0,1,1-11.32-11.32l32-32a8,8,0,0,1,11.32,0l32,32a8,8,0,1,1-11.32,11.32L128,91.29Zm0,56a8,8,0,1,1-11.32-11.32l32-32a8,8,0,0,1,11.32,0l32,32a8,8,0,0,1-11.32,11.32L128,147.32Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.NewspaperFill">M216,48H56A16,16,0,0,0,40,64V184a8,8,0,0,1-16,0V88A8,8,0,0,0,8,88v96.11A24,24,0,0,0,32,208H208a24,24,0,0,0,24-24V64A16,16,0,0,0,216,48ZM176,152H96a8,8,0,0,1,0-16h80a8,8,0,0,1,0,16Zm0-32H96a8,8,0,0,1,0-16h80a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.MinusFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM184,136H72a8,8,0,0,1,0-16H184a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BookOpenTextFill">M232,48H168a32,32,0,0,0-32,32v87.73a8.17,8.17,0,0,1-7.47,8.25,8,8,0,0,1-8.53-8V80A32,32,0,0,0,88,48H24a8,8,0,0,0-8,8V200a8,8,0,0,0,8,8H96a24,24,0,0,1,24,23.94,7.9,7.9,0,0,0,5.12,7.55A8,8,0,0,0,136,232a24,24,0,0,1,24-24h72a8,8,0,0,0,8-8V56A8,8,0,0,0,232,48ZM208,168H168.27a8.17,8.17,0,0,1-8.25-7.47,8,8,0,0,1,8-8.53h39.73a8.17,8.17,0,0,1,8.25,7.47A8,8,0,0,1,208,168Zm0-32H168.27a8.17,8.17,0,0,1-8.25-7.47,8,8,0,0,1,8-8.53h39.73a8.17,8.17,0,0,1,8.25,7.47A8,8,0,0,1,208,136Zm0-32H168.27A8.17,8.17,0,0,1,160,96.53,8,8,0,0,1,168,88h39.73A8.17,8.17,0,0,1,216,95.47,8,8,0,0,1,208,104Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PintGlassFill">M206,26.69A8,8,0,0,0,200,24H56a8,8,0,0,0-7.94,9l23.15,193A16,16,0,0,0,87.1,240h81.8a16,16,0,0,0,15.89-14.09L207.94,33A8,8,0,0,0,206,26.69ZM191,40,188.1,64H67.9L65,40Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ImagesFill">M216,40H72A16,16,0,0,0,56,56V72H40A16,16,0,0,0,24,88V200a16,16,0,0,0,16,16H184a16,16,0,0,0,16-16V184h16a16,16,0,0,0,16-16V56A16,16,0,0,0,216,40ZM172,72a12,12,0,1,1-12,12A12,12,0,0,1,172,72Zm12,128H40V88H56v80a16,16,0,0,0,16,16H184Zm32-32H72V120.69l30.34-30.35a8,8,0,0,1,11.32,0L163.31,140,189,114.34a8,8,0,0,1,11.31,0L216,130.07V168Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ThumbsUpFill">M234,80.12A24,24,0,0,0,216,72H160V56a40,40,0,0,0-40-40,8,8,0,0,0-7.16,4.42L75.06,96H32a16,16,0,0,0-16,16v88a16,16,0,0,0,16,16H204a24,24,0,0,0,23.82-21l12-96A24,24,0,0,0,234,80.12ZM32,112H72v88H32Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PencilRulerFill">M224,48V208a16,16,0,0,1-16,16H160a16,16,0,0,1-16-16V180a4,4,0,0,1,4-4h36a8,8,0,0,0,8-8.53,8.18,8.18,0,0,0-8.25-7.47H148a4,4,0,0,1-4-4V140a4,4,0,0,1,4-4h36a8,8,0,0,0,8-8.53,8.18,8.18,0,0,0-8.25-7.47H148a4,4,0,0,1-4-4V100a4,4,0,0,1,4-4h36a8,8,0,0,0,8-8.53A8.18,8.18,0,0,0,183.73,80H148a4,4,0,0,1-4-4V48a16,16,0,0,1,16-16h48A16,16,0,0,1,224,48ZM109.66,58.34A8,8,0,0,1,112,64V208a16,16,0,0,1-16,16H48a16,16,0,0,1-16-16V64a8,8,0,0,1,2.34-5.66l32-32a8,8,0,0,1,11.32,0ZM48,80V184H64V80Zm32,0V184H96V80ZM51.31,64H92.69L72,43.31Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FlagBannerFill">M239.22,59.44l-45.63,95.82a3.54,3.54,0,0,1-.16.34l-34.21,71.84a8,8,0,1,1-14.44-6.88L173.62,160H40a8,8,0,0,1-5.66-13.66L76.69,104,34.34,61.66A8,8,0,0,1,40,48H232a8,8,0,0,1,7.22,11.44Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowsHorizontalFill">M237.66,133.66l-32,32A8,8,0,0,1,192,160V136H64v24a8,8,0,0,1-13.66,5.66l-32-32a8,8,0,0,1,0-11.32l32-32A8,8,0,0,1,64,96v24H192V96a8,8,0,0,1,13.66-5.66l32,32A8,8,0,0,1,237.66,133.66Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FileCodeFill">M213.66,82.34l-56-56A8,8,0,0,0,152,24H56A16,16,0,0,0,40,40V216a16,16,0,0,0,16,16H200a16,16,0,0,0,16-16V88A8,8,0,0,0,213.66,82.34Zm-104,88a8,8,0,0,1-11.32,11.32l-24-24a8,8,0,0,1,0-11.32l24-24a8,8,0,0,1,11.32,11.32L91.31,152Zm72-12.68-24,24a8,8,0,0,1-11.32-11.32L164.69,152l-18.35-18.34a8,8,0,0,1,11.32-11.32l24,24A8,8,0,0,1,181.66,157.66ZM152,88V44l44,44Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.NumberCircleEightFill">M148,152a20,20,0,1,1-20-20A20,20,0,0,1,148,152Zm-20-36a16,16,0,1,0-16-16A16,16,0,0,0,128,116Zm104,12A104,104,0,1,1,128,24,104.11,104.11,0,0,1,232,128Zm-68,24a35.93,35.93,0,0,0-14.19-28.61,32,32,0,1,0-43.62,0A36,36,0,1,0,164,152Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.InfoFill">M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24Zm-4,48a12,12,0,1,1-12,12A12,12,0,0,1,124,72Zm12,112a16,16,0,0,1-16-16V128a8,8,0,0,1,0-16,16,16,0,0,1,16,16v40a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.StampFill">M224,224a8,8,0,0,1-8,8H40a8,8,0,0,1,0-16H216A8,8,0,0,1,224,224Zm-16-96H151.57l15.71-73.29A32,32,0,0,0,136,16H120A32,32,0,0,0,88.72,54.71L104.43,128H48a16,16,0,0,0-16,16v40a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V144A16,16,0,0,0,208,128Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CookieFill">M224,120a40,40,0,0,1-40-40,8,8,0,0,0-8-8,40,40,0,0,1-40-40,8,8,0,0,0-8-8A104,104,0,1,0,232,128,8,8,0,0,0,224,120ZM75.51,99.51a12,12,0,1,1,0,17A12,12,0,0,1,75.51,99.51Zm25,73a12,12,0,1,1,0-17A12,12,0,0,1,100.49,172.49Zm23-40a12,12,0,1,1,17,0A12,12,0,0,1,123.51,132.49Zm41,48a12,12,0,1,1,0-17A12,12,0,0,1,164.49,180.49Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.RowsFill">M224,152v40a16,16,0,0,1-16,16H48a16,16,0,0,1-16-16V152a16,16,0,0,1,16-16H208A16,16,0,0,1,224,152ZM208,48H48A16,16,0,0,0,32,64v40a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V64A16,16,0,0,0,208,48Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.LegoSmileyFill">M184,48H168V32a16,16,0,0,0-16-16H104A16,16,0,0,0,88,32V48H72A32,32,0,0,0,40,80v96a32.06,32.06,0,0,0,24,31v17a16,16,0,0,0,16,16h96a16,16,0,0,0,16-16V207a32.06,32.06,0,0,0,24-31V80A32,32,0,0,0,184,48Zm-28,52a12,12,0,1,1-12,12A12,12,0,0,1,156,100Zm4.27,58.77a61,61,0,0,1-64.54,0,8,8,0,0,1,8.54-13.54,45,45,0,0,0,47.46,0,8,8,0,0,1,8.54,13.54ZM104,32h48V48H104Zm-4,68a12,12,0,1,1-12,12A12,12,0,0,1,100,100Zm76,124H80V208h96Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ChatsCircleFill">M232.07,186.76a80,80,0,0,0-62.5-114.17A80,80,0,1,0,23.93,138.76l-7.27,24.71a16,16,0,0,0,19.87,19.87l24.71-7.27a80.39,80.39,0,0,0,25.18,7.35,80,80,0,0,0,108.34,40.65l24.71,7.27a16,16,0,0,0,19.87-19.86Zm-16.25,1.47L224,216l-27.76-8.17a8,8,0,0,0-6,.63,64.05,64.05,0,0,1-85.87-24.88A79.93,79.93,0,0,0,174.7,89.71a64,64,0,0,1,41.75,92.48A8,8,0,0,0,215.82,188.23Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.DoorFill">M232,216H208V40a16,16,0,0,0-16-16H64A16,16,0,0,0,48,40V216H24a8,8,0,0,0,0,16H232a8,8,0,0,0,0-16Zm-68-72a12,12,0,1,1,12-12A12,12,0,0,1,164,144Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SpeakerHifiFill">M152,160a24,24,0,1,1-24-24A24,24,0,0,1,152,160ZM208,40V216a16,16,0,0,1-16,16H64a16,16,0,0,1-16-16V40A16,16,0,0,1,64,24H192A16,16,0,0,1,208,40ZM116,68a12,12,0,1,0,12-12A12,12,0,0,0,116,68Zm52,92a40,40,0,1,0-40,40A40,40,0,0,0,168,160Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.LinkBreakFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM96,64a8,8,0,0,1,16,0V80a8,8,0,0,1-16,0ZM64,96H80a8,8,0,0,1,0,16H64a8,8,0,0,1,0-16Zm64.08,85.66-7.21,7.21a38,38,0,1,1-53.74-53.74l7.21-7.21a8,8,0,1,1,11.32,11.31l-7.22,7.21a22,22,0,0,0,31.12,31.12l7.21-7.22a8,8,0,1,1,11.31,11.32ZM160,192a8,8,0,0,1-16,0V176a8,8,0,0,1,16,0Zm32-32H176a8,8,0,0,1,0-16h16a8,8,0,0,1,0,16Zm-3.13-39.13-7.21,7.21a8,8,0,1,1-11.32-11.31l7.22-7.21a22,22,0,0,0-31.12-31.12l-7.21,7.22a8,8,0,1,1-11.31-11.32l7.21-7.21a38,38,0,1,1,53.74,53.74Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ClosedCaptioningFill">M224,48H32A16,16,0,0,0,16,64V192a16,16,0,0,0,16,16H224a16,16,0,0,0,16-16V64A16,16,0,0,0,224,48ZM116,162.64a40,40,0,1,1,0-69.28,8,8,0,1,1-8,13.85,24,24,0,1,0,0,41.58,8,8,0,0,1,8,13.85Zm80,0a40,40,0,1,1,0-69.28,8,8,0,1,1-8,13.85,24,24,0,1,0,0,41.58,8,8,0,0,1,8,13.85Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CellSignalFullFill">M208,40V200a16,16,0,0,1-16,16H32A16,16,0,0,1,20.7,188.68l160-160A16,16,0,0,1,208,40Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SwimmingPoolFill">M24,168a8,8,0,0,1,8-8c14.42,0,22.19,5.18,28.44,9.34C66,173.06,70.42,176,80,176s14-2.94,19.56-6.66c6.24-4.16,14-9.34,28.43-9.34s22.2,5.18,28.44,9.34c5.58,3.72,10,6.66,19.57,6.66s14-2.94,19.56-6.66c6.25-4.16,14-9.34,28.44-9.34a8,8,0,0,1,0,16c-9.58,0-14,2.94-19.56,6.66-6.25,4.16-14,9.34-28.44,9.34s-22.2-5.18-28.44-9.34C142,178.94,137.57,176,128,176s-14,2.94-19.56,6.66c-6.24,4.16-14,9.34-28.43,9.34s-22.19-5.18-28.44-9.34C46,178.94,41.58,176,32,176A8,8,0,0,1,24,168Zm200,32c-14.42,0-22.19,5.18-28.44,9.34C190,213.06,185.58,216,176,216s-14-2.94-19.57-6.66c-6.24-4.16-14-9.34-28.44-9.34s-22.19,5.18-28.43,9.34C94,213.06,89.57,216,80,216s-14-2.94-19.56-6.66C54.19,205.18,46.42,200,32,200a8,8,0,0,0,0,16c9.58,0,14,2.94,19.56,6.66,6.25,4.16,14,9.34,28.44,9.34s22.19-5.18,28.43-9.34c5.58-3.72,10-6.66,19.56-6.66s14,2.94,19.57,6.66c6.24,4.16,14,9.34,28.44,9.34s22.19-5.18,28.44-9.34c5.57-3.72,10-6.66,19.56-6.66a8,8,0,0,0,0-16ZM80,141.39V32a8,8,0,0,1,16,0v8h64V32a8,8,0,0,1,16,0V143.29a8,8,0,0,1-16,0V136H96v5.39a8,8,0,0,1-16,0ZM96,72a8,8,0,0,0,8,8h48a8,8,0,0,0,0-16H104A8,8,0,0,0,96,72Zm0,32a8,8,0,0,0,8,8h48a8,8,0,0,0,0-16H104A8,8,0,0,0,96,104Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.IntersectThreeFill">M195.88,96c.07-1.31.12-2.63.12-4A68,68,0,0,0,60,92c0,1.33,0,2.65.12,4A68,68,0,1,0,128,213.65,68,68,0,1,0,195.88,96ZM128,193.47a51.89,51.89,0,0,1-16-35.38,67.55,67.55,0,0,0,31.9,0A51.89,51.89,0,0,1,128,193.47ZM99.23,135.29A52.19,52.19,0,0,1,77.92,106a51.88,51.88,0,0,1,36.79,3.28A68.17,68.17,0,0,0,99.23,135.29Zm42.06-26.06A51.88,51.88,0,0,1,178.08,106a52.19,52.19,0,0,1-21.31,29.34A68.17,68.17,0,0,0,141.29,109.23ZM128,40A52.06,52.06,0,0,1,180,89.91,67.72,67.72,0,0,0,128,98.35a67.72,67.72,0,0,0-51.95-8.44A52.06,52.06,0,0,1,128,40ZM40,156a52,52,0,0,1,23.23-43.29A68.36,68.36,0,0,0,96.12,152c-.07,1.31-.12,2.63-.12,4a67.74,67.74,0,0,0,18.71,46.77A52,52,0,0,1,40,156Zm124,52a51.65,51.65,0,0,1-22.71-5.23A67.74,67.74,0,0,0,160,156c0-1.33-.05-2.65-.12-4a68.36,68.36,0,0,0,32.89-39.33A52,52,0,0,1,164,208Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.LockSimpleFill">M208,80H176V56a48,48,0,0,0-96,0V80H48A16,16,0,0,0,32,96V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V96A16,16,0,0,0,208,80ZM96,56a32,32,0,0,1,64,0V80H96Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BellSimpleZFill">M168,224a8,8,0,0,1-8,8H96a8,8,0,1,1,0-16h64A8,8,0,0,1,168,224Zm53.85-32A15.8,15.8,0,0,1,208,200H48a16,16,0,0,1-13.8-24.06C39.75,166.38,48,139.34,48,104a80,80,0,1,1,160,0c0,35.33,8.26,62.38,13.81,71.94A15.89,15.89,0,0,1,221.84,192ZM152,144a8,8,0,0,0-8-8H127l23.7-35.56A8,8,0,0,0,144,88H112a8,8,0,0,0,0,16h17.05l-23.7,35.56A8,8,0,0,0,112,152h32A8,8,0,0,0,152,144Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.DeviceMobileSpeakerFill">M176,16H80A24,24,0,0,0,56,40V216a24,24,0,0,0,24,24h96a24,24,0,0,0,24-24V40A24,24,0,0,0,176,16ZM160,64H96a8,8,0,0,1,0-16h64a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CopyleftFill">M128,56a72,72,0,1,0,72,72A72.08,72.08,0,0,0,128,56Zm0,120a47.66,47.66,0,0,1-38.4-19.19,8,8,0,0,1,12.8-9.61,32,32,0,1,0,0-38.4,8,8,0,0,1-12.8-9.61A48,48,0,1,1,128,176Zm0-152A104,104,0,1,0,232,128,104,104,0,0,0,128,24Zm0,192a88,88,0,1,1,88-88A88.1,88.1,0,0,1,128,216Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.MemoryFill">M232,56H24A16,16,0,0,0,8,72V200a8,8,0,0,0,16,0V184H40v16a8,8,0,0,0,16,0V184H72v16a8,8,0,0,0,16,0V184h16v16a8,8,0,0,0,16,0V184h16v16a8,8,0,0,0,16,0V184h16v16a8,8,0,0,0,16,0V184h16v16a8,8,0,0,0,16,0V184h16v16a8,8,0,0,0,16,0V72A16,16,0,0,0,232,56ZM208,96v48H144V96Zm-96,0v48H48V96Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PolygonFill">M227.81,52.19a28,28,0,0,0-39.6,0h0a28.14,28.14,0,0,0-4,5L148,47.33A28,28,0,0,0,100.2,28.19h0A28,28,0,0,0,94.7,60L54.58,96.1a28,28,0,0,0-34.39,4.1h0a28,28,0,0,0,36.7,42.12l76.75,56.28a28,28,0,1,0,46.17-10.39,27.66,27.66,0,0,0-3.33-2.84L206.63,100q.69,0,1.38,0a28,28,0,0,0,19.8-47.79ZM161.39,180.05a28,28,0,0,0-18.29,5.64L66.36,129.41A28.15,28.15,0,0,0,65.29,108l40.12-36.11a28,28,0,0,0,38.37-9.12L180,72.66a27.88,27.88,0,0,0,8.17,19.13,28.61,28.61,0,0,0,3.32,2.85Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CaretUpFill">M213.66,154.34l-80-80a8,8,0,0,0-11.32,0l-80,80A8,8,0,0,0,48,168H208a8,8,0,0,0,5.66-13.66Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CurrencyGbpFill">M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24Zm40,160H88a8,8,0,0,1,0-16,16,16,0,0,0,16-16V136H88a8,8,0,0,1,0-16h16V96a40,40,0,0,1,60-34.64,8,8,0,0,1-8,13.85A24,24,0,0,0,120,96v24h16a8,8,0,0,1,0,16H120v16a31.71,31.71,0,0,1-4.31,16H168a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BreadFill">M200,40H48a40,40,0,0,0-16,76.65V200a16,16,0,0,0,16,16H200a16,16,0,0,0,16-16V116.65A40,40,0,0,0,200,40Zm-56,64a8,8,0,0,0,0,16v80H48V120a8,8,0,0,0,0-16,24,24,0,0,1,0-48h96a24,24,0,0,1,0,48Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FolderSimpleDashedFill">M24,80V64A16,16,0,0,1,40,48H93.33a16.12,16.12,0,0,1,9.6,3.2L132.8,73.6A8,8,0,0,1,128,88H32A8,8,0,0,1,24,80ZM88,200H40v-8a8,8,0,0,0-16,0v8.62A15.4,15.4,0,0,0,39.38,216H88a8,8,0,0,0,0-16Zm72,0H128a8,8,0,0,0,0,16h32a8,8,0,0,0,0-16Zm64-56a8,8,0,0,0-8,8v48H200a8,8,0,0,0,0,16h16.89A15.13,15.13,0,0,0,232,200.89V152A8,8,0,0,0,224,144Zm-8-72H168a8,8,0,0,0,0,16h48v24a8,8,0,0,0,16,0V88A16,16,0,0,0,216,72ZM32,160a8,8,0,0,0,8-8V120a8,8,0,0,0-16,0v32A8,8,0,0,0,32,160Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FileCloudFill">M160,181a52.06,52.06,0,0,1-52,51H60.72C40.87,232,24,215.77,24,195.92a36,36,0,0,1,19.28-31.79,4,4,0,0,1,5.77,4.33,63.53,63.53,0,0,0-1,11.15A8.22,8.22,0,0,0,55.55,188,8,8,0,0,0,64,180a47.55,47.55,0,0,1,4.37-20h0A48,48,0,0,1,160,181Zm56-93V216a16,16,0,0,1-16,16H176a8,8,0,0,1,0-16h24V96H152a8,8,0,0,1-8-8V40H56v88a8,8,0,0,1-16,0V40A16,16,0,0,1,56,24h96a8,8,0,0,1,5.66,2.34l56,56A8,8,0,0,1,216,88Zm-27.31-8L160,51.31V80Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.AsclepiusFill">M136,128v72h11.62A12.25,12.25,0,0,0,160,188.53a12,12,0,0,0-5.93-10.87,4.08,4.08,0,0,1-2.06-3.49v-8.79a4,4,0,0,1,5.25-3.81A28.06,28.06,0,0,1,176,187.71c.16,15.56-13,28.29-28.59,28.29H136v16a8,8,0,0,1-16,0V216H96a8,8,0,0,1-8-8.53A8.17,8.17,0,0,1,96.27,200H120V128H104.46c-8.6,0-16,6.6-16.44,15.19a16,16,0,0,0,12.87,16.51,3.94,3.94,0,0,1,3.11,3.89V172a4,4,0,0,1-4,4,36,36,0,0,1-36-36.87C64.47,119.48,81,104,100.68,104H120V24a8,8,0,0,1,16,0v80h32a16,16,0,0,0,16-16.81C183.56,78.6,176.14,72,167.54,72H156a4,4,0,0,1-4-4V44a4,4,0,0,1,4-4h15.22c24.62,0,45.2,20.15,44.77,44.76A44,44,0,0,1,172,128ZM92.66,72H100a4,4,0,0,0,4-4V44a4,4,0,0,0-4-4H64A40,40,0,0,0,24,80v8a8,8,0,0,0,8,8H56A40,40,0,0,0,92.66,72Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BackspaceFill">M216,40H68.53a16.12,16.12,0,0,0-13.72,7.77L9.14,123.88a8,8,0,0,0,0,8.24l45.67,76.11h0A16.11,16.11,0,0,0,68.53,216H216a16,16,0,0,0,16-16V56A16,16,0,0,0,216,40ZM165.66,146.34a8,8,0,0,1-11.32,11.32L136,139.31l-18.35,18.35a8,8,0,0,1-11.31-11.32L124.69,128l-18.35-18.34a8,8,0,1,1,11.31-11.32L136,116.69l18.34-18.35a8,8,0,0,1,11.32,11.32L147.31,128Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.NotebookFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM80,208H48V48H80Zm96-56H112a8,8,0,0,1,0-16h64a8,8,0,0,1,0,16Zm0-32H112a8,8,0,0,1,0-16h64a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PawPrintFill">M240,108a28,28,0,1,1-28-28A28,28,0,0,1,240,108ZM72,108a28,28,0,1,0-28,28A28,28,0,0,0,72,108ZM92,88A28,28,0,1,0,64,60,28,28,0,0,0,92,88Zm72,0a28,28,0,1,0-28-28A28,28,0,0,0,164,88Zm23.12,60.86a35.3,35.3,0,0,1-16.87-21.14,44,44,0,0,0-84.5,0A35.25,35.25,0,0,1,69,148.82,40,40,0,0,0,88,224a39.48,39.48,0,0,0,15.52-3.13,64.09,64.09,0,0,1,48.87,0,40,40,0,0,0,34.73-72Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.MotorcycleFill">M216,120a41,41,0,0,0-6.6.55l-5.82-15.14A55.64,55.64,0,0,1,216,104a8,8,0,0,0,0-16H196.88L183.47,53.13A8,8,0,0,0,176,48H144a8,8,0,0,0,0,16h26.51l9.23,24H152c-18.5,0-33.5,4.31-43.37,12.46a16,16,0,0,1-16.76,2.07c-10.58-4.81-73.29-30.12-73.8-30.26a8,8,0,0,0-5,15.19S68.57,109.4,79.6,120.4A55.67,55.67,0,0,1,95.43,152H79.2a40,40,0,1,0,0,16h52.12a31.91,31.91,0,0,0,30.74-23.1,56,56,0,0,1,26.59-33.72l5.82,15.13A40,40,0,1,0,216,120ZM40,168H62.62a24,24,0,1,1,0-16H40a8,8,0,0,0,0,16Zm176,16a24,24,0,0,1-15.58-42.23l8.11,21.1a8,8,0,1,0,14.94-5.74L215.35,136l.65,0a24,24,0,0,1,0,48Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.KnifeFill">M236,49a25,25,0,0,0-42.63-17.66L143.16,81.54,18.34,206.4a8,8,0,0,0,3.86,13.45A160.67,160.67,0,0,0,58.4,224c32.95,0,65.91-10.2,96.94-30.23,31.76-20.5,50.19-43.82,51-44.8a8,8,0,0,0-.64-10.59L181.31,114l47.38-47.39A24.84,24.84,0,0,0,236,49ZM146.23,180.6c-34.43,22.1-69.94,30.92-105.76,26.3L146,101.34l43.09,43.1A220.09,220.09,0,0,1,146.23,180.6Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ShoppingBagOpenFill">M216,40H40A16,16,0,0,0,24,56V200a16,16,0,0,0,16,16H216a16,16,0,0,0,16-16V56A16,16,0,0,0,216,40ZM128,160a48.05,48.05,0,0,1-48-48,8,8,0,0,1,16,0,32,32,0,0,0,64,0,8,8,0,0,1,16,0A48.05,48.05,0,0,1,128,160ZM40,72V56H216V72Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FirstAidKitFill">M216,56H176V48a24,24,0,0,0-24-24H104A24,24,0,0,0,80,48v8H40A16,16,0,0,0,24,72V200a16,16,0,0,0,16,16H216a16,16,0,0,0,16-16V72A16,16,0,0,0,216,56Zm-64,88H136v16a8,8,0,0,1-16,0V144H104a8,8,0,0,1,0-16h16V112a8,8,0,0,1,16,0v16h16a8,8,0,0,1,0,16Zm8-88H96V48a8,8,0,0,1,8-8h48a8,8,0,0,1,8,8Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CurrencyInrFill">M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24Zm38.32,72H176a8,8,0,0,1,0,16h-8.19A44.06,44.06,0,0,1,124,152H111.32l53.59,41.69a8,8,0,1,1-9.82,12.62l-72-56A8,8,0,0,1,88,136h36a28,28,0,0,0,27.71-24H88a8,8,0,0,1,0-16h61.29A28,28,0,0,0,124,80H88a8,8,0,0,1,0-16h88a8,8,0,0,1,0,16H157.92A43.87,43.87,0,0,1,166.32,96Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.EyeglassesFill">M232,72v92a44,44,0,0,1-87.81,4H111.81A44,44,0,0,1,24,164V72A32,32,0,0,1,56,40a8,8,0,0,1,0,16A16,16,0,0,0,40,72v58.08A44,44,0,0,1,110.32,152h35.36A44,44,0,0,1,216,130.08V72a16,16,0,0,0-16-16,8,8,0,0,1,0-16A32,32,0,0,1,232,72Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.TentFill">M255.31,188.75l-64-144A8,8,0,0,0,184,40H72a8,8,0,0,0-7.31,4.75h0l0,.12v0L.69,188.75A8,8,0,0,0,8,200H248a8,8,0,0,0,7.31-11.25ZM64,184H20.31L64,85.7Zm16,0V85.7L123.69,184Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowRightFill">M221.66,133.66l-72,72A8,8,0,0,1,136,200V136H40a8,8,0,0,1,0-16h96V56a8,8,0,0,1,13.66-5.66l72,72A8,8,0,0,1,221.66,133.66Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PoliceCarFill">M96,24a8,8,0,0,1,8-8h48a8,8,0,0,1,0,16H104A8,8,0,0,1,96,24Zm152,88a8,8,0,0,1-8,8h-8v80a16,16,0,0,1-16,16H192a16,16,0,0,1-16-16v-8H80v8a16,16,0,0,1-16,16H40a16,16,0,0,1-16-16V120H16a8,8,0,0,1,0-16H27.36L54.75,56.06A16,16,0,0,1,68.64,48H187.36a16,16,0,0,1,13.89,8.06L228.64,104H240A8,8,0,0,1,248,112ZM88,144a8,8,0,0,0-8-8H56a8,8,0,0,0,0,16H80A8,8,0,0,0,88,144Zm120,0a8,8,0,0,0-8-8H176a8,8,0,0,0,0,16h24A8,8,0,0,0,208,144Zm2.21-40L187.36,64H68.64L45.79,104Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArticleMediumFill">M216,40H40A16,16,0,0,0,24,56V200a16,16,0,0,0,16,16H216a16,16,0,0,0,16-16V56A16,16,0,0,0,216,40ZM72,144a8,8,0,0,1-4.89,7.37A7.86,7.86,0,0,1,64,152H52a8,8,0,0,1,0-16h4V88H52a8,8,0,0,1,0-16H64a8,8,0,0,1,6.91,4L92,112.12,113.09,76A8,8,0,0,1,120,72h12a8,8,0,0,1,0,16h-4v48h4a8,8,0,0,1,0,16H120a7.86,7.86,0,0,1-3.11-.63A8,8,0,0,1,112,144V109.59L98.91,132a8,8,0,0,1-13.82,0L72,109.59Zm128,40H88a8,8,0,0,1,0-16H200a8,8,0,0,1,0,16Zm0-32H160a8,8,0,0,1,0-16h40a8,8,0,0,1,0,16Zm0-32H160a8,8,0,0,1,0-16h40a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.HeartHalfFill">M178,40c-20.65,0-38.73,8.88-50,23.89C116.73,48.88,98.65,40,78,40a62.07,62.07,0,0,0-62,62c0,70,103.79,126.67,108.21,129a8,8,0,0,0,7.58,0C136.21,228.67,240,172,240,102A62.07,62.07,0,0,0,178,40ZM128,214.8V104a48,48,0,0,1,41.61-47.56A83.85,83.85,0,0,1,178,56a46.06,46.06,0,0,1,46,46C224,155.61,146.25,204.15,128,214.8Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PlaceholderFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM187.31,187.31a8,8,0,0,1-11.31,0L68.69,80A8,8,0,0,1,80,68.69L187.31,176A8,8,0,0,1,187.31,187.31Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.LightningAFill">M173.87,118.58,78.67,221.43A8,8,0,0,1,65,214.15l13.67-57.56-50-22.44a8,8,0,0,1-2.59-12.73l95.2-102.85A8,8,0,0,1,135,25.85L121.31,83.41l50,22.43a8,8,0,0,1,2.59,12.74Zm61.71,104.57A7.91,7.91,0,0,1,232,224a8,8,0,0,1-7.16-4.42L215.05,200H176.94l-9.79,19.58a8,8,0,0,1-14.31-7.16l36-72a8,8,0,0,1,14.31,0l36,72A8,8,0,0,1,235.58,223.15ZM207.05,184,196,161.89,184.94,184Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CactusFill">M224,216a8,8,0,0,1-8,8H40a8,8,0,0,1,0-16H88V136H80A64.07,64.07,0,0,1,16,72,24.07,24.07,0,0,1,40.08,48h.4A23.55,23.55,0,0,1,64,71.52V72h0A16,16,0,0,0,80,88h8V56a40,40,0,0,1,80,0v72h8a16,16,0,0,0,16-16h0v-.48A23.55,23.55,0,0,1,215.52,88h.4A24.07,24.07,0,0,1,240,112a64.07,64.07,0,0,1-64,64h-8v32h48A8,8,0,0,1,224,216Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.UsersThreeFill">M64.12,147.8a4,4,0,0,1-4,4.2H16a8,8,0,0,1-7.8-6.17,8.35,8.35,0,0,1,1.62-6.93A67.79,67.79,0,0,1,37,117.51a40,40,0,1,1,66.46-35.8,3.94,3.94,0,0,1-2.27,4.18A64.08,64.08,0,0,0,64,144C64,145.28,64,146.54,64.12,147.8Zm182-8.91A67.76,67.76,0,0,0,219,117.51a40,40,0,1,0-66.46-35.8,3.94,3.94,0,0,0,2.27,4.18A64.08,64.08,0,0,1,192,144c0,1.28,0,2.54-.12,3.8a4,4,0,0,0,4,4.2H240a8,8,0,0,0,7.8-6.17A8.33,8.33,0,0,0,246.17,138.89Zm-89,43.18a48,48,0,1,0-58.37,0A72.13,72.13,0,0,0,65.07,212,8,8,0,0,0,72,224H184a8,8,0,0,0,6.93-12A72.15,72.15,0,0,0,157.19,182.07Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FolderOpenFill">M245,110.64A16,16,0,0,0,232,104H216V88a16,16,0,0,0-16-16H130.67L102.94,51.2a16.14,16.14,0,0,0-9.6-3.2H40A16,16,0,0,0,24,64V208h0a8,8,0,0,0,8,8H211.1a8,8,0,0,0,7.59-5.47l28.49-85.47A16.05,16.05,0,0,0,245,110.64ZM93.34,64,123.2,86.4A8,8,0,0,0,128,88h72v16H69.77a16,16,0,0,0-15.18,10.94L40,158.7V64Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.DeviceTabletFill">M192,24H64A24,24,0,0,0,40,48V208a24,24,0,0,0,24,24H192a24,24,0,0,0,24-24V48A24,24,0,0,0,192,24ZM64,40H192a8,8,0,0,1,8,8v8H56V48A8,8,0,0,1,64,40ZM192,216H64a8,8,0,0,1-8-8v-8H200v8A8,8,0,0,1,192,216Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowLineRightFill">M189.66,122.34a8,8,0,0,1,0,11.32l-72,72A8,8,0,0,1,104,200V136H32a8,8,0,0,1,0-16h72V56a8,8,0,0,1,13.66-5.66ZM216,32a8,8,0,0,0-8,8V216a8,8,0,0,0,16,0V40A8,8,0,0,0,216,32Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PersonSimpleSkiFill">M144,60a28,28,0,1,1,28,28A28,28,0,0,1,144,60ZM37.76,87.68l111,32.36,5.61,5.61A8,8,0,0,0,160,128h40a8,8,0,0,0,0-16H163.31l-4.72-4.72,0,0-24.9-24.9a8,8,0,0,0-11.32,0L112,92.67,42.24,72.32a8,8,0,0,0-4.48,15.36Zm200.9,105.47a8,8,0,0,0-11.1-2.22,53.78,53.78,0,0,1-45,6.9l-62.79-18.28,29.9-29.9a8,8,0,0,0-3.46-13.35l-56-16a8,8,0,0,0-4.4,15.39L128.73,148l-26.5,26.49-76-22.13a8,8,0,1,0-4.48,15.36l156.31,45.52a69.78,69.78,0,0,0,58.37-8.95A8,8,0,0,0,238.66,193.15Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BatteryEmptyFill">M200,56H32A24,24,0,0,0,8,80v96a24,24,0,0,0,24,24H200a24,24,0,0,0,24-24V80A24,24,0,0,0,200,56Zm8,120a8,8,0,0,1-8,8H32a8,8,0,0,1-8-8V80a8,8,0,0,1,8-8H200a8,8,0,0,1,8,8Zm48-80v64a8,8,0,0,1-16,0V96a8,8,0,0,1,16,0Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ClipboardTextFill">M200,32H163.74a47.92,47.92,0,0,0-71.48,0H56A16,16,0,0,0,40,48V216a16,16,0,0,0,16,16H200a16,16,0,0,0,16-16V48A16,16,0,0,0,200,32Zm-72,0a32,32,0,0,1,32,32H96A32,32,0,0,1,128,32Zm32,128H96a8,8,0,0,1,0-16h64a8,8,0,0,1,0,16Zm0-32H96a8,8,0,0,1,0-16h64a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.RobotFill">M200,48H136V16a8,8,0,0,0-16,0V48H56A32,32,0,0,0,24,80V192a32,32,0,0,0,32,32H200a32,32,0,0,0,32-32V80A32,32,0,0,0,200,48ZM172,96a12,12,0,1,1-12,12A12,12,0,0,1,172,96ZM96,184H80a16,16,0,0,1,0-32H96ZM84,120a12,12,0,1,1,12-12A12,12,0,0,1,84,120Zm60,64H112V152h32Zm32,0H160V152h16a16,16,0,0,1,0,32Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SwapFill">M224,48V152a16,16,0,0,1-16,16H112v16a8,8,0,0,1-13.66,5.66l-24-24a8,8,0,0,1,0-11.32l24-24A8,8,0,0,1,112,136v16h96V48H96v8a8,8,0,0,1-16,0V48A16,16,0,0,1,96,32H208A16,16,0,0,1,224,48ZM168,192a8,8,0,0,0-8,8v8H48V104h96v16a8,8,0,0,0,13.66,5.66l24-24a8,8,0,0,0,0-11.32l-24-24A8,8,0,0,0,144,72V88H48a16,16,0,0,0-16,16V208a16,16,0,0,0,16,16H160a16,16,0,0,0,16-16v-8A8,8,0,0,0,168,192Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.HandDepositFill">M232,198.65V240a8,8,0,0,1-16,0V198.65A74.84,74.84,0,0,0,192,144v58.35a8,8,0,0,1-14.69,4.38l-10.68-16.31c-.08-.12-.16-.25-.23-.38a12,12,0,0,0-20.89,11.83l22.13,33.79a8,8,0,0,1-13.39,8.76l-22.26-34-.24-.38c-.38-.66-.73-1.33-1.05-2H56a8,8,0,0,1-8-8V96A16,16,0,0,1,64,80h48v48a8,8,0,0,0,16,0V80h48a16,16,0,0,1,16,16v27.62A90.89,90.89,0,0,1,232,198.65ZM128,35.31l18.34,18.35a8,8,0,0,0,11.32-11.32l-32-32a8,8,0,0,0-11.32,0l-32,32A8,8,0,0,0,93.66,53.66L112,35.31V80h16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FilePptFill">M224,152.53a8.17,8.17,0,0,1-8.25,7.47H204v47.73a8.17,8.17,0,0,1-7.47,8.25,8,8,0,0,1-8.53-8V160H176.27a8.17,8.17,0,0,1-8.25-7.47,8,8,0,0,1,8-8.53h40A8,8,0,0,1,224,152.53ZM92,172.85C91.54,188.08,78.64,200,63.4,200H56v7.73A8.17,8.17,0,0,1,48.53,216,8,8,0,0,1,40,208V152a8,8,0,0,1,8-8H64A28,28,0,0,1,92,172.85Zm-16-2A12.25,12.25,0,0,0,63.65,160H56v24h8A12,12,0,0,0,76,170.84Zm84,2C159.54,188.08,146.64,200,131.4,200H124v7.73a8.17,8.17,0,0,1-7.47,8.25,8,8,0,0,1-8.53-8V152a8,8,0,0,1,8-8h16A28,28,0,0,1,160,172.85Zm-16-2A12.25,12.25,0,0,0,131.65,160H124v24h8A12,12,0,0,0,144,170.84ZM40,116V40A16,16,0,0,1,56,24h96a8,8,0,0,1,5.66,2.34l56,56A8,8,0,0,1,216,88v28a4,4,0,0,1-4,4H44A4,4,0,0,1,40,116ZM152,88h44L152,44Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.WifiSlashFill">M213.92,210.62a8,8,0,1,1-11.84,10.76l-33.67-37-28.1,33.88A15.93,15.93,0,0,1,128,224h0a15.93,15.93,0,0,1-12.31-5.77L11.65,92.8A15.65,15.65,0,0,1,8.11,80.91,15.93,15.93,0,0,1,14.28,70.1,188.26,188.26,0,0,1,46.6,50.35l-4.29-4.72a8.22,8.22,0,0,1,.13-11.38,8,8,0,0,1,11.48.37Zm34-129.71a15.93,15.93,0,0,0-6.17-10.81A186.67,186.67,0,0,0,128,32a191,191,0,0,0-42.49,4.75,4,4,0,0,0-2,6.59L186,156.07a4,4,0,0,0,6-.14L244.35,92.8A15.65,15.65,0,0,0,247.89,80.91Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SpinnerFill">M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24Zm33.94,58.75,17-17a8,8,0,0,1,11.32,11.32l-17,17a8,8,0,0,1-11.31-11.31ZM48,136a8,8,0,0,1,0-16H72a8,8,0,0,1,0,16Zm46.06,37.25-17,17a8,8,0,0,1-11.32-11.32l17-17a8,8,0,0,1,11.31,11.31Zm0-79.19a8,8,0,0,1-11.31,0l-17-17A8,8,0,0,1,77.09,65.77l17,17A8,8,0,0,1,94.06,94.06ZM136,208a8,8,0,0,1-16,0V184a8,8,0,0,1,16,0Zm0-136a8,8,0,0,1-16,0V48a8,8,0,0,1,16,0Zm54.23,118.23a8,8,0,0,1-11.32,0l-17-17a8,8,0,0,1,11.31-11.31l17,17A8,8,0,0,1,190.23,190.23ZM208,136H184a8,8,0,0,1,0-16h24a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.RacquetFill">M230,26.05C202-1.88,151.53,3.16,117.4,37.3c-31.79,31.79-38.33,77.77-16.51,106.49L71.33,173.35l-.68-.68a16,16,0,0,0-22.64,0L20.69,200a16,16,0,0,0,0,22.64l12.69,12.69a16,16,0,0,0,22.63,0h0L83.34,208a16,16,0,0,0,0-22.63l-.69-.69,29.56-29.56c11.29,8.58,25.24,12.79,40,12.79,22.72,0,47.25-10,66.54-29.3C252.83,104.47,257.88,54,230,26.05ZM224.23,104H200.06v-32h32A72.45,72.45,0,0,1,224.23,104ZM136,149.61A44.15,44.15,0,0,1,106.39,120H136ZM104,104a72.24,72.24,0,0,1,7.86-32H136v32Zm48-32h32v32h-32Zm77.67-16H200.06V26.28a44.23,44.23,0,0,1,29.66,29.66Zm-45.82-32h.16v32h-32V31.76A72.47,72.47,0,0,1,183.9,23.9ZM136,42.06V55.94H122.16a89.72,89.72,0,0,1,6.56-7.32A93.17,93.17,0,0,1,136,42.06Zm16,109.92V120h32v24.16A72.24,72.24,0,0,1,152.05,152Zm48-18.14V120H214a91.62,91.62,0,0,1-6.56,7.32A89.64,89.64,0,0,1,200.06,133.84Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PlugChargingFill">M224,56H176V16a8,8,0,0,0-16,0V56H96V16a8,8,0,0,0-8-8c-3.21,0-8,2.27-8,8.54V56H32.55C26.28,56,24,60.78,24,64a8,8,0,0,0,8,8H48v88a40,40,0,0,0,40,40h32v40a8,8,0,0,0,16,0V200h32a40,40,0,0,0,40-40V72h16a8,8,0,0,0,0-16Zm-72.51,74.81-12,32a8,8,0,0,1-15-5.62l8-21.19H112a8,8,0,0,1-7.49-10.81l12-32a8,8,0,1,1,15,5.62l-8,21.19H144a8,8,0,0,1,7.49,10.81Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.NumberSixFill">M200,24H56A16,16,0,0,0,40,40V216a16,16,0,0,0,16,16H200a16,16,0,0,0,16-16V40A16,16,0,0,0,200,24ZM128,192a44,44,0,0,1-38.3-65.62c.07-.13.12-.26.2-.38l33.48-58a8,8,0,0,1,13.86,8l-16.52,28.61A44.79,44.79,0,0,1,128,104a44,44,0,0,1,0,88Zm28-44a28,28,0,1,1-28-28A28,28,0,0,1,156,148Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ToteFill">M236,69.4A16.13,16.13,0,0,0,223.92,64H176a48,48,0,0,0-96,0H32.08a16.13,16.13,0,0,0-12,5.4,16,16,0,0,0-3.92,12.48l14.26,120a16,16,0,0,0,16,14.12H209.67a16,16,0,0,0,16-14.12l14.26-120A16,16,0,0,0,236,69.4ZM96,104a8,8,0,0,1-16,0V88a8,8,0,0,1,16,0Zm32-72a32,32,0,0,1,32,32H96A32,32,0,0,1,128,32Zm48,72a8,8,0,0,1-16,0V88a8,8,0,0,1,16,0Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.TrafficSignalFill">M216,144H200V80h16a8,8,0,0,0,0-16H200V40a16,16,0,0,0-16-16H72A16,16,0,0,0,56,40V64H40a8,8,0,0,0,0,16H56v64H40a8,8,0,0,0,0,16H56v56a16,16,0,0,0,16,16H184a16,16,0,0,0,16-16V160h16a8,8,0,0,0,0-16Zm-88-28a28,28,0,1,1,28-28A28,28,0,0,1,128,116Zm0,24a28,28,0,1,1-28,28A28,28,0,0,1,128,140Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SkipBackCircleFill">M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24Zm40,144a8,8,0,0,1-12.65,6.51L104,137.83V168a8,8,0,0,1-16,0V88a8,8,0,0,1,16,0v30.17l51.35-36.68A8,8,0,0,1,168,88Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.TextItalicFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM176,80H153.64l-34.29,96H136a8,8,0,0,1,0,16H80a8,8,0,0,1,0-16h22.36l34.29-96H120a8,8,0,0,1,0-16h56a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CarFill">M240,104H229.2L201.42,41.5A16,16,0,0,0,186.8,32H69.2a16,16,0,0,0-14.62,9.5L26.8,104H16a8,8,0,0,0,0,16h8v80a16,16,0,0,0,16,16H64a16,16,0,0,0,16-16v-8h96v8a16,16,0,0,0,16,16h24a16,16,0,0,0,16-16V120h8a8,8,0,0,0,0-16ZM80,152H56a8,8,0,0,1,0-16H80a8,8,0,0,1,0,16Zm120,0H176a8,8,0,0,1,0-16h24a8,8,0,0,1,0,16ZM44.31,104,69.2,48H186.8l24.89,56Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CubeFocusFill">M232,48V88a8,8,0,0,1-16,0V56H184a8,8,0,0,1,0-16h40A8,8,0,0,1,232,48ZM72,200H40V168a8,8,0,0,0-16,0v40a8,8,0,0,0,8,8H72a8,8,0,0,0,0-16Zm152-40a8,8,0,0,0-8,8v32H184a8,8,0,0,0,0,16h40a8,8,0,0,0,8-8V168A8,8,0,0,0,224,160ZM32,96a8,8,0,0,0,8-8V56H72a8,8,0,0,0,0-16H32a8,8,0,0,0-8,8V88A8,8,0,0,0,32,96ZM177.92,83.31,132,57.05a8,8,0,0,0-7.94,0L78.08,83.31a4,4,0,0,0,0,7L128,118.79l49.92-28.53A4,4,0,0,0,177.92,83.31ZM64,107.53V160A8,8,0,0,0,68,167l46,26.27a4,4,0,0,0,6-3.47V132.64L70,104.06A4,4,0,0,0,64,107.53ZM192,160V107.53a4,4,0,0,0-6-3.47l-50,28.58v57.11a4,4,0,0,0,6,3.47L188,167A8,8,0,0,0,192,160Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowCircleLeftFill">M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24Zm40,112H107.31l18.35,18.34a8,8,0,0,1-11.32,11.32l-32-32a8,8,0,0,1,0-11.32l32-32a8,8,0,0,1,11.32,11.32L107.31,120H168a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowBendDoubleUpRightFill">M229.66,109.66l-48,48a8,8,0,0,1-11.32-11.32L212.69,104,170.34,61.66a8,8,0,0,1,11.32-11.32l48,48A8,8,0,0,1,229.66,109.66Zm-48-11.32-48-48A8,8,0,0,0,120,56V96.3A104.15,104.15,0,0,0,24,200a8,8,0,0,0,16,0,88.11,88.11,0,0,1,80-87.63V152a8,8,0,0,0,13.66,5.66l48-48A8,8,0,0,0,181.66,98.34Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.LightningFill">M213.85,125.46l-112,120a8,8,0,0,1-13.69-7l14.66-73.33L45.19,143.49a8,8,0,0,1-3-13l112-120a8,8,0,0,1,13.69,7L153.18,90.9l57.63,21.61a8,8,0,0,1,3,12.95Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.WifiXFill">M229.66,98.34a8,8,0,0,1-11.32,11.32L200,91.31l-18.34,18.35a8,8,0,0,1-11.32-11.32L188.69,80,170.34,61.66a8,8,0,0,1,11.32-11.32L200,68.69l18.34-18.35a8,8,0,0,1,11.32,11.32L211.31,80ZM206.85,131a32.75,32.75,0,0,1-4.15-3.14,4,4,0,0,0-5.37,0,32,32,0,0,1-45.18-45.18,4,4,0,0,0,0-5.34A32,32,0,0,1,149,38.91a4,4,0,0,0-3.11-6.08Q137,32,128,32A186.67,186.67,0,0,0,14.28,70.1,15.93,15.93,0,0,0,8.11,80.91,15.65,15.65,0,0,0,11.65,92.8l104,125.43A15.93,15.93,0,0,0,128,224h0a15.93,15.93,0,0,0,12.31-5.77l67.45-81.31A4,4,0,0,0,206.85,131Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CaretCircleRightFill">M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24Zm29.66,109.66-40,40a8,8,0,0,1-11.32-11.32L140.69,128,106.34,93.66a8,8,0,0,1,11.32-11.32l40,40A8,8,0,0,1,157.66,133.66Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.TruckFill">M255.43,117l-14-35A15.93,15.93,0,0,0,226.58,72H192V64a8,8,0,0,0-8-8H32A16,16,0,0,0,16,72V184a16,16,0,0,0,16,16H49a32,32,0,0,0,62,0h50a32,32,0,0,0,62,0h17a16,16,0,0,0,16-16V120A8.13,8.13,0,0,0,255.43,117ZM80,208a16,16,0,1,1,16-16A16,16,0,0,1,80,208ZM32,136V72H176v64Zm160,72a16,16,0,1,1,16-16A16,16,0,0,1,192,208Zm0-96V88h34.58l9.6,24Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.StackPlusFill">M24,80a8,8,0,0,1,4-6.91l96-56a8,8,0,0,1,8.06,0l96,56a8,8,0,0,1,0,13.82l-96,56a8,8,0,0,1-8.06,0l-96-56A8,8,0,0,1,24,80Zm196,41.09-92,53.65L36,121.09A8,8,0,0,0,28,134.91l96,56a8,8,0,0,0,8.06,0l96-56A8,8,0,1,0,220,121.09ZM232,192H216V176a8,8,0,0,0-16,0v16H184a8,8,0,0,0,0,16h16v16a8,8,0,0,0,16,0V208h16a8,8,0,0,0,0-16Zm-92,23.76-12,7L36,169.09A8,8,0,0,0,28,182.91l96,56a8,8,0,0,0,8.06,0l16-9.33A8,8,0,1,0,140,215.76Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FilePdfFill">M44,120H212a4,4,0,0,0,4-4V88a8,8,0,0,0-2.34-5.66l-56-56A8,8,0,0,0,152,24H56A16,16,0,0,0,40,40v76A4,4,0,0,0,44,120ZM152,44l44,44H152Zm72,108.53a8.18,8.18,0,0,1-8.25,7.47H192v16h15.73a8.17,8.17,0,0,1,8.25,7.47,8,8,0,0,1-8,8.53H192v15.73a8.17,8.17,0,0,1-7.47,8.25,8,8,0,0,1-8.53-8V152a8,8,0,0,1,8-8h32A8,8,0,0,1,224,152.53ZM64,144H48a8,8,0,0,0-8,8v55.73A8.17,8.17,0,0,0,47.47,216,8,8,0,0,0,56,208v-8h7.4c15.24,0,28.14-11.92,28.59-27.15A28,28,0,0,0,64,144Zm-.35,40H56V160h8a12,12,0,0,1,12,13.16A12.25,12.25,0,0,1,63.65,184ZM128,144H112a8,8,0,0,0-8,8v56a8,8,0,0,0,8,8h15.32c19.66,0,36.21-15.48,36.67-35.13A36,36,0,0,0,128,144Zm-.49,56H120V160h8a20,20,0,0,1,20,20.77C147.58,191.59,138.34,200,127.51,200Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SirenFill">M120,16V8a8,8,0,0,1,16,0v8a8,8,0,0,1-16,0Zm80,32a8,8,0,0,0,5.66-2.34l8-8a8,8,0,0,0-11.32-11.32l-8,8A8,8,0,0,0,200,48ZM50.34,45.66A8,8,0,0,0,61.66,34.34l-8-8A8,8,0,0,0,42.34,37.66ZM232,176v24a16,16,0,0,1-16,16H40a16,16,0,0,1-16-16V176a16,16,0,0,1,16-16V128a88,88,0,0,1,88.67-88c48.15.36,87.33,40.29,87.33,89v31A16,16,0,0,1,232,176ZM134.68,87.89C153.67,91.08,168,108.32,168,128a8,8,0,0,0,16,0c0-27.4-20.07-51.43-46.68-55.89a8,8,0,1,0-2.64,15.78ZM216,200V176H40v24H216Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.LighthouseFill">M208,80a8,8,0,0,0-8,8v16H188.85L184,55.2A8,8,0,0,0,181.31,50h0L138.44,11.88l-.2-.17a16,16,0,0,0-20.48,0l-.2.17L74.68,50v0A7.93,7.93,0,0,0,72,55.2L67.15,104H56V88a8,8,0,0,0-16,0v24a8,8,0,0,0,8,8H65.54l-9.47,94.48A16,16,0,0,0,72,232H184a16,16,0,0,0,15.92-17.56L190.46,120H208a8,8,0,0,0,8-8V88A8,8,0,0,0,208,80ZM87.24,64h81.52l4,40H136V88a8,8,0,0,0-16,0v16H83.23ZM72,216l4.81-48H179.19L184,216Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SortAscendingFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM72,72h96a8,8,0,0,1,0,16H72a8,8,0,0,1,0-16Zm40,112H72a8,8,0,0,1,0-16h40a8,8,0,0,1,0,16Zm8-48H72a8,8,0,0,1,0-16h48a8,8,0,0,1,0,16Zm77.66,29.66-24,24a8,8,0,0,1-11.32,0l-24-24a8,8,0,0,1,11.32-11.32L160,164.69V120a8,8,0,0,1,16,0v44.69l10.34-10.35a8,8,0,0,1,11.32,11.32Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.GenderTransgenderFill">M127.92,150a24,24,0,1,1-22-22A24,24,0,0,1,127.92,150ZM216,40V216a16,16,0,0,1-16,16H56a16,16,0,0,1-16-16V40A16,16,0,0,1,56,24H200A16,16,0,0,1,216,40ZM192,72a8,8,0,0,0-8-8H156.27A8.17,8.17,0,0,0,148,71.47,8,8,0,0,0,156,80h8.69L148,96.69,137.66,86.34a8,8,0,0,0-11.49.18,8.22,8.22,0,0,0,.41,11.37L136.69,108,126,118.64A40,40,0,1,0,137.36,130L148,119.31l10.34,10.35a8,8,0,0,0,11.71-.43,8.2,8.2,0,0,0-.6-11.1L159.31,108,176,91.31v8.42a8.18,8.18,0,0,0,7.47,8.25,8,8,0,0,0,8.53-8Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BuildingOfficeFill">M248,208H232V96a8,8,0,0,0,0-16H184V48a8,8,0,0,0,0-16H40a8,8,0,0,0,0,16V208H24a8,8,0,0,0,0,16H248a8,8,0,0,0,0-16ZM80,72H96a8,8,0,0,1,0,16H80a8,8,0,0,1,0-16Zm-8,48a8,8,0,0,1,8-8H96a8,8,0,0,1,0,16H80A8,8,0,0,1,72,120Zm64,88H88V160h48Zm8-80H128a8,8,0,0,1,0-16h16a8,8,0,0,1,0,16Zm0-40H128a8,8,0,0,1,0-16h16a8,8,0,0,1,0,16Zm72,120H184V96h32Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ChartLineDownFill">M216,40H40A16,16,0,0,0,24,56V200a16,16,0,0,0,16,16H216a16,16,0,0,0,16-16V56A16,16,0,0,0,216,40ZM200,192H56a8,8,0,0,1-8-8V72a8,8,0,0,1,16,0V92.69l32,32,34.34-34.35a8,8,0,0,1,11.32,0L176,124.69V104a8,8,0,0,1,16,0v40a8,8,0,0,1-8,8H144a8,8,0,0,1,0-16h20.69L136,107.31l-34.34,34.35a8,8,0,0,1-11.32,0L64,115.31V176H200a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CellSignalNoneFill">M198.12,25.23a16,16,0,0,0-17.44,3.46l-160,160A16,16,0,0,0,32,216H192a16,16,0,0,0,16-16V40A15.94,15.94,0,0,0,198.12,25.23ZM192,200H32L192,40Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PantsFill">M53.44,43.5,54.12,38A16,16,0,0,1,70,24H186a16,16,0,0,1,15.88,14l.68,5.49a4,4,0,0,1-4,4.5H57.41A4,4,0,0,1,53.44,43.5ZM169,64a32.06,32.06,0,0,0,31,24h3.59a4,4,0,0,0,4-4.5l-2-16a4,4,0,0,0-4-3.5ZM52.41,88H56A32.06,32.06,0,0,0,87,64H54.41a4,4,0,0,0-4,3.5l-2,16A4,4,0,0,0,52.41,88ZM223.88,214,210.56,107.5a4,4,0,0,0-4-3.5H200a48.07,48.07,0,0,1-47.32-40H136v39.73a8.18,8.18,0,0,1-7.47,8.25,8,8,0,0,1-8.53-8V64H103.32A48.07,48.07,0,0,1,56,104H49.41a4,4,0,0,0-4,3.5L32.12,214a16,16,0,0,0,6.71,15.09A16.56,16.56,0,0,0,48.39,232h40.3a16,16,0,0,0,15.51-12.06l23.8-92,23.79,91.94A16,16,0,0,0,167.31,232h40.3a16.54,16.54,0,0,0,9.56-2.89A16,16,0,0,0,223.88,214Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ScrewdriverFill">M233.23,22.75a50.46,50.46,0,0,0-71.31,0L108.68,76A15.92,15.92,0,0,0,104,87.3V104H87.17a16.14,16.14,0,0,0-9.66,3.24,8,8,0,0,0-.82.72l-8,8a16,16,0,0,0,0,22.63l18.7,18.71-77,77.05a8,8,0,0,0,11.32,11.32l77-77.06,18.71,18.71a16,16,0,0,0,22.62,0l8-8a8.08,8.08,0,0,0,.72-.83,16,16,0,0,0,3.25-9.66V152h16.69A15.86,15.86,0,0,0,180,147.3l53.23-53.23a50.43,50.43,0,0,0,0-71.32ZM205.66,61.64l-56,56a8,8,0,0,1-11.32-11.31l56-56a8,8,0,0,1,11.32,11.32Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FileTsFill">M213.66,82.34l-56-56A8,8,0,0,0,152,24H56A16,16,0,0,0,40,40v76a4,4,0,0,0,4,4H164a4,4,0,0,1,4,4V228a4,4,0,0,0,4,4h28a16,16,0,0,0,16-16V88A8,8,0,0,0,213.66,82.34ZM152,88V44l44,44Zm-4.19,108.31a20.82,20.82,0,0,1-9.19,15.23C133.43,215,127,216,121.13,216A61.14,61.14,0,0,1,106,214a8,8,0,1,1,4.3-15.41c4.38,1.2,15,2.7,19.55-.36.88-.59,1.83-1.52,2.14-3.93.35-2.67-.71-4.1-12.78-7.59-9.35-2.7-25-7.23-23-23.11a20.56,20.56,0,0,1,9-14.95c11.84-8,30.71-3.31,32.83-2.76a8,8,0,0,1-4.07,15.48c-4.49-1.17-15.23-2.56-19.83.56a4.54,4.54,0,0,0-2,3.67c-.12.9-.14,1.09,1.11,1.9,2.31,1.49,6.45,2.68,10.45,3.84C133.49,174.17,150.05,179,147.81,196.31ZM88,152.53A8.17,8.17,0,0,1,79.73,160H68v47.73A8.17,8.17,0,0,1,60.53,216,8,8,0,0,1,52,208V160H40.27A8.17,8.17,0,0,1,32,152.53,8,8,0,0,1,40,144H80A8,8,0,0,1,88,152.53Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PathFill">M228,200a28,28,0,0,1-54.83,8H72a48,48,0,0,1,0-96h96a24,24,0,0,0,0-48H72a8,8,0,0,1,0-16h96a40,40,0,0,1,0,80H72a32,32,0,0,0,0,64H173.17A28,28,0,0,1,228,200Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BinocularsFill">M237.22,151.9l0-.1a1.42,1.42,0,0,0-.07-.22,48.46,48.46,0,0,0-2.31-5.3L193.27,51.8a8,8,0,0,0-1.67-2.44,32,32,0,0,0-45.26,0A8,8,0,0,0,144,55V80H112V55a8,8,0,0,0-2.34-5.66,32,32,0,0,0-45.26,0,8,8,0,0,0-1.67,2.44L21.2,146.28a48.46,48.46,0,0,0-2.31,5.3,1.72,1.72,0,0,0-.07.21s0,.08,0,.11a48,48,0,0,0,90.32,32.51,47.49,47.49,0,0,0,2.9-16.59V96h32v71.83a47.49,47.49,0,0,0,2.9,16.59,48,48,0,0,0,90.32-32.51Zm-143.15,27a32,32,0,0,1-60.2-21.71l1.81-4.13A32,32,0,0,1,96,167.88V168h0A32,32,0,0,1,94.07,178.94ZM203,198.07A32,32,0,0,1,160,168h0v-.11a32,32,0,0,1,60.32-14.78l1.81,4.13A32,32,0,0,1,203,198.07Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ThermometerFill">M212,56a28,28,0,1,0,28,28A28,28,0,0,0,212,56Zm0,40a12,12,0,1,1,12-12A12,12,0,0,1,212,96Zm-60,50.08V40a32,32,0,0,0-64,0V146.08a56,56,0,1,0,64,0ZM136,104H104V40a16,16,0,0,1,32,0Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.TumblrLogoFill">M152,120v48a8,8,0,0,0,8,8h32a8,8,0,0,1,8,8v48a8,8,0,0,1-8,8H152a64.07,64.07,0,0,1-64-64V120H64a8,8,0,0,1-8-8V72a8,8,0,0,1,8-8,40,40,0,0,0,40-40,8,8,0,0,1,8-8h32a8,8,0,0,1,8,8V64h40a8,8,0,0,1,8,8v40a8,8,0,0,1-8,8Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PrinterFill">M240,96v80a8,8,0,0,1-8,8H200v32a8,8,0,0,1-8,8H64a8,8,0,0,1-8-8V184H24a8,8,0,0,1-8-8V96c0-13.23,11.36-24,25.33-24H56V40a8,8,0,0,1,8-8H192a8,8,0,0,1,8,8V72h14.67C228.64,72,240,82.77,240,96ZM72,72H184V48H72Zm112,88H72v48H184Zm16-44a12,12,0,1,0-12,12A12,12,0,0,0,200,116Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SoccerBallFill">M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24Zm8,39.38,24.79-17.05a88.41,88.41,0,0,1,36.18,27l-8,26.94c-.2,0-.41.1-.61.17l-22.82,7.41a7.59,7.59,0,0,0-1,.4L136,88.62c0-.2,0-.41,0-.62V64C136,63.79,136,63.58,136,63.38ZM95.24,46.33,120,63.38c0,.2,0,.41,0,.62V88c0,.21,0,.42,0,.62L91.44,108.29a7.59,7.59,0,0,0-1-.4l-22.82-7.41c-.2-.07-.41-.12-.61-.17l-8-26.94A88.41,88.41,0,0,1,95.24,46.33Zm-13,129.09H53.9a87.4,87.4,0,0,1-13.79-43.07l22-16.88a5.77,5.77,0,0,0,.58.22l22.83,7.42a7.83,7.83,0,0,0,.93.22l10.79,31.42c-.15.18-.3.36-.44.55L82.7,174.71A7.8,7.8,0,0,0,82.24,175.42ZM150.69,213a88.16,88.16,0,0,1-45.38,0L95.25,184.6c.13-.16.27-.31.39-.48l14.11-19.42a7.66,7.66,0,0,0,.46-.7h35.58a7.66,7.66,0,0,0,.46.7l14.11,19.42c.12.17.26.32.39.48Zm23.07-37.61a7.8,7.8,0,0,0-.46-.71L159.19,155.3c-.14-.19-.29-.37-.44-.55l10.79-31.42a7.83,7.83,0,0,0,.93-.22l22.83-7.42a5.77,5.77,0,0,0,.58-.22l22,16.88a87.4,87.4,0,0,1-13.79,43.07Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.NetworkXFill">M240,120a8,8,0,0,1-8,8H200v16a8,8,0,0,1-16,0V128H72v32h8a16,16,0,0,1,16,16v32a16,16,0,0,1-16,16H48a16,16,0,0,1-16-16V176a16,16,0,0,1,16-16h8V128H24a8,8,0,0,1,0-16h96V88h-8A16,16,0,0,1,96,72V40a16,16,0,0,1,16-16h32a16,16,0,0,1,16,16V72a16,16,0,0,1-16,16h-8v24h96A8,8,0,0,1,240,120Zm-18.34,42.34a8,8,0,0,0-11.32,0L192,180.69l-18.34-18.35a8,8,0,0,0-11.32,11.32L180.69,192l-18.35,18.34a8,8,0,0,0,11.32,11.32L192,203.31l18.34,18.35a8,8,0,0,0,11.32-11.32L203.31,192l18.35-18.34A8,8,0,0,0,221.66,162.34Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PersonSimpleWalkFill">M120,48a32,32,0,1,1,32,32A32,32,0,0,1,120,48Zm88,88c-28.64,0-41.81-13.3-55.75-27.37-3.53-3.57-7.18-7.26-11-10.58-37-32.14-96.22,22.73-98.72,25.08a8,8,0,0,0,10.95,11.66A163.88,163.88,0,0,1,84,113c13.78-7.38,25.39-10.23,34.7-8.58L64.66,228.81a8,8,0,0,0,4.15,10.52A7.84,7.84,0,0,0,72,240a8,8,0,0,0,7.34-4.81l33.59-77.27L144,180.12V232a8,8,0,0,0,16,0V176a8,8,0,0,0-3.35-6.51l-37.2-26.57L132.88,112c2.64,2.44,5.26,5.07,8,7.84C155.05,134.19,172.69,152,208,152a8,8,0,0,0,0-16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PhosphorLogoFill">M152,32H72a8,8,0,0,0-8,8V168a80.09,80.09,0,0,0,80,80,8,8,0,0,0,8-8V176a72,72,0,0,0,0-144ZM136,231.5A64.14,64.14,0,0,1,80.51,176H136Zm0-94L85.68,48H136ZM152,160V48a56,56,0,0,1,0,112Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SpeakerSimpleXFill">M163.52,24.81a8,8,0,0,0-8.43.88L85.25,80H40A16,16,0,0,0,24,96v64a16,16,0,0,0,16,16H85.25l69.84,54.31A7.94,7.94,0,0,0,160,232a8,8,0,0,0,8-8V32A8,8,0,0,0,163.52,24.81Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SpeakerSimpleXFill2">M235.31,128l18.35-18.34a8,8,0,0,0-11.32-11.32L224,116.69,205.66,98.34a8,8,0,0,0-11.32,11.32L212.69,128l-18.35,18.34a8,8,0,0,0,11.32,11.32L224,139.31l18.34,18.35a8,8,0,0,0,11.32-11.32Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SmileySadFill">M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24ZM92,96a12,12,0,1,1-12,12A12,12,0,0,1,92,96Zm80,86.92A8,8,0,0,1,161.08,180c-7.47-12.91-19.21-20-33.08-20s-25.61,7.1-33.08,20a8,8,0,1,1-13.84-8c10.29-17.79,27.39-28,46.92-28s36.63,10.2,46.92,28A8,8,0,0,1,172,182.92ZM164,120a12,12,0,1,1,12-12A12,12,0,0,1,164,120Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CowFill">M104,192a8,8,0,0,1-8,8H80a8,8,0,0,1,0-16H96A8,8,0,0,1,104,192Zm72-8H160a8,8,0,0,0,0,16h16a8,8,0,0,0,0-16Zm68.39-61.88A16,16,0,0,1,232,128H200v32a40,40,0,0,1-24,72H80a40,40,0,0,1-24-72V128H24A16,16,0,0,1,8.31,109,56.13,56.13,0,0,1,63.22,64h1.64A55.83,55.83,0,0,1,48,24a8,8,0,0,1,16,0,40,40,0,0,0,40,40h48a40,40,0,0,0,40-40,8,8,0,0,1,16,0,55.83,55.83,0,0,1-16.86,40h1.64a56.13,56.13,0,0,1,54.91,45A15.82,15.82,0,0,1,244.39,122.12ZM144,124a12,12,0,1,0,12-12A12,12,0,0,0,144,124Zm-56,0a12,12,0,1,0,12-12A12,12,0,0,0,88,124ZM56,112v-8a39.81,39.81,0,0,1,8-24h-.8A40.09,40.09,0,0,0,24,112Zm144,80a24,24,0,0,0-24-24H80a24,24,0,0,0,0,48h96A24,24,0,0,0,200,192Zm32-80a40.08,40.08,0,0,0-39.2-32H192a39.81,39.81,0,0,1,8,24v8Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CloudMoonFill">M172,72a76.35,76.35,0,0,0-12.36,1A71.93,71.93,0,0,0,104.17,9.83a8,8,0,0,0-9.59,9.58A56.05,56.05,0,0,1,40,88a56.45,56.45,0,0,1-12.59-1.42,8,8,0,0,0-9.59,9.59,72.22,72.22,0,0,0,32.29,45.06A52,52,0,0,0,92,224h80a76,76,0,0,0,0-152ZM37.37,104c.87,0,1.75,0,2.63,0a72.08,72.08,0,0,0,72-72c0-.89,0-1.78,0-2.67a55.64,55.64,0,0,1,32,48.05A76.4,76.4,0,0,0,101,120.78a52.38,52.38,0,0,0-9-.78,51.69,51.69,0,0,0-30,9.59A56.22,56.22,0,0,1,37.37,104Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.WifiHighFill">M244.35,92.8l-104,125.43A15.93,15.93,0,0,1,128,224h0a15.93,15.93,0,0,1-12.31-5.77L11.65,92.8A15.65,15.65,0,0,1,8.11,80.91,15.93,15.93,0,0,1,14.28,70.1,186.67,186.67,0,0,1,128,32,186.67,186.67,0,0,1,241.72,70.1a15.93,15.93,0,0,1,6.17,10.81A15.65,15.65,0,0,1,244.35,92.8Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.AirplaneLandingFill">M256,216a8,8,0,0,1-8,8H104a8,8,0,0,1,0-16H248A8,8,0,0,1,256,216Zm-24-24a8,8,0,0,0,8-8V148.32a40.13,40.13,0,0,0-29.28-38.54l-60.84-17-22.5-53.63a8,8,0,0,0-4.85-4.5l-5.47-1.82A16,16,0,0,0,96,48V77.39L66.13,68.88,55.52,39.51a8,8,0,0,0-5-4.87l-5.47-1.82A16,16,0,0,0,24,48v55.72a40.12,40.12,0,0,0,29.21,38.52L229.84,191.7A8,8,0,0,0,232,192Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BoundingBoxFill">M208,96a16,16,0,0,0,16-16V48a16,16,0,0,0-16-16H176a16,16,0,0,0-16,16v8H96V48A16,16,0,0,0,80,32H48A16,16,0,0,0,32,48V80A16,16,0,0,0,48,96h8v64H48a16,16,0,0,0-16,16v32a16,16,0,0,0,16,16H80a16,16,0,0,0,16-16v-8h64v8a16,16,0,0,0,16,16h32a16,16,0,0,0,16-16V176a16,16,0,0,0-16-16h-8V96Zm-24,64h-8a16,16,0,0,0-16,16v8H96v-8a16,16,0,0,0-16-16H72V96h8A16,16,0,0,0,96,80V72h64v8a16,16,0,0,0,16,16h8Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ThumbsDownFill">M239.82,157l-12-96A24,24,0,0,0,204,40H32A16,16,0,0,0,16,56v88a16,16,0,0,0,16,16H75.06l37.78,75.58A8,8,0,0,0,120,240a40,40,0,0,0,40-40V184h56a24,24,0,0,0,23.82-27ZM72,144H32V56H72Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.TipiFill">M238.74,211.69,137.5,53.5l21.24-33.19a8,8,0,0,0-13.48-8.62L128,38.66l-17.26-27a8,8,0,1,0-13.48,8.62L118.5,53.5,17.26,211.69A8,8,0,0,0,24,224H232a8,8,0,0,0,6.74-12.31Zm-50-3.69-54-84.31a8,8,0,0,0-13.48,0L67.3,208H38.62L128,68.34,217.38,208Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ShareNetworkFill">M212,200a36,36,0,1,1-69.85-12.25l-53-34.05a36,36,0,1,1,0-51.4l53-34a36.09,36.09,0,1,1,8.67,13.45l-53,34.05a36,36,0,0,1,0,24.5l53,34.05A36,36,0,0,1,212,200Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FolderSimpleUserFill">M231.73,221.94A8,8,0,0,1,224,232H160A8,8,0,0,1,152.27,222a40,40,0,0,1,17.11-23.33,32,32,0,1,1,45.24,0A40,40,0,0,1,231.73,221.94ZM216,72H130.67L102.93,51.2a16.12,16.12,0,0,0-9.6-3.2H40A16,16,0,0,0,24,64V200a16,16,0,0,0,16,16h80a8,8,0,0,0,0-16H40V64H93.33l27.74,20.8a16.12,16.12,0,0,0,9.6,3.2H216v32a8,8,0,0,0,16,0V88A16,16,0,0,0,216,72Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.StrategyFill">M108,188a32,32,0,1,1-32-32A32,32,0,0,1,108,188ZM53.66,117.66,68,103.31l14.34,14.35a8,8,0,0,0,11.32-11.32L79.31,92,93.66,77.66A8,8,0,0,0,82.34,66.34L68,80.69,53.66,66.34A8,8,0,0,0,42.34,77.66L56.69,92,42.34,106.34a8,8,0,0,0,11.32,11.32ZM215.31,188l14.35-14.34a8,8,0,0,0-11.32-11.32L204,176.69l-14.34-14.35a8,8,0,0,0-11.32,11.32L192.69,188l-14.35,14.34a8,8,0,0,0,11.32,11.32L204,199.31l14.34,14.35a8,8,0,0,0,11.32-11.32ZM165.66,50.34,163.31,48H184a8,8,0,0,0,0-16H144a8,8,0,0,0-8,8V80a8,8,0,0,0,16,0V59.31l2.34,2.35c17.93,17.93,17.9,35.4,14.71,46.9-4.64,16.77-19.36,31.77-35,35.68A8,8,0,0,0,136,160a8.13,8.13,0,0,0,1.95-.24c21.21-5.3,40.35-24.6,46.53-46.93C190.58,90.78,183.9,68.59,165.66,50.34Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.HeadlightsFill">M160,80a8,8,0,0,1,8-8h72a8,8,0,0,1,0,16H168A8,8,0,0,1,160,80Zm80,88H168a8,8,0,0,0,0,16h72a8,8,0,0,0,0-16Zm0-64H168a8,8,0,0,0,0,16h72a8,8,0,0,0,0-16Zm0,32H168a8,8,0,0,0,0,16h72a8,8,0,0,0,0-16ZM128,48H88.9C44.62,48,8.33,83.62,8,127.39A80,80,0,0,0,88,208h40a16,16,0,0,0,16-16V64A16,16,0,0,0,128,48Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.GaugeFill">M240,152v24a16,16,0,0,1-16,16H115.93a4,4,0,0,1-3.24-6.35L174.27,101a8.21,8.21,0,0,0-1.37-11.3,8,8,0,0,0-11.37,1.61l-72,99.06A4,4,0,0,1,86.25,192H32a16,16,0,0,1-16-16V153.13c0-1.79,0-3.57.13-5.33a4,4,0,0,1,4-3.8H48a8,8,0,0,0,8-8.53A8.17,8.17,0,0,0,47.73,128H23.92a4,4,0,0,1-3.87-5c12-43.84,49.66-77.13,95.52-82.28a4,4,0,0,1,4.43,4V72a8,8,0,0,0,8.53,8A8.17,8.17,0,0,0,136,71.73V44.67a4,4,0,0,1,4.43-4A112.18,112.18,0,0,1,236.23,123a4,4,0,0,1-3.88,5H208.27a8.17,8.17,0,0,0-8.25,7.47,8,8,0,0,0,8,8.53h27.92a4,4,0,0,1,4,3.86C240,149.23,240,150.61,240,152Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BatteryVerticalFullFill">M88,8a8,8,0,0,1,8-8h64a8,8,0,0,1,0,16H96A8,8,0,0,1,88,8ZM200,56V224a24,24,0,0,1-24,24H80a24,24,0,0,1-24-24V56A24,24,0,0,1,80,32h96A24,24,0,0,1,200,56Zm-16,0a8,8,0,0,0-8-8H80a8,8,0,0,0-8,8V224a8,8,0,0,0,8,8h96a8,8,0,0,0,8-8Zm-24,8H96a8,8,0,0,0-8,8V208a8,8,0,0,0,8,8h64a8,8,0,0,0,8-8V72A8,8,0,0,0,160,64Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SkipForwardFill">M208,40V216a8,8,0,0,1-16,0V146.77L72.43,221.55A15.95,15.95,0,0,1,48,208.12V47.88A15.95,15.95,0,0,1,72.43,34.45L192,109.23V40a8,8,0,0,1,16,0Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.AlignCenterHorizontalSimpleFill">M224,96v64a16,16,0,0,1-16,16H136v32a8,8,0,0,1-16,0V176H48a16,16,0,0,1-16-16V96A16,16,0,0,1,48,80h72V48a8,8,0,0,1,16,0V80h72A16,16,0,0,1,224,96Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CurrencyCircleDollarFill">M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24Zm12,152h-4v8a8,8,0,0,1-16,0v-8H104a8,8,0,0,1,0-16h36a12,12,0,0,0,0-24H116a28,28,0,0,1,0-56h4V72a8,8,0,0,1,16,0v8h16a8,8,0,0,1,0,16H116a12,12,0,0,0,0,24h24a28,28,0,0,1,0,56Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.WindmillFill">M232,231.47a8.17,8.17,0,0,0-8.25-7.47H182.94l-6.3-44.12,3.24,1.91a16,16,0,0,0,21.91-5.67l11.81-20a16.49,16.49,0,0,0,2.11-11.49,15.92,15.92,0,0,0-7.6-10.74L148.93,99a8.18,8.18,0,0,1-3.33-10.63,8,8,0,0,1,11.21-3.3l20.95,12.33A4,4,0,0,0,183.24,96l30.55-51.9a16,16,0,0,0-5.67-21.92l-20.34-12a16,16,0,0,0-21.91,5.67l-35,59.42a8,8,0,0,1-11.79,2.27A8.13,8.13,0,0,1,117.21,67l12.23-20.78A4,4,0,0,0,128,40.76L76.12,10.22a16,16,0,0,0-21.91,5.67l-11.81,20a16.47,16.47,0,0,0-2.11,11.48,16,16,0,0,0,7.6,10.75L107.08,93a8.16,8.16,0,0,1,3.47,10.3,8,8,0,0,1-11.36,3.62l-21-12.34A4,4,0,0,0,72.76,96l-30.55,51.9a16,16,0,0,0,5.67,21.91l20.34,12a15.57,15.57,0,0,0,10.58,2L73.06,224H32.27A8.17,8.17,0,0,0,24,231.47,8,8,0,0,0,32,240H224A8,8,0,0,0,232,231.47ZM89.22,224,98,162.8l12.77-21.7h0L125,116.93a8.18,8.18,0,0,1,10.62-3.33,8,8,0,0,1,3.3,11.21l-12.33,21a4,4,0,0,0,1.42,5.47l31,18.25L166.78,224Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BookFill">M216,32V192a8,8,0,0,1-8,8H72a16,16,0,0,0-16,16H192a8,8,0,0,1,0,16H48a8,8,0,0,1-8-8V56A32,32,0,0,1,72,24H208A8,8,0,0,1,216,32Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.VoicemailFill">M200,72a56,56,0,0,0-39.14,96H95.14A56,56,0,1,0,56,184H200a56,56,0,0,0,0-112ZM56,168a40,40,0,1,1,40-40A40,40,0,0,1,56,168Zm144,0a40,40,0,1,1,40-40A40,40,0,0,1,200,168Zm24-40a24,24,0,1,1-24-24A24,24,0,0,1,224,128ZM80,128a24,24,0,1,1-24-24A24,24,0,0,1,80,128Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SpadeFill">M232,136a56,56,0,0,1-83.4,48.82l11.06,36.88A8,8,0,0,1,152,232H104a8,8,0,0,1-7.66-10.3l11.06-36.88A56,56,0,0,1,24,136c0-32,17.65-62.84,51-89.27a234.14,234.14,0,0,1,49.89-30.11,7.93,7.93,0,0,1,6.16,0A234.14,234.14,0,0,1,181,46.73C214.35,73.16,232,104,232,136Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FileMagnifyingGlassFill">M144,148a20,20,0,1,1-20-20A20,20,0,0,1,144,148Zm72-60V216a16,16,0,0,1-16,16H56a16,16,0,0,1-16-16V40A16,16,0,0,1,56,24h96a8,8,0,0,1,5.66,2.34l56,56A8,8,0,0,1,216,88Zm-50.34,90.34-11.2-11.19a36.05,36.05,0,1,0-11.31,11.31l11.19,11.2a8,8,0,0,0,11.32-11.32ZM196,88,152,44V88Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BoxArrowDownFill">M223.16,68.42l-16-32A8,8,0,0,0,200,32H56a8,8,0,0,0-7.16,4.42l-16,32A8.08,8.08,0,0,0,32,72V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V72A8.08,8.08,0,0,0,223.16,68.42Zm-57.5,89.24-32,32a8,8,0,0,1-11.32,0l-32-32a8,8,0,0,1,11.32-11.32L120,164.69V104a8,8,0,0,1,16,0v60.69l18.34-18.35a8,8,0,0,1,11.32,11.32ZM52.94,64l8-16H195.06l8,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.NumberSquareOneFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM140,176a8,8,0,0,1-16,0V95l-11.56,7.71a8,8,0,1,1-8.88-13.32l24-16A8,8,0,0,1,140,80Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SpeakerNoneFill">M64,84v88a4,4,0,0,1-4,4H32a16,16,0,0,1-16-16V96A16,16,0,0,1,32,80H60A4,4,0,0,1,64,84Zm93.15-58.15a8,8,0,0,0-10-.16l-65.57,51A4,4,0,0,0,80,79.84v96.32a4,4,0,0,0,1.55,3.15l65.57,51a8,8,0,0,0,9,.56,8.29,8.29,0,0,0,3.91-7.18V32.25A8.27,8.27,0,0,0,157.12,25.85Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SidebarFill">M216,40H40A16,16,0,0,0,24,56V200a16,16,0,0,0,16,16H216a16,16,0,0,0,16-16V56A16,16,0,0,0,216,40ZM64,152H48a8,8,0,0,1,0-16H64a8,8,0,0,1,0,16Zm0-32H48a8,8,0,0,1,0-16H64a8,8,0,0,1,0,16Zm0-32H48a8,8,0,0,1,0-16H64a8,8,0,0,1,0,16ZM216,200H88V56H216V200Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowLineUpRightFill">M224,216a8,8,0,0,1-8,8H40a8,8,0,0,1,0-16H216A8,8,0,0,1,224,216ZM80,176a8,8,0,0,0,5.66-2.34L144,115.31l42.34,42.35A8,8,0,0,0,200,152V56a8,8,0,0,0-8-8H96a8,8,0,0,0-5.66,13.66L132.69,104,74.34,162.34A8,8,0,0,0,80,176Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.WaveformSlashFill">M216,40H40A16,16,0,0,0,24,56V200a16,16,0,0,0,16,16H216a16,16,0,0,0,16-16V56A16,16,0,0,0,216,40ZM184,96a8,8,0,0,1,16,0v50.75a8,8,0,0,1-16,0Zm-32,8a8,8,0,0,1,16,0v10.75a8,8,0,0,1-16,0ZM72,152a8,8,0,0,1-16,0V104a8,8,0,0,1,16,0Zm125.66,45.66a8,8,0,0,1-11.32,0L136,147.31V168a8,8,0,0,1-16,0V131.31l-16-16V184a8,8,0,0,1-16,0V99.5c0-.06,0-.12,0-.18L58.34,69.66A8,8,0,0,1,69.66,58.34l128,128A8,8,0,0,1,197.66,197.66Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ChatCircleFill">M232,128A104,104,0,0,1,79.12,219.82L45.07,231.17a16,16,0,0,1-20.24-20.24l11.35-34.05A104,104,0,1,1,232,128Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.HandEyeFill">M144,180a16,16,0,1,1-16-16A16,16,0,0,1,144,180Zm72-76v48a88,88,0,0,1-176,0V64a16,16,0,0,1,32,0v56a8,8,0,0,0,16,0V32a16,16,0,0,1,32,0v80a8,8,0,0,0,16,0V48a16,16,0,0,1,32,0v80a8,8,0,0,0,16,0V104a16,16,0,0,1,32,0Zm-36.42,74.21c-.7-1.4-17.5-34.21-51.58-34.21s-50.88,32.81-51.58,34.21a4,4,0,0,0,0,3.58c.7,1.4,17.5,34.21,51.58,34.21s50.88-32.81,51.58-34.21A4,4,0,0,0,179.58,178.21Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BroomFill">M235.29,216.7C212.86,205.69,200,182.12,200,152V134.69a15.94,15.94,0,0,0-10.09-14.87l-28.65-11.46A8,8,0,0,1,156.79,98l22.32-56.67C184,28.79,178,14.21,165.34,9.51a24,24,0,0,0-30.7,13.71L112.25,80.08a8,8,0,0,1-10.41,4.5L73.11,73.08a15.91,15.91,0,0,0-17.38,3.66C34.68,98.4,24,123.71,24,152a111.53,111.53,0,0,0,31.15,77.53A8.06,8.06,0,0,0,61,232H232a8,8,0,0,0,8-7.51A8.21,8.21,0,0,0,235.29,216.7ZM115.11,216a87.52,87.52,0,0,1-24.26-41.71,8.21,8.21,0,0,0-9.25-6.18A8,8,0,0,0,75.28,178a105.33,105.33,0,0,0,18.36,38H64.44A95.62,95.62,0,0,1,40,152a85.92,85.92,0,0,1,7.73-36.3l137.8,55.13c3,18.06,10.55,33.5,21.89,45.19Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ChatsFill">M232,96a16,16,0,0,0-16-16H184V48a16,16,0,0,0-16-16H40A16,16,0,0,0,24,48V176a8,8,0,0,0,13,6.22L72,154V184a16,16,0,0,0,16,16h93.59L219,230.22a8,8,0,0,0,5,1.78,8,8,0,0,0,8-8Zm-42.55,89.78a8,8,0,0,0-5-1.78H88V152h80a16,16,0,0,0,16-16V96h32V207.25Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowsInLineVerticalFill">M224,128a8,8,0,0,1-8,8H40a8,8,0,0,1,0-16H216A8,8,0,0,1,224,128ZM122.34,101.66a8,8,0,0,0,11.32,0l32-32A8,8,0,0,0,160,56H136V16a8,8,0,0,0-16,0V56H96a8,8,0,0,0-5.66,13.66Zm11.32,52.68a8,8,0,0,0-11.32,0l-32,32A8,8,0,0,0,96,200h24v40a8,8,0,0,0,16,0V200h24a8,8,0,0,0,5.66-13.66Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.LifebuoyFill">M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24ZM96,128a32,32,0,1,1,32,32A32,32,0,0,1,96,128Zm88.28-67.6L155.79,88.9a47.84,47.84,0,0,0-55.58,0L71.72,60.4a87.83,87.83,0,0,1,112.56,0ZM71.72,195.6l28.49-28.5a47.84,47.84,0,0,0,55.58,0l28.49,28.5a87.83,87.83,0,0,1-112.56,0Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.MoneyWavyFill">M244.24,60a8,8,0,0,0-7.75-.4c-42.93,21-73.59,11.16-106,.78C96.4,49.53,61.2,38.28,12.49,62.06A8,8,0,0,0,8,69.24V189.17a8,8,0,0,0,11.51,7.19c42.93-21,73.59-11.16,106.05-.78,19.24,6.15,38.84,12.42,61,12.42,17.09,0,35.73-3.72,56.91-14.06a8,8,0,0,0,4.49-7.18V66.83A8,8,0,0,0,244.24,60ZM48,152a8,8,0,0,1-16,0V88a8,8,0,0,1,16,0Zm80,8a32,32,0,1,1,32-32A32,32,0,0,1,128,160Zm96,8a8,8,0,0,1-16,0V104a8,8,0,0,1,16,0Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.TelevisionFill">M216,64H147.31l34.35-34.34a8,8,0,1,0-11.32-11.32L128,60.69,85.66,18.34A8,8,0,0,0,74.34,29.66L108.69,64H40A16,16,0,0,0,24,80V200a16,16,0,0,0,16,16H216a16,16,0,0,0,16-16V80A16,16,0,0,0,216,64Zm0,136H160V80h56V200Zm-16-84a12,12,0,1,1-12-12A12,12,0,0,1,200,116Zm0,48a12,12,0,1,1-12-12A12,12,0,0,1,200,164Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SkipBackFill">M208,47.88V208.12a16,16,0,0,1-24.43,13.43L64,146.77V216a8,8,0,0,1-16,0V40a8,8,0,0,1,16,0v69.23L183.57,34.45A15.95,15.95,0,0,1,208,47.88Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.InfinityFill">M216,40H40A16,16,0,0,0,24,56V200a16,16,0,0,0,16,16H216a16,16,0,0,0,16-16V56A16,16,0,0,0,216,40ZM204.28,156.28a40,40,0,0,1-56.4.17L97.29,111.34,97,111A24,24,0,1,0,97,145c.36-.36.71-.73,1-1.1a8,8,0,1,1,12,10.6c-.55.62-1.13,1.23-1.71,1.81a40,40,0,1,1-.17-56.73l50.58,45.11.33.31A24,24,0,1,0,159,111c-.36.36-.7.72-1,1.1a8,8,0,0,1-12-10.59c.54-.62,1.12-1.24,1.71-1.82a40,40,0,0,1,56.57,56.56Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PushPinSlashFill">M235.33,104l-47.62,47.78a4,4,0,0,1-5.79-.14L108,70.27a4,4,0,0,1,.13-5.51L152,20.7a16,16,0,0,1,22.63,0l60.69,60.68A16,16,0,0,1,235.33,104ZM53.92,34.62a8,8,0,0,0-12,.21,8.18,8.18,0,0,0,.37,10.75L67.32,73.15C58.26,75.09,48.2,79.37,38,87.63a16,16,0,0,0-1.29,23.78L85,159.71,42.55,202.14a8.17,8.17,0,0,0-.6,11.09,8,8,0,0,0,11.71.43L96.29,171l48.29,48.29A16,16,0,0,0,155.9,224c.38,0,.75,0,1.13,0a15.93,15.93,0,0,0,11.64-6.33,88.62,88.62,0,0,0,11.64-20.2l21.77,23.95a8,8,0,1,0,11.84-10.76Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.AirplaneFill">M240,136v32a8,8,0,0,1-8,8,7.61,7.61,0,0,1-1.57-.16L156,161v23.73l17.66,17.65A8,8,0,0,1,176,208v24a8,8,0,0,1-11,7.43l-37-14.81L91,239.43A8,8,0,0,1,80,232V208a8,8,0,0,1,2.34-5.66L100,184.69V161L25.57,175.84A7.61,7.61,0,0,1,24,176a8,8,0,0,1-8-8V136a8,8,0,0,1,4.42-7.16L100,89.06V44a28,28,0,0,1,56,0V89.06l79.58,39.78A8,8,0,0,1,240,136Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.GlobeXFill">M128,24a104,104,0,0,0,0,208,8,8,0,0,0,5-14.21l0,0c-1.12-.91-20.88-17.32-31.06-49.77h26a8,8,0,0,0,0-16H98.08a140.17,140.17,0,0,1,0-48h59.88A138,138,0,0,1,160,128a8,8,0,0,0,16,0,154.7,154.7,0,0,0-1.84-24h38.51A87.61,87.61,0,0,1,216,128a8,8,0,0,0,16,0A104.11,104.11,0,0,0,128,24ZM102,88a115.11,115.11,0,0,1,26-45,115.27,115.27,0,0,1,26,45Zm68.75,0a135.28,135.28,0,0,0-22.3-45.6,88.29,88.29,0,0,1,58,45.6Zm50.95,85.66L203.31,192l18.35,18.34a8,8,0,0,1-11.32,11.32L192,203.31l-18.34,18.35a8,8,0,0,1-11.32-11.32L180.69,192l-18.35-18.34a8,8,0,0,1,11.32-11.32L192,180.69l18.34-18.35a8,8,0,0,1,11.32,11.32Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.NumberFiveFill">M200,24H56A16,16,0,0,0,40,40V216a16,16,0,0,0,16,16H200a16,16,0,0,0,16-16V40A16,16,0,0,0,200,24Zm-76,80a44,44,0,1,1-34.22,71.66,8,8,0,0,1,12.44-10.06,28,28,0,1,0,.35-35.62,8,8,0,0,1-14-6.29l7.55-52.82A8,8,0,0,1,104,64h56a8,8,0,0,1,0,16H110.94L107,107.4A44,44,0,0,1,124,104Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ImageSquareFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM48,48H208v77.38l-24.69-24.7a16,16,0,0,0-22.62,0L53.37,208H48ZM80,96a16,16,0,1,1,16,16A16,16,0,0,1,80,96Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SquareSplitHorizontalFill">M120,44V212a4,4,0,0,1-4,4H56a16,16,0,0,1-16-16V56A16,16,0,0,1,56,40h60A4,4,0,0,1,120,44Zm80-4H140a4,4,0,0,0-4,4V212a4,4,0,0,0,4,4h60a16,16,0,0,0,16-16V56A16,16,0,0,0,200,40Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.RowsPlusBottomFill">M224,128v24a16,16,0,0,1-16,16H48a16,16,0,0,1-16-16V128a16,16,0,0,1,16-16H208A16,16,0,0,1,224,128ZM208,40H48A16,16,0,0,0,32,56V80A16,16,0,0,0,48,96H208a16,16,0,0,0,16-16V56A16,16,0,0,0,208,40ZM152,208H136V192a8,8,0,0,0-16,0v16H104a8,8,0,0,0,0,16h16v16a8,8,0,0,0,16,0V224h16a8,8,0,0,0,0-16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ChefHatFill">M240,112a56.06,56.06,0,0,0-56-56c-1.77,0-3.54.1-5.29.26a56,56,0,0,0-101.42,0C75.54,56.1,73.77,56,72,56A56,56,0,0,0,48,162.59V208a16,16,0,0,0,16,16H192a16,16,0,0,0,16-16V162.59A56.09,56.09,0,0,0,240,112Zm-87.76,30.06,8-32a8,8,0,0,1,15.52,3.88l-8,32A8,8,0,0,1,160,152a8.13,8.13,0,0,1-1.95-.24A8,8,0,0,1,152.24,142.06ZM120,112a8,8,0,0,1,16,0v32a8,8,0,0,1-16,0Zm-33.94-7.76a8,8,0,0,1,9.7,5.82l8,32a8,8,0,0,1-5.82,9.7,8.13,8.13,0,0,1-2,.24,8,8,0,0,1-7.75-6.06l-8-32A8,8,0,0,1,86.06,104.24ZM192,208H64V167.42a55.49,55.49,0,0,0,8,.58H184a55.49,55.49,0,0,0,8-.58Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PatreonLogoFill">M232,93.17c0,41-29.69,52.47-53.55,61.67-8.41,3.24-16.35,6.3-22.21,10.28-11.39,7.72-18.59,21.78-25.55,35.38-9.94,19.42-20.23,39.5-43.17,39.5-12.91,0-24.61-11.64-33.85-33.66s-14.31-51-13.61-77.45c1.08-40.65,14.58-62.68,25.7-74,14.95-15.2,35.24-25.3,58.68-29.2,21.79-3.62,44.14-1.38,62.93,6.3C215.73,43.6,232,65.9,232,93.17Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.RoadHorizonFill">M239,188.08,173.68,72h58A8.17,8.17,0,0,0,240,64.53,8,8,0,0,0,232,56H24.27A8.17,8.17,0,0,0,16,63.47,8,8,0,0,0,24,72H82.32L17,188.08a8,8,0,0,0,1.17,9.43,8.24,8.24,0,0,0,6,2.49H116a4,4,0,0,0,4-4V176.27a8.17,8.17,0,0,1,7.47-8.25,8,8,0,0,1,8.53,8v20a4,4,0,0,0,4,4h91.77a8.24,8.24,0,0,0,6-2.49A8,8,0,0,0,239,188.08ZM136,140a8,8,0,0,1-16,0V124a8,8,0,0,1,16,0Zm0-52a8,8,0,0,1-16,0V80a8,8,0,0,1,16,0Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.WifiLowFill">M247.89,80.91a15.93,15.93,0,0,0-6.17-10.81A186.67,186.67,0,0,0,128,32,186.67,186.67,0,0,0,14.28,70.1,15.93,15.93,0,0,0,8.11,80.91,15.65,15.65,0,0,0,11.65,92.8l104,125.43A15.93,15.93,0,0,0,128,224h0a15.93,15.93,0,0,0,12.31-5.77h0l104-125.43A15.65,15.65,0,0,0,247.89,80.91Zm-77.52,76a75.89,75.89,0,0,0-84.74,0L24.09,82.74A170.76,170.76,0,0,1,128,48,170.76,170.76,0,0,1,231.91,82.74Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.WindFill">M120,104H24a8,8,0,0,1-8-8.53A8.17,8.17,0,0,1,24.27,88H112a8,8,0,0,0,8-8.53A8.17,8.17,0,0,0,111.73,72H92.29a4,4,0,0,1-4-4.58A32,32,0,1,1,120,104Zm119.92-2.29a32,32,0,0,0-63.59-2.29,4,4,0,0,0,4,4.58h19.44a8.17,8.17,0,0,1,8.25,7.47,8,8,0,0,1-8,8.53H32.27A8.17,8.17,0,0,0,24,127.47,8,8,0,0,0,32,136H208A32,32,0,0,0,239.92,101.71ZM152,152H40.27A8.17,8.17,0,0,0,32,159.47,8,8,0,0,0,40,168H143.73a8.17,8.17,0,0,1,8.25,7.47,8,8,0,0,1-8,8.53H124.29a4,4,0,0,0-4,4.58A32,32,0,1,0,152,152Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SealFill">M240,128c0,10.44-7.51,18.27-14.14,25.18-3.77,3.94-7.67,8-9.14,11.57-1.36,3.27-1.44,8.69-1.52,13.94-.15,9.76-.31,20.82-8,28.51s-18.75,7.85-28.51,8c-5.25.08-10.67.16-13.94,1.52-3.57,1.47-7.63,5.37-11.57,9.14C146.27,232.49,138.44,240,128,240s-18.27-7.51-25.18-14.14c-3.94-3.77-8-7.67-11.57-9.14-3.27-1.36-8.69-1.44-13.94-1.52-9.76-.15-20.82-.31-28.51-8s-7.85-18.75-8-28.51c-.08-5.25-.16-10.67-1.52-13.94-1.47-3.57-5.37-7.63-9.14-11.57C23.51,146.27,16,138.44,16,128s7.51-18.27,14.14-25.18c3.77-3.94,7.67-8,9.14-11.57,1.36-3.27,1.44-8.69,1.52-13.94.15-9.76.31-20.82,8-28.51s18.75-7.85,28.51-8c5.25-.08,10.67-.16,13.94-1.52,3.57-1.47,7.63-5.37,11.57-9.14C109.73,23.51,117.56,16,128,16s18.27,7.51,25.18,14.14c3.94,3.77,8,7.67,11.57,9.14,3.27,1.36,8.69,1.44,13.94,1.52,9.76.15,20.82.31,28.51,8s7.85,18.75,8,28.51c.08,5.25.16,10.67,1.52,13.94,1.47,3.57,5.37,7.63,9.14,11.57C232.49,109.73,240,117.56,240,128Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PersonSimpleSnowboardFill">M136,52a28,28,0,1,1,28,28A28,28,0,0,1,136,52Zm87.67,70.25a8,8,0,0,1-9.93,5.42l-79.07-23.26-7.78,11.67,35.33,10.23a8,8,0,0,1,4.42,12.14l-19.75,29.44,50.89,14.75A25.32,25.32,0,0,1,216,206.81,25.28,25.28,0,0,1,190.79,232a25.88,25.88,0,0,1-7.14-1L26.21,185.35A25.32,25.32,0,0,1,8,161.18,25.25,25.25,0,0,1,40.34,137l44.73,13,33.52-50.28-40.85-12a8,8,0,1,1,4.52-15.35l136,40A8,8,0,0,1,223.67,122.25ZM117.58,130l-16.4,24.6,29.58,8.58,16.49-24.59Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.WineFill">M205.33,103.67,183.56,29.74A8,8,0,0,0,175.89,24H80.11a8,8,0,0,0-7.67,5.74L50.67,103.67a63.46,63.46,0,0,0,17.42,64.67A87.41,87.41,0,0,0,120,191.63V232H88a8,8,0,1,0,0,16h80a8,8,0,1,0,0-16H136V191.63a87.39,87.39,0,0,0,51.91-23.29A63.48,63.48,0,0,0,205.33,103.67ZM86.09,40h83.82L190,108.19c.09.3.17.6.25.9-21.42,7.68-45.54-1.6-58.63-8.23C106.43,88.11,86.43,86.49,71.68,88.93Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.LockKeyOpenFill">M208,80H96V56a32,32,0,0,1,32-32c15.37,0,29.2,11,32.16,25.59a8,8,0,0,0,15.68-3.18C171.32,24.15,151.2,8,128,8A48.05,48.05,0,0,0,80,56V80H48A16,16,0,0,0,32,96V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V96A16,16,0,0,0,208,80Zm-72,78.63V184a8,8,0,0,1-16,0V158.63a24,24,0,1,1,16,0Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SmileyWinkFill">M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24ZM92,96a12,12,0,1,1-12,12A12,12,0,0,1,92,96Zm82.92,60c-10.29,17.79-27.39,28-46.92,28s-36.63-10.2-46.92-28a8,8,0,1,1,13.84-8c7.47,12.91,19.21,20,33.08,20s25.61-7.1,33.08-20a8,8,0,1,1,13.84,8ZM184,116H152a8,8,0,0,1,0-16h32a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.GitCommitFill">M256,128a8,8,0,0,1-8,8H183.42a56,56,0,0,1-110.84,0H8a8,8,0,0,1,0-16H72.58a56,56,0,0,1,110.84,0H248A8,8,0,0,1,256,128Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.RssFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM76,192a12,12,0,1,1,12-12A12,12,0,0,1,76,192Zm44,0a8,8,0,0,1-8-8,40,40,0,0,0-40-40,8,8,0,0,1,0-16,56.06,56.06,0,0,1,56,56A8,8,0,0,1,120,192Zm32,0a8,8,0,0,1-8-8,72.08,72.08,0,0,0-72-72,8,8,0,0,1,0-16,88.1,88.1,0,0,1,88,88A8,8,0,0,1,152,192Zm32,0a8,8,0,0,1-8-8A104.11,104.11,0,0,0,72,80a8,8,0,0,1,0-16A120.13,120.13,0,0,1,192,184,8,8,0,0,1,184,192Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.RainbowFill">M128,48A120.13,120.13,0,0,0,8,168v16a8,8,0,0,0,8,8H240a8,8,0,0,0,8-8V168A120.13,120.13,0,0,0,128,48Zm32,128a8,8,0,0,1-8-8,24,24,0,0,0-48,0,8,8,0,0,1-16,0,40,40,0,0,1,80,0A8,8,0,0,1,160,176Zm32,0a8,8,0,0,1-8-8,56,56,0,0,0-112,0,8,8,0,0,1-16,0,72,72,0,0,1,144,0A8,8,0,0,1,192,176Zm32,0a8,8,0,0,1-8-8,88,88,0,0,0-176,0,8,8,0,0,1-16,0,104,104,0,0,1,208,0A8,8,0,0,1,224,176Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowUpFill">M207.39,115.06A8,8,0,0,1,200,120H136v96a8,8,0,0,1-16,0V120H56a8,8,0,0,1-5.66-13.66l72-72a8,8,0,0,1,11.32,0l72,72A8,8,0,0,1,207.39,115.06Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.StethoscopeFill">M240,160a32,32,0,1,0-39.93,31,8,8,0,0,0-.07,1,32,32,0,0,1-32,32H144a32,32,0,0,1-32-32V151.48c31.47-4,56-31.47,56-64.31V40a8,8,0,0,0-8-8H136a8,8,0,0,0,0,16h16V87.17c0,26.58-21.25,48.49-47.36,48.83A48,48,0,0,1,56,88V48H72a8,8,0,0,0,0-16H48a8,8,0,0,0-8,8V88a64,64,0,0,0,56,63.49V192a48.05,48.05,0,0,0,48,48h24a48.05,48.05,0,0,0,48-48,8,8,0,0,0-.07-1A32,32,0,0,0,240,160Zm-32,8a8,8,0,1,1,8-8A8,8,0,0,1,208,168Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PushPinSimpleFill">M224,176a8,8,0,0,1-8,8H136v56a8,8,0,0,1-16,0V184H40a8,8,0,0,1,0-16h9.29L70.46,48H64a8,8,0,0,1,0-16H192a8,8,0,0,1,0,16h-6.46l21.17,120H216A8,8,0,0,1,224,176Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ShareFill">M229.66,109.66l-48,48A8,8,0,0,1,168,152V112h-3a88,88,0,0,0-85.23,66,8,8,0,0,1-15.5-4A103.94,103.94,0,0,1,165,96h3V56a8,8,0,0,1,13.66-5.66l48,48A8,8,0,0,1,229.66,109.66ZM192,208H40V88a8,8,0,0,0-16,0V216a8,8,0,0,0,8,8H192a8,8,0,0,0,0-16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.VideoCameraSlashFill">M256,80.23v95.45a8.33,8.33,0,0,1-3.86,7.17,8,8,0,0,1-8.58-.19l-33.78-22.52a4,4,0,0,1-1.78-3.33V99.19a4,4,0,0,1,1.78-3.32l33.78-22.53a8,8,0,0,1,9.73.66A8.23,8.23,0,0,1,256,80.23ZM53.92,34.62A8,8,0,1,0,42.08,45.38L51.73,56H32A16,16,0,0,0,16,72V184a16,16,0,0,0,16,16H182.64l19.44,21.38a8,8,0,1,0,11.84-10.76ZM185,155.07a4,4,0,0,0,7-2.7V72a16,16,0,0,0-16-16H104a4,4,0,0,0-3,6.69Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.UserCirclePlusFill">M128,76a44,44,0,1,1-44,44A44,44,0,0,1,128,76Zm48-12h16V80a8,8,0,0,0,16,0V64h16a8,8,0,0,0,0-16H208V32a8,8,0,0,0-16,0V48H176a8,8,0,0,0,0,16Zm45.35,40.11a8,8,0,0,0-6.57,9.21A88.85,88.85,0,0,1,216,128a87.62,87.62,0,0,1-22.24,58.41A79.86,79.86,0,0,0,172,165.1a4,4,0,0,0-4.84.32,59.81,59.81,0,0,1-78.27,0A4,4,0,0,0,84,165.1a79.71,79.71,0,0,0-21.79,21.31A88,88,0,0,1,128,40a88.76,88.76,0,0,1,14.68,1.22,8,8,0,0,0,2.64-15.78,103.92,103.92,0,1,0,85.24,85.24A8,8,0,0,0,221.35,104.11Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.MusicNotesSimpleFill">M212.92,17.69a8,8,0,0,0-6.86-1.45l-128,32A8,8,0,0,0,72,56V166.08A36,36,0,1,0,88,196V62.25l112-28v99.83A36,36,0,1,0,216,164V24A8,8,0,0,0,212.92,17.69Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.OfficeChairFill">M248,128a8,8,0,0,1-8,8H223.33A48.08,48.08,0,0,1,176,176H136v24h24a32,32,0,0,1,32,32,8,8,0,0,1-16,0,16,16,0,0,0-16-16H136v16a8,8,0,0,1-16,0V216H96a16,16,0,0,0-16,16,8,8,0,0,1-16,0,32,32,0,0,1,32-32h24V176H80a48.08,48.08,0,0,1-47.33-40H16a8,8,0,0,1,0-16H40a8,8,0,0,1,8,8,32,32,0,0,0,32,32h96a32,32,0,0,0,32-32,8,8,0,0,1,8-8h24A8,8,0,0,1,248,128ZM80,144h96a16,16,0,0,0,15.84-18.26l-13.72-96A16.08,16.08,0,0,0,162.28,16H93.72A16.08,16.08,0,0,0,77.88,29.74l-13.72,96A16,16,0,0,0,80,144Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PenFill">M227.32,73.37,182.63,28.69a16,16,0,0,0-22.63,0L36.69,152A15.86,15.86,0,0,0,32,163.31V208a16,16,0,0,0,16,16H92.69A15.86,15.86,0,0,0,104,219.31l83.67-83.66,3.48,13.9-36.8,36.79a8,8,0,0,0,11.31,11.32l40-40a8,8,0,0,0,2.11-7.6l-6.9-27.61L227.32,96A16,16,0,0,0,227.32,73.37ZM192,108.69,147.32,64l24-24L216,84.69Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ParallelogramFill">M246.58,62.57l-64.8,144A16,16,0,0,1,167.19,216H24A16,16,0,0,1,9.42,193.43l64.8-144A16,16,0,0,1,88.81,40H232a16,16,0,0,1,14.59,22.57Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.StopFill">M216,56V200a16,16,0,0,1-16,16H56a16,16,0,0,1-16-16V56A16,16,0,0,1,56,40H200A16,16,0,0,1,216,56Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowDownLeftFill">M197.66,69.66,127.31,140l46.35,46.34A8,8,0,0,1,168,200H64a8,8,0,0,1-8-8V88a8,8,0,0,1,13.66-5.66L116,128.69l70.34-70.35a8,8,0,0,1,11.32,11.32Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SubsetProperOfFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM128,176h48a8,8,0,0,1,0,16H128a64,64,0,0,1,0-128h48a8,8,0,0,1,0,16H128a48,48,0,0,0,0,96Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FloppyDiskFill">M219.31,72,184,36.69A15.86,15.86,0,0,0,172.69,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V83.31A15.86,15.86,0,0,0,219.31,72ZM208,208H184V152a16,16,0,0,0-16-16H88a16,16,0,0,0-16,16v56H48V48H172.69L208,83.31ZM160,72a8,8,0,0,1-8,8H96a8,8,0,0,1,0-16h56A8,8,0,0,1,160,72Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SunFill">M120,40V16a8,8,0,0,1,16,0V40a8,8,0,0,1-16,0Zm8,24a64,64,0,1,0,64,64A64.07,64.07,0,0,0,128,64ZM58.34,69.66A8,8,0,0,0,69.66,58.34l-16-16A8,8,0,0,0,42.34,53.66Zm0,116.68-16,16a8,8,0,0,0,11.32,11.32l16-16a8,8,0,0,0-11.32-11.32ZM192,72a8,8,0,0,0,5.66-2.34l16-16a8,8,0,0,0-11.32-11.32l-16,16A8,8,0,0,0,192,72Zm5.66,114.34a8,8,0,0,0-11.32,11.32l16,16a8,8,0,0,0,11.32-11.32ZM48,128a8,8,0,0,0-8-8H16a8,8,0,0,0,0,16H40A8,8,0,0,0,48,128Zm80,80a8,8,0,0,0-8,8v24a8,8,0,0,0,16,0V216A8,8,0,0,0,128,208Zm112-88H216a8,8,0,0,0,0,16h24a8,8,0,0,0,0-16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BootFill">M192,112H112.27a8.17,8.17,0,0,1-8.25-7.47A8,8,0,0,1,112,96h44a4,4,0,0,0,4-4V84a4,4,0,0,0-4-4H112.27A8.17,8.17,0,0,1,104,72.53,8,8,0,0,1,112,64h44a4,4,0,0,0,4-4V56a16,16,0,0,0-16-16H32.22a8.23,8.23,0,0,0-5.08,1.64,8,8,0,0,0-2.61,9.22c11.06,28.84,8.76,83.71-.22,114.93A8,8,0,0,0,24,168v32a16,16,0,0,0,16,16H66.11a16,16,0,0,0,7.16-1.69L85.89,208h16.22l12.62,6.31a16,16,0,0,0,7.16,1.69h28.22a16,16,0,0,0,7.16-1.69L169.89,208h16.22l12.62,6.31a16,16,0,0,0,7.16,1.69H232a16,16,0,0,0,16-16V168A56,56,0,0,0,192,112Zm40,88H205.89l-12.62-6.31a16,16,0,0,0-7.16-1.69H169.89a16,16,0,0,0-7.16,1.69L150.11,200H121.89l-12.62-6.31a16,16,0,0,0-7.16-1.69H85.89a16,16,0,0,0-7.16,1.69L66.11,200H40V176H232Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PlusMinusFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM56,96a8,8,0,0,1,8-8H80V72a8,8,0,0,1,16,0V88h16a8,8,0,0,1,0,16H96v16a8,8,0,0,1-16,0V104H64A8,8,0,0,1,56,96Zm24,96a8,8,0,0,1-5.66-13.66l96-96a8,8,0,0,1,11.32,11.32l-96,96A8,8,0,0,1,80,192Zm112-8H144a8,8,0,0,1,0-16h48a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FileJsFill">M213.66,82.34l-56-56A8,8,0,0,0,152,24H56A16,16,0,0,0,40,40v76a4,4,0,0,0,4,4H164a4,4,0,0,1,4,4V228a4,4,0,0,0,4,4h28a16,16,0,0,0,16-16V88A8,8,0,0,0,213.66,82.34ZM152,88V44l44,44Zm-4.19,108.31a20.82,20.82,0,0,1-9.19,15.23C133.43,215,127,216,121.13,216a61.34,61.34,0,0,1-15.19-2,8,8,0,0,1,4.31-15.41c4.38,1.2,15,2.7,19.55-.36.88-.59,1.83-1.52,2.14-3.93.34-2.67-.72-4.1-12.78-7.59-9.35-2.7-25-7.23-23-23.11a20.58,20.58,0,0,1,9-14.95c11.85-8,30.72-3.31,32.84-2.76a8,8,0,0,1-4.07,15.48c-4.49-1.17-15.23-2.56-19.83.56a4.57,4.57,0,0,0-2,3.67c-.11.9-.13,1.09,1.12,1.9,2.31,1.49,6.45,2.68,10.45,3.84C133.49,174.17,150,179,147.81,196.31ZM80,152v37.41c0,14.22-11.18,26.26-25.41,26.58A26,26,0,0,1,28,190.37,8.17,8.17,0,0,1,35.31,182,8,8,0,0,1,44,190.22a8.89,8.89,0,0,0,4,8c7.85,4.82,16-.75,16-8.2V152.27A8.17,8.17,0,0,1,71.47,144,8,8,0,0,1,80,152Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PersonSimpleFill">M95.89,48a32,32,0,1,1,32,32A32,32,0,0,1,95.89,48Zm132.23,73.14C226.4,120.11,185.55,96,128,96S29.6,120.11,27.88,121.14a8,8,0,0,0,8.24,13.72c.36-.22,34.91-20.6,83.88-22.68V149L58,218.69a8,8,0,1,0,12,10.62L128,164l58,65.27a8,8,0,0,0,12-10.62L136,149V112.19c48.77,2.08,83.53,22.46,83.88,22.67a8,8,0,1,0,8.24-13.72Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.UsersFourFill">M230.4,219.19A8,8,0,0,1,224,232H32a8,8,0,0,1-6.4-12.8A67.88,67.88,0,0,1,53,197.51a40,40,0,1,1,53.93,0,67.42,67.42,0,0,1,21,14.29,67.42,67.42,0,0,1,21-14.29,40,40,0,1,1,53.93,0A67.85,67.85,0,0,1,230.4,219.19ZM27.2,126.4a8,8,0,0,0,11.2-1.6,52,52,0,0,1,83.2,0,8,8,0,0,0,12.8,0,52,52,0,0,1,83.2,0,8,8,0,0,0,12.8-9.61A67.85,67.85,0,0,0,203,93.51a40,40,0,1,0-53.93,0,67.42,67.42,0,0,0-21,14.29,67.42,67.42,0,0,0-21-14.29,40,40,0,1,0-53.93,0A67.88,67.88,0,0,0,25.6,115.2,8,8,0,0,0,27.2,126.4Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.GhostFill">M128,24a96.11,96.11,0,0,0-96,96v96a8,8,0,0,0,13.07,6.19l24.26-19.85L93.6,222.19a8,8,0,0,0,10.13,0L128,202.34l24.27,19.85a8,8,0,0,0,10.13,0l24.27-19.85,24.26,19.85A8,8,0,0,0,224,216V120A96.11,96.11,0,0,0,128,24ZM100,128a12,12,0,1,1,12-12A12,12,0,0,1,100,128Zm56,0a12,12,0,1,1,12-12A12,12,0,0,1,156,128Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PlantFill">M205.41,159.07a60.9,60.9,0,0,1-31.83,8.86,71.71,71.71,0,0,1-27.36-5.66A55.55,55.55,0,0,0,136,194.51V224a8,8,0,0,1-8.53,8,8.18,8.18,0,0,1-7.47-8.25V211.31L81.38,172.69A52.5,52.5,0,0,1,63.44,176a45.82,45.82,0,0,1-23.92-6.67C17.73,156.09,6,125.62,8.27,87.79a8,8,0,0,1,7.52-7.52c37.83-2.23,68.3,9.46,81.5,31.25A46,46,0,0,1,103.74,140a4,4,0,0,1-6.89,2.43l-19.2-20.1a8,8,0,0,0-11.31,11.31l53.88,55.25c.06-.78.13-1.56.21-2.33a68.56,68.56,0,0,1,18.64-39.46l50.59-53.46a8,8,0,0,0-11.31-11.32l-49,51.82a4,4,0,0,1-6.78-1.74c-4.74-17.48-2.65-34.88,6.4-49.82,17.86-29.48,59.42-45.26,111.18-42.22a8,8,0,0,1,7.52,7.52C250.67,99.65,234.89,141.21,205.41,159.07Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.NumberCircleSevenFill">M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24Zm31.52,66.73-32,88A8,8,0,0,1,120,184a7.9,7.9,0,0,1-2.73-.48,8,8,0,0,1-4.79-10.25L140.58,96H104a8,8,0,0,1,0-16h48a8,8,0,0,1,7.52,10.73Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.DesktopFill">M208,40H48A24,24,0,0,0,24,64V176a24,24,0,0,0,24,24h72v16H96a8,8,0,0,0,0,16h64a8,8,0,0,0,0-16H136V200h72a24,24,0,0,0,24-24V64A24,24,0,0,0,208,40Zm0,144H48a8,8,0,0,1-8-8V160H216v16A8,8,0,0,1,208,184Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ImagesSquareFill">M208,32H80A16,16,0,0,0,64,48V64H48A16,16,0,0,0,32,80V208a16,16,0,0,0,16,16H176a16,16,0,0,0,16-16V192h16a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM80,48H208v69.38l-16.7-16.7a16,16,0,0,0-22.62,0L93.37,176H80Zm96,160H48V80H64v96a16,16,0,0,0,16,16h96ZM104,88a16,16,0,1,1,16,16A16,16,0,0,1,104,88Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SquareSplitVerticalFill">M216,56v60a4,4,0,0,1-4,4H44a4,4,0,0,1-4-4V56A16,16,0,0,1,56,40H200A16,16,0,0,1,216,56Zm-4,80H44a4,4,0,0,0-4,4v60a16,16,0,0,0,16,16H200a16,16,0,0,0,16-16V140A4,4,0,0,0,212,136Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.DiceOneFill">M192,32H64A32,32,0,0,0,32,64V192a32,32,0,0,0,32,32H192a32,32,0,0,0,32-32V64A32,32,0,0,0,192,32ZM128,140a12,12,0,1,1,12-12A12,12,0,0,1,128,140Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.UserCircleDashedFill">M96.26,37A8,8,0,0,1,102,27.29a104.11,104.11,0,0,1,52,0,8,8,0,0,1-2,15.75,8.15,8.15,0,0,1-2-.26,88,88,0,0,0-44,0A8,8,0,0,1,96.26,37ZM33.35,110a8,8,0,0,0,9.85-5.57,88,88,0,0,1,22-38.09A8,8,0,0,0,53.79,55.14a104.05,104.05,0,0,0-26,45A8,8,0,0,0,33.35,110Zm179.44-5.56a8,8,0,0,0,15.42-4.28,104,104,0,0,0-26-45,8,8,0,1,0-11.41,11.22A88,88,0,0,1,212.79,104.45ZM222.66,146a8,8,0,0,0-9.85,5.58,87.61,87.61,0,0,1-19,34.83A79.75,79.75,0,0,0,172,165.11a4,4,0,0,0-4.83.31,59.81,59.81,0,0,1-78.27,0,4,4,0,0,0-4.84-.31,79.52,79.52,0,0,0-22,21.12,87.7,87.7,0,0,1-18.83-34.67,8,8,0,0,0-15.42,4.28,104.07,104.07,0,0,0,200.46,0A8,8,0,0,0,222.66,146ZM128,164a44,44,0,1,0-44-44A44.05,44.05,0,0,0,128,164Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.RugFill">M200,16a8,8,0,0,0-8,8V40H160V24a8,8,0,0,0-16,0V40H112V24a8,8,0,0,0-16,0V40H64V24a8,8,0,0,0-16,0V232a8,8,0,0,0,16,0V216H96v16a8,8,0,0,0,16,0V216h32v16a8,8,0,0,0,16,0V216h32v16a8,8,0,0,0,16,0V24A8,8,0,0,0,200,16ZM155.43,130.06l-24,40a4,4,0,0,1-6.86,0l-24-40a4,4,0,0,1,0-4.12l24-40a4,4,0,0,1,6.86,0l24,40A4,4,0,0,1,155.43,130.06Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ScissorsFill">M236.52,187.09l-143-97.87a36,36,0,1,0-14.38,17.27l21.39,21.69L79.15,149.54l0,0a35.91,35.91,0,1,0,14.38,17.27l26.91-18.41L170,198.64a32.26,32.26,0,0,0,22.7,9.37,31.52,31.52,0,0,0,4.11-.27l.28,0,36.27-6.11a8,8,0,0,0,3.19-14.5Zm-162.38-97A20,20,0,1,1,80,76,20,20,0,0,1,74.14,90.13Zm0,104A20,20,0,1,1,80,180,20,20,0,0,1,74.14,194.15Zm61-101.5L169.94,57.4a32.19,32.19,0,0,1,26.84-9.14l.28,0,36,6.07a8.21,8.21,0,0,1,6.09,4.42,8,8,0,0,1-2.67,10.12l-69.93,47.85a4,4,0,0,1-4.51,0l-26.31-18A4,4,0,0,1,135.18,92.65Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FolderDashedFill">M96,208a8,8,0,0,1-8,8H39.38A15.4,15.4,0,0,1,24,200.62V192a8,8,0,0,1,16,0v8H88A8,8,0,0,1,96,208Zm64-8H128a8,8,0,0,0,0,16h32a8,8,0,0,0,0-16Zm64-56a8,8,0,0,0-8,8v48H200a8,8,0,0,0,0,16h16.89A15.13,15.13,0,0,0,232,200.89V152A8,8,0,0,0,224,144Zm-8-72H168a8,8,0,0,0,0,16h48v24a8,8,0,0,0,16,0V88A16,16,0,0,0,216,72ZM32,88h96a8,8,0,0,0,5.66-13.66L104,44.69A15.86,15.86,0,0,0,92.69,40H40A16,16,0,0,0,24,56V80A8,8,0,0,0,32,88Zm0,72a8,8,0,0,0,8-8V120a8,8,0,0,0-16,0v32A8,8,0,0,0,32,160Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.MagnifyingGlassFill">M168,112a56,56,0,1,1-56-56A56,56,0,0,1,168,112Zm61.66,117.66a8,8,0,0,1-11.32,0l-50.06-50.07a88,88,0,1,1,11.32-11.31l50.06,50.06A8,8,0,0,1,229.66,229.66ZM112,184a72,72,0,1,0-72-72A72.08,72.08,0,0,0,112,184Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.TrademarkFill">M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24Zm-24,88H96v40a8,8,0,0,1-16,0V112H72a8,8,0,0,1,0-16h32a8,8,0,0,1,0,16Zm88,40a8,8,0,0,1-16,0V125.29l-14,16a8,8,0,0,1-12,0l-14-16V152a8,8,0,0,1-16,0V104a8,8,0,0,1,14-5.27l22,25.12,22-25.12A8,8,0,0,1,192,104Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.GraduationCapFill">M176,207.24a119,119,0,0,0,16-7.73V240a8,8,0,0,1-16,0Zm11.76-88.43-56-29.87a8,8,0,0,0-7.52,14.12L171,128l17-9.06Zm64-29.87-120-64a8,8,0,0,0-7.52,0l-120,64a8,8,0,0,0,0,14.12L32,117.87v48.42a15.91,15.91,0,0,0,4.06,10.65C49.16,191.53,78.51,216,128,216a130,130,0,0,0,48-8.76V130.67L171,128l-43,22.93L43.83,106l0,0L25,96,128,41.07,231,96l-18.78,10-.06,0L188,118.94a8,8,0,0,1,4,6.93v73.64a115.63,115.63,0,0,0,27.94-22.57A15.91,15.91,0,0,0,224,166.29V117.87l27.76-14.81a8,8,0,0,0,0-14.12Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.DeviceRotateFill">M205.66,221.66l-24,24A8,8,0,0,1,168,240V224H80a24,24,0,0,1-24-24V104a8,8,0,0,1,16,0v96a8,8,0,0,0,8,8h88V192a8,8,0,0,1,13.66-5.66l24,24A8,8,0,0,1,205.66,221.66ZM80,72a8,8,0,0,0,8-8V48h88a8,8,0,0,1,8,8v96a8,8,0,0,0,16,0V56a24,24,0,0,0-24-24H88V16a8,8,0,0,0-13.66-5.66l-24,24a8,8,0,0,0,0,11.32l24,24A8,8,0,0,0,80,72Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.KeyReturnFill">M216,40H40A16,16,0,0,0,24,56V200a16,16,0,0,0,16,16H216a16,16,0,0,0,16-16V56A16,16,0,0,0,216,40Zm-32,96a8,8,0,0,1-8,8H99.31l10.35,10.34a8,8,0,0,1-11.32,11.32l-24-24a8,8,0,0,1,0-11.32l24-24a8,8,0,0,1,11.32,11.32L99.31,128H168V104a8,8,0,0,1,16,0Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CalendarMinusFill">M208,32H184V24a8,8,0,0,0-16,0v8H88V24a8,8,0,0,0-16,0v8H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM152,160H104a8,8,0,0,1,0-16h48a8,8,0,0,1,0,16Zm56-80H48V48H72v8a8,8,0,0,0,16,0V48h80v8a8,8,0,0,0,16,0V48h24Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CaretLineDownFill">M42.34,77.66A8,8,0,0,1,48,64H208a8,8,0,0,1,5.66,13.66l-80,80a8,8,0,0,1-11.32,0ZM208,184H48a8,8,0,0,0,0,16H208a8,8,0,0,0,0-16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.GoogleLogoFill">M128,24A104,104,0,1,0,232,128,104,104,0,0,0,128,24Zm0,184A80,80,0,1,1,181.34,68.37a8,8,0,0,1-10.67,11.92A64,64,0,1,0,191.5,136H128a8,8,0,0,1,0-16h72a8,8,0,0,1,8,8A80.09,80.09,0,0,1,128,208Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.NumberCircleSixFill">M148,148a20,20,0,1,1-20-20A20,20,0,0,1,148,148Zm84-20A104,104,0,1,1,128,24,104.11,104.11,0,0,1,232,128Zm-68,20a36,36,0,0,0-36-36c-.61,0-1.22,0-1.82,0L142.87,84.1a8,8,0,0,0-13.74-8.2s-32.4,54.28-32.47,54.42A36,36,0,1,0,164,148Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.HouseFill">M224,120v96a8,8,0,0,1-8,8H160a8,8,0,0,1-8-8V164a4,4,0,0,0-4-4H108a4,4,0,0,0-4,4v52a8,8,0,0,1-8,8H40a8,8,0,0,1-8-8V120a16,16,0,0,1,4.69-11.31l80-80a16,16,0,0,1,22.62,0l80,80A16,16,0,0,1,224,120Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.MapPinSimpleFill">M136,127.42V232a8,8,0,0,1-16,0V127.42a56,56,0,1,1,16,0Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BellSimpleRingingFill">M168,224a8,8,0,0,1-8,8H96a8,8,0,0,1,0-16h64A8,8,0,0,1,168,224ZM227.39,60.32a111.36,111.36,0,0,0-39.12-43.08,8,8,0,1,0-8.54,13.53,94.13,94.13,0,0,1,33.46,36.91,8,8,0,0,0,14.2-7.36ZM35.71,72a8,8,0,0,0,7.1-4.32A94.13,94.13,0,0,1,76.27,30.77a8,8,0,1,0-8.54-13.53A111.36,111.36,0,0,0,28.61,60.32,8,8,0,0,0,35.71,72ZM208,112a80,80,0,0,0-160,0c0,26.28-4.78,48.39-13.81,63.94A16,16,0,0,0,48,200H208a16,16,0,0,0,13.79-24.06C212.78,160.38,208,138.27,208,112Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.UploadFill">M74.34,77.66a8,8,0,0,1,0-11.32l48-48a8,8,0,0,1,11.32,0l48,48a8,8,0,0,1-11.32,11.32L136,43.31V128a8,8,0,0,1-16,0V43.31L85.66,77.66A8,8,0,0,1,74.34,77.66ZM240,136v64a16,16,0,0,1-16,16H32a16,16,0,0,1-16-16V136a16,16,0,0,1,16-16h68a4,4,0,0,1,4,4v3.46c0,13.45,11,24.79,24.46,24.54A24,24,0,0,0,152,128v-4a4,4,0,0,1,4-4h68A16,16,0,0,1,240,136Zm-40,32a12,12,0,1,0-12,12A12,12,0,0,0,200,168Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.AlignLeftFill">M232,152v40a16,16,0,0,1-16,16H80a16,16,0,0,1-16-16V152a16,16,0,0,1,16-16H216A16,16,0,0,1,232,152ZM40,32a8,8,0,0,0-8,8V216a8,8,0,0,0,16,0V40A8,8,0,0,0,40,32Zm40,88h96a16,16,0,0,0,16-16V64a16,16,0,0,0-16-16H80A16,16,0,0,0,64,64v40A16,16,0,0,0,80,120Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PersonSimpleTaiChiFill">M96,48a32,32,0,1,1,32,32A32,32,0,0,1,96,48ZM216,96H40a8,8,0,0,0,0,16h80v28.44L42.65,210.05A8,8,0,0,0,53.35,222l76.2-68.58L176,173.28V216a8,8,0,0,0,16,0V168a8,8,0,0,0-4.85-7.35L136,138.72V112h80a8,8,0,0,0,0-16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.NoteFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H156.69A15.92,15.92,0,0,0,168,219.31L219.31,168A15.92,15.92,0,0,0,224,156.69V48A16,16,0,0,0,208,32ZM96,88h64a8,8,0,0,1,0,16H96a8,8,0,0,1,0-16Zm32,80H96a8,8,0,0,1,0-16h32a8,8,0,0,1,0,16ZM96,136a8,8,0,0,1,0-16h64a8,8,0,0,1,0,16Zm64,68.69V160h44.7Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PinterestLogoFill">M240,128.7c-.38,56.49-46.46,102.73-102.94,103.29a104.16,104.16,0,0,1-25.94-3,4,4,0,0,1-2.91-4.86l8.64-34.55A60.57,60.57,0,0,0,144,196c37,0,66.7-33.45,63.81-73.36A72,72,0,1,0,69.24,155,8,8,0,0,0,80,159.29a8.19,8.19,0,0,0,4-10.49,56,56,0,1,1,107.86-24.93C194,154.4,171.73,180,144,180a44.87,44.87,0,0,1-23.14-6.44l14.9-59.62a8,8,0,0,0-15.52-3.88L93.38,217.51a4,4,0,0,1-5.71,2.59A104,104,0,0,1,32,126.88C32.6,70.52,78.67,24.52,135,24A104,104,0,0,1,240,128.7Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.TrafficConeFill">M232,208H213.69L153.42,34.75A16,16,0,0,0,138.31,24H117.69a16,16,0,0,0-15.11,10.74L42.31,208H24a8,8,0,0,0,0,16H232a8,8,0,0,0,0-16ZM95.43,104h65.14l16.7,48H78.73Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BarbellFill">M200,64V192a16,16,0,0,1-16,16H168a16,16,0,0,1-16-16V136H104v56a16,16,0,0,1-16,16H72a16,16,0,0,1-16-16V64A16,16,0,0,1,72,48H88a16,16,0,0,1,16,16v56h48V64a16,16,0,0,1,16-16h16A16,16,0,0,1,200,64ZM36,72H32A16,16,0,0,0,16,88v32H8.27A8.18,8.18,0,0,0,0,127.47,8,8,0,0,0,8,136h8v32a16,16,0,0,0,16,16h4a4,4,0,0,0,4-4V76A4,4,0,0,0,36,72Zm220,55.47a8.18,8.18,0,0,0-8.25-7.47H240V88a16,16,0,0,0-16-16h-4a4,4,0,0,0-4,4V180a4,4,0,0,0,4,4h4a16,16,0,0,0,16-16V136h8A8,8,0,0,0,256,127.47Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.InvoiceFill">M28,128a8,8,0,0,1,0-16H56a8,8,0,0,0,0-16H40a24,24,0,0,1,0-48,8,8,0,0,1,16,0h8a8,8,0,0,1,0,16H40a8,8,0,0,0,0,16H56a24,24,0,0,1,0,48,8,8,0,0,1-16,0ZM224,48H96a8,8,0,0,0,0,16H216V96H104a8,8,0,0,0,0,16h56v32H80a8,8,0,0,0,0,16h80v32H40V152a8,8,0,0,0-16,0v40a16,16,0,0,0,16,16H216a16,16,0,0,0,16-16V56A8,8,0,0,0,224,48Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArticleFill">M216,40H40A16,16,0,0,0,24,56V200a16,16,0,0,0,16,16H216a16,16,0,0,0,16-16V56A16,16,0,0,0,216,40ZM176,168H80a8,8,0,0,1,0-16h96a8,8,0,0,1,0,16Zm0-32H80a8,8,0,0,1,0-16h96a8,8,0,0,1,0,16Zm0-32H80a8,8,0,0,1,0-16h96a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowSquareDownLeftFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32Zm-42.34,69.66L115.31,152H144a8,8,0,0,1,0,16H96a8,8,0,0,1-8-8V112a8,8,0,0,1,16,0v28.69l50.34-50.35a8,8,0,0,1,11.32,11.32Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.WhatsappLogoFill">M152.58,145.23l23,11.48A24,24,0,0,1,152,176a72.08,72.08,0,0,1-72-72A24,24,0,0,1,99.29,80.46l11.48,23L101,118a8,8,0,0,0-.73,7.51,56.47,56.47,0,0,0,30.15,30.15A8,8,0,0,0,138,155ZM232,128A104,104,0,0,1,79.12,219.82L45.07,231.17a16,16,0,0,1-20.24-20.24l11.35-34.05A104,104,0,1,1,232,128Zm-40,24a8,8,0,0,0-4.42-7.16l-32-16a8,8,0,0,0-8,.5l-14.69,9.8a40.55,40.55,0,0,1-16-16l9.8-14.69a8,8,0,0,0,.5-8l-16-32A8,8,0,0,0,104,64a40,40,0,0,0-40,40,88.1,88.1,0,0,0,88,88A40,40,0,0,0,192,152Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.TextHOneFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM144,160a8,8,0,0,1-16,0V128H72v32a8,8,0,0,1-16,0V80a8,8,0,0,1,16,0v32h56V80a8,8,0,0,1,16,0Zm56,16a8,8,0,0,1-16,0V111l-11.56,7.71a8,8,0,1,1-8.88-13.32l24-16A8,8,0,0,1,200,96Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.IntersectSquareFill">M216,88H168V40a8,8,0,0,0-8-8H40a8,8,0,0,0-8,8V160a8,8,0,0,0,8,8H88v48a8,8,0,0,0,8,8H216a8,8,0,0,0,8-8V96A8,8,0,0,0,216,88ZM48,152V48H152V88H96a8,8,0,0,0-8,8v56Zm160,56H104V168h56a8,8,0,0,0,8-8V104h40Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.AirplaneInFlightFill">M224,216a8,8,0,0,1-8,8H72a8,8,0,1,1,0-16H216A8,8,0,0,1,224,216ZM208,96H147.32L101.66,50.34A8,8,0,0,0,96,48H88A16,16,0,0,0,72.83,69.06l9,26.94H59.32L37.66,74.34A8,8,0,0,0,32,72H24A16,16,0,0,0,8.69,92.6l14.07,46.89A39.75,39.75,0,0,0,61.07,168H240a8,8,0,0,0,8-8V136A40,40,0,0,0,208,96Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BluetoothFill">M200,176a8,8,0,0,1-3.2,6.4l-64,48A8,8,0,0,1,128,232a8,8,0,0,1-8-8V144L68.8,182.4a8,8,0,0,1-9.6-12.8L114.67,128,59.2,86.4a8,8,0,0,1,9.6-12.8L120,112V32a8,8,0,0,1,12.8-6.4l64,48a8,8,0,0,1,0,12.8L141.33,128l55.47,41.6A8,8,0,0,1,200,176Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SignInFill">M141.66,133.66l-40,40A8,8,0,0,1,88,168V136H24a8,8,0,0,1,0-16H88V88a8,8,0,0,1,13.66-5.66l40,40A8,8,0,0,1,141.66,133.66ZM200,32H136a8,8,0,0,0,0,16h56V208H136a8,8,0,0,0,0,16h64a8,8,0,0,0,8-8V40A8,8,0,0,0,200,32Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.MosqueFill">M224,128a23.84,23.84,0,0,0-8,1.38V128c0-41.78-31.07-62.46-53.76-77.56C148.16,41.06,136,33,136,24a8,8,0,0,0-16,0c0,9-12.16,17.06-26.24,26.44C71.07,65.54,40,86.22,40,128v1.38A24,24,0,0,0,8,152v56a8,8,0,0,0,8,8H72a8,8,0,0,0,8-8V176a16,16,0,0,1,32,0v32a8,8,0,0,0,8,8h16a8,8,0,0,0,8-8V176a16,16,0,0,1,32,0v32a8,8,0,0,0,8,8h56a8,8,0,0,0,8-8V152A24,24,0,0,0,224,128ZM40,200H24V152a8,8,0,0,1,16,0Zm192,0H216V152a8,8,0,0,1,16,0Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CraneFill">M228.12,17.14a8,8,0,0,0-7.88-.2L102,80H32A16,16,0,0,0,16,96V200a16,16,0,0,0,16,16h88a16,16,0,0,0,16-16V168a7.31,7.31,0,0,0-.08-1.05l0-.24a9.6,9.6,0,0,0-.22-1,.09.09,0,0,0,0-.05v0a.64.64,0,0,1,0-.07L113.54,92,216,37.33V160H200v-8a8,8,0,0,0-16,0v8a16,16,0,0,0,16,16h16a16,16,0,0,0,16-16V24A8,8,0,0,0,228.12,17.14ZM48,96v64H32V96ZM32,200h0V176h88v24Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CardholderFill">M208,48H48A24,24,0,0,0,24,72V184a24,24,0,0,0,24,24H208a24,24,0,0,0,24-24V72A24,24,0,0,0,208,48Zm-56,72a24,24,0,0,1-48,0,8,8,0,0,0-8-8H40V96H216v16H160A8,8,0,0,0,152,120ZM48,64H208a8,8,0,0,1,8,8v8H40V72A8,8,0,0,1,48,64Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BowlSteamFill">M81.77,55c5.35-6.66,6.67-11.16,6.12-13.14-.42-1.49-2.41-2.26-2.43-2.26A8,8,0,0,1,88,24a8.11,8.11,0,0,1,2.38.36c1,.31,9.91,3.33,12.79,12.76,2.46,8.07-.55,17.45-8.94,27.89-5.35,6.66-6.67,11.16-6.12,13.14.42,1.49,2.37,2.24,2.39,2.25A8,8,0,0,1,88,96a8.11,8.11,0,0,1-2.38-.36c-1-.31-9.91-3.33-12.79-12.76C70.37,74.81,73.38,65.43,81.77,55Zm31.06,27.89c2.88,9.43,11.79,12.45,12.79,12.76A8.11,8.11,0,0,0,128,96a8,8,0,0,0,2.5-15.6s-2-.76-2.39-2.25c-.55-2,.77-6.48,6.12-13.14,8.39-10.44,11.4-19.82,8.94-27.89-2.88-9.43-11.78-12.45-12.79-12.76A8.11,8.11,0,0,0,128,24a8,8,0,0,0-2.54,15.59s2,.77,2.43,2.26c.55,2-.77,6.48-6.12,13.14C113.38,65.43,110.37,74.81,112.83,82.88Zm40,0c2.88,9.43,11.79,12.45,12.79,12.76A8.11,8.11,0,0,0,168,96a8,8,0,0,0,2.5-15.6s-2-.76-2.39-2.25c-.55-2,.77-6.48,6.12-13.14,8.39-10.44,11.4-19.82,8.94-27.89-2.88-9.43-11.78-12.45-12.79-12.76A8.11,8.11,0,0,0,168,24a8,8,0,0,0-2.54,15.59s2,.77,2.43,2.26c.55,2-.77,6.48-6.12,13.14C153.38,65.43,150.37,74.81,152.83,82.88ZM224,112H32a8,8,0,0,0-8,8,104.35,104.35,0,0,0,56,92.28V216a16,16,0,0,0,16,16h64a16,16,0,0,0,16-16v-3.72A104.35,104.35,0,0,0,232,120,8,8,0,0,0,224,112Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.MonitorArrowUpFill">M168,224a8,8,0,0,1-8,8H96a8,8,0,0,1,0-16h64A8,8,0,0,1,168,224ZM232,64V176a24,24,0,0,1-24,24H48a24,24,0,0,1-24-24V64A24,24,0,0,1,48,40H208A24,24,0,0,1,232,64Zm-74.34,42.34-24-24a8,8,0,0,0-11.32,0l-24,24a8,8,0,0,0,11.32,11.32L120,107.31V152a8,8,0,0,0,16,0V107.31l10.34,10.35a8,8,0,0,0,11.32-11.32Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PowerFill">M128,24A104,104,0,1,0,232,128,104,104,0,0,0,128,24Zm-8,40a8,8,0,0,1,16,0v64a8,8,0,0,1-16,0Zm8,144A80,80,0,0,1,83.55,61.48a8,8,0,1,1,8.9,13.29,64,64,0,1,0,71.1,0,8,8,0,1,1,8.9-13.29A80,80,0,0,1,128,208Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.AlignCenterVerticalSimpleFill">M216,128a8,8,0,0,1-8,8H176v72a16,16,0,0,1-16,16H96a16,16,0,0,1-16-16V136H48a8,8,0,0,1,0-16H80V48A16,16,0,0,1,96,32h64a16,16,0,0,1,16,16v72h32A8,8,0,0,1,216,128Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.MinusSquareFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM168,136H88a8,8,0,0,1,0-16h80a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.GpsFill">M248,128a8,8,0,0,1-8,8H215.63A88.13,88.13,0,0,1,136,215.63V240a8,8,0,0,1-16,0V215.63A88.13,88.13,0,0,1,40.37,136H16a8,8,0,0,1,0-16H40.37A88.13,88.13,0,0,1,120,40.37V16a8,8,0,0,1,16,0V40.37A88.13,88.13,0,0,1,215.63,120H240A8,8,0,0,1,248,128Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.TagChevronFill">M246.66,132.44,201,200.88A16,16,0,0,1,187.72,208H32a8,8,0,0,1-6.66-12.44L70.39,128l-45-67.56A8,8,0,0,1,32,48H187.72A16,16,0,0,1,201,55.12l45.63,68.44A8,8,0,0,1,246.66,132.44Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.DropSlashFill">M213.92,210.62a8,8,0,1,1-11.84,10.76l-12.9-14.19A87.71,87.71,0,0,1,128,232c-48,0-87.49-38.93-88-86.88-.27-24.34,8.22-49.84,24.73-74.81L42.3,45.63a8.23,8.23,0,0,1,.14-11.38,8,8,0,0,1,11.48.37Zm-10.07-34.86a4,4,0,0,0,6.7-1.27A87.66,87.66,0,0,0,216,144c0-31.4-14.51-64.68-42-96.25a254.19,254.19,0,0,0-41.45-38.3,8,8,0,0,0-9.18,0A251.26,251.26,0,0,0,87.17,42a4,4,0,0,0,0,5.41Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.TrashFill">M216,48H176V40a24,24,0,0,0-24-24H104A24,24,0,0,0,80,40v8H40a8,8,0,0,0,0,16h8V208a16,16,0,0,0,16,16H192a16,16,0,0,0,16-16V64h8a8,8,0,0,0,0-16ZM112,168a8,8,0,0,1-16,0V104a8,8,0,0,1,16,0Zm48,0a8,8,0,0,1-16,0V104a8,8,0,0,1,16,0Zm0-120H96V40a8,8,0,0,1,8-8h48a8,8,0,0,1,8,8Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FireTruckFill">M255.43,117l-14-35A15.93,15.93,0,0,0,226.58,72H192V64a8,8,0,0,0-16,0v64H24a8,8,0,0,0-8,8v48a16,16,0,0,0,16,16H49a32,32,0,0,0,62,0h50a32,32,0,0,0,62,0h17a16,16,0,0,0,16-16V120A7.92,7.92,0,0,0,255.43,117ZM80,208a16,16,0,1,1,16-16A16,16,0,0,1,80,208Zm112,0a16,16,0,1,1,16-16A16,16,0,0,1,192,208Zm0-96V88h34.58l9.6,24ZM24,96a8,8,0,0,0,0,16H152a8,8,0,0,0,0-16H136V72h16a8,8,0,0,0,0-16H24a8,8,0,0,0,0,16H40V96ZM96,72h24V96H96ZM56,72H80V96H56Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PottedPlantFill">M200,144h-76.7l22.41-22.41a59.55,59.55,0,0,0,26.1,6.36,49.56,49.56,0,0,0,25.89-7.22c23.72-14.36,36.43-47.6,34-88.92a8,8,0,0,0-7.52-7.52c-41.32-2.43-74.56,10.28-88.93,34-9.35,15.45-9.59,34.11-.86,52L120,124.68l-12.21-12.21c6-13.25,5.57-27-1.39-38.48C95.53,56,70.61,46.41,39.73,48.22a8,8,0,0,0-7.51,7.51C30.4,86.6,40,111.52,58,122.4A38.22,38.22,0,0,0,78,128a45,45,0,0,0,18.52-4.19L108.69,136l-8,8H56a8,8,0,0,0,0,16h9.59L78.8,219.47A15.89,15.89,0,0,0,94.42,232h67.17a15.91,15.91,0,0,0,15.62-12.53L190.42,160H200a8,8,0,0,0,0-16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowUpRightFill">M200,64V168a8,8,0,0,1-13.66,5.66L140,127.31,69.66,197.66a8,8,0,0,1-11.32-11.32L128.69,116,82.34,69.66A8,8,0,0,1,88,56H192A8,8,0,0,1,200,64Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.WallFill">M136,92h92a4,4,0,0,0,4-4V56a8,8,0,0,0-8-8H140a4,4,0,0,0-4,4Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.WallFill2">M184,152h44a4,4,0,0,0,4-4V112a4,4,0,0,0-4-4H184Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.WallFill3">M72,108H28a4,4,0,0,0-4,4v36a4,4,0,0,0,4,4H72Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.WallFill4">M136,168v36a4,4,0,0,0,4,4h84a8,8,0,0,0,8-8V172a4,4,0,0,0-4-4Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.WallFill5">M120,92V52a4,4,0,0,0-4-4H32a8,8,0,0,0-8,8V88a4,4,0,0,0,4,4Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.WallFill6">M120,168H28a4,4,0,0,0-4,4v28a8,8,0,0,0,8,8h84a4,4,0,0,0,4-4Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CloudSlashFill">M248,128.72A87.74,87.74,0,0,1,222.41,190a4,4,0,0,1-5.77-.16L103.78,65.67a4,4,0,0,1,.39-5.76A87.82,87.82,0,0,1,160.87,40C209.15,40.47,248.38,80.43,248,128.72ZM53.92,34.62A8,8,0,1,0,42.08,45.38L81.33,88.56l-.06.11A64,64,0,0,0,8,153c.53,35.12,29.84,63,65,63h87a87.65,87.65,0,0,0,31.78-5.95l10.3,11.33a8,8,0,0,0,11.33.52,8.32,8.32,0,0,0,.29-11.52Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.TornadoFill">M144,228a12,12,0,0,1-12,12H116a12,12,0,0,1,0-24h16A12,12,0,0,1,144,228ZM220,32H60a12,12,0,0,0,0,24,12,12,0,0,1,0,24H44a12,12,0,0,0,0,24H76a12,12,0,0,1,0,24,12,12,0,0,0,0,24h48a12,12,0,0,1,0,24,12,12,0,0,0,0,24h48a12,12,0,0,0,0-24,12,12,0,0,1,0-24h16a12,12,0,0,0,0-24H164a12,12,0,0,1,0-24,12,12,0,0,0,0-24,12,12,0,0,1,0-24h56a12,12,0,0,0,0-24Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PhoneIncomingFill">M223.88,183.08A56.26,56.26,0,0,1,168,232C88.6,232,24,167.4,24,88A56.26,56.26,0,0,1,72.92,32.12a16,16,0,0,1,16.62,9.52l21.12,47.15,0,.12A16,16,0,0,1,109.39,104c-.18.27-.37.52-.57.77L88,129.45c7.49,15.22,23.41,31,38.83,38.51l24.34-20.71a8.12,8.12,0,0,1,.75-.56,16,16,0,0,1,15.17-1.4l.13.06,47.11,21.11A16,16,0,0,1,223.88,183.08ZM152,112h40a8,8,0,0,0,0-16H171.32l34.34-34.34a8,8,0,0,0-11.32-11.32L160,84.69V64a8,8,0,0,0-16,0v40A8,8,0,0,0,152,112Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.MusicNoteSimpleFill">M210.3,56.34l-80-24A8,8,0,0,0,120,40V148.26A48,48,0,1,0,136,184V50.75l69.7,20.91a8,8,0,1,0,4.6-15.32Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.NutFill">M223.68,66.15,135.68,18a15.88,15.88,0,0,0-15.36,0l-88,48.17a16,16,0,0,0-8.32,14v95.64a16,16,0,0,0,8.32,14l88,48.17a15.88,15.88,0,0,0,15.36,0l88-48.17a16,16,0,0,0,8.32-14V80.18A16,16,0,0,0,223.68,66.15ZM128,168a40,40,0,1,1,40-40A40,40,0,0,1,128,168Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FunnelSimpleFill">M216,40H40A16,16,0,0,0,24,56V200a16,16,0,0,0,16,16H216a16,16,0,0,0,16-16V56A16,16,0,0,0,216,40ZM144,176H112a8,8,0,0,1,0-16h32a8,8,0,0,1,0,16Zm32-40H80a8,8,0,0,1,0-16h96a8,8,0,0,1,0,16Zm32-40H48a8,8,0,0,1,0-16H208a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SealQuestionFill">M225.86,102.82c-3.77-3.94-7.67-8-9.14-11.57-1.36-3.27-1.44-8.69-1.52-13.94-.15-9.76-.31-20.82-8-28.51s-18.75-7.85-28.51-8c-5.25-.08-10.67-.16-13.94-1.52-3.56-1.47-7.63-5.37-11.57-9.14C146.28,23.51,138.44,16,128,16s-18.27,7.51-25.18,14.14c-3.94,3.77-8,7.67-11.57,9.14C88,40.64,82.56,40.72,77.31,40.8c-9.76.15-20.82.31-28.51,8S41,67.55,40.8,77.31c-.08,5.25-.16,10.67-1.52,13.94-1.47,3.56-5.37,7.63-9.14,11.57C23.51,109.72,16,117.56,16,128s7.51,18.27,14.14,25.18c3.77,3.94,7.67,8,9.14,11.57,1.36,3.27,1.44,8.69,1.52,13.94.15,9.76.31,20.82,8,28.51s18.75,7.85,28.51,8c5.25.08,10.67.16,13.94,1.52,3.56,1.47,7.63,5.37,11.57,9.14C109.72,232.49,117.56,240,128,240s18.27-7.51,25.18-14.14c3.94-3.77,8-7.67,11.57-9.14,3.27-1.36,8.69-1.44,13.94-1.52,9.76-.15,20.82-.31,28.51-8s7.85-18.75,8-28.51c.08-5.25.16-10.67,1.52-13.94,1.47-3.56,5.37-7.63,9.14-11.57C232.49,146.28,240,138.44,240,128S232.49,109.73,225.86,102.82ZM128,192a12,12,0,1,1,12-12A12,12,0,0,1,128,192Zm8-48.72V144a8,8,0,0,1-16,0v-8a8,8,0,0,1,8-8c13.23,0,24-9,24-20s-10.77-20-24-20-24,9-24,20v4a8,8,0,0,1-16,0v-4c0-19.85,17.94-36,40-36s40,16.15,40,36C168,125.38,154.24,139.93,136,143.28Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.GearSixFill">M237.94,107.21a8,8,0,0,0-3.89-5.4l-29.83-17-.12-33.62a8,8,0,0,0-2.83-6.08,111.91,111.91,0,0,0-36.72-20.67,8,8,0,0,0-6.46.59L128,41.85,97.88,25a8,8,0,0,0-6.47-.6A111.92,111.92,0,0,0,54.73,45.15a8,8,0,0,0-2.83,6.07l-.15,33.65-29.83,17a8,8,0,0,0-3.89,5.4,106.47,106.47,0,0,0,0,41.56,8,8,0,0,0,3.89,5.4l29.83,17,.12,33.63a8,8,0,0,0,2.83,6.08,111.91,111.91,0,0,0,36.72,20.67,8,8,0,0,0,6.46-.59L128,214.15,158.12,231a7.91,7.91,0,0,0,3.9,1,8.09,8.09,0,0,0,2.57-.42,112.1,112.1,0,0,0,36.68-20.73,8,8,0,0,0,2.83-6.07l.15-33.65,29.83-17a8,8,0,0,0,3.89-5.4A106.47,106.47,0,0,0,237.94,107.21ZM128,168a40,40,0,1,1,40-40A40,40,0,0,1,128,168Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.LightbulbFill">M176,232a8,8,0,0,1-8,8H88a8,8,0,0,1,0-16h80A8,8,0,0,1,176,232Zm40-128a87.55,87.55,0,0,1-33.64,69.21A16.24,16.24,0,0,0,176,186v6a16,16,0,0,1-16,16H96a16,16,0,0,1-16-16v-6a16,16,0,0,0-6.23-12.66A87.59,87.59,0,0,1,40,104.49C39.74,56.83,78.26,17.14,125.88,16A88,88,0,0,1,216,104Zm-32.11-9.34a57.6,57.6,0,0,0-46.56-46.55,8,8,0,0,0-2.66,15.78c16.57,2.79,30.63,16.85,33.44,33.45A8,8,0,0,0,176,104a9,9,0,0,0,1.35-.11A8,8,0,0,0,183.89,94.66Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.NotePencilFill">M224,128v80a16,16,0,0,1-16,16H48a16,16,0,0,1-16-16V48A16,16,0,0,1,48,32h80a8,8,0,0,1,0,16H48V208H208V128a8,8,0,0,1,16,0Zm5.66-58.34-96,96A8,8,0,0,1,128,168H96a8,8,0,0,1-8-8V128a8,8,0,0,1,2.34-5.66l96-96a8,8,0,0,1,11.32,0l32,32A8,8,0,0,1,229.66,69.66Zm-17-5.66L192,43.31,179.31,56,200,76.69Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.TeaBagFill">M112,136V72h19.47a16.09,16.09,0,0,1,13.72,7.77L165.72,114a16.06,16.06,0,0,1,2.28,8.24V216a16,16,0,0,1-16,16H56a16,16,0,0,1-16-16V122.22A16.06,16.06,0,0,1,42.28,114L62.81,79.77A16.09,16.09,0,0,1,76.53,72H96v64a8,8,0,0,0,16,0Zm112,24a16,16,0,0,1-16-16V64A56,56,0,0,0,96,64v8h16V64a40,40,0,0,1,80,0v80a32,32,0,0,0,32,32,8,8,0,0,0,0-16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CaretUpDownFill">M183.39,172.94a8,8,0,0,1-1.73,8.72l-48,48a8,8,0,0,1-11.32,0l-48-48A8,8,0,0,1,80,168h96A8,8,0,0,1,183.39,172.94ZM80,88h96a8,8,0,0,0,5.66-13.66l-48-48a8,8,0,0,0-11.32,0l-48,48A8,8,0,0,0,80,88Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FileJsxFill">M213.66,82.34l-56-56A8,8,0,0,0,152,24H56A16,16,0,0,0,40,40v76a4,4,0,0,0,4,4H212a4,4,0,0,0,4-4V88A8,8,0,0,0,213.66,82.34ZM152,88V44l44,44Zm-4.19,108.31a20.82,20.82,0,0,1-9.19,15.23C133.43,215,127,216,121.13,216a60.63,60.63,0,0,1-15.19-2,8,8,0,0,1,4.31-15.41c4.38,1.21,15,2.71,19.55-.35.88-.6,1.83-1.52,2.14-3.93.34-2.67-.72-4.1-12.78-7.59-9.35-2.7-25-7.23-23-23.12a20.58,20.58,0,0,1,9-14.94c11.85-8,30.72-3.31,32.84-2.76a8,8,0,0,1-4.07,15.48c-4.49-1.17-15.23-2.56-19.83.56a4.57,4.57,0,0,0-2,3.67c-.11.9-.13,1.08,1.12,1.9,2.31,1.49,6.45,2.68,10.45,3.84C133.49,174.17,150,179,147.81,196.31ZM80,152v37.4c0,14.23-11.18,26.27-25.41,26.59A26,26,0,0,1,28,190.37,8.17,8.17,0,0,1,35.31,182,8,8,0,0,1,44,190.22a8.89,8.89,0,0,0,4,8c7.85,4.82,16-.76,16-8.2V152.27A8.17,8.17,0,0,1,71.47,144,8,8,0,0,1,80,152Zm134.51,4.65L197.83,180l16.68,23.35a8,8,0,0,1-13,9.3L188,193.76l-13.49,18.89a8,8,0,1,1-13-9.3L178.17,180l-16.68-23.35a8,8,0,0,1,13-9.3L188,166.24l13.49-18.89a8,8,0,0,1,13,9.3Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FileCFill">M48,180c0,11,7.18,20,16,20a14.07,14.07,0,0,0,10.07-4.51,8.19,8.19,0,0,1,10.88-.9,8,8,0,0,1,.83,11.81A30.06,30.06,0,0,1,64,216c-17.65,0-32-16.15-32-36s14.35-36,32-36a30,30,0,0,1,21.39,9.19,8.26,8.26,0,0,1,.73,11.09,8,8,0,0,1-11.9.38A14.24,14.24,0,0,0,64,160C55.18,160,48,169,48,180ZM216,88V216a16,16,0,0,1-16,16H116a4,4,0,0,1-4-4V124a4,4,0,0,0-4-4H44a4,4,0,0,1-4-4V40A16,16,0,0,1,56,24h96a8,8,0,0,1,5.66,2.34l56,56A8,8,0,0,1,216,88Zm-20,0L152,44V88Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CaretDoubleDownFill">M208,128H147.31l66.35-66.34A8,8,0,0,0,208,48H48a8,8,0,0,0-5.66,13.66L108.69,128H48a8,8,0,0,0-5.66,13.66l80,80a8,8,0,0,0,11.32,0l80-80A8,8,0,0,0,208,128Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ColumnsPlusRightFill">M96,48V208a16,16,0,0,1-16,16H56a16,16,0,0,1-16-16V48A16,16,0,0,1,56,32H80A16,16,0,0,1,96,48Zm56-16H128a16,16,0,0,0-16,16V208a16,16,0,0,0,16,16h24a16,16,0,0,0,16-16V48A16,16,0,0,0,152,32Zm88,88H224V104a8,8,0,0,0-16,0v16H192a8,8,0,0,0,0,16h16v16a8,8,0,0,0,16,0V136h16a8,8,0,0,0,0-16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowsDownUpFill">M119.39,172.94a8,8,0,0,1-1.73,8.72l-32,32a8,8,0,0,1-11.32,0l-32-32A8,8,0,0,1,48,168H72V48a8,8,0,0,1,16,0V168h24A8,8,0,0,1,119.39,172.94Zm94.27-98.6-32-32a8,8,0,0,0-11.32,0l-32,32A8,8,0,0,0,144,88h24V208a8,8,0,0,0,16,0V88h24a8,8,0,0,0,5.66-13.66Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ChartBarHorizontalFill">M232,112v32a8,8,0,0,1-8,8H56v16h88a8,8,0,0,1,8,8v24a8,8,0,0,1-8,8H56v8a8,8,0,0,1-16,0V40a8,8,0,0,1,16,0v8H176a8,8,0,0,1,8,8V80a8,8,0,0,1-8,8H56v16H224A8,8,0,0,1,232,112Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ShuffleFill">M237.66,178.34a8,8,0,0,1,0,11.32l-24,24A8,8,0,0,1,200,208V192a72.15,72.15,0,0,1-57.65-30.14l-41.72-58.4A56.1,56.1,0,0,0,55.06,80H32a8,8,0,0,1,0-16H55.06a72.12,72.12,0,0,1,58.59,30.15l41.72,58.4A56.08,56.08,0,0,0,200,176V160a8,8,0,0,1,13.66-5.66ZM143,107a8,8,0,0,0,11.16-1.86l1.2-1.67A56.08,56.08,0,0,1,200,80V96a8,8,0,0,0,13.66,5.66l24-24a8,8,0,0,0,0-11.32l-24-24A8,8,0,0,0,200,48V64a72.15,72.15,0,0,0-57.65,30.14l-1.2,1.67A8,8,0,0,0,143,107Zm-30,42a8,8,0,0,0-11.16,1.86l-1.2,1.67A56.1,56.1,0,0,1,55.06,176H32a8,8,0,0,0,0,16H55.06a72.12,72.12,0,0,0,58.59-30.15l1.2-1.67A8,8,0,0,0,113,149Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.MedalFill">M216,96A88,88,0,1,0,72,163.83V240a8,8,0,0,0,11.58,7.16L128,225l44.43,22.21A8.07,8.07,0,0,0,176,248a8,8,0,0,0,8-8V163.83A87.85,87.85,0,0,0,216,96ZM56,96a72,72,0,1,1,72,72A72.08,72.08,0,0,1,56,96Zm16,0a56,56,0,1,1,56,56A56.06,56.06,0,0,1,72,96Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CurrencyKrwFill">M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24Zm72,120H181.42l-14,35a8,8,0,0,1-14.86,0L128,117.54,103.43,179a8,8,0,0,1-14.86,0l-14-35H56a8,8,0,0,1,0-16H68.18L56.57,99A8,8,0,1,1,71.43,93L96,154.46,120.57,93a8,8,0,0,1,14.86,0L160,154.46,184.57,93A8,8,0,1,1,199.43,99l-11.61,29H200a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CowboyHatFill">M216,120a8,8,0,0,0-6.78,3.76A179.9,179.9,0,0,1,195.41,143l-1.63-8.57v0L178.32,53.07a16,16,0,0,0-25.72-9.55l-.13.1L128,64,103.53,43.62l-.13-.1a16,16,0,0,0-25.72,9.53L62.23,134.38v0L60.59,143a179.27,179.27,0,0,1-13.81-19.25A8,8,0,0,0,40,120a40,40,0,0,0,0,80H216a40,40,0,0,0,0-80ZM76.68,144H179.31l2.54,13.35a113.28,113.28,0,0,1-27.35,19C139.1,183.77,128.06,184,128,184c-.33,0-25.49-.4-53.86-26.6Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.GpsSlashFill">M240,136H215.63a87.21,87.21,0,0,1-10.13,33.61,4,4,0,0,1-6.5.81L92.51,53.28a4,4,0,0,1,1.4-6.38A87,87,0,0,1,120,40.37V16a8,8,0,0,1,8.53-8A8.17,8.17,0,0,1,136,16.27v24.1A88.13,88.13,0,0,1,215.63,120h24.1a8.17,8.17,0,0,1,8.25,7.47A8,8,0,0,1,240,136ZM53.92,34.62A8,8,0,1,0,42.08,45.38l21.09,23.2A87.63,87.63,0,0,0,40.37,120H16a8,8,0,0,0,0,16H40.37A88.13,88.13,0,0,0,120,215.63V240a8,8,0,0,0,16,0V215.63a87.51,87.51,0,0,0,45-17.43l21.08,23.18a8,8,0,1,0,11.84-10.76Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowSquareInFill">M128,136v64a8,8,0,0,1-13.66,5.66L88,179.31,45.66,221.66a8,8,0,0,1-11.32-11.32L76.69,168,50.34,141.66A8,8,0,0,1,56,128h64A8,8,0,0,1,128,136ZM208,32H80A16,16,0,0,0,64,48V96a8,8,0,0,0,16,0V48H208V176H160a8,8,0,0,0,0,16h48a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BombFill">M248,32h0a8,8,0,0,0-8,8,52.66,52.66,0,0,1-3.57,17.39C232.38,67.22,225.7,72,216,72c-11.06,0-18.85-9.76-29.49-24.65C176,32.66,164.12,16,144,16c-16.39,0-29,8.89-35.43,25a66.07,66.07,0,0,0-3.9,15H88A16,16,0,0,0,72,72v9.59A88,88,0,0,0,112,248h1.59A88,88,0,0,0,152,81.59V72a16,16,0,0,0-16-16H120.88a46.76,46.76,0,0,1,2.69-9.37C127.62,36.78,134.3,32,144,32c11.06,0,18.85,9.76,29.49,24.65C184,71.34,195.88,88,216,88c16.39,0,29-8.89,35.43-25A68.69,68.69,0,0,0,256,40,8,8,0,0,0,248,32ZM111.89,209.32A8,8,0,0,1,104,216a8.52,8.52,0,0,1-1.33-.11,57.5,57.5,0,0,1-46.57-46.57,8,8,0,1,1,15.78-2.64,41.29,41.29,0,0,0,33.43,33.43A8,8,0,0,1,111.89,209.32Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.EnvelopeFill">M224,48H32a8,8,0,0,0-8,8V192a16,16,0,0,0,16,16H216a16,16,0,0,0,16-16V56A8,8,0,0,0,224,48ZM98.71,128,40,181.81V74.19Zm11.84,10.85,12,11.05a8,8,0,0,0,10.82,0l12-11.05,58,53.15H52.57ZM157.29,128,216,74.18V181.82Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.TipJarFill">M184,48.81V32a16,16,0,0,0-16-16H88A16,16,0,0,0,72,32V48.81A40.05,40.05,0,0,0,40,88V200a40,40,0,0,0,40,40h96a40,40,0,0,0,40-40V88A40.05,40.05,0,0,0,184,48.81ZM120,32h16V48H120ZM88,32h16V48H88Zm48,152v8a8,8,0,0,1-16,0v-8h-8a8,8,0,0,1,0-16h24a8,8,0,0,0,0-16H120a24,24,0,0,1,0-48V96a8,8,0,0,1,16,0v8h8a8,8,0,0,1,0,16H120a8,8,0,0,0,0,16h16a24,24,0,0,1,0,48ZM168,48H152V32h16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.HeartStraightBreakFill">M113.29,55.31A58,58,0,0,0,32.93,139l89.37,90.66a8,8,0,0,0,11.4,0L223,139a58,58,0,0,0-82-82.1h0l-24.4,23L143,106.32a8,8,0,0,1,0,11.32l-20.69,20.69A8,8,0,1,1,111,127l15-15L99.5,85.42a8,8,0,0,1,.22-11.53l13.55-12.78a4,4,0,0,0,0-5.8Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CheckCircleFill">M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24Zm45.66,85.66-56,56a8,8,0,0,1-11.32,0l-24-24a8,8,0,0,1,11.32-11.32L112,148.69l50.34-50.35a8,8,0,0,1,11.32,11.32Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.TimerFill">M128,40a96,96,0,1,0,96,96A96.11,96.11,0,0,0,128,40Zm45.66,61.66-40,40a8,8,0,0,1-11.32-11.32l40-40a8,8,0,0,1,11.32,11.32ZM96,16a8,8,0,0,1,8-8h48a8,8,0,0,1,0,16H104A8,8,0,0,1,96,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PopcornFill">M229.52,74.21a8,8,0,0,0-7.13-2A44,44,0,0,0,168,41.67a44,44,0,0,0-80,0,44,44,0,0,0-54.4,30.51,8,8,0,0,0-9.4,9.65L54.76,211.67A16,16,0,0,0,70.34,224H185.66a16,16,0,0,0,15.58-12.33L231.79,81.83A8,8,0,0,0,229.52,74.21ZM70.34,208,42.91,91.44l37.85,10.81L94.86,208ZM122.06,73.76,87.57,87.56,49,76.54a28,28,0,0,1,40.1-17.28,8,8,0,0,0,11.56-5.34,28,28,0,0,1,54.66,0,8,8,0,0,0,11.56,5.34A28,28,0,0,1,207,76.54l-38.56,11-34.49-13.8A16,16,0,0,0,122.06,73.76ZM185.66,208H161.14l14.1-105.75,37.85-10.81Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ChatCircleSlashFill">M213.92,210.62a8,8,0,1,1-11.84,10.76l-10.26-11.29a104,104,0,0,1-112.7,9.73L45.07,231.17a16,16,0,0,1-20.24-20.24l11.35-34.05A104.06,104.06,0,0,1,52.33,56.66L42.08,45.38A8,8,0,1,1,53.92,34.62ZM128,24a103.39,103.39,0,0,0-40.33,8.11,8,8,0,0,0-2.81,12.75l121.8,134a8,8,0,0,0,13-1.59A104,104,0,0,0,128,24Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.DiscordLogoFill">M247.51,174.39,218,58a16.08,16.08,0,0,0-13-11.88l-36.06-5.92a16.22,16.22,0,0,0-18.26,11.88l-.21.85a4,4,0,0,0,3.27,4.93,155.62,155.62,0,0,1,24.41,5.62,8.2,8.2,0,0,1,5.62,9.7,8,8,0,0,1-10.19,5.64,155.4,155.4,0,0,0-90.8-.1,8.22,8.22,0,0,1-10.28-4.81,8,8,0,0,1,5.08-10.33,156.85,156.85,0,0,1,24.72-5.72,4,4,0,0,0,3.27-4.93l-.21-.85A16.21,16.21,0,0,0,87.08,40.21L51,46.13A16.08,16.08,0,0,0,38,58L8.49,174.39a15.94,15.94,0,0,0,9.06,18.51l67,29.71a16.17,16.17,0,0,0,21.71-9.1l3.49-9.45a4,4,0,0,0-3.27-5.35,158.13,158.13,0,0,1-28.63-6.2,8.2,8.2,0,0,1-5.61-9.67,8,8,0,0,1,10.2-5.66,155.59,155.59,0,0,0,91.12,0,8,8,0,0,1,10.19,5.65,8.19,8.19,0,0,1-5.61,9.68,157.84,157.84,0,0,1-28.62,6.2,4,4,0,0,0-3.27,5.35l3.49,9.45a16.18,16.18,0,0,0,21.71,9.1l67-29.71A15.94,15.94,0,0,0,247.51,174.39ZM92,152a12,12,0,1,1,12-12A12,12,0,0,1,92,152Zm72,0a12,12,0,1,1,12-12A12,12,0,0,1,164,152Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.HighHeelFill">M32,144a95.28,95.28,0,0,1,37.53,7.67,4,4,0,0,1,2.47,3.7V192a16,16,0,0,1-16,16H40a16,16,0,0,1-16-16V148a4,4,0,0,1,4-4Zm199,12.19L180,144.71,69.66,34.34a8,8,0,0,0-11.56.26C36.11,58.64,24,89,24,120a8,8,0,0,0,8,8,111.2,111.2,0,0,1,63.34,19.7,112.45,112.45,0,0,1,40.55,50.39A15.9,15.9,0,0,0,150.72,208H240a16,16,0,0,0,16-16v-4.73A31.72,31.72,0,0,0,231,156.19Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SpinnerGapFill">M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24ZM48,136a8,8,0,0,1,0-16H72a8,8,0,0,1,0,16Zm46.06,37.25-17,17a8,8,0,0,1-11.32-11.32l17-17a8,8,0,0,1,11.31,11.31Zm0-79.19a8,8,0,0,1-11.31,0l-17-17A8,8,0,0,1,77.09,65.77l17,17A8,8,0,0,1,94.06,94.06ZM136,208a8,8,0,0,1-16,0V184a8,8,0,0,1,16,0Zm0-136a8,8,0,0,1-16,0V48a8,8,0,0,1,16,0Zm54.23,118.23a8,8,0,0,1-11.32,0l-17-17a8,8,0,0,1,11.31-11.31l17,17A8,8,0,0,1,190.23,190.23ZM208,136H184a8,8,0,0,1,0-16h24a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.DevToLogoFill">M80,120v16a16,16,0,0,1-16,16V104A16,16,0,0,1,80,120ZM248,72V184a16,16,0,0,1-16,16H24A16,16,0,0,1,8,184V72A16,16,0,0,1,24,56H232A16,16,0,0,1,248,72ZM96,120A32,32,0,0,0,64,88H56a8,8,0,0,0-8,8v64a8,8,0,0,0,8,8h8a32,32,0,0,0,32-32Zm32,0V104h16a8,8,0,0,0,0-16H120a8,8,0,0,0-8,8v64a8,8,0,0,0,8,8h24a8,8,0,0,0,0-16H128V136h8a8,8,0,0,0,0-16Zm82.17-31.7a8,8,0,0,0-9.87,5.53L190,130.45,179.7,93.83a8,8,0,0,0-15.4,4.34l18,64a8,8,0,0,0,15.4,0l18-64A8,8,0,0,0,210.17,88.3Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CourtBasketballFill">M240,92.23v71.54a4,4,0,0,1-4.41,4,40,40,0,0,1,0-79.52A4,4,0,0,1,240,92.23ZM20.41,167.76a40,40,0,0,0,0-79.52,4,4,0,0,0-4.41,4v71.54A4,4,0,0,0,20.41,167.76ZM116,48H32A16,16,0,0,0,16,64v4.13a4,4,0,0,0,3.8,4,56,56,0,0,1,0,111.74,4,4,0,0,0-3.8,4V192a16,16,0,0,0,16,16h84a4,4,0,0,0,4-4V52A4,4,0,0,0,116,48Zm108,0H140a4,4,0,0,0-4,4V204a4,4,0,0,0,4,4h84a16,16,0,0,0,16-16v-4.13a4,4,0,0,0-3.8-4,56,56,0,0,1,0-111.74,4,4,0,0,0,3.8-4V64A16,16,0,0,0,224,48Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FileArchiveFill">M213.66,82.34l-56-56A8,8,0,0,0,152,24H56A16,16,0,0,0,40,40V216a16,16,0,0,0,16,16H92a4,4,0,0,0,4-4V208H88.27A8.17,8.17,0,0,1,80,200.53,8,8,0,0,1,88,192h8V176H88.27A8.17,8.17,0,0,1,80,168.53,8,8,0,0,1,88,160h8V144H88.27A8.17,8.17,0,0,1,80,136.53,8,8,0,0,1,88,128h8v-7.73a8.18,8.18,0,0,1,7.47-8.25,8,8,0,0,1,8.53,8v8h7.73a8.17,8.17,0,0,1,8.25,7.47,8,8,0,0,1-8,8.53h-8v16h7.73a8.17,8.17,0,0,1,8.25,7.47,8,8,0,0,1-8,8.53h-8v16h7.73a8.17,8.17,0,0,1,8.25,7.47,8,8,0,0,1-8,8.53h-8v20a4,4,0,0,0,4,4h84a16,16,0,0,0,16-16V88A8,8,0,0,0,213.66,82.34ZM152,88V44l44,44Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FilmSlateFill">M216,104H102.09L210,75.51a8,8,0,0,0,5.68-9.84l-8.16-30a15.93,15.93,0,0,0-19.42-11.13L35.81,64.74a15.75,15.75,0,0,0-9.7,7.4,15.51,15.51,0,0,0-1.55,12L32,111.56c0,.14,0,.29,0,.44v88a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V112A8,8,0,0,0,216,104ZM192.16,40l6,22.07L164.57,71,136.44,54.72ZM77.55,70.27l28.12,16.24-59.6,15.73-6-22.08Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SpeakerSimpleNoneFill">M163.52,24.81a8,8,0,0,0-8.43.88L85.25,80H40A16,16,0,0,0,24,96v64a16,16,0,0,0,16,16H85.25l69.84,54.31A7.94,7.94,0,0,0,160,232a8,8,0,0,0,8-8V32A8,8,0,0,0,163.52,24.81Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PencilLineFill">M227.32,73.37,182.63,28.69a16,16,0,0,0-22.63,0L36.69,152A15.86,15.86,0,0,0,32,163.31V208a16,16,0,0,0,16,16H216a8,8,0,0,0,0-16H115.32l112-112A16,16,0,0,0,227.32,73.37ZM79.32,188l90.34-90.34,16.69,16.68L96,204.69Zm79-101.66h0L68,176.69,51.31,160l90.35-90.34ZM48,179.31,76.69,208H48Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PrescriptionFill">M128,120H96V72h32a24,24,0,0,1,0,48Zm96-72V208a16,16,0,0,1-16,16H48a16,16,0,0,1-16-16V48A16,16,0,0,1,48,32H208A16,16,0,0,1,224,48ZM189.66,186.34,175.31,172l14.35-14.34a8,8,0,0,0-11.32-11.32L164,160.69l-26-26A40,40,0,0,0,128,56H88a8,8,0,0,0-8,8V176a8,8,0,0,0,16,0V136h20.69l36,36-14.35,14.34a8,8,0,0,0,11.32,11.32L164,183.31l14.34,14.35a8,8,0,0,0,11.32-11.32Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ChargingStationFill">M241,69.66,221.66,50.34a8,8,0,0,0-11.32,11.32L229.66,81A8,8,0,0,1,232,86.63V168a8,8,0,0,1-16,0V128a24,24,0,0,0-24-24H176V56a24,24,0,0,0-24-24H72A24,24,0,0,0,48,56V208H32a8,8,0,0,0,0,16H192a8,8,0,0,0,0-16H176V120h16a8,8,0,0,1,8,8v40a24,24,0,0,0,48,0V86.63A23.85,23.85,0,0,0,241,69.66ZM135.43,131l-16,40A8,8,0,0,1,104.57,165l11.61-29H96a8,8,0,0,1-7.43-11l16-40A8,8,0,1,1,119.43,91l-11.61,29H128a8,8,0,0,1,7.43,11Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ShoppingCartSimpleFill">M239.71,74.14l-25.64,92.28A24.06,24.06,0,0,1,191,184H92.16A24.06,24.06,0,0,1,69,166.42L33.92,40H16a8,8,0,0,1,0-16H40a8,8,0,0,1,7.71,5.86L57.19,64H232a8,8,0,0,1,7.71,10.14ZM88,200a16,16,0,1,0,16,16A16,16,0,0,0,88,200Zm104,0a16,16,0,1,0,16,16A16,16,0,0,0,192,200Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.MagnetStraightFill">M200,40H160a16,16,0,0,0-16,16v88a16,16,0,0,1-32,0V56A16,16,0,0,0,96,40H56A16,16,0,0,0,40,56v88a88,88,0,0,0,88,88h.67c48.15-.36,87.33-40.29,87.33-89V56A16,16,0,0,0,200,40Zm0,16V96H160V56ZM96,56V96H56V56Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ListChecksFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM117.66,149.66l-32,32a8,8,0,0,1-11.32,0l-16-16a8,8,0,0,1,11.32-11.32L80,164.69l26.34-26.35a8,8,0,0,1,11.32,11.32Zm0-64-32,32a8,8,0,0,1-11.32,0l-16-16A8,8,0,0,1,69.66,90.34L80,100.69l26.34-26.35a8,8,0,0,1,11.32,11.32ZM192,168H144a8,8,0,0,1,0-16h48a8,8,0,0,1,0,16Zm0-64H144a8,8,0,0,1,0-16h48a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FediverseLogoFill">M212,96a27.84,27.84,0,0,0-10.51,2L171,59.94A28,28,0,1,0,120,44a28.65,28.65,0,0,0,.15,2.94L73.68,66.3a28,28,0,1,0-28.6,44.83l1.85,46.38a28,28,0,1,0,32.74,41.42L128,212.47a28,28,0,1,0,49.13-18.79l27.21-42.75A28,28,0,1,0,212,96ZM71.19,104.36,113.72,129,72.26,161.22a28,28,0,0,0-9.34-4.35l-1.85-46.38A28,28,0,0,0,71.19,104.36ZM149.57,72a27.8,27.8,0,0,0,8.94-2L189,108.06a27.86,27.86,0,0,0-4.18,9.22l-46.57,2.22ZM82.09,173.85,124,141.26l15.94,47.83a28.2,28.2,0,0,0-7.6,8L84,183.53A28,28,0,0,0,82.09,173.85ZM156,184l-.89,0-16.18-48.53,46.65-2.22a27.94,27.94,0,0,0,5.28,9l-27.21,42.75A28,28,0,0,0,156,184ZM126.32,61.7A28.44,28.44,0,0,0,134,68.24l-11.3,47.45L79.23,90.52A28,28,0,0,0,80,84a28.65,28.65,0,0,0-.15-2.94Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ProhibitInsetFill">M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24Zm37.66,141.66a8,8,0,0,1-11.32,0l-64-64a8,8,0,0,1,11.32-11.32l64,64A8,8,0,0,1,165.66,165.66Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FingerprintSimpleFill">M126.41,24C70.72,24.85,25.21,70.07,24,125.75a103.48,103.48,0,0,0,13.51,53.5,4,4,0,0,0,7.1-.29A119.29,119.29,0,0,0,56,128,71.93,71.93,0,0,1,73.74,80.67a8.22,8.22,0,0,1,10.8-1.59A8,8,0,0,1,86,91a55.92,55.92,0,0,0-14,37,135.12,135.12,0,0,1-18.44,68.31,4,4,0,0,0,.61,4.85A104.33,104.33,0,0,0,67,212.21,4,4,0,0,0,72.82,211,159.58,159.58,0,0,0,84,189a8,8,0,1,1,14.8,6.1,176.9,176.9,0,0,1-11.85,23.54,4,4,0,0,0,1.89,5.74,103.46,103.46,0,0,0,25,6.7,4,4,0,0,0,4.07-2,206.86,206.86,0,0,0,25.57-85.61,8,8,0,1,1,15.95,1.16,222.83,222.83,0,0,1-21.58,80.75,4,4,0,0,0,4.08,5.74,103.72,103.72,0,0,0,20.6-4.95,4,4,0,0,0,2.35-2.23A247.29,247.29,0,0,0,184,129.76c.22-30.64-23.4-56.67-54-57.73a56.72,56.72,0,0,0-16,1.73,8,8,0,0,1-9.84-6.21,8.23,8.23,0,0,1,6.29-9.39A72.05,72.05,0,0,1,200,128a264.82,264.82,0,0,1-10.66,74.63,4,4,0,0,0,6.47,4.15A104,104,0,0,0,126.41,24ZM128,96a32.05,32.05,0,0,1,23.85,10.67,8,8,0,0,1-1.24,11.79,8.26,8.26,0,0,1-10.88-1.34,16,16,0,0,0-16.78-4.3,16.39,16.39,0,0,0-11,15.67,176.89,176.89,0,0,1-3.19,33A8,8,0,0,1,101,168a7.69,7.69,0,0,1-1.5-.14,8.3,8.3,0,0,1-6.31-9.66A161.12,161.12,0,0,0,96,128,32,32,0,0,1,128,96Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowLineDownFill">M50.34,117.66A8,8,0,0,1,56,104h64V32a8,8,0,0,1,16,0v72h64a8,8,0,0,1,5.66,13.66l-72,72a8,8,0,0,1-11.32,0ZM216,208H40a8,8,0,0,0,0,16H216a8,8,0,0,0,0-16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BeachBallFill">M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24Zm83.44,76A195.88,195.88,0,0,0,165,91,195.88,195.88,0,0,0,156,44.56,88.43,88.43,0,0,1,211.44,100ZM85,51.24a188.27,188.27,0,0,1,67.3,39.21A196.29,196.29,0,0,0,40.08,124.51,88.07,88.07,0,0,1,85,51.24Zm46.48,164.68a196.29,196.29,0,0,0,34.06-112.23A188.27,188.27,0,0,1,204.76,171,88.07,88.07,0,0,1,131.49,215.92Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ChatSlashFill">M213.92,210.61a8,8,0,1,1-11.84,10.76L189.92,208H83l-32.6,28.16-.08.07A15.94,15.94,0,0,1,40,240a16.13,16.13,0,0,1-6.8-1.52A15.85,15.85,0,0,1,24,224V64A16,16,0,0,1,40,48h4.46l-2.38-2.62A8,8,0,1,1,53.92,34.62ZM216,48H96.75a4,4,0,0,0-3,6.69L225,199.06a4,4,0,0,0,7-2.69V64A16,16,0,0,0,216,48Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FalloutShelterFill">M231.94,124.55c-1.77-54.49-46-98.72-100.49-100.49A104.09,104.09,0,0,0,24.06,131.45c1.77,54.49,46,98.72,100.49,100.49A104.09,104.09,0,0,0,231.94,124.55Zm-33.56,16.92L174.93,174.3a8.52,8.52,0,0,1-13.86,0L128,128,94.93,174.3a8.52,8.52,0,0,1-13.86,0L57.62,141.47A8.52,8.52,0,0,1,64.55,128H128L97.62,85.47A8.52,8.52,0,0,1,104.55,72h46.9a8.52,8.52,0,0,1,6.93,13.47L128,128h63.45A8.52,8.52,0,0,1,198.38,141.47Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ConfettiFill">M111.49,52.63a15.8,15.8,0,0,0-26,5.77L33,202.78A15.83,15.83,0,0,0,47.76,224a16,16,0,0,0,5.46-1l144.37-52.5a15.8,15.8,0,0,0,5.78-26ZM65.14,161.13l19.2-52.79,63.32,63.32-52.8,19.2ZM160,72a37.8,37.8,0,0,1,3.84-15.58C169.14,45.83,179.14,40,192,40c6.7,0,11-2.29,13.65-7.21A22,22,0,0,0,208,23.94,8,8,0,0,1,224,24c0,12.86-8.52,32-32,32-6.7,0-11,2.29-13.65,7.21A22,22,0,0,0,176,72.06,8,8,0,0,1,160,72ZM136,40V16a8,8,0,0,1,16,0V40a8,8,0,0,1-16,0Zm101.66,82.34a8,8,0,1,1-11.32,11.31l-16-16a8,8,0,0,1,11.32-11.32Zm4.87-42.75-24,8a8,8,0,0,1-5.06-15.18l24-8a8,8,0,0,1,5.06,15.18Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.RadicalFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32Zm0,80a8,8,0,0,1-16,0v-8H125.42l-30,75a8,8,0,0,1-14.86,0l-32-80A8,8,0,1,1,63.43,93L88,154.46,112.57,93A8,8,0,0,1,120,88h80a8,8,0,0,1,8,8Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.HandPointingFill">M224,104v50.93c0,46.2-36.85,84.55-83,85.06A83.71,83.71,0,0,1,80.6,215.4C58.79,192.33,34.15,136,34.15,136a16,16,0,0,1,6.53-22.23c7.66-4,17.1-.84,21.4,6.62l21,36.44a6.09,6.09,0,0,0,6,3.09l.12,0A8.19,8.19,0,0,0,96,151.74V32a16,16,0,0,1,16.77-16c8.61.4,15.23,7.82,15.23,16.43V104a8,8,0,0,0,8.53,8,8.17,8.17,0,0,0,7.47-8.25V88a16,16,0,0,1,16.77-16c8.61.4,15.23,7.82,15.23,16.43V112a8,8,0,0,0,8.53,8,8.17,8.17,0,0,0,7.47-8.25v-7.28c0-8.61,6.62-16,15.23-16.43A16,16,0,0,1,224,104Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CameraSlashFill">M232,80V192a24.52,24.52,0,0,1-.45,4.65,4,4,0,0,1-6.9,2L86,46.08a4,4,0,0,1-.37-4.91l3.74-5.61A8,8,0,0,1,96,32h64a8,8,0,0,1,6.66,3.56L180.28,56H208A24,24,0,0,1,232,80ZM213.92,210.62a8,8,0,1,1-11.84,10.76L197.19,216H48a24,24,0,0,1-24-24V80A24,24,0,0,1,48,56h3.73L42.08,45.38A8,8,0,1,1,53.92,34.62ZM148,161.92l-47.88-52.68A36,36,0,0,0,148,161.92Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.GrainsSlashFill">M216,64v80a87.66,87.66,0,0,1-5.45,30.49,4,4,0,0,1-6.7,1.27L162.52,130.3a4,4,0,0,1,1-6.16A87.36,87.36,0,0,1,200,112.37V72.45a72.33,72.33,0,0,0-50.35,29.36A8,8,0,0,1,137.72,103a8.17,8.17,0,0,1-.89-10.75,88.06,88.06,0,0,1,25-23.11C152.62,49.8,135.45,37.74,128,33.2a99.79,99.79,0,0,0-23.4,19.94,8,8,0,0,1-12,.27,8.18,8.18,0,0,1-.06-10.8,112.35,112.35,0,0,1,31.86-25.76,8,8,0,0,1,7.16,0c1.32.66,30.27,15.43,44.59,45.15a87.86,87.86,0,0,1,31.74-6A8,8,0,0,1,216,64Zm-2.08,146.62a8,8,0,1,1-11.84,10.76l-12.9-14.19A87.77,87.77,0,0,1,128.52,232C79.83,232.28,40,191.51,40,142.83V64a8,8,0,0,1,8.09-8c1.25,0,2.48,0,3.72.09L42.08,45.38A8,8,0,1,1,53.92,34.62Zm-77.6-61.57L69.18,75.19A71.31,71.31,0,0,0,56,72.44v39.94a88.17,88.17,0,0,1,72,51A88.22,88.22,0,0,1,136.32,149.05Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.StackFill">M220,169.09l-92,53.65L36,169.09A8,8,0,0,0,28,182.91l96,56a8,8,0,0,0,8.06,0l96-56A8,8,0,1,0,220,169.09Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.StackFill2">M220,121.09l-92,53.65L36,121.09A8,8,0,0,0,28,134.91l96,56a8,8,0,0,0,8.06,0l96-56A8,8,0,1,0,220,121.09Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.StackFill3">M28,86.91l96,56a8,8,0,0,0,8.06,0l96-56a8,8,0,0,0,0-13.82l-96-56a8,8,0,0,0-8.06,0l-96,56a8,8,0,0,0,0,13.82Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.StopCircleFill">M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24Zm32,132a4,4,0,0,1-4,4H100a4,4,0,0,1-4-4V100a4,4,0,0,1,4-4h56a4,4,0,0,1,4,4Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CakeFill">M208,88H136V79a32.06,32.06,0,0,0,24-31c0-28-26.44-45.91-27.56-46.66a8,8,0,0,0-8.88,0C122.44,2.09,96,20,96,48a32.06,32.06,0,0,0,24,31v9H48a24,24,0,0,0-24,24v23.33a40.84,40.84,0,0,0,8,24.24V200a24,24,0,0,0,24,24H200a24,24,0,0,0,24-24V159.57a40.84,40.84,0,0,0,8-24.24V112A24,24,0,0,0,208,88ZM112,48c0-13.57,10-24.46,16-29.79,6,5.33,16,16.22,16,29.79a16,16,0,0,1-32,0Zm104,87.33c0,13.25-10.46,24.31-23.32,24.66A24,24,0,0,1,168,136a8,8,0,0,0-16,0,24,24,0,0,1-48,0,8,8,0,0,0-16,0,24,24,0,0,1-24.68,24C50.46,159.64,40,148.58,40,135.33V112a8,8,0,0,1,8-8H208a8,8,0,0,1,8,8Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BookmarkFill">M184,32H72A16,16,0,0,0,56,48V224a8,8,0,0,0,12.24,6.78L128,193.43l59.77,37.35A8,8,0,0,0,200,224V48A16,16,0,0,0,184,32ZM132.23,177.22a8,8,0,0,0-8.48,0L72,209.57V180.43l56-35,56,35v29.14Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SpeakerXFill">M245.66,146.34a8,8,0,0,1-11.32,11.32L216,139.31l-18.34,18.35a8,8,0,0,1-11.32-11.32L204.69,128l-18.35-18.34a8,8,0,0,1,11.32-11.32L216,116.69l18.34-18.35a8,8,0,0,1,11.32,11.32L227.31,128ZM60,80H32A16,16,0,0,0,16,96v64a16,16,0,0,0,16,16H60a4,4,0,0,0,4-4V84A4,4,0,0,0,60,80Zm97.15-54.15a8,8,0,0,0-10-.16l-65.57,51A4,4,0,0,0,80,79.84v96.32a4,4,0,0,0,1.55,3.15l65.57,51a8,8,0,0,0,9,.56,8.29,8.29,0,0,0,3.91-7.18V32.25A8.27,8.27,0,0,0,157.12,25.85Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FolderPlusFill">M216,72H131.31L104,44.69A15.88,15.88,0,0,0,92.69,40H40A16,16,0,0,0,24,56V200.62A15.41,15.41,0,0,0,39.39,216h177.5A15.13,15.13,0,0,0,232,200.89V88A16,16,0,0,0,216,72ZM40,56H92.69l16,16H40Zm112,96H136v16a8,8,0,0,1-16,0V152H104a8,8,0,0,1,0-16h16V120a8,8,0,0,1,16,0v16h16a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.InstagramLogoFill">M160,128a32,32,0,1,1-32-32A32,32,0,0,1,160,128Zm72-48v96a56.06,56.06,0,0,1-56,56H80a56.06,56.06,0,0,1-56-56V80A56.06,56.06,0,0,1,80,24h96A56.06,56.06,0,0,1,232,80Zm-56,48a48,48,0,1,0-48,48A48.05,48.05,0,0,0,176,128Zm24-60a12,12,0,1,0-12,12A12,12,0,0,0,200,68Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.AtomFill">M196.12,128c24.65-34.61,37.22-70.38,19.74-87.86S162.61,35.23,128,59.88C93.39,35.23,57.62,22.66,40.14,40.14S35.23,93.39,59.88,128c-24.65,34.61-37.22,70.38-19.74,87.86h0c5.63,5.63,13.15,8.14,21.91,8.14,18.47,0,42.48-11.17,66-27.88C151.47,212.83,175.47,224,194,224c8.76,0,16.29-2.52,21.91-8.14h0C233.34,198.38,220.77,162.61,196.12,128Zm8.43-76.55c7.64,7.64,2.48,32.4-18.52,63.28a300.33,300.33,0,0,0-21.19-23.57A302.47,302.47,0,0,0,141.27,70C172.15,49,196.91,43.81,204.55,51.45Zm-153.1,0c2.2-2.21,5.83-3.35,10.62-3.35C73.89,48.1,92.76,55,114.72,70A304,304,0,0,0,91.16,91.16,300.33,300.33,0,0,0,70,114.73C49,83.85,43.81,59.09,51.45,51.45Zm0,153.1C43.81,196.91,49,172.15,70,141.27a300.33,300.33,0,0,0,21.19,23.57A304.18,304.18,0,0,0,114.73,186C83.85,207,59.09,212.19,51.45,204.55ZM128,140a12,12,0,1,1,12-12A12,12,0,0,1,128,140Zm76.55,64.56c-7.64,7.65-32.4,2.48-63.28-18.52a304.18,304.18,0,0,0,23.57-21.19A300.33,300.33,0,0,0,186,141.27C207,172.15,212.19,196.91,204.55,204.55Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FadersFill">M136,120v96a8,8,0,0,1-16,0V120a8,8,0,0,1,16,0Zm64,72a8,8,0,0,0-8,8v16a8,8,0,0,0,16,0V200A8,8,0,0,0,200,192Zm24-48H208V40a8,8,0,0,0-16,0V144H176a8,8,0,0,0-8,8v16a8,8,0,0,0,8,8h48a8,8,0,0,0,8-8V152A8,8,0,0,0,224,144ZM56,160a8,8,0,0,0-8,8v48a8,8,0,0,0,16,0V168A8,8,0,0,0,56,160Zm24-48H64V40a8,8,0,0,0-16,0v72H32a8,8,0,0,0-8,8v16a8,8,0,0,0,8,8H80a8,8,0,0,0,8-8V120A8,8,0,0,0,80,112Zm72-48H136V40a8,8,0,0,0-16,0V64H104a8,8,0,0,0-8,8V88a8,8,0,0,0,8,8h48a8,8,0,0,0,8-8V72A8,8,0,0,0,152,64Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SphereFill">M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24Zm0,16c8.15,0,24,31.06,24,88,0,8.24-.34,15.92-.93,23.07-7.15.59-14.83.93-23.07.93-56.94,0-88-15.85-88-24A88.1,88.1,0,0,1,128,40ZM43.4,152.26C63.28,162.65,95.76,168,128,168c7.09,0,14.19-.26,21.17-.77C144.23,199,134,216,128,216A88.17,88.17,0,0,1,43.4,152.26Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.EqualizerFill">M80,96a8,8,0,0,1-8,8H24a8,8,0,0,1,0-16H72A8,8,0,0,1,80,96Zm72,24H104a8,8,0,0,0,0,16h48a8,8,0,0,0,0-16Zm32-48h48a8,8,0,0,0,0-16H184a8,8,0,0,0,0,16ZM72,120H24a8,8,0,0,0-8,8v64a8,8,0,0,0,8,8H72a8,8,0,0,0,8-8V128A8,8,0,0,0,72,120ZM232,88H184a8,8,0,0,0-8,8v96a8,8,0,0,0,8,8h48a8,8,0,0,0,8-8V96A8,8,0,0,0,232,88Zm-80,64H104a8,8,0,0,0-8,8v32a8,8,0,0,0,8,8h48a8,8,0,0,0,8-8V160A8,8,0,0,0,152,152Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.TractorFill">M80,172a12,12,0,1,1-12-12A12,12,0,0,1,80,172Zm40,0a52,52,0,1,1-52-52A52.06,52.06,0,0,1,120,172Zm-24,0a28,28,0,1,0-28,28A28,28,0,0,0,96,172Zm152,16a36,36,0,0,1-71.77,4H144a8,8,0,0,1-8-8V172a68.07,68.07,0,0,0-68-68H40a8,8,0,0,1,0-16h8V56H40a8,8,0,0,1,0-16H160a8,8,0,0,1,0,16h-8V97.88l24,6.5V72a8,8,0,0,1,16,0v36.71l36.39,9.86.21.06A15.89,15.89,0,0,1,240,134v31.46A35.8,35.8,0,0,1,248,188Zm-20,0a16,16,0,1,0-16,16A16,16,0,0,0,228,188Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.VinylRecordFill">M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24ZM72,128a8,8,0,0,1-16,0,72.08,72.08,0,0,1,72-72,8,8,0,0,1,0,16A56.06,56.06,0,0,0,72,128Zm32,0a24,24,0,1,1,24,24A24,24,0,0,1,104,128Zm24,72a8,8,0,0,1,0-16,56.06,56.06,0,0,0,56-56,8,8,0,0,1,16,0A72.08,72.08,0,0,1,128,200Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.WashingMachineFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM128,184a56,56,0,1,1,56-56A56,56,0,0,1,128,184ZM188,80a12,12,0,1,1,12-12A12,12,0,0,1,188,80Zm-54.34,29.66-32,32a8,8,0,0,1-11.32-11.32l32-32a8,8,0,0,1,11.32,11.32Zm32-3.32a8,8,0,0,1,0,11.32l-48,48a8,8,0,0,1-11.32-11.32l48-48A8,8,0,0,1,165.66,106.34Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.LeafFill">M223.45,40.07a8,8,0,0,0-7.52-7.52C139.8,28.08,78.82,51,52.82,94a87.09,87.09,0,0,0-12.76,49A101.72,101.72,0,0,0,46.7,175.2a4,4,0,0,0,6.61,1.43l85-86.3a8,8,0,0,1,11.32,11.32L56.74,195.94,42.55,210.13a8.2,8.2,0,0,0-.6,11.1,8,8,0,0,0,11.71.43l16.79-16.79c14.14,6.84,28.41,10.57,42.56,11.07q1.67.06,3.33.06A86.93,86.93,0,0,0,162,203.18C205,177.18,227.93,116.21,223.45,40.07Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FingerprintFill">M126.42,24C70.73,24.85,25.21,70.09,24,125.81a103.53,103.53,0,0,0,13.52,53.54,4,4,0,0,0,7.1-.3,119.35,119.35,0,0,0,11.37-51A71.77,71.77,0,0,1,83,71.83a8,8,0,1,1,9.86,12.61A55.82,55.82,0,0,0,72,128.07a135.28,135.28,0,0,1-18.45,68.35,4,4,0,0,0,.61,4.85c2,2,4.09,4,6.25,5.82a4,4,0,0,0,6-1A151.18,151.18,0,0,0,85,158.49a8,8,0,1,1,15.68,3.19,167.33,167.33,0,0,1-21.07,53.64,4,4,0,0,0,1.6,5.63c2.47,1.25,5,2.41,7.57,3.47a4,4,0,0,0,5-1.61A183,183,0,0,0,120,128.28a8.16,8.16,0,0,1,7.44-8.21,8,8,0,0,1,8.56,8,198.94,198.94,0,0,1-25.21,97.16,4,4,0,0,0,2.95,5.92q4.55.63,9.21.86a4,4,0,0,0,3.67-2.1A214.88,214.88,0,0,0,152,128.8c.05-13.25-10.3-24.49-23.54-24.74A24,24,0,0,0,104,128a8.1,8.1,0,0,1-7.29,8,8,8,0,0,1-8.71-8,40,40,0,0,1,40.42-40c22,.23,39.68,19.17,39.57,41.16a231.37,231.37,0,0,1-20.52,94.57,4,4,0,0,0,4.62,5.51,103.49,103.49,0,0,0,10.26-3,4,4,0,0,0,2.35-2.22,243.76,243.76,0,0,0,11.48-34,8,8,0,1,1,15.5,4q-1.12,4.37-2.4,8.7a4,4,0,0,0,6.46,4.17A104,104,0,0,0,126.42,24ZM198,161.08a8,8,0,0,1-7.92,7,8.39,8.39,0,0,1-1-.06,8,8,0,0,1-6.95-8.93,252.57,252.57,0,0,0,1.92-31,56.08,56.08,0,0,0-56-56,56.78,56.78,0,0,0-7,.43,8,8,0,0,1-2-15.89,72.1,72.1,0,0,1,81,71.49A266.93,266.93,0,0,1,198,161.08Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowsOutCardinalFill">M88.61,59.06a8,8,0,0,1,1.73-8.72l32-32a8,8,0,0,1,11.32,0l32,32A8,8,0,0,1,160,64H136V96a8,8,0,0,1-16,0V64H96A8,8,0,0,1,88.61,59.06ZM160,192H136V160a8,8,0,0,0-16,0v32H96a8,8,0,0,0-5.66,13.66l32,32a8,8,0,0,0,11.32,0l32-32A8,8,0,0,0,160,192Zm77.66-69.66-32-32A8,8,0,0,0,192,96v24H160a8,8,0,0,0,0,16h32v24a8,8,0,0,0,13.66,5.66l32-32A8,8,0,0,0,237.66,122.34ZM96,136a8,8,0,0,0,0-16H64V96a8,8,0,0,0-13.66-5.66l-32,32a8,8,0,0,0,0,11.32l32,32A8,8,0,0,0,64,160V136Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CertificateFill">M232,86.53V56a16,16,0,0,0-16-16H40A16,16,0,0,0,24,56V184a16,16,0,0,0,16,16H160v24A8,8,0,0,0,172,231l24-13.74L220,231A8,8,0,0,0,232,224V161.47a51.88,51.88,0,0,0,0-74.94ZM128,144H72a8,8,0,0,1,0-16h56a8,8,0,0,1,0,16Zm0-32H72a8,8,0,0,1,0-16h56a8,8,0,0,1,0,16Zm88,98.21-16-9.16a8,8,0,0,0-7.94,0l-16,9.16V172a51.88,51.88,0,0,0,40,0ZM196,160a36,36,0,1,1,36-36A36,36,0,0,1,196,160Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.HourglassSimpleMediumFill">M211.18,196.56,139.57,128l71.61-68.56a1.59,1.59,0,0,1,.13-.13A16,16,0,0,0,200,32H56A16,16,0,0,0,44.69,59.31a1.59,1.59,0,0,1,.13.13L116.43,128,44.82,196.56a1.59,1.59,0,0,1-.13.13A16,16,0,0,0,56,224H200a16,16,0,0,0,11.32-27.31A1.59,1.59,0,0,1,211.18,196.56ZM56,48h0v0Zm144,0L174.92,72H81.08L56,48ZM56,208l64-61.26V168a8,8,0,0,0,16,0V146.74L200,208Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.QuestionMarkFill">M200,24H56A16,16,0,0,0,40,40V216a16,16,0,0,0,16,16H200a16,16,0,0,0,16-16V40A16,16,0,0,0,200,24ZM136,143.28V144a8,8,0,0,1-16,0v-8a8,8,0,0,1,8-8c13.23,0,24-9,24-20s-10.77-20-24-20-24,9-24,20v4a8,8,0,0,1-16,0v-4c0-19.85,17.94-36,40-36s40,16.15,40,36C168,125.38,154.23,139.93,136,143.28ZM140,180a12,12,0,1,1-12-12A12,12,0,0,1,140,180Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.NumberCircleThreeFill">M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24Zm-4,164a35.71,35.71,0,0,1-25.71-10.81A8,8,0,1,1,109.71,166,20,20,0,1,0,124,132a8,8,0,0,1-6.55-12.59L136.63,92H104a8,8,0,0,1,0-16h48a8,8,0,0,1,6.55,12.59l-21,30A36,36,0,0,1,124,188Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.DropHalfBottomFill">M174,47.75a254.19,254.19,0,0,0-41.45-38.3,8,8,0,0,0-9.18,0A254.19,254.19,0,0,0,82,47.75C54.51,79.32,40,112.6,40,144a88,88,0,0,0,176,0C216,112.6,201.49,79.32,174,47.75ZM128,26c14.16,11.1,56.86,47.74,68.84,94H59.16C71.14,73.76,113.84,37.12,128,26Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.DropboxLogoFill">M188,120,128,80l55.56-37a8,8,0,0,1,8.88,0L238,73.34a8,8,0,0,1,0,13.32ZM72.44,43a8,8,0,0,0-8.88,0L18,73.34a8,8,0,0,0,0,13.32L68,120l60-40ZM238,153.34,188,120l-60,40,55.56,37a8,8,0,0,0,8.88,0L238,166.66A8,8,0,0,0,238,153.34Zm-220,0a8,8,0,0,0,0,13.32L63.56,197a8,8,0,0,0,8.88,0L128,160,68,120Zm150.61,52.95-38.37-25.58a4,4,0,0,0-4.44,0L87.41,206.29a4,4,0,0,0,0,6.65L123.56,237a8,8,0,0,0,8.88,0l36.15-24.1A4,4,0,0,0,168.59,206.29Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FileTsxFill">M213.66,82.34l-56-56A8,8,0,0,0,152,24H56A16,16,0,0,0,40,40v76a4,4,0,0,0,4,4H212a4,4,0,0,0,4-4V88A8,8,0,0,0,213.66,82.34ZM152,88V44l44,44Zm62.51,68.65L197.83,180l16.68,23.35a8,8,0,0,1-13,9.3L188,193.76l-13.49,18.89a8,8,0,1,1-13-9.3L178.17,180l-16.68-23.35a8,8,0,0,1,2.3-11.46,8.19,8.19,0,0,1,10.88,2.38L188,166.24l13.49-18.89a8,8,0,0,1,13,9.3Zm-66.7,39.66a20.82,20.82,0,0,1-9.19,15.23C133.43,215,127,216,121.13,216A60.43,60.43,0,0,1,106,214a8,8,0,1,1,4.3-15.41c4.38,1.21,15,2.71,19.55-.35.88-.6,1.83-1.52,2.14-3.93.34-2.67-.72-4.1-12.78-7.59-9.35-2.7-25-7.23-23-23.12a20.58,20.58,0,0,1,9-14.94c11.85-8,30.72-3.31,32.84-2.76a8,8,0,0,1-4.07,15.48c-4.49-1.17-15.23-2.56-19.83.56a4.54,4.54,0,0,0-2,3.67c-.12.9-.14,1.08,1.11,1.9,2.31,1.49,6.45,2.68,10.45,3.84C133.49,174.17,150,179,147.81,196.31ZM88,152.53A8.18,8.18,0,0,1,79.73,160H68v47.72A8.18,8.18,0,0,1,60.53,216,8,8,0,0,1,52,208V160H40.27A8.18,8.18,0,0,1,32,152.53,8,8,0,0,1,40,144H80A8,8,0,0,1,88,152.53Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.NumberSquareFourFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM160,160h-8v16a8,8,0,0,1-16,0V160H88a8,8,0,0,1-6.31-12.91l56-72A8,8,0,0,1,152,80v64h8a8,8,0,0,1,0,16Zm-55.64-16L136,103.32V144Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FileRsFill">M213.66,82.34l-56-56A8,8,0,0,0,152,24H56A16,16,0,0,0,40,40v76a4,4,0,0,0,4,4H172a4,4,0,0,1,4,4V228a4,4,0,0,0,4,4h20a16,16,0,0,0,16-16V88A8,8,0,0,0,213.66,82.34ZM152,88V44l44,44ZM63.42,144H48a8,8,0,0,0-8,8v55.73A8.17,8.17,0,0,0,47.47,216,8,8,0,0,0,56,208v-8h8a28.48,28.48,0,0,0,5.73-.59L77.09,212a8,8,0,0,0,11.81,2.3,8.14,8.14,0,0,0,1.91-10.54l-7-12A27.92,27.92,0,0,0,92,171.36C91.65,156.05,78.74,144,63.42,144Zm.23,40H56V160h8a12,12,0,0,1,12,13.16A12.25,12.25,0,0,1,63.65,184Zm92.16,12.31a20.82,20.82,0,0,1-9.19,15.23C141.43,215,135,216,129.13,216A61.14,61.14,0,0,1,114,214a8,8,0,1,1,4.3-15.41c4.38,1.2,14.95,2.7,19.55-.36.88-.59,1.83-1.52,2.14-3.93.35-2.67-.71-4.1-12.78-7.59-9.35-2.7-25-7.23-23-23.11a20.56,20.56,0,0,1,9-14.95c11.84-8,30.71-3.31,32.83-2.76a8,8,0,0,1-4.07,15.48c-4.49-1.17-15.23-2.56-19.83.56a4.54,4.54,0,0,0-2,3.67c-.12.9-.14,1.09,1.11,1.9,2.31,1.49,6.45,2.68,10.45,3.84C141.49,174.17,158.05,179,155.81,196.31Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.GitlabLogoSimpleFill">M208.14,178.06l-73.27,51.76a11.91,11.91,0,0,1-13.74,0L47.86,178.06a57.19,57.19,0,0,1-22-61L45.75,41a11.94,11.94,0,0,1,22.79-1.11L86.22,88h83.56l17.68-48.13A11.94,11.94,0,0,1,210.25,41l19.9,76.12A57.19,57.19,0,0,1,208.14,178.06Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.StudentFill">M226.53,56.41l-96-32a8,8,0,0,0-5.06,0l-96,32A8,8,0,0,0,24,64v80a8,8,0,0,0,16,0V75.1L73.59,86.29a64,64,0,0,0,20.65,88.05c-18,7.06-33.56,19.83-44.94,37.29a8,8,0,1,0,13.4,8.74C77.77,197.25,101.57,184,128,184s50.23,13.25,65.3,36.37a8,8,0,0,0,13.4-8.74c-11.38-17.46-27-30.23-44.94-37.29a64,64,0,0,0,20.65-88l44.12-14.7a8,8,0,0,0,0-15.18ZM176,120A48,48,0,1,1,89.35,91.55l36.12,12a8,8,0,0,0,5.06,0l36.12-12A47.89,47.89,0,0,1,176,120Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PictureInPictureFill">M216,48H40A16,16,0,0,0,24,64V192a16,16,0,0,0,16,16H216a16,16,0,0,0,16-16V64A16,16,0,0,0,216,48Zm0,144H136V128h80v64Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FileDashedFill">M80,224a8,8,0,0,1-8,8H56a16,16,0,0,1-16-16V184a8,8,0,0,1,16,0v32H72A8,8,0,0,1,80,224ZM213.66,82.34l-56-56A8,8,0,0,0,152,24H120a8,8,0,0,0,0,16h24V88a8,8,0,0,0,8,8h48v40a8,8,0,0,0,16,0V88A8,8,0,0,0,213.66,82.34ZM80,24H56A16,16,0,0,0,40,40V64a8,8,0,0,0,16,0V40H80a8,8,0,0,0,0-16ZM208,168a8,8,0,0,0-8,8v40h-8a8,8,0,0,0,0,16h8a16,16,0,0,0,16-16V176A8,8,0,0,0,208,168ZM48,152a8,8,0,0,0,8-8V104a8,8,0,0,0-16,0v40A8,8,0,0,0,48,152Zm104,64H112a8,8,0,0,0,0,16h40a8,8,0,0,0,0-16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SkypeLogoFill">M222.53,144.83A96.09,96.09,0,0,0,111.17,33.47,55.38,55.38,0,0,0,80,24,56.06,56.06,0,0,0,24,80a55.38,55.38,0,0,0,9.47,31.17A96.09,96.09,0,0,0,144.83,222.53,55.38,55.38,0,0,0,176,232a56.06,56.06,0,0,0,56-56A55.38,55.38,0,0,0,222.53,144.83ZM128,184c-22.06,0-40-14.36-40-32a8,8,0,0,1,16,0c0,8.67,11,16,24,16s24-7.33,24-16c0-9.48-8.61-13-26.88-18.26C109.37,129.2,89.78,123.55,89.78,104c0-18.24,16.43-32,38.22-32,15.72,0,29.18,7.3,35.12,19a8,8,0,1,1-14.27,7.22C145.64,91.94,137.65,88,128,88c-12.67,0-22.22,6.88-22.22,16,0,7,9,10.1,23.77,14.36C145.78,123,168,129.45,168,152,168,169.64,150.06,184,128,184Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.MessengerLogoFill">M128,24A104,104,0,0,0,36.18,176.88L24.83,210.93a16,16,0,0,0,20.24,20.24l34.05-11.35A104,104,0,1,0,128,24Zm53.66,93.66-32,32a8,8,0,0,1-11.32,0L112,123.31,85.66,149.66a8,8,0,0,1-11.32-11.32l32-32a8,8,0,0,1,11.32,0L144,132.69l26.34-26.35a8,8,0,0,1,11.32,11.32Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CompassFill">M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24Zm51.58,57.79-32,64a4.08,4.08,0,0,1-1.79,1.79l-64,32a4,4,0,0,1-5.37-5.37l32-64a4.08,4.08,0,0,1,1.79-1.79l64-32A4,4,0,0,1,179.58,81.79Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.MopedFill">M216,128a39.3,39.3,0,0,0-6.27.5L175.49,37.19A8,8,0,0,0,168,32H136a8,8,0,0,0,0,16h26.46l32.3,86.13a40.13,40.13,0,0,0-18,25.87H136.54l-25-66.81A8,8,0,0,0,104,88H24a8,8,0,0,0,0,16h8v13.39A56.12,56.12,0,0,0,0,168a8,8,0,0,0,8,8h8.8a40,40,0,0,0,78.4,0h81.6A40,40,0,1,0,216,128ZM56,192a24,24,0,0,1-22.62-16H78.62A24,24,0,0,1,56,192Zm160,0a24,24,0,0,1-15.43-42.36l7.94,21.17a8,8,0,0,0,15-5.62L215.55,144H216a24,24,0,0,1,0,48Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.LecternFill">M246.3,120.84l-40-80A15.92,15.92,0,0,0,192,32H64A15.92,15.92,0,0,0,49.7,40.84l-40,80A16,16,0,0,0,24,144h96v64H96a8,8,0,0,0,0,16h64a8,8,0,0,0,0-16H136V144h96a16,16,0,0,0,14.31-23.16ZM192,120H64a8,8,0,0,1,0-16H192a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SupersetProperOfFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM128,192H80a8,8,0,0,1,0-16h48a48,48,0,0,0,0-96H80a8,8,0,0,1,0-16h48a64,64,0,0,1,0,128Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FolderLockFill">M216,72H131.31L104,44.69A15.86,15.86,0,0,0,92.69,40H40A16,16,0,0,0,24,56V200.62A15.4,15.4,0,0,0,39.38,216h73.18a8,8,0,0,0,0-16H40V88H216v16a8,8,0,0,0,16,0V88A16,16,0,0,0,216,72ZM40,72V56H92.69l16,16Zm184,88h-8v-4a28,28,0,0,0-56,0v4h-8a8,8,0,0,0-8,8v40a8,8,0,0,0,8,8h72a8,8,0,0,0,8-8V168A8,8,0,0,0,224,160Zm-24,0H176v-4a12,12,0,0,1,24,0Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowFatLineUpFill">M231.39,123.06A8,8,0,0,1,224,128H184v56a8,8,0,0,1-8,8H80a8,8,0,0,1-8-8V128H32a8,8,0,0,1-5.66-13.66l96-96a8,8,0,0,1,11.32,0l96,96A8,8,0,0,1,231.39,123.06ZM176,208H80a8,8,0,0,0,0,16h96a8,8,0,0,0,0-16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.HourglassMediumFill">M200,75.64V40a16,16,0,0,0-16-16H72A16,16,0,0,0,56,40V76a16.07,16.07,0,0,0,6.4,12.8L114.67,128,62.4,167.2A16.07,16.07,0,0,0,56,180v36a16,16,0,0,0,16,16H184a16,16,0,0,0,16-16V180.36a16.09,16.09,0,0,0-6.35-12.77L141.27,128l52.38-39.59A16.09,16.09,0,0,0,200,75.64ZM184,180.36V216H72V180l48-36v24a8,8,0,0,0,16,0V144.08Zm0-104.72L178.23,80H77.33L72,76V40H184Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ChatFill">M232,64V192a16,16,0,0,1-16,16H83l-32.6,28.16-.09.07A15.89,15.89,0,0,1,40,240a16.05,16.05,0,0,1-6.79-1.52A15.84,15.84,0,0,1,24,224V64A16,16,0,0,1,40,48H216A16,16,0,0,1,232,64Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PersonSimpleSwimFill">M144,72a32,32,0,1,1,32,32A32,32,0,0,1,144,72Zm66.89,112.19c-31.83,26.39-53.72,14.51-79.07.74-26.61-14.44-56.76-30.81-96.93,2.49a8,8,0,1,0,10.22,12.31c31.83-26.39,53.72-14.5,79.07-.74,15.11,8.2,31.35,17,49.93,17,14.14,0,29.64-5.11,47-19.5a8,8,0,0,0-10.22-12.32Zm-176-36.76a8,8,0,1,0,10.22,12.31c31.83-26.38,53.72-14.5,79.07-.74,15.11,8.2,31.35,17,49.93,17,14.14,0,29.64-5.11,47-19.5a8,8,0,1,0-10.22-12.31,75.79,75.79,0,0,1-19.28,12.06l-53.84-53.82A103.34,103.34,0,0,0,64.24,72H40a8,8,0,0,0,0,16H64.24a87.66,87.66,0,0,1,41.88,10.56L76.49,128.17C63.82,129.36,50.07,134.84,34.89,147.42Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.HandsPrayingFill">M235.32,180l-36.24-36.25L162.62,23.46A21.76,21.76,0,0,0,128,12.93,21.76,21.76,0,0,0,93.38,23.46L56.92,143.76,20.68,180a16,16,0,0,0,0,22.62l32.69,32.69a16,16,0,0,0,22.63,0L124.28,187a40.68,40.68,0,0,0,3.72-4.29,40.68,40.68,0,0,0,3.72,4.29L180,235.32a16,16,0,0,0,22.63,0l32.69-32.69A16,16,0,0,0,235.32,180ZM120,158.75a23.85,23.85,0,0,1-7,17L88.68,200,56,167.32l13.65-13.66a8,8,0,0,0,2-3.34l37-122.22A5.78,5.78,0,0,1,120,29.78Zm47.44,41.38L143,175.72a23.85,23.85,0,0,1-7-17v-129a5.78,5.78,0,0,1,11.31-1.68l37,122.22a8,8,0,0,0,2,3.34l14.49,14.49Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowDownFill">M205.66,149.66l-72,72a8,8,0,0,1-11.32,0l-72-72A8,8,0,0,1,56,136h64V40a8,8,0,0,1,16,0v96h64a8,8,0,0,1,5.66,13.66Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.MusicNoteFill">M210.3,56.34l-80-24A8,8,0,0,0,120,40V148.26A48,48,0,1,0,136,184V98.75l69.7,20.91A8,8,0,0,0,216,112V64A8,8,0,0,0,210.3,56.34Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ImageBrokenFill">M216,40H40A16,16,0,0,0,24,56V200a16,16,0,0,0,16,16h64a8,8,0,0,0,7.59-5.47l14.83-44.48L163,151.43a8.07,8.07,0,0,0,4.46-4.46l14.62-36.55,44.48-14.83A8,8,0,0,0,232,88V56A16,16,0,0,0,216,40ZM117,152.57a8,8,0,0,0-4.62,4.9L98.23,200H40V160.69l46.34-46.35a8,8,0,0,1,11.32,0l32.84,32.84Zm115-30.84V200a16,16,0,0,1-16,16H137.73a8,8,0,0,1-7.59-10.53l7.94-23.8a8,8,0,0,1,4.61-4.9l35.77-14.31,14.31-35.77a8,8,0,0,1,4.9-4.61l23.8-7.94A8,8,0,0,1,232,121.73Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.AvocadoFill">M211,130.66,181.2,46.47a56,56,0,0,0-106-1.14h0l-29.51,83.5A88,88,0,1,0,211,130.66ZM128,200a40,40,0,1,1,40-40A40,40,0,0,1,128,200Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.EyedropperSampleFill">M224,67.3a35.79,35.79,0,0,0-11.26-25.66c-14-13.28-36.72-12.78-50.62,1.13L138.8,66.2a24,24,0,0,0-33.14.77l-5,5a16,16,0,0,0,0,22.64l2,2.06-51,51a39.75,39.75,0,0,0-10.53,38l-8,18.41A13.65,13.65,0,0,0,36,219.29a15.9,15.9,0,0,0,17.71,3.36L71.24,215a39.9,39.9,0,0,0,37.05-10.75l51-51,2.06,2.06a16,16,0,0,0,22.62,0l5-5a24,24,0,0,0,.74-33.18l23.75-23.87A35.75,35.75,0,0,0,224,67.3ZM138,152H70.07l44-44,33.94,34Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.DeviceMobileCameraFill">M176,16H80A24,24,0,0,0,56,40V216a24,24,0,0,0,24,24h96a24,24,0,0,0,24-24V40A24,24,0,0,0,176,16ZM128,72a12,12,0,1,1,12-12A12,12,0,0,1,128,72Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.MicrophoneStageFill">M115.06,46.36a4,4,0,0,0-6.11.54A71.54,71.54,0,0,0,96,88a73.29,73.29,0,0,0,.63,9.42L27.12,192.22A15.93,15.93,0,0,0,28.71,213L43,227.29a15.93,15.93,0,0,0,20.78,1.59l94.81-69.53A73.29,73.29,0,0,0,168,160a71.54,71.54,0,0,0,41.09-12.93,4,4,0,0,0,.54-6.11Zm2.61,103.28-16,16a8,8,0,1,1-11.31-11.31l16-16a8,8,0,0,1,11.31,11.31Zm109.4-20.56a4,4,0,0,1-6.12.54L126.38,35.05a4,4,0,0,1,.54-6.12A71.93,71.93,0,0,1,227.07,129.08Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FishFill">M168,76a12,12,0,1,1-12-12A12,12,0,0,1,168,76Zm48.72,67.64c-19.37,34.9-55.44,53.76-107.24,56.1l-22,51.41A8,8,0,0,1,80.1,256l-.51,0a8,8,0,0,1-7.19-5.78L57.6,198.39,5.8,183.56a8,8,0,0,1-1-15.05l51.41-22c2.35-51.78,21.21-87.84,56.09-107.22,24.75-13.74,52.74-15.84,71.88-15.18,18.64.64,36,4.27,38.86,6a8,8,0,0,1,2.83,2.83c1.69,2.85,5.33,20.21,6,38.85C232.55,90.89,230.46,118.89,216.72,143.64Zm-4.3-100.07c-14.15-3-64.1-11-100.3,14.75a81.21,81.21,0,0,0-16,15.07,36,36,0,0,0,39.35,38.44,8,8,0,0,1,8.73,8.73,36,36,0,0,0,38.47,39.34,80.81,80.81,0,0,0,15-16C223.42,107.73,215.42,57.74,212.42,43.57Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FileFill">M213.66,82.34l-56-56A8,8,0,0,0,152,24H56A16,16,0,0,0,40,40V216a16,16,0,0,0,16,16H200a16,16,0,0,0,16-16V88A8,8,0,0,0,213.66,82.34ZM152,88V44l44,44Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.DevicesFill">M224,72H208V64a24,24,0,0,0-24-24H40A24,24,0,0,0,16,64v96a24,24,0,0,0,24,24H152v8a24,24,0,0,0,24,24h48a24,24,0,0,0,24-24V96A24,24,0,0,0,224,72Zm8,120a8,8,0,0,1-8,8H176a8,8,0,0,1-8-8V96a8,8,0,0,1,8-8h48a8,8,0,0,1,8,8Zm-96,16a8,8,0,0,1-8,8H88a8,8,0,0,1,0-16h40A8,8,0,0,1,136,208Zm80-96a8,8,0,0,1-8,8H192a8,8,0,0,1,0-16h16A8,8,0,0,1,216,112Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ThreeDFill">M184,128a32,32,0,0,1-32,32h-8V96h8A32,32,0,0,1,184,128Zm48-72V200a16,16,0,0,1-16,16H40a16,16,0,0,1-16-16V56A16,16,0,0,1,40,40H216A16,16,0,0,1,232,56ZM112,144a32,32,0,0,0-18.31-28.92L110.4,92.8A8,8,0,0,0,104,80H64a8,8,0,0,0,0,16H88L73.6,115.2A8,8,0,0,0,80,128a16,16,0,1,1-10.66,27.93,8,8,0,1,0-10.68,11.92A32,32,0,0,0,112,144Zm88-16a48.05,48.05,0,0,0-48-48H136a8,8,0,0,0-8,8v80a8,8,0,0,0,8,8h16A48.05,48.05,0,0,0,200,128Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowCircleUpLeftFill">M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24Zm37.66,141.66a8,8,0,0,1-11.32,0L104,115.31V144a8,8,0,0,1-16,0V96a8,8,0,0,1,8-8h48a8,8,0,0,1,0,16H115.31l50.35,50.34A8,8,0,0,1,165.66,165.66Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.GraphicsCardFill">M232,48H16a8,8,0,0,0-8,8V208a8,8,0,0,0,16,0V192H40v16a8,8,0,0,0,16,0V192H72v16a8,8,0,0,0,16,0V192h16v16a8,8,0,0,0,16,0V192H232a16,16,0,0,0,16-16V64A16,16,0,0,0,232,48Zm-20,72a35.81,35.81,0,0,1-5.53,19.16L156.84,89.53A36,36,0,0,1,212,120Zm-96,0a35.81,35.81,0,0,1-5.53,19.16L60.84,89.53A36,36,0,0,1,116,120ZM80,156a36,36,0,0,1-30.47-55.16l49.63,49.63A35.81,35.81,0,0,1,80,156Zm60-36a35.81,35.81,0,0,1,5.53-19.16l49.63,49.63A36,36,0,0,1,140,120Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.GlobeHemisphereWestFill">M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24Zm88,104a87.62,87.62,0,0,1-6.4,32.94l-44.7-27.49a15.92,15.92,0,0,0-6.24-2.23l-22.82-3.08a16.11,16.11,0,0,0-16,7.86h-8.72l-3.8-7.86a15.91,15.91,0,0,0-11-8.67l-8-1.73L96.14,104h16.71a16.06,16.06,0,0,0,7.73-2l12.25-6.76a16.62,16.62,0,0,0,3-2.14l26.91-24.34A15.93,15.93,0,0,0,166,49.1l-.36-.65A88.11,88.11,0,0,1,216,128ZM40,128a87.53,87.53,0,0,1,8.54-37.8l11.34,30.27a16,16,0,0,0,11.62,10l21.43,4.61L96.74,143a16.09,16.09,0,0,0,14.4,9h1.48l-7.23,16.23a16,16,0,0,0,2.86,17.37l.14.14L128,205.94l-1.94,10A88.11,88.11,0,0,1,40,128Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PepperFill">M167.27,40.42A40.06,40.06,0,0,0,128,8a8,8,0,0,0,0,16,24,24,0,0,1,22.85,16.66A64.08,64.08,0,0,0,96,104c0,46.75-25.75,78-76.53,93a16,16,0,0,0,1.77,31.13A264.8,264.8,0,0,0,66.75,232c40.78,0,86.16-9.15,117.53-35.46C210.64,174.44,224,143.3,224,104h0A64.07,64.07,0,0,0,167.27,40.42ZM192,95,163.58,80.83a8,8,0,0,0-7.16,0L128,95l-13.37-6.68a48,48,0,0,1,90.74,0Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowElbowRightUpFill">M223.39,99.06A8,8,0,0,1,216,104H176v88a8,8,0,0,1-8,8H24a8,8,0,0,1,0-16H160V104H120a8,8,0,0,1-5.66-13.66l48-48a8,8,0,0,1,11.32,0l48,48A8,8,0,0,1,223.39,99.06Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CircleHalfTiltFill">M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24ZM40,128A88,88,0,0,1,190.2,65.8L65.8,190.2A87.76,87.76,0,0,1,40,128Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowFatLinesUpFill">M231.39,123.06A8,8,0,0,1,224,128H184v24a8,8,0,0,1-8,8H80a8,8,0,0,1-8-8V128H32a8,8,0,0,1-5.66-13.66l96-96a8,8,0,0,1,11.32,0l96,96A8,8,0,0,1,231.39,123.06ZM176,208H80a8,8,0,0,0,0,16h96a8,8,0,0,0,0-16Zm0-32H80a8,8,0,0,0,0,16h96a8,8,0,0,0,0-16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FlaskFill">M221.69,199.77,160,96.92V40h8a8,8,0,0,0,0-16H88a8,8,0,0,0,0,16h8V96.92L34.31,199.77A16,16,0,0,0,48,224H208a16,16,0,0,0,13.72-24.23Zm-90.08-42.91c-15.91-8.05-31.05-12.32-45.22-12.81l24.47-40.8A7.93,7.93,0,0,0,112,99.14V40h32V99.14a7.93,7.93,0,0,0,1.14,4.11L183.36,167C171.4,169.34,154.29,168.34,131.61,156.86Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BaseballCapFill">M128,24A104.12,104.12,0,0,0,24,128v56a24,24,0,0,0,24,24,24.11,24.11,0,0,0,14.18-4.64C74.33,194.53,95.6,184,128,184s53.67,10.52,65.81,19.35A24,24,0,0,0,232,184V128A104.12,104.12,0,0,0,128,24ZM40,128A88.15,88.15,0,0,1,109.81,41.9a167,167,0,0,0-28.87,76.76A166,166,0,0,0,40,136.88Zm176,56a7.77,7.77,0,0,1-4.34,7.1,8,8,0,0,1-8.44-.69C189.16,180.2,164.7,168,128,168S66.84,180.2,52.78,190.42a8,8,0,0,1-8.44.69A7.77,7.77,0,0,1,40,184V156.07a150.62,150.62,0,0,1,49.93-23.28,7.06,7.06,0,0,0,1-.26,154.06,154.06,0,0,1,74.17,0,8.64,8.64,0,0,0,1,.27A150.49,150.49,0,0,1,216,156.07Zm0-47.13a166,166,0,0,0-40.94-18.22A167,167,0,0,0,146.19,41.9,88.15,88.15,0,0,1,216,128Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ShieldChevronFill">M208,40H48A16,16,0,0,0,32,56v56c0,52.72,25.52,84.67,46.93,102.19,23.06,18.86,46,25.26,47,25.53a8,8,0,0,0,4.2,0c1-.27,23.91-6.67,47-25.53C198.48,196.67,224,164.72,224,112V56A16,16,0,0,0,208,40Zm0,72q0,26.31-9.14,47.84l-66.27-46.39a8,8,0,0,0-9.18,0L57.13,159.84C51.06,145.52,48,129.54,48,112l0-56,160,0Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ShootingStarFill">M235.24,84.38l-28.06,23.68,8.56,35.39a13.34,13.34,0,0,1-5.09,13.91,13.54,13.54,0,0,1-15,.69L164,139l-31.65,19.06a13.51,13.51,0,0,1-15-.69,13.32,13.32,0,0,1-5.1-13.91l8.56-35.39L92.76,84.38a13.39,13.39,0,0,1,7.66-23.58l36.94-2.92,14.21-33.66a13.51,13.51,0,0,1,24.86,0l14.21,33.66,36.94,2.92a13.39,13.39,0,0,1,7.66,23.58ZM88.11,111.89a8,8,0,0,0-11.32,0L18.34,170.34a8,8,0,0,0,11.32,11.32l58.45-58.45A8,8,0,0,0,88.11,111.89Zm-.5,61.19L34.34,226.34a8,8,0,0,0,11.32,11.32l53.26-53.27a8,8,0,0,0-11.31-11.31Zm73-1-54.29,54.28a8,8,0,0,0,11.32,11.32l54.28-54.28a8,8,0,0,0-11.31-11.32Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowUpLeftFill">M197.66,197.66a8,8,0,0,1-11.32,0L116,127.31,69.66,173.66A8,8,0,0,1,56,168V64a8,8,0,0,1,8-8H168a8,8,0,0,1,5.66,13.66L127.31,116l70.35,70.34A8,8,0,0,1,197.66,197.66Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FunctionFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM176,72H159.92a16,16,0,0,0-15.73,13l-6.55,35H168a8,8,0,0,1,0,16H134.64l-7.11,37.9A32,32,0,0,1,96.08,200H80a8,8,0,0,1,0-16H96.08A16,16,0,0,0,111.81,171L118.36,136H88a8,8,0,0,1,0-16h33.36l7.11-37.9A32,32,0,0,1,159.92,56H176a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.AppleLogoFill">M128.23,30A40,40,0,0,1,167,0h1a8,8,0,0,1,0,16h-1a24,24,0,0,0-23.24,18,8,8,0,1,1-15.5-4ZM223.3,169.59a8.07,8.07,0,0,0-2.8-3.4C203.53,154.53,200,134.64,200,120c0-17.67,13.47-33.06,21.5-40.67a8,8,0,0,0,0-11.62C208.82,55.74,187.82,48,168,48a72.23,72.23,0,0,0-40,12.13,71.56,71.56,0,0,0-90.71,9.09A74.63,74.63,0,0,0,16,123.4a127,127,0,0,0,40.14,89.73A39.8,39.8,0,0,0,83.59,224h87.68a39.84,39.84,0,0,0,29.12-12.57,125,125,0,0,0,17.82-24.6C225.23,174,224.33,172,223.3,169.59Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CellSignalHighFill">M198.12,25.23a16,16,0,0,0-17.44,3.46l-160,160A16,16,0,0,0,32,216H192a16,16,0,0,0,16-16V40A15.94,15.94,0,0,0,198.12,25.23ZM192,200H168V64l24-24Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.WebhooksLogoFill">M50.15,160,89.07,92.57l-2.24-3.88a48,48,0,1,1,85.05-44.17,8.17,8.17,0,0,1-3.19,10.4,8,8,0,0,1-11.35-3.72,32,32,0,1,0-56.77,29.3.57.57,0,0,1,.08.13l13.83,23.94a8,8,0,0,1,0,8L77.86,176a16,16,0,0,1-27.71-16Zm141-40H178.81L141.86,56a16,16,0,0,0-27.71,16l34.64,60a8,8,0,0,0,6.92,4h35.63c17.89,0,32.95,14.64,32.66,32.53A32,32,0,0,1,192.31,200a8.23,8.23,0,0,0-8.28,7.33,8,8,0,0,0,8,8.67,48.05,48.05,0,0,0,48-48.93C239.49,140.79,217.48,120,191.19,120ZM208,167.23c-.4-8.61-7.82-15.23-16.43-15.23H114.81a8,8,0,0,0-6.93,4L91.72,184h0a32,32,0,1,1-53.47-35,8.2,8.2,0,0,0-.92-11,8,8,0,0,0-11.72,1.17A47.63,47.63,0,0,0,16,167.54,48,48,0,0,0,105.55,192v0l4.62-8H192A16,16,0,0,0,208,167.23Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.HighDefinitionFill">M196,128a32,32,0,0,1-32,32H152V96h12A32,32,0,0,1,196,128Zm36-72V200a16,16,0,0,1-16,16H40a16,16,0,0,1-16-16V56A16,16,0,0,1,40,40H216A16,16,0,0,1,232,56ZM120,88a8,8,0,0,0-16,0v32H64V88a8,8,0,0,0-16,0v80a8,8,0,0,0,16,0V136h40v32a8,8,0,0,0,16,0Zm92,40a48.05,48.05,0,0,0-48-48H144a8,8,0,0,0-8,8v80a8,8,0,0,0,8,8h20A48.05,48.05,0,0,0,212,128Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PaperPlaneTiltFill">M231.4,44.34s0,.1,0,.15l-58.2,191.94a15.88,15.88,0,0,1-14,11.51q-.69.06-1.38.06a15.86,15.86,0,0,1-14.42-9.15L107,164.15a4,4,0,0,1,.77-4.58l57.92-57.92a8,8,0,0,0-11.31-11.31L96.43,148.26a4,4,0,0,1-4.58.77L17.08,112.64a16,16,0,0,1,2.49-29.8l191.94-58.2.15,0A16,16,0,0,1,231.4,44.34Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.AirplaneTiltFill">M215.52,197.26a8,8,0,0,1-1.86,8.39l-24,24A8,8,0,0,1,184,232a7.09,7.09,0,0,1-.79,0,8,8,0,0,1-5.87-3.52l-44.07-66.12L112,183.59V208a8,8,0,0,1-2.34,5.65s-14,14.06-15.88,15.88A7.91,7.91,0,0,1,91,231.41a8,8,0,0,1-10.41-4.35l-.06-.15-14.7-36.76L29,175.42a8,8,0,0,1-2.69-13.08l16-16A8,8,0,0,1,48,144H72.4l21.27-21.27L27.56,78.65a8,8,0,0,1-1.22-12.32l24-24a8,8,0,0,1,8.39-1.86l85.94,31.25L176.2,40.19a28,28,0,0,1,39.6,39.6l-31.53,31.53Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowArcLeftFill">M232,184a8,8,0,0,1-16,0A88,88,0,0,0,67.47,120.16l26.19,26.18A8,8,0,0,1,88,160H24a8,8,0,0,1-8-8V88a8,8,0,0,1,13.66-5.66l26.48,26.48A104,104,0,0,1,232,184Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.DribbbleLogoFill">M93.27,36.86a4,4,0,0,1,.82-7.19,103.94,103.94,0,0,1,88.66,9.95,4,4,0,0,1,1,5.87,153.32,153.32,0,0,1-41.89,37A169.43,169.43,0,0,0,93.27,36.86ZM127.58,90a153,153,0,0,0-56-46.91,3.94,3.94,0,0,0-4,.33,104.41,104.41,0,0,0-38.34,52,4,4,0,0,0,3,5.16A152.34,152.34,0,0,0,64,104,151,151,0,0,0,127.58,90Zm103.8,26.69A103.81,103.81,0,0,0,202.19,55.2a4,4,0,0,0-6,.34,169.15,169.15,0,0,1-45.69,40.4,167.73,167.73,0,0,1,13.55,29.9A167.64,167.64,0,0,1,208,120,169.35,169.35,0,0,1,227,121.07,4,4,0,0,0,231.38,116.72Zm-62.91,24.5a167.7,167.7,0,0,1,4.45,38.47,168,168,0,0,1-4.11,36.85A4,4,0,0,0,174.5,221a104.25,104.25,0,0,0,56.57-79.25,4,4,0,0,0-3.49-4.49,152.44,152.44,0,0,0-59.11,4Zm-19.64-10.45a151.76,151.76,0,0,0-12.39-27.21A167,167,0,0,1,64,120a168.4,168.4,0,0,1-34.88-3.65,4,4,0,0,0-4.81,3.56q-.31,4-.32,8.09a103.72,103.72,0,0,0,33,75.91,4,4,0,0,0,6.15-.92A169,169,0,0,1,148.83,130.77ZM75.69,213.25a4,4,0,0,0,1.52,5.48,103.88,103.88,0,0,0,68.85,11.69,3.93,3.93,0,0,0,3.06-2.65,152.6,152.6,0,0,0,7.8-48.08,151.3,151.3,0,0,0-3.74-33.46A152.94,152.94,0,0,0,75.69,213.25Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FlowerTulipFill">M208,48a87.48,87.48,0,0,0-35.36,7.43c-15.1-25.37-39.92-38-41.06-38.59a8,8,0,0,0-7.16,0c-1.14.58-26,13.22-41.06,38.59A87.48,87.48,0,0,0,48,48a8,8,0,0,0-8,8V96a88.11,88.11,0,0,0,80,87.63v35.43L83.58,200.84a8,8,0,1,0-7.16,14.32l48,24a8,8,0,0,0,7.16,0l48-24a8,8,0,0,0-7.16-14.32L136,219.06V183.63A88.11,88.11,0,0,0,216,96V56A8,8,0,0,0,208,48ZM56,96V64.44A72.1,72.1,0,0,1,120,136v31.56A72.1,72.1,0,0,1,56,96Zm144,0a72.1,72.1,0,0,1-64,71.56V136a72.1,72.1,0,0,1,64-71.56Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SquareHalfFill">M200,40H56A16,16,0,0,0,40,56V200a16,16,0,0,0,16,16H200a16,16,0,0,0,16-16V56A16,16,0,0,0,200,40ZM56,56h72V200H56Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FileCSharpFill">M48,180c0,11,7.18,20,16,20a14.07,14.07,0,0,0,10.07-4.51,8.19,8.19,0,0,1,10.88-.9,8,8,0,0,1,.83,11.81A30.06,30.06,0,0,1,64,216c-17.65,0-32-16.15-32-36s14.35-36,32-36a30,30,0,0,1,21.38,9.19,8.25,8.25,0,0,1,.74,11.09,8,8,0,0,1-11.9.38A14.24,14.24,0,0,0,64,160C55.18,160,48,169,48,180ZM216,88V223.75a8.15,8.15,0,0,1-6.81,8.16A8,8,0,0,1,200,224V124a4,4,0,0,0-4-4H44a4,4,0,0,1-4-4V40A16,16,0,0,1,56,24h96a8,8,0,0,1,5.66,2.34l56,56A8,8,0,0,1,216,88Zm-20,0L152,44V88Zm-28,80v16h7.73a8.17,8.17,0,0,1,8.25,7.47,8,8,0,0,1-8,8.53h-8v7.73a8.17,8.17,0,0,1-7.47,8.25,8,8,0,0,1-8.53-8v-8H136v7.73a8.17,8.17,0,0,1-7.47,8.25,8,8,0,0,1-8.53-8v-8h-7.73a8.17,8.17,0,0,1-8.25-7.47,8,8,0,0,1,8-8.53h8V168h-7.73a8.17,8.17,0,0,1-8.25-7.47,8,8,0,0,1,8-8.53h8v-7.73a8.17,8.17,0,0,1,7.47-8.25,8,8,0,0,1,8.53,8v8h16v-7.73a8.17,8.17,0,0,1,7.47-8.25,8,8,0,0,1,8.53,8v8h7.73a8.17,8.17,0,0,1,8.25,7.47,8,8,0,0,1-8,8.53Zm-16,0H136v16h16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BinaryFill">M168,168c0,4.75-1.11,9.16-3.05,12.11A7.77,7.77,0,0,1,158,184c-9.72,0-10-14.36-10-16,0-4.74,1.11-9.16,3.05-12.11A7.77,7.77,0,0,1,158,152C167.72,152,168,166.36,168,168ZM224,48V208a16,16,0,0,1-16,16H48a16,16,0,0,1-16-16V48A16,16,0,0,1,48,32H208A16,16,0,0,1,224,48ZM140.84,75.58a8,8,0,0,0,10.74,3.58L156,76.94V112a8,8,0,0,0,16,0V64a8,8,0,0,0-11.58-7.16l-16,8A8,8,0,0,0,140.84,75.58ZM112,144a8,8,0,0,0-11.58-7.16l-16,8a8,8,0,0,0,7.16,14.32L96,156.94V192a8,8,0,0,0,16,0Zm16-56c0-18.84-10.69-32-26-32S76,69.16,76,88s10.69,32,26,32S128,106.84,128,88Zm56,80c0-18.84-10.69-32-26-32s-26,13.16-26,32,10.69,32,26,32S184,186.84,184,168ZM102,72a7.77,7.77,0,0,0-7,3.89c-1.94,3-3,7.37-3,12.11,0,1.64.28,16,10,16a7.77,7.77,0,0,0,7-3.89c1.94-3,3-7.36,3-12.11C112,86.36,111.72,72,102,72Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.VideoConferenceFill">M204,88a12,12,0,1,1-12-12A12,12,0,0,1,204,88Zm-12,68a12,12,0,1,0,12,12A12,12,0,0,0,192,156ZM96,104a16,16,0,1,0,16,16A16,16,0,0,0,96,104ZM232,56V200a16,16,0,0,1-16,16H40a16,16,0,0,1-16-16V56A16,16,0,0,1,40,40H216A16,16,0,0,1,232,56Zm-64,64h48V56H168Zm-32.25,46a39.76,39.76,0,0,0-17.19-23.34,32,32,0,1,0-45.12,0A39.84,39.84,0,0,0,56.25,166a8,8,0,0,0,15.5,4c2.64-10.25,13.06-18,24.25-18s21.62,7.73,24.25,18a8,8,0,1,0,15.5-4ZM216,200V136H168v64h48Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.EmptyFill">M170.49,91.59A56,56,0,0,1,97.54,175ZM128,72a56,56,0,0,0-42.49,92.41l73-83.37A55.67,55.67,0,0,0,128,72Zm104,56A104,104,0,1,1,128,24,104.13,104.13,0,0,1,232,128Zm-32,0a71.68,71.68,0,0,0-18.89-48.55L186,73.27a8,8,0,1,0-12-10.54l-4.91,6.18A72,72,0,0,0,74.89,176.55L70,182.73a8,8,0,0,0,12,10.54l4.91-6.18A71.95,71.95,0,0,0,200,128Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FunnelXFill">M227.73,66.85,160,139.17v55.49A16,16,0,0,1,152.87,208l-32,21.34A16,16,0,0,1,96,216V139.17L28.27,66.85l-.08-.09A16,16,0,0,1,40,40H216a16,16,0,0,1,11.84,26.76ZM227.31,192l18.35-18.34a8,8,0,0,0-11.32-11.32L216,180.69l-18.34-18.35a8,8,0,0,0-11.32,11.32L204.69,192l-18.35,18.34a8,8,0,0,0,11.32,11.32L216,203.31l18.34,18.35a8,8,0,0,0,11.32-11.32Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PaintBrushFill">M232,32a8,8,0,0,0-8-8c-44.08,0-89.31,49.71-114.43,82.63A60,60,0,0,0,32,164c0,30.88-19.54,44.73-20.47,45.37A8,8,0,0,0,16,224H92a60,60,0,0,0,57.37-77.57C182.3,121.31,232,76.08,232,32ZM124.42,113.55q5.14-6.66,10.09-12.55A76.23,76.23,0,0,1,155,121.49q-5.9,4.94-12.55,10.09A60.54,60.54,0,0,0,124.42,113.55Zm42.7-2.68a92.57,92.57,0,0,0-22-22c31.78-34.53,55.75-45,69.9-47.91C212.17,55.12,201.65,79.09,167.12,110.87Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.GlobeHemisphereEastFill">M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24ZM62.29,186.47l2.52-1.65A16,16,0,0,0,72,171.53l.21-36.23L93.17,104a3.62,3.62,0,0,0,.32.22l19.67,12.87a15.94,15.94,0,0,0,11.35,2.77L156,115.59a16,16,0,0,0,10-5.41l22.17-25.76A16,16,0,0,0,192,74V67.67A87.87,87.87,0,0,1,211.77,155l-16.14-14.76a16,16,0,0,0-16.93-3l-30.46,12.65a16.08,16.08,0,0,0-9.68,12.45l-2.39,16.19a16,16,0,0,0,11.77,17.81L169.4,202l2.36,2.37A87.88,87.88,0,0,1,62.29,186.47Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.VideoCameraFill">M192,72V184a16,16,0,0,1-16,16H32a16,16,0,0,1-16-16V72A16,16,0,0,1,32,56H176A16,16,0,0,1,192,72Zm58,.25a8.23,8.23,0,0,0-6.63,1.22L209.78,95.86A4,4,0,0,0,208,99.19v57.62a4,4,0,0,0,1.78,3.33l33.78,22.52a8,8,0,0,0,8.58.19,8.33,8.33,0,0,0,3.86-7.17V80A8,8,0,0,0,250,72.25Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PaintBrushHouseholdFill">M230.64,25.36a32,32,0,0,0-45.26,0q-.21.21-.42.45L131.55,88.22,121,77.64a24,24,0,0,0-33.95,0l-76.69,76.7a8,8,0,0,0,0,11.31l80,80a8,8,0,0,0,11.31,0L178.36,169a24,24,0,0,0,0-33.95l-10.58-10.57L230.19,71c.15-.14.31-.28.45-.43A32,32,0,0,0,230.64,25.36ZM96,228.69,79.32,212l22.34-22.35a8,8,0,0,0-11.31-11.31L68,200.68,55.32,188l22.34-22.35a8,8,0,0,0-11.31-11.31L44,176.68,27.31,160l50.35-50.34,68.69,68.69Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.YinYangFill">M140,80a12,12,0,1,1-12-12A12,12,0,0,1,140,80Zm92,48A104,104,0,1,1,128,24,104.11,104.11,0,0,1,232,128Zm-92,48a12,12,0,1,0-12,12A12,12,0,0,0,140,176Zm32-92a44.05,44.05,0,0,0-44-44A88,88,0,0,0,81.09,202.42,52,52,0,0,1,128,128,44.05,44.05,0,0,0,172,84Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.HandFistFill">M232,120v8A104,104,0,0,1,127.63,232c-54-.19-98-42.06-103.12-94.78a4,4,0,0,1,5.56-4A35.94,35.94,0,0,0,72,122.59a35.92,35.92,0,0,0,53.94,2.33,40.36,40.36,0,0,0,12.87,13A47.94,47.94,0,0,0,120,176a8,8,0,0,0,8.67,8,8.21,8.21,0,0,0,7.33-8.26A32,32,0,0,1,168,144a8,8,0,0,0,8-8.53,8.18,8.18,0,0,0-8.25-7.47H160a24,24,0,0,1-24-24V88h64A32,32,0,0,1,232,120ZM44.73,120C55.57,119.6,64,110.37,64,99.52v-23C64,65.63,55.57,56.4,44.73,56A20,20,0,0,0,24,76v24A20,20,0,0,0,44.73,120Zm56,0c10.84-.39,19.27-9.62,19.27-20.47v-47c0-10.85-8.43-20.08-19.27-20.47A20,20,0,0,0,80,52v48A20,20,0,0,0,100.73,120ZM176,52a20,20,0,0,0-20.73-20C144.43,32.4,136,41.63,136,52.48V72h36a4,4,0,0,0,4-4Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowFatLineRightFill">M132.94,231.39A8,8,0,0,1,128,224V184H72a8,8,0,0,1-8-8V80a8,8,0,0,1,8-8h56V32a8,8,0,0,1,13.66-5.66l96,96a8,8,0,0,1,0,11.32l-96,96A8,8,0,0,1,132.94,231.39ZM48,176V80a8,8,0,0,0-16,0v96a8,8,0,0,0,16,0Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.OptionFill">M216,40H40A16,16,0,0,0,24,56V200a16,16,0,0,0,16,16H216a16,16,0,0,0,16-16V56A16,16,0,0,0,216,40ZM200,176H152.94a15.92,15.92,0,0,1-14.31-8.84L103.06,96H56a8,8,0,0,1,0-16h47.06a15.92,15.92,0,0,1,14.31,8.84L152.94,160H200a8,8,0,0,1,0,16Zm0-80H152a8,8,0,0,1,0-16h48a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PizzaFill">M239.54,63a15.91,15.91,0,0,0-7.25-9.9,201.49,201.49,0,0,0-208.58,0,16,16,0,0,0-5.37,22l96,157.27a16,16,0,0,0,27.36,0l96-157.27A15.82,15.82,0,0,0,239.54,63Zm-55.1,68.53a40,40,0,0,0-41.38,67.77L128,224,96.5,172.43a40,40,0,1,0-41.35-67.76L48.8,94.26a152,152,0,0,1,158.39,0Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.TrashSimpleFill">M224,56a8,8,0,0,1-8,8h-8V208a16,16,0,0,1-16,16H64a16,16,0,0,1-16-16V64H40a8,8,0,0,1,0-16H216A8,8,0,0,1,224,56ZM88,32h80a8,8,0,0,0,0-16H88a8,8,0,0,0,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FolderUserFill">M231.73,221.94A8,8,0,0,1,224,232H160A8,8,0,0,1,152.27,222a40,40,0,0,1,17.11-23.33,32,32,0,1,1,45.24,0A40,40,0,0,1,231.73,221.94ZM232,88v32a8,8,0,0,1-16,0V88H40V200h80.56a8,8,0,0,1,0,16H39.38A15.4,15.4,0,0,1,24,200.62V56A16,16,0,0,1,40,40H92.69A15.86,15.86,0,0,1,104,44.69L131.31,72H216A16,16,0,0,1,232,88ZM108.69,72l-16-16H40V72Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.EyeFill">M247.31,124.76c-.35-.79-8.82-19.58-27.65-38.41C194.57,61.26,162.88,48,128,48S61.43,61.26,36.34,86.35C17.51,105.18,9,124,8.69,124.76a8,8,0,0,0,0,6.5c.35.79,8.82,19.57,27.65,38.4C61.43,194.74,93.12,208,128,208s66.57-13.26,91.66-38.34c18.83-18.83,27.3-37.61,27.65-38.4A8,8,0,0,0,247.31,124.76ZM128,168a40,40,0,1,1,40-40A40,40,0,0,1,128,168Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.TextStrikethroughFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM82.71,94.58C86,76.57,104.58,64,128,64c18.2,0,33.59,7.41,41.18,19.83a8,8,0,1,1-13.66,8.34C150.94,84.66,140.39,80,128,80c-15.3,0-27.73,7.33-29.55,17.42A8,8,0,0,1,90.59,104a7.76,7.76,0,0,1-1.43-.13A8,8,0,0,1,82.71,94.58ZM192,136H168.29A28.45,28.45,0,0,1,176,156c0,20.19-21.08,36-48,36-23.89,0-43.83-12.78-47.43-30.4a8,8,0,1,1,15.67-3.2c2,9.87,16,17.6,31.76,17.6,17.35,0,32-9.16,32-20,0-9.14-6.76-14.43-25.72-20H64a8,8,0,0,1,0-16H192a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.AlignLeftSimpleFill">M40,56V200a8,8,0,0,1-16,0V56a8,8,0,0,1,16,0ZM224,80H72A16,16,0,0,0,56,96v64a16,16,0,0,0,16,16H224a16,16,0,0,0,16-16V96A16,16,0,0,0,224,80Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.NumberCircleNineFill">M145.33,118l0,0A20,20,0,1,1,138,90.68,20,20,0,0,1,145.31,118ZM232,128A104,104,0,1,1,128,24,104.11,104.11,0,0,1,232,128ZM146,76.82A36,36,0,1,0,127.94,144q.94,0,1.89-.06l-16.7,28a8,8,0,0,0,2.77,11,8,8,0,0,0,11-2.77L159.18,126A36.05,36.05,0,0,0,146,76.82Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SealCheckFill">M225.86,102.82c-3.77-3.94-7.67-8-9.14-11.57-1.36-3.27-1.44-8.69-1.52-13.94-.15-9.76-.31-20.82-8-28.51s-18.75-7.85-28.51-8c-5.25-.08-10.67-.16-13.94-1.52-3.56-1.47-7.63-5.37-11.57-9.14C146.28,23.51,138.44,16,128,16s-18.27,7.51-25.18,14.14c-3.94,3.77-8,7.67-11.57,9.14C88,40.64,82.56,40.72,77.31,40.8c-9.76.15-20.82.31-28.51,8S41,67.55,40.8,77.31c-.08,5.25-.16,10.67-1.52,13.94-1.47,3.56-5.37,7.63-9.14,11.57C23.51,109.72,16,117.56,16,128s7.51,18.27,14.14,25.18c3.77,3.94,7.67,8,9.14,11.57,1.36,3.27,1.44,8.69,1.52,13.94.15,9.76.31,20.82,8,28.51s18.75,7.85,28.51,8c5.25.08,10.67.16,13.94,1.52,3.56,1.47,7.63,5.37,11.57,9.14C109.72,232.49,117.56,240,128,240s18.27-7.51,25.18-14.14c3.94-3.77,8-7.67,11.57-9.14,3.27-1.36,8.69-1.44,13.94-1.52,9.76-.15,20.82-.31,28.51-8s7.85-18.75,8-28.51c.08-5.25.16-10.67,1.52-13.94,1.47-3.56,5.37-7.63,9.14-11.57C232.49,146.28,240,138.44,240,128S232.49,109.73,225.86,102.82Zm-52.2,6.84-56,56a8,8,0,0,1-11.32,0l-24-24a8,8,0,0,1,11.32-11.32L112,148.69l50.34-50.35a8,8,0,0,1,11.32,11.32Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ClockUserFill">M136,72v43.06l36.42-18.22a8,8,0,1,1,7.16,14.32l-48,24A8,8,0,0,1,120,128V72a8,8,0,0,1,16,0Zm-8,144a88,88,0,1,1,88-88,8,8,0,0,0,16,0A104,104,0,1,0,128,232a8,8,0,0,0,0-16Zm86.62-17.38a32,32,0,1,0-45.24,0A40,40,0,0,0,152.27,222,8,8,0,0,0,160,232h64a8,8,0,0,0,7.73-10.06A40,40,0,0,0,214.62,198.62Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.UniteFill">M240,164a76,76,0,0,1-151.9,3.9,76,76,0,1,1,79.8-79.8A76.1,76.1,0,0,1,240,164Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.MegaphoneFill">M200,72H160.2c-2.91-.17-53.62-3.74-101.91-44.24A16,16,0,0,0,32,40V200a16,16,0,0,0,26.29,12.25c37.77-31.68,77-40.76,93.71-43.3v31.72A16,16,0,0,0,159.12,214l11,7.33A16,16,0,0,0,194.5,212l11.77-44.36A48,48,0,0,0,200,72ZM179,207.89l0,.11-11-7.33V168h21.6ZM200,152H168V88h32a32,32,0,1,1,0,64Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SpeakerHighFill">M160,32.25V223.69a8.29,8.29,0,0,1-3.91,7.18,8,8,0,0,1-9-.56l-65.57-51A4,4,0,0,1,80,176.16V79.84a4,4,0,0,1,1.55-3.15l65.57-51a8,8,0,0,1,10,.16A8.27,8.27,0,0,1,160,32.25ZM60,80H32A16,16,0,0,0,16,96v64a16,16,0,0,0,16,16H60a4,4,0,0,0,4-4V84A4,4,0,0,0,60,80Zm126.77,20.84a8,8,0,0,0-.72,11.3,24,24,0,0,1,0,31.72,8,8,0,1,0,12,10.58,40,40,0,0,0,0-52.88A8,8,0,0,0,186.74,100.84Zm40.89-26.17a8,8,0,1,0-11.92,10.66,64,64,0,0,1,0,85.34,8,8,0,1,0,11.92,10.66,80,80,0,0,0,0-106.66Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CameraRotateFill">M208,56H180.28L166.65,35.56A8,8,0,0,0,160,32H96a8,8,0,0,0-6.65,3.56L75.71,56H48A24,24,0,0,0,24,80V192a24,24,0,0,0,24,24H208a24,24,0,0,0,24-24V80A24,24,0,0,0,208,56ZM156.81,166.4A48.21,48.21,0,0,1,96,163.77V168a8,8,0,0,1-16,0V144a8,8,0,0,1,8-8h24a8,8,0,0,1,0,16h-5.15a32.12,32.12,0,0,0,40.34,1.61,8,8,0,0,1,9.62,12.79ZM176,120a8,8,0,0,1-8,8H144a8,8,0,0,1,0-16h5.15a32.12,32.12,0,0,0-40.34-1.61A8,8,0,0,1,99.19,97.6,48.21,48.21,0,0,1,160,100.23V96a8,8,0,0,1,16,0Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ShippingContainerFill">M236.4,70.65,130.2,40.31a8,8,0,0,0-3.33-.23L21.74,55.1A16.08,16.08,0,0,0,8,70.94V185.06A16.08,16.08,0,0,0,21.74,200.9l105.13,15A8.47,8.47,0,0,0,128,216a7.85,7.85,0,0,0,2.2-.31l106.2-30.34A16.07,16.07,0,0,0,248,170V86A16.07,16.07,0,0,0,236.4,70.65ZM64,120H48a8,8,0,0,0,0,16H64v54.78l-40-5.72V70.94l40-5.72Zm56,78.78-40-5.72V136H96a8,8,0,0,0,0-16H80V62.94l40-5.72Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.StarFill">M234.29,114.85l-45,38.83L203,211.75a16.4,16.4,0,0,1-24.5,17.82L128,198.49,77.47,229.57A16.4,16.4,0,0,1,53,211.75l13.76-58.07-45-38.83A16.46,16.46,0,0,1,31.08,86l59-4.76,22.76-55.08a16.36,16.36,0,0,1,30.27,0l22.75,55.08,59,4.76a16.46,16.46,0,0,1,9.37,28.86Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ScanFill">M224,40V80a8,8,0,0,1-16,0V48H176a8,8,0,0,1,0-16h40A8,8,0,0,1,224,40ZM80,208H48V176a8,8,0,0,0-16,0v40a8,8,0,0,0,8,8H80a8,8,0,0,0,0-16Zm136-40a8,8,0,0,0-8,8v32H176a8,8,0,0,0,0,16h40a8,8,0,0,0,8-8V176A8,8,0,0,0,216,168ZM40,88a8,8,0,0,0,8-8V48H80a8,8,0,0,0,0-16H40a8,8,0,0,0-8,8V80A8,8,0,0,0,40,88Zm32-8v96a8,8,0,0,0,8,8h96a8,8,0,0,0,8-8V80a8,8,0,0,0-8-8H80A8,8,0,0,0,72,80Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.JeepFill">M248,103.47A8.17,8.17,0,0,0,239.73,96H232a8,8,0,0,0-.18-1.68L221.18,44.65A16.08,16.08,0,0,0,205.53,32H50.47A16.08,16.08,0,0,0,34.82,44.65L24.18,94.32A8,8,0,0,0,24,96H16.27A8.17,8.17,0,0,0,8,103.47,8,8,0,0,0,16,112h8v88a16,16,0,0,0,16,16H64a16,16,0,0,0,16-16V184h20a4,4,0,0,0,4-4V128.27a8.17,8.17,0,0,1,7.47-8.25,8,8,0,0,1,8.53,8v52a4,4,0,0,0,4,4h8a4,4,0,0,0,4-4V128.27a8.17,8.17,0,0,1,7.47-8.25,8,8,0,0,1,8.53,8v52a4,4,0,0,0,4,4h20v16a16,16,0,0,0,16,16h24a16,16,0,0,0,16-16V112h8A8,8,0,0,0,248,103.47ZM68,144a12,12,0,1,1,12-12A12,12,0,0,1,68,144Zm120,0a12,12,0,1,1,12-12A12,12,0,0,1,188,144ZM40.18,96,50.47,48H205.53l10.29,48Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.MapPinSimpleLineFill">M224,216a8,8,0,0,1-8,8H40a8,8,0,0,1,0-16h80V135.42a56,56,0,1,1,16,0V208h80A8,8,0,0,1,224,216Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ChurchFill">M228.12,145.14,192,123.47V104a8,8,0,0,0-4-7L136,67.36V48h16a8,8,0,0,0,0-16H136V16a8,8,0,0,0-16,0V32H104a8,8,0,0,0,0,16h16V67.36L68,97.05a8,8,0,0,0-4,7v19.47L27.88,145.14A8,8,0,0,0,24,152v64a8,8,0,0,0,8,8h72a8,8,0,0,0,8-8V168a16,16,0,0,1,32,0v48a8,8,0,0,0,8,8h72a8,8,0,0,0,8-8V152A8,8,0,0,0,228.12,145.14ZM64,208H40V156.53l24-14.4Zm152,0H192V142.13l24,14.4Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ShieldSlashFill">M224,56v56c0,25.24-5.85,45.72-14.3,62.14a4,4,0,0,1-6.53.87L86.52,46.69a4,4,0,0,1,3-6.69H208A16,16,0,0,1,224,56ZM53.92,34.62A8,8,0,0,0,40.26,42,16,16,0,0,0,32,56v56c0,52.72,25.52,84.67,46.93,102.19,23.06,18.86,46,25.27,47,25.53a8,8,0,0,0,4.2,0c1-.26,23.91-6.67,47-25.53A131.92,131.92,0,0,0,187.18,205l14.9,16.38a8,8,0,1,0,11.84-10.76Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.TildeFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32Zm-10,99.66c-13.19,15-25.34,20.29-36.37,20.29-14.94,0-27.81-9.61-38.43-17.54-19.2-14.34-31.89-23.81-53.2.48a8,8,0,1,1-12-10.55c31.05-35.41,56.34-16.53,74.8-2.75,19.2,14.34,31.89,23.81,53.2-.48a8,8,0,1,1,12,10.55Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CodeSimpleFill">M216,40H40A16,16,0,0,0,24,56V200a16,16,0,0,0,16,16H216a16,16,0,0,0,16-16V56A16,16,0,0,0,216,40ZM101.66,162.34a8,8,0,0,1-11.32,11.32l-40-40a8,8,0,0,1,0-11.32l40-40a8,8,0,0,1,11.32,11.32L67.31,128Zm104-28.68-40,40a8,8,0,0,1-11.32-11.32L188.69,128,154.34,93.66a8,8,0,0,1,11.32-11.32l40,40A8,8,0,0,1,205.66,133.66Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BooksFill">M231.65,194.55,198.46,36.75a16,16,0,0,0-19-12.39L132.65,34.42a16.08,16.08,0,0,0-12.3,19l33.19,157.8A16,16,0,0,0,169.16,224a16.25,16.25,0,0,0,3.38-.36l46.81-10.06A16.09,16.09,0,0,0,231.65,194.55ZM136,50.15c0-.06,0-.09,0-.09l46.8-10,3.33,15.87L139.33,66Zm10,47.38-3.35-15.9,46.82-10.06,3.34,15.9Zm70,100.41-46.8,10-3.33-15.87L212.67,182,216,197.85C216,197.91,216,197.94,216,197.94ZM104,32H56A16,16,0,0,0,40,48V208a16,16,0,0,0,16,16h48a16,16,0,0,0,16-16V48A16,16,0,0,0,104,32ZM56,48h48V64H56Zm48,160H56V192h48v16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowFatLinesDownFill">M229.66,141.66l-96,96a8,8,0,0,1-11.32,0l-96-96A8,8,0,0,1,32,128H72V104a8,8,0,0,1,8-8h96a8,8,0,0,1,8,8v24h40a8,8,0,0,1,5.66,13.66ZM184,40a8,8,0,0,0-8-8H80a8,8,0,0,0,0,16h96A8,8,0,0,0,184,40Zm0,32a8,8,0,0,0-8-8H80a8,8,0,0,0,0,16h96A8,8,0,0,0,184,72Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SubtractSquareFill">M216,88H168V40a8,8,0,0,0-8-8H40a8,8,0,0,0-8,8V160a8,8,0,0,0,8,8H88v48a8,8,0,0,0,8,8H216a8,8,0,0,0,8-8V96A8,8,0,0,0,216,88ZM48,48H152V152H48Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PopsicleFill">M128,8A72.08,72.08,0,0,0,56,80v96a16,16,0,0,0,16,16h32v40a24,24,0,0,0,48,0V192h32a16,16,0,0,0,16-16V80A72.08,72.08,0,0,0,128,8ZM112,152a8,8,0,0,1-16,0V72a8,8,0,0,1,16,0Zm24,80a8,8,0,0,1-16,0V192h16Zm24-80a8,8,0,0,1-16,0V72a8,8,0,0,1,16,0Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.IntersectionFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM184,176a8,8,0,0,1-16,0V120a40,40,0,0,0-80,0v56a8,8,0,0,1-16,0V120a56,56,0,0,1,112,0Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowElbowDownLeftFill">M200,32V176a8,8,0,0,1-8,8H104v40a8,8,0,0,1-13.66,5.66l-48-48a8,8,0,0,1,0-11.32l48-48A8,8,0,0,1,104,128v40h80V32a8,8,0,0,1,16,0Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.UserCircleGearFill">M228.25,63.07l-4.66-2.69a23.6,23.6,0,0,0,0-8.76l4.66-2.69a8,8,0,0,0-8-13.86l-4.67,2.7A23.92,23.92,0,0,0,208,33.38V28a8,8,0,0,0-16,0v5.38a23.92,23.92,0,0,0-7.58,4.39l-4.67-2.7a8,8,0,1,0-8,13.86l4.66,2.69a23.6,23.6,0,0,0,0,8.76l-4.66,2.69a8,8,0,0,0,4,14.93,7.92,7.92,0,0,0,4-1.07l4.67-2.7A23.92,23.92,0,0,0,192,78.62V84a8,8,0,0,0,16,0V78.62a23.92,23.92,0,0,0,7.58-4.39l4.67,2.7a7.92,7.92,0,0,0,4,1.07,8,8,0,0,0,4-14.93ZM200,64a8,8,0,1,1,8-8A8,8,0,0,1,200,64ZM128,76a44,44,0,1,1-44,44A44,44,0,0,1,128,76Zm102.56,34.68a103.92,103.92,0,1,1-85.24-85.24,8,8,0,0,1-2.64,15.78A88.07,88.07,0,0,0,40,128a87.62,87.62,0,0,0,22.24,58.41A79.71,79.71,0,0,1,84,165.1a4,4,0,0,1,4.83.32,59.81,59.81,0,0,0,78.27,0,4,4,0,0,1,4.84-.32,79.86,79.86,0,0,1,21.79,21.31A87.62,87.62,0,0,0,216,128a88.85,88.85,0,0,0-1.22-14.68,8,8,0,1,1,15.78-2.64Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.YarnFill">M69.4,144.89a220.94,220.94,0,0,0-18.77,42.6,4,4,0,0,1-7,1.19,103.44,103.44,0,0,1-18.83-48.11,4,4,0,0,1,4.13-4.47A119,119,0,0,1,69.4,144.89ZM44,77.14a180.06,180.06,0,0,1,63,19.12,226.9,226.9,0,0,1,22.6-19.49,206.42,206.42,0,0,0-69.28-25.6,4,4,0,0,0-3.42,1A105.3,105.3,0,0,0,41.08,71,4,4,0,0,0,44,77.14ZM239.58,221.35A7.91,7.91,0,0,0,232,216H183.36A104.25,104.25,0,0,0,230.25,147a4,4,0,0,0-5.27-4.52A120.6,120.6,0,0,0,150.88,216H134a136.55,136.55,0,0,1,94.78-91.37,4,4,0,0,0,2.92-4.15,102.59,102.59,0,0,0-3.58-20.56,4,4,0,0,0-4.89-2.8A164.53,164.53,0,0,0,103,225a4,4,0,0,0,3.08,4.69A103.9,103.9,0,0,0,128,232h0l104,0A8,8,0,0,0,239.58,221.35Zm-211-101.27a134.51,134.51,0,0,1,49.39,11A224.44,224.44,0,0,1,95.52,108.4,164.28,164.28,0,0,0,33.36,92.28a4,4,0,0,0-4,2.75,103,103,0,0,0-4.63,20.61A4,4,0,0,0,28.57,120.08ZM85.84,40.66A222.81,222.81,0,0,1,144,66.8a221.3,221.3,0,0,1,38.8-19.67,4,4,0,0,0,.7-7.08,103.86,103.86,0,0,0-98.2-6.85A4,4,0,0,0,85.84,40.66ZM216,82.51a4,4,0,0,0,2.4-5.87,105,105,0,0,0-12.82-17.81,4,4,0,0,0-4.21-1.19A208.81,208.81,0,0,0,62.21,205.51a4,4,0,0,0,1.44,4.13A104.25,104.25,0,0,0,82.2,221.36a4,4,0,0,0,5.71-2.75A180.61,180.61,0,0,1,216,82.51Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CigaretteFill">M224,128H32a16,16,0,0,0-16,16v32a16,16,0,0,0,16,16H224a16,16,0,0,0,16-16V144A16,16,0,0,0,224,128Zm0,48H96V144H224v32ZM201,60.08c8-14.23,7.42-21.71,6.36-24.91a7.79,7.79,0,0,0-2.64-3.86,8,8,0,1,1,6.5-14.62,22.57,22.57,0,0,1,11.32,13.44c3.36,10.14.81,22.85-7.6,37.79-8,14.23-7.42,21.72-6.36,24.92a7.79,7.79,0,0,0,2.64,3.85,8,8,0,1,1-6.5,14.62,22.53,22.53,0,0,1-11.32-13.44C190.07,87.73,192.62,75,201,60.08Zm-40,0c8-14.23,7.42-21.71,6.36-24.91a7.79,7.79,0,0,0-2.64-3.86,8,8,0,1,1,6.5-14.62,22.57,22.57,0,0,1,11.32,13.44c3.36,10.14.81,22.85-7.6,37.79-8,14.23-7.42,21.72-6.36,24.92a7.79,7.79,0,0,0,2.64,3.85,8,8,0,1,1-6.5,14.62,22.53,22.53,0,0,1-11.32-13.44C150.07,87.73,152.62,75,161,60.08Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.MinusCircleFill">M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24Zm40,112H88a8,8,0,0,1,0-16h80a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CaretDoubleRightFill">M221.66,122.34l-80-80A8,8,0,0,0,128,48v60.69L61.66,42.34A8,8,0,0,0,48,48V208a8,8,0,0,0,13.66,5.66L128,147.31V208a8,8,0,0,0,13.66,5.66l80-80A8,8,0,0,0,221.66,122.34Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FunnelSimpleXFill">M216,40H40A16,16,0,0,0,24,56V200a16,16,0,0,0,16,16H216a16,16,0,0,0,16-16V56A16,16,0,0,0,216,40ZM72,128a8,8,0,0,1,8-8h96a8,8,0,0,1,0,16H80A8,8,0,0,1,72,128Zm56,48H112a8,8,0,0,1,0-16h16a8,8,0,0,1,0,16Zm69.66,10.34a8,8,0,0,1-11.32,11.32L176,187.31l-10.34,10.35a8,8,0,0,1-11.32-11.32L164.69,176l-10.35-10.34a8,8,0,0,1,11.32-11.32L176,164.69l10.34-10.35a8,8,0,0,1,11.32,11.32L187.31,176ZM208,96H48a8,8,0,0,1,0-16H208a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowFatLineLeftFill">M114.34,229.66l-96-96a8,8,0,0,1,0-11.32l96-96A8,8,0,0,1,128,32V72h56a8,8,0,0,1,8,8v96a8,8,0,0,1-8,8H128v40a8,8,0,0,1-13.66,5.66ZM216,184a8,8,0,0,0,8-8V80a8,8,0,0,0-16,0v96A8,8,0,0,0,216,184Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.RabbitFill">M199.28,149.8A71.58,71.58,0,0,0,193,129c19-37.94,30.45-88.28,17.34-110A22,22,0,0,0,190.94,8c-14.12,0-26,11.89-36.44,36.36-6.22,14.62-10.85,31.32-14,44.74a71.8,71.8,0,0,0-25,0c-3.13-13.42-7.76-30.12-14-44.74C91.1,19.89,79.18,8,65.06,8A22,22,0,0,0,45.64,19.08C32.53,40.76,44,91.1,63,129a71.58,71.58,0,0,0-6.26,20.76A52,52,0,1,0,128,225.52l-21.12-19.37a8,8,0,1,1,10.24-12.3L128,202.9l10.88-9.05a8,8,0,0,1,10.24,12.3L128,225.52a52,52,0,1,0,71.28-75.72Zm-126-36.53A218.45,218.45,0,0,1,58.4,67.08c-3.49-18.13-3.15-33,.93-39.72A6,6,0,0,1,65.06,24c6.61,0,14.52,9.7,21.72,26.62,5.93,13.94,10.35,30.12,13.33,43a71.72,71.72,0,0,0-26.88,19.64ZM100,176a12,12,0,1,1,12-12A12,12,0,0,1,100,176Zm56,0a12,12,0,1,1,12-12A12,12,0,0,1,156,176Zm20.55-69.17a71.89,71.89,0,0,0-20.66-13.2c3-12.89,7.4-29.07,13.33-43C176.42,33.7,184.33,24,190.94,24a6,6,0,0,1,5.73,3.36c4.08,6.74,4.42,21.59.93,39.72a218.45,218.45,0,0,1-14.83,46.19A72.6,72.6,0,0,0,176.55,106.83Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FrameCornersFill">M216,40H40A16,16,0,0,0,24,56V200a16,16,0,0,0,16,16H216a16,16,0,0,0,16-16V56A16,16,0,0,0,216,40ZM88,192H56a8,8,0,0,1-8-8V152a8,8,0,0,1,16,0v24H88a8,8,0,0,1,0,16Zm120-88a8,8,0,0,1-16,0V80H168a8,8,0,0,1,0-16h32a8,8,0,0,1,8,8Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CurrencyDollarSimpleFill">M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24Zm16,160h-8v8a8,8,0,0,1-16,0v-8h-8a32,32,0,0,1-32-32,8,8,0,0,1,16,0,16,16,0,0,0,16,16h32a16,16,0,0,0,0-32H116a32,32,0,0,1,0-64h4V64a8,8,0,0,1,16,0v8h4a32,32,0,0,1,32,32,8,8,0,0,1-16,0,16,16,0,0,0-16-16H116a16,16,0,0,0,0,32h28a32,32,0,0,1,0,64Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.WifiNoneFill">M247.89,80.91a15.93,15.93,0,0,0-6.17-10.81A186.67,186.67,0,0,0,128,32,186.67,186.67,0,0,0,14.28,70.1,15.93,15.93,0,0,0,8.11,80.91,15.65,15.65,0,0,0,11.65,92.8l104,125.43A15.93,15.93,0,0,0,128,224h0a15.93,15.93,0,0,0,12.31-5.77h0l104-125.43A15.65,15.65,0,0,0,247.89,80.91ZM128,208,24.09,82.74A170.76,170.76,0,0,1,128,48,170.76,170.76,0,0,1,231.91,82.74Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.HandSoapFill">M184,96.8V88a32,32,0,0,0-32-32H136V32h32a8,8,0,0,1,8,8,8,8,0,0,0,16,0,24,24,0,0,0-24-24H104a8,8,0,0,0,0,16h16V56H104A32,32,0,0,0,72,88v8.8A40.07,40.07,0,0,0,40,136v80a16,16,0,0,0,16,16H200a16,16,0,0,0,16-16V136A40.07,40.07,0,0,0,184,96.8ZM104,72h48a16,16,0,0,1,16,16v8H88V88A16,16,0,0,1,104,72Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CampfireFill">M132.19,25.19a8,8,0,0,0-8.38,0A156,156,0,0,0,96.24,48C77.77,67.13,68,87.9,68,108a60,60,0,0,0,120,0C188,60.08,134.47,26.59,132.19,25.19ZM128,152a24,24,0,0,1-24-24c0-24,24-40,24-40s24,16,24,40A24,24,0,0,1,128,152Zm95.62,74.42a8,8,0,0,1-10.05,5.2L128,204.39,42.43,231.62a8,8,0,1,1-4.85-15.25l64-20.37-64-20.38a8,8,0,1,1,4.85-15.24L128,187.6l85.57-27.22a8,8,0,1,1,4.85,15.24l-64,20.38,64,20.37A8,8,0,0,1,223.62,226.42Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PackageFill">M223.68,66.15,135.68,18a15.88,15.88,0,0,0-15.36,0l-88,48.17a16,16,0,0,0-8.32,14v95.64a16,16,0,0,0,8.32,14l88,48.17a15.88,15.88,0,0,0,15.36,0l88-48.17a16,16,0,0,0,8.32-14V80.18A16,16,0,0,0,223.68,66.15ZM128,32l80.35,44L178.57,92.29l-80.35-44Zm0,88L47.65,76,81.56,57.43l80.35,44Zm88,55.85h0l-80,43.79V133.83l32-17.51V152a8,8,0,0,0,16,0V107.56l32-17.51v85.76Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BulldozerFill">M248,200h-8a8,8,0,0,1-8-8V160a8,8,0,0,1,8-8h8a8,8,0,0,0,0-16h-8a24,24,0,0,0-24,24v8H199.2a40.1,40.1,0,0,0-33.71-31.61L129.44,49.85A16,16,0,0,0,114.67,40H24A16,16,0,0,0,8,56v96a40,40,0,0,0,32,64H160a40.07,40.07,0,0,0,39.2-32H216v8a24,24,0,0,0,24,24h8a8,8,0,0,0,0-16ZM64,56h50.67L148,136H64ZM24,56H48v80H40a39.72,39.72,0,0,0-16,3.35ZM160,184H40a8,8,0,0,1,0-16H160a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ShuffleSimpleFill">M216,48V88a8,8,0,0,1-13.66,5.66L188,79.31,156.28,111A8,8,0,0,1,145,99.72L176.69,68,162.34,53.66A8,8,0,0,1,168,40h40A8,8,0,0,1,216,48Zm-4.94,112.61a8,8,0,0,0-8.72,1.73L188,176.69,53.66,42.34A8,8,0,0,0,42.34,53.66L176.69,188l-14.35,14.34A8,8,0,0,0,168,216h40a8,8,0,0,0,8-8V168A8,8,0,0,0,211.06,160.61ZM99.72,145,42.34,202.34a8,8,0,0,0,11.32,11.32L111,156.28A8,8,0,0,0,99.72,145Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BeanieFill">M224,162.16V144a96.18,96.18,0,0,0-72.34-93,28,28,0,1,0-47.32,0A96.18,96.18,0,0,0,32,144v18.16A16,16,0,0,0,24,176v32a16,16,0,0,0,16,16H216a16,16,0,0,0,16-16V176A16,16,0,0,0,224,162.16ZM120,176v32H80V176Zm16,0h40v32H136ZM116,36a12,12,0,1,1,12,12A12,12,0,0,1,116,36ZM40,176H64v32H40Zm176,32H192V176h24v32Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.HandbagSimpleFill">M239.89,198.12l-14.26-120a16,16,0,0,0-16-14.12H176a48,48,0,0,0-96,0H46.33a16,16,0,0,0-16,14.12l-14.26,120A16,16,0,0,0,20,210.6a16.13,16.13,0,0,0,12,5.4H223.92A16.13,16.13,0,0,0,236,210.6,16,16,0,0,0,239.89,198.12ZM128,32a32,32,0,0,1,32,32H96A32,32,0,0,1,128,32Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SelectionAllFill">M104,40a8,8,0,0,1,8-8h32a8,8,0,0,1,0,16H112A8,8,0,0,1,104,40Zm40,168H112a8,8,0,0,0,0,16h32a8,8,0,0,0,0-16ZM208,32H184a8,8,0,0,0,0,16h24V72a8,8,0,0,0,16,0V48A16,16,0,0,0,208,32Zm8,72a8,8,0,0,0-8,8v32a8,8,0,0,0,16,0V112A8,8,0,0,0,216,104Zm0,72a8,8,0,0,0-8,8v24H184a8,8,0,0,0,0,16h24a16,16,0,0,0,16-16V184A8,8,0,0,0,216,176ZM40,152a8,8,0,0,0,8-8V112a8,8,0,0,0-16,0v32A8,8,0,0,0,40,152Zm32,56H48V184a8,8,0,0,0-16,0v24a16,16,0,0,0,16,16H72a8,8,0,0,0,0-16ZM40,80a8,8,0,0,0,8-8V48H72a8,8,0,0,0,0-16H48A16,16,0,0,0,32,48V72A8,8,0,0,0,40,80Zm144,96V80a8,8,0,0,0-8-8H80a8,8,0,0,0-8,8v96a8,8,0,0,0,8,8h96A8,8,0,0,0,184,176Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.AddressBookFill">M160,112a24,24,0,1,1-24-24A24,24,0,0,1,160,112Zm64-72V216a16,16,0,0,1-16,16H64a16,16,0,0,1-16-16V192H32a8,8,0,0,1,0-16H48V136H32a8,8,0,0,1,0-16H48V80H32a8,8,0,0,1,0-16H48V40A16,16,0,0,1,64,24H208A16,16,0,0,1,224,40ZM190.4,163.2A67.88,67.88,0,0,0,163,141.51a40,40,0,1,0-53.94,0A67.88,67.88,0,0,0,81.6,163.2a8,8,0,1,0,12.8,9.6,52,52,0,0,1,83.2,0,8,8,0,1,0,12.8-9.6Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ChampagneFill">M149.91,13.53A8,8,0,0,0,142.3,8H97.71a8,8,0,0,0-7.61,5.53,451,451,0,0,0-14.21,59.7c-7.26,44.25-4.35,75.76,8.65,93.66A40,40,0,0,0,112,183.42V232H96a8,8,0,1,0,0,16h48a8,8,0,0,0,0-16H128V183.42a39.94,39.94,0,0,0,27.46-16.53c13-17.9,15.92-49.41,8.66-93.66A451,451,0,0,0,149.91,13.53ZM93.8,64c3-15.58,6.73-29.81,9.79-40h32.83c3.06,10.19,6.77,24.42,9.8,40ZM232,52a12,12,0,1,1-12-12A12,12,0,0,1,232,52ZM184,20a12,12,0,1,1,12,12A12,12,0,0,1,184,20Zm24,80a12,12,0,1,1-12-12A12,12,0,0,1,208,100Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ApplePodcastsLogoFill">M159.8,151.82a19.67,19.67,0,0,1,3.58,17.05l-12.18,48A20.17,20.17,0,0,1,131.56,232h-7.12a20.17,20.17,0,0,1-19.64-15.13l-12.18-48a19.67,19.67,0,0,1,3.58-17.05,20.17,20.17,0,0,1,16-7.82h31.5A20.17,20.17,0,0,1,159.8,151.82ZM156,116a28,28,0,1,0-28,28A28,28,0,0,0,156,116Zm26,27a8,8,0,1,0,15.41,4.29,72,72,0,1,0-138.74,0A8,8,0,0,0,74,143,56,56,0,1,1,182,143ZM128,24A104,104,0,0,0,70.18,214.46a8,8,0,1,0,8.9-13.3,88,88,0,1,1,97.84,0,8,8,0,0,0,8.9,13.3A104,104,0,0,0,128,24Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PlugsConnectedFill">M88.57,35A8,8,0,0,1,103.43,29l8,20A8,8,0,0,1,96.57,55ZM29,103.43l20,8A8,8,0,1,0,55,96.57l-20-8A8,8,0,0,0,29,103.43ZM227,152.57l-20-8A8,8,0,1,0,201,159.43l20,8A8,8,0,0,0,227,152.57ZM159.43,201A8,8,0,0,0,144.57,207l8,20A8,8,0,1,0,167.43,221ZM237.91,18.52a8,8,0,0,0-11.5-.18L174,70.75l-5.38-5.38a32,32,0,0,0-45.28,0L106.14,82.54a4,4,0,0,0,0,5.66l61.7,61.66a4,4,0,0,0,5.66,0l16.74-16.74a32.76,32.76,0,0,0,9.81-22.52,31.82,31.82,0,0,0-9.37-23.17l-5.38-5.37,52.2-52.17A8.22,8.22,0,0,0,237.91,18.52ZM85.64,90.34a8,8,0,0,0-11.49.18,8.22,8.22,0,0,0,.41,11.37L80.67,108,65.34,123.31A31.82,31.82,0,0,0,56,146.47,32.75,32.75,0,0,0,65.77,169l5,4.94L18.49,226.13a8.21,8.21,0,0,0-.61,11.1,8,8,0,0,0,11.72.43L82,185.25l5.37,5.38a32.1,32.1,0,0,0,45.29,0L148,175.31l6.34,6.35a8,8,0,0,0,11.32-11.32Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.MarkerCircleFill">M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24Zm40,182.37a87.89,87.89,0,0,1-80,0V176h80ZM104,160V144h48v16Zm80,35.83V176a16,16,0,0,0-16-16V144a16,16,0,0,0-13.61-15.8L143.66,76.74a16,16,0,0,0-31.32,0L101.61,128.2A16,16,0,0,0,88,144v16a16,16,0,0,0-16,16v19.83a88,88,0,1,1,112,0Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ToolboxFill">M224,64H176V56a24,24,0,0,0-24-24H104A24,24,0,0,0,80,56v8H32A16,16,0,0,0,16,80v28a4,4,0,0,0,4,4H64V96.27A8.17,8.17,0,0,1,71.47,88,8,8,0,0,1,80,96v16h96V96.27A8.17,8.17,0,0,1,183.47,88,8,8,0,0,1,192,96v16h44a4,4,0,0,0,4-4V80A16,16,0,0,0,224,64Zm-64,0H96V56a8,8,0,0,1,8-8h48a8,8,0,0,1,8,8Zm80,68v60a16,16,0,0,1-16,16H32a16,16,0,0,1-16-16V132a4,4,0,0,1,4-4H64v16a8,8,0,0,0,8.53,8A8.17,8.17,0,0,0,80,143.73V128h96v16a8,8,0,0,0,8.53,8,8.17,8.17,0,0,0,7.47-8.25V128h44A4,4,0,0,1,240,132Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FinnTheHumanFill">M176,148a12,12,0,1,1-12-12A12,12,0,0,1,176,148ZM92,136a12,12,0,1,0,12,12A12,12,0,0,0,92,136ZM240,72v80a72.08,72.08,0,0,1-72,72H88a72.08,72.08,0,0,1-72-72V72a32,32,0,0,1,63-8h98a32,32,0,0,1,63,8Zm-40,72a32,32,0,0,0-32-32H88a32,32,0,0,0-32,32v8a32,32,0,0,0,32,32h80a32,32,0,0,0,32-32Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.HandPalmFill">M216,104v48a88,88,0,0,1-176,0V64a16,16,0,0,1,32,0v56a8,8,0,0,0,16,0V32a16,16,0,0,1,32,0v80a8,8,0,0,0,16,0V48a16,16,0,0,1,32,0v80.67A48.08,48.08,0,0,0,128,176a8,8,0,0,0,16,0,32,32,0,0,1,32-32,8,8,0,0,0,8-8V104a16,16,0,0,1,32,0Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PinwheelFill">M229.66,218.34l-48.42-48.41c1.1-.33,2.19-.68,3.27-1.07A60,60,0,0,0,220.37,92a8,8,0,0,0-10.25-4.78l-44.2,16.08c.32-.62.64-1.24.93-1.88A60,60,0,0,0,92,19.65,8,8,0,0,0,87.18,29.9l16.09,44.22c-.63-.32-1.25-.65-1.89-1a60,60,0,0,0-81.73,74.89,8,8,0,0,0,10.25,4.78l44.2-16.09c-.32.63-.64,1.25-.93,1.89a60,60,0,0,0,74.89,81.73,8,8,0,0,0,4.78-10.25l-16.08-44.18c.62.31,1.24.62,1.88.91a59.87,59.87,0,0,0,22.48,5.58l57.22,57.23a8,8,0,0,0,11.32-11.32ZM109,203.87a44,44,0,0,1-3.73-77.81l29.6,81.33A43.6,43.6,0,0,1,109,203.87Zm43.4-109.25A43.77,43.77,0,0,1,134.8,114L105.19,32.63a44,44,0,0,1,47.16,62Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FigmaLogoFill">M192,96a40,40,0,0,0-24-72H96A40,40,0,0,0,72,96a40,40,0,0,0,1.37,65A44,44,0,1,0,144,196V160a40,40,0,1,0,48-64Zm-64,56H96a24,24,0,0,1,0-48h32Zm40-64H144V40h24a24,24,0,0,1,0,48Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CursorFill">M220.49,207.8,207.8,220.49a12,12,0,0,1-17,0l-56.57-56.57L115,214.08l-.13.33A15.84,15.84,0,0,1,100.26,224l-.78,0a15.82,15.82,0,0,1-14.41-11L32.8,52.92A15.95,15.95,0,0,1,52.92,32.8L213,85.07a16,16,0,0,1,1.41,29.8l-.33.13-50.16,19.27,56.57,56.56A12,12,0,0,1,220.49,207.8Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SplitVerticalFill">M216,152a8,8,0,0,1-8,8H136v32h24a8,8,0,0,1,5.66,13.66l-32,32a8,8,0,0,1-11.32,0l-32-32A8,8,0,0,1,96,192h24V160H48a8,8,0,0,1,0-16H208A8,8,0,0,1,216,152ZM48,112H208a8,8,0,0,0,0-16H136V64h24a8,8,0,0,0,5.66-13.66l-32-32a8,8,0,0,0-11.32,0l-32,32A8,8,0,0,0,96,64h24V96H48a8,8,0,0,0,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SteamLogoFill">M231.92,132.11c-2.09,54-45.83,97.72-99.81,99.81A104.06,104.06,0,0,1,25.6,109.76a4,4,0,0,1,6.77-2.08l43,43a28,28,0,0,0,42.42,34.92l61.1-49.84a36,36,0,1,0-50.71-50.65l-43,52.74L35,87.67a4,4,0,0,1-.76-4.6,104,104,0,0,1,197.7,49ZM121.58,118.55,90.77,156.33A11.83,11.83,0,0,0,88,163.19,12.19,12.19,0,0,0,99.85,176a11.84,11.84,0,0,0,7.78-2.74l0,0,37.78-30.81A36.18,36.18,0,0,1,121.58,118.55ZM175.9,110A20,20,0,1,0,158,127.9,20,20,0,0,0,175.9,110Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FileImageFill">M158.66,219.56A8,8,0,0,1,152,232H24a8,8,0,0,1-6.73-12.33l36-56a8,8,0,0,1,13.46,0l9.76,15.18,20.85-31.29a8,8,0,0,1,13.32,0ZM216,88V216a16,16,0,0,1-16,16h-8a8,8,0,0,1,0-16h8V96H152a8,8,0,0,1-8-8V40H56v88a8,8,0,0,1-16,0V40A16,16,0,0,1,56,24h96a8,8,0,0,1,5.66,2.34l56,56A8,8,0,0,1,216,88Zm-56-8h28.69L160,51.31Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.HandArrowDownFill">M230.33,141.06a24.4,24.4,0,0,0-21.24-4.23l-41.84,9.62A28,28,0,0,0,140,112H89.94a31.82,31.82,0,0,0-22.63,9.37L44.69,144H16A16,16,0,0,0,0,160v40a16,16,0,0,0,16,16H120a7.93,7.93,0,0,0,1.94-.24l64-16a6.94,6.94,0,0,0,1.19-.4L226,182.82l.44-.2a24.6,24.6,0,0,0,3.93-41.56Zm-10.9,27.15-38,16.18L119,200H56V155.31l22.63-22.62A15.86,15.86,0,0,1,89.94,128H140a12,12,0,0,1,0,24H112a8,8,0,0,0,0,16h32a8.32,8.32,0,0,0,1.79-.2l67-15.41.31-.08a8.6,8.6,0,0,1,6.3,15.9ZM154.34,77.66a8,8,0,0,1,11.32-11.32L184,84.69V24a8,8,0,0,1,16,0V84.69l18.34-18.35a8,8,0,0,1,11.32,11.32l-32,32a8,8,0,0,1-11.32,0Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CloudLightningFill">M156,168H132.53l-14.4,24H144a8,8,0,0,1,6.86,12.12l-24,40a8,8,0,0,1-13.72-8.24L129.87,208H104a8,8,0,0,1-6.86-12.12L113.87,168h-37C48.12,168,24.2,145.07,24,116.36A52.09,52.09,0,0,1,61.35,66.1a4,4,0,0,1,5,4.78A92.48,92.48,0,0,0,64,87.39,8.14,8.14,0,0,0,71.41,96l.6,0a8.18,8.18,0,0,0,8.08-7.72A76,76,0,1,1,156,168Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.StandardDefinitionFill">M192,128a32,32,0,0,1-32,32h-8V96h8A32,32,0,0,1,192,128Zm40-72V200a16,16,0,0,1-16,16H40a16,16,0,0,1-16-16V56A16,16,0,0,1,40,40H216A16,16,0,0,1,232,56ZM120,148c0-19.88-19.92-25.35-34.47-29.34-12.06-3.31-20-5.84-20-10.66,0-6.73,8.1-12,18.44-12,8,0,14.85,3.13,17.42,8a8,8,0,1,0,14.13-7.51C110.16,86.31,98.07,80,84,80c-19.64,0-34.44,12-34.44,28,0,17.38,17.6,22.21,31.74,26.09,16,4.39,22.7,7.3,22.7,13.91,0,5.68-8.21,12-20,12s-20-6.32-20-12a8,8,0,0,0-16,0c0,15.7,15.81,28,36,28S120,163.7,120,148Zm88-20a48.05,48.05,0,0,0-48-48H144a8,8,0,0,0-8,8v80a8,8,0,0,0,8,8h16A48.05,48.05,0,0,0,208,128Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SuitcaseRollingFill">M192,48H168V24A24,24,0,0,0,144,0H112A24,24,0,0,0,88,24V48H64A16,16,0,0,0,48,64V208a16,16,0,0,0,16,16H80v16a8,8,0,0,0,16,0V224h64v16a8,8,0,0,0,16,0V224h16a16,16,0,0,0,16-16V64A16,16,0,0,0,192,48ZM96,192a8,8,0,0,1-16,0V80a8,8,0,0,1,16,0Zm40,0a8,8,0,0,1-16,0V80a8,8,0,0,1,16,0ZM152,48H104V24a8,8,0,0,1,8-8h32a8,8,0,0,1,8,8Zm24,144a8,8,0,0,1-16,0V80a8,8,0,0,1,16,0Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.NumberZeroFill">M157.68,88.39C164.34,98.52,168,112.59,168,128s-3.66,29.47-10.32,39.61C150.55,178.49,140.56,184,128,184s-22.55-5.51-29.68-16.39C91.66,157.47,88,143.41,88,128s3.66-29.48,10.32-39.61C105.45,77.51,115.44,72,128,72S150.55,77.51,157.68,88.39ZM216,40V216a16,16,0,0,1-16,16H56a16,16,0,0,1-16-16V40A16,16,0,0,1,56,24H200A16,16,0,0,1,216,40Zm-32,88c0-18.49-4.6-35.68-12.94-48.39C160.92,64.16,146,56,128,56S95.08,64.16,84.94,79.61C76.6,92.32,72,109.51,72,128s4.6,35.68,12.94,48.39C95.08,191.84,110,200,128,200s32.92-8.16,43.06-23.61C179.4,163.68,184,146.49,184,128Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ShieldWarningFill">M208,40H48A16,16,0,0,0,32,56v56c0,52.72,25.52,84.67,46.93,102.19,23.06,18.86,46,25.27,47,25.53a8,8,0,0,0,4.2,0c1-.26,23.91-6.67,47-25.53C198.48,196.67,224,164.72,224,112V56A16,16,0,0,0,208,40ZM120,96a8,8,0,0,1,16,0v40a8,8,0,0,1-16,0Zm8,88a12,12,0,1,1,12-12A12,12,0,0,1,128,184Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CaretCircleDownFill">M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24Zm45.66,93.66-40,40a8,8,0,0,1-11.32,0l-40-40a8,8,0,0,1,11.32-11.32L128,140.69l34.34-34.35a8,8,0,0,1,11.32,11.32Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.TextSuperscriptFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM126.55,179.41a8,8,0,1,1-13.1,9.18L92,158,70.55,188.59a8,8,0,1,1-13.1-9.18L82.23,144,57.45,108.59a8,8,0,1,1,13.1-9.18L92,130.05l21.45-30.64a8,8,0,0,1,13.1,9.18L101.77,144ZM192,160H152a8,8,0,0,1-6.4-12.8l36-48a12,12,0,1,0-19.15-14.46,13.06,13.06,0,0,0-2.58,4.81,8,8,0,1,1-15.68-3.18,28.17,28.17,0,1,1,50.2,22.44L168,144h24a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.LessThanFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM179.35,168.74a8,8,0,1,1-6.7,14.52l-104-48a8,8,0,0,1,0-14.52l104-48a8,8,0,0,1,6.7,14.52L91.09,128Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.AtFill">M232,128c0,.51,0,1,0,1.52-.34,14.26-5.63,30.48-28,30.48-23.14,0-28-17.4-28-32V88a8,8,0,0,0-8.53-8A8.17,8.17,0,0,0,160,88.27v4a48,48,0,1,0,6.73,64.05,40.19,40.19,0,0,0,3.38,5C175.48,168,185.71,176,204,176a54.81,54.81,0,0,0,9.22-.75,4,4,0,0,1,4.09,6A104.05,104.05,0,0,1,125.91,232C71.13,230.9,26.2,186.86,24.08,132.11A104,104,0,1,1,232,128ZM96,128a32,32,0,1,0,32-32A32,32,0,0,0,96,128Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.AppStoreLogoFill">M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24ZM83.66,180.12l-4.8,8a8,8,0,1,1-13.72-8.24l4.8-8a8,8,0,0,1,13.72,8.24ZM128,152H56a8,8,0,0,1,0-16H91.47l27.2-45.33L105.14,68.12a8,8,0,0,1,13.72-8.24L128,75.12l9.14-15.24a8,8,0,0,1,13.72,8.24L110.13,136H128a8,8,0,0,1,0,16Zm72,0H174.13l16.73,27.88a8,8,0,0,1-13.72,8.24l-38.4-64a8,8,0,0,1,13.72-8.24L164.53,136H200a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.TextTFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM184,96a8,8,0,0,1-16,0V88H136v88h12a8,8,0,0,1,0,16H108a8,8,0,0,1,0-16h12V88H88v8a8,8,0,0,1-16,0V80a8,8,0,0,1,8-8h96a8,8,0,0,1,8,8Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CalendarBlankFill">M208,32H184V24a8,8,0,0,0-16,0v8H88V24a8,8,0,0,0-16,0v8H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32Zm0,48H48V48H72v8a8,8,0,0,0,16,0V48h80v8a8,8,0,0,0,16,0V48h24Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.HospitalFill">M248,208h-8V128a16,16,0,0,0-16-16H168V48a16,16,0,0,0-16-16H56A16,16,0,0,0,40,48V208H32a8,8,0,0,0,0,16H248a8,8,0,0,0,0-16Zm-120,0H80V160h48Zm0-104H112v16a8,8,0,0,1-16,0V104H80a8,8,0,0,1,0-16H96V72a8,8,0,0,1,16,0V88h16a8,8,0,0,1,0,16Zm96,104H168V128h56Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SuitcaseSimpleFill">M216,56H176V48a24,24,0,0,0-24-24H104A24,24,0,0,0,80,48v8H40A16,16,0,0,0,24,72V200a16,16,0,0,0,16,16H216a16,16,0,0,0,16-16V72A16,16,0,0,0,216,56ZM96,48a8,8,0,0,1,8-8h48a8,8,0,0,1,8,8v8H96ZM216,72v72H40V72Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.UniteSquareFill">M224,96V216a8,8,0,0,1-8,8H96a8,8,0,0,1-8-8V168H40a8,8,0,0,1-8-8V40a8,8,0,0,1,8-8H160a8,8,0,0,1,8,8V88h48A8,8,0,0,1,224,96Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.TagSimpleFill">M246.66,123.56,201,55.13A15.94,15.94,0,0,0,187.72,48H40A16,16,0,0,0,24,64V192a16,16,0,0,0,16,16H187.72A16,16,0,0,0,201,200.88h0l45.63-68.44A8,8,0,0,0,246.66,123.56Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ShieldStarFill">M208,40H48A16,16,0,0,0,32,56v56c0,52.72,25.52,84.67,46.93,102.19,23.06,18.86,46,25.27,47,25.53a8,8,0,0,0,4.2,0c1-.26,23.91-6.67,47-25.53C198.48,196.67,224,164.72,224,112V56A16,16,0,0,0,208,40Zm-37,87.43-30.31,12.12L158.4,163.2a8,8,0,1,1-12.8,9.6L128,149.33,110.4,172.8a8,8,0,1,1-12.8-9.6l17.74-23.65L85,127.43A8,8,0,1,1,91,112.57l29,11.61V96a8,8,0,0,1,16,0v28.18l29-11.61A8,8,0,1,1,171,127.43Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CheckSquareFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32Zm-34.34,77.66-56,56a8,8,0,0,1-11.32,0l-24-24a8,8,0,0,1,11.32-11.32L112,148.69l50.34-50.35a8,8,0,0,1,11.32,11.32Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.NotEqualsFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM184,144a8,8,0,0,1,0,16H110.63L78,197.27a8,8,0,0,1-12-10.54L89.37,160H72a8,8,0,0,1,0-16h31.37l28-32H72a8,8,0,0,1,0-16h73.37L178,58.73a8,8,0,1,1,12,10.54L166.63,96H184a8,8,0,0,1,0,16H152.63l-28,32Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.HorseFill">M202.05,55A103.24,103.24,0,0,0,128,24h-8a8,8,0,0,0-8,8V59.53L11.81,121.19a8,8,0,0,0-2.59,11.05l13.78,22,.3.43a31.84,31.84,0,0,0,31.34,12.83c13.93-2.36,38.62-6.54,61.4,3.29l-26.6,36.57A84.71,84.71,0,0,1,69.34,194,8,8,0,1,0,58.67,206a103.32,103.32,0,0,0,69.26,26l2.17,0a104,104,0,0,0,72-177ZM124,112a12,12,0,1,1,12-12A12,12,0,0,1,124,112Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.TextSubscriptFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM126.55,147.41a8,8,0,1,1-13.1,9.18L92,126,70.55,156.59a8,8,0,1,1-13.1-9.18L82.23,112,57.45,76.59a8,8,0,0,1,13.1-9.18L92,98.05l21.45-30.64a8,8,0,0,1,13.1,9.18L101.77,112ZM192,192H152a8,8,0,0,1-6.4-12.8l36-48a12,12,0,1,0-19.15-14.46,13.06,13.06,0,0,0-2.58,4.81,8,8,0,1,1-15.68-3.18,28.17,28.17,0,1,1,50.2,22.44L168,176h24a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ChecksFill">M224,48H32A16,16,0,0,0,16,64V192a16,16,0,0,0,16,16H224a16,16,0,0,0,16-16V64A16,16,0,0,0,224,48ZM72,168a8,8,0,0,1-5.66-2.34l-24-24a8,8,0,0,1,11.32-11.32L72,148.69l58.34-58.35a8,8,0,0,1,11.32,11.32l-64,64A8,8,0,0,1,72,168Zm141.66-66.34-64,64a8,8,0,0,1-11.32,0l-16-16a8,8,0,0,1,11.32-11.32L144,148.69l58.34-58.35a8,8,0,0,1,11.32,11.32Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowUUpRightFill">M168,136V96H88a48,48,0,0,0,0,96h88a8,8,0,0,1,0,16H88A64,64,0,0,1,88,80h80V40a8,8,0,0,1,13.66-5.66l48,48a8,8,0,0,1,0,11.32l-48,48A8,8,0,0,1,168,136Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.MicrosoftOutlookLogoFill">M88,144a16,16,0,1,1,16-16A16,16,0,0,1,88,144Zm144-32v96a16,16,0,0,1-16,16H88a16,16,0,0,1-16-16V192H40a16,16,0,0,1-16-16V80A16,16,0,0,1,40,64H96V40a8,8,0,0,1,8-8h96a8,8,0,0,1,8,8v64h16A8,8,0,0,1,232,112ZM112,64h24a16,16,0,0,1,16,16v74.13l40-28.89V48H112ZM88,160a32,32,0,1,0-32-32A32,32,0,0,0,88,160Zm111.26,48L152,173.87V176a16,16,0,0,1-16,16H88v16ZM216,127.65,165.66,164,216,200.35Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ChatCircleTextFill">M128,24A104,104,0,0,0,36.18,176.88L24.83,210.93a16,16,0,0,0,20.24,20.24l34.05-11.35A104,104,0,1,0,128,24Zm32,128H96a8,8,0,0,1,0-16h64a8,8,0,0,1,0,16Zm0-32H96a8,8,0,0,1,0-16h64a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BatteryVerticalHighFill">M88,8a8,8,0,0,1,8-8h64a8,8,0,0,1,0,16H96A8,8,0,0,1,88,8Zm72,96H96a8,8,0,0,0-8,8v96a8,8,0,0,0,8,8h64a8,8,0,0,0,8-8V112A8,8,0,0,0,160,104Zm40-48V224a24,24,0,0,1-24,24H80a24,24,0,0,1-24-24V56A24,24,0,0,1,80,32h96A24,24,0,0,1,200,56Zm-16,0a8,8,0,0,0-8-8H80a8,8,0,0,0-8,8V224a8,8,0,0,0,8,8h96a8,8,0,0,0,8-8Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.IdentificationBadgeFill">M200,24H56A16,16,0,0,0,40,40V216a16,16,0,0,0,16,16H200a16,16,0,0,0,16-16V40A16,16,0,0,0,200,24ZM96,48h64a8,8,0,0,1,0,16H96a8,8,0,0,1,0-16Zm84.81,150.4a8,8,0,0,1-11.21-1.6,52,52,0,0,0-83.2,0,8,8,0,1,1-12.8-9.6A67.88,67.88,0,0,1,101,165.51a40,40,0,1,1,53.94,0A67.88,67.88,0,0,1,182.4,187.2,8,8,0,0,1,180.81,198.4ZM152,136a24,24,0,1,1-24-24A24,24,0,0,1,152,136Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FootballHelmetFill">M216,160H165.8l-7.09-24H216a8,8,0,0,0,8-8v-4A100,100,0,0,0,122.58,24C68.24,24.77,24,69.61,24,124A100,100,0,0,0,67.62,206.6a8,8,0,0,0,4.52,1.4H120a16,16,0,0,0,15.62-19.47,5.44,5.44,0,0,0-.15-.54l-3.56-12h21.93l10.79,36.53A16.1,16.1,0,0,0,180,224h36a16,16,0,0,0,16-16V176A16,16,0,0,0,216,160ZM84,176a12,12,0,1,1,12-12A12,12,0,0,1,84,176Zm43.16-16L120,136h22l7.09,24ZM216,208H180l-9.46-32H216Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BeerBottleFill">M245.66,42.34l-32-32a8,8,0,0,0-11.32,11.32l1.48,1.47L148.65,64.51l-38.22,7.65a8.05,8.05,0,0,0-4.09,2.18L23,157.66a24,24,0,0,0,0,33.94L64.4,233a24,24,0,0,0,33.94,0l83.32-83.31a8,8,0,0,0,2.18-4.09l7.65-38.22,41.38-55.17,1.47,1.48a8,8,0,0,0,11.32-11.32ZM81.37,224a7.94,7.94,0,0,1-5.65-2.34L34.34,180.28a8,8,0,0,1,0-11.31L40,163.31,92.69,216,87,221.66A8,8,0,0,1,81.37,224ZM177.6,99.2a7.92,7.92,0,0,0-1.44,3.23l-7.53,37.63L160,148.69,107.31,96l8.63-8.63,37.63-7.53a7.92,7.92,0,0,0,3.23-1.44l58.45-43.84,6.19,6.19Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CaretCircleUpDownFill">M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24Zm37.66,133.66-32,32a8,8,0,0,1-11.32,0l-32-32a8,8,0,0,1,11.32-11.32L128,172.69l26.34-26.35a8,8,0,0,1,11.32,11.32Zm0-48a8,8,0,0,1-11.32,0L128,83.31l-26.34,26.35A8,8,0,0,1,90.34,98.34l32-32a8,8,0,0,1,11.32,0l32,32A8,8,0,0,1,165.66,109.66Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.XLogoFill">M215,219.85a8,8,0,0,1-7,4.15H160a8,8,0,0,1-6.75-3.71l-40.49-63.63L53.92,221.38a8,8,0,0,1-11.84-10.76l61.77-68L41.25,44.3A8,8,0,0,1,48,32H96a8,8,0,0,1,6.75,3.71l40.49,63.63,58.84-64.72a8,8,0,0,1,11.84,10.76l-61.77,67.95,62.6,98.38A8,8,0,0,1,215,219.85Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.DiceTwoFill">M192,32H64A32,32,0,0,0,32,64V192a32,32,0,0,0,32,32H192a32,32,0,0,0,32-32V64A32,32,0,0,0,192,32Zm-84,88a12,12,0,1,1,12-12A12,12,0,0,1,108,120Zm40,40a12,12,0,1,1,12-12A12,12,0,0,1,148,160Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.EscalatorDownFill">M170.34,85.66a8,8,0,0,1,11.32-11.32L192,84.69V48a8,8,0,0,1,16,0V84.69l10.34-10.35a8,8,0,0,1,11.32,11.32l-24,24a8,8,0,0,1-11.32,0ZM224,144H187.5L93.88,42.57A8,8,0,0,0,88,40H32A16,16,0,0,0,16,56V96a16,16,0,0,0,16,16H68.5l93.62,101.43A8,8,0,0,0,168,216h56a16,16,0,0,0,16-16V160A16,16,0,0,0,224,144Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.EnvelopeSimpleFill">M224,48H32a8,8,0,0,0-8,8V192a16,16,0,0,0,16,16H216a16,16,0,0,0,16-16V56A8,8,0,0,0,224,48Zm-8,144H40V74.19l82.59,75.71a8,8,0,0,0,10.82,0L216,74.19V192Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CurrencyNgnFill">M143.55,136H160v23ZM96,120h16.45L96,97Zm136,8A104,104,0,1,1,128,24,104.11,104.11,0,0,1,232,128Zm-32,0a8,8,0,0,0-8-8H176V72a8,8,0,0,0-16,0v48H132.12L94.51,67.35A8,8,0,0,0,80,72v48H64a8,8,0,0,0,0,16H80v48a8,8,0,0,0,16,0V136h27.88l37.61,52.65A8,8,0,0,0,168,192a7.91,7.91,0,0,0,2.44-.38A8,8,0,0,0,176,184V136h16A8,8,0,0,0,200,128Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CheckFill">M216,40H40A16,16,0,0,0,24,56V200a16,16,0,0,0,16,16H216a16,16,0,0,0,16-16V56A16,16,0,0,0,216,40ZM205.66,85.66l-96,96a8,8,0,0,1-11.32,0l-40-40a8,8,0,0,1,11.32-11.32L104,164.69l90.34-90.35a8,8,0,0,1,11.32,11.32Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ToiletFill">M60,88H196a4,4,0,0,0,4-4V40a16,16,0,0,0-16-16H72A16,16,0,0,0,56,40V84A4,4,0,0,0,60,88ZM88,48h16a8,8,0,0,1,0,16H88a8,8,0,0,1,0-16Zm136,64a8,8,0,0,0-8-8H40a8,8,0,0,0-8,8,96.09,96.09,0,0,0,51.68,85.14l-3.52,24.6A16,16,0,0,0,96,240h64a16,16,0,0,0,15.84-18.26l-3.52-24.6A96.09,96.09,0,0,0,224,112ZM96,224l2.93-20.5a96.15,96.15,0,0,0,58.14,0L160,224Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.GoogleCardboardLogoFill">M224,48H32A16,16,0,0,0,16,64V192a16,16,0,0,0,16,16H96a8,8,0,0,0,5.66-2.34L128,179.31l26.34,26.35A8,8,0,0,0,160,208h64a16,16,0,0,0,16-16V64A16,16,0,0,0,224,48Zm-24,80a24,24,0,1,1-24-24A24,24,0,0,1,200,128ZM56,128a24,24,0,1,1,24,24A24,24,0,0,1,56,128Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.GasPumpFill">M241,69.66,221.66,50.34a8,8,0,0,0-11.32,11.32L229.66,81A8,8,0,0,1,232,86.63V168a8,8,0,0,1-16,0V128a24,24,0,0,0-24-24H176V56a24,24,0,0,0-24-24H72A24,24,0,0,0,48,56V208H32a8,8,0,0,0,0,16H192a8,8,0,0,0,0-16H176V120h16a8,8,0,0,1,8,8v40a24,24,0,0,0,48,0V86.63A23.85,23.85,0,0,0,241,69.66ZM144,120H80a8,8,0,0,1,0-16h64a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.JarLabelFill">M184,48.81V32a16,16,0,0,0-16-16H88A16,16,0,0,0,72,32V48.81A40.05,40.05,0,0,0,40,88V200a40,40,0,0,0,40,40h96a40,40,0,0,0,40-40V88A40.05,40.05,0,0,0,184,48.81ZM168,48H152V32h16Zm-48,0V32h16V48ZM104,32V48H88V32ZM80,64h96a24,24,0,0,1,24,24v8H56V88A24,24,0,0,1,80,64Zm96,160H80a24,24,0,0,1-24-24v-8H200v8A24,24,0,0,1,176,224Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowULeftUpFill">M208,80v88a64,64,0,0,1-128,0V88H40a8,8,0,0,1-5.66-13.66l48-48a8,8,0,0,1,11.32,0l48,48A8,8,0,0,1,136,88H96v80a48,48,0,0,0,96,0V80a8,8,0,0,1,16,0Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CloudSnowFill">M88,196a12,12,0,1,1-12-12A12,12,0,0,1,88,196Zm28,4a12,12,0,1,0,12,12A12,12,0,0,0,116,200Zm48-16a12,12,0,1,0,12,12A12,12,0,0,0,164,184ZM68,224a12,12,0,1,0,12,12A12,12,0,0,0,68,224Zm88,0a12,12,0,1,0,12,12A12,12,0,0,0,156,224ZM231.87,87.55a76,76,0,0,0-151.78.73A8.18,8.18,0,0,1,72,96l-.6,0A8.14,8.14,0,0,1,64,87.39a92.48,92.48,0,0,1,2.33-16.51,4,4,0,0,0-5-4.78A52.09,52.09,0,0,0,24,116.36C24.2,145.07,48.12,168,76.84,168H156A76.08,76.08,0,0,0,231.87,87.55Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ListNumbersFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM56.84,75.58a8,8,0,0,1,3.58-10.74l16-8A8,8,0,0,1,88,64v48a8,8,0,0,1-16,0V76.94l-4.42,2.22A8,8,0,0,1,56.84,75.58ZM92,180a8,8,0,0,1,0,16H68a8,8,0,0,1-6.4-12.8l21.67-28.89A3.92,3.92,0,0,0,84,152a4,4,0,0,0-7.77-1.33,8,8,0,0,1-15.09-5.34,20,20,0,1,1,35,18.53L84,180Zm100,4H120a8,8,0,0,1,0-16h72a8,8,0,0,1,0,16Zm0-48H120a8,8,0,0,1,0-16h72a8,8,0,0,1,0,16Zm0-48H120a8,8,0,0,1,0-16h72a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowUUpLeftFill">M232,144a64.07,64.07,0,0,1-64,64H80a8,8,0,0,1,0-16h88a48,48,0,0,0,0-96H88v40a8,8,0,0,1-13.66,5.66l-48-48a8,8,0,0,1,0-11.32l48-48A8,8,0,0,1,88,40V80h80A64.07,64.07,0,0,1,232,144Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CodeFill">M216,40H40A16,16,0,0,0,24,56V200a16,16,0,0,0,16,16H216a16,16,0,0,0,16-16V56A16,16,0,0,0,216,40ZM92.8,145.6a8,8,0,1,1-9.6,12.8l-32-24a8,8,0,0,1,0-12.8l32-24a8,8,0,0,1,9.6,12.8L69.33,128Zm58.89-71.4-32,112a8,8,0,1,1-15.38-4.4l32-112a8,8,0,0,1,15.38,4.4Zm53.11,60.2-32,24a8,8,0,0,1-9.6-12.8L186.67,128,163.2,110.4a8,8,0,1,1,9.6-12.8l32,24a8,8,0,0,1,0,12.8Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.HourglassFill">M200,75.64V40a16,16,0,0,0-16-16H72A16,16,0,0,0,56,40V76a16.08,16.08,0,0,0,6.41,12.8L114.67,128,62.4,167.2A16.07,16.07,0,0,0,56,180v36a16,16,0,0,0,16,16H184a16,16,0,0,0,16-16V180.36a16,16,0,0,0-6.36-12.77L141.26,128l52.38-39.59A16.05,16.05,0,0,0,200,75.64Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowULeftDownFill">M208,88v88a8,8,0,0,1-16,0V88a48,48,0,0,0-96,0v80h40a8,8,0,0,1,5.66,13.66l-48,48a8,8,0,0,1-11.32,0l-48-48A8,8,0,0,1,40,168H80V88a64,64,0,0,1,128,0Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.EnvelopeSimpleOpenFill">M228.44,89.34l-96-64a8,8,0,0,0-8.88,0l-96,64A8,8,0,0,0,24,96V200a16,16,0,0,0,16,16H216a16,16,0,0,0,16-16V96A8,8,0,0,0,228.44,89.34ZM40,200V111.53l65.9,47a8,8,0,0,0,4.65,1.49h34.9a8,8,0,0,0,4.65-1.49l65.9-47V200Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowSquareLeftFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM168,136H107.31l18.35,18.34a8,8,0,0,1-11.32,11.32l-32-32a8,8,0,0,1,0-11.32l32-32a8,8,0,0,1,11.32,11.32L107.31,120H168a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CaretLeftFill">M163.06,40.61a8,8,0,0,0-8.72,1.73l-80,80a8,8,0,0,0,0,11.32l80,80A8,8,0,0,0,168,208V48A8,8,0,0,0,163.06,40.61Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PencilSlashFill">M53.92,34.62A8,8,0,1,0,42.08,45.38l48.2,53L36.68,152A15.89,15.89,0,0,0,32,163.31V208a16,16,0,0,0,16,16H92.69A15.86,15.86,0,0,0,104,219.31l50.4-50.39,47.69,52.46a8,8,0,1,0,11.84-10.76Zm47.14,75.64L117,127.74,68,176.69,51.31,160ZM48,208V179.31L76.69,208Zm48-3.31L79.32,188l48.41-48.41,15.89,17.48ZM227.32,96,183,140.34A8,8,0,0,1,171.67,129l14.68-14.68L169.66,97.66,156.31,111A8,8,0,0,1,145,99.69l13.35-13.35h0L141.66,69.66l-12,12a8,8,0,0,1-11.32-11.31L160,28.69a16,16,0,0,1,22.63,0l44.69,44.68A16,16,0,0,1,227.32,96Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BatteryWarningFill">M200,56H32A24,24,0,0,0,8,80v96a24,24,0,0,0,24,24H200a24,24,0,0,0,24-24V80A24,24,0,0,0,200,56ZM108,88a8,8,0,0,1,16,0v40a8,8,0,0,1-16,0Zm8,88a12,12,0,1,1,12-12A12,12,0,0,1,116,176ZM256,96v64a8,8,0,0,1-16,0V96a8,8,0,0,1,16,0Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.TramFill">M184,48H136V24h32a8,8,0,0,0,0-16H88a8,8,0,0,0,0,16h32V48H72A32,32,0,0,0,40,80V184a32,32,0,0,0,32,32h8L65.6,235.2a8,8,0,1,0,12.8,9.6L100,216h56l21.6,28.8a8,8,0,1,0,12.8-9.6L176,216h8a32,32,0,0,0,32-32V80A32,32,0,0,0,184,48Zm0,152H72a16,16,0,0,1-16-16V128H200v56A16,16,0,0,1,184,200ZM96,172a12,12,0,1,1-12-12A12,12,0,0,1,96,172Zm88,0a12,12,0,1,1-12-12A12,12,0,0,1,184,172Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CirclesThreeFill">M128,120a44,44,0,1,1,44-44A44.05,44.05,0,0,1,128,120Zm60,8a44,44,0,1,0,44,44A44.05,44.05,0,0,0,188,128ZM68,128a44,44,0,1,0,44,44A44.05,44.05,0,0,0,68,128Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.TreasureChestFill">M240,124v68a16,16,0,0,1-16,16H32a16,16,0,0,1-16-16V124a4,4,0,0,1,4-4H56v64a8,8,0,0,0,8.53,8A8.17,8.17,0,0,0,72,183.73V120h40v20a4,4,0,0,0,4,4h24a4,4,0,0,0,4-4V120h40v64a8,8,0,0,0,8.53,8,8.17,8.17,0,0,0,7.47-8.25V120h36A4,4,0,0,1,240,124ZM184,40H72A56,56,0,0,0,16,96v4a4,4,0,0,0,4,4H56V64.27A8.17,8.17,0,0,1,63.47,56,8,8,0,0,1,72,64v40h40V92a4,4,0,0,1,4-4h24a4,4,0,0,1,4,4v12h40V64.27A8.17,8.17,0,0,1,191.47,56,8,8,0,0,1,200,64v40h36a4,4,0,0,0,4-4V96A56,56,0,0,0,184,40Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ChatCircleDotsFill">M128,24A104,104,0,0,0,36.18,176.88L24.83,210.93a16,16,0,0,0,20.24,20.24l34.05-11.35A104,104,0,1,0,128,24ZM84,140a12,12,0,1,1,12-12A12,12,0,0,1,84,140Zm44,0a12,12,0,1,1,12-12A12,12,0,0,1,128,140Zm44,0a12,12,0,1,1,12-12A12,12,0,0,1,172,140Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PentagonFill">M231.26,105.19l-32,107.54-.06.17A15.94,15.94,0,0,1,184,224H72A15.94,15.94,0,0,1,56.8,212.9l-.06-.17-32-107.54a16,16,0,0,1,5.7-17.63l87.92-68.31.18-.14a15.93,15.93,0,0,1,18.92,0l.18.14,87.92,68.31A16,16,0,0,1,231.26,105.19Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.TextboxFill">M248,80v96a16,16,0,0,1-16,16H140a4,4,0,0,1-4-4V68a4,4,0,0,1,4-4h92A16,16,0,0,1,248,80ZM120,48V208a8,8,0,0,1-16,0V192H24A16,16,0,0,1,8,176V80A16,16,0,0,1,24,64h80V48a8,8,0,0,1,16,0ZM88,112a8,8,0,0,0-8-8H48a8,8,0,0,0,0,16h8v24a8,8,0,0,0,16,0V120h8A8,8,0,0,0,88,112Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SmileyMeltingFill">M235.6,176H220.24a104,104,0,1,0-184.52,0H20.4A12.26,12.26,0,0,0,8,187.78,12,12,0,0,0,20,200H80a8,8,0,0,1,0,16H72.16a8.2,8.2,0,0,0-8,6.33A8,8,0,0,0,72,232H199.73a8.18,8.18,0,0,0,8.25-7.47,8,8,0,0,0-8-8.53H144a8,8,0,0,1,0-16h7.79a8.28,8.28,0,0,0,8.15-7.05A8,8,0,0,0,152,184H136c-14.93,0-30.59-5.78-43-15.85-13.55-11-21-25.27-21-40.15a57,57,0,0,1,.71-9,8.21,8.21,0,0,1,8.85-7,8,8,0,0,1,7,9.27A41.33,41.33,0,0,0,88,128c0,22.16,26.26,40,48,40h15.44c13.5,0,24.86,11.05,24.55,24.55a24,24,0,0,1-.23,2.83,4,4,0,0,0,4,4.62H236a12,12,0,0,0,12-12.22A12.26,12.26,0,0,0,235.6,176ZM127.9,93.56A12,12,0,1,1,114.44,80.1,12,12,0,0,1,127.9,93.56Zm48,48a12,12,0,1,1-13.46-13.46A12,12,0,0,1,175.9,141.56Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.TwitchLogoFill">M208,32H48A16,16,0,0,0,32,48V192a16,16,0,0,0,16,16H64v32a8,8,0,0,0,13.12,6.15L122.9,208h42.2a16,16,0,0,0,10.25-3.71l42.89-35.75A15.93,15.93,0,0,0,224,156.25V48A16,16,0,0,0,208,32ZM128,136a8,8,0,0,1-16,0V88a8,8,0,0,1,16,0Zm48,0a8,8,0,0,1-16,0V88a8,8,0,0,1,16,0Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.TextHTwoFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM128,160a8,8,0,0,1-16,0V128H72v32a8,8,0,0,1-16,0V80a8,8,0,0,1,16,0v32h40V80a8,8,0,0,1,16,0Zm64,24H152a8,8,0,0,1-6.4-12.8l36-48a12,12,0,1,0-19.15-14.46,13.06,13.06,0,0,0-2.58,4.81,8,8,0,1,1-15.68-3.18,28.17,28.17,0,1,1,50.2,22.44L168,168h24a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.RadioButtonFill">M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24Zm0,192a88,88,0,1,1,88-88A88.1,88.1,0,0,1,128,216Zm56-88a56,56,0,1,1-56-56A56.06,56.06,0,0,1,184,128Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.OrangeFill">M165.87,72.58A64.06,64.06,0,0,0,200,16a8,8,0,0,0-8-8h-8a64,64,0,0,0-56,33.06A64,64,0,0,0,72,8H64a8,8,0,0,0,0,16h8a48.08,48.08,0,0,1,47.4,40.42,88,88,0,1,0,46.47,8.16ZM183.33,24a48.09,48.09,0,0,1-46.66,40A48.09,48.09,0,0,1,183.33,24Zm.56,137.32a57.5,57.5,0,0,1-46.57,46.57A8.52,8.52,0,0,1,136,208a8,8,0,0,1-1.31-15.89,41.29,41.29,0,0,0,33.43-33.43,8,8,0,0,1,15.78,2.64Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.AddressBookTabsFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM184,48h24V88H184Zm0,56h24v48H184Zm-38,71.75a8,8,0,0,1-9.74-5.76c-2.63-10.26-13.06-18-24.25-18s-21.61,7.74-24.25,18a8,8,0,0,1-15.5-4,39.84,39.84,0,0,1,17.19-23.34,32,32,0,1,1,45.12,0A39.76,39.76,0,0,1,151.75,166,8,8,0,0,1,146,175.75ZM208,208H184V168h24v40Zm-80-88a16,16,0,1,1-16-16A16,16,0,0,1,128,120Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.WrenchFill">M232,96a72,72,0,0,1-100.94,66L79,222.22c-.12.14-.26.29-.39.42a32,32,0,0,1-45.26-45.26c.14-.13.28-.27.43-.39L94,124.94a72.07,72.07,0,0,1,83.54-98.78,8,8,0,0,1,3.93,13.19L144,80l5.66,26.35L176,112l40.65-37.52a8,8,0,0,1,13.19,3.93A72.6,72.6,0,0,1,232,96Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.TreeViewFill">M160,136v-8H88v64a8,8,0,0,0,8,8h64v-8a16,16,0,0,1,16-16h32a16,16,0,0,1,16,16v32a16,16,0,0,1-16,16H176a16,16,0,0,1-16-16v-8H96a24,24,0,0,1-24-24V80H64A16,16,0,0,1,48,64V32A16,16,0,0,1,64,16H96a16,16,0,0,1,16,16V64A16,16,0,0,1,96,80H88v32h72v-8a16,16,0,0,1,16-16h32a16,16,0,0,1,16,16v32a16,16,0,0,1-16,16H176A16,16,0,0,1,160,136Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CoffeeFill">M208,80H32a8,8,0,0,0-8,8v48a96.3,96.3,0,0,0,32.54,72H32a8,8,0,0,0,0,16H208a8,8,0,0,0,0-16H183.46a96.59,96.59,0,0,0,27-40.09A40,40,0,0,0,248,128v-8A40,40,0,0,0,208,80Zm24,48a24,24,0,0,1-17.2,23,95.78,95.78,0,0,0,1.2-15V97.38A24,24,0,0,1,232,120ZM112,56V24a8,8,0,0,1,16,0V56a8,8,0,0,1-16,0Zm32,0V24a8,8,0,0,1,16,0V56a8,8,0,0,1-16,0ZM80,56V24a8,8,0,0,1,16,0V56a8,8,0,0,1-16,0Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.GifFill">M216,40H40A16,16,0,0,0,24,56V200a16,16,0,0,0,16,16H216a16,16,0,0,0,16-16V56A16,16,0,0,0,216,40ZM112,144a32,32,0,0,1-64,0V112a32,32,0,0,1,55.85-21.33,8,8,0,1,1-11.92,10.66A16,16,0,0,0,64,112v32a16,16,0,0,0,32,0v-8H88a8,8,0,0,1,0-16h16a8,8,0,0,1,8,8Zm32,24a8,8,0,0,1-16,0V88a8,8,0,0,1,16,0Zm60-72H176v24h20a8,8,0,0,1,0,16H176v32a8,8,0,0,1-16,0V88a8,8,0,0,1,8-8h36a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.GitDiffFill">M118.18,213.08c-.11.14-.24.27-.36.4l-.16.18-.17.15a4.83,4.83,0,0,1-.42.37,3.92,3.92,0,0,1-.32.25l-.3.22-.38.23a2.91,2.91,0,0,1-.3.17l-.37.19-.34.15-.36.13a2.84,2.84,0,0,1-.38.13l-.36.1c-.14,0-.26.07-.4.09l-.42.07-.35.05a7,7,0,0,1-.79,0H64a8,8,0,0,1,0-16H92.69L55,162.34a23.85,23.85,0,0,1-7-17V95a32,32,0,1,1,16,0v50.38A8,8,0,0,0,66.34,151L104,188.69V160a8,8,0,0,1,16,0v48a7,7,0,0,1,0,.8c0,.11,0,.21,0,.32s0,.3-.07.46a2.83,2.83,0,0,1-.09.37c0,.13-.06.26-.1.39s-.08.23-.12.35l-.14.39-.15.31c-.06.13-.12.27-.19.4s-.11.18-.16.28l-.24.39-.21.28ZM208,161V110.63a23.85,23.85,0,0,0-7-17L163.31,56H192a8,8,0,0,0,0-16H143.82l-.6,0c-.14,0-.28,0-.41.06l-.37,0-.43.11-.33.08-.4.14-.34.13-.35.16-.36.18a3.14,3.14,0,0,0-.31.18c-.12.07-.25.14-.36.22a3.55,3.55,0,0,0-.31.23,3.81,3.81,0,0,0-.32.24c-.15.12-.28.24-.42.37l-.17.15-.16.18c-.12.13-.25.26-.36.4l-.26.35-.21.28-.24.39c-.05.1-.11.19-.16.28s-.13.27-.19.4l-.15.31-.14.39c0,.12-.09.23-.12.35s-.07.26-.1.39a2.83,2.83,0,0,0-.09.37c0,.16,0,.31-.07.46s0,.21-.05.32a7,7,0,0,0,0,.8V96a8,8,0,0,0,16,0V67.31L189.66,105a8,8,0,0,1,2.34,5.66V161a32,32,0,1,0,16,0Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.TelegramLogoFill">M228.88,26.19a9,9,0,0,0-9.16-1.57L17.06,103.93a14.22,14.22,0,0,0,2.43,27.21L72,141.45V200a15.92,15.92,0,0,0,10,14.83,15.91,15.91,0,0,0,17.51-3.73l25.32-26.26L165,220a15.88,15.88,0,0,0,10.51,4,16.3,16.3,0,0,0,5-.79,15.85,15.85,0,0,0,10.67-11.63L231.77,35A9,9,0,0,0,228.88,26.19ZM175.53,208,92.85,135.5l119-85.29Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.MicrosoftWordLogoFill">M200,24H72A16,16,0,0,0,56,40V64H40A16,16,0,0,0,24,80v96a16,16,0,0,0,16,16H56v24a16,16,0,0,0,16,16H200a16,16,0,0,0,16-16V40A16,16,0,0,0,200,24ZM68.24,153.94l-12-48a8,8,0,1,1,15.52-3.88l6.76,27,6.32-12.66a8,8,0,0,1,14.32,0l6.32,12.66,6.76-27a8,8,0,0,1,15.52,3.88l-12,48a8,8,0,0,1-6.89,6,8.46,8.46,0,0,1-.87.05,8,8,0,0,1-7.16-4.42L92,137.89l-8.84,17.69a8,8,0,0,1-14.92-1.64ZM200,216H72V192h72a16,16,0,0,0,16-16v-8h40Zm0-64H160V104h40Zm0-64H160V80a16,16,0,0,0-16-16H72V40H200Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.DropFill">M174,47.75a254.19,254.19,0,0,0-41.45-38.3,8,8,0,0,0-9.18,0A254.19,254.19,0,0,0,82,47.75C54.51,79.32,40,112.6,40,144a88,88,0,0,0,176,0C216,112.6,201.49,79.32,174,47.75Zm9.85,105.59a57.6,57.6,0,0,1-46.56,46.55A8.75,8.75,0,0,1,136,200a8,8,0,0,1-1.32-15.89c16.57-2.79,30.63-16.85,33.44-33.45a8,8,0,0,1,15.78,2.68Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.TreeFill">M128,187.85a72.44,72.44,0,0,0,8,4.62V232a8,8,0,0,1-16,0V192.47A72.44,72.44,0,0,0,128,187.85ZM198.1,62.59a76,76,0,0,0-140.2,0A71.71,71.71,0,0,0,16,127.8C15.9,166,48,199,86.14,200A72.22,72.22,0,0,0,120,192.47V156.94L76.42,135.16a8,8,0,1,1,7.16-14.32L120,139.06V88a8,8,0,0,1,16,0v27.06l36.42-18.22a8,8,0,1,1,7.16,14.32L136,132.94v59.53A72.17,72.17,0,0,0,168,200l1.82,0C208,199,240.11,166,240,127.8A71.71,71.71,0,0,0,198.1,62.59Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.MastodonLogoFill">M184,32H72A40,40,0,0,0,32,72V192a40,40,0,0,0,40,40h88a8,8,0,0,0,0-16H72a24,24,0,0,1-24-24v-8H184a40,40,0,0,0,40-40V72A40,40,0,0,0,184,32Zm0,104a8,8,0,0,1-16,0V104a16,16,0,0,0-32,0v32a8,8,0,0,1-16,0V104a16,16,0,0,0-32,0v32a8,8,0,0,1-16,0V104a32,32,0,0,1,56-21.13A32,32,0,0,1,184,104Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BrandyFill">M224,88h0a95.63,95.63,0,0,0-15.53-52.37,8,8,0,0,0-6.7-3.63H54.23a8,8,0,0,0-6.7,3.63A95.63,95.63,0,0,0,32,88h0a96.12,96.12,0,0,0,88,95.66V216H88a8,8,0,0,0,0,16h80a8,8,0,0,0,0-16H136V183.66A96.12,96.12,0,0,0,224,88ZM58.7,48H197.3a79.52,79.52,0,0,1,10.3,32H48.4A79.52,79.52,0,0,1,58.7,48Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BrowsersFill">M216,40H72A16,16,0,0,0,56,56V72H40A16,16,0,0,0,24,88V200a16,16,0,0,0,16,16H184a16,16,0,0,0,16-16V184h16a16,16,0,0,0,16-16V56A16,16,0,0,0,216,40ZM184,88v16H40V88Zm32,80H200V88a16,16,0,0,0-16-16H72V56H216Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.LineSegmentsFill">M235.81,75.79A27.91,27.91,0,0,1,216,84a28.49,28.49,0,0,1-5.67-.58l-30.57,56.77,0,0a28,28,0,1,1-44.43,6.49l-26.06-26.06A28.07,28.07,0,0,1,96,124a28.41,28.41,0,0,1-5.67-.58L59.76,180.18l0,0a28,28,0,1,1-39.6,0h0a28,28,0,0,1,25.47-7.61l30.57-56.77,0,0a28.05,28.05,0,0,1,0-39.61h0a28,28,0,0,1,44.43,33.12l26.06,26.06a28.1,28.1,0,0,1,19-2.77l30.57-56.77,0,0a28,28,0,0,1,0-39.6h0a28,28,0,0,1,39.6,39.6Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.VirtualRealityFill">M176,48H80a80,80,0,0,0,0,160h96a80,80,0,0,0,0-160ZM123.49,98.81l-24,64a8,8,0,0,1-15,0l-24-64a8,8,0,1,1,15-5.62l16.51,44,16.51-44a8,8,0,1,1,15,5.62ZM191,156a8,8,0,0,1-13.9,7.94l-11.44-20c-.53,0-1.07.05-1.61.05H152v16a8,8,0,0,1-16,0V96a8,8,0,0,1,8-8h20a28,28,0,0,1,16.84,50.35ZM176,116a12,12,0,0,1-12,12H152V104h12A12,12,0,0,1,176,116Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.TextUnderlineFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM80,72a8,8,0,0,1,16,0v48a32,32,0,0,0,64,0V72a8,8,0,0,1,16,0v48a48,48,0,0,1-96,0Zm96,128H80a8,8,0,0,1,0-16h96a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowFatLeftFill">M224,88v80a16,16,0,0,1-16,16H128v40a8,8,0,0,1-13.66,5.66l-96-96a8,8,0,0,1,0-11.32l96-96A8,8,0,0,1,128,32V72h80A16,16,0,0,1,224,88Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.DiceThreeFill">M192,32H64A32,32,0,0,0,32,64V192a32,32,0,0,0,32,32H192a32,32,0,0,0,32-32V64A32,32,0,0,0,192,32ZM92,104a12,12,0,1,1,12-12A12,12,0,0,1,92,104Zm36,36a12,12,0,1,1,12-12A12,12,0,0,1,128,140Zm36,36a12,12,0,1,1,12-12A12,12,0,0,1,164,176Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.VanFill">M254.07,106.79,208.53,53.73A16,16,0,0,0,196.26,48H32A16,16,0,0,0,16,64V176a16,16,0,0,0,16,16H49a32,32,0,0,0,62,0h50a32,32,0,0,0,62,0h17a16,16,0,0,0,16-16V112A8,8,0,0,0,254.07,106.79ZM32,104V64H88v40Zm48,96a16,16,0,1,1,16-16A16,16,0,0,1,80,200Zm80-96H104V64h56Zm32,96a16,16,0,1,1,16-16A16,16,0,0,1,192,200Zm-16-96V64h20.26l34.33,40Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.MicrosoftExcelLogoFill">M200,24H72A16,16,0,0,0,56,40V64H40A16,16,0,0,0,24,80v96a16,16,0,0,0,16,16H56v24a16,16,0,0,0,16,16H200a16,16,0,0,0,16-16V40A16,16,0,0,0,200,24ZM72,160a8,8,0,0,1-6.15-13.12L81.59,128,65.85,109.12a8,8,0,0,1,12.3-10.24L92,115.5l13.85-16.62a8,8,0,1,1,12.3,10.24L102.41,128l15.74,18.88a8,8,0,0,1-12.3,10.24L92,140.5,78.15,157.12A8,8,0,0,1,72,160Zm56,56H72V192h56Zm0-152H72V40h56Zm72,152H144V192a16,16,0,0,0,16-16v-8h40Zm0-64H160V104h40Zm0-64H160V80a16,16,0,0,0-16-16V40h56Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.OvenFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM172,56a12,12,0,1,1-12,12A12,12,0,0,1,172,56Zm-44,0a12,12,0,1,1-12,12A12,12,0,0,1,128,56ZM84,56A12,12,0,1,1,72,68,12,12,0,0,1,84,56ZM192,192H64V104H192Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CoinFill">M207.58,63.84C186.85,53.48,159.33,48,128,48S69.15,53.48,48.42,63.84,16,88.78,16,104v48c0,15.22,11.82,29.85,32.42,40.16S96.67,208,128,208s58.85-5.48,79.58-15.84S240,167.22,240,152V104C240,88.78,228.18,74.15,207.58,63.84Zm-87.58,96v32c-19-.62-35-3.42-48-7.49V153.05A203.43,203.43,0,0,0,120,159.86Zm16,0a203.43,203.43,0,0,0,48-6.81v31.31c-13,4.07-29,6.87-48,7.49ZM32,152V133.53a82.88,82.88,0,0,0,16.42,10.63c2.43,1.21,5,2.35,7.58,3.43V178C40.17,170.16,32,160.29,32,152Zm168,26V147.59c2.61-1.08,5.15-2.22,7.58-3.43A82.88,82.88,0,0,0,224,133.53V152C224,160.29,215.83,170.16,200,178Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowElbowDownRightFill">M221.66,181.66l-48,48A8,8,0,0,1,160,224V184H72a8,8,0,0,1-8-8V32a8,8,0,0,1,16,0V168h80V128a8,8,0,0,1,13.66-5.66l48,48A8,8,0,0,1,221.66,181.66Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CoinsFill">M184,89.57V84c0-25.08-37.83-44-88-44S8,58.92,8,84v40c0,20.89,26.25,37.49,64,42.46V172c0,25.08,37.83,44,88,44s88-18.92,88-44V132C248,111.3,222.58,94.68,184,89.57ZM56,146.87C36.41,141.4,24,132.39,24,124V109.93c8.16,5.78,19.09,10.44,32,13.57Zm80-23.37c12.91-3.13,23.84-7.79,32-13.57V124c0,8.39-12.41,17.4-32,22.87Zm-16,71.37C100.41,189.4,88,180.39,88,172v-4.17c2.63.1,5.29.17,8,.17,3.88,0,7.67-.13,11.39-.35A121.92,121.92,0,0,0,120,171.41Zm0-44.62A163,163,0,0,1,96,152a163,163,0,0,1-24-1.75V126.46A183.74,183.74,0,0,0,96,128a183.74,183.74,0,0,0,24-1.54Zm64,48a165.45,165.45,0,0,1-48,0V174.4a179.48,179.48,0,0,0,24,1.6,183.74,183.74,0,0,0,24-1.54ZM232,172c0,8.39-12.41,17.4-32,22.87V171.5c12.91-3.13,23.84-7.79,32-13.57Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.WaveformFill">M216,40H40A16,16,0,0,0,24,56V200a16,16,0,0,0,16,16H216a16,16,0,0,0,16-16V56A16,16,0,0,0,216,40ZM72,152a8,8,0,0,1-16,0V104a8,8,0,0,1,16,0Zm32,32a8,8,0,0,1-16,0V72a8,8,0,0,1,16,0Zm32-16a8,8,0,0,1-16,0V88a8,8,0,0,1,16,0Zm32-16a8,8,0,0,1-16,0V104a8,8,0,0,1,16,0Zm32,8a8,8,0,0,1-16,0V96a8,8,0,0,1,16,0Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PlayCircleFill">M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24Zm40.55,110.58-52,36A8,8,0,0,1,104,164V92a8,8,0,0,1,12.55-6.58l52,36a8,8,0,0,1,0,13.16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.WaveSawtoothFill">M216,40H40A16,16,0,0,0,24,56V200a16,16,0,0,0,16,16H216a16,16,0,0,0,16-16V56A16,16,0,0,0,216,40Zm-11.56,94.66-72,48A8,8,0,0,1,128,184a8,8,0,0,1-8-8V95L60.44,134.66a8,8,0,1,1-8.88-13.32l72-48A8,8,0,0,1,136,80v81.05l59.56-39.71a8,8,0,0,1,8.88,13.32Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowsVerticalFill">M167.39,196.94a8,8,0,0,1-1.73,8.72l-32,32a8,8,0,0,1-11.32,0l-32-32A8,8,0,0,1,96,192h24V64H96a8,8,0,0,1-5.66-13.66l32-32a8,8,0,0,1,11.32,0l32,32A8,8,0,0,1,160,64H136V192h24A8,8,0,0,1,167.39,196.94Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.HockeyFill">M149.9,122.82l68-80a8,8,0,0,1,12.2,10.36l-68,80a8,8,0,1,1-12.2-10.36ZM240,168v32a16,16,0,0,1-16,16H171.7a16,16,0,0,1-12.19-5.64L25.9,53.18h0A8,8,0,1,1,38.1,42.82L130.9,152H224A16,16,0,0,1,240,168Zm-16,0H208v32h16ZM115.3,183.06a4,4,0,0,1,0,5.18L96.49,210.36A16,16,0,0,1,84.3,216H32a16,16,0,0,1-16-16V168a16,16,0,0,1,16-16H87.05a4,4,0,0,1,3,1.41ZM48,168H32v32H48Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.DotsThreeOutlineVerticalFill">M156,128a28,28,0,1,1-28-28A28,28,0,0,1,156,128ZM128,76a28,28,0,1,0-28-28A28,28,0,0,0,128,76Zm0,104a28,28,0,1,0,28,28A28,28,0,0,0,128,180Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowCircleDownRightFill">M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24Zm40,136a8,8,0,0,1-8,8H112a8,8,0,0,1,0-16h28.69L90.34,101.66a8,8,0,0,1,11.32-11.32L152,140.69V112a8,8,0,0,1,16,0Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.TextAlignLeftFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM160,184H64a8,8,0,0,1,0-16h96a8,8,0,0,1,0,16Zm32-32H64a8,8,0,0,1,0-16H192a8,8,0,0,1,0,16ZM56,112a8,8,0,0,1,8-8h96a8,8,0,0,1,0,16H64A8,8,0,0,1,56,112ZM192,88H64a8,8,0,0,1,0-16H192a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FileVideoFill">M192,224h8a8,8,0,0,0,8-8V88L152,32H56a8,8,0,0,0-8,8v72</StreamGeometry>
+  <StreamGeometry x:Key="Icons.RankingFill">M240,200h-8V144a16,16,0,0,0-16-16H176V56a16,16,0,0,0-16-16H96A16,16,0,0,0,80,56V88H40a16,16,0,0,0-16,16v96H16a8,8,0,0,0,0,16H240a8,8,0,0,0,0-16ZM80,200H40V104H80Zm60-64a8,8,0,0,1-16,0V107.1l-1.47.49a8,8,0,0,1-5.06-15.18l12-4A8,8,0,0,1,140,96Zm76,64H176V144h40Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PauseCircleFill">M128,24A104,104,0,1,0,232,128,104.13,104.13,0,0,0,128,24ZM112,160a8,8,0,0,1-16,0V96a8,8,0,0,1,16,0Zm48,0a8,8,0,0,1-16,0V96a8,8,0,0,1,16,0Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.TriangleDashedFill">M236.8,188.09,149.35,36.22a24.76,24.76,0,0,0-42.7,0L19.2,188.09a23.51,23.51,0,0,0,0,23.72A24.34,24.34,0,0,0,40.55,224h174.9a24.34,24.34,0,0,0,21.33-12.19A23.51,23.51,0,0,0,236.8,188.09ZM108,200H60.79A12,12,0,0,1,50.4,182l24.18-42a8,8,0,0,1,13.87,8L67.71,184H108a8,8,0,0,1,0,16Zm-1.12-84A8,8,0,0,1,93,108l24.59-42.7a12,12,0,0,1,20.8,0L163,108a8,8,0,0,1-13.87,8L128,79.31Zm98.72,78a12.05,12.05,0,0,1-10.39,6H148a8,8,0,0,1,0-16h40.29l-20.74-36a8,8,0,0,1,13.87-8l24.18,42A12,12,0,0,1,205.6,194Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.RocketLaunchFill">M101.85,191.14C97.34,201,82.29,224,40,224a8,8,0,0,1-8-8c0-42.29,23-57.34,32.86-61.85a8,8,0,0,1,6.64,14.56c-6.43,2.93-20.62,12.36-23.12,38.91,26.55-2.5,36-16.69,38.91-23.12a8,8,0,1,1,14.56,6.64Zm122-144a16,16,0,0,0-15-15c-12.58-.75-44.73.4-71.4,27.07h0L88,108.7A8,8,0,0,1,76.67,97.39l26.56-26.57A4,4,0,0,0,100.41,64H74.35A15.9,15.9,0,0,0,63,68.68L28.7,103a16,16,0,0,0,9.07,27.16l38.47,5.37,44.21,44.21,5.37,38.49a15.94,15.94,0,0,0,10.78,12.92,16.11,16.11,0,0,0,5.1.83A15.91,15.91,0,0,0,153,227.3L187.32,193A16,16,0,0,0,192,181.65V155.59a4,4,0,0,0-6.83-2.82l-26.57,26.56a8,8,0,0,1-11.71-.42,8.2,8.2,0,0,1,.6-11.1l49.27-49.27h0C223.45,91.86,224.6,59.71,223.85,47.12Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.OnigiriFill">M231.53,146.57,175.68,50.66l-.11-.19a56,56,0,0,0-95.14,0l-.11.19L24.47,146.57A56,56,0,0,0,72.09,232H183.91a56,56,0,0,0,47.62-85.43Zm-12.68,48.88A39.49,39.49,0,0,1,183.91,216H176V168a16,16,0,0,0-16-16H96a16,16,0,0,0-16,16v48H72.09a40,40,0,0,1-34-61.09,2,2,0,0,0,.11-.2l55.85-95.9a40,40,0,0,1,67.84,0l55.85,95.9a2,2,0,0,0,.11.2A39.5,39.5,0,0,1,218.85,195.45Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BowlingBallFill">M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24Zm4,104a12,12,0,1,1,12-12A12,12,0,0,1,132,128Zm20-36a12,12,0,1,1,12,12A12,12,0,0,1,152,92Zm20,52a12,12,0,1,1,12-12A12,12,0,0,1,172,144Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.LockLaminatedFill">M208,80H176V56a48,48,0,0,0-96,0V80H48A16,16,0,0,0,32,96V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V96A16,16,0,0,0,208,80ZM96,56a32,32,0,0,1,64,0V80H96Zm88,136H72a8,8,0,0,1,0-16H184a8,8,0,0,1,0,16Zm0-32H72a8,8,0,0,1,0-16H184a8,8,0,0,1,0,16Zm0-32H72a8,8,0,0,1,0-16H184a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SpeakerSimpleHighFill">M168,32V224a8,8,0,0,1-12.91,6.31L85.25,176H40a16,16,0,0,1-16-16V96A16,16,0,0,1,40,80H85.25l69.84-54.31A8,8,0,0,1,168,32Zm32,64a8,8,0,0,0-8,8v48a8,8,0,0,0,16,0V104A8,8,0,0,0,200,96Zm32-16a8,8,0,0,0-8,8v80a8,8,0,0,0,16,0V88A8,8,0,0,0,232,80Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SoundcloudLogoFill">M24,120v48a8,8,0,0,1-16,0V120a8,8,0,0,1,16,0ZM48,88a8,8,0,0,0-8,8v96a8,8,0,0,0,16,0V96A8,8,0,0,0,48,88Zm32-8a8,8,0,0,0-8,8V192a8,8,0,0,0,16,0V88A8,8,0,0,0,80,80Zm32-32a8,8,0,0,0-8,8V192a8,8,0,0,0,16,0V56A8,8,0,0,0,112,48Zm110.84,58.34A80,80,0,0,0,144,40h-4a4,4,0,0,0-4,4V196a4,4,0,0,0,4,4h67.21c25.58,0,47.27-19.72,48.71-45.26A48.06,48.06,0,0,0,222.84,106.34Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PaperPlaneFill">M236.2,218.31A15.88,15.88,0,0,1,224,224a16.22,16.22,0,0,1-5.37-.92l-79.95-27a4,4,0,0,1-2.72-3.79V120a8,8,0,0,0-8.53-8,8.19,8.19,0,0,0-7.47,8.26v72a4,4,0,0,1-2.72,3.79l-79.95,27a16,16,0,0,1-19.26-22.92L114,32.13a16,16,0,0,1,27.89,0L237.9,200.1A15.89,15.89,0,0,1,236.2,218.31Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CardsThreeFill">M224,104v96a16,16,0,0,1-16,16H48a16,16,0,0,1-16-16V104A16,16,0,0,1,48,88H208A16,16,0,0,1,224,104ZM56,72H200a8,8,0,0,0,0-16H56a8,8,0,0,0,0,16ZM72,40H184a8,8,0,0,0,0-16H72a8,8,0,0,0,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.NoteBlankFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H156.69A15.86,15.86,0,0,0,168,219.31L219.31,168A15.86,15.86,0,0,0,224,156.69V48A16,16,0,0,0,208,32ZM160,204.69V160h44.69Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SyringeFill">M237.66,77.6a8,8,0,0,1-11.32,0L208,59.25,179.3,88l34.35,34.35a8,8,0,0,1-11.32,11.32L196,127.27l-84,84A16,16,0,0,1,100.65,216H51.26L29.6,237.66a8,8,0,0,1-11.72-.43,8.21,8.21,0,0,1,.61-11.1l21.45-21.46V155.28A16,16,0,0,1,44.63,144l15.18-15.18a4,4,0,0,1,5.66,0L94.3,157.63a8,8,0,1,0,11.32-11.32L76.78,117.47a4,4,0,0,1,0-5.66l11-11a4,4,0,0,1,5.66,0l28.84,28.84a8,8,0,1,0,11.32-11.32L104.79,89.46a4,4,0,0,1,0-5.66l23.87-23.86-6.35-6.35a8,8,0,0,1,.18-11.49,8.22,8.22,0,0,1,11.37.41L168,76.63l28.69-28.7L178.33,29.58a8,8,0,0,1,.17-11.49,8.23,8.23,0,0,1,11.38.41l47.78,47.78A8,8,0,0,1,237.66,77.6Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CloudFogFill">M168,232a8,8,0,0,1-8,8H104a8,8,0,0,1,0-16h56A8,8,0,0,1,168,232Zm-40-32a8,8,0,0,0-8-8H72a8,8,0,0,0,0,16h48A8,8,0,0,0,128,200Zm56-8H160a8,8,0,0,0,0,16h24a8,8,0,0,0,0-16Zm47.87-96.45a76,76,0,0,0-151.78.73A8.18,8.18,0,0,1,72,104l-.6,0A8.14,8.14,0,0,1,64,95.39a92.48,92.48,0,0,1,2.33-16.51,4,4,0,0,0-5-4.78A52.09,52.09,0,0,0,24,124.36C24.2,153.07,48.12,176,76.84,176H156A76.08,76.08,0,0,0,231.87,95.55Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.LinkFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM115.7,192.49a43.31,43.31,0,0,1-55-66.43l25.37-25.37a43.35,43.35,0,0,1,61.25,0,42.9,42.9,0,0,1,9.95,15.43,8,8,0,1,1-15,5.6A27.33,27.33,0,0,0,97.37,112L72,137.37a27.32,27.32,0,0,0,34.68,41.91,8,8,0,1,1,9,13.21Zm79.61-62.55-25.37,25.37A43,43,0,0,1,139.32,168h0a43.35,43.35,0,0,1-40.53-28.12,8,8,0,1,1,15-5.6A27.35,27.35,0,0,0,139.28,152h0a27.14,27.14,0,0,0,19.32-8L184,118.63a27.32,27.32,0,0,0-34.68-41.91,8,8,0,1,1-9-13.21,43.32,43.32,0,0,1,55,66.43Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ChartLineUpFill">M216,40H40A16,16,0,0,0,24,56V200a16,16,0,0,0,16,16H216a16,16,0,0,0,16-16V56A16,16,0,0,0,216,40ZM200,192H56a8,8,0,0,1-8-8V72a8,8,0,0,1,16,0v76.69l34.34-34.35a8,8,0,0,1,11.32,0L128,132.69,172.69,88H144a8,8,0,0,1,0-16h48a8,8,0,0,1,8,8v48a8,8,0,0,1-16,0V99.31l-50.34,50.35a8,8,0,0,1-11.32,0L104,131.31l-40,40V176H200a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.QrCodeFill">M144,184a8,8,0,0,0,8-8V144a8,8,0,0,0-16,0v32A8,8,0,0,0,144,184Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.QrCodeFill2">M208,152H184v-8a8,8,0,0,0-16,0v56H144a8,8,0,0,0,0,16h32a8,8,0,0,0,8-8V168h24a8,8,0,0,0,0-16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.QrCodeFill3">M208,184a8,8,0,0,0-8,8v16a8,8,0,0,0,16,0V192A8,8,0,0,0,208,184Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ThreadsLogoFill">M138.62,128a53.54,53.54,0,0,1,13.1,1.63c-.57,8.21-3.34,15-8.11,19.61A23.89,23.89,0,0,1,127,156c-11.87,0-15-7.58-15-12.07C112,133,125.8,128,138.62,128ZM224,128c0,65.12-35.89,104-96,104S32,193.12,32,128,67.89,24,128,24,224,62.88,224,128ZM72,128c0-43.07,18.32-64,56-64,26.34,0,43,10.08,50.81,30.83a8,8,0,0,0,15-5.66C180.9,55.14,150.9,48,128,48c-26.1,0-45.52,8.7-57.72,25.86C60.8,87.19,56,105.4,56,128s4.8,40.81,14.28,54.14C82.48,199.3,101.9,208,128,208c24.45,0,39.82-8.8,48.41-16.18,10.76-9.25,17.19-21.89,17.19-33.82,0-14.3-6.59-26.79-18.56-35.17a54.16,54.16,0,0,0-7.77-4.5c-2.09-14.65-10-25.75-22.34-31.07C130.43,81,112,83.93,101.21,94.19a8,8,0,0,0,11,11.62c5.43-5.14,16.79-8,26.4-3.85a20.05,20.05,0,0,1,10.77,10.92,68.89,68.89,0,0,0-10.76-.85C113.53,112,96,125.15,96,143.93c0,16.27,13,28.07,31,28.07a40,40,0,0,0,27.75-11.29c4.7-4.59,10.11-12.2,12.17-24A25.55,25.55,0,0,1,177.6,158c0,13.71-15.76,34-49.6,34C90.32,192,72,171.07,72,128Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.AlignTopSimpleFill">M208,32a8,8,0,0,1-8,8H56a8,8,0,0,1,0-16H200A8,8,0,0,1,208,32ZM160,56H96A16,16,0,0,0,80,72V224a16,16,0,0,0,16,16h64a16,16,0,0,0,16-16V72A16,16,0,0,0,160,56Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowsClockwiseFill">M224,48V96a8,8,0,0,1-8,8H168a8,8,0,0,1-5.66-13.66L180.65,72a79.48,79.48,0,0,0-54.72-22.09h-.45A79.52,79.52,0,0,0,69.59,72.71,8,8,0,0,1,58.41,61.27,96,96,0,0,1,192,60.7l18.36-18.36A8,8,0,0,1,224,48ZM186.41,183.29A80,80,0,0,1,75.35,184l18.31-18.31A8,8,0,0,0,88,152H40a8,8,0,0,0-8,8v48a8,8,0,0,0,13.66,5.66L64,195.3a95.42,95.42,0,0,0,66,26.76h.53a95.36,95.36,0,0,0,67.07-27.33,8,8,0,0,0-11.18-11.44Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ThermometerHotFill">M152,146.08V40a32,32,0,0,0-64,0V146.08a56,56,0,1,0,64,0ZM136,56H104V40a16,16,0,0,1,32,0Zm41.3,24.77a8,8,0,0,1,2.33-11.07c15-9.79,26.87-4.75,35.51-1.06C223,72,227.76,74,235.63,68.89a8,8,0,0,1,8.74,13.41C237.88,86.53,232,88,226.69,88c-7,0-12.92-2.54-17.83-4.63C201,80,196.24,78,188.37,83.11A8,8,0,0,1,177.3,80.77Zm69.4,22.46a8,8,0,0,1-2.33,11.07C237.88,118.53,232,120,226.69,120c-7,0-12.92-2.54-17.83-4.63-7.87-3.36-12.62-5.38-20.49-.25a8,8,0,0,1-8.74-13.41c15-9.79,26.87-4.75,35.51-1.06,7.87,3.36,12.62,5.39,20.49.25A8,8,0,0,1,246.7,103.23Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.DotsThreeVerticalFill">M160,16H96A16,16,0,0,0,80,32V224a16,16,0,0,0,16,16h64a16,16,0,0,0,16-16V32A16,16,0,0,0,160,16ZM128,208a12,12,0,1,1,12-12A12,12,0,0,1,128,208Zm0-68a12,12,0,1,1,12-12A12,12,0,0,1,128,140Zm0-68a12,12,0,1,1,12-12A12,12,0,0,1,128,72Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BugDroidFill">M191.83,51.48l13.83-13.82a8,8,0,0,0-11.32-11.32L179.79,40.9a87.81,87.81,0,0,0-103.58,0L61.66,26.34A8,8,0,0,0,50.34,37.66L64.17,51.48A87.72,87.72,0,0,0,40,112v40a88,88,0,0,0,176,0V112A87.72,87.72,0,0,0,191.83,51.48ZM128,40a72.08,72.08,0,0,1,72,72v8H56v-8A72.08,72.08,0,0,1,128,40Zm16,52a12,12,0,1,1,12,12A12,12,0,0,1,144,92ZM88,92a12,12,0,1,1,12,12A12,12,0,0,1,88,92Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FlowArrowFill">M245.66,85.66l-32,32a8,8,0,0,1-11.32-11.32L220.69,88H208c-38.67,0-46.59,19-56.62,43.08C141.05,155.88,129.33,184,80,184H79a32,32,0,1,1,0-16h1c38.67,0,46.59-19,56.62-43.08C147,100.12,158.67,72,208,72h12.69L202.34,53.66a8,8,0,0,1,11.32-11.32l32,32A8,8,0,0,1,245.66,85.66Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowURightDownFill">M221.66,181.66l-48,48a8,8,0,0,1-11.32,0l-48-48A8,8,0,0,1,120,168h40V88a48,48,0,0,0-96,0v88a8,8,0,0,1-16,0V88a64,64,0,0,1,128,0v80h40a8,8,0,0,1,5.66,13.66Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ShoppingBagFill">M216,40H40A16,16,0,0,0,24,56V200a16,16,0,0,0,16,16H216a16,16,0,0,0,16-16V56A16,16,0,0,0,216,40Zm-88,96A48.05,48.05,0,0,1,80,88a8,8,0,0,1,16,0,32,32,0,0,0,64,0,8,8,0,0,1,16,0A48.05,48.05,0,0,1,128,136Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.AlarmFill">M61.66,37.66l-32,32A8,8,0,0,1,18.34,58.34l32-32A8,8,0,0,1,61.66,37.66Zm176,20.68-32-32a8,8,0,0,0-11.32,11.32l32,32a8,8,0,0,0,11.32-11.32ZM224,136a96,96,0,1,1-96-96A96.11,96.11,0,0,1,224,136Zm-32,0a8,8,0,0,0-8-8H136V80a8,8,0,0,0-16,0v56a8,8,0,0,0,8,8h56A8,8,0,0,0,192,136Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PenNibFill">M243.31,81.36,174.63,12.68a16,16,0,0,0-22.63,0L123.56,41.12l-58,21.76A16,16,0,0,0,55.36,75.23L34.59,199.83a4,4,0,0,0,6.77,3.49l57-57a23.85,23.85,0,0,1-2.29-12.08,24,24,0,1,1,13.6,23.4l-57,57a4,4,0,0,0,3.49,6.77l124.61-20.77a16,16,0,0,0,12.35-10.16l21.77-58.07L243.31,104a16,16,0,0,0,0-22.63ZM208,116.68,139.32,48l24-24L232,92.68Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.LadderFill">M215.52,213.26,164.51,73l9.09-25H184a8,8,0,0,0,0-16H88a8,8,0,0,0,0,16h4.58L32.48,213.26a8,8,0,0,0,4.79,10.26A8.14,8.14,0,0,0,40,224a8,8,0,0,0,7.52-5.27L57.24,192h47l-7.74,21.26a8,8,0,0,0,4.79,10.26A8.14,8.14,0,0,0,104,224a8,8,0,0,0,7.52-5.27L130,168H182l18.45,50.73A8,8,0,0,0,208,224a8.14,8.14,0,0,0,2.73-.48A8,8,0,0,0,215.52,213.26ZM109.39,64h30a8,8,0,0,1,0,16H109.39a8,8,0,1,1,0-16Zm.86,96H80.3a8,8,0,0,1,0-16h30a8,8,0,0,1,0,16Zm14.54-40H94.84a8,8,0,0,1,0-16h30a8,8,0,0,1,0,16Zm11,32L156,96.41,176.21,152Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SlidersFill">M84,136a28,28,0,0,1-20,26.83V216a8,8,0,0,1-16,0V162.83a28,28,0,0,1,0-53.66V40a8,8,0,0,1,16,0v69.17A28,28,0,0,1,84,136Zm52-74.83V40a8,8,0,0,0-16,0V61.17a28,28,0,0,0,0,53.66V216a8,8,0,0,0,16,0V114.83a28,28,0,0,0,0-53.66Zm72,80V40a8,8,0,0,0-16,0V141.17a28,28,0,0,0,0,53.66V216a8,8,0,0,0,16,0V194.83a28,28,0,0,0,0-53.66Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.MedalMilitaryFill">M207,40H49A17,17,0,0,0,32,57v49.21a17,17,0,0,0,10,15.47l62.6,28.45a48,48,0,1,0,46.88,0L214,121.68a17,17,0,0,0,10-15.47V57A17,17,0,0,0,207,40ZM96,56h64v72.67l-32,14.54L96,128.67Zm32,168a32,32,0,1,1,32-32A32,32,0,0,1,128,224Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FunnelFill">M227.81,66.76l-.08.09L160,139.17v55.49A16,16,0,0,1,152.87,208l-32,21.34A16,16,0,0,1,96,216V139.17L28.27,66.85l-.08-.09A16,16,0,0,1,40,40H216a16,16,0,0,1,11.84,26.76Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowElbowLeftUpFill">M240,192a8,8,0,0,1-8,8H88a8,8,0,0,1-8-8V104H40a8,8,0,0,1-5.66-13.66l48-48a8,8,0,0,1,11.32,0l48,48A8,8,0,0,1,136,104H96v80H232A8,8,0,0,1,240,192Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PanoramaFill">M241.75,51.32a15.87,15.87,0,0,0-13.86-2.77l-3.48.94C205.61,54.56,170.61,64,128,64S50.39,54.56,31.59,49.49l-3.48-.94A16,16,0,0,0,8,64V192a16,16,0,0,0,16,16,16.22,16.22,0,0,0,4.18-.55l3.18-.86C50.13,201.49,85.17,192,128,192s77.87,9.49,96.69,14.59l3.18.86A16,16,0,0,0,248,192V64A15.9,15.9,0,0,0,241.75,51.32ZM204,96a12,12,0,1,1-12,12A12,12,0,0,1,204,96Zm-76,80c-45,0-82.72,10.23-100.87,15.14L24,192v-39.3l46.34-46.35a8,8,0,0,1,11.32,0L152.28,177C144.49,176.35,136.37,176,128,176Zm100.87,15.14a448.7,448.7,0,0,0-51-11.2l-35.26-35.26L157,130.34a8,8,0,0,1,11.31,0l60.89,60.88Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowElbowUpLeftFill">M200,80V224a8,8,0,0,1-16,0V88H104v40a8,8,0,0,1-13.66,5.66l-48-48a8,8,0,0,1,0-11.32l48-48A8,8,0,0,1,104,32V72h88A8,8,0,0,1,200,80Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.LampFill">M246.68,156.4A8,8,0,0,1,240,160H208v32a8,8,0,0,1-16,0V160H136v48h24a8,8,0,0,1,0,16H96a8,8,0,0,1,0-16h24V160H16a8,8,0,0,1-7.35-11.15l48-112A8,8,0,0,1,64,32H192a8,8,0,0,1,7.35,4.85l48,112A8,8,0,0,1,246.68,156.4Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.AnchorSimpleFill">M232,120a104,104,0,0,1-208,0,8,8,0,0,1,8-8H56a8,8,0,0,1,0,16H40.36A88.15,88.15,0,0,0,120,207.63V90.83a28,28,0,1,1,16,0v116.8A88.15,88.15,0,0,0,215.64,128H200a8,8,0,0,1,0-16h24A8,8,0,0,1,232,120Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SidebarSimpleFill">M216,40H40A16,16,0,0,0,24,56V200a16,16,0,0,0,16,16H216a16,16,0,0,0,16-16V56A16,16,0,0,0,216,40Zm0,160H88V56H216V200Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.EyeSlashFill">M96.68,57.87a4,4,0,0,1,2.08-6.6A130.13,130.13,0,0,1,128,48c34.88,0,66.57,13.26,91.66,38.35,18.83,18.83,27.3,37.62,27.65,38.41a8,8,0,0,1,0,6.5c-.35.79-8.82,19.57-27.65,38.4q-4.28,4.26-8.79,8.07a4,4,0,0,1-5.55-.36ZM213.92,210.62a8,8,0,1,1-11.84,10.76L180,197.13A127.21,127.21,0,0,1,128,208c-34.88,0-66.57-13.26-91.66-38.34C17.51,150.83,9,132.05,8.69,131.26a8,8,0,0,1,0-6.5C9,124,17.51,105.18,36.34,86.35a135,135,0,0,1,25-19.78L42.08,45.38A8,8,0,1,1,53.92,34.62Zm-65.49-48.25-52.69-58a40,40,0,0,0,52.69,58Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.DeviceMobileFill">M176,16H80A24,24,0,0,0,56,40V216a24,24,0,0,0,24,24h96a24,24,0,0,0,24-24V40A24,24,0,0,0,176,16ZM80,32h96a8,8,0,0,1,8,8v8H72V40A8,8,0,0,1,80,32Zm96,192H80a8,8,0,0,1-8-8v-8H184v8A8,8,0,0,1,176,224Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.LessThanOrEqualFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM176,184H72a8,8,0,0,1,0-16H176a8,8,0,0,1,0,16Zm2.35-55.65a8,8,0,0,1-4.7,15.3l-104-32a8,8,0,0,1,0-15.3l104-32a8,8,0,0,1,4.7,15.3L99.2,104Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.WavesFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM197.2,176.87c-13.07,11.18-24.9,15.1-35.64,15.1-14.26,0-26.62-6.92-37.47-13-18.41-10.31-32.95-18.45-54.89.31a8,8,0,1,1-10.4-12.16c30.42-26,54.09-12.76,73.11-2.11,18.41,10.31,33,18.45,54.89-.31a8,8,0,0,1,10.4,12.16Zm0-44c-13.07,11.18-24.9,15.1-35.64,15.1-14.26,0-26.62-6.92-37.47-13-18.41-10.31-32.95-18.45-54.89.31a8,8,0,0,1-10.4-12.16c30.42-26,54.09-12.76,73.11-2.11,18.41,10.31,33,18.45,54.89-.31a8,8,0,1,1,10.4,12.16Zm0-44c-13.07,11.18-24.9,15.1-35.64,15.1-14.26,0-26.62-6.92-37.47-13-18.41-10.31-32.95-18.45-54.89.31A8,8,0,0,1,58.8,79.13c30.42-26,54.09-12.76,73.11-2.11,18.41,10.31,33,18.45,54.89-.31a8,8,0,1,1,10.4,12.16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PasswordFill">M224,48H32A16,16,0,0,0,16,64V192a16,16,0,0,0,16,16H224a16,16,0,0,0,16-16V64A16,16,0,0,0,224,48Zm-19.42,94.71a8,8,0,1,1-13,9.41L184,141.61l-7.63,10.51a8,8,0,1,1-13-9.41l7.64-10.5-12.36-4a8,8,0,1,1,5-15.21L176,117V104a8,8,0,0,1,16,0v13l12.35-4a8,8,0,0,1,5,15.21l-12.36,4Zm-72,0a8,8,0,1,1-13,9.41L112,141.61l-7.63,10.51a8,8,0,1,1-13-9.41l7.64-10.5-12.36-4a8,8,0,1,1,5-15.21L104,117V104a8,8,0,0,1,16,0v13l12.35-4a8,8,0,1,1,5,15.21l-12.36,4ZM64,88v80a8,8,0,0,1-16,0V88a8,8,0,0,1,16,0Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.GogglesFill">M184,64H72A72.08,72.08,0,0,0,0,136a24.06,24.06,0,0,0,17,23c6.06,20.37,37.63,33,55,33a40.07,40.07,0,0,0,39.2-32h33.6A40.07,40.07,0,0,0,184,192c17.33,0,48.9-12.66,55-33a24.06,24.06,0,0,0,17-23A72.08,72.08,0,0,0,184,64ZM89,169a8,8,0,0,1-11.31,0L53.14,144.45a8,8,0,0,1,11.31-11.31L89,157.65A8,8,0,0,1,89,169Zm119.52-.49a8,8,0,0,1-11.31,0l-25.41-25.4a8,8,0,0,1,11.32-11.32l25.4,25.41A8,8,0,0,1,208.48,168.48Zm29.2-26.86C229.34,123.25,200.34,112,184,112a40.07,40.07,0,0,0-39.2,32H111.2A40.07,40.07,0,0,0,72,112c-16.34,0-45.34,11.25-53.68,29.62A8,8,0,0,1,16,136,56.06,56.06,0,0,1,72,80H184a56.06,56.06,0,0,1,56,56A8,8,0,0,1,237.68,141.62Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FolderSimplePlusFill">M216,72H130.67L102.93,51.2a16.12,16.12,0,0,0-9.6-3.2H40A16,16,0,0,0,24,64V200a16,16,0,0,0,16,16H216.89A15.13,15.13,0,0,0,232,200.89V88A16,16,0,0,0,216,72Zm-64,80H136v16a8,8,0,0,1-16,0V152H104a8,8,0,0,1,0-16h16V120a8,8,0,0,1,16,0v16h16a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FilePngFill">M44,120H212a4,4,0,0,0,4-4V88a8,8,0,0,0-2.34-5.66l-56-56A8,8,0,0,0,152,24H56A16,16,0,0,0,40,40v76A4,4,0,0,0,44,120ZM152,44l44,44H152ZM60,144H44a8,8,0,0,0-8,8v55.72A8.17,8.17,0,0,0,43.47,216,8,8,0,0,0,52,208v-8h7.4c15.24,0,28.14-11.92,28.59-27.15A28,28,0,0,0,60,144Zm-.35,40H52V160h8a12,12,0,0,1,12,13.16A12.25,12.25,0,0,1,59.65,184ZM224,200.87a8,8,0,0,1-2.26,5.57A30.07,30.07,0,0,1,200,216c-17.64,0-32-16.15-32-36s14.36-36,32-36a29.36,29.36,0,0,1,16.09,4.86,8.21,8.21,0,0,1,3,10.64,8,8,0,0,1-11.55,2.88A13.21,13.21,0,0,0,200,160c-8.82,0-16,9-16,20s7.18,20,16,20a13.57,13.57,0,0,0,8-2.72V192a8,8,0,0,1-8-8.53,8.17,8.17,0,0,1,8.25-7.47H216a8,8,0,0,1,8,8ZM156,152v55.76a8.22,8.22,0,0,1-4.12,7.24,8,8,0,0,1-10.39-2.35L116,177v30.76a8.17,8.17,0,0,1-7.47,8.26,8,8,0,0,1-8.53-8V152.31a8.27,8.27,0,0,1,4.53-7.52,8,8,0,0,1,10,2.56L140,183V152.27a8.17,8.17,0,0,1,7.47-8.25A8,8,0,0,1,156,152Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.HexagonFill">M232,80.18v95.64a16,16,0,0,1-8.32,14l-88,48.17a15.88,15.88,0,0,1-15.36,0l-88-48.17a16,16,0,0,1-8.32-14V80.18a16,16,0,0,1,8.32-14l88-48.17a15.88,15.88,0,0,1,15.36,0l88,48.17A16,16,0,0,1,232,80.18Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.EnvelopeOpenFill">M228.44,89.34l-96-64a8,8,0,0,0-8.88,0l-96,64A8,8,0,0,0,24,96V200a16,16,0,0,0,16,16H216a16,16,0,0,0,16-16V96A8,8,0,0,0,228.44,89.34ZM96.72,152,40,192V111.53Zm16.37,8h29.82l56.63,40H56.46Zm46.19-8L216,111.53V192Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.TreePalmFill">M239.84,60.33a8,8,0,0,1-4.65,5.75L179,90.55a71.42,71.42,0,0,1,43.36,33.21,70.64,70.64,0,0,1,7.2,54.32A8,8,0,0,1,217,182.36l-81-61.68V224a8,8,0,0,1-16,0V120.68L39,182.36a8,8,0,0,1-12.57-4.28,70.64,70.64,0,0,1,7.2-54.32A71.42,71.42,0,0,1,77,90.55L20.81,66.08a8,8,0,0,1-2.6-12.85,66.86,66.86,0,0,1,97.74,0,72.21,72.21,0,0,1,12,17,72.21,72.21,0,0,1,12.05-17,66.86,66.86,0,0,1,97.74,0A8,8,0,0,1,239.84,60.33Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CaretLineUpFill">M213.66,186.34A8,8,0,0,1,208,200H48a8,8,0,0,1-5.66-13.66l80-80a8,8,0,0,1,11.32,0ZM48,80H208a8,8,0,0,0,0-16H48a8,8,0,0,0,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SelectionSlashFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM152,56h32a16,16,0,0,1,16,16v32a8,8,0,0,1-16,0V72H152a8,8,0,0,1,0-16ZM104,200H72a16,16,0,0,1-16-16V152a8,8,0,0,1,16,0v32h32a8,8,0,0,1,0,16Zm101.66,5.66a8,8,0,0,1-11.32,0L188.69,200H152a8,8,0,0,1,0-16h20.69L72,83.31V104a8,8,0,0,1-16,0V67.31l-5.66-5.65A8,8,0,0,1,61.66,50.34l8,8h0l136,136A8,8,0,0,1,205.66,205.66Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.TrolleyFill">M88,224a16,16,0,1,1-16-16A16,16,0,0,1,88,224Zm128-16a16,16,0,1,0,16,16A16,16,0,0,0,216,208Zm24-32H56V75.31A15.86,15.86,0,0,0,51.31,64L29.66,42.34A8,8,0,0,0,18.34,53.66L40,75.31V176H32a8,8,0,0,0,0,16H240a8,8,0,0,0,0-16ZM88,160H216a16,16,0,0,0,16-16V80a16,16,0,0,0-16-16H88A16,16,0,0,0,72,80v64A16,16,0,0,0,88,160Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ExcludeFill">M240,160A80,80,0,0,1,81.36,174.64a80,80,0,0,0,93.28-93.28A80,80,0,0,1,240,160ZM160,80a80.29,80.29,0,0,1,14.64,1.36,80,80,0,1,0-93.28,93.28A80,80,0,0,1,160,80Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BoulesFill">M232,128c0,56.63-47.38,104-104,104a103.67,103.67,0,0,1-31.52-4.89,4,4,0,0,1-1.62-6.65L220.46,94.85a4,4,0,0,1,6.65,1.62A103.69,103.69,0,0,1,232,128ZM215.84,72.39a103.16,103.16,0,0,0-6.06-8.56,4,4,0,0,0-6-.33L63.5,203.82a4,4,0,0,0,.33,6,103.16,103.16,0,0,0,8.56,6.06,4,4,0,0,0,5-.54L215.3,77.39A4,4,0,0,0,215.84,72.39ZM192.17,46.22a103.16,103.16,0,0,0-8.56-6.06,4,4,0,0,0-5,.54L40.7,178.62a4,4,0,0,0-.54,5,103.16,103.16,0,0,0,6.06,8.56,4,4,0,0,0,6,.33L192.5,52.18A4,4,0,0,0,192.17,46.22ZM159.53,28.89A103.67,103.67,0,0,0,128,24C71.38,24,24,71.37,24,128a103.69,103.69,0,0,0,4.89,31.53,4,4,0,0,0,6.65,1.62L161.15,35.54A4,4,0,0,0,159.53,28.89Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.WifiMediumFill">M247.89,80.91a15.93,15.93,0,0,0-6.17-10.81A186.67,186.67,0,0,0,128,32,186.67,186.67,0,0,0,14.28,70.1,15.93,15.93,0,0,0,8.11,80.91,15.65,15.65,0,0,0,11.65,92.8l104,125.43A15.93,15.93,0,0,0,128,224h0a15.93,15.93,0,0,0,12.31-5.77h0l104-125.43A15.65,15.65,0,0,0,247.89,80.91Zm-46.77,38.94a124,124,0,0,0-146.24,0L24.09,82.74A170.76,170.76,0,0,1,128,48,170.76,170.76,0,0,1,231.91,82.74Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ShareFatFill">M237.66,117.66l-80,80A8,8,0,0,1,144,192V152.23c-57.1,3.24-96.25,40.27-107.24,52h0a12,12,0,0,1-20.68-9.58c3.71-32.26,21.38-63.29,49.76-87.37,23.57-20,52.22-32.69,78.16-34.91V32a8,8,0,0,1,13.66-5.66l80,80A8,8,0,0,1,237.66,117.66Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.NumberSquareTwoFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM152,168a8,8,0,0,1,0,16H104a8,8,0,0,1-6.4-12.8l43.17-57.56a16,16,0,1,0-27.86-15,8,8,0,0,1-15.09-5.34,32,32,0,1,1,55.74,29.93L120,168Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CurrencyCnyFill">M128,16A104,104,0,1,0,232,120,104.11,104.11,0,0,0,128,16ZM88,72h80a8,8,0,0,1,0,16H88a8,8,0,0,1,0-16Zm104,88a8,8,0,0,1-8,8H160a24,24,0,0,1-24-24V120H120a48.05,48.05,0,0,1-48,48,8,8,0,0,1,0-16,32,32,0,0,0,32-32H80a8,8,0,0,1,0-16h96a8,8,0,0,1,0,16H152v24a8,8,0,0,0,8,8h16v-8a8,8,0,0,1,16,0Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FileArrowUpFill">M213.66,82.34l-56-56A8,8,0,0,0,152,24H56A16,16,0,0,0,40,40V216a16,16,0,0,0,16,16H200a16,16,0,0,0,16-16V88A8,8,0,0,0,213.66,82.34Zm-56,67.32a8,8,0,0,1-11.32,0L136,139.31V184a8,8,0,0,1-16,0V139.31l-10.34,10.35a8,8,0,0,1-11.32-11.32l24-24a8,8,0,0,1,11.32,0l24,24A8,8,0,0,1,157.66,149.66ZM152,88V44l44,44Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FaceMaskFill">M224,72h-.85a16,16,0,0,0-9.68-10L133.47,33a16.06,16.06,0,0,0-10.94,0l-80,29.09a16,16,0,0,0-9.68,10H32A32,32,0,0,0,0,104v24a32,32,0,0,0,32,32h5.19c7.19,15.8,21.79,29.43,43.23,40.16a191.16,191.16,0,0,0,46.15,15.71,7.93,7.93,0,0,0,2.86,0,191.16,191.16,0,0,0,46.15-15.71c21.44-10.73,36-24.36,43.23-40.16H224a32,32,0,0,0,32-32V104A32,32,0,0,0,224,72ZM32,144a16,16,0,0,1-16-16V104A16,16,0,0,1,32,88v48a58.74,58.74,0,0,0,.55,8Zm136,0H88a8,8,0,0,1,0-16h80a8,8,0,0,1,0,16Zm0-32H88a8,8,0,0,1,0-16h80a8,8,0,0,1,0,16Zm72,16a16,16,0,0,1-16,16h-.55a58.74,58.74,0,0,0,.55-8V88a16,16,0,0,1,16,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.WebcamFill">M160,104a32,32,0,1,1-32-32A32,32,0,0,1,160,104Zm72,104a8,8,0,0,1-8,8H32a8,8,0,0,1,0-16h88V183.6a80,80,0,1,1,16,0V200h88A8,8,0,0,1,232,208ZM128,152a48,48,0,1,0-48-48A48.05,48.05,0,0,0,128,152Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.TicketFill">M232,104a8,8,0,0,0,8-8V64a16,16,0,0,0-16-16H32A16,16,0,0,0,16,64V96a8,8,0,0,0,8,8,24,24,0,0,1,0,48,8,8,0,0,0-8,8v32a16,16,0,0,0,16,16H224a16,16,0,0,0,16-16V160a8,8,0,0,0-8-8,24,24,0,0,1,0-48ZM32,167.2a40,40,0,0,0,0-78.4V64H88V192H32Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FolderSimpleLockFill">M224,160h-8v-4a28,28,0,0,0-56,0v4h-8a8,8,0,0,0-8,8v40a8,8,0,0,0,8,8h72a8,8,0,0,0,8-8V168A8,8,0,0,0,224,160Zm-24,0H176v-4a12,12,0,0,1,24,0Zm32-72v16a8,8,0,0,1-16,0V88H130.67a16.12,16.12,0,0,1-9.6-3.2L93.33,64H40V200h72a8,8,0,0,1,0,16H40a16,16,0,0,1-16-16V64A16,16,0,0,1,40,48H93.33a16.12,16.12,0,0,1,9.6,3.2L130.67,72H216A16,16,0,0,1,232,88Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.DiamondsFourFill">M82.34,69.66a8,8,0,0,1,0-11.32l40-40a8,8,0,0,1,11.32,0l40,40a8,8,0,0,1,0,11.32l-40,40a8,8,0,0,1-11.32,0Zm51.32,76.68a8,8,0,0,0-11.32,0l-40,40a8,8,0,0,0,0,11.32l40,40a8,8,0,0,0,11.32,0l40-40a8,8,0,0,0,0-11.32Zm104-24-40-40a8,8,0,0,0-11.32,0l-40,40a8,8,0,0,0,0,11.32l40,40a8,8,0,0,0,11.32,0l40-40A8,8,0,0,0,237.66,122.34Zm-128,0-40-40a8,8,0,0,0-11.32,0l-40,40a8,8,0,0,0,0,11.32l40,40a8,8,0,0,0,11.32,0l40-40A8,8,0,0,0,109.66,122.34Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.EyeClosedFill">M230.94,164A8,8,0,1,1,217.05,172l-19-33.2A123.23,123.23,0,0,1,162,155.46l5.87,35.22a8,8,0,0,1-6.58,9.21A8.4,8.4,0,0,1,160,200a8,8,0,0,1-7.88-6.69l-5.77-34.58a133.06,133.06,0,0,1-36.68,0l-5.77,34.58A8,8,0,0,1,96,200a8.4,8.4,0,0,1-1.32-.11,8,8,0,0,1-6.58-9.21L94,155.46a123.23,123.23,0,0,1-36.06-16.69L39,172A8,8,0,1,1,25.06,164l20-35a152.8,152.8,0,0,1-19.3-20,8,8,0,0,1,0-10.06C44.56,75.72,77.55,48,128,48s83.44,27.72,102.22,51a8,8,0,0,1,0,10.06,152.8,152.8,0,0,1-19.3,20Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.IdentificationCardFill">M112,120a16,16,0,1,1-16-16A16,16,0,0,1,112,120ZM232,56V200a16,16,0,0,1-16,16H40a16,16,0,0,1-16-16V56A16,16,0,0,1,40,40H216A16,16,0,0,1,232,56ZM135.75,166a39.76,39.76,0,0,0-17.19-23.34,32,32,0,1,0-45.12,0A39.84,39.84,0,0,0,56.25,166a8,8,0,0,0,15.5,4c2.64-10.25,13.06-18,24.25-18s21.62,7.73,24.25,18a8,8,0,1,0,15.5-4ZM200,144a8,8,0,0,0-8-8H152a8,8,0,0,0,0,16h40A8,8,0,0,0,200,144Zm0-32a8,8,0,0,0-8-8H152a8,8,0,0,0,0,16h40A8,8,0,0,0,200,112Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.UmbrellaFill">M240,126.63A112.21,112.21,0,0,0,128,24h0A112.21,112.21,0,0,0,16.05,126.63,16,16,0,0,0,32,144h88v56a32,32,0,0,0,64,0,8,8,0,0,0-16,0,16,16,0,0,1-32,0V144h88a16,16,0,0,0,16-17.37ZM32,128a96.15,96.15,0,0,1,76.2-85.89C96.48,58,81.85,86.11,80.17,128H32Zm143.83,0c-1.68-41.89-16.31-70-28-85.94A96.07,96.07,0,0,1,224,128Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ContactlessPaymentFill">M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24ZM97.07,155.74a8,8,0,1,1-14.14-7.48,42.79,42.79,0,0,0,0-40.52,8,8,0,0,1,14.14-7.48A59.33,59.33,0,0,1,97.07,155.74Zm28,16a8,8,0,1,1-14.12-7.52,77.07,77.07,0,0,0,0-72.48,8,8,0,1,1,14.12-7.52A93,93,0,0,1,125.06,171.76Zm28,16A8,8,0,0,1,139,180.23a110.62,110.62,0,0,0,0-104.46,8,8,0,0,1,14.12-7.54A126.67,126.67,0,0,1,153.07,187.77Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PencilSimpleLineFill">M227.32,73.37,182.63,28.69a16,16,0,0,0-22.63,0L36.69,152A15.86,15.86,0,0,0,32,163.31V208a16,16,0,0,0,16,16H216a8,8,0,0,0,0-16H115.32l112-112A16,16,0,0,0,227.32,73.37ZM192,108.69,147.32,64l24-24L216,84.69Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.DotsSixVerticalFill">M192,16H64A16,16,0,0,0,48,32V224a16,16,0,0,0,16,16H192a16,16,0,0,0,16-16V32A16,16,0,0,0,192,16ZM100,200a12,12,0,1,1,12-12A12,12,0,0,1,100,200Zm0-60a12,12,0,1,1,12-12A12,12,0,0,1,100,140Zm0-60a12,12,0,1,1,12-12A12,12,0,0,1,100,80Zm56,120a12,12,0,1,1,12-12A12,12,0,0,1,156,200Zm0-60a12,12,0,1,1,12-12A12,12,0,0,1,156,140Zm0-60a12,12,0,1,1,12-12A12,12,0,0,1,156,80Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BracketsSquareFill">M216,40H40A16,16,0,0,0,24,56V200a16,16,0,0,0,16,16H216a16,16,0,0,0,16-16V56A16,16,0,0,0,216,40ZM104,176a8,8,0,0,1,0,16H72a8,8,0,0,1-8-8V72a8,8,0,0,1,8-8h32a8,8,0,0,1,0,16H80v96Zm88,8a8,8,0,0,1-8,8H152a8,8,0,0,1,0-16h24V80H152a8,8,0,0,1,0-16h32a8,8,0,0,1,8,8Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.TextHFourFill">M164.46,144,184,119.13V144ZM224,48V208a16,16,0,0,1-16,16H48a16,16,0,0,1-16-16V48A16,16,0,0,1,48,32H208A16,16,0,0,1,224,48ZM128,80a8,8,0,0,0-16,0v32H72V80a8,8,0,0,0-16,0v80a8,8,0,0,0,16,0V128h40v32a8,8,0,0,0,16,0Zm84,72a8,8,0,0,0-8-8h-4V96a8,8,0,0,0-14.29-4.94l-44,56A8,8,0,0,0,148,160h36v16a8,8,0,0,0,16,0V160h4A8,8,0,0,0,212,152Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.UploadSimpleFill">M224,144v64a8,8,0,0,1-8,8H40a8,8,0,0,1-8-8V144a8,8,0,0,1,16,0v56H208V144a8,8,0,0,1,16,0ZM88,80h32v64a8,8,0,0,0,16,0V80h32a8,8,0,0,0,5.66-13.66l-40-40a8,8,0,0,0-11.32,0l-40,40A8,8,0,0,0,88,80Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ColumnsFill">M120,48V208a16,16,0,0,1-16,16H64a16,16,0,0,1-16-16V48A16,16,0,0,1,64,32h40A16,16,0,0,1,120,48Zm72-16H152a16,16,0,0,0-16,16V208a16,16,0,0,0,16,16h40a16,16,0,0,0,16-16V48A16,16,0,0,0,192,32Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.NumberCircleFourFill">M104.36,144,136,103.32V144ZM232,128A104,104,0,1,1,128,24,104.11,104.11,0,0,1,232,128Zm-64,24a8,8,0,0,0-8-8h-8V80a8,8,0,0,0-14.31-4.91l-56,72A8,8,0,0,0,88,160h48v16a8,8,0,0,0,16,0V160h8A8,8,0,0,0,168,152Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PlanetFill">M245.11,60.68c-7.65-13.19-27.85-16.16-58.5-8.66A96,96,0,0,0,32.81,140.3C5.09,169,5.49,186,10.9,195.32,16,204.16,26.64,208,40.64,208a124.11,124.11,0,0,0,28.79-4,96,96,0,0,0,153.78-88.25c12.51-13,20.83-25.35,23.66-35.92C248.83,72.51,248.24,66.07,245.11,60.68Zm-13.69,15c-6.11,22.78-48.65,57.31-87.52,79.64-67.81,39-113.62,41.52-119.16,32-1.46-2.51-.65-7.24,2.22-13a80.06,80.06,0,0,1,10.28-15.05,95.53,95.53,0,0,0,6.23,14.18,4,4,0,0,0,4,2.12,122.14,122.14,0,0,0,16.95-3.32c21.23-5.55,46.63-16.48,71.52-30.78s47-30.66,62.45-46.15A122.74,122.74,0,0,0,209.7,82.45a4,4,0,0,0,.17-4.52,96.26,96.26,0,0,0-9.1-12.46c14.21-2.35,27.37-2.17,30.5,3.24C232.19,70.28,232.24,72.63,231.42,75.69Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CirclesFourFill">M120,80A40,40,0,1,1,80,40,40,40,0,0,1,120,80Zm56,40a40,40,0,1,0-40-40A40,40,0,0,0,176,120ZM80,136a40,40,0,1,0,40,40A40,40,0,0,0,80,136Zm96,0a40,40,0,1,0,40,40A40,40,0,0,0,176,136Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.HandCoinsFill">M128.09,57.38a36,36,0,0,1,55.17-27.82,4,4,0,0,1-.56,7A52.06,52.06,0,0,0,152,84c0,1.17,0,2.34.12,3.49a4,4,0,0,1-6,3.76A36,36,0,0,1,128.09,57.38ZM240,160.61a24.47,24.47,0,0,1-13.6,22l-.44.2-38.83,16.54a6.94,6.94,0,0,1-1.19.4l-64,16A7.93,7.93,0,0,1,120,216H16A16,16,0,0,1,0,200V160a16,16,0,0,1,16-16H44.69l22.62-22.63A31.82,31.82,0,0,1,89.94,112H140a28,28,0,0,1,27.25,34.45l41.84-9.62A24.61,24.61,0,0,1,240,160.61Zm-16,0a8.61,8.61,0,0,0-10.87-8.3l-.31.08-67,15.41a8.32,8.32,0,0,1-1.79.2H112a8,8,0,0,1,0-16h28a12,12,0,0,0,0-24H89.94a15.86,15.86,0,0,0-11.31,4.69L56,155.31V200h63l62.43-15.61,38-16.18A8.56,8.56,0,0,0,224,160.61ZM168,84a36,36,0,1,0,36-36A36,36,0,0,0,168,84Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FireFill">M143.38,17.85a8,8,0,0,0-12.63,3.41l-22,60.41L84.59,58.26a8,8,0,0,0-11.93.89C51,87.53,40,116.08,40,144a88,88,0,0,0,176,0C216,84.55,165.21,36,143.38,17.85Zm40.51,135.49a57.6,57.6,0,0,1-46.56,46.55A7.65,7.65,0,0,1,136,200a8,8,0,0,1-1.32-15.89c16.57-2.79,30.63-16.85,33.44-33.45a8,8,0,0,1,15.78,2.68Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SubtitlesSlashFill">M53.92,34.62a8,8,0,0,0-11.48-.37,8.23,8.23,0,0,0-.14,11.38L44.46,48H32A16,16,0,0,0,16,64V192a16,16,0,0,0,16,16H189.92l12.16,13.38a8,8,0,0,0,11.33.51,8.31,8.31,0,0,0,.3-11.51ZM104,128h13.19l14.54,16H104.27A8.18,8.18,0,0,1,96,136.53,8,8,0,0,1,104,128Zm-48,0H72a8,8,0,0,1,8,8.53A8.18,8.18,0,0,1,71.73,144H56.27A8.18,8.18,0,0,1,48,136.53,8,8,0,0,1,56,128Zm96,48H56.27A8.18,8.18,0,0,1,48,168.53,8,8,0,0,1,56,160h90.28l11.9,13.09A8,8,0,0,1,152,176ZM240,64V192a16,16,0,0,1-5.19,11.78,4,4,0,0,1-5.7-.24L175,144h25a8,8,0,0,0,8-8.53,8.17,8.17,0,0,0-8.25-7.47h-39.3L93.79,54.69a4,4,0,0,1,3-6.69H224A16,16,0,0,1,240,64Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowsOutFill">M216,48V96a8,8,0,0,1-13.66,5.66L184,83.31l-26.34,26.35a8,8,0,0,1-11.32-11.32L172.69,72,154.34,53.66A8,8,0,0,1,160,40h48A8,8,0,0,1,216,48ZM98.34,146.34,72,172.69,53.66,154.34A8,8,0,0,0,40,160v48a8,8,0,0,0,8,8H96a8,8,0,0,0,5.66-13.66L83.31,184l26.35-26.34a8,8,0,0,0-11.32-11.32Zm112.72,6.27a8,8,0,0,0-8.72,1.73L184,172.69l-26.34-26.35a8,8,0,0,0-11.32,11.32L172.69,184l-18.35,18.34A8,8,0,0,0,160,216h48a8,8,0,0,0,8-8V160A8,8,0,0,0,211.06,152.61ZM83.31,72l18.35-18.34A8,8,0,0,0,96,40H48a8,8,0,0,0-8,8V96a8,8,0,0,0,13.66,5.66L72,83.31l26.34,26.35a8,8,0,0,0,11.32-11.32Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PiFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM172,168a12,12,0,0,0,12-12,8,8,0,0,1,16,0,28,28,0,0,1-56,0V96H112v80a8,8,0,0,1-16,0V96H88a24,24,0,0,0-24,24,8,8,0,0,1-16,0A40,40,0,0,1,88,80H192a8,8,0,0,1,0,16H160v60A12,12,0,0,0,172,168Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SmileyXEyesFill">M128,24A104,104,0,1,0,232,128,104.13,104.13,0,0,0,128,24Zm-18.34,98.34a8,8,0,0,1-11.32,11.32L88,123.31,77.66,133.66a8,8,0,0,1-11.32-11.32L76.69,112,66.34,101.66A8,8,0,0,1,77.66,90.34L88,100.69,98.34,90.34a8,8,0,0,1,11.32,11.32L99.31,112ZM128,192a12,12,0,1,1,12-12A12,12,0,0,1,128,192Zm61.66-69.66a8,8,0,0,1-11.32,11.32L168,123.31l-10.34,10.35a8,8,0,0,1-11.32-11.32L156.69,112l-10.35-10.34a8,8,0,0,1,11.32-11.32L168,100.69l10.34-10.35a8,8,0,0,1,11.32,11.32L179.31,112Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PulseFill">M216,40H40A16,16,0,0,0,24,56V200a16,16,0,0,0,16,16H216a16,16,0,0,0,16-16V56A16,16,0,0,0,216,40Zm-8,96H188.64L159,188a8,8,0,0,1-6.95,4h-.46a8,8,0,0,1-6.89-4.84L103,89.92,79,132a8,8,0,0,1-7,4H48a8,8,0,0,1,0-16H67.36L97.05,68a8,8,0,0,1,14.3.82L153,166.08l24-42.05a8,8,0,0,1,6.95-4h24a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ChalkboardTeacherFill">M216,40H40A16,16,0,0,0,24,56V200a16,16,0,0,0,16,16H53.39a8,8,0,0,0,7.23-4.57,48,48,0,0,1,86.76,0,8,8,0,0,0,7.23,4.57H216a16,16,0,0,0,16-16V56A16,16,0,0,0,216,40ZM104,168a32,32,0,1,1,32-32A32,32,0,0,1,104,168Zm112,32H159.43a63.93,63.93,0,0,0-13.16-16H192a8,8,0,0,0,8-8V80a8,8,0,0,0-8-8H64a8,8,0,0,0-8,8v96a8,8,0,0,0,6,7.75A63.72,63.72,0,0,0,48.57,200H40V56H216Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ToteSimpleFill">M236,69.4A16.13,16.13,0,0,0,223.92,64H176a48,48,0,0,0-96,0H32.08a16.13,16.13,0,0,0-12,5.4,16,16,0,0,0-3.92,12.48l14.26,120a16,16,0,0,0,16,14.12H209.67a16,16,0,0,0,16-14.12l14.26-120A16,16,0,0,0,236,69.4ZM128,32a32,32,0,0,1,32,32H96A32,32,0,0,1,128,32Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FileCsvFill">M213.66,82.34l-56-56A8,8,0,0,0,152,24H56A16,16,0,0,0,40,40v76a4,4,0,0,0,4,4H212a4,4,0,0,0,4-4V88A8,8,0,0,0,213.66,82.34ZM152,88V44l44,44ZM48,180c0,11,7.18,20,16,20a14.18,14.18,0,0,0,10.06-4.5,8.21,8.21,0,0,1,10.9-.91,8,8,0,0,1,.82,11.81A30.06,30.06,0,0,1,64,216c-17.64,0-32-16.15-32-36s14.36-36,32-36a30,30,0,0,1,21.39,9.19,8.26,8.26,0,0,1,.73,11.09,8,8,0,0,1-11.9.38A14.17,14.17,0,0,0,64,160C55.18,160,48,169,48,180Zm103.81,16.31a20.82,20.82,0,0,1-9.19,15.23C137.43,215,131,216,125.13,216A61.14,61.14,0,0,1,110,214a8,8,0,1,1,4.3-15.41c4.38,1.2,14.95,2.7,19.55-.36.88-.59,1.83-1.52,2.14-3.93.35-2.67-.71-4.1-12.78-7.59-9.35-2.7-25-7.23-23-23.11a20.56,20.56,0,0,1,9-14.95c11.84-8,30.71-3.31,32.83-2.76a8,8,0,0,1-4.07,15.48c-4.49-1.17-15.23-2.56-19.83.56a4.54,4.54,0,0,0-2,3.67c-.12.9-.14,1.09,1.11,1.9,2.31,1.49,6.45,2.68,10.45,3.84C137.49,174.17,154.05,179,151.81,196.31ZM215.42,155l-19.89,55.68a8,8,0,0,1-15.06,0L160.58,155a8.21,8.21,0,0,1,4.5-10.45,8,8,0,0,1,10.45,4.76L188,184.21l12.47-34.9a8,8,0,0,1,10.45-4.76A8.23,8.23,0,0,1,215.42,155Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FileTxtFill">M154.31,156.92,137.83,180l16.53,23.14a8.18,8.18,0,0,1-1.22,11,8,8,0,0,1-11.65-1.48L128,193.76l-13.49,18.89a8,8,0,0,1-11.64,1.49,8.17,8.17,0,0,1-1.23-11L118.17,180l-16.48-23.08a8.22,8.22,0,0,1,1.46-11.28,8,8,0,0,1,11.36,1.71L128,166.24l13.49-18.89a8,8,0,0,1,11.36-1.71A8.22,8.22,0,0,1,154.31,156.92ZM84,144H44.27A8.18,8.18,0,0,0,36,151.47,8,8,0,0,0,44,160H56v47.73A8.17,8.17,0,0,0,63.47,216,8,8,0,0,0,72,208V160H83.73A8.18,8.18,0,0,0,92,152.53,8,8,0,0,0,84,144Zm128,0H172.27a8.18,8.18,0,0,0-8.25,7.47,8,8,0,0,0,8,8.53h12v47.73a8.17,8.17,0,0,0,7.47,8.25,8,8,0,0,0,8.53-8V160h11.73a8.18,8.18,0,0,0,8.25-7.47A8,8,0,0,0,212,144ZM40,116V40A16,16,0,0,1,56,24h96a8,8,0,0,1,5.66,2.34l56,56A8,8,0,0,1,216,88v28a4,4,0,0,1-4,4H44A4,4,0,0,1,40,116ZM152,88h44L152,44Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FishSimpleFill">M168,76a12,12,0,1,1-12-12A12,12,0,0,1,168,76Zm42,79.08c-15.08,20.84-37.53,34.88-66.7,41.74-20.08,4.72-43.54,6-70.12,3.93q2.4,17.82,6.72,37.54a8,8,0,0,1-6.1,9.52,7.81,7.81,0,0,1-1.72.19,8,8,0,0,1-7.81-6.29q-4.89-22.36-7.41-42.62-20.22-2.51-42.58-7.41a8,8,0,0,1,3.43-15.63q19.7,4.32,37.5,6.73c-2.09-26.56-.78-50,3.93-70.06C66,83.55,80.05,61.1,100.88,46,115,35.76,140.14,23.64,179.27,24c21.19.21,40.83,4.33,43.81,6.08a8,8,0,0,1,2.83,2.83c1.75,3,5.87,22.59,6.08,43.78C232.21,98.31,228.57,129.44,210,155.08Zm2.43-111.52a175.75,175.75,0,0,0-39.22-3.51c-24.34.64-44.71,6.49-60.76,17.39a96,96,0,0,0,86.09,86.1c10.91-16,16.76-36.42,17.4-60.76A175.82,175.82,0,0,0,212.44,43.56Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CalendarCheckFill">M208,32H184V24a8,8,0,0,0-16,0v8H88V24a8,8,0,0,0-16,0v8H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM169.66,133.66l-48,48a8,8,0,0,1-11.32,0l-24-24a8,8,0,0,1,11.32-11.32L116,164.69l42.34-42.35a8,8,0,0,1,11.32,11.32ZM48,80V48H72v8a8,8,0,0,0,16,0V48h80v8a8,8,0,0,0,16,0V48h24V80Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CraneTowerFill">M127.73,208H112V164a4,4,0,0,0-4-4H44a4,4,0,0,0-4,4v44H24.27A8.17,8.17,0,0,0,16,215.47,8,8,0,0,0,24,224H128a8,8,0,0,0,8-8.53A8.17,8.17,0,0,0,127.73,208Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CraneTowerFill2">M239.73,80H108.94L87.16,36.42A8,8,0,0,0,80,32H48a8,8,0,0,0-8,8V80H24.27A8.17,8.17,0,0,0,16,87.47,8,8,0,0,0,24,96H40v44a4,4,0,0,0,4,4h64a4,4,0,0,0,4-4V96h96v88H192v-7.73a8.18,8.18,0,0,0-7.47-8.25,8,8,0,0,0-8.53,8v8a16,16,0,0,0,16,16h16a16,16,0,0,0,16-16V96h16a8,8,0,0,0,8-8.53A8.17,8.17,0,0,0,239.73,80ZM56,80V48H75.06l16,32Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BluetoothSlashFill">M221.38,221.92a8,8,0,0,1-11.3-.54l-26.45-29.1L132.8,230.4a8,8,0,0,1-8.89.47,8.29,8.29,0,0,1-3.91-7.18V144L68.8,182.4a8,8,0,0,1-11.16-1.55,8.26,8.26,0,0,1,1.81-11.43l61.47-46.11L50.08,45.38A8,8,0,0,1,61.92,34.62l160,176A8,8,0,0,1,221.38,221.92ZM155,113.22a4,4,0,0,0,5.36.51L196.8,86.4a8,8,0,0,0,0-12.8l-64-48a8,8,0,0,0-10,.29A8.25,8.25,0,0,0,120,32.24V73.18a4,4,0,0,0,1,2.69Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowCircleDownLeftFill">M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24Zm37.66,77.66L115.31,152H144a8,8,0,0,1,0,16H96a8,8,0,0,1-8-8V112a8,8,0,0,1,16,0v28.69l50.34-50.35a8,8,0,0,1,11.32,11.32Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CaretCircleDoubleRightFill">M201.57,54.42a104,104,0,1,0,0,147.15A104.17,104.17,0,0,0,201.57,54.42Zm-75.91,79.24-32,32a8,8,0,1,1-11.32-11.32L108.68,128,82.32,101.64A8,8,0,1,1,93.64,90.32l32,32A8,8,0,0,1,125.66,133.66Zm56,0-32,32a8,8,0,0,1-11.32-11.32L164.71,128l-26.36-26.36a8,8,0,1,1,11.32-11.32l32,32A8,8,0,0,1,181.68,133.66Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.TrainRegionalFill">M168,88a8,8,0,0,1-8,8H96a8,8,0,0,1,0-16h64A8,8,0,0,1,168,88Zm55.72,34.1-22.39,82.11A16,16,0,0,1,185.89,216H176l14.4,19.2a8,8,0,1,1-12.8,9.6L156,216H100L78.4,244.8a8,8,0,1,1-12.8-9.6L80,216H70.11a16,16,0,0,1-15.44-11.79L32.28,122.1a8.08,8.08,0,0,1,0-4.2L54.67,35.79A16,16,0,0,1,70.11,24H185.89a16,16,0,0,1,15.44,11.79l22.39,82.11A8.08,8.08,0,0,1,223.72,122.1ZM136,152a8,8,0,0,0-16,0v40a8,8,0,0,0,16,0Zm70-38.31L185.89,40H70.11L50,113.69l78,14.18Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.MediumLogoFill">M136,128A64,64,0,1,1,72,64,64.07,64.07,0,0,1,136,128Zm48-64c-5.68,0-16.4,2.76-24.32,21.25C154.73,96.8,152,112,152,128s2.73,31.2,7.68,42.75C167.6,189.24,178.32,192,184,192s16.4-2.76,24.32-21.25C213.27,159.2,216,144,216,128s-2.73-31.2-7.68-42.75C200.4,66.76,189.68,64,184,64Zm56,0a8,8,0,0,0-8,8V184a8,8,0,0,0,16,0V72A8,8,0,0,0,240,64Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CurrencyEurFill">M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24Zm0,80a8,8,0,0,1,0,16H88v16h24a8,8,0,0,1,0,16H88.81a40,40,0,0,0,65.86,21.82,8,8,0,1,1,10.66,11.92A56,56,0,0,1,72.58,152H64a8,8,0,0,1,0-16h8V120H64a8,8,0,0,1,0-16h8.58a56,56,0,0,1,92.75-33.74,8,8,0,1,1-10.66,11.92A40,40,0,0,0,88.81,104Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CurrencyKztFill">M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24Zm48,96H136v72a8,8,0,0,1-16,0V120H80a8,8,0,0,1,0-16h96a8,8,0,0,1,0,16Zm0-32H80a8,8,0,0,1,0-16h96a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.NotSubsetOfFill">M128,80h31.37L90.83,158.33A48,48,0,0,1,128,80Zm96-32V208a16,16,0,0,1-16,16H48a16,16,0,0,1-16-16V48A16,16,0,0,1,48,32H208A16,16,0,0,1,224,48ZM189.27,58a8,8,0,0,0-11.29.75L173.37,64H128A64,64,0,0,0,80.19,170.49L66,186.73a8,8,0,0,0,12,10.54L92.22,181A63.62,63.62,0,0,0,128,192h48a8,8,0,0,0,0-16H128a47.63,47.63,0,0,1-25.13-7.13L190,69.27A8,8,0,0,0,189.27,58Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.NavigationArrowFill">M248,121.58a15.76,15.76,0,0,1-11.29,15l-.2.06-78,21.84-21.84,78-.06.2a15.77,15.77,0,0,1-15,11.29h-.3a15.77,15.77,0,0,1-15.07-10.67L41,61.41a1,1,0,0,1-.05-.16A16,16,0,0,1,61.25,40.9l.16.05,175.92,65.26A15.78,15.78,0,0,1,248,121.58Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.WheelchairFill">M250.53,199.59l-24,8a8,8,0,0,1-9.69-4L187.05,144H104a8,8,0,0,1-8-8V106.34A56,56,0,0,0,112,216c25.91,0,50.09-18.05,56.25-42a8,8,0,1,1,15.5,4c-8.06,31.3-38.23,54-71.75,54A72,72,0,0,1,96,89.81v-19a28,28,0,1,1,16,0V88h56a8,8,0,0,1,0,16H112v24h80a8,8,0,0,1,7.15,4.42l28.9,57.8,17.42-5.81a8,8,0,0,1,5.06,15.18Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.AcornFill">M232,104a56.06,56.06,0,0,0-56-56H136a24,24,0,0,1,24-24,8,8,0,0,0,0-16,40,40,0,0,0-40,40H80a56.06,56.06,0,0,0-56,56,16,16,0,0,0,8,13.84V128c0,35.53,33.12,62.12,59.74,83.49C103.66,221.07,120,234.18,120,240a8,8,0,0,0,16,0c0-5.82,16.34-18.93,28.26-28.51C190.88,190.12,224,163.53,224,128V117.84A16,16,0,0,0,232,104Zm-77.75,95c-10.62,8.52-20,16-26.25,23.37-6.25-7.32-15.63-14.85-26.25-23.37C77.8,179.79,48,155.86,48,128v-8H208v8C208,155.86,178.2,179.79,154.25,199Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.DotsThreeCircleVerticalFill">M232,128A104,104,0,1,0,128,232,104.13,104.13,0,0,0,232,128ZM116,84a12,12,0,1,1,12,12A12,12,0,0,1,116,84Zm0,44a12,12,0,1,1,12,12A12,12,0,0,1,116,128Zm0,44a12,12,0,1,1,12,12A12,12,0,0,1,116,172Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CaretCircleDoubleLeftFill">M201.57,54.42a104,104,0,1,0,0,147.15A104.17,104.17,0,0,0,201.57,54.42Zm-83.92,99.93a8,8,0,1,1-11.32,11.32l-32-32a8,8,0,0,1,0-11.32l32-32a8,8,0,1,1,11.32,11.32L91.29,128Zm56,0a8,8,0,1,1-11.32,11.32l-32-32a8,8,0,0,1,0-11.32l32-32a8,8,0,1,1,11.32,11.32L147.32,128Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ChatCenteredTextFill">M216,40H40A16,16,0,0,0,24,56V184a16,16,0,0,0,16,16h60.43l13.68,23.94a16,16,0,0,0,27.78,0L155.57,200H216a16,16,0,0,0,16-16V56A16,16,0,0,0,216,40ZM160,144H96a8,8,0,0,1,0-16h64a8,8,0,0,1,0,16Zm0-32H96a8,8,0,0,1,0-16h64a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.HeartbeatFill">M240,102c0,70-103.79,126.66-108.21,129a8,8,0,0,1-7.58,0c-3.35-1.8-63.55-34.69-92.68-80.89A4,4,0,0,1,34.92,144H72a8,8,0,0,0,6.66-3.56l9.34-14,25.34,38a8,8,0,0,0,9.16,3.16,8.17,8.17,0,0,0,4.27-3.34L140.28,144H160a8,8,0,0,0,8-8.53,8.18,8.18,0,0,0-8.25-7.47H136a8,8,0,0,0-6.66,3.56l-9.34,14-25.34-38a8,8,0,0,0-9.16-3.16,8.17,8.17,0,0,0-4.27,3.34L67.72,128H23.53a4,4,0,0,1-3.83-2.81A76.93,76.93,0,0,1,16,102,62.07,62.07,0,0,1,78,40c20.65,0,38.73,8.88,50,23.89C139.27,48.88,157.35,40,178,40A62.07,62.07,0,0,1,240,102Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ToothFill">M168,24H88A56,56,0,0,0,32,79.75c0,42.72,8,75.4,14.7,95.28,8.72,25.8,20.62,45.49,32.64,54A15.67,15.67,0,0,0,88.47,232a16.09,16.09,0,0,0,16-14.9c.85-11.52,5-49.11,23.53-49.11s22.68,37.59,23.53,49.11a16.09,16.09,0,0,0,9.18,13.36,15.69,15.69,0,0,0,15.95-1.41c12-8.53,23.92-28.22,32.64-54C216,155.15,224,122.47,224,79.75A56,56,0,0,0,168,24Zm3,56.57A8,8,0,1,1,165,95.42L128,80.61,91,95.42A8,8,0,1,1,85,80.57L106.46,72,85,63.42A8,8,0,1,1,91,48.57l37,14.81,37-14.81A8,8,0,1,1,171,63.42L149.54,72Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PaintBrushBroadFill">M216,24H72A40,40,0,0,0,32,64v72a24,24,0,0,0,24,24h48l-7.89,46.67A8.42,8.42,0,0,0,96,208a32,32,0,0,0,64,0,8.42,8.42,0,0,0-.11-1.33L152,160h48a24,24,0,0,0,24-24V32A8,8,0,0,0,216,24ZM72,40H176V80a8,8,0,0,0,16,0V40h16v72H48V64A24,24,0,0,1,72,40Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.GenderFemaleFill">M128,144a40,40,0,1,1,40-40A40,40,0,0,1,128,144ZM216,40V216a16,16,0,0,1-16,16H56a16,16,0,0,1-16-16V40A16,16,0,0,1,56,24H200A16,16,0,0,1,216,40ZM136,176V159.42a56,56,0,1,0-16,0V176H96a8,8,0,0,0,0,16h24v16a8,8,0,0,0,16,0V192h24a8,8,0,0,0,0-16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FourKFill">M79.55,136,96,113v23ZM232,56V200a16,16,0,0,1-16,16H40a16,16,0,0,1-16-16V56A16,16,0,0,1,40,40H216A16,16,0,0,1,232,56ZM124,144a8,8,0,0,0-8-8h-4V88a8,8,0,0,0-14.51-4.65l-40,56A8,8,0,0,0,64,152H96v16a8,8,0,0,0,16,0V152h4A8,8,0,0,0,124,144Zm49.59-22.23,24.48-28.56a8,8,0,0,0-12.14-10.42L157.8,115.6s0,0,0,0L152,122.37V88a8,8,0,0,0-16,0v80a8,8,0,0,0,16,0V147l10.62-12.39,22.52,37.55a8,8,0,1,0,13.72-8.24Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.HardDriveFill">M224,64H32A16,16,0,0,0,16,80v96a16,16,0,0,0,16,16H224a16,16,0,0,0,16-16V80A16,16,0,0,0,224,64Zm-36,76a12,12,0,1,1,12-12A12,12,0,0,1,188,140Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowsInFill">M144,104V64a8,8,0,0,1,13.66-5.66L172,72.69l30.34-30.35a8,8,0,0,1,11.32,11.32L183.31,84l14.35,14.34A8,8,0,0,1,192,112H152A8,8,0,0,1,144,104Zm-40,40H64a8,8,0,0,0-5.66,13.66L72.69,172,42.34,202.34a8,8,0,0,0,11.32,11.32L84,183.31l14.34,14.35A8,8,0,0,0,112,192V152A8,8,0,0,0,104,144Zm79.31,28,14.35-14.34A8,8,0,0,0,192,144H152a8,8,0,0,0-8,8v40a8,8,0,0,0,13.66,5.66L172,183.31l30.34,30.35a8,8,0,0,0,11.32-11.32ZM107.06,56.61a8,8,0,0,0-8.72,1.73L84,72.69,53.66,42.34A8,8,0,0,0,42.34,53.66L72.69,84,58.34,98.34A8,8,0,0,0,64,112h40a8,8,0,0,0,8-8V64A8,8,0,0,0,107.06,56.61Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.AlignRightSimpleFill">M232,56V200a8,8,0,0,1-16,0V56a8,8,0,0,1,16,0ZM184,80H32A16,16,0,0,0,16,96v64a16,16,0,0,0,16,16H184a16,16,0,0,0,16-16V96A16,16,0,0,0,184,80Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SketchLogoFill">M246,98.73l-56-64A8,8,0,0,0,184,32H72a8,8,0,0,0-6,2.73l-56,64a8,8,0,0,0,.17,10.73l112,120a8,8,0,0,0,11.7,0l112-120A8,8,0,0,0,246,98.73ZM222.37,96H180L144,48h36.37ZM74.58,112l30.13,75.33L34.41,112Zm106.84,0h40.17l-70.3,75.33ZM75.63,48H112L76,96H33.63Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.TrayFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32Zm0,176H48V168H76.69L96,187.32A15.89,15.89,0,0,0,107.31,192h41.38A15.86,15.86,0,0,0,160,187.31L179.31,168H208v40Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CatFill">M222.83,33.54a16,16,0,0,0-18.14,3.15c-.14.14-.26.27-.38.41L187.05,57A111.28,111.28,0,0,0,69,57L51.69,37.1c-.12-.14-.24-.27-.38-.41a16,16,0,0,0-18.14-3.15A16.4,16.4,0,0,0,24,48.46V136c0,49,40.06,89.63,91.56,95.32a4,4,0,0,0,4.44-4v-32l-13.42-13.43a8.22,8.22,0,0,1-.41-11.37,8,8,0,0,1,11.49-.18L128,180.68l10.34-10.35a8,8,0,0,1,11.49.18,8.22,8.22,0,0,1-.41,11.37L136,195.31v32a4,4,0,0,0,4.44,4C191.94,225.62,232,185,232,136V48.46A16.4,16.4,0,0,0,222.83,33.54ZM84,152a12,12,0,1,1,12-12A12,12,0,0,1,84,152Zm20-64a8,8,0,1,1-16,0V69a8,8,0,0,1,16,0Zm32,0a8,8,0,1,1-16,0V64a8,8,0,0,1,16,0Zm16,0V69a8,8,0,0,1,16,0V88a8,8,0,1,1-16,0Zm20,64a12,12,0,1,1,12-12A12,12,0,0,1,172,152Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.NyTimesLogoFill">M172,136a12,12,0,1,1-12,12A12,12,0,0,1,172,136Zm12.62-32.75L118.91,72.59A71.95,71.95,0,0,0,56.06,141.3l68.18-36.36A8,8,0,0,1,136,112V215.55a71.64,71.64,0,0,0,60.71-50A8,8,0,0,1,212,170.4,88,88,0,1,1,51.74,100.1,36,36,0,0,1,68,32a8.05,8.05,0,0,1,3.38.75L189.63,87.93A20,20,0,0,0,188,48a8,8,0,0,1,0-16,36,36,0,0,1,0,72A8.05,8.05,0,0,1,184.62,103.25ZM96,208.47V138.13L57.51,158.66A72.23,72.23,0,0,0,96,208.47ZM96.13,62,66.37,48.07a20,20,0,0,0-5.2,38.71c.6-.71,1.2-1.42,1.84-2.11A88,88,0,0,1,96.13,62Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ChatTeardropFill">M232,124A100.11,100.11,0,0,1,132,224H48a16,16,0,0,1-16-16V124a100,100,0,0,1,200,0Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.AlienFill">M128,16a96.11,96.11,0,0,0-96,96c0,24,12.56,55.06,33.61,83,21.18,28.15,44.5,45,62.39,45s41.21-16.81,62.39-45c21.05-28,33.61-59,33.61-83A96.11,96.11,0,0,0,128,16ZM64,116a12,12,0,0,1,12-12,36,36,0,0,1,36,36,12,12,0,0,1-12,12A36,36,0,0,1,64,116Zm80,84H112a8,8,0,0,1,0-16h32a8,8,0,0,1,0,16Zm12-48a12,12,0,0,1-12-12,36,36,0,0,1,36-36,12,12,0,0,1,12,12A36,36,0,0,1,156,152Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.AlignCenterHorizontalFill">M224,152v40a16,16,0,0,1-16,16H136v16a8,8,0,0,1-16,0V208H48a16,16,0,0,1-16-16V152a16,16,0,0,1,16-16h72V120H72a16,16,0,0,1-16-16V64A16,16,0,0,1,72,48h48V32a8,8,0,0,1,16,0V48h48a16,16,0,0,1,16,16v40a16,16,0,0,1-16,16H136v16h72A16,16,0,0,1,224,152Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SelectionBackgroundFill">M72,112h72v72H72ZM224,48V208a16,16,0,0,1-16,16H48a16,16,0,0,1-16-16V48A16,16,0,0,1,48,32H208A16,16,0,0,1,224,48ZM96,72a8,8,0,0,0,16,0h16a8,8,0,0,0,0-16H112A16,16,0,0,0,96,72Zm64,40a16,16,0,0,0-16-16H72a16,16,0,0,0-16,16v72a16,16,0,0,0,16,16h72a16,16,0,0,0,16-16Zm40,16a8,8,0,0,0-16,0v16a8,8,0,0,0,0,16,16,16,0,0,0,16-16Zm0-56a16,16,0,0,0-16-16H168a8,8,0,0,0,0,16h16V88a8,8,0,0,0,16,0Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.TrainSimpleFill">M184,24H72A32,32,0,0,0,40,56V184a32,32,0,0,0,32,32h8L65.6,235.2a8,8,0,1,0,12.8,9.6L100,216h56l21.6,28.8a8,8,0,1,0,12.8-9.6L176,216h8a32,32,0,0,0,32-32V56A32,32,0,0,0,184,24Zm0,176H72a16,16,0,0,1-16-16V136H200v48A16,16,0,0,1,184,200ZM96,172a12,12,0,1,1-12-12A12,12,0,0,1,96,172Zm88,0a12,12,0,1,1-12-12A12,12,0,0,1,184,172Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowBendLeftDownFill">M208,32a8,8,0,0,1-8,8,88.1,88.1,0,0,0-88,88v40h40a8,8,0,0,1,5.66,13.66l-48,48a8,8,0,0,1-11.32,0l-48-48A8,8,0,0,1,56,168H96V128A104.11,104.11,0,0,1,200,24,8,8,0,0,1,208,32Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.GitForkFill">M224,64a32,32,0,1,0-40,31v17a8,8,0,0,1-8,8H80a8,8,0,0,1-8-8V95a32,32,0,1,0-16,0v17a24,24,0,0,0,24,24h40v25a32,32,0,1,0,16,0V136h40a24,24,0,0,0,24-24V95A32.06,32.06,0,0,0,224,64ZM144,192a16,16,0,1,1-16-16A16,16,0,0,1,144,192Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SeatbeltFill">M128,112a44,44,0,1,1,44-44A44.05,44.05,0,0,1,128,112Zm72,104H77.16L197.29,110a8.17,8.17,0,0,0,1.1-1.19,8.07,8.07,0,0,0,1.61-5.08A8,8,0,0,0,186.71,98l-24.54,21.65A80,80,0,0,0,49,179.25a8.33,8.33,0,0,0-.1,1.1L48,223.83A8,8,0,0,0,56,232H200a8,8,0,0,0,0-16Zm-11.88-73a8,8,0,0,0-6.25,1.94L119.47,200H200a8,8,0,0,0,8-8,79.6,79.6,0,0,0-14.27-45.62A8,8,0,0,0,188.12,143Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.MountainsFill">M254.88,195.92l-54.56-92.08A15.87,15.87,0,0,0,186.55,96h0a15.85,15.85,0,0,0-13.76,7.84l-15.64,26.39a4,4,0,0,0,0,4.07l26.8,45.47a8.13,8.13,0,0,1-1.89,10.55,8,8,0,0,1-11.8-2.26L101.79,71.88a16,16,0,0,0-27.58,0L1.11,195.94a8,8,0,0,0,1,9.52A8.23,8.23,0,0,0,8.23,208H247.77a8.29,8.29,0,0,0,6.09-2.55A8,8,0,0,0,254.88,195.92ZM64.43,120,88,80l23.57,40ZM140,52a24,24,0,1,1,24,24A24,24,0,0,1,140,52Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CaretLineRightFill">M149.66,122.34a8,8,0,0,1,0,11.32l-80,80A8,8,0,0,1,56,208V48a8,8,0,0,1,13.66-5.66ZM184,40a8,8,0,0,0-8,8V208a8,8,0,0,0,16,0V48A8,8,0,0,0,184,40Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SelectionPlusFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM56,72A16,16,0,0,1,72,56H96a8,8,0,0,1,0,16H72V96a8,8,0,0,1-16,0Zm56,112H72a16,16,0,0,1-16-16V136a8,8,0,0,1,16,0v32h40a8,8,0,0,1,0,16ZM128,64a8,8,0,0,1,8-8h32a16,16,0,0,1,16,16v40a8,8,0,0,1-16,0V72H136A8,8,0,0,1,128,64Zm72,120H184v16a8,8,0,0,1-16,0V184H152a8,8,0,0,1,0-16h16V152a8,8,0,0,1,16,0v16h16a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BellRingingFill">M224,71.1a8,8,0,0,1-10.78-3.42,94.13,94.13,0,0,0-33.46-36.91,8,8,0,1,1,8.54-13.54,111.46,111.46,0,0,1,39.12,43.09A8,8,0,0,1,224,71.1ZM35.71,72a8,8,0,0,0,7.1-4.32A94.13,94.13,0,0,1,76.27,30.77a8,8,0,1,0-8.54-13.54A111.46,111.46,0,0,0,28.61,60.32,8,8,0,0,0,35.71,72Zm186.1,103.94A16,16,0,0,1,208,200H167.2a40,40,0,0,1-78.4,0H48a16,16,0,0,1-13.79-24.06C43.22,160.39,48,138.28,48,112a80,80,0,0,1,160,0C208,138.27,212.78,160.38,221.81,175.94ZM150.62,200H105.38a24,24,0,0,0,45.24,0Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowCircleRightFill">M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24Zm45.66,109.66-32,32a8,8,0,0,1-11.32-11.32L148.69,136H88a8,8,0,0,1,0-16h60.69l-18.35-18.34a8,8,0,0,1,11.32-11.32l32,32A8,8,0,0,1,173.66,133.66Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CirclesThreePlusFill">M120,80A40,40,0,1,1,80,40,40,40,0,0,1,120,80Zm56,40a40,40,0,1,0-40-40A40,40,0,0,0,176,120ZM80,136a40,40,0,1,0,40,40A40,40,0,0,0,80,136Zm128,32H184V144a8,8,0,0,0-16,0v24H144a8,8,0,0,0,0,16h24v24a8,8,0,0,0,16,0V184h24a8,8,0,0,0,0-16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SeatFill">M224,232a8,8,0,0,1-8,8H112a8,8,0,0,1,0-16H216A8,8,0,0,1,224,232Zm-16-88-64.22,0L112,80l14.19-26.32a1.51,1.51,0,0,0,.11-.22A16,16,0,0,0,119.15,32l-.47-.22L85,17.57A16,16,0,0,0,63.8,24.84l-22.12,44a16.1,16.1,0,0,0,0,14.32l58.11,116A15.93,15.93,0,0,0,114.11,208H208a16,16,0,0,0,16-16V160A16,16,0,0,0,208,144Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.TextTSlashFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM128,72h48a8,8,0,0,1,8,8V96a8,8,0,0,1-16,0V88H128a8,8,0,0,1,0-16Zm61.27,126a8,8,0,0,1-11.29-.75l-42-48V176h12a8,8,0,0,1,0,16H108a8,8,0,0,1,0-16h12V131L88,94.43V96a8,8,0,0,1-16,0V80a8.13,8.13,0,0,1,.63-3.13L66,69.27A8,8,0,0,1,78,58.73l112,128A8,8,0,0,1,189.27,198Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.GiftFill">M216,72H180.92c.39-.33.79-.65,1.17-1A29.53,29.53,0,0,0,192,49.57,32.62,32.62,0,0,0,158.44,16,29.53,29.53,0,0,0,137,25.91a54.94,54.94,0,0,0-9,14.48,54.94,54.94,0,0,0-9-14.48A29.53,29.53,0,0,0,97.56,16,32.62,32.62,0,0,0,64,49.57,29.53,29.53,0,0,0,73.91,71c.38.33.78.65,1.17,1H40A16,16,0,0,0,24,88v32a16,16,0,0,0,16,16v64a16,16,0,0,0,16,16h60a4,4,0,0,0,4-4V120H40V88h80v32h16V88h80v32H136v92a4,4,0,0,0,4,4h60a16,16,0,0,0,16-16V136a16,16,0,0,0,16-16V88A16,16,0,0,0,216,72ZM84.51,59a13.69,13.69,0,0,1-4.5-10A16.62,16.62,0,0,1,96.59,32h.49a13.69,13.69,0,0,1,10,4.5c8.39,9.48,11.35,25.2,12.39,34.92C109.71,70.39,94,67.43,84.51,59Zm87,0c-9.49,8.4-25.24,11.36-35,12.4C137.7,60.89,141,45.5,149,36.51a13.69,13.69,0,0,1,10-4.5h.49A16.62,16.62,0,0,1,176,49.08,13.69,13.69,0,0,1,171.49,59Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SunDimFill">M120,40V32a8,8,0,0,1,16,0v8a8,8,0,0,1-16,0Zm8,24a64,64,0,1,0,64,64A64.07,64.07,0,0,0,128,64ZM58.34,69.66A8,8,0,0,0,69.66,58.34l-8-8A8,8,0,0,0,50.34,61.66Zm0,116.68-8,8a8,8,0,0,0,11.32,11.32l8-8a8,8,0,0,0-11.32-11.32ZM192,72a8,8,0,0,0,5.66-2.34l8-8a8,8,0,0,0-11.32-11.32l-8,8A8,8,0,0,0,192,72Zm5.66,114.34a8,8,0,0,0-11.32,11.32l8,8a8,8,0,0,0,11.32-11.32ZM40,120H32a8,8,0,0,0,0,16h8a8,8,0,0,0,0-16Zm88,88a8,8,0,0,0-8,8v8a8,8,0,0,0,16,0v-8A8,8,0,0,0,128,208Zm96-88h-8a8,8,0,0,0,0,16h8a8,8,0,0,0,0-16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.HandTapFill">M64,64a48,48,0,0,1,96,0,8,8,0,0,1-16,0,32,32,0,0,0-64,0,8,8,0,0,1-16,0Zm143.23,56c-8.61.4-15.23,7.82-15.23,16.43v7.28a8.17,8.17,0,0,1-7.47,8.25,8,8,0,0,1-8.53-8V120.45c0-8.61-6.62-16-15.23-16.43A16,16,0,0,0,144,120v15.73a8.17,8.17,0,0,1-7.47,8.25,8,8,0,0,1-8.53-8V64.45c0-8.61-6.62-16-15.23-16.43A16,16,0,0,0,96,64V183.74a8.19,8.19,0,0,1-6.72,8.16l-.12,0a6.09,6.09,0,0,1-6-3.09l-21-36.44c-4.3-7.46-13.74-10.57-21.4-6.62A16,16,0,0,0,34.15,168L65.1,228.05A8,8,0,0,0,72,232H208a8,8,0,0,0,7.16-4.42c.36-.72,8.84-15.06,8.84-40.65V136A16,16,0,0,0,207.23,120Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ChatCenteredDotsFill">M216,40H40A16,16,0,0,0,24,56V184a16,16,0,0,0,16,16h60.43l13.68,23.94a16,16,0,0,0,27.78,0L155.57,200H216a16,16,0,0,0,16-16V56A16,16,0,0,0,216,40ZM84,132a12,12,0,1,1,12-12A12,12,0,0,1,84,132Zm44,0a12,12,0,1,1,12-12A12,12,0,0,1,128,132Zm44,0a12,12,0,1,1,12-12A12,12,0,0,1,172,132Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ResizeFill">M144,120v88a8,8,0,0,1-8,8H48a8,8,0,0,1-8-8V120a8,8,0,0,1,8-8h88A8,8,0,0,1,144,120Zm64,56a8,8,0,0,0-8,8v16H176a8,8,0,0,0,0,16h24a16,16,0,0,0,16-16V184A8,8,0,0,0,208,176Zm0-72a8,8,0,0,0-8,8v32a8,8,0,0,0,16,0V112A8,8,0,0,0,208,104Zm-8-64H184a8,8,0,0,0,0,16h16V72a8,8,0,0,0,16,0V56A16,16,0,0,0,200,40Zm-56,0H112a8,8,0,0,0,0,16h32a8,8,0,0,0,0-16ZM48,88a8,8,0,0,0,8-8V56H72a8,8,0,0,0,0-16H56A16,16,0,0,0,40,56V80A8,8,0,0,0,48,88Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SunHorizonFill">M248,160a8,8,0,0,1-8,8H16a8,8,0,0,1,0-16H56.45a73.54,73.54,0,0,1-.45-8,72,72,0,0,1,144,0,73.54,73.54,0,0,1-.45,8H240A8,8,0,0,1,248,160Zm-40,32H48a8,8,0,0,0,0,16H208a8,8,0,0,0,0-16ZM80.84,59.58a8,8,0,0,0,14.32-7.16l-8-16a8,8,0,0,0-14.32,7.16ZM20.42,103.16l16,8a8,8,0,1,0,7.16-14.31l-16-8a8,8,0,1,0-7.16,14.31ZM216,112a8,8,0,0,0,3.57-.84l16-8a8,8,0,1,0-7.16-14.31l-16,8A8,8,0,0,0,216,112ZM164.42,63.16a8,8,0,0,0,10.74-3.58l8-16a8,8,0,0,0-14.32-7.16l-8,16A8,8,0,0,0,164.42,63.16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.MagnifyingGlassPlusFill">M229.66,218.34,179.6,168.28a88.21,88.21,0,1,0-11.32,11.31l50.06,50.07a8,8,0,0,0,11.32-11.32ZM144,120H120v24a8,8,0,0,1-16,0V120H80a8,8,0,0,1,0-16h24V80a8,8,0,0,1,16,0v24h24a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CloudXFill">M247.93,124.52C246.11,77.54,207.07,40,160.06,40A88.1,88.1,0,0,0,81.29,88.67h0A87.48,87.48,0,0,0,72,127.73,8.18,8.18,0,0,1,64.57,136,8,8,0,0,1,56,128a103.66,103.66,0,0,1,5.34-32.92,4,4,0,0,0-4.75-5.18A64.09,64.09,0,0,0,8,152c0,35.19,29.75,64,65,64H160A88.09,88.09,0,0,0,247.93,124.52Zm-58.27,29.82a8,8,0,0,1-11.32,11.32L160,147.31l-18.34,18.35a8,8,0,0,1-11.32-11.32L148.69,136l-18.35-18.34a8,8,0,0,1,11.32-11.32L160,124.69l18.34-18.35a8,8,0,0,1,11.32,11.32L171.31,136Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.HourglassSimpleFill">M211.31,196.69A16,16,0,0,1,200,224H56a16,16,0,0,1-11.32-27.31,1.59,1.59,0,0,0,.13-.13L116.43,128,44.82,59.44a1.59,1.59,0,0,0-.13-.13A16,16,0,0,1,56,32H200a16,16,0,0,1,11.32,27.31,1.59,1.59,0,0,0-.13.13L139.57,128l71.61,68.56A1.59,1.59,0,0,0,211.31,196.69Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BracketsRoundFill">M216,40H40A16,16,0,0,0,24,56V200a16,16,0,0,0,16,16H216a16,16,0,0,0,16-16V56A16,16,0,0,0,216,40ZM99.61,176.86a8,8,0,0,1-7.19,14.3A71.23,71.23,0,0,1,56,128,71.23,71.23,0,0,1,92.42,64.84a8,8,0,0,1,7.18,14.3C98.37,79.78,72,93.76,72,128S98.48,176.28,99.61,176.86Zm64,14.3a8,8,0,1,1-7.16-14.32c1.1-.56,27.58-14.52,27.58-48.84s-26.48-48.28-27.61-48.86a8,8,0,0,1,7.19-14.3A71.23,71.23,0,0,1,200,128,71.23,71.23,0,0,1,163.58,191.16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.GradientFill">M80,192a8,8,0,0,1-8,8H32a8,8,0,0,1,0-16H72A8,8,0,0,1,80,192Zm144-8H184a8,8,0,0,0,0,16h40a8,8,0,0,0,0-16Zm-72,0H104a8,8,0,0,0,0,16h48a8,8,0,0,0,0-16ZM32,168h80a8,8,0,0,0,0-16H32a8,8,0,0,0,0,16Zm192-16H144a8,8,0,0,0,0,16h80a8,8,0,0,0,0-16Zm0-96H32a8,8,0,0,0-8,8V88a8,8,0,0,0,8,8H224a8,8,0,0,0,8-8V64A8,8,0,0,0,224,56Zm0,56H32a8,8,0,0,0-8,8v8a8,8,0,0,0,8,8H224a8,8,0,0,0,8-8v-8A8,8,0,0,0,224,112Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BehanceLogoFill">M92,120H64V96H92a12,12,0,0,1,0,24Zm4,16H64v32H96a16,16,0,0,0,0-32Zm80-16a24,24,0,0,0-22.62,16h45.24A24,24,0,0,0,176,120Zm64-64V200a16,16,0,0,1-16,16H32a16,16,0,0,1-16-16V56A16,16,0,0,1,32,40H224A16,16,0,0,1,240,56ZM144,88a8,8,0,0,0,8,8h48a8,8,0,0,0,0-16H152A8,8,0,0,0,144,88Zm-16,64a32,32,0,0,0-14.13-26.53A28,28,0,0,0,92,80H56a8,8,0,0,0-8,8v88a8,8,0,0,0,8,8H96A32,32,0,0,0,128,152Zm88-8a40,40,0,1,0-13.54,30,8,8,0,0,0-10.59-12,24,24,0,0,1-38.49-10H208A8,8,0,0,0,216,144Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.MagicWandFill">M248,152a8,8,0,0,1-8,8H224v16a8,8,0,0,1-16,0V160H192a8,8,0,0,1,0-16h16V128a8,8,0,0,1,16,0v16h16A8,8,0,0,1,248,152ZM56,72H72V88a8,8,0,0,0,16,0V72h16a8,8,0,0,0,0-16H88V40a8,8,0,0,0-16,0V56H56a8,8,0,0,0,0,16ZM184,192h-8v-8a8,8,0,0,0-16,0v8h-8a8,8,0,0,0,0,16h8v8a8,8,0,0,0,16,0v-8h8a8,8,0,0,0,0-16ZM219.31,80,80,219.31a16,16,0,0,1-22.62,0L36.68,198.63a16,16,0,0,1,0-22.63L176,36.69a16,16,0,0,1,22.63,0l20.68,20.68A16,16,0,0,1,219.31,80ZM208,68.69,187.31,48l-32,32L176,100.69Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.DownloadFill">M74.34,85.66A8,8,0,0,1,85.66,74.34L120,108.69V24a8,8,0,0,1,16,0v84.69l34.34-34.35a8,8,0,0,1,11.32,11.32l-48,48a8,8,0,0,1-11.32,0ZM240,136v64a16,16,0,0,1-16,16H32a16,16,0,0,1-16-16V136a16,16,0,0,1,16-16H84.4a4,4,0,0,1,2.83,1.17L111,145A24,24,0,0,0,145,145l23.8-23.8A4,4,0,0,1,171.6,120H224A16,16,0,0,1,240,136Zm-40,32a12,12,0,1,0-12,12A12,12,0,0,0,200,168Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PerspectiveFill">M248,136a8,8,0,0,1-8,8H224v64a16,16,0,0,1-16,16,16.47,16.47,0,0,1-2.87-.26l-160-29.09A16,16,0,0,1,32,178.91V144H16a8,8,0,0,1,0-16H240A8,8,0,0,1,248,136ZM36,112H220a4,4,0,0,0,4-4V48.42a16.48,16.48,0,0,0-4.07-11.08,16,16,0,0,0-14.79-5.08l-160,29.09A16,16,0,0,0,32,77.09V108A4,4,0,0,0,36,112Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FoldersFill">M224,64H154.67L126.93,43.2a16.12,16.12,0,0,0-9.6-3.2H72A16,16,0,0,0,56,56V72H40A16,16,0,0,0,24,88V200a16,16,0,0,0,16,16H192.89A15.13,15.13,0,0,0,208,200.89V184h16.89A15.13,15.13,0,0,0,240,168.89V80A16,16,0,0,0,224,64Zm0,104H208V112a16,16,0,0,0-16-16H122.67L94.93,75.2a16.12,16.12,0,0,0-9.6-3.2H72V56h45.33L147.2,78.4A8,8,0,0,0,152,80h72Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ShowerFill">M64,236a12,12,0,1,1-12-12A12,12,0,0,1,64,236Zm20-44a12,12,0,1,0,12,12A12,12,0,0,0,84,192Zm-64,0a12,12,0,1,0,12,12A12,12,0,0,0,20,192Zm32-32a12,12,0,1,0,12,12A12,12,0,0,0,52,160ZM248,32H216a8,8,0,0,0-5.66,2.34l-30.2,30.2L53.38,86.19a16,16,0,0,0-8.69,27.1l98,98a16,16,0,0,0,27.09-8.66L191.46,75.86,219.31,48H248a8,8,0,0,0,0-16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.OpenAiLogoFill">M224.32,114.24a56,56,0,0,0-60.07-76.57A56,56,0,0,0,67.93,51.44a56,56,0,0,0-36.25,90.32A56,56,0,0,0,69,217,56.39,56.39,0,0,0,83.59,219a55.75,55.75,0,0,0,8.17-.61,56,56,0,0,0,96.31-13.78,56,56,0,0,0,36.25-90.32Zm-80.32,23-16,9.24-16-9.24V118.76l16-9.24,16,9.24Zm38.85-82.81a40,40,0,0,1,28.56,48c-.95-.63-1.91-1.24-2.91-1.81L164,74.88a8,8,0,0,0-8,0l-44,25.41V81.81l40.5-23.38A39.76,39.76,0,0,1,182.85,54.43Zm-142,32.5A39.75,39.75,0,0,1,64.12,68.57C64.05,69.71,64,70.85,64,72v51.38a8,8,0,0,0,4,6.93l44,25.4L96,165,55.5,141.57A40,40,0,0,1,40.86,86.93ZM136,224a39.79,39.79,0,0,1-27.52-10.95c1-.51,2-1.05,3-1.63L156,185.73a8,8,0,0,0,4-6.92V128l16,9.24V184A40,40,0,0,1,136,224Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ShieldCheckeredFill">M208,40H48A16,16,0,0,0,32,56v56c0,52.72,25.52,84.67,46.93,102.19,23.06,18.86,46,25.27,47,25.53a8,8,0,0,0,4.2,0c1-.26,23.91-6.67,47-25.53C198.48,196.67,224,164.72,224,112V56A16,16,0,0,0,208,40ZM128,223.62a128.25,128.25,0,0,1-38.92-21.81C65.83,182.79,52.37,158,48.9,128H128V56h80v56a141.24,141.24,0,0,1-.9,16H128v95.62Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ToggleRightFill">M176,56H80a72,72,0,0,0,0,144h96a72,72,0,0,0,0-144Zm0,112a40,40,0,1,1,40-40A40,40,0,0,1,176,168Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PencilCircleFill">M201.54,54.46A104,104,0,0,0,54.46,201.54,104,104,0,0,0,201.54,54.46ZM128,170.87a31.93,31.93,0,0,0-32.31-9.77L111,128H145l15.27,33.1A31.93,31.93,0,0,0,128,170.87Zm40,35.5a88,88,0,0,1-32,9.22V192a16,16,0,0,1,32,0Zm22.22-16.14c-2,2-4.08,3.87-6.22,5.64V176a7.91,7.91,0,0,0-.74-3.35l-48-104a8,8,0,0,0-14.52,0l-48,104A7.91,7.91,0,0,0,72,176v19.87c-2.14-1.77-4.22-3.64-6.22-5.64a88,88,0,1,1,124.44,0Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CalendarStarFill">M208,32H184V24a8,8,0,0,0-16,0v8H88V24a8,8,0,0,0-16,0v8H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM72,64V56a8,8,0,0,1,16,0v8a8,8,0,0,1-16,0Zm106.55,60.7-24.46,20.19L161.55,175a4,4,0,0,1-1.49,4.17,4.05,4.05,0,0,1-2.39.79,4,4,0,0,1-2-.55L128,163.18l-27.64,16.27A4,4,0,0,1,94.45,175l7.46-30.15L77.45,124.7a4,4,0,0,1,2.24-7.08l32.24-2.49,12.4-28.71a4,4,0,0,1,7.34,0l12.4,28.71,32.24,2.49a4,4,0,0,1,2.24,7.08ZM184,64a8,8,0,0,1-16,0V56a8,8,0,0,1,16,0Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.HandSwipeRightFill">M216,128v50.93c0,25.59-8.48,39.93-8.84,40.65A8,8,0,0,1,200,224H64a8,8,0,0,1-6.9-3.95L26.15,160a16,16,0,0,1,6.53-22.23c7.66-4,17.1-.84,21.4,6.62l21,36.44a6.09,6.09,0,0,0,6,3.09l.12,0A8.19,8.19,0,0,0,88,175.74V56a16,16,0,0,1,16.77-16c8.61.4,15.23,7.82,15.23,16.43V128a8,8,0,0,0,8.53,8,8.17,8.17,0,0,0,7.47-8.25V112a16,16,0,0,1,16.77-16c8.61.4,15.23,7.82,15.23,16.43V136a8,8,0,0,0,8.53,8,8.18,8.18,0,0,0,7.47-8.25v-7.28c0-8.61,6.62-16,15.23-16.43A16,16,0,0,1,216,128Zm37.66-77.66-32-32a8,8,0,0,0-11.32,11.32L228.69,48H176a8,8,0,0,0,0,16h52.69L210.34,82.34a8,8,0,0,0,11.32,11.32l32-32A8,8,0,0,0,253.66,50.34Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowBendUpLeftFill">M232,200a8,8,0,0,1-16,0,88.1,88.1,0,0,0-88-88H88v40a8,8,0,0,1-13.66,5.66l-48-48a8,8,0,0,1,0-11.32l48-48A8,8,0,0,1,88,56V96h40A104.11,104.11,0,0,1,232,200Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowBendLeftUpFill">M208,224a8,8,0,0,1-8,8A104.11,104.11,0,0,1,96,128V88H56a8,8,0,0,1-5.66-13.66l48-48a8,8,0,0,1,11.32,0l48,48A8,8,0,0,1,152,88H112v40a88.1,88.1,0,0,0,88,88A8,8,0,0,1,208,224Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.VaultFill">M216,40H40A16,16,0,0,0,24,56V192a16,16,0,0,0,16,16H56v16a8,8,0,0,0,16,0V208H184v16a8,8,0,0,0,16,0V208h16a16,16,0,0,0,16-16V56A16,16,0,0,0,216,40Zm-8,96H179.09a36,36,0,1,1,0-16H208a8,8,0,0,1,0,16Zm-44-8a20,20,0,1,1-20-20A20,20,0,0,1,164,128Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.AmbulanceFill">M255.43,117l-14-35A15.93,15.93,0,0,0,226.58,72H192V64a8,8,0,0,0-8-8H32A16,16,0,0,0,16,72V184a16,16,0,0,0,16,16H49a32,32,0,0,0,62,0h50a32,32,0,0,0,62,0h17a16,16,0,0,0,16-16V120A7.92,7.92,0,0,0,255.43,117ZM80,208a16,16,0,1,1,16-16A16,16,0,0,1,80,208Zm56-80H120v16a8,8,0,0,1-16,0V128H88a8,8,0,0,1,0-16h16V96a8,8,0,0,1,16,0v16h16a8,8,0,0,1,0,16Zm56,80a16,16,0,1,1,16-16A16,16,0,0,1,192,208Zm0-96V88h34.58l9.6,24Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.DotsNineFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM76,192a12,12,0,1,1,12-12A12,12,0,0,1,76,192Zm0-52a12,12,0,1,1,12-12A12,12,0,0,1,76,140Zm0-52A12,12,0,1,1,88,76,12,12,0,0,1,76,88Zm52,104a12,12,0,1,1,12-12A12,12,0,0,1,128,192Zm0-52a12,12,0,1,1,12-12A12,12,0,0,1,128,140Zm0-52a12,12,0,1,1,12-12A12,12,0,0,1,128,88Zm52,104a12,12,0,1,1,12-12A12,12,0,0,1,180,192Zm0-52a12,12,0,1,1,12-12A12,12,0,0,1,180,140Zm0-52a12,12,0,1,1,12-12A12,12,0,0,1,180,88Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BrainFill">M212,76V72a44,44,0,0,0-74.86-31.31,3.93,3.93,0,0,0-1.14,2.8v88.72a4,4,0,0,0,6.2,3.33A47.67,47.67,0,0,1,167.68,128a8.18,8.18,0,0,1,8.31,7.58,8,8,0,0,1-8,8.42,32,32,0,0,0-32,32v33.88a4,4,0,0,0,1.49,3.12,47.92,47.92,0,0,0,74.21-17.16,4,4,0,0,0-4.49-5.56A68.06,68.06,0,0,1,192,192h-7.73a8.18,8.18,0,0,1-8.25-7.47,8,8,0,0,1,8-8.53h8a51.6,51.6,0,0,0,24-5.88v0A52,52,0,0,0,212,76Zm-12,36h-4a36,36,0,0,1-36-36V72a8,8,0,0,1,16,0v4a20,20,0,0,0,20,20h4a8,8,0,0,1,0,16ZM88,28A44.05,44.05,0,0,0,44,72v4a52,52,0,0,0-4,94.12h0A51.6,51.6,0,0,0,64,176h7.73A8.18,8.18,0,0,1,80,183.47,8,8,0,0,1,72,192H64a67.48,67.48,0,0,1-15.21-1.73,4,4,0,0,0-4.5,5.55A47.93,47.93,0,0,0,118.51,213a4,4,0,0,0,1.49-3.12V176a32,32,0,0,0-32-32,8,8,0,0,1-8-8.42A8.18,8.18,0,0,1,88.32,128a47.67,47.67,0,0,1,25.48,7.54,4,4,0,0,0,6.2-3.33V43.49a4,4,0,0,0-1.14-2.81A43.85,43.85,0,0,0,88,28Zm8,48a36,36,0,0,1-36,36H56a8,8,0,0,1,0-16h4A20,20,0,0,0,80,76V72a8,8,0,0,1,16,0Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ListMagnifyingGlassFill">M32,64a8,8,0,0,1,8-8H216a8,8,0,0,1,0,16H40A8,8,0,0,1,32,64Zm8,72h72a8,8,0,0,0,0-16H40a8,8,0,0,0,0,16Zm88,48H40a8,8,0,0,0,0,16h88a8,8,0,0,0,0-16Zm109.66,2.34L217.36,166A40,40,0,1,0,206,177.36l20.3,20.3a8,8,0,0,0,11.32-11.32Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PaperclipFill">M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24Zm37.66,50.34a8,8,0,0,0-11.32,0L87.09,143A24,24,0,1,0,121,177l49.32-50.32a8,8,0,1,1,11.42,11.2l-49.37,50.38a40,40,0,1,1-56.62-56.51L143,63.09A24,24,0,1,1,177,97L109.71,165.6a8,8,0,1,1-11.42-11.2L165.6,85.71a8,8,0,0,0,.06-11.37Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.WheelchairMotionFill">M144,48a32,32,0,1,1,32,32A32,32,0,0,1,144,48Zm16,112a8,8,0,0,0-8,8,48,48,0,1,1-48-48,8,8,0,0,0,0-16,64,64,0,1,0,64,64A8,8,0,0,0,160,160Zm40-32H141.82l17.12-29.78a8,8,0,0,0-2.57-10.69A96,96,0,0,0,42.91,94a8,8,0,1,0,10.18,12.33,80.09,80.09,0,0,1,88-9.17L121.06,132A8,8,0,0,0,128,144h62.24l-14.08,70.43a8,8,0,0,0,6.27,9.41A7.77,7.77,0,0,0,184,224a8,8,0,0,0,7.83-6.43l16-80A8,8,0,0,0,200,128Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.GuitarFill">M249.66,46.34l-40-40a8,8,0,0,0-11.32,11.32L200.69,20,140.52,80.16C117.73,68.3,92.21,69.29,76.75,84.74a42.27,42.27,0,0,0-9.39,14.37A8.24,8.24,0,0,1,59.81,104c-14.59.49-27.26,5.72-36.65,15.11C11.08,131.22,6,148.6,8.74,168.07,11.4,186.7,21.07,205.15,36,220s33.34,24.56,52,27.22A71.13,71.13,0,0,0,98.1,248c15.32,0,28.83-5.23,38.76-15.16,9.39-9.39,14.62-22.06,15.11-36.65a8.24,8.24,0,0,1,4.92-7.55,42.22,42.22,0,0,0,14.37-9.39c15.45-15.46,16.44-41,4.58-63.77L236,55.31l2.34,2.35a8,8,0,0,0,11.32-11.32Zm-156,159.31a8,8,0,0,1-11.31,0l-32-32a8,8,0,0,1,11.32-11.31l32,32A8,8,0,0,1,93.66,205.65Zm42.14-45.86a28,28,0,1,1,0-39.59A28,28,0,0,1,135.8,159.79Zm31.06-58a86.94,86.94,0,0,0-6-6.68,85.23,85.23,0,0,0-6.69-6L176,67.31,188.69,80ZM200,68.68,187.32,56,212,31.31,224.69,44Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.EngineFill">M256,120v48a16,16,0,0,1-16,16H227.31L192,219.31A15.86,15.86,0,0,1,180.69,224H103.31A15.86,15.86,0,0,1,92,219.31L52.69,180A15.86,15.86,0,0,1,48,168.69V148H24v24a8,8,0,0,1-16,0V108a8,8,0,0,1,16,0v24H48V80A16,16,0,0,1,64,64h60V40H100a8,8,0,0,1,0-16h64a8,8,0,0,1,0,16H140V64h40.69A15.86,15.86,0,0,1,192,68.69L227.31,104H240A16,16,0,0,1,256,120Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.WaveSineFill">M216,40H40A16,16,0,0,0,24,56V200a16,16,0,0,0,16,16H216a16,16,0,0,0,16-16V56A16,16,0,0,0,216,40Zm-4.78,91.44c-16.68,35-31.06,50.56-46.65,50.56-19.68,0-31.39-24.56-43.79-50.56C112,113,101,90,91.43,90c-3.74,0-14.37,4-32.21,41.44a8,8,0,0,1-14.44-6.88C61.46,89.59,75.84,74,91.43,74c19.68,0,31.39,24.56,43.79,50.56C144,143,155,166,164.57,166c3.74,0,14.37-4,32.21-41.44a8,8,0,1,1,14.44,6.88Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ClubFill">M240,144a56,56,0,0,1-84.81,48h-4.44l8.91,29.7A8,8,0,0,1,152,232H104a8,8,0,0,1-7.66-10.3l8.91-29.7h-4.44A56,56,0,1,1,72,88c.78,0,1.55,0,2.33,0a56,56,0,1,1,107.34,0c.77,0,1.55,0,2.33,0A56.06,56.06,0,0,1,240,144Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BatteryVerticalLowFill">M88,8a8,8,0,0,1,8-8h64a8,8,0,0,1,0,16H96A8,8,0,0,1,88,8Zm72,176H96a8,8,0,0,0-8,8v16a8,8,0,0,0,8,8h64a8,8,0,0,0,8-8V192A8,8,0,0,0,160,184ZM200,56V224a24,24,0,0,1-24,24H80a24,24,0,0,1-24-24V56A24,24,0,0,1,80,32h96A24,24,0,0,1,200,56Zm-16,0a8,8,0,0,0-8-8H80a8,8,0,0,0-8,8V224a8,8,0,0,0,8,8h96a8,8,0,0,0,8-8Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.StackMinusFill">M230.91,124A8,8,0,0,1,228,134.91l-96,56a8,8,0,0,1-8.06,0l-96-56A8,8,0,0,1,36,121.09l92,53.65,92-53.65A8,8,0,0,1,230.91,124ZM28,86.91l96,56a8,8,0,0,0,8.06,0l96-56a8,8,0,0,0,0-13.82l-96-56a8,8,0,0,0-8.06,0l-96,56a8,8,0,0,0,0,13.82ZM232,192H184a8,8,0,0,0,0,16h48a8,8,0,0,0,0-16Zm-92,23.76-12,7L36,169.09A8,8,0,0,0,28,182.91l96,56a8,8,0,0,0,8.06,0l16-9.33A8,8,0,1,0,140,215.76Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ChartLineFill">M216,40H40A16,16,0,0,0,24,56V200a16,16,0,0,0,16,16H216a16,16,0,0,0,16-16V56A16,16,0,0,0,216,40ZM200,176a8,8,0,0,1,0,16H56a8,8,0,0,1-8-8V72a8,8,0,0,1,16,0v62.92l34.88-29.07a8,8,0,0,1,9.56-.51l43,28.69,43.41-36.18a8,8,0,0,1,10.24,12.3l-48,40a8,8,0,0,1-9.56.51l-43-28.69L64,155.75V176Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CameraFill">M208,56H180.28L166.65,35.56A8,8,0,0,0,160,32H96a8,8,0,0,0-6.65,3.56L75.71,56H48A24,24,0,0,0,24,80V192a24,24,0,0,0,24,24H208a24,24,0,0,0,24-24V80A24,24,0,0,0,208,56Zm-44,76a36,36,0,1,1-36-36A36,36,0,0,1,164,132Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.MetaLogoFill">M216,40H40A16,16,0,0,0,24,56V200a16,16,0,0,0,16,16H216a16,16,0,0,0,16-16V56A16,16,0,0,0,216,40ZM201.23,170.26c-5.63,9-14.33,13.74-25.16,13.74-20.73,0-34.81-25.31-49.72-52.11C115.47,112.33,101.93,88,90.61,88,78.18,88,64,116.88,64,142.21c0,8.26,1.5,15,4.34,19.56C71,166,74.68,168,79.93,168c6.08,0,13.52-7,22.74-21.51a8,8,0,0,1,13.49,8.59C99.84,180.71,88.22,184,79.93,184c-10.83,0-19.53-4.75-25.16-13.74-4.43-7.08-6.77-16.78-6.77-28A103.13,103.13,0,0,1,59,97.06C67.34,80.9,78.57,72,90.61,72c20.73,0,34.81,25.31,49.72,52.11C151.21,143.66,164.75,168,176.07,168c5.25,0,8.93-2,11.59-6.23,2.84-4.53,4.34-11.3,4.34-19.56C192,116.88,177.82,88,165.39,88c-3.4,0-7.35,2.31-11.74,6.88a8,8,0,1,1-11.54-11.09C149.74,75.86,157.35,72,165.39,72c12,0,23.27,8.9,31.62,25.06a103.13,103.13,0,0,1,11,45.15C208,153.48,205.66,163.18,201.23,170.26Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.EjectFill">M33.31,126.24a15.59,15.59,0,0,1,3.1-17.12h0l73.73-77.51a24.76,24.76,0,0,1,35.72,0l73.73,77.51a15.59,15.59,0,0,1,3.1,17.12A16.18,16.18,0,0,1,207.76,136H48.24A16.18,16.18,0,0,1,33.31,126.24ZM208,152H48a16,16,0,0,0-16,16v16a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V168A16,16,0,0,0,208,152Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ScreencastFill">M56,208a8,8,0,0,1-8.24,8A8.28,8.28,0,0,1,40,207.76,8,8,0,0,0,32.24,200,8.28,8.28,0,0,1,24,192.24,8,8,0,0,1,32,184,24,24,0,0,1,56,208ZM32,152a8,8,0,0,0-8,8.65A8.17,8.17,0,0,0,32.24,168,40,40,0,0,1,72,207.76,8.17,8.17,0,0,0,79.36,216,8,8,0,0,0,88,208,56.06,56.06,0,0,0,32,152Zm0-32a8,8,0,0,0-8,8.6,8.22,8.22,0,0,0,8.3,7.4A72.08,72.08,0,0,1,104,207.68a8.22,8.22,0,0,0,7.4,8.3,8,8,0,0,0,8.6-8A88.1,88.1,0,0,0,32,120ZM216,40H40A16,16,0,0,0,24,56v44.08a4,4,0,0,0,4.15,4A104.11,104.11,0,0,1,135.93,211.85a4,4,0,0,0,4,4.15H216a16,16,0,0,0,16-16V56A16,16,0,0,0,216,40Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PlugFill">M237.66,77.66,203.31,112l26.35,26.34a8,8,0,0,1-11.32,11.32L212,143.31l-53,53a40,40,0,0,1-56.57,0L86.75,180.57,37.66,229.66a8,8,0,0,1-11.32-11.32l49.09-49.09L59.72,153.54a40,40,0,0,1,0-56.57l53-53-6.35-6.34a8,8,0,0,1,11.32-11.32L144,52.69l34.34-34.35a8,8,0,1,1,11.32,11.32L155.31,64,192,100.69l34.34-34.35a8,8,0,0,1,11.32,11.32Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ClipboardFill">M200,32H163.74a47.92,47.92,0,0,0-71.48,0H56A16,16,0,0,0,40,48V216a16,16,0,0,0,16,16H200a16,16,0,0,0,16-16V48A16,16,0,0,0,200,32Zm-72,0a32,32,0,0,1,32,32H96A32,32,0,0,1,128,32Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.LinktreeLogoFill">M200,24H56A16,16,0,0,0,40,40V216a16,16,0,0,0,16,16H200a16,16,0,0,0,16-16V40A16,16,0,0,0,200,24ZM136,200a8,8,0,0,1-16,0V160a8,8,0,0,1,16,0Zm48-80H147.31l26.35,26.34a8,8,0,0,1-11.32,11.32L128,123.31,93.66,157.66a8,8,0,0,1-11.32-11.32L108.69,120H72a8,8,0,0,1,0-16h36.69L82.34,77.66A8,8,0,0,1,93.66,66.34L120,92.69V56a8,8,0,0,1,16,0V92.69l26.34-26.35a8,8,0,0,1,11.32,11.32L147.31,104H184a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ApertureFill">M232,128A104,104,0,0,0,54.46,54.46,104,104,0,0,0,128,232h.09A104,104,0,0,0,232,128ZM49.18,88.92l51.21,9.35L46.65,161.53A88.39,88.39,0,0,1,49.18,88.92Zm160.17,5.54a88.41,88.41,0,0,1-2.53,72.62l-51.21-9.35Zm-8.08-15.2L167.55,119,139.63,40.78a87.38,87.38,0,0,1,50.6,25A88.74,88.74,0,0,1,201.27,79.26ZM122.43,40.19l17.51,49L58.3,74.32a89.28,89.28,0,0,1,7.47-8.55A87.37,87.37,0,0,1,122.43,40.19ZM54.73,176.74,88.45,137l27.92,78.18a88,88,0,0,1-61.64-38.48Zm78.84,39.06-17.51-49L139.14,171h0l58.52,10.69a87.5,87.5,0,0,1-64.13,34.12Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.UsersFill">M164.47,195.63a8,8,0,0,1-6.7,12.37H10.23a8,8,0,0,1-6.7-12.37,95.83,95.83,0,0,1,47.22-37.71,60,60,0,1,1,66.5,0A95.83,95.83,0,0,1,164.47,195.63Zm87.91-.15a95.87,95.87,0,0,0-47.13-37.56A60,60,0,0,0,144.7,54.59a4,4,0,0,0-1.33,6A75.83,75.83,0,0,1,147,150.53a4,4,0,0,0,1.07,5.53,112.32,112.32,0,0,1,29.85,30.83,23.92,23.92,0,0,1,3.65,16.47,4,4,0,0,0,3.95,4.64h60.3a8,8,0,0,0,7.73-5.93A8.22,8.22,0,0,0,252.38,195.48Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BatteryWarningVerticalFill">M88,8a8,8,0,0,1,8-8h64a8,8,0,0,1,0,16H96A8,8,0,0,1,88,8ZM200,56V224a24,24,0,0,1-24,24H80a24,24,0,0,1-24-24V56A24,24,0,0,1,80,32h96A24,24,0,0,1,200,56Zm-80,80a8,8,0,0,0,16,0V96a8,8,0,0,0-16,0Zm20,36a12,12,0,1,0-12,12A12,12,0,0,0,140,172Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.HashFill">M116.25,112h31.5l-8,32h-31.5ZM224,48V208a16,16,0,0,1-16,16H48a16,16,0,0,1-16-16V48A16,16,0,0,1,48,32H208A16,16,0,0,1,224,48Zm-16,56a8,8,0,0,0-8-8H168.25l7.51-30.06a8,8,0,0,0-15.52-3.88L151.75,96h-31.5l7.51-30.06a8,8,0,0,0-15.52-3.88L103.75,96H64a8,8,0,0,0,0,16H99.75l-8,32H56a8,8,0,0,0,0,16H87.75l-7.51,30.06a8,8,0,0,0,5.82,9.7,8.13,8.13,0,0,0,2,.24,8,8,0,0,0,7.75-6.06L104.25,160h31.5l-7.51,30.06a8,8,0,0,0,5.82,9.7A8.13,8.13,0,0,0,136,200a8,8,0,0,0,7.75-6.06L152.25,160H192a8,8,0,0,0,0-16H156.25l8-32H200A8,8,0,0,0,208,104Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SortDescendingFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM72,72h40a8,8,0,0,1,0,16H72a8,8,0,0,1,0-16Zm0,48h48a8,8,0,0,1,0,16H72a8,8,0,0,1,0-16Zm96,64H72a8,8,0,0,1,0-16h96a8,8,0,0,1,0,16Zm29.66-82.34a8,8,0,0,1-11.32,0L176,91.31V136a8,8,0,0,1-16,0V91.31l-10.34,10.35a8,8,0,0,1-11.32-11.32l24-24a8,8,0,0,1,11.32,0l24,24A8,8,0,0,1,197.66,101.66Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.KeyFill">M216.57,39.43A80,80,0,0,0,83.91,120.78L28.69,176A15.86,15.86,0,0,0,24,187.31V216a16,16,0,0,0,16,16H72a8,8,0,0,0,8-8V208H96a8,8,0,0,0,8-8V184h16a8,8,0,0,0,5.66-2.34l9.56-9.57A79.73,79.73,0,0,0,160,176h.1A80,80,0,0,0,216.57,39.43ZM180,92a16,16,0,1,1,16-16A16,16,0,0,1,180,92Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CableCarFill">M247.87,30.59a8,8,0,0,0-9.28-6.46l-224,40A8,8,0,0,0,16,80a8.6,8.6,0,0,0,1.42-.12L120,61.56V96H64a32,32,0,0,0-32,32v64a32,32,0,0,0,32,32H192a32,32,0,0,0,32-32V128a32,32,0,0,0-32-32H136V58.7L241.4,39.88A8,8,0,0,0,247.87,30.59ZM104,160V112h48v48ZM64,112H88v48H48V128A16,16,0,0,1,64,112Zm144,16v32H168V112h24A16,16,0,0,1,208,128Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.LaptopFill">M232,168h-8V72a24,24,0,0,0-24-24H56A24,24,0,0,0,32,72v96H24a8,8,0,0,0-8,8v16a24,24,0,0,0,24,24H216a24,24,0,0,0,24-24V176A8,8,0,0,0,232,168ZM112,72h32a8,8,0,0,1,0,16H112a8,8,0,0,1,0-16ZM224,192a8,8,0,0,1-8,8H40a8,8,0,0,1-8-8v-8H224Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ShieldCheckFill">M208,40H48A16,16,0,0,0,32,56v56c0,52.72,25.52,84.67,46.93,102.19,23.06,18.86,46,25.26,47,25.53a8,8,0,0,0,4.2,0c1-.27,23.91-6.67,47-25.53C198.48,196.67,224,164.72,224,112V56A16,16,0,0,0,208,40Zm-34.32,69.66-56,56a8,8,0,0,1-11.32,0l-24-24a8,8,0,0,1,11.32-11.32L112,148.69l50.34-50.35a8,8,0,0,1,11.32,11.32Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BookmarkSimpleFill">M184,32H72A16,16,0,0,0,56,48V224a8,8,0,0,0,12.24,6.78L128,193.43l59.77,37.35A8,8,0,0,0,200,224V48A16,16,0,0,0,184,32Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BeltFill">M64,80v96a8,8,0,0,1-16,0H8a8,8,0,0,1-8-8V88a8,8,0,0,1,8-8H48a8,8,0,0,1,16,0Zm192,8v80a8,8,0,0,1-8,8H189.83A16,16,0,0,1,176,184H112a16,16,0,0,1-13.83-8H84a4,4,0,0,1-4-4V84a4,4,0,0,1,4-4H98.17A16,16,0,0,1,112,72h64a16,16,0,0,1,13.83,8H248A8,8,0,0,1,256,88Zm-80,79.8V136H144a8,8,0,0,1,0-16h32V88H112v80h64C176,167.93,176,167.87,176,167.8Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CoinVerticalFill">M198.51,56.09C186.44,35.4,169.92,24,152,24H104C86.08,24,69.56,35.4,57.49,56.09,46.21,75.42,40,101,40,128s6.21,52.58,17.49,71.91C69.56,220.6,86.08,232,104,232h48c17.92,0,34.44-11.4,46.51-32.09C209.79,180.58,216,155,216,128S209.79,75.42,198.51,56.09ZM199.79,120h-32a152.78,152.78,0,0,0-9.68-48H188.7C194.82,85.38,198.86,102,199.79,120Zm-20.6-64H150.46a83.13,83.13,0,0,0-12-16H152C162,40,171.4,46,179.19,56ZM152,216H138.49a83.13,83.13,0,0,0,12-16h28.73C171.4,210,162,216,152,216Zm36.7-32H158.12a152.78,152.78,0,0,0,9.68-48h32C198.86,154,194.82,170.62,188.7,184Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.LockSimpleOpenFill">M224,96V208a16,16,0,0,1-16,16H48a16,16,0,0,1-16-16V96A16,16,0,0,1,48,80H80V56A48.05,48.05,0,0,1,128,8c23.2,0,43.32,16.15,47.84,38.41a8,8,0,0,1-15.68,3.18C157.2,35,143.37,24,128,24A32,32,0,0,0,96,56V80H208A16,16,0,0,1,224,96Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CellSignalSlashFill">M213.38,221.92a8,8,0,0,1-11.3-.54l-5.51-6.06A16.11,16.11,0,0,1,192,216H32a16,16,0,0,1-15.06-10.59,16.4,16.4,0,0,1,4.07-17l79.13-79.12L42.26,45.62a8.22,8.22,0,0,1,.14-11.38,8,8,0,0,1,11.48.37l160,176A8,8,0,0,1,213.38,221.92ZM201,172.66a4,4,0,0,0,7-2.69V40a16,16,0,0,0-27.32-11.32l-55.21,55.2a4,4,0,0,0-.13,5.52Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ElevatorFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM112,56h32a8,8,0,0,1,0,16H112a8,8,0,0,1,0-16Zm8,152H64V96h56Zm72,0H136V96h56Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.MicrophoneSlashFill">M213.38,229.92a8,8,0,0,1-11.3-.54l-30.92-34A78.83,78.83,0,0,1,136,207.59V240a8,8,0,0,1-16,0V207.6A80.11,80.11,0,0,1,48,128a8,8,0,0,1,16,0,64.07,64.07,0,0,0,64,64,63.41,63.41,0,0,0,32.21-8.68l-11.1-12.2A48,48,0,0,1,80,128V95.09L42.08,53.38A8,8,0,0,1,53.92,42.62l160,176A8,8,0,0,1,213.38,229.92Zm-24.19-63.13a7.88,7.88,0,0,0,3.51.82,8,8,0,0,0,7.19-4.49A79.16,79.16,0,0,0,208,128a8,8,0,0,0-16,0,63.32,63.32,0,0,1-6.48,28.09A8,8,0,0,0,189.19,166.79Zm-27.33-29.22A8,8,0,0,0,175.74,133a49.49,49.49,0,0,0,.26-5V64A48,48,0,0,0,84,44.87a8,8,0,0,0,1.41,8.57Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.UserCircleMinusFill">M128,76a44,44,0,1,1-44,44A44,44,0,0,1,128,76Zm48-12h48a8,8,0,0,0,0-16H176a8,8,0,0,0,0,16Zm39.87,24.46A8,8,0,0,0,211,98.67a88,88,0,0,1-17.23,87.74A79.86,79.86,0,0,0,172,165.1a4,4,0,0,0-4.84.32,59.81,59.81,0,0,1-78.27,0A4,4,0,0,0,84,165.1a79.71,79.71,0,0,0-21.79,21.31A88,88,0,0,1,128,40a88.76,88.76,0,0,1,14.68,1.22,8,8,0,0,0,2.64-15.78,103.9,103.9,0,1,0,80.76,67.89A8,8,0,0,0,215.87,88.46Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FileTextFill">M213.66,82.34l-56-56A8,8,0,0,0,152,24H56A16,16,0,0,0,40,40V216a16,16,0,0,0,16,16H200a16,16,0,0,0,16-16V88A8,8,0,0,0,213.66,82.34ZM160,176H96a8,8,0,0,1,0-16h64a8,8,0,0,1,0,16Zm0-32H96a8,8,0,0,1,0-16h64a8,8,0,0,1,0,16Zm-8-56V44l44,44Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowSquareUpRightFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM168,144a8,8,0,0,1-16,0V115.31l-50.34,50.35a8,8,0,0,1-11.32-11.32L140.69,104H112a8,8,0,0,1,0-16h48a8,8,0,0,1,8,8Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ShoppingCartFill">M230.14,58.87A8,8,0,0,0,224,56H62.68L56.6,22.57A8,8,0,0,0,48.73,16H24a8,8,0,0,0,0,16h18L67.56,172.29a24,24,0,0,0,5.33,11.27,28,28,0,1,0,44.4,8.44h45.42A27.75,27.75,0,0,0,160,204a28,28,0,1,0,28-28H91.17a8,8,0,0,1-7.87-6.57L80.13,152h116a24,24,0,0,0,23.61-19.71l12.16-66.86A8,8,0,0,0,230.14,58.87ZM104,204a12,12,0,1,1-12-12A12,12,0,0,1,104,204Zm96,0a12,12,0,1,1-12-12A12,12,0,0,1,200,204Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FootprintsFill">M216.06,192v12A36,36,0,0,1,144,204V192a8,8,0,0,1,8-8h56A8,8,0,0,1,216.06,192ZM104,160h-56a8,8,0,0,0-8,8v12A36,36,0,0,0,112,180V168A8,8,0,0,0,104,160ZM76,16C64.36,16,53.07,26.31,44.2,45c-13.93,29.38-18.56,73,.29,96a8,8,0,0,0,6.2,2.93h50.55a8,8,0,0,0,6.2-2.93c18.85-23,14.22-66.65.29-96C98.85,26.31,87.57,16,76,16Zm78.8,152h50.55a8,8,0,0,0,6.2-2.93c18.85-23,14.22-66.65.29-96C202.93,50.31,191.64,40,180,40s-22.89,10.31-31.77,29c-13.93,29.38-18.56,73,.29,96A8,8,0,0,0,154.76,168Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PhoneDisconnectFill">M236.28,161.84a16,16,0,0,1-18.38,5.06l-49-17.39-.29-.11a16,16,0,0,1-9.72-11.59l-6.21-29.75h0a76.52,76.52,0,0,0-49.68.11l-5.9,29.52a16,16,0,0,1-9.75,11.73l-.29.11-49,17.37A15.8,15.8,0,0,1,32.35,168a16,16,0,0,1-12.63-6.14c-17.23-22.22-15.3-51.71,4.69-71.71,56.15-56.17,151-56.17,207.18,0h0C251.58,110.13,253.51,139.62,236.28,161.84ZM216,192H40a8,8,0,0,0,0,16H216a8,8,0,0,0,0-16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FlagPennantFill">M248,104a8,8,0,0,1-5.37,7.56L64,173.69V216a8,8,0,0,1-16,0V40a8,8,0,0,1,10.63-7.56l184,64A8,8,0,0,1,248,104Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.AirplaneTaxiingFill">M248,136v24a8,8,0,0,1-8,8H61.07a39.75,39.75,0,0,1-38.31-28.51L8.69,92.6A16,16,0,0,1,24,72h8a8,8,0,0,1,5.65,2.34L59.32,96H81.81l-9-26.94A16,16,0,0,1,88,48h8a8,8,0,0,1,5.66,2.34L147.32,96H208A40,40,0,0,1,248,136Zm-40,48a16,16,0,1,0,16,16A16,16,0,0,0,208,184Zm-96,0a16,16,0,1,0,16,16A16,16,0,0,0,112,184Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CellTowerFill">M135.16,84.42a8,8,0,0,0-14.32,0l-72,144a8,8,0,0,0,14.31,7.16L77,208h102.1l13.79,27.58A8,8,0,0,0,200,240a8,8,0,0,0,7.15-11.58ZM128,105.89,155.06,160H100.94Zm31.49-12.15a32,32,0,1,0-63,0,8,8,0,1,1-15.74,2.85,48,48,0,1,1,94.46,0,8,8,0,0,1-7.86,6.58,8.74,8.74,0,0,1-1.43-.13A8,8,0,0,1,159.49,93.74ZM64.15,136.21a80,80,0,1,1,127.7,0,8,8,0,0,1-12.76-9.65,64,64,0,1,0-102.18,0,8,8,0,0,1-12.76,9.65Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SignpostFill">M246,117.35,212.33,154.7a16,16,0,0,1-11.89,5.3H136v64a8,8,0,0,1-16,0V160H40a16,16,0,0,1-16-16V80A16,16,0,0,1,40,64h80V32a8,8,0,0,1,16,0V64h64.44a16,16,0,0,1,11.89,5.3L246,106.65A8,8,0,0,1,246,117.35Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.DiceSixFill">M192,32H64A32,32,0,0,0,32,64V192a32,32,0,0,0,32,32H192a32,32,0,0,0,32-32V64A32,32,0,0,0,192,32ZM92,184a12,12,0,1,1,12-12A12,12,0,0,1,92,184Zm0-44a12,12,0,1,1,12-12A12,12,0,0,1,92,140Zm0-44a12,12,0,1,1,12-12A12,12,0,0,1,92,96Zm72,88a12,12,0,1,1,12-12A12,12,0,0,1,164,184Zm0-44a12,12,0,1,1,12-12A12,12,0,0,1,164,140Zm0-44a12,12,0,1,1,12-12A12,12,0,0,1,164,96Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.DeskFill">M248,64H8A8,8,0,0,0,8,80h8V192a8,8,0,0,0,16,0V144H224v48a8,8,0,0,0,16,0V80h8a8,8,0,0,0,0-16ZM80,112H56a8,8,0,0,1,0-16H80a8,8,0,0,1,0,16Zm56,8a8,8,0,0,1-16,0V88a8,8,0,0,1,16,0Zm64-8H176a8,8,0,0,1,0-16h24a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PaperclipHorizontalFill">M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24Zm40,144H72a24,24,0,0,1,0-48h96a8,8,0,0,1,0,16H72a8,8,0,0,0,0,16h96a24,24,0,0,0,0-48H96a8,8,0,0,1,0-16h72a40,40,0,0,1,0,80Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BookmarksFill">M192,24H96A16,16,0,0,0,80,40V56H64A16,16,0,0,0,48,72V224a8,8,0,0,0,12.65,6.51L112,193.83l51.36,36.68A8,8,0,0,0,176,224V184.69l19.35,13.82A8,8,0,0,0,208,192V40A16,16,0,0,0,192,24Zm0,152.46L176,165V72a16,16,0,0,0-16-16H96V40h96Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CircleNotchFill">M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24Zm0,176A72,72,0,0,1,92,65.64a8,8,0,0,1,8,13.85,56,56,0,1,0,56,0,8,8,0,0,1,8-13.85A72,72,0,0,1,128,200Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.TextAlignJustifyFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM192,184H64a8,8,0,0,1,0-16H192a8,8,0,0,1,0,16Zm0-32H64a8,8,0,0,1,0-16H192a8,8,0,0,1,0,16Zm0-32H64a8,8,0,0,1,0-16H192a8,8,0,0,1,0,16Zm0-32H64a8,8,0,0,1,0-16H192a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowCircleUpRightFill">M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24Zm40,120a8,8,0,0,1-16,0V115.31l-50.34,50.35a8,8,0,0,1-11.32-11.32L140.69,104H112a8,8,0,0,1,0-16h48a8,8,0,0,1,8,8Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.GoogleChromeLogoFill">M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24Zm0,16a88,88,0,0,1,73.72,40H128a48.08,48.08,0,0,0-45.6,33l-23.08-40A87.89,87.89,0,0,1,128,40ZM40,128a87.44,87.44,0,0,1,9.56-39.86L86.43,152c.06.1.13.19.19.28A48,48,0,0,0,137.82,175l-23.1,40A88.14,88.14,0,0,1,40,128Zm92.69,87.87L169.57,152c.08-.14.14-.28.22-.42a47.88,47.88,0,0,0-6-55.58H210a88,88,0,0,1-77.29,119.87Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PencilFill">M227.31,73.37,182.63,28.68a16,16,0,0,0-22.63,0L36.69,152A15.86,15.86,0,0,0,32,163.31V208a16,16,0,0,0,16,16H92.69A15.86,15.86,0,0,0,104,219.31L227.31,96a16,16,0,0,0,0-22.63ZM51.31,160l90.35-90.35,16.68,16.69L68,176.68ZM48,179.31,76.69,208H48Zm48,25.38L79.31,188l90.35-90.35h0l16.68,16.69Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FastForwardCircleFill">M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24Zm68.8,110.4-48,36A8,8,0,0,1,144,172a8,8,0,0,1-8-8V128a8,8,0,0,1-3.2,6.4l-48,36A8,8,0,0,1,80,172a8,8,0,0,1-8-8V92a8,8,0,0,1,12.8-6.4l48,36A8,8,0,0,1,136,128V92a8,8,0,0,1,12.8-6.4l48,36a8,8,0,0,1,0,12.8Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.VectorThreeFill">M237.66,141.66l-32,32A8,8,0,0,1,192,168V144H123.31l-40,40,18.35,18.34A8,8,0,0,1,96,216H48a8,8,0,0,1-8-8V160a8,8,0,0,1,13.66-5.66L72,172.69l40-40V64H88a8,8,0,0,1-5.66-13.66l32-32a8,8,0,0,1,11.32,0l32,32A8,8,0,0,1,152,64H128v64h64V104a8,8,0,0,1,13.66-5.66l32,32A8,8,0,0,1,237.66,141.66Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.GridNineFill">M84,52V92H28a4,4,0,0,1-4-4V64A16,16,0,0,1,40,48H80A4,4,0,0,1,84,52Zm16,152a4,4,0,0,0,4,4h48a4,4,0,0,0,4-4V164H100ZM24,168v24a16,16,0,0,0,16,16H80a4,4,0,0,0,4-4V164H28A4,4,0,0,0,24,168Zm0-56v32a4,4,0,0,0,4,4H84V108H28A4,4,0,0,0,24,112ZM152,48H104a4,4,0,0,0-4,4V92h56V52A4,4,0,0,0,152,48Zm76,60H172v40h56a4,4,0,0,0,4-4V112A4,4,0,0,0,228,108ZM100,148h56V108H100ZM216,48H176a4,4,0,0,0-4,4V92h56a4,4,0,0,0,4-4V64A16,16,0,0,0,216,48Zm12,116H172v40a4,4,0,0,0,4,4h40a16,16,0,0,0,16-16V168A4,4,0,0,0,228,164Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.AnchorFill">M224,144c0,38.11-27.67,45.66-49.9,51.72C149.77,202.36,136,207.31,136,232a8,8,0,0,1-16,0c0-24.69-13.77-29.64-38.1-36.28C59.67,189.66,32,182.11,32,144a8,8,0,0,1,16,0c0,24.69,13.77,29.64,38.1,36.28,11.36,3.1,24.12,6.6,33.9,14.34V128H88a8,8,0,0,1,0-16h32V82.83a28,28,0,1,1,16,0V112h32a8,8,0,0,1,0,16H136v66.62c9.78-7.74,22.54-11.24,33.9-14.34C194.23,173.64,208,168.69,208,144a8,8,0,0,1,16,0Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.GooglePhotosLogoFill">M232,120H192.49A72,72,0,0,0,128,16a8,8,0,0,0-8,8V63.51A72,72,0,0,0,16,128a8,8,0,0,0,8,8H63.51A72,72,0,0,0,128,240a8,8,0,0,0,8-8V192.49A72,72,0,0,0,240,128,8,8,0,0,0,232,120ZM88,72a55.31,55.31,0,0,1,32,10v38H32.57A56.09,56.09,0,0,1,88,72Zm80,112A55.31,55.31,0,0,1,136,174V136h87.43A56.09,56.09,0,0,1,168,184Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BaseballHelmetFill">M248,120H223.7A104,104,0,0,0,16,128v24a72.08,72.08,0,0,0,72,72h40a72.08,72.08,0,0,0,72-72V136h48a8,8,0,0,0,0-16ZM88,180a24,24,0,1,1,24-24A24,24,0,0,1,88,180Zm96-28a56.06,56.06,0,0,1-50.46,55.72A71.87,71.87,0,0,0,160,152V136h24Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.MouseMiddleClickFill">M144,16H112A64.07,64.07,0,0,0,48,80v96a64.07,64.07,0,0,0,64,64h32a64.07,64.07,0,0,0,64-64V80A64.07,64.07,0,0,0,144,16Zm48,64v24H152V88a16,16,0,0,0-16-16V32h8A48.05,48.05,0,0,1,192,80ZM112,32h8V72a16,16,0,0,0-16,16v16H64V80A48.05,48.05,0,0,1,112,32Zm32,192H112a48.05,48.05,0,0,1-48-48V120h40v16a16,16,0,0,0,16,16h16a16,16,0,0,0,16-16V120h40v56A48.05,48.05,0,0,1,144,224Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ReplitLogoFill">M72,160h72v56a16,16,0,0,1-16,16H72a16,16,0,0,1-16-16V176A16,16,0,0,1,72,160ZM128,24H72A16,16,0,0,0,56,40V80A16,16,0,0,0,72,96h72V40A16,16,0,0,0,128,24Zm88,72H144v64h72a16,16,0,0,0,16-16V112A16,16,0,0,0,216,96Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BabyCarriageFill">M215.58,54.55a7.53,7.53,0,0,0-1.32-1.27A79.68,79.68,0,0,0,160,32h-8a16,16,0,0,0-16,16v56H55.2A40.07,40.07,0,0,0,16,72a8,8,0,0,0,0,16,24,24,0,0,1,24,24,80.09,80.09,0,0,0,80,80h40A79.94,79.94,0,0,0,215.58,54.55Zm-6.91,16A63.73,63.73,0,0,1,223.48,104H166.81ZM160,48a63.59,63.59,0,0,1,36.69,11.61L152,95.35V48ZM104,224a16,16,0,1,1-16-16A16,16,0,0,1,104,224Zm104,0a16,16,0,1,1-16-16A16,16,0,0,1,208,224Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.TextAaFill">M200,156c0,6.5-7.33,12-16,12s-16-5.5-16-12,7.33-12,16-12S200,149.5,200,156ZM232,56V200a16,16,0,0,1-16,16H40a16,16,0,0,1-16-16V56A16,16,0,0,1,40,40H216A16,16,0,0,1,232,56ZM143.37,172.88l-44-104a8,8,0,0,0-14.74,0l-44,104a8,8,0,0,0,14.74,6.24L66.84,152h50.32l11.47,27.12a8,8,0,0,0,14.74-6.24ZM216,124c0-15.44-14.36-28-32-28a34.86,34.86,0,0,0-20.78,6.68,8,8,0,0,0,9.56,12.83A18.84,18.84,0,0,1,184,112c8.56,0,15.8,5.36,16,11.76v8A35.24,35.24,0,0,0,184,128c-17.64,0-32,12.56-32,28s14.36,28,32,28a35.13,35.13,0,0,0,16.93-4.26A8,8,0,0,0,216,176ZM73.61,136h36.78L92,92.53Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.MoonStarsFill">M240,96a8,8,0,0,1-8,8H216v16a8,8,0,0,1-16,0V104H184a8,8,0,0,1,0-16h16V72a8,8,0,0,1,16,0V88h16A8,8,0,0,1,240,96ZM144,56h8v8a8,8,0,0,0,16,0V56h8a8,8,0,0,0,0-16h-8V32a8,8,0,0,0-16,0v8h-8a8,8,0,0,0,0,16Zm65.14,94.33A88.07,88.07,0,0,1,105.67,46.86a8,8,0,0,0-10.6-9.06A96,96,0,1,0,218.2,160.93a8,8,0,0,0-9.06-10.6Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.AlignRightFill">M224,40V216a8,8,0,0,1-16,0V40a8,8,0,0,1,16,0Zm-48,8H80A16,16,0,0,0,64,64v40a16,16,0,0,0,16,16h96a16,16,0,0,0,16-16V64A16,16,0,0,0,176,48Zm0,88H40a16,16,0,0,0-16,16v40a16,16,0,0,0,16,16H176a16,16,0,0,0,16-16V152A16,16,0,0,0,176,136Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BeerSteinFill">M216,88H200V72a40,40,0,0,0-40-40H148.82c-11.91-10.2-28-16-44.82-16C68.71,16,40,41.12,40,72V208a16,16,0,0,0,16,16H184a16,16,0,0,0,16-16v-8h16a24,24,0,0,0,24-24V112A24,24,0,0,0,216,88ZM104,184a8,8,0,0,1-16,0V104a8,8,0,0,1,16,0Zm48,0a8,8,0,0,1-16,0V104a8,8,0,0,1,16,0ZM57,64c4.46-18.24,23.85-32,47-32,13.87,0,27.06,5,36.21,13.78A8,8,0,0,0,145.74,48H160a24,24,0,0,1,22.62,16ZM224,176a8,8,0,0,1-8,8H200V104h16a8,8,0,0,1,8,8Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BookOpenFill">M240,56V200a8,8,0,0,1-8,8H160a24,24,0,0,0-24,23.94,7.9,7.9,0,0,1-5.12,7.55A8,8,0,0,1,120,232a24,24,0,0,0-24-24H24a8,8,0,0,1-8-8V56a8,8,0,0,1,8-8H88a32,32,0,0,1,32,32v87.73a8.17,8.17,0,0,0,7.47,8.25,8,8,0,0,0,8.53-8V80a32,32,0,0,1,32-32h64A8,8,0,0,1,240,56Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.VibrateFill">M208,80a8,8,0,0,0-8,8v80a8,8,0,0,0,16,0V88A8,8,0,0,0,208,80Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.VibrateFill2">M240,96a8,8,0,0,0-8,8v48a8,8,0,0,0,16,0V104A8,8,0,0,0,240,96Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.VibrateFill3">M48,80a8,8,0,0,0-8,8v80a8,8,0,0,0,16,0V88A8,8,0,0,0,48,80Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.VibrateFill4">M16,96a8,8,0,0,0-8,8v48a8,8,0,0,0,16,0V104A8,8,0,0,0,16,96Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.UnionFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM184,136a56,56,0,0,1-112,0V80a8,8,0,0,1,16,0v56a40,40,0,0,0,80,0V80a8,8,0,0,1,16,0Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.NumberSevenFill">M200,24H56A16,16,0,0,0,40,40V216a16,16,0,0,0,16,16H200a16,16,0,0,0,16-16V40A16,16,0,0,0,200,24ZM167.53,74.69l-40,112a8,8,0,1,1-15.06-5.38L148.65,80H96a8,8,0,0,1,0-16h64a8,8,0,0,1,7.53,10.69Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ClockCountdownFill">M232,136.66A104.12,104.12,0,1,1,119.34,24,8,8,0,0,1,120.66,40,88.12,88.12,0,1,0,216,135.34,8,8,0,0,1,232,136.66ZM160,48a12,12,0,1,0-12-12A12,12,0,0,0,160,48Zm36,24a12,12,0,1,0-12-12A12,12,0,0,0,196,72Zm24,36a12,12,0,1,0-12-12A12,12,0,0,0,220,108ZM128,56a72,72,0,1,1-72,72A72.08,72.08,0,0,1,128,56Zm-8,72a8,8,0,0,0,8,8h48a8,8,0,0,0,0-16H136V80a8,8,0,0,0-16,0Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PersonArmsSpreadFill">M100,36a28,28,0,1,1,28,28A28,28,0,0,1,100,36ZM227.6,92.57A15.7,15.7,0,0,0,212,80H44a16,16,0,0,0-6.7,30.53l.06,0,53.89,23.73-21.92,83.3a16,16,0,0,0,7.9,20.91A15.83,15.83,0,0,0,84,240a16,16,0,0,0,14.44-9.06L128,180l29.58,51a16,16,0,0,0,29.07-13.35l-21.92-83.3,54-23.76A15.7,15.7,0,0,0,227.6,92.57Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.TextHSixFill">M192,152a16,16,0,1,1-16-16A16,16,0,0,1,192,152ZM224,48V208a16,16,0,0,1-16,16H48a16,16,0,0,1-16-16V48A16,16,0,0,1,48,32H208A16,16,0,0,1,224,48ZM128,80a8,8,0,0,0-16,0v32H72V80a8,8,0,0,0-16,0v80a8,8,0,0,0,16,0V128h40v32a8,8,0,0,0,16,0Zm80,72a32,32,0,0,0-32-32l11.55-20a8,8,0,0,0-13.86-8l-25.4,44-.14.27A32,32,0,1,0,208,152Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.NumberCircleZeroFill">M156,128c0,14.86-5.9,40-28,40s-28-25.14-28-40,5.9-40,28-40S156,113.14,156,128Zm76,0A104,104,0,1,1,128,24,104.11,104.11,0,0,1,232,128Zm-60,0c0-14.25-3.56-27.53-10-37.39C154,78.44,142.23,72,128,72s-26,6.44-34,18.61c-6.47,9.86-10,23.14-10,37.39s3.56,27.53,10,37.39c8,12.18,19.74,18.61,34,18.61s26-6.43,34-18.61C168.44,155.53,172,142.25,172,128Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ToggleLeftFill">M176,56H80a72,72,0,0,0,0,144h96a72,72,0,0,0,0-144ZM80,168a40,40,0,1,1,40-40A40,40,0,0,1,80,168Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.LineSegmentFill">M211.81,83.79a28,28,0,0,1-33.12,4.83L88.62,178.69a28,28,0,1,1-44.43-6.48h0a28,28,0,0,1,33.12-4.83l90.07-90.07a28,28,0,1,1,44.43,6.48Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.LinkSimpleBreakFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM144.56,173.66l-21.45,21.45a44,44,0,0,1-62.22-62.22l21.45-21.46a8,8,0,0,1,11.32,11.31L72.2,144.2a28,28,0,0,0,39.6,39.6l21.45-21.46a8,8,0,0,1,11.31,11.32Zm50.55-50.55-21.45,21.45a8,8,0,0,1-11.32-11.31L183.8,111.8a28,28,0,0,0-39.6-39.6L122.74,93.66a8,8,0,0,1-11.31-11.32l21.46-21.45a44,44,0,0,1,62.22,62.22Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CopyrightFill">M128,56a72,72,0,1,0,72,72A72.08,72.08,0,0,0,128,56Zm0,104a31.8,31.8,0,0,0,25.61-12.8,8,8,0,1,1,12.79,9.61,48,48,0,1,1,0-57.63,8,8,0,1,1-12.79,9.61A32,32,0,1,0,128,160Zm0-136A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24Zm0,192a88,88,0,1,1,88-88A88.1,88.1,0,0,1,128,216Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SnowflakeFill">M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24Zm42.37,119.22,18.94-6.76a8,8,0,1,1,5.38,15.08l-15.48,5.52,4.52,16.87a8,8,0,0,1-5.66,9.8A8.23,8.23,0,0,1,176,184a8,8,0,0,1-7.73-5.93l-5.57-20.8L136,141.86v30.83l13.66,13.65a8,8,0,0,1-11.32,11.32L128,187.31l-10.34,10.35a8,8,0,0,1-11.32-11.32L120,172.69V141.86L93.3,157.27l-5.57,20.8A8,8,0,0,1,80,184a8.23,8.23,0,0,1-2.07-.27,8,8,0,0,1-5.66-9.8l4.52-16.87-15.48-5.52a8,8,0,0,1,5.38-15.08l18.94,6.76L112,128,85.63,112.78l-18.94,6.76A8.18,8.18,0,0,1,64,120a8,8,0,0,1-2.69-15.54l15.48-5.52L72.27,82.07a8,8,0,0,1,15.46-4.14l5.57,20.8L120,114.14V83.31L106.34,69.66a8,8,0,0,1,11.32-11.32L128,68.69l10.34-10.35a8,8,0,0,1,11.32,11.32L136,83.31v30.83l26.7-15.41,5.57-20.8a8,8,0,0,1,15.46,4.14l-4.52,16.87,15.48,5.52A8,8,0,0,1,192,120a8.18,8.18,0,0,1-2.69-.46l-18.94-6.76L144,128Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.TelevisionSimpleFill">M216,64H147.31l34.35-34.34a8,8,0,1,0-11.32-11.32L128,60.69,85.66,18.34A8,8,0,0,0,74.34,29.66L108.69,64H40A16,16,0,0,0,24,80V200a16,16,0,0,0,16,16H216a16,16,0,0,0,16-16V80A16,16,0,0,0,216,64Zm0,136H40V80H216V200ZM200,100v80a4,4,0,0,1-4,4H60a4,4,0,0,1-4-4V100a4,4,0,0,1,4-4H196A4,4,0,0,1,200,100Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BasketFill">M238,82.73A8,8,0,0,0,232,80H187.63L134,18.73a8,8,0,0,0-12,0L68.37,80H24a8,8,0,0,0-7.93,9.06L31.14,202.12A16.06,16.06,0,0,0,47,216H209a16.06,16.06,0,0,0,15.86-13.88L239.93,89.06A8,8,0,0,0,238,82.73ZM81.6,184a7.32,7.32,0,0,1-.81,0,8,8,0,0,1-8-7.2l-5.6-56a8,8,0,0,1,15.92-1.6l5.6,56A8,8,0,0,1,81.6,184Zm54.4-8a8,8,0,0,1-16,0V120a8,8,0,0,1,16,0ZM89.63,80,128,36.15,166.37,80Zm99.13,40.8-5.6,56a8,8,0,0,1-7.95,7.2,7.32,7.32,0,0,1-.81,0,8,8,0,0,1-7.16-8.76l5.6-56a8,8,0,0,1,15.92,1.6Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.DiceFourFill">M192,32H64A32,32,0,0,0,32,64V192a32,32,0,0,0,32,32H192a32,32,0,0,0,32-32V64A32,32,0,0,0,192,32ZM100,168a12,12,0,1,1,12-12A12,12,0,0,1,100,168Zm0-56a12,12,0,1,1,12-12A12,12,0,0,1,100,112Zm56,56a12,12,0,1,1,12-12A12,12,0,0,1,156,168Zm0-56a12,12,0,1,1,12-12A12,12,0,0,1,156,112Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CameraPlusFill">M208,56H180.28L169,39.12A16,16,0,0,0,155.72,32H100.28A16,16,0,0,0,87,39.12L75.72,56H48A24,24,0,0,0,24,80V192a24,24,0,0,0,24,24H208a24,24,0,0,0,24-24V80A24,24,0,0,0,208,56Zm-48,88H136v24a8,8,0,0,1-16,0V144H96a8,8,0,0,1,0-16h24V104a8,8,0,0,1,16,0v24h24a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.NumberCircleOneFill">M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24Zm12,152a8,8,0,0,1-16,0V95l-11.56,7.71a8,8,0,1,1-8.88-13.32l24-16A8,8,0,0,1,140,80Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.GreaterThanOrEqualFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM184,184H80a8,8,0,0,1,0-16H184a8,8,0,0,1,0,16Zm2.35-64.35-104,32a8,8,0,1,1-4.7-15.3L156.8,112,77.65,87.65a8,8,0,0,1,4.7-15.3l104,32a8,8,0,0,1,0,15.3Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.LineVerticalFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM136,192a8,8,0,0,1-16,0V64a8,8,0,0,1,16,0Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CheckSquareOffsetFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM80,200a8,8,0,0,1-5.66-2.34l-16-16a8,8,0,0,1,11.32-11.32L80,180.69l34.34-34.35a8,8,0,0,1,11.32,11.32l-40,40A8,8,0,0,1,80,200Zm120-8a8,8,0,0,1-8,8H136a8,8,0,0,1,0-16h48V72H72v64a8,8,0,0,1-16,0V64a8,8,0,0,1,8-8H192a8,8,0,0,1,8,8Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ParkFill">M232,192H200V168h24a8,8,0,0,0,7.76-9.94l-32-128a8,8,0,0,0-15.52,0l-32,128A8,8,0,0,0,160,168h24v24H120V176h8a8,8,0,0,0,0-16h-8V144h8a8,8,0,0,0,0-16H40a8,8,0,0,0,0,16h8v16H40a8,8,0,0,0,0,16h8v16H24a8,8,0,0,0,0,16H232a8,8,0,0,0,0-16Zm-128,0H64V176h40Zm0-32H64V144h40Zm12-64A28,28,0,1,0,88,68,28,28,0,0,0,116,96Zm0-40a12,12,0,1,1-12,12A12,12,0,0,1,116,56Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.LetterCirclePFill">M156,116a20,20,0,0,1-20,20H112V96h24A20,20,0,0,1,156,116Zm76,12A104,104,0,1,1,128,24,104.11,104.11,0,0,1,232,128Zm-60-12a36,36,0,0,0-36-36H104a8,8,0,0,0-8,8v80a8,8,0,0,0,16,0V152h24A36,36,0,0,0,172,116Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BagSimpleFill">M216,64H176a48,48,0,0,0-96,0H40A16,16,0,0,0,24,80V200a16,16,0,0,0,16,16H216a16,16,0,0,0,16-16V80A16,16,0,0,0,216,64ZM128,32a32,32,0,0,1,32,32H96A32,32,0,0,1,128,32Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CoatHangerFill">M241.57,171.2,141.33,96l23.46-17.6A8,8,0,0,0,168,72a40,40,0,1,0-80,0,8,8,0,0,0,16,0,24,24,0,0,1,47.69-3.78L14.43,171.2A16,16,0,0,0,24,200H232a16,16,0,0,0,9.6-28.8ZM32.73,184C53.6,170.59,89.49,152,128,152s74.4,18.59,95.27,32Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowsInCardinalFill">M90.34,69.66A8,8,0,0,1,96,56h24V24a8,8,0,0,1,16,0V56h24a8,8,0,0,1,5.66,13.66l-32,32a8,8,0,0,1-11.32,0Zm43.32,84.68a8,8,0,0,0-11.32,0l-32,32A8,8,0,0,0,96,200h24v32a8,8,0,0,0,16,0V200h24a8,8,0,0,0,5.66-13.66ZM232,120H200V96a8,8,0,0,0-13.66-5.66l-32,32a8,8,0,0,0,0,11.32l32,32A8,8,0,0,0,200,160V136h32a8,8,0,0,0,0-16Zm-130.34,2.34-32-32A8,8,0,0,0,56,96v24H24a8,8,0,0,0,0,16H56v24a8,8,0,0,0,13.66,5.66l32-32A8,8,0,0,0,101.66,122.34Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PhoneCallFill">M144.27,45.93a8,8,0,0,1,9.8-5.66,86.22,86.22,0,0,1,61.66,61.66,8,8,0,0,1-5.66,9.8A8.23,8.23,0,0,1,208,112a8,8,0,0,1-7.73-5.93,70.35,70.35,0,0,0-50.33-50.34A8,8,0,0,1,144.27,45.93Zm-2.33,41.8c13.79,3.68,22.65,12.55,26.33,26.34A8,8,0,0,0,176,120a8.23,8.23,0,0,0,2.07-.27,8,8,0,0,0,5.66-9.8c-5.12-19.16-18.5-32.54-37.66-37.66a8,8,0,1,0-4.13,15.46Zm72.43,78.73-47.11-21.11-.13-.06a16,16,0,0,0-15.17,1.4,8.12,8.12,0,0,0-.75.56L126.87,168c-15.42-7.49-31.34-23.29-38.83-38.51l20.78-24.71c.2-.25.39-.5.57-.77a16,16,0,0,0,1.32-15.06l0-.12L89.54,41.64a16,16,0,0,0-16.62-9.52A56.26,56.26,0,0,0,24,88c0,79.4,64.6,144,144,144a56.26,56.26,0,0,0,55.88-48.92A16,16,0,0,0,214.37,166.46Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SpiralFill">M248,144a8,8,0,0,1-16,0,96.11,96.11,0,0,0-96-96c-1.4,0-2.8,0-4.18.1A80.06,80.06,0,0,0,56,128a64.07,64.07,0,0,0,64,64,44.05,44.05,0,0,0,44-44,32,32,0,0,0-32-32,8,8,0,0,0,0,16,16,16,0,0,1,16,16,28,28,0,0,1-28,28,48.05,48.05,0,0,1-48-48,64.07,64.07,0,0,1,64-64,80.09,80.09,0,0,1,80,80,88.1,88.1,0,0,1-88,88,96.11,96.11,0,0,1-96-96A104.11,104.11,0,0,1,136,32,112.12,112.12,0,0,1,248,144Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CodesandboxLogoFill">M229.89,72.25v0l0,0a15.93,15.93,0,0,0-6.18-6.06L135.68,18a15.94,15.94,0,0,0-15.36,0l-88,48.18a15.93,15.93,0,0,0-6.18,6.06l0,0v0A16,16,0,0,0,24,80.18v95.64a16,16,0,0,0,8.32,14l88,48.17a15.88,15.88,0,0,0,15.36,0l88-48.17a16,16,0,0,0,8.32-14V80.18A16,16,0,0,0,229.89,72.25ZM120,219.61,88,202.09V152a8,8,0,0,0-4.16-7L40,121v-32l80,43.8Zm8-100.73L48.66,75.44,83.14,56.57l41,22.45a8,8,0,0,0,7.68,0l41-22.45,34.48,18.87Zm88,2.1-43.84,24a8,8,0,0,0-4.16,7v50.09l-32,17.52V132.74l80-43.8Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.DatabaseFill">M128,24C74.17,24,32,48.6,32,80v96c0,31.4,42.17,56,96,56s96-24.6,96-56V80C224,48.6,181.83,24,128,24Zm80,104c0,9.62-7.88,19.43-21.61,26.92C170.93,163.35,150.19,168,128,168s-42.93-4.65-58.39-13.08C55.88,147.43,48,137.62,48,128V111.36c17.06,15,46.23,24.64,80,24.64s62.94-9.68,80-24.64Zm-21.61,74.92C170.93,211.35,150.19,216,128,216s-42.93-4.65-58.39-13.08C55.88,195.43,48,185.62,48,176V159.36c17.06,15,46.23,24.64,80,24.64s62.94-9.68,80-24.64V176C208,185.62,200.12,195.43,186.39,202.92Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ProhibitFill">M200,128a71.69,71.69,0,0,1-15.78,44.91L83.09,71.78A71.95,71.95,0,0,1,200,128ZM56,128a71.95,71.95,0,0,0,116.91,56.22L71.78,83.09A71.69,71.69,0,0,0,56,128Zm180,0A108,108,0,1,1,128,20,108.12,108.12,0,0,1,236,128Zm-20,0a88,88,0,1,0-88,88A88.1,88.1,0,0,0,216,128Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ReceiptFill">M216,40H40A16,16,0,0,0,24,56V208a8,8,0,0,0,11.58,7.15L64,200.94l28.42,14.21a8,8,0,0,0,7.16,0L128,200.94l28.42,14.21a8,8,0,0,0,7.16,0L192,200.94l28.42,14.21A8,8,0,0,0,232,208V56A16,16,0,0,0,216,40ZM176,144H80a8,8,0,0,1,0-16h96a8,8,0,0,1,0,16Zm0-32H80a8,8,0,0,1,0-16h96a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ThermometerColdFill">M248.91,77.72l-20,6.49,12.34,17a8,8,0,1,1-12.94,9.4L216,93.61l-12.34,17a8,8,0,0,1-12.94-9.4l12.34-17-20-6.49A8,8,0,0,1,188,62.5L208,69V48a8,8,0,0,1,16,0V69l20-6.49a8,8,0,0,1,4.95,15.22ZM176,192a56,56,0,1,1-88-46V40a32,32,0,0,1,64,0V146A56.23,56.23,0,0,1,176,192Zm-95.18-8h78.36A40.16,40.16,0,0,0,140,157.35a8,8,0,0,1-4-6.93V40a16,16,0,0,0-32,0V150.42a8,8,0,0,1-4,6.93A40.16,40.16,0,0,0,80.82,184Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CastleTurretFill">M216,216H200V115.31L211.31,104A15.86,15.86,0,0,0,216,92.69V48a16,16,0,0,0-16-16H180a8,8,0,0,0-8,8V64H148V40a8,8,0,0,0-8-8H116a8,8,0,0,0-8,8V64H84V40a8,8,0,0,0-8-8H56A16,16,0,0,0,40,48V92.69A15.86,15.86,0,0,0,44.69,104L56,115.31V216H40a8,8,0,0,0,0,16H216a8,8,0,0,0,0-16ZM112,168a16,16,0,0,1,32,0v48H112Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BedFill">M216,72H32V48a8,8,0,0,0-16,0V208a8,8,0,0,0,16,0V176H240v32a8,8,0,0,0,16,0V112A40,40,0,0,0,216,72ZM32,88h72v72H32Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CloudArrowDownFill">M247.93,124.52C246.11,77.54,207.07,40,160.06,40A88.1,88.1,0,0,0,81.29,88.67h0A87.48,87.48,0,0,0,72,127.73,8.18,8.18,0,0,1,64.57,136,8,8,0,0,1,56,128a103.66,103.66,0,0,1,5.34-32.92,4,4,0,0,0-4.75-5.18A64.09,64.09,0,0,0,8,152c0,35.19,29.75,64,65,64H160A88.09,88.09,0,0,0,247.93,124.52Zm-50.27,25.14-32,32a8,8,0,0,1-11.32,0l-32-32a8,8,0,0,1,11.32-11.32L152,156.69V96a8,8,0,0,1,16,0v60.69l18.34-18.35a8,8,0,0,1,11.32,11.32Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BookBookmarkFill">M208,24H72A32,32,0,0,0,40,56V224a8,8,0,0,0,8,8H192a8,8,0,0,0,0-16H56a16,16,0,0,1,16-16H208a8,8,0,0,0,8-8V32A8,8,0,0,0,208,24Zm-24,96-25.61-19.2a4,4,0,0,0-4.8,0L128,120V40h56Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BuildingsFill">M239.73,208H224V96a16,16,0,0,0-16-16H164a4,4,0,0,0-4,4V208H144V32.41a16.43,16.43,0,0,0-6.16-13,16,16,0,0,0-18.72-.69L39.12,72A16,16,0,0,0,32,85.34V208H16.27A8.18,8.18,0,0,0,8,215.47,8,8,0,0,0,16,224H240a8,8,0,0,0,8-8.53A8.18,8.18,0,0,0,239.73,208ZM76,184a8,8,0,0,1-8.53,8A8.18,8.18,0,0,1,60,183.72V168.27A8.19,8.19,0,0,1,67.47,160,8,8,0,0,1,76,168Zm0-56a8,8,0,0,1-8.53,8A8.19,8.19,0,0,1,60,127.72V112.27A8.19,8.19,0,0,1,67.47,104,8,8,0,0,1,76,112Zm40,56a8,8,0,0,1-8.53,8,8.18,8.18,0,0,1-7.47-8.26V168.27a8.19,8.19,0,0,1,7.47-8.26,8,8,0,0,1,8.53,8Zm0-56a8,8,0,0,1-8.53,8,8.19,8.19,0,0,1-7.47-8.26V112.27a8.19,8.19,0,0,1,7.47-8.26,8,8,0,0,1,8.53,8Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CursorClickFill">M220.49,190.83a12,12,0,0,1,0,17L207.8,220.49a12,12,0,0,1-17,0l-56.56-56.57L115,214.09c0,.1-.08.21-.13.32a15.83,15.83,0,0,1-14.6,9.59l-.79,0a15.83,15.83,0,0,1-14.41-11L32.8,52.92A16,16,0,0,1,52.92,32.8L213,85.07a16,16,0,0,1,1.41,29.8l-.32.13-50.17,19.27ZM96,32a8,8,0,0,0,8-8V16a8,8,0,0,0-16,0v8A8,8,0,0,0,96,32ZM16,104h8a8,8,0,0,0,0-16H16a8,8,0,0,0,0,16ZM124.42,39.16a8,8,0,0,0,10.74-3.58l8-16a8,8,0,0,0-14.31-7.16l-8,16A8,8,0,0,0,124.42,39.16Zm-96,81.69-16,8a8,8,0,0,0,7.16,14.31l16-8a8,8,0,1,0-7.16-14.31Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.DotsThreeOutlineFill">M156,128a28,28,0,1,1-28-28A28,28,0,0,1,156,128ZM48,100a28,28,0,1,0,28,28A28,28,0,0,0,48,100Zm160,0a28,28,0,1,0,28,28A28,28,0,0,0,208,100Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PresentationFill">M216,40H136V24a8,8,0,0,0-16,0V40H40A16,16,0,0,0,24,56V176a16,16,0,0,0,16,16H79.36L57.75,219a8,8,0,0,0,12.5,10l29.59-37h56.32l29.59,37a8,8,0,1,0,12.5-10l-21.61-27H216a16,16,0,0,0,16-16V56A16,16,0,0,0,216,40Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.AmazonLogoFill">M152,136a24,24,0,1,1-24-24A24,24,0,0,1,152,136Zm80-8A104,104,0,1,1,128,24,104.11,104.11,0,0,1,232,128Zm-80-24v0a40,40,0,1,0,0,64v0a8,8,0,0,0,16,0V104A40,40,0,0,0,94.13,82.71a8,8,0,0,0,13.54,8.52A24,24,0,0,1,152,104Zm44.81,65.61a8,8,0,0,0-11.2,1.58,72,72,0,0,1-115.22,0,8,8,0,1,0-12.78,9.62,88,88,0,0,0,140.78,0A8,8,0,0,0,196.81,169.61Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FolderSimpleStarFill">M128,208a8,8,0,0,1-8,8H40a16,16,0,0,1-16-16V64A16,16,0,0,1,40,48H93.33a16.12,16.12,0,0,1,9.6,3.2L130.67,72H216a16,16,0,0,1,16,16v32a8,8,0,0,1-16,0V88H128a8,8,0,0,1-4.8-1.6L93.33,64H40V200h80A8,8,0,0,1,128,208Zm111.63-48.8a8,8,0,0,0-7-5.56l-29.84-2.31-11.43-26.5a8,8,0,0,0-14.7,0l-11.43,26.5-29.84,2.31a8,8,0,0,0-4.47,14.14l22.51,18.59-6.85,27.71a8,8,0,0,0,11.82,8.81L184,207.82l25.61,15.07a8,8,0,0,0,11.82-8.81l-6.85-27.71,22.51-18.59A8,8,0,0,0,239.63,159.2Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.MathOperationsFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM146.34,77.66a8,8,0,0,1,11.32-11.32L168,76.69l10.34-10.35a8,8,0,0,1,11.32,11.32L179.31,88l10.35,10.34a8,8,0,0,1-11.32,11.32L168,99.31l-10.34,10.35a8,8,0,0,1-11.32-11.32L156.69,88ZM112,176H96v16a8,8,0,0,1-16,0V176H64a8,8,0,0,1,0-16H80V144a8,8,0,0,1,16,0v16h16a8,8,0,0,1,0,16Zm0-80H64a8,8,0,0,1,0-16h48a8,8,0,0,1,0,16Zm80,96H144a8,8,0,0,1,0-16h48a8,8,0,0,1,0,16Zm0-32H144a8,8,0,0,1,0-16h48a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CloudWarningFill">M247.93,124.52C246.11,77.54,207.07,40,160.06,40A88.1,88.1,0,0,0,81.29,88.67h0A87.48,87.48,0,0,0,72,127.73,8.18,8.18,0,0,1,64.57,136,8,8,0,0,1,56,128a103.66,103.66,0,0,1,5.34-32.92,4,4,0,0,0-4.75-5.18A64.09,64.09,0,0,0,8,152c0,35.19,29.75,64,65,64H160A88.09,88.09,0,0,0,247.93,124.52ZM152,88a8,8,0,0,1,16,0v40a8,8,0,0,1-16,0Zm8,88a12,12,0,1,1,12-12A12,12,0,0,1,160,176Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.UserCircleFill">M172,120a44,44,0,1,1-44-44A44.05,44.05,0,0,1,172,120Zm60,8A104,104,0,1,1,128,24,104.11,104.11,0,0,1,232,128Zm-16,0a88.09,88.09,0,0,0-91.47-87.93C77.43,41.89,39.87,81.12,40,128.25a87.65,87.65,0,0,0,22.24,58.16A79.71,79.71,0,0,1,84,165.1a4,4,0,0,1,4.83.32,59.83,59.83,0,0,0,78.28,0,4,4,0,0,1,4.83-.32,79.71,79.71,0,0,1,21.79,21.31A87.62,87.62,0,0,0,216,128Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PaintBucketFill">M256,208a24,24,0,0,1-48,0c0-17.91,15.57-41.77,17.34-44.44a8,8,0,0,1,13.32,0C240.43,166.23,256,190.09,256,208ZM132.49,124.49a12,12,0,0,0-17-17l0,0s0,0,0,0a12,12,0,0,0,17,16.94ZM37.65,18.34A8,8,0,0,0,26.34,29.66l32.6,32.6L70.25,51ZM234.53,139.07a8,8,0,0,0,3.13-13.24L122.17,10.34a8,8,0,0,0-11.31,0L70.25,51l40.43,40.42a28,28,0,1,1-11.31,11.32L58.94,62.26,15,106.17a24,24,0,0,0,0,33.94L99.89,225a24,24,0,0,0,33.94,0l78.49-78.49Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ProjectorScreenChartFill">M232,64V48a16,16,0,0,0-16-16H40A16,16,0,0,0,24,48V64A16,16,0,0,0,40,80v96H32a8,8,0,0,0,0,16h88v17.38a24,24,0,1,0,16,0V192h88a8,8,0,0,0,0-16h-8V80A16,16,0,0,0,232,64ZM104,144a8,8,0,0,1-16,0V128a8,8,0,0,1,16,0Zm24,96a8,8,0,1,1,8-8A8,8,0,0,1,128,240Zm8-96a8,8,0,0,1-16,0V120a8,8,0,0,1,16,0Zm32,0a8,8,0,0,1-16,0V112a8,8,0,0,1,16,0ZM40,64V48H216V64H40Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowFatLinesRightFill">M132.94,231.39A8,8,0,0,1,128,224V184H104a8,8,0,0,1-8-8V80a8,8,0,0,1,8-8h24V32a8,8,0,0,1,13.66-5.66l96,96a8,8,0,0,1,0,11.32l-96,96A8,8,0,0,1,132.94,231.39ZM48,176V80a8,8,0,0,0-16,0v96a8,8,0,0,0,16,0Zm32,0V80a8,8,0,0,0-16,0v96a8,8,0,0,0,16,0Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.HourglassLowFill">M200,75.64V40a16,16,0,0,0-16-16H72A16,16,0,0,0,56,40V76a16.07,16.07,0,0,0,6.4,12.8L114.67,128,62.4,167.2A16.07,16.07,0,0,0,56,180v36a16,16,0,0,0,16,16H184a16,16,0,0,0,16-16V180.36a16.08,16.08,0,0,0-6.35-12.76L141.27,128l52.38-39.59A16.09,16.09,0,0,0,200,75.64ZM178.23,176H77.33L128,138ZM184,75.64,128,118,72,76V40H184Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.HandArrowUpFill">M230.33,141.06a24.43,24.43,0,0,0-21.24-4.23l-41.84,9.62A28,28,0,0,0,140,112H89.94a31.82,31.82,0,0,0-22.63,9.37L44.69,144H16A16,16,0,0,0,0,160v40a16,16,0,0,0,16,16H120a7.93,7.93,0,0,0,1.94-.24l64-16a7.35,7.35,0,0,0,1.2-.4L226,182.82l.44-.2a24.6,24.6,0,0,0,3.93-41.56Zm-10.9,27.15-38,16.18L119,200H56V155.31l22.63-22.62A15.86,15.86,0,0,1,89.94,128H140a12,12,0,0,1,0,24H112a8,8,0,0,0,0,16h32a8.32,8.32,0,0,0,1.79-.2l67-15.41.31-.08a8.6,8.6,0,0,1,6.3,15.9ZM154.34,61.66a8,8,0,0,1,0-11.32l32-32a8,8,0,0,1,11.32,0l32,32a8,8,0,0,1-11.32,11.32L200,43.31V104a8,8,0,0,1-16,0V43.31L165.66,61.66A8,8,0,0,1,154.34,61.66Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.HeadCircuitFill">M192.5,171.42A88.32,88.32,0,0,0,224,101.89q0-1.1-.09-2.19a4,4,0,0,0-4-3.75H195.75L172.62,123.7a24,24,0,1,1-12.28-10.25l25.51-30.62A8,8,0,0,1,192,80h23.14a4,4,0,0,0,3.77-5.35C207.27,42,176.86,18,140.74,16.08l-.59,0a4,4,0,0,0-4.15,4V49.33a24,24,0,1,1-16,0v-27a4,4,0,0,0-4.89-3.91A88.16,88.16,0,0,0,48,102L25.55,145.14l-.22.45a16,16,0,0,0,7.51,20.7l.25.12L56,176.9v31a16,16,0,0,0,16,16h40v8a8,8,0,0,0,8,8h71.77a8.31,8.31,0,0,0,4.06-1,8,8,0,0,0,4.11-8Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SubtitlesFill">M224,48H32A16,16,0,0,0,16,64V192a16,16,0,0,0,16,16H224a16,16,0,0,0,16-16V64A16,16,0,0,0,224,48ZM56,128H72a8,8,0,0,1,0,16H56a8,8,0,0,1,0-16Zm96,48H56a8,8,0,0,1,0-16h96a8,8,0,0,1,0,16Zm48,0H184a8,8,0,0,1,0-16h16a8,8,0,0,1,0,16Zm0-32H104a8,8,0,0,1,0-16h96a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.HeadsetFill">M232,128v80a40,40,0,0,1-40,40H136a8,8,0,0,1,0-16h56a24,24,0,0,0,24-24H192a24,24,0,0,1-24-24V144a24,24,0,0,1,24-24h23.65A88,88,0,0,0,66,65.54,87.29,87.29,0,0,0,40.36,120H64a24,24,0,0,1,24,24v40a24,24,0,0,1-24,24H48a24,24,0,0,1-24-24V128A104.11,104.11,0,0,1,201.89,54.66,103.41,103.41,0,0,1,232,128Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.WebcamSlashFill">M83.34,43.19a4,4,0,0,1,.78-6A80,80,0,0,1,190.39,154a4,4,0,0,1-6.11.22l-16.43-18.08a4,4,0,0,1-.3-5,48,48,0,0,0-62.84-69.11,4,4,0,0,1-4.94-.78ZM126.93,72a31.8,31.8,0,0,0-8.43,1.42A4,4,0,0,0,116.75,80l34.12,37.53a4,4,0,0,0,6.67-1.18A31.84,31.84,0,0,0,160,104,32.36,32.36,0,0,0,126.93,72Zm86.45,149.9a8,8,0,0,1-11.3-.54L197.19,216H32a8,8,0,0,1-8-8.53A8.17,8.17,0,0,1,32.27,200H120V183.6A79.93,79.93,0,0,1,58.86,63.84L42.08,45.38A8,8,0,1,1,53.92,34.62l160,176A8,8,0,0,1,213.38,221.92ZM128,152a48.17,48.17,0,0,0,10-1.06l-13.79-15.17A32,32,0,0,1,96,104.71L82.23,89.55A48,48,0,0,0,128,152Zm54.64,48-21.22-23.34A79.24,79.24,0,0,1,136,183.6V200Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SignOutFill">M120,216a8,8,0,0,1-8,8H48a8,8,0,0,1-8-8V40a8,8,0,0,1,8-8h64a8,8,0,0,1,0,16H56V208h56A8,8,0,0,1,120,216Zm109.66-93.66-40-40A8,8,0,0,0,176,88v32H112a8,8,0,0,0,0,16h64v32a8,8,0,0,0,13.66,5.66l40-40A8,8,0,0,0,229.66,122.34Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SpeakerSimpleSlashFill">M221.92,210.62a8,8,0,1,1-11.84,10.76L168,175.09v48.6a8.29,8.29,0,0,1-3.91,7.18,8,8,0,0,1-9-.56L85.25,176H40a16,16,0,0,1-16-16V96A16,16,0,0,1,40,80H81.55L50.08,45.38A8,8,0,0,1,61.92,34.62ZM200.53,160a8.17,8.17,0,0,0,7.47-8.25V104.27A8.17,8.17,0,0,0,200.53,96a8,8,0,0,0-8.53,8v48A8,8,0,0,0,200.53,160ZM161,119.87a4,4,0,0,0,7-2.7V32.24a8.25,8.25,0,0,0-2.88-6.39,8,8,0,0,0-10-.16L111.83,59.33a4,4,0,0,0-.5,5.85ZM231.47,80A8.17,8.17,0,0,0,224,88.27v79.46a8.17,8.17,0,0,0,7.47,8.25,8,8,0,0,0,8.53-8V88A8,8,0,0,0,231.47,80Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PercentFill">M176,172a12,12,0,1,1-12-12A12,12,0,0,1,176,172ZM92,96A12,12,0,1,0,80,84,12,12,0,0,0,92,96ZM224,48V208a16,16,0,0,1-16,16H48a16,16,0,0,1-16-16V48A16,16,0,0,1,48,32H208A16,16,0,0,1,224,48ZM64,84A28,28,0,1,0,92,56,28,28,0,0,0,64,84Zm128,88a28,28,0,1,0-28,28A28,28,0,0,0,192,172ZM189.66,66.34a8,8,0,0,0-11.32,0l-112,112a8,8,0,0,0,11.32,11.32l112-112A8,8,0,0,0,189.66,66.34Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SecurityCameraFill">M248,136a8,8,0,0,0-8,8v16H195.31L177,141.66l50.34-50.35a16,16,0,0,0,0-22.62L189.66,31h0L171.31,12.69a16,16,0,0,0-22.63,0L2.92,158.94A10,10,0,0,0,10,176H49.37l35.32,35.31a16,16,0,0,0,22.62,0L165.66,153,184,171.31A15.86,15.86,0,0,0,195.31,176H240v16a8,8,0,0,0,16,0V144A8,8,0,0,0,248,136ZM160,24l12.69,12.69L49.37,160H24.46Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CommandFill">M116,116h24v24H116ZM86,72a14,14,0,0,0,0,28h14V86A14,14,0,0,0,86,72Zm98,14a14,14,0,0,0-28,0v14h14A14,14,0,0,0,184,86ZM72,170a14,14,0,0,0,28,0V156H86A14,14,0,0,0,72,170ZM224,48V208a16,16,0,0,1-16,16H48a16,16,0,0,1-16-16V48A16,16,0,0,1,48,32H208A16,16,0,0,1,224,48Zm-68,92V116h14a30,30,0,1,0-30-30v14H116V86a30,30,0,1,0-30,30h14v24H86a30,30,0,1,0,30,30V156h24v14a30,30,0,1,0,30-30Zm0,30a14,14,0,1,0,14-14H156Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.LinuxLogoFill">M161.22,209.74a4,4,0,0,1-3.31,6.26H98.1a4,4,0,0,1-3.31-6.26,40,40,0,0,1,66.43,0Zm68.93,3.37a8.29,8.29,0,0,1-6.43,2.89H184.56a4,4,0,0,1-3.76-2.65,56,56,0,0,0-105.59,0A4,4,0,0,1,71.45,216H32.23a8.2,8.2,0,0,1-6.42-2.93A8,8,0,0,1,25.75,203c.06-.07,7.64-9.78,15.12-28.72C47.77,156.8,56,127.64,56,88a72,72,0,0,1,144,0c0,39.64,8.23,68.8,15.13,86.28,7.48,18.94,15.06,28.65,15.13,28.74A8,8,0,0,1,230.15,213.11ZM88,100a12,12,0,1,0,12-12A12,12,0,0,0,88,100Zm79.16,32.42a8,8,0,0,0-10.73-3.58L128,143.06,99.58,128.84a8,8,0,0,0-7.15,14.32l32,16a8,8,0,0,0,7.15,0l32-16A8,8,0,0,0,167.16,132.42ZM168,100a12,12,0,1,0-12,12A12,12,0,0,0,168,100Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PlugsFill">M149.66,149.66,131.31,168l18.35,18.34a8,8,0,0,1-11.32,11.32L132,191.31l-23.31,23.32a32.06,32.06,0,0,1-45.26,0l-5.37-5.38-28.4,28.41a8,8,0,0,1-11.32-11.32l28.41-28.4-5.38-5.37a32,32,0,0,1,0-45.26L64.69,124l-6.35-6.34a8,8,0,0,1,11.32-11.32L88,124.69l18.34-18.35a8,8,0,0,1,11.32,11.32L99.31,136,120,156.69l18.34-18.35a8,8,0,0,1,11.32,11.32Zm88-131.32a8,8,0,0,0-11.32,0l-28.4,28.41-5.37-5.38a32.05,32.05,0,0,0-45.26,0L124,64.69l-6.34-6.35a8,8,0,0,0-11.32,11.32l80,80a8,8,0,0,0,11.32-11.32L191.31,132l23.32-23.31a32,32,0,0,0,0-45.26l-5.38-5.37,28.41-28.4A8,8,0,0,0,237.66,18.34Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.DiscFill">M188.3,43.31a8,8,0,0,0-.65-.5c-.23-.16-.47-.31-.71-.45a103.85,103.85,0,1,0,1.36,1ZM128,152a24,24,0,1,1,24-24A24,24,0,0,1,128,152Zm88-24c0,2.47-.11,4.92-.31,7.34L168,126.92a39.83,39.83,0,0,0-11-26.41l27.78-39.67A87.8,87.8,0,0,1,216,128Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PencilSimpleFill">M227.31,73.37,182.63,28.68a16,16,0,0,0-22.63,0L36.69,152A15.86,15.86,0,0,0,32,163.31V208a16,16,0,0,0,16,16H92.69A15.86,15.86,0,0,0,104,219.31L227.31,96a16,16,0,0,0,0-22.63ZM192,108.68,147.31,64l24-24L216,84.68Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CallBellFill">M16,176a8,8,0,0,1,8-8h8V152a96.12,96.12,0,0,1,88-95.66V40H104a8,8,0,0,1,0-16h48a8,8,0,0,1,0,16H136V56.34A96.12,96.12,0,0,1,224,152v16h8a8,8,0,0,1,0,16H24A8,8,0,0,1,16,176Zm216,24H24a8,8,0,0,0,0,16H232a8,8,0,0,0,0-16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.NumberThreeFill">M200,24H56A16,16,0,0,0,40,40V216a16,16,0,0,0,16,16H200a16,16,0,0,0,16-16V40A16,16,0,0,0,200,24ZM124,192a43.85,43.85,0,0,1-34.22-16.34,8,8,0,0,1,12.44-10.06A28,28,0,1,0,126,120.07a8,8,0,0,1-5.58-13.1l22.48-27H96a8,8,0,0,1,0-16h64a8,8,0,0,1,6.15,13.12l-25.23,30.27A44,44,0,0,1,124,192Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.JarFill">M184,48.81V32a16,16,0,0,0-16-16H88A16,16,0,0,0,72,32V48.81A40.05,40.05,0,0,0,40,88V200a40,40,0,0,0,40,40h96a40,40,0,0,0,40-40V88A40.05,40.05,0,0,0,184,48.81ZM120,48V32h16V48Zm48,0H152V32h16ZM104,32V48H88V32Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.RocketFill">M152,224a8,8,0,0,1-8,8H112a8,8,0,0,1,0-16h32A8,8,0,0,1,152,224Zm71.62-68.17-12.36,55.63a16,16,0,0,1-25.51,9.11L158.51,200h-61L70.25,220.57a16,16,0,0,1-25.51-9.11L32.38,155.83a16.09,16.09,0,0,1,3.32-13.71l28.56-34.26a123.07,123.07,0,0,1,8.57-36.67c12.9-32.34,36-52.63,45.37-59.85a16,16,0,0,1,19.6,0c9.34,7.22,32.47,27.51,45.37,59.85a123.07,123.07,0,0,1,8.57,36.67l28.56,34.26A16.09,16.09,0,0,1,223.62,155.83Zm-139.23,34Q68.28,160.5,64.83,132.16L48,152.36,60.36,208l.18-.13ZM140,100a12,12,0,1,0-12,12A12,12,0,0,0,140,100Zm68,52.36-16.83-20.2q-3.42,28.28-19.56,57.69l23.85,18,.18.13Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.GolfFill">M175.47,197.14a8,8,0,0,1-4.61,10.33A125.91,125.91,0,0,1,136,215.68V248a8,8,0,0,1-16,0V215.68a125.91,125.91,0,0,1-34.86-8.21,8,8,0,1,1,5.72-14.94C104,197.56,116.15,200,128,200s24-2.44,37.14-7.47A8,8,0,0,1,175.47,197.14ZM216,96A88,88,0,1,1,128,8,88.1,88.1,0,0,1,216,96Zm-72,36a12,12,0,1,0-12,12A12,12,0,0,0,144,132Zm32-32a12,12,0,1,0-12,12A12,12,0,0,0,176,100Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.NumberNineFill">M200,24H56A16,16,0,0,0,40,40V216a16,16,0,0,0,16,16H200a16,16,0,0,0,16-16V40A16,16,0,0,0,200,24ZM166.3,129.62c-.07.13-.12.26-.2.38l-33.48,58a8,8,0,0,1-13.86-8l16.52-28.61A44.79,44.79,0,0,1,128,152a44.05,44.05,0,1,1,38.3-22.38ZM156,108a28,28,0,1,1-28-28A28,28,0,0,1,156,108Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.NumberSquareEightFill">M112,100a16,16,0,1,1,16,16A16,16,0,0,1,112,100Zm16,32a20,20,0,1,0,20,20A20,20,0,0,0,128,132Zm96-84V208a16,16,0,0,1-16,16H48a16,16,0,0,1-16-16V48A16,16,0,0,1,48,32H208A16,16,0,0,1,224,48ZM164,152a35.93,35.93,0,0,0-14.19-28.61,32,32,0,1,0-43.62,0A36,36,0,1,0,164,152Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.DeviceTabletSpeakerFill">M192,24H64A24,24,0,0,0,40,48V208a24,24,0,0,0,24,24H192a24,24,0,0,0,24-24V48A24,24,0,0,0,192,24ZM160,72H96a8,8,0,0,1,0-16h64a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.MailboxFill">M104,152a8,8,0,0,1-8,8H56a8,8,0,0,1,0-16H96A8,8,0,0,1,104,152ZM168,32h24a8,8,0,0,0,0-16H160a8,8,0,0,0-8,8V56h16Zm72,84v60a16,16,0,0,1-16,16H136v32a8,8,0,0,1-16,0V192H32a16,16,0,0,1-16-16V116A60.07,60.07,0,0,1,76,56h76v88a8,8,0,0,0,16,0V56h12A60.07,60.07,0,0,1,240,116Zm-120,0a44,44,0,0,0-88,0v60h88Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CloudSunFill">M164,72a76.2,76.2,0,0,0-20.26,2.73,55.63,55.63,0,0,0-9.41-11.54l9.51-13.57a8,8,0,1,0-13.11-9.18L121.22,54A55.9,55.9,0,0,0,96,48c-.59,0-1.16,0-1.74,0L91.37,31.71a8,8,0,1,0-15.75,2.77L78.5,50.82A56.1,56.1,0,0,0,55.23,65.67L41.61,56.14a8,8,0,1,0-9.17,13.11L46,78.77A55.55,55.55,0,0,0,40,104c0,.57,0,1.15,0,1.72L23.71,108.6a8,8,0,0,0,1.38,15.88,8.24,8.24,0,0,0,1.39-.12l16.32-2.88a55.74,55.74,0,0,0,5.86,12.42A52,52,0,0,0,84,224h80a76,76,0,0,0,0-152ZM92.92,120.76a52.14,52.14,0,0,0-31,4.17,40,40,0,0,1,66.62-44.17A76.26,76.26,0,0,0,92.92,120.76Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.LampPendantFill">M176,74.78V72a16,16,0,0,0-16-16H136V16a8,8,0,0,0-16,0V56H96A16,16,0,0,0,80,72v2.78A111.73,111.73,0,0,0,16,176a8,8,0,0,0,8,8H88a40,40,0,0,0,80,0h64a8,8,0,0,0,8-8A111.73,111.73,0,0,0,176,74.78ZM128,208a24,24,0,0,1-24-24h48A24,24,0,0,1,128,208Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ClockCounterClockwiseFill">M224,128A96,96,0,0,1,62.11,197.82a8,8,0,1,1,11-11.64A80,80,0,1,0,71.43,71.43C67.9,75,64.58,78.51,61.35,82L77.66,98.34A8,8,0,0,1,72,112H32a8,8,0,0,1-8-8V64a8,8,0,0,1,13.66-5.66L50,70.7c3.22-3.49,6.54-7,10.06-10.55A96,96,0,0,1,224,128ZM128,72a8,8,0,0,0-8,8v48a8,8,0,0,0,3.88,6.86l40,24a8,8,0,1,0,8.24-13.72L136,123.47V80A8,8,0,0,0,128,72Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.WaveTriangleFill">M216,40H40A16,16,0,0,0,24,56V200a16,16,0,0,0,16,16H216a16,16,0,0,0,16-16V56A16,16,0,0,0,216,40Zm-9.85,93.12-40,48A8,8,0,0,1,160,184h-.43a8,8,0,0,1-6.23-3.55l-58-87.09L62.15,133.12a8,8,0,0,1-12.3-10.24l40-48a8,8,0,0,1,12.81.68l58.05,87.09,33.14-39.77a8,8,0,1,1,12.3,10.24Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowCircleDownFill">M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24Zm37.66,117.66-32,32a8,8,0,0,1-11.32,0l-32-32a8,8,0,0,1,11.32-11.32L120,148.69V88a8,8,0,0,1,16,0v60.69l18.34-18.35a8,8,0,0,1,11.32,11.32Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.NewspaperClippingFill">M216,40H40A16,16,0,0,0,24,56V216a8,8,0,0,0,11.58,7.15L64,208.94l28.42,14.21a8,8,0,0,0,7.16,0L128,208.94l28.42,14.21a8,8,0,0,0,7.16,0L192,208.94l28.42,14.21A8,8,0,0,0,232,216V56A16,16,0,0,0,216,40ZM116,160a4,4,0,0,1-4,4H64a4,4,0,0,1-4-4V96a4,4,0,0,1,4-4h48a4,4,0,0,1,4,4Zm76-8H144a8,8,0,0,1,0-16h48a8,8,0,0,1,0,16Zm0-32H144a8,8,0,0,1,0-16h48a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.TextAUnderlineFill">M148.73,120H107.27L128,75.09ZM216,32V224a8,8,0,0,1-8,8H48a8,8,0,0,1-8-8V32a8,8,0,0,1,8-8H208A8,8,0,0,1,216,32ZM76.65,167.26a8,8,0,0,0,10.61-3.91L99.89,136h56.22l12.63,27.35a8,8,0,0,0,14.52-6.7l-48-104a8,8,0,0,0-14.52,0l-48,104A8,8,0,0,0,76.65,167.26ZM200,192a8,8,0,0,0-8-8H64a8,8,0,0,0,0,16H192A8,8,0,0,0,200,192Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.VirusFill">M240,120H223.66a95.52,95.52,0,0,0-22.39-53.95l12.39-12.39a8,8,0,0,0-11.32-11.32L190,54.73A95.52,95.52,0,0,0,136,32.34V16a8,8,0,0,0-16,0V32.34A95.52,95.52,0,0,0,66.05,54.73L53.66,42.34A8,8,0,0,0,42.34,53.66L54.73,66.05a95.52,95.52,0,0,0-22.39,54H16a8,8,0,0,0,0,16H32.34A95.52,95.52,0,0,0,54.73,190L42.34,202.34a8,8,0,0,0,11.32,11.32l12.39-12.39a95.52,95.52,0,0,0,54,22.39V240a8,8,0,0,0,16,0V223.66A95.52,95.52,0,0,0,190,201.27l12.39,12.39a8,8,0,0,0,11.32-11.32L201.27,190A95.52,95.52,0,0,0,223.66,136H240a8,8,0,0,0,0-16ZM80,108a28,28,0,1,1,28,28A28,28,0,0,1,80,108Zm48,84a16,16,0,1,1,16-16A16,16,0,0,1,128,192Zm48-48a16,16,0,1,1,16-16A16,16,0,0,1,176,144Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.GooglePodcastsLogoFill">M243.32,116.68l-104-104a16,16,0,0,0-22.64,0l-104,104a16,16,0,0,0,0,22.64l104,104a16,16,0,0,0,22.64,0l104-104A16,16,0,0,0,243.32,116.68ZM56,136a8,8,0,0,1-16,0V120a8,8,0,0,1,16,0Zm40,40a8,8,0,0,1-16,0V160a8,8,0,0,1,16,0Zm0-48a8,8,0,0,1-16,0V80a8,8,0,0,1,16,0Zm40,88a8,8,0,0,1-16,0V200a8,8,0,0,1,16,0Zm0-48a8,8,0,0,1-16,0V88a8,8,0,0,1,16,0Zm0-112a8,8,0,0,1-16,0V40a8,8,0,0,1,16,0Zm40,120a8,8,0,0,1-16,0V128a8,8,0,0,1,16,0Zm0-80a8,8,0,0,1-16,0V80a8,8,0,0,1,16,0Zm40,40a8,8,0,0,1-16,0V120a8,8,0,0,1,16,0Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.MoonFill">M235.54,150.21a104.84,104.84,0,0,1-37,52.91A104,104,0,0,1,32,120,103.09,103.09,0,0,1,52.88,57.48a104.84,104.84,0,0,1,52.91-37,8,8,0,0,1,10,10,88.08,88.08,0,0,0,109.8,109.8,8,8,0,0,1,10,10Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.MonitorPlayFill">M168,224a8,8,0,0,1-8,8H96a8,8,0,0,1,0-16h64A8,8,0,0,1,168,224ZM232,64V176a24,24,0,0,1-24,24H48a24,24,0,0,1-24-24V64A24,24,0,0,1,48,40H208A24,24,0,0,1,232,64Zm-68,56a8,8,0,0,0-3.41-6.55l-40-28A8,8,0,0,0,108,92v56a8,8,0,0,0,12.59,6.55l40-28A8,8,0,0,0,164,120Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.GitMergeFill">M208,112a32.05,32.05,0,0,0-30.69,23l-42.21-6a8,8,0,0,1-4.95-2.71L94.43,84.55A32,32,0,1,0,72,87v82a32,32,0,1,0,16,0V101.63l30,35a24,24,0,0,0,14.83,8.14l44,6.28A32,32,0,1,0,208,112ZM96,200a16,16,0,1,1-16-16A16,16,0,0,1,96,200Zm112-40a16,16,0,1,1,16-16A16,16,0,0,1,208,160Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ChartPieSliceFill">M100,116.43a8,8,0,0,0,4-6.93v-72A8,8,0,0,0,93.34,30,104.06,104.06,0,0,0,25.73,147a8,8,0,0,0,4.52,5.81,7.86,7.86,0,0,0,3.35.74,8,8,0,0,0,4-1.07ZM88,49.62v55.26L40.12,132.51C40,131,40,129.48,40,128A88.12,88.12,0,0,1,88,49.62ZM232,128A104,104,0,0,1,38.32,180.7a8,8,0,0,1,2.87-11L120,123.83V32a8,8,0,0,1,8-8,104.05,104.05,0,0,1,89.74,51.48c.11.16.21.32.31.49s.2.37.29.55A103.34,103.34,0,0,1,232,128Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ParagraphFill">M216,48a8,8,0,0,1-8,8H192V208a8,8,0,0,1-16,0V56H152V208a8,8,0,0,1-16,0V168H96A64,64,0,0,1,96,40H208A8,8,0,0,1,216,48Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.LinkedinLogoFill">M216,24H40A16,16,0,0,0,24,40V216a16,16,0,0,0,16,16H216a16,16,0,0,0,16-16V40A16,16,0,0,0,216,24ZM96,176a8,8,0,0,1-16,0V112a8,8,0,0,1,16,0ZM88,96a12,12,0,1,1,12-12A12,12,0,0,1,88,96Zm96,80a8,8,0,0,1-16,0V140a20,20,0,0,0-40,0v36a8,8,0,0,1-16,0V112a8,8,0,0,1,15.79-1.78A36,36,0,0,1,184,140Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.NotMemberOfFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM190,69.27,145.63,120H176a8,8,0,0,1,0,16H131.63l-28.76,32.87A47.72,47.72,0,0,0,128,176h48a8,8,0,0,1,0,16H128a63.62,63.62,0,0,1-35.78-11L78,197.27a8,8,0,0,1-12-10.54l14.21-16.24A64,64,0,0,1,128,64h45.37L178,58.73a8,8,0,1,1,12,10.54ZM128,80h31.37l-35,40H80.68A48.07,48.07,0,0,1,128,80ZM80.68,136h29.69L90.84,158.32A47.78,47.78,0,0,1,80.68,136Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowBendDownRightFill">M229.66,157.66l-48,48A8,8,0,0,1,168,200V160H128A104.11,104.11,0,0,1,24,56a8,8,0,0,1,16,0,88.1,88.1,0,0,0,88,88h40V104a8,8,0,0,1,13.66-5.66l48,48A8,8,0,0,1,229.66,157.66Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FlipVerticalFill">M56,120H216a16,16,0,0,0,6.23-30.74l-.14-.06-159.93-64A16,16,0,0,0,40,40v64A16,16,0,0,0,56,120Zm0-80,.15.06L216,104H56l0-64ZM231.67,148.82a15.85,15.85,0,0,1-9.45,17.92l-.14.06-159.93,64A16,16,0,0,1,40,216V152a16,16,0,0,1,16-16H216A15.85,15.85,0,0,1,231.67,148.82Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ExclamationMarkFill">M200,24H56A16,16,0,0,0,40,40V216a16,16,0,0,0,16,16H200a16,16,0,0,0,16-16V40A16,16,0,0,0,200,24ZM128,160a12,12,0,1,1-12,12A12,12,0,0,1,128,160Zm-8-24V80a8,8,0,0,1,16,0v56a8,8,0,0,1-16,0Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PokerChipFill">M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24ZM60.4,71.72,77.47,88.79a63.66,63.66,0,0,0-13,31.21H40.37A87.6,87.6,0,0,1,60.4,71.72ZM40.37,136H64.52a63.66,63.66,0,0,0,13,31.21L60.4,184.28A87.6,87.6,0,0,1,40.37,136ZM120,215.63a87.6,87.6,0,0,1-48.28-20l17.07-17.07A63.66,63.66,0,0,0,120,191.48Zm0-151.11a63.66,63.66,0,0,0-31.21,13L71.72,60.4a87.6,87.6,0,0,1,48.28-20ZM215.63,120H191.48a63.66,63.66,0,0,0-12.95-31.21L195.6,71.72A87.6,87.6,0,0,1,215.63,120ZM136,40.37a87.6,87.6,0,0,1,48.28,20L167.21,77.47a63.66,63.66,0,0,0-31.21-13Zm0,175.26V191.48a63.66,63.66,0,0,0,31.21-12.95l17.07,17.07A87.6,87.6,0,0,1,136,215.63Zm59.6-31.35-17.07-17.07A63.66,63.66,0,0,0,191.48,136h24.15A87.6,87.6,0,0,1,195.6,184.28Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.QuestionFill">M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24Zm0,168a12,12,0,1,1,12-12A12,12,0,0,1,128,192Zm8-48.72V144a8,8,0,0,1-16,0v-8a8,8,0,0,1,8-8c13.23,0,24-9,24-20s-10.77-20-24-20-24,9-24,20v4a8,8,0,0,1-16,0v-4c0-19.85,17.94-36,40-36s40,16.15,40,36C168,125.38,154.24,139.93,136,143.28Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowClockwiseFill">M240,56v48a8,8,0,0,1-8,8H184a8,8,0,0,1-5.66-13.66l17-17-10.55-9.65-.25-.24a80,80,0,1,0-1.67,114.78,8,8,0,0,1,11,11.63A95.44,95.44,0,0,1,128,224h-1.32A96,96,0,1,1,195.75,60l10.93,10L226.34,50.3A8,8,0,0,1,240,56Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FileDocFill">M44,120H212.07a4,4,0,0,0,4-4V88a8,8,0,0,0-2.34-5.66l-56-56A8,8,0,0,0,152.05,24H56A16,16,0,0,0,40,40v76A4,4,0,0,0,44,120Zm108-76,44,44h-44ZM52,144H36a8,8,0,0,0-8,8v56a8,8,0,0,0,8,8H51.33C71,216,87.55,200.52,88,180.87A36,36,0,0,0,52,144Zm-.49,56H44V160h8a20,20,0,0,1,20,20.77C71.59,191.59,62.35,200,51.52,200Zm170.67-4.28a8.26,8.26,0,0,1-.73,11.09,30,30,0,0,1-21.4,9.19c-17.65,0-32-16.15-32-36s14.36-36,32-36a30,30,0,0,1,21.4,9.19,8.26,8.26,0,0,1,.73,11.09,8,8,0,0,1-11.9.38A14.21,14.21,0,0,0,200.06,160c-8.82,0-16,9-16,20s7.18,20,16,20a14.25,14.25,0,0,0,10.23-4.66A8,8,0,0,1,222.19,195.72ZM128,144c-17.65,0-32,16.15-32,36s14.37,36,32,36,32-16.15,32-36S145.69,144,128,144Zm0,56c-8.83,0-16-9-16-20s7.18-20,16-20,16,9,16,20S136.86,200,128,200Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.HeartFill">M240,102c0,70-103.79,126.66-108.21,129a8,8,0,0,1-7.58,0C119.79,228.66,16,172,16,102A62.07,62.07,0,0,1,78,40c20.65,0,38.73,8.88,50,23.89C139.27,48.88,157.35,40,178,40A62.07,62.07,0,0,1,240,102Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowLineUpFill">M205.66,138.34A8,8,0,0,1,200,152H136v72a8,8,0,0,1-16,0V152H56a8,8,0,0,1-5.66-13.66l72-72a8,8,0,0,1,11.32,0ZM216,32H40a8,8,0,0,0,0,16H216a8,8,0,0,0,0-16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PersonSimpleHikeFill">M120,48a32,32,0,1,1,32,32A32,32,0,0,1,120,48Zm72,88c-23.37,0-28.92-8.56-36.6-20.4-3.65-5.64-7.79-12-14.16-17.55a40.92,40.92,0,0,0-8-5.47,8,8,0,0,0-11,3.92L64.66,228.81a8,8,0,0,0,4.15,10.52A7.84,7.84,0,0,0,72,240a8,8,0,0,0,7.34-4.81l33.59-77.27L144,180.12V232a8,8,0,0,0,16,0V176a8,8,0,0,0-3.35-6.51l-37.2-26.57,13.4-30.81c3.57,3.62,6.28,7.8,9.13,12.19,7.67,11.84,16.27,25.11,42,27.36V232a8,8,0,0,0,16,0V144A8,8,0,0,0,192,136ZM72,152a8,8,0,0,0,7.36-4.85l24-56a8,8,0,0,0-4.2-10.5l-28-12a8,8,0,0,0-10.5,4.2l-24,56a8,8,0,0,0,4.2,10.5l28,12A8,8,0,0,0,72,152Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowCounterClockwiseFill">M224,128a96,96,0,0,1-94.71,96H128A95.38,95.38,0,0,1,62.1,197.8a8,8,0,0,1,11-11.63A80,80,0,1,0,71.43,71.39a3.07,3.07,0,0,1-.26.25L60.63,81.29l17,17A8,8,0,0,1,72,112H24a8,8,0,0,1-8-8V56A8,8,0,0,1,29.66,50.3L49.31,70,60.25,60A96,96,0,0,1,224,128Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.DogFill">M239.71,125l-16.42-88a16,16,0,0,0-19.61-12.58l-.31.09L150.85,40h-45.7L52.63,24.56l-.31-.09A16,16,0,0,0,32.71,37.05L16.29,125a15.77,15.77,0,0,0,9.12,17.52A16.26,16.26,0,0,0,32.12,144,15.48,15.48,0,0,0,40,141.84V184a40,40,0,0,0,40,40h96a40,40,0,0,0,40-40V141.85a15.5,15.5,0,0,0,7.87,2.16,16.31,16.31,0,0,0,6.72-1.47A15.77,15.77,0,0,0,239.71,125ZM176,208H136V195.31l13.66-13.65a8,8,0,0,0-11.32-11.32L128,180.69l-10.34-10.35a8,8,0,0,0-11.32,11.32L120,195.31V208H80a24,24,0,0,1-24-24V123.11L107.93,56h40.14L200,123.11V184A24,24,0,0,1,176,208Zm-72-68a12,12,0,1,1-12-12A12,12,0,0,1,104,140Zm72,0a12,12,0,1,1-12-12A12,12,0,0,1,176,140Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.DoorOpenFill">M232,216H208V40a16,16,0,0,0-16-16H64A16,16,0,0,0,48,40V216H24a8,8,0,0,0,0,16H232a8,8,0,0,0,0-16Zm-64,0H64V40H168Zm-40-84a12,12,0,1,1,12,12A12,12,0,0,1,128,132Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.HandsClappingFill">M188.87,65A18,18,0,0,0,157.62,83L133.36,41a18,18,0,0,0-31.22,18L96.4,49A18,18,0,0,0,65.18,67l3.34,5.77A26,26,0,0,0,39.74,111l3,5.2A26,26,0,0,0,23.5,155l35.27,61a80.14,80.14,0,0,0,149.52-39.57A71.92,71.92,0,0,0,210,101.58Zm1.2,127.56A64.12,64.12,0,0,1,72.65,208L37.38,147a10,10,0,0,1,17.34-10L75,172a8,8,0,0,0,13.87-8L53.62,103A10,10,0,0,1,71,93l31.81,55a8,8,0,0,0,13.87-8l-26-45a10,10,0,0,1,17.35-10l36.5,63a8,8,0,0,0,13.87-8l-12.6-21.75A10,10,0,0,1,163.44,109l20.22,35A63.52,63.52,0,0,1,190.07,192.57ZM160.22,24V8a8,8,0,0,1,16,0V24a8,8,0,0,1-16,0Zm33.22,6,8-13.1a8,8,0,0,1,13.68,8.33l-8,13.11a8,8,0,0,1-6.84,3.83A8,8,0,0,1,193.44,30Zm45,33.66-15.05,4.85a8.15,8.15,0,0,1-2.46.39,8,8,0,0,1-2.46-15.62l15.06-4.85a8,8,0,1,1,4.91,15.23Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CalendarPlusFill">M208,32H184V24a8,8,0,0,0-16,0v8H88V24a8,8,0,0,0-16,0v8H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM152,160H136v16a8,8,0,0,1-16,0V160H104a8,8,0,0,1,0-16h16V128a8,8,0,0,1,16,0v16h16a8,8,0,0,1,0,16ZM48,80V48H72v8a8,8,0,0,0,16,0V48h80v8a8,8,0,0,0,16,0V48h24V80Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BracketsCurlyFill">M216,40H40A16,16,0,0,0,24,56V200a16,16,0,0,0,16,16H216a16,16,0,0,0,16-16V56A16,16,0,0,0,216,40ZM88,155.84c.29,14.26.41,20.16,16,20.16a8,8,0,0,1,0,16c-31.27,0-31.72-22.43-32-35.84C71.71,141.9,71.59,136,56,136a8,8,0,0,1,0-16c15.59,0,15.71-5.9,16-20.16C72.28,86.43,72.73,64,104,64a8,8,0,0,1,0,16c-15.59,0-15.71,5.9-16,20.16-.17,8.31-.41,20.09-8,27.84C87.59,135.75,87.83,147.53,88,155.84ZM200,136c-15.59,0-15.71,5.9-16,20.16-.28,13.41-.73,35.84-32,35.84a8,8,0,0,1,0-16c15.59,0,15.71-5.9,16-20.16.17-8.31.41-20.09,8-27.84-7.6-7.75-7.84-19.53-8-27.84C167.71,85.9,167.59,80,152,80a8,8,0,0,1,0-16c31.27,0,31.72,22.43,32,35.84.29,14.26.41,20.16,16,20.16a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SlackLogoFill">M221.13,128A32,32,0,0,0,184,76.31V56a32,32,0,0,0-56-21.13A32,32,0,0,0,76.31,72H56a32,32,0,0,0-21.13,56A32,32,0,0,0,72,179.69V200a32,32,0,0,0,56,21.13A32,32,0,0,0,179.69,184H200a32,32,0,0,0,21.13-56ZM88,56a16,16,0,0,1,32,0V72H104A16,16,0,0,1,88,56ZM40,104A16,16,0,0,1,56,88h48a16,16,0,0,1,16,16v16H56A16,16,0,0,1,40,104Zm128,96a16,16,0,0,1-32,0V184h16A16,16,0,0,1,168,200Zm32-32H152a16,16,0,0,1-16-16V136h64a16,16,0,0,1,0,32Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowDownRightFill">M200,88V192a8,8,0,0,1-8,8H88a8,8,0,0,1-5.66-13.66L128.69,140,58.34,69.66A8,8,0,0,1,69.66,58.34L140,128.69l46.34-46.35A8,8,0,0,1,200,88Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BoneFill">M231.12,107.72a35.91,35.91,0,0,1-46.19,6.8.14.14,0,0,0-.1,0l-70.35,70.36s0,0,0,.08a36,36,0,1,1-66.37,22.92,36,36,0,1,1,22.92-66.37.14.14,0,0,0,.1,0l70.35-70.36s0,0,0-.08a36,36,0,1,1,66.37-22.92,36,36,0,0,1,23.27,59.57Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CylinderFill">M128,16C87.63,16,56,35.33,56,60V196c0,24.67,31.63,44,72,44s72-19.33,72-44V60C200,35.33,168.37,16,128,16Zm0,208c-29.83,0-56-13.08-56-28V77.43C82.92,88.5,103.9,96,128,96s45.08-7.5,56-18.57V196C184,210.92,157.83,224,128,224Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.UserGearFill">M198.13,194.85A8,8,0,0,1,192,208H24a8,8,0,0,1-6.12-13.15c14.94-17.78,33.52-30.41,54.17-37.17a68,68,0,1,1,71.9,0C164.6,164.44,183.18,177.07,198.13,194.85ZM255.18,154a8,8,0,0,1-6.94,4,7.92,7.92,0,0,1-4-1.07l-4.67-2.7a23.92,23.92,0,0,1-7.58,4.39V164a8,8,0,0,1-16,0v-5.38a23.92,23.92,0,0,1-7.58-4.39l-4.67,2.7a7.92,7.92,0,0,1-4,1.07,8,8,0,0,1-4-14.93l4.66-2.69a23.6,23.6,0,0,1,0-8.76l-4.66-2.69a8,8,0,1,1,8-13.86l4.67,2.7a23.92,23.92,0,0,1,7.58-4.39V108a8,8,0,0,1,16,0v5.38a23.92,23.92,0,0,1,7.58,4.39l4.67-2.7a8,8,0,1,1,8,13.86l-4.66,2.69a23.6,23.6,0,0,1,0,8.76l4.66,2.69A8,8,0,0,1,255.18,154ZM224,144a8,8,0,1,0-8-8A8,8,0,0,0,224,144Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.AxeFill">M255.15,97.72A16,16,0,0,0,242,86.94a136.46,136.46,0,0,1-51.65-18l10.31-10.3a25,25,0,0,0-35.32-35.32l-13.2,13.21c-2.33-2.8-3.81-4.84-4.41-5.69a16,16,0,0,0-24.41-2.15L84.68,67.36a16,16,0,0,0,2.14,24.4c.86.6,2.9,2.08,5.7,4.41L7.31,181.37a25,25,0,0,0,35.32,35.32l82.3-82.31a136.63,136.63,0,0,1,18,51.65,16,16,0,0,0,10.77,13.12,16.21,16.21,0,0,0,5.15.85,15.88,15.88,0,0,0,11.26-4.69l81.18-81.19A15.86,15.86,0,0,0,255.15,97.72ZM241,94.87ZM176.69,34.63a9,9,0,1,1,12.68,12.68L176.82,59.86A152.5,152.5,0,0,1,163.1,48.21ZM31.31,205.37a9,9,0,1,1-12.68-12.68l85.58-85.58a149.75,149.75,0,0,1,11.65,13.72Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.GoogleDriveLogoFill">M237.6,143.78,169.13,31.52A15.91,15.91,0,0,0,155.56,24H100.43a15.89,15.89,0,0,0-13.56,7.52l-.05.07L18.44,143.7a16,16,0,0,0-.33,16.42l27.32,47.82A16,16,0,0,0,59.32,216H196.67a16,16,0,0,0,13.89-8.06l27.32-47.82A15.91,15.91,0,0,0,237.6,143.78ZM219,144H172.52L137.33,85.33l22.75-37.92ZM92.53,160h70.94l24,40H68.53Zm9.6-16L128,100.88,153.87,144ZM95.91,47.41l22.76,37.92L83.47,144H37Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.IceCreamFill">M208,97.37V96A80,80,0,0,0,48,96v1.37A24,24,0,0,0,56,144h3.29l54.82,95.94a16,16,0,0,0,27.78,0L196.71,144H200a24,24,0,0,0,8-46.63ZM146.89,198.94,115.5,144h19.29l21.75,38.06ZM77.71,144H97.07l40.61,71.06L128,232Zm88,21.94L153.21,144h25.08Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FirstAidFill">M232,108v40a16,16,0,0,1-16,16H164v52a16,16,0,0,1-16,16H108a16,16,0,0,1-16-16V164H40a16,16,0,0,1-16-16V108A16,16,0,0,1,40,92H92V40a16,16,0,0,1,16-16h40a16,16,0,0,1,16,16V92h52A16,16,0,0,1,232,108Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.TwitterLogoFill">M245.66,77.66l-29.9,29.9C209.72,177.58,150.67,232,80,232c-14.52,0-26.49-2.3-35.58-6.84-7.33-3.67-10.33-7.6-11.08-8.72a8,8,0,0,1,3.85-11.93c.26-.1,24.24-9.31,39.47-26.84a110.93,110.93,0,0,1-21.88-24.2c-12.4-18.41-26.28-50.39-22-98.18a8,8,0,0,1,13.65-4.92c.35.35,33.28,33.1,73.54,43.72V88a47.87,47.87,0,0,1,14.36-34.3A46.87,46.87,0,0,1,168.1,40a48.66,48.66,0,0,1,41.47,24H240a8,8,0,0,1,5.66,13.66Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.KeyboardFill">M224,48H32A16,16,0,0,0,16,64V192a16,16,0,0,0,16,16H224a16,16,0,0,0,16-16V64A16,16,0,0,0,224,48ZM64,168H48a8,8,0,0,1,0-16H64a8,8,0,0,1,0,16Zm96,0H96a8,8,0,0,1,0-16h64a8,8,0,0,1,0,16Zm48,0H192a8,8,0,0,1,0-16h16a8,8,0,0,1,0,16Zm0-32H48a8,8,0,0,1,0-16H208a8,8,0,0,1,0,16Zm0-32H48a8,8,0,0,1,0-16H208a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.RepeatFill">M24,128A72.08,72.08,0,0,1,96,56h96V40a8,8,0,0,1,13.66-5.66l24,24a8,8,0,0,1,0,11.32l-24,24A8,8,0,0,1,192,88V72H96a56.06,56.06,0,0,0-56,56,8,8,0,0,1-16,0Zm200-8a8,8,0,0,0-8,8,56.06,56.06,0,0,1-56,56H64V168a8,8,0,0,0-13.66-5.66l-24,24a8,8,0,0,0,0,11.32l24,24A8,8,0,0,0,64,216V200h96a72.08,72.08,0,0,0,72-72A8,8,0,0,0,224,120Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CigaretteSlashFill">M201,60.08c8-14.23,7.42-21.71,6.36-24.91a7.79,7.79,0,0,0-2.64-3.86,8,8,0,1,1,6.5-14.62,22.57,22.57,0,0,1,11.32,13.44c3.36,10.14.81,22.85-7.6,37.79-8,14.23-7.42,21.72-6.36,24.92a7.79,7.79,0,0,0,2.64,3.85,8,8,0,1,1-6.5,14.62,22.53,22.53,0,0,1-11.32-13.44C190.07,87.73,192.62,75,201,60.08Zm-47.6,37.79a22.53,22.53,0,0,0,11.32,13.44,8,8,0,1,0,6.5-14.62,7.79,7.79,0,0,1-2.64-3.85c-1.06-3.2-1.64-10.69,6.36-24.92,8.41-14.94,11-27.65,7.6-37.79a22.57,22.57,0,0,0-11.32-13.44,8,8,0,1,0-6.5,14.62,7.79,7.79,0,0,1,2.64,3.86c1.06,3.2,1.64,10.68-6.36,24.91C152.62,75,150.07,87.73,153.43,97.87Zm60.49,112.75a8,8,0,1,1-11.84,10.76L175.37,192H32a16,16,0,0,1-16-16V144a16,16,0,0,1,16-16h85.19L42.08,45.38A8,8,0,1,1,53.92,34.62ZM160.82,176l-29.09-32H96v32ZM224,128H178.52a8,8,0,1,0,0,16H224v32h-1.84a8,8,0,1,0,0,16H224a16,16,0,0,0,16-16V144A16,16,0,0,0,224,128Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SnapchatLogoFill">M245.47,189.74c-7.1,6.67-17.67,7.71-27.88,8.72-6.31.62-12.83,1.27-16.39,3.23-3.37,1.86-6.85,6.62-10.21,11.22-5.4,7.41-11.53,15.8-21.23,18.28h0a26.35,26.35,0,0,1-6.64.81c-6.88,0-13.7-2.32-19.9-4.43-5.55-1.89-10.8-3.68-15.21-3.68s-9.66,1.79-15.21,3.68c-8.19,2.79-17.47,6-26.54,3.62-9.71-2.48-15.84-10.87-21.24-18.28-3.36-4.6-6.84-9.36-10.21-11.22-3.56-2-10.08-2.61-16.38-3.23-10.22-1-20.79-2.05-27.89-8.72a8,8,0,0,1,2.77-13.36c.09,0,12.84-4.86,25.36-19a94,94,0,0,0,17.74-30.2L37,119.43A8,8,0,1,1,43,104.57l17.85,7.15A151.24,151.24,0,0,0,64,80a64,64,0,0,1,128,0,149,149,0,0,0,3.21,31.73L213,104.57A8,8,0,1,1,219,119.43l-19.3,7.72c14.08,38.35,42.64,49.09,43,49.23a8,8,0,0,1,2.77,13.36Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FileSvgFill">M213.66,82.34l-56-56A8,8,0,0,0,152,24H56A16,16,0,0,0,40,40v76a4,4,0,0,0,4,4H212a4,4,0,0,0,4-4V88A8,8,0,0,0,213.66,82.34ZM152,88V44l44,44ZM87.82,196.31a20.82,20.82,0,0,1-9.19,15.23C73.44,215,67,216,61.14,216A61.23,61.23,0,0,1,46,214a8,8,0,0,1,4.3-15.41c4.38,1.2,14.95,2.7,19.55-.36.88-.59,1.83-1.52,2.14-3.93.35-2.67-.71-4.1-12.78-7.59-9.35-2.7-25-7.23-23-23.11a20.55,20.55,0,0,1,9-14.95c11.84-8,30.72-3.31,32.83-2.76a8,8,0,0,1-4.07,15.48c-4.48-1.17-15.23-2.56-19.83.56a4.54,4.54,0,0,0-2,3.67c-.11.9-.14,1.09,1.12,1.9,2.31,1.49,6.44,2.68,10.45,3.84C73.5,174.17,90.06,179,87.82,196.31Zm63.72-41.62-19.9,55.72a8.25,8.25,0,0,1-6.5,5.51,8,8,0,0,1-8.67-5.23L96.59,155a8.21,8.21,0,0,1,4.5-10.45,8,8,0,0,1,10.45,4.76L124,184.21l12.46-34.9a8,8,0,0,1,15.07,5.38ZM216,184v16.87a8,8,0,0,1-2.26,5.57A30,30,0,0,1,192,216c-17.64,0-32-16.15-32-36s14.36-36,32-36a29.36,29.36,0,0,1,16.09,4.86,8.22,8.22,0,0,1,3,10.64,8,8,0,0,1-11.54,2.88A13.27,13.27,0,0,0,192,160c-8.82,0-16,9-16,20s7.18,20,16,20a13.38,13.38,0,0,0,8-2.71V192a8,8,0,0,1-8-8.53,8.18,8.18,0,0,1,8.26-7.47H208A8,8,0,0,1,216,184Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BarricadeFill">M224,64H32A16,16,0,0,0,16,80v72a16,16,0,0,0,16,16H56v32a8,8,0,0,0,16,0V168H184v32a8,8,0,0,0,16,0V168h24a16,16,0,0,0,16-16V80A16,16,0,0,0,224,64ZM32,152V92l60,60Zm192,0H167.31l-72-72H164l60,60v12Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CopyFill">M216,32H88a8,8,0,0,0-8,8V80H40a8,8,0,0,0-8,8V216a8,8,0,0,0,8,8H168a8,8,0,0,0,8-8V176h40a8,8,0,0,0,8-8V40A8,8,0,0,0,216,32Zm-8,128H176V88a8,8,0,0,0-8-8H96V48H208Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.RowsPlusTopFill">M224,176v24a16,16,0,0,1-16,16H48a16,16,0,0,1-16-16V176a16,16,0,0,1,16-16H208A16,16,0,0,1,224,176ZM208,88H48a16,16,0,0,0-16,16v24a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V104A16,16,0,0,0,208,88ZM104,48h16V64a8,8,0,0,0,16,0V48h16a8,8,0,0,0,0-16H136V16a8,8,0,0,0-16,0V32H104a8,8,0,0,0,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ApproximateEqualsFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM197.2,160.87c-13.07,11.18-24.9,15.1-35.64,15.1-14.26,0-26.62-6.92-37.47-13-18.41-10.31-32.95-18.45-54.89.31a8,8,0,1,1-10.4-12.16c30.42-26,54.09-12.76,73.11-2.11,18.41,10.31,33,18.45,54.89-.31a8,8,0,0,1,10.4,12.16Zm0-56c-13.07,11.18-24.9,15.1-35.64,15.1-14.26,0-26.62-6.92-37.47-13-18.41-10.31-32.95-18.45-54.89.31A8,8,0,0,1,58.8,95.13c30.42-26,54.09-12.76,73.11-2.11,18.41,10.31,33,18.45,54.89-.31a8,8,0,1,1,10.4,12.16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.StackSimpleFill">M12,111l112,64a8,8,0,0,0,7.94,0l112-64a8,8,0,0,0,0-13.9l-112-64a8,8,0,0,0-7.94,0l-112,64A8,8,0,0,0,12,111Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.StackSimpleFill2">M236,137.05,128,198.79,20,137.05A8,8,0,1,0,12,151l112,64a8,8,0,0,0,7.94,0l112-64a8,8,0,1,0-7.94-13.9Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.LadderSimpleFill">M192,24a8,8,0,0,0-8,8v8H72V32a8,8,0,0,0-16,0V224a8,8,0,0,0,16,0v-8H184v8a8,8,0,0,0,16,0V32A8,8,0,0,0,192,24ZM176,184H80a8,8,0,0,1,0-16h96a8,8,0,0,1,0,16Zm0-48H80a8,8,0,0,1,0-16h96a8,8,0,0,1,0,16Zm0-48H80a8,8,0,0,1,0-16h96a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.HouseLineFill">M240,208H224V136l2.34,2.34A8,8,0,0,0,237.66,127L139.31,28.68a16,16,0,0,0-22.62,0L18.34,127a8,8,0,0,0,11.32,11.31L32,136v72H16a8,8,0,0,0,0,16H240a8,8,0,0,0,0-16Zm-88,0H104V160a4,4,0,0,1,4-4h40a4,4,0,0,1,4,4Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BagFill">M216,64H176a48,48,0,0,0-96,0H40A16,16,0,0,0,24,80V200a16,16,0,0,0,16,16H216a16,16,0,0,0,16-16V80A16,16,0,0,0,216,64ZM96,104a8,8,0,0,1-16,0V88a8,8,0,0,1,16,0Zm32-72a32,32,0,0,1,32,32H96A32,32,0,0,1,128,32Zm48,72a8,8,0,0,1-16,0V88a8,8,0,0,1,16,0Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CrownFill">M248,80a28,28,0,1,0-51.12,15.77l-26.79,33L146,73.4a28,28,0,1,0-36.06,0L85.91,128.74l-26.79-33a28,28,0,1,0-26.6,12L47,194.63A16,16,0,0,0,62.78,208H193.22A16,16,0,0,0,209,194.63l14.47-86.85A28,28,0,0,0,248,80ZM128,40a12,12,0,1,1-12,12A12,12,0,0,1,128,40ZM24,80A12,12,0,1,1,36,92,12,12,0,0,1,24,80ZM220,92a12,12,0,1,1,12-12A12,12,0,0,1,220,92Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PersonFill">M100,36a28,28,0,1,1,28,28A28,28,0,0,1,100,36ZM215.42,140.78l-45.25-51.3a28,28,0,0,0-21-9.48H106.83a28,28,0,0,0-21,9.48l-45.25,51.3a16,16,0,0,0,22.56,22.69L89,142.7l-19.7,74.88a16,16,0,0,0,29.08,13.35L128,180l29.58,51a16,16,0,0,0,29.08-13.35L167,142.7l25.9,20.77a16,16,0,0,0,22.56-22.69Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CarBatteryFill">M224,72H208V56a16,16,0,0,0-16-16H160a16,16,0,0,0-16,16V72H112V56A16,16,0,0,0,96,40H64A16,16,0,0,0,48,56V72H32A16,16,0,0,0,16,88v96a16,16,0,0,0,16,16H224a16,16,0,0,0,16-16V88A16,16,0,0,0,224,72ZM64,56H96V72H64Zm40,88H72a8,8,0,0,1,0-16h32a8,8,0,0,1,0,16Zm80,0h-8v8a8,8,0,0,1-16,0v-8h-8a8,8,0,0,1,0-16h8v-8a8,8,0,0,1,16,0v8h8a8,8,0,0,1,0,16Zm8-72H160V56h32Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.MicrophoneFill">M80,128V64a48,48,0,0,1,96,0v64a48,48,0,0,1-96,0Zm128,0a8,8,0,0,0-16,0,64,64,0,0,1-128,0,8,8,0,0,0-16,0,80.11,80.11,0,0,0,72,79.6V240a8,8,0,0,0,16,0V207.6A80.11,80.11,0,0,0,208,128Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SelectionForegroundFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM88,200H72a16,16,0,0,1-16-16V168a8,8,0,0,1,16,0v16H88a8,8,0,0,1,0,16Zm0-88H72v16a8,8,0,0,1-16,0V112A16,16,0,0,1,72,96H88a8,8,0,0,1,0,16Zm72,72a16,16,0,0,1-16,16H128a8,8,0,0,1,0-16h16V168a8,8,0,0,1,16,0Zm0-56a8,8,0,0,1-16,0V112H128a8,8,0,0,1,0-16h16a16,16,0,0,1,16,16Zm40,16a16,16,0,0,1-16,16,8,8,0,0,1,0-16h0V72H112a8,8,0,0,1-16,0,16,16,0,0,1,16-16h72a16,16,0,0,1,16,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.VisorFill">M183.05,56H72A72,72,0,0,0,.08,131.4c1.69,36.69,31.76,66.79,68.45,68.52,15.84.72,32-5.9,49.38-20.3a15.87,15.87,0,0,1,20.24,0C148.72,188.39,165,200,184,200a72,72,0,0,0,72-72.95C255.49,87.87,222.76,56,183.05,56ZM176,104H80a8,8,0,0,1,0-16h96a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.TriangleFill">M236.78,211.81A24.34,24.34,0,0,1,215.45,224H40.55a24.34,24.34,0,0,1-21.33-12.19,23.51,23.51,0,0,1,0-23.72L106.65,36.22a24.76,24.76,0,0,1,42.7,0L236.8,188.09A23.51,23.51,0,0,1,236.78,211.81Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BookmarksSimpleFill">M160,56H64A16,16,0,0,0,48,72V224a8,8,0,0,0,12.65,6.51L112,193.83l51.36,36.68A8,8,0,0,0,176,224V72A16,16,0,0,0,160,56Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BookmarksSimpleFill2">M192,24H88a8,8,0,0,0,0,16H192V192a8,8,0,0,0,16,0V40A16,16,0,0,0,192,24Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BatteryHighFill">M152,96v64a8,8,0,0,1-8,8H48a8,8,0,0,1-8-8V96a8,8,0,0,1,8-8h96A8,8,0,0,1,152,96Zm72-16v96a24,24,0,0,1-24,24H32A24,24,0,0,1,8,176V80A24,24,0,0,1,32,56H200A24,24,0,0,1,224,80Zm-16,0a8,8,0,0,0-8-8H32a8,8,0,0,0-8,8v96a8,8,0,0,0,8,8H200a8,8,0,0,0,8-8Zm40,8a8,8,0,0,0-8,8v64a8,8,0,0,0,16,0V96A8,8,0,0,0,248,88Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FastForwardFill">M256,128a15.76,15.76,0,0,1-7.33,13.34L160.48,197.5A15.91,15.91,0,0,1,136,184.16v-37.3L56.48,197.5A15.91,15.91,0,0,1,32,184.16V71.84A15.91,15.91,0,0,1,56.48,58.5L136,109.14V71.84A15.91,15.91,0,0,1,160.48,58.5l88.19,56.16A15.76,15.76,0,0,1,256,128Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.DropSimpleFill">M174,47.75a254.19,254.19,0,0,0-41.45-38.3,8,8,0,0,0-9.18,0A254.19,254.19,0,0,0,82,47.75C54.51,79.32,40,112.6,40,144a88,88,0,0,0,176,0C216,112.6,201.49,79.32,174,47.75Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FileCssFill">M48,180c0,11,7.18,20,16,20a14.18,14.18,0,0,0,10.06-4.5,8.2,8.2,0,0,1,10.9-.91,8,8,0,0,1,.81,11.81A30,30,0,0,1,64,216c-17.65,0-32-16.15-32-36s14.35-36,32-36a30,30,0,0,1,21.38,9.19,8.26,8.26,0,0,1,.74,11.09,8,8,0,0,1-11.9.38A14.2,14.2,0,0,0,64,160C55.18,160,48,169,48,180Zm79.6-8.69c-4-1.16-8.14-2.35-10.45-3.84-1.26-.81-1.23-1-1.12-1.9a4.54,4.54,0,0,1,2-3.67c4.6-3.12,15.35-1.73,19.83-.56a8,8,0,0,0,4.07-15.48c-2.12-.55-21-5.22-32.83,2.76a20.55,20.55,0,0,0-9,14.95c-2,15.88,13.64,20.41,23,23.11,12.07,3.49,13.13,4.92,12.78,7.59-.31,2.41-1.26,3.34-2.14,3.93-4.6,3.06-15.17,1.56-19.55.36a8,8,0,0,0-4.3,15.41,61.23,61.23,0,0,0,15.18,2c5.83,0,12.3-1,17.49-4.46a20.82,20.82,0,0,0,9.19-15.23C154,179,137.48,174.17,127.6,171.31Zm64,0c-4-1.16-8.14-2.35-10.45-3.84-1.25-.81-1.23-1-1.12-1.9a4.54,4.54,0,0,1,2-3.67c4.6-3.12,15.34-1.73,19.82-.56a8,8,0,0,0,4.07-15.48c-2.11-.55-21-5.22-32.83,2.76a20.58,20.58,0,0,0-8.95,14.95c-2,15.88,13.65,20.41,23,23.11,12.06,3.49,13.12,4.92,12.78,7.59-.31,2.41-1.26,3.34-2.15,3.93-4.6,3.06-15.16,1.56-19.54.36A8,8,0,0,0,173.93,214a61.34,61.34,0,0,0,15.19,2c5.82,0,12.3-1,17.49-4.46a20.81,20.81,0,0,0,9.18-15.23C218,179,201.48,174.17,191.59,171.31ZM40,116V40A16,16,0,0,1,56,24h96a8,8,0,0,1,5.66,2.34l56,56A8,8,0,0,1,216,88v28a4,4,0,0,1-4,4H44A4,4,0,0,1,40,116ZM152,88h44L152,44Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.TextHThreeFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM128,160a8,8,0,0,1-16,0V128H72v32a8,8,0,0,1-16,0V80a8,8,0,0,1,16,0v32h40V80a8,8,0,0,1,16,0Zm40,24a32,32,0,0,1-21.34-8.15,8,8,0,1,1,10.68-11.92A16,16,0,1,0,168,136a8,8,0,0,1-6.4-12.8L176,104H152a8,8,0,0,1,0-16h40a8,8,0,0,1,6.4,12.8l-16.71,22.28A32,32,0,0,1,168,184Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.LinkSimpleHorizontalFill">M224,48H32A16,16,0,0,0,16,64V192a16,16,0,0,0,16,16H224a16,16,0,0,0,16-16V64A16,16,0,0,0,224,48ZM112,168H80a40,40,0,0,1,0-80h32a8,8,0,0,1,0,16H80a24,24,0,0,0,0,48h32a8,8,0,0,1,0,16Zm48-48a8,8,0,0,1,0,16H96a8,8,0,0,1,0-16Zm16,48H144a8,8,0,0,1,0-16h32a24,24,0,0,0,0-48H144a8,8,0,0,1,0-16h32a40,40,0,0,1,0,80Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SockFill">M192,16H104A16,16,0,0,0,88,32v76.69L49.25,147.43a58.92,58.92,0,0,0,83.32,83.32L201,162.34a23.85,23.85,0,0,0,7-17V32A16,16,0,0,0,192,16Zm0,16h0V56H104V32Zm-2.34,119L157.8,182.88a48,48,0,0,1,34.2-70.2v32.69A8,8,0,0,1,189.66,151Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CarSimpleFill">M240,104H229.2L201.42,41.5A16,16,0,0,0,186.8,32H69.2a16,16,0,0,0-14.62,9.5L26.8,104H16a8,8,0,0,0,0,16h8v80a16,16,0,0,0,16,16H64a16,16,0,0,0,16-16v-8h96v8a16,16,0,0,0,16,16h24a16,16,0,0,0,16-16V120h8a8,8,0,0,0,0-16ZM44.31,104,69.2,48H186.8l24.89,56Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CodaLogoFill">M136,128a40,40,0,0,0,40,40h.32c7.83.3,14-1.46,21.24-6.11A12,12,0,0,1,216,172v36a16,16,0,0,1-16,16H56a16,16,0,0,1-16-16V48A16,16,0,0,1,56,32H200a16,16,0,0,1,16,16V84a12,12,0,0,1-18.47,10.1A40.23,40.23,0,0,0,136,128Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BankFill">M248,208a8,8,0,0,1-8,8H16a8,8,0,0,1,0-16H240A8,8,0,0,1,248,208ZM16.3,98.18a8,8,0,0,1,3.51-9l104-64a8,8,0,0,1,8.38,0l104,64A8,8,0,0,1,232,104H208v64h16a8,8,0,0,1,0,16H32a8,8,0,0,1,0-16H48V104H24A8,8,0,0,1,16.3,98.18ZM144,160a8,8,0,0,0,16,0V112a8,8,0,0,0-16,0Zm-48,0a8,8,0,0,0,16,0V112a8,8,0,0,0-16,0Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FilePyFill">M213.66,82.34l-56-56A8,8,0,0,0,152,24H56A16,16,0,0,0,40,40v76a4,4,0,0,0,4,4H172a4,4,0,0,1,4,4V228a4,4,0,0,0,4,4h20a16,16,0,0,0,16-16V88A8,8,0,0,0,213.66,82.34ZM152,88V44l44,44ZM64,144H48a8,8,0,0,0-8,8v55.73A8.17,8.17,0,0,0,47.47,216,8,8,0,0,0,56,208v-8h7.4c15.24,0,28.14-11.92,28.59-27.15A28,28,0,0,0,64,144Zm-.35,40H56V160h8a12,12,0,0,1,12,13.16A12.25,12.25,0,0,1,63.65,184Zm91-27.48L136,186.29v21.44a8.17,8.17,0,0,1-7.47,8.25,8,8,0,0,1-8.53-8V186.29l-18.61-29.77a8.22,8.22,0,0,1,2.16-11.17,8,8,0,0,1,11.23,2.41L128,168.91l13.22-21.15a8,8,0,0,1,11.23-2.41A8.22,8.22,0,0,1,154.61,156.52Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.UsbFill">M252,128a4,4,0,0,1-1.78,3.33l-48,32A4,4,0,0,1,196,160V136H72v48h36v-8a12,12,0,0,1,12-12h32a12,12,0,0,1,12,12v32a12,12,0,0,1-12,12H120a12,12,0,0,1-12-12v-8H72a16,16,0,0,1-16-16V136H8a8,8,0,0,1,0-16H56V72A16,16,0,0,1,72,56h37.17a28,28,0,1,1,0,16H72v48H196V96a4,4,0,0,1,6.22-3.33l48,32A4,4,0,0,1,252,128Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowBendDoubleUpLeftFill">M85.66,146.34a8,8,0,0,1-11.32,11.32l-48-48a8,8,0,0,1,0-11.32l48-48A8,8,0,0,1,85.66,61.66L43.31,104ZM136,96.3V56a8,8,0,0,0-13.66-5.66l-48,48a8,8,0,0,0,0,11.32l48,48A8,8,0,0,0,136,152V112.37A88.11,88.11,0,0,1,216,200a8,8,0,0,0,16,0A104.15,104.15,0,0,0,136,96.3Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowCircleUpFill">M232,128A104,104,0,1,0,128,232,104.11,104.11,0,0,0,232,128Zm-66.34-2.34a8,8,0,0,1-11.32,0L136,107.31V168a8,8,0,0,1-16,0V107.31l-18.34,18.35a8,8,0,0,1-11.32-11.32l32-32a8,8,0,0,1,11.32,0l32,32A8,8,0,0,1,165.66,125.66Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BatteryPlusVerticalFill">M88,8a8,8,0,0,1,8-8h64a8,8,0,0,1,0,16H96A8,8,0,0,1,88,8ZM200,56V224a24,24,0,0,1-24,24H80a24,24,0,0,1-24-24V56A24,24,0,0,1,80,32h96A24,24,0,0,1,200,56Zm-36,84a8,8,0,0,0-8-8H136V112a8,8,0,0,0-16,0v20H100a8,8,0,0,0,0,16h20v20a8,8,0,0,0,16,0V148h20A8,8,0,0,0,164,140Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PenNibStraightFill">M222.33,123.89c-.06-.13-.12-.26-.19-.38L192,69.91V32a16,16,0,0,0-16-16H80A16,16,0,0,0,64,32V69.9L33.86,123.51c-.07.12-.13.25-.2.38a15.94,15.94,0,0,0,1.46,16.57l.11.14,77.61,100.81A4,4,0,0,0,120,239V154.63a24,24,0,1,1,16,0V239a4,4,0,0,0,7.16,2.44l77.6-100.81.11-.14A15.92,15.92,0,0,0,222.33,123.89ZM176,64H80V32h96Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.HashStraightFill">M112,112h32v32H112ZM224,48V208a16,16,0,0,1-16,16H48a16,16,0,0,1-16-16V48A16,16,0,0,1,48,32H208A16,16,0,0,1,224,48Zm-64,96V112h32a8,8,0,0,0,0-16H160V64a8,8,0,0,0-16,0V96H112V64a8,8,0,0,0-16,0V96H64a8,8,0,0,0,0,16H96v32H64a8,8,0,0,0,0,16H96v32a8,8,0,0,0,16,0V160h32v32a8,8,0,0,0,16,0V160h32a8,8,0,0,0,0-16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.NumberSquareThreeFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM124,184a35.71,35.71,0,0,1-25.71-10.81A8,8,0,1,1,109.71,162,20,20,0,1,0,124,128a8,8,0,0,1-6.55-12.59L136.63,88H104a8,8,0,0,1,0-16h48a8,8,0,0,1,6.55,12.59l-21,30A36,36,0,0,1,124,184Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.RepeatOnceFill">M24,128A72.08,72.08,0,0,1,96,56h96V40a8,8,0,0,1,13.66-5.66l24,24a8,8,0,0,1,0,11.32l-24,24A8,8,0,0,1,192,88V72H96a56.06,56.06,0,0,0-56,56,8,8,0,0,1-16,0Zm200-8a8,8,0,0,0-8,8,56.06,56.06,0,0,1-56,56H64V168a8,8,0,0,0-13.66-5.66l-24,24a8,8,0,0,0,0,11.32l24,24A8,8,0,0,0,64,216V200h96a72.08,72.08,0,0,0,72-72A8,8,0,0,0,224,120Zm-88,40a8,8,0,0,0,8-8V104a8,8,0,0,0-11.58-7.16l-16,8a8,8,0,1,0,7.16,14.31l4.42-2.21V152A8,8,0,0,0,136,160Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BathtubFill">M240,96H216a8,8,0,0,0-8-8H136a8,8,0,0,0-8,8H64V52A12,12,0,0,1,76,40a12.44,12.44,0,0,1,12.16,9.59,8,8,0,0,0,15.68-3.18A28.32,28.32,0,0,0,76,24,28,28,0,0,0,48,52V96H16a8,8,0,0,0-8,8v40a56.06,56.06,0,0,0,56,56v16a8,8,0,0,0,16,0V200h96v16a8,8,0,0,0,16,0V200a56.06,56.06,0,0,0,56-56V104A8,8,0,0,0,240,96Zm-40,8v40H144V104Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FolderSimpleFill">M232,88V200.89A15.13,15.13,0,0,1,216.89,216H40a16,16,0,0,1-16-16V64A16,16,0,0,1,40,48H93.33a16.12,16.12,0,0,1,9.6,3.2L130.67,72H216A16,16,0,0,1,232,88Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PixLogoFill">M235.34,139.28l-19.56,19.55A4,4,0,0,1,213,160H171.32l-32-32,32-32H213a4,4,0,0,1,2.82,1.17l19.56,19.55A16,16,0,0,1,235.34,139.28ZM67.05,80H88a8,8,0,0,1,5.65,2.34L128,116.68l34.35-34.34A8,8,0,0,1,168,80H189a4,4,0,0,0,2.83-6.83l-52.5-52.51a16,16,0,0,0-22.56,0L64.22,73.17A4,4,0,0,0,67.05,80ZM189,176H168a8,8,0,0,1-5.65-2.34L128,139.31,93.65,173.66A8,8,0,0,1,88,176h-21a4,4,0,0,0-2.83,6.83l52.5,52.51a16,16,0,0,0,22.56,0l52.5-52.51A4,4,0,0,0,189,176Zm-72.26-48-32-32H43a4,4,0,0,0-2.82,1.17L20.66,116.72a16,16,0,0,0,0,22.56l19.56,19.55A4,4,0,0,0,43,160H84.68Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.NumberEightFill">M108,92a20,20,0,1,1,20,20A20,20,0,0,1,108,92Zm20,36a28,28,0,1,0,28,28A28,28,0,0,0,128,128Zm88-88V216a16,16,0,0,1-16,16H56a16,16,0,0,1-16-16V40A16,16,0,0,1,56,24H200A16,16,0,0,1,216,40ZM172,156a44,44,0,0,0-20.23-37,36,36,0,1,0-47.54,0A44,44,0,1,0,172,156Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.MarkdownLogoFill">M232,48H24A16,16,0,0,0,8,64V192a16,16,0,0,0,16,16H232a16,16,0,0,0,16-16V64A16,16,0,0,0,232,48ZM128,152a8,8,0,0,1-16,0V123.31L93.66,141.66a8,8,0,0,1-11.32,0L64,123.31V152a8,8,0,0,1-16,0V104a8,8,0,0,1,13.66-5.66L88,124.69l26.34-26.35A8,8,0,0,1,128,104Zm77.66-18.34-24,24a8,8,0,0,1-11.32,0l-24-24a8,8,0,0,1,11.32-11.32L168,132.69V104a8,8,0,0,1,16,0v28.69l10.34-10.35a8,8,0,0,1,11.32,11.32Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ShieldFill">M224,56v56c0,52.72-25.52,84.67-46.93,102.19-23.06,18.86-46,25.27-47,25.53a8,8,0,0,1-4.2,0c-1-.26-23.91-6.67-47-25.53C57.52,196.67,32,164.72,32,112V56A16,16,0,0,1,48,40H208A16,16,0,0,1,224,56Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CircleDashedFill">M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24Zm54.59,45a8,8,0,0,1,11.29.7,88,88,0,0,1,17.6,30.47,8,8,0,0,1-15.18,5.08,71.87,71.87,0,0,0-14.4-25A8,8,0,0,1,182.59,69ZM73.41,187.05a8,8,0,0,1-11.29-.7,88,88,0,0,1-17.6-30.47A8,8,0,1,1,59.7,150.8a71.87,71.87,0,0,0,14.4,24.95A8,8,0,0,1,73.41,187.05Zm.69-106.8a71.87,71.87,0,0,0-14.4,25,8,8,0,1,1-15.18-5.08,88,88,0,0,1,17.6-30.47,8,8,0,1,1,12,10.6Zm71.49,134a87.8,87.8,0,0,1-35.18,0,8,8,0,0,1,3.18-15.68,72.08,72.08,0,0,0,28.82,0,8,8,0,0,1,3.18,15.68Zm6.25-163A8,8,0,0,1,144,57.61a7.89,7.89,0,0,1-1.6-.16,72.08,72.08,0,0,0-28.82,0,8,8,0,1,1-3.18-15.68,87.92,87.92,0,0,1,35.18,0A8,8,0,0,1,151.84,51.2Zm59.64,104.68a88,88,0,0,1-17.6,30.47,8,8,0,1,1-12-10.6,71.87,71.87,0,0,0,14.4-24.95,8,8,0,0,1,15.18,5.08Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SubwayFill">M156,176V152h20v16a8,8,0,0,1-8,8Zm-16,0V152H116v24Zm36-88a8,8,0,0,0-8-8H88a8,8,0,0,0-8,8v48h96ZM152,24H104A72,72,0,0,0,32,96V208a8,8,0,0,0,8,8H76.58a4,4,0,0,0,3.58-2.21L91.06,192H88a24,24,0,0,1-24-24V88A24,24,0,0,1,88,64h80a24,24,0,0,1,24,24v80a24,24,0,0,1-24,24h-3.06l10.9,21.79a4,4,0,0,0,3.58,2.21H216a8,8,0,0,0,8-8V96A72,72,0,0,0,152,24Zm-4.94,168H108.94l-9.1,18.21a4,4,0,0,0,3.58,5.79h49.16a4,4,0,0,0,3.58-5.79ZM80,168a8,8,0,0,0,8,8h12V152H80Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ClockAfternoonFill">M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24Zm56,112H147.31l26.35,26.34a8,8,0,0,1-11.32,11.32l-40-40A8,8,0,0,1,128,120h56a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SneakerFill">M228.65,129.11l-28.06-9.35a4,4,0,0,0-2.63,0l-43.23,15.72A8.14,8.14,0,0,1,152,136a8,8,0,0,1-7.71-5.88,8.17,8.17,0,0,1,5.22-9.73L168,113.67a2.54,2.54,0,0,0-.06-4.8,23.93,23.93,0,0,1-8.8-5.25,4,4,0,0,0-4.17-.91l-24.22,8.8a8,8,0,0,1-10.44-5.39,8.17,8.17,0,0,1,5.22-9.73L146,88.93a4,4,0,0,0,2.31-5.34l-3.06-7.16a4,4,0,0,0-5.05-2.19l-25.5,9.27a8,8,0,0,1-10.44-5.39,8.17,8.17,0,0,1,5.22-9.73l24-8.73a4,4,0,0,0,2.31-5.33L130.39,41.6s0-.07,0-.1A16,16,0,0,0,110.25,33L34.53,60.49A16.05,16.05,0,0,0,24,75.53V192a16,16,0,0,0,16,16H240a16,16,0,0,0,16-16V167.06A40,40,0,0,0,228.65,129.11ZM240,192H40V176H240Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.RedditLogoFill">M248,104a32,32,0,0,0-52.94-24.19c-16.75-8.9-36.76-14.28-57.66-15.53l5.19-31.17,17.72,2.72a24,24,0,1,0,2.87-15.74l-26-4a8,8,0,0,0-9.11,6.59L121.2,64.16c-21.84.94-42.82,6.38-60.26,15.65a32,32,0,0,0-42.59,47.74A59,59,0,0,0,16,144c0,21.93,12,42.35,33.91,57.49C70.88,216,98.61,224,128,224s57.12-8,78.09-22.51C228,186.35,240,165.93,240,144a59,59,0,0,0-2.35-16.45A32.16,32.16,0,0,0,248,104ZM72,128a16,16,0,1,1,16,16A16,16,0,0,1,72,128Zm91.75,55.07a76.18,76.18,0,0,1-71.5,0,8,8,0,1,1,7.5-14.14,60.18,60.18,0,0,0,56.5,0,8,8,0,1,1,7.5,14.14ZM168,144a16,16,0,1,1,16-16A16,16,0,0,1,168,144Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.AlignCenterVerticalFill">M232,128a8,8,0,0,1-8,8H208v48a16,16,0,0,1-16,16H152a16,16,0,0,1-16-16V136H120v72a16,16,0,0,1-16,16H64a16,16,0,0,1-16-16V136H32a8,8,0,0,1,0-16H48V48A16,16,0,0,1,64,32h40a16,16,0,0,1,16,16v72h16V72a16,16,0,0,1,16-16h40a16,16,0,0,1,16,16v48h16A8,8,0,0,1,232,128Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ListFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM192,184H64a8,8,0,0,1,0-16H192a8,8,0,0,1,0,16Zm0-48H64a8,8,0,0,1,0-16H192a8,8,0,0,1,0,16Zm0-48H64a8,8,0,0,1,0-16H192a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.TextIndentFill">M224,128a8,8,0,0,1-8,8H112a8,8,0,0,1,0-16H216A8,8,0,0,1,224,128ZM112,72H216a8,8,0,0,0,0-16H112a8,8,0,0,0,0,16ZM216,184H40a8,8,0,0,0,0,16H216a8,8,0,0,0,0-16ZM36.94,143.39a8,8,0,0,0,8.72-1.73l40-40a8,8,0,0,0,0-11.32l-40-40A8,8,0,0,0,32,56v80A8,8,0,0,0,36.94,143.39Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.NotepadFill">M208,32H184V24a8,8,0,0,0-16,0v8H136V24a8,8,0,0,0-16,0v8H88V24a8,8,0,0,0-16,0v8H48a8,8,0,0,0-8,8V200a32,32,0,0,0,32,32H184a32,32,0,0,0,32-32V40A8,8,0,0,0,208,32ZM120,56a8,8,0,0,1,16,0v8a8,8,0,0,1-16,0ZM80,72a8,8,0,0,1-8-8V56a8,8,0,0,1,16,0v8A8,8,0,0,1,80,72Zm80,96H96a8,8,0,0,1,0-16h64a8,8,0,0,1,0,16Zm0-32H96a8,8,0,0,1,0-16h64a8,8,0,0,1,0,16Zm24-72a8,8,0,0,1-16,0V56a8,8,0,0,1,16,0Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.TranslateFill">M160,129.89,175.06,160H144.94l6.36-12.7v0ZM224,48V208a16,16,0,0,1-16,16H48a16,16,0,0,1-16-16V48A16,16,0,0,1,48,32H208A16,16,0,0,1,224,48ZM207.16,188.42l-40-80a8,8,0,0,0-14.32,0L139.66,134.8a62.31,62.31,0,0,1-23.61-10A79.61,79.61,0,0,0,135.6,80H152a8,8,0,0,0,0-16H112V56a8,8,0,0,0-16,0v8H56a8,8,0,0,0,0,16h63.48a63.73,63.73,0,0,1-15.3,34.05,65.93,65.93,0,0,1-9-13.61,8,8,0,0,0-14.32,7.12,81.75,81.75,0,0,0,11.4,17.15A63.62,63.62,0,0,1,56,136a8,8,0,0,0,0,16,79.56,79.56,0,0,0,48.11-16.13,78.33,78.33,0,0,0,28.18,13.66l-19.45,38.89a8,8,0,0,0,14.32,7.16L136.94,176h46.12l9.78,19.58a8,8,0,1,0,14.32-7.16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.GraphFill">M200,152a31.84,31.84,0,0,0-19.53,6.68l-23.11-18A31.65,31.65,0,0,0,160,128c0-.74,0-1.48-.08-2.21l13.23-4.41A32,32,0,1,0,168,104c0,.74,0,1.48.08,2.21l-13.23,4.41A32,32,0,0,0,128,96a32.59,32.59,0,0,0-5.27.44L115.89,81A32,32,0,1,0,96,88a32.59,32.59,0,0,0,5.27-.44l6.84,15.4a31.92,31.92,0,0,0-8.57,39.64L73.83,165.44a32.06,32.06,0,1,0,10.63,12l25.71-22.84a31.91,31.91,0,0,0,37.36-1.24l23.11,18A31.65,31.65,0,0,0,168,184a32,32,0,1,0,32-32Zm0-64a16,16,0,1,1-16,16A16,16,0,0,1,200,88ZM80,56A16,16,0,1,1,96,72,16,16,0,0,1,80,56ZM56,208a16,16,0,1,1,16-16A16,16,0,0,1,56,208Zm144-8a16,16,0,1,1,16-16A16,16,0,0,1,200,200Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.TestTubeFill">M237.66,86.34l-60-60a8,8,0,0,0-11.32,0L37.11,155.57a44.77,44.77,0,0,0,63.32,63.32L212.32,107l22.21-7.4a8,8,0,0,0,3.13-13.25Zm-32.19,6.07a8,8,0,0,0-3.13,1.93l-39.57,39.57c-8.47,2.9-21.75,4-39.07-5-10.6-5.54-20.18-8-28.56-8.73L172,43.31,217.19,88.5Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.TargetFill">M211.2,79.39a8,8,0,0,0-3.77,10.67A88.09,88.09,0,1,1,184.3,60.39L161.53,83.16A56,56,0,0,0,88.4,167.59h0a56,56,0,0,0,95.5-42.79,8,8,0,1,0-16,.9,40,40,0,0,1-62,35.67l23.95-23.95L167.6,99.72h0l62.06-62a8,8,0,0,0-11.32-11.32L195.67,49A104,104,0,0,0,54.46,201.54,104,104,0,0,0,221.87,83.16,8,8,0,0,0,211.2,79.39Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CrosshairSimpleFill">M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24Zm0,192a88,88,0,1,1,88-88A88.1,88.1,0,0,1,128,216Zm48-80h23.54A72.11,72.11,0,0,1,136,199.54V176a8,8,0,0,0-16,0v23.54A72.11,72.11,0,0,1,56.46,136H80a8,8,0,0,0,0-16H56.46A72.11,72.11,0,0,1,120,56.46V80a8,8,0,0,0,16,0V56.46A72.11,72.11,0,0,1,199.54,120H176a8,8,0,0,0,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.MouseRightClickFill">M144,16H112A64.07,64.07,0,0,0,48,80v96a64.07,64.07,0,0,0,64,64h32a64.07,64.07,0,0,0,64-64V80A64.07,64.07,0,0,0,144,16ZM112,32h16v72H64V80A48.05,48.05,0,0,1,112,32Zm32,192H112a48.05,48.05,0,0,1-48-48V120H192v56A48.05,48.05,0,0,1,144,224Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FanFill">M233,135a60,60,0,0,0-89.62-35.45l16.39-65.44a8,8,0,0,0-3.45-8.68A60,60,0,1,0,95.69,128.91L30.82,147.44a8,8,0,0,0-5.8,7.32,60,60,0,0,0,44.42,60.66,60.52,60.52,0,0,0,15.62,2.07,60.07,60.07,0,0,0,59.88-62l48.48,46.92a8,8,0,0,0,9.25,1.35A60,60,0,0,0,233,135ZM130.44,147.85a20,20,0,1,1,17.41-22.29A20,20,0,0,1,130.44,147.85Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ProjectorScreenFill">M232,64V48a16,16,0,0,0-16-16H40A16,16,0,0,0,24,48V64A16,16,0,0,0,40,80v96H32a8,8,0,0,0,0,16h88v17.38a24,24,0,1,0,16,0V192h88a8,8,0,0,0,0-16h-8V80A16,16,0,0,0,232,64ZM128,240a8,8,0,1,1,8-8A8,8,0,0,1,128,240ZM40,48H216V64H40Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.TiktokLogoFill">M232,80v40a8,8,0,0,1-8,8,103.25,103.25,0,0,1-48-11.71V156a76,76,0,0,1-152,0c0-36.9,26.91-69.52,62.6-75.88A8,8,0,0,1,96,88v42.69a8,8,0,0,1-4.57,7.23A20,20,0,1,0,120,156V24a8,8,0,0,1,8-8h40a8,8,0,0,1,8,8,48.05,48.05,0,0,0,48,48A8,8,0,0,1,232,80Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CaretLineLeftFill">M200,48V208a8,8,0,0,1-13.66,5.66l-80-80a8,8,0,0,1,0-11.32l80-80A8,8,0,0,1,200,48ZM72,40a8,8,0,0,0-8,8V208a8,8,0,0,0,16,0V48A8,8,0,0,0,72,40Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CaretRightFill">M181.66,122.34l-80-80A8,8,0,0,0,88,48V208a8,8,0,0,0,13.66,5.66l80-80A8,8,0,0,0,181.66,122.34Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.AlignBottomSimpleFill">M208,232a8,8,0,0,1-8,8H56a8,8,0,0,1,0-16H200A8,8,0,0,1,208,232ZM96,208h64a16,16,0,0,0,16-16V40a16,16,0,0,0-16-16H96A16,16,0,0,0,80,40V192A16,16,0,0,0,96,208Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArmchairFill">M240,132a28,28,0,0,1-24,27.71V200a16,16,0,0,1-16,16H56a16,16,0,0,1-16-16V159.71A28,28,0,1,1,72,132v36a8,8,0,0,0,16,0V144h80v24a8,8,0,0,0,16,0V132a28,28,0,0,1,56,0ZM44,88a44.06,44.06,0,0,1,43.81,40h80.38A44.06,44.06,0,0,1,212,88a4,4,0,0,0,4-4V72a40,40,0,0,0-40-40H80A40,40,0,0,0,40,72V84A4,4,0,0,0,44,88Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.TextColumnsFill">M216,40H40A16,16,0,0,0,24,56V200a16,16,0,0,0,16,16H216a16,16,0,0,0,16-16V56A16,16,0,0,0,216,40ZM112,184H56a8,8,0,0,1,0-16h56a8,8,0,0,1,0,16Zm0-32H56a8,8,0,0,1,0-16h56a8,8,0,0,1,0,16Zm0-32H56a8,8,0,0,1,0-16h56a8,8,0,0,1,0,16Zm0-32H56a8,8,0,0,1,0-16h56a8,8,0,0,1,0,16Zm88,96H144a8,8,0,0,1,0-16h56a8,8,0,0,1,0,16Zm0-32H144a8,8,0,0,1,0-16h56a8,8,0,0,1,0,16Zm0-32H144a8,8,0,0,1,0-16h56a8,8,0,0,1,0,16Zm0-32H144a8,8,0,0,1,0-16h56a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.GitlabLogoFill">M230.15,117.1,210.25,41a11.94,11.94,0,0,0-22.79-1.11L169.78,88H86.22L68.54,39.87A11.94,11.94,0,0,0,45.75,41L25.85,117.1a57.19,57.19,0,0,0,22,61l73.27,51.76a11.91,11.91,0,0,0,13.74,0l73.27-51.76A57.19,57.19,0,0,0,230.15,117.1Zm-189.47,7L114.13,176,93.41,190.65,57.09,165A41.06,41.06,0,0,1,40.68,124.11Zm87.32,91-20.73-14.65L128,185.8l20.73,14.64ZM198.91,165l-36.32,25.66L141.87,176l73.45-51.9A41.06,41.06,0,0,1,198.91,165Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ForkKnifeFill">M216,40V224a8,8,0,0,1-16,0V176H152a8,8,0,0,1-8-8,268.75,268.75,0,0,1,7.22-56.88c9.78-40.49,28.32-67.63,53.63-78.47A8,8,0,0,1,216,40Zm-96.11-1.31a8,8,0,1,0-15.78,2.63L111.89,88H88V40a8,8,0,0,0-16,0V88H48.11l7.78-46.68a8,8,0,1,0-15.78-2.63l-8,48A8.17,8.17,0,0,0,32,88a48.07,48.07,0,0,0,40,47.32V224a8,8,0,0,0,16,0V135.32A48.07,48.07,0,0,0,128,88a8.17,8.17,0,0,0-.11-1.31Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PicnicTableFill">M146.85,96l14.54,32H94.61l14.54-32ZM232,56V200a16,16,0,0,1-16,16H40a16,16,0,0,1-16-16V56A16,16,0,0,1,40,40H216A16,16,0,0,1,232,56Zm-24,80a8,8,0,0,0-8-8H179L164.42,96H176a8,8,0,0,0,0-16H80a8,8,0,0,0,0,16H91.58L77,128H56a8,8,0,0,0,0,16H69.76l-13,28.69a8,8,0,1,0,14.56,6.62l16-35.31h81.34l16.05,35.31a8,8,0,0,0,14.56-6.62l-13-28.69H200A8,8,0,0,0,208,136Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BarcodeFill">M224,40H32a8,8,0,0,0-8,8V208a8,8,0,0,0,8,8H224a8,8,0,0,0,8-8V48A8,8,0,0,0,224,40ZM40,64a8,8,0,0,1,8-8H80a8,8,0,0,1,0,16H56V96a8,8,0,0,1-16,0ZM80,200H48a8,8,0,0,1-8-8V160a8,8,0,0,1,16,0v24H80a8,8,0,0,1,0,16Zm24-48a8,8,0,0,1-16,0V104a8,8,0,0,1,16,0Zm32,0a8,8,0,0,1-16,0V104a8,8,0,0,1,16,0Zm24,8a8,8,0,0,1-8-8V104a8,8,0,0,1,16,0v48A8,8,0,0,1,160,160Zm56,32a8,8,0,0,1-8,8H176a8,8,0,0,1,0-16h24V160a8,8,0,0,1,16,0Zm0-96a8,8,0,0,1-16,0V72H176a8,8,0,0,1,0-16h32a8,8,0,0,1,8,8Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.MouseLeftClickFill">M144,16H112A64.07,64.07,0,0,0,48,80v96a64.07,64.07,0,0,0,64,64h32a64.07,64.07,0,0,0,64-64V80A64.07,64.07,0,0,0,144,16Zm48,64v24H128V32h16A48.05,48.05,0,0,1,192,80ZM144,224H112a48.05,48.05,0,0,1-48-48V120H192v56A48.05,48.05,0,0,1,144,224Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FlowerFill">M210.35,129.36c-.81-.47-1.7-.92-2.62-1.36.92-.44,1.81-.89,2.62-1.36a40,40,0,1,0-40-69.28c-.81.47-1.65,1-2.48,1.59.08-1,.13-2,.13-3a40,40,0,0,0-80,0c0,.94,0,1.94.13,3-.83-.57-1.67-1.12-2.48-1.59a40,40,0,1,0-40,69.28c.81.47,1.7.92,2.62,1.36-.92.44-1.81.89-2.62,1.36a40,40,0,1,0,40,69.28c.81-.47,1.65-1,2.48-1.59-.08,1-.13,2-.13,2.95a40,40,0,0,0,80,0c0-.94-.05-1.94-.13-2.95.83.57,1.67,1.12,2.48,1.59A39.79,39.79,0,0,0,190.29,204a40.43,40.43,0,0,0,10.42-1.38,40,40,0,0,0,9.64-73.28ZM128,156a28,28,0,1,1,28-28A28,28,0,0,1,128,156Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.LockFill">M208,80H176V56a48,48,0,0,0-96,0V80H48A16,16,0,0,0,32,96V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V96A16,16,0,0,0,208,80Zm-80,84a12,12,0,1,1,12-12A12,12,0,0,1,128,164Zm32-84H96V56a32,32,0,0,1,64,0Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowsInSimpleFill">M213.66,53.66,179.31,88l18.35,18.34A8,8,0,0,1,192,120H144a8,8,0,0,1-8-8V64a8,8,0,0,1,13.66-5.66L168,76.69l34.34-34.35a8,8,0,0,1,11.32,11.32ZM112,136H64a8,8,0,0,0-5.66,13.66L76.69,168,42.34,202.34a8,8,0,0,0,11.32,11.32L88,179.31l18.34,18.35A8,8,0,0,0,120,192V144A8,8,0,0,0,112,136Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.NumberFourFill">M104.65,144,144,94.81V144ZM216,40V216a16,16,0,0,1-16,16H56a16,16,0,0,1-16-16V40A16,16,0,0,1,56,24H200A16,16,0,0,1,216,40ZM184,152a8,8,0,0,0-8-8H160V72a8,8,0,0,0-14.25-5l-64,80A8,8,0,0,0,88,160h56v24a8,8,0,0,0,16,0V160h16A8,8,0,0,0,184,152Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ToiletPaperFill">M184,120a8,8,0,0,1-8,8H160a8,8,0,0,1,0-16h16A8,8,0,0,1,184,120Zm56,0v88a16,16,0,0,1-16,16H112a16,16,0,0,1-16-16V186.35C87.37,200.37,76.18,208,64,208c-13.87,0-26.46-9.89-35.44-27.85C20.46,164,16,142.59,16,120s4.46-43.95,12.56-60.15C37.54,41.89,50.13,32,64,32H192c13.87,0,26.46,9.89,35.44,27.85C235.54,76.05,240,97.41,240,120ZM76,120a12,12,0,1,0-12,12A12,12,0,0,0,76,120Zm148,8H208a8,8,0,0,1,0-16h15.79C221.84,73.9,206.16,48,192,48H92.12a73.6,73.6,0,0,1,7.32,11.85c7.14,14.28,11.44,32.56,12.37,52.15H128a8,8,0,0,1,0,16H112v80H224Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.HandSwipeLeftFill">M216,128v50.93c0,25.59-8.48,39.93-8.84,40.65A8,8,0,0,1,200,224H64a8,8,0,0,1-6.9-3.95L26.15,160a16,16,0,0,1,6.53-22.23c7.66-4,17.1-.84,21.4,6.62l21,36.44a6.09,6.09,0,0,0,6,3.09l.12,0A8.19,8.19,0,0,0,88,175.74V56a16,16,0,0,1,16.77-16c8.61.4,15.23,7.82,15.23,16.43V128a8,8,0,0,0,8.53,8,8.17,8.17,0,0,0,7.47-8.25V112a16,16,0,0,1,16.77-16c8.61.4,15.23,7.82,15.23,16.43V136a8,8,0,0,0,8.53,8,8.18,8.18,0,0,0,7.47-8.25v-7.28c0-8.61,6.62-16,15.23-16.43A16,16,0,0,1,216,128Zm32-80H195.31l18.35-18.34a8,8,0,1,0-11.32-11.32l-32,32a8,8,0,0,0,0,11.32l32,32a8,8,0,0,0,11.32-11.32L195.31,64H248a8,8,0,0,0,0-16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.XCircleFill">M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24Zm37.66,130.34a8,8,0,0,1-11.32,11.32L128,139.31l-26.34,26.35a8,8,0,0,1-11.32-11.32L116.69,128,90.34,101.66a8,8,0,0,1,11.32-11.32L128,116.69l26.34-26.35a8,8,0,0,1,11.32,11.32L139.31,128Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CompassToolFill">M215.12,123.64a8,8,0,1,0-14.24-7.28,79.58,79.58,0,0,1-33.08,33.5l-18.24-41.05A36,36,0,0,0,136,44.91V24a8,8,0,0,0-16,0V44.91a36,36,0,0,0-13.56,63.9L56.69,220.75a8,8,0,1,0,14.62,6.5l25.14-56.56A95.48,95.48,0,0,0,128,176a99.13,99.13,0,0,0,31.6-5.21l25.09,56.46a8,8,0,0,0,14.62-6.5l-25-56.25A95.81,95.81,0,0,0,215.12,123.64ZM128,160a79.52,79.52,0,0,1-25-4l18.08-40.68a35.75,35.75,0,0,0,13.88,0l18.14,40.8A83.21,83.21,0,0,1,128,160Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CheckFatFill">M243.31,90.91l-128.4,128.4a16,16,0,0,1-22.62,0l-71.62-72a16,16,0,0,1,0-22.61l20-20a16,16,0,0,1,22.58,0L104,144.22l96.76-95.57a16,16,0,0,1,22.59,0l19.95,19.54A16,16,0,0,1,243.31,90.91Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PhoneFill">M231.88,175.08A56.26,56.26,0,0,1,176,224C96.6,224,32,159.4,32,80A56.26,56.26,0,0,1,80.92,24.12a16,16,0,0,1,16.62,9.52l21.12,47.15,0,.12A16,16,0,0,1,117.39,96c-.18.27-.37.52-.57.77L96,121.45c7.49,15.22,23.41,31,38.83,38.51l24.34-20.71a8.12,8.12,0,0,1,.75-.56,16,16,0,0,1,15.17-1.4l.13.06,47.11,21.11A16,16,0,0,1,231.88,175.08Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.StarHalfFill">M239.18,97.26A16.38,16.38,0,0,0,224.92,86l-59-4.76L143.14,26.15a16.36,16.36,0,0,0-30.27,0L90.11,81.23,31.08,86a16.46,16.46,0,0,0-9.37,28.86l45,38.83L53,211.75a16.4,16.4,0,0,0,24.5,17.82L128,198.49l50.53,31.08A16.4,16.4,0,0,0,203,211.75l-13.76-58.07,45-38.83A16.43,16.43,0,0,0,239.18,97.26Zm-15.34,5.47-48.7,42a8,8,0,0,0-2.56,7.91l14.88,62.8a.37.37,0,0,1-.17.48c-.18.14-.23.11-.38,0l-54.72-33.65A8,8,0,0,0,128,181.1V32c.24,0,.27.08.35.26L153,91.86a8,8,0,0,0,6.75,4.92l63.91,5.16c.16,0,.25,0,.34.29S224,102.63,223.84,102.73Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.UserSwitchFill">M84,120a44,44,0,1,1,44,44A44,44,0,0,1,84,120Zm126.16,57.18a8.21,8.21,0,0,0-10.86,2.41,87.42,87.42,0,0,1-5.52,6.85A79.76,79.76,0,0,0,172,165.1a4,4,0,0,0-4.84.32,59.8,59.8,0,0,1-78.26,0A4,4,0,0,0,84,165.1a79.71,79.71,0,0,0-21.79,21.31A87.66,87.66,0,0,1,40.37,136h15.4a8.2,8.2,0,0,0,6.69-3.28,8,8,0,0,0-.8-10.38l-24-24a8,8,0,0,0-11.32,0l-24,24a8,8,0,0,0-.8,10.38A8.2,8.2,0,0,0,8.23,136H24.3a104,104,0,0,0,188.18,52.67A8,8,0,0,0,210.16,177.18Zm45.23-52.24A8,8,0,0,0,248,120H231.7A104,104,0,0,0,43.52,67.33a8,8,0,0,0,13,9.34A88,88,0,0,1,215.63,120H200a8,8,0,0,0-5.66,13.66l24,24a8,8,0,0,0,11.32,0l24-24A8,8,0,0,0,255.39,124.94Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CropFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM120,80h48a8,8,0,0,1,8,8v48a8,8,0,0,1-16,0V96H120a8,8,0,0,1,0-16Zm72,96H176v16a8,8,0,0,1-16,0V176H88a8,8,0,0,1-8-8V96H64a8,8,0,0,1,0-16H80V64a8,8,0,0,1,16,0v96h96a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.GrainsFill">M208,56a87.52,87.52,0,0,0-31.84,6c-14.32-29.7-43.25-44.46-44.57-45.13a8,8,0,0,0-7.16,0C123.1,17.51,94.17,32.27,79.85,62A87.52,87.52,0,0,0,48,56a8,8,0,0,0-8,8v80a88.12,88.12,0,0,0,75.48,87.1,4,4,0,0,0,4.52-4V176.27a8.17,8.17,0,0,1,7.47-8.25,8,8,0,0,1,8.53,8v51.14a4,4,0,0,0,4.52,4A88.12,88.12,0,0,0,216,144V64A8,8,0,0,0,208,56Zm-88,93.46a88,88,0,0,0-64-37.09V72.44A72.1,72.1,0,0,1,120,144Zm8-42.1A88.61,88.61,0,0,0,94.16,69.11c9.21-19.21,26.4-31.33,33.84-35.9,7.45,4.58,24.63,16.7,33.84,35.9A88.61,88.61,0,0,0,128,107.36Zm72,5a88,88,0,0,0-64,37.09V144a72.1,72.1,0,0,1,64-71.56Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.AlignTopFill">M224,40a8,8,0,0,1-8,8H40a8,8,0,0,1,0-16H216A8,8,0,0,1,224,40ZM192,64H152a16,16,0,0,0-16,16v96a16,16,0,0,0,16,16h40a16,16,0,0,0,16-16V80A16,16,0,0,0,192,64Zm-88,0H64A16,16,0,0,0,48,80V216a16,16,0,0,0,16,16h40a16,16,0,0,0,16-16V80A16,16,0,0,0,104,64Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowElbowUpRightFill">M221.66,85.66l-48,48A8,8,0,0,1,160,128V88H80V224a8,8,0,0,1-16,0V80a8,8,0,0,1,8-8h88V32a8,8,0,0,1,13.66-5.66l48,48A8,8,0,0,1,221.66,85.66Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowLineDownLeftFill">M232,48a8,8,0,0,1-8,8H48a8,8,0,0,1,0-16H224A8,8,0,0,1,232,48ZM178.34,90.34,120,148.69,77.66,106.34A8,8,0,0,0,64,112v96a8,8,0,0,0,8,8h96a8,8,0,0,0,5.66-13.66L131.31,160l58.35-58.34a8,8,0,0,0-11.32-11.32Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.HandshakeFill">M254.3,107.91,228.78,56.85a16,16,0,0,0-21.47-7.15L182.44,62.13,130.05,48.27a8.14,8.14,0,0,0-4.1,0L73.56,62.13,48.69,49.7a16,16,0,0,0-21.47,7.15L1.7,107.9a16,16,0,0,0,7.15,21.47l27,13.51,55.49,39.63a8.06,8.06,0,0,0,2.71,1.25l64,16a8,8,0,0,0,7.6-2.1l40-40,15.08-15.08,26.42-13.21a16,16,0,0,0,7.15-21.46Zm-54.89,33.37L165,113.72a8,8,0,0,0-10.68.61C136.51,132.27,116.66,130,104,122L147.24,80h31.81l27.21,54.41Zm-41.87,41.86L99.42,168.61l-49.2-35.14,28-56L128,64.28l9.8,2.59-45,43.68-.08.09a16,16,0,0,0,2.72,24.81c20.56,13.13,45.37,11,64.91-5L188,152.66Zm-25.72,34.8a8,8,0,0,1-7.75,6.06,8.13,8.13,0,0,1-1.95-.24L80.41,213.33a7.89,7.89,0,0,1-2.71-1.25L51.35,193.26a8,8,0,0,1,9.3-13l25.11,17.94L126,208.24A8,8,0,0,1,131.82,217.94Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowsSplitFill">M229.66,189.66l-32,32a8,8,0,0,1-11.32,0l-32-32A8,8,0,0,1,160,176h24V139.31l-56-56-56,56V176H96a8,8,0,0,1,5.66,13.66l-32,32a8,8,0,0,1-11.32,0l-32-32A8,8,0,0,1,32,176H56V136a8,8,0,0,1,2.34-5.66L120,68.69V24a8,8,0,0,1,16,0V68.69l61.66,61.65A8,8,0,0,1,200,136v40h24a8,8,0,0,1,5.66,13.66Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FadersHorizontalFill">M184,80a8,8,0,0,1,8-8h24a8,8,0,0,1,0,16H192A8,8,0,0,1,184,80ZM40,88h96v16a8,8,0,0,0,8,8h16a8,8,0,0,0,8-8V56a8,8,0,0,0-8-8H144a8,8,0,0,0-8,8V72H40a8,8,0,0,0,0,16Zm176,80H128a8,8,0,0,0,0,16h88a8,8,0,0,0,0-16ZM96,144H80a8,8,0,0,0-8,8v16H40a8,8,0,0,0,0,16H72v16a8,8,0,0,0,8,8H96a8,8,0,0,0,8-8V152A8,8,0,0,0,96,144Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.RadioactiveFill">M116,128a12,12,0,1,1,12,12A12,12,0,0,1,116,128Zm-15.78,3.51A29,29,0,0,1,100,128a28,28,0,0,1,16.94-25.73,4,4,0,0,0,1.87-5.66L90.75,48a16,16,0,0,0-23.1-5.07,103.83,103.83,0,0,0-43.58,75.49,16.21,16.21,0,0,0,4.17,12.37A16,16,0,0,0,40,136H96.26A4,4,0,0,0,100.22,131.51Zm131.71-13.09a103.83,103.83,0,0,0-43.58-75.49A16,16,0,0,0,165.25,48L137.19,96.61a4,4,0,0,0,1.87,5.66A28,28,0,0,1,156,128a29,29,0,0,1-.22,3.51,4,4,0,0,0,4,4.49H216a16,16,0,0,0,11.76-5.21A16.21,16.21,0,0,0,231.93,118.42ZM150.8,151.48a4,4,0,0,0-5.91-1.15,28,28,0,0,1-33.78,0,4,4,0,0,0-5.91,1.15L77.25,199.91a16,16,0,0,0,7.12,22.52,104.24,104.24,0,0,0,87.26,0,16,16,0,0,0,7.12-22.52Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SkullFill">M128,16C70.65,16,24,60.86,24,116c0,34.1,18.27,66,48,84.28V216a16,16,0,0,0,16,16h8a4,4,0,0,0,4-4V200.27a8.17,8.17,0,0,1,7.47-8.25,8,8,0,0,1,8.53,8v28a4,4,0,0,0,4,4h16a4,4,0,0,0,4-4V200.27a8.17,8.17,0,0,1,7.47-8.25,8,8,0,0,1,8.53,8v28a4,4,0,0,0,4,4h8a16,16,0,0,0,16-16V200.28C213.73,182,232,150.1,232,116,232,60.86,185.35,16,128,16ZM92,152a20,20,0,1,1,20-20A20,20,0,0,1,92,152Zm72,0a20,20,0,1,1,20-20A20,20,0,0,1,164,152Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PlusFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM184,136H136v48a8,8,0,0,1-16,0V136H72a8,8,0,0,1,0-16h48V72a8,8,0,0,1,16,0v48h48a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SimCardFill">M213.66,82.34l-56-56A8,8,0,0,0,152,24H56A16,16,0,0,0,40,40V216a16,16,0,0,0,16,16H200a16,16,0,0,0,16-16V88A8,8,0,0,0,213.66,82.34ZM184,192a8,8,0,0,1-8,8H160a4,4,0,0,1-4-4V160.27a8.17,8.17,0,0,0-7.47-8.25,8,8,0,0,0-8.53,8v36a4,4,0,0,1-4,4H120a4,4,0,0,1-4-4V160.27a8.17,8.17,0,0,0-7.47-8.25,8,8,0,0,0-8.53,8v36a4,4,0,0,1-4,4H80a8,8,0,0,1-8-8V136a8,8,0,0,1,8-8h96a8,8,0,0,1,8,8Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SquareLogoFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32Zm0,176H48V48H208V208ZM168,96v64a8,8,0,0,1-8,8H96a8,8,0,0,1-8-8V96a8,8,0,0,1,8-8h64A8,8,0,0,1,168,96Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ReadCvLogoFill">M210.78,39.25l-130.25-23A16,16,0,0,0,62,29.23l-29.75,169a16,16,0,0,0,13,18.53l130.25,23a16,16,0,0,0,18.54-13l29.75-169A16,16,0,0,0,210.78,39.25ZM135.5,131.56a8,8,0,0,1-7.87,6.61,8.27,8.27,0,0,1-1.4-.12l-41.5-7.33A8,8,0,0,1,87.52,115L129,122.29A8,8,0,0,1,135.5,131.56Zm47-24.18a8,8,0,0,1-7.86,6.61,7.55,7.55,0,0,1-1.41-.13l-83-14.65a8,8,0,0,1,2.79-15.76l83,14.66A8,8,0,0,1,182.53,107.38Zm5.55-31.52a8,8,0,0,1-7.87,6.61,8.36,8.36,0,0,1-1.4-.12l-83-14.66a8,8,0,1,1,2.78-15.75l83,14.65A8,8,0,0,1,188.08,75.86Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CricketFill">M243.31,81.37,190.63,28.69a16,16,0,0,0-22.63,0L60.69,136a16,16,0,0,0,0,22.63l20.68,20.68-47,47a8,8,0,0,0,11.32,11.32l47-47,20.68,20.68a16,16,0,0,0,22.63,0L243.31,104a16,16,0,0,0,0-22.63ZM124.69,200,104,179.31l29.66-29.65a8,8,0,0,0-11.32-11.32L92.69,168,72,147.31,107.31,112H160v52.69ZM32,60A28,28,0,1,1,60,88,28,28,0,0,1,32,60Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CurrencyBtcFill">M176,152a16,16,0,0,1-16,16H112V136h48A16,16,0,0,1,176,152Zm64-24A104,104,0,1,1,136,24,104.11,104.11,0,0,1,240,128Zm-48,24a32,32,0,0,0-15.51-27.42A32,32,0,0,0,160,73V64a8,8,0,0,0-16,0v8H128V64a8,8,0,0,0-16,0v8H96a8,8,0,0,0,0,16v80a8,8,0,0,0,0,16h16v8a8,8,0,0,0,16,0v-8h16v8a8,8,0,0,0,16,0v-8A32,32,0,0,0,192,152Zm-24-48a16,16,0,0,0-16-16H112v32h40A16,16,0,0,0,168,104Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SpeakerSimpleLowFill">M168,32V224a8,8,0,0,1-12.91,6.31L85.25,176H40a16,16,0,0,1-16-16V96A16,16,0,0,1,40,80H85.25l69.84-54.31A8,8,0,0,1,168,32Zm32,64a8,8,0,0,0-8,8v48a8,8,0,0,0,16,0V104A8,8,0,0,0,200,96Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.LegoFill">M247.94,79.21a8,8,0,0,0-4.36-6.37L197.29,49.7C191.54,39.24,177.21,32,160,32c-22.43,0-40,12.3-40,28a20.77,20.77,0,0,0,1.06,6.53l-19.52,9.76A53.69,53.69,0,0,0,80,72c-22.43,0-40,12.3-40,28a20.77,20.77,0,0,0,1.06,6.53L12.42,120.84A8,8,0,0,0,8,128v64a8,8,0,0,0,4.42,7.16l64,32a8,8,0,0,0,7.16,0l160-80A8,8,0,0,0,248,144V80A4.54,4.54,0,0,0,247.94,79.21ZM80,151.06,33.89,128,51,119.45c7.24,5.29,17.48,8.55,29,8.55,22.43,0,40-12.3,40-28a21.77,21.77,0,0,0-4.35-12.88L131,79.45c7.24,5.29,17.48,8.55,29,8.55,18.38,0,33.49-8.26,38.35-19.88L222.11,80ZM160,48c12.23,0,21.69,5,23.63,10.12,0,.09.07.18.11.28A5.25,5.25,0,0,1,184,60c0,5.66-10.26,12-24,12-9.66,0-17.6-3.14-21.46-7a6.92,6.92,0,0,0-.86-.93A6.66,6.66,0,0,1,136,60C136,54.34,146.26,48,160,48ZM80,88a37,37,0,0,1,17.13,3.87,7.52,7.52,0,0,0,1,.56c3.69,2.21,5.87,5,5.87,7.57,0,5.66-10.26,12-24,12-9.67,0-17.61-3.14-21.47-7a7.5,7.5,0,0,0-.84-.93A6.62,6.62,0,0,1,56,100C56,94.34,66.26,88,80,88ZM24,140.94l48,24v46.12l-48-24Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ClockFill">M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24Zm56,112H128a8,8,0,0,1-8-8V72a8,8,0,0,1,16,0v48h48a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ButterflyFill">M128,100.17a108.42,108.42,0,0,0-8-12.64V56a8,8,0,0,1,16,0V87.53A108.42,108.42,0,0,0,128,100.17ZM232.7,50.48C229,45.7,221.84,40,209,40c-16.85,0-38.46,11.28-57.81,30.16A140.07,140.07,0,0,0,136,87.53V180a8,8,0,0,1-16,0V87.53a140.07,140.07,0,0,0-15.15-17.37C85.49,51.28,63.88,40,47,40,34.16,40,27,45.7,23.3,50.48c-6.82,8.77-12.18,24.08-.21,71.2,6.05,23.83,19.51,33,30.63,36.42A44,44,0,0,0,128,205.27a44,44,0,0,0,74.28-47.17c11.12-3.4,24.57-12.59,30.63-36.42C239.63,95.24,244.85,66.1,232.7,50.48Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.MaskHappyFill">M217,34.8a15.94,15.94,0,0,0-14.82-1.71C188.15,38.55,159.82,47.71,128,47.71S67.84,38.55,53.79,33.09A16,16,0,0,0,32,48v55.77c0,35.84,9.65,69.65,27.18,95.18,18.16,26.46,42.6,41,68.82,41s50.66-14.57,68.82-41C214.35,173.44,224,139.63,224,103.79V48A16,16,0,0,0,217,34.8ZM78,133.33A8,8,0,1,1,66,122.66C71.75,116.28,82.18,112,92,112s20.25,4.28,26,10.66A8,8,0,1,1,106,133.33c-2.68-3-8.85-5.33-14-5.33S80.64,130.34,78,133.33Zm90.49,47.86a52.9,52.9,0,0,1-80.9,0A8,8,0,1,1,99.72,170.8a36.89,36.89,0,0,0,56.56,0,8,8,0,0,1,12.17,10.39ZM189.34,134a8,8,0,0,1-11.3-.63c-2.68-3-8.85-5.33-14-5.33s-11.36,2.34-14,5.33A8,8,0,1,1,138,122.66c5.71-6.38,16.14-10.66,26-10.66s20.25,4.28,26,10.66A8,8,0,0,1,189.34,134Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.TagFill">M243.31,136,144,36.69A15.86,15.86,0,0,0,132.69,32H40a8,8,0,0,0-8,8v92.69A15.86,15.86,0,0,0,36.69,144L136,243.31a16,16,0,0,0,22.63,0l84.68-84.68a16,16,0,0,0,0-22.63ZM84,96A12,12,0,1,1,96,84,12,12,0,0,1,84,96Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ChatCenteredSlashFill">M232,56V184a15.93,15.93,0,0,1-4.82,11.42,4,4,0,0,1-5.68-.25L86.52,46.69a4,4,0,0,1,3-6.69H216A16,16,0,0,1,232,56ZM53.92,34.62A8,8,0,0,0,40,40h0A16,16,0,0,0,24,56V184a16,16,0,0,0,16,16h60.43l13.68,23.94a16,16,0,0,0,27.78,0L155.57,200h27.07l19.44,21.38a8,8,0,1,0,11.84-10.76Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.LastfmLogoFill">M216,40H40A16,16,0,0,0,24,56V200a16,16,0,0,0,16,16H216a16,16,0,0,0,16-16V56A16,16,0,0,0,216,40ZM184,184H172.61a40.09,40.09,0,0,1-36.42-23.45l-23-50.48A24,24,0,0,0,91.39,96H80a24,24,0,0,0-24,24v24a24,24,0,0,0,24,24h8a23.92,23.92,0,0,0,18.74-9,8,8,0,1,1,12.48,10A39.83,39.83,0,0,1,88,184H80a40,40,0,0,1-40-40V120A40,40,0,0,1,80,80H91.39a40.09,40.09,0,0,1,36.42,23.45l22.95,50.48A24,24,0,0,0,172.61,168H184a16,16,0,0,0,0-32h-8a28,28,0,0,1,0-56h12a20,20,0,0,1,20,20,8,8,0,0,1-16,0,4,4,0,0,0-4-4H176a12,12,0,0,0,0,24h8a32,32,0,0,1,0,64Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ListDashesFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM72,184H64a8,8,0,0,1,0-16h8a8,8,0,0,1,0,16Zm0-48H64a8,8,0,0,1,0-16h8a8,8,0,0,1,0,16Zm0-48H64a8,8,0,0,1,0-16h8a8,8,0,0,1,0,16Zm120,96H104a8,8,0,0,1,0-16h88a8,8,0,0,1,0,16Zm0-48H104a8,8,0,0,1,0-16h88a8,8,0,0,1,0,16Zm0-48H104a8,8,0,0,1,0-16h88a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SpotifyLogoFill">M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24Zm31.07,145.74a8,8,0,0,1-10.81,3.33,42.79,42.79,0,0,0-40.52,0,8,8,0,0,1-7.48-14.14,59.33,59.33,0,0,1,55.48,0A8,8,0,0,1,159.07,169.74Zm16-28a8,8,0,0,1-10.82,3.3,77.07,77.07,0,0,0-72.48,0,8,8,0,0,1-7.52-14.12,93,93,0,0,1,87.52,0A8,8,0,0,1,175.06,141.76Zm16-28a8,8,0,0,1-10.83,3.29,110.62,110.62,0,0,0-104.46,0,8,8,0,0,1-7.54-14.12,126.67,126.67,0,0,1,119.54,0A8,8,0,0,1,191.06,113.76Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CaretDoubleLeftFill">M203.06,40.61a8,8,0,0,0-8.72,1.73L128,108.69V48a8,8,0,0,0-13.66-5.66l-80,80a8,8,0,0,0,0,11.32l80,80A8,8,0,0,0,128,208V147.31l66.34,66.35A8,8,0,0,0,208,208V48A8,8,0,0,0,203.06,40.61Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.StorefrontFill">M231.69,93.81,217.35,43.6A16.07,16.07,0,0,0,202,32H54A16.07,16.07,0,0,0,38.65,43.6L24.31,93.81A7.94,7.94,0,0,0,24,96v16a40,40,0,0,0,16,32v72a8,8,0,0,0,8,8H208a8,8,0,0,0,8-8V144a40,40,0,0,0,16-32V96A7.94,7.94,0,0,0,231.69,93.81ZM88,112a24,24,0,0,1-35.12,21.26,7.88,7.88,0,0,0-1.82-1.06A24,24,0,0,1,40,112v-8H88Zm64,0a24,24,0,0,1-48,0v-8h48Zm64,0a24,24,0,0,1-11.07,20.2,8.08,8.08,0,0,0-1.8,1.05A24,24,0,0,1,168,112v-8h48Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.MouseScrollFill">M144,16H112A64.07,64.07,0,0,0,48,80v96a64.07,64.07,0,0,0,64,64h32a64.07,64.07,0,0,0,64-64V80A64.07,64.07,0,0,0,144,16Zm2.34,146.34a8,8,0,0,1,11.32,11.32l-24,24a8,8,0,0,1-11.32,0l-24-24a8,8,0,0,1,11.32-11.32L120,172.69V83.31L109.66,93.66A8,8,0,0,1,98.34,82.34l24-24a8,8,0,0,1,11.32,0l24,24a8,8,0,0,1-11.32,11.32L136,83.31v89.38Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BellSimpleFill">M168,224a8,8,0,0,1-8,8H96a8,8,0,1,1,0-16h64A8,8,0,0,1,168,224Zm53.81-48.06C216.25,166.38,208,139.33,208,104a80,80,0,1,0-160,0c0,35.34-8.26,62.38-13.81,71.94A16,16,0,0,0,48,200H208a16,16,0,0,0,13.8-24.06Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BracketsAngleFill">M216,40H40A16,16,0,0,0,24,56V200a16,16,0,0,0,16,16H216a16,16,0,0,0,16-16V56A16,16,0,0,0,216,40ZM103,180A8,8,0,0,1,89.05,188l-32-56a8,8,0,0,1,0-7.94l32-56A8,8,0,0,1,103,76L73.21,128ZM199,132l-32,56a8,8,0,0,1-13.9-7.94l29.74-52L153.05,76A8,8,0,1,1,167,68l32,56A8,8,0,0,1,199,132Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BasketballFill">M63.6,46.39a103.48,103.48,0,0,1,52-21.65,4,4,0,0,1,4.45,4V120H95.7A103.77,103.77,0,0,0,63.38,52.44,4,4,0,0,1,63.6,46.39ZM46,64.07a103.51,103.51,0,0,0-21.29,51.46,4,4,0,0,0,4,4.47H79.63A87.86,87.86,0,0,0,51.89,63.59,4,4,0,0,0,46,64.07ZM192.4,46.39a103.48,103.48,0,0,0-52-21.65,4,4,0,0,0-4.45,4V120h24.3a103.77,103.77,0,0,1,32.32-67.56A4,4,0,0,0,192.4,46.39Zm38.86,69.14A103.51,103.51,0,0,0,210,64.07a4,4,0,0,0-5.86-.48A87.86,87.86,0,0,0,176.37,120h50.91A4,4,0,0,0,231.26,115.53ZM24.74,140.47A103.51,103.51,0,0,0,46,191.93a4,4,0,0,0,5.86.48A87.86,87.86,0,0,0,79.63,136H28.72A4,4,0,0,0,24.74,140.47ZM210,191.93a103.51,103.51,0,0,0,21.29-51.46,4,4,0,0,0-4-4.47H176.37a87.86,87.86,0,0,0,27.74,56.41A4,4,0,0,0,210,191.93ZM63.6,209.61a103.48,103.48,0,0,0,52,21.65,4,4,0,0,0,4.45-4V136H95.7a103.77,103.77,0,0,1-32.32,67.56A4,4,0,0,0,63.6,209.61ZM160.3,136H136v91.28a4,4,0,0,0,4.45,4,103.48,103.48,0,0,0,52-21.65,4,4,0,0,0,.22-6.05A103.77,103.77,0,0,1,160.3,136Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.MapPinPlusFill">M128,16a88.1,88.1,0,0,0-88,88c0,31.4,14.51,64.68,42,96.25a254.19,254.19,0,0,0,41.45,38.3,8,8,0,0,0,9.18,0A254.19,254.19,0,0,0,174,200.25c27.45-31.57,42-64.85,42-96.25A88.1,88.1,0,0,0,128,16Zm32,96H136v24a8,8,0,0,1-16,0V112H96a8,8,0,0,1,0-16h24V72a8,8,0,0,1,16,0V96h24a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PhoneXFill">M146.34,98.34,164.69,80,146.34,61.66a8,8,0,0,1,11.32-11.32L176,68.69l18.34-18.35a8,8,0,0,1,11.32,11.32L187.32,80l18.34,18.34a8,8,0,0,1-11.32,11.32L176,91.31l-18.34,18.35a8,8,0,0,1-11.32-11.32Zm68,68.12-47.11-21.11-.13-.06a16,16,0,0,0-15.17,1.4,8.12,8.12,0,0,0-.75.56L126.87,168c-15.42-7.49-31.34-23.29-38.83-38.51l20.78-24.71c.2-.25.39-.5.57-.77a16,16,0,0,0,1.32-15.06l0-.12L89.54,41.64a16,16,0,0,0-16.62-9.52A56.26,56.26,0,0,0,24,88c0,79.4,64.6,144,144,144a56.26,56.26,0,0,0,55.88-48.92A16,16,0,0,0,214.37,166.46Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FlowerLotusFill">M245.83,121.63a15.53,15.53,0,0,0-9.52-7.33,73.55,73.55,0,0,0-22.17-2.22c4-19.85,1-35.55-2-44.86a16.17,16.17,0,0,0-18.8-10.88,85.53,85.53,0,0,0-28.55,12.12,94.58,94.58,0,0,0-27.11-33.25,16.05,16.05,0,0,0-19.26,0A94.58,94.58,0,0,0,91.26,68.46,85.53,85.53,0,0,0,62.71,56.34,16.14,16.14,0,0,0,43.92,67.22c-3,9.31-6,25-2.06,44.86a73.55,73.55,0,0,0-22.17,2.22,15.53,15.53,0,0,0-9.52,7.33,16,16,0,0,0-1.6,12.26c3.39,12.58,13.8,36.49,45.33,55.33S113.13,208,128.05,208s42.67,0,74-18.78c31.53-18.84,41.94-42.75,45.33-55.33A16,16,0,0,0,245.83,121.63ZM62.1,175.49C35.47,159.57,26.82,140.05,24,129.7a59.61,59.61,0,0,1,22.5-1.17,129.08,129.08,0,0,0,9.15,19.41,142.28,142.28,0,0,0,34,39.56A114.92,114.92,0,0,1,62.1,175.49ZM128,190.4c-9.33-6.94-32-28.23-32-71.23C96,76.7,118.38,55.24,128,48c9.62,7.26,32,28.72,32,71.19C160,162.17,137.33,183.46,128,190.4Zm104-60.68c-2.77,10.24-11.4,29.81-38.09,45.77a114.92,114.92,0,0,1-27.55,12,142.28,142.28,0,0,0,34-39.56,129.08,129.08,0,0,0,9.15-19.41A59.69,59.69,0,0,1,232,129.71Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ShieldPlusFill">M208,40H48A16,16,0,0,0,32,56v56c0,52.72,25.52,84.67,46.93,102.19,23.06,18.86,46,25.27,47,25.53a8,8,0,0,0,4.2,0c1-.26,23.91-6.67,47-25.53C198.48,196.67,224,164.72,224,112V56A16,16,0,0,0,208,40Zm-48,96H136v24a8,8,0,0,1-16,0V136H96a8,8,0,0,1,0-16h24V96a8,8,0,0,1,16,0v24h24a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowSquareUpFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32Zm-42.34,93.66a8,8,0,0,1-11.32,0L136,107.31V168a8,8,0,0,1-16,0V107.31l-18.34,18.35a8,8,0,0,1-11.32-11.32l32-32a8,8,0,0,1,11.32,0l32,32A8,8,0,0,1,165.66,125.66Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PushPinSimpleSlashFill">M79.25,38.69a4,4,0,0,1,3-6.69H192a8,8,0,0,1,8,8.53A8.17,8.17,0,0,1,191.73,48h-6.19L206.7,167.91a4,4,0,0,1-6.9,3.39ZM213.92,210.62l-160-176A8,8,0,1,0,42.08,45.38L66.24,72,49.29,168H40a8,8,0,0,0,0,16h80v56a8,8,0,0,0,16,0V184h32.1l34,37.38a8,8,0,1,0,11.84-10.76Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.WarningCircleFill">M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24Zm-8,56a8,8,0,0,1,16,0v56a8,8,0,0,1-16,0Zm8,104a12,12,0,1,1,12-12A12,12,0,0,1,128,184Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CloudFill">M160.06,40A88.1,88.1,0,0,0,81.29,88.67h0A87.48,87.48,0,0,0,72,127.73,8.18,8.18,0,0,1,64.57,136,8,8,0,0,1,56,128a103.66,103.66,0,0,1,5.34-32.92,4,4,0,0,0-4.75-5.18A64.09,64.09,0,0,0,8,152c0,35.19,29.75,64,65,64H160a88.09,88.09,0,0,0,87.93-91.48C246.11,77.54,207.07,40,160.06,40Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.RewindCircleFill">M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24Zm56,140a8,8,0,0,1-12.8,6.4l-48-36A8,8,0,0,1,120,128v36a8,8,0,0,1-12.8,6.4l-48-36a8,8,0,0,1,0-12.8l48-36A8,8,0,0,1,120,92v36a8,8,0,0,1,3.2-6.4l48-36A8,8,0,0,1,184,92Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FootballFill">M229.06,53.89a32.92,32.92,0,0,0-26.95-26.95c-32.38-5.49-93.39-8-138.27,36.9s-42.39,105.9-36.9,138.27a32.92,32.92,0,0,0,27,26.95A206.58,206.58,0,0,0,88.27,232c32.09,0,72.05-8,103.89-39.84C237.05,147.28,234.55,86.26,229.06,53.89ZM56.56,213.3A16.94,16.94,0,0,1,42.7,199.44a180.27,180.27,0,0,1-2.11-46.9l62.87,62.87A180.27,180.27,0,0,1,56.56,213.3ZM165.64,101.67,151.3,116l6.34,6.34a8,8,0,1,1-11.31,11.3L140,127.31,127.31,140l6.34,6.34a8,8,0,1,1-11.3,11.31L116,151.3l-14.34,14.34a8,8,0,1,1-11.31-11.31L104.7,140l-6.34-6.34a8,8,0,0,1,11.31-11.3l6.34,6.34L128.69,116l-6.34-6.34a8,8,0,0,1,11.3-11.31L140,104.7l14.34-14.34a8,8,0,1,1,11.31,11.31Zm49.77,1.79L152.54,40.59c4.76-.44,9.72-.69,14.91-.69a192,192,0,0,1,32,2.8A16.94,16.94,0,0,1,213.3,56.56,180.27,180.27,0,0,1,215.41,103.46Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.HandWithdrawFill">M128,56H112V16a8,8,0,0,1,16,0Zm64,67.62V72a16,16,0,0,0-16-16H128v60.69l18.34-18.35a8,8,0,0,1,11.32,11.32l-32,32a8,8,0,0,1-11.32,0l-32-32A8,8,0,0,1,93.66,98.34L112,116.69V56H64A16,16,0,0,0,48,72V200a8,8,0,0,0,8,8h74.7c.32.67.67,1.34,1.05,2l.24.38,22.26,34a8,8,0,0,0,13.39-8.76l-22.13-33.79A12,12,0,0,1,166.4,190c.07.13.15.26.23.38l10.68,16.31A8,8,0,0,0,192,202.31V144a74.84,74.84,0,0,1,24,54.69V240a8,8,0,0,0,16,0V198.65A90.89,90.89,0,0,0,192,123.62Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BellZFill">M221.8,175.94C216.25,166.38,208,139.33,208,104a80,80,0,1,0-160,0c0,35.34-8.26,62.38-13.81,71.94A16,16,0,0,0,48,200H88.81a40,40,0,0,0,78.38,0H208a16,16,0,0,0,13.8-24.06ZM128,216a24,24,0,0,1-22.62-16h45.24A24,24,0,0,1,128,216Zm16-64H112a8,8,0,0,1-6.65-12.44L129.05,104H112a8,8,0,0,1,0-16h32a8,8,0,0,1,6.65,12.44L127,136h17a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.GasCanFill">M200,24H123.31A15.86,15.86,0,0,0,112,28.69L101.66,39,91.31,28.69a16,16,0,0,0-22.62,0l-24,24a16,16,0,0,0,0,22.62L55,85.66,44.69,96A15.86,15.86,0,0,0,40,107.31V216a16,16,0,0,0,16,16H200a16,16,0,0,0,16-16V40A16,16,0,0,0,200,24ZM56,64,80,40,90.34,50.34l-24,24ZM180.8,185.6a8,8,0,1,1-9.6,12.8L128,166,84.8,198.4a8,8,0,0,1-9.6-12.8L114.67,156,75.2,126.4a8,8,0,0,1,9.6-12.8L128,146l43.2-32.4a8,8,0,0,1,9.6,12.8L141.33,156ZM176,72H136a8,8,0,0,1,0-16h40a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.MusicNotesFill">M212.92,17.71a7.89,7.89,0,0,0-6.86-1.46l-128,32A8,8,0,0,0,72,56V166.1A36,36,0,1,0,88,196V102.25l112-28V134.1A36,36,0,1,0,216,164V24A8,8,0,0,0,212.92,17.71Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CrossFill">M216,92v24a16,16,0,0,1-16,16H156v92a16,16,0,0,1-16,16H116a16,16,0,0,1-16-16V132H56a16,16,0,0,1-16-16V92A16,16,0,0,1,56,76h44V32a16,16,0,0,1,16-16h24a16,16,0,0,1,16,16V76h44A16,16,0,0,1,216,92Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.TrendDownFill">M240,128v64a8,8,0,0,1-8,8H168a8,8,0,0,1-5.66-13.66L188.69,160,136,107.31l-34.34,34.35a8,8,0,0,1-11.32,0l-72-72A8,8,0,0,1,29.66,58.34L96,124.69l34.34-34.35a8,8,0,0,1,11.32,0L200,148.69l26.34-26.35A8,8,0,0,1,240,128Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.NumpadFill">M200,24H56A16,16,0,0,0,40,40V216a16,16,0,0,0,16,16H200a16,16,0,0,0,16-16V40A16,16,0,0,0,200,24ZM80,164a12,12,0,1,1,12-12A12,12,0,0,1,80,164Zm0-40a12,12,0,1,1,12-12A12,12,0,0,1,80,124Zm0-40A12,12,0,1,1,92,72,12,12,0,0,1,80,84Zm48,120a12,12,0,1,1,12-12A12,12,0,0,1,128,204Zm0-40a12,12,0,1,1,12-12A12,12,0,0,1,128,164Zm0-40a12,12,0,1,1,12-12A12,12,0,0,1,128,124Zm0-40a12,12,0,1,1,12-12A12,12,0,0,1,128,84Zm48,80a12,12,0,1,1,12-12A12,12,0,0,1,176,164Zm0-40a12,12,0,1,1,12-12A12,12,0,0,1,176,124Zm0-40a12,12,0,1,1,12-12A12,12,0,0,1,176,84Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.StickerFill">M168,32H88A56.06,56.06,0,0,0,32,88v80a56.06,56.06,0,0,0,56,56h48a8.07,8.07,0,0,0,2.53-.41c26.23-8.75,76.31-58.83,85.06-85.06A8.07,8.07,0,0,0,224,136V88A56.06,56.06,0,0,0,168,32ZM136,207.42V176a40,40,0,0,1,40-40h31.42C198.16,157.55,157.55,198.16,136,207.42Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.DesktopTowerFill">M120,76V188a4,4,0,0,1-4,4H96v16h15.73a8.18,8.18,0,0,1,8.25,7.47,8,8,0,0,1-8,8.53H64.27A8.18,8.18,0,0,1,56,216.53,8,8,0,0,1,64,208H80V192H32A24,24,0,0,1,8,168V96A24,24,0,0,1,32,72h84A4,4,0,0,1,120,76ZM248,48V208a16,16,0,0,1-16,16H152a16,16,0,0,1-16-16V48a16,16,0,0,1,16-16h80A16,16,0,0,1,248,48ZM203.9,181.57a12,12,0,1,0-10.34,10.33A12,12,0,0,0,203.9,181.57ZM224,103.47A8.18,8.18,0,0,0,215.73,96H168.27a8.18,8.18,0,0,0-8.25,7.47,8,8,0,0,0,8,8.53h48A8,8,0,0,0,224,103.47Zm0-32A8.18,8.18,0,0,0,215.73,64H168.27A8.18,8.18,0,0,0,160,71.47,8,8,0,0,0,168,80h48A8,8,0,0,0,224,71.47Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.NumberOneFill">M200,24H56A16,16,0,0,0,40,40V216a16,16,0,0,0,16,16H200a16,16,0,0,0,16-16V40A16,16,0,0,0,200,24ZM144,184a8,8,0,0,1-16,0V84.94L107.58,95.16a8,8,0,1,1-7.16-14.32l32-16A8,8,0,0,1,144,72Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BluetoothXFill">M184,176a8,8,0,0,1-3.2,6.4l-64,48A8,8,0,0,1,112,232a7.9,7.9,0,0,1-4.11-1.14,8.3,8.3,0,0,1-3.9-7.18V144L52.76,182.4a8,8,0,0,1-11.16-1.55,8.26,8.26,0,0,1,1.8-11.43L98.66,128,43.38,86.57a8.19,8.19,0,0,1-2.13-10.93,8,8,0,0,1,11.51-2L104,112V32.24a8.21,8.21,0,0,1,2.83-6.34,8,8,0,0,1,10-.3l33.62,25.2A4,4,0,0,1,152,54v52a4,4,0,0,1-1.6,3.2L125.34,128l55.5,41.6A8,8,0,0,1,184,176Zm53.47-77.87L219.37,80l18.11-18.11a8.21,8.21,0,0,0,.41-11.37,8,8,0,0,0-11.49-.18L208.05,68.69,189.93,50.58a8.23,8.23,0,0,0-10.83-.88,8,8,0,0,0-.73,12L196.73,80,178.58,98.13a8.2,8.2,0,0,0-.6,11.1,8,8,0,0,0,11.71.43l18.36-18.35,18.35,18.35a8,8,0,0,0,11.72-.43A8.21,8.21,0,0,0,237.51,98.13Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.TabsFill">M256,168a8,8,0,0,1-8,8H8A8,8,0,0,1,.37,165.6L22.63,91.4A15.89,15.89,0,0,1,38,80h84.1a15.89,15.89,0,0,1,15.32,11.4L158,160h15.3L150.79,85.15A4,4,0,0,1,154.62,80h15.43a16,16,0,0,1,15.32,11.4L206,160h15.3L198.79,85.15A4,4,0,0,1,202.62,80h15.43a16,16,0,0,1,15.32,11.4l22.26,74.18A8.11,8.11,0,0,1,256,168Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.NumberSquareFiveFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32Zm-84,80a36,36,0,0,1,0,72,35.54,35.54,0,0,1-25.71-10.4,8,8,0,1,1,11.42-11.2A19.73,19.73,0,0,0,124,168a20,20,0,0,0,0-40,19.73,19.73,0,0,0-14.29,5.6,8,8,0,0,1-13.6-6.92l8-48A8,8,0,0,1,112,72h40a8,8,0,0,1,0,16H118.78l-4.19,25.14A38.8,38.8,0,0,1,124,112Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowElbowRightFill">M240,80v72a8,8,0,0,1-13.66,5.66L196,127.31l-70.34,70.35a8,8,0,0,1-11.32,0l-96-96A8,8,0,0,1,29.66,90.34L120,180.69,184.69,116,154.34,85.66A8,8,0,0,1,160,72h72A8,8,0,0,1,240,80Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CellSignalXFill">M213.66,194.34a8,8,0,0,1-11.32,11.32L184,187.31l-18.34,18.35a8,8,0,0,1-11.32-11.32L172.69,176l-18.35-18.34a8,8,0,0,1,11.32-11.32L184,164.69l18.34-18.35a8,8,0,0,1,11.32,11.32L195.31,176ZM157.41,120.1a32,32,0,0,1,23.92,8.05,4,4,0,0,0,5.34,0,31.88,31.88,0,0,1,17.77-8,4,4,0,0,0,3.56-4V40.46a16.41,16.41,0,0,0-9.18-14.93,16,16,0,0,0-18.14,3.16l-160,160a16,16,0,0,0-3.17,18.13A16.4,16.4,0,0,0,32.46,216h93.6a4,4,0,0,0,3.78-5.3,32,32,0,0,1,6.31-32,4,4,0,0,0,0-5.34,32,32,0,0,1,21.26-53.23Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.HandHeartFill">M230.33,141.06a24.34,24.34,0,0,0-18.61-4.77C230.5,117.33,240,98.48,240,80c0-26.47-21.29-48-47.46-48A47.58,47.58,0,0,0,156,48.75,47.58,47.58,0,0,0,119.46,32C93.29,32,72,53.53,72,80c0,11,3.24,21.69,10.06,33a31.87,31.87,0,0,0-14.75,8.4L44.69,144H16A16,16,0,0,0,0,160v40a16,16,0,0,0,16,16H120a7.93,7.93,0,0,0,1.94-.24l64-16a6.94,6.94,0,0,0,1.19-.4L226,182.82l.44-.2a24.6,24.6,0,0,0,3.93-41.56Zm-10.9,27.15-38,16.18L119,200H56V155.31l22.63-22.62A15.86,15.86,0,0,1,89.94,128H140a12,12,0,0,1,0,24H112a8,8,0,0,0,0,16h32a8.32,8.32,0,0,0,1.79-.2l67-15.41.31-.08a8.6,8.6,0,0,1,6.3,15.9Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FileMinusFill">M213.66,82.34l-56-56A8,8,0,0,0,152,24H56A16,16,0,0,0,40,40V216a16,16,0,0,0,16,16H200a16,16,0,0,0,16-16V88A8,8,0,0,0,213.66,82.34ZM152,160H104a8,8,0,0,1,0-16h48a8,8,0,0,1,0,16Zm0-72V43.31L196.69,88Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PhonePauseFill">M223.88,183.08A56.26,56.26,0,0,1,168,232C88.6,232,24,167.4,24,88A56.26,56.26,0,0,1,72.92,32.12a16,16,0,0,1,16.62,9.52l21.12,47.15,0,.12A16,16,0,0,1,109.39,104c-.18.27-.37.52-.57.77L88,129.45c7.49,15.22,23.41,31,38.83,38.51l24.34-20.71a8.12,8.12,0,0,1,.75-.56,16,16,0,0,1,15.18-1.4l.12.06,47.1,21.11A16,16,0,0,1,223.88,183.08ZM200,112a8,8,0,0,0,8-8V48a8,8,0,0,0-16,0v56A8,8,0,0,0,200,112Zm-40,0a8,8,0,0,0,8-8V48a8,8,0,0,0-16,0v56A8,8,0,0,0,160,112Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.MicroscopeFill">M232,216a8,8,0,0,1-8,8H32a8,8,0,0,1,0-16H181.25A72,72,0,0,0,144,80.46V136a16,16,0,0,1-16,16H80a16,16,0,0,1-16-16V32A16,16,0,0,1,80,16h48a16,16,0,0,1,16,16V64.37A88.05,88.05,0,0,1,203.94,208H224A8,8,0,0,1,232,216Zm-96-32a8,8,0,0,0,0-16H72a8,8,0,0,0,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FlameFill">M173.79,51.48a221.25,221.25,0,0,0-41.67-34.34,8,8,0,0,0-8.24,0A221.25,221.25,0,0,0,82.21,51.48C54.59,80.48,40,112.47,40,144a88,88,0,0,0,176,0C216,112.47,201.41,80.48,173.79,51.48ZM96,184c0-27.67,22.53-47.28,32-54.3,9.48,7,32,26.63,32,54.3a32,32,0,0,1-64,0Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PlusCircleFill">M128,24A104,104,0,1,0,232,128,104.13,104.13,0,0,0,128,24Zm40,112H136v32a8,8,0,0,1-16,0V136H88a8,8,0,0,1,0-16h32V88a8,8,0,0,1,16,0v32h32a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BatteryVerticalMediumFill">M88,8a8,8,0,0,1,8-8h64a8,8,0,0,1,0,16H96A8,8,0,0,1,88,8ZM200,56V224a24,24,0,0,1-24,24H80a24,24,0,0,1-24-24V56A24,24,0,0,1,80,32h96A24,24,0,0,1,200,56Zm-16,0a8,8,0,0,0-8-8H80a8,8,0,0,0-8,8V224a8,8,0,0,0,8,8h96a8,8,0,0,0,8-8Zm-24,88H96a8,8,0,0,0-8,8v56a8,8,0,0,0,8,8h64a8,8,0,0,0,8-8V152A8,8,0,0,0,160,144Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SprayBottleFill">M200,80a8,8,0,0,0,8-8,56.06,56.06,0,0,0-56-56H80A16,16,0,0,0,64,32V80a24,24,0,0,1-24,24,8,8,0,0,0,0,16A40,40,0,0,0,80,80h32v24.62a23.87,23.87,0,0,1-9,18.74L87,136.15a39.79,39.79,0,0,0-15,31.23V224a16,16,0,0,0,16,16H192a16,16,0,0,0,16-16V211.47A270.88,270.88,0,0,0,174,80ZM80,32h72a40.08,40.08,0,0,1,39.2,32H80Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CodeBlockFill">M200,40H168a16,16,0,0,0-16-16H32A16,16,0,0,0,16,40v80a16,16,0,0,0,16,16h8v64a16,16,0,0,0,16,16H200a16,16,0,0,0,16-16V56A16,16,0,0,0,200,40ZM106.34,61.66a8,8,0,0,1,11.32-11.32l24,24a8,8,0,0,1,0,11.32l-24,24a8,8,0,0,1-11.32-11.32L124.69,80Zm-64,24a8,8,0,0,1,0-11.32l24-24A8,8,0,0,1,77.66,61.66L59.31,80,77.66,98.34a8,8,0,0,1-11.32,11.32ZM200,200H56V136h96a16,16,0,0,0,16-16V56h32Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowLineLeftFill">M232,128a8,8,0,0,1-8,8H152v64a8,8,0,0,1-13.66,5.66l-72-72a8,8,0,0,1,0-11.32l72-72A8,8,0,0,1,152,56v64h72A8,8,0,0,1,232,128ZM40,32a8,8,0,0,0-8,8V216a8,8,0,0,0,16,0V40A8,8,0,0,0,40,32Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.UserCheckFill">M253.66,133.66l-32,32a8,8,0,0,1-11.32,0l-16-16a8,8,0,0,1,11.32-11.32L216,148.69l26.34-26.35a8,8,0,0,1,11.32,11.32ZM144,157.68a68,68,0,1,0-71.9,0c-20.65,6.76-39.23,19.39-54.17,37.17A8,8,0,0,0,24,208H192a8,8,0,0,0,6.13-13.15C183.18,177.07,164.6,164.44,144,157.68Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.HandbagFill">M239.89,198.12l-14.26-120a16,16,0,0,0-16-14.12H176a48,48,0,0,0-96,0H46.33a16,16,0,0,0-16,14.12l-14.26,120A16,16,0,0,0,20,210.6a16.13,16.13,0,0,0,12,5.4H223.92A16.13,16.13,0,0,0,236,210.6,16,16,0,0,0,239.89,198.12ZM96,104a8,8,0,0,1-16,0V88a8,8,0,0,1,16,0Zm32-72a32,32,0,0,1,32,32H96A32,32,0,0,1,128,32Zm48,72a8,8,0,0,1-16,0V88a8,8,0,0,1,16,0Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SealWarningFill">M225.86,102.82c-3.77-3.94-7.67-8-9.14-11.57-1.36-3.27-1.44-8.69-1.52-13.94-.15-9.76-.31-20.82-8-28.51s-18.75-7.85-28.51-8c-5.25-.08-10.67-.16-13.94-1.52-3.56-1.47-7.63-5.37-11.57-9.14C146.28,23.51,138.44,16,128,16s-18.27,7.51-25.18,14.14c-3.94,3.77-8,7.67-11.57,9.14C88,40.64,82.56,40.72,77.31,40.8c-9.76.15-20.82.31-28.51,8S41,67.55,40.8,77.31c-.08,5.25-.16,10.67-1.52,13.94-1.47,3.56-5.37,7.63-9.14,11.57C23.51,109.72,16,117.56,16,128s7.51,18.27,14.14,25.18c3.77,3.94,7.67,8,9.14,11.57,1.36,3.27,1.44,8.69,1.52,13.94.15,9.76.31,20.82,8,28.51s18.75,7.85,28.51,8c5.25.08,10.67.16,13.94,1.52,3.56,1.47,7.63,5.37,11.57,9.14C109.72,232.49,117.56,240,128,240s18.27-7.51,25.18-14.14c3.94-3.77,8-7.67,11.57-9.14,3.27-1.36,8.69-1.44,13.94-1.52,9.76-.15,20.82-.31,28.51-8s7.85-18.75,8-28.51c.08-5.25.16-10.67,1.52-13.94,1.47-3.56,5.37-7.63,9.14-11.57C232.49,146.28,240,138.44,240,128S232.49,109.73,225.86,102.82ZM120,80a8,8,0,0,1,16,0v56a8,8,0,0,1-16,0Zm8,104a12,12,0,1,1,12-12A12,12,0,0,1,128,184Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.WechatLogoFill">M232.07,186.76A80,80,0,0,0,169.58,72.59,80,80,0,1,0,23.93,138.76l-7.27,24.71a16,16,0,0,0,19.87,19.87l24.71-7.27a79,79,0,0,0,25.19,7.35,80,80,0,0,0,108.33,40.65l24.71,7.27a16,16,0,0,0,19.87-19.87ZM132,152a12,12,0,1,1,12-12A12,12,0,0,1,132,152Zm-52,0a80.32,80.32,0,0,0,1.3,14.3,63.45,63.45,0,0,1-15.49-5.85,8,8,0,0,0-6-.63L32,168l8.17-27.76a8,8,0,0,0-.63-6A64,64,0,0,1,151.68,72.43,80.12,80.12,0,0,0,80,152Zm108,0a12,12,0,1,1,12-12A12,12,0,0,1,188,152Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CornersOutFill">M216,48V88a8,8,0,0,1-13.66,5.66l-40-40A8,8,0,0,1,168,40h40A8,8,0,0,1,216,48ZM53.66,162.34A8,8,0,0,0,40,168v40a8,8,0,0,0,8,8H88a8,8,0,0,0,5.66-13.66Zm157.4-1.73a8,8,0,0,0-8.72,1.73l-40,40A8,8,0,0,0,168,216h40a8,8,0,0,0,8-8V168A8,8,0,0,0,211.06,160.61ZM88,40H48a8,8,0,0,0-8,8V88a8,8,0,0,0,13.66,5.66l40-40A8,8,0,0,0,88,40Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.DotsThreeFill">M224,80H32A16,16,0,0,0,16,96v64a16,16,0,0,0,16,16H224a16,16,0,0,0,16-16V96A16,16,0,0,0,224,80ZM60,140a12,12,0,1,1,12-12A12,12,0,0,1,60,140Zm68,0a12,12,0,1,1,12-12A12,12,0,0,1,128,140Zm68,0a12,12,0,1,1,12-12A12,12,0,0,1,196,140Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CrownSimpleFill">M239.75,90.81c0,.11,0,.21-.07.32L217,195a16,16,0,0,1-15.72,13H54.71A16,16,0,0,1,39,195L16.32,91.13c0-.11-.05-.21-.07-.32A16,16,0,0,1,44,77.39l33.67,36.29,35.8-80.29a1,1,0,0,0,0-.1,16,16,0,0,1,29.06,0,1,1,0,0,0,0,.1l35.8,80.29L212,77.39a16,16,0,0,1,27.71,13.42Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FactoryFill">M232,208h-8V136c0-.05,0-.09,0-.14s0-.29,0-.43,0-.28,0-.41a.76.76,0,0,0,0-.15l-15-105.13A16.08,16.08,0,0,0,193.06,16H174.94A16.08,16.08,0,0,0,159.1,29.74l-11.56,80.91L108.8,81.6A8,8,0,0,0,96,88v32L44.8,81.6A8,8,0,0,0,32,88V208H24a8,8,0,0,0,0,16H232a8,8,0,0,0,0-16ZM108,184H80a8,8,0,0,1,0-16h28a8,8,0,0,1,0,16Zm68,0H148a8,8,0,0,1,0-16h28a8,8,0,0,1,0,16Zm-5.33-56-8.53-6.4L174.94,32h18.12l13.72,96Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.HamburgerFill">M35.58,98.06a16,16,0,0,1-3.23-13.44C39.78,49.5,80,24,128,24s88.22,25.5,95.65,60.62A16,16,0,0,1,207.93,104H48.07A16,16,0,0,1,35.58,98.06Zm193.68,54.42-41.13,15L151,152.57a8,8,0,0,0-5.94,0l-37,14.81L71,152.57a8,8,0,0,0-5.7-.09l-44,16a8,8,0,0,0,5.47,15L40,178.69V184a40,40,0,0,0,40,40h96a40,40,0,0,0,40-40v-9.67l18.73-6.81a8,8,0,1,0-5.47-15ZM24,136H232a8,8,0,0,0,0-16H24a8,8,0,0,0,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CrownCrossFill">M128,83.22a53.86,53.86,0,0,0-8-10.06V40H104a8,8,0,0,1,0-16h16V8a8,8,0,0,1,16,0V24h16a8,8,0,0,1,0,16H136V73.16A53.86,53.86,0,0,0,128,83.22ZM180,56c-17.74,0-33.21,6.48-44,17.16V176a8,8,0,0,1-16,0V73.16C109.21,62.48,93.74,56,76,56a60.07,60.07,0,0,0-60,60c0,29.86,14.54,48.85,26.73,59.52A90.48,90.48,0,0,0,64,189.34V208a16,16,0,0,0,16,16h96a16,16,0,0,0,16-16V189.34a90.48,90.48,0,0,0,21.27-13.82C225.46,164.85,240,145.86,240,116A60.07,60.07,0,0,0,180,56Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.LogFill">M212,136a12,12,0,1,1-12-12A12,12,0,0,1,212,136Zm36,0c0,40.37-21.08,72-48,72H56c-26.92,0-48-31.63-48-72S29.08,64,56,64H92.69l37.65-37.66A8,8,0,0,1,136,24h32a8,8,0,0,1,0,16H139.31l-24,24H200C226.92,64,248,95.63,248,136Zm-144-8a8,8,0,0,0,0-16H33.26a8,8,0,1,0,0,16Zm50.91,32a8,8,0,0,0-8-8H80a8,8,0,0,0,0,16h66.91A8,8,0,0,0,154.91,160ZM232,136c0-30.36-14.65-56-32-56s-32,25.64-32,56,14.65,56,32,56S232,166.36,232,136Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.HeadphonesFill">M232,128v56a24,24,0,0,1-24,24H192a24,24,0,0,1-24-24V144a24,24,0,0,1,24-24h23.65a87.71,87.71,0,0,0-87-80H128a88,88,0,0,0-87.64,80H64a24,24,0,0,1,24,24v40a24,24,0,0,1-24,24H48a24,24,0,0,1-24-24V128A104.11,104.11,0,0,1,201.89,54.66,103.41,103.41,0,0,1,232,128Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.LockOpenFill">M208,80H96V56a32,32,0,0,1,32-32c15.37,0,29.2,11,32.16,25.59a8,8,0,0,0,15.68-3.18C171.32,24.15,151.2,8,128,8A48.05,48.05,0,0,0,80,56V80H48A16,16,0,0,0,32,96V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V96A16,16,0,0,0,208,80Zm-80,84a12,12,0,1,1,12-12A12,12,0,0,1,128,164Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CalendarDotFill">M208,32H184V24a8,8,0,0,0-16,0v8H88V24a8,8,0,0,0-16,0v8H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM128,168a16,16,0,1,1,16-16A16,16,0,0,1,128,168Zm80-88H48V48H72v8a8,8,0,0,0,16,0V48h80v8a8,8,0,0,0,16,0V48h24Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.MoneyFill">M168,128a40,40,0,1,1-40-40A40,40,0,0,1,168,128Zm80-64V192a8,8,0,0,1-8,8H16a8,8,0,0,1-8-8V64a8,8,0,0,1,8-8H240A8,8,0,0,1,248,64Zm-16,46.35A56.78,56.78,0,0,1,193.65,72H62.35A56.78,56.78,0,0,1,24,110.35v35.3A56.78,56.78,0,0,1,62.35,184h131.3A56.78,56.78,0,0,1,232,145.65Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.DownloadSimpleFill">M224,144v64a8,8,0,0,1-8,8H40a8,8,0,0,1-8-8V144a8,8,0,0,1,16,0v56H208V144a8,8,0,0,1,16,0Zm-101.66,5.66a8,8,0,0,0,11.32,0l40-40A8,8,0,0,0,168,96H136V32a8,8,0,0,0-16,0V96H88a8,8,0,0,0-5.66,13.66Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CalendarHeartFill">M208,32H184V24a8,8,0,0,0-16,0v8H88V24a8,8,0,0,0-16,0v8H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM72,64V56a8,8,0,0,1,16,0v8a8,8,0,0,1-16,0Zm82.56,103.07a143.52,143.52,0,0,1-24.77,16.51,4,4,0,0,1-3.58,0,143.52,143.52,0,0,1-24.77-16.51C84.56,153,76,138.51,76,124a28,28,0,0,1,52-14.41A28,28,0,0,1,180,124C180,138.51,171.44,153,154.56,167.07ZM184,64a8,8,0,0,1-16,0V56a8,8,0,0,1,16,0Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BuildingApartmentFill">M240,208h-8V72a8,8,0,0,0-8-8H184V40a8,8,0,0,0-8-8H80a8,8,0,0,0-8,8V96H32a8,8,0,0,0-8,8V208H16a8,8,0,0,0,0,16H240a8,8,0,0,0,0-16ZM80,176H64a8,8,0,0,1,0-16H80a8,8,0,0,1,0,16Zm0-32H64a8,8,0,0,1,0-16H80a8,8,0,0,1,0,16Zm64,64H112V168h32Zm-8-64H120a8,8,0,0,1,0-16h16a8,8,0,0,1,0,16Zm0-32H120a8,8,0,0,1,0-16h16a8,8,0,0,1,0,16Zm0-32H120a8,8,0,0,1,0-16h16a8,8,0,0,1,0,16Zm56,96H176a8,8,0,0,1,0-16h16a8,8,0,0,1,0,16Zm0-32H176a8,8,0,0,1,0-16h16a8,8,0,0,1,0,16Zm0-32H176a8,8,0,0,1,0-16h16a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowsLeftRightFill">M213.66,181.66l-32,32A8,8,0,0,1,168,208V184H48a8,8,0,0,1,0-16H168V144a8,8,0,0,1,13.66-5.66l32,32A8,8,0,0,1,213.66,181.66Zm-139.32-64A8,8,0,0,0,88,112V88H208a8,8,0,0,0,0-16H88V48a8,8,0,0,0-13.66-5.66l-32,32a8,8,0,0,0,0,11.32Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowURightUpFill">M223.39,83.06A8,8,0,0,1,216,88H176v80a64,64,0,0,1-128,0V80a8,8,0,0,1,16,0v88a48,48,0,0,0,96,0V88H120a8,8,0,0,1-5.66-13.66l48-48a8,8,0,0,1,11.32,0l48,48A8,8,0,0,1,223.39,83.06Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.MapPinLineFill">M200,224H150.54A266.56,266.56,0,0,0,174,200.25c27.45-31.57,42-64.85,42-96.25a88,88,0,0,0-176,0c0,31.4,14.51,64.68,42,96.25A266.56,266.56,0,0,0,105.46,224H56a8,8,0,0,0,0,16H200a8,8,0,0,0,0-16ZM128,72a32,32,0,1,1-32,32A32,32,0,0,1,128,72Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.DeviceTabletCameraFill">M192,24H64A24,24,0,0,0,40,48V208a24,24,0,0,0,24,24H192a24,24,0,0,0,24-24V48A24,24,0,0,0,192,24ZM128,80a12,12,0,1,1,12-12A12,12,0,0,1,128,80Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.RewindFill">M232,71.84V184.16a15.92,15.92,0,0,1-24.48,13.34L128,146.86v37.3a15.92,15.92,0,0,1-24.48,13.34L15.33,141.34a15.8,15.8,0,0,1,0-26.68L103.52,58.5A15.91,15.91,0,0,1,128,71.84v37.3L207.52,58.5A15.91,15.91,0,0,1,232,71.84Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BabyFill">M134.16,24.1a4,4,0,0,0-3.56,1.81C120.3,41.48,120,55.79,120,56a8,8,0,0,0,9.68,7.79A8.24,8.24,0,0,0,136,55.68,8,8,0,0,1,144.8,48a8.14,8.14,0,0,1,7.2,8.23,24,24,0,0,1-48-.27c0-.63.09-10.78,5.44-24a4,4,0,0,0-4.59-5.39A104.16,104.16,0,0,0,24.07,131.66C26,186.72,71.23,231,126.32,231.9a104,104,0,0,0,7.84-207.8ZM80,127.91a12,12,0,1,1,12,12A12,12,0,0,1,80,127.91Zm80.27,54.77a61,61,0,0,1-64.54,0,8,8,0,0,1,8.54-13.54,45,45,0,0,0,47.46,0,8,8,0,0,1,8.54,13.54ZM164,139.91a12,12,0,1,1,12-12A12,12,0,0,1,164,139.91Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CloudArrowUpFill">M247.93,124.52C246.11,77.54,207.07,40,160.06,40A88.1,88.1,0,0,0,81.29,88.67h0A87.48,87.48,0,0,0,72,127.73,8.18,8.18,0,0,1,64.57,136,8,8,0,0,1,56,128a103.66,103.66,0,0,1,5.34-32.92,4,4,0,0,0-4.75-5.18A64.09,64.09,0,0,0,8,152c0,35.19,29.75,64,65,64H160A88.09,88.09,0,0,0,247.93,124.52Zm-50.27,9.14a8,8,0,0,1-11.32,0L168,115.31V176a8,8,0,0,1-16,0V115.31l-18.34,18.35a8,8,0,0,1-11.32-11.32l32-32a8,8,0,0,1,11.32,0l32,32A8,8,0,0,1,197.66,133.66Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowLineUpLeftFill">M232,208a8,8,0,0,1-8,8H48a8,8,0,0,1,0-16H224A8,8,0,0,1,232,208ZM68.94,151.39a8,8,0,0,0,8.72-1.73L120,107.31l58.34,58.35a8,8,0,0,0,11.32-11.32L131.31,96l42.35-42.34A8,8,0,0,0,168,40H72a8,8,0,0,0-8,8v96A8,8,0,0,0,68.94,151.39Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SolarRoofFill">M247.16,124.42l-40-80A8,8,0,0,0,200,40H56a8,8,0,0,0-7.16,4.42l-40,80A8.08,8.08,0,0,0,8,128v56a16,16,0,0,0,16,16H232a16,16,0,0,0,16-16V128A8.08,8.08,0,0,0,247.16,124.42ZM99.06,56l12,24H80.94l-12-24Zm48,0,12,24H128.94l-12-24Zm-46.12,64-12-24h30.12l12,24Zm48,0-12-24h30.12l12,24Zm48,0-12-24h30.12l12,24Zm10.12-40H176.94l-12-24h30.12ZM104,184V136H232v48Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FeatherFill">M211.84,134.81l-59.79,60.47,0,0a15.75,15.75,0,0,1-11.2,4.68H75.32L45.66,229.66a8,8,0,0,1-11.32-11.32l22.59-22.58h0L124.7,128H209A4,4,0,0,1,211.84,134.81ZM216.7,30.57a64,64,0,0,0-85.9,4.14l-9.6,9.48A4,4,0,0,0,120,47v63l55-55a8,8,0,0,1,11.31,11.31L140.71,112h88.38a4,4,0,0,0,3.56-2.16A64.08,64.08,0,0,0,216.7,30.57ZM62.83,167.23,104,126.06V70.76a4,4,0,0,0-6.81-2.84L60.69,104A15.9,15.9,0,0,0,56,115.31V164.4A4,4,0,0,0,62.83,167.23Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CellSignalMediumFill">M198.12,25.23a16,16,0,0,0-17.44,3.46l-160,160A16,16,0,0,0,32,216H192a16,16,0,0,0,16-16V40A15.94,15.94,0,0,0,198.12,25.23ZM192,200H128V104l64-64Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.QuotesFill">M116,72v88a48.05,48.05,0,0,1-48,48,8,8,0,0,1,0-16,32,32,0,0,0,32-32v-8H40a16,16,0,0,1-16-16V72A16,16,0,0,1,40,56h60A16,16,0,0,1,116,72ZM216,56H156a16,16,0,0,0-16,16v64a16,16,0,0,0,16,16h60v8a32,32,0,0,1-32,32,8,8,0,0,0,0,16,48.05,48.05,0,0,0,48-48V72A16,16,0,0,0,216,56Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SubtractFill">M174.63,81.35a80,80,0,1,0-93.28,93.28,80,80,0,1,0,93.28-93.28ZM96,160a64,64,0,1,1,64-64A64.07,64.07,0,0,1,96,160Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.LightningSlashFill">M105.72,67.81a4,4,0,0,1,0-5.42l48.39-51.85a8,8,0,0,1,13.7,7L153.18,90.9l57.43,21.53a8.24,8.24,0,0,1,4.22,3.4,8,8,0,0,1-1,9.63l-25.27,27.07a4,4,0,0,1-5.88,0Zm27.76,54.32L53.92,34.62A8,8,0,1,0,42.08,45.38L81.34,88.56l-39,41.83A8.15,8.15,0,0,0,40,135.31a8,8,0,0,0,5.16,8.18l57.63,21.61L88.16,238.43a8,8,0,0,0,13.69,7l61.86-66.28,38.37,42.2a8,8,0,1,0,11.84-10.76Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.LockKeyFill">M208,80H176V56a48,48,0,0,0-96,0V80H48A16,16,0,0,0,32,96V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V96A16,16,0,0,0,208,80Zm-72,78.63V184a8,8,0,0,1-16,0V158.63a24,24,0,1,1,16,0ZM160,80H96V56a32,32,0,0,1,64,0Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.DnaFill">M200,204.5V232a8,8,0,0,1-16,0V204.5a63.67,63.67,0,0,0-35.38-57.25l-48.4-24.19A79.58,79.58,0,0,1,56,51.5V24a8,8,0,0,1,16,0V51.5a63.67,63.67,0,0,0,35.38,57.25l48.4,24.19A79.58,79.58,0,0,1,200,204.5ZM163.18,192H83.91a8,8,0,0,1-8-8.53A8.18,8.18,0,0,1,84.18,176H149.7a4,4,0,0,0,2.75-6.9,48.24,48.24,0,0,0-11-7.53L94.8,138.23a4,4,0,0,0-4.08.3A79.51,79.51,0,0,0,56,204.5v27.23A8.17,8.17,0,0,0,63.47,240,8,8,0,0,0,72,232V216h92a4,4,0,0,0,4-4v-7.5a48.76,48.76,0,0,0-.9-9.32A4,4,0,0,0,163.18,192ZM191.47,16A8.17,8.17,0,0,0,184,24.27V40H92a4,4,0,0,0-4,4v7.5a48.76,48.76,0,0,0,.9,9.32A4,4,0,0,0,92.82,64h79a8.18,8.18,0,0,1,8.25,7.47,8,8,0,0,1-8,8.53H106.3a4,4,0,0,0-2.75,6.9,48.24,48.24,0,0,0,11,7.53l46.67,23.34a4,4,0,0,0,4.08-.3A79.51,79.51,0,0,0,200,51.5V24A8,8,0,0,0,191.47,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.HourglassSimpleLowFill">M211.18,196.56,139.57,128l71.61-68.56a1.59,1.59,0,0,1,.13-.13A16,16,0,0,0,200,32H56A16,16,0,0,0,44.69,59.31a1.59,1.59,0,0,1,.13.13L116.43,128,44.82,196.56a1.59,1.59,0,0,1-.13.13A16,16,0,0,0,56,224H200a16,16,0,0,0,11.32-27.31A1.59,1.59,0,0,1,211.18,196.56ZM56,48h0v0ZM158.21,168H97.79L128,139.08ZM200,48l-72,68.92L56,48Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SunglassesFill">M200,40a8,8,0,0,0,0,16,16,16,0,0,1,16,16v56H40V72A16,16,0,0,1,56,56a8,8,0,0,0,0-16A32,32,0,0,0,24,72v92a44,44,0,0,0,88,0V144h32v20a44,44,0,0,0,88,0V72A32,32,0,0,0,200,40ZM91.22,179.22a8,8,0,0,1-11.31,0L58.34,157.66a8,8,0,0,1,11.32-11.32l21.56,21.57A8,8,0,0,1,91.22,179.22Zm120,0a8,8,0,0,1-11.31,0l-21.57-21.56a8,8,0,0,1,11.32-11.32l21.56,21.57A8,8,0,0,1,211.22,179.22Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CaretCircleUpFill">M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24Zm45.66,125.66a8,8,0,0,1-11.32,0L128,115.31,93.66,149.66a8,8,0,0,1-11.32-11.32l40-40a8,8,0,0,1,11.32,0l40,40A8,8,0,0,1,173.66,149.66Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ScrollFill">M220.8,169.6A8,8,0,0,0,216,168h-8V64a32,32,0,0,0-32-32H40A32,32,0,0,0,8,64C8,77.61,18.05,85.54,19.2,86.4h0A7.89,7.89,0,0,0,24,88a8,8,0,0,0,4.87-14.33h0C28.83,73.62,24,69.74,24,64a16,16,0,0,1,32,0V192a32,32,0,0,0,32,32H200a32,32,0,0,0,32-32C232,178.39,222,170.46,220.8,169.6ZM104,96h64a8,8,0,0,1,0,16H104a8,8,0,0,1,0-16Zm-8,40a8,8,0,0,1,8-8h64a8,8,0,0,1,0,16H104A8,8,0,0,1,96,136Zm104,72H107.71A31.82,31.82,0,0,0,112,192a26.92,26.92,0,0,0-1.21-8h102a12.58,12.58,0,0,1,3.23,8A16,16,0,0,1,200,208Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowsOutLineVerticalFill">M224,128a8,8,0,0,1-8,8H40a8,8,0,0,1,0-16H216A8,8,0,0,1,224,128ZM96,56h24V96a8,8,0,0,0,16,0V56h24a8,8,0,0,0,5.66-13.66l-32-32a8,8,0,0,0-11.32,0l-32,32A8,8,0,0,0,96,56Zm64,144H136V160a8,8,0,0,0-16,0v40H96a8,8,0,0,0-5.66,13.66l32,32a8,8,0,0,0,11.32,0l32-32A8,8,0,0,0,160,200Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FolderSimpleMinusFill">M216,72H130.67L102.93,51.2a16.12,16.12,0,0,0-9.6-3.2H40A16,16,0,0,0,24,64V200a16,16,0,0,0,16,16H216.89A15.13,15.13,0,0,0,232,200.89V88A16,16,0,0,0,216,72Zm-64,80H104a8,8,0,0,1,0-16h48a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CalendarSlashFill">M224,48V187.57a4,4,0,0,1-7,2.7L116.8,80H208V48H184v8a8,8,0,0,1-8.52,8A8.18,8.18,0,0,1,168,55.73V48H87.71l-8.46-9.31a4,4,0,0,1,3-6.69H168V24a8,8,0,0,1,8.52-8A8.18,8.18,0,0,1,184,24.27V32h24A16,16,0,0,1,224,48ZM213.92,210.62A8,8,0,0,1,208,224H48a16,16,0,0,1-16-16V48A16,16,0,0,1,48,32a8,8,0,0,1,5.93,2.62ZM73.55,80,48,51.89V80Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.DeviceMobileSlashFill">M213.38,221.92a8,8,0,0,1-11.3-.54l-2.26-2.48A24,24,0,0,1,176,240H80a24,24,0,0,1-24-24V60.69L42.08,45.38A8,8,0,1,1,53.92,34.62l160,176A8,8,0,0,1,213.38,221.92Zm-27.3-65.71A8,8,0,0,0,200,150.83V40a24,24,0,0,0-24-24H76.7a8,8,0,0,0-5.92,13.38Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PlaylistFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM64,72H192a8,8,0,0,1,0,16H64a8,8,0,0,1,0-16Zm0,48h72a8,8,0,0,1,0,16H64a8,8,0,0,1,0-16Zm40,64H64a8,8,0,0,1,0-16h40a8,8,0,0,1,0,16Zm103.59-53.47a8,8,0,0,1-10.12,5.06L184,131.1V176a24,24,0,1,1-16-22.62V120a8,8,0,0,1,10.53-7.59l24,8A8,8,0,0,1,207.59,130.53Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.DiscoBallFill">M120,64.37V16a8,8,0,0,0-16,0V64.37a88,88,0,1,0,16,0ZM183.54,144H151.77c-1.51-28.36-10.79-48.36-19.44-61.06A72.16,72.16,0,0,1,183.54,144Zm-47.78,16c-2,33.52-16.13,52.95-23.76,61.08-7.64-8.15-21.77-27.57-23.76-61.08ZM91.67,82.94C83,95.64,73.74,115.64,72.23,144H40.46A72.16,72.16,0,0,1,91.67,82.94ZM40.46,160H72.23c1.51,28.36,10.79,48.36,19.44,61.06A72.16,72.16,0,0,1,40.46,160ZM256,88a8,8,0,0,1-8,8h-8v8a8,8,0,0,1-16,0V96h-8a8,8,0,0,1,0-16h8V72a8,8,0,0,1,16,0v8h8A8,8,0,0,1,256,88ZM152,40a8,8,0,0,1,8-8h16V16a8,8,0,0,1,16,0V32h16a8,8,0,0,1,0,16H192V64a8,8,0,0,1-16,0V48H160A8,8,0,0,1,152,40Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.TrayArrowUpFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM90.34,98.34l32-32a8,8,0,0,1,11.32,0l32,32a8,8,0,0,1-11.32,11.32L136,91.31V152a8,8,0,0,1-16,0V91.31l-18.34,18.35A8,8,0,0,1,90.34,98.34ZM208,208H48V168H76.69L96,187.31A15.86,15.86,0,0,0,107.31,192h41.38A15.86,15.86,0,0,0,160,187.31L179.31,168H208v40Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowSquareDownRightFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM168,160a8,8,0,0,1-8,8H112a8,8,0,0,1,0-16h28.69L90.34,101.66a8,8,0,0,1,11.32-11.32L152,140.69V112a8,8,0,0,1,16,0Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowArcRightFill">M240,88v64a8,8,0,0,1-8,8H168a8,8,0,0,1-5.66-13.66l26.19-26.18A88,88,0,0,0,40,184a8,8,0,0,1-16,0,104,104,0,0,1,175.86-75.18l26.48-26.48A8,8,0,0,1,240,88Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.VignetteFill">M216,40H40A16,16,0,0,0,24,56V200a16,16,0,0,0,16,16H216a16,16,0,0,0,16-16V56A16,16,0,0,0,216,40Zm-16,88c0,30.93-32.24,56-72,56s-72-25.07-72-56,32.24-56,72-56S200,97.07,200,128Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowFatRightFill">M132.94,231.39A8,8,0,0,1,128,224V184H48a16,16,0,0,1-16-16V88A16,16,0,0,1,48,72h80V32a8,8,0,0,1,13.66-5.66l96,96a8,8,0,0,1,0,11.32l-96,96A8,8,0,0,1,132.94,231.39Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.HardHatFill">M152,152H104V40a16,16,0,0,1,16-16h16a16,16,0,0,1,16,16Zm72,16H32a16,16,0,0,0-16,16v8a16,16,0,0,0,16,16H224a16,16,0,0,0,16-16v-8A16,16,0,0,0,224,168Zm0-20V136a96.44,96.44,0,0,0-50.11-84.31A4,4,0,0,0,168,55.22V152h52A4,4,0,0,0,224,148ZM36,152H88V55.22a4,4,0,0,0-5.89-3.53A96.44,96.44,0,0,0,32,136v12A4,4,0,0,0,36,152Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CookingPotFill">M88,48V16a8,8,0,0,1,16,0V48a8,8,0,0,1-16,0Zm40,8a8,8,0,0,0,8-8V16a8,8,0,0,0-16,0V48A8,8,0,0,0,128,56Zm32,0a8,8,0,0,0,8-8V16a8,8,0,0,0-16,0V48A8,8,0,0,0,160,56Zm94.4,35.2a8,8,0,0,0-11.2-1.6L224,104V80a8,8,0,0,0-8-8H40a8,8,0,0,0-8,8v24L12.8,89.6a8,8,0,0,0-9.6,12.8L32,124v60a32,32,0,0,0,32,32H192a32,32,0,0,0,32-32V124l28.8-21.6A8,8,0,0,0,254.4,91.2Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowLeftFill">M224,128a8,8,0,0,1-8,8H120v64a8,8,0,0,1-13.66,5.66l-72-72a8,8,0,0,1,0-11.32l72-72A8,8,0,0,1,120,56v64h96A8,8,0,0,1,224,128Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.NumberSquareSevenFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM159.52,90.73l-32,88A8,8,0,0,1,120,184a7.9,7.9,0,0,1-2.73-.48,8,8,0,0,1-4.79-10.25L140.58,96H104a8,8,0,0,1,0-16h48a8,8,0,0,1,7.52,10.73Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.NumberSquareSixFill">M148,148a20,20,0,1,1-20-20A20,20,0,0,1,148,148ZM224,48V208a16,16,0,0,1-16,16H48a16,16,0,0,1-16-16V48A16,16,0,0,1,48,32H208A16,16,0,0,1,224,48ZM164,148a36,36,0,0,0-36-36c-.61,0-1.22,0-1.82,0L142.87,84.1a8,8,0,0,0-13.74-8.2s-32.4,54.28-32.47,54.42A36,36,0,1,0,164,148Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.GridFourFill">M216,56v60a4,4,0,0,1-4,4H136V44a4,4,0,0,1,4-4h60A16,16,0,0,1,216,56ZM116,40H56A16,16,0,0,0,40,56v60a4,4,0,0,0,4,4h76V44A4,4,0,0,0,116,40Zm96,96H136v76a4,4,0,0,0,4,4h60a16,16,0,0,0,16-16V140A4,4,0,0,0,212,136ZM40,140v60a16,16,0,0,0,16,16h60a4,4,0,0,0,4-4V136H44A4,4,0,0,0,40,140Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.TextOutdentFill">M224,128a8,8,0,0,1-8,8H112a8,8,0,0,1,0-16H216A8,8,0,0,1,224,128ZM112,72H216a8,8,0,0,0,0-16H112a8,8,0,0,0,0,16ZM216,184H40a8,8,0,0,0,0,16H216a8,8,0,0,0,0-16ZM72,144a8,8,0,0,0,8-8V56a8,8,0,0,0-13.66-5.66l-40,40a8,8,0,0,0,0,11.32l40,40A8,8,0,0,0,72,144Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ChatTeardropTextFill">M132,24A100.11,100.11,0,0,0,32,124v84a16,16,0,0,0,16,16h84a100,100,0,0,0,0-200Zm32,128H96a8,8,0,0,1,0-16h68a8,8,0,0,1,0,16Zm0-32H96a8,8,0,0,1,0-16h68a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BluetoothConnectedFill">M200,176a8,8,0,0,1-3.2,6.4l-64,48A8,8,0,0,1,128,232a8,8,0,0,1-8-8V144L68.8,182.4a8,8,0,0,1-9.6-12.8L114.67,128,59.2,86.4a8,8,0,0,1,9.6-12.8L120,112V32a8,8,0,0,1,12.8-6.4l64,48a8,8,0,0,1,0,12.8L141.33,128l55.47,41.6A8,8,0,0,1,200,176ZM72,128a12,12,0,1,0-12,12A12,12,0,0,0,72,128Zm132-12a12,12,0,1,0,12,12A12,12,0,0,0,204,116Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BellSimpleSlashFill">M221.84,192v0a1.85,1.85,0,0,1-3,.28L83.27,43.19a4,4,0,0,1,.8-6A79.55,79.55,0,0,1,129.17,24C173,24.66,207.8,61.1,208,104.92c.14,34.88,8.31,61.54,13.82,71A15.89,15.89,0,0,1,221.84,192ZM160,216H96.22A8.19,8.19,0,0,0,88,223.47,8,8,0,0,0,96,232h63.74a8.19,8.19,0,0,0,8.26-7.47A8,8,0,0,0,160,216ZM53.84,34.62A8,8,0,1,0,42,45.38L58.79,63.85A79.42,79.42,0,0,0,47.93,104c0,35.09-8.15,62-13.7,71.73a16.42,16.42,0,0,0,.09,16.68A15.78,15.78,0,0,0,47.91,200H182.62l19.45,21.38a8,8,0,0,0,11.85-10.76Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CashRegisterFill">M239.76,158.06,217.28,68.12A16,16,0,0,0,201.75,56H136V40a16,16,0,0,0-16-16H80A16,16,0,0,0,64,40V56H54.25A16,16,0,0,0,38.72,68.12L16.24,158.06A7.93,7.93,0,0,0,16,160v32a16,16,0,0,0,16,16H224a16,16,0,0,0,16-16V160A7.93,7.93,0,0,0,239.76,158.06ZM168,88h16a8,8,0,0,1,0,16H168a8,8,0,0,1,0-16Zm0,32h16a8,8,0,0,1,0,16H168a8,8,0,0,1,0-16ZM136,88a8,8,0,0,1,0,16H120a8,8,0,0,1,0-16Zm8,40a8,8,0,0,1-8,8H120a8,8,0,0,1,0-16h16A8,8,0,0,1,144,128ZM80,40h40V56H80ZM72,88H88a8,8,0,0,1,0,16H72a8,8,0,0,1,0-16Zm0,32H88a8,8,0,0,1,0,16H72a8,8,0,0,1,0-16Zm152,72H32V168H224Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SmileyMehFill">M128,24A104,104,0,1,0,232,128,104.13,104.13,0,0,0,128,24ZM92,96a12,12,0,1,1-12,12A12,12,0,0,1,92,96Zm76,72H88a8,8,0,0,1,0-16h80a8,8,0,0,1,0,16Zm-4-48a12,12,0,1,1,12-12A12,12,0,0,1,164,120Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SmileyAngryFill">M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24ZM80,140a12,12,0,1,1,12,12A12,12,0,0,1,80,140Zm78.66,48.43a8,8,0,0,1-11.09,2.23C141.07,186.34,136,184,128,184s-13.07,2.34-19.57,6.66a8,8,0,0,1-8.86-13.32C108,171.73,116.06,168,128,168s20,3.73,28.43,9.34A8,8,0,0,1,158.66,188.43ZM164,152a12,12,0,1,1,12-12A12,12,0,0,1,164,152Zm16.44-57.34-48,32a8,8,0,0,1-8.88,0l-48-32a8,8,0,1,1,8.88-13.32L128,110.39l43.56-29a8,8,0,0,1,8.88,13.32Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SealPercentFill">M96,104a8,8,0,1,1,8-8A8,8,0,0,1,96,104Zm64,48a8,8,0,1,0,8,8A8,8,0,0,0,160,152Zm80-24c0,10.44-7.51,18.27-14.14,25.18-3.77,3.94-7.67,8-9.14,11.57-1.36,3.27-1.44,8.69-1.52,13.94-.15,9.76-.31,20.82-8,28.51s-18.75,7.85-28.51,8c-5.25.08-10.67.16-13.94,1.52-3.57,1.47-7.63,5.37-11.57,9.14C146.27,232.49,138.44,240,128,240s-18.27-7.51-25.18-14.14c-3.94-3.77-8-7.67-11.57-9.14-3.27-1.36-8.69-1.44-13.94-1.52-9.76-.15-20.82-.31-28.51-8s-7.85-18.75-8-28.51c-.08-5.25-.16-10.67-1.52-13.94-1.47-3.57-5.37-7.63-9.14-11.57C23.51,146.27,16,138.44,16,128s7.51-18.27,14.14-25.18c3.77-3.94,7.67-8,9.14-11.57,1.36-3.27,1.44-8.69,1.52-13.94.15-9.76.31-20.82,8-28.51s18.75-7.85,28.51-8c5.25-.08,10.67-.16,13.94-1.52,3.57-1.47,7.63-5.37,11.57-9.14C109.73,23.51,117.56,16,128,16s18.27,7.51,25.18,14.14c3.94,3.77,8,7.67,11.57,9.14,3.27,1.36,8.69,1.44,13.94,1.52,9.76.15,20.82.31,28.51,8s7.85,18.75,8,28.51c.08,5.25.16,10.67,1.52,13.94,1.47,3.57,5.37,7.63,9.14,11.57C232.49,109.73,240,117.56,240,128ZM96,120A24,24,0,1,0,72,96,24,24,0,0,0,96,120Zm77.66-26.34a8,8,0,0,0-11.32-11.32l-80,80a8,8,0,0,0,11.32,11.32ZM184,160a24,24,0,1,0-24,24A24,24,0,0,0,184,160Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.LinkSimpleHorizontalBreakFill">M224,48H32A16,16,0,0,0,16,64V192a16,16,0,0,0,16,16H224a16,16,0,0,0,16-16V64A16,16,0,0,0,224,48ZM112,168H80a40,40,0,0,1,0-80h32a8,8,0,0,1,0,16H80a24,24,0,0,0,0,48h32a8,8,0,0,1,0,16Zm64,0H144a8,8,0,0,1,0-16h32a24,24,0,0,0,0-48H144a8,8,0,0,1,0-16h32a40,40,0,0,1,0,80Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.GitPullRequestFill">M104,64A32,32,0,1,0,64,95v66a32,32,0,1,0,16,0V95A32.06,32.06,0,0,0,104,64ZM88,192a16,16,0,1,1-16-16A16,16,0,0,1,88,192Zm144,0a32,32,0,1,1-40-31V110.63a8,8,0,0,0-2.34-5.66L152,67.31V96a8,8,0,0,1-16,0V48a8,8,0,0,1,8-8h48a8,8,0,0,1,0,16H163.31L201,93.66a23.85,23.85,0,0,1,7,17V161A32.06,32.06,0,0,1,232,192Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BowlFoodFill">M224,104h-8.37a88,88,0,0,0-175.26,0H32a8,8,0,0,0-8,8,104.35,104.35,0,0,0,56,92.28V208a16,16,0,0,0,16,16h64a16,16,0,0,0,16-16v-3.72A104.35,104.35,0,0,0,232,112,8,8,0,0,0,224,104ZM173.48,56.23q2.75,2.25,5.27,4.75a87.92,87.92,0,0,0-49.15,43H100.1A72.26,72.26,0,0,1,168,56C169.83,56,171.66,56.09,173.48,56.23ZM148.12,104a71.84,71.84,0,0,1,41.27-29.57A71.45,71.45,0,0,1,199.54,104ZM128,40a71.87,71.87,0,0,1,19,2.57A88.36,88.36,0,0,0,83.33,104H56.46A72.08,72.08,0,0,1,128,40Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.KanbanFill">M160,56v96a8,8,0,0,1-8,8H112a8,8,0,0,1-8-8V56a8,8,0,0,1,8-8h40A8,8,0,0,1,160,56Zm64-8H184a8,8,0,0,0-8,8v52a4,4,0,0,0,4,4h48a4,4,0,0,0,4-4V56A8,8,0,0,0,224,48Zm4,80H180a4,4,0,0,0-4,4v44a16,16,0,0,0,16,16h24a16,16,0,0,0,16-16V132A4,4,0,0,0,228,128ZM80,48H40a8,8,0,0,0-8,8v52a4,4,0,0,0,4,4H84a4,4,0,0,0,4-4V56A8,8,0,0,0,80,48Zm4,80H36a4,4,0,0,0-4,4v76a16,16,0,0,0,16,16H72a16,16,0,0,0,16-16V132A4,4,0,0,0,84,128Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowsCounterClockwiseFill">M88,104H40a8,8,0,0,1-8-8V48a8,8,0,0,1,13.66-5.66L64,60.7a95.42,95.42,0,0,1,66-26.76h.53a95.36,95.36,0,0,1,67.07,27.33,8,8,0,0,1-11.18,11.44,79.52,79.52,0,0,0-55.89-22.77h-.45A79.48,79.48,0,0,0,75.35,72L93.66,90.34A8,8,0,0,1,88,104Zm128,48H168a8,8,0,0,0-5.66,13.66L180.65,184a79.48,79.48,0,0,1-54.72,22.09h-.45a79.52,79.52,0,0,1-55.89-22.77,8,8,0,1,0-11.18,11.44,95.36,95.36,0,0,0,67.07,27.33H126a95.42,95.42,0,0,0,66-26.76l18.36,18.36A8,8,0,0,0,224,208V160A8,8,0,0,0,216,152Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.AlignBottomFill">M224,216a8,8,0,0,1-8,8H40a8,8,0,0,1,0-16H216A8,8,0,0,1,224,216Zm-72-24h40a16,16,0,0,0,16-16V80a16,16,0,0,0-16-16H152a16,16,0,0,0-16,16v96A16,16,0,0,0,152,192Zm-88,0h40a16,16,0,0,0,16-16V40a16,16,0,0,0-16-16H64A16,16,0,0,0,48,40V176A16,16,0,0,0,64,192Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PersonSimpleThrowFill">M96,56a32,32,0,1,1,32,32A32,32,0,0,1,96,56ZM221,99.36c-1.5-1.2-37.22-29-89.51,6.57C86,136.84,59.57,126.23,59.32,126.12a8,8,0,1,0-6.63,14.56c.61.28,7.49,3.27,19.67,3.27,14.21,0,35.64-4.11,62.77-21.29-2.28,29.41-12.73,83.47-73.43,101.68a8,8,0,1,0,4.6,15.32c34.83-10.45,59.45-32.34,73.2-65.08a141.86,141.86,0,0,0,5.1-14.33l22.08,18.4-14.27,42.82a8,8,0,0,0,15.18,5.06l16-48a8,8,0,0,0-2.47-8.68l-32.42-27a215.91,215.91,0,0,0,3-30.34c36.18-18.57,59-.85,59.28-.65a8,8,0,1,0,10-12.48ZM64,112A16,16,0,1,0,48,96,16,16,0,0,0,64,112Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CloudRainFill">M158.66,196.44l-32,48a8,8,0,1,1-13.32-8.88l32-48a8,8,0,0,1,13.32,8.88ZM231.87,87.55a76,76,0,0,0-151.78.73A8.18,8.18,0,0,1,72,96l-.6,0A8.14,8.14,0,0,1,64,87.39a92.48,92.48,0,0,1,2.33-16.51,4,4,0,0,0-5-4.78A52.09,52.09,0,0,0,24,116.36C24.2,145.07,48.12,168,76.84,168h36.21L89.34,203.56a8,8,0,0,0,13.32,8.88L132.28,168H156A76.08,76.08,0,0,0,231.87,87.55Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.GenderMaleFill">M152,140a36,36,0,1,1-36-36A36,36,0,0,1,152,140ZM216,40V216a16,16,0,0,1-16,16H56a16,16,0,0,1-16-16V40A16,16,0,0,1,56,24H200A16,16,0,0,1,216,40ZM192,72a8,8,0,0,0-8-8H152a8,8,0,0,0,0,16h12.69l-18,18A52.08,52.08,0,1,0,158,109.35l18-18V104a8,8,0,0,0,16,0Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowElbowRightDownFill">M229.66,165.66l-48,48a8,8,0,0,1-11.32,0l-48-48A8,8,0,0,1,128,152h40V72H32a8,8,0,0,1,0-16H176a8,8,0,0,1,8,8v88h40a8,8,0,0,1,5.66,13.66Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.GlobeSimpleXFill">M221.66,173.66,203.31,192l18.35,18.34a8,8,0,0,1-11.32,11.32L192,203.31l-18.34,18.35a8,8,0,0,1-11.32-11.32L180.69,192l-18.35-18.34a8,8,0,0,1,11.32-11.32L192,180.69l18.34-18.35a8,8,0,0,1,11.32,11.32ZM232,128a8,8,0,0,1-8,8H96.25c3,53.73,35.33,80.6,36.77,81.77h0A8,8,0,0,1,128,232,104,104,0,1,1,232,128ZM148.41,42.4C159.94,57.67,174,83.49,175.79,120h39.84A88.19,88.19,0,0,0,148.41,42.4ZM96.23,120h63.54C157.46,78.4,137.55,52.9,128,43,118.46,52.89,98.54,78.39,96.23,120Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FileArrowDownFill">M213.66,82.34l-56-56A8,8,0,0,0,152,24H56A16,16,0,0,0,40,40V216a16,16,0,0,0,16,16H200a16,16,0,0,0,16-16V88A8,8,0,0,0,213.66,82.34Zm-56,83.32-24,24a8,8,0,0,1-11.32,0l-24-24a8,8,0,0,1,11.32-11.32L120,164.69V120a8,8,0,0,1,16,0v44.69l10.34-10.35a8,8,0,0,1,11.32,11.32ZM152,88V44l44,44Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.VolleyballFill">M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24Zm87.63,96H181.37a104.18,104.18,0,0,0-35.78-78.23A88.18,88.18,0,0,1,215.63,120ZM44.53,155.87A87.95,87.95,0,0,1,77.27,56.13L94.39,85.78a104.14,104.14,0,0,0-49.86,70.09ZM58.9,182.43a88,88,0,0,1,43.49-82.79L118.76,128,77.27,199.87A88.62,88.62,0,0,1,58.9,182.43Zm150.84-21.85a88,88,0,0,1-93.49,3.78L132.62,136h83A87.16,87.16,0,0,1,209.74,160.58Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ChartPolarFill">M120,199.54v27.74a4,4,0,0,1-4.46,4,104.22,104.22,0,0,1-90.8-90.8,4,4,0,0,1,4-4.46H56.46A72.11,72.11,0,0,0,120,199.54ZM183.42,136H136v47.42A56.11,56.11,0,0,0,183.42,136ZM136,72.58V120h47.42A56.11,56.11,0,0,0,136,72.58ZM227.28,136H199.54A72.11,72.11,0,0,1,136,199.54v27.74a4,4,0,0,0,4.46,4,104.22,104.22,0,0,0,90.8-90.8A4,4,0,0,0,227.28,136Zm-27.74-16h27.74a4,4,0,0,0,4-4.46,104.22,104.22,0,0,0-90.8-90.8,4,4,0,0,0-4.46,4V56.46A72.11,72.11,0,0,1,199.54,120Zm-84-95.26a104.22,104.22,0,0,0-90.8,90.8,4,4,0,0,0,4,4.46H56.46A72.11,72.11,0,0,1,120,56.46V28.72A4,4,0,0,0,115.54,24.74ZM72.58,120H120V72.58A56.11,56.11,0,0,0,72.58,120ZM120,183.42V136H72.58A56.11,56.11,0,0,0,120,183.42Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.StarFourFill">M240,128a15.79,15.79,0,0,1-10.5,15l-63.44,23.07L143,229.5a16,16,0,0,1-30,0L89.94,166.06,26.5,143a16,16,0,0,1,0-30L89.94,89.94,113,26.5a16,16,0,0,1,30,0l23.07,63.44L229.5,113A15.79,15.79,0,0,1,240,128Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SpeakerLowFill">M160,32.25V223.69a8.29,8.29,0,0,1-3.91,7.18,8,8,0,0,1-9-.56l-65.57-51A4,4,0,0,1,80,176.16V79.84a4,4,0,0,1,1.55-3.15l65.57-51a8,8,0,0,1,10,.16A8.27,8.27,0,0,1,160,32.25ZM60,80H32A16,16,0,0,0,16,96v64a16,16,0,0,0,16,16H60a4,4,0,0,0,4-4V84A4,4,0,0,0,60,80ZM198,101.56a8,8,0,1,0-12,10.58,24,24,0,0,1,0,31.72,8,8,0,1,0,12,10.58,40,40,0,0,0,0-52.88Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CellSignalLowFill">M198.12,25.23a16,16,0,0,0-17.44,3.46l-160,160A16,16,0,0,0,32,216H192a16,16,0,0,0,16-16V40A15.94,15.94,0,0,0,198.12,25.23ZM192,200H88V144L192,40Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.LockersFill">M208,32H48A16,16,0,0,0,32,48V224a8,8,0,0,0,16,0V208h72v16a8,8,0,0,0,16,0V208h72v16a8,8,0,0,0,16,0V48A16,16,0,0,0,208,32ZM96,112H56a8,8,0,0,1,0-16H96a8,8,0,0,1,0,16Zm0-32H56a8,8,0,0,1,0-16H96a8,8,0,0,1,0,16Zm40,104a8,8,0,0,1-16,0V56a8,8,0,0,1,16,0Zm64-72H160a8,8,0,0,1,0-16h40a8,8,0,0,1,0,16Zm0-32H160a8,8,0,0,1,0-16h40a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.NumberSquareZeroFill">M156,128c0,14.86-5.9,40-28,40s-28-25.14-28-40,5.9-40,28-40S156,113.14,156,128Zm68-80V208a16,16,0,0,1-16,16H48a16,16,0,0,1-16-16V48A16,16,0,0,1,48,32H208A16,16,0,0,1,224,48Zm-52,80c0-14.25-3.56-27.53-10-37.39C154,78.44,142.23,72,128,72s-26,6.44-34,18.61c-6.47,9.86-10,23.14-10,37.39s3.56,27.53,10,37.39c8,12.17,19.74,18.61,34,18.61s26-6.44,34-18.61C168.44,155.53,172,142.25,172,128Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.GenderNeuterFill">M167.84,108.35a40,40,0,1,1-36.19-36.19A40,40,0,0,1,167.84,108.35ZM216,40V216a16,16,0,0,1-16,16H56a16,16,0,0,1-16-16V40A16,16,0,0,1,56,24H200A16,16,0,0,1,216,40Zm-32,72a56,56,0,1,0-64,55.42v32.31a8.18,8.18,0,0,0,7.47,8.25,8,8,0,0,0,8.53-8V167.42A56.09,56.09,0,0,0,184,112Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CheckerboardFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32Zm0,176H128V128H48V48h80v80h80v80Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.GooglePlayLogoFill">M239.82,114.18,72,18.16a16,16,0,0,0-16.12,0A15.68,15.68,0,0,0,48,31.87V224.13a15.68,15.68,0,0,0,7.92,13.67,16,16,0,0,0,16.12,0l167.78-96a15.76,15.76,0,0,0,0-27.64ZM160,139.31l18.92,18.92-88.5,50.66ZM90.4,47.1l88.53,50.67L160,116.69ZM193.31,150l-22-22,22-22,38.43,22Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BuildingFill">M232,224H208V32h8a8,8,0,0,0,0-16H40a8,8,0,0,0,0,16h8V224H24a8,8,0,0,0,0,16H232a8,8,0,0,0,0-16ZM88,56h24a8,8,0,0,1,0,16H88a8,8,0,0,1,0-16Zm0,40h24a8,8,0,0,1,0,16H88a8,8,0,0,1,0-16Zm-8,48a8,8,0,0,1,8-8h24a8,8,0,0,1,0,16H88A8,8,0,0,1,80,144Zm72,80H104V184h48Zm16-72H144a8,8,0,0,1,0-16h24a8,8,0,0,1,0,16Zm0-40H144a8,8,0,0,1,0-16h24a8,8,0,0,1,0,16Zm0-40H144a8,8,0,0,1,0-16h24a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.MartiniFill">M237.66,45.66A8,8,0,0,0,232,32H24a8,8,0,0,0-5.66,13.66L120,147.31V208H88a8,8,0,0,0,0,16h80a8,8,0,0,0,0-16H136V147.31Zm-25,2.34-16,16H59.31l-16-16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FileJpgFill">M44,120H212a4,4,0,0,0,4-4V88a8,8,0,0,0-2.34-5.66l-56-56A8,8,0,0,0,152,24H56A16,16,0,0,0,40,40v76A4,4,0,0,0,44,120ZM152,44l44,44H152ZM120,144H104a8,8,0,0,0-8,8v55.73a8.17,8.17,0,0,0,7.47,8.25,8,8,0,0,0,8.53-8v-8h7.4c15.24,0,28.13-11.92,28.59-27.15A28,28,0,0,0,120,144Zm-.35,40H112V160h8a12,12,0,0,1,11.94,13.16A12.23,12.23,0,0,1,119.65,184ZM216,200.87a8,8,0,0,1-2.26,5.57A30,30,0,0,1,192,216c-17.64,0-32-16.15-32-36s14.36-36,32-36a29.36,29.36,0,0,1,16.09,4.86,8.21,8.21,0,0,1,3,10.64,8,8,0,0,1-11.55,2.88A13.21,13.21,0,0,0,192,160c-8.82,0-16,9-16,20s7.18,20,16,20a13.63,13.63,0,0,0,8-2.71V192a8,8,0,0,1-8-8.53,8.17,8.17,0,0,1,8.25-7.47H208a8,8,0,0,1,8,8ZM80,152v37.41c0,14.22-11.18,26.26-25.41,26.58A26,26,0,0,1,28,190.37,8.17,8.17,0,0,1,35.31,182,8,8,0,0,1,44,190.22a8.89,8.89,0,0,0,4,8c7.85,4.82,16-.75,16-8.2V152.27A8.17,8.17,0,0,1,71.47,144,8,8,0,0,1,80,152Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PaintRollerFill">M248,104v50a16.07,16.07,0,0,1-11.6,15.38L136,198v34a8,8,0,0,1-16,0V198a16.07,16.07,0,0,1,11.6-15.38L232,154V104H216v24a16,16,0,0,1-16,16H48a16,16,0,0,1-16-16V104H16a8,8,0,0,1,0-16H32V64A16,16,0,0,1,48,48H200a16,16,0,0,1,16,16V88h16A16,16,0,0,1,248,104Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BroadcastFill">M168,128a40,40,0,1,1-40-40A40,40,0,0,1,168,128Zm40,0a79.74,79.74,0,0,0-20.37-53.33,8,8,0,1,0-11.92,10.67,64,64,0,0,1,0,85.33,8,8,0,0,0,11.92,10.67A79.79,79.79,0,0,0,208,128ZM80.29,85.34A8,8,0,1,0,68.37,74.67a79.94,79.94,0,0,0,0,106.67,8,8,0,0,0,11.92-10.67,63.95,63.95,0,0,1,0-85.33Zm158.28-4A119.48,119.48,0,0,0,213.71,44a8,8,0,1,0-11.42,11.2,103.9,103.9,0,0,1,0,145.56A8,8,0,1,0,213.71,212,120.12,120.12,0,0,0,238.57,81.29ZM32.17,168.48A103.9,103.9,0,0,1,53.71,55.22,8,8,0,1,0,42.29,44a119.87,119.87,0,0,0,0,168,8,8,0,1,0,11.42-11.2A103.61,103.61,0,0,1,32.17,168.48Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.HighlighterFill">M253.66,106.34a8,8,0,0,0-11.32,0L192,156.69,107.31,72l50.35-50.34a8,8,0,1,0-11.32-11.32L96,60.69A16,16,0,0,0,93.18,79.5L72,100.69a16,16,0,0,0,0,22.62L76.69,128,18.34,186.34a8,8,0,0,0,3.13,13.25l72,24A7.88,7.88,0,0,0,96,224a8,8,0,0,0,5.66-2.34L136,187.31l4.69,4.69a16,16,0,0,0,22.62,0l21.18-21.18A16,16,0,0,0,203.31,168l50.35-50.34A8,8,0,0,0,253.66,106.34ZM152,180.69,83.31,112,104,91.31,172.69,160Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.MapTrifoldFill">M228.92,49.69a8,8,0,0,0-6.86-1.45L160.93,63.52,99.58,32.84a8,8,0,0,0-5.52-.6l-64,16A8,8,0,0,0,24,56V200a8,8,0,0,0,9.94,7.76l61.13-15.28,61.35,30.68A8.15,8.15,0,0,0,160,224a8,8,0,0,0,1.94-.24l64-16A8,8,0,0,0,232,200V56A8,8,0,0,0,228.92,49.69ZM96,176a8,8,0,0,0-1.94.24L40,189.75V62.25L95.07,48.48l.93.46Zm120,17.75-55.07,13.77-.93-.46V80a8,8,0,0,0,1.94-.23L216,66.25Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.HoodieFill">M237.31,120.53,183,39.12A16,16,0,0,0,169.73,32H86.27A16,16,0,0,0,73,39.12L18.69,120.53a16,16,0,0,0-2.13,13.09L38,212.21A16,16,0,0,0,53.43,224H80a16,16,0,0,0,16-16V192h64v16a16,16,0,0,0,16,16h26.57A16,16,0,0,0,218,212.21l21.44-78.59A16,16,0,0,0,237.31,120.53ZM80,208H53.43L32,129.41l32-48V176a16,16,0,0,0,16,16Zm40-72a8,8,0,0,1-16,0V97.14a8,8,0,1,1,16,0Zm32-8a8,8,0,0,1-16,0V97.14a8,8,0,1,1,16,0ZM128,78.71,83.35,52.39,86.27,48h83.46l2.92,4.39ZM202.57,208H176V192a16,16,0,0,0,16-16V81.41l32,48Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.NumberTwoFill">M200,24H56A16,16,0,0,0,40,40V216a16,16,0,0,0,16,16H200a16,16,0,0,0,16-16V40A16,16,0,0,0,200,24ZM160,176a8,8,0,0,1,0,16H96a8,8,0,0,1-5.79-13.52L145.9,120a24,24,0,0,0-35.73-32A23.33,23.33,0,0,0,107,92.38a8,8,0,0,1-14-7.77,40.22,40.22,0,0,1,5.28-7.38,40,40,0,0,1,59.45,53.54l-.16.16L114.66,176Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ListHeartFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM104,184H64a8,8,0,0,1,0-16h40a8,8,0,0,1,0,16ZM56,128a8,8,0,0,1,8-8H96a8,8,0,0,1,0,16H64A8,8,0,0,1,56,128Zm105.79,57.58a4,4,0,0,1-3.58,0C156.65,184.8,120,166.17,120,140a22,22,0,0,1,40-12.64A22,22,0,0,1,200,140C200,166.17,163.35,184.8,161.79,185.58ZM192,88H64a8,8,0,0,1,0-16H192a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.GearFill">M216,130.16q.06-2.16,0-4.32l14.92-18.64a8,8,0,0,0,1.48-7.06,107.6,107.6,0,0,0-10.88-26.25,8,8,0,0,0-6-3.93l-23.72-2.64q-1.48-1.56-3-3L186,40.54a8,8,0,0,0-3.94-6,107.29,107.29,0,0,0-26.25-10.86,8,8,0,0,0-7.06,1.48L130.16,40Q128,40,125.84,40L107.2,25.11a8,8,0,0,0-7.06-1.48A107.6,107.6,0,0,0,73.89,34.51a8,8,0,0,0-3.93,6L67.32,64.27q-1.56,1.49-3,3L40.54,70a8,8,0,0,0-6,3.94,107.71,107.71,0,0,0-10.87,26.25,8,8,0,0,0,1.49,7.06L40,125.84Q40,128,40,130.16L25.11,148.8a8,8,0,0,0-1.48,7.06,107.6,107.6,0,0,0,10.88,26.25,8,8,0,0,0,6,3.93l23.72,2.64q1.49,1.56,3,3L70,215.46a8,8,0,0,0,3.94,6,107.71,107.71,0,0,0,26.25,10.87,8,8,0,0,0,7.06-1.49L125.84,216q2.16.06,4.32,0l18.64,14.92a8,8,0,0,0,7.06,1.48,107.21,107.21,0,0,0,26.25-10.88,8,8,0,0,0,3.93-6l2.64-23.72q1.56-1.48,3-3L215.46,186a8,8,0,0,0,6-3.94,107.71,107.71,0,0,0,10.87-26.25,8,8,0,0,0-1.49-7.06ZM128,168a40,40,0,1,1,40-40A40,40,0,0,1,128,168Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.TextAlignCenterFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM176,184H80a8,8,0,0,1,0-16h96a8,8,0,0,1,0,16Zm16-32H64a8,8,0,0,1,0-16H192a8,8,0,0,1,0,16ZM72,112a8,8,0,0,1,8-8h96a8,8,0,0,1,0,16H80A8,8,0,0,1,72,112ZM192,88H64a8,8,0,0,1,0-16H192a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.EggFill">M216,152a88,88,0,0,1-176,0c0-30.77,10.7-64.46,29.34-92.44C87.53,32.29,109.46,16,128,16s40.47,16.29,58.66,43.56C205.3,87.54,216,121.23,216,152Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.DotsSixFill">M224,48H32A16,16,0,0,0,16,64V192a16,16,0,0,0,16,16H224a16,16,0,0,0,16-16V64A16,16,0,0,0,224,48ZM68,168a12,12,0,1,1,12-12A12,12,0,0,1,68,168Zm0-56a12,12,0,1,1,12-12A12,12,0,0,1,68,112Zm60,56a12,12,0,1,1,12-12A12,12,0,0,1,128,168Zm0-56a12,12,0,1,1,12-12A12,12,0,0,1,128,112Zm60,56a12,12,0,1,1,12-12A12,12,0,0,1,188,168Zm0-56a12,12,0,1,1,12-12A12,12,0,0,1,188,112Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.HairDryerFill">M177.42,206.62,209,137.07A64,64,0,0,0,168,24a8.4,8.4,0,0,0-1.32.11L29.37,47A16,16,0,0,0,16,62.78v50.44A16,16,0,0,0,29.37,129L128,145.44V200a16,16,0,0,0,16,16,40,40,0,0,0,40,40h16a8,8,0,0,0,0-16H184a24,24,0,0,1-24-24h2.85A16,16,0,0,0,177.42,206.62ZM192,88a24,24,0,1,1-24-24A24,24,0,0,1,192,88Zm-25.32,63.89A8.4,8.4,0,0,0,168,152a63.9,63.9,0,0,0,17.82-2.54l-23,50.54H144V148.11Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.YoutubeLogoFill">M234.33,69.52a24,24,0,0,0-14.49-16.4C185.56,39.88,131,40,128,40s-57.56-.12-91.84,13.12a24,24,0,0,0-14.49,16.4C19.08,79.5,16,97.74,16,128s3.08,48.5,5.67,58.48a24,24,0,0,0,14.49,16.41C69,215.56,120.4,216,127.34,216h1.32c6.94,0,58.37-.44,91.18-13.11a24,24,0,0,0,14.49-16.41c2.59-10,5.67-28.22,5.67-58.48S236.92,79.5,234.33,69.52Zm-73.74,65-40,28A8,8,0,0,1,108,156V100a8,8,0,0,1,12.59-6.55l40,28a8,8,0,0,1,0,13.1Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.GithubLogoFill">M216,104v8a56.06,56.06,0,0,1-48.44,55.47A39.8,39.8,0,0,1,176,192v40a8,8,0,0,1-8,8H104a8,8,0,0,1-8-8V216H72a40,40,0,0,1-40-40A24,24,0,0,0,8,152a8,8,0,0,1,0-16,40,40,0,0,1,40,40,24,24,0,0,0,24,24H96v-8a39.8,39.8,0,0,1,8.44-24.53A56.06,56.06,0,0,1,56,112v-8a58.14,58.14,0,0,1,7.69-28.32A59.78,59.78,0,0,1,69.07,28,8,8,0,0,1,76,24a59.75,59.75,0,0,1,48,24h24a59.75,59.75,0,0,1,48-24,8,8,0,0,1,6.93,4,59.74,59.74,0,0,1,5.37,47.68A58,58,0,0,1,216,104Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BarnFill">M240,192h-8V130.57l1.49,2.08a8,8,0,1,0,13-9.3l-40-56a8,8,0,0,0-2-1.94L137,18.77l-.1-.07a16,16,0,0,0-17.76,0l-.1.07L51.45,65.42a8,8,0,0,0-2,1.94l-40,56a8,8,0,1,0,13,9.3L24,130.57V192H16a8,8,0,0,0,0,16H240a8,8,0,0,0,0-16ZM112,80h32a8,8,0,1,1,0,16H112a8,8,0,1,1,0-16Zm52.64,40L128,146.17,91.36,120ZM72,125.83,114.24,156,72,186.17ZM91.36,192,128,165.83,164.64,192ZM184,186.17,141.76,156,184,125.83Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.GameControllerFill">M247.44,173.75a.68.68,0,0,0,0-.14L231.05,89.44c0-.06,0-.12,0-.18A60.08,60.08,0,0,0,172,40H83.89a59.88,59.88,0,0,0-59,49.52L8.58,173.61a.68.68,0,0,0,0,.14,36,36,0,0,0,60.9,31.71l.35-.37L109.52,160h37l39.71,45.09c.11.13.23.25.35.37A36.08,36.08,0,0,0,212,216a36,36,0,0,0,35.43-42.25ZM104,112H96v8a8,8,0,0,1-16,0v-8H72a8,8,0,0,1,0-16h8V88a8,8,0,0,1,16,0v8h8a8,8,0,0,1,0,16Zm40-8a8,8,0,0,1,8-8h24a8,8,0,0,1,0,16H152A8,8,0,0,1,144,104Zm84.37,87.47a19.84,19.84,0,0,1-12.9,8.23A20.09,20.09,0,0,1,198,194.31L167.8,160H172a60,60,0,0,0,51-28.38l8.74,45A19.82,19.82,0,0,1,228.37,191.47Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.AppWindowFill">M216,40H40A16,16,0,0,0,24,56V200a16,16,0,0,0,16,16H216a16,16,0,0,0,16-16V56A16,16,0,0,0,216,40ZM68,96A12,12,0,1,1,80,84,12,12,0,0,1,68,96Zm40,0a12,12,0,1,1,12-12A12,12,0,0,1,108,96Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.AirplaneTakeoffFill">M176,216a8,8,0,0,1-8,8H24a8,8,0,0,1,0-16H168A8,8,0,0,1,176,216ZM246.31,86.76,227.67,62.87l-.12-.15a39.82,39.82,0,0,0-51.28-9.12L124.7,84.38,70.76,64.54a8,8,0,0,0-5.59,0L58,67.27l-.32.13a16,16,0,0,0-4.53,26.47L75,115.06l-20.17,12.2-28.26-9.54a8,8,0,0,0-6.08.4l-3,1.47A16,16,0,0,0,13,145.8l36,35.27.12.12a39.78,39.78,0,0,0,27.28,10.87,40.18,40.18,0,0,0,20.26-5.52l147.41-88a8,8,0,0,0,2.21-11.78Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.GarageFill">M240,192h-8V98.67a16,16,0,0,0-7.12-13.31l-88-58.67a16,16,0,0,0-17.75,0l-88,58.67A16,16,0,0,0,24,98.67V192H16a8,8,0,0,0,0,16H240a8,8,0,0,0,0-16ZM136,128h56v24H136Zm-16,24H64V128h56ZM64,168h56v24H64Zm72,0h56v24H136Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.EqualsFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM184,160H72a8,8,0,0,1,0-16H184a8,8,0,0,1,0,16Zm0-48H72a8,8,0,0,1,0-16H184a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.LassoFill">M93.43,136.11a17.14,17.14,0,0,0-15.35,6.1c9.31,6.56,22.51,11.33,37.43,13.07C110.41,143.33,101.72,137,93.43,136.11Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.LassoFill2">M224,48V208a16,16,0,0,1-16,16H127.65a4,4,0,0,1-3.23-6.34c7.5-10.23,11.58-23.24,11.58-37.84,0-2.79-.13-5.46-.35-8.05C176.79,169.33,208,147.47,208,120c0-29.15-35.14-52-80-52S48,90.84,48,120c0,27.31,30.82,49.07,71.58,51.73a77,77,0,0,1,.42,8.09c0,17.62-7.65,31.95-21,39.32A38.77,38.77,0,0,1,79.27,224H48a16,16,0,0,1-16-16V48A16,16,0,0,1,48,32H208A16,16,0,0,1,224,48Zm-32,72c0-19.51-29.31-36-64-36s-64,16.48-64,36a21.29,21.29,0,0,0,3,10.63A33.65,33.65,0,0,1,95.16,120.2c15,1.63,30.84,13.4,37.54,35.68C165.3,154.47,192,138.62,192,120Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FileAudioFill">M152,180a40.55,40.55,0,0,1-20,34.91A8,8,0,0,1,124,201.09a24.49,24.49,0,0,0,0-42.18A8,8,0,0,1,132,145.09,40.55,40.55,0,0,1,152,180ZM99.06,128.61a8,8,0,0,0-8.72,1.73L68.69,152H48a8,8,0,0,0-8,8v40a8,8,0,0,0,8,8H68.69l21.65,21.66A8,8,0,0,0,104,224V136A8,8,0,0,0,99.06,128.61ZM216,88V216a16,16,0,0,1-16,16H168a8,8,0,0,1,0-16h32V96H152a8,8,0,0,1-8-8V40H56v80a8,8,0,0,1-16,0V40A16,16,0,0,1,56,24h96a8,8,0,0,1,5.66,2.34l56,56A8,8,0,0,1,216,88Zm-56-8h28.69L160,51.31Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.GreaterThanFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM187.35,135.26l-104,48a8,8,0,0,1-6.7-14.52L164.91,128,76.65,87.26a8,8,0,1,1,6.7-14.52l104,48a8,8,0,0,1,0,14.52Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.NotSupersetOfFill">M164.09,98.9A24,24,0,0,1,144,136H131.63ZM224,48V208a16,16,0,0,1-16,16H48a16,16,0,0,1-16-16V48A16,16,0,0,1,48,32H208A16,16,0,0,1,224,48ZM189.27,58a8,8,0,0,0-11.29.75L162.42,76.51A39.82,39.82,0,0,0,144,72H80a8,8,0,0,0,0,16h64a23.87,23.87,0,0,1,7.36,1.16l-41,46.84H80a8,8,0,0,0,0,16H96.37L66,186.73a8,8,0,0,0,12,10.54L89.63,184H176a8,8,0,0,0,0-16H103.63l14-16H144a40,40,0,0,0,30.87-65.41L190,69.27A8,8,0,0,0,189.27,58Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.StairsFill">M200,24H56A16,16,0,0,0,40,40V216a16,16,0,0,0,16,16H200a16,16,0,0,0,16-16V40A16,16,0,0,0,200,24Zm-40,80h40v24H160Zm-48,40h88v24H112Zm88,72H56V184H200v32Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.WarningDiamondFill">M235.33,116.72,139.28,20.66a16,16,0,0,0-22.56,0l-96,96.06a16,16,0,0,0,0,22.56l96.05,96.06h0a16,16,0,0,0,22.56,0l96.05-96.06a16,16,0,0,0,0-22.56ZM120,80a8,8,0,0,1,16,0v56a8,8,0,0,1-16,0Zm8,104a12,12,0,1,1,12-12A12,12,0,0,1,128,184Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowFatLinesLeftFill">M160,80v96a8,8,0,0,1-8,8H128v40a8,8,0,0,1-13.66,5.66l-96-96a8,8,0,0,1,0-11.32l96-96A8,8,0,0,1,128,32V72h24A8,8,0,0,1,160,80Zm56-8a8,8,0,0,0-8,8v96a8,8,0,0,0,16,0V80A8,8,0,0,0,216,72Zm-32,0a8,8,0,0,0-8,8v96a8,8,0,0,0,16,0V80A8,8,0,0,0,184,72Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.XSquareFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM165.66,154.34a8,8,0,0,1-11.32,11.32L128,139.31l-26.34,26.35a8,8,0,0,1-11.32-11.32L116.69,128,90.34,101.66a8,8,0,0,1,11.32-11.32L128,116.69l26.34-26.35a8,8,0,0,1,11.32,11.32L139.31,128Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CarProfileFill">M240,112H211.31L168,68.69A15.86,15.86,0,0,0,156.69,64H44.28A16,16,0,0,0,31,71.12L1.34,115.56A8.07,8.07,0,0,0,0,120v48a16,16,0,0,0,16,16H33a32,32,0,0,0,62,0h66a32,32,0,0,0,62,0h17a16,16,0,0,0,16-16V128A16,16,0,0,0,240,112ZM44.28,80H156.69l32,32H23ZM64,192a16,16,0,1,1,16-16A16,16,0,0,1,64,192Zm128,0a16,16,0,1,1,16-16A16,16,0,0,1,192,192Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PianoKeysFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM88,208H48V48H72v96a8,8,0,0,0,8,8h8Zm64,0H104V152h8a8,8,0,0,0,8-8V48h16v96a8,8,0,0,0,8,8h8Zm56,0H168V152h8a8,8,0,0,0,8-8V48h24V208Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ChatTeardropDotsFill">M132,24A100.11,100.11,0,0,0,32,124v84a16,16,0,0,0,16,16h84a100,100,0,0,0,0-200ZM88,140a12,12,0,1,1,12-12A12,12,0,0,1,88,140Zm44,0a12,12,0,1,1,12-12A12,12,0,0,1,132,140Zm44,0a12,12,0,1,1,12-12A12,12,0,0,1,176,140Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.EarFill">M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24Zm20,128a4.21,4.21,0,0,0,1.33-.22,8,8,0,0,1,5.34,15.08A20,20,0,0,1,128,148c0-8.85,4.77-15.23,9-20.87,3.77-5,7-9.38,7-15.13a16,16,0,0,0-32,0,8,8,0,0,1-16,0,32,32,0,0,1,64,0c0,11.07-5.66,18.63-10.2,24.71-3.6,4.81-5.8,7.93-5.8,11.29A4,4,0,0,0,148,152Zm36-32a8,8,0,0,1-8-8,48,48,0,0,0-96,0c0,11.9,6.71,20.5,13.82,29.6,7,8.92,14.18,18.15,14.18,30.4a20,20,0,0,0,34,14.29,8,8,0,1,1,11.19,11.42A36,36,0,0,1,92,172c0-6.74-5-13.14-10.79-20.55C73.54,141.63,64,129.41,64,112a64,64,0,0,1,128,0A8,8,0,0,1,184,120Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CalendarFill">M208,32H184V24a8,8,0,0,0-16,0v8H88V24a8,8,0,0,0-16,0v8H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM112,184a8,8,0,0,1-16,0V132.94l-4.42,2.22a8,8,0,0,1-7.16-14.32l16-8A8,8,0,0,1,112,120Zm56-8a8,8,0,0,1,0,16H136a8,8,0,0,1-6.4-12.8l28.78-38.37A8,8,0,1,0,145.07,132a8,8,0,1,1-13.85-8A24,24,0,0,1,176,136a23.76,23.76,0,0,1-4.84,14.45L152,176ZM48,80V48H72v8a8,8,0,0,0,16,0V48h80v8a8,8,0,0,0,16,0V48h24V80Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.TrophyFill">M232,64H208V48a8,8,0,0,0-8-8H56a8,8,0,0,0-8,8V64H24A16,16,0,0,0,8,80V96a40,40,0,0,0,40,40h3.65A80.13,80.13,0,0,0,120,191.61V216H96a8,8,0,0,0,0,16h64a8,8,0,0,0,0-16H136V191.58c31.94-3.23,58.44-25.64,68.08-55.58H208a40,40,0,0,0,40-40V80A16,16,0,0,0,232,64ZM48,120A24,24,0,0,1,24,96V80H48v32q0,4,.39,8ZM232,96a24,24,0,0,1-24,24h-.5a81.81,81.81,0,0,0,.5-8.9V80h24Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.LinkSimpleFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM144.56,173.66l-21.45,21.45a44,44,0,0,1-62.22-62.22l21.45-21.46a8,8,0,0,1,11.32,11.31L72.2,144.2a28,28,0,0,0,39.6,39.6l21.45-21.46a8,8,0,0,1,11.31,11.32Zm-34.9-16a8,8,0,0,1-11.32-11.32l48-48a8,8,0,0,1,11.32,11.32Zm85.45-34.55-21.45,21.45a8,8,0,0,1-11.32-11.31L183.8,111.8a28,28,0,0,0-39.6-39.6L122.74,93.66a8,8,0,0,1-11.31-11.32l21.46-21.45a44,44,0,0,1,62.22,62.22Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SignatureFill">M80.3,120.26A58.29,58.29,0,0,1,81,97.07C83.32,87,87.89,80,92.1,80c2.57,0,2.94.67,3.12,1,.88,1.61,4,10.93-12.63,46.52A28.87,28.87,0,0,1,80.3,120.26ZM232,56V200a16,16,0,0,1-16,16H40a16,16,0,0,1-16-16V56A16,16,0,0,1,40,40H216A16,16,0,0,1,232,56ZM84,160c2-3.59,3.94-7.32,5.9-11.14,10.34-.32,22.21-7.57,35.47-21.68,5,9.69,11.38,15.25,18.87,16.55,8,1.38,16-2.38,23.94-11.2,6,5.53,16.15,11.47,31.8,11.47a8,8,0,0,0,0-16c-17.91,0-24.3-10.88-24.84-11.86a7.83,7.83,0,0,0-6.54-4.51,8,8,0,0,0-7.25,3.6c-6.78,10-11.87,13.16-14.39,12.73-4-.69-9.15-10-11.23-18a8,8,0,0,0-14-3c-8.88,10.94-16.3,17.79-22.13,21.66,15.8-35.65,13.27-48.59,9.6-55.3C107.35,69.84,102.59,64,92.1,64,79.66,64,69.68,75,65.41,93.46a75,75,0,0,0-.83,29.81c1.7,8.9,5.17,15.73,10.16,20.12-3,5.81-6.09,11.43-9,16.61H56a8,8,0,0,0,0,16h.44c-4.26,7.12-7.11,11.59-7.18,11.69a8,8,0,0,0,13.48,8.62c.36-.55,5.47-8.57,12.29-20.31H200a8,8,0,0,0,0-16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArticleNyTimesFill">M216,40H40A16,16,0,0,0,24,56V200a16,16,0,0,0,16,16H216a16,16,0,0,0,16-16V56A16,16,0,0,0,216,40ZM64,92a8,8,0,0,1-16,0V80a8,8,0,0,1,8-8h72a8,8,0,0,1,8,8V92a8,8,0,0,1-16,0V88H100v48h4a8,8,0,0,1,0,16H80a8,8,0,0,1,0-16h4V88H64Zm136,92H80a8,8,0,0,1,0-16H200a8,8,0,0,1,0,16Zm0-32H136a8,8,0,0,1,0-16h64a8,8,0,0,1,0,16Zm0-32H152a8,8,0,0,1,0-16h48a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.MouseFill">M144,16H112A64.07,64.07,0,0,0,48,80v96a64.07,64.07,0,0,0,64,64h32a64.07,64.07,0,0,0,64-64V80A64.07,64.07,0,0,0,144,16Zm48,64v24H136V32h8A48.05,48.05,0,0,1,192,80ZM112,32h8v72H64V80A48.05,48.05,0,0,1,112,32Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SmileyNervousFill">M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24Zm36,72a12,12,0,1,1-12,12A12,12,0,0,1,164,96ZM92,96a12,12,0,1,1-12,12A12,12,0,0,1,92,96Zm84,80c-10,0-15.05-6.74-18.4-11.2-3-4-3.92-4.8-5.6-4.8s-2.57.76-5.6,4.8C143.05,169.26,138,176,128,176s-15-6.74-18.4-11.2c-3-4-3.92-4.8-5.6-4.8s-2.57.76-5.6,4.8C95.05,169.26,90,176,80,176a8,8,0,0,1,0-16c1.68,0,2.57-.76,5.6-4.8C89,150.74,94,144,104,144s15,6.74,18.4,11.2c3,4,3.92,4.8,5.6,4.8s2.57-.76,5.6-4.8C137,150.74,142,144,152,144s15.05,6.74,18.4,11.2c3,4,3.92,4.8,5.6,4.8a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PentagramFill">M60.18,129.52a4,4,0,0,1-6.15,2L22.66,109a15.78,15.78,0,0,1-5.82-18A16.33,16.33,0,0,1,32.43,80H70.74a4,4,0,0,1,3.81,5.24Zm-7,73.48A15.75,15.75,0,0,0,59,220.88a15.74,15.74,0,0,0,18.77,0l32.05-23.06a4,4,0,0,0,0-6.5L71.38,163.72a4,4,0,0,0-6.14,2ZM143.23,19.26a15.93,15.93,0,0,0-30.45-.05L100,58.76A4,4,0,0,0,103.76,64h48.48a4,4,0,0,0,3.81-5.23ZM160,80H96a4,4,0,0,0-3.8,2.77L73,141.77a4,4,0,0,0,1.47,4.48l51.17,36.82a4,4,0,0,0,4.68,0l51.17-36.82a4,4,0,0,0,1.47-4.48l-19.15-59A4,4,0,0,0,160,80Zm79.13,11a16.33,16.33,0,0,0-15.59-11H185.26a4,4,0,0,0-3.81,5.24l14.37,44.29a4,4,0,0,0,6.14,2l31.41-22.6A15.75,15.75,0,0,0,239.16,91Zm-54.55,72.75-38.4,27.63a4,4,0,0,0,0,6.5l32,23A16,16,0,0,0,202.85,203l-12.09-37.27A4,4,0,0,0,184.61,163.72Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.AirTrafficControlFill">M229.11,70.82A16,16,0,0,0,216,64H136V32h16a8,8,0,0,0,0-16H104a8,8,0,0,0,0,16h16V64H40A16,16,0,0,0,25,85.47l26.19,72a16,16,0,0,0,15,10.53H189.82a16,16,0,0,0,15-10.53l26.19-72A16,16,0,0,0,229.11,70.82ZM102.52,151.87a7.87,7.87,0,0,1-1.44.13,8,8,0,0,1-7.86-6.57L83,89.43a8,8,0,0,1,15.75-2.86l10.18,56A8,8,0,0,1,102.52,151.87ZM173,89.43l-10.19,56a8,8,0,0,1-7.86,6.57,7.87,7.87,0,0,1-1.44-.13,8,8,0,0,1-6.44-9.3l10.18-56A8,8,0,0,1,173,89.43ZM160,188v44a8,8,0,0,1-8,8H104a8,8,0,0,1-8-8V188a4,4,0,0,1,4-4h56A4,4,0,0,1,160,188Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.TextBFill">M168,156a20,20,0,0,1-20,20H96V136h52A20,20,0,0,1,168,156ZM224,48V208a16,16,0,0,1-16,16H48a16,16,0,0,1-16-16V48A16,16,0,0,1,48,32H208A16,16,0,0,1,224,48ZM184,156a36,36,0,0,0-18-31.15A36,36,0,0,0,140,64H88a8,8,0,0,0-8,8V184a8,8,0,0,0,8,8h60A36,36,0,0,0,184,156Zm-24-56a20,20,0,0,0-20-20H96v40h44A20,20,0,0,0,160,100Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.WarningOctagonFill">M227.31,80.23,175.77,28.69A16.13,16.13,0,0,0,164.45,24H91.55a16.13,16.13,0,0,0-11.32,4.69L28.69,80.23A16.13,16.13,0,0,0,24,91.55v72.9a16.13,16.13,0,0,0,4.69,11.32l51.54,51.54A16.13,16.13,0,0,0,91.55,232h72.9a16.13,16.13,0,0,0,11.32-4.69l51.54-51.54A16.13,16.13,0,0,0,232,164.45V91.55A16.13,16.13,0,0,0,227.31,80.23ZM120,80a8,8,0,0,1,16,0v56a8,8,0,0,1-16,0Zm8,104a12,12,0,1,1,12-12A12,12,0,0,1,128,184Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.RulerFill">M235.32,96,96,235.31a16,16,0,0,1-22.63,0L20.68,182.63a16,16,0,0,1,0-22.63l29.17-29.17a4,4,0,0,1,5.66,0l34.83,34.83a8,8,0,0,0,11.71-.43,8.18,8.18,0,0,0-.6-11.09L66.82,119.51a4,4,0,0,1,0-5.65l15-15a4,4,0,0,1,5.66,0l34.83,34.83a8,8,0,0,0,11.71-.43,8.18,8.18,0,0,0-.6-11.09L98.83,87.51a4,4,0,0,1,0-5.65l15-15a4,4,0,0,1,5.65,0l34.83,34.83a8,8,0,0,0,11.72-.43,8.18,8.18,0,0,0-.61-11.09L130.83,55.51a4,4,0,0,1,0-5.65L160,20.69a16,16,0,0,1,22.63,0l52.69,52.68A16,16,0,0,1,235.32,96Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.GearFineFill">M232,120h-8.34a95.07,95.07,0,0,0-8.82-32.9l7.23-4.17a8,8,0,0,0-8-13.86l-7.25,4.19a97,97,0,0,0-24.08-24.08l4.19-7.25a8,8,0,0,0-13.86-8l-4.17,7.23A95.07,95.07,0,0,0,136,32.34V24a8,8,0,0,0-16,0v8.34a95.07,95.07,0,0,0-32.9,8.82l-4.17-7.23a8,8,0,0,0-13.86,8l4.19,7.25A97,97,0,0,0,49.18,73.26l-7.25-4.19a8,8,0,0,0-8,13.86l7.23,4.17A95.07,95.07,0,0,0,32.34,120H24a8,8,0,0,0,0,16h8.34a95.07,95.07,0,0,0,8.82,32.9l-7.23,4.17a8,8,0,0,0,4,14.93,7.92,7.92,0,0,0,4-1.07l7.25-4.19a97,97,0,0,0,24.08,24.08l-4.19,7.25a8,8,0,0,0,13.86,8l4.17-7.23a95.07,95.07,0,0,0,32.9,8.82V232a8,8,0,0,0,16,0v-8.34a95.07,95.07,0,0,0,32.9-8.82l4.17,7.23a8,8,0,0,0,13.86-8l-4.19-7.25a97,97,0,0,0,24.08-24.08l7.25,4.19A8,8,0,0,0,225,184a8,8,0,0,0-2.92-10.93l-7.23-4.17a95.07,95.07,0,0,0,8.82-32.9H232a8,8,0,0,0,0-16ZM72,128A55.91,55.91,0,0,1,93.38,84l25.38,44L93.38,172A55.91,55.91,0,0,1,72,128Zm56,56a55.67,55.67,0,0,1-20.78-4l25.4-44h50.8A56.09,56.09,0,0,1,128,184Zm4.62-64-25.4-44a56,56,0,0,1,76.2,44Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.MegaphoneSimpleFill">M228.54,86.66l-176.06-54A16,16,0,0,0,32,48V192a16,16,0,0,0,16,16,16,16,0,0,0,4.52-.65L136,181.73V192a16,16,0,0,0,16,16h32a16,16,0,0,0,16-16v-29.9l28.54-8.75A16.09,16.09,0,0,0,240,138V102A16.09,16.09,0,0,0,228.54,86.66ZM184,192H152V176.82L184,167Zm40-54-.11,0L152,160.08V79.91L223.89,102l.11,0v36Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.MouseSimpleFill">M144,16H112A64.07,64.07,0,0,0,48,80v96a64.07,64.07,0,0,0,64,64h32a64.07,64.07,0,0,0,64-64V80A64.07,64.07,0,0,0,144,16Zm-8,96a8,8,0,0,1-16,0V64a8,8,0,0,1,16,0Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.MeteorFill">M136,160a40,40,0,1,1-40-40A40,40,0,0,1,136,160Zm74.34-37.66-48,48a8,8,0,0,0,11.32,11.32l48-48a8,8,0,0,0-11.32-11.32Zm-20.68-12.68a8,8,0,0,0-11.32-11.32l-24,24a8,8,0,0,0,11.32,11.32Zm40-51.32a8,8,0,0,0-11.32,0l-16,16a8,8,0,0,0,11.32,11.32l16-16A8,8,0,0,0,229.66,58.34ZM122.34,101.66a8,8,0,0,0,11.32,0l72-72a8,8,0,1,0-11.32-11.32l-72,72A8,8,0,0,0,122.34,101.66ZM135.6,199.6a56,56,0,0,1-79.2-79.2l82.75-82.74a8,8,0,1,0-11.32-11.32L45.09,109.09A72,72,0,1,0,146.91,210.91,8,8,0,0,0,135.6,199.6Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.TextAlignRightFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM192,184H96a8,8,0,0,1,0-16h96a8,8,0,0,1,0,16Zm0-32H64a8,8,0,0,1,0-16H192a8,8,0,0,1,0,16Zm0-32H96a8,8,0,0,1,0-16h96a8,8,0,0,1,0,16Zm0-32H64a8,8,0,0,1,0-16H192a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowFatLineDownFill">M229.66,141.66l-96,96a8,8,0,0,1-11.32,0l-96-96A8,8,0,0,1,32,128H72V72a8,8,0,0,1,8-8h96a8,8,0,0,1,8,8v56h40a8,8,0,0,1,5.66,13.66ZM184,40a8,8,0,0,0-8-8H80a8,8,0,0,0,0,16h96A8,8,0,0,0,184,40Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.LockLaminatedOpenFill">M208,80H96V56a32,32,0,0,1,32-32c15.37,0,29.2,11,32.16,25.59a8,8,0,0,0,15.68-3.18C171.32,24.15,151.2,8,128,8A48.05,48.05,0,0,0,80,56V80H48A16,16,0,0,0,32,96V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V96A16,16,0,0,0,208,80ZM184,192H72a8,8,0,0,1,0-16H184a8,8,0,0,1,0,16Zm0-32H72a8,8,0,0,1,0-16H184a8,8,0,0,1,0,16Zm0-32H72a8,8,0,0,1,0-16H184a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.TaxiFill">M240,104H228.64L201.25,56.06A16,16,0,0,0,187.36,48H165.42l-12-29.94A15.93,15.93,0,0,0,138.58,8H117.42a15.93,15.93,0,0,0-14.86,10.06L90.58,48H68.64a16,16,0,0,0-13.89,8.06L27.36,104H16a8,8,0,0,0,0,16h8v80a16,16,0,0,0,16,16H64a16,16,0,0,0,16-16v-8h96v8a16,16,0,0,0,16,16h24a16,16,0,0,0,16-16V120h8a8,8,0,0,0,0-16ZM80,152H56a8,8,0,0,1,0-16H80a8,8,0,0,1,0,16Zm120,0H176a8,8,0,0,1,0-16h24a8,8,0,0,1,0,16ZM45.79,104,68.64,64H187.36l22.85,40Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SpeakerSlashFill">M213.92,210.62a8,8,0,1,1-11.84,10.76L160,175.09v48.6a8.29,8.29,0,0,1-3.91,7.18,8,8,0,0,1-9-.56l-65.55-51A4,4,0,0,1,80,176.18V87.09L42.08,45.38A8,8,0,1,1,53.92,34.62Zm-27.21-55.46a8,8,0,0,0,11.29-.7,40,40,0,0,0,0-52.88,8,8,0,1,0-12,10.57,24,24,0,0,1,0,31.72A8,8,0,0,0,186.71,155.16Zm40.92-80.49a8,8,0,1,0-11.92,10.66,64,64,0,0,1,0,85.34,8,8,0,1,0,11.92,10.66,80,80,0,0,0,0-106.66ZM153,119.87a4,4,0,0,0,7-2.7V32.25a8.27,8.27,0,0,0-2.88-6.4,8,8,0,0,0-10-.16L103.83,59.33a4,4,0,0,0-.5,5.85ZM60,80H32A16,16,0,0,0,16,96v64a16,16,0,0,0,16,16H60a4,4,0,0,0,4-4V84A4,4,0,0,0,60,80Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.TennisBallFill">M24.81,115.41a103.9,103.9,0,0,1,90.6-90.65,4,4,0,0,1,4.47,3.79,87.82,87.82,0,0,1-91.27,91.33A4,4,0,0,1,24.81,115.41Zm202.54,20.7c-1.12,0-2.23-.07-3.35-.07a87.84,87.84,0,0,0-87.88,91.41,4,4,0,0,0,4.47,3.79,103.9,103.9,0,0,0,90.6-90.66A4,4,0,0,0,227.35,136.11Zm-76.89,14.35A103.33,103.33,0,0,1,224,120c1,0,2.06,0,3.09,0a4,4,0,0,0,4.12-4.43,103.91,103.91,0,0,0-90.88-90.89,4,4,0,0,0-4.43,4.12,103.72,103.72,0,0,1-30.36,76.7A103.33,103.33,0,0,1,32,136c-1,0-2.06,0-3.09,0a4,4,0,0,0-4.12,4.43,103.91,103.91,0,0,0,90.88,90.89,4,4,0,0,0,4.43-4.12A103.72,103.72,0,0,1,150.46,150.46Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.MopedFrontFill">M208,40H167.2a40,40,0,0,0-78.4,0H48a8,8,0,0,0,0,16H88.8a40,40,0,0,0,12.58,21.82A64.08,64.08,0,0,0,64,136v64a16,16,0,0,0,16,16H96a32,32,0,0,0,64,0h16a16,16,0,0,0,16-16V136a64.08,64.08,0,0,0-37.38-58.18A40,40,0,0,0,167.2,56H208a8,8,0,0,0,0-16ZM144,216a16,16,0,0,1-32,0V168a16,16,0,0,1,32,0ZM128,72a24,24,0,1,1,24-24A24,24,0,0,1,128,72Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowBendDownLeftFill">M232,56A104.11,104.11,0,0,1,128,160H88v40a8,8,0,0,1-13.66,5.66l-48-48a8,8,0,0,1,0-11.32l48-48A8,8,0,0,1,88,104v40h40a88.1,88.1,0,0,0,88-88,8,8,0,0,1,16,0Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FilmReelFill">M232,216H183.36A103.95,103.95,0,1,0,128,232H232a8,8,0,0,0,0-16ZM80,148a20,20,0,1,1,20-20A20,20,0,0,1,80,148Zm48,48a20,20,0,1,1,20-20A20,20,0,0,1,128,196Zm0-96a20,20,0,1,1,20-20A20,20,0,0,1,128,100Zm28,28a20,20,0,1,1,20,20A20,20,0,0,1,156,128Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SwordFill">M216,32H152a8,8,0,0,0-6.34,3.12l-64,83.21L72,108.69a16,16,0,0,0-22.64,0l-8.69,8.7a16,16,0,0,0,0,22.63l22,22-32,32a16,16,0,0,0,0,22.63l8.69,8.68a16,16,0,0,0,22.62,0l32-32,22,22a16,16,0,0,0,22.64,0l8.69-8.7a16,16,0,0,0,0-22.63l-9.64-9.64,83.21-64A8,8,0,0,0,224,104V40A8,8,0,0,0,216,32Zm-8,68.06-81.74,62.88L115.32,152l50.34-50.34a8,8,0,0,0-11.32-11.31L104,140.68,93.07,129.74,155.94,48H208Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BriefcaseMetalFill">M28,112H228a4,4,0,0,1,4,4v40a4,4,0,0,1-4,4H28a4,4,0,0,1-4-4V116A4,4,0,0,1,28,112Zm-4,88a16,16,0,0,0,16,16H216a16,16,0,0,0,16-16V180a4,4,0,0,0-4-4H28a4,4,0,0,0-4,4ZM232,72V92a4,4,0,0,1-4,4H28a4,4,0,0,1-4-4V72A16,16,0,0,1,40,56H80V48a24,24,0,0,1,24-24h48a24,24,0,0,1,24,24v8h40A16,16,0,0,1,232,72ZM160,48a8,8,0,0,0-8-8H104a8,8,0,0,0-8,8v8h64Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FramerLogoFill">M200,112H149l56.27,50A8,8,0,0,1,200,176H136v64a8,8,0,0,1-13.66,5.66l-72-72A8,8,0,0,1,48,168V104a8,8,0,0,1,8-8h51L50.69,46A8,8,0,0,1,56,32H200a8,8,0,0,1,8,8v64A8,8,0,0,1,200,112Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.NuclearPlantFill">M152,32h24a8,8,0,0,0,8-8,8,8,0,0,1,16,0,24,24,0,0,1-24,24H152a8,8,0,0,0-8,8,8,8,0,0,1-16,0A24,24,0,0,1,152,32ZM104,64a8,8,0,0,0,8-8,40,40,0,0,1,40-40h8a8,8,0,0,0,0-16h-8A56.06,56.06,0,0,0,96,56,8,8,0,0,0,104,64ZM248,216a8,8,0,0,1-8,8H16a8,8,0,0,1,0-16H32.74c13.77-27.83,29.48-68.69,31.12-112.66A15.91,15.91,0,0,1,79.85,80h88.33a16,16,0,0,1,16,15.28c2.1,47.84,23.84,92.37,35.29,112.72H240A8,8,0,0,1,248,216ZM168.18,96h-16c1.77,43.72,17.39,84.32,31.09,112h18C188.68,184.08,170.18,141.64,168.18,96Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.EjectSimpleFill">M232,200a8,8,0,0,1-8,8H32a8,8,0,1,1,0-16H224A8,8,0,0,1,232,200ZM40.09,160H215.91a16.1,16.1,0,0,0,12.48-26.23L146.74,32.94a24.11,24.11,0,0,0-37.48,0L27.61,133.77A16.1,16.1,0,0,0,40.09,160Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CarrotFill">M232,80H199.44a64,64,0,0,1-10.19,77.26c-8.52,8.69-19.61,16.92-31.85,24.51a4,4,0,0,1-4.91-.59l-34.84-34.84a8,8,0,0,0-11.49.18,8.23,8.23,0,0,0,.41,11.38l29.88,29.88a4,4,0,0,1-1,6.39C95.74,214.79,53,228.54,46.78,230.48a16,16,0,0,1-21.26-21.26c2.73-8.71,29-90.27,64.86-133.35a4,4,0,0,1,5.9-.26l42.05,42.06a8,8,0,0,0,11.71-.43,8.19,8.19,0,0,0-.6-11.1L108.08,64.78a4,4,0,0,1,.63-6.18,64,64,0,0,1,67.28-2V24a8,8,0,0,1,8.54-8A8.18,8.18,0,0,1,192,24.27V52.69l26.34-26.35a8,8,0,0,1,11.32,11.32L203.31,64h28.42A8.18,8.18,0,0,1,240,71.47,8,8,0,0,1,232,80Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.StepsFill">M240,56V200a8,8,0,0,1-8,8H8a8,8,0,0,1,0-16H56V152a8,8,0,0,1,8-8h48V104a8,8,0,0,1,8-8h48V56a8,8,0,0,1,8-8h56A8,8,0,0,1,240,56Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BugFill">M168,92a12,12,0,1,1-12-12A12,12,0,0,1,168,92ZM100,80a12,12,0,1,0,12,12A12,12,0,0,0,100,80Zm116,64A87.76,87.76,0,0,1,213,167l22.24,9.72A8,8,0,0,1,232,192a7.89,7.89,0,0,1-3.2-.67L207.38,182a88,88,0,0,1-158.76,0L27.2,191.33A7.89,7.89,0,0,1,24,192a8,8,0,0,1-3.2-15.33L43,167A87.76,87.76,0,0,1,40,144v-8H16a8,8,0,0,1,0-16H40v-8a87.76,87.76,0,0,1,3-23L20.8,79.33a8,8,0,1,1,6.4-14.66L48.62,74a88,88,0,0,1,158.76,0l21.42-9.36a8,8,0,0,1,6.4,14.66L213,89.05a87.76,87.76,0,0,1,3,23v8h24a8,8,0,0,1,0,16H216Zm-80,0a8,8,0,0,0-16,0v64a8,8,0,0,0,16,0Zm64-32a72,72,0,0,0-144,0v8H200Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ThermometerSimpleFill">M160,146.08V40a32,32,0,0,0-64,0V146.08a56,56,0,1,0,64,0ZM128,24a16,16,0,0,1,16,16v64H112V40A16,16,0,0,1,128,24Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.HurricaneFill">M158.32,45.36l9.41-35.3A8,8,0,0,0,158.32.18,195.87,195.87,0,0,0,99.67,25.27C60.63,50.37,40,85.89,40,128a88.11,88.11,0,0,0,57.68,82.64l-9.41,35.3a8,8,0,0,0,9.41,9.88,195.87,195.87,0,0,0,58.65-25.09C195.37,205.63,216,170.11,216,128A88.1,88.1,0,0,0,158.32,45.36ZM128,152a24,24,0,1,1,24-24A24,24,0,0,1,128,152Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PhonePlusFill">M223.88,183.08A56.26,56.26,0,0,1,168,232C88.6,232,24,167.4,24,88A56.26,56.26,0,0,1,72.92,32.12a16,16,0,0,1,16.62,9.52l21.12,47.15a.61.61,0,0,0,0,.12A16,16,0,0,1,109.39,104c-.18.27-.37.52-.57.77L88,129.45c7.49,15.22,23.41,31,38.83,38.51l24.34-20.71a8.12,8.12,0,0,1,.75-.56,16,16,0,0,1,15.18-1.4l.12.06,47.1,21.11A16,16,0,0,1,223.88,183.08ZM144,88h24v24a8,8,0,0,0,16,0V88h24a8,8,0,0,0,0-16H184V48a8,8,0,0,0-16,0V72H144a8,8,0,0,0,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PaletteFill">M200.77,53.89A103.27,103.27,0,0,0,128,24h-1.07A104,104,0,0,0,24,128c0,43,26.58,79.06,69.36,94.17A32,32,0,0,0,136,192a16,16,0,0,1,16-16h46.21a31.81,31.81,0,0,0,31.2-24.88,104.43,104.43,0,0,0,2.59-24A103.28,103.28,0,0,0,200.77,53.89ZM84,168a12,12,0,1,1,12-12A12,12,0,0,1,84,168Zm0-56a12,12,0,1,1,12-12A12,12,0,0,1,84,112Zm44-24a12,12,0,1,1,12-12A12,12,0,0,1,128,88Zm44,24a12,12,0,1,1,12-12A12,12,0,0,1,172,112Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SuitcaseFill">M216,56H176V48a24,24,0,0,0-24-24H104A24,24,0,0,0,80,48v8H40A16,16,0,0,0,24,72V200a16,16,0,0,0,16,16H216a16,16,0,0,0,16-16V72A16,16,0,0,0,216,56ZM96,72h64V200H96Zm0-24a8,8,0,0,1,8-8h48a8,8,0,0,1,8,8v8H96Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ChartPieFill">M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24Zm0,16a88,88,0,0,1,71.87,37.27L128,118.76Zm0,176a88,88,0,0,1-71.87-37.27L207.89,91.12A88,88,0,0,1,128,216Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CursorTextFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32Zm-64,88a8,8,0,0,1,0,16h-8v24a16,16,0,0,0,16,16h8a8,8,0,0,1,0,16h-8a31.92,31.92,0,0,1-24-10.87A31.92,31.92,0,0,1,104,192H96a8,8,0,0,1,0-16h8a16,16,0,0,0,16-16V136h-8a8,8,0,0,1,0-16h8V96a16,16,0,0,0-16-16H96a8,8,0,0,1,0-16h8a31.92,31.92,0,0,1,24,10.87A31.92,31.92,0,0,1,152,64h8a8,8,0,0,1,0,16h-8a16,16,0,0,0-16,16v24Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FilmScriptFill">M200,24H56A16,16,0,0,0,40,40V216a16,16,0,0,0,16,16H200a16,16,0,0,0,16-16V40A16,16,0,0,0,200,24ZM76,188a12,12,0,1,1,12-12A12,12,0,0,1,76,188Zm0-48a12,12,0,1,1,12-12A12,12,0,0,1,76,140Zm0-48A12,12,0,1,1,88,80,12,12,0,0,1,76,92Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CaretCircleLeftFill">M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24Zm21.66,138.34a8,8,0,0,1-11.32,11.32l-40-40a8,8,0,0,1,0-11.32l40-40a8,8,0,0,1,11.32,11.32L115.31,128Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SquareHalfBottomFill">M200,40H56A16,16,0,0,0,40,56V200a16,16,0,0,0,16,16H200a16,16,0,0,0,16-16V56A16,16,0,0,0,200,40Zm0,16v72H56V56Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SpinnerBallFill">M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24Zm39.11,25.19C170.24,83.71,155,99.44,135,113.61c-2.25-24.48-8.44-49.8-38.37-67.82a87.89,87.89,0,0,1,70.5,3.4ZM40.18,133.54c28.34-20,49.57-14.68,71.87-4.39C92,143.34,73.19,161.36,72.52,196.26A87.92,87.92,0,0,1,40.18,133.54Zm136.5,67.73c-31.45-14.55-37.47-35.58-39.71-60,12.72,5.86,26.31,10.75,41.3,10.75,11.33,0,23.46-2.8,36.63-10.08A88.2,88.2,0,0,1,176.68,201.27Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.TerminalWindowFill">M216,40H40A16,16,0,0,0,24,56V200a16,16,0,0,0,16,16H216a16,16,0,0,0,16-16V56A16,16,0,0,0,216,40Zm-91,94.25-40,32a8,8,0,1,1-10-12.5L107.19,128,75,102.25a8,8,0,1,1,10-12.5l40,32a8,8,0,0,1,0,12.5ZM176,168H136a8,8,0,0,1,0-16h40a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PiggyBankFill">M226,88.08c-.4-1-.82-2-1.25-3a87.93,87.93,0,0,0-30.17-37H216a8,8,0,0,0,0-16H112a88.12,88.12,0,0,0-87.72,81A32,32,0,0,0,0,144a8,8,0,0,0,16,0,16,16,0,0,1,8.57-14.16A87.69,87.69,0,0,0,46,178.22l12.56,35.16A16,16,0,0,0,73.64,224H86.36a16,16,0,0,0,15.07-10.62l1.92-5.38h57.3l1.92,5.38A16,16,0,0,0,177.64,224h12.72a16,16,0,0,0,15.07-10.62L221.64,168H224a24,24,0,0,0,24-24V112A24,24,0,0,0,226,88.08ZM152,72H112a8,8,0,0,1,0-16h40a8,8,0,0,1,0,16Zm28,56a12,12,0,1,1,12-12A12,12,0,0,1,180,128Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CheersFill">M213.93,213.94l-17.65,4.73-10.42-38.89a40.06,40.06,0,0,0,20.77-46.14c-12.6-47-38.78-88.22-39.89-89.95a8,8,0,0,0-8.68-3.45L136.2,45.71c0-8.25-.18-13.43-.21-14.08a8,8,0,0,0-6.05-7.39l-32-8a8,8,0,0,0-8.68,3.45c-1.11,1.73-27.29,42.93-39.89,90a40.06,40.06,0,0,0,20.77,46.14L59.72,194.67l-17.65-4.73a8,8,0,0,0-4.14,15.46l48,12.86a8.23,8.23,0,0,0,2.07.27,8,8,0,0,0,2.07-15.73l-14.9-4,10.42-38.89c.81.05,1.61.08,2.41.08a40.12,40.12,0,0,0,37-24.88c1.18,6.37,2.6,12.82,4.31,19.22A40.08,40.08,0,0,0,168,184c.8,0,1.6,0,2.41-.08l10.42,38.89-14.9,4A8,8,0,0,0,168,242.53a8.23,8.23,0,0,0,2.07-.27l48-12.86a8,8,0,0,0-4.14-15.46ZM156.22,57.19c2.78,4.7,7.23,12.54,12.2,22.46L136,87.77c-.42-10-.38-18.25-.25-23.79,0-.56.05-1.12.08-1.68Zm-56.44-24,20.37,5.09c.06,4.28,0,10.67-.21,18.47-.06,1.21-.16,3.19-.23,5.84,0,1-.1,2-.16,3L86.69,57.43C92,46.67,96.84,38.16,99.78,33.19Zm85.06,10.39a8,8,0,0,1,3.58-10.74l16-8a8,8,0,1,1,7.16,14.32l-16,8a8,8,0,0,1-10.74-3.58ZM232,72a8,8,0,0,1-8,8H208a8,8,0,0,1,0-16h16A8,8,0,0,1,232,72ZM32.84,20.42a8,8,0,0,1,10.74-3.58l16,8a8,8,0,0,1-7.16,14.32l-16-8A8,8,0,0,1,32.84,20.42ZM40,72H24a8,8,0,0,1,0-16H40a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FacebookLogoFill">M232,128a104.16,104.16,0,0,1-91.55,103.26,4,4,0,0,1-4.45-4V152h24a8,8,0,0,0,8-8.53,8.17,8.17,0,0,0-8.25-7.47H136V112a16,16,0,0,1,16-16h16a8,8,0,0,0,8-8.53A8.17,8.17,0,0,0,167.73,80H152a32,32,0,0,0-32,32v24H96a8,8,0,0,0-8,8.53A8.17,8.17,0,0,0,96.27,152H120v75.28a4,4,0,0,1-4.44,4A104.15,104.15,0,0,1,24.07,124.09c2-54,45.74-97.9,99.78-100A104.12,104.12,0,0,1,232,128Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BicycleFill">M54.46,164.71,82.33,126.5a48,48,0,1,1-12.92-9.44L41.54,155.29a8,8,0,1,0,12.92,9.42ZM208,112a47.81,47.81,0,0,0-16.93,3.09L214.91,156A8,8,0,1,1,201.09,164l-23.83-40.86A48,48,0,1,0,208,112ZM165.93,72H192a8,8,0,0,1,8,8,8,8,0,0,0,16,0,24,24,0,0,0-24-24H152a8,8,0,0,0-6.91,12l11.65,20H99.26L82.91,60A8,8,0,0,0,76,56H48a8,8,0,0,0,0,16H71.41L85.12,95.51,69.41,117.06a47.87,47.87,0,0,1,12.92,9.44l11.59-15.9L125.09,164A8,8,0,1,0,138.91,156l-30.32-52h57.48l11.19,19.17a48.11,48.11,0,0,1,13.81-8.08Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.StarOfDavidFill">M201.21,128,231,76A8,8,0,0,0,224,64H164.65L135,12a8,8,0,0,0-13.9,0L91.33,64H32a8,8,0,0,0-6.95,12l29.72,52L25.05,180a8,8,0,0,0,7,12H91.33l29.72,52a8,8,0,0,0,13.9,0l29.7-52H224A8,8,0,0,0,231,180Zm-18.42,0-27.42,48-54.75,0L73.2,128l27.42-48,54.75,0Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ScooterFill">M244,172a32,32,0,1,1-49.38-26.85l-9-26.89-51.46,62.81A8,8,0,0,1,128,184H73.66a32,32,0,1,1,2.08-16h48.47l55.46-67.69L162.23,48H136a8,8,0,0,1,0-16h32a8,8,0,0,1,7.59,5.47L209.8,140.08c.72-.05,1.46-.08,2.2-.08A32,32,0,0,1,244,172Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.IslandFill">M239.55,226.65A8,8,0,0,1,232,232H24a8,8,0,0,1-5-14.25c1.63-1.3,38.53-30.26,98.29-33.45A120,120,0,0,1,114,146.37c1.73-21.71,10.91-50.63,42.95-72.48a66.28,66.28,0,0,0-15-1.87l-1.67,0c-19,.62-30.94,11.71-36.5,33.92A8,8,0,0,1,96,112a7.66,7.66,0,0,1-2-.24,8,8,0,0,1-5.82-9.7c9.25-36.95,33.11-45.42,51.5-46a81.43,81.43,0,0,1,21.68,2.45c-3.82-6.33-9.42-12.93-17.21-16.25-10-4.24-22.17-2.39-36.31,5.51a8,8,0,0,1-7.8-14c18.74-10.45,35.72-12.54,50.48-6.2,12.49,5.36,20.73,15.78,25.88,25,6.17-9.64,13.87-16.17,22.38-18.94,11.86-3.87,24.64-.72,38,9.37a8,8,0,0,1-9.64,12.76c-8.91-6.73-16.77-9.06-23.34-6.93-7.3,2.35-12.87,10-16.38,16.61A70.46,70.46,0,0,1,208,73.07c14.61,8.35,32,26.05,32,62.94a8,8,0,0,1-16,0c0-23.46-8.06-40-24-49a50.49,50.49,0,0,0-5.75-2.8,55.64,55.64,0,0,1,5.06,33.06,59.41,59.41,0,0,1-8.86,23.41,8,8,0,0,1-13.09-9.2c.75-1.09,16.33-24.38-3.26-49.37-27,15.21-41.89,37.25-44.16,65.59a104.27,104.27,0,0,0,3.83,36.44c62.65,1.81,101.52,32.33,103.2,33.66A8,8,0,0,1,239.55,226.65ZM52,168a28,28,0,1,0-28-28A28,28,0,0,0,52,168Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.RainbowCloudFill">M248,160a48.05,48.05,0,0,1-48,48H152c-17.65,0-32-14.75-32-32.89s14.35-32.89,32-32.89a31,31,0,0,1,3.34.18A48,48,0,0,1,248,160ZM112,72a87.57,87.57,0,0,1,61.35,24.91A8,8,0,0,0,184.5,85.44,104,104,0,0,0,8,160v16a8,8,0,0,0,16,0V160A88.1,88.1,0,0,1,112,72Zm0,32a55.58,55.58,0,0,1,33.13,10.84A8,8,0,1,0,154.6,102,72,72,0,0,0,40,160v16a8,8,0,0,0,16,0V160A56.06,56.06,0,0,1,112,104Zm15.21,26.71a8,8,0,0,0-5.94-9.63A40,40,0,0,0,72,160v16a8,8,0,0,0,16,0V160a24,24,0,0,1,29.57-23.35A8,8,0,0,0,127.21,130.71Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.DroneFill">M189.66,77.66,160,107.31v41.38l29.66,29.65a8,8,0,0,1-11.32,11.32L148.69,160H107.31L77.66,189.66a8,8,0,0,1-11.32-11.32L96,148.69V107.31L66.34,77.66A8,8,0,0,1,77.66,66.34L107.31,96h41.38l29.65-29.66a8,8,0,0,1,11.32,11.32Zm-46.28-6.12a8,8,0,0,0,10.21-4.87,28,28,0,1,1,35.74,35.74A8,8,0,0,0,192,118a7.86,7.86,0,0,0,2.67-.46,44,44,0,1,0-56.16-56.16A8,8,0,0,0,143.38,71.54Zm51.29,67a8,8,0,0,0-5.34,15.08,28,28,0,1,1-35.74,35.74,8,8,0,0,0-15.08,5.34,44,44,0,1,0,56.16-56.16Zm-82,46a8,8,0,0,0-10.21,4.87,28,28,0,1,1-35.74-35.74,8,8,0,0,0-5.34-15.08,44,44,0,1,0,56.16,56.16A8,8,0,0,0,112.62,184.46Zm-51.29-67A7.86,7.86,0,0,0,64,118a8,8,0,0,0,2.67-15.54,28,28,0,1,1,35.74-35.74,8,8,0,1,0,15.08-5.34,44,44,0,1,0-56.16,56.16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FlagFill">M232,56V176a8,8,0,0,1-2.76,6c-15.28,13.23-29.89,18-43.82,18-18.91,0-36.57-8.74-53-16.85C105.87,170,82.79,158.61,56,179.77V224a8,8,0,0,1-16,0V56a8,8,0,0,1,2.77-6h0c36-31.18,68.31-15.21,96.79-1.12C167,62.46,190.79,74.2,218.76,50A8,8,0,0,1,232,56Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.HandGrabbingFill">M216,104v48a88,88,0,0,1-176,0V136a16,16,0,0,1,32,0v8a8,8,0,0,0,16,0V88a16,16,0,0,1,32,0v16a8,8,0,0,0,16,0V88a16,16,0,0,1,32,0v16a8,8,0,0,0,16,0,16,16,0,0,1,32,0Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ParachuteFill">M232,120A104.12,104.12,0,0,0,128,16h0A104.12,104.12,0,0,0,24,120a8,8,0,0,0,3.21,6.39h0L120,196v20h-8a8,8,0,0,0,0,16h32a8,8,0,0,0,0-16h-8V196l92.8-69.6h0A8,8,0,0,0,232,120Zm-16.36-8H175.83c-1.54-37.95-13.91-62.43-25.11-77A88.2,88.2,0,0,1,215.64,112ZM154.4,128,128,175.53,101.6,128Zm-71.11,0,19.5,35.09L56,128Zm89.42,0H200l-46.79,35.09ZM105.28,35c-11.2,14.57-23.57,39.05-25.11,77H40.36A88.2,88.2,0,0,1,105.28,35Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.DotFill">M128,80a48,48,0,1,0,48,48A48,48,0,0,0,128,80Zm0,60a12,12,0,1,1,12-12A12,12,0,0,1,128,140Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.EraserFill">M225,80.4,183.6,39a24,24,0,0,0-33.94,0L31,157.66a24,24,0,0,0,0,33.94l30.06,30.06A8,8,0,0,0,66.74,224H216a8,8,0,0,0,0-16h-84.7L225,114.34A24,24,0,0,0,225,80.4ZM213.67,103,160,156.69,107.31,104,161,50.34a8,8,0,0,1,11.32,0l41.38,41.38a8,8,0,0,1,0,11.31Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BrowserFill">M216,40H40A16,16,0,0,0,24,56V200a16,16,0,0,0,16,16H216a16,16,0,0,0,16-16V56A16,16,0,0,0,216,40Zm0,16V88H40V56Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BackpackFill">M168,40.58V32A24,24,0,0,0,144,8H112A24,24,0,0,0,88,32v8.58A56.09,56.09,0,0,0,40,96V216a16,16,0,0,0,16,16H200a16,16,0,0,0,16-16V96A56.09,56.09,0,0,0,168,40.58ZM104,32a8,8,0,0,1,8-8h32a8,8,0,0,1,8,8v8H104Zm8,40h32a8,8,0,0,1,0,16H112a8,8,0,0,1,0-16Zm64,144H80V176h56v8a8,8,0,0,0,16,0v-8h24Zm0-56H80v-8a16,16,0,0,1,16-16h64a16,16,0,0,1,16,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.UserRectangleFill">M172,120a44,44,0,1,1-44-44A44,44,0,0,1,172,120Zm60-64V200a16,16,0,0,1-16,16H40a16,16,0,0,1-16-16V56A16,16,0,0,1,40,40H216A16,16,0,0,1,232,56ZM216,200V56H40V200H54.68a80,80,0,0,1,29.41-34.84,4,4,0,0,1,4.83.31,59.82,59.82,0,0,0,78.16,0,4,4,0,0,1,4.83-.31A80,80,0,0,1,201.32,200H216Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FileMdFill">M213.66,82.34l-56-56A8,8,0,0,0,152,24H56A16,16,0,0,0,40,40v76a4,4,0,0,0,4,4H196a4,4,0,0,1,4,4V224a8,8,0,0,0,9.19,7.91,8.15,8.15,0,0,0,6.81-8.16V88A8,8,0,0,0,213.66,82.34ZM152,88V44l44,44Zm-8,56H128a8,8,0,0,0-8,8v56a8,8,0,0,0,8,8h15.32c19.66,0,36.21-15.48,36.67-35.13A36,36,0,0,0,144,144Zm-.49,56H136V160h8a20,20,0,0,1,20,20.77C163.58,191.59,154.34,200,143.51,200ZM104,152v55.73A8.17,8.17,0,0,1,96.53,216,8,8,0,0,1,88,208V177.38l-13.32,19a8.3,8.3,0,0,1-4.2,3.2,8,8,0,0,1-9-3L48,177.38v30.35A8.17,8.17,0,0,1,40.53,216,8,8,0,0,1,32,208V152.31a8.27,8.27,0,0,1,4.56-7.53,8,8,0,0,1,10,2.63L68,178.05l21.27-30.39a8.28,8.28,0,0,1,8.06-3.55A8,8,0,0,1,104,152Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.LetterCircleHFill">M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24Zm40,144a8,8,0,0,1-16,0V136H104v32a8,8,0,0,1-16,0V88a8,8,0,0,1,16,0v32h48V88a8,8,0,0,1,16,0Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FileVueFill">M213.66,82.34l-56-56A8,8,0,0,0,152,24h-96a16,16,0,0,0-16,16v76a4,4,0,0,0,4,4H212a4,4,0,0,0,4-4V88A8,8,0,0,0,213.66,82.34ZM152,88V44l44,44ZM87.36,155,67.47,210.69a8,8,0,0,1-15.08,0L32.5,155A8.21,8.21,0,0,1,37,144.55a8,8,0,0,1,10.46,4.76l12.47,34.9,12.47-34.9a8,8,0,0,1,10.46-4.76A8.22,8.22,0,0,1,87.36,155ZM184,160v12h15.73a8.19,8.19,0,0,1,8.26,7.47,8,8,0,0,1-8,8.53H184v12h23.73a8.18,8.18,0,0,1,8.26,7.47,8,8,0,0,1-8,8.53H176a8,8,0,0,1-8-8V152a8,8,0,0,1,8-8h31.74a8.18,8.18,0,0,1,8.26,7.47,8,8,0,0,1-8,8.53Zm-32-8v37.45c0,14.14-11.07,26.12-25.22,26.54A26,26,0,0,1,100,190V152.27a8.18,8.18,0,0,1,7.47-8.25,8,8,0,0,1,8.54,8v37.65A10.23,10.23,0,0,0,125.27,200,10,10,0,0,0,136,190V152.27a8.18,8.18,0,0,1,7.47-8.25A8,8,0,0,1,152,152Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SupersetOfFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM176,184H80a8,8,0,0,1,0-16h96a8,8,0,0,1,0,16Zm-32-32H80a8,8,0,0,1,0-16h64a24,24,0,0,0,0-48H80a8,8,0,0,1,0-16h64a40,40,0,0,1,0,80Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.RecycleFill">M96,208a8,8,0,0,1-8,8H40a24,24,0,0,1-20.77-36l28-48.3-13.82-8A8,8,0,0,1,35.33,109l32.77-8.77a8,8,0,0,1,9.8,5.66l8.79,32.77a8,8,0,0,1-11.73,9l-13.88-8L33.11,188A8,8,0,0,0,40,200H88A8,8,0,0,1,96,208Zm140.73-28-23.14-40a8,8,0,0,0-13.84,8l23.14,40A8,8,0,0,1,216,200H160V184a8,8,0,0,0-13.66-5.66l-24,24a8,8,0,0,0,0,11.32l24,24A8,8,0,0,0,160,232V216h56a24,24,0,0,0,20.77-36ZM128,32a7.85,7.85,0,0,1,6.92,4l28,48.3-13.82,8A8,8,0,0,0,151,106.92l32.78,8.79a8.23,8.23,0,0,0,2.07.27,8,8,0,0,0,7.72-5.93l8.79-32.79a8,8,0,0,0-11.72-9l-13.89,8L148.77,28a24,24,0,0,0-41.54,0L84.07,68a8,8,0,0,0,13.85,8l23.16-40A7.85,7.85,0,0,1,128,32Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PlusSquareFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM168,136H136v32a8,8,0,0,1-16,0V136H88a8,8,0,0,1,0-16h32V88a8,8,0,0,1,16,0v32h32a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SmileyStickerFill">M128,24a104,104,0,1,0,30.57,203.43,7.9,7.9,0,0,0,3.3-2l63.57-63.57a8,8,0,0,0,2-3.31A104.09,104.09,0,0,0,128,24ZM92,96a12,12,0,1,1-12,12A12,12,0,0,1,92,96Zm82.92,60c-10.29,17.79-27.39,28-46.92,28s-36.63-10.2-46.92-28a8,8,0,1,1,13.84-8c7.47,12.91,19.21,20,33.08,20s25.61-7.1,33.08-20a8,8,0,1,1,13.84,8ZM164,120a12,12,0,1,1,12-12A12,12,0,0,1,164,120Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.GavelFill">M52.69,99.31a16,16,0,0,1,0-22.63l64-64a16,16,0,0,1,22.63,22.63l-64,64a16,16,0,0,1-22.63,0Zm190.63,17.37a16,16,0,0,0-22.63,0l-64,64a16,16,0,0,0,0,22.63h0a16,16,0,0,0,22.63,0l64-64A16,16,0,0,0,243.32,116.68Zm-35.11-15.8L155.12,47.79a4,4,0,0,0-5.66,0L87.8,109.45a4,4,0,0,0,0,5.66L103,130.34,28.69,204.69a16,16,0,0,0,22.62,22.62L125.66,153l15.23,15.23a4,4,0,0,0,5.66,0l61.66-61.66A4,4,0,0,0,208.21,100.88Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ExamFill">M96,113.89,107.06,136H84.94ZM232,56V216a8,8,0,0,1-11.58,7.16L192,208.94l-28.42,14.22a8,8,0,0,1-7.16,0L128,208.94,99.58,223.16a8,8,0,0,1-7.16,0L64,208.94,35.58,223.16A8,8,0,0,1,24,216V56A16,16,0,0,1,40,40H216A16,16,0,0,1,232,56ZM135.16,156.42l-32-64a8,8,0,0,0-14.32,0l-32,64a8,8,0,0,0,14.32,7.16L76.94,152h38.12l5.78,11.58a8,8,0,1,0,14.32-7.16ZM208,128a8,8,0,0,0-8-8H184V104a8,8,0,0,0-16,0v16H152a8,8,0,0,0,0,16h16v16a8,8,0,0,0,16,0V136h16A8,8,0,0,0,208,128Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SneakerMoveFill">M70.8,184H32a8,8,0,0,1,0-16H70.8a8,8,0,1,1,0,16Zm32,16H48a8,8,0,0,0,0,16h54.8a8,8,0,1,0,0-16Zm128.36-33.37-28.63-14.31A47.74,47.74,0,0,1,176,109.39V80a8,8,0,0,0-7.93-8A48.05,48.05,0,0,1,120,24.07a8,8,0,0,0-12.83-6.44L45.11,64.68a4,4,0,0,0-.41,6l51.44,51.44a8.19,8.19,0,0,1,.6,11.09,8,8,0,0,1-11.71.43l-53-53a4,4,0,0,0-6.44,1.09,16,16,0,0,0,3.12,18.22L142.4,213.66a8,8,0,0,0,5.66,2.34H224a16,16,0,0,0,16-16V180.94A15.92,15.92,0,0,0,231.16,166.63Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BellFill">M221.8,175.94C216.25,166.38,208,139.33,208,104a80,80,0,1,0-160,0c0,35.34-8.26,62.38-13.81,71.94A16,16,0,0,0,48,200H88.81a40,40,0,0,0,78.38,0H208a16,16,0,0,0,13.8-24.06ZM128,216a24,24,0,0,1-22.62-16h45.24A24,24,0,0,1,128,216Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PhoneListFill">M223.88,183.08A56.26,56.26,0,0,1,168,232C88.6,232,24,167.4,24,88A56.26,56.26,0,0,1,72.92,32.12a16,16,0,0,1,16.62,9.52l21.12,47.15a.61.61,0,0,0,0,.12A16,16,0,0,1,109.39,104c-.18.27-.37.52-.57.77L88,129.45c7.49,15.22,23.41,31,38.83,38.51l24.34-20.71a8.12,8.12,0,0,1,.75-.56,16,16,0,0,1,15.18-1.4l.12.06,47.1,21.11A16,16,0,0,1,223.88,183.08ZM144,72h64a8,8,0,0,0,0-16H144a8,8,0,0,0,0,16Zm0,40h64a8,8,0,0,0,0-16H144a8,8,0,0,0,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BellSlashFill">M221.84,192v0a1.85,1.85,0,0,1-3,.28L83.27,43.19a4,4,0,0,1,.8-6A79.55,79.55,0,0,1,129.17,24C173,24.66,207.8,61.1,208,104.92c.14,34.88,8.31,61.54,13.82,71A15.89,15.89,0,0,1,221.84,192Zm-7.92,18.62a8,8,0,0,1-11.85,10.76L182.62,200H167.16a40,40,0,0,1-78.41,0H47.91a15.78,15.78,0,0,1-13.59-7.59,16.42,16.42,0,0,1-.09-16.68c5.55-9.73,13.7-36.64,13.7-71.73A79.42,79.42,0,0,1,58.79,63.85L42,45.38A8,8,0,1,1,53.84,34.62ZM150.59,200H105.32a24,24,0,0,0,45.27,0Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowSquareDownFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM165.66,141.66l-32,32a8,8,0,0,1-11.32,0l-32-32a8,8,0,0,1,11.32-11.32L120,148.69V88a8,8,0,0,1,16,0v60.69l18.34-18.35a8,8,0,0,1,11.32,11.32Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CaretDownFill">M215.39,92.94A8,8,0,0,0,208,88H48a8,8,0,0,0-5.66,13.66l80,80a8,8,0,0,0,11.32,0l80-80A8,8,0,0,0,215.39,92.94Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.UserCircleCheckFill">M230.56,110.68a103.92,103.92,0,1,1-85.24-85.24,8,8,0,0,1-2.64,15.78A88.07,88.07,0,0,0,40,128a87.62,87.62,0,0,0,22.24,58.41A79.71,79.71,0,0,1,84,165.1a4,4,0,0,1,4.84.32,59.8,59.8,0,0,0,78.26,0,4,4,0,0,1,4.84-.32,79.86,79.86,0,0,1,21.79,21.31A87.62,87.62,0,0,0,216,128a88.85,88.85,0,0,0-1.22-14.68,8,8,0,1,1,15.78-2.64ZM84,120a44,44,0,1,0,44-44A44,44,0,0,0,84,120ZM237.66,34.34a8,8,0,0,0-11.32,0L200,60.69,189.66,50.34a8,8,0,0,0-11.32,11.32l16,16a8,8,0,0,0,11.32,0l32-32A8,8,0,0,0,237.66,34.34Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowsMergeFill">M192,40v64a8,8,0,0,1-2.34,5.66L136,163.31V192h24a8,8,0,0,1,5.66,13.66l-32,32a8,8,0,0,1-11.32,0l-32-32A8,8,0,0,1,96,192h24V163.31L66.34,109.66A8,8,0,0,1,64,104V40a8,8,0,0,1,16,0v60.69l48,48,48-48V40a8,8,0,0,1,16,0Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PeaceFill">M136,143.37l46,32.2a71.86,71.86,0,0,1-46,24ZM56,128a71.61,71.61,0,0,0,8.81,34.48L120,123.84V56.46A72.08,72.08,0,0,0,56,128Zm64,71.54V143.37l-46,32.2A71.86,71.86,0,0,0,120,199.54ZM136,56.46v67.38l55.19,38.64A72,72,0,0,0,136,56.46ZM232,128A104,104,0,1,1,128,24,104.11,104.11,0,0,1,232,128Zm-16,0a88,88,0,1,0-88,88A88.1,88.1,0,0,0,216,128Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.TruckTrailerFill">M224,96.8V96a56.06,56.06,0,0,0-56-56h-8a16,16,0,0,0-16,16V176H128V72a8,8,0,0,0-8-8H16A16,16,0,0,0,0,80V184a32,32,0,0,0,56,21.13A32,32,0,0,0,111,192h82a32,32,0,0,0,63-8V136A40.07,40.07,0,0,0,224,96.8ZM32,200a16,16,0,1,1,16-16A16,16,0,0,1,32,200Zm48,0a16,16,0,1,1,16-16A16,16,0,0,1,80,200Zm144,0a16,16,0,1,1,16-16A16,16,0,0,1,224,200Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CurrencyJpyFill">M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24Zm54.4,52.8L144,128h16a8,8,0,0,1,0,16H136v16h24a8,8,0,0,1,0,16H136v16a8,8,0,0,1-16,0V176H96a8,8,0,0,1,0-16h24V144H96a8,8,0,0,1,0-16h16L73.6,76.8a8,8,0,1,1,12.8-9.6L128,122.67,169.6,67.2a8,8,0,0,1,12.8,9.6Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CurrencyEthFill">M222.29,123.06l-88-112a8,8,0,0,0-12.58,0l-88,112a8,8,0,0,0,0,9.88l88,112a8,8,0,0,0,12.58,0l88-112A8,8,0,0,0,222.29,123.06ZM136,155.58V39.13l67.42,85.8Zm-16,0L52.58,124.93,120,39.13Zm0,17.57v43.72l-53.43-68Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.DropHalfFill">M174,47.75a254.19,254.19,0,0,0-41.45-38.3,8,8,0,0,0-9.18,0A254.19,254.19,0,0,0,82,47.75C54.51,79.32,40,112.6,40,144a88,88,0,0,0,176,0C216,112.6,201.49,79.32,174,47.75ZM56,144c0-57.23,55.47-105,72-118V216A72.08,72.08,0,0,1,56,144Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PingPongFill">M240,196a16,16,0,0,0-6.65-11.7l-38-27.15,17-16.95a39.67,39.67,0,0,0,11-35.79,99.52,99.52,0,0,0-35.4-57.89A101.93,101.93,0,0,0,122.58,24,100.29,100.29,0,0,0,24,122.58a102.12,102.12,0,0,0,22.55,65.28,99.52,99.52,0,0,0,57.89,35.4,39.68,39.68,0,0,0,35.79-11l16.95-17,27.15,38A16,16,0,0,0,196,240c.44,0,.88.05,1.32.05a16,16,0,0,0,11.31-4.69l26.64-26.64A16,16,0,0,0,240,196Zm-42.6,28-32.63-45.69a8,8,0,0,0-5.85-3.32q-.33,0-.66,0a8,8,0,0,0-5.66,2.34l-23.63,23.63a23.68,23.68,0,0,1-21.36,6.63,80.3,80.3,0,0,1-12.3-3.5l108.8-108.8a80.63,80.63,0,0,1,3.5,12.3,23.67,23.67,0,0,1-6.63,21.36L177.3,152.55a8,8,0,0,0,1,12.17L224,197.36Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.TowelFill">M224,48V152a8,8,0,0,1-8.53,8,8.17,8.17,0,0,1-7.47-8.25V48a8,8,0,0,0-8.55-8A8.19,8.19,0,0,0,192,48.28V180a4,4,0,0,1-4,4H52a4,4,0,0,1-4-4V48A24,24,0,0,1,72,24H200A24,24,0,0,1,224,48ZM188,200H52a4,4,0,0,0-4,4v12a16,16,0,0,0,16,16H176a16,16,0,0,0,16-16V204A4,4,0,0,0,188,200Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.DetectiveFill">M256,120a8,8,0,0,1-8,8H8a8,8,0,0,1,0-16H35.92l47.5-65.41a16,16,0,0,1,25.31-.72l12.85,14.9.2.23a7.95,7.95,0,0,0,12.44,0l.2-.23,12.85-14.9a16,16,0,0,1,25.31.72L220.08,112H248A8,8,0,0,1,256,120Zm-76,24a36,36,0,0,0-35.77,32H111.77a36,36,0,1,0-1.83,16h36.12A36,36,0,1,0,180,144Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FileXFill">M213.66,82.34l-56-56A8,8,0,0,0,152,24H56A16,16,0,0,0,40,40V216a16,16,0,0,0,16,16H200a16,16,0,0,0,16-16V88A8,8,0,0,0,213.66,82.34Zm-56,88a8,8,0,0,1-11.32,11.32L128,163.31l-18.34,18.35a8,8,0,0,1-11.32-11.32L116.69,152,98.34,133.66a8,8,0,0,1,11.32-11.32L128,140.69l18.34-18.35a8,8,0,0,1,11.32,11.32L139.31,152ZM152,88V44l44,44Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.AsteriskFill">M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24Zm59.43,129.07a8,8,0,0,1-4,14.93,7.92,7.92,0,0,1-4-1.07L136,141.86V192a8,8,0,0,1-16,0V141.86L76.57,166.93A8,8,0,0,1,65.65,164a8,8,0,0,1,2.92-10.93L112,128,68.57,102.93a8,8,0,0,1,8-13.86L120,114.14V64a8,8,0,0,1,16,0v50.14l43.43-25.07a8,8,0,0,1,8,13.86L144,128Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BridgeFill">M232,160h-8V120.5c1.63.81,3.29,1.57,5,2.26a8,8,0,0,0,6-14.83A55.78,55.78,0,0,1,200,56a8,8,0,0,0-16,0A56,56,0,0,1,72,56a8,8,0,0,0-16,0,55.78,55.78,0,0,1-35,51.93,8,8,0,0,0,6,14.83c1.71-.69,3.37-1.45,5-2.26V160H24.6c-6.31,0-8.6,4.78-8.6,8a8,8,0,0,0,8,8H56v24a8,8,0,0,0,16,0V176H184v24a8,8,0,0,0,16,0V176h32a8,8,0,0,0,0-16ZM72,152a8,8,0,0,1-16,0V104.12a8,8,0,0,1,16,0Zm40,0a8,8,0,0,1-16,0V132.32a8,8,0,0,1,16,0Zm48,0a8,8,0,0,1-16,0V132.32a8,8,0,0,1,16,0Zm40,0a8,8,0,0,1-16,0V104.12a8,8,0,0,1,16,0Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SplitHorizontalFill">M112,48V208a8,8,0,0,1-16,0V136H64v24a8,8,0,0,1-13.66,5.66l-32-32a8,8,0,0,1,0-11.32l32-32A8,8,0,0,1,64,96v24H96V48a8,8,0,0,1,16,0Zm125.66,74.34-32-32A8,8,0,0,0,192,96v24H160V48a8,8,0,0,0-16,0V208a8,8,0,0,0,16,0V136h32v24a8,8,0,0,0,13.66,5.66l32-32A8,8,0,0,0,237.66,122.34Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.TextHFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM184,176a8,8,0,0,1-16,0V136H88v40a8,8,0,0,1-16,0V80a8,8,0,0,1,16,0v40h80V80a8,8,0,0,1,16,0Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FolderStarFill">M237.09,167.78l-22.51,18.59,6.85,27.71a8,8,0,0,1-11.82,8.81L184,207.82l-25.61,15.07a8,8,0,0,1-11.82-8.81l6.85-27.71-22.51-18.59a8,8,0,0,1,4.47-14.14l29.84-2.31,11.43-26.5a8,8,0,0,1,14.7,0l11.43,26.5,29.84,2.31a8,8,0,0,1,4.47,14.14ZM128.56,208a8,8,0,0,1-8,8H39.38A15.4,15.4,0,0,1,24,200.62V56A16,16,0,0,1,40,40H92.69A15.86,15.86,0,0,1,104,44.69L131.31,72H216a16,16,0,0,1,16,16v32a8,8,0,0,1-16,0V88H40V200h80.56A8,8,0,0,1,128.56,208ZM40,72h68.69l-16-16H40Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.XFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM181.66,170.34a8,8,0,0,1-11.32,11.32L128,139.31,85.66,181.66a8,8,0,0,1-11.32-11.32L116.69,128,74.34,85.66A8,8,0,0,1,85.66,74.34L128,116.69l42.34-42.35a8,8,0,0,1,11.32,11.32L139.31,128Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SwatchesFill">M240,155.91a16,16,0,0,0-1-5.22L219.94,98.48A16,16,0,0,0,199.49,89l-67.81,24.57,12.08-69A16,16,0,0,0,130.84,26L76.17,16.25a15.94,15.94,0,0,0-18.47,13l-25,143.12A43.82,43.82,0,0,0,75.78,224H224a16,16,0,0,0,16-16ZM76,196a16,16,0,1,1,16-16A16,16,0,0,1,76,196Zm42.72-8.38,9.78-55.92L204.92,104,224,156.11,116.78,195A44.89,44.89,0,0,0,118.72,187.62ZM224,208H127.74L224,173.11Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CreditCardFill">M224,48H32A16,16,0,0,0,16,64V192a16,16,0,0,0,16,16H224a16,16,0,0,0,16-16V64A16,16,0,0,0,224,48ZM136,176H120a8,8,0,0,1,0-16h16a8,8,0,0,1,0,16Zm64,0H168a8,8,0,0,1,0-16h32a8,8,0,0,1,0,16ZM32,88V64H224V88Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.VideoFill">M232,208a8,8,0,0,1-8,8H32a8,8,0,0,1,0-16H224A8,8,0,0,1,232,208Zm0-152V168a16,16,0,0,1-16,16H40a16,16,0,0,1-16-16V56A16,16,0,0,1,40,40H216A16,16,0,0,1,232,56Zm-68,56a8,8,0,0,0-3.41-6.55l-40-28A8,8,0,0,0,108,84v56a8,8,0,0,0,12.59,6.55l40-28A8,8,0,0,0,164,112Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CalculatorFill">M200,24H56A16,16,0,0,0,40,40V216a16,16,0,0,0,16,16H200a16,16,0,0,0,16-16V40A16,16,0,0,0,200,24ZM88,200a12,12,0,1,1,12-12A12,12,0,0,1,88,200Zm0-40a12,12,0,1,1,12-12A12,12,0,0,1,88,160Zm40,40a12,12,0,1,1,12-12A12,12,0,0,1,128,200Zm0-40a12,12,0,1,1,12-12A12,12,0,0,1,128,160Zm40,40a12,12,0,1,1,12-12A12,12,0,0,1,168,200Zm0-40a12,12,0,1,1,12-12A12,12,0,0,1,168,160Zm16-56a8,8,0,0,1-8,8H80a8,8,0,0,1-8-8V64a8,8,0,0,1,8-8h96a8,8,0,0,1,8,8Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FileIniFill">M48,152v55.73A8.17,8.17,0,0,1,40.53,216,8,8,0,0,1,32,208V152.27A8.17,8.17,0,0,1,39.47,144,8,8,0,0,1,48,152Zm71.47-8a8.17,8.17,0,0,0-7.47,8.25V183L86.69,147.6a8.26,8.26,0,0,0-8-3.48A8,8,0,0,0,72,152v55.73A8.17,8.17,0,0,0,79.47,216,8,8,0,0,0,88,208V177l25.49,35.69A8,8,0,0,0,123.87,215a8.23,8.23,0,0,0,4.13-7.25V152A8,8,0,0,0,119.47,144Zm40,0a8.17,8.17,0,0,0-7.47,8.25v55.46a8.17,8.17,0,0,0,7.47,8.25,8,8,0,0,0,8.53-8V152A8,8,0,0,0,159.47,144ZM216,88V223.75a8.15,8.15,0,0,1-6.81,8.16A8,8,0,0,1,200,224V124a4,4,0,0,0-4-4H44a4,4,0,0,1-4-4V40A16,16,0,0,1,56,24h96a8,8,0,0,1,5.66,2.34l56,56A8,8,0,0,1,216,88Zm-20,0L152,44V88Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.TShirtFill">M247.59,61.22,195.83,33A8,8,0,0,0,192,32H160a8,8,0,0,0-8,8,24,24,0,0,1-48,0,8,8,0,0,0-8-8H64a8,8,0,0,0-3.84,1L8.41,61.22A15.76,15.76,0,0,0,1.82,82.48l19.27,36.81A16.37,16.37,0,0,0,35.67,128H56v80a16,16,0,0,0,16,16H184a16,16,0,0,0,16-16V128h20.34a16.37,16.37,0,0,0,14.58-8.71l19.27-36.81A15.76,15.76,0,0,0,247.59,61.22ZM35.67,112a.62.62,0,0,1-.41-.13L16.09,75.26,56,53.48V112Zm185.07-.14a.55.55,0,0,1-.41.14H200V53.48l39.92,21.78Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FileCppFill">M44,120H212a4,4,0,0,0,4-4V88a8,8,0,0,0-2.34-5.66l-56-56A8,8,0,0,0,152,24H56A16,16,0,0,0,40,40v76A4,4,0,0,0,44,120ZM152,44l44,44H152ZM48,180c0,11,7.18,20,16,20a14.07,14.07,0,0,0,10.07-4.51,8.19,8.19,0,0,1,10.88-.9,8,8,0,0,1,.83,11.81A30.06,30.06,0,0,1,64,216c-17.65,0-32-16.15-32-36s14.35-36,32-36a30,30,0,0,1,21.39,9.2,8.24,8.24,0,0,1,.73,11.08,8,8,0,0,1-11.9.38A14.18,14.18,0,0,0,64,160C55.18,160,48,169,48,180Zm108,.53a8.18,8.18,0,0,1-8.25,7.47H136v11.73a8.17,8.17,0,0,1-7.47,8.25,8,8,0,0,1-8.53-8V188H108.27a8.18,8.18,0,0,1-8.25-7.47,8,8,0,0,1,8-8.53h12V160.27a8.17,8.17,0,0,1,7.47-8.25,8,8,0,0,1,8.53,8v12h12A8,8,0,0,1,156,180.53Zm68,0a8.18,8.18,0,0,1-8.25,7.47H204v11.73a8.17,8.17,0,0,1-7.47,8.25,8,8,0,0,1-8.53-8V188H176.27a8.18,8.18,0,0,1-8.25-7.47,8,8,0,0,1,8-8.53h12V160.27a8.17,8.17,0,0,1,7.47-8.25,8,8,0,0,1,8.53,8v12h12A8,8,0,0,1,224,180.53Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PuzzlePieceFill">M165.78,224H208a16,16,0,0,0,16-16V170.35A8,8,0,0,0,212.94,163a23.37,23.37,0,0,1-8.94,1.77c-13.23,0-24-11.1-24-24.73s10.77-24.73,24-24.73a23.37,23.37,0,0,1,8.94,1.77A8,8,0,0,0,224,109.65V72a16,16,0,0,0-16-16H171.78a35.36,35.36,0,0,0,.22-4,36,36,0,0,0-72,0,35.36,35.36,0,0,0,.22,4H64A16,16,0,0,0,48,72v32.22a35.36,35.36,0,0,0-4-.22,36,36,0,0,0,0,72,35.36,35.36,0,0,0,4-.22V208a16,16,0,0,0,16,16h42.22</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowFatUpFill">M231.39,123.06A8,8,0,0,1,224,128H184v80a16,16,0,0,1-16,16H88a16,16,0,0,1-16-16V128H32a8,8,0,0,1-5.66-13.66l96-96a8,8,0,0,1,11.32,0l96,96A8,8,0,0,1,231.39,123.06Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowElbowLeftFill">M237.66,101.66l-96,96a8,8,0,0,1-11.32,0L60,127.31,29.66,157.66A8,8,0,0,1,16,152V80a8,8,0,0,1,8-8H96a8,8,0,0,1,5.66,13.66L71.31,116,136,180.69l90.34-90.35a8,8,0,0,1,11.32,11.32Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CornersInFill">M152,96V48a8,8,0,0,1,13.66-5.66l48,48A8,8,0,0,1,208,104H160A8,8,0,0,1,152,96ZM96,152H48a8,8,0,0,0-5.66,13.66l48,48A8,8,0,0,0,104,208V160A8,8,0,0,0,96,152ZM99.06,40.61a8,8,0,0,0-8.72,1.73l-48,48A8,8,0,0,0,48,104H96a8,8,0,0,0,8-8V48A8,8,0,0,0,99.06,40.61ZM208,152H160a8,8,0,0,0-8,8v48a8,8,0,0,0,13.66,5.66l48-48A8,8,0,0,0,208,152Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BatteryMediumFill">M112,96v64a8,8,0,0,1-8,8H48a8,8,0,0,1-8-8V96a8,8,0,0,1,8-8h56A8,8,0,0,1,112,96ZM224,80v96a24,24,0,0,1-24,24H32A24,24,0,0,1,8,176V80A24,24,0,0,1,32,56H200A24,24,0,0,1,224,80Zm-16,0a8,8,0,0,0-8-8H32a8,8,0,0,0-8,8v96a8,8,0,0,0,8,8H200a8,8,0,0,0,8-8Zm40,8a8,8,0,0,0-8,8v64a8,8,0,0,0,16,0V96A8,8,0,0,0,248,88Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.UserFill">M230.93,220a8,8,0,0,1-6.93,4H32a8,8,0,0,1-6.92-12c15.23-26.33,38.7-45.21,66.09-54.16a72,72,0,1,1,73.66,0c27.39,8.95,50.86,27.83,66.09,54.16A8,8,0,0,1,230.93,220Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.DressFill">M66.26,80.23a15.26,15.26,0,0,1-1.65-12.17,15.54,15.54,0,0,1,2-4.76L88,32.7V8a8,8,0,0,1,8.53-8A8.17,8.17,0,0,1,104,8.27V32.42L109.25,39a23.91,23.91,0,0,0,19.13,9,24.67,24.67,0,0,0,18.71-9.43L152,32.42V8a8,8,0,0,1,8.53-8A8.17,8.17,0,0,1,168,8.27V32.7l21.42,30.6a15.54,15.54,0,0,1,2,4.76,15.26,15.26,0,0,1-1.65,12.17,1.74,1.74,0,0,0-.11.18l-13.85,21.74A4,4,0,0,1,172.4,104H83.6a4,4,0,0,1-3.38-1.85L66.37,80.41A1.74,1.74,0,0,0,66.26,80.23Zm148.5,129.56a2.52,2.52,0,0,0-.15-.34L173.69,122.3a4,4,0,0,0-3.63-2.3H85.94a4,4,0,0,0-3.63,2.3L41.39,209.45a2.52,2.52,0,0,0-.15.34A16.19,16.19,0,0,0,41.6,223,16,16,0,0,0,56,232H200a16,16,0,0,0,14.39-9A16.19,16.19,0,0,0,214.76,209.79Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SkipForwardCircleFill">M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24Zm40,144a8,8,0,0,1-16,0V137.83l-51.35,36.68A8,8,0,0,1,88,168V88a8,8,0,0,1,12.65-6.51L152,118.17V88a8,8,0,0,1,16,0Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowFatDownFill">M229.66,141.66l-96,96a8,8,0,0,1-11.32,0l-96-96A8,8,0,0,1,32,128H72V48A16,16,0,0,1,88,32h80a16,16,0,0,1,16,16v80h40a8,8,0,0,1,5.66,13.66Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.TrainFill">M184,24H72A32,32,0,0,0,40,56V184a32,32,0,0,0,32,32h8L65.6,235.2a8,8,0,1,0,12.8,9.6L100,216h56l21.6,28.8a8,8,0,1,0,12.8-9.6L176,216h8a32,32,0,0,0,32-32V56A32,32,0,0,0,184,24ZM84,184a12,12,0,1,1,12-12A12,12,0,0,1,84,184Zm36-64H56V80h64Zm52,64a12,12,0,1,1,12-12A12,12,0,0,1,172,184Zm28-64H136V80h64Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CpuFill">M104,104h48v48H104Zm136,48a8,8,0,0,1-8,8H216v40a16,16,0,0,1-16,16H160v16a8,8,0,0,1-16,0V216H112v16a8,8,0,0,1-16,0V216H56a16,16,0,0,1-16-16V160H24a8,8,0,0,1,0-16H40V112H24a8,8,0,0,1,0-16H40V56A16,16,0,0,1,56,40H96V24a8,8,0,0,1,16,0V40h32V24a8,8,0,0,1,16,0V40h40a16,16,0,0,1,16,16V96h16a8,8,0,0,1,0,16H216v32h16A8,8,0,0,1,240,152ZM168,96a8,8,0,0,0-8-8H96a8,8,0,0,0-8,8v64a8,8,0,0,0,8,8h64a8,8,0,0,0,8-8Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CircuitryFill">M88,111.31l48,48V220a4,4,0,0,1-4,4H48a16,16,0,0,1-16-16V48A16,16,0,0,1,48,32H68a4,4,0,0,1,4,4V153.38a24,24,0,1,0,16,0ZM80,184a8,8,0,1,0-8-8A8,8,0,0,0,80,184Zm104-80a8,8,0,1,0-8,8A8,8,0,0,0,184,104Zm24-72H156a4,4,0,0,0-4,4V68.69l13.66,13.66a24,24,0,1,1-11.31,11.31l-16-16A8,8,0,0,1,136,72V36a4,4,0,0,0-4-4H92a4,4,0,0,0-4,4V88.69l61.66,61.65A8,8,0,0,1,152,156v64a4,4,0,0,0,4,4h52a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CurrencyDollarFill">M160,152a16,16,0,0,1-16,16h-8V136h8A16,16,0,0,1,160,152Zm72-24A104,104,0,1,1,128,24,104.11,104.11,0,0,1,232,128Zm-56,24a32,32,0,0,0-32-32h-8V88h4a16,16,0,0,1,16,16,8,8,0,0,0,16,0,32,32,0,0,0-32-32h-4V64a8,8,0,0,0-16,0v8h-4a32,32,0,0,0,0,64h4v32h-8a16,16,0,0,1-16-16,8,8,0,0,0-16,0,32,32,0,0,0,32,32h8v8a8,8,0,0,0,16,0v-8h8A32,32,0,0,0,176,152Zm-76-48a16,16,0,0,0,16,16h4V88h-4A16,16,0,0,0,100,104Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FireExtinguisherFill">M218.3,48.34l-60.68-18.2,30-15A8,8,0,0,0,180.42.85L134,24.05a80.08,80.08,0,0,0-78,80V208a8,8,0,0,0,16,0V176H88v56a16,16,0,0,0,16,16h64a16,16,0,0,0,16-16V104a48.07,48.07,0,0,0-40-47.32V42.75l69.7,20.91a8,8,0,1,0,4.6-15.32ZM72,160V104a64.07,64.07,0,0,1,56-63.48V56.68A48.07,48.07,0,0,0,88,104v56Zm96-56v56H104V104a32,32,0,0,1,64,0Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PauseFill">M216,48V208a16,16,0,0,1-16,16H160a16,16,0,0,1-16-16V48a16,16,0,0,1,16-16h40A16,16,0,0,1,216,48ZM96,32H56A16,16,0,0,0,40,48V208a16,16,0,0,0,16,16H96a16,16,0,0,0,16-16V48A16,16,0,0,0,96,32Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.TreeEvergreenFill">M231.19,195.51A8,8,0,0,1,224,200H136v40a8,8,0,0,1-16,0V200H32a8,8,0,0,1-6.31-12.91l46-59.09H48a8,8,0,0,1-6.34-12.88l80-104a8,8,0,0,1,12.68,0l80,104A8,8,0,0,1,208,128H184.36l45.95,59.09A8,8,0,0,1,231.19,195.51Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ChalkboardFill">M240,192h-8V56a16,16,0,0,0-16-16H40A16,16,0,0,0,24,56V192H16a8,8,0,0,0,0,16H240a8,8,0,0,0,0-16Zm-24,0H144V176a8,8,0,0,1,8-8h56a8,8,0,0,1,8,8Zm0-48a8,8,0,0,1-16,0V72H56V184a8,8,0,0,1-16,0V64a8,8,0,0,1,8-8H208a8,8,0,0,1,8,8Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ListStarFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM64,72H192a8,8,0,0,1,0,16H64a8,8,0,0,1,0-16Zm0,48H96a8,8,0,0,1,0,16H64a8,8,0,0,1,0-16Zm40,64H64a8,8,0,0,1,0-16h40a8,8,0,0,1,0,16Zm94.55-40.71L180.69,158l5.44,22a4,4,0,0,1-1.49,4.17,4.05,4.05,0,0,1-2.39.79,4,4,0,0,1-2-.55L160,172.54l-20.22,11.91a4,4,0,0,1-5.91-4.41l5.44-22-17.86-14.75a4,4,0,0,1,2.24-7.07l23.58-1.82,9.06-21a4,4,0,0,1,7.34,0l9.06,21,23.58,1.82a4,4,0,0,1,2.24,7.07Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CubeTransparentFill">M104,152V104h48v48ZM32,53v95a4,4,0,0,0,4,4H88V99.31L38.83,50.14A4,4,0,0,0,32,53Zm188,51H168v52.69l49.17,49.17A4,4,0,0,0,224,203V108A4,4,0,0,0,220,104ZM152,36a4,4,0,0,0-4-4H53a4,4,0,0,0-2.83,6.83L99.31,88H152Zm60.49,45.17L174.83,43.51A4,4,0,0,0,168,46.34V88h41.66A4,4,0,0,0,212.49,81.17ZM156.69,168H104v52a4,4,0,0,0,4,4h95a4,4,0,0,0,2.83-6.83ZM43.51,174.83l37.66,37.66A4,4,0,0,0,88,209.66V168H46.34A4,4,0,0,0,43.51,174.83Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ChatDotsFill">M216,48H40A16,16,0,0,0,24,64V224a15.84,15.84,0,0,0,9.25,14.5A16.05,16.05,0,0,0,40,240a15.89,15.89,0,0,0,10.25-3.78l.09-.07L83,208H216a16,16,0,0,0,16-16V64A16,16,0,0,0,216,48ZM84,140a12,12,0,1,1,12-12A12,12,0,0,1,84,140Zm44,0a12,12,0,1,1,12-12A12,12,0,0,1,128,140Zm44,0a12,12,0,1,1,12-12A12,12,0,0,1,172,140Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowUDownLeftFill">M232,112a64.07,64.07,0,0,1-64,64H88v40a8,8,0,0,1-13.66,5.66l-48-48a8,8,0,0,1,0-11.32l48-48A8,8,0,0,1,88,120v40h80a48,48,0,0,0,0-96H80a8,8,0,0,1,0-16h88A64.07,64.07,0,0,1,232,112Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BiohazardFill">M239.83,159.58a60.09,60.09,0,0,0-54.17-55.31,61.63,61.63,0,0,0-3-5.59,59.94,59.94,0,0,0-26.82-77.93l-.14-.08a8.1,8.1,0,0,0-1.14-.48h0a8,8,0,0,0-6.21,14.69l.07,0C149.6,35.57,168,45.73,168,68a40,40,0,0,1-2,12.53,63.83,63.83,0,0,0-76,0A40,40,0,0,1,88,68c0-22.35,18.53-32.51,19.65-33.1l0,0a8,8,0,0,0-7.33-14.22l-.15.08a60,60,0,0,0-26.85,78c-1.1,1.8-2.12,3.66-3,5.57a60.11,60.11,0,0,0-54.15,55.32,35.86,35.86,0,0,0-.14,4.87A8,8,0,0,0,32,164c0-1.36.07-2.71.19-4,.73-6.25,4.06-19.08,18.64-27.49a39.83,39.83,0,0,1,13.32-4.81c-.1,1.43-.16,2.88-.16,4.34a64.09,64.09,0,0,0,39,58.91,39.81,39.81,0,0,1-12.15,10.84c-19.07,11-36.88.36-38.39-.58l-.12-.08a8,8,0,0,0-8.71,13.42l.24.15A59.95,59.95,0,0,0,126.74,196c.42,0,.83,0,1.25,0s.84,0,1.27,0a60,60,0,0,0,82.89,18.69l.23-.15a8,8,0,0,0-8.71-13.42l-.12.08c-1.51.94-19.32,11.59-38.39.58A39.84,39.84,0,0,1,153,190.9,64.09,64.09,0,0,0,192,132c0-1.46-.07-2.9-.16-4.33a39.84,39.84,0,0,1,13.33,4.8c14.47,8.35,17.86,21.06,18.63,27.32.13,1.39.2,2.79.2,4.21a8,8,0,0,0,16,.46A36,36,0,0,0,239.83,159.58Zm-130.1,16.8A48.08,48.08,0,0,1,80,132c0-1.27.07-2.53.17-3.78l1,.25a40,40,0,0,1,28.54,47.91ZM128,134.11l-.11-.19h.22ZM128,108A39.91,39.91,0,0,1,98.07,94.51a47.84,47.84,0,0,1,59.84,0A39.88,39.88,0,0,1,128,108Zm18.29,68.37a39.9,39.9,0,0,1,29.55-48.13c.1,1.24.16,2.49.16,3.76A48.07,48.07,0,0,1,146.28,176.37Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.WatchFill">M175.3,63.53l-6.24-34.38A16,16,0,0,0,153.32,16H102.68A16,16,0,0,0,86.94,29.15L80.7,63.53a79.9,79.9,0,0,0,0,128.94l6.24,34.38A16,16,0,0,0,102.68,240h50.64a16,16,0,0,0,15.74-13.15l6.24-34.38a79.9,79.9,0,0,0,0-128.94ZM102.68,32h50.64l3.91,21.55a79.75,79.75,0,0,0-58.46,0Zm50.64,192H102.68l-3.91-21.55a79.75,79.75,0,0,0,58.46,0ZM168,136H128a8,8,0,0,1-8-8V88a8,8,0,0,1,16,0v32h32a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ShovelFill">M245.66,69.66a8,8,0,0,1-11.32,0L216,51.31l-71,71L133.66,111l71-71L186.34,21.66a8,8,0,0,1,11.32-11.32l48,48A8,8,0,0,1,245.66,69.66ZM88,176a8,8,0,0,1-5.66-13.66L133.66,111,99.31,76.68a16,16,0,0,0-22.62,0l-56,56A15.89,15.89,0,0,0,16,144v80a16,16,0,0,0,16,16h80a15.86,15.86,0,0,0,11.31-4.69l56-56a16,16,0,0,0,0-22.62L145,122.34,93.66,173.66A8,8,0,0,1,88,176Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CouchFill">M16,100V72A16,16,0,0,1,32,56h84a4,4,0,0,1,4,4v76H64a32,32,0,0,0-32-32H20A4,4,0,0,1,16,100Zm208,4h12a4,4,0,0,0,4-4V72a16,16,0,0,0-16-16H140a4,4,0,0,0-4,4v76h56A32,32,0,0,1,224,104Zm8,16h-8a16,16,0,0,0-16,16v8a8,8,0,0,1-8,8H56a8,8,0,0,1-8-8v-8a16,16,0,0,0-16-16H24A16,16,0,0,0,8,136v32a16,16,0,0,0,16,16h8v15.73A8.18,8.18,0,0,0,39.47,208,8,8,0,0,0,48,200V184H208v15.73a8.17,8.17,0,0,0,7.47,8.25,8,8,0,0,0,8.53-8V184h8a16,16,0,0,0,16-16V136A16,16,0,0,0,232,120Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowSquareRightFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM173.66,133.66l-32,32a8,8,0,0,1-11.32-11.32L148.69,136H88a8,8,0,0,1,0-16h60.69l-18.35-18.34a8,8,0,0,1,11.32-11.32l32,32A8,8,0,0,1,173.66,133.66Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.UserSoundFill">M198.13,202.85A8,8,0,0,1,192,216H24a8,8,0,0,1-6.12-13.15c14.94-17.78,33.52-30.41,54.17-37.17a68,68,0,1,1,71.9,0C164.6,172.44,183.18,185.07,198.13,202.85ZM196.86,61.39a8,8,0,0,0-4.22,10.5,92.26,92.26,0,0,1,0,72.22,8,8,0,1,0,14.72,6.29,108.36,108.36,0,0,0,0-84.8A8,8,0,0,0,196.86,61.39Zm39.85-8.54a8,8,0,1,0-14.7,6.3,124.43,124.43,0,0,1,0,97.7,8,8,0,1,0,14.7,6.3,140.34,140.34,0,0,0,0-110.3Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ChatTeardropSlashFill">M213.92,210.62a8,8,0,1,1-11.84,10.76l-13.57-14.92A99.4,99.4,0,0,1,132,224H48a16,16,0,0,1-16-16V124A99.54,99.54,0,0,1,55.29,59.92L42.08,45.38a8,8,0,0,1,.72-11.46,8.22,8.22,0,0,1,11.34.95Zm-5.57-29.91a4,4,0,0,0,6.24-.4A100,100,0,0,0,83.78,36.42a4,4,0,0,0-1,6.18Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ChairFill">M208,136H176V104h16a16,16,0,0,0,16-16V40a16,16,0,0,0-16-16H64A16,16,0,0,0,48,40V88a16,16,0,0,0,16,16H80v32H48a16,16,0,0,0-16,16v16a16,16,0,0,0,16,16h8v40a8,8,0,0,0,16,0V184H184v40a8,8,0,0,0,16,0V184h8a16,16,0,0,0,16-16V152A16,16,0,0,0,208,136Zm-48,0H96V104h64Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SteeringWheelFill">M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24ZM49.63,168H90.45l17,45.58A88.35,88.35,0,0,1,49.63,168ZM128,156a16,16,0,1,1,16-16A16,16,0,0,1,128,156Zm20.46,57.59L165.55,168h40.82A88.34,88.34,0,0,1,148.46,213.59ZM128,96a136.38,136.38,0,0,0-88,32.33V128a88,88,0,0,1,176,0v.33A136.38,136.38,0,0,0,128,96Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FlyingSaucerFill">M183.59,213.47a8,8,0,0,1-15.18,5.06l-8-24a8,8,0,0,1,15.18-5.06ZM128,184a8,8,0,0,0-8,8v32a8,8,0,0,0,16,0V192A8,8,0,0,0,128,184Zm-37.47.41a8,8,0,0,0-10.12,5.06l-8,24a8,8,0,0,0,15.18,5.06l8-24A8,8,0,0,0,90.53,184.41ZM248,112c0,16.22-13.37,30.89-37.65,41.29C188.22,162.78,159,168,128,168s-60.22-5.22-82.35-14.71C21.37,142.89,8,128.22,8,112c0-8.37,3.67-20.79,21.17-32.5,11.37-7.61,26.94-13.76,45.18-17.85A63.64,63.64,0,0,1,173,50.45a64.84,64.84,0,0,1,9.11,11.3C223.43,71.09,248,89.74,248,112ZM176,96a47.66,47.66,0,0,0-6.06-23.35l-.06-.09A48.07,48.07,0,0,0,127.36,48C101.25,48.34,80,70.25,80,96.83v3a7.92,7.92,0,0,0,6.13,7.76A188.24,188.24,0,0,0,128,112a188.09,188.09,0,0,0,41.85-4.37A7.93,7.93,0,0,0,176,99.87Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PersonSimpleCircleFill">M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24Zm0,40a16,16,0,1,1-16,16A16,16,0,0,1,128,64Zm48,56H136v13.58l30.66,46a8,8,0,0,1-13.32,8.88l-25.34-38-25.34,38a8,8,0,1,1-13.32-8.88l30.66-46V120H80a8,8,0,0,1,0-16h96a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PlayPauseFill">M184,64V192a8,8,0,0,1-16,0V64a8,8,0,0,1,16,0Zm40-8a8,8,0,0,0-8,8V192a8,8,0,0,0,16,0V64A8,8,0,0,0,224,56Zm-87.33,58.66L48.48,58.51A15.91,15.91,0,0,0,24,71.85v112.3A15.83,15.83,0,0,0,32.23,198a15.95,15.95,0,0,0,16.25-.53l88.19-56.15a15.8,15.8,0,0,0,0-26.68Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BatteryChargingFill">M256,96v64a8,8,0,0,1-16,0V96a8,8,0,0,1,16,0ZM224,80v96a24,24,0,0,1-24,24H32A24,24,0,0,1,8,176V80A24,24,0,0,1,32,56H200A24,24,0,0,1,224,80Zm-85.19,43.79A8,8,0,0,0,132,120H112.94l10.22-20.42a8,8,0,1,0-14.32-7.16l-16,32A8,8,0,0,0,100,136h19.06l-10.22,20.42a8,8,0,0,0,14.32,7.16l16-32A8,8,0,0,0,138.81,123.79Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SynagogueFill">M208,57.38V32a8,8,0,0,0-16,0V57.38A24,24,0,0,0,176,80v42.21L136,99.36V72a8,8,0,0,0-16,0V99.36L80,122.21V80A24,24,0,0,0,64,57.38V32a8,8,0,0,0-16,0V57.38A24,24,0,0,0,32,80V216a8,8,0,0,0,8,8h64a8,8,0,0,0,8-8V176a16,16,0,0,1,32,0v40a8,8,0,0,0,8,8h64a8,8,0,0,0,8-8V80A24,24,0,0,0,208,57.38ZM64,208H48V112H64Zm144,0H192V112h16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PipeFill">M232,104H208V56h24a8,8,0,0,0,0-16H205.83A16,16,0,0,0,192,32H176a16,16,0,0,0-13.83,8H144A104.11,104.11,0,0,0,40,144v18.16A16,16,0,0,0,32,176v16a16,16,0,0,0,8,13.84V232a8,8,0,0,0,16,0V208h48v24a8,8,0,0,0,16,0V205.84A16,16,0,0,0,128,192V176a16,16,0,0,0-8-13.84V144a24,24,0,0,1,24-24h18.17A16,16,0,0,0,176,128h16a16,16,0,0,0,13.83-8H232a8,8,0,0,0,0-16ZM112,192H48V176h64Zm64-80V48h16v63.8c0,.07,0,.13,0,.2Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.NetworkSlashFill">M98.08,59.41A8,8,0,0,1,96,54V40a16,16,0,0,1,16-16h32a16,16,0,0,1,16,16V72a16,16,0,0,1-16,16H127.61a8,8,0,0,1-5.92-2.62ZM53.92,34.62A8,8,0,1,0,42.08,45.38L102.64,112H24a8,8,0,0,0,0,16H56v32H48a16,16,0,0,0-16,16v32a16,16,0,0,0,16,16H80a16,16,0,0,0,16-16V176a16,16,0,0,0-16-16H72V128h45.19l84.89,93.38a8,8,0,1,0,11.84-10.76ZM232,112H164a8,8,0,0,0,0,16h20v22.83a8,8,0,1,0,16,0V128h32a8,8,0,0,0,0-16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.MicrosoftPowerpointLogoFill">M136,24A104.33,104.33,0,0,0,54,64H40A16,16,0,0,0,24,80v96a16,16,0,0,0,16,16H54A104,104,0,1,0,136,24ZM72,152V104a8,8,0,0,1,8-8H96a24,24,0,0,1,0,48H88v8a8,8,0,0,1-16,0Zm56,63.63A88.36,88.36,0,0,1,75.63,192H128ZM128,64H75.63A88.36,88.36,0,0,1,128,40.37Zm16-23.63A88.13,88.13,0,0,1,223.63,120H160V80a16,16,0,0,0-16-16Zm0,175.26V192a16,16,0,0,0,16-16V136h63.63A88.13,88.13,0,0,1,144,215.63ZM96,128H88V112h8a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.NeedleFill">M212.28,43.72a40,40,0,0,0-56.56,0l-24,24a8,8,0,0,0-2.23,4.3C120.69,123.28,36,208.73,34.36,210.33h0a8,8,0,0,0,11.31,11.32h0c.86-.87,86.83-86.31,138.32-95.15a8,8,0,0,0,4.3-2.23l24-24a40,40,0,0,0,0-56.56ZM189.66,77.66l-16,16a8,8,0,0,1-11.32-11.32l16-16a8,8,0,0,1,11.32,11.32Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArchiveFill">M224,48H32A16,16,0,0,0,16,64V88a16,16,0,0,0,16,16v88a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V104a16,16,0,0,0,16-16V64A16,16,0,0,0,224,48Zm-72,96H104a8,8,0,0,1,0-16h48a8,8,0,0,1,0,16Zm72-56H32V64H224V88Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ExportFill">M216,112v96a16,16,0,0,1-16,16H56a16,16,0,0,1-16-16V112A16,16,0,0,1,56,96h64v48a8,8,0,0,0,16,0V96h64A16,16,0,0,1,216,112ZM136,43.31l26.34,26.35a8,8,0,0,0,11.32-11.32l-40-40a8,8,0,0,0-11.32,0l-40,40A8,8,0,0,0,93.66,69.66L120,43.31V96h16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowSquareOutFill">M224,104a8,8,0,0,1-13.66,5.66L184,83.31l-42.34,42.35a8,8,0,0,1-11.32-11.32L172.69,72,146.34,45.66A8,8,0,0,1,152,32h64a8,8,0,0,1,8,8Zm-40,24a8,8,0,0,0-8,8v72H48V80h72a8,8,0,0,0,0-16H48A16,16,0,0,0,32,80V208a16,16,0,0,0,16,16H176a16,16,0,0,0,16-16V136A8,8,0,0,0,184,128Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ShapesFill">M111.59,181.47A8,8,0,0,1,104,192H24a8,8,0,0,1-7.59-10.53l40-120a8,8,0,0,1,15.18,0ZM208,76a52,52,0,1,0-52,52A52.06,52.06,0,0,0,208,76Zm16,68H136a8,8,0,0,0-8,8v56a8,8,0,0,0,8,8h88a8,8,0,0,0,8-8V152A8,8,0,0,0,224,144Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BalloonFill">M128,16a88.1,88.1,0,0,0-88,88c0,23.43,9.4,49.42,25.13,69.5,12.08,15.41,26.5,26,41.91,31.09L96.65,228.85A8,8,0,0,0,104,240h48a8,8,0,0,0,7.35-11.15L149,204.59c15.4-5.07,29.83-15.68,41.91-31.09C206.6,153.42,216,127.43,216,104A88.1,88.1,0,0,0,128,16Zm49.32,87.89A8.52,8.52,0,0,1,176,104a8,8,0,0,1-7.88-6.68,41.29,41.29,0,0,0-33.43-33.43,8,8,0,1,1,2.64-15.78,57.5,57.5,0,0,1,46.57,46.57A8,8,0,0,1,177.32,103.89Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BatteryPlusFill">M200,56H32A24,24,0,0,0,8,80v96a24,24,0,0,0,24,24H200a24,24,0,0,0,24-24V80A24,24,0,0,0,200,56Zm-56,80H124v20a8,8,0,0,1-16,0V136H88a8,8,0,0,1,0-16h20V100a8,8,0,0,1,16,0v20h20a8,8,0,0,1,0,16ZM256,96v64a8,8,0,0,1-16,0V96a8,8,0,0,1,16,0Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SparkleFill">M208,144a15.78,15.78,0,0,1-10.42,14.94L146,178l-19,51.62a15.92,15.92,0,0,1-29.88,0L78,178l-51.62-19a15.92,15.92,0,0,1,0-29.88L78,110l19-51.62a15.92,15.92,0,0,1,29.88,0L146,110l51.62,19A15.78,15.78,0,0,1,208,144ZM152,48h16V64a8,8,0,0,0,16,0V48h16a8,8,0,0,0,0-16H184V16a8,8,0,0,0-16,0V32H152a8,8,0,0,0,0,16Zm88,32h-8V72a8,8,0,0,0-16,0v8h-8a8,8,0,0,0,0,16h8v8a8,8,0,0,0,16,0V96h8a8,8,0,0,0,0-16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ListBulletsFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM68,188a12,12,0,1,1,12-12A12,12,0,0,1,68,188Zm0-48a12,12,0,1,1,12-12A12,12,0,0,1,68,140Zm0-48A12,12,0,1,1,80,80,12,12,0,0,1,68,92Zm124,92H104a8,8,0,0,1,0-16h88a8,8,0,0,1,0,16Zm0-48H104a8,8,0,0,1,0-16h88a8,8,0,0,1,0,16Zm0-48H104a8,8,0,0,1,0-16h88a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SelectionFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM104,200H72a16,16,0,0,1-16-16V152a8,8,0,0,1,16,0v32h32a8,8,0,0,1,0,16Zm0-128H72v32a8,8,0,0,1-16,0V72A16,16,0,0,1,72,56h32a8,8,0,0,1,0,16Zm96,112a16,16,0,0,1-16,16H152a8,8,0,0,1,0-16h32V152a8,8,0,0,1,16,0Zm0-80a8,8,0,0,1-16,0V72H152a8,8,0,0,1,0-16h32a16,16,0,0,1,16,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.TextHFiveFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM128,160a8,8,0,0,1-16,0V128H72v32a8,8,0,0,1-16,0V80a8,8,0,0,1,16,0v32h40V80a8,8,0,0,1,16,0Zm40-40a32,32,0,1,1-21.34,55.85,8,8,0,0,1,10.67-11.92,16,16,0,1,0,0-24,8,8,0,0,1-13.17-7.61l8-38A8,8,0,0,1,160,88h32a8,8,0,0,1,0,16H166.49L163,120.37A34.08,34.08,0,0,1,168,120Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.MemberOfFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32Zm-32,88a8,8,0,0,1,0,16H80.68A48.07,48.07,0,0,0,128,176h48a8,8,0,0,1,0,16H128a64,64,0,0,1,0-128h48a8,8,0,0,1,0,16H128a48.07,48.07,0,0,0-47.32,40Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.NotificationFill">M216,128v80a16,16,0,0,1-16,16H48a16,16,0,0,1-16-16V56A16,16,0,0,1,48,40h80a8,8,0,0,1,0,16H48V208H200V128a8,8,0,0,1,16,0ZM196,24a36,36,0,1,0,36,36A36,36,0,0,0,196,24Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PersonSimpleRunFill">M120,56a32,32,0,1,1,32,32A32,32,0,0,1,120,56Zm103.28,74.08a8,8,0,0,0-10.6-4c-.25.12-26.71,10.72-72.18-20.19-52.29-35.54-88-7.77-89.51-6.57a8,8,0,1,0,10,12.48c.26-.21,25.12-19.5,64.07,3.27-4.25,13.35-12.76,31.82-25.25,47-18.56,22.48-41.11,32.56-67,30A8,8,0,0,0,31.2,208a92.29,92.29,0,0,0,9.34.47c27.38,0,52-12.38,71.63-36.18.57-.69,1.14-1.4,1.69-2.1C133.31,175.29,168,190.3,168,232a8,8,0,0,0,16,0c0-24.65-10.08-45.35-29.15-59.86a104.29,104.29,0,0,0-31.31-15.81A169.31,169.31,0,0,0,139,124c26.14,16.09,46.84,20,60.69,20,12.18,0,19.06-3,19.67-3.28A8,8,0,0,0,223.28,130.08Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CityFill">M240,208h-8V88a8,8,0,0,0-8-8H160a8,8,0,0,0-8,8v40H104V40a8,8,0,0,0-8-8H32a8,8,0,0,0-8,8V208H16a8,8,0,0,0,0,16H240a8,8,0,0,0,0-16ZM72,184a8,8,0,0,1-16,0V168a8,8,0,0,1,16,0Zm0-48a8,8,0,0,1-16,0V120a8,8,0,0,1,16,0Zm0-48a8,8,0,0,1-16,0V72a8,8,0,0,1,16,0Zm64,96a8,8,0,0,1-16,0V168a8,8,0,0,1,16,0Zm64,0a8,8,0,0,1-16,0V168a8,8,0,0,1,16,0Zm0-48a8,8,0,0,1-16,0V120a8,8,0,0,1,16,0Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.TrayArrowDownFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM90.34,114.34a8,8,0,0,1,11.32,0L120,132.69V72a8,8,0,0,1,16,0v60.69l18.34-18.35a8,8,0,0,1,11.32,11.32l-32,32a8,8,0,0,1-11.32,0l-32-32A8,8,0,0,1,90.34,114.34ZM208,208H48V168H76.69L96,187.32A15.89,15.89,0,0,0,107.31,192h41.38A15.86,15.86,0,0,0,160,187.31L179.31,168H208v40Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.UserMinusFill">M198.13,194.85A8,8,0,0,1,192,208H24a8,8,0,0,1-6.12-13.15c14.94-17.78,33.52-30.41,54.17-37.17a68,68,0,1,1,71.9,0C164.6,164.44,183.18,177.07,198.13,194.85ZM248,128H200a8,8,0,0,0,0,16h48a8,8,0,0,0,0-16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.LightbulbFilamentFill">M176,232a8,8,0,0,1-8,8H88a8,8,0,0,1,0-16h80A8,8,0,0,1,176,232Zm40-128a87.55,87.55,0,0,1-33.64,69.21A16.24,16.24,0,0,0,176,186v6a16,16,0,0,1-16,16H96a16,16,0,0,1-16-16v-6a16,16,0,0,0-6.23-12.66A87.59,87.59,0,0,1,40,104.49C39.74,56.83,78.26,17.14,125.88,16A88,88,0,0,1,216,104Zm-50.34,2.34a8,8,0,0,0-11.32,0L128,132.69l-26.34-26.35a8,8,0,0,0-11.32,11.32L120,147.31V184a8,8,0,0,0,16,0V147.31l29.66-29.65A8,8,0,0,0,165.66,106.34Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SlidersHorizontalFill">M32,80a8,8,0,0,1,8-8H77.17a28,28,0,0,1,53.66,0H216a8,8,0,0,1,0,16H130.83a28,28,0,0,1-53.66,0H40A8,8,0,0,1,32,80Zm184,88H194.83a28,28,0,0,0-53.66,0H40a8,8,0,0,0,0,16H141.17a28,28,0,0,0,53.66,0H216a8,8,0,0,0,0-16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.DotOutlineFill">M156,128a28,28,0,1,1-28-28A28,28,0,0,1,156,128Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.WalletFill">M216,64H56a8,8,0,0,1,0-16H192a8,8,0,0,0,0-16H56A24,24,0,0,0,32,56V184a24,24,0,0,0,24,24H216a16,16,0,0,0,16-16V80A16,16,0,0,0,216,64Zm-36,80a12,12,0,1,1,12-12A12,12,0,0,1,180,144Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ControlFill">M207.39,123.06A8,8,0,0,1,200,128H56a8,8,0,0,1-5.66-13.66l72-72a8,8,0,0,1,11.32,0l72,72A8,8,0,0,1,207.39,123.06Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.HourglassSimpleHighFill">M211.18,196.56,139.57,128l71.61-68.56a1.59,1.59,0,0,1,.13-.13A16,16,0,0,0,200,32H56A16,16,0,0,0,44.69,59.31a1.59,1.59,0,0,1,.13.13L116.43,128,44.82,196.56a1.59,1.59,0,0,1-.13.13A16,16,0,0,0,56,224H200a16,16,0,0,0,11.32-27.31A1.59,1.59,0,0,1,211.18,196.56ZM56,48h0v0Zm144,0-16.7,16H72.72L56,48ZM56,208l72-68.92L200,208Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CloudCheckFill">M247.93,124.52C246.11,77.54,207.07,40,160.06,40A88.1,88.1,0,0,0,81.29,88.67h0A87.48,87.48,0,0,0,72,127.73,8.18,8.18,0,0,1,64.57,136,8,8,0,0,1,56,128a103.66,103.66,0,0,1,5.34-32.92,4,4,0,0,0-4.75-5.18A64.09,64.09,0,0,0,8,152c0,35.19,29.75,64,65,64H160A88.09,88.09,0,0,0,247.93,124.52Zm-50.27-6.86-48,48a8,8,0,0,1-11.32,0l-24-24a8,8,0,0,1,11.32-11.32L144,148.69l42.34-42.35a8,8,0,0,1,11.32,11.32Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.EyesFill">M176,32c-20.61,0-38.28,18.16-48,45.85C118.28,50.16,100.61,32,80,32c-31.4,0-56,42.17-56,96s24.6,96,56,96c20.61,0,38.28-18.16,48-45.85,9.72,27.69,27.39,45.85,48,45.85,31.4,0,56-42.17,56-96S207.4,32,176,32ZM106.92,186.39C99.43,200.12,89.62,208,80,208s-19.43-7.88-26.92-21.61a104.81,104.81,0,0,1-10.24-29.23,32,32,0,1,0,0-58.32A104.81,104.81,0,0,1,53.08,69.61C60.57,55.88,70.38,48,80,48s19.43,7.88,26.92,21.61C115.35,85.07,120,105.81,120,128S115.35,170.93,106.92,186.39Zm96,0C195.43,200.12,185.62,208,176,208s-19.43-7.88-26.92-21.61a104.81,104.81,0,0,1-10.24-29.23,32,32,0,1,0,0-58.32,104.81,104.81,0,0,1,10.24-29.23C156.57,55.88,166.38,48,176,48s19.43,7.88,26.92,21.61C211.35,85.07,216,105.81,216,128S211.35,170.93,202.92,186.39Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ChartDonutFill">M120,161.94v65.34a4,4,0,0,1-4.46,4,104.28,104.28,0,0,1-84-64.5,4,4,0,0,1,2.69-5.34L97.32,144.5a4,4,0,0,1,4.35,1.66,32.25,32.25,0,0,0,15.59,12A4,4,0,0,1,120,161.94ZM128.06,24A8,8,0,0,0,120,32V88a7.94,7.94,0,0,0,7.87,8,32,32,0,0,1,10.86,62.15,4,4,0,0,0-2.73,3.79v65.34a4,4,0,0,0,4.45,4A104,104,0,0,0,128.06,24Zm-32,101.49a32,32,0,0,1,4.15-13.42l0-.07a8,8,0,0,0-.57-8.87A8.36,8.36,0,0,0,97.18,101L48.85,73.06A8,8,0,0,0,37.92,76,104.12,104.12,0,0,0,25,142.68,4,4,0,0,0,30,146L93.22,129A3.94,3.94,0,0,0,96.1,125.49Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SmileyBlankFill">M128,24A104,104,0,1,0,232,128,104.13,104.13,0,0,0,128,24ZM92,120a12,12,0,1,1,12-12A12,12,0,0,1,92,120Zm72,0a12,12,0,1,1,12-12A12,12,0,0,1,164,120Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.KeyholeFill">M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24Zm29.52,146.39a4,4,0,0,1-3.66,5.61H102.14a4,4,0,0,1-3.66-5.61L112,139.72a32,32,0,1,1,32,0Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SigmaFill">M200,24H56A16,16,0,0,0,40,40V216a16,16,0,0,0,16,16H200a16,16,0,0,0,16-16V40A16,16,0,0,0,200,24ZM184,88a8,8,0,0,1-16,0V72H96l38.4,51.2a8,8,0,0,1,0,9.6L96,184h72V168a8,8,0,0,1,16,0v24a8,8,0,0,1-8,8H80a8,8,0,0,1-6.4-12.8L118,128,73.6,68.8A8,8,0,0,1,80,56h96a8,8,0,0,1,8,8Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.TireFill">M184,128c0,22.09-7.16,40-16,40s-16-17.91-16-40,7.16-40,16-40S184,105.91,184,128Zm56,96a8,8,0,0,1-8,8H92c-33.64,0-60-45.68-60-104S58.36,24,92,24h72c33.64,0,60,45.68,60,104,0,37.47-10.88,69.73-27.59,88H232A8,8,0,0,1,240,224ZM57.87,111.81a7.93,7.93,0,0,0,4.64-1.49L80,97.83l13.28,9.49a8,8,0,0,0,9.3-13L84.65,81.49a8,8,0,0,0-9.3,0L53.21,97.3a8,8,0,0,0,4.66,14.51Zm46.67,47.89L84.65,145.49a8,8,0,0,0-9.3,0L56,159.29a8,8,0,1,0,9.3,13L80,161.83l15.24,10.88a8,8,0,1,0,9.3-13Zm89.2,32.37c9.19-17,14.26-39.74,14.26-64.07s-5.07-47.09-14.26-64.07C185.38,48.5,174.82,40,164,40s-21.38,8.5-29.74,23.93C125.07,80.91,120,103.67,120,128s5.07,47.09,14.26,64.07C142.62,207.5,153.18,216,164,216S185.38,207.5,193.74,192.07Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FileSqlFill">M44,120H212a4,4,0,0,0,4-4V88a8,8,0,0,0-2.34-5.66l-56-56A8,8,0,0,0,152,24H56A16,16,0,0,0,40,40v76A4,4,0,0,0,44,120ZM152,44l44,44H152Zm76,164.53a8.18,8.18,0,0,1-8.25,7.47H192a8,8,0,0,1-8-8V152.27a8.18,8.18,0,0,1,7.47-8.25,8,8,0,0,1,8.53,8v48h20A8,8,0,0,1,228,208.53ZM91.82,196.31a20.82,20.82,0,0,1-9.19,15.23C77.44,215,71,216,65.14,216A60.72,60.72,0,0,1,50,214a8,8,0,0,1,4.3-15.41c4.38,1.2,14.95,2.7,19.55-.36.89-.59,1.83-1.52,2.14-3.93.35-2.67-.71-4.1-12.78-7.59-9.35-2.7-25-7.23-23-23.11a20.55,20.55,0,0,1,9-14.95c11.84-8,30.72-3.31,32.83-2.76a8,8,0,0,1-4.08,15.48c-4.49-1.17-15.22-2.56-19.82.56a4.54,4.54,0,0,0-2,3.67c-.12.9-.14,1.08,1.12,1.9,2.31,1.49,6.44,2.68,10.45,3.84C77.5,174.17,94.06,179,91.82,196.31Zm71,3.23A39.05,39.05,0,0,0,168,180c0-19.85-14.35-36-32-36s-32,16.15-32,36,14.35,36,32,36a29.18,29.18,0,0,0,15.9-4.78l2.44,2.44a8,8,0,0,0,11.71-.43,8.18,8.18,0,0,0-.61-11.09ZM136,200c-8.82,0-16-9-16-20s7.18-20,16-20,16,9,16,20a24.41,24.41,0,0,1-1.18,7.51l-.93-.93a8.22,8.22,0,0,0-11.37-.41,8,8,0,0,0-.18,11.49l1.68,1.67A12.93,12.93,0,0,1,136,200Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ComputerTowerFill">M192,24H64A16,16,0,0,0,48,40V216a16,16,0,0,0,16,16H192a16,16,0,0,0,16-16V40A16,16,0,0,0,192,24ZM128,192a12,12,0,1,1,12-12A12,12,0,0,1,128,192Zm32-80H96a8,8,0,0,1,0-16h64a8,8,0,0,1,0,16Zm0-32H96a8,8,0,0,1,0-16h64a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PushPinFill">M235.33,104l-53.47,53.65c4.56,12.67,6.45,33.89-13.19,60A15.93,15.93,0,0,1,157,224c-.38,0-.75,0-1.13,0a16,16,0,0,1-11.32-4.69L96.29,171,53.66,213.66a8,8,0,0,1-11.32-11.32L85,159.71l-48.3-48.3A16,16,0,0,1,38,87.63c25.42-20.51,49.75-16.48,60.4-13.14L152,20.7a16,16,0,0,1,22.63,0l60.69,60.68A16,16,0,0,1,235.33,104Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PaperPlaneRightFill">M240,127.89a16,16,0,0,1-8.18,14L63.9,237.9A16.15,16.15,0,0,1,56,240a16,16,0,0,1-15-21.33l27-79.95A4,4,0,0,1,71.72,136H144a8,8,0,0,0,8-8.53,8.19,8.19,0,0,0-8.26-7.47h-72a4,4,0,0,1-3.79-2.72l-27-79.94A16,16,0,0,1,63.84,18.07l168,95.89A16,16,0,0,1,240,127.89Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.TerminalFill">M216,40H40A16,16,0,0,0,24,56V200a16,16,0,0,0,16,16H216a16,16,0,0,0,16-16V56A16,16,0,0,0,216,40ZM77.66,173.66a8,8,0,0,1-11.32-11.32L100.69,128,66.34,93.66A8,8,0,0,1,77.66,82.34l40,40a8,8,0,0,1,0,11.32ZM192,176H128a8,8,0,0,1,0-16h64a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ClockClockwiseFill">M136,80v43.47l36.12,21.67a8,8,0,0,1-8.24,13.72l-40-24A8,8,0,0,1,120,128V80a8,8,0,0,1,16,0Zm91.06-23.39a8,8,0,0,0-8.72,1.73L206,70.71c-3.23-3.51-6.56-7-10.1-10.59a96,96,0,1,0-2,137.7,8,8,0,0,0-11-11.64A80,80,0,1,1,184.54,71.4c3.54,3.58,6.87,7.1,10.11,10.63L178.34,98.34A8,8,0,0,0,184,112h40a8,8,0,0,0,8-8V64A8,8,0,0,0,227.06,56.61Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.HourglassHighFill">M200,75.64V40a16,16,0,0,0-16-16H72A16,16,0,0,0,56,40V76a16.07,16.07,0,0,0,6.4,12.8L114.67,128,62.4,167.2A16.07,16.07,0,0,0,56,180v36a16,16,0,0,0,16,16H184a16,16,0,0,0,16-16V180.36a16.09,16.09,0,0,0-6.35-12.77L141.27,128l52.38-39.59A16.09,16.09,0,0,0,200,75.64ZM184,40V64H72V40Zm0,176H72V180l56-42,56,42.35Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SquaresFourFill">M120,56v48a16,16,0,0,1-16,16H56a16,16,0,0,1-16-16V56A16,16,0,0,1,56,40h48A16,16,0,0,1,120,56Zm80-16H152a16,16,0,0,0-16,16v48a16,16,0,0,0,16,16h48a16,16,0,0,0,16-16V56A16,16,0,0,0,200,40Zm-96,96H56a16,16,0,0,0-16,16v48a16,16,0,0,0,16,16h48a16,16,0,0,0,16-16V152A16,16,0,0,0,104,136Zm96,0H152a16,16,0,0,0-16,16v48a16,16,0,0,0,16,16h48a16,16,0,0,0,16-16V152A16,16,0,0,0,200,136Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.AngularLogoFill">M128,104.47,141.07,128H114.93ZM231.93,73.06l-16,120a8,8,0,0,1-4.35,6.1l-80,40a8,8,0,0,1-7.16,0l-80-40a8,8,0,0,1-4.35-6.1l-16-120a8,8,0,0,1,4.85-8.44l96-40a7.93,7.93,0,0,1,6.16,0l96,40A8,8,0,0,1,231.93,73.06ZM175,156.12l-40-72a8,8,0,0,0-14,0l-40,72a8,8,0,1,0,14,7.76L106,144H150l11,19.88a8,8,0,1,0,14-7.76Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.LayoutFill">M216,40H40A16,16,0,0,0,24,56V200a16,16,0,0,0,16,16H216a16,16,0,0,0,16-16V56A16,16,0,0,0,216,40ZM40,56H216V96H40ZM216,200H112V112H216v88Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.AndroidLogoFill">M207.06,80.67c-.74-.74-1.49-1.46-2.24-2.17l24.84-24.84a8,8,0,0,0-11.32-11.32l-26,26a111.43,111.43,0,0,0-128.55.19L37.66,42.34A8,8,0,0,0,26.34,53.66L51.4,78.72A113.38,113.38,0,0,0,16,161.13V184a16,16,0,0,0,16,16H224a16,16,0,0,0,16-16V160A111.25,111.25,0,0,0,207.06,80.67ZM92,160a12,12,0,1,1,12-12A12,12,0,0,1,92,160Zm72,0a12,12,0,1,1,12-12A12,12,0,0,1,164,160Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ColumnsPlusLeftFill">M144,48V208a16,16,0,0,1-16,16H104a16,16,0,0,1-16-16V48a16,16,0,0,1,16-16h24A16,16,0,0,1,144,48Zm56-16H176a16,16,0,0,0-16,16V208a16,16,0,0,0,16,16h24a16,16,0,0,0,16-16V48A16,16,0,0,0,200,32ZM64,120H48V104a8,8,0,0,0-16,0v16H16a8,8,0,0,0,0,16H32v16a8,8,0,0,0,16,0V136H64a8,8,0,0,0,0-16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.UserFocusFill">M224,40V76a8,8,0,0,1-16,0V48H180a8,8,0,0,1,0-16h36A8,8,0,0,1,224,40Zm-8,132a8,8,0,0,0-8,8v28H180a8,8,0,0,0,0,16h36a8,8,0,0,0,8-8V180A8,8,0,0,0,216,172ZM76,208H48V180a8,8,0,0,0-16,0v36a8,8,0,0,0,8,8H76a8,8,0,0,0,0-16ZM40,84a8,8,0,0,0,8-8V48H76a8,8,0,0,0,0-16H40a8,8,0,0,0-8,8V76A8,8,0,0,0,40,84Zm61,57.51A67.94,67.94,0,0,0,73.6,163.19,8,8,0,0,0,80,176h96a8,8,0,0,0,6.4-12.81A67.94,67.94,0,0,0,155,141.51a40,40,0,1,0-53.94,0Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.JoystickFill">M224,160v48a16,16,0,0,1-16,16H48a16,16,0,0,1-16-16V160a16,16,0,0,1,16-16h72V95.19a40,40,0,1,1,16,0V144h72A16,16,0,0,1,224,160Zm-64-40a8,8,0,0,0,8,8h32a8,8,0,0,0,0-16H168A8,8,0,0,0,160,120Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.WarningFill">M236.8,188.09,149.35,36.22h0a24.76,24.76,0,0,0-42.7,0L19.2,188.09a23.51,23.51,0,0,0,0,23.72A24.35,24.35,0,0,0,40.55,224h174.9a24.35,24.35,0,0,0,21.33-12.19A23.51,23.51,0,0,0,236.8,188.09ZM120,104a8,8,0,0,1,16,0v40a8,8,0,0,1-16,0Zm8,88a12,12,0,1,1,12-12A12,12,0,0,1,128,192Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowsOutLineHorizontalFill">M136,40V216a8,8,0,0,1-16,0V40a8,8,0,0,1,16,0ZM96,120H56V96a8,8,0,0,0-13.66-5.66l-32,32a8,8,0,0,0,0,11.32l32,32A8,8,0,0,0,56,160V136H96a8,8,0,0,0,0-16Zm149.66,2.34-32-32A8,8,0,0,0,200,96v24H160a8,8,0,0,0,0,16h40v24a8,8,0,0,0,13.66,5.66l32-32A8,8,0,0,0,245.66,122.34Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CloverFill">M228,120c0,22.63-6,36.72-17.93,41.87a27.3,27.3,0,0,1-11,2.13,41.75,41.75,0,0,1-8.4-.93,4.05,4.05,0,0,1-2.52-1.64,368.49,368.49,0,0,0-47.75-55.26,8,8,0,0,0-11,11.62c14.84,13.91,64.13,63.49,78.32,120.27a8,8,0,0,1-5.82,9.7A8.13,8.13,0,0,1,200,248a8,8,0,0,1-7.75-6.06c-4.12-16.47-11.65-32.48-20.46-47.09a25.85,25.85,0,0,1-1.9,7.21C164.72,214,150.63,220,128,220s-36.72-6-41.88-17.94c-5.45-12.58-.39-30.82,15-54.21.68-1,1.36-2,2-3l-3,2C82.84,158.27,68.35,164,56.89,164a27.3,27.3,0,0,1-11-2.13C34,156.72,28,142.63,28,120s6-36.72,17.93-41.88c12.59-5.45,30.83-.39,54.22,15l3,2q-1-1.5-2-3c-15.41-23.39-20.47-41.63-15-54.22C91.28,26,105.37,20,128,20s36.72,6,41.88,17.93c5.45,12.59.39,30.83-15,54.22q-1,1.53-2,3l3-2c23.39-15.41,41.63-20.47,54.22-15C222,83.28,228,97.37,228,120Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.GenderNonbinaryFill">M200,24H56A16,16,0,0,0,40,40V216a16,16,0,0,0,16,16H200a16,16,0,0,0,16-16V40A16,16,0,0,0,200,24ZM128,208a52,52,0,0,1-8-103.38V83.82L91,95.43A8,8,0,0,1,85,80.57L106.46,72,85,63.43A8,8,0,0,1,91,48.57l37,14.81,37-14.81A8,8,0,1,1,171,63.43L149.54,72,171,80.57A8,8,0,0,1,165,95.43L136,83.82v20.8A52,52,0,0,1,128,208Zm36-52a36,36,0,1,1-36-36A36,36,0,0,1,164,156Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.HouseSimpleFill">M224,120v96a8,8,0,0,1-8,8H40a8,8,0,0,1-8-8V120a15.87,15.87,0,0,1,4.69-11.32l80-80a16,16,0,0,1,22.62,0l80,80A15.87,15.87,0,0,1,224,120Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.MapPinFill">M128,16a88.1,88.1,0,0,0-88,88c0,75.3,80,132.17,83.41,134.55a8,8,0,0,0,9.18,0C136,236.17,216,179.3,216,104A88.1,88.1,0,0,0,128,16Zm0,56a32,32,0,1,1-32,32A32,32,0,0,1,128,72Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BoxArrowUpFill">M223.16,68.42l-16-32A8,8,0,0,0,200,32H56a8,8,0,0,0-7.16,4.42l-16,32A8.08,8.08,0,0,0,32,72V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V72A8.08,8.08,0,0,0,223.16,68.42Zm-57.5,73.24a8,8,0,0,1-11.32,0L136,123.31V184a8,8,0,0,1-16,0V123.31l-18.34,18.35a8,8,0,0,1-11.32-11.32l32-32a8,8,0,0,1,11.32,0l32,32A8,8,0,0,1,165.66,141.66ZM52.94,64l8-16H195.06l8,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ChatTextFill">M216,48H40A16,16,0,0,0,24,64V224a15.84,15.84,0,0,0,9.25,14.5A16.05,16.05,0,0,0,40,240a15.89,15.89,0,0,0,10.25-3.78l.09-.07L83,208H216a16,16,0,0,0,16-16V64A16,16,0,0,0,216,48ZM160,152H96a8,8,0,0,1,0-16h64a8,8,0,0,1,0,16Zm0-32H96a8,8,0,0,1,0-16h64a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FileXlsFill">M44,120H212a4,4,0,0,0,4-4V88a8,8,0,0,0-2.34-5.66l-56-56A8,8,0,0,0,152,24H56A16,16,0,0,0,40,40v76A4,4,0,0,0,44,120ZM152,44l44,44H152Zm4,164.53a8.18,8.18,0,0,1-8.25,7.47H120a8,8,0,0,1-8-8V152.27a8.18,8.18,0,0,1,7.47-8.25,8,8,0,0,1,8.53,8v48h20A8,8,0,0,1,156,208.53ZM94.51,156.65,77.83,180l16.68,23.35a8,8,0,0,1-13,9.3L68,193.76,54.51,212.65a8,8,0,1,1-13-9.3L58.17,180,41.49,156.65a8,8,0,0,1,2.3-11.46,8.19,8.19,0,0,1,10.88,2.38L68,166.24l13.49-18.89a8,8,0,0,1,13,9.3Zm121.28,39.66a20.81,20.81,0,0,1-9.18,15.23C201.42,215,194.94,216,189.12,216a60.63,60.63,0,0,1-15.19-2,8,8,0,0,1,4.31-15.41c4.38,1.21,14.94,2.71,19.54-.35.89-.6,1.84-1.52,2.15-3.93.34-2.67-.72-4.1-12.78-7.59-9.35-2.7-25-7.23-23-23.12a20.58,20.58,0,0,1,8.95-14.94c11.84-8,30.72-3.31,32.83-2.76a8,8,0,0,1-4.07,15.48c-4.48-1.17-15.22-2.56-19.82.56a4.54,4.54,0,0,0-2,3.67c-.11.9-.13,1.08,1.12,1.9,2.31,1.49,6.45,2.68,10.45,3.84C201.48,174.17,218,179,215.79,196.31Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.TreeStructureFill">M144,96V80H128a8,8,0,0,0-8,8v80a8,8,0,0,0,8,8h16V160a16,16,0,0,1,16-16h48a16,16,0,0,1,16,16v48a16,16,0,0,1-16,16H160a16,16,0,0,1-16-16V192H128a24,24,0,0,1-24-24V136H72v8a16,16,0,0,1-16,16H24A16,16,0,0,1,8,144V112A16,16,0,0,1,24,96H56a16,16,0,0,1,16,16v8h32V88a24,24,0,0,1,24-24h16V48a16,16,0,0,1,16-16h48a16,16,0,0,1,16,16V96a16,16,0,0,1-16,16H160A16,16,0,0,1,144,96Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.AsteriskSimpleFill">M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24Zm63.34,91.83-50.4,16.38,31.15,42.87a8,8,0,1,1-12.94,9.4L128,141.61,96.85,184.48a8,8,0,0,1-12.94-9.4l31.15-42.87-50.4-16.38a8,8,0,0,1,4.94-15.22L120,117V64a8,8,0,0,1,16,0v53l50.4-16.38a8,8,0,0,1,4.94,15.22Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.StarAndCrescentFill">M160,206.4a8,8,0,0,1-4.36,7.13A94.93,94.93,0,0,1,112,224a96,96,0,0,1,0-192,94.93,94.93,0,0,1,43.64,10.47,8,8,0,0,1,0,14.25,80,80,0,0,0,0,142.56A8,8,0,0,1,160,206.4Zm91.17-85.75-26.5-11.43-2.31-29.84a8,8,0,0,0-14.14-4.47L189.63,97.42l-27.71-6.85a8,8,0,0,0-8.81,11.82L168.18,128l-15.07,25.61a8,8,0,0,0,8.81,11.82l27.71-6.85,18.59,22.51a8,8,0,0,0,14.14-4.47l2.31-29.84,26.5-11.43a8,8,0,0,0,0-14.7Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ImageFill">M216,40H40A16,16,0,0,0,24,56V200a16,16,0,0,0,16,16H216a16,16,0,0,0,16-16V56A16,16,0,0,0,216,40ZM156,88a12,12,0,1,1-12,12A12,12,0,0,1,156,88Zm60,112H40V160.69l46.34-46.35a8,8,0,0,1,11.32,0h0L165,181.66a8,8,0,0,0,11.32-11.32l-17.66-17.65L173,138.34a8,8,0,0,1,11.31,0L216,170.07V200Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ChatCenteredFill">M232,56V184a16,16,0,0,1-16,16H155.57l-13.68,23.94a16,16,0,0,1-27.78,0L100.43,200H40a16,16,0,0,1-16-16V56A16,16,0,0,1,40,40H216A16,16,0,0,1,232,56Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.RssSimpleFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM76,192a12,12,0,1,1,12-12A12,12,0,0,1,76,192Zm60,0a8,8,0,0,1-8-8,56.06,56.06,0,0,0-56-56,8,8,0,0,1,0-16,72.08,72.08,0,0,1,72,72A8,8,0,0,1,136,192Zm48,0a8,8,0,0,1-8-8A104.11,104.11,0,0,0,72,80a8,8,0,0,1,0-16A120.13,120.13,0,0,1,192,184,8,8,0,0,1,184,192Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.MonitorFill">M160,216H96a8,8,0,0,0,0,16h64a8,8,0,0,0,0-16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.LetterCircleVFill">M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24Zm39.43,75-32,80a8,8,0,0,1-14.86,0l-32-80A8,8,0,0,1,103.43,93L128,154.46,152.57,93A8,8,0,1,1,167.43,99Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ScribbleFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM193.66,169.66l-8,8a9,9,0,0,0,0,12.68l4,4a8,8,0,0,1-11.32,11.32l-4-4a25,25,0,0,1,0-35.32l8-8a9,9,0,0,0,0-12.68,9,9,0,0,0-12.68,0l-48,48a25,25,0,0,1-35.32-35.32l72-72a9,9,0,0,0,0-12.68,9,9,0,0,0-12.68,0l-48,48A25,25,0,0,1,62.34,86.34l28-28a8,8,0,0,1,11.32,11.32l-28,28a9,9,0,0,0,0,12.68,9,9,0,0,0,12.68,0l48-48a25,25,0,0,1,35.32,35.32l-72,72a9,9,0,0,0,0,12.68,9,9,0,0,0,12.68,0l48-48a25,25,0,0,1,35.32,35.32Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.AngleFill">M216,40H40A16,16,0,0,0,24,56V200a16,16,0,0,0,16,16H216a16,16,0,0,0,16-16V56A16,16,0,0,0,216,40ZM112,88a64.07,64.07,0,0,1,64,64,8,8,0,0,1-16,0,48.05,48.05,0,0,0-48-48,8,8,0,0,1,0-16Zm88,104H80a8,8,0,0,1-8-8V104H56a8,8,0,0,1,0-16H72V72a8,8,0,0,1,16,0V176H200a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BatteryFullFill">M200,56H32A24,24,0,0,0,8,80v96a24,24,0,0,0,24,24H200a24,24,0,0,0,24-24V80A24,24,0,0,0,200,56Zm8,120a8,8,0,0,1-8,8H32a8,8,0,0,1-8-8V80a8,8,0,0,1,8-8H200a8,8,0,0,1,8,8ZM192,96v64a8,8,0,0,1-8,8H48a8,8,0,0,1-8-8V96a8,8,0,0,1,8-8H184A8,8,0,0,1,192,96Zm64,0v64a8,8,0,0,1-16,0V96a8,8,0,0,1,16,0Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.MatrixLogoFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM80,200H64a8,8,0,0,1-8-8V64a8,8,0,0,1,8-8H80a8,8,0,0,1,0,16H72V184h8a8,8,0,0,1,0,16Zm80-40a8,8,0,0,1-8-8V120a8,8,0,0,0-16,0v32a8,8,0,0,1-16,0V120a8,8,0,0,0-16,0v32a8,8,0,0,1-16,0V104a8,8,0,0,1,13.66-5.65A23.94,23.94,0,0,1,128,102.13,24,24,0,0,1,168,120v32A8,8,0,0,1,160,160Zm40,32a8,8,0,0,1-8,8H176a8,8,0,0,1,0-16h8V72h-8a8,8,0,0,1,0-16h16a8,8,0,0,1,8,8Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BlueprintFill">M136,120h24v16H136ZM240,64V200a8,8,0,0,1-8,8H48a32,32,0,0,1-32-32V64A32,32,0,0,1,48,32H64a8,8,0,0,1,8,8V56H232A8,8,0,0,1,240,64ZM56,48H48A16,16,0,0,0,32,64v84.29A31.82,31.82,0,0,1,48,144h8Zm120,88V120h16a8,8,0,0,0,0-16H176V96a8,8,0,0,0-16,0v8H136V96a8,8,0,0,0-16,0v8H104a8,8,0,0,0,0,16h16v16H104a8,8,0,0,0,0,16h16v8a8,8,0,0,0,16,0v-8h24v8a8,8,0,0,0,16,0v-8h16a8,8,0,0,0,0-16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.TrendUpFill">M240,56v64a8,8,0,0,1-13.66,5.66L200,99.31l-58.34,58.35a8,8,0,0,1-11.32,0L96,123.31,29.66,189.66a8,8,0,0,1-11.32-11.32l72-72a8,8,0,0,1,11.32,0L136,140.69,188.69,88,162.34,61.66A8,8,0,0,1,168,48h64A8,8,0,0,1,240,56Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.UserSquareFill">M172,120a44,44,0,1,1-44-44A44,44,0,0,1,172,120Zm52-72V208a16,16,0,0,1-16,16H48a16,16,0,0,1-16-16V48A16,16,0,0,1,48,32H208A16,16,0,0,1,224,48ZM208,208V48H48V208h3.67a80.58,80.58,0,0,1,26.07-38.25q3.08-2.48,6.36-4.62a4,4,0,0,1,4.81.33,59.82,59.82,0,0,0,78.18,0,4,4,0,0,1,4.81-.33q3.28,2.15,6.36,4.62A80.58,80.58,0,0,1,204.33,208H208Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.MusicNotesMinusFill">M224,40H176a8,8,0,0,0,0,16h48a8,8,0,0,0,0-16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.MusicNotesMinusFill2">M162.13,76.5a31.57,31.57,0,0,1-16.44-38.76A4,4,0,0,0,141,32.53L78.06,48.25A8,8,0,0,0,72,56V166.1A36,36,0,1,0,52.42,232C72.25,231.77,88,215.13,88,195.3V102.25l73.26-18.31A4,4,0,0,0,162.13,76.5Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.MusicNotesMinusFill3">M212,80h-8a4,4,0,0,0-4,4v50.1A36,36,0,1,0,180.42,200c19.83-.23,35.58-16.86,35.58-36.7V84A4,4,0,0,0,212,80Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.TableFill">M224,48H32a8,8,0,0,0-8,8V192a16,16,0,0,0,16,16H216a16,16,0,0,0,16-16V56A8,8,0,0,0,224,48ZM40,112H80v32H40Zm56,0H216v32H96ZM40,160H80v32H40Zm176,32H96V160H216v32Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.AirplayFill">M174.15,210.88A8,8,0,0,1,168,224H88a8,8,0,0,1-6.15-13.12l40-48a8,8,0,0,1,12.29,0ZM208,40H48A24,24,0,0,0,24,64V176a24,24,0,0,0,24,24H68.22a4,4,0,0,0,3.07-1.44l38.28-45.92a24,24,0,0,1,21-8.51,24.68,24.68,0,0,1,16.25,8.94l37.91,45.49a4,4,0,0,0,3.07,1.44H208a24,24,0,0,0,24-24V64A24,24,0,0,0,208,40Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowBendRightUpFill">M207.39,83.06A8,8,0,0,1,200,88H160v40A104.11,104.11,0,0,1,56,232a8,8,0,0,1,0-16,88.1,88.1,0,0,0,88-88V88H104a8,8,0,0,1-5.66-13.66l48-48a8,8,0,0,1,11.32,0l48,48A8,8,0,0,1,207.39,83.06Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.RadioFill">M216,64H86.51L194.3,31.67a8,8,0,0,0-4.6-15.33l-160,48h0A8,8,0,0,0,24,72V192a16,16,0,0,0,16,16H216a16,16,0,0,0,16-16V80A16,16,0,0,0,216,64ZM104,176H64a8,8,0,0,1,0-16h40a8,8,0,0,1,0,16Zm0-32H64a8,8,0,0,1,0-16h40a8,8,0,0,1,0,16Zm0-32H64a8,8,0,0,1,0-16h40a8,8,0,0,1,0,16Zm64,56a32,32,0,1,1,32-32A32,32,0,0,1,168,168Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FireSimpleFill">M143.38,17.85a8,8,0,0,0-12.63,3.41l-22,60.41L84.59,58.26a8,8,0,0,0-11.93.89C51,87.53,40,116.08,40,144a88,88,0,0,0,176,0C216,84.55,165.21,36,143.38,17.85Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CubeFill">M223.68,66.15,135.68,18a15.88,15.88,0,0,0-15.36,0l-88,48.17a16,16,0,0,0-8.32,14v95.64a16,16,0,0,0,8.32,14l88,48.17a15.88,15.88,0,0,0,15.36,0l88-48.17a16,16,0,0,0,8.32-14V80.18A16,16,0,0,0,223.68,66.15ZM128,120,47.65,76,128,32l80.35,44Zm8,99.64V133.83l80-43.78v85.76Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.GenderIntersexFill">M147.91,113.72a28,28,0,1,1-25.63-25.63A28,28,0,0,1,147.91,113.72ZM216,40V216a16,16,0,0,1-16,16H56a16,16,0,0,1-16-16V40A16,16,0,0,1,56,24H200A16,16,0,0,1,216,40ZM188,56a8,8,0,0,0-8-8H152.27A8.17,8.17,0,0,0,144,55.47,8,8,0,0,0,152,64h8.69L144.92,79.77A44,44,0,1,0,112,159.26V176H92.27A8.17,8.17,0,0,0,84,183.47,8,8,0,0,0,92,192h20v15.73a8.18,8.18,0,0,0,7.47,8.25,8,8,0,0,0,8.53-8V192h19.73a8.17,8.17,0,0,0,8.25-7.47,8,8,0,0,0-8-8.53H128V159.26a44,44,0,0,0,28.24-68.18L172,75.31v8.42A8.18,8.18,0,0,0,179.47,92,8,8,0,0,0,188,84Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SailboatFill">M160,140V72.85a4,4,0,0,1,7-2.69l55,60.46a8,8,0,0,1,.43,10.26,8.24,8.24,0,0,1-6.58,3.12H164A4,4,0,0,1,160,140Zm87.21,32.53A8,8,0,0,0,240,168H144V8a8,8,0,0,0-14.21-5l-104,128A8,8,0,0,0,32,144h96v24H16a8,8,0,0,0-6.25,13l29.6,37a15.93,15.93,0,0,0,12.49,6H204.16a15.93,15.93,0,0,0,12.49-6l29.6-37A8,8,0,0,0,247.21,172.53Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CalendarDotsFill">M208,32H184V24a8,8,0,0,0-16,0v8H88V24a8,8,0,0,0-16,0v8H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM84,184a12,12,0,1,1,12-12A12,12,0,0,1,84,184Zm44,0a12,12,0,1,1,12-12A12,12,0,0,1,128,184Zm0-40a12,12,0,1,1,12-12A12,12,0,0,1,128,144Zm44,40a12,12,0,1,1,12-12A12,12,0,0,1,172,184Zm0-40a12,12,0,1,1,12-12A12,12,0,0,1,172,144Zm36-64H48V48H72v8a8,8,0,0,0,16,0V48h80v8a8,8,0,0,0,16,0V48h24Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BatteryLowFill">M72,96v64a8,8,0,0,1-8,8H48a8,8,0,0,1-8-8V96a8,8,0,0,1,8-8H64A8,8,0,0,1,72,96ZM224,80v96a24,24,0,0,1-24,24H32A24,24,0,0,1,8,176V80A24,24,0,0,1,32,56H200A24,24,0,0,1,224,80Zm-16,0a8,8,0,0,0-8-8H32a8,8,0,0,0-8,8v96a8,8,0,0,0,8,8H200a8,8,0,0,0,8-8Zm40,8a8,8,0,0,0-8,8v64a8,8,0,0,0,16,0V96A8,8,0,0,0,248,88Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BugBeetleFill">M224,120H208V104h16a8,8,0,0,1,0,16ZM32,104a8,8,0,0,0,0,16H48V104Zm176,56c0,2.7-.14,5.37-.4,8H224a8,8,0,0,1,0,16H204.32a80,80,0,0,1-152.64,0H32a8,8,0,0,1,0-16H48.4c-.26-2.63-.4-5.3-.4-8v-8H32a8,8,0,0,1,0-16H48V120H208v16h16a8,8,0,0,1,0,16H208Zm-72-16a8,8,0,0,0-16,0v64a8,8,0,0,0,16,0ZM69.84,57.15A79.76,79.76,0,0,0,48.4,104H207.6a79.76,79.76,0,0,0-21.44-46.85l19.5-19.49a8,8,0,0,0-11.32-11.32l-20.29,20.3a79.74,79.74,0,0,0-92.1,0L61.66,26.34A8,8,0,0,0,50.34,37.66Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CalendarXFill">M208,32H184V24a8,8,0,0,0-16,0v8H88V24a8,8,0,0,0-16,0v8H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM157.66,170.34a8,8,0,0,1-11.32,11.32L128,163.31l-18.34,18.35a8,8,0,0,1-11.32-11.32L116.69,152,98.34,133.66a8,8,0,0,1,11.32-11.32L128,140.69l18.34-18.35a8,8,0,0,1,11.32,11.32L139.31,152ZM208,80H48V48H72v8a8,8,0,0,0,16,0V48h80v8a8,8,0,0,0,16,0V48h24Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SolarPanelFill">M32,104a8,8,0,0,1,8-8H56a8,8,0,0,1,0,16H40A8,8,0,0,1,32,104ZM71.43,58.75A8,8,0,0,0,82.75,47.43L71.43,36.12A8,8,0,0,0,60.12,47.43ZM128,40a8,8,0,0,0,8-8V16a8,8,0,0,0-16,0V32A8,8,0,0,0,128,40Zm50.91,21.09a8,8,0,0,0,5.66-2.34l11.31-11.32a8,8,0,0,0-11.31-11.31L173.25,47.43a8,8,0,0,0,5.66,13.66ZM192,104a8,8,0,0,0,8,8h16a8,8,0,0,0,0-16H200A8,8,0,0,0,192,104ZM88,112a8,8,0,0,0,8-8,32,32,0,0,1,64,0,8,8,0,0,0,16,0,48,48,0,0,0-96,0A8,8,0,0,0,88,112Zm55.2,24H112.8a4,4,0,0,0-3.91,3.15L102.62,168h50.76l-6.27-28.85A4,4,0,0,0,143.2,136ZM31.75,186,17,212.06a8,8,0,0,0,1.16,9.45,8.22,8.22,0,0,0,6,2.49H70.85a4,4,0,0,0,3.91-3.15l8-36.85H35.23A4,4,0,0,0,31.75,186Zm207.21,26-14.71-26a4,4,0,0,0-3.48-2H173.23l8,36.85a4,4,0,0,0,3.91,3.15h46.62a8.22,8.22,0,0,0,6-2.49A8,8,0,0,0,239,212.06Zm-28.27-50-12.42-22a8,8,0,0,0-7-4.06H167.76a4,4,0,0,0-3.91,4.85l5.9,27.15H207.2A4,4,0,0,0,210.69,162ZM88.24,136H64.7a8,8,0,0,0-7,4.06L45.31,162a4,4,0,0,0,3.49,6H86.25l5.9-27.15A4,4,0,0,0,88.24,136Zm68.62,48H99.14L91.5,219.15A4,4,0,0,0,95.41,224h65.18a4,4,0,0,0,3.91-4.85Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FlagCheckeredFill">M227.32,48.75A8,8,0,0,0,218.76,50c-28,24.22-51.72,12.48-79.21-1.13C111.07,34.76,78.78,18.79,42.76,50h0A8,8,0,0,0,40,56V224a8,8,0,0,0,16,0V179.77c26.79-21.16,49.87-9.75,76.45,3.41,16.4,8.11,34.06,16.85,53,16.85,13.93,0,28.54-4.75,43.82-18a8,8,0,0,0,2.76-6V56A8,8,0,0,0,227.32,48.75ZM56,160.44V109.88c16.85-11.28,32.64-11.59,48-7.34v51.74C88.87,150.47,72.87,150.71,56,160.44ZM104,50.87c9.25,2.83,18.61,7.45,28.45,12.32,11.26,5.57,23.11,11.43,35.55,14.56v51.74c15.35,4.25,31.14,3.94,48-7.35v50.11c-16.87,13.32-32.27,13.72-48,8.91V129.49c-21.62-6-42.38-21-64-26.95Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BaseballFill">M209.35,63.28a4,4,0,0,0-5.8-.47,88.94,88.94,0,0,0-9.4,10,8.19,8.19,0,0,1-11,1.81A8,8,0,0,1,181.49,63a104.17,104.17,0,0,1,10.33-11.14,4,4,0,0,0-.22-6.09,103.79,103.79,0,0,0-127.2,0,4,4,0,0,0-.22,6.09A105.65,105.65,0,0,1,74.35,62.79,8.18,8.18,0,0,1,74,73.58,8,8,0,0,1,62,73a89.23,89.23,0,0,0-9.59-10.2,4,4,0,0,0-5.79.48,103.79,103.79,0,0,0,0,129.44,4,4,0,0,0,5.8.47,88.94,88.94,0,0,0,9.4-10,8.19,8.19,0,0,1,11-1.81A8,8,0,0,1,74.51,193a104.17,104.17,0,0,1-10.33,11.14,4,4,0,0,0,.22,6.09,103.79,103.79,0,0,0,127.2,0,4,4,0,0,0,.22-6.09A104.17,104.17,0,0,1,181.49,193a8,8,0,0,1,1.7-11.59,8.19,8.19,0,0,1,11,1.81,88.94,88.94,0,0,0,9.4,10,4,4,0,0,0,5.8-.47,103.79,103.79,0,0,0,0-129.44ZM81.71,88.3a8.18,8.18,0,0,1,9.79,5.29,105.1,105.1,0,0,1,4.34,16.77A8,8,0,0,1,88,120a8,8,0,0,1-8-7.35c-.38-4.44-1.11-8.91-3.2-12.84A8,8,0,0,1,81.71,88.3Zm14.13,57.29a103.54,103.54,0,0,1-4.43,17.08,8,8,0,0,1-11.17,4.46,8.19,8.19,0,0,1-3.82-10.08,87.84,87.84,0,0,0,3.69-14.37,8,8,0,0,1,10.18-6.35A8.17,8.17,0,0,1,95.84,145.59Zm79.92,21.54a8,8,0,0,1-11.17-4.46,103.54,103.54,0,0,1-4.43-17.08,8.18,8.18,0,0,1,5.55-9.26,8,8,0,0,1,10.18,6.35,87.84,87.84,0,0,0,3.69,14.37A8.19,8.19,0,0,1,175.76,167.13Zm3.41-67.32c-2.09,3.93-2.82,8.4-3.2,12.84a8,8,0,0,1-10.17,7,8.16,8.16,0,0,1-5.65-9.25A103.59,103.59,0,0,1,164.5,93.6a8.17,8.17,0,0,1,9.79-5.3A8,8,0,0,1,179.17,99.81Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FileHtmlFill">M44,128H212a4,4,0,0,0,4-4V88a8,8,0,0,0-2.34-5.66l-56-56A8,8,0,0,0,152,24H56A16,16,0,0,0,40,40v84A4,4,0,0,0,44,128ZM152,44l44,44H152ZM68,160v48a8,8,0,0,1-16,0V192H32v16a8,8,0,0,1-16,0V160a8,8,0,0,1,16,0v16H52V160a8,8,0,0,1,16,0Zm56,0a8,8,0,0,1-8,8h-8v40a8,8,0,0,1-16,0V168H84a8,8,0,0,1,0-16h32A8,8,0,0,1,124,160Zm72,0v48a8,8,0,0,1-16,0V184l-9.6,12.8a8,8,0,0,1-12.8,0L148,184v24a8,8,0,0,1-16,0V160a8,8,0,0,1,14.4-4.8L164,178.67l17.6-23.47A8,8,0,0,1,196,160Zm56,48a8,8,0,0,1-8,8H216a8,8,0,0,1-8-8V160a8,8,0,0,1,16,0v40h20A8,8,0,0,1,252,208Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FileZipFill">M184,144H168a8,8,0,0,0-8,8v55.73a8.17,8.17,0,0,0,7.47,8.25,8,8,0,0,0,8.53-8v-8h7.4c15.24,0,28.14-11.92,28.59-27.15A28,28,0,0,0,184,144Zm-.35,40H176V160h8A12,12,0,0,1,196,173.16,12.25,12.25,0,0,1,183.65,184ZM136,152v55.73a8.17,8.17,0,0,1-7.47,8.25,8,8,0,0,1-8.53-8V152.27a8.17,8.17,0,0,1,7.47-8.25A8,8,0,0,1,136,152ZM96,208.53A8.17,8.17,0,0,1,87.73,216H56.23a8.27,8.27,0,0,1-6-2.5A8,8,0,0,1,49.05,204l25.16-44H56.27A8.17,8.17,0,0,1,48,152.53,8,8,0,0,1,56,144H87.77a8.27,8.27,0,0,1,6,2.5A8,8,0,0,1,95,156L69.79,200H88A8,8,0,0,1,96,208.53ZM213.66,82.34l-56-56A8,8,0,0,0,152,24H56A16,16,0,0,0,40,40v76a4,4,0,0,0,4,4H212a4,4,0,0,0,4-4V88A8,8,0,0,0,213.66,82.34ZM152,88V44l44,44Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CaretDoubleUpFill">M147.31,128H208a8,8,0,0,0,5.66-13.66l-80-80a8,8,0,0,0-11.32,0l-80,80A8,8,0,0,0,48,128h60.69L42.34,194.34A8,8,0,0,0,48,208H208a8,8,0,0,0,5.66-13.66Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowElbowLeftDownFill">M240,72a8,8,0,0,1-8,8H96v80h40a8,8,0,0,1,5.66,13.66l-48,48a8,8,0,0,1-11.32,0l-48-48A8,8,0,0,1,40,160H80V72a8,8,0,0,1,8-8H232A8,8,0,0,1,240,72Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.MapPinAreaFill">M124,175a8,8,0,0,0,7.94,0c2.45-1.41,60-35,60-94.95A64,64,0,0,0,64,80C64,140,121.58,173.54,124,175ZM128,56a24,24,0,1,1-24,24A24,24,0,0,1,128,56ZM240,184c0,31.18-57.71,48-112,48S16,215.18,16,184c0-14.59,13.22-27.51,37.23-36.37a8,8,0,0,1,5.54,15C42.26,168.74,32,176.92,32,184c0,13.36,36.52,32,96,32s96-18.64,96-32c0-7.08-10.26-15.26-26.77-21.36a8,8,0,0,1,5.54-15C226.78,156.49,240,169.41,240,184Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.UserPlusFill">M256,136a8,8,0,0,1-8,8H232v16a8,8,0,0,1-16,0V144H200a8,8,0,0,1,0-16h16V112a8,8,0,0,1,16,0v16h16A8,8,0,0,1,256,136ZM144,157.68a68,68,0,1,0-71.9,0c-20.65,6.76-39.23,19.39-54.17,37.17A8,8,0,0,0,24,208H192a8,8,0,0,0,6.13-13.15C183.18,177.07,164.6,164.44,144,157.68Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.QueueFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM64,72H192a8,8,0,0,1,0,16H64a8,8,0,0,1,0-16Zm40,112H64a8,8,0,0,1,0-16h40a8,8,0,0,1,0,16Zm0-48H64a8,8,0,0,1,0-16h40a8,8,0,0,1,0,16Zm92.44,22.66-48,32A8,8,0,0,1,144,192a8,8,0,0,1-8-8V120a8,8,0,0,1,12.44-6.66l48,32a8,8,0,0,1,0,13.32Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PaypalLogoFill">M220.12,93.54a55.8,55.8,0,0,0-20.19-16.18A56,56,0,0,0,144,24H84A16,16,0,0,0,68.48,36.12l-36,144A16,16,0,0,0,48,200h27.5l-3,12.12A16,16,0,0,0,88,232h31.5A16,16,0,0,0,135,219.88L144,184h32a56,56,0,0,0,44.14-90.46ZM48,184,84,40h60a40,40,0,0,1,39.3,32.49A57,57,0,0,0,176,72H120a16,16,0,0,0-15.53,12.12L79.52,184H48Zm166.77-46.3A39.94,39.94,0,0,1,176,168H144a16,16,0,0,0-15.52,12.12l-9,35.88H88l20-80h36a55.9,55.9,0,0,0,54-41.39,40.2,40.2,0,0,1,9.48,8.77A39.73,39.73,0,0,1,214.78,137.7Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FarmFill">M136.83,220.43a8,8,0,0,1-11.09,2.23A183.15,183.15,0,0,0,24,192a8,8,0,0,1,0-16,199.11,199.11,0,0,1,110.6,33.34A8,8,0,0,1,136.83,220.43ZM24,144a8,8,0,0,0,0,16,214.81,214.81,0,0,1,151.17,61.71,8,8,0,1,0,11.2-11.42A230.69,230.69,0,0,0,24,144Zm208,16a216.51,216.51,0,0,0-48.59,5.49q8.24,6.25,16,13.16A201.53,201.53,0,0,1,232,176a8,8,0,0,1,0,16c-6,0-11.93.29-17.85.86q8.32,8.67,15.94,18.14a8,8,0,1,1-12.48,10A247,247,0,0,0,24,128a8,8,0,0,1,0-16,265.43,265.43,0,0,1,48,4.38V80a8,8,0,0,1,3.2-6.4l64-48a8,8,0,0,1,9.6,0l64,48A8,8,0,0,1,216,80v32.5c5.31-.32,10.64-.5,16-.5a8,8,0,0,1,0,16,246.3,246.3,0,0,0-84.26,14.69q9.44,5,18.46,10.78A232.2,232.2,0,0,1,232,144a8,8,0,0,1,0,16ZM128.07,133.27A261.51,261.51,0,0,1,168,119.81V96H120v34C122.71,131,125.4,132.13,128.07,133.27Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PhoneTransferFill">M136,72a8,8,0,0,1,8-8h52.69L178.34,45.66a8,8,0,0,1,11.32-11.32l32,32a8,8,0,0,1,0,11.32l-32,32a8,8,0,0,1-11.32-11.32L196.69,80H144A8,8,0,0,1,136,72Zm78.36,94.46-47.11-21.11-.11-.06a16,16,0,0,0-15.18,1.4,8.12,8.12,0,0,0-.75.56L126.87,168c-15.42-7.49-31.34-23.29-38.83-38.51l20.78-24.71c.2-.25.39-.5.57-.77a16,16,0,0,0,1.32-15.06l0-.12L89.54,41.64a16,16,0,0,0-16.62-9.51A56.24,56.24,0,0,0,24,88c0,79.4,64.6,144,144,144a56.24,56.24,0,0,0,55.87-48.92A16,16,0,0,0,214.36,166.46Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.EyedropperFill">M224,67.3a35.79,35.79,0,0,0-11.26-25.66c-14-13.28-36.72-12.78-50.62,1.13L138.8,66.2a24,24,0,0,0-33.14.77l-5,5a16,16,0,0,0,0,22.64l2,2.06-51,51a39.75,39.75,0,0,0-10.53,38l-8,18.41A13.68,13.68,0,0,0,36,219.3a15.92,15.92,0,0,0,17.71,3.35L71.23,215a39.89,39.89,0,0,0,37.06-10.75l51-51,2.06,2.06a16,16,0,0,0,22.62,0l5-5a24,24,0,0,0,.74-33.18l23.75-23.87A35.75,35.75,0,0,0,224,67.3ZM97,193a24,24,0,0,1-24,6,8,8,0,0,0-5.55.31l-18.1,7.91L57,189.41a8,8,0,0,0,.25-5.75A23.88,23.88,0,0,1,63,159l51-51,33.94,34Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.GlobeSimpleFill">M128,24h0A104,104,0,1,0,232,128,104.12,104.12,0,0,0,128,24Zm87.62,96H175.79C174,83.49,159.94,57.67,148.41,42.4A88.19,88.19,0,0,1,215.63,120ZM96.23,136h63.54c-2.31,41.61-22.23,67.11-31.77,77C118.45,203.1,98.54,177.6,96.23,136Zm0-16C98.54,78.39,118.46,52.89,128,43c9.55,9.93,29.46,35.43,31.77,77Zm52.18,93.6c11.53-15.27,25.56-41.09,27.38-77.6h39.84A88.19,88.19,0,0,1,148.41,213.6Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CoffeeBeanFill">M71.22,190.47a108.88,108.88,0,0,1-33.84,9.16,4,4,0,0,1-3.89-2c-8.67-15.28-11.52-34.29-8-55.15,4.49-26.92,19.09-53.87,41.12-75.9s49-36.63,75.9-41.12c22.79-3.79,43.37,0,59.29,10.6a4,4,0,0,1-1.25,7.23,121,121,0,0,0-21.82,7.46c-21.77,9.9-49.6,31.06-58.52,75.7C114.1,156.73,97.63,178.27,71.22,190.47ZM222.51,58.38a4,4,0,0,0-3.88-2,108.5,108.5,0,0,0-33.85,9.16c-26.41,12.2-42.88,33.74-48.94,64-8.93,44.64-36.75,65.8-58.52,75.7a121,121,0,0,1-21.82,7.46A4,4,0,0,0,54.27,220c11.87,7.92,26.32,12,42.35,12a103.66,103.66,0,0,0,16.92-1.44c26.91-4.49,53.87-19.09,75.9-41.12s36.63-49,41.12-75.9C234,92.68,231.18,73.66,222.51,58.38Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.MetronomeFill">M187.14,114.84l26.78-29.46a8,8,0,0,0-11.84-10.76l-20.55,22.6-17.2-54.07A15.94,15.94,0,0,0,149.08,32H106.91A15.94,15.94,0,0,0,91.66,43.15l-50.91,160A16,16,0,0,0,56,224H200a16,16,0,0,0,15.25-20.85ZM71.27,160,106.91,48h42.17l20,62.9L124.46,160Zm74.81,0,28.62-31.48,10,31.48Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CaretCircleDoubleDownFill">M54.42,54.43a104,104,0,1,0,147.15,0A104.17,104.17,0,0,0,54.42,54.43Zm99.93,83.92a8,8,0,1,1,11.32,11.32l-32,32a8,8,0,0,1-11.32,0l-32-32a8,8,0,1,1,11.32-11.32L128,164.71Zm0-56a8,8,0,1,1,11.32,11.32l-32,32a8,8,0,0,1-11.32,0l-32-32a8,8,0,1,1,11.32-11.32L128,108.68Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.MagnifyingGlassMinusFill">M229.66,218.34,179.6,168.28a88.21,88.21,0,1,0-11.32,11.31l50.06,50.07a8,8,0,0,0,11.32-11.32ZM144,120H80a8,8,0,0,1,0-16h64a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PlayFill">M240,128a15.74,15.74,0,0,1-7.6,13.51L88.32,229.65a16,16,0,0,1-16.2.3A15.86,15.86,0,0,1,64,216.13V39.87a15.86,15.86,0,0,1,8.12-13.82,16,16,0,0,1,16.2.3L232.4,114.49A15.74,15.74,0,0,1,240,128Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PhoneSlashFill">M236.28,177.85a16,16,0,0,1-18.38,5.07l-24.76-19a3.43,3.43,0,0,1-.53-.48L109.18,71.62a4,4,0,0,1,2.55-6.68c43-4.62,87.74,9.12,119.86,41.24h0C251.58,126.17,253.51,155.64,236.28,177.85ZM53.93,34.62A8,8,0,1,0,42.09,45.38L69.71,75.77a142,142,0,0,0-45.3,30.41c-20,20-21.92,49.46-4.69,71.67a16,16,0,0,0,18.38,5.07l49-17.37.29-.11a16,16,0,0,0,9.75-11.72l5.9-29.51a73.64,73.64,0,0,1,8.57-2.39l90.5,99.56a8,8,0,1,0,11.84-10.76Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.HandPeaceFill">M96.55,36.14a16,16,0,0,1,11-19.52c8.61-2.46,17.65,3,20,11.65l16,59.78a4,4,0,0,1-3.18,5A31.79,31.79,0,0,0,128,98c-.56.37-1.1.76-1.64,1.17-.33-.58-.67-1.16-1-1.72a31.74,31.74,0,0,0-14-11.72,3.94,3.94,0,0,1-2.25-2.62ZM80.4,176.65a16.17,16.17,0,0,0,3.23.33A16,16,0,0,0,86.8,145.3l-19.59-4a16,16,0,0,0-6.41,31.35Zm-19.6-53,34.64,7.07a16,16,0,1,0,6.4-31.35L67.21,92.33A16,16,0,0,0,48.33,104.8,16,16,0,0,0,60.8,123.68Zm102-28.16,23.55,4.81A4,4,0,0,0,191,97.44l16.42-61.3a16,16,0,0,0-30.91-8.28l-16.8,62.7A4,4,0,0,0,162.81,95.52Zm37.34,31.74a23.89,23.89,0,0,0-15.67-11L148.87,109a16,16,0,0,0-15.12,5,14,14,0,0,0-2.43,3.57,16,16,0,0,0,1.72,17,16.5,16.5,0,0,0,9.8,5.93l15.24,3.11a8.06,8.06,0,0,1,6.32,9.36,28,28,0,0,0,2.77,19,8.19,8.19,0,0,1-1.93,10.41,8,8,0,0,1-11.94-2.43,44,44,0,0,1-5.48-22.09L139.27,156A31.78,31.78,0,0,1,119,142.32c-.38-.57-.73-1.15-1.06-1.74a32.12,32.12,0,0,1-6.87,4A32,32,0,0,1,83.63,193a32.32,32.32,0,0,1-6.43-.65l-19.59-4h-.06a2.61,2.61,0,0,0-3,3.57A80.19,80.19,0,0,0,128,240h.61c43.77-.33,79.39-36.62,79.39-80.9v-3.34A55.72,55.72,0,0,0,200.15,127.26Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BezierCurveFill">M221,144.4A96.26,96.26,0,0,0,181,88h59a8,8,0,0,0,0-16H159a32,32,0,0,0-62,0H16a8,8,0,0,0,0,16H75A96.26,96.26,0,0,0,35,144.4,32,32,0,1,0,71,184H185a32,32,0,1,0,36-39.6ZM40,192a16,16,0,1,1,16-16A16,16,0,0,1,40,192ZM128,64a16,16,0,1,1-16,16A16,16,0,0,1,128,64Zm88,128a16,16,0,1,1,16-16A16,16,0,0,1,216,192Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowsInLineHorizontalFill">M136,40V216a8,8,0,0,1-16,0V40a8,8,0,0,1,16,0ZM69.66,90.34A8,8,0,0,0,56,96v24H16a8,8,0,0,0,0,16H56v24a8,8,0,0,0,13.66,5.66l32-32a8,8,0,0,0,0-11.32ZM240,120H200V96a8,8,0,0,0-13.66-5.66l-32,32a8,8,0,0,0,0,11.32l32,32A8,8,0,0,0,200,160V136h40a8,8,0,0,0,0-16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ShirtFoldedFill">M201,40H179.35L165.66,26.34A8,8,0,0,0,160,24H96a8,8,0,0,0-5.66,2.34L76.65,40H55A15,15,0,0,0,40,55V209a15,15,0,0,0,15,15h61a4,4,0,0,0,4-4V104.27A8.18,8.18,0,0,1,127.47,96a8,8,0,0,1,8.53,8V220a4,4,0,0,0,4,4h61a15,15,0,0,0,15-15V55A15,15,0,0,0,201,40ZM86.54,107.08A4,4,0,0,1,80,104V59.31L95.24,44.07l23.47,35.21ZM128,80h0v0Zm48,24a4,4,0,0,1-2.3,3.63,3.93,3.93,0,0,1-4.21-.51l-32.2-27.82,23.47-35.21L176,59.31Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BandaidsFill">M184.57,128l27.71-27.72a40,40,0,1,0-56.56-56.56L128,71.43,100.28,43.72a40,40,0,1,0-56.56,56.56L71.43,128,43.72,155.72a40,40,0,1,0,56.56,56.56L128,184.57l27.72,27.71a40,40,0,1,0,56.56-56.56ZM128,94.06,161.94,128,128,161.94,94.06,128Zm39-39A24,24,0,1,1,201,89l-27.72,27.72L139.31,82.75ZM89,201A24,24,0,1,1,55,167l27.72-27.72,33.94,33.94Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.OrangeSliceFill">M51.18,145.51A95.5,95.5,0,0,1,32,88c0-1.41,0-2.81.09-4.21a4,4,0,0,1,4-3.79H107a4,4,0,0,1,2.83,6.83ZM120,183.66V99.31L61.83,157.49A95.68,95.68,0,0,0,120,183.66Zm84.82-38.15A95.5,95.5,0,0,0,224,88c0-1.41,0-2.81-.09-4.21a4,4,0,0,0-4-3.79H149a4,4,0,0,0-2.83,6.83ZM248,80h-4.08a4,4,0,0,0-4,4.14c0,1.28.07,2.57.07,3.86A112,112,0,0,1,16,88c0-1.29,0-2.58.07-3.86a4,4,0,0,0-4-4.14H8a8,8,0,0,0-8,8,128,128,0,1,0,256,0A8,8,0,0,0,248,80ZM136,99.31v84.35a95.68,95.68,0,0,0,58.17-26.17Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ScanSmileyFill">M224,40V76a8,8,0,0,1-16,0V48H180a8,8,0,0,1,0-16h36A8,8,0,0,1,224,40Zm-8,132a8,8,0,0,0-8,8v28H180a8,8,0,0,0,0,16h36a8,8,0,0,0,8-8V180A8,8,0,0,0,216,172ZM76,208H48V180a8,8,0,0,0-16,0v36a8,8,0,0,0,8,8H76a8,8,0,0,0,0-16ZM40,84a8,8,0,0,0,8-8V48H76a8,8,0,0,0,0-16H40a8,8,0,0,0-8,8V76A8,8,0,0,0,40,84Zm88,116a72,72,0,1,1,72-72A72.08,72.08,0,0,1,128,200Zm-24-72a12,12,0,1,0-12-12A12,12,0,0,0,104,128Zm54,18.71a8,8,0,0,0-11.29-.71c-3.81,3.37-12,6-18.71,6s-14.9-2.63-18.71-6a8,8,0,1,0-10.58,12c7.83,6.91,20.35,10,29.29,10s21.46-3.09,29.29-10A8,8,0,0,0,158,146.71ZM164,116a12,12,0,1,0-12,12A12,12,0,0,0,164,116Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowLineDownRightFill">M224,40a8,8,0,0,1-8,8H40a8,8,0,0,1,0-16H216A8,8,0,0,1,224,40ZM195.06,96.61a8,8,0,0,0-8.72,1.73L144,140.69,85.66,82.34A8,8,0,0,0,74.34,93.66L132.69,152,90.34,194.34A8,8,0,0,0,96,208h96a8,8,0,0,0,8-8V104A8,8,0,0,0,195.06,96.61Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.IntersectFill">M174.63,81.37a80,80,0,1,0-93.26,93.26,80,80,0,1,0,93.26-93.26ZM32,96a64,64,0,0,1,126-16A80.08,80.08,0,0,0,80.05,158,64.11,64.11,0,0,1,32,96ZM160,224A64.11,64.11,0,0,1,98,176,80.08,80.08,0,0,0,176,98,64,64,0,0,1,160,224Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ScalesFill">M239.43,133l-32-80A8,8,0,0,0,200,48a8.27,8.27,0,0,0-1.73.21L136,62V40a8,8,0,0,0-16,0V65.58L54.27,80.21A8,8,0,0,0,48.57,85l-32,80a7.92,7.92,0,0,0-.57,3c0,23.31,24.54,32,40,32s40-8.69,40-32a7.92,7.92,0,0,0-.57-3L66.92,93.77,120,82V208H104a8,8,0,0,0,0,16h48a8,8,0,0,0,0-16H136V78.42L187,67.1,160.57,133a7.92,7.92,0,0,0-.57,3c0,23.31,24.54,32,40,32s40-8.69,40-32A7.92,7.92,0,0,0,239.43,133Zm-160,35H32.62L56,109.54Zm97.24-32L200,77.54,223.38,136Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.StackOverflowLogoFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM134.86,46.86a8,8,0,0,1,11.32,0l45.25,45.26a8,8,0,0,1-11.31,11.31L134.86,58.18A8,8,0,0,1,134.86,46.86ZM100.18,98.77a8,8,0,0,1,10.45-4.33l59.13,24.49a8,8,0,0,1-3.06,15.4,7.89,7.89,0,0,1-3.06-.62l-59.13-24.49A8,8,0,0,1,100.18,98.77ZM96,152h64a8,8,0,0,1,0,16H96a8,8,0,0,1,0-16Zm104,40a8,8,0,0,1-8,8H64a8,8,0,0,1-8-8V144a8,8,0,0,1,16,0v40H184V144a8,8,0,0,1,16,0Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.StoolFill">M200,64V40a16,16,0,0,0-16-16H72A16,16,0,0,0,56,40V64A16,16,0,0,0,72,80h6.64L56.1,222.75a8,8,0,0,0,6.65,9.15A7.82,7.82,0,0,0,64,232a8,8,0,0,0,7.89-6.75L79.68,176h96.64l7.78,49.25A8,8,0,0,0,192,232a7.82,7.82,0,0,0,1.26-.1,8,8,0,0,0,6.65-9.15L177.36,80H184A16,16,0,0,0,200,64Zm-26.21,96H82.21L94.84,80h66.32Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PersonSimpleBikeFill">M136,52a28,28,0,1,1,28,28A28,28,0,0,1,136,52ZM240,176a40,40,0,1,1-40-40A40,40,0,0,1,240,176Zm-16,0a24,24,0,1,0-24,24A24,24,0,0,0,224,176Zm-24-64a8,8,0,0,0-8-8H155.31L125.66,74.34a8,8,0,0,0-11.32,0l-32,32a8,8,0,0,0,0,11.32L120,155.31V200a8,8,0,0,0,16,0V152a8,8,0,0,0-2.34-5.66L99.31,112,120,91.31l26.34,26.35A8,8,0,0,0,152,120h40A8,8,0,0,0,200,112ZM96,176a40,40,0,1,1-40-40A40,40,0,0,1,96,176Zm-16,0a24,24,0,1,0-24,24A24,24,0,0,0,80,176Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ExcludeSquareFill">M88,88v80H40a8,8,0,0,1-8-8V40a8,8,0,0,1,8-8H160a8,8,0,0,1,8,8V88Zm128,0H168v80H88v48a8,8,0,0,0,8,8H216a8,8,0,0,0,8-8V96A8,8,0,0,0,216,88Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowUDownRightFill">M229.66,173.66l-48,48A8,8,0,0,1,168,216V176H88A64,64,0,0,1,88,48h88a8,8,0,0,1,0,16H88a48,48,0,0,0,0,96h80V120a8,8,0,0,1,13.66-5.66l48,48A8,8,0,0,1,229.66,173.66Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FileLockFill">M120,176h-8v-4a28,28,0,0,0-56,0v4H48a8,8,0,0,0-8,8v40a8,8,0,0,0,8,8h72a8,8,0,0,0,8-8V184A8,8,0,0,0,120,176Zm-24,0H72v-4a12,12,0,0,1,24,0ZM213.66,82.34l-56-56A8,8,0,0,0,152,24H56A16,16,0,0,0,40,40v88a8,8,0,0,0,16,0V40h88V88a8,8,0,0,0,8,8h48V216H160a8,8,0,0,0,0,16h40a16,16,0,0,0,16-16V88A8,8,0,0,0,213.66,82.34ZM160,51.31,188.69,80H160Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ShrimpFill">M136,116a12,12,0,1,1,12,12A12,12,0,0,1,136,116ZM240,60a28,28,0,0,1-16.2,25.38A80.09,80.09,0,0,1,144,160H112a12,12,0,0,0,0,24h56a8,8,0,0,1,0,16H120v16h32a8,8,0,0,1,0,16H96A80,80,0,0,1,96,72H212a12,12,0,0,0,0-24H128a24,24,0,0,1-24-24,8,8,0,0,1,16,0,8,8,0,0,0,8,8h84A28,28,0,0,1,240,60ZM85.72,182.2a8,8,0,0,0-11.16-1.86l-15.36,11a8,8,0,0,0,9.3,13l15.36-11A8,8,0,0,0,85.72,182.2Zm-1.5-35.62L45.55,129a8,8,0,1,0-6.62,14.56L77.6,161.15a8,8,0,0,0,10.59-4A8,8,0,0,0,84.22,146.58ZM207.5,88H120v56h24A64.09,64.09,0,0,0,207.5,88Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CompassRoseFill">M249.94,120.24l-27.05-6.76a95.86,95.86,0,0,0-80.37-80.37l-6.76-27a8,8,0,0,0-15.52,0l-6.76,27.05a95.86,95.86,0,0,0-80.37,80.37l-27,6.76a8,8,0,0,0,0,15.52l27.05,6.76a95.86,95.86,0,0,0,80.37,80.37l6.76,27.05a8,8,0,0,0,15.52,0l6.76-27.05a95.86,95.86,0,0,0,80.37-80.37l27.05-6.76a8,8,0,0,0,0-15.52Zm-44.17-11L158.6,97.4,146.8,50.23A79.88,79.88,0,0,1,205.77,109.2Zm-96.57-59L97.4,97.4,50.23,109.2A79.88,79.88,0,0,1,109.2,50.23Zm-59,96.57L97.4,158.6l11.8,47.17A79.88,79.88,0,0,1,50.23,146.8Zm96.57,59,11.8-47.17,47.17-11.8A79.88,79.88,0,0,1,146.8,205.77Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FolderMinusFill">M216,72H131.31L104,44.69A15.88,15.88,0,0,0,92.69,40H40A16,16,0,0,0,24,56V200.62A15.41,15.41,0,0,0,39.39,216h177.5A15.13,15.13,0,0,0,232,200.89V88A16,16,0,0,0,216,72ZM40,56H92.69l16,16H40Zm112,96H104a8,8,0,0,1,0-16h48a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.HammerFill">M251.34,112,183.88,44.08a96.1,96.1,0,0,0-135.77,0l-.09.09L34.25,58.4A8,8,0,0,0,45.74,69.53L59.47,55.35a79.92,79.92,0,0,1,18.71-13.9L124.68,88l-96,96a16,16,0,0,0,0,22.63l20.69,20.69a16,16,0,0,0,22.63,0l96-96,32,32a16,16,0,0,0,22.63,0l28.69-28.69A16,16,0,0,0,251.34,112Zm-89,2.33L140,136.67,119.31,116l22.35-22.35a8,8,0,0,0,0-11.32L94.32,35a80,80,0,0,1,78.23,20.41l44.22,44.51L188,128.66l-14.34-14.34A8,8,0,0,0,162.34,114.32Zm49,37.66-12-12L228,111.25l12,12Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FloppyDiskBackFill">M208,32H83.31A15.86,15.86,0,0,0,72,36.69L36.69,72A15.86,15.86,0,0,0,32,83.31V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM128,184a32,32,0,1,1,32-32A32,32,0,0,1,128,184ZM172,80a4,4,0,0,1-4,4H88a4,4,0,0,1-4-4V48h88Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BoatFill">M221.06,110.59,208,106.23V56a16,16,0,0,0-16-16H136V24a8,8,0,0,0-16,0V40H64A16,16,0,0,0,48,56v50.23l-13.06,4.36A16,16,0,0,0,24,125.77V152c0,61.54,97.89,86.72,102.06,87.76a8,8,0,0,0,3.88,0C134.11,238.72,232,213.54,232,152V125.77A16,16,0,0,0,221.06,110.59ZM136,168a8,8,0,0,1-16,0V104.87a8,8,0,0,1,16,0Zm56-67.1L130.53,80.41a8,8,0,0,0-5.06,0L64,100.9V56H192Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BatteryVerticalEmptyFill">M88,8a8,8,0,0,1,8-8h64a8,8,0,0,1,0,16H96A8,8,0,0,1,88,8ZM200,56V224a24,24,0,0,1-24,24H80a24,24,0,0,1-24-24V56A24,24,0,0,1,80,32h96A24,24,0,0,1,200,56Zm-16,0a8,8,0,0,0-8-8H80a8,8,0,0,0-8,8V224a8,8,0,0,0,8,8h96a8,8,0,0,0,8-8Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ChartScatterFill">M216,40H40A16,16,0,0,0,24,56V200a16,16,0,0,0,16,16H216a16,16,0,0,0,16-16V56A16,16,0,0,0,216,40ZM188,72a12,12,0,1,1-12,12A12,12,0,0,1,188,72Zm0,56a12,12,0,1,1-12,12A12,12,0,0,1,188,128Zm-40-16a12,12,0,1,1-12,12A12,12,0,0,1,148,112ZM124,72a12,12,0,1,1-12,12A12,12,0,0,1,124,72Zm-24,56a12,12,0,1,1-12,12A12,12,0,0,1,100,128Zm100,64H56a8,8,0,0,1-8-8V72a8,8,0,0,1,16,0V176H200a8,8,0,0,1,0,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ArrowSquareUpLeftFill">M208,32H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM165.66,165.66a8,8,0,0,1-11.32,0L104,115.31V144a8,8,0,0,1-16,0V96a8,8,0,0,1,8-8h48a8,8,0,0,1,0,16H115.31l50.35,50.34A8,8,0,0,1,165.66,165.66Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.WarehouseFill">M240,184h-8V57.9l9.67-2.08a8,8,0,1,0-3.35-15.64l-224,48A8,8,0,0,0,16,104a8.16,8.16,0,0,0,1.69-.18L24,102.47V184H16a8,8,0,0,0,0,16H240a8,8,0,0,0,0-16Zm-56,0H72V168H184Zm0-32H72V136H184Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.RectangleDashedFill">M216,40H40A16,16,0,0,0,24,56V200a16,16,0,0,0,16,16H216a16,16,0,0,0,16-16V56A16,16,0,0,0,216,40ZM80,192H64a16,16,0,0,1-16-16V144a8,8,0,0,1,16,0v32H80a8,8,0,0,1,0,16ZM80,80H64v32a8,8,0,0,1-16,0V80A16,16,0,0,1,64,64H80a8,8,0,0,1,0,16Zm64,112H112a8,8,0,0,1,0-16h32a8,8,0,0,1,0,16Zm0-112H112a8,8,0,0,1,0-16h32a8,8,0,0,1,0,16Zm64,96a16,16,0,0,1-16,16H176a8,8,0,0,1,0-16h16V144a8,8,0,0,1,16,0Zm0-64a8,8,0,0,1-16,0V80H176a8,8,0,0,1,0-16h16a16,16,0,0,1,16,16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CardsFill">M216,40H64a8,8,0,0,0,0,16H216V176a8,8,0,0,0,16,0V56A16,16,0,0,0,216,40Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.GpsFixFill">M240,120H215.63A88.13,88.13,0,0,0,136,40.37V16a8,8,0,0,0-16,0V40.37A88.13,88.13,0,0,0,40.37,120H16a8,8,0,0,0,0,16H40.37A88.13,88.13,0,0,0,120,215.63V240a8,8,0,0,0,16,0V215.63A88.13,88.13,0,0,0,215.63,136H240a8,8,0,0,0,0-16ZM128,200a72,72,0,1,1,72-72A72.08,72.08,0,0,1,128,200Zm40-72a40,40,0,1,1-40-40A40,40,0,0,1,168,128Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.NumberCircleTwoFill">M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24Zm24,144a8,8,0,0,1,0,16H104a8,8,0,0,1-6.4-12.8l43.17-57.56a16,16,0,1,0-27.86-15,8,8,0,0,1-15.09-5.34,32,32,0,1,1,55.74,29.93L120,168Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.HeartStraightFill">M240,98a57.63,57.63,0,0,1-17,41L133.7,229.62a8,8,0,0,1-11.4,0L33,139a58,58,0,0,1,82-82.1L128,69.05l13.09-12.19A58,58,0,0,1,240,98Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CherriesFill">M178.42,72a75.24,75.24,0,0,0-10.21.37,91.9,91.9,0,0,0-21.59-25.09C108.78,16.79,57.05,23.77,54.87,24.08A8,8,0,0,0,48,31.43a8.19,8.19,0,0,0,3.69,7.32c17.4,11.68,25.37,30.91,28.7,49.65a72.08,72.08,0,1,0,16.26.14C93.54,68.59,86.56,52,76,39.37c16.67.72,41.24,4.78,60.64,20.48a74.76,74.76,0,0,1,15,16.39c-1.9.69-3.79,1.44-5.65,2.29a8.42,8.42,0,0,0-4.49,4.63,8,8,0,0,0,2.41,9,88.9,88.9,0,0,1,13.59,14,3.64,3.64,0,0,0,.65.65C160,108.15,165.83,112,176,112c12.15,0,18.18-5.51,18.43-5.75l-.09.09a8,8,0,1,1,11.32,11.32C204.6,118.72,194.77,128,176,128l-1.61,0a3,3,0,0,0-3,4,87.91,87.91,0,0,1-7,71.6,8.39,8.39,0,0,0-1,6.24,8,8,0,0,0,7.16,6c1.78.13,3.59.2,5.37.2a72,72,0,0,0,2.42-144Zm-72,50.21-.09.09a8,8,0,0,1,11.32,11.32C116.6,134.72,106.77,144,88,144s-28.6-9.28-29.66-10.34a8,8,0,0,1,11.32-11.32l-.09-.09c.25.24,6.28,5.75,18.43,5.75S106.18,122.49,106.43,122.25Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.NumberCircleFiveFill">M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24Zm-4,88a36,36,0,0,1,0,72,35.54,35.54,0,0,1-25.71-10.4,8,8,0,1,1,11.42-11.2A19.73,19.73,0,0,0,124,168a20,20,0,0,0,0-40,19.73,19.73,0,0,0-14.29,5.6,8,8,0,0,1-13.6-6.92l8-48A8,8,0,0,1,112,72h40a8,8,0,0,1,0,16H118.78l-4.19,25.14A38.8,38.8,0,0,1,124,112Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.MusicNotesPlusFill">M232,48a8,8,0,0,1-8,8H208V72a8,8,0,0,1-16,0V56H176a8,8,0,0,1,0-16h16V24a8,8,0,0,1,16,0V40h16A8,8,0,0,1,232,48ZM160.6,77.86l-6.76-6.76A32.85,32.85,0,0,1,144,49.33a31.87,31.87,0,0,1,1.67-11.66,4,4,0,0,0-4.76-5.14L78.06,48.25A8,8,0,0,0,72,56V166.1A36,36,0,1,0,52.42,232C72.25,231.77,88,215.13,88,195.3V102.25l70.74-17.69A4,4,0,0,0,160.6,77.86Zm50.11,24.31a31.91,31.91,0,0,1-7.14,1.63,4,4,0,0,0-3.57,4V134.1A36,36,0,1,0,180.42,200c19.83-.23,35.58-16.86,35.58-36.7V106A4,4,0,0,0,210.71,102.17Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BatteryChargingVerticalFill">M176,32H80A24,24,0,0,0,56,56V224a24,24,0,0,0,24,24h96a24,24,0,0,0,24-24V56A24,24,0,0,0,176,32ZM151.16,139.58l-16,32a8,8,0,0,1-14.32-7.16L131.06,144H112a8,8,0,0,1-7.16-11.58l16-32a8,8,0,1,1,14.32,7.16L124.94,128H144a8,8,0,0,1,7.16,11.58ZM88,8a8,8,0,0,1,8-8h64a8,8,0,0,1,0,16H96A8,8,0,0,1,88,8Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PillFill">M216.43,39.6a53.27,53.27,0,0,0-75.33,0L39.6,141.09a53.26,53.26,0,0,0,75.32,75.31L216.43,114.91A53.32,53.32,0,0,0,216.43,39.6Zm-11.32,64-50.75,50.74-52.69-52.68,50.75-50.75a37.26,37.26,0,0,1,52.69,52.69ZM189.68,82.34a8,8,0,0,1,0,11.32l-24,24a8,8,0,1,1-11.31-11.32l24-24A8,8,0,0,1,189.68,82.34Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.WaveSquareFill">M216,40H40A16,16,0,0,0,24,56V200a16,16,0,0,0,16,16H216a16,16,0,0,0,16-16V56A16,16,0,0,0,216,40Zm-8,128a8,8,0,0,1-8,8H128a8,8,0,0,1-8-8V96H64v32a8,8,0,0,1-16,0V88a8,8,0,0,1,8-8h72a8,8,0,0,1,8,8v72h56V128a8,8,0,0,1,16,0Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.DotsThreeCircleFill">M128,24A104,104,0,1,0,232,128,104.13,104.13,0,0,0,128,24ZM84,140a12,12,0,1,1,12-12A12,12,0,0,1,84,140Zm44,0a12,12,0,1,1,12-12A12,12,0,0,1,128,140Zm44,0a12,12,0,1,1,12-12A12,12,0,0,1,172,140Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.UmbrellaSimpleFill">M235.76,138.83A16,16,0,0,1,224,144H136v56a16,16,0,0,0,32,0,8,8,0,0,1,16,0,32,32,0,0,1-64,0V144H32a16,16,0,0,1-16-17.37,112.44,112.44,0,0,1,188.2-72.88A111.56,111.56,0,0,1,240,126.63,16.1,16.1,0,0,1,235.76,138.83Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FilePlusFill">M213.66,82.34l-56-56A8,8,0,0,0,152,24H56A16,16,0,0,0,40,40V216a16,16,0,0,0,16,16H200a16,16,0,0,0,16-16V88A8,8,0,0,0,213.66,82.34ZM152,160H136v16a8,8,0,0,1-16,0V160H104a8,8,0,0,1,0-16h16V128a8,8,0,0,1,16,0v16h16a8,8,0,0,1,0,16Zm0-72V43.31L196.69,88Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.MagnetFill">M207,50.25A87.46,87.46,0,0,0,144.6,24h-.33A87.48,87.48,0,0,0,82,49.81L20.61,112a16,16,0,0,0,.06,22.56l28.66,28.66a15.92,15.92,0,0,0,11.32,4.69h.09a16,16,0,0,0,11.36-4.82L133,100.69a16.08,16.08,0,0,1,22.41-.21,15.6,15.6,0,0,1,4.73,11.19,16.89,16.89,0,0,1-4.85,12L93,183.88a16,16,0,0,0-.17,22.79l28.66,28.66a16.06,16.06,0,0,0,22.52.12L205.81,175C240.26,140.5,240.79,84.56,207,50.25ZM60.65,151.89,32,123.24,61.42,93.43,89.9,121.91ZM132.79,224l-28.68-28.65,30.13-29.13,28.49,28.48Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.DiamondFill">M240,128a15.85,15.85,0,0,1-4.67,11.28l-96.05,96.06a16,16,0,0,1-22.56,0h0l-96-96.06a16,16,0,0,1,0-22.56l96.05-96.06a16,16,0,0,1,22.56,0l96.05,96.06A15.85,15.85,0,0,1,240,128Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.ShuffleAngularFill">M237.66,178.34a8,8,0,0,1,0,11.32l-24,24A8,8,0,0,1,200,208V192H168a8,8,0,0,1-6.51-3.35L83.88,80H32a8,8,0,0,1,0-16H88a8,8,0,0,1,6.51,3.35L172.12,176H200V160a8,8,0,0,1,13.66-5.66ZM143,107a8,8,0,0,0,11.16-1.86l18-25.12H200V96a8,8,0,0,0,13.66,5.66l24-24a8,8,0,0,0,0-11.32l-24-24A8,8,0,0,0,200,48V64H168a8,8,0,0,0-6.51,3.35L141.15,95.82A8,8,0,0,0,143,107Zm-30,42a8,8,0,0,0-11.16,1.86L83.88,176H32a8,8,0,0,0,0,16H88a8,8,0,0,0,6.51-3.35l20.34-28.47A8,8,0,0,0,113,149Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.MaskSadFill">M217,34.8a15.94,15.94,0,0,0-14.82-1.71C188.15,38.55,159.82,47.71,128,47.71S67.84,38.55,53.79,33.09A16,16,0,0,0,32,48v55.77c0,35.84,9.65,69.65,27.18,95.18,18.16,26.46,42.6,41,68.82,41s50.66-14.57,68.82-41C214.35,173.44,224,139.63,224,103.79V48A16,16,0,0,0,217,34.8ZM66,125.33A8,8,0,0,1,78,114.66c2.68,3,8.85,5.34,14,5.34s11.36-2.35,14-5.34A8,8,0,0,1,118,125.33C112.25,131.71,101.82,136,92,136S71.75,131.71,66,125.33Zm92.62,63.1A8,8,0,0,1,152,192a7.92,7.92,0,0,1-4.42-1.34C141.07,186.34,136,184,128,184s-13.07,2.34-19.57,6.66a8,8,0,0,1-8.86-13.32C108,171.73,116.06,168,128,168s20,3.73,28.43,9.34A8,8,0,0,1,158.66,188.43Zm31.3-63.1c-5.71,6.38-16.14,10.67-26,10.67s-20.25-4.29-26-10.67A8,8,0,0,1,150,114.66c2.68,3,8.85,5.34,14,5.34s11.36-2.35,14-5.34A8,8,0,0,1,190,125.33Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.MicrosoftTeamsLogoFill">M219.26,80h-7.57A31.71,31.71,0,0,0,216,64a32,32,0,0,0-45.88-28.85A40,40,0,0,0,96.81,64H40A16,16,0,0,0,24,80v96a16,16,0,0,0,16,16H76.67a64,64,0,0,0,118.7-.15A40,40,0,0,0,232,152V92.74A12.76,12.76,0,0,0,219.26,80ZM136,32a24,24,0,0,1,15.07,42.68A16,16,0,0,0,136,64H113.38A24,24,0,0,1,136,32ZM88,160a8,8,0,0,1-8-8V112H72a8,8,0,0,1,0-16h32a8,8,0,0,1,0,16H96v40A8,8,0,0,1,88,160Zm96,8a48,48,0,0,1-89.56,24H136a16,16,0,0,0,16-16V96h32Zm0-88H168a39.89,39.89,0,0,0,7.6-29.6A16,16,0,1,1,184,80Zm32,72a24,24,0,0,1-16.36,22.75A62.76,62.76,0,0,0,200,168V96h16Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SmileyFill">M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24ZM92,96a12,12,0,1,1-12,12A12,12,0,0,1,92,96Zm82.92,60c-10.29,17.79-27.39,28-46.92,28s-36.63-10.2-46.92-28a8,8,0,1,1,13.84-8c7.47,12.91,19.21,20,33.08,20s25.61-7.1,33.08-20a8,8,0,1,1,13.84,8ZM164,120a12,12,0,1,1,12-12A12,12,0,0,1,164,120Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BirdFill">M236.44,73.34,213.21,57.86A60,60,0,0,0,156,16h-.29C122.79,16.16,96,43.47,96,76.89V96.63L11.63,197.88l-.1.12A16,16,0,0,0,24,224h88A104.11,104.11,0,0,0,216,120V100.28l20.44-13.62a8,8,0,0,0,0-13.32ZM126.15,133.12l-60,72a8,8,0,1,1-12.29-10.24l60-72a8,8,0,1,1,12.29,10.24ZM164,80a12,12,0,1,1,12-12A12,12,0,0,1,164,80Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.OctagonFill">M227.31,80.23,175.77,28.69A16.13,16.13,0,0,0,164.45,24H91.55a16.13,16.13,0,0,0-11.32,4.69L28.69,80.23A16.13,16.13,0,0,0,24,91.55v72.9a16.13,16.13,0,0,0,4.69,11.32l51.54,51.54A16.13,16.13,0,0,0,91.55,232h72.9a16.13,16.13,0,0,0,11.32-4.69l51.54-51.54A16.13,16.13,0,0,0,232,164.45V91.55A16.13,16.13,0,0,0,227.31,80.23Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.TrademarkRegisteredFill">M152,112a16,16,0,0,1-16,16H112V96h24A16,16,0,0,1,152,112Zm80,16A104,104,0,1,1,128,24,104.11,104.11,0,0,1,232,128Zm-16,0a88,88,0,1,0-88,88A88.1,88.1,0,0,0,216,128Zm-16,0a72,72,0,1,1-72-72A72.08,72.08,0,0,1,200,128Zm-33.34,35.56-15.57-23.35A32,32,0,0,0,136,80H104a8,8,0,0,0-8,8v80a8,8,0,0,0,16,0V144h22.39l19,28.44a8,8,0,0,0,13.32-8.88Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.UserListFill">M152,80a8,8,0,0,1,8-8h88a8,8,0,0,1,0,16H160A8,8,0,0,1,152,80Zm96,40H160a8,8,0,0,0,0,16h88a8,8,0,0,0,0-16Zm0,48H184a8,8,0,0,0,0,16h64a8,8,0,0,0,0-16ZM109.29,142a48,48,0,1,0-58.58,0c-20.62,8.73-36.87,26.3-42.46,48A8,8,0,0,0,16,200H144a8,8,0,0,0,7.75-10C146.16,168.29,129.91,150.72,109.29,142Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.EggCrackFill">M216,152a88.11,88.11,0,0,1-87.8,88c-50.66.12-90.21-43-88.12-93.62,1.21-29.21,11.71-60.54,29.23-86.82C87.5,32.29,109.43,16,128,16c13.25,0,28.23,8.32,42.34,23a4,4,0,0,1,.09,5.44L122,98.67a8,8,0,0,0,4,13.09l24.61,6.15-6.51,32.52a8,8,0,0,0,6.28,9.41A7.7,7.7,0,0,0,152,160a8,8,0,0,0,7.83-6.43l8-40a8,8,0,0,0-5.9-9.33l-19.16-4.79,36.89-41.33a4,4,0,0,1,6.29.41c.24.34.47.68.7,1C205.3,87.54,216,121.23,216,152Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.SelectionInverseFill">M152,216a8,8,0,0,1-8,8H112a8,8,0,0,1,0-16h32A8,8,0,0,1,152,216ZM40,152a8,8,0,0,0,8-8V112a8,8,0,0,0-16,0v32A8,8,0,0,0,40,152Zm32,56H48V184a8,8,0,0,0-16,0v24a16,16,0,0,0,16,16H72a8,8,0,0,0,0-16ZM224,48a16,16,0,0,0-16-16H48a15.87,15.87,0,0,0-10.66,4.11,7.67,7.67,0,0,0-1.23,1.23A15.87,15.87,0,0,0,32,48V72a8,8,0,0,0,16,0V59.31L196.69,208H184a8,8,0,0,0,0,16h24a15.91,15.91,0,0,0,10.66-4.1,7.35,7.35,0,0,0,.65-.59,6,6,0,0,0,.58-.65A15.87,15.87,0,0,0,224,208Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FlagBannerFoldFill">M131.79,69.65l-43.63,96A4,4,0,0,1,84.52,168H28.23a8.2,8.2,0,0,1-6.58-3.13,8,8,0,0,1,.43-10.25L57.19,116,22.08,77.38a8,8,0,0,1-.43-10.26A8.22,8.22,0,0,1,28.23,64h99.92A4,4,0,0,1,131.79,69.65ZM237.56,42.24A8.3,8.3,0,0,0,231.77,40H168a8,8,0,0,0-7.28,4.69l-42.57,93.65a4,4,0,0,0,3.64,5.66h57.79l-34.86,76.69a8,8,0,1,0,14.56,6.62l80-176A8,8,0,0,0,237.56,42.24Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.GlobeFill">M128,24h0A104,104,0,1,0,232,128,104.12,104.12,0,0,0,128,24Zm78.36,64H170.71a135.28,135.28,0,0,0-22.3-45.6A88.29,88.29,0,0,1,206.37,88ZM216,128a87.61,87.61,0,0,1-3.33,24H174.16a157.44,157.44,0,0,0,0-48h38.51A87.61,87.61,0,0,1,216,128ZM128,43a115.27,115.27,0,0,1,26,45H102A115.11,115.11,0,0,1,128,43ZM102,168H154a115.11,115.11,0,0,1-26,45A115.27,115.27,0,0,1,102,168Zm-3.9-16a140.84,140.84,0,0,1,0-48h59.88a140.84,140.84,0,0,1,0,48Zm50.35,61.6a135.28,135.28,0,0,0,22.3-45.6h35.66A88.29,88.29,0,0,1,148.41,213.6Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BusFill">M248,80v24a8,8,0,0,1-16,0V80a8,8,0,0,1,16,0ZM16,72a8,8,0,0,0-8,8v24a8,8,0,0,0,16,0V80A8,8,0,0,0,16,72Zm200-8V208a16,16,0,0,1-16,16H184a16,16,0,0,1-16-16v-8H88v8a16,16,0,0,1-16,16H56a16,16,0,0,1-16-16V64A32,32,0,0,1,72,32H184A32,32,0,0,1,216,64ZM104,148a12,12,0,1,0-12,12A12,12,0,0,0,104,148Zm72,0a12,12,0,1,0-12,12A12,12,0,0,0,176,148Zm24-76H56v40H200Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.TrolleySuitcaseFill">M88,224a16,16,0,1,1-16-16A16,16,0,0,1,88,224Zm128-16a16,16,0,1,0,16,16A16,16,0,0,0,216,208Zm24-32H56V75.31A15.86,15.86,0,0,0,51.31,64L29.66,42.34A8,8,0,0,0,18.34,53.66L40,75.31V176H32a8,8,0,0,0,0,16H240a8,8,0,0,0,0-16ZM72,144V72A16,16,0,0,1,88,56h32V40a16,16,0,0,1,16-16h32a16,16,0,0,1,16,16V56h32a16,16,0,0,1,16,16v72a16,16,0,0,1-16,16H88A16,16,0,0,1,72,144Zm64-88h32V40H136Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.PresentationChartFill">M216,40H136V24a8,8,0,0,0-16,0V40H40A16,16,0,0,0,24,56V176a16,16,0,0,0,16,16H79.36L57.75,219a8,8,0,0,0,12.5,10l29.59-37h56.32l29.59,37a8,8,0,1,0,12.5-10l-21.61-27H216a16,16,0,0,0,16-16V56A16,16,0,0,0,216,40ZM104,144a8,8,0,0,1-16,0V120a8,8,0,0,1,16,0Zm32,0a8,8,0,0,1-16,0V104a8,8,0,0,1,16,0Zm32,0a8,8,0,0,1-16,0V88a8,8,0,0,1,16,0Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.FilesFill">M213.66,66.34l-40-40A8,8,0,0,0,168,24H88A16,16,0,0,0,72,40V56H56A16,16,0,0,0,40,72V216a16,16,0,0,0,16,16H168a16,16,0,0,0,16-16V200h16a16,16,0,0,0,16-16V72A8,8,0,0,0,213.66,66.34ZM136,192H88a8,8,0,0,1,0-16h48a8,8,0,0,1,0,16Zm0-32H88a8,8,0,0,1,0-16h48a8,8,0,0,1,0,16Zm64,24H184V104a8,8,0,0,0-2.34-5.66l-40-40A8,8,0,0,0,136,56H88V40h76.69L200,75.31Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.BriefcaseFill">M152,112a8,8,0,0,1-8,8H112a8,8,0,0,1,0-16h32A8,8,0,0,1,152,112Zm80-40V200a16,16,0,0,1-16,16H40a16,16,0,0,1-16-16V72A16,16,0,0,1,40,56H80V48a24,24,0,0,1,24-24h48a24,24,0,0,1,24,24v8h40A16,16,0,0,1,232,72ZM96,56h64V48a8,8,0,0,0-8-8H104a8,8,0,0,0-8,8Zm120,57.61V72H40v41.61A184,184,0,0,0,128,136,184,184,0,0,0,216,113.61Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.HandWavingFill">M219.31,98.46A88,88,0,1,1,67.08,186.77h0L26.15,115.88a16,16,0,0,1,27.69-16L72.4,132a8,8,0,0,0,13.86-8L47,56A16,16,0,0,1,74.69,40L114,108a8,8,0,1,0,13.85-8l-30-52a16,16,0,0,1,27.71-16L166,102.12A48.25,48.25,0,0,0,152,136a47.59,47.59,0,0,0,9.6,28.8,8,8,0,1,0,12.79-9.61A32,32,0,0,1,181,110.26a8,8,0,0,0,2.17-10.43L171.71,80a16,16,0,0,1,27.71-16l19.89,34.46Zm-29.37-57A43.74,43.74,0,0,1,216.74,62l.33.57a8,8,0,0,0,13.86-8L230.6,54a59.64,59.64,0,0,0-36.54-28,8,8,0,0,0-4.12,15.46ZM79.58,225.72A103.58,103.58,0,0,1,53.93,196a8,8,0,0,0-13.86,8,119.56,119.56,0,0,0,29.6,34.28,8,8,0,0,0,9.91-12.56Z</StreamGeometry>
+
+</ResourceDictionary>
diff --git a/RogueEssence.Editor.Avalonia/Assets/NodeTemplates.axaml b/RogueEssence.Editor.Avalonia/Assets/NodeTemplates.axaml
new file mode 100644
index 00000000..f0b38cda
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/Assets/NodeTemplates.axaml
@@ -0,0 +1,98 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:RogueEssence.Dev.Converters"
+                    xmlns:v="clr-namespace:RogueEssence.Dev.Views"
+                    xmlns:vm="clr-namespace:RogueEssence.Dev.ViewModels">
+    <local:IconKeyToGeometryConverter x:Key="IconKeyConverter" />
+    <DataTemplate x:Key="NodeContentTemplate" DataType="vm:NodeBase">
+        <v:IconText Text="{Binding Title}" Icon="{Binding Icon}" IconSize="12" />
+    </DataTemplate>
+
+    <DataTemplate x:Key="ItemRootDataTemplate" DataType="vm:ItemRootNode">
+        <Grid ColumnDefinitions="Auto, *, 16" Height="16">
+            <ContentPresenter Content="{Binding}"
+                              ContentTemplate="{StaticResource NodeContentTemplate}" />
+
+            <!-- Bug or feature... the plus always shows up when the child elements are hovered... is it possible to check if Border#PART_LayoutRoot is hovered -->
+            <Button x:Name="DataRootAddButton" Grid.Column="2" Classes="icon_button"
+                    IsVisible="{Binding IsPointerOver, RelativeSource={RelativeSource AncestorType=TreeViewItem}}"
+                    Command="{Binding AddCommand}">
+                <Path
+                    Stretch="Fill"
+
+                    Fill="{DynamicResource Brush.FG1}"
+                    Width="10" Height="10" Margin="0,0,0,0"
+                    Data="{StaticResource Icons.Plus}" />
+            </Button>
+        </Grid>
+    </DataTemplate>
+    
+    <TreeDataTemplate x:Key="ItemRootTemplate" DataType="vm:ItemRootNode" ItemsSource="{Binding SubNodes}">
+        <ContentPresenter Content="{Binding}"
+                          ContentTemplate="{StaticResource ItemRootDataTemplate}" />
+    </TreeDataTemplate>
+    
+    
+    <!-- DataRootNode -->
+    <!-- <TreeDataTemplate x:Key="DataRootTemplate" DataType="vm:DataRootNode" ItemsSource="{Binding SubNodes}"> -->
+    <!--     <ContentPresenter Content="{Binding}" -->
+    <!--                       ContentTemplate="{StaticResource ItemRootDataTemplate}" /> -->
+    <!-- </TreeDataTemplate> -->
+
+
+    <!-- SpriteRootNode -->
+    <!-- <TreeDataTemplate x:Key="SpriteRootTemplate" DataType="vm:SpriteRootNode" ItemsSource="{Binding SubNodes}"> -->
+    <!--     <ContentPresenter Content="{Binding}" -->
+    <!--                       ContentTemplate="{StaticResource ItemRootDataTemplate}" /> -->
+    <!-- </TreeDataTemplate> -->
+
+    <TreeDataTemplate x:Key="DataItemTemplate" DataType="vm:DataItemNode" ItemsSource="{Binding SubNodes}">
+        <Grid ColumnDefinitions="*,Auto"
+              Background="Transparent"
+              ClipToBounds="False"
+              Height="16">
+            <ContentPresenter Content="{Binding}"
+                              ContentTemplate="{StaticResource NodeContentTemplate}" />
+            
+            <Button Grid.Column="1"
+                    Classes="icon_button"
+                    Width="16" Height="16"
+                    Command="{Binding $parent[TreeViewItem;1].((vm:ItemRootNode)DataContext).DeleteCommand}"
+                    CommandParameter="{Binding}"
+                    IsVisible="{Binding IsPointerOver, RelativeSource={RelativeSource AncestorType=TreeViewItem}}"
+                    VerticalAlignment="Center"
+                    HorizontalAlignment="Right"
+                    Background="Transparent"
+                    BorderThickness="0">
+                <Path Stretch="Fill"
+                      Fill="{DynamicResource Brush.FG1}"
+                      Width="10" Height="10"
+                      Data="{StaticResource Icons.TrashFill}" />
+            </Button>
+        </Grid>
+    </TreeDataTemplate>
+
+
+    <TreeDataTemplate x:Key="OpenEditorTemplate" DataType="vm:OpenEditorNode" ItemsSource="{Binding SubNodes}">
+        <Grid ColumnDefinitions="*, Auto">
+            <ContentPresenter Content="{Binding}"
+                              ContentTemplate="{StaticResource NodeContentTemplate}" />
+        </Grid>
+    </TreeDataTemplate>
+
+
+    <TreeDataTemplate x:Key="NodeBaseTemplate" DataType="vm:NodeBase" ItemsSource="{Binding SubNodes}">
+        <Grid ColumnDefinitions="*,Auto">
+            <ContentPresenter Content="{Binding}"
+                              ContentTemplate="{StaticResource NodeContentTemplate}" />
+        </Grid>
+    </TreeDataTemplate>
+    
+    <!-- TAB SWITCHER ONLY -->
+    <TreeDataTemplate x:Key="PageNodeTemplate" DataType="vm:PageNode" ItemsSource="{Binding SubNodes}">
+        <Grid ColumnDefinitions="*, Auto">
+            <ContentPresenter Content="{Binding}"
+                              ContentTemplate="{StaticResource NodeContentTemplate}" />
+        </Grid>
+    </TreeDataTemplate>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Assets/Styles.axaml b/RogueEssence.Editor.Avalonia/Assets/Styles.axaml
new file mode 100644
index 00000000..4a40db30
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/Assets/Styles.axaml
@@ -0,0 +1,892 @@
+<Styles xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:s="using:RogueEssence.Dev"
+        xmlns:vm="using:RogueEssence.Dev.ViewModels"
+        xmlns:v="using:RogueEssence.Dev.Views"
+        xmlns:c="using:RogueEssence.Dev.Converters">
+    <Design.PreviewWith>
+        <StackPanel Orientation="Vertical">
+            <Button>Hello</Button>
+        </StackPanel>
+    </Design.PreviewWith>
+
+    <Style Selector="UserControl">
+        <Setter Property="FontSize" Value="12" />
+    </Style>
+    <Style Selector="TextBlock">
+        <Setter Property="FontSize" Value="12" />
+    </Style>
+    <Style Selector="Button">
+        <Setter Property="FontSize" Value="12" />
+    </Style>
+    <Style Selector="ContentPresenter">
+        <Setter Property="FontSize" Value="12" />
+    </Style>
+
+
+    <Style Selector="TextBlock.small">
+        <Setter Property="FontSize" Value="10" />
+    </Style>
+    <Style Selector="TextBlock.bold">
+        <Setter Property="FontWeight" Value="Bold" />
+    </Style>
+    <Style Selector="TextBlock.italic">
+        <Setter Property="FontStyle" Value="Italic" />
+    </Style>
+    <Style Selector="TextBlock.primary, SelectableTextBlock.primary">
+        <Setter Property="FontFamily" Value="{DynamicResource Fonts.Primary}" />
+    </Style>
+    <Style Selector="TextBlock.group_header_label">
+        <Setter Property="Foreground" Value="{DynamicResource Brush.FG2}" />
+        <Setter Property="FontWeight" Value="Bold" />
+    </Style>
+    <Style Selector="TextBlock.table_header">
+        <Setter Property="Foreground" Value="{DynamicResource Brush.FG1}" />
+        <Setter Property="Opacity" Value=".65" />
+        <Setter Property="FontWeight" Value="Bold" />
+    </Style>
+    <Style Selector="TextBlock.info_label">
+        <Setter Property="Foreground" Value="{DynamicResource Brush.FG2}" />
+        <Setter Property="FontWeight" Value="Bold" />
+        <Setter Property="HorizontalAlignment" Value="Right" />
+    </Style>
+    <Style Selector="TextBlock.tab_header">
+        <Setter Property="FontSize" Value="16" />
+        <Setter Property="Foreground" Value="{DynamicResource Brush.FG1}" />
+        <Setter Property="FontWeight" Value="Bold" />
+        <Setter Property="Opacity" Value=".56" />
+    </Style>
+
+    <Style Selector="FlyoutPresenter">
+        <Setter Property="Padding" Value="0" />
+        <Setter Property="Cursor" Value="Arrow" />
+
+        <Setter Property="Template">
+            <ControlTemplate>
+                <Grid>
+                    <Border Background="{DynamicResource Brush.Popup}" BorderThickness="0" Margin="4"
+                            CornerRadius="{TemplateBinding CornerRadius}">
+                        <Border.Effect>
+                            <DropShadowEffect OffsetX="0" OffsetY="0" BlurRadius="4" Color="Black" Opacity=".6" />
+                        </Border.Effect>
+                    </Border>
+                    <Border Name="LayoutRoot"
+                            Margin="4"
+                            Padding="8"
+                            Background="{DynamicResource Brush.Popup}"
+                            BorderThickness="0"
+                            CornerRadius="{TemplateBinding CornerRadius}">
+                        <ScrollViewer
+                            HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
+                            VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
+                            <ContentPresenter x:Name="PART_ContentPresenter"
+                                              Content="{TemplateBinding Content}"
+                                              ContentTemplate="{TemplateBinding ContentTemplate}"
+                                              Margin="0"
+                                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                              HorizontalContentAlignment="Stretch"
+                                              VerticalContentAlignment="Stretch" />
+                        </ScrollViewer>
+                    </Border>
+                </Grid>
+            </ControlTemplate>
+        </Setter>
+    </Style>
+
+    <Style Selector="Button.icon_button, RepeatButton.icon_button">
+        <Setter Property="BorderThickness" Value="0" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+    </Style>
+    <Style
+        Selector="Button.icon_button /template/ ContentPresenter#PART_ContentPresenter, RepeatButton.icon_button /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Opacity" Value="0.8" />
+    </Style>
+    <Style
+        Selector="Button.icon_button:pointerover /template/ ContentPresenter#PART_ContentPresenter, RepeatButton.icon_button:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="Opacity" Value="1" />
+    </Style>
+
+
+    <Style Selector="Button.flat">
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="BorderBrush" Value="{DynamicResource Brush.Border2}" />
+        <Setter Property="TextBlock.TextAlignment" Value="Center" />
+        <Setter Property="Foreground" Value="{DynamicResource Brush.FG1}" />
+        <Setter Property="Background" Value="{DynamicResource Brush.FlatButton.Background2}" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="HorizontalContentAlignment" Value="Center" />
+        <Setter Property="HorizontalAlignment" Value="Stretch"></Setter>
+        <Setter Property="Template">
+            <ControlTemplate>
+                <Grid>
+                    <Border x:Name="PART_Border"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="{TemplateBinding CornerRadius}" />
+
+                    <ContentPresenter x:Name="PART_ContentPresenter"
+                                      Background="Transparent"
+                                      Padding="{TemplateBinding Padding}"
+                                      Content="{TemplateBinding Content}"
+                                      ContentTemplate="{TemplateBinding ContentTemplate}"
+                                      HorizontalContentAlignment="Center"
+                                      VerticalContentAlignment="Center" />
+                </Grid>
+            </ControlTemplate>
+        </Setter>
+    </Style>
+    <Style Selector="Button.flat:pointerover /template/ Border#PART_Border">
+
+        <Setter Property="Background" Value="{DynamicResource Brush.FlatButton.BackgroundHovered}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource Brush.Accent}" />
+    </Style>
+    <Style Selector="Button.flat:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="Background" Value="Transparent" />
+    </Style>
+    <Style Selector="Button.flat:disabled">
+        <Setter Property="Background" Value="{DynamicResource Brush.FlatButton.Background}" />
+    </Style>
+    <Style Selector="Button.flat:disabled /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="Background" Value="Transparent" />
+    </Style>
+    <Style Selector="Button.flat.primary">
+        <Setter Property="BorderBrush" Value="{DynamicResource AccentButtonBorderBrush}" />
+        <Setter Property="Background" Value="{DynamicResource AccentButtonBackground}" />
+    </Style>
+    <Style Selector="Button.flat.primary:pointerover /template/ Border#PART_Border">
+        <Setter Property="Background" Value="{DynamicResource AccentButtonBackgroundPointerOver}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource AccentButtonBackgroundPointerOver}" />
+    </Style>
+    <Style Selector="Button.flat.primary:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="Background" Value="Transparent" />
+    </Style>
+    <Style Selector="Button.flat.primary:disabled">
+        <Setter Property="Opacity" Value=".65" />
+    </Style>
+    <Style Selector="Button.flat.primary TextBlock">
+        <Setter Property="Foreground" Value="{DynamicResource AccentButtonForeground}" />
+    </Style>
+    <Style Selector="Button.flat.primary ToolTip TextBlock">
+        <Setter Property="Foreground" Value="{DynamicResource Brush.FG1}" />
+    </Style>
+
+    
+    
+    <Style Selector="Button.flat.danger">
+        <Setter Property="BorderBrush" Value="#FFCB444A" />
+        <Setter Property="Background" Value="#FFE14444" />
+    </Style>
+    <Style Selector="Button.flat.danger:pointerover /template/ Border#PART_Border">
+        <Setter Property="Background" Value="#E56363" />
+        <Setter Property="BorderBrush" Value="#E56363" />
+    </Style>
+
+    
+    <Style Selector="Button.flat.danger:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="Background" Value="Transparent" />
+    </Style>
+    <Style Selector="Button.flat.danger:disabled">
+        <Setter Property="Opacity" Value=".65" />
+    </Style>
+    <Style Selector="Button.flat.danger TextBlock">
+        <Setter Property="Foreground" Value="{DynamicResource AccentButtonForeground}" />
+    </Style>
+    <Style Selector="Button.flat.danger ToolTip TextBlock">
+        <Setter Property="Foreground" Value="{DynamicResource Brush.FG1}" />
+    </Style>
+
+
+    
+    <Style Selector="Button.flat.danger:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="Background" Value="Transparent" />
+    </Style>
+
+    <Style Selector="Button.caption_button">
+        <Setter Property="Width" Value="48" />
+        <Setter Property="BorderThickness" Value="0" />
+        <Setter Property="VerticalAlignment" Value="Stretch" />
+    </Style>
+    <Style Selector="Button.caption_button > Path">
+        <Setter Property="Fill" Value="{DynamicResource Brush.FG1}" />
+    </Style>
+    <Style Selector="Button.caption_button /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="CornerRadius" Value="0" />
+    </Style>
+    <Style Selector="Button.caption_button:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="Background" Value="#40000000" />
+    </Style>
+    <Style
+        Selector="Button.caption_button:nth-last-child(1):pointerover /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="Background" Value="Red" />
+    </Style>
+
+
+    <Style Selector="Window">
+        <Setter Property="Background" Value="{DynamicResource Brush.Window}" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="BorderBrush" Value="{DynamicResource Brush.Border0}" />
+        <Setter Property="SystemDecorations" Value="Full" />
+        <Setter Property="Padding" Value="0" />
+
+        <Style.Resources>
+            <SolidColorBrush x:Key="SystemControlErrorTextForegroundBrush" Color="Red" />
+            <Color x:Key="SystemErrorTextColor">Red</Color>
+        </Style.Resources>
+    </Style>
+
+    <Style Selector="Window[WindowState=Maximized]">
+        <Setter Property="BorderThickness" Value="0" />
+        <Setter Property="Padding" Value="0" />
+    </Style>
+
+    <Style Selector="Window[WindowState=Maximized].fix_maximized_padding">
+        <Setter Property="Padding" Value="8,6,8,8" />
+    </Style>
+
+    <Style Selector="Window.custom_window_frame">
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="BorderThickness" Value="0" />
+        <Setter Property="SystemDecorations" Value="None" />
+        <Setter Property="Padding" Value="12" />
+        <Setter Property="CornerRadius" Value="8" />
+
+        <Setter Property="Template">
+            <ControlTemplate>
+                <Grid>
+                    <Border x:Name="PART_BorderTopLeft"
+                            Classes="resize_border"
+                            Width="12" Height="12"
+                            Background="Transparent"
+                            HorizontalAlignment="Left" VerticalAlignment="Top"
+                            Cursor="TopLeftCorner"
+                            Tag="{x:Static WindowEdge.NorthWest}" />
+
+                    <Border x:Name="PART_BorderTop"
+                            Classes="resize_border"
+                            Height="12" Margin="12,0"
+                            Background="Transparent"
+                            HorizontalAlignment="Stretch" VerticalAlignment="Top"
+                            Cursor="TopSide"
+                            Tag="{x:Static WindowEdge.North}" />
+
+                    <Border x:Name="PART_BorderTopRight"
+                            Classes="resize_border"
+                            Width="12" Height="12"
+                            Background="Transparent"
+                            HorizontalAlignment="Right" VerticalAlignment="Top"
+                            Cursor="TopRightCorner"
+                            Tag="{x:Static WindowEdge.NorthEast}" />
+
+                    <Border x:Name="PART_BorderLeft"
+                            Classes="resize_border"
+                            Width="12" Margin="0,12"
+                            Background="Transparent"
+                            HorizontalAlignment="Left" VerticalAlignment="Stretch"
+                            Cursor="LeftSide"
+                            Tag="{x:Static WindowEdge.West}" />
+
+                    <Border x:Name="PART_BorderRight"
+                            Classes="resize_border"
+                            Width="12" Margin="0,12"
+                            Background="Transparent"
+                            HorizontalAlignment="Right" VerticalAlignment="Stretch"
+                            Cursor="RightSide"
+                            Tag="{x:Static WindowEdge.East}" />
+
+                    <Border x:Name="PART_BorderBottomLeft"
+                            Classes="resize_border"
+                            Width="12" Height="12"
+                            Background="Transparent"
+                            HorizontalAlignment="Left" VerticalAlignment="Bottom"
+                            Cursor="BottomLeftCorner"
+                            Tag="{x:Static WindowEdge.SouthWest}" />
+
+                    <Border x:Name="PART_BorderBottom"
+                            Classes="resize_border"
+                            Height="12" Margin="12,0"
+                            Background="Transparent"
+                            HorizontalAlignment="Stretch" VerticalAlignment="Bottom"
+                            Cursor="BottomSide"
+                            Tag="{x:Static WindowEdge.South}" />
+
+                    <Border x:Name="PART_BorderBottomRight"
+                            Classes="resize_border"
+                            Width="12" Height="12"
+                            Background="Transparent"
+                            HorizontalAlignment="Right" VerticalAlignment="Bottom"
+                            Cursor="BottomRightCorner"
+                            Tag="{x:Static WindowEdge.SouthEast}" />
+
+                    <Grid Margin="{TemplateBinding Padding}" Effect="drop-shadow(0 0 12 #A0000000)">
+                        <Border x:Name="PART_ContentRoot"
+                                Background="{DynamicResource Brush.Window}"
+                                BorderBrush="{DynamicResource Brush.WindowBorder}"
+                                BorderThickness="1"
+                                CornerRadius="{TemplateBinding CornerRadius}">
+                            <VisualLayerManager>
+                                <Border CornerRadius="{TemplateBinding CornerRadius}" ClipToBounds="True">
+                                    <ContentPresenter Name="PART_ContentPresenter"
+                                                      ContentTemplate="{TemplateBinding ContentTemplate}"
+                                                      Content="{TemplateBinding Content}"
+                                                      HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                      VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+                                </Border>
+                            </VisualLayerManager>
+                        </Border>
+                    </Grid>
+                </Grid>
+            </ControlTemplate>
+        </Setter>
+    </Style>
+
+    <Style Selector="Button.max_or_restore_btn Path">
+        <Setter Property="Data" Value="{StaticResource Icons.Window.Maximize}" />
+    </Style>
+    <Style Selector="Window[WindowState=Maximized] Button.max_or_restore_btn Path">
+        <Setter Property="Data" Value="{StaticResource Icons.Window.Restore}" />
+    </Style>
+
+    <!-- <Style Selector="Button.icon_button:disabled"> -->
+    <!--     <Setter Property="Fill" Value="{DynamicResource Brush.FG2}"/> -->
+    <!-- </Style> -->
+
+    <Style Selector="ContextMenu">
+        <Setter Property="MaxWidth" Value="1024" />
+        <Setter Property="HorizontalOffset" Value="-4" />
+        <Setter Property="VerticalOffset" Value="-4" />
+        <Setter Property="Template">
+            <ControlTemplate>
+                <Grid>
+                    <Border Background="{DynamicResource Brush.Popup}" BorderThickness="0" Margin="4"
+                            CornerRadius="{TemplateBinding CornerRadius}">
+                        <Border.Effect>
+                            <DropShadowEffect OffsetX="0" OffsetY="0" BlurRadius="4" Color="Black" Opacity=".6" />
+                        </Border.Effect>
+                    </Border>
+
+                    <Border BorderThickness="0"
+                            Margin="8,4"
+                            MaxWidth="{TemplateBinding MaxWidth}"
+                            MinHeight="{TemplateBinding MinHeight}"
+                            HorizontalAlignment="{TemplateBinding HorizontalAlignment}">
+                        <ScrollViewer Theme="{StaticResource FluentMenuScrollViewer}">
+                            <ItemsPresenter Name="PART_ItemsPresenter"
+                                            ItemsPanel="{TemplateBinding ItemsPanel}"
+                                            Margin="{DynamicResource MenuFlyoutScrollerMargin}"
+                                            KeyboardNavigation.TabNavigation="Continue"
+                                            Grid.IsSharedSizeScope="True" />
+                        </ScrollViewer>
+                    </Border>
+                </Grid>
+            </ControlTemplate>
+        </Setter>
+    </Style>
+
+    <Style Selector="MenuItem">
+        <Setter Property="Height" Value="28" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Foreground" Value="{DynamicResource Brush.FG1}" />
+        <Setter Property="Cursor" Value="Arrow" />
+
+        <Setter Property="Template">
+            <ControlTemplate>
+                <Panel>
+                    <Border Name="PART_LayoutRoot"
+                            Padding="0,0,4,0"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="3">
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="28" SharedSizeGroup="MenuItemIcon" />
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="Auto" SharedSizeGroup="MenuItemIGT" />
+                                <ColumnDefinition Width="Auto" SharedSizeGroup="MenuItemChevron" />
+                            </Grid.ColumnDefinitions>
+
+                            <ContentControl Grid.Column="0"
+                                            x:Name="PART_IconPresenter"
+                                            Content="{TemplateBinding Icon}"
+                                            IsVisible="False"
+                                            HorizontalAlignment="Center"
+                                            VerticalAlignment="Center" />
+
+                            <ContentPresenter Grid.Column="1"
+                                              x:Name="PART_HeaderPresenter"
+                                              Content="{TemplateBinding Header}"
+                                              Foreground="{TemplateBinding Foreground}"
+                                              ContentTemplate="{TemplateBinding HeaderTemplate}"
+                                              VerticalAlignment="Center"
+                                              HorizontalAlignment="Stretch"
+                                              RecognizesAccessKey="False">
+                                <!-- <ContentPresenter.DataTemplates> -->
+                                <!-- <DataTemplate DataType="x:String"> -->
+                                <!--   <v:NameHighlightedTextBlock Text="{Binding}" VerticalAlignment="Center"/> -->
+                                <!-- </DataTemplate> -->
+                                <!-- -->
+                                <!-- <DataTemplate DataType="vm:FilterModeInGraph"> -->
+                                <!--   <v:FilterModeInGraph/> -->
+                                <!-- </DataTemplate> -->
+
+                                <!--   <DataTemplate DataType="vm:CustomActionContextMenuLabel"> -->
+                                <!--     <StackPanel Orientation="Horizontal"> -->
+                                <!--       <TextBlock Text="{Binding Name}" VerticalAlignment="Center"/> -->
+                                <!--       <Border Margin="4,0,0,0" Height="16" Background="Green" CornerRadius="8" VerticalAlignment="Center" IsVisible="{Binding IsGlobal}"> -->
+                                <!--         <TextBlock Classes="primary" Text="GLOBAL" Margin="8,0" FontSize="10" Foreground="White"/> -->
+                                <!--       </Border> -->
+                                <!--     </StackPanel> -->
+                                <!--   </DataTemplate> -->
+                                <!-- </ContentPresenter.DataTemplates> -->
+                            </ContentPresenter>
+
+                            <TextBlock Grid.Column="2"
+                                       Classes="CaptionTextBlockStyle"
+                                       Margin="{DynamicResource MenuInputGestureTextMargin}"
+                                       Text="{TemplateBinding InputGesture, Converter={StaticResource KeyGestureConverter}}"
+                                       HorizontalAlignment="Right"
+                                       VerticalAlignment="Center"
+                                       Foreground="{DynamicResource MenuFlyoutItemKeyboardAcceleratorTextForeground}"
+                                       FontSize="11" />
+
+                            <TextBlock Grid.Column="2"
+                                       Classes="CaptionTextBlockStyle"
+                                       Margin="{DynamicResource MenuInputGestureTextMargin}"
+                                       Text="{TemplateBinding Tag}"
+                                       HorizontalAlignment="Right"
+                                       VerticalAlignment="Center"
+                                       Foreground="{DynamicResource MenuFlyoutItemKeyboardAcceleratorTextForeground}"
+                                       FontSize="11"
+                                       IsVisible="{TemplateBinding InputGesture, Converter={x:Static ObjectConverters.IsNull}}" />
+
+                            <Path Name="PART_ChevronPath"
+                                  Width="6"
+                                  Data="M573 512 215 881c-20 20-20 51 0 61l61 61c20 20 51 20 61 0l461-461c10-10 10-20 10-31s0-20-10-31L338 20C317 0 287 0 276 20L215 82c-20 20-20 51 0 61L573 512z"
+                                  Fill="{DynamicResource Brush.FG2}"
+                                  Margin="8,0,0,0"
+                                  VerticalAlignment="Center"
+                                  Grid.Column="3" />
+                        </Grid>
+                    </Border>
+                    <Popup Name="PART_Popup"
+                           WindowManagerAddShadowHint="False"
+                           Placement="RightEdgeAlignedTop"
+                           MaxHeight="400"
+                           IsLightDismissEnabled="False"
+                           HorizontalOffset="-4"
+                           VerticalOffset="-4"
+                           IsOpen="{TemplateBinding IsSubMenuOpen, Mode=TwoWay}">
+                        <Grid>
+                            <Border Background="{DynamicResource Brush.Popup}" Margin="4"
+                                    CornerRadius="{DynamicResource OverlayCornerRadius}">
+                                <Border.Effect>
+                                    <DropShadowEffect OffsetX="0" OffsetY="0" Color="Black" BlurRadius="4" Opacity=".6" />
+                                </Border.Effect>
+                            </Border>
+
+                            <Border BorderThickness="0" Margin="8,4" MaxHeight="400">
+                                <ScrollViewer Theme="{StaticResource FluentMenuScrollViewer}">
+                                    <ItemsPresenter Name="PART_ItemsPresenter"
+                                                    Margin="{DynamicResource MenuFlyoutScrollerMargin}"
+                                                    Grid.IsSharedSizeScope="True">
+                                        <ItemsPresenter.ItemsPanel>
+                                            <ItemsPanelTemplate>
+                                                <VirtualizingStackPanel Orientation="Vertical" />
+                                            </ItemsPanelTemplate>
+                                        </ItemsPresenter.ItemsPanel>
+                                    </ItemsPresenter>
+                                </ScrollViewer>
+                            </Border>
+                        </Grid>
+                    </Popup>
+                </Panel>
+            </ControlTemplate>
+        </Setter>
+
+        <Style Selector="^:icon /template/ ContentControl#PART_IconPresenter">
+            <Setter Property="IsVisible" Value="True" />
+        </Style>
+
+        <Style Selector="^:selected">
+            <Style Selector="^ /template/ Border#PART_LayoutRoot">
+                <Setter Property="Background" Value="{DynamicResource MenuFlyoutItemBackgroundPointerOver}" />
+            </Style>
+            <Style Selector="^ /template/ ContentPresenter#PART_HeaderPresenter">
+                <Setter Property="Foreground" Value="{DynamicResource MenuFlyoutItemForegroundPointerOver}" />
+            </Style>
+            <Style Selector="^ /template/ Path#PART_ChevronPath">
+                <Setter Property="Fill" Value="{DynamicResource MenuFlyoutSubItemChevronPointerOver}" />
+            </Style>
+        </Style>
+
+        <Style Selector="^:disabled">
+            <Setter Property="Opacity" Value="0.65" />
+            <Setter Property="Background" Value="Transparent" />
+        </Style>
+
+        <Style Selector="^:empty /template/ Path#PART_ChevronPath">
+            <Setter Property="IsVisible" Value="False" />
+        </Style>
+
+        <Style Selector="^:separator">
+            <Setter Property="Height" Value="5" />
+            <Setter Property="Template">
+                <ControlTemplate>
+                    <Separator Margin="28,0,4,0" Height=".5" VerticalAlignment="Center"
+                               Background="{DynamicResource Brush.Border2}" />
+                </ControlTemplate>
+            </Setter>
+        </Style>
+    </Style>
+
+
+    <Style Selector="MenuFlyoutPresenter">
+        <Setter Property="Template">
+            <ControlTemplate>
+                <Grid>
+                    <Border Background="{DynamicResource Brush.Popup}" BorderThickness="0" Margin="4"
+                            CornerRadius="{TemplateBinding CornerRadius}">
+                        <Border.Effect>
+                            <DropShadowEffect OffsetX="0" OffsetY="0" BlurRadius="4" Color="Black" Opacity=".6" />
+                        </Border.Effect>
+                    </Border>
+
+                    <Border Name="LayoutRoot"
+                            Margin="4"
+                            Background="Transparent"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="0"
+                            Padding="4,2"
+                            CornerRadius="{TemplateBinding CornerRadius}">
+                        <ScrollViewer
+                            HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
+                            Theme="{StaticResource FluentMenuScrollViewer}"
+                            VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
+                            <ItemsPresenter Name="PART_ItemsPresenter"
+                                            ItemsPanel="{TemplateBinding ItemsPanel}"
+                                            Margin="{DynamicResource MenuFlyoutScrollerMargin}"
+                                            KeyboardNavigation.TabNavigation="Continue"
+                                            Grid.IsSharedSizeScope="True" />
+                        </ScrollViewer>
+                    </Border>
+                </Grid>
+            </ControlTemplate>
+        </Setter>
+    </Style>
+
+    <Style Selector="Path">
+        <Setter Property="Fill" Value="{DynamicResource Brush.FG1}" />
+        <Setter Property="Stretch" Value="Uniform" />
+        <Setter Property="HorizontalAlignment" Value="Center" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+    </Style>
+    <Style Selector="Path[IsVisible=True].rotating">
+        <Setter Property="Opacity" Value="0" />
+        <Setter Property="Data" Value="{StaticResource Icons.Loading}" />
+        <Style.Animations>
+            <Animation Duration="0:0:1" IterationCount="Infinite">
+                <KeyFrame Cue="0%">
+                    <Setter Property="Opacity" Value="1" />
+                    <Setter Property="RotateTransform.Angle" Value="0.0" />
+                </KeyFrame>
+                <KeyFrame Cue="100%">
+                    <Setter Property="Opacity" Value="1" />
+                    <Setter Property="RotateTransform.Angle" Value="360.0" />
+                </KeyFrame>
+            </Animation>
+            <Animation Duration="0:0:0.5" IterationCount="1">
+                <KeyFrame Cue="0%">
+                    <Setter Property="Opacity" Value="0.2" />
+                </KeyFrame>
+                <KeyFrame Cue="100%">
+                    <Setter Property="Opacity" Value="1" />
+                </KeyFrame>
+            </Animation>
+        </Style.Animations>
+    </Style>
+    <Style Selector="Path[IsVisible=True].waiting">
+        <Setter Property="Opacity" Value="0" />
+        <Setter Property="Data" Value="{StaticResource Icons.Waiting}" />
+        <Style.Animations>
+            <Animation Duration="0:0:1" IterationCount="Infinite">
+                <KeyFrame Cue="0%">
+                    <Setter Property="Opacity" Value="0.0" />
+                </KeyFrame>
+                <KeyFrame Cue="50%">
+                    <Setter Property="Opacity" Value="1" />
+                </KeyFrame>
+                <KeyFrame Cue="100%">
+                    <Setter Property="Opacity" Value="0.0" />
+                </KeyFrame>
+            </Animation>
+        </Style.Animations>
+    </Style>
+    <Style Selector="Button.max_or_restore_btn Path">
+        <Setter Property="Data" Value="{StaticResource Icons.Window.Maximize}" />
+    </Style>
+    <Style Selector="Window[WindowState=Maximized] Button.max_or_restore_btn Path">
+        <Setter Property="Data" Value="{StaticResource Icons.Window.Restore}" />
+    </Style>
+
+
+    <Style Selector="Slider">
+        <Style.Resources>
+            <Thickness x:Key="SliderTopHeaderMargin">0,0,0,4</Thickness>
+            <GridLength x:Key="SliderPreContentMargin">0</GridLength>
+            <GridLength x:Key="SliderPostContentMargin">0</GridLength>
+            <CornerRadius x:Key="SliderThumbCornerRadius">8</CornerRadius>
+            <x:Double x:Key="SliderHorizontalThumbWidth">16</x:Double>
+            <x:Double x:Key="SliderHorizontalThumbHeight">16</x:Double>
+        </Style.Resources>
+    </Style>
+
+    <Style Selector="ToolTip">
+        <Setter Property="Foreground" Value="{DynamicResource Brush.FG1}" />
+        <Setter Property="Background" Value="{DynamicResource Brush.Popup}" />
+        <Setter Property="MaxWidth" Value="800" />
+        <Setter Property="VerticalOffset" Value="-8" />
+        <Setter Property="TextBlock.TextDecorations" Value="" />
+        <Setter Property="Template">
+            <ControlTemplate>
+                <Grid Effect="drop-shadow(0 0 8 #30000000)">
+                    <Border Margin="8"
+                            Padding="8,6"
+                            CornerRadius="4"
+                            Background="{DynamicResource Brush.Popup}"
+                            BorderBrush="{DynamicResource Brush.Border2}"
+                            BorderThickness="1"
+                            MaxWidth="{TemplateBinding MaxWidth}"
+                            MinHeight="{TemplateBinding MinHeight}"
+                            HorizontalAlignment="{TemplateBinding HorizontalAlignment}">
+                        <ContentPresenter Name="PART_ContentPresenter"
+                                          MaxWidth="{TemplateBinding MaxWidth}"
+                                          Content="{TemplateBinding Content}"
+                                          ContentTemplate="{TemplateBinding ContentTemplate}"
+                                          TextBlock.TextWrapping="Wrap" />
+                    </Border>
+                </Grid>
+            </ControlTemplate>
+        </Setter>
+    </Style>
+
+    <Style Selector="TabItem">
+        <Setter Property="Foreground" Value="{DynamicResource Brush.FG1}" />
+        <Setter Property="FontSize" Value="13" />
+        <Setter Property="Padding" Value="10,0" />
+        <Setter Property="MinHeight" Value="24" />
+        <Setter Property="Opacity" Value="1" />
+
+        <Style.Resources>
+            <x:Double x:Key="TabItemPipeThickness">2</x:Double>
+        </Style.Resources>
+    </Style>
+    
+    <Style Selector="TabItem:pointerover TextBlock.tab_header">
+        <Setter Property="Foreground" Value="{DynamicResource Brush.FG1}" />
+        <Setter Property="Opacity" Value="1" />
+    </Style>
+
+    <Style Selector="TabItem:selected TextBlock.tab_header">
+        <Setter Property="Foreground" Value="{DynamicResource Brush.Accent}" />
+        <Setter Property="Opacity" Value="1" />
+    </Style>
+    <!-- -->
+    <!-- <Style Selector="TabItem:pointerover  /template/ Border#P"> -->
+    <!--     <Setter Property="Background" Value="{DynamicResource Brush.TabHeader.BackgroundHovered}"/> -->
+    <!-- </Style> -->
+
+    <Style Selector="NumericUpDown">
+        <Style Selector="^ /template/ ButtonSpinner#PART_Spinner">
+            <Setter Property="MinHeight" Value="0" />
+            <Setter Property="Height" Value="28" />
+        </Style>
+        <Style Selector="^ /template/ TextBox#PART_TextBox">
+            <Setter Property="MinHeight" Value="0" />
+            <Setter Property="Height" Value="28" />
+            <Setter Property="VerticalContentAlignment" Value="Center" />
+            <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" />
+            <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Disabled" />
+        </Style>
+        <Style Selector="^:focus-within /template/ ButtonSpinner#PART_Spinner">
+            <Setter Property="BorderBrush" Value="{DynamicResource Brush.Accent}" />
+        </Style>
+        <Style Selector="^ /template/ TextBox#PART_TextBox /template/ Border#PART_BorderElement">
+            <Setter Property="IsVisible" Value="False" />
+        </Style>
+    </Style>
+
+    <Style Selector="TextBox">
+        <Setter Property="CornerRadius" Value="0" />
+        <Setter Property="Padding" Value="4,0" />
+        <Setter Property="MinHeight" Value="30" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="BorderBrush" Value="{DynamicResource Brush.Border1}" />
+        <Setter Property="Background" Value="{DynamicResource Brush.Contents}" />
+        <Setter Property="Foreground" Value="{DynamicResource Brush.FG1}" />
+        <!-- <Setter Property="ContextFlyout"> -->
+        <!--   <Setter.Value> -->
+        <!--     <MenuFlyout> -->
+        <!--       <MenuItem Header="{DynamicResource Text.Cut}" Command="{Binding $parent[TextBox].Cut}" IsEnabled="{Binding $parent[TextBox].CanCut}" InputGesture="{x:Static TextBox.CutGesture}"> -->
+        <!--         <MenuItem.Icon> -->
+        <!--           <Path Width="11" Height="11" Data="{StaticResource Icons.Cut}" VerticalAlignment="Center"/> -->
+        <!--         </MenuItem.Icon> -->
+        <!--       </MenuItem> -->
+        <!-- -->
+        <!--       <MenuItem Header="{DynamicResource Text.Copy}" Command="{Binding $parent[TextBox].Copy}" IsEnabled="{Binding $parent[TextBox].CanCopy}" InputGesture="{x:Static TextBox.CopyGesture}"> -->
+        <!--         <MenuItem.Icon> -->
+        <!--           <Path Width="11" Height="11" Data="{StaticResource Icons.Copy}" VerticalAlignment="Center"/> -->
+        <!--         </MenuItem.Icon> -->
+        <!--       </MenuItem> -->
+        <!-- -->
+        <!--       <MenuItem Header="{DynamicResource Text.Paste}" Command="{Binding $parent[TextBox].Paste}" IsEnabled="{Binding $parent[TextBox].CanPaste}" InputGesture="{x:Static TextBox.PasteGesture}"> -->
+        <!--         <MenuItem.Icon> -->
+        <!--           <Path Width="11" Height="11" Data="{StaticResource Icons.Paste}" VerticalAlignment="Center"/> -->
+        <!--         </MenuItem.Icon> -->
+        <!--       </MenuItem> -->
+        <!--     </MenuFlyout> -->
+        <!--   </Setter.Value> -->
+        <!-- </Setter> -->
+    </Style>
+    <Style Selector="TextBox:pointerover /template/ Border#PART_BorderElement">
+        <Setter Property="BorderBrush" Value="{DynamicResource Brush.Accent}" />
+        <Setter Property="Background" Value="{DynamicResource Brush.Contents}" />
+    </Style>
+    <Style Selector="TextBox:focus /template/ Border#PART_BorderElement">
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="BorderBrush" Value="{DynamicResource Brush.Accent}" />
+        <Setter Property="Background" Value="{DynamicResource Brush.Contents}" />
+    </Style>
+    <Style Selector="TextBox:disabled /template/ Border#PART_BorderElement">
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Opacity" Value=".6" />
+    </Style>
+    <Style Selector="TextBox.no_background">
+        <Setter Property="Background" Value="Transparent" />
+    </Style>
+    <Style Selector="TextBox.no_background:pointerover /template/ Border#PART_BorderElement">
+        <Setter Property="Background" Value="Transparent" />
+    </Style>
+    <Style Selector="TextBox.no_background:focus /template/ Border#PART_BorderElement">
+        <Setter Property="Background" Value="Transparent" />
+    </Style>
+    <Style Selector="TextBox.no_border">
+        <Setter Property="BorderBrush" Value="Transparent" />
+    </Style>
+    <Style Selector="TextBox.no_border:pointerover /template/ Border#PART_BorderElement">
+        <Setter Property="BorderBrush" Value="Transparent" />
+    </Style>
+    <Style Selector="TextBox.no_border:focus /template/ Border#PART_BorderElement">
+        <Setter Property="BorderBrush" Value="Transparent" />
+    </Style>
+
+    <Style Selector="DataValidationErrors">
+        <Setter Property="Theme" Value="{DynamicResource TooltipDataValidationErrors}" />
+    </Style>
+    <Style Selector="DataValidationErrors Path">
+        <Setter Property="Fill" Value="Transparent" />
+        <Setter Property="Stroke" Value="Red" />
+    </Style>
+    <Style Selector="ComboBox">
+        <Style.Resources>
+            <Thickness x:Key="ComboBoxDropdownBorderPadding">4,0</Thickness>
+            <Thickness x:Key="ComboBoxItemThemePadding">6,4</Thickness>
+            <!-- <SolidColorBrush x:Key="ComboBoxBackground" Color="{DynamicResource Color.FlatButton.Background}" /> -->
+            <SolidColorBrush x:Key="ComboBoxDropDownBackground" Color="{DynamicResource Color.Popup}" />
+            <SolidColorBrush x:Key="ComboBoxDropDownBorderBrush" Color="{DynamicResource SystemAccentColor}" />
+        </Style.Resources>
+
+
+        <Setter Property="MinHeight" Value="20" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="BorderBrush" Value="{DynamicResource Brush.Border1}" />
+
+        <Style Selector="^ /template/ Popup#PART_Popup">
+            <Setter Property="Placement" Value="BottomEdgeAlignedLeft" />
+            <Setter Property="VerticalOffset" Value="2" />
+        </Style>
+        <Style Selector="^:pointerover /template/ Border#Background">
+
+            <Setter Property="BorderBrush" Value="{DynamicResource Brush.Accent}" />
+        </Style>
+        <Style Selector="^:disabled">
+            <Setter Property="Opacity" Value=".6" />
+        </Style>
+        <Style Selector="^:disabled /template/ Border#Background">
+            <Setter Property="Background" Value="Transparent" />
+        </Style>
+    </Style>
+
+    <Style Selector="ComboBoxItem">
+        <Setter Property="CornerRadius" Value="3" />
+    </Style>
+
+    <Style Selector="CheckBox">
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="Template">
+            <ControlTemplate>
+                <Grid Background="Transparent" ColumnDefinitions="Auto,*">
+                    <Border x:Name="Border" Grid.Column="0" Width="16" Height="16" VerticalAlignment="Center"
+                            BorderBrush="{DynamicResource Brush.Border1}" BorderThickness="1" Background="Transparent"
+                            CornerRadius="2">
+                        <Path x:Name="Icon" Height="12" Width="12" Data="{DynamicResource Icons.Check}"
+                              Fill="{DynamicResource Brush.Accent}" IsVisible="False" Margin="0,2,0,0" />
+                    </Border>
+
+                    <ContentPresenter x:Name="ContentPresenter"
+                                      ContentTemplate="{TemplateBinding ContentTemplate}"
+                                      Content="{TemplateBinding Content}"
+                                      Grid.Column="1"
+                                      VerticalAlignment="Center"
+                                      Margin="8,0,0,0"
+                                      TextWrapping="Wrap" />
+                </Grid>
+            </ControlTemplate>
+        </Setter>
+
+        <Style Selector="^:pointerover /template/ Border#Border">
+            <Setter Property="BorderBrush" Value="{DynamicResource Brush.Accent}" />
+        </Style>
+        <Style Selector="^:checked /template/ Path#Icon">
+            <Setter Property="IsVisible" Value="True" />
+        </Style>
+    </Style>
+
+    <Style Selector="ContextMenu">
+        <Setter Property="MaxWidth" Value="1024" />
+        <Setter Property="HorizontalOffset" Value="-4" />
+        <Setter Property="VerticalOffset" Value="-4" />
+        <Setter Property="Template">
+            <ControlTemplate>
+                <Grid>
+                    <Border Background="{DynamicResource Brush.Popup}" BorderThickness="0" Margin="4"
+                            CornerRadius="{TemplateBinding CornerRadius}">
+                        <Border.Effect>
+                            <DropShadowEffect OffsetX="0" OffsetY="0" BlurRadius="4" Color="Black" Opacity=".6" />
+                        </Border.Effect>
+                    </Border>
+
+                    <Border BorderThickness="0"
+                            Margin="8,4"
+                            MaxWidth="{TemplateBinding MaxWidth}"
+                            MinHeight="{TemplateBinding MinHeight}"
+                            HorizontalAlignment="{TemplateBinding HorizontalAlignment}">
+                        <ScrollViewer Theme="{StaticResource FluentMenuScrollViewer}">
+                            <ItemsPresenter Name="PART_ItemsPresenter"
+                                            ItemsPanel="{TemplateBinding ItemsPanel}"
+                                            Margin="{DynamicResource MenuFlyoutScrollerMargin}"
+                                            KeyboardNavigation.TabNavigation="Continue"
+                                            Grid.IsSharedSizeScope="True" />
+                        </ScrollViewer>
+                    </Border>
+                </Grid>
+            </ControlTemplate>
+        </Setter>
+    </Style>
+
+</Styles>
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Assets/Themes.axaml b/RogueEssence.Editor.Avalonia/Assets/Themes.axaml
new file mode 100644
index 00000000..fa38e899
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/Assets/Themes.axaml
@@ -0,0 +1,79 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ResourceDictionary.ThemeDictionaries>
+    <ResourceDictionary x:Key="Light">
+      <Color x:Key="Color.Window">#FFF7F8FA</Color>
+      <Color x:Key="Color.WindowBorder">#00000000</Color>
+      <Color x:Key="Color.PageBackground">#FFFAFAFA</Color>
+      <Color x:Key="Color.TitleBar">#FFEBECF0</Color>
+      <Color x:Key="Color.ToolBar">#FFF0F5F9</Color>
+      <Color x:Key="Color.Popup">#FFF8F8F8</Color>
+      <Color x:Key="Color.Contents">#FFFAFAFA</Color>
+      <Color x:Key="Color.Badge">#FFB0CEE8</Color>
+      <Color x:Key="Color.BadgeFG">#FF1F1F1F</Color>
+      <Color x:Key="Color.Conflict">#FF836C2E</Color>
+      <Color x:Key="Color.ConflictForeground">#FFFFFFFF</Color>
+      <Color x:Key="Color.Border0">#FFCFCFCF</Color>
+      <Color x:Key="Color.Border1">#FF898989</Color>
+      <Color x:Key="Color.Border2">#FFCFCFCF</Color>
+      <Color x:Key="Color.Border3">#FFAFAFAF</Color>
+      <Color x:Key="Color.FlatButton.Background">#FFF8F8F8</Color>
+      <Color x:Key="Color.FlatButton.Background2">#FFF8F8F8</Color>
+      <Color x:Key="Color.FlatButton.BackgroundHovered">White</Color>
+      <Color x:Key="Color.TabHeader.BackgroundHovered">#FFDFDFDF</Color>
+      <Color x:Key="Color.FG1">#FF1F1F1F</Color>
+      <Color x:Key="Color.FG2">#FF6F6F6F</Color>
+    </ResourceDictionary>
+
+    <ResourceDictionary x:Key="Dark">
+      <Color x:Key="Color.Window">#FF252525</Color>
+      <Color x:Key="Color.WindowBorder">#FF444444</Color>
+      <Color x:Key="Color.PageBackground">#FF2A2A2A</Color>
+      <Color x:Key="Color.TitleBar">#FF1F1F1F</Color>
+      <Color x:Key="Color.ToolBar">#FF2C2C2C</Color>
+      <Color x:Key="Color.Popup">#FF2B2B2B</Color>
+      <Color x:Key="Color.Contents">#FF1C1C1C</Color>
+      <Color x:Key="Color.Badge">#FF8F8F8F</Color>
+      <Color x:Key="Color.BadgeFG">#FFDDDDDD</Color>
+      <Color x:Key="Color.Conflict">#FFFAFAD2</Color>
+      <Color x:Key="Color.ConflictForeground">#FF252525</Color>
+      <Color x:Key="Color.Border0">#FF181818</Color>
+      <Color x:Key="Color.Border1">#FF7C7C7C</Color>
+      <Color x:Key="Color.Border2">#FF404040</Color>
+      <Color x:Key="Color.Border3">#FF404040</Color>
+      <Color x:Key="Color.FlatButton.Background">#FF303030</Color>
+      <Color x:Key="Color.FlatButton.BackgroundHovered">#FF333333</Color>
+      <Color x:Key="Color.TabHeader.BackgroundHovered">#FF404040</Color>
+      <Color x:Key="Color.FG1">#FFDDDDDD</Color>
+      <Color x:Key="Color.FG2">#60F1F1F1</Color>
+    </ResourceDictionary>
+  </ResourceDictionary.ThemeDictionaries>
+
+  <SolidColorBrush x:Key="Brush.Window" Color="{DynamicResource Color.Window}"/>
+  <SolidColorBrush x:Key="Brush.WindowBorder" Color="{DynamicResource Color.WindowBorder}"/>
+  <SolidColorBrush x:Key="Brush.PageBackground" Color="{DynamicResource Color.PageBackground}"/>
+  <SolidColorBrush x:Key="Brush.TitleBar" Color="{DynamicResource Color.TitleBar}"/>
+  <SolidColorBrush x:Key="Brush.ToolBar" Color="{DynamicResource Color.ToolBar}"/>
+  <SolidColorBrush x:Key="Brush.Popup" Color="{DynamicResource Color.Popup}"/>
+  <SolidColorBrush x:Key="Brush.Contents" Color="{DynamicResource Color.Contents}"/>
+  <SolidColorBrush x:Key="Brush.Badge" Color="{DynamicResource Color.Badge}"/>
+  <SolidColorBrush x:Key="Brush.BadgeFG" Color="{DynamicResource Color.BadgeFG}"/>
+  <SolidColorBrush x:Key="Brush.Conflict" Color="{DynamicResource Color.Conflict}"/>
+  <SolidColorBrush x:Key="Brush.ConflictForeground" Color="{DynamicResource Color.ConflictForeground}"/>
+  <SolidColorBrush x:Key="Brush.Border0" Color="{DynamicResource Color.Border0}"/>
+  <SolidColorBrush x:Key="Brush.Border1" Color="{DynamicResource Color.Border1}"/>
+  <SolidColorBrush x:Key="Brush.Border2" Color="{DynamicResource Color.Border2}"/>
+  <SolidColorBrush x:Key="Brush.Border3" Color="{DynamicResource Color.Border3}"/>
+  <SolidColorBrush x:Key="Brush.FlatButton.Background" Color="{DynamicResource Color.FlatButton.Background}"/>
+  <SolidColorBrush x:Key="Brush.FlatButton.Background2" Color="{DynamicResource Color.FlatButton.Background2}"/>
+  <SolidColorBrush x:Key="Brush.FlatButton.BackgroundHovered" Color="{DynamicResource Color.FlatButton.BackgroundHovered}"/>
+  <SolidColorBrush x:Key="Brush.TabHeader.BackgroundHovered" Color="{DynamicResource Color.TabHeader.BackgroundHovered}"/>
+  <SolidColorBrush x:Key="Brush.FG1" Color="{DynamicResource Color.FG1}"/>
+  <SolidColorBrush x:Key="Brush.FG2" Color="{DynamicResource Color.FG2}"/>
+  <SolidColorBrush x:Key="Brush.Accent" Color="{DynamicResource SystemAccentColor}"/>
+  <SolidColorBrush x:Key="Brush.AccentHovered" Color="{DynamicResource SystemListLowColor}"/>
+
+  <!-- <FontFamily x:Key="Fonts.Default">fonts:Inter#Inter</FontFamily> -->
+  <!-- <FontFamily x:Key="Fonts.Monospace">fonts:SourceGit#JetBrains Mono</FontFamily> -->
+  <!-- <FontFamily x:Key="Fonts.Primary">fonts:SourceGit#JetBrains Mono</FontFamily> -->
+</ResourceDictionary>
diff --git a/RogueEssence.Editor.Avalonia/Assets/TreeStyles.axaml b/RogueEssence.Editor.Avalonia/Assets/TreeStyles.axaml
new file mode 100644
index 00000000..fc648ec6
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/Assets/TreeStyles.axaml
@@ -0,0 +1,24 @@
+<Styles xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:s="using:RogueEssence.Dev"
+        xmlns:vm="using:RogueEssence.Dev.ViewModels"
+        xmlns:v="using:RogueEssence.Dev.Views"
+        xmlns:local="clr-namespace:RogueEssence.Dev.Converters"
+        xmlns:c="using:RogueEssence.Dev.Converters">
+
+    <Styles.Resources>
+        
+    </Styles.Resources>
+
+    <Style Selector="TreeViewItem">
+        <Setter Property="Padding" Value="4" />
+        <Setter Property="FontSize" Value="12" />
+        <Setter Property="MinHeight" Value="20" />
+
+
+        <Style Selector="^ /template/ ToggleButton Path">
+            <Setter Property="Height" Value="10" />
+            <Setter Property="Width" Value="10" />
+        </Style>
+    </Style>
+</Styles>
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Converters/New/IconKeyToGeometryConverter.cs b/RogueEssence.Editor.Avalonia/Converters/New/IconKeyToGeometryConverter.cs
new file mode 100644
index 00000000..12bc90b0
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/Converters/New/IconKeyToGeometryConverter.cs
@@ -0,0 +1,37 @@
+// using System.Collections.Generic;
+// using Avalonia;
+// using Avalonia.Controls;
+// using Avalonia.Data.Converters;
+// using Avalonia.Styling;
+// using AvaloniaTest.ViewModels;
+//
+// namespace AvaloniaTest.Converters;
+//
+// using Avalonia.Media;
+// using System;
+// using System.Globalization;
+
+using System;
+using System.Globalization;
+using Avalonia;
+using Avalonia.Data.Converters;
+using Avalonia.Media;
+
+namespace RogueEssence.Dev.Converters
+{
+    public class IconKeyToGeometryConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value is string key && Application.Current?.Resources.TryGetResource(key, null, out var geo) == true)
+            {
+                return geo as StreamGeometry;
+            }
+
+            return null;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+            => throw new NotImplementedException();
+    }
+}
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Converters/New/ObjectToColorKeyConverter.cs b/RogueEssence.Editor.Avalonia/Converters/New/ObjectToColorKeyConverter.cs
new file mode 100644
index 00000000..92c6eebd
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/Converters/New/ObjectToColorKeyConverter.cs
@@ -0,0 +1,52 @@
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using Avalonia;
+using Avalonia.Data.Converters;
+using Avalonia.Media;
+
+namespace RogueEssence.Dev.Converters
+{
+    public class ObjectToColorKeyConverter : IMultiValueConverter
+    {
+        public object? Convert(IList<object> values, Type targetType, object? parameter, CultureInfo culture)
+        {
+            if (values.Count < 2)
+                throw new Exception("Expected at least 2 values: object, mandatoryKey, [optionalKey]");
+
+            var value = values[0];
+            var mandatoryKey = values[1] as string;
+            var optionalKey = values.Count > 2 ? values[2] as string : null;
+
+            if (mandatoryKey == null)
+                throw new Exception("Mandatory key must be a string");
+
+            if (value == null)
+            {
+                if (Application.Current?.TryGetResource(mandatoryKey,
+                        Application.Current.ActualThemeVariant, out var brush) == true)
+                {
+                    return brush;
+                }
+
+            }
+
+            if (optionalKey == null) return AvaloniaProperty.UnsetValue;
+
+
+            if (Application.Current?.TryGetResource(optionalKey,
+                    Application.Current.ActualThemeVariant, out var brushWhenNotNull) == true)
+            {
+                return brushWhenNotNull;
+            }
+
+
+            return Brushes.Transparent;
+            throw new Exception($"No brush found!");
+        }
+
+        public object[] ConvertBack(object value, Type[] targetTypes, object? parameter, CultureInfo culture)
+            => throw new NotImplementedException();
+    }
+}
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Converters/New/StringConverters.cs b/RogueEssence.Editor.Avalonia/Converters/New/StringConverters.cs
new file mode 100644
index 00000000..bfc98278
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/Converters/New/StringConverters.cs
@@ -0,0 +1,51 @@
+
+using System;
+using System.Globalization;
+using Avalonia.Data.Converters;
+using Avalonia.Styling;
+
+namespace RogueEssence.Dev.Converters
+{
+    public class ToLocaleConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return Models.Locale.Supported.Find(x => x.Key == value as string);
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return (value as Models.Locale)?.Key;
+        }
+    }
+
+    public static class StringConverters
+    {
+        public static readonly ToLocaleConverter ToLocale = new ToLocaleConverter();
+
+        public class ToThemeConverter : IValueConverter
+        {
+            public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+            {
+                var theme = (string)value;
+                if (string.IsNullOrEmpty(theme))
+                    return ThemeVariant.Default;
+
+                if (theme.Equals("Light", StringComparison.OrdinalIgnoreCase))
+                    return ThemeVariant.Light;
+
+                if (theme.Equals("Dark", StringComparison.OrdinalIgnoreCase))
+                    return ThemeVariant.Dark;
+
+                return ThemeVariant.Default;
+            }
+
+            public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+            {
+                return (value as ThemeVariant)?.Key;
+            }
+        }
+
+        public static readonly ToThemeConverter ToTheme = new ToThemeConverter();
+    }
+}
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Converters/New/WindowStateToColumnConverter.cs b/RogueEssence.Editor.Avalonia/Converters/New/WindowStateToColumnConverter.cs
new file mode 100644
index 00000000..917191e2
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/Converters/New/WindowStateToColumnConverter.cs
@@ -0,0 +1,24 @@
+using System;
+using System.Globalization;
+using Avalonia.Controls;
+using Avalonia.Data.Converters;
+
+namespace RogueEssence.Dev.Converters
+{
+    public class WindowStateToColumnConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value is WindowState ws)
+            {
+                if (ws == WindowState.FullScreen || !OperatingSystem.IsMacOS())
+                    return 0;
+            }
+
+            return 1;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+            => throw new NotImplementedException();
+    }
+}
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Models/Locales.cs b/RogueEssence.Editor.Avalonia/Models/Locales.cs
new file mode 100644
index 00000000..ed1dc7d2
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/Models/Locales.cs
@@ -0,0 +1,21 @@
+using System.Collections.Generic;
+
+namespace RogueEssence.Dev.Models
+{
+    public class Locale
+    {
+        public string Name { get; set; }
+        public string Key { get; set; }
+
+        public static readonly List<Locale> Supported = new List<Locale>()
+        {
+            new Locale("English", "en_US"),
+        };
+
+        public Locale(string name, string key)
+        {
+            Name = name;
+            Key = key;
+        }
+    }
+}
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Models/ModHeader.cs b/RogueEssence.Editor.Avalonia/Models/ModHeader.cs
new file mode 100644
index 00000000..94dd5a56
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/Models/ModHeader.cs
@@ -0,0 +1,15 @@
+namespace RogueEssence.Dev.Models
+{
+    public class ModHeader
+    {
+        public string Name { get; set; }
+        public string Key { get; set; }
+
+
+        public ModHeader(string name, string key)
+        {
+            Name = name;
+            Key = key;
+        }
+    }
+}
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Native/Linux.cs b/RogueEssence.Editor.Avalonia/Native/Linux.cs
new file mode 100644
index 00000000..392f368c
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/Native/Linux.cs
@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Runtime.Versioning;
+
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Platform;
+
+namespace RogueEssence.Dev.Native
+{
+    [SupportedOSPlatform("linux")]
+    internal class Linux : OS.IBackend
+    {
+        public void SetupApp(AppBuilder builder)
+        {
+            builder.With(new X11PlatformOptions() { EnableIme = true });
+        }
+
+        public void SetupWindow(Window window)
+        {
+            if (OS.UseSystemWindowFrame)
+            {
+                window.ExtendClientAreaChromeHints = ExtendClientAreaChromeHints.Default;
+                window.ExtendClientAreaToDecorationsHint = false;
+            }
+            else
+            {
+                window.ExtendClientAreaChromeHints = ExtendClientAreaChromeHints.NoChrome;
+                window.ExtendClientAreaToDecorationsHint = true;
+                window.Classes.Add("custom_window_frame");
+            }
+        }
+    }
+}
diff --git a/RogueEssence.Editor.Avalonia/Native/MacOS.cs b/RogueEssence.Editor.Avalonia/Native/MacOS.cs
new file mode 100644
index 00000000..3ab5e23b
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/Native/MacOS.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Runtime.Versioning;
+
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Platform;
+
+namespace RogueEssence.Dev.Native
+{
+    [SupportedOSPlatform("macOS")]
+    internal class MacOS : OS.IBackend
+    {
+        public void SetupApp(AppBuilder builder)
+        {
+            builder.With(new MacOSPlatformOptions()
+            {
+                DisableDefaultApplicationMenuItems = true,
+            });
+        }
+
+        public void SetupWindow(Window window)
+        {
+            window.ExtendClientAreaChromeHints = ExtendClientAreaChromeHints.SystemChrome;
+            window.ExtendClientAreaToDecorationsHint = true;
+        }
+
+    }
+}
diff --git a/RogueEssence.Editor.Avalonia/Native/OS.cs b/RogueEssence.Editor.Avalonia/Native/OS.cs
new file mode 100644
index 00000000..a20b1dcc
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/Native/OS.cs
@@ -0,0 +1,81 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+
+using Avalonia;
+using Avalonia.Controls;
+
+namespace RogueEssence.Dev.Native
+{
+    public static partial class OS
+    {
+        public interface IBackend
+        {
+            void SetupApp(AppBuilder builder);
+            void SetupWindow(Window window);
+        }
+
+        public static string DataDir
+        {
+            get;
+            private set;
+        } = string.Empty;
+        
+        public static void SetupDataDir()
+        {
+            var execFile = Process.GetCurrentProcess().MainModule!.FileName!;
+            var execDir = Path.GetDirectoryName(execFile)!;
+            var dataDir = Path.Combine(execDir, "data");
+
+            if (!Directory.Exists(dataDir))
+                Directory.CreateDirectory(dataDir);
+
+            DataDir = dataDir;
+        }
+
+
+        public static bool UseSystemWindowFrame
+        {
+            get => OperatingSystem.IsLinux() && _enableSystemWindowFrame;
+            set => _enableSystemWindowFrame = value;
+        }
+
+        static OS()
+        {
+            if (OperatingSystem.IsWindows())
+            {
+                _backend = new Windows();
+            }
+            else if (OperatingSystem.IsMacOS())
+            {
+                _backend = new MacOS();
+            }
+            else if (OperatingSystem.IsLinux())
+            {
+                _backend = new Linux();
+            }
+            else
+            {
+                throw new PlatformNotSupportedException();
+            }
+        }
+
+        public static void SetupApp(AppBuilder builder)
+        {
+            _backend.SetupApp(builder);
+        }
+        
+
+        public static void SetupForWindow(Window window)
+        {
+            _backend.SetupWindow(window);
+        }
+        
+
+        private static IBackend _backend = null;
+        private static bool _enableSystemWindowFrame = false;
+    }
+}
diff --git a/RogueEssence.Editor.Avalonia/Native/Windows.cs b/RogueEssence.Editor.Avalonia/Native/Windows.cs
new file mode 100644
index 00000000..77e4eeee
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/Native/Windows.cs
@@ -0,0 +1,135 @@
+using System;
+using System.IO;
+using System.Runtime.InteropServices;
+using System.Runtime.Versioning;
+using System.Text;
+
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Platform;
+using Avalonia.Threading;
+
+namespace RogueEssence.Dev.Native
+{
+    [SupportedOSPlatform("windows")]
+    internal class Windows : OS.IBackend
+    {
+        [StructLayout(LayoutKind.Sequential)]
+        internal struct RECT
+        {
+            public int left;
+            public int top;
+            public int right;
+            public int bottom;
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        internal struct MARGINS
+        {
+            public int cxLeftWidth;
+            public int cxRightWidth;
+            public int cyTopHeight;
+            public int cyBottomHeight;
+        }
+
+        [DllImport("dwmapi.dll")]
+        private static extern int DwmExtendFrameIntoClientArea(IntPtr hwnd, ref MARGINS margins);
+
+        [DllImport("shlwapi.dll", CharSet = CharSet.Unicode, SetLastError = false)]
+        private static extern bool PathFindOnPath([In, Out] StringBuilder pszFile, [In] string[] ppszOtherDirs);
+
+        [DllImport("shell32.dll", CharSet = CharSet.Unicode, SetLastError = false)]
+        private static extern IntPtr ILCreateFromPathW(string pszPath);
+
+        [DllImport("shell32.dll", SetLastError = false)]
+        private static extern void ILFree(IntPtr pidl);
+
+        [DllImport("shell32.dll", CharSet = CharSet.Unicode, SetLastError = false)]
+        private static extern int SHOpenFolderAndSelectItems(IntPtr pidlFolder, int cild, IntPtr apidl, int dwFlags);
+
+        [DllImport("user32.dll")]
+        private static extern bool GetWindowRect(IntPtr hwnd, out RECT lpRect);
+
+        public void SetupApp(AppBuilder builder)
+        {
+            // Fix drop shadow issue on Windows 10
+            if (!OperatingSystem.IsWindowsVersionAtLeast(10, 0, 22000))
+            {
+                Window.WindowStateProperty.Changed.AddClassHandler<Window>((w, _) => FixWindowFrameOnWin10(w));
+                Control.LoadedEvent.AddClassHandler<Window>((w, _) => FixWindowFrameOnWin10(w));
+            }
+        }
+
+        public void SetupWindow(Window window)
+        {
+            window.ExtendClientAreaChromeHints = ExtendClientAreaChromeHints.NoChrome;
+            window.ExtendClientAreaToDecorationsHint = true;
+            window.Classes.Add("fix_maximized_padding");
+
+            Win32Properties.AddWndProcHookCallback(window, (IntPtr hWnd, uint msg, IntPtr _, IntPtr lParam, ref bool handled) =>
+            {
+                // Custom WM_NCHITTEST
+                if (msg == 0x0084)
+                {
+                    handled = true;
+
+                    if (window.WindowState == WindowState.FullScreen || window.WindowState == WindowState.Maximized)
+                        return 1; // HTCLIENT
+
+                    var p = IntPtrToPixelPoint(lParam);
+                    GetWindowRect(hWnd, out var rcWindow);
+
+                    var borderThickness = (int)(4 * window.RenderScaling);
+                    int y = 1;
+                    int x = 1;
+                    if (p.X >= rcWindow.left && p.X < rcWindow.left + borderThickness)
+                        x = 0;
+                    else if (p.X < rcWindow.right && p.X >= rcWindow.right - borderThickness)
+                        x = 2;
+
+                    if (p.Y >= rcWindow.top && p.Y < rcWindow.top + borderThickness)
+                        y = 0;
+                    else if (p.Y < rcWindow.bottom && p.Y >= rcWindow.bottom - borderThickness)
+                        y = 2;
+
+                    var zone = y * 3 + x;
+                    return zone switch
+                    {
+                        0 => 13, // HTTOPLEFT
+                        1 => 12, // HTTOP
+                        2 => 14, // HTTOPRIGHT
+                        3 => 10, // HTLEFT
+                        4 => 1, // HTCLIENT
+                        5 => 11, // HTRIGHT
+                        6 => 16, // HTBOTTOMLEFT
+                        7 => 15, // HTBOTTOM
+                        _ => 17,
+                    };
+                }
+
+                return IntPtr.Zero;
+            });
+        }
+
+        private void FixWindowFrameOnWin10(Window w)
+        {
+            // Schedule the DWM frame extension to run in the next render frame
+            // to ensure proper timing with the window initialization sequence
+            Dispatcher.UIThread.Post(() =>
+            {
+                var platformHandle = w.TryGetPlatformHandle();
+                if (platformHandle == null)
+                    return;
+
+                var margins = new MARGINS { cxLeftWidth = 1, cxRightWidth = 1, cyTopHeight = 1, cyBottomHeight = 1 };
+                DwmExtendFrameIntoClientArea(platformHandle.Handle, ref margins);
+            }, DispatcherPriority.Render);
+        }
+
+        private PixelPoint IntPtrToPixelPoint(IntPtr param)
+        {
+            var v = IntPtr.Size == 4 ? param.ToInt32() : (int)(param.ToInt64() & 0xFFFFFFFF);
+            return new PixelPoint((short)(v & 0xffff), (short)(v >> 16));
+        }
+    }
+}
diff --git a/RogueEssence.Editor.Avalonia/NodeFactory.cs b/RogueEssence.Editor.Avalonia/NodeFactory.cs
new file mode 100644
index 00000000..8eb30393
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/NodeFactory.cs
@@ -0,0 +1,48 @@
+
+
+using System;
+using Microsoft.Extensions.DependencyInjection;
+using RogueEssence.Dev.Services;
+using RogueEssence.Dev.ViewModels;
+
+namespace RogueEssence.Dev
+{
+    public class NodeFactory
+    {
+        private readonly IServiceProvider _serviceProvider;
+
+        public NodeFactory(IServiceProvider serviceProvider)
+        {
+            _serviceProvider = serviceProvider;
+        }
+
+        public T Create<T>(params object[] args)
+            where T : NodeBase
+        {
+            return (T)ActivatorUtilities.CreateInstance(_serviceProvider, typeof(T), args);
+        }
+
+        public OpenEditorNode CreateOpenEditorNode(string title, string? icon = null, string editorKey = "")
+            => Create<OpenEditorNode>(title, icon, editorKey);
+
+        public DataRootNode CreateDataRootNode(string dataType, string editorKey, string title, string? icon = null)
+        {
+            return Create<DataRootNode>(dataType, editorKey, title, icon);
+        }
+
+        public DataItemNode CreateDataItemNode(string key, string editorKey, string title, string? icon = null)
+            => Create<DataItemNode>(key, editorKey, title, icon);
+
+        // I cannot for the life of figure out of why none of the create methods work... but I guess this will do
+        public PageNode CreatePageNode(EditorPageViewModel childPage, PageNode? parentNode = null)
+
+            => new PageNode(_serviceProvider.GetService<IDialogService>(), this, childPage, parentNode);
+        // => Create<PageNode>(childPage, parentNode);
+        // => Create<PageNode>(this, childPage, parentNode);
+
+
+        public SpriteRootNode CreateSpriteRootNode(string dataType, string editorKey, string title, string? icon = null)
+            => Create<SpriteRootNode>(dataType, editorKey, title, icon);
+
+    }
+}
diff --git a/RogueEssence.Editor.Avalonia/PageFactory.cs b/RogueEssence.Editor.Avalonia/PageFactory.cs
new file mode 100644
index 00000000..df4304c4
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/PageFactory.cs
@@ -0,0 +1,89 @@
+
+using System;
+using System.Collections.Generic;
+using Microsoft.Extensions.DependencyInjection;
+using RogueEssence.Dev.ViewModels;
+
+namespace RogueEssence.Dev
+{
+    public class DesignServiceProvider : IServiceProvider
+    {
+        private readonly IServiceProvider _serviceProvider;
+
+        public DesignServiceProvider()
+        {
+            var collection = new ServiceCollection();
+            collection.AddCommonServices();
+            _serviceProvider = collection.BuildServiceProvider();
+            _serviceProvider.RegisterPages();
+        }
+
+        public object? GetService(Type serviceType)
+        {
+            return _serviceProvider.GetService(serviceType);
+        }
+    
+        public T? GetService<T>()
+        {
+            return _serviceProvider.GetService<T>();
+        }
+    
+        public T GetRequiredService<T>() where T : notnull
+        {
+            return _serviceProvider.GetRequiredService<T>();
+        }
+
+    }
+
+
+
+    public class PageFactory
+    {
+        private readonly IServiceProvider _provider;
+        private readonly Dictionary<string, Type> _map = new();
+
+        public PageFactory(IServiceProvider provider)
+        {
+            _provider = provider;
+        }
+
+        public void Register<TPage>(string key) where TPage : EditorPageViewModel
+        {
+            _map[key] = typeof(TPage);
+        }
+    
+        public EditorPageViewModel? CreatePage(string key)
+        {
+            if (_map.TryGetValue(key, out var type))
+            {
+                return (EditorPageViewModel)_provider.GetRequiredService(type);
+            }
+    
+            return null;
+        }
+    
+        // TODO: see if create page or the one above is better...
+        public T CreatePage<T>() where T : EditorPageViewModel
+        {
+            Console.WriteLine("Don't use this...");
+            return _provider.GetRequiredService<T>();
+        }
+    
+        public void PrintRegisteredPages()
+        {
+            Console.WriteLine("Registered pages:");
+            foreach (var entry in _map)
+            {
+                Console.WriteLine($"Key: {entry.Key}, Type: {entry.Value.FullName}");
+            }
+        }
+    
+        public T GetRequiredService<T>() where T : notnull
+        {
+            return _provider.GetRequiredService<T>();
+        }
+    }
+}
+
+
+
diff --git a/RogueEssence.Editor.Avalonia/Program.cs b/RogueEssence.Editor.Avalonia/Program.cs
index b53c10b0..eed12217 100644
--- a/RogueEssence.Editor.Avalonia/Program.cs
+++ b/RogueEssence.Editor.Avalonia/Program.cs
@@ -1,26 +1,32 @@
 using System;
 using Avalonia;
-using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.ReactiveUI;
 
 namespace RogueEssence.Dev
 {
     public class Program
     {
+
         // Initialization code. Don't use any Avalonia, third-party APIs or any
         // SynchronizationContext-reliant code before AppMain is called: things aren't initialized
         // yet and stuff might break.
+        [STAThread]
         public static void Main(string[] args)
         {
-            AppBuilder builder = BuildAvaloniaApp();
-            builder.StartWithClassicDesktopLifetime(args);
+            Native.OS.SetupDataDir();
+            BuildAvaloniaApp().StartWithClassicDesktopLifetime(args);
         }
 
         // Avalonia configuration, don't remove; also used by visual designer.
         public static AppBuilder BuildAvaloniaApp()
-            => AppBuilder.Configure<App>()
-                .UsePlatformDetect()
-                .LogToTrace()
-                .UseReactiveUI();
+        {
+            var builder = AppBuilder.Configure<App>();
+            builder.UsePlatformDetect();
+            builder.LogToTrace();
+            // builder.WithInterFont();
+            builder.UseReactiveUI();
+            Native.OS.SetupApp(builder);
+            return builder;
+        }
     }
 }
diff --git a/RogueEssence.Editor.Avalonia/RogueEssence.Editor.Avalonia.csproj b/RogueEssence.Editor.Avalonia/RogueEssence.Editor.Avalonia.csproj
index b43319cc..839d1b1d 100644
--- a/RogueEssence.Editor.Avalonia/RogueEssence.Editor.Avalonia.csproj
+++ b/RogueEssence.Editor.Avalonia/RogueEssence.Editor.Avalonia.csproj
@@ -10,12 +10,12 @@
     <AvaloniaResource Include="Assets\**" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="11.2.0" />
-    <PackageReference Include="Avalonia.Controls.DataGrid" Version="11.2.0" />
-    <PackageReference Include="Avalonia.Desktop" Version="11.2.0" />
-    <PackageReference Include="Avalonia.Diagnostics" Version="11.2.0" />
-    <PackageReference Include="Avalonia.ReactiveUI" Version="11.2.0" />
-    <PackageReference Include="Avalonia.Themes.Simple" Version="11.2.0" />
+    <PackageReference Include="Avalonia" Version="11.3.8" />
+    <PackageReference Include="Avalonia.Controls.DataGrid" Version="11.3.8" />
+    <PackageReference Include="Avalonia.Desktop" Version="11.3.8" />
+    <PackageReference Include="Avalonia.Diagnostics" Version="11.3.8" />
+    <PackageReference Include="Avalonia.ReactiveUI" Version="11.3.8" />
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.8" />
     <PackageReference Include="ResXResourceReader.NetStandard" Version="1.0.1" />
   </ItemGroup>
   <ItemGroup>
@@ -183,6 +183,6 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Models\" />
+    <Content Include="ViewModels\New\New\.DS_Store" />
   </ItemGroup>
 </Project>
diff --git a/RogueEssence.Editor.Avalonia/Services/DialogService.cs b/RogueEssence.Editor.Avalonia/Services/DialogService.cs
new file mode 100644
index 00000000..0c9f50ac
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/Services/DialogService.cs
@@ -0,0 +1,87 @@
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Controls.ApplicationLifetimes;
+using Avalonia.Platform.Storage;
+
+namespace RogueEssence.Dev.Services
+{
+    public interface IDialogService
+    {
+        Task<TResult> ShowDialogAsync<TViewModel, TResult>(TViewModel viewModel, string title = "", bool initVm = true)
+            where TViewModel : class;
+
+        void Close<TViewModel, TResult>(TViewModel viewModel, TResult result)
+            where TViewModel : class;
+
+        Task<string?> ShowFolderPickerAsync(FolderPickerOpenOptions options);
+
+    }
+
+    public class DialogService : IDialogService
+    {
+        private readonly ViewLocator _viewLocator;
+        private readonly Func<TopLevel> _topLevelFunc;
+
+        public DialogService()
+        {
+            _viewLocator = new ViewLocator();
+            _topLevelFunc = () =>
+                (Application.Current?.ApplicationLifetime as IClassicDesktopStyleApplicationLifetime)?.MainWindow;
+        }
+
+        public DialogService(ViewLocator viewLocator, Func<TopLevel?> topLevelFunc)
+        {
+            _viewLocator = viewLocator;
+            _topLevelFunc = topLevelFunc;
+        }
+
+        public async Task<TResult?> ShowDialogAsync<TViewModel, TResult>(TViewModel viewModel, string title = "",
+            bool initVm = true)
+            where TViewModel : class
+        {
+            var control = _viewLocator.Build(viewModel);
+            if (control is not Window window)
+                throw new InvalidOperationException($"View for {typeof(TViewModel).Name} must be a Window.");
+
+            if (initVm)
+            {
+                // window.DataContext = viewModel;
+            }
+
+            window.Title = title;
+
+            var mainWindow = (Application.Current?.ApplicationLifetime as IClassicDesktopStyleApplicationLifetime)
+                ?.MainWindow;
+            if (mainWindow == null)
+                throw new InvalidOperationException("Main window not found for dialog parent.");
+
+            return await window.ShowDialog<TResult?>(mainWindow);
+        }
+
+        public void Close<TViewModel, TResult>(TViewModel viewModel, TResult result)
+            where TViewModel : class
+        {
+            var window = (App.Current?.ApplicationLifetime as IClassicDesktopStyleApplicationLifetime)?
+                .Windows.FirstOrDefault(w => ReferenceEquals(w.DataContext, viewModel));
+
+            window?.Close(result);
+        }
+
+        public async Task<string?> ShowFolderPickerAsync(FolderPickerOpenOptions options)
+        {
+            var topLevelVisual = _topLevelFunc();
+            if (topLevelVisual == null) return null;
+
+            var folders = await topLevelVisual.StorageProvider.OpenFolderPickerAsync(options);
+
+            var path = folders.FirstOrDefault()?.Path;
+            if (path == null) return null;
+            return path.IsAbsoluteUri ? path.LocalPath : path.OriginalString;
+        }
+
+
+    }
+}
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/TabEvents.cs b/RogueEssence.Editor.Avalonia/TabEvents.cs
new file mode 100644
index 00000000..e5c0d3a4
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/TabEvents.cs
@@ -0,0 +1,50 @@
+using System;
+using RogueEssence.Dev.ViewModels;
+
+namespace RogueEssence.Dev
+{
+    public class TabEvents
+    {
+        private readonly PageFactory _pageFactory;
+
+        public event Action<EditorPageViewModel, EditorPageViewModel>? AddChildTabEvent;
+        public event Action<EditorPageViewModel>? AddTopLevelTabEvent;
+        public event Action<EditorPageViewModel>? RemoveTabEvent;
+        public event Action<EditorPageViewModel>? NavigateToTabEvent;
+
+        // Navigate tab to ID
+
+        public TabEvents(PageFactory pageFactory)
+        {
+            _pageFactory = pageFactory;
+        }
+
+        public void AddChildPage<T>(EditorPageViewModel parent) where T : EditorPageViewModel
+        {
+            var child = _pageFactory.CreatePage<T>();
+            AddChildTabEvent?.Invoke(parent, child);
+        }
+
+        public void AddChildPage(EditorPageViewModel parent, EditorPageViewModel child)
+            => AddChildTabEvent?.Invoke(parent, child);
+
+        public void AddTopLevelTab<T>() where T : EditorPageViewModel
+        {
+            var tab = _pageFactory.CreatePage<T>();
+            AddTopLevelTabEvent?.Invoke(tab);
+        }
+
+        public void AddTopLevelTab(EditorPageViewModel tab)
+            => AddTopLevelTabEvent?.Invoke(tab);
+
+
+        // TODO: maybe add async callback for closing tab to confirm?
+        public void RemoveTab(EditorPageViewModel page)
+            => RemoveTabEvent?.Invoke(page);
+
+        // TODO: remove this?
+        public void NavigateToTab(EditorPageViewModel page)
+            => NavigateToTabEvent?.Invoke(page);
+
+    }
+}
diff --git a/RogueEssence.Editor.Avalonia/Utility/NodeHelper.cs b/RogueEssence.Editor.Avalonia/Utility/NodeHelper.cs
new file mode 100644
index 00000000..b02c3589
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/Utility/NodeHelper.cs
@@ -0,0 +1,58 @@
+using System;
+using System.Linq;
+using System.Text.RegularExpressions;
+using RogueEssence.Dev.ViewModels;
+
+namespace RogueEssence.Dev.Utility;
+
+
+public interface ITitleFilterStrategy
+{
+    bool Matches(string title, string filter);
+}
+
+public class BeginningTitleFilterStrategy : ITitleFilterStrategy
+{
+    public bool Matches(string title, string filter)
+    {
+        if (string.IsNullOrWhiteSpace(filter))
+            return true;
+
+        var tokens = Regex.Split(title, @"[\s_:]+");
+        return tokens.Any(t => t.StartsWith(filter, StringComparison.OrdinalIgnoreCase));
+    }
+}
+
+public static class NodeHelper
+{
+    public static bool FilterRecursive(NodeBase node, string filter, ITitleFilterStrategy filterStrategy)
+    {
+        bool match = string.IsNullOrWhiteSpace(filter);
+
+       
+
+        match |= filterStrategy.Matches(node.Title, filter);
+
+        bool childMatch = false;
+        foreach (var child in node.SubNodes)
+        {
+            if (FilterRecursive(child, filter, filterStrategy))
+                childMatch = true;
+        }
+
+        node.IsVisible = match || childMatch;
+
+        if (!string.IsNullOrWhiteSpace(filter))
+        {
+            node.IsExpanded = match || childMatch;
+
+            if (match && node.SubNodes.Any())
+            {
+                foreach (var child in node.SubNodes)
+                    child.IsVisible = true;
+            }
+        }
+
+        return node.IsVisible;
+    }
+}
diff --git a/RogueEssence.Editor.Avalonia/ViewLocator.cs b/RogueEssence.Editor.Avalonia/ViewLocator.cs
index 82688454..dd275bda 100644
--- a/RogueEssence.Editor.Avalonia/ViewLocator.cs
+++ b/RogueEssence.Editor.Avalonia/ViewLocator.cs
@@ -7,24 +7,25 @@ namespace RogueEssence.Dev
 {
     public class ViewLocator : IDataTemplate
     {
-        public bool SupportsRecycling => false;
-
-        public Control Build(object data)
+        public Control? Build(object? data)
         {
-            var name = data.GetType().FullName.Replace("ViewModel", "View");
+            if (data is null)
+                return null;
+
+            var name = data.GetType().FullName!.Replace("ViewModel", "View", StringComparison.Ordinal);
             var type = Type.GetType(name);
 
             if (type != null)
             {
-                return (Control)Activator.CreateInstance(type);
-            }
-            else
-            {
-                return new TextBlock { Text = "Not Found: " + name };
+                var control = (Control)Activator.CreateInstance(type)!;
+                control.DataContext = data;
+                return control;
             }
+
+            return new TextBlock { Text = "Not Found: " + name };
         }
 
-        public bool Match(object data)
+        public bool Match(object? data)
         {
             return data is ViewModelBase;
         }
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/DialogBoxes/DialogViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/DialogBoxes/DialogViewModel.cs
new file mode 100644
index 00000000..0c1c42f3
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/DialogBoxes/DialogViewModel.cs
@@ -0,0 +1,38 @@
+using System.Threading.Tasks;
+using ReactiveUI;
+
+namespace RogueEssence.Dev.ViewModels;
+
+
+public class DialogViewModel : ViewModelBase
+{
+    private bool _isDialogOpen;
+
+    public bool IsDialogOpen
+    {
+        get => _isDialogOpen;
+        set { this.RaiseAndSetIfChanged(ref _isDialogOpen, value); }
+    }
+
+    protected TaskCompletionSource closeTask = new TaskCompletionSource();
+
+    public async Task WaitAsnyc()
+    {
+        await closeTask.Task;
+    }
+    
+    public void Show()
+    {
+        if (closeTask.Task.IsCompleted)
+            closeTask = new TaskCompletionSource();
+    
+        IsDialogOpen = true;
+    }
+
+    public void Close()
+    {
+        IsDialogOpen = false;
+        
+        closeTask.TrySetResult();
+    }
+}
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/DialogBoxes/MessageBoxWindowViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/DialogBoxes/MessageBoxWindowViewModel.cs
new file mode 100644
index 00000000..82b92b27
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/DialogBoxes/MessageBoxWindowViewModel.cs
@@ -0,0 +1,46 @@
+using System;
+using System.Collections.ObjectModel;
+using System.Reactive;
+using ReactiveUI;
+using RogueEssence.Dev.Views;
+
+namespace RogueEssence.Dev.ViewModels
+{
+    public class MessageBoxWindowViewModel : ReactiveObject
+    {
+        public string Title { get; }
+        public string Text { get; }
+        public ObservableCollection<ButtonViewModel> Buttons { get; } = new();
+
+        
+        public event EventHandler<MessageBoxWindowView.MessageBoxResult>? CloseRequested;
+
+        public MessageBoxWindowViewModel(string title, string text)
+        {
+            Title = title;
+            Text = text;
+        }
+
+        public void RequestClose(MessageBoxWindowView.MessageBoxResult result)
+        {
+            CloseRequested?.Invoke(this, result);
+        }
+
+        public class ButtonViewModel
+        {
+            public bool IsPrimary => (Caption == "Yes" || Caption == "Ok") && !Danger;
+            public bool Danger { get; }
+            public string Caption { get; }
+            public MessageBoxWindowView.MessageBoxResult Result { get; }
+            public ReactiveCommand<Unit, Unit> Command { get; }
+
+            public ButtonViewModel(string caption, MessageBoxWindowView.MessageBoxResult result, MessageBoxWindowViewModel owner, bool danger)
+            {
+                Caption = caption;
+                Result = result;
+                Danger = danger;
+                Command = ReactiveCommand.Create(() => owner.RequestClose(result));
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/DialogBoxes/PreferencesWindowViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/DialogBoxes/PreferencesWindowViewModel.cs
new file mode 100644
index 00000000..d26a6cdd
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/DialogBoxes/PreferencesWindowViewModel.cs
@@ -0,0 +1,110 @@
+using System;
+using System.IO;
+using System.Reactive.Linq;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using ReactiveUI;
+
+namespace RogueEssence.Dev.ViewModels;
+
+
+[JsonSerializable(typeof(PreferencesWindowViewModel))]
+internal partial class JsonCodeGen : JsonSerializerContext { }
+
+public class PreferencesWindowViewModel : ViewModelBase
+{
+    
+    private static PreferencesWindowViewModel? _instance = null;
+  
+    [JsonIgnore]
+    public static PreferencesWindowViewModel Instance
+    {
+        get
+        {
+            if (_instance != null) return _instance;
+            _instance = Load();
+            _instance.IsLoading = false;
+            return _instance;
+        }
+    }
+    
+    public void Save()
+    {
+        if (_isLoading)
+            return;
+      
+        var file = Path.Combine(Native.OS.DataDir, "preference.json");
+        using var stream = File.Create(file);
+        
+        JsonSerializer.Serialize(stream, this, JsonCodeGen.Default.PreferencesWindowViewModel);
+    }
+
+    private static PreferencesWindowViewModel Load()
+    {
+        var path = Path.Combine(Native.OS.DataDir, "preference.json");
+        if (!File.Exists(path))
+        {
+            return new PreferencesWindowViewModel();
+        }
+
+        try
+        {
+            using var stream = File.OpenRead(path);
+            var prefs = JsonSerializer.Deserialize(stream, JsonCodeGen.Default.PreferencesWindowViewModel);
+            return prefs;
+        }
+        catch
+        {
+            return new PreferencesWindowViewModel();
+        }
+    }
+    
+  
+    
+    private bool _isLoading = true;
+    
+    public bool IsLoading
+    {
+        get => _isLoading;
+        set { this.RaiseAndSetIfChanged(ref _isLoading, value); }
+    }
+    
+    private string _locale = "en_US";
+    
+    
+    public string Locale
+    {
+        get => _locale;
+        set { this.RaiseAndSetIfChanged(ref _locale, value); }
+    }
+    
+    private string _theme = "Default";
+    
+    public string Theme
+    {
+        get => _theme;
+        set { this.RaiseAndSetIfChanged(ref _theme, value); }
+    }
+
+    private string _themeOverrides = string.Empty;
+    public string ThemeOverrides
+    {
+        get => _themeOverrides;
+        set { this.RaiseAndSetIfChanged(ref _themeOverrides, value); }
+    }
+    
+    public PreferencesWindowViewModel()
+    {
+        this.WhenAnyValue(x => x.Theme, x => x.ThemeOverrides)
+            .Where(_ => !_isLoading)
+            .Subscribe(x =>
+            {
+                var (theme, themeOverrides) = x;
+                App.SetTheme(theme, themeOverrides);
+            });
+        
+        this.WhenAnyValue(x => x.Locale)
+            .Where(_ => !_isLoading)
+            .Subscribe(App.SetLocale);
+    }
+}
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/DialogBoxes/RenameWindowViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/DialogBoxes/RenameWindowViewModel.cs
new file mode 100644
index 00000000..85168b86
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/DialogBoxes/RenameWindowViewModel.cs
@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using ReactiveUI;
+
+namespace RogueEssence.Dev.ViewModels
+{
+    public class RenameWindowViewModel : ViewModelBase
+    {
+        public RenameWindowViewModel()
+        {
+            Name = "";
+        }
+
+        private string name;
+        public string Name
+        {
+            get => name;
+            set => this.RaiseAndSetIfChanged(ref name, value);
+        }
+
+    }
+}
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DevControlViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DevControlViewModel.cs
new file mode 100644
index 00000000..29f39ac2
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DevControlViewModel.cs
@@ -0,0 +1,24 @@
+using RogueEssence.Dev.Services;
+
+namespace RogueEssence.Dev.ViewModels;
+
+public class DevControlViewModel : EditorPageViewModel
+{
+    public override string UniqueId => "DevControl";
+    public override string? Title => "Dev Control";
+
+    public TestComboBoxViewModel Fruits { get; }
+    
+    public DevControlViewModel (PageFactory pageFactory, TabEvents tabEvents, IDialogService dialogService) : base(pageFactory, tabEvents, dialogService)
+    {
+       
+        Fruits = new TestComboBoxViewModel();
+    }
+    
+    public DevControlViewModel() : base(new PageFactory(new DesignServiceProvider()), new TabEvents(new PageFactory(new DesignServiceProvider())), new DialogService())
+    {
+        Title = "Dev Control";
+        Fruits = new TestComboBoxViewModel();
+    }
+    
+}
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/EditorPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/EditorPageViewModel.cs
new file mode 100644
index 00000000..110d29e9
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/EditorPageViewModel.cs
@@ -0,0 +1,222 @@
+using ReactiveUI;
+
+using System;
+using System.Collections.ObjectModel;
+using RogueEssence.Dev.Services;
+
+
+namespace RogueEssence.Dev.ViewModels;
+
+public class EditorPageViewModel : ViewModelBase
+{
+    public virtual string? UniqueId => null;
+    
+    public virtual bool AddNewTab => true;
+    
+    
+    private string _data = "";
+
+    private string _title = "";
+    public virtual string Title
+    {
+        get { return _title; }
+        set
+        {
+            this.RaiseAndSetIfChanged(ref _title, value);
+        }
+    }
+
+    public string Data
+    {
+        get { return _data; }
+        set
+        {
+            this.RaiseAndSetIfChanged(ref _data, value);
+        }
+    }
+    
+ 
+
+    
+    private string? _icon = "";
+    public string Icon
+    {
+        get { return _icon; }
+        set
+        {
+            this.RaiseAndSetIfChanged(ref _icon, value);
+        }
+    }
+    
+    
+       private bool _modified = false;
+        public bool Modified
+        {
+            get { return _modified; }
+            set
+            {
+                this.RaiseAndSetIfChanged(ref _modified, value);
+            }
+        }
+    private readonly TabEvents _tabEvents;
+    
+    public EditorPageViewModel(PageFactory pageFactory, TabEvents tabEvents, IDialogService dialogService)
+    {
+        // Children = new ObservableCollection<EditorPageViewModel>();
+        _tabEvents = tabEvents;
+    }
+
+    public void SetTabInfo(NodeBase node)
+    {
+        _icon = node._icon;
+        _title = node.Title;
+    }
+    
+    public void SetTitle(string title)
+    {
+        _title = title;
+    }
+    
+    public void SetIcon(string icon)
+    {
+        _icon = icon;
+    }
+    
+    // public RepositoryNode Node
+    // {
+    //     get => _node;
+    //     set => SetProperty(ref _node, value);
+    // }
+
+    // public LauncherPage()
+    // {
+    // _node = new RepositoryNode() { Id = Guid.NewGuid().ToString() };
+    // _data = Welcome.Instance;
+
+    // New welcome page will clear the search filter before.
+    // Welcome.Instance.ClearSearchFilter();
+    // }
+
+
+    // public class LauncherPage : ObservableObject
+    // {
+    //     public RepositoryNode Node
+    //     {
+    //         get => _node;
+    //         set => SetProperty(ref _node, value);
+    //     }
+    //
+    //     public object Data
+    //     {
+    //         get => _data;
+    //         set => SetProperty(ref _data, value);
+    //     }
+    //
+    //     public Models.DirtyState DirtyState
+    //     {
+    //         get => _dirtyState;
+    //         private set => SetProperty(ref _dirtyState, value);
+    //     }
+    //
+    //     public Popup Popup
+    //     {
+    //         get => _popup;
+    //         set => SetProperty(ref _popup, value);
+    //     }
+    //
+    //     public AvaloniaList<Models.Notification> Notifications
+    //     {
+    //         get;
+    //         set;
+    //     } = new AvaloniaList<Models.Notification>();
+    //
+    //     public LauncherPage()
+    //     {
+    //         _node = new RepositoryNode() { Id = Guid.NewGuid().ToString() };
+    //         _data = Welcome.Instance;
+    //
+    //         // New welcome page will clear the search filter before.
+    //         Welcome.Instance.ClearSearchFilter();
+    //     }
+    //
+    //     public LauncherPage(RepositoryNode node, Repository repo)
+    //     {
+    //         _node = node;
+    //         _data = repo;
+    //     }
+    //
+    //     public void ClearNotifications()
+    //     {
+    //         Notifications.Clear();
+    //     }
+    //
+    //     public async Task CopyPathAsync()
+    //     {
+    //         if (_node.IsRepository)
+    //             await App.CopyTextAsync(_node.Id);
+    //     }
+    //
+    //     public void ChangeDirtyState(Models.DirtyState flag, bool remove)
+    //     {
+    //         var state = _dirtyState;
+    //         if (remove)
+    //         {
+    //             if (state.HasFlag(flag))
+    //                 state -= flag;
+    //         }
+    //         else
+    //         {
+    //             state |= flag;
+    //         }
+    //
+    //         DirtyState = state;
+    //     }
+    //
+    //     public bool CanCreatePopup()
+    //     {
+    //         return _popup is not { InProgress: true };
+    //     }
+    //
+    //     public async Task ProcessPopupAsync()
+    //     {
+    //         if (_popup is { InProgress: false } dump)
+    //         {
+    //             if (!dump.Check())
+    //                 return;
+    //
+    //             dump.InProgress = true;
+    //
+    //             try
+    //             {
+    //                 var finished = await dump.Sure();
+    //                 if (finished)
+    //                 {
+    //                     dump.Cleanup();
+    //                     Popup = null;
+    //                 }
+    //             }
+    //             catch (Exception e)
+    //             {
+    //                 App.LogException(e);
+    //             }
+    //
+    //             dump.InProgress = false;
+    //         }
+    //     }
+    //
+    //     public void CancelPopup()
+    //     {
+    //         if (_popup == null || _popup.InProgress)
+    //             return;
+    //
+    //         _popup?.Cleanup();
+    //         Popup = null;
+    //     }
+    //
+    //     private RepositoryNode _node = null;
+
+    //     private Models.DirtyState _dirtyState = Models.DirtyState.None;
+    //     private Popup _popup = null;
+    // }
+
+}
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/GroundEditorPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/GroundEditorPageViewModel.cs
new file mode 100644
index 00000000..c1e506a7
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/GroundEditorPageViewModel.cs
@@ -0,0 +1,12 @@
+using RogueEssence.Dev.Services;
+
+namespace RogueEssence.Dev.ViewModels;
+
+public class GroundEditorPageViewModel : EditorPageViewModel
+{
+    public override string UniqueId => "GroundEditor";
+    public override string Title => "Ground Editor Long Name";
+    
+    public GroundEditorPageViewModel (PageFactory pageFactory, TabEvents tabEvents, IDialogService dialogService) : base(pageFactory, tabEvents, dialogService)
+    { }
+}
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ModInfoEditorViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ModInfoEditorViewModel.cs
new file mode 100644
index 00000000..a55b48ab
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ModInfoEditorViewModel.cs
@@ -0,0 +1,26 @@
+namespace RogueEssence.Dev.ViewModels;
+
+using Dev.Services;
+
+public class ModInfoEditorViewModel : EditorPageViewModel
+{
+    public override string UniqueId => null;
+    public override string? Title => "Mod Info";
+    
+    // public override bool AddNewTab => true;
+
+    public TestComboBoxViewModel Fruits { get; }
+    
+    public ModInfoEditorViewModel(PageFactory pageFactory, TabEvents tabEvents, IDialogService dialogService) : base(pageFactory, tabEvents, dialogService)
+    {
+       
+        Fruits = new TestComboBoxViewModel();
+    }
+    
+    public ModInfoEditorViewModel() : base(new PageFactory(new DesignServiceProvider()), new TabEvents(new PageFactory(new DesignServiceProvider())), new DialogService())
+    {
+        Title = "Dev Control";
+        Fruits = new TestComboBoxViewModel();
+    }
+    
+}
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/RandomInfoPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/RandomInfoPageViewModel.cs
new file mode 100644
index 00000000..cd6f28d6
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/RandomInfoPageViewModel.cs
@@ -0,0 +1,14 @@
+using RogueEssence.Dev.Services;
+
+namespace RogueEssence.Dev.ViewModels;
+
+public class RandomInfoPageViewModel : EditorPageViewModel
+{
+    public override bool AddNewTab => false;
+    
+    public override string Title => "Random Page Info";
+    public RandomInfoPageViewModel (PageFactory pageFactory, TabEvents tabEvents, IDialogService dialogService) : base(pageFactory, tabEvents, dialogService)
+    {
+    }
+    
+}
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/SpritePageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/SpritePageViewModel.cs
new file mode 100644
index 00000000..84a284e0
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/SpritePageViewModel.cs
@@ -0,0 +1,40 @@
+using System;
+using System.Reactive;
+using Avalonia.Platform.Storage;
+using RogueEssence.Dev.Services;
+using ReactiveUI;
+
+namespace RogueEssence.Dev.ViewModels;
+
+public class SpritePageViewModel : EditorPageViewModel
+{
+    public ReactiveCommand<Unit, Unit> CreateATab { get; }
+    public ReactiveCommand<Unit, Unit> CreateATopTab { get; }
+    public ReactiveCommand<Unit, Unit> TestDialog { get; }
+    public ReactiveCommand<Unit, Unit> RemoveSelfTab { get; }
+    
+    public override string Title => "Sprite Stuff";
+    public override string? UniqueId => "";
+
+
+    public SpritePageViewModel(PageFactory pageFactory, TabEvents tabEvents, IDialogService dialogService) : base(pageFactory, tabEvents, dialogService)
+    {
+        CreateATab = ReactiveCommand.Create(() => tabEvents.AddChildPage(this, pageFactory.CreatePage("SpritePage")));
+        CreateATopTab = ReactiveCommand.Create(() => tabEvents.AddTopLevelTab(pageFactory.CreatePage("ModInfoEditor")));
+        TestDialog = ReactiveCommand.CreateFromTask(async () =>
+            {
+                var rename = new RenameWindowViewModel();
+                var result = await dialogService.ShowFolderPickerAsync(new FolderPickerOpenOptions()
+                {
+                    AllowMultiple = false,
+                    Title = "Select a folder"
+                });
+                Console.WriteLine(rename.Name);
+            }
+        );
+        
+        RemoveSelfTab = ReactiveCommand.Create( () => tabEvents.RemoveTab(this));
+            
+        
+    }
+}
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ZoneEditorPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ZoneEditorPageViewModel.cs
new file mode 100644
index 00000000..baba4ce6
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ZoneEditorPageViewModel.cs
@@ -0,0 +1,16 @@
+using RogueEssence.Dev.Services;
+
+namespace RogueEssence.Dev.ViewModels;
+
+public class ZoneEditorPageViewModel : EditorPageViewModel
+{
+    public override string UniqueId => "ZoneEditor";
+    public override string Title => "Zone Editor";
+    
+    public ZoneEditorPageViewModel(PageFactory pageFactory, TabEvents tabEvents, IDialogService dialogService) : base(pageFactory, tabEvents, dialogService)
+    {
+        
+    }
+    
+}
+    
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/MainWindowViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/MainWindowViewModel.cs
new file mode 100644
index 00000000..cd06da31
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/MainWindowViewModel.cs
@@ -0,0 +1,456 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Reactive;
+using System.Reactive.Linq;
+using System.Threading.Tasks;
+using RogueEssence.Dev.Models;
+using RogueEssence.Dev.Services;
+using ReactiveUI;
+using RogueEssence.Dev.Utility;
+using RogueEssence.Dev.Views;
+
+namespace RogueEssence.Dev.ViewModels;
+
+public class MainWindowViewModel : ViewModelBase
+{
+    private readonly NodeFactory _nodeFactory;
+
+
+    private bool _isTreeView;
+
+    public bool IsTreeView
+    {
+        get => _isTreeView;
+        set { this.RaiseAndSetIfChanged(ref _isTreeView, value); }
+    }
+
+
+    private Models.ModHeader _currentMod = new  Models.ModHeader("Halcyon", "halcyon");
+
+    public Models.ModHeader CurrentMod
+    {
+        get => _currentMod;
+        set { this.RaiseAndSetIfChanged(ref _currentMod, value); }
+    }
+
+    public void OpenTabSwitcher()
+    {
+        TabSwitcher = _pageFactory.GetRequiredService<TabSwitcherViewModel>();
+    }
+    public event Action? TabSwitcherClosed;
+    public void CloseTabSwitcher()
+    {
+        TabSwitcher = null;
+        TabSwitcherClosed?.Invoke();
+    }
+
+    public void OnModSwitcherOpened()
+    {
+        if (ModSwitcher == null)
+        {
+            ModSwitcher = _pageFactory.GetRequiredService<ModSwitcherViewModel>();
+        }
+    }
+
+    
+    public event Action? ModSwitcherClosed;
+    public void OnModSwitcherClosed()
+    {
+        if (ModSwitcher != null)
+        {
+            ModSwitcher = null;
+            ModSwitcherClosed?.Invoke();
+        }
+    }
+
+    public ReactiveCommand<Unit, Unit> OpenPreferencesWindow { get; }
+
+    public ReactiveCommand<Unit, Unit> ClearFilterCommand { get; }
+    
+    private string _filter = "";
+    public string Filter
+    {
+        get { return _filter; }
+        set { this.RaiseAndSetIfChanged(ref _filter, value); }
+    }
+
+
+    private void ApplyFilter(string filter)
+    {
+        foreach (var node in Nodes)
+        {
+            NodeHelper.FilterRecursive(node, filter, new BeginningTitleFilterStrategy());
+        }
+    }
+    
+    private ObservableCollection<EditorPageViewModel> _pages;
+
+    public ObservableCollection<EditorPageViewModel> Pages
+    {
+        get => _pages;
+        set => this.RaiseAndSetIfChanged(ref _pages, value);
+    }
+
+    private EditorPageViewModel? _activePage;
+
+    public EditorPageViewModel? ActivePage
+    {
+        get => _activePage;
+        set => this.RaiseAndSetIfChanged(ref _activePage, value);
+    }
+
+    private EditorPageViewModel? _temporaryTab;
+
+
+    public EditorPageViewModel? TemporaryTab
+    {
+        get => _temporaryTab;
+        set => this.RaiseAndSetIfChanged(ref _temporaryTab, value);
+    }
+
+    private ObservableCollection<PageNode> _topLevelPages;
+
+    public ObservableCollection<PageNode> TopLevelPages
+    {
+        get => _topLevelPages;
+        set => this.RaiseAndSetIfChanged(ref _topLevelPages, value);
+    }
+
+    private Dictionary<EditorPageViewModel, PageNode> _pageToNodeMap;
+
+
+    public void AddTopLevelPage(EditorPageViewModel page)
+    {
+        // Console.WriteLine($"Adding top level page {page}");
+        var navigated = TryNavigateToExistingPage(page);
+        if (navigated) return;
+        
+        if (!page.AddNewTab)
+        {
+            TemporaryTab = page;
+            return;
+        }
+        
+        
+        Pages.Add(page);
+        var node = _nodeFactory.CreatePageNode(page, null);
+        TopLevelPages.Add(node);
+        _pageToNodeMap[page] = node;
+        ActivePage = page;
+    }
+
+    
+    public void AddChildPage(EditorPageViewModel parentPage, EditorPageViewModel childPage)
+    {
+        var navigated = TryNavigateToExistingPage(childPage);
+        if (navigated) return;
+        
+        
+        // Otherwise... add to the list of tabs
+        if (_pageToNodeMap.TryGetValue(parentPage, out var parentNode))
+        {
+            var childNode = parentNode.AddChild(childPage);
+            _pageToNodeMap[childPage] = childNode;
+            var parentIndex = Pages.IndexOf(parentPage);
+            if (parentIndex == -1)
+            {
+                Pages.Add(childPage);
+            }
+            else
+            {
+                Pages.Insert(parentIndex + 1, childPage);
+            }
+        }
+        else
+        {
+            AddTopLevelPage(parentPage);
+        }
+    }
+
+    // Returns whether the navigation was successful
+    private bool TryNavigateToExistingPage(EditorPageViewModel page)
+    {
+        if (!string.IsNullOrEmpty(page.UniqueId))
+        {
+            var existing = Pages.FirstOrDefault(p => p.UniqueId == page.UniqueId);
+            if (existing != null)
+            {
+                TemporaryTab = null;
+                ActivePage = existing;
+                return true;
+            }
+        }
+
+        return false;
+    }
+        
+    public bool PageHasChildren(EditorPageViewModel page)
+    {
+        if (!_pageToNodeMap.TryGetValue(page, out var node))
+            return false;
+
+        return node.SubNodes.Count > 0;
+    }
+
+    public void RemoveTab(EditorPageViewModel page)
+    {
+        if (!_pageToNodeMap.TryGetValue(page, out var node))
+            return;
+        
+        int removeIdx = Pages.IndexOf(page);
+
+        ClosePageAndChildren(node);
+        
+        
+        // We want to prioritize setting the left tab to be the active tab since our editors open stuff to the right first
+        // Maybe we want to set the active page to be the parent if it exists?
+        if (Pages.Count == 0)
+        {
+            ActivePage = null;
+        }
+        else
+        {
+            if (removeIdx > 0 && removeIdx - 1 < Pages.Count)
+            {
+                ActivePage = Pages[removeIdx - 1];
+            }
+            else if (removeIdx > 0)
+            {
+                ActivePage = Pages[Pages.Count - 1];
+            }
+            else
+            {
+                ActivePage = Pages[0];
+            }
+        }
+        
+    }
+
+    private void ClosePageAndChildren(PageNode node)
+    {
+        var children = node.SubNodes.Cast<PageNode>().ToList();
+        foreach (var child in children)
+        {
+            ClosePageAndChildren(child);
+        }
+
+        Pages.Remove(node.Page);
+
+        if (node.IsTopLevel)
+        {
+            TopLevelPages.Remove(node);
+        }
+        else
+        {
+            node.Parent.RemoveChild(node);
+        }
+
+        _pageToNodeMap.Remove(node.Page);
+    }
+
+
+    private readonly PageFactory _pageFactory;
+    private readonly TabEvents _tabEvents;
+    private readonly IDialogService _dialogService;
+    public ObservableCollection<NodeBase> Nodes { get; set; }
+
+    public MainWindowViewModel() : this(new PageFactory(new DesignServiceProvider()),
+        new NodeFactory(new DesignServiceProvider()), new DialogService(),
+        new TabEvents(new PageFactory(new DesignServiceProvider())))
+    {
+    }
+
+    public MainWindowViewModel(PageFactory pageFactory, NodeFactory nodeFactory, IDialogService dialogService,
+        TabEvents tabEvents)
+    {
+        _pageFactory = pageFactory;
+        _tabEvents = tabEvents;
+        _nodeFactory = nodeFactory;
+        _dialogService = dialogService;
+
+        BuildNodes();
+        InitializeTabEvents();
+
+        this.WhenAnyValue(x => x.ActivePage)
+            .Where(activePage => activePage != null)
+            .Subscribe(_ => TemporaryTab = null);
+
+        Pages = new ObservableCollection<EditorPageViewModel>();
+        TopLevelPages = new ObservableCollection<PageNode>();
+        _pageToNodeMap = new Dictionary<EditorPageViewModel, PageNode>();
+
+        // TODO: move this own view
+        ClearFilterCommand = ReactiveCommand.Create(() => { Filter = string.Empty; });
+        
+        OpenPreferencesWindow = ReactiveCommand.CreateFromTask(async () =>
+        {
+            await _dialogService.ShowDialogAsync<PreferencesWindowViewModel, bool>(
+                PreferencesWindowViewModel.Instance, "Preferences", false);
+        });
+
+        var tab = _pageFactory.CreatePage("DevControl");
+        tab.Icon = "Icons.GameControllerFill";
+        AddTopLevelPage(tab);
+        this.WhenAnyValue(x => x.Filter).Subscribe(ApplyFilter);
+    }
+    
+    private void InitializeTabEvents()
+    {
+        _tabEvents.AddChildTabEvent += (parent, child) =>
+        {
+            AddChildPage(parent, child);
+            ActivePage = child;
+        };
+
+        _tabEvents.AddTopLevelTabEvent += (tab) =>
+        {
+            AddTopLevelPage(tab);
+        };
+        
+        _tabEvents.RemoveTabEvent += (tab) => { RemoveTab(tab); };
+        
+        _tabEvents.NavigateToTabEvent += (tab) =>
+        {
+            ActivePage = tab;
+        };
+    }
+
+    private void BuildNodes()
+    {
+        var halcyonNode = _nodeFactory.CreateOpenEditorNode("Halcyon", "Icons.FloppyDiskBackFill", "ModInfoEditor");
+
+        halcyonNode.SubNodes.Add(
+            _nodeFactory.CreateOpenEditorNode("Dev Control", "Icons.GameControllerFill", "DevControl"));
+        halcyonNode.SubNodes.Add(_nodeFactory.CreateOpenEditorNode("Zone Editor", "Icons.StairsFill", "ZoneEditor"));
+        halcyonNode.SubNodes.Add(
+            _nodeFactory.CreateOpenEditorNode("Ground Editor", "Icons.MapTrifoldFill", "GroundEditor"));
+        halcyonNode.SubNodes.Add(_nodeFactory.CreateOpenEditorNode("Testing", "Icons.BedFill", "RandomInfo"));
+        halcyonNode.SubNodes.Add(_nodeFactory.CreateOpenEditorNode("Tab Test", "Icons.AirplaneFill", "SpritePage"));
+
+        halcyonNode.SubNodes.Add(_nodeFactory.CreateOpenEditorNode("Constants", "Icons.ListFill"));
+
+        var monstersRoot = _nodeFactory.CreateDataRootNode("Monsters", "Monsters", "Monsters", "Icons.GhostFill");
+
+
+        //             new OpenEditorNode("Dev Control", "Icons.GameControllerFill", "DevControl"),
+        //             new OpenEditorNode("Zone Editor", "Icons.StairsFill", "ZoneEditor"),
+        //             new OpenEditorNode("Ground Editor", "Icons.MapTrifoldFill", "GroundEditor"),
+        //             new OpenEditorNode("Testing", "Icons.BedFill", "RandomInfo"),
+
+
+        monstersRoot.SubNodes.Add(_nodeFactory.CreateDataItemNode("eevee", "MonsterEditor", "eevee: Eevee",
+            "Icons.GhostFill"));
+        monstersRoot.SubNodes.Add(_nodeFactory.CreateDataItemNode("seviper", "MonsterEditor", "seviper: Seviper",
+            "Icons.GhostFill"));
+
+        var particlesRoot = _nodeFactory.CreateSpriteRootNode("particles", "", "Particles", "Icons.PaintBrushFill");
+        particlesRoot.SubNodes.Add(_nodeFactory.CreateDataItemNode("Acid_Blue", "SpriteEditor", "Acid_Blue",
+            "Icons.PaintBrushFill"));
+        particlesRoot.SubNodes.Add(_nodeFactory.CreateDataItemNode("Acid_Red", "SpriteEditor", "Acid_Red",
+            "Icons.PaintBrushFill"));
+
+        halcyonNode.SubNodes.Add(particlesRoot);
+        //             new NodeBase("Sprites", "Icons.PaintBrushFill")
+        //             {
+        //                 SubNodes = new ObservableCollection<NodeBase>
+        //                 {
+        //                     new NodeBase("Char Sprites", "Icons.GhostFill"),
+        //                     new NodeBase("Portraits", "Icons.ImagesSquareFill"),
+        //                     new ActionDataNode("Particles", "Icons.ShootingStarFill")
+        //                     {
+        //                         SubNodes = new ObservableCollection<NodeBase>
+        //                         {
+        //                             new NodeBase("Absorb", "Icons.ShootingStarFill"),
+        //                             new NodeBase("Acid_Blue", "Icons.ShootingStarFill"),
+        //                         }
+        //                     },
+        //                     new ActionDataNode("Beam", "Icons.HeadlightsFill")
+        //                     {
+        //                         SubNodes = new ObservableCollection<NodeBase>
+        //                         {
+        //                             new NodeBase("Beam_2", "Icons.HeadlightsFill"),
+        //                             new NodeBase("Beam_Pink", "Icons.HeadlightsFill"),
+        //                         }
+        //                     },
+        //                 }
+        //             },
+        //             new NodeBase("Mods", "Icons.SwordFill")
+        //             {
+        //                 SubNodes = new ObservableCollection<NodeBase>
+        //                 {
+        //                     new NodeBase("halcyon: Halcyon", "Icons.SwordFill"),
+        //                     new NodeBase("zorea_mystery_dungeon: Zorea Mystery Dungeon", "Icons.SwordFill"),
+        //                 }
+        //             }
+        //         }
+
+        halcyonNode.SubNodes.Add(monstersRoot);
+        Nodes = new ObservableCollection<NodeBase> { halcyonNode };
+
+        halcyonNode.IsExpanded = true;
+        monstersRoot.IsExpanded = true;
+    }
+
+ 
+
+    private TabSwitcherViewModel? _tabSwitcher;
+
+    public TabSwitcherViewModel? TabSwitcher
+    {
+        get => _tabSwitcher;
+        set => this.RaiseAndSetIfChanged(ref _tabSwitcher, value);
+    }
+
+
+    private ModSwitcherViewModel? _modSwitcher;
+
+    public ModSwitcherViewModel? ModSwitcher
+    {
+        get => _modSwitcher;
+        set => this.RaiseAndSetIfChanged(ref _modSwitcher, value);
+    }
+    
+
+    // Navigate to a page from tab switcher
+    public void NavigateToPage(PageNode node)
+    {
+        Console.WriteLine($"Navigating to page {node.Title}");
+        Console.WriteLine("yay");
+        ActivePage = node.Page;
+    }
+    
+    public void AddPageFromPageNode(OpenEditorNode node)
+    {
+        var editor = _pageFactory.CreatePage(node.EditorKey);
+
+        if (editor != null)
+        {
+            editor.SetTabInfo(node);
+            AddTopLevelPage(editor);
+        }
+    }
+    
+    public async Task<bool> TryCloseTabAsync(EditorPageViewModel page)
+    {
+        if (PageHasChildren(page))
+        {
+            var result = await MessageBoxWindowView.Show(
+                "Are you sure you want to close all subtabs?  Your changes will not be saved.",
+                "Confirm Close",
+                MessageBoxWindowView.MessageBoxButtons.YesNo,
+                _dialogService
+            );
+
+            if (result != MessageBoxWindowView.MessageBoxResult.Yes)
+                return false;
+        }
+
+        RemoveTab(page);
+        return true;
+    }
+    
+
+    // public TreeSearchViewModel TreeSearch { get; } = new TreeSearchViewModel();
+}
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/ModSwitcherViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/ModSwitcherViewModel.cs
new file mode 100644
index 00000000..18704360
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/ModSwitcherViewModel.cs
@@ -0,0 +1,90 @@
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Threading.Tasks;
+using RogueEssence.Dev;
+using RogueEssence.Dev.Services;
+using ReactiveUI;
+using RogueEssence.Dev.Views;
+
+namespace RogueEssence.Dev.ViewModels;
+
+public class ModSwitcherViewModel : ViewModelBase
+{
+
+    private readonly IDialogService _dialogService;
+    private readonly MainWindowViewModel _mainWindow;
+    private ModHeader _selectedMod;
+
+    public ModHeader SelectedMod
+    {
+        get => _selectedMod;
+        set { this.RaiseAndSetIfChanged(ref _selectedMod, value); }
+    }
+    
+    public ObservableCollection<Models.ModHeader> Mods { get; }
+    public ModSwitcherViewModel(MainWindowViewModel mainWindowViewModel, IDialogService dialogService)
+    {
+        _mainWindow = mainWindowViewModel;
+        _dialogService = dialogService;
+        
+        Mods = new ObservableCollection<Models.ModHeader>()
+        {
+            // new Models.ModHeader("[NULL]", "origin"),
+            // new ModHead("Super Party Bros", "Super_Party_Bros"),
+            // new ModHead("Resource Dungeon Pack", "source_duns_imbi"),
+            // new ModHead("Trio's Sandbox", "trios_sandbox"),
+            // new ModHead("Bubsy Mystery Dungeon", "bubsy_md"),
+            // new ModHead("Friend Area", "friend_area"),
+            // new ModHead("Typeless Moves", "typeless_moves"),
+            // new ModHead("Bossfights", "bossfights"),
+            // new ModHead("Explorers of Friending", "explorers_of_friending"),
+            // new ModHead("All Starters", "starter_mod"),
+            // new ModHead("Visible Monster Houses", "visible_monster_houses"),
+            // new ModHead("Project EoN (0.2.3)", "what_does_n_stand_for"),
+            // new ModHead("Explorers of Kanto", "explorers_of_kanto"),
+            // new ModHead("Halcyon", "halcyon"),
+            // new ModHead("Ruin", "ruins"),
+            // new ModHead("More Items", "more_items"),
+            // new ModHead("Enable Mission Board", "enable_mission_board"),
+            // new ModHead("Silver Resistance", "silver_resistance"),
+            // new ModHead("Rev Mod", "rev_mod"),
+            // new ModHead("Halcyon No Nickname", "halcyon_nickname"),
+            // new ModHead("Mystery Ruins", "mystery_ruins"),
+            // new ModHead("Trio's Sandbox", "trios_sandbox_pack"),
+            // new ModHead("Music Notice", "music_notice"),
+            // new ModHead("Trio's Dungeon Pack", "trios_dungeon_pack"),
+            // new ModHead("Raw", "raw_key"),
+            // new ModHead("Gender Unlock", "gender_unlock"),
+
+        };
+    }
+    
+    
+    public void CloseSwitcher()
+    {
+        _mainWindow.OnModSwitcherClosed();
+    }
+    
+    public async Task<MessageBoxWindowView.MessageBoxResult> ConfirmModSwitchAsync()
+    {
+        return await MessageBoxWindowView.Show(
+            "The game will be reloaded to use content from the new path. Click OK to proceed. Your changes will not be saved.",
+            "Are you sure?",
+            MessageBoxWindowView.MessageBoxButtons.OkCancel,
+            _dialogService
+        );
+    }
+    
+    public Models.ModHeader CurrentMod
+    {
+        get => _mainWindow.CurrentMod;
+        set => _mainWindow.CurrentMod = value;
+    }
+
+    public bool IsCurrent(Models.ModHeader head)
+    { 
+        return head.Key == _mainWindow.CurrentMod.Key;
+    }
+}
+
+
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/NodeBase.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/NodeBase.cs
new file mode 100644
index 00000000..ebc9d094
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/NodeBase.cs
@@ -0,0 +1,405 @@
+using System;
+using System.Collections.Specialized;
+using System.Reactive;
+using System.Threading.Tasks;
+using System.Windows.Input;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Controls.ApplicationLifetimes;
+using Avalonia.Platform.Storage;
+using RogueEssence.Dev.Services;
+using ReactiveUI;
+using RogueEssence.Dev.Views;
+
+namespace RogueEssence.Dev.ViewModels;
+
+using System.Collections.ObjectModel;
+
+public class NodeBase : ViewModelBase
+{
+    public ObservableCollection<NodeBase> SubNodes { get; set; }
+
+    // public NodeBase? Parent { get; internal set; } 
+    
+    private string _title = "";
+
+    public virtual string Title
+    {
+        get => _title;
+        set => this.RaiseAndSetIfChanged(ref _title, value);
+    }
+
+    public string _icon = "";
+    public string Icon
+    {
+        get => _icon;
+        set => this.RaiseAndSetIfChanged(ref _icon, value);
+    }
+
+    
+    public NodeBase(string title = "", string? icon = null)
+    {
+        Title = title;
+        _icon = icon ?? "";
+        SubNodes = new ObservableCollection<NodeBase>();
+        IsExpanded = false;
+        // SubNodes.CollectionChanged += OnSubNodesChanged;
+    }
+    
+    private bool _isExpanded = false;
+    public bool IsExpanded
+    {
+        get => _isExpanded;
+        set => this.RaiseAndSetIfChanged(ref _isExpanded, value);
+    }
+    
+    private bool _isVisible = true;
+    public bool IsVisible
+    {
+        get => _isVisible;
+        set => this.RaiseAndSetIfChanged(ref _isVisible, value);
+    }
+    
+    // private void OnSubNodesChanged(object? s, NotifyCollectionChangedEventArgs e) {
+    //     if (e.NewItems != null)
+    //         foreach(NodeBase child in e.NewItems) child.Parent = this;
+    //     if (e.OldItems != null)
+    //         foreach(NodeBase child in e.OldItems) child.Parent = null;
+    // }
+
+
+}
+
+public class OpenEditorNode : NodeBase
+{
+    public string EditorKey { get; }
+    
+    public OpenEditorNode(string title, string? icon = null, string editorKey = "") 
+        : base(title, icon ?? "")
+    {
+        EditorKey = editorKey;
+    }
+}
+
+public abstract class ItemRootNode : OpenEditorNode
+{
+    protected readonly IDialogService _dialogService;
+    
+    public abstract ReactiveCommand<Unit, Unit> AddCommand { get; }
+    public abstract ReactiveCommand<DataItemNode, Unit> DeleteCommand { get; }
+
+    protected ItemRootNode(string title, string icon, string editorKey)
+        : base(title, icon, editorKey)
+    {
+
+    }
+}
+
+public class DataRootNode : ItemRootNode
+{
+    protected readonly string _dataType;
+    
+    private readonly NodeFactory _nodeFactory;
+    
+    private readonly IDialogService _dialogService ;
+    
+
+    public override ReactiveCommand<Unit, Unit> AddCommand { get; }
+    public override ReactiveCommand<DataItemNode, Unit> DeleteCommand { get; }
+
+    public ReactiveCommand<Unit, Unit> ReIndexCommand { get; }
+    public ReactiveCommand<Unit, Unit> ResaveAllAsFileCommand { get; }
+    public ReactiveCommand<Unit, Unit> ResaveAllAsDiffCommand { get; }
+
+    public ReactiveCommand<DataItemNode, Unit> ResaveAsFile { get; }
+    public ReactiveCommand<DataItemNode, Unit> ResaveAsPatch { get; }
+
+    public DataRootNode(NodeFactory nodeFactory, IDialogService dialogService, string dataType, string editorKey, string title, string? icon = null)
+        : base(title, icon ?? "", editorKey)
+    {
+        _nodeFactory = nodeFactory;
+        _dialogService = dialogService;
+        _dataType = dataType;
+        
+        AddCommand = ReactiveCommand.CreateFromTask(AddItemAsync);
+        DeleteCommand = ReactiveCommand.CreateFromTask<DataItemNode>(DeleteItemAsync);
+
+        ReIndexCommand = ReactiveCommand.CreateFromTask(ReIndexAsync);
+        ResaveAllAsFileCommand = ReactiveCommand.CreateFromTask(ResaveAllAsFileAsync);
+        ResaveAllAsDiffCommand = ReactiveCommand.CreateFromTask(ResaveAllAsDiffAsync);
+
+        ResaveAsFile = ReactiveCommand.CreateFromTask<DataItemNode>(ResaveItemAsFileAsync);
+        ResaveAsPatch = ReactiveCommand.CreateFromTask<DataItemNode>(ResaveItemAsPatchAsync);
+    }
+    private async Task AddItemAsync()
+    {
+        var vm = new RenameWindowViewModel();
+        bool result = await _dialogService.ShowDialogAsync<RenameWindowViewModel, bool>(vm, $"Add new {_dataType}");
+
+        if (!result)
+            return;
+
+        SubNodes.Add(_nodeFactory.CreateDataItemNode(vm.Name, "MonsterEditor", $"{vm.Name}:", "Icons.GhostFill"));
+        Console.WriteLine($"Added {_dataType} item: {vm.Name}");
+    }
+
+    private async Task DeleteItemAsync(DataItemNode? node)
+    {
+        if (node is null)
+            return;
+
+        var res = await MessageBoxWindowView.Show(
+            $"Deleting {node.ItemKey} will reset it back to the base game.",
+            $"Delete {node.ItemKey}",
+            MessageBoxWindowView.MessageBoxButtons.YesNo,
+            _dialogService,
+            true
+        );
+
+        if (res != MessageBoxWindowView.MessageBoxResult.Yes)
+            return;
+
+        SubNodes.Remove(node);
+        Console.WriteLine($"Deleted {node.Title} of type {_dataType}");
+    }
+
+    private async Task ReIndexAsync()
+    {
+        Console.WriteLine($"Reindexing {_dataType}...");
+        await Task.Delay(100);
+    }
+
+    private async Task ResaveAllAsFileAsync()
+    {
+        Console.WriteLine($"Resaving all {_dataType} as file...");
+        await Task.Delay(100);
+    }
+
+    private async Task ResaveAllAsDiffAsync()
+    {
+        Console.WriteLine($"Resaving all {_dataType} as diff...");
+        await Task.Delay(100);
+    }
+
+    private async Task ResaveItemAsFileAsync(DataItemNode node)
+    {
+        Console.WriteLine($"Resaving {node.Title} as file...");
+        await Task.Delay(100);
+    }
+
+    private async Task ResaveItemAsPatchAsync(DataItemNode node)
+    {
+        Console.WriteLine($"Resaving {node.Title} as patch...");
+        await Task.Delay(100);
+    }
+}
+
+
+
+public class DataItemNode : OpenEditorNode
+{
+    public string ItemKey { get; }
+    
+    private string _value = "";
+    public string Value 
+    {
+        get => _value;
+        set => this.RaiseAndSetIfChanged(ref _value, value);
+    }
+    
+    // private bool _editorKey = false;
+    // public bool EditorKey
+    // {
+    //     get => _editorKey;
+    //     set => this.RaiseAndSetIfChanged(ref _editorKey, value);
+    // }
+    
+    public DataItemNode(string itemKey, string editorKey, string? title, string? icon = null) 
+        : base(title ?? "", icon ?? "", editorKey)
+    {
+        ItemKey = itemKey;
+    }
+}
+
+public class SpriteRootNode : ItemRootNode
+{
+    private readonly string _dataType;
+    private readonly string _key;
+    private readonly NodeFactory _nodeFactory;
+    private readonly IDialogService _dialogService;
+
+    public override ReactiveCommand<Unit, Unit> AddCommand { get; }
+    public override ReactiveCommand<DataItemNode, Unit> DeleteCommand { get; }
+
+    public ReactiveCommand<Unit, Unit> MassExportCommand { get; }
+    public ReactiveCommand<Unit, Unit> MassImportCommand { get; }
+    public ReactiveCommand<DataItemNode, Unit> ExportCommand { get; }
+    public ReactiveCommand<DataItemNode, Unit> ImportCommand { get; }
+    public ReactiveCommand<DataItemNode, Unit> ReImportCommand { get; }
+
+    public SpriteRootNode(
+        IDialogService dialogService,
+        NodeFactory nodeFactory,
+        string dataType,
+        string editorKey,
+        string title,
+        string? icon = null)
+        : base(title, icon ?? "", editorKey)
+    {
+        _dataType = dataType;
+        _key = editorKey;
+        _dialogService = dialogService;
+        _nodeFactory = nodeFactory;
+
+        AddCommand = ReactiveCommand.CreateFromTask(AddSpriteAsync);
+        DeleteCommand = ReactiveCommand.CreateFromTask<DataItemNode>(DeleteSpriteAsync);
+        MassExportCommand = ReactiveCommand.CreateFromTask(MassExportAsync);
+        MassImportCommand = ReactiveCommand.CreateFromTask(MassImportAsync);
+        ExportCommand = ReactiveCommand.CreateFromTask<DataItemNode>(ExportSpriteAsync);
+        ImportCommand = ReactiveCommand.CreateFromTask<DataItemNode>(ImportSpriteAsync);
+        ReImportCommand = ReactiveCommand.CreateFromTask<DataItemNode>(ReImportSpriteAsync);
+    }
+    private async Task AddSpriteAsync()
+    {
+        var vm = new RenameWindowViewModel();
+        bool result = await _dialogService.ShowDialogAsync<RenameWindowViewModel, bool>(vm, "Add sprite ID");
+
+        if (!result)
+            return;
+
+        var node = _nodeFactory.CreateDataItemNode(vm.Name, "SpriteEditor", vm.Name + ":", "Icons.PaintBrushFill");
+        SubNodes.Add(node);
+
+        Console.WriteLine($"[SpriteRootNode] Added sprite: {vm.Name}");
+    }
+
+    private async Task DeleteSpriteAsync(DataItemNode node)
+    {
+        var res = await MessageBoxWindowView.Show(
+            $"Delete sprite '{node.Title}'?",
+            "Deleting Sprite",
+            MessageBoxWindowView.MessageBoxButtons.YesNo,
+            _dialogService, true);
+
+        if (res != MessageBoxWindowView.MessageBoxResult.Yes)
+            return;
+
+        SubNodes.Remove(node);
+        Console.WriteLine($"[SpriteRootNode] Deleted sprite: {node.Title}");
+    }
+
+    private async Task MassExportAsync()
+    {
+        var x = await _dialogService.ShowFolderPickerAsync(new FolderPickerOpenOptions( )
+        {
+            AllowMultiple = true,
+            Title = "Select a folder to mass export to"
+        });
+        Console.WriteLine("[SpriteRootNode] Mass export triggered (TODO: implement export logic).");
+        await Task.CompletedTask;
+    }
+
+    private async Task MassImportAsync()
+    {
+        Console.WriteLine("[SpriteRootNode] Mass import triggered (TODO: implement import logic).");
+        await Task.CompletedTask;
+    }
+
+    private async Task ExportSpriteAsync(DataItemNode node)
+    {
+        Console.WriteLine($"[SpriteRootNode] Exporting sprite: {node.Title}");
+        await Task.CompletedTask;
+    }
+
+    private async Task ImportSpriteAsync(DataItemNode node)
+    {
+        Console.WriteLine($"[SpriteRootNode] Importing sprite: {node.Title}");
+        await Task.CompletedTask;
+    }
+
+    private async Task ReImportSpriteAsync(DataItemNode node)
+    {
+        Console.WriteLine($"[SpriteRootNode] Re-importing sprite: {node.Title}");
+        await Task.CompletedTask;
+    }
+}
+
+
+// Used by TabSwitcher
+public class PageNode : NodeBase
+{
+    
+    private readonly NodeFactory _nodeFactory;
+    private readonly IDialogService _dialogService;
+    public EditorPageViewModel Page { get; }
+    public PageNode? Parent { get; set; }
+    public bool IsTopLevel => Parent == null;
+    
+    public PageNode(IDialogService dialogService, NodeFactory nodeFactory, EditorPageViewModel page, PageNode? parent = null)
+        : base(page.Title, page.Icon)
+    {
+        _dialogService = dialogService;
+        _nodeFactory = nodeFactory;
+        Page = page;
+        Parent = parent;
+    }
+    
+    public override string Title => Page.Title;
+    
+    public PageNode AddChild(EditorPageViewModel childPage)
+    {
+        var childNode = _nodeFactory.CreatePageNode(childPage, this);
+        SubNodes.Add(childNode);
+        return childNode;
+    }
+    
+    public void RemoveChild(PageNode childNode)
+    {
+        SubNodes.Remove(childNode);
+        childNode.Parent = null;
+    }
+}
+
+// public interface IItemCommands
+// {
+//     ReactiveCommand<Unit, Unit> AddCommand { get; }
+//     ReactiveCommand<DataItemNode, Unit> DeleteCommand { get; }
+// }
+
+// public class DefaultItemCommands : IItemCommands
+// {
+//     public ReactiveCommand<Unit, Unit> AddCommand { get; }
+//     public ReactiveCommand<Unit, Unit> DeleteCommand { get; }
+//
+//     public DefaultItemCommands(Action onAdd, Action onDelete)
+//     {
+//         // AddCommand = ReactiveCommand.CreateFromTask(onAdd);
+//         // DeleteCommand = ReactiveCommand.Create(onDelete);
+//     }
+// }
+//
+
+
+// public class DataRootItemCommands : IItemCommands
+// {
+//     public ReactiveCommand<Unit, Unit> AddCommand { get; }
+//     public ReactiveCommand<DataItemNode, Unit> DeleteCommand { get; }
+//     
+//     public DataRootItemCommands(ItemRootNode node)
+//     {
+//         AddCommand = ReactiveCommand.CreateFromTask(async () =>
+//         {
+//             Console.WriteLine($"[DATA] Adding {dataType}...");
+//             await Task.Delay(500); // simulate work
+//             Console.WriteLine($"[DATA] Done adding {dataType}");
+//         });
+//
+//         DeleteCommand = ReactiveCommand.CreateFromTask(async () =>
+//         {
+//             Console.WriteLine($"[DATA] Deleting {dataType}...");
+//             await Task.Delay(500);
+//             Console.WriteLine($"[DATA] Done deleting {dataType}");
+//         });
+//     }
+//
+// }
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/TabSwitcherViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/TabSwitcherViewModel.cs
new file mode 100644
index 00000000..dc753918
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/TabSwitcherViewModel.cs
@@ -0,0 +1,103 @@
+using System;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Reactive;
+using System.Text.RegularExpressions;
+using Avalonia.Media;
+using DynamicData;
+using ReactiveUI;
+using RogueEssence.Dev.Utility;
+
+namespace RogueEssence.Dev.ViewModels;
+
+public class TabSwitcherViewModel: ViewModelBase
+{
+    public ObservableCollection<EditorPageViewModel> VisiblePages { get; } = new ObservableCollection<EditorPageViewModel>();
+    
+    private EditorPageViewModel? _selectedPage;
+
+    public EditorPageViewModel? SelectedPage
+    {
+        get => _selectedPage;
+        set => this.RaiseAndSetIfChanged(ref _selectedPage, value);
+    }
+
+    private readonly MainWindowViewModel _mainWindow;
+
+    private string _searchFilter = string.Empty;
+
+    public string SearchFilter
+    {
+        get => _searchFilter;
+        set { this.RaiseAndSetIfChanged(ref _searchFilter, value); }
+    }
+
+    
+    public TabSwitcherViewModel(MainWindowViewModel mainWindow)
+    {
+        _mainWindow = mainWindow;
+        UpdateVisiblePages(_searchFilter);
+        
+        VisiblePages = new ObservableCollection<EditorPageViewModel>(_mainWindow.Pages);
+        SelectedPage = _mainWindow.ActivePage;
+        this.WhenAnyValue(x => x.SearchFilter).Subscribe(UpdateVisiblePages);
+    }
+
+    public TabSwitcherViewModel() : this(new MainWindowViewModel()) {}
+    
+    public void ClearFilter()
+    {
+        SearchFilter = string.Empty;
+    }
+
+    
+    public void ToggleSearchMode()
+    {
+        _mainWindow.IsTreeView = !_mainWindow.IsTreeView;
+    }
+    
+    
+    public bool IsTreeView => _mainWindow.IsTreeView;
+
+    public void Switch()
+    {
+        _mainWindow.ActivePage = _selectedPage;
+        _mainWindow.CloseTabSwitcher();
+    }
+    
+    public ObservableCollection<PageNode> TopLevelPages 
+        => _mainWindow.TopLevelPages;
+    
+    // Do it for both the tab list and the tab tree view!
+    private void UpdateVisiblePages(string filter)
+    {
+        var strategy = new BeginningTitleFilterStrategy();
+        foreach (var node in _mainWindow.TopLevelPages)
+        {
+            NodeHelper.FilterRecursive(node, filter, strategy);
+        }
+        
+        UpdateVisiblePagesList(filter, strategy);
+    }
+    
+    public bool HasTemporaryTab()
+    {
+        return _mainWindow?.TemporaryTab != null;
+    }
+    
+    private void UpdateVisiblePagesList(string filter, ITitleFilterStrategy titleStrategy)
+    {
+        VisiblePages.Clear();
+
+        foreach (var page in _mainWindow.Pages)
+        {
+            if (titleStrategy.Matches(page.Title, filter))
+                VisiblePages.Add(page);
+        }
+        
+        SelectedPage = VisiblePages.Count > 0 ? VisiblePages[0] : null;
+    }
+    
+ 
+
+}
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/TestComboBoxViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/TestComboBoxViewModel.cs
new file mode 100644
index 00000000..5dc465b6
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/TestComboBoxViewModel.cs
@@ -0,0 +1,41 @@
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using ReactiveUI;
+
+namespace RogueEssence.Dev.ViewModels;
+
+public class TestComboBoxViewModel : ViewModelBase
+{
+    private ObservableCollection<string> _fruits = new ObservableCollection<string>
+    {
+        "Pineapple", "Banana", "Cherry", "Dragonfruit",
+        "Elderberry", "Fig", "Grapes", "Honeydew"
+    };
+    
+    public ObservableCollection<string> Fruits
+    {
+        get => _fruits;
+        set => this.RaiseAndSetIfChanged(ref _fruits, value);
+    }
+    
+    private string? _selectedFruit;
+    public string? SelectedFruit
+    {
+        get => _selectedFruit;
+        set => this.RaiseAndSetIfChanged(ref _selectedFruit, value);
+    }
+    
+     
+
+    public TestComboBoxViewModel()
+    {
+        Fruits = new ObservableCollection<string>
+        {
+            "Pineapple", "Banana", "Cherry", "Dragonfruit",
+            "Elderberry", "Fig", "Grapes", "Honeydew"
+        };
+    }
+        
+    
+    
+}
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/TreeSearchViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/TreeSearchViewModel.cs
new file mode 100644
index 00000000..0bb9d81f
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/TreeSearchViewModel.cs
@@ -0,0 +1,123 @@
+using System.Collections.ObjectModel;
+using System.Linq;
+using DynamicData;
+
+
+namespace RogueEssence.Dev.ViewModels;
+
+public class TreeSearchViewModel : ViewModelBase
+{
+    public ObservableCollection<NodeBase> Nodes { get; }
+    public ObservableCollection<NodeBase> SelectedNodes { get; }
+
+    public TreeSearchViewModel()
+    {
+        // SelectedNodes = new ObservableCollection<NodeBase>();
+        // Nodes = new ObservableCollection<NodeBase>
+        // {
+        //     new OpenEditorNode("Halcyon", "Icons.FloppyDiskBackFill")
+        //     {
+        //         SubNodes = new ObservableCollection<NodeBase>
+        //         {
+        //             new OpenEditorNode("Dev Control", "Icons.GameControllerFill", "DevControl"),
+        //             new OpenEditorNode("Zone Editor", "Icons.StairsFill", "ZoneEditor"),
+        //             new OpenEditorNode("Ground Editor", "Icons.MapTrifoldFill", "GroundEditor"),
+        //             new OpenEditorNode("Testing", "Icons.BedFill", "RandomInfo"),
+        //             new OpenEditorNode("Constants", "Icons.ListFill")
+        //             {
+        //                 SubNodes = new ObservableCollection<NodeBase>
+        //                 {
+        //                     new OpenEditorNode("Start Parameters", "Icons.ListFill"),
+        //                     new OpenEditorNode("Universal Events", "Icons.ListFill"),
+        //                     new OpenEditorNode("Strings", "Icons.TableFill")
+        //                     {
+        //                         SubNodes = new ObservableCollection<NodeBase>
+        //                         {
+        //                             new OpenEditorNode("English", "Icons.TableFill"),
+        //                             new OpenEditorNode("Chinese", "Icons.TableFill")
+        //                         }
+        //                     },
+        //                     new OpenEditorNode("Effects", "Icons.SparkleFill")
+        //                     {
+        //                         SubNodes = new ObservableCollection<NodeBase>
+        //                         {
+        //                             new OpenEditorNode("Heal FX", "Icons.SparkleFill"),
+        //                             new OpenEditorNode("+Charge FX", "Icons.SparkleFill"),
+        //                         }
+        //                     },
+        //                 }
+        //             },
+        //             new OpenEditorNode("Data", "Icons.FloppyDiskFill")
+        //             {
+        //                 SubNodes =
+        //                 {
+        //                     new DataRootNode("Monsters", "Monsters", "Monsters", "Icons.GhostFill")
+        //                     {
+        //                         SubNodes =
+        //                         {
+        //                             // TODO: Change later
+        //                             new DataItemNode("eevee", "MonsterEditor", "eevee: Eevee", "Icons.GhostFill"),
+        //                             new DataItemNode("seviper", "MonsterEditor", "seviper: Seviper", "Icons.GhostFill")
+        //                         }
+        //                     },
+        //                     new ActionDataNode("Items", "Icons.JarLabelFill")
+        //                     {
+        //                         SubNodes = new ObservableCollection<NodeBase>
+        //                         {
+        //                             new NodeBase("ammo_cacnea_spike: Ammo Cacnea Spike", "Icons.JarLabelFill"),
+        //                         }
+        //                     },
+        //                     new ActionDataNode("Zones", "Icons.StairsFill")
+        //                     {
+        //                         SubNodes = new ObservableCollection<NodeBase>
+        //                         {
+        //                             new NodeBase("ambush_forest: Ambush Forest", "Icons.StairsFill"),
+        //                         }
+        //                     },
+        //                     new ActionDataNode("Statuses", "Icons.HeartFill")
+        //                     {
+        //                         SubNodes = new ObservableCollection<NodeBase>
+        //                         {
+        //                             new NodeBase("para: Paralyzed", "Icons.HeartFill"),
+        //                         }
+        //                     },
+        //                 }
+        //             },
+        //             new NodeBase("Sprites", "Icons.PaintBrushFill")
+        //             {
+        //                 SubNodes = new ObservableCollection<NodeBase>
+        //                 {
+        //                     new NodeBase("Char Sprites", "Icons.GhostFill"),
+        //                     new NodeBase("Portraits", "Icons.ImagesSquareFill"),
+        //                     new ActionDataNode("Particles", "Icons.ShootingStarFill")
+        //                     {
+        //                         SubNodes = new ObservableCollection<NodeBase>
+        //                         {
+        //                             new NodeBase("Absorb", "Icons.ShootingStarFill"),
+        //                             new NodeBase("Acid_Blue", "Icons.ShootingStarFill"),
+        //                         }
+        //                     },
+        //                     new ActionDataNode("Beam", "Icons.HeadlightsFill")
+        //                     {
+        //                         SubNodes = new ObservableCollection<NodeBase>
+        //                         {
+        //                             new NodeBase("Beam_2", "Icons.HeadlightsFill"),
+        //                             new NodeBase("Beam_Pink", "Icons.HeadlightsFill"),
+        //                         }
+        //                     },
+        //                 }
+        //             },
+        //             new NodeBase("Mods", "Icons.SwordFill")
+        //             {
+        //                 SubNodes = new ObservableCollection<NodeBase>
+        //                 {
+        //                     new NodeBase("halcyon: Halcyon", "Icons.SwordFill"),
+        //                     new NodeBase("zorea_mystery_dungeon: Zorea Mystery Dungeon", "Icons.SwordFill"),
+        //                 }
+        //             }
+        //         }
+        //     },
+        // };
+        // Nodes.First().IsExpanded = true;
+    }
+}
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/ViewModelBase.cs b/RogueEssence.Editor.Avalonia/ViewModels/ViewModelBase.cs
index a848277d..1438964b 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/ViewModelBase.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/ViewModelBase.cs
@@ -3,7 +3,7 @@
 using System.Text;
 using ReactiveUI;
 
-namespace RogueEssence.Dev.ViewModels
+namespace RogueEssence.Dev
 {
     public class ViewModelBase : ReactiveObject
     {
diff --git a/RogueEssence.Editor.Avalonia/Views/New/CaptionButtons.axaml b/RogueEssence.Editor.Avalonia/Views/New/CaptionButtons.axaml
new file mode 100644
index 00000000..3e16916a
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/Views/New/CaptionButtons.axaml
@@ -0,0 +1,19 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:Class="RogueEssence.Dev.Views.CaptionButtons"
+             x:Name="ThisControl">
+  <StackPanel Orientation="Horizontal">
+    <Button Classes="caption_button" Click="MinimizeWindow" IsVisible="{Binding !#ThisControl.IsCloseButtonOnly}">
+      <Path Width="11" Height="11" Margin="0,2,0,0" Data="{StaticResource Icons.Window.Minimize}"/>
+    </Button>
+    <Button Classes="caption_button max_or_restore_btn" Click="MaximizeOrRestoreWindow" IsVisible="{Binding !#ThisControl.IsCloseButtonOnly}">
+      <Path Width="10" Height="10" Margin="0,4,0,0"/>
+    </Button>
+    <Button Classes="caption_button" Click="CloseWindow">
+      <Path Width="9" Height="9" Margin="0,4,2,0" Data="{StaticResource Icons.Window.Close}"/>
+    </Button>
+  </StackPanel>
+</UserControl>
diff --git a/RogueEssence.Editor.Avalonia/Views/New/CaptionButtons.axaml.cs b/RogueEssence.Editor.Avalonia/Views/New/CaptionButtons.axaml.cs
new file mode 100644
index 00000000..5b91cf30
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/Views/New/CaptionButtons.axaml.cs
@@ -0,0 +1,50 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+using Avalonia.VisualTree;
+
+namespace RogueEssence.Dev.Views
+{
+    public partial class CaptionButtons : UserControl
+    {
+        public static readonly StyledProperty<bool> IsCloseButtonOnlyProperty =
+            AvaloniaProperty.Register<CaptionButtons, bool>(nameof(IsCloseButtonOnly));
+
+        public bool IsCloseButtonOnly
+        {
+            get => GetValue(IsCloseButtonOnlyProperty);
+            set => SetValue(IsCloseButtonOnlyProperty, value);
+        }
+
+        public CaptionButtons()
+        {
+            InitializeComponent();
+        }
+
+        private void MinimizeWindow(object _, RoutedEventArgs e)
+        {
+            var window = this.FindAncestorOfType<Window>();
+            if (window != null)
+                window.WindowState = WindowState.Minimized;
+
+            e.Handled = true;
+        }
+
+        private void MaximizeOrRestoreWindow(object _, RoutedEventArgs e)
+        {
+            var window = this.FindAncestorOfType<Window>();
+            if (window != null)
+                window.WindowState = window.WindowState == WindowState.Maximized ? WindowState.Normal : WindowState.Maximized;
+
+            e.Handled = true;
+        }
+
+        private void CloseWindow(object _, RoutedEventArgs e)
+        {
+            var window = this.FindAncestorOfType<Window>();
+            window?.Close();
+
+            e.Handled = true;
+        }
+    }
+}
diff --git a/RogueEssence.Editor.Avalonia/Views/New/ChromelessWindow.cs b/RogueEssence.Editor.Avalonia/Views/New/ChromelessWindow.cs
new file mode 100644
index 00000000..ff6ca22d
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/Views/New/ChromelessWindow.cs
@@ -0,0 +1,92 @@
+using System;
+using Avalonia.Controls;
+using Avalonia.Controls.Primitives;
+using Avalonia.Input;
+
+namespace RogueEssence.Dev.Views;
+
+public class ChromelessWindow : Window
+    {
+        public bool UseSystemWindowFrame
+        {
+            get => Native.OS.UseSystemWindowFrame;
+        }
+
+        public bool CloseOnESC
+        {
+            get;
+            set;
+        } = false;
+
+        protected override Type StyleKeyOverride => typeof(Window);
+
+        public ChromelessWindow()
+        {
+            Focusable = true;
+            Native.OS.SetupForWindow(this);
+        }
+
+        public void BeginMoveWindow(object _, PointerPressedEventArgs e)
+        {
+            if (e.ClickCount == 1)
+                BeginMoveDrag(e);
+
+            e.Handled = true;
+        }
+
+        public void MaximizeOrRestoreWindow(object _, TappedEventArgs e)
+        {
+            if (WindowState == WindowState.Maximized)
+                WindowState = WindowState.Normal;
+            else
+                WindowState = WindowState.Maximized;
+
+            e.Handled = true;
+        }
+        
+        protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
+        {
+            base.OnApplyTemplate(e);
+
+            if (Classes.Contains("custom_window_frame") && CanResize)
+            {
+                string[] borderNames = [
+                    "PART_BorderTopLeft",
+                    "PART_BorderTop",
+                    "PART_BorderTopRight",
+                    "PART_BorderLeft",
+                    "PART_BorderRight",
+                    "PART_BorderBottomLeft",
+                    "PART_BorderBottom",
+                    "PART_BorderBottomRight",
+                ];
+
+                foreach (var name in borderNames)
+                {
+                    var border = e.NameScope.Find<Border>(name);
+                    if (border != null)
+                    {
+                        border.PointerPressed -= OnWindowBorderPointerPressed;
+                        border.PointerPressed += OnWindowBorderPointerPressed;
+                    }
+                }
+            }
+        }
+
+        protected override void OnKeyDown(KeyEventArgs e)
+        {
+            base.OnKeyDown(e);
+
+            if (e is { Handled: false, Key: Key.Escape, KeyModifiers: KeyModifiers.None } && CloseOnESC)
+            {
+                Close();
+                e.Handled = true;
+            }
+        }
+
+        private void OnWindowBorderPointerPressed(object sender, PointerPressedEventArgs e)
+        {
+            if (sender is Border { Tag: WindowEdge edge } && CanResize)
+                BeginResizeDrag(edge, e);
+        }
+    }
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Components/IconText.axaml b/RogueEssence.Editor.Avalonia/Views/New/Components/IconText.axaml
new file mode 100644
index 00000000..e01505cc
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/Views/New/Components/IconText.axaml
@@ -0,0 +1,27 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:v="clr-namespace:RogueEssence.Dev.Views"
+             x:Class="RogueEssence.Dev.Views.IconText">
+    
+    <Design.PreviewWith>
+        <Border Padding="20" Background="{DynamicResource PrimaryBackground}">
+            <StackPanel Spacing="20">
+                <v:IconText Text="Hi" Icon="Icons.GhostFill" IconSize="14"/>
+            </StackPanel>
+        </Border>
+    </Design.PreviewWith>
+    <Grid ColumnDefinitions="Auto, *">
+        <Path IsVisible="{Binding $parent[v:IconText].Icon, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"
+              Width="{Binding $parent[v:IconText].IconSize}"
+              Height="{Binding $parent[v:IconText].IconSize}"
+              Fill="{Binding #MyTextBlock.Foreground}"
+              Margin="0,0,6,0"
+              Data="{Binding $parent[v:IconText].Icon, Converter={StaticResource IconKeyConverter}}"/>
+        <TextBlock Grid.Column="1" VerticalAlignment="Center"
+                   x:Name="MyTextBlock"
+                   Text="{Binding $parent[v:IconText].Text}"
+                   TextTrimming="CharacterEllipsis"
+                   TextWrapping="NoWrap"
+                   ClipToBounds="True" />
+    </Grid>
+</UserControl>
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Components/IconText.axaml.cs b/RogueEssence.Editor.Avalonia/Views/New/Components/IconText.axaml.cs
new file mode 100644
index 00000000..9e543104
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/Views/New/Components/IconText.axaml.cs
@@ -0,0 +1,41 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+using Avalonia.Media;
+
+namespace RogueEssence.Dev.Views;
+
+public partial class IconText : UserControl
+{
+    public static readonly StyledProperty<string?> IconProperty =
+        AvaloniaProperty.Register<IconText, string?>(nameof(Icon));
+
+    public static readonly StyledProperty<string?> TextProperty =
+        AvaloniaProperty.Register<IconText, string?>(nameof(Text));
+
+    public static readonly StyledProperty<double> IconSizeProperty =
+        AvaloniaProperty.Register<IconText, double>(nameof(IconSize), 12.0);
+
+    public string? Icon
+    {
+        get => GetValue(IconProperty);
+        set => SetValue(IconProperty, value);
+    }
+
+    public string? Text
+    {
+        get => GetValue(TextProperty);
+        set => SetValue(TextProperty, value);
+    }
+
+    public double IconSize
+    {
+        get => GetValue(IconSizeProperty);
+        set => SetValue(IconSizeProperty, value);
+    }
+
+    public IconText()
+    {
+        InitializeComponent();
+    }
+}
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/MessageBoxWindowView.axaml b/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/MessageBoxWindowView.axaml
new file mode 100644
index 00000000..92627ad1
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/MessageBoxWindowView.axaml
@@ -0,0 +1,57 @@
+<v:ChromelessWindow xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:vm="using:RogueEssence.Dev.ViewModels"
+                    x:Class="RogueEssence.Dev.Views.MessageBoxWindowView"
+                    x:DataType="vm:MessageBoxWindowViewModel"
+                    xmlns:v="using:RogueEssence.Dev.Views"
+                    CanResize="False"
+                    MaxWidth="400"
+                    MinWidth="300"
+                    x:Name="ThisControl"
+                    SizeToContent="WidthAndHeight">
+
+    <Grid RowDefinitions="Auto,*">
+        <!-- TitleBar -->
+        <Grid Grid.Row="0" Height="28" IsVisible="{Binding !#ThisControl.UseSystemWindowFrame}">
+            <Border Background="{DynamicResource Brush.TitleBar}"
+                    BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border0}"
+                    PointerPressed="BeginMoveWindow" />
+
+            <Path Width="14" Height="14"
+                  Margin="10,0,0,0"
+                  HorizontalAlignment="Left"
+                  Data="{StaticResource Icons.SoftwareUpdate}"
+                  IsVisible="{OnPlatform True, macOS=False}" />
+
+            <TextBlock Classes="bold"
+                       Text="{Binding Title}"
+                       HorizontalAlignment="Center" VerticalAlignment="Center"
+                       IsHitTestVisible="False" />
+            
+            <v:CaptionButtons HorizontalAlignment="Right"
+                              IsCloseButtonOnly="True"
+                              IsVisible="{OnPlatform True, macOS=False}"/>
+            
+        </Grid>
+        
+        <StackPanel Grid.Row="1" Margin="16" Spacing="12">
+            <TextBlock Text="{Binding Text}" TextWrapping="Wrap" />
+            <ItemsControl ItemsSource="{Binding Buttons}">
+                <ItemsControl.ItemsPanel>
+                    <ItemsPanelTemplate>
+                        <UniformGrid Columns="{Binding Buttons.Count}" ColumnSpacing="8"/>
+                    </ItemsPanelTemplate>
+                </ItemsControl.ItemsPanel>
+                <ItemsControl.ItemTemplate>
+                    <DataTemplate>
+                        <Button Classes="flat" Classes.primary="{Binding IsPrimary}" Classes.danger="{Binding Danger}" Content="{Binding Caption}"
+                                Command="{Binding Command}" />
+                    </DataTemplate>
+                </ItemsControl.ItemTemplate>
+            </ItemsControl>
+
+        </StackPanel>
+    </Grid>
+
+
+</v:ChromelessWindow>
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/MessageBoxWindowView.axaml.cs b/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/MessageBoxWindowView.axaml.cs
new file mode 100644
index 00000000..6b8df50c
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/MessageBoxWindowView.axaml.cs
@@ -0,0 +1,73 @@
+using System.Linq;
+using System.Threading.Tasks;
+using Avalonia.Controls;
+using Avalonia.Controls.ApplicationLifetimes;
+using RogueEssence.Dev.Services;
+using RogueEssence.Dev.ViewModels;
+
+namespace RogueEssence.Dev.Views
+{
+    public partial class MessageBoxWindowView : ChromelessWindow
+    {
+        public enum MessageBoxButtons
+        {
+            Ok,
+            OkCancel,
+            YesNo,
+            YesNoCancel
+        }
+
+        public enum MessageBoxResult
+        {
+            Ok,
+            Cancel,
+            Yes,
+            No
+        }
+
+        public MessageBoxWindowView()
+        {
+            InitializeComponent();
+        }
+
+        public static async Task<MessageBoxResult> Show(
+            string text,
+            string title,
+            MessageBoxButtons buttons,
+            IDialogService dialogService, 
+            bool danger = false)
+        {
+            var vm = new MessageBoxWindowViewModel(title, text);
+
+            void AddButton(string caption, MessageBoxResult result, bool _danger = false)
+            {
+                vm.Buttons.Add(new MessageBoxWindowViewModel.ButtonViewModel(caption, result, vm, _danger));
+            }
+
+            switch (buttons)
+            {
+                case MessageBoxButtons.Ok:
+                    AddButton("Ok", MessageBoxResult.Ok, danger);
+                    break;
+                case MessageBoxButtons.OkCancel:
+                    AddButton("Cancel", MessageBoxResult.Cancel, false);
+                    AddButton("Ok", MessageBoxResult.Ok, danger);
+                    break;
+                case MessageBoxButtons.YesNo:
+                    AddButton("No", MessageBoxResult.No, false);
+                    AddButton("Yes", MessageBoxResult.Yes, danger);
+                    break;
+                case MessageBoxButtons.YesNoCancel:
+                    AddButton("No", MessageBoxResult.No, false);
+                    AddButton("Cancel", MessageBoxResult.Cancel, false);
+                    AddButton("Yes", MessageBoxResult.Yes, danger);
+                    break;
+            }
+            
+            vm.CloseRequested += (_, result) => dialogService.Close(vm, result);
+
+            var resultValue = await dialogService.ShowDialogAsync<MessageBoxWindowViewModel, MessageBoxResult>(vm, title);
+            return resultValue;
+        }
+    }
+}
diff --git a/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/PreferencesWindowView.axaml b/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/PreferencesWindowView.axaml
new file mode 100644
index 00000000..91693935
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/PreferencesWindowView.axaml
@@ -0,0 +1,84 @@
+<v:ChromelessWindow xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+                    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+                    xmlns:s="using:RogueEssence.Dev"
+                    xmlns:m="using:RogueEssence.Dev.Models"
+                    xmlns:c="using:RogueEssence.Dev.Converters"
+                    xmlns:vm="using:RogueEssence.Dev.ViewModels"
+                    xmlns:v="using:RogueEssence.Dev.Views"
+                    mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+                    x:Class="RogueEssence.Dev.Views.PreferencesWindowView"
+                    x:DataType="vm:PreferencesWindowViewModel"
+                    x:Name="ThisControl"
+                    Title="{DynamicResource Text.Preferences}"
+                    SizeToContent="WidthAndHeight"
+                    CanResize="False"
+                    WindowStartupLocation="CenterScreen">
+    <Grid RowDefinitions="Auto,Auto" MinWidth="600">
+        <!-- TitleBar -->
+        <Grid Grid.Row="0" Height="28" IsVisible="{Binding !#ThisControl.UseSystemWindowFrame}">
+            <Border Background="{DynamicResource Brush.TitleBar}"
+                    BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border0}"
+                    PointerPressed="BeginMoveWindow"/>
+
+            <Path Width="14" Height="14"
+                  Margin="10,0,0,0"
+                  HorizontalAlignment="Left"
+                  Data="{StaticResource Icons.Settings}"
+                  IsVisible="{OnPlatform True, macOS=False}"/>
+
+            <TextBlock Classes="bold"
+                       Text="{Binding #ThisControl.Title}"
+                       HorizontalAlignment="Center" VerticalAlignment="Center"
+                       IsHitTestVisible="False"/>
+
+            <v:CaptionButtons HorizontalAlignment="Right"
+                              IsCloseButtonOnly="True"
+                              IsVisible="{OnPlatform True, macOS=False}"/>
+        </Grid>
+        <Border Grid.Row="1" Padding="8">
+            <!-- <TabControl> -->
+            <!--     <TabItem> -->
+            <!--         <TabItem.Header> -->
+            <!--             <TextBlock Classes="tab_header">Settings</TextBlock> -->
+            <!--         </TabItem.Header> -->
+            <Grid Margin="8" RowDefinitions="32,32" ColumnDefinitions="Auto,*">
+                <TextBlock Grid.Row="0" Grid.Column="0"
+                           Text="Theme"
+                           HorizontalAlignment="Right"
+                           VerticalAlignment="Center"
+                           Margin="0,0,16,0"/>
+                <ComboBox Grid.Row="0" Grid.Column="1"
+                          MinHeight="28"
+                          Padding="8,0"
+                          HorizontalAlignment="Stretch"
+                          DisplayMemberBinding="{Binding Key, x:DataType=ThemeVariant}"
+                          SelectedItem="{Binding Theme, Mode=TwoWay, Converter={x:Static c:StringConverters.ToTheme}}">
+                    <ComboBox.Items>
+                        <ThemeVariant>Default</ThemeVariant>
+                        <ThemeVariant>Dark</ThemeVariant>
+                        <ThemeVariant>Light</ThemeVariant>
+                    </ComboBox.Items>
+                </ComboBox>
+                
+                <TextBlock Grid.Row="1" Grid.Column="0"
+                           Text="Language"
+                           HorizontalAlignment="Right"
+                           VerticalAlignment="Center"
+                           Margin="0,0,16,0"/>
+                <ComboBox Grid.Row="1" Grid.Column="1"
+                          MinHeight="28"
+                          Padding="8,0"
+                          HorizontalAlignment="Stretch"
+                          ItemsSource="{Binding Source={x:Static m:Locale.Supported}}"
+                          DisplayMemberBinding="{Binding Name, x:DataType=m:Locale}"
+                          SelectedItem="{Binding Locale, Mode=TwoWay, Converter={x:Static c:StringConverters.ToLocale}}"/>
+
+            </Grid>
+            <!--     </TabItem> -->
+            <!-- </TabControl> -->
+        </Border>
+    </Grid>
+
+</v:ChromelessWindow>
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/PreferencesWindowView.axaml.cs b/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/PreferencesWindowView.axaml.cs
new file mode 100644
index 00000000..0b1df342
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/PreferencesWindowView.axaml.cs
@@ -0,0 +1,28 @@
+using System;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace RogueEssence.Dev.Views;
+
+public partial class PreferencesWindowView: ChromelessWindow
+{
+    public PreferencesWindowView()
+    {
+        var pref = ViewModels.PreferencesWindowViewModel.Instance;
+        DataContext = pref;
+        CloseOnESC = true;
+        InitializeComponent();
+    }
+    
+    protected override void OnClosing(WindowClosingEventArgs e)
+    {
+        base.OnClosing(e);
+
+        if (Design.IsDesignMode)
+            return;
+
+        ViewModels.PreferencesWindowViewModel.Instance.Save();
+    }
+
+}
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/RenameWindowView.axaml b/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/RenameWindowView.axaml
new file mode 100644
index 00000000..f5285cb8
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/RenameWindowView.axaml
@@ -0,0 +1,52 @@
+<v:ChromelessWindow xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:vm="using:RogueEssence.Dev.ViewModels"
+                    x:Class="RogueEssence.Dev.Views.RenameWindowView"
+                    xmlns:v="using:RogueEssence.Dev.Views"
+                    x:DataType="vm:RenameWindowViewModel"
+                    CanResize="False"
+                    Width="500"
+                    MaxWidth="350"
+                    Height="120"
+                    x:Name="ThisControl">
+
+    <Grid RowDefinitions="Auto,*">
+        <!-- TitleBar -->
+        <Grid Grid.Row="0" Height="28" IsVisible="{Binding !#ThisControl.UseSystemWindowFrame}">
+            <Border Background="{DynamicResource Brush.TitleBar}"
+                    BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border0}"
+                    PointerPressed="BeginMoveWindow" />
+
+            <Path Width="14" Height="14"
+                  Margin="10,0,0,0"
+                  HorizontalAlignment="Left"
+                  Data="{StaticResource Icons.SoftwareUpdate}"
+                  IsVisible="{OnPlatform True, macOS=False}" />
+
+            <TextBlock Classes="bold"
+                       x:Name="TitleText"
+                       Text="{Binding #ThisControl.Title}"
+                       HorizontalAlignment="Center" VerticalAlignment="Center"
+                       IsHitTestVisible="False" />
+            
+            <v:CaptionButtons HorizontalAlignment="Right"
+                              IsCloseButtonOnly="True"
+                              IsVisible="{OnPlatform True, macOS=False}"/>
+            
+        </Grid>
+        
+        <Grid Grid.Row="1" Margin="4" >
+            <Grid.RowDefinitions>
+                <RowDefinition Height="42"/>
+                <RowDefinition Height="42"/>
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition/>
+                <ColumnDefinition/>
+            </Grid.ColumnDefinitions>
+            <TextBox Text="{Binding Name}" VerticalAlignment="Center" Margin="4" Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2"/>
+            <Button Classes="flat" HorizontalContentAlignment="Center" Click="btnCancel_Click" Margin="4" Grid.Row="1" Grid.Column="0">Cancel</Button>
+            <Button Classes="flat primary"  Click="btnOK_Click" Margin="4" Grid.Row="1" Grid.Column="1">OK</Button>
+        </Grid>
+    </Grid>
+</v:ChromelessWindow>
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/RenameWindowView.axaml.cs b/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/RenameWindowView.axaml.cs
new file mode 100644
index 00000000..499a0596
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/RenameWindowView.axaml.cs
@@ -0,0 +1,27 @@
+using System;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+using Avalonia.Markup.Xaml;
+
+namespace RogueEssence.Dev.Views
+{
+    public partial class RenameWindowView: ChromelessWindow
+    {
+        public RenameWindowView()
+        {
+            this.InitializeComponent();
+        }
+
+        public void btnOK_Click(object sender, RoutedEventArgs e)
+        {
+            this.Close(true);
+        }
+
+
+        public void btnCancel_Click(object sender, RoutedEventArgs e)
+        {
+            this.Close(false);
+        }
+    }
+}
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/DevControlView.axaml b/RogueEssence.Editor.Avalonia/Views/New/Editors/DevControlView.axaml
new file mode 100644
index 00000000..2b8524de
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/Views/New/Editors/DevControlView.axaml
@@ -0,0 +1,218 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:vm="using:RogueEssence.Dev.ViewModels"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             FontSize="12"
+             x:DataType="vm:DevControlViewModel"
+             x:Class="RogueEssence.Dev.Views.DevControlView">
+    
+    
+    <UserControl.DataContext>
+        <vm:DevControlViewModel/>
+    </UserControl.DataContext>
+    <!-- The Game/Player/Travel/Script Tabs will be moved inside here... -->
+
+    
+    <!-- <Style Selector="Button.flat"> -->
+    <!--     <Setter Property="BorderThickness" Value="1" /> -->
+    <!--     <Setter Property="BorderBrush" Value="{DynamicResource Brush.Border2}" /> -->
+    <!--     <Setter Property="TextBlock.TextAlignment" Value="Center" /> -->
+    <!--     <Setter Property="Foreground" Value="{DynamicResource Brush.FG1}" /> -->
+    <!--     <Setter Property="Background" Value="{DynamicResource Brush.FlatButton.Background}" /> -->
+    <!--     <Setter Property="VerticalContentAlignment" Value="Center" /> -->
+    <!--     <Setter Property="Template"> -->
+    <!--         <ControlTemplate> -->
+    <!--             <Grid> -->
+    <!--                 <Border x:Name="PART_Border" -->
+    <!--                         Background="{TemplateBinding Background}" -->
+    <!--                         BorderBrush="{TemplateBinding BorderBrush}" -->
+    <!--                         BorderThickness="{TemplateBinding BorderThickness}" -->
+    <!--                         CornerRadius="{TemplateBinding CornerRadius}" /> -->
+    <!-- -->
+    <!--                 <ContentPresenter x:Name="PART_ContentPresenter" -->
+    <!--                                   Background="Transparent" -->
+    <!--                                   Padding="{TemplateBinding Padding}" -->
+    <!--                                   Content="{TemplateBinding Content}" -->
+    <!--                                   ContentTemplate="{TemplateBinding ContentTemplate}" -->
+    <!--                                   HorizontalContentAlignment="Center" -->
+    <!--                                   VerticalContentAlignment="Center" /> -->
+    <!--                  -->
+                    
+    <UserControl.Styles>
+        <Style Selector="Button">
+            <Setter Property="Padding" Value="10"></Setter>
+            <Setter Property="HorizontalAlignment" Value="Stretch"></Setter>
+            <Setter Property="HorizontalContentAlignment" Value="Center"></Setter>
+        </Style>
+        <Style Selector="ComboBox">
+            <Setter Property="Padding" Value="8"></Setter>
+            <!-- <Setter Property="Foreground" Value="Red" />  -->
+            <!-- <Setter Property="Background" Value="Red" /> -->
+        </Style>
+        
+        <!-- -->
+        <!-- <Style Selector="TabControl /template/ ContentPresenter#PART_SelectedContentHost"> -->
+        <!--     <Setter Property="Margin" Value="2"/> -->
+        <!-- </Style> -->
+    </UserControl.Styles>
+
+ 
+    <Border>
+        
+        <TabControl>
+            <TabItem Header="Game">
+                <Grid ColumnSpacing="8" RowSpacing="8" RowDefinitions="Auto, Auto, Auto, Auto, Auto, Auto, Auto, Auto, Auto, Auto"
+                      ColumnDefinitions="* *">
+                    <CheckBox Grid.Row="0" Grid.Column="0" Content="Hide Objects"></CheckBox>
+                    <CheckBox Grid.Row="0" Grid.Column="1" Content="Hide Sprites"></CheckBox>
+                    <Button Classes="flat" HorizontalAlignment="Stretch" HorizontalContentAlignment="Center" Name="btnSpawnClone"
+                            Grid.Row="1" Grid.Column="0" Content="Create Clone">
+                
+                    </Button>
+                    <Button Classes="flat" HorizontalAlignment="Stretch" HorizontalContentAlignment="Center" Name="btnDespawnAll"
+                            Grid.Row="1" Grid.Column="1" Content="Clear All Foes">
+                        
+                    </Button>
+                    
+                    <ComboBox HorizontalAlignment="Stretch" 
+                              Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2"
+                              ItemsSource="{Binding Fruits}" >
+                              <ComboBox.ItemTemplate>
+                                  <DataTemplate>
+                                      <StackPanel Orientation="Horizontal">
+                                          <TextBlock Text="{Binding .}"></TextBlock>
+                                      </StackPanel>
+                                  </DataTemplate>
+                              </ComboBox.ItemTemplate>
+                        </ComboBox>
+                    
+                    <Button Classes="flat" HorizontalAlignment="Stretch" HorizontalContentAlignment="Center"
+                            Grid.Row="3" Grid.Column="0" Content="Learn Skill">
+
+                     
+                    </Button>
+                    
+                    <Button Classes="flat" HorizontalAlignment="Stretch" HorizontalContentAlignment="Center"
+                            Grid.Row="3" Grid.Column="1" Content="Teach Foes">
+                        
+                    </Button>
+                    
+                    <ComboBox ItemsSource="{Binding Fruits.Fruits}" HorizontalAlignment="Stretch" Grid.Row="4" Grid.Column="0" Grid.ColumnSpan="2"/>
+                       
+                    
+                    <Button Classes="flat" HorizontalAlignment="Stretch" HorizontalContentAlignment="Center"
+                            Grid.Row="5" Grid.Column="0" Content="Set Intrinsic">
+                        
+                    </Button>
+                    
+                    <Button Classes="flat"
+                            Grid.Row="5" Grid.Column="1" Content="Give Foes">
+                        
+                    </Button>
+                    
+                    
+                    <ComboBox  ItemsSource="{Binding Fruits}" HorizontalAlignment="Stretch" Grid.Row="6" Grid.Column="0" Grid.ColumnSpan="2"/>
+                       
+                    
+                    <Button Classes="flat" HorizontalAlignment="Stretch" HorizontalContentAlignment="Center"
+                            Grid.Row="7" Grid.Column="0"  Grid.ColumnSpan="2" Content="Toggle Status">
+                        
+                    </Button>
+                    
+                     
+                    <ComboBox ItemsSource="{Binding Fruits}" HorizontalAlignment="Stretch" Grid.Row="8" Grid.Column="0" Grid.ColumnSpan="2"/>
+                        
+                 
+                    
+                    <Button Classes="flat" HorizontalAlignment="Stretch" HorizontalContentAlignment="Center"
+                            Grid.Row="9" Grid.Column="0"  Grid.ColumnSpan="2" Content="Create Item">
+                        
+                    </Button>
+
+                    
+                   
+
+                    <!-- <Button Name="btnLearnSkill" Command="{Binding btnLearnSkill_Click}" Margin="4" Grid.Row="3" Grid.Column="0">Learn Skill</Button> -->
+                    <!-- <Button Name="btnGiveSkill" Command="{Binding btnGiveSkill_Click}" Margin="4" Grid.Row="3" Grid.Column="1">Teach Foes</Button> -->
+                    <!-- <views:SearchComboBox Name="cbIntrinsics" Items="{Binding Intrinsics}" SelectedIndex="{Binding ChosenIntrinsic}" VirtualizationMode="Simple" Margin="4" Grid.Row="4" Grid.Column="0" Grid.ColumnSpan="2"/> -->
+                    <!-- <Button Name="btnSetIntrinsic" Command="{Binding btnSetIntrinsic_Click}" Margin="4" Grid.Row="5" Grid.Column="0">Set Intrinsic</Button> -->
+                    <!-- <Button Name="btnGiveFoes" Command="{Binding btnGiveFoes_Click}" Margin="4" Grid.Row="5" Grid.Column="1">Give Foes</Button> -->
+                    <!-- <views:SearchComboBox Name="cbStatus" Items="{Binding Statuses}" SelectedIndex="{Binding ChosenStatus}" VirtualizationMode="Simple" Margin="4" Grid.Row="6" Grid.Column="0" Grid.ColumnSpan="2"/> -->
+                    <!-- <Button Name="btnToggleStatus" Command="{Binding btnToggleStatus_Click}" Margin="4" Grid.Row="7" Grid.Column="0" Grid.ColumnSpan="2">Toggle Status</Button> -->
+                    <!-- <views:SearchComboBox Name="cbSpawnItem" Items="{Binding Items}" SelectedIndex="{Binding ChosenItem}" VirtualizationMode="Simple" Margin="4" Grid.Row="8" Grid.Column="0" Grid.ColumnSpan="2"/> -->
+                    <!-- <Button Name="btnSpawnItem" Command="{Binding btnSpawnItem_Click}" Margin="4" Grid.Row="10" Grid.ColumnSpan="2">Create Item</Button> -->
+                </Grid>
+
+            </TabItem>
+            <TabItem Header="Player">
+                <Grid RowDefinitions="30, Auto, 30, Auto, 30, Auto, 30, Auto, 30, Auto, Auto, Auto" ColumnDefinitions="*, *" ColumnSpacing="8">
+                    <TextBlock Margin="4,0" VerticalAlignment="Bottom" Grid.Row="0" Grid.Column="0">Lv.</TextBlock>
+                    <NumericUpDown MinHeight="40" Name="nudLevel" Value="20" Minimum="1" Increment="1" Maximum="100" Grid.Row="1" Grid.Column="0"/>
+                    <Button Classes="flat"  Name="btnRollSkill" Margin="4" Grid.Row="1" Grid.Column="1">Reroll Skills</Button>
+                    <!-- <Button Name="btnRollSkill" Command="{Binding btnRollSkill_Click}" Margin="4" Grid.Row="1" Grid.Column="1">Reroll Skills</Button> -->
+                    <TextBlock VerticalAlignment="Bottom" Grid.Row="2" Grid.Column="0">Species</TextBlock>
+                    <Grid Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2" ColumnDefinitions="*, Auto" ColumnSpacing="4">
+                 
+                         
+                         
+                         
+                    <!-- <views:SearchComboBox Name="cbDexNum" Items="{Binding Monsters}" SelectedIndex="{Binding ChosenMonster}" VirtualizationMode="Simple" Margin="4"/> -->
+                    <ComboBox ItemsSource="{Binding Fruits}" HorizontalAlignment="Stretch"/>
+                      
+                    <Button HorizontalAlignment="Stretch" HorizontalContentAlignment="Center" Classes="icon_button" Height="20" Width="20" Name="btnChangeOrder" Grid.Column="1" ToolTip.Tip="Switch Ordering">
+                         <!-- <Panel> -->
+                         <!--   <Image Source="/Assets/AssetOrder.png" Width="26" -->
+                         <!--                   Height="26" VerticalAlignment="Center" HorizontalAlignment="Center" /> -->
+                         <!-- </Panel> -->
+                         <Path
+                             Width="20" Height="20"
+                             Margin="0,1,0,0"
+                             Data="{StaticResource Icons.ListNumbersFill}" />
+                    </Button>
+              
+                    </Grid>
+                    
+                    <TextBlock VerticalAlignment="Bottom" Grid.Row="4">Form</TextBlock>
+                    <ComboBox ItemsSource="{Binding Fruits}" HorizontalAlignment="Stretch" Grid.Row="5" Grid.ColumnSpan="2"/>
+                        
+                    <TextBlock  VerticalAlignment="Bottom" Grid.Row="6" Grid.Column="0">Skin</TextBlock>
+                    <TextBlock  VerticalAlignment="Bottom" Grid.Row="6" Grid.Column="1">Gender</TextBlock>
+                    <ComboBox  ItemsSource="{Binding Fruits}" HorizontalAlignment="Stretch" Grid.Row="7" Grid.Column="0"/>
+                       
+                    <ComboBox ItemsSource="{Binding Fruits}" HorizontalAlignment="Stretch" Grid.Row="7" Grid.Column="1"/>
+                      
+                    
+                    <TextBlock VerticalAlignment="Bottom" Grid.Row="8" Grid.Column="0">Animation</TextBlock>
+                    
+                    <ComboBox ItemsSource="{Binding Fruits}" HorizontalAlignment="Stretch" Grid.Row="9" Grid.Column="0" Grid.ColumnSpan="2"/>
+                        
+                    
+                    <CheckBox Name="chkJustMe" VerticalAlignment="Center" Grid.Row="10" Grid.Column="0">Just Me</CheckBox>
+                    <CheckBox Name="chkJustOnce" VerticalAlignment="Center" Grid.Row="10" Grid.Column="1">Just Once</CheckBox>
+                    <Button Classes="flat"  Name="btnResetAnim" Grid.Row="11" Grid.Column="0" Grid.ColumnSpan="2">Restart All Anims</Button>
+                   
+                    </Grid>
+            </TabItem>
+            <TabItem Header="Travel">
+                <TextBlock>
+                    Travel Tab
+                </TextBlock>
+            </TabItem>
+            <TabItem Header="Script">
+              
+                    <Grid RowDefinitions="34, 26, Auto, 40" ColumnDefinitions="*, *" ColumnSpacing="8" RowSpacing="8">
+                  
+                        <Button Classes="flat" Name="btnReloadScripts"  Grid.Row="0" Grid.Column="0" >Reload Scripts</Button>
+                        <Button  Classes="flat" Name="btnTextTest"  Grid.Row="0" Grid.Column="1" >Text Test</Button>
+                        <TextBlock VerticalAlignment="Bottom" Grid.Row="1" Grid.Column="0">Lua Console:</TextBlock>
+                        <TextBox Name="txtScriptOutput" Height="300"  IsReadOnly="True" Grid.Row="2" Grid.ColumnSpan="2"/>
+                        <TextBox Name="txtScriptInput" Grid.Row="3" Grid.ColumnSpan="2"></TextBox>
+                    </Grid>
+                
+            </TabItem>
+
+        </TabControl>
+    </Border>
+</UserControl>
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/DevControlView.axaml.cs b/RogueEssence.Editor.Avalonia/Views/New/Editors/DevControlView.axaml.cs
new file mode 100644
index 00000000..ad91f432
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/Views/New/Editors/DevControlView.axaml.cs
@@ -0,0 +1,13 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace RogueEssence.Dev.Views;
+
+public partial class DevControlView : UserControl
+{
+    public DevControlView()
+    {
+        InitializeComponent();
+    }
+}
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/GroundEditorPageView.axaml b/RogueEssence.Editor.Avalonia/Views/New/Editors/GroundEditorPageView.axaml
new file mode 100644
index 00000000..4487dd33
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/Views/New/Editors/GroundEditorPageView.axaml
@@ -0,0 +1,10 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:vm="using:RogueEssence.Dev.ViewModels"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:DataType="vm:GroundEditorPageViewModel"
+             x:Class="RogueEssence.Dev.Views.GroundEditorPageView">
+    Welcome to the GroundEditor
+</UserControl>
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/GroundEditorPageView.axaml.cs b/RogueEssence.Editor.Avalonia/Views/New/Editors/GroundEditorPageView.axaml.cs
new file mode 100644
index 00000000..b40dad9b
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/Views/New/Editors/GroundEditorPageView.axaml.cs
@@ -0,0 +1,13 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace RogueEssence.Dev.Views;
+
+public partial class GroundEditorPageView : UserControl
+{
+    public GroundEditorPageView()
+    {
+        InitializeComponent();
+    }
+}
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/ModInfoEditorView.axaml b/RogueEssence.Editor.Avalonia/Views/New/Editors/ModInfoEditorView.axaml
new file mode 100644
index 00000000..649dc078
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/Views/New/Editors/ModInfoEditorView.axaml
@@ -0,0 +1,10 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:vm="using:RogueEssence.Dev.ViewModels"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:DataType="vm:ModInfoEditorViewModel"
+             x:Class="RogueEssence.Dev.Views.ModInfoEditorView">
+    Welcome to Avalonia!
+</UserControl>
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/ModInfoEditorView.axaml.cs b/RogueEssence.Editor.Avalonia/Views/New/Editors/ModInfoEditorView.axaml.cs
new file mode 100644
index 00000000..59bdd546
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/Views/New/Editors/ModInfoEditorView.axaml.cs
@@ -0,0 +1,13 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace RogueEssence.Dev.Views;
+
+public partial class ModInfoEditorView : UserControl
+{
+    public ModInfoEditorView()
+    {
+        InitializeComponent();
+    }
+}
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/RandomInfoPageView.axaml b/RogueEssence.Editor.Avalonia/Views/New/Editors/RandomInfoPageView.axaml
new file mode 100644
index 00000000..42228e33
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/Views/New/Editors/RandomInfoPageView.axaml
@@ -0,0 +1,10 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             xmlns:vm="using:RogueEssence.Dev.ViewModels"
+             x:DataType="vm:GroundEditorPageViewModel"
+             x:Class="RogueEssence.Dev.Views.RandomInfoPageView">
+   Some random page info! This shouldn't add any tabs!
+</UserControl>
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/RandomInfoPageView.axaml.cs b/RogueEssence.Editor.Avalonia/Views/New/Editors/RandomInfoPageView.axaml.cs
new file mode 100644
index 00000000..0da9606a
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/Views/New/Editors/RandomInfoPageView.axaml.cs
@@ -0,0 +1,13 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace RogueEssence.Dev.Views;
+
+public partial class RandomInfoPageView : UserControl
+{
+    public RandomInfoPageView()
+    {
+        InitializeComponent();
+    }
+}
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/SpritePageView.axaml b/RogueEssence.Editor.Avalonia/Views/New/Editors/SpritePageView.axaml
new file mode 100644
index 00000000..9d05728f
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/Views/New/Editors/SpritePageView.axaml
@@ -0,0 +1,19 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:vm="using:RogueEssence.Dev.ViewModels"
+             xmlns:v="using:RogueEssence.Dev.Views"
+             xmlns:views="clr-namespace:RogueEssence.Dev.Views"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:DataType="vm:SpritePageViewModel"
+             x:Class="RogueEssence.Dev.Views.SpritePageView">
+    <StackPanel>
+        <Button Command="{Binding CreateATab}" Content="Add a child tab to this one!"/>
+        <Button Command="{Binding CreateATopTab}" Content="Add a top level tab!"/>
+        <Button Command="{Binding  TestDialog}" Content="Test out a dialogue!"/>
+
+        <Button Command="{Binding  RemoveSelfTab}" Content="Close out this tab!"/>
+    </StackPanel>
+ 
+</UserControl>
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/SpritePageView.axaml.cs b/RogueEssence.Editor.Avalonia/Views/New/Editors/SpritePageView.axaml.cs
new file mode 100644
index 00000000..c00bac0d
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/Views/New/Editors/SpritePageView.axaml.cs
@@ -0,0 +1,13 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace RogueEssence.Dev.Views;
+
+public partial class SpritePageView : UserControl
+{
+    public SpritePageView()
+    {
+        InitializeComponent();
+    }
+}
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/ZoneEditorPageView.axaml b/RogueEssence.Editor.Avalonia/Views/New/Editors/ZoneEditorPageView.axaml
new file mode 100644
index 00000000..88e944ef
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/Views/New/Editors/ZoneEditorPageView.axaml
@@ -0,0 +1,10 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:vm="using:RogueEssence.Dev.ViewModels"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:DataType="vm:ZoneEditorPageViewModel"
+             x:Class="RogueEssence.Dev.Views.ZoneEditorPageView">
+    Welcome to ZoneEditor
+</UserControl>
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/ZoneEditorPageView.axaml.cs b/RogueEssence.Editor.Avalonia/Views/New/Editors/ZoneEditorPageView.axaml.cs
new file mode 100644
index 00000000..fb8765cc
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/Views/New/Editors/ZoneEditorPageView.axaml.cs
@@ -0,0 +1,13 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace RogueEssence.Dev.Views;
+
+public partial class ZoneEditorPageView : UserControl
+{
+    public ZoneEditorPageView()
+    {
+        InitializeComponent();
+    }
+}
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/New/MainWindow.axaml b/RogueEssence.Editor.Avalonia/Views/New/MainWindow.axaml
new file mode 100644
index 00000000..83e4ae80
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/Views/New/MainWindow.axaml
@@ -0,0 +1,186 @@
+<v:ChromelessWindow xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:vm="clr-namespace:RogueEssence.Dev.ViewModels"
+                    xmlns:v="clr-namespace:RogueEssence.Dev.Views"
+                    xmlns:c="clr-namespace:RogueEssence.Dev.Converters"
+                    xmlns:views="clr-namespace:RogueEssence.Dev.Views"
+                    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+                    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+                    mc:Ignorable="d"
+                    d:DesignWidth="1024"
+                    d:DesignHeight="450"
+                    x:Class="RogueEssence.Dev.Views.MainWindow"
+                    x:Name="WindowMain"
+                    Title="Avalonia PMD Editor">
+
+  <!-- <v:ChromelessWindow.DataContext> -->
+  <!--   <vm:MainWindowViewModel /> -->
+  <!-- </v:ChromelessWindow.DataContext> -->
+
+    <!-- x:DataType="vm:MainWindowViewModel" -->
+    <!-- Icon="/Assets/avalonia-logo.ico" -->
+    <!-- x:DataType="vm:MainWindowViewModel" -->
+    <!-- <Design.DataContext> -->
+        <!-- <vm:MainWindowViewModel /> -->
+    <!-- </Design.DataContext> -->
+    <Window.Resources>
+        <c:WindowStateToColumnConverter x:Key="WindowStateToColumnConverter" />
+
+    </Window.Resources>
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="{Binding #WindowMain.CaptionHeight}" />
+            <RowDefinition Height="*" />
+        </Grid.RowDefinitions>
+    
+        <!-- Top Bar -->
+        <Grid Grid.Row="0" ColumnDefinitions="Auto, Auto, *, Auto">
+            <Border Grid.Column="0" Grid.ColumnSpan="4"
+                    DoubleTapped="MaximizeOrRestoreWindow"
+                    PointerPressed="BeginMoveWindow"
+                    Background="{DynamicResource Brush.TitleBar}"
+                    BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border0}" />
+            <Border Grid.Column="0" Width="72" IsVisible="{Binding #WindowMain.HasLeftCaptionButton}" />
+    
+            <StackPanel
+                Grid.Column="{Binding #WindowMain.WindowState, Converter={StaticResource WindowStateToColumnConverter}}"
+                Orientation="Horizontal">
+                <!-- Settings -->
+                <Button Classes="icon_button" Command="{Binding OpenPreferencesWindow}"
+                        Padding="8, 4, 0, 0">
+                    <Path HorizontalAlignment="Center" Width="14" Height="14" Margin="0,2,0,0"
+                          Data="{StaticResource Icons.GearFill}" />
+                </Button>
+    
+                <!-- Switch Mod Button  -->
+                <Button ToolTip.Tip="{Binding CurrentMod.Key}" Margin="12, 0, 0, 0" Grid.Column="3"
+                        Classes="icon_button"
+                        x:Name="ModSwitcherFlyoutButton" Padding="0, 4, 0, 0">
+    
+                    <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
+                        <TextBlock Padding="0, 0, 6, 0" Text="{Binding CurrentMod.Name}" />
+                        <Path HorizontalAlignment="Center" Width="10" Height="10" Margin="0,2,0,0"
+                              Data="{StaticResource Icons.CaretDownFill}" />
+                    </StackPanel>
+                    <Button.Flyout>
+                        <Flyout Placement="BottomEdgeAlignedLeft"
+                                VerticalOffset="8"
+                                Opened="ModSwitcherFlyout_OnOpened"
+                                Closed="ModSwitcherFlyout_OnClosed">
+                            <StackPanel Orientation="Vertical" Background="{DynamicResource Brush.Popup}">
+                                <ContentControl Content="{Binding ModSwitcher}" Margin="8,8,8,8" />
+                            </StackPanel>
+                        </Flyout>
+                    </Button.Flyout>
+                </Button>
+            </StackPanel>
+    
+            <Border Grid.Column="3" Margin="16,0,0,0" IsVisible="{Binding #WindowMain.HasRightCaptionButton}">
+                <v:CaptionButtons Height="30" VerticalAlignment="Top" />
+            </Border>
+        </Grid>
+        <Grid Grid.Row="1">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="250" MinWidth="200" MaxWidth="500" />
+                <ColumnDefinition Width="0" />
+                <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
+            <!-- Left Side -->
+            <Border Grid.Column="0" Margin="0,0,0,0" BorderThickness="1"
+                    BorderBrush="{DynamicResource Brush.ToolBar}" CornerRadius="6">
+                <Grid RowDefinitions="28, 3, *">
+                    <TextBox
+                        Margin="0,0,0,0"
+                        Height="28"
+        
+                        BorderThickness="0"
+                        CornerRadius="0"
+                        BorderBrush="{DynamicResource Brush.Border2}"
+                        Watermark="Search..."
+                        Text="{Binding Filter, Mode=TwoWay}"
+                        VerticalContentAlignment="Center">
+                        <TextBox.InnerLeftContent>
+                            <Path
+                                Fill="{DynamicResource Brush.FG2}"
+                                Width="12" Height="12"
+                                Margin="6,0,0,0"
+                                Data="{StaticResource Icons.MagnifyingGlassFill}" />
+        
+        
+                        </TextBox.InnerLeftContent>
+                        <TextBox.InnerRightContent>
+                            <Button Classes="icon_button"
+                                    Width="16"
+                                    Height="16"
+                                    Margin="0,0,6,0"
+                                    Command="{Binding ClearFilterCommand}"
+                                    IsVisible="{Binding Filter, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"
+                                    HorizontalAlignment="Right">
+                                <Path
+                                    Width="14" Height="14"
+                                    Margin="0,1,0,0"
+                                    Data="{StaticResource Icons.XCircleFill}" />
+                            </Button>
+                        </TextBox.InnerRightContent>
+                    </TextBox>
+                    <Border Grid.Row="1"
+                            Height="1"
+                            Background="{DynamicResource Brush.Border2}"
+                            HorizontalAlignment="Stretch" />
+        
+                    <TreeView Grid.Row="2" Margin="0"
+                              x:Name="MasterTreeView"
+                              SelectionMode="Toggle"
+                              ItemsSource="{Binding Nodes}"
+                              DoubleTapped="MasterTreeView_OnDoubleTapped"
+                              ContextRequested="MasterTreeView_OnContextRequested"
+                              SelectionChanged="MasterTreeView_OnSelectionChanged"
+                              ScrollViewer.VerticalScrollBarVisibility="Auto"
+                              ScrollViewer.HorizontalScrollBarVisibility="Disabled">
+                        <TreeView.Styles>
+                            <Style Selector="TreeViewItem" x:DataType="vm:NodeBase">
+                                <Setter Property="IsExpanded" Value="{Binding IsExpanded, Mode=TwoWay}" />
+                                <Setter Property="IsVisible" Value="{Binding IsVisible}" />
+                            </Style>
+                        </TreeView.Styles>
+                        <TreeView.DataTemplates>
+                            <!-- Note the DataRoot and SpriteRoot follow the ItemRootTemplate -->
+                            <StaticResource ResourceKey="ItemRootTemplate" />
+                            <StaticResource ResourceKey="DataItemTemplate" />
+                            <StaticResource ResourceKey="OpenEditorTemplate" />
+                            <StaticResource ResourceKey="NodeBaseTemplate" />
+                        </TreeView.DataTemplates>
+                    </TreeView>
+                </Grid>
+            </Border>
+        
+            <!--  Splitter -->
+            <GridSplitter Grid.Column="1"
+                          BorderBrush="{DynamicResource Brush.Border0}"
+                          Background="Transparent"
+                          MinWidth="3"
+                          HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
+                          BorderThickness="0,0,1,0" />
+        
+            <!-- Editor Panel -->
+            <Grid Margin="2, 0, 0, 0" Grid.Column="2" RowDefinitions="Auto, *">
+                <Border BorderThickness="0, 0, 0, 1" BorderBrush="{DynamicResource Brush.Border0}"
+                        Background="{DynamicResource TabControlWindowActiveBackgroundBrush}">
+                    <!-- Tab Bar -->
+                    <views:TabBarView Height="30" VerticalAlignment="Bottom" Margin="0,0,0,0" />
+        
+                </Border>
+        
+                <!-- Editor Content -->
+                <Panel Grid.Row="1" Background="{DynamicResource Brush.PageBackground}">
+                    <ContentControl Content="{Binding TemporaryTab}"
+                                    IsVisible="{Binding TemporaryTab, Converter={x:Static ObjectConverters.IsNotNull}}" />
+                    <ContentControl Content="{Binding ActivePage}"
+                                    IsVisible="{Binding TemporaryTab, Converter={x:Static ObjectConverters.IsNull}}" />
+                </Panel>
+            </Grid>
+        </Grid>
+    
+    </Grid>
+
+</v:ChromelessWindow>
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/New/MainWindow.axaml.cs b/RogueEssence.Editor.Avalonia/Views/New/MainWindow.axaml.cs
new file mode 100644
index 00000000..65f70325
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/Views/New/MainWindow.axaml.cs
@@ -0,0 +1,241 @@
+using System;
+using System.Linq;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Controls.Templates;
+using Avalonia.Input;
+using Avalonia.Interactivity;
+using Avalonia.LogicalTree;
+using Avalonia.Platform.Storage;
+using Avalonia.Threading;
+using Avalonia.VisualTree;
+using Avalonia.Platform;
+using RogueEssence.Dev.ViewModels;
+
+namespace RogueEssence.Dev.Views;
+
+public partial class MainWindow : ChromelessWindow
+{
+    public static readonly StyledProperty<GridLength> CaptionHeightProperty =
+        AvaloniaProperty.Register<MainWindow, GridLength>(nameof(CaptionHeight));
+
+    public GridLength CaptionHeight
+    {
+        get => GetValue(CaptionHeightProperty);
+        set => SetValue(CaptionHeightProperty, value);
+    }
+
+    public static readonly StyledProperty<bool> HasLeftCaptionButtonProperty =
+        AvaloniaProperty.Register<MainWindow, bool>(nameof(HasLeftCaptionButton));
+
+    public bool HasLeftCaptionButton
+    {
+        get => GetValue(HasLeftCaptionButtonProperty);
+        set => SetValue(HasLeftCaptionButtonProperty, value);
+    }
+
+    public bool HasRightCaptionButton
+    {
+        get
+        {
+            if (OperatingSystem.IsLinux())
+                return !Native.OS.UseSystemWindowFrame;
+
+            return OperatingSystem.IsWindows();
+        }
+    }
+    
+    
+    
+    public MainWindow()
+    {
+        
+        if (OperatingSystem.IsMacOS())
+        {
+            HasLeftCaptionButton = true;
+            CaptionHeight = new GridLength(34);
+            ExtendClientAreaChromeHints =
+                ExtendClientAreaChromeHints.SystemChrome | ExtendClientAreaChromeHints.OSXThickTitleBar;
+        }
+        else if (UseSystemWindowFrame)
+        {
+            CaptionHeight = new GridLength(30);
+        }
+        else
+        {
+            CaptionHeight = new GridLength(38);
+        }
+        
+        InitializeComponent();
+    }
+    
+    protected override void OnDataContextChanged(EventArgs e)
+    {
+        base.OnDataContextChanged(e);
+        if (DataContext is MainWindowViewModel vm)
+        {
+            // vm.ModSwitcherClosed += () => ModSwitcherFlyoutButton.Flyout?.Hide();;
+        }
+    }
+    
+    private void ModSwitcherFlyout_OnOpened(object? sender, EventArgs e)
+    {
+        if (DataContext is MainWindowViewModel vm)
+        {
+            vm.OnModSwitcherOpened();
+        }
+    }
+    
+    private void ModSwitcherFlyout_OnClosed(object? sender, EventArgs e)
+    {
+        if (DataContext is MainWindowViewModel vm)
+        {
+            vm.OnModSwitcherClosed();
+            // ModSwitcherFlyoutButton.Flyout?.Hide();
+        }
+    }
+    
+    protected override void OnClosing(WindowClosingEventArgs e)
+    {
+        base.OnClosing(e);
+
+        if (!Design.IsDesignMode && DataContext is ViewModels.MainWindowViewModel)
+        {
+            PreferencesWindowViewModel.Instance.Save();
+        }
+    }
+
+  
+ 
+    private void MasterTreeView_OnDoubleTapped(object? sender, TappedEventArgs e)
+    {
+        if (DataContext is MainWindowViewModel vm && sender is TreeView { SelectedItem: not null } treeView)
+        {
+            var selectedItem = (OpenEditorNode)treeView.SelectedItem;
+            vm.AddPageFromPageNode(selectedItem);
+        }
+    }
+    
+    private void MasterTreeView_OnSelectionChanged(object? sender, SelectionChangedEventArgs e)
+    {
+        // Deselect the item after MasterTreeView_OnDoubleTapped
+        Dispatcher.UIThread.Post(() =>
+        {
+            if (sender is TreeView tree)
+            {
+                tree.SelectedItem = null;
+            }
+        });
+    }
+    
+    private void MasterTreeView_OnContextRequested(object? sender, ContextRequestedEventArgs e)
+    {
+        if (e.Source is not Visual visual)
+            return;
+
+        var current = visual.GetSelfAndVisualAncestors().OfType<TreeViewItem>().FirstOrDefault();
+        var parent = visual.GetSelfAndVisualAncestors().OfType<TreeViewItem>().Skip(1).FirstOrDefault();
+
+        if (current == null)
+            return;
+
+        if (current.DataContext is DataItemNode itemNode &&
+            parent?.DataContext is DataRootNode parentRoot)
+        {
+            ShowDataItemNodeMenu(current, itemNode, parentRoot, e);
+        }
+        
+        else if (current.DataContext is DataItemNode itemNode2 &&
+            parent?.DataContext is SpriteRootNode spriteRootMode)
+        {
+            ShowSpriteItemNodeMenu(current, itemNode2, spriteRootMode, e);
+        }
+        else if (current.DataContext is DataRootNode rootNode)
+        {
+            ShowRootNodeMenu(current, rootNode, e);
+        } 
+        else if (current.DataContext is SpriteRootNode spriteRoot)
+        {
+            ShowSpriteRootNodeMenu(current, spriteRoot, e);
+            
+        }
+    }
+
+    private void ShowDataItemNodeMenu(TreeViewItem current, DataItemNode node, DataRootNode parentNode,
+        ContextRequestedEventArgs e)
+    {
+        var menu = new ContextMenu
+        {
+            Items =
+            {
+                new MenuItem { Header = "Resave as File", Command = parentNode.ResaveAsFile, CommandParameter = node, Icon = App.CreateMenuIcon("Icons.FileFill") },
+                new MenuItem
+                    { Header = "Resave as Patch", Command = parentNode.ResaveAsPatch, CommandParameter = node, Icon = App.CreateMenuIcon("Icons.FileTextFill") },
+                new Separator(),
+                new MenuItem { Header = "Edit", Icon = App.CreateMenuIcon("Icons.PencilFill") },
+                new MenuItem { Header = "Delete", Command = parentNode.DeleteCommand, CommandParameter = node,  Icon = App.CreateMenuIcon("Icons.TrashFill") }
+            }
+        };
+
+        AttachAndOpenMenu(current, menu, e);
+    }
+
+    private void ShowSpriteItemNodeMenu(TreeViewItem current, DataItemNode node, SpriteRootNode parentNode,
+        ContextRequestedEventArgs e)
+    {
+        var menu = new ContextMenu
+        {
+            Items =
+            {
+                new MenuItem { Header = "Import", Command = parentNode.ImportCommand, CommandParameter = node, Icon = App.CreateMenuIcon("Icons.DownloadSimpleFill") },
+                new MenuItem { Header = "Re-Import", Command = parentNode.ReImportCommand, CommandParameter = node, Icon = App.CreateMenuIcon("Icons.RepeatFill") },
+                new MenuItem { Header = "Export", Command = parentNode.ExportCommand, CommandParameter = node, Icon = App.CreateMenuIcon("Icons.ExportFill") },
+                new Separator(),
+                new MenuItem { Header = "Delete", Command = parentNode.DeleteCommand, CommandParameter = node, Icon =  App.CreateMenuIcon("Icons.TrashFill") }
+            }
+        };
+
+        AttachAndOpenMenu(current, menu, e);
+    }
+
+    private void ShowRootNodeMenu(TreeViewItem current, DataRootNode root, ContextRequestedEventArgs e)
+    {
+        var menu = new ContextMenu
+        {
+            Items =
+            {
+                new MenuItem { Header = "Re-Index", Command = root.ReIndexCommand, Icon = App.CreateMenuIcon("Icons.ListNumbersFill") },
+                new MenuItem { Header = "Resave all as File", Command = root.ResaveAllAsFileCommand, Icon = App.CreateMenuIcon("Icons.FileFill") },
+                new MenuItem { Header = "Resave all as Diff", Command = root.ResaveAllAsDiffCommand, Icon = App.CreateMenuIcon("Icons.PlusMinusFill") },
+                new Separator(),
+                new MenuItem { Header = "Add", Command = root.AddCommand, Icon = App.CreateMenuIcon("Icons.Plus") }
+            }
+        };
+
+        AttachAndOpenMenu(current, menu, e);
+    }
+    
+    private void ShowSpriteRootNodeMenu(TreeViewItem current, SpriteRootNode root, ContextRequestedEventArgs e)
+    {
+        var menu = new ContextMenu
+        {
+            Items =
+            {
+                new MenuItem { Header = "Mass Import", Command = root.MassImportCommand, Icon = App.CreateMenuIcon("Icons.DownloadSimpleFill") },
+                new MenuItem { Header = "Mass Export", Command = root.MassExportCommand, Icon = App.CreateMenuIcon("Icons.ExportFill") },
+                new Separator(),
+                new MenuItem { Header = "Add", Command = root.AddCommand,  Icon = App.CreateMenuIcon("Icons.Plus") }
+            }
+        };
+
+        AttachAndOpenMenu(current, menu, e);
+    }
+
+    private static void AttachAndOpenMenu(TreeViewItem current, ContextMenu menu, ContextRequestedEventArgs e)
+    {
+        menu.Closed += (_, _) => current.ContextMenu = null;
+        current.ContextMenu = menu;
+        menu.Open(current);
+        e.Handled = true;
+    }
+}
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/New/ModSwitcherView.axaml b/RogueEssence.Editor.Avalonia/Views/New/ModSwitcherView.axaml
new file mode 100644
index 00000000..494687af
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/Views/New/ModSwitcherView.axaml
@@ -0,0 +1,64 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             xmlns:vm="using:RogueEssence.Dev.ViewModels"
+             xmlns:m="using:RogueEssence.Dev.Models"
+             x:DataType="vm:ModSwitcherViewModel"
+             x:Class="RogueEssence.Dev.Views.ModSwitcherView">
+    <Grid RowDefinitions="Auto, Auto, *">
+        
+        <TextBlock Classes="table_header" FontSize="16">Mods</TextBlock>
+        
+        <Border Grid.Row="1" Height="1"
+                Background="{DynamicResource Brush.Border1}"
+                Padding="0, 0"
+                HorizontalAlignment="Stretch" />
+        <!-- <Separator Grid.Row="1" HorizontalAlignment="Stretch" /> -->
+        <!-- KeyDown="PagesListBox_KeyDown" -->
+        <ListBox Grid.Row="2"
+                 x:Name="ModsListBox"
+                 Width="400"
+                 MaxHeight="600"
+                 BorderThickness="0"
+                 SelectionMode="Single"
+                 KeyDown="ModsListBox_OnKeyDown"
+                 Background="Transparent"
+                 Focusable="True"
+                 ScrollViewer.HorizontalScrollBarVisibility="Disabled"
+                 ScrollViewer.VerticalScrollBarVisibility="Auto"
+                 ItemsSource="{Binding Mods, Mode=OneWay}"
+                 SelectedItem="{Binding SelectedMod, Mode=TwoWay}">
+            <ListBox.Styles>
+                <Style Selector="ListBoxItem">
+                    <!-- <Setter Property="Padding" Value="8, 8, 0, 8" /> -->
+                    <Setter Property="FontSize" Value="14" />
+                    <Setter Property="MinHeight" Value="20" />
+                </Style>
+                
+
+                <Style Selector="ListBox">
+                    <Setter Property="FocusAdorner">
+                        <FocusAdornerTemplate>
+                            <Grid />
+                        </FocusAdornerTemplate>
+                    </Setter>
+                </Style>
+            </ListBox.Styles>
+
+            
+
+            <ListBox.ItemTemplate>
+                <DataTemplate DataType="m:ModHeader">
+                    <!-- Tapped="OnItemTapped" -->
+                    <Grid RowDefinitions="Auto, Auto" Background="Transparent" Tapped="OnItemTapped" >
+                        <TextBlock FontSize="14" Classes="primary"  Text="{Binding Name}" ></TextBlock>
+                        <TextBlock Grid.Row="1"  Classes="primary" Foreground="{DynamicResource Brush.FG2}" Text="{Binding Key}" />
+                        <!-- <v:IconText Text="{Binding Name}" Icon="{Binding Icon}" IconSize="12" /> -->
+                    </Grid>
+                </DataTemplate>
+            </ListBox.ItemTemplate>
+        </ListBox>
+    </Grid>
+</UserControl>
diff --git a/RogueEssence.Editor.Avalonia/Views/New/ModSwitcherView.axaml.cs b/RogueEssence.Editor.Avalonia/Views/New/ModSwitcherView.axaml.cs
new file mode 100644
index 00000000..47a88858
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/Views/New/ModSwitcherView.axaml.cs
@@ -0,0 +1,103 @@
+using System;
+using System.Collections.Generic;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Input;
+using Avalonia.Markup.Xaml;
+using Avalonia.Threading;
+using RogueEssence.Dev.Models;
+using RogueEssence.Dev.ViewModels;
+
+namespace RogueEssence.Dev.Views;
+
+public partial class ModSwitcherView : UserControl
+{
+    public ModSwitcherView()
+    {
+        InitializeComponent();
+        ModsListBox.AttachedToVisualTree += (_, _) =>
+        {
+            
+            Dispatcher.UIThread.Post(() =>
+            {
+                ModsListBox.Focus();
+            },  DispatcherPriority.Loaded);
+        };
+    }
+    
+    protected override async void OnKeyDown(KeyEventArgs e)
+    {
+        base.OnKeyDown(e);
+
+        if (e.Key != Key.Enter || DataContext is not ViewModels.ModSwitcherViewModel switcher)
+            return;
+
+        var selected = ModsListBox.SelectedItem as  Models.ModHeader;
+        if (selected is null)
+            return;
+        
+        if (switcher.IsCurrent(selected))
+        {
+            switcher.CloseSwitcher();
+            e.Handled = true;
+            return;
+        }
+        
+        var result = await switcher.ConfirmModSwitchAsync();
+        if (result == MessageBoxWindowView.MessageBoxResult.Cancel)
+            return;
+        
+        switcher.CurrentMod = selected;
+        switcher.CloseSwitcher();
+
+        e.Handled = true;
+    }
+
+
+    private void ModsListBox_OnKeyDown(object? sender, KeyEventArgs e)
+    {
+        if (DataContext is not ModSwitcherViewModel switcher)
+            return;
+        
+        if (e.Key == Key.Down)
+        {
+            ModsListBox.SelectedIndex = (ModsListBox.SelectedIndex + 1 + ModsListBox.ItemCount) % ModsListBox.ItemCount;
+            ModsListBox.Focus(NavigationMethod.Directional);
+            e.Handled = true;
+        }
+        else if (e.Key == Key.Up)
+        {
+            ModsListBox.SelectedIndex = (ModsListBox.SelectedIndex - 1 + ModsListBox.ItemCount) % ModsListBox.ItemCount;
+            ModsListBox.Focus(NavigationMethod.Directional);
+            e.Handled = true;
+        }
+    }
+    
+    private async void OnItemTapped(object sender, TappedEventArgs e)
+    {
+        if (DataContext is not ModSwitcherViewModel switcher)
+            return;
+
+        var selected = ModsListBox.SelectedItem as Models.ModHeader;
+        if (selected is null)
+            return;
+        
+        if (switcher.IsCurrent(selected))
+        {
+            switcher.CloseSwitcher();
+            e.Handled = true;
+            return;
+        }
+        
+        var result = await switcher.ConfirmModSwitchAsync();
+        if (result == MessageBoxWindowView.MessageBoxResult.Cancel)
+            return;
+        
+        switcher.CurrentMod = selected;
+        switcher.CloseSwitcher();
+
+        e.Handled = true;
+    }
+
+
+}
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/New/TabBarView.axaml b/RogueEssence.Editor.Avalonia/Views/New/TabBarView.axaml
new file mode 100644
index 00000000..ed8946f4
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/Views/New/TabBarView.axaml
@@ -0,0 +1,268 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:vm="clr-namespace:RogueEssence.Dev.ViewModels"
+             xmlns:c="using:RogueEssence.Dev.Converters"
+             xmlns:v="clr-namespace:RogueEssence.Dev.Views"
+             xmlns:controls="clr-namespace:Tabalonia.Controls;assembly=Tabalonia"
+             xmlns:local="clr-namespace:RogueEssence.Dev.Converters"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="30"
+             x:Class="RogueEssence.Dev.Views.TabBarView"
+             x:DataType="vm:MainWindowViewModel"
+             x:Name="MainTabBar">
+
+    <UserControl.Resources>
+        <local:ObjectToColorKeyConverter x:Key="ObjectToColorKeyConverter" />
+        <ControlTheme x:Key="DragTabItemThumb" TargetType="controls:LeftPressedThumb">
+            <Setter Property="HorizontalAlignment" Value="Stretch" />
+            <Setter Property="VerticalAlignment" Value="Stretch" />
+            <Setter Property="IsHitTestVisible" Value="True" />
+            <Setter Property="Background" Value="Transparent" />
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate>
+                        <Border Background="{TemplateBinding Background}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}" />
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </ControlTheme>
+    </UserControl.Resources>
+    <Design.DataContext>
+        <vm:MainWindowViewModel />
+    </Design.DataContext>
+
+    <UserControl.Styles>
+        <Style Selector="Button#CloseTabButton">
+            <Setter Property="Opacity" Value="0"></Setter>
+        </Style>
+
+
+        <Style Selector="controls|DragTabItem">
+            <Setter Property="HorizontalContentAlignment" Value="Left" />
+            <Setter Property="Padding" Value="0"></Setter>
+        </Style>
+
+        <Style Selector="controls|DragTabItem">
+            <Setter Property="Margin" Value="0,0, 8, 0"></Setter>
+            <Style Selector="^:selected">
+                <Setter Property="Background">
+                    <Setter.Value>
+                        <MultiBinding Converter="{StaticResource ObjectToColorKeyConverter}">
+                            <Binding Path="((vm:MainWindowViewModel)DataContext).TemporaryTab"
+                                     RelativeSource="{RelativeSource AncestorType=controls:TabsControl}" />
+                            <Binding Source="SelectedTabItemBackgroundBrush" />
+                            <Binding Source="" />
+                            <Binding Path="RequestedThemeVariant" Source="{x:Static Application.Current}" />
+                        </MultiBinding>
+                    </Setter.Value>
+                </Setter>
+
+                <Setter Property="Foreground">
+                    <Setter.Value>
+                        <MultiBinding Converter="{StaticResource ObjectToColorKeyConverter}">
+                            <Binding Path="((vm:MainWindowViewModel)DataContext).TemporaryTab"
+                                     RelativeSource="{RelativeSource AncestorType=controls:TabsControl}" />
+                            <!-- highlight color -->
+                            <Binding Source="TabItemHeaderForegroundSelected" />
+                            <!-- deselect color -->
+                            <Binding Source="TabItemHeaderForegroundUnselected" />
+                            <Binding Path="RequestedThemeVariant"
+                                     Source="{x:Static Application.Current}" />
+                        </MultiBinding>
+                    </Setter.Value>
+                </Setter>
+            </Style>
+
+            <Style Selector="^:selected:pointerover">
+                <Setter Property="Background">
+                    <MultiBinding Converter="{StaticResource ObjectToColorKeyConverter}">
+                        <Binding Path="((vm:MainWindowViewModel)DataContext).TemporaryTab"
+                                 RelativeSource="{RelativeSource AncestorType=controls:TabsControl}" />
+                        <Binding Source="SelectedTabItemBackgroundBrush" />
+                        <Binding Source="TabItemHeaderBackgroundUnselectedPointerOver" />
+                        <Binding Path="RequestedThemeVariant"
+                                 Source="{x:Static Application.Current}" />
+                    </MultiBinding>
+                </Setter>
+            </Style>
+        </Style>
+
+        <Style Selector="Button#CloseTabButton:pointerover">
+            <Setter Property="Opacity" Value="1"></Setter>
+        </Style>
+
+        <Style Selector="Button#CloseTabButton:pointerover /template/ ContentPresenter">
+            <Setter Property="Opacity" Value="1"></Setter>
+        </Style>
+
+        <Style Selector="Grid#CloseButtonContainer:pointerover > Ellipse#NeedToSaveEllipse">
+            <Setter Property="Opacity" Value="0"></Setter>
+        </Style>
+
+        <Style Selector="Grid#CloseButtonContainer:pointerover > Button#CloseTabButton">
+            <Setter Property="Opacity" Value="1"></Setter>
+        </Style>
+
+        <Style Selector="controls|DragTabItem">
+            <Setter Property="Template">
+                <ControlTemplate>
+                    <Grid>
+                        <Border
+                            Name="PART_LayoutRoot"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="{TemplateBinding CornerRadius}"
+                            Padding="{TemplateBinding Padding}">
+                            <Grid>
+                                <ContentPresenter Name="PART_ContentPresenter"
+                                                  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                                  Content="{TemplateBinding Header}"
+                                                  ContentTemplate="{TemplateBinding HeaderTemplate}"
+                                                  FontFamily="{TemplateBinding FontFamily}"
+                                                  FontSize="{TemplateBinding FontSize}"
+                                                  FontWeight="{TemplateBinding FontWeight}" />
+
+                                <controls:LeftPressedThumb Name="PART_Thumb"
+                                                           HorizontalAlignment="Stretch"
+                                                           VerticalAlignment="Stretch"
+                                                           IsHitTestVisible="True"
+                                                           Theme="{StaticResource DragTabItemThumb}"
+                                                           Margin="0,0,32,0" />
+
+                                <Border Name="PART_SelectedPipe"
+                                        Background="{DynamicResource TabItemHeaderSelectedPipeFill}"
+                                        CornerRadius="{DynamicResource ControlCornerRadius}"
+                                        IsVisible="False" />
+                            </Grid>
+
+                        </Border>
+                        <!-- Selection indicator -->
+                        <Border x:Name="Indicator"
+                                Height="4"
+                                CornerRadius="20"
+                                Background="Transparent"
+                                VerticalAlignment="Bottom"
+                                HorizontalAlignment="Center"
+                                Width="166" />
+                    </Grid>
+                </ControlTemplate>
+
+            </Setter>
+
+
+        </Style>
+        <Style Selector="controls|DragTabItem:selected /template/ Border#Indicator">
+            <Setter Property="Background" Value="{DynamicResource Brush.Accent}" />
+            <Setter Property="IsVisible"
+                    Value="{Binding ((vm:MainWindowViewModel)DataContext).TemporaryTab, RelativeSource={RelativeSource AncestorType=controls:TabsControl}, Converter={x:Static ObjectConverters.IsNull}}" />
+
+        </Style>
+
+
+        <Style Selector="controls|TabsControl">
+            <Setter Property="Margin" Value="0" />
+            <Setter Property="Template">
+                <ControlTemplate>
+                    <Border BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="{TemplateBinding CornerRadius}"
+                            Background="{TemplateBinding Background}"
+                            HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                            VerticalAlignment="{TemplateBinding VerticalAlignment}">
+                        <Grid ColumnDefinitions="Auto, *, Auto">
+                            <Thumb Grid.Column="0" Name="PART_LeftDragWindowThumb"
+                                   MinWidth="{TemplateBinding LeftThumbWidth}" />
+                            <ScrollViewer Grid.Column="1" HorizontalScrollBarVisibility="Hidden"
+                                          VerticalScrollBarVisibility="Disabled">
+                                <ItemsPresenter Name="PART_ItemsPresenter"
+                                                ItemsPanel="{TemplateBinding ItemsPanel}" Margin="0, 0, 0, 0" />
+                            </ScrollViewer>
+                            <Thumb Grid.Column="2" Name="PART_RightDragWindowThumb"
+                                   MinWidth="{TemplateBinding RightThumbWidth}" />
+                            
+                            <ContentPresenter Grid.Column="2" Name="PART_RightContent"
+                                              Content="{TemplateBinding RightContent}" />
+                        </Grid>
+                    </Border>
+                </ControlTemplate>
+            </Setter>
+        </Style>
+    </UserControl.Styles>
+    <Grid ColumnDefinitions="*,Auto,Auto">
+        <Grid ColumnDefinitions="*">
+            <controls:TabsControl SelectedItem="{Binding ActivePage}"
+                                  ShowDefaultCloseButton="False"
+                                  ShowDefaultAddButton="False"
+                                  TabItemWidth="175"
+                                  ScrollViewer.HorizontalScrollBarVisibility="Visible"
+                                  Padding="0"
+                                  RightThumbWidth="0"
+                                  LeftThumbWidth="0"
+                                  ItemsSource="{Binding Pages}">
+
+                <controls:TabsControl.RightContent>
+                    <StackPanel VerticalAlignment="Center">
+                        <!-- Tab Switcher Button -->
+                        <Button Background="Transparent" Grid.Column="1" Classes="icon_button"
+                                VerticalAlignment="Bottom"
+                                Margin="0, 0, 0, 0"
+                                Name="TabSwitcherFlyoutButton">
+                            <Path Width="13" Height="13" Margin="0,2,0,0" Data="{StaticResource Icons.Tabs}" />
+                            <Button.Flyout>
+                                <Flyout Placement="BottomEdgeAlignedRight" Opened="TabSwitcherFlyout_OnOpened" Closed="TabSwitcherFlyout_OnClosed">
+                                    <StackPanel Orientation="Vertical" Background="{DynamicResource Brush.Popup}">
+                                        <ContentControl Content="{Binding TabSwitcher}" Margin="0" />
+                                    </StackPanel>
+                                </Flyout>
+                            </Button.Flyout>
+                        </Button>
+                    </StackPanel>
+                </controls:TabsControl.RightContent>
+                
+                <controls:TabsControl.ItemTemplate>
+                    <DataTemplate DataType="{x:Type vm:EditorPageViewModel}">
+                        <!-- TODO: The tooltip doesn't show up when hovered over text-->
+                        <Grid Background="Transparent" Height="30"
+                              Width="175"
+                              ToolTip.Tip="{Binding Title}"
+                              IsHitTestVisible="True"
+                              HorizontalAlignment="Left">
+                            <Border IsHitTestVisible="True" ToolTip.Tip="{Binding Title}" Padding="8, 0, 16, 0"
+                                    Background="Transparent" BorderBrush="{DynamicResource Color.Window}"
+                                    BorderThickness="0 0 0 1"
+                                    Margin="0, 0, 0, -3">
+                                <!-- <Grid Width="{Binding Source={x:Static vm:Preferences.Instance}, Path=UseFixedTabWidth, Converter={x:Static c:BoolConverters.ToPageTabWidth}}" Height="30" ColumnDefinitions="Auto,*,Auto" VerticalAlignment="Center"> -->
+                                <Grid ColumnDefinitions="*, Auto">
+                                    <v:IconText Text="{Binding Title}" Icon="{Binding Icon}" IconSize="12" />
+                                    <Grid Grid.Column="1" x:Name="CloseButtonContainer"
+                                          ZIndex="100">
+                                        <Ellipse x:Name="NeedToSaveEllipse"
+                                                 IsVisible="{Binding Modified}"
+                                                 Width="8" Height="8"
+                                                 Margin="0,0,0,0"
+                                                 VerticalAlignment="Center"
+                                                 Fill="Gray" />
+                                        <Button Classes="icon_button"
+                                                x:Name="CloseTabButton"
+                                                Width="16" Height="16" Margin="8, 0, 0. 0"
+                                                Click="OnCloseTab"
+                                                ZIndex="100">
+                                            <Path x:Name="CloseTabPath" Width="9" Height="9"
+                                                  Data="{StaticResource Icons.Close}" />
+                                        </Button>
+                                    </Grid>
+                                </Grid>
+                            </Border>
+                        </Grid>
+                    </DataTemplate>
+                </controls:TabsControl.ItemTemplate>
+             
+            </controls:TabsControl>
+        </Grid>
+    </Grid>
+</UserControl>
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/New/TabBarView.axaml.cs b/RogueEssence.Editor.Avalonia/Views/New/TabBarView.axaml.cs
new file mode 100644
index 00000000..97b510bd
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/Views/New/TabBarView.axaml.cs
@@ -0,0 +1,51 @@
+using System;
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+using RogueEssence.Dev.ViewModels;
+
+namespace RogueEssence.Dev.Views
+{
+    public partial class TabBarView : UserControl
+    {
+        public TabBarView()
+        {
+            InitializeComponent();
+        }
+        
+        protected override void OnDataContextChanged(EventArgs e)
+        {
+            base.OnDataContextChanged(e);
+            if (DataContext is MainWindowViewModel vm)
+            {
+                vm.TabSwitcherClosed += () => TabSwitcherFlyoutButton.Flyout?.Hide();;
+            }
+        }
+
+        private async void OnCloseTab(object? sender, RoutedEventArgs e)
+        {
+            if (DataContext is not MainWindowViewModel vm) return;
+            if (sender is not Button { DataContext: EditorPageViewModel page }) return;
+            
+            bool closed = await vm.TryCloseTabAsync(page);
+            if (!closed)
+                e.Handled = true;
+        }
+        
+        
+        private void TabSwitcherFlyout_OnOpened(object? sender, EventArgs e)
+        {
+            if (DataContext is MainWindowViewModel vm)
+            {
+                vm.OpenTabSwitcher();
+            }
+        }
+
+        private void TabSwitcherFlyout_OnClosed(object? sender, EventArgs e)
+        {
+            if (DataContext is MainWindowViewModel vm)
+            {
+                vm.CloseTabSwitcher();
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/New/TabSwitcherView.axaml b/RogueEssence.Editor.Avalonia/Views/New/TabSwitcherView.axaml
new file mode 100644
index 00000000..555337f5
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/Views/New/TabSwitcherView.axaml
@@ -0,0 +1,165 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:local="clr-namespace:RogueEssence.Dev.Converters"
+             xmlns:vm="using:RogueEssence.Dev.ViewModels"
+             xmlns:c="using:RogueEssence.Dev.Converters"
+             xmlns:v="using:RogueEssence.Dev.Views"
+             x:Name="ThisControl"
+             x:DataType="vm:TabSwitcherViewModel"
+             mc:Ignorable="d" d:DesignWidth="420" d:DesignHeight="200"
+             x:Class="RogueEssence.Dev.Views.TabSwitcherView">
+    <Design.DataContext>
+        <vm:TabSwitcherViewModel />
+    </Design.DataContext>
+
+    <UserControl.Resources>
+    </UserControl.Resources>
+    <Grid RowDefinitions="Auto, Auto">
+        <!-- <Grid Grid.Row="0" ColumnDefinitions="*, Auto" HorizontalAlignment="Stretch"> -->
+        <TextBox Grid.Row="0"
+                 Height="24"
+                 x:Name="TabSwitcherTextBox"
+                 HorizontalAlignment="Stretch"
+                 MaxWidth="400"
+                 Margin="0"
+                 BorderThickness="1"
+                 CornerRadius="0"
+                 Watermark="Search for tabs.."
+                 KeyDown="TabSwitcherTextBox_KeyDown"
+                 Text="{Binding SearchFilter, Mode=TwoWay}"
+                 BorderBrush="{DynamicResource Brush.Border2}"
+                 VerticalContentAlignment="Center">
+            <TextBox.InnerLeftContent>
+                <Path
+                    Fill="{DynamicResource Brush.FG2}"
+                    Width="14" Height="14"
+                    Margin="6,1,0,0"
+                    Data="{StaticResource Icons.MagnifyingGlassFill}" />
+            </TextBox.InnerLeftContent>
+
+            <TextBox.InnerRightContent>
+                <StackPanel Orientation="Horizontal">
+                    <Button Classes="icon_button"
+                            Width="16"
+                            x:Name="ClearFilterButton"
+                            Margin="6, 0"
+                            
+                            Click="ClearFilterButton_OnClick"
+                            IsVisible="{Binding SearchFilter, Converter={x:Static StringConverters.IsNotNullOrEmpty}}">
+                        <Path
+                            Fill="{DynamicResource Brush.FG1}"
+                            Width="12" Height="12"
+                            Margin="0,1,0,0"
+                            Data="{StaticResource Icons.XCircleFill}" />
+                    </Button>
+                    <Border Width="1"
+                            Height="16"
+                            Background="{DynamicResource Brush.Border1}"
+                            Margin="0,0" />
+                    <Button Classes="icon_button"
+                            Width="24"
+                            Margin="3, 0"
+                            IsVisible="{Binding IsTreeView}"
+                            Padding="0, 0, 0, 0"
+                            Click="ToggleButtonOnClick"
+                            ToolTip.Placement="Right"
+                            ToolTip.Tip="Switch to tab list view (ordered by tab order in tab bar)">
+                        <Path
+                            Fill="{DynamicResource Brush.FG1}"
+                            Width="12" Height="12"
+                            Margin="0,0,0,0"
+                            Data="{StaticResource Icons.RowsFill}" />
+                    </Button>
+
+                    <Button Classes="icon_button"
+                            Width="24"
+                            Margin="3, 0"
+                            Padding="0, 0, 0, 0"
+                            IsVisible="{Binding !IsTreeView}"
+                            Click="ToggleButtonOnClick"
+                            ToolTip.Placement="Pointer"
+                            ToolTip.Tip="Switch to tab tree view (ordered by which tabs added first)"
+                            HorizontalAlignment="Right">
+                        <Path
+                            Fill="{DynamicResource Brush.FG1}"
+                            Width="12" Height="12"
+                            Margin="0,0,0,0"
+                            Data="{StaticResource Icons.TreeStructureFill}" />
+                    </Button>
+                </StackPanel>
+            </TextBox.InnerRightContent>
+        </TextBox>
+        <TreeView Grid.Row="1" Margin="0"
+                  Width="400"
+                  MaxHeight="300"
+                  IsVisible="{Binding IsTreeView}"
+                  x:Name="TreeViewTabSwitcher"
+                  ItemsSource="{Binding TopLevelPages}"
+                  SelectionMode="Single"
+                  PointerPressed="TreeViewTabSwitcher_OnPointerPressed"
+                  ScrollViewer.VerticalScrollBarVisibility="Auto"
+                  ScrollViewer.HorizontalScrollBarVisibility="Disabled">
+            <TreeView.Styles>
+                <Style Selector="TreeViewItem" x:DataType="vm:NodeBase">
+                    <Setter Property="IsExpanded" Value="{Binding IsExpanded, Mode=TwoWay}" />
+                    <Setter Property="IsVisible" Value="{Binding IsVisible}" />
+                    <Setter Property="Padding" Value="0 4" />
+                    <Setter Property="FontSize" Value="14" />
+                    <Setter Property="MinHeight" Value="20" />
+                    <Setter Property="Focusable" Value="True"/>
+                </Style>
+            </TreeView.Styles>
+            <TreeView.DataTemplates>
+                <StaticResource ResourceKey="PageNodeTemplate"/>
+            </TreeView.DataTemplates>
+        </TreeView>
+
+        <ListBox Grid.Row="1"
+                 x:Name="PagesListBox"
+                 Width="400"
+                 MaxHeight="300"
+                 IsVisible="{Binding !IsTreeView}"
+                 BorderThickness="0"
+                 SelectionMode="Single"
+                 KeyDown="PagesListBox_KeyDown"
+                 Background="Transparent"
+                 Focusable="True"
+                 ScrollViewer.HorizontalScrollBarVisibility="Disabled"
+                 ScrollViewer.VerticalScrollBarVisibility="Auto"
+                 ItemsSource="{Binding VisiblePages, Mode=OneWay}"
+                 SelectedItem="{Binding SelectedPage, Mode=TwoWay}">
+            <ListBox.Styles>
+                <Style Selector="ListBoxItem">
+                    <Setter Property="Padding" Value="37, 5, 8, 5" />
+                    <Setter Property="FontSize" Value="14" />
+                    <Setter Property="MinHeight" Value="20" />
+                </Style>
+                
+
+                <Style Selector="ListBox">
+                    <Setter Property="FocusAdorner">
+                        <FocusAdornerTemplate>
+                            <Grid />
+                        </FocusAdornerTemplate>
+                    </Setter>
+                </Style>
+            </ListBox.Styles>
+
+            <ListBox.ItemsPanel>
+                <ItemsPanelTemplate>
+                    <StackPanel Orientation="Vertical" />
+                </ItemsPanelTemplate>
+            </ListBox.ItemsPanel>
+
+            <ListBox.ItemTemplate>
+                <DataTemplate DataType="vm:EditorPageViewModel">
+                    <Grid ColumnDefinitions="Auto,6,*" Background="Transparent" Tapped="OnItemTapped">
+                        <v:IconText Text="{Binding Title}" Icon="{Binding Icon}" IconSize="12" />
+                    </Grid>
+                </DataTemplate>
+            </ListBox.ItemTemplate>
+        </ListBox>
+    </Grid>
+</UserControl>
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/New/TabSwitcherView.axaml.cs b/RogueEssence.Editor.Avalonia/Views/New/TabSwitcherView.axaml.cs
new file mode 100644
index 00000000..de35b3c0
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/Views/New/TabSwitcherView.axaml.cs
@@ -0,0 +1,439 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Controls.Primitives;
+using Avalonia.Input;
+using Avalonia.Interactivity;
+using Avalonia.LogicalTree;
+using Avalonia.Markup.Xaml;
+using Avalonia.Threading;
+using Avalonia.VisualTree;
+using RogueEssence.Dev.ViewModels;
+
+namespace RogueEssence.Dev.Views;
+
+public partial class TabSwitcherView : UserControl
+{
+    public TabSwitcherView()
+    {
+        InitializeComponent();
+
+        
+        
+        TreeViewTabSwitcher.AddHandler(KeyDownEvent, TreeViewTabSwitcher_OnKeyDown,
+            RoutingStrategies.Tunnel | RoutingStrategies.Bubble);
+        TreeViewTabSwitcher.AddHandler(PointerPressedEvent, TreeViewTabSwitcher_OnPointerPressed,
+            RoutingStrategies.Tunnel);
+
+        TreeViewTabSwitcher.AttachedToVisualTree += (_, _) =>
+        {
+            
+            Dispatcher.UIThread.Post(() =>
+            {
+
+            
+                ExpandAllNodes();
+                if (DataContext is TabSwitcherViewModel vm && vm.HasTemporaryTab())
+                {
+                    TabSwitcherTextBox.Focus();
+                    var allItems = GetAllVisibleTreeViewItems(TreeViewTabSwitcher).ToList();
+
+                    foreach (var item in allItems)
+                    {
+                        item.IsSelected = false;
+                    }
+                }
+                else
+                {
+                    SetFocusToSelectedPage();
+                    
+                }
+               
+            },  DispatcherPriority.Loaded);
+        };
+        
+        PagesListBox.AttachedToVisualTree += (_, _) =>
+        {
+            
+            Dispatcher.UIThread.Post(() =>
+            {
+                if (DataContext is TabSwitcherViewModel vm && vm.HasTemporaryTab())
+                {
+                    (DataContext as TabSwitcherViewModel).SelectedPage = null;
+                    TabSwitcherTextBox.Focus();
+                }
+                else
+                {
+                    PagesListBox.Focus();
+                }
+            },  DispatcherPriority.Loaded);
+        };
+    }
+    
+    private void ExpandAllNodes()
+    {
+        if (TreeViewTabSwitcher.Items == null) return;
+    
+        foreach (var item in TreeViewTabSwitcher.Items)
+        {
+            if (item is PageNode pageNode)
+            {
+                ExpandAllPageNodesRecursive(pageNode);
+            }
+        }
+    }
+
+    private void ExpandAllPageNodesRecursive(NodeBase pageNode)
+    {
+        pageNode.IsExpanded = true;
+    
+        if (pageNode.SubNodes != null && pageNode.SubNodes.Count > 0)
+        {
+            foreach (var child in pageNode.SubNodes)
+            {
+                ExpandAllPageNodesRecursive(child);
+            }
+        }
+    }
+
+    private void SetFocusToSelectedPage()
+    {
+        if (DataContext is TabSwitcherViewModel switcher)
+        {
+            ExpandToPage(TreeViewTabSwitcher, switcher.SelectedPage);
+            
+            Dispatcher.UIThread.Post(() =>
+            {
+                var allItems = GetAllVisibleTreeViewItems(TreeViewTabSwitcher).ToList();
+
+                foreach (var item in allItems)
+                {
+                    item.IsSelected = false;
+                }
+
+                foreach (var item in allItems)
+                {
+                    if ((item.DataContext as PageNode)?.Page == switcher.SelectedPage)
+                    {
+                        item.IsSelected = true;
+                        item.Focus();
+                        item.BringIntoView();
+                        break;
+                    }
+                }
+            }, DispatcherPriority.Background);
+        }
+    }
+
+    private void ExpandToPage(TreeView treeView, object targetPage)
+    {
+        foreach (var child in treeView.GetLogicalChildren().OfType<TreeViewItem>())
+        {
+            if (ExpandToPageRecursive(child, targetPage))
+            {
+                break;
+            }
+        }
+    }
+
+    private bool ExpandToPageRecursive(TreeViewItem item, object targetPage)
+    {
+        var pageNode = item.DataContext as PageNode;
+        
+        if (pageNode?.Page == targetPage)
+        {
+            return true;
+        }
+        
+        if (pageNode != null)
+        {
+            bool wasExpanded = item.IsExpanded;
+            item.IsExpanded = true;
+            
+            item.UpdateLayout();
+
+            foreach (var child in item.GetLogicalChildren().OfType<TreeViewItem>())
+            {
+                if (ExpandToPageRecursive(child, targetPage))
+                {
+                    return true;
+                }
+            }
+            item.IsExpanded = wasExpanded;
+        }
+
+        return false;
+    }
+
+
+    protected override void OnKeyDown(KeyEventArgs e)
+    {
+        base.OnKeyDown(e);
+
+        if (e.Key == Key.Enter && DataContext is ViewModels.TabSwitcherViewModel switcher)
+        {
+            switcher.Switch();
+            e.Handled = true;
+        }
+    }
+
+    private void OnItemTapped(object sender, TappedEventArgs e)
+    {
+        if (DataContext is TabSwitcherViewModel switcher)
+        {
+            switcher.Switch();
+            e.Handled = true;
+        }
+    }
+
+
+    private void PagesListBox_KeyDown(object sender, KeyEventArgs e)
+    {
+        if (DataContext is not TabSwitcherViewModel switcher)
+            return;
+
+        if (PagesListBox.ItemCount == 0)
+            return;
+
+        if (!switcher.IsTreeView)
+        {
+            if (e.Key == Key.Down)
+            {
+                if (PagesListBox.SelectedIndex < PagesListBox.ItemCount - 1)
+                {
+                    PagesListBox.SelectedIndex++;
+                    PagesListBox.Focus(NavigationMethod.Directional);
+                }
+                else
+                {
+                    TabSwitcherTextBox.Focus(NavigationMethod.Directional);
+                    PagesListBox.SelectedIndex = -1;
+                }
+
+                e.Handled = true;
+            }
+            else if (e.Key == Key.Up)
+            {
+                if (PagesListBox.SelectedIndex > 0)
+                {
+                    PagesListBox.Focus(NavigationMethod.Directional);
+                    PagesListBox.SelectedIndex--;
+                }
+                else
+                {
+                    TabSwitcherTextBox.Focus(NavigationMethod.Directional);
+                    PagesListBox.SelectedIndex = -1;
+                }
+
+                e.Handled = true;
+            }
+        }
+    }
+
+    private void TabSwitcherTextBox_KeyDown(object sender, KeyEventArgs e)
+    {
+        if (DataContext is not TabSwitcherViewModel switcher)
+            return;
+
+        if (PagesListBox.ItemCount == 0)
+            return;
+
+        if (!switcher.IsTreeView)
+        {
+            if (e.Key == Key.Down)
+            {
+                PagesListBox.Focus(NavigationMethod.Directional);
+                PagesListBox.SelectedIndex = 0;
+            }
+            else if (e.Key == Key.Up)
+            {
+                PagesListBox.Focus(NavigationMethod.Directional);
+                PagesListBox.SelectedIndex = PagesListBox.ItemCount - 1;
+            }
+        }
+        else
+        {
+            var allItems = GetAllVisibleTreeViewItems(TreeViewTabSwitcher).ToList();
+    
+            if (allItems.Count > 0)
+            {
+                if (e.Key == Key.Down)
+                {
+                    TreeViewTabSwitcher.Focus(NavigationMethod.Directional);
+                    allItems[0].IsSelected = true;
+                    allItems[0].Focus();
+                    switcher.SelectedPage = (allItems[0].DataContext as PageNode)?.Page;
+                }
+                else if (e.Key == Key.Up)
+                {
+                    TreeViewTabSwitcher.Focus(NavigationMethod.Directional);
+                    allItems[allItems.Count - 1].IsSelected = true;
+                    allItems[allItems.Count - 1].Focus();
+                    switcher.SelectedPage = (allItems[allItems.Count - 1].DataContext as PageNode)?.Page;
+                }
+            }
+        }
+        
+    }
+
+    private void TreeViewTabSwitcher_OnPointerPressed(object? sender, PointerPressedEventArgs e)
+    {
+        if (DataContext is ViewModels.TabSwitcherViewModel switcher)
+        {
+            // Handle expander
+            var toggleButton = (e.Source as Control)?.FindAncestorOfType<ToggleButton>();
+            if (toggleButton != null)
+            {
+                return;
+            }
+
+            var treeViewItem = (e.Source as Control)?.FindAncestorOfType<TreeViewItem>();
+
+            if (treeViewItem != null)
+            {
+                var dataContext = treeViewItem.DataContext as PageNode;
+                switcher.SelectedPage = dataContext?.Page;
+                switcher.Switch();
+                e.Handled = true;
+            }
+        }
+    }
+
+    private void ToggleButtonOnClick(object? sender, RoutedEventArgs e)
+    {
+        if (DataContext is TabSwitcherViewModel switcher)
+        {
+            switcher.ToggleSearchMode();
+            SetFocusToSelectedPage();
+            TabSwitcherTextBox.Focus();
+        }
+    }
+
+    private void ClearFilterButton_OnClick(object? sender, RoutedEventArgs e)
+    {
+        if (DataContext is TabSwitcherViewModel switcher)
+        {
+            switcher.ClearFilter();
+            TabSwitcherTextBox.Focus();
+        }
+    }
+
+    private void TreeViewTabSwitcher_OnKeyDown(object sender, KeyEventArgs e)
+{
+    if (e.Handled) return;
+
+    if (e.Key == Key.Enter && DataContext is ViewModels.TabSwitcherViewModel switcher)
+    {
+        switcher.Switch();
+        e.Handled = true;
+        return;
+    }
+
+    var treeView = sender as TreeView;
+    if (treeView == null) return;
+
+    if (e.Key == Key.Down)
+    {
+        SelectNextItem(treeView);
+        e.Handled = true;
+    }
+    else if (e.Key == Key.Up)
+    {
+        SelectPreviousItem(treeView);
+        e.Handled = true;
+    }
+}
+
+private void SelectNextItem(TreeView treeView)
+{
+    if (DataContext is not TabSwitcherViewModel switcher) return;
+
+    var items = GetAllVisibleTreeViewItems(treeView).ToList();
+    if (items.Count == 0) return;
+
+    var currentItem = items.FirstOrDefault(item => item.IsSelected);
+    int currentIndex = currentItem != null ? items.IndexOf(currentItem) : -1;
+
+    if (currentIndex < items.Count - 1)
+    {
+        if (currentItem != null) currentItem.IsSelected = false;
+        items[currentIndex + 1].IsSelected = true;
+        items[currentIndex + 1].Focus();
+        switcher.SelectedPage = (items[currentIndex + 1].DataContext as PageNode).Page;
+    }
+    else if (currentIndex == items.Count - 1)
+    {
+        if (currentItem != null) currentItem.IsSelected = false;
+        TabSwitcherTextBox.Focus(NavigationMethod.Directional);
+    }
+    else if (currentIndex == -1 && items.Count > 0)
+    {
+        items[0].IsSelected = true;
+        items[0].Focus();
+        switcher.SelectedPage = (items[0].DataContext as PageNode).Page;
+    }
+}
+
+private void SelectPreviousItem(TreeView treeView)
+{
+    if (DataContext is not TabSwitcherViewModel switcher) return;
+
+    var items = GetAllVisibleTreeViewItems(treeView).ToList();
+    if (items.Count == 0) return;
+
+    var currentItem = items.FirstOrDefault(item => item.IsSelected);
+    int currentIndex = currentItem != null ? items.IndexOf(currentItem) : -1;
+
+    if (currentIndex > 0)
+    {
+        if (currentItem != null) currentItem.IsSelected = false;
+        items[currentIndex - 1].IsSelected = true;
+        items[currentIndex - 1].Focus();
+        switcher.SelectedPage = (items[currentIndex - 1].DataContext as PageNode).Page;
+    }
+    else if (currentIndex == 0)
+    {
+        if (currentItem != null) currentItem.IsSelected = false;
+        TabSwitcherTextBox.Focus(NavigationMethod.Directional);
+    }
+    else if (currentIndex == -1 && items.Count > 0)
+    {
+        items[items.Count - 1].IsSelected = true;
+        items[items.Count - 1].Focus();
+        switcher.SelectedPage = (items[items.Count - 1].DataContext as PageNode).Page;
+    }
+}
+    private IEnumerable<TreeViewItem> GetAllVisibleTreeViewItems(TreeView treeView)
+    {
+        foreach (var child in treeView.GetLogicalChildren().OfType<TreeViewItem>())
+        {
+            yield return child;
+
+            if (child.IsExpanded)
+            {
+                foreach (var descendant in GetVisibleTreeViewItemsRecursive(child))
+                {
+                    yield return descendant;
+                }
+            }
+        }
+    }
+    
+    private IEnumerable<TreeViewItem> GetVisibleTreeViewItemsRecursive(TreeViewItem parent)
+    {
+        foreach (var child in parent.GetLogicalChildren().OfType<TreeViewItem>())
+        {
+            yield return child;
+
+            if (child.IsExpanded)
+            {
+                foreach (var descendant in GetVisibleTreeViewItemsRecursive(child))
+                {
+                    yield return descendant;
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/UserControls/AutoCompleteBinder.cs b/RogueEssence.Editor.Avalonia/Views/UserControls/AutoCompleteBinder.cs
new file mode 100644
index 00000000..4a93fd12
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/Views/UserControls/AutoCompleteBinder.cs
@@ -0,0 +1,73 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using ReactiveUI;
+
+namespace RogueEssence.Dev.Views
+{
+    public class AutoCompleteBinder<T> : ReactiveObject
+    {
+        private string _searchText = string.Empty;
+
+        public string SearchText
+        {
+            get => _searchText;
+            set => this.RaiseAndSetIfChanged(ref _searchText, value);
+        }
+
+        private T _chosenItem;
+
+        public T ChosenItem
+        {
+            get => _chosenItem;
+            set
+            {
+                if (EqualityComparer<T>.Default.Equals(_chosenItem, value)) return;
+                this.RaiseAndSetIfChanged(ref _chosenItem, value);
+                AcceptChosenItem(value);
+            }
+        }
+
+        public IList<T> Items { get; }
+
+
+        private readonly Action<T> _updateModel;
+
+        public AutoCompleteBinder(IList<T> items, Action<T> updateModel = null)
+        {
+            Items = items;
+            _updateModel = updateModel;
+        }
+        
+        public AutoCompleteBinder(IList<T> items, T initialSelection = default, Action<T> updateModel = null)
+        {
+            Items = items;
+            _updateModel = updateModel;
+
+            if (initialSelection != null)
+                ChosenItem = initialSelection;
+            
+            _searchText = _chosenItem?.ToString() ?? string.Empty;
+        }
+
+
+        private void AcceptChosenItem(T item)
+        {
+            if (item == null) return;
+            _updateModel?.Invoke(item);
+            SearchText = item.ToString();
+        }
+
+
+        public void AcceptSearchText()
+        {
+            if (string.IsNullOrWhiteSpace(SearchText)) return;
+
+            var match = Items.FirstOrDefault(x =>
+                x.ToString().StartsWith(SearchText, StringComparison.InvariantCultureIgnoreCase));
+
+            if (match != null)
+                ChosenItem = match;
+        }
+    }
+}
diff --git a/RogueEssence.Editor.Avalonia/Views/UserControls/AutoCompleteBinderBox.cs b/RogueEssence.Editor.Avalonia/Views/UserControls/AutoCompleteBinderBox.cs
new file mode 100644
index 00000000..45bd91bc
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/Views/UserControls/AutoCompleteBinderBox.cs
@@ -0,0 +1,81 @@
+using Avalonia.Controls;
+using Avalonia.Input;
+using System;
+using System.Linq;
+
+
+namespace RogueEssence.Dev.Views {
+
+
+
+public class AutoCompleteBinderBox<T> : AutoCompleteBox
+{
+    /// <summary>
+    /// Optional callback invoked when the user accepts the typed text.
+    /// </summary>
+    public Action<T> AcceptAction { get; set; }
+
+    protected override void OnKeyUp(KeyEventArgs e)
+    {
+        base.OnKeyUp(e);
+
+        if (e.Key == Key.Enter)
+        {
+            AcceptTypedText();
+            e.Handled = true;
+        }
+        else
+        {
+            // Open the dropdown if the box is empty
+            if (string.IsNullOrWhiteSpace(Text))
+            {
+                IsDropDownOpen = true;
+                FilterItems();
+            }
+        }
+    }
+
+    protected override void OnLostFocus(Avalonia.Interactivity.RoutedEventArgs e)
+    {
+        base.OnLostFocus(e);
+        AcceptTypedText();
+    }
+
+    private void AcceptTypedText()
+    {
+        if (SelectedItem != null) // already selected
+        {
+            AcceptAction?.Invoke((T)SelectedItem);
+            return;
+        }
+
+        // Try to match typed text
+        if (!string.IsNullOrEmpty(Text))
+        {
+            var match = ItemsSource.Cast<T>().FirstOrDefault(item =>
+                item.ToString().StartsWith(Text, StringComparison.InvariantCultureIgnoreCase));
+
+            if (match != null)
+            {
+                SelectedItem = match;
+                AcceptAction?.Invoke(match);
+            }
+        }
+    }
+
+    /// <summary>
+    /// Forces dropdown to show all items when empty
+    /// </summary>
+    private void FilterItems()
+    {
+        // Avalonia AutoCompleteBox will filter based on Text.
+        // Setting Text="" and reopening dropdown shows all items.
+        IsDropDownOpen = true;
+    }
+}
+public class AutoCompleteStringBox : AutoCompleteBinderBox<string>
+{
+    // Nothing extra is needed — just a type alias for XAML use
+}
+
+}
\ No newline at end of file
diff --git a/RogueEssence/RogueEssence.csproj b/RogueEssence/RogueEssence.csproj
index 488ad4c4..6701ec98 100644
--- a/RogueEssence/RogueEssence.csproj
+++ b/RogueEssence/RogueEssence.csproj
@@ -8,12 +8,15 @@
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
   <ItemGroup>
+    <PackageReference Include="Avalonia" Version="11.3.8" />
     <PackageReference Include="JsonDiffPatch.Net" Version="2.3.0" />
     <PackageReference Include="LiteNetLib" Version="0.9.5.2" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0" />
 	<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
 	<PackageReference Include="ResXResourceReader.NetStandard" Version="1.0.1" />
     <PackageReference Include="System.Resources.Extensions" Version="4.6.0" />
     <PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0" />
+    <PackageReference Include="Tabalonia" Version="0.10.7" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\FNA\FNA.Core.csproj" />

From e7b60f284800cfed7950a6287f87d9997b6d0648 Mon Sep 17 00:00:00 2001
From: Kace <41309226+DoubleTrio@users.noreply.github.com>
Date: Sat, 15 Nov 2025 22:24:22 -0500
Subject: [PATCH 05/51] minor fixes

---
 RogueEssence.Editor.Avalonia/Program.cs                        | 1 -
 .../RogueEssence.Editor.Avalonia.csproj                        | 3 ++-
 RogueEssence/RogueEssence.csproj                               | 2 --
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/RogueEssence.Editor.Avalonia/Program.cs b/RogueEssence.Editor.Avalonia/Program.cs
index eed12217..657b634e 100644
--- a/RogueEssence.Editor.Avalonia/Program.cs
+++ b/RogueEssence.Editor.Avalonia/Program.cs
@@ -10,7 +10,6 @@ public class Program
         // Initialization code. Don't use any Avalonia, third-party APIs or any
         // SynchronizationContext-reliant code before AppMain is called: things aren't initialized
         // yet and stuff might break.
-        [STAThread]
         public static void Main(string[] args)
         {
             Native.OS.SetupDataDir();
diff --git a/RogueEssence.Editor.Avalonia/RogueEssence.Editor.Avalonia.csproj b/RogueEssence.Editor.Avalonia/RogueEssence.Editor.Avalonia.csproj
index 839d1b1d..77513929 100644
--- a/RogueEssence.Editor.Avalonia/RogueEssence.Editor.Avalonia.csproj
+++ b/RogueEssence.Editor.Avalonia/RogueEssence.Editor.Avalonia.csproj
@@ -17,6 +17,7 @@
     <PackageReference Include="Avalonia.ReactiveUI" Version="11.3.8" />
     <PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.8" />
     <PackageReference Include="ResXResourceReader.NetStandard" Version="1.0.1" />
+    <PackageReference Include="Tabalonia" Version="0.10.7" />
   </ItemGroup>
   <ItemGroup>
     <Compile Update="DataEditor\DataEditRootForm.axaml.cs">
@@ -183,6 +184,6 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="ViewModels\New\New\.DS_Store" />
+    <Folder Include="Models\" />
   </ItemGroup>
 </Project>
diff --git a/RogueEssence/RogueEssence.csproj b/RogueEssence/RogueEssence.csproj
index 6701ec98..12c26e0e 100644
--- a/RogueEssence/RogueEssence.csproj
+++ b/RogueEssence/RogueEssence.csproj
@@ -8,7 +8,6 @@
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="11.3.8" />
     <PackageReference Include="JsonDiffPatch.Net" Version="2.3.0" />
     <PackageReference Include="LiteNetLib" Version="0.9.5.2" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0" />
@@ -16,7 +15,6 @@
 	<PackageReference Include="ResXResourceReader.NetStandard" Version="1.0.1" />
     <PackageReference Include="System.Resources.Extensions" Version="4.6.0" />
     <PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0" />
-    <PackageReference Include="Tabalonia" Version="0.10.7" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\FNA\FNA.Core.csproj" />

From bd8e222d9d2c2833adba32b7d7580101f5f56c8c Mon Sep 17 00:00:00 2001
From: Kace <41309226+DoubleTrio@users.noreply.github.com>
Date: Sat, 15 Nov 2025 23:05:52 -0500
Subject: [PATCH 06/51] editor loads

---
 RogueEssence.Editor.Avalonia/App.axaml.cs     |   4 +-
 .../ViewModels/DevForm/DevFormViewModel.cs    |  78 +-
 .../ViewModels/New/MainWindowViewModel.cs     |  19 +
 .../Views/DevForm/DevForm.axaml               |  68 +-
 .../Views/DevForm/DevForm.axaml.cs            | 884 +++++++++---------
 .../New/{MainWindow.axaml => DevForm.axaml}   |  78 +-
 .../Views/New/DevForm.axaml.cs                | 664 +++++++++++++
 .../Views/New/MainWindow.axaml.cs             | 241 -----
 8 files changed, 1263 insertions(+), 773 deletions(-)
 rename RogueEssence.Editor.Avalonia/Views/New/{MainWindow.axaml => DevForm.axaml} (79%)
 create mode 100644 RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml.cs
 delete mode 100644 RogueEssence.Editor.Avalonia/Views/New/MainWindow.axaml.cs

diff --git a/RogueEssence.Editor.Avalonia/App.axaml.cs b/RogueEssence.Editor.Avalonia/App.axaml.cs
index cf3c3e1e..808b49ea 100644
--- a/RogueEssence.Editor.Avalonia/App.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/App.axaml.cs
@@ -131,14 +131,14 @@ public override void OnFrameworkInitializationCompleted()
 
             if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
             {
-                desktop.MainWindow = new MainWindow
+                desktop.MainWindow = new DevForm
                 {
                     DataContext = vm
                 };
             }
             else if (ApplicationLifetime is ISingleViewApplicationLifetime singleViewPlatform)
             {
-                singleViewPlatform.MainView = new MainWindow
+                singleViewPlatform.MainView = new DevForm
                 {
                     DataContext = vm
                 };
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevFormViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevFormViewModel.cs
index 93e3ad18..7beda25a 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevFormViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevFormViewModel.cs
@@ -1,39 +1,39 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using RogueEssence;
-using RogueEssence.Dungeon;
-using RogueEssence.Ground;
-using RogueEssence.Data;
-
-namespace RogueEssence.Dev.ViewModels
-{
-    public class DevFormViewModel : ViewModelBase
-    {
-        public DevFormViewModel()
-        {
-            Game = new DevTabGameViewModel();
-            Player = new DevTabPlayerViewModel();
-            Data = new DevTabDataViewModel();
-            Travel = new DevTabTravelViewModel();
-            Sprites = new DevTabSpritesViewModel();
-            Script = new DevTabScriptViewModel();
-            Mods = new DevTabModsViewModel();
-            Constants = new DevTabConstantsViewModel();
-        }
-
-        public DevTabGameViewModel Game { get; set; }
-        public DevTabPlayerViewModel Player { get; set; }
-        public DevTabDataViewModel Data { get; set; }
-        public DevTabTravelViewModel Travel { get; set; }
-        public DevTabSpritesViewModel Sprites { get; set; }
-        public DevTabScriptViewModel Script { get; set; }
-        public DevTabModsViewModel Mods { get; set; }
-        public DevTabConstantsViewModel Constants { get; set; }
-
-
-
-
-
-    }
-}
+// using System;
+// using System.Collections.Generic;
+// using System.Text;
+// using RogueEssence;
+// using RogueEssence.Dungeon;
+// using RogueEssence.Ground;
+// using RogueEssence.Data;
+//
+// namespace RogueEssence.Dev.ViewModels
+// {
+//     public class DevFormViewModel : ViewModelBase
+//     {
+//         public DevFormViewModel()
+//         {
+//             Game = new DevTabGameViewModel();
+//             Player = new DevTabPlayerViewModel();
+//             Data = new DevTabDataViewModel();
+//             Travel = new DevTabTravelViewModel();
+//             Sprites = new DevTabSpritesViewModel();
+//             Script = new DevTabScriptViewModel();
+//             Mods = new DevTabModsViewModel();
+//             Constants = new DevTabConstantsViewModel();
+//         }
+//
+//         public DevTabGameViewModel Game { get; set; }
+//         public DevTabPlayerViewModel Player { get; set; }
+//         public DevTabDataViewModel Data { get; set; }
+//         public DevTabTravelViewModel Travel { get; set; }
+//         public DevTabSpritesViewModel Sprites { get; set; }
+//         public DevTabScriptViewModel Script { get; set; }
+//         public DevTabModsViewModel Mods { get; set; }
+//         public DevTabConstantsViewModel Constants { get; set; }
+//
+//
+//
+//
+//
+//     }
+// }
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/MainWindowViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/MainWindowViewModel.cs
index cd06da31..327c9986 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/MainWindowViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/MainWindowViewModel.cs
@@ -15,6 +15,17 @@ namespace RogueEssence.Dev.ViewModels;
 
 public class MainWindowViewModel : ViewModelBase
 {
+    public DevTabGameViewModel Game { get; set; }
+    public DevTabPlayerViewModel Player { get; set; }
+    public DevTabDataViewModel Data { get; set; }
+    public DevTabTravelViewModel Travel { get; set; }
+    public DevTabSpritesViewModel Sprites { get; set; }
+    public DevTabScriptViewModel Script { get; set; }
+    public DevTabModsViewModel Mods { get; set; }
+    public DevTabConstantsViewModel Constants { get; set; }
+
+
+    
     private readonly NodeFactory _nodeFactory;
 
 
@@ -265,6 +276,14 @@ public MainWindowViewModel() : this(new PageFactory(new DesignServiceProvider())
     public MainWindowViewModel(PageFactory pageFactory, NodeFactory nodeFactory, IDialogService dialogService,
         TabEvents tabEvents)
     {
+        Game = new DevTabGameViewModel();
+        Player = new DevTabPlayerViewModel();
+        Data = new DevTabDataViewModel();
+        Travel = new DevTabTravelViewModel();
+        Sprites = new DevTabSpritesViewModel();
+        Script = new DevTabScriptViewModel();
+        Mods = new DevTabModsViewModel();
+        Constants = new DevTabConstantsViewModel();
         _pageFactory = pageFactory;
         _tabEvents = tabEvents;
         _nodeFactory = nodeFactory;
diff --git a/RogueEssence.Editor.Avalonia/Views/DevForm/DevForm.axaml b/RogueEssence.Editor.Avalonia/Views/DevForm/DevForm.axaml
index 6e1afc44..4290e1dd 100644
--- a/RogueEssence.Editor.Avalonia/Views/DevForm/DevForm.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/DevForm/DevForm.axaml
@@ -5,38 +5,40 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         mc:Ignorable="d"
-        x:Class="RogueEssence.Dev.Views.DevForm"
-        Title="Dev Controls" Height="480" Width="460" Opened="Window_Loaded" Closed="Window_Closed">
+
+        Title="Dev Controls" Height="480" Width="460">
+    <!-- x:Class="RogueEssence.Dev.Views.DevForm" -->
+    <!--  Opened="Window_Loaded" Closed="Window_Closed -->
   <!--Icon="/Assets/app-logo.ico"-->
-    <Design.DataContext>
-        <vm:DevFormViewModel/>
-    </Design.DataContext>
-  <Grid>
-    <TabControl TabStripPlacement="Top" Margin="2">
-      <TabItem Header="Game" >
-        <views:DevTabGame DataContext="{Binding Game}"/>
-      </TabItem>
-      <TabItem Header="Player" >
-        <views:DevTabPlayer DataContext="{Binding Player}"/>
-      </TabItem>
-      <TabItem Header="Travel" >
-        <views:DevTabTravel DataContext="{Binding Travel}"/>
-      </TabItem>
-      <TabItem Header="Data" >
-        <views:DevTabData DataContext="{Binding Data}"/>
-      </TabItem>
-      <TabItem Header="Sprites" >
-        <views:DevTabSprites DataContext="{Binding Sprites}"/>
-      </TabItem>
-      <TabItem Header="Script" >
-        <views:DevTabScript DataContext="{Binding Script}"/>
-      </TabItem>
-      <TabItem Header="Mods" >
-        <views:DevTabMods DataContext="{Binding Mods}"/>
-      </TabItem>
-      <TabItem Header="Constants" >
-        <views:DevTabConstants DataContext="{Binding Constants}"/>
-      </TabItem>
-    </TabControl>
-  </Grid>
+  <!--   <Design.DataContext> -->
+  <!--       <vm:DevFormViewModel/> -->
+  <!--   </Design.DataContext> -->
+  <!-- <Grid> -->
+  <!--   <TabControl TabStripPlacement="Top" Margin="2"> -->
+  <!--     <TabItem Header="Game" > -->
+  <!--       <views:DevTabGame DataContext="{Binding Game}"/> -->
+  <!--     </TabItem> -->
+  <!--     <TabItem Header="Player" > -->
+  <!--       <views:DevTabPlayer DataContext="{Binding Player}"/> -->
+  <!--     </TabItem> -->
+  <!--     <TabItem Header="Travel" > -->
+  <!--       <views:DevTabTravel DataContext="{Binding Travel}"/> -->
+  <!--     </TabItem> -->
+  <!--     <TabItem Header="Data" > -->
+  <!--       <views:DevTabData DataContext="{Binding Data}"/> -->
+  <!--     </TabItem> -->
+  <!--     <TabItem Header="Sprites" > -->
+  <!--       <views:DevTabSprites DataContext="{Binding Sprites}"/> -->
+  <!--     </TabItem> -->
+  <!--     <TabItem Header="Script" > -->
+  <!--       <views:DevTabScript DataContext="{Binding Script}"/> -->
+  <!--     </TabItem> -->
+  <!--     <TabItem Header="Mods" > -->
+  <!--       <views:DevTabMods DataContext="{Binding Mods}"/> -->
+  <!--     </TabItem> -->
+  <!--     <TabItem Header="Constants" > -->
+  <!--       <views:DevTabConstants DataContext="{Binding Constants}"/> -->
+  <!--     </TabItem> -->
+  <!--   </TabControl> -->
+  <!-- </Grid> -->
 </Window>
diff --git a/RogueEssence.Editor.Avalonia/Views/DevForm/DevForm.axaml.cs b/RogueEssence.Editor.Avalonia/Views/DevForm/DevForm.axaml.cs
index 1cf7d341..72afc3b1 100644
--- a/RogueEssence.Editor.Avalonia/Views/DevForm/DevForm.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/DevForm/DevForm.axaml.cs
@@ -1,442 +1,442 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
-using Avalonia.Input;
-using Avalonia.Interactivity;
-using System;
-using RogueEssence;
-using RogueEssence.Dev;
-using Microsoft.Xna.Framework;
-using Avalonia.Threading;
-using System.Threading;
-using RogueEssence.Data;
-using RogueEssence.Content;
-using System.Collections;
-using System.Collections.Generic;
-using System.IO;
-
-namespace RogueEssence.Dev.Views
-{
-    public partial class DevForm : Window, IRootEditor
-    {
-        public bool LoadComplete { get; private set; }
-
-        public MapEditForm MapEditForm;
-        public GroundEditForm GroundEditForm;
-
-        private Action pendingEditorAction;
-        private Exception pendingException;
-
-        public IMapEditor MapEditor { get { return MapEditForm; } }
-        public IGroundEditor GroundEditor { get { return GroundEditForm; } }
-        public bool AteMouse { get { return false; } }
-        public bool AteKeyboard { get { return false; } }
-
-        private static Dictionary<string, string> devConfig;
-        private static bool canSave;
-
-
-
-        public DevForm()
-        {
-            InitializeComponent();
-        }
-        
-        void IRootEditor.Load(GameBase game)
-        {
-            ExecuteOrInvoke(load);
-        }
-
-        private void load()
-        {
-            lock (GameBase.lockObj)
-            {
-                DevDataManager.Init();
-
-                loadDevConfig();
-
-                reload(DataManager.DataType.All);
-
-                LoadComplete = true;
-            }
-        }
-
-
-        void IRootEditor.ReloadData(DataManager.DataType dataType)
-        {
-            ExecuteOrInvoke(() => { reload(dataType); });
-        }
-
-        private void reload(DataManager.DataType dataType)
-        {
-            lock (GameBase.lockObj)
-            {
-                if (dataType == DataManager.DataType.All)
-                    DevDataManager.ClearCaches();
-
-                ViewModels.DevFormViewModel devViewModel = (ViewModels.DevFormViewModel)this.DataContext;
-
-                if (dataType == DataManager.DataType.All)
-                {
-                    devViewModel.Game.HideSprites = DataManager.Instance.HideChars;
-                    devViewModel.Game.HideObjects = DataManager.Instance.HideObjects;
-                    devViewModel.Travel.DebugGen = DiagManager.Instance.ListenGen;
-                }
-
-                if ((dataType & DataManager.DataType.Skill) != DataManager.DataType.None)
-                    devViewModel.Game.ReloadSkills();
-
-                if ((dataType & DataManager.DataType.Intrinsic) != DataManager.DataType.None)
-                    devViewModel.Game.ReloadIntrinsics();
-
-                if ((dataType & DataManager.DataType.Status) != DataManager.DataType.None)
-                    devViewModel.Game.ReloadStatuses();
-
-                if ((dataType & DataManager.DataType.Item) != DataManager.DataType.None)
-                    devViewModel.Game.ReloadItems();
-
-
-                if ((dataType & DataManager.DataType.Monster) != DataManager.DataType.None)
-                {
-                    devViewModel.Player.LoadMonstersNumeric();
-                    devViewModel.Player.ReloadMonsters();
-                }
-
-                if (dataType == DataManager.DataType.All)
-                {
-                    int globalIdle = GraphicsManager.GlobalIdle;
-                    devViewModel.Player.Anims.Clear();
-                    for (int ii = 0; ii < GraphicsManager.Actions.Count; ii++)
-                        devViewModel.Player.Anims.Add(GraphicsManager.Actions[ii].Name);
-                    devViewModel.Player.ChosenAnim = -1;
-                    devViewModel.Player.ChosenAnim = globalIdle;
-                }
-
-                if ((dataType & DataManager.DataType.Zone) != DataManager.DataType.None)
-                    devViewModel.Travel.ReloadZones();
-
-                if (dataType == DataManager.DataType.All)
-                    devViewModel.Mods.UpdateMod();
-
-                LoadComplete = true;
-            }
-        }
-
-
-        public void Update(GameTime gameTime)
-        {
-            if (pendingEditorAction != null)
-            {
-                try
-                {
-                    pendingEditorAction();
-                    pendingException = null;
-                }
-                catch (Exception ex)
-                {
-                    pendingException = ex;
-                }
-                pendingEditorAction = null;
-            }
-
-            ExecuteOrInvoke(update);
-        }
-
-        private void update()
-        {
-            lock (GameBase.lockObj)
-            {
-                ViewModels.DevFormViewModel devViewModel = (ViewModels.DevFormViewModel)this.DataContext;
-
-                devViewModel.Player.UpdateLevel();
-                if (GameManager.Instance.IsInGame())
-                {
-                    if (!devViewModel.Player.JustOnce)
-                    {
-                        if (devViewModel.Player.JustMe)
-                        {
-                            int currentIdle = Dungeon.DungeonScene.Instance.FocusedCharacter.IdleOverride;
-                            if (currentIdle < 0)
-                                currentIdle = GraphicsManager.GlobalIdle;
-                            devViewModel.Player.ChosenAnim = currentIdle;
-                        }
-                        else
-                            devViewModel.Player.ChosenAnim = GraphicsManager.GlobalIdle;
-                    }
-                    devViewModel.Player.UpdateSpecies(Dungeon.DungeonScene.Instance.FocusedCharacter.BaseForm);
-                }
-                if (GroundEditForm != null)
-                {
-                    ViewModels.GroundEditViewModel vm = (ViewModels.GroundEditViewModel)GroundEditForm.DataContext;
-                    vm.Textures.TileBrowser.UpdateFrame();
-                }
-                if (MapEditForm != null)
-                {
-                    ViewModels.MapEditViewModel vm = (ViewModels.MapEditViewModel)MapEditForm.DataContext;
-                    vm.Textures.TileBrowser.UpdateFrame();
-                    vm.Terrain.TileBrowser.UpdateFrame();
-                }
-
-                if (canSave)
-                    saveConfig();
-            }
-        }
-        public void Draw() { }
-
-        public void OpenGround()
-        {
-            ExecuteOrInvoke(openGround);
-        }
-
-        private void openGround()
-        {
-            GroundEditForm = new GroundEditForm();
-            ViewModels.GroundEditViewModel vm = new ViewModels.GroundEditViewModel();
-            GroundEditForm.DataContext = vm;
-            vm.LoadFromCurrentGround();
-            GroundEditForm.Show();
-        }
-
-        public void OpenMap()
-        {
-            ExecuteOrInvoke(openMap);
-        }
-
-        public void openMap()
-        {
-            MapEditForm = new MapEditForm();
-            ViewModels.MapEditViewModel vm = new ViewModels.MapEditViewModel();
-            MapEditForm.DataContext = vm;
-            vm.LoadFromCurrentMap();
-            MapEditForm.Show();
-        }
-
-        public void groundEditorClosed(object sender, EventArgs e)
-        {
-            GameManager.Instance.SceneOutcome = resetEditors();
-        }
-
-        public void mapEditorClosed(object sender, EventArgs e)
-        {
-            GameManager.Instance.SceneOutcome = resetEditors();
-        }
-
-
-        private IEnumerator<YieldInstruction> resetEditors()
-        {
-            GroundEditForm = null;
-            MapEditForm = null;
-            yield return CoroutineManager.Instance.StartCoroutine(GameManager.Instance.RestartToTitle());
-        }
-
-
-        public void CloseGround()
-        {
-            if (GroundEditForm != null)
-                GroundEditForm.Close();
-        }
-
-        public void CloseMap()
-        {
-            if (MapEditForm != null)
-                MapEditForm.Close();
-        }
-
-
-        void LoadGame()
-        {
-            // Windows - CAN run game in new thread, CAN run game in same thread via dispatch.
-            // Mac - CANNOT run game in new thread, CAN run game in same thread via dispatch.
-            // Linux - CAN run the game in new thread, CANNOT run game in same thread via dispatch.
-
-            // When the game is started, it should run a continuous loop, blocking the UI
-            // However, this is only happening on linux.  Why not windows and mac?
-            // With Mac, cocoa can ONLY start the game window if it's on the main thread. Weird...
-
-            if (!OperatingSystem.IsLinux())
-                LoadGameDelegate();
-            else
-            {
-                Thread thread = new Thread(LoadGameDelegate);
-                thread.IsBackground = true;
-                thread.Start();
-            }
-        }
-
-        /// <summary>
-        /// A method intended to be called from the editor thread, that sends a function pointer to the Game thread,
-        /// waits for it to complete (blocking the thread), and then continues execution.
-        /// This call cannot be performed within a lock!!
-        /// </summary>
-        /// <param name="action"></param>
-        public static void ExecuteOrPend(Action action)
-        {
-            if (!OperatingSystem.IsLinux())
-                action();
-            else
-            {
-                DevForm editor = (DevForm)DiagManager.Instance.DevEditor;
-                editor.pendingEditorAction = action;
-
-                SpinWait.SpinUntil(() => editor.pendingEditorAction == null);
-
-                if (editor.pendingException != null)
-                {
-                    Exception ex = editor.pendingException;
-                    throw ex;
-                }
-            }
-        }
-
-        public static void ExecuteOrInvoke(Action action)
-        {
-            if (!OperatingSystem.IsLinux())
-                action();
-            else
-                Dispatcher.UIThread.InvokeAsync(action, DispatcherPriority.Background);
-        }
-
-        void LoadGameDelegate()
-        {
-            try
-            {
-                DiagManager.Instance.DevEditor = this;
-                using (GameBase game = new GameBase())
-                    game.Run();
-            }
-            catch (Exception ex)
-            {
-                DiagManager.Instance.LogError(ex);
-            }
-            ExecuteOrInvoke(Close);
-        }
-
-        public void Window_Loaded(object sender, EventArgs e)
-        {
-            if (Design.IsDesignMode)
-                return;
-            //Thread thread = new Thread(LoadGame);
-            //thread.IsBackground = true;
-            //thread.Start();
-            Dispatcher.UIThread.InvokeAsync(LoadGame, DispatcherPriority.Background);
-            //LoadGame();
-        }
-
-        public void Window_Closed(object sender, EventArgs e)
-        {
-            DiagManager.Instance.LoadMsg = "Closing...";
-            EnterLoadPhase(GameBase.LoadPhase.Unload);
-        }
-
-        public static void EnterLoadPhase(GameBase.LoadPhase loadState)
-        {
-            GameBase.CurrentPhase = loadState;
-        }
-
-
-
-        private static void loadDevConfig()
-        {
-            devConfig = new Dictionary<string, string>();
-
-            try
-            {
-                string configPath = GetConfigPath();
-                string folderPath = Path.GetDirectoryName(configPath);
-                if (!Directory.Exists(folderPath))
-                    Directory.CreateDirectory(folderPath);
-
-                if (File.Exists(configPath))
-                {
-                    using (FileStream stream = File.OpenRead(configPath))
-                    {
-                        using (BinaryReader reader = new BinaryReader(stream))
-                        {
-                            while (reader.BaseStream.Position < reader.BaseStream.Length)
-                            {
-                                string key = reader.ReadString();
-                                string val = reader.ReadString();
-                                devConfig[key] = val;
-                            }
-                        }
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                DiagManager.Instance.LogError(ex);
-            }
-        }
-
-
-        private static void saveConfig()
-        {
-            //save whole file
-            try
-            {
-                using (var writer = new BinaryWriter(new FileStream(GetConfigPath(), FileMode.Create, FileAccess.Write, FileShare.None)))
-                {
-                    foreach (string curKey in devConfig.Keys)
-                    {
-                        writer.Write(curKey);
-                        writer.Write(devConfig[curKey]);
-                    }
-                }
-            }
-            catch (IOException ioEx)
-            {
-                DiagManager.Instance.LogError(ioEx, false);
-            }
-            catch (Exception ex)
-            {
-                DiagManager.Instance.LogError(ex);
-            }
-        }
-
-        public static string GetConfig(string key, string def)
-        {
-            string val;
-            if (devConfig.TryGetValue(key, out val))
-                return val;
-            return def;
-        }
-
-        public static int GetConfig(string key, int def)
-        {
-            string val;
-            if (devConfig.TryGetValue(key, out val))
-            {
-                int result;
-                if (Int32.TryParse(val, out result))
-                    return result;
-            }
-            return def;
-        }
-
-        public static void SetConfig(string key, int val)
-        {
-            SetConfig(key, val.ToString());
-        }
-
-        public static void SetConfig(string key, string val)
-        {
-            if (val == null && devConfig.ContainsKey(key))
-                devConfig.Remove(key);
-            else
-                devConfig[key] = val;
-
-            canSave = true;
-        }
-
-        public static string GetConfigPath()
-        {
-            //https://jimrich.sk/environment-specialfolder-on-windows-linux-and-os-x/
-            //MacOS actually uses a different folder for config data, traditionally
-            //I guess it's the odd one out...
-            if (OperatingSystem.IsMacOS())
-                return PathMod.FromApp("./devConfig");//Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Personal), "/Library/Application Support/RogueEssence/config");
-            else
-                return PathMod.FromApp("./devConfig");//Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "RogueEssence /devConfig");
-        }
-    }
-}
+// using Avalonia;
+// using Avalonia.Controls;
+// using Avalonia.Markup.Xaml;
+// using Avalonia.Input;
+// using Avalonia.Interactivity;
+// using System;
+// using RogueEssence;
+// using RogueEssence.Dev;
+// using Microsoft.Xna.Framework;
+// using Avalonia.Threading;
+// using System.Threading;
+// using RogueEssence.Data;
+// using RogueEssence.Content;
+// using System.Collections;
+// using System.Collections.Generic;
+// using System.IO;
+//
+// namespace RogueEssence.Dev.Views
+// {
+//     public partial class DevForm : Window, IRootEditor
+//     {
+//         public bool LoadComplete { get; private set; }
+//
+//         public MapEditForm MapEditForm;
+//         public GroundEditForm GroundEditForm;
+//
+//         private Action pendingEditorAction;
+//         private Exception pendingException;
+//
+//         public IMapEditor MapEditor { get { return MapEditForm; } }
+//         public IGroundEditor GroundEditor { get { return GroundEditForm; } }
+//         public bool AteMouse { get { return false; } }
+//         public bool AteKeyboard { get { return false; } }
+//
+//         private static Dictionary<string, string> devConfig;
+//         private static bool canSave;
+//
+//
+//
+//         public DevForm()
+//         {
+//             InitializeComponent();
+//         }
+//         
+//         void IRootEditor.Load(GameBase game)
+//         {
+//             ExecuteOrInvoke(load);
+//         }
+//
+//         private void load()
+//         {
+//             lock (GameBase.lockObj)
+//             {
+//                 DevDataManager.Init();
+//
+//                 loadDevConfig();
+//
+//                 reload(DataManager.DataType.All);
+//
+//                 LoadComplete = true;
+//             }
+//         }
+//
+//
+//         void IRootEditor.ReloadData(DataManager.DataType dataType)
+//         {
+//             ExecuteOrInvoke(() => { reload(dataType); });
+//         }
+//
+//         private void reload(DataManager.DataType dataType)
+//         {
+//             lock (GameBase.lockObj)
+//             {
+//                 if (dataType == DataManager.DataType.All)
+//                     DevDataManager.ClearCaches();
+//
+//                 ViewModels.DevFormViewModel devViewModel = (ViewModels.DevFormViewModel)this.DataContext;
+//
+//                 if (dataType == DataManager.DataType.All)
+//                 {
+//                     devViewModel.Game.HideSprites = DataManager.Instance.HideChars;
+//                     devViewModel.Game.HideObjects = DataManager.Instance.HideObjects;
+//                     devViewModel.Travel.DebugGen = DiagManager.Instance.ListenGen;
+//                 }
+//
+//                 if ((dataType & DataManager.DataType.Skill) != DataManager.DataType.None)
+//                     devViewModel.Game.ReloadSkills();
+//
+//                 if ((dataType & DataManager.DataType.Intrinsic) != DataManager.DataType.None)
+//                     devViewModel.Game.ReloadIntrinsics();
+//
+//                 if ((dataType & DataManager.DataType.Status) != DataManager.DataType.None)
+//                     devViewModel.Game.ReloadStatuses();
+//
+//                 if ((dataType & DataManager.DataType.Item) != DataManager.DataType.None)
+//                     devViewModel.Game.ReloadItems();
+//
+//
+//                 if ((dataType & DataManager.DataType.Monster) != DataManager.DataType.None)
+//                 {
+//                     devViewModel.Player.LoadMonstersNumeric();
+//                     devViewModel.Player.ReloadMonsters();
+//                 }
+//
+//                 if (dataType == DataManager.DataType.All)
+//                 {
+//                     int globalIdle = GraphicsManager.GlobalIdle;
+//                     devViewModel.Player.Anims.Clear();
+//                     for (int ii = 0; ii < GraphicsManager.Actions.Count; ii++)
+//                         devViewModel.Player.Anims.Add(GraphicsManager.Actions[ii].Name);
+//                     devViewModel.Player.ChosenAnim = -1;
+//                     devViewModel.Player.ChosenAnim = globalIdle;
+//                 }
+//
+//                 if ((dataType & DataManager.DataType.Zone) != DataManager.DataType.None)
+//                     devViewModel.Travel.ReloadZones();
+//
+//                 if (dataType == DataManager.DataType.All)
+//                     devViewModel.Mods.UpdateMod();
+//
+//                 LoadComplete = true;
+//             }
+//         }
+//
+//
+//         public void Update(GameTime gameTime)
+//         {
+//             if (pendingEditorAction != null)
+//             {
+//                 try
+//                 {
+//                     pendingEditorAction();
+//                     pendingException = null;
+//                 }
+//                 catch (Exception ex)
+//                 {
+//                     pendingException = ex;
+//                 }
+//                 pendingEditorAction = null;
+//             }
+//
+//             ExecuteOrInvoke(update);
+//         }
+//
+//         private void update()
+//         {
+//             lock (GameBase.lockObj)
+//             {
+//                 ViewModels.DevFormViewModel devViewModel = (ViewModels.DevFormViewModel)this.DataContext;
+//
+//                 devViewModel.Player.UpdateLevel();
+//                 if (GameManager.Instance.IsInGame())
+//                 {
+//                     if (!devViewModel.Player.JustOnce)
+//                     {
+//                         if (devViewModel.Player.JustMe)
+//                         {
+//                             int currentIdle = Dungeon.DungeonScene.Instance.FocusedCharacter.IdleOverride;
+//                             if (currentIdle < 0)
+//                                 currentIdle = GraphicsManager.GlobalIdle;
+//                             devViewModel.Player.ChosenAnim = currentIdle;
+//                         }
+//                         else
+//                             devViewModel.Player.ChosenAnim = GraphicsManager.GlobalIdle;
+//                     }
+//                     devViewModel.Player.UpdateSpecies(Dungeon.DungeonScene.Instance.FocusedCharacter.BaseForm);
+//                 }
+//                 if (GroundEditForm != null)
+//                 {
+//                     ViewModels.GroundEditViewModel vm = (ViewModels.GroundEditViewModel)GroundEditForm.DataContext;
+//                     vm.Textures.TileBrowser.UpdateFrame();
+//                 }
+//                 if (MapEditForm != null)
+//                 {
+//                     ViewModels.MapEditViewModel vm = (ViewModels.MapEditViewModel)MapEditForm.DataContext;
+//                     vm.Textures.TileBrowser.UpdateFrame();
+//                     vm.Terrain.TileBrowser.UpdateFrame();
+//                 }
+//
+//                 if (canSave)
+//                     saveConfig();
+//             }
+//         }
+//         public void Draw() { }
+//
+//         public void OpenGround()
+//         {
+//             ExecuteOrInvoke(openGround);
+//         }
+//
+//         private void openGround()
+//         {
+//             GroundEditForm = new GroundEditForm();
+//             ViewModels.GroundEditViewModel vm = new ViewModels.GroundEditViewModel();
+//             GroundEditForm.DataContext = vm;
+//             vm.LoadFromCurrentGround();
+//             GroundEditForm.Show();
+//         }
+//
+//         public void OpenMap()
+//         {
+//             ExecuteOrInvoke(openMap);
+//         }
+//
+//         public void openMap()
+//         {
+//             MapEditForm = new MapEditForm();
+//             ViewModels.MapEditViewModel vm = new ViewModels.MapEditViewModel();
+//             MapEditForm.DataContext = vm;
+//             vm.LoadFromCurrentMap();
+//             MapEditForm.Show();
+//         }
+//
+//         public void groundEditorClosed(object sender, EventArgs e)
+//         {
+//             GameManager.Instance.SceneOutcome = resetEditors();
+//         }
+//
+//         public void mapEditorClosed(object sender, EventArgs e)
+//         {
+//             GameManager.Instance.SceneOutcome = resetEditors();
+//         }
+//
+//
+//         private IEnumerator<YieldInstruction> resetEditors()
+//         {
+//             GroundEditForm = null;
+//             MapEditForm = null;
+//             yield return CoroutineManager.Instance.StartCoroutine(GameManager.Instance.RestartToTitle());
+//         }
+//
+//
+//         public void CloseGround()
+//         {
+//             if (GroundEditForm != null)
+//                 GroundEditForm.Close();
+//         }
+//
+//         public void CloseMap()
+//         {
+//             if (MapEditForm != null)
+//                 MapEditForm.Close();
+//         }
+//
+//
+//         void LoadGame()
+//         {
+//             // Windows - CAN run game in new thread, CAN run game in same thread via dispatch.
+//             // Mac - CANNOT run game in new thread, CAN run game in same thread via dispatch.
+//             // Linux - CAN run the game in new thread, CANNOT run game in same thread via dispatch.
+//
+//             // When the game is started, it should run a continuous loop, blocking the UI
+//             // However, this is only happening on linux.  Why not windows and mac?
+//             // With Mac, cocoa can ONLY start the game window if it's on the main thread. Weird...
+//
+//             if (!OperatingSystem.IsLinux())
+//                 LoadGameDelegate();
+//             else
+//             {
+//                 Thread thread = new Thread(LoadGameDelegate);
+//                 thread.IsBackground = true;
+//                 thread.Start();
+//             }
+//         }
+//
+//         /// <summary>
+//         /// A method intended to be called from the editor thread, that sends a function pointer to the Game thread,
+//         /// waits for it to complete (blocking the thread), and then continues execution.
+//         /// This call cannot be performed within a lock!!
+//         /// </summary>
+//         /// <param name="action"></param>
+//         public static void ExecuteOrPend(Action action)
+//         {
+//             if (!OperatingSystem.IsLinux())
+//                 action();
+//             else
+//             {
+//                 DevForm editor = (DevForm)DiagManager.Instance.DevEditor;
+//                 editor.pendingEditorAction = action;
+//
+//                 SpinWait.SpinUntil(() => editor.pendingEditorAction == null);
+//
+//                 if (editor.pendingException != null)
+//                 {
+//                     Exception ex = editor.pendingException;
+//                     throw ex;
+//                 }
+//             }
+//         }
+//
+//         public static void ExecuteOrInvoke(Action action)
+//         {
+//             if (!OperatingSystem.IsLinux())
+//                 action();
+//             else
+//                 Dispatcher.UIThread.InvokeAsync(action, DispatcherPriority.Background);
+//         }
+//
+//         void LoadGameDelegate()
+//         {
+//             try
+//             {
+//                 DiagManager.Instance.DevEditor = this;
+//                 using (GameBase game = new GameBase())
+//                     game.Run();
+//             }
+//             catch (Exception ex)
+//             {
+//                 DiagManager.Instance.LogError(ex);
+//             }
+//             ExecuteOrInvoke(Close);
+//         }
+//
+//         public void Window_Loaded(object sender, EventArgs e)
+//         {
+//             if (Design.IsDesignMode)
+//                 return;
+//             //Thread thread = new Thread(LoadGame);
+//             //thread.IsBackground = true;
+//             //thread.Start();
+//             Dispatcher.UIThread.InvokeAsync(LoadGame, DispatcherPriority.Background);
+//             //LoadGame();
+//         }
+//
+//         public void Window_Closed(object sender, EventArgs e)
+//         {
+//             DiagManager.Instance.LoadMsg = "Closing...";
+//             EnterLoadPhase(GameBase.LoadPhase.Unload);
+//         }
+//
+//         public static void EnterLoadPhase(GameBase.LoadPhase loadState)
+//         {
+//             GameBase.CurrentPhase = loadState;
+//         }
+//
+//
+//
+//         private static void loadDevConfig()
+//         {
+//             devConfig = new Dictionary<string, string>();
+//
+//             try
+//             {
+//                 string configPath = GetConfigPath();
+//                 string folderPath = Path.GetDirectoryName(configPath);
+//                 if (!Directory.Exists(folderPath))
+//                     Directory.CreateDirectory(folderPath);
+//
+//                 if (File.Exists(configPath))
+//                 {
+//                     using (FileStream stream = File.OpenRead(configPath))
+//                     {
+//                         using (BinaryReader reader = new BinaryReader(stream))
+//                         {
+//                             while (reader.BaseStream.Position < reader.BaseStream.Length)
+//                             {
+//                                 string key = reader.ReadString();
+//                                 string val = reader.ReadString();
+//                                 devConfig[key] = val;
+//                             }
+//                         }
+//                     }
+//                 }
+//             }
+//             catch (Exception ex)
+//             {
+//                 DiagManager.Instance.LogError(ex);
+//             }
+//         }
+//
+//
+//         private static void saveConfig()
+//         {
+//             //save whole file
+//             try
+//             {
+//                 using (var writer = new BinaryWriter(new FileStream(GetConfigPath(), FileMode.Create, FileAccess.Write, FileShare.None)))
+//                 {
+//                     foreach (string curKey in devConfig.Keys)
+//                     {
+//                         writer.Write(curKey);
+//                         writer.Write(devConfig[curKey]);
+//                     }
+//                 }
+//             }
+//             catch (IOException ioEx)
+//             {
+//                 DiagManager.Instance.LogError(ioEx, false);
+//             }
+//             catch (Exception ex)
+//             {
+//                 DiagManager.Instance.LogError(ex);
+//             }
+//         }
+//
+//         public static string GetConfig(string key, string def)
+//         {
+//             string val;
+//             if (devConfig.TryGetValue(key, out val))
+//                 return val;
+//             return def;
+//         }
+//
+//         public static int GetConfig(string key, int def)
+//         {
+//             string val;
+//             if (devConfig.TryGetValue(key, out val))
+//             {
+//                 int result;
+//                 if (Int32.TryParse(val, out result))
+//                     return result;
+//             }
+//             return def;
+//         }
+//
+//         public static void SetConfig(string key, int val)
+//         {
+//             SetConfig(key, val.ToString());
+//         }
+//
+//         public static void SetConfig(string key, string val)
+//         {
+//             if (val == null && devConfig.ContainsKey(key))
+//                 devConfig.Remove(key);
+//             else
+//                 devConfig[key] = val;
+//
+//             canSave = true;
+//         }
+//
+//         public static string GetConfigPath()
+//         {
+//             //https://jimrich.sk/environment-specialfolder-on-windows-linux-and-os-x/
+//             //MacOS actually uses a different folder for config data, traditionally
+//             //I guess it's the odd one out...
+//             if (OperatingSystem.IsMacOS())
+//                 return PathMod.FromApp("./devConfig");//Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Personal), "/Library/Application Support/RogueEssence/config");
+//             else
+//                 return PathMod.FromApp("./devConfig");//Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "RogueEssence /devConfig");
+//         }
+//     }
+// }
diff --git a/RogueEssence.Editor.Avalonia/Views/New/MainWindow.axaml b/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml
similarity index 79%
rename from RogueEssence.Editor.Avalonia/Views/New/MainWindow.axaml
rename to RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml
index 83e4ae80..c0b3bdfc 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/MainWindow.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml
@@ -9,8 +9,9 @@
                     mc:Ignorable="d"
                     d:DesignWidth="1024"
                     d:DesignHeight="450"
-                    x:Class="RogueEssence.Dev.Views.MainWindow"
+                    x:Class="RogueEssence.Dev.Views.DevForm"
                     x:Name="WindowMain"
+                    Opened="Window_Loaded" Closed="Window_Closed"
                     Title="Avalonia PMD Editor">
 
   <!-- <v:ChromelessWindow.DataContext> -->
@@ -32,7 +33,7 @@
             <RowDefinition Height="{Binding #WindowMain.CaptionHeight}" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
-    
+
         <!-- Top Bar -->
         <Grid Grid.Row="0" ColumnDefinitions="Auto, Auto, *, Auto">
             <Border Grid.Column="0" Grid.ColumnSpan="4"
@@ -41,7 +42,7 @@
                     Background="{DynamicResource Brush.TitleBar}"
                     BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border0}" />
             <Border Grid.Column="0" Width="72" IsVisible="{Binding #WindowMain.HasLeftCaptionButton}" />
-    
+
             <StackPanel
                 Grid.Column="{Binding #WindowMain.WindowState, Converter={StaticResource WindowStateToColumnConverter}}"
                 Orientation="Horizontal">
@@ -51,12 +52,12 @@
                     <Path HorizontalAlignment="Center" Width="14" Height="14" Margin="0,2,0,0"
                           Data="{StaticResource Icons.GearFill}" />
                 </Button>
-    
+
                 <!-- Switch Mod Button  -->
                 <Button ToolTip.Tip="{Binding CurrentMod.Key}" Margin="12, 0, 0, 0" Grid.Column="3"
                         Classes="icon_button"
                         x:Name="ModSwitcherFlyoutButton" Padding="0, 4, 0, 0">
-    
+
                     <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
                         <TextBlock Padding="0, 0, 6, 0" Text="{Binding CurrentMod.Name}" />
                         <Path HorizontalAlignment="Center" Width="10" Height="10" Margin="0,2,0,0"
@@ -74,7 +75,7 @@
                     </Button.Flyout>
                 </Button>
             </StackPanel>
-    
+
             <Border Grid.Column="3" Margin="16,0,0,0" IsVisible="{Binding #WindowMain.HasRightCaptionButton}">
                 <v:CaptionButtons Height="30" VerticalAlignment="Top" />
             </Border>
@@ -92,7 +93,7 @@
                     <TextBox
                         Margin="0,0,0,0"
                         Height="28"
-        
+
                         BorderThickness="0"
                         CornerRadius="0"
                         BorderBrush="{DynamicResource Brush.Border2}"
@@ -105,8 +106,8 @@
                                 Width="12" Height="12"
                                 Margin="6,0,0,0"
                                 Data="{StaticResource Icons.MagnifyingGlassFill}" />
-        
-        
+
+
                         </TextBox.InnerLeftContent>
                         <TextBox.InnerRightContent>
                             <Button Classes="icon_button"
@@ -127,7 +128,7 @@
                             Height="1"
                             Background="{DynamicResource Brush.Border2}"
                             HorizontalAlignment="Stretch" />
-        
+
                     <TreeView Grid.Row="2" Margin="0"
                               x:Name="MasterTreeView"
                               SelectionMode="Toggle"
@@ -153,7 +154,7 @@
                     </TreeView>
                 </Grid>
             </Border>
-        
+
             <!--  Splitter -->
             <GridSplitter Grid.Column="1"
                           BorderBrush="{DynamicResource Brush.Border0}"
@@ -161,16 +162,16 @@
                           MinWidth="3"
                           HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
                           BorderThickness="0,0,1,0" />
-        
+
             <!-- Editor Panel -->
             <Grid Margin="2, 0, 0, 0" Grid.Column="2" RowDefinitions="Auto, *">
                 <Border BorderThickness="0, 0, 0, 1" BorderBrush="{DynamicResource Brush.Border0}"
                         Background="{DynamicResource TabControlWindowActiveBackgroundBrush}">
                     <!-- Tab Bar -->
                     <views:TabBarView Height="30" VerticalAlignment="Bottom" Margin="0,0,0,0" />
-        
+
                 </Border>
-        
+
                 <!-- Editor Content -->
                 <Panel Grid.Row="1" Background="{DynamicResource Brush.PageBackground}">
                     <ContentControl Content="{Binding TemporaryTab}"
@@ -180,7 +181,52 @@
                 </Panel>
             </Grid>
         </Grid>
-    
+
     </Grid>
 
-</v:ChromelessWindow>
\ No newline at end of file
+</v:ChromelessWindow>
+
+
+<!-- <views:ChromelessWindow xmlns="https://github.com/avaloniaui" -->
+<!--         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" -->
+<!--         xmlns:vm="clr-namespace:RogueEssence.Dev.ViewModels;assembly=RogueEssence.Editor.Avalonia" -->
+<!--         xmlns:views="clr-namespace:RogueEssence.Dev.Views" -->
+<!--         xmlns:d="http://schemas.microsoft.com/expression/blend/2008" -->
+<!--         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" -->
+<!--         xmlns:v="clr-namespace:RogueEssence.Dev.Views" -->
+<!--         mc:Ignorable="d" -->
+<!--         x:Class="RogueEssence.Dev.Views.MainWindow" -->
+<!--         Title="Dev Controls" Height="480" Width="460" Opened="Window_Loaded" Closed="Window_Closed"> -->
+<!--     ~1~Icon="/Assets/app-logo.ico"@1@ -->
+<!--     <Design.DataContext> -->
+<!--         <vm:DevFormViewModel/> -->
+<!--     </Design.DataContext> -->
+<!--     <Grid> -->
+<!--         <TabControl TabStripPlacement="Top" Margin="2"> -->
+<!--             <TabItem Header="Game" > -->
+<!--                 <views:DevTabGame DataContext="{Binding Game}"/> -->
+<!--             </TabItem> -->
+<!--             <TabItem Header="Player" > -->
+<!--                 <views:DevTabPlayer DataContext="{Binding Player}"/> -->
+<!--             </TabItem> -->
+<!--             <TabItem Header="Travel" > -->
+<!--                 <views:DevTabTravel DataContext="{Binding Travel}"/> -->
+<!--             </TabItem> -->
+<!--             <TabItem Header="Data" > -->
+<!--                 <views:DevTabData DataContext="{Binding Data}"/> -->
+<!--             </TabItem> -->
+<!--             <TabItem Header="Sprites" > -->
+<!--                 <views:DevTabSprites DataContext="{Binding Sprites}"/> -->
+<!--             </TabItem> -->
+<!--             <TabItem Header="Script" > -->
+<!--                 <views:DevTabScript DataContext="{Binding Script}"/> -->
+<!--             </TabItem> -->
+<!--             <TabItem Header="Mods" > -->
+<!--                 <views:DevTabMods DataContext="{Binding Mods}"/> -->
+<!--             </TabItem> -->
+<!--             <TabItem Header="Constants" > -->
+<!--                 <views:DevTabConstants DataContext="{Binding Constants}"/> -->
+<!--             </TabItem> -->
+<!--         </TabControl> -->
+<!--     </Grid> -->
+<!-- </views:ChromelessWindow> -->
diff --git a/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml.cs b/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml.cs
new file mode 100644
index 00000000..b0fb3aea
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml.cs
@@ -0,0 +1,664 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Controls.Templates;
+using Avalonia.Input;
+using Avalonia.Interactivity;
+using Avalonia.LogicalTree;
+using Avalonia.Platform.Storage;
+using Avalonia.Threading;
+using Avalonia.VisualTree;
+using Avalonia.Platform;
+using Microsoft.Xna.Framework;
+using RogueEssence.Content;
+using RogueEssence.Data;
+using RogueEssence.Dev.ViewModels;
+
+namespace RogueEssence.Dev.Views;
+
+public partial class DevForm : ChromelessWindow, IRootEditor
+{
+    public bool LoadComplete { get; private set; }
+
+        public MapEditForm MapEditForm;
+        public GroundEditForm GroundEditForm;
+
+        private Action pendingEditorAction;
+        private Exception pendingException;
+
+        public IMapEditor MapEditor { get { return MapEditForm; } }
+        public IGroundEditor GroundEditor { get { return GroundEditForm; } }
+        public bool AteMouse { get { return false; } }
+        public bool AteKeyboard { get { return false; } }
+
+        private static Dictionary<string, string> devConfig;
+        private static bool canSave;
+
+    
+        
+        void IRootEditor.Load(GameBase game)
+        {
+            Console.WriteLine("Loading Dev Editor");
+            ExecuteOrInvoke(load);
+        }
+
+        private void load()
+        {
+            lock (GameBase.lockObj)
+            {
+                DevDataManager.Init();
+
+                loadDevConfig();
+
+                reload(DataManager.DataType.All);
+
+                LoadComplete = true;
+            }
+        }
+
+
+        void IRootEditor.ReloadData(DataManager.DataType dataType)
+        {
+            ExecuteOrInvoke(() => { reload(dataType); });
+        }
+
+        private void reload(DataManager.DataType dataType)
+        {
+            lock (GameBase.lockObj)
+            {
+                if (dataType == DataManager.DataType.All)
+                    DevDataManager.ClearCaches();
+
+                ViewModels.MainWindowViewModel devViewModel = (ViewModels.MainWindowViewModel)this.DataContext;
+
+                if (dataType == DataManager.DataType.All)
+                {
+                    devViewModel.Game.HideSprites = DataManager.Instance.HideChars;
+                    devViewModel.Game.HideObjects = DataManager.Instance.HideObjects;
+                    devViewModel.Travel.DebugGen = DiagManager.Instance.ListenGen;
+                }
+
+                if ((dataType & DataManager.DataType.Skill) != DataManager.DataType.None)
+                    devViewModel.Game.ReloadSkills();
+
+                if ((dataType & DataManager.DataType.Intrinsic) != DataManager.DataType.None)
+                    devViewModel.Game.ReloadIntrinsics();
+
+                if ((dataType & DataManager.DataType.Status) != DataManager.DataType.None)
+                    devViewModel.Game.ReloadStatuses();
+
+                if ((dataType & DataManager.DataType.Item) != DataManager.DataType.None)
+                    devViewModel.Game.ReloadItems();
+
+
+                if ((dataType & DataManager.DataType.Monster) != DataManager.DataType.None)
+                {
+                    devViewModel.Player.LoadMonstersNumeric();
+                    devViewModel.Player.ReloadMonsters();
+                }
+
+                if (dataType == DataManager.DataType.All)
+                {
+                    int globalIdle = GraphicsManager.GlobalIdle;
+                    devViewModel.Player.Anims.Clear();
+                    for (int ii = 0; ii < GraphicsManager.Actions.Count; ii++)
+                        devViewModel.Player.Anims.Add(GraphicsManager.Actions[ii].Name);
+                    devViewModel.Player.ChosenAnim = -1;
+                    devViewModel.Player.ChosenAnim = globalIdle;
+                }
+
+                if ((dataType & DataManager.DataType.Zone) != DataManager.DataType.None)
+                    devViewModel.Travel.ReloadZones();
+
+                if (dataType == DataManager.DataType.All)
+                    devViewModel.Mods.UpdateMod();
+
+                LoadComplete = true;
+            }
+        }
+
+
+        public void Update(GameTime gameTime)
+        {
+            if (pendingEditorAction != null)
+            {
+                try
+                {
+                    pendingEditorAction();
+                    pendingException = null;
+                }
+                catch (Exception ex)
+                {
+                    pendingException = ex;
+                }
+                pendingEditorAction = null;
+            }
+
+            ExecuteOrInvoke(update);
+        }
+
+        private void update()
+        {
+            lock (GameBase.lockObj)
+            {
+                ViewModels.MainWindowViewModel devViewModel = (ViewModels.MainWindowViewModel)this.DataContext;
+
+                devViewModel.Player.UpdateLevel();
+                if (GameManager.Instance.IsInGame())
+                {
+                    if (!devViewModel.Player.JustOnce)
+                    {
+                        if (devViewModel.Player.JustMe)
+                        {
+                            int currentIdle = Dungeon.DungeonScene.Instance.FocusedCharacter.IdleOverride;
+                            if (currentIdle < 0)
+                                currentIdle = GraphicsManager.GlobalIdle;
+                            devViewModel.Player.ChosenAnim = currentIdle;
+                        }
+                        else
+                            devViewModel.Player.ChosenAnim = GraphicsManager.GlobalIdle;
+                    }
+                    devViewModel.Player.UpdateSpecies(Dungeon.DungeonScene.Instance.FocusedCharacter.BaseForm);
+                }
+                if (GroundEditForm != null)
+                {
+                    ViewModels.GroundEditViewModel vm = (ViewModels.GroundEditViewModel)GroundEditForm.DataContext;
+                    vm.Textures.TileBrowser.UpdateFrame();
+                }
+                if (MapEditForm != null)
+                {
+                    ViewModels.MapEditViewModel vm = (ViewModels.MapEditViewModel)MapEditForm.DataContext;
+                    vm.Textures.TileBrowser.UpdateFrame();
+                    vm.Terrain.TileBrowser.UpdateFrame();
+                }
+
+                if (canSave)
+                    saveConfig();
+            }
+        }
+        public void Draw() { }
+
+        public void OpenGround()
+        {
+            ExecuteOrInvoke(openGround);
+        }
+
+        private void openGround()
+        {
+            GroundEditForm = new GroundEditForm();
+            ViewModels.GroundEditViewModel vm = new ViewModels.GroundEditViewModel();
+            GroundEditForm.DataContext = vm;
+            vm.LoadFromCurrentGround();
+            GroundEditForm.Show();
+        }
+
+        public void OpenMap()
+        {
+            ExecuteOrInvoke(openMap);
+        }
+
+        public void openMap()
+        {
+            MapEditForm = new MapEditForm();
+            ViewModels.MapEditViewModel vm = new ViewModels.MapEditViewModel();
+            MapEditForm.DataContext = vm;
+            vm.LoadFromCurrentMap();
+            MapEditForm.Show();
+        }
+
+        public void groundEditorClosed(object sender, EventArgs e)
+        {
+            GameManager.Instance.SceneOutcome = resetEditors();
+        }
+
+        public void mapEditorClosed(object sender, EventArgs e)
+        {
+            GameManager.Instance.SceneOutcome = resetEditors();
+        }
+
+
+        private IEnumerator<YieldInstruction> resetEditors()
+        {
+            GroundEditForm = null;
+            MapEditForm = null;
+            yield return CoroutineManager.Instance.StartCoroutine(GameManager.Instance.RestartToTitle());
+        }
+
+
+        public void CloseGround()
+        {
+            if (GroundEditForm != null)
+                GroundEditForm.Close();
+        }
+
+        public void CloseMap()
+        {
+            if (MapEditForm != null)
+                MapEditForm.Close();
+        }
+
+
+        void LoadGame()
+        {
+            // Windows - CAN run game in new thread, CAN run game in same thread via dispatch.
+            // Mac - CANNOT run game in new thread, CAN run game in same thread via dispatch.
+            // Linux - CAN run the game in new thread, CANNOT run game in same thread via dispatch.
+
+            // When the game is started, it should run a continuous loop, blocking the UI
+            // However, this is only happening on linux.  Why not windows and mac?
+            // With Mac, cocoa can ONLY start the game window if it's on the main thread. Weird...
+
+            if (!OperatingSystem.IsLinux())
+                LoadGameDelegate();
+            else
+            {
+                Thread thread = new Thread(LoadGameDelegate);
+                thread.IsBackground = true;
+                thread.Start();
+            }
+        }
+
+        /// <summary>
+        /// A method intended to be called from the editor thread, that sends a function pointer to the Game thread,
+        /// waits for it to complete (blocking the thread), and then continues execution.
+        /// This call cannot be performed within a lock!!
+        /// </summary>
+        /// <param name="action"></param>
+        public static void ExecuteOrPend(Action action)
+        {
+            if (!OperatingSystem.IsLinux())
+                action();
+            else
+            {
+                DevForm editor = (DevForm)DiagManager.Instance.DevEditor;
+                editor.pendingEditorAction = action;
+
+                SpinWait.SpinUntil(() => editor.pendingEditorAction == null);
+
+                if (editor.pendingException != null)
+                {
+                    Exception ex = editor.pendingException;
+                    throw ex;
+                }
+            }
+        }
+
+        public static void ExecuteOrInvoke(Action action)
+        {
+            if (!OperatingSystem.IsLinux())
+                action();
+            else
+                Dispatcher.UIThread.InvokeAsync(action, DispatcherPriority.Background);
+        }
+
+        void LoadGameDelegate()
+        {
+            try
+            {
+                DiagManager.Instance.DevEditor = this;
+                using (GameBase game = new GameBase())
+                    game.Run();
+            }
+            catch (Exception ex)
+            {
+                DiagManager.Instance.LogError(ex);
+            }
+            ExecuteOrInvoke(Close);
+        }
+
+        public void Window_Loaded(object sender, EventArgs e)
+        {
+            if (Design.IsDesignMode)
+                return;
+            //Thread thread = new Thread(LoadGame);
+            //thread.IsBackground = true;
+            //thread.Start();
+            Dispatcher.UIThread.InvokeAsync(LoadGame, DispatcherPriority.Background);
+            //LoadGame();
+        }
+
+        public void Window_Closed(object sender, EventArgs e)
+        {
+            DiagManager.Instance.LoadMsg = "Closing...";
+            EnterLoadPhase(GameBase.LoadPhase.Unload);
+        }
+
+        public static void EnterLoadPhase(GameBase.LoadPhase loadState)
+        {
+            GameBase.CurrentPhase = loadState;
+        }
+
+
+
+        private static void loadDevConfig()
+        {
+            devConfig = new Dictionary<string, string>();
+
+            try
+            {
+                string configPath = GetConfigPath();
+                string folderPath = Path.GetDirectoryName(configPath);
+                if (!Directory.Exists(folderPath))
+                    Directory.CreateDirectory(folderPath);
+
+                if (File.Exists(configPath))
+                {
+                    using (FileStream stream = File.OpenRead(configPath))
+                    {
+                        using (BinaryReader reader = new BinaryReader(stream))
+                        {
+                            while (reader.BaseStream.Position < reader.BaseStream.Length)
+                            {
+                                string key = reader.ReadString();
+                                string val = reader.ReadString();
+                                devConfig[key] = val;
+                            }
+                        }
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                DiagManager.Instance.LogError(ex);
+            }
+        }
+
+
+        private static void saveConfig()
+        {
+            //save whole file
+            try
+            {
+                using (var writer = new BinaryWriter(new FileStream(GetConfigPath(), FileMode.Create, FileAccess.Write, FileShare.None)))
+                {
+                    foreach (string curKey in devConfig.Keys)
+                    {
+                        writer.Write(curKey);
+                        writer.Write(devConfig[curKey]);
+                    }
+                }
+            }
+            catch (IOException ioEx)
+            {
+                DiagManager.Instance.LogError(ioEx, false);
+            }
+            catch (Exception ex)
+            {
+                DiagManager.Instance.LogError(ex);
+            }
+        }
+
+        public static string GetConfig(string key, string def)
+        {
+            string val;
+            if (devConfig.TryGetValue(key, out val))
+                return val;
+            return def;
+        }
+
+        public static int GetConfig(string key, int def)
+        {
+            string val;
+            if (devConfig.TryGetValue(key, out val))
+            {
+                int result;
+                if (Int32.TryParse(val, out result))
+                    return result;
+            }
+            return def;
+        }
+
+        public static void SetConfig(string key, int val)
+        {
+            SetConfig(key, val.ToString());
+        }
+
+        public static void SetConfig(string key, string val)
+        {
+            if (val == null && devConfig.ContainsKey(key))
+                devConfig.Remove(key);
+            else
+                devConfig[key] = val;
+
+            canSave = true;
+        }
+
+        public static string GetConfigPath()
+        {
+            //https://jimrich.sk/environment-specialfolder-on-windows-linux-and-os-x/
+            //MacOS actually uses a different folder for config data, traditionally
+            //I guess it's the odd one out...
+            if (OperatingSystem.IsMacOS())
+                return PathMod.FromApp("./devConfig");//Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Personal), "/Library/Application Support/RogueEssence/config");
+            else
+                return PathMod.FromApp("./devConfig");//Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "RogueEssence /devConfig");
+        }
+        
+        
+    public static readonly StyledProperty<GridLength> CaptionHeightProperty =
+        AvaloniaProperty.Register<DevForm, GridLength>(nameof(CaptionHeight));
+
+    public GridLength CaptionHeight
+    {
+        get => GetValue(CaptionHeightProperty);
+        set => SetValue(CaptionHeightProperty, value);
+    }
+
+    public static readonly StyledProperty<bool> HasLeftCaptionButtonProperty =
+        AvaloniaProperty.Register<DevForm, bool>(nameof(HasLeftCaptionButton));
+
+    public bool HasLeftCaptionButton
+    {
+        get => GetValue(HasLeftCaptionButtonProperty);
+        set => SetValue(HasLeftCaptionButtonProperty, value);
+    }
+
+    public bool HasRightCaptionButton
+    {
+        get
+        {
+            if (OperatingSystem.IsLinux())
+                return !Native.OS.UseSystemWindowFrame;
+
+            return OperatingSystem.IsWindows();
+        }
+    }
+    
+    
+    
+    public DevForm()
+    {
+        
+        if (OperatingSystem.IsMacOS())
+        {
+            HasLeftCaptionButton = true;
+            CaptionHeight = new GridLength(34);
+            ExtendClientAreaChromeHints =
+                ExtendClientAreaChromeHints.SystemChrome | ExtendClientAreaChromeHints.OSXThickTitleBar;
+        }
+        else if (UseSystemWindowFrame)
+        {
+            CaptionHeight = new GridLength(30);
+        }
+        else
+        {
+            CaptionHeight = new GridLength(38);
+        }
+        
+        InitializeComponent();
+    }
+    
+    protected override void OnDataContextChanged(EventArgs e)
+    {
+        base.OnDataContextChanged(e);
+        if (DataContext is MainWindowViewModel vm)
+        {
+            // vm.ModSwitcherClosed += () => ModSwitcherFlyoutButton.Flyout?.Hide();;
+        }
+    }
+    
+    private void ModSwitcherFlyout_OnOpened(object? sender, EventArgs e)
+    {
+        if (DataContext is MainWindowViewModel vm)
+        {
+            vm.OnModSwitcherOpened();
+        }
+    }
+    
+    private void ModSwitcherFlyout_OnClosed(object? sender, EventArgs e)
+    {
+        if (DataContext is MainWindowViewModel vm)
+        {
+            vm.OnModSwitcherClosed();
+            // ModSwitcherFlyoutButton.Flyout?.Hide();
+        }
+    }
+    
+    protected override void OnClosing(WindowClosingEventArgs e)
+    {
+        base.OnClosing(e);
+
+        if (!Design.IsDesignMode && DataContext is ViewModels.MainWindowViewModel)
+        {
+            PreferencesWindowViewModel.Instance.Save();
+        }
+    }
+
+  
+ 
+    private void MasterTreeView_OnDoubleTapped(object? sender, TappedEventArgs e)
+    {
+        if (DataContext is MainWindowViewModel vm && sender is TreeView { SelectedItem: not null } treeView)
+        {
+            var selectedItem = (OpenEditorNode)treeView.SelectedItem;
+            vm.AddPageFromPageNode(selectedItem);
+        }
+    }
+    
+    private void MasterTreeView_OnSelectionChanged(object? sender, SelectionChangedEventArgs e)
+    {
+        // Deselect the item after MasterTreeView_OnDoubleTapped
+        Dispatcher.UIThread.Post(() =>
+        {
+            if (sender is TreeView tree)
+            {
+                tree.SelectedItem = null;
+            }
+        });
+    }
+    
+    private void MasterTreeView_OnContextRequested(object? sender, ContextRequestedEventArgs e)
+    {
+        if (e.Source is not Visual visual)
+            return;
+
+        var current = visual.GetSelfAndVisualAncestors().OfType<TreeViewItem>().FirstOrDefault();
+        var parent = visual.GetSelfAndVisualAncestors().OfType<TreeViewItem>().Skip(1).FirstOrDefault();
+
+        if (current == null)
+            return;
+
+        if (current.DataContext is DataItemNode itemNode &&
+            parent?.DataContext is DataRootNode parentRoot)
+        {
+            ShowDataItemNodeMenu(current, itemNode, parentRoot, e);
+        }
+        
+        else if (current.DataContext is DataItemNode itemNode2 &&
+            parent?.DataContext is SpriteRootNode spriteRootMode)
+        {
+            ShowSpriteItemNodeMenu(current, itemNode2, spriteRootMode, e);
+        }
+        else if (current.DataContext is DataRootNode rootNode)
+        {
+            ShowRootNodeMenu(current, rootNode, e);
+        } 
+        else if (current.DataContext is SpriteRootNode spriteRoot)
+        {
+            ShowSpriteRootNodeMenu(current, spriteRoot, e);
+            
+        }
+    }
+
+    private void ShowDataItemNodeMenu(TreeViewItem current, DataItemNode node, DataRootNode parentNode,
+        ContextRequestedEventArgs e)
+    {
+        var menu = new ContextMenu
+        {
+            Items =
+            {
+                new MenuItem { Header = "Resave as File", Command = parentNode.ResaveAsFile, CommandParameter = node, Icon = App.CreateMenuIcon("Icons.FileFill") },
+                new MenuItem
+                    { Header = "Resave as Patch", Command = parentNode.ResaveAsPatch, CommandParameter = node, Icon = App.CreateMenuIcon("Icons.FileTextFill") },
+                new Separator(),
+                new MenuItem { Header = "Edit", Icon = App.CreateMenuIcon("Icons.PencilFill") },
+                new MenuItem { Header = "Delete", Command = parentNode.DeleteCommand, CommandParameter = node,  Icon = App.CreateMenuIcon("Icons.TrashFill") }
+            }
+        };
+
+        AttachAndOpenMenu(current, menu, e);
+    }
+
+    private void ShowSpriteItemNodeMenu(TreeViewItem current, DataItemNode node, SpriteRootNode parentNode,
+        ContextRequestedEventArgs e)
+    {
+        var menu = new ContextMenu
+        {
+            Items =
+            {
+                new MenuItem { Header = "Import", Command = parentNode.ImportCommand, CommandParameter = node, Icon = App.CreateMenuIcon("Icons.DownloadSimpleFill") },
+                new MenuItem { Header = "Re-Import", Command = parentNode.ReImportCommand, CommandParameter = node, Icon = App.CreateMenuIcon("Icons.RepeatFill") },
+                new MenuItem { Header = "Export", Command = parentNode.ExportCommand, CommandParameter = node, Icon = App.CreateMenuIcon("Icons.ExportFill") },
+                new Separator(),
+                new MenuItem { Header = "Delete", Command = parentNode.DeleteCommand, CommandParameter = node, Icon =  App.CreateMenuIcon("Icons.TrashFill") }
+            }
+        };
+
+        AttachAndOpenMenu(current, menu, e);
+    }
+
+    private void ShowRootNodeMenu(TreeViewItem current, DataRootNode root, ContextRequestedEventArgs e)
+    {
+        var menu = new ContextMenu
+        {
+            Items =
+            {
+                new MenuItem { Header = "Re-Index", Command = root.ReIndexCommand, Icon = App.CreateMenuIcon("Icons.ListNumbersFill") },
+                new MenuItem { Header = "Resave all as File", Command = root.ResaveAllAsFileCommand, Icon = App.CreateMenuIcon("Icons.FileFill") },
+                new MenuItem { Header = "Resave all as Diff", Command = root.ResaveAllAsDiffCommand, Icon = App.CreateMenuIcon("Icons.PlusMinusFill") },
+                new Separator(),
+                new MenuItem { Header = "Add", Command = root.AddCommand, Icon = App.CreateMenuIcon("Icons.Plus") }
+            }
+        };
+
+        AttachAndOpenMenu(current, menu, e);
+    }
+    
+    private void ShowSpriteRootNodeMenu(TreeViewItem current, SpriteRootNode root, ContextRequestedEventArgs e)
+    {
+        var menu = new ContextMenu
+        {
+            Items =
+            {
+                new MenuItem { Header = "Mass Import", Command = root.MassImportCommand, Icon = App.CreateMenuIcon("Icons.DownloadSimpleFill") },
+                new MenuItem { Header = "Mass Export", Command = root.MassExportCommand, Icon = App.CreateMenuIcon("Icons.ExportFill") },
+                new Separator(),
+                new MenuItem { Header = "Add", Command = root.AddCommand,  Icon = App.CreateMenuIcon("Icons.Plus") }
+            }
+        };
+
+        AttachAndOpenMenu(current, menu, e);
+    }
+
+    private static void AttachAndOpenMenu(TreeViewItem current, ContextMenu menu, ContextRequestedEventArgs e)
+    {
+        menu.Closed += (_, _) => current.ContextMenu = null;
+        current.ContextMenu = menu;
+        menu.Open(current);
+        e.Handled = true;
+    }
+}
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/New/MainWindow.axaml.cs b/RogueEssence.Editor.Avalonia/Views/New/MainWindow.axaml.cs
deleted file mode 100644
index 65f70325..00000000
--- a/RogueEssence.Editor.Avalonia/Views/New/MainWindow.axaml.cs
+++ /dev/null
@@ -1,241 +0,0 @@
-using System;
-using System.Linq;
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Controls.Templates;
-using Avalonia.Input;
-using Avalonia.Interactivity;
-using Avalonia.LogicalTree;
-using Avalonia.Platform.Storage;
-using Avalonia.Threading;
-using Avalonia.VisualTree;
-using Avalonia.Platform;
-using RogueEssence.Dev.ViewModels;
-
-namespace RogueEssence.Dev.Views;
-
-public partial class MainWindow : ChromelessWindow
-{
-    public static readonly StyledProperty<GridLength> CaptionHeightProperty =
-        AvaloniaProperty.Register<MainWindow, GridLength>(nameof(CaptionHeight));
-
-    public GridLength CaptionHeight
-    {
-        get => GetValue(CaptionHeightProperty);
-        set => SetValue(CaptionHeightProperty, value);
-    }
-
-    public static readonly StyledProperty<bool> HasLeftCaptionButtonProperty =
-        AvaloniaProperty.Register<MainWindow, bool>(nameof(HasLeftCaptionButton));
-
-    public bool HasLeftCaptionButton
-    {
-        get => GetValue(HasLeftCaptionButtonProperty);
-        set => SetValue(HasLeftCaptionButtonProperty, value);
-    }
-
-    public bool HasRightCaptionButton
-    {
-        get
-        {
-            if (OperatingSystem.IsLinux())
-                return !Native.OS.UseSystemWindowFrame;
-
-            return OperatingSystem.IsWindows();
-        }
-    }
-    
-    
-    
-    public MainWindow()
-    {
-        
-        if (OperatingSystem.IsMacOS())
-        {
-            HasLeftCaptionButton = true;
-            CaptionHeight = new GridLength(34);
-            ExtendClientAreaChromeHints =
-                ExtendClientAreaChromeHints.SystemChrome | ExtendClientAreaChromeHints.OSXThickTitleBar;
-        }
-        else if (UseSystemWindowFrame)
-        {
-            CaptionHeight = new GridLength(30);
-        }
-        else
-        {
-            CaptionHeight = new GridLength(38);
-        }
-        
-        InitializeComponent();
-    }
-    
-    protected override void OnDataContextChanged(EventArgs e)
-    {
-        base.OnDataContextChanged(e);
-        if (DataContext is MainWindowViewModel vm)
-        {
-            // vm.ModSwitcherClosed += () => ModSwitcherFlyoutButton.Flyout?.Hide();;
-        }
-    }
-    
-    private void ModSwitcherFlyout_OnOpened(object? sender, EventArgs e)
-    {
-        if (DataContext is MainWindowViewModel vm)
-        {
-            vm.OnModSwitcherOpened();
-        }
-    }
-    
-    private void ModSwitcherFlyout_OnClosed(object? sender, EventArgs e)
-    {
-        if (DataContext is MainWindowViewModel vm)
-        {
-            vm.OnModSwitcherClosed();
-            // ModSwitcherFlyoutButton.Flyout?.Hide();
-        }
-    }
-    
-    protected override void OnClosing(WindowClosingEventArgs e)
-    {
-        base.OnClosing(e);
-
-        if (!Design.IsDesignMode && DataContext is ViewModels.MainWindowViewModel)
-        {
-            PreferencesWindowViewModel.Instance.Save();
-        }
-    }
-
-  
- 
-    private void MasterTreeView_OnDoubleTapped(object? sender, TappedEventArgs e)
-    {
-        if (DataContext is MainWindowViewModel vm && sender is TreeView { SelectedItem: not null } treeView)
-        {
-            var selectedItem = (OpenEditorNode)treeView.SelectedItem;
-            vm.AddPageFromPageNode(selectedItem);
-        }
-    }
-    
-    private void MasterTreeView_OnSelectionChanged(object? sender, SelectionChangedEventArgs e)
-    {
-        // Deselect the item after MasterTreeView_OnDoubleTapped
-        Dispatcher.UIThread.Post(() =>
-        {
-            if (sender is TreeView tree)
-            {
-                tree.SelectedItem = null;
-            }
-        });
-    }
-    
-    private void MasterTreeView_OnContextRequested(object? sender, ContextRequestedEventArgs e)
-    {
-        if (e.Source is not Visual visual)
-            return;
-
-        var current = visual.GetSelfAndVisualAncestors().OfType<TreeViewItem>().FirstOrDefault();
-        var parent = visual.GetSelfAndVisualAncestors().OfType<TreeViewItem>().Skip(1).FirstOrDefault();
-
-        if (current == null)
-            return;
-
-        if (current.DataContext is DataItemNode itemNode &&
-            parent?.DataContext is DataRootNode parentRoot)
-        {
-            ShowDataItemNodeMenu(current, itemNode, parentRoot, e);
-        }
-        
-        else if (current.DataContext is DataItemNode itemNode2 &&
-            parent?.DataContext is SpriteRootNode spriteRootMode)
-        {
-            ShowSpriteItemNodeMenu(current, itemNode2, spriteRootMode, e);
-        }
-        else if (current.DataContext is DataRootNode rootNode)
-        {
-            ShowRootNodeMenu(current, rootNode, e);
-        } 
-        else if (current.DataContext is SpriteRootNode spriteRoot)
-        {
-            ShowSpriteRootNodeMenu(current, spriteRoot, e);
-            
-        }
-    }
-
-    private void ShowDataItemNodeMenu(TreeViewItem current, DataItemNode node, DataRootNode parentNode,
-        ContextRequestedEventArgs e)
-    {
-        var menu = new ContextMenu
-        {
-            Items =
-            {
-                new MenuItem { Header = "Resave as File", Command = parentNode.ResaveAsFile, CommandParameter = node, Icon = App.CreateMenuIcon("Icons.FileFill") },
-                new MenuItem
-                    { Header = "Resave as Patch", Command = parentNode.ResaveAsPatch, CommandParameter = node, Icon = App.CreateMenuIcon("Icons.FileTextFill") },
-                new Separator(),
-                new MenuItem { Header = "Edit", Icon = App.CreateMenuIcon("Icons.PencilFill") },
-                new MenuItem { Header = "Delete", Command = parentNode.DeleteCommand, CommandParameter = node,  Icon = App.CreateMenuIcon("Icons.TrashFill") }
-            }
-        };
-
-        AttachAndOpenMenu(current, menu, e);
-    }
-
-    private void ShowSpriteItemNodeMenu(TreeViewItem current, DataItemNode node, SpriteRootNode parentNode,
-        ContextRequestedEventArgs e)
-    {
-        var menu = new ContextMenu
-        {
-            Items =
-            {
-                new MenuItem { Header = "Import", Command = parentNode.ImportCommand, CommandParameter = node, Icon = App.CreateMenuIcon("Icons.DownloadSimpleFill") },
-                new MenuItem { Header = "Re-Import", Command = parentNode.ReImportCommand, CommandParameter = node, Icon = App.CreateMenuIcon("Icons.RepeatFill") },
-                new MenuItem { Header = "Export", Command = parentNode.ExportCommand, CommandParameter = node, Icon = App.CreateMenuIcon("Icons.ExportFill") },
-                new Separator(),
-                new MenuItem { Header = "Delete", Command = parentNode.DeleteCommand, CommandParameter = node, Icon =  App.CreateMenuIcon("Icons.TrashFill") }
-            }
-        };
-
-        AttachAndOpenMenu(current, menu, e);
-    }
-
-    private void ShowRootNodeMenu(TreeViewItem current, DataRootNode root, ContextRequestedEventArgs e)
-    {
-        var menu = new ContextMenu
-        {
-            Items =
-            {
-                new MenuItem { Header = "Re-Index", Command = root.ReIndexCommand, Icon = App.CreateMenuIcon("Icons.ListNumbersFill") },
-                new MenuItem { Header = "Resave all as File", Command = root.ResaveAllAsFileCommand, Icon = App.CreateMenuIcon("Icons.FileFill") },
-                new MenuItem { Header = "Resave all as Diff", Command = root.ResaveAllAsDiffCommand, Icon = App.CreateMenuIcon("Icons.PlusMinusFill") },
-                new Separator(),
-                new MenuItem { Header = "Add", Command = root.AddCommand, Icon = App.CreateMenuIcon("Icons.Plus") }
-            }
-        };
-
-        AttachAndOpenMenu(current, menu, e);
-    }
-    
-    private void ShowSpriteRootNodeMenu(TreeViewItem current, SpriteRootNode root, ContextRequestedEventArgs e)
-    {
-        var menu = new ContextMenu
-        {
-            Items =
-            {
-                new MenuItem { Header = "Mass Import", Command = root.MassImportCommand, Icon = App.CreateMenuIcon("Icons.DownloadSimpleFill") },
-                new MenuItem { Header = "Mass Export", Command = root.MassExportCommand, Icon = App.CreateMenuIcon("Icons.ExportFill") },
-                new Separator(),
-                new MenuItem { Header = "Add", Command = root.AddCommand,  Icon = App.CreateMenuIcon("Icons.Plus") }
-            }
-        };
-
-        AttachAndOpenMenu(current, menu, e);
-    }
-
-    private static void AttachAndOpenMenu(TreeViewItem current, ContextMenu menu, ContextRequestedEventArgs e)
-    {
-        menu.Closed += (_, _) => current.ContextMenu = null;
-        current.ContextMenu = menu;
-        menu.Open(current);
-        e.Handled = true;
-    }
-}
\ No newline at end of file

From 20c85bc9fdd23734c059fab4b8657fad9dbf21d6 Mon Sep 17 00:00:00 2001
From: Kace <41309226+DoubleTrio@users.noreply.github.com>
Date: Sun, 16 Nov 2025 01:09:07 -0500
Subject: [PATCH 07/51] add singleton for dev form views, now functioning

---
 RogueEssence.Editor.Avalonia/App.axaml.cs     |  22 +-
 .../Assets/Styles.axaml                       |   1 +
 .../RogueEssence.Editor.Avalonia.csproj       |   8 +
 .../ViewModels/DevForm/DevTabGameViewModel.cs |   2 +-
 ...WindowViewModel.cs => DevFormViewModel.cs} |  39 ++--
 .../New/Editors/DevControlViewModel.cs        |  24 +-
 .../ViewModels/New/ModSwitcherViewModel.cs    |   4 +-
 .../ViewModels/New/TabSwitcherViewModel.cs    |   6 +-
 .../Views/DevForm/DevTabGame.axaml            |  58 -----
 .../Views/DevForm/DevTabPlayer.axaml          |  20 +-
 .../Views/New/DevForm.axaml.cs                |  14 +-
 .../Editors/DevControl/DevControlView.axaml   | 138 +++++++++++
 .../{ => DevControl}/DevControlView.axaml.cs  |   0
 .../New/Editors/DevControl/DevTabGame.axaml   |  52 +++++
 .../Editors/DevControl}/DevTabGame.axaml.cs   |   0
 .../Views/New/Editors/DevControlView.axaml    | 218 ------------------
 .../Views/New/TabBarView.axaml                |  12 +-
 .../Views/New/TabBarView.axaml.cs             |   8 +-
 18 files changed, 281 insertions(+), 345 deletions(-)
 rename RogueEssence.Editor.Avalonia/ViewModels/New/{MainWindowViewModel.cs => DevFormViewModel.cs} (93%)
 delete mode 100644 RogueEssence.Editor.Avalonia/Views/DevForm/DevTabGame.axaml
 create mode 100644 RogueEssence.Editor.Avalonia/Views/New/Editors/DevControl/DevControlView.axaml
 rename RogueEssence.Editor.Avalonia/Views/New/Editors/{ => DevControl}/DevControlView.axaml.cs (100%)
 create mode 100644 RogueEssence.Editor.Avalonia/Views/New/Editors/DevControl/DevTabGame.axaml
 rename RogueEssence.Editor.Avalonia/Views/{DevForm => New/Editors/DevControl}/DevTabGame.axaml.cs (100%)
 delete mode 100644 RogueEssence.Editor.Avalonia/Views/New/Editors/DevControlView.axaml

diff --git a/RogueEssence.Editor.Avalonia/App.axaml.cs b/RogueEssence.Editor.Avalonia/App.axaml.cs
index 808b49ea..de53a671 100644
--- a/RogueEssence.Editor.Avalonia/App.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/App.axaml.cs
@@ -26,12 +26,14 @@ public static void AddCommonServices(this IServiceCollection collection)
             collection.AddSingleton<TabEvents>();
             collection.AddSingleton<PageFactory>();
             collection.AddSingleton<NodeFactory>();
-            collection.AddSingleton<MainWindowViewModel>();
-
+            collection.AddSingleton<DevFormViewModel>();
 
+       
+            AddDevTabViewModels(collection);
+            
             collection.AddTransient<TabSwitcherViewModel>(sp =>
             {
-                var mainVm = sp.GetRequiredService<MainWindowViewModel>();
+                var mainVm = sp.GetRequiredService<DevFormViewModel>();
                 return new TabSwitcherViewModel(mainVm);
             });
 
@@ -65,6 +67,18 @@ public static void AddCommonServices(this IServiceCollection collection)
             collection.AddTransient<SpritePageViewModel>();
             collection.AddTransient<ModInfoEditorViewModel>();
         }
+        
+        private static void AddDevTabViewModels(this IServiceCollection services)
+        {
+            services.AddSingleton<DevTabGameViewModel>();
+            services.AddSingleton<DevTabPlayerViewModel>();
+            services.AddSingleton<DevTabDataViewModel>();
+            services.AddSingleton<DevTabTravelViewModel>();
+            services.AddSingleton<DevTabSpritesViewModel>();
+            services.AddSingleton<DevTabScriptViewModel>();
+            services.AddSingleton<DevTabModsViewModel>();
+            services.AddSingleton<DevTabConstantsViewModel>();
+        }
 
         public static void RegisterPages(this IServiceProvider provider)
         {
@@ -127,7 +141,7 @@ public override void OnFrameworkInitializationCompleted()
             services.RegisterPages();
 
 
-            var vm = services.GetRequiredService<MainWindowViewModel>();
+            var vm = services.GetRequiredService<DevFormViewModel>();
 
             if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
             {
diff --git a/RogueEssence.Editor.Avalonia/Assets/Styles.axaml b/RogueEssence.Editor.Avalonia/Assets/Styles.axaml
index 4a40db30..c0f5e20b 100644
--- a/RogueEssence.Editor.Avalonia/Assets/Styles.axaml
+++ b/RogueEssence.Editor.Avalonia/Assets/Styles.axaml
@@ -801,6 +801,7 @@
             <SolidColorBrush x:Key="ComboBoxDropDownBorderBrush" Color="{DynamicResource SystemAccentColor}" />
         </Style.Resources>
 
+        <Setter Property="HorizontalAlignment" Value="Stretch"></Setter>
 
         <Setter Property="MinHeight" Value="20" />
         <Setter Property="VerticalAlignment" Value="Center" />
diff --git a/RogueEssence.Editor.Avalonia/RogueEssence.Editor.Avalonia.csproj b/RogueEssence.Editor.Avalonia/RogueEssence.Editor.Avalonia.csproj
index 77513929..661769b9 100644
--- a/RogueEssence.Editor.Avalonia/RogueEssence.Editor.Avalonia.csproj
+++ b/RogueEssence.Editor.Avalonia/RogueEssence.Editor.Avalonia.csproj
@@ -182,6 +182,14 @@
     <Compile Update="DataEditor\Editors\RogueEssence\Tiles\TileBrowser.axaml.cs">
       <DependentUpon>TileBrowser.axaml</DependentUpon>
     </Compile>
+    <Compile Update="Views\New\Editors\DevControl\DevControlView.axaml.cs">
+      <DependentUpon>DevControlView.axaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Update="Views\New\Editors\DevControl\DevTabGame.axaml.cs">
+      <DependentUpon>DevTabGame.axaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Models\" />
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevTabGameViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevTabGameViewModel.cs
index 7f8802ad..f2453dd8 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevTabGameViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevTabGameViewModel.cs
@@ -103,7 +103,7 @@ public int ChosenIntrinsic
             set { this.SetIfChanged(ref chosenIntrinsic, value); }
         }
 
-        public ObservableCollection<string> Statuses { get; }
+        public ObservableCollection<string> Statuses { get; } = new();
 
         public List<string> StatusKeys;
 
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/MainWindowViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs
similarity index 93%
rename from RogueEssence.Editor.Avalonia/ViewModels/New/MainWindowViewModel.cs
rename to RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs
index 327c9986..ff4c77e0 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/MainWindowViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs
@@ -13,7 +13,7 @@
 
 namespace RogueEssence.Dev.ViewModels;
 
-public class MainWindowViewModel : ViewModelBase
+public class DevFormViewModel : ViewModelBase
 {
     public DevTabGameViewModel Game { get; set; }
     public DevTabPlayerViewModel Player { get; set; }
@@ -267,23 +267,28 @@ private void ClosePageAndChildren(PageNode node)
     private readonly IDialogService _dialogService;
     public ObservableCollection<NodeBase> Nodes { get; set; }
 
-    public MainWindowViewModel() : this(new PageFactory(new DesignServiceProvider()),
-        new NodeFactory(new DesignServiceProvider()), new DialogService(),
-        new TabEvents(new PageFactory(new DesignServiceProvider())))
+    // public DevFormViewModel() : this(new PageFactory(new DesignServiceProvider()),
+    //     new NodeFactory(new DesignServiceProvider()), new DialogService(),
+    //     new TabEvents(new PageFactory(new DesignServiceProvider())), new DevTabGameViewModel(), new DevTabPlayerViewModel())
+    // {
+    // }
+
+    public DevFormViewModel(PageFactory pageFactory, NodeFactory nodeFactory, IDialogService dialogService,
+        TabEvents tabEvents, DevTabGameViewModel game, DevTabPlayerViewModel player, DevTabDataViewModel data, 
+        DevTabTravelViewModel travel, DevTabSpritesViewModel sprites, DevTabScriptViewModel script, 
+        DevTabModsViewModel mods, 
+        DevTabConstantsViewModel constants)
     {
-    }
-
-    public MainWindowViewModel(PageFactory pageFactory, NodeFactory nodeFactory, IDialogService dialogService,
-        TabEvents tabEvents)
-    {
-        Game = new DevTabGameViewModel();
-        Player = new DevTabPlayerViewModel();
-        Data = new DevTabDataViewModel();
-        Travel = new DevTabTravelViewModel();
-        Sprites = new DevTabSpritesViewModel();
-        Script = new DevTabScriptViewModel();
-        Mods = new DevTabModsViewModel();
-        Constants = new DevTabConstantsViewModel();
+        
+        // NOTE: These should all be private readonly
+        Game = game;
+        Player = player;
+        Data = data;
+        Travel = travel;
+        Sprites = sprites;
+        Script = script;
+        Mods = mods;
+        Constants = constants;
         _pageFactory = pageFactory;
         _tabEvents = tabEvents;
         _nodeFactory = nodeFactory;
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DevControlViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DevControlViewModel.cs
index 29f39ac2..a6717f8b 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DevControlViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DevControlViewModel.cs
@@ -4,21 +4,33 @@ namespace RogueEssence.Dev.ViewModels;
 
 public class DevControlViewModel : EditorPageViewModel
 {
+    public DevTabGameViewModel Game { get; }
+    public DevTabPlayerViewModel Player { get; }
+
+    public DevTabTravelViewModel Travel { get; }
+
+    public DevTabScriptViewModel Script { get; }
+
     public override string UniqueId => "DevControl";
     public override string? Title => "Dev Control";
 
     public TestComboBoxViewModel Fruits { get; }
-    
-    public DevControlViewModel (PageFactory pageFactory, TabEvents tabEvents, IDialogService dialogService) : base(pageFactory, tabEvents, dialogService)
+
+    public DevControlViewModel(PageFactory pageFactory, TabEvents tabEvents, IDialogService dialogService,
+        DevTabGameViewModel game, DevTabPlayerViewModel player, DevTabTravelViewModel travel,
+        DevTabScriptViewModel script) : base(pageFactory, tabEvents, dialogService)
     {
-       
         Fruits = new TestComboBoxViewModel();
+        Game = game;
+        Player = player;
+        Travel = travel;
+        Script = script;
     }
-    
-    public DevControlViewModel() : base(new PageFactory(new DesignServiceProvider()), new TabEvents(new PageFactory(new DesignServiceProvider())), new DialogService())
+
+    public DevControlViewModel() : base(new PageFactory(new DesignServiceProvider()),
+        new TabEvents(new PageFactory(new DesignServiceProvider())), new DialogService())
     {
         Title = "Dev Control";
         Fruits = new TestComboBoxViewModel();
     }
-    
 }
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/ModSwitcherViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/ModSwitcherViewModel.cs
index 18704360..db636bf9 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/ModSwitcherViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/ModSwitcherViewModel.cs
@@ -12,7 +12,7 @@ public class ModSwitcherViewModel : ViewModelBase
 {
 
     private readonly IDialogService _dialogService;
-    private readonly MainWindowViewModel _mainWindow;
+    private readonly DevFormViewModel _mainWindow;
     private ModHeader _selectedMod;
 
     public ModHeader SelectedMod
@@ -22,7 +22,7 @@ public ModHeader SelectedMod
     }
     
     public ObservableCollection<Models.ModHeader> Mods { get; }
-    public ModSwitcherViewModel(MainWindowViewModel mainWindowViewModel, IDialogService dialogService)
+    public ModSwitcherViewModel(DevFormViewModel mainWindowViewModel, IDialogService dialogService)
     {
         _mainWindow = mainWindowViewModel;
         _dialogService = dialogService;
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/TabSwitcherViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/TabSwitcherViewModel.cs
index dc753918..783a5adb 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/TabSwitcherViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/TabSwitcherViewModel.cs
@@ -22,7 +22,7 @@ public EditorPageViewModel? SelectedPage
         set => this.RaiseAndSetIfChanged(ref _selectedPage, value);
     }
 
-    private readonly MainWindowViewModel _mainWindow;
+    private readonly DevFormViewModel _mainWindow;
 
     private string _searchFilter = string.Empty;
 
@@ -33,7 +33,7 @@ public string SearchFilter
     }
 
     
-    public TabSwitcherViewModel(MainWindowViewModel mainWindow)
+    public TabSwitcherViewModel(DevFormViewModel mainWindow)
     {
         _mainWindow = mainWindow;
         UpdateVisiblePages(_searchFilter);
@@ -43,7 +43,7 @@ public TabSwitcherViewModel(MainWindowViewModel mainWindow)
         this.WhenAnyValue(x => x.SearchFilter).Subscribe(UpdateVisiblePages);
     }
 
-    public TabSwitcherViewModel() : this(new MainWindowViewModel()) {}
+    // public TabSwitcherViewModel() : this(new DevFormViewModel()) {}
     
     public void ClearFilter()
     {
diff --git a/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabGame.axaml b/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabGame.axaml
deleted file mode 100644
index 507b8891..00000000
--- a/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabGame.axaml
+++ /dev/null
@@ -1,58 +0,0 @@
-<UserControl xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:vm="clr-namespace:RogueEssence.Dev.ViewModels;assembly=RogueEssence.Editor.Avalonia"
-             xmlns:views="clr-namespace:RogueEssence.Dev.Views"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             mc:Ignorable="d"
-             x:Class="RogueEssence.Dev.Views.DevTabGame">
-  <Design.DataContext>
-    <vm:DevTabGameViewModel/>
-  </Design.DataContext>
-    <Grid Margin="4" >
-      <Grid.RowDefinitions>
-        <RowDefinition/>
-        <RowDefinition/>
-        <RowDefinition/>
-        <RowDefinition/>
-        <RowDefinition/>
-        <RowDefinition/>
-        <RowDefinition/>
-        <RowDefinition/>
-        <RowDefinition/>
-        <RowDefinition/>
-      </Grid.RowDefinitions>
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition/>
-        <ColumnDefinition/>
-      </Grid.ColumnDefinitions>
-      <CheckBox Name="chkObjects" Margin="4" IsChecked="{Binding HideObjects}" VerticalAlignment="Center" Grid.Row="0" Grid.Column="0">Hide Objects</CheckBox>
-      <CheckBox Name="chkSprites" Margin="4" IsChecked="{Binding HideSprites}" VerticalAlignment="Center" Grid.Row="0" Grid.Column="1">Hide Sprites</CheckBox>
-      <Button Name="btnSpawnClone" Command="{Binding btnSpawn_Click}" Margin="4" Grid.Row="1" Grid.Column="0">Create Clone</Button>
-      <Button Name="btnDespawnAll" Command="{Binding btnDespawn_Click}" Margin="4" Grid.Row="1" Grid.Column="1">Clear All Foes</Button>
-      <views:SearchComboBox Name="cbSkills" ItemsSource="{Binding Skills}" SelectedIndex="{Binding ChosenSkill}" Margin="4" Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2"/>
-      <Button Name="btnLearnSkill" Command="{Binding btnLearnSkill_Click}" Margin="4" Grid.Row="3" Grid.Column="0">Learn Skill</Button>
-      <Button Name="btnGiveSkill" Command="{Binding btnGiveSkill_Click}" Margin="4" Grid.Row="3" Grid.Column="1">Teach Foes</Button>
-      <views:SearchComboBox Name="cbIntrinsics" ItemsSource="{Binding Intrinsics}" SelectedIndex="{Binding ChosenIntrinsic}" Margin="4" Grid.Row="4" Grid.Column="0" Grid.ColumnSpan="2"/>
-      <Button Name="btnSetIntrinsic" Command="{Binding btnSetIntrinsic_Click}" Margin="4" Grid.Row="5" Grid.Column="0">Set Intrinsic</Button>
-      <Button Name="btnGiveFoes" Command="{Binding btnGiveFoes_Click}" Margin="4" Grid.Row="5" Grid.Column="1">Give Foes</Button>
-      <views:SearchComboBox Name="cbStatus" ItemsSource="{Binding Statuses}" SelectedIndex="{Binding ChosenStatus}" Margin="4" Grid.Row="6" Grid.Column="0" Grid.ColumnSpan="2"/>
-      <Button Name="btnToggleStatus" Command="{Binding btnToggleStatus_Click}" Margin="4" Grid.Row="7" Grid.Column="0" Grid.ColumnSpan="2">Toggle Status</Button>
-      <views:SearchComboBox 
-        Name="cbSpawnItem" 
-        ItemsSource="{Binding Items}" 
-        SelectedIndex="{Binding ChosenItem}" 
-        Margin="4" 
-        Grid.Row="8" 
-        Grid.Column="0" 
-        Grid.ColumnSpan="2">
-        <ComboBox.ItemsPanel>
-          <ItemsPanelTemplate>
-            <!-- Using VirtualizingStackPanel to enable virtualization -->
-            <VirtualizingStackPanel />
-          </ItemsPanelTemplate>
-        </ComboBox.ItemsPanel>
-      </views:SearchComboBox>
-      <Button Name="btnSpawnItem" Command="{Binding btnSpawnItem_Click}" Margin="4" Grid.Row="10" Grid.ColumnSpan="2">Create Item</Button>
-    </Grid>
-</UserControl>
diff --git a/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabPlayer.axaml b/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabPlayer.axaml
index 0ac9fac8..494752cd 100644
--- a/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabPlayer.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabPlayer.axaml
@@ -9,25 +9,7 @@
   <Design.DataContext>
     <vm:DevTabPlayerViewModel/>
   </Design.DataContext>
-  <Grid Margin="4" >
-    <Grid.RowDefinitions>
-      <RowDefinition Height="30"/>
-      <RowDefinition/>
-      <RowDefinition Height="30"/>
-      <RowDefinition/>
-      <RowDefinition Height="30"/>
-      <RowDefinition/>
-      <RowDefinition Height="30"/>
-      <RowDefinition/>
-      <RowDefinition Height="30"/>
-      <RowDefinition/>
-      <RowDefinition/>
-      <RowDefinition/>
-    </Grid.RowDefinitions>
-    <Grid.ColumnDefinitions>
-      <ColumnDefinition/>
-      <ColumnDefinition/>
-    </Grid.ColumnDefinitions>
+  <Grid RowDefinitions="30, Auto, 30, Auto, 30, Auto, 30, Auto, 30, Auto, Auto, Auto" ColumnDefinitions="*, *" ColumnSpacing="8">
     <TextBlock Margin="4,0" VerticalAlignment="Bottom" Grid.Row="0" Grid.Column="0">Lv.</TextBlock>
     <NumericUpDown Name="nudLevel" Value="{Binding Level}" Minimum="1" Maximum="100" Margin="4" Grid.Row="1" Grid.Column="0"/>
     <Button Name="btnRollSkill" Command="{Binding btnRollSkill_Click}" Margin="4" Grid.Row="1" Grid.Column="1">Reroll Skills</Button>
diff --git a/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml.cs b/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml.cs
index b0fb3aea..d1835de4 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml.cs
@@ -73,7 +73,7 @@ private void reload(DataManager.DataType dataType)
                 if (dataType == DataManager.DataType.All)
                     DevDataManager.ClearCaches();
 
-                ViewModels.MainWindowViewModel devViewModel = (ViewModels.MainWindowViewModel)this.DataContext;
+                ViewModels.DevFormViewModel devViewModel = (ViewModels.DevFormViewModel)this.DataContext;
 
                 if (dataType == DataManager.DataType.All)
                 {
@@ -145,7 +145,7 @@ private void update()
         {
             lock (GameBase.lockObj)
             {
-                ViewModels.MainWindowViewModel devViewModel = (ViewModels.MainWindowViewModel)this.DataContext;
+                ViewModels.DevFormViewModel devViewModel = (ViewModels.DevFormViewModel)this.DataContext;
 
                 devViewModel.Player.UpdateLevel();
                 if (GameManager.Instance.IsInGame())
@@ -495,7 +495,7 @@ public DevForm()
     protected override void OnDataContextChanged(EventArgs e)
     {
         base.OnDataContextChanged(e);
-        if (DataContext is MainWindowViewModel vm)
+        if (DataContext is DevFormViewModel vm)
         {
             // vm.ModSwitcherClosed += () => ModSwitcherFlyoutButton.Flyout?.Hide();;
         }
@@ -503,7 +503,7 @@ protected override void OnDataContextChanged(EventArgs e)
     
     private void ModSwitcherFlyout_OnOpened(object? sender, EventArgs e)
     {
-        if (DataContext is MainWindowViewModel vm)
+        if (DataContext is DevFormViewModel vm)
         {
             vm.OnModSwitcherOpened();
         }
@@ -511,7 +511,7 @@ private void ModSwitcherFlyout_OnOpened(object? sender, EventArgs e)
     
     private void ModSwitcherFlyout_OnClosed(object? sender, EventArgs e)
     {
-        if (DataContext is MainWindowViewModel vm)
+        if (DataContext is DevFormViewModel vm)
         {
             vm.OnModSwitcherClosed();
             // ModSwitcherFlyoutButton.Flyout?.Hide();
@@ -522,7 +522,7 @@ protected override void OnClosing(WindowClosingEventArgs e)
     {
         base.OnClosing(e);
 
-        if (!Design.IsDesignMode && DataContext is ViewModels.MainWindowViewModel)
+        if (!Design.IsDesignMode && DataContext is ViewModels.DevFormViewModel)
         {
             PreferencesWindowViewModel.Instance.Save();
         }
@@ -532,7 +532,7 @@ protected override void OnClosing(WindowClosingEventArgs e)
  
     private void MasterTreeView_OnDoubleTapped(object? sender, TappedEventArgs e)
     {
-        if (DataContext is MainWindowViewModel vm && sender is TreeView { SelectedItem: not null } treeView)
+        if (DataContext is DevFormViewModel vm && sender is TreeView { SelectedItem: not null } treeView)
         {
             var selectedItem = (OpenEditorNode)treeView.SelectedItem;
             vm.AddPageFromPageNode(selectedItem);
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/DevControl/DevControlView.axaml b/RogueEssence.Editor.Avalonia/Views/New/Editors/DevControl/DevControlView.axaml
new file mode 100644
index 00000000..91327c95
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/Views/New/Editors/DevControl/DevControlView.axaml
@@ -0,0 +1,138 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:vm="using:RogueEssence.Dev.ViewModels"
+             xmlns:views="clr-namespace:RogueEssence.Dev.Views"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             FontSize="12"
+             x:DataType="vm:DevControlViewModel"
+             x:Class="RogueEssence.Dev.Views.DevControlView">
+    
+    
+    <UserControl.DataContext>
+        <vm:DevControlViewModel/>
+    </UserControl.DataContext>
+    <!-- The Game/Player/Travel/Script Tabs will be moved inside here... -->
+
+    
+    <!-- <Style Selector="Button.flat"> -->
+    <!--     <Setter Property="BorderThickness" Value="1" /> -->
+    <!--     <Setter Property="BorderBrush" Value="{DynamicResource Brush.Border2}" /> -->
+    <!--     <Setter Property="TextBlock.TextAlignment" Value="Center" /> -->
+    <!--     <Setter Property="Foreground" Value="{DynamicResource Brush.FG1}" /> -->
+    <!--     <Setter Property="Background" Value="{DynamicResource Brush.FlatButton.Background}" /> -->
+    <!--     <Setter Property="VerticalContentAlignment" Value="Center" /> -->
+    <!--     <Setter Property="Template"> -->
+    <!--         <ControlTemplate> -->
+    <!--             <Grid> -->
+    <!--                 <Border x:Name="PART_Border" -->
+    <!--                         Background="{TemplateBinding Background}" -->
+    <!--                         BorderBrush="{TemplateBinding BorderBrush}" -->
+    <!--                         BorderThickness="{TemplateBinding BorderThickness}" -->
+    <!--                         CornerRadius="{TemplateBinding CornerRadius}" /> -->
+    <!-- -->
+    <!--                 <ContentPresenter x:Name="PART_ContentPresenter" -->
+    <!--                                   Background="Transparent" -->
+    <!--                                   Padding="{TemplateBinding Padding}" -->
+    <!--                                   Content="{TemplateBinding Content}" -->
+    <!--                                   ContentTemplate="{TemplateBinding ContentTemplate}" -->
+    <!--                                   HorizontalContentAlignment="Center" -->
+    <!--                                   VerticalContentAlignment="Center" /> -->
+    <!--                  -->
+                    
+    <UserControl.Styles>
+        <Style Selector="Button">
+            <Setter Property="Padding" Value="10"></Setter>
+            <Setter Property="HorizontalAlignment" Value="Stretch"></Setter>
+            <Setter Property="HorizontalContentAlignment" Value="Center"></Setter>
+        </Style>
+        <Style Selector="ComboBox">
+            <Setter Property="Padding" Value="8"></Setter>
+            <!-- <Setter Property="Foreground" Value="Red" />  -->
+            <!-- <Setter Property="Background" Value="Red" /> -->
+        </Style>
+        
+        <!-- -->
+        <!-- <Style Selector="TabControl /template/ ContentPresenter#PART_SelectedContentHost"> -->
+        <!--     <Setter Property="Margin" Value="2"/> -->
+        <!-- </Style> -->
+    </UserControl.Styles>
+
+ 
+    <Border>
+        
+        <TabControl>
+            <TabItem Header="Game">
+                <views:DevTabGame DataContext="{Binding Game}"/>
+            </TabItem>
+            <TabItem Header="Player">
+                <views:DevTabPlayer DataContext="{Binding Player}"/>
+                <!-- <Grid RowDefinitions="30, Auto, 30, Auto, 30, Auto, 30, Auto, 30, Auto, Auto, Auto" ColumnDefinitions="*, *" ColumnSpacing="8"> -->
+                <!--     <TextBlock Margin="4,0" VerticalAlignment="Bottom" Grid.Row="0" Grid.Column="0">Lv.</TextBlock> -->
+                <!--     <NumericUpDown MinHeight="40" Name="nudLevel" Value="20" Minimum="1" Increment="1" Maximum="100" Grid.Row="1" Grid.Column="0"/> -->
+                <!--     <Button Classes="flat"  Name="btnRollSkill" Margin="4" Grid.Row="1" Grid.Column="1">Reroll Skills</Button> -->
+                <!--     ~1~ <Button Name="btnRollSkill" Command="{Binding btnRollSkill_Click}" Margin="4" Grid.Row="1" Grid.Column="1">Reroll Skills</Button> @1@ -->
+                <!--     <TextBlock VerticalAlignment="Bottom" Grid.Row="2" Grid.Column="0">Species</TextBlock> -->
+                <!--     <Grid Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2" ColumnDefinitions="*, Auto" ColumnSpacing="4"> -->
+                <!--   -->
+                <!--           -->
+                <!--           -->
+                <!--           -->
+                <!--     ~1~ <views:SearchComboBox Name="cbDexNum" Items="{Binding Monsters}" SelectedIndex="{Binding ChosenMonster}" VirtualizationMode="Simple" Margin="4"/> @1@ -->
+                <!--     <ComboBox ItemsSource="{Binding Fruits}" HorizontalAlignment="Stretch"/> -->
+                <!--        -->
+                <!--     <Button HorizontalAlignment="Stretch" HorizontalContentAlignment="Center" Classes="icon_button" Height="20" Width="20" Name="btnChangeOrder" Grid.Column="1" ToolTip.Tip="Switch Ordering"> -->
+                <!--          ~1~ <Panel> @1@ -->
+                <!--          ~1~   <Image Source="/Assets/AssetOrder.png" Width="26" @1@ -->
+                <!--          ~1~                   Height="26" VerticalAlignment="Center" HorizontalAlignment="Center" /> @1@ -->
+                <!--          ~1~ </Panel> @1@ -->
+                <!--          <Path -->
+                <!--              Width="20" Height="20" -->
+                <!--              Margin="0,1,0,0" -->
+                <!--              Data="{StaticResource Icons.ListNumbersFill}" /> -->
+                <!--     </Button> -->
+                <!-- -->
+                <!--     </Grid> -->
+                <!--      -->
+                <!--     <TextBlock VerticalAlignment="Bottom" Grid.Row="4">Form</TextBlock> -->
+                <!--     <ComboBox ItemsSource="{Binding Fruits}" HorizontalAlignment="Stretch" Grid.Row="5" Grid.ColumnSpan="2"/> -->
+                <!--          -->
+                <!--     <TextBlock  VerticalAlignment="Bottom" Grid.Row="6" Grid.Column="0">Skin</TextBlock> -->
+                <!--     <TextBlock  VerticalAlignment="Bottom" Grid.Row="6" Grid.Column="1">Gender</TextBlock> -->
+                <!--     <ComboBox  ItemsSource="{Binding Fruits}" HorizontalAlignment="Stretch" Grid.Row="7" Grid.Column="0"/> -->
+                <!--         -->
+                <!--     <ComboBox ItemsSource="{Binding Fruits}" HorizontalAlignment="Stretch" Grid.Row="7" Grid.Column="1"/> -->
+                <!--        -->
+                <!--      -->
+                <!--     <TextBlock VerticalAlignment="Bottom" Grid.Row="8" Grid.Column="0">Animation</TextBlock> -->
+                <!--      -->
+                <!--     <ComboBox ItemsSource="{Binding Fruits}" HorizontalAlignment="Stretch" Grid.Row="9" Grid.Column="0" Grid.ColumnSpan="2"/> -->
+                <!--          -->
+                <!--      -->
+                <!--     <CheckBox Name="chkJustMe" VerticalAlignment="Center" Grid.Row="10" Grid.Column="0">Just Me</CheckBox> -->
+                <!--     <CheckBox Name="chkJustOnce" VerticalAlignment="Center" Grid.Row="10" Grid.Column="1">Just Once</CheckBox> -->
+                <!--     <Button Classes="flat"  Name="btnResetAnim" Grid.Row="11" Grid.Column="0" Grid.ColumnSpan="2">Restart All Anims</Button> -->
+                <!--     -->
+                <!--     </Grid> -->
+            </TabItem>
+            <TabItem Header="Travel">
+                <views:DevTabTravel DataContext="{Binding Travel}"/>
+            </TabItem>
+            <TabItem Header="Script">
+                <views:DevTabScript DataContext="{Binding Script}"/>
+              
+                <!-- <Grid RowDefinitions="34, 26, Auto, 40" ColumnDefinitions="*, *" ColumnSpacing="8" RowSpacing="8"> -->
+                    <!-- -->
+                    <!--     <Button Classes="flat" Name="btnReloadScripts"  Grid.Row="0" Grid.Column="0" >Reload Scripts</Button> -->
+                    <!--     <Button  Classes="flat" Name="btnTextTest"  Grid.Row="0" Grid.Column="1" >Text Test</Button> -->
+                    <!--     <TextBlock VerticalAlignment="Bottom" Grid.Row="1" Grid.Column="0">Lua Console:</TextBlock> -->
+                    <!--     <TextBox Name="txtScriptOutput" Height="300"  IsReadOnly="True" Grid.Row="2" Grid.ColumnSpan="2"/> -->
+                    <!--     <TextBox Name="txtScriptInput" Grid.Row="3" Grid.ColumnSpan="2"></TextBox> -->
+                    <!-- </Grid> -->
+                    <!-- -->
+            </TabItem>
+
+        </TabControl>
+    </Border>
+</UserControl>
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/DevControlView.axaml.cs b/RogueEssence.Editor.Avalonia/Views/New/Editors/DevControl/DevControlView.axaml.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/New/Editors/DevControlView.axaml.cs
rename to RogueEssence.Editor.Avalonia/Views/New/Editors/DevControl/DevControlView.axaml.cs
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/DevControl/DevTabGame.axaml b/RogueEssence.Editor.Avalonia/Views/New/Editors/DevControl/DevTabGame.axaml
new file mode 100644
index 00000000..8ef22561
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/Views/New/Editors/DevControl/DevTabGame.axaml
@@ -0,0 +1,52 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:vm="clr-namespace:RogueEssence.Dev.ViewModels;assembly=RogueEssence.Editor.Avalonia"
+             xmlns:views="clr-namespace:RogueEssence.Dev.Views"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             mc:Ignorable="d"
+             x:Class="RogueEssence.Dev.Views.DevTabGame">
+    <Design.DataContext>
+        <vm:DevTabGameViewModel />
+    </Design.DataContext>
+    <Grid ColumnSpacing="8" RowSpacing="8" RowDefinitions="Auto, Auto, Auto, Auto, Auto, Auto, Auto, Auto, Auto, Auto"
+          ColumnDefinitions="* *">
+        <CheckBox Grid.Row="0" Grid.Column="0" Content="Hide Objects" IsChecked="{Binding HideObjects}" />
+        <CheckBox Grid.Row="0" Grid.Column="1" Content="Hide Sprites" IsChecked="{Binding HideSprites}" />
+        <Button Classes="flat" Command="{Binding btnSpawn_Click}" Margin="4" Grid.Row="1" Grid.Column="0">Create Clone</Button>
+        <Button Classes="flat" Command="{Binding btnDespawn_Click}" Margin="4" Grid.Row="1" Grid.Column="1">Clear All Foes</Button>
+        <views:SearchComboBox ItemsSource="{Binding Skills}"
+                              SelectedIndex="{Binding ChosenSkill}" Margin="4" Grid.Row="2" Grid.Column="0"
+                              Grid.ColumnSpan="2" />
+        <Button Classes="flat" Command="{Binding btnLearnSkill_Click}" Margin="4" Grid.Row="3" Grid.Column="0">Learn Skill</Button>
+        <Button Classes="flat" Command="{Binding btnGiveSkill_Click}" Margin="4" Grid.Row="3" Grid.Column="1">Teach Foes</Button>
+        <views:SearchComboBox ItemsSource="{Binding Intrinsics}"
+                              SelectedIndex="{Binding ChosenIntrinsic}" Margin="4" Grid.Row="4" Grid.Column="0"
+                              Grid.ColumnSpan="2" />
+        <Button Classes="flat" Command="{Binding btnSetIntrinsic_Click}" Margin="4" Grid.Row="5" Grid.Column="0">Set Intrinsic</Button>
+        <Button Classes="flat" Command="{Binding btnGiveFoes_Click}" Margin="4" Grid.Row="5" Grid.Column="1">Give Foes</Button>
+        <views:SearchComboBox ItemsSource="{Binding Statuses}"
+                              SelectedIndex="{Binding ChosenStatus}" Margin="4" Grid.Row="6" Grid.Column="0"
+                              Grid.ColumnSpan="2" />
+        <Button Classes="flat" Command="{Binding btnToggleStatus_Click}" Margin="4" Grid.Row="7" Grid.Column="0" Grid.ColumnSpan="2">Toggle Status</Button>
+        <views:SearchComboBox
+            ItemsSource="{Binding Items}"
+            SelectedIndex="{Binding ChosenItem}"
+            Margin="4"
+            Grid.Row="8"
+            Grid.Column="0"
+            Grid.ColumnSpan="2">
+            <ComboBox.ItemsPanel>
+                <ItemsPanelTemplate>
+                    <VirtualizingStackPanel />
+                </ItemsPanelTemplate>
+            </ComboBox.ItemsPanel>
+            <ComboBox.Styles>
+                <Style Selector="ComboBox /template/  Popup#PART_Popup">
+                    <Setter Property="Placement" Value="Bottom"/>
+                </Style>
+            </ComboBox.Styles>
+        </views:SearchComboBox>
+        <Button Classes="flat" Command="{Binding btnSpawnItem_Click}" Margin="4" Grid.Row="10" Grid.ColumnSpan="2">Create Item</Button>
+    </Grid>
+</UserControl>
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabGame.axaml.cs b/RogueEssence.Editor.Avalonia/Views/New/Editors/DevControl/DevTabGame.axaml.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/DevForm/DevTabGame.axaml.cs
rename to RogueEssence.Editor.Avalonia/Views/New/Editors/DevControl/DevTabGame.axaml.cs
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/DevControlView.axaml b/RogueEssence.Editor.Avalonia/Views/New/Editors/DevControlView.axaml
deleted file mode 100644
index 2b8524de..00000000
--- a/RogueEssence.Editor.Avalonia/Views/New/Editors/DevControlView.axaml
+++ /dev/null
@@ -1,218 +0,0 @@
-<UserControl xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:vm="using:RogueEssence.Dev.ViewModels"
-             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             FontSize="12"
-             x:DataType="vm:DevControlViewModel"
-             x:Class="RogueEssence.Dev.Views.DevControlView">
-    
-    
-    <UserControl.DataContext>
-        <vm:DevControlViewModel/>
-    </UserControl.DataContext>
-    <!-- The Game/Player/Travel/Script Tabs will be moved inside here... -->
-
-    
-    <!-- <Style Selector="Button.flat"> -->
-    <!--     <Setter Property="BorderThickness" Value="1" /> -->
-    <!--     <Setter Property="BorderBrush" Value="{DynamicResource Brush.Border2}" /> -->
-    <!--     <Setter Property="TextBlock.TextAlignment" Value="Center" /> -->
-    <!--     <Setter Property="Foreground" Value="{DynamicResource Brush.FG1}" /> -->
-    <!--     <Setter Property="Background" Value="{DynamicResource Brush.FlatButton.Background}" /> -->
-    <!--     <Setter Property="VerticalContentAlignment" Value="Center" /> -->
-    <!--     <Setter Property="Template"> -->
-    <!--         <ControlTemplate> -->
-    <!--             <Grid> -->
-    <!--                 <Border x:Name="PART_Border" -->
-    <!--                         Background="{TemplateBinding Background}" -->
-    <!--                         BorderBrush="{TemplateBinding BorderBrush}" -->
-    <!--                         BorderThickness="{TemplateBinding BorderThickness}" -->
-    <!--                         CornerRadius="{TemplateBinding CornerRadius}" /> -->
-    <!-- -->
-    <!--                 <ContentPresenter x:Name="PART_ContentPresenter" -->
-    <!--                                   Background="Transparent" -->
-    <!--                                   Padding="{TemplateBinding Padding}" -->
-    <!--                                   Content="{TemplateBinding Content}" -->
-    <!--                                   ContentTemplate="{TemplateBinding ContentTemplate}" -->
-    <!--                                   HorizontalContentAlignment="Center" -->
-    <!--                                   VerticalContentAlignment="Center" /> -->
-    <!--                  -->
-                    
-    <UserControl.Styles>
-        <Style Selector="Button">
-            <Setter Property="Padding" Value="10"></Setter>
-            <Setter Property="HorizontalAlignment" Value="Stretch"></Setter>
-            <Setter Property="HorizontalContentAlignment" Value="Center"></Setter>
-        </Style>
-        <Style Selector="ComboBox">
-            <Setter Property="Padding" Value="8"></Setter>
-            <!-- <Setter Property="Foreground" Value="Red" />  -->
-            <!-- <Setter Property="Background" Value="Red" /> -->
-        </Style>
-        
-        <!-- -->
-        <!-- <Style Selector="TabControl /template/ ContentPresenter#PART_SelectedContentHost"> -->
-        <!--     <Setter Property="Margin" Value="2"/> -->
-        <!-- </Style> -->
-    </UserControl.Styles>
-
- 
-    <Border>
-        
-        <TabControl>
-            <TabItem Header="Game">
-                <Grid ColumnSpacing="8" RowSpacing="8" RowDefinitions="Auto, Auto, Auto, Auto, Auto, Auto, Auto, Auto, Auto, Auto"
-                      ColumnDefinitions="* *">
-                    <CheckBox Grid.Row="0" Grid.Column="0" Content="Hide Objects"></CheckBox>
-                    <CheckBox Grid.Row="0" Grid.Column="1" Content="Hide Sprites"></CheckBox>
-                    <Button Classes="flat" HorizontalAlignment="Stretch" HorizontalContentAlignment="Center" Name="btnSpawnClone"
-                            Grid.Row="1" Grid.Column="0" Content="Create Clone">
-                
-                    </Button>
-                    <Button Classes="flat" HorizontalAlignment="Stretch" HorizontalContentAlignment="Center" Name="btnDespawnAll"
-                            Grid.Row="1" Grid.Column="1" Content="Clear All Foes">
-                        
-                    </Button>
-                    
-                    <ComboBox HorizontalAlignment="Stretch" 
-                              Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2"
-                              ItemsSource="{Binding Fruits}" >
-                              <ComboBox.ItemTemplate>
-                                  <DataTemplate>
-                                      <StackPanel Orientation="Horizontal">
-                                          <TextBlock Text="{Binding .}"></TextBlock>
-                                      </StackPanel>
-                                  </DataTemplate>
-                              </ComboBox.ItemTemplate>
-                        </ComboBox>
-                    
-                    <Button Classes="flat" HorizontalAlignment="Stretch" HorizontalContentAlignment="Center"
-                            Grid.Row="3" Grid.Column="0" Content="Learn Skill">
-
-                     
-                    </Button>
-                    
-                    <Button Classes="flat" HorizontalAlignment="Stretch" HorizontalContentAlignment="Center"
-                            Grid.Row="3" Grid.Column="1" Content="Teach Foes">
-                        
-                    </Button>
-                    
-                    <ComboBox ItemsSource="{Binding Fruits.Fruits}" HorizontalAlignment="Stretch" Grid.Row="4" Grid.Column="0" Grid.ColumnSpan="2"/>
-                       
-                    
-                    <Button Classes="flat" HorizontalAlignment="Stretch" HorizontalContentAlignment="Center"
-                            Grid.Row="5" Grid.Column="0" Content="Set Intrinsic">
-                        
-                    </Button>
-                    
-                    <Button Classes="flat"
-                            Grid.Row="5" Grid.Column="1" Content="Give Foes">
-                        
-                    </Button>
-                    
-                    
-                    <ComboBox  ItemsSource="{Binding Fruits}" HorizontalAlignment="Stretch" Grid.Row="6" Grid.Column="0" Grid.ColumnSpan="2"/>
-                       
-                    
-                    <Button Classes="flat" HorizontalAlignment="Stretch" HorizontalContentAlignment="Center"
-                            Grid.Row="7" Grid.Column="0"  Grid.ColumnSpan="2" Content="Toggle Status">
-                        
-                    </Button>
-                    
-                     
-                    <ComboBox ItemsSource="{Binding Fruits}" HorizontalAlignment="Stretch" Grid.Row="8" Grid.Column="0" Grid.ColumnSpan="2"/>
-                        
-                 
-                    
-                    <Button Classes="flat" HorizontalAlignment="Stretch" HorizontalContentAlignment="Center"
-                            Grid.Row="9" Grid.Column="0"  Grid.ColumnSpan="2" Content="Create Item">
-                        
-                    </Button>
-
-                    
-                   
-
-                    <!-- <Button Name="btnLearnSkill" Command="{Binding btnLearnSkill_Click}" Margin="4" Grid.Row="3" Grid.Column="0">Learn Skill</Button> -->
-                    <!-- <Button Name="btnGiveSkill" Command="{Binding btnGiveSkill_Click}" Margin="4" Grid.Row="3" Grid.Column="1">Teach Foes</Button> -->
-                    <!-- <views:SearchComboBox Name="cbIntrinsics" Items="{Binding Intrinsics}" SelectedIndex="{Binding ChosenIntrinsic}" VirtualizationMode="Simple" Margin="4" Grid.Row="4" Grid.Column="0" Grid.ColumnSpan="2"/> -->
-                    <!-- <Button Name="btnSetIntrinsic" Command="{Binding btnSetIntrinsic_Click}" Margin="4" Grid.Row="5" Grid.Column="0">Set Intrinsic</Button> -->
-                    <!-- <Button Name="btnGiveFoes" Command="{Binding btnGiveFoes_Click}" Margin="4" Grid.Row="5" Grid.Column="1">Give Foes</Button> -->
-                    <!-- <views:SearchComboBox Name="cbStatus" Items="{Binding Statuses}" SelectedIndex="{Binding ChosenStatus}" VirtualizationMode="Simple" Margin="4" Grid.Row="6" Grid.Column="0" Grid.ColumnSpan="2"/> -->
-                    <!-- <Button Name="btnToggleStatus" Command="{Binding btnToggleStatus_Click}" Margin="4" Grid.Row="7" Grid.Column="0" Grid.ColumnSpan="2">Toggle Status</Button> -->
-                    <!-- <views:SearchComboBox Name="cbSpawnItem" Items="{Binding Items}" SelectedIndex="{Binding ChosenItem}" VirtualizationMode="Simple" Margin="4" Grid.Row="8" Grid.Column="0" Grid.ColumnSpan="2"/> -->
-                    <!-- <Button Name="btnSpawnItem" Command="{Binding btnSpawnItem_Click}" Margin="4" Grid.Row="10" Grid.ColumnSpan="2">Create Item</Button> -->
-                </Grid>
-
-            </TabItem>
-            <TabItem Header="Player">
-                <Grid RowDefinitions="30, Auto, 30, Auto, 30, Auto, 30, Auto, 30, Auto, Auto, Auto" ColumnDefinitions="*, *" ColumnSpacing="8">
-                    <TextBlock Margin="4,0" VerticalAlignment="Bottom" Grid.Row="0" Grid.Column="0">Lv.</TextBlock>
-                    <NumericUpDown MinHeight="40" Name="nudLevel" Value="20" Minimum="1" Increment="1" Maximum="100" Grid.Row="1" Grid.Column="0"/>
-                    <Button Classes="flat"  Name="btnRollSkill" Margin="4" Grid.Row="1" Grid.Column="1">Reroll Skills</Button>
-                    <!-- <Button Name="btnRollSkill" Command="{Binding btnRollSkill_Click}" Margin="4" Grid.Row="1" Grid.Column="1">Reroll Skills</Button> -->
-                    <TextBlock VerticalAlignment="Bottom" Grid.Row="2" Grid.Column="0">Species</TextBlock>
-                    <Grid Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2" ColumnDefinitions="*, Auto" ColumnSpacing="4">
-                 
-                         
-                         
-                         
-                    <!-- <views:SearchComboBox Name="cbDexNum" Items="{Binding Monsters}" SelectedIndex="{Binding ChosenMonster}" VirtualizationMode="Simple" Margin="4"/> -->
-                    <ComboBox ItemsSource="{Binding Fruits}" HorizontalAlignment="Stretch"/>
-                      
-                    <Button HorizontalAlignment="Stretch" HorizontalContentAlignment="Center" Classes="icon_button" Height="20" Width="20" Name="btnChangeOrder" Grid.Column="1" ToolTip.Tip="Switch Ordering">
-                         <!-- <Panel> -->
-                         <!--   <Image Source="/Assets/AssetOrder.png" Width="26" -->
-                         <!--                   Height="26" VerticalAlignment="Center" HorizontalAlignment="Center" /> -->
-                         <!-- </Panel> -->
-                         <Path
-                             Width="20" Height="20"
-                             Margin="0,1,0,0"
-                             Data="{StaticResource Icons.ListNumbersFill}" />
-                    </Button>
-              
-                    </Grid>
-                    
-                    <TextBlock VerticalAlignment="Bottom" Grid.Row="4">Form</TextBlock>
-                    <ComboBox ItemsSource="{Binding Fruits}" HorizontalAlignment="Stretch" Grid.Row="5" Grid.ColumnSpan="2"/>
-                        
-                    <TextBlock  VerticalAlignment="Bottom" Grid.Row="6" Grid.Column="0">Skin</TextBlock>
-                    <TextBlock  VerticalAlignment="Bottom" Grid.Row="6" Grid.Column="1">Gender</TextBlock>
-                    <ComboBox  ItemsSource="{Binding Fruits}" HorizontalAlignment="Stretch" Grid.Row="7" Grid.Column="0"/>
-                       
-                    <ComboBox ItemsSource="{Binding Fruits}" HorizontalAlignment="Stretch" Grid.Row="7" Grid.Column="1"/>
-                      
-                    
-                    <TextBlock VerticalAlignment="Bottom" Grid.Row="8" Grid.Column="0">Animation</TextBlock>
-                    
-                    <ComboBox ItemsSource="{Binding Fruits}" HorizontalAlignment="Stretch" Grid.Row="9" Grid.Column="0" Grid.ColumnSpan="2"/>
-                        
-                    
-                    <CheckBox Name="chkJustMe" VerticalAlignment="Center" Grid.Row="10" Grid.Column="0">Just Me</CheckBox>
-                    <CheckBox Name="chkJustOnce" VerticalAlignment="Center" Grid.Row="10" Grid.Column="1">Just Once</CheckBox>
-                    <Button Classes="flat"  Name="btnResetAnim" Grid.Row="11" Grid.Column="0" Grid.ColumnSpan="2">Restart All Anims</Button>
-                   
-                    </Grid>
-            </TabItem>
-            <TabItem Header="Travel">
-                <TextBlock>
-                    Travel Tab
-                </TextBlock>
-            </TabItem>
-            <TabItem Header="Script">
-              
-                    <Grid RowDefinitions="34, 26, Auto, 40" ColumnDefinitions="*, *" ColumnSpacing="8" RowSpacing="8">
-                  
-                        <Button Classes="flat" Name="btnReloadScripts"  Grid.Row="0" Grid.Column="0" >Reload Scripts</Button>
-                        <Button  Classes="flat" Name="btnTextTest"  Grid.Row="0" Grid.Column="1" >Text Test</Button>
-                        <TextBlock VerticalAlignment="Bottom" Grid.Row="1" Grid.Column="0">Lua Console:</TextBlock>
-                        <TextBox Name="txtScriptOutput" Height="300"  IsReadOnly="True" Grid.Row="2" Grid.ColumnSpan="2"/>
-                        <TextBox Name="txtScriptInput" Grid.Row="3" Grid.ColumnSpan="2"></TextBox>
-                    </Grid>
-                
-            </TabItem>
-
-        </TabControl>
-    </Border>
-</UserControl>
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/New/TabBarView.axaml b/RogueEssence.Editor.Avalonia/Views/New/TabBarView.axaml
index ed8946f4..04f34ba1 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/TabBarView.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/New/TabBarView.axaml
@@ -9,7 +9,7 @@
              xmlns:local="clr-namespace:RogueEssence.Dev.Converters"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="30"
              x:Class="RogueEssence.Dev.Views.TabBarView"
-             x:DataType="vm:MainWindowViewModel"
+             x:DataType="vm:DevFormViewModel"
              x:Name="MainTabBar">
 
     <UserControl.Resources>
@@ -31,7 +31,7 @@
         </ControlTheme>
     </UserControl.Resources>
     <Design.DataContext>
-        <vm:MainWindowViewModel />
+        <vm:DevFormViewModel />
     </Design.DataContext>
 
     <UserControl.Styles>
@@ -51,7 +51,7 @@
                 <Setter Property="Background">
                     <Setter.Value>
                         <MultiBinding Converter="{StaticResource ObjectToColorKeyConverter}">
-                            <Binding Path="((vm:MainWindowViewModel)DataContext).TemporaryTab"
+                            <Binding Path="((vm:DevFormViewModel)DataContext).TemporaryTab"
                                      RelativeSource="{RelativeSource AncestorType=controls:TabsControl}" />
                             <Binding Source="SelectedTabItemBackgroundBrush" />
                             <Binding Source="" />
@@ -63,7 +63,7 @@
                 <Setter Property="Foreground">
                     <Setter.Value>
                         <MultiBinding Converter="{StaticResource ObjectToColorKeyConverter}">
-                            <Binding Path="((vm:MainWindowViewModel)DataContext).TemporaryTab"
+                            <Binding Path="((vm:DevFormViewModel)DataContext).TemporaryTab"
                                      RelativeSource="{RelativeSource AncestorType=controls:TabsControl}" />
                             <!-- highlight color -->
                             <Binding Source="TabItemHeaderForegroundSelected" />
@@ -79,7 +79,7 @@
             <Style Selector="^:selected:pointerover">
                 <Setter Property="Background">
                     <MultiBinding Converter="{StaticResource ObjectToColorKeyConverter}">
-                        <Binding Path="((vm:MainWindowViewModel)DataContext).TemporaryTab"
+                        <Binding Path="((vm:DevFormViewModel)DataContext).TemporaryTab"
                                  RelativeSource="{RelativeSource AncestorType=controls:TabsControl}" />
                         <Binding Source="SelectedTabItemBackgroundBrush" />
                         <Binding Source="TabItemHeaderBackgroundUnselectedPointerOver" />
@@ -159,7 +159,7 @@
         <Style Selector="controls|DragTabItem:selected /template/ Border#Indicator">
             <Setter Property="Background" Value="{DynamicResource Brush.Accent}" />
             <Setter Property="IsVisible"
-                    Value="{Binding ((vm:MainWindowViewModel)DataContext).TemporaryTab, RelativeSource={RelativeSource AncestorType=controls:TabsControl}, Converter={x:Static ObjectConverters.IsNull}}" />
+                    Value="{Binding ((vm:DevFormViewModel)DataContext).TemporaryTab, RelativeSource={RelativeSource AncestorType=controls:TabsControl}, Converter={x:Static ObjectConverters.IsNull}}" />
 
         </Style>
 
diff --git a/RogueEssence.Editor.Avalonia/Views/New/TabBarView.axaml.cs b/RogueEssence.Editor.Avalonia/Views/New/TabBarView.axaml.cs
index 97b510bd..0dd32774 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/TabBarView.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/New/TabBarView.axaml.cs
@@ -15,7 +15,7 @@ public TabBarView()
         protected override void OnDataContextChanged(EventArgs e)
         {
             base.OnDataContextChanged(e);
-            if (DataContext is MainWindowViewModel vm)
+            if (DataContext is DevFormViewModel vm)
             {
                 vm.TabSwitcherClosed += () => TabSwitcherFlyoutButton.Flyout?.Hide();;
             }
@@ -23,7 +23,7 @@ protected override void OnDataContextChanged(EventArgs e)
 
         private async void OnCloseTab(object? sender, RoutedEventArgs e)
         {
-            if (DataContext is not MainWindowViewModel vm) return;
+            if (DataContext is not DevFormViewModel vm) return;
             if (sender is not Button { DataContext: EditorPageViewModel page }) return;
             
             bool closed = await vm.TryCloseTabAsync(page);
@@ -34,7 +34,7 @@ private async void OnCloseTab(object? sender, RoutedEventArgs e)
         
         private void TabSwitcherFlyout_OnOpened(object? sender, EventArgs e)
         {
-            if (DataContext is MainWindowViewModel vm)
+            if (DataContext is DevFormViewModel vm)
             {
                 vm.OpenTabSwitcher();
             }
@@ -42,7 +42,7 @@ private void TabSwitcherFlyout_OnOpened(object? sender, EventArgs e)
 
         private void TabSwitcherFlyout_OnClosed(object? sender, EventArgs e)
         {
-            if (DataContext is MainWindowViewModel vm)
+            if (DataContext is DevFormViewModel vm)
             {
                 vm.CloseTabSwitcher();
             }

From ef0e3afcd6e4f21ed409f8071cce7dacac025d1b Mon Sep 17 00:00:00 2001
From: Kace <41309226+DoubleTrio@users.noreply.github.com>
Date: Sun, 16 Nov 2025 11:45:43 -0500
Subject: [PATCH 08/51] data nodes

---
 .../ViewModels/New/DevFormViewModel.cs        | 57 ++++++++++++++++++-
 .../Views/DevForm/DevTabPlayer.axaml          | 25 +++++---
 .../Views/DevForm/DevTabScript.axaml          | 33 ++++-------
 .../Views/DevForm/DevTabTravel.axaml          | 29 +++-------
 .../Views/New/DevForm.axaml                   |  7 +++
 .../Views/New/DevForm.axaml.cs                |  3 +
 RogueEssence/Data/DataManager.cs              | 23 ++++++++
 7 files changed, 123 insertions(+), 54 deletions(-)

diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs
index ff4c77e0..199656f0 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs
@@ -8,6 +8,7 @@
 using RogueEssence.Dev.Models;
 using RogueEssence.Dev.Services;
 using ReactiveUI;
+using RogueEssence.Data;
 using RogueEssence.Dev.Utility;
 using RogueEssence.Dev.Views;
 
@@ -265,8 +266,15 @@ private void ClosePageAndChildren(PageNode node)
     private readonly PageFactory _pageFactory;
     private readonly TabEvents _tabEvents;
     private readonly IDialogService _dialogService;
-    public ObservableCollection<NodeBase> Nodes { get; set; }
-
+    
+    
+    private ObservableCollection<NodeBase> _nodes = new();
+    
+    public ObservableCollection<NodeBase> Nodes 
+    { 
+        get => _nodes;
+        set => this.RaiseAndSetIfChanged(ref _nodes, value);
+    }
     // public DevFormViewModel() : this(new PageFactory(new DesignServiceProvider()),
     //     new NodeFactory(new DesignServiceProvider()), new DialogService(),
     //     new TabEvents(new PageFactory(new DesignServiceProvider())), new DevTabGameViewModel(), new DevTabPlayerViewModel())
@@ -317,7 +325,50 @@ await _dialogService.ShowDialogAsync<PreferencesWindowViewModel, bool>(
         var tab = _pageFactory.CreatePage("DevControl");
         tab.Icon = "Icons.GameControllerFill";
         AddTopLevelPage(tab);
-        this.WhenAnyValue(x => x.Filter).Subscribe(ApplyFilter);
+        this.WhenAnyValue(x => x.Filter).Throttle(TimeSpan.FromMilliseconds(300)).Subscribe(ApplyFilter);
+    }
+
+
+    public void ClearNodes()
+    {
+        Nodes.Clear();
+    }
+    public void UpdateTree()
+    {
+        CreateDataNode();
+
+     
+    }
+
+    private void CreateDataNode()
+    {
+        var dataNode = _nodeFactory.CreateOpenEditorNode("Data", "Icons.FloppyDiskFill", "");
+        foreach (var type in Enum.GetValues<DataManager.DataType>())
+        {
+            if (type == DataManager.DataType.All || type == DataManager.DataType.None)
+                continue;
+            
+               
+            var dataItemRootNode = _nodeFactory.CreateDataRootNode(
+                type.ToString(),
+                "TODO",
+                type.ToString(),
+                type.GetIcon());
+            dataNode.SubNodes.Add(dataItemRootNode);
+            var entries = DataManager.Instance.DataIndices[type].GetLocalStringArray(true);
+
+            foreach (string key in entries.Keys)
+            {
+                var itemNode = _nodeFactory.CreateDataItemNode(
+                    key,
+                    "TODO",
+                    $"{key}: {entries[key]}",
+                    type.GetIcon());
+            
+                dataItemRootNode.SubNodes.Add(itemNode);
+            }
+        }
+        Nodes.Add(dataNode);
     }
     
     private void InitializeTabEvents()
diff --git a/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabPlayer.axaml b/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabPlayer.axaml
index 494752cd..13f906ad 100644
--- a/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabPlayer.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabPlayer.axaml
@@ -10,9 +10,18 @@
     <vm:DevTabPlayerViewModel/>
   </Design.DataContext>
   <Grid RowDefinitions="30, Auto, 30, Auto, 30, Auto, 30, Auto, 30, Auto, Auto, Auto" ColumnDefinitions="*, *" ColumnSpacing="8">
-    <TextBlock Margin="4,0" VerticalAlignment="Bottom" Grid.Row="0" Grid.Column="0">Lv.</TextBlock>
-    <NumericUpDown Name="nudLevel" Value="{Binding Level}" Minimum="1" Maximum="100" Margin="4" Grid.Row="1" Grid.Column="0"/>
-    <Button Name="btnRollSkill" Command="{Binding btnRollSkill_Click}" Margin="4" Grid.Row="1" Grid.Column="1">Reroll Skills</Button>
+    <Grid.Styles>
+      <Style Selector="TextBlock">
+        <Setter Property="VerticalAlignment" Value="Bottom" />
+      </Style>
+      <Style Selector="NumericUpDown">
+        <Setter Property="MinHeight" Value="40"  />
+        <Setter Property="Height" Value="40"  />
+      </Style>
+    </Grid.Styles>
+    <TextBlock  Margin="4,0" VerticalAlignment="Bottom" Grid.Row="0" Grid.Column="0">Lv.</TextBlock>
+    <NumericUpDown  Name="nudLevel" Value="{Binding Level}" Minimum="1" Maximum="100" Grid.Row="1" Grid.Column="0"/>
+    <Button Classes="flat" Name="btnRollSkill" Command="{Binding btnRollSkill_Click}" Grid.Row="1" Grid.Column="1">Reroll Skills</Button>
     <TextBlock Margin="4,0" VerticalAlignment="Bottom" Grid.Row="2" Grid.Column="0">Species</TextBlock>
     <Grid Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2">
       <Grid.ColumnDefinitions>
@@ -20,10 +29,10 @@
         <ColumnDefinition Width="40"/>
       </Grid.ColumnDefinitions>
 	  <views:SearchComboBox Name="cbDexNum" ItemsSource="{Binding Monsters}" SelectedIndex="{Binding ChosenMonster}" Margin="4"/>
-	  <Button Name="btnChangeOrder" Command="{Binding btnChangeOrder_Click}" Margin="4" Grid.Column="1" ToolTip.Tip="Switch Ordering">
+	  <Button Classes="icon_button" Name="btnChangeOrder" Command="{Binding btnChangeOrder_Click}"  Grid.Column="1" ToolTip.Tip="Switch Ordering">
         <Panel>
-          <Image Source="/Assets/AssetOrder.png" Width="26"
-                          Height="26" VerticalAlignment="Center" HorizontalAlignment="Center" />
+          <Image Source="/Assets/AssetOrder.png" Width="20"
+                          Height="20" VerticalAlignment="Center" HorizontalAlignment="Center" />
         </Panel>
 	  </Button>
     </Grid>
@@ -37,6 +46,6 @@
     <views:SearchComboBox Name="cbAnim" ItemsSource="{Binding Anims}" SelectedIndex="{Binding ChosenAnim}" Margin="4" Grid.Row="9" Grid.Column="0" Grid.ColumnSpan="2"/>
     <CheckBox Name="chkJustMe" Margin="4" IsChecked="{Binding JustMe}" VerticalAlignment="Center" Grid.Row="10" Grid.Column="0">Just Me</CheckBox>
     <CheckBox Name="chkJustOnce" Margin="4" IsChecked="{Binding JustOnce}" VerticalAlignment="Center" Grid.Row="10" Grid.Column="1">Just Once</CheckBox>
-    <Button Name="btnResetAnim" Command="{Binding btnResetAnim_Click}" Margin="4" Grid.Row="11" Grid.Column="0" Grid.ColumnSpan="2">Restart All Anims</Button>
+    <Button Classes="flat" Name="btnResetAnim" Command="{Binding btnResetAnim_Click}" Margin="4" Grid.Row="11" Grid.Column="0" Grid.ColumnSpan="2">Restart All Anims</Button>
   </Grid>
-</UserControl>
+</UserControl>
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabScript.axaml b/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabScript.axaml
index 37d145d8..8577f21c 100644
--- a/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabScript.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabScript.axaml
@@ -5,24 +5,15 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              mc:Ignorable="d"
              x:Class="RogueEssence.Dev.Views.DevTabScript">
-  <Design.DataContext>
-    <vm:DevTabScriptViewModel/>
-  </Design.DataContext>
-  <Grid Margin="4">
-    <Grid.RowDefinitions>
-      <RowDefinition Height="34"/>
-      <RowDefinition Height="26"/>
-      <RowDefinition Height="*"/>
-      <RowDefinition Height="40"/>
-    </Grid.RowDefinitions>
-    <Grid.ColumnDefinitions>
-      <ColumnDefinition/>
-      <ColumnDefinition/>
-    </Grid.ColumnDefinitions>
-    <Button Name="btnReloadScripts" Command="{Binding btnReloadScripts_Click}" Margin="4" Grid.Row="0" Grid.Column="0" >Reload Scripts</Button>
-    <Button Name="btnTextTest" Command="{Binding btnTextTest_Click}" Margin="4" Grid.Row="0" Grid.Column="1" >Text Test</Button>
-    <TextBlock Margin="4,0" VerticalAlignment="Bottom" Grid.Row="1" Grid.Column="0">Lua Console:</TextBlock>
-    <TextBox Name="txtScriptOutput" Text="{Binding ScriptLog}" CaretIndex="{Binding ScriptCaret}" Margin="4" IsReadOnly="True" Grid.Row="2" Grid.ColumnSpan="2"/>
-    <TextBox Name="txtScriptInput" Text="{Binding ScriptLine}" CaretIndex="{Binding CmdCaret, Mode=TwoWay}" Margin="4" TextWrapping="Wrap" Grid.Row="3" Grid.ColumnSpan="2" KeyDown="txtScriptInput_KeyDown"></TextBox>
-  </Grid>
-</UserControl>
+    <Design.DataContext>
+        <vm:DevTabScriptViewModel/>
+    </Design.DataContext>
+    <Grid RowDefinitions="40, 26, Auto, 40" ColumnDefinitions="*, *" ColumnSpacing="8" RowSpacing="8">
+                  
+        <Button Classes="flat" Name="btnReloadScripts" Command="{Binding btnReloadScripts_Click}" Margin="4" Grid.Row="0" Grid.Column="0" >Reload Scripts</Button>
+        <Button Classes="flat" Name="btnTextTest" Command="{Binding btnTextTest_Click}" Margin="4" Grid.Row="0" Grid.Column="1" >Text Test</Button>
+        <TextBlock Margin="4,0" VerticalAlignment="Bottom" Grid.Row="1" Grid.Column="0">Lua Console:</TextBlock>
+        <TextBox Name="txtScriptOutput" Height="300" VerticalAlignment="Stretch" VerticalContentAlignment="Top" Text="{Binding ScriptLog}" CaretIndex="{Binding ScriptCaret}" Margin="4" IsReadOnly="True" Grid.Row="2" Grid.ColumnSpan="2" />
+        <TextBox Name="txtScriptInput" Text="{Binding ScriptLine}" CaretIndex="{Binding CmdCaret, Mode=TwoWay}" Margin="4" TextWrapping="Wrap" Grid.Row="3" Grid.ColumnSpan="2" KeyDown="txtScriptInput_KeyDown"></TextBox>
+    </Grid>
+</UserControl>
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabTravel.axaml b/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabTravel.axaml
index 7bb3d87c..da16d8f5 100644
--- a/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabTravel.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabTravel.axaml
@@ -13,33 +13,18 @@
   <UserControl.Resources>
     <converters:ListNotEmptyConverter x:Key="ListNotEmptyConverter"/>
   </UserControl.Resources>
-  <Grid Margin="4">
-    <Grid.RowDefinitions>
-      <RowDefinition/>
-      <RowDefinition/>
-      <RowDefinition/>
-      <RowDefinition/>
-      <RowDefinition/>
-      <RowDefinition/>
-      <RowDefinition/>
-      <RowDefinition/>
-      <RowDefinition/>
-    </Grid.RowDefinitions>
-    <Grid.ColumnDefinitions>
-      <ColumnDefinition/>
-      <ColumnDefinition/>
-    </Grid.ColumnDefinitions>
-    <Button Margin="4" Command="{Binding btnReloadMap_Click}" Grid.Row="0" Grid.ColumnSpan="2">Reload Current Map</Button>
+  <Grid RowDefinitions="Auto, 30, 30, Auto, 30, Auto, 30, Auto, 10, Auto" ColumnDefinitions="*, *" ColumnSpacing="8">
+    <Button Margin="0, 10" Classes="flat" Command="{Binding btnReloadMap_Click}" Grid.Row="0" Grid.ColumnSpan="2">Reload Current Map</Button>
     <CheckBox Name="chkDebugGen" Margin="4" IsChecked="{Binding DebugGen}" VerticalAlignment="Center" Grid.Row="1" Grid.ColumnSpan="2">Show Generation Steps</CheckBox>
     <TextBlock Margin="4,0" VerticalAlignment="Bottom" Grid.Row="2">Zone:</TextBlock>
     <views:SearchComboBox Margin="4" ItemsSource="{Binding Zones}" SelectedIndex="{Binding ChosenZone}" Grid.Row="3" Grid.ColumnSpan="2"/>
     <TextBlock Margin="4,0" VerticalAlignment="Bottom" Grid.Row="4" Grid.ColumnSpan="2" >Structure:</TextBlock>
     <views:SearchComboBox Margin="4" ItemsSource="{Binding Structures}" IsEnabled="{Binding Path=Structures, Converter={StaticResource ListNotEmptyConverter}}" SelectedIndex="{Binding ChosenStructure}" Grid.Row="5" Grid.ColumnSpan="2" />
     <TextBlock Margin="4,0" VerticalAlignment="Bottom" Grid.Row="6" Grid.Column="0">Ground:</TextBlock>
-    <views:SearchComboBox Margin="4" ItemsSource="{Binding Grounds}" SelectedIndex="{Binding ChosenGround}" IsEnabled="{Binding Path=Grounds, Converter={StaticResource ListNotEmptyConverter}}" Grid.Row="7" Grid.Column="0"/>
-    <Button Margin="4" Command="{Binding btnEnterGround_Click}" IsEnabled="{Binding Path=Grounds, Converter={StaticResource ListNotEmptyConverter}}" Grid.Row="8" Grid.Column="0">Enter Ground</Button>
+    <views:SearchComboBox Margin="4,0" ItemsSource="{Binding Grounds}" SelectedIndex="{Binding ChosenGround}" IsEnabled="{Binding Path=Grounds, Converter={StaticResource ListNotEmptyConverter}}" Grid.Row="7" Grid.Column="0"/>
+    <Button Classes="flat" Command="{Binding btnEnterGround_Click}" IsEnabled="{Binding Path=Grounds, Converter={StaticResource ListNotEmptyConverter}}" Grid.Row="9" Grid.Column="0">Enter Ground</Button>
     <TextBlock Margin="4,0" VerticalAlignment="Bottom" Grid.Row="6" Grid.Column="1" >Floor:</TextBlock>
-    <views:SearchComboBox Margin="4" ItemsSource="{Binding Floors}" IsEnabled="{Binding Path=Floors, Converter={StaticResource ListNotEmptyConverter}}" SelectedIndex="{Binding ChosenFloor}" Grid.Row="7" Grid.Column="1"/>
-    <Button Margin="4" Command="{Binding btnEnterDungeon_Click}" IsEnabled="{Binding Path=Floors, Converter={StaticResource ListNotEmptyConverter}}" Grid.Row="8" Grid.Column="1">Enter Map</Button>
+    <views:SearchComboBox  Margin="4,0" ItemsSource="{Binding Floors}" IsEnabled="{Binding Path=Floors, Converter={StaticResource ListNotEmptyConverter}}" SelectedIndex="{Binding ChosenFloor}" Grid.Row="7" Grid.Column="1"/>
+    <Button Classes="flat" Command="{Binding btnEnterDungeon_Click}" IsEnabled="{Binding Path=Floors, Converter={StaticResource ListNotEmptyConverter}}" Grid.Row="9" Grid.Column="1">Enter Map</Button>
   </Grid>
-</UserControl>
+</UserControl>
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml b/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml
index c0b3bdfc..5a187acf 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml
@@ -14,6 +14,13 @@
                     Opened="Window_Loaded" Closed="Window_Closed"
                     Title="Avalonia PMD Editor">
 
+    <Design.DataContext>
+
+
+        <vm:DevFormViewModel />
+
+
+    </Design.DataContext>
   <!-- <v:ChromelessWindow.DataContext> -->
   <!--   <vm:MainWindowViewModel /> -->
   <!-- </v:ChromelessWindow.DataContext> -->
diff --git a/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml.cs b/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml.cs
index d1835de4..73e3b7ee 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml.cs
@@ -117,7 +117,10 @@ private void reload(DataManager.DataType dataType)
                 if (dataType == DataManager.DataType.All)
                     devViewModel.Mods.UpdateMod();
 
+                devViewModel.ClearNodes();
+                devViewModel.UpdateTree();
                 LoadComplete = true;
+                
             }
         }
 
diff --git a/RogueEssence/Data/DataManager.cs b/RogueEssence/Data/DataManager.cs
index c4b9924d..48ff426b 100644
--- a/RogueEssence/Data/DataManager.cs
+++ b/RogueEssence/Data/DataManager.cs
@@ -58,6 +58,29 @@ public static Type GetClassType(this DataManager.DataType dataType)
             }
             throw new ArgumentOutOfRangeException(nameof(dataType), dataType, null);
         }
+        
+        public static string GetIcon(this DataManager.DataType dataType) => dataType switch
+        {
+            DataManager.DataType.Monster => "Icons.GhostFill",
+            DataManager.DataType.Skill => "Icons.SwordFill",
+            DataManager.DataType.Item => "Icons.JarLabelFill",
+            DataManager.DataType.Intrinsic => "Icons.SwordFill",
+            DataManager.DataType.Status => "Icons.HeartFill",
+            DataManager.DataType.MapStatus => "Icons.HeartFill",
+            DataManager.DataType.Terrain => "Icons.MountainsFill",
+            DataManager.DataType.Tile => "Icons.SquaresFourFill",
+            DataManager.DataType.Zone => "Icons.StairsFill",
+            DataManager.DataType.Emote => "Icons.StarFill",
+            DataManager.DataType.AutoTile => "Icons.SquaresFourFill",
+            DataManager.DataType.Element => "Icons.LightningFill",
+            DataManager.DataType.GrowthGroup => "Icons.TrendUpFill",
+            DataManager.DataType.SkillGroup => "Icons.ListFill",
+            DataManager.DataType.AI => "Icons.BrainFill",
+            DataManager.DataType.Rank => "Icons.BinaryFill",
+            DataManager.DataType.Skin => "Icons.SparkleFill",
+            _ => "Icons.ListFill"
+        };
+    
     }
     
     //Manages data such as items, intrinsics, etc.  Also holds save data

From a651a58a33fa60c4f54a07ba4462553078e70bbd Mon Sep 17 00:00:00 2001
From: Kace <41309226+DoubleTrio@users.noreply.github.com>
Date: Sun, 16 Nov 2025 21:40:16 -0500
Subject: [PATCH 09/51] use treedatagrid for performance

---
 RogueEssence.Editor.Avalonia/App.axaml        |   2 +-
 RogueEssence.Editor.Avalonia/App.axaml.cs     |   2 +-
 .../RogueEssence.Editor.Avalonia.csproj       |   1 +
 .../ViewModels/New/DevFormViewModel.cs        |  46 +++++-
 .../ViewModels/New/NodeBase.cs                |  17 ++-
 .../Views/New/DevForm.axaml                   | 106 ++++++++++---
 .../Views/New/DevForm.axaml.cs                | 140 ++++++++++--------
 7 files changed, 213 insertions(+), 101 deletions(-)

diff --git a/RogueEssence.Editor.Avalonia/App.axaml b/RogueEssence.Editor.Avalonia/App.axaml
index 970e731c..840e1e60 100644
--- a/RogueEssence.Editor.Avalonia/App.axaml
+++ b/RogueEssence.Editor.Avalonia/App.axaml
@@ -43,7 +43,7 @@
          <FluentTheme />
          <fluent:CustomTheme/>
          <StyleInclude Source="/Assets/Styles.axaml"/>
-
+         <StyleInclude Source="avares://Avalonia.Controls.TreeDataGrid/Themes/Fluent.axaml"/>
          <StyleInclude Source="/Assets/TreeStyles.axaml"/>
      </Application.Styles>
              
diff --git a/RogueEssence.Editor.Avalonia/App.axaml.cs b/RogueEssence.Editor.Avalonia/App.axaml.cs
index de53a671..e3873318 100644
--- a/RogueEssence.Editor.Avalonia/App.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/App.axaml.cs
@@ -178,7 +178,7 @@ app.Resources[localeKey] is not ResourceDictionary targetLocale ||
 
         public static Avalonia.Controls.Shapes.Path CreateMenuIcon(string key)
         {
-            Console.WriteLine($"Icon???");
+  
             var icon = new Avalonia.Controls.Shapes.Path();
             icon.Width = 12;
             icon.Height = 12;
diff --git a/RogueEssence.Editor.Avalonia/RogueEssence.Editor.Avalonia.csproj b/RogueEssence.Editor.Avalonia/RogueEssence.Editor.Avalonia.csproj
index 661769b9..4806321d 100644
--- a/RogueEssence.Editor.Avalonia/RogueEssence.Editor.Avalonia.csproj
+++ b/RogueEssence.Editor.Avalonia/RogueEssence.Editor.Avalonia.csproj
@@ -12,6 +12,7 @@
   <ItemGroup>
     <PackageReference Include="Avalonia" Version="11.3.8" />
     <PackageReference Include="Avalonia.Controls.DataGrid" Version="11.3.8" />
+    <PackageReference Include="Avalonia.Controls.TreeDataGrid" Version="11.1.1" />
     <PackageReference Include="Avalonia.Desktop" Version="11.3.8" />
     <PackageReference Include="Avalonia.Diagnostics" Version="11.3.8" />
     <PackageReference Include="Avalonia.ReactiveUI" Version="11.3.8" />
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs
index 199656f0..5a432e3c 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs
@@ -1,10 +1,14 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.Collections.Specialized;
 using System.Linq;
 using System.Reactive;
 using System.Reactive.Linq;
 using System.Threading.Tasks;
+using Avalonia.Controls;
+using Avalonia.Controls.Models.TreeDataGrid;
+using Avalonia.Threading;
 using RogueEssence.Dev.Models;
 using RogueEssence.Dev.Services;
 using ReactiveUI;
@@ -16,6 +20,12 @@ namespace RogueEssence.Dev.ViewModels;
 
 public class DevFormViewModel : ViewModelBase
 {
+    private HierarchicalTreeDataGridSource<NodeBase> _nodeSource;
+    public HierarchicalTreeDataGridSource<NodeBase> NodeSource 
+    { 
+        get => _nodeSource;
+        set => this.RaiseAndSetIfChanged(ref _nodeSource, value);
+    }
     public DevTabGameViewModel Game { get; set; }
     public DevTabPlayerViewModel Player { get; set; }
     public DevTabDataViewModel Data { get; set; }
@@ -91,11 +101,35 @@ public string Filter
 
     private void ApplyFilter(string filter)
     {
-        foreach (var node in Nodes)
+        Dispatcher.UIThread.Post(() =>
         {
-            NodeHelper.FilterRecursive(node, filter, new BeginningTitleFilterStrategy());
-        }
+            foreach (var node in Nodes)
+            {
+                NodeHelper.FilterRecursive(node, filter, new BeginningTitleFilterStrategy());
+            }
+
+            RefreshTreeDataGrid();
+        });
     }
+    private void RefreshTreeDataGrid()
+    {
+        NodeSource = new HierarchicalTreeDataGridSource<NodeBase>(Nodes)
+                  {
+                      Columns =
+                      {
+                          new HierarchicalExpanderColumn<NodeBase>(
+                              new TemplateColumn<NodeBase>(
+                                  null,
+                                  "TreeDataGridNodeBaseTemplate",
+                                  null,
+                                  new GridLength(1, GridUnitType.Star)),
+                              x => x.SubNodes.Where(n => n.IsVisible),
+                              null,                        // hasChildrenSelector (optional)
+                              x => x.IsExpanded)           // isExpandedSelector
+                      },
+                  };
+    }
+    
     
     private ObservableCollection<EditorPageViewModel> _pages;
 
@@ -326,9 +360,9 @@ await _dialogService.ShowDialogAsync<PreferencesWindowViewModel, bool>(
         tab.Icon = "Icons.GameControllerFill";
         AddTopLevelPage(tab);
         this.WhenAnyValue(x => x.Filter).Throttle(TimeSpan.FromMilliseconds(300)).Subscribe(ApplyFilter);
-    }
-
 
+        
+    }
     public void ClearNodes()
     {
         Nodes.Clear();
@@ -336,8 +370,6 @@ public void ClearNodes()
     public void UpdateTree()
     {
         CreateDataNode();
-
-     
     }
 
     private void CreateDataNode()
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/NodeBase.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/NodeBase.cs
index ebc9d094..eddace8d 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/NodeBase.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/NodeBase.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Specialized;
+using System.Diagnostics;
 using System.Reactive;
 using System.Threading.Tasks;
 using System.Windows.Input;
@@ -19,7 +20,7 @@ public class NodeBase : ViewModelBase
 {
     public ObservableCollection<NodeBase> SubNodes { get; set; }
 
-    // public NodeBase? Parent { get; internal set; } 
+    public NodeBase? Parent { get; internal set; } 
     
     private string _title = "";
 
@@ -43,7 +44,7 @@ public NodeBase(string title = "", string? icon = null)
         _icon = icon ?? "";
         SubNodes = new ObservableCollection<NodeBase>();
         IsExpanded = false;
-        // SubNodes.CollectionChanged += OnSubNodesChanged;
+        SubNodes.CollectionChanged += OnSubNodesChanged;
     }
     
     private bool _isExpanded = false;
@@ -60,12 +61,12 @@ public bool IsVisible
         set => this.RaiseAndSetIfChanged(ref _isVisible, value);
     }
     
-    // private void OnSubNodesChanged(object? s, NotifyCollectionChangedEventArgs e) {
-    //     if (e.NewItems != null)
-    //         foreach(NodeBase child in e.NewItems) child.Parent = this;
-    //     if (e.OldItems != null)
-    //         foreach(NodeBase child in e.OldItems) child.Parent = null;
-    // }
+    private void OnSubNodesChanged(object? s, NotifyCollectionChangedEventArgs e) {
+        if (e.NewItems != null)
+            foreach(NodeBase child in e.NewItems) child.Parent = this;
+        if (e.OldItems != null)
+            foreach(NodeBase child in e.OldItems) child.Parent = null;
+    }
 
 
 }
diff --git a/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml b/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml
index 5a187acf..8a5b559b 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml
@@ -135,30 +135,90 @@
                             Height="1"
                             Background="{DynamicResource Brush.Border2}"
                             HorizontalAlignment="Stretch" />
+                    <TreeDataGrid Grid.Row="2"
+                                  MinHeight="200" MinWidth="200"
+                                  x:Name="LeftTreeDataGrid"
+                                  Loaded="LeftTreeDataGrid_OnLoaded"
+                                  DoubleTapped="LeftTreeDataGrid_OnDoubleTapped"
+                                  ContextRequested="LeftTreeDataGrid_OnContextRequested"
+                                  SelectionChanging="LeftTreeDataGrid_OnSelectionChanging"
+                                  ShowColumnHeaders="False"
+                                  Source="{Binding NodeSource}">
+                        
+                        <TreeDataGrid.Resources>
+                            <!-- <DataTemplate x:Key="TreeDataGridNodeBaseTemplate"> -->
+                            <!--     <TreeDataGridExpander -->
+                            <!--         IsExpanded="{Binding IsExpanded, Mode=TwoWay}"> -->
+                            <!--         <TextBlock Text="{Binding Title}" /> -->
+                            <!--     </TreeDataGridExpander> -->
+                            <!-- </DataTemplate> -->
+                            <DataTemplate x:Key="TreeDataGridNodeBaseTemplate" DataType="vm:NodeBase">
+                                <ContentControl Content="{Binding}">
+                                    <ContentControl.DataTemplates>
+                                        <DataTemplate DataType="vm:ItemRootNode">
+                                            <Grid ColumnDefinitions="*, 32" Height="16" Margin="8, 0, 0, 0">
+                                                <v:IconText Grid.Column="0" Grid.ColumnSpan="2"
+                                                            Text="{Binding Title}"
+                                                            Icon="{Binding Icon}"
+                                                            IconSize="12" />
 
-                    <TreeView Grid.Row="2" Margin="0"
-                              x:Name="MasterTreeView"
-                              SelectionMode="Toggle"
-                              ItemsSource="{Binding Nodes}"
-                              DoubleTapped="MasterTreeView_OnDoubleTapped"
-                              ContextRequested="MasterTreeView_OnContextRequested"
-                              SelectionChanged="MasterTreeView_OnSelectionChanged"
-                              ScrollViewer.VerticalScrollBarVisibility="Auto"
-                              ScrollViewer.HorizontalScrollBarVisibility="Disabled">
-                        <TreeView.Styles>
-                            <Style Selector="TreeViewItem" x:DataType="vm:NodeBase">
-                                <Setter Property="IsExpanded" Value="{Binding IsExpanded, Mode=TwoWay}" />
-                                <Setter Property="IsVisible" Value="{Binding IsVisible}" />
-                            </Style>
-                        </TreeView.Styles>
-                        <TreeView.DataTemplates>
-                            <!-- Note the DataRoot and SpriteRoot follow the ItemRootTemplate -->
-                            <StaticResource ResourceKey="ItemRootTemplate" />
-                            <StaticResource ResourceKey="DataItemTemplate" />
-                            <StaticResource ResourceKey="OpenEditorTemplate" />
-                            <StaticResource ResourceKey="NodeBaseTemplate" />
-                        </TreeView.DataTemplates>
-                    </TreeView>
+                                                <Button Grid.Column="1" HorizontalAlignment="Left" Classes="icon_button"
+                                                        Padding="4, 0, 0, 0"
+                                                        Width="18" Height="18"
+                                                        IsVisible="{Binding IsPointerOver, RelativeSource={RelativeSource AncestorType=TreeDataGridRow}}"
+
+                                                        Command="{Binding AddCommand}">
+                                                    <Path Stretch="Fill"
+                                                          Fill="{DynamicResource Brush.FG1}"
+                                                          Width="12" Height="12"
+                                                          Data="{StaticResource Icons.Plus}" />
+                                                </Button>
+                                            </Grid>
+                                        </DataTemplate>
+                                        
+                                        <DataTemplate DataType="vm:DataItemNode" >
+                                            <Grid ColumnDefinitions="*,32" Height="16" Margin="8, 0, 0, 0">
+                                                <v:IconText Text="{Binding Title}"
+                                                            Icon="{Binding Icon}"
+                                                            IconSize="12" />
+
+                                                <Button Grid.Column="1"
+                                                        Padding="4, 0, 0, 0"
+                                                        HorizontalAlignment="Left"
+                                                        Command="{Binding ((vm:ItemRootNode)Parent).DeleteCommand}"
+                                                        CommandParameter="{Binding}"
+                                                        IsVisible="{Binding IsPointerOver, RelativeSource={RelativeSource AncestorType=TreeDataGridRow}}"
+                                                        Classes="icon_button"
+                                                        Width="18" Height="18"
+                                                        VerticalAlignment="Center">
+                                                    <Path Stretch="Fill"
+                                                          Fill="{DynamicResource Brush.FG1}"
+                                                          Width="12" Height="12"
+                                                          Data="{StaticResource Icons.TrashFill}" />
+                                                </Button>
+                                            </Grid>
+                                        </DataTemplate>
+
+                                 
+                                        <DataTemplate DataType="vm:OpenEditorNode">
+                                            <v:IconText Margin="8, 0, 0, 0" Text="{Binding Title}"
+                                                        Icon="{Binding Icon}"
+                                                        IconSize="12" />
+                                        </DataTemplate>
+
+                                      
+                                        
+                                        <DataTemplate DataType="vm:NodeBase">
+                                            <v:IconText Margin="8, 0, 0, 0" Text="{Binding Title}"
+                                                        Icon="{Binding Icon}"
+                                                        IconSize="12" />
+                                        </DataTemplate>
+
+                                    </ContentControl.DataTemplates>
+                                </ContentControl>
+                            </DataTemplate>
+                        </TreeDataGrid.Resources>
+                    </TreeDataGrid>
                 </Grid>
             </Border>
 
diff --git a/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml.cs b/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml.cs
index 73e3b7ee..516d8011 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml.cs
@@ -1,10 +1,13 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.IO;
 using System.Linq;
 using System.Threading;
+using System.Threading.Tasks;
 using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Templates;
 using Avalonia.Input;
 using Avalonia.Interactivity;
@@ -530,64 +533,8 @@ protected override void OnClosing(WindowClosingEventArgs e)
             PreferencesWindowViewModel.Instance.Save();
         }
     }
-
-  
- 
-    private void MasterTreeView_OnDoubleTapped(object? sender, TappedEventArgs e)
-    {
-        if (DataContext is DevFormViewModel vm && sender is TreeView { SelectedItem: not null } treeView)
-        {
-            var selectedItem = (OpenEditorNode)treeView.SelectedItem;
-            vm.AddPageFromPageNode(selectedItem);
-        }
-    }
     
-    private void MasterTreeView_OnSelectionChanged(object? sender, SelectionChangedEventArgs e)
-    {
-        // Deselect the item after MasterTreeView_OnDoubleTapped
-        Dispatcher.UIThread.Post(() =>
-        {
-            if (sender is TreeView tree)
-            {
-                tree.SelectedItem = null;
-            }
-        });
-    }
-    
-    private void MasterTreeView_OnContextRequested(object? sender, ContextRequestedEventArgs e)
-    {
-        if (e.Source is not Visual visual)
-            return;
-
-        var current = visual.GetSelfAndVisualAncestors().OfType<TreeViewItem>().FirstOrDefault();
-        var parent = visual.GetSelfAndVisualAncestors().OfType<TreeViewItem>().Skip(1).FirstOrDefault();
-
-        if (current == null)
-            return;
-
-        if (current.DataContext is DataItemNode itemNode &&
-            parent?.DataContext is DataRootNode parentRoot)
-        {
-            ShowDataItemNodeMenu(current, itemNode, parentRoot, e);
-        }
-        
-        else if (current.DataContext is DataItemNode itemNode2 &&
-            parent?.DataContext is SpriteRootNode spriteRootMode)
-        {
-            ShowSpriteItemNodeMenu(current, itemNode2, spriteRootMode, e);
-        }
-        else if (current.DataContext is DataRootNode rootNode)
-        {
-            ShowRootNodeMenu(current, rootNode, e);
-        } 
-        else if (current.DataContext is SpriteRootNode spriteRoot)
-        {
-            ShowSpriteRootNodeMenu(current, spriteRoot, e);
-            
-        }
-    }
-
-    private void ShowDataItemNodeMenu(TreeViewItem current, DataItemNode node, DataRootNode parentNode,
+    private void ShowDataItemNodeMenu(TreeDataGridRow current, DataItemNode node, DataRootNode parentNode,
         ContextRequestedEventArgs e)
     {
         var menu = new ContextMenu
@@ -606,7 +553,7 @@ private void ShowDataItemNodeMenu(TreeViewItem current, DataItemNode node, DataR
         AttachAndOpenMenu(current, menu, e);
     }
 
-    private void ShowSpriteItemNodeMenu(TreeViewItem current, DataItemNode node, SpriteRootNode parentNode,
+    private void ShowSpriteItemNodeMenu(TreeDataGridRow current, DataItemNode node, SpriteRootNode parentNode,
         ContextRequestedEventArgs e)
     {
         var menu = new ContextMenu
@@ -624,7 +571,7 @@ private void ShowSpriteItemNodeMenu(TreeViewItem current, DataItemNode node, Spr
         AttachAndOpenMenu(current, menu, e);
     }
 
-    private void ShowRootNodeMenu(TreeViewItem current, DataRootNode root, ContextRequestedEventArgs e)
+    private void ShowRootNodeMenu(TreeDataGridRow current, DataRootNode root, ContextRequestedEventArgs e)
     {
         var menu = new ContextMenu
         {
@@ -641,7 +588,7 @@ private void ShowRootNodeMenu(TreeViewItem current, DataRootNode root, ContextRe
         AttachAndOpenMenu(current, menu, e);
     }
     
-    private void ShowSpriteRootNodeMenu(TreeViewItem current, SpriteRootNode root, ContextRequestedEventArgs e)
+    private void ShowSpriteRootNodeMenu(TreeDataGridRow current, SpriteRootNode root, ContextRequestedEventArgs e)
     {
         var menu = new ContextMenu
         {
@@ -657,11 +604,82 @@ private void ShowSpriteRootNodeMenu(TreeViewItem current, SpriteRootNode root, C
         AttachAndOpenMenu(current, menu, e);
     }
 
-    private static void AttachAndOpenMenu(TreeViewItem current, ContextMenu menu, ContextRequestedEventArgs e)
+    private static void AttachAndOpenMenu(TreeDataGridRow current, ContextMenu menu, ContextRequestedEventArgs e)
     {
         menu.Closed += (_, _) => current.ContextMenu = null;
         current.ContextMenu = menu;
         menu.Open(current);
         e.Handled = true;
     }
+    
+    private void LeftTreeDataGrid_OnDoubleTapped(object? sender, TappedEventArgs e)
+    {
+        if (DataContext is DevFormViewModel vm && sender is TreeDataGrid treeView)
+        {
+            var selectedItem = (OpenEditorNode)treeView.RowSelection.SelectedItem;
+            vm.AddPageFromPageNode(selectedItem);
+        }
+    }
+
+    private void LeftTreeDataGrid_OnSelectionChanging(object? sender, CancelEventArgs e)
+    {
+        if (DataContext is DevFormViewModel vm && sender is TreeDataGrid treeView)
+        {
+            Dispatcher.UIThread.Invoke(() =>
+            {
+
+            });
+
+        }
+
+    }
+    
+    private void LeftTreeDataGrid_OnContextRequested(object? sender, ContextRequestedEventArgs e)
+    {
+        if (e.Source is not Visual visual)
+            return;
+    
+        var row = visual.GetSelfAndVisualAncestors()
+            .OfType<TreeDataGridRow>()
+            .FirstOrDefault();
+    
+        if (row == null)
+            return;
+        
+        if (row.DataContext is not NodeBase node)
+            return;
+        
+        var parent = node.Parent;
+   
+    
+        switch (node)
+        {
+            case DataItemNode itemNode when parent is DataRootNode root:
+                ShowDataItemNodeMenu(row, itemNode, root, e);
+                break;
+    
+            case DataItemNode itemNode when parent is SpriteRootNode spriteRoot:
+                ShowSpriteItemNodeMenu(row, itemNode, spriteRoot, e);
+                break;
+    
+            case DataRootNode rootNode:
+                ShowRootNodeMenu(row, rootNode, e);
+                break;
+    
+            case SpriteRootNode spriteRoot:
+                ShowSpriteRootNodeMenu(row, spriteRoot, e);
+                break;
+        }
+    }
+
+    private async void LeftTreeDataGrid_OnLoaded(object sender, RoutedEventArgs e)
+    {
+        if (sender is TreeDataGrid treeDataGrid)
+        {
+            await Task.Delay(10); // Small delay to let layout complete
+            treeDataGrid.InvalidateMeasure();
+            treeDataGrid.InvalidateArrange();
+            treeDataGrid.UpdateLayout(); // Force immediate layout pass
+        }
+    }
 }
\ No newline at end of file

From 895367a45934d0ae1c112573f66b53b483b6a9bf Mon Sep 17 00:00:00 2001
From: Kace <41309226+DoubleTrio@users.noreply.github.com>
Date: Mon, 17 Nov 2025 03:34:37 -0500
Subject: [PATCH 10/51] node exposed to editor pages

---
 RogueEssence.Editor.Avalonia/App.axaml.cs     |   2 +
 RogueEssence.Editor.Avalonia/NodeFactory.cs   |   3 +-
 RogueEssence.Editor.Avalonia/PageFactory.cs   |  16 ++
 .../ViewModels/New/DevFormViewModel.cs        | 148 +++++++++---------
 .../New/Editors/DevEditPageViewModel.cs       |  87 ++++++++++
 .../ViewModels/New/NodeBase.cs                |  19 +--
 .../Views/New/DevForm.axaml.cs                |   7 -
 .../Views/New/Editors/DevEditPageView.axaml   |   8 +
 .../New/Editors/DevEditPageView.axaml.cs      |  13 ++
 9 files changed, 211 insertions(+), 92 deletions(-)
 create mode 100644 RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DevEditPageViewModel.cs
 create mode 100644 RogueEssence.Editor.Avalonia/Views/New/Editors/DevEditPageView.axaml
 create mode 100644 RogueEssence.Editor.Avalonia/Views/New/Editors/DevEditPageView.axaml.cs

diff --git a/RogueEssence.Editor.Avalonia/App.axaml.cs b/RogueEssence.Editor.Avalonia/App.axaml.cs
index e3873318..b756f593 100644
--- a/RogueEssence.Editor.Avalonia/App.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/App.axaml.cs
@@ -66,6 +66,7 @@ public static void AddCommonServices(this IServiceCollection collection)
             collection.AddTransient<RandomInfoPageViewModel>();
             collection.AddTransient<SpritePageViewModel>();
             collection.AddTransient<ModInfoEditorViewModel>();
+            collection.AddTransient<DevEditPageViewModel>();
         }
         
         private static void AddDevTabViewModels(this IServiceCollection services)
@@ -90,6 +91,7 @@ public static void RegisterPages(this IServiceProvider provider)
             pageFactory.Register<RandomInfoPageViewModel>("RandomInfo");
             pageFactory.Register<SpritePageViewModel>("SpritePage");
             pageFactory.Register<ModInfoEditorViewModel>("ModInfoEditor");
+            pageFactory.Register<DevEditPageViewModel>("DevEditEditor");
         }
     }
 
diff --git a/RogueEssence.Editor.Avalonia/NodeFactory.cs b/RogueEssence.Editor.Avalonia/NodeFactory.cs
index 8eb30393..5e01ccdf 100644
--- a/RogueEssence.Editor.Avalonia/NodeFactory.cs
+++ b/RogueEssence.Editor.Avalonia/NodeFactory.cs
@@ -2,6 +2,7 @@
 
 using System;
 using Microsoft.Extensions.DependencyInjection;
+using RogueEssence.Data;
 using RogueEssence.Dev.Services;
 using RogueEssence.Dev.ViewModels;
 
@@ -25,7 +26,7 @@ public T Create<T>(params object[] args)
         public OpenEditorNode CreateOpenEditorNode(string title, string? icon = null, string editorKey = "")
             => Create<OpenEditorNode>(title, icon, editorKey);
 
-        public DataRootNode CreateDataRootNode(string dataType, string editorKey, string title, string? icon = null)
+        public DataRootNode CreateDataRootNode(DataManager.DataType dataType, string editorKey, string title, string? icon = null)
         {
             return Create<DataRootNode>(dataType, editorKey, title, icon);
         }
diff --git a/RogueEssence.Editor.Avalonia/PageFactory.cs b/RogueEssence.Editor.Avalonia/PageFactory.cs
index df4304c4..d7064efb 100644
--- a/RogueEssence.Editor.Avalonia/PageFactory.cs
+++ b/RogueEssence.Editor.Avalonia/PageFactory.cs
@@ -62,6 +62,22 @@ public void Register<TPage>(string key) where TPage : EditorPageViewModel
             return null;
         }
     
+        public EditorPageViewModel? CreatePage(string key, NodeBase? node = null)
+        {
+            if (_map.TryGetValue(key, out var type))
+            {
+                if (node != null)
+                {
+                    return (EditorPageViewModel)
+                        ActivatorUtilities.CreateInstance(_provider, type, node);
+                }
+                
+                return (EditorPageViewModel)_provider.GetRequiredService(type);
+            }
+
+            return null;
+        }
+        
         // TODO: see if create page or the one above is better...
         public T CreatePage<T>() where T : EditorPageViewModel
         {
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs
index 5a432e3c..12197e59 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs
@@ -21,11 +21,13 @@ namespace RogueEssence.Dev.ViewModels;
 public class DevFormViewModel : ViewModelBase
 {
     private HierarchicalTreeDataGridSource<NodeBase> _nodeSource;
-    public HierarchicalTreeDataGridSource<NodeBase> NodeSource 
-    { 
+
+    public HierarchicalTreeDataGridSource<NodeBase> NodeSource
+    {
         get => _nodeSource;
         set => this.RaiseAndSetIfChanged(ref _nodeSource, value);
     }
+
     public DevTabGameViewModel Game { get; set; }
     public DevTabPlayerViewModel Player { get; set; }
     public DevTabDataViewModel Data { get; set; }
@@ -36,7 +38,6 @@ public HierarchicalTreeDataGridSource<NodeBase> NodeSource
     public DevTabConstantsViewModel Constants { get; set; }
 
 
-    
     private readonly NodeFactory _nodeFactory;
 
 
@@ -49,7 +50,7 @@ public bool IsTreeView
     }
 
 
-    private Models.ModHeader _currentMod = new  Models.ModHeader("Halcyon", "halcyon");
+    private Models.ModHeader _currentMod = new Models.ModHeader("Halcyon", "halcyon");
 
     public Models.ModHeader CurrentMod
     {
@@ -61,7 +62,9 @@ public void OpenTabSwitcher()
     {
         TabSwitcher = _pageFactory.GetRequiredService<TabSwitcherViewModel>();
     }
+
     public event Action? TabSwitcherClosed;
+
     public void CloseTabSwitcher()
     {
         TabSwitcher = null;
@@ -76,8 +79,9 @@ public void OnModSwitcherOpened()
         }
     }
 
-    
+
     public event Action? ModSwitcherClosed;
+
     public void OnModSwitcherClosed()
     {
         if (ModSwitcher != null)
@@ -90,8 +94,9 @@ public void OnModSwitcherClosed()
     public ReactiveCommand<Unit, Unit> OpenPreferencesWindow { get; }
 
     public ReactiveCommand<Unit, Unit> ClearFilterCommand { get; }
-    
+
     private string _filter = "";
+
     public string Filter
     {
         get { return _filter; }
@@ -111,26 +116,27 @@ private void ApplyFilter(string filter)
             RefreshTreeDataGrid();
         });
     }
+
     private void RefreshTreeDataGrid()
     {
         NodeSource = new HierarchicalTreeDataGridSource<NodeBase>(Nodes)
-                  {
-                      Columns =
-                      {
-                          new HierarchicalExpanderColumn<NodeBase>(
-                              new TemplateColumn<NodeBase>(
-                                  null,
-                                  "TreeDataGridNodeBaseTemplate",
-                                  null,
-                                  new GridLength(1, GridUnitType.Star)),
-                              x => x.SubNodes.Where(n => n.IsVisible),
-                              null,                        // hasChildrenSelector (optional)
-                              x => x.IsExpanded)           // isExpandedSelector
-                      },
-                  };
-    }
-    
-    
+        {
+            Columns =
+            {
+                new HierarchicalExpanderColumn<NodeBase>(
+                    new TemplateColumn<NodeBase>(
+                        null,
+                        "TreeDataGridNodeBaseTemplate",
+                        null,
+                        new GridLength(1, GridUnitType.Star)),
+                    x => x.SubNodes.Where(n => n.IsVisible),
+                    x => x.SubNodes.Count > 0,
+                    x => x.IsExpanded)
+            },
+        };
+    }
+
+
     private ObservableCollection<EditorPageViewModel> _pages;
 
     public ObservableCollection<EditorPageViewModel> Pages
@@ -172,14 +178,14 @@ public void AddTopLevelPage(EditorPageViewModel page)
         // Console.WriteLine($"Adding top level page {page}");
         var navigated = TryNavigateToExistingPage(page);
         if (navigated) return;
-        
+
         if (!page.AddNewTab)
         {
             TemporaryTab = page;
             return;
         }
-        
-        
+
+
         Pages.Add(page);
         var node = _nodeFactory.CreatePageNode(page, null);
         TopLevelPages.Add(node);
@@ -187,13 +193,13 @@ public void AddTopLevelPage(EditorPageViewModel page)
         ActivePage = page;
     }
 
-    
+
     public void AddChildPage(EditorPageViewModel parentPage, EditorPageViewModel childPage)
     {
         var navigated = TryNavigateToExistingPage(childPage);
         if (navigated) return;
-        
-        
+
+
         // Otherwise... add to the list of tabs
         if (_pageToNodeMap.TryGetValue(parentPage, out var parentNode))
         {
@@ -231,7 +237,7 @@ private bool TryNavigateToExistingPage(EditorPageViewModel page)
 
         return false;
     }
-        
+
     public bool PageHasChildren(EditorPageViewModel page)
     {
         if (!_pageToNodeMap.TryGetValue(page, out var node))
@@ -244,12 +250,12 @@ public void RemoveTab(EditorPageViewModel page)
     {
         if (!_pageToNodeMap.TryGetValue(page, out var node))
             return;
-        
+
         int removeIdx = Pages.IndexOf(page);
 
         ClosePageAndChildren(node);
-        
-        
+
+
         // We want to prioritize setting the left tab to be the active tab since our editors open stuff to the right first
         // Maybe we want to set the active page to be the parent if it exists?
         if (Pages.Count == 0)
@@ -271,7 +277,6 @@ public void RemoveTab(EditorPageViewModel page)
                 ActivePage = Pages[0];
             }
         }
-        
     }
 
     private void ClosePageAndChildren(PageNode node)
@@ -300,12 +305,12 @@ private void ClosePageAndChildren(PageNode node)
     private readonly PageFactory _pageFactory;
     private readonly TabEvents _tabEvents;
     private readonly IDialogService _dialogService;
-    
-    
+
+
     private ObservableCollection<NodeBase> _nodes = new();
-    
-    public ObservableCollection<NodeBase> Nodes 
-    { 
+
+    public ObservableCollection<NodeBase> Nodes
+    {
         get => _nodes;
         set => this.RaiseAndSetIfChanged(ref _nodes, value);
     }
@@ -316,12 +321,11 @@ public ObservableCollection<NodeBase> Nodes
     // }
 
     public DevFormViewModel(PageFactory pageFactory, NodeFactory nodeFactory, IDialogService dialogService,
-        TabEvents tabEvents, DevTabGameViewModel game, DevTabPlayerViewModel player, DevTabDataViewModel data, 
-        DevTabTravelViewModel travel, DevTabSpritesViewModel sprites, DevTabScriptViewModel script, 
-        DevTabModsViewModel mods, 
+        TabEvents tabEvents, DevTabGameViewModel game, DevTabPlayerViewModel player, DevTabDataViewModel data,
+        DevTabTravelViewModel travel, DevTabSpritesViewModel sprites, DevTabScriptViewModel script,
+        DevTabModsViewModel mods,
         DevTabConstantsViewModel constants)
     {
-        
         // NOTE: These should all be private readonly
         Game = game;
         Player = player;
@@ -349,7 +353,7 @@ public DevFormViewModel(PageFactory pageFactory, NodeFactory nodeFactory, IDialo
 
         // TODO: move this own view
         ClearFilterCommand = ReactiveCommand.Create(() => { Filter = string.Empty; });
-        
+
         OpenPreferencesWindow = ReactiveCommand.CreateFromTask(async () =>
         {
             await _dialogService.ShowDialogAsync<PreferencesWindowViewModel, bool>(
@@ -360,13 +364,13 @@ await _dialogService.ShowDialogAsync<PreferencesWindowViewModel, bool>(
         tab.Icon = "Icons.GameControllerFill";
         AddTopLevelPage(tab);
         this.WhenAnyValue(x => x.Filter).Throttle(TimeSpan.FromMilliseconds(300)).Subscribe(ApplyFilter);
-
-        
     }
+
     public void ClearNodes()
     {
         Nodes.Clear();
     }
+
     public void UpdateTree()
     {
         CreateDataNode();
@@ -379,10 +383,10 @@ private void CreateDataNode()
         {
             if (type == DataManager.DataType.All || type == DataManager.DataType.None)
                 continue;
-            
-               
+
+
             var dataItemRootNode = _nodeFactory.CreateDataRootNode(
-                type.ToString(),
+                type,
                 "TODO",
                 type.ToString(),
                 type.GetIcon());
@@ -393,16 +397,17 @@ private void CreateDataNode()
             {
                 var itemNode = _nodeFactory.CreateDataItemNode(
                     key,
-                    "TODO",
+                    "DevEditEditor",
                     $"{key}: {entries[key]}",
                     type.GetIcon());
-            
+
                 dataItemRootNode.SubNodes.Add(itemNode);
             }
         }
+
         Nodes.Add(dataNode);
     }
-    
+
     private void InitializeTabEvents()
     {
         _tabEvents.AddChildTabEvent += (parent, child) =>
@@ -411,17 +416,11 @@ private void InitializeTabEvents()
             ActivePage = child;
         };
 
-        _tabEvents.AddTopLevelTabEvent += (tab) =>
-        {
-            AddTopLevelPage(tab);
-        };
-        
+        _tabEvents.AddTopLevelTabEvent += (tab) => { AddTopLevelPage(tab); };
+
         _tabEvents.RemoveTabEvent += (tab) => { RemoveTab(tab); };
-        
-        _tabEvents.NavigateToTabEvent += (tab) =>
-        {
-            ActivePage = tab;
-        };
+
+        _tabEvents.NavigateToTabEvent += (tab) => { ActivePage = tab; };
     }
 
     private void BuildNodes()
@@ -438,7 +437,7 @@ private void BuildNodes()
 
         halcyonNode.SubNodes.Add(_nodeFactory.CreateOpenEditorNode("Constants", "Icons.ListFill"));
 
-        var monstersRoot = _nodeFactory.CreateDataRootNode("Monsters", "Monsters", "Monsters", "Icons.GhostFill");
+        // var monstersRoot = _nodeFactory.CreateDataRootNode("Monsters", "Monsters", "Monsters", "Icons.GhostFill");
 
 
         //             new OpenEditorNode("Dev Control", "Icons.GameControllerFill", "DevControl"),
@@ -447,10 +446,10 @@ private void BuildNodes()
         //             new OpenEditorNode("Testing", "Icons.BedFill", "RandomInfo"),
 
 
-        monstersRoot.SubNodes.Add(_nodeFactory.CreateDataItemNode("eevee", "MonsterEditor", "eevee: Eevee",
-            "Icons.GhostFill"));
-        monstersRoot.SubNodes.Add(_nodeFactory.CreateDataItemNode("seviper", "MonsterEditor", "seviper: Seviper",
-            "Icons.GhostFill"));
+        // monstersRoot.SubNodes.Add(_nodeFactory.CreateDataItemNode("eevee", "MonsterEditor", "eevee: Eevee",
+        //     "Icons.GhostFill"));
+        // monstersRoot.SubNodes.Add(_nodeFactory.CreateDataItemNode("seviper", "MonsterEditor", "seviper: Seviper",
+        //     "Icons.GhostFill"));
 
         var particlesRoot = _nodeFactory.CreateSpriteRootNode("particles", "", "Particles", "Icons.PaintBrushFill");
         particlesRoot.SubNodes.Add(_nodeFactory.CreateDataItemNode("Acid_Blue", "SpriteEditor", "Acid_Blue",
@@ -493,14 +492,13 @@ private void BuildNodes()
         //             }
         //         }
 
-        halcyonNode.SubNodes.Add(monstersRoot);
+        // halcyonNode.SubNodes.Add(monstersRoot);
         Nodes = new ObservableCollection<NodeBase> { halcyonNode };
 
         halcyonNode.IsExpanded = true;
-        monstersRoot.IsExpanded = true;
+        // monstersRoot.IsExpanded = true;
     }
 
- 
 
     private TabSwitcherViewModel? _tabSwitcher;
 
@@ -518,7 +516,7 @@ public ModSwitcherViewModel? ModSwitcher
         get => _modSwitcher;
         set => this.RaiseAndSetIfChanged(ref _modSwitcher, value);
     }
-    
+
 
     // Navigate to a page from tab switcher
     public void NavigateToPage(PageNode node)
@@ -527,10 +525,10 @@ public void NavigateToPage(PageNode node)
         Console.WriteLine("yay");
         ActivePage = node.Page;
     }
-    
+
     public void AddPageFromPageNode(OpenEditorNode node)
     {
-        var editor = _pageFactory.CreatePage(node.EditorKey);
+        var editor = _pageFactory.CreatePage(node.EditorKey, node);
 
         if (editor != null)
         {
@@ -538,7 +536,7 @@ public void AddPageFromPageNode(OpenEditorNode node)
             AddTopLevelPage(editor);
         }
     }
-    
+
     public async Task<bool> TryCloseTabAsync(EditorPageViewModel page)
     {
         if (PageHasChildren(page))
@@ -557,7 +555,7 @@ public async Task<bool> TryCloseTabAsync(EditorPageViewModel page)
         RemoveTab(page);
         return true;
     }
-    
+
 
     // public TreeSearchViewModel TreeSearch { get; } = new TreeSearchViewModel();
 }
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DevEditPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DevEditPageViewModel.cs
new file mode 100644
index 00000000..3223dab1
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DevEditPageViewModel.cs
@@ -0,0 +1,87 @@
+using System;
+using RogueEssence.Data;
+
+namespace RogueEssence.Dev.ViewModels;
+
+using Dev.Services;
+
+public class DevEditPageViewModel : EditorPageViewModel
+{
+    public void btnEditEmote_Click()
+    {
+        OpenList(DataManager.DataType.Emote, DataManager.Instance.GetEmote, () => { return new EmoteData(); });
+    }
+
+    public void btnEditElement_Click()
+    {
+        OpenList(DataManager.DataType.Element, DataManager.Instance.GetElement, () => { return new ElementData(); });
+    }
+
+    public void btnEditGrowthGroup_Click()
+    {
+        OpenList(DataManager.DataType.GrowthGroup, DataManager.Instance.GetGrowth, () => { return new GrowthData(); });
+    }
+
+    public void btnEditSkillGroup_Click()
+    {
+        OpenList(DataManager.DataType.SkillGroup, DataManager.Instance.GetSkillGroup,
+            () => { return new SkillGroupData(); });
+    }
+
+    public void btnEditRank_Click()
+    {
+        OpenList(DataManager.DataType.Rank, DataManager.Instance.GetRank, () => { return new RankData(); });
+    }
+
+    public void btnEditSkin_Click()
+    {
+        OpenList(DataManager.DataType.Skin, DataManager.Instance.GetSkin, () => { return new SkinData(); });
+    }
+
+    public void btnEditAI_Click()
+    {
+        OpenList(DataManager.DataType.AI, DataManager.Instance.GetAITactic, () => { return new AITactic(); });
+    }
+
+
+    private delegate IEntryData GetEntry(string entryNum);
+
+    private delegate IEntryData CreateEntry();
+
+    private void OpenList(DataManager.DataType dataType, GetEntry entryOp, CreateEntry createOp)
+    {
+        lock (GameBase.lockObj)
+        {
+            // DataListForm dataListForm = new DataListForm();
+            // DataListFormViewModel choices = createChoices(dataListForm, dataType, entryOp, createOp);
+            // DataOpContainer reindexOp = createReindexOp(dataType, choices);
+            // DataOpContainer resaveFileOp = createResaveFileDiffOp(dataType, choices, entryOp, false);
+            // DataOpContainer resaveDiffOp = createResaveFileDiffOp(dataType, choices, entryOp, true);
+            // choices.SetOps(reindexOp, resaveFileOp, resaveDiffOp);
+            //
+            // dataListForm.DataContext = choices;
+            // dataListForm.SetListContextMenu(CreateContextMenu(choices));
+            // dataListForm.Show();
+        }
+    }
+
+    public override string UniqueId => null;
+    public override string? Title => "Dev Edit";
+
+    public DevEditPageViewModel(PageFactory pageFactory, TabEvents tabEvents, IDialogService dialogService, NodeBase node) : base(
+        pageFactory, tabEvents, dialogService)
+    {
+        var n = node as DataItemNode;
+        var nn = node.Parent as DataRootNode;
+        // Console.WriteLine(nn.DataType);
+        // Console.WriteLine(n.ItemKey);
+        // Console.WriteLine(n.Parent.);
+        // Console.WriteLine(node.);
+    }
+
+    public DevEditPageViewModel() : base(new PageFactory(new DesignServiceProvider()),
+        new TabEvents(new PageFactory(new DesignServiceProvider())), new DialogService())
+    {
+        Title = "Dev Edit";
+    }
+}
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/NodeBase.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/NodeBase.cs
index eddace8d..3d324a09 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/NodeBase.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/NodeBase.cs
@@ -10,6 +10,7 @@
 using Avalonia.Platform.Storage;
 using RogueEssence.Dev.Services;
 using ReactiveUI;
+using RogueEssence.Data;
 using RogueEssence.Dev.Views;
 
 namespace RogueEssence.Dev.ViewModels;
@@ -98,7 +99,7 @@ protected ItemRootNode(string title, string icon, string editorKey)
 
 public class DataRootNode : ItemRootNode
 {
-    protected readonly string _dataType;
+    public DataManager.DataType DataType { get; }
     
     private readonly NodeFactory _nodeFactory;
     
@@ -115,12 +116,12 @@ public class DataRootNode : ItemRootNode
     public ReactiveCommand<DataItemNode, Unit> ResaveAsFile { get; }
     public ReactiveCommand<DataItemNode, Unit> ResaveAsPatch { get; }
 
-    public DataRootNode(NodeFactory nodeFactory, IDialogService dialogService, string dataType, string editorKey, string title, string? icon = null)
+    public DataRootNode(NodeFactory nodeFactory, IDialogService dialogService, DataManager.DataType dataType, string editorKey, string title, string? icon = null)
         : base(title, icon ?? "", editorKey)
     {
         _nodeFactory = nodeFactory;
         _dialogService = dialogService;
-        _dataType = dataType;
+        DataType = dataType;
         
         AddCommand = ReactiveCommand.CreateFromTask(AddItemAsync);
         DeleteCommand = ReactiveCommand.CreateFromTask<DataItemNode>(DeleteItemAsync);
@@ -135,13 +136,13 @@ public DataRootNode(NodeFactory nodeFactory, IDialogService dialogService, strin
     private async Task AddItemAsync()
     {
         var vm = new RenameWindowViewModel();
-        bool result = await _dialogService.ShowDialogAsync<RenameWindowViewModel, bool>(vm, $"Add new {_dataType}");
+        bool result = await _dialogService.ShowDialogAsync<RenameWindowViewModel, bool>(vm, $"Add new {DataType}");
 
         if (!result)
             return;
 
         SubNodes.Add(_nodeFactory.CreateDataItemNode(vm.Name, "MonsterEditor", $"{vm.Name}:", "Icons.GhostFill"));
-        Console.WriteLine($"Added {_dataType} item: {vm.Name}");
+        Console.WriteLine($"Added {DataType} item: {vm.Name}");
     }
 
     private async Task DeleteItemAsync(DataItemNode? node)
@@ -161,24 +162,24 @@ private async Task DeleteItemAsync(DataItemNode? node)
             return;
 
         SubNodes.Remove(node);
-        Console.WriteLine($"Deleted {node.Title} of type {_dataType}");
+        Console.WriteLine($"Deleted {node.Title} of type {DataType}");
     }
 
     private async Task ReIndexAsync()
     {
-        Console.WriteLine($"Reindexing {_dataType}...");
+        Console.WriteLine($"Reindexing {DataType}...");
         await Task.Delay(100);
     }
 
     private async Task ResaveAllAsFileAsync()
     {
-        Console.WriteLine($"Resaving all {_dataType} as file...");
+        Console.WriteLine($"Resaving all {DataType} as file...");
         await Task.Delay(100);
     }
 
     private async Task ResaveAllAsDiffAsync()
     {
-        Console.WriteLine($"Resaving all {_dataType} as diff...");
+        Console.WriteLine($"Resaving all {DataType} as diff...");
         await Task.Delay(100);
     }
 
diff --git a/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml.cs b/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml.cs
index 516d8011..9b4f8402 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml.cs
@@ -674,12 +674,5 @@ private void LeftTreeDataGrid_OnContextRequested(object? sender, ContextRequeste
 
     private async void LeftTreeDataGrid_OnLoaded(object sender, RoutedEventArgs e)
     {
-        if (sender is TreeDataGrid treeDataGrid)
-        {
-            await Task.Delay(10); // Small delay to let layout complete
-            treeDataGrid.InvalidateMeasure();
-            treeDataGrid.InvalidateArrange();
-            treeDataGrid.UpdateLayout(); // Force immediate layout pass
-        }
     }
 }
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/DevEditPageView.axaml b/RogueEssence.Editor.Avalonia/Views/New/Editors/DevEditPageView.axaml
new file mode 100644
index 00000000..058576cb
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/Views/New/Editors/DevEditPageView.axaml
@@ -0,0 +1,8 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:Class="RogueEssence.Dev.Views.DevEditPageView">
+    Welcome to Avalonia!
+</UserControl>
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/DevEditPageView.axaml.cs b/RogueEssence.Editor.Avalonia/Views/New/Editors/DevEditPageView.axaml.cs
new file mode 100644
index 00000000..0e2bbef7
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/Views/New/Editors/DevEditPageView.axaml.cs
@@ -0,0 +1,13 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace RogueEssence.Dev.Views;
+
+public partial class DevEditPageView : UserControl
+{
+    public DevEditPageView()
+    {
+        InitializeComponent();
+    }
+}
\ No newline at end of file

From a1b11e2357634ebda0bd938855413ef12621f004 Mon Sep 17 00:00:00 2001
From: Kace <41309226+DoubleTrio@users.noreply.github.com>
Date: Wed, 19 Nov 2025 20:27:40 -0500
Subject: [PATCH 11/51] collapse all nodes when parent collapse + fix ui not
 updating for tab switcher

---
 .../ViewModels/New/NodeBase.cs                | 99 ++++++++++++++++---
 .../ViewModels/New/TabSwitcherViewModel.cs    | 10 +-
 2 files changed, 91 insertions(+), 18 deletions(-)

diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/NodeBase.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/NodeBase.cs
index 3d324a09..2d2e7462 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/NodeBase.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/NodeBase.cs
@@ -2,6 +2,7 @@
 using System.Collections.Specialized;
 using System.Diagnostics;
 using System.Reactive;
+using System.Reactive.Linq;
 using System.Threading.Tasks;
 using System.Windows.Input;
 using Avalonia;
@@ -46,6 +47,9 @@ public NodeBase(string title = "", string? icon = null)
         SubNodes = new ObservableCollection<NodeBase>();
         IsExpanded = false;
         SubNodes.CollectionChanged += OnSubNodesChanged;
+        this.WhenAnyValue(x => x.IsExpanded)
+            .Where(expanded => !expanded)
+            .Subscribe(_ => CollapseChildren());
     }
     
     private bool _isExpanded = false;
@@ -69,6 +73,18 @@ private void OnSubNodesChanged(object? s, NotifyCollectionChangedEventArgs e) {
             foreach(NodeBase child in e.OldItems) child.Parent = null;
     }
 
+    
+    public void CollapseChildren()
+    {
+        if (SubNodes == null) 
+            return;
+
+        foreach (var child in SubNodes)
+        {
+            child.IsExpanded = false;
+            child.CollapseChildren();
+        }
+    }
 
 }
 
@@ -124,6 +140,13 @@ public DataRootNode(NodeFactory nodeFactory, IDialogService dialogService, DataM
         DataType = dataType;
         
         AddCommand = ReactiveCommand.CreateFromTask(AddItemAsync);
+        
+        AddCommand.ThrownExceptions.Subscribe(ex =>
+            Console.WriteLine("[AddCommand] ThrownExceptions: " + ex));
+
+        AddCommand.IsExecuting.Subscribe(isExec =>
+            Console.WriteLine("[AddCommand] IsExecuting = " + isExec));
+        
         DeleteCommand = ReactiveCommand.CreateFromTask<DataItemNode>(DeleteItemAsync);
 
         ReIndexCommand = ReactiveCommand.CreateFromTask(ReIndexAsync);
@@ -135,14 +158,35 @@ public DataRootNode(NodeFactory nodeFactory, IDialogService dialogService, DataM
     }
     private async Task AddItemAsync()
     {
-        var vm = new RenameWindowViewModel();
-        bool result = await _dialogService.ShowDialogAsync<RenameWindowViewModel, bool>(vm, $"Add new {DataType}");
+        try
+        {
+            var vm = new RenameWindowViewModel();
 
-        if (!result)
-            return;
+            Console.WriteLine("[AddItem] Opening dialog…");
+
+            bool result = await _dialogService
+                .ShowDialogAsync<RenameWindowViewModel, bool>(vm, $"Add new {DataType}");
 
-        SubNodes.Add(_nodeFactory.CreateDataItemNode(vm.Name, "MonsterEditor", $"{vm.Name}:", "Icons.GhostFill"));
-        Console.WriteLine($"Added {DataType} item: {vm.Name}");
+            Console.WriteLine("[AddItem] Dialog closed. Result = " + result);
+
+            if (!result)
+                return;
+
+            var node = _nodeFactory.CreateDataItemNode(
+                vm.Name,
+                "MonsterEditor",
+                $"{vm.Name}:",
+                "Icons.GhostFill"
+            );
+
+            SubNodes.Add(node);
+
+            Console.WriteLine($"[AddItem] Added {DataType} item: {vm.Name}");
+        }
+        catch (Exception ex)
+        {
+            Console.WriteLine("[AddItem] ERROR: " + ex);
+        }
     }
 
     private async Task DeleteItemAsync(DataItemNode? node)
@@ -183,10 +227,28 @@ private async Task ResaveAllAsDiffAsync()
         await Task.Delay(100);
     }
 
+    
+    
     private async Task ResaveItemAsFileAsync(DataItemNode node)
     {
-        Console.WriteLine($"Resaving {node.Title} as file...");
-        await Task.Delay(100);
+        // GetEntry entryOp, CreateEntry createOp
+        // string entryNum = choices.ChosenAsset;
+        // if (DataManager.GetEntryDataModStatus(entryNum, dataType.ToString()) == DataManager.ModStatus.Base)
+        // {
+        //     await MessageBox.Show(form, String.Format("{0} must have saved edits first!", entryNum), "Error", MessageBox.MessageBoxButtons.Ok);
+        //     return;
+        // }
+        //
+        // lock (GameBase.lockObj)
+        // {
+        //     IEntryData data = entryOp(entryNum);
+        //     DataManager.Instance.ContentResaved(dataType, entryNum, data, false);
+        //
+        //     string newName = DataManager.Instance.DataIndices[dataType].Get(entryNum).GetLocalString(true);
+        //     choices.ModifyEntry(entryNum, newName);
+        // }
+        //
+        // await MessageBox.Show(form, String.Format("{0} is now saved as a file.", entryNum), "Complete", MessageBox.MessageBoxButtons.Ok);
     }
 
     private async Task ResaveItemAsPatchAsync(DataItemNode node)
@@ -263,16 +325,23 @@ public SpriteRootNode(
     }
     private async Task AddSpriteAsync()
     {
-        var vm = new RenameWindowViewModel();
-        bool result = await _dialogService.ShowDialogAsync<RenameWindowViewModel, bool>(vm, "Add sprite ID");
+        try
+        {
+            var vm = new RenameWindowViewModel();
+            bool result = await _dialogService.ShowDialogAsync<RenameWindowViewModel, bool>(vm, "Add sprite ID");
 
-        if (!result)
-            return;
+            if (!result)
+                return;
 
-        var node = _nodeFactory.CreateDataItemNode(vm.Name, "SpriteEditor", vm.Name + ":", "Icons.PaintBrushFill");
-        SubNodes.Add(node);
+            var node = _nodeFactory.CreateDataItemNode(vm.Name, "SpriteEditor", vm.Name + ":", "Icons.PaintBrushFill");
+            SubNodes.Add(node);
 
-        Console.WriteLine($"[SpriteRootNode] Added sprite: {vm.Name}");
+            Console.WriteLine($"[SpriteRootNode] Added sprite: {vm.Name}");
+        }
+        catch (Exception ex)
+        {
+            Console.WriteLine("ERROR in AddSpriteAsync: " + ex);
+        }
     }
 
     private async Task DeleteSpriteAsync(DataItemNode node)
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/TabSwitcherViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/TabSwitcherViewModel.cs
index 783a5adb..3c6c95ff 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/TabSwitcherViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/TabSwitcherViewModel.cs
@@ -41,6 +41,10 @@ public TabSwitcherViewModel(DevFormViewModel mainWindow)
         VisiblePages = new ObservableCollection<EditorPageViewModel>(_mainWindow.Pages);
         SelectedPage = _mainWindow.ActivePage;
         this.WhenAnyValue(x => x.SearchFilter).Subscribe(UpdateVisiblePages);
+        
+        _isTreeView = mainWindow
+            .WhenAnyValue(x => x.IsTreeView)
+            .ToProperty(this, x => x.IsTreeView);
     }
 
     // public TabSwitcherViewModel() : this(new DevFormViewModel()) {}
@@ -51,14 +55,14 @@ public void ClearFilter()
     }
 
     
+    private readonly ObservableAsPropertyHelper<bool> _isTreeView;
+    public bool IsTreeView => _isTreeView.Value;
+    
     public void ToggleSearchMode()
     {
         _mainWindow.IsTreeView = !_mainWindow.IsTreeView;
     }
     
-    
-    public bool IsTreeView => _mainWindow.IsTreeView;
-
     public void Switch()
     {
         _mainWindow.ActivePage = _selectedPage;

From 3687f012a2ec9668b776165b4f20f7d87641b7a3 Mon Sep 17 00:00:00 2001
From: Kace <41309226+DoubleTrio@users.noreply.github.com>
Date: Wed, 19 Nov 2025 21:46:55 -0500
Subject: [PATCH 12/51] add item async debug test

---
 .../ViewModels/New/NodeBase.cs                | 146 +++++++-----------
 1 file changed, 59 insertions(+), 87 deletions(-)

diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/NodeBase.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/NodeBase.cs
index 2d2e7462..fb79c055 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/NodeBase.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/NodeBase.cs
@@ -22,8 +22,8 @@ public class NodeBase : ViewModelBase
 {
     public ObservableCollection<NodeBase> SubNodes { get; set; }
 
-    public NodeBase? Parent { get; internal set; } 
-    
+    public NodeBase? Parent { get; internal set; }
+
     private string _title = "";
 
     public virtual string Title
@@ -33,13 +33,14 @@ public virtual string Title
     }
 
     public string _icon = "";
+
     public string Icon
     {
         get => _icon;
         set => this.RaiseAndSetIfChanged(ref _icon, value);
     }
 
-    
+
     public NodeBase(string title = "", string? icon = null)
     {
         Title = title;
@@ -51,32 +52,37 @@ public NodeBase(string title = "", string? icon = null)
             .Where(expanded => !expanded)
             .Subscribe(_ => CollapseChildren());
     }
-    
+
     private bool _isExpanded = false;
+
     public bool IsExpanded
     {
         get => _isExpanded;
         set => this.RaiseAndSetIfChanged(ref _isExpanded, value);
     }
-    
+
     private bool _isVisible = true;
+
     public bool IsVisible
     {
         get => _isVisible;
         set => this.RaiseAndSetIfChanged(ref _isVisible, value);
     }
-    
-    private void OnSubNodesChanged(object? s, NotifyCollectionChangedEventArgs e) {
+
+    private void OnSubNodesChanged(object? s, NotifyCollectionChangedEventArgs e)
+    {
         if (e.NewItems != null)
-            foreach(NodeBase child in e.NewItems) child.Parent = this;
+            foreach (NodeBase child in e.NewItems)
+                child.Parent = this;
         if (e.OldItems != null)
-            foreach(NodeBase child in e.OldItems) child.Parent = null;
+            foreach (NodeBase child in e.OldItems)
+                child.Parent = null;
     }
 
-    
+
     public void CollapseChildren()
     {
-        if (SubNodes == null) 
+        if (SubNodes == null)
             return;
 
         foreach (var child in SubNodes)
@@ -85,14 +91,13 @@ public void CollapseChildren()
             child.CollapseChildren();
         }
     }
-
 }
 
 public class OpenEditorNode : NodeBase
 {
     public string EditorKey { get; }
-    
-    public OpenEditorNode(string title, string? icon = null, string editorKey = "") 
+
+    public OpenEditorNode(string title, string? icon = null, string editorKey = "")
         : base(title, icon ?? "")
     {
         EditorKey = editorKey;
@@ -102,25 +107,24 @@ public OpenEditorNode(string title, string? icon = null, string editorKey = "")
 public abstract class ItemRootNode : OpenEditorNode
 {
     protected readonly IDialogService _dialogService;
-    
+
     public abstract ReactiveCommand<Unit, Unit> AddCommand { get; }
     public abstract ReactiveCommand<DataItemNode, Unit> DeleteCommand { get; }
 
     protected ItemRootNode(string title, string icon, string editorKey)
         : base(title, icon, editorKey)
     {
-
     }
 }
 
 public class DataRootNode : ItemRootNode
 {
     public DataManager.DataType DataType { get; }
-    
+
     private readonly NodeFactory _nodeFactory;
-    
-    private readonly IDialogService _dialogService ;
-    
+
+    private readonly IDialogService _dialogService;
+
 
     public override ReactiveCommand<Unit, Unit> AddCommand { get; }
     public override ReactiveCommand<DataItemNode, Unit> DeleteCommand { get; }
@@ -132,21 +136,18 @@ public class DataRootNode : ItemRootNode
     public ReactiveCommand<DataItemNode, Unit> ResaveAsFile { get; }
     public ReactiveCommand<DataItemNode, Unit> ResaveAsPatch { get; }
 
-    public DataRootNode(NodeFactory nodeFactory, IDialogService dialogService, DataManager.DataType dataType, string editorKey, string title, string? icon = null)
+    public DataRootNode(NodeFactory nodeFactory, IDialogService dialogService, DataManager.DataType dataType,
+        string editorKey, string title, string? icon = null)
         : base(title, icon ?? "", editorKey)
     {
         _nodeFactory = nodeFactory;
         _dialogService = dialogService;
         DataType = dataType;
-        
+
         AddCommand = ReactiveCommand.CreateFromTask(AddItemAsync);
-        
-        AddCommand.ThrownExceptions.Subscribe(ex =>
-            Console.WriteLine("[AddCommand] ThrownExceptions: " + ex));
+        AddCommand.CanExecute.Subscribe(canExecute =>
+            Console.WriteLine($"Add Command - CanExecute: {canExecute}"));
 
-        AddCommand.IsExecuting.Subscribe(isExec =>
-            Console.WriteLine("[AddCommand] IsExecuting = " + isExec));
-        
         DeleteCommand = ReactiveCommand.CreateFromTask<DataItemNode>(DeleteItemAsync);
 
         ReIndexCommand = ReactiveCommand.CreateFromTask(ReIndexAsync);
@@ -156,37 +157,17 @@ public DataRootNode(NodeFactory nodeFactory, IDialogService dialogService, DataM
         ResaveAsFile = ReactiveCommand.CreateFromTask<DataItemNode>(ResaveItemAsFileAsync);
         ResaveAsPatch = ReactiveCommand.CreateFromTask<DataItemNode>(ResaveItemAsPatchAsync);
     }
+
     private async Task AddItemAsync()
     {
-        try
-        {
-            var vm = new RenameWindowViewModel();
-
-            Console.WriteLine("[AddItem] Opening dialog…");
-
-            bool result = await _dialogService
-                .ShowDialogAsync<RenameWindowViewModel, bool>(vm, $"Add new {DataType}");
-
-            Console.WriteLine("[AddItem] Dialog closed. Result = " + result);
-
-            if (!result)
-                return;
+        var vm = new RenameWindowViewModel();
+        bool result = await _dialogService.ShowDialogAsync<RenameWindowViewModel, bool>(vm, $"Add new {DataType}");
 
-            var node = _nodeFactory.CreateDataItemNode(
-                vm.Name,
-                "MonsterEditor",
-                $"{vm.Name}:",
-                "Icons.GhostFill"
-            );
-
-            SubNodes.Add(node);
+        if (!result)
+            return;
 
-            Console.WriteLine($"[AddItem] Added {DataType} item: {vm.Name}");
-        }
-        catch (Exception ex)
-        {
-            Console.WriteLine("[AddItem] ERROR: " + ex);
-        }
+        SubNodes.Add(_nodeFactory.CreateDataItemNode(vm.Name, "MonsterEditor", $"{vm.Name}:", "Icons.GhostFill"));
+        Console.WriteLine($"Added {DataType} item: {vm.Name}");
     }
 
     private async Task DeleteItemAsync(DataItemNode? node)
@@ -227,8 +208,7 @@ private async Task ResaveAllAsDiffAsync()
         await Task.Delay(100);
     }
 
-    
-    
+
     private async Task ResaveItemAsFileAsync(DataItemNode node)
     {
         // GetEntry entryOp, CreateEntry createOp
@@ -258,27 +238,26 @@ private async Task ResaveItemAsPatchAsync(DataItemNode node)
     }
 }
 
-
-
 public class DataItemNode : OpenEditorNode
 {
     public string ItemKey { get; }
-    
+
     private string _value = "";
-    public string Value 
+
+    public string Value
     {
         get => _value;
         set => this.RaiseAndSetIfChanged(ref _value, value);
     }
-    
+
     // private bool _editorKey = false;
     // public bool EditorKey
     // {
     //     get => _editorKey;
     //     set => this.RaiseAndSetIfChanged(ref _editorKey, value);
     // }
-    
-    public DataItemNode(string itemKey, string editorKey, string? title, string? icon = null) 
+
+    public DataItemNode(string itemKey, string editorKey, string? title, string? icon = null)
         : base(title ?? "", icon ?? "", editorKey)
     {
         ItemKey = itemKey;
@@ -323,25 +302,19 @@ public SpriteRootNode(
         ImportCommand = ReactiveCommand.CreateFromTask<DataItemNode>(ImportSpriteAsync);
         ReImportCommand = ReactiveCommand.CreateFromTask<DataItemNode>(ReImportSpriteAsync);
     }
+
     private async Task AddSpriteAsync()
     {
-        try
-        {
-            var vm = new RenameWindowViewModel();
-            bool result = await _dialogService.ShowDialogAsync<RenameWindowViewModel, bool>(vm, "Add sprite ID");
+        var vm = new RenameWindowViewModel();
+        bool result = await _dialogService.ShowDialogAsync<RenameWindowViewModel, bool>(vm, "Add sprite ID");
 
-            if (!result)
-                return;
+        if (!result)
+            return;
 
-            var node = _nodeFactory.CreateDataItemNode(vm.Name, "SpriteEditor", vm.Name + ":", "Icons.PaintBrushFill");
-            SubNodes.Add(node);
+        var node = _nodeFactory.CreateDataItemNode(vm.Name, "SpriteEditor", vm.Name + ":", "Icons.PaintBrushFill");
+        SubNodes.Add(node);
 
-            Console.WriteLine($"[SpriteRootNode] Added sprite: {vm.Name}");
-        }
-        catch (Exception ex)
-        {
-            Console.WriteLine("ERROR in AddSpriteAsync: " + ex);
-        }
+        Console.WriteLine($"[SpriteRootNode] Added sprite: {vm.Name}");
     }
 
     private async Task DeleteSpriteAsync(DataItemNode node)
@@ -361,7 +334,7 @@ private async Task DeleteSpriteAsync(DataItemNode node)
 
     private async Task MassExportAsync()
     {
-        var x = await _dialogService.ShowFolderPickerAsync(new FolderPickerOpenOptions( )
+        var x = await _dialogService.ShowFolderPickerAsync(new FolderPickerOpenOptions()
         {
             AllowMultiple = true,
             Title = "Select a folder to mass export to"
@@ -395,18 +368,17 @@ private async Task ReImportSpriteAsync(DataItemNode node)
     }
 }
 
-
 // Used by TabSwitcher
 public class PageNode : NodeBase
 {
-    
     private readonly NodeFactory _nodeFactory;
     private readonly IDialogService _dialogService;
     public EditorPageViewModel Page { get; }
     public PageNode? Parent { get; set; }
     public bool IsTopLevel => Parent == null;
-    
-    public PageNode(IDialogService dialogService, NodeFactory nodeFactory, EditorPageViewModel page, PageNode? parent = null)
+
+    public PageNode(IDialogService dialogService, NodeFactory nodeFactory, EditorPageViewModel page,
+        PageNode? parent = null)
         : base(page.Title, page.Icon)
     {
         _dialogService = dialogService;
@@ -414,16 +386,16 @@ public PageNode(IDialogService dialogService, NodeFactory nodeFactory, EditorPag
         Page = page;
         Parent = parent;
     }
-    
+
     public override string Title => Page.Title;
-    
+
     public PageNode AddChild(EditorPageViewModel childPage)
     {
         var childNode = _nodeFactory.CreatePageNode(childPage, this);
         SubNodes.Add(childNode);
         return childNode;
     }
-    
+
     public void RemoveChild(PageNode childNode)
     {
         SubNodes.Remove(childNode);
@@ -473,4 +445,4 @@ public void RemoveChild(PageNode childNode)
 //         });
 //     }
 //
-// }
+// }
\ No newline at end of file

From 732424aa3e28e75afd53d620eb071803e7da1792 Mon Sep 17 00:00:00 2001
From: Kace <41309226+DoubleTrio@users.noreply.github.com>
Date: Wed, 19 Nov 2025 22:51:06 -0500
Subject: [PATCH 13/51] format devplayer tab

---
 .../Views/DevForm/DevTabPlayer.axaml                     | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabPlayer.axaml b/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabPlayer.axaml
index 13f906ad..bcbbf943 100644
--- a/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabPlayer.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabPlayer.axaml
@@ -11,16 +11,17 @@
   </Design.DataContext>
   <Grid RowDefinitions="30, Auto, 30, Auto, 30, Auto, 30, Auto, 30, Auto, Auto, Auto" ColumnDefinitions="*, *" ColumnSpacing="8">
     <Grid.Styles>
-      <Style Selector="TextBlock">
-        <Setter Property="VerticalAlignment" Value="Bottom" />
-      </Style>
+      <!-- <Style Selector="TextBlock"> -->
+      <!--   <Setter Property="VerticalAlignment" Value="Bottom" /> -->
+      <!-- </Style> -->
       <Style Selector="NumericUpDown">
         <Setter Property="MinHeight" Value="40"  />
         <Setter Property="Height" Value="40"  />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
       </Style>
     </Grid.Styles>
     <TextBlock  Margin="4,0" VerticalAlignment="Bottom" Grid.Row="0" Grid.Column="0">Lv.</TextBlock>
-    <NumericUpDown  Name="nudLevel" Value="{Binding Level}" Minimum="1" Maximum="100" Grid.Row="1" Grid.Column="0"/>
+    <NumericUpDown  Name="nudLevel" Value="{Binding Level}" Minimum="1" Maximum="100" Increment="1" Grid.Row="1" Grid.Column="0"/>
     <Button Classes="flat" Name="btnRollSkill" Command="{Binding btnRollSkill_Click}" Grid.Row="1" Grid.Column="1">Reroll Skills</Button>
     <TextBlock Margin="4,0" VerticalAlignment="Bottom" Grid.Row="2" Grid.Column="0">Species</TextBlock>
     <Grid Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2">

From fc809f56e8b628ec381425e0c1e309773d2e7c8b Mon Sep 17 00:00:00 2001
From: Kace <41309226+DoubleTrio@users.noreply.github.com>
Date: Thu, 20 Nov 2025 01:53:11 -0500
Subject: [PATCH 14/51] add and delete nodes now works immediately

---
 .../ViewModels/New/DevFormViewModel.cs        | 27 +++++++++++++++++++
 .../ViewModels/New/NodeBase.cs                | 18 +++++++++++++
 2 files changed, 45 insertions(+)

diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs
index 12197e59..f91287b1 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs
@@ -364,6 +364,22 @@ await _dialogService.ShowDialogAsync<PreferencesWindowViewModel, bool>(
         tab.Icon = "Icons.GameControllerFill";
         AddTopLevelPage(tab);
         this.WhenAnyValue(x => x.Filter).Throttle(TimeSpan.FromMilliseconds(300)).Subscribe(ApplyFilter);
+
+        NodeSource = new HierarchicalTreeDataGridSource<NodeBase>(Nodes)
+        {
+            Columns =
+            {
+                new HierarchicalExpanderColumn<NodeBase>(
+                    new TemplateColumn<NodeBase>(
+                        null,
+                        "TreeDataGridNodeBaseTemplate",
+                        null,
+                        new GridLength(1, GridUnitType.Star)),
+                    x => x.SubNodes.Where(n => n.IsVisible),
+                    x => x.SubNodes.Count > 0,
+                    x => x.IsExpanded)
+            },
+        };
     }
 
     public void ClearNodes()
@@ -406,6 +422,10 @@ private void CreateDataNode()
         }
 
         Nodes.Add(dataNode);
+
+
+        foreach (var root in Nodes)
+            AttachEventsRecursive(root);
     }
 
     private void InitializeTabEvents()
@@ -499,6 +519,13 @@ private void BuildNodes()
         // monstersRoot.IsExpanded = true;
     }
 
+    private void AttachEventsRecursive(NodeBase node)
+    {
+        node.SubNodesChanged += () => RefreshTreeDataGrid();
+
+        foreach (var child in node.SubNodes)
+            AttachEventsRecursive(child);
+    }
 
     private TabSwitcherViewModel? _tabSwitcher;
 
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/NodeBase.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/NodeBase.cs
index fb79c055..95afd032 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/NodeBase.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/NodeBase.cs
@@ -40,6 +40,8 @@ public string Icon
         set => this.RaiseAndSetIfChanged(ref _icon, value);
     }
 
+    public event Action? SubNodesChanged;
+    
 
     public NodeBase(string title = "", string? icon = null)
     {
@@ -47,6 +49,7 @@ public NodeBase(string title = "", string? icon = null)
         _icon = icon ?? "";
         SubNodes = new ObservableCollection<NodeBase>();
         IsExpanded = false;
+        IsVisible = true;
         SubNodes.CollectionChanged += OnSubNodesChanged;
         this.WhenAnyValue(x => x.IsExpanded)
             .Where(expanded => !expanded)
@@ -72,11 +75,24 @@ public bool IsVisible
     private void OnSubNodesChanged(object? s, NotifyCollectionChangedEventArgs e)
     {
         if (e.NewItems != null)
+        {
             foreach (NodeBase child in e.NewItems)
+            {
                 child.Parent = this;
+                child.SubNodesChanged += SubNodesChanged;
+            }
+        }
+
         if (e.OldItems != null)
+        {
             foreach (NodeBase child in e.OldItems)
+            {
                 child.Parent = null;
+                child.SubNodesChanged -= SubNodesChanged;
+            }
+        }
+
+        SubNodesChanged?.Invoke();
     }
 
 
@@ -167,6 +183,7 @@ private async Task AddItemAsync()
             return;
 
         SubNodes.Add(_nodeFactory.CreateDataItemNode(vm.Name, "MonsterEditor", $"{vm.Name}:", "Icons.GhostFill"));
+        IsExpanded = true;
         Console.WriteLine($"Added {DataType} item: {vm.Name}");
     }
 
@@ -313,6 +330,7 @@ private async Task AddSpriteAsync()
 
         var node = _nodeFactory.CreateDataItemNode(vm.Name, "SpriteEditor", vm.Name + ":", "Icons.PaintBrushFill");
         SubNodes.Add(node);
+        IsExpanded = true;
 
         Console.WriteLine($"[SpriteRootNode] Added sprite: {vm.Name}");
     }

From e8010295f62957147c937483a3bb97d664b6009e Mon Sep 17 00:00:00 2001
From: Kace <41309226+DoubleTrio@users.noreply.github.com>
Date: Mon, 24 Nov 2025 02:59:03 -0500
Subject: [PATCH 15/51] progress on sprite nodes

---
 RogueEssence.Editor.Avalonia/App.axaml.cs     |   2 +
 RogueEssence.Editor.Avalonia/NodeFactory.cs   |  15 +-
 .../RogueEssence.Editor.Avalonia.csproj       |   8 +
 .../Services/DialogService.cs                 |  64 +-
 .../ViewModels/Content/AnimEditViewModel.cs   |  80 +-
 .../Content/SpeciesEditViewModel.cs           |  40 +-
 .../DevForm/DevTabSpritesViewModel.cs         |   4 +-
 .../ViewModels/New/DevFormViewModel.cs        | 251 +++++-
 .../DialogBoxes/MapRetileWindowViewModel.cs   |  42 +
 .../New/Editors/DevControlViewModel.cs        |   2 +-
 .../New/Editors/DevEditPageViewModel.cs       |   5 +-
 .../New/Editors/SpeciesEditPageViewModel.cs   | 813 ++++++++++++++++++
 .../ViewModels/New/ModSwitcherViewModel.cs    |   7 +-
 .../New/Nodes/ISpriteOperationStrategy.cs     |  14 +
 .../ViewModels/New/{ => Nodes}/NodeBase.cs    | 193 +++--
 .../New/Nodes/SpriteAssetTypeStrategy.cs      | 382 ++++++++
 .../New/Nodes/SpriteTileStrategy.cs           | 376 ++++++++
 .../Views/Content/SpeciesEditForm.axaml       |   4 +-
 ...ileWindow.axaml => MapRetileWindow2.axaml} |   2 +-
 ...dow.axaml.cs => MapRetileWindow2.axaml.cs} |   4 +-
 .../Views/New/DevForm.axaml                   |  26 +-
 .../Views/New/DevForm.axaml.cs                | 100 ++-
 .../New/DialogBoxes/MapRetileWindow.axaml     |  24 +
 .../New/DialogBoxes/MapRetileWindow.axaml.cs  |  41 +
 .../DialogBoxes/MessageBoxWindowView.axaml.cs |   2 +-
 .../New/Editors/SpeciesEditPageView.axaml     |  67 ++
 .../New/Editors/SpeciesEditPageView.axaml.cs  |  13 +
 .../Views/New/Editors/SpritePageView.axaml    |   3 +
 RogueEssence/Content/GraphicsManager.cs       |  33 +
 RogueEssence/Data/DataManager.cs              |  56 ++
 30 files changed, 2464 insertions(+), 209 deletions(-)
 create mode 100644 RogueEssence.Editor.Avalonia/ViewModels/New/DialogBoxes/MapRetileWindowViewModel.cs
 create mode 100644 RogueEssence.Editor.Avalonia/ViewModels/New/Editors/SpeciesEditPageViewModel.cs
 create mode 100644 RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/ISpriteOperationStrategy.cs
 rename RogueEssence.Editor.Avalonia/ViewModels/New/{ => Nodes}/NodeBase.cs (75%)
 create mode 100644 RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/SpriteAssetTypeStrategy.cs
 create mode 100644 RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/SpriteTileStrategy.cs
 rename RogueEssence.Editor.Avalonia/Views/DialogBoxes/{MapRetileWindow.axaml => MapRetileWindow2.axaml} (96%)
 rename RogueEssence.Editor.Avalonia/Views/DialogBoxes/{MapRetileWindow.axaml.cs => MapRetileWindow2.axaml.cs} (90%)
 create mode 100644 RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/MapRetileWindow.axaml
 create mode 100644 RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/MapRetileWindow.axaml.cs
 create mode 100644 RogueEssence.Editor.Avalonia/Views/New/Editors/SpeciesEditPageView.axaml
 create mode 100644 RogueEssence.Editor.Avalonia/Views/New/Editors/SpeciesEditPageView.axaml.cs

diff --git a/RogueEssence.Editor.Avalonia/App.axaml.cs b/RogueEssence.Editor.Avalonia/App.axaml.cs
index b756f593..21140939 100644
--- a/RogueEssence.Editor.Avalonia/App.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/App.axaml.cs
@@ -67,6 +67,7 @@ public static void AddCommonServices(this IServiceCollection collection)
             collection.AddTransient<SpritePageViewModel>();
             collection.AddTransient<ModInfoEditorViewModel>();
             collection.AddTransient<DevEditPageViewModel>();
+            collection.AddTransient<SpeciesEditPageViewModel>();
         }
         
         private static void AddDevTabViewModels(this IServiceCollection services)
@@ -92,6 +93,7 @@ public static void RegisterPages(this IServiceProvider provider)
             pageFactory.Register<SpritePageViewModel>("SpritePage");
             pageFactory.Register<ModInfoEditorViewModel>("ModInfoEditor");
             pageFactory.Register<DevEditPageViewModel>("DevEditEditor");
+            pageFactory.Register<SpeciesEditPageViewModel>("SpeciesSpriteEditor");
         }
     }
 
diff --git a/RogueEssence.Editor.Avalonia/NodeFactory.cs b/RogueEssence.Editor.Avalonia/NodeFactory.cs
index 5e01ccdf..d2aec450 100644
--- a/RogueEssence.Editor.Avalonia/NodeFactory.cs
+++ b/RogueEssence.Editor.Avalonia/NodeFactory.cs
@@ -2,6 +2,7 @@
 
 using System;
 using Microsoft.Extensions.DependencyInjection;
+using RogueEssence.Content;
 using RogueEssence.Data;
 using RogueEssence.Dev.Services;
 using RogueEssence.Dev.ViewModels;
@@ -25,6 +26,13 @@ public T Create<T>(params object[] args)
 
         public OpenEditorNode CreateOpenEditorNode(string title, string? icon = null, string editorKey = "")
             => Create<OpenEditorNode>(title, icon, editorKey);
+        
+        public OpenEditorNodeWithParams CreateOpenEditorNodeWithParams(
+            string title,
+            string? icon = null,
+            string editorKey = "",
+            params object[] extraParams)
+            => Create<OpenEditorNodeWithParams>(title, icon, editorKey, extraParams);
 
         public DataRootNode CreateDataRootNode(DataManager.DataType dataType, string editorKey, string title, string? icon = null)
         {
@@ -42,8 +50,11 @@ public PageNode CreatePageNode(EditorPageViewModel childPage, PageNode? parentNo
         // => Create<PageNode>(this, childPage, parentNode);
 
 
-        public SpriteRootNode CreateSpriteRootNode(string dataType, string editorKey, string title, string? icon = null)
-            => Create<SpriteRootNode>(dataType, editorKey, title, icon);
+        public SpriteRootNode CreateSpriteRootNode(GraphicsManager.AssetType assetType, string editorKey, string title, string? icon = null)
+            => Create<SpriteRootNode>(assetType, editorKey, title, icon);
+        
+        public SpriteTileRootNode CreateSpriteTileRootNode(string editorKey, string title, string? icon = null)
+            => Create<SpriteTileRootNode>(editorKey, title, icon);
 
     }
 }
diff --git a/RogueEssence.Editor.Avalonia/RogueEssence.Editor.Avalonia.csproj b/RogueEssence.Editor.Avalonia/RogueEssence.Editor.Avalonia.csproj
index 4806321d..2e1ebb95 100644
--- a/RogueEssence.Editor.Avalonia/RogueEssence.Editor.Avalonia.csproj
+++ b/RogueEssence.Editor.Avalonia/RogueEssence.Editor.Avalonia.csproj
@@ -191,6 +191,14 @@
       <DependentUpon>DevTabGame.axaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
+    <Compile Update="Views\New\DialogBoxes\MapRetileWindow.axaml.cs">
+      <DependentUpon>MapRetileWindow.axaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Update="Views\New\Editors\SpeciesEditPageView.axaml.cs">
+      <DependentUpon>SpeciesEditPageView.axaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Models\" />
diff --git a/RogueEssence.Editor.Avalonia/Services/DialogService.cs b/RogueEssence.Editor.Avalonia/Services/DialogService.cs
index 0c9f50ac..c3a4afe4 100644
--- a/RogueEssence.Editor.Avalonia/Services/DialogService.cs
+++ b/RogueEssence.Editor.Avalonia/Services/DialogService.cs
@@ -4,20 +4,24 @@
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
+using Avalonia.Controls.Shapes;
 using Avalonia.Platform.Storage;
+using Avalonia.Threading;
 
 namespace RogueEssence.Dev.Services
 {
     public interface IDialogService
     {
-        Task<TResult> ShowDialogAsync<TViewModel, TResult>(TViewModel viewModel, string title = "", bool initVm = true)
+        Task<TResult> ShowDialogAsync<TViewModel, TResult>(TViewModel viewModel, string title = "")
             where TViewModel : class;
 
         void Close<TViewModel, TResult>(TViewModel viewModel, TResult result)
             where TViewModel : class;
 
-        Task<string?> ShowFolderPickerAsync(FolderPickerOpenOptions options);
-
+        Task<string?> ShowFolderPickerAsync(FolderPickerOpenOptions options, string folderName = "");
+        Task<string?> ShowFilePickerAsync(FilePickerOpenOptions options, string folderName = "");
+        
+        Task<string?> TryGetSaveFileAsync(FilePickerSaveOptions options, string folderName = "");
     }
 
     public class DialogService : IDialogService
@@ -38,19 +42,14 @@ public DialogService(ViewLocator viewLocator, Func<TopLevel?> topLevelFunc)
             _topLevelFunc = topLevelFunc;
         }
 
-        public async Task<TResult?> ShowDialogAsync<TViewModel, TResult>(TViewModel viewModel, string title = "",
-            bool initVm = true)
+        public async Task<TResult?> ShowDialogAsync<TViewModel, TResult>(TViewModel viewModel, string title = "")
             where TViewModel : class
         {
             var control = _viewLocator.Build(viewModel);
             if (control is not Window window)
                 throw new InvalidOperationException($"View for {typeof(TViewModel).Name} must be a Window.");
 
-            if (initVm)
-            {
-                // window.DataContext = viewModel;
-            }
-
+            window.DataContext = viewModel;
             window.Title = title;
 
             var mainWindow = (Application.Current?.ApplicationLifetime as IClassicDesktopStyleApplicationLifetime)
@@ -69,19 +68,50 @@ public void Close<TViewModel, TResult>(TViewModel viewModel, TResult result)
 
             window?.Close(result);
         }
-
-        public async Task<string?> ShowFolderPickerAsync(FolderPickerOpenOptions options)
+        public async Task<string?> ShowFolderPickerAsync(FolderPickerOpenOptions options, string folderName)
         {
-            var topLevelVisual = _topLevelFunc();
-            if (topLevelVisual == null) return null;
 
-            var folders = await topLevelVisual.StorageProvider.OpenFolderPickerAsync(options);
+            var topLevel = _topLevelFunc();
+            
+            if (folderName != "")
+            {
+                options.SuggestedStartLocation = await topLevel.StorageProvider.TryGetFolderFromPathAsync(folderName);
+            }
 
+            var folders = await topLevel.StorageProvider.OpenFolderPickerAsync(options);
+            
             var path = folders.FirstOrDefault()?.Path;
-            if (path == null) return null;
-            return path.IsAbsoluteUri ? path.LocalPath : path.OriginalString;
+            return path?.LocalPath;
         }
+  
+        public async Task<string?> ShowFilePickerAsync(FilePickerOpenOptions options, string folderName)
+        {
+            var topLevel = _topLevelFunc();
+            
+            if (folderName != "")
+            {
+                options.SuggestedStartLocation = await topLevel.StorageProvider.TryGetFolderFromPathAsync(folderName);
+            }
 
+            var files = await topLevel.StorageProvider.OpenFilePickerAsync(options);
+            
+            if (files.Count == 0)
+                return null;
+
+            return files[0].TryGetLocalPath();
+        }
+        
+        public async Task<string?> TryGetSaveFileAsync(FilePickerSaveOptions options, string folderName)
+        {
+            var topLevel = _topLevelFunc();
 
+            if (folderName != "")
+            {
+                options.SuggestedStartLocation = await topLevel.StorageProvider.TryGetFolderFromPathAsync(folderName);
+            }
+            
+            var result = await topLevel.StorageProvider.SaveFilePickerAsync(options);
+            return result?.Path.LocalPath;
+        }
     }
 }
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/Content/AnimEditViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/Content/AnimEditViewModel.cs
index 5b80b6ea..e4bf791f 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/Content/AnimEditViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/Content/AnimEditViewModel.cs
@@ -20,7 +20,7 @@ namespace RogueEssence.Dev.ViewModels
 {
     public class AnimEditViewModel : ViewModelBase
     {
-        private GraphicsManager.AssetType assetType;
+        private GraphicsManager.AssetType   assetType;
         private Window parent;
 
 
@@ -220,6 +220,43 @@ public async void btnReImport_Click()
             }
         }
 
+        // public async void btnExport_Click()
+        // {
+        //     //get current sprite
+        //     string animData = anims[Anims.InternalIndex];
+        //
+        //     //remember addresses in registry
+        //     string folderName = DevForm.GetConfig(Name + "Dir", Directory.GetCurrentDirectory());
+        //
+        //     SaveFileDialog saveFileDialog = new SaveFileDialog();
+        //     saveFileDialog.Directory = folderName;
+        //
+        //     FileDialogFilter filter = new FileDialogFilter();
+        //     filter.Name = "PNG Files";
+        //     filter.Extensions.Add("png");
+        //     saveFileDialog.Filters.Add(filter);
+        //
+        //     string folder = await saveFileDialog.ShowAsync(parent);
+        //
+        //     if (!String.IsNullOrEmpty(folder))
+        //     {
+        //         DevForm.SetConfig(Name + "Dir", Path.GetDirectoryName(folder));
+        //         //CachedPath = folder;
+        //
+        //         try
+        //         {
+        //             DevForm.ExecuteOrPend(() => { Export(folder, animData); });
+        //         }
+        //         catch (Exception ex)
+        //         {
+        //             DiagManager.Instance.LogError(ex, false);
+        //             await MessageBox.Show(parent, "Error exporting to\n" + CachedPath + "\n\n" + ex.Message, "Export Failed", MessageBox.MessageBoxButtons.Ok);
+        //             return;
+        //         }
+        //     }
+        // }
+
+        
         public async void btnExport_Click()
         {
             //get current sprite
@@ -228,34 +265,45 @@ public async void btnExport_Click()
             //remember addresses in registry
             string folderName = DevForm.GetConfig(Name + "Dir", Directory.GetCurrentDirectory());
 
-            SaveFileDialog saveFileDialog = new SaveFileDialog();
-            saveFileDialog.Directory = folderName;
-
-            FileDialogFilter filter = new FileDialogFilter();
-            filter.Name = "PNG Files";
-            filter.Extensions.Add("png");
-            saveFileDialog.Filters.Add(filter);
-
-            string folder = await saveFileDialog.ShowAsync(parent);
+            var options = new FilePickerSaveOptions
+            {
+                Title = "Export PNG",
+                SuggestedStartLocation = await parent.StorageProvider.TryGetFolderFromPathAsync(folderName),
+                DefaultExtension = "png",
+                SuggestedFileName = "export.png",
+                FileTypeChoices =
+                [
+                    new FilePickerFileType("PNG Files")
+                    {
+                        Patterns = new[] { "*.png" }
+                    }
+                ]
+            };
+            
+            var saveFile = await parent.StorageProvider.SaveFilePickerAsync(options);
 
-            if (!String.IsNullOrEmpty(folder))
+            if (saveFile != null)
             {
-                DevForm.SetConfig(Name + "Dir", Path.GetDirectoryName(folder));
-                //CachedPath = folder;
+                string filePath = saveFile.Path.LocalPath;
+                DevForm.SetConfig(Name + "Dir", Path.GetDirectoryName(filePath));
 
                 try
                 {
-                    DevForm.ExecuteOrPend(() => { Export(folder, animData); });
+                    DevForm.ExecuteOrPend(() => { Export(filePath, animData); });
                 }
                 catch (Exception ex)
                 {
                     DiagManager.Instance.LogError(ex, false);
-                    await MessageBox.Show(parent, "Error exporting to\n" + CachedPath + "\n\n" + ex.Message, "Export Failed", MessageBox.MessageBoxButtons.Ok);
+            
+                    
+                    await MessageBox.Show(parent,
+                        "Export Failed",
+                        $"Error exporting to\n{filePath}\n\n{ex.Message}",
+                        MessageBox.MessageBoxButtons.Ok);
                     return;
                 }
             }
         }
-
         public async void btnDelete_Click()
         {
             //get current sprite
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/Content/SpeciesEditViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/Content/SpeciesEditViewModel.cs
index 4e70e64c..01d340a7 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/Content/SpeciesEditViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/Content/SpeciesEditViewModel.cs
@@ -18,13 +18,13 @@
 
 namespace RogueEssence.Dev.ViewModels
 {
-    public class SpeciesOpContainer
+    public class SpeciesOpContainer2
     {
         public Action CommandAction;
         public CharSheetOp Op;
         public string Name { get { return Op.Name; } }
 
-        public SpeciesOpContainer(CharSheetOp op, Action command)
+        public SpeciesOpContainer2(CharSheetOp op, Action command)
         {
             Op = op;
             CommandAction = command;
@@ -36,7 +36,7 @@ public void Command()
         }
     }
 
-    public class MonsterNodeViewModel : ViewModelBase
+    public class MonsterNodeViewModel2 : ViewModelBase
     {
 
         private bool filled;
@@ -55,19 +55,19 @@ public string Name
 
         public CharID ID;
 
-        public ObservableCollection<MonsterNodeViewModel> Nodes { get; }
+        public ObservableCollection<MonsterNodeViewModel2> Nodes { get; }
 
-        public MonsterNodeViewModel(string name, CharID id, bool filled)
+        public MonsterNodeViewModel2(string name, CharID id, bool filled)
         {
             this.name = name;
             this.ID = id;
             this.filled = filled;
-            Nodes = new ObservableCollection<MonsterNodeViewModel>();
+            Nodes = new ObservableCollection<MonsterNodeViewModel2>();
         }
 
     }
 
-    public class SpeciesEditViewModel : ViewModelBase
+    public class SpeciesEditViewModel2 : ViewModelBase
     {
 
         private bool checkSprites;
@@ -85,12 +85,12 @@ public string Name
         private List<string> monsterKeys;
         private List<string> skinKeys;
 
-        public ObservableCollection<MonsterNodeViewModel> Monsters { get; }
-        public ObservableCollection<SpeciesOpContainer> OpList { get; }
+        public ObservableCollection<MonsterNodeViewModel2> Monsters { get; }
+        public ObservableCollection<SpeciesOpContainer2> OpList { get; }
 
 
-        private MonsterNodeViewModel chosenMonster;
-        public MonsterNodeViewModel ChosenMonster
+        private MonsterNodeViewModel2 chosenMonster;
+        public MonsterNodeViewModel2 ChosenMonster
         {
             get => chosenMonster;
             set
@@ -110,10 +110,10 @@ public string CachedPath
         }
 
 
-        public SpeciesEditViewModel()
+        public SpeciesEditViewModel2()
         {
-            Monsters = new ObservableCollection<MonsterNodeViewModel>();
-            OpList = new ObservableCollection<SpeciesOpContainer>();
+            Monsters = new ObservableCollection<MonsterNodeViewModel2>();
+            OpList = new ObservableCollection<SpeciesOpContainer2>();
         }
 
 
@@ -182,11 +182,11 @@ public void LoadFormDataEntries(bool sprites, Window parent)
         {
             checkSprites = sprites;
             this.parent = parent;
-            OpList.Add(new SpeciesOpContainer(new CharSheetDummyOp("Export as Multi Sheet"), ExportMultiSheet));
+            OpList.Add(new SpeciesOpContainer2(new CharSheetDummyOp("Export as Multi Sheet"), ExportMultiSheet));
             if (sprites)
             {
                 foreach (CharSheetOp op in DevDataManager.CharSheetOps)
-                    OpList.Add(new SpeciesOpContainer(op, () => applyOpToCharSheet(op)));
+                    OpList.Add(new SpeciesOpContainer2(op, () => applyOpToCharSheet(op)));
             }
 
             monsterKeys = DataManager.Instance.DataIndices[DataManager.DataType.Monster].GetMappedKeys();
@@ -456,22 +456,22 @@ private void reloadFullList()
                     MonsterEntrySummary dex = (MonsterEntrySummary)DataManager.Instance.DataIndices[DataManager.DataType.Monster].Get(monsterKeys[ii]);
 
                     CharID dexID = new CharID(ii, -1, -1, -1);
-                    MonsterNodeViewModel node = new MonsterNodeViewModel("#" + ii.ToString() + ": " + dex.Name.ToLocal(), dexID, hasSprite(charaNode, dexID));
+                    MonsterNodeViewModel2 node = new MonsterNodeViewModel2("#" + ii.ToString() + ": " + dex.Name.ToLocal(), dexID, hasSprite(charaNode, dexID));
                     for (int jj = 0; jj < dex.Forms.Count; jj++)
                     {
                         CharID formID = new CharID(ii, jj, -1, -1);
-                        MonsterNodeViewModel formNode = new MonsterNodeViewModel("Form" + jj.ToString() + ": " + dex.Forms[jj].Name.ToLocal(), formID, hasSprite(charaNode, formID));
+                        MonsterNodeViewModel2 formNode = new MonsterNodeViewModel2("Form" + jj.ToString() + ": " + dex.Forms[jj].Name.ToLocal(), formID, hasSprite(charaNode, formID));
                         for (int kk = 0; kk < skinKeys.Count; kk++)
                         {
                             SkinData skinData = DataManager.Instance.GetSkin(skinKeys[kk]);
                             if (!skinData.Challenge)
                             {
                                 CharID skinID = new CharID(ii, jj, kk, -1);
-                                MonsterNodeViewModel skinNode = new MonsterNodeViewModel(skinData.Name.ToLocal(), skinID, hasSprite(charaNode, skinID));
+                                MonsterNodeViewModel2 skinNode = new MonsterNodeViewModel2(skinData.Name.ToLocal(), skinID, hasSprite(charaNode, skinID));
                                 for (int mm = 0; mm < 3; mm++)
                                 {
                                     CharID genderID = new CharID(ii, jj, kk, mm);
-                                    MonsterNodeViewModel genderNode = new MonsterNodeViewModel(((Gender)mm).ToString(), genderID, hasSprite(charaNode, genderID));
+                                    MonsterNodeViewModel2 genderNode = new MonsterNodeViewModel2(((Gender)mm).ToString(), genderID, hasSprite(charaNode, genderID));
                                     skinNode.Nodes.Add(genderNode);
                                 }
 
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevTabSpritesViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevTabSpritesViewModel.cs
index 114344b4..41c0f64f 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevTabSpritesViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevTabSpritesViewModel.cs
@@ -10,7 +10,7 @@ public class DevTabSpritesViewModel : ViewModelBase
 
         public void btnEditSprites_Click()
         {
-            SpeciesEditViewModel mv = new SpeciesEditViewModel();
+            SpeciesEditViewModel2 mv = new SpeciesEditViewModel2();
             Views.SpeciesEditForm editForm = new Views.SpeciesEditForm();
             mv.LoadFormDataEntries(true, editForm);
             editForm.DataContext = mv;
@@ -19,7 +19,7 @@ public void btnEditSprites_Click()
 
         public void btnEditPortraits_Click()
         {
-            SpeciesEditViewModel mv = new SpeciesEditViewModel();
+            SpeciesEditViewModel2 mv = new SpeciesEditViewModel2();
             Views.SpeciesEditForm editForm = new Views.SpeciesEditForm();
             mv.LoadFormDataEntries(false, editForm);
             editForm.DataContext = mv;
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs
index f91287b1..60e96057 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Collections.Specialized;
+using System.IO;
 using System.Linq;
 using System.Reactive;
 using System.Reactive.Linq;
@@ -12,6 +13,7 @@
 using RogueEssence.Dev.Models;
 using RogueEssence.Dev.Services;
 using ReactiveUI;
+using RogueEssence.Content;
 using RogueEssence.Data;
 using RogueEssence.Dev.Utility;
 using RogueEssence.Dev.Views;
@@ -357,7 +359,7 @@ public DevFormViewModel(PageFactory pageFactory, NodeFactory nodeFactory, IDialo
         OpenPreferencesWindow = ReactiveCommand.CreateFromTask(async () =>
         {
             await _dialogService.ShowDialogAsync<PreferencesWindowViewModel, bool>(
-                PreferencesWindowViewModel.Instance, "Preferences", false);
+                PreferencesWindowViewModel.Instance, "Preferences");
         });
 
         var tab = _pageFactory.CreatePage("DevControl");
@@ -387,12 +389,46 @@ public void ClearNodes()
         Nodes.Clear();
     }
 
-    public void UpdateTree()
+    public void LoadDevTree()
     {
-        CreateDataNode();
+        var modsViewModel = _pageFactory.GetRequiredService<DevTabModsViewModel>();
+        var rootStr = modsViewModel.CurrentMod = string.IsNullOrEmpty(modsViewModel.CurrentMod)
+            ? "[NULL ORIGINS]"
+            : modsViewModel.CurrentMod;
+
+        var root = _nodeFactory.CreateOpenEditorNode(rootStr, "Icons.ScrollFill", "");
+
+
+        root.SubNodes.Add(
+            _nodeFactory.CreateOpenEditorNode("Dev Control", "Icons.GameControllerFill", "DevControl"));
+        root.SubNodes.Add(_nodeFactory.CreateOpenEditorNode("Zone Editor", "Icons.StairsFill", "ZoneEditor"));
+        root.SubNodes.Add(
+            _nodeFactory.CreateOpenEditorNode("Ground Editor", "Icons.MapTrifoldFill", "GroundEditor"));
+        root.SubNodes.Add(_nodeFactory.CreateOpenEditorNode("Testing", "Icons.BedFill", "RandomInfo"));
+        root.SubNodes.Add(_nodeFactory.CreateOpenEditorNode("Tab Test", "Icons.AirplaneFill", "SpritePage"));
+
+        root.SubNodes.Add(_nodeFactory.CreateOpenEditorNode("Constants", "Icons.ListFill"));
+
+        // var particlesRoot = _nodeFactory.CreateSpriteRootNode("particles", "", "Particles", "Icons.PaintBrushFill");
+        // particlesRoot.SubNodes.Add(_nodeFactory.CreateDataItemNode("Acid_Blue", "SpriteEditor", "Acid_Blue",
+        //     "Icons.PaintBrushFill"));
+        // particlesRoot.SubNodes.Add(_nodeFactory.CreateDataItemNode("Acid_Red", "SpriteEditor", "Acid_Red",
+        //     "Icons.PaintBrushFill"));
+        //
+        // halcyonNode.SubNodes.Add(particlesRoot);
+
+
+        CreateDataNode(root);
+
+        CreateSpriteNode(root);
+
+        CreateModNode(root);
+        Nodes.Add(root);
+
+        AttachEventsRecursive(root);
     }
 
-    private void CreateDataNode()
+    private void CreateDataNode(NodeBase parent)
     {
         var dataNode = _nodeFactory.CreateOpenEditorNode("Data", "Icons.FloppyDiskFill", "");
         foreach (var type in Enum.GetValues<DataManager.DataType>())
@@ -421,11 +457,152 @@ private void CreateDataNode()
             }
         }
 
-        Nodes.Add(dataNode);
+        parent.SubNodes.Add(dataNode);
+    }
+
+    private void CreateSpriteNode(NodeBase parent)
+    {
+        var spritesViewModel = _pageFactory.GetRequiredService<DevTabSpritesViewModel>();
+        var spriteNode = _nodeFactory.CreateOpenEditorNode("Sprites", "Icons.PaintBrushFill", "SpeciesSpriteEditor");
+
+        spriteNode.SubNodes.Add(
+            _nodeFactory.CreateOpenEditorNodeWithParams("Char Sprites", "Icons.PersonFill", "SpeciesSpriteEditor", true)
+        );
+        spriteNode.SubNodes.Add(
+            _nodeFactory.CreateOpenEditorNodeWithParams("Portraits", "Icons.UserRectangleFill", "SpeciesSpriteEditor", false)
+        );
+
+        foreach (var type in Enum.GetValues<GraphicsManager.AssetType>())
+        {
+            if (type == GraphicsManager.AssetType.None || type == GraphicsManager.AssetType.All ||
+                type == GraphicsManager.AssetType.Count || type == GraphicsManager.AssetType.Autotile ||
+                type == GraphicsManager.AssetType.Chara || type == GraphicsManager.AssetType.Portrait ||
+                type == GraphicsManager.AssetType.Font)
+                continue;
+
+            if (type == GraphicsManager.AssetType.Tile)
+            {
+                var tileRootNode = _nodeFactory.CreateSpriteTileRootNode(
+                    "",
+                    type.ToString(),
+                    type.GetIcon());
+                lock (GameBase.lockObj)
+                {
+                    foreach (string name in GraphicsManager.TileIndex.Nodes.Keys.OrderBy(n => n))
+                    {
+                        var itemNode = _nodeFactory.CreateDataItemNode(
+                            name,
+                            "",
+                            name,
+                            type.GetIcon());
+                        tileRootNode.SubNodes.Add(itemNode);
+                    }
+                }
+
+                spriteNode.SubNodes.Add(tileRootNode);
+                continue;
+            }
+
+            string assetPattern = GraphicsManager.GetPattern(type);
+            string[] dirs = PathMod.GetModFiles(Path.GetDirectoryName(assetPattern),
+                String.Format(Path.GetFileName(assetPattern), "*"));
+
+            var spriteRootNode = _nodeFactory.CreateSpriteRootNode(
+                type,
+                "TODO",
+                type.ToString(),
+                type.GetIcon());
+            // dataNode.SubNodes.Add(dataItemRootNode);
+            spriteNode.SubNodes.Add(spriteRootNode);
+
+
+            lock (GameBase.lockObj)
+            {
+                for (int ii = 0; ii < dirs.Length; ii++)
+                {
+                    string filename = Path.GetFileNameWithoutExtension(dirs[ii]);
+                    // anims.Add(filename);
+                    var itemNode = _nodeFactory.CreateDataItemNode(
+                        filename,
+                        "",
+                        filename,
+                        type.GetIcon());
+
+                    spriteRootNode.SubNodes.Add(itemNode);
+                }
+            }
+        }
+
 
+        parent.SubNodes.Add(spriteNode);
+
+        // lock (GameBase.lockObj)
+        // {
+        // anims.Clear();
+        // Anims.Clear();
+        // string assetPattern = GraphicsManager.GetPattern(assetType);
+        // string[] dirs = PathMod.GetModFiles(Path.GetDirectoryName(assetPattern), String.Format(Path.GetFileName(assetPattern), "*"));
+        // for (int ii = 0; ii < dirs.Length; ii++)
+        // {
+        //     string filename = Path.GetFileNameWithoutExtension(dirs[ii]);
+        //     anims.Add(filename);
+        // }
+        // Anims.SetItems(anims);
+        // }
+
+
+        // var dataNode = _nodeFactory.CreateSpriteRootNode("aaaa", "Icons.FloppyDiskFill", "Sprite");
+
+        // foreach (var type in Enum.GetValues<DataManager.DataType>())
+        // {
+        //     if (type == DataManager.DataType.All || type == DataManager.DataType.None)
+        //         continue;
+        //
+        //
+        //     var dataItemRootNode = _nodeFactory.CreateDataRootNode(
+        //         type,
+        //         "TODO",
+        //         type.ToString(),
+        //         type.GetIcon());
+        //     dataNode.SubNodes.Add(dataItemRootNode);
+        //     var entries = DataManager.Instance.DataIndices[type].GetLocalStringArray(true);
+        //
+        //     foreach (string key in entries.Keys)
+        //     {
+        //         var itemNode = _nodeFactory.CreateDataItemNode(
+        //             key,
+        //             "DevEditEditor",
+        //             $"{key}: {entries[key]}",
+        //             type.GetIcon());
+        //
+        //         dataItemRootNode.SubNodes.Add(itemNode);
+        //     }
+        // }
+        //
+        // parent.SubNodes.Add(dataNode);
+    }
+
+    private void HandleSprites()
+    {
+    }
+
+    private void CreateModNode(NodeBase parent)
+    {
+        var modsViewModel = _pageFactory.GetRequiredService<DevTabModsViewModel>();
+        var modRoot = _nodeFactory.CreateDataRootNode(DataManager.DataType.AI, "", "Mods", "Icons.ScrollFill");
+
+        foreach (ModsNodeViewModel mod in modsViewModel.Mods)
+        {
+            var itemNode = _nodeFactory.CreateDataItemNode(
+                mod.Namespace,
+                "",
+                $"{mod.Namespace}: {mod.Name}",
+                "Icons.ScrollFill");
+
+            modRoot.SubNodes.Add(itemNode);
+        }
 
-        foreach (var root in Nodes)
-            AttachEventsRecursive(root);
+        parent.SubNodes.Add(modRoot);
     }
 
     private void InitializeTabEvents()
@@ -445,17 +622,17 @@ private void InitializeTabEvents()
 
     private void BuildNodes()
     {
-        var halcyonNode = _nodeFactory.CreateOpenEditorNode("Halcyon", "Icons.FloppyDiskBackFill", "ModInfoEditor");
-
-        halcyonNode.SubNodes.Add(
-            _nodeFactory.CreateOpenEditorNode("Dev Control", "Icons.GameControllerFill", "DevControl"));
-        halcyonNode.SubNodes.Add(_nodeFactory.CreateOpenEditorNode("Zone Editor", "Icons.StairsFill", "ZoneEditor"));
-        halcyonNode.SubNodes.Add(
-            _nodeFactory.CreateOpenEditorNode("Ground Editor", "Icons.MapTrifoldFill", "GroundEditor"));
-        halcyonNode.SubNodes.Add(_nodeFactory.CreateOpenEditorNode("Testing", "Icons.BedFill", "RandomInfo"));
-        halcyonNode.SubNodes.Add(_nodeFactory.CreateOpenEditorNode("Tab Test", "Icons.AirplaneFill", "SpritePage"));
-
-        halcyonNode.SubNodes.Add(_nodeFactory.CreateOpenEditorNode("Constants", "Icons.ListFill"));
+        // var halcyonNode = _nodeFactory.CreateOpenEditorNode("Halcyon", "Icons.FloppyDiskBackFill", "ModInfoEditor");
+        //
+        // halcyonNode.SubNodes.Add(
+        //     _nodeFactory.CreateOpenEditorNode("Dev Control", "Icons.GameControllerFill", "DevControl"));
+        // halcyonNode.SubNodes.Add(_nodeFactory.CreateOpenEditorNode("Zone Editor", "Icons.StairsFill", "ZoneEditor"));
+        // halcyonNode.SubNodes.Add(
+        //     _nodeFactory.CreateOpenEditorNode("Ground Editor", "Icons.MapTrifoldFill", "GroundEditor"));
+        // halcyonNode.SubNodes.Add(_nodeFactory.CreateOpenEditorNode("Testing", "Icons.BedFill", "RandomInfo"));
+        // halcyonNode.SubNodes.Add(_nodeFactory.CreateOpenEditorNode("Tab Test", "Icons.AirplaneFill", "SpritePage"));
+        //
+        // halcyonNode.SubNodes.Add(_nodeFactory.CreateOpenEditorNode("Constants", "Icons.ListFill"));
 
         // var monstersRoot = _nodeFactory.CreateDataRootNode("Monsters", "Monsters", "Monsters", "Icons.GhostFill");
 
@@ -471,13 +648,13 @@ private void BuildNodes()
         // monstersRoot.SubNodes.Add(_nodeFactory.CreateDataItemNode("seviper", "MonsterEditor", "seviper: Seviper",
         //     "Icons.GhostFill"));
 
-        var particlesRoot = _nodeFactory.CreateSpriteRootNode("particles", "", "Particles", "Icons.PaintBrushFill");
-        particlesRoot.SubNodes.Add(_nodeFactory.CreateDataItemNode("Acid_Blue", "SpriteEditor", "Acid_Blue",
-            "Icons.PaintBrushFill"));
-        particlesRoot.SubNodes.Add(_nodeFactory.CreateDataItemNode("Acid_Red", "SpriteEditor", "Acid_Red",
-            "Icons.PaintBrushFill"));
-
-        halcyonNode.SubNodes.Add(particlesRoot);
+        // var particlesRoot = _nodeFactory.CreateSpriteRootNode("particles", "", "Particles", "Icons.PaintBrushFill");
+        // particlesRoot.SubNodes.Add(_nodeFactory.CreateDataItemNode("Acid_Blue", "SpriteEditor", "Acid_Blue",
+        //     "Icons.PaintBrushFill"));
+        // particlesRoot.SubNodes.Add(_nodeFactory.CreateDataItemNode("Acid_Red", "SpriteEditor", "Acid_Red",
+        //     "Icons.PaintBrushFill"));
+        //
+        // halcyonNode.SubNodes.Add(particlesRoot);
         //             new NodeBase("Sprites", "Icons.PaintBrushFill")
         //             {
         //                 SubNodes = new ObservableCollection<NodeBase>
@@ -513,9 +690,9 @@ private void BuildNodes()
         //         }
 
         // halcyonNode.SubNodes.Add(monstersRoot);
-        Nodes = new ObservableCollection<NodeBase> { halcyonNode };
+        // Nodes = new ObservableCollection<NodeBase> { halcyonNode };
 
-        halcyonNode.IsExpanded = true;
+        // halcyonNode.IsExpanded = true;
         // monstersRoot.IsExpanded = true;
     }
 
@@ -544,16 +721,7 @@ public ModSwitcherViewModel? ModSwitcher
         set => this.RaiseAndSetIfChanged(ref _modSwitcher, value);
     }
 
-
-    // Navigate to a page from tab switcher
-    public void NavigateToPage(PageNode node)
-    {
-        Console.WriteLine($"Navigating to page {node.Title}");
-        Console.WriteLine("yay");
-        ActivePage = node.Page;
-    }
-
-    public void AddPageFromPageNode(OpenEditorNode node)
+    public void AddPageFromTreeNode(OpenEditorNode node)
     {
         var editor = _pageFactory.CreatePage(node.EditorKey, node);
 
@@ -568,12 +736,9 @@ public async Task<bool> TryCloseTabAsync(EditorPageViewModel page)
     {
         if (PageHasChildren(page))
         {
-            var result = await MessageBoxWindowView.Show(
-                "Are you sure you want to close all subtabs?  Your changes will not be saved.",
-                "Confirm Close",
-                MessageBoxWindowView.MessageBoxButtons.YesNo,
-                _dialogService
-            );
+            var result = await MessageBoxWindowView.Show(_dialogService,
+                "Are you sure you want to close all subtabs?  Your changes will not be saved.", "Confirm Close",
+                MessageBoxWindowView.MessageBoxButtons.YesNo);
 
             if (result != MessageBoxWindowView.MessageBoxResult.Yes)
                 return false;
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/DialogBoxes/MapRetileWindowViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/DialogBoxes/MapRetileWindowViewModel.cs
new file mode 100644
index 00000000..507893e3
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/DialogBoxes/MapRetileWindowViewModel.cs
@@ -0,0 +1,42 @@
+namespace RogueEssence.Dev.ViewModels;
+
+public class MapRetileWindowViewModel : ViewModelBase
+{
+    public MapRetileWindowViewModel(int origSize, string msg)
+    {
+        TileSize = origSize;
+        Message = msg;
+    }
+
+    private int tileSize;
+    public int TileSize
+    {
+        get { return tileSize; }
+        set
+        {
+            this.SetIfChanged(ref tileSize, value);
+            AllowConfirm = (tileSize % 8 == 0);
+        }
+    }
+
+    private bool allowConfirm;
+    public bool AllowConfirm
+    {
+        get { return allowConfirm; }
+        set
+        {
+            this.SetIfChanged(ref allowConfirm, value);
+        }
+    }
+
+
+    private string message;
+    public string Message
+    {
+        get { return message; }
+        set
+        {
+            this.SetIfChanged(ref message, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DevControlViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DevControlViewModel.cs
index a6717f8b..ba99aff6 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DevControlViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DevControlViewModel.cs
@@ -18,7 +18,7 @@ public class DevControlViewModel : EditorPageViewModel
 
     public DevControlViewModel(PageFactory pageFactory, TabEvents tabEvents, IDialogService dialogService,
         DevTabGameViewModel game, DevTabPlayerViewModel player, DevTabTravelViewModel travel,
-        DevTabScriptViewModel script) : base(pageFactory, tabEvents, dialogService)
+        DevTabScriptViewModel script, NodeBase node) : base(pageFactory, tabEvents, dialogService)
     {
         Fruits = new TestComboBoxViewModel();
         Game = game;
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DevEditPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DevEditPageViewModel.cs
index 3223dab1..d6ca8204 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DevEditPageViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DevEditPageViewModel.cs
@@ -73,10 +73,7 @@ public DevEditPageViewModel(PageFactory pageFactory, TabEvents tabEvents, IDialo
     {
         var n = node as DataItemNode;
         var nn = node.Parent as DataRootNode;
-        // Console.WriteLine(nn.DataType);
-        // Console.WriteLine(n.ItemKey);
-        // Console.WriteLine(n.Parent.);
-        // Console.WriteLine(node.);
+        var dt = nn.DataType;
     }
 
     public DevEditPageViewModel() : base(new PageFactory(new DesignServiceProvider()),
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/SpeciesEditPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/SpeciesEditPageViewModel.cs
new file mode 100644
index 00000000..ca923256
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/SpeciesEditPageViewModel.cs
@@ -0,0 +1,813 @@
+using RogueEssence.Content;
+using RogueEssence.Data;
+using RogueEssence.Dev.Views;
+
+using Avalonia.Interactivity;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using ReactiveUI;
+using System.Collections.ObjectModel;
+using Avalonia.Controls;
+using RogueEssence.Dungeon;
+using RogueEssence.Data;
+using RogueEssence.Content;
+using System.IO;
+using System.Linq;
+using Avalonia.Media.Imaging;
+using Avalonia.Platform.Storage;
+using Avalonia.Threading;
+using RogueElements;
+using RogueEssence.Dev.Services;
+using RogueEssence.Dev.Views;
+
+namespace RogueEssence.Dev.ViewModels
+{
+    public class SpeciesOpContainer
+    {
+        public Action CommandAction;
+        public CharSheetOp Op;
+        public string Name { get { return Op.Name; } }
+
+        public SpeciesOpContainer(CharSheetOp op, Action command)
+        {
+            Op = op;
+            CommandAction = command;
+        }
+
+        public void Command()
+        {
+            CommandAction();
+        }
+    }
+
+    public class MonsterNodeViewModel : ViewModelBase
+    {
+
+        private bool filled;
+        public bool Filled
+        {
+            get => filled;
+            set => this.SetIfChanged(ref filled, value);
+        }
+
+        private string name;
+        public string Name
+        {
+            get => name;
+            set => this.SetIfChanged(ref name, value);
+        }
+
+        public CharID ID;
+
+        public ObservableCollection<MonsterNodeViewModel> Nodes { get; }
+
+        public MonsterNodeViewModel(string name, CharID id, bool filled)
+        {
+            this.name = name;
+            this.ID = id;
+            this.filled = filled;
+            Nodes = new ObservableCollection<MonsterNodeViewModel>();
+        }
+
+    }
+
+    public class SpeciesEditPageViewModel : EditorPageViewModel
+    {
+        
+        public override string Title => "Species Editor";
+        public override string? UniqueId => "";
+        
+
+        private bool checkSprites;
+        private bool notifiedImport;
+
+        private Window parent;
+
+
+        public string Name
+        {
+            get { return checkSprites ? GraphicsManager.AssetType.Chara.ToString() : GraphicsManager.AssetType.Portrait.ToString(); }
+            set { }
+        }
+
+        private List<string> monsterKeys;
+        private List<string> skinKeys;
+
+        public ObservableCollection<MonsterNodeViewModel> Monsters { get; }
+        public ObservableCollection<SpeciesOpContainer> OpList { get; }
+
+
+        private MonsterNodeViewModel chosenMonster;
+        public MonsterNodeViewModel ChosenMonster
+        {
+            get => chosenMonster;
+            set
+            {
+                this.SetIfChanged(ref chosenMonster, value);
+                CachedPath = null;
+            }
+        }
+
+        //ReImport enabled if CachedPath is not null
+
+        private string cachedPath;
+        public string CachedPath
+        {
+            get => cachedPath;
+            set => this.SetIfChanged(ref cachedPath, value);
+        }
+
+
+        public SpeciesEditPageViewModel(PageFactory pageFactory, TabEvents tabEvents, IDialogService dialogService, OpenEditorNodeWithParams node) : base(pageFactory, tabEvents, dialogService)
+        {
+            Monsters = new ObservableCollection<MonsterNodeViewModel>();
+            OpList = new ObservableCollection<SpeciesOpContainer>();
+            checkSprites = (bool)node.ExtraParams[0];
+            LoadFormDataEntries(checkSprites);
+        }
+
+
+        private bool hasSprite(CharaIndexNode parent, CharID id)
+        {
+            return GraphicsManager.GetFallbackForm(parent, id) == id;
+        }
+
+        private async void applyOpToCharSheet(CharSheetOp op)
+        {
+            //get current sprite
+            CharID currentForm = chosenMonster.ID;
+            string fileName = GetFilename(currentForm.Species);
+            if (!Directory.Exists(Path.GetDirectoryName(fileName)))
+                Directory.CreateDirectory(Path.GetDirectoryName(fileName));
+
+            if (!chosenMonster.Filled)
+            {
+                await MessageBox.Show(parent, String.Format("No graphics exist for {0}.", chosenMonster.Name), "Error", MessageBox.MessageBoxButtons.Ok);
+                return;
+            }
+
+            int[] animOptions = op.Anims;
+            int chosenAnim = -1;
+            if (animOptions.Length > 0)
+            {
+                AnimChoiceWindow window = new AnimChoiceWindow();
+                AnimChoiceViewModel viewModel = new AnimChoiceViewModel(animOptions);
+                window.DataContext = viewModel;
+
+                bool animResult = await window.ShowDialog<bool>(parent);
+                if (!animResult)
+                    return;
+                chosenAnim = animOptions[viewModel.ChosenAnim];
+            }
+
+            DevForm.ExecuteOrPend(() => { tryApplyOpToCharSheet(op, currentForm, fileName, chosenAnim); });
+        }
+
+        private void tryApplyOpToCharSheet(CharSheetOp op, CharID currentForm, string fileName, int chosenAnim)
+        {
+            lock (GameBase.lockObj)
+            {
+                CharSheet sheet = GraphicsManager.GetChara(currentForm);
+
+                op.Apply(sheet, chosenAnim);
+
+                //load data
+                Dictionary<CharID, byte[]> data = LoadSpeciesData(currentForm.Species);
+
+                //write sprite data
+                WriteSpeciesData(data, currentForm, sheet);
+
+                //save data
+                ImportHelper.SaveSpecies(fileName, data);
+
+                GraphicsManager.RebuildIndices(GraphicsManager.AssetType.Chara);
+                GraphicsManager.ClearCaches(GraphicsManager.AssetType.Chara);
+
+
+                DiagManager.Instance.LogInfo(String.Format("{0} applied to: {1}", op.Name, GetFormString(currentForm)));
+            }
+        }
+
+        public void LoadFormDataEntries(bool sprites)
+        {
+            checkSprites = sprites;
+            OpList.Add(new SpeciesOpContainer(new CharSheetDummyOp("Export as Multi Sheet"), ExportMultiSheet));
+            if (sprites)
+            {
+                foreach (CharSheetOp op in DevDataManager.CharSheetOps)
+                    OpList.Add(new SpeciesOpContainer(op, () => applyOpToCharSheet(op)));
+            }
+
+            monsterKeys = DataManager.Instance.DataIndices[DataManager.DataType.Monster].GetMappedKeys();
+            skinKeys = DataManager.Instance.DataIndices[DataManager.DataType.Skin].GetMappedKeys();
+
+            reloadFullList();
+        }
+
+
+        public async void mnuMassImport_Click()
+        {
+            await MessageBox.Show(parent, "Note: Importing a sprite to a slot that is already filled will automatically overwrite the old one.", "Mass Import", MessageBox.MessageBoxButtons.Ok);
+
+            //remember addresses in registry
+            string folderName = DevForm.GetConfig(Name + "Dir", Directory.GetCurrentDirectory());
+
+            //open window to choose directory
+            IStorageFolder directory = await parent.StorageProvider.TryGetFolderFromPathAsync(folderName);
+            await Dispatcher.UIThread.InvokeAsync(async () =>
+            {
+            
+                IReadOnlyList<IStorageFolder> results = await parent.StorageProvider.OpenFolderPickerAsync(
+                    new FolderPickerOpenOptions
+                    {
+                        Title = "Select sprite folder to mass import",
+                        SuggestedStartLocation = directory,
+                        AllowMultiple = false,
+                    });
+
+                if (results.Count <= 0)
+                    return;
+
+                string folder = results.First().Path.LocalPath;
+                
+                DevForm.SetConfig(Name + "Dir", folder);
+                CachedPath = folder + "/";
+
+                try
+                {
+                    MassImport(CachedPath);
+                }
+                catch (Exception ex)
+                {
+                    DiagManager.Instance.LogError(ex, false);
+                    await MessageBox.Show(parent, "Error importing from\n" + CachedPath + "\n\n" + ex.Message, "Import Failed", MessageBox.MessageBoxButtons.Ok);
+                    return;
+                }
+                
+
+
+            });
+        }
+
+        public void mnuMassExportMulti_Click()
+        {
+            MassExportFlow(false);
+        }
+        public void mnuMassExport_Click()
+        {
+            MassExportFlow(true);
+        }
+
+        public async void MassExportFlow(bool singleSheet)
+        {
+            //remember addresses in registry
+            string folderName = DevForm.GetConfig(Name + "Dir", Directory.GetCurrentDirectory());
+
+            //open window to choose directory
+            IStorageFolder directory = await parent.StorageProvider.TryGetFolderFromPathAsync(folderName);
+            await Dispatcher.UIThread.InvokeAsync(async () =>
+            {
+                IReadOnlyList<IStorageFolder> results = await parent.StorageProvider.OpenFolderPickerAsync(
+                    new FolderPickerOpenOptions
+                    {
+                        Title = "Select folder to mass export to",
+                        SuggestedStartLocation = directory,
+                        AllowMultiple = false,
+                    });
+
+                if (results.Count <= 0)
+                    return;
+
+                string folder = results.First().Path.LocalPath;
+                DevForm.SetConfig(Name + "Dir", folder);
+                CachedPath = folder + "/";
+
+                bool success = MassExport(CachedPath, singleSheet);
+                if (!success)
+                    await MessageBox.Show(parent, "Errors found exporting to\n" + CachedPath + "\n\nCheck logs for more info.", "Mass Export Failed", MessageBox.MessageBoxButtons.Ok);
+            });
+        }
+
+        public async void mnuReIndex_Click()
+        {
+            try
+            {
+                ReIndex();
+            }
+            catch (Exception ex)
+            {
+                DiagManager.Instance.LogError(ex, false);
+                await MessageBox.Show(parent, "Error when reindexing.\n\n" + ex.Message, "Reindex Failed", MessageBox.MessageBoxButtons.Ok);
+                return;
+            }
+        }
+
+
+        public async void btnImport_Click()
+        {
+            //get current sprite
+            CharID formdata = chosenMonster.ID;
+
+            if (chosenMonster.Filled)
+            {
+                MessageBox.MessageBoxResult result = await MessageBox.Show(parent, "Are you sure you want to overwrite the existing sheet:\n" + GetFormString(formdata), "Sprite Sheet already exists.",
+                    MessageBox.MessageBoxButtons.YesNo);
+                if (result == MessageBox.MessageBoxResult.No)
+                    return;
+            }
+
+            //notify (once) that sprites need to follow a rigid guideline
+            if (!notifiedImport)
+            {
+                await MessageBox.Show(parent, "When importing sprites, " +
+                    "make sure that all files in each folder adhere to the naming convention.", "Sprite Importing", MessageBox.MessageBoxButtons.Ok);
+                notifiedImport = true;
+            }
+
+            //remember addresses in registry
+            string folderName = DevForm.GetConfig(Name + "Dir", Directory.GetCurrentDirectory());
+
+            //open window to choose directory
+            IStorageFolder directory = await parent.StorageProvider.TryGetFolderFromPathAsync(folderName);
+            await Dispatcher.UIThread.InvokeAsync(async () =>
+            {
+                IReadOnlyList<IStorageFolder> results = await parent.StorageProvider.OpenFolderPickerAsync(
+                    new FolderPickerOpenOptions
+                    {
+                        Title = "Select folder to mass export to",
+                        SuggestedStartLocation = directory,
+                        AllowMultiple = false,
+                    });
+
+                if (results.Count <= 0)
+                    return;
+
+                string folder = results.First().Path.LocalPath;
+                DevForm.SetConfig(Name + "Dir", folder);
+                CachedPath = folder + "/";
+
+                try
+                {
+                    Import(CachedPath, formdata);
+                }
+                catch (Exception ex)
+                {
+                    DiagManager.Instance.LogError(ex, false);
+                    await MessageBox.Show(parent, "Error importing from\n" + CachedPath + "\n\n" + ex.Message, "Import Failed", MessageBox.MessageBoxButtons.Ok);
+                    return;
+                }
+            });
+        }
+
+        public async void btnReImport_Click()
+        {
+            try
+            {
+                Import(CachedPath, chosenMonster.ID);
+            }
+            catch (Exception ex)
+            {
+                DiagManager.Instance.LogError(ex, false);
+                await MessageBox.Show(parent, "Error importing from\n" + CachedPath + "\n\n" + ex.Message, "Import Failed", MessageBox.MessageBoxButtons.Ok);
+                return;
+            }
+        }
+
+        public void ExportMultiSheet()
+        {
+            ExportFlow(false);
+        }
+
+        public void btnExport_Click()
+        {
+            ExportFlow(true);
+        }
+
+        public async void ExportFlow(bool singleSheet)
+        {
+            //get current sprite
+            CharID formdata = chosenMonster.ID;
+
+            if (!chosenMonster.Filled)
+            {
+                await MessageBox.Show(parent, String.Format("No graphics exist for {0}.", chosenMonster.Name), "Error", MessageBox.MessageBoxButtons.Ok);
+                return;
+            }
+
+            //remember addresses in registry
+            string folderName = DevForm.GetConfig(Name + "Dir", Directory.GetCurrentDirectory());
+
+            //open window to choose directory
+            IStorageFolder directory = await parent.StorageProvider.TryGetFolderFromPathAsync(folderName);
+            await Dispatcher.UIThread.InvokeAsync(async () =>
+            {
+                IReadOnlyList<IStorageFolder> results = await parent.StorageProvider.OpenFolderPickerAsync(
+                    new FolderPickerOpenOptions
+                    {
+                        Title = "Select folder to export to",
+                        SuggestedStartLocation = directory,
+                        AllowMultiple = false,
+                    });
+
+                if (results.Count <= 0)
+                    return;
+
+                string folder = results.First().Path.LocalPath;
+                
+                DevForm.SetConfig(Name + "Dir", folder);
+                CachedPath = folder + "/";
+
+                try
+                {
+                    DevForm.ExecuteOrPend(() => { Export(CachedPath, formdata, singleSheet); });
+                }
+                catch (Exception ex)
+                {
+                    DiagManager.Instance.LogError(ex, false);
+                    await MessageBox.Show(parent, "Error exporting to\n" + CachedPath + "\n\n" + ex.Message, "Export Failed", MessageBox.MessageBoxButtons.Ok);
+                    return;
+                }
+            });
+        }
+
+        public async void btnDelete_Click()
+        {
+            if (!chosenMonster.Filled)
+            {
+                await MessageBox.Show(parent, String.Format("No graphics exist for {0}.", chosenMonster.Name), "Error", MessageBox.MessageBoxButtons.Ok);
+                return;
+            }
+
+            //get current sprite
+            CharID formdata = chosenMonster.ID;
+
+            MessageBox.MessageBoxResult result = await MessageBox.Show(parent, "Are you sure you want to delete the following sheet:\n" + GetFormString(formdata), "Delete Sprite Sheet.",
+                MessageBox.MessageBoxButtons.YesNo);
+            if (result == MessageBox.MessageBoxResult.No)
+                return;
+
+            Delete(formdata);
+        }
+
+
+
+
+        private void reloadFullList()
+        {
+            lock (GameBase.lockObj)
+            {
+                Monsters.Clear();
+                CharaIndexNode charaNode = GetIndexNode();
+                for (int ii = 0; ii < monsterKeys.Count; ii++)
+                {
+                    if (monsterKeys[ii] == null) // in case of non continuous index of Dex numbers
+                        continue;
+                    MonsterEntrySummary dex = (MonsterEntrySummary)DataManager.Instance.DataIndices[DataManager.DataType.Monster].Get(monsterKeys[ii]);
+
+                    CharID dexID = new CharID(ii, -1, -1, -1);
+                    MonsterNodeViewModel node = new MonsterNodeViewModel("#" + ii.ToString() + ": " + dex.Name.ToLocal(), dexID, hasSprite(charaNode, dexID));
+                    for (int jj = 0; jj < dex.Forms.Count; jj++)
+                    {
+                        CharID formID = new CharID(ii, jj, -1, -1);
+                        MonsterNodeViewModel formNode = new MonsterNodeViewModel("Form" + jj.ToString() + ": " + dex.Forms[jj].Name.ToLocal(), formID, hasSprite(charaNode, formID));
+                        for (int kk = 0; kk < skinKeys.Count; kk++)
+                        {
+                            SkinData skinData = DataManager.Instance.GetSkin(skinKeys[kk]);
+                            if (!skinData.Challenge)
+                            {
+                                CharID skinID = new CharID(ii, jj, kk, -1);
+                                MonsterNodeViewModel skinNode = new MonsterNodeViewModel(skinData.Name.ToLocal(), skinID, hasSprite(charaNode, skinID));
+                                for (int mm = 0; mm < 3; mm++)
+                                {
+                                    CharID genderID = new CharID(ii, jj, kk, mm);
+                                    MonsterNodeViewModel genderNode = new MonsterNodeViewModel(((Gender)mm).ToString(), genderID, hasSprite(charaNode, genderID));
+                                    skinNode.Nodes.Add(genderNode);
+                                }
+
+                                formNode.Nodes.Add(skinNode);
+                            }
+                        }
+
+                        node.Nodes.Add(formNode);
+                    }
+
+                    Monsters.Add(node);
+                }
+            }
+        }
+
+        private void MassImport(string currentPath)
+        {
+            DevForm.ExecuteOrPend(() => { tryMassImport(currentPath); });
+
+            reloadFullList();
+        }
+
+        private void tryMassImport(string currentPath)
+        {
+            lock (GameBase.lockObj)
+            {
+                string assetPattern = PathMod.HardMod(GetPattern());
+                if (!Directory.Exists(Path.GetDirectoryName(assetPattern)))
+                    Directory.CreateDirectory(Path.GetDirectoryName(assetPattern));
+
+                if (checkSprites)
+                    ImportHelper.ImportAllChars(currentPath, assetPattern);
+                else
+                    ImportHelper.ImportAllPortraits(currentPath, assetPattern);
+
+                GraphicsManager.RebuildIndices(GetAssetType());
+                GraphicsManager.ClearCaches(GetAssetType());
+
+                DiagManager.Instance.LogInfo("Mass import complete.");
+            }
+        }
+
+        private void ReIndex()
+        {
+            DevForm.ExecuteOrPend(() => { tryReIndex(); });
+
+            reloadFullList();
+        }
+
+        private void tryReIndex()
+        {
+            lock (GameBase.lockObj)
+            {
+                GraphicsManager.RebuildIndices(GetAssetType());
+                GraphicsManager.ClearCaches(GetAssetType());
+
+                DiagManager.Instance.LogInfo("All files re-indexed.");
+            }
+        }
+
+        private void Import(string currentPath, CharID currentForm)
+        {
+            DevForm.ExecuteOrPend(() => { tryImport(currentPath, currentForm); });
+
+            chosenMonster.Filled = true;
+        }
+
+        private void tryImport(string currentPath, CharID currentForm)
+        {
+            lock (GameBase.lockObj)
+            {
+                string fileName = GetFilename(currentForm.Species);
+                if (!Directory.Exists(Path.GetDirectoryName(fileName)))
+                    Directory.CreateDirectory(Path.GetDirectoryName(fileName));
+
+                //load data
+                Dictionary<CharID, byte[]> data = LoadSpeciesData(currentForm.Species);
+
+                //write sprite data
+                if (checkSprites)
+                    ImportHelper.BakeCharSheet(currentPath, data, currentForm);
+                else
+                    ImportHelper.BakePortrait(currentPath, data, currentForm);
+
+                //save data
+                ImportHelper.SaveSpecies(fileName, data);
+
+                GraphicsManager.RebuildIndices(GetAssetType());
+                GraphicsManager.ClearCaches(GetAssetType());
+
+
+                DiagManager.Instance.LogInfo("Frames from:\n" +
+                    currentPath +
+                    "\nhave been imported to:" + GetFormString(currentForm));
+            }
+        }
+
+
+        private bool MassExport(string currentPath, bool singleSheet)
+        {
+            bool success = true;
+            CharaIndexNode charaNode = GetIndexNode();
+            foreach (int ii in charaNode.Nodes.Keys)
+            {
+                CharID dexID = new CharID(ii, -1, -1, -1);
+
+                try
+                {
+                    DevForm.ExecuteOrPend(() => { Export(currentPath + ii.ToString("D4") + "/", dexID, singleSheet); });
+                }
+                catch (Exception ex)
+                {
+                    DiagManager.Instance.LogError(ex, false);
+                    success = false;
+                }
+
+                CharaIndexNode formNode = charaNode.Nodes[ii];
+                foreach (int jj in formNode.Nodes.Keys)
+                {
+                    CharID formID = new CharID(ii, jj, -1, -1);
+
+                    try
+                    {
+                        DevForm.ExecuteOrPend(() => { Export(currentPath + ii.ToString("D4") + "/" + jj.ToString("D4") + "/", formID, singleSheet); });
+                    }
+                    catch (Exception ex)
+                    {
+                        DiagManager.Instance.LogError(ex, false);
+                        success = false;
+                    }
+
+                    CharaIndexNode skinNode = formNode.Nodes[jj];
+                    foreach (int kk in skinNode.Nodes.Keys)
+                    {
+                        CharID skinID = new CharID(ii, jj, kk, -1);
+
+                        try
+                        {
+                            DevForm.ExecuteOrPend(() => { Export(currentPath + ii.ToString("D4") + "/" + jj.ToString("D4") + "/" + kk.ToString("D4") + "/", skinID, singleSheet); });
+                        }
+                        catch (Exception ex)
+                        {
+                            DiagManager.Instance.LogError(ex, false);
+                            success = false;
+                        }
+
+                        CharaIndexNode genderNode = skinNode.Nodes[kk];
+                        foreach (int mm in genderNode.Nodes.Keys)
+                        {
+                            CharID genderID = new CharID(ii, jj, kk, mm);
+
+                            try
+                            {
+                                DevForm.ExecuteOrPend(() => { Export(currentPath + ii.ToString("D4") + "/" + jj.ToString("D4") + "/" + kk.ToString("D4") + "/" + mm.ToString("D4") + "/", genderID, singleSheet); });
+                            }
+                            catch (Exception ex)
+                            {
+                                DiagManager.Instance.LogError(ex, false);
+                                success = false;
+                            }
+                        }
+                    }
+                }
+            }
+            return success;
+        }
+
+        private void Export(string currentPath, CharID currentForm, bool singleSheet)
+        {
+            lock (GameBase.lockObj)
+            {
+                if (!Directory.Exists(currentPath))
+                    Directory.CreateDirectory(currentPath);
+
+                CharID fallback = GraphicsManager.GetFallbackForm(GraphicsManager.CharaIndex, currentForm);
+                if (fallback == currentForm)
+                {
+                    if (checkSprites)
+                    {
+                        CharSheet sheet = GraphicsManager.GetChara(currentForm);
+                        CharSheet.Export(sheet, currentPath, singleSheet);
+                    }
+                    else
+                    {
+                        PortraitSheet sheet = GraphicsManager.GetPortrait(currentForm);
+                        PortraitSheet.Export(sheet, currentPath, singleSheet);
+                    }
+
+                    DiagManager.Instance.LogInfo("Frames from:\n" +
+                        GetFormString(currentForm) +
+                        "\nhave been exported to:" + currentPath);
+                }
+            }
+        }
+
+
+        private void Delete(CharID formdata)
+        {
+            DevForm.ExecuteOrPend(() => { tryDelete(formdata); });
+
+            chosenMonster.Filled = false;
+        }
+
+        private void tryDelete(CharID formdata)
+        {
+            lock (GameBase.lockObj)
+            {
+                string fileName = GetFilename(formdata.Species);
+                if (!Directory.Exists(Path.GetDirectoryName(fileName)))
+                    Directory.CreateDirectory(Path.GetDirectoryName(fileName));
+
+                Dictionary<CharID, byte[]> data = LoadSpeciesData(formdata.Species);
+
+                //delete sprite data
+                data.Remove(formdata);
+
+                //save data
+                ImportHelper.SaveSpecies(fileName, data);
+
+                GraphicsManager.RebuildIndices(GetAssetType());
+                GraphicsManager.ClearCaches(GetAssetType());
+
+                DiagManager.Instance.LogInfo("Deleted frames for:" + GetFormString(formdata));
+            }
+        }
+
+        private void WriteSpeciesData(Dictionary<CharID, byte[]> spriteData, CharID formData, CharSheet sprite)
+        {
+            using (MemoryStream stream = new MemoryStream())
+            {
+                using (BinaryWriter writer = new BinaryWriter(stream))
+                    sprite.Save(writer);
+
+                byte[] writingBytes = stream.ToArray();
+                spriteData[formData] = writingBytes;
+            }
+        }
+
+        private Dictionary<CharID, byte[]> LoadSpeciesData(int num)
+        {
+            Dictionary<CharID, byte[]> dict = new Dictionary<CharID, byte[]>();
+
+            CharaIndexNode charaNode = GetIndexNode();
+
+            if (charaNode.Nodes.ContainsKey(num))
+            {
+                if (charaNode.Nodes[num].Position > 0)
+                    LoadSpeciesFormData(dict, new CharID(num, -1, -1, -1));
+
+                foreach (int form in charaNode.Nodes[num].Nodes.Keys)
+                {
+                    if (charaNode.Nodes[num].Nodes[form].Position > 0)
+                        LoadSpeciesFormData(dict, new CharID(num, form, -1, -1));
+
+                    foreach (int skin in charaNode.Nodes[num].Nodes[form].Nodes.Keys)
+                    {
+                        if (charaNode.Nodes[num].Nodes[form].Nodes[skin].Position > 0)
+                            LoadSpeciesFormData(dict, new CharID(num, form, skin, -1));
+
+                        foreach (int gender in charaNode.Nodes[num].Nodes[form].Nodes[skin].Nodes.Keys)
+                        {
+                            if (charaNode.Nodes[num].Nodes[form].Nodes[skin].Nodes[gender].Position > 0)
+                                LoadSpeciesFormData(dict, new CharID(num, form, skin, gender));
+                        }
+                    }
+                }
+            }
+
+            return dict;
+        }
+
+        private void LoadSpeciesFormData(Dictionary<CharID, byte[]> data, CharID formData)
+        {
+            using (MemoryStream stream = new MemoryStream())
+            {
+                using (BinaryWriter writer = new BinaryWriter(stream))
+                {
+                    if (checkSprites)
+                        GraphicsManager.GetChara(formData).Save(writer);
+                    else
+                        GraphicsManager.GetPortrait(formData).Save(writer);
+                }
+                byte[] writingBytes = stream.ToArray();
+                data[formData] = writingBytes;
+            }
+        }
+
+        private string GetFormString(CharID formdata)
+        {
+            string name = DataManager.Instance.DataIndices[DataManager.DataType.Monster].Get(monsterKeys[formdata.Species]).Name.ToLocal();
+            if (formdata.Form > -1)
+                name += ", " + DataManager.Instance.GetMonster(monsterKeys[formdata.Species]).Forms[formdata.Form].FormName.ToLocal() + " form";
+            if (formdata.Skin > -1)
+                name += ", " + DataManager.Instance.DataIndices[DataManager.DataType.Skin].Get(skinKeys[formdata.Skin]).Name.ToLocal() + " skin";
+            if (formdata.Gender > -1)
+                name += ", " + (Gender)formdata.Gender + " gender";
+            return name;
+        }
+
+        private CharaIndexNode GetIndexNode()
+        {
+            if (checkSprites)
+                return GraphicsManager.CharaIndex;
+            else
+                return GraphicsManager.PortraitIndex;
+        }
+
+        private string GetFilename(int num)
+        {
+            return PathMod.HardMod(String.Format(GetPattern(), num));
+        }
+
+        private string GetPattern()
+        {
+            if (checkSprites)
+                return GraphicsManager.CHARA_PATTERN;
+            else
+                return GraphicsManager.PORTRAIT_PATTERN;
+        }
+
+        private GraphicsManager.AssetType GetAssetType()
+        {
+            if (checkSprites)
+                return GraphicsManager.AssetType.Chara;
+            else
+                return GraphicsManager.AssetType.Portrait;
+        }
+    }
+}
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/ModSwitcherViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/ModSwitcherViewModel.cs
index db636bf9..7d212aec 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/ModSwitcherViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/ModSwitcherViewModel.cs
@@ -67,12 +67,7 @@ public void CloseSwitcher()
     
     public async Task<MessageBoxWindowView.MessageBoxResult> ConfirmModSwitchAsync()
     {
-        return await MessageBoxWindowView.Show(
-            "The game will be reloaded to use content from the new path. Click OK to proceed. Your changes will not be saved.",
-            "Are you sure?",
-            MessageBoxWindowView.MessageBoxButtons.OkCancel,
-            _dialogService
-        );
+        return await MessageBoxWindowView.Show(_dialogService, "The game will be reloaded to use content from the new path. Click OK to proceed. Your changes will not be saved.", "Are you sure?", MessageBoxWindowView.MessageBoxButtons.OkCancel);
     }
     
     public Models.ModHeader CurrentMod
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/ISpriteOperationStrategy.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/ISpriteOperationStrategy.cs
new file mode 100644
index 00000000..14fe3522
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/ISpriteOperationStrategy.cs
@@ -0,0 +1,14 @@
+using System.Threading.Tasks;
+
+namespace RogueEssence.Dev.ViewModels;
+
+public interface ISpriteOperationStrategy
+{
+    Task<NodeBase> AddAsync();
+    Task DeleteAsync(DataItemNode node);
+    Task MassExportAsync();
+    Task MassImportAsync();
+    Task ExportAsync(DataItemNode node);
+    Task ImportAsync(DataItemNode node);
+    Task ReImportAsync();
+}
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/NodeBase.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/NodeBase.cs
similarity index 75%
rename from RogueEssence.Editor.Avalonia/ViewModels/New/NodeBase.cs
rename to RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/NodeBase.cs
index 95afd032..4312fc64 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/NodeBase.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/NodeBase.cs
@@ -1,6 +1,9 @@
 using System;
+using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.Diagnostics;
+using System.IO;
+using System.Linq;
 using System.Reactive;
 using System.Reactive.Linq;
 using System.Threading.Tasks;
@@ -9,8 +12,11 @@
 using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Platform.Storage;
+using Avalonia.ReactiveUI;
+using Avalonia.Threading;
 using RogueEssence.Dev.Services;
 using ReactiveUI;
+using RogueEssence.Content;
 using RogueEssence.Data;
 using RogueEssence.Dev.Views;
 
@@ -120,6 +126,22 @@ public OpenEditorNode(string title, string? icon = null, string editorKey = "")
     }
 }
 
+public class OpenEditorNodeWithParams : OpenEditorNode
+{
+    public object[] ExtraParams { get; }
+
+    public OpenEditorNodeWithParams(
+        string title,
+        string? icon = null,
+        string editorKey = "",
+        params object[] extraParams)
+        : base(title, icon ?? "", editorKey)
+    {
+        ExtraParams = extraParams;
+    }
+}
+
+
 public abstract class ItemRootNode : OpenEditorNode
 {
     protected readonly IDialogService _dialogService;
@@ -192,13 +214,8 @@ private async Task DeleteItemAsync(DataItemNode? node)
         if (node is null)
             return;
 
-        var res = await MessageBoxWindowView.Show(
-            $"Deleting {node.ItemKey} will reset it back to the base game.",
-            $"Delete {node.ItemKey}",
-            MessageBoxWindowView.MessageBoxButtons.YesNo,
-            _dialogService,
-            true
-        );
+        var res = await MessageBoxWindowView.Show(_dialogService,
+            $"Deleting {node.ItemKey} will reset it back to the base game.", $"Delete {node.ItemKey}", MessageBoxWindowView.MessageBoxButtons.YesNo, true);
 
         if (res != MessageBoxWindowView.MessageBoxResult.Yes)
             return;
@@ -259,13 +276,13 @@ public class DataItemNode : OpenEditorNode
 {
     public string ItemKey { get; }
 
-    private string _value = "";
-
-    public string Value
-    {
-        get => _value;
-        set => this.RaiseAndSetIfChanged(ref _value, value);
-    }
+    // private string _value = "";
+    //
+    // public string Value
+    // {
+    //     get => _value;
+    //     set => this.RaiseAndSetIfChanged(ref _value, value);
+    // }
 
     // private bool _editorKey = false;
     // public bool EditorKey
@@ -283,8 +300,9 @@ public DataItemNode(string itemKey, string editorKey, string? title, string? ico
 
 public class SpriteRootNode : ItemRootNode
 {
-    private readonly string _dataType;
-    private readonly string _key;
+    private readonly ISpriteOperationStrategy _strategy;
+    
+    public readonly GraphicsManager.AssetType AssetType;
     private readonly NodeFactory _nodeFactory;
     private readonly IDialogService _dialogService;
 
@@ -295,21 +313,38 @@ public class SpriteRootNode : ItemRootNode
     public ReactiveCommand<Unit, Unit> MassImportCommand { get; }
     public ReactiveCommand<DataItemNode, Unit> ExportCommand { get; }
     public ReactiveCommand<DataItemNode, Unit> ImportCommand { get; }
-    public ReactiveCommand<DataItemNode, Unit> ReImportCommand { get; }
+    public ReactiveCommand<Unit, Unit> ReImportCommand { get; }
 
+    private string _cachedPath;
+    public string CachedPath
+    {
+        get => _cachedPath;
+        set => this.RaiseAndSetIfChanged(ref _cachedPath, value);
+    }
+
+    
     public SpriteRootNode(
         IDialogService dialogService,
         NodeFactory nodeFactory,
-        string dataType,
+        GraphicsManager.AssetType assetType,
         string editorKey,
         string title,
         string? icon = null)
         : base(title, icon ?? "", editorKey)
     {
-        _dataType = dataType;
-        _key = editorKey;
-        _dialogService = dialogService;
-        _nodeFactory = nodeFactory;
+        AssetType = assetType;
+        // _dialogService = dialogService;
+        // _nodeFactory = nodeFactory;
+
+        if (AssetType == GraphicsManager.AssetType.Tile)
+        {
+            _strategy = new SpriteTileStrategy(dialogService, nodeFactory, this);
+        }
+        else
+        {
+            _strategy = new SpriteAssetTypeStrategy(dialogService, nodeFactory, this);
+            
+        }
 
         AddCommand = ReactiveCommand.CreateFromTask(AddSpriteAsync);
         DeleteCommand = ReactiveCommand.CreateFromTask<DataItemNode>(DeleteSpriteAsync);
@@ -317,72 +352,110 @@ public SpriteRootNode(
         MassImportCommand = ReactiveCommand.CreateFromTask(MassImportAsync);
         ExportCommand = ReactiveCommand.CreateFromTask<DataItemNode>(ExportSpriteAsync);
         ImportCommand = ReactiveCommand.CreateFromTask<DataItemNode>(ImportSpriteAsync);
-        ReImportCommand = ReactiveCommand.CreateFromTask<DataItemNode>(ReImportSpriteAsync);
+        ReImportCommand = ReactiveCommand.CreateFromTask(ReImportSpriteAsync);
     }
 
     private async Task AddSpriteAsync()
     {
-        var vm = new RenameWindowViewModel();
-        bool result = await _dialogService.ShowDialogAsync<RenameWindowViewModel, bool>(vm, "Add sprite ID");
-
-        if (!result)
-            return;
-
-        var node = _nodeFactory.CreateDataItemNode(vm.Name, "SpriteEditor", vm.Name + ":", "Icons.PaintBrushFill");
-        SubNodes.Add(node);
-        IsExpanded = true;
+        var node = await _strategy.AddAsync();
+        if (node != null)
+        {
+            SubNodes.Add(node);
+            IsExpanded = true;
+        }
 
-        Console.WriteLine($"[SpriteRootNode] Added sprite: {vm.Name}");
     }
 
     private async Task DeleteSpriteAsync(DataItemNode node)
     {
-        var res = await MessageBoxWindowView.Show(
-            $"Delete sprite '{node.Title}'?",
-            "Deleting Sprite",
-            MessageBoxWindowView.MessageBoxButtons.YesNo,
-            _dialogService, true);
-
-        if (res != MessageBoxWindowView.MessageBoxResult.Yes)
-            return;
-
-        SubNodes.Remove(node);
-        Console.WriteLine($"[SpriteRootNode] Deleted sprite: {node.Title}");
+        await _strategy.DeleteAsync(node);
     }
 
     private async Task MassExportAsync()
     {
-        var x = await _dialogService.ShowFolderPickerAsync(new FolderPickerOpenOptions()
-        {
-            AllowMultiple = true,
-            Title = "Select a folder to mass export to"
-        });
-        Console.WriteLine("[SpriteRootNode] Mass export triggered (TODO: implement export logic).");
-        await Task.CompletedTask;
+        await _strategy.MassExportAsync();
     }
 
     private async Task MassImportAsync()
     {
-        Console.WriteLine("[SpriteRootNode] Mass import triggered (TODO: implement import logic).");
-        await Task.CompletedTask;
+        await _strategy.MassImportAsync();
     }
 
     private async Task ExportSpriteAsync(DataItemNode node)
     {
-        Console.WriteLine($"[SpriteRootNode] Exporting sprite: {node.Title}");
-        await Task.CompletedTask;
+        await _strategy.ExportAsync(node);
     }
 
     private async Task ImportSpriteAsync(DataItemNode node)
     {
-        Console.WriteLine($"[SpriteRootNode] Importing sprite: {node.Title}");
-        await Task.CompletedTask;
+        await _strategy.ImportAsync(node);
     }
 
-    private async Task ReImportSpriteAsync(DataItemNode node)
+    private async Task ReImportSpriteAsync()
+    {
+        await _strategy.ReImportAsync();
+    }
+}
+
+public class SpriteTileRootNode : SpriteRootNode
+{
+    private readonly NodeFactory _nodeFactory;
+    private readonly IDialogService _dialogService;
+    public ReactiveCommand<Unit, Unit> ReIndexCommand { get; }
+
+    public SpriteTileRootNode(IDialogService dialogService, NodeFactory nodeFactory, string editorKey, string title, string? icon = null)
+        : base(dialogService, nodeFactory, GraphicsManager.AssetType.Tile, editorKey, title, icon)
     {
-        Console.WriteLine($"[SpriteRootNode] Re-importing sprite: {node.Title}");
-        await Task.CompletedTask;
+        _nodeFactory = nodeFactory;
+        _dialogService = dialogService;
+        ReIndexCommand = ReactiveCommand.CreateFromTask(ReIndexAsync);
+    }
+    
+    private async Task ReIndexAsync()
+    {
+        try
+        {
+            _reIndex();
+        }
+        catch (Exception ex)
+        {
+            DiagManager.Instance.LogError(ex, false);
+            await MessageBoxWindowView.Show(_dialogService, "Error when reindexing.\n\n" + ex.Message, "Reindex Failed", MessageBoxWindowView.MessageBoxButtons.Ok);
+            return;
+        }
+    }
+    
+    private void _reloadFullList()
+    {
+        Console.WriteLine("TODO: Reuse this... This is already identical to SpriteTileStrategy...");
+        lock (GameBase.lockObj)
+        {
+            SubNodes.Clear();
+            foreach (string name in GraphicsManager.TileIndex.Nodes.Keys)
+            {
+                SubNodes.Add(
+                    _nodeFactory.CreateDataItemNode(name, "", name + ":", this.AssetType.GetIcon())
+                );
+            }
+        }
+    }
+
+    private void _reIndex()
+    {
+        DevForm.ExecuteOrPend(() => { _tryReIndex(); });
+
+        _reloadFullList();
+    }
+
+    private void _tryReIndex()
+    {
+        lock (GameBase.lockObj)
+        {
+            GraphicsManager.RebuildIndices(GraphicsManager.AssetType.Tile);
+            GraphicsManager.ClearCaches(GraphicsManager.AssetType.Tile);
+
+            DiagManager.Instance.LogInfo("All files re-indexed.");
+        }
     }
 }
 
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/SpriteAssetTypeStrategy.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/SpriteAssetTypeStrategy.cs
new file mode 100644
index 00000000..dd1e53f5
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/SpriteAssetTypeStrategy.cs
@@ -0,0 +1,382 @@
+using System;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using Avalonia.Platform.Storage;
+using Avalonia.Threading;
+using RogueEssence.Content;
+using RogueEssence.Dev.Services;
+using RogueEssence.Dev.Views;
+
+namespace RogueEssence.Dev.ViewModels;
+
+public class SpriteAssetTypeStrategy : ISpriteOperationStrategy
+{
+    private readonly IDialogService _dialogService;
+    private readonly NodeFactory _nodeFactory;
+    private readonly SpriteRootNode _spriteRootNode;
+    
+    
+    private void _export(string currentPath, string anim)
+    {
+        lock (GameBase.lockObj)
+        {
+            string animPath = PathMod.ModPath(String.Format(GraphicsManager.GetPattern(_spriteRootNode.AssetType), anim));
+            if (File.Exists(animPath))
+            {
+                //read file and read binary data
+                using (FileStream fileStream = File.OpenRead(animPath))
+                {
+                    using (BinaryReader reader = new BinaryReader(fileStream))
+                    {
+                        DirSheet sheet = DirSheet.Load(reader);
+
+                        string filename = DirSheet.GetExportString(sheet, Path.GetFileNameWithoutExtension(currentPath));
+                        string dirname = Path.GetDirectoryName(currentPath);
+                        DirSheet.Export(sheet, Path.Combine(dirname, filename + ".png"));
+                    }
+                }
+            }
+
+            DiagManager.Instance.LogInfo("Frames from:\n" +
+                                         anim +
+                                         "\nhave been exported to:" + currentPath);
+        }
+    }
+    
+    private bool _massExport(string currentPath, GraphicsManager.AssetType assetType)
+    {
+        bool success = true;
+        string assetPattern = GraphicsManager.GetPattern(assetType);
+        string[] dirs = PathMod.GetModFiles(Path.GetDirectoryName(assetPattern), String.Format(Path.GetFileName(assetPattern), "*"));
+        for (int ii = 0; ii < dirs.Length; ii++)
+        {
+            try
+            {
+                string filename = Path.GetFileNameWithoutExtension(dirs[ii]);
+                DevForm.ExecuteOrPend(() => { _export(currentPath + filename, filename); });
+            }
+            catch (Exception ex)
+            {
+                DiagManager.Instance.LogError(ex, false);
+                success = false;
+            }
+        }
+        return success;
+    }
+
+    public SpriteAssetTypeStrategy(IDialogService dialogService, NodeFactory nodeFactory, SpriteRootNode spriteRootNode)
+    {
+        _dialogService = dialogService;
+        _nodeFactory = nodeFactory;
+        _spriteRootNode = spriteRootNode;
+    }
+
+    public async Task<NodeBase> AddAsync()
+    {
+        
+        Console.WriteLine("TODO: Resolve this later...");
+        var vm = new RenameWindowViewModel();
+        bool result = await _dialogService.ShowDialogAsync<RenameWindowViewModel, bool>(
+            vm, "Add sprite ID");
+
+        if (!result) return null;
+
+        return _nodeFactory.CreateDataItemNode(
+            vm.Name, "SpriteEditor", vm.Name + ":", "Icons.PaintBrushFill");
+    }
+
+    public async Task DeleteAsync(DataItemNode node)
+    {
+        var res = await MessageBoxWindowView.Show(_dialogService, $"Delete sprite '{node.Title}'?", "Deleting Sprite", MessageBoxWindowView.MessageBoxButtons.YesNo, true);
+
+        var assetType = _spriteRootNode.AssetType;
+        if (res == MessageBoxWindowView.MessageBoxResult.Yes)
+        {
+            lock (GameBase.lockObj)
+            {
+                string anim = node.ItemKey;
+                string animPath = PathMod.ModPath(String.Format(GraphicsManager.GetPattern(assetType), anim));
+                if (File.Exists(animPath))
+                    File.Delete(animPath);
+
+                GraphicsManager.RebuildIndices(assetType);
+                GraphicsManager.ClearCaches(assetType);
+
+                DiagManager.Instance.LogInfo("Deleted frames for:" + anim);
+                _spriteRootNode.SubNodes.Remove(node);
+            }
+            
+        }
+    }
+
+
+    public async Task MassExportAsync()
+    {
+        string name = _spriteRootNode.AssetType.ToString();
+        
+        //remember addresses in registry
+        string folderName = DevForm.GetConfig(name+ "Dir", Directory.GetCurrentDirectory());
+
+        
+        //open window to choose directory
+        await Dispatcher.UIThread.InvokeAsync(async () =>
+        {
+            var options = new FolderPickerOpenOptions
+            {
+                Title = "Select folder to mass export to",
+                AllowMultiple = false,
+            };
+            var folder = await _dialogService.ShowFolderPickerAsync(options, folderName);
+            if (folder == null) return;
+
+            DevForm.SetConfig(name + "Dir", folder);
+            _spriteRootNode.CachedPath = folder + "/";
+
+
+            bool success = _massExport(_spriteRootNode.CachedPath, _spriteRootNode.AssetType);
+            if (!success)
+            {
+                await MessageBoxWindowView.Show(_dialogService, "Errors found exporting to\n" + _spriteRootNode.CachedPath + "\n\nCheck logs for more info.", "Mass Export Failed", MessageBoxWindowView.MessageBoxButtons.Ok);
+            }
+        });
+    }
+
+    public async Task MassImportAsync()
+    {
+        await MessageBoxWindowView.Show(_dialogService, "Note: Importing a sprite to a slot that is already filled will automatically overwrite the old one.", "Mass Import", MessageBoxWindowView.MessageBoxButtons.Ok);
+        string name = _spriteRootNode.AssetType.ToString();
+        
+        //remember addresses in registry
+        string folderName = DevForm.GetConfig(name + "Dir", Directory.GetCurrentDirectory());
+
+        var options = new FolderPickerOpenOptions
+        {
+            Title = "Select folder to mass import",
+            AllowMultiple = false,
+        };
+        var result = await _dialogService.ShowFolderPickerAsync(options, folderName);
+
+        if (result == null) return;
+        
+        DevForm.SetConfig(name + "Dir", result);
+        _spriteRootNode.CachedPath = result + "/";
+        
+        try
+        {
+            MassImport(_spriteRootNode.CachedPath);
+        }
+        catch (Exception ex)
+        {
+            DiagManager.Instance.LogError(ex, false);
+            
+            await MessageBoxWindowView.Show(_dialogService, "Error importing from\n" + _spriteRootNode.CachedPath + "\n\n" + ex.Message, "Import Failed", MessageBoxWindowView.MessageBoxButtons.Ok);
+        }
+        
+    }
+    
+    private void _recomputeAnimList()
+    {
+        lock (GameBase.lockObj)
+        {
+            _spriteRootNode.SubNodes.Clear();
+            GraphicsManager.AssetType assetType = _spriteRootNode.AssetType;
+            string assetPattern = GraphicsManager.GetPattern(assetType);
+            string[] dirs = PathMod.GetModFiles(Path.GetDirectoryName(assetPattern), String.Format(Path.GetFileName(assetPattern), "*"));
+            for (int ii = 0; ii < dirs.Length; ii++)
+            {
+                string filename = Path.GetFileNameWithoutExtension(dirs[ii]);
+                _spriteRootNode.SubNodes.Add(_nodeFactory.CreateDataItemNode(filename, "", filename, "Icons.PaintBrushFill"));
+            }
+        }
+    }
+    
+    private void _import(string currentPath)
+    {
+        DevForm.ExecuteOrPend(() => { _tryImport(currentPath); });
+
+        //recompute
+        _recomputeAnimList();
+    }
+
+    private void _tryImport(string currentPath)
+    {
+        lock (GameBase.lockObj)
+        {
+            GraphicsManager.AssetType assetType = _spriteRootNode.AssetType;
+            string assetPattern = GraphicsManager.GetPattern(assetType);
+            string destFile;
+            string animName = Path.GetFileNameWithoutExtension(currentPath);
+            if (Directory.Exists(currentPath))
+                destFile = PathMod.HardMod(String.Format(assetPattern, animName));
+            else
+            {
+                string[] components = animName.Split('.');
+                if (components.Length != 2)
+                    throw new ArgumentException(
+                        "The input filename does not fit the convention of \"<Anim Name>.<Anim Type>.png\"!");
+                destFile = PathMod.HardMod(String.Format(assetPattern, components[0]));
+            }
+
+            if (!Directory.Exists(Path.GetDirectoryName(destFile)))
+                Directory.CreateDirectory(Path.GetDirectoryName(destFile));
+
+            //write sprite data
+            using (DirSheet sheet = DirSheet.Import(currentPath))
+            {
+                using (FileStream stream = File.OpenWrite(destFile))
+                {
+                    //save data
+                    using (BinaryWriter writer = new BinaryWriter(stream))
+                        sheet.Save(writer);
+                }
+            }
+
+            GraphicsManager.RebuildIndices(assetType);
+            GraphicsManager.ClearCaches(assetType);
+
+            DiagManager.Instance.LogInfo("Frames from:\n" +
+                                         currentPath + "\nhave been imported.");
+        }
+    }
+
+
+    private void MassImport(string currentPath)
+    {
+        DevForm.ExecuteOrPend(() => { _tryMassImport(currentPath); });
+        //recompute
+        _recomputeAnimList();
+    }
+    private void _tryMassImport(string currentPath)
+    {
+        lock (GameBase.lockObj)
+        {
+            GraphicsManager.AssetType assetType = _spriteRootNode.AssetType;
+            string assetPattern = GraphicsManager.GetPattern(assetType);
+            if (!Directory.Exists(Path.GetDirectoryName(PathMod.HardMod(assetPattern))))
+                Directory.CreateDirectory(Path.GetDirectoryName(PathMod.HardMod(assetPattern)));
+            ImportHelper.ImportAllNameDirs(currentPath, PathMod.HardMod(assetPattern));
+
+            GraphicsManager.RebuildIndices(assetType);
+            GraphicsManager.ClearCaches(assetType);
+
+            DiagManager.Instance.LogInfo("Mass import complete.");
+        }
+    }
+
+    public async Task ExportAsync(DataItemNode node)
+    {
+        string name = _spriteRootNode.AssetType.ToString();
+        string folderName = DevForm.GetConfig(name + "Dir", Directory.GetCurrentDirectory());
+        var options = new FilePickerSaveOptions
+        {
+            Title = "Export PNG",
+            DefaultExtension = "png",
+            FileTypeChoices =
+            [
+                new FilePickerFileType("PNG Files")
+                {
+                    Patterns = new[] { "*.png" }
+                }
+            ]
+        };
+
+        await Dispatcher.UIThread.InvokeAsync(async () =>
+        {
+
+            var filePath = await _dialogService.TryGetSaveFileAsync(options, folderName);
+            if (!String.IsNullOrEmpty(filePath))
+            {
+                DevForm.SetConfig(name + "Dir", Path.GetDirectoryName(filePath));
+
+                try
+                {
+                    DevForm.ExecuteOrPend(() => { _export(filePath, node.ItemKey); });
+                }
+                catch (Exception ex)
+                {
+                    DiagManager.Instance.LogError(ex, false);
+
+
+                    await MessageBoxWindowView.Show(_dialogService, $"Error exporting to\n{filePath}\n\n{ex.Message}", "Export Failed", MessageBoxWindowView.MessageBoxButtons.Ok);
+                }
+            }
+        });
+
+    }
+
+    public async Task ImportAsync(DataItemNode _)
+    {
+        string name = _spriteRootNode.AssetType.ToString();
+        string folderName = DevForm.GetConfig(name + "Dir", Directory.GetCurrentDirectory());
+        var options = new FilePickerOpenOptions
+        {
+            Title = "Open .png or .xml File",
+            AllowMultiple = false,
+            FileTypeFilter =
+            [
+                new FilePickerFileType("PNG Files")
+                {
+                    Patterns = ["*.png"]
+                },
+                new FilePickerFileType("DirData XML")
+                {
+                    Patterns = ["*.xml"]
+                }
+            ]
+        };
+        await Dispatcher.UIThread.InvokeAsync(async () =>
+        {
+
+            var filePath = await _dialogService.ShowFilePickerAsync(options, folderName);
+
+            if (filePath != null)
+            {
+                string animName = Path.GetFileNameWithoutExtension(filePath);
+                if (_spriteRootNode.SubNodes.Any(n => n.Title == animName))
+                {
+
+                    MessageBoxWindowView.MessageBoxResult result = await MessageBoxWindowView.Show(_dialogService, "Are you sure you want to overwrite the existing sheet:\n" + animName, "Sprite Sheet already exists.", MessageBoxWindowView.MessageBoxButtons.YesNo);
+                    if (result == MessageBoxWindowView.MessageBoxResult.No)
+                        return;
+                }
+
+                DevForm.SetConfig(name + "Dir", Path.GetDirectoryName(filePath));
+                if (Path.GetExtension(filePath) == ".xml")
+                    _spriteRootNode.CachedPath = Path.GetDirectoryName(filePath);
+                else
+                    _spriteRootNode.CachedPath = filePath;
+
+                try
+                {
+                    _import(_spriteRootNode.CachedPath);
+                }
+                catch (Exception ex)
+                {
+                    DiagManager.Instance.LogError(ex, false);
+                    await MessageBoxWindowView.Show(_dialogService, "Error importing from\n" + _spriteRootNode.CachedPath + "\n\n" + ex.Message, "Import Failed", MessageBoxWindowView.MessageBoxButtons.Ok);
+                    return;
+                }
+
+            }
+        });
+    }
+
+    public async Task ReImportAsync()
+    {
+        await Dispatcher.UIThread.InvokeAsync(async () =>
+        {
+            try
+            {
+                _import(_spriteRootNode.CachedPath);
+            }
+            catch (Exception ex)
+            {
+                DiagManager.Instance.LogError(ex, false);
+                await MessageBoxWindowView.Show(_dialogService, "Error importing from\n" + _spriteRootNode.CachedPath + "\n\n" + ex.Message, "Import Failed", MessageBoxWindowView.MessageBoxButtons.Ok);
+                return;
+            }
+
+        });
+    }
+}
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/SpriteTileStrategy.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/SpriteTileStrategy.cs
new file mode 100644
index 00000000..2d2b65e6
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/SpriteTileStrategy.cs
@@ -0,0 +1,376 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using Avalonia.Controls;
+using Avalonia.Platform.Storage;
+using Avalonia.Threading;
+using RogueEssence;
+using RogueEssence.Content;
+using RogueEssence.Dev;
+using RogueEssence.Dev.Services;
+using RogueEssence.Dev.ViewModels;
+using RogueEssence.Dev.Views;
+
+namespace RogueEssence.Dev.ViewModels;
+
+public class SpriteTileStrategy : ISpriteOperationStrategy
+{
+    private int _cachedSize;
+
+    private readonly IDialogService _dialogService;
+    private readonly NodeFactory _nodeFactory;
+    private readonly SpriteRootNode _spriteRootNode;
+
+    public SpriteTileStrategy(IDialogService dialogService, NodeFactory nodeFactory, SpriteRootNode spriteRootNode)
+    {
+        _dialogService = dialogService;
+        _nodeFactory = nodeFactory;
+        _spriteRootNode = spriteRootNode;
+    }
+
+    public async Task<NodeBase> AddAsync()
+    {
+        var vm = new RenameWindowViewModel();
+        bool result = await _dialogService.ShowDialogAsync<RenameWindowViewModel, bool>(
+            vm, "Add sprite ID");
+
+        if (!result) return null;
+
+        return _nodeFactory.CreateDataItemNode(
+            vm.Name, "SpriteEditor", vm.Name + ":", "Icons.PaintBrushFill");
+    }
+
+    public async Task DeleteAsync(DataItemNode node)
+    {
+        var res = await MessageBoxWindowView.Show(_dialogService, $"Delete sprite '{node.Title}'?", "Deleting Sprite",
+            MessageBoxWindowView.MessageBoxButtons.YesNo, true);
+
+        if (res == MessageBoxWindowView.MessageBoxResult.Yes)
+        {
+            lock (GameBase.lockObj)
+            {
+                string anim = node.ItemKey;
+
+                string animPath = PathMod.ModPath(String.Format(GraphicsManager.TILE_PATTERN, anim));
+                if (File.Exists(animPath))
+                    File.Delete(animPath);
+
+                GraphicsManager.RebuildIndices(GraphicsManager.AssetType.Tile);
+                GraphicsManager.ClearCaches(GraphicsManager.AssetType.Tile);
+
+                DiagManager.Instance.LogInfo("Deleted frames for:" + anim);
+
+                _spriteRootNode.SubNodes.Remove(node);
+            }
+        }
+    }
+
+    public async Task MassExportAsync()
+    {
+        //remember addresses in registry
+        string folderName = DevForm.GetConfig("TilesetDir", Directory.GetCurrentDirectory());
+
+   
+        //open window to choose directory
+        var options = new FolderPickerOpenOptions
+        {
+            Title = "Select folder to mass export to",
+            AllowMultiple = false,
+        };
+        
+        await Dispatcher.UIThread.InvokeAsync(async () =>
+        {
+            var folder = await _dialogService.ShowFolderPickerAsync(options, folderName);
+
+            if (folder == null)
+                return;
+            
+            DevForm.SetConfig("TilesetDir", folder);
+            _spriteRootNode.CachedPath = folder + "/";
+
+            bool success = _massExport(_spriteRootNode.CachedPath);
+            if (!success)
+                await MessageBoxWindowView.Show(_dialogService, "Errors found exporting to\n" + _spriteRootNode.CachedPath + "\n\nCheck logs for more info.", "Mass Export Failed", MessageBoxWindowView.MessageBoxButtons.Ok);
+        });
+    }
+
+    public async Task MassImportAsync()
+    {
+        await MessageBoxWindowView.Show(_dialogService,
+            "Note: Importing a tileset to a slot that is already filled will automatically overwrite the old one.",
+            "Mass Import", MessageBoxWindowView.MessageBoxButtons.Ok);
+
+        //remember addresses in registry
+        string folderName = DevForm.GetConfig("TilesetDir", Directory.GetCurrentDirectory());
+
+        //open window to choose directory
+        var options = new FolderPickerOpenOptions
+        {
+            Title = "Select tileset folder to mass import",
+            AllowMultiple = false,
+        };
+
+        // IStorageFolder directory = await parent.StorageProvider.TryGetFolderFromPathAsync(folderName);
+        await Dispatcher.UIThread.InvokeAsync(async () =>
+        {
+            var folder = await _dialogService.ShowFolderPickerAsync(options, folderName);
+
+            // string folder = results.First().Path.LocalPath;
+
+            MapRetileViewModel viewModel =
+                new MapRetileViewModel(GraphicsManager.TileSize, "Tile size must be divisible by 8.");
+            bool sizeResult = await _dialogService.ShowDialogAsync<MapRetileViewModel, bool>(viewModel, "");
+
+            int size = viewModel.TileSize;
+
+            if (!sizeResult || size == 0)
+                return;
+
+
+            DevForm.SetConfig("TilesetDir", folder);
+            _spriteRootNode.CachedPath = folder + "/";
+            _cachedSize = size;
+
+            try
+            {
+                _massImport(_spriteRootNode.CachedPath, _cachedSize);
+            }
+            catch (Exception ex)
+            {
+                DiagManager.Instance.LogError(ex, false);
+                await MessageBoxWindowView.Show(_dialogService,
+                    "Error importing from\n" + _spriteRootNode.CachedPath + "\n\n" + ex.Message, "Import Failed",
+                    MessageBoxWindowView.MessageBoxButtons.Ok);
+                return;
+            }
+        });
+    }
+
+    public async Task ExportAsync(DataItemNode node)
+    {
+        //get current sprite
+        string animData = node.ItemKey;
+
+        //remember addresses in registry
+        string folderName = DevForm.GetConfig("TilesetDir", Directory.GetCurrentDirectory());
+
+        var options = new FilePickerSaveOptions
+        {
+            Title = "Export PNG",
+            DefaultExtension = "png",
+            FileTypeChoices =
+            [
+                new FilePickerFileType("PNG Files")
+                {
+                    Patterns = new[] { "*.png" }
+                }
+            ]
+        };
+        var folder = await _dialogService.TryGetSaveFileAsync(options, folderName);
+        if (!String.IsNullOrEmpty(folder))
+        {
+            DevForm.SetConfig("TilesetDir", Path.GetDirectoryName(folder));
+
+            try
+            {
+                DevForm.ExecuteOrPend(() => { _export(folder, animData); });
+            }
+            catch (Exception ex)
+            {
+                DiagManager.Instance.LogError(ex, false);
+                await MessageBoxWindowView.Show(_dialogService,
+                    "Error exporting to\n" + _spriteRootNode.CachedPath + "\n\n" + ex.Message, "Export Failed",
+                    MessageBoxWindowView.MessageBoxButtons.Ok);
+                return;
+            }
+        }
+    }
+
+    public async Task ImportAsync(DataItemNode node)
+    {
+        //remember addresses in registry
+        string folderName = DevForm.GetConfig("TilesetDir", Directory.GetCurrentDirectory());
+
+        var options = new FilePickerOpenOptions
+        {
+            Title = "Open .png File",
+            AllowMultiple = false,
+            FileTypeFilter =
+            [
+                new FilePickerFileType("PNG Files")
+                {
+                    Patterns = ["*.PNG"]
+                }
+            ]
+        };
+
+        var file = await _dialogService.ShowFilePickerAsync(options, folderName);
+
+        if (file == null) return;
+
+        string animName = Path.GetFileNameWithoutExtension(file);
+
+
+        if (_spriteRootNode.SubNodes.Any(n => n.Title == animName))
+        {
+            MessageBoxWindowView.MessageBoxResult result = await MessageBoxWindowView.Show(_dialogService,
+                "Are you sure you want to overwrite the existing sheet:\n" + animName,
+                "Sprite Sheet already exists.",
+                MessageBoxWindowView.MessageBoxButtons.YesNo);
+            if (result == MessageBoxWindowView.MessageBoxResult.No)
+                return;
+        }
+
+        MapRetileViewModel viewModel =
+            new MapRetileViewModel(GraphicsManager.TileSize, "Tile size must be divisible by 8.");
+        bool sizeResult = await _dialogService.ShowDialogAsync<MapRetileViewModel, bool>(viewModel, "");
+
+        int size = viewModel.TileSize;
+
+        if (!sizeResult || size == 0)
+            return;
+
+        DevForm.SetConfig("TilesetDir", Path.GetDirectoryName(file));
+        _spriteRootNode.CachedPath = file;
+        _cachedSize = size;
+
+        try
+        {
+            _import(_spriteRootNode.CachedPath, _cachedSize);
+        }
+        catch (Exception ex)
+        {
+            DiagManager.Instance.LogError(ex, false);
+            await MessageBoxWindowView.Show(_dialogService,
+                "Error importing from\n" + _spriteRootNode.CachedPath + "\n\n" + ex.Message,
+                "Import Failed", MessageBoxWindowView.MessageBoxButtons.Ok);
+            return;
+        }
+    }
+
+    public async Task ReImportAsync()
+    {
+        try
+        {
+            _import(_spriteRootNode.CachedPath, _cachedSize);
+        }
+        catch (Exception ex)
+        {
+            DiagManager.Instance.LogError(ex, false);
+            await MessageBoxWindowView.Show(_dialogService,
+                "Error importing from\n" + _spriteRootNode.CachedPath + "\n\n" + ex.Message, "Import Failed",
+                MessageBoxWindowView.MessageBoxButtons.Ok);
+            return;
+        }
+    }
+
+    private void _reloadFullList()
+    {
+        lock (GameBase.lockObj)
+        {
+            _spriteRootNode.SubNodes.Clear();
+            foreach (string name in GraphicsManager.TileIndex.Nodes.Keys)
+            {
+                _spriteRootNode.SubNodes.Add(
+                    _nodeFactory.CreateDataItemNode(name, "", name + ":", _spriteRootNode.AssetType.GetIcon())
+                );
+            }
+        }
+    }
+
+
+    private void _import(string currentPath, int tileSize)
+    {
+        DevForm.ExecuteOrPend(() => { _tryImport(currentPath, tileSize); });
+
+        //recompute
+        _reloadFullList();
+    }
+
+    private void _tryImport(string currentPath, int tileSize)
+    {
+        lock (GameBase.lockObj)
+        {
+            string sheetName = Path.GetFileNameWithoutExtension(currentPath);
+            string outputFile = PathMod.HardMod(String.Format(GraphicsManager.TILE_PATTERN, sheetName));
+
+            if (!Directory.Exists(Path.GetDirectoryName(outputFile)))
+                Directory.CreateDirectory(Path.GetDirectoryName(outputFile));
+
+            //load into tilesets
+            using (BaseSheet tileset = BaseSheet.Import(currentPath))
+            {
+                List<BaseSheet[]> tileList = new List<BaseSheet[]>();
+                tileList.Add(new BaseSheet[] { tileset });
+                ImportHelper.SaveTileSheet(tileList, outputFile, tileSize);
+            }
+
+            GraphicsManager.RebuildIndices(GraphicsManager.AssetType.Tile);
+            GraphicsManager.ClearCaches(GraphicsManager.AssetType.Tile);
+            DevDataManager.ClearCaches();
+
+            DiagManager.Instance.LogInfo("Tiles from:\n" +
+                                         currentPath + "\nhave been imported.");
+        }
+    }
+
+    private void _massImport(string currentPath, int tileSize)
+    {
+        DevForm.ExecuteOrPend(() => { _tryMassImport(currentPath, tileSize); });
+
+        //recompute
+        _reloadFullList();
+    }
+
+    private void _tryMassImport(string currentPath, int tileSize)
+    {
+        lock (GameBase.lockObj)
+        {
+            if (!Directory.Exists(Path.GetDirectoryName(PathMod.HardMod(GraphicsManager.TILE_PATTERN))))
+                Directory.CreateDirectory(Path.GetDirectoryName(PathMod.HardMod(GraphicsManager.TILE_PATTERN)));
+
+            ImportHelper.ImportAllTiles(currentPath, PathMod.HardMod(GraphicsManager.TILE_PATTERN), tileSize);
+
+            GraphicsManager.RebuildIndices(GraphicsManager.AssetType.Tile);
+            GraphicsManager.ClearCaches(GraphicsManager.AssetType.Tile);
+
+            DiagManager.Instance.LogInfo("Mass import complete.");
+        }
+    }
+    
+    private bool _massExport(string currentPath)
+    {
+        bool success = true;
+        string[] dirs = PathMod.GetModFiles(Path.GetDirectoryName(GraphicsManager.TILE_PATTERN),
+            String.Format(Path.GetFileName(GraphicsManager.TILE_PATTERN), "*"));
+        for (int ii = 0; ii < dirs.Length; ii++)
+        {
+            try
+            {
+                string filename = Path.GetFileNameWithoutExtension(dirs[ii]);
+                DevForm.ExecuteOrPend(() => { _export(Path.Combine(currentPath, filename + ".png"), filename); });
+            }
+            catch (Exception ex)
+            {
+                DiagManager.Instance.LogError(ex, false);
+                success = false;
+            }
+        }
+
+        return success;
+    }
+
+    private void _export(string currentPath, string anim)
+    {
+        lock (GameBase.lockObj)
+        {
+            string animPath = PathMod.ModPath(String.Format(GraphicsManager.TILE_PATTERN, anim));
+            ImportHelper.ExportTileSheet(animPath, currentPath);
+
+            DiagManager.Instance.LogInfo("Frames from:\n" +
+                                         anim + "\nhave been exported to:" + currentPath);
+        }
+    }
+}
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/Content/SpeciesEditForm.axaml b/RogueEssence.Editor.Avalonia/Views/Content/SpeciesEditForm.axaml
index eadb4147..e22535a2 100644
--- a/RogueEssence.Editor.Avalonia/Views/Content/SpeciesEditForm.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/Content/SpeciesEditForm.axaml
@@ -10,7 +10,7 @@
         Title="{Binding Name}" Height="280" Width="300">
   <!--Icon="/Assets/app-logo.ico"-->
     <Design.DataContext>
-      <vm:SpeciesEditViewModel/>
+      <vm:SpeciesEditViewModel2/>
     </Design.DataContext>
   <Window.Resources>
     <converters:OXConverter x:Key="OXConverter"/>
@@ -38,7 +38,7 @@
       </Grid.ColumnDefinitions>
       <TreeView ItemsSource="{Binding Monsters}" SelectedItem="{Binding ChosenMonster}" SelectionMode="AlwaysSelected" Margin="4" Grid.ColumnSpan="4">
         <TreeView.DataTemplates>
-          <TreeDataTemplate DataType="vm:MonsterNodeViewModel" ItemsSource="{Binding Nodes}">
+          <TreeDataTemplate DataType="vm:MonsterNodeViewModel2" ItemsSource="{Binding Nodes}">
             <Grid>
               <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="24"/>
diff --git a/RogueEssence.Editor.Avalonia/Views/DialogBoxes/MapRetileWindow.axaml b/RogueEssence.Editor.Avalonia/Views/DialogBoxes/MapRetileWindow2.axaml
similarity index 96%
rename from RogueEssence.Editor.Avalonia/Views/DialogBoxes/MapRetileWindow.axaml
rename to RogueEssence.Editor.Avalonia/Views/DialogBoxes/MapRetileWindow2.axaml
index cfc55541..75439dfa 100644
--- a/RogueEssence.Editor.Avalonia/Views/DialogBoxes/MapRetileWindow.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/DialogBoxes/MapRetileWindow2.axaml
@@ -5,7 +5,7 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         mc:Ignorable="d"
-        x:Class="RogueEssence.Dev.Views.MapRetileWindow"
+        x:Class="RogueEssence.Dev.Views.MapRetileWindow2"
         Title="Tileset Size" Height="180" Width="280" Opened="Window_Loaded">
   <Design.DataContext>
     <vm:MapRetileViewModel/>
diff --git a/RogueEssence.Editor.Avalonia/Views/DialogBoxes/MapRetileWindow.axaml.cs b/RogueEssence.Editor.Avalonia/Views/DialogBoxes/MapRetileWindow2.axaml.cs
similarity index 90%
rename from RogueEssence.Editor.Avalonia/Views/DialogBoxes/MapRetileWindow.axaml.cs
rename to RogueEssence.Editor.Avalonia/Views/DialogBoxes/MapRetileWindow2.axaml.cs
index 909135fa..b23e8057 100644
--- a/RogueEssence.Editor.Avalonia/Views/DialogBoxes/MapRetileWindow.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/DialogBoxes/MapRetileWindow2.axaml.cs
@@ -6,9 +6,9 @@
 
 namespace RogueEssence.Dev.Views
 {
-    public partial class MapRetileWindow : Window
+    public partial class MapRetileWindow2 : Window
     {
-        public MapRetileWindow()
+        public MapRetileWindow2()
         {
             this.InitializeComponent();
         }
diff --git a/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml b/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml
index 8a5b559b..fd63eda0 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml
@@ -21,15 +21,15 @@
 
 
     </Design.DataContext>
-  <!-- <v:ChromelessWindow.DataContext> -->
-  <!--   <vm:MainWindowViewModel /> -->
-  <!-- </v:ChromelessWindow.DataContext> -->
+    <!-- <v:ChromelessWindow.DataContext> -->
+    <!--   <vm:MainWindowViewModel /> -->
+    <!-- </v:ChromelessWindow.DataContext> -->
 
     <!-- x:DataType="vm:MainWindowViewModel" -->
     <!-- Icon="/Assets/avalonia-logo.ico" -->
     <!-- x:DataType="vm:MainWindowViewModel" -->
     <!-- <Design.DataContext> -->
-        <!-- <vm:MainWindowViewModel /> -->
+    <!-- <vm:MainWindowViewModel /> -->
     <!-- </Design.DataContext> -->
     <Window.Resources>
         <c:WindowStateToColumnConverter x:Key="WindowStateToColumnConverter" />
@@ -141,10 +141,10 @@
                                   Loaded="LeftTreeDataGrid_OnLoaded"
                                   DoubleTapped="LeftTreeDataGrid_OnDoubleTapped"
                                   ContextRequested="LeftTreeDataGrid_OnContextRequested"
-                                  SelectionChanging="LeftTreeDataGrid_OnSelectionChanging"
+                                  PointerPressed="LeftTreeDataGrid_OnPointerPressed"
+                                  LostFocus="LeftTreeDataGrid_OnLostFocus"
                                   ShowColumnHeaders="False"
                                   Source="{Binding NodeSource}">
-                        
                         <TreeDataGrid.Resources>
                             <!-- <DataTemplate x:Key="TreeDataGridNodeBaseTemplate"> -->
                             <!--     <TreeDataGridExpander -->
@@ -162,7 +162,8 @@
                                                             Icon="{Binding Icon}"
                                                             IconSize="12" />
 
-                                                <Button Grid.Column="1" HorizontalAlignment="Left" Classes="icon_button"
+                                                <Button Grid.Column="1" HorizontalAlignment="Left"
+                                                        Classes="icon_button"
                                                         Padding="4, 0, 0, 0"
                                                         Width="18" Height="18"
                                                         IsVisible="{Binding IsPointerOver, RelativeSource={RelativeSource AncestorType=TreeDataGridRow}}"
@@ -175,8 +176,8 @@
                                                 </Button>
                                             </Grid>
                                         </DataTemplate>
-                                        
-                                        <DataTemplate DataType="vm:DataItemNode" >
+
+                                        <DataTemplate DataType="vm:DataItemNode">
                                             <Grid ColumnDefinitions="*,32" Height="16" Margin="8, 0, 0, 0">
                                                 <v:IconText Text="{Binding Title}"
                                                             Icon="{Binding Icon}"
@@ -199,15 +200,14 @@
                                             </Grid>
                                         </DataTemplate>
 
-                                 
+
                                         <DataTemplate DataType="vm:OpenEditorNode">
                                             <v:IconText Margin="8, 0, 0, 0" Text="{Binding Title}"
                                                         Icon="{Binding Icon}"
                                                         IconSize="12" />
                                         </DataTemplate>
 
-                                      
-                                        
+
                                         <DataTemplate DataType="vm:NodeBase">
                                             <v:IconText Margin="8, 0, 0, 0" Text="{Binding Title}"
                                                         Icon="{Binding Icon}"
@@ -296,4 +296,4 @@
 <!--             </TabItem> -->
 <!--         </TabControl> -->
 <!--     </Grid> -->
-<!-- </views:ChromelessWindow> -->
+<!-- </views:ChromelessWindow> -->
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml.cs b/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml.cs
index 9b4f8402..80bd860c 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml.cs
@@ -20,6 +20,7 @@
 using RogueEssence.Content;
 using RogueEssence.Data;
 using RogueEssence.Dev.ViewModels;
+using RogueEssence.Dungeon;
 
 namespace RogueEssence.Dev.Views;
 
@@ -121,7 +122,7 @@ private void reload(DataManager.DataType dataType)
                     devViewModel.Mods.UpdateMod();
 
                 devViewModel.ClearNodes();
-                devViewModel.UpdateTree();
+                devViewModel.LoadDevTree();
                 LoadComplete = true;
                 
             }
@@ -601,14 +602,19 @@ private void ShowSpriteRootNodeMenu(TreeDataGridRow current, SpriteRootNode root
             }
         };
 
+        if (root is SpriteTileRootNode node)
+        {
+            menu.Items.Insert(0, new MenuItem { Header = "Re-Index", Command = node.ReIndexCommand, Icon = App.CreateMenuIcon("Icons.ListNumbersFill") } );
+        };
+
         AttachAndOpenMenu(current, menu, e);
     }
 
-    private static void AttachAndOpenMenu(TreeDataGridRow current, ContextMenu menu, ContextRequestedEventArgs e)
+    private void AttachAndOpenMenu(TreeDataGridRow current, ContextMenu menu, ContextRequestedEventArgs e)
     {
-        menu.Closed += (_, _) => current.ContextMenu = null;
-        current.ContextMenu = menu;
-        menu.Open(current);
+        menu.Closed += (_, _) => LeftTreeDataGrid.ContextMenu = null;
+        LeftTreeDataGrid.ContextMenu = menu;
+        menu.Open(LeftTreeDataGrid);
         e.Handled = true;
     }
     
@@ -617,21 +623,9 @@ private void LeftTreeDataGrid_OnDoubleTapped(object? sender, TappedEventArgs e)
         if (DataContext is DevFormViewModel vm && sender is TreeDataGrid treeView)
         {
             var selectedItem = (OpenEditorNode)treeView.RowSelection.SelectedItem;
-            vm.AddPageFromPageNode(selectedItem);
-        }
-    }
-
-    private void LeftTreeDataGrid_OnSelectionChanging(object? sender, CancelEventArgs e)
-    {
-        if (DataContext is DevFormViewModel vm && sender is TreeDataGrid treeView)
-        {
-            Dispatcher.UIThread.Invoke(() =>
-            {
-
-            });
-
+            Console.WriteLine(selectedItem.ToString());
+            vm.AddPageFromTreeNode(selectedItem);
         }
-
     }
     
     private void LeftTreeDataGrid_OnContextRequested(object? sender, ContextRequestedEventArgs e)
@@ -675,4 +669,72 @@ private void LeftTreeDataGrid_OnContextRequested(object? sender, ContextRequeste
     private async void LeftTreeDataGrid_OnLoaded(object sender, RoutedEventArgs e)
     {
     }
+
+    private void LeftTreeDataGrid_OnPointerPressed(object? sender, PointerPressedEventArgs e)
+    {
+        if (sender is not TreeDataGrid treeDataGrid)
+            return;
+        
+        var point = e.GetPosition(treeDataGrid);
+        var visual = treeDataGrid.InputHitTest(point);
+        
+        var element = visual as Control;
+        while (element != null && element is not TreeDataGridRow)
+        {
+            element = element.Parent as Control;
+        }
+    
+        if (DungeonScene.Instance == null)
+            return;
+
+        GraphicsManager.AssetType debugAsset = GraphicsManager.AssetType.None;
+        string? debugAnim = null;
+        
+        if (element is TreeDataGridRow row &&
+            row.DataContext is DataItemNode node &&
+            node.Parent is SpriteRootNode parent &&
+            parent.AssetType.IsAnimEdit())
+        {
+            debugAsset = parent.AssetType;
+            debugAnim = node.ItemKey;
+        }
+
+        lock (GameBase.lockObj)
+        {
+            DungeonScene.Instance.DebugAsset = debugAsset;
+            DungeonScene.Instance.DebugAnim = debugAnim;
+        }
+
+    }
+
+    private void LeftTreeDataGrid_OnLostFocus(object sender, RoutedEventArgs e)
+    {
+        
+        if (!(sender is TreeDataGrid grid))
+            return;
+        
+        
+        if (grid.IsKeyboardFocusWithin)
+            return;
+        
+        if (grid.ContextMenu?.IsOpen == true)
+            return;
+        
+        var window = grid.GetVisualRoot() as Window;
+        if (window is { IsActive: false })
+            return; 
+        // (grid.RowSelection.SelectedItem as DataItemNode)?.Parent?.ResaveAsFile(grid.RowSelection.SelectedItem as DataItemNode)
+        // Not sure why it doesn't clear the grid...
+        grid.RowSelection.Clear();
+        
+        lock (GameBase.lockObj)
+        {
+            if (DungeonScene.Instance != null)
+            {
+                DungeonScene.Instance.DebugAsset = GraphicsManager.AssetType.None;
+                DungeonScene.Instance.DebugAnim = null;
+            }
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/MapRetileWindow.axaml b/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/MapRetileWindow.axaml
new file mode 100644
index 00000000..1daf2667
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/MapRetileWindow.axaml
@@ -0,0 +1,24 @@
+<v:ChromelessWindow xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:vm="using:RogueEssence.Dev.ViewModels"
+                    x:Class="RogueEssence.Dev.Views.MapRetileWindow"
+                    x:DataType="vm:MapRetileWindowViewModel"
+                    xmlns:v="using:RogueEssence.Dev.Views"
+                    CanResize="False"
+                    MaxWidth="400"
+                    MinWidth="300"
+                    x:Name="ThisControl"
+                    SizeToContent="WidthAndHeight">
+
+    <Design.DataContext>
+        <vm:MapRetileWindowViewModel/>
+    </Design.DataContext>
+    <Grid Margin="4" RowDefinitions="20, 42, *, 42" ColumnDefinitions="*, *">
+        <TextBlock Margin="4" VerticalAlignment="Bottom" Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2">Tile Size (Pixels)</TextBlock>
+        <NumericUpDown Value="{Binding TileSize}" Minimum="1" Maximum="256" Margin="4" Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2"></NumericUpDown>
+        <TextBlock Margin="4" TextWrapping="Wrap" Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2" Text="{Binding Message}"/>
+        <Button Click="btnOK_Click" IsEnabled="{Binding AllowConfirm}" Margin="4" Grid.Row="3" Grid.Column="0">OK</Button>
+        <Button Click="btnCancel_Click" Margin="4" Grid.Row="3" Grid.Column="1">Cancel</Button>
+    </Grid>
+
+</v:ChromelessWindow>
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/MapRetileWindow.axaml.cs b/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/MapRetileWindow.axaml.cs
new file mode 100644
index 00000000..483b4d58
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/MapRetileWindow.axaml.cs
@@ -0,0 +1,41 @@
+using System.Linq;
+using System.Threading.Tasks;
+using Avalonia.Controls;
+using Avalonia.Controls.ApplicationLifetimes;
+using Avalonia.Interactivity;
+using RogueEssence.Dev.Services;
+using RogueEssence.Dev.ViewModels;
+
+namespace RogueEssence.Dev.Views
+{
+    public partial class MapRetileWindow : ChromelessWindow
+    {
+        public MapRetileWindow()
+        {
+            // var pref = ViewModels.PreferencesWindowViewModel.Instance;
+            // DataContext = pref;
+            // CloseOnESC = true;
+            // InitializeComponent();
+        }
+    
+        protected override void OnClosing(WindowClosingEventArgs e)
+        {
+            // base.OnClosing(e);
+            //
+            // if (Design.IsDesignMode)
+            //     return;
+            //
+            // ViewModels.PreferencesWindowViewModel.Instance.Save();
+        }
+        
+        public void btnOK_Click(object sender, RoutedEventArgs e)
+        {
+            this.Close(true);
+        }
+
+
+        public void btnCancel_Click(object sender, RoutedEventArgs e)
+        {
+        }
+    }
+}
diff --git a/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/MessageBoxWindowView.axaml.cs b/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/MessageBoxWindowView.axaml.cs
index 6b8df50c..987bc1dc 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/MessageBoxWindowView.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/MessageBoxWindowView.axaml.cs
@@ -31,10 +31,10 @@ public MessageBoxWindowView()
         }
 
         public static async Task<MessageBoxResult> Show(
+            IDialogService dialogService,
             string text,
             string title,
             MessageBoxButtons buttons,
-            IDialogService dialogService, 
             bool danger = false)
         {
             var vm = new MessageBoxWindowViewModel(title, text);
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/SpeciesEditPageView.axaml b/RogueEssence.Editor.Avalonia/Views/New/Editors/SpeciesEditPageView.axaml
new file mode 100644
index 00000000..0f4ff315
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/Views/New/Editors/SpeciesEditPageView.axaml
@@ -0,0 +1,67 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:vm="using:RogueEssence.Dev.ViewModels"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:DataType="vm:SpeciesEditPageViewModel"
+             xmlns:converters="clr-namespace:RogueEssence.Dev.Converters"
+             x:Class="RogueEssence.Dev.Views.SpeciesEditPageView">
+    <!-- <UserControl.DataContext> -->
+    <!--     <vm:SpeciesEditPageViewModel/> -->
+    <!-- </UserControl.DataContext> -->
+  <UserControl.Resources>
+    <converters:OXConverter x:Key="OXConverter"/>
+  </UserControl.Resources>
+  <DockPanel>
+    <Menu DockPanel.Dock="Top">
+      <MenuItem Header="_Edit">
+        <MenuItem Header="Mass Import" Command="{Binding mnuMassImport_Click}"/>
+        <MenuItem Header="Re-Index" Command="{Binding mnuReIndex_Click}"/>
+        <Separator/>
+        <MenuItem Header="Mass Export" Command="{Binding mnuMassExport_Click}"/>
+        <MenuItem Header="Mass Export Multi Sheet" Command="{Binding mnuMassExportMulti_Click}"/>
+      </MenuItem>
+    </Menu>
+    <Grid>
+      <Grid.RowDefinitions>
+        <RowDefinition Height="*"/>
+        <RowDefinition Height="34"/>
+      </Grid.RowDefinitions>
+      <Grid.ColumnDefinitions>
+        <ColumnDefinition/>
+        <ColumnDefinition/>
+        <ColumnDefinition/>
+        <ColumnDefinition/>
+      </Grid.ColumnDefinitions>
+      <TreeView ItemsSource="{Binding Monsters}" SelectedItem="{Binding ChosenMonster}" SelectionMode="AlwaysSelected" Margin="4" Grid.ColumnSpan="4">
+        <TreeView.DataTemplates>
+          <TreeDataTemplate DataType="vm:MonsterNodeViewModel" ItemsSource="{Binding Nodes}">
+            <Grid>
+              <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="24"/>
+                <ColumnDefinition/>
+              </Grid.ColumnDefinitions>
+              <Image Source="{Binding Filled, Converter={StaticResource OXConverter}}" Stretch="None" Grid.Column="0"/>
+              <TextBlock Text="{Binding Name}" VerticalAlignment="Center" Grid.Column="1"/>
+            </Grid>
+          </TreeDataTemplate>
+        </TreeView.DataTemplates>
+        <TreeView.ContextMenu>
+          <ContextMenu ItemsSource="{Binding OpList}">
+            <ContextMenu.Styles>
+              <Style Selector="MenuItem">
+                <Setter Property="Header" Value="{Binding Name}"/>
+                <Setter Property="Command" Value="{Binding Command}"/>
+              </Style>
+            </ContextMenu.Styles>
+          </ContextMenu>
+        </TreeView.ContextMenu>
+      </TreeView>
+      <Button Command="{Binding btnImport_Click}" Margin="4" Grid.Row="1" Grid.Column="0" IsEnabled="{Binding ChosenMonster, Converter={x:Static ObjectConverters.IsNotNull}}">Import</Button>
+      <Button Command="{Binding btnReImport_Click}" Margin="4" Grid.Row="1" Grid.Column="1" IsEnabled="{Binding CachedPath, Converter={x:Static StringConverters.IsNotNullOrEmpty}}">Re-Import</Button>
+      <Button Command="{Binding btnExport_Click}" Margin="4" Grid.Row="1" Grid.Column="2" IsEnabled="{Binding ChosenMonster, Converter={x:Static ObjectConverters.IsNotNull}}">Export</Button>
+      <Button Command="{Binding btnDelete_Click}" Margin="4" Grid.Row="1" Grid.Column="3" IsEnabled="{Binding ChosenMonster, Converter={x:Static ObjectConverters.IsNotNull}}">Delete</Button>
+    </Grid>
+  </DockPanel>
+</UserControl>
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/SpeciesEditPageView.axaml.cs b/RogueEssence.Editor.Avalonia/Views/New/Editors/SpeciesEditPageView.axaml.cs
new file mode 100644
index 00000000..566bcc02
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/Views/New/Editors/SpeciesEditPageView.axaml.cs
@@ -0,0 +1,13 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace RogueEssence.Dev.Views;
+
+public partial class SpeciesEditPageView : UserControl
+{
+    public SpeciesEditPageView()
+    {
+        InitializeComponent();
+    }
+}
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/SpritePageView.axaml b/RogueEssence.Editor.Avalonia/Views/New/Editors/SpritePageView.axaml
index 9d05728f..689823d9 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/Editors/SpritePageView.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/New/Editors/SpritePageView.axaml
@@ -8,6 +8,9 @@
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:DataType="vm:SpritePageViewModel"
              x:Class="RogueEssence.Dev.Views.SpritePageView">
+    <!-- <UserControl.DataContext> -->
+    <!--     <vm:SpritePageViewModel/> -->
+    <!-- </UserControl.DataContext> -->
     <StackPanel>
         <Button Command="{Binding CreateATab}" Content="Add a child tab to this one!"/>
         <Button Command="{Binding CreateATopTab}" Content="Add a top level tab!"/>
diff --git a/RogueEssence/Content/GraphicsManager.cs b/RogueEssence/Content/GraphicsManager.cs
index 1d5fbc58..5c5a939c 100644
--- a/RogueEssence/Content/GraphicsManager.cs
+++ b/RogueEssence/Content/GraphicsManager.cs
@@ -11,6 +11,39 @@
 
 namespace RogueEssence.Content
 {
+    
+    public static class AssetTypeExtensions
+    {
+        public static bool IsAnimEdit(this GraphicsManager.AssetType type)
+        {
+            return type is GraphicsManager.AssetType.Particle
+                or GraphicsManager.AssetType.Beam
+                or GraphicsManager.AssetType.BG
+                or GraphicsManager.AssetType.Item
+                or GraphicsManager.AssetType.Object
+                or GraphicsManager.AssetType.Icon;
+        }
+
+        public static string GetIcon(this GraphicsManager.AssetType dataType) => dataType switch
+        {
+            GraphicsManager.AssetType.None => "Icons.ListFill",
+            // GraphicsManager.AssetType.Font => "Icons.ListFill",
+            // GraphicsManager.AssetType.Chara => "Icons.SparkleFill",
+            // GraphicsManager.AssetType.Portrait => "Icons.ListFill",
+            GraphicsManager.AssetType.Tile => "Icons.GridNineFill",
+            GraphicsManager.AssetType.Item => "Icons.JarLabelFill",
+            GraphicsManager.AssetType.Particle => "Icons.SparkleFill",
+            GraphicsManager.AssetType.Beam => "Icons.HeadlightsFill",
+            GraphicsManager.AssetType.Icon => "Icons.ExclamationMarkFill",
+            GraphicsManager.AssetType.Object => "Icons.CubeFill",
+            GraphicsManager.AssetType.BG => "Icons.ImageFill",
+            // GraphicsManager.AssetType.Autotile => "Icons.ListFill",
+            // GraphicsManager.AssetType.All => "Icons.ListFill",
+            // GraphicsManager.AssetType.Count => "Icons.ListFill",
+            _ => "Icons.ListFill"
+        };
+    }
+
     //Responsible for managing all graphics and sound for the game
     public static class GraphicsManager
     {
diff --git a/RogueEssence/Data/DataManager.cs b/RogueEssence/Data/DataManager.cs
index 48ff426b..9d098f88 100644
--- a/RogueEssence/Data/DataManager.cs
+++ b/RogueEssence/Data/DataManager.cs
@@ -15,8 +15,64 @@
 
 namespace RogueEssence.Data
 {
+    public static class DataRegistry
+    {
+        public static readonly Dictionary<DataManager.DataType, RegistryEntry> Map
+            = new Dictionary<DataManager.DataType, RegistryEntry>();
+        
+        public struct RegistryEntry
+        {
+            public Type ClassType;
+            public Func<string, IEntryData> GetEntry;
+            public Func<IEntryData> CreateEntry;
+        }
+        
+        static DataRegistry()
+        {
+            // Register(DataManager.DataType.Monster,
+            //     typeof(MonsterData),
+            //     entryNum => new MonsterData { EntryNum = entryNum },
+            //     () => new MonsterData());
+            //
+            // Register(DataManager.DataType.Skill,
+            //     typeof(SkillData),
+            //     entryNum => new SkillData { EntryNum = entryNum },
+            //     () => new SkillData());
+            //
+            // Register(DataManager.DataType.Item,
+            //     typeof(ItemData),
+            //     entryNum => new ItemData { EntryNum = entryNum },
+            //     () => new ItemData());
+        }
+
+        private static void Register(
+            DataManager.DataType type,
+            Type classType,
+            Func<string, IEntryData> getEntry,
+            Func<IEntryData> createEntry)
+        {
+            Map[type] = new RegistryEntry
+            {
+                ClassType = classType,
+                GetEntry = getEntry,
+                CreateEntry = createEntry
+            };
+        }
+    }
     public static class DataTypeExtensions
     {
+        public delegate IEntryData GetEntry(string id);
+        public delegate IEntryData CreateEntry();
+        
+        
+        // public static Type GetClassType(this DataManager.DataType type)
+        //     => DataRegistry.Map[type].ClassType;
+        //
+        // public static GetEntry GetGetter(this DataManager.DataType type)
+        //     => DataRegistry.Map[type].GetEntry;
+        //
+        // public static CreateEntry GetCreator(this DataManager.DataType type)
+        //     => DataRegistry.Map[type].CreateEntry;
         public static Type GetClassType(this DataManager.DataType dataType)
         {
             switch (dataType)

From 3a2d0b907f258d498f387b257fb4bea3f4b73f9a Mon Sep 17 00:00:00 2001
From: Kace <41309226+DoubleTrio@users.noreply.github.com>
Date: Mon, 24 Nov 2025 16:26:25 -0500
Subject: [PATCH 16/51] progress on switching mods

---
 .../RogueEssence.Editor.Avalonia.csproj       |   4 +
 .../ViewModels/DevForm/DevTabModsViewModel.cs |   8 +-
 ...figViewModel.cs => ModConfigViewModel2.cs} |   4 +-
 .../ViewModels/New/DevFormViewModel.cs        |  11 +-
 .../DialogBoxes/ModConfigWindowViewModel.cs   | 158 ++++++++++++++++++
 .../ViewModels/New/ModSwitcherViewModel.cs    |  49 ++----
 .../New/Nodes/ISpriteOperationStrategy.cs     |   2 +-
 .../ViewModels/New/Nodes/NodeBase.cs          |  16 +-
 .../New/Nodes/SpriteAssetTypeStrategy.cs      |   2 +-
 .../New/Nodes/SpriteTileStrategy.cs           |   2 +-
 .../Views/DialogBoxes/ModConfigWindow.axaml   |   2 +-
 .../DialogBoxes/ModConfigWindow.axaml.cs      |   2 +-
 .../Views/New/DevForm.axaml                   |   2 +-
 .../Views/New/DevForm.axaml.cs                |   8 +-
 .../New/DialogBoxes/MapRetileWindow.axaml     |  42 ++++-
 .../New/DialogBoxes/ModConfigWindowView.axaml | 111 ++++++++++++
 .../DialogBoxes/ModConfigWindowView.axaml.cs  |  53 ++++++
 .../Views/New/ModSwitcherView.axaml           |  11 +-
 .../Views/New/ModSwitcherView.axaml.cs        |  28 +++-
 19 files changed, 426 insertions(+), 89 deletions(-)
 rename RogueEssence.Editor.Avalonia/ViewModels/DialogBoxes/{ModConfigViewModel.cs => ModConfigViewModel2.cs} (97%)
 create mode 100644 RogueEssence.Editor.Avalonia/ViewModels/New/DialogBoxes/ModConfigWindowViewModel.cs
 create mode 100644 RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/ModConfigWindowView.axaml
 create mode 100644 RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/ModConfigWindowView.axaml.cs

diff --git a/RogueEssence.Editor.Avalonia/RogueEssence.Editor.Avalonia.csproj b/RogueEssence.Editor.Avalonia/RogueEssence.Editor.Avalonia.csproj
index 2e1ebb95..c2c1b15d 100644
--- a/RogueEssence.Editor.Avalonia/RogueEssence.Editor.Avalonia.csproj
+++ b/RogueEssence.Editor.Avalonia/RogueEssence.Editor.Avalonia.csproj
@@ -199,6 +199,10 @@
       <DependentUpon>SpeciesEditPageView.axaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
+    <Compile Update="Views\New\DialogBoxes\ModConfigWindowView.axaml.cs">
+      <DependentUpon>ModConfigWindow.axaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Models\" />
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevTabModsViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevTabModsViewModel.cs
index 6b828f22..387f8365 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevTabModsViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevTabModsViewModel.cs
@@ -107,9 +107,9 @@ private void doSwitch()
 
         public async void btnAdd_Click()
         {
-            ModConfigWindow window = new ModConfigWindow();
+            ModConfigWindowView window = new ModConfigWindowView();
             ModHeader header = new ModHeader("", "", "", "", "", Guid.NewGuid(), new Version(), new Version(), PathMod.ModType.Mod, new RelatedMod[0] { });
-            ModConfigViewModel vm = new ModConfigViewModel(header);
+            ModConfigViewModel2 vm = new ModConfigViewModel2(header);
             window.DataContext = vm;
 
             DevForm form = (DevForm)DiagManager.Instance.DevEditor;
@@ -188,9 +188,9 @@ public async void btnDelete_Click()
 
         public async void btnEdit_Click()
         {
-            ModConfigWindow window = new ModConfigWindow();
+            ModConfigWindowView window = new ModConfigWindowView();
             ModHeader header = PathMod.Quest;
-            ModConfigViewModel vm = new ModConfigViewModel(header);
+            ModConfigViewModel2 vm = new ModConfigViewModel2(header);
             window.DataContext = vm;
 
             DevForm form = (DevForm)DiagManager.Instance.DevEditor;
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/DialogBoxes/ModConfigViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/DialogBoxes/ModConfigViewModel2.cs
similarity index 97%
rename from RogueEssence.Editor.Avalonia/ViewModels/DialogBoxes/ModConfigViewModel.cs
rename to RogueEssence.Editor.Avalonia/ViewModels/DialogBoxes/ModConfigViewModel2.cs
index c28281a7..64e0cd6b 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/DialogBoxes/ModConfigViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/DialogBoxes/ModConfigViewModel2.cs
@@ -11,9 +11,9 @@
 
 namespace RogueEssence.Dev.ViewModels
 {
-    public class ModConfigViewModel : ViewModelBase
+    public class ModConfigViewModel2 : ViewModelBase
     {
-        public ModConfigViewModel(ModHeader header)
+        public ModConfigViewModel2(ModHeader header)
         {
             Name = header.Name;
             Namespace = header.Namespace;
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs
index 60e96057..1d3d9411 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs
@@ -50,16 +50,7 @@ public bool IsTreeView
         get => _isTreeView;
         set { this.RaiseAndSetIfChanged(ref _isTreeView, value); }
     }
-
-
-    private Models.ModHeader _currentMod = new Models.ModHeader("Halcyon", "halcyon");
-
-    public Models.ModHeader CurrentMod
-    {
-        get => _currentMod;
-        set { this.RaiseAndSetIfChanged(ref _currentMod, value); }
-    }
-
+    
     public void OpenTabSwitcher()
     {
         TabSwitcher = _pageFactory.GetRequiredService<TabSwitcherViewModel>();
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/DialogBoxes/ModConfigWindowViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/DialogBoxes/ModConfigWindowViewModel.cs
new file mode 100644
index 00000000..373d2f3a
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/DialogBoxes/ModConfigWindowViewModel.cs
@@ -0,0 +1,158 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using RogueEssence;
+using RogueEssence.Dungeon;
+using RogueEssence.Ground;
+using RogueEssence.Data;
+using ReactiveUI;
+using System.Collections.ObjectModel;
+using RogueEssence.Dev.Views;
+
+namespace RogueEssence.Dev.ViewModels
+{
+    public class ModConfigWindowViewModel : ViewModelBase
+    {
+        public ModConfigWindowViewModel(ModHeader header)
+        {
+            Name = header.Name;
+            Namespace = header.Namespace;
+            Author = header.Author;
+            Description = header.Description;
+            UUID = header.UUID.ToString().ToUpper();
+            Version = header.Version.ToString();
+            GameVersion = header.GameVersion.ToString();
+
+            ModTypes = new ObservableCollection<string>();
+            for (int ii = 0; ii < (int)PathMod.ModType.Count; ii++)
+                ModTypes.Add(((PathMod.ModType)ii).ToLocal());
+            ChosenModType = (int)header.ModType;
+
+            DevForm form = (DevForm)DiagManager.Instance.DevEditor;
+            Relationships = new CollectionBoxViewModel(form, new StringConv(typeof(RelatedMod), new object[0]));
+            Relationships.OnEditItem += Relationships_EditItem;
+            Relationships.LoadFromList(header.Relationships);
+        }
+
+        private string name;
+        public string Name
+        {
+            get => name;
+            set => this.SetIfChanged(ref name, value);
+        }
+
+        private string author;
+        public string Author
+        {
+            get => author;
+            set => this.SetIfChanged(ref author, value);
+        }
+
+        private string description;
+        public string Description
+        {
+            get => description;
+            set => this.SetIfChanged(ref description, value);
+        }
+
+        private string editNamespace;
+        public string Namespace
+        {
+            get => editNamespace;
+            set => this.SetIfChanged(ref editNamespace, value);
+        }
+
+        private string uuid;
+        public string UUID
+        {
+            get => uuid;
+            set => this.SetIfChanged(ref uuid, value);
+        }
+
+
+        private string version;
+        public string Version
+        {
+            get => version;
+            set => this.SetIfChanged(ref version, value);
+        }
+
+
+        private string gameVersion;
+        public string GameVersion
+        {
+            get => gameVersion;
+            set => this.SetIfChanged(ref gameVersion, value);
+        }
+
+        public ObservableCollection<string> ModTypes { get; }
+
+        private int chosenModType;
+        public int ChosenModType
+        {
+            get => chosenModType;
+            set => this.SetIfChanged(ref chosenModType, value);
+        }
+
+        public CollectionBoxViewModel Relationships { get; set; }
+
+
+        public void Relationships_EditItem(int index, object element, bool advancedEdit, CollectionBoxViewModel.EditElementOp op)
+        {
+            string elementName = "Relationship[" + index + "]";
+            DataEditForm frmData = new DataEditRootForm();
+            frmData.Title = DataEditor.GetWindowTitle("Relationship", elementName, element, typeof(RelatedMod), new object[0]);
+
+            //TODO: make this a member and reference it that way
+            DataEditor.LoadClassControls(frmData.ControlPanel, "Relationship", null, elementName, typeof(RelatedMod), new object[0], element, true, new Type[0], advancedEdit);
+            DataEditor.TrackTypeSize(frmData, typeof(RelatedMod));
+
+            frmData.SelectedOKEvent += async () =>
+            {
+                element = DataEditor.SaveClassControls(frmData.ControlPanel, elementName, typeof(RelatedMod), new object[0], true, new Type[0], advancedEdit);
+
+                bool itemExists = false;
+
+                List<RelatedMod> relations = Relationships.GetList<List<RelatedMod>>();
+                for (int ii = 0; ii < relations.Count; ii++)
+                {
+                    if (ii != index)
+                    {
+                        if (relations[ii].UUID == ((RelatedMod)element).UUID)
+                            itemExists = true;
+                    }
+                }
+
+                if (String.IsNullOrEmpty(((RelatedMod)element).Namespace))
+                {
+                    await MessageBox.Show(frmData, "Related mod needs a namespace!", "Namespace needed.", MessageBox.MessageBoxButtons.Ok);
+                    return false;
+                }
+                if (itemExists)
+                {
+                    await MessageBox.Show(frmData, "Cannot add duplicate entries.", "Entry with UUID already exists.", MessageBox.MessageBoxButtons.Ok);
+                    return false;
+                }
+                else
+                {
+                    op(index, element);
+                    return true;
+                }
+            };
+
+            //this.RegisterChild(frmData);
+            frmData.Show();
+        }
+
+        public RelatedMod[] GetRelationshipArray()
+        {
+            List<RelatedMod> relationships = Relationships.GetList<List<RelatedMod>>();
+            return relationships.ToArray();
+        }
+
+        public void btnRegenUUID_Click()
+        {
+            UUID = Guid.NewGuid().ToString().ToUpper();
+        }
+    }
+}
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/ModSwitcherViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/ModSwitcherViewModel.cs
index 7d212aec..3422730c 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/ModSwitcherViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/ModSwitcherViewModel.cs
@@ -13,50 +13,21 @@ public class ModSwitcherViewModel : ViewModelBase
 
     private readonly IDialogService _dialogService;
     private readonly DevFormViewModel _mainWindow;
-    private ModHeader _selectedMod;
-
-    public ModHeader SelectedMod
+    private ModsNodeViewModel _selectedMod;
+    
+    public ModsNodeViewModel SelectedMod
     {
         get => _selectedMod;
         set { this.RaiseAndSetIfChanged(ref _selectedMod, value); }
     }
     
-    public ObservableCollection<Models.ModHeader> Mods { get; }
+    public ObservableCollection<ModsNodeViewModel> Mods { get; }
     public ModSwitcherViewModel(DevFormViewModel mainWindowViewModel, IDialogService dialogService)
     {
         _mainWindow = mainWindowViewModel;
         _dialogService = dialogService;
-        
-        Mods = new ObservableCollection<Models.ModHeader>()
-        {
-            // new Models.ModHeader("[NULL]", "origin"),
-            // new ModHead("Super Party Bros", "Super_Party_Bros"),
-            // new ModHead("Resource Dungeon Pack", "source_duns_imbi"),
-            // new ModHead("Trio's Sandbox", "trios_sandbox"),
-            // new ModHead("Bubsy Mystery Dungeon", "bubsy_md"),
-            // new ModHead("Friend Area", "friend_area"),
-            // new ModHead("Typeless Moves", "typeless_moves"),
-            // new ModHead("Bossfights", "bossfights"),
-            // new ModHead("Explorers of Friending", "explorers_of_friending"),
-            // new ModHead("All Starters", "starter_mod"),
-            // new ModHead("Visible Monster Houses", "visible_monster_houses"),
-            // new ModHead("Project EoN (0.2.3)", "what_does_n_stand_for"),
-            // new ModHead("Explorers of Kanto", "explorers_of_kanto"),
-            // new ModHead("Halcyon", "halcyon"),
-            // new ModHead("Ruin", "ruins"),
-            // new ModHead("More Items", "more_items"),
-            // new ModHead("Enable Mission Board", "enable_mission_board"),
-            // new ModHead("Silver Resistance", "silver_resistance"),
-            // new ModHead("Rev Mod", "rev_mod"),
-            // new ModHead("Halcyon No Nickname", "halcyon_nickname"),
-            // new ModHead("Mystery Ruins", "mystery_ruins"),
-            // new ModHead("Trio's Sandbox", "trios_sandbox_pack"),
-            // new ModHead("Music Notice", "music_notice"),
-            // new ModHead("Trio's Dungeon Pack", "trios_dungeon_pack"),
-            // new ModHead("Raw", "raw_key"),
-            // new ModHead("Gender Unlock", "gender_unlock"),
 
-        };
+        Mods = new ObservableCollection<ModsNodeViewModel>(mainWindowViewModel.Mods.Mods);
     }
     
     
@@ -70,15 +41,15 @@ public void CloseSwitcher()
         return await MessageBoxWindowView.Show(_dialogService, "The game will be reloaded to use content from the new path. Click OK to proceed. Your changes will not be saved.", "Are you sure?", MessageBoxWindowView.MessageBoxButtons.OkCancel);
     }
     
-    public Models.ModHeader CurrentMod
+    public ModsNodeViewModel CurrentMod
     {
-        get => _mainWindow.CurrentMod;
-        set => _mainWindow.CurrentMod = value;
+        get => _mainWindow.Mods.ChosenMod;
+        set => _mainWindow.Mods.ChosenMod = value;
     }
 
-    public bool IsCurrent(Models.ModHeader head)
+    public bool IsCurrent(ModsNodeViewModel head)
     { 
-        return head.Key == _mainWindow.CurrentMod.Key;
+        return head.Namespace == _mainWindow.Mods.ChosenMod.Namespace;
     }
 }
 
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/ISpriteOperationStrategy.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/ISpriteOperationStrategy.cs
index 14fe3522..2325254d 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/ISpriteOperationStrategy.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/ISpriteOperationStrategy.cs
@@ -9,6 +9,6 @@ public interface ISpriteOperationStrategy
     Task MassExportAsync();
     Task MassImportAsync();
     Task ExportAsync(DataItemNode node);
-    Task ImportAsync(DataItemNode node);
+    Task ImportAsync();
     Task ReImportAsync();
 }
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/NodeBase.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/NodeBase.cs
index 4312fc64..f85cbf99 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/NodeBase.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/NodeBase.cs
@@ -312,7 +312,7 @@ public class SpriteRootNode : ItemRootNode
     public ReactiveCommand<Unit, Unit> MassExportCommand { get; }
     public ReactiveCommand<Unit, Unit> MassImportCommand { get; }
     public ReactiveCommand<DataItemNode, Unit> ExportCommand { get; }
-    public ReactiveCommand<DataItemNode, Unit> ImportCommand { get; }
+    public ReactiveCommand<Unit, Unit> ImportCommand { get; }
     public ReactiveCommand<Unit, Unit> ReImportCommand { get; }
 
     private string _cachedPath;
@@ -351,19 +351,13 @@ public SpriteRootNode(
         MassExportCommand = ReactiveCommand.CreateFromTask(MassExportAsync);
         MassImportCommand = ReactiveCommand.CreateFromTask(MassImportAsync);
         ExportCommand = ReactiveCommand.CreateFromTask<DataItemNode>(ExportSpriteAsync);
-        ImportCommand = ReactiveCommand.CreateFromTask<DataItemNode>(ImportSpriteAsync);
+        ImportCommand = ReactiveCommand.CreateFromTask(ImportSpriteAsync);
         ReImportCommand = ReactiveCommand.CreateFromTask(ReImportSpriteAsync);
     }
 
     private async Task AddSpriteAsync()
     {
-        var node = await _strategy.AddAsync();
-        if (node != null)
-        {
-            SubNodes.Add(node);
-            IsExpanded = true;
-        }
-
+        await _strategy.ImportAsync();
     }
 
     private async Task DeleteSpriteAsync(DataItemNode node)
@@ -386,9 +380,9 @@ private async Task ExportSpriteAsync(DataItemNode node)
         await _strategy.ExportAsync(node);
     }
 
-    private async Task ImportSpriteAsync(DataItemNode node)
+    private async Task ImportSpriteAsync()
     {
-        await _strategy.ImportAsync(node);
+        await _strategy.ImportAsync();
     }
 
     private async Task ReImportSpriteAsync()
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/SpriteAssetTypeStrategy.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/SpriteAssetTypeStrategy.cs
index dd1e53f5..adef5d5c 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/SpriteAssetTypeStrategy.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/SpriteAssetTypeStrategy.cs
@@ -305,7 +305,7 @@ await Dispatcher.UIThread.InvokeAsync(async () =>
 
     }
 
-    public async Task ImportAsync(DataItemNode _)
+    public async Task ImportAsync()
     {
         string name = _spriteRootNode.AssetType.ToString();
         string folderName = DevForm.GetConfig(name + "Dir", Directory.GetCurrentDirectory());
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/SpriteTileStrategy.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/SpriteTileStrategy.cs
index 2d2b65e6..aff55be4 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/SpriteTileStrategy.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/SpriteTileStrategy.cs
@@ -188,7 +188,7 @@ await MessageBoxWindowView.Show(_dialogService,
         }
     }
 
-    public async Task ImportAsync(DataItemNode node)
+    public async Task ImportAsync()
     {
         //remember addresses in registry
         string folderName = DevForm.GetConfig("TilesetDir", Directory.GetCurrentDirectory());
diff --git a/RogueEssence.Editor.Avalonia/Views/DialogBoxes/ModConfigWindow.axaml b/RogueEssence.Editor.Avalonia/Views/DialogBoxes/ModConfigWindow.axaml
index 0fa2e467..124f0ec6 100644
--- a/RogueEssence.Editor.Avalonia/Views/DialogBoxes/ModConfigWindow.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/DialogBoxes/ModConfigWindow.axaml
@@ -8,7 +8,7 @@
         x:Class="RogueEssence.Dev.Views.ModConfigWindow"
         Title="Mod Config" Width="420" Height="480">
   <Design.DataContext>
-    <vm:ModConfigViewModel/>
+    <vm:ModConfigViewModel2/>
   </Design.DataContext>
 
   <Grid Margin="4">
diff --git a/RogueEssence.Editor.Avalonia/Views/DialogBoxes/ModConfigWindow.axaml.cs b/RogueEssence.Editor.Avalonia/Views/DialogBoxes/ModConfigWindow.axaml.cs
index 8d0bba96..2f713d9e 100644
--- a/RogueEssence.Editor.Avalonia/Views/DialogBoxes/ModConfigWindow.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/DialogBoxes/ModConfigWindow.axaml.cs
@@ -16,7 +16,7 @@ public ModConfigWindow()
 
         public async void btnOK_Click(object sender, RoutedEventArgs e)
         {
-            ModConfigViewModel vm = (ModConfigViewModel)DataContext;
+            ModConfigViewModel2 vm = (ModConfigViewModel2)DataContext;
             try
             {
                 if (String.IsNullOrWhiteSpace(Text.Sanitize(vm.Name)))
diff --git a/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml b/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml
index fd63eda0..fcc55f65 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml
@@ -66,7 +66,7 @@
                         x:Name="ModSwitcherFlyoutButton" Padding="0, 4, 0, 0">
 
                     <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
-                        <TextBlock Padding="0, 0, 6, 0" Text="{Binding CurrentMod.Name}" />
+                        <TextBlock Padding="0, 0, 6, 0" Text="{Binding Mods.CurrentMod}" />
                         <Path HorizontalAlignment="Center" Width="10" Height="10" Margin="0,2,0,0"
                               Data="{StaticResource Icons.CaretDownFill}" />
                     </StackPanel>
diff --git a/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml.cs b/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml.cs
index 80bd860c..4cca8822 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml.cs
@@ -561,8 +561,6 @@ private void ShowSpriteItemNodeMenu(TreeDataGridRow current, DataItemNode node,
         {
             Items =
             {
-                new MenuItem { Header = "Import", Command = parentNode.ImportCommand, CommandParameter = node, Icon = App.CreateMenuIcon("Icons.DownloadSimpleFill") },
-                new MenuItem { Header = "Re-Import", Command = parentNode.ReImportCommand, CommandParameter = node, Icon = App.CreateMenuIcon("Icons.RepeatFill") },
                 new MenuItem { Header = "Export", Command = parentNode.ExportCommand, CommandParameter = node, Icon = App.CreateMenuIcon("Icons.ExportFill") },
                 new Separator(),
                 new MenuItem { Header = "Delete", Command = parentNode.DeleteCommand, CommandParameter = node, Icon =  App.CreateMenuIcon("Icons.TrashFill") }
@@ -597,8 +595,12 @@ private void ShowSpriteRootNodeMenu(TreeDataGridRow current, SpriteRootNode root
             {
                 new MenuItem { Header = "Mass Import", Command = root.MassImportCommand, Icon = App.CreateMenuIcon("Icons.DownloadSimpleFill") },
                 new MenuItem { Header = "Mass Export", Command = root.MassExportCommand, Icon = App.CreateMenuIcon("Icons.ExportFill") },
+                
+                
                 new Separator(),
-                new MenuItem { Header = "Add", Command = root.AddCommand,  Icon = App.CreateMenuIcon("Icons.Plus") }
+                new MenuItem { Header = "Import", Command = root.ImportCommand, Icon = App.CreateMenuIcon("Icons.Plus") },
+                new MenuItem { Header = "Re-Import", Command = root.ReImportCommand, Icon = App.CreateMenuIcon("Icons.RepeatFill") },
+                // new MenuItem { Header = "Add", Command = root.AddCommand,  Icon = App.CreateMenuIcon("Icons.Plus") }
             }
         };
 
diff --git a/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/MapRetileWindow.axaml b/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/MapRetileWindow.axaml
index 1daf2667..5516d5b2 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/MapRetileWindow.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/MapRetileWindow.axaml
@@ -11,14 +11,42 @@
                     SizeToContent="WidthAndHeight">
 
     <Design.DataContext>
-        <vm:MapRetileWindowViewModel/>
+        <vm:MapRetileWindowViewModel />
     </Design.DataContext>
-    <Grid Margin="4" RowDefinitions="20, 42, *, 42" ColumnDefinitions="*, *">
-        <TextBlock Margin="4" VerticalAlignment="Bottom" Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2">Tile Size (Pixels)</TextBlock>
-        <NumericUpDown Value="{Binding TileSize}" Minimum="1" Maximum="256" Margin="4" Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2"></NumericUpDown>
-        <TextBlock Margin="4" TextWrapping="Wrap" Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2" Text="{Binding Message}"/>
-        <Button Click="btnOK_Click" IsEnabled="{Binding AllowConfirm}" Margin="4" Grid.Row="3" Grid.Column="0">OK</Button>
-        <Button Click="btnCancel_Click" Margin="4" Grid.Row="3" Grid.Column="1">Cancel</Button>
+
+    <Grid RowDefinitions="Auto,*">
+        <!-- TitleBar -->
+        <Grid Grid.Row="0" Height="28" IsVisible="{Binding !#ThisControl.UseSystemWindowFrame}">
+            <Border Background="{DynamicResource Brush.TitleBar}"
+                    BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border0}"
+                    PointerPressed="BeginMoveWindow" />
+
+            <Path Width="14" Height="14"
+                  Margin="10,0,0,0"
+                  HorizontalAlignment="Left"
+                  Data="{StaticResource Icons.SoftwareUpdate}"
+                  IsVisible="{OnPlatform True, macOS=False}" />
+
+            <TextBlock Classes="bold"
+                       Text="{Binding Title}"
+                       HorizontalAlignment="Center" VerticalAlignment="Center"
+                       IsHitTestVisible="False" />
+
+            <v:CaptionButtons HorizontalAlignment="Right"
+                              IsCloseButtonOnly="True"
+                              IsVisible="{OnPlatform True, macOS=False}" />
+
+        </Grid>
+        <Grid Grid.Row="1" Margin="4" RowDefinitions="20, 42, *, 42" ColumnDefinitions="*, *">
+            <TextBlock Margin="4" VerticalAlignment="Bottom" Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2">Tile Size (Pixels)</TextBlock>
+            <NumericUpDown Value="{Binding TileSize}" Minimum="1" Maximum="256" Margin="4" Grid.Row="1" Grid.Column="0"
+                           Grid.ColumnSpan="2">
+            </NumericUpDown>
+            <TextBlock Margin="4" TextWrapping="Wrap" Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2"
+                       Text="{Binding Message}" />
+            <Button Click="btnOK_Click" IsEnabled="{Binding AllowConfirm}" Margin="4" Grid.Row="3" Grid.Column="0">OK</Button>
+            <Button Click="btnCancel_Click" Margin="4" Grid.Row="3" Grid.Column="1">Cancel</Button>
+        </Grid>
     </Grid>
 
 </v:ChromelessWindow>
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/ModConfigWindowView.axaml b/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/ModConfigWindowView.axaml
new file mode 100644
index 00000000..9522ce42
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/ModConfigWindowView.axaml
@@ -0,0 +1,111 @@
+<v:ChromelessWindow xmlns="https://github.com/avaloniaui"
+                    xmlns:vm="clr-namespace:RogueEssence.Dev.ViewModels;assembly=RogueEssence.Editor.Avalonia"
+                    xmlns:views="clr-namespace:RogueEssence.Dev.Views"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+                    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+                    xmlns:v="using:RogueEssence.Dev.Views"
+                    mc:Ignorable="d"
+                    x:Class="RogueEssence.Dev.Views.ModConfigWindowView"
+                    Title="Mod Config" Width="420" Height="480">
+    <Design.DataContext>
+        <vm:ModConfigWindowViewModel />
+    </Design.DataContext>
+    <Grid RowDefinitions="Auto,*">
+        <!-- TitleBar -->
+        <Grid Grid.Row="0" Height="28" IsVisible="{Binding !#ThisControl.UseSystemWindowFrame}">
+            <Border Background="{DynamicResource Brush.TitleBar}"
+                    BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border0}"
+                    PointerPressed="BeginMoveWindow" />
+
+            <Path Width="14" Height="14"
+                  Margin="10,0,0,0"
+                  HorizontalAlignment="Left"
+                  Data="{StaticResource Icons.SoftwareUpdate}"
+                  IsVisible="{OnPlatform True, macOS=False}" />
+
+            <TextBlock Classes="bold"
+                       Text="{Binding Title}"
+                       HorizontalAlignment="Center" VerticalAlignment="Center"
+                       IsHitTestVisible="False" />
+
+            <v:CaptionButtons HorizontalAlignment="Right"
+                              IsCloseButtonOnly="True"
+                              IsVisible="{OnPlatform True, macOS=False}" />
+
+        </Grid>
+        <Grid Grid.Row="1" Margin="4" RowDefinitions="188, *, 42">
+            <Grid RowDefinitions="36, 36, 36, 80" ColumnDefinitions="72, *">
+                <TextBlock Margin="4,2" Text="Name:" VerticalAlignment="Center" HorizontalAlignment="Right" />
+                <Grid Grid.Row="0" Grid.Column="1">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition />
+                        <ColumnDefinition Width="48" />
+                        <ColumnDefinition Width="72" />
+                    </Grid.ColumnDefinitions>
+                    <TextBox Text="{Binding Name}" VerticalAlignment="Center" Margin="4" />
+                    <TextBlock Margin="4,2" Text="Type:" VerticalAlignment="Center" HorizontalAlignment="Right"
+                               Grid.Column="1" />
+                    <views:SearchComboBox Margin="4,2" ItemsSource="{Binding ModTypes}"
+                                          SelectedIndex="{Binding ChosenModType}" Grid.Column="2" />
+                </Grid>
+
+                <TextBlock Margin="4,2" Text="Namespace:" VerticalAlignment="Center" HorizontalAlignment="Right"
+                           Grid.Row="1" />
+                <Grid Grid.Row="1" Grid.Column="1">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition />
+                        <ColumnDefinition Width="48" />
+                        <ColumnDefinition Width="72" />
+                    </Grid.ColumnDefinitions>
+                    <TextBox Text="{Binding Namespace}" VerticalAlignment="Center" Margin="4" />
+                    <TextBlock Margin="4,2" Text="Version:" VerticalAlignment="Center" HorizontalAlignment="Right"
+                               Grid.Column="1" />
+                    <TextBox Text="{Binding Version}" VerticalAlignment="Center" Margin="4" Grid.Column="2" />
+                </Grid>
+
+                <TextBlock Margin="4,2" Text="Author:" VerticalAlignment="Center" HorizontalAlignment="Right"
+                           Grid.Row="2" />
+                <TextBox Text="{Binding Author}" VerticalAlignment="Center" Margin="4" Grid.Row="2" Grid.Column="1" />
+                <TextBlock Margin="4,2" Text="Description:" VerticalAlignment="Top" HorizontalAlignment="Right"
+                           Grid.Row="3" />
+                <TextBox Text="{Binding Description}" AcceptsReturn="True" Margin="4" Grid.Row="3" Grid.Column="1" />
+            </Grid>
+
+            <Expander Grid.Row="1">
+                <Expander.Header>
+                    <Label Content="Advanced"></Label>
+                </Expander.Header>
+                <Grid RowDefinitions="36, 36, *" ColumnDefinitions="80, *">
+                    <TextBlock Margin="4,2" Text="UUID:" VerticalAlignment="Center" HorizontalAlignment="Right"
+                               Grid.Row="0" />
+                    <Grid Grid.Row="0" Grid.Column="1">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition />
+                            <ColumnDefinition Width="64" />
+                        </Grid.ColumnDefinitions>
+                        <TextBox Text="{Binding UUID}" IsReadOnly="True" VerticalAlignment="Center" Margin="4" />
+                        <Button Command="{Binding btnRegenUUID_Click}" Margin="4" Grid.Column="1">Regen</Button>
+                    </Grid>
+
+                    <TextBlock Margin="4,2" Text="Game Version:" VerticalAlignment="Center" HorizontalAlignment="Right"
+                               Grid.Row="1" />
+                    <TextBox Text="{Binding GameVersion}" VerticalAlignment="Center" Margin="4" Grid.Row="1"
+                             Grid.Column="1" />
+
+                    <TextBlock Margin="4" VerticalAlignment="Top" HorizontalAlignment="Right" Grid.Row="2">Relations:</TextBlock>
+                    <views:CollectionBox DataContext="{Binding Relationships}" Margin="4" Grid.Row="2" Grid.Column="1" />
+
+                </Grid>
+            </Expander>
+            <Grid Grid.Row="2">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition />
+                    <ColumnDefinition />
+                </Grid.ColumnDefinitions>
+                <Button Click="btnOK_Click" Margin="4" Grid.Column="0">OK</Button>
+                <Button Click="btnCancel_Click" Margin="4" Grid.Column="1">Cancel</Button>
+            </Grid>
+        </Grid>
+    </Grid>
+</v:ChromelessWindow>
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/ModConfigWindowView.axaml.cs b/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/ModConfigWindowView.axaml.cs
new file mode 100644
index 00000000..49e4b842
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/ModConfigWindowView.axaml.cs
@@ -0,0 +1,53 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+using Avalonia.Markup.Xaml;
+using RogueEssence.Dev.ViewModels;
+using System;
+
+namespace RogueEssence.Dev.Views
+{
+    public partial class ModConfigWindowView : ChromelessWindow
+    {
+        public ModConfigWindowView()
+        {
+            this.InitializeComponent();
+        }
+
+        public async void btnOK_Click(object sender, RoutedEventArgs e)
+        {
+            ModConfigViewModel2 vm = (ModConfigViewModel2)DataContext;
+            try
+            {
+                if (String.IsNullOrWhiteSpace(Text.Sanitize(vm.Name)))
+                    throw new InvalidOperationException("Invalid Name");
+                if (String.IsNullOrWhiteSpace(Text.Sanitize(vm.Namespace).ToLower()))
+                    throw new InvalidOperationException("Invalid Namespace");
+
+                Guid uuid = Guid.Parse(vm.UUID);
+                if (uuid == Guid.Empty)
+                    throw new InvalidOperationException("Invalid UUID");
+
+                Version.Parse(vm.Version);
+                Version.Parse(vm.GameVersion);
+
+                if (vm.ChosenModType < 0 || vm.ChosenModType >= (int)PathMod.ModType.Count)
+                    throw new InvalidOperationException("Invalid ModType");
+            }
+            catch (Exception ex)
+            {
+                DiagManager.Instance.LogError(ex, false);
+                await MessageBox.Show(this, ex.Message, "Invalid Input", MessageBox.MessageBoxButtons.Ok);
+                return;
+            }
+
+            this.Close(true);
+        }
+
+
+        public void btnCancel_Click(object sender, RoutedEventArgs e)
+        {
+            this.Close(false);
+        }
+    }
+}
diff --git a/RogueEssence.Editor.Avalonia/Views/New/ModSwitcherView.axaml b/RogueEssence.Editor.Avalonia/Views/New/ModSwitcherView.axaml
index 494687af..f501625c 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/ModSwitcherView.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/New/ModSwitcherView.axaml
@@ -4,9 +4,14 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              xmlns:vm="using:RogueEssence.Dev.ViewModels"
-             xmlns:m="using:RogueEssence.Dev.Models"
              x:DataType="vm:ModSwitcherViewModel"
              x:Class="RogueEssence.Dev.Views.ModSwitcherView">
+    
+    <Design.DataContext>
+        <vm:ModSwitcherViewModel />
+    </Design.DataContext>
+
+    
     <Grid RowDefinitions="Auto, Auto, *">
         
         <TextBlock Classes="table_header" FontSize="16">Mods</TextBlock>
@@ -50,11 +55,11 @@
             
 
             <ListBox.ItemTemplate>
-                <DataTemplate DataType="m:ModHeader">
+                <DataTemplate DataType="vm:ModsNodeViewModel">
                     <!-- Tapped="OnItemTapped" -->
                     <Grid RowDefinitions="Auto, Auto" Background="Transparent" Tapped="OnItemTapped" >
                         <TextBlock FontSize="14" Classes="primary"  Text="{Binding Name}" ></TextBlock>
-                        <TextBlock Grid.Row="1"  Classes="primary" Foreground="{DynamicResource Brush.FG2}" Text="{Binding Key}" />
+                        <TextBlock Grid.Row="1"  Classes="primary" Foreground="{DynamicResource Brush.FG2}" Text="{Binding Namespace}" />
                         <!-- <v:IconText Text="{Binding Name}" Icon="{Binding Icon}" IconSize="12" /> -->
                     </Grid>
                 </DataTemplate>
diff --git a/RogueEssence.Editor.Avalonia/Views/New/ModSwitcherView.axaml.cs b/RogueEssence.Editor.Avalonia/Views/New/ModSwitcherView.axaml.cs
index 47a88858..577444ea 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/ModSwitcherView.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/New/ModSwitcherView.axaml.cs
@@ -7,6 +7,8 @@
 using Avalonia.Threading;
 using RogueEssence.Dev.Models;
 using RogueEssence.Dev.ViewModels;
+using RogueEssence.Menu;
+using RogueEssence.Script;
 
 namespace RogueEssence.Dev.Views;
 
@@ -32,7 +34,7 @@ protected override async void OnKeyDown(KeyEventArgs e)
         if (e.Key != Key.Enter || DataContext is not ViewModels.ModSwitcherViewModel switcher)
             return;
 
-        var selected = ModsListBox.SelectedItem as  Models.ModHeader;
+        var selected = ModsListBox.SelectedItem as ModsNodeViewModel;
         if (selected is null)
             return;
         
@@ -47,12 +49,29 @@ protected override async void OnKeyDown(KeyEventArgs e)
         if (result == MessageBoxWindowView.MessageBoxResult.Cancel)
             return;
         
-        switcher.CurrentMod = selected;
+        // switcher.CurrentMod = selected;
         switcher.CloseSwitcher();
 
+        DevForm.ExecuteOrPend(() => _doSwitch(selected));
         e.Handled = true;
     }
 
+    private void _doSwitch(ModsNodeViewModel mod)
+    {
+        //modify and reload
+        lock (GameBase.lockObj)
+        {
+            LuaEngine.Instance.BreakScripts();
+            MenuManager.Instance.ClearMenus();
+            if (!String.IsNullOrEmpty(mod.Path))
+                GameManager.Instance.SetQuest(PathMod.GetModDetails(PathMod.FromApp(mod.Path)), new ModHeader[0] { }, new List<int>() { -1 });
+            else
+                GameManager.Instance.SetQuest(ModHeader.Invalid, new ModHeader[0] { }, new List<int>() { });
+
+            DiagManager.Instance.PrintModSettings();
+            DiagManager.Instance.SaveModSettings();
+        }
+    }
 
     private void ModsListBox_OnKeyDown(object? sender, KeyEventArgs e)
     {
@@ -78,7 +97,7 @@ private async void OnItemTapped(object sender, TappedEventArgs e)
         if (DataContext is not ModSwitcherViewModel switcher)
             return;
 
-        var selected = ModsListBox.SelectedItem as Models.ModHeader;
+        var selected = ModsListBox.SelectedItem as ModsNodeViewModel;
         if (selected is null)
             return;
         
@@ -93,7 +112,8 @@ private async void OnItemTapped(object sender, TappedEventArgs e)
         if (result == MessageBoxWindowView.MessageBoxResult.Cancel)
             return;
         
-        switcher.CurrentMod = selected;
+        // switcher.CurrentMod = selected;
+        DevForm.ExecuteOrPend(() => _doSwitch(selected));
         switcher.CloseSwitcher();
 
         e.Handled = true;

From a9c026189f265e7ca5a2df911c8f2ec7643509f4 Mon Sep 17 00:00:00 2001
From: Kace <41309226+DoubleTrio@users.noreply.github.com>
Date: Mon, 24 Nov 2025 20:33:53 -0500
Subject: [PATCH 17/51] mod switching works now

---
 .../ViewModels/New/DevFormViewModel.cs        | 200 ++++++++++--------
 .../ViewModels/New/ModSwitcherViewModel.cs    |  38 +++-
 .../ViewModels/New/Nodes/NodeBase.cs          |   2 +-
 .../Views/New/DevForm.axaml                   |  14 +-
 .../Views/New/DevForm.axaml.cs                |   8 +-
 .../Views/New/ModSwitcherView.axaml.cs        |  41 ++--
 6 files changed, 167 insertions(+), 136 deletions(-)

diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs
index 1d3d9411..575d36b1 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs
@@ -17,6 +17,8 @@
 using RogueEssence.Data;
 using RogueEssence.Dev.Utility;
 using RogueEssence.Dev.Views;
+using RogueEssence.Menu;
+using RogueEssence.Script;
 
 namespace RogueEssence.Dev.ViewModels;
 
@@ -36,13 +38,77 @@ public HierarchicalTreeDataGridSource<NodeBase> NodeSource
     public DevTabTravelViewModel Travel { get; set; }
     public DevTabSpritesViewModel Sprites { get; set; }
     public DevTabScriptViewModel Script { get; set; }
-    public DevTabModsViewModel Mods { get; set; }
+    // public DevTabModsViewModel Mods { get; set; }
     public DevTabConstantsViewModel Constants { get; set; }
 
 
     private readonly NodeFactory _nodeFactory;
 
+    public ObservableCollection<ModsNodeViewModel> Mods { get; }
 
+ 
+    private ModsNodeViewModel _chosenMod;
+
+    public ModsNodeViewModel ChosenMod
+    {
+        get => _chosenMod;
+        set { this.RaiseAndSetIfChanged(ref _chosenMod, value); }
+    }
+    
+    private string currentMod;
+    public string CurrentMod
+    {
+        get => currentMod;
+        set => this.SetIfChanged(ref currentMod, value);
+    }
+    
+    public void UpdateMod()
+    {
+        CurrentMod = _getModName(PathMod.Quest);
+    }
+    private void _reloadMods()
+    {
+        Mods.Clear();
+  
+        string[] modsPath = Directory.GetDirectories(PathMod.MODS_PATH);
+        ModsNodeViewModel chosenModel = new ModsNodeViewModel("Origins", PathMod.BaseNamespace, "");
+        Mods.Add(chosenModel);
+        foreach (string modPath in modsPath)
+        {
+            ModHeader header = PathMod.GetModDetails(modPath);
+            Mods.Add(new ModsNodeViewModel(_getModName(header), header.Namespace, Path.Combine(PathMod.MODS_FOLDER, Path.GetFileName(modPath))));
+            if (PathMod.Quest.Path == header.Path)
+            {
+                chosenModel = Mods[Mods.Count - 1];
+            }
+        }
+        ChosenMod = chosenModel;
+    }
+    
+    private void DoSwitch()
+    {
+        //modify and reload
+        lock (GameBase.lockObj)
+        {
+            LuaEngine.Instance.BreakScripts();
+            MenuManager.Instance.ClearMenus();
+            if (!String.IsNullOrEmpty(_chosenMod.Path))
+                GameManager.Instance.SetQuest(PathMod.GetModDetails(PathMod.FromApp(_chosenMod.Path)), new ModHeader[0] { }, new List<int>() { -1 });
+            else
+                GameManager.Instance.SetQuest(ModHeader.Invalid, new ModHeader[0] { }, new List<int>() { });
+
+            DiagManager.Instance.PrintModSettings();
+            DiagManager.Instance.SaveModSettings();
+        }
+    }
+    
+    private static string _getModName(ModHeader mod)
+    {
+        if (!mod.IsValid())
+            return null;
+        return mod.GetMenuName();
+    }
+    
     private bool _isTreeView;
 
     public bool IsTreeView
@@ -319,6 +385,7 @@ public DevFormViewModel(PageFactory pageFactory, NodeFactory nodeFactory, IDialo
         DevTabModsViewModel mods,
         DevTabConstantsViewModel constants)
     {
+        Mods = new ObservableCollection<ModsNodeViewModel>();
         // NOTE: These should all be private readonly
         Game = game;
         Player = player;
@@ -326,14 +393,13 @@ public DevFormViewModel(PageFactory pageFactory, NodeFactory nodeFactory, IDialo
         Travel = travel;
         Sprites = sprites;
         Script = script;
-        Mods = mods;
+        // Mods = mods;
         Constants = constants;
         _pageFactory = pageFactory;
         _tabEvents = tabEvents;
         _nodeFactory = nodeFactory;
         _dialogService = dialogService;
-
-        BuildNodes();
+        
         InitializeTabEvents();
 
         this.WhenAnyValue(x => x.ActivePage)
@@ -353,9 +419,7 @@ await _dialogService.ShowDialogAsync<PreferencesWindowViewModel, bool>(
                 PreferencesWindowViewModel.Instance, "Preferences");
         });
 
-        var tab = _pageFactory.CreatePage("DevControl");
-        tab.Icon = "Icons.GameControllerFill";
-        AddTopLevelPage(tab);
+      
         this.WhenAnyValue(x => x.Filter).Throttle(TimeSpan.FromMilliseconds(300)).Subscribe(ApplyFilter);
 
         NodeSource = new HierarchicalTreeDataGridSource<NodeBase>(Nodes)
@@ -374,18 +438,30 @@ await _dialogService.ShowDialogAsync<PreferencesWindowViewModel, bool>(
             },
         };
     }
-
-    public void ClearNodes()
-    {
-        Nodes.Clear();
-    }
-
+    
     public void LoadDevTree()
     {
-        var modsViewModel = _pageFactory.GetRequiredService<DevTabModsViewModel>();
-        var rootStr = modsViewModel.CurrentMod = string.IsNullOrEmpty(modsViewModel.CurrentMod)
-            ? "[NULL ORIGINS]"
-            : modsViewModel.CurrentMod;
+        Filter = "";
+        _reloadMods();
+
+        ActivePage = null;
+        TopLevelPages.Clear();
+        Pages.Clear();
+        _pageToNodeMap.Clear();
+        
+        var tab = _pageFactory.CreatePage("DevControl");
+        tab.Icon = "Icons.GameControllerFill";
+        AddTopLevelPage(tab);
+
+
+        foreach (var n in Nodes)
+        {
+            DetachEventsRecursive(n);
+        }
+        
+        Nodes.Clear();
+       
+        var rootStr = ChosenMod.Name;
 
         var root = _nodeFactory.CreateOpenEditorNode(rootStr, "Icons.ScrollFill", "");
 
@@ -417,6 +493,7 @@ public void LoadDevTree()
         Nodes.Add(root);
 
         AttachEventsRecursive(root);
+        root.IsExpanded = true;
     }
 
     private void CreateDataNode(NodeBase parent)
@@ -611,90 +688,27 @@ private void InitializeTabEvents()
         _tabEvents.NavigateToTabEvent += (tab) => { ActivePage = tab; };
     }
 
-    private void BuildNodes()
+    private void AttachEventsRecursive(NodeBase node)
     {
-        // var halcyonNode = _nodeFactory.CreateOpenEditorNode("Halcyon", "Icons.FloppyDiskBackFill", "ModInfoEditor");
-        //
-        // halcyonNode.SubNodes.Add(
-        //     _nodeFactory.CreateOpenEditorNode("Dev Control", "Icons.GameControllerFill", "DevControl"));
-        // halcyonNode.SubNodes.Add(_nodeFactory.CreateOpenEditorNode("Zone Editor", "Icons.StairsFill", "ZoneEditor"));
-        // halcyonNode.SubNodes.Add(
-        //     _nodeFactory.CreateOpenEditorNode("Ground Editor", "Icons.MapTrifoldFill", "GroundEditor"));
-        // halcyonNode.SubNodes.Add(_nodeFactory.CreateOpenEditorNode("Testing", "Icons.BedFill", "RandomInfo"));
-        // halcyonNode.SubNodes.Add(_nodeFactory.CreateOpenEditorNode("Tab Test", "Icons.AirplaneFill", "SpritePage"));
-        //
-        // halcyonNode.SubNodes.Add(_nodeFactory.CreateOpenEditorNode("Constants", "Icons.ListFill"));
-
-        // var monstersRoot = _nodeFactory.CreateDataRootNode("Monsters", "Monsters", "Monsters", "Icons.GhostFill");
-
-
-        //             new OpenEditorNode("Dev Control", "Icons.GameControllerFill", "DevControl"),
-        //             new OpenEditorNode("Zone Editor", "Icons.StairsFill", "ZoneEditor"),
-        //             new OpenEditorNode("Ground Editor", "Icons.MapTrifoldFill", "GroundEditor"),
-        //             new OpenEditorNode("Testing", "Icons.BedFill", "RandomInfo"),
-
+        node.SubNodesChanged += () => OnSubNodesChanged();
 
-        // monstersRoot.SubNodes.Add(_nodeFactory.CreateDataItemNode("eevee", "MonsterEditor", "eevee: Eevee",
-        //     "Icons.GhostFill"));
-        // monstersRoot.SubNodes.Add(_nodeFactory.CreateDataItemNode("seviper", "MonsterEditor", "seviper: Seviper",
-        //     "Icons.GhostFill"));
-
-        // var particlesRoot = _nodeFactory.CreateSpriteRootNode("particles", "", "Particles", "Icons.PaintBrushFill");
-        // particlesRoot.SubNodes.Add(_nodeFactory.CreateDataItemNode("Acid_Blue", "SpriteEditor", "Acid_Blue",
-        //     "Icons.PaintBrushFill"));
-        // particlesRoot.SubNodes.Add(_nodeFactory.CreateDataItemNode("Acid_Red", "SpriteEditor", "Acid_Red",
-        //     "Icons.PaintBrushFill"));
-        //
-        // halcyonNode.SubNodes.Add(particlesRoot);
-        //             new NodeBase("Sprites", "Icons.PaintBrushFill")
-        //             {
-        //                 SubNodes = new ObservableCollection<NodeBase>
-        //                 {
-        //                     new NodeBase("Char Sprites", "Icons.GhostFill"),
-        //                     new NodeBase("Portraits", "Icons.ImagesSquareFill"),
-        //                     new ActionDataNode("Particles", "Icons.ShootingStarFill")
-        //                     {
-        //                         SubNodes = new ObservableCollection<NodeBase>
-        //                         {
-        //                             new NodeBase("Absorb", "Icons.ShootingStarFill"),
-        //                             new NodeBase("Acid_Blue", "Icons.ShootingStarFill"),
-        //                         }
-        //                     },
-        //                     new ActionDataNode("Beam", "Icons.HeadlightsFill")
-        //                     {
-        //                         SubNodes = new ObservableCollection<NodeBase>
-        //                         {
-        //                             new NodeBase("Beam_2", "Icons.HeadlightsFill"),
-        //                             new NodeBase("Beam_Pink", "Icons.HeadlightsFill"),
-        //                         }
-        //                     },
-        //                 }
-        //             },
-        //             new NodeBase("Mods", "Icons.SwordFill")
-        //             {
-        //                 SubNodes = new ObservableCollection<NodeBase>
-        //                 {
-        //                     new NodeBase("halcyon: Halcyon", "Icons.SwordFill"),
-        //                     new NodeBase("zorea_mystery_dungeon: Zorea Mystery Dungeon", "Icons.SwordFill"),
-        //                 }
-        //             }
-        //         }
-
-        // halcyonNode.SubNodes.Add(monstersRoot);
-        // Nodes = new ObservableCollection<NodeBase> { halcyonNode };
-
-        // halcyonNode.IsExpanded = true;
-        // monstersRoot.IsExpanded = true;
+        foreach (var child in node.SubNodes)
+            AttachEventsRecursive(child);
     }
 
-    private void AttachEventsRecursive(NodeBase node)
+    private void DetachEventsRecursive(NodeBase node)
     {
-        node.SubNodesChanged += () => RefreshTreeDataGrid();
+        node.SubNodesChanged -= OnSubNodesChanged;
 
         foreach (var child in node.SubNodes)
-            AttachEventsRecursive(child);
+            DetachEventsRecursive(child);
     }
-
+    
+    private void OnSubNodesChanged()
+    {
+        RefreshTreeDataGrid();
+    }
+    
     private TabSwitcherViewModel? _tabSwitcher;
 
     public TabSwitcherViewModel? TabSwitcher
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/ModSwitcherViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/ModSwitcherViewModel.cs
index 3422730c..490bb1bd 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/ModSwitcherViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/ModSwitcherViewModel.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Threading.Tasks;
@@ -5,6 +6,8 @@
 using RogueEssence.Dev.Services;
 using ReactiveUI;
 using RogueEssence.Dev.Views;
+using RogueEssence.Menu;
+using RogueEssence.Script;
 
 namespace RogueEssence.Dev.ViewModels;
 
@@ -27,7 +30,7 @@ public ModSwitcherViewModel(DevFormViewModel mainWindowViewModel, IDialogService
         _mainWindow = mainWindowViewModel;
         _dialogService = dialogService;
 
-        Mods = new ObservableCollection<ModsNodeViewModel>(mainWindowViewModel.Mods.Mods);
+        Mods = new ObservableCollection<ModsNodeViewModel>(mainWindowViewModel.Mods);
     }
     
     
@@ -36,20 +39,43 @@ public void CloseSwitcher()
         _mainWindow.OnModSwitcherClosed();
     }
     
-    public async Task<MessageBoxWindowView.MessageBoxResult> ConfirmModSwitchAsync()
+    public async Task ConfirmModSwitchAsync()
     {
-        return await MessageBoxWindowView.Show(_dialogService, "The game will be reloaded to use content from the new path. Click OK to proceed. Your changes will not be saved.", "Are you sure?", MessageBoxWindowView.MessageBoxButtons.OkCancel);
+        var res = await MessageBoxWindowView.Show(_dialogService, "The game will be reloaded to use content from the new path. Click OK to proceed. Your changes will not be saved.", "Are you sure?", MessageBoxWindowView.MessageBoxButtons.OkCancel);
+        if (res == MessageBoxWindowView.MessageBoxResult.Ok)
+        {
+            DevForm.ExecuteOrPend(() => _doSwitch(SelectedMod));
+        }
     }
     
     public ModsNodeViewModel CurrentMod
     {
-        get => _mainWindow.Mods.ChosenMod;
-        set => _mainWindow.Mods.ChosenMod = value;
+        get => _mainWindow.ChosenMod;
+        set => _mainWindow.ChosenMod = value;
     }
 
     public bool IsCurrent(ModsNodeViewModel head)
     { 
-        return head.Namespace == _mainWindow.Mods.ChosenMod.Namespace;
+        Console.WriteLine("0" + _mainWindow.ChosenMod);
+        Console.WriteLine("1" + head.Namespace);
+        return head.Namespace == _mainWindow.ChosenMod.Namespace;
+    }
+    
+    private void _doSwitch(ModsNodeViewModel mod)
+    {
+        //modify and reload
+        lock (GameBase.lockObj)
+        {
+            LuaEngine.Instance.BreakScripts();
+            MenuManager.Instance.ClearMenus();
+            if (!String.IsNullOrEmpty(mod.Path))
+                GameManager.Instance.SetQuest(PathMod.GetModDetails(PathMod.FromApp(mod.Path)), new ModHeader[0] { }, new List<int>() { -1 });
+            else
+                GameManager.Instance.SetQuest(ModHeader.Invalid, new ModHeader[0] { }, new List<int>() { });
+
+            DiagManager.Instance.PrintModSettings();
+            DiagManager.Instance.SaveModSettings();
+        }
     }
 }
 
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/NodeBase.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/NodeBase.cs
index f85cbf99..bb554de2 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/NodeBase.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/NodeBase.cs
@@ -88,7 +88,7 @@ private void OnSubNodesChanged(object? s, NotifyCollectionChangedEventArgs e)
                 child.SubNodesChanged += SubNodesChanged;
             }
         }
-
+        
         if (e.OldItems != null)
         {
             foreach (NodeBase child in e.OldItems)
diff --git a/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml b/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml
index fcc55f65..ebbe1ca3 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml
@@ -61,12 +61,16 @@
                 </Button>
 
                 <!-- Switch Mod Button  -->
-                <Button ToolTip.Tip="{Binding CurrentMod.Key}" Margin="12, 0, 0, 0" Grid.Column="3"
+                <!-- TODO: figure out why tooltips won't work -->
+                <Button Margin="12,0,0,0" Grid.Column="3"
                         Classes="icon_button"
-                        x:Name="ModSwitcherFlyoutButton" Padding="0, 4, 0, 0">
-
-                    <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
-                        <TextBlock Padding="0, 0, 6, 0" Text="{Binding Mods.CurrentMod}" />
+                        x:Name="ModSwitcherFlyoutButton" Padding="0,4,0,0"
+                        ToolTip.Tip="testing tooltip">
+                    <StackPanel Orientation="Horizontal"
+                                VerticalAlignment="Center">
+                        <TextBlock Padding="0,0,6,0" Text="{Binding ChosenMod.Name}"
+                                   MaxWidth="200"
+                                   TextTrimming="CharacterEllipsis" />
                         <Path HorizontalAlignment="Center" Width="10" Height="10" Margin="0,2,0,0"
                               Data="{StaticResource Icons.CaretDownFill}" />
                     </StackPanel>
diff --git a/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml.cs b/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml.cs
index 4cca8822..e0c5cd07 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml.cs
@@ -119,9 +119,9 @@ private void reload(DataManager.DataType dataType)
                     devViewModel.Travel.ReloadZones();
 
                 if (dataType == DataManager.DataType.All)
-                    devViewModel.Mods.UpdateMod();
-
-                devViewModel.ClearNodes();
+                    devViewModel.UpdateMod();
+                
+                Console.WriteLine("Dev Editor Reloaded!");
                 devViewModel.LoadDevTree();
                 LoadComplete = true;
                 
@@ -504,7 +504,7 @@ protected override void OnDataContextChanged(EventArgs e)
         base.OnDataContextChanged(e);
         if (DataContext is DevFormViewModel vm)
         {
-            // vm.ModSwitcherClosed += () => ModSwitcherFlyoutButton.Flyout?.Hide();;
+            vm.ModSwitcherClosed += () => ModSwitcherFlyoutButton.Flyout?.Hide();;
         }
     }
     
diff --git a/RogueEssence.Editor.Avalonia/Views/New/ModSwitcherView.axaml.cs b/RogueEssence.Editor.Avalonia/Views/New/ModSwitcherView.axaml.cs
index 577444ea..0e609104 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/ModSwitcherView.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/New/ModSwitcherView.axaml.cs
@@ -45,34 +45,19 @@ protected override async void OnKeyDown(KeyEventArgs e)
             return;
         }
         
-        var result = await switcher.ConfirmModSwitchAsync();
-        if (result == MessageBoxWindowView.MessageBoxResult.Cancel)
-            return;
+        switcher.CloseSwitcher();
+        await switcher.ConfirmModSwitchAsync();
+        // if (result == MessageBoxWindowView.MessageBoxResult.Cancel)
+        //     return;
         
         // switcher.CurrentMod = selected;
-        switcher.CloseSwitcher();
+      
 
-        DevForm.ExecuteOrPend(() => _doSwitch(selected));
+        // DevForm.ExecuteOrPend(() => _doSwitch(selected));
         e.Handled = true;
     }
 
-    private void _doSwitch(ModsNodeViewModel mod)
-    {
-        //modify and reload
-        lock (GameBase.lockObj)
-        {
-            LuaEngine.Instance.BreakScripts();
-            MenuManager.Instance.ClearMenus();
-            if (!String.IsNullOrEmpty(mod.Path))
-                GameManager.Instance.SetQuest(PathMod.GetModDetails(PathMod.FromApp(mod.Path)), new ModHeader[0] { }, new List<int>() { -1 });
-            else
-                GameManager.Instance.SetQuest(ModHeader.Invalid, new ModHeader[0] { }, new List<int>() { });
-
-            DiagManager.Instance.PrintModSettings();
-            DiagManager.Instance.SaveModSettings();
-        }
-    }
-
+    
     private void ModsListBox_OnKeyDown(object? sender, KeyEventArgs e)
     {
         if (DataContext is not ModSwitcherViewModel switcher)
@@ -101,20 +86,22 @@ private async void OnItemTapped(object sender, TappedEventArgs e)
         if (selected is null)
             return;
         
+        Console.WriteLine("Capped");
         if (switcher.IsCurrent(selected))
         {
+            Console.WriteLine("Same");
             switcher.CloseSwitcher();
             e.Handled = true;
             return;
         }
+        Console.WriteLine("Tapped");
         
-        var result = await switcher.ConfirmModSwitchAsync();
-        if (result == MessageBoxWindowView.MessageBoxResult.Cancel)
-            return;
+        switcher.CloseSwitcher();
+        await switcher.ConfirmModSwitchAsync();
         
         // switcher.CurrentMod = selected;
-        DevForm.ExecuteOrPend(() => _doSwitch(selected));
-        switcher.CloseSwitcher();
+        // DevForm.ExecuteOrPend(() => _doSwitch(selected));
+  
 
         e.Handled = true;
     }

From 79653a43aa1b35f3aac5d497b139073c4e47f4cd Mon Sep 17 00:00:00 2001
From: Kace <41309226+DoubleTrio@users.noreply.github.com>
Date: Thu, 27 Nov 2025 06:17:44 -0500
Subject: [PATCH 18/51] refactor page factory, use type instead string keys

---
 RogueEssence.Editor.Avalonia/App.axaml.cs     |  18 +-
 RogueEssence.Editor.Avalonia/NodeFactory.cs   |  65 +--
 RogueEssence.Editor.Avalonia/PageFactory.cs   |  99 +++-
 .../RogueEssence.Editor.Avalonia.csproj       |   4 +
 .../DevForm/DevTabConstantsViewModel.cs       |   2 +
 .../ViewModels/New/DevFormViewModel.cs        | 471 ++++++++++++------
 .../New/Editors/DataListPageViewModel.cs      |  15 +
 .../New/Editors/DevControlViewModel.cs        |   5 +-
 .../New/Editors/DevEditPageViewModel.cs       |   7 +-
 .../New/Editors/EditorPageViewModel.cs        |  35 +-
 .../New/Editors/GroundEditorPageViewModel.cs  |   3 +-
 .../New/Editors/ModInfoEditorViewModel.cs     |   5 +-
 .../New/Editors/RandomInfoPageViewModel.cs    |   2 +-
 .../New/Editors/SpeciesEditPageViewModel.cs   |  37 +-
 .../New/Editors/SpritePageViewModel.cs        |   7 +-
 .../New/Editors/ZoneEditorPageViewModel.cs    |   5 +-
 .../ViewModels/New/Nodes/NodeBase.cs          | 113 ++++-
 .../New/Nodes/SpriteAssetTypeStrategy.cs      |   6 +-
 .../New/Nodes/SpriteTileStrategy.cs           |   6 +-
 .../Views/DialogBoxes/ModConfigWindow.axaml   |  33 +-
 .../DialogBoxes/ModConfigWindow.axaml.cs      |   4 +-
 .../Views/New/DevForm.axaml                   |   2 +-
 .../New/DialogBoxes/ModConfigWindowView.axaml |  18 +-
 .../Views/New/Editors/DataListPageView.axaml  |  10 +
 .../New/Editors/DataListPageView.axaml.cs     |  13 +
 25 files changed, 663 insertions(+), 322 deletions(-)
 create mode 100644 RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DataListPageViewModel.cs
 create mode 100644 RogueEssence.Editor.Avalonia/Views/New/Editors/DataListPageView.axaml
 create mode 100644 RogueEssence.Editor.Avalonia/Views/New/Editors/DataListPageView.axaml.cs

diff --git a/RogueEssence.Editor.Avalonia/App.axaml.cs b/RogueEssence.Editor.Avalonia/App.axaml.cs
index 21140939..89a642db 100644
--- a/RogueEssence.Editor.Avalonia/App.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/App.axaml.cs
@@ -68,6 +68,7 @@ public static void AddCommonServices(this IServiceCollection collection)
             collection.AddTransient<ModInfoEditorViewModel>();
             collection.AddTransient<DevEditPageViewModel>();
             collection.AddTransient<SpeciesEditPageViewModel>();
+            collection.AddTransient<DataListPageViewModel>();
         }
         
         private static void AddDevTabViewModels(this IServiceCollection services)
@@ -86,14 +87,15 @@ public static void RegisterPages(this IServiceProvider provider)
         {
             var pageFactory = provider.GetRequiredService<PageFactory>();
 
-            pageFactory.Register<DevControlViewModel>("DevControl");
-            pageFactory.Register<ZoneEditorPageViewModel>("ZoneEditor");
-            pageFactory.Register<GroundEditorPageViewModel>("GroundEditor");
-            pageFactory.Register<RandomInfoPageViewModel>("RandomInfo");
-            pageFactory.Register<SpritePageViewModel>("SpritePage");
-            pageFactory.Register<ModInfoEditorViewModel>("ModInfoEditor");
-            pageFactory.Register<DevEditPageViewModel>("DevEditEditor");
-            pageFactory.Register<SpeciesEditPageViewModel>("SpeciesSpriteEditor");
+            pageFactory.Register<DevControlViewModel>();
+            pageFactory.Register<ZoneEditorPageViewModel>();
+            pageFactory.Register<GroundEditorPageViewModel>();
+            pageFactory.Register<RandomInfoPageViewModel>();
+            pageFactory.Register<SpritePageViewModel>();
+            pageFactory.Register<ModInfoEditorViewModel>();
+            pageFactory.Register<DevEditPageViewModel>();
+            pageFactory.Register<SpeciesEditPageViewModel>();
+            pageFactory.Register<DataListPageViewModel>();
         }
     }
 
diff --git a/RogueEssence.Editor.Avalonia/NodeFactory.cs b/RogueEssence.Editor.Avalonia/NodeFactory.cs
index d2aec450..210c1405 100644
--- a/RogueEssence.Editor.Avalonia/NodeFactory.cs
+++ b/RogueEssence.Editor.Avalonia/NodeFactory.cs
@@ -23,38 +23,47 @@ public T Create<T>(params object[] args)
         {
             return (T)ActivatorUtilities.CreateInstance(_serviceProvider, typeof(T), args);
         }
-
-        public OpenEditorNode CreateOpenEditorNode(string title, string? icon = null, string editorKey = "")
-            => Create<OpenEditorNode>(title, icon, editorKey);
         
-        public OpenEditorNodeWithParams CreateOpenEditorNodeWithParams(
+        public OpenEditorNode CreateOpenEditorNode<TEditor>(string title, string? icon = null)
+            where TEditor : EditorPageViewModel
+            => Create<OpenEditorNode>(title, typeof(TEditor), icon);
+        
+        public OpenEditorNodeWithParams CreateOpenEditorNodeWithParams<TEditor>(
             string title,
-            string? icon = null,
-            string editorKey = "",
-            params object[] extraParams)
-            => Create<OpenEditorNodeWithParams>(title, icon, editorKey, extraParams);
-
-        public DataRootNode CreateDataRootNode(DataManager.DataType dataType, string editorKey, string title, string? icon = null)
-        {
-            return Create<DataRootNode>(dataType, editorKey, title, icon);
-        }
-
-        public DataItemNode CreateDataItemNode(string key, string editorKey, string title, string? icon = null)
-            => Create<DataItemNode>(key, editorKey, title, icon);
+            object[] extraParams,
+            string? icon = null)
+            where TEditor : EditorPageViewModel
+            => Create<OpenEditorNodeWithParams>(title, typeof(TEditor), extraParams, icon);
+        
+        public DataRootNode CreateDataRootNode<TEditor>(DataManager.DataType dataType, string title, string? icon = null)
+            where TEditor : EditorPageViewModel
+            => Create<DataRootNode>(dataType, typeof(TEditor), title, icon);
+        
+        public ModRootNode CreateModRootNode<TEditor>(string title, string? icon = null)
+            where TEditor : EditorPageViewModel
+            => Create<ModRootNode>(typeof(TEditor), title, icon);
+        
+        public DataItemNode CreateDataItemNode<TEditor>(string key, string title, string? icon = null)
+            where TEditor : EditorPageViewModel
+            => Create<DataItemNode>(key, typeof(TEditor), title, icon);
 
-        // I cannot for the life of figure out of why none of the create methods work... but I guess this will do
         public PageNode CreatePageNode(EditorPageViewModel childPage, PageNode? parentNode = null)
-
             => new PageNode(_serviceProvider.GetService<IDialogService>(), this, childPage, parentNode);
-        // => Create<PageNode>(childPage, parentNode);
-        // => Create<PageNode>(this, childPage, parentNode);
-
-
-        public SpriteRootNode CreateSpriteRootNode(GraphicsManager.AssetType assetType, string editorKey, string title, string? icon = null)
-            => Create<SpriteRootNode>(assetType, editorKey, title, icon);
         
-        public SpriteTileRootNode CreateSpriteTileRootNode(string editorKey, string title, string? icon = null)
-            => Create<SpriteTileRootNode>(editorKey, title, icon);
-
+        public SpriteRootNode CreateSpriteRootNode<TEditor>(GraphicsManager.AssetType assetType, string title, string? icon = null)
+            where TEditor : EditorPageViewModel
+            => Create<SpriteRootNode>(assetType, typeof(TEditor), title, icon);
+        
+        public SpriteTileRootNode CreateSpriteTileRootNode<TEditor>(string title, string? icon = null)
+            where TEditor : EditorPageViewModel
+            => Create<SpriteTileRootNode>(typeof(TEditor), title, icon);
+        
+        public OpenEditorNodeFX<T> CreateOpenEditorNodeFX<T, TEditor>(
+            string title, 
+            Func<T> getter, 
+            Action<T> setter,
+            string? icon = null)
+            where TEditor : EditorPageViewModel
+            => Create<OpenEditorNodeFX<T>>(title, typeof(TEditor), getter, setter, icon);
     }
-}
+}
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/PageFactory.cs b/RogueEssence.Editor.Avalonia/PageFactory.cs
index d7064efb..02ac581a 100644
--- a/RogueEssence.Editor.Avalonia/PageFactory.cs
+++ b/RogueEssence.Editor.Avalonia/PageFactory.cs
@@ -40,57 +40,102 @@ public T GetRequiredService<T>() where T : notnull
     public class PageFactory
     {
         private readonly IServiceProvider _provider;
-        private readonly Dictionary<string, Type> _map = new();
+        private readonly HashSet<Type> _registeredTypes = new();
 
         public PageFactory(IServiceProvider provider)
         {
             _provider = provider;
         }
 
-        public void Register<TPage>(string key) where TPage : EditorPageViewModel
+        public void Register<TPage>() where TPage : EditorPageViewModel
         {
-            _map[key] = typeof(TPage);
+            _registeredTypes.Add(typeof(TPage));
         }
-    
-        public EditorPageViewModel? CreatePage(string key)
+
+        public TPage? CreatePage<TPage>() where TPage : EditorPageViewModel
         {
-            if (_map.TryGetValue(key, out var type))
+            var type = typeof(TPage);
+        
+            if (!_registeredTypes.Contains(type))
             {
-                return (EditorPageViewModel)_provider.GetRequiredService(type);
+                return null;
             }
-    
-            return null;
+
+            return (TPage)_provider.GetRequiredService(type);
         }
-    
-        public EditorPageViewModel? CreatePage(string key, NodeBase? node = null)
+        
+        public EditorPageViewModel? CreatePage(Type pageType, NodeBase? node = null)
         {
-            if (_map.TryGetValue(key, out var type))
+            
+            if (!typeof(EditorPageViewModel).IsAssignableFrom(pageType))
+            {
+                throw new ArgumentException(
+                    $"Type {pageType.Name} must derive from EditorPageViewModel", 
+                    nameof(pageType));
+            }
+            
+            if (!_registeredTypes.Contains(pageType))
             {
-                if (node != null)
-                {
-                    return (EditorPageViewModel)
-                        ActivatorUtilities.CreateInstance(_provider, type, node);
-                }
-                
-                return (EditorPageViewModel)_provider.GetRequiredService(type);
+                return null;
             }
 
-            return null;
+            if (node != null)
+            {
+                return (EditorPageViewModel)ActivatorUtilities.CreateInstance(_provider, pageType, node);
+            }
+    
+            return (EditorPageViewModel)_provider.GetRequiredService(pageType);
         }
+
+        
+        // public EditorPageViewModel? CreatePage(Type pageType)
+        // {
+        //     
+        //     if (!typeof(EditorPageViewModel).IsAssignableFrom(pageType))
+        //     {
+        //         throw new ArgumentException(
+        //             $"Type {pageType.Name} must derive from EditorPageViewModel", 
+        //             nameof(pageType));
+        //     }
+        //     
+        //     if (!_registeredTypes.Contains(pageType))
+        //     {
+        //         return null;
+        //     }
+        //     
+        //     return (EditorPageViewModel)_provider.GetRequiredService(pageType);
+        // }
         
-        // TODO: see if create page or the one above is better...
-        public T CreatePage<T>() where T : EditorPageViewModel
+        public TPage? CreatePage<TPage>(NodeBase? node) where TPage : EditorPageViewModel
         {
-            Console.WriteLine("Don't use this...");
-            return _provider.GetRequiredService<T>();
+            var type = typeof(TPage);
+        
+            if (!_registeredTypes.Contains(type))
+            {
+                return null;
+            }
+
+            if (node != null)
+            {
+                return (TPage)ActivatorUtilities.CreateInstance(_provider, type, node);
+            }
+        
+            return (TPage)_provider.GetRequiredService(type);
         }
-    
+        
+        // // TODO: see if create page or the one above is better...
+        // public T CreatePage<T>() where T : EditorPageViewModel
+        // {
+        //     Console.WriteLine("Don't use this...");
+        //     return _provider.GetRequiredService<T>();
+        // }
+        //
         public void PrintRegisteredPages()
         {
             Console.WriteLine("Registered pages:");
-            foreach (var entry in _map)
+            foreach (var entry in _registeredTypes)
             {
-                Console.WriteLine($"Key: {entry.Key}, Type: {entry.Value.FullName}");
+                Console.WriteLine($"Type: {entry}");
             }
         }
     
diff --git a/RogueEssence.Editor.Avalonia/RogueEssence.Editor.Avalonia.csproj b/RogueEssence.Editor.Avalonia/RogueEssence.Editor.Avalonia.csproj
index c2c1b15d..caa45c6f 100644
--- a/RogueEssence.Editor.Avalonia/RogueEssence.Editor.Avalonia.csproj
+++ b/RogueEssence.Editor.Avalonia/RogueEssence.Editor.Avalonia.csproj
@@ -203,6 +203,10 @@
       <DependentUpon>ModConfigWindow.axaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
+    <Compile Update="Views\New\Editors\DataListPageView.axaml.cs">
+      <DependentUpon>DataListPageView.axaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Models\" />
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevTabConstantsViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevTabConstantsViewModel.cs
index d14cee18..d425fbb6 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevTabConstantsViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevTabConstantsViewModel.cs
@@ -173,6 +173,8 @@ private void OpenItem<T>(string name, T data, SaveFX<T> saveOp)
             lock (GameBase.lockObj)
             {
                 Views.DataEditForm editor = new Views.DataEditRootForm();
+                // EditorPageViewModel page = new EditorPageViewModel();
+                // pag
                 editor.Title = DataEditor.GetWindowTitle("", name, data, data.GetType());
                 DataEditor.LoadDataControls("", data, editor);
                 editor.SelectedOKEvent += async () =>
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs
index 575d36b1..a06e0ca3 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs
@@ -37,7 +37,9 @@ public HierarchicalTreeDataGridSource<NodeBase> NodeSource
     public DevTabDataViewModel Data { get; set; }
     public DevTabTravelViewModel Travel { get; set; }
     public DevTabSpritesViewModel Sprites { get; set; }
+
     public DevTabScriptViewModel Script { get; set; }
+
     // public DevTabModsViewModel Mods { get; set; }
     public DevTabConstantsViewModel Constants { get; set; }
 
@@ -46,7 +48,7 @@ public HierarchicalTreeDataGridSource<NodeBase> NodeSource
 
     public ObservableCollection<ModsNodeViewModel> Mods { get; }
 
- 
+
     private ModsNodeViewModel _chosenMod;
 
     public ModsNodeViewModel ChosenMod
@@ -54,37 +56,41 @@ public ModsNodeViewModel ChosenMod
         get => _chosenMod;
         set { this.RaiseAndSetIfChanged(ref _chosenMod, value); }
     }
-    
+
     private string currentMod;
+
     public string CurrentMod
     {
         get => currentMod;
         set => this.SetIfChanged(ref currentMod, value);
     }
-    
+
     public void UpdateMod()
     {
         CurrentMod = _getModName(PathMod.Quest);
     }
+
     private void _reloadMods()
     {
         Mods.Clear();
-  
+
         string[] modsPath = Directory.GetDirectories(PathMod.MODS_PATH);
         ModsNodeViewModel chosenModel = new ModsNodeViewModel("Origins", PathMod.BaseNamespace, "");
         Mods.Add(chosenModel);
         foreach (string modPath in modsPath)
         {
             ModHeader header = PathMod.GetModDetails(modPath);
-            Mods.Add(new ModsNodeViewModel(_getModName(header), header.Namespace, Path.Combine(PathMod.MODS_FOLDER, Path.GetFileName(modPath))));
+            Mods.Add(new ModsNodeViewModel(_getModName(header), header.Namespace,
+                Path.Combine(PathMod.MODS_FOLDER, Path.GetFileName(modPath))));
             if (PathMod.Quest.Path == header.Path)
             {
                 chosenModel = Mods[Mods.Count - 1];
             }
         }
+
         ChosenMod = chosenModel;
     }
-    
+
     private void DoSwitch()
     {
         //modify and reload
@@ -93,7 +99,8 @@ private void DoSwitch()
             LuaEngine.Instance.BreakScripts();
             MenuManager.Instance.ClearMenus();
             if (!String.IsNullOrEmpty(_chosenMod.Path))
-                GameManager.Instance.SetQuest(PathMod.GetModDetails(PathMod.FromApp(_chosenMod.Path)), new ModHeader[0] { }, new List<int>() { -1 });
+                GameManager.Instance.SetQuest(PathMod.GetModDetails(PathMod.FromApp(_chosenMod.Path)),
+                    new ModHeader[0] { }, new List<int>() { -1 });
             else
                 GameManager.Instance.SetQuest(ModHeader.Invalid, new ModHeader[0] { }, new List<int>() { });
 
@@ -101,14 +108,14 @@ private void DoSwitch()
             DiagManager.Instance.SaveModSettings();
         }
     }
-    
+
     private static string _getModName(ModHeader mod)
     {
         if (!mod.IsValid())
             return null;
         return mod.GetMenuName();
     }
-    
+
     private bool _isTreeView;
 
     public bool IsTreeView
@@ -116,7 +123,7 @@ public bool IsTreeView
         get => _isTreeView;
         set { this.RaiseAndSetIfChanged(ref _isTreeView, value); }
     }
-    
+
     public void OpenTabSwitcher()
     {
         TabSwitcher = _pageFactory.GetRequiredService<TabSwitcherViewModel>();
@@ -234,7 +241,7 @@ public ObservableCollection<PageNode> TopLevelPages
 
     public void AddTopLevelPage(EditorPageViewModel page)
     {
-        // Console.WriteLine($"Adding top level page {page}");
+        Console.WriteLine($"Adding top level page {page}");
         var navigated = TryNavigateToExistingPage(page);
         if (navigated) return;
 
@@ -264,6 +271,8 @@ public void AddChildPage(EditorPageViewModel parentPage, EditorPageViewModel chi
         {
             var childNode = parentNode.AddChild(childPage);
             _pageToNodeMap[childPage] = childNode;
+            
+            // Try to insert the child page to the right of the parent
             var parentIndex = Pages.IndexOf(parentPage);
             if (parentIndex == -1)
             {
@@ -283,20 +292,17 @@ public void AddChildPage(EditorPageViewModel parentPage, EditorPageViewModel chi
     // Returns whether the navigation was successful
     private bool TryNavigateToExistingPage(EditorPageViewModel page)
     {
-        if (!string.IsNullOrEmpty(page.UniqueId))
+        var existing = Pages.FirstOrDefault(p => p.Equals(page));
+        if (existing != null)
         {
-            var existing = Pages.FirstOrDefault(p => p.UniqueId == page.UniqueId);
-            if (existing != null)
-            {
-                TemporaryTab = null;
-                ActivePage = existing;
-                return true;
-            }
+            TemporaryTab = null;
+            ActivePage = existing;
+            return true;
         }
 
         return false;
     }
-
+    
     public bool PageHasChildren(EditorPageViewModel page)
     {
         if (!_pageToNodeMap.TryGetValue(page, out var node))
@@ -399,7 +405,7 @@ public DevFormViewModel(PageFactory pageFactory, NodeFactory nodeFactory, IDialo
         _tabEvents = tabEvents;
         _nodeFactory = nodeFactory;
         _dialogService = dialogService;
-        
+
         InitializeTabEvents();
 
         this.WhenAnyValue(x => x.ActivePage)
@@ -419,7 +425,7 @@ await _dialogService.ShowDialogAsync<PreferencesWindowViewModel, bool>(
                 PreferencesWindowViewModel.Instance, "Preferences");
         });
 
-      
+
         this.WhenAnyValue(x => x.Filter).Throttle(TimeSpan.FromMilliseconds(300)).Subscribe(ApplyFilter);
 
         NodeSource = new HierarchicalTreeDataGridSource<NodeBase>(Nodes)
@@ -438,7 +444,7 @@ await _dialogService.ShowDialogAsync<PreferencesWindowViewModel, bool>(
             },
         };
     }
-    
+
     public void LoadDevTree()
     {
         Filter = "";
@@ -448,8 +454,8 @@ public void LoadDevTree()
         TopLevelPages.Clear();
         Pages.Clear();
         _pageToNodeMap.Clear();
-        
-        var tab = _pageFactory.CreatePage("DevControl");
+
+        var tab = _pageFactory.CreatePage(typeof(DevControlViewModel));
         tab.Icon = "Icons.GameControllerFill";
         AddTopLevelPage(tab);
 
@@ -458,24 +464,23 @@ public void LoadDevTree()
         {
             DetachEventsRecursive(n);
         }
-        
-        Nodes.Clear();
-       
-        var rootStr = ChosenMod.Name;
 
-        var root = _nodeFactory.CreateOpenEditorNode(rootStr, "Icons.ScrollFill", "");
+        Nodes.Clear();
 
+        var rootStr = ChosenMod.Name;
 
-        root.SubNodes.Add(
-            _nodeFactory.CreateOpenEditorNode("Dev Control", "Icons.GameControllerFill", "DevControl"));
-        root.SubNodes.Add(_nodeFactory.CreateOpenEditorNode("Zone Editor", "Icons.StairsFill", "ZoneEditor"));
-        root.SubNodes.Add(
-            _nodeFactory.CreateOpenEditorNode("Ground Editor", "Icons.MapTrifoldFill", "GroundEditor"));
-        root.SubNodes.Add(_nodeFactory.CreateOpenEditorNode("Testing", "Icons.BedFill", "RandomInfo"));
-        root.SubNodes.Add(_nodeFactory.CreateOpenEditorNode("Tab Test", "Icons.AirplaneFill", "SpritePage"));
+        // TODO: change to Mod Edit Page View Model
+        var root = _nodeFactory.CreateOpenEditorNode<DevEditPageViewModel>(rootStr, "Icons.ScrollFill");
 
-        root.SubNodes.Add(_nodeFactory.CreateOpenEditorNode("Constants", "Icons.ListFill"));
 
+        // root.SubNodes.Add(
+            // _nodeFactory.CreateOpenEditorNode("Dev Control",  typeof(DevControlViewModel), "Icons.GameControllerFill"));
+        root.SubNodes.Add(_nodeFactory.CreateOpenEditorNode<ZoneEditorPageViewModel>("Zone Editor", "Icons.StairsFill"));
+        // root.SubNodes.Add(
+            // _nodeFactory.CreateOpenEditorNode("Ground Editor", typeof(GroundEditorPageViewModel), "Icons.MapTrifoldFill"));
+        // root.SubNodes.Add(_nodeFactory.CreateOpenEditorNode("Testing", "Icons.BedFill", "RandomInfo"));
+        // root.SubNodes.Add(_nodeFactory.CreateOpenEditorNode("Tab Test", "Icons.AirplaneFill", "SpritePage"));
+        
         // var particlesRoot = _nodeFactory.CreateSpriteRootNode("particles", "", "Particles", "Icons.PaintBrushFill");
         // particlesRoot.SubNodes.Add(_nodeFactory.CreateDataItemNode("Acid_Blue", "SpriteEditor", "Acid_Blue",
         //     "Icons.PaintBrushFill"));
@@ -485,121 +490,285 @@ public void LoadDevTree()
         // halcyonNode.SubNodes.Add(particlesRoot);
 
 
-        CreateDataNode(root);
-
+        // CreateConstantsNode(root);
+        // CreateDataNode(root);
+        //
         CreateSpriteNode(root);
 
-        CreateModNode(root);
+        // CreateModNode(root);
         Nodes.Add(root);
 
         AttachEventsRecursive(root);
         root.IsExpanded = true;
     }
 
-    private void CreateDataNode(NodeBase parent)
+
+    private void CreateConstantsNode(NodeBase parent)
     {
-        var dataNode = _nodeFactory.CreateOpenEditorNode("Data", "Icons.FloppyDiskFill", "");
-        foreach (var type in Enum.GetValues<DataManager.DataType>())
-        {
-            if (type == DataManager.DataType.All || type == DataManager.DataType.None)
-                continue;
+        // var constantsNode = _nodeFactory.CreateOpenEditorNode("Constants", "Icons.ListFill", "");
+        //
+        // var startParamsNode = _nodeFactory.CreateOpenEditorNode("Start Params", "Icons.ListFill", "");
+        // var universalEventsNode = _nodeFactory.CreateOpenEditorNode("Universal Events", "Icons.ListFill", "");
+        //
+        // var menuTextNode = _nodeFactory.CreateOpenEditorNode("Menu Text", "Icons.TableFill", "");
+        // var gameplayTextNode = _nodeFactory.CreateOpenEditorNode("Gameplay Text", "Icons.TableFill", "");
+        //
+        //
+        // constantsNode.SubNodes.Add(startParamsNode);
+        // constantsNode.SubNodes.Add(universalEventsNode);
+        // constantsNode.SubNodes.Add(menuTextNode);
+        // constantsNode.SubNodes.Add(gameplayTextNode);
+        //
+        // var effectsNode = _nodeFactory.CreateOpenEditorNode("Effects", "Icons.ListFill", "");
+        //
+        // effectsNode.SubNodes.Add(_nodeFactory.CreateOpenEditorNodeFX<BattleFX>(
+        //     "Heal FX",
+        //     () => DataManager.Instance.HealFX,
+        //     (fx) =>
+        //     {
+        //         DataManager.Instance.HealFX = fx;
+        //         DataManager.SaveData(fx, DataManager.FX_PATH, "Heal", DataManager.DATA_EXT);
+        //     },
+        //     "Icons.SparkleFill"
+        // ));
+        //
+        // effectsNode.SubNodes.Add(_nodeFactory.CreateOpenEditorNodeFX<BattleFX>(
+        //     "Restore Charge FX",
+        //     () => DataManager.Instance.RestoreChargeFX,
+        //     (fx) =>
+        //     {
+        //         DataManager.Instance.RestoreChargeFX = fx;
+        //         DataManager.SaveData(fx, DataManager.FX_PATH, "RestoreCharge", DataManager.DATA_EXT);
+        //     },
+        //     "Icons.SparkleFill"
+        // ));
+        //
+        // effectsNode.SubNodes.Add(_nodeFactory.CreateOpenEditorNodeFX<BattleFX>(
+        //     "Lose Charge FX",
+        //     () => DataManager.Instance.LoseChargeFX,
+        //     (fx) =>
+        //     {
+        //         DataManager.Instance.LoseChargeFX = fx;
+        //         DataManager.SaveData(fx, DataManager.FX_PATH, "LoseCharge", DataManager.DATA_EXT);
+        //     },
+        //     "Icons.SparkleFill"
+        // ));
+        //
+        // effectsNode.SubNodes.Add(_nodeFactory.CreateOpenEditorNodeFX<EmoteFX>(
+        //     "No Charge FX",
+        //     () => DataManager.Instance.NoChargeFX,
+        //     (fx) =>
+        //     {
+        //         DataManager.Instance.NoChargeFX = fx;
+        //         DataManager.SaveData(fx, DataManager.FX_PATH, "NoCharge", DataManager.DATA_EXT);
+        //     },
+        //     "Icons.SparkleFill"
+        // ));
+        //
+        // effectsNode.SubNodes.Add(_nodeFactory.CreateOpenEditorNodeFX<BattleFX>(
+        //     "Element FX",
+        //     () => DataManager.Instance.ElementFX,
+        //     (fx) =>
+        //     {
+        //         DataManager.Instance.ElementFX = fx;
+        //         DataManager.SaveData(fx, DataManager.FX_PATH, "Element", DataManager.DATA_EXT);
+        //     },
+        //     "Icons.SparkleFill"
+        // ));
+        //
+        // effectsNode.SubNodes.Add(_nodeFactory.CreateOpenEditorNodeFX<BattleFX>(
+        //     "Intrinsic FX",
+        //     () => DataManager.Instance.IntrinsicFX,
+        //     (fx) =>
+        //     {
+        //         DataManager.Instance.IntrinsicFX = fx;
+        //         DataManager.SaveData(fx, DataManager.FX_PATH, "Intrinsic", DataManager.DATA_EXT);
+        //     },
+        //     "Icons.SparkleFill"
+        // ));
+        //
+        // effectsNode.SubNodes.Add(_nodeFactory.CreateOpenEditorNodeFX<BattleFX>(
+        //     "Send Home FX",
+        //     () => DataManager.Instance.SendHomeFX,
+        //     (fx) =>
+        //     {
+        //         DataManager.Instance.SendHomeFX = fx;
+        //         DataManager.SaveData(fx, DataManager.FX_PATH, "SendHome", DataManager.DATA_EXT);
+        //     },
+        //     "Icons.SparkleFill"
+        // ));
+        //
+        // effectsNode.SubNodes.Add(_nodeFactory.CreateOpenEditorNodeFX<BattleFX>(
+        //     "Item Lost FX",
+        //     () => DataManager.Instance.ItemLostFX,
+        //     (fx) =>
+        //     {
+        //         DataManager.Instance.ItemLostFX = fx;
+        //         DataManager.SaveData(fx, DataManager.FX_PATH, "ItemLost", DataManager.DATA_EXT);
+        //     },
+        //     "Icons.SparkleFill"
+        // ));
+        //
+        // effectsNode.SubNodes.Add(_nodeFactory.CreateOpenEditorNodeFX<BattleFX>(
+        //     "Warp FX",
+        //     () => DataManager.Instance.WarpFX,
+        //     (fx) =>
+        //     {
+        //         DataManager.Instance.WarpFX = fx;
+        //         DataManager.SaveData(fx, DataManager.FX_PATH, "Warp", DataManager.DATA_EXT);
+        //     },
+        //     "Icons.SparkleFill"
+        // ));
+        //
+        // effectsNode.SubNodes.Add(_nodeFactory.CreateOpenEditorNodeFX<BattleFX>(
+        //     "Knockback FX",
+        //     () => DataManager.Instance.KnockbackFX,
+        //     (fx) =>
+        //     {
+        //         DataManager.Instance.KnockbackFX = fx;
+        //         DataManager.SaveData(fx, DataManager.FX_PATH, "Knockback", DataManager.DATA_EXT);
+        //     },
+        //     "Icons.SparkleFill"
+        // ));
+        //
+        // effectsNode.SubNodes.Add(_nodeFactory.CreateOpenEditorNodeFX<BattleFX>(
+        //     "Jump FX",
+        //     () => DataManager.Instance.JumpFX,
+        //     (fx) =>
+        //     {
+        //         DataManager.Instance.JumpFX = fx;
+        //         DataManager.SaveData(fx, DataManager.FX_PATH, "Jump", DataManager.DATA_EXT);
+        //     },
+        //     "Icons.SparkleFill"
+        // ));
+        //
+        // effectsNode.SubNodes.Add(_nodeFactory.CreateOpenEditorNodeFX<BattleFX>(
+        //     "Throw FX",
+        //     () => DataManager.Instance.ThrowFX,
+        //     (fx) =>
+        //     {
+        //         DataManager.Instance.ThrowFX = fx;
+        //         DataManager.SaveData(fx, DataManager.FX_PATH, "Throw", DataManager.DATA_EXT);
+        //     },
+        //     "Icons.SparkleFill"
+        // ));
+        //
+        // constantsNode.SubNodes.Add(effectsNode);
+        // effectsNode.SubNodes.Add(_nodeFactory.Create<BattleFX>("Damage FX", ...params));
+        // effectsNode.SubNodes.Add(_nodeFactory.Create<BattleFX>("Heal FX", ...params));
 
 
-            var dataItemRootNode = _nodeFactory.CreateDataRootNode(
-                type,
-                "TODO",
-                type.ToString(),
-                type.GetIcon());
-            dataNode.SubNodes.Add(dataItemRootNode);
-            var entries = DataManager.Instance.DataIndices[type].GetLocalStringArray(true);
+        // var effectsNode = _nodeFactory.CreateOpenEditorNode("Effec", "Icons.ListFill", "");
 
-            foreach (string key in entries.Keys)
-            {
-                var itemNode = _nodeFactory.CreateDataItemNode(
-                    key,
-                    "DevEditEditor",
-                    $"{key}: {entries[key]}",
-                    type.GetIcon());
 
-                dataItemRootNode.SubNodes.Add(itemNode);
-            }
-        }
+        // parent.SubNodes.Add(constantsNode);
+    }
 
-        parent.SubNodes.Add(dataNode);
+    private void CreateDataNode(NodeBase parent)
+    {
+        // var dataNode = _nodeFactory.CreateOpenEditorNode("Data", "Icons.FloppyDiskFill", "");
+        // foreach (var type in Enum.GetValues<DataManager.DataType>())
+        // {
+        //     if (type == DataManager.DataType.All || type == DataManager.DataType.None)
+        //         continue;
+        //
+        //
+        //     var dataItemRootNode = _nodeFactory.CreateDataRootNode(
+        //         type,
+        //         "TODO",
+        //         type.ToString(),
+        //         type.GetIcon());
+        //     dataNode.SubNodes.Add(dataItemRootNode);
+        //     var entries = DataManager.Instance.DataIndices[type].GetLocalStringArray(true);
+        //
+        //     foreach (string key in entries.Keys)
+        //     {
+        //         var itemNode = _nodeFactory.CreateDataItemNode(
+        //             key,
+        //             "DevEditEditor",
+        //             $"{key}: {entries[key]}",
+        //             type.GetIcon());
+        //
+        //         dataItemRootNode.SubNodes.Add(itemNode);
+        //     }
+        // }
+        //
+        // parent.SubNodes.Add(dataNode);
     }
 
     private void CreateSpriteNode(NodeBase parent)
     {
-        var spritesViewModel = _pageFactory.GetRequiredService<DevTabSpritesViewModel>();
-        var spriteNode = _nodeFactory.CreateOpenEditorNode("Sprites", "Icons.PaintBrushFill", "SpeciesSpriteEditor");
-
+        // var spritesViewModel = _pageFactory.GetRequiredService<DevTabSpritesViewModel>();
+        var spriteNode = _nodeFactory.CreateOpenEditorNode<DevEditPageViewModel>("Sprites", "Icons.PaintBrushFill");
+        //
         spriteNode.SubNodes.Add(
-            _nodeFactory.CreateOpenEditorNodeWithParams("Char Sprites", "Icons.PersonFill", "SpeciesSpriteEditor", true)
+            _nodeFactory.CreateOpenEditorNodeWithParams<SpeciesEditPageViewModel>("Char Sprites", [true], "Icons.PersonFill")
         );
         spriteNode.SubNodes.Add(
-            _nodeFactory.CreateOpenEditorNodeWithParams("Portraits", "Icons.UserRectangleFill", "SpeciesSpriteEditor", false)
+            _nodeFactory.CreateOpenEditorNodeWithParams<SpeciesEditPageViewModel>("Portraits", [false], "Icons.PersonFill")
         );
-
-        foreach (var type in Enum.GetValues<GraphicsManager.AssetType>())
-        {
-            if (type == GraphicsManager.AssetType.None || type == GraphicsManager.AssetType.All ||
-                type == GraphicsManager.AssetType.Count || type == GraphicsManager.AssetType.Autotile ||
-                type == GraphicsManager.AssetType.Chara || type == GraphicsManager.AssetType.Portrait ||
-                type == GraphicsManager.AssetType.Font)
-                continue;
-
-            if (type == GraphicsManager.AssetType.Tile)
-            {
-                var tileRootNode = _nodeFactory.CreateSpriteTileRootNode(
-                    "",
-                    type.ToString(),
-                    type.GetIcon());
-                lock (GameBase.lockObj)
-                {
-                    foreach (string name in GraphicsManager.TileIndex.Nodes.Keys.OrderBy(n => n))
-                    {
-                        var itemNode = _nodeFactory.CreateDataItemNode(
-                            name,
-                            "",
-                            name,
-                            type.GetIcon());
-                        tileRootNode.SubNodes.Add(itemNode);
-                    }
-                }
-
-                spriteNode.SubNodes.Add(tileRootNode);
-                continue;
-            }
-
-            string assetPattern = GraphicsManager.GetPattern(type);
-            string[] dirs = PathMod.GetModFiles(Path.GetDirectoryName(assetPattern),
-                String.Format(Path.GetFileName(assetPattern), "*"));
-
-            var spriteRootNode = _nodeFactory.CreateSpriteRootNode(
-                type,
-                "TODO",
-                type.ToString(),
-                type.GetIcon());
-            // dataNode.SubNodes.Add(dataItemRootNode);
-            spriteNode.SubNodes.Add(spriteRootNode);
-
-
-            lock (GameBase.lockObj)
-            {
-                for (int ii = 0; ii < dirs.Length; ii++)
-                {
-                    string filename = Path.GetFileNameWithoutExtension(dirs[ii]);
-                    // anims.Add(filename);
-                    var itemNode = _nodeFactory.CreateDataItemNode(
-                        filename,
-                        "",
-                        filename,
-                        type.GetIcon());
-
-                    spriteRootNode.SubNodes.Add(itemNode);
-                }
-            }
-        }
+        // );
+        //
+        // foreach (var type in Enum.GetValues<GraphicsManager.AssetType>())
+        // {
+        //     if (type == GraphicsManager.AssetType.None || type == GraphicsManager.AssetType.All ||
+        //         type == GraphicsManager.AssetType.Count || type == GraphicsManager.AssetType.Autotile ||
+        //         type == GraphicsManager.AssetType.Chara || type == GraphicsManager.AssetType.Portrait ||
+        //         type == GraphicsManager.AssetType.Font)
+        //         continue;
+        //
+        //     if (type == GraphicsManager.AssetType.Tile)
+        //     {
+        //         var tileRootNode = _nodeFactory.CreateSpriteTileRootNode(
+        //             "",
+        //             type.ToString(),
+        //             type.GetIcon());
+        //         lock (GameBase.lockObj)
+        //         {
+        //             foreach (string name in GraphicsManager.TileIndex.Nodes.Keys.OrderBy(n => n))
+        //             {
+        //                 var itemNode = _nodeFactory.CreateDataItemNode(
+        //                     name,
+        //                     "",
+        //                     name,
+        //                     type.GetIcon());
+        //                 tileRootNode.SubNodes.Add(itemNode);
+        //             }
+        //         }
+        //
+        //         spriteNode.SubNodes.Add(tileRootNode);
+        //         continue;
+        //     }
+        //
+        //     string assetPattern = GraphicsManager.GetPattern(type);
+        //     string[] dirs = PathMod.GetModFiles(Path.GetDirectoryName(assetPattern),
+        //         String.Format(Path.GetFileName(assetPattern), "*"));
+        //
+        //     var spriteRootNode = _nodeFactory.CreateSpriteRootNode(
+        //         type,
+        //         "TODO",
+        //         type.ToString(),
+        //         type.GetIcon());
+        //     // dataNode.SubNodes.Add(dataItemRootNode);
+        //     spriteNode.SubNodes.Add(spriteRootNode);
+        //
+        //
+        //     lock (GameBase.lockObj)
+        //     {
+        //         for (int ii = 0; ii < dirs.Length; ii++)
+        //         {
+        //             string filename = Path.GetFileNameWithoutExtension(dirs[ii]);
+        //             // anims.Add(filename);
+        //             var itemNode = _nodeFactory.CreateDataItemNode(
+        //                 filename,
+        //                 "",
+        //                 filename,
+        //                 type.GetIcon());
+        //
+        //             spriteRootNode.SubNodes.Add(itemNode);
+        //         }
+        //     }
+        // }
 
 
         parent.SubNodes.Add(spriteNode);
@@ -656,21 +825,22 @@ private void HandleSprites()
 
     private void CreateModNode(NodeBase parent)
     {
-        var modsViewModel = _pageFactory.GetRequiredService<DevTabModsViewModel>();
-        var modRoot = _nodeFactory.CreateDataRootNode(DataManager.DataType.AI, "", "Mods", "Icons.ScrollFill");
-
-        foreach (ModsNodeViewModel mod in modsViewModel.Mods)
-        {
-            var itemNode = _nodeFactory.CreateDataItemNode(
-                mod.Namespace,
-                "",
-                $"{mod.Namespace}: {mod.Name}",
-                "Icons.ScrollFill");
-
-            modRoot.SubNodes.Add(itemNode);
-        }
-
-        parent.SubNodes.Add(modRoot);
+        // var modsViewModel = _pageFactory.GetRequiredService<DevTabModsViewModel>();
+        // var modRoot = _nodeFactory.CreateModRootNode("", "Mods", "Icons.ScrollFill");
+        //
+        // foreach (ModsNodeViewModel mod in modsViewModel.Mods)
+        // {
+        //     var name = mod.Namespace == "origin" ? "Origins" : mod.Name;
+        //     var itemNode = _nodeFactory.CreateDataItemNode(
+        //         mod.Namespace,
+        //         "",
+        //         $"{mod.Namespace}: {name}",
+        //         "Icons.ScrollFill");
+        //
+        //     modRoot.SubNodes.Add(itemNode);
+        // }
+        //
+        // parent.SubNodes.Add(modRoot);
     }
 
     private void InitializeTabEvents()
@@ -703,12 +873,12 @@ private void DetachEventsRecursive(NodeBase node)
         foreach (var child in node.SubNodes)
             DetachEventsRecursive(child);
     }
-    
+
     private void OnSubNodesChanged()
     {
         RefreshTreeDataGrid();
     }
-    
+
     private TabSwitcherViewModel? _tabSwitcher;
 
     public TabSwitcherViewModel? TabSwitcher
@@ -728,11 +898,12 @@ public ModSwitcherViewModel? ModSwitcher
 
     public void AddPageFromTreeNode(OpenEditorNode node)
     {
-        var editor = _pageFactory.CreatePage(node.EditorKey, node);
+        var editor = _pageFactory.CreatePage(node.EditorType, node);
 
+        Console.WriteLine("EDitpr" + editor);
         if (editor != null)
         {
-            editor.SetTabInfo(node);
+            editor.SetPageTitleFromNode(node);
             AddTopLevelPage(editor);
         }
     }
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DataListPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DataListPageViewModel.cs
new file mode 100644
index 00000000..e09bbfa7
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DataListPageViewModel.cs
@@ -0,0 +1,15 @@
+using RogueEssence.Dev.Services;
+
+namespace RogueEssence.Dev.ViewModels;
+
+public class DataListPageViewModel : EditorPageViewModel
+{
+    // public override string Title => "Data List";
+    
+    public DataListPageViewModel(PageFactory pageFactory, TabEvents tabEvents, IDialogService dialogService) : base(pageFactory, tabEvents, dialogService)
+    {
+        
+    }
+    
+}
+    
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DevControlViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DevControlViewModel.cs
index ba99aff6..fdaaa343 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DevControlViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DevControlViewModel.cs
@@ -11,8 +11,7 @@ public class DevControlViewModel : EditorPageViewModel
 
     public DevTabScriptViewModel Script { get; }
 
-    public override string UniqueId => "DevControl";
-    public override string? Title => "Dev Control";
+    public override string DefaultTitle => "Dev Control";
 
     public TestComboBoxViewModel Fruits { get; }
 
@@ -30,7 +29,7 @@ public DevControlViewModel(PageFactory pageFactory, TabEvents tabEvents, IDialog
     public DevControlViewModel() : base(new PageFactory(new DesignServiceProvider()),
         new TabEvents(new PageFactory(new DesignServiceProvider())), new DialogService())
     {
-        Title = "Dev Control";
+        // Title = "Dev Control";
         Fruits = new TestComboBoxViewModel();
     }
 }
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DevEditPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DevEditPageViewModel.cs
index d6ca8204..4f6bbd6f 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DevEditPageViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DevEditPageViewModel.cs
@@ -64,9 +64,8 @@ private void OpenList(DataManager.DataType dataType, GetEntry entryOp, CreateEnt
             // dataListForm.Show();
         }
     }
-
-    public override string UniqueId => null;
-    public override string? Title => "Dev Edit";
+    
+    // public override string? Title => "Dev Edit";
 
     public DevEditPageViewModel(PageFactory pageFactory, TabEvents tabEvents, IDialogService dialogService, NodeBase node) : base(
         pageFactory, tabEvents, dialogService)
@@ -79,6 +78,6 @@ public DevEditPageViewModel(PageFactory pageFactory, TabEvents tabEvents, IDialo
     public DevEditPageViewModel() : base(new PageFactory(new DesignServiceProvider()),
         new TabEvents(new PageFactory(new DesignServiceProvider())), new DialogService())
     {
-        Title = "Dev Edit";
+        // Title = "Dev Edit";
     }
 }
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/EditorPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/EditorPageViewModel.cs
index 110d29e9..3ca1f8c4 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/EditorPageViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/EditorPageViewModel.cs
@@ -9,23 +9,34 @@ namespace RogueEssence.Dev.ViewModels;
 
 public class EditorPageViewModel : ViewModelBase
 {
-    public virtual string? UniqueId => null;
     
-    public virtual bool AddNewTab => true;
+    public virtual string DefaultTitle => "Dev Edit";
     
+    private string _title = "";
+
+
+    public string Title =>
+        string.IsNullOrEmpty(_title) ? DefaultTitle : _title;
     
-    private string _data = "";
+    public bool Equals(object? obj)
+    {
+        if (obj is not EditorPageViewModel other)
+            return false;
+        
+        return GetType() == other.GetType() && IsSamePage(other);
+    }
 
-    private string _title = "";
-    public virtual string Title
+    protected virtual bool IsSamePage(EditorPageViewModel other)
     {
-        get { return _title; }
-        set
-        {
-            this.RaiseAndSetIfChanged(ref _title, value);
-        }
+        return true;
     }
+    
+    public virtual bool AddNewTab => true;
+    
+    
+    private string _data = "";
 
+  
     public string Data
     {
         get { return _data; }
@@ -66,9 +77,9 @@ public EditorPageViewModel(PageFactory pageFactory, TabEvents tabEvents, IDialog
         _tabEvents = tabEvents;
     }
 
-    public void SetTabInfo(NodeBase node)
+    public void SetPageTitleFromNode(NodeBase node)
     {
-        _icon = node._icon;
+        _icon = node.Icon;
         _title = node.Title;
     }
     
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/GroundEditorPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/GroundEditorPageViewModel.cs
index c1e506a7..8bf1c9a6 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/GroundEditorPageViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/GroundEditorPageViewModel.cs
@@ -4,8 +4,7 @@ namespace RogueEssence.Dev.ViewModels;
 
 public class GroundEditorPageViewModel : EditorPageViewModel
 {
-    public override string UniqueId => "GroundEditor";
-    public override string Title => "Ground Editor Long Name";
+    // public override string Title => "Ground Editor Long Name";
     
     public GroundEditorPageViewModel (PageFactory pageFactory, TabEvents tabEvents, IDialogService dialogService) : base(pageFactory, tabEvents, dialogService)
     { }
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ModInfoEditorViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ModInfoEditorViewModel.cs
index a55b48ab..ea11d3dd 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ModInfoEditorViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ModInfoEditorViewModel.cs
@@ -4,8 +4,7 @@ namespace RogueEssence.Dev.ViewModels;
 
 public class ModInfoEditorViewModel : EditorPageViewModel
 {
-    public override string UniqueId => null;
-    public override string? Title => "Mod Info";
+    // public override string? Title => "Mod Info";
     
     // public override bool AddNewTab => true;
 
@@ -19,7 +18,7 @@ public ModInfoEditorViewModel(PageFactory pageFactory, TabEvents tabEvents, IDia
     
     public ModInfoEditorViewModel() : base(new PageFactory(new DesignServiceProvider()), new TabEvents(new PageFactory(new DesignServiceProvider())), new DialogService())
     {
-        Title = "Dev Control";
+        // Title = "Dev Control";
         Fruits = new TestComboBoxViewModel();
     }
     
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/RandomInfoPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/RandomInfoPageViewModel.cs
index cd6f28d6..d4ac9383 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/RandomInfoPageViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/RandomInfoPageViewModel.cs
@@ -6,7 +6,7 @@ public class RandomInfoPageViewModel : EditorPageViewModel
 {
     public override bool AddNewTab => false;
     
-    public override string Title => "Random Page Info";
+    // public override string Title => "Random Page Info";
     public RandomInfoPageViewModel (PageFactory pageFactory, TabEvents tabEvents, IDialogService dialogService) : base(pageFactory, tabEvents, dialogService)
     {
     }
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/SpeciesEditPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/SpeciesEditPageViewModel.cs
index ca923256..b00d2981 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/SpeciesEditPageViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/SpeciesEditPageViewModel.cs
@@ -74,12 +74,17 @@ public MonsterNodeViewModel(string name, CharID id, bool filled)
 
     public class SpeciesEditPageViewModel : EditorPageViewModel
     {
-        
-        public override string Title => "Species Editor";
-        public override string? UniqueId => "";
-        
+        protected override bool IsSamePage(EditorPageViewModel other)
+        {
+            if (other is not SpeciesEditPageViewModel species)
+                return false;
+    
+            return this.CheckSprites == species.CheckSprites;
+        }
+        // public override string Title => "Species Editor";
+
 
-        private bool checkSprites;
+        public bool CheckSprites;
         private bool notifiedImport;
 
         private Window parent;
@@ -87,7 +92,7 @@ public class SpeciesEditPageViewModel : EditorPageViewModel
 
         public string Name
         {
-            get { return checkSprites ? GraphicsManager.AssetType.Chara.ToString() : GraphicsManager.AssetType.Portrait.ToString(); }
+            get { return CheckSprites ? GraphicsManager.AssetType.Chara.ToString() : GraphicsManager.AssetType.Portrait.ToString(); }
             set { }
         }
 
@@ -123,8 +128,8 @@ public SpeciesEditPageViewModel(PageFactory pageFactory, TabEvents tabEvents, ID
         {
             Monsters = new ObservableCollection<MonsterNodeViewModel>();
             OpList = new ObservableCollection<SpeciesOpContainer>();
-            checkSprites = (bool)node.ExtraParams[0];
-            LoadFormDataEntries(checkSprites);
+            CheckSprites = (bool)node.ExtraParams[0];
+            LoadFormDataEntries(CheckSprites);
         }
 
 
@@ -191,7 +196,7 @@ private void tryApplyOpToCharSheet(CharSheetOp op, CharID currentForm, string fi
 
         public void LoadFormDataEntries(bool sprites)
         {
-            checkSprites = sprites;
+            CheckSprites = sprites;
             OpList.Add(new SpeciesOpContainer(new CharSheetDummyOp("Export as Multi Sheet"), ExportMultiSheet));
             if (sprites)
             {
@@ -512,7 +517,7 @@ private void tryMassImport(string currentPath)
                 if (!Directory.Exists(Path.GetDirectoryName(assetPattern)))
                     Directory.CreateDirectory(Path.GetDirectoryName(assetPattern));
 
-                if (checkSprites)
+                if (CheckSprites)
                     ImportHelper.ImportAllChars(currentPath, assetPattern);
                 else
                     ImportHelper.ImportAllPortraits(currentPath, assetPattern);
@@ -561,7 +566,7 @@ private void tryImport(string currentPath, CharID currentForm)
                 Dictionary<CharID, byte[]> data = LoadSpeciesData(currentForm.Species);
 
                 //write sprite data
-                if (checkSprites)
+                if (CheckSprites)
                     ImportHelper.BakeCharSheet(currentPath, data, currentForm);
                 else
                     ImportHelper.BakePortrait(currentPath, data, currentForm);
@@ -659,7 +664,7 @@ private void Export(string currentPath, CharID currentForm, bool singleSheet)
                 CharID fallback = GraphicsManager.GetFallbackForm(GraphicsManager.CharaIndex, currentForm);
                 if (fallback == currentForm)
                 {
-                    if (checkSprites)
+                    if (CheckSprites)
                     {
                         CharSheet sheet = GraphicsManager.GetChara(currentForm);
                         CharSheet.Export(sheet, currentPath, singleSheet);
@@ -759,7 +764,7 @@ private void LoadSpeciesFormData(Dictionary<CharID, byte[]> data, CharID formDat
             {
                 using (BinaryWriter writer = new BinaryWriter(stream))
                 {
-                    if (checkSprites)
+                    if (CheckSprites)
                         GraphicsManager.GetChara(formData).Save(writer);
                     else
                         GraphicsManager.GetPortrait(formData).Save(writer);
@@ -783,7 +788,7 @@ private string GetFormString(CharID formdata)
 
         private CharaIndexNode GetIndexNode()
         {
-            if (checkSprites)
+            if (CheckSprites)
                 return GraphicsManager.CharaIndex;
             else
                 return GraphicsManager.PortraitIndex;
@@ -796,7 +801,7 @@ private string GetFilename(int num)
 
         private string GetPattern()
         {
-            if (checkSprites)
+            if (CheckSprites)
                 return GraphicsManager.CHARA_PATTERN;
             else
                 return GraphicsManager.PORTRAIT_PATTERN;
@@ -804,7 +809,7 @@ private string GetPattern()
 
         private GraphicsManager.AssetType GetAssetType()
         {
-            if (checkSprites)
+            if (CheckSprites)
                 return GraphicsManager.AssetType.Chara;
             else
                 return GraphicsManager.AssetType.Portrait;
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/SpritePageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/SpritePageViewModel.cs
index 84a284e0..afd23283 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/SpritePageViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/SpritePageViewModel.cs
@@ -13,14 +13,13 @@ public class SpritePageViewModel : EditorPageViewModel
     public ReactiveCommand<Unit, Unit> TestDialog { get; }
     public ReactiveCommand<Unit, Unit> RemoveSelfTab { get; }
     
-    public override string Title => "Sprite Stuff";
-    public override string? UniqueId => "";
+    // public override string Title => "Sprite Stuff";
 
 
     public SpritePageViewModel(PageFactory pageFactory, TabEvents tabEvents, IDialogService dialogService) : base(pageFactory, tabEvents, dialogService)
     {
-        CreateATab = ReactiveCommand.Create(() => tabEvents.AddChildPage(this, pageFactory.CreatePage("SpritePage")));
-        CreateATopTab = ReactiveCommand.Create(() => tabEvents.AddTopLevelTab(pageFactory.CreatePage("ModInfoEditor")));
+        CreateATab = ReactiveCommand.Create(() => tabEvents.AddChildPage(this, pageFactory.CreatePage(typeof(SpritePageViewModel))));
+        CreateATopTab = ReactiveCommand.Create(() => tabEvents.AddTopLevelTab(pageFactory.CreatePage(typeof(ModInfoEditorViewModel))));
         TestDialog = ReactiveCommand.CreateFromTask(async () =>
             {
                 var rename = new RenameWindowViewModel();
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ZoneEditorPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ZoneEditorPageViewModel.cs
index baba4ce6..4faf6aed 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ZoneEditorPageViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ZoneEditorPageViewModel.cs
@@ -4,10 +4,9 @@ namespace RogueEssence.Dev.ViewModels;
 
 public class ZoneEditorPageViewModel : EditorPageViewModel
 {
-    public override string UniqueId => "ZoneEditor";
-    public override string Title => "Zone Editor";
+    // public override string Title => "Zone Editor";
     
-    public ZoneEditorPageViewModel(PageFactory pageFactory, TabEvents tabEvents, IDialogService dialogService) : base(pageFactory, tabEvents, dialogService)
+    public ZoneEditorPageViewModel(PageFactory pageFactory, TabEvents tabEvents, IDialogService dialogService, NodeBase node) : base(pageFactory, tabEvents, dialogService)
     {
         
     }
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/NodeBase.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/NodeBase.cs
index bb554de2..70951f93 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/NodeBase.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/NodeBase.cs
@@ -20,6 +20,7 @@
 using RogueEssence.Data;
 using RogueEssence.Dev.Views;
 
+
 namespace RogueEssence.Dev.ViewModels;
 
 using System.Collections.ObjectModel;
@@ -38,7 +39,7 @@ public virtual string Title
         set => this.RaiseAndSetIfChanged(ref _title, value);
     }
 
-    public string _icon = "";
+    private string _icon = "";
 
     public string Icon
     {
@@ -117,30 +118,53 @@ public void CollapseChildren()
 
 public class OpenEditorNode : NodeBase
 {
-    public string EditorKey { get; }
+    public Type EditorType { get; }
 
-    public OpenEditorNode(string title, string? icon = null, string editorKey = "")
+    public OpenEditorNode(string title, Type? editorType, string? icon = null)
         : base(title, icon ?? "")
     {
-        EditorKey = editorKey;
+        EditorType = editorType;
     }
 }
 
+
 public class OpenEditorNodeWithParams : OpenEditorNode
 {
     public object[] ExtraParams { get; }
 
     public OpenEditorNodeWithParams(
         string title,
-        string? icon = null,
-        string editorKey = "",
-        params object[] extraParams)
-        : base(title, icon ?? "", editorKey)
+        Type? editorType,
+        object[] extraParams,
+        string? icon = null)
+        : base(title, editorType, icon)
     {
         ExtraParams = extraParams;
     }
 }
 
+public class OpenEditorNodeFX<T> : OpenEditorNode
+{
+    private readonly Func<T> _getter;
+    private readonly Action<T> _setter;
+
+    public OpenEditorNodeFX(
+        string title, 
+        Type? editorType,
+        Func<T> getter, 
+        Action<T> setter,
+        string? icon = null)
+        : base(title, editorType, icon)
+    {
+        _getter = getter;
+        _setter = setter;
+    }
+
+    public async Task OnClickAsync()
+    {
+
+    }
+}
 
 public abstract class ItemRootNode : OpenEditorNode
 {
@@ -149,8 +173,8 @@ public abstract class ItemRootNode : OpenEditorNode
     public abstract ReactiveCommand<Unit, Unit> AddCommand { get; }
     public abstract ReactiveCommand<DataItemNode, Unit> DeleteCommand { get; }
 
-    protected ItemRootNode(string title, string icon, string editorKey)
-        : base(title, icon, editorKey)
+    protected ItemRootNode(string title, Type? editorKey, string icon = null)
+        : base(title, editorKey, icon)
     {
     }
 }
@@ -175,8 +199,8 @@ public class DataRootNode : ItemRootNode
     public ReactiveCommand<DataItemNode, Unit> ResaveAsPatch { get; }
 
     public DataRootNode(NodeFactory nodeFactory, IDialogService dialogService, DataManager.DataType dataType,
-        string editorKey, string title, string? icon = null)
-        : base(title, icon ?? "", editorKey)
+        Type? editorType, string title, string? icon = null)
+        : base(title, editorType, icon ?? "")
     {
         _nodeFactory = nodeFactory;
         _dialogService = dialogService;
@@ -204,7 +228,7 @@ private async Task AddItemAsync()
         if (!result)
             return;
 
-        SubNodes.Add(_nodeFactory.CreateDataItemNode(vm.Name, "MonsterEditor", $"{vm.Name}:", "Icons.GhostFill"));
+        SubNodes.Add(_nodeFactory.CreateDataItemNode<DevEditPageViewModel>(vm.Name, $"{vm.Name}:", "Icons.GhostFill"));
         IsExpanded = true;
         Console.WriteLine($"Added {DataType} item: {vm.Name}");
     }
@@ -291,8 +315,8 @@ public class DataItemNode : OpenEditorNode
     //     set => this.RaiseAndSetIfChanged(ref _editorKey, value);
     // }
 
-    public DataItemNode(string itemKey, string editorKey, string? title, string? icon = null)
-        : base(title ?? "", icon ?? "", editorKey)
+    public DataItemNode(string itemKey, Type? editorType, string? title, string? icon = null)
+        : base(title ?? "", editorType, icon ?? "")
     {
         ItemKey = itemKey;
     }
@@ -327,10 +351,10 @@ public SpriteRootNode(
         IDialogService dialogService,
         NodeFactory nodeFactory,
         GraphicsManager.AssetType assetType,
-        string editorKey,
+        Type? editorType,
         string title,
         string? icon = null)
-        : base(title, icon ?? "", editorKey)
+        : base(title, editorType, icon ?? "")
     {
         AssetType = assetType;
         // _dialogService = dialogService;
@@ -397,8 +421,8 @@ public class SpriteTileRootNode : SpriteRootNode
     private readonly IDialogService _dialogService;
     public ReactiveCommand<Unit, Unit> ReIndexCommand { get; }
 
-    public SpriteTileRootNode(IDialogService dialogService, NodeFactory nodeFactory, string editorKey, string title, string? icon = null)
-        : base(dialogService, nodeFactory, GraphicsManager.AssetType.Tile, editorKey, title, icon)
+    public SpriteTileRootNode(IDialogService dialogService, NodeFactory nodeFactory, Type? editorType, string title, string? icon = null)
+        : base(dialogService, nodeFactory, GraphicsManager.AssetType.Tile, editorType, title, icon)
     {
         _nodeFactory = nodeFactory;
         _dialogService = dialogService;
@@ -428,7 +452,7 @@ private void _reloadFullList()
             foreach (string name in GraphicsManager.TileIndex.Nodes.Keys)
             {
                 SubNodes.Add(
-                    _nodeFactory.CreateDataItemNode(name, "", name + ":", this.AssetType.GetIcon())
+                    _nodeFactory.CreateDataItemNode<DevEditPageViewModel>(name, name + ":", this.AssetType.GetIcon())
                 );
             }
         }
@@ -453,6 +477,55 @@ private void _tryReIndex()
     }
 }
 
+
+public class ModRootNode : ItemRootNode
+{
+    private readonly NodeFactory _nodeFactory;
+
+    private readonly IDialogService _dialogService;
+    public override ReactiveCommand<Unit, Unit> AddCommand { get; }
+    public override ReactiveCommand<DataItemNode, Unit> DeleteCommand { get; }
+    public ModRootNode(NodeFactory nodeFactory, IDialogService dialogService,
+        Type? editorType, string title, string? icon = null)
+        : base(title, editorType, icon ?? "")
+    {
+        _nodeFactory = nodeFactory;
+        _dialogService = dialogService;
+
+        AddCommand = ReactiveCommand.CreateFromTask(AddItemAsync);
+        DeleteCommand = ReactiveCommand.CreateFromTask<DataItemNode>(DeleteItemAsync);
+    }
+
+    private async Task AddItemAsync()
+    {
+        ModHeader header = new ModHeader("", "", "", "", "", Guid.NewGuid(), new Version(), new Version(), PathMod.ModType.Mod, new RelatedMod[0] { });
+        var vm = new ModConfigWindowViewModel(header);
+        bool result = await _dialogService.ShowDialogAsync<ModConfigWindowViewModel, bool>(vm, "Mod Config");
+        
+        if (!result)
+            return;
+        
+        // SubNodes.Add(_nodeFactory.CreateDataItemNode(vm.Name, "MonsterEditor", $"{vm.Name}:", "Icons.GhostFill"));
+        // IsExpanded = true;
+        // Console.WriteLine($"Added {DataType} item: {vm.Name}");
+    }
+
+    private async Task DeleteItemAsync(DataItemNode? node)
+    {
+        // if (node is null)
+        //     return;
+        //
+        // var res = await MessageBoxWindowView.Show(_dialogService,
+        //     $"Deleting {node.ItemKey} will reset it back to the base game.", $"Delete {node.ItemKey}", MessageBoxWindowView.MessageBoxButtons.YesNo, true);
+        //
+        // if (res != MessageBoxWindowView.MessageBoxResult.Yes)
+        //     return;
+        //
+        // SubNodes.Remove(node);
+        // Console.WriteLine($"Deleted {node.Title} of type {DataType}");
+    }
+}
+
 // Used by TabSwitcher
 public class PageNode : NodeBase
 {
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/SpriteAssetTypeStrategy.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/SpriteAssetTypeStrategy.cs
index adef5d5c..9eb1e93c 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/SpriteAssetTypeStrategy.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/SpriteAssetTypeStrategy.cs
@@ -82,8 +82,8 @@ public async Task<NodeBase> AddAsync()
 
         if (!result) return null;
 
-        return _nodeFactory.CreateDataItemNode(
-            vm.Name, "SpriteEditor", vm.Name + ":", "Icons.PaintBrushFill");
+        return _nodeFactory.CreateDataItemNode<DevEditPageViewModel>(
+            vm.Name, vm.Name + ":", "Icons.PaintBrushFill");
     }
 
     public async Task DeleteAsync(DataItemNode node)
@@ -186,7 +186,7 @@ private void _recomputeAnimList()
             for (int ii = 0; ii < dirs.Length; ii++)
             {
                 string filename = Path.GetFileNameWithoutExtension(dirs[ii]);
-                _spriteRootNode.SubNodes.Add(_nodeFactory.CreateDataItemNode(filename, "", filename, "Icons.PaintBrushFill"));
+                _spriteRootNode.SubNodes.Add(_nodeFactory.CreateDataItemNode<DevEditPageViewModel>(filename, filename, "Icons.PaintBrushFill"));
             }
         }
     }
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/SpriteTileStrategy.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/SpriteTileStrategy.cs
index aff55be4..462ff0a2 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/SpriteTileStrategy.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/SpriteTileStrategy.cs
@@ -38,8 +38,8 @@ public async Task<NodeBase> AddAsync()
 
         if (!result) return null;
 
-        return _nodeFactory.CreateDataItemNode(
-            vm.Name, "SpriteEditor", vm.Name + ":", "Icons.PaintBrushFill");
+        return _nodeFactory.CreateDataItemNode<DevEditPageViewModel>(
+            vm.Name, vm.Name + ":", "Icons.PaintBrushFill");
     }
 
     public async Task DeleteAsync(DataItemNode node)
@@ -274,7 +274,7 @@ private void _reloadFullList()
             foreach (string name in GraphicsManager.TileIndex.Nodes.Keys)
             {
                 _spriteRootNode.SubNodes.Add(
-                    _nodeFactory.CreateDataItemNode(name, "", name + ":", _spriteRootNode.AssetType.GetIcon())
+                    _nodeFactory.CreateDataItemNode<DevEditPageViewModel>(name, name + ":", _spriteRootNode.AssetType.GetIcon())
                 );
             }
         }
diff --git a/RogueEssence.Editor.Avalonia/Views/DialogBoxes/ModConfigWindow.axaml b/RogueEssence.Editor.Avalonia/Views/DialogBoxes/ModConfigWindow.axaml
index 124f0ec6..578605d0 100644
--- a/RogueEssence.Editor.Avalonia/Views/DialogBoxes/ModConfigWindow.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/DialogBoxes/ModConfigWindow.axaml
@@ -1,6 +1,6 @@
-<Window xmlns="https://github.com/avaloniaui"
+<v:ChromelessWindow xmlns="https://github.com/avaloniaui"
         xmlns:vm="clr-namespace:RogueEssence.Dev.ViewModels;assembly=RogueEssence.Editor.Avalonia"
-        xmlns:views="clr-namespace:RogueEssence.Dev.Views"
+        xmlns:v="clr-namespace:RogueEssence.Dev.Views"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -8,28 +8,11 @@
         x:Class="RogueEssence.Dev.Views.ModConfigWindow"
         Title="Mod Config" Width="420" Height="480">
   <Design.DataContext>
-    <vm:ModConfigViewModel2/>
+    <vm:ModConfigWindowViewModel/>
   </Design.DataContext>
 
-  <Grid Margin="4">
-    <Grid.RowDefinitions>
-      <RowDefinition Height="188"/>
-      <RowDefinition Height="*"/>
-      <RowDefinition Height="42"/>
-    </Grid.RowDefinitions>
-  
-  <Grid>
-    <Grid.RowDefinitions>
-      <RowDefinition Height="36"/>
-      <RowDefinition Height="36"/>
-      <RowDefinition Height="36"/>
-      <RowDefinition Height="80"/>
-    </Grid.RowDefinitions>
-    <Grid.ColumnDefinitions>
-      <ColumnDefinition Width="72"/>
-      <ColumnDefinition/>
-    </Grid.ColumnDefinitions>
-
+  <Grid Margin="4" RowDefinitions="188, *, 42">
+    <Grid RowDefinitions="36,36,36,80" ColumnDefinitions="72,*">
     <TextBlock Margin="4,2" Text="Name:" VerticalAlignment="Center" HorizontalAlignment="Right"/>
     <Grid Grid.Row="0" Grid.Column="1">
       <Grid.ColumnDefinitions>
@@ -39,7 +22,7 @@
       </Grid.ColumnDefinitions>
       <TextBox Text="{Binding Name}" VerticalAlignment="Center" Margin="4"/>
       <TextBlock Margin="4,2" Text="Type:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Column="1"/>
-      <views:SearchComboBox Margin="4,2" ItemsSource="{Binding ModTypes}" SelectedIndex="{Binding ChosenModType}" Grid.Column="2"/>
+      <v:SearchComboBox Margin="4,2" ItemsSource="{Binding ModTypes}" SelectedIndex="{Binding ChosenModType}" Grid.Column="2"/>
     </Grid>
 
     <TextBlock Margin="4,2" Text="Namespace:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="1"/>
@@ -89,7 +72,7 @@
         <TextBox Text="{Binding GameVersion}" VerticalAlignment="Center" Margin="4" Grid.Row="1" Grid.Column="1"/>
         
         <TextBlock Margin="4" VerticalAlignment="Top" HorizontalAlignment="Right" Grid.Row="2">Relations:</TextBlock>
-        <views:CollectionBox DataContext="{Binding Relationships}" Margin="4" Grid.Row="2" Grid.Column="1"/>
+        <v:CollectionBox DataContext="{Binding Relationships}" Margin="4" Grid.Row="2" Grid.Column="1"/>
 
       </Grid>
     </Expander>
@@ -102,4 +85,4 @@
     <Button Click="btnCancel_Click" Margin="4" Grid.Column="1">Cancel</Button>
   </Grid>
   </Grid>
-</Window>
+</v:ChromelessWindow>
diff --git a/RogueEssence.Editor.Avalonia/Views/DialogBoxes/ModConfigWindow.axaml.cs b/RogueEssence.Editor.Avalonia/Views/DialogBoxes/ModConfigWindow.axaml.cs
index 2f713d9e..691a1247 100644
--- a/RogueEssence.Editor.Avalonia/Views/DialogBoxes/ModConfigWindow.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/DialogBoxes/ModConfigWindow.axaml.cs
@@ -7,7 +7,7 @@
 
 namespace RogueEssence.Dev.Views
 {
-    public partial class ModConfigWindow : Window
+    public partial class ModConfigWindow : ChromelessWindow
     {
         public ModConfigWindow()
         {
@@ -16,7 +16,7 @@ public ModConfigWindow()
 
         public async void btnOK_Click(object sender, RoutedEventArgs e)
         {
-            ModConfigViewModel2 vm = (ModConfigViewModel2)DataContext;
+            ModConfigWindowViewModel vm = (ModConfigWindowViewModel)DataContext;
             try
             {
                 if (String.IsNullOrWhiteSpace(Text.Sanitize(vm.Name)))
diff --git a/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml b/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml
index ebbe1ca3..55a99282 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml
@@ -93,7 +93,7 @@
         </Grid>
         <Grid Grid.Row="1">
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="250" MinWidth="200" MaxWidth="500" />
+                <ColumnDefinition Width="250" MinWidth="100" MaxWidth="500" />
                 <ColumnDefinition Width="0" />
                 <ColumnDefinition Width="*" />
             </Grid.ColumnDefinitions>
diff --git a/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/ModConfigWindowView.axaml b/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/ModConfigWindowView.axaml
index 9522ce42..159e1840 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/ModConfigWindowView.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/ModConfigWindowView.axaml
@@ -6,6 +6,7 @@
                     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
                     xmlns:v="using:RogueEssence.Dev.Views"
                     mc:Ignorable="d"
+                    x:Name="ThisControl"
                     x:Class="RogueEssence.Dev.Views.ModConfigWindowView"
                     Title="Mod Config" Width="420" Height="480">
     <Design.DataContext>
@@ -25,9 +26,9 @@
                   IsVisible="{OnPlatform True, macOS=False}" />
 
             <TextBlock Classes="bold"
-                       Text="{Binding Title}"
+                       Text="{Binding #ThisControl.Title}"
                        HorizontalAlignment="Center" VerticalAlignment="Center"
-                       IsHitTestVisible="False" />
+                       IsHitTestVisible="False"/>
 
             <v:CaptionButtons HorizontalAlignment="Right"
                               IsCloseButtonOnly="True"
@@ -41,7 +42,7 @@
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition />
                         <ColumnDefinition Width="48" />
-                        <ColumnDefinition Width="72" />
+                        <ColumnDefinition Width="90" />
                     </Grid.ColumnDefinitions>
                     <TextBox Text="{Binding Name}" VerticalAlignment="Center" Margin="4" />
                     <TextBlock Margin="4,2" Text="Type:" VerticalAlignment="Center" HorizontalAlignment="Right"
@@ -69,10 +70,13 @@
                 <TextBox Text="{Binding Author}" VerticalAlignment="Center" Margin="4" Grid.Row="2" Grid.Column="1" />
                 <TextBlock Margin="4,2" Text="Description:" VerticalAlignment="Top" HorizontalAlignment="Right"
                            Grid.Row="3" />
-                <TextBox Text="{Binding Description}" AcceptsReturn="True" Margin="4" Grid.Row="3" Grid.Column="1" />
+                <TextBox Text="{Binding Description}" VerticalAlignment="Stretch" VerticalContentAlignment="Top" AcceptsReturn="True" Margin="4" Grid.Row="3" Grid.Column="1" />
             </Grid>
 
-            <Expander Grid.Row="1">
+            <Expander Grid.Row="1"
+                      HorizontalAlignment="Stretch"
+                      VerticalAlignment="Top"
+                      HorizontalContentAlignment="Stretch">
                 <Expander.Header>
                     <Label Content="Advanced"></Label>
                 </Expander.Header>
@@ -103,8 +107,8 @@
                     <ColumnDefinition />
                     <ColumnDefinition />
                 </Grid.ColumnDefinitions>
-                <Button Click="btnOK_Click" Margin="4" Grid.Column="0">OK</Button>
-                <Button Click="btnCancel_Click" Margin="4" Grid.Column="1">Cancel</Button>
+                <Button Classes="flat" Click="btnOK_Click" Margin="4" Grid.Column="0">OK</Button>
+                <Button Classes="flat" Click="btnCancel_Click" Margin="4" Grid.Column="1">Cancel</Button>
             </Grid>
         </Grid>
     </Grid>
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/DataListPageView.axaml b/RogueEssence.Editor.Avalonia/Views/New/Editors/DataListPageView.axaml
new file mode 100644
index 00000000..452c09ee
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/Views/New/Editors/DataListPageView.axaml
@@ -0,0 +1,10 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:vm="using:RogueEssence.Dev.ViewModels"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:DataType="vm:DataListPageViewModel"
+             x:Class="RogueEssence.Dev.Views.DataListPageView">
+    Welcome to ZoneEditor
+</UserControl>
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/DataListPageView.axaml.cs b/RogueEssence.Editor.Avalonia/Views/New/Editors/DataListPageView.axaml.cs
new file mode 100644
index 00000000..9cbf998c
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/Views/New/Editors/DataListPageView.axaml.cs
@@ -0,0 +1,13 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace RogueEssence.Dev.Views;
+
+public partial class DataListPageView : UserControl
+{
+    public DataListPageView()
+    {
+        InitializeComponent();
+    }
+}
\ No newline at end of file

From a0fbd0e7a025edb7c6f2c678057727d297c7c3a3 Mon Sep 17 00:00:00 2001
From: Kace <41309226+DoubleTrio@users.noreply.github.com>
Date: Sun, 19 Apr 2026 02:20:41 -0400
Subject: [PATCH 19/51] ui changes

---
 RogueEssence.Editor.Avalonia/App.axaml        |   5 +-
 .../Assets/ListBoxStyles.axaml                |  11 +
 .../Assets/MenuItemStyles.axaml               | 289 +++++++++++++
 .../Assets/Styles.axaml                       | 399 +++++++++++-------
 .../Assets/Themes.axaml                       |  16 +-
 .../DataEditor/CollectionBox.axaml            |  87 ++--
 .../DataEditor/CollectionBoxViewModel.cs      | 100 +++--
 .../ViewModels/New/DevFormViewModel.cs        |  88 ++--
 .../Views/DialogBoxes/ModConfigWindow.axaml   |  22 +-
 .../Views/New/DevForm.axaml.cs                |   8 +-
 .../New/DialogBoxes/ModConfigWindowView.axaml | 141 ++++---
 .../DialogBoxes/ModConfigWindowView.axaml.cs  |   2 +-
 .../New/Editors/SpeciesEditPageView.axaml     | 212 +++++++---
 RogueEssence/Ground/GroundChar.cs             |   1 +
 14 files changed, 973 insertions(+), 408 deletions(-)
 create mode 100644 RogueEssence.Editor.Avalonia/Assets/ListBoxStyles.axaml
 create mode 100644 RogueEssence.Editor.Avalonia/Assets/MenuItemStyles.axaml

diff --git a/RogueEssence.Editor.Avalonia/App.axaml b/RogueEssence.Editor.Avalonia/App.axaml
index 840e1e60..10851340 100644
--- a/RogueEssence.Editor.Avalonia/App.axaml
+++ b/RogueEssence.Editor.Avalonia/App.axaml
@@ -12,10 +12,12 @@
 
     <Application.Resources>
         <ResourceDictionary>
+
             <ResourceDictionary.MergedDictionaries>
                 <ResourceInclude Source="/Assets/Icons.axaml"/>
                 <ResourceInclude Source="/Assets/Themes.axaml"/>
                 <ResourceInclude Source="/Assets/NodeTemplates.axaml"/>
+                <ResourceInclude Source="/Assets/MenuItemStyles.axaml" />
             </ResourceDictionary.MergedDictionaries>
             <ResourceDictionary.ThemeDictionaries>
                 <ResourceDictionary x:Key="Light">
@@ -25,7 +27,7 @@
                     <SolidColorBrush x:Key="TabItemBackgroundBrushWindowInactive" Color="#FFF6F6F6" />
                     <SolidColorBrush x:Key="SelectedTabItemBackgroundBrush" Color="#FFFDFDFD" />
                     <SolidColorBrush x:Key="TabItemHeaderBackgroundUnselectedPointerOver" Color="#FFDFDFDF" />
-                    
+
                 </ResourceDictionary>
                 
                 <ResourceDictionary x:Key="Dark">
@@ -43,6 +45,7 @@
          <FluentTheme />
          <fluent:CustomTheme/>
          <StyleInclude Source="/Assets/Styles.axaml"/>
+         <StyleInclude Source="/Assets/ListBoxStyles.axaml"/>
          <StyleInclude Source="avares://Avalonia.Controls.TreeDataGrid/Themes/Fluent.axaml"/>
          <StyleInclude Source="/Assets/TreeStyles.axaml"/>
      </Application.Styles>
diff --git a/RogueEssence.Editor.Avalonia/Assets/ListBoxStyles.axaml b/RogueEssence.Editor.Avalonia/Assets/ListBoxStyles.axaml
new file mode 100644
index 00000000..55748e07
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/Assets/ListBoxStyles.axaml
@@ -0,0 +1,11 @@
+<Styles xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:s="using:RogueEssence.Dev">
+
+    <Styles.Resources>
+        <ControlTheme x:Key="CompactListBoxItem" TargetType="ListBoxItem" BasedOn="{StaticResource {x:Type ListBoxItem}}">
+            <Setter Property="Padding" Value="4,2"/>
+        </ControlTheme>
+    </Styles.Resources>
+
+</Styles>
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Assets/MenuItemStyles.axaml b/RogueEssence.Editor.Avalonia/Assets/MenuItemStyles.axaml
new file mode 100644
index 00000000..76b40aeb
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/Assets/MenuItemStyles.axaml
@@ -0,0 +1,289 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    
+
+    <ControlTheme x:Key="CommandMenuItemTheme" TargetType="MenuItem"  BasedOn="{StaticResource {x:Type MenuItem}}">
+        <ControlTheme.Resources>
+            <StreamGeometry x:Key="MenuItemChevronPathData">M 0,1 L 10,10 L 20,1 L 19,0 L 10,8 L 1,0 Z</StreamGeometry>
+            <Thickness x:Key="MenuInputGestureTextMargin">0,0,0,0</Thickness>
+        </ControlTheme.Resources>
+        
+       <Setter Property="Template">
+            <ControlTemplate>
+                <Panel>
+                    <Border Name="PART_LayoutRoot"
+                            Padding="0,0,4,0"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="3">
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="28" SharedSizeGroup="MenuItemIcon" />
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="Auto" SharedSizeGroup="MenuItemIGT" />
+                                <ColumnDefinition Width="Auto" SharedSizeGroup="MenuItemChevron" />
+                            </Grid.ColumnDefinitions>
+
+                            <ContentControl Grid.Column="0"
+                                            x:Name="PART_IconPresenter"
+                                            Content="{TemplateBinding Icon}"
+                                            IsVisible="False"
+                                            HorizontalAlignment="Center"
+                                            VerticalAlignment="Center" />
+
+                            <ContentPresenter Grid.Column="1"
+                                              x:Name="PART_HeaderPresenter"
+                                              Content="{TemplateBinding Header}"
+                                              Foreground="{TemplateBinding Foreground}"
+                                              ContentTemplate="{TemplateBinding HeaderTemplate}"
+                                              VerticalAlignment="Center"
+                                              HorizontalAlignment="Stretch"
+                                              RecognizesAccessKey="False" />
+
+                            <TextBlock Grid.Column="2"
+                                       Classes="CaptionTextBlockStyle"
+                                       Margin="{DynamicResource MenuInputGestureTextMargin}"
+                                       Text="{TemplateBinding InputGesture, Converter={StaticResource KeyGestureConverter}}"
+                                       HorizontalAlignment="Right"
+                                       VerticalAlignment="Center"
+                                       Foreground="{DynamicResource MenuFlyoutItemKeyboardAcceleratorTextForeground}"
+                                       FontSize="11" />
+
+                            <TextBlock Grid.Column="2"
+                                       Classes="CaptionTextBlockStyle"
+                                       Margin="{DynamicResource MenuInputGestureTextMargin}"
+                                       Text="{TemplateBinding Tag}"
+                                       HorizontalAlignment="Right"
+                                       VerticalAlignment="Center"
+                                       Foreground="{DynamicResource MenuFlyoutItemKeyboardAcceleratorTextForeground}"
+                                       FontSize="11"
+                                       IsVisible="{TemplateBinding InputGesture, Converter={x:Static ObjectConverters.IsNull}}" />
+
+                            <Path Name="PART_ChevronPath"
+                                  Width="6"
+                                  Data="M573 512 215 881c-20 20-20 51 0 61l61 61c20 20 51 20 61 0l461-461c10-10 10-20 10-31s0-20-10-31L338 20C317 0 287 0 276 20L215 82c-20 20-20 51 0 61L573 512z"
+                                  Fill="{DynamicResource Brush.FG2}"
+                                  Margin="8,0,0,0"
+                                  VerticalAlignment="Center"
+                                  Grid.Column="3" />
+                        </Grid>
+                    </Border>
+                    <Popup Name="PART_Popup"
+                           WindowManagerAddShadowHint="False"
+                           Placement="RightEdgeAlignedTop"
+                           MaxHeight="400"
+                           IsLightDismissEnabled="False"
+                           HorizontalOffset="-4"
+                           VerticalOffset="-4"
+                           IsOpen="{TemplateBinding IsSubMenuOpen, Mode=TwoWay}">
+                        <Grid>
+                            <Border Background="{DynamicResource Brush.Popup}" Margin="4"
+                                    CornerRadius="{DynamicResource OverlayCornerRadius}">
+                                <Border.Effect>
+                                    <DropShadowEffect OffsetX="0" OffsetY="0" Color="Black" BlurRadius="4" Opacity=".6" />
+                                </Border.Effect>
+                            </Border>
+
+                            <Border BorderThickness="0" Margin="8,4" MaxHeight="400">
+                                <ScrollViewer Theme="{StaticResource FluentMenuScrollViewer}">
+                                    <ItemsPresenter Name="PART_ItemsPresenter"
+                                                    Margin="{DynamicResource MenuFlyoutScrollerMargin}"
+                                                    Grid.IsSharedSizeScope="True">
+                                        <ItemsPresenter.ItemsPanel>
+                                            <ItemsPanelTemplate>
+                                                <VirtualizingStackPanel Orientation="Vertical" />
+                                            </ItemsPanelTemplate>
+                                        </ItemsPresenter.ItemsPanel>
+                                    </ItemsPresenter>
+                                </ScrollViewer>
+                            </Border>
+                        </Grid>
+                    </Popup>
+                </Panel>
+            </ControlTemplate>
+        </Setter>
+        
+        <!-- Icon visibility -->
+        <Style Selector="^:icon /template/ ContentControl#PART_IconPresenter">
+            <Setter Property="IsVisible" Value="True" />
+        </Style>
+
+        <!-- Selected state -->
+        <Style Selector="^:selected /template/ Border#PART_LayoutRoot">
+            <Setter Property="Background" Value="{DynamicResource MenuFlyoutItemBackgroundPointerOver}" />
+        </Style>
+        <Style Selector="^:selected /template/ ContentPresenter#PART_HeaderPresenter">
+            <Setter Property="Foreground" Value="{DynamicResource MenuFlyoutItemForegroundPointerOver}" />
+        </Style>
+        <Style Selector="^:selected /template/ Path#PART_ChevronPath">
+            <Setter Property="Fill" Value="{DynamicResource MenuFlyoutSubItemChevronPointerOver}" />
+        </Style>
+
+        <!-- Disabled state -->
+        <Style Selector="^:disabled">
+            <Setter Property="Opacity" Value="0.65" />
+            <Setter Property="Background" Value="Transparent" />
+        </Style>
+
+        <!-- Empty (no submenu) -->
+        <Style Selector="^:empty /template/ Path#PART_ChevronPath">
+            <Setter Property="IsVisible" Value="False" />
+        </Style>
+
+        <!-- Separator -->
+        <Style Selector="^:separator">
+            <Setter Property="Height" Value="5" />
+            <Setter Property="Template">
+                <ControlTemplate>
+                    <Separator Margin="28,0,4,0" Height=".5" VerticalAlignment="Center"
+                               Background="{DynamicResource Brush.Border2}" />
+                </ControlTemplate>
+            </Setter>
+        </Style>
+    </ControlTheme>
+    
+    
+      <ControlTheme x:Key="IconMenuItemTheme" TargetType="MenuItem">
+        <!-- Base property setters -->
+        <Setter Property="Height" Value="28" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Foreground" Value="{DynamicResource Brush.FG1}" />
+        <Setter Property="Cursor" Value="Arrow" />
+        
+        <Setter Property="Template">
+            <ControlTemplate>
+                <Panel>
+                    <Border Name="PART_LayoutRoot"
+                            Padding="0,0,4,0"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="3">
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="28" SharedSizeGroup="MenuItemIcon" />
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="Auto" SharedSizeGroup="MenuItemIGT" />
+                                <ColumnDefinition Width="Auto" SharedSizeGroup="MenuItemChevron" />
+                            </Grid.ColumnDefinitions>
+
+                            <ContentControl Grid.Column="0"
+                                            x:Name="PART_IconPresenter"
+                                            Content="{TemplateBinding Icon}"
+                                            IsVisible="False"
+                                            HorizontalAlignment="Center"
+                                            VerticalAlignment="Center" />
+
+                            <ContentPresenter Grid.Column="1"
+                                              x:Name="PART_HeaderPresenter"
+                                              Content="{TemplateBinding Header}"
+                                              Foreground="{TemplateBinding Foreground}"
+                                              ContentTemplate="{TemplateBinding HeaderTemplate}"
+                                              VerticalAlignment="Center"
+                                              HorizontalAlignment="Stretch"
+                                              RecognizesAccessKey="False" />
+
+                            <TextBlock Grid.Column="2"
+                                       Classes="CaptionTextBlockStyle"
+                                       Margin="{DynamicResource MenuInputGestureTextMargin}"
+                                       Text="{TemplateBinding InputGesture, Converter={StaticResource KeyGestureConverter}}"
+                                       HorizontalAlignment="Right"
+                                       VerticalAlignment="Center"
+                                       Foreground="{DynamicResource MenuFlyoutItemKeyboardAcceleratorTextForeground}"
+                                       FontSize="11" />
+
+                            <TextBlock Grid.Column="2"
+                                       Classes="CaptionTextBlockStyle"
+                                       Margin="{DynamicResource MenuInputGestureTextMargin}"
+                                       Text="{TemplateBinding Tag}"
+                                       HorizontalAlignment="Right"
+                                       VerticalAlignment="Center"
+                                       Foreground="{DynamicResource MenuFlyoutItemKeyboardAcceleratorTextForeground}"
+                                       FontSize="11"
+                                       IsVisible="{TemplateBinding InputGesture, Converter={x:Static ObjectConverters.IsNull}}" />
+
+                            <Path Name="PART_ChevronPath"
+                                  Width="6"
+                                  Data="M573 512 215 881c-20 20-20 51 0 61l61 61c20 20 51 20 61 0l461-461c10-10 10-20 10-31s0-20-10-31L338 20C317 0 287 0 276 20L215 82c-20 20-20 51 0 61L573 512z"
+                                  Fill="{DynamicResource Brush.FG2}"
+                                  Margin="8,0,0,0"
+                                  VerticalAlignment="Center"
+                                  Grid.Column="3" />
+                        </Grid>
+                    </Border>
+                    <Popup Name="PART_Popup"
+                           WindowManagerAddShadowHint="False"
+                           Placement="RightEdgeAlignedTop"
+                           MaxHeight="400"
+                           IsLightDismissEnabled="False"
+                           HorizontalOffset="-4"
+                           VerticalOffset="-4"
+                           IsOpen="{TemplateBinding IsSubMenuOpen, Mode=TwoWay}">
+                        <Grid>
+                            <Border Background="{DynamicResource Brush.Popup}" Margin="4"
+                                    CornerRadius="{DynamicResource OverlayCornerRadius}">
+                                <Border.Effect>
+                                    <DropShadowEffect OffsetX="0" OffsetY="0" Color="Black" BlurRadius="4" Opacity=".6" />
+                                </Border.Effect>
+                            </Border>
+
+                            <Border BorderThickness="0" Margin="8,4" MaxHeight="400">
+                                <ScrollViewer Theme="{StaticResource FluentMenuScrollViewer}">
+                                    <ItemsPresenter Name="PART_ItemsPresenter"
+                                                    Margin="{DynamicResource MenuFlyoutScrollerMargin}"
+                                                    Grid.IsSharedSizeScope="True">
+                                        <ItemsPresenter.ItemsPanel>
+                                            <ItemsPanelTemplate>
+                                                <VirtualizingStackPanel Orientation="Vertical" />
+                                            </ItemsPanelTemplate>
+                                        </ItemsPresenter.ItemsPanel>
+                                    </ItemsPresenter>
+                                </ScrollViewer>
+                            </Border>
+                        </Grid>
+                    </Popup>
+                </Panel>
+            </ControlTemplate>
+        </Setter>
+        
+        <!-- Icon visibility -->
+        <Style Selector="^:icon /template/ ContentControl#PART_IconPresenter">
+            <Setter Property="IsVisible" Value="True" />
+        </Style>
+
+        <!-- Selected state -->
+        <Style Selector="^:selected /template/ Border#PART_LayoutRoot">
+            <Setter Property="Background" Value="{DynamicResource MenuFlyoutItemBackgroundPointerOver}" />
+        </Style>
+        <Style Selector="^:selected /template/ ContentPresenter#PART_HeaderPresenter">
+            <Setter Property="Foreground" Value="{DynamicResource MenuFlyoutItemForegroundPointerOver}" />
+        </Style>
+        <Style Selector="^:selected /template/ Path#PART_ChevronPath">
+            <Setter Property="Fill" Value="{DynamicResource MenuFlyoutSubItemChevronPointerOver}" />
+        </Style>
+
+        <!-- Disabled state -->
+        <Style Selector="^:disabled">
+            <Setter Property="Opacity" Value="0.65" />
+            <Setter Property="Background" Value="Transparent" />
+        </Style>
+
+        <!-- Empty (no submenu) -->
+        <Style Selector="^:empty /template/ Path#PART_ChevronPath">
+            <Setter Property="IsVisible" Value="False" />
+        </Style>
+
+        <!-- Separator -->
+        <Style Selector="^:separator">
+            <Setter Property="Height" Value="5" />
+            <Setter Property="Template">
+                <ControlTemplate>
+                    <Separator Margin="28,0,4,0" Height=".5" VerticalAlignment="Center"
+                               Background="{DynamicResource Brush.Border2}" />
+                </ControlTemplate>
+            </Setter>
+        </Style>
+    </ControlTheme>
+    
+</ResourceDictionary>
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Assets/Styles.axaml b/RogueEssence.Editor.Avalonia/Assets/Styles.axaml
index c0f5e20b..3103e860 100644
--- a/RogueEssence.Editor.Avalonia/Assets/Styles.axaml
+++ b/RogueEssence.Editor.Avalonia/Assets/Styles.axaml
@@ -10,6 +10,64 @@
         </StackPanel>
     </Design.PreviewWith>
 
+    
+    <Style Selector="Expander">
+        <Style.Resources>
+            <SolidColorBrush x:Key="ExpanderContentBackground" Color="Transparent" />
+            <SolidColorBrush x:Key="ExpanderHeaderBackground" Color="Transparent" />
+            <SolidColorBrush x:Key="ExpanderChevronBackgroundPointerOver">Transparent</SolidColorBrush>
+            <SolidColorBrush x:Key="ExpanderHeaderBackgroundPressed">Transparent</SolidColorBrush>
+            <Thickness x:Key="ExpanderHeaderBorderThickness">0</Thickness>
+            <Thickness x:Key="ExpanderContentLeftBorderThickness">0</Thickness>
+            <Thickness x:Key="ExpanderContentUpBorderThickness">0</Thickness>
+            <Thickness x:Key="ExpanderContentRightBorderThickness">0</Thickness>
+            <Thickness x:Key="ExpanderContentDownBorderThickness">0</Thickness>
+            <SolidColorBrush x:Key="ExpanderHeaderBackgroundPointerOver">Transparent</SolidColorBrush>
+        </Style.Resources>
+        <Style Selector="^ /template/ ToggleButton#ExpanderHeader">
+            <Setter Property="HorizontalContentAlignment" Value="Left" />
+            <Setter Property="Padding" Value="0" />
+            <Setter Property="Foreground" Value="{DynamicResource ExpanderHeaderForeground}" />
+            <Setter Property="Margin" Value="0" />
+            <Setter Property="MinHeight" Value="24" />
+            <Setter Property="Template">
+
+                <ControlTemplate>
+                    <Border x:Name="ToggleButtonBackground">
+                        <Grid ColumnDefinitions="Auto, *">
+                            <Border x:Name="ExpandCollapseChevronBorder"
+                                    Grid.Column="0"
+                                    Margin="4, 0, 6, 0"
+                                    Width="12"
+                                    Height="12"
+                                    RenderTransformOrigin="50%,50%">
+                                <Path x:Name="ExpandCollapseChevron"
+                                      HorizontalAlignment="Center"
+                                      VerticalAlignment="Center"
+                                      RenderTransformOrigin="50%,50%"
+                                      Stretch="Uniform"
+                                      Stroke="{DynamicResource ExpanderChevronForeground}"
+                                      StrokeThickness="1" />
+                                <Border.RenderTransform>
+                                    <RotateTransform />
+                                </Border.RenderTransform>
+                            </Border>
+                            <ContentPresenter Grid.Column="1"
+                                              x:Name="PART_ContentPresenter"
+                                              Margin="{TemplateBinding Padding}"
+                                              HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                              VerticalContentAlignment="Center"
+                                              Content="{TemplateBinding Content}"
+                                              ContentTemplate="{TemplateBinding ContentTemplate}"
+                                              Foreground="{TemplateBinding Foreground}" />
+                        </Grid>
+                    </Border>
+                </ControlTemplate>
+            </Setter>
+        </Style>
+    </Style>
+
+
     <Style Selector="UserControl">
         <Setter Property="FontSize" Value="12" />
     </Style>
@@ -115,7 +173,7 @@
         <Setter Property="BorderBrush" Value="{DynamicResource Brush.Border2}" />
         <Setter Property="TextBlock.TextAlignment" Value="Center" />
         <Setter Property="Foreground" Value="{DynamicResource Brush.FG1}" />
-        <Setter Property="Background" Value="{DynamicResource Brush.FlatButton.Background2}" />
+        <Setter Property="Background" Value="{DynamicResource Brush.FlatButton.Background}" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
         <Setter Property="HorizontalContentAlignment" Value="Center" />
         <Setter Property="HorizontalAlignment" Value="Stretch"></Setter>
@@ -174,8 +232,25 @@
         <Setter Property="Foreground" Value="{DynamicResource Brush.FG1}" />
     </Style>
 
-    
-    
+    <Style Selector="Button.secondary">
+        <Setter Property="Background" Value="{DynamicResource Brush.IconButton.Background}" />
+    </Style>
+    <Style Selector="Button.secondary:pointerover /template/ Border#PART_Border">
+        <!-- <Setter Property="Background" Value="Red" /> -->
+        <Setter Property="BorderBrush" Value="Transparent" />
+    </Style>
+
+
+    <Style Selector="Button.secondary:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="Background" Value="{DynamicResource Brush.IconButton.BackgroundHovered}" />
+    </Style>
+    <Style Selector="Button.secondary:disabled">
+        <Setter Property="Opacity" Value=".65" />
+    </Style>
+    <Style Selector="Button.secondary ToolTip TextBlock">
+        <Setter Property="Foreground" Value="{DynamicResource Brush.FG1}" />
+    </Style>
+
     <Style Selector="Button.flat.danger">
         <Setter Property="BorderBrush" Value="#FFCB444A" />
         <Setter Property="Background" Value="#FFE14444" />
@@ -185,7 +260,7 @@
         <Setter Property="BorderBrush" Value="#E56363" />
     </Style>
 
-    
+
     <Style Selector="Button.flat.danger:pointerover /template/ ContentPresenter#PART_ContentPresenter">
         <Setter Property="Background" Value="Transparent" />
     </Style>
@@ -200,7 +275,6 @@
     </Style>
 
 
-    
     <Style Selector="Button.flat.danger:pointerover /template/ ContentPresenter#PART_ContentPresenter">
         <Setter Property="Background" Value="Transparent" />
     </Style>
@@ -387,162 +461,162 @@
         </Setter>
     </Style>
 
-    <Style Selector="MenuItem">
-        <Setter Property="Height" Value="28" />
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="Foreground" Value="{DynamicResource Brush.FG1}" />
-        <Setter Property="Cursor" Value="Arrow" />
-
-        <Setter Property="Template">
-            <ControlTemplate>
-                <Panel>
-                    <Border Name="PART_LayoutRoot"
-                            Padding="0,0,4,0"
-                            Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            CornerRadius="3">
-                        <Grid>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="28" SharedSizeGroup="MenuItemIcon" />
-                                <ColumnDefinition Width="*" />
-                                <ColumnDefinition Width="Auto" SharedSizeGroup="MenuItemIGT" />
-                                <ColumnDefinition Width="Auto" SharedSizeGroup="MenuItemChevron" />
-                            </Grid.ColumnDefinitions>
-
-                            <ContentControl Grid.Column="0"
-                                            x:Name="PART_IconPresenter"
-                                            Content="{TemplateBinding Icon}"
-                                            IsVisible="False"
-                                            HorizontalAlignment="Center"
-                                            VerticalAlignment="Center" />
-
-                            <ContentPresenter Grid.Column="1"
-                                              x:Name="PART_HeaderPresenter"
-                                              Content="{TemplateBinding Header}"
-                                              Foreground="{TemplateBinding Foreground}"
-                                              ContentTemplate="{TemplateBinding HeaderTemplate}"
-                                              VerticalAlignment="Center"
-                                              HorizontalAlignment="Stretch"
-                                              RecognizesAccessKey="False">
-                                <!-- <ContentPresenter.DataTemplates> -->
-                                <!-- <DataTemplate DataType="x:String"> -->
-                                <!--   <v:NameHighlightedTextBlock Text="{Binding}" VerticalAlignment="Center"/> -->
-                                <!-- </DataTemplate> -->
-                                <!-- -->
-                                <!-- <DataTemplate DataType="vm:FilterModeInGraph"> -->
-                                <!--   <v:FilterModeInGraph/> -->
-                                <!-- </DataTemplate> -->
-
-                                <!--   <DataTemplate DataType="vm:CustomActionContextMenuLabel"> -->
-                                <!--     <StackPanel Orientation="Horizontal"> -->
-                                <!--       <TextBlock Text="{Binding Name}" VerticalAlignment="Center"/> -->
-                                <!--       <Border Margin="4,0,0,0" Height="16" Background="Green" CornerRadius="8" VerticalAlignment="Center" IsVisible="{Binding IsGlobal}"> -->
-                                <!--         <TextBlock Classes="primary" Text="GLOBAL" Margin="8,0" FontSize="10" Foreground="White"/> -->
-                                <!--       </Border> -->
-                                <!--     </StackPanel> -->
-                                <!--   </DataTemplate> -->
-                                <!-- </ContentPresenter.DataTemplates> -->
-                            </ContentPresenter>
-
-                            <TextBlock Grid.Column="2"
-                                       Classes="CaptionTextBlockStyle"
-                                       Margin="{DynamicResource MenuInputGestureTextMargin}"
-                                       Text="{TemplateBinding InputGesture, Converter={StaticResource KeyGestureConverter}}"
-                                       HorizontalAlignment="Right"
-                                       VerticalAlignment="Center"
-                                       Foreground="{DynamicResource MenuFlyoutItemKeyboardAcceleratorTextForeground}"
-                                       FontSize="11" />
-
-                            <TextBlock Grid.Column="2"
-                                       Classes="CaptionTextBlockStyle"
-                                       Margin="{DynamicResource MenuInputGestureTextMargin}"
-                                       Text="{TemplateBinding Tag}"
-                                       HorizontalAlignment="Right"
-                                       VerticalAlignment="Center"
-                                       Foreground="{DynamicResource MenuFlyoutItemKeyboardAcceleratorTextForeground}"
-                                       FontSize="11"
-                                       IsVisible="{TemplateBinding InputGesture, Converter={x:Static ObjectConverters.IsNull}}" />
-
-                            <Path Name="PART_ChevronPath"
-                                  Width="6"
-                                  Data="M573 512 215 881c-20 20-20 51 0 61l61 61c20 20 51 20 61 0l461-461c10-10 10-20 10-31s0-20-10-31L338 20C317 0 287 0 276 20L215 82c-20 20-20 51 0 61L573 512z"
-                                  Fill="{DynamicResource Brush.FG2}"
-                                  Margin="8,0,0,0"
-                                  VerticalAlignment="Center"
-                                  Grid.Column="3" />
-                        </Grid>
-                    </Border>
-                    <Popup Name="PART_Popup"
-                           WindowManagerAddShadowHint="False"
-                           Placement="RightEdgeAlignedTop"
-                           MaxHeight="400"
-                           IsLightDismissEnabled="False"
-                           HorizontalOffset="-4"
-                           VerticalOffset="-4"
-                           IsOpen="{TemplateBinding IsSubMenuOpen, Mode=TwoWay}">
-                        <Grid>
-                            <Border Background="{DynamicResource Brush.Popup}" Margin="4"
-                                    CornerRadius="{DynamicResource OverlayCornerRadius}">
-                                <Border.Effect>
-                                    <DropShadowEffect OffsetX="0" OffsetY="0" Color="Black" BlurRadius="4" Opacity=".6" />
-                                </Border.Effect>
-                            </Border>
-
-                            <Border BorderThickness="0" Margin="8,4" MaxHeight="400">
-                                <ScrollViewer Theme="{StaticResource FluentMenuScrollViewer}">
-                                    <ItemsPresenter Name="PART_ItemsPresenter"
-                                                    Margin="{DynamicResource MenuFlyoutScrollerMargin}"
-                                                    Grid.IsSharedSizeScope="True">
-                                        <ItemsPresenter.ItemsPanel>
-                                            <ItemsPanelTemplate>
-                                                <VirtualizingStackPanel Orientation="Vertical" />
-                                            </ItemsPanelTemplate>
-                                        </ItemsPresenter.ItemsPanel>
-                                    </ItemsPresenter>
-                                </ScrollViewer>
-                            </Border>
-                        </Grid>
-                    </Popup>
-                </Panel>
-            </ControlTemplate>
-        </Setter>
-
-        <Style Selector="^:icon /template/ ContentControl#PART_IconPresenter">
-            <Setter Property="IsVisible" Value="True" />
-        </Style>
-
-        <Style Selector="^:selected">
-            <Style Selector="^ /template/ Border#PART_LayoutRoot">
-                <Setter Property="Background" Value="{DynamicResource MenuFlyoutItemBackgroundPointerOver}" />
-            </Style>
-            <Style Selector="^ /template/ ContentPresenter#PART_HeaderPresenter">
-                <Setter Property="Foreground" Value="{DynamicResource MenuFlyoutItemForegroundPointerOver}" />
-            </Style>
-            <Style Selector="^ /template/ Path#PART_ChevronPath">
-                <Setter Property="Fill" Value="{DynamicResource MenuFlyoutSubItemChevronPointerOver}" />
-            </Style>
-        </Style>
-
-        <Style Selector="^:disabled">
-            <Setter Property="Opacity" Value="0.65" />
-            <Setter Property="Background" Value="Transparent" />
-        </Style>
-
-        <Style Selector="^:empty /template/ Path#PART_ChevronPath">
-            <Setter Property="IsVisible" Value="False" />
-        </Style>
-
-        <Style Selector="^:separator">
-            <Setter Property="Height" Value="5" />
-            <Setter Property="Template">
-                <ControlTemplate>
-                    <Separator Margin="28,0,4,0" Height=".5" VerticalAlignment="Center"
-                               Background="{DynamicResource Brush.Border2}" />
-                </ControlTemplate>
-            </Setter>
-        </Style>
-    </Style>
+    <!-- <Style Selector="MenuItem"> -->
+    <!--     <Setter Property="Height" Value="28" /> -->
+    <!--     <Setter Property="Background" Value="Transparent" /> -->
+    <!--     <Setter Property="Foreground" Value="{DynamicResource Brush.FG1}" /> -->
+    <!--     <Setter Property="Cursor" Value="Arrow" /> -->
+    <!-- -->
+    <!--     <Setter Property="Template"> -->
+    <!--         <ControlTemplate> -->
+    <!--             <Panel> -->
+    <!--                 <Border Name="PART_LayoutRoot" -->
+    <!--                         Padding="0,0,4,0" -->
+    <!--                         Background="{TemplateBinding Background}" -->
+    <!--                         BorderBrush="{TemplateBinding BorderBrush}" -->
+    <!--                         BorderThickness="{TemplateBinding BorderThickness}" -->
+    <!--                         CornerRadius="3"> -->
+    <!--                     <Grid> -->
+    <!--                         <Grid.ColumnDefinitions> -->
+    <!--                             <ColumnDefinition Width="28" SharedSizeGroup="MenuItemIcon" /> -->
+    <!--                             <ColumnDefinition Width="*" /> -->
+    <!--                             <ColumnDefinition Width="Auto" SharedSizeGroup="MenuItemIGT" /> -->
+    <!--                             <ColumnDefinition Width="Auto" SharedSizeGroup="MenuItemChevron" /> -->
+    <!--                         </Grid.ColumnDefinitions> -->
+    <!-- -->
+    <!--                         <ContentControl Grid.Column="0" -->
+    <!--                                         x:Name="PART_IconPresenter" -->
+    <!--                                         Content="{TemplateBinding Icon}" -->
+    <!--                                         IsVisible="False" -->
+    <!--                                         HorizontalAlignment="Center" -->
+    <!--                                         VerticalAlignment="Center" /> -->
+    <!-- -->
+    <!--                         <ContentPresenter Grid.Column="1" -->
+    <!--                                           x:Name="PART_HeaderPresenter" -->
+    <!--                                           Content="{TemplateBinding Header}" -->
+    <!--                                           Foreground="{TemplateBinding Foreground}" -->
+    <!--                                           ContentTemplate="{TemplateBinding HeaderTemplate}" -->
+    <!--                                           VerticalAlignment="Center" -->
+    <!--                                           HorizontalAlignment="Stretch" -->
+    <!--                                           RecognizesAccessKey="False"> -->
+    <!--                             ~1~ <ContentPresenter.DataTemplates> @1@ -->
+    <!--                             ~1~ <DataTemplate DataType="x:String"> @1@ -->
+    <!--                             ~1~   <v:NameHighlightedTextBlock Text="{Binding}" VerticalAlignment="Center"/> @1@ -->
+    <!--                             ~1~ </DataTemplate> @1@ -->
+    <!--                             ~1~ @1@ -->
+    <!--                             ~1~ <DataTemplate DataType="vm:FilterModeInGraph"> @1@ -->
+    <!--                             ~1~   <v:FilterModeInGraph/> @1@ -->
+    <!--                             ~1~ </DataTemplate> @1@ -->
+    <!-- -->
+    <!--                             ~1~   <DataTemplate DataType="vm:CustomActionContextMenuLabel"> @1@ -->
+    <!--                             ~1~     <StackPanel Orientation="Horizontal"> @1@ -->
+    <!--                             ~1~       <TextBlock Text="{Binding Name}" VerticalAlignment="Center"/> @1@ -->
+    <!--                             ~1~       <Border Margin="4,0,0,0" Height="16" Background="Green" CornerRadius="8" VerticalAlignment="Center" IsVisible="{Binding IsGlobal}"> @1@ -->
+    <!--                             ~1~         <TextBlock Classes="primary" Text="GLOBAL" Margin="8,0" FontSize="10" Foreground="White"/> @1@ -->
+    <!--                             ~1~       </Border> @1@ -->
+    <!--                             ~1~     </StackPanel> @1@ -->
+    <!--                             ~1~   </DataTemplate> @1@ -->
+    <!--                             ~1~ </ContentPresenter.DataTemplates> @1@ -->
+    <!--                         </ContentPresenter> -->
+    <!-- -->
+    <!--                         <TextBlock Grid.Column="2" -->
+    <!--                                    Classes="CaptionTextBlockStyle" -->
+    <!--                                    Margin="{DynamicResource MenuInputGestureTextMargin}" -->
+    <!--                                    Text="{TemplateBinding InputGesture, Converter={StaticResource KeyGestureConverter}}" -->
+    <!--                                    HorizontalAlignment="Right" -->
+    <!--                                    VerticalAlignment="Center" -->
+    <!--                                    Foreground="{DynamicResource MenuFlyoutItemKeyboardAcceleratorTextForeground}" -->
+    <!--                                    FontSize="11" /> -->
+    <!-- -->
+    <!--                         <TextBlock Grid.Column="2" -->
+    <!--                                    Classes="CaptionTextBlockStyle" -->
+    <!--                                    Margin="{DynamicResource MenuInputGestureTextMargin}" -->
+    <!--                                    Text="{TemplateBinding Tag}" -->
+    <!--                                    HorizontalAlignment="Right" -->
+    <!--                                    VerticalAlignment="Center" -->
+    <!--                                    Foreground="{DynamicResource MenuFlyoutItemKeyboardAcceleratorTextForeground}" -->
+    <!--                                    FontSize="11" -->
+    <!--                                    IsVisible="{TemplateBinding InputGesture, Converter={x:Static ObjectConverters.IsNull}}" /> -->
+    <!-- -->
+    <!--                         <Path Name="PART_ChevronPath" -->
+    <!--                               Width="6" -->
+    <!--                               Data="M573 512 215 881c-20 20-20 51 0 61l61 61c20 20 51 20 61 0l461-461c10-10 10-20 10-31s0-20-10-31L338 20C317 0 287 0 276 20L215 82c-20 20-20 51 0 61L573 512z" -->
+    <!--                               Fill="{DynamicResource Brush.FG2}" -->
+    <!--                               Margin="8,0,0,0" -->
+    <!--                               VerticalAlignment="Center" -->
+    <!--                               Grid.Column="3" /> -->
+    <!--                     </Grid> -->
+    <!--                 </Border> -->
+    <!--                 <Popup Name="PART_Popup" -->
+    <!--                        WindowManagerAddShadowHint="False" -->
+    <!--                        Placement="RightEdgeAlignedTop" -->
+    <!--                        MaxHeight="400" -->
+    <!--                        IsLightDismissEnabled="False" -->
+    <!--                        HorizontalOffset="-4" -->
+    <!--                        VerticalOffset="-4" -->
+    <!--                        IsOpen="{TemplateBinding IsSubMenuOpen, Mode=TwoWay}"> -->
+    <!--                     <Grid> -->
+    <!--                         <Border Background="{DynamicResource Brush.Popup}" Margin="4" -->
+    <!--                                 CornerRadius="{DynamicResource OverlayCornerRadius}"> -->
+    <!--                             <Border.Effect> -->
+    <!--                                 <DropShadowEffect OffsetX="0" OffsetY="0" Color="Black" BlurRadius="4" Opacity=".6" /> -->
+    <!--                             </Border.Effect> -->
+    <!--                         </Border> -->
+    <!-- -->
+    <!--                         <Border BorderThickness="0" Margin="8,4" MaxHeight="400"> -->
+    <!--                             <ScrollViewer Theme="{StaticResource FluentMenuScrollViewer}"> -->
+    <!--                                 <ItemsPresenter Name="PART_ItemsPresenter" -->
+    <!--                                                 Margin="{DynamicResource MenuFlyoutScrollerMargin}" -->
+    <!--                                                 Grid.IsSharedSizeScope="True"> -->
+    <!--                                     <ItemsPresenter.ItemsPanel> -->
+    <!--                                         <ItemsPanelTemplate> -->
+    <!--                                             <VirtualizingStackPanel Orientation="Vertical" /> -->
+    <!--                                         </ItemsPanelTemplate> -->
+    <!--                                     </ItemsPresenter.ItemsPanel> -->
+    <!--                                 </ItemsPresenter> -->
+    <!--                             </ScrollViewer> -->
+    <!--                         </Border> -->
+    <!--                     </Grid> -->
+    <!--                 </Popup> -->
+    <!--             </Panel> -->
+    <!--         </ControlTemplate> -->
+    <!--     </Setter> -->
+    <!-- -->
+    <!--     <Style Selector="^:icon /template/ ContentControl#PART_IconPresenter"> -->
+    <!--         <Setter Property="IsVisible" Value="True" /> -->
+    <!--     </Style> -->
+    <!-- -->
+    <!--     <Style Selector="^:selected"> -->
+    <!--         <Style Selector="^ /template/ Border#PART_LayoutRoot"> -->
+    <!--             <Setter Property="Background" Value="{DynamicResource MenuFlyoutItemBackgroundPointerOver}" /> -->
+    <!--         </Style> -->
+    <!--         <Style Selector="^ /template/ ContentPresenter#PART_HeaderPresenter"> -->
+    <!--             <Setter Property="Foreground" Value="{DynamicResource MenuFlyoutItemForegroundPointerOver}" /> -->
+    <!--         </Style> -->
+    <!--         <Style Selector="^ /template/ Path#PART_ChevronPath"> -->
+    <!--             <Setter Property="Fill" Value="{DynamicResource MenuFlyoutSubItemChevronPointerOver}" /> -->
+    <!--         </Style> -->
+    <!--     </Style> -->
+    <!-- -->
+    <!--     <Style Selector="^:disabled"> -->
+    <!--         <Setter Property="Opacity" Value="0.65" /> -->
+    <!--         <Setter Property="Background" Value="Transparent" /> -->
+    <!--     </Style> -->
+    <!-- -->
+    <!--     <Style Selector="^:empty /template/ Path#PART_ChevronPath"> -->
+    <!--         <Setter Property="IsVisible" Value="False" /> -->
+    <!--     </Style> -->
+    <!-- -->
+    <!--     <Style Selector="^:separator"> -->
+    <!--         <Setter Property="Height" Value="5" /> -->
+    <!--         <Setter Property="Template"> -->
+    <!--             <ControlTemplate> -->
+    <!--                 <Separator Margin="28,0,4,0" Height=".5" VerticalAlignment="Center" -->
+    <!--                            Background="{DynamicResource Brush.Border2}" /> -->
+    <!--             </ControlTemplate> -->
+    <!--         </Setter> -->
+    <!--     </Style> -->
+    <!-- </Style> -->
 
 
     <Style Selector="MenuFlyoutPresenter">
@@ -685,7 +759,7 @@
             <x:Double x:Key="TabItemPipeThickness">2</x:Double>
         </Style.Resources>
     </Style>
-    
+
     <Style Selector="TabItem:pointerover TextBlock.tab_header">
         <Setter Property="Foreground" Value="{DynamicResource Brush.FG1}" />
         <Setter Property="Opacity" Value="1" />
@@ -796,7 +870,6 @@
         <Style.Resources>
             <Thickness x:Key="ComboBoxDropdownBorderPadding">4,0</Thickness>
             <Thickness x:Key="ComboBoxItemThemePadding">6,4</Thickness>
-            <!-- <SolidColorBrush x:Key="ComboBoxBackground" Color="{DynamicResource Color.FlatButton.Background}" /> -->
             <SolidColorBrush x:Key="ComboBoxDropDownBackground" Color="{DynamicResource Color.Popup}" />
             <SolidColorBrush x:Key="ComboBoxDropDownBorderBrush" Color="{DynamicResource SystemAccentColor}" />
         </Style.Resources>
diff --git a/RogueEssence.Editor.Avalonia/Assets/Themes.axaml b/RogueEssence.Editor.Avalonia/Assets/Themes.axaml
index fa38e899..ed979b55 100644
--- a/RogueEssence.Editor.Avalonia/Assets/Themes.axaml
+++ b/RogueEssence.Editor.Avalonia/Assets/Themes.axaml
@@ -17,9 +17,10 @@
       <Color x:Key="Color.Border1">#FF898989</Color>
       <Color x:Key="Color.Border2">#FFCFCFCF</Color>
       <Color x:Key="Color.Border3">#FFAFAFAF</Color>
-      <Color x:Key="Color.FlatButton.Background">#FFF8F8F8</Color>
-      <Color x:Key="Color.FlatButton.Background2">#FFF8F8F8</Color>
-      <Color x:Key="Color.FlatButton.BackgroundHovered">White</Color>
+      <Color x:Key="Color.FlatButton.Background">#FFEBEBEB</Color>
+      <Color x:Key="Color.FlatButton.BackgroundHovered">#FFDFDFDF</Color>
+      <Color x:Key="Color.IconButton.Background">#FFEBEBEB</Color>
+      <Color x:Key="Color.IconButton.BackgroundHovered">#FFDFDFDF</Color>
       <Color x:Key="Color.TabHeader.BackgroundHovered">#FFDFDFDF</Color>
       <Color x:Key="Color.FG1">#FF1F1F1F</Color>
       <Color x:Key="Color.FG2">#FF6F6F6F</Color>
@@ -41,8 +42,10 @@
       <Color x:Key="Color.Border1">#FF7C7C7C</Color>
       <Color x:Key="Color.Border2">#FF404040</Color>
       <Color x:Key="Color.Border3">#FF404040</Color>
-      <Color x:Key="Color.FlatButton.Background">#FF303030</Color>
-      <Color x:Key="Color.FlatButton.BackgroundHovered">#FF333333</Color>
+      <Color x:Key="Color.FlatButton.Background">#FF3A3A3A</Color>
+      <Color x:Key="Color.FlatButton.BackgroundHovered">#FF4A4A4A</Color>
+      <Color x:Key="Color.IconButton.Background">#FF5D5D5D</Color>
+      <Color x:Key="Color.IconButton.BackgroundHovered">#FF6D6D6D</Color>
       <Color x:Key="Color.TabHeader.BackgroundHovered">#FF404040</Color>
       <Color x:Key="Color.FG1">#FFDDDDDD</Color>
       <Color x:Key="Color.FG2">#60F1F1F1</Color>
@@ -65,8 +68,9 @@
   <SolidColorBrush x:Key="Brush.Border2" Color="{DynamicResource Color.Border2}"/>
   <SolidColorBrush x:Key="Brush.Border3" Color="{DynamicResource Color.Border3}"/>
   <SolidColorBrush x:Key="Brush.FlatButton.Background" Color="{DynamicResource Color.FlatButton.Background}"/>
-  <SolidColorBrush x:Key="Brush.FlatButton.Background2" Color="{DynamicResource Color.FlatButton.Background2}"/>
   <SolidColorBrush x:Key="Brush.FlatButton.BackgroundHovered" Color="{DynamicResource Color.FlatButton.BackgroundHovered}"/>
+  <SolidColorBrush x:Key="Brush.IconButton.Background" Color="{DynamicResource Color.IconButton.Background}"/>
+  <SolidColorBrush x:Key="Brush.IconButton.BackgroundHovered" Color="{DynamicResource Color.IconButton.BackgroundHovered}"/>
   <SolidColorBrush x:Key="Brush.TabHeader.BackgroundHovered" Color="{DynamicResource Color.TabHeader.BackgroundHovered}"/>
   <SolidColorBrush x:Key="Brush.FG1" Color="{DynamicResource Color.FG1}"/>
   <SolidColorBrush x:Key="Brush.FG2" Color="{DynamicResource Color.FG2}"/>
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/CollectionBox.axaml b/RogueEssence.Editor.Avalonia/DataEditor/CollectionBox.axaml
index 4b99cbcb..6b08d051 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/CollectionBox.axaml
+++ b/RogueEssence.Editor.Avalonia/DataEditor/CollectionBox.axaml
@@ -6,32 +6,61 @@
              mc:Ignorable="d"
              xmlns:converters="clr-namespace:RogueEssence.Dev.Converters"
              x:Class="RogueEssence.Dev.Views.CollectionBox">
-  <Design.DataContext>
-    <vm:CollectionBoxViewModel/>
-  </Design.DataContext>
-  <UserControl.Resources>
-  </UserControl.Resources>
-  <Grid>
-    <Grid.RowDefinitions>
-      <RowDefinition/>
-      <RowDefinition/>
-      <RowDefinition Height="40"/>
-    </Grid.RowDefinitions>
-    <Grid.ColumnDefinitions>
-      <ColumnDefinition/>
-      <ColumnDefinition/>
-      <ColumnDefinition Width="30"/>
-    </Grid.ColumnDefinitions>
-    <ListBox Name="lbxItems" ItemsSource="{Binding Collection}" SelectedIndex="{Binding SelectedIndex}" DoubleTapped="doubleClickStart" PointerReleased="lbxCollection_DoubleClick" Margin="4" Grid.RowSpan="2" Grid.ColumnSpan="2" MinHeight="50">
-      <ListBox.ItemTemplate>
-        <DataTemplate>
-          <TextBlock Text="{Binding Path=DisplayValue}"/>
-        </DataTemplate>
-      </ListBox.ItemTemplate>
-    </ListBox>
-    <Button x:Name="CollectionBoxAddButton" PointerReleased="CollectionBoxAddButton_OnPointerReleased" Margin="4" Grid.Row="2" Grid.Column="0">Add</Button>
-    <Button Command="{Binding btnDelete_Click}" Margin="4" Grid.Row="2" Grid.Column="1">Delete</Button>
-    <Button Command="{Binding btnUp_Click}" Margin="4" Grid.Row="0" Grid.Column="2">^</Button>
-    <Button Command="{Binding btnDown_Click}" Margin="4" Grid.Row="1" Grid.Column="2">v</Button>
-  </Grid>
-</UserControl>
+    <Design.DataContext>
+        <vm:CollectionBoxViewModel />
+    </Design.DataContext>
+    <UserControl.Resources>
+    </UserControl.Resources>
+    <Grid RowDefinitions="*, *, 40" ColumnDefinitions="*, *, 50">
+        <ListBox Name="lbxItems" ItemsSource="{Binding Collection}" SelectedIndex="{Binding SelectedIndex}"
+                 DoubleTapped="doubleClickStart" PointerReleased="lbxCollection_DoubleClick" Margin="4"
+                 Grid.RowSpan="2" Grid.ColumnSpan="2" MinHeight="100">
+            <ListBox.ItemTemplate>
+                <DataTemplate>
+                    <TextBlock Text="{Binding Path=DisplayValue}" />
+                </DataTemplate>
+            </ListBox.ItemTemplate>
+            <ListBox.ItemContainerTheme>
+                <StaticResource ResourceKey="CompactListBoxItem" />
+            </ListBox.ItemContainerTheme>
+        </ListBox>
+        <!-- <ListBox Name="lbxItems" -->
+        <!--          ItemsSource="{Binding Collection}" -->
+        <!--          SelectedIndex="{Binding SelectedIndex}" -->
+        <!--          DoubleTapped="doubleClickStart" -->
+        <!--          PointerReleased="lbxCollection_DoubleClick" -->
+        <!--          Margin="4" -->
+        <!--          Grid.RowSpan="2" -->
+        <!--          Grid.ColumnSpan="2" -->
+        <!--          MinHeight="170" -->
+        <!--          VerticalAlignment="Stretch"> -->
+        <!--     <ListBox.ItemContainerTheme> -->
+        <!--         <StaticResource ResourceKey="CompactListBoxItem" /> -->
+        <!--     </ListBox.ItemContainerTheme> -->
+        <!--     <ListBox.ItemTemplate> -->
+        <!--         <DataTemplate> -->
+        <!--             <TextBlock Text="{Binding Path=DisplayValue}" /> -->
+        <!--         </DataTemplate> -->
+        <!--     </ListBox.ItemTemplate> -->
+        <!-- </ListBox> -->
+        <StackPanel Grid.Row="0" Grid.RowSpan="2" Grid.Column="2" Margin="10, 0, 0, 0">
+            <Button x:Name="CollectionBoxAddButton" PointerReleased="CollectionBoxAddButton_OnPointerReleased"
+                    Classes="secondary" Margin="0, 0" Padding="4,3, 4, 3">
+                <Path Width="10" Height="10" Margin="0, 2,0,0" Data="{StaticResource Icons.Plus}" />
+            </Button>
+            <Button Command="{Binding DeleteCommand}" Classes="secondary" Margin="0, 0" Padding="4,3, 4, 3">
+                <Path Width="10" Height="10" Margin="0,0,0,0" Data="{StaticResource Icons.Minus}" />
+            </Button>
+    
+            <!-- Remove Grid.Row, Grid.RowSpan, Grid.Column here -->
+            <StackPanel Margin="0, 30, 0, 0">
+                <Button Command="{Binding MoveUpCommand}" Classes="secondary" Margin="0, 0" Padding="4,3, 4, 3">
+                    <Path Width="10" Height="10" Margin="0, 2,0,0" Data="{StaticResource Icons.CaretUpFill}" />
+                </Button>
+                <Button Command="{Binding MoveDownCommand}" Classes="secondary" Margin="0, 0" Padding="4,3, 4, 3">
+                    <Path Width="10" Height="10" Margin="0,0,0,0" Data="{StaticResource Icons.CaretDownFill}" />
+                </Button>
+            </StackPanel>
+        </StackPanel>
+    </Grid>
+</UserControl>
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/CollectionBoxViewModel.cs b/RogueEssence.Editor.Avalonia/DataEditor/CollectionBoxViewModel.cs
index 3881b08b..e57408a5 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/CollectionBoxViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/CollectionBoxViewModel.cs
@@ -7,6 +7,10 @@
 using Avalonia.Controls;
 using RogueElements;
 using System.Collections;
+using System.Collections.Specialized;
+using System.Reactive;
+using System.Reactive.Linq;
+using System.Threading.Tasks;
 using Avalonia.Data.Converters;
 using Avalonia.Input;
 using RogueEssence.Dev.Views;
@@ -16,6 +20,7 @@ namespace RogueEssence.Dev.ViewModels
     public class ListElement : ViewModelBase
     {
         private int key;
+
         public int Key
         {
             get { return key; }
@@ -33,6 +38,7 @@ public int DisplayKey
         }
 
         private object val;
+
         public object Value
         {
             get { return val; }
@@ -60,38 +66,75 @@ public class CollectionBoxViewModel : ViewModelBase
     {
         public ObservableCollection<ListElement> Collection { get; }
 
-        private int selectedIndex;
+        private int _selectedIndex = -1;
+
         public int SelectedIndex
         {
-            get { return selectedIndex; }
-            set { this.SetIfChanged(ref selectedIndex, value); }
+            get => _selectedIndex;
+            set => this.RaiseAndSetIfChanged(ref _selectedIndex, value);
         }
 
         public StringConv StringConv;
-
         private Window parent;
 
-
         public delegate void EditElementOp(int index, object element);
+
         public delegate void ElementOp(int index, object element, bool advancedEdit, EditElementOp op);
 
         public event ElementOp OnEditItem;
         public event Action OnMemberChanged;
 
         public bool Index1;
-        public int AddIndex { get { return Index1 ? 1 : 0; } }
-
+        public int AddIndex => Index1 ? 1 : 0;
         public bool ConfirmDelete;
-
+        
+        public ReactiveCommand<Unit, Unit> DeleteCommand { get; }
+        public ReactiveCommand<Unit, Unit> MoveUpCommand { get; }
+        public ReactiveCommand<Unit, Unit> MoveDownCommand { get; }
+        
+        
         public CollectionBoxViewModel(Window parent, StringConv conv)
         {
             StringConv = conv;
             this.parent = parent;
             Collection = new ObservableCollection<ListElement>();
-            SelectedIndex = -1;
-        }
 
+            var collectionCount = Observable.FromEventPattern<NotifyCollectionChangedEventHandler, NotifyCollectionChangedEventArgs>(
+                    h => Collection.CollectionChanged += h,
+                    h => Collection.CollectionChanged -= h)
+                .Select(_ => Collection.Count)
+                .StartWith(Collection.Count);
+
+            var hasSelection = this.WhenAnyValue(x => x.SelectedIndex, index => index >= 0);
+            
+            DeleteCommand = ReactiveCommand.CreateFromTask(DeleteItemAsync, hasSelection);
+            
+            MoveUpCommand = ReactiveCommand.Create(MoveUp, 
+                this.WhenAnyValue(x => x.SelectedIndex, index => index > 0));
+            
+            MoveDownCommand = ReactiveCommand.Create(MoveDown,
+                Observable.CombineLatest(
+                    this.WhenAnyValue(x => x.SelectedIndex),
+                    collectionCount,
+                    (index, count) => index >= 0 && index < count - 1));
+            
+            // Force UI refresh when CanExecute changes
+            MoveDownCommand.CanExecute.Subscribe(canExecute => 
+            {
+                Console.WriteLine($"MoveDown button should be {(canExecute ? "enabled" : "disabled")}");
+            });
+        }
 
+        private void MoveDown()
+        {
+            if (SelectedIndex > -1 && SelectedIndex < Collection.Count - 1)
+            {
+                int index = SelectedIndex;
+                Switch(SelectedIndex, SelectedIndex + 1);
+                SelectedIndex = index + 1;
+                OnMemberChanged?.Invoke();
+            }
+        }
         public T GetList<T>() where T : IList
         {
             return (T)GetList(typeof(T));
@@ -112,7 +155,6 @@ public void LoadFromList(IList source)
                 Collection.Add(new ListElement(StringConv, AddIndex, Collection.Count, obj));
         }
 
-
         private void editItem(int index, object element)
         {
             index = Math.Min(Math.Max(0, index), Collection.Count);
@@ -141,7 +183,6 @@ public void DeleteItem(int index)
 
         public void lbxCollection_DoubleClick(object sender, PointerReleasedEventArgs e)
         {
-            //int index = lbxCollection.IndexFromPoint(e.X, e.Y);
             KeyModifiers modifiers = e.KeyModifiers;
             bool advancedEdit = modifiers.HasFlag(KeyModifiers.Shift);
             int index = SelectedIndex;
@@ -152,7 +193,6 @@ public void lbxCollection_DoubleClick(object sender, PointerReleasedEventArgs e)
             }
         }
 
-
         public void btnAdd_Click(bool advancedEdit)
         {
             int index = SelectedIndex;
@@ -162,14 +202,18 @@ public void btnAdd_Click(bool advancedEdit)
             OnEditItem?.Invoke(index, element, advancedEdit, InsertItem);
         }
 
-        private async void btnDelete_Click()
+        private async Task DeleteItemAsync()
         {
             if (SelectedIndex > -1 && SelectedIndex < Collection.Count)
             {
                 if (ConfirmDelete)
                 {
-                    MessageBox.MessageBoxResult result = await MessageBox.Show(parent, "Are you sure you want to delete this item:\n" + Collection[SelectedIndex].DisplayValue, "Confirm Delete",
-                    MessageBox.MessageBoxButtons.YesNo);
+                    MessageBox.MessageBoxResult result = await MessageBox.Show(
+                        parent,
+                        "Are you sure you want to delete this item:\n" + Collection[SelectedIndex].DisplayValue,
+                        "Confirm Delete",
+                        MessageBox.MessageBoxButtons.YesNo);
+
                     if (result == MessageBox.MessageBoxResult.No)
                         return;
                 }
@@ -192,7 +236,7 @@ private void Switch(int a, int b)
             Collection[b].Key = b;
         }
 
-        private void btnUp_Click()
+        private void MoveUp()
         {
             if (SelectedIndex > 0)
             {
@@ -203,15 +247,15 @@ private void btnUp_Click()
             }
         }
 
-        private void btnDown_Click()
-        {
-            if (SelectedIndex > -1 && SelectedIndex < Collection.Count - 1)
-            {
-                int index = SelectedIndex;
-                Switch(SelectedIndex, SelectedIndex + 1);
-                SelectedIndex = index + 1;
-                OnMemberChanged?.Invoke();
-            }
-        }
+        // private void MoveDown()
+        // {
+        //     if (SelectedIndex > -1 && SelectedIndex < Collection.Count - 1)
+        //     {
+        //         int index = SelectedIndex;
+        //         Switch(SelectedIndex, SelectedIndex + 1);
+        //         SelectedIndex = index + 1;
+        //         OnMemberChanged?.Invoke();
+        //     }
+        // }
     }
-}
+}
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs
index a06e0ca3..26e3e40e 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs
@@ -491,11 +491,11 @@ public void LoadDevTree()
 
 
         // CreateConstantsNode(root);
-        // CreateDataNode(root);
+        CreateDataNode(root);
         //
         CreateSpriteNode(root);
 
-        // CreateModNode(root);
+        CreateModNode(root);
         Nodes.Add(root);
 
         AttachEventsRecursive(root);
@@ -666,34 +666,31 @@ private void CreateConstantsNode(NodeBase parent)
 
     private void CreateDataNode(NodeBase parent)
     {
-        // var dataNode = _nodeFactory.CreateOpenEditorNode("Data", "Icons.FloppyDiskFill", "");
-        // foreach (var type in Enum.GetValues<DataManager.DataType>())
-        // {
-        //     if (type == DataManager.DataType.All || type == DataManager.DataType.None)
-        //         continue;
-        //
-        //
-        //     var dataItemRootNode = _nodeFactory.CreateDataRootNode(
-        //         type,
-        //         "TODO",
-        //         type.ToString(),
-        //         type.GetIcon());
-        //     dataNode.SubNodes.Add(dataItemRootNode);
-        //     var entries = DataManager.Instance.DataIndices[type].GetLocalStringArray(true);
-        //
-        //     foreach (string key in entries.Keys)
-        //     {
-        //         var itemNode = _nodeFactory.CreateDataItemNode(
-        //             key,
-        //             "DevEditEditor",
-        //             $"{key}: {entries[key]}",
-        //             type.GetIcon());
-        //
-        //         dataItemRootNode.SubNodes.Add(itemNode);
-        //     }
-        // }
-        //
-        // parent.SubNodes.Add(dataNode);
+        var dataNode = _nodeFactory.CreateOpenEditorNode<ZoneEditorPageViewModel>("Data", "Icons.FloppyDiskFill");
+        foreach (var type in Enum.GetValues<DataManager.DataType>())
+        {
+            if (type == DataManager.DataType.All || type == DataManager.DataType.None)
+                continue;
+        
+        
+            var dataItemRootNode = _nodeFactory.CreateDataRootNode<ZoneEditorPageViewModel>(
+                type,
+                type.ToString(),
+                type.GetIcon());
+            dataNode.SubNodes.Add(dataItemRootNode);
+            var entries = DataManager.Instance.DataIndices[type].GetLocalStringArray(true);
+        
+            foreach (string key in entries.Keys)
+            {
+                var itemNode = _nodeFactory.CreateDataItemNode<ZoneEditorPageViewModel>(
+                    key,
+                    $"{key}: {entries[key]}",
+                    type.GetIcon());
+                dataItemRootNode.SubNodes.Add(itemNode);
+            }
+        }
+        
+        parent.SubNodes.Add(dataNode);
     }
 
     private void CreateSpriteNode(NodeBase parent)
@@ -825,22 +822,21 @@ private void HandleSprites()
 
     private void CreateModNode(NodeBase parent)
     {
-        // var modsViewModel = _pageFactory.GetRequiredService<DevTabModsViewModel>();
-        // var modRoot = _nodeFactory.CreateModRootNode("", "Mods", "Icons.ScrollFill");
-        //
-        // foreach (ModsNodeViewModel mod in modsViewModel.Mods)
-        // {
-        //     var name = mod.Namespace == "origin" ? "Origins" : mod.Name;
-        //     var itemNode = _nodeFactory.CreateDataItemNode(
-        //         mod.Namespace,
-        //         "",
-        //         $"{mod.Namespace}: {name}",
-        //         "Icons.ScrollFill");
-        //
-        //     modRoot.SubNodes.Add(itemNode);
-        // }
-        //
-        // parent.SubNodes.Add(modRoot);
+        var modsViewModel = _pageFactory.GetRequiredService<DevTabModsViewModel>();
+        var modRoot = _nodeFactory.CreateModRootNode<DevEditPageViewModel>("Mods", "Icons.ScrollFill");
+        
+        foreach (ModsNodeViewModel mod in modsViewModel.Mods)
+        {
+            var name = mod.Namespace == "origin" ? "Origins" : mod.Name;
+            var itemNode = _nodeFactory.CreateDataItemNode<DevEditPageViewModel>(
+                mod.Namespace,
+                $"{mod.Namespace}: {name}",
+                "Icons.ScrollFill");
+        
+            modRoot.SubNodes.Add(itemNode);
+        }
+        
+        parent.SubNodes.Add(modRoot);
     }
 
     private void InitializeTabEvents()
diff --git a/RogueEssence.Editor.Avalonia/Views/DialogBoxes/ModConfigWindow.axaml b/RogueEssence.Editor.Avalonia/Views/DialogBoxes/ModConfigWindow.axaml
index 578605d0..a51a1e37 100644
--- a/RogueEssence.Editor.Avalonia/Views/DialogBoxes/ModConfigWindow.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/DialogBoxes/ModConfigWindow.axaml
@@ -5,13 +5,15 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         mc:Ignorable="d"
+        SizeToContent="WidthAndHeight"
         x:Class="RogueEssence.Dev.Views.ModConfigWindow"
-        Title="Mod Config" Width="420" Height="480">
+        
+        Title="Mod Config" Width="500" Height="600">
   <Design.DataContext>
     <vm:ModConfigWindowViewModel/>
   </Design.DataContext>
 
-  <Grid Margin="4" RowDefinitions="188, *, 42">
+  <Grid Margin="4" RowDefinitions="188, *">
     <Grid RowDefinitions="36,36,36,80" ColumnDefinitions="72,*">
     <TextBlock Margin="4,2" Text="Name:" VerticalAlignment="Center" HorizontalAlignment="Right"/>
     <Grid Grid.Row="0" Grid.Column="1">
@@ -76,13 +78,13 @@
 
       </Grid>
     </Expander>
-  <Grid Grid.Row="2">
-    <Grid.ColumnDefinitions>
-      <ColumnDefinition/>
-      <ColumnDefinition/>
-    </Grid.ColumnDefinitions>
-    <Button Click="btnOK_Click" Margin="4" Grid.Column="0">OK</Button>
-    <Button Click="btnCancel_Click" Margin="4" Grid.Column="1">Cancel</Button>
-  </Grid>
+  <!-- <Grid Grid.Row="2"> -->
+  <!--   <Grid.ColumnDefinitions> -->
+  <!--     <ColumnDefinition/> -->
+  <!--     <ColumnDefinition/> -->
+  <!--   </Grid.ColumnDefinitions> -->
+  <!--   <Button Click="btnOK_Click" Margin="4" Grid.Column="0">OK</Button> -->
+  <!--   <Button Click="btnCancel_Click" Margin="4" Grid.Column="1">Cancel</Button> -->
+  <!-- </Grid> -->
   </Grid>
 </v:ChromelessWindow>
diff --git a/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml.cs b/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml.cs
index e0c5cd07..4d3d70d5 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml.cs
@@ -625,8 +625,12 @@ private void LeftTreeDataGrid_OnDoubleTapped(object? sender, TappedEventArgs e)
         if (DataContext is DevFormViewModel vm && sender is TreeDataGrid treeView)
         {
             var selectedItem = (OpenEditorNode)treeView.RowSelection.SelectedItem;
-            Console.WriteLine(selectedItem.ToString());
-            vm.AddPageFromTreeNode(selectedItem);
+            if (selectedItem != null)
+            {
+                Console.WriteLine(selectedItem.ToString());
+                vm.AddPageFromTreeNode(selectedItem);
+            }
+
         }
     }
     
diff --git a/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/ModConfigWindowView.axaml b/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/ModConfigWindowView.axaml
index 159e1840..82f952c5 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/ModConfigWindowView.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/ModConfigWindowView.axaml
@@ -8,11 +8,11 @@
                     mc:Ignorable="d"
                     x:Name="ThisControl"
                     x:Class="RogueEssence.Dev.Views.ModConfigWindowView"
-                    Title="Mod Config" Width="420" Height="480">
+                    Title="Mod Config" Width="420" Height="600">
     <Design.DataContext>
         <vm:ModConfigWindowViewModel />
     </Design.DataContext>
-    <Grid RowDefinitions="Auto,*">
+    <Grid RowDefinitions="Auto,*,Auto">
         <!-- TitleBar -->
         <Grid Grid.Row="0" Height="28" IsVisible="{Binding !#ThisControl.UseSystemWindowFrame}">
             <Border Background="{DynamicResource Brush.TitleBar}"
@@ -28,88 +28,95 @@
             <TextBlock Classes="bold"
                        Text="{Binding #ThisControl.Title}"
                        HorizontalAlignment="Center" VerticalAlignment="Center"
-                       IsHitTestVisible="False"/>
+                       IsHitTestVisible="False" />
 
             <v:CaptionButtons HorizontalAlignment="Right"
                               IsCloseButtonOnly="True"
                               IsVisible="{OnPlatform True, macOS=False}" />
 
         </Grid>
-        <Grid Grid.Row="1" Margin="4" RowDefinitions="188, *, 42">
-            <Grid RowDefinitions="36, 36, 36, 80" ColumnDefinitions="72, *">
-                <TextBlock Margin="4,2" Text="Name:" VerticalAlignment="Center" HorizontalAlignment="Right" />
-                <Grid Grid.Row="0" Grid.Column="1">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition />
-                        <ColumnDefinition Width="48" />
-                        <ColumnDefinition Width="90" />
-                    </Grid.ColumnDefinitions>
-                    <TextBox Text="{Binding Name}" VerticalAlignment="Center" Margin="4" />
-                    <TextBlock Margin="4,2" Text="Type:" VerticalAlignment="Center" HorizontalAlignment="Right"
-                               Grid.Column="1" />
-                    <views:SearchComboBox Margin="4,2" ItemsSource="{Binding ModTypes}"
-                                          SelectedIndex="{Binding ChosenModType}" Grid.Column="2" />
-                </Grid>
-
-                <TextBlock Margin="4,2" Text="Namespace:" VerticalAlignment="Center" HorizontalAlignment="Right"
-                           Grid.Row="1" />
-                <Grid Grid.Row="1" Grid.Column="1">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition />
-                        <ColumnDefinition Width="48" />
-                        <ColumnDefinition Width="72" />
-                    </Grid.ColumnDefinitions>
-                    <TextBox Text="{Binding Namespace}" VerticalAlignment="Center" Margin="4" />
-                    <TextBlock Margin="4,2" Text="Version:" VerticalAlignment="Center" HorizontalAlignment="Right"
-                               Grid.Column="1" />
-                    <TextBox Text="{Binding Version}" VerticalAlignment="Center" Margin="4" Grid.Column="2" />
-                </Grid>
-
-                <TextBlock Margin="4,2" Text="Author:" VerticalAlignment="Center" HorizontalAlignment="Right"
-                           Grid.Row="2" />
-                <TextBox Text="{Binding Author}" VerticalAlignment="Center" Margin="4" Grid.Row="2" Grid.Column="1" />
-                <TextBlock Margin="4,2" Text="Description:" VerticalAlignment="Top" HorizontalAlignment="Right"
-                           Grid.Row="3" />
-                <TextBox Text="{Binding Description}" VerticalAlignment="Stretch" VerticalContentAlignment="Top" AcceptsReturn="True" Margin="4" Grid.Row="3" Grid.Column="1" />
-            </Grid>
 
-            <Expander Grid.Row="1"
-                      HorizontalAlignment="Stretch"
-                      VerticalAlignment="Top"
-                      HorizontalContentAlignment="Stretch">
-                <Expander.Header>
-                    <Label Content="Advanced"></Label>
-                </Expander.Header>
-                <Grid RowDefinitions="36, 36, *" ColumnDefinitions="80, *">
-                    <TextBlock Margin="4,2" Text="UUID:" VerticalAlignment="Center" HorizontalAlignment="Right"
-                               Grid.Row="0" />
+        <ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled">
+            <Grid Margin="4" RowDefinitions="Auto, Auto">
+                <Grid RowDefinitions="36, 36, 36, 80" ColumnDefinitions="72, *">
+                    <TextBlock Margin="4,2" Text="Name:" VerticalAlignment="Center" HorizontalAlignment="Right" />
                     <Grid Grid.Row="0" Grid.Column="1">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition />
-                            <ColumnDefinition Width="64" />
+                            <ColumnDefinition Width="48" />
+                            <ColumnDefinition Width="90" />
                         </Grid.ColumnDefinitions>
-                        <TextBox Text="{Binding UUID}" IsReadOnly="True" VerticalAlignment="Center" Margin="4" />
-                        <Button Command="{Binding btnRegenUUID_Click}" Margin="4" Grid.Column="1">Regen</Button>
+                        <TextBox Text="{Binding Name}" VerticalAlignment="Center" Margin="4" />
+                        <TextBlock Margin="4,2" Text="Type:" VerticalAlignment="Center" HorizontalAlignment="Right"
+                                   Grid.Column="1" />
+                        <views:SearchComboBox Margin="4,2" ItemsSource="{Binding ModTypes}"
+                                              SelectedIndex="{Binding ChosenModType}" Grid.Column="2" />
                     </Grid>
 
-                    <TextBlock Margin="4,2" Text="Game Version:" VerticalAlignment="Center" HorizontalAlignment="Right"
+                    <TextBlock Margin="4,2" Text="Namespace:" VerticalAlignment="Center" HorizontalAlignment="Right"
                                Grid.Row="1" />
-                    <TextBox Text="{Binding GameVersion}" VerticalAlignment="Center" Margin="4" Grid.Row="1"
-                             Grid.Column="1" />
-
-                    <TextBlock Margin="4" VerticalAlignment="Top" HorizontalAlignment="Right" Grid.Row="2">Relations:</TextBlock>
-                    <views:CollectionBox DataContext="{Binding Relationships}" Margin="4" Grid.Row="2" Grid.Column="1" />
+                    <Grid Grid.Row="1" Grid.Column="1">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition />
+                            <ColumnDefinition Width="48" />
+                            <ColumnDefinition Width="72" />
+                        </Grid.ColumnDefinitions>
+                        <TextBox Text="{Binding Namespace}" VerticalAlignment="Center" Margin="4" />
+                        <TextBlock Margin="4,2" Text="Version:" VerticalAlignment="Center" HorizontalAlignment="Right"
+                                   Grid.Column="1" />
+                        <TextBox Text="{Binding Version}" VerticalAlignment="Center" Margin="4" Grid.Column="2" />
+                    </Grid>
 
+                    <TextBlock Margin="4,2" Text="Author:" VerticalAlignment="Center" HorizontalAlignment="Right"
+                               Grid.Row="2" />
+                    <TextBox Text="{Binding Author}" VerticalAlignment="Center" Margin="4" Grid.Row="2" Grid.Column="1" />
+                    <TextBlock Margin="4,2" Text="Description:" VerticalAlignment="Top" HorizontalAlignment="Right"
+                               Grid.Row="3" />
+                    <TextBox Text="{Binding Description}" VerticalAlignment="Stretch" VerticalContentAlignment="Top"
+                             AcceptsReturn="True" Margin="4" Grid.Row="3" Grid.Column="1" />
                 </Grid>
-            </Expander>
-            <Grid Grid.Row="2">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition />
-                    <ColumnDefinition />
-                </Grid.ColumnDefinitions>
-                <Button Classes="flat" Click="btnOK_Click" Margin="4" Grid.Column="0">OK</Button>
-                <Button Classes="flat" Click="btnCancel_Click" Margin="4" Grid.Column="1">Cancel</Button>
+
+                <Expander Grid.Row="1"
+                          HorizontalAlignment="Stretch"
+                          VerticalAlignment="Top"
+                          HorizontalContentAlignment="Stretch">
+                    <Expander.Header>
+                        <Label Content="Advanced"></Label>
+                    </Expander.Header>
+                    <Grid RowDefinitions="36, 36, Auto" ColumnDefinitions="80, *">
+                        <TextBlock Margin="4,2" Text="UUID:" VerticalAlignment="Center" HorizontalAlignment="Right"
+                                   Grid.Row="0" />
+                        <Grid Grid.Row="0" Grid.Column="1">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition />
+                                <ColumnDefinition Width="64" />
+                            </Grid.ColumnDefinitions>
+                            <TextBox Text="{Binding UUID}" IsReadOnly="True" VerticalAlignment="Center" Margin="4" />
+                            <Button Command="{Binding btnRegenUUID_Click}" Margin="4" Grid.Column="1">Regen</Button>
+                        </Grid>
+
+                        <TextBlock Margin="4,2" Text="Game Version:" VerticalAlignment="Center"
+                                   HorizontalAlignment="Right"
+                                   Grid.Row="1" />
+                        <TextBox Text="{Binding GameVersion}" VerticalAlignment="Center" Margin="4" Grid.Row="1"
+                                 Grid.Column="1" />
+
+                        <TextBlock Margin="4,6,4,2" VerticalAlignment="Top" HorizontalAlignment="Right" Grid.Row="2">Relations:</TextBlock>
+                        <views:CollectionBox DataContext="{Binding Relationships}" Margin="4" Grid.Row="2"
+                                             Grid.Column="1" MinHeight="150" />
+
+                    </Grid>
+                </Expander>
             </Grid>
+        </ScrollViewer>
+
+        <Grid Grid.Row="2" Margin="4">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition />
+                <ColumnDefinition />
+            </Grid.ColumnDefinitions>
+            <Button Classes="flat" Click="btnOK_Click" Margin="4" Grid.Column="0">OK</Button>
+            <Button Classes="flat" Click="btnCancel_Click" Margin="4" Grid.Column="1">Cancel</Button>
         </Grid>
     </Grid>
 </v:ChromelessWindow>
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/ModConfigWindowView.axaml.cs b/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/ModConfigWindowView.axaml.cs
index 49e4b842..8b519be6 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/ModConfigWindowView.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/ModConfigWindowView.axaml.cs
@@ -16,7 +16,7 @@ public ModConfigWindowView()
 
         public async void btnOK_Click(object sender, RoutedEventArgs e)
         {
-            ModConfigViewModel2 vm = (ModConfigViewModel2)DataContext;
+            ModConfigWindowViewModel vm = (ModConfigWindowViewModel)DataContext;
             try
             {
                 if (String.IsNullOrWhiteSpace(Text.Sanitize(vm.Name)))
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/SpeciesEditPageView.axaml b/RogueEssence.Editor.Avalonia/Views/New/Editors/SpeciesEditPageView.axaml
index 0f4ff315..b24d6951 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/Editors/SpeciesEditPageView.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/New/Editors/SpeciesEditPageView.axaml
@@ -10,58 +10,160 @@
     <!-- <UserControl.DataContext> -->
     <!--     <vm:SpeciesEditPageViewModel/> -->
     <!-- </UserControl.DataContext> -->
-  <UserControl.Resources>
-    <converters:OXConverter x:Key="OXConverter"/>
-  </UserControl.Resources>
-  <DockPanel>
-    <Menu DockPanel.Dock="Top">
-      <MenuItem Header="_Edit">
-        <MenuItem Header="Mass Import" Command="{Binding mnuMassImport_Click}"/>
-        <MenuItem Header="Re-Index" Command="{Binding mnuReIndex_Click}"/>
-        <Separator/>
-        <MenuItem Header="Mass Export" Command="{Binding mnuMassExport_Click}"/>
-        <MenuItem Header="Mass Export Multi Sheet" Command="{Binding mnuMassExportMulti_Click}"/>
-      </MenuItem>
-    </Menu>
-    <Grid>
-      <Grid.RowDefinitions>
-        <RowDefinition Height="*"/>
-        <RowDefinition Height="34"/>
-      </Grid.RowDefinitions>
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition/>
-        <ColumnDefinition/>
-        <ColumnDefinition/>
-        <ColumnDefinition/>
-      </Grid.ColumnDefinitions>
-      <TreeView ItemsSource="{Binding Monsters}" SelectedItem="{Binding ChosenMonster}" SelectionMode="AlwaysSelected" Margin="4" Grid.ColumnSpan="4">
-        <TreeView.DataTemplates>
-          <TreeDataTemplate DataType="vm:MonsterNodeViewModel" ItemsSource="{Binding Nodes}">
-            <Grid>
-              <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="24"/>
-                <ColumnDefinition/>
-              </Grid.ColumnDefinitions>
-              <Image Source="{Binding Filled, Converter={StaticResource OXConverter}}" Stretch="None" Grid.Column="0"/>
-              <TextBlock Text="{Binding Name}" VerticalAlignment="Center" Grid.Column="1"/>
-            </Grid>
-          </TreeDataTemplate>
-        </TreeView.DataTemplates>
-        <TreeView.ContextMenu>
-          <ContextMenu ItemsSource="{Binding OpList}">
-            <ContextMenu.Styles>
-              <Style Selector="MenuItem">
-                <Setter Property="Header" Value="{Binding Name}"/>
-                <Setter Property="Command" Value="{Binding Command}"/>
-              </Style>
-            </ContextMenu.Styles>
-          </ContextMenu>
-        </TreeView.ContextMenu>
-      </TreeView>
-      <Button Command="{Binding btnImport_Click}" Margin="4" Grid.Row="1" Grid.Column="0" IsEnabled="{Binding ChosenMonster, Converter={x:Static ObjectConverters.IsNotNull}}">Import</Button>
-      <Button Command="{Binding btnReImport_Click}" Margin="4" Grid.Row="1" Grid.Column="1" IsEnabled="{Binding CachedPath, Converter={x:Static StringConverters.IsNotNullOrEmpty}}">Re-Import</Button>
-      <Button Command="{Binding btnExport_Click}" Margin="4" Grid.Row="1" Grid.Column="2" IsEnabled="{Binding ChosenMonster, Converter={x:Static ObjectConverters.IsNotNull}}">Export</Button>
-      <Button Command="{Binding btnDelete_Click}" Margin="4" Grid.Row="1" Grid.Column="3" IsEnabled="{Binding ChosenMonster, Converter={x:Static ObjectConverters.IsNotNull}}">Delete</Button>
-    </Grid>
-  </DockPanel>
-</UserControl>
+    <UserControl.Resources>
+        <converters:OXConverter x:Key="OXConverter" />
+    </UserControl.Resources>
+    <DockPanel>
+        <Menu DockPanel.Dock="Top">
+            <MenuItem Header="_Edit">
+                <MenuItem.Styles>
+                    <Style Selector="MenuItem">
+                        <Setter Property="Template">
+                            <ControlTemplate>
+                                <Panel>
+                                    <Border Name="PART_LayoutRoot"
+                                            Padding="{TemplateBinding Padding}"
+                                            Background="{TemplateBinding Background}"
+                                            BorderBrush="{TemplateBinding BorderBrush}"
+                                            BorderThickness="{TemplateBinding BorderThickness}"
+                                            CornerRadius="{TemplateBinding CornerRadius}">
+                                        <Grid>
+                                            <Grid.ColumnDefinitions>
+                                                <ColumnDefinition Width="Auto"
+                                                                  SharedSizeGroup="ToggleIcon" />
+                                                <ColumnDefinition Width="Auto"
+                                                                  SharedSizeGroup="MenuItemIcon" />
+                                                <ColumnDefinition Width="*" />
+                                                <ColumnDefinition Width="Auto"
+                                                                  SharedSizeGroup="MenuItemIGT" />
+                                            </Grid.ColumnDefinitions>
+
+                                            <ContentControl Grid.Column="0"
+                                                            x:Name="PART_ToggleIconPresenter"
+                                                            IsVisible="False"
+                                                            Theme="{StaticResource FluentMenuItemIconTheme}"
+                                                            Margin="{DynamicResource MenuIconPresenterMargin}" />
+
+                                            <ContentControl Grid.Column="1"
+                                                            x:Name="PART_IconPresenter"
+                                                            IsVisible="False"
+                                                            Theme="{StaticResource FluentMenuItemIconTheme}"
+                                                            Content="{TemplateBinding Icon}"
+                                                            Margin="{DynamicResource MenuIconPresenterMargin}" />
+
+                                            <ContentPresenter Name="PART_HeaderPresenter"
+                                                              Content="{TemplateBinding Header}"
+                                                              ContentTemplate="{TemplateBinding HeaderTemplate}"
+                                                              VerticalAlignment="Center"
+                                                              HorizontalAlignment="Stretch"
+                                                              Grid.Column="2" />
+                                            <TextBlock x:Name="PART_InputGestureText"
+                                                       Grid.Column="3"
+                                                       Margin="{DynamicResource MenuInputGestureTextMargin}"
+                                                       Text="{TemplateBinding InputGesture, Converter={StaticResource KeyGestureConverter}}"
+                                                       HorizontalAlignment="Right"
+                                                       VerticalAlignment="Center"
+                                                       Foreground="{DynamicResource MenuFlyoutItemKeyboardAcceleratorTextForeground}" />
+                                        </Grid>
+                                    </Border>
+                                    <Popup Name="PART_Popup"
+                                           WindowManagerAddShadowHint="False"
+                                           Placement="RightEdgeAlignedTop"
+                                           MaxHeight="400"
+                                           IsLightDismissEnabled="False"
+                                           HorizontalOffset="-4"
+                                           VerticalOffset="-4"
+                                           IsOpen="{TemplateBinding IsSubMenuOpen, Mode=TwoWay}">
+                                        <Grid>
+                                            <Border Background="{DynamicResource Brush.Popup}" Margin="4"
+                                                    CornerRadius="{DynamicResource OverlayCornerRadius}">
+                                                <Border.Effect>
+                                                    <DropShadowEffect OffsetX="0" OffsetY="0" Color="Black"
+                                                                      BlurRadius="4" Opacity=".6" />
+                                                </Border.Effect>
+                                            </Border>
+
+                                            <Border BorderThickness="0" Margin="8,4" MaxHeight="400">
+                                                <ScrollViewer Theme="{StaticResource FluentMenuScrollViewer}">
+                                                    <ItemsPresenter Name="PART_ItemsPresenter"
+                                                                    Margin="{DynamicResource MenuFlyoutScrollerMargin}"
+                                                                    Grid.IsSharedSizeScope="True">
+                                                        <ItemsPresenter.ItemsPanel>
+                                                            <ItemsPanelTemplate>
+                                                                <VirtualizingStackPanel Orientation="Vertical" />
+                                                            </ItemsPanelTemplate>
+                                                        </ItemsPresenter.ItemsPanel>
+                                                    </ItemsPresenter>
+                                                </ScrollViewer>
+                                            </Border>
+                                        </Grid>
+                                    </Popup>
+                                </Panel>
+                            </ControlTemplate>
+                        </Setter>
+                    </Style>
+
+                </MenuItem.Styles>
+                <MenuItem Header="Mass Import" Command="{Binding mnuMassImport_Click}" />
+                <MenuItem Header="Re-Index" Command="{Binding mnuReIndex_Click}" />
+                <Separator />
+                <MenuItem Header="Mass Export" Command="{Binding mnuMassExport_Click}" />
+                <MenuItem Header="Mass Export Multi Sheet" Command="{Binding mnuMassExportMulti_Click}" />
+            </MenuItem>
+        </Menu>
+        <Grid>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="*" />
+                <RowDefinition Height="34" />
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition />
+                <ColumnDefinition />
+                <ColumnDefinition />
+                <ColumnDefinition />
+            </Grid.ColumnDefinitions>
+            <TreeView ItemsSource="{Binding Monsters}" SelectedItem="{Binding ChosenMonster}"
+                      SelectionMode="AlwaysSelected" Margin="4" Grid.ColumnSpan="4">
+                <TreeView.DataTemplates>
+                    <TreeDataTemplate DataType="vm:MonsterNodeViewModel" ItemsSource="{Binding Nodes}">
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="24" />
+                                <ColumnDefinition />
+                            </Grid.ColumnDefinitions>
+                            <Image Source="{Binding Filled, Converter={StaticResource OXConverter}}" Stretch="None"
+                                   Grid.Column="0" />
+                            <TextBlock Text="{Binding Name}" VerticalAlignment="Center" Grid.Column="1" />
+                        </Grid>
+                    </TreeDataTemplate>
+                </TreeView.DataTemplates>
+                <TreeView.ContextMenu>
+                    <ContextMenu ItemsSource="{Binding OpList}">
+                        <ContextMenu.Styles>
+                            <Style Selector="MenuItem">
+                                <Setter Property="Header" Value="{Binding Name}" />
+                                <Setter Property="Command" Value="{Binding Command}" />
+                            </Style>
+                        </ContextMenu.Styles>
+                    </ContextMenu>
+                </TreeView.ContextMenu>
+            </TreeView>
+            <Button Command="{Binding btnImport_Click}" Margin="4" Grid.Row="1" Grid.Column="0"
+                    IsEnabled="{Binding ChosenMonster, Converter={x:Static ObjectConverters.IsNotNull}}">
+                Import
+            </Button>
+            <Button Command="{Binding btnReImport_Click}" Margin="4" Grid.Row="1" Grid.Column="1"
+                    IsEnabled="{Binding CachedPath, Converter={x:Static StringConverters.IsNotNullOrEmpty}}">
+                Re-Import
+            </Button>
+            <Button Command="{Binding btnExport_Click}" Margin="4" Grid.Row="1" Grid.Column="2"
+                    IsEnabled="{Binding ChosenMonster, Converter={x:Static ObjectConverters.IsNotNull}}">
+                Export
+            </Button>
+            <Button Command="{Binding btnDelete_Click}" Margin="4" Grid.Row="1" Grid.Column="3"
+                    IsEnabled="{Binding ChosenMonster, Converter={x:Static ObjectConverters.IsNotNull}}">
+                Delete
+            </Button>
+        </Grid>
+    </DockPanel>
+</UserControl>
\ No newline at end of file
diff --git a/RogueEssence/Ground/GroundChar.cs b/RogueEssence/Ground/GroundChar.cs
index 4bb98fb5..99001f17 100644
--- a/RogueEssence/Ground/GroundChar.cs
+++ b/RogueEssence/Ground/GroundChar.cs
@@ -139,6 +139,7 @@ public override void DoCleanup()
         {
         }
 
+        
         public GroundChar(CharData baseChar, Loc newLoc, Dir8 charDir, string instancename)
         {
             Data = baseChar;

From d1c0cc1f1173fef98efd2759a47a98bf87ba8e09 Mon Sep 17 00:00:00 2001
From: Kace <41309226+DoubleTrio@users.noreply.github.com>
Date: Tue, 28 Apr 2026 22:25:03 -0400
Subject: [PATCH 20/51] functional char sprites and portraits page, update to
 new dialogue window

---
 RogueEssence.Editor.Avalonia/App.axaml.cs     |   2 +
 .../Assets/NodeTemplates.axaml                |  55 +--
 RogueEssence.Editor.Avalonia/PageFactory.cs   |   2 +
 .../RogueEssence.Editor.Avalonia.csproj       |   1 +
 RogueEssence.Editor.Avalonia/TabEvents.cs     |   9 +
 .../Utility/ContextMenuHelper.cs              |  40 ++
 .../Utility/NodeHelper.cs                     |  97 +++-
 .../ViewModels/New/DevFormViewModel.cs        | 104 ++--
 .../New/Editors/DataListPageViewModel.cs      | 366 +++++++++++++-
 .../New/Editors/DevControlViewModel.cs        |  16 +-
 .../New/Editors/DevEditPageViewModel.cs       |  14 +-
 .../New/Editors/EditorPageViewModel.cs        |  99 +++-
 .../New/Editors/GroundEditorPageViewModel.cs  |   2 +-
 .../New/Editors/ModInfoEditorViewModel.cs     |  13 +-
 .../New/Editors/RandomInfoPageViewModel.cs    |   3 +-
 .../New/Editors/ReflectedDataPageViewModel.cs |  22 +
 .../New/Editors/SpeciesEditPageViewModel.cs   | 421 ++++++++++------
 .../New/Editors/SpritePageViewModel.cs        |   3 +-
 .../New/Editors/ZoneEditorPageViewModel.cs    |   3 +-
 .../ViewModels/New/Nodes/NodeBase.cs          | 462 +++++++++++++++---
 .../ViewModels/New/TabSwitcherViewModel.cs    |   1 -
 .../Views/New/DevForm.axaml                   |  39 +-
 .../Views/New/DevForm.axaml.cs                |  93 ++--
 .../Views/New/Editors/DataListPageView.axaml  | 126 ++++-
 .../New/Editors/DataListPageView.axaml.cs     |  39 ++
 .../Editors/DevControl/DevControlView.axaml   |   4 +-
 .../New/Editors/ReflectedDataPageView.axaml   |  10 +
 .../Editors/ReflectedDataPageView.axaml.cs    |  13 +
 .../New/Editors/SpeciesEditPageView.axaml     | 436 +++++++++++------
 .../New/Editors/SpeciesEditPageView.axaml.cs  |  15 +
 .../New/Editors/ZoneEditorPageView.axaml      |   8 +-
 .../Views/New/ModSwitcherView.axaml.cs        |   4 +-
 .../Views/New/TabSwitcherView.axaml.cs        |   1 -
 RogueEssence/Data/DataManager.cs              |  81 ++-
 34 files changed, 1985 insertions(+), 619 deletions(-)
 create mode 100644 RogueEssence.Editor.Avalonia/Utility/ContextMenuHelper.cs
 create mode 100644 RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ReflectedDataPageViewModel.cs
 create mode 100644 RogueEssence.Editor.Avalonia/Views/New/Editors/ReflectedDataPageView.axaml
 create mode 100644 RogueEssence.Editor.Avalonia/Views/New/Editors/ReflectedDataPageView.axaml.cs

diff --git a/RogueEssence.Editor.Avalonia/App.axaml.cs b/RogueEssence.Editor.Avalonia/App.axaml.cs
index 89a642db..116e4f12 100644
--- a/RogueEssence.Editor.Avalonia/App.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/App.axaml.cs
@@ -69,6 +69,7 @@ public static void AddCommonServices(this IServiceCollection collection)
             collection.AddTransient<DevEditPageViewModel>();
             collection.AddTransient<SpeciesEditPageViewModel>();
             collection.AddTransient<DataListPageViewModel>();
+            collection.AddTransient<ReflectedDataPageViewModel>();
         }
         
         private static void AddDevTabViewModels(this IServiceCollection services)
@@ -89,6 +90,7 @@ public static void RegisterPages(this IServiceProvider provider)
 
             pageFactory.Register<DevControlViewModel>();
             pageFactory.Register<ZoneEditorPageViewModel>();
+            pageFactory.Register<ReflectedDataPageViewModel>();
             pageFactory.Register<GroundEditorPageViewModel>();
             pageFactory.Register<RandomInfoPageViewModel>();
             pageFactory.Register<SpritePageViewModel>();
diff --git a/RogueEssence.Editor.Avalonia/Assets/NodeTemplates.axaml b/RogueEssence.Editor.Avalonia/Assets/NodeTemplates.axaml
index f0b38cda..30c80c1d 100644
--- a/RogueEssence.Editor.Avalonia/Assets/NodeTemplates.axaml
+++ b/RogueEssence.Editor.Avalonia/Assets/NodeTemplates.axaml
@@ -4,7 +4,8 @@
                     xmlns:v="clr-namespace:RogueEssence.Dev.Views"
                     xmlns:vm="clr-namespace:RogueEssence.Dev.ViewModels">
     <local:IconKeyToGeometryConverter x:Key="IconKeyConverter" />
-    <DataTemplate x:Key="NodeContentTemplate" DataType="vm:NodeBase">
+    <local:OXConverter x:Key="OxConverter" />
+ <DataTemplate x:Key="NodeContentTemplate" DataType="vm:NodeBase">
         <v:IconText Text="{Binding Title}" Icon="{Binding Icon}" IconSize="12" />
     </DataTemplate>
 
@@ -12,39 +13,21 @@
         <Grid ColumnDefinitions="Auto, *, 16" Height="16">
             <ContentPresenter Content="{Binding}"
                               ContentTemplate="{StaticResource NodeContentTemplate}" />
-
-            <!-- Bug or feature... the plus always shows up when the child elements are hovered... is it possible to check if Border#PART_LayoutRoot is hovered -->
             <Button x:Name="DataRootAddButton" Grid.Column="2" Classes="icon_button"
                     IsVisible="{Binding IsPointerOver, RelativeSource={RelativeSource AncestorType=TreeViewItem}}"
                     Command="{Binding AddCommand}">
-                <Path
-                    Stretch="Fill"
-
-                    Fill="{DynamicResource Brush.FG1}"
-                    Width="10" Height="10" Margin="0,0,0,0"
-                    Data="{StaticResource Icons.Plus}" />
+                <Path Stretch="Fill"
+                      Fill="{DynamicResource Brush.FG1}"
+                      Width="10" Height="10"
+                      Data="{StaticResource Icons.Plus}" />
             </Button>
         </Grid>
     </DataTemplate>
-    
+
     <TreeDataTemplate x:Key="ItemRootTemplate" DataType="vm:ItemRootNode" ItemsSource="{Binding SubNodes}">
         <ContentPresenter Content="{Binding}"
                           ContentTemplate="{StaticResource ItemRootDataTemplate}" />
     </TreeDataTemplate>
-    
-    
-    <!-- DataRootNode -->
-    <!-- <TreeDataTemplate x:Key="DataRootTemplate" DataType="vm:DataRootNode" ItemsSource="{Binding SubNodes}"> -->
-    <!--     <ContentPresenter Content="{Binding}" -->
-    <!--                       ContentTemplate="{StaticResource ItemRootDataTemplate}" /> -->
-    <!-- </TreeDataTemplate> -->
-
-
-    <!-- SpriteRootNode -->
-    <!-- <TreeDataTemplate x:Key="SpriteRootTemplate" DataType="vm:SpriteRootNode" ItemsSource="{Binding SubNodes}"> -->
-    <!--     <ContentPresenter Content="{Binding}" -->
-    <!--                       ContentTemplate="{StaticResource ItemRootDataTemplate}" /> -->
-    <!-- </TreeDataTemplate> -->
 
     <TreeDataTemplate x:Key="DataItemTemplate" DataType="vm:DataItemNode" ItemsSource="{Binding SubNodes}">
         <Grid ColumnDefinitions="*,Auto"
@@ -53,7 +36,6 @@
               Height="16">
             <ContentPresenter Content="{Binding}"
                               ContentTemplate="{StaticResource NodeContentTemplate}" />
-            
             <Button Grid.Column="1"
                     Classes="icon_button"
                     Width="16" Height="16"
@@ -72,21 +54,28 @@
         </Grid>
     </TreeDataTemplate>
 
-
-    <TreeDataTemplate x:Key="OpenEditorTemplate" DataType="vm:OpenEditorNode" ItemsSource="{Binding SubNodes}">
+    <TreeDataTemplate x:Key="DefaultNodeTemplate" DataType="vm:NodeBase" ItemsSource="{Binding SubNodes}">
         <Grid ColumnDefinitions="*, Auto">
             <ContentPresenter Content="{Binding}"
                               ContentTemplate="{StaticResource NodeContentTemplate}" />
         </Grid>
     </TreeDataTemplate>
+    
+    
+    <!-- DataRootNode -->
+    <!-- <TreeDataTemplate x:Key="DataRootTemplate" DataType="vm:DataRootNode" ItemsSource="{Binding SubNodes}"> -->
+    <!--     <ContentPresenter Content="{Binding}" -->
+    <!--                       ContentTemplate="{StaticResource ItemRootDataTemplate}" /> -->
+    <!-- </TreeDataTemplate> -->
+
+
+    <!-- SpriteRootNode -->
+    <!-- <TreeDataTemplate x:Key="SpriteRootTemplate" DataType="vm:SpriteRootNode" ItemsSource="{Binding SubNodes}"> -->
+    <!--     <ContentPresenter Content="{Binding}" -->
+    <!--                       ContentTemplate="{StaticResource ItemRootDataTemplate}" /> -->
+    <!-- </TreeDataTemplate> -->
 
 
-    <TreeDataTemplate x:Key="NodeBaseTemplate" DataType="vm:NodeBase" ItemsSource="{Binding SubNodes}">
-        <Grid ColumnDefinitions="*,Auto">
-            <ContentPresenter Content="{Binding}"
-                              ContentTemplate="{StaticResource NodeContentTemplate}" />
-        </Grid>
-    </TreeDataTemplate>
     
     <!-- TAB SWITCHER ONLY -->
     <TreeDataTemplate x:Key="PageNodeTemplate" DataType="vm:PageNode" ItemsSource="{Binding SubNodes}">
diff --git a/RogueEssence.Editor.Avalonia/PageFactory.cs b/RogueEssence.Editor.Avalonia/PageFactory.cs
index 02ac581a..512e79fb 100644
--- a/RogueEssence.Editor.Avalonia/PageFactory.cs
+++ b/RogueEssence.Editor.Avalonia/PageFactory.cs
@@ -67,6 +67,7 @@ public void Register<TPage>() where TPage : EditorPageViewModel
         public EditorPageViewModel? CreatePage(Type pageType, NodeBase? node = null)
         {
             
+            // Make sure it's a page
             if (!typeof(EditorPageViewModel).IsAssignableFrom(pageType))
             {
                 throw new ArgumentException(
@@ -74,6 +75,7 @@ public void Register<TPage>() where TPage : EditorPageViewModel
                     nameof(pageType));
             }
             
+            
             if (!_registeredTypes.Contains(pageType))
             {
                 return null;
diff --git a/RogueEssence.Editor.Avalonia/RogueEssence.Editor.Avalonia.csproj b/RogueEssence.Editor.Avalonia/RogueEssence.Editor.Avalonia.csproj
index caa45c6f..9924e1af 100644
--- a/RogueEssence.Editor.Avalonia/RogueEssence.Editor.Avalonia.csproj
+++ b/RogueEssence.Editor.Avalonia/RogueEssence.Editor.Avalonia.csproj
@@ -210,5 +210,6 @@
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Models\" />
+    <Folder Include="ViewModels\New\UserControls\" />
   </ItemGroup>
 </Project>
diff --git a/RogueEssence.Editor.Avalonia/TabEvents.cs b/RogueEssence.Editor.Avalonia/TabEvents.cs
index e5c0d3a4..07eebacf 100644
--- a/RogueEssence.Editor.Avalonia/TabEvents.cs
+++ b/RogueEssence.Editor.Avalonia/TabEvents.cs
@@ -1,4 +1,5 @@
 using System;
+using RogueEssence.Data;
 using RogueEssence.Dev.ViewModels;
 
 namespace RogueEssence.Dev
@@ -11,6 +12,14 @@ public class TabEvents
         public event Action<EditorPageViewModel>? AddTopLevelTabEvent;
         public event Action<EditorPageViewModel>? RemoveTabEvent;
         public event Action<EditorPageViewModel>? NavigateToTabEvent;
+        
+        // Used for closing tabs when a data entry is deleted
+        public event Action<string, DataManager.DataType>? CloseTabsForEntry;
+
+        public void RequestCloseTabsForEntry(string key, DataManager.DataType dataType)
+        {
+            CloseTabsForEntry?.Invoke(key, dataType);
+        }
 
         // Navigate tab to ID
 
diff --git a/RogueEssence.Editor.Avalonia/Utility/ContextMenuHelper.cs b/RogueEssence.Editor.Avalonia/Utility/ContextMenuHelper.cs
new file mode 100644
index 00000000..7b76d61b
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/Utility/ContextMenuHelper.cs
@@ -0,0 +1,40 @@
+using System;
+using System.Threading.Tasks;
+using Avalonia.Controls;
+using RogueEssence.Dev.ViewModels;
+
+namespace RogueEssence.Dev.Utility;
+
+public class ContextMenuHelper
+{
+    public static MenuItem CreateMenuItem(string header, string icon, Func<Task> onClick)
+    {
+        var item = new MenuItem
+        {
+            Header = header,
+            Icon = App.CreateMenuIcon(icon)
+        };
+        item.Click += async (_, e) =>
+        {
+            await onClick();
+            e.Handled = true;
+        };
+        return item;
+    }
+    
+    public static ContextMenu CreateContextMenu(params MenuItem[] items)
+    {
+        var menu = new ContextMenu();
+        foreach (var item in items)
+            menu.Items.Add(item);
+        return menu;
+    }
+    
+    public static ContextMenu CreateDataItemMenu(DataRootNode node, string key)
+    {
+        return CreateContextMenu(
+            CreateMenuItem("Resave as File", "Icons.FileFill", () => node.ResaveItemAsFile(key)),
+            CreateMenuItem("Resave as Patch", "Icons.FileTextFill", () => node.ResaveItemAsPatch(key))
+        );
+    }
+}
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Utility/NodeHelper.cs b/RogueEssence.Editor.Avalonia/Utility/NodeHelper.cs
index b02c3589..e0762c87 100644
--- a/RogueEssence.Editor.Avalonia/Utility/NodeHelper.cs
+++ b/RogueEssence.Editor.Avalonia/Utility/NodeHelper.cs
@@ -11,26 +11,80 @@ public interface ITitleFilterStrategy
     bool Matches(string title, string filter);
 }
 
+// Matches the beginning of each token word in the title
 public class BeginningTitleFilterStrategy : ITitleFilterStrategy
 {
+
     public bool Matches(string title, string filter)
     {
         if (string.IsNullOrWhiteSpace(filter))
             return true;
 
-        var tokens = Regex.Split(title, @"[\s_:]+");
-        return tokens.Any(t => t.StartsWith(filter, StringComparison.OrdinalIgnoreCase));
+        var titleTokens = Regex.Split(title, @"[\s_:]+");
+        var filterTokens = Regex.Split(filter.Trim(), @"[\s_:]+");
+        
+        for (int i = 0; i <= titleTokens.Length - filterTokens.Length; i++)
+        {
+            bool match = true;
+            for (int j = 0; j < filterTokens.Length; j++)
+            {
+                bool isLast = j == filterTokens.Length - 1;
+                bool tokenMatch = isLast
+                    ? titleTokens[i + j].StartsWith(filterTokens[j], StringComparison.OrdinalIgnoreCase)
+                    : titleTokens[i + j].Equals(filterTokens[j], StringComparison.OrdinalIgnoreCase);
+
+                if (!tokenMatch)
+                {
+                    match = false; break;
+                }
+            }
+            if (match) return true;
+        }
+
+        return false;
+    }
+}
+
+// Matches any titles that satisfies any one of the strategies
+public class CombinedTitleFilterStrategy : ITitleFilterStrategy
+{
+    private readonly ITitleFilterStrategy[] _strategies;
+
+    public CombinedTitleFilterStrategy(params ITitleFilterStrategy[] strategies)
+    {
+        _strategies = strategies;
+    }
+
+    public bool Matches(string title, string filter)
+    {
+        return _strategies.Any(s => s.Matches(title, filter));
+    }
+}
+
+// Matches the index number of the monster, e.g "#299" with "299"
+public class IndexTitleFilterStrategy : ITitleFilterStrategy
+{
+    public bool Matches(string title, string filter)
+    {
+        if (string.IsNullOrWhiteSpace(filter))
+            return true;
+
+        var match = Regex.Match(title, @"#(\d+)");
+        if (!match.Success)
+            return false;
+
+        return match.Groups[1].Value.StartsWith(filter.TrimStart('#'), StringComparison.OrdinalIgnoreCase);
     }
 }
 
 public static class NodeHelper
 {
+    
+    // Expands the top level nodes if the child matches the filter. Also the node expands itself if it matches the filter.
     public static bool FilterRecursive(NodeBase node, string filter, ITitleFilterStrategy filterStrategy)
     {
         bool match = string.IsNullOrWhiteSpace(filter);
-
-       
-
+        
         match |= filterStrategy.Matches(node.Title, filter);
 
         bool childMatch = false;
@@ -55,4 +109,37 @@ public static bool FilterRecursive(NodeBase node, string filter, ITitleFilterStr
 
         return node.IsVisible;
     }
+    
+    public static void ExpandIfMatches(NodeBase node, string filter, ITitleFilterStrategy filterStrategy)
+    {
+
+        if (filterStrategy.Matches(node.Title, filter))
+        {
+            ExpandAll(node, true);
+        }
+        else
+        { 
+            node.IsVisible = false;
+        }
+    }
+
+    public static void ExpandAll(NodeBase node, bool expanded)
+    {
+        node.IsVisible = true;
+        node.IsExpanded = expanded;
+        foreach (var child in node.SubNodes)
+            ExpandAll(child, expanded);
+    }
+    
+    public static void ExpandParents(NodeBase node, bool expanded)
+    {
+        node.IsExpanded = expanded;
+    
+        var parent = node.Parent;
+        while (parent != null)
+        {
+            parent.IsExpanded = expanded;
+            parent = parent.Parent;
+        }
+    }
 }
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs
index 26e3e40e..4425f152 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs
@@ -251,6 +251,8 @@ public void AddTopLevelPage(EditorPageViewModel page)
             return;
         }
 
+        // Only load the data once it is confirmed that the tab doesn't already exist
+        page.LoadData();
 
         Pages.Add(page);
         var node = _nodeFactory.CreatePageNode(page, null);
@@ -271,7 +273,7 @@ public void AddChildPage(EditorPageViewModel parentPage, EditorPageViewModel chi
         {
             var childNode = parentNode.AddChild(childPage);
             _pageToNodeMap[childPage] = childNode;
-            
+
             // Try to insert the child page to the right of the parent
             var parentIndex = Pages.IndexOf(parentPage);
             if (parentIndex == -1)
@@ -302,7 +304,7 @@ private bool TryNavigateToExistingPage(EditorPageViewModel page)
 
         return false;
     }
-    
+
     public bool PageHasChildren(EditorPageViewModel page)
     {
         if (!_pageToNodeMap.TryGetValue(page, out var node))
@@ -311,6 +313,14 @@ public bool PageHasChildren(EditorPageViewModel page)
         return node.SubNodes.Count > 0;
     }
 
+    private PageNode GetTopLevelNode(PageNode node)
+    {
+        var current = node;
+        while (!current.IsTopLevel)
+            current = current.Parent;
+        return current;
+    }
+
     public void RemoveTab(EditorPageViewModel page)
     {
         if (!_pageToNodeMap.TryGetValue(page, out var node))
@@ -321,8 +331,10 @@ public void RemoveTab(EditorPageViewModel page)
         ClosePageAndChildren(node);
 
 
+        // TODO:
         // We want to prioritize setting the left tab to be the active tab since our editors open stuff to the right first
         // Maybe we want to set the active page to be the parent if it exists?
+        // For after deleting Datatype entries, should it go back to the last previously visited tab?
         if (Pages.Count == 0)
         {
             ActivePage = null;
@@ -354,6 +366,7 @@ private void ClosePageAndChildren(PageNode node)
 
         Pages.Remove(node.Page);
 
+
         if (node.IsTopLevel)
         {
             TopLevelPages.Remove(node);
@@ -425,6 +438,13 @@ await _dialogService.ShowDialogAsync<PreferencesWindowViewModel, bool>(
                 PreferencesWindowViewModel.Instance, "Preferences");
         });
 
+        this.WhenAnyValue(x => x.ActivePage)
+            .Buffer(2, 1)
+            .Subscribe(pair =>
+            {
+                if (pair.Count > 1 && pair[0] != null) pair[0].IsActive = false;
+                if (pair.Count > 0 && pair[^1] != null) pair[^1].IsActive = true;
+            });
 
         this.WhenAnyValue(x => x.Filter).Throttle(TimeSpan.FromMilliseconds(300)).Subscribe(ApplyFilter);
 
@@ -474,13 +494,14 @@ public void LoadDevTree()
 
 
         // root.SubNodes.Add(
-            // _nodeFactory.CreateOpenEditorNode("Dev Control",  typeof(DevControlViewModel), "Icons.GameControllerFill"));
-        root.SubNodes.Add(_nodeFactory.CreateOpenEditorNode<ZoneEditorPageViewModel>("Zone Editor", "Icons.StairsFill"));
+        // _nodeFactory.CreateOpenEditorNode("Dev Control",  typeof(DevControlViewModel), "Icons.GameControllerFill"));
+        root.SubNodes.Add(
+            _nodeFactory.CreateOpenEditorNode<ZoneEditorPageViewModel>("Zone Editor", "Icons.StairsFill"));
         // root.SubNodes.Add(
-            // _nodeFactory.CreateOpenEditorNode("Ground Editor", typeof(GroundEditorPageViewModel), "Icons.MapTrifoldFill"));
+        // _nodeFactory.CreateOpenEditorNode("Ground Editor", typeof(GroundEditorPageViewModel), "Icons.MapTrifoldFill"));
         // root.SubNodes.Add(_nodeFactory.CreateOpenEditorNode("Testing", "Icons.BedFill", "RandomInfo"));
         // root.SubNodes.Add(_nodeFactory.CreateOpenEditorNode("Tab Test", "Icons.AirplaneFill", "SpritePage"));
-        
+
         // var particlesRoot = _nodeFactory.CreateSpriteRootNode("particles", "", "Particles", "Icons.PaintBrushFill");
         // particlesRoot.SubNodes.Add(_nodeFactory.CreateDataItemNode("Acid_Blue", "SpriteEditor", "Acid_Blue",
         //     "Icons.PaintBrushFill"));
@@ -666,30 +687,31 @@ private void CreateConstantsNode(NodeBase parent)
 
     private void CreateDataNode(NodeBase parent)
     {
-        var dataNode = _nodeFactory.CreateOpenEditorNode<ZoneEditorPageViewModel>("Data", "Icons.FloppyDiskFill");
+        var dataNode = _nodeFactory.CreateOpenEditorNode<ZoneEditorPageViewModel>("Datazz", "Icons.FloppyDiskFill");
         foreach (var type in Enum.GetValues<DataManager.DataType>())
         {
-            if (type == DataManager.DataType.All || type == DataManager.DataType.None)
+            if (type is DataManager.DataType.All or DataManager.DataType.None)
                 continue;
-        
-        
-            var dataItemRootNode = _nodeFactory.CreateDataRootNode<ZoneEditorPageViewModel>(
+
+            var entry = DataRegistry.Map[type];
+
+            var dataItemRootNode = _nodeFactory.CreateDataRootNode<DataListPageViewModel>(
                 type,
                 type.ToString(),
-                type.GetIcon());
+                entry.Icon);
             dataNode.SubNodes.Add(dataItemRootNode);
-            var entries = DataManager.Instance.DataIndices[type].GetLocalStringArray(true);
-        
-            foreach (string key in entries.Keys)
-            {
-                var itemNode = _nodeFactory.CreateDataItemNode<ZoneEditorPageViewModel>(
-                    key,
-                    $"{key}: {entries[key]}",
-                    type.GetIcon());
-                dataItemRootNode.SubNodes.Add(itemNode);
-            }
+            // var entries = DataManager.Instance.DataIndices[type].GetLocalStringArray(true);
+            //
+            // foreach (string key in entries.Keys)
+            // {
+            //     var itemNode = _nodeFactory.CreateDataItemNode<DataListPageViewModel>(
+            //         key,
+            //         $"{key}: {entries[key]}",
+            //         type.GetIcon());
+            //     dataItemRootNode.SubNodes.Add(itemNode);
+            // }
         }
-        
+
         parent.SubNodes.Add(dataNode);
     }
 
@@ -699,10 +721,12 @@ private void CreateSpriteNode(NodeBase parent)
         var spriteNode = _nodeFactory.CreateOpenEditorNode<DevEditPageViewModel>("Sprites", "Icons.PaintBrushFill");
         //
         spriteNode.SubNodes.Add(
-            _nodeFactory.CreateOpenEditorNodeWithParams<SpeciesEditPageViewModel>("Char Sprites", [true], "Icons.PersonFill")
+            _nodeFactory.CreateOpenEditorNodeWithParams<SpeciesEditPageViewModel>("Char Sprites", [true],
+                "Icons.PersonFill")
         );
         spriteNode.SubNodes.Add(
-            _nodeFactory.CreateOpenEditorNodeWithParams<SpeciesEditPageViewModel>("Portraits", [false], "Icons.PersonFill")
+            _nodeFactory.CreateOpenEditorNodeWithParams<SpeciesEditPageViewModel>("Portraits", [false],
+                "Icons.PersonFill")
         );
         // );
         //
@@ -824,7 +848,7 @@ private void CreateModNode(NodeBase parent)
     {
         var modsViewModel = _pageFactory.GetRequiredService<DevTabModsViewModel>();
         var modRoot = _nodeFactory.CreateModRootNode<DevEditPageViewModel>("Mods", "Icons.ScrollFill");
-        
+
         foreach (ModsNodeViewModel mod in modsViewModel.Mods)
         {
             var name = mod.Namespace == "origin" ? "Origins" : mod.Name;
@@ -832,10 +856,10 @@ private void CreateModNode(NodeBase parent)
                 mod.Namespace,
                 $"{mod.Namespace}: {name}",
                 "Icons.ScrollFill");
-        
+
             modRoot.SubNodes.Add(itemNode);
         }
-        
+
         parent.SubNodes.Add(modRoot);
     }
 
@@ -852,6 +876,30 @@ private void InitializeTabEvents()
         _tabEvents.RemoveTabEvent += (tab) => { RemoveTab(tab); };
 
         _tabEvents.NavigateToTabEvent += (tab) => { ActivePage = tab; };
+
+        // TODO: Check if this works if the page is a children of a tab. What if it closes the children first before the parent...
+        _tabEvents.CloseTabsForEntry += (key, dataType) =>
+        {
+            var topLevelPagesToClose = Pages
+                .OfType<ReflectedDataPageViewModel>()
+                .Where(p => p.Node is DataItemNode dataItemNode
+                            && dataItemNode.ItemKey == key
+                            && dataItemNode.Parent is DataRootNode rootNode
+                            && rootNode.DataType == dataType)
+                .Cast<EditorPageViewModel>()
+                .Select(page =>
+                {
+                    if (!_pageToNodeMap.TryGetValue(page, out var node)) return null;
+                    if (node is not PageNode pageNode) return null;
+                    return GetTopLevelNode(pageNode).Page;
+                })
+                .Where(p => p != null)
+                .Distinct()
+                .ToList();
+
+            foreach (var page in topLevelPagesToClose)
+                RemoveTab(page);
+        };
     }
 
     private void AttachEventsRecursive(NodeBase node)
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DataListPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DataListPageViewModel.cs
index e09bbfa7..f4c06af1 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DataListPageViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DataListPageViewModel.cs
@@ -1,15 +1,365 @@
+using System;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.Linq;
+using System.Reactive;
+using System.Threading.Tasks;
+using Avalonia.Platform.Storage;
+using Avalonia.Threading;
+using DynamicData;
+using ReactiveUI;
+using RogueEssence.Content;
+using RogueEssence.Data;
 using RogueEssence.Dev.Services;
+using RogueEssence.Dev.Utility;
+using RogueEssence.Dev.Views;
+using RogueEssence.Script;
 
 namespace RogueEssence.Dev.ViewModels;
 
-public class DataListPageViewModel : EditorPageViewModel
+public record DataListEntry(string Key, string Value)
 {
-    // public override string Title => "Data List";
-    
-    public DataListPageViewModel(PageFactory pageFactory, TabEvents tabEvents, IDialogService dialogService) : base(pageFactory, tabEvents, dialogService)
+    public string Title => $"{Key}: {Value}";
+}
+
+public class DataListPageViewModel : EditorPageViewModel<DataRootNode>
+{
+    public ReactiveCommand<string, Unit> ResaveAsFileCommand { get; }
+
+
+    private string _searchFilter = string.Empty;
+
+    public string SearchFilter
     {
-        
+        get => _searchFilter;
+        set => this.RaiseAndSetIfChanged(ref _searchFilter, value);
     }
-    
-}
-    
\ No newline at end of file
+
+
+    private DataListEntry? _selectedItem;
+
+    public DataListEntry? SelectedItem
+    {
+        get => _selectedItem;
+        set => this.RaiseAndSetIfChanged(ref _selectedItem, value);
+    }
+
+
+    public ObservableCollection<DataListEntry> Items { get; } = new();
+    public ObservableCollection<DataListEntry> FilteredItems { get; } = new();
+
+    public ObservableCollection<DataOpContainer> EditMenuItems { get; } = new();
+
+    public DataManager.DataType DataType => Node.DataType;
+
+
+    public DataListPageViewModel(NodeFactory nodeFactory, PageFactory pageFactory, TabEvents tabEvents,
+        IDialogService dialogService,
+        NodeBase node) : base(nodeFactory, pageFactory, tabEvents, dialogService, node)
+    {
+    }
+
+
+    private void ReloadEntries()
+    {
+        var entries = DataManager.Instance.DataIndices[DataType].GetLocalStringArray(true);
+        Dispatcher.UIThread.Post(() =>
+        {
+            Items.Clear();
+            foreach (var (key, value) in entries)
+                Items.Add(new DataListEntry(key, value));
+            UpdateVisibleItems(SearchFilter);
+        });
+    }
+
+
+    public override void LoadData()
+    {
+        ReloadEntries();
+
+        // ResaveAsFileCommand = Node.ResaveAsFile;
+
+        this.WhenAnyValue(x => x.SearchFilter).Subscribe(UpdateVisibleItems);
+
+        EditMenuItems.Clear();
+
+        EditMenuItems.Add(new DataOpContainer("Re-Index", ReIndexAsync));
+        if (DataType != DataManager.DataType.AutoTile)
+        {
+            EditMenuItems.Add(new DataOpContainer("Resave all as File", () => ResaveAllAsync(false)));
+            EditMenuItems.Add(new DataOpContainer("Resave all as Diff", () => ResaveAllAsync(true)));
+        }
+        else
+        {
+            EditMenuItems.Add(new DataOpContainer("Import DTEF", ImportDtefAsync));
+            // EditMenuItems.Add(new DataOpContainer("Export as DTEF", ExportDtefAsync));
+        }
+    }
+
+    private void tryImportDtef(string folder, string animName)
+    {
+        lock (GameBase.lockObj)
+        {
+            string destFile = PathMod.HardMod(string.Format(Content.GraphicsManager.TILE_PATTERN, animName));
+            DtefImportHelper.ImportDtef(folder, destFile);
+
+            //reindex graphics
+            GraphicsManager.RebuildIndices(GraphicsManager.AssetType.Tile);
+            GraphicsManager.ClearCaches(GraphicsManager.AssetType.Tile);
+            DevDataManager.ClearCaches();
+
+            //reindex data
+            DevHelper.RunIndexing(DataManager.DataType.AutoTile);
+            DevHelper.RunExtraIndexing(DataManager.DataType.AutoTile);
+            DataManager.Instance.LoadIndex(DataManager.DataType.AutoTile);
+            DataManager.Instance.LoadUniversalIndices();
+            DataManager.Instance.ClearCache(DataManager.DataType.AutoTile);
+            DiagManager.Instance.DevEditor.ReloadData(DataManager.DataType.AutoTile);
+            ReloadEntries();
+        }
+    }
+
+    private async Task ImportDtefAsync()
+    {
+        //remember addresses in registry
+        string folderName = DevForm.GetConfig("TilesetDir", Directory.GetCurrentDirectory());
+
+        string? folder = await DialogService.ShowFolderPickerAsync(new FolderPickerOpenOptions
+        {
+            Title = "Select DTEF folder",
+            AllowMultiple = false,
+        }, folderName);
+
+        if (folder is null)
+            return;
+
+        string animName = Path.GetFileNameWithoutExtension(folder);
+
+        bool conflict = false;
+        foreach (string name in GraphicsManager.TileIndex.Nodes.Keys)
+        {
+            if (name.ToLower() == animName.ToLower())
+            {
+                conflict = true;
+                break;
+            }
+        }
+
+        if (conflict)
+        {
+            var result = await MessageBoxWindowView.Show(DialogService,
+                $"Are you sure you want to overwrite the existing sheet:\n{animName}",
+                "Tileset already exists.", MessageBoxWindowView.MessageBoxButtons.YesNo);
+
+            if (result == MessageBoxWindowView.MessageBoxResult.No)
+                return;
+        }
+
+        DevForm.SetConfig("TilesetDir", Path.GetDirectoryName(folder));
+
+        try
+        {
+            DevForm.ExecuteOrPend(() => { tryImportDtef(folder, animName); });
+        }
+        catch (Exception ex)
+        {
+            DiagManager.Instance.LogError(ex, false);
+            await MessageBoxWindowView.Show(DialogService, $"Error importing from\n{folder}\n\n{ex.Message}",
+                "Import Failed", MessageBoxWindowView.MessageBoxButtons.Ok);
+            return;
+        }
+    }
+
+    private async Task ExportDtefAsync()
+    {
+        if (SelectedItem != null)
+        {
+            //remember addresses in registry
+            string folderName = DevForm.GetConfig("TilesetDir", Directory.GetCurrentDirectory());
+
+            string? folder = await DialogService.ShowFolderPickerAsync(new FolderPickerOpenOptions
+            {
+                Title = "Select folder to export the DTEF to",
+                AllowMultiple = false,
+            }, folderName);
+
+            if (folder is null)
+                return;
+            DevForm.SetConfig("TilesetDir", Path.GetDirectoryName(folder));
+
+            // TODO: Implement export Dtef function
+            // DevForm.ExecuteOrPend(() => { tryExportDtef(entryIndex, folder); });
+        }
+    }
+    // private void tryExportDtef(int entryIndex, string folder)
+    // {
+    //     lock (GameBase.lockObj)
+    //     {
+    //         DtefImportHelper.ExportDtefTile(entryIndex, folder);
+    //     }
+    // }
+
+
+    private async Task ResaveAllAsync(bool asDiff)
+    {
+        await Task.Run(() =>
+        {
+            lock (GameBase.lockObj)
+            {
+                DevHelper.Resave(DataType, asDiff);
+                DevHelper.RunIndexing(DataType);
+                DevHelper.RunExtraIndexing(DataType);
+                DataManager.Instance.LoadIndex(DataType);
+                DataManager.Instance.LoadUniversalIndices();
+                DataManager.Instance.ClearCache(DataType);
+                DiagManager.Instance.DevEditor.ReloadData(DataType);
+                ReloadEntries();
+            }
+        });
+    }
+
+
+    protected override bool IsSamePage(EditorPageViewModel other)
+    {
+        var page = other as DataListPageViewModel;
+        return Node.Equals(page?.Node);
+    }
+
+    private void UpdateVisibleItems(string filter)
+    {
+        FilteredItems.Clear();
+        var strategy = new BeginningTitleFilterStrategy();
+        foreach (var item in Items.Where(e => strategy.Matches(e.Title, filter)))
+            FilteredItems.Add(item);
+    }
+
+    public void AddUnderParentNode(DataListEntry entry)
+    {
+        Node.AddNodeIfNotExists(
+            NodeFactory.CreateDataItemNode<ReflectedDataPageViewModel>(entry.Key, entry.Title, Node.Icon));
+        NodeHelper.ExpandParents(Node, true);
+    }
+
+    public async Task AddItem()
+    {
+        var entry = DataRegistry.Map[DataType];
+
+        var vm = new RenameWindowViewModel();
+        bool result = await DialogService.ShowDialogAsync<RenameWindowViewModel, bool>(vm, $"Add new {DataType}");
+
+        if (!result)
+            return;
+
+        lock (GameBase.lockObj)
+        {
+            string assetName = Text.GetNonConflictingName(Text.Sanitize(vm.Name).ToLower(),
+                DataManager.Instance.DataIndices[DataType].ContainsKey);
+            DataManager.Instance.ContentChanged(DataType, assetName, entry.CreateEntry());
+            string newName = DataManager.Instance.DataIndices[DataType].Get(assetName).GetLocalString(true);
+            // choices.AddEntry(assetName, newName);
+
+            if (DataType == DataManager.DataType.Zone)
+                LuaEngine.Instance.CreateZoneScriptDir(assetName);
+        }
+
+        DataListEntry data = new(vm.Name, "");
+        Items.Add(data);
+        UpdateVisibleItems(SearchFilter);
+
+
+        // SubNodes.Add(_nodeFactory.CreateDataItemNode<DevEditPageViewModel>(assetName, $"{assetName}:", "Icons.GhostFill"));
+        // IsExpanded = true;
+        //
+
+        // var vm = new RenameWindowViewModel();
+        // bool result = await DialogService.ShowDialogAsync<RenameWindowViewModel, bool>(vm, $"Add new {Node.DataType}");
+
+        // if (!result)
+        //     return;
+        //
+        // SubNodes.Add(_nodeFactory.CreateDataItemNode<DevEditPageViewModel>(vm.Name, $"{vm.Name}:", "Icons.GhostFill"));
+        // IsExpanded = true;
+        // Console.WriteLine($"Added {DataType} item: {vm.Name}");
+        //
+    }
+
+    private async Task ReIndexAsync()
+    {
+        await Task.Run(() =>
+        {
+            lock (GameBase.lockObj)
+            {
+                DevHelper.RunIndexing(DataType);
+                DevHelper.RunExtraIndexing(DataType);
+                DataManager.Instance.LoadIndex(DataType);
+                DataManager.Instance.LoadUniversalIndices();
+                DataManager.Instance.ClearCache(DataType);
+                DiagManager.Instance.DevEditor.ReloadData(DataType);
+                ReloadEntries();
+            }
+        });
+    }
+
+
+    public async Task DeleteItem()
+    {
+        var key = SelectedItem?.Key;
+        if (key is null) return;
+
+
+        var datatype = Node.DataType;
+        var modStatus = DataManager.GetEntryDataModStatus(key, datatype.ToString());
+
+        if (PathMod.Quest.IsValid() && modStatus == DataManager.ModStatus.Base)
+        {
+            await MessageBoxWindowView.Show(DialogService,
+                string.Format("The {0} {1} is not a part of the currently edited mod and cannot be deleted.",
+                    datatype.ToString(), key),
+                "Delete " + datatype.ToString(), MessageBoxWindowView.MessageBoxButtons.Ok);
+            return;
+        }
+
+        MessageBoxWindowView.MessageBoxResult result;
+        if (modStatus == DataManager.ModStatus.Base || modStatus == DataManager.ModStatus.Added)
+            result = await MessageBoxWindowView.Show(DialogService,
+                string.Format("Are you sure you want to delete the following {0}:\n{1}", datatype.ToString(), key),
+                "Delete " + datatype.ToString(), MessageBoxWindowView.MessageBoxButtons.YesNo);
+        else
+            result = await MessageBoxWindowView.Show(DialogService,
+                string.Format("The following {0} will be reset back to the base game:\n{1}", datatype.ToString(), key),
+                "Delete " + datatype.ToString(), MessageBoxWindowView.MessageBoxButtons.YesNo);
+
+        if (result == MessageBoxWindowView.MessageBoxResult.No)
+            return;
+
+
+        Items.Remove(SelectedItem);
+        UpdateVisibleItems(SearchFilter);
+        TabEvents.RequestCloseTabsForEntry(key, datatype);
+        var nodeToRemove = Node.SubNodes
+            .OfType<DataItemNode>()
+            .FirstOrDefault(n => n.ItemKey == key);
+
+        if (nodeToRemove != null)
+            Node.SubNodes.Remove(nodeToRemove);
+        lock (GameBase.lockObj)
+        {
+            DataManager.Instance.ContentChanged(datatype, key, null);
+            // choices.DeleteEntry(key);
+
+
+            if (DataManager.Instance.DataIndices[datatype].ContainsKey(key))
+            {
+                string newName = DataManager.Instance.DataIndices[datatype].Get(key).GetLocalString(true);
+                // choices.AddEntry(key, newName);
+            }
+
+            if (datatype == DataManager.DataType.Zone)
+            {
+                string str = LuaEngine.MakeZoneScriptPath(key, "");
+                if (Directory.Exists(str))
+                    Directory.Delete(str, true);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DevControlViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DevControlViewModel.cs
index fdaaa343..00d5ce78 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DevControlViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DevControlViewModel.cs
@@ -15,9 +15,9 @@ public class DevControlViewModel : EditorPageViewModel
 
     public TestComboBoxViewModel Fruits { get; }
 
-    public DevControlViewModel(PageFactory pageFactory, TabEvents tabEvents, IDialogService dialogService,
+    public DevControlViewModel(NodeFactory nodeFactory, PageFactory pageFactory, TabEvents tabEvents, IDialogService dialogService,
         DevTabGameViewModel game, DevTabPlayerViewModel player, DevTabTravelViewModel travel,
-        DevTabScriptViewModel script, NodeBase node) : base(pageFactory, tabEvents, dialogService)
+        DevTabScriptViewModel script, NodeBase node) : base(nodeFactory, pageFactory, tabEvents, dialogService)
     {
         Fruits = new TestComboBoxViewModel();
         Game = game;
@@ -26,10 +26,10 @@ public DevControlViewModel(PageFactory pageFactory, TabEvents tabEvents, IDialog
         Script = script;
     }
 
-    public DevControlViewModel() : base(new PageFactory(new DesignServiceProvider()),
-        new TabEvents(new PageFactory(new DesignServiceProvider())), new DialogService())
-    {
-        // Title = "Dev Control";
-        Fruits = new TestComboBoxViewModel();
-    }
+    // public DevControlViewModel() : base(new PageFactory(new DesignServiceProvider()),
+    //     new TabEvents(new PageFactory(new DesignServiceProvider())), new DialogService())
+    // {
+    //     // Title = "Dev Control";
+    //     Fruits = new TestComboBoxViewModel();
+    // }
 }
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DevEditPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DevEditPageViewModel.cs
index 4f6bbd6f..250dedd9 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DevEditPageViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DevEditPageViewModel.cs
@@ -67,17 +67,17 @@ private void OpenList(DataManager.DataType dataType, GetEntry entryOp, CreateEnt
     
     // public override string? Title => "Dev Edit";
 
-    public DevEditPageViewModel(PageFactory pageFactory, TabEvents tabEvents, IDialogService dialogService, NodeBase node) : base(
-        pageFactory, tabEvents, dialogService)
+    public DevEditPageViewModel(NodeFactory nodeFactory, PageFactory pageFactory, TabEvents tabEvents, IDialogService dialogService,
+        NodeBase node) : base(nodeFactory, pageFactory, tabEvents, dialogService)
     {
         var n = node as DataItemNode;
         var nn = node.Parent as DataRootNode;
         var dt = nn.DataType;
     }
 
-    public DevEditPageViewModel() : base(new PageFactory(new DesignServiceProvider()),
-        new TabEvents(new PageFactory(new DesignServiceProvider())), new DialogService())
-    {
-        // Title = "Dev Edit";
-    }
+    // public DevEditPageViewModel() : base(new PageFactory(new DesignServiceProvider()),
+    //     new TabEvents(new PageFactory(new DesignServiceProvider())), new DialogService())
+    // {
+    //     // Title = "Dev Edit";
+    // }
 }
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/EditorPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/EditorPageViewModel.cs
index 3ca1f8c4..afc278d3 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/EditorPageViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/EditorPageViewModel.cs
@@ -2,14 +2,42 @@
 
 using System;
 using System.Collections.ObjectModel;
+using System.Runtime.CompilerServices;
 using RogueEssence.Dev.Services;
 
 
 namespace RogueEssence.Dev.ViewModels;
 
-public class EditorPageViewModel : ViewModelBase
+public abstract class EditorPageViewModel<TNode> : EditorPageViewModel
+    where TNode : NodeBase
 {
     
+    // The node that opened this page
+    public TNode Node { get; }
+
+    protected EditorPageViewModel(NodeFactory nodeFactory, PageFactory pageFactory, TabEvents tabEvents, 
+        IDialogService dialogService, NodeBase node) : base(nodeFactory, pageFactory, tabEvents, dialogService)
+    {
+        if (node is not TNode typedNode)
+            throw new ArgumentException($"Expected {typeof(TNode).Name} but got {node.GetType().Name}");
+        
+        Node = typedNode;
+    }
+    
+    protected override bool IsSamePage(EditorPageViewModel other)
+    {
+        var otherTyped = (EditorPageViewModel<TNode>)other;
+        return Node.Equals(otherTyped.Node);
+    }
+
+    protected override int GetHashCodeCore() => Node.GetHashCode();
+}
+
+
+public class EditorPageViewModel : ViewModelBase, IEquatable<EditorPageViewModel>
+{
+    public double ScrollOffset { get; set; } = 0;
+    
     public virtual string DefaultTitle => "Dev Edit";
     
     private string _title = "";
@@ -18,36 +46,49 @@ public class EditorPageViewModel : ViewModelBase
     public string Title =>
         string.IsNullOrEmpty(_title) ? DefaultTitle : _title;
     
-    public bool Equals(object? obj)
-    {
-        if (obj is not EditorPageViewModel other)
-            return false;
-        
-        return GetType() == other.GetType() && IsSamePage(other);
-    }
+    
 
-    protected virtual bool IsSamePage(EditorPageViewModel other)
-    {
-        return true;
-    }
     
+    // Whether to add a new tab when this page is selected
     public virtual bool AddNewTab => true;
     
+        
+    // Only load data when there is no duplicate pages
+    public virtual void LoadData() { }
     
-    private string _data = "";
-
-  
-    public string Data
+    public bool Equals(EditorPageViewModel? other)
     {
-        get { return _data; }
-        set
-        {
-            this.RaiseAndSetIfChanged(ref _data, value);
-        }
+        if (other is null) return false;
+        if (GetType() != other.GetType()) return false;
+        return IsSamePage(other);
     }
+
+    public override bool Equals(object? obj) => obj is EditorPageViewModel other && Equals(other);
+    public override int GetHashCode() => GetHashCodeCore();
     
+    protected virtual bool IsSamePage(EditorPageViewModel other) => true;
+    protected virtual int GetHashCodeCore() => RuntimeHelpers.GetHashCode(this);
+    //
+    // private string _data = "";
+    //
+    //
+    // public string Data
+    // {
+    //     get { return _data; }
+    //     set
+    //     {
+    //         this.RaiseAndSetIfChanged(ref _data, value);
+    //     }
+    // }
+    //
  
 
+    private bool _isActive;
+    public bool IsActive
+    {
+        get => _isActive;
+        set => this.RaiseAndSetIfChanged(ref _isActive, value);
+    }
     
     private string? _icon = "";
     public string Icon
@@ -69,13 +110,21 @@ public bool Modified
                 this.RaiseAndSetIfChanged(ref _modified, value);
             }
         }
-    private readonly TabEvents _tabEvents;
+        
+    public readonly NodeFactory NodeFactory;
+    public readonly TabEvents TabEvents;
+    public readonly IDialogService DialogService;
+    public readonly PageFactory PageFactory;
     
-    public EditorPageViewModel(PageFactory pageFactory, TabEvents tabEvents, IDialogService dialogService)
+    public EditorPageViewModel(NodeFactory nodeFactory, PageFactory pageFactory, TabEvents tabEvents, IDialogService dialogService)
     {
-        // Children = new ObservableCollection<EditorPageViewModel>();
-        _tabEvents = tabEvents;
+        this.TabEvents = tabEvents;
+        this.DialogService = dialogService;
+        this.PageFactory = pageFactory;
+        this.NodeFactory = nodeFactory;
     }
+    
+    
 
     public void SetPageTitleFromNode(NodeBase node)
     {
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/GroundEditorPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/GroundEditorPageViewModel.cs
index 8bf1c9a6..8d6025ed 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/GroundEditorPageViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/GroundEditorPageViewModel.cs
@@ -6,6 +6,6 @@ public class GroundEditorPageViewModel : EditorPageViewModel
 {
     // public override string Title => "Ground Editor Long Name";
     
-    public GroundEditorPageViewModel (PageFactory pageFactory, TabEvents tabEvents, IDialogService dialogService) : base(pageFactory, tabEvents, dialogService)
+    public GroundEditorPageViewModel(NodeFactory nodeFactory, PageFactory pageFactory, TabEvents tabEvents, IDialogService dialogService) : base(nodeFactory, pageFactory, tabEvents, dialogService)
     { }
 }
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ModInfoEditorViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ModInfoEditorViewModel.cs
index ea11d3dd..27e8642b 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ModInfoEditorViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ModInfoEditorViewModel.cs
@@ -10,16 +10,17 @@ public class ModInfoEditorViewModel : EditorPageViewModel
 
     public TestComboBoxViewModel Fruits { get; }
     
-    public ModInfoEditorViewModel(PageFactory pageFactory, TabEvents tabEvents, IDialogService dialogService) : base(pageFactory, tabEvents, dialogService)
+    public ModInfoEditorViewModel(NodeFactory nodeFactory, PageFactory pageFactory, TabEvents tabEvents, IDialogService dialogService,
+        NodeBase node) : base(nodeFactory, pageFactory, tabEvents, dialogService) 
     {
        
         Fruits = new TestComboBoxViewModel();
     }
     
-    public ModInfoEditorViewModel() : base(new PageFactory(new DesignServiceProvider()), new TabEvents(new PageFactory(new DesignServiceProvider())), new DialogService())
-    {
-        // Title = "Dev Control";
-        Fruits = new TestComboBoxViewModel();
-    }
+    // public ModInfoEditorViewModel() : base(new PageFactory(new DesignServiceProvider()), new TabEvents(new PageFactory(new DesignServiceProvider())), new DialogService())
+    // {
+    //     // Title = "Dev Control";
+    //     Fruits = new TestComboBoxViewModel();
+    // }
     
 }
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/RandomInfoPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/RandomInfoPageViewModel.cs
index d4ac9383..926a9f39 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/RandomInfoPageViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/RandomInfoPageViewModel.cs
@@ -7,7 +7,8 @@ public class RandomInfoPageViewModel : EditorPageViewModel
     public override bool AddNewTab => false;
     
     // public override string Title => "Random Page Info";
-    public RandomInfoPageViewModel (PageFactory pageFactory, TabEvents tabEvents, IDialogService dialogService) : base(pageFactory, tabEvents, dialogService)
+    public RandomInfoPageViewModel(NodeFactory nodeFactory, PageFactory pageFactory, TabEvents tabEvents, IDialogService dialogService,
+        NodeBase node) : base(nodeFactory, pageFactory, tabEvents, dialogService)
     {
     }
     
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ReflectedDataPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ReflectedDataPageViewModel.cs
new file mode 100644
index 00000000..155f6ea3
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ReflectedDataPageViewModel.cs
@@ -0,0 +1,22 @@
+using RogueEssence.Dev.Services;
+
+namespace RogueEssence.Dev.ViewModels;
+
+public class ReflectedDataPageViewModel : EditorPageViewModel<NodeBase>
+{
+    
+    // TODO:
+    // A page that is autogenerated will never be the same page as another page?
+    protected override bool IsSamePage(EditorPageViewModel other)
+    {
+        if (other is not ReflectedDataPageViewModel otherPage)
+            return false;
+        return otherPage.Node.Equals(Node);
+    }
+
+    // public override string Title => "Random Page Info";
+    public ReflectedDataPageViewModel(NodeFactory nodeFactory, PageFactory pageFactory, TabEvents tabEvents, IDialogService dialogService,
+        NodeBase node) : base(nodeFactory, pageFactory, tabEvents, dialogService, node)
+    {
+    }
+}
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/SpeciesEditPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/SpeciesEditPageViewModel.cs
index b00d2981..511b3174 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/SpeciesEditPageViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/SpeciesEditPageViewModel.cs
@@ -1,7 +1,6 @@
 using RogueEssence.Content;
 using RogueEssence.Data;
 using RogueEssence.Dev.Views;
-
 using Avalonia.Interactivity;
 using System;
 using System.Collections.Generic;
@@ -14,11 +13,14 @@
 using RogueEssence.Content;
 using System.IO;
 using System.Linq;
+using System.Reactive.Linq;
+using Avalonia.Controls.Models.TreeDataGrid;
 using Avalonia.Media.Imaging;
 using Avalonia.Platform.Storage;
 using Avalonia.Threading;
 using RogueElements;
 using RogueEssence.Dev.Services;
+using RogueEssence.Dev.Utility;
 using RogueEssence.Dev.Views;
 
 namespace RogueEssence.Dev.ViewModels
@@ -27,7 +29,11 @@ public class SpeciesOpContainer
     {
         public Action CommandAction;
         public CharSheetOp Op;
-        public string Name { get { return Op.Name; } }
+
+        public string Name
+        {
+            get { return Op.Name; }
+        }
 
         public SpeciesOpContainer(CharSheetOp op, Action command)
         {
@@ -41,44 +47,49 @@ public void Command()
         }
     }
 
-    public class MonsterNodeViewModel : ViewModelBase
+    public class MonsterNodeViewModel : NodeBase
     {
+        private bool _filled;
 
-        private bool filled;
         public bool Filled
         {
-            get => filled;
-            set => this.SetIfChanged(ref filled, value);
-        }
-
-        private string name;
-        public string Name
-        {
-            get => name;
-            set => this.SetIfChanged(ref name, value);
+            get => _filled;
+            set => this.RaiseAndSetIfChanged(ref _filled, value);
         }
 
         public CharID ID;
 
-        public ObservableCollection<MonsterNodeViewModel> Nodes { get; }
-
         public MonsterNodeViewModel(string name, CharID id, bool filled)
+            : base(name)
+        {
+            ID = id;
+            _filled = filled;
+        }
+
+        protected override bool EqualsCore(NodeBase other)
         {
-            this.name = name;
-            this.ID = id;
-            this.filled = filled;
-            Nodes = new ObservableCollection<MonsterNodeViewModel>();
+            var node = (MonsterNodeViewModel)other;
+            return ID == node.ID;
         }
 
+        protected override int GetHashCodeCore() => ID.GetHashCode();
     }
 
     public class SpeciesEditPageViewModel : EditorPageViewModel
     {
+        private HierarchicalTreeDataGridSource<MonsterNodeViewModel> _nodeSource;
+
+        public HierarchicalTreeDataGridSource<MonsterNodeViewModel> NodeSource
+        {
+            get => _nodeSource;
+            set => this.RaiseAndSetIfChanged(ref _nodeSource, value);
+        }
+
         protected override bool IsSamePage(EditorPageViewModel other)
         {
             if (other is not SpeciesEditPageViewModel species)
                 return false;
-    
+
             return this.CheckSprites == species.CheckSprites;
         }
         // public override string Title => "Species Editor";
@@ -92,7 +103,12 @@ protected override bool IsSamePage(EditorPageViewModel other)
 
         public string Name
         {
-            get { return CheckSprites ? GraphicsManager.AssetType.Chara.ToString() : GraphicsManager.AssetType.Portrait.ToString(); }
+            get
+            {
+                return CheckSprites
+                    ? GraphicsManager.AssetType.Chara.ToString()
+                    : GraphicsManager.AssetType.Portrait.ToString();
+            }
             set { }
         }
 
@@ -104,6 +120,7 @@ public string Name
 
 
         private MonsterNodeViewModel chosenMonster;
+
         public MonsterNodeViewModel ChosenMonster
         {
             get => chosenMonster;
@@ -117,19 +134,93 @@ public MonsterNodeViewModel ChosenMonster
         //ReImport enabled if CachedPath is not null
 
         private string cachedPath;
+
         public string CachedPath
         {
             get => cachedPath;
             set => this.SetIfChanged(ref cachedPath, value);
         }
 
+        private string _filter;
+
+        public string Filter
+        {
+            get { return _filter; }
+            set { this.RaiseAndSetIfChanged(ref _filter, value); }
+        }
+
 
-        public SpeciesEditPageViewModel(PageFactory pageFactory, TabEvents tabEvents, IDialogService dialogService, OpenEditorNodeWithParams node) : base(pageFactory, tabEvents, dialogService)
+        private void ApplyFilter(string filter)
+        {
+            Dispatcher.UIThread.Post(() =>
+            {
+                foreach (var node in Monsters)
+                {
+                    // Only expand nodes IF there is a filter, otherwise the nodes should be closed by default
+                    if (string.IsNullOrWhiteSpace(filter))
+                    {
+                        NodeHelper.ExpandAll(node, false);
+                    }
+                    else
+                    {
+                        NodeHelper.ExpandIfMatches(node, filter,
+                            new CombinedTitleFilterStrategy(new BeginningTitleFilterStrategy(),
+                                new IndexTitleFilterStrategy()));
+                    }
+                }
+
+                // Remove the chosen monster if it no longer matches the filter
+                if (ChosenMonster != null && !ChosenMonster.IsVisible)
+                {
+                    ChosenMonster = null;
+                }
+
+
+                RefreshTreeDataGrid();
+            });
+        }
+
+        private void RefreshTreeDataGrid()
+        {
+            var visible = string.IsNullOrWhiteSpace(Filter)
+                ? Monsters
+                : new ObservableCollection<MonsterNodeViewModel>(Monsters.Where(n => n.IsVisible));
+
+            NodeSource = new HierarchicalTreeDataGridSource<MonsterNodeViewModel>(visible)
+            {
+                Columns =
+                {
+                    new HierarchicalExpanderColumn<MonsterNodeViewModel>(
+                        new TemplateColumn<MonsterNodeViewModel>(
+                            null,
+                            "MonsterNodeTemplate",
+                            null,
+                            new GridLength(1, GridUnitType.Star)),
+                        x => new ObservableCollection<MonsterNodeViewModel>(
+                            x.SubNodes.OfType<MonsterNodeViewModel>().Where(n => n.IsVisible)),
+                        x => x.SubNodes.Count > 0,
+                        x => x.IsExpanded)
+                }
+            };
+        }
+
+        public string HeaderText { get; }
+
+        public SpeciesEditPageViewModel(NodeFactory nodeFactory, PageFactory pageFactory, TabEvents tabEvents,
+            IDialogService dialogService,
+            OpenEditorNodeWithParams node) : base(nodeFactory, pageFactory, tabEvents, dialogService)
         {
             Monsters = new ObservableCollection<MonsterNodeViewModel>();
             OpList = new ObservableCollection<SpeciesOpContainer>();
             CheckSprites = (bool)node.ExtraParams[0];
+            HeaderText = node.Title;
+        }
+
+        public override void LoadData()
+        {
             LoadFormDataEntries(CheckSprites);
+            this.WhenAnyValue(x => x.Filter).Throttle(TimeSpan.FromMilliseconds(300)).Subscribe(ApplyFilter);
+            RefreshTreeDataGrid();
         }
 
 
@@ -148,7 +239,9 @@ private async void applyOpToCharSheet(CharSheetOp op)
 
             if (!chosenMonster.Filled)
             {
-                await MessageBox.Show(parent, String.Format("No graphics exist for {0}.", chosenMonster.Name), "Error", MessageBox.MessageBoxButtons.Ok);
+                await MessageBoxWindowView.Show(DialogService,
+                    string.Format("No graphics exist for {0}.", chosenMonster.Title),
+                    "Error", MessageBoxWindowView.MessageBoxButtons.Ok);
                 return;
             }
 
@@ -213,52 +306,44 @@ public void LoadFormDataEntries(bool sprites)
 
         public async void mnuMassImport_Click()
         {
-            await MessageBox.Show(parent, "Note: Importing a sprite to a slot that is already filled will automatically overwrite the old one.", "Mass Import", MessageBox.MessageBoxButtons.Ok);
-
+            await MessageBoxWindowView.Show(DialogService,
+                "Note: Importing a sprite to a slot that is already filled will automatically overwrite the old one.",
+                "Mass Import", MessageBoxWindowView.MessageBoxButtons.Ok);
             //remember addresses in registry
             string folderName = DevForm.GetConfig(Name + "Dir", Directory.GetCurrentDirectory());
 
             //open window to choose directory
-            IStorageFolder directory = await parent.StorageProvider.TryGetFolderFromPathAsync(folderName);
-            await Dispatcher.UIThread.InvokeAsync(async () =>
+            string? folder = await DialogService.ShowFolderPickerAsync(new FolderPickerOpenOptions
             {
-            
-                IReadOnlyList<IStorageFolder> results = await parent.StorageProvider.OpenFolderPickerAsync(
-                    new FolderPickerOpenOptions
-                    {
-                        Title = "Select sprite folder to mass import",
-                        SuggestedStartLocation = directory,
-                        AllowMultiple = false,
-                    });
-
-                if (results.Count <= 0)
-                    return;
-
-                string folder = results.First().Path.LocalPath;
-                
-                DevForm.SetConfig(Name + "Dir", folder);
-                CachedPath = folder + "/";
+                Title = "Select sprite folder to mass import",
+                AllowMultiple = false,
+            }, folderName);
 
-                try
-                {
-                    MassImport(CachedPath);
-                }
-                catch (Exception ex)
-                {
-                    DiagManager.Instance.LogError(ex, false);
-                    await MessageBox.Show(parent, "Error importing from\n" + CachedPath + "\n\n" + ex.Message, "Import Failed", MessageBox.MessageBoxButtons.Ok);
-                    return;
-                }
-                
+            if (string.IsNullOrEmpty(folder))
+                return;
 
+            DevForm.SetConfig(Name + "Dir", folder);
+            CachedPath = folder + "/";
 
-            });
+            try
+            {
+                MassImport(CachedPath);
+            }
+            catch (Exception ex)
+            {
+                DiagManager.Instance.LogError(ex, false);
+                await MessageBoxWindowView.Show(DialogService,
+                    $"Error importing from\n{CachedPath}\n\n{ex.Message}",
+                    "Import Failed", MessageBoxWindowView.MessageBoxButtons.Ok);
+                return;
+            }
         }
 
         public void mnuMassExportMulti_Click()
         {
             MassExportFlow(false);
         }
+
         public void mnuMassExport_Click()
         {
             MassExportFlow(true);
@@ -270,28 +355,22 @@ public async void MassExportFlow(bool singleSheet)
             string folderName = DevForm.GetConfig(Name + "Dir", Directory.GetCurrentDirectory());
 
             //open window to choose directory
-            IStorageFolder directory = await parent.StorageProvider.TryGetFolderFromPathAsync(folderName);
-            await Dispatcher.UIThread.InvokeAsync(async () =>
+            string? folder = await DialogService.ShowFolderPickerAsync(new FolderPickerOpenOptions
             {
-                IReadOnlyList<IStorageFolder> results = await parent.StorageProvider.OpenFolderPickerAsync(
-                    new FolderPickerOpenOptions
-                    {
-                        Title = "Select folder to mass export to",
-                        SuggestedStartLocation = directory,
-                        AllowMultiple = false,
-                    });
-
-                if (results.Count <= 0)
-                    return;
+                Title = "Select folder to mass export to",
+                AllowMultiple = false,
+            }, folderName);
 
-                string folder = results.First().Path.LocalPath;
-                DevForm.SetConfig(Name + "Dir", folder);
-                CachedPath = folder + "/";
+            if (string.IsNullOrEmpty(folder))
+                return;
+            DevForm.SetConfig(Name + "Dir", folder);
+            CachedPath = folder + "/";
 
-                bool success = MassExport(CachedPath, singleSheet);
-                if (!success)
-                    await MessageBox.Show(parent, "Errors found exporting to\n" + CachedPath + "\n\nCheck logs for more info.", "Mass Export Failed", MessageBox.MessageBoxButtons.Ok);
-            });
+            bool success = MassExport(CachedPath, singleSheet);
+            if (!success)
+                await MessageBox.Show(parent,
+                    "Errors found exporting to\n" + CachedPath + "\n\nCheck logs for more info.", "Mass Export Failed",
+                    MessageBox.MessageBoxButtons.Ok);
         }
 
         public async void mnuReIndex_Click()
@@ -303,7 +382,8 @@ public async void mnuReIndex_Click()
             catch (Exception ex)
             {
                 DiagManager.Instance.LogError(ex, false);
-                await MessageBox.Show(parent, "Error when reindexing.\n\n" + ex.Message, "Reindex Failed", MessageBox.MessageBoxButtons.Ok);
+                await MessageBoxWindowView.Show(DialogService, "Error when reindexing.\n\n" + ex.Message,
+                    "Reindex Failed", MessageBoxWindowView.MessageBoxButtons.Ok);
                 return;
             }
         }
@@ -316,17 +396,21 @@ public async void btnImport_Click()
 
             if (chosenMonster.Filled)
             {
-                MessageBox.MessageBoxResult result = await MessageBox.Show(parent, "Are you sure you want to overwrite the existing sheet:\n" + GetFormString(formdata), "Sprite Sheet already exists.",
-                    MessageBox.MessageBoxButtons.YesNo);
-                if (result == MessageBox.MessageBoxResult.No)
+                var res = await MessageBoxWindowView.Show(DialogService,
+                    "Are you sure you want to overwrite the existing sheet:\n" + GetFormString(formdata),
+                    "Sprite Sheet already exists.", MessageBoxWindowView.MessageBoxButtons.OkCancel);
+                if (res == MessageBoxWindowView.MessageBoxResult.No)
+                {
                     return;
+                }
             }
 
             //notify (once) that sprites need to follow a rigid guideline
             if (!notifiedImport)
             {
-                await MessageBox.Show(parent, "When importing sprites, " +
-                    "make sure that all files in each folder adhere to the naming convention.", "Sprite Importing", MessageBox.MessageBoxButtons.Ok);
+                await MessageBoxWindowView.Show(DialogService, "When importing sprites, " +
+                                                               "make sure that all files in each folder adhere to the naming convention.",
+                    "Sprite Importing", MessageBoxWindowView.MessageBoxButtons.Ok);
                 notifiedImport = true;
             }
 
@@ -334,35 +418,30 @@ await MessageBox.Show(parent, "When importing sprites, " +
             string folderName = DevForm.GetConfig(Name + "Dir", Directory.GetCurrentDirectory());
 
             //open window to choose directory
-            IStorageFolder directory = await parent.StorageProvider.TryGetFolderFromPathAsync(folderName);
-            await Dispatcher.UIThread.InvokeAsync(async () =>
+            string? folder = await DialogService.ShowFolderPickerAsync(new FolderPickerOpenOptions
             {
-                IReadOnlyList<IStorageFolder> results = await parent.StorageProvider.OpenFolderPickerAsync(
-                    new FolderPickerOpenOptions
-                    {
-                        Title = "Select folder to mass export to",
-                        SuggestedStartLocation = directory,
-                        AllowMultiple = false,
-                    });
+                Title = "Select folder to import from",
+                AllowMultiple = false,
+            }, folderName);
 
-                if (results.Count <= 0)
-                    return;
+            if (string.IsNullOrEmpty(folder))
+                return;
 
-                string folder = results.First().Path.LocalPath;
-                DevForm.SetConfig(Name + "Dir", folder);
-                CachedPath = folder + "/";
+            DevForm.SetConfig(Name + "Dir", folder);
+            CachedPath = folder + "/";
 
-                try
-                {
-                    Import(CachedPath, formdata);
-                }
-                catch (Exception ex)
-                {
-                    DiagManager.Instance.LogError(ex, false);
-                    await MessageBox.Show(parent, "Error importing from\n" + CachedPath + "\n\n" + ex.Message, "Import Failed", MessageBox.MessageBoxButtons.Ok);
-                    return;
-                }
-            });
+            try
+            {
+                Import(CachedPath, formdata);
+            }
+            catch (Exception ex)
+            {
+                DiagManager.Instance.LogError(ex, false);
+                await MessageBoxWindowView.Show(DialogService,
+                    "Error importing from\n" + CachedPath + "\n\n" + ex.Message, "Import Failed",
+                    MessageBoxWindowView.MessageBoxButtons.Ok);
+                return;
+            }
         }
 
         public async void btnReImport_Click()
@@ -374,7 +453,9 @@ public async void btnReImport_Click()
             catch (Exception ex)
             {
                 DiagManager.Instance.LogError(ex, false);
-                await MessageBox.Show(parent, "Error importing from\n" + CachedPath + "\n\n" + ex.Message, "Import Failed", MessageBox.MessageBoxButtons.Ok);
+                await MessageBoxWindowView.Show(DialogService,
+                    "Error importing from\n" + CachedPath + "\n\n" + ex.Message, "Import Failed",
+                    MessageBoxWindowView.MessageBoxButtons.Ok);
                 return;
             }
         }
@@ -396,7 +477,9 @@ public async void ExportFlow(bool singleSheet)
 
             if (!chosenMonster.Filled)
             {
-                await MessageBox.Show(parent, String.Format("No graphics exist for {0}.", chosenMonster.Name), "Error", MessageBox.MessageBoxButtons.Ok);
+                await MessageBoxWindowView.Show(DialogService,
+                    String.Format("No graphics exist for {0}.", chosenMonster.Title), "Error",
+                    MessageBoxWindowView.MessageBoxButtons.Ok);
                 return;
             }
 
@@ -404,60 +487,57 @@ public async void ExportFlow(bool singleSheet)
             string folderName = DevForm.GetConfig(Name + "Dir", Directory.GetCurrentDirectory());
 
             //open window to choose directory
-            IStorageFolder directory = await parent.StorageProvider.TryGetFolderFromPathAsync(folderName);
-            await Dispatcher.UIThread.InvokeAsync(async () =>
+
+            string folder = await DialogService.ShowFolderPickerAsync(new FolderPickerOpenOptions
             {
-                IReadOnlyList<IStorageFolder> results = await parent.StorageProvider.OpenFolderPickerAsync(
-                    new FolderPickerOpenOptions
-                    {
-                        Title = "Select folder to export to",
-                        SuggestedStartLocation = directory,
-                        AllowMultiple = false,
-                    });
+                Title = "Select folder to export to",
+                AllowMultiple = false,
+            }, folderName);
 
-                if (results.Count <= 0)
-                    return;
+            if (String.IsNullOrEmpty(folder))
+                return;
 
-                string folder = results.First().Path.LocalPath;
-                
-                DevForm.SetConfig(Name + "Dir", folder);
-                CachedPath = folder + "/";
+            DevForm.SetConfig(Name + "Dir", folder);
+            CachedPath = folder + "/";
 
-                try
-                {
-                    DevForm.ExecuteOrPend(() => { Export(CachedPath, formdata, singleSheet); });
-                }
-                catch (Exception ex)
-                {
-                    DiagManager.Instance.LogError(ex, false);
-                    await MessageBox.Show(parent, "Error exporting to\n" + CachedPath + "\n\n" + ex.Message, "Export Failed", MessageBox.MessageBoxButtons.Ok);
-                    return;
-                }
-            });
+            try
+            {
+                DevForm.ExecuteOrPend(() => { Export(CachedPath, formdata, singleSheet); });
+            }
+            catch (Exception ex)
+            {
+                DiagManager.Instance.LogError(ex, false);
+                await MessageBoxWindowView.Show(DialogService,
+                    "Error exporting to\n" + CachedPath + "\n\n" + ex.Message, "Export Failed",
+                    MessageBoxWindowView.MessageBoxButtons.Ok);
+                return;
+            }
         }
 
         public async void btnDelete_Click()
         {
             if (!chosenMonster.Filled)
             {
-                await MessageBox.Show(parent, String.Format("No graphics exist for {0}.", chosenMonster.Name), "Error", MessageBox.MessageBoxButtons.Ok);
+                await MessageBoxWindowView.Show(DialogService,
+                    String.Format("No graphics exist for {0}.", chosenMonster.Title), "Error",
+                    MessageBoxWindowView.MessageBoxButtons.Ok);
                 return;
             }
 
             //get current sprite
             CharID formdata = chosenMonster.ID;
 
-            MessageBox.MessageBoxResult result = await MessageBox.Show(parent, "Are you sure you want to delete the following sheet:\n" + GetFormString(formdata), "Delete Sprite Sheet.",
-                MessageBox.MessageBoxButtons.YesNo);
-            if (result == MessageBox.MessageBoxResult.No)
+            var result = await MessageBoxWindowView.Show(DialogService,
+                "Are you sure you want to delete the following sheet:\n" + GetFormString(formdata),
+                "Delete Sprite Sheet.",
+                MessageBoxWindowView.MessageBoxButtons.YesNo);
+            if (result == MessageBoxWindowView.MessageBoxResult.No)
                 return;
 
             Delete(formdata);
         }
 
 
-
-
         private void reloadFullList()
         {
             lock (GameBase.lockObj)
@@ -468,33 +548,39 @@ private void reloadFullList()
                 {
                     if (monsterKeys[ii] == null) // in case of non continuous index of Dex numbers
                         continue;
-                    MonsterEntrySummary dex = (MonsterEntrySummary)DataManager.Instance.DataIndices[DataManager.DataType.Monster].Get(monsterKeys[ii]);
+                    MonsterEntrySummary dex = (MonsterEntrySummary)DataManager.Instance
+                        .DataIndices[DataManager.DataType.Monster].Get(monsterKeys[ii]);
 
                     CharID dexID = new CharID(ii, -1, -1, -1);
-                    MonsterNodeViewModel node = new MonsterNodeViewModel("#" + ii.ToString() + ": " + dex.Name.ToLocal(), dexID, hasSprite(charaNode, dexID));
+                    MonsterNodeViewModel node = new MonsterNodeViewModel(
+                        "#" + ii.ToString() + ": " + dex.Name.ToLocal(), dexID, hasSprite(charaNode, dexID));
                     for (int jj = 0; jj < dex.Forms.Count; jj++)
                     {
                         CharID formID = new CharID(ii, jj, -1, -1);
-                        MonsterNodeViewModel formNode = new MonsterNodeViewModel("Form" + jj.ToString() + ": " + dex.Forms[jj].Name.ToLocal(), formID, hasSprite(charaNode, formID));
+                        MonsterNodeViewModel formNode = new MonsterNodeViewModel(
+                            "Form" + jj.ToString() + ": " + dex.Forms[jj].Name.ToLocal(), formID,
+                            hasSprite(charaNode, formID));
                         for (int kk = 0; kk < skinKeys.Count; kk++)
                         {
                             SkinData skinData = DataManager.Instance.GetSkin(skinKeys[kk]);
                             if (!skinData.Challenge)
                             {
                                 CharID skinID = new CharID(ii, jj, kk, -1);
-                                MonsterNodeViewModel skinNode = new MonsterNodeViewModel(skinData.Name.ToLocal(), skinID, hasSprite(charaNode, skinID));
+                                MonsterNodeViewModel skinNode = new MonsterNodeViewModel(skinData.Name.ToLocal(),
+                                    skinID, hasSprite(charaNode, skinID));
                                 for (int mm = 0; mm < 3; mm++)
                                 {
                                     CharID genderID = new CharID(ii, jj, kk, mm);
-                                    MonsterNodeViewModel genderNode = new MonsterNodeViewModel(((Gender)mm).ToString(), genderID, hasSprite(charaNode, genderID));
-                                    skinNode.Nodes.Add(genderNode);
+                                    MonsterNodeViewModel genderNode = new MonsterNodeViewModel(((Gender)mm).ToString(),
+                                        genderID, hasSprite(charaNode, genderID));
+                                    skinNode.SubNodes.Add(genderNode);
                                 }
 
-                                formNode.Nodes.Add(skinNode);
+                                formNode.SubNodes.Add(skinNode);
                             }
                         }
 
-                        node.Nodes.Add(formNode);
+                        node.SubNodes.Add(formNode);
                     }
 
                     Monsters.Add(node);
@@ -579,8 +665,8 @@ private void tryImport(string currentPath, CharID currentForm)
 
 
                 DiagManager.Instance.LogInfo("Frames from:\n" +
-                    currentPath +
-                    "\nhave been imported to:" + GetFormString(currentForm));
+                                             currentPath +
+                                             "\nhave been imported to:" + GetFormString(currentForm));
             }
         }
 
@@ -610,7 +696,11 @@ private bool MassExport(string currentPath, bool singleSheet)
 
                     try
                     {
-                        DevForm.ExecuteOrPend(() => { Export(currentPath + ii.ToString("D4") + "/" + jj.ToString("D4") + "/", formID, singleSheet); });
+                        DevForm.ExecuteOrPend(() =>
+                        {
+                            Export(currentPath + ii.ToString("D4") + "/" + jj.ToString("D4") + "/", formID,
+                                singleSheet);
+                        });
                     }
                     catch (Exception ex)
                     {
@@ -625,7 +715,12 @@ private bool MassExport(string currentPath, bool singleSheet)
 
                         try
                         {
-                            DevForm.ExecuteOrPend(() => { Export(currentPath + ii.ToString("D4") + "/" + jj.ToString("D4") + "/" + kk.ToString("D4") + "/", skinID, singleSheet); });
+                            DevForm.ExecuteOrPend(() =>
+                            {
+                                Export(
+                                    currentPath + ii.ToString("D4") + "/" + jj.ToString("D4") + "/" +
+                                    kk.ToString("D4") + "/", skinID, singleSheet);
+                            });
                         }
                         catch (Exception ex)
                         {
@@ -640,7 +735,12 @@ private bool MassExport(string currentPath, bool singleSheet)
 
                             try
                             {
-                                DevForm.ExecuteOrPend(() => { Export(currentPath + ii.ToString("D4") + "/" + jj.ToString("D4") + "/" + kk.ToString("D4") + "/" + mm.ToString("D4") + "/", genderID, singleSheet); });
+                                DevForm.ExecuteOrPend(() =>
+                                {
+                                    Export(
+                                        currentPath + ii.ToString("D4") + "/" + jj.ToString("D4") + "/" +
+                                        kk.ToString("D4") + "/" + mm.ToString("D4") + "/", genderID, singleSheet);
+                                });
                             }
                             catch (Exception ex)
                             {
@@ -651,6 +751,7 @@ private bool MassExport(string currentPath, bool singleSheet)
                     }
                 }
             }
+
             return success;
         }
 
@@ -676,8 +777,8 @@ private void Export(string currentPath, CharID currentForm, bool singleSheet)
                     }
 
                     DiagManager.Instance.LogInfo("Frames from:\n" +
-                        GetFormString(currentForm) +
-                        "\nhave been exported to:" + currentPath);
+                                                 GetFormString(currentForm) +
+                                                 "\nhave been exported to:" + currentPath);
                 }
             }
         }
@@ -769,6 +870,7 @@ private void LoadSpeciesFormData(Dictionary<CharID, byte[]> data, CharID formDat
                     else
                         GraphicsManager.GetPortrait(formData).Save(writer);
                 }
+
                 byte[] writingBytes = stream.ToArray();
                 data[formData] = writingBytes;
             }
@@ -776,11 +878,14 @@ private void LoadSpeciesFormData(Dictionary<CharID, byte[]> data, CharID formDat
 
         private string GetFormString(CharID formdata)
         {
-            string name = DataManager.Instance.DataIndices[DataManager.DataType.Monster].Get(monsterKeys[formdata.Species]).Name.ToLocal();
+            string name = DataManager.Instance.DataIndices[DataManager.DataType.Monster]
+                .Get(monsterKeys[formdata.Species]).Name.ToLocal();
             if (formdata.Form > -1)
-                name += ", " + DataManager.Instance.GetMonster(monsterKeys[formdata.Species]).Forms[formdata.Form].FormName.ToLocal() + " form";
+                name += ", " + DataManager.Instance.GetMonster(monsterKeys[formdata.Species]).Forms[formdata.Form]
+                    .FormName.ToLocal() + " form";
             if (formdata.Skin > -1)
-                name += ", " + DataManager.Instance.DataIndices[DataManager.DataType.Skin].Get(skinKeys[formdata.Skin]).Name.ToLocal() + " skin";
+                name += ", " + DataManager.Instance.DataIndices[DataManager.DataType.Skin].Get(skinKeys[formdata.Skin])
+                    .Name.ToLocal() + " skin";
             if (formdata.Gender > -1)
                 name += ", " + (Gender)formdata.Gender + " gender";
             return name;
@@ -815,4 +920,4 @@ private GraphicsManager.AssetType GetAssetType()
                 return GraphicsManager.AssetType.Portrait;
         }
     }
-}
+}
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/SpritePageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/SpritePageViewModel.cs
index afd23283..2bcc2fea 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/SpritePageViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/SpritePageViewModel.cs
@@ -16,7 +16,8 @@ public class SpritePageViewModel : EditorPageViewModel
     // public override string Title => "Sprite Stuff";
 
 
-    public SpritePageViewModel(PageFactory pageFactory, TabEvents tabEvents, IDialogService dialogService) : base(pageFactory, tabEvents, dialogService)
+    public SpritePageViewModel(NodeFactory nodeFactory, PageFactory pageFactory, TabEvents tabEvents, IDialogService dialogService,
+        NodeBase node) : base(nodeFactory, pageFactory, tabEvents, dialogService)
     {
         CreateATab = ReactiveCommand.Create(() => tabEvents.AddChildPage(this, pageFactory.CreatePage(typeof(SpritePageViewModel))));
         CreateATopTab = ReactiveCommand.Create(() => tabEvents.AddTopLevelTab(pageFactory.CreatePage(typeof(ModInfoEditorViewModel))));
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ZoneEditorPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ZoneEditorPageViewModel.cs
index 4faf6aed..d64908aa 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ZoneEditorPageViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ZoneEditorPageViewModel.cs
@@ -6,7 +6,8 @@ public class ZoneEditorPageViewModel : EditorPageViewModel
 {
     // public override string Title => "Zone Editor";
     
-    public ZoneEditorPageViewModel(PageFactory pageFactory, TabEvents tabEvents, IDialogService dialogService, NodeBase node) : base(pageFactory, tabEvents, dialogService)
+    public ZoneEditorPageViewModel(NodeFactory nodeFactory, PageFactory pageFactory, TabEvents tabEvents, IDialogService dialogService,
+        NodeBase node) : base(nodeFactory, pageFactory, tabEvents, dialogService)
     {
         
     }
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/NodeBase.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/NodeBase.cs
index 70951f93..36b88798 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/NodeBase.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/NodeBase.cs
@@ -6,6 +6,7 @@
 using System.Linq;
 using System.Reactive;
 using System.Reactive.Linq;
+using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
 using System.Windows.Input;
 using Avalonia;
@@ -19,13 +20,14 @@
 using RogueEssence.Content;
 using RogueEssence.Data;
 using RogueEssence.Dev.Views;
+using RogueEssence.Script;
 
 
 namespace RogueEssence.Dev.ViewModels;
 
 using System.Collections.ObjectModel;
 
-public class NodeBase : ViewModelBase
+public class NodeBase : ViewModelBase, IEquatable<NodeBase>
 {
     public ObservableCollection<NodeBase> SubNodes { get; set; }
 
@@ -78,6 +80,20 @@ public bool IsVisible
         get => _isVisible;
         set => this.RaiseAndSetIfChanged(ref _isVisible, value);
     }
+    
+    public bool Equals(NodeBase? other)
+    {
+        if (other is null) return false;
+        if (GetType() != other.GetType()) return false;
+        return EqualsCore(other);
+    }
+
+    public override bool Equals(object? obj) => (obj is NodeBase) && this.Equals((NodeBase) obj);
+    public override int GetHashCode() => GetHashCodeCore();
+
+    protected virtual bool EqualsCore(NodeBase other) => ReferenceEquals(this, other);
+    protected virtual int GetHashCodeCore() => RuntimeHelpers.GetHashCode(this);
+    
 
     private void OnSubNodesChanged(object? s, NotifyCollectionChangedEventArgs e)
     {
@@ -114,6 +130,19 @@ public void CollapseChildren()
             child.CollapseChildren();
         }
     }
+    public void AddNodeIfNotExists(NodeBase node)
+    {
+        if (!SubNodes.Contains(node))
+            SubNodes.Add(node);
+    }
+    
+    public void RemoveNode(NodeBase node)
+    {
+        Console.WriteLine("hi");
+        Console.WriteLine($"Removing node {node.Title}");
+        SubNodes.Remove(node);
+    }
+    
 }
 
 public class OpenEditorNode : NodeBase
@@ -125,9 +154,21 @@ public OpenEditorNode(string title, Type? editorType, string? icon = null)
     {
         EditorType = editorType;
     }
+    
+    protected override bool EqualsCore(NodeBase other)
+    {
+        if (other is not OpenEditorNode node)
+            return false;
+        return EditorType == node.EditorType;
+    }
+    protected override int GetHashCodeCore()
+    {
+        return EditorType.GetHashCode();
+    }
 }
 
 
+// TODO: Remove
 public class OpenEditorNodeWithParams : OpenEditorNode
 {
     public object[] ExtraParams { get; }
@@ -168,14 +209,19 @@ public async Task OnClickAsync()
 
 public abstract class ItemRootNode : OpenEditorNode
 {
-    protected readonly IDialogService _dialogService;
+    
+    public ReactiveCommand<NodeBase, Unit> DeleteCommand { get; }
+
+// In constructor:
 
-    public abstract ReactiveCommand<Unit, Unit> AddCommand { get; }
-    public abstract ReactiveCommand<DataItemNode, Unit> DeleteCommand { get; }
+    public abstract Task AddItem();
+    public abstract Task DeleteItem(string key);
 
     protected ItemRootNode(string title, Type? editorKey, string icon = null)
         : base(title, editorKey, icon)
     {
+        DeleteCommand = ReactiveCommand.Create<NodeBase>(RemoveNode);
+        
     }
 }
 
@@ -184,20 +230,8 @@ public class DataRootNode : ItemRootNode
     public DataManager.DataType DataType { get; }
 
     private readonly NodeFactory _nodeFactory;
-
     private readonly IDialogService _dialogService;
 
-
-    public override ReactiveCommand<Unit, Unit> AddCommand { get; }
-    public override ReactiveCommand<DataItemNode, Unit> DeleteCommand { get; }
-
-    public ReactiveCommand<Unit, Unit> ReIndexCommand { get; }
-    public ReactiveCommand<Unit, Unit> ResaveAllAsFileCommand { get; }
-    public ReactiveCommand<Unit, Unit> ResaveAllAsDiffCommand { get; }
-
-    public ReactiveCommand<DataItemNode, Unit> ResaveAsFile { get; }
-    public ReactiveCommand<DataItemNode, Unit> ResaveAsPatch { get; }
-
     public DataRootNode(NodeFactory nodeFactory, IDialogService dialogService, DataManager.DataType dataType,
         Type? editorType, string title, string? icon = null)
         : base(title, editorType, icon ?? "")
@@ -205,22 +239,21 @@ public DataRootNode(NodeFactory nodeFactory, IDialogService dialogService, DataM
         _nodeFactory = nodeFactory;
         _dialogService = dialogService;
         DataType = dataType;
+    }
 
-        AddCommand = ReactiveCommand.CreateFromTask(AddItemAsync);
-        AddCommand.CanExecute.Subscribe(canExecute =>
-            Console.WriteLine($"Add Command - CanExecute: {canExecute}"));
-
-        DeleteCommand = ReactiveCommand.CreateFromTask<DataItemNode>(DeleteItemAsync);
-
-        ReIndexCommand = ReactiveCommand.CreateFromTask(ReIndexAsync);
-        ResaveAllAsFileCommand = ReactiveCommand.CreateFromTask(ResaveAllAsFileAsync);
-        ResaveAllAsDiffCommand = ReactiveCommand.CreateFromTask(ResaveAllAsDiffAsync);
+    protected override bool EqualsCore(NodeBase other)
+    {
+        if (other is not DataRootNode node)
+            return false;
+        return DataType == node.DataType && EditorType == node.EditorType;
+    }
 
-        ResaveAsFile = ReactiveCommand.CreateFromTask<DataItemNode>(ResaveItemAsFileAsync);
-        ResaveAsPatch = ReactiveCommand.CreateFromTask<DataItemNode>(ResaveItemAsPatchAsync);
+    protected override int GetHashCodeCore()
+    {
+        return EditorType.GetHashCode() ^ DataType.GetHashCode();
     }
 
-    private async Task AddItemAsync()
+    public override async Task AddItem()
     {
         var vm = new RenameWindowViewModel();
         bool result = await _dialogService.ShowDialogAsync<RenameWindowViewModel, bool>(vm, $"Add new {DataType}");
@@ -233,68 +266,341 @@ private async Task AddItemAsync()
         Console.WriteLine($"Added {DataType} item: {vm.Name}");
     }
 
-    private async Task DeleteItemAsync(DataItemNode? node)
+    public override async Task DeleteItem(string key)
     {
-        if (node is null)
+        // if (node is null)
+        //     return;
+
+        // var res = await MessageBoxWindowView.Show(_dialogService,
+        //     $"Deleting {key} will reset it back to the base game.", $"Delete {key}", MessageBoxWindowView.MessageBoxButtons.YesNo, true);
+
+        // if (res != MessageBoxWindowView.MessageBoxResult.Yes)
+        //     return;
+
+        // SubNodes.Remove(node);
+        // Console.WriteLine($"Deleted {key} of type {DataType}");
+        
+        var modStatus = DataManager.GetEntryDataModStatus(key, DataType.ToString());
+
+        if (PathMod.Quest.IsValid() && modStatus == DataManager.ModStatus.Base)
+        {
+            await MessageBoxWindowView.Show(_dialogService,
+                string.Format("The {0} {1} is not a part of the currently edited mod and cannot be deleted.", DataType.ToString(), key),
+                "Delete " + DataType.ToString(), MessageBoxWindowView.MessageBoxButtons.Ok);
             return;
+        }
 
-        var res = await MessageBoxWindowView.Show(_dialogService,
-            $"Deleting {node.ItemKey} will reset it back to the base game.", $"Delete {node.ItemKey}", MessageBoxWindowView.MessageBoxButtons.YesNo, true);
+        MessageBoxWindowView.MessageBoxResult result;
+        if (modStatus == DataManager.ModStatus.Base || modStatus == DataManager.ModStatus.Added)
+            result = await MessageBoxWindowView.Show(_dialogService,
+                string.Format("Are you sure you want to delete the following {0}:\n{1}", DataType.ToString(), key),
+                "Delete " + DataType.ToString(), MessageBoxWindowView.MessageBoxButtons.YesNo);
+        else
+            result = await MessageBoxWindowView.Show(_dialogService,
+                string.Format("The following {0} will be reset back to the base game:\n{1}", DataType.ToString(), key),
+                "Delete " + DataType.ToString(), MessageBoxWindowView.MessageBoxButtons.YesNo);
 
-        if (res != MessageBoxWindowView.MessageBoxResult.Yes)
+        if (result == MessageBoxWindowView.MessageBoxResult.No)
             return;
 
-        SubNodes.Remove(node);
-        Console.WriteLine($"Deleted {node.Title} of type {DataType}");
+        lock (GameBase.lockObj)
+        {
+            DataManager.Instance.ContentChanged(DataType, key, null);
+            // choices.DeleteEntry(key);
+        
+            if (DataManager.Instance.DataIndices[DataType].ContainsKey(key))
+            {
+                string newName = DataManager.Instance.DataIndices[DataType].Get(key).GetLocalString(true);
+                // choices.AddEntry(key, newName);
+            }
+
+            if (DataType == DataManager.DataType.Zone)
+            {
+                string str = LuaEngine.MakeZoneScriptPath(key, "");
+                if (Directory.Exists(str))
+                    Directory.Delete(str, true);
+            }
+        }
     }
 
-    private async Task ReIndexAsync()
+    public async Task ReIndex()
     {
         Console.WriteLine($"Reindexing {DataType}...");
         await Task.Delay(100);
     }
 
-    private async Task ResaveAllAsFileAsync()
+    public async Task ResaveAllAsFile()
     {
         Console.WriteLine($"Resaving all {DataType} as file...");
         await Task.Delay(100);
     }
 
-    private async Task ResaveAllAsDiffAsync()
+    public async Task ResaveAllAsDiff()
     {
         Console.WriteLine($"Resaving all {DataType} as diff...");
         await Task.Delay(100);
     }
 
+    public async Task ResaveItemAsFile(string key)
+    {
+        if (DataManager.GetEntryDataModStatus(key, DataType.ToString()) == DataManager.ModStatus.Base)
+        {
+            await MessageBoxWindowView.Show(_dialogService, string.Format("{0} must have saved edits first!", key), "Error", MessageBoxWindowView.MessageBoxButtons.Ok);
+            return;
+        }
+
+        lock (GameBase.lockObj)
+        {
+            var entry = DataRegistry.Map[DataType];
+            IEntryData data = entry.GetEntry(key);
+            DataManager.Instance.ContentResaved(DataType, key, data, false);
+            string newName = DataManager.Instance.DataIndices[DataType].Get(key).GetLocalString(true);
+        }
 
-    private async Task ResaveItemAsFileAsync(DataItemNode node)
+        await MessageBoxWindowView.Show(_dialogService, string.Format("{0} is now saved as a file.", key), "Complete", MessageBoxWindowView.MessageBoxButtons.Ok);
+    }
+
+    public async Task ResaveItemAsPatch(string key)
     {
-        // GetEntry entryOp, CreateEntry createOp
-        // string entryNum = choices.ChosenAsset;
-        // if (DataManager.GetEntryDataModStatus(entryNum, dataType.ToString()) == DataManager.ModStatus.Base)
+        var modStatus = DataManager.GetEntryDataModStatus(key, DataType.ToString());
+    
+        if (modStatus == DataManager.ModStatus.Base)
+        {
+            await MessageBoxWindowView.Show(_dialogService, string.Format("{0} must have saved edits first!", key), "Error", MessageBoxWindowView.MessageBoxButtons.Ok);
+            return;
+        }
+    
+        if (modStatus == DataManager.ModStatus.Added)
+        {
+            await MessageBoxWindowView.Show(_dialogService, string.Format("{0} is newly added in this mod and cannot be saved as patch.", key), "Error", MessageBoxWindowView.MessageBoxButtons.Ok);
+            return;
+        }
+
+        lock (GameBase.lockObj)
+        {
+            var entry = DataRegistry.Map[DataType];
+            IEntryData data = entry.GetEntry(key);
+            DataManager.Instance.ContentResaved(DataType, key, data, true);
+        }
+
+        if (DataManager.GetEntryDataModStatus(key, DataType.ToString()) == DataManager.ModStatus.Base)
+            await MessageBoxWindowView.Show(_dialogService, string.Format("Modded {0} was identical to base. Unneeded patch removed.", key), "Complete", MessageBoxWindowView.MessageBoxButtons.Ok);
+        else
+            await MessageBoxWindowView.Show(_dialogService, string.Format("{0} is now saved as a patch.", key), "Complete", MessageBoxWindowView.MessageBoxButtons.Ok);
+    }
+    
+    
+}
+
+
+// For Skills, Zones, Monsters, Items, etc.
+// public class DataRootNode : ItemRootNode
+// {
+//     public DataManager.DataType DataType { get; }
+//
+//     private readonly NodeFactory _nodeFactory;
+//
+//     private readonly IDialogService _dialogService;
+//     
+//     public override ReactiveCommand<Unit, Unit> AddCommand { get; }
+//     public override ReactiveCommand<DataItemNode, Unit> DeleteCommand { get; }
+//
+//     public ReactiveCommand<Unit, Unit> ReIndexCommand { get; }
+//     public ReactiveCommand<Unit, Unit> ResaveAllAsFileCommand { get; }
+//     public ReactiveCommand<Unit, Unit> ResaveAllAsDiffCommand { get; }
+//
+//     public ReactiveCommand<string, Unit> ResaveAsFile { get; }
+//     public ReactiveCommand<string, Unit> ResaveAsPatch { get; }
+//
+//     public DataRootNode(NodeFactory nodeFactory, IDialogService dialogService, DataManager.DataType dataType,
+//         Type? editorType, string title, string? icon = null)
+//         : base(title, editorType, icon ?? "")
+//     {
+//         _nodeFactory = nodeFactory;
+//         _dialogService = dialogService;
+//         DataType = dataType;
+//
+//         AddCommand = ReactiveCommand.CreateFromTask(AddItemAsync);
+//         AddCommand.CanExecute.Subscribe(canExecute =>
+//             Console.WriteLine($"Add Command - CanExecute: {canExecute}"));
+//
+//         DeleteCommand = ReactiveCommand.CreateFromTask<DataItemNode>(DeleteItemAsync);
+//
+//         ReIndexCommand = ReactiveCommand.CreateFromTask(ReIndexAsync);
+//         ResaveAllAsFileCommand = ReactiveCommand.CreateFromTask(ResaveAllAsFileAsync);
+//         ResaveAllAsDiffCommand = ReactiveCommand.CreateFromTask(ResaveAllAsDiffAsync);
+//
+//
+//         ResaveAsFile = ReactiveCommand.CreateFromTask<string>(
+//             execute: async (key) => await ResaveItemAsFileAsync(key),
+//             canExecute: Observable.Return(true)
+//         );
+//         ResaveAsFile.ThrownExceptions.Subscribe(ex => Console.WriteLine(ex.Message));
+//         ResaveAsFile.IsExecuting.Subscribe(x => Console.WriteLine($"IsExecuting: {x}"));
+//         ResaveAsPatch = ReactiveCommand.CreateFromTask<string>(ResaveItemAsPatchAsync);
+//     }
+//
+//     protected override bool EqualsCore(NodeBase other)
+//     {
+//         if (other is not DataRootNode node)
+//             return false;
+//         return DataType == node.DataType && EditorType == node.EditorType;
+//     }
+//     protected override int GetHashCodeCore()
+//     {
+//         return EditorType.GetHashCode() ^ DataType.GetHashCode();;
+//     }
+//     
+//     private async Task AddItemAsync()
+//     {
+//         var vm = new RenameWindowViewModel();
+//         bool result = await _dialogService.ShowDialogAsync<RenameWindowViewModel, bool>(vm, $"Add new {DataType}");
+//
+//         if (!result)
+//             return;
+//
+//         SubNodes.Add(_nodeFactory.CreateDataItemNode<DevEditPageViewModel>(vm.Name, $"{vm.Name}:", "Icons.GhostFill"));
+//         IsExpanded = true;
+//         Console.WriteLine($"Added {DataType} item: {vm.Name}");
+//     }
+//
+//     private async Task DeleteItemAsync(DataItemNode? node)
+//     {
+//         if (node is null)
+//             return;
+//
+//         var res = await MessageBoxWindowView.Show(_dialogService,
+//             $"Deleting {node.ItemKey} will reset it back to the base game.", $"Delete {node.ItemKey}", MessageBoxWindowView.MessageBoxButtons.YesNo, true);
+//
+//         if (res != MessageBoxWindowView.MessageBoxResult.Yes)
+//             return;
+//
+//         SubNodes.Remove(node);
+//         Console.WriteLine($"Deleted {node.Title} of type {DataType}");
+//     }
+//
+//     private async Task ReIndexAsync()
+//     {
+//         Console.WriteLine($"Reindexing {DataType}...");
+//         await Task.Delay(100);
+//     }
+//
+//     private async Task ResaveAllAsFileAsync()
+//     {
+//         Console.WriteLine($"Resaving all {DataType} as file...");
+//         await Task.Delay(100);
+//     }
+//
+//     private async Task ResaveAllAsDiffAsync()
+//     {
+//         Console.WriteLine($"Resaving all {DataType} as diff...");
+//         await Task.Delay(100);
+//     }
+//     
+//     public async Task ResaveItemAsFileAsync(string key)
+//     {
+//         await Task.Run(async () =>
+//         {
+//             if (DataManager.GetEntryDataModStatus(key, DataType.ToString()) == DataManager.ModStatus.Base)
+//             {
+//                 await Dispatcher.UIThread.InvokeAsync(() =>
+//                     MessageBoxWindowView.Show(_dialogService,
+//                         string.Format("{0} must have saved edits first!", key), "Error", MessageBoxWindowView.MessageBoxButtons.Ok));
+//                 return;
+//             }
+//
+//             lock (GameBase.lockObj)
+//             {
+//                 var entry = DataRegistry.Map[DataType];
+//                 IEntryData data = entry.GetEntry(key);
+//                 DataManager.Instance.ContentResaved(DataType, key, data, false);
+//                 string newName = DataManager.Instance.DataIndices[DataType].Get(key).GetLocalString(true);
+//             }
+//
+//             await Dispatcher.UIThread.InvokeAsync(() =>
+//                 MessageBoxWindowView.Show(_dialogService,
+//                     string.Format("{0} is now saved as a file.", key), "Complete", MessageBoxWindowView.MessageBoxButtons.Ok));
+//         });
+//     }
+    // private async Task ResaveItemAsFileAsync(string key)
+    // {
+    //     Console.WriteLine("3");
+    //     
+    //     await Task.Yield(); // force off the calling context
+    //
+    //     Console.WriteLine("4");
+    //     await Task.Delay(1000).ConfigureAwait(false);
+    //     Console.WriteLine("5");
+        // if (DataManager.GetEntryDataModStatus(key, DataType.ToString()) == DataManager.ModStatus.Base)
         // {
-        //     await MessageBox.Show(form, String.Format("{0} must have saved edits first!", entryNum), "Error", MessageBox.MessageBoxButtons.Ok);
-        //     return;
+        //     await MessageBoxWindowView.Show(_dialogService,
+        //         string.Format("{0} must have saved edits first!", key), "Error", MessageBoxWindowView.MessageBoxButtons.Ok);
         // }
-        //
-        // lock (GameBase.lockObj)
+        // else
         // {
-        //     IEntryData data = entryOp(entryNum);
-        //     DataManager.Instance.ContentResaved(dataType, entryNum, data, false);
+        //     await Task.Run(() =>
+        //     {
+        //         lock (GameBase.lockObj)
+        //         {
+        //             var entry = DataRegistry.Map[DataType];
+        //             IEntryData data = entry.GetEntry(key);
+        //             DataManager.Instance.ContentResaved(DataType, key, data, false);
+        //             string newName = DataManager.Instance.DataIndices[DataType].Get(key).GetLocalString(true);
+        //         }
+        //     });
         //
-        //     string newName = DataManager.Instance.DataIndices[dataType].Get(entryNum).GetLocalString(true);
-        //     choices.ModifyEntry(entryNum, newName);
+        //     await MessageBoxWindowView.Show(_dialogService,
+        //         string.Format("{0} is now saved as a file.", key), "Complete", MessageBoxWindowView.MessageBoxButtons.Ok);
         // }
-        //
-        // await MessageBox.Show(form, String.Format("{0} is now saved as a file.", entryNum), "Complete", MessageBox.MessageBoxButtons.Ok);
-    }
+    // }
+
+
+    // private async Task ResaveItemAsFileAsync(string key)
+    // {
+    //     if (DataManager.GetEntryDataModStatus(key, DataType.ToString()) == DataManager.ModStatus.Base)
+    //     {
+    //         
+    //         
+    //        await MessageBoxWindowView.Show(_dialogService,
+    //             String.Format("{0} must have saved edits first!", key), "Errir", MessageBoxWindowView.MessageBoxButtons.Ok);
+    //        
+    //        return;
+    //     }
+    //     
+    //     // Do the locked work synchronously, outside of any await
+    //     await Task.Run(() =>
+    //     {
+    //         lock (GameBase.lockObj)
+    //         {
+    //             var entry = DataRegistry.Map[DataType];
+    //             IEntryData data = entry.GetEntry(key);
+    //             DataManager.Instance.ContentResaved(DataType, key, data, false);
+    //
+    //             string newName = DataManager.Instance.DataIndices[DataType].Get(key).GetLocalString(true);
+    //             // choices.ModifyEntry(entryNum, newName);
+    //         }
+    //     });
+    //
+    //     // lock (GameBase.lockObj)
+    //     // {
+    //     //
+    //     //     var entry = DataRegistry.Map[DataType];
+    //     //     IEntryData data = entry.GetEntry(key);
+    //     //     DataManager.Instance.ContentResaved(DataType, key, data, false);
+    //     //
+    //     //     string newName = DataManager.Instance.DataIndices[DataType].Get(key).GetLocalString(true);
+    //     //
+    //     // }
+    //
+    //                
+    //     await MessageBoxWindowView.Show(_dialogService,
+    //         String.Format("{0} is now saved as a file.", key), "Complete", MessageBoxWindowView.MessageBoxButtons.Ok);
+    // }
 
-    private async Task ResaveItemAsPatchAsync(DataItemNode node)
-    {
-        Console.WriteLine($"Resaving {node.Title} as patch...");
-        await Task.Delay(100);
-    }
-}
+
+// }
+
+// Children of the DataRootNode
 
 public class DataItemNode : OpenEditorNode
 {
@@ -320,19 +626,27 @@ public DataItemNode(string itemKey, Type? editorType, string? title, string? ico
     {
         ItemKey = itemKey;
     }
+    
+    protected override bool EqualsCore(NodeBase other)
+    {
+        if (other is not DataItemNode node)
+            return false;
+        return ItemKey == node.ItemKey && EditorType == node.EditorType;
+    }
+    protected override int GetHashCodeCore()
+    {
+        return EditorType.GetHashCode() ^ ItemKey.GetHashCode();
+    }
 }
 
+// SpriteRootNode have additional properties like mass exporting
 public class SpriteRootNode : ItemRootNode
 {
     private readonly ISpriteOperationStrategy _strategy;
     
     public readonly GraphicsManager.AssetType AssetType;
-    private readonly NodeFactory _nodeFactory;
-    private readonly IDialogService _dialogService;
-
-    public override ReactiveCommand<Unit, Unit> AddCommand { get; }
-    public override ReactiveCommand<DataItemNode, Unit> DeleteCommand { get; }
 
+    
     public ReactiveCommand<Unit, Unit> MassExportCommand { get; }
     public ReactiveCommand<Unit, Unit> MassImportCommand { get; }
     public ReactiveCommand<DataItemNode, Unit> ExportCommand { get; }
@@ -369,9 +683,7 @@ public SpriteRootNode(
             _strategy = new SpriteAssetTypeStrategy(dialogService, nodeFactory, this);
             
         }
-
-        AddCommand = ReactiveCommand.CreateFromTask(AddSpriteAsync);
-        DeleteCommand = ReactiveCommand.CreateFromTask<DataItemNode>(DeleteSpriteAsync);
+        
         MassExportCommand = ReactiveCommand.CreateFromTask(MassExportAsync);
         MassImportCommand = ReactiveCommand.CreateFromTask(MassImportAsync);
         ExportCommand = ReactiveCommand.CreateFromTask<DataItemNode>(ExportSpriteAsync);
@@ -379,14 +691,14 @@ public SpriteRootNode(
         ReImportCommand = ReactiveCommand.CreateFromTask(ReImportSpriteAsync);
     }
 
-    private async Task AddSpriteAsync()
+    public override async Task AddItem()
     {
         await _strategy.ImportAsync();
     }
 
-    private async Task DeleteSpriteAsync(DataItemNode node)
+    public override async Task DeleteItem(string key)
     {
-        await _strategy.DeleteAsync(node);
+        // await _strategy.DeleteAsync(node);
     }
 
     private async Task MassExportAsync()
@@ -483,20 +795,16 @@ public class ModRootNode : ItemRootNode
     private readonly NodeFactory _nodeFactory;
 
     private readonly IDialogService _dialogService;
-    public override ReactiveCommand<Unit, Unit> AddCommand { get; }
-    public override ReactiveCommand<DataItemNode, Unit> DeleteCommand { get; }
     public ModRootNode(NodeFactory nodeFactory, IDialogService dialogService,
         Type? editorType, string title, string? icon = null)
         : base(title, editorType, icon ?? "")
     {
         _nodeFactory = nodeFactory;
         _dialogService = dialogService;
-
-        AddCommand = ReactiveCommand.CreateFromTask(AddItemAsync);
-        DeleteCommand = ReactiveCommand.CreateFromTask<DataItemNode>(DeleteItemAsync);
+        
     }
 
-    private async Task AddItemAsync()
+    public override async Task AddItem()
     {
         ModHeader header = new ModHeader("", "", "", "", "", Guid.NewGuid(), new Version(), new Version(), PathMod.ModType.Mod, new RelatedMod[0] { });
         var vm = new ModConfigWindowViewModel(header);
@@ -510,7 +818,7 @@ private async Task AddItemAsync()
         // Console.WriteLine($"Added {DataType} item: {vm.Name}");
     }
 
-    private async Task DeleteItemAsync(DataItemNode? node)
+    public override async Task DeleteItem(string key)
     {
         // if (node is null)
         //     return;
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/TabSwitcherViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/TabSwitcherViewModel.cs
index 3c6c95ff..37e9ed9e 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/TabSwitcherViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/TabSwitcherViewModel.cs
@@ -72,7 +72,6 @@ public void Switch()
     public ObservableCollection<PageNode> TopLevelPages 
         => _mainWindow.TopLevelPages;
     
-    // Do it for both the tab list and the tab tree view!
     private void UpdateVisiblePages(string filter)
     {
         var strategy = new BeginningTitleFilterStrategy();
diff --git a/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml b/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml
index 55a99282..dc30d4a5 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml
@@ -150,12 +150,7 @@
                                   ShowColumnHeaders="False"
                                   Source="{Binding NodeSource}">
                         <TreeDataGrid.Resources>
-                            <!-- <DataTemplate x:Key="TreeDataGridNodeBaseTemplate"> -->
-                            <!--     <TreeDataGridExpander -->
-                            <!--         IsExpanded="{Binding IsExpanded, Mode=TwoWay}"> -->
-                            <!--         <TextBlock Text="{Binding Title}" /> -->
-                            <!--     </TreeDataGridExpander> -->
-                            <!-- </DataTemplate> -->
+                    
                             <DataTemplate x:Key="TreeDataGridNodeBaseTemplate" DataType="vm:NodeBase">
                                 <ContentControl Content="{Binding}">
                                     <ContentControl.DataTemplates>
@@ -199,7 +194,7 @@
                                                     <Path Stretch="Fill"
                                                           Fill="{DynamicResource Brush.FG1}"
                                                           Width="12" Height="12"
-                                                          Data="{StaticResource Icons.TrashFill}" />
+                                                          Data="{StaticResource Icons.Minus}" />
                                                 </Button>
                                             </Grid>
                                         </DataTemplate>
@@ -243,13 +238,29 @@
 
                 </Border>
 
-                <!-- Editor Content -->
-                <Panel Grid.Row="1" Background="{DynamicResource Brush.PageBackground}">
-                    <ContentControl Content="{Binding TemporaryTab}"
-                                    IsVisible="{Binding TemporaryTab, Converter={x:Static ObjectConverters.IsNotNull}}" />
-                    <ContentControl Content="{Binding ActivePage}"
-                                    IsVisible="{Binding TemporaryTab, Converter={x:Static ObjectConverters.IsNull}}" />
-                </Panel>
+      <!-- Editor Content -->
+<Panel Grid.Row="1" Background="{DynamicResource Brush.PageBackground}">
+    
+    <!-- Temporary tab still uses ContentControl since it's transient -->
+    <ContentControl Content="{Binding TemporaryTab}"
+                    IsVisible="{Binding TemporaryTab, Converter={x:Static ObjectConverters.IsNotNull}}" />
+    
+    <!-- All permanent pages kept alive, just toggling visibility -->
+    <ItemsControl ItemsSource="{Binding Pages}"
+                  IsVisible="{Binding TemporaryTab, Converter={x:Static ObjectConverters.IsNull}}">
+        <ItemsControl.ItemsPanel>
+            <ItemsPanelTemplate>
+                <Panel/>
+            </ItemsPanelTemplate>
+        </ItemsControl.ItemsPanel>
+        <ItemsControl.ItemTemplate>
+            <DataTemplate>
+                <ContentControl Content="{Binding}" IsVisible="{Binding IsActive}"/>
+            </DataTemplate>
+        </ItemsControl.ItemTemplate>
+    </ItemsControl>
+    
+</Panel>
             </Grid>
         </Grid>
 
diff --git a/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml.cs b/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml.cs
index 4d3d70d5..43e40c51 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml.cs
@@ -19,6 +19,7 @@
 using Microsoft.Xna.Framework;
 using RogueEssence.Content;
 using RogueEssence.Data;
+using RogueEssence.Dev.Utility;
 using RogueEssence.Dev.ViewModels;
 using RogueEssence.Dungeon;
 
@@ -119,10 +120,11 @@ private void reload(DataManager.DataType dataType)
                     devViewModel.Travel.ReloadZones();
 
                 if (dataType == DataManager.DataType.All)
+                {
                     devViewModel.UpdateMod();
-                
-                Console.WriteLine("Dev Editor Reloaded!");
-                devViewModel.LoadDevTree();
+                    devViewModel.LoadDevTree();
+                }
+
                 LoadComplete = true;
                 
             }
@@ -538,53 +540,58 @@ protected override void OnClosing(WindowClosingEventArgs e)
     private void ShowDataItemNodeMenu(TreeDataGridRow current, DataItemNode node, DataRootNode parentNode,
         ContextRequestedEventArgs e)
     {
-        var menu = new ContextMenu
-        {
-            Items =
-            {
-                new MenuItem { Header = "Resave as File", Command = parentNode.ResaveAsFile, CommandParameter = node, Icon = App.CreateMenuIcon("Icons.FileFill") },
-                new MenuItem
-                    { Header = "Resave as Patch", Command = parentNode.ResaveAsPatch, CommandParameter = node, Icon = App.CreateMenuIcon("Icons.FileTextFill") },
-                new Separator(),
-                new MenuItem { Header = "Edit", Icon = App.CreateMenuIcon("Icons.PencilFill") },
-                new MenuItem { Header = "Delete", Command = parentNode.DeleteCommand, CommandParameter = node,  Icon = App.CreateMenuIcon("Icons.TrashFill") }
-            }
-        };
+        
+        var contextMenu = ContextMenuHelper.CreateDataItemMenu(parentNode, node.ItemKey);
 
-        AttachAndOpenMenu(current, menu, e);
+        // contextMenu.Open(this);
+        
+        // var menu = new ContextMenu
+        // {
+        //     Items =
+        //     {
+        //         new MenuItem { Header = "Resave as File", Command = parentNode.ResaveItemAsFile, CommandParameter = node.ItemKey, Icon = App.CreateMenuIcon("Icons.FileFill") },
+        //         new MenuItem
+        //             { Header = "Resave as Patch", Command = parentNode.ResaveAsPatch, CommandParameter = node, Icon = App.CreateMenuIcon("Icons.FileTextFill") },
+        //         new Separator(),
+        //         new MenuItem { Header = "Edit", Icon = App.CreateMenuIcon("Icons.PencilFill") },
+        //         new MenuItem { Header = "Delete", Command = parentNode.DeleteCommand, CommandParameter = node,  Icon = App.CreateMenuIcon("Icons.TrashFill") }
+        //     }
+        // };
+        
+        AttachAndOpenMenu(current, contextMenu, e);
     }
 
     private void ShowSpriteItemNodeMenu(TreeDataGridRow current, DataItemNode node, SpriteRootNode parentNode,
         ContextRequestedEventArgs e)
     {
-        var menu = new ContextMenu
-        {
-            Items =
-            {
-                new MenuItem { Header = "Export", Command = parentNode.ExportCommand, CommandParameter = node, Icon = App.CreateMenuIcon("Icons.ExportFill") },
-                new Separator(),
-                new MenuItem { Header = "Delete", Command = parentNode.DeleteCommand, CommandParameter = node, Icon =  App.CreateMenuIcon("Icons.TrashFill") }
-            }
-        };
-
-        AttachAndOpenMenu(current, menu, e);
+        // var menu = new ContextMenu
+        // {
+        //     Items =
+        //     {
+        //         new MenuItem { Header = "Export", Command = parentNode.ExportCommand, CommandParameter = node, Icon = App.CreateMenuIcon("Icons.ExportFill") },
+        //         new Separator(),
+        //         new MenuItem { Header = "Delete", Command = parentNode.DeleteCommand, CommandParameter = node, Icon =  App.CreateMenuIcon("Icons.TrashFill") }
+        //     }
+        // };
+
+        // AttachAndOpenMenu(current, menu, e);
     }
 
     private void ShowRootNodeMenu(TreeDataGridRow current, DataRootNode root, ContextRequestedEventArgs e)
     {
-        var menu = new ContextMenu
-        {
-            Items =
-            {
-                new MenuItem { Header = "Re-Index", Command = root.ReIndexCommand, Icon = App.CreateMenuIcon("Icons.ListNumbersFill") },
-                new MenuItem { Header = "Resave all as File", Command = root.ResaveAllAsFileCommand, Icon = App.CreateMenuIcon("Icons.FileFill") },
-                new MenuItem { Header = "Resave all as Diff", Command = root.ResaveAllAsDiffCommand, Icon = App.CreateMenuIcon("Icons.PlusMinusFill") },
-                new Separator(),
-                new MenuItem { Header = "Add", Command = root.AddCommand, Icon = App.CreateMenuIcon("Icons.Plus") }
-            }
-        };
-
-        AttachAndOpenMenu(current, menu, e);
+        // var menu = new ContextMenu
+        // {
+        //     Items =
+        //     {
+        //         new MenuItem { Header = "Re-Index", Command = root.ReIndexCommand, Icon = App.CreateMenuIcon("Icons.ListNumbersFill") },
+        //         new MenuItem { Header = "Resave all as File", Command = root.ResaveAllAsFileCommand, Icon = App.CreateMenuIcon("Icons.FileFill") },
+        //         new MenuItem { Header = "Resave all as Diff", Command = root.ResaveAllAsDiffCommand, Icon = App.CreateMenuIcon("Icons.PlusMinusFill") },
+        //         new Separator(),
+        //         new MenuItem { Header = "Add", Command = root.AddCommand, Icon = App.CreateMenuIcon("Icons.Plus") }
+        //     }
+        // };
+        //
+        // AttachAndOpenMenu(current, menu, e);
     }
     
     private void ShowSpriteRootNodeMenu(TreeDataGridRow current, SpriteRootNode root, ContextRequestedEventArgs e)
@@ -650,8 +657,7 @@ private void LeftTreeDataGrid_OnContextRequested(object? sender, ContextRequeste
             return;
         
         var parent = node.Parent;
-   
-    
+        
         switch (node)
         {
             case DataItemNode itemNode when parent is DataRootNode root:
@@ -676,6 +682,7 @@ private async void LeftTreeDataGrid_OnLoaded(object sender, RoutedEventArgs e)
     {
     }
 
+    // Show the sprite in-game when the user clicks on the sprite node in the tree
     private void LeftTreeDataGrid_OnPointerPressed(object? sender, PointerPressedEventArgs e)
     {
         if (sender is not TreeDataGrid treeDataGrid)
@@ -716,7 +723,7 @@ node.Parent is SpriteRootNode parent &&
     private void LeftTreeDataGrid_OnLostFocus(object sender, RoutedEventArgs e)
     {
         
-        if (!(sender is TreeDataGrid grid))
+        if (sender is not TreeDataGrid grid)
             return;
         
         
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/DataListPageView.axaml b/RogueEssence.Editor.Avalonia/Views/New/Editors/DataListPageView.axaml
index 452c09ee..aa11d262 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/Editors/DataListPageView.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/New/Editors/DataListPageView.axaml
@@ -6,5 +6,127 @@
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:DataType="vm:DataListPageViewModel"
              x:Class="RogueEssence.Dev.Views.DataListPageView">
-    Welcome to ZoneEditor
-</UserControl>
+
+    <Design.DataContext>
+        <vm:DataListPageViewModel />
+    </Design.DataContext>
+
+    <!-- // var menu = new ContextMenu -->
+    <!-- // { -->
+    <!-- //     Items = -->
+    <!-- //     { -->
+    <!-- //         new MenuItem { Header = "Re-Index", Command = root.ReIndexCommand, Icon = App.CreateMenuIcon("Icons.ListNumbersFill") }, -->
+    <!-- //         new MenuItem { Header = "Resave all as File", Command = root.ResaveAllAsFileCommand, Icon = App.CreateMenuIcon("Icons.FileFill") }, -->
+    <!-- //         new MenuItem { Header = "Resave all as Diff", Command = root.ResaveAllAsDiffCommand, Icon = App.CreateMenuIcon("Icons.PlusMinusFill") }, -->
+    <!-- //         new Separator(), -->
+    <!-- //         new MenuItem { Header = "Add", Command = root.AddCommand, Icon = App.CreateMenuIcon("Icons.Plus") } -->
+    <!-- //     } -->
+    <!-- // }; -->
+    <!-- // -->
+    <!-- // AttachAndOpenMenu(current, menu, e); -->
+    <Grid RowDefinitions="Auto, 32, Auto, Auto">
+
+
+        <DockPanel Grid.Row="0" VerticalAlignment="Top">
+            <Menu x:Name="DataListPageViewEditMenu" DockPanel.Dock="Left"
+                  ContextRequested="DataListPageViewEditMenu_OnContextRequested">
+                <!-- <Menu.Styles> -->
+                <!--     <Style Selector="MenuItem"> -->
+                <!--         <Setter Property="Theme" Value="{DynamicResource CustomMenuItemTheme}" /> -->
+                <!--     </Style> -->
+                <!-- </Menu.Styles> -->
+
+
+                <Menu DockPanel.Dock="Top">
+
+
+                    <MenuItem Header="Edit" ItemsSource="{Binding EditMenuItems}">
+                        <MenuItem.DataTemplates>
+                            <!-- <Menu.DataTemplates> -->
+                            <DataTemplate x:DataType="vm:DataOpContainer">
+                                <MenuItem Header="{Binding Name}"
+                                          Command="{Binding Command}" />
+                            </DataTemplate>
+
+                            <!-- </Menu.DataTemplates> -->
+                        </MenuItem.DataTemplates>
+
+
+                    </MenuItem>
+
+                    <!-- <Menu DockPanel.Dock="Top" ItemsSource="{Binding OpList}"> -->
+                    <!--     <Menu.Styles> -->
+                    <!--         <Style Selector="MenuItem"> -->
+                    <!--             <Setter Property="Header" Value="{Binding Name}"/> -->
+                    <!--             <Setter Property="Command" Value="{Binding Command}"/> -->
+                    <!--             <Setter Property="ItemsSource" Value="{Binding Items}"/> -->
+                    <!--         </Style> -->
+                    <!--     </Menu.Styles> -->
+                    <!-- </Menu> -->
+                    <!--   -->
+                    <!-- <Menu.Styles> -->
+                    <!--   <Style Selector="MenuItem"> -->
+                    <!--     <Setter Property="Header" Value="{Binding Name}"/> -->
+                    <!--     <Setter Property="Command" Value="{Binding Command}"/> -->
+                    <!--     <Setter Property="ItemsSource" Value="{Binding Items}"/> -->
+                    <!--   </Style> -->
+                    <!-- </Menu.Styles> -->
+                </Menu>
+
+            </Menu>
+        </DockPanel>
+        <TextBlock Grid.Row="2" HorizontalAlignment="Center" Classes="table_header" FontSize="16"
+                   Text="{Binding Node.DataType}" />
+
+        <!-- Search Grid -->
+        <Grid Grid.Row="3" RowDefinitions="Auto, 16, Auto, 12, Auto" Margin="64, 8" MinWidth="600">
+
+            <TextBox Grid.Row="0"
+                     Height="24"
+                     x:Name="TabSwitcherTextBox"
+                     HorizontalAlignment="Stretch"
+                     Margin="0"
+                     BorderThickness="1"
+                     CornerRadius="0"
+                     Watermark="Search..."
+                     Text="{Binding SearchFilter, Mode=TwoWay}"
+                     BorderBrush="{DynamicResource Brush.Border2}"
+                     VerticalContentAlignment="Center">
+                <TextBox.InnerLeftContent>
+                    <Path
+                        Fill="{DynamicResource Brush.FG2}"
+                        Width="14" Height="14"
+                        Margin="6,1,0,0"
+                        Data="{StaticResource Icons.MagnifyingGlassFill}" />
+                </TextBox.InnerLeftContent>
+            </TextBox>
+
+            <ListBox Grid.Row="2"
+                     ContextRequested="DataListPageListBox_OnContextRequested"
+                     Background="{DynamicResource Brush.Contents}"
+                     x:Name="DataListPageListBox" SelectedItem="{Binding SelectedItem}"
+                     ItemsSource="{Binding FilteredItems}" Height="400" BorderBrush="{DynamicResource Brush.Border2}"
+                     BorderThickness="1" DoubleTapped="DataListPageListBox_OnDoubleTapped">
+                <ListBox.Styles>
+                    <Style Selector="ListBoxItem">
+                        <Setter Property="Background" Value="{DynamicResource Brush.Contents}" />
+                    </Style>
+                </ListBox.Styles>
+                <ListBox.ItemTemplate>
+                    <DataTemplate>
+                        <TextBlock Text="{Binding Title}" Padding="4" />
+                    </DataTemplate>
+                </ListBox.ItemTemplate>
+            </ListBox>
+
+            <StackPanel Grid.Row="4" Orientation="Horizontal" HorizontalAlignment="Right" Spacing="4">
+                <Button Command="{Binding AddItem}" Classes="secondary" Margin="0, 0" Padding="4,3, 4, 3">
+                    <Path Width="14" Height="14" Data="{StaticResource Icons.Plus}" />
+                </Button>
+                <Button Command="{Binding DeleteItem}" Classes="secondary" Margin="0, 0" Padding="4,3, 4, 3">
+                    <Path Width="14" Height="14" Data="{StaticResource Icons.Minus}" />
+                </Button>
+            </StackPanel>
+        </Grid>
+    </Grid>
+</UserControl>
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/DataListPageView.axaml.cs b/RogueEssence.Editor.Avalonia/Views/New/Editors/DataListPageView.axaml.cs
index 9cbf998c..c700521a 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/Editors/DataListPageView.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/New/Editors/DataListPageView.axaml.cs
@@ -1,6 +1,11 @@
+using System;
 using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Input;
 using Avalonia.Markup.Xaml;
+using Avalonia.Threading;
+using RogueEssence.Dev.Utility;
+using RogueEssence.Dev.ViewModels;
 
 namespace RogueEssence.Dev.Views;
 
@@ -10,4 +15,38 @@ public DataListPageView()
     {
         InitializeComponent();
     }
+
+
+    private void DataListPageListBox_OnDoubleTapped(object sender, TappedEventArgs e)
+    {
+        if (DataContext is DataListPageViewModel vm)
+            vm.AddUnderParentNode(vm.SelectedItem);
+    }
+
+
+    private void DataListPageListBox_OnContextRequested(object sender, ContextRequestedEventArgs e)
+    {
+        if (e.Source is not Visual)
+            return;
+
+        if (sender is not ListBox listBox || listBox.SelectedItem is not DataListEntry entry ||
+            listBox.DataContext is not DataListPageViewModel vm)
+            return;
+
+        var contextMenu = ContextMenuHelper.CreateDataItemMenu(vm.Node, entry.Key);
+        contextMenu.Open(this);
+    }
+
+    private void DataListPageViewEditMenu_OnContextRequested(object sender, ContextRequestedEventArgs e)
+    {
+        if (e.Source is not Visual)
+            return;
+
+        if (sender is not ListBox listBox || listBox.SelectedItem is not DataListEntry entry ||
+            listBox.DataContext is not DataListPageViewModel vm)
+            return;
+
+        var contextMenu = ContextMenuHelper.CreateDataItemMenu(vm.Node, entry.Key);
+        contextMenu.Open(this);
+    }
 }
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/DevControl/DevControlView.axaml b/RogueEssence.Editor.Avalonia/Views/New/Editors/DevControl/DevControlView.axaml
index 91327c95..0cdcbb18 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/Editors/DevControl/DevControlView.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/New/Editors/DevControl/DevControlView.axaml
@@ -10,9 +10,9 @@
              x:Class="RogueEssence.Dev.Views.DevControlView">
     
     
-    <UserControl.DataContext>
+    <Design.DataContext>
         <vm:DevControlViewModel/>
-    </UserControl.DataContext>
+    </Design.DataContext>
     <!-- The Game/Player/Travel/Script Tabs will be moved inside here... -->
 
     
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/ReflectedDataPageView.axaml b/RogueEssence.Editor.Avalonia/Views/New/Editors/ReflectedDataPageView.axaml
new file mode 100644
index 00000000..3153b698
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/Views/New/Editors/ReflectedDataPageView.axaml
@@ -0,0 +1,10 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:vm="using:RogueEssence.Dev.ViewModels"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:DataType="vm:ReflectedDataPageViewModel"
+             x:Class="RogueEssence.Dev.Views.ReflectedDataPageView">
+    Welcome to Reflection
+</UserControl>
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/ReflectedDataPageView.axaml.cs b/RogueEssence.Editor.Avalonia/Views/New/Editors/ReflectedDataPageView.axaml.cs
new file mode 100644
index 00000000..6fb3da5a
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/Views/New/Editors/ReflectedDataPageView.axaml.cs
@@ -0,0 +1,13 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace RogueEssence.Dev.Views;
+
+public partial class ReflectedDataPageView : UserControl
+{
+    public ReflectedDataPageView()
+    {
+        InitializeComponent();
+    }
+}
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/SpeciesEditPageView.axaml b/RogueEssence.Editor.Avalonia/Views/New/Editors/SpeciesEditPageView.axaml
index b24d6951..df43bcab 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/Editors/SpeciesEditPageView.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/New/Editors/SpeciesEditPageView.axaml
@@ -3,141 +3,161 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:vm="using:RogueEssence.Dev.ViewModels"
+             xmlns:v="clr-namespace:RogueEssence.Dev.Views"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:DataType="vm:SpeciesEditPageViewModel"
+             
              xmlns:converters="clr-namespace:RogueEssence.Dev.Converters"
              x:Class="RogueEssence.Dev.Views.SpeciesEditPageView">
-    <!-- <UserControl.DataContext> -->
-    <!--     <vm:SpeciesEditPageViewModel/> -->
-    <!-- </UserControl.DataContext> -->
+    <Design.DataContext>
+        <vm:SpeciesEditPageViewModel/>
+    </Design.DataContext>
     <UserControl.Resources>
         <converters:OXConverter x:Key="OXConverter" />
     </UserControl.Resources>
-    <DockPanel>
-        <Menu DockPanel.Dock="Top">
-            <MenuItem Header="_Edit">
-                <MenuItem.Styles>
-                    <Style Selector="MenuItem">
-                        <Setter Property="Template">
-                            <ControlTemplate>
-                                <Panel>
-                                    <Border Name="PART_LayoutRoot"
-                                            Padding="{TemplateBinding Padding}"
-                                            Background="{TemplateBinding Background}"
-                                            BorderBrush="{TemplateBinding BorderBrush}"
-                                            BorderThickness="{TemplateBinding BorderThickness}"
-                                            CornerRadius="{TemplateBinding CornerRadius}">
-                                        <Grid>
-                                            <Grid.ColumnDefinitions>
-                                                <ColumnDefinition Width="Auto"
-                                                                  SharedSizeGroup="ToggleIcon" />
-                                                <ColumnDefinition Width="Auto"
-                                                                  SharedSizeGroup="MenuItemIcon" />
-                                                <ColumnDefinition Width="*" />
-                                                <ColumnDefinition Width="Auto"
-                                                                  SharedSizeGroup="MenuItemIGT" />
-                                            </Grid.ColumnDefinitions>
+    <Grid RowDefinitions="Auto, 32, Auto Auto">
+        <DockPanel>
+            <Menu DockPanel.Dock="Top">
+                <MenuItem Header="_Edit">
+                    <MenuItem.Styles>
+                        <Style Selector="MenuItem">
+                            <Setter Property="Template">
+                                <ControlTemplate>
+                                    <Panel>
+                                        <Border Name="PART_LayoutRoot"
+                                                Padding="{TemplateBinding Padding}"
+                                                Background="{TemplateBinding Background}"
+                                                BorderBrush="{TemplateBinding BorderBrush}"
+                                                BorderThickness="{TemplateBinding BorderThickness}"
+                                                CornerRadius="{TemplateBinding CornerRadius}">
+                                            <Grid>
+                                                <Grid.ColumnDefinitions>
+                                                    <ColumnDefinition Width="Auto"
+                                                                      SharedSizeGroup="ToggleIcon" />
+                                                    <ColumnDefinition Width="Auto"
+                                                                      SharedSizeGroup="MenuItemIcon" />
+                                                    <ColumnDefinition Width="*" />
+                                                    <ColumnDefinition Width="Auto"
+                                                                      SharedSizeGroup="MenuItemIGT" />
+                                                </Grid.ColumnDefinitions>
 
-                                            <ContentControl Grid.Column="0"
-                                                            x:Name="PART_ToggleIconPresenter"
-                                                            IsVisible="False"
-                                                            Theme="{StaticResource FluentMenuItemIconTheme}"
-                                                            Margin="{DynamicResource MenuIconPresenterMargin}" />
+                                                <ContentControl Grid.Column="0"
+                                                                x:Name="PART_ToggleIconPresenter"
+                                                                IsVisible="False"
+                                                                Theme="{StaticResource FluentMenuItemIconTheme}"
+                                                                Margin="{DynamicResource MenuIconPresenterMargin}" />
 
-                                            <ContentControl Grid.Column="1"
-                                                            x:Name="PART_IconPresenter"
-                                                            IsVisible="False"
-                                                            Theme="{StaticResource FluentMenuItemIconTheme}"
-                                                            Content="{TemplateBinding Icon}"
-                                                            Margin="{DynamicResource MenuIconPresenterMargin}" />
+                                                <ContentControl Grid.Column="1"
+                                                                x:Name="PART_IconPresenter"
+                                                                IsVisible="False"
+                                                                Theme="{StaticResource FluentMenuItemIconTheme}"
+                                                                Content="{TemplateBinding Icon}"
+                                                                Margin="{DynamicResource MenuIconPresenterMargin}" />
 
-                                            <ContentPresenter Name="PART_HeaderPresenter"
-                                                              Content="{TemplateBinding Header}"
-                                                              ContentTemplate="{TemplateBinding HeaderTemplate}"
-                                                              VerticalAlignment="Center"
-                                                              HorizontalAlignment="Stretch"
-                                                              Grid.Column="2" />
-                                            <TextBlock x:Name="PART_InputGestureText"
-                                                       Grid.Column="3"
-                                                       Margin="{DynamicResource MenuInputGestureTextMargin}"
-                                                       Text="{TemplateBinding InputGesture, Converter={StaticResource KeyGestureConverter}}"
-                                                       HorizontalAlignment="Right"
-                                                       VerticalAlignment="Center"
-                                                       Foreground="{DynamicResource MenuFlyoutItemKeyboardAcceleratorTextForeground}" />
-                                        </Grid>
-                                    </Border>
-                                    <Popup Name="PART_Popup"
-                                           WindowManagerAddShadowHint="False"
-                                           Placement="RightEdgeAlignedTop"
-                                           MaxHeight="400"
-                                           IsLightDismissEnabled="False"
-                                           HorizontalOffset="-4"
-                                           VerticalOffset="-4"
-                                           IsOpen="{TemplateBinding IsSubMenuOpen, Mode=TwoWay}">
-                                        <Grid>
-                                            <Border Background="{DynamicResource Brush.Popup}" Margin="4"
-                                                    CornerRadius="{DynamicResource OverlayCornerRadius}">
-                                                <Border.Effect>
-                                                    <DropShadowEffect OffsetX="0" OffsetY="0" Color="Black"
-                                                                      BlurRadius="4" Opacity=".6" />
-                                                </Border.Effect>
-                                            </Border>
+                                                <ContentPresenter Name="PART_HeaderPresenter"
+                                                                  Content="{TemplateBinding Header}"
+                                                                  ContentTemplate="{TemplateBinding HeaderTemplate}"
+                                                                  VerticalAlignment="Center"
+                                                                  HorizontalAlignment="Stretch"
+                                                                  Grid.Column="2" />
+                                                <TextBlock x:Name="PART_InputGestureText"
+                                                           Grid.Column="3"
+                                                           Margin="{DynamicResource MenuInputGestureTextMargin}"
+                                                           Text="{TemplateBinding InputGesture, Converter={StaticResource KeyGestureConverter}}"
+                                                           HorizontalAlignment="Right"
+                                                           VerticalAlignment="Center"
+                                                           Foreground="{DynamicResource MenuFlyoutItemKeyboardAcceleratorTextForeground}" />
+                                            </Grid>
+                                        </Border>
+                                        <Popup Name="PART_Popup"
+                                               WindowManagerAddShadowHint="False"
+                                               Placement="RightEdgeAlignedTop"
+                                               MaxHeight="400"
+                                               IsLightDismissEnabled="False"
+                                               HorizontalOffset="-4"
+                                               VerticalOffset="-4"
+                                               IsOpen="{TemplateBinding IsSubMenuOpen, Mode=TwoWay}">
+                                            <Grid>
+                                                <Border Background="{DynamicResource Brush.Popup}" Margin="4"
+                                                        CornerRadius="{DynamicResource OverlayCornerRadius}">
+                                                    <Border.Effect>
+                                                        <DropShadowEffect OffsetX="0" OffsetY="0" Color="Black"
+                                                                          BlurRadius="4" Opacity=".6" />
+                                                    </Border.Effect>
+                                                </Border>
 
-                                            <Border BorderThickness="0" Margin="8,4" MaxHeight="400">
-                                                <ScrollViewer Theme="{StaticResource FluentMenuScrollViewer}">
-                                                    <ItemsPresenter Name="PART_ItemsPresenter"
-                                                                    Margin="{DynamicResource MenuFlyoutScrollerMargin}"
-                                                                    Grid.IsSharedSizeScope="True">
-                                                        <ItemsPresenter.ItemsPanel>
-                                                            <ItemsPanelTemplate>
-                                                                <VirtualizingStackPanel Orientation="Vertical" />
-                                                            </ItemsPanelTemplate>
-                                                        </ItemsPresenter.ItemsPanel>
-                                                    </ItemsPresenter>
-                                                </ScrollViewer>
-                                            </Border>
-                                        </Grid>
-                                    </Popup>
-                                </Panel>
-                            </ControlTemplate>
-                        </Setter>
-                    </Style>
+                                                <Border BorderThickness="0" Margin="8,4" MaxHeight="400">
+                                                    <ScrollViewer Theme="{StaticResource FluentMenuScrollViewer}">
+                                                        <ItemsPresenter Name="PART_ItemsPresenter"
+                                                                        Margin="{DynamicResource MenuFlyoutScrollerMargin}"
+                                                                        Grid.IsSharedSizeScope="True">
+                                                            <ItemsPresenter.ItemsPanel>
+                                                                <ItemsPanelTemplate>
+                                                                    <VirtualizingStackPanel Orientation="Vertical" />
+                                                                </ItemsPanelTemplate>
+                                                            </ItemsPresenter.ItemsPanel>
+                                                        </ItemsPresenter>
+                                                    </ScrollViewer>
+                                                </Border>
+                                            </Grid>
+                                        </Popup>
+                                    </Panel>
+                                </ControlTemplate>
+                            </Setter>
+                        </Style>
+
+                    </MenuItem.Styles>
+                    <MenuItem Header="Mass Import" Command="{Binding mnuMassImport_Click}" />
+                    <MenuItem Header="Re-Index" Command="{Binding mnuReIndex_Click}" />
+                    <Separator />
+                    <MenuItem Header="Mass Export" Command="{Binding mnuMassExport_Click}" />
+                    <MenuItem Header="Mass Export Multi Sheet" Command="{Binding mnuMassExportMulti_Click}" />
+                </MenuItem>
+            </Menu>
+        </DockPanel>
+        <TextBlock Grid.Row="2" HorizontalAlignment="Center" Classes="table_header" FontSize="16" Text="{Binding HeaderText}"/>
+        
+        <!-- Text="{Binding SearchFilter, Mode=TwoWay}" -->
+        <!-- Search Grid -->
+        <Grid Grid.Row="3" RowDefinitions="Auto, 16, Auto, 32, Auto" Margin="64, 8" MinWidth="600">
+            
+            <TextBox Grid.Row="0"
+                     Height="24"
+                     x:Name="TabSwitcherTextBox"
+                     HorizontalAlignment="Stretch"
+                     Margin="0"
+                     BorderThickness="1"
+                     CornerRadius="0"
+                     Watermark="Search..."
+                     Text="{Binding Filter, Mode=TwoWay}"
 
-                </MenuItem.Styles>
-                <MenuItem Header="Mass Import" Command="{Binding mnuMassImport_Click}" />
-                <MenuItem Header="Re-Index" Command="{Binding mnuReIndex_Click}" />
-                <Separator />
-                <MenuItem Header="Mass Export" Command="{Binding mnuMassExport_Click}" />
-                <MenuItem Header="Mass Export Multi Sheet" Command="{Binding mnuMassExportMulti_Click}" />
-            </MenuItem>
-        </Menu>
-        <Grid>
-            <Grid.RowDefinitions>
-                <RowDefinition Height="*" />
-                <RowDefinition Height="34" />
-            </Grid.RowDefinitions>
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition />
-                <ColumnDefinition />
-                <ColumnDefinition />
-                <ColumnDefinition />
-            </Grid.ColumnDefinitions>
-            <TreeView ItemsSource="{Binding Monsters}" SelectedItem="{Binding ChosenMonster}"
-                      SelectionMode="AlwaysSelected" Margin="4" Grid.ColumnSpan="4">
-                <TreeView.DataTemplates>
-                    <TreeDataTemplate DataType="vm:MonsterNodeViewModel" ItemsSource="{Binding Nodes}">
-                        <Grid>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="24" />
-                                <ColumnDefinition />
-                            </Grid.ColumnDefinitions>
-                            <Image Source="{Binding Filled, Converter={StaticResource OXConverter}}" Stretch="None"
-                                   Grid.Column="0" />
-                            <TextBlock Text="{Binding Name}" VerticalAlignment="Center" Grid.Column="1" />
+                     BorderBrush="{DynamicResource Brush.Border2}"
+                     VerticalContentAlignment="Center">
+                <TextBox.InnerLeftContent>
+                    <Path
+                        Fill="{DynamicResource Brush.FG2}"
+                        Width="14" Height="14"
+                        Margin="6,1,0,0"
+                        Data="{StaticResource Icons.MagnifyingGlassFill}" />
+                </TextBox.InnerLeftContent>
+            </TextBox>
+            
+            <TreeDataGrid x:Name="SpeciesEditTreeDataGrid" Background="{DynamicResource Brush.Contents}" SelectionChanging="SpeciesEditTreeDataGrid_OnSelectionChanging" ShowColumnHeaders="False" Grid.Row="2" Source="{Binding NodeSource}" Grid.ColumnSpan="4" Height="400" BorderBrush="{DynamicResource Brush.Border2}" BorderThickness="1">
+                <TreeDataGrid.Styles>
+                    <Style Selector="TreeDataGridRow">
+                        <Setter Property="Background" Value="{DynamicResource Brush.Contents}"/>
+                    </Style>
+                </TreeDataGrid.Styles>
+                <TreeDataGrid.Resources>
+                    <DataTemplate x:Key="MonsterNodeTemplate" DataType="vm:MonsterNodeViewModel">
+                        <Grid ColumnDefinitions="24, *">
+                            <Image Source="{Binding Filled, Converter={StaticResource OXConverter}}"
+                                   Stretch="None" Grid.Column="0" />
+                            <TextBlock Text="{Binding Title}" VerticalAlignment="Center" Grid.Column="1" />
                         </Grid>
-                    </TreeDataTemplate>
-                </TreeView.DataTemplates>
-                <TreeView.ContextMenu>
+                    </DataTemplate>
+                </TreeDataGrid.Resources>
+                <TreeDataGrid.ContextMenu>
                     <ContextMenu ItemsSource="{Binding OpList}">
                         <ContextMenu.Styles>
                             <Style Selector="MenuItem">
@@ -146,24 +166,158 @@
                             </Style>
                         </ContextMenu.Styles>
                     </ContextMenu>
-                </TreeView.ContextMenu>
-            </TreeView>
-            <Button Command="{Binding btnImport_Click}" Margin="4" Grid.Row="1" Grid.Column="0"
-                    IsEnabled="{Binding ChosenMonster, Converter={x:Static ObjectConverters.IsNotNull}}">
-                Import
-            </Button>
-            <Button Command="{Binding btnReImport_Click}" Margin="4" Grid.Row="1" Grid.Column="1"
-                    IsEnabled="{Binding CachedPath, Converter={x:Static StringConverters.IsNotNullOrEmpty}}">
-                Re-Import
-            </Button>
-            <Button Command="{Binding btnExport_Click}" Margin="4" Grid.Row="1" Grid.Column="2"
-                    IsEnabled="{Binding ChosenMonster, Converter={x:Static ObjectConverters.IsNotNull}}">
-                Export
-            </Button>
-            <Button Command="{Binding btnDelete_Click}" Margin="4" Grid.Row="1" Grid.Column="3"
-                    IsEnabled="{Binding ChosenMonster, Converter={x:Static ObjectConverters.IsNotNull}}">
-                Delete
-            </Button>
+                </TreeDataGrid.ContextMenu>
+            </TreeDataGrid>
+            
+            <Grid Grid.Row="4" ColumnDefinitions="Auto, *">
+                <UniformGrid Rows="1" Columns="3">
+                    <Button Classes="flat" Margin="0,0,10,0" Command="{Binding btnImport_Click}" IsEnabled="{Binding ChosenMonster, Converter={x:Static ObjectConverters.IsNotNull}}">
+                        <v:IconText Text="Import" Icon="Icons.DownloadFill" IconSize="12" />
+                    </Button>
+                    <Button Classes="flat" Margin="0,0,10,0" Command="{Binding btnReImport_Click}" IsEnabled="{Binding CachedPath, Converter={x:Static StringConverters.IsNotNullOrEmpty}}">
+                        <v:IconText Text="Re-Import" Icon="Icons.RepeatFill" IconSize="12" />
+                    </Button>
+                    <Button Classes="flat" Command="{Binding btnExport_Click}" IsEnabled="{Binding ChosenMonster, Converter={x:Static ObjectConverters.IsNotNull}}">
+                        <v:IconText Text="Export" Icon="Icons.ExportFill" IconSize="12" />
+                    </Button>
+                </UniformGrid>
+                <Button Grid.Column="1" HorizontalAlignment="Right" Command="{Binding btnDelete_Click}" Classes="secondary" Padding="4,3,4,3"  IsEnabled="{Binding ChosenMonster, Converter={x:Static ObjectConverters.IsNotNull}}">
+                    <Path Width="14" Height="14" Data="{StaticResource Icons.Minus}" />
+                </Button>
+            </Grid>
+            
+            <!--     <Button Command="{Binding btnImport_Click}" Margin="4" Grid.Row="1" Grid.Column="0" -->
+            <!--             IsEnabled="{Binding ChosenMonster, Converter={x:Static ObjectConverters.IsNotNull}}"> -->
+            <!--         Import -->
+            <!--     </Button> -->
+            <!--     <Button Command="{Binding btnReImport_Click}" Margin="4" Grid.Row="1" Grid.Column="1" -->
+            <!--             IsEnabled="{Binding CachedPath, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"> -->
+            <!--         Re-Import -->
+            <!--     </Button> -->
+            <!--     <Button Command="{Binding btnExport_Click}" Margin="4" Grid.Row="1" Grid.Column="2" -->
+            <!--             IsEnabled="{Binding ChosenMonster, Converter={x:Static ObjectConverters.IsNotNull}}"> -->
+            <!--         Export -->
+            <!--     </Button> -->
+            <!--     <Button Command="{Binding btnDelete_Click}" Margin="4" Grid.Row="1" Grid.Column="3" -->
+            <!--             IsEnabled="{Binding ChosenMonster, Converter={x:Static ObjectConverters.IsNotNull}}"> -->
+            <!--         Delete -->
+            <!--     </Button> -->
+                  
+            <!-- <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,8,0,0" Spacing="4"> -->
+            <!--     <Button Command="{Binding }" Classes="secondary" Margin="0, 0" Padding="4,3, 4, 3"> -->
+            <!--         <Path Width="14" Height="14" Data="{StaticResource Icons.Plus}" /> -->
+            <!--     </Button> -->
+            <!--     <Button Command="{Binding }" Classes="secondary" Margin="0, 0" Padding="4,3, 4, 3"> -->
+            <!--         <Path Width="14" Height="14" Data="{StaticResource Icons.Minus}" /> -->
+            <!--     </Button> -->
+            <!-- </StackPanel> -->
+            
+        <!--     ~1~ <TreeView ItemsSource="{Binding Monsters}" SelectedItem="{Binding ChosenMonster}" @1@ -->
+        <!--     ~1~           SelectionMode="AlwaysSelected" Margin="4" Grid.ColumnSpan="4"> @1@ -->
+        <!--     ~1~     <TreeView.DataTemplates> @1@ -->
+        <!--     ~1~         <TreeDataTemplate DataType="vm:MonsterNodeViewModel" ItemsSource="{Binding Nodes}"> @1@ -->
+        <!--     ~1~             <Grid> @1@ -->
+        <!--     ~1~                 <Grid.ColumnDefinitions> @1@ -->
+        <!--     ~1~                     <ColumnDefinition Width="24" /> @1@ -->
+        <!--     ~1~                     <ColumnDefinition /> @1@ -->
+        <!--     ~1~                 </Grid.ColumnDefinitions> @1@ -->
+        <!--     ~1~                 <Image Source="{Binding Filled, Converter={StaticResource OXConverter}}" Stretch="None" @1@ -->
+        <!--     ~1~                        Grid.Column="0" /> @1@ -->
+        <!--     ~1~                 <TextBlock Text="{Binding Name}" VerticalAlignment="Center" Grid.Column="1" /> @1@ -->
+        <!--     ~1~             </Grid> @1@ -->
+        <!--     ~1~         </TreeDataTemplate> @1@ -->
+        <!--     ~1~     </TreeView.DataTemplates> @1@ -->
+        <!--     ~1~     <TreeView.ContextMenu> @1@ -->
+        <!--     ~1~         <ContextMenu ItemsSource="{Binding OpList}"> @1@ -->
+        <!--     ~1~             <ContextMenu.Styles> @1@ -->
+        <!--     ~1~                 <Style Selector="MenuItem"> @1@ -->
+        <!--     ~1~                     <Setter Property="Header" Value="{Binding Name}" /> @1@ -->
+        <!--     ~1~                     <Setter Property="Command" Value="{Binding Command}" /> @1@ -->
+        <!--     ~1~                 </Style> @1@ -->
+        <!--     ~1~             </ContextMenu.Styles> @1@ -->
+        <!--     ~1~         </ContextMenu> @1@ -->
+        <!--     ~1~     </TreeView.ContextMenu> @1@ -->
+        <!--     ~1~ </TreeView> @1@ -->
+
+        </Grid>
+    <Grid/>
+    
+    
+        <!-- -->
+        <!-- -->
+        <!-- <Grid> -->
+        <!--     <Grid.RowDefinitions> -->
+        <!--         <RowDefinition Height="*" /> -->
+        <!--         <RowDefinition Height="34" /> -->
+        <!--     </Grid.RowDefinitions> -->
+        <!--     <Grid.ColumnDefinitions> -->
+        <!--         <ColumnDefinition /> -->
+        <!--         <ColumnDefinition /> -->
+        <!--         <ColumnDefinition /> -->
+        <!--         <ColumnDefinition /> -->
+        <!--     </Grid.ColumnDefinitions> -->
+        <!--     <TreeDataGrid Source="{Binding MonsterSource}" Margin="4" Grid.ColumnSpan="4"> -->
+        <!--         <TreeDataGrid.Resources> -->
+        <!--             <DataTemplate x:Key="MonsterNodeTemplate" DataType="vm:MonsterNodeViewModel"> -->
+        <!--                 <Grid ColumnDefinitions="24, *"> -->
+        <!--                     <Image Source="{Binding Filled, Converter={StaticResource OXConverter}}"  -->
+        <!--                            Stretch="None" Grid.Column="0" /> -->
+        <!--                     <TextBlock Text="{Binding Name}" VerticalAlignment="Center" Grid.Column="1" /> -->
+        <!--                 </Grid> -->
+        <!--             </DataTemplate> -->
+        <!--         </TreeDataGrid.Resources> -->
+        <!--         <TreeDataGrid.ContextMenu> -->
+        <!--             <ContextMenu ItemsSource="{Binding OpList}"> -->
+        <!--                 <ContextMenu.Styles> -->
+        <!--                     <Style Selector="MenuItem"> -->
+        <!--                         <Setter Property="Header" Value="{Binding Name}" /> -->
+        <!--                         <Setter Property="Command" Value="{Binding Command}" /> -->
+        <!--                     </Style> -->
+        <!--                 </ContextMenu.Styles> -->
+        <!--             </ContextMenu> -->
+        <!--         </TreeDataGrid.ContextMenu> -->
+        <!--     </TreeDataGrid> -->
+        <!--     ~1~ <TreeView ItemsSource="{Binding Monsters}" SelectedItem="{Binding ChosenMonster}" @1@ -->
+        <!--     ~1~           SelectionMode="AlwaysSelected" Margin="4" Grid.ColumnSpan="4"> @1@ -->
+        <!--     ~1~     <TreeView.DataTemplates> @1@ -->
+        <!--     ~1~         <TreeDataTemplate DataType="vm:MonsterNodeViewModel" ItemsSource="{Binding Nodes}"> @1@ -->
+        <!--     ~1~             <Grid> @1@ -->
+        <!--     ~1~                 <Grid.ColumnDefinitions> @1@ -->
+        <!--     ~1~                     <ColumnDefinition Width="24" /> @1@ -->
+        <!--     ~1~                     <ColumnDefinition /> @1@ -->
+        <!--     ~1~                 </Grid.ColumnDefinitions> @1@ -->
+        <!--     ~1~                 <Image Source="{Binding Filled, Converter={StaticResource OXConverter}}" Stretch="None" @1@ -->
+        <!--     ~1~                        Grid.Column="0" /> @1@ -->
+        <!--     ~1~                 <TextBlock Text="{Binding Name}" VerticalAlignment="Center" Grid.Column="1" /> @1@ -->
+        <!--     ~1~             </Grid> @1@ -->
+        <!--     ~1~         </TreeDataTemplate> @1@ -->
+        <!--     ~1~     </TreeView.DataTemplates> @1@ -->
+        <!--     ~1~     <TreeView.ContextMenu> @1@ -->
+        <!--     ~1~         <ContextMenu ItemsSource="{Binding OpList}"> @1@ -->
+        <!--     ~1~             <ContextMenu.Styles> @1@ -->
+        <!--     ~1~                 <Style Selector="MenuItem"> @1@ -->
+        <!--     ~1~                     <Setter Property="Header" Value="{Binding Name}" /> @1@ -->
+        <!--     ~1~                     <Setter Property="Command" Value="{Binding Command}" /> @1@ -->
+        <!--     ~1~                 </Style> @1@ -->
+        <!--     ~1~             </ContextMenu.Styles> @1@ -->
+        <!--     ~1~         </ContextMenu> @1@ -->
+        <!--     ~1~     </TreeView.ContextMenu> @1@ -->
+        <!--     ~1~ </TreeView> @1@ -->
+        <!--     <Button Command="{Binding btnImport_Click}" Margin="4" Grid.Row="1" Grid.Column="0" -->
+        <!--             IsEnabled="{Binding ChosenMonster, Converter={x:Static ObjectConverters.IsNotNull}}"> -->
+        <!--         Import -->
+        <!--     </Button> -->
+        <!--     <Button Command="{Binding btnReImport_Click}" Margin="4" Grid.Row="1" Grid.Column="1" -->
+        <!--             IsEnabled="{Binding CachedPath, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"> -->
+        <!--         Re-Import -->
+        <!--     </Button> -->
+        <!--     <Button Command="{Binding btnExport_Click}" Margin="4" Grid.Row="1" Grid.Column="2" -->
+        <!--             IsEnabled="{Binding ChosenMonster, Converter={x:Static ObjectConverters.IsNotNull}}"> -->
+        <!--         Export -->
+        <!--     </Button> -->
+        <!--     <Button Command="{Binding btnDelete_Click}" Margin="4" Grid.Row="1" Grid.Column="3" -->
+        <!--             IsEnabled="{Binding ChosenMonster, Converter={x:Static ObjectConverters.IsNotNull}}"> -->
+        <!--         Delete -->
+        <!--     </Button> -->
         </Grid>
-    </DockPanel>
 </UserControl>
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/SpeciesEditPageView.axaml.cs b/RogueEssence.Editor.Avalonia/Views/New/Editors/SpeciesEditPageView.axaml.cs
index 566bcc02..3e8079e4 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/Editors/SpeciesEditPageView.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/New/Editors/SpeciesEditPageView.axaml.cs
@@ -1,6 +1,10 @@
+using System;
+using System.ComponentModel;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
+using Avalonia.Threading;
+using RogueEssence.Dev.ViewModels;
 
 namespace RogueEssence.Dev.Views;
 
@@ -10,4 +14,15 @@ public SpeciesEditPageView()
     {
         InitializeComponent();
     }
+    
+    private void SpeciesEditTreeDataGrid_OnSelectionChanging(object sender, CancelEventArgs e)
+    {
+        if (sender is not TreeDataGrid grid || DataContext is not SpeciesEditPageViewModel vm) return;
+        Dispatcher.UIThread.Post(() =>
+        {
+            vm.ChosenMonster = grid.RowSelection?.SelectedItem as MonsterNodeViewModel;
+            grid.InvalidateMeasure();
+        });
+    }
+    
 }
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/ZoneEditorPageView.axaml b/RogueEssence.Editor.Avalonia/Views/New/Editors/ZoneEditorPageView.axaml
index 88e944ef..a1ae95e6 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/Editors/ZoneEditorPageView.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/New/Editors/ZoneEditorPageView.axaml
@@ -6,5 +6,9 @@
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:DataType="vm:ZoneEditorPageViewModel"
              x:Class="RogueEssence.Dev.Views.ZoneEditorPageView">
-    Welcome to ZoneEditor
-</UserControl>
+    <ScrollViewer>
+        <StackPanel Spacing="8" Margin="16">
+            <TextBlock Text="Zone Editor" FontSize="24" FontWeight="Bold"/>
+        </StackPanel>
+    </ScrollViewer>
+</UserControl>
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/New/ModSwitcherView.axaml.cs b/RogueEssence.Editor.Avalonia/Views/New/ModSwitcherView.axaml.cs
index 0e609104..a774259f 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/ModSwitcherView.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/New/ModSwitcherView.axaml.cs
@@ -85,8 +85,7 @@ private async void OnItemTapped(object sender, TappedEventArgs e)
         var selected = ModsListBox.SelectedItem as ModsNodeViewModel;
         if (selected is null)
             return;
-        
-        Console.WriteLine("Capped");
+        ;
         if (switcher.IsCurrent(selected))
         {
             Console.WriteLine("Same");
@@ -94,7 +93,6 @@ private async void OnItemTapped(object sender, TappedEventArgs e)
             e.Handled = true;
             return;
         }
-        Console.WriteLine("Tapped");
         
         switcher.CloseSwitcher();
         await switcher.ConfirmModSwitchAsync();
diff --git a/RogueEssence.Editor.Avalonia/Views/New/TabSwitcherView.axaml.cs b/RogueEssence.Editor.Avalonia/Views/New/TabSwitcherView.axaml.cs
index de35b3c0..abf549ba 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/TabSwitcherView.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/New/TabSwitcherView.axaml.cs
@@ -282,7 +282,6 @@ private void TreeViewTabSwitcher_OnPointerPressed(object? sender, PointerPressed
     {
         if (DataContext is ViewModels.TabSwitcherViewModel switcher)
         {
-            // Handle expander
             var toggleButton = (e.Source as Control)?.FindAncestorOfType<ToggleButton>();
             if (toggleButton != null)
             {
diff --git a/RogueEssence/Data/DataManager.cs b/RogueEssence/Data/DataManager.cs
index 9d098f88..8ea94560 100644
--- a/RogueEssence/Data/DataManager.cs
+++ b/RogueEssence/Data/DataManager.cs
@@ -17,62 +17,41 @@ namespace RogueEssence.Data
 {
     public static class DataRegistry
     {
-        public static readonly Dictionary<DataManager.DataType, RegistryEntry> Map
-            = new Dictionary<DataManager.DataType, RegistryEntry>();
-        
-        public struct RegistryEntry
-        {
-            public Type ClassType;
-            public Func<string, IEntryData> GetEntry;
-            public Func<IEntryData> CreateEntry;
-        }
-        
+        public static readonly Dictionary<DataManager.DataType, RegistryEntry> Map = new();
+
+        public record RegistryEntry(
+            Type ClassType,
+            Func<string, IEntryData> GetEntry,
+            Func<IEntryData> CreateEntry,
+            string Icon
+        );
+
         static DataRegistry()
         {
-            // Register(DataManager.DataType.Monster,
-            //     typeof(MonsterData),
-            //     entryNum => new MonsterData { EntryNum = entryNum },
-            //     () => new MonsterData());
-            //
-            // Register(DataManager.DataType.Skill,
-            //     typeof(SkillData),
-            //     entryNum => new SkillData { EntryNum = entryNum },
-            //     () => new SkillData());
-            //
-            // Register(DataManager.DataType.Item,
-            //     typeof(ItemData),
-            //     entryNum => new ItemData { EntryNum = entryNum },
-            //     () => new ItemData());
-        }
-
-        private static void Register(
-            DataManager.DataType type,
-            Type classType,
-            Func<string, IEntryData> getEntry,
-            Func<IEntryData> createEntry)
-        {
-            Map[type] = new RegistryEntry
-            {
-                ClassType = classType,
-                GetEntry = getEntry,
-                CreateEntry = createEntry
-            };
-        }
+            Register(DataManager.DataType.Monster, typeof(MonsterData), DataManager.Instance.GetMonster, () => new MonsterData(), "Icons.GhostFill");
+            Register(DataManager.DataType.Skill, typeof(SkillData), DataManager.Instance.GetSkill, () => new SkillData(), "Icons.SwordFill");
+            Register(DataManager.DataType.Item, typeof(ItemData), DataManager.Instance.GetItem, () => new ItemData(), "Icons.JarLabelFill");
+            Register(DataManager.DataType.Intrinsic, typeof(IntrinsicData), DataManager.Instance.GetIntrinsic, () => new IntrinsicData(), "Icons.SwordFill");
+            Register(DataManager.DataType.Status, typeof(StatusData), DataManager.Instance.GetStatus, () => new StatusData(), "Icons.HeartFill");
+            Register(DataManager.DataType.MapStatus, typeof(MapStatusData), DataManager.Instance.GetMapStatus, () => new MapStatusData(), "Icons.HeartFill");
+            Register(DataManager.DataType.Terrain, typeof(TerrainData), DataManager.Instance.GetTerrain, () => new TerrainData(), "Icons.MountainsFill");
+            Register(DataManager.DataType.Tile, typeof(TileData), DataManager.Instance.GetTile, () => new TileData(), "Icons.SquaresFourFill");
+            Register(DataManager.DataType.Zone, typeof(ZoneData), DataManager.Instance.GetZone, () => new ZoneData(), "Icons.StairsFill");
+            Register(DataManager.DataType.Emote, typeof(EmoteData), DataManager.Instance.GetEmote, () => new EmoteData(), "Icons.StarFill");
+            Register(DataManager.DataType.AutoTile, typeof(AutoTileData), DataManager.Instance.GetAutoTile, () => new AutoTileData(), "Icons.SquaresFourFill");
+            Register(DataManager.DataType.Element, typeof(ElementData), DataManager.Instance.GetElement, () => new ElementData(), "Icons.LightningFill");
+            Register(DataManager.DataType.GrowthGroup, typeof(GrowthData), DataManager.Instance.GetGrowth, () => new GrowthData(), "Icons.TrendUpFill");
+            Register(DataManager.DataType.SkillGroup, typeof(SkillGroupData), DataManager.Instance.GetSkillGroup, () => new SkillGroupData(), "Icons.ListFill");
+            Register(DataManager.DataType.AI, typeof(AITactic), DataManager.Instance.GetAITactic, () => new AITactic(), "Icons.BrainFill");
+            Register(DataManager.DataType.Rank, typeof(RankData), DataManager.Instance.GetRank, () => new RankData(), "Icons.BinaryFill");
+            Register(DataManager.DataType.Skin, typeof(SkinData), DataManager.Instance.GetSkin, () => new SkinData(), "Icons.SparkleFill");
+        }
+
+        private static void Register(DataManager.DataType type, Type classType, Func<string, IEntryData> getEntry, Func<IEntryData> createEntry, string icon)
+            => Map[type] = new RegistryEntry(classType, getEntry, createEntry, icon); 
     }
     public static class DataTypeExtensions
     {
-        public delegate IEntryData GetEntry(string id);
-        public delegate IEntryData CreateEntry();
-        
-        
-        // public static Type GetClassType(this DataManager.DataType type)
-        //     => DataRegistry.Map[type].ClassType;
-        //
-        // public static GetEntry GetGetter(this DataManager.DataType type)
-        //     => DataRegistry.Map[type].GetEntry;
-        //
-        // public static CreateEntry GetCreator(this DataManager.DataType type)
-        //     => DataRegistry.Map[type].CreateEntry;
         public static Type GetClassType(this DataManager.DataType dataType)
         {
             switch (dataType)

From 9f0edd376296aeda882783d1d450a3426f469eb0 Mon Sep 17 00:00:00 2001
From: Kace <41309226+DoubleTrio@users.noreply.github.com>
Date: Tue, 28 Apr 2026 22:35:31 -0400
Subject: [PATCH 21/51] clean up

---
 .../RogueEssence.Editor.Avalonia.csproj       |   1 -
 .../New/Editors/DataListPageViewModel.cs      |  12 +-
 .../New/Editors/SpeciesEditPageView.axaml     | 170 +++---------------
 .../Views/New/ModSwitcherView.axaml.cs        |   3 +-
 4 files changed, 25 insertions(+), 161 deletions(-)

diff --git a/RogueEssence.Editor.Avalonia/RogueEssence.Editor.Avalonia.csproj b/RogueEssence.Editor.Avalonia/RogueEssence.Editor.Avalonia.csproj
index 9924e1af..caa45c6f 100644
--- a/RogueEssence.Editor.Avalonia/RogueEssence.Editor.Avalonia.csproj
+++ b/RogueEssence.Editor.Avalonia/RogueEssence.Editor.Avalonia.csproj
@@ -210,6 +210,5 @@
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Models\" />
-    <Folder Include="ViewModels\New\UserControls\" />
   </ItemGroup>
 </Project>
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DataListPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DataListPageViewModel.cs
index f4c06af1..216e2dbb 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DataListPageViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DataListPageViewModel.cs
@@ -267,20 +267,10 @@ public async Task AddItem()
         UpdateVisibleItems(SearchFilter);
 
 
+        // TODO: Determine whether to add the new item to the tree
         // SubNodes.Add(_nodeFactory.CreateDataItemNode<DevEditPageViewModel>(assetName, $"{assetName}:", "Icons.GhostFill"));
         // IsExpanded = true;
-        //
-
-        // var vm = new RenameWindowViewModel();
-        // bool result = await DialogService.ShowDialogAsync<RenameWindowViewModel, bool>(vm, $"Add new {Node.DataType}");
-
-        // if (!result)
-        //     return;
-        //
-        // SubNodes.Add(_nodeFactory.CreateDataItemNode<DevEditPageViewModel>(vm.Name, $"{vm.Name}:", "Icons.GhostFill"));
-        // IsExpanded = true;
         // Console.WriteLine($"Added {DataType} item: {vm.Name}");
-        //
     }
 
     private async Task ReIndexAsync()
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/SpeciesEditPageView.axaml b/RogueEssence.Editor.Avalonia/Views/New/Editors/SpeciesEditPageView.axaml
index df43bcab..7d37552a 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/Editors/SpeciesEditPageView.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/New/Editors/SpeciesEditPageView.axaml
@@ -6,11 +6,11 @@
              xmlns:v="clr-namespace:RogueEssence.Dev.Views"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:DataType="vm:SpeciesEditPageViewModel"
-             
+
              xmlns:converters="clr-namespace:RogueEssence.Dev.Converters"
              x:Class="RogueEssence.Dev.Views.SpeciesEditPageView">
     <Design.DataContext>
-        <vm:SpeciesEditPageViewModel/>
+        <vm:SpeciesEditPageViewModel />
     </Design.DataContext>
     <UserControl.Resources>
         <converters:OXConverter x:Key="OXConverter" />
@@ -115,12 +115,13 @@
                 </MenuItem>
             </Menu>
         </DockPanel>
-        <TextBlock Grid.Row="2" HorizontalAlignment="Center" Classes="table_header" FontSize="16" Text="{Binding HeaderText}"/>
-        
+        <TextBlock Grid.Row="2" HorizontalAlignment="Center" Classes="table_header" FontSize="16"
+                   Text="{Binding HeaderText}" />
+
         <!-- Text="{Binding SearchFilter, Mode=TwoWay}" -->
         <!-- Search Grid -->
         <Grid Grid.Row="3" RowDefinitions="Auto, 16, Auto, 32, Auto" Margin="64, 8" MinWidth="600">
-            
+
             <TextBox Grid.Row="0"
                      Height="24"
                      x:Name="TabSwitcherTextBox"
@@ -141,11 +142,14 @@
                         Data="{StaticResource Icons.MagnifyingGlassFill}" />
                 </TextBox.InnerLeftContent>
             </TextBox>
-            
-            <TreeDataGrid x:Name="SpeciesEditTreeDataGrid" Background="{DynamicResource Brush.Contents}" SelectionChanging="SpeciesEditTreeDataGrid_OnSelectionChanging" ShowColumnHeaders="False" Grid.Row="2" Source="{Binding NodeSource}" Grid.ColumnSpan="4" Height="400" BorderBrush="{DynamicResource Brush.Border2}" BorderThickness="1">
+
+            <TreeDataGrid x:Name="SpeciesEditTreeDataGrid" Background="{DynamicResource Brush.Contents}"
+                          SelectionChanging="SpeciesEditTreeDataGrid_OnSelectionChanging" ShowColumnHeaders="False"
+                          Grid.Row="2" Source="{Binding NodeSource}" Grid.ColumnSpan="4" Height="400"
+                          BorderBrush="{DynamicResource Brush.Border2}" BorderThickness="1">
                 <TreeDataGrid.Styles>
                     <Style Selector="TreeDataGridRow">
-                        <Setter Property="Background" Value="{DynamicResource Brush.Contents}"/>
+                        <Setter Property="Background" Value="{DynamicResource Brush.Contents}" />
                     </Style>
                 </TreeDataGrid.Styles>
                 <TreeDataGrid.Resources>
@@ -168,156 +172,28 @@
                     </ContextMenu>
                 </TreeDataGrid.ContextMenu>
             </TreeDataGrid>
-            
+
             <Grid Grid.Row="4" ColumnDefinitions="Auto, *">
                 <UniformGrid Rows="1" Columns="3">
-                    <Button Classes="flat" Margin="0,0,10,0" Command="{Binding btnImport_Click}" IsEnabled="{Binding ChosenMonster, Converter={x:Static ObjectConverters.IsNotNull}}">
+                    <Button Classes="flat" Margin="0,0,10,0" Command="{Binding btnImport_Click}"
+                            IsEnabled="{Binding ChosenMonster, Converter={x:Static ObjectConverters.IsNotNull}}">
                         <v:IconText Text="Import" Icon="Icons.DownloadFill" IconSize="12" />
                     </Button>
-                    <Button Classes="flat" Margin="0,0,10,0" Command="{Binding btnReImport_Click}" IsEnabled="{Binding CachedPath, Converter={x:Static StringConverters.IsNotNullOrEmpty}}">
+                    <Button Classes="flat" Margin="0,0,10,0" Command="{Binding btnReImport_Click}"
+                            IsEnabled="{Binding CachedPath, Converter={x:Static StringConverters.IsNotNullOrEmpty}}">
                         <v:IconText Text="Re-Import" Icon="Icons.RepeatFill" IconSize="12" />
                     </Button>
-                    <Button Classes="flat" Command="{Binding btnExport_Click}" IsEnabled="{Binding ChosenMonster, Converter={x:Static ObjectConverters.IsNotNull}}">
+                    <Button Classes="flat" Command="{Binding btnExport_Click}"
+                            IsEnabled="{Binding ChosenMonster, Converter={x:Static ObjectConverters.IsNotNull}}">
                         <v:IconText Text="Export" Icon="Icons.ExportFill" IconSize="12" />
                     </Button>
                 </UniformGrid>
-                <Button Grid.Column="1" HorizontalAlignment="Right" Command="{Binding btnDelete_Click}" Classes="secondary" Padding="4,3,4,3"  IsEnabled="{Binding ChosenMonster, Converter={x:Static ObjectConverters.IsNotNull}}">
+                <Button Grid.Column="1" HorizontalAlignment="Right" Command="{Binding btnDelete_Click}"
+                        Classes="secondary" Padding="4,3,4,3"
+                        IsEnabled="{Binding ChosenMonster, Converter={x:Static ObjectConverters.IsNotNull}}">
                     <Path Width="14" Height="14" Data="{StaticResource Icons.Minus}" />
                 </Button>
             </Grid>
-            
-            <!--     <Button Command="{Binding btnImport_Click}" Margin="4" Grid.Row="1" Grid.Column="0" -->
-            <!--             IsEnabled="{Binding ChosenMonster, Converter={x:Static ObjectConverters.IsNotNull}}"> -->
-            <!--         Import -->
-            <!--     </Button> -->
-            <!--     <Button Command="{Binding btnReImport_Click}" Margin="4" Grid.Row="1" Grid.Column="1" -->
-            <!--             IsEnabled="{Binding CachedPath, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"> -->
-            <!--         Re-Import -->
-            <!--     </Button> -->
-            <!--     <Button Command="{Binding btnExport_Click}" Margin="4" Grid.Row="1" Grid.Column="2" -->
-            <!--             IsEnabled="{Binding ChosenMonster, Converter={x:Static ObjectConverters.IsNotNull}}"> -->
-            <!--         Export -->
-            <!--     </Button> -->
-            <!--     <Button Command="{Binding btnDelete_Click}" Margin="4" Grid.Row="1" Grid.Column="3" -->
-            <!--             IsEnabled="{Binding ChosenMonster, Converter={x:Static ObjectConverters.IsNotNull}}"> -->
-            <!--         Delete -->
-            <!--     </Button> -->
-                  
-            <!-- <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,8,0,0" Spacing="4"> -->
-            <!--     <Button Command="{Binding }" Classes="secondary" Margin="0, 0" Padding="4,3, 4, 3"> -->
-            <!--         <Path Width="14" Height="14" Data="{StaticResource Icons.Plus}" /> -->
-            <!--     </Button> -->
-            <!--     <Button Command="{Binding }" Classes="secondary" Margin="0, 0" Padding="4,3, 4, 3"> -->
-            <!--         <Path Width="14" Height="14" Data="{StaticResource Icons.Minus}" /> -->
-            <!--     </Button> -->
-            <!-- </StackPanel> -->
-            
-        <!--     ~1~ <TreeView ItemsSource="{Binding Monsters}" SelectedItem="{Binding ChosenMonster}" @1@ -->
-        <!--     ~1~           SelectionMode="AlwaysSelected" Margin="4" Grid.ColumnSpan="4"> @1@ -->
-        <!--     ~1~     <TreeView.DataTemplates> @1@ -->
-        <!--     ~1~         <TreeDataTemplate DataType="vm:MonsterNodeViewModel" ItemsSource="{Binding Nodes}"> @1@ -->
-        <!--     ~1~             <Grid> @1@ -->
-        <!--     ~1~                 <Grid.ColumnDefinitions> @1@ -->
-        <!--     ~1~                     <ColumnDefinition Width="24" /> @1@ -->
-        <!--     ~1~                     <ColumnDefinition /> @1@ -->
-        <!--     ~1~                 </Grid.ColumnDefinitions> @1@ -->
-        <!--     ~1~                 <Image Source="{Binding Filled, Converter={StaticResource OXConverter}}" Stretch="None" @1@ -->
-        <!--     ~1~                        Grid.Column="0" /> @1@ -->
-        <!--     ~1~                 <TextBlock Text="{Binding Name}" VerticalAlignment="Center" Grid.Column="1" /> @1@ -->
-        <!--     ~1~             </Grid> @1@ -->
-        <!--     ~1~         </TreeDataTemplate> @1@ -->
-        <!--     ~1~     </TreeView.DataTemplates> @1@ -->
-        <!--     ~1~     <TreeView.ContextMenu> @1@ -->
-        <!--     ~1~         <ContextMenu ItemsSource="{Binding OpList}"> @1@ -->
-        <!--     ~1~             <ContextMenu.Styles> @1@ -->
-        <!--     ~1~                 <Style Selector="MenuItem"> @1@ -->
-        <!--     ~1~                     <Setter Property="Header" Value="{Binding Name}" /> @1@ -->
-        <!--     ~1~                     <Setter Property="Command" Value="{Binding Command}" /> @1@ -->
-        <!--     ~1~                 </Style> @1@ -->
-        <!--     ~1~             </ContextMenu.Styles> @1@ -->
-        <!--     ~1~         </ContextMenu> @1@ -->
-        <!--     ~1~     </TreeView.ContextMenu> @1@ -->
-        <!--     ~1~ </TreeView> @1@ -->
-
-        </Grid>
-    <Grid/>
-    
-    
-        <!-- -->
-        <!-- -->
-        <!-- <Grid> -->
-        <!--     <Grid.RowDefinitions> -->
-        <!--         <RowDefinition Height="*" /> -->
-        <!--         <RowDefinition Height="34" /> -->
-        <!--     </Grid.RowDefinitions> -->
-        <!--     <Grid.ColumnDefinitions> -->
-        <!--         <ColumnDefinition /> -->
-        <!--         <ColumnDefinition /> -->
-        <!--         <ColumnDefinition /> -->
-        <!--         <ColumnDefinition /> -->
-        <!--     </Grid.ColumnDefinitions> -->
-        <!--     <TreeDataGrid Source="{Binding MonsterSource}" Margin="4" Grid.ColumnSpan="4"> -->
-        <!--         <TreeDataGrid.Resources> -->
-        <!--             <DataTemplate x:Key="MonsterNodeTemplate" DataType="vm:MonsterNodeViewModel"> -->
-        <!--                 <Grid ColumnDefinitions="24, *"> -->
-        <!--                     <Image Source="{Binding Filled, Converter={StaticResource OXConverter}}"  -->
-        <!--                            Stretch="None" Grid.Column="0" /> -->
-        <!--                     <TextBlock Text="{Binding Name}" VerticalAlignment="Center" Grid.Column="1" /> -->
-        <!--                 </Grid> -->
-        <!--             </DataTemplate> -->
-        <!--         </TreeDataGrid.Resources> -->
-        <!--         <TreeDataGrid.ContextMenu> -->
-        <!--             <ContextMenu ItemsSource="{Binding OpList}"> -->
-        <!--                 <ContextMenu.Styles> -->
-        <!--                     <Style Selector="MenuItem"> -->
-        <!--                         <Setter Property="Header" Value="{Binding Name}" /> -->
-        <!--                         <Setter Property="Command" Value="{Binding Command}" /> -->
-        <!--                     </Style> -->
-        <!--                 </ContextMenu.Styles> -->
-        <!--             </ContextMenu> -->
-        <!--         </TreeDataGrid.ContextMenu> -->
-        <!--     </TreeDataGrid> -->
-        <!--     ~1~ <TreeView ItemsSource="{Binding Monsters}" SelectedItem="{Binding ChosenMonster}" @1@ -->
-        <!--     ~1~           SelectionMode="AlwaysSelected" Margin="4" Grid.ColumnSpan="4"> @1@ -->
-        <!--     ~1~     <TreeView.DataTemplates> @1@ -->
-        <!--     ~1~         <TreeDataTemplate DataType="vm:MonsterNodeViewModel" ItemsSource="{Binding Nodes}"> @1@ -->
-        <!--     ~1~             <Grid> @1@ -->
-        <!--     ~1~                 <Grid.ColumnDefinitions> @1@ -->
-        <!--     ~1~                     <ColumnDefinition Width="24" /> @1@ -->
-        <!--     ~1~                     <ColumnDefinition /> @1@ -->
-        <!--     ~1~                 </Grid.ColumnDefinitions> @1@ -->
-        <!--     ~1~                 <Image Source="{Binding Filled, Converter={StaticResource OXConverter}}" Stretch="None" @1@ -->
-        <!--     ~1~                        Grid.Column="0" /> @1@ -->
-        <!--     ~1~                 <TextBlock Text="{Binding Name}" VerticalAlignment="Center" Grid.Column="1" /> @1@ -->
-        <!--     ~1~             </Grid> @1@ -->
-        <!--     ~1~         </TreeDataTemplate> @1@ -->
-        <!--     ~1~     </TreeView.DataTemplates> @1@ -->
-        <!--     ~1~     <TreeView.ContextMenu> @1@ -->
-        <!--     ~1~         <ContextMenu ItemsSource="{Binding OpList}"> @1@ -->
-        <!--     ~1~             <ContextMenu.Styles> @1@ -->
-        <!--     ~1~                 <Style Selector="MenuItem"> @1@ -->
-        <!--     ~1~                     <Setter Property="Header" Value="{Binding Name}" /> @1@ -->
-        <!--     ~1~                     <Setter Property="Command" Value="{Binding Command}" /> @1@ -->
-        <!--     ~1~                 </Style> @1@ -->
-        <!--     ~1~             </ContextMenu.Styles> @1@ -->
-        <!--     ~1~         </ContextMenu> @1@ -->
-        <!--     ~1~     </TreeView.ContextMenu> @1@ -->
-        <!--     ~1~ </TreeView> @1@ -->
-        <!--     <Button Command="{Binding btnImport_Click}" Margin="4" Grid.Row="1" Grid.Column="0" -->
-        <!--             IsEnabled="{Binding ChosenMonster, Converter={x:Static ObjectConverters.IsNotNull}}"> -->
-        <!--         Import -->
-        <!--     </Button> -->
-        <!--     <Button Command="{Binding btnReImport_Click}" Margin="4" Grid.Row="1" Grid.Column="1" -->
-        <!--             IsEnabled="{Binding CachedPath, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"> -->
-        <!--         Re-Import -->
-        <!--     </Button> -->
-        <!--     <Button Command="{Binding btnExport_Click}" Margin="4" Grid.Row="1" Grid.Column="2" -->
-        <!--             IsEnabled="{Binding ChosenMonster, Converter={x:Static ObjectConverters.IsNotNull}}"> -->
-        <!--         Export -->
-        <!--     </Button> -->
-        <!--     <Button Command="{Binding btnDelete_Click}" Margin="4" Grid.Row="1" Grid.Column="3" -->
-        <!--             IsEnabled="{Binding ChosenMonster, Converter={x:Static ObjectConverters.IsNotNull}}"> -->
-        <!--         Delete -->
-        <!--     </Button> -->
         </Grid>
+    </Grid>
 </UserControl>
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/New/ModSwitcherView.axaml.cs b/RogueEssence.Editor.Avalonia/Views/New/ModSwitcherView.axaml.cs
index a774259f..0fc428fa 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/ModSwitcherView.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/New/ModSwitcherView.axaml.cs
@@ -85,10 +85,9 @@ private async void OnItemTapped(object sender, TappedEventArgs e)
         var selected = ModsListBox.SelectedItem as ModsNodeViewModel;
         if (selected is null)
             return;
-        ;
+        
         if (switcher.IsCurrent(selected))
         {
-            Console.WriteLine("Same");
             switcher.CloseSwitcher();
             e.Handled = true;
             return;

From 59cca8dabc78ff0b1deab403a24c8f6bb451441a Mon Sep 17 00:00:00 2001
From: Kace <41309226+DoubleTrio@users.noreply.github.com>
Date: Mon, 11 May 2026 03:58:45 -0400
Subject: [PATCH 22/51] functional pages

---
 RogueEssence.Editor.Avalonia/App.axaml        |   2 +
 RogueEssence.Editor.Avalonia/App.axaml.cs     |  45 +++-
 .../Assets/DataGridStyles.axaml               |  46 ++++
 .../Assets/Icons.axaml                        |   1 -
 .../Assets/ListBoxStyles.axaml                |   2 -
 .../Assets/Styles.axaml                       |  18 +-
 .../Assets/Themes.axaml                       |   4 +
 .../DataEditor/ClassBox.axaml                 |  10 +-
 .../DataEditor/CollectionBox.axaml            |  42 ++--
 .../DataEditor/CollectionBoxViewModel.cs      |  56 ++---
 .../DataEditor/DataEditor.cs                  | 202 +++++++++++++++++-
 .../DataEditor/DictionaryBox.axaml            |  59 ++---
 .../DataEditor/DictionaryBoxViewModel.cs      |  20 +-
 .../DataEditor/Editors/DataFolderEditor.cs    |   1 +
 .../DataEditor/Editors/Editor.cs              | 156 ++++++++++++--
 .../DataEditor/Editors/IEditor.cs             |  11 +-
 .../Editors/Primitive/BooleanEditor.cs        |   1 +
 .../Editors/Primitive/ByteEditor.cs           |   3 +
 .../Editors/Primitive/CharEditor.cs           |   1 +
 .../Editors/Primitive/DoubleEditor.cs         |   4 +
 .../DataEditor/Editors/Primitive/IntEditor.cs |   2 +
 .../Editors/Primitive/SingleEditor.cs         |   2 +
 .../Editors/Primitive/StringEditor.cs         |   4 +
 .../RogueElements/BlobWaterStepEditor.cs      |   3 +
 .../CombinedGridRoomStepEditor.cs             |   1 +
 .../RogueElements/FloorPlanStepEditor.cs      |   6 +
 .../RogueElements/GridPathStepEditor.cs       |   4 +
 .../Editors/RogueElements/IntRangeEditor.cs   |   2 +-
 .../Editors/RogueElements/LocEditor.cs        |   2 +
 .../Editors/RogueElements/MultiRandEditor.cs  |   4 +
 .../RogueElements/MultiRandPickerEditor.cs    |   1 +
 .../RogueElements/PerlinWaterStepEditor.cs    |   2 +
 .../Editors/RogueElements/PriorityEditor.cs   |   1 +
 .../RogueElements/PriorityListEditor.cs       |  71 ++++--
 .../Editors/RogueElements/RandPickerEditor.cs |   1 +
 .../Editors/RogueElements/RandRangeEditor.cs  |   2 +-
 .../Editors/RogueElements/RangeDictEditor.cs  |  65 ++++--
 .../Editors/RogueElements/RoomGenEditor.cs    |   6 +
 .../Editors/RogueElements/SpawnListEditor.cs  |  38 ++--
 .../RogueElements/SpawnRangeListEditor.cs     |  40 ++--
 .../Editors/RogueElements/SpawnStepEditor.cs  |   4 +
 .../RogueElements/StepSpawnerEditor.cs        |   7 +
 .../Editors/RogueElements/TypeDictEditor.cs   |  46 ++--
 .../Editors/RogueEssence/AliasDataEditor.cs   |   1 +
 .../Editors/RogueEssence/AnimDataEditor.cs    |   1 +
 .../RogueEssence/CategorySpawnEditor.cs       |  82 ++++---
 .../Editors/RogueEssence/ColorEditor.cs       |   4 +
 .../Editors/RogueEssence/EntryDataEditor.cs   |   1 +
 .../Editors/RogueEssence/FlagTypeEditor.cs    |   1 +
 .../Editors/RogueEssence/FrameTypeEditor.cs   |   1 +
 .../Editors/RogueEssence/InvItemEditor.cs     |   1 +
 .../Editors/RogueEssence/ItemDataEditor.cs    |   1 +
 .../RogueEssence/ItemSpawnZoneStepEditor.cs   |   1 +
 .../Editors/RogueEssence/MapItemEditor.cs     |   1 +
 .../Editors/RogueEssence/MobSpawnEditor.cs    |   1 +
 .../RogueEssence/MobSpawnExtraEditor.cs       |   2 +
 .../RogueEssence/MoneySpawnRangeEditor.cs     |   2 +-
 .../RogueEssence/MoneySpawnZoneStepEditor.cs  |   1 +
 .../Editors/RogueEssence/MonsterIDEditor.cs   |   1 +
 .../Editors/RogueEssence/MultiplierEditor.cs  |   1 +
 .../Editors/RogueEssence/MusicEditor.cs       |   1 +
 .../RogueEssence/PromoteBranchEditor.cs       |   1 +
 .../Editors/RogueEssence/SegLocEditor.cs      |   1 +
 .../Editors/RogueEssence/SoundEditor.cs       |   1 +
 .../RogueEssence/SpreadPlanBaseEditor.cs      |   3 +
 .../RogueEssence/StatusEffectEditor.cs        |   2 +
 .../Editors/RogueEssence/StringKeyEditor.cs   |   1 +
 .../RogueEssence/TeamMemberSpawnEditor.cs     |   1 +
 .../RogueEssence/TeamSpawnZoneStepEditor.cs   |   1 +
 .../RogueEssence/TeamStepSpawnerEditor.cs     |   1 +
 .../Testable/BaseEmitterEditor.cs             |   1 +
 .../RogueEssence/Testable/BattleDataEditor.cs |   1 +
 .../RogueEssence/Testable/BattleFXEditor.cs   |   1 +
 .../Testable/CircleSquareEmitterEditor.cs     |   1 +
 .../RogueEssence/Testable/ColumnAnimEditor.cs |   1 +
 .../Testable/CombatActionEditor.cs            |   1 +
 .../Testable/ExplosionDataEditor.cs           |   1 +
 .../Testable/ShootingEmitterEditor.cs         |   1 +
 .../RogueEssence/Testable/SkillDataEditor.cs  |   1 +
 .../RogueEssence/Testable/StaticAnimEditor.cs |   1 +
 .../RogueEssence/Testable/TestableEditor.cs   |   2 +
 .../RogueEssence/TileSpawnZoneStepEditor.cs   |   1 +
 .../RogueEssence/Tiles/AutoTileBaseEditor.cs  |  30 ++-
 .../RogueEssence/Tiles/AutoTileEditor.cs      |   1 +
 .../RogueEssence/Tiles/TileLayerEditor.cs     |   1 +
 .../Editors/RogueEssence/ZoneDataEditor.cs    |   3 +-
 .../DataEditor/Editors/System/ArrayEditor.cs  |  32 ++-
 .../Editors/System/DictionaryEditor.cs        |  85 +++++---
 .../DataEditor/Editors/System/EnumEditor.cs   |   1 +
 .../DataEditor/Editors/System/GuidEditor.cs   |   1 +
 .../Editors/System/HashSetEditor.cs           |  36 ++--
 .../DataEditor/Editors/System/ListEditor.cs   | 112 ++++++++--
 .../Editors/System/NoDupeListEditor.cs        |  62 ++++--
 .../DataEditor/Editors/System/ObjectEditor.cs |   4 +-
 .../DataEditor/Editors/System/TypeEditor.cs   |   1 +
 .../DataEditor/PriorityListBox.axaml          |  62 ++++--
 .../DataEditor/PriorityListBoxViewModel.cs    |  13 +-
 .../DataEditor/RangeDictBoxViewModel.cs       |  14 +-
 .../DataEditor/RankedCollectionBox.axaml      |  61 ++++--
 .../DataEditor/SpawnListBoxViewModel.cs       |  15 +-
 .../DataEditor/SpawnRangeListBoxViewModel.cs  |  17 +-
 .../EditorContext/EditorContext.cs            |  61 ++++++
 .../{ => EditorContext}/NodeFactory.cs        |   5 +
 .../{ => EditorContext}/PageFactory.cs        |  55 ++++-
 .../{ => EditorContext}/TabEvents.cs          |  12 ++
 RogueEssence.Editor.Avalonia/ReactiveExt.cs   |  13 ++
 .../RogueEssence.Editor.Avalonia.csproj       |   4 +
 .../ViewModels/DevForm/DevTabModsViewModel.cs |   8 +-
 .../DialogBoxes/ModConfigViewModel2.cs        |   5 +-
 .../MapEditForm/MapEditViewModel.cs           |  32 ++-
 .../MapEditForm/MapTabEffectsViewModel.cs     |   4 +-
 .../MapEditForm/MapTabEntitiesViewModel.cs    |   7 +-
 .../MapEditForm/MapTabPropertiesViewModel.cs  |   5 +-
 .../MapEditForm/MapTabTilesViewModel.cs       |   4 +-
 .../ViewModels/New/DevFormViewModel.cs        |  60 ++++--
 .../DialogBoxes/AnimChoiceWindowViewModel.cs  |  33 +++
 .../DialogBoxes/MessageBoxWindowViewModel.cs  |   2 +-
 .../DialogBoxes/ModConfigWindowViewModel.cs   |   5 +-
 .../New/Editors/DataListPageViewModel.cs      |  24 +--
 .../New/Editors/DevControlViewModel.cs        |   4 +-
 .../New/Editors/DevEditPageViewModel.cs       |   5 +-
 .../New/Editors/EditorPageViewModel.cs        |  78 ++++---
 .../New/Editors/GroundEditorPageViewModel.cs  |   2 +-
 .../New/Editors/ModInfoEditorViewModel.cs     |   3 +-
 .../New/Editors/RandomInfoPageViewModel.cs    |   3 +-
 .../New/Editors/ReflectedDataPageViewModel.cs | 121 ++++++++++-
 .../New/Editors/SpeciesEditPageViewModel.cs   |  44 ++--
 .../New/Editors/SpritePageViewModel.cs        |  11 +-
 .../New/Editors/ZoneEditorPageViewModel.cs    |   3 +-
 .../ViewModels/New/Nodes/NodeBase.cs          |  35 ++-
 .../Views/New/DevForm.axaml                   |   4 +-
 .../Views/New/DevForm.axaml.cs                |  11 +-
 .../DialogBoxes/AnimChoiceWindowView.axaml    |  56 +++++
 .../DialogBoxes/AnimChoiceWindowView.axaml.cs |  27 +++
 .../Views/New/Editors/DataListPageView.axaml  |   7 +-
 .../New/Editors/ReflectedDataPageView.axaml   |  26 ++-
 .../Editors/ReflectedDataPageView.axaml.cs    | 127 ++++++++++-
 .../New/Editors/SpeciesEditPageView.axaml     |  40 ++--
 .../New/Editors/ZoneEditorPageView.axaml      |  16 +-
 .../New/Editors/ZoneEditorPageView.axaml.cs   |  21 ++
 140 files changed, 2052 insertions(+), 609 deletions(-)
 create mode 100644 RogueEssence.Editor.Avalonia/Assets/DataGridStyles.axaml
 create mode 100644 RogueEssence.Editor.Avalonia/EditorContext/EditorContext.cs
 rename RogueEssence.Editor.Avalonia/{ => EditorContext}/NodeFactory.cs (92%)
 rename RogueEssence.Editor.Avalonia/{ => EditorContext}/PageFactory.cs (67%)
 rename RogueEssence.Editor.Avalonia/{ => EditorContext}/TabEvents.cs (84%)
 create mode 100644 RogueEssence.Editor.Avalonia/ViewModels/New/DialogBoxes/AnimChoiceWindowViewModel.cs
 create mode 100644 RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/AnimChoiceWindowView.axaml
 create mode 100644 RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/AnimChoiceWindowView.axaml.cs

diff --git a/RogueEssence.Editor.Avalonia/App.axaml b/RogueEssence.Editor.Avalonia/App.axaml
index 10851340..96b3258b 100644
--- a/RogueEssence.Editor.Avalonia/App.axaml
+++ b/RogueEssence.Editor.Avalonia/App.axaml
@@ -47,7 +47,9 @@
          <StyleInclude Source="/Assets/Styles.axaml"/>
          <StyleInclude Source="/Assets/ListBoxStyles.axaml"/>
          <StyleInclude Source="avares://Avalonia.Controls.TreeDataGrid/Themes/Fluent.axaml"/>
+         <StyleInclude Source="avares://Avalonia.Controls.DataGrid/Themes/Fluent.xaml"/>
          <StyleInclude Source="/Assets/TreeStyles.axaml"/>
+         <StyleInclude Source="/Assets/DataGridStyles.axaml"/>
      </Application.Styles>
              
 </Application>
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/App.axaml.cs b/RogueEssence.Editor.Avalonia/App.axaml.cs
index 116e4f12..b655aef8 100644
--- a/RogueEssence.Editor.Avalonia/App.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/App.axaml.cs
@@ -1,7 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Reactive.Linq;
+using System.Reflection;
 using System.Text.Json;
 using Avalonia;
 using Avalonia.Controls;
@@ -26,16 +28,14 @@ public static void AddCommonServices(this IServiceCollection collection)
             collection.AddSingleton<TabEvents>();
             collection.AddSingleton<PageFactory>();
             collection.AddSingleton<NodeFactory>();
+            collection.AddSingleton<EditorContext>();
             collection.AddSingleton<DevFormViewModel>();
 
        
             AddDevTabViewModels(collection);
+            AddMapEditViewModels(collection);
             
-            collection.AddTransient<TabSwitcherViewModel>(sp =>
-            {
-                var mainVm = sp.GetRequiredService<DevFormViewModel>();
-                return new TabSwitcherViewModel(mainVm);
-            });
+            collection.AddTransient<TabSwitcherViewModel>();
 
             collection.AddTransient<ModSwitcherViewModel>();
 
@@ -70,6 +70,32 @@ public static void AddCommonServices(this IServiceCollection collection)
             collection.AddTransient<SpeciesEditPageViewModel>();
             collection.AddTransient<DataListPageViewModel>();
             collection.AddTransient<ReflectedDataPageViewModel>();
+            
+            
+            var editorTypes = Assembly.GetExecutingAssembly()
+                .GetTypes()
+                .Where(t => typeof(IEditor).IsAssignableFrom(t) && !t.IsAbstract);
+
+            foreach (var type in editorTypes)
+            {
+                Console.WriteLine("Registering editor: " + type.Name);
+                collection.AddTransient(type);
+            }
+        }
+
+        private static void AddMapEditViewModels(this IServiceCollection services)
+        {
+            services.AddSingleton<MapTabTexturesViewModel>();
+            services.AddSingleton<MapTabDecorationsViewModel>();
+            services.AddSingleton<MapTabTerrainViewModel>();
+            services.AddSingleton<MapTabTilesViewModel>();
+            services.AddSingleton<MapTabItemsViewModel>();
+            services.AddSingleton<MapTabEntitiesViewModel>();
+            services.AddSingleton<MapTabEntrancesViewModel>();
+            services.AddSingleton<MapTabSpawnsViewModel>();
+            services.AddSingleton<MapTabEffectsViewModel>();
+            services.AddSingleton<MapTabPropertiesViewModel>();
+            services.AddSingleton<MapEditViewModel>();
         }
         
         private static void AddDevTabViewModels(this IServiceCollection services)
@@ -103,6 +129,9 @@ public static void RegisterPages(this IServiceProvider provider)
 
     public partial class App : Application
     {
+        public static Action<IServiceCollection>? RegisterServices { get; set; }
+        public static Action<IServiceProvider>? OnServicesReady { get; set; }
+        
         public override void Initialize()
         {
             AvaloniaXamlLoader.Load(this);
@@ -132,6 +161,10 @@ public override void OnFrameworkInitializationCompleted()
             var collection = new ServiceCollection();
             collection.AddCommonServices();
 
+
+
+            RegisterServices?.Invoke(collection);
+            
             // TopLevel provider
             collection.AddSingleton<Func<TopLevel?>>(x => () =>
             {
@@ -148,7 +181,7 @@ public override void OnFrameworkInitializationCompleted()
 
             services.RegisterPages();
 
-
+            OnServicesReady?.Invoke(services);
             var vm = services.GetRequiredService<DevFormViewModel>();
 
             if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
diff --git a/RogueEssence.Editor.Avalonia/Assets/DataGridStyles.axaml b/RogueEssence.Editor.Avalonia/Assets/DataGridStyles.axaml
new file mode 100644
index 00000000..0e9264ae
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/Assets/DataGridStyles.axaml
@@ -0,0 +1,46 @@
+<Styles xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    
+    <Style Selector="DataGrid.default">
+        <Setter Property="AutoGenerateColumns" Value="False"/>
+        <Setter Property="CanUserReorderColumns" Value="False"/>
+        <Setter Property="CanUserResizeColumns" Value="False"/>
+        <Setter Property="CanUserSortColumns" Value="True"/>
+        <Setter Property="GridLinesVisibility" Value="All"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource Brush.Border2}"/>
+        <Setter Property="Background" Value="{DynamicResource Brush.Contents}"/>
+    </Style>
+    
+    <Style Selector="DataGrid.default DataGridColumnHeader">
+        <Setter Property="Background" Value="{DynamicResource Brush.DataGrid.HeaderBackground}"/>
+    </Style>
+    
+    
+        
+    <Style Selector="DataGridCell">
+        <Setter Property="Padding" Value="0,4" /> 
+        <Setter Property="MinHeight" Value="10" />
+    </Style>
+    <Style Selector="DataGridCell TextBlock">
+        <Setter Property="Margin" Value="4, 0" /> 
+    </Style>
+    <Style Selector="DataGridColumnHeader">
+        <Setter Property="Padding" Value="4,2,-6,2"/>
+    </Style>
+
+
+    
+    <Style Selector="DataGrid.default DataGridCell">
+        <Setter Property="Padding" Value="0,4" /> 
+        <Setter Property="MinHeight" Value="10" />
+    </Style>
+    <Style Selector="DataGrid.default DataGridCell TextBlock">
+        <Setter Property="Margin" Value="4, 0" /> 
+    </Style>
+    <Style Selector="DataGrid.default DataGridColumnHeader">
+        <Setter Property="Padding" Value="4,2,-6,2"/>
+    </Style>
+
+
+</Styles>
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Assets/Icons.axaml b/RogueEssence.Editor.Avalonia/Assets/Icons.axaml
index cf4b822c..d96ae6da 100644
--- a/RogueEssence.Editor.Avalonia/Assets/Icons.axaml
+++ b/RogueEssence.Editor.Avalonia/Assets/Icons.axaml
@@ -1684,5 +1684,4 @@
   <StreamGeometry x:Key="Icons.FilesFill">M213.66,66.34l-40-40A8,8,0,0,0,168,24H88A16,16,0,0,0,72,40V56H56A16,16,0,0,0,40,72V216a16,16,0,0,0,16,16H168a16,16,0,0,0,16-16V200h16a16,16,0,0,0,16-16V72A8,8,0,0,0,213.66,66.34ZM136,192H88a8,8,0,0,1,0-16h48a8,8,0,0,1,0,16Zm0-32H88a8,8,0,0,1,0-16h48a8,8,0,0,1,0,16Zm64,24H184V104a8,8,0,0,0-2.34-5.66l-40-40A8,8,0,0,0,136,56H88V40h76.69L200,75.31Z</StreamGeometry>
   <StreamGeometry x:Key="Icons.BriefcaseFill">M152,112a8,8,0,0,1-8,8H112a8,8,0,0,1,0-16h32A8,8,0,0,1,152,112Zm80-40V200a16,16,0,0,1-16,16H40a16,16,0,0,1-16-16V72A16,16,0,0,1,40,56H80V48a24,24,0,0,1,24-24h48a24,24,0,0,1,24,24v8h40A16,16,0,0,1,232,72ZM96,56h64V48a8,8,0,0,0-8-8H104a8,8,0,0,0-8,8Zm120,57.61V72H40v41.61A184,184,0,0,0,128,136,184,184,0,0,0,216,113.61Z</StreamGeometry>
   <StreamGeometry x:Key="Icons.HandWavingFill">M219.31,98.46A88,88,0,1,1,67.08,186.77h0L26.15,115.88a16,16,0,0,1,27.69-16L72.4,132a8,8,0,0,0,13.86-8L47,56A16,16,0,0,1,74.69,40L114,108a8,8,0,1,0,13.85-8l-30-52a16,16,0,0,1,27.71-16L166,102.12A48.25,48.25,0,0,0,152,136a47.59,47.59,0,0,0,9.6,28.8,8,8,0,1,0,12.79-9.61A32,32,0,0,1,181,110.26a8,8,0,0,0,2.17-10.43L171.71,80a16,16,0,0,1,27.71-16l19.89,34.46Zm-29.37-57A43.74,43.74,0,0,1,216.74,62l.33.57a8,8,0,0,0,13.86-8L230.6,54a59.64,59.64,0,0,0-36.54-28,8,8,0,0,0-4.12,15.46ZM79.58,225.72A103.58,103.58,0,0,1,53.93,196a8,8,0,0,0-13.86,8,119.56,119.56,0,0,0,29.6,34.28,8,8,0,0,0,9.91-12.56Z</StreamGeometry>
-
 </ResourceDictionary>
diff --git a/RogueEssence.Editor.Avalonia/Assets/ListBoxStyles.axaml b/RogueEssence.Editor.Avalonia/Assets/ListBoxStyles.axaml
index 55748e07..5d9a166c 100644
--- a/RogueEssence.Editor.Avalonia/Assets/ListBoxStyles.axaml
+++ b/RogueEssence.Editor.Avalonia/Assets/ListBoxStyles.axaml
@@ -1,11 +1,9 @@
 <Styles xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:s="using:RogueEssence.Dev">
-
     <Styles.Resources>
         <ControlTheme x:Key="CompactListBoxItem" TargetType="ListBoxItem" BasedOn="{StaticResource {x:Type ListBoxItem}}">
             <Setter Property="Padding" Value="4,2"/>
         </ControlTheme>
     </Styles.Resources>
-
 </Styles>
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Assets/Styles.axaml b/RogueEssence.Editor.Avalonia/Assets/Styles.axaml
index 3103e860..4821fcfa 100644
--- a/RogueEssence.Editor.Avalonia/Assets/Styles.axaml
+++ b/RogueEssence.Editor.Avalonia/Assets/Styles.axaml
@@ -10,8 +10,9 @@
         </StackPanel>
     </Design.PreviewWith>
 
-    
+
     <Style Selector="Expander">
+        <Setter Property="HorizontalContentAlignment" Value="Stretch"></Setter>
         <Style.Resources>
             <SolidColorBrush x:Key="ExpanderContentBackground" Color="Transparent" />
             <SolidColorBrush x:Key="ExpanderHeaderBackground" Color="Transparent" />
@@ -31,7 +32,6 @@
             <Setter Property="Margin" Value="0" />
             <Setter Property="MinHeight" Value="24" />
             <Setter Property="Template">
-
                 <ControlTemplate>
                     <Border x:Name="ToggleButtonBackground">
                         <Grid ColumnDefinitions="Auto, *">
@@ -45,12 +45,10 @@
                                       HorizontalAlignment="Center"
                                       VerticalAlignment="Center"
                                       RenderTransformOrigin="50%,50%"
+                                      RenderTransform="rotate(180deg)"
                                       Stretch="Uniform"
                                       Stroke="{DynamicResource ExpanderChevronForeground}"
                                       StrokeThickness="1" />
-                                <Border.RenderTransform>
-                                    <RotateTransform />
-                                </Border.RenderTransform>
                             </Border>
                             <ContentPresenter Grid.Column="1"
                                               x:Name="PART_ContentPresenter"
@@ -65,9 +63,15 @@
                 </ControlTemplate>
             </Setter>
         </Style>
-    </Style>
 
+        <Style Selector="^ /template/ ToggleButton#ExpanderHeader /template/ Border#ExpandCollapseChevronBorder">
+            <Setter Property="RenderTransform" Value="rotate(90deg)"/>
+        </Style>
 
+        <Style Selector="^:expanded /template/ ToggleButton#ExpanderHeader /template/ Border#ExpandCollapseChevronBorder">
+            <Setter Property="RenderTransform" Value="rotate(180deg)"/>
+        </Style>
+    </Style>
     <Style Selector="UserControl">
         <Setter Property="FontSize" Value="12" />
     </Style>
@@ -795,7 +799,7 @@
     </Style>
 
     <Style Selector="TextBox">
-        <Setter Property="CornerRadius" Value="0" />
+        <Setter Property="CornerRadius" Value="4" />
         <Setter Property="Padding" Value="4,0" />
         <Setter Property="MinHeight" Value="30" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
diff --git a/RogueEssence.Editor.Avalonia/Assets/Themes.axaml b/RogueEssence.Editor.Avalonia/Assets/Themes.axaml
index ed979b55..d9952926 100644
--- a/RogueEssence.Editor.Avalonia/Assets/Themes.axaml
+++ b/RogueEssence.Editor.Avalonia/Assets/Themes.axaml
@@ -24,6 +24,7 @@
       <Color x:Key="Color.TabHeader.BackgroundHovered">#FFDFDFDF</Color>
       <Color x:Key="Color.FG1">#FF1F1F1F</Color>
       <Color x:Key="Color.FG2">#FF6F6F6F</Color>
+      <Color x:Key="Color.ListBox.Background">#FFEBEBEB</Color>
     </ResourceDictionary>
 
     <ResourceDictionary x:Key="Dark">
@@ -49,6 +50,7 @@
       <Color x:Key="Color.TabHeader.BackgroundHovered">#FF404040</Color>
       <Color x:Key="Color.FG1">#FFDDDDDD</Color>
       <Color x:Key="Color.FG2">#60F1F1F1</Color>
+      <Color x:Key="Color.ListBox.Background">#FF1C1C1C</Color>
     </ResourceDictionary>
   </ResourceDictionary.ThemeDictionaries>
 
@@ -67,6 +69,8 @@
   <SolidColorBrush x:Key="Brush.Border1" Color="{DynamicResource Color.Border1}"/>
   <SolidColorBrush x:Key="Brush.Border2" Color="{DynamicResource Color.Border2}"/>
   <SolidColorBrush x:Key="Brush.Border3" Color="{DynamicResource Color.Border3}"/>
+  <SolidColorBrush x:Key="Brush.DataGrid.HeaderBackground" Color="{DynamicResource Color.FlatButton.Background}"/>
+  <SolidColorBrush x:Key="Brush.ListBox.Background" Color="{DynamicResource Color.ListBox.Background}"/>
   <SolidColorBrush x:Key="Brush.FlatButton.Background" Color="{DynamicResource Color.FlatButton.Background}"/>
   <SolidColorBrush x:Key="Brush.FlatButton.BackgroundHovered" Color="{DynamicResource Color.FlatButton.BackgroundHovered}"/>
   <SolidColorBrush x:Key="Brush.IconButton.Background" Color="{DynamicResource Color.IconButton.Background}"/>
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/ClassBox.axaml b/RogueEssence.Editor.Avalonia/DataEditor/ClassBox.axaml
index 4185761b..920c960f 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/ClassBox.axaml
+++ b/RogueEssence.Editor.Avalonia/DataEditor/ClassBox.axaml
@@ -8,12 +8,8 @@
   <Design.DataContext>
     <vm:ClassBoxViewModel/>
   </Design.DataContext>
-  <Grid>
-    <Grid.ColumnDefinitions>
-      <ColumnDefinition Width="80"/>
-      <ColumnDefinition/>
-    </Grid.ColumnDefinitions>
-    <Button x:Name="ClassBoxEditButton" PointerReleased="ClassBoxEditButton_OnPointerReleased">Edit</Button>
-    <TextBlock Text="{Binding Name}" Margin="4,0,0,0" VerticalAlignment="Center" HorizontalAlignment="Left" TextWrapping="Wrap" Width="180" Grid.Column="1"/>
+  <Grid ColumnDefinitions="80, *">
+    <Button x:Name="ClassBoxEditButton" PointerReleased="ClassBoxEditButton_OnPointerReleased" Classes="flat">Edit</Button>
+    <TextBlock Text="{Binding Name}" Margin="4,0,0,0" VerticalAlignment="Center" HorizontalAlignment="Left" TextWrapping="Wrap" MaxWidth="{Binding $parent[Window].Bounds.Width}" Grid.Column="1"/>
   </Grid>
 </UserControl>
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/CollectionBox.axaml b/RogueEssence.Editor.Avalonia/DataEditor/CollectionBox.axaml
index 6b08d051..f0815285 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/CollectionBox.axaml
+++ b/RogueEssence.Editor.Avalonia/DataEditor/CollectionBox.axaml
@@ -4,6 +4,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              mc:Ignorable="d"
+             HorizontalAlignment="Stretch"
              xmlns:converters="clr-namespace:RogueEssence.Dev.Converters"
              x:Class="RogueEssence.Dev.Views.CollectionBox">
     <Design.DataContext>
@@ -11,9 +12,12 @@
     </Design.DataContext>
     <UserControl.Resources>
     </UserControl.Resources>
-    <Grid RowDefinitions="*, *, 40" ColumnDefinitions="*, *, 50">
+    <Grid RowDefinitions="*, *, 40" ColumnDefinitions="*, *, 30" HorizontalAlignment="Stretch">
         <ListBox Name="lbxItems" ItemsSource="{Binding Collection}" SelectedIndex="{Binding SelectedIndex}"
                  DoubleTapped="doubleClickStart" PointerReleased="lbxCollection_DoubleClick" Margin="4"
+                 CornerRadius="4"
+                 HorizontalAlignment="Stretch"
+                 Background="{DynamicResource Brush.ListBox.Background}"
                  Grid.RowSpan="2" Grid.ColumnSpan="2" MinHeight="100">
             <ListBox.ItemTemplate>
                 <DataTemplate>
@@ -43,24 +47,30 @@
         <!--         </DataTemplate> -->
         <!--     </ListBox.ItemTemplate> -->
         <!-- </ListBox> -->
-        <StackPanel Grid.Row="0" Grid.RowSpan="2" Grid.Column="2" Margin="10, 0, 0, 0">
+        <StackPanel Grid.Row="0" Grid.RowSpan="2" Grid.Column="2" Margin="10,0,0,0">
             <Button x:Name="CollectionBoxAddButton" PointerReleased="CollectionBoxAddButton_OnPointerReleased"
-                    Classes="secondary" Margin="0, 0" Padding="4,3, 4, 3">
-                <Path Width="10" Height="10" Margin="0, 2,0,0" Data="{StaticResource Icons.Plus}" />
+                    Classes="secondary" Margin="0,0" Padding="4,3">
+                <Path Width="10" Height="10" Margin="0,2,0,0" Data="{StaticResource Icons.Plus}" />
             </Button>
-            <Button Command="{Binding DeleteCommand}" Classes="secondary" Margin="0, 0" Padding="4,3, 4, 3">
-                <Path Width="10" Height="10" Margin="0,0,0,0" Data="{StaticResource Icons.Minus}" />
+            <Button Command="{Binding DeleteItemAsync}"
+                    IsEnabled="{Binding HasSelection}"
+                    Classes="secondary" Margin="0,0" Padding="4,3">
+                <Path Width="10" Height="10" Data="{StaticResource Icons.Minus}" />
+            </Button>
+        </StackPanel>
+
+        <StackPanel Grid.Row="1" Grid.RowSpan="1" Grid.Column="2" Margin="10,0,0,0">
+            <Button Command="{Binding MoveUp}"
+                    IsEnabled="{Binding CanMoveUp}"
+                    Classes="secondary" Margin="0,0" Padding="4,3">
+                <Path Width="10" Height="10" Margin="0,2,0,0" Data="{StaticResource Icons.CaretUpFill}" />
+            </Button>
+            <Button 
+                    Command="{Binding MoveDown}"
+                    IsEnabled="{Binding CanMoveDown}"
+                    Classes="secondary" Margin="0,0" Padding="4,3">
+                <Path Width="10" Height="10" Data="{StaticResource Icons.CaretDownFill}" />
             </Button>
-    
-            <!-- Remove Grid.Row, Grid.RowSpan, Grid.Column here -->
-            <StackPanel Margin="0, 30, 0, 0">
-                <Button Command="{Binding MoveUpCommand}" Classes="secondary" Margin="0, 0" Padding="4,3, 4, 3">
-                    <Path Width="10" Height="10" Margin="0, 2,0,0" Data="{StaticResource Icons.CaretUpFill}" />
-                </Button>
-                <Button Command="{Binding MoveDownCommand}" Classes="secondary" Margin="0, 0" Padding="4,3, 4, 3">
-                    <Path Width="10" Height="10" Margin="0,0,0,0" Data="{StaticResource Icons.CaretDownFill}" />
-                </Button>
-            </StackPanel>
         </StackPanel>
     </Grid>
 </UserControl>
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/CollectionBoxViewModel.cs b/RogueEssence.Editor.Avalonia/DataEditor/CollectionBoxViewModel.cs
index e57408a5..4286098a 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/CollectionBoxViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/CollectionBoxViewModel.cs
@@ -13,6 +13,7 @@
 using System.Threading.Tasks;
 using Avalonia.Data.Converters;
 using Avalonia.Input;
+using RogueEssence.Dev.Services;
 using RogueEssence.Dev.Views;
 
 namespace RogueEssence.Dev.ViewModels
@@ -75,7 +76,6 @@ public int SelectedIndex
         }
 
         public StringConv StringConv;
-        private Window parent;
 
         public delegate void EditElementOp(int index, object element);
 
@@ -88,44 +88,24 @@ public int SelectedIndex
         public int AddIndex => Index1 ? 1 : 0;
         public bool ConfirmDelete;
         
-        public ReactiveCommand<Unit, Unit> DeleteCommand { get; }
-        public ReactiveCommand<Unit, Unit> MoveUpCommand { get; }
-        public ReactiveCommand<Unit, Unit> MoveDownCommand { get; }
+        public bool CanMoveUp => SelectedIndex > 0;
+        public bool CanMoveDown => SelectedIndex >= 0 && SelectedIndex < Collection.Count - 1;
+        public bool HasSelection => SelectedIndex >= 0;
         
-        
-        public CollectionBoxViewModel(Window parent, StringConv conv)
+        private IDialogService _dialogService;
+        public CollectionBoxViewModel(IDialogService dialogService, StringConv conv)
         {
+            _dialogService = dialogService;
             StringConv = conv;
-            this.parent = parent;
             Collection = new ObservableCollection<ListElement>();
-
-            var collectionCount = Observable.FromEventPattern<NotifyCollectionChangedEventHandler, NotifyCollectionChangedEventArgs>(
-                    h => Collection.CollectionChanged += h,
-                    h => Collection.CollectionChanged -= h)
-                .Select(_ => Collection.Count)
-                .StartWith(Collection.Count);
-
-            var hasSelection = this.WhenAnyValue(x => x.SelectedIndex, index => index >= 0);
-            
-            DeleteCommand = ReactiveCommand.CreateFromTask(DeleteItemAsync, hasSelection);
-            
-            MoveUpCommand = ReactiveCommand.Create(MoveUp, 
-                this.WhenAnyValue(x => x.SelectedIndex, index => index > 0));
-            
-            MoveDownCommand = ReactiveCommand.Create(MoveDown,
-                Observable.CombineLatest(
-                    this.WhenAnyValue(x => x.SelectedIndex),
-                    collectionCount,
-                    (index, count) => index >= 0 && index < count - 1));
-            
-            // Force UI refresh when CanExecute changes
-            MoveDownCommand.CanExecute.Subscribe(canExecute => 
+            this.WhenAnyValue(x => x.SelectedIndex).Subscribe(_ =>
             {
-                Console.WriteLine($"MoveDown button should be {(canExecute ? "enabled" : "disabled")}");
+                this.RaisePropertyChanged(nameof(CanMoveUp));
+                this.RaisePropertyChanged(nameof(CanMoveDown));
+                this.RaisePropertyChanged(nameof(HasSelection));
             });
         }
-
-        private void MoveDown()
+        public void MoveDown()
         {
             if (SelectedIndex > -1 && SelectedIndex < Collection.Count - 1)
             {
@@ -202,19 +182,19 @@ public void btnAdd_Click(bool advancedEdit)
             OnEditItem?.Invoke(index, element, advancedEdit, InsertItem);
         }
 
-        private async Task DeleteItemAsync()
+        public async Task DeleteItemAsync()
         {
             if (SelectedIndex > -1 && SelectedIndex < Collection.Count)
             {
                 if (ConfirmDelete)
                 {
-                    MessageBox.MessageBoxResult result = await MessageBox.Show(
-                        parent,
+                    MessageBoxWindowView.MessageBoxResult result = await MessageBoxWindowView.Show(
+                        _dialogService,
                         "Are you sure you want to delete this item:\n" + Collection[SelectedIndex].DisplayValue,
                         "Confirm Delete",
-                        MessageBox.MessageBoxButtons.YesNo);
+                        MessageBoxWindowView.MessageBoxButtons.YesNo);
 
-                    if (result == MessageBox.MessageBoxResult.No)
+                    if (result == MessageBoxWindowView.MessageBoxResult.No)
                         return;
                 }
 
@@ -236,7 +216,7 @@ private void Switch(int a, int b)
             Collection[b].Key = b;
         }
 
-        private void MoveUp()
+        public void MoveUp()
         {
             if (SelectedIndex > 0)
             {
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/DataEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/DataEditor.cs
index 15665e61..da2b8952 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/DataEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/DataEditor.cs
@@ -67,7 +67,12 @@ public static void LoadDataControls(string assetName, object obj, DataEditForm e
             LoadClassControls(editor.ControlPanel, assetName, null, obj.ToString(), editType, new object[0], obj, true, new Type[0], false);
             TrackTypeSize(editor, editType);
         }
-
+        public static void LoadDataControls(string assetName, object obj, StackPanel panel)
+        {
+            Type editType = obj.GetType();
+            LoadClassControls(panel, assetName, null, obj.ToString(), editType, new object[0], obj, true, new Type[0], false);
+        }
+        
         /// <summary>
         /// Sets the editor window based on saved values (if there are any), and sets the event to save editor dimensions when changed.
         /// </summary>
@@ -122,7 +127,7 @@ public static void LoadClassControls(StackPanel control, string parent, Type par
             IEditor converter = findEditor(type, attributes, advancedEdit);
             converter.LoadClassControls(control, parent, parentType, name, type, attributes, member, isWindow, subGroupStack, advancedEdit);
         }
-
+        
         public static void LoadWindowControls(StackPanel control, string parent, Type parentType, string name, Type type, object[] attributes, object obj, Type[] subGroupStack, bool advancedEdit)
         {
             IEditor converter = findEditor(type, attributes, advancedEdit);
@@ -211,5 +216,198 @@ public static string GetFriendlyTypeString(this Type type)
             return type.GetDisplayName();
         }
     }
+    
+    
+    
+    
+    // public static class ReflectedDataEditor
+    // {
+    //     private static List<IEditor> editors;
+    //
+    //     public static object clipboardObj;
+    //
+    //     private static Dictionary<Type, string> friendlyTypeNames;
+    //
+    //     public static void Init()
+    //     {
+    //         clipboardObj = new object();
+    //         editors = new List<IEditor>();
+    //         friendlyTypeNames = new Dictionary<Type, string>();
+    //     }
+    //
+    //     public static void AddEditor(IEditor editor)
+    //     {
+    //         //maintain inheritance order
+    //         Type convertingType = editor.GetConvertingType();
+    //         for (int ii = 0; ii < editors.Count; ii++)
+    //         {
+    //             if (convertingType.IsSubclassOf(editors[ii].GetConvertingType()))
+    //             {
+    //                 editors.Insert(ii, editor);
+    //                 return;
+    //             }
+    //             else if (convertingType == editors[ii].GetConvertingType() && convertingType != null && editors[ii].GetAttributeType() == null)
+    //             {
+    //                 editors.Insert(ii, editor);
+    //                 return;
+    //             }
+    //         }
+    //         editors.Add(editor);
+    //
+    //         string friendlyName = editor.GetTypeString();
+    //         if (friendlyName != null && !friendlyTypeNames.ContainsKey(convertingType))
+    //             friendlyTypeNames[convertingType] = friendlyName;
+    //     }
+    //
+    //     public static void LoadDataControls(string assetName, object obj, DataEditForm editor)
+    //     {
+    //         Type editType = obj.GetType();
+    //         LoadClassControls(editor.ControlPanel, assetName, null, obj.ToString(), editType, new object[0], obj, true, new Type[0], false);
+    //         TrackTypeSize(editor, editType);
+    //     }
+    //
+    //     /// <summary>
+    //     /// Sets the editor window based on saved values (if there are any), and sets the event to save editor dimensions when changed.
+    //     /// </summary>
+    //     /// <param name="editor"></param>
+    //     /// <param name="editType"></param>
+    //     public static void TrackTypeSize(DataEditForm editor, Type editType)
+    //     {
+    //         Size savedSize;
+    //         if (DevDataManager.GetTypeSize(editType, out savedSize))
+    //         {
+    //             //TODO: avalonia pls, why you increase the width of the window immediately after opening??
+    //             editor.Width = savedSize.Width - 10;
+    //             editor.Height = savedSize.Height;
+    //         }
+    //
+    //         void editorWindow_SizeChanged(Size size)
+    //         {
+    //             DevDataManager.SetTypeSize(editType, size);
+    //         }
+    //
+    //         editor.GetObservable(TopLevel.ClientSizeProperty).Subscribe(editorWindow_SizeChanged);
+    //     }
+    //
+    //     private static IEditor findEditor(Type objType, object[] attributes, bool noSimple)
+    //     {
+    //         foreach (IEditor editor in editors)
+    //         {
+    //             if (noSimple && editor.SimpleEditor)
+    //                 continue;
+    //
+    //             Type editType = editor.GetConvertingType();
+    //             if (editType.IsAssignableFrom(objType))
+    //             {
+    //                 Type attrType = editor.GetAttributeType();
+    //                 if (attrType == null)
+    //                     return editor;
+    //                 else
+    //                 {
+    //                     foreach (object attr in attributes)
+    //                     {
+    //                         if (attr.GetType() == attrType)
+    //                             return editor;
+    //                     }
+    //                 }
+    //             }
+    //         }
+    //         throw new ArgumentException("Unhandled type!");
+    //     }
+    //
+    //     public static void LoadClassControls(StackPanel control, string parent, Type parentType, string name, Type type, object[] attributes, object member, bool isWindow, Type[] subGroupStack, bool advancedEdit)
+    //     {
+    //         IEditor converter = findEditor(type, attributes, advancedEdit);
+    //         converter.LoadClassControls(control, parent, parentType, name, type, attributes, member, isWindow, subGroupStack, advancedEdit);
+    //     }
+    //
+    //     public static void LoadWindowControls(StackPanel control, string parent, Type parentType, string name, Type type, object[] attributes, object obj, Type[] subGroupStack, bool advancedEdit)
+    //     {
+    //         IEditor converter = findEditor(type, attributes, advancedEdit);
+    //         converter.LoadWindowControls(control, parent, parentType, name, type, attributes, obj, subGroupStack);
+    //     }
+    //
+    //     public static void LoadMemberControl(string parent, object obj, StackPanel control, string name, Type type, object[] attributes, object member, bool isWindow, Type[] subGroupStack)
+    //     {
+    //         IEditor converter = findEditor(obj.GetType(), attributes, false);
+    //         converter.LoadMemberControl(parent, obj, control, name, type, attributes, member, isWindow, subGroupStack);
+    //     }
+    //
+    //     public static void SaveDataControls(ref object obj, StackPanel control, Type[] subGroupStack)
+    //     {
+    //         obj = SaveClassControls(control, obj.ToString(), obj.GetType(), new object[0], true, subGroupStack, false);
+    //     }
+    //
+    //     public static object SaveClassControls(StackPanel control, string name, Type type, object[] attributes, bool isWindow, Type[] subGroupStack, bool advancedEdit)
+    //     {
+    //         IEditor converter = findEditor(type, attributes, advancedEdit);
+    //         return converter.SaveClassControls(control, name, type, attributes, isWindow, subGroupStack, advancedEdit);
+    //     }
+    //
+    //
+    //     public static object SaveWindowControls(StackPanel control, string name, Type type, object[] attributes, Type[] subGroupStack, bool advancedEdit)
+    //     {
+    //         IEditor converter = findEditor(type, attributes, advancedEdit);
+    //         return converter.SaveWindowControls(control, name, type, attributes, subGroupStack);
+    //     }
+    //
+    //
+    //     public static object SaveMemberControl(object obj, StackPanel control, string name, Type type, object[] attributes, bool isWindow, Type[] subGroupStack)
+    //     {
+    //         IEditor converter = findEditor(obj.GetType(), attributes, false);
+    //         return converter.SaveMemberControl(obj, control, name, type, attributes, isWindow, subGroupStack);
+    //     }
+    //
+    //     public static string GetString(object obj, Type type, object[] attributes)
+    //     {
+    //         if (obj == null)
+    //             return "NULL";
+    //         IEditor editor = findEditor(obj.GetType(), attributes, false);
+    //         return editor.GetString(obj, type, attributes);
+    //     }
+    //
+    //     public static string GetWindowTitle(string parent, string name, object obj, Type type)
+    //     {
+    //         return GetWindowTitle(parent, name, obj, type, new object[0]);
+    //     }
+    //
+    //     public static string GetWindowTitle(string parent, string name, object obj, Type type, object[] attributes)
+    //     {
+    //         string parentStr = Text.GetMemberTitle(parent);
+    //         string nameStr = Text.GetMemberTitle(name);
+    //
+    //         //if (obj == null)
+    //         //    return String.Format("{0}.{1}: New {2}", parentStr, nameStr, type.Name);
+    //         //else
+    //         //    return String.Format("{0}.{1}: {2}", parentStr, nameStr, DataEditor.GetString(obj, type, attributes));
+    //         return String.Format("{0}: {1}", parentStr, nameStr);
+    //     }
+    //
+    //     public static void SetClipboardObj(object obj, Type converterType)
+    //     {
+    //         try
+    //         {
+    //             if (converterType == null)
+    //                 clipboardObj = ReflectionExt.SerializeCopy(obj);
+    //             else
+    //             {
+    //                 JsonConverter conv = (JsonConverter)Activator.CreateInstance(converterType);
+    //                 clipboardObj = ReflectionExt.SerializeCopy(obj, conv);
+    //             }
+    //         }
+    //         catch (Exception ex)
+    //         {
+    //             DiagManager.Instance.LogError(ex);
+    //         }
+    //     }
+    //
+    //     public static string GetFriendlyTypeString(this Type type)
+    //     {
+    //         string displayName;
+    //         if (friendlyTypeNames.TryGetValue(type, out displayName))
+    //             return displayName;
+    //         return type.GetDisplayName();
+    //     }
+    // }
 }
 
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/DictionaryBox.axaml b/RogueEssence.Editor.Avalonia/DataEditor/DictionaryBox.axaml
index 42f084fe..ec858ada 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/DictionaryBox.axaml
+++ b/RogueEssence.Editor.Avalonia/DataEditor/DictionaryBox.axaml
@@ -6,30 +6,35 @@
              mc:Ignorable="d"
              xmlns:converters="clr-namespace:RogueEssence.Dev.Converters"
              x:Class="RogueEssence.Dev.Views.DictionaryBox">
-  <Design.DataContext>
-    <vm:DictionaryBoxViewModel/>
-  </Design.DataContext>
-  <UserControl.Resources>
-  </UserControl.Resources>
-  <Grid>
-    <Grid.RowDefinitions>
-      <RowDefinition/>
-      <RowDefinition/>
-      <RowDefinition Height="40"/>
-    </Grid.RowDefinitions>
-    <Grid.ColumnDefinitions>
-      <ColumnDefinition/>
-      <ColumnDefinition/>
-    </Grid.ColumnDefinitions>
-    <DataGrid Name="gridItems" IsReadOnly="true" ItemsSource="{Binding Collection}" SelectedIndex="{Binding SelectedIndex, Mode=TwoWay}" DoubleTapped="doubleClickStart" PointerReleased="lbxCollection_DoubleClick" Margin="4" Grid.RowSpan="2" Grid.ColumnSpan="2" MinHeight="60">
-      <DataGrid.Columns>
-        <DataGridTextColumn Header="Key"
-                      Binding="{Binding Key}" />
-        <DataGridTextColumn Header="Value"
-                            Binding="{Binding Path=DisplayValue}" />
-      </DataGrid.Columns>
-    </DataGrid>
-    <Button x:Name="DictionaryBoxAddButton" PointerReleased="DictionaryBoxAddButton_OnPointerReleased" Margin="4" Grid.Row="2" Grid.Column="0">Add</Button>
-    <Button Command="{Binding btnDelete_Click}" Margin="4" Grid.Row="2" Grid.Column="1">Delete</Button>
-  </Grid>
-</UserControl>
+    <Design.DataContext>
+        <vm:DictionaryBoxViewModel />
+    </Design.DataContext>
+    <UserControl.Resources>
+    </UserControl.Resources>
+    <Grid RowDefinitions="200, *, *, 40" ColumnDefinitions="*, *, 30">
+        <DataGrid Classes="default" Name="gridItems" IsReadOnly="true"
+                  ItemsSource="{Binding Collection}"
+                  SelectedIndex="{Binding SelectedIndex, Mode=TwoWay}"
+                  DoubleTapped="doubleClickStart"
+                  PointerReleased="lbxCollection_DoubleClick"
+                  Grid.RowSpan="3" Grid.ColumnSpan="2"
+                  ScrollViewer.VerticalScrollBarVisibility="Auto"
+                  VerticalAlignment="Stretch"
+                  HorizontalAlignment="Stretch">
+            <DataGrid.Columns>
+                <DataGridTextColumn Header="Key" Binding="{Binding Key}" Width="*" MinWidth="60" />
+                <DataGridTextColumn Header="Value" Binding="{Binding Path=DisplayValue}" Width="2*" MinWidth="100" />
+            </DataGrid.Columns>
+        </DataGrid>
+
+        <StackPanel Grid.Row="0" Grid.RowSpan="3" Grid.Column="2" Margin="4,0,0,0">
+            <Button x:Name="DictionaryBoxAddButton" PointerReleased="DictionaryBoxAddButton_OnPointerReleased"
+                    Classes="secondary" Margin="0,0,0,2" Padding="4,3">
+                <Path Width="10" Height="10" Margin="0,2,0,0" Data="{StaticResource Icons.Plus}" />
+            </Button>
+            <Button Command="{Binding btnDelete_Click}" Classes="secondary" Margin="0,0,0,2" Padding="4,3">
+                <Path Width="10" Height="10" Data="{StaticResource Icons.Minus}" />
+            </Button>
+        </StackPanel>
+    </Grid>
+</UserControl>
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/DictionaryBoxViewModel.cs b/RogueEssence.Editor.Avalonia/DataEditor/DictionaryBoxViewModel.cs
index 991d3778..fb423eac 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/DictionaryBoxViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/DictionaryBoxViewModel.cs
@@ -8,6 +8,7 @@
 using RogueElements;
 using System.Collections;
 using Avalonia.Input;
+using RogueEssence.Dev.Services;
 using RogueEssence.Dev.Views;
 
 namespace RogueEssence.Dev.ViewModels
@@ -58,15 +59,14 @@ public int SelectedIndex
         public event Action OnMemberChanged;
 
         public StringConv StringConv;
-
-        private Window parent;
-
+        
         public bool ConfirmDelete;
 
-        public DictionaryBoxViewModel(Window parent, StringConv conv)
+        private IDialogService _dialogService;
+        public DictionaryBoxViewModel(IDialogService dialogService, StringConv conv)
         {
             StringConv = conv;
-            this.parent = parent;
+            _dialogService = dialogService;
             Collection = new ObservableCollection<DictionaryElement>();
         }
 
@@ -104,7 +104,7 @@ private async void editKey(object oldKey, object key, object element)
             int existingIndex = getIndexFromKey(key);
             if (existingIndex > -1)
             {
-                await MessageBox.Show(parent, "Dictionary already contains this key!", "Error", MessageBox.MessageBoxButtons.Ok);
+                await MessageBoxWindowView.Show(_dialogService, "Dictionary already contains this key!", "Error", MessageBoxWindowView.MessageBoxButtons.Ok);
                 return;
             }
 
@@ -119,7 +119,7 @@ private async void insertKey(object oldKey, object key, object element)
             int existingIndex = getIndexFromKey(key);
             if (existingIndex > -1)
             {
-                await MessageBox.Show(parent, "Dictionary already contains this key!", "Error", MessageBox.MessageBoxButtons.Ok);
+                await MessageBoxWindowView.Show(_dialogService, "Dictionary already contains this key!", "Error", MessageBoxWindowView.MessageBoxButtons.Ok);
                 return;
             }
             bool advancedEdit = false;
@@ -181,9 +181,9 @@ public async void btnDelete_Click()
             {
                 if (ConfirmDelete)
                 {
-                    MessageBox.MessageBoxResult result = await MessageBox.Show(parent, "Are you sure you want to delete this item:\n" + Collection[SelectedIndex].DisplayValue, "Confirm Delete",
-                    MessageBox.MessageBoxButtons.YesNo);
-                    if (result == MessageBox.MessageBoxResult.No)
+                    MessageBoxWindowView.MessageBoxResult result = await MessageBoxWindowView.Show(_dialogService, "Are you sure you want to delete this item:\n" + Collection[SelectedIndex].DisplayValue, "Confirm Delete",
+                        MessageBoxWindowView.MessageBoxButtons.YesNo);
+                    if (result == MessageBoxWindowView.MessageBoxResult.No)
                         return;
                 }
 
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/DataFolderEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/DataFolderEditor.cs
index af53320b..bae35914 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/DataFolderEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/DataFolderEditor.cs
@@ -17,6 +17,7 @@ namespace RogueEssence.Dev
 {
     public class DataFolderEditor : StringEditor
     {
+        public DataFolderEditor(EditorContext context) : base(context) { }
         public override bool DefaultSubgroup => true;
 
         public override bool DefaultDecoration => false;
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/Editor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/Editor.cs
index 85d30e72..8b157be3 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/Editor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/Editor.cs
@@ -11,11 +11,18 @@
 using System.Reflection;
 using System.Text;
 using System.Xml.Linq;
+using RogueEssence.Dev.Services;
 
 namespace RogueEssence.Dev
 {
     public abstract class Editor<T> : IEditor
     {
+        protected readonly EditorContext _context;
+
+        protected Editor(EditorContext context)
+        {
+            _context = context;
+        }
         protected delegate void CreateMethod(PartialType type, Type fullType);
 
         /// <summary>
@@ -118,12 +125,75 @@ public virtual void LoadWindowControls(StackPanel control, string parent, Type p
             }
         }
 
+        
+         public virtual void LoadWindowControlsReflected(StackPanel control, string parent, Type parentType, string name, Type type, object[] attributes, T obj, Type[] subGroupStack)
+        {
+            //go through all members and add for them
+            //control starts off clean; this is the control that will have all member controls on it
+            try
+            {
+                List<MemberInfo> myFields = type.GetEditableMembers();
+
+                List<List<MemberInfo>> tieredFields = new List<List<MemberInfo>>();
+                for (int ii = 0; ii < myFields.Count; ii++)
+                {
+                    if (myFields[ii].GetCustomAttributes(typeof(NonEditedAttribute), false).Length > 0)
+                        continue;
+                    if (myFields[ii].GetCustomAttributes(typeof(NonSerializedAttribute), false).Length > 0)
+                        continue;
+
+                    object member = myFields[ii].GetValue(obj);
+                    if (member == null && myFields[ii].GetCustomAttributes(typeof(NonNullAttribute), false).Length > 0)
+                        throw new Exception("Null class member found in " + type.ToString() + ": " + myFields[ii].Name);
+
+                    if (myFields[ii].GetCustomAttributes(typeof(SharedRowAttribute), false).Length == 0)
+                        tieredFields.Add(new List<MemberInfo>());
+                    tieredFields[tieredFields.Count - 1].Add(myFields[ii]);
+                }
+
+                for (int ii = 0; ii < tieredFields.Count; ii++)
+                {
+                    if (tieredFields[ii].Count == 1)
+                    {
+                        MemberInfo myInfo = tieredFields[ii][0];
+                        StackPanel stack = new StackPanel();
+                        control.Children.Add(stack);
+                        DataEditor.LoadMemberControl(name, obj, stack, myInfo.Name, myInfo.GetMemberInfoType(), myInfo.GetCustomAttributes(false), myInfo.GetValue(obj), false, subGroupStack);
+                    }
+                    else
+                    {
+                        Grid sharedRowPanel = getSharedRowPanel(tieredFields[ii].Count);
+                        control.Children.Add(sharedRowPanel);
+                        for (int jj = 0; jj < tieredFields[ii].Count; jj++)
+                        {
+                            MemberInfo myInfo = tieredFields[ii][jj];
+                            StackPanel stack = new StackPanel();
+                            sharedRowPanel.Children.Add(stack);
+                            stack.SetValue(Grid.ColumnProperty, jj);
+                            DataEditor.LoadMemberControl(name, obj, stack, myInfo.Name, myInfo.GetMemberInfoType(), myInfo.GetCustomAttributes(false), myInfo.GetValue(obj), false, subGroupStack);
+                        }
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                DiagManager.Instance.LogError(e);
+            }
+        }
         //TODO: add the ability to tag- using attributes- a specific member with a specific editor
         public virtual void LoadMemberControl(string parent, T obj, StackPanel control, string name, Type type, object[] attributes, object member, bool isWindow, Type[] subGroupStack)
         {
             DataEditor.LoadClassControls(control, parent, obj.GetType(), name, type, attributes, member, isWindow, subGroupStack, false);
         }
+        //TODO: add the ability to tag- using attributes- a specific member with a specific editor
+        public virtual void LoadMemberControlReflected(string parent, T obj, StackPanel control, string name, Type type, object[] attributes, object member, bool isWindow, Type[] subGroupStack)
+        {
+            DataEditor.LoadClassControls(control, parent, obj.GetType(), name, type, attributes, member, isWindow, subGroupStack, false);
+        }
 
+        
+
+        
         public virtual T SaveWindowControls(StackPanel control, string name, Type type, object[] attributes, Type[] subGroupStack)
         {
             try
@@ -183,13 +253,12 @@ public virtual T SaveWindowControls(StackPanel control, string name, Type type,
                 return default(T);
             }
         }
-
+        
         public virtual object SaveMemberControl(T obj, StackPanel control, string name, Type type, object[] attributes, bool isWindow, Type[] subGroupStack)
         {
             return DataEditor.SaveClassControls(control, name, type, attributes, isWindow, subGroupStack, false);
         }
-
-
+        
         public virtual string GetString(T obj, Type type, object[] attributes)
         {
             return obj == null ? "NULL" : obj.ToString();
@@ -256,21 +325,70 @@ void IEditor.LoadClassControls(StackPanel control, string parent, Type parentTyp
                 //add lambda expression for editing a single element
                 mv.OnEditItem += (object element, bool advancedEdit, ClassBoxViewModel.EditElementOp op) =>
                 {
-                    DataEditForm frmData = new DataEditForm();
-                    frmData.Title = DataEditor.GetWindowTitle(parent, name, element, type, ReflectionExt.GetPassableAttributes(0, attributes));
-
-                    DataEditor.LoadClassControls(frmData.ControlPanel, parent, parentType, name, type, ReflectionExt.GetPassableAttributes(0, attributes), element, true, new Type[0], advancedEdit);
-                    DataEditor.TrackTypeSize(frmData, type);
+                    
+                    EditorPageViewModel vm = control.FindAncestorViewModel<EditorPageViewModel>();
+                    
+                                    
+                    string title = DataEditor.GetWindowTitle(parent, name, element, type, ReflectionExt.GetPassableAttributes(0, attributes));
+                    NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(title, vm.Node.Icon);
+                    vm.Node.AddNodeIfNotExists(node);
+                    
+                    ReflectedDataPageViewModel newEditor = _context.PageFactory.CreatePage<ReflectedDataPageViewModel>(node);
+                    newEditor.SetPageTitle(title, vm.Node.Icon);
 
-                    frmData.SelectedOKEvent += async () =>
+                    newEditor.OnLoadAction = panel =>
                     {
-                        element = DataEditor.SaveClassControls(frmData.ControlPanel, name, type, ReflectionExt.GetPassableAttributes(0, attributes), true, new Type[0], advancedEdit);
+                        DataEditor.LoadClassControls(panel, parent, parentType, name, type,
+                            ReflectionExt.GetPassableAttributes(0, attributes), element, true, new Type[0],
+                            advancedEdit);
+                    };
+                    newEditor.OnOKAction = async (panel) =>
+                    {
+                        element = DataEditor.SaveClassControls(panel, name, type,
+                            ReflectionExt.GetPassableAttributes(0, attributes), true, new Type[0], advancedEdit);
                         op(element);
                         return true;
                     };
-
-                    control.GetOwningForm().RegisterChild(frmData);
-                    frmData.Show();
+                    
+                            
+                    _context.TabEvents.AddChildPage(vm, newEditor);
+
+                    // _context.OpenElementEditor(vm, title, elementName, elementType, attributes, element, advancedEdit, op);
+                    // DataEditForm frmData = new DataEditForm();
+                    // frmData.Title = DataEditor.GetWindowTitle(parent, name, element, type, ReflectionExt.GetPassableAttributes(0, attributes));
+                    //
+                    // DataEditor.LoadClassControls(frmData.ControlPanel, parent, parentType, name, type, ReflectionExt.GetPassableAttributes(0, attributes), element, true, new Type[0], advancedEdit);
+                    // DataEditor.TrackTypeSize(frmData, type);
+                    //
+                    // frmData.SelectedOKEvent += async () =>
+                    // {
+                    //     element = DataEditor.SaveClassControls(frmData.ControlPanel, name, type, ReflectionExt.GetPassableAttributes(0, attributes), true, new Type[0], advancedEdit);
+                    //     op(element);
+                    //     return true;
+                    // };
+                    //
+                    // control.GetOwningForm().RegisterChild(frmData);
+                    // frmData.Show();
+
+
+
+                    // string title = DataEditor.GetWindowTitle(parent, name, element, type, ReflectionExt.GetPassableAttributes(0, attributes));
+                    // var (node, editor) = vm.AddNewNodeAndTab(title);
+                    // DataEditForm frmData = new DataEditForm();
+                    // frmData.Title = DataEditor.GetWindowTitle(parent, name, element, type, ReflectionExt.GetPassableAttributes(0, attributes));
+                    //
+                    // DataEditor.LoadClassControls(frmData.ControlPanel, parent, parentType, name, type, ReflectionExt.GetPassableAttributes(0, attributes), element, true, new Type[0], advancedEdit);
+                    // DataEditor.TrackTypeSize(frmData, type);
+                    //
+                    // frmData.SelectedOKEvent += async () =>
+                    // {
+                    //     element = DataEditor.SaveClassControls(frmData.ControlPanel, name, type, ReflectionExt.GetPassableAttributes(0, attributes), true, new Type[0], advancedEdit);
+                    //     op(element);
+                    //     return true;
+                    // };
+                    //
+                    // control.GetOwningForm().RegisterChild(frmData);
+                    // frmData.Show();
                 };
 
                 {
@@ -299,7 +417,7 @@ void IEditor.LoadClassControls(StackPanel control, string parent, Type parentTyp
                         if (type2.IsAssignableFrom(type1))
                             mv.LoadFromSource(DataEditor.clipboardObj);
                         else
-                            await MessageBox.Show(control.GetOwningForm(), String.Format("Incompatible types:\n{0}\n{1}", type1.AssemblyQualifiedName, type2.AssemblyQualifiedName), "Invalid Operation", MessageBox.MessageBoxButtons.Ok);
+                            await MessageBoxWindowView.Show(_context.DialogService, String.Format("Incompatible types:\n{0}\n{1}", type1.AssemblyQualifiedName, type2.AssemblyQualifiedName), "Invalid Operation", MessageBoxWindowView.MessageBoxButtons.Ok);
                     };
 
                     control.ContextMenu = copyPasteStrip;
@@ -415,7 +533,7 @@ void IEditor.LoadClassControls(StackPanel control, string parent, Type parentTyp
                                 DataEditor.LoadWindowControls(controlParent, parent, parentType, name, type1, attributes, DataEditor.clipboardObj, newStack, false);
                             }
                             else
-                                await MessageBox.Show(control.GetOwningForm(), String.Format("Incompatible types:\n{0}\n{1}", type1.AssemblyQualifiedName, type2.AssemblyQualifiedName), "Invalid Operation", MessageBox.MessageBoxButtons.Ok);
+                                await MessageBoxWindowView.Show(_context.DialogService, String.Format("Incompatible types:\n{0}\n{1}", type1.AssemblyQualifiedName, type2.AssemblyQualifiedName), "Invalid Operation", MessageBoxWindowView.MessageBoxButtons.Ok);
                         };
 
                         control.ContextMenu = copyPasteStrip;
@@ -524,7 +642,7 @@ void IEditor.LoadClassControls(StackPanel control, string parent, Type parentTyp
                                 DataEditor.LoadWindowControls(controlParent, parent, parentType, name, type1, attributes, DataEditor.clipboardObj, newStack, advancedEdit);
                             }
                             else
-                                await MessageBox.Show(control.GetOwningForm(), String.Format("Incompatible types:\n{0}\n{1}", type1.AssemblyQualifiedName, type2.AssemblyQualifiedName), "Invalid Operation", MessageBox.MessageBoxButtons.Ok);
+                                await MessageBoxWindowView.Show(_context.DialogService, String.Format("Incompatible types:\n{0}\n{1}", type1.AssemblyQualifiedName, type2.AssemblyQualifiedName), "Invalid Operation", MessageBoxWindowView.MessageBoxButtons.Ok);
                         };
 
                         control.ContextMenu = copyPasteStrip;
@@ -537,7 +655,7 @@ void IEditor.LoadClassControls(StackPanel control, string parent, Type parentTyp
                 }
             }
         }
-
+        
         void IEditor.LoadWindowControls(StackPanel control, string parent, Type parentType, string name, Type type, object[] attributes, object obj, Type[] subGroupStack)
         {
             LoadWindowControls(control, parent, parentType, name, type, attributes, (T)obj, subGroupStack);
@@ -638,7 +756,7 @@ object IEditor.SaveClassControls(StackPanel control, string name, Type type, obj
 
             }
         }
-
+        
         /// <summary>
         /// Creates a string that consists of a generic type and its single type argument.
         /// Used only for the editor display HACK
@@ -989,7 +1107,7 @@ object IEditor.SaveMemberControl(object obj, StackPanel control, string name, Ty
         {
             return SaveMemberControl((T)obj, control, name, type, attributes, isWindow, subGroupStack);
         }
-
+        
         string IEditor.GetString(object obj, Type type, object[] attributes)
         {
             return GetString((T)obj, type, attributes);
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/IEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/IEditor.cs
index b2ad3743..9e97eaed 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/IEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/IEditor.cs
@@ -3,6 +3,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+using RogueEssence.Dev.ViewModels;
 
 namespace RogueEssence.Dev
 {
@@ -13,17 +14,15 @@ public interface IEditor
         Type GetConvertingType();
 
         void LoadClassControls(StackPanel control, string parent, Type parentType, string name, Type type, object[] attributes, object member, bool isWindow, Type[] subGroupStack, bool advancedEdit);
-
+        
         void LoadWindowControls(StackPanel control, string parent, Type parentType, string name, Type type, object[] attributes, object member, Type[] subGroupStack);
-
+        
         void LoadMemberControl(string parent, object obj, StackPanel control, string name, Type type, object[] attributes, object member, bool isWindow, Type[] subGroupStack);
-
+        
         object SaveClassControls(StackPanel control, string name, Type type, object[] attributes, bool isWindow, Type[] subGroupStack, bool advancedEdit);
-
         object SaveWindowControls(StackPanel control, string name, Type type, object[] attributes, Type[] subGroupStack);
-
         object SaveMemberControl(object obj, StackPanel control, string name, Type type, object[] attributes, bool isWindow, Type[] subGroupStack);
-
+        
         string GetString(object obj, Type type, object[] attributes);
 
         string GetTypeString();
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/Primitive/BooleanEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/Primitive/BooleanEditor.cs
index 4a8f0414..387e1d72 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/Primitive/BooleanEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/Primitive/BooleanEditor.cs
@@ -17,6 +17,7 @@ namespace RogueEssence.Dev
 {
     public class BooleanEditor : Editor<Boolean>
     {
+        public BooleanEditor(EditorContext context) : base(context) { }
         public override bool DefaultSubgroup => true;
         public override bool DefaultDecoration => false;
         public override bool DefaultLabel => false;
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/Primitive/ByteEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/Primitive/ByteEditor.cs
index abaad398..10c940f8 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/Primitive/ByteEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/Primitive/ByteEditor.cs
@@ -17,6 +17,8 @@ namespace RogueEssence.Dev
 {
     public class ByteEditor : Editor<Byte>
     {
+        public ByteEditor(EditorContext context) : base(context) { }
+        
         public override bool DefaultSubgroup => true;
         public override bool DefaultDecoration => false;
 
@@ -25,6 +27,7 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
             NumericUpDown nudValue = new NumericUpDown();
             nudValue.Minimum = byte.MinValue;
             nudValue.Maximum = byte.MaxValue;
+            nudValue.Increment = 1;
             NumberRangeAttribute rangeAtt = ReflectionExt.FindAttribute<NumberRangeAttribute>(attributes);
             if (rangeAtt != null)
             {
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/Primitive/CharEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/Primitive/CharEditor.cs
index 3a0d2f41..f02bef3a 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/Primitive/CharEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/Primitive/CharEditor.cs
@@ -17,6 +17,7 @@ namespace RogueEssence.Dev
 {
     public class CharEditor : Editor<Char>
     {
+        public CharEditor(EditorContext context) : base(context) { }
         public override bool DefaultSubgroup => true;
 
         public override bool DefaultDecoration => false;
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/Primitive/DoubleEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/Primitive/DoubleEditor.cs
index 698ed9c0..0ec500b4 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/Primitive/DoubleEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/Primitive/DoubleEditor.cs
@@ -12,11 +12,15 @@
 using Avalonia;
 using System.Reactive.Subjects;
 using System.IO;
+using DynamicData;
 
 namespace RogueEssence.Dev
 {
     public class DoubleEditor : Editor<Double>
     {
+        
+        public DoubleEditor(EditorContext context) : base(context) { }
+        
         public override bool DefaultSubgroup => true;
         public override bool DefaultDecoration => false;
 
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/Primitive/IntEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/Primitive/IntEditor.cs
index f9aa95b3..d333f558 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/Primitive/IntEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/Primitive/IntEditor.cs
@@ -17,6 +17,7 @@ namespace RogueEssence.Dev
 {
     public class IntEditor : Editor<Int32>
     {
+        public IntEditor(EditorContext context) : base(context) { }
         public override bool DefaultSubgroup => true;
         public override bool DefaultDecoration => false;
 
@@ -45,6 +46,7 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
             nudValue.Minimum = minimum;
             nudValue.Maximum = maximum;
             nudValue.Value = member;
+            nudValue.Increment = 1;
 
             control.Children.Add(nudValue);
         }
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/Primitive/SingleEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/Primitive/SingleEditor.cs
index f511389d..78d221db 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/Primitive/SingleEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/Primitive/SingleEditor.cs
@@ -17,6 +17,8 @@ namespace RogueEssence.Dev
 {
     public class SingleEditor : Editor<Single>
     {
+        public SingleEditor(EditorContext context) : base(context) { }
+        
         public override bool DefaultSubgroup => true;
         public override bool DefaultDecoration => false;
 
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/Primitive/StringEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/Primitive/StringEditor.cs
index 177da1ec..56e22301 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/Primitive/StringEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/Primitive/StringEditor.cs
@@ -12,11 +12,13 @@
 using Avalonia;
 using System.Reactive.Subjects;
 using System.IO;
+using Avalonia.Layout;
 
 namespace RogueEssence.Dev
 {
     public class StringEditor : Editor<String>
     {
+        public StringEditor(EditorContext context) : base(context) { }
         public override bool DefaultSubgroup => true;
 
         public override bool DefaultDecoration => false;
@@ -31,6 +33,8 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
             {
                 txtValue.AcceptsReturn = true;
                 txtValue.Height = 80;
+                txtValue.HorizontalContentAlignment = HorizontalAlignment.Left;
+                txtValue.VerticalContentAlignment = VerticalAlignment.Top;
                 //txtValue.Size = new Size(0, 80);
             }
             //else
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/BlobWaterStepEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/BlobWaterStepEditor.cs
index b2c4f5f7..4ca13466 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/BlobWaterStepEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/BlobWaterStepEditor.cs
@@ -18,6 +18,9 @@ namespace RogueEssence.Dev
 {
     public class BlobWaterStepEditor : Editor<IBlobWaterStep>
     {
+        
+        public BlobWaterStepEditor(EditorContext context) : base(context) { }
+        
         public override string GetString(IBlobWaterStep obj, Type type, object[] attributes)
         {
             PropertyInfo blobInfo = typeof(IBlobWaterStep).GetProperty(nameof(obj.Blobs));
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/CombinedGridRoomStepEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/CombinedGridRoomStepEditor.cs
index 8d0c0458..9caae370 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/CombinedGridRoomStepEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/CombinedGridRoomStepEditor.cs
@@ -18,6 +18,7 @@ namespace RogueEssence.Dev
 {
     public class CombinedGridRoomStepEditor : Editor<ICombineGridRoomStep>
     {
+        public CombinedGridRoomStepEditor(EditorContext context) : base(context) { }
         public override string GetString(ICombineGridRoomStep obj, Type type, object[] attributes)
         {
             PropertyInfo mergeRateInfo = typeof(ICombineGridRoomStep).GetProperty(nameof(obj.MergeRate));
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/FloorPlanStepEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/FloorPlanStepEditor.cs
index 55f60607..8358e1ba 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/FloorPlanStepEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/FloorPlanStepEditor.cs
@@ -18,6 +18,7 @@ namespace RogueEssence.Dev
 {
     public class AddConnectedRoomsStepEditor : Editor<IAddConnectedRoomsStep>
     {
+        public AddConnectedRoomsStepEditor(EditorContext context) : base(context) { }
         public override string GetString(IAddConnectedRoomsStep obj, Type type, object[] attributes)
         {
             PropertyInfo amountInfo = typeof(IAddConnectedRoomsStep).GetProperty(nameof(obj.Amount));
@@ -30,6 +31,7 @@ public override string GetString(IAddConnectedRoomsStep obj, Type type, object[]
 
     public class AddDisconnectedRoomsStepEditor : Editor<IAddDisconnectedRoomsStep>
     {
+        public AddDisconnectedRoomsStepEditor(EditorContext context) : base(context) { }
         public override string GetString(IAddDisconnectedRoomsStep obj, Type type, object[] attributes)
         {
             PropertyInfo amountInfo = typeof(IAddDisconnectedRoomsStep).GetProperty(nameof(obj.Amount));
@@ -40,6 +42,8 @@ public override string GetString(IAddDisconnectedRoomsStep obj, Type type, objec
 
     public class ConnectRoomStepEditor : Editor<IConnectRoomStep>
     {
+        
+        public ConnectRoomStepEditor(EditorContext context) : base(context) { }
         public override string GetString(IConnectRoomStep obj, Type type, object[] attributes)
         {
             PropertyInfo connectInfo = typeof(IConnectRoomStep).GetProperty(nameof(obj.ConnectFactor));
@@ -50,6 +54,8 @@ public override string GetString(IConnectRoomStep obj, Type type, object[] attri
 
     public class FloorPathBranchEditor : Editor<IFloorPathBranch>
     {
+        
+        public FloorPathBranchEditor(EditorContext context) : base(context) { }
         public override string GetString(IFloorPathBranch obj, Type type, object[] attributes)
         {
             PropertyInfo fillInfo = typeof(IFloorPathBranch).GetProperty(nameof(obj.FillPercent));
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/GridPathStepEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/GridPathStepEditor.cs
index 48392468..ed1d6ef5 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/GridPathStepEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/GridPathStepEditor.cs
@@ -18,6 +18,8 @@ namespace RogueEssence.Dev
 {
     public class GridPathCircleEditor : Editor<IGridPathCircle>
     {
+        public GridPathCircleEditor(EditorContext context) : base(context) { }
+        
         public override string GetString(IGridPathCircle obj, Type type, object[] attributes)
         {
             PropertyInfo fillInfo = typeof(IGridPathCircle).GetProperty(nameof(obj.CircleRoomRatio));
@@ -30,6 +32,7 @@ public override string GetString(IGridPathCircle obj, Type type, object[] attrib
 
     public class GridPathBranchEditor : Editor<IGridPathBranch>
     {
+        public GridPathBranchEditor(EditorContext context) : base(context) { }
         public override string GetString(IGridPathBranch obj, Type type, object[] attributes)
         {
             PropertyInfo fillInfo = typeof(IGridPathBranch).GetProperty(nameof(obj.RoomRatio));
@@ -42,6 +45,7 @@ public override string GetString(IGridPathBranch obj, Type type, object[] attrib
 
     public class GridPathGridEditor : Editor<IGridPathGrid>
     {
+        public GridPathGridEditor(EditorContext context) : base(context) { }
         public override string GetString(IGridPathGrid obj, Type type, object[] attributes)
         {
             PropertyInfo fillInfo = typeof(IGridPathGrid).GetProperty(nameof(obj.RoomRatio));
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/IntRangeEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/IntRangeEditor.cs
index 47f3bb33..a045eeed 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/IntRangeEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/IntRangeEditor.cs
@@ -26,7 +26,7 @@ public class IntRangeEditor : Editor<IntRange>
         /// </summary>
         public bool Inclusive;
 
-        public IntRangeEditor(bool index1, bool inclusive)
+        public IntRangeEditor(EditorContext context, bool index1, bool inclusive) : base(context)
         {
             Index1 = index1;
             Inclusive = inclusive;
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/LocEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/LocEditor.cs
index 33cf7eb4..09fcdc2a 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/LocEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/LocEditor.cs
@@ -16,6 +16,8 @@ namespace RogueEssence.Dev
 {
     public class LocEditor : Editor<Loc>
     {
+        public LocEditor(EditorContext context) : base(context) { }
+        
         public override bool DefaultSubgroup => true;
         public override bool DefaultDecoration => false;
 
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/MultiRandEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/MultiRandEditor.cs
index 738ac266..8c6dd060 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/MultiRandEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/MultiRandEditor.cs
@@ -17,6 +17,8 @@ namespace RogueEssence.Dev
 {
     public class LoopedRandEditor : Editor<ILoopedRand>
     {
+        
+        public LoopedRandEditor(EditorContext context) : base(context) { }
 
         public override string GetString(ILoopedRand obj, Type type, object[] attributes)
         {
@@ -30,6 +32,8 @@ public override string GetString(ILoopedRand obj, Type type, object[] attributes
 
     public class PresetMultiRandEditor : Editor<IPresetMultiRand>
     {
+        
+        public PresetMultiRandEditor(EditorContext context) : base(context) { }
         public override string GetString(IPresetMultiRand obj, Type type, object[] attributes)
         {
             if (obj.Count == 1)
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/MultiRandPickerEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/MultiRandPickerEditor.cs
index 1c96d3ce..88961f4a 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/MultiRandPickerEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/MultiRandPickerEditor.cs
@@ -17,6 +17,7 @@ namespace RogueEssence.Dev
 {
     public class MultiRandPickerEditor : Editor<IMultiRandPicker>
     {
+        public MultiRandPickerEditor(EditorContext context) : base(context) { }
         public override bool DefaultSubgroup => true;
     }
 }
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/PerlinWaterStepEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/PerlinWaterStepEditor.cs
index ad9ad6d7..8aca8389 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/PerlinWaterStepEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/PerlinWaterStepEditor.cs
@@ -18,6 +18,8 @@ namespace RogueEssence.Dev
 {
     public class PerlinWaterStepEditor : Editor<IPerlinWaterStep>
     {
+        
+        public PerlinWaterStepEditor(EditorContext context) : base(context) { }
         public override string GetString(IPerlinWaterStep obj, Type type, object[] attributes)
         {
             PropertyInfo waterInfo = typeof(IPerlinWaterStep).GetProperty(nameof(obj.WaterPercent));
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/PriorityEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/PriorityEditor.cs
index e4b5dddd..0d0f8644 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/PriorityEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/PriorityEditor.cs
@@ -16,6 +16,7 @@ namespace RogueEssence.Dev
 {
     public class PriorityEditor : Editor<Priority>
     {
+        public PriorityEditor(EditorContext context) : base(context) { }
         public override bool DefaultSubgroup => true;
         public override bool DefaultDecoration => false;
 
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/PriorityListEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/PriorityListEditor.cs
index 58a9818f..92bbeea0 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/PriorityListEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/PriorityListEditor.cs
@@ -9,14 +9,24 @@
 using Avalonia.Controls;
 using RogueEssence.Dev.Views;
 using System.Collections;
+using System.Linq;
 using RogueEssence.Dev.ViewModels;
 using Avalonia.Interactivity;
 using Avalonia;
+using Avalonia.Controls.Primitives;
+using Avalonia.Controls.Templates;
+using Avalonia.Layout;
+using Avalonia.Media;
+using Avalonia.Threading;
+using RogueEssence.Dev.Services;
+using RogueEssence.Dev.Utility;
 
 namespace RogueEssence.Dev
 {
     public class PriorityListEditor : Editor<IPriorityList>
     {
+        
+        public PriorityListEditor(EditorContext context) : base(context) { }
         public override bool DefaultSubgroup => true;
         public override bool DefaultDecoration => false;
         public override bool DefaultLabel => false;
@@ -33,7 +43,7 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
             else
                 lbxValue.MaxHeight = 220;
 
-            PriorityListBoxViewModel vm = new PriorityListBoxViewModel(control.GetOwningForm(), new StringConv(elementType, ReflectionExt.GetPassableAttributes(2, attributes)));
+            PriorityListBoxViewModel vm = new PriorityListBoxViewModel(_context.DialogService, new StringConv(elementType, ReflectionExt.GetPassableAttributes(2, attributes)));
             lbxValue.DataContext = vm;
             CollectionAttribute confirmAtt = ReflectionExt.FindAttribute<CollectionAttribute>(attributes);
             if (confirmAtt != null)
@@ -41,49 +51,64 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
             else
                 vm.ConfirmDelete = true;
 
-            lbxValue.SetListContextMenu(createContextMenu(control, type, vm));
+            lbxValue.SetListContextMenu(createContextMenu(_context.DialogService, control, type, vm));
             lbxValue.MinHeight = lbxValue.MaxHeight;//TODO: Uptake Avalonia fix for improperly updating Grid control dimensions
 
             //add lambda expression for editing a single element
             vm.OnEditItem = (Priority priority, int index, object element, bool advancedEdit, PriorityListBoxViewModel.EditElementOp op) =>
             {
+                EditorPageViewModel pageViewModel = control.FindAncestorViewModel<EditorPageViewModel>();
                 string elementName = name + "[" + priority.ToString() + "]";
-                DataEditForm frmData = new DataEditForm();
-                frmData.Title = DataEditor.GetWindowTitle(parent, elementName, element, elementType, ReflectionExt.GetPassableAttributes(2, attributes));
+                string title = DataEditor.GetWindowTitle(parent, elementName, element, elementType, ReflectionExt.GetPassableAttributes(2, attributes));
 
-                DataEditor.LoadClassControls(frmData.ControlPanel, parent, null, elementName, elementType, ReflectionExt.GetPassableAttributes(2, attributes), element, true, new Type[0], advancedEdit);
-                DataEditor.TrackTypeSize(frmData, elementType);
+                NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(elementName, pageViewModel.Node.Icon);
+                pageViewModel.Node.AddNodeIfNotExists(node);
 
-                frmData.SelectedOKEvent += async () =>
+                NodeHelper.ExpandParents(node, true);
+                ReflectedDataPageViewModel newEditor = _context.PageFactory.CreatePage<ReflectedDataPageViewModel>(node);
+                newEditor.SetPageTitle(title, pageViewModel.Node.Icon);
+
+                newEditor.OnLoadAction = (StackPanel stack) =>
                 {
-                    element = DataEditor.SaveClassControls(frmData.ControlPanel, elementName, elementType, ReflectionExt.GetPassableAttributes(2, attributes), true, new Type[0], advancedEdit);
+                    DataEditor.LoadClassControls(stack, parent, null, elementName, elementType, ReflectionExt.GetPassableAttributes(2, attributes), element, true, new Type[0], advancedEdit);
+                };
+
+                newEditor.OnOKAction = async (StackPanel stack) =>
+                {
+                    element = DataEditor.SaveClassControls(stack, elementName, elementType, ReflectionExt.GetPassableAttributes(2, attributes), true, new Type[0], advancedEdit);
                     op(priority, index, element);
                     return true;
                 };
 
-                control.GetOwningForm().RegisterChild(frmData);
-                frmData.Show();
+                _context.TabEvents.AddChildPage(pageViewModel, newEditor);
             };
+            
             vm.OnEditPriority = (Priority priority, int index, bool advancedEdit, PriorityListBoxViewModel.EditPriorityOp op) =>
             {
+                EditorPageViewModel pageViewModel = control.FindAncestorViewModel<EditorPageViewModel>();
                 string elementName = name + "<Priority>";
-                DataEditForm frmData = new DataEditForm();
-                frmData.Title = DataEditor.GetWindowTitle(parent, elementName, priority, typeof(Priority), ReflectionExt.GetPassableAttributes(1, attributes));
+        
+                NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(elementName, pageViewModel.Node.Icon);
+                pageViewModel.Node.AddNodeIfNotExists(node);
 
-                DataEditor.LoadClassControls(frmData.ControlPanel, parent, null, elementName, typeof(Priority), ReflectionExt.GetPassableAttributes(1, attributes), priority, true, new Type[0], advancedEdit);
-                DataEditor.TrackTypeSize(frmData, typeof(Priority));
+                NodeHelper.ExpandParents(node, true);
+                ReflectedDataPageViewModel newEditor = _context.PageFactory.CreatePage<ReflectedDataPageViewModel>(node);
+                newEditor.SetPageTitle(elementName, pageViewModel.Node.Icon);
 
-                frmData.SelectedOKEvent += async () =>
+                newEditor.OnLoadAction = (StackPanel stack) =>
                 {
-                    object priorityObj = DataEditor.SaveClassControls(frmData.ControlPanel, elementName, typeof(Priority), ReflectionExt.GetPassableAttributes(1, attributes), true, new Type[0], advancedEdit);
+                    DataEditor.LoadClassControls(stack, parent, null, elementName, typeof(Priority), ReflectionExt.GetPassableAttributes(1, attributes), priority, true, new Type[0], advancedEdit);
+                };
+
+                newEditor.OnOKAction = async (StackPanel stack) =>
+                {
+                    object priorityObj = DataEditor.SaveClassControls(stack, elementName, typeof(Priority), ReflectionExt.GetPassableAttributes(1, attributes), true, new Type[0], advancedEdit);
                     op(priority, index, (Priority)priorityObj);
                     return true;
                 };
 
-                control.GetOwningForm().RegisterChild(frmData);
-                frmData.Show();
+                _context.TabEvents.AddChildPage(pageViewModel, newEditor);
             };
-
             vm.LoadFromList(member);
 
 
@@ -99,6 +124,8 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
                     ToolTip.SetTip(expander, desc);
                 expander.IsExpanded = member.Count > 0;
                 expander.Content = lbxValue;
+                expander.HorizontalAlignment = HorizontalAlignment.Stretch;
+                
                 control.Children.Add(expander);
             }
             else
@@ -109,7 +136,7 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
         }
 
 
-        private static ContextMenu createContextMenu(StackPanel control, Type type, PriorityListBoxViewModel vm)
+        private static ContextMenu createContextMenu(IDialogService dialogService, StackPanel control, Type type, PriorityListBoxViewModel vm)
         {
             Type elementType = ReflectionExt.GetBaseTypeArg(typeof(IPriorityList<>), type, 0);
 
@@ -135,7 +162,7 @@ private static ContextMenu createContextMenu(StackPanel control, Type type, Prio
                     DataEditor.SetClipboardObj(obj, null);
                 }
                 else
-                    await MessageBox.Show(control.GetOwningForm(), String.Format("No index selected!"), "Invalid Operation", MessageBox.MessageBoxButtons.Ok);
+                    await MessageBoxWindowView.Show(dialogService, String.Format("No index selected!"), "Invalid Operation", MessageBoxWindowView.MessageBoxButtons.Ok);
             };
             pasteToolStripMenuItem.Click += async (object copySender, RoutedEventArgs copyE) =>
             {
@@ -149,7 +176,7 @@ private static ContextMenu createContextMenu(StackPanel control, Type type, Prio
                     vm.InsertOnKey(idx, DataEditor.clipboardObj);
                 }
                 else
-                    await MessageBox.Show(control.GetOwningForm(), String.Format("Incompatible types:\n{0}\n{1}", type1.AssemblyQualifiedName, type2.AssemblyQualifiedName), "Invalid Operation", MessageBox.MessageBoxButtons.Ok);
+                    await MessageBoxWindowView.Show(dialogService, String.Format("Incompatible types:\n{0}\n{1}", type1.AssemblyQualifiedName, type2.AssemblyQualifiedName), "Invalid Operation", MessageBoxWindowView.MessageBoxButtons.Ok);
             };
             return copyPasteStrip;
         }
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/RandPickerEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/RandPickerEditor.cs
index 3be8a852..0ea4e3d1 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/RandPickerEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/RandPickerEditor.cs
@@ -17,6 +17,7 @@ namespace RogueEssence.Dev
 {
     public class RandPickerEditor : Editor<IRandPicker>
     {
+        public RandPickerEditor(EditorContext context) : base(context) { }
         public override bool DefaultSubgroup => true;
     }
 }
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/RandRangeEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/RandRangeEditor.cs
index 399f13b9..598d3624 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/RandRangeEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/RandRangeEditor.cs
@@ -26,7 +26,7 @@ public class RandRangeEditor : Editor<RandRange>
         /// </summary>
         public bool Inclusive;
 
-        public RandRangeEditor(bool index1, bool inclusive)
+        public RandRangeEditor(EditorContext context, bool index1, bool inclusive) : base(context)
         {
             Index1 = index1;
             Inclusive = inclusive;
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/RangeDictEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/RangeDictEditor.cs
index a8bb3189..0c2bb97b 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/RangeDictEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/RangeDictEditor.cs
@@ -12,6 +12,8 @@
 using RogueEssence.Dev.ViewModels;
 using RogueEssence.LevelGen;
 using Avalonia.Interactivity;
+using RogueEssence.Dev.Services;
+using RogueEssence.Dev.Utility;
 
 namespace RogueEssence.Dev
 {
@@ -27,7 +29,7 @@ public class RangeDictEditor : Editor<IRangeDict>
         /// </summary>
         public bool Inclusive;
 
-        public RangeDictEditor(bool index1, bool inclusive)
+        public RangeDictEditor(EditorContext context, bool index1, bool inclusive) : base(context)
         {
             Index1 = index1;
             Inclusive = inclusive;
@@ -51,7 +53,7 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
             else
                 lbxValue.MaxHeight = 220;
 
-            RangeDictBoxViewModel vm = new RangeDictBoxViewModel(control.GetOwningForm(), new StringConv(elementType, ReflectionExt.GetPassableAttributes(1, attributes)));
+            RangeDictBoxViewModel vm = new RangeDictBoxViewModel(_context.DialogService, new StringConv(elementType, ReflectionExt.GetPassableAttributes(1, attributes)));
 
             vm.Index1 = Index1;
             vm.Inclusive = Inclusive;
@@ -68,59 +70,76 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
 
             lbxValue.DataContext = vm;
 
-            lbxValue.SetListContextMenu(createContextMenu(control, type, vm));
+            lbxValue.SetListContextMenu(createContextMenu(_context.DialogService, control, type, vm));
             lbxValue.MinHeight = lbxValue.MaxHeight;//TODO: Uptake Avalonia fix for improperly updating Grid control dimensions
 
             //add lambda expression for editing a single element
             vm.OnEditItem += (IntRange key, object element, bool advancedEdit, RangeDictBoxViewModel.EditElementOp op) =>
             {
+                EditorPageViewModel pageViewModel = control.FindAncestorViewModel<EditorPageViewModel>();
                 string elementName = name + "[" + key.ToString() + "]";
-                DataEditForm frmData = new DataEditForm();
-                frmData.Title = DataEditor.GetWindowTitle(parent, elementName, element, elementType, ReflectionExt.GetPassableAttributes(1, attributes));
+                // string title = DataEditor.GetWindowTitle(parent, elementName, element, elementType, ReflectionExt.GetPassableAttributes(1, attributes));
 
-                DataEditor.LoadClassControls(frmData.ControlPanel, parent, null, elementName, elementType, ReflectionExt.GetPassableAttributes(1, attributes), element, true, new Type[0], advancedEdit);
-                DataEditor.TrackTypeSize(frmData, elementType);
+                NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(elementName, pageViewModel.Node.Icon);
+                pageViewModel.Node.AddNodeIfNotExists(node);
 
-                frmData.SelectedOKEvent += async () =>
+                NodeHelper.ExpandParents(node, true);
+                ReflectedDataPageViewModel newEditor = _context.PageFactory.CreatePage<ReflectedDataPageViewModel>(node);
+                newEditor.SetPageTitle(elementName, pageViewModel.Node.Icon);
+
+                newEditor.OnLoadAction = (StackPanel stack) =>
                 {
-                    element = DataEditor.SaveClassControls(frmData.ControlPanel, elementName, elementType, ReflectionExt.GetPassableAttributes(1, attributes), true, new Type[0], advancedEdit);
+                    DataEditor.LoadClassControls(stack, parent, null, elementName, elementType, ReflectionExt.GetPassableAttributes(1, attributes), element, true, new Type[0], advancedEdit);
+                };
+
+                newEditor.OnOKAction = async (StackPanel stack) =>
+                {
+                    element = DataEditor.SaveClassControls(stack, elementName, elementType, ReflectionExt.GetPassableAttributes(1, attributes), true, new Type[0], advancedEdit);
                     op(key, element);
                     return true;
                 };
 
-                control.GetOwningForm().RegisterChild(frmData);
-                frmData.Show();
+                _context.TabEvents.AddChildPage(pageViewModel, newEditor);
             };
-
+            
             vm.OnEditKey += (IntRange key, object element, bool advancedEdit, RangeDictBoxViewModel.EditElementOp op) =>
             {
+                EditorPageViewModel pageViewModel = control.FindAncestorViewModel<EditorPageViewModel>();
                 string elementName = name + "<Range>";
-                DataEditForm frmKey = new DataEditForm();
 
                 List<object> attrList = new List<object>();
                 if (rangeAtt != null)
                     attrList.Add(rangeAtt);
-                frmKey.Title = DataEditor.GetWindowTitle(parent, elementName, key, keyType, attrList.ToArray());
 
-                DataEditor.LoadClassControls(frmKey.ControlPanel, parent, null, elementName, keyType, attrList.ToArray(), key, true, new Type[0], advancedEdit);
-                DataEditor.TrackTypeSize(frmKey, keyType);
+                // string title = DataEditor.GetWindowTitle(parent, elementName, key, keyType, attrList.ToArray());
+
+                NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(elementName, pageViewModel.Node.Icon);
+                pageViewModel.Node.AddNodeIfNotExists(node);
+
+                NodeHelper.ExpandParents(node, true);
+                ReflectedDataPageViewModel newEditor = _context.PageFactory.CreatePage<ReflectedDataPageViewModel>(node);
+                newEditor.SetPageTitle(elementName, pageViewModel.Node.Icon);
+
+                newEditor.OnLoadAction = (StackPanel stack) =>
+                {
+                    DataEditor.LoadClassControls(stack, parent, null, elementName, keyType, attrList.ToArray(), key, true, new Type[0], advancedEdit);
+                };
 
-                frmKey.SelectedOKEvent += async () =>
+                newEditor.OnOKAction = async (StackPanel stack) =>
                 {
-                    key = (IntRange)DataEditor.SaveClassControls(frmKey.ControlPanel, elementName, keyType, attrList.ToArray(), true, new Type[0], advancedEdit);
+                    key = (IntRange)DataEditor.SaveClassControls(stack, elementName, keyType, attrList.ToArray(), true, new Type[0], advancedEdit);
                     op(key, element);
                     return true;
                 };
 
-                control.GetOwningForm().RegisterChild(frmKey);
-                frmKey.Show();
+                _context.TabEvents.AddChildPage(pageViewModel, newEditor);
             };
 
             vm.LoadFromDict(member);
             control.Children.Add(lbxValue);
         }
 
-        private static ContextMenu createContextMenu(StackPanel control, Type type, RangeDictBoxViewModel vm)
+        private static ContextMenu createContextMenu(IDialogService dialogService, StackPanel control, Type type, RangeDictBoxViewModel vm)
         {
             Type elementType = ReflectionExt.GetBaseTypeArg(typeof(IRangeDict<>), type, 0);
 
@@ -146,7 +165,7 @@ private static ContextMenu createContextMenu(StackPanel control, Type type, Rang
                     DataEditor.SetClipboardObj(obj, null);
                 }
                 else
-                    await MessageBox.Show(control.GetOwningForm(), String.Format("No index selected!"), "Invalid Operation", MessageBox.MessageBoxButtons.Ok);
+                    await MessageBoxWindowView.Show(dialogService, String.Format("No index selected!"), "Invalid Operation", MessageBoxWindowView.MessageBoxButtons.Ok);
             };
             pasteToolStripMenuItem.Click += async (object copySender, RoutedEventArgs copyE) =>
             {
@@ -160,7 +179,7 @@ private static ContextMenu createContextMenu(StackPanel control, Type type, Rang
                     vm.InsertOnKey(idx, DataEditor.clipboardObj);
                 }
                 else
-                    await MessageBox.Show(control.GetOwningForm(), String.Format("Incompatible types:\n{0}\n{1}", type1.AssemblyQualifiedName, type2.AssemblyQualifiedName), "Invalid Operation", MessageBox.MessageBoxButtons.Ok);
+                    await MessageBoxWindowView.Show(dialogService, String.Format("Incompatible types:\n{0}\n{1}", type1.AssemblyQualifiedName, type2.AssemblyQualifiedName), "Invalid Operation", MessageBoxWindowView.MessageBoxButtons.Ok);
             };
             return copyPasteStrip;
         }
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/RoomGenEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/RoomGenEditor.cs
index 7e19a943..90c185c7 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/RoomGenEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/RoomGenEditor.cs
@@ -18,6 +18,8 @@ namespace RogueEssence.Dev
 {
     public class RoomGenDefaultEditor : Editor<IRoomGenDefault>
     {
+        public RoomGenDefaultEditor(EditorContext context) : base(context) { }
+        
         public override string GetString(IRoomGenDefault obj, Type type, object[] attributes)
         {
             return string.Format("Single-Tile Room");
@@ -31,6 +33,8 @@ public override string GetTypeString()
 
     public class SizedRoomGenEditor : Editor<ISizedRoomGen>
     {
+        
+        public SizedRoomGenEditor(EditorContext context) : base(context) { }
         public override string GetString(ISizedRoomGen obj, Type type, object[] attributes)
         {
             PropertyInfo widthInfo = typeof(ISizedRoomGen).GetProperty(nameof(obj.Width));
@@ -43,6 +47,8 @@ public override string GetString(ISizedRoomGen obj, Type type, object[] attribut
 
     public class RoomGenCrossEditor : Editor<IRoomGenCross>
     {
+        
+        public RoomGenCrossEditor(EditorContext context) : base(context) { }
         public override string GetString(IRoomGenCross obj, Type type, object[] attributes)
         {
             PropertyInfo majorWidthInfo = typeof(IRoomGenCross).GetProperty(nameof(obj.MajorWidth));
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/SpawnListEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/SpawnListEditor.cs
index d903c87f..a71598fa 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/SpawnListEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/SpawnListEditor.cs
@@ -11,11 +11,15 @@
 using RogueEssence.Dev.ViewModels;
 using Avalonia.Interactivity;
 using System.Reflection;
+using RogueEssence.Dev.Services;
+using RogueEssence.Dev.Utility;
 
 namespace RogueEssence.Dev
 {
     public class SpawnListEditor : Editor<ISpawnList>
     {
+        
+        public SpawnListEditor(EditorContext context) : base(context) { }
         public override bool DefaultSubgroup => true;
         public override bool DefaultDecoration => false;
 
@@ -31,35 +35,43 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
             else
                 lbxValue.MaxHeight = 220;
 
-            SpawnListBoxViewModel vm = new SpawnListBoxViewModel(control.GetOwningForm(), new StringConv(elementType, ReflectionExt.GetPassableAttributes(1, attributes)));
+            SpawnListBoxViewModel vm = new SpawnListBoxViewModel(_context.DialogService, new StringConv(elementType, ReflectionExt.GetPassableAttributes(1, attributes)));
 
             CollectionAttribute confirmAtt = ReflectionExt.FindAttribute<CollectionAttribute>(attributes);
             if (confirmAtt != null)
                 vm.ConfirmDelete = confirmAtt.ConfirmDelete;
 
             lbxValue.DataContext = vm;
-            lbxValue.SetListContextMenu(createContextMenu(control, type, vm));
+            lbxValue.SetListContextMenu(createContextMenu(_context.DialogService, control, type, vm));
             lbxValue.MinHeight = lbxValue.MaxHeight;//TODO: Uptake Avalonia fix for improperly updating Grid control dimensions
 
             //add lambda expression for editing a single element
             vm.OnEditItem += (int index, object element, bool advancedEdit, SpawnListBoxViewModel.EditElementOp op) =>
             {
+                EditorPageViewModel pageViewModel = control.FindAncestorViewModel<EditorPageViewModel>();
                 string elementName = name + "[" + index + "]";
-                DataEditForm frmData = new DataEditForm();
-                frmData.Title = DataEditor.GetWindowTitle(parent, elementName, element, elementType, ReflectionExt.GetPassableAttributes(1, attributes));
+                // string title = DataEditor.GetWindowTitle(parent, elementName, element, elementType, ReflectionExt.GetPassableAttributes(1, attributes));
 
-                DataEditor.LoadClassControls(frmData.ControlPanel, parent, null, elementName, elementType, ReflectionExt.GetPassableAttributes(1, attributes), element, true, new Type[0], advancedEdit);
-                DataEditor.TrackTypeSize(frmData, elementType);
+                NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(elementName, pageViewModel.Node.Icon);
+                pageViewModel.Node.AddNodeIfNotExists(node);
 
-                frmData.SelectedOKEvent += async () =>
+                NodeHelper.ExpandParents(node, true);
+                ReflectedDataPageViewModel newEditor = _context.PageFactory.CreatePage<ReflectedDataPageViewModel>(node);
+                newEditor.SetPageTitle(elementName, pageViewModel.Node.Icon);
+
+                newEditor.OnLoadAction = (StackPanel stack) =>
+                {
+                    DataEditor.LoadClassControls(stack, parent, null, elementName, elementType, ReflectionExt.GetPassableAttributes(1, attributes), element, true, new Type[0], advancedEdit);
+                };
+
+                newEditor.OnOKAction = async (StackPanel stack) =>
                 {
-                    element = DataEditor.SaveClassControls(frmData.ControlPanel, elementName, elementType, ReflectionExt.GetPassableAttributes(1, attributes), true, new Type[0], advancedEdit);
+                    element = DataEditor.SaveClassControls(stack, elementName, elementType, ReflectionExt.GetPassableAttributes(1, attributes), true, new Type[0], advancedEdit);
                     op(index, element);
                     return true;
                 };
 
-                control.GetOwningForm().RegisterChild(frmData);
-                frmData.Show();
+                _context.TabEvents.AddChildPage(pageViewModel, newEditor);
             };
 
             vm.LoadFromList(member);
@@ -67,7 +79,7 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
         }
 
 
-        private static ContextMenu createContextMenu(StackPanel control, Type type, SpawnListBoxViewModel vm)
+        private static ContextMenu createContextMenu(IDialogService dialogService, StackPanel control, Type type, SpawnListBoxViewModel vm)
         {
             Type elementType = ReflectionExt.GetBaseTypeArg(typeof(ISpawnList<>), type, 0);
 
@@ -93,7 +105,7 @@ private static ContextMenu createContextMenu(StackPanel control, Type type, Spaw
                     DataEditor.SetClipboardObj(obj, null);
                 }
                 else
-                    await MessageBox.Show(control.GetOwningForm(), String.Format("No index selected!"), "Invalid Operation", MessageBox.MessageBoxButtons.Ok);
+                    await MessageBoxWindowView.Show(dialogService, String.Format("No index selected!"), "Invalid Operation", MessageBoxWindowView.MessageBoxButtons.Ok);
             };
             pasteToolStripMenuItem.Click += async (object copySender, RoutedEventArgs copyE) =>
             {
@@ -107,7 +119,7 @@ private static ContextMenu createContextMenu(StackPanel control, Type type, Spaw
                     vm.InsertOnKey(idx, DataEditor.clipboardObj);
                 }
                 else
-                    await MessageBox.Show(control.GetOwningForm(), String.Format("Incompatible types:\n{0}\n{1}", type1.AssemblyQualifiedName, type2.AssemblyQualifiedName), "Invalid Operation", MessageBox.MessageBoxButtons.Ok);
+                    await MessageBoxWindowView.Show(dialogService, String.Format("Incompatible types:\n{0}\n{1}", type1.AssemblyQualifiedName, type2.AssemblyQualifiedName), "Invalid Operation", MessageBoxWindowView.MessageBoxButtons.Ok);
             };
             return copyPasteStrip;
         }
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/SpawnRangeListEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/SpawnRangeListEditor.cs
index 4fa23ac7..b03dffee 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/SpawnRangeListEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/SpawnRangeListEditor.cs
@@ -10,6 +10,8 @@
 using RogueEssence.Dev.Views;
 using RogueEssence.Dev.ViewModels;
 using Avalonia.Interactivity;
+using RogueEssence.Dev.Services;
+using RogueEssence.Dev.Utility;
 
 namespace RogueEssence.Dev
 {
@@ -25,7 +27,7 @@ public class SpawnRangeListEditor : Editor<ISpawnRangeList>
         /// </summary>
         public bool Inclusive;
 
-        public SpawnRangeListEditor(bool index1, bool inclusive)
+        public SpawnRangeListEditor(EditorContext context, bool index1, bool inclusive) : base(context)
         {
             Index1 = index1;
             Inclusive = inclusive;
@@ -46,7 +48,7 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
             else
                 lbxValue.MaxHeight = 260;
 
-            SpawnRangeListBoxViewModel vm = new SpawnRangeListBoxViewModel(control.GetOwningForm(), new StringConv(elementType, ReflectionExt.GetPassableAttributes(1, attributes)));
+            SpawnRangeListBoxViewModel vm = new SpawnRangeListBoxViewModel(_context.DialogService, new StringConv(elementType, ReflectionExt.GetPassableAttributes(1, attributes)));
 
             vm.Index1 = Index1;
             vm.Inclusive = Inclusive;
@@ -63,29 +65,37 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
             }
 
             lbxValue.DataContext = vm;
-            lbxValue.SetListContextMenu(createContextMenu(control, type, vm));
+            lbxValue.SetListContextMenu(createContextMenu(_context.DialogService, control, type, vm));
             lbxValue.MinHeight = lbxValue.MaxHeight;//TODO: Uptake Avalonia fix for improperly updating Grid control dimensions
 
 
             //add lambda expression for editing a single element
             vm.OnEditItem += (int index, object element, bool advancedEdit, SpawnRangeListBoxViewModel.EditElementOp op) =>
             {
+                EditorPageViewModel pageViewModel = control.FindAncestorViewModel<EditorPageViewModel>();
                 string elementName = name + "[" + index + "]";
-                DataEditForm frmData = new DataEditForm();
-                frmData.Title = DataEditor.GetWindowTitle(parent, elementName, element, elementType, ReflectionExt.GetPassableAttributes(2, attributes));
-                
-                DataEditor.LoadClassControls(frmData.ControlPanel, parent, null, elementName, elementType, ReflectionExt.GetPassableAttributes(2, attributes), element, true, new Type[0], advancedEdit);
-                DataEditor.TrackTypeSize(frmData, elementType);
+                // string title = DataEditor.GetWindowTitle(parent, elementName, element, elementType, ReflectionExt.GetPassableAttributes(2, attributes));
 
-                frmData.SelectedOKEvent += async () =>
+                NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(elementName, pageViewModel.Node.Icon);
+                pageViewModel.Node.AddNodeIfNotExists(node);
+
+                NodeHelper.ExpandParents(node, true);
+                ReflectedDataPageViewModel newEditor = _context.PageFactory.CreatePage<ReflectedDataPageViewModel>(node);
+                newEditor.SetPageTitle(elementName, pageViewModel.Node.Icon);
+
+                newEditor.OnLoadAction = (StackPanel stack) =>
+                {
+                    DataEditor.LoadClassControls(stack, parent, null, elementName, elementType, ReflectionExt.GetPassableAttributes(2, attributes), element, true, new Type[0], advancedEdit);
+                };
+
+                newEditor.OnOKAction = async (StackPanel stack) =>
                 {
-                    element = DataEditor.SaveClassControls(frmData.ControlPanel, elementName, elementType, ReflectionExt.GetPassableAttributes(2, attributes), true, new Type[0], advancedEdit);
+                    element = DataEditor.SaveClassControls(stack, elementName, elementType, ReflectionExt.GetPassableAttributes(2, attributes), true, new Type[0], advancedEdit);
                     op(index, element);
                     return true;
                 };
 
-                control.GetOwningForm().RegisterChild(frmData);
-                frmData.Show();
+                _context.TabEvents.AddChildPage(pageViewModel, newEditor);
             };
 
             vm.LoadFromList(member);
@@ -93,7 +103,7 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
         }
 
 
-        private static ContextMenu createContextMenu(StackPanel control, Type type, SpawnRangeListBoxViewModel vm)
+        private static ContextMenu createContextMenu(IDialogService dialogService, StackPanel control, Type type, SpawnRangeListBoxViewModel vm)
         {
             Type elementType = ReflectionExt.GetBaseTypeArg(typeof(ISpawnRangeList<>), type, 0);
 
@@ -119,7 +129,7 @@ private static ContextMenu createContextMenu(StackPanel control, Type type, Spaw
                     DataEditor.SetClipboardObj(obj, null);
                 }
                 else
-                    await MessageBox.Show(control.GetOwningForm(), String.Format("No index selected!"), "Invalid Operation", MessageBox.MessageBoxButtons.Ok);
+                    await MessageBoxWindowView.Show(dialogService, String.Format("No index selected!"), "Invalid Operation", MessageBoxWindowView.MessageBoxButtons.Ok);
             };
             pasteToolStripMenuItem.Click += async (object copySender, RoutedEventArgs copyE) =>
             {
@@ -133,7 +143,7 @@ private static ContextMenu createContextMenu(StackPanel control, Type type, Spaw
                     vm.InsertOnKey(idx, DataEditor.clipboardObj);
                 }
                 else
-                    await MessageBox.Show(control.GetOwningForm(), String.Format("Incompatible types:\n{0}\n{1}", type1.AssemblyQualifiedName, type2.AssemblyQualifiedName), "Invalid Operation", MessageBox.MessageBoxButtons.Ok);
+                    await MessageBoxWindowView.Show(dialogService, String.Format("Incompatible types:\n{0}\n{1}", type1.AssemblyQualifiedName, type2.AssemblyQualifiedName), "Invalid Operation", MessageBoxWindowView.MessageBoxButtons.Ok);
             };
             return copyPasteStrip;
         }
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/SpawnStepEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/SpawnStepEditor.cs
index 4d1d4149..d37b8a25 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/SpawnStepEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/SpawnStepEditor.cs
@@ -18,6 +18,8 @@ namespace RogueEssence.Dev
 {
     public class BaseSpawnStepEditor : Editor<IBaseSpawnStep>
     {
+        
+        public BaseSpawnStepEditor(EditorContext context) : base(context) { }
         public override string GetString(IBaseSpawnStep obj, Type type, object[] attributes)
         {
             PropertyInfo memberInfo = typeof(IBaseSpawnStep).GetProperty(nameof(obj.Spawn));
@@ -28,6 +30,7 @@ public override string GetString(IBaseSpawnStep obj, Type type, object[] attribu
     }
     public class PlaceMobsStepEditor : Editor<IPlaceMobsStep>
     {
+        public PlaceMobsStepEditor(EditorContext context) : base(context) { }
         public override string GetString(IPlaceMobsStep obj, Type type, object[] attributes)
         {
             PropertyInfo memberInfo = typeof(IPlaceMobsStep).GetProperty(nameof(obj.Spawn));
@@ -38,6 +41,7 @@ public override string GetString(IPlaceMobsStep obj, Type type, object[] attribu
     }
     public class MoneySpawnStepEditor : Editor<IMoneySpawnStep>
     {
+        public MoneySpawnStepEditor(EditorContext context) : base(context) { }
         public override string GetString(IMoneySpawnStep obj, Type type, object[] attributes)
         {
             PropertyInfo memberInfo = typeof(IMoneySpawnStep).GetProperty(nameof(obj.MoneyRange));
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/StepSpawnerEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/StepSpawnerEditor.cs
index ef0cd70e..8bcc20c6 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/StepSpawnerEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/StepSpawnerEditor.cs
@@ -18,12 +18,14 @@ namespace RogueEssence.Dev
 {
     public class StepSpawnerEditor : Editor<IStepSpawner>
     {
+        public StepSpawnerEditor(EditorContext context) : base(context) { }
         public override bool DefaultSubgroup => true;
 
     }
 
     public class MultiStepSpawnerEditor : Editor<IMultiStepSpawner>
     {
+        public MultiStepSpawnerEditor(EditorContext context) : base(context) { }
         public override bool DefaultSubgroup => true;
 
 
@@ -35,6 +37,7 @@ public override string GetString(IMultiStepSpawner obj, Type type, object[] attr
     }
     public class PickerSpawnerEditor : Editor<IPickerSpawner>
     {
+        public PickerSpawnerEditor(EditorContext context) : base(context) { }
         public override bool DefaultSubgroup => true;
 
 
@@ -46,6 +49,7 @@ public override string GetString(IPickerSpawner obj, Type type, object[] attribu
     }
     public class MoneyDivSpawnerEditor : Editor<IDivSpawner>
     {
+        public MoneyDivSpawnerEditor(EditorContext context) : base(context) { }
         public override bool DefaultSubgroup => true;
 
         public override string GetString(IDivSpawner obj, Type type, object[] attributes)
@@ -56,6 +60,7 @@ public override string GetString(IDivSpawner obj, Type type, object[] attributes
     }
     public class ContextSpawnerEditor : Editor<IContextSpawner>
     {
+        public ContextSpawnerEditor(EditorContext context) : base(context) { }
         public override bool DefaultSubgroup => true;
 
 
@@ -67,6 +72,7 @@ public override string GetString(IContextSpawner obj, Type type, object[] attrib
     }
     public class TeamContextSpawnerEditor : Editor<ITeamContextSpawner>
     {
+        public TeamContextSpawnerEditor(EditorContext context) : base(context) { }
         public override bool DefaultSubgroup => true;
 
         public override string GetString(ITeamContextSpawner obj, Type type, object[] attributes)
@@ -77,6 +83,7 @@ public override string GetString(ITeamContextSpawner obj, Type type, object[] at
     }
     public class LoopedTeamSpawnerEditor : Editor<ILoopedTeamSpawner>
     {
+        public LoopedTeamSpawnerEditor(EditorContext context) : base(context) { }
         public override bool DefaultSubgroup => true;
 
         public override string GetString(ILoopedTeamSpawner obj, Type type, object[] attributes)
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/TypeDictEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/TypeDictEditor.cs
index 58e26fc3..8cc98d0f 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/TypeDictEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/TypeDictEditor.cs
@@ -10,11 +10,19 @@
 using RogueEssence.Dev.Views;
 using RogueEssence.Dev.ViewModels;
 using System.Threading.Tasks;
+using Avalonia;
+using Avalonia.Layout;
+using RogueEssence.Dev.Utility;
 
 namespace RogueEssence.Dev
 {
     public class TypeDictEditor : Editor<ITypeDict>
     {
+
+        public TypeDictEditor(EditorContext context) : base(context)
+        {
+            
+        }
         public override bool DefaultSubgroup => true;
 
         public override bool DefaultDecoration => false;
@@ -32,7 +40,7 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
             else
                 lbxValue.MaxHeight = 180;
 
-            CollectionBoxViewModel vm = new CollectionBoxViewModel(control.GetOwningForm(), new StringConv(elementType, ReflectionExt.GetPassableAttributes(1, attributes)));
+            CollectionBoxViewModel vm = new CollectionBoxViewModel(_context.DialogService, new StringConv(elementType, ReflectionExt.GetPassableAttributes(1, attributes)));
 
             CollectionAttribute confirmAtt = ReflectionExt.FindAttribute<CollectionAttribute>(attributes);
             if (confirmAtt != null)
@@ -44,20 +52,33 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
             //add lambda expression for editing a single element
             vm.OnEditItem += (int index, object element, bool advancedEdit, CollectionBoxViewModel.EditElementOp op) =>
             {
+                EditorPageViewModel pageViewModel = control.FindAncestorViewModel<EditorPageViewModel>();
                 string elementName = name + "[" + index + "]";
-                DataEditForm frmData = new DataEditForm();
-                frmData.Title = DataEditor.GetWindowTitle(parent, elementName, element, elementType, ReflectionExt.GetPassableAttributes(1, attributes));
+                // string title = DataEditor.GetWindowTitle(parent, elementName, element, elementType, ReflectionExt.GetPassableAttributes(1, attributes));
+
+                NodeBase node =
+                    _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(elementName,
+                        pageViewModel.Node.Icon);
+                pageViewModel.Node.AddNodeIfNotExists(node);
 
-                //TODO: make this a member and reference it that way
-                DataEditor.LoadClassControls(frmData.ControlPanel, parent, null, elementName, elementType, ReflectionExt.GetPassableAttributes(1, attributes), element, true, new Type[0], advancedEdit);
-                DataEditor.TrackTypeSize(frmData, elementType);
+                NodeHelper.ExpandParents(node, true);
+                ReflectedDataPageViewModel
+                    newEditor = _context.PageFactory.CreatePage<ReflectedDataPageViewModel>(node);
+                newEditor.SetPageTitle(elementName, pageViewModel.Node.Icon);
 
-                frmData.SelectedOKEvent += async () =>
+                newEditor.OnLoadAction = (StackPanel stack) =>
                 {
-                    object newElement = DataEditor.SaveClassControls(frmData.ControlPanel, elementName, elementType, ReflectionExt.GetPassableAttributes(1, attributes), true, new Type[0], advancedEdit);
+                    DataEditor.LoadClassControls(stack, parent, null, elementName, elementType,
+                        ReflectionExt.GetPassableAttributes(1, attributes), element, true, new Type[0],
+                        advancedEdit);
+                };
 
-                    bool itemExists = false;
+                newEditor.OnOKAction = async (StackPanel stack) =>
+                {
+                    object newElement = DataEditor.SaveClassControls(stack, elementName, elementType,
+                        ReflectionExt.GetPassableAttributes(1, attributes), true, new Type[0], advancedEdit);
 
+                    bool itemExists = false;
                     List<object> states = (List<object>)vm.GetList(typeof(List<object>));
                     for (int ii = 0; ii < states.Count; ii++)
                     {
@@ -72,7 +93,8 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
 
                     if (itemExists)
                     {
-                        await MessageBox.Show(control.GetOwningForm(), "Cannot add duplicate states.", "Entry already exists.", MessageBox.MessageBoxButtons.Ok);
+                        await MessageBoxWindowView.Show(_context.DialogService, "Cannot add duplicate states.",
+                            "Entry already exists.", MessageBoxWindowView.MessageBoxButtons.Ok);
                         return false;
                     }
                     else
@@ -82,8 +104,7 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
                     }
                 };
 
-                control.GetOwningForm().RegisterChild(frmData);
-                frmData.Show();
+                _context.TabEvents.AddChildPage(pageViewModel, newEditor);
             };
 
             List<object> states = new List<object>();
@@ -104,6 +125,7 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
                 if (desc != null)
                     ToolTip.SetTip(expander, desc);
                 expander.IsExpanded = member.Count > 0;
+                expander.HorizontalAlignment = HorizontalAlignment.Stretch;
                 expander.Content = lbxValue;
                 control.Children.Add(expander);
             }
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/AliasDataEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/AliasDataEditor.cs
index 1ca0cfb7..78c62643 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/AliasDataEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/AliasDataEditor.cs
@@ -17,6 +17,7 @@ namespace RogueEssence.Dev
 {
     public class AliasDataEditor : IntEditor
     {
+        public AliasDataEditor(EditorContext context) : base(context) { }
         public override bool DefaultSubgroup => true;
         public override bool DefaultDecoration => false;
 
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/AnimDataEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/AnimDataEditor.cs
index 21824db3..215f08d7 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/AnimDataEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/AnimDataEditor.cs
@@ -17,6 +17,7 @@ namespace RogueEssence.Dev
 {
     public class AnimDataEditor : StringEditor
     {
+        public AnimDataEditor(EditorContext context) : base(context) { }
         public override bool DefaultSubgroup => true;
 
         public override bool DefaultDecoration => false;
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/CategorySpawnEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/CategorySpawnEditor.cs
index 5f2fd64b..de103c17 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/CategorySpawnEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/CategorySpawnEditor.cs
@@ -14,6 +14,7 @@
 using RogueEssence.LevelGen;
 using Avalonia;
 using System.Reflection;
+using RogueEssence.Dev.Utility;
 
 namespace RogueEssence.Dev
 {
@@ -27,7 +28,7 @@ public class CategorySpawnEditor : Editor<Dictionary<string, CategorySpawn<InvIt
         public bool Index1;
 
 
-        public CategorySpawnEditor(bool index1)
+        public CategorySpawnEditor(EditorContext context, bool index1) : base(context) 
         {
             Index1 = index1;
         }
@@ -51,7 +52,7 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
             else
                 lbxValue.MaxHeight = 180;
 
-            DictionaryBoxViewModel vm = new DictionaryBoxViewModel(control.GetOwningForm(), new StringConv(elementType, ReflectionExt.GetPassableAttributes(2, attributes)));
+            DictionaryBoxViewModel vm = new DictionaryBoxViewModel(_context.DialogService, new StringConv(elementType, ReflectionExt.GetPassableAttributes(2, attributes)));
 
             CollectionAttribute confirmAtt = ReflectionExt.FindAttribute<CollectionAttribute>(attributes);
             if (confirmAtt != null)
@@ -63,46 +64,62 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
             //add lambda expression for editing a single element
             vm.OnEditItem += (object key, object element, bool advancedEdit, DictionaryBoxViewModel.EditElementOp op) =>
             {
+                EditorPageViewModel pageViewModel = control.FindAncestorViewModel<EditorPageViewModel>();
                 string elementName = name + "[" + key.ToString() + "]";
-                DataEditForm frmData = new DataEditForm();
-                frmData.Title = DataEditor.GetWindowTitle(parent, elementName, element, elementType, ReflectionExt.GetPassableAttributes(2, attributes));
+                // string title = DataEditor.GetWindowTitle(parent, elementName, element, elementType, ReflectionExt.GetPassableAttributes(2, attributes));
 
-                DataEditor.LoadClassControls(frmData.ControlPanel, parent, null, elementName, elementType, ReflectionExt.GetPassableAttributes(2, attributes), element, true, new Type[0], advancedEdit);
-                DataEditor.TrackTypeSize(frmData, elementType);
+                NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(elementName, pageViewModel.Node.Icon);
+                pageViewModel.Node.AddNodeIfNotExists(node);
 
-                frmData.SelectedOKEvent += async () =>
+                NodeHelper.ExpandParents(node, true);
+                ReflectedDataPageViewModel newEditor = _context.PageFactory.CreatePage<ReflectedDataPageViewModel>(node);
+                newEditor.SetPageTitle(elementName, pageViewModel.Node.Icon);
+
+                newEditor.OnLoadAction = (StackPanel stack) =>
+                {
+                    DataEditor.LoadClassControls(stack, parent, null, elementName, elementType, ReflectionExt.GetPassableAttributes(2, attributes), element, true, new Type[0], advancedEdit);
+                };
+
+                newEditor.OnOKAction = async (StackPanel stack) =>
                 {
-                    element = DataEditor.SaveClassControls(frmData.ControlPanel, elementName, elementType, ReflectionExt.GetPassableAttributes(2, attributes), true, new Type[0], advancedEdit);
+                    element = DataEditor.SaveClassControls(stack, elementName, elementType, ReflectionExt.GetPassableAttributes(2, attributes), true, new Type[0], advancedEdit);
                     op(key, key, element);
                     return true;
                 };
 
-                control.GetOwningForm().RegisterChild(frmData);
-                frmData.Show();
+                _context.TabEvents.AddChildPage(pageViewModel, newEditor);
             };
 
             vm.OnEditKey += (object key, object element, bool advancedEdit, DictionaryBoxViewModel.EditElementOp op) =>
             {
+                EditorPageViewModel pageViewModel = control.FindAncestorViewModel<EditorPageViewModel>();
                 string elementName = name + "<Key>";
-                DataEditForm frmData = new DataEditForm();
-                frmData.Title = DataEditor.GetWindowTitle(parent, elementName, key, keyType, ReflectionExt.GetPassableAttributes(1, attributes));
+                // string title = DataEditor.GetWindowTitle(parent, elementName, key, keyType, ReflectionExt.GetPassableAttributes(1, attributes));
 
-                DataEditor.LoadClassControls(frmData.ControlPanel, parent, null, elementName, keyType, ReflectionExt.GetPassableAttributes(1, attributes), key, true, new Type[0], advancedEdit);
-                DataEditor.TrackTypeSize(frmData, keyType);
+                NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(elementName, pageViewModel.Node.Icon);
+                pageViewModel.Node.AddNodeIfNotExists(node);
 
-                frmData.SelectedOKEvent += async () =>
+                NodeHelper.ExpandParents(node, true);
+                ReflectedDataPageViewModel newEditor = _context.PageFactory.CreatePage<ReflectedDataPageViewModel>(node);
+                newEditor.SetPageTitle(elementName, pageViewModel.Node.Icon);
+
+                newEditor.OnLoadAction = (StackPanel stack) =>
                 {
-                    object newKey = DataEditor.SaveClassControls(frmData.ControlPanel, elementName, keyType, ReflectionExt.GetPassableAttributes(1, attributes), true, new Type[0], advancedEdit);
+                    DataEditor.LoadClassControls(stack, parent, null, elementName, keyType, ReflectionExt.GetPassableAttributes(1, attributes), key, true, new Type[0], advancedEdit);
+                };
+
+                newEditor.OnOKAction = async (StackPanel stack) =>
+                {
+                    object newKey = DataEditor.SaveClassControls(stack, elementName, keyType, ReflectionExt.GetPassableAttributes(1, attributes), true, new Type[0], advancedEdit);
                     op(key, newKey, element);
                     return true;
                 };
 
-                control.GetOwningForm().RegisterChild(frmData);
-                frmData.Show();
+                _context.TabEvents.AddChildPage(pageViewModel, newEditor);
             };
 
             vm.LoadFromDict(member);
-            lbxValue.SetListContextMenu(DictionaryEditor.CreateContextMenu(control, type, vm));
+            lbxValue.SetListContextMenu(DictionaryEditor.CreateContextMenu(_context.DialogService, control, type, vm));
             control.Children.Add(lbxValue);
 
 
@@ -154,7 +171,7 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
                 StackPanel viewPanel = frmData.ControlPanel;
 
                 SpawnListViewBox lbxValue = new SpawnListViewBox();
-                SpawnListBoxViewModel mv = new SpawnListBoxViewModel(control.GetOwningForm(), new StringConv(elementType, ReflectionExt.GetPassableAttributes(1, attributes)));
+                SpawnListBoxViewModel mv = new SpawnListBoxViewModel(_context.DialogService, new StringConv(elementType, ReflectionExt.GetPassableAttributes(1, attributes)));
 
                 CollectionAttribute confirmAtt = ReflectionExt.FindAttribute<CollectionAttribute>(attributes);
                 if (confirmAtt != null)
@@ -194,6 +211,7 @@ public override Dictionary<string, CategorySpawn<InvItem>> SaveWindowControls(St
 
     public class DictSpawnEditor : Editor<SpawnDict<string, SpawnList<InvItem>>>
     {
+        public DictSpawnEditor(EditorContext context) : base(context) { }
         public override bool DefaultSubgroup => true;
         public override bool DefaultDecoration => false;
         public override bool DefaultType => true;
@@ -239,22 +257,30 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
 
             vm.OnEditKey += (int index, object key, bool advancedEdit, CategorySpawnBoxViewModel.EditElementOp op) =>
             {
+                EditorPageViewModel pageViewModel = control.FindAncestorViewModel<EditorPageViewModel>();
                 string elementName = name + "[" + index + "]";
-                DataEditForm frmData = new DataEditForm();
-                frmData.Title = DataEditor.GetWindowTitle(parent, elementName, key, keyType, ReflectionExt.GetPassableAttributes(1, attributes));
+                string title = DataEditor.GetWindowTitle(parent, elementName, key, keyType, ReflectionExt.GetPassableAttributes(1, attributes));
 
-                DataEditor.LoadClassControls(frmData.ControlPanel, parent, null, elementName, keyType, ReflectionExt.GetPassableAttributes(1, attributes), key, true, new Type[0], advancedEdit);
-                DataEditor.TrackTypeSize(frmData, keyType);
+                NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(title, pageViewModel.Node.Icon);
+                pageViewModel.Node.SubNodes.Add(node);
 
-                frmData.SelectedOKEvent += async () =>
+                NodeHelper.ExpandParents(node, true);
+                ReflectedDataPageViewModel newEditor = _context.PageFactory.CreatePage<ReflectedDataPageViewModel>(node);
+                newEditor.SetPageTitle(title, pageViewModel.Node.Icon);
+
+                newEditor.OnLoadAction = (StackPanel stack) =>
+                {
+                    DataEditor.LoadClassControls(stack, parent, null, elementName, keyType, ReflectionExt.GetPassableAttributes(1, attributes), key, true, new Type[0], advancedEdit);
+                };
+
+                newEditor.OnOKAction = async (StackPanel stack) =>
                 {
-                    key = DataEditor.SaveClassControls(frmData.ControlPanel, elementName, keyType, ReflectionExt.GetPassableAttributes(1, attributes), true, new Type[0], advancedEdit);
+                    key = DataEditor.SaveClassControls(stack, elementName, keyType, ReflectionExt.GetPassableAttributes(1, attributes), true, new Type[0], advancedEdit);
                     op(index, key);
                     return true;
                 };
 
-                control.GetOwningForm().RegisterChild(frmData);
-                frmData.Show();
+                _context.TabEvents.AddChildPage(pageViewModel, newEditor);
             };
 
             vm.LoadFromDict(member);
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/ColorEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/ColorEditor.cs
index f6a976cd..b5953135 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/ColorEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/ColorEditor.cs
@@ -16,6 +16,7 @@ namespace RogueEssence.Dev
 {
     public class ColorEditor : Editor<Color>
     {
+        public ColorEditor(EditorContext context) : base(context) { }
         public override bool DefaultSubgroup => true;
         public override bool DefaultDecoration => false;
 
@@ -37,6 +38,7 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
             nudValueR.Minimum = byte.MinValue;
             nudValueR.Maximum = byte.MaxValue;
             nudValueR.Value = member.R;
+            nudValueR.Increment = 1;
             innerPanel.Children.Add(nudValueR);
             nudValueR.SetValue(Avalonia.Controls.Grid.ColumnProperty, 1);
 
@@ -55,6 +57,7 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
             nudValueG.Minimum = byte.MinValue;
             nudValueG.Maximum = byte.MaxValue;
             nudValueG.Value = member.G;
+            nudValueG.Increment = 1;
             innerPanel.Children.Add(nudValueG);
             nudValueG.SetValue(Avalonia.Controls.Grid.ColumnProperty, 3);
 
@@ -73,6 +76,7 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
             nudValueB.Minimum = byte.MinValue;
             nudValueB.Maximum = byte.MaxValue;
             nudValueB.Value = member.B;
+            nudValueB.Increment = 1;
             innerPanel.Children.Add(nudValueB);
             nudValueB.SetValue(Avalonia.Controls.Grid.ColumnProperty, 5);
 
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/EntryDataEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/EntryDataEditor.cs
index 0017ec8d..f1a79d77 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/EntryDataEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/EntryDataEditor.cs
@@ -18,6 +18,7 @@ namespace RogueEssence.Dev
 
     public class EntryDataEditor : StringEditor
     {
+        public EntryDataEditor(EditorContext context) : base(context) { }
         public override bool DefaultSubgroup => true;
         public override bool DefaultDecoration => false;
 
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/FlagTypeEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/FlagTypeEditor.cs
index 1e7155ae..3002128b 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/FlagTypeEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/FlagTypeEditor.cs
@@ -16,6 +16,7 @@ namespace RogueEssence.Dev
 {
     public class FlagTypeEditor : Editor<FlagType>
     {
+        public FlagTypeEditor(EditorContext context) : base(context) { }
         public override bool DefaultSubgroup => true;
         public override bool DefaultDecoration => false;
         public override bool DefaultLabel => false;
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/FrameTypeEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/FrameTypeEditor.cs
index 2bf9557c..7188b0c1 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/FrameTypeEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/FrameTypeEditor.cs
@@ -17,6 +17,7 @@ namespace RogueEssence.Dev
 {
     public class FrameTypeEditor : IntEditor
     {
+        public FrameTypeEditor(EditorContext context) : base(context) { }
         public override bool DefaultSubgroup => true;
         public override bool DefaultDecoration => false;
 
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/InvItemEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/InvItemEditor.cs
index 72b4ef0a..9473a0db 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/InvItemEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/InvItemEditor.cs
@@ -16,6 +16,7 @@ namespace RogueEssence.Dev
 {
     public class InvItemEditor : Editor<InvItem>
     {
+        public InvItemEditor(EditorContext context) : base(context) { }
         public override void LoadWindowControls(StackPanel control, string parent, Type parentType, string name, Type type, object[] attributes, InvItem member, Type[] subGroupStack)
         {
             Avalonia.Controls.Grid innerPanel1 = getSharedRowPanel(2);
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/ItemDataEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/ItemDataEditor.cs
index 3e22f608..798644ac 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/ItemDataEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/ItemDataEditor.cs
@@ -12,6 +12,7 @@ namespace RogueEssence.Dev
 {
     public class ItemDataEditor : Editor<ItemData>
     {
+        public ItemDataEditor(EditorContext context) : base(context) { }
         public override bool DefaultSubgroup => false;
 
         public override void LoadMemberControl(string parent, ItemData obj, StackPanel control, string name, Type type, object[] attributes, object member, bool isWindow, Type[] subGroupStack)
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/ItemSpawnZoneStepEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/ItemSpawnZoneStepEditor.cs
index d06b6dca..973f0a6a 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/ItemSpawnZoneStepEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/ItemSpawnZoneStepEditor.cs
@@ -18,6 +18,7 @@ namespace RogueEssence.Dev
 {
     public class ItemSpawnZoneStepEditor : Editor<ItemSpawnZoneStep>
     {
+        public ItemSpawnZoneStepEditor(EditorContext context) : base(context) { }
         public override string GetString(ItemSpawnZoneStep obj, Type type, object[] attributes)
         {
             return String.Format("{0} [{1}]", "Spawn Items", obj.Spawns.Count.ToString());
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/MapItemEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/MapItemEditor.cs
index 70ece608..11b85c06 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/MapItemEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/MapItemEditor.cs
@@ -16,6 +16,7 @@ namespace RogueEssence.Dev
 {
     public class MapItemEditor : Editor<MapItem>
     {
+        public MapItemEditor(EditorContext context) : base(context) { }
         public override void LoadWindowControls(StackPanel control, string parent, Type parentType, string name, Type type, object[] attributes, MapItem member, Type[] subGroupStack)
         {
             MapItemAttribute itemAtt = ReflectionExt.FindAttribute<MapItemAttribute>(attributes);
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/MobSpawnEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/MobSpawnEditor.cs
index 0e6e3d0d..7d382c08 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/MobSpawnEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/MobSpawnEditor.cs
@@ -18,6 +18,7 @@ namespace RogueEssence.Dev
 {
     public class MobSpawnEditor : Editor<MobSpawn>
     {
+        public MobSpawnEditor(EditorContext context) : base(context) { }
         public override string GetString(MobSpawn obj, Type type, object[] attributes)
         {
             string monName = "[EMPTY]";
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/MobSpawnExtraEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/MobSpawnExtraEditor.cs
index 605335b2..aece8a6d 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/MobSpawnExtraEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/MobSpawnExtraEditor.cs
@@ -10,6 +10,7 @@ namespace RogueEssence.Dev
 {
     public class MobSpawnStatusEditor : Editor<MobSpawnStatus>
     {
+        public MobSpawnStatusEditor(EditorContext context) : base(context) { }
         public override string GetString(MobSpawnStatus obj, Type type, object[] attributes)
         {
             if (obj.Statuses.Count != 1)
@@ -27,6 +28,7 @@ public override string GetTypeString()
     }
     public class MobSpawnScriptEditor : Editor<MobSpawnScript>
     {
+        public MobSpawnScriptEditor(EditorContext context) : base(context) { }
         public override string GetString(MobSpawnScript obj, Type type, object[] attributes)
         {
             LuaTable tbl = LuaEngine.Instance.RunString("return " + obj.ArgTable).First() as LuaTable;
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/MoneySpawnRangeEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/MoneySpawnRangeEditor.cs
index 15dfa8a4..f5f5334b 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/MoneySpawnRangeEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/MoneySpawnRangeEditor.cs
@@ -27,7 +27,7 @@ public class MoneySpawnRangeEditor : Editor<MoneySpawnRange>
         /// </summary>
         public bool Inclusive;
 
-        public MoneySpawnRangeEditor(bool index1, bool inclusive)
+        public MoneySpawnRangeEditor(EditorContext context, bool index1, bool inclusive) : base(context)
         {
             Index1 = index1;
             Inclusive = inclusive;
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/MoneySpawnZoneStepEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/MoneySpawnZoneStepEditor.cs
index 7c3df4c7..fcfc459b 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/MoneySpawnZoneStepEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/MoneySpawnZoneStepEditor.cs
@@ -17,6 +17,7 @@ namespace RogueEssence.Dev
 {
     public class MoneySpawnZoneStepEditor : Editor<MoneySpawnZoneStep>
     {
+        public MoneySpawnZoneStepEditor(EditorContext context) : base(context) { }
         public override string GetString(MoneySpawnZoneStep obj, Type type, object[] attributes)
         {
             string startString = getRangeString(obj.StartAmount);
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/MonsterIDEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/MonsterIDEditor.cs
index 7417103d..dec1d043 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/MonsterIDEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/MonsterIDEditor.cs
@@ -16,6 +16,7 @@ namespace RogueEssence.Dev
 {
     public class MonsterIDEditor : Editor<MonsterID>
     {
+        public MonsterIDEditor(EditorContext context) : base(context) { }
         public override bool DefaultSubgroup => true;
         public override bool DefaultDecoration => false;
 
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/MultiplierEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/MultiplierEditor.cs
index c4edaa96..91212a8f 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/MultiplierEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/MultiplierEditor.cs
@@ -16,6 +16,7 @@ namespace RogueEssence.Dev
 {
     public class MultiplierEditor : Editor<Multiplier>
     {
+        public MultiplierEditor(EditorContext context) : base(context) { }
         public override bool DefaultSubgroup => true;
         public override bool DefaultDecoration => false;
 
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/MusicEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/MusicEditor.cs
index e0622c42..b0b02abb 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/MusicEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/MusicEditor.cs
@@ -17,6 +17,7 @@ namespace RogueEssence.Dev
 {
     public class MusicEditor : StringEditor
     {
+        public MusicEditor(EditorContext context) : base(context) { }
         public override bool DefaultSubgroup => true;
 
         public override bool DefaultDecoration => false;
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/PromoteBranchEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/PromoteBranchEditor.cs
index 9a16aff1..2b3def2a 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/PromoteBranchEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/PromoteBranchEditor.cs
@@ -16,6 +16,7 @@ namespace RogueEssence.Dev
 {
     public class PromoteBranchEditor : Editor<PromoteBranch>
     {
+        public PromoteBranchEditor(EditorContext context) : base(context) { }
         public override string GetString(PromoteBranch obj, Type type, object[] attributes)
         {
             MonsterData entry = DataManager.Instance.GetMonster(obj.Result);
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/SegLocEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/SegLocEditor.cs
index 89bca72c..15804734 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/SegLocEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/SegLocEditor.cs
@@ -16,6 +16,7 @@ namespace RogueEssence.Dev
 {
     public class SegLocEditor : Editor<SegLoc>
     {
+        public SegLocEditor(EditorContext context) : base(context) { }
         public override bool DefaultSubgroup => true;
         public override bool DefaultDecoration => false;
 
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/SoundEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/SoundEditor.cs
index 26562ae5..211b807c 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/SoundEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/SoundEditor.cs
@@ -17,6 +17,7 @@ namespace RogueEssence.Dev
 {
     public class SoundEditor : StringEditor
     {
+        public SoundEditor(EditorContext context) : base(context) { }
         public override bool DefaultSubgroup => true;
 
         public override bool DefaultDecoration => false;
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/SpreadPlanBaseEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/SpreadPlanBaseEditor.cs
index 269f4941..e6e7e0ad 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/SpreadPlanBaseEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/SpreadPlanBaseEditor.cs
@@ -18,6 +18,7 @@ namespace RogueEssence.Dev
 {
     public class SpreadPlanBaseEditor : Editor<SpreadPlanBase>
     {
+        public SpreadPlanBaseEditor(EditorContext context) : base(context) { }
         public override string GetString(SpreadPlanBase obj, Type type, object[] attributes)
         {
             MemberInfo[] floorRangeInfo = type.GetMember(nameof(obj.FloorRange));
@@ -29,6 +30,7 @@ public override string GetString(SpreadPlanBase obj, Type type, object[] attribu
 
     public class SpreadPlanSpacedEditor : Editor<SpreadPlanSpaced>
     {
+        public SpreadPlanSpacedEditor(EditorContext context) : base(context) { }
         public override string GetString(SpreadPlanSpaced obj, Type type, object[] attributes)
         {
             MemberInfo[] floorRangeInfo = type.GetMember(nameof(obj.FloorRange));
@@ -41,6 +43,7 @@ public override string GetString(SpreadPlanSpaced obj, Type type, object[] attri
 
     public class SpreadPlanQuotaEditor : Editor<SpreadPlanQuota>
     {
+        public SpreadPlanQuotaEditor(EditorContext context) : base(context) { }
         public override string GetString(SpreadPlanQuota obj, Type type, object[] attributes)
         {
             MemberInfo[] floorRangeInfo = type.GetMember(nameof(obj.FloorRange));
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/StatusEffectEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/StatusEffectEditor.cs
index b3984105..a0dcc1ba 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/StatusEffectEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/StatusEffectEditor.cs
@@ -18,6 +18,7 @@ namespace RogueEssence.Dev
 {
     public class StatusEffectEditor : Editor<StatusEffect>
     {
+        public StatusEffectEditor(EditorContext context) : base(context) { }
         //TODO: add a "load from default" button to load all status states from the original definition
         public override string GetString(StatusEffect obj, Type type, object[] attributes)
         {
@@ -40,6 +41,7 @@ public override string GetString(StatusEffect obj, Type type, object[] attribute
     }
     public class MapStatusEditor : Editor<MapStatus>
     {
+        public MapStatusEditor(EditorContext context) : base(context) { }
         //TODO: add a "load from default" button to load all status states from the original definition
         public override string GetString(MapStatus obj, Type type, object[] attributes)
         {
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/StringKeyEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/StringKeyEditor.cs
index 4e827bc4..b7ec37c8 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/StringKeyEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/StringKeyEditor.cs
@@ -20,6 +20,7 @@ namespace RogueEssence.Dev
 
     public class StringKeyEditor : Editor<StringKey>
     {
+        public StringKeyEditor(EditorContext context) : base(context) { }
         public override bool DefaultSubgroup => true;
         public override bool DefaultDecoration => false;
 
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/TeamMemberSpawnEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/TeamMemberSpawnEditor.cs
index 02c67e77..60087b75 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/TeamMemberSpawnEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/TeamMemberSpawnEditor.cs
@@ -18,6 +18,7 @@ namespace RogueEssence.Dev
 {
     public class TeamMemberSpawnEditor : Editor<TeamMemberSpawn>
     {
+        public TeamMemberSpawnEditor(EditorContext context) : base(context) { }
         public override string GetString(TeamMemberSpawn obj, Type type, object[] attributes)
         {
             MemberInfo[] spawnInfo = type.GetMember(nameof(obj.Spawn));
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/TeamSpawnZoneStepEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/TeamSpawnZoneStepEditor.cs
index ff4e4e9a..8aac9dae 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/TeamSpawnZoneStepEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/TeamSpawnZoneStepEditor.cs
@@ -18,6 +18,7 @@ namespace RogueEssence.Dev
 {
     public class TeamSpawnZoneStepEditor : Editor<TeamSpawnZoneStep>
     {
+        public TeamSpawnZoneStepEditor(EditorContext context) : base(context) { }
         public override string GetString(TeamSpawnZoneStep obj, Type type, object[] attributes)
         {
             return String.Format("{0} [{1}]", "Spawn NPCs", obj.Spawns.Count.ToString());
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/TeamStepSpawnerEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/TeamStepSpawnerEditor.cs
index 7ade9040..6241b9d8 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/TeamStepSpawnerEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/TeamStepSpawnerEditor.cs
@@ -17,6 +17,7 @@ namespace RogueEssence.Dev
 {
     public class TeamStepSpawnerEditor : Editor<IMultiTeamStepSpawner>
     {
+        public TeamStepSpawnerEditor(EditorContext context) : base(context) { }
         public override bool DefaultSubgroup => true;
     }
 }
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Testable/BaseEmitterEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Testable/BaseEmitterEditor.cs
index 17ab78bc..14079434 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Testable/BaseEmitterEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Testable/BaseEmitterEditor.cs
@@ -10,6 +10,7 @@ namespace RogueEssence.Dev
 {
     public class BaseEmitterEditor : TestableEditor<EndingEmitter>
     {
+        public BaseEmitterEditor(EditorContext context) : base(context) { }
         protected override void RunTest(EndingEmitter data)
         {
             Character player = DungeonScene.Instance.FocusedCharacter;
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Testable/BattleDataEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Testable/BattleDataEditor.cs
index da1d71a3..557b2de6 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Testable/BattleDataEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Testable/BattleDataEditor.cs
@@ -11,6 +11,7 @@ namespace RogueEssence.Dev
 {
     public class BattleDataEditor : TestableEditor<BattleData>
     {
+        public BattleDataEditor(EditorContext context) : base(context) { }
         protected override void RunTest(BattleData data)
         {
             Character player = DungeonScene.Instance.FocusedCharacter;
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Testable/BattleFXEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Testable/BattleFXEditor.cs
index e8d6064a..787a5707 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Testable/BattleFXEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Testable/BattleFXEditor.cs
@@ -10,6 +10,7 @@ namespace RogueEssence.Dev
 {
     public class BattleFXEditor : TestableEditor<BattleFX>
     {
+        public BattleFXEditor(EditorContext context) : base(context) { }
         protected override void RunTest(BattleFX data)
         {
             Character player = DungeonScene.Instance.FocusedCharacter;
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Testable/CircleSquareEmitterEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Testable/CircleSquareEmitterEditor.cs
index 92a3192d..f8449231 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Testable/CircleSquareEmitterEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Testable/CircleSquareEmitterEditor.cs
@@ -10,6 +10,7 @@ namespace RogueEssence.Dev
 {
     public class CircleSquareEmitterEditor : TestableEditor<CircleSquareEmitter>
     {
+        public CircleSquareEmitterEditor(EditorContext context) : base(context) { }
         protected override void RunTest(CircleSquareEmitter data)
         {
             Character player = DungeonScene.Instance.FocusedCharacter;
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Testable/ColumnAnimEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Testable/ColumnAnimEditor.cs
index 0ff5543e..2f876285 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Testable/ColumnAnimEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Testable/ColumnAnimEditor.cs
@@ -10,6 +10,7 @@ namespace RogueEssence.Dev
 {
     public class ColumnAnimEditor : TestableEditor<ColumnAnim>
     {
+        public ColumnAnimEditor(EditorContext context) : base(context) { }
         protected override void RunTest(ColumnAnim data)
         {
             Character player = DungeonScene.Instance.FocusedCharacter;
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Testable/CombatActionEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Testable/CombatActionEditor.cs
index 96313db2..edf63ce6 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Testable/CombatActionEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Testable/CombatActionEditor.cs
@@ -11,6 +11,7 @@ namespace RogueEssence.Dev
 {
     public class CombatActionEditor : TestableEditor<CombatAction>
     {
+        public CombatActionEditor(EditorContext context) : base(context) { }
         protected override void RunTest(CombatAction data)
         {
             Character player = DungeonScene.Instance.FocusedCharacter;
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Testable/ExplosionDataEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Testable/ExplosionDataEditor.cs
index 6e899016..3204551c 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Testable/ExplosionDataEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Testable/ExplosionDataEditor.cs
@@ -11,6 +11,7 @@ namespace RogueEssence.Dev
 {
     public class ExplosionDataEditor : TestableEditor<ExplosionData>
     {
+        public ExplosionDataEditor(EditorContext context) : base(context) { }
         protected override void RunTest(ExplosionData data)
         {
             Character player = DungeonScene.Instance.FocusedCharacter;
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Testable/ShootingEmitterEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Testable/ShootingEmitterEditor.cs
index 91c99300..cfcd3536 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Testable/ShootingEmitterEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Testable/ShootingEmitterEditor.cs
@@ -10,6 +10,7 @@ namespace RogueEssence.Dev
 {
     public class ShootingEmitterEditor : TestableEditor<ShootingEmitter>
     {
+        public ShootingEmitterEditor(EditorContext context) : base(context) { }
         protected override void RunTest(ShootingEmitter data)
         {
             Character player = DungeonScene.Instance.FocusedCharacter;
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Testable/SkillDataEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Testable/SkillDataEditor.cs
index 15d4482f..3626c28b 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Testable/SkillDataEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Testable/SkillDataEditor.cs
@@ -11,6 +11,7 @@ namespace RogueEssence.Dev
 {
     public class SkillDataEditor : TestableEditor<SkillData>
     {
+        public SkillDataEditor(EditorContext context) : base(context) { }
         protected override void RunTest(SkillData data)
         {
             Character player = DungeonScene.Instance.FocusedCharacter;
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Testable/StaticAnimEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Testable/StaticAnimEditor.cs
index 80533cf1..4f4f0052 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Testable/StaticAnimEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Testable/StaticAnimEditor.cs
@@ -10,6 +10,7 @@ namespace RogueEssence.Dev
 {
     public class StaticAnimEditor : TestableEditor<StaticAnim>
     {
+        public StaticAnimEditor(EditorContext context) : base(context) { }
         protected override void RunTest(StaticAnim data)
         {
             Character player = DungeonScene.Instance.FocusedCharacter;
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Testable/TestableEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Testable/TestableEditor.cs
index 66343bb1..98510f6c 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Testable/TestableEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Testable/TestableEditor.cs
@@ -13,6 +13,7 @@ namespace RogueEssence.Dev
     public abstract class TestableEditor<T> : Editor<T>
     {
 
+        public TestableEditor(EditorContext context) : base(context) { }
         public override void LoadWindowControls(StackPanel control, string parent, Type parentType, string name, Type type, object[] attributes, T obj, Type[] subGroupStack)
         {
             base.LoadWindowControls(control, parent, parentType, name, type, attributes, obj, subGroupStack);
@@ -20,6 +21,7 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
             Button btnTest = new Button();
             btnTest.Margin = new Avalonia.Thickness(0, 4, 0, 0);
             btnTest.Content = "Test";
+            btnTest.Classes.Add("flat");
             btnTest.Click += (object sender, RoutedEventArgs e) =>
             {
                 lock (GameBase.lockObj)
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/TileSpawnZoneStepEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/TileSpawnZoneStepEditor.cs
index ca7ffcd6..1767d911 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/TileSpawnZoneStepEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/TileSpawnZoneStepEditor.cs
@@ -18,6 +18,7 @@ namespace RogueEssence.Dev
 {
     public class TileSpawnZoneStepEditor : Editor<TileSpawnZoneStep>
     {
+        public TileSpawnZoneStepEditor(EditorContext context) : base(context) { }
         public override string GetString(TileSpawnZoneStep obj, Type type, object[] attributes)
         {
             return String.Format("{0} [{1}]", "Spawn Effect Tiles", obj.Spawns.Count.ToString());
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Tiles/AutoTileBaseEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Tiles/AutoTileBaseEditor.cs
index ef6b07f2..5623074a 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Tiles/AutoTileBaseEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Tiles/AutoTileBaseEditor.cs
@@ -6,12 +6,15 @@
 using RogueEssence.Data;
 using Avalonia.Controls;
 using Avalonia.Interactivity;
+using RogueEssence.Dev.Utility;
+using RogueEssence.Dev.ViewModels;
 using RogueEssence.Dev.Views;
 
 namespace RogueEssence.Dev
 {
     public class AutoTileBaseEditor : Editor<AutoTileBase>
     {
+        public AutoTileBaseEditor(EditorContext context) : base(context) { }
 
         public override void LoadWindowControls(StackPanel control, string parent, Type parentType, string name, Type type, object[] attributes, AutoTileBase obj, Type[] subGroupStack)
         {
@@ -24,20 +27,30 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
             // btnAssign.PointerReleased
             btnAssign.Click += (object sender, RoutedEventArgs e) =>
             {
+                EditorPageViewModel pageViewModel = control.FindAncestorViewModel<EditorPageViewModel>();
                 bool advancedEdit = false;
-                DataEditForm frmData = new DataEditForm();
-                frmData.Title = "Choose a Tilesheet";
+                string title = "Choose a Tilesheet";
 
                 object[] elementAttr = new object[1];
                 elementAttr[0] = new AnimAttribute(0, "Tile");
-                DataEditor.LoadClassControls(frmData.ControlPanel, parent, parentType, name, typeof(string), elementAttr, "", true, new Type[0], advancedEdit);
-                DataEditor.TrackTypeSize(frmData, typeof(string));
 
-                frmData.SelectedOKEvent += async () =>
+                NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(title, pageViewModel.Node.Icon);
+                pageViewModel.Node.SubNodes.Add(node);
+
+                NodeHelper.ExpandParents(node, true);
+                ReflectedDataPageViewModel newEditor = _context.PageFactory.CreatePage<ReflectedDataPageViewModel>(node);
+                newEditor.SetPageTitle(title, pageViewModel.Node.Icon);
+
+                newEditor.OnLoadAction = (StackPanel stack) =>
+                {
+                    DataEditor.LoadClassControls(stack, parent, parentType, name, typeof(string), elementAttr, "", true, new Type[0], advancedEdit);
+                };
+
+                newEditor.OnOKAction = async (StackPanel stack) =>
                 {
-                    object element = DataEditor.SaveClassControls(frmData.ControlPanel, name, typeof(string), elementAttr, true, new Type[0], advancedEdit);
+                    object element = DataEditor.SaveClassControls(stack, name, typeof(string), elementAttr, true, new Type[0], advancedEdit);
                     string destSheet = (string)element;
-                    //change all tiles of this object by first saving the object and then updating and then reloading?
+
                     AutoTileBase preTiles = SaveWindowControls(control, name, type, attributes, subGroupStack);
                     foreach (List<TileLayer> layers in preTiles.IterateElements())
                     {
@@ -52,8 +65,7 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
                     return true;
                 };
 
-                control.GetOwningForm().RegisterChild(frmData);
-                frmData.Show();
+                _context.TabEvents.AddChildPage(pageViewModel, newEditor);
             };
             control.Children.Add(btnAssign);
         }
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Tiles/AutoTileEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Tiles/AutoTileEditor.cs
index 5e6b6e46..cba6ac30 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Tiles/AutoTileEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Tiles/AutoTileEditor.cs
@@ -13,6 +13,7 @@ namespace RogueEssence.Dev
 {
     public class AutoTileEditor : Editor<AutoTile>
     {
+        public AutoTileEditor(EditorContext context) : base(context) { }
         public override bool DefaultSubgroup => true;
         public override bool DefaultDecoration => false;
 
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Tiles/TileLayerEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Tiles/TileLayerEditor.cs
index ef19e414..419ba199 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Tiles/TileLayerEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Tiles/TileLayerEditor.cs
@@ -16,6 +16,7 @@ namespace RogueEssence.Dev
 {
     public class TileLayerEditor : Editor<TileLayer>
     {
+        public TileLayerEditor(EditorContext context) : base(context) { }
         public override bool DefaultSubgroup => true;
         public override bool DefaultDecoration => false;
 
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/ZoneDataEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/ZoneDataEditor.cs
index 0a91b400..a2577aa0 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/ZoneDataEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/ZoneDataEditor.cs
@@ -17,6 +17,7 @@ namespace RogueEssence.Dev
     public class ZoneDataEditor : Editor<ZoneData>
     {
 
+        public ZoneDataEditor(EditorContext context) : base(context) { }
         public override void LoadWindowControls(StackPanel control, string parent, Type parentType, string name, Type type, object[] attributes, ZoneData obj, Type[] subGroupStack)
         {
             base.LoadWindowControls(control, parent, parentType, name, type, attributes, obj, subGroupStack);
@@ -32,7 +33,7 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
 
                 if (!Directory.Exists(zonescriptdir))
                 {
-                    await MessageBox.Show(control.GetOwningForm(), String.Format("This zone has not been saved under the current mod-under-edit.  Please switch to the desired mod and save it first."), "Invalid Operation", MessageBox.MessageBoxButtons.Ok);
+                    await MessageBoxWindowView.Show(_context.DialogService, String.Format("This zone has not been saved under the current mod-under-edit.  Please switch to the desired mod and save it first."), "Invalid Operation", MessageBoxWindowView.MessageBoxButtons.Ok);
                 }
                 else
                 {
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/ArrayEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/ArrayEditor.cs
index 5b88ce20..9b752903 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/ArrayEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/ArrayEditor.cs
@@ -11,12 +11,14 @@
 using System.Collections;
 using Avalonia;
 using System.Reactive.Subjects;
+using RogueEssence.Dev.Utility;
 using RogueEssence.Dev.ViewModels;
 
 namespace RogueEssence.Dev
 {
     public class ArrayEditor : Editor<Array>
     {
+        public ArrayEditor(EditorContext context) : base(context) { }
         public override bool DefaultSubgroup => true;
         public override bool DefaultDecoration => false;
 
@@ -36,7 +38,7 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
 
                 CollectionBoxViewModel vm = createViewModel(control, parent, name, type, attributes, member, rangeAtt.Index1);
                 lbxValue.DataContext = vm;
-                lbxValue.SetListContextMenu(ListEditor.CreateContextMenu(control, type, vm));
+                lbxValue.SetListContextMenu(ListEditor.CreateContextMenu(_context.DialogService, control, type, vm));
                 lbxValue.MinHeight = lbxValue.MaxHeight;//TODO: Uptake Avalonia fix for improperly updating Grid control dimensions
                 control.Children.Add(lbxValue);
             }
@@ -52,7 +54,7 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
 
                 CollectionBoxViewModel vm = createViewModel(control, parent, name, type, attributes, member, false);
                 lbxValue.DataContext = vm;
-                lbxValue.SetListContextMenu(ListEditor.CreateContextMenu(control, type, vm));
+                lbxValue.SetListContextMenu(ListEditor.CreateContextMenu(_context.DialogService, control, type, vm));
                 lbxValue.MinHeight = lbxValue.MaxHeight;//TODO: Uptake Avalonia fix for improperly updating Grid control dimensions
                 control.Children.Add(lbxValue);
             }
@@ -63,7 +65,7 @@ private CollectionBoxViewModel createViewModel(StackPanel control, string parent
         {
             Type elementType = type.GetElementType();
 
-            CollectionBoxViewModel vm = new CollectionBoxViewModel(control.GetOwningForm(), new StringConv(elementType, ReflectionExt.GetPassableAttributes(1, attributes)));
+            CollectionBoxViewModel vm = new CollectionBoxViewModel(_context.DialogService, new StringConv(elementType, ReflectionExt.GetPassableAttributes(1, attributes)));
             vm.Index1 = index1;
             CollectionAttribute confirmAtt = ReflectionExt.FindAttribute<CollectionAttribute>(attributes);
             if (confirmAtt != null)
@@ -72,22 +74,30 @@ private CollectionBoxViewModel createViewModel(StackPanel control, string parent
             //add lambda expression for editing a single element
             vm.OnEditItem += (int index, object element, bool advancedEdit, CollectionBoxViewModel.EditElementOp op) =>
             {
+                EditorPageViewModel pageViewModel = control.FindAncestorViewModel<EditorPageViewModel>();
                 string elementName = name + "[" + index + "]";
-                DataEditForm frmData = new DataEditForm();
-                frmData.Title = DataEditor.GetWindowTitle(parent, elementName, element, elementType, ReflectionExt.GetPassableAttributes(0, attributes));
+                string title = DataEditor.GetWindowTitle(parent, elementName, element, elementType, ReflectionExt.GetPassableAttributes(0, attributes));
 
-                DataEditor.LoadClassControls(frmData.ControlPanel, parent, null, elementName, elementType, ReflectionExt.GetPassableAttributes(0, attributes), element, true, new Type[0], advancedEdit);
-                DataEditor.TrackTypeSize(frmData, elementType);
+                NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(title, pageViewModel.Node.Icon);
+                pageViewModel.Node.SubNodes.Add(node);
 
-                frmData.SelectedOKEvent += async () =>
+                NodeHelper.ExpandParents(node, true);
+                ReflectedDataPageViewModel newEditor = _context.PageFactory.CreatePage<ReflectedDataPageViewModel>(node);
+                newEditor.SetPageTitle(title, pageViewModel.Node.Icon);
+
+                newEditor.OnLoadAction = (StackPanel stack) =>
+                {
+                    DataEditor.LoadClassControls(stack, parent, null, elementName, elementType, ReflectionExt.GetPassableAttributes(0, attributes), element, true, new Type[0], advancedEdit);
+                };
+
+                newEditor.OnOKAction = async (StackPanel stack) =>
                 {
-                    element = DataEditor.SaveClassControls(frmData.ControlPanel, elementName, elementType, ReflectionExt.GetPassableAttributes(0, attributes), true, new Type[0], advancedEdit);
+                    element = DataEditor.SaveClassControls(stack, elementName, elementType, ReflectionExt.GetPassableAttributes(0, attributes), true, new Type[0], advancedEdit);
                     op(index, element);
                     return true;
                 };
 
-                control.GetOwningForm().RegisterChild(frmData);
-                frmData.Show();
+                _context.TabEvents.AddChildPage(pageViewModel, newEditor);
             };
 
 
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/DictionaryEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/DictionaryEditor.cs
index 6491eb93..0e8bc824 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/DictionaryEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/DictionaryEditor.cs
@@ -11,84 +11,117 @@
 using System.Collections;
 using RogueEssence.Dev.ViewModels;
 using Avalonia.Interactivity;
+using RogueEssence.Dev.Services;
+using RogueEssence.Dev.Utility;
 
 namespace RogueEssence.Dev
 {
     public class DictionaryEditor : Editor<IDictionary>
     {
+        public DictionaryEditor(EditorContext context) : base(context) { }
         public override bool DefaultSubgroup => true;
         public override bool DefaultDecoration => false;
         public override bool DefaultType => true;
 
-        public override void LoadWindowControls(StackPanel control, string parent, Type parentType, string name, Type type, object[] attributes, IDictionary member, Type[] subGroupStack)
+        public override void LoadWindowControls(StackPanel control, string parent, Type parentType, string name,
+            Type type, object[] attributes, IDictionary member, Type[] subGroupStack)
         {
             Type keyType = ReflectionExt.GetBaseTypeArg(typeof(IDictionary<,>), type, 0);
             Type elementType = ReflectionExt.GetBaseTypeArg(typeof(IDictionary<,>), type, 1);
 
             DictionaryBox lbxValue = new DictionaryBox();
-            
+
             EditorHeightAttribute heightAtt = ReflectionExt.FindAttribute<EditorHeightAttribute>(attributes);
             if (heightAtt != null)
                 lbxValue.MaxHeight = heightAtt.Height;
             else
                 lbxValue.MaxHeight = 200;
 
-            DictionaryBoxViewModel vm = new DictionaryBoxViewModel(control.GetOwningForm(), new StringConv(elementType, ReflectionExt.GetPassableAttributes(2, attributes)));
-
+            DictionaryBoxViewModel vm = new DictionaryBoxViewModel(_context.DialogService,
+                new StringConv(elementType, ReflectionExt.GetPassableAttributes(2, attributes)));
+            
             CollectionAttribute confirmAtt = ReflectionExt.FindAttribute<CollectionAttribute>(attributes);
             if (confirmAtt != null)
                 vm.ConfirmDelete = confirmAtt.ConfirmDelete;
 
             lbxValue.DataContext = vm;
-            lbxValue.MinHeight = lbxValue.MaxHeight;//TODO: Uptake Avalonia fix for improperly updating Grid control dimensions
+            lbxValue.MinHeight = lbxValue.MaxHeight; //TODO: Uptake Avalonia fix for improperly updating Grid control dimensions
 
             //add lambda expression for editing a single element
             vm.OnEditItem += (object key, object element, bool advancedEdit, DictionaryBoxViewModel.EditElementOp op) =>
             {
+                EditorPageViewModel pageViewModel = control.FindAncestorViewModel<EditorPageViewModel>();
                 string elementName = name + "[" + key.ToString() + "]";
-                DataEditForm frmData = new DataEditForm();
-                frmData.Title = DataEditor.GetWindowTitle(parent, elementName, element, elementType, ReflectionExt.GetPassableAttributes(2, attributes));
+                string title = DataEditor.GetWindowTitle(parent, elementName, element, elementType,
+                    ReflectionExt.GetPassableAttributes(2, attributes));
 
-                DataEditor.LoadClassControls(frmData.ControlPanel, parent, null, elementName, elementType, ReflectionExt.GetPassableAttributes(2, attributes), element, true, new Type[0], advancedEdit);
-                DataEditor.TrackTypeSize(frmData, elementType);
+                NodeBase node =
+                    _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(title,
+                        pageViewModel.Node.Icon);
+                pageViewModel.Node.AddNodeIfNotExists(node);
+
+                NodeHelper.ExpandParents(node, true);
+                ReflectedDataPageViewModel
+                    newEditor = _context.PageFactory.CreatePage<ReflectedDataPageViewModel>(node);
+                newEditor.SetPageTitle(title, pageViewModel.Node.Icon);
+
+                newEditor.OnLoadAction = (StackPanel stack) =>
+                {
+                    DataEditor.LoadClassControls(stack, elementName, null, elementName, elementType,
+                        ReflectionExt.GetPassableAttributes(2, attributes), element, true, new Type[0],
+                        advancedEdit);
+                };
 
-                frmData.SelectedOKEvent += async () =>
+                newEditor.OnOKAction = async (StackPanel stack) =>
                 {
-                    element = DataEditor.SaveClassControls(frmData.ControlPanel, elementName, elementType, ReflectionExt.GetPassableAttributes(2, attributes), true, new Type[0], advancedEdit);
+                    element = DataEditor.SaveClassControls(stack, elementName, elementType,
+                        ReflectionExt.GetPassableAttributes(2, attributes), true, new Type[0], advancedEdit);
                     op(key, key, element);
                     return true;
                 };
 
-                control.GetOwningForm().RegisterChild(frmData);
-                frmData.Show();
+                _context.TabEvents.AddChildPage(pageViewModel, newEditor);
             };
 
             vm.OnEditKey += (object key, object element, bool advancedEdit, DictionaryBoxViewModel.EditElementOp op) =>
             {
+                EditorPageViewModel pageViewModel = control.FindAncestorViewModel<EditorPageViewModel>();
                 string elementName = name + "<Key>";
-                DataEditForm frmData = new DataEditForm();
-                frmData.Title = DataEditor.GetWindowTitle(parent, elementName, key, keyType, ReflectionExt.GetPassableAttributes(1, attributes));
+                string title = DataEditor.GetWindowTitle(parent, elementName, key, keyType,
+                    ReflectionExt.GetPassableAttributes(1, attributes));
 
-                DataEditor.LoadClassControls(frmData.ControlPanel, parent, null, elementName, keyType, ReflectionExt.GetPassableAttributes(1, attributes), key, true, new Type[0], advancedEdit);
-                DataEditor.TrackTypeSize(frmData, keyType);
+                NodeBase node =
+                    _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(title,
+                        pageViewModel.Node.Icon);
+                pageViewModel.Node.SubNodes.Add(node);
 
-                frmData.SelectedOKEvent += async () =>
+                NodeHelper.ExpandParents(node, true);
+                ReflectedDataPageViewModel
+                    newEditor = _context.PageFactory.CreatePage<ReflectedDataPageViewModel>(node);
+                newEditor.SetPageTitle(title, pageViewModel.Node.Icon);
+
+                newEditor.OnLoadAction = (StackPanel stack) =>
+                {
+                    DataEditor.LoadClassControls(stack, parent, null, elementName, keyType,
+                        ReflectionExt.GetPassableAttributes(1, attributes), key, true, new Type[0], advancedEdit);
+                };
+
+                newEditor.OnOKAction = async (StackPanel stack) =>
                 {
-                    object newKey = DataEditor.SaveClassControls(frmData.ControlPanel, elementName, keyType, ReflectionExt.GetPassableAttributes(1, attributes), true, new Type[0], advancedEdit);
+                    object newKey = DataEditor.SaveClassControls(stack, elementName, keyType,
+                        ReflectionExt.GetPassableAttributes(1, attributes), true, new Type[0], advancedEdit);
                     op(key, newKey, element);
                     return true;
                 };
 
-                control.GetOwningForm().RegisterChild(frmData);
-                frmData.Show();
+                _context.TabEvents.AddChildPage(pageViewModel, newEditor);
             };
-
-            vm.LoadFromDict(member);
-            lbxValue.SetListContextMenu(CreateContextMenu(control, type, vm));
             control.Children.Add(lbxValue);
+            vm.LoadFromDict(member);
+            lbxValue.SetListContextMenu(CreateContextMenu(_context.DialogService, control, type, vm));
         }
 
-        public static ContextMenu CreateContextMenu(StackPanel control, Type type, DictionaryBoxViewModel vm)
+        public static ContextMenu CreateContextMenu(IDialogService dialogService, StackPanel control, Type type, DictionaryBoxViewModel vm)
         {
             Type keyType = ReflectionExt.GetBaseTypeArg(typeof(IDictionary<,>), type, 0);
             Type elementType = ReflectionExt.GetBaseTypeArg(typeof(IDictionary<,>), type, 1);
@@ -109,7 +142,7 @@ public static ContextMenu CreateContextMenu(StackPanel control, Type type, Dicti
                 if (vm.SelectedIndex > -1)
                     vm.EditKey(vm.SelectedIndex);
                 else
-                    await MessageBox.Show(control.GetOwningForm(), String.Format("No index selected!"), "Invalid Operation", MessageBox.MessageBoxButtons.Ok);
+                    await MessageBoxWindowView.Show(dialogService, String.Format("No index selected!"), "Invalid Operation", MessageBoxWindowView.MessageBoxButtons.Ok);
             };
             return copyPasteStrip;
         }
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/EnumEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/EnumEditor.cs
index d2c5525d..898307ff 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/EnumEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/EnumEditor.cs
@@ -16,6 +16,7 @@ namespace RogueEssence.Dev
 {
     public class EnumEditor : Editor<Enum>
     {
+        public EnumEditor(EditorContext context) : base(context) { }
         public override bool DefaultSubgroup => true;
         public override bool DefaultDecoration => false;
         public override bool DefaultType => true;
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/GuidEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/GuidEditor.cs
index 5b0ba9ac..fdef6cee 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/GuidEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/GuidEditor.cs
@@ -16,6 +16,7 @@ namespace RogueEssence.Dev
 {
     public class GuidEditor : Editor<Guid>
     {
+        public GuidEditor(EditorContext context) : base(context) { }
         public override bool DefaultSubgroup => true;
 
         public override bool DefaultDecoration => false;
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/HashSetEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/HashSetEditor.cs
index b8cd4738..11157cef 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/HashSetEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/HashSetEditor.cs
@@ -8,6 +8,7 @@
 using System.Drawing;
 using RogueElements;
 using Avalonia.Controls;
+using RogueEssence.Dev.Utility;
 using RogueEssence.Dev.Views;
 using RogueEssence.Dev.ViewModels;
 
@@ -17,6 +18,7 @@ namespace RogueEssence.Dev
     //so instead we have to do the painful process of manually adding every hashset of every type we actually use.  ugh
     public class HashSetEditor<T> : Editor<HashSet<T>>
     {
+        public HashSetEditor(EditorContext context) : base(context) { }
         public override bool DefaultSubgroup => true;
         public override bool DefaultDecoration => false;
         public override bool DefaultType => true;
@@ -26,14 +28,13 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
             Type elementType = typeof(T);
 
             CollectionBox lbxValue = new CollectionBox();
-
             EditorHeightAttribute heightAtt = ReflectionExt.FindAttribute<EditorHeightAttribute>(attributes);
             if (heightAtt != null)
                 lbxValue.MaxHeight = heightAtt.Height;
             else
                 lbxValue.MaxHeight = 200;
 
-            CollectionBoxViewModel vm = new CollectionBoxViewModel(control.GetOwningForm(), new StringConv(elementType, ReflectionExt.GetPassableAttributes(1, attributes)));
+            CollectionBoxViewModel vm = new CollectionBoxViewModel(_context.DialogService, new StringConv(elementType, ReflectionExt.GetPassableAttributes(1, attributes)));
 
             CollectionAttribute confirmAtt = ReflectionExt.FindAttribute<CollectionAttribute>(attributes);
             if (confirmAtt != null)
@@ -45,25 +46,30 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
             //add lambda expression for editing a single element
             vm.OnEditItem += (int index, object element, bool advancedEdit, CollectionBoxViewModel.EditElementOp op) =>
             {
+                EditorPageViewModel pageViewModel = control.FindAncestorViewModel<EditorPageViewModel>();
                 string elementName = name + "[" + index + "]";
-                DataEditForm frmData = new DataEditForm();
-                frmData.Title = DataEditor.GetWindowTitle(parent, elementName, element, elementType, ReflectionExt.GetPassableAttributes(1, attributes));
+                string title = DataEditor.GetWindowTitle(parent, elementName, element, elementType, ReflectionExt.GetPassableAttributes(1, attributes));
+
+                NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(title, pageViewModel.Node.Icon);
+                pageViewModel.Node.SubNodes.Add(node);
 
-                //TODO: make this a member and reference it that way
-                DataEditor.LoadClassControls(frmData.ControlPanel, parent, parentType, elementName, elementType, ReflectionExt.GetPassableAttributes(1, attributes), element, true, new Type[0], advancedEdit);
-                DataEditor.TrackTypeSize(frmData, elementType);
+                NodeHelper.ExpandParents(node, true);
+                ReflectedDataPageViewModel newEditor = _context.PageFactory.CreatePage<ReflectedDataPageViewModel>(node);
+                newEditor.SetPageTitle(title, pageViewModel.Node.Icon);
 
-                frmData.SelectedOKEvent += async () =>
+                newEditor.OnLoadAction = (StackPanel stack) =>
                 {
-                    object newElement = DataEditor.SaveClassControls(frmData.ControlPanel, elementName, elementType, ReflectionExt.GetPassableAttributes(1, attributes), true, new Type[0], advancedEdit);
+                    DataEditor.LoadClassControls(stack, parent, parentType, elementName, elementType, ReflectionExt.GetPassableAttributes(1, attributes), element, true, new Type[0], advancedEdit);
+                };
 
-                    bool itemExists = false;
+                newEditor.OnOKAction = async (StackPanel stack) =>
+                {
+                    object newElement = DataEditor.SaveClassControls(stack, elementName, elementType, ReflectionExt.GetPassableAttributes(1, attributes), true, new Type[0], advancedEdit);
 
+                    bool itemExists = false;
                     List<object> states = (List<object>)vm.GetList(typeof(List<object>));
                     for (int ii = 0; ii < states.Count; ii++)
                     {
-                        //ignore the current index being edited
-                        //if the element is null, then we are editing a new object, so skip
                         if (ii != index || element == null)
                         {
                             if (states[ii].Equals(newElement))
@@ -73,7 +79,7 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
 
                     if (itemExists)
                     {
-                        await MessageBox.Show(control.GetOwningForm(), "Cannot add duplicate items.", "Entry already exists.", MessageBox.MessageBoxButtons.Ok);
+                        await MessageBoxWindowView.Show(_context.DialogService, "Cannot add duplicate items.", "Entry already exists.", MessageBoxWindowView.MessageBoxButtons.Ok);
                         return false;
                     }
                     else
@@ -82,9 +88,7 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
                         return true;
                     }
                 };
-
-                control.GetOwningForm().RegisterChild(frmData);
-                frmData.Show();
+                _context.TabEvents.AddChildPage(pageViewModel, newEditor);
             };
 
             List<object> states = new List<object>();
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/ListEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/ListEditor.cs
index 34d8ac57..0e0fbbe4 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/ListEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/ListEditor.cs
@@ -11,11 +11,17 @@
 using RogueEssence.Dev.ViewModels;
 using System.Collections;
 using Avalonia.Interactivity;
+using Avalonia.LogicalTree;
+using Avalonia.VisualTree;
+using DynamicData;
+using RogueEssence.Dev.Services;
+using RogueEssence.Dev.Utility;
 
 namespace RogueEssence.Dev
 {
     public class ListEditor : Editor<IList>
     {
+        public ListEditor(EditorContext context) : base(context) { }
         public override bool DefaultSubgroup => true;
         public override bool DefaultDecoration => false;
         public override bool DefaultType => true;
@@ -36,7 +42,7 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
 
                 CollectionBoxViewModel vm = createViewModel(control, parent, name, type, attributes, member, rangeAtt.Index1);
                 lbxValue.DataContext = vm;
-                lbxValue.SetListContextMenu(CreateContextMenu(control, type, vm));
+                lbxValue.SetListContextMenu(CreateContextMenu(_context.DialogService, control, type, vm));
                 lbxValue.MinHeight = lbxValue.MaxHeight;//TODO: Uptake Avalonia fix for improperly updating Grid control dimensions
                 control.Children.Add(lbxValue);
             }
@@ -52,13 +58,13 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
 
                 CollectionBoxViewModel vm = createViewModel(control, parent, name, type, attributes, member, false);
                 lbxValue.DataContext = vm;
-                lbxValue.SetListContextMenu(CreateContextMenu(control, type, vm));
+                lbxValue.SetListContextMenu(CreateContextMenu(_context.DialogService, control, type, vm));
                 lbxValue.MinHeight = lbxValue.MaxHeight;//TODO: Uptake Avalonia fix for improperly updating Grid control dimensions
                 control.Children.Add(lbxValue);
             }
         }
 
-        public static ContextMenu CreateContextMenu(StackPanel control, Type type, CollectionBoxViewModel vm)
+        public static ContextMenu CreateContextMenu(IDialogService dialogService, StackPanel control, Type type, CollectionBoxViewModel vm)
         {
             Type elementType = ReflectionExt.GetBaseTypeArg(typeof(IList<>), type, 0);
 
@@ -84,7 +90,7 @@ public static ContextMenu CreateContextMenu(StackPanel control, Type type, Colle
                     DataEditor.SetClipboardObj(obj, null);
                 }
                 else
-                    await MessageBox.Show(control.GetOwningForm(), String.Format("No index selected!"), "Invalid Operation", MessageBox.MessageBoxButtons.Ok);
+                    await MessageBoxWindowView.Show(dialogService, String.Format("No index selected!"), "Invalid Operation", MessageBoxWindowView.MessageBoxButtons.Ok);
             };
             pasteToolStripMenuItem.Click += async (object copySender, RoutedEventArgs copyE) =>
             {
@@ -98,43 +104,117 @@ public static ContextMenu CreateContextMenu(StackPanel control, Type type, Colle
                     vm.InsertItem(idx, DataEditor.clipboardObj);
                 }
                 else
-                    await MessageBox.Show(control.GetOwningForm(), String.Format("Incompatible types:\n{0}\n{1}", type1.AssemblyQualifiedName, type2.AssemblyQualifiedName), "Invalid Operation", MessageBox.MessageBoxButtons.Ok);
+                    await MessageBoxWindowView.Show(dialogService, String.Format("Incompatible types:\n{0}\n{1}", type1.AssemblyQualifiedName, type2.AssemblyQualifiedName), "Invalid Operation", MessageBoxWindowView.MessageBoxButtons.Ok);
             };
             return copyPasteStrip;
         }
 
+
         private CollectionBoxViewModel createViewModel(StackPanel control, string parent, string name, Type type, object[] attributes, IList member, bool index1)
         {
             Type elementType = ReflectionExt.GetBaseTypeArg(typeof(IList<>), type, 0);
 
-            CollectionBoxViewModel vm = new CollectionBoxViewModel(control.GetOwningForm(), new StringConv(elementType, ReflectionExt.GetPassableAttributes(1, attributes)));
+            CollectionBoxViewModel vm = new CollectionBoxViewModel(_context.DialogService, new StringConv(elementType, ReflectionExt.GetPassableAttributes(1, attributes)));
             vm.Index1 = index1;
 
             CollectionAttribute confirmAtt = ReflectionExt.FindAttribute<CollectionAttribute>(attributes);
             if (confirmAtt != null)
                 vm.ConfirmDelete = confirmAtt.ConfirmDelete;
 
+          
+            
+            // //add lambda expression for editing a single element
+            // vm.OnEditItem += (int index, object element, bool advancedEdit, CollectionBoxViewModel.EditElementOp op) =>
+            // {
+            //     Console.WriteLine("TRY EDIT");
+            //     // public void TestMethod()
+            //     // {
+            //     //     NodeBase node = NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>("New Node [TODO Change Title]", "Icons.PaintBrushFill");
+            //     //     Node.SubNodes.Add(node);
+            //     //     var editor = PageFactory.CreatePage<ReflectedDataPageViewModel>(node);
+            //     //     if (editor != null)
+            //     //     {
+            //     //         editor.SetPageTitle("New Node [TODO Change Title]", Node.Icon);
+            //     //         TabEvents.AddChildPage(this, editor);
+            //     //     }
+            //     // }
+            //     
+            //     
+            //     
+            //     var new_editor = pageViewModel.PageFactory.CreatePage<ReflectedDataPageViewModel>(pageViewModel.Node);
+            //     var locator = new ViewLocator();
+            //     ReflectedDataPageView view = locator.Build(new_editor) as ReflectedDataPageView;
+            //     
+            //     Console.WriteLine(view + "VIEW DONE");
+            //  
+            //
+            //     
+            //     string elementName = name + "[" + index + "]";
+            //     string title = DataEditor.GetWindowTitle(parent, elementName, element, elementType, ReflectionExt.GetPassableAttributes(1, attributes));
+            //     DataEditor.LoadClassControlsReflected(view.ControlPanel, parent, null, elementName, elementType, ReflectionExt.GetPassableAttributes(1, attributes), element, true, new Type[0], advancedEdit);
+            //
+            //     NodeBase node = pageViewModel.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(title, pageViewModel.Node.Icon);
+            //     
+            //     pageViewModel.Node.SubNodes.Add(node);
+            //     // ReflectedDataPageViewModel editor = PageFactory.CreatePage<ReflectedDataPageViewModel>(node);
+            //     if (new_editor != null)
+            //     {
+            //         new_editor.SetPageTitle(title, pageViewModel.Node.Icon);
+            //         pageViewModel.TabEvents.AddChildPage(pageViewModel, new_editor);
+            //     }
+            //     
+            //     view.SelectedOKEvent += async () =>
+            //     {
+            //         element = DataEditor.SaveClassControls(view.ControlPanel, elementName, elementType, ReflectionExt.GetPassableAttributes(1, attributes), true, new Type[0], advancedEdit);
+            //         op(index, element);
+            //         return true;
+            //     };
+            //
+            //     
+            //     // DataEditor.TrackTypeSize(frmData, elementType);
+            //     //
+            //     // frmData.SelectedOKEvent += async () =>
+            //     // {
+            //     //     element = DataEditor.SaveClassControls(frmData.ControlPanel, elementName, elementType, ReflectionExt.GetPassableAttributes(1, attributes), true, new Type[0], advancedEdit);
+            //     //     op(index, element);
+            //     //     return true;
+            //     // };
+            //
+            //     // control.GetOwningForm().RegisterChild(frmData);
+            //     // // control.FindAncestorOfType<TreeDataGr>()
+            //
+            //     // frmData.Show();
+            // };
+            
             //add lambda expression for editing a single element
             vm.OnEditItem += (int index, object element, bool advancedEdit, CollectionBoxViewModel.EditElementOp op) =>
             {
+                EditorPageViewModel pageViewModel = control.FindAncestorViewModel<EditorPageViewModel>();
                 string elementName = name + "[" + index + "]";
-                DataEditForm frmData = new DataEditForm();
-                frmData.Title = DataEditor.GetWindowTitle(parent, elementName, element, elementType, ReflectionExt.GetPassableAttributes(1, attributes));
-
-                DataEditor.LoadClassControls(frmData.ControlPanel, parent, null, elementName, elementType, ReflectionExt.GetPassableAttributes(1, attributes), element, true, new Type[0], advancedEdit);
-                DataEditor.TrackTypeSize(frmData, elementType);
+                // string title = DataEditor.GetWindowTitle(parent, elementName, element, elementType, ReflectionExt.GetPassableAttributes(1, attributes));
+
+                NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(elementName, pageViewModel.Node.Icon);
+                
+                pageViewModel.Node.AddNodeIfNotExists(node);
+                
+                NodeHelper.ExpandParents(node, true);
+                ReflectedDataPageViewModel newEditor = _context.PageFactory.CreatePage<ReflectedDataPageViewModel>(node);
+                newEditor.SetPageTitle(elementName, pageViewModel.Node.Icon);
+                
+                newEditor.OnLoadAction = (StackPanel stack) =>
+                {
+                    DataEditor.LoadClassControls(stack, elementName, null, elementName, elementType, ReflectionExt.GetPassableAttributes(1, attributes), element, true, new Type[0], advancedEdit);
+                };
 
-                frmData.SelectedOKEvent += async () =>
+                newEditor.OnOKAction = async (StackPanel stack) =>
                 {
-                    element = DataEditor.SaveClassControls(frmData.ControlPanel, elementName, elementType, ReflectionExt.GetPassableAttributes(1, attributes), true, new Type[0], advancedEdit);
+                    element = DataEditor.SaveClassControls(stack, elementName, elementType, ReflectionExt.GetPassableAttributes(1, attributes), true, new Type[0], advancedEdit);
                     op(index, element);
                     return true;
                 };
 
-                control.GetOwningForm().RegisterChild(frmData);
-                frmData.Show();
+                _context.TabEvents.AddChildPage(pageViewModel, newEditor);
             };
-
             vm.LoadFromList(member);
             return vm;
         }
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/NoDupeListEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/NoDupeListEditor.cs
index 0ce775a4..4c95252c 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/NoDupeListEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/NoDupeListEditor.cs
@@ -8,6 +8,7 @@
 using System.Drawing;
 using RogueElements;
 using Avalonia.Controls;
+using RogueEssence.Dev.Utility;
 using RogueEssence.Dev.Views;
 using RogueEssence.Dev.ViewModels;
 
@@ -15,14 +16,22 @@ namespace RogueEssence.Dev
 {
     public class NoDupeListEditor : Editor<IList>
     {
+        public NoDupeListEditor(EditorContext context) : base(context)
+        {
+        }
+
         public override bool DefaultSubgroup => true;
         public override bool DefaultDecoration => false;
         public override bool DefaultType => true;
 
 
-        public override Type GetAttributeType() { return typeof(NoDupeAttribute); }
+        public override Type GetAttributeType()
+        {
+            return typeof(NoDupeAttribute);
+        }
 
-        public override void LoadWindowControls(StackPanel control, string parent, Type parentType, string name, Type type, object[] attributes, IList member, Type[] subGroupStack)
+        public override void LoadWindowControls(StackPanel control, string parent, Type parentType, string name,
+            Type type, object[] attributes, IList member, Type[] subGroupStack)
         {
             Type elementType = ReflectionExt.GetBaseTypeArg(typeof(IList<>), member.GetType(), 0);
 
@@ -34,37 +43,51 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
             else
                 lbxValue.MaxHeight = 180;
 
-            CollectionBoxViewModel vm = new CollectionBoxViewModel(control.GetOwningForm(), new StringConv(elementType, ReflectionExt.GetPassableAttributes(1, attributes)));
+            CollectionBoxViewModel vm = new CollectionBoxViewModel(_context.DialogService,
+                new StringConv(elementType, ReflectionExt.GetPassableAttributes(1, attributes)));
 
             CollectionAttribute confirmAtt = ReflectionExt.FindAttribute<CollectionAttribute>(attributes);
             if (confirmAtt != null)
                 vm.ConfirmDelete = confirmAtt.ConfirmDelete;
 
             lbxValue.DataContext = vm;
-            lbxValue.MinHeight = lbxValue.MaxHeight;//TODO: Uptake Avalonia fix for improperly updating Grid control dimensions
+            lbxValue.MinHeight =
+                lbxValue.MaxHeight; //TODO: Uptake Avalonia fix for improperly updating Grid control dimensions
 
             //add lambda expression for editing a single element
             vm.OnEditItem += (int index, object element, bool advancedEdit, CollectionBoxViewModel.EditElementOp op) =>
             {
+                EditorPageViewModel pageViewModel = control.FindAncestorViewModel<EditorPageViewModel>();
                 string elementName = name + "[" + index + "]";
-                DataEditForm frmData = new DataEditForm();
-                frmData.Title = DataEditor.GetWindowTitle(parent, elementName, element, elementType, ReflectionExt.GetPassableAttributes(1, attributes));
+                string title = DataEditor.GetWindowTitle(parent, elementName, element, elementType,
+                    ReflectionExt.GetPassableAttributes(1, attributes));
 
-                //TODO: make this a member and reference it that way
-                DataEditor.LoadClassControls(frmData.ControlPanel, parent, null, elementName, elementType, ReflectionExt.GetPassableAttributes(1, attributes), element, true, new Type[0], advancedEdit);
-                DataEditor.TrackTypeSize(frmData, elementType);
+                NodeBase node =
+                    _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(title,
+                        pageViewModel.Node.Icon);
+                pageViewModel.Node.SubNodes.Add(node);
 
-                frmData.SelectedOKEvent += async () =>
+                NodeHelper.ExpandParents(node, true);
+                ReflectedDataPageViewModel
+                    newEditor = _context.PageFactory.CreatePage<ReflectedDataPageViewModel>(node);
+                newEditor.SetPageTitle(title, pageViewModel.Node.Icon);
+
+                newEditor.OnLoadAction = (StackPanel stack) =>
                 {
-                    object newElement = DataEditor.SaveClassControls(frmData.ControlPanel, elementName, elementType, ReflectionExt.GetPassableAttributes(1, attributes), true, new Type[0], advancedEdit);
+                    DataEditor.LoadClassControls(stack, parent, null, elementName, elementType,
+                        ReflectionExt.GetPassableAttributes(1, attributes), element, true, new Type[0],
+                        advancedEdit);
+                };
 
-                    bool itemExists = false;
+                newEditor.OnOKAction = async (StackPanel stack) =>
+                {
+                    object newElement = DataEditor.SaveClassControls(stack, elementName, elementType,
+                        ReflectionExt.GetPassableAttributes(1, attributes), true, new Type[0], advancedEdit);
 
+                    bool itemExists = false;
                     List<object> states = (List<object>)vm.GetList(typeof(List<object>));
                     for (int ii = 0; ii < states.Count; ii++)
                     {
-                        //ignore the current index being edited
-                        //if the element is null, then we are editing a new object, so skip
                         if (ii != index || element == null)
                         {
                             if (states[ii].Equals(newElement))
@@ -74,7 +97,8 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
 
                     if (itemExists)
                     {
-                        await MessageBox.Show(control.GetOwningForm(), "Cannot add duplicate items.", "Entry already exists.", MessageBox.MessageBoxButtons.Ok);
+                        await MessageBoxWindowView.Show(_context.DialogService, "Cannot add duplicate items.",
+                            "Entry already exists.", MessageBoxWindowView.MessageBoxButtons.Ok);
                         return false;
                     }
                     else
@@ -84,8 +108,7 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
                     }
                 };
 
-                control.GetOwningForm().RegisterChild(frmData);
-                frmData.Show();
+                _context.TabEvents.AddChildPage(pageViewModel, newEditor);
             };
 
             List<object> states = new List<object>();
@@ -96,7 +119,8 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
         }
 
 
-        public override IList SaveWindowControls(StackPanel control, string name, Type type, object[] attributes, Type[] subGroupStack)
+        public override IList SaveWindowControls(StackPanel control, string name, Type type, object[] attributes,
+            Type[] subGroupStack)
         {
             int controlIndex = 0;
 
@@ -105,4 +129,4 @@ public override IList SaveWindowControls(StackPanel control, string name, Type t
             return mv.GetList(type);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/ObjectEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/ObjectEditor.cs
index b7dc3675..7dfacbf6 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/ObjectEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/ObjectEditor.cs
@@ -15,5 +15,7 @@
 namespace RogueEssence.Dev
 {
     public class ObjectEditor : Editor<Object>
-    { }
+    {
+        public ObjectEditor(EditorContext context) : base(context) { }
+    }
 }
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/TypeEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/TypeEditor.cs
index 941a91dc..47c145ee 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/TypeEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/TypeEditor.cs
@@ -16,6 +16,7 @@ namespace RogueEssence.Dev
 {
     public class TypeEditor : Editor<Type>
     {
+        public TypeEditor(EditorContext context) : base(context) { }
         public override bool DefaultSubgroup => true;
         public override bool DefaultDecoration => false;
         public override bool DefaultLabel => false;
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/PriorityListBox.axaml b/RogueEssence.Editor.Avalonia/DataEditor/PriorityListBox.axaml
index 28f3d818..e9b8a390 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/PriorityListBox.axaml
+++ b/RogueEssence.Editor.Avalonia/DataEditor/PriorityListBox.axaml
@@ -1,9 +1,12 @@
 <UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:v="clr-namespace:RogueEssence.Dev.Views"
              xmlns:vm="clr-namespace:RogueEssence.Dev.ViewModels;assembly=RogueEssence.Editor.Avalonia"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              mc:Ignorable="d"
+             HorizontalAlignment="Stretch"
+             VerticalAlignment="Stretch"
              xmlns:converters="clr-namespace:RogueEssence.Dev.Converters"
              x:Class="RogueEssence.Dev.Views.PriorityListBox">
   <UserControl.Resources>
@@ -11,30 +14,49 @@
   <Design.DataContext>
     <vm:PriorityListBoxViewModel/>
   </Design.DataContext>
-  <Grid>
-    <Grid.RowDefinitions>
-      <RowDefinition/>
-      <RowDefinition Height="40"/>
-      <RowDefinition/>
-      <RowDefinition Height="40"/>
-    </Grid.RowDefinitions>
-    <Grid.ColumnDefinitions>
-      <ColumnDefinition/>
-      <ColumnDefinition/>
-      <ColumnDefinition Width="30"/>
-    </Grid.ColumnDefinitions>
-    <DataGrid Name="gridItems" IsReadOnly="true" ItemsSource="{Binding Collection}" SelectedIndex="{Binding SelectedIndex, Mode=TwoWay}" DoubleTapped="doubleClickStart" PointerReleased="lbxCollection_DoubleClick" Margin="4" Grid.RowSpan="3" Grid.ColumnSpan="2" MinHeight="50">
+  <Grid RowDefinitions="*, 40, *" ColumnDefinitions="*, *, 30">
+    <DataGrid 
+      Name="gridItems" 
+      IsReadOnly="true" 
+      HorizontalAlignment="Stretch"
+      ItemsSource="{Binding Collection}" 
+      SelectedIndex="{Binding SelectedIndex, Mode=TwoWay}"
+      DoubleTapped="doubleClickStart" 
+      PointerReleased="lbxCollection_DoubleClick" 
+      Margin="4" Grid.RowSpan="3" 
+      Grid.ColumnSpan="2" 
+      MinHeight="50"
+      x:DataType="vm:PriorityElement"
+      Classes="default"
+    >
       <DataGrid.Columns>
         <DataGridTextColumn Header="Priority"
-                      Binding="{Binding PriorityObj}" />
+                            Binding="{Binding PriorityObj}"
+                            Width="80" />
         <DataGridTextColumn Header="Value"
-                            Binding="{Binding Path=DisplayValue}" />
+                            Binding="{Binding Path=DisplayValue}"
+                            Width="*" />
       </DataGrid.Columns>
     </DataGrid>
-    <Button x:Name="PriorityListBoxAddButton" PointerReleased="PriorityListBoxAddButton_OnPointerReleased" Margin="4" Grid.Row="3" Grid.Column="0">Add</Button>
-    <Button Command="{Binding btnDelete_Click}" Margin="4" Grid.Row="3" Grid.Column="1">Delete</Button>
-    <Button Command="{Binding btnUp_Click}" Margin="4" Grid.Row="0" Grid.Column="2">^</Button>
-    <Button x:Name="PriorityListBoxEditButton" PointerReleased="PriorityListBoxEditButton_OnPointerReleased" Margin="4" Grid.Row="1" Grid.Column="2">~</Button>
-    <Button Command="{Binding btnDown_Click}" Margin="4" Grid.Row="2" Grid.Column="2">v</Button>
+    
+    <StackPanel Grid.Row="0" Grid.RowSpan="3" Grid.Column="2" Margin="10, 0, 0, 0">
+      <Button x:Name="PriorityListBoxAddButton" PointerReleased="PriorityListBoxAddButton_OnPointerReleased" Classes="secondary" Margin="0, 0" Padding="4, 3">
+        <Path Width="10" Height="10" Margin="0, 2,0,0" Data="{StaticResource Icons.Plus}" />
+      </Button>
+      <Button Command="{Binding btnDelete_Click}" Classes="secondary" Margin="0, 0" Padding="4, 3">
+        <Path Width="10" Height="10" Margin="0,0,0,0" Data="{StaticResource Icons.Minus}" />
+      </Button>
+    </StackPanel>
+    <StackPanel Grid.Row="1" Grid.RowSpan="2" Grid.Column="2" Margin="10, 0, 0, 0">
+      <Button Command="{Binding btnUp_Click}" Classes="secondary" Margin="0, 0" Padding="4,3, 4, 3">
+        <Path Width="10" Height="10" Margin="0, 2,0,0" Data="{StaticResource Icons.CaretUpFill}" />
+      </Button>
+      <Button x:Name="PriorityListBoxEditButton" PointerReleased="PriorityListBoxEditButton_OnPointerReleased" Classes="secondary" Margin="0, 0" Padding="4,3, 4, 3">
+        <Path Width="10" Height="10" Margin="0,0,0,0" Data="{StaticResource Icons.SortDescendingFill}" />
+      </Button>
+      <Button Command="{Binding btnDown_Click}" Classes="secondary" Margin="0, 0" Padding="4,3, 4, 3">
+        <Path Width="10" Height="10" Margin="0,0,0,0" Data="{StaticResource Icons.CaretDownFill}" />
+      </Button>
+    </StackPanel>
   </Grid>
 </UserControl>
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/PriorityListBoxViewModel.cs b/RogueEssence.Editor.Avalonia/DataEditor/PriorityListBoxViewModel.cs
index e142e07b..4c54ca4c 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/PriorityListBoxViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/PriorityListBoxViewModel.cs
@@ -8,6 +8,7 @@
 using RogueElements;
 using System.Collections;
 using Avalonia.Input;
+using RogueEssence.Dev.Services;
 using RogueEssence.Dev.Views;
 
 namespace RogueEssence.Dev.ViewModels
@@ -69,15 +70,14 @@ public int SelectedIndex
         public PriorityOp OnEditPriority;
 
         public StringConv StringConv;
-
-        private Window parent;
+        
+        private IDialogService _dialogService;
 
         public bool ConfirmDelete;
 
-        public PriorityListBoxViewModel(Window parent, StringConv conv)
+        public PriorityListBoxViewModel(IDialogService dialogService, StringConv conv)
         {
             StringConv = conv;
-            this.parent = parent;
             Collection = new ObservableCollection<PriorityElement>();
         }
 
@@ -186,9 +186,8 @@ public async void btnDelete_Click()
             {
                 if (ConfirmDelete)
                 {
-                    MessageBox.MessageBoxResult result = await MessageBox.Show(parent, "Are you sure you want to delete this item:\n" + Collection[SelectedIndex].DisplayValue, "Confirm Delete",
-                    MessageBox.MessageBoxButtons.YesNo);
-                    if (result == MessageBox.MessageBoxResult.No)
+                    MessageBoxWindowView.MessageBoxResult result = await MessageBoxWindowView.Show(_dialogService,"Are you sure you want to delete this item:\n" + Collection[SelectedIndex].DisplayValue, "Confirm Delete", MessageBoxWindowView.MessageBoxButtons.YesNo);
+                    if (result == MessageBoxWindowView.MessageBoxResult.No)
                         return;
                 }
 
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/RangeDictBoxViewModel.cs b/RogueEssence.Editor.Avalonia/DataEditor/RangeDictBoxViewModel.cs
index 2b5b1f42..76ffc2fd 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/RangeDictBoxViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/RangeDictBoxViewModel.cs
@@ -10,6 +10,7 @@
 using RogueEssence.Dev.Views;
 using RogueEssence.LevelGen;
 using System.Linq;
+using RogueEssence.Dev.Services;
 
 namespace RogueEssence.Dev.ViewModels
 {
@@ -162,14 +163,13 @@ public int AddMax
 
         public StringConv StringConv;
 
-        private Window parent;
-
         public bool ConfirmDelete;
 
-        public RangeDictBoxViewModel(Window parent, StringConv conv)
+        private IDialogService _dialogService;
+        public RangeDictBoxViewModel(IDialogService dialogService, StringConv conv)
         {
+            _dialogService = dialogService;
             StringConv = conv;
-            this.parent = parent;
             Collection = new ObservableCollection<RangeDictElement>();
         }
 
@@ -313,9 +313,9 @@ public async void btnDelete_Click()
             {
                 if (ConfirmDelete)
                 {
-                    MessageBox.MessageBoxResult result = await MessageBox.Show(parent, "Are you sure you want to delete this item:\n" + Collection[currentElement].DisplayValue, "Confirm Delete",
-                    MessageBox.MessageBoxButtons.YesNo);
-                    if (result == MessageBox.MessageBoxResult.No)
+                    MessageBoxWindowView.MessageBoxResult result = await MessageBoxWindowView.Show(_dialogService, "Are you sure you want to delete this item:\n" + Collection[currentElement].DisplayValue, "Confirm Delete",
+                        MessageBoxWindowView.MessageBoxButtons.YesNo);
+                    if (result == MessageBoxWindowView.MessageBoxResult.No)
                         return;
                 }
 
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/RankedCollectionBox.axaml b/RogueEssence.Editor.Avalonia/DataEditor/RankedCollectionBox.axaml
index 631879a7..a51b261e 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/RankedCollectionBox.axaml
+++ b/RogueEssence.Editor.Avalonia/DataEditor/RankedCollectionBox.axaml
@@ -4,35 +4,54 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              mc:Ignorable="d"
+             HorizontalAlignment="Stretch"
+             VerticalAlignment="Stretch"
              xmlns:converters="clr-namespace:RogueEssence.Dev.Converters"
              x:Class="RogueEssence.Dev.Views.RankedCollectionBox">
   <Design.DataContext>
     <vm:CollectionBoxViewModel/>
   </Design.DataContext>
-  <UserControl.Resources>
-  </UserControl.Resources>
-  <Grid>
-    <Grid.RowDefinitions>
-      <RowDefinition/>
-      <RowDefinition/>
-      <RowDefinition Height="40"/>
-    </Grid.RowDefinitions>
-    <Grid.ColumnDefinitions>
-      <ColumnDefinition/>
-      <ColumnDefinition/>
-      <ColumnDefinition Width="30"/>
-    </Grid.ColumnDefinitions>
-    <DataGrid Name="gridItems" IsReadOnly="true" ItemsSource="{Binding Collection}" SelectedIndex="{Binding SelectedIndex, Mode=TwoWay}" DoubleTapped="doubleClickStart" PointerReleased="lbxCollection_DoubleClick" Margin="4" Grid.RowSpan="2" Grid.ColumnSpan="2" MinHeight="60">
+  <Grid RowDefinitions="*, *, 40" ColumnDefinitions="*, *, 30">
+    <DataGrid 
+      Name="gridItems" 
+      IsReadOnly="true"
+      HorizontalAlignment="Stretch"
+      ItemsSource="{Binding Collection}" 
+      CanUserSortColumns="False"
+      
+      SelectedIndex="{Binding SelectedIndex, Mode=TwoWay}"
+      DoubleTapped="doubleClickStart" 
+      PointerReleased="lbxCollection_DoubleClick" 
+      Margin="4" Grid.RowSpan="2" 
+      Grid.ColumnSpan="2" 
+      MinHeight="60"
+      Classes="default">
       <DataGrid.Columns>
         <DataGridTextColumn Header="#"
-                      Binding="{Binding DisplayKey}" />
+                      Binding="{Binding DisplayKey}"
+                      Width="80"/>
         <DataGridTextColumn Header="Value"
-                            Binding="{Binding Path=DisplayValue}" />
+                            Binding="{Binding Path=DisplayValue}"
+                            Width="*"/>
       </DataGrid.Columns>
     </DataGrid>
-    <Button x:Name="RankedCollectionBoxAddButton" PointerReleased="RankedCollectionBoxAddButton_OnPointerReleased" Margin="4" Grid.Row="2" Grid.Column="0">Add</Button>
-    <Button Command="{Binding btnDelete_Click}" Margin="4" Grid.Row="2" Grid.Column="1">Delete</Button>
-    <Button Command="{Binding btnUp_Click}" Margin="4" Grid.Row="0" Grid.Column="2">^</Button>
-    <Button Command="{Binding btnDown_Click}" Margin="4" Grid.Row="1" Grid.Column="2">v</Button>
+
+    <StackPanel Grid.Row="0" Grid.RowSpan="2" Grid.Column="2" Margin="10,0,0,0">
+      <Button x:Name="RankedCollectionBoxAddButton" PointerReleased="RankedCollectionBoxAddButton_OnPointerReleased" Classes="secondary" Margin="0,0" Padding="4,3">
+        <Path Width="10" Height="10" Margin="0,2,0,0" Data="{StaticResource Icons.Plus}" />
+      </Button>
+      <Button Command="{Binding DeleteItemAsync}" Classes="secondary" Margin="0,0" Padding="4,3">
+        <Path Width="10" Height="10" Data="{StaticResource Icons.CactusFill}" />
+      </Button>
+    </StackPanel>
+
+    <StackPanel Grid.Row="1" Grid.RowSpan="1" Grid.Column="2" Margin="10,0,0,0">
+      <Button Command="{Binding MoveUp}" IsEnabled="{Binding CanMoveUp}" Classes="secondary" Margin="0,0" Padding="4,3">
+        <Path Width="10" Height="10" Margin="0,2,0,0" Data="{StaticResource Icons.CaretUpFill}" />
+      </Button>
+      <Button Command="{Binding MoveDown}" Classes="secondary" Margin="0,0" Padding="4,3">
+        <Path Width="10" Height="10" Data="{StaticResource Icons.CaretDownFill}" />
+      </Button>
+    </StackPanel>
   </Grid>
-</UserControl>
+</UserControl>
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/SpawnListBoxViewModel.cs b/RogueEssence.Editor.Avalonia/DataEditor/SpawnListBoxViewModel.cs
index 55f2061a..bf750623 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/SpawnListBoxViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/SpawnListBoxViewModel.cs
@@ -7,6 +7,7 @@
 using Avalonia.Controls;
 using Avalonia.Input;
 using RogueElements;
+using RogueEssence.Dev.Services;
 using RogueEssence.Dev.Views;
 
 namespace RogueEssence.Dev.ViewModels
@@ -55,14 +56,14 @@ public class SpawnListBoxViewModel : ViewModelBase
 
         public StringConv StringConv;
 
-        private Window parent;
-
         public bool ConfirmDelete;
+        
+        private IDialogService _dialogService;
 
-        public SpawnListBoxViewModel(Window parent, StringConv conv)
+        public SpawnListBoxViewModel(IDialogService dialogService, StringConv conv)
         {
+            _dialogService = dialogService;
             StringConv = conv;
-            this.parent = parent;
             Collection = new ObservableCollection<SpawnListElement>();
         }
 
@@ -208,9 +209,9 @@ private async void btnDelete_Click()
             {
                 if (ConfirmDelete)
                 {
-                    MessageBox.MessageBoxResult result = await MessageBox.Show(parent, "Are you sure you want to delete this item:\n" + Collection[currentElement].DisplayValue, "Confirm Delete",
-                    MessageBox.MessageBoxButtons.YesNo);
-                    if (result == MessageBox.MessageBoxResult.No)
+                    MessageBoxWindowView.MessageBoxResult result = await MessageBoxWindowView.Show(_dialogService,"Are you sure you want to delete this item:\n" + Collection[currentElement].DisplayValue, "Confirm Delete",
+                    MessageBoxWindowView.MessageBoxButtons.YesNo);
+                    if (result == MessageBoxWindowView.MessageBoxResult.No)
                         return;
                 }
 
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/SpawnRangeListBoxViewModel.cs b/RogueEssence.Editor.Avalonia/DataEditor/SpawnRangeListBoxViewModel.cs
index 3ef3c9d4..e9d68b6f 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/SpawnRangeListBoxViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/SpawnRangeListBoxViewModel.cs
@@ -7,6 +7,7 @@
 using Avalonia.Controls;
 using Avalonia.Input;
 using RogueElements;
+using RogueEssence.Dev.Services;
 using RogueEssence.Dev.Views;
 
 namespace RogueEssence.Dev.ViewModels
@@ -86,9 +87,7 @@ public class SpawnRangeListBoxViewModel : ViewModelBase
         public delegate void ElementOp(int index, object element, bool advancedEdit, EditElementOp op);
 
         public StringConv StringConv;
-
-        private Window parent;
-
+        
         public event ElementOp OnEditItem;
 
         public bool Index1;
@@ -111,10 +110,11 @@ public int AddMax
 
         public bool ConfirmDelete;
 
-        public SpawnRangeListBoxViewModel(Window parent, StringConv conv)
+        private IDialogService _dialogService;
+        public SpawnRangeListBoxViewModel(IDialogService dialogService, StringConv conv)
         {
+            _dialogService = dialogService;
             StringConv = conv;
-            this.parent = parent;
             Collection = new ObservableCollection<SpawnRangeListElement>();
         }
 
@@ -128,6 +128,7 @@ public int CurrentElement
             {
                 this.SetIfChanged(ref currentElement, value);
                 if (currentElement > -1)
+                if (currentElement > -1)
                 {
                     CurrentWeight = Collection[currentElement].Weight;
                     settingRange = true;
@@ -262,9 +263,9 @@ private async void btnDelete_Click()
             {
                 if (ConfirmDelete)
                 {
-                    MessageBox.MessageBoxResult result = await MessageBox.Show(parent, "Are you sure you want to delete this item:\n" + Collection[currentElement].DisplayValue, "Confirm Delete",
-                        MessageBox.MessageBoxButtons.YesNo);
-                    if (result == MessageBox.MessageBoxResult.No)
+                    MessageBoxWindowView.MessageBoxResult result = await MessageBoxWindowView.Show(_dialogService,"Are you sure you want to delete this item:\n" + Collection[currentElement].DisplayValue, "Confirm Delete",
+                        MessageBoxWindowView.MessageBoxButtons.YesNo);
+                    if (result == MessageBoxWindowView.MessageBoxResult.No)
                         return;
                 }
 
diff --git a/RogueEssence.Editor.Avalonia/EditorContext/EditorContext.cs b/RogueEssence.Editor.Avalonia/EditorContext/EditorContext.cs
new file mode 100644
index 00000000..2e406900
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/EditorContext/EditorContext.cs
@@ -0,0 +1,61 @@
+using System;
+using Avalonia.Controls;
+using RogueEssence.Dev.Services;
+using RogueEssence.Dev.ViewModels;
+
+namespace RogueEssence.Dev;
+
+public static class EditorContextExtensions
+{
+    public static void OpenElementEditor(
+        this EditorContext context,
+        EditorPageViewModel pageViewModel,
+        int index,
+        string title,
+        string elementName,
+        Type elementType,
+        object[] attributes,
+        object element,
+        bool advancedEdit,
+        CollectionBoxViewModel.EditElementOp op)
+    {
+        NodeBase node = context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(title, pageViewModel.Node.Icon);
+        pageViewModel.Node.SubNodes.Add(node);
+        
+        ReflectedDataPageViewModel new_editor = context.PageFactory.CreatePage<ReflectedDataPageViewModel>(node);
+        if (new_editor == null) return;
+        
+        new_editor.SetPageTitle(title, pageViewModel.Node.Icon);
+        
+        new_editor.OnLoadAction = (StackPanel stack) =>
+        {
+            DataEditor.LoadClassControls(stack, elementName, null, elementName, elementType, ReflectionExt.GetPassableAttributes(1, attributes), element, true, new Type[0], advancedEdit);
+        };
+
+        new_editor.OnOKAction = async (StackPanel stack) =>
+        {
+            element = DataEditor.SaveClassControls(stack, elementName, elementType, ReflectionExt.GetPassableAttributes(1, attributes), true, new Type[0], advancedEdit);
+            op(index, element);
+            return true;
+        };
+        
+        context.TabEvents.AddChildPage(pageViewModel, new_editor);
+    }
+}
+public class EditorContext
+{
+    public NodeFactory NodeFactory { get; }
+    public PageFactory PageFactory { get; }
+    public TabEvents TabEvents { get; }
+    public IDialogService DialogService { get; }
+
+    public EditorContext(NodeFactory nodeFactory, PageFactory pageFactory, TabEvents tabEvents, IDialogService dialogService)
+    {
+        NodeFactory = nodeFactory;
+        PageFactory = pageFactory;
+        TabEvents = tabEvents;
+        DialogService = dialogService;
+    }
+    
+    
+}
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/NodeFactory.cs b/RogueEssence.Editor.Avalonia/EditorContext/NodeFactory.cs
similarity index 92%
rename from RogueEssence.Editor.Avalonia/NodeFactory.cs
rename to RogueEssence.Editor.Avalonia/EditorContext/NodeFactory.cs
index 210c1405..1adccb07 100644
--- a/RogueEssence.Editor.Avalonia/NodeFactory.cs
+++ b/RogueEssence.Editor.Avalonia/EditorContext/NodeFactory.cs
@@ -28,6 +28,11 @@ public OpenEditorNode CreateOpenEditorNode<TEditor>(string title, string? icon =
             where TEditor : EditorPageViewModel
             => Create<OpenEditorNode>(title, typeof(TEditor), icon);
         
+        public ReflectedDataNode CreateReflectedDataNode<TEditor>(string title, string? icon = null)
+            where TEditor : EditorPageViewModel
+            => Create<ReflectedDataNode>(title, typeof(TEditor), icon);
+
+        
         public OpenEditorNodeWithParams CreateOpenEditorNodeWithParams<TEditor>(
             string title,
             object[] extraParams,
diff --git a/RogueEssence.Editor.Avalonia/PageFactory.cs b/RogueEssence.Editor.Avalonia/EditorContext/PageFactory.cs
similarity index 67%
rename from RogueEssence.Editor.Avalonia/PageFactory.cs
rename to RogueEssence.Editor.Avalonia/EditorContext/PageFactory.cs
index 512e79fb..fea005da 100644
--- a/RogueEssence.Editor.Avalonia/PageFactory.cs
+++ b/RogueEssence.Editor.Avalonia/EditorContext/PageFactory.cs
@@ -1,7 +1,10 @@
 
 using System;
 using System.Collections.Generic;
+using System.Threading.Tasks;
+using Avalonia.Controls;
 using Microsoft.Extensions.DependencyInjection;
+using RogueEssence.Data;
 using RogueEssence.Dev.ViewModels;
 
 namespace RogueEssence.Dev
@@ -64,7 +67,7 @@ public void Register<TPage>() where TPage : EditorPageViewModel
             return (TPage)_provider.GetRequiredService(type);
         }
         
-        public EditorPageViewModel? CreatePage(Type pageType, NodeBase? node = null)
+        public EditorPageViewModel? CreatePage(Type pageType, NodeBase? node = null, Func<Task>? onOpen = null)
         {
             
             // Make sure it's a page
@@ -75,18 +78,60 @@ public void Register<TPage>() where TPage : EditorPageViewModel
                     nameof(pageType));
             }
             
-            
             if (!_registeredTypes.Contains(pageType))
             {
                 return null;
             }
+            
+            EditorPageViewModel page;
 
+       
             if (node != null)
             {
-                return (EditorPageViewModel)ActivatorUtilities.CreateInstance(_provider, pageType, node);
+                page = (EditorPageViewModel)ActivatorUtilities.CreateInstance(_provider, pageType, node);
             }
-    
-            return (EditorPageViewModel)_provider.GetRequiredService(pageType);
+            else
+            {
+                page = (EditorPageViewModel)_provider.GetRequiredService(pageType);
+            }
+            
+            if (node is DataItemNode && page is ReflectedDataPageViewModel pg)
+            {
+                var dataRoot = pg.Node.FindNode<DataRootNode>();
+                var dataItem = pg.Node.FindNode<DataItemNode>();
+
+                DataManager.DataType dataType = dataRoot.DataType;
+                string key = dataItem.ItemKey;
+
+                var regis = DataRegistry.Map[dataType];
+                IEntryData data = regis.GetEntry(key);
+
+                string title = DataEditor.GetWindowTitle(String.Format("{0} #{1}", dataType.ToString(), key),
+                    data.Name.ToLocal(), data, data.GetType());
+
+                pg.SetPageTitle(title, pg.Node.Icon);
+
+                pg.OnLoadAction = (StackPanel stack) =>
+                {
+                    DataEditor.LoadDataControls(key, data, stack);
+                };
+
+                pg.OnOKAction = async (StackPanel stack) =>
+                {
+                    Console.WriteLine("OK ACTION");
+                    lock (GameBase.lockObj)
+                    {
+                        object obj = data;
+                        DataEditor.SaveDataControls(ref obj, stack, new Type[0]);
+                        DataManager.Instance.ContentChanged(dataType, key, (IEntryData)obj);
+
+                        string newName = DataManager.Instance.DataIndices[dataType].Get(key).GetLocalString(true);
+                        pg.SetPageTitle(DataEditor.GetWindowTitle(String.Format("{0} #{1}", dataType.ToString(), key), newName, obj, obj.GetType()), pg.Node.Icon);
+                    }
+                    return true;
+                };
+            }
+            return page;
         }
 
         
diff --git a/RogueEssence.Editor.Avalonia/TabEvents.cs b/RogueEssence.Editor.Avalonia/EditorContext/TabEvents.cs
similarity index 84%
rename from RogueEssence.Editor.Avalonia/TabEvents.cs
rename to RogueEssence.Editor.Avalonia/EditorContext/TabEvents.cs
index 07eebacf..70264714 100644
--- a/RogueEssence.Editor.Avalonia/TabEvents.cs
+++ b/RogueEssence.Editor.Avalonia/EditorContext/TabEvents.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Threading.Tasks;
 using RogueEssence.Data;
 using RogueEssence.Dev.ViewModels;
 
@@ -15,6 +16,17 @@ public class TabEvents
         
         // Used for closing tabs when a data entry is deleted
         public event Action<string, DataManager.DataType>? CloseTabsForEntry;
+        
+        
+        public event Func<EditorPageViewModel, Task>? SaveChildrenEvent;
+
+        public async Task SaveChildren(EditorPageViewModel page)
+        {
+            if (SaveChildrenEvent != null)
+                await SaveChildrenEvent.Invoke(page);
+        }
+        
+        // TODO: Probably remove this...
 
         public void RequestCloseTabsForEntry(string key, DataManager.DataType dataType)
         {
diff --git a/RogueEssence.Editor.Avalonia/ReactiveExt.cs b/RogueEssence.Editor.Avalonia/ReactiveExt.cs
index 0c9a3bb7..f65d85d7 100644
--- a/RogueEssence.Editor.Avalonia/ReactiveExt.cs
+++ b/RogueEssence.Editor.Avalonia/ReactiveExt.cs
@@ -48,5 +48,18 @@ public static ParentForm GetOwningForm(this Control control)
                 control = (Control) control.Parent;
             return (ParentForm)control;
         }
+        
+        
+        public static T FindAncestorViewModel<T>(this Control control) where T : class
+        {
+            Control current = control.Parent as Control;
+            while (current != null)
+            {
+                if (current.DataContext is T match)
+                    return match;
+                current = current.Parent as Control;
+            }
+            return null;
+        }
     }
 }
diff --git a/RogueEssence.Editor.Avalonia/RogueEssence.Editor.Avalonia.csproj b/RogueEssence.Editor.Avalonia/RogueEssence.Editor.Avalonia.csproj
index caa45c6f..3fb6e8a6 100644
--- a/RogueEssence.Editor.Avalonia/RogueEssence.Editor.Avalonia.csproj
+++ b/RogueEssence.Editor.Avalonia/RogueEssence.Editor.Avalonia.csproj
@@ -207,6 +207,10 @@
       <DependentUpon>DataListPageView.axaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
+    <Compile Update="Views\New\DialogBoxes\AnimChoiceWindowView.axaml.cs">
+      <DependentUpon>AnimChoiceWindowView.axaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Models\" />
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevTabModsViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevTabModsViewModel.cs
index 387f8365..092deecb 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevTabModsViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevTabModsViewModel.cs
@@ -48,9 +48,11 @@ public ModsNodeViewModel(string name, string newNamespace, string fullPath)
 
     public class DevTabModsViewModel : ViewModelBase
     {
-        public DevTabModsViewModel()
+        private EditorContext _context;
+        public DevTabModsViewModel(EditorContext context)
         {
             currentMod = null;
+            _context = context;
 
             Mods = new ObservableCollection<ModsNodeViewModel>();
             reloadMods();
@@ -109,7 +111,7 @@ public async void btnAdd_Click()
         {
             ModConfigWindowView window = new ModConfigWindowView();
             ModHeader header = new ModHeader("", "", "", "", "", Guid.NewGuid(), new Version(), new Version(), PathMod.ModType.Mod, new RelatedMod[0] { });
-            ModConfigViewModel2 vm = new ModConfigViewModel2(header);
+            ModConfigViewModel2 vm = new ModConfigViewModel2(_context.DialogService, header);
             window.DataContext = vm;
 
             DevForm form = (DevForm)DiagManager.Instance.DevEditor;
@@ -190,7 +192,7 @@ public async void btnEdit_Click()
         {
             ModConfigWindowView window = new ModConfigWindowView();
             ModHeader header = PathMod.Quest;
-            ModConfigViewModel2 vm = new ModConfigViewModel2(header);
+            ModConfigViewModel2 vm = new ModConfigViewModel2(_context.DialogService, header);
             window.DataContext = vm;
 
             DevForm form = (DevForm)DiagManager.Instance.DevEditor;
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/DialogBoxes/ModConfigViewModel2.cs b/RogueEssence.Editor.Avalonia/ViewModels/DialogBoxes/ModConfigViewModel2.cs
index 64e0cd6b..c273c8ec 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/DialogBoxes/ModConfigViewModel2.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/DialogBoxes/ModConfigViewModel2.cs
@@ -7,13 +7,14 @@
 using RogueEssence.Data;
 using ReactiveUI;
 using System.Collections.ObjectModel;
+using RogueEssence.Dev.Services;
 using RogueEssence.Dev.Views;
 
 namespace RogueEssence.Dev.ViewModels
 {
     public class ModConfigViewModel2 : ViewModelBase
     {
-        public ModConfigViewModel2(ModHeader header)
+        public ModConfigViewModel2(IDialogService dialogService, ModHeader header)
         {
             Name = header.Name;
             Namespace = header.Namespace;
@@ -29,7 +30,7 @@ public ModConfigViewModel2(ModHeader header)
             ChosenModType = (int)header.ModType;
 
             DevForm form = (DevForm)DiagManager.Instance.DevEditor;
-            Relationships = new CollectionBoxViewModel(form, new StringConv(typeof(RelatedMod), new object[0]));
+            Relationships = new CollectionBoxViewModel(dialogService, new StringConv(typeof(RelatedMod), new object[0]));
             Relationships.OnEditItem += Relationships_EditItem;
             Relationships.LoadFromList(header.Relationships);
         }
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/MapEditForm/MapEditViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/MapEditForm/MapEditViewModel.cs
index 1106c2cd..4ec1aff6 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/MapEditForm/MapEditViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/MapEditForm/MapEditViewModel.cs
@@ -26,18 +26,28 @@ namespace RogueEssence.Dev.ViewModels
 {
     public class MapEditViewModel : ViewModelBase
     {
-        public MapEditViewModel()
+        public MapEditViewModel(
+            MapTabTexturesViewModel textures,
+            MapTabDecorationsViewModel decorations,
+            MapTabTerrainViewModel terrain,
+            MapTabTilesViewModel tiles,
+            MapTabItemsViewModel items,
+            MapTabEntitiesViewModel entities,
+            MapTabEntrancesViewModel entrances,
+            MapTabSpawnsViewModel spawns,
+            MapTabEffectsViewModel effects,
+            MapTabPropertiesViewModel properties)
         {
-            Textures = new MapTabTexturesViewModel();
-            Decorations = new MapTabDecorationsViewModel();
-            Terrain = new MapTabTerrainViewModel();
-            Tiles = new MapTabTilesViewModel();
-            Items = new MapTabItemsViewModel();
-            Entities = new MapTabEntitiesViewModel();
-            Entrances = new MapTabEntrancesViewModel();
-            Spawns = new MapTabSpawnsViewModel();
-            Effects = new MapTabEffectsViewModel();
-            Properties = new MapTabPropertiesViewModel();
+            Textures = textures;
+            Decorations = decorations;
+            Terrain = terrain;
+            Tiles = tiles;
+            Items = items;
+            Entities = entities;
+            Entrances = entrances;
+            Spawns = spawns;
+            Effects = effects;
+            Properties = properties;
             CurrentFile = "";
         }
 
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/MapEditForm/MapTabEffectsViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/MapEditForm/MapTabEffectsViewModel.cs
index e03169f4..6e681a77 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/MapEditForm/MapTabEffectsViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/MapEditForm/MapTabEffectsViewModel.cs
@@ -14,10 +14,10 @@ namespace RogueEssence.Dev.ViewModels
 {
     public class MapTabEffectsViewModel : ViewModelBase
     {
-        public MapTabEffectsViewModel()
+        public MapTabEffectsViewModel(EditorContext context)
         {
             DevForm form = (DevForm)DiagManager.Instance.DevEditor;
-            Statuses = new CollectionBoxViewModel(form.MapEditForm, new StringConv(typeof(MapStatus), new object[0]));
+            Statuses = new CollectionBoxViewModel(context.DialogService, new StringConv(typeof(MapStatus), new object[0]));
             Statuses.OnMemberChanged += Statuses_Changed;
             Statuses.OnEditItem += Statuses_EditItem;
 
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/MapEditForm/MapTabEntitiesViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/MapEditForm/MapTabEntitiesViewModel.cs
index 82548678..d2e683f3 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/MapEditForm/MapTabEntitiesViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/MapEditForm/MapTabEntitiesViewModel.cs
@@ -16,7 +16,7 @@ public class MapTabEntitiesViewModel : ViewModelBase
     {
         public delegate void EntityOp(Character ent);
 
-        public MapTabEntitiesViewModel()
+        public MapTabEntitiesViewModel(EditorContext context)
         {
             //Teams = new TeamBoxViewModel(DiagManager.Instance.DevEditor.MapEditor.Edits);
 
@@ -101,10 +101,10 @@ public MapTabEntitiesViewModel()
             speciesChanged();
 
             DevForm form = (DevForm)DiagManager.Instance.DevEditor;
-            ActionEvents = new CollectionBoxViewModel(form.MapEditForm, new StringConv(typeof(BattleEvent), new object[0]));
+            ActionEvents = new CollectionBoxViewModel(context.DialogService, new StringConv(typeof(BattleEvent), new object[0]));
             ActionEvents.OnMemberChanged += ActionEvents_Changed;
             ActionEvents.OnEditItem += ActionEvents_EditItem;
-            Statuses = new CollectionBoxViewModel(form.MapEditForm, new StringConv(typeof(StatusEffect), new object[0]));
+            Statuses = new CollectionBoxViewModel(context.DialogService, new StringConv(typeof(StatusEffect), new object[0]));
             Statuses.OnMemberChanged += Statuses_Changed;
             Statuses.OnEditItem += Statuses_EditItem;
         }
@@ -595,6 +595,7 @@ public void Statuses_EditItem(int index, object element, bool advancedEdit, Coll
             DataEditForm frmData = new DataEditRootForm();
             frmData.Title = DataEditor.GetWindowTitle(SelectedEntity.Name, elementName, element, typeof(StatusEffect), new object[0]);
 
+            
             DataEditor.LoadClassControls(frmData.ControlPanel, ZoneManager.Instance.CurrentMap.AssetName, null, elementName, typeof(StatusEffect), new object[0], element, true, new Type[0], advancedEdit);
             DataEditor.TrackTypeSize(frmData, typeof(StatusEffect));
 
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/MapEditForm/MapTabPropertiesViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/MapEditForm/MapTabPropertiesViewModel.cs
index 72b9e115..d3c66c3d 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/MapEditForm/MapTabPropertiesViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/MapEditForm/MapTabPropertiesViewModel.cs
@@ -10,12 +10,13 @@
 using System.Collections.ObjectModel;
 using System.IO;
 using System.Text;
+using RogueEssence.Dev.Services;
 
 namespace RogueEssence.Dev.ViewModels
 {
     public class MapTabPropertiesViewModel : ViewModelBase
     {
-        public MapTabPropertiesViewModel()
+        public MapTabPropertiesViewModel(IDialogService dialogService)
         {
             Sights = new ObservableCollection<string>();
             for (int ii = 0; ii <= (int)Map.SightRange.Blind; ii++)
@@ -43,7 +44,7 @@ public MapTabPropertiesViewModel()
             BlankBG.OnEditItem += AutoTile_Edit;
 
             DevForm form = (DevForm)DiagManager.Instance.DevEditor;
-            TextureMap = new DictionaryBoxViewModel(form.MapEditForm, new StringConv(typeof(AutoTile), new object[0]));
+            TextureMap = new DictionaryBoxViewModel(dialogService, new StringConv(typeof(AutoTile), new object[0]));
             TextureMap.OnMemberChanged += TextureMap_Changed;
             TextureMap.OnEditKey += TextureMap_EditKey;
             TextureMap.OnEditItem += TextureMap_EditItem;
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/MapEditForm/MapTabTilesViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/MapEditForm/MapTabTilesViewModel.cs
index a49c7f72..1e507713 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/MapEditForm/MapTabTilesViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/MapEditForm/MapTabTilesViewModel.cs
@@ -14,7 +14,7 @@ namespace RogueEssence.Dev.ViewModels
     public class MapTabTilesViewModel : ViewModelBase
     {
 
-        public MapTabTilesViewModel()
+        public MapTabTilesViewModel(EditorContext context)
         {
             TileTypes = new ObservableCollection<string>();
             Dictionary<string, string> tile_names = DataManager.Instance.DataIndices[DataManager.DataType.Tile].GetLocalStringArray(true);
@@ -33,7 +33,7 @@ public MapTabTilesViewModel()
 
 
             DevForm form = (DevForm)DiagManager.Instance.DevEditor;
-            TileStates = new CollectionBoxViewModel(form.MapEditForm, new StringConv(typeof(TileState), new object[0]));
+            TileStates = new CollectionBoxViewModel(context.DialogService, new StringConv(typeof(TileState), new object[0]));
             TileStates.OnEditItem += TileStates_EditItem;
         }
 
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs
index 4425f152..f453aa82 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs
@@ -156,11 +156,8 @@ public void OnModSwitcherClosed()
             ModSwitcherClosed?.Invoke();
         }
     }
-
-    public ReactiveCommand<Unit, Unit> OpenPreferencesWindow { get; }
-
-    public ReactiveCommand<Unit, Unit> ClearFilterCommand { get; }
-
+    
+    
     private string _filter = "";
 
     public string Filter
@@ -356,6 +353,18 @@ public void RemoveTab(EditorPageViewModel page)
         }
     }
 
+    public async Task SaveChildren(EditorPageViewModel page)
+    {
+        if (!_pageToNodeMap.TryGetValue(page, out var pageNode))
+            return;
+
+        foreach (var child in pageNode.SubNodes.Cast<PageNode>().ToList())
+        {
+            await SaveChildren(child.Page);
+            if (child.Page.AttachedView is ISaveable saveable)
+                await saveable.Save();
+        }
+    }
     private void ClosePageAndChildren(PageNode node)
     {
         var children = node.SubNodes.Cast<PageNode>().ToList();
@@ -428,16 +437,7 @@ public DevFormViewModel(PageFactory pageFactory, NodeFactory nodeFactory, IDialo
         Pages = new ObservableCollection<EditorPageViewModel>();
         TopLevelPages = new ObservableCollection<PageNode>();
         _pageToNodeMap = new Dictionary<EditorPageViewModel, PageNode>();
-
-        // TODO: move this own view
-        ClearFilterCommand = ReactiveCommand.Create(() => { Filter = string.Empty; });
-
-        OpenPreferencesWindow = ReactiveCommand.CreateFromTask(async () =>
-        {
-            await _dialogService.ShowDialogAsync<PreferencesWindowViewModel, bool>(
-                PreferencesWindowViewModel.Instance, "Preferences");
-        });
-
+        
         this.WhenAnyValue(x => x.ActivePage)
             .Buffer(2, 1)
             .Subscribe(pair =>
@@ -465,6 +465,16 @@ await _dialogService.ShowDialogAsync<PreferencesWindowViewModel, bool>(
         };
     }
 
+    public void ClearFilter()
+    {
+        Filter = "";
+    }
+
+    public async void ShowPreferencesWindow()
+    {
+        await _dialogService.ShowDialogAsync<PreferencesWindowViewModel, bool>(
+            PreferencesWindowViewModel.Instance, "Preferences");
+    }
     public void LoadDevTree()
     {
         Filter = "";
@@ -475,7 +485,9 @@ public void LoadDevTree()
         Pages.Clear();
         _pageToNodeMap.Clear();
 
-        var tab = _pageFactory.CreatePage(typeof(DevControlViewModel));
+        
+        // TODO: Attach the DevControlNode to this tab rather than keeping it null... 
+        var tab = _pageFactory.CreatePage(typeof(DevControlViewModel), null);
         tab.Icon = "Icons.GameControllerFill";
         AddTopLevelPage(tab);
 
@@ -526,17 +538,16 @@ public void LoadDevTree()
 
     private void CreateConstantsNode(NodeBase parent)
     {
-        // var constantsNode = _nodeFactory.CreateOpenEditorNode("Constants", "Icons.ListFill", "");
-        //
-        // var startParamsNode = _nodeFactory.CreateOpenEditorNode("Start Params", "Icons.ListFill", "");
-        // var universalEventsNode = _nodeFactory.CreateOpenEditorNode("Universal Events", "Icons.ListFill", "");
+        var constantsNode = _nodeFactory.CreateOpenEditorNode<ZoneEditorPageViewModel>("Constants", "Icons.ListFill", "");
+        var startParamsNode = _nodeFactory.CreateOpenEditorNode<ReflectedDataPageViewModel>("Start Params", "Icons.ListFill", "");
+        var universalEventsNode = _nodeFactory.CreateOpenEditorNode<ReflectedDataPageViewModel>("Universal Events", "Icons.ListFill", "");
         //
         // var menuTextNode = _nodeFactory.CreateOpenEditorNode("Menu Text", "Icons.TableFill", "");
         // var gameplayTextNode = _nodeFactory.CreateOpenEditorNode("Gameplay Text", "Icons.TableFill", "");
         //
         //
-        // constantsNode.SubNodes.Add(startParamsNode);
-        // constantsNode.SubNodes.Add(universalEventsNode);
+        constantsNode.SubNodes.Add(startParamsNode);
+        constantsNode.SubNodes.Add(universalEventsNode);
         // constantsNode.SubNodes.Add(menuTextNode);
         // constantsNode.SubNodes.Add(gameplayTextNode);
         //
@@ -870,6 +881,8 @@ private void InitializeTabEvents()
             AddChildPage(parent, child);
             ActivePage = child;
         };
+        
+        _tabEvents.SaveChildrenEvent += SaveChildren;
 
         _tabEvents.AddTopLevelTabEvent += (tab) => { AddTopLevelPage(tab); };
 
@@ -956,6 +969,8 @@ public async Task<bool> TryCloseTabAsync(EditorPageViewModel page)
     {
         if (PageHasChildren(page))
         {
+            
+            // TODO: Add a can close method and check if any of the subtabs has any unsaved changes.
             var result = await MessageBoxWindowView.Show(_dialogService,
                 "Are you sure you want to close all subtabs?  Your changes will not be saved.", "Confirm Close",
                 MessageBoxWindowView.MessageBoxButtons.YesNo);
@@ -965,6 +980,7 @@ public async Task<bool> TryCloseTabAsync(EditorPageViewModel page)
         }
 
         RemoveTab(page);
+        page.OnPageRemoved();
         return true;
     }
 
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/DialogBoxes/AnimChoiceWindowViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/DialogBoxes/AnimChoiceWindowViewModel.cs
new file mode 100644
index 00000000..65b2b81c
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/DialogBoxes/AnimChoiceWindowViewModel.cs
@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using RogueEssence;
+using RogueEssence.Dungeon;
+using RogueEssence.Ground;
+using RogueEssence.Data;
+using ReactiveUI;
+using System.Collections.ObjectModel;
+using RogueEssence.Content;
+
+namespace RogueEssence.Dev.ViewModels
+{
+    public class AnimChoiceWindowViewModel : ViewModelBase
+    {
+        public AnimChoiceWindowViewModel(int[] anims)
+        {
+            Anims = new ObservableCollection<string>();
+            foreach (int anim in anims)
+                Anims.Add(GraphicsManager.Actions[anim].Name);
+        }
+
+        public ObservableCollection<string> Anims { get; }
+
+        private int chosenAnim;
+        public int ChosenAnim
+        {
+            get => chosenAnim;
+            set => this.SetIfChanged(ref chosenAnim, value);
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/DialogBoxes/MessageBoxWindowViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/DialogBoxes/MessageBoxWindowViewModel.cs
index 82b92b27..6c567a45 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/DialogBoxes/MessageBoxWindowViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/DialogBoxes/MessageBoxWindowViewModel.cs
@@ -6,7 +6,7 @@
 
 namespace RogueEssence.Dev.ViewModels
 {
-    public class MessageBoxWindowViewModel : ReactiveObject
+    public class MessageBoxWindowViewModel: ViewModelBase
     {
         public string Title { get; }
         public string Text { get; }
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/DialogBoxes/ModConfigWindowViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/DialogBoxes/ModConfigWindowViewModel.cs
index 373d2f3a..c5c680cb 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/DialogBoxes/ModConfigWindowViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/DialogBoxes/ModConfigWindowViewModel.cs
@@ -7,13 +7,14 @@
 using RogueEssence.Data;
 using ReactiveUI;
 using System.Collections.ObjectModel;
+using RogueEssence.Dev.Services;
 using RogueEssence.Dev.Views;
 
 namespace RogueEssence.Dev.ViewModels
 {
     public class ModConfigWindowViewModel : ViewModelBase
     {
-        public ModConfigWindowViewModel(ModHeader header)
+        public ModConfigWindowViewModel(IDialogService dialogService, ModHeader header)
         {
             Name = header.Name;
             Namespace = header.Namespace;
@@ -29,7 +30,7 @@ public ModConfigWindowViewModel(ModHeader header)
             ChosenModType = (int)header.ModType;
 
             DevForm form = (DevForm)DiagManager.Instance.DevEditor;
-            Relationships = new CollectionBoxViewModel(form, new StringConv(typeof(RelatedMod), new object[0]));
+            Relationships = new CollectionBoxViewModel(dialogService, new StringConv(typeof(RelatedMod), new object[0]));
             Relationships.OnEditItem += Relationships_EditItem;
             Relationships.LoadFromList(header.Relationships);
         }
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DataListPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DataListPageViewModel.cs
index 216e2dbb..4e0ebd7d 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DataListPageViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DataListPageViewModel.cs
@@ -53,9 +53,7 @@ public DataListEntry? SelectedItem
     public DataManager.DataType DataType => Node.DataType;
 
 
-    public DataListPageViewModel(NodeFactory nodeFactory, PageFactory pageFactory, TabEvents tabEvents,
-        IDialogService dialogService,
-        NodeBase node) : base(nodeFactory, pageFactory, tabEvents, dialogService, node)
+    public DataListPageViewModel(EditorContext context, NodeBase node) : base(context, node)
     {
     }
 
@@ -124,7 +122,7 @@ private async Task ImportDtefAsync()
         //remember addresses in registry
         string folderName = DevForm.GetConfig("TilesetDir", Directory.GetCurrentDirectory());
 
-        string? folder = await DialogService.ShowFolderPickerAsync(new FolderPickerOpenOptions
+        string? folder = await _context.DialogService.ShowFolderPickerAsync(new FolderPickerOpenOptions
         {
             Title = "Select DTEF folder",
             AllowMultiple = false,
@@ -147,7 +145,7 @@ private async Task ImportDtefAsync()
 
         if (conflict)
         {
-            var result = await MessageBoxWindowView.Show(DialogService,
+            var result = await MessageBoxWindowView.Show(_context.DialogService,
                 $"Are you sure you want to overwrite the existing sheet:\n{animName}",
                 "Tileset already exists.", MessageBoxWindowView.MessageBoxButtons.YesNo);
 
@@ -164,7 +162,7 @@ private async Task ImportDtefAsync()
         catch (Exception ex)
         {
             DiagManager.Instance.LogError(ex, false);
-            await MessageBoxWindowView.Show(DialogService, $"Error importing from\n{folder}\n\n{ex.Message}",
+            await MessageBoxWindowView.Show(_context.DialogService, $"Error importing from\n{folder}\n\n{ex.Message}",
                 "Import Failed", MessageBoxWindowView.MessageBoxButtons.Ok);
             return;
         }
@@ -177,7 +175,7 @@ private async Task ExportDtefAsync()
             //remember addresses in registry
             string folderName = DevForm.GetConfig("TilesetDir", Directory.GetCurrentDirectory());
 
-            string? folder = await DialogService.ShowFolderPickerAsync(new FolderPickerOpenOptions
+            string? folder = await _context.DialogService.ShowFolderPickerAsync(new FolderPickerOpenOptions
             {
                 Title = "Select folder to export the DTEF to",
                 AllowMultiple = false,
@@ -236,7 +234,7 @@ private void UpdateVisibleItems(string filter)
     public void AddUnderParentNode(DataListEntry entry)
     {
         Node.AddNodeIfNotExists(
-            NodeFactory.CreateDataItemNode<ReflectedDataPageViewModel>(entry.Key, entry.Title, Node.Icon));
+            _context.NodeFactory.CreateDataItemNode<ReflectedDataPageViewModel>(entry.Key, entry.Title, Node.Icon));
         NodeHelper.ExpandParents(Node, true);
     }
 
@@ -245,7 +243,7 @@ public async Task AddItem()
         var entry = DataRegistry.Map[DataType];
 
         var vm = new RenameWindowViewModel();
-        bool result = await DialogService.ShowDialogAsync<RenameWindowViewModel, bool>(vm, $"Add new {DataType}");
+        bool result = await _context.DialogService.ShowDialogAsync<RenameWindowViewModel, bool>(vm, $"Add new {DataType}");
 
         if (!result)
             return;
@@ -302,7 +300,7 @@ public async Task DeleteItem()
 
         if (PathMod.Quest.IsValid() && modStatus == DataManager.ModStatus.Base)
         {
-            await MessageBoxWindowView.Show(DialogService,
+            await MessageBoxWindowView.Show(_context.DialogService,
                 string.Format("The {0} {1} is not a part of the currently edited mod and cannot be deleted.",
                     datatype.ToString(), key),
                 "Delete " + datatype.ToString(), MessageBoxWindowView.MessageBoxButtons.Ok);
@@ -311,11 +309,11 @@ await MessageBoxWindowView.Show(DialogService,
 
         MessageBoxWindowView.MessageBoxResult result;
         if (modStatus == DataManager.ModStatus.Base || modStatus == DataManager.ModStatus.Added)
-            result = await MessageBoxWindowView.Show(DialogService,
+            result = await MessageBoxWindowView.Show(_context.DialogService,
                 string.Format("Are you sure you want to delete the following {0}:\n{1}", datatype.ToString(), key),
                 "Delete " + datatype.ToString(), MessageBoxWindowView.MessageBoxButtons.YesNo);
         else
-            result = await MessageBoxWindowView.Show(DialogService,
+            result = await MessageBoxWindowView.Show(_context.DialogService,
                 string.Format("The following {0} will be reset back to the base game:\n{1}", datatype.ToString(), key),
                 "Delete " + datatype.ToString(), MessageBoxWindowView.MessageBoxButtons.YesNo);
 
@@ -325,7 +323,7 @@ await MessageBoxWindowView.Show(DialogService,
 
         Items.Remove(SelectedItem);
         UpdateVisibleItems(SearchFilter);
-        TabEvents.RequestCloseTabsForEntry(key, datatype);
+        _context.TabEvents.RequestCloseTabsForEntry(key, datatype);
         var nodeToRemove = Node.SubNodes
             .OfType<DataItemNode>()
             .FirstOrDefault(n => n.ItemKey == key);
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DevControlViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DevControlViewModel.cs
index 00d5ce78..51b850f0 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DevControlViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DevControlViewModel.cs
@@ -15,9 +15,9 @@ public class DevControlViewModel : EditorPageViewModel
 
     public TestComboBoxViewModel Fruits { get; }
 
-    public DevControlViewModel(NodeFactory nodeFactory, PageFactory pageFactory, TabEvents tabEvents, IDialogService dialogService,
+    public DevControlViewModel(EditorContext context,
         DevTabGameViewModel game, DevTabPlayerViewModel player, DevTabTravelViewModel travel,
-        DevTabScriptViewModel script, NodeBase node) : base(nodeFactory, pageFactory, tabEvents, dialogService)
+        DevTabScriptViewModel script, NodeBase node) : base(context, node)
     {
         Fruits = new TestComboBoxViewModel();
         Game = game;
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DevEditPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DevEditPageViewModel.cs
index 250dedd9..d7ce87e8 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DevEditPageViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DevEditPageViewModel.cs
@@ -67,12 +67,11 @@ private void OpenList(DataManager.DataType dataType, GetEntry entryOp, CreateEnt
     
     // public override string? Title => "Dev Edit";
 
-    public DevEditPageViewModel(NodeFactory nodeFactory, PageFactory pageFactory, TabEvents tabEvents, IDialogService dialogService,
-        NodeBase node) : base(nodeFactory, pageFactory, tabEvents, dialogService)
+    public DevEditPageViewModel(EditorContext context, NodeBase node) : base(context, node)
     {
         var n = node as DataItemNode;
         var nn = node.Parent as DataRootNode;
-        var dt = nn.DataType;
+        // var dt = nn.DataType;
     }
 
     // public DevEditPageViewModel() : base(new PageFactory(new DesignServiceProvider()),
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/EditorPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/EditorPageViewModel.cs
index afc278d3..e6c9e43d 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/EditorPageViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/EditorPageViewModel.cs
@@ -3,6 +3,7 @@
 using System;
 using System.Collections.ObjectModel;
 using System.Runtime.CompilerServices;
+using Avalonia.Controls;
 using RogueEssence.Dev.Services;
 
 
@@ -13,17 +14,11 @@ public abstract class EditorPageViewModel<TNode> : EditorPageViewModel
 {
     
     // The node that opened this page
-    public TNode Node { get; }
+    public new TNode Node => (TNode)base.Node;
 
-    protected EditorPageViewModel(NodeFactory nodeFactory, PageFactory pageFactory, TabEvents tabEvents, 
-        IDialogService dialogService, NodeBase node) : base(nodeFactory, pageFactory, tabEvents, dialogService)
+    protected EditorPageViewModel(EditorContext context, NodeBase node) : base(context, node)
     {
-        if (node is not TNode typedNode)
-            throw new ArgumentException($"Expected {typeof(TNode).Name} but got {node.GetType().Name}");
-        
-        Node = typedNode;
     }
-    
     protected override bool IsSamePage(EditorPageViewModel other)
     {
         var otherTyped = (EditorPageViewModel<TNode>)other;
@@ -36,26 +31,33 @@ protected override bool IsSamePage(EditorPageViewModel other)
 
 public class EditorPageViewModel : ViewModelBase, IEquatable<EditorPageViewModel>
 {
-    public double ScrollOffset { get; set; } = 0;
-    
-    public virtual string DefaultTitle => "Dev Edit";
-    
-    private string _title = "";
-
 
-    public string Title =>
-        string.IsNullOrEmpty(_title) ? DefaultTitle : _title;
+    public Control? AttachedView { get; set; }
     
+    public virtual string DefaultTitle => "DEFAULT TEXT";
     
-
+    public event EventHandler? PageRemoved;
+    
+    public virtual void OnPageRemoved()
+    {
+        PageRemoved?.Invoke(this, EventArgs.Empty);
+    }
     
-    // Whether to add a new tab when this page is selected
+    // Whether to add a new tab when this page is added
     public virtual bool AddNewTab => true;
     
         
-    // Only load data when there is no duplicate pages
+    // Only load data when there is no duplicate pages using the IsSamePage method
     public virtual void LoadData() { }
     
+        
+    private string _title = "";
+
+
+    // Tab title
+    public string Title =>
+        string.IsNullOrEmpty(_title) ? DefaultTitle : _title;
+    
     public bool Equals(EditorPageViewModel? other)
     {
         if (other is null) return false;
@@ -111,25 +113,41 @@ public bool Modified
             }
         }
         
-    public readonly NodeFactory NodeFactory;
-    public readonly TabEvents TabEvents;
-    public readonly IDialogService DialogService;
-    public readonly PageFactory PageFactory;
+    public NodeBase Node { get; }
     
-    public EditorPageViewModel(NodeFactory nodeFactory, PageFactory pageFactory, TabEvents tabEvents, IDialogService dialogService)
+    protected readonly EditorContext _context;
+
+    protected EditorPageViewModel(EditorContext context, NodeBase node)
     {
-        this.TabEvents = tabEvents;
-        this.DialogService = dialogService;
-        this.PageFactory = pageFactory;
-        this.NodeFactory = nodeFactory;
+        Node = node;
+        _context = context;
     }
     
+    public (NodeBase node, ReflectedDataPageViewModel? editor) AddNewNodeAndTab(string title, string icon = "Icons.PaintBrushFill")
+    {
+        NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(title, icon);
+        Node.SubNodes.Add(node);
+        ReflectedDataPageViewModel editor = _context.PageFactory.CreatePage<ReflectedDataPageViewModel>(node);
+        if (editor != null)
+        {
+            editor.SetPageTitle(title, icon);
+            _context.TabEvents.AddChildPage(this, editor);
+        }
+
+        return (node, editor);
+    }
+ 
     
 
     public void SetPageTitleFromNode(NodeBase node)
     {
-        _icon = node.Icon;
-        _title = node.Title;
+        SetPageTitle(node.Title, node.Icon);
+    }
+
+    public void SetPageTitle(string title, string icon)
+    {
+        _title = title;
+        _icon = icon;
     }
     
     public void SetTitle(string title)
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/GroundEditorPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/GroundEditorPageViewModel.cs
index 8d6025ed..f830624f 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/GroundEditorPageViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/GroundEditorPageViewModel.cs
@@ -6,6 +6,6 @@ public class GroundEditorPageViewModel : EditorPageViewModel
 {
     // public override string Title => "Ground Editor Long Name";
     
-    public GroundEditorPageViewModel(NodeFactory nodeFactory, PageFactory pageFactory, TabEvents tabEvents, IDialogService dialogService) : base(nodeFactory, pageFactory, tabEvents, dialogService)
+    public GroundEditorPageViewModel(EditorContext context, NodeBase node) : base(context, node)
     { }
 }
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ModInfoEditorViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ModInfoEditorViewModel.cs
index 27e8642b..4efea4f8 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ModInfoEditorViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ModInfoEditorViewModel.cs
@@ -10,8 +10,7 @@ public class ModInfoEditorViewModel : EditorPageViewModel
 
     public TestComboBoxViewModel Fruits { get; }
     
-    public ModInfoEditorViewModel(NodeFactory nodeFactory, PageFactory pageFactory, TabEvents tabEvents, IDialogService dialogService,
-        NodeBase node) : base(nodeFactory, pageFactory, tabEvents, dialogService) 
+    public ModInfoEditorViewModel(EditorContext context, NodeBase node) : base(context, node) 
     {
        
         Fruits = new TestComboBoxViewModel();
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/RandomInfoPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/RandomInfoPageViewModel.cs
index 926a9f39..c0564129 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/RandomInfoPageViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/RandomInfoPageViewModel.cs
@@ -7,8 +7,7 @@ public class RandomInfoPageViewModel : EditorPageViewModel
     public override bool AddNewTab => false;
     
     // public override string Title => "Random Page Info";
-    public RandomInfoPageViewModel(NodeFactory nodeFactory, PageFactory pageFactory, TabEvents tabEvents, IDialogService dialogService,
-        NodeBase node) : base(nodeFactory, pageFactory, tabEvents, dialogService)
+    public RandomInfoPageViewModel(EditorContext context, NodeBase node) : base(context, node)
     {
     }
     
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ReflectedDataPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ReflectedDataPageViewModel.cs
index 155f6ea3..9c4b9916 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ReflectedDataPageViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ReflectedDataPageViewModel.cs
@@ -1,22 +1,129 @@
+using System;
+using System.Collections.Generic;
+using System.Reactive;
+using System.Threading.Tasks;
+using Avalonia.Controls;
+using Avalonia.Controls.Templates;
+using ReactiveUI;
 using RogueEssence.Dev.Services;
+using RogueEssence.Dev.Views;
 
 namespace RogueEssence.Dev.ViewModels;
 
 public class ReflectedDataPageViewModel : EditorPageViewModel<NodeBase>
 {
     
-    // TODO:
+    public Action<StackPanel> OnLoadAction;
+    public Func<StackPanel, Task<bool>> OnOKAction;
+
+    // public delegate Task<bool> OKEvent();
+    // public OKEvent SelectedOKEvent;
+
+    // public override string Title => "Random Page Info";
+    public ReflectedDataPageViewModel(EditorContext context,
+        NodeBase node) : base(context, node)
+    {
+        AddNewNodeAndTabCommand = ReactiveCommand.Create(AddNewNodeAndTabDefault);
+    }
+    
+    public bool isRootPage => Node is not ReflectedDataNode;
+    public override void LoadData()
+    {
+        base.LoadData();
+    }
+
+
+    public async Task<bool> ApplySave()
+    {
+        await _context.TabEvents.SaveChildren(this);
+        if (AttachedView is ISaveable saveable)
+            return await saveable.Save();
+        return true;
+    }
+    public void Close()
+    {
+        Node.Parent?.SubNodes.Remove(Node);
+        _context.TabEvents.RemoveTab(this);
+    }
+
+    public ReactiveCommand<Unit, Unit> AddNewNodeAndTabCommand { get; }
+ 
+    public void AddNewNodeAndTabDefault()
+    {
+        NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>("New Node [TODO Change Title]", "Icons.PaintBrushFill");
+        Node.SubNodes.Add(node);
+        var editor = _context.PageFactory.CreatePage<ReflectedDataPageViewModel>(node);
+        if (editor != null)
+        {
+            editor.SetPageTitle("New Node [TODO Change Title]", Node.Icon);
+            _context.TabEvents.AddChildPage(this, editor);
+        }
+    }
+    
+    public event EventHandler Closed;
+
+    public List<ReflectedDataPageViewModel> Children;
+
+    // public void RegisterChild(ReflectedDataPageViewModel child)
+    // {
+    //     Children.Add(child);
+    //     child.Closed += (object sender, EventArgs e) =>
+    //     {
+    //         Children.Remove(child);
+    //         TabClosed?.Invoke(this, EventArgs.Empty);
+    //     };
+    // }
+    
+    public void RegisterChild(ReflectedDataPageViewModel child)
+    {
+        Children.Add(child);
+    }
+    
+    public void UnregisterChild(ReflectedDataPageViewModel child)
+    {
+        Children.Remove(child);
+        Closed?.Invoke(this, EventArgs.Empty);
+    }
+    
+    // public async Task SaveChildren()
+    // {
+    //     for (int ii = Children.Count - 1; ii >= 0; ii--)
+    //     {
+    //         DataEditForm dataEditor = children[ii];
+    //         if (dataEditor != null)
+    //         {
+    //             await dataEditor.SaveChildren();
+    //             if (dataEditor.SelectedOKEvent != null)
+    //                 await dataEditor.SelectedOKEvent.Invoke();
+    //         }
+    //     }
+    // }
+    //
+
+    // Dummy test
+    // public void AddNewNodeAndTab()
+    // {
+    //     NodeBase node = NodeFactory.CreateOpenEditorNode<ReflectedDataPageViewModel>("New Node", "Icons.PaintBrushFill");
+    //     Node.SubNodes.Add(node);
+    //     var editor = PageFactory.CreatePage<ReflectedDataPageViewModel>(node);
+    //     if (editor != null)
+    //     {
+    //         TabEvents.AddTopLevelTab(editor);
+    //     }
+    // }
+    
+    public override void OnPageRemoved()
+    {
+        Node.Parent?.RemoveNode(Node);
+        base.OnPageRemoved();
+    }
+    
     // A page that is autogenerated will never be the same page as another page?
     protected override bool IsSamePage(EditorPageViewModel other)
     {
         if (other is not ReflectedDataPageViewModel otherPage)
             return false;
+        
         return otherPage.Node.Equals(Node);
     }
-
-    // public override string Title => "Random Page Info";
-    public ReflectedDataPageViewModel(NodeFactory nodeFactory, PageFactory pageFactory, TabEvents tabEvents, IDialogService dialogService,
-        NodeBase node) : base(nodeFactory, pageFactory, tabEvents, dialogService, node)
-    {
-    }
 }
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/SpeciesEditPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/SpeciesEditPageViewModel.cs
index 511b3174..1e2b2cc3 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/SpeciesEditPageViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/SpeciesEditPageViewModel.cs
@@ -206,9 +206,8 @@ private void RefreshTreeDataGrid()
 
         public string HeaderText { get; }
 
-        public SpeciesEditPageViewModel(NodeFactory nodeFactory, PageFactory pageFactory, TabEvents tabEvents,
-            IDialogService dialogService,
-            OpenEditorNodeWithParams node) : base(nodeFactory, pageFactory, tabEvents, dialogService)
+        public SpeciesEditPageViewModel(EditorContext context,
+            OpenEditorNodeWithParams node) : base(context, node)
         {
             Monsters = new ObservableCollection<MonsterNodeViewModel>();
             OpList = new ObservableCollection<SpeciesOpContainer>();
@@ -239,7 +238,7 @@ private async void applyOpToCharSheet(CharSheetOp op)
 
             if (!chosenMonster.Filled)
             {
-                await MessageBoxWindowView.Show(DialogService,
+                await MessageBoxWindowView.Show(_context.DialogService,
                     string.Format("No graphics exist for {0}.", chosenMonster.Title),
                     "Error", MessageBoxWindowView.MessageBoxButtons.Ok);
                 return;
@@ -249,11 +248,8 @@ await MessageBoxWindowView.Show(DialogService,
             int chosenAnim = -1;
             if (animOptions.Length > 0)
             {
-                AnimChoiceWindow window = new AnimChoiceWindow();
-                AnimChoiceViewModel viewModel = new AnimChoiceViewModel(animOptions);
-                window.DataContext = viewModel;
-
-                bool animResult = await window.ShowDialog<bool>(parent);
+                AnimChoiceWindowViewModel viewModel = new AnimChoiceWindowViewModel(animOptions);
+                bool animResult = await _context.DialogService.ShowDialogAsync<AnimChoiceWindowViewModel, bool>(viewModel);
                 if (!animResult)
                     return;
                 chosenAnim = animOptions[viewModel.ChosenAnim];
@@ -306,14 +302,14 @@ public void LoadFormDataEntries(bool sprites)
 
         public async void mnuMassImport_Click()
         {
-            await MessageBoxWindowView.Show(DialogService,
+            await MessageBoxWindowView.Show(_context.DialogService,
                 "Note: Importing a sprite to a slot that is already filled will automatically overwrite the old one.",
                 "Mass Import", MessageBoxWindowView.MessageBoxButtons.Ok);
             //remember addresses in registry
             string folderName = DevForm.GetConfig(Name + "Dir", Directory.GetCurrentDirectory());
 
             //open window to choose directory
-            string? folder = await DialogService.ShowFolderPickerAsync(new FolderPickerOpenOptions
+            string? folder = await _context.DialogService.ShowFolderPickerAsync(new FolderPickerOpenOptions
             {
                 Title = "Select sprite folder to mass import",
                 AllowMultiple = false,
@@ -332,7 +328,7 @@ await MessageBoxWindowView.Show(DialogService,
             catch (Exception ex)
             {
                 DiagManager.Instance.LogError(ex, false);
-                await MessageBoxWindowView.Show(DialogService,
+                await MessageBoxWindowView.Show(_context.DialogService,
                     $"Error importing from\n{CachedPath}\n\n{ex.Message}",
                     "Import Failed", MessageBoxWindowView.MessageBoxButtons.Ok);
                 return;
@@ -355,7 +351,7 @@ public async void MassExportFlow(bool singleSheet)
             string folderName = DevForm.GetConfig(Name + "Dir", Directory.GetCurrentDirectory());
 
             //open window to choose directory
-            string? folder = await DialogService.ShowFolderPickerAsync(new FolderPickerOpenOptions
+            string? folder = await _context.DialogService.ShowFolderPickerAsync(new FolderPickerOpenOptions
             {
                 Title = "Select folder to mass export to",
                 AllowMultiple = false,
@@ -382,7 +378,7 @@ public async void mnuReIndex_Click()
             catch (Exception ex)
             {
                 DiagManager.Instance.LogError(ex, false);
-                await MessageBoxWindowView.Show(DialogService, "Error when reindexing.\n\n" + ex.Message,
+                await MessageBoxWindowView.Show(_context.DialogService, "Error when reindexing.\n\n" + ex.Message,
                     "Reindex Failed", MessageBoxWindowView.MessageBoxButtons.Ok);
                 return;
             }
@@ -396,7 +392,7 @@ public async void btnImport_Click()
 
             if (chosenMonster.Filled)
             {
-                var res = await MessageBoxWindowView.Show(DialogService,
+                var res = await MessageBoxWindowView.Show(_context.DialogService,
                     "Are you sure you want to overwrite the existing sheet:\n" + GetFormString(formdata),
                     "Sprite Sheet already exists.", MessageBoxWindowView.MessageBoxButtons.OkCancel);
                 if (res == MessageBoxWindowView.MessageBoxResult.No)
@@ -408,7 +404,7 @@ public async void btnImport_Click()
             //notify (once) that sprites need to follow a rigid guideline
             if (!notifiedImport)
             {
-                await MessageBoxWindowView.Show(DialogService, "When importing sprites, " +
+                await MessageBoxWindowView.Show(_context.DialogService, "When importing sprites, " +
                                                                "make sure that all files in each folder adhere to the naming convention.",
                     "Sprite Importing", MessageBoxWindowView.MessageBoxButtons.Ok);
                 notifiedImport = true;
@@ -418,7 +414,7 @@ await MessageBoxWindowView.Show(DialogService, "When importing sprites, " +
             string folderName = DevForm.GetConfig(Name + "Dir", Directory.GetCurrentDirectory());
 
             //open window to choose directory
-            string? folder = await DialogService.ShowFolderPickerAsync(new FolderPickerOpenOptions
+            string? folder = await _context.DialogService.ShowFolderPickerAsync(new FolderPickerOpenOptions
             {
                 Title = "Select folder to import from",
                 AllowMultiple = false,
@@ -437,7 +433,7 @@ await MessageBoxWindowView.Show(DialogService, "When importing sprites, " +
             catch (Exception ex)
             {
                 DiagManager.Instance.LogError(ex, false);
-                await MessageBoxWindowView.Show(DialogService,
+                await MessageBoxWindowView.Show(_context.DialogService,
                     "Error importing from\n" + CachedPath + "\n\n" + ex.Message, "Import Failed",
                     MessageBoxWindowView.MessageBoxButtons.Ok);
                 return;
@@ -453,7 +449,7 @@ public async void btnReImport_Click()
             catch (Exception ex)
             {
                 DiagManager.Instance.LogError(ex, false);
-                await MessageBoxWindowView.Show(DialogService,
+                await MessageBoxWindowView.Show(_context.DialogService,
                     "Error importing from\n" + CachedPath + "\n\n" + ex.Message, "Import Failed",
                     MessageBoxWindowView.MessageBoxButtons.Ok);
                 return;
@@ -477,7 +473,7 @@ public async void ExportFlow(bool singleSheet)
 
             if (!chosenMonster.Filled)
             {
-                await MessageBoxWindowView.Show(DialogService,
+                await MessageBoxWindowView.Show(_context.DialogService,
                     String.Format("No graphics exist for {0}.", chosenMonster.Title), "Error",
                     MessageBoxWindowView.MessageBoxButtons.Ok);
                 return;
@@ -488,7 +484,7 @@ await MessageBoxWindowView.Show(DialogService,
 
             //open window to choose directory
 
-            string folder = await DialogService.ShowFolderPickerAsync(new FolderPickerOpenOptions
+            string folder = await _context.DialogService.ShowFolderPickerAsync(new FolderPickerOpenOptions
             {
                 Title = "Select folder to export to",
                 AllowMultiple = false,
@@ -507,7 +503,7 @@ await MessageBoxWindowView.Show(DialogService,
             catch (Exception ex)
             {
                 DiagManager.Instance.LogError(ex, false);
-                await MessageBoxWindowView.Show(DialogService,
+                await MessageBoxWindowView.Show(_context.DialogService,
                     "Error exporting to\n" + CachedPath + "\n\n" + ex.Message, "Export Failed",
                     MessageBoxWindowView.MessageBoxButtons.Ok);
                 return;
@@ -518,7 +514,7 @@ public async void btnDelete_Click()
         {
             if (!chosenMonster.Filled)
             {
-                await MessageBoxWindowView.Show(DialogService,
+                await MessageBoxWindowView.Show(_context.DialogService,
                     String.Format("No graphics exist for {0}.", chosenMonster.Title), "Error",
                     MessageBoxWindowView.MessageBoxButtons.Ok);
                 return;
@@ -527,7 +523,7 @@ await MessageBoxWindowView.Show(DialogService,
             //get current sprite
             CharID formdata = chosenMonster.ID;
 
-            var result = await MessageBoxWindowView.Show(DialogService,
+            var result = await MessageBoxWindowView.Show(_context.DialogService,
                 "Are you sure you want to delete the following sheet:\n" + GetFormString(formdata),
                 "Delete Sprite Sheet.",
                 MessageBoxWindowView.MessageBoxButtons.YesNo);
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/SpritePageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/SpritePageViewModel.cs
index 2bcc2fea..832aa858 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/SpritePageViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/SpritePageViewModel.cs
@@ -16,15 +16,14 @@ public class SpritePageViewModel : EditorPageViewModel
     // public override string Title => "Sprite Stuff";
 
 
-    public SpritePageViewModel(NodeFactory nodeFactory, PageFactory pageFactory, TabEvents tabEvents, IDialogService dialogService,
-        NodeBase node) : base(nodeFactory, pageFactory, tabEvents, dialogService)
+    public SpritePageViewModel(EditorContext context, NodeBase node) : base(context, node)
     {
-        CreateATab = ReactiveCommand.Create(() => tabEvents.AddChildPage(this, pageFactory.CreatePage(typeof(SpritePageViewModel))));
-        CreateATopTab = ReactiveCommand.Create(() => tabEvents.AddTopLevelTab(pageFactory.CreatePage(typeof(ModInfoEditorViewModel))));
+        CreateATab = ReactiveCommand.Create(() => _context.TabEvents.AddChildPage(this, _context.PageFactory.CreatePage(typeof(SpritePageViewModel))));
+        CreateATopTab = ReactiveCommand.Create(() => _context.TabEvents.AddTopLevelTab(_context.PageFactory.CreatePage(typeof(ModInfoEditorViewModel))));
         TestDialog = ReactiveCommand.CreateFromTask(async () =>
             {
                 var rename = new RenameWindowViewModel();
-                var result = await dialogService.ShowFolderPickerAsync(new FolderPickerOpenOptions()
+                var result = await _context.DialogService.ShowFolderPickerAsync(new FolderPickerOpenOptions()
                 {
                     AllowMultiple = false,
                     Title = "Select a folder"
@@ -33,7 +32,7 @@ public SpritePageViewModel(NodeFactory nodeFactory, PageFactory pageFactory, Tab
             }
         );
         
-        RemoveSelfTab = ReactiveCommand.Create( () => tabEvents.RemoveTab(this));
+        RemoveSelfTab = ReactiveCommand.Create( () => _context.TabEvents.RemoveTab(this));
             
         
     }
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ZoneEditorPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ZoneEditorPageViewModel.cs
index d64908aa..ef71d554 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ZoneEditorPageViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ZoneEditorPageViewModel.cs
@@ -6,8 +6,7 @@ public class ZoneEditorPageViewModel : EditorPageViewModel
 {
     // public override string Title => "Zone Editor";
     
-    public ZoneEditorPageViewModel(NodeFactory nodeFactory, PageFactory pageFactory, TabEvents tabEvents, IDialogService dialogService,
-        NodeBase node) : base(nodeFactory, pageFactory, tabEvents, dialogService)
+    public ZoneEditorPageViewModel(EditorContext context, NodeBase node) : base(context, node)
     {
         
     }
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/NodeBase.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/NodeBase.cs
index 36b88798..c4564ab5 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/NodeBase.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/NodeBase.cs
@@ -29,7 +29,7 @@ namespace RogueEssence.Dev.ViewModels;
 
 public class NodeBase : ViewModelBase, IEquatable<NodeBase>
 {
-    public ObservableCollection<NodeBase> SubNodes { get; set; }
+    public ObservableCollection<NodeBase> SubNodes { get; }
 
     public NodeBase? Parent { get; internal set; }
 
@@ -138,11 +138,24 @@ public void AddNodeIfNotExists(NodeBase node)
     
     public void RemoveNode(NodeBase node)
     {
-        Console.WriteLine("hi");
-        Console.WriteLine($"Removing node {node.Title}");
         SubNodes.Remove(node);
     }
     
+    // NOTE: Include itself while looking for a match
+    public T FindNode<T>() where T : NodeBase
+    {
+        var currentNode = this;
+
+        while (currentNode != null)
+        {
+            if (currentNode is T match)
+                return match;
+
+            currentNode = currentNode.Parent;
+        }
+
+        return null;
+    }
 }
 
 public class OpenEditorNode : NodeBase
@@ -167,6 +180,20 @@ protected override int GetHashCodeCore()
     }
 }
 
+public class ReflectedDataNode : OpenEditorNode
+{
+    public ReflectedDataNode(string title, Type editorType, string icon = null)
+        : base(title, editorType, icon)
+    { }
+    
+    // TODO: Rather than using references, keep track of a tree of inherited subtypes to check if they're equal?
+    // Don't use references...
+    // Don't use the title, use the type instead or a combination of elementName, parent, elementType
+    // Find something more reliable than the title?
+    protected override bool EqualsCore(NodeBase other) => other.Title == Title;
+    protected override int GetHashCodeCore() => Title.GetHashCode();
+}
+
 
 // TODO: Remove
 public class OpenEditorNodeWithParams : OpenEditorNode
@@ -807,7 +834,7 @@ public ModRootNode(NodeFactory nodeFactory, IDialogService dialogService,
     public override async Task AddItem()
     {
         ModHeader header = new ModHeader("", "", "", "", "", Guid.NewGuid(), new Version(), new Version(), PathMod.ModType.Mod, new RelatedMod[0] { });
-        var vm = new ModConfigWindowViewModel(header);
+        var vm = new ModConfigWindowViewModel(_dialogService, header);
         bool result = await _dialogService.ShowDialogAsync<ModConfigWindowViewModel, bool>(vm, "Mod Config");
         
         if (!result)
diff --git a/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml b/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml
index dc30d4a5..a7798eb6 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml
@@ -54,7 +54,7 @@
                 Grid.Column="{Binding #WindowMain.WindowState, Converter={StaticResource WindowStateToColumnConverter}}"
                 Orientation="Horizontal">
                 <!-- Settings -->
-                <Button Classes="icon_button" Command="{Binding OpenPreferencesWindow}"
+                <Button Classes="icon_button" Command="{Binding ShowPreferencesWindow}"
                         Padding="8, 4, 0, 0">
                     <Path HorizontalAlignment="Center" Width="14" Height="14" Margin="0,2,0,0"
                           Data="{StaticResource Icons.GearFill}" />
@@ -125,7 +125,7 @@
                                     Width="16"
                                     Height="16"
                                     Margin="0,0,6,0"
-                                    Command="{Binding ClearFilterCommand}"
+                                    Command="{Binding ClearFilter}"
                                     IsVisible="{Binding Filter, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"
                                     HorizontalAlignment="Right">
                                 <Path
diff --git a/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml.cs b/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml.cs
index 43e40c51..49b07908 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml.cs
@@ -212,11 +212,12 @@ public void OpenMap()
 
         public void openMap()
         {
-            MapEditForm = new MapEditForm();
-            ViewModels.MapEditViewModel vm = new ViewModels.MapEditViewModel();
-            MapEditForm.DataContext = vm;
-            vm.LoadFromCurrentMap();
-            MapEditForm.Show();
+            // TODO: Resolve this!
+            // MapEditForm = new MapEditForm();
+            // ViewModels.MapEditViewModel vm = new ViewModels.MapEditViewModel();
+            // MapEditForm.DataContext = vm;
+            // vm.LoadFromCurrentMap();
+            // MapEditForm.Show();
         }
 
         public void groundEditorClosed(object sender, EventArgs e)
diff --git a/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/AnimChoiceWindowView.axaml b/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/AnimChoiceWindowView.axaml
new file mode 100644
index 00000000..ce5d9fc2
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/AnimChoiceWindowView.axaml
@@ -0,0 +1,56 @@
+<v:ChromelessWindow xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:vm="using:RogueEssence.Dev.ViewModels"
+                    x:Class="RogueEssence.Dev.Views.AnimChoiceWindowView"
+                    xmlns:v="using:RogueEssence.Dev.Views"
+                    x:DataType="vm:AnimChoiceWindowViewModel"
+                    CanResize="False"
+                    Width="500"
+                    MaxWidth="350"
+                    Height="120"
+                    x:Name="ThisControl">
+    
+    <Design.DataContext>
+        <vm:AnimChoiceWindowViewModel/>
+    </Design.DataContext>
+
+    <Grid RowDefinitions="Auto,*">
+        <!-- TitleBar -->
+        <Grid Grid.Row="0" Height="28" IsVisible="{Binding !#ThisControl.UseSystemWindowFrame}">
+            <Border Background="{DynamicResource Brush.TitleBar}"
+                    BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border0}"
+                    PointerPressed="BeginMoveWindow" />
+
+            <Path Width="14" Height="14"
+                  Margin="10,0,0,0"
+                  HorizontalAlignment="Left"
+                  Data="{StaticResource Icons.SoftwareUpdate}"
+                  IsVisible="{OnPlatform True, macOS=False}" />
+
+            <TextBlock Classes="bold"
+                       x:Name="TitleText"
+                       Text="{Binding #ThisControl.Title}"
+                       HorizontalAlignment="Center" VerticalAlignment="Center"
+                       IsHitTestVisible="False" />
+            
+            <v:CaptionButtons HorizontalAlignment="Right"
+                              IsCloseButtonOnly="True"
+                              IsVisible="{OnPlatform True, macOS=False}"/>
+            
+        </Grid>
+        
+        <Grid Margin="4" >
+            <Grid.RowDefinitions>
+                <RowDefinition Height="42"/>
+                <RowDefinition Height="42"/>
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition/>
+                <ColumnDefinition/>
+            </Grid.ColumnDefinitions>
+            <v:SearchComboBox ItemsSource="{Binding Anims}" SelectedIndex="{Binding ChosenAnim}" Margin="4" Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2"/>
+            <Button Click="btnOK_Click" Margin="4" Grid.Row="1" Grid.Column="0">OK</Button>
+            <Button Click="btnCancel_Click" Margin="4" Grid.Row="1" Grid.Column="1">Cancel</Button>
+        </Grid>
+    </Grid>
+</v:ChromelessWindow>
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/AnimChoiceWindowView.axaml.cs b/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/AnimChoiceWindowView.axaml.cs
new file mode 100644
index 00000000..7f083cc5
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/AnimChoiceWindowView.axaml.cs
@@ -0,0 +1,27 @@
+using System;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+using Avalonia.Markup.Xaml;
+
+namespace RogueEssence.Dev.Views
+{
+    public partial class AnimChoiceWindowView: ChromelessWindow
+    {
+        public AnimChoiceWindowView()
+        {
+            this.InitializeComponent();
+        }
+        
+        public void btnOK_Click(object sender, RoutedEventArgs e)
+        {
+            this.Close(true);
+        }
+
+
+        public void btnCancel_Click(object sender, RoutedEventArgs e)
+        {
+            this.Close(false);
+        }
+    }
+}
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/DataListPageView.axaml b/RogueEssence.Editor.Avalonia/Views/New/Editors/DataListPageView.axaml
index aa11d262..965c5541 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/Editors/DataListPageView.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/New/Editors/DataListPageView.axaml
@@ -103,15 +103,18 @@
 
             <ListBox Grid.Row="2"
                      ContextRequested="DataListPageListBox_OnContextRequested"
-                     Background="{DynamicResource Brush.Contents}"
+                     Background="{DynamicResource Brush.ListBox.Background}"
                      x:Name="DataListPageListBox" SelectedItem="{Binding SelectedItem}"
                      ItemsSource="{Binding FilteredItems}" Height="400" BorderBrush="{DynamicResource Brush.Border2}"
                      BorderThickness="1" DoubleTapped="DataListPageListBox_OnDoubleTapped">
                 <ListBox.Styles>
                     <Style Selector="ListBoxItem">
-                        <Setter Property="Background" Value="{DynamicResource Brush.Contents}" />
+                        <Setter Property="Background" Value="{DynamicResource Brush.ListBox.Background}" />
                     </Style>
                 </ListBox.Styles>
+                <ListBox.ItemContainerTheme>
+                    <StaticResource ResourceKey="CompactListBoxItem"/>
+                </ListBox.ItemContainerTheme>
                 <ListBox.ItemTemplate>
                     <DataTemplate>
                         <TextBlock Text="{Binding Title}" Padding="4" />
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/ReflectedDataPageView.axaml b/RogueEssence.Editor.Avalonia/Views/New/Editors/ReflectedDataPageView.axaml
index 3153b698..09175d7a 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/Editors/ReflectedDataPageView.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/New/Editors/ReflectedDataPageView.axaml
@@ -6,5 +6,29 @@
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:DataType="vm:ReflectedDataPageViewModel"
              x:Class="RogueEssence.Dev.Views.ReflectedDataPageView">
-    Welcome to Reflection
+    
+    <Design.DataContext>
+        <vm:ReflectedDataPageViewModel></vm:ReflectedDataPageViewModel>
+    </Design.DataContext>
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="*"/>
+            <RowDefinition Height="32"/>
+            <RowDefinition Height="32"/>
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition/>
+            <ColumnDefinition/>
+        </Grid.ColumnDefinitions>
+        <!--ScrollViewer HorizontalScrollBarVisibility="Visible" VerticalScrollBarVisibility="Visible" Grid.ColumnSpan="2"-->
+        <ScrollViewer Grid.ColumnSpan="2">
+            <StackPanel Name="stkContent" Margin="12, 4">
+        
+            </StackPanel>
+        </ScrollViewer>
+        
+        <Button Click="btnApply_Click" Classes="flat" Margin="4" Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" IsVisible="{Binding isRootPage}">Save All Sub-Windows</Button>
+        <Button Click="btnOK_Click" Classes="flat" Margin="4" Grid.Row="2" Grid.Column="0">OK</Button>
+        <Button Click="btnCancel_Click" Classes="flat" Margin="4" Grid.Row="2" Grid.Column="1">Cancel</Button>
+    </Grid>
 </UserControl>
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/ReflectedDataPageView.axaml.cs b/RogueEssence.Editor.Avalonia/Views/New/Editors/ReflectedDataPageView.axaml.cs
index 6fb3da5a..c4b8913a 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/Editors/ReflectedDataPageView.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/New/Editors/ReflectedDataPageView.axaml.cs
@@ -1,13 +1,138 @@
+using System;
+using System.Threading.Tasks;
 using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Interactivity;
 using Avalonia.Markup.Xaml;
+using RogueEssence.Data;
+using RogueEssence.Dev.ViewModels;
 
 namespace RogueEssence.Dev.Views;
 
-public partial class ReflectedDataPageView : UserControl
+public interface ISaveable
 {
+    Task<bool> Save();
+}
+
+public partial class ReflectedDataPageView : UserControl, ISaveable
+{
+    public StackPanel ControlPanel { get; }
+
+    
     public ReflectedDataPageView()
     {
         InitializeComponent();
+        ControlPanel = stkContent;
+    }
+    
+    public async Task<bool> Save()
+    {
+        if (DataContext is ReflectedDataPageViewModel vm && vm.OnOKAction != null)
+        {
+            return await vm.OnOKAction(ControlPanel);
+            
+        }
+        return true;
+    }
+    public async void btnApply_Click(object sender, RoutedEventArgs e)
+    {
+        if (DataContext is ReflectedDataPageViewModel vm)
+            await vm.ApplySave();
+    }
+    
+    public async void btnOK_Click(object sender, RoutedEventArgs e)
+    {
+        if (DataContext is ReflectedDataPageViewModel vm)
+        {
+            bool close = await vm.ApplySave();
+            if (close)
+                vm.Close();
+        }
+    }
+    
+    public void btnCancel_Click(object sender, RoutedEventArgs e)
+    {
+        if (DataContext is ReflectedDataPageViewModel vm)
+            vm.Close();
+    }
+
+    protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
+    {
+        base.OnAttachedToVisualTree(e);
+        DataContextChanged += OnDataContextChanged;
+        OnDataContextChanged(this, EventArgs.Empty);
+    }
+
+    protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e)
+    {
+        base.OnDetachedFromVisualTree(e);
+        DataContextChanged -= OnDataContextChanged;
+    }
+
+    private void OnDataContextChanged(object? sender, EventArgs e)
+    {
+        if (DataContext is not EditorPageViewModel vm) return;
+    
+        vm.AttachedView = this;
+        Console.WriteLine($"View set on {vm}");
+
+        if (DataContext is ReflectedDataPageViewModel reflectedVm && reflectedVm.OnLoadAction != null)
+            reflectedVm.OnLoadAction(ControlPanel);
     }
+    
+    // public virtual async void Window_Closing(object sender, WindowClosingEventArgs e)
+    // {
+    //     if (Design.IsDesignMode)
+    //         return;
+    //         
+    //     if (!Cancel)
+    //     {
+    //         if (!OK && children.Count > 0)
+    //         {
+    //             //X button was clicked when there are children, cancel the close, popup the children, and add a warning message.
+    //             e.Cancel = true;
+    //             FocusChildren();
+    //             Task<MessageBox.MessageBoxResult> task =  MessageBox.Show(this, "Are you sure you want to close all subwindows?  Your changes will not be saved.", "Confirm Close",
+    //                 MessageBox.MessageBoxButtons.YesNo);
+    //             MessageBox.MessageBoxResult result = await task;
+    //             if (result == MessageBox.MessageBoxResult.Yes)
+    //             {
+    //                 Cancel = true;
+    //                 Close();
+    //                 return;
+    //             }
+    //         }
+    //     }
+    //         
+    //     if (!e.Cancel)
+    //         CloseChildren();
+    // }
+    //
+    // public async void btnOK_Click(object sender, RoutedEventArgs e)
+    // {
+    //     bool close = false;
+    //     if (SelectedOKEvent != null)
+    //     {
+    //         await SaveChildren();
+    //         close = await SelectedOKEvent.Invoke();
+    //     }
+    //     if (close)
+    //     {
+    //         OK = true;
+    //         Close();
+    //     }
+    // }
+    //
+    // public void btnCancel_Click(object sender, RoutedEventArgs e)
+    // {
+    //     //SelectedCancelEvent?.Invoke();
+    //     Cancel = true;
+    //     Close();
+    // }
+    //
+    // public void SetViewOnly()
+    // {
+    //     Button button = this.FindControl<Button>("btnOK");
+    //     button.IsEnabled = false;
+    // }
 }
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/SpeciesEditPageView.axaml b/RogueEssence.Editor.Avalonia/Views/New/Editors/SpeciesEditPageView.axaml
index 7d37552a..69f43967 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/Editors/SpeciesEditPageView.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/New/Editors/SpeciesEditPageView.axaml
@@ -172,28 +172,28 @@
                     </ContextMenu>
                 </TreeDataGrid.ContextMenu>
             </TreeDataGrid>
-
-            <Grid Grid.Row="4" ColumnDefinitions="Auto, *">
-                <UniformGrid Rows="1" Columns="3">
-                    <Button Classes="flat" Margin="0,0,10,0" Command="{Binding btnImport_Click}"
-                            IsEnabled="{Binding ChosenMonster, Converter={x:Static ObjectConverters.IsNotNull}}">
-                        <v:IconText Text="Import" Icon="Icons.DownloadFill" IconSize="12" />
-                    </Button>
-                    <Button Classes="flat" Margin="0,0,10,0" Command="{Binding btnReImport_Click}"
-                            IsEnabled="{Binding CachedPath, Converter={x:Static StringConverters.IsNotNullOrEmpty}}">
-                        <v:IconText Text="Re-Import" Icon="Icons.RepeatFill" IconSize="12" />
-                    </Button>
-                    <Button Classes="flat" Command="{Binding btnExport_Click}"
-                            IsEnabled="{Binding ChosenMonster, Converter={x:Static ObjectConverters.IsNotNull}}">
-                        <v:IconText Text="Export" Icon="Icons.ExportFill" IconSize="12" />
-                    </Button>
-                </UniformGrid>
-                <Button Grid.Column="1" HorizontalAlignment="Right" Command="{Binding btnDelete_Click}"
-                        Classes="secondary" Padding="4,3,4,3"
+            <StackPanel Grid.Row="4" Orientation="Horizontal">
+                <Button Classes="flat" Width="100"
+                        Command="{Binding btnImport_Click}"
+                        IsEnabled="{Binding ChosenMonster, Converter={x:Static ObjectConverters.IsNotNull}}">
+                    <v:IconText Text="Import" Icon="Icons.DownloadFill" IconSize="12" />
+                </Button>
+                <Button Classes="flat" Width="100" Margin="24,0,0,0"
+                        Command="{Binding btnReImport_Click}"
+                        IsEnabled="{Binding CachedPath, Converter={x:Static StringConverters.IsNotNullOrEmpty}}">
+                    <v:IconText Text="Re-Import" Icon="Icons.RepeatFill" IconSize="12" />
+                </Button>
+                <Button Classes="flat" Width="100" Margin="24,0,0,0"
+                        Command="{Binding btnExport_Click}"
+                        IsEnabled="{Binding ChosenMonster, Converter={x:Static ObjectConverters.IsNotNull}}">
+                    <v:IconText Text="Export" Icon="Icons.ExportFill" IconSize="12" />
+                </Button>
+                <Button Classes="flat" Width="100" Margin="24,0,0,0"
+                        Command="{Binding btnExport_Click}"
                         IsEnabled="{Binding ChosenMonster, Converter={x:Static ObjectConverters.IsNotNull}}">
-                    <Path Width="14" Height="14" Data="{StaticResource Icons.Minus}" />
+                    <v:IconText Text="Delete" Icon="Icons.TrashFill" IconSize="12" />
                 </Button>
-            </Grid>
+            </StackPanel>
         </Grid>
     </Grid>
 </UserControl>
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/ZoneEditorPageView.axaml b/RogueEssence.Editor.Avalonia/Views/New/Editors/ZoneEditorPageView.axaml
index a1ae95e6..60944858 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/Editors/ZoneEditorPageView.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/New/Editors/ZoneEditorPageView.axaml
@@ -3,12 +3,26 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:vm="using:RogueEssence.Dev.ViewModels"
+             xmlns:v="using:RogueEssence.Dev.Views"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:DataType="vm:ZoneEditorPageViewModel"
              x:Class="RogueEssence.Dev.Views.ZoneEditorPageView">
     <ScrollViewer>
         <StackPanel Spacing="8" Margin="16">
-            <TextBlock Text="Zone Editor" FontSize="24" FontWeight="Bold"/>
+            <TextBlock Text="Zone Edit" FontSize="24" FontWeight="Bold"/>
+            <DataGrid x:Name="ZoneDataGrid"
+                      x:DataType="v:ZoneMockEntry"
+                      Classes="default"
+
+                      >
+                <DataGrid.Columns>
+                    <DataGridTextColumn Header="ID" Binding="{Binding Id}" Width="60"/>
+                    <DataGridTextColumn Header="Name" Binding="{Binding Name}" Width="200"/>
+                    <DataGridTextColumn Header="Level Range" Binding="{Binding LevelRange}" Width="120"/>
+                    <DataGridTextColumn Header="Map Count" Binding="{Binding MapCount}" Width="100"/>
+                    <DataGridTextColumn Header="Music" Binding="{Binding Music}" Width="200"/>
+                </DataGrid.Columns>
+            </DataGrid>
         </StackPanel>
     </ScrollViewer>
 </UserControl>
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/ZoneEditorPageView.axaml.cs b/RogueEssence.Editor.Avalonia/Views/New/Editors/ZoneEditorPageView.axaml.cs
index fb8765cc..0c39d95a 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/Editors/ZoneEditorPageView.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/New/Editors/ZoneEditorPageView.axaml.cs
@@ -1,13 +1,34 @@
+using System.Collections.Generic;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
 namespace RogueEssence.Dev.Views;
 
+public class ZoneMockEntry
+{
+    public int Id { get; set; }
+    public string Name { get; set; }
+    public string LevelRange { get; set; }
+    public int MapCount { get; set; }
+    public string Music { get; set; }
+}
 public partial class ZoneEditorPageView : UserControl
 {
     public ZoneEditorPageView()
     {
         InitializeComponent();
+        ZoneDataGrid.ItemsSource = GetMockData();
     }
+    
+    private List<ZoneMockEntry> GetMockData() => new List<ZoneMockEntry>
+    {
+        new ZoneMockEntry { Id = 0, Name = "Tiny Woods", LevelRange = "1-5", MapCount = 3, Music = "tiny_woods.ogg" },
+        new ZoneMockEntry { Id = 1, Name = "Thunderwave Cave", LevelRange = "6-11", MapCount = 5, Music = "thunderwave.ogg" },
+        new ZoneMockEntry { Id = 2, Name = "Mt. Steel", LevelRange = "11-19", MapCount = 7, Music = "mt_steel.ogg" },
+        new ZoneMockEntry { Id = 3, Name = "Sinister Woods", LevelRange = "14-22", MapCount = 6, Music = "sinister_woods.ogg" },
+        new ZoneMockEntry { Id = 4, Name = "Silent Chasm", LevelRange = "20-28", MapCount = 8, Music = "silent_chasm.ogg" },
+    };
+
+
 }
\ No newline at end of file

From 843aff82e3376affce57265dc9e6905af74cea41 Mon Sep 17 00:00:00 2001
From: Kace <41309226+DoubleTrio@users.noreply.github.com>
Date: Mon, 11 May 2026 04:14:15 -0400
Subject: [PATCH 23/51] fix error

---
 .../ViewModels/New/DevFormViewModel.cs                      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs
index f453aa82..27126f53 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs
@@ -538,9 +538,9 @@ public void LoadDevTree()
 
     private void CreateConstantsNode(NodeBase parent)
     {
-        var constantsNode = _nodeFactory.CreateOpenEditorNode<ZoneEditorPageViewModel>("Constants", "Icons.ListFill", "");
-        var startParamsNode = _nodeFactory.CreateOpenEditorNode<ReflectedDataPageViewModel>("Start Params", "Icons.ListFill", "");
-        var universalEventsNode = _nodeFactory.CreateOpenEditorNode<ReflectedDataPageViewModel>("Universal Events", "Icons.ListFill", "");
+        var constantsNode = _nodeFactory.CreateOpenEditorNode<ZoneEditorPageViewModel>("Constants", "Icons.ListFill");
+        var startParamsNode = _nodeFactory.CreateOpenEditorNode<ReflectedDataPageViewModel>("Start Params", "Icons.ListFill");
+        var universalEventsNode = _nodeFactory.CreateOpenEditorNode<ReflectedDataPageViewModel>("Universal Events", "Icons.ListFill");
         //
         // var menuTextNode = _nodeFactory.CreateOpenEditorNode("Menu Text", "Icons.TableFill", "");
         // var gameplayTextNode = _nodeFactory.CreateOpenEditorNode("Gameplay Text", "Icons.TableFill", "");

From 01b97fa628e3011a5319e12b4061eeeddb5f891d Mon Sep 17 00:00:00 2001
From: Kace <41309226+DoubleTrio@users.noreply.github.com>
Date: Tue, 12 May 2026 19:54:35 -0400
Subject: [PATCH 24/51] ui improvements, some clean up

---
 RogueEssence.Editor.Avalonia/App.axaml.cs     |  13 +-
 .../Assets/Styles.axaml                       |   4 +-
 .../Assets/Themes.axaml                       |   6 +-
 .../DataEditor/CollectionBox.axaml            |  69 +--
 .../DataEditor/CollectionBoxViewModel.cs      |   7 +
 .../DataEditor/Editors/Editor.cs              |  13 +-
 .../RogueElements/PriorityListEditor.cs       |   3 +-
 .../Editors/RogueElements/TypeDictEditor.cs   |   1 +
 .../RogueEssence/CategorySpawnEditor.cs       |   4 +-
 .../RogueEssence/Tiles/AutoTileBaseEditor.cs  |   2 +-
 .../DataEditor/Editors/System/ArrayEditor.cs  |   4 +-
 .../Editors/System/DictionaryEditor.cs        |   5 +-
 .../Editors/System/HashSetEditor.cs           |   4 +-
 .../Editors/System/NoDupeListEditor.cs        |   5 +-
 .../DataEditor/PriorityListBox.axaml          | 107 ++--
 .../DataEditor/PriorityListBoxViewModel.cs    |  22 +-
 .../DataEditor/RangeDictBox.axaml             | 105 ++--
 .../DataEditor/RangeDictBoxViewModel.cs       |  11 +
 .../DataEditor/SpawnRangeListBox.axaml        | 135 +++--
 .../DataEditor/SpawnRangeListBoxViewModel.cs  |  27 +-
 .../EditorContext/EditorContext.cs            |  38 --
 .../EditorContext/NodeFactory.cs              | 147 +++--
 .../EditorContext/PageFactory.cs              |  54 +-
 .../RogueEssence.Editor.Avalonia.csproj       |   4 +
 .../Content/StringsEditViewModel.cs           |   1 +
 .../DevForm/DevTabConstantsViewModel.cs       | 281 +++++----
 .../ViewModels/New/DevFormViewModel.cs        | 549 ++++++++++++------
 .../New/Editors/AnimEditPageViewModel.cs      |   6 +
 .../New/Editors/DataListPageViewModel.cs      |  59 +-
 .../New/Editors/DevControlViewModel.cs        |   3 +-
 .../New/Editors/DevEditPageViewModel.cs       |   2 +-
 .../New/Editors/EditorPageViewModel.cs        |  41 +-
 .../New/Editors/GroundEditorPageViewModel.cs  |   3 +-
 .../New/Editors/ModInfoEditorViewModel.cs     |   4 +-
 .../New/Editors/RandomInfoPageViewModel.cs    |   3 +-
 .../New/Editors/ReflectedDataPageViewModel.cs | 104 +---
 .../New/Editors/SpeciesEditPageViewModel.cs   |  16 +-
 .../New/Editors/SpritePageViewModel.cs        |   2 +-
 .../New/Editors/StringEditPageViewModel.cs    | 211 +++++++
 .../New/Editors/ZoneEditorPageViewModel.cs    |   3 +-
 .../ViewModels/New/Nodes/NodeBase.cs          |  90 ++-
 .../Views/DevForm/DevTabScript.axaml          |   6 +-
 .../Views/New/DevForm.axaml                   |  54 +-
 .../New/Editors/ReflectedDataPageView.axaml   |  13 +-
 .../New/Editors/StringEditPageView.axaml      |  58 ++
 .../New/Editors/StringEditPageView.axaml.cs   |  28 +
 .../Views/New/TabBarView.axaml                | 164 +++---
 47 files changed, 1551 insertions(+), 940 deletions(-)
 create mode 100644 RogueEssence.Editor.Avalonia/ViewModels/New/Editors/AnimEditPageViewModel.cs
 create mode 100644 RogueEssence.Editor.Avalonia/ViewModels/New/Editors/StringEditPageViewModel.cs
 create mode 100644 RogueEssence.Editor.Avalonia/Views/New/Editors/StringEditPageView.axaml
 create mode 100644 RogueEssence.Editor.Avalonia/Views/New/Editors/StringEditPageView.axaml.cs

diff --git a/RogueEssence.Editor.Avalonia/App.axaml.cs b/RogueEssence.Editor.Avalonia/App.axaml.cs
index b655aef8..47c7a41a 100644
--- a/RogueEssence.Editor.Avalonia/App.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/App.axaml.cs
@@ -70,17 +70,7 @@ public static void AddCommonServices(this IServiceCollection collection)
             collection.AddTransient<SpeciesEditPageViewModel>();
             collection.AddTransient<DataListPageViewModel>();
             collection.AddTransient<ReflectedDataPageViewModel>();
-            
-            
-            var editorTypes = Assembly.GetExecutingAssembly()
-                .GetTypes()
-                .Where(t => typeof(IEditor).IsAssignableFrom(t) && !t.IsAbstract);
-
-            foreach (var type in editorTypes)
-            {
-                Console.WriteLine("Registering editor: " + type.Name);
-                collection.AddTransient(type);
-            }
+            collection.AddTransient<StringEditPageViewModel>();
         }
 
         private static void AddMapEditViewModels(this IServiceCollection services)
@@ -124,6 +114,7 @@ public static void RegisterPages(this IServiceProvider provider)
             pageFactory.Register<DevEditPageViewModel>();
             pageFactory.Register<SpeciesEditPageViewModel>();
             pageFactory.Register<DataListPageViewModel>();
+            pageFactory.Register<StringEditPageViewModel>();
         }
     }
 
diff --git a/RogueEssence.Editor.Avalonia/Assets/Styles.axaml b/RogueEssence.Editor.Avalonia/Assets/Styles.axaml
index 4821fcfa..184dffc4 100644
--- a/RogueEssence.Editor.Avalonia/Assets/Styles.axaml
+++ b/RogueEssence.Editor.Avalonia/Assets/Styles.axaml
@@ -249,7 +249,7 @@
         <Setter Property="Background" Value="{DynamicResource Brush.IconButton.BackgroundHovered}" />
     </Style>
     <Style Selector="Button.secondary:disabled">
-        <Setter Property="Opacity" Value=".65" />
+        <Setter Property="Opacity" Value=".30" />
     </Style>
     <Style Selector="Button.secondary ToolTip TextBlock">
         <Setter Property="Foreground" Value="{DynamicResource Brush.FG1}" />
@@ -269,7 +269,7 @@
         <Setter Property="Background" Value="Transparent" />
     </Style>
     <Style Selector="Button.flat.danger:disabled">
-        <Setter Property="Opacity" Value=".65" />
+        <Setter Property="Opacity" Value=".30" />
     </Style>
     <Style Selector="Button.flat.danger TextBlock">
         <Setter Property="Foreground" Value="{DynamicResource AccentButtonForeground}" />
diff --git a/RogueEssence.Editor.Avalonia/Assets/Themes.axaml b/RogueEssence.Editor.Avalonia/Assets/Themes.axaml
index d9952926..76c5737e 100644
--- a/RogueEssence.Editor.Avalonia/Assets/Themes.axaml
+++ b/RogueEssence.Editor.Avalonia/Assets/Themes.axaml
@@ -16,7 +16,7 @@
       <Color x:Key="Color.Border0">#FFCFCFCF</Color>
       <Color x:Key="Color.Border1">#FF898989</Color>
       <Color x:Key="Color.Border2">#FFCFCFCF</Color>
-      <Color x:Key="Color.Border3">#FFAFAFAF</Color>
+      <Color x:Key="Color.SubStackBorder">#FFCFCFCF</Color>
       <Color x:Key="Color.FlatButton.Background">#FFEBEBEB</Color>
       <Color x:Key="Color.FlatButton.BackgroundHovered">#FFDFDFDF</Color>
       <Color x:Key="Color.IconButton.Background">#FFEBEBEB</Color>
@@ -42,7 +42,7 @@
       <Color x:Key="Color.Border0">#FF181818</Color>
       <Color x:Key="Color.Border1">#FF7C7C7C</Color>
       <Color x:Key="Color.Border2">#FF404040</Color>
-      <Color x:Key="Color.Border3">#FF404040</Color>
+      <Color x:Key="Color.SubStackBorder">#FF404040</Color>
       <Color x:Key="Color.FlatButton.Background">#FF3A3A3A</Color>
       <Color x:Key="Color.FlatButton.BackgroundHovered">#FF4A4A4A</Color>
       <Color x:Key="Color.IconButton.Background">#FF5D5D5D</Color>
@@ -68,7 +68,7 @@
   <SolidColorBrush x:Key="Brush.Border0" Color="{DynamicResource Color.Border0}"/>
   <SolidColorBrush x:Key="Brush.Border1" Color="{DynamicResource Color.Border1}"/>
   <SolidColorBrush x:Key="Brush.Border2" Color="{DynamicResource Color.Border2}"/>
-  <SolidColorBrush x:Key="Brush.Border3" Color="{DynamicResource Color.Border3}"/>
+  <SolidColorBrush x:Key="Brush.SubStackBorder" Color="{DynamicResource Color.SubStackBorder}"/>
   <SolidColorBrush x:Key="Brush.DataGrid.HeaderBackground" Color="{DynamicResource Color.FlatButton.Background}"/>
   <SolidColorBrush x:Key="Brush.ListBox.Background" Color="{DynamicResource Color.ListBox.Background}"/>
   <SolidColorBrush x:Key="Brush.FlatButton.Background" Color="{DynamicResource Color.FlatButton.Background}"/>
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/CollectionBox.axaml b/RogueEssence.Editor.Avalonia/DataEditor/CollectionBox.axaml
index f0815285..d5f4aafd 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/CollectionBox.axaml
+++ b/RogueEssence.Editor.Avalonia/DataEditor/CollectionBox.axaml
@@ -18,7 +18,7 @@
                  CornerRadius="4"
                  HorizontalAlignment="Stretch"
                  Background="{DynamicResource Brush.ListBox.Background}"
-                 Grid.RowSpan="2" Grid.ColumnSpan="2" MinHeight="100">
+                 Grid.RowSpan="2" Grid.ColumnSpan="2">
             <ListBox.ItemTemplate>
                 <DataTemplate>
                     <TextBlock Text="{Binding Path=DisplayValue}" />
@@ -28,49 +28,30 @@
                 <StaticResource ResourceKey="CompactListBoxItem" />
             </ListBox.ItemContainerTheme>
         </ListBox>
-        <!-- <ListBox Name="lbxItems" -->
-        <!--          ItemsSource="{Binding Collection}" -->
-        <!--          SelectedIndex="{Binding SelectedIndex}" -->
-        <!--          DoubleTapped="doubleClickStart" -->
-        <!--          PointerReleased="lbxCollection_DoubleClick" -->
-        <!--          Margin="4" -->
-        <!--          Grid.RowSpan="2" -->
-        <!--          Grid.ColumnSpan="2" -->
-        <!--          MinHeight="170" -->
-        <!--          VerticalAlignment="Stretch"> -->
-        <!--     <ListBox.ItemContainerTheme> -->
-        <!--         <StaticResource ResourceKey="CompactListBoxItem" /> -->
-        <!--     </ListBox.ItemContainerTheme> -->
-        <!--     <ListBox.ItemTemplate> -->
-        <!--         <DataTemplate> -->
-        <!--             <TextBlock Text="{Binding Path=DisplayValue}" /> -->
-        <!--         </DataTemplate> -->
-        <!--     </ListBox.ItemTemplate> -->
-        <!-- </ListBox> -->
-        <StackPanel Grid.Row="0" Grid.RowSpan="2" Grid.Column="2" Margin="10,0,0,0">
-            <Button x:Name="CollectionBoxAddButton" PointerReleased="CollectionBoxAddButton_OnPointerReleased"
-                    Classes="secondary" Margin="0,0" Padding="4,3">
-                <Path Width="10" Height="10" Margin="0,2,0,0" Data="{StaticResource Icons.Plus}" />
-            </Button>
-            <Button Command="{Binding DeleteItemAsync}"
-                    IsEnabled="{Binding HasSelection}"
-                    Classes="secondary" Margin="0,0" Padding="4,3">
-                <Path Width="10" Height="10" Data="{StaticResource Icons.Minus}" />
-            </Button>
-        </StackPanel>
-
-        <StackPanel Grid.Row="1" Grid.RowSpan="1" Grid.Column="2" Margin="10,0,0,0">
-            <Button Command="{Binding MoveUp}"
-                    IsEnabled="{Binding CanMoveUp}"
-                    Classes="secondary" Margin="0,0" Padding="4,3">
-                <Path Width="10" Height="10" Margin="0,2,0,0" Data="{StaticResource Icons.CaretUpFill}" />
-            </Button>
-            <Button 
-                    Command="{Binding MoveDown}"
-                    IsEnabled="{Binding CanMoveDown}"
-                    Classes="secondary" Margin="0,0" Padding="4,3">
-                <Path Width="10" Height="10" Data="{StaticResource Icons.CaretDownFill}" />
-            </Button>
+        <StackPanel Grid.Row="0" Grid.RowSpan="2" Grid.Column="2" Margin="10,0,0,0" Spacing="30">
+            <StackPanel>
+                <Button x:Name="CollectionBoxAddButton" PointerReleased="CollectionBoxAddButton_OnPointerReleased"
+                        Classes="secondary" Margin="0,0" Padding="4,3">
+                    <Path Width="10" Height="10" Margin="0,2,0,0" Data="{StaticResource Icons.Plus}" />
+                </Button>
+                <Button Command="{Binding DeleteItemAsync}"
+                        IsEnabled="{Binding HasSelection}"
+                        Classes="secondary" Margin="0,0" Padding="4,3">
+                    <Path Width="10" Height="10" Data="{StaticResource Icons.Minus}" />
+                </Button>
+            </StackPanel>
+            <StackPanel>
+                <Button Command="{Binding MoveUp}"
+                        IsEnabled="{Binding CanMoveUp}"
+                        Classes="secondary" Margin="0,0" Padding="4,3">
+                    <Path Width="10" Height="10" Margin="0,2,0,0" Data="{StaticResource Icons.CaretUpFill}" />
+                </Button>
+                <Button Command="{Binding MoveDown}"
+                        IsEnabled="{Binding CanMoveDown}"
+                        Classes="secondary" Margin="0,0" Padding="4,3">
+                    <Path Width="10" Height="10" Data="{StaticResource Icons.CaretDownFill}" />
+                </Button>
+            </StackPanel>
         </StackPanel>
     </Grid>
 </UserControl>
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/CollectionBoxViewModel.cs b/RogueEssence.Editor.Avalonia/DataEditor/CollectionBoxViewModel.cs
index 4286098a..88425deb 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/CollectionBoxViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/CollectionBoxViewModel.cs
@@ -98,6 +98,12 @@ public CollectionBoxViewModel(IDialogService dialogService, StringConv conv)
             _dialogService = dialogService;
             StringConv = conv;
             Collection = new ObservableCollection<ListElement>();
+            Collection.CollectionChanged += (_, _) =>
+            {
+                this.RaisePropertyChanged(nameof(CanMoveUp));
+                this.RaisePropertyChanged(nameof(CanMoveDown));
+                this.RaisePropertyChanged(nameof(HasSelection));
+            }; 
             this.WhenAnyValue(x => x.SelectedIndex).Subscribe(_ =>
             {
                 this.RaisePropertyChanged(nameof(CanMoveUp));
@@ -105,6 +111,7 @@ public CollectionBoxViewModel(IDialogService dialogService, StringConv conv)
                 this.RaisePropertyChanged(nameof(HasSelection));
             });
         }
+        
         public void MoveDown()
         {
             if (SelectedIndex > -1 && SelectedIndex < Collection.Count - 1)
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/Editor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/Editor.cs
index 8b157be3..5568606e 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/Editor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/Editor.cs
@@ -11,7 +11,9 @@
 using System.Reflection;
 using System.Text;
 using System.Xml.Linq;
+using Avalonia.Media;
 using RogueEssence.Dev.Services;
+using RogueEssence.Dev.Utility;
 
 namespace RogueEssence.Dev
 {
@@ -330,9 +332,11 @@ void IEditor.LoadClassControls(StackPanel control, string parent, Type parentTyp
                     
                                     
                     string title = DataEditor.GetWindowTitle(parent, name, element, type, ReflectionExt.GetPassableAttributes(0, attributes));
-                    NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(title, vm.Node.Icon);
+                    NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(title, vm.Node.Icon, vm.Node);
                     vm.Node.AddNodeIfNotExists(node);
                     
+                    NodeHelper.ExpandParents(node, true);
+                    
                     ReflectedDataPageViewModel newEditor = _context.PageFactory.CreatePage<ReflectedDataPageViewModel>(node);
                     newEditor.SetPageTitle(title, vm.Node.Icon);
 
@@ -480,7 +484,8 @@ void IEditor.LoadClassControls(StackPanel control, string parent, Type parentTyp
                     {
                         Border border = new Border();
                         border.BorderThickness = new Thickness(1);
-                        border.BorderBrush = Avalonia.Media.Brushes.LightGray;
+                        border.CornerRadius = new CornerRadius(4);
+                        border.BorderBrush = Application.Current?.FindResource("Brush.SubStackBorder") as IBrush;
                         border.Margin = new Thickness(2);
                         control.Children.Add(border);
 
@@ -570,7 +575,9 @@ void IEditor.LoadClassControls(StackPanel control, string parent, Type parentTyp
                     {
                         Border border = new Border();
                         border.BorderThickness = new Thickness(1);
-                        border.BorderBrush = Avalonia.Media.Brushes.LightGray;
+                        border.CornerRadius = new CornerRadius(4);
+                        // border.BorderBrush = Avalonia.Media.Brushes.LightGray;
+                        border.BorderBrush = Application.Current?.FindResource("Brush.SubStackBorder") as IBrush;
                         border.Margin = new Thickness(2);
                         control.Children.Add(border);
 
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/PriorityListEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/PriorityListEditor.cs
index 92bbeea0..94d09247 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/PriorityListEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/PriorityListEditor.cs
@@ -66,7 +66,7 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
 
                 NodeHelper.ExpandParents(node, true);
                 ReflectedDataPageViewModel newEditor = _context.PageFactory.CreatePage<ReflectedDataPageViewModel>(node);
-                newEditor.SetPageTitle(title, pageViewModel.Node.Icon);
+                newEditor.SetPageTitle(elementName, pageViewModel.Node.Icon);
 
                 newEditor.OnLoadAction = (StackPanel stack) =>
                 {
@@ -125,6 +125,7 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
                 expander.IsExpanded = member.Count > 0;
                 expander.Content = lbxValue;
                 expander.HorizontalAlignment = HorizontalAlignment.Stretch;
+                expander.Padding = new Thickness(0);
                 
                 control.Children.Add(expander);
             }
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/TypeDictEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/TypeDictEditor.cs
index 8cc98d0f..1ea40404 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/TypeDictEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/TypeDictEditor.cs
@@ -127,6 +127,7 @@ await MessageBoxWindowView.Show(_context.DialogService, "Cannot add duplicate st
                 expander.IsExpanded = member.Count > 0;
                 expander.HorizontalAlignment = HorizontalAlignment.Stretch;
                 expander.Content = lbxValue;
+                expander.Padding = new Thickness(0);
                 control.Children.Add(expander);
             }
             else
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/CategorySpawnEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/CategorySpawnEditor.cs
index de103c17..798524e5 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/CategorySpawnEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/CategorySpawnEditor.cs
@@ -261,8 +261,8 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
                 string elementName = name + "[" + index + "]";
                 string title = DataEditor.GetWindowTitle(parent, elementName, key, keyType, ReflectionExt.GetPassableAttributes(1, attributes));
 
-                NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(title, pageViewModel.Node.Icon);
-                pageViewModel.Node.SubNodes.Add(node);
+                NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(elementName, pageViewModel.Node.Icon);
+                pageViewModel.Node.AddNodeIfNotExists(node);
 
                 NodeHelper.ExpandParents(node, true);
                 ReflectedDataPageViewModel newEditor = _context.PageFactory.CreatePage<ReflectedDataPageViewModel>(node);
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Tiles/AutoTileBaseEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Tiles/AutoTileBaseEditor.cs
index 5623074a..531d946c 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Tiles/AutoTileBaseEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Tiles/AutoTileBaseEditor.cs
@@ -35,7 +35,7 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
                 elementAttr[0] = new AnimAttribute(0, "Tile");
 
                 NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(title, pageViewModel.Node.Icon);
-                pageViewModel.Node.SubNodes.Add(node);
+                pageViewModel.Node.AddNodeIfNotExists(node);
 
                 NodeHelper.ExpandParents(node, true);
                 ReflectedDataPageViewModel newEditor = _context.PageFactory.CreatePage<ReflectedDataPageViewModel>(node);
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/ArrayEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/ArrayEditor.cs
index 9b752903..6eb6c7dc 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/ArrayEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/ArrayEditor.cs
@@ -78,8 +78,8 @@ private CollectionBoxViewModel createViewModel(StackPanel control, string parent
                 string elementName = name + "[" + index + "]";
                 string title = DataEditor.GetWindowTitle(parent, elementName, element, elementType, ReflectionExt.GetPassableAttributes(0, attributes));
 
-                NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(title, pageViewModel.Node.Icon);
-                pageViewModel.Node.SubNodes.Add(node);
+                NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(elementName, pageViewModel.Node.Icon);
+                pageViewModel.Node.AddNodeIfNotExists(node);
 
                 NodeHelper.ExpandParents(node, true);
                 ReflectedDataPageViewModel newEditor = _context.PageFactory.CreatePage<ReflectedDataPageViewModel>(node);
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/DictionaryEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/DictionaryEditor.cs
index 0e8bc824..697e2551 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/DictionaryEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/DictionaryEditor.cs
@@ -91,9 +91,8 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
                     ReflectionExt.GetPassableAttributes(1, attributes));
 
                 NodeBase node =
-                    _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(title,
-                        pageViewModel.Node.Icon);
-                pageViewModel.Node.SubNodes.Add(node);
+                    _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(elementName, pageViewModel.Node.Icon);
+                pageViewModel.Node.AddNodeIfNotExists(node);
 
                 NodeHelper.ExpandParents(node, true);
                 ReflectedDataPageViewModel
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/HashSetEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/HashSetEditor.cs
index 11157cef..0d3d30f9 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/HashSetEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/HashSetEditor.cs
@@ -50,8 +50,8 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
                 string elementName = name + "[" + index + "]";
                 string title = DataEditor.GetWindowTitle(parent, elementName, element, elementType, ReflectionExt.GetPassableAttributes(1, attributes));
 
-                NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(title, pageViewModel.Node.Icon);
-                pageViewModel.Node.SubNodes.Add(node);
+                NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(elementName, pageViewModel.Node.Icon);
+                pageViewModel.Node.AddNodeIfNotExists(node);
 
                 NodeHelper.ExpandParents(node, true);
                 ReflectedDataPageViewModel newEditor = _context.PageFactory.CreatePage<ReflectedDataPageViewModel>(node);
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/NoDupeListEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/NoDupeListEditor.cs
index 4c95252c..f951f7df 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/NoDupeListEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/NoDupeListEditor.cs
@@ -63,9 +63,8 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
                     ReflectionExt.GetPassableAttributes(1, attributes));
 
                 NodeBase node =
-                    _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(title,
-                        pageViewModel.Node.Icon);
-                pageViewModel.Node.SubNodes.Add(node);
+                    _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(elementName, pageViewModel.Node.Icon);
+                pageViewModel.Node.AddNodeIfNotExists(node);
 
                 NodeHelper.ExpandParents(node, true);
                 ReflectedDataPageViewModel
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/PriorityListBox.axaml b/RogueEssence.Editor.Avalonia/DataEditor/PriorityListBox.axaml
index e9b8a390..9c93b9d2 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/PriorityListBox.axaml
+++ b/RogueEssence.Editor.Avalonia/DataEditor/PriorityListBox.axaml
@@ -9,54 +9,59 @@
              VerticalAlignment="Stretch"
              xmlns:converters="clr-namespace:RogueEssence.Dev.Converters"
              x:Class="RogueEssence.Dev.Views.PriorityListBox">
-  <UserControl.Resources>
-  </UserControl.Resources>
-  <Design.DataContext>
-    <vm:PriorityListBoxViewModel/>
-  </Design.DataContext>
-  <Grid RowDefinitions="*, 40, *" ColumnDefinitions="*, *, 30">
-    <DataGrid 
-      Name="gridItems" 
-      IsReadOnly="true" 
-      HorizontalAlignment="Stretch"
-      ItemsSource="{Binding Collection}" 
-      SelectedIndex="{Binding SelectedIndex, Mode=TwoWay}"
-      DoubleTapped="doubleClickStart" 
-      PointerReleased="lbxCollection_DoubleClick" 
-      Margin="4" Grid.RowSpan="3" 
-      Grid.ColumnSpan="2" 
-      MinHeight="50"
-      x:DataType="vm:PriorityElement"
-      Classes="default"
-    >
-      <DataGrid.Columns>
-        <DataGridTextColumn Header="Priority"
-                            Binding="{Binding PriorityObj}"
-                            Width="80" />
-        <DataGridTextColumn Header="Value"
-                            Binding="{Binding Path=DisplayValue}"
-                            Width="*" />
-      </DataGrid.Columns>
-    </DataGrid>
-    
-    <StackPanel Grid.Row="0" Grid.RowSpan="3" Grid.Column="2" Margin="10, 0, 0, 0">
-      <Button x:Name="PriorityListBoxAddButton" PointerReleased="PriorityListBoxAddButton_OnPointerReleased" Classes="secondary" Margin="0, 0" Padding="4, 3">
-        <Path Width="10" Height="10" Margin="0, 2,0,0" Data="{StaticResource Icons.Plus}" />
-      </Button>
-      <Button Command="{Binding btnDelete_Click}" Classes="secondary" Margin="0, 0" Padding="4, 3">
-        <Path Width="10" Height="10" Margin="0,0,0,0" Data="{StaticResource Icons.Minus}" />
-      </Button>
-    </StackPanel>
-    <StackPanel Grid.Row="1" Grid.RowSpan="2" Grid.Column="2" Margin="10, 0, 0, 0">
-      <Button Command="{Binding btnUp_Click}" Classes="secondary" Margin="0, 0" Padding="4,3, 4, 3">
-        <Path Width="10" Height="10" Margin="0, 2,0,0" Data="{StaticResource Icons.CaretUpFill}" />
-      </Button>
-      <Button x:Name="PriorityListBoxEditButton" PointerReleased="PriorityListBoxEditButton_OnPointerReleased" Classes="secondary" Margin="0, 0" Padding="4,3, 4, 3">
-        <Path Width="10" Height="10" Margin="0,0,0,0" Data="{StaticResource Icons.SortDescendingFill}" />
-      </Button>
-      <Button Command="{Binding btnDown_Click}" Classes="secondary" Margin="0, 0" Padding="4,3, 4, 3">
-        <Path Width="10" Height="10" Margin="0,0,0,0" Data="{StaticResource Icons.CaretDownFill}" />
-      </Button>
-    </StackPanel>
-  </Grid>
-</UserControl>
+    <UserControl.Resources>
+    </UserControl.Resources>
+    <Design.DataContext>
+        <vm:PriorityListBoxViewModel />
+    </Design.DataContext>
+    <Grid RowDefinitions="*, 40, *" ColumnDefinitions="*, *, 30">
+        <DataGrid
+            Name="gridItems"
+            IsReadOnly="true"
+            HorizontalAlignment="Stretch"
+            ItemsSource="{Binding Collection}"
+            SelectedIndex="{Binding SelectedIndex, Mode=TwoWay}"
+            DoubleTapped="doubleClickStart"
+            PointerReleased="lbxCollection_DoubleClick"
+            Margin="4" Grid.RowSpan="3"
+            Grid.ColumnSpan="2"
+            MinHeight="50"
+            x:DataType="vm:PriorityElement"
+            Classes="default">
+            <DataGrid.Columns>
+                <DataGridTextColumn Header="Priority"
+                                    Binding="{Binding PriorityObj}"
+                                    Width="80" />
+                <DataGridTextColumn Header="Value"
+                                    Binding="{Binding Path=DisplayValue}"
+                                    Width="*" />
+            </DataGrid.Columns>
+        </DataGrid>
+
+        <StackPanel Grid.Row="0" Grid.RowSpan="3" Grid.Column="2" Margin="10, 0, 0, 0"
+                    Spacing="30">
+            <StackPanel>
+                <Button x:Name="PriorityListBoxAddButton" PointerReleased="PriorityListBoxAddButton_OnPointerReleased"
+                        Classes="secondary" Margin="0, 0" Padding="4, 3">
+                    <Path Width="10" Height="10" Margin="0, 2,0,0" Data="{StaticResource Icons.Plus}" />
+                </Button>
+                <Button Command="{Binding btnDelete_Click}" IsEnabled="{Binding HasSelection}" Classes="secondary" Margin="0, 0" Padding="4, 3">
+                    <Path Width="10" Height="10" Margin="0,0,0,0" Data="{StaticResource Icons.Minus}" />
+                </Button>
+            </StackPanel>
+            <StackPanel>
+                <Button Command="{Binding btnUp_Click}" IsEnabled="{Binding CanMoveUp}" Classes="secondary" Margin="0, 0" Padding="4,3, 4, 3">
+                    <Path Width="10" Height="10" Margin="0, 2,0,0" Data="{StaticResource Icons.CaretUpFill}" />
+                </Button>
+                <Button x:Name="PriorityListBoxEditButton"
+                        PointerReleased="PriorityListBoxEditButton_OnPointerReleased" IsEnabled="{Binding HasSelection}" Classes="secondary" Margin="0, 0"
+                        Padding="4,3, 4, 3">
+                    <Path Width="10" Height="10" Margin="0,0,0,0" Data="{StaticResource Icons.SortDescendingFill}" />
+                </Button>
+                <Button Command="{Binding btnDown_Click}" IsEnabled="{Binding CanMoveDown}" Classes="secondary" Margin="0, 0" Padding="4,3, 4, 3">
+                    <Path Width="10" Height="10" Margin="0,0,0,0" Data="{StaticResource Icons.CaretDownFill}" />
+                </Button>
+            </StackPanel>
+        </StackPanel>
+    </Grid>
+</UserControl>
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/PriorityListBoxViewModel.cs b/RogueEssence.Editor.Avalonia/DataEditor/PriorityListBoxViewModel.cs
index 4c54ca4c..5ead0df1 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/PriorityListBoxViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/PriorityListBoxViewModel.cs
@@ -50,6 +50,9 @@ public PriorityElement(StringConv conv, Priority priority, object value)
 
     public class PriorityListBoxViewModel : ViewModelBase
     {
+        public bool CanMoveUp => SelectedIndex > 0;
+        public bool CanMoveDown => SelectedIndex >= 0 && SelectedIndex < Collection.Count - 1;
+        public bool HasSelection => SelectedIndex >= 0 && SelectedIndex < Collection.Count;
         public ObservableCollection<PriorityElement> Collection { get; }
 
         private int selectedIndex;
@@ -79,6 +82,21 @@ public PriorityListBoxViewModel(IDialogService dialogService, StringConv conv)
         {
             StringConv = conv;
             Collection = new ObservableCollection<PriorityElement>();
+            _dialogService = dialogService;
+            
+            this.WhenAnyValue(x => x.SelectedIndex).Subscribe(_ =>
+            {
+                this.RaisePropertyChanged(nameof(CanMoveUp));
+                this.RaisePropertyChanged(nameof(CanMoveDown));
+                this.RaisePropertyChanged(nameof(HasSelection));
+            });
+
+            Collection.CollectionChanged += (_, _) =>
+            {
+                this.RaisePropertyChanged(nameof(CanMoveUp));
+                this.RaisePropertyChanged(nameof(CanMoveDown));
+                this.RaisePropertyChanged(nameof(HasSelection));
+            };
         }
 
         public IPriorityList GetList(Type type)
@@ -182,15 +200,17 @@ public void btnAdd_Click(bool advancedEdit)
 
         public async void btnDelete_Click()
         {
+    
             if (SelectedIndex > -1 && SelectedIndex < Collection.Count)
             {
                 if (ConfirmDelete)
                 {
+                    Console.WriteLine(_dialogService);
+                    
                     MessageBoxWindowView.MessageBoxResult result = await MessageBoxWindowView.Show(_dialogService,"Are you sure you want to delete this item:\n" + Collection[SelectedIndex].DisplayValue, "Confirm Delete", MessageBoxWindowView.MessageBoxButtons.YesNo);
                     if (result == MessageBoxWindowView.MessageBoxResult.No)
                         return;
                 }
-
                 Collection.RemoveAt(SelectedIndex);
             }
         }
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/RangeDictBox.axaml b/RogueEssence.Editor.Avalonia/DataEditor/RangeDictBox.axaml
index 4ddc66f2..3a46a8f4 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/RangeDictBox.axaml
+++ b/RogueEssence.Editor.Avalonia/DataEditor/RangeDictBox.axaml
@@ -5,6 +5,8 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              mc:Ignorable="d"
              xmlns:converters="clr-namespace:RogueEssence.Dev.Converters"
+             HorizontalAlignment="Stretch"
+             VerticalAlignment="Stretch"
              x:Class="RogueEssence.Dev.Views.RangeDictBox">
   <Design.DataContext>
     <vm:RangeDictBoxViewModel/>
@@ -12,58 +14,55 @@
   <UserControl.Resources>
     <converters:ValidIdxConverter x:Key="ValidIdxConverter"/>
   </UserControl.Resources>
-  <Grid>
-    <Grid.RowDefinitions>
-      <RowDefinition/>
-      <RowDefinition Height="42"/>
-      <RowDefinition Height="36"/>
-    </Grid.RowDefinitions>
-    <Grid.ColumnDefinitions>
-      <ColumnDefinition/>
-    </Grid.ColumnDefinitions>
-    <Grid Grid.Row="0">
-      <Grid.RowDefinitions>
-        <RowDefinition/>
-      </Grid.RowDefinitions>
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition/>
-      </Grid.ColumnDefinitions>
-      <DataGrid Name="gridItems" IsReadOnly="true" ItemsSource="{Binding Collection}" SelectedIndex="{Binding CurrentElement, Mode=TwoWay}" DoubleTapped="doubleClickStart" PointerReleased="lbxCollection_DoubleClick" Margin="4" Grid.RowSpan="2" Grid.ColumnSpan="2" MinHeight="60">
-        <DataGrid.Columns>
-          <DataGridTextColumn Header="Start"
-                        Binding="{Binding DisplayStart}" />
-          <DataGridTextColumn Header="End"
-                        Binding="{Binding DisplayEnd}" />
-          <DataGridTextColumn Header="Value"
-                              Binding="{Binding Path=DisplayValue}" />
-        </DataGrid.Columns>
-      </DataGrid>
-    </Grid>
-    <Grid Grid.Row="1">
-      <Grid.RowDefinitions>
-        <RowDefinition/>
-      </Grid.RowDefinitions>
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition Width="30"/>
-        <ColumnDefinition/>
-        <ColumnDefinition Width="30"/>
-        <ColumnDefinition/>
-      </Grid.ColumnDefinitions>
-      <TextBlock VerticalAlignment="Center" Margin="4" Grid.Row="0" Grid.Column="0">Start:</TextBlock>
-      <NumericUpDown IsEnabled="{Binding Path=CurrentElement, Converter={StaticResource ValidIdxConverter}, ConverterParameter=false}" Value="{Binding CurrentStart}" ValueChanged="nudStart_ValueChanged" Margin="4" Grid.Row="0" Grid.Column="1"/>
-      <TextBlock VerticalAlignment="Center" Margin="4" Grid.Row="0" Grid.Column="2">End:</TextBlock>
-      <NumericUpDown IsEnabled="{Binding Path=CurrentElement, Converter={StaticResource ValidIdxConverter}, ConverterParameter=false}" Value="{Binding CurrentEnd}" ValueChanged="nudEnd_ValueChanged" Margin="4" Grid.Row="0" Grid.Column="3"/>
-    </Grid>
-    <Grid Grid.Row="2">
-      <Grid.RowDefinitions>
-        <RowDefinition/>
-      </Grid.RowDefinitions>
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition/>
-        <ColumnDefinition/>
-      </Grid.ColumnDefinitions>
-      <Button Command="{Binding btnAdd_Click}" Margin="4" Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="1">Add</Button>
-      <Button Command="{Binding btnDelete_Click}" Margin="4" Grid.Row="0" Grid.Column="1" Grid.ColumnSpan="1">Delete</Button>
+
+  <Grid RowDefinitions="*, 42" ColumnDefinitions="*, 30">
+
+    <DataGrid Name="gridItems"
+              IsReadOnly="true"
+              HorizontalAlignment="Stretch"
+              ItemsSource="{Binding Collection}"
+              SelectedIndex="{Binding CurrentElement, Mode=TwoWay}"
+              DoubleTapped="doubleClickStart"
+              PointerReleased="lbxCollection_DoubleClick"
+              Margin="4"
+              Grid.Row="0"
+              Grid.Column="0"
+              MinHeight="60"
+              Classes="default">
+      <DataGrid.Columns>
+        <DataGridTextColumn Header="Start" Binding="{Binding DisplayStart}" Width="60" />
+        <DataGridTextColumn Header="End"   Binding="{Binding DisplayEnd}"   Width="60" />
+        <DataGridTextColumn Header="Value" Binding="{Binding Path=DisplayValue}" Width="*" />
+      </DataGrid.Columns>
+    </DataGrid>
+
+    <StackPanel Grid.Row="0" Grid.RowSpan="2" Grid.Column="1" Margin="10, 0, 0, 0" VerticalAlignment="Top">
+      <Button x:Name="RangeDictBoxAddButton"
+              Command="{Binding btnAdd_Click}"
+              Classes="secondary" Margin="0, 0" Padding="4, 3">
+        <Path Width="10" Height="10" Margin="0, 2, 0, 0" Data="{StaticResource Icons.Plus}" />
+      </Button>
+      <Button Command="{Binding btnDelete_Click}"
+              IsEnabled="{Binding HasSelection}"
+              Classes="secondary" Margin="0, 0" Padding="4, 3">
+        <Path Width="10" Height="10" Margin="0, 0, 0, 0" Data="{StaticResource Icons.Minus}" />
+      </Button>
+    </StackPanel>
+
+    <Grid Grid.Row="1" Grid.Column="0" ColumnDefinitions="Auto, *, Auto, *">
+      <TextBlock VerticalAlignment="Center" Margin="4,0" Grid.Column="0">Start:</TextBlock>
+      <NumericUpDown IsEnabled="{Binding Path=CurrentElement, Converter={StaticResource ValidIdxConverter}, ConverterParameter=false}"
+                     Value="{Binding CurrentStart}"
+                     Increment="1"
+                     ValueChanged="nudStart_ValueChanged"
+                     Margin="4" Grid.Column="1"/>
+      <TextBlock VerticalAlignment="Center" Margin="4,0" Grid.Column="2">End:</TextBlock>
+      <NumericUpDown IsEnabled="{Binding Path=CurrentElement, Converter={StaticResource ValidIdxConverter}, ConverterParameter=false}"
+                     Value="{Binding CurrentEnd}"
+                     Increment="1"
+                     ValueChanged="nudEnd_ValueChanged"
+                     Margin="4" Grid.Column="3"/>
     </Grid>
+
   </Grid>
-</UserControl>
+</UserControl>
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/RangeDictBoxViewModel.cs b/RogueEssence.Editor.Avalonia/DataEditor/RangeDictBoxViewModel.cs
index 76ffc2fd..152bf01c 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/RangeDictBoxViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/RangeDictBoxViewModel.cs
@@ -166,11 +166,22 @@ public int AddMax
         public bool ConfirmDelete;
 
         private IDialogService _dialogService;
+        public bool HasSelection => CurrentElement >= 0 && CurrentElement < Collection.Count;
+
         public RangeDictBoxViewModel(IDialogService dialogService, StringConv conv)
         {
             _dialogService = dialogService;
             StringConv = conv;
             Collection = new ObservableCollection<RangeDictElement>();
+            this.WhenAnyValue(x => x.CurrentElement).Subscribe(_ =>
+            {
+                this.RaisePropertyChanged(nameof(HasSelection));
+            });
+
+            Collection.CollectionChanged += (_, _) =>
+            {
+                this.RaisePropertyChanged(nameof(HasSelection));
+            };
         }
 
         public T GetDict<T>() where T : IRangeDict
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/SpawnRangeListBox.axaml b/RogueEssence.Editor.Avalonia/DataEditor/SpawnRangeListBox.axaml
index 2d6b4288..16345300 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/SpawnRangeListBox.axaml
+++ b/RogueEssence.Editor.Avalonia/DataEditor/SpawnRangeListBox.axaml
@@ -5,6 +5,8 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              mc:Ignorable="d"
              xmlns:converters="clr-namespace:RogueEssence.Dev.Converters"
+             HorizontalAlignment="Stretch"
+             VerticalAlignment="Stretch"
              x:Class="RogueEssence.Dev.Views.SpawnRangeListBox">
   <Design.DataContext>
     <vm:SpawnRangeListBoxViewModel/>
@@ -13,68 +15,75 @@
     <converters:ValidIdxConverter x:Key="ValidIdxConverter"/>
     <converters:PercentConverter x:Key="PercentConverter"/>
   </UserControl.Resources>
-  <Grid>
-    <Grid.RowDefinitions>
-      <RowDefinition/>
-      <RowDefinition Height="42"/>
-      <RowDefinition Height="36"/>
-    </Grid.RowDefinitions>
-    <Grid.ColumnDefinitions>
-      <ColumnDefinition/>
-    </Grid.ColumnDefinitions>
-    <Grid Grid.Row="0">
-      <Grid.RowDefinitions>
-        <RowDefinition/>
-        <RowDefinition/>
-      </Grid.RowDefinitions>
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition/>
-        <ColumnDefinition Width="40"/>
-      </Grid.ColumnDefinitions>
-      <DataGrid Name="gridItems" IsReadOnly="true" ItemsSource="{Binding Collection}" SelectedIndex="{Binding CurrentElement, Mode=TwoWay}" DoubleTapped="doubleClickStart" PointerReleased="gridCollection_DoubleClick" Margin="4" Grid.RowSpan="2" Grid.ColumnSpan="1" MinHeight="50">
-        <DataGrid.Columns>
-          <DataGridTextColumn Header="Start"
-                        Binding="{Binding DisplayStart}" />
-          <DataGridTextColumn Header="End"
-                        Binding="{Binding DisplayEnd}" />
-          <DataGridTextColumn Header="Weight"
-                        Binding="{Binding Weight}" />
-          <DataGridTextColumn Header="Value"
-                              Binding="{Binding Path=DisplayValue}" />
-        </DataGrid.Columns>
-      </DataGrid>
-      <Button Command="{Binding btnUp_Click}" Margin="4" Grid.Row="0" Grid.Column="1">^</Button>
-      <Button Command="{Binding btnDown_Click}" Margin="4" Grid.Row="1" Grid.Column="1">v</Button>
-    </Grid>
-    <Grid Grid.Row="1">
-      <Grid.RowDefinitions>
-        <RowDefinition/>
-      </Grid.RowDefinitions>
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition Width="30"/>
-        <ColumnDefinition/>
-        <ColumnDefinition Width="30"/>
-        <ColumnDefinition/>
-        <ColumnDefinition Width="40"/>
-        <ColumnDefinition/>
-      </Grid.ColumnDefinitions>
-      <TextBlock VerticalAlignment="Center" Margin="4" Grid.Row="0" Grid.Column="0">Start:</TextBlock>
-      <NumericUpDown IsEnabled="{Binding Path=CurrentElement, Converter={StaticResource ValidIdxConverter}, ConverterParameter=false}" Value="{Binding CurrentStart}" ValueChanged="nudStart_ValueChanged" Margin="4" Grid.Row="0" Grid.Column="1"/>
-      <TextBlock VerticalAlignment="Center" Margin="4" Grid.Row="0" Grid.Column="2">End:</TextBlock>
-      <NumericUpDown IsEnabled="{Binding Path=CurrentElement, Converter={StaticResource ValidIdxConverter}, ConverterParameter=false}" Value="{Binding CurrentEnd}" ValueChanged="nudEnd_ValueChanged" Margin="4" Grid.Row="0" Grid.Column="3"/>
-      <TextBlock VerticalAlignment="Center" Margin="4" Grid.Row="0" Grid.Column="4">Weight:</TextBlock>
-      <NumericUpDown IsEnabled="{Binding Path=CurrentElement, Converter={StaticResource ValidIdxConverter}, ConverterParameter=false}" Value="{Binding CurrentWeight}" Minimum="1" Margin="4" Grid.Row="0" Grid.Column="5"/>
-    </Grid>
-    <Grid Grid.Row="2">
-      <Grid.RowDefinitions>
-        <RowDefinition/>
-      </Grid.RowDefinitions>
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition/>
-        <ColumnDefinition/>
-      </Grid.ColumnDefinitions>
-      <Button x:Name="SpawnRangeListBoxAddButton" PointerReleased="SpawnRangeListBoxAddButton_OnPointerReleased" Margin="4" Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="1">Add</Button>
-      <Button Command="{Binding btnDelete_Click}" Margin="4" Grid.Row="0" Grid.Column="1" Grid.ColumnSpan="1">Delete</Button>
+
+  <Grid RowDefinitions="*, 42" ColumnDefinitions="*, 30">
+
+    <!-- DataGrid: row 0 only, first column -->
+    <DataGrid Name="gridItems"
+              IsReadOnly="true"
+              HorizontalAlignment="Stretch"
+              ItemsSource="{Binding Collection}"
+              SelectedIndex="{Binding CurrentElement, Mode=TwoWay}"
+              DoubleTapped="doubleClickStart"
+              PointerReleased="gridCollection_DoubleClick"
+              Margin="4"
+              Grid.Row="0"
+              Grid.Column="0"
+              MinHeight="50"
+              Classes="default">
+      <DataGrid.Columns>
+        <DataGridTextColumn Header="Start"  Binding="{Binding DisplayStart}" Width="70" />
+        <DataGridTextColumn Header="End"    Binding="{Binding DisplayEnd}"   Width="70" />
+        <DataGridTextColumn Header="Weight" Binding="{Binding Weight}"       Width="70" />
+        <DataGridTextColumn Header="Value"  Binding="{Binding Path=DisplayValue}" Width="*" />
+      </DataGrid.Columns>
+    </DataGrid>
+
+
+    <StackPanel Grid.Row="0" Grid.RowSpan="2" Grid.Column="1" Margin="10, 0, 0, 0" VerticalAlignment="Top" Spacing="30">
+      <StackPanel Spacing="0">
+        <Button x:Name="SpawnRangeListBoxAddButton"
+                PointerReleased="SpawnRangeListBoxAddButton_OnPointerReleased"
+                Classes="secondary" Margin="0, 0" Padding="4, 3">
+          <Path Width="10" Height="10" Margin="0, 2, 0, 0" Data="{StaticResource Icons.Plus}" />
+        </Button>
+        <Button Command="{Binding btnDelete_Click}"
+                IsEnabled="{Binding HasSelection}"
+                Classes="secondary" Margin="0, 0" Padding="4, 3">
+          <Path Width="10" Height="10" Margin="0, 0, 0, 0" Data="{StaticResource Icons.Minus}" />
+        </Button>
+      </StackPanel>
+      <StackPanel Spacing="0">
+        <Button Command="{Binding btnUp_Click}"
+                IsEnabled="{Binding CanMoveUp}"
+                Classes="secondary" Margin="0, 0" Padding="4, 3">
+          <Path Width="10" Height="10" Margin="0, 2, 0, 0" Data="{StaticResource Icons.CaretUpFill}" />
+        </Button>
+        <Button Command="{Binding btnDown_Click}"
+                IsEnabled="{Binding CanMoveDown}"
+                Classes="secondary" Margin="0, 0" Padding="4, 3">
+          <Path Width="10" Height="10" Margin="0, 0, 0, 0" Data="{StaticResource Icons.CaretDownFill}" />
+        </Button>
+      </StackPanel>
+    </StackPanel>
+    
+    <Grid Grid.Row="1" Grid.Column="0" ColumnDefinitions="Auto, *, Auto, *, Auto, *">
+      <TextBlock VerticalAlignment="Center" Margin="4,0" Grid.Column="0">Start:</TextBlock>
+      <NumericUpDown IsEnabled="{Binding Path=CurrentElement, Converter={StaticResource ValidIdxConverter}, ConverterParameter=false}"
+                     Value="{Binding CurrentStart}"
+                     ValueChanged="nudStart_ValueChanged"
+                     Margin="4" Grid.Column="1"/>
+      <TextBlock VerticalAlignment="Center" Margin="4,0" Grid.Column="2">End:</TextBlock>
+      <NumericUpDown IsEnabled="{Binding Path=CurrentElement, Converter={StaticResource ValidIdxConverter}, ConverterParameter=false}"
+                     Value="{Binding CurrentEnd}"
+                     ValueChanged="nudEnd_ValueChanged"
+                     Margin="4" Grid.Column="3"/>
+      <TextBlock VerticalAlignment="Center" Margin="4,0" Grid.Column="4">Weight:</TextBlock>
+      <NumericUpDown IsEnabled="{Binding Path=CurrentElement, Converter={StaticResource ValidIdxConverter}, ConverterParameter=false}"
+                     Value="{Binding CurrentWeight}"
+                     Minimum="1"
+                     Margin="4" Grid.Column="5"/>
     </Grid>
+
   </Grid>
-</UserControl>
+</UserControl>
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/SpawnRangeListBoxViewModel.cs b/RogueEssence.Editor.Avalonia/DataEditor/SpawnRangeListBoxViewModel.cs
index e9d68b6f..cce356bc 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/SpawnRangeListBoxViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/SpawnRangeListBoxViewModel.cs
@@ -111,11 +111,31 @@ public int AddMax
         public bool ConfirmDelete;
 
         private IDialogService _dialogService;
+        
+        
+        public bool CanMoveUp => CurrentElement > 0;
+        public bool CanMoveDown => CurrentElement >= 0 && CurrentElement < Collection.Count - 1;
+        public bool HasSelection => CurrentElement >= 0 && CurrentElement < Collection.Count;
+        
         public SpawnRangeListBoxViewModel(IDialogService dialogService, StringConv conv)
         {
             _dialogService = dialogService;
             StringConv = conv;
             Collection = new ObservableCollection<SpawnRangeListElement>();
+            
+            this.WhenAnyValue(x => x.CurrentElement).Subscribe(_ =>
+            {
+                this.RaisePropertyChanged(nameof(CanMoveUp));
+                this.RaisePropertyChanged(nameof(CanMoveDown));
+                this.RaisePropertyChanged(nameof(HasSelection));
+            });
+
+            Collection.CollectionChanged += (_, _) =>
+            {
+                this.RaisePropertyChanged(nameof(CanMoveUp));
+                this.RaisePropertyChanged(nameof(CanMoveDown));
+                this.RaisePropertyChanged(nameof(HasSelection));
+            };
         }
 
         public ObservableCollection<SpawnRangeListElement> Collection { get; }
@@ -257,8 +277,9 @@ public void btnAdd_Click(bool advancedEdit)
             OnEditItem?.Invoke(index, element, advancedEdit, insertItem);
         }
 
-        private async void btnDelete_Click()
+        public async void btnDelete_Click()
         {
+            Console.WriteLine("Delete");
             if (CurrentElement > -1 && CurrentElement < Collection.Count)
             {
                 if (ConfirmDelete)
@@ -280,7 +301,7 @@ private void Switch(int a, int b)
             Collection[b] = obj;
         }
 
-        private void btnUp_Click()
+        public void btnUp_Click()
         {
             if (CurrentElement > 0)
             {
@@ -290,7 +311,7 @@ private void btnUp_Click()
             }
         }
 
-        private void btnDown_Click()
+        public void btnDown_Click()
         {
             if (CurrentElement > -1 && CurrentElement < Collection.Count - 1)
             {
diff --git a/RogueEssence.Editor.Avalonia/EditorContext/EditorContext.cs b/RogueEssence.Editor.Avalonia/EditorContext/EditorContext.cs
index 2e406900..36f5c386 100644
--- a/RogueEssence.Editor.Avalonia/EditorContext/EditorContext.cs
+++ b/RogueEssence.Editor.Avalonia/EditorContext/EditorContext.cs
@@ -4,44 +4,6 @@
 using RogueEssence.Dev.ViewModels;
 
 namespace RogueEssence.Dev;
-
-public static class EditorContextExtensions
-{
-    public static void OpenElementEditor(
-        this EditorContext context,
-        EditorPageViewModel pageViewModel,
-        int index,
-        string title,
-        string elementName,
-        Type elementType,
-        object[] attributes,
-        object element,
-        bool advancedEdit,
-        CollectionBoxViewModel.EditElementOp op)
-    {
-        NodeBase node = context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(title, pageViewModel.Node.Icon);
-        pageViewModel.Node.SubNodes.Add(node);
-        
-        ReflectedDataPageViewModel new_editor = context.PageFactory.CreatePage<ReflectedDataPageViewModel>(node);
-        if (new_editor == null) return;
-        
-        new_editor.SetPageTitle(title, pageViewModel.Node.Icon);
-        
-        new_editor.OnLoadAction = (StackPanel stack) =>
-        {
-            DataEditor.LoadClassControls(stack, elementName, null, elementName, elementType, ReflectionExt.GetPassableAttributes(1, attributes), element, true, new Type[0], advancedEdit);
-        };
-
-        new_editor.OnOKAction = async (StackPanel stack) =>
-        {
-            element = DataEditor.SaveClassControls(stack, elementName, elementType, ReflectionExt.GetPassableAttributes(1, attributes), true, new Type[0], advancedEdit);
-            op(index, element);
-            return true;
-        };
-        
-        context.TabEvents.AddChildPage(pageViewModel, new_editor);
-    }
-}
 public class EditorContext
 {
     public NodeFactory NodeFactory { get; }
diff --git a/RogueEssence.Editor.Avalonia/EditorContext/NodeFactory.cs b/RogueEssence.Editor.Avalonia/EditorContext/NodeFactory.cs
index 1adccb07..e64a29b6 100644
--- a/RogueEssence.Editor.Avalonia/EditorContext/NodeFactory.cs
+++ b/RogueEssence.Editor.Avalonia/EditorContext/NodeFactory.cs
@@ -7,68 +7,103 @@
 using RogueEssence.Dev.Services;
 using RogueEssence.Dev.ViewModels;
 
-namespace RogueEssence.Dev
+public class NodeFactory
 {
-    public class NodeFactory
+    private readonly IServiceProvider _serviceProvider;
+
+    public NodeFactory(IServiceProvider serviceProvider)
     {
-        private readonly IServiceProvider _serviceProvider;
+        _serviceProvider = serviceProvider;
+    }
 
-        public NodeFactory(IServiceProvider serviceProvider)
-        {
-            _serviceProvider = serviceProvider;
-        }
+    public T Create<T>(params object[] args)
+        where T : NodeBase
+    {
+        return (T)ActivatorUtilities.CreateInstance(_serviceProvider, typeof(T), args);
+    }
 
-        public T Create<T>(params object[] args)
-            where T : NodeBase
+    private Action<EditorPageViewModel>? CreateCallback<TEditor>(Action<TEditor>? onOpen)
+        where TEditor : EditorPageViewModel
+    {
+        
+        Action<EditorPageViewModel> callback = vm => { };
+        if (onOpen != null)
         {
-            return (T)ActivatorUtilities.CreateInstance(_serviceProvider, typeof(T), args);
+            callback = vm => onOpen((TEditor)vm);
         }
-        
-        public OpenEditorNode CreateOpenEditorNode<TEditor>(string title, string? icon = null)
-            where TEditor : EditorPageViewModel
-            => Create<OpenEditorNode>(title, typeof(TEditor), icon);
-        
-        public ReflectedDataNode CreateReflectedDataNode<TEditor>(string title, string? icon = null)
-            where TEditor : EditorPageViewModel
-            => Create<ReflectedDataNode>(title, typeof(TEditor), icon);
+        return callback;
+    }
 
-        
-        public OpenEditorNodeWithParams CreateOpenEditorNodeWithParams<TEditor>(
-            string title,
-            object[] extraParams,
-            string? icon = null)
-            where TEditor : EditorPageViewModel
-            => Create<OpenEditorNodeWithParams>(title, typeof(TEditor), extraParams, icon);
-        
-        public DataRootNode CreateDataRootNode<TEditor>(DataManager.DataType dataType, string title, string? icon = null)
-            where TEditor : EditorPageViewModel
-            => Create<DataRootNode>(dataType, typeof(TEditor), title, icon);
-        
-        public ModRootNode CreateModRootNode<TEditor>(string title, string? icon = null)
-            where TEditor : EditorPageViewModel
-            => Create<ModRootNode>(typeof(TEditor), title, icon);
-        
-        public DataItemNode CreateDataItemNode<TEditor>(string key, string title, string? icon = null)
-            where TEditor : EditorPageViewModel
-            => Create<DataItemNode>(key, typeof(TEditor), title, icon);
+    public OpenEditorNode CreateOpenEditorNode<TEditor>(
+        string title,
+        string? icon = null,
+        Action<TEditor>? onOpen = null)
+        where TEditor : EditorPageViewModel
+        => Create<OpenEditorNode>(title, typeof(TEditor), icon, CreateCallback(onOpen));
 
-        public PageNode CreatePageNode(EditorPageViewModel childPage, PageNode? parentNode = null)
-            => new PageNode(_serviceProvider.GetService<IDialogService>(), this, childPage, parentNode);
-        
-        public SpriteRootNode CreateSpriteRootNode<TEditor>(GraphicsManager.AssetType assetType, string title, string? icon = null)
-            where TEditor : EditorPageViewModel
-            => Create<SpriteRootNode>(assetType, typeof(TEditor), title, icon);
-        
-        public SpriteTileRootNode CreateSpriteTileRootNode<TEditor>(string title, string? icon = null)
-            where TEditor : EditorPageViewModel
-            => Create<SpriteTileRootNode>(typeof(TEditor), title, icon);
-        
-        public OpenEditorNodeFX<T> CreateOpenEditorNodeFX<T, TEditor>(
-            string title, 
-            Func<T> getter, 
-            Action<T> setter,
-            string? icon = null)
-            where TEditor : EditorPageViewModel
-            => Create<OpenEditorNodeFX<T>>(title, typeof(TEditor), getter, setter, icon);
-    }
+    public ReflectedDataNode CreateReflectedDataNode<TEditor>(
+        string title,
+        string? icon = null,
+        NodeBase? parent = null,
+        Action<TEditor>? onOpen = null)
+        where TEditor : EditorPageViewModel
+        => Create<ReflectedDataNode>(title, typeof(TEditor), icon, parent, CreateCallback(onOpen));
+
+    public OpenEditorNodeWithParams CreateOpenEditorNodeWithParams<TEditor>(
+        string title,
+        object[] extraParams,
+        string? icon = null,
+        Action<TEditor>? onOpen = null)
+        where TEditor : EditorPageViewModel
+        => Create<OpenEditorNodeWithParams>(title, typeof(TEditor), extraParams, icon, CreateCallback(onOpen));
+
+    public DataRootNode CreateDataRootNode<TEditor>(
+        DataManager.DataType dataType,
+        string title,
+        string? icon = null,
+        Action<TEditor>? onOpen = null)
+        where TEditor : EditorPageViewModel
+        => Create<DataRootNode>(dataType, typeof(TEditor), title, icon, CreateCallback(onOpen));
+
+    public ModRootNode CreateModRootNode<TEditor>(
+        string title,
+        string? icon = null,
+        Action<TEditor>? onOpen = null)
+        where TEditor : EditorPageViewModel
+        => Create<ModRootNode>(typeof(TEditor), title, icon, CreateCallback(onOpen));
+
+    public DataItemNode CreateDataItemNode<TEditor>(
+        string key,
+        string title,
+        string? icon = null,
+        Action<TEditor>? onOpen = null)
+        where TEditor : EditorPageViewModel
+        => Create<DataItemNode>(key, typeof(TEditor), title, icon, CreateCallback(onOpen));
+
+    public PageNode CreatePageNode(EditorPageViewModel childPage, PageNode? parentNode = null)
+        => new PageNode(_serviceProvider.GetService<IDialogService>(), this, childPage, parentNode);
+
+    public SpriteRootNode CreateSpriteRootNode<TEditor>(
+        GraphicsManager.AssetType assetType,
+        string title,
+        string? icon = null,
+        Action<TEditor>? onOpen = null)
+        where TEditor : EditorPageViewModel
+        => Create<SpriteRootNode>(assetType, typeof(TEditor), title, icon, CreateCallback(onOpen));
+
+    public SpriteTileRootNode CreateSpriteTileRootNode<TEditor>(
+        string title,
+        string? icon = null,
+        Action<TEditor>? onOpen = null)
+        where TEditor : EditorPageViewModel
+        => Create<SpriteTileRootNode>(typeof(TEditor), title, icon, CreateCallback(onOpen));
+
+    public OpenEditorNodeFX<T> CreateOpenEditorNodeFX<T, TEditor>(
+        string title,
+        Func<T> getter,
+        Action<T> setter,
+        string? icon = null,
+        Action<TEditor>? onOpen = null)
+        where TEditor : EditorPageViewModel
+        => Create<OpenEditorNodeFX<T>>(title, typeof(TEditor), getter, setter, icon, CreateCallback(onOpen));
 }
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/EditorContext/PageFactory.cs b/RogueEssence.Editor.Avalonia/EditorContext/PageFactory.cs
index fea005da..d3aeb2e4 100644
--- a/RogueEssence.Editor.Avalonia/EditorContext/PageFactory.cs
+++ b/RogueEssence.Editor.Avalonia/EditorContext/PageFactory.cs
@@ -67,7 +67,7 @@ public void Register<TPage>() where TPage : EditorPageViewModel
             return (TPage)_provider.GetRequiredService(type);
         }
         
-        public EditorPageViewModel? CreatePage(Type pageType, NodeBase? node = null, Func<Task>? onOpen = null)
+        public EditorPageViewModel? CreatePage(Type pageType, NodeBase? node = null, Action<EditorPageViewModel> onOpen = null)
         {
             
             // Make sure it's a page
@@ -88,49 +88,17 @@ public void Register<TPage>() where TPage : EditorPageViewModel
        
             if (node != null)
             {
-                page = (EditorPageViewModel)ActivatorUtilities.CreateInstance(_provider, pageType, node);
+                if (onOpen == null)
+                {
+                    onOpen = (vm) => { };
+                }
+                page = (EditorPageViewModel)ActivatorUtilities.CreateInstance(_provider, pageType, node, onOpen);
             }
             else
             {
                 page = (EditorPageViewModel)_provider.GetRequiredService(pageType);
             }
             
-            if (node is DataItemNode && page is ReflectedDataPageViewModel pg)
-            {
-                var dataRoot = pg.Node.FindNode<DataRootNode>();
-                var dataItem = pg.Node.FindNode<DataItemNode>();
-
-                DataManager.DataType dataType = dataRoot.DataType;
-                string key = dataItem.ItemKey;
-
-                var regis = DataRegistry.Map[dataType];
-                IEntryData data = regis.GetEntry(key);
-
-                string title = DataEditor.GetWindowTitle(String.Format("{0} #{1}", dataType.ToString(), key),
-                    data.Name.ToLocal(), data, data.GetType());
-
-                pg.SetPageTitle(title, pg.Node.Icon);
-
-                pg.OnLoadAction = (StackPanel stack) =>
-                {
-                    DataEditor.LoadDataControls(key, data, stack);
-                };
-
-                pg.OnOKAction = async (StackPanel stack) =>
-                {
-                    Console.WriteLine("OK ACTION");
-                    lock (GameBase.lockObj)
-                    {
-                        object obj = data;
-                        DataEditor.SaveDataControls(ref obj, stack, new Type[0]);
-                        DataManager.Instance.ContentChanged(dataType, key, (IEntryData)obj);
-
-                        string newName = DataManager.Instance.DataIndices[dataType].Get(key).GetLocalString(true);
-                        pg.SetPageTitle(DataEditor.GetWindowTitle(String.Format("{0} #{1}", dataType.ToString(), key), newName, obj, obj.GetType()), pg.Node.Icon);
-                    }
-                    return true;
-                };
-            }
             return page;
         }
 
@@ -153,8 +121,14 @@ public void Register<TPage>() where TPage : EditorPageViewModel
         //     return (EditorPageViewModel)_provider.GetRequiredService(pageType);
         // }
         
-        public TPage? CreatePage<TPage>(NodeBase? node) where TPage : EditorPageViewModel
+        public TPage? CreatePage<TPage>(NodeBase? node, Action<EditorPageViewModel> onOpen = null) where TPage : EditorPageViewModel
         {
+
+            if (onOpen == null)
+            {
+                onOpen = (vm) => { };
+            }
+            
             var type = typeof(TPage);
         
             if (!_registeredTypes.Contains(type))
@@ -164,7 +138,7 @@ public void Register<TPage>() where TPage : EditorPageViewModel
 
             if (node != null)
             {
-                return (TPage)ActivatorUtilities.CreateInstance(_provider, type, node);
+                return (TPage)ActivatorUtilities.CreateInstance(_provider, type, node, onOpen);
             }
         
             return (TPage)_provider.GetRequiredService(type);
diff --git a/RogueEssence.Editor.Avalonia/RogueEssence.Editor.Avalonia.csproj b/RogueEssence.Editor.Avalonia/RogueEssence.Editor.Avalonia.csproj
index 3fb6e8a6..1cbd30cd 100644
--- a/RogueEssence.Editor.Avalonia/RogueEssence.Editor.Avalonia.csproj
+++ b/RogueEssence.Editor.Avalonia/RogueEssence.Editor.Avalonia.csproj
@@ -211,6 +211,10 @@
       <DependentUpon>AnimChoiceWindowView.axaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
+    <Compile Update="Views\New\Editors\StringEditPageView.axaml.cs">
+      <DependentUpon>StringEditPageView.axaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Models\" />
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/Content/StringsEditViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/Content/StringsEditViewModel.cs
index 016f581a..e2f21e53 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/Content/StringsEditViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/Content/StringsEditViewModel.cs
@@ -75,6 +75,7 @@ public void btnAdd_Click()
         {
             string defname = String.Format("STRING_{0}", GameStrings.Count);
             GameStrings.Add(new MapString(defname, "", ""));
+            CurrentString = GameStrings.Count - 1;
         }
         public void btnDelete_Click()
         {
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevTabConstantsViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevTabConstantsViewModel.cs
index d425fbb6..a21ee58b 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevTabConstantsViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevTabConstantsViewModel.cs
@@ -5,6 +5,7 @@
 using RogueElements;
 using RogueEssence.Content;
 using RogueEssence.Data;
+using RogueEssence.Dev.Utility;
 using RogueEssence.Dungeon;
 using RogueEssence.Menu;
 using RogueEssence.Script;
@@ -14,40 +15,44 @@ namespace RogueEssence.Dev.ViewModels
 {
     public class DevTabConstantsViewModel : ViewModelBase
     {
-        public void btnEditStartParams_Click()
-        {
-            OpenItem<StartParams>("Start Params", DataManager.Instance.Start, (obj) => {
-                DataManager.Instance.Start = obj;
-                DataManager.Instance.SaveStartParams();
-            });
-        }
 
-        public void btnEditUniversal_Click()
-        {
-            OpenItem<UniversalBaseEffect>("Universal Event", (UniversalBaseEffect)DataManager.Instance.UniversalEvent, (obj) => {
-                DataManager.Instance.UniversalEvent = obj;
-                DataManager.SaveData(obj, DataManager.DATA_PATH, "Universal", DataManager.DATA_EXT);
-            });
-        }
+        private EditorContext _context;
+        public DevTabConstantsViewModel(EditorContext context)
+        {
+            _context = context;
+        }
+        // public void btnEditStartParams_Click()
+        // {
+        //     OpenItem<StartParams>("Start Params", DataManager.Instance.Start, (obj) => {
+        //         DataManager.Instance.Start = obj;
+        //         DataManager.Instance.SaveStartParams();
+        //     });
+        // }
+        //
+        // public void btnEditUniversal_Click()
+        // {
+        //     OpenItem<UniversalBaseEffect>("Universal Event", (UniversalBaseEffect)DataManager.Instance.UniversalEvent, (obj) => {
+        //         DataManager.Instance.UniversalEvent = obj;
+        //         DataManager.SaveData(obj, DataManager.DATA_PATH, "Universal", DataManager.DATA_EXT);
+        //     });
+        // }
         public async void mnuUniversalFile_Click()
         {
-            DevForm parent = (DevForm)DiagManager.Instance.DevEditor;
             if (DataManager.GetDataModStatus(DataManager.DATA_PATH, "Universal", DataManager.DATA_EXT) == DataManager.ModStatus.Base)
             {
-                await MessageBox.Show(parent, "Universal data must have saved edits first!", "Error", MessageBox.MessageBoxButtons.Ok);
+                await MessageBoxWindowView.Show(_context.DialogService, "Universal data must have saved edits first!", "Error", MessageBoxWindowView.MessageBoxButtons.Ok);
                 return;
             }
 
             DataManager.SaveData(DataManager.Instance.UniversalEvent, DataManager.DATA_PATH, "Universal", DataManager.DATA_EXT, DataManager.SavePolicy.File);
 
-            await MessageBox.Show(parent, "Universal is now saved as a file.", "Complete", MessageBox.MessageBoxButtons.Ok);
+            await MessageBoxWindowView.Show(_context.DialogService, "Universal is now saved as a file.", "Complete", MessageBoxWindowView.MessageBoxButtons.Ok);
         }
         public async void mnuUniversalDiff_Click()
         {
-            DevForm parent = (DevForm)DiagManager.Instance.DevEditor;
             if (DataManager.GetDataModStatus(DataManager.DATA_PATH, "Universal", DataManager.DATA_EXT) == DataManager.ModStatus.Base)
             {
-                await MessageBox.Show(parent, "Universal data must have saved edits first!", "Error", MessageBox.MessageBoxButtons.Ok);
+                await MessageBoxWindowView.Show(_context.DialogService,"Universal data must have saved edits first!", "Error", MessageBoxWindowView.MessageBoxButtons.Ok);
                 return;
             }
 
@@ -55,9 +60,9 @@ public async void mnuUniversalDiff_Click()
             DataManager.SaveData(DataManager.Instance.UniversalEvent, DataManager.DATA_PATH, "Universal", DataManager.DATA_EXT, DataManager.SavePolicy.Diff);
 
             if (DataManager.GetDataModStatus(DataManager.DATA_PATH, "Universal", DataManager.DATA_EXT) == DataManager.ModStatus.Base)
-                await MessageBox.Show(parent, "Modded Universal was identical to base. Unneeded patch removed.", "Complete", MessageBox.MessageBoxButtons.Ok);
+                await MessageBoxWindowView.Show(_context.DialogService, "Modded Universal was identical to base. Unneeded patch removed.", "Complete", MessageBoxWindowView.MessageBoxButtons.Ok);
             else
-                await MessageBox.Show(parent, "Universal is now saved as a patch.", "Complete", MessageBox.MessageBoxButtons.Ok);
+                await MessageBoxWindowView.Show(_context.DialogService, "Universal is now saved as a patch.", "Complete", MessageBoxWindowView.MessageBoxButtons.Ok);
         }
 
         public void btnEditStrings_Click()
@@ -68,7 +73,7 @@ public void btnEditStrings_Click()
             editForm.DataContext = mv;
             editForm.Show();
         }
-
+        
         public void btnEditStringsEx_Click()
         {
             StringsEditViewModel mv = new StringsEditViewModel();
@@ -77,119 +82,147 @@ public void btnEditStringsEx_Click()
             editForm.DataContext = mv;
             editForm.Show();
         }
-
-
-
-        public void btnEditHeal_Click()
-        {
-            OpenItem<BattleFX>("Heal FX", DataManager.Instance.HealFX, (fx) => {
-                DataManager.Instance.HealFX = fx;
-                DataManager.SaveData(fx, DataManager.FX_PATH, "Heal", DataManager.DATA_EXT);
-            });
-        }
-        public void btnEditRestoreCharge_Click()
-        {
-            OpenItem<BattleFX>("Restore Charge FX", DataManager.Instance.RestoreChargeFX, (fx) => {
-                DataManager.Instance.RestoreChargeFX = fx;
-                DataManager.SaveData(fx, DataManager.FX_PATH, "RestoreCharge", DataManager.DATA_EXT);
-            });
-        }
-        public void btnEditLoseCharge_Click()
-        {
-            OpenItem<BattleFX>("Lose Charge FX", DataManager.Instance.LoseChargeFX, (fx) => {
-                DataManager.Instance.LoseChargeFX = fx;
-                DataManager.SaveData(fx, DataManager.FX_PATH, "LoseCharge", DataManager.DATA_EXT);
-            });
-        }
-        public void btnEditNoCharge_Click()
-        {
-            OpenItem<EmoteFX>("No Charge FX", DataManager.Instance.NoChargeFX, (fx) => {
-                DataManager.Instance.NoChargeFX = fx;
-                DataManager.SaveData(fx, DataManager.FX_PATH, "NoCharge", DataManager.DATA_EXT);
-            });
-        }
-        public void btnEditElement_Click()
-        {
-            OpenItem<BattleFX>("Element FX", DataManager.Instance.ElementFX, (fx) => {
-                DataManager.Instance.ElementFX = fx;
-                DataManager.SaveData(fx, DataManager.FX_PATH, "Element", DataManager.DATA_EXT);
-            });
-        }
-        public void btnEditIntrinsic_Click()
-        {
-            OpenItem<BattleFX>("Intrinsic FX", DataManager.Instance.IntrinsicFX, (fx) => {
-                DataManager.Instance.IntrinsicFX = fx;
-                DataManager.SaveData(fx, DataManager.FX_PATH, "Intrinsic", DataManager.DATA_EXT);
-            });
-        }
-        public void btnEditSendHome_Click()
-        {
-            OpenItem<BattleFX>("Send Home FX", DataManager.Instance.SendHomeFX, (fx) => {
-                DataManager.Instance.SendHomeFX = fx;
-                DataManager.SaveData(fx, DataManager.FX_PATH, "SendHome", DataManager.DATA_EXT);
-            });
-        }
-        public void btnEditItemLost_Click()
-        {
-            OpenItem<BattleFX>("Item Lost FX", DataManager.Instance.ItemLostFX, (fx) => {
-                DataManager.Instance.ItemLostFX = fx;
-                DataManager.SaveData(fx, DataManager.FX_PATH, "ItemLost", DataManager.DATA_EXT);
-            });
-        }
-        public void btnEditWarp_Click()
-        {
-            OpenItem<BattleFX>("Warp FX", DataManager.Instance.WarpFX, (fx) => {
-                DataManager.Instance.WarpFX = fx;
-                DataManager.SaveData(fx, DataManager.FX_PATH, "Warp", DataManager.DATA_EXT);
-            });
-        }
-
-        public void btnEditKnockback_Click()
-        {
-            OpenItem<BattleFX>("Knockback FX", DataManager.Instance.KnockbackFX, (fx) => {
-                DataManager.Instance.KnockbackFX = fx;
-                DataManager.SaveData(fx, DataManager.FX_PATH, "Knockback", DataManager.DATA_EXT);
-            });
-        }
-
-        public void btnEditJump_Click()
-        {
-            OpenItem<BattleFX>("Jump FX", DataManager.Instance.JumpFX, (fx) => {
-                DataManager.Instance.JumpFX = fx;
-                DataManager.SaveData(fx, DataManager.FX_PATH, "Jump", DataManager.DATA_EXT);
-            });
-        }
-
-        public void btnEditThrow_Click()
-        {
-            OpenItem<BattleFX>("Throw FX", DataManager.Instance.ThrowFX, (fx) => { DataManager.Instance.ThrowFX = fx;
-                DataManager.SaveData(fx, DataManager.FX_PATH, "Throw", DataManager.DATA_EXT);
-            });
-        }
-
-        private delegate void SaveFX<T>(T obj);
-        private void OpenItem<T>(string name, T data, SaveFX<T> saveOp)
+        //
+        //
+        //
+        // public void btnEditHeal_Click()
+        // {
+        //     OpenItem<BattleFX>("Heal FX", DataManager.Instance.HealFX, (fx) => {
+        //         DataManager.Instance.HealFX = fx;
+        //         DataManager.SaveData(fx, DataManager.FX_PATH, "Heal", DataManager.DATA_EXT);
+        //     });
+        // }
+        // public void btnEditRestoreCharge_Click()
+        // {
+        //     OpenItem<BattleFX>("Restore Charge FX", DataManager.Instance.RestoreChargeFX, (fx) => {
+        //         DataManager.Instance.RestoreChargeFX = fx;
+        //         DataManager.SaveData(fx, DataManager.FX_PATH, "RestoreCharge", DataManager.DATA_EXT);
+        //     });
+        // }
+        // public void btnEditLoseCharge_Click()
+        // {
+        //     OpenItem<BattleFX>("Lose Charge FX", DataManager.Instance.LoseChargeFX, (fx) => {
+        //         DataManager.Instance.LoseChargeFX = fx;
+        //         DataManager.SaveData(fx, DataManager.FX_PATH, "LoseCharge", DataManager.DATA_EXT);
+        //     });
+        // }
+        // public void btnEditNoCharge_Click()
+        // {
+        //     OpenItem<EmoteFX>("No Charge FX", DataManager.Instance.NoChargeFX, (fx) => {
+        //         DataManager.Instance.NoChargeFX = fx;
+        //         DataManager.SaveData(fx, DataManager.FX_PATH, "NoCharge", DataManager.DATA_EXT);
+        //     });
+        // }
+        // public void btnEditElement_Click()
+        // {
+        //     OpenItem<BattleFX>("Element FX", DataManager.Instance.ElementFX, (fx) => {
+        //         DataManager.Instance.ElementFX = fx;
+        //         DataManager.SaveData(fx, DataManager.FX_PATH, "Element", DataManager.DATA_EXT);
+        //     });
+        // }
+        // public void btnEditIntrinsic_Click()
+        // {
+        //     OpenItem<BattleFX>("Intrinsic FX", DataManager.Instance.IntrinsicFX, (fx) => {
+        //         DataManager.Instance.IntrinsicFX = fx;
+        //         DataManager.SaveData(fx, DataManager.FX_PATH, "Intrinsic", DataManager.DATA_EXT);
+        //     });
+        // }
+        // public void btnEditSendHome_Click()
+        // {
+        //     OpenItem<BattleFX>("Send Home FX", DataManager.Instance.SendHomeFX, (fx) => {
+        //         DataManager.Instance.SendHomeFX = fx;
+        //         DataManager.SaveData(fx, DataManager.FX_PATH, "SendHome", DataManager.DATA_EXT);
+        //     });
+        // }
+        // public void btnEditItemLost_Click()
+        // {
+        //     OpenItem<BattleFX>("Item Lost FX", DataManager.Instance.ItemLostFX, (fx) => {
+        //         DataManager.Instance.ItemLostFX = fx;
+        //         DataManager.SaveData(fx, DataManager.FX_PATH, "ItemLost", DataManager.DATA_EXT);
+        //     });
+        // }
+        // public void btnEditWarp_Click()
+        // {
+        //     OpenItem<BattleFX>("Warp FX", DataManager.Instance.WarpFX, (fx) => {
+        //         DataManager.Instance.WarpFX = fx;
+        //         DataManager.SaveData(fx, DataManager.FX_PATH, "Warp", DataManager.DATA_EXT);
+        //     });
+        // }
+        //
+        // public void btnEditKnockback_Click()
+        // {
+        //     OpenItem<BattleFX>("Knockback FX", DataManager.Instance.KnockbackFX, (fx) => {
+        //         DataManager.Instance.KnockbackFX = fx;
+        //         DataManager.SaveData(fx, DataManager.FX_PATH, "Knockback", DataManager.DATA_EXT);
+        //     });
+        // }
+        //
+        // public void btnEditJump_Click()
+        // {
+        //     OpenItem<BattleFX>("Jump FX", DataManager.Instance.JumpFX, (fx) => {
+        //         DataManager.Instance.JumpFX = fx;
+        //         DataManager.SaveData(fx, DataManager.FX_PATH, "Jump", DataManager.DATA_EXT);
+        //     });
+        // }
+        //
+        // public void btnEditThrow_Click()
+        // {
+        //     OpenItem<BattleFX>("Throw FX", DataManager.Instance.ThrowFX, (fx) => { DataManager.Instance.ThrowFX = fx;
+        //         DataManager.SaveData(fx, DataManager.FX_PATH, "Throw", DataManager.DATA_EXT);
+        //     });
+        // }
+
+        // private delegate void SaveFX<T>(T obj);
+        // private void OpenItem<T>(string name, T data, SaveFX<T> saveOp)
+        // {
+        //     lock (GameBase.lockObj)
+        //     {
+        //         Views.DataEditForm editor = new Views.DataEditRootForm();
+        //         // EditorPageViewModel page = new EditorPageViewModel();
+        //         // pag
+        //         editor.Title = DataEditor.GetWindowTitle("", name, data, data.GetType());
+        //         DataEditor.LoadDataControls("", data, editor);
+        //         editor.SelectedOKEvent += async () =>
+        //         {
+        //             lock (GameBase.lockObj)
+        //             {
+        //                 object obj = data;
+        //                 DataEditor.SaveDataControls(ref obj, editor.ControlPanel, new Type[0]);
+        //                 saveOp((T)obj);
+        //                 return true;
+        //             }
+        //         };
+        //
+        //         editor.Show();
+        //
+        //     }
+        // }
+        //
+        
+        private void OpenItem<T>(string name, T data, Action<T> saveOp, NodeBase parentNode)
         {
             lock (GameBase.lockObj)
             {
-                Views.DataEditForm editor = new Views.DataEditRootForm();
-                // EditorPageViewModel page = new EditorPageViewModel();
-                // pag
-                editor.Title = DataEditor.GetWindowTitle("", name, data, data.GetType());
-                DataEditor.LoadDataControls("", data, editor);
-                editor.SelectedOKEvent += async () =>
+                ReflectedDataPageViewModel newEditor = _context.PageFactory.CreatePage<ReflectedDataPageViewModel>(parentNode);
+                newEditor.SetPageTitle(name, parentNode.Icon);
+
+                newEditor.OnLoadAction = (StackPanel stack) =>
+                {
+                    DataEditor.LoadDataControls("", data, stack);
+                };
+
+                newEditor.OnOKAction = async (StackPanel stack) =>
                 {
                     lock (GameBase.lockObj)
                     {
                         object obj = data;
-                        DataEditor.SaveDataControls(ref obj, editor.ControlPanel, new Type[0]);
+                        DataEditor.SaveDataControls(ref obj, stack, new Type[0]);
                         saveOp((T)obj);
-                        return true;
                     }
+                    return true;
                 };
 
-                editor.Show();
-
+                _context.TabEvents.AddTopLevelTab(newEditor);
             }
         }
 
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs
index 27126f53..b7543873 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs
@@ -44,8 +44,6 @@ public HierarchicalTreeDataGridSource<NodeBase> NodeSource
     public DevTabConstantsViewModel Constants { get; set; }
 
 
-    private readonly NodeFactory _nodeFactory;
-
     public ObservableCollection<ModsNodeViewModel> Mods { get; }
 
 
@@ -126,7 +124,7 @@ public bool IsTreeView
 
     public void OpenTabSwitcher()
     {
-        TabSwitcher = _pageFactory.GetRequiredService<TabSwitcherViewModel>();
+        TabSwitcher = _context.PageFactory.GetRequiredService<TabSwitcherViewModel>();
     }
 
     public event Action? TabSwitcherClosed;
@@ -141,7 +139,8 @@ public void OnModSwitcherOpened()
     {
         if (ModSwitcher == null)
         {
-            ModSwitcher = _pageFactory.GetRequiredService<ModSwitcherViewModel>();
+            // TODO: Doesn't look ideal
+            ModSwitcher = _context.PageFactory.GetRequiredService<ModSwitcherViewModel>();
         }
     }
 
@@ -156,8 +155,8 @@ public void OnModSwitcherClosed()
             ModSwitcherClosed?.Invoke();
         }
     }
-    
-    
+
+
     private string _filter = "";
 
     public string Filter
@@ -249,10 +248,10 @@ public void AddTopLevelPage(EditorPageViewModel page)
         }
 
         // Only load the data once it is confirmed that the tab doesn't already exist
-        page.LoadData();
+        page.OnPageLoad();
 
         Pages.Add(page);
-        var node = _nodeFactory.CreatePageNode(page, null);
+        var node = _context.NodeFactory.CreatePageNode(page, null);
         TopLevelPages.Add(node);
         _pageToNodeMap[page] = node;
         ActivePage = page;
@@ -320,10 +319,13 @@ private PageNode GetTopLevelNode(PageNode node)
 
     public void RemoveTab(EditorPageViewModel page)
     {
+        Console.WriteLine($"Removing tab {page}" + "hmmm");
         if (!_pageToNodeMap.TryGetValue(page, out var node))
             return;
 
         int removeIdx = Pages.IndexOf(page);
+        
+        Console.WriteLine($"Removing tab {page} at index {removeIdx}");
 
         ClosePageAndChildren(node);
 
@@ -365,6 +367,7 @@ public async Task SaveChildren(EditorPageViewModel page)
                 await saveable.Save();
         }
     }
+
     private void ClosePageAndChildren(PageNode node)
     {
         var children = node.SubNodes.Cast<PageNode>().ToList();
@@ -388,12 +391,6 @@ private void ClosePageAndChildren(PageNode node)
         _pageToNodeMap.Remove(node.Page);
     }
 
-
-    private readonly PageFactory _pageFactory;
-    private readonly TabEvents _tabEvents;
-    private readonly IDialogService _dialogService;
-
-
     private ObservableCollection<NodeBase> _nodes = new();
 
     public ObservableCollection<NodeBase> Nodes
@@ -407,12 +404,15 @@ public ObservableCollection<NodeBase> Nodes
     // {
     // }
 
-    public DevFormViewModel(PageFactory pageFactory, NodeFactory nodeFactory, IDialogService dialogService,
-        TabEvents tabEvents, DevTabGameViewModel game, DevTabPlayerViewModel player, DevTabDataViewModel data,
+    private EditorContext _context;
+
+    public DevFormViewModel(EditorContext context, DevTabGameViewModel game, DevTabPlayerViewModel player,
+        DevTabDataViewModel data,
         DevTabTravelViewModel travel, DevTabSpritesViewModel sprites, DevTabScriptViewModel script,
         DevTabModsViewModel mods,
         DevTabConstantsViewModel constants)
     {
+        _context = context;
         Mods = new ObservableCollection<ModsNodeViewModel>();
         // NOTE: These should all be private readonly
         Game = game;
@@ -423,10 +423,6 @@ public DevFormViewModel(PageFactory pageFactory, NodeFactory nodeFactory, IDialo
         Script = script;
         // Mods = mods;
         Constants = constants;
-        _pageFactory = pageFactory;
-        _tabEvents = tabEvents;
-        _nodeFactory = nodeFactory;
-        _dialogService = dialogService;
 
         InitializeTabEvents();
 
@@ -437,7 +433,7 @@ public DevFormViewModel(PageFactory pageFactory, NodeFactory nodeFactory, IDialo
         Pages = new ObservableCollection<EditorPageViewModel>();
         TopLevelPages = new ObservableCollection<PageNode>();
         _pageToNodeMap = new Dictionary<EditorPageViewModel, PageNode>();
-        
+
         this.WhenAnyValue(x => x.ActivePage)
             .Buffer(2, 1)
             .Subscribe(pair =>
@@ -472,11 +468,13 @@ public void ClearFilter()
 
     public async void ShowPreferencesWindow()
     {
-        await _dialogService.ShowDialogAsync<PreferencesWindowViewModel, bool>(
+        await _context.DialogService.ShowDialogAsync<PreferencesWindowViewModel, bool>(
             PreferencesWindowViewModel.Instance, "Preferences");
     }
+
     public void LoadDevTree()
     {
+        NodeFactory _nodeFactory = _context.NodeFactory;
         Filter = "";
         _reloadMods();
 
@@ -485,9 +483,9 @@ public void LoadDevTree()
         Pages.Clear();
         _pageToNodeMap.Clear();
 
-        
+
         // TODO: Attach the DevControlNode to this tab rather than keeping it null... 
-        var tab = _pageFactory.CreatePage(typeof(DevControlViewModel), null);
+        var tab = _context.PageFactory.CreatePage(typeof(DevControlViewModel), null);
         tab.Icon = "Icons.GameControllerFill";
         AddTopLevelPage(tab);
 
@@ -523,8 +521,8 @@ public void LoadDevTree()
         // halcyonNode.SubNodes.Add(particlesRoot);
 
 
-        // CreateConstantsNode(root);
         CreateDataNode(root);
+        CreateConstantsNode(root);
         //
         CreateSpriteNode(root);
 
@@ -536,169 +534,371 @@ public void LoadDevTree()
     }
 
 
+    private void OpenItem<T>(string name, T data, Action<T> saveOp, NodeBase parentNode)
+    {
+        lock (GameBase.lockObj)
+        {
+            ReflectedDataPageViewModel newEditor = _context.PageFactory.CreatePage<ReflectedDataPageViewModel>(
+                parentNode,
+                vm =>
+                {
+                    var pg = vm as ReflectedDataPageViewModel;
+                    pg.SetPageTitle(name, parentNode.Icon);
+
+
+                    pg.OnLoadAction = (StackPanel stack) => { DataEditor.LoadDataControls("", data, stack); };
+
+                    pg.OnOKAction = async (StackPanel stack) =>
+                    {
+                        lock (GameBase.lockObj)
+                        {
+                            object obj = data;
+                            DataEditor.SaveDataControls(ref obj, stack, new Type[0]);
+                            saveOp((T)obj);
+                        }
+
+                        return true;
+                    };
+                });
+            _context.TabEvents.AddTopLevelTab(newEditor);
+        }
+    }
+
+    private Action<ReflectedDataPageViewModel> CreateDataOnOpen<T>(Func<T> getter, Action<T> setter, NodeBase parent)
+    {
+        return vm =>
+        {
+            vm.SetRemoveNode(false);
+            vm.SetIsRootPage(true);
+            vm.OnLoadAction = stack => { DataEditor.LoadDataControls("", getter(), stack); };
+
+            vm.OnOKAction = async stack =>
+            {
+                lock (GameBase.lockObj)
+                {
+                    object obj = getter();
+                    DataEditor.SaveDataControls(ref obj, stack, new Type[0]);
+                    setter((T)obj);
+                }
+
+                return true;
+            };
+        };
+    }
+
+    private Action<ReflectedDataPageViewModel> CreateFXOnOpen<T>(Func<T> getter, Action<T> setter, string fxKey,
+        NodeBase parent)
+        => CreateDataOnOpen(getter, fx =>
+        {
+            setter(fx);
+            DataManager.SaveData(fx, DataManager.FX_PATH, fxKey, DataManager.DATA_EXT);
+        }, parent);
+
+
     private void CreateConstantsNode(NodeBase parent)
     {
-        var constantsNode = _nodeFactory.CreateOpenEditorNode<ZoneEditorPageViewModel>("Constants", "Icons.ListFill");
-        var startParamsNode = _nodeFactory.CreateOpenEditorNode<ReflectedDataPageViewModel>("Start Params", "Icons.ListFill");
-        var universalEventsNode = _nodeFactory.CreateOpenEditorNode<ReflectedDataPageViewModel>("Universal Events", "Icons.ListFill");
+        var constantsNode =
+            _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>("Constants", "Icons.ListFill");
+        var startParamsNode = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>("Start Params",
+            "Icons.ListFill",
+            parent,
+            CreateDataOnOpen(
+                () => DataManager.Instance.Start,
+                obj =>
+                {
+                    DataManager.Instance.Start = obj;
+                    DataManager.Instance.SaveStartParams();
+                },
+                parent)
+        );
+
+        var universalEventsNode = _context.NodeFactory.CreateOpenEditorNode<ReflectedDataPageViewModel>(
+            "Universal Event", "Icons.ListFill",
+            CreateDataOnOpen(
+                () => (UniversalBaseEffect)DataManager.Instance.UniversalEvent,
+                obj =>
+                {
+                    DataManager.Instance.UniversalEvent = obj;
+                    DataManager.SaveData(obj, DataManager.DATA_PATH, "Universal", DataManager.DATA_EXT);
+                },
+                parent));
+
+        
+        var stringsNode = _context.NodeFactory.CreateOpenEditorNode<ZoneEditorPageViewModel>("Strings", "Icons.TableFill");
+        var menuTextNode = _context.NodeFactory.CreateOpenEditorNodeWithParams<StringEditPageViewModel>("Menu Text", [false], "Icons.TableFill");
+        var gameplayTextNode = _context.NodeFactory.CreateOpenEditorNodeWithParams<StringEditPageViewModel>("Gameplay Text", [true], "Icons.TableFill");
+        stringsNode.SubNodes.Add(menuTextNode);
+        stringsNode.SubNodes.Add(gameplayTextNode);
+        // var universalEventsNode = _context.NodeFactory.CreateOpenEditorNode<ReflectedDataPageViewModel>("Universal Events", "Icons.ListFill");
+
+        //             public void btnEditStartParams_Click()
+        //     {
+        //         OpenItem<StartParams>("Start Params", DataManager.Instance.Start, (obj) => {
+        //             DataManager.Instance.Start = obj;
+        //             DataManager.Instance.SaveStartParams();
+        //         });
+        //     }
         //
-        // var menuTextNode = _nodeFactory.CreateOpenEditorNode("Menu Text", "Icons.TableFill", "");
-        // var gameplayTextNode = _nodeFactory.CreateOpenEditorNode("Gameplay Text", "Icons.TableFill", "");
+        //     public void btnEditUniversal_Click()
+        //     {
+        //         OpenItem<UniversalBaseEffect>("Universal Event", (UniversalBaseEffect)DataManager.Instance.UniversalEvent, (obj) => {
+        //             DataManager.Instance.UniversalEvent = obj;
+        //             DataManager.SaveData(obj, DataManager.DATA_PATH, "Universal", DataManager.DATA_EXT);
+        //         });
+        //     }
+        //     public async void mnuUniversalFile_Click()
+        //     {
+        //         DevForm parent = (DevForm)DiagManager.Instance.DevEditor;
+        //         if (DataManager.GetDataModStatus(DataManager.DATA_PATH, "Universal", DataManager.DATA_EXT) == DataManager.ModStatus.Base)
+        //         {
+        //             await MessageBox.Show(parent, "Universal data must have saved edits first!", "Error", MessageBox.MessageBoxButtons.Ok);
+        //             return;
+        //         }
         //
+        //         DataManager.SaveData(DataManager.Instance.UniversalEvent, DataManager.DATA_PATH, "Universal", DataManager.DATA_EXT, DataManager.SavePolicy.File);
         //
-        constantsNode.SubNodes.Add(startParamsNode);
-        constantsNode.SubNodes.Add(universalEventsNode);
-        // constantsNode.SubNodes.Add(menuTextNode);
-        // constantsNode.SubNodes.Add(gameplayTextNode);
+        //         await MessageBox.Show(parent, "Universal is now saved as a file.", "Complete", MessageBox.MessageBoxButtons.Ok);
+        //     }
+        //     public async void mnuUniversalDiff_Click()
+        //     {
+        //         DevForm parent = (DevForm)DiagManager.Instance.DevEditor;
+        //         if (DataManager.GetDataModStatus(DataManager.DATA_PATH, "Universal", DataManager.DATA_EXT) == DataManager.ModStatus.Base)
+        //         {
+        //             await MessageBox.Show(parent, "Universal data must have saved edits first!", "Error", MessageBox.MessageBoxButtons.Ok);
+        //             return;
+        //         }
         //
-        // var effectsNode = _nodeFactory.CreateOpenEditorNode("Effects", "Icons.ListFill", "");
+        //         //you can't make a diff for the base game!
+        //         DataManager.SaveData(DataManager.Instance.UniversalEvent, DataManager.DATA_PATH, "Universal", DataManager.DATA_EXT, DataManager.SavePolicy.Diff);
         //
-        // effectsNode.SubNodes.Add(_nodeFactory.CreateOpenEditorNodeFX<BattleFX>(
-        //     "Heal FX",
-        //     () => DataManager.Instance.HealFX,
-        //     (fx) =>
+        //         if (DataManager.GetDataModStatus(DataManager.DATA_PATH, "Universal", DataManager.DATA_EXT) == DataManager.ModStatus.Base)
+        //             await MessageBox.Show(parent, "Modded Universal was identical to base. Unneeded patch removed.", "Complete", MessageBox.MessageBoxButtons.Ok);
+        //         else
+        //             await MessageBox.Show(parent, "Universal is now saved as a patch.", "Complete", MessageBox.MessageBoxButtons.Ok);
+        //     }
+        //
+        //     public void btnEditStrings_Click()
         //     {
-        //         DataManager.Instance.HealFX = fx;
-        //         DataManager.SaveData(fx, DataManager.FX_PATH, "Heal", DataManager.DATA_EXT);
-        //     },
-        //     "Icons.SparkleFill"
-        // ));
-        //
-        // effectsNode.SubNodes.Add(_nodeFactory.CreateOpenEditorNodeFX<BattleFX>(
-        //     "Restore Charge FX",
-        //     () => DataManager.Instance.RestoreChargeFX,
-        //     (fx) =>
+        //         StringsEditViewModel mv = new StringsEditViewModel();
+        //         Views.StringsEditForm editForm = new Views.StringsEditForm();
+        //         mv.LoadStringEntries(false, editForm);
+        //         editForm.DataContext = mv;
+        //         editForm.Show();
+        //     }
+        //
+        //     public void btnEditStringsEx_Click()
         //     {
-        //         DataManager.Instance.RestoreChargeFX = fx;
-        //         DataManager.SaveData(fx, DataManager.FX_PATH, "RestoreCharge", DataManager.DATA_EXT);
-        //     },
-        //     "Icons.SparkleFill"
-        // ));
-        //
-        // effectsNode.SubNodes.Add(_nodeFactory.CreateOpenEditorNodeFX<BattleFX>(
-        //     "Lose Charge FX",
-        //     () => DataManager.Instance.LoseChargeFX,
-        //     (fx) =>
+        //         StringsEditViewModel mv = new StringsEditViewModel();
+        //         Views.StringsEditForm editForm = new Views.StringsEditForm();
+        //         mv.LoadStringEntries(true, editForm);
+        //         editForm.DataContext = mv;
+        //         editForm.Show();
+        //     }
+        //
+        //
+        //
+        //     public void btnEditHeal_Click()
         //     {
-        //         DataManager.Instance.LoseChargeFX = fx;
-        //         DataManager.SaveData(fx, DataManager.FX_PATH, "LoseCharge", DataManager.DATA_EXT);
-        //     },
-        //     "Icons.SparkleFill"
-        // ));
-        //
-        // effectsNode.SubNodes.Add(_nodeFactory.CreateOpenEditorNodeFX<EmoteFX>(
-        //     "No Charge FX",
-        //     () => DataManager.Instance.NoChargeFX,
-        //     (fx) =>
+        //         OpenItem<BattleFX>("Heal FX", DataManager.Instance.HealFX, (fx) => {
+        //             DataManager.Instance.HealFX = fx;
+        //             DataManager.SaveData(fx, DataManager.FX_PATH, "Heal", DataManager.DATA_EXT);
+        //         });
+        //     }
+        //     public void btnEditRestoreCharge_Click()
         //     {
-        //         DataManager.Instance.NoChargeFX = fx;
-        //         DataManager.SaveData(fx, DataManager.FX_PATH, "NoCharge", DataManager.DATA_EXT);
-        //     },
-        //     "Icons.SparkleFill"
-        // ));
-        //
-        // effectsNode.SubNodes.Add(_nodeFactory.CreateOpenEditorNodeFX<BattleFX>(
-        //     "Element FX",
-        //     () => DataManager.Instance.ElementFX,
-        //     (fx) =>
+        //         OpenItem<BattleFX>("Restore Charge FX", DataManager.Instance.RestoreChargeFX, (fx) => {
+        //             DataManager.Instance.RestoreChargeFX = fx;
+        //             DataManager.SaveData(fx, DataManager.FX_PATH, "RestoreCharge", DataManager.DATA_EXT);
+        //         });
+        //     }
+        //     public void btnEditLoseCharge_Click()
         //     {
-        //         DataManager.Instance.ElementFX = fx;
-        //         DataManager.SaveData(fx, DataManager.FX_PATH, "Element", DataManager.DATA_EXT);
-        //     },
-        //     "Icons.SparkleFill"
-        // ));
-        //
-        // effectsNode.SubNodes.Add(_nodeFactory.CreateOpenEditorNodeFX<BattleFX>(
-        //     "Intrinsic FX",
-        //     () => DataManager.Instance.IntrinsicFX,
-        //     (fx) =>
+        //         OpenItem<BattleFX>("Lose Charge FX", DataManager.Instance.LoseChargeFX, (fx) => {
+        //             DataManager.Instance.LoseChargeFX = fx;
+        //             DataManager.SaveData(fx, DataManager.FX_PATH, "LoseCharge", DataManager.DATA_EXT);
+        //         });
+        //     }
+        //     public void btnEditNoCharge_Click()
         //     {
-        //         DataManager.Instance.IntrinsicFX = fx;
-        //         DataManager.SaveData(fx, DataManager.FX_PATH, "Intrinsic", DataManager.DATA_EXT);
-        //     },
-        //     "Icons.SparkleFill"
-        // ));
-        //
-        // effectsNode.SubNodes.Add(_nodeFactory.CreateOpenEditorNodeFX<BattleFX>(
-        //     "Send Home FX",
-        //     () => DataManager.Instance.SendHomeFX,
-        //     (fx) =>
+        //         OpenItem<EmoteFX>("No Charge FX", DataManager.Instance.NoChargeFX, (fx) => {
+        //             DataManager.Instance.NoChargeFX = fx;
+        //             DataManager.SaveData(fx, DataManager.FX_PATH, "NoCharge", DataManager.DATA_EXT);
+        //         });
+        //     }
+        //     public void btnEditElement_Click()
         //     {
-        //         DataManager.Instance.SendHomeFX = fx;
-        //         DataManager.SaveData(fx, DataManager.FX_PATH, "SendHome", DataManager.DATA_EXT);
-        //     },
-        //     "Icons.SparkleFill"
-        // ));
-        //
-        // effectsNode.SubNodes.Add(_nodeFactory.CreateOpenEditorNodeFX<BattleFX>(
-        //     "Item Lost FX",
-        //     () => DataManager.Instance.ItemLostFX,
-        //     (fx) =>
+        //         OpenItem<BattleFX>("Element FX", DataManager.Instance.ElementFX, (fx) => {
+        //             DataManager.Instance.ElementFX = fx;
+        //             DataManager.SaveData(fx, DataManager.FX_PATH, "Element", DataManager.DATA_EXT);
+        //         });
+        //     }
+        //     public void btnEditIntrinsic_Click()
         //     {
-        //         DataManager.Instance.ItemLostFX = fx;
-        //         DataManager.SaveData(fx, DataManager.FX_PATH, "ItemLost", DataManager.DATA_EXT);
-        //     },
-        //     "Icons.SparkleFill"
-        // ));
-        //
-        // effectsNode.SubNodes.Add(_nodeFactory.CreateOpenEditorNodeFX<BattleFX>(
-        //     "Warp FX",
-        //     () => DataManager.Instance.WarpFX,
-        //     (fx) =>
+        //         OpenItem<BattleFX>("Intrinsic FX", DataManager.Instance.IntrinsicFX, (fx) => {
+        //             DataManager.Instance.IntrinsicFX = fx;
+        //             DataManager.SaveData(fx, DataManager.FX_PATH, "Intrinsic", DataManager.DATA_EXT);
+        //         });
+        //     }
+        //     public void btnEditSendHome_Click()
         //     {
-        //         DataManager.Instance.WarpFX = fx;
-        //         DataManager.SaveData(fx, DataManager.FX_PATH, "Warp", DataManager.DATA_EXT);
-        //     },
-        //     "Icons.SparkleFill"
-        // ));
-        //
-        // effectsNode.SubNodes.Add(_nodeFactory.CreateOpenEditorNodeFX<BattleFX>(
-        //     "Knockback FX",
-        //     () => DataManager.Instance.KnockbackFX,
-        //     (fx) =>
+        //         OpenItem<BattleFX>("Send Home FX", DataManager.Instance.SendHomeFX, (fx) => {
+        //             DataManager.Instance.SendHomeFX = fx;
+        //             DataManager.SaveData(fx, DataManager.FX_PATH, "SendHome", DataManager.DATA_EXT);
+        //         });
+        //     }
+        //     public void btnEditItemLost_Click()
         //     {
-        //         DataManager.Instance.KnockbackFX = fx;
-        //         DataManager.SaveData(fx, DataManager.FX_PATH, "Knockback", DataManager.DATA_EXT);
-        //     },
-        //     "Icons.SparkleFill"
-        // ));
-        //
-        // effectsNode.SubNodes.Add(_nodeFactory.CreateOpenEditorNodeFX<BattleFX>(
-        //     "Jump FX",
-        //     () => DataManager.Instance.JumpFX,
-        //     (fx) =>
+        //         OpenItem<BattleFX>("Item Lost FX", DataManager.Instance.ItemLostFX, (fx) => {
+        //             DataManager.Instance.ItemLostFX = fx;
+        //             DataManager.SaveData(fx, DataManager.FX_PATH, "ItemLost", DataManager.DATA_EXT);
+        //         });
+        //     }
+        //     public void btnEditWarp_Click()
         //     {
-        //         DataManager.Instance.JumpFX = fx;
-        //         DataManager.SaveData(fx, DataManager.FX_PATH, "Jump", DataManager.DATA_EXT);
-        //     },
-        //     "Icons.SparkleFill"
-        // ));
-        //
-        // effectsNode.SubNodes.Add(_nodeFactory.CreateOpenEditorNodeFX<BattleFX>(
-        //     "Throw FX",
-        //     () => DataManager.Instance.ThrowFX,
-        //     (fx) =>
+        //         OpenItem<BattleFX>("Warp FX", DataManager.Instance.WarpFX, (fx) => {
+        //             DataManager.Instance.WarpFX = fx;
+        //             DataManager.SaveData(fx, DataManager.FX_PATH, "Warp", DataManager.DATA_EXT);
+        //         });
+        //     }
+        //
+        //     public void btnEditKnockback_Click()
         //     {
-        //         DataManager.Instance.ThrowFX = fx;
-        //         DataManager.SaveData(fx, DataManager.FX_PATH, "Throw", DataManager.DATA_EXT);
-        //     },
-        //     "Icons.SparkleFill"
-        // ));
+        //         OpenItem<BattleFX>("Knockback FX", DataManager.Instance.KnockbackFX, (fx) => {
+        //             DataManager.Instance.KnockbackFX = fx;
+        //             DataManager.SaveData(fx, DataManager.FX_PATH, "Knockback", DataManager.DATA_EXT);
+        //         });
+        //     }
+        //
+        //     public void btnEditJump_Click()
+        //     {
+        //         OpenItem<BattleFX>("Jump FX", DataManager.Instance.JumpFX, (fx) => {
+        //             DataManager.Instance.JumpFX = fx;
+        //             DataManager.SaveData(fx, DataManager.FX_PATH, "Jump", DataManager.DATA_EXT);
+        //         });
+        //     }
+        //
+        //     public void btnEditThrow_Click()
+        //     {
+        //         OpenItem<BattleFX>("Throw FX", DataManager.Instance.ThrowFX, (fx) => { DataManager.Instance.ThrowFX = fx;
+        //             DataManager.SaveData(fx, DataManager.FX_PATH, "Throw", DataManager.DATA_EXT);
+        //         });
+        //     }
+        //
+        //     private delegate void SaveFX<T>(T obj);
+        //     private void OpenItem<T>(string name, T data, SaveFX<T> saveOp)
+        //     {
+        //         lock (GameBase.lockObj)
+        //         {
+        //             Views.DataEditForm editor = new Views.DataEditRootForm();
+        //             // EditorPageViewModel page = new EditorPageViewModel();
+        //             // pag
+        //             editor.Title = DataEditor.GetWindowTitle("", name, data, data.GetType());
+        //             DataEditor.LoadDataControls("", data, editor);
+        //             editor.SelectedOKEvent += async () =>
+        //             {
+        //                 lock (GameBase.lockObj)
+        //                 {
+        //                     object obj = data;
+        //                     DataEditor.SaveDataControls(ref obj, editor.ControlPanel, new Type[0]);
+        //                     saveOp((T)obj);
+        //                     return true;
+        //                 }
+        //             };
+        //
+        //             editor.Show();
+        //
+        //         }
+        //     }
+        //
+        // }
+        //
+        //
         //
-        // constantsNode.SubNodes.Add(effectsNode);
-        // effectsNode.SubNodes.Add(_nodeFactory.Create<BattleFX>("Damage FX", ...params));
-        // effectsNode.SubNodes.Add(_nodeFactory.Create<BattleFX>("Heal FX", ...params));
-
-
-        // var effectsNode = _nodeFactory.CreateOpenEditorNode("Effec", "Icons.ListFill", "");
-
 
-        // parent.SubNodes.Add(constantsNode);
+        constantsNode.SubNodes.Add(startParamsNode);
+        
+        constantsNode.SubNodes.Add(universalEventsNode);
+        constantsNode.SubNodes.Add(stringsNode);
+        
+        var effectsNode =
+            _context.NodeFactory.CreateOpenEditorNode<ZoneEditorPageViewModel>("Effects", "Icons.SparkleFill");
+        effectsNode.SubNodes.Add(_context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>("Heal FX",
+            "Icons.SparkleFill",
+            effectsNode,
+            CreateFXOnOpen(() => DataManager.Instance.HealFX, fx => DataManager.Instance.HealFX = fx, "Heal", parent)));
+
+        effectsNode.SubNodes.Add(_context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(
+            "Restore Charge FX", "Icons.SparkleFill",
+            effectsNode,
+            CreateFXOnOpen(() => DataManager.Instance.RestoreChargeFX, fx => DataManager.Instance.RestoreChargeFX = fx,
+                "RestoreCharge", parent)));
+
+        effectsNode.SubNodes.Add(_context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(
+            "Lose Charge FX", "Icons.SparkleFill",
+            effectsNode,
+            CreateFXOnOpen(() => DataManager.Instance.LoseChargeFX, fx => DataManager.Instance.LoseChargeFX = fx,
+                "LoseCharge", parent)));
+
+        effectsNode.SubNodes.Add(_context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(
+            "No Charge FX", "Icons.SparkleFill",
+            effectsNode,
+            CreateFXOnOpen(() => DataManager.Instance.NoChargeFX, fx => DataManager.Instance.NoChargeFX = fx,
+                "NoCharge", parent)));
+
+        effectsNode.SubNodes.Add(_context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>("Element FX",
+            "Icons.SparkleFill",
+            effectsNode,
+            CreateFXOnOpen(() => DataManager.Instance.ElementFX, fx => DataManager.Instance.ElementFX = fx, "Element",
+                parent)));
+
+        effectsNode.SubNodes.Add(_context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(
+            "Intrinsic FX", "Icons.SparkleFill",
+            effectsNode,
+            CreateFXOnOpen(() => DataManager.Instance.IntrinsicFX, fx => DataManager.Instance.IntrinsicFX = fx,
+                "Intrinsic", parent)));
+
+        effectsNode.SubNodes.Add(_context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(
+            "Send Home FX", "Icons.SparkleFill",
+            effectsNode,
+            CreateFXOnOpen(() => DataManager.Instance.SendHomeFX, fx => DataManager.Instance.SendHomeFX = fx,
+                "SendHome", parent)));
+
+        effectsNode.SubNodes.Add(_context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(
+            "Item Lost FX", "Icons.SparkleFill",
+            effectsNode,
+            CreateFXOnOpen(() => DataManager.Instance.ItemLostFX, fx => DataManager.Instance.ItemLostFX = fx,
+                "ItemLost", parent)));
+
+        effectsNode.SubNodes.Add(_context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>("Warp FX",
+            "Icons.SparkleFill",
+            effectsNode,
+            CreateFXOnOpen(() => DataManager.Instance.WarpFX, fx => DataManager.Instance.WarpFX = fx, "Warp", parent)));
+
+        effectsNode.SubNodes.Add(_context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(
+            "Knockback FX", "Icons.SparkleFill",
+            effectsNode,
+            CreateFXOnOpen(() => DataManager.Instance.KnockbackFX, fx => DataManager.Instance.KnockbackFX = fx,
+                "Knockback", parent)));
+
+        effectsNode.SubNodes.Add(_context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>("Jump FX",
+            "Icons.SparkleFill",
+            effectsNode,
+            CreateFXOnOpen(() => DataManager.Instance.JumpFX, fx => DataManager.Instance.JumpFX = fx, "Jump", parent)));
+
+        effectsNode.SubNodes.Add(_context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>("Throw FX",
+            "Icons.SparkleFill",
+            effectsNode,
+            CreateFXOnOpen(() => DataManager.Instance.ThrowFX, fx => DataManager.Instance.ThrowFX = fx, "Throw",
+                parent)));
+
+        constantsNode.SubNodes.Add(effectsNode);
+        parent.SubNodes.Add(constantsNode);
     }
 
     private void CreateDataNode(NodeBase parent)
     {
-        var dataNode = _nodeFactory.CreateOpenEditorNode<ZoneEditorPageViewModel>("Datazz", "Icons.FloppyDiskFill");
+        var dataNode =
+            _context.NodeFactory.CreateOpenEditorNode<ZoneEditorPageViewModel>("Datazz", "Icons.FloppyDiskFill");
         foreach (var type in Enum.GetValues<DataManager.DataType>())
         {
             if (type is DataManager.DataType.All or DataManager.DataType.None)
@@ -706,7 +906,7 @@ private void CreateDataNode(NodeBase parent)
 
             var entry = DataRegistry.Map[type];
 
-            var dataItemRootNode = _nodeFactory.CreateDataRootNode<DataListPageViewModel>(
+            var dataItemRootNode = _context.NodeFactory.CreateDataRootNode<DataListPageViewModel>(
                 type,
                 type.ToString(),
                 entry.Icon);
@@ -729,14 +929,15 @@ private void CreateDataNode(NodeBase parent)
     private void CreateSpriteNode(NodeBase parent)
     {
         // var spritesViewModel = _pageFactory.GetRequiredService<DevTabSpritesViewModel>();
-        var spriteNode = _nodeFactory.CreateOpenEditorNode<DevEditPageViewModel>("Sprites", "Icons.PaintBrushFill");
+        var spriteNode =
+            _context.NodeFactory.CreateOpenEditorNode<DevEditPageViewModel>("Sprites", "Icons.PaintBrushFill");
         //
         spriteNode.SubNodes.Add(
-            _nodeFactory.CreateOpenEditorNodeWithParams<SpeciesEditPageViewModel>("Char Sprites", [true],
+            _context.NodeFactory.CreateOpenEditorNodeWithParams<SpeciesEditPageViewModel>("Char Sprites", [true],
                 "Icons.PersonFill")
         );
         spriteNode.SubNodes.Add(
-            _nodeFactory.CreateOpenEditorNodeWithParams<SpeciesEditPageViewModel>("Portraits", [false],
+            _context.NodeFactory.CreateOpenEditorNodeWithParams<SpeciesEditPageViewModel>("Portraits", [false],
                 "Icons.PersonFill")
         );
         // );
@@ -857,13 +1058,13 @@ private void HandleSprites()
 
     private void CreateModNode(NodeBase parent)
     {
-        var modsViewModel = _pageFactory.GetRequiredService<DevTabModsViewModel>();
-        var modRoot = _nodeFactory.CreateModRootNode<DevEditPageViewModel>("Mods", "Icons.ScrollFill");
+        var modsViewModel = _context.PageFactory.GetRequiredService<DevTabModsViewModel>();
+        var modRoot = _context.NodeFactory.CreateModRootNode<DevEditPageViewModel>("Mods", "Icons.ScrollFill");
 
         foreach (ModsNodeViewModel mod in modsViewModel.Mods)
         {
             var name = mod.Namespace == "origin" ? "Origins" : mod.Name;
-            var itemNode = _nodeFactory.CreateDataItemNode<DevEditPageViewModel>(
+            var itemNode = _context.NodeFactory.CreateDataItemNode<DevEditPageViewModel>(
                 mod.Namespace,
                 $"{mod.Namespace}: {name}",
                 "Icons.ScrollFill");
@@ -876,12 +1077,13 @@ private void CreateModNode(NodeBase parent)
 
     private void InitializeTabEvents()
     {
+        TabEvents _tabEvents = _context.TabEvents;
         _tabEvents.AddChildTabEvent += (parent, child) =>
         {
             AddChildPage(parent, child);
             ActivePage = child;
         };
-        
+
         _tabEvents.SaveChildrenEvent += SaveChildren;
 
         _tabEvents.AddTopLevelTabEvent += (tab) => { AddTopLevelPage(tab); };
@@ -955,7 +1157,7 @@ public ModSwitcherViewModel? ModSwitcher
 
     public void AddPageFromTreeNode(OpenEditorNode node)
     {
-        var editor = _pageFactory.CreatePage(node.EditorType, node);
+        var editor = _context.PageFactory.CreatePage(node.EditorType, node, node.OnPageLoad);
 
         Console.WriteLine("EDitpr" + editor);
         if (editor != null)
@@ -969,9 +1171,8 @@ public async Task<bool> TryCloseTabAsync(EditorPageViewModel page)
     {
         if (PageHasChildren(page))
         {
-            
             // TODO: Add a can close method and check if any of the subtabs has any unsaved changes.
-            var result = await MessageBoxWindowView.Show(_dialogService,
+            var result = await MessageBoxWindowView.Show(_context.DialogService,
                 "Are you sure you want to close all subtabs?  Your changes will not be saved.", "Confirm Close",
                 MessageBoxWindowView.MessageBoxButtons.YesNo);
 
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/AnimEditPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/AnimEditPageViewModel.cs
new file mode 100644
index 00000000..2ffbb4ba
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/AnimEditPageViewModel.cs
@@ -0,0 +1,6 @@
+namespace RogueEssence.Dev.ViewModels;
+
+public class AnimEditPageViewModel
+{
+    
+}
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DataListPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DataListPageViewModel.cs
index 4e0ebd7d..12ccf0e4 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DataListPageViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DataListPageViewModel.cs
@@ -4,6 +4,7 @@
 using System.Linq;
 using System.Reactive;
 using System.Threading.Tasks;
+using Avalonia.Controls;
 using Avalonia.Platform.Storage;
 using Avalonia.Threading;
 using DynamicData;
@@ -53,7 +54,7 @@ public DataListEntry? SelectedItem
     public DataManager.DataType DataType => Node.DataType;
 
 
-    public DataListPageViewModel(EditorContext context, NodeBase node) : base(context, node)
+    public DataListPageViewModel(EditorContext context, NodeBase node, Action<EditorPageViewModel> onPageOpen = null) : base(context, node, onPageOpen)
     {
     }
 
@@ -71,7 +72,7 @@ private void ReloadEntries()
     }
 
 
-    public override void LoadData()
+    public override void OnPageLoad()
     {
         ReloadEntries();
 
@@ -231,10 +232,62 @@ private void UpdateVisibleItems(string filter)
             FilteredItems.Add(item);
     }
 
+    
+    Action<EditorPageViewModel> _onPageOpen;
+    public void OnPageOpen(Action<EditorPageViewModel> onPageOpen)
+    {
+     
+        
+    }
+    
     public void AddUnderParentNode(DataListEntry entry)
     {
+
+        Action<EditorPageViewModel> callback = (vm) =>
+        {
+            ReflectedDataPageViewModel pg = (ReflectedDataPageViewModel)vm;
+            
+            pg.SetIsRootPage(true);
+            
+            
+            var dataRoot = pg.Node.FindNode<DataRootNode>();
+            var dataItem = pg.Node.FindNode<DataItemNode>();
+
+            DataManager.DataType dataType = dataRoot.DataType;
+            string key = dataItem.ItemKey;
+
+            var regis = DataRegistry.Map[dataType];
+            IEntryData data = regis.GetEntry(key);
+
+            string title = DataEditor.GetWindowTitle(String.Format("{0} #{1}", dataType.ToString(), key),
+                data.Name.ToLocal(), data, data.GetType());
+
+            pg.SetPageTitle(title, pg.Node.Icon);
+
+            pg.OnLoadAction = (StackPanel stack) =>
+            {
+                DataEditor.LoadDataControls(key, data, stack);
+            };
+
+            pg.OnOKAction = async (StackPanel stack) =>
+            {
+                lock (GameBase.lockObj)
+                {
+                    object obj = data;
+                    DataEditor.SaveDataControls(ref obj, stack, new Type[0]);
+                    DataManager.Instance.ContentChanged(dataType, key, (IEntryData)obj);
+
+                    string newName = DataManager.Instance.DataIndices[dataType].Get(key).GetLocalString(true);
+                    pg.SetPageTitle(
+                        DataEditor.GetWindowTitle(String.Format("{0} #{1}", dataType.ToString(), key), newName, obj,
+                            obj.GetType()), pg.Node.Icon);
+                }
+
+                return true;
+            };
+        };
         Node.AddNodeIfNotExists(
-            _context.NodeFactory.CreateDataItemNode<ReflectedDataPageViewModel>(entry.Key, entry.Title, Node.Icon));
+            _context.NodeFactory.CreateDataItemNode<ReflectedDataPageViewModel>(entry.Key, entry.Title, Node.Icon, callback));
         NodeHelper.ExpandParents(Node, true);
     }
 
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DevControlViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DevControlViewModel.cs
index 51b850f0..cd2d3486 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DevControlViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DevControlViewModel.cs
@@ -1,3 +1,4 @@
+using System;
 using RogueEssence.Dev.Services;
 
 namespace RogueEssence.Dev.ViewModels;
@@ -17,7 +18,7 @@ public class DevControlViewModel : EditorPageViewModel
 
     public DevControlViewModel(EditorContext context,
         DevTabGameViewModel game, DevTabPlayerViewModel player, DevTabTravelViewModel travel,
-        DevTabScriptViewModel script, NodeBase node) : base(context, node)
+        DevTabScriptViewModel script, NodeBase node, Action<EditorPageViewModel> onPageOpen = null) : base(context, node, onPageOpen)
     {
         Fruits = new TestComboBoxViewModel();
         Game = game;
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DevEditPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DevEditPageViewModel.cs
index d7ce87e8..bc8f2182 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DevEditPageViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DevEditPageViewModel.cs
@@ -67,7 +67,7 @@ private void OpenList(DataManager.DataType dataType, GetEntry entryOp, CreateEnt
     
     // public override string? Title => "Dev Edit";
 
-    public DevEditPageViewModel(EditorContext context, NodeBase node) : base(context, node)
+    public DevEditPageViewModel(EditorContext context, NodeBase node, Action<EditorPageViewModel> onPageOpen = null) : base(context, node, onPageOpen)
     {
         var n = node as DataItemNode;
         var nn = node.Parent as DataRootNode;
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/EditorPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/EditorPageViewModel.cs
index e6c9e43d..90073bd4 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/EditorPageViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/EditorPageViewModel.cs
@@ -16,7 +16,7 @@ public abstract class EditorPageViewModel<TNode> : EditorPageViewModel
     // The node that opened this page
     public new TNode Node => (TNode)base.Node;
 
-    protected EditorPageViewModel(EditorContext context, NodeBase node) : base(context, node)
+    protected EditorPageViewModel(EditorContext context, NodeBase node, Action<EditorPageViewModel> onPageOpen = null) : base(context, node, onPageOpen)
     {
     }
     protected override bool IsSamePage(EditorPageViewModel other)
@@ -46,9 +46,13 @@ public virtual void OnPageRemoved()
     // Whether to add a new tab when this page is added
     public virtual bool AddNewTab => true;
     
-        
+    private Action<EditorPageViewModel>? _onPageLoad;
+    
     // Only load data when there is no duplicate pages using the IsSamePage method
-    public virtual void LoadData() { }
+    public virtual void OnPageLoad()
+    {
+        _onPageLoad?.Invoke(this);
+    }
     
         
     private string _title = "";
@@ -117,26 +121,27 @@ public bool Modified
     
     protected readonly EditorContext _context;
 
-    protected EditorPageViewModel(EditorContext context, NodeBase node)
+    protected EditorPageViewModel(EditorContext context, NodeBase node, Action<EditorPageViewModel> onPageLoad = null)
     {
         Node = node;
         _context = context;
+        _onPageLoad = onPageLoad;
     }
     
-    public (NodeBase node, ReflectedDataPageViewModel? editor) AddNewNodeAndTab(string title, string icon = "Icons.PaintBrushFill")
-    {
-        NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(title, icon);
-        Node.SubNodes.Add(node);
-        ReflectedDataPageViewModel editor = _context.PageFactory.CreatePage<ReflectedDataPageViewModel>(node);
-        if (editor != null)
-        {
-            editor.SetPageTitle(title, icon);
-            _context.TabEvents.AddChildPage(this, editor);
-        }
-
-        return (node, editor);
-    }
- 
+    // public (NodeBase node, ReflectedDataPageViewModel? editor) AddNewNodeAndTab(string title, string icon = "Icons.PaintBrushFill")
+    // {
+    //     NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(title, icon);
+    //     Node.SubNodes.Add(node);
+    //     ReflectedDataPageViewModel editor = _context.PageFactory.CreatePage<ReflectedDataPageViewModel>(node);
+    //     if (editor != null)
+    //     {
+    //         editor.SetPageTitle(title, icon);
+    //         _context.TabEvents.AddChildPage(this, editor);
+    //     }
+    //
+    //     return (node, editor);
+    // }
+    //
     
 
     public void SetPageTitleFromNode(NodeBase node)
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/GroundEditorPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/GroundEditorPageViewModel.cs
index f830624f..74697a7c 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/GroundEditorPageViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/GroundEditorPageViewModel.cs
@@ -1,3 +1,4 @@
+using System;
 using RogueEssence.Dev.Services;
 
 namespace RogueEssence.Dev.ViewModels;
@@ -6,6 +7,6 @@ public class GroundEditorPageViewModel : EditorPageViewModel
 {
     // public override string Title => "Ground Editor Long Name";
     
-    public GroundEditorPageViewModel(EditorContext context, NodeBase node) : base(context, node)
+    public GroundEditorPageViewModel(EditorContext context, NodeBase node, Action<EditorPageViewModel> onPageOpen = null) : base(context, node, onPageOpen)
     { }
 }
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ModInfoEditorViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ModInfoEditorViewModel.cs
index 4efea4f8..cb0e565c 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ModInfoEditorViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ModInfoEditorViewModel.cs
@@ -1,3 +1,5 @@
+using System;
+
 namespace RogueEssence.Dev.ViewModels;
 
 using Dev.Services;
@@ -10,7 +12,7 @@ public class ModInfoEditorViewModel : EditorPageViewModel
 
     public TestComboBoxViewModel Fruits { get; }
     
-    public ModInfoEditorViewModel(EditorContext context, NodeBase node) : base(context, node) 
+    public ModInfoEditorViewModel(EditorContext context, NodeBase node, Action<EditorPageViewModel> onPageOpen = null) : base(context, node, onPageOpen) 
     {
        
         Fruits = new TestComboBoxViewModel();
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/RandomInfoPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/RandomInfoPageViewModel.cs
index c0564129..60ceed16 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/RandomInfoPageViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/RandomInfoPageViewModel.cs
@@ -1,3 +1,4 @@
+using System;
 using RogueEssence.Dev.Services;
 
 namespace RogueEssence.Dev.ViewModels;
@@ -7,7 +8,7 @@ public class RandomInfoPageViewModel : EditorPageViewModel
     public override bool AddNewTab => false;
     
     // public override string Title => "Random Page Info";
-    public RandomInfoPageViewModel(EditorContext context, NodeBase node) : base(context, node)
+    public RandomInfoPageViewModel(EditorContext context, NodeBase node, Action<EditorPageViewModel> onPageOpen = null) : base(context, node, onPageOpen)
     {
     }
     
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ReflectedDataPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ReflectedDataPageViewModel.cs
index 9c4b9916..45e69b8f 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ReflectedDataPageViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ReflectedDataPageViewModel.cs
@@ -15,24 +15,33 @@ public class ReflectedDataPageViewModel : EditorPageViewModel<NodeBase>
     
     public Action<StackPanel> OnLoadAction;
     public Func<StackPanel, Task<bool>> OnOKAction;
-
-    // public delegate Task<bool> OKEvent();
-    // public OKEvent SelectedOKEvent;
-
-    // public override string Title => "Random Page Info";
+    
+    private bool _shouldRemoveNode = true;
+    
     public ReflectedDataPageViewModel(EditorContext context,
-        NodeBase node) : base(context, node)
+        NodeBase node, Action<EditorPageViewModel> onPageLoad) : base(context, node, onPageLoad)
     {
-        AddNewNodeAndTabCommand = ReactiveCommand.Create(AddNewNodeAndTabDefault);
     }
     
-    public bool isRootPage => Node is not ReflectedDataNode;
-    public override void LoadData()
+    // Whether to remove the node from the parent when the page is closed
+    public void SetRemoveNode(bool remove)
     {
-        base.LoadData();
+        _shouldRemoveNode = remove;
+    }
+    
+    private bool _isRootPage;
+    public bool IsRootPage
+    {
+        get => _isRootPage;
+        private set => this.RaiseAndSetIfChanged(ref _isRootPage, value);
     }
 
-
+    // If the page is the root page, it will include the "Save All Sub-Windows" button
+    public void SetIsRootPage(bool isRoot)
+    {
+        IsRootPage = isRoot;
+    }
+    
     public async Task<bool> ApplySave()
     {
         await _context.TabEvents.SaveChildren(this);
@@ -40,81 +49,22 @@ public async Task<bool> ApplySave()
             return await saveable.Save();
         return true;
     }
-    public void Close()
-    {
-        Node.Parent?.SubNodes.Remove(Node);
-        _context.TabEvents.RemoveTab(this);
-    }
 
-    public ReactiveCommand<Unit, Unit> AddNewNodeAndTabCommand { get; }
- 
-    public void AddNewNodeAndTabDefault()
+    public void RemoveNodeFromTree()
     {
-        NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>("New Node [TODO Change Title]", "Icons.PaintBrushFill");
-        Node.SubNodes.Add(node);
-        var editor = _context.PageFactory.CreatePage<ReflectedDataPageViewModel>(node);
-        if (editor != null)
+        if (_shouldRemoveNode)
         {
-            editor.SetPageTitle("New Node [TODO Change Title]", Node.Icon);
-            _context.TabEvents.AddChildPage(this, editor);
+            Node.Parent?.SubNodes.Remove(Node);
         }
     }
-    
-    public event EventHandler Closed;
-
-    public List<ReflectedDataPageViewModel> Children;
-
-    // public void RegisterChild(ReflectedDataPageViewModel child)
-    // {
-    //     Children.Add(child);
-    //     child.Closed += (object sender, EventArgs e) =>
-    //     {
-    //         Children.Remove(child);
-    //         TabClosed?.Invoke(this, EventArgs.Empty);
-    //     };
-    // }
-    
-    public void RegisterChild(ReflectedDataPageViewModel child)
-    {
-        Children.Add(child);
-    }
-    
-    public void UnregisterChild(ReflectedDataPageViewModel child)
+    public void Close()
     {
-        Children.Remove(child);
-        Closed?.Invoke(this, EventArgs.Empty);
+        _context.TabEvents.RemoveTab(this);
+        RemoveNodeFromTree();
     }
-    
-    // public async Task SaveChildren()
-    // {
-    //     for (int ii = Children.Count - 1; ii >= 0; ii--)
-    //     {
-    //         DataEditForm dataEditor = children[ii];
-    //         if (dataEditor != null)
-    //         {
-    //             await dataEditor.SaveChildren();
-    //             if (dataEditor.SelectedOKEvent != null)
-    //                 await dataEditor.SelectedOKEvent.Invoke();
-    //         }
-    //     }
-    // }
-    //
-
-    // Dummy test
-    // public void AddNewNodeAndTab()
-    // {
-    //     NodeBase node = NodeFactory.CreateOpenEditorNode<ReflectedDataPageViewModel>("New Node", "Icons.PaintBrushFill");
-    //     Node.SubNodes.Add(node);
-    //     var editor = PageFactory.CreatePage<ReflectedDataPageViewModel>(node);
-    //     if (editor != null)
-    //     {
-    //         TabEvents.AddTopLevelTab(editor);
-    //     }
-    // }
-    
     public override void OnPageRemoved()
     {
-        Node.Parent?.RemoveNode(Node);
+        RemoveNodeFromTree();
         base.OnPageRemoved();
     }
     
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/SpeciesEditPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/SpeciesEditPageViewModel.cs
index 1e2b2cc3..d8bf3859 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/SpeciesEditPageViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/SpeciesEditPageViewModel.cs
@@ -95,11 +95,9 @@ protected override bool IsSamePage(EditorPageViewModel other)
         // public override string Title => "Species Editor";
 
 
-        public bool CheckSprites;
+        public bool CheckSprites { get; private set; }
         private bool notifiedImport;
-
-        private Window parent;
-
+        
 
         public string Name
         {
@@ -109,7 +107,6 @@ public string Name
                     ? GraphicsManager.AssetType.Chara.ToString()
                     : GraphicsManager.AssetType.Portrait.ToString();
             }
-            set { }
         }
 
         private List<string> monsterKeys;
@@ -207,7 +204,7 @@ private void RefreshTreeDataGrid()
         public string HeaderText { get; }
 
         public SpeciesEditPageViewModel(EditorContext context,
-            OpenEditorNodeWithParams node) : base(context, node)
+            OpenEditorNodeWithParams node, Action<EditorPageViewModel> onPageOpen) : base(context, node, onPageOpen)
         {
             Monsters = new ObservableCollection<MonsterNodeViewModel>();
             OpList = new ObservableCollection<SpeciesOpContainer>();
@@ -215,7 +212,7 @@ public SpeciesEditPageViewModel(EditorContext context,
             HeaderText = node.Title;
         }
 
-        public override void LoadData()
+        public override void OnPageLoad()
         {
             LoadFormDataEntries(CheckSprites);
             this.WhenAnyValue(x => x.Filter).Throttle(TimeSpan.FromMilliseconds(300)).Subscribe(ApplyFilter);
@@ -364,9 +361,8 @@ public async void MassExportFlow(bool singleSheet)
 
             bool success = MassExport(CachedPath, singleSheet);
             if (!success)
-                await MessageBox.Show(parent,
-                    "Errors found exporting to\n" + CachedPath + "\n\nCheck logs for more info.", "Mass Export Failed",
-                    MessageBox.MessageBoxButtons.Ok);
+                await MessageBoxWindowView.Show(_context.DialogService,"Errors found exporting to\n" + CachedPath + "\n\nCheck logs for more info.", "Mass Export Failed",
+                    MessageBoxWindowView.MessageBoxButtons.Ok);
         }
 
         public async void mnuReIndex_Click()
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/SpritePageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/SpritePageViewModel.cs
index 832aa858..5ff0d95b 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/SpritePageViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/SpritePageViewModel.cs
@@ -16,7 +16,7 @@ public class SpritePageViewModel : EditorPageViewModel
     // public override string Title => "Sprite Stuff";
 
 
-    public SpritePageViewModel(EditorContext context, NodeBase node) : base(context, node)
+    public SpritePageViewModel(EditorContext context, NodeBase node, Action<EditorPageViewModel> onPageOpen = null) : base(context, node, onPageOpen)
     {
         CreateATab = ReactiveCommand.Create(() => _context.TabEvents.AddChildPage(this, _context.PageFactory.CreatePage(typeof(SpritePageViewModel))));
         CreateATopTab = ReactiveCommand.Create(() => _context.TabEvents.AddTopLevelTab(_context.PageFactory.CreatePage(typeof(ModInfoEditorViewModel))));
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/StringEditPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/StringEditPageViewModel.cs
new file mode 100644
index 00000000..96b641f5
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/StringEditPageViewModel.cs
@@ -0,0 +1,211 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.Reactive;
+using Avalonia.Controls;
+using Avalonia.Platform.Storage;
+using ReactiveUI;
+
+namespace RogueEssence.Dev.ViewModels;
+
+public class StringEditPageViewModel : EditorPageViewModel
+{
+    public bool IsMenuText { get; private set;  }
+    
+    public string HeaderText { get; }
+    
+    public StringEditPageViewModel(EditorContext context, OpenEditorNodeWithParams node, Action<EditorPageViewModel> onPageOpen = null)
+        : base(context, node, onPageOpen)
+    {
+        GameStrings = new ObservableCollection<MapString>();
+        IsMenuText = (bool)node.ExtraParams[0];
+        HeaderText = node.Title;
+    }
+    public override void OnPageLoad()
+    {
+        LoadStringEntries();
+    }
+    
+    protected override bool IsSamePage(EditorPageViewModel other)
+    {
+        if (other is not StringEditPageViewModel stringPage)
+            return false;
+
+        return this.IsMenuText == stringPage.IsMenuText;
+    }
+        
+    
+    public string Name
+    {
+        get { return IsMenuText ? "stringsEx" : "strings"; }
+    }
+
+
+    // Later: implement variable length columns workaround https://github.com/AvaloniaUI/Avalonia/issues/2781
+    public ObservableCollection<MapString> GameStrings { get; set; }
+
+    private int currentString;
+
+    public int CurrentString
+    {
+        get { return currentString; }
+        set { this.SetIfChanged(ref currentString, value); }
+    }
+
+
+    public void btnAddString_Click()
+    {
+        string defname = String.Format("String_{0}", GameStrings.Count);
+        //if (CurrentString > -1)
+        //    GameStrings.Insert(CurrentString, new MapString(defname, "", ""));
+        //else
+        GameStrings.Add(new MapString(defname, "", ""));
+    }
+
+    public void btnDeleteString_Click()
+    {
+        GameStrings.RemoveAt(CurrentString);
+    }
+
+    
+
+    public void LoadStringEntries()
+    {
+        LoadStrings();
+    }
+
+
+    public void btnAdd_Click()
+    {
+        string defname = String.Format("STRING_{0}", GameStrings.Count);
+        GameStrings.Add(new MapString(defname, "", ""));
+    }
+
+    public void btnDelete_Click()
+    {
+        GameStrings.RemoveAt(CurrentString);
+    }
+
+    public void btnSave_Click()
+    {
+        SaveStrings();
+    }
+
+
+    /// <summary>
+    /// Loads the strings files content into the data grid view for editing
+    /// </summary>
+    /// <param name="stringsdir">Directory in which string resx files are stored!</param>
+    public void LoadStrings()
+    {
+        populateStringTable(GameStrings, false);
+    }
+
+    private void populateStringTable(IList<MapString> strings, bool skipTopMod)
+    {
+        string stringsdir = "Strings/";
+        //Clear old strings
+        Dictionary<string, Dictionary<string, (string val, string comment)>> rawStrings =
+            new Dictionary<string, Dictionary<string, (string, string)>>();
+
+
+        string FMTStr = String.Format("{0}{1}{2}", Name, "{0}", Text.STRINGS_FILE_EXT);
+        foreach (string code in Text.SupportedLangs)
+        {
+            string fname =
+                String.Format(FMTStr, code == "en" ? "" : ("." + code)); //special case for english, which is default
+            string path = Path.Combine(stringsdir, fname);
+
+            bool first = true;
+            foreach (string modPath in PathMod.FallbackPaths(path))
+            {
+                if (first && skipTopMod)
+                {
+                    first = false;
+                    continue;
+                }
+
+                Dictionary<string, (string val, string comment)> xmlDict = Text.LoadDevStringResx(modPath);
+                foreach (string name in xmlDict.Keys)
+                {
+                    if (!rawStrings.ContainsKey(name))
+                        rawStrings.Add(name, new Dictionary<string, (string val, string comment)>());
+
+                    if (!rawStrings[name].ContainsKey(code))
+                        rawStrings[name].Add(code, xmlDict[name]);
+                }
+
+                first = false;
+            }
+        }
+
+        strings.Clear();
+        foreach (string key in rawStrings.Keys)
+        {
+            Dictionary<string, string> comments = new Dictionary<string, string>();
+            Dictionary<string, string> vals = new Dictionary<string, string>();
+            foreach (string name in rawStrings[key].Keys)
+            {
+                comments[name] = rawStrings[key][name].comment;
+                vals[name] = rawStrings[key][name].val;
+            }
+
+            strings.Add(new MapString(key, comments, vals));
+        }
+    }
+
+    /// <summary>
+    /// Writes the content of the dataview into a set of resx files for each languages
+    /// </summary>
+    public void SaveStrings()
+    {
+        string stringsdir = "Strings/";
+
+        string FMTStr = String.Format("{0}{1}{2}", Name, "{0}", Text.STRINGS_FILE_EXT);
+        foreach (string code in Text.SupportedLangs)
+        {
+            string fname =
+                String.Format(FMTStr, code == "en" ? "" : ("." + code)); //special case for english, which is default
+            string path = Path.Combine(stringsdir, fname);
+            string modPath = PathMod.HardMod(path);
+            Dictionary<string, (string val, string comment)> stringDict =
+                new Dictionary<string, (string val, string comment)>();
+            List<MapString> baseStrings = new List<MapString>();
+            populateStringTable(baseStrings, true);
+
+            foreach (MapString str in GameStrings)
+            {
+                string cm, tl;
+                if (!str.Comments.TryGetValue(code, out cm))
+                    cm = "";
+                if (!str.Translations.TryGetValue(code, out tl))
+                    tl = "";
+                if (tl != "" || code == "en")
+                    stringDict[str.Key] = (tl, cm);
+            }
+
+            //remove the ones identical to baseStrings
+            foreach (MapString str in baseStrings)
+            {
+                string cm, tl;
+                if (!str.Comments.TryGetValue(code, out cm))
+                    cm = "";
+                if (!str.Translations.TryGetValue(code, out tl))
+                    tl = "";
+                (string val, string comment) item;
+                if (stringDict.TryGetValue(str.Key, out item))
+                {
+                    if (item.val == tl && item.comment == cm)
+                        stringDict.Remove(str.Key);
+                }
+            }
+
+            Text.SaveStringResx(modPath, stringDict);
+
+
+            lock (GameBase.lockObj)
+                Text.SetCultureCode(DiagManager.Instance.CurSettings.Language);
+        }
+    }
+}
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ZoneEditorPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ZoneEditorPageViewModel.cs
index ef71d554..68005a48 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ZoneEditorPageViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ZoneEditorPageViewModel.cs
@@ -1,3 +1,4 @@
+using System;
 using RogueEssence.Dev.Services;
 
 namespace RogueEssence.Dev.ViewModels;
@@ -6,7 +7,7 @@ public class ZoneEditorPageViewModel : EditorPageViewModel
 {
     // public override string Title => "Zone Editor";
     
-    public ZoneEditorPageViewModel(EditorContext context, NodeBase node) : base(context, node)
+    public ZoneEditorPageViewModel(EditorContext context, NodeBase node, Action<EditorPageViewModel> onPageOpen = null) : base(context, node, onPageOpen)
     {
         
     }
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/NodeBase.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/NodeBase.cs
index c4564ab5..50ea781b 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/NodeBase.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/NodeBase.cs
@@ -15,6 +15,7 @@
 using Avalonia.Platform.Storage;
 using Avalonia.ReactiveUI;
 using Avalonia.Threading;
+using DynamicData;
 using RogueEssence.Dev.Services;
 using ReactiveUI;
 using RogueEssence.Content;
@@ -130,10 +131,17 @@ public void CollapseChildren()
             child.CollapseChildren();
         }
     }
-    public void AddNodeIfNotExists(NodeBase node)
+    public bool AddNodeIfNotExists(NodeBase node)
     {
+        bool added = false;
+
         if (!SubNodes.Contains(node))
+        {
             SubNodes.Add(node);
+            added = true;
+        }
+        
+        return added;
     }
     
     public void RemoveNode(NodeBase node)
@@ -161,10 +169,13 @@ public T FindNode<T>() where T : NodeBase
 public class OpenEditorNode : NodeBase
 {
     public Type EditorType { get; }
-
-    public OpenEditorNode(string title, Type? editorType, string? icon = null)
+    
+    public readonly Action<EditorPageViewModel>? OnPageLoad;
+    
+    public OpenEditorNode(string title, Type? editorType, string? icon = null, Action<EditorPageViewModel>? onPageLoad = null)
         : base(title, icon ?? "")
     {
+        OnPageLoad = onPageLoad;
         EditorType = editorType;
     }
     
@@ -182,16 +193,34 @@ protected override int GetHashCodeCore()
 
 public class ReflectedDataNode : OpenEditorNode
 {
-    public ReflectedDataNode(string title, Type editorType, string icon = null)
-        : base(title, editorType, icon)
-    { }
-    
-    // TODO: Rather than using references, keep track of a tree of inherited subtypes to check if they're equal?
-    // Don't use references...
-    // Don't use the title, use the type instead or a combination of elementName, parent, elementType
-    // Find something more reliable than the title?
-    protected override bool EqualsCore(NodeBase other) => other.Title == Title;
-    protected override int GetHashCodeCore() => Title.GetHashCode();
+    private string BuildIdentifier(NodeBase? parent)
+    {
+        var parts = new List<string> { Title };
+        NodeBase? current = parent;
+
+        while (current != null)
+        {
+            parts.Add(current.Title);
+            current = current.Parent;
+        }
+
+        parts.Reverse();
+        return string.Join("/", parts);
+    }
+
+    private readonly string _identifier;
+
+    public ReflectedDataNode(string title, Type editorType,
+        string icon = null, NodeBase? parent = null, Action<EditorPageViewModel>? onPageLoad = null)
+        : base(title, editorType, icon, onPageLoad)
+    {
+        _identifier = BuildIdentifier(parent);
+    }
+
+    protected override bool EqualsCore(NodeBase other)
+        => other is ReflectedDataNode o && _identifier == o._identifier;
+
+    protected override int GetHashCodeCore() => _identifier.GetHashCode();
 }
 
 
@@ -204,8 +233,9 @@ public OpenEditorNodeWithParams(
         string title,
         Type? editorType,
         object[] extraParams,
-        string? icon = null)
-        : base(title, editorType, icon)
+        string? icon = null, 
+        Action<EditorPageViewModel>? onPageLoad = null)
+        : base(title, editorType, icon, onPageLoad)
     {
         ExtraParams = extraParams;
     }
@@ -221,8 +251,10 @@ public OpenEditorNodeFX(
         Type? editorType,
         Func<T> getter, 
         Action<T> setter,
-        string? icon = null)
-        : base(title, editorType, icon)
+        string? icon = null,
+        Action<EditorPageViewModel>? onPageLoad = null
+        )
+        : base(title, editorType, icon, onPageLoad)
     {
         _getter = getter;
         _setter = setter;
@@ -244,8 +276,8 @@ public abstract class ItemRootNode : OpenEditorNode
     public abstract Task AddItem();
     public abstract Task DeleteItem(string key);
 
-    protected ItemRootNode(string title, Type? editorKey, string icon = null)
-        : base(title, editorKey, icon)
+    protected ItemRootNode(string title, Type? editorKey, string icon = null, Action<EditorPageViewModel>? onPageLoad = null)
+        : base(title, editorKey, icon, onPageLoad)
     {
         DeleteCommand = ReactiveCommand.Create<NodeBase>(RemoveNode);
         
@@ -260,8 +292,8 @@ public class DataRootNode : ItemRootNode
     private readonly IDialogService _dialogService;
 
     public DataRootNode(NodeFactory nodeFactory, IDialogService dialogService, DataManager.DataType dataType,
-        Type? editorType, string title, string? icon = null)
-        : base(title, editorType, icon ?? "")
+        Type? editorType, string title, string? icon = null, Action<EditorPageViewModel>? onPageLoad = null)
+        : base(title, editorType, icon ?? "", onPageLoad)
     {
         _nodeFactory = nodeFactory;
         _dialogService = dialogService;
@@ -648,8 +680,8 @@ public class DataItemNode : OpenEditorNode
     //     set => this.RaiseAndSetIfChanged(ref _editorKey, value);
     // }
 
-    public DataItemNode(string itemKey, Type? editorType, string? title, string? icon = null)
-        : base(title ?? "", editorType, icon ?? "")
+    public DataItemNode(string itemKey, Type? editorType, string? title, string? icon = null, Action<EditorPageViewModel>? onPageLoad = null)
+        : base(title ?? "", editorType, icon ?? "", onPageLoad)
     {
         ItemKey = itemKey;
     }
@@ -694,8 +726,8 @@ public SpriteRootNode(
         GraphicsManager.AssetType assetType,
         Type? editorType,
         string title,
-        string? icon = null)
-        : base(title, editorType, icon ?? "")
+        string? icon = null, Action<EditorPageViewModel>? onPageLoad = null)
+        : base(title, editorType, icon ?? "", onPageLoad)
     {
         AssetType = assetType;
         // _dialogService = dialogService;
@@ -760,8 +792,8 @@ public class SpriteTileRootNode : SpriteRootNode
     private readonly IDialogService _dialogService;
     public ReactiveCommand<Unit, Unit> ReIndexCommand { get; }
 
-    public SpriteTileRootNode(IDialogService dialogService, NodeFactory nodeFactory, Type? editorType, string title, string? icon = null)
-        : base(dialogService, nodeFactory, GraphicsManager.AssetType.Tile, editorType, title, icon)
+    public SpriteTileRootNode(IDialogService dialogService, NodeFactory nodeFactory, Type? editorType, string title, string? icon = null, Action<EditorPageViewModel>? onPageLoad = null)
+        : base(dialogService, nodeFactory, GraphicsManager.AssetType.Tile, editorType, title, icon, onPageLoad)
     {
         _nodeFactory = nodeFactory;
         _dialogService = dialogService;
@@ -823,8 +855,8 @@ public class ModRootNode : ItemRootNode
 
     private readonly IDialogService _dialogService;
     public ModRootNode(NodeFactory nodeFactory, IDialogService dialogService,
-        Type? editorType, string title, string? icon = null)
-        : base(title, editorType, icon ?? "")
+        Type? editorType, string title, string? icon = null, Action<EditorPageViewModel>? onPageLoad = null)
+        : base(title, editorType, icon ?? "", onPageLoad)
     {
         _nodeFactory = nodeFactory;
         _dialogService = dialogService;
diff --git a/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabScript.axaml b/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabScript.axaml
index 8577f21c..d792b60d 100644
--- a/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabScript.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabScript.axaml
@@ -8,12 +8,12 @@
     <Design.DataContext>
         <vm:DevTabScriptViewModel/>
     </Design.DataContext>
-    <Grid RowDefinitions="40, 26, Auto, 40" ColumnDefinitions="*, *" ColumnSpacing="8" RowSpacing="8">
+    <Grid RowDefinitions="40, 26, Auto, 80" ColumnDefinitions="*, *" ColumnSpacing="8" RowSpacing="8">
                   
         <Button Classes="flat" Name="btnReloadScripts" Command="{Binding btnReloadScripts_Click}" Margin="4" Grid.Row="0" Grid.Column="0" >Reload Scripts</Button>
         <Button Classes="flat" Name="btnTextTest" Command="{Binding btnTextTest_Click}" Margin="4" Grid.Row="0" Grid.Column="1" >Text Test</Button>
         <TextBlock Margin="4,0" VerticalAlignment="Bottom" Grid.Row="1" Grid.Column="0">Lua Console:</TextBlock>
-        <TextBox Name="txtScriptOutput" Height="300" VerticalAlignment="Stretch" VerticalContentAlignment="Top" Text="{Binding ScriptLog}" CaretIndex="{Binding ScriptCaret}" Margin="4" IsReadOnly="True" Grid.Row="2" Grid.ColumnSpan="2" />
-        <TextBox Name="txtScriptInput" Text="{Binding ScriptLine}" CaretIndex="{Binding CmdCaret, Mode=TwoWay}" Margin="4" TextWrapping="Wrap" Grid.Row="3" Grid.ColumnSpan="2" KeyDown="txtScriptInput_KeyDown"></TextBox>
+        <TextBox Name="txtScriptOutput" Height="300" VerticalAlignment="Stretch" VerticalContentAlignment="Top" Text="{Binding ScriptLog}" CaretIndex="{Binding ScriptCaret}" Margin="4" IsReadOnly="True" TextWrapping="Wrap" Focusable="False" Grid.Row="2" Grid.ColumnSpan="2" />
+        <TextBox Watermark="Enter Lua code..."  VerticalContentAlignment="Top" HorizontalContentAlignment="Left" Height="100" Name="txtScriptInput" Text="{Binding ScriptLine}" CaretIndex="{Binding CmdCaret, Mode=TwoWay}" Margin="4" TextWrapping="Wrap" Grid.Row="3" Grid.ColumnSpan="2" KeyDown="txtScriptInput_KeyDown" Padding="4"></TextBox>
     </Grid>
 </UserControl>
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml b/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml
index a7798eb6..8e392efa 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml
@@ -161,18 +161,18 @@
                                                             Icon="{Binding Icon}"
                                                             IconSize="12" />
 
-                                                <Button Grid.Column="1" HorizontalAlignment="Left"
-                                                        Classes="icon_button"
-                                                        Padding="4, 0, 0, 0"
-                                                        Width="18" Height="18"
-                                                        IsVisible="{Binding IsPointerOver, RelativeSource={RelativeSource AncestorType=TreeDataGridRow}}"
-
-                                                        Command="{Binding AddCommand}">
-                                                    <Path Stretch="Fill"
-                                                          Fill="{DynamicResource Brush.FG1}"
-                                                          Width="12" Height="12"
-                                                          Data="{StaticResource Icons.Plus}" />
-                                                </Button>
+                                                <!-- <Button Grid.Column="1" HorizontalAlignment="Left" -->
+                                                <!--         Classes="icon_button" -->
+                                                <!--         Padding="4, 0, 0, 0" -->
+                                                <!--         Width="18" Height="18" -->
+                                                <!--         IsVisible="{Binding IsPointerOver, RelativeSource={RelativeSource AncestorType=TreeDataGridRow}}" -->
+                                                <!-- -->
+                                                <!--         Command="{Binding AddCommand}"> -->
+                                                <!--     <Path Stretch="Fill" -->
+                                                <!--           Fill="{DynamicResource Brush.FG1}" -->
+                                                <!--           Width="12" Height="12" -->
+                                                <!--           Data="{StaticResource Icons.Plus}" /> -->
+                                                <!-- </Button> -->
                                             </Grid>
                                         </DataTemplate>
 
@@ -181,21 +181,21 @@
                                                 <v:IconText Text="{Binding Title}"
                                                             Icon="{Binding Icon}"
                                                             IconSize="12" />
-
-                                                <Button Grid.Column="1"
-                                                        Padding="4, 0, 0, 0"
-                                                        HorizontalAlignment="Left"
-                                                        Command="{Binding ((vm:ItemRootNode)Parent).DeleteCommand}"
-                                                        CommandParameter="{Binding}"
-                                                        IsVisible="{Binding IsPointerOver, RelativeSource={RelativeSource AncestorType=TreeDataGridRow}}"
-                                                        Classes="icon_button"
-                                                        Width="18" Height="18"
-                                                        VerticalAlignment="Center">
-                                                    <Path Stretch="Fill"
-                                                          Fill="{DynamicResource Brush.FG1}"
-                                                          Width="12" Height="12"
-                                                          Data="{StaticResource Icons.Minus}" />
-                                                </Button>
+                                                <!-- -->
+                                                <!-- <Button Grid.Column="1" -->
+                                                <!--         Padding="4, 0, 0, 0" -->
+                                                <!--         HorizontalAlignment="Left" -->
+                                                <!--         Command="{Binding ((vm:ItemRootNode)Parent).DeleteCommand}" -->
+                                                <!--         CommandParameter="{Binding}" -->
+                                                <!--         IsVisible="{Binding IsPointerOver, RelativeSource={RelativeSource AncestorType=TreeDataGridRow}}" -->
+                                                <!--         Classes="icon_button" -->
+                                                <!--         Width="18" Height="18" -->
+                                                <!--         VerticalAlignment="Center"> -->
+                                                <!--     <Path Stretch="Fill" -->
+                                                <!--           Fill="{DynamicResource Brush.FG1}" -->
+                                                <!--           Width="12" Height="12" -->
+                                                <!--           Data="{StaticResource Icons.Minus}" /> -->
+                                                <!-- </Button> -->
                                             </Grid>
                                         </DataTemplate>
 
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/ReflectedDataPageView.axaml b/RogueEssence.Editor.Avalonia/Views/New/Editors/ReflectedDataPageView.axaml
index 09175d7a..66b12504 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/Editors/ReflectedDataPageView.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/New/Editors/ReflectedDataPageView.axaml
@@ -10,16 +10,7 @@
     <Design.DataContext>
         <vm:ReflectedDataPageViewModel></vm:ReflectedDataPageViewModel>
     </Design.DataContext>
-    <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="*"/>
-            <RowDefinition Height="32"/>
-            <RowDefinition Height="32"/>
-        </Grid.RowDefinitions>
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition/>
-            <ColumnDefinition/>
-        </Grid.ColumnDefinitions>
+    <Grid RowDefinitions="*, Auto, 32" ColumnDefinitions="*, *">
         <!--ScrollViewer HorizontalScrollBarVisibility="Visible" VerticalScrollBarVisibility="Visible" Grid.ColumnSpan="2"-->
         <ScrollViewer Grid.ColumnSpan="2">
             <StackPanel Name="stkContent" Margin="12, 4">
@@ -27,7 +18,7 @@
             </StackPanel>
         </ScrollViewer>
         
-        <Button Click="btnApply_Click" Classes="flat" Margin="4" Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" IsVisible="{Binding isRootPage}">Save All Sub-Windows</Button>
+        <Button Click="btnApply_Click" Classes="flat" Margin="4" Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" IsVisible="{Binding IsRootPage}">Save All Sub-Windows</Button>
         <Button Click="btnOK_Click" Classes="flat" Margin="4" Grid.Row="2" Grid.Column="0">OK</Button>
         <Button Click="btnCancel_Click" Classes="flat" Margin="4" Grid.Row="2" Grid.Column="1">Cancel</Button>
     </Grid>
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/StringEditPageView.axaml b/RogueEssence.Editor.Avalonia/Views/New/Editors/StringEditPageView.axaml
new file mode 100644
index 00000000..4ff76f80
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/Views/New/Editors/StringEditPageView.axaml
@@ -0,0 +1,58 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:vm="using:RogueEssence.Dev.ViewModels"
+             xmlns:v="using:RogueEssence.Dev.Views"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:DataType="vm:StringEditPageViewModel"
+             x:Class="RogueEssence.Dev.Views.StringEditPageView">
+    <Design.DataContext>
+        <vm:StringEditPageViewModel/>
+    </Design.DataContext>
+    <Grid RowDefinitions="64, Auto, Auto, Auto">
+        <TextBlock Grid.Row="1" HorizontalAlignment="Center" Classes="table_header" FontSize="16"
+                   Text="{Binding HeaderText}" />
+
+        <Grid Grid.Row="2" RowDefinitions="Auto, 16, Auto, 32, Auto" Margin="64, 8" MinWidth="600">
+            <DataGrid x:Name="StringDataGrid" Grid.Row="2" ItemsSource="{Binding GameStrings}" Classes="default" 
+                      SelectedIndex="{Binding CurrentString, Mode=TwoWay}"
+                      CanUserResizeColumns="True" 
+                      HorizontalScrollBarVisibility="Disabled" 
+                      Height="400"
+                      BorderBrush="{DynamicResource Brush.Border2}" 
+                      BorderThickness="1"
+                      Margin="4">
+                <DataGrid.Styles>
+                    <Style Selector="TextBlock">
+                        <Setter Property="TextWrapping" Value="WrapWithOverflow" />
+                    </Style>
+                    <Style Selector="TextBox">
+                        <Setter Property="TextWrapping" Value="Wrap" />
+                        <Setter Property="AcceptsReturn" Value="True" />
+                    </Style>
+                </DataGrid.Styles>
+                <DataGrid.Columns>
+                    <DataGridTextColumn Header="Key" Binding="{Binding Key}" Width="1*"/>
+                    <DataGridTextColumn Header="Comment" Binding="{Binding Comment}" Width="1*"/>
+                    <DataGridTextColumn Header="String" Binding="{Binding String}" Width="3*"/>
+                </DataGrid.Columns>
+            </DataGrid>
+
+            <StackPanel Grid.Row="3" Orientation="Horizontal">
+                <Button x:Name="StringDataGridButtonAdd" Classes="flat" Width="100"
+                        Click="StringDataGridButtonAdd_OnClick">
+                    <v:IconText Text="Add" Icon="Icons.Plus" IconSize="12" />
+                </Button>
+                <Button Classes="flat" Width="100" Margin="24,0,0,0"
+                        Command="{Binding btnDelete_Click}">
+                    <v:IconText Text="Delete" Icon="Icons.TrashFill" IconSize="12" />
+                </Button>
+                <Button Classes="flat" Width="100" Margin="24,0,0,0"
+                        Command="{Binding btnSave_Click}">
+                    <v:IconText Text="Save All" Icon="Icons.FloppyDiskFill" IconSize="12" />
+                </Button>
+            </StackPanel>
+        </Grid>
+    </Grid>
+</UserControl>
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/StringEditPageView.axaml.cs b/RogueEssence.Editor.Avalonia/Views/New/Editors/StringEditPageView.axaml.cs
new file mode 100644
index 00000000..ff708036
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/Views/New/Editors/StringEditPageView.axaml.cs
@@ -0,0 +1,28 @@
+using System.Collections.Generic;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+using Avalonia.Markup.Xaml;
+using RogueEssence.Dev.ViewModels;
+
+namespace RogueEssence.Dev.Views;
+
+
+public partial class StringEditPageView : UserControl
+{
+    public StringEditPageView()
+    {
+        InitializeComponent();
+    }
+
+    private void StringDataGridButtonAdd_OnClick(object sender, RoutedEventArgs e)
+    {
+        if (DataContext is StringEditPageViewModel vm)
+        {
+            vm.btnAdd_Click();
+            var lastItem = vm.GameStrings[vm.GameStrings.Count - 1];
+            StringDataGrid.ScrollIntoView(lastItem, null);
+            StringDataGrid.SelectedItem = lastItem;
+        }
+    }
+}
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/New/TabBarView.axaml b/RogueEssence.Editor.Avalonia/Views/New/TabBarView.axaml
index 04f34ba1..1d9083d0 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/TabBarView.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/New/TabBarView.axaml
@@ -35,18 +35,54 @@
     </Design.DataContext>
 
     <UserControl.Styles>
-        <Style Selector="Button#CloseTabButton">
-            <Setter Property="Opacity" Value="0"></Setter>
-        </Style>
-
-
         <Style Selector="controls|DragTabItem">
+            <Setter Property="Margin" Value="0,0,8,0" />
             <Setter Property="HorizontalContentAlignment" Value="Left" />
-            <Setter Property="Padding" Value="0"></Setter>
-        </Style>
+            <Setter Property="Padding" Value="0" />
+            <Setter Property="Template">
+                <ControlTemplate>
+                    <Grid>
+                        <Border
+                            Name="PART_LayoutRoot"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="{TemplateBinding CornerRadius}"
+                            Padding="{TemplateBinding Padding}">
+                            <Grid>
+                                <ContentPresenter Name="PART_ContentPresenter"
+                                                  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                                  Content="{TemplateBinding Header}"
+                                                  ContentTemplate="{TemplateBinding HeaderTemplate}"
+                                                  FontFamily="{TemplateBinding FontFamily}"
+                                                  FontSize="{TemplateBinding FontSize}"
+                                                  FontWeight="{TemplateBinding FontWeight}" />
+
+                                <controls:LeftPressedThumb Name="PART_Thumb"
+                                                           HorizontalAlignment="Stretch"
+                                                           VerticalAlignment="Stretch"
+                                                           IsHitTestVisible="True"
+                                                           Theme="{StaticResource DragTabItemThumb}"
+                                                           Margin="0,0,32,0" />
+
+                                <Border Name="PART_SelectedPipe"
+                                        Background="{DynamicResource TabItemHeaderSelectedPipeFill}"
+                                        CornerRadius="{DynamicResource ControlCornerRadius}"
+                                        IsVisible="False" />
+                            </Grid>
+                        </Border>
+                        <Border x:Name="Indicator"
+                                Height="4"
+                                CornerRadius="20"
+                                Background="Transparent"
+                                VerticalAlignment="Bottom"
+                                HorizontalAlignment="Center"
+                                Width="166" />
+                    </Grid>
+                </ControlTemplate>
+            </Setter>
 
-        <Style Selector="controls|DragTabItem">
-            <Setter Property="Margin" Value="0,0, 8, 0"></Setter>
             <Style Selector="^:selected">
                 <Setter Property="Background">
                     <Setter.Value>
@@ -59,18 +95,14 @@
                         </MultiBinding>
                     </Setter.Value>
                 </Setter>
-
                 <Setter Property="Foreground">
                     <Setter.Value>
                         <MultiBinding Converter="{StaticResource ObjectToColorKeyConverter}">
                             <Binding Path="((vm:DevFormViewModel)DataContext).TemporaryTab"
                                      RelativeSource="{RelativeSource AncestorType=controls:TabsControl}" />
-                            <!-- highlight color -->
                             <Binding Source="TabItemHeaderForegroundSelected" />
-                            <!-- deselect color -->
                             <Binding Source="TabItemHeaderForegroundUnselected" />
-                            <Binding Path="RequestedThemeVariant"
-                                     Source="{x:Static Application.Current}" />
+                            <Binding Path="RequestedThemeVariant" Source="{x:Static Application.Current}" />
                         </MultiBinding>
                     </Setter.Value>
                 </Setter>
@@ -83,79 +115,60 @@
                                  RelativeSource="{RelativeSource AncestorType=controls:TabsControl}" />
                         <Binding Source="SelectedTabItemBackgroundBrush" />
                         <Binding Source="TabItemHeaderBackgroundUnselectedPointerOver" />
-                        <Binding Path="RequestedThemeVariant"
-                                 Source="{x:Static Application.Current}" />
+                        <Binding Path="RequestedThemeVariant" Source="{x:Static Application.Current}" />
                     </MultiBinding>
                 </Setter>
             </Style>
         </Style>
 
-        <Style Selector="Button#CloseTabButton:pointerover">
-            <Setter Property="Opacity" Value="1"></Setter>
-        </Style>
 
-        <Style Selector="Button#CloseTabButton:pointerover /template/ ContentPresenter">
-            <Setter Property="Opacity" Value="1"></Setter>
+        <!-- 1. default hidden -->
+        <Style Selector="Button#CloseTabButton">
+            <Setter Property="Opacity" Value="0" />
         </Style>
 
-        <Style Selector="Grid#CloseButtonContainer:pointerover > Ellipse#NeedToSaveEllipse">
-            <Setter Property="Opacity" Value="0"></Setter>
+        <!-- 2. show on any tab hover -->
+        <Style Selector="controls|DragTabItem:pointerover Button#CloseTabButton">
+            <Setter Property="Opacity" Value="1" />
         </Style>
 
-        <Style Selector="Grid#CloseButtonContainer:pointerover > Button#CloseTabButton">
-            <Setter Property="Opacity" Value="1"></Setter>
+        <!-- 3. hide on selected (not hovered) -->
+        <Style Selector="controls|DragTabItem:selected Button#CloseTabButton">
+            <Setter Property="Opacity" Value="0" />
         </Style>
 
-        <Style Selector="controls|DragTabItem">
-            <Setter Property="Template">
-                <ControlTemplate>
-                    <Grid>
-                        <Border
-                            Name="PART_LayoutRoot"
-                            Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            CornerRadius="{TemplateBinding CornerRadius}"
-                            Padding="{TemplateBinding Padding}">
-                            <Grid>
-                                <ContentPresenter Name="PART_ContentPresenter"
-                                                  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                                  Content="{TemplateBinding Header}"
-                                                  ContentTemplate="{TemplateBinding HeaderTemplate}"
-                                                  FontFamily="{TemplateBinding FontFamily}"
-                                                  FontSize="{TemplateBinding FontSize}"
-                                                  FontWeight="{TemplateBinding FontWeight}" />
-
-                                <controls:LeftPressedThumb Name="PART_Thumb"
-                                                           HorizontalAlignment="Stretch"
-                                                           VerticalAlignment="Stretch"
-                                                           IsHitTestVisible="True"
-                                                           Theme="{StaticResource DragTabItemThumb}"
-                                                           Margin="0,0,32,0" />
+        <!-- 4. show on selected + hovered -->
+        <Style Selector="controls|DragTabItem:selected:pointerover Button#CloseTabButton">
+            <Setter Property="Opacity" Value="1" />
+        </Style>
+      
+        <Style Selector="controls|DragTabItem:selected /template/ controls|LeftPressedThumb#PART_Thumb">
+            <Setter Property="IsHitTestVisible" Value="False" />
+        </Style>
+        <Style Selector="Button#CloseTabButton">
+            <Setter Property="Opacity" Value="0" />
+        </Style>
+        <Style Selector="Button#CloseTabButton">
+            <Setter Property="IsVisible" Value="False" />
+        </Style>
 
-                                <Border Name="PART_SelectedPipe"
-                                        Background="{DynamicResource TabItemHeaderSelectedPipeFill}"
-                                        CornerRadius="{DynamicResource ControlCornerRadius}"
-                                        IsVisible="False" />
-                            </Grid>
+        <Style Selector="controls|DragTabItem:pointerover Button#CloseTabButton">
+            <Setter Property="IsVisible" Value="True" />
+        </Style>
 
-                        </Border>
-                        <!-- Selection indicator -->
-                        <Border x:Name="Indicator"
-                                Height="4"
-                                CornerRadius="20"
-                                Background="Transparent"
-                                VerticalAlignment="Bottom"
-                                HorizontalAlignment="Center"
-                                Width="166" />
-                    </Grid>
-                </ControlTemplate>
+        <Style Selector="controls|DragTabItem:selected Button#CloseTabButton">
+            <Setter Property="IsVisible" Value="False" />
+        </Style>
 
-            </Setter>
+        <Style Selector="controls|DragTabItem:selected:pointerover Button#CloseTabButton">
+            <Setter Property="IsVisible" Value="True" />
+        </Style>
+       
+        <Style Selector="Grid#CloseButtonContainer:pointerover > Ellipse#NeedToSaveEllipse">
+            <Setter Property="Opacity" Value="0"></Setter>
+        </Style>
 
 
-        </Style>
         <Style Selector="controls|DragTabItem:selected /template/ Border#Indicator">
             <Setter Property="Background" Value="{DynamicResource Brush.Accent}" />
             <Setter Property="IsVisible"
@@ -184,7 +197,7 @@
                             </ScrollViewer>
                             <Thumb Grid.Column="2" Name="PART_RightDragWindowThumb"
                                    MinWidth="{TemplateBinding RightThumbWidth}" />
-                            
+
                             <ContentPresenter Grid.Column="2" Name="PART_RightContent"
                                               Content="{TemplateBinding RightContent}" />
                         </Grid>
@@ -214,7 +227,8 @@
                                 Name="TabSwitcherFlyoutButton">
                             <Path Width="13" Height="13" Margin="0,2,0,0" Data="{StaticResource Icons.Tabs}" />
                             <Button.Flyout>
-                                <Flyout Placement="BottomEdgeAlignedRight" Opened="TabSwitcherFlyout_OnOpened" Closed="TabSwitcherFlyout_OnClosed">
+                                <Flyout Placement="BottomEdgeAlignedRight" Opened="TabSwitcherFlyout_OnOpened"
+                                        Closed="TabSwitcherFlyout_OnClosed">
                                     <StackPanel Orientation="Vertical" Background="{DynamicResource Brush.Popup}">
                                         <ContentControl Content="{Binding TabSwitcher}" Margin="0" />
                                     </StackPanel>
@@ -223,7 +237,7 @@
                         </Button>
                     </StackPanel>
                 </controls:TabsControl.RightContent>
-                
+
                 <controls:TabsControl.ItemTemplate>
                     <DataTemplate DataType="{x:Type vm:EditorPageViewModel}">
                         <!-- TODO: The tooltip doesn't show up when hovered over text-->
@@ -249,7 +263,7 @@
                                                  Fill="Gray" />
                                         <Button Classes="icon_button"
                                                 x:Name="CloseTabButton"
-                                                Width="16" Height="16" Margin="8, 0, 0. 0"
+                                                Width="16" Height="16" Margin="8, 0, 0, 0"
                                                 Click="OnCloseTab"
                                                 ZIndex="100">
                                             <Path x:Name="CloseTabPath" Width="9" Height="9"
@@ -261,7 +275,7 @@
                         </Grid>
                     </DataTemplate>
                 </controls:TabsControl.ItemTemplate>
-             
+
             </controls:TabsControl>
         </Grid>
     </Grid>

From c2934117adfbb9ddb726fd850fa1cf415382d5b3 Mon Sep 17 00:00:00 2001
From: Kace <41309226+DoubleTrio@users.noreply.github.com>
Date: Tue, 12 May 2026 21:57:44 -0400
Subject: [PATCH 25/51] more datagrid refactors

---
 .../DataEditor/CategorySpawnBox.axaml         | 117 ++++++++--------
 .../Editors/Primitive/SingleEditor.cs         |   1 +
 .../RogueElements/PriorityListEditor.cs       |   4 +-
 .../Editors/RogueElements/RangeDictEditor.cs  |   2 +-
 .../Editors/RogueElements/SpawnListEditor.cs  |   2 +-
 .../RogueElements/SpawnRangeListEditor.cs     |   2 +-
 .../RogueEssence/CategorySpawnEditor.cs       |   4 +-
 .../RogueEssence/Tiles/AutoTileBaseEditor.cs  |   2 +-
 .../Editors/RogueEssence/ZoneDataEditor.cs    |   5 +-
 .../Editors/System/DictionaryEditor.cs        |   2 +-
 .../Editors/System/HashSetEditor.cs           |   2 +-
 .../DataEditor/Editors/System/ListEditor.cs   |   4 +-
 .../Editors/System/NoDupeListEditor.cs        |   2 +-
 .../DataEditor/SpawnListBox.axaml             | 132 +++++++++---------
 .../DataEditor/SpawnListBoxViewModel.cs       |  24 +++-
 .../DataEditor/SpawnListViewBox.axaml         |  46 +++---
 .../DataEditor/SpawnRangeListBox.axaml        |   4 +-
 .../DataEditor/SpawnRangeListBoxViewModel.cs  |   1 -
 .../ViewModels/New/DevFormViewModel.cs        |   2 +-
 .../Views/DevForm/DevTabScript.axaml          |  21 ++-
 20 files changed, 208 insertions(+), 171 deletions(-)

diff --git a/RogueEssence.Editor.Avalonia/DataEditor/CategorySpawnBox.axaml b/RogueEssence.Editor.Avalonia/DataEditor/CategorySpawnBox.axaml
index f6d54116..57876aa9 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/CategorySpawnBox.axaml
+++ b/RogueEssence.Editor.Avalonia/DataEditor/CategorySpawnBox.axaml
@@ -5,6 +5,8 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              mc:Ignorable="d"
              xmlns:converters="clr-namespace:RogueEssence.Dev.Converters"
+             HorizontalAlignment="Stretch"
+             VerticalAlignment="Stretch"
              x:Class="RogueEssence.Dev.Views.CategorySpawnBox">
   <Design.DataContext>
     <vm:SpawnListBoxViewModel/>
@@ -14,65 +16,66 @@
     <converters:PercentConverter x:Key="PercentConverter"/>
   </UserControl.Resources>
 
-  <Grid>
-    <Grid.RowDefinitions>
-      <RowDefinition/>
-      <RowDefinition Height="42"/>
-      <RowDefinition Height="36"/>
-    </Grid.RowDefinitions>
-    <Grid.ColumnDefinitions>
-      <ColumnDefinition/>
-    </Grid.ColumnDefinitions>
+  <Grid RowDefinitions="*, 42" ColumnDefinitions="*, 30">
 
-    <Grid Grid.Row="0">
-      <Grid.RowDefinitions>
-        <RowDefinition/>
-        <RowDefinition/>
-      </Grid.RowDefinitions>
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition/>
-        <ColumnDefinition Width="40"/>
-      </Grid.ColumnDefinitions>
-      <DataGrid IsReadOnly="true" ItemsSource="{Binding Collection}" SelectedIndex="{Binding CurrentElement, Mode=TwoWay}" DoubleTapped="doubleClickStart" PointerReleased="gridCollection_DoubleClick" Margin="4" Grid.RowSpan="2" Grid.ColumnSpan="1" MinHeight="50">
-        <DataGrid.Columns>
-          <DataGridTextColumn Header="Weight"
-                        Binding="{Binding DisplayWeight}" />
-          <DataGridTextColumn Header="Chance"
-                        Binding="{Binding Path=DisplayChance, Mode=OneWay}" />
-          <DataGridTextColumn Header="Value"
-                              Binding="{Binding Path=DisplayValue}" />
-        </DataGrid.Columns>
-      </DataGrid>
-      <Button Command="{Binding btnUp_Click}" Margin="4" Grid.Row="0" Grid.Column="1">^</Button>
-      <Button Command="{Binding btnDown_Click}" Margin="4" Grid.Row="1" Grid.Column="1">v</Button>
-    </Grid>
+    <DataGrid IsReadOnly="true"
+              HorizontalAlignment="Stretch"
+              ItemsSource="{Binding Collection}"
+              SelectedIndex="{Binding CurrentElement, Mode=TwoWay}"
+              DoubleTapped="doubleClickStart"
+              PointerReleased="gridCollection_DoubleClick"
+              Margin="4"
+              Grid.Row="0"
+              Grid.Column="0"
+              MinHeight="50"
+              Classes="default">
+      <DataGrid.Columns>
+        <DataGridTextColumn Header="Weight" Binding="{Binding DisplayWeight}" Width="70" />
+        <DataGridTextColumn Header="Chance" Binding="{Binding Path=DisplayChance, Mode=OneWay}" Width="80" />
+        <DataGridTextColumn Header="Value"  Binding="{Binding Path=DisplayValue}" Width="*" />
+      </DataGrid.Columns>
+    </DataGrid>
 
-    <Grid Grid.Row="1">
-      <Grid.RowDefinitions>
-        <RowDefinition/>
-      </Grid.RowDefinitions>
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition Width="40"/>
-        <ColumnDefinition/>
-      </Grid.ColumnDefinitions>
-      <TextBlock VerticalAlignment="Center" Margin="4" Grid.Row="0" Grid.Column="0">Weight:</TextBlock>
-      <NumericUpDown IsEnabled="{Binding Path=CurrentElement, Converter={StaticResource ValidIdxConverter}, ConverterParameter=false}" Value="{Binding CurrentWeight}" Minimum="1" Margin="4" Grid.Row="0" Grid.Column="1"/>
-    </Grid>
+    <StackPanel Grid.Row="0" Grid.RowSpan="2" Grid.Column="1" Margin="10, 0, 0, 0" VerticalAlignment="Top" Spacing="30">
+      <StackPanel Spacing="0">
+        <Button x:Name="CategorySpawnBoxAddCategoryButton"
+                PointerReleased="CategorySpawnBoxAddCategoryButton_OnPointerReleased"
+                Classes="secondary" Margin="0, 0" Padding="4, 3">
+          <Path Width="10" Height="10" Margin="0, 2, 0, 0" Data="{StaticResource Icons.Plus}" />
+        </Button>
+        <Button x:Name="CategorySpawnBoxAddItemButton"
+                PointerReleased="CategorySpawnBoxAddItemButton_OnPointerReleased"
+                Classes="secondary" Margin="0, 0" Padding="4, 3">
+          <Path Width="10" Height="10" Margin="0, 2, 0, 0" Data="{StaticResource Icons.PlusCircleFill}" />
+        </Button>
+        <Button Command="{Binding btnDelete_Click}"
+                IsEnabled="{Binding HasSelection}"
+                Classes="secondary" Margin="0, 0" Padding="4, 3">
+          <Path Width="10" Height="10" Margin="0, 0, 0, 0" Data="{StaticResource Icons.Minus}" />
+        </Button>
+      </StackPanel>
+      <StackPanel Spacing="0">
+        <Button Command="{Binding btnUp_Click}"
+                IsEnabled="{Binding CanMoveUp}"
+                Classes="secondary" Margin="0, 0" Padding="4, 3">
+          <Path Width="10" Height="10" Margin="0, 2, 0, 0" Data="{StaticResource Icons.CaretUpFill}" />
+        </Button>
+        <Button Command="{Binding btnDown_Click}"
+                IsEnabled="{Binding CanMoveDown}"
+                Classes="secondary" Margin="0, 0" Padding="4, 3">
+          <Path Width="10" Height="10" Margin="0, 0, 0, 0" Data="{StaticResource Icons.CaretDownFill}" />
+        </Button>
+      </StackPanel>
+    </StackPanel>
 
-    <Grid Grid.Row="2">
-      <Grid.RowDefinitions>
-        <RowDefinition/>
-      </Grid.RowDefinitions>
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition/>
-        <ColumnDefinition/>
-        <ColumnDefinition/>
-      </Grid.ColumnDefinitions>
-      <Button x:Name="CategorySpawnBoxAddCategoryButton" PointerReleased="CategorySpawnBoxAddCategoryButton_OnPointerReleased" Margin="4" Grid.Row="0" Grid.Column="0">Add Category</Button>
-      <Button x:Name="CategorySpawnBoxAddItemButton" PointerReleased="CategorySpawnBoxAddItemButton_OnPointerReleased" Margin="4" Grid.Row="0" Grid.Column="1">Add Item</Button>
-      <Button Command="{Binding btnDelete_Click}" Margin="4" Grid.Row="0" Grid.Column="2">Delete</Button>
+    <Grid Grid.Row="1" Grid.Column="0" ColumnDefinitions="Auto, *">
+      <TextBlock VerticalAlignment="Center" Margin="4,0" Grid.Column="0">Weight:</TextBlock>
+      <NumericUpDown IsEnabled="{Binding Path=CurrentElement, Converter={StaticResource ValidIdxConverter}, ConverterParameter=false}"
+                     Value="{Binding CurrentWeight}"
+                     Minimum="1"
+                     Margin="4" Grid.Column="1"/>
     </Grid>
-    
+
   </Grid>
-  
-</UserControl>
+
+</UserControl>
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/Primitive/SingleEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/Primitive/SingleEditor.cs
index 78d221db..206a0ba9 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/Primitive/SingleEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/Primitive/SingleEditor.cs
@@ -27,6 +27,7 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
             NumericUpDown nudValue = new NumericUpDown();
             nudValue.Minimum = Int32.MinValue;
             nudValue.Maximum = Int32.MaxValue;
+            nudValue.Increment = 1;
             NumberRangeAttribute attribute = ReflectionExt.FindAttribute<NumberRangeAttribute>(attributes);
             if (attribute != null)
             {
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/PriorityListEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/PriorityListEditor.cs
index 94d09247..0077ee83 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/PriorityListEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/PriorityListEditor.cs
@@ -41,7 +41,7 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
             if (heightAtt != null)
                 lbxValue.MaxHeight = heightAtt.Height;
             else
-                lbxValue.MaxHeight = 220;
+                lbxValue.MaxHeight = 180;
 
             PriorityListBoxViewModel vm = new PriorityListBoxViewModel(_context.DialogService, new StringConv(elementType, ReflectionExt.GetPassableAttributes(2, attributes)));
             lbxValue.DataContext = vm;
@@ -61,7 +61,7 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
                 string elementName = name + "[" + priority.ToString() + "]";
                 string title = DataEditor.GetWindowTitle(parent, elementName, element, elementType, ReflectionExt.GetPassableAttributes(2, attributes));
 
-                NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(elementName, pageViewModel.Node.Icon);
+                NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(elementName, pageViewModel.Node.Icon, pageViewModel.Node);
                 pageViewModel.Node.AddNodeIfNotExists(node);
 
                 NodeHelper.ExpandParents(node, true);
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/RangeDictEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/RangeDictEditor.cs
index 0c2bb97b..e5585243 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/RangeDictEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/RangeDictEditor.cs
@@ -80,7 +80,7 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
                 string elementName = name + "[" + key.ToString() + "]";
                 // string title = DataEditor.GetWindowTitle(parent, elementName, element, elementType, ReflectionExt.GetPassableAttributes(1, attributes));
 
-                NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(elementName, pageViewModel.Node.Icon);
+                NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(elementName, pageViewModel.Node.Icon, pageViewModel.Node);
                 pageViewModel.Node.AddNodeIfNotExists(node);
 
                 NodeHelper.ExpandParents(node, true);
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/SpawnListEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/SpawnListEditor.cs
index a71598fa..d80b6988 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/SpawnListEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/SpawnListEditor.cs
@@ -52,7 +52,7 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
                 string elementName = name + "[" + index + "]";
                 // string title = DataEditor.GetWindowTitle(parent, elementName, element, elementType, ReflectionExt.GetPassableAttributes(1, attributes));
 
-                NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(elementName, pageViewModel.Node.Icon);
+                NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(elementName, pageViewModel.Node.Icon, pageViewModel.Node);
                 pageViewModel.Node.AddNodeIfNotExists(node);
 
                 NodeHelper.ExpandParents(node, true);
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/SpawnRangeListEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/SpawnRangeListEditor.cs
index b03dffee..8e1a821b 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/SpawnRangeListEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/SpawnRangeListEditor.cs
@@ -76,7 +76,7 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
                 string elementName = name + "[" + index + "]";
                 // string title = DataEditor.GetWindowTitle(parent, elementName, element, elementType, ReflectionExt.GetPassableAttributes(2, attributes));
 
-                NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(elementName, pageViewModel.Node.Icon);
+                NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(elementName, pageViewModel.Node.Icon, pageViewModel.Node);
                 pageViewModel.Node.AddNodeIfNotExists(node);
 
                 NodeHelper.ExpandParents(node, true);
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/CategorySpawnEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/CategorySpawnEditor.cs
index 798524e5..accf089e 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/CategorySpawnEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/CategorySpawnEditor.cs
@@ -68,7 +68,7 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
                 string elementName = name + "[" + key.ToString() + "]";
                 // string title = DataEditor.GetWindowTitle(parent, elementName, element, elementType, ReflectionExt.GetPassableAttributes(2, attributes));
 
-                NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(elementName, pageViewModel.Node.Icon);
+                NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(elementName, pageViewModel.Node.Icon, pageViewModel.Node);
                 pageViewModel.Node.AddNodeIfNotExists(node);
 
                 NodeHelper.ExpandParents(node, true);
@@ -96,7 +96,7 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
                 string elementName = name + "<Key>";
                 // string title = DataEditor.GetWindowTitle(parent, elementName, key, keyType, ReflectionExt.GetPassableAttributes(1, attributes));
 
-                NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(elementName, pageViewModel.Node.Icon);
+                NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(elementName, pageViewModel.Node.Icon, pageViewModel.Node);
                 pageViewModel.Node.AddNodeIfNotExists(node);
 
                 NodeHelper.ExpandParents(node, true);
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Tiles/AutoTileBaseEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Tiles/AutoTileBaseEditor.cs
index 531d946c..522b2a6d 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Tiles/AutoTileBaseEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Tiles/AutoTileBaseEditor.cs
@@ -34,7 +34,7 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
                 object[] elementAttr = new object[1];
                 elementAttr[0] = new AnimAttribute(0, "Tile");
 
-                NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(title, pageViewModel.Node.Icon);
+                NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(title, pageViewModel.Node.Icon, pageViewModel.Node);
                 pageViewModel.Node.AddNodeIfNotExists(node);
 
                 NodeHelper.ExpandParents(node, true);
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/ZoneDataEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/ZoneDataEditor.cs
index a2577aa0..6a94d461 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/ZoneDataEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/ZoneDataEditor.cs
@@ -11,6 +11,7 @@
 using Avalonia;
 using System.Diagnostics;
 using System.IO;
+using Avalonia.Media;
 
 namespace RogueEssence.Dev
 {
@@ -27,7 +28,9 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
             Button btnTest = new Button();
             btnTest.Margin = new Thickness(0, 4, 0, 0);
             btnTest.Content = "Open Script Folder";
+            btnTest.Classes.Add("flat");
             btnTest.Click += async (object sender, RoutedEventArgs e) =>
+            
             {
                 string zonescriptdir = LuaEngine.MakeZoneScriptPath(parent, "");
 
@@ -58,7 +61,7 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
 
             Border border = new Border();
             border.BorderThickness = new Thickness(1);
-            border.BorderBrush = Avalonia.Media.Brushes.LightGray;
+            border.BorderBrush = Application.Current?.FindResource("Brush.SubStackBorder") as IBrush;
             border.Margin = new Thickness(2);
             control.Children.Add(border);
 
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/DictionaryEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/DictionaryEditor.cs
index 697e2551..243055fa 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/DictionaryEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/DictionaryEditor.cs
@@ -57,7 +57,7 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
 
                 NodeBase node =
                     _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(title,
-                        pageViewModel.Node.Icon);
+                        pageViewModel.Node.Icon, pageViewModel.Node);
                 pageViewModel.Node.AddNodeIfNotExists(node);
 
                 NodeHelper.ExpandParents(node, true);
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/HashSetEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/HashSetEditor.cs
index 0d3d30f9..a101e388 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/HashSetEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/HashSetEditor.cs
@@ -50,7 +50,7 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
                 string elementName = name + "[" + index + "]";
                 string title = DataEditor.GetWindowTitle(parent, elementName, element, elementType, ReflectionExt.GetPassableAttributes(1, attributes));
 
-                NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(elementName, pageViewModel.Node.Icon);
+                NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(elementName, pageViewModel.Node.Icon, pageViewModel.Node);
                 pageViewModel.Node.AddNodeIfNotExists(node);
 
                 NodeHelper.ExpandParents(node, true);
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/ListEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/ListEditor.cs
index 0e0fbbe4..65a9e694 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/ListEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/ListEditor.cs
@@ -38,7 +38,7 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
                 if (heightAtt != null)
                     lbxValue.MaxHeight = heightAtt.Height;
                 else
-                    lbxValue.MaxHeight = 220;
+                    lbxValue.MaxHeight = 180;
 
                 CollectionBoxViewModel vm = createViewModel(control, parent, name, type, attributes, member, rangeAtt.Index1);
                 lbxValue.DataContext = vm;
@@ -193,7 +193,7 @@ private CollectionBoxViewModel createViewModel(StackPanel control, string parent
                 string elementName = name + "[" + index + "]";
                 // string title = DataEditor.GetWindowTitle(parent, elementName, element, elementType, ReflectionExt.GetPassableAttributes(1, attributes));
 
-                NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(elementName, pageViewModel.Node.Icon);
+                NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(elementName, pageViewModel.Node.Icon, pageViewModel.Node);
                 
                 pageViewModel.Node.AddNodeIfNotExists(node);
                 
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/NoDupeListEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/NoDupeListEditor.cs
index f951f7df..4b554477 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/NoDupeListEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/NoDupeListEditor.cs
@@ -63,7 +63,7 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
                     ReflectionExt.GetPassableAttributes(1, attributes));
 
                 NodeBase node =
-                    _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(elementName, pageViewModel.Node.Icon);
+                    _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(elementName, pageViewModel.Node.Icon, pageViewModel.Node);
                 pageViewModel.Node.AddNodeIfNotExists(node);
 
                 NodeHelper.ExpandParents(node, true);
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/SpawnListBox.axaml b/RogueEssence.Editor.Avalonia/DataEditor/SpawnListBox.axaml
index 71165b34..b946fd6f 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/SpawnListBox.axaml
+++ b/RogueEssence.Editor.Avalonia/DataEditor/SpawnListBox.axaml
@@ -5,72 +5,78 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              mc:Ignorable="d"
              xmlns:converters="clr-namespace:RogueEssence.Dev.Converters"
+             HorizontalAlignment="Stretch"
+             VerticalAlignment="Stretch"
              x:Class="RogueEssence.Dev.Views.SpawnListBox">
-  <Design.DataContext>
-    <vm:SpawnListBoxViewModel/>
-  </Design.DataContext>
-  <UserControl.Resources>
-    <converters:ValidIdxConverter x:Key="ValidIdxConverter"/>
-    <converters:PercentConverter x:Key="PercentConverter"/>
-  </UserControl.Resources>
+    <Design.DataContext>
+        <vm:SpawnListBoxViewModel />
+    </Design.DataContext>
+    <UserControl.Resources>
+        <converters:ValidIdxConverter x:Key="ValidIdxConverter" />
+        <converters:PercentConverter x:Key="PercentConverter" />
+    </UserControl.Resources>
 
-  <Grid>
-    <Grid.RowDefinitions>
-      <RowDefinition/>
-      <RowDefinition Height="42"/>
-      <RowDefinition Height="36"/>
-    </Grid.RowDefinitions>
-    <Grid.ColumnDefinitions>
-      <ColumnDefinition/>
-    </Grid.ColumnDefinitions>
+    <Grid RowDefinitions="*, 42" ColumnDefinitions="*, 30">
 
-    <Grid Grid.Row="0">
-      <Grid.RowDefinitions>
-        <RowDefinition/>
-        <RowDefinition/>
-      </Grid.RowDefinitions>
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition/>
-        <ColumnDefinition Width="40"/>
-      </Grid.ColumnDefinitions>
-      <DataGrid Name="gridItems" IsReadOnly="true" ItemsSource="{Binding Collection}" SelectedIndex="{Binding CurrentElement, Mode=TwoWay}" DoubleTapped="doubleClickStart" PointerReleased="gridCollection_DoubleClick" Margin="4" Grid.RowSpan="2" Grid.ColumnSpan="1" MinHeight="50">
-        <DataGrid.Columns>
-          <DataGridTextColumn Header="Weight"
-                        Binding="{Binding Weight}" />
-          <DataGridTextColumn Header="Chance"
-                        Binding="{Binding Path=Chance, Converter={StaticResource PercentConverter}, Mode=OneWay}" />
-          <DataGridTextColumn Header="Value"
-                              Binding="{Binding Path=DisplayValue}" />
-        </DataGrid.Columns>
-      </DataGrid>
-      <Button Command="{Binding btnUp_Click}" Margin="4" Grid.Row="0" Grid.Column="1">^</Button>
-      <Button Command="{Binding btnDown_Click}" Margin="4" Grid.Row="1" Grid.Column="1">v</Button>
-    </Grid>
+        <DataGrid Name="gridItems"
+                  IsReadOnly="true"
+                  HorizontalAlignment="Stretch"
+                  ItemsSource="{Binding Collection}"
+                  SelectedIndex="{Binding CurrentElement, Mode=TwoWay}"
+                  DoubleTapped="doubleClickStart"
+                  PointerReleased="gridCollection_DoubleClick"
+                  Margin="4"
+                  Grid.Row="0"
+                  Grid.Column="0"
+                  MinHeight="50"
+                  Classes="default">
+            <DataGrid.Columns>
+                <DataGridTextColumn Header="Weight" Binding="{Binding Weight}" Width="70" />
+                <DataGridTextColumn Header="Chance"
+                                    Binding="{Binding Path=Chance, Converter={StaticResource PercentConverter}, Mode=OneWay}"
+                                    Width="80" />
+                <DataGridTextColumn Header="Value" Binding="{Binding Path=DisplayValue}" Width="*" />
+            </DataGrid.Columns>
+        </DataGrid>
 
-    <Grid Grid.Row="1">
-      <Grid.RowDefinitions>
-        <RowDefinition/>
-      </Grid.RowDefinitions>
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition/>
-        <ColumnDefinition Width="100"/>
-      </Grid.ColumnDefinitions>
-      <TextBlock VerticalAlignment="Center" HorizontalAlignment="Right" Margin="4" Grid.Row="0" Grid.Column="0">Weight:</TextBlock>
-      <NumericUpDown IsEnabled="{Binding Path=CurrentElement, Converter={StaticResource ValidIdxConverter}, ConverterParameter=false}" Value="{Binding CurrentWeight}" Minimum="1" Margin="4" Grid.Row="0" Grid.Column="1"/>
-    </Grid>
+        <StackPanel Grid.Row="0" Grid.RowSpan="2" Grid.Column="1" Margin="10, 0, 0, 0" VerticalAlignment="Top"
+                    Spacing="30">
+            <StackPanel Spacing="0">
+                <Button x:Name="SpawnListBoxAddButton"
+                        PointerReleased="SpawnListBoxAddButton_OnPointerReleased"
+                        Classes="secondary" Margin="0, 0" Padding="4, 3">
+                    <Path Width="10" Height="10" Margin="0, 2, 0, 0" Data="{StaticResource Icons.Plus}" />
+                </Button>
+                <Button Command="{Binding btnDelete_Click}"
+                        IsEnabled="{Binding HasSelection}"
+                        Classes="secondary" Margin="0, 0" Padding="4, 3">
+                    <Path Width="10" Height="10" Margin="0, 0, 0, 0" Data="{StaticResource Icons.Minus}" />
+                </Button>
+            </StackPanel>
+            <StackPanel Spacing="0">
+                <Button Command="{Binding btnUp_Click}"
+                        IsEnabled="{Binding CanMoveUp}"
+                        Classes="secondary" Margin="0, 0" Padding="4, 3">
+                    <Path Width="10" Height="10" Margin="0, 2, 0, 0" Data="{StaticResource Icons.CaretUpFill}" />
+                </Button>
+                <Button Command="{Binding btnDown_Click}"
+                        IsEnabled="{Binding CanMoveDown}"
+                        Classes="secondary" Margin="0, 0" Padding="4, 3">
+                    <Path Width="10" Height="10" Margin="0, 0, 0, 0" Data="{StaticResource Icons.CaretDownFill}" />
+                </Button>
+            </StackPanel>
+        </StackPanel>
+
+        <Grid Grid.Row="1" Grid.Column="0" ColumnDefinitions="*, Auto">
+            <TextBlock VerticalAlignment="Center" HorizontalAlignment="Right" Margin="4" Grid.Column="0">Weight:</TextBlock>
+            <NumericUpDown Increment="1"
+                           IsEnabled="{Binding Path=CurrentElement, Converter={StaticResource ValidIdxConverter}, ConverterParameter=false}"
+                           Value="{Binding CurrentWeight}"
+                           Minimum="1"
+                           Margin="4" Grid.Column="1"
+                           Width="100" />
+        </Grid>
 
-    <Grid Grid.Row="2">
-      <Grid.RowDefinitions>
-        <RowDefinition/>
-      </Grid.RowDefinitions>
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition/>
-        <ColumnDefinition/>
-      </Grid.ColumnDefinitions>
-      <Button x:Name="SpawnListBoxAddButton" PointerReleased="SpawnListBoxAddButton_OnPointerReleased" Margin="4" Grid.Row="0" Grid.Column="0">Add</Button>
-      <Button Command="{Binding btnDelete_Click}" Margin="4" Grid.Row="0" Grid.Column="1">Delete</Button>
     </Grid>
-    
-  </Grid>
-  
-</UserControl>
+
+</UserControl>
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/SpawnListBoxViewModel.cs b/RogueEssence.Editor.Avalonia/DataEditor/SpawnListBoxViewModel.cs
index bf750623..17f18c56 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/SpawnListBoxViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/SpawnListBoxViewModel.cs
@@ -58,6 +58,10 @@ public class SpawnListBoxViewModel : ViewModelBase
 
         public bool ConfirmDelete;
         
+        public bool CanMoveUp => CurrentElement > 0;
+        public bool CanMoveDown => CurrentElement >= 0 && CurrentElement < Collection.Count - 1;
+        public bool HasSelection => CurrentElement >= 0 && CurrentElement < Collection.Count;
+        
         private IDialogService _dialogService;
 
         public SpawnListBoxViewModel(IDialogService dialogService, StringConv conv)
@@ -65,6 +69,20 @@ public SpawnListBoxViewModel(IDialogService dialogService, StringConv conv)
             _dialogService = dialogService;
             StringConv = conv;
             Collection = new ObservableCollection<SpawnListElement>();
+            
+            this.WhenAnyValue(x => x.CurrentElement).Subscribe(_ =>
+            {
+                this.RaisePropertyChanged(nameof(CanMoveUp));
+                this.RaisePropertyChanged(nameof(CanMoveDown));
+                this.RaisePropertyChanged(nameof(HasSelection));
+            });
+
+            Collection.CollectionChanged += (_, _) =>
+            {
+                this.RaisePropertyChanged(nameof(CanMoveUp));
+                this.RaisePropertyChanged(nameof(CanMoveDown));
+                this.RaisePropertyChanged(nameof(HasSelection));
+            };
         }
 
         public ObservableCollection<SpawnListElement> Collection { get; }
@@ -203,7 +221,7 @@ public void btnAdd_Click(bool advancedEdit)
             OnEditItem?.Invoke(index, element, advancedEdit, insertItem);
         }
 
-        private async void btnDelete_Click()
+        public async void btnDelete_Click()
         {
             if (CurrentElement > -1 && CurrentElement < Collection.Count)
             {
@@ -226,7 +244,7 @@ private void Switch(int a, int b)
             Collection[b] = obj;
         }
 
-        private void btnUp_Click()
+        public void btnUp_Click()
         {
             if (CurrentElement > 0)
             {
@@ -236,7 +254,7 @@ private void btnUp_Click()
             }
         }
 
-        private void btnDown_Click()
+        public void btnDown_Click()
         {
             if (CurrentElement > -1 && CurrentElement < Collection.Count - 1)
             {
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/SpawnListViewBox.axaml b/RogueEssence.Editor.Avalonia/DataEditor/SpawnListViewBox.axaml
index 932ad34b..8c9b665b 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/SpawnListViewBox.axaml
+++ b/RogueEssence.Editor.Avalonia/DataEditor/SpawnListViewBox.axaml
@@ -5,30 +5,28 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              mc:Ignorable="d"
              xmlns:converters="clr-namespace:RogueEssence.Dev.Converters"
+             HorizontalAlignment="Stretch"
+             VerticalAlignment="Stretch"
              x:Class="RogueEssence.Dev.Views.SpawnListViewBox">
-  <Design.DataContext>
-    <vm:SpawnListBoxViewModel/>
-  </Design.DataContext>
-  <UserControl.Resources>
-    <converters:ValidIdxConverter x:Key="ValidIdxConverter"/>
-    <converters:PercentConverter x:Key="PercentConverter"/>
-  </UserControl.Resources>
+    <Design.DataContext>
+        <vm:SpawnListBoxViewModel/>
+    </Design.DataContext>
+    <UserControl.Resources>
+        <converters:ValidIdxConverter x:Key="ValidIdxConverter"/>
+        <converters:PercentConverter x:Key="PercentConverter"/>
+    </UserControl.Resources>
 
-  <Grid>
-    <Grid.RowDefinitions>
-      <RowDefinition/>
-      <RowDefinition/>
-    </Grid.RowDefinitions>
-    <Grid.ColumnDefinitions>
-      <ColumnDefinition/>
-    </Grid.ColumnDefinitions>
-    <DataGrid IsReadOnly="true" ItemsSource="{Binding Collection}" SelectedIndex="{Binding CurrentElement, Mode=TwoWay}" Margin="4" Grid.RowSpan="2" Grid.ColumnSpan="1" MinHeight="50">
-      <DataGrid.Columns>
-        <DataGridTextColumn Header="Chance"
-                      Binding="{Binding Path=Chance, Converter={StaticResource PercentConverter}, Mode=OneWay}" />
-        <DataGridTextColumn Header="Value"
-                            Binding="{Binding Path=DisplayValue}" />
-      </DataGrid.Columns>
+    <DataGrid IsReadOnly="true"
+              HorizontalAlignment="Stretch"
+              ItemsSource="{Binding Collection}"
+              SelectedIndex="{Binding CurrentElement, Mode=TwoWay}"
+              Margin="4"
+              MinHeight="50"
+              Classes="default">
+        <DataGrid.Columns>
+            <DataGridTextColumn Header="Chance" Binding="{Binding Path=Chance, Converter={StaticResource PercentConverter}, Mode=OneWay}" Width="80" />
+            <DataGridTextColumn Header="Value"  Binding="{Binding Path=DisplayValue}" Width="*" />
+        </DataGrid.Columns>
     </DataGrid>
-  </Grid>
-</UserControl>
+
+</UserControl>
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/SpawnRangeListBox.axaml b/RogueEssence.Editor.Avalonia/DataEditor/SpawnRangeListBox.axaml
index 16345300..b418ea4e 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/SpawnRangeListBox.axaml
+++ b/RogueEssence.Editor.Avalonia/DataEditor/SpawnRangeListBox.axaml
@@ -33,8 +33,8 @@
               Classes="default">
       <DataGrid.Columns>
         <DataGridTextColumn Header="Start"  Binding="{Binding DisplayStart}" Width="70" />
-        <DataGridTextColumn Header="End"    Binding="{Binding DisplayEnd}"   Width="70" />
-        <DataGridTextColumn Header="Weight" Binding="{Binding Weight}"       Width="70" />
+        <DataGridTextColumn Header="End" Binding="{Binding DisplayEnd}" Width="70" />
+        <DataGridTextColumn Header="Weight" Binding="{Binding Weight}" Width="70" />
         <DataGridTextColumn Header="Value"  Binding="{Binding Path=DisplayValue}" Width="*" />
       </DataGrid.Columns>
     </DataGrid>
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/SpawnRangeListBoxViewModel.cs b/RogueEssence.Editor.Avalonia/DataEditor/SpawnRangeListBoxViewModel.cs
index cce356bc..32e14028 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/SpawnRangeListBoxViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/SpawnRangeListBoxViewModel.cs
@@ -279,7 +279,6 @@ public void btnAdd_Click(bool advancedEdit)
 
         public async void btnDelete_Click()
         {
-            Console.WriteLine("Delete");
             if (CurrentElement > -1 && CurrentElement < Collection.Count)
             {
                 if (ConfirmDelete)
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs
index b7543873..7fd5cba2 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs
@@ -598,7 +598,7 @@ private Action<ReflectedDataPageViewModel> CreateFXOnOpen<T>(Func<T> getter, Act
     private void CreateConstantsNode(NodeBase parent)
     {
         var constantsNode =
-            _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>("Constants", "Icons.ListFill");
+            _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>("Constants", "Icons.ListFill", parent);
         var startParamsNode = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>("Start Params",
             "Icons.ListFill",
             parent,
diff --git a/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabScript.axaml b/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabScript.axaml
index d792b60d..5a1e30db 100644
--- a/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabScript.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabScript.axaml
@@ -8,12 +8,21 @@
     <Design.DataContext>
         <vm:DevTabScriptViewModel/>
     </Design.DataContext>
-    <Grid RowDefinitions="40, 26, Auto, 80" ColumnDefinitions="*, *" ColumnSpacing="8" RowSpacing="8">
-                  
-        <Button Classes="flat" Name="btnReloadScripts" Command="{Binding btnReloadScripts_Click}" Margin="4" Grid.Row="0" Grid.Column="0" >Reload Scripts</Button>
-        <Button Classes="flat" Name="btnTextTest" Command="{Binding btnTextTest_Click}" Margin="4" Grid.Row="0" Grid.Column="1" >Text Test</Button>
+    <Grid RowDefinitions="40, 26, Auto, 100" ColumnDefinitions="*, *" RowSpacing="8">
+        <Button Classes="flat" Name="btnReloadScripts" Command="{Binding btnReloadScripts_Click}" Margin="4,4,2,4" Grid.Row="0" Grid.Column="0">Reload Scripts</Button>
+        <Button Classes="flat" Name="btnTextTest" Command="{Binding btnTextTest_Click}" Margin="2,4,4,4" Grid.Row="0" Grid.Column="1">Text Test</Button>
         <TextBlock Margin="4,0" VerticalAlignment="Bottom" Grid.Row="1" Grid.Column="0">Lua Console:</TextBlock>
-        <TextBox Name="txtScriptOutput" Height="300" VerticalAlignment="Stretch" VerticalContentAlignment="Top" Text="{Binding ScriptLog}" CaretIndex="{Binding ScriptCaret}" Margin="4" IsReadOnly="True" TextWrapping="Wrap" Focusable="False" Grid.Row="2" Grid.ColumnSpan="2" />
-        <TextBox Watermark="Enter Lua code..."  VerticalContentAlignment="Top" HorizontalContentAlignment="Left" Height="100" Name="txtScriptInput" Text="{Binding ScriptLine}" CaretIndex="{Binding CmdCaret, Mode=TwoWay}" Margin="4" TextWrapping="Wrap" Grid.Row="3" Grid.ColumnSpan="2" KeyDown="txtScriptInput_KeyDown" Padding="4"></TextBox>
+        <TextBox Name="txtScriptOutput" Height="300" VerticalAlignment="Stretch" VerticalContentAlignment="Top" Text="{Binding ScriptLog}" CaretIndex="{Binding ScriptCaret}" Margin="4" IsReadOnly="True" TextWrapping="Wrap" Focusable="False" Grid.Row="2" Grid.ColumnSpan="2"/>
+        <Border Grid.Row="3" Grid.ColumnSpan="2" Margin="4">
+            <TextBox Watermark="Enter Lua code..."
+                     VerticalContentAlignment="Top"
+                     VerticalAlignment="Stretch"
+                     Name="txtScriptInput"
+                     Text="{Binding ScriptLine}"
+                     CaretIndex="{Binding CmdCaret, Mode=TwoWay}"
+                     TextWrapping="Wrap"
+                     KeyDown="txtScriptInput_KeyDown"
+                     Padding="4"/>
+        </Border>
     </Grid>
 </UserControl>
\ No newline at end of file

From 8af68df48e485f3e104cf243c3c53a2750709e9b Mon Sep 17 00:00:00 2001
From: Kace <41309226+DoubleTrio@users.noreply.github.com>
Date: Tue, 12 May 2026 22:27:31 -0400
Subject: [PATCH 26/51] remove unneeded comments

---
 .../ViewModels/New/DevFormViewModel.cs        |  8 ++---
 .../Views/New/DevForm.axaml.cs                |  1 -
 .../Editors/ReflectedDataPageView.axaml.cs    |  1 -
 .../New/Editors/ZoneEditorPageView.axaml      | 33 ++++++++++---------
 .../New/Editors/ZoneEditorPageView.axaml.cs   |  2 +-
 5 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs
index 7fd5cba2..acb28eb8 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs
@@ -237,7 +237,6 @@ public ObservableCollection<PageNode> TopLevelPages
 
     public void AddTopLevelPage(EditorPageViewModel page)
     {
-        Console.WriteLine($"Adding top level page {page}");
         var navigated = TryNavigateToExistingPage(page);
         if (navigated) return;
 
@@ -319,13 +318,13 @@ private PageNode GetTopLevelNode(PageNode node)
 
     public void RemoveTab(EditorPageViewModel page)
     {
-        Console.WriteLine($"Removing tab {page}" + "hmmm");
+        // Console.WriteLine($"Removing tab {page}" + "hmmm");
         if (!_pageToNodeMap.TryGetValue(page, out var node))
             return;
 
         int removeIdx = Pages.IndexOf(page);
         
-        Console.WriteLine($"Removing tab {page} at index {removeIdx}");
+        // Console.WriteLine($"Removing tab {page} at index {removeIdx}");
 
         ClosePageAndChildren(node);
 
@@ -1158,8 +1157,7 @@ public ModSwitcherViewModel? ModSwitcher
     public void AddPageFromTreeNode(OpenEditorNode node)
     {
         var editor = _context.PageFactory.CreatePage(node.EditorType, node, node.OnPageLoad);
-
-        Console.WriteLine("EDitpr" + editor);
+        
         if (editor != null)
         {
             editor.SetPageTitleFromNode(node);
diff --git a/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml.cs b/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml.cs
index 49b07908..2ab14ee7 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml.cs
@@ -635,7 +635,6 @@ private void LeftTreeDataGrid_OnDoubleTapped(object? sender, TappedEventArgs e)
             var selectedItem = (OpenEditorNode)treeView.RowSelection.SelectedItem;
             if (selectedItem != null)
             {
-                Console.WriteLine(selectedItem.ToString());
                 vm.AddPageFromTreeNode(selectedItem);
             }
 
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/ReflectedDataPageView.axaml.cs b/RogueEssence.Editor.Avalonia/Views/New/Editors/ReflectedDataPageView.axaml.cs
index c4b8913a..ef7220e4 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/Editors/ReflectedDataPageView.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/New/Editors/ReflectedDataPageView.axaml.cs
@@ -74,7 +74,6 @@ private void OnDataContextChanged(object? sender, EventArgs e)
         if (DataContext is not EditorPageViewModel vm) return;
     
         vm.AttachedView = this;
-        Console.WriteLine($"View set on {vm}");
 
         if (DataContext is ReflectedDataPageViewModel reflectedVm && reflectedVm.OnLoadAction != null)
             reflectedVm.OnLoadAction(ControlPanel);
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/ZoneEditorPageView.axaml b/RogueEssence.Editor.Avalonia/Views/New/Editors/ZoneEditorPageView.axaml
index 60944858..6f552277 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/Editors/ZoneEditorPageView.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/New/Editors/ZoneEditorPageView.axaml
@@ -8,21 +8,22 @@
              x:DataType="vm:ZoneEditorPageViewModel"
              x:Class="RogueEssence.Dev.Views.ZoneEditorPageView">
     <ScrollViewer>
-        <StackPanel Spacing="8" Margin="16">
-            <TextBlock Text="Zone Edit" FontSize="24" FontWeight="Bold"/>
-            <DataGrid x:Name="ZoneDataGrid"
-                      x:DataType="v:ZoneMockEntry"
-                      Classes="default"
-
-                      >
-                <DataGrid.Columns>
-                    <DataGridTextColumn Header="ID" Binding="{Binding Id}" Width="60"/>
-                    <DataGridTextColumn Header="Name" Binding="{Binding Name}" Width="200"/>
-                    <DataGridTextColumn Header="Level Range" Binding="{Binding LevelRange}" Width="120"/>
-                    <DataGridTextColumn Header="Map Count" Binding="{Binding MapCount}" Width="100"/>
-                    <DataGridTextColumn Header="Music" Binding="{Binding Music}" Width="200"/>
-                </DataGrid.Columns>
-            </DataGrid>
-        </StackPanel>
+        <TextBlock>Hi there, this is just a temporary page! :D</TextBlock>
+        <!-- <StackPanel Spacing="8" Margin="16"> -->
+        <!--     <TextBlock Text="Zone Edit" FontSize="24" FontWeight="Bold"/> -->
+        <!--     <DataGrid x:Name="ZoneDataGrid" -->
+        <!--               x:DataType="v:ZoneMockEntry" -->
+        <!--               Classes="default" -->
+        <!-- -->
+        <!--               > -->
+        <!--         <DataGrid.Columns> -->
+        <!--             <DataGridTextColumn Header="ID" Binding="{Binding Id}" Width="60"/> -->
+        <!--             <DataGridTextColumn Header="Name" Binding="{Binding Name}" Width="200"/> -->
+        <!--             <DataGridTextColumn Header="Level Range" Binding="{Binding LevelRange}" Width="120"/> -->
+        <!--             <DataGridTextColumn Header="Map Count" Binding="{Binding MapCount}" Width="100"/> -->
+        <!--             <DataGridTextColumn Header="Music" Binding="{Binding Music}" Width="200"/> -->
+        <!--         </DataGrid.Columns> -->
+        <!--     </DataGrid> -->
+        <!-- </StackPanel> -->
     </ScrollViewer>
 </UserControl>
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/ZoneEditorPageView.axaml.cs b/RogueEssence.Editor.Avalonia/Views/New/Editors/ZoneEditorPageView.axaml.cs
index 0c39d95a..ec7a0c7a 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/Editors/ZoneEditorPageView.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/New/Editors/ZoneEditorPageView.axaml.cs
@@ -18,7 +18,7 @@ public partial class ZoneEditorPageView : UserControl
     public ZoneEditorPageView()
     {
         InitializeComponent();
-        ZoneDataGrid.ItemsSource = GetMockData();
+        // ZoneDataGrid.ItemsSource = GetMockData();
     }
     
     private List<ZoneMockEntry> GetMockData() => new List<ZoneMockEntry>

From 9f1edca44acd9311894a067ba9811fdf81f3990f Mon Sep 17 00:00:00 2001
From: Kace <41309226+DoubleTrio@users.noreply.github.com>
Date: Thu, 14 May 2026 01:52:44 -0400
Subject: [PATCH 27/51] Implemented sprites pages

---
 .../Utility/ContextMenuHelper.cs              |  11 +-
 .../ViewModels/Content/AnimEditViewModel.cs   |   2 +-
 .../Content/TilesetEditViewModel.cs           |   1 +
 .../ViewModels/New/DevFormViewModel.cs        | 254 ++-----
 .../New/Editors/DataListPageViewModel.cs      |  88 +--
 .../New/Editors/DevControlViewModel.cs        |   4 +-
 .../New/Editors/SpritePageViewModel.cs        | 710 +++++++++++++++++-
 ...egy.cs => ISpriteRootOperationStrategy.cs} |   2 +-
 .../ViewModels/New/Nodes/NodeBase.cs          |  48 +-
 ...tegy.cs => SpriteRootAssetTypeStrategy.cs} |   8 +-
 ...eStrategy.cs => SpriteRootTileStrategy.cs} |   4 +-
 .../Views/New/DevForm.axaml.cs                |  49 +-
 .../Views/New/Editors/DataListPageView.axaml  |   1 -
 .../New/Editors/DataListPageView.axaml.cs     |   2 +-
 .../New/Editors/SpeciesEditPageView.axaml     |   5 +-
 .../Views/New/Editors/SpritePageView.axaml    | 126 +++-
 .../Views/New/Editors/SpritePageView.axaml.cs |  75 ++
 .../New/Editors/ZoneEditorPageView.axaml      |   2 +-
 .../Views/SearchListBox.axaml                 |   8 +-
 19 files changed, 1072 insertions(+), 328 deletions(-)
 rename RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/{ISpriteOperationStrategy.cs => ISpriteRootOperationStrategy.cs} (86%)
 rename RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/{SpriteAssetTypeStrategy.cs => SpriteRootAssetTypeStrategy.cs} (97%)
 rename RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/{SpriteTileStrategy.cs => SpriteRootTileStrategy.cs} (98%)

diff --git a/RogueEssence.Editor.Avalonia/Utility/ContextMenuHelper.cs b/RogueEssence.Editor.Avalonia/Utility/ContextMenuHelper.cs
index 7b76d61b..33f7d66b 100644
--- a/RogueEssence.Editor.Avalonia/Utility/ContextMenuHelper.cs
+++ b/RogueEssence.Editor.Avalonia/Utility/ContextMenuHelper.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Threading.Tasks;
 using Avalonia.Controls;
+using Avalonia.Layout;
 using RogueEssence.Dev.ViewModels;
 
 namespace RogueEssence.Dev.Utility;
@@ -22,7 +23,7 @@ public static MenuItem CreateMenuItem(string header, string icon, Func<Task> onC
         return item;
     }
     
-    public static ContextMenu CreateContextMenu(params MenuItem[] items)
+    public static ContextMenu CreateContextMenu(params Control[] items)
     {
         var menu = new ContextMenu();
         foreach (var item in items)
@@ -37,4 +38,12 @@ public static ContextMenu CreateDataItemMenu(DataRootNode node, string key)
             CreateMenuItem("Resave as Patch", "Icons.FileTextFill", () => node.ResaveItemAsPatch(key))
         );
     }
+    
+    public static ContextMenu CreateSpriteItemMenu(SpriteRootNode node)
+    {
+        return CreateContextMenu(
+            CreateMenuItem("Mass Import", "Icons.DownloadFill", async () => await node.MassImportAsync()),
+            CreateMenuItem("Mass Export", "Icons.ExportFill", async () => await node.MassExportAsync())
+        );
+    }
 }
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/Content/AnimEditViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/Content/AnimEditViewModel.cs
index e4bf791f..913b0cdd 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/Content/AnimEditViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/Content/AnimEditViewModel.cs
@@ -20,7 +20,7 @@ namespace RogueEssence.Dev.ViewModels
 {
     public class AnimEditViewModel : ViewModelBase
     {
-        private GraphicsManager.AssetType   assetType;
+        private GraphicsManager.AssetType assetType;
         private Window parent;
 
 
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/Content/TilesetEditViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/Content/TilesetEditViewModel.cs
index 84547905..f73797b1 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/Content/TilesetEditViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/Content/TilesetEditViewModel.cs
@@ -146,6 +146,7 @@ await Dispatcher.UIThread.InvokeAsync(async () =>
             });
         }
 
+        
         public async void mnuReIndex_Click()
         {
             try
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs
index acb28eb8..5909e63d 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs
@@ -505,7 +505,9 @@ public void LoadDevTree()
         // root.SubNodes.Add(
         // _nodeFactory.CreateOpenEditorNode("Dev Control",  typeof(DevControlViewModel), "Icons.GameControllerFill"));
         root.SubNodes.Add(
-            _nodeFactory.CreateOpenEditorNode<ZoneEditorPageViewModel>("Zone Editor", "Icons.StairsFill"));
+            _nodeFactory.CreateOpenEditorNode<DevControlViewModel>("Dev Control", "Icons.GameControllerFill"));
+        // root.SubNodes.Add(
+        //     _nodeFactory.CreateOpenEditorNode<ZoneEditorPageViewModel>("Zone Editor", "Icons.StairsFill"));
         // root.SubNodes.Add(
         // _nodeFactory.CreateOpenEditorNode("Ground Editor", typeof(GroundEditorPageViewModel), "Icons.MapTrifoldFill"));
         // root.SubNodes.Add(_nodeFactory.CreateOpenEditorNode("Testing", "Icons.BedFill", "RandomInfo"));
@@ -525,7 +527,7 @@ public void LoadDevTree()
         //
         CreateSpriteNode(root);
 
-        CreateModNode(root);
+        // CreateModNode(root);
         Nodes.Add(root);
 
         AttachEventsRecursive(root);
@@ -597,7 +599,7 @@ private Action<ReflectedDataPageViewModel> CreateFXOnOpen<T>(Func<T> getter, Act
     private void CreateConstantsNode(NodeBase parent)
     {
         var constantsNode =
-            _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>("Constants", "Icons.ListFill", parent);
+            _context.NodeFactory.CreateReflectedDataNode<ZoneEditorPageViewModel>("Constants", "Icons.ListFill", parent);
         var startParamsNode = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>("Start Params",
             "Icons.ListFill",
             parent,
@@ -695,124 +697,6 @@ private void CreateConstantsNode(NodeBase parent)
         //     }
         //
         //
-        //
-        //     public void btnEditHeal_Click()
-        //     {
-        //         OpenItem<BattleFX>("Heal FX", DataManager.Instance.HealFX, (fx) => {
-        //             DataManager.Instance.HealFX = fx;
-        //             DataManager.SaveData(fx, DataManager.FX_PATH, "Heal", DataManager.DATA_EXT);
-        //         });
-        //     }
-        //     public void btnEditRestoreCharge_Click()
-        //     {
-        //         OpenItem<BattleFX>("Restore Charge FX", DataManager.Instance.RestoreChargeFX, (fx) => {
-        //             DataManager.Instance.RestoreChargeFX = fx;
-        //             DataManager.SaveData(fx, DataManager.FX_PATH, "RestoreCharge", DataManager.DATA_EXT);
-        //         });
-        //     }
-        //     public void btnEditLoseCharge_Click()
-        //     {
-        //         OpenItem<BattleFX>("Lose Charge FX", DataManager.Instance.LoseChargeFX, (fx) => {
-        //             DataManager.Instance.LoseChargeFX = fx;
-        //             DataManager.SaveData(fx, DataManager.FX_PATH, "LoseCharge", DataManager.DATA_EXT);
-        //         });
-        //     }
-        //     public void btnEditNoCharge_Click()
-        //     {
-        //         OpenItem<EmoteFX>("No Charge FX", DataManager.Instance.NoChargeFX, (fx) => {
-        //             DataManager.Instance.NoChargeFX = fx;
-        //             DataManager.SaveData(fx, DataManager.FX_PATH, "NoCharge", DataManager.DATA_EXT);
-        //         });
-        //     }
-        //     public void btnEditElement_Click()
-        //     {
-        //         OpenItem<BattleFX>("Element FX", DataManager.Instance.ElementFX, (fx) => {
-        //             DataManager.Instance.ElementFX = fx;
-        //             DataManager.SaveData(fx, DataManager.FX_PATH, "Element", DataManager.DATA_EXT);
-        //         });
-        //     }
-        //     public void btnEditIntrinsic_Click()
-        //     {
-        //         OpenItem<BattleFX>("Intrinsic FX", DataManager.Instance.IntrinsicFX, (fx) => {
-        //             DataManager.Instance.IntrinsicFX = fx;
-        //             DataManager.SaveData(fx, DataManager.FX_PATH, "Intrinsic", DataManager.DATA_EXT);
-        //         });
-        //     }
-        //     public void btnEditSendHome_Click()
-        //     {
-        //         OpenItem<BattleFX>("Send Home FX", DataManager.Instance.SendHomeFX, (fx) => {
-        //             DataManager.Instance.SendHomeFX = fx;
-        //             DataManager.SaveData(fx, DataManager.FX_PATH, "SendHome", DataManager.DATA_EXT);
-        //         });
-        //     }
-        //     public void btnEditItemLost_Click()
-        //     {
-        //         OpenItem<BattleFX>("Item Lost FX", DataManager.Instance.ItemLostFX, (fx) => {
-        //             DataManager.Instance.ItemLostFX = fx;
-        //             DataManager.SaveData(fx, DataManager.FX_PATH, "ItemLost", DataManager.DATA_EXT);
-        //         });
-        //     }
-        //     public void btnEditWarp_Click()
-        //     {
-        //         OpenItem<BattleFX>("Warp FX", DataManager.Instance.WarpFX, (fx) => {
-        //             DataManager.Instance.WarpFX = fx;
-        //             DataManager.SaveData(fx, DataManager.FX_PATH, "Warp", DataManager.DATA_EXT);
-        //         });
-        //     }
-        //
-        //     public void btnEditKnockback_Click()
-        //     {
-        //         OpenItem<BattleFX>("Knockback FX", DataManager.Instance.KnockbackFX, (fx) => {
-        //             DataManager.Instance.KnockbackFX = fx;
-        //             DataManager.SaveData(fx, DataManager.FX_PATH, "Knockback", DataManager.DATA_EXT);
-        //         });
-        //     }
-        //
-        //     public void btnEditJump_Click()
-        //     {
-        //         OpenItem<BattleFX>("Jump FX", DataManager.Instance.JumpFX, (fx) => {
-        //             DataManager.Instance.JumpFX = fx;
-        //             DataManager.SaveData(fx, DataManager.FX_PATH, "Jump", DataManager.DATA_EXT);
-        //         });
-        //     }
-        //
-        //     public void btnEditThrow_Click()
-        //     {
-        //         OpenItem<BattleFX>("Throw FX", DataManager.Instance.ThrowFX, (fx) => { DataManager.Instance.ThrowFX = fx;
-        //             DataManager.SaveData(fx, DataManager.FX_PATH, "Throw", DataManager.DATA_EXT);
-        //         });
-        //     }
-        //
-        //     private delegate void SaveFX<T>(T obj);
-        //     private void OpenItem<T>(string name, T data, SaveFX<T> saveOp)
-        //     {
-        //         lock (GameBase.lockObj)
-        //         {
-        //             Views.DataEditForm editor = new Views.DataEditRootForm();
-        //             // EditorPageViewModel page = new EditorPageViewModel();
-        //             // pag
-        //             editor.Title = DataEditor.GetWindowTitle("", name, data, data.GetType());
-        //             DataEditor.LoadDataControls("", data, editor);
-        //             editor.SelectedOKEvent += async () =>
-        //             {
-        //                 lock (GameBase.lockObj)
-        //                 {
-        //                     object obj = data;
-        //                     DataEditor.SaveDataControls(ref obj, editor.ControlPanel, new Type[0]);
-        //                     saveOp((T)obj);
-        //                     return true;
-        //                 }
-        //             };
-        //
-        //             editor.Show();
-        //
-        //         }
-        //     }
-        //
-        // }
-        //
-        //
-        //
 
         constantsNode.SubNodes.Add(startParamsNode);
         
@@ -929,7 +813,7 @@ private void CreateSpriteNode(NodeBase parent)
     {
         // var spritesViewModel = _pageFactory.GetRequiredService<DevTabSpritesViewModel>();
         var spriteNode =
-            _context.NodeFactory.CreateOpenEditorNode<DevEditPageViewModel>("Sprites", "Icons.PaintBrushFill");
+            _context.NodeFactory.CreateOpenEditorNode<ZoneEditorPageViewModel>("Sprites", "Icons.PaintBrushFill");
         //
         spriteNode.SubNodes.Add(
             _context.NodeFactory.CreateOpenEditorNodeWithParams<SpeciesEditPageViewModel>("Char Sprites", [true],
@@ -939,68 +823,70 @@ private void CreateSpriteNode(NodeBase parent)
             _context.NodeFactory.CreateOpenEditorNodeWithParams<SpeciesEditPageViewModel>("Portraits", [false],
                 "Icons.PersonFill")
         );
-        // );
-        //
-        // foreach (var type in Enum.GetValues<GraphicsManager.AssetType>())
-        // {
-        //     if (type == GraphicsManager.AssetType.None || type == GraphicsManager.AssetType.All ||
-        //         type == GraphicsManager.AssetType.Count || type == GraphicsManager.AssetType.Autotile ||
-        //         type == GraphicsManager.AssetType.Chara || type == GraphicsManager.AssetType.Portrait ||
-        //         type == GraphicsManager.AssetType.Font)
-        //         continue;
-        //
-        //     if (type == GraphicsManager.AssetType.Tile)
-        //     {
-        //         var tileRootNode = _nodeFactory.CreateSpriteTileRootNode(
-        //             "",
-        //             type.ToString(),
-        //             type.GetIcon());
-        //         lock (GameBase.lockObj)
-        //         {
-        //             foreach (string name in GraphicsManager.TileIndex.Nodes.Keys.OrderBy(n => n))
-        //             {
-        //                 var itemNode = _nodeFactory.CreateDataItemNode(
-        //                     name,
-        //                     "",
-        //                     name,
-        //                     type.GetIcon());
-        //                 tileRootNode.SubNodes.Add(itemNode);
-        //             }
-        //         }
-        //
-        //         spriteNode.SubNodes.Add(tileRootNode);
-        //         continue;
-        //     }
-        //
-        //     string assetPattern = GraphicsManager.GetPattern(type);
-        //     string[] dirs = PathMod.GetModFiles(Path.GetDirectoryName(assetPattern),
-        //         String.Format(Path.GetFileName(assetPattern), "*"));
-        //
-        //     var spriteRootNode = _nodeFactory.CreateSpriteRootNode(
-        //         type,
-        //         "TODO",
-        //         type.ToString(),
-        //         type.GetIcon());
-        //     // dataNode.SubNodes.Add(dataItemRootNode);
-        //     spriteNode.SubNodes.Add(spriteRootNode);
-        //
-        //
-        //     lock (GameBase.lockObj)
-        //     {
-        //         for (int ii = 0; ii < dirs.Length; ii++)
-        //         {
-        //             string filename = Path.GetFileNameWithoutExtension(dirs[ii]);
-        //             // anims.Add(filename);
-        //             var itemNode = _nodeFactory.CreateDataItemNode(
-        //                 filename,
-        //                 "",
-        //                 filename,
-        //                 type.GetIcon());
-        //
-        //             spriteRootNode.SubNodes.Add(itemNode);
-        //         }
-        //     }
-        // }
+     
+        foreach (var type in Enum.GetValues<GraphicsManager.AssetType>())
+        {
+            if (type == GraphicsManager.AssetType.None || type == GraphicsManager.AssetType.All ||
+                type == GraphicsManager.AssetType.Count || type == GraphicsManager.AssetType.Autotile ||
+                type == GraphicsManager.AssetType.Chara || type == GraphicsManager.AssetType.Portrait ||
+                type == GraphicsManager.AssetType.Font)
+                continue;
+
+            spriteNode.SubNodes.Add(
+                _context.NodeFactory.CreateSpriteRootNode<SpritePageViewModel>(type, type.ToString(), type.GetIcon()));
+
+            // if (type == GraphicsManager.AssetType.Tile)
+            // {
+            //     var tileRootNode = _nodeFactory.CreateSpriteTileRootNode(
+            //         "",
+            //         type.ToString(),
+            //         type.GetIcon());
+            //     lock (GameBase.lockObj)
+            //     {
+            //         foreach (string name in GraphicsManager.TileIndex.Nodes.Keys.OrderBy(n => n))
+            //         {
+            //             var itemNode = _nodeFactory.CreateDataItemNode(
+            //                 name,
+            //                 "",
+            //                 name,
+            //                 type.GetIcon());
+            //             tileRootNode.SubNodes.Add(itemNode);
+            //         }
+            //     }
+            //
+            //     spriteNode.SubNodes.Add(tileRootNode);
+            //     continue;
+            // }
+            //
+            // string assetPattern = GraphicsManager.GetPattern(type);
+            // string[] dirs = PathMod.GetModFiles(Path.GetDirectoryName(assetPattern),
+            //     String.Format(Path.GetFileName(assetPattern), "*"));
+            //
+            // // var spriteRootNode = _nodeFactory.CreateSpriteRootNode(
+            //     type,
+            //     "TODO",
+            //     type.ToString(),
+            //     type.GetIcon());
+            // // dataNode.SubNodes.Add(dataItemRootNode);
+            // spriteNode.SubNodes.Add(spriteRootNode);
+
+
+            // lock (GameBase.lockObj)
+            // {
+            //     for (int ii = 0; ii < dirs.Length; ii++)
+            //     {
+            //         string filename = Path.GetFileNameWithoutExtension(dirs[ii]);
+            //         // anims.Add(filename);
+            //         var itemNode = _nodeFactory.CreateDataItemNode(
+            //             filename,
+            //             "",
+            //             filename,
+            //             type.GetIcon());
+            //
+            //         spriteRootNode.SubNodes.Add(itemNode);
+            //     }
+            // }
+        }
 
 
         parent.SubNodes.Add(spriteNode);
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DataListPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DataListPageViewModel.cs
index 12ccf0e4..d3ac9a0b 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DataListPageViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DataListPageViewModel.cs
@@ -23,11 +23,10 @@ public record DataListEntry(string Key, string Value)
     public string Title => $"{Key}: {Value}";
 }
 
-public class DataListPageViewModel : EditorPageViewModel<DataRootNode>
-{
-    public ReactiveCommand<string, Unit> ResaveAsFileCommand { get; }
 
 
+public class DataListPageViewModel : EditorPageViewModel<DataRootNode>
+{
     private string _searchFilter = string.Empty;
 
     public string SearchFilter
@@ -221,7 +220,7 @@ await Task.Run(() =>
     protected override bool IsSamePage(EditorPageViewModel other)
     {
         var page = other as DataListPageViewModel;
-        return Node.Equals(page?.Node);
+        return DataType == page?.DataType;
     }
 
     private void UpdateVisibleItems(string filter)
@@ -231,64 +230,55 @@ private void UpdateVisibleItems(string filter)
         foreach (var item in Items.Where(e => strategy.Matches(e.Title, filter)))
             FilteredItems.Add(item);
     }
-
     
-    Action<EditorPageViewModel> _onPageOpen;
-    public void OnPageOpen(Action<EditorPageViewModel> onPageOpen)
+    public void AddChildItemUnderParent(DataListEntry entry)
     {
-     
-        
+        Node.AddNodeIfNotExists(
+            _context.NodeFactory.CreateDataItemNode<ReflectedDataPageViewModel>(entry.Key, entry.Title, Node.Icon, _configurePage));
+        NodeHelper.ExpandParents(Node, true);
     }
-    
-    public void AddUnderParentNode(DataListEntry entry)
+
+    private void _configurePage(EditorPageViewModel vm)
     {
+        ReflectedDataPageViewModel pg = (ReflectedDataPageViewModel)vm;
+    
+        pg.SetIsRootPage(true);
+    
+        var dataRoot = pg.Node.FindNode<DataRootNode>();
+        var dataItem = pg.Node.FindNode<DataItemNode>();
 
-        Action<EditorPageViewModel> callback = (vm) =>
-        {
-            ReflectedDataPageViewModel pg = (ReflectedDataPageViewModel)vm;
-            
-            pg.SetIsRootPage(true);
-            
-            
-            var dataRoot = pg.Node.FindNode<DataRootNode>();
-            var dataItem = pg.Node.FindNode<DataItemNode>();
+        DataManager.DataType dataType = dataRoot.DataType;
+        string key = dataItem.ItemKey;
 
-            DataManager.DataType dataType = dataRoot.DataType;
-            string key = dataItem.ItemKey;
+        var regis = DataRegistry.Map[dataType];
+        IEntryData data = regis.GetEntry(key);
 
-            var regis = DataRegistry.Map[dataType];
-            IEntryData data = regis.GetEntry(key);
+        string title = DataEditor.GetWindowTitle(String.Format("{0} #{1}", dataType.ToString(), key),
+            data.Name.ToLocal(), data, data.GetType());
 
-            string title = DataEditor.GetWindowTitle(String.Format("{0} #{1}", dataType.ToString(), key),
-                data.Name.ToLocal(), data, data.GetType());
+        pg.SetPageTitle(title, pg.Node.Icon);
 
-            pg.SetPageTitle(title, pg.Node.Icon);
+        pg.OnLoadAction = (StackPanel stack) =>
+        {
+            DataEditor.LoadDataControls(key, data, stack);
+        };
 
-            pg.OnLoadAction = (StackPanel stack) =>
+        pg.OnOKAction = async (StackPanel stack) =>
+        {
+            lock (GameBase.lockObj)
             {
-                DataEditor.LoadDataControls(key, data, stack);
-            };
+                object obj = data;
+                DataEditor.SaveDataControls(ref obj, stack, new Type[0]);
+                DataManager.Instance.ContentChanged(dataType, key, (IEntryData)obj);
+
+                string newName = DataManager.Instance.DataIndices[dataType].Get(key).GetLocalString(true);
+                pg.SetPageTitle(
+                    DataEditor.GetWindowTitle(String.Format("{0} #{1}", dataType.ToString(), key), newName, obj,
+                        obj.GetType()), pg.Node.Icon);
+            }
 
-            pg.OnOKAction = async (StackPanel stack) =>
-            {
-                lock (GameBase.lockObj)
-                {
-                    object obj = data;
-                    DataEditor.SaveDataControls(ref obj, stack, new Type[0]);
-                    DataManager.Instance.ContentChanged(dataType, key, (IEntryData)obj);
-
-                    string newName = DataManager.Instance.DataIndices[dataType].Get(key).GetLocalString(true);
-                    pg.SetPageTitle(
-                        DataEditor.GetWindowTitle(String.Format("{0} #{1}", dataType.ToString(), key), newName, obj,
-                            obj.GetType()), pg.Node.Icon);
-                }
-
-                return true;
-            };
+            return true;
         };
-        Node.AddNodeIfNotExists(
-            _context.NodeFactory.CreateDataItemNode<ReflectedDataPageViewModel>(entry.Key, entry.Title, Node.Icon, callback));
-        NodeHelper.ExpandParents(Node, true);
     }
 
     public async Task AddItem()
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DevControlViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DevControlViewModel.cs
index cd2d3486..830719bd 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DevControlViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DevControlViewModel.cs
@@ -13,14 +13,12 @@ public class DevControlViewModel : EditorPageViewModel
     public DevTabScriptViewModel Script { get; }
 
     public override string DefaultTitle => "Dev Control";
-
-    public TestComboBoxViewModel Fruits { get; }
+    
 
     public DevControlViewModel(EditorContext context,
         DevTabGameViewModel game, DevTabPlayerViewModel player, DevTabTravelViewModel travel,
         DevTabScriptViewModel script, NodeBase node, Action<EditorPageViewModel> onPageOpen = null) : base(context, node, onPageOpen)
     {
-        Fruits = new TestComboBoxViewModel();
         Game = game;
         Player = player;
         Travel = travel;
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/SpritePageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/SpritePageViewModel.cs
index 5ff0d95b..8475d00e 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/SpritePageViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/SpritePageViewModel.cs
@@ -1,39 +1,711 @@
 using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.Linq;
 using System.Reactive;
+using System.Threading.Tasks;
 using Avalonia.Platform.Storage;
+using Avalonia.Threading;
+using DynamicData;
 using RogueEssence.Dev.Services;
 using ReactiveUI;
+using RogueEssence.Content;
+using RogueEssence.Dev.Utility;
+using RogueEssence.Dev.Views;
+using RogueEssence.Dungeon;
 
 namespace RogueEssence.Dev.ViewModels;
 
-public class SpritePageViewModel : EditorPageViewModel
+
+
+public interface ISpriteItemOperationStrategy
+{
+    Task<string?> ImportAsync(ObservableCollection<string> items);
+    Task ReImportAsync(string cachedPath);
+    Task DeleteAsync(string path);
+    Task ExportAsync(string path);
+}
+
+public class SpriteItemAssetTypeStrategy : ISpriteItemOperationStrategy
 {
-    public ReactiveCommand<Unit, Unit> CreateATab { get; }
-    public ReactiveCommand<Unit, Unit> CreateATopTab { get; }
-    public ReactiveCommand<Unit, Unit> TestDialog { get; }
-    public ReactiveCommand<Unit, Unit> RemoveSelfTab { get; }
+    private readonly IDialogService _dialogService;
+    private readonly GraphicsManager.AssetType _assetType;
+    private readonly Action _onReload;
+
+
+    public async Task<string?> ImportAsync(ObservableCollection<string> items)
+    {
+        string name = _assetType.ToString();
+        string folderName = DevForm.GetConfig(name + "Dir", Directory.GetCurrentDirectory());
+        var options = new FilePickerOpenOptions
+        {
+            Title = "Open .png or .xml File",
+            AllowMultiple = false,
+            FileTypeFilter =
+            [
+                new FilePickerFileType("PNG Files") { Patterns = ["*.png"] },
+                new FilePickerFileType("DirData XML") { Patterns = ["*.xml"] }
+            ]
+        };
+
+        string? result = null;
+        await Dispatcher.UIThread.InvokeAsync((Func<Task>)(async () =>
+        {
+            var filePath = await _dialogService.ShowFilePickerAsync(options, folderName);
+
+            if (filePath == null)
+                return;
+
+            string animName = Path.GetFileNameWithoutExtension(filePath);
+
+            if (items.Any(item => item == animName))
+            {
+                MessageBoxWindowView.MessageBoxResult res = await MessageBoxWindowView.Show(_dialogService, "Are you sure you want to overwrite the existing sheet:\n" + animName, "Sprite Sheet already exists.", MessageBoxWindowView.MessageBoxButtons.YesNo);
+                if (res == MessageBoxWindowView.MessageBoxResult.No)
+                    return;
+            }
+            else
+            {
+                items.Add(animName);
+            }
+
+            DevForm.SetConfig(name + "Dir", Path.GetDirectoryName(filePath));
+            result = Path.GetExtension(filePath) == ".xml"
+                ? Path.GetDirectoryName(filePath)
+                : filePath;
+
+            try
+            {
+                _import(result);
+            }
+            catch (Exception ex)
+            {
+                DiagManager.Instance.LogError(ex, false);
+                await MessageBoxWindowView.Show(_dialogService, "Error importing from\n" + result + "\n\n" + ex.Message, "Import Failed", MessageBoxWindowView.MessageBoxButtons.Ok);
+                result = null;
+            }
+        }));
+
+        return result;
+    }
+    
+    
+    public async Task DeleteAsync(string key)
+    {
+        var res = await MessageBoxWindowView.Show(_dialogService, $"Delete sprite '{key}'?", "Deleting Sprite", MessageBoxWindowView.MessageBoxButtons.YesNo, true);
+        
+        if (res == MessageBoxWindowView.MessageBoxResult.Yes)
+        {
+            lock (GameBase.lockObj)
+            {
+                string anim = key;
+                string animPath = PathMod.ModPath(String.Format(GraphicsManager.GetPattern(_assetType), anim));
+                if (File.Exists(animPath))
+                    File.Delete(animPath);
+
+                GraphicsManager.RebuildIndices(_assetType);
+                GraphicsManager.ClearCaches(_assetType);
+
+                DiagManager.Instance.LogInfo("Deleted frames for:" + anim);
+                _onReload?.Invoke();
+            }
+            
+        }
+    }
+    
+    public async Task ExportAsync(string key)
+    {
+        string name = _assetType.ToString();
+        string folderName = DevForm.GetConfig(name + "Dir", Directory.GetCurrentDirectory());
+        var options = new FilePickerSaveOptions
+        {
+            Title = $"Export {key} as PNG",
+            DefaultExtension = "png",
+            FileTypeChoices =
+            [
+                new FilePickerFileType("PNG Files")
+                {
+                    Patterns = new[] { "*.png" }
+                }
+            ]
+        };
+
+        await Dispatcher.UIThread.InvokeAsync((Func<Task>)(async () =>
+        {
+
+            var filePath = await _dialogService.TryGetSaveFileAsync(options, folderName);
+            if (!String.IsNullOrEmpty(filePath))
+            {
+                DevForm.SetConfig(name + "Dir", Path.GetDirectoryName(filePath));
+
+                try
+                {
+                    DevForm.ExecuteOrPend(() => { _export(filePath, key); });
+                }
+                catch (Exception ex)
+                {
+                    DiagManager.Instance.LogError(ex, false);
+
+
+                    await MessageBoxWindowView.Show(_dialogService, $"Error exporting to\n{filePath}\n\n{ex.Message}", "Export Failed", MessageBoxWindowView.MessageBoxButtons.Ok);
+                }
+            }
+        }));
+
+    }
+    
+    public async Task ReImportAsync(string cachedPatg)
+    {
+        await Dispatcher.UIThread.InvokeAsync((Func<Task>)(async () =>
+        {
+            try
+            {
+                _import(cachedPatg);
+            }
+            catch (Exception ex)
+            {
+                DiagManager.Instance.LogError(ex, false);
+                await MessageBoxWindowView.Show(_dialogService, "Error importing from\n" + cachedPatg + "\n\n" + ex.Message, "Import Failed", MessageBoxWindowView.MessageBoxButtons.Ok);
+                return;
+            }
+
+        }));
+    }
+
+    private void _export(string currentPath, string anim)
+    {
+        lock (GameBase.lockObj)
+        {
+            string animPath = PathMod.ModPath(String.Format(GraphicsManager.GetPattern(_assetType), anim));
+            if (File.Exists(animPath))
+            {
+                //read file and read binary data
+                using (FileStream fileStream = File.OpenRead(animPath))
+                {
+                    using (BinaryReader reader = new BinaryReader(fileStream))
+                    {
+                        DirSheet sheet = DirSheet.Load(reader);
+
+                        string filename = DirSheet.GetExportString(sheet, Path.GetFileNameWithoutExtension(currentPath));
+                        string dirname = Path.GetDirectoryName(currentPath);
+                        DirSheet.Export(sheet, Path.Combine(dirname, filename + ".png"));
+                    }
+                }
+            }
+
+            DiagManager.Instance.LogInfo("Frames from:\n" +
+                                         anim +
+                                         "\nhave been exported to:" + currentPath);
+        }
+    }
     
-    // public override string Title => "Sprite Stuff";
+    
+    private void _import(string currentPath)
+    {
+        DevForm.ExecuteOrPend(() => { _tryImport(currentPath); });
 
+        //recompute
+        _onReload?.Invoke();
+    }
 
-    public SpritePageViewModel(EditorContext context, NodeBase node, Action<EditorPageViewModel> onPageOpen = null) : base(context, node, onPageOpen)
+    private void _tryImport(string currentPath)
     {
-        CreateATab = ReactiveCommand.Create(() => _context.TabEvents.AddChildPage(this, _context.PageFactory.CreatePage(typeof(SpritePageViewModel))));
-        CreateATopTab = ReactiveCommand.Create(() => _context.TabEvents.AddTopLevelTab(_context.PageFactory.CreatePage(typeof(ModInfoEditorViewModel))));
-        TestDialog = ReactiveCommand.CreateFromTask(async () =>
+        lock (GameBase.lockObj)
+        {
+            string assetPattern = GraphicsManager.GetPattern(_assetType);
+            string destFile;
+            string animName = Path.GetFileNameWithoutExtension(currentPath);
+            if (Directory.Exists(currentPath))
+                destFile = PathMod.HardMod(String.Format(assetPattern, animName));
+            else
             {
-                var rename = new RenameWindowViewModel();
-                var result = await _context.DialogService.ShowFolderPickerAsync(new FolderPickerOpenOptions()
+                string[] components = animName.Split('.');
+                if (components.Length != 2)
+                    throw new ArgumentException(
+                        "The input filename does not fit the convention of \"<Anim Name>.<Anim Type>.png\"!");
+                destFile = PathMod.HardMod(String.Format(assetPattern, components[0]));
+            }
+
+            if (!Directory.Exists(Path.GetDirectoryName(destFile)))
+                Directory.CreateDirectory(Path.GetDirectoryName(destFile));
+
+            //write sprite data
+            using (DirSheet sheet = DirSheet.Import(currentPath))
+            {
+                using (FileStream stream = File.OpenWrite(destFile))
                 {
-                    AllowMultiple = false,
-                    Title = "Select a folder"
-                });
-                Console.WriteLine(rename.Name);
+                    //save data
+                    using (BinaryWriter writer = new BinaryWriter(stream))
+                        sheet.Save(writer);
+                }
             }
-        );
+
+            GraphicsManager.RebuildIndices(_assetType);
+            GraphicsManager.ClearCaches(_assetType);
+
+            DiagManager.Instance.LogInfo("Frames from:\n" +
+                                         currentPath + "\nhave been imported.");
+        }
+    }
+
+    public SpriteItemAssetTypeStrategy(IDialogService dialogService, GraphicsManager.AssetType assetType, Action onReload)
+    {
+        _dialogService = dialogService;
+        _assetType = assetType;
+        _onReload = onReload;
+    }
+}
+
+
+
+
+
+public class SpriteItemTileStrategy : ISpriteItemOperationStrategy
+{
+    private int _cachedSize;
+
+    private readonly IDialogService _dialogService;
+    
+    private Action _onReload;
+    public SpriteItemTileStrategy(IDialogService dialogService, Action onReload)
+    {
+        _dialogService = dialogService;
+        _onReload = onReload;
+    }
+    
+    public async Task DeleteAsync(string key)
+    {
+        var res = await MessageBoxWindowView.Show(_dialogService, $"Delete sprite '{key}'?", "Deleting Sprite",
+            MessageBoxWindowView.MessageBoxButtons.YesNo, true);
+
+        if (res == MessageBoxWindowView.MessageBoxResult.Yes)
+        {
+            lock (GameBase.lockObj)
+            {
+                string anim = key;
+
+                string animPath = PathMod.ModPath(String.Format(GraphicsManager.TILE_PATTERN, anim));
+                if (File.Exists(animPath))
+                    File.Delete(animPath);
+
+                GraphicsManager.RebuildIndices(GraphicsManager.AssetType.Tile);
+                GraphicsManager.ClearCaches(GraphicsManager.AssetType.Tile);
+
+                DiagManager.Instance.LogInfo("Deleted frames for:" + anim);
+                _onReload?.Invoke();
+            }
+        }
+    }
+    
+    public async Task ExportAsync(string key)
+    {
+        //get current sprite
+        string animData = key;
+
+        //remember addresses in registry
+        string folderName = DevForm.GetConfig("TilesetDir", Directory.GetCurrentDirectory());
+
+        var options = new FilePickerSaveOptions
+        {
+            Title = "Export PNG",
+            DefaultExtension = "png",
+            FileTypeChoices =
+            [
+                new FilePickerFileType("PNG Files")
+                {
+                    Patterns = new[] { "*.png" }
+                }
+            ]
+        };
+        var folder = await _dialogService.TryGetSaveFileAsync(options, folderName);
+        if (!String.IsNullOrEmpty(folder))
+        {
+            DevForm.SetConfig("TilesetDir", Path.GetDirectoryName(folder));
+
+            try
+            {
+                DevForm.ExecuteOrPend(() => { _export(folder, animData); });
+            }
+            catch (Exception ex)
+            {
+                DiagManager.Instance.LogError(ex, false);
+                await MessageBoxWindowView.Show(_dialogService,
+                    "Error exporting to\n" + folderName + "\n\n" + ex.Message, "Export Failed",
+                    MessageBoxWindowView.MessageBoxButtons.Ok);
+                return;
+            }
+        }
+    }
+    
+    
+    public async Task<string?> ImportAsync(ObservableCollection<string> items)
+    {
+        //remember addresses in registry
+        string folderName = DevForm.GetConfig("TilesetDir", Directory.GetCurrentDirectory());
+
+        var options = new FilePickerOpenOptions
+        {
+            Title = "Open .png File",
+            AllowMultiple = false,
+            FileTypeFilter =
+            [
+                new FilePickerFileType("PNG Files") { Patterns = ["*.PNG"] }
+            ]
+        };
+
+        var file = await _dialogService.ShowFilePickerAsync(options, folderName);
+        if (file == null) return null;
+
+        string animName = Path.GetFileNameWithoutExtension(file);
+
+        if (items.Any(item => item == animName))
+        {
+            MessageBoxWindowView.MessageBoxResult result = await MessageBoxWindowView.Show(_dialogService,
+                "Are you sure you want to overwrite the existing sheet:\n" + animName,
+                "Sprite Sheet already exists.",
+                MessageBoxWindowView.MessageBoxButtons.YesNo);
+            if (result == MessageBoxWindowView.MessageBoxResult.No)
+                return null;
+        }
+        else
+        {
+            items.Add(animName);
+        }
+
+        MapRetileViewModel viewModel = new MapRetileViewModel(GraphicsManager.TileSize, "Tile size must be divisible by 8.");
+        bool sizeResult = await _dialogService.ShowDialogAsync<MapRetileViewModel, bool>(viewModel, "");
+
+        int size = viewModel.TileSize;
+
+        if (!sizeResult || size == 0)
+            return null;
+
+        //open window to choose directory
+        DevForm.SetConfig("TilesetDir", Path.GetDirectoryName(file));
+        _cachedSize = size;
+
+        try
+        {
+            _import(file, _cachedSize);
+            return file;
+        }
+        catch (Exception ex)
+        {
+            DiagManager.Instance.LogError(ex, false);
+            await MessageBoxWindowView.Show(_dialogService,
+                "Error importing from\n" + file + "\n\n" + ex.Message,
+                "Import Failed", MessageBoxWindowView.MessageBoxButtons.Ok);
+            return null;
+        }
+    }
+    
+    public async Task ReImportAsync(string cachedPath)
+    {
+        try
+        {
+            _import(cachedPath, _cachedSize);
+        }
+        catch (Exception ex)
+        {
+            DiagManager.Instance.LogError(ex, false);
+            await MessageBoxWindowView.Show(_dialogService,
+                "Error importing from\n" + cachedPath + "\n\n" + ex.Message, "Import Failed",
+                MessageBoxWindowView.MessageBoxButtons.Ok);
+            return;
+        }
+    }
+    
+    private void _import(string currentPath, int tileSize)
+    {
+        DevForm.ExecuteOrPend(() => { _tryImport(currentPath, tileSize); });
+
+        //recompute
+        _onReload?.Invoke();
+    }
+
+    
+    private void _tryImport(string currentPath, int tileSize)
+    {
+        lock (GameBase.lockObj)
+        {
+            string sheetName = Path.GetFileNameWithoutExtension(currentPath);
+            string outputFile = PathMod.HardMod(String.Format(GraphicsManager.TILE_PATTERN, sheetName));
+
+            if (!Directory.Exists(Path.GetDirectoryName(outputFile)))
+                Directory.CreateDirectory(Path.GetDirectoryName(outputFile));
+
+            //load into tilesets
+            using (BaseSheet tileset = BaseSheet.Import(currentPath))
+            {
+                List<BaseSheet[]> tileList = new List<BaseSheet[]>();
+                tileList.Add(new BaseSheet[] { tileset });
+                ImportHelper.SaveTileSheet(tileList, outputFile, tileSize);
+            }
+
+            GraphicsManager.RebuildIndices(GraphicsManager.AssetType.Tile);
+            GraphicsManager.ClearCaches(GraphicsManager.AssetType.Tile);
+            DevDataManager.ClearCaches();
+
+            DiagManager.Instance.LogInfo("Tiles from:\n" +
+                                         currentPath + "\nhave been imported.");
+        }
+    }
+
+    
+    private void _export(string currentPath, string anim)
+    {
+        lock (GameBase.lockObj)
+        {
+            string animPath = PathMod.ModPath(String.Format(GraphicsManager.TILE_PATTERN, anim));
+            ImportHelper.ExportTileSheet(animPath, currentPath);
+
+            DiagManager.Instance.LogInfo("Frames from:\n" +
+                                         anim + "\nhave been exported to:" + currentPath);
+        }
+    }
+    
+    
+
+
+}
+
+
+
+public class SpritePageViewModel : EditorPageViewModel<SpriteRootNode>
+{
+    
+    private string _searchFilter = string.Empty;
+
+    public string SearchFilter
+    {
+        get => _searchFilter;
+        set => this.RaiseAndSetIfChanged(ref _searchFilter, value);
+    }
+    
+    // private List<string> anims;
+    // public SearchListBoxViewModel Anims { get; set; }
+
+    private string cachedPath;
+    public string CachedPath
+    {
+        get => cachedPath;
+        set => this.RaiseAndSetIfChanged(ref cachedPath, value);
+    }
+    
+    private string? _selectedItem;
+
+    public string? SelectedItem
+    {
+        get => _selectedItem;
+        set => this.RaiseAndSetIfChanged(ref _selectedItem, value);
+    }
+
+
+    public ObservableCollection<string> Items { get; } = new();
+    public ObservableCollection<string> FilteredItems { get; } = new();
+
+    public ObservableCollection<DataOpContainer> EditMenuItems { get; } = new();
+    
+    public string Name { get { return AssetType.ToString(); } }
+
+    private void UpdateVisibleItems(string filter)
+    {
+        FilteredItems.Clear();
+        var strategy = new BeginningTitleFilterStrategy();
+        foreach (var item in Items.Where(key => strategy.Matches(key, filter)))
+            FilteredItems.Add(item);
+    }
+
+    
+    public GraphicsManager.AssetType AssetType => Node.AssetType;
+    
+    private ISpriteItemOperationStrategy _strategy;
+    
+    public SpritePageViewModel(EditorContext context, SpriteRootNode node, Action<EditorPageViewModel> onPageOpen = null) : base(context, node, onPageOpen)
+    {
+
+        if (AssetType == GraphicsManager.AssetType.Tile)
+        {
+            _strategy = new SpriteItemTileStrategy(context.DialogService, LoadDataEntriesForTiles);
+        }
+        else
+        {
+            _strategy = new SpriteItemAssetTypeStrategy(context.DialogService, AssetType,
+                () => LoadDataEntries(AssetType));
+        }
+    }
+    
+    public Action? OnPageRemovedAction { get; set; }
+
+    public override void OnPageRemoved()
+    {
+        OnPageRemovedAction?.Invoke();
+        base.OnPageRemoved();
+    }
+    
+    
+    public override void OnPageLoad()
+    {
         
-        RemoveSelfTab = ReactiveCommand.Create( () => _context.TabEvents.RemoveTab(this));
-            
+        if (AssetType == GraphicsManager.AssetType.Tile)
+        { 
+            LoadDataEntriesForTiles();
+        }
+        else
+        {
+            LoadDataEntries(AssetType);
+        }
         
+      
+        this.WhenAnyValue(x => x.SearchFilter).Subscribe(UpdateVisibleItems);
+        this.WhenAnyValue(x => x.SelectedItem).Subscribe(_ => CachedPath = null);
+        CachedPath = null;
+        // EditMenuItems.Add(new DataOpContainer("Re-Index", ReIndexAsync));
+        // if (DataType != DataManager.DataType.AutoTile)
+        // {
+        //     EditMenuItems.Add(new DataOpContainer("Resave all as File", () => ResaveAllAsync(false)));
+        //     EditMenuItems.Add(new DataOpContainer("Resave all as Diff", () => ResaveAllAsync(true)));
+        // }
+        // else
+        // {
+        //     EditMenuItems.Add(new DataOpContainer("Import DTEF", ImportDtefAsync));
+        //     // EditMenuItems.Add(new DataOpContainer("Export as DTEF", ExportDtefAsync));
+        // }
+    }
+    
+    // private void Delete(int animIdx)
+    // {
+    //     lock (GameBase.lockObj)
+    //     {
+    //         string anim = anims[animIdx];
+    //         string animPath = PathMod.ModPath(String.Format(GraphicsManager.GetPattern(AssetType), anim));
+    //         if (File.Exists(animPath))
+    //             File.Delete(animPath);
+    //
+    //         GraphicsManager.RebuildIndices(AssetType);
+    //         GraphicsManager.ClearCaches(AssetType);
+    //
+    //         DiagManager.Instance.LogInfo("Deleted frames for:" + anim);
+    //
+    //         anims.RemoveAt(animIdx);
+    //         Anims.RemoveInternalAt(animIdx);
+    //     }
+    // }
+    
+    public async void mnuMassExport_Click()
+    {
+        await Node.MassExportAsync();
+    }
+    
+    public async void mnuMassImport_Click()
+    {
+        await Node.MassImportAsync();
+    }
+    
+    
+    public void LoadDataEntries(GraphicsManager.AssetType assetType)
+    {
+        lock (GameBase.lockObj)
+        {
+            
+            Dispatcher.UIThread.Post(() =>
+            {
+                Items.Clear();
+                string assetPattern = GraphicsManager.GetPattern(assetType);
+                string[] dirs = PathMod.GetModFiles(Path.GetDirectoryName(assetPattern), String.Format(Path.GetFileName(assetPattern), "*"));
+                for (int ii = 0; ii < dirs.Length; ii++)
+                {
+                    string filename = Path.GetFileNameWithoutExtension(dirs[ii]);
+                    Items.Add(filename);
+                }
+
+                UpdateVisibleItems(SearchFilter);
+            });
+        }
+    }
+
+    public void LoadDataEntriesForTiles()
+    {
+        lock (GameBase.lockObj)
+        {
+            Dispatcher.UIThread.Post(() =>
+            {
+                Items.Clear();
+                
+                foreach (string name in GraphicsManager.TileIndex.Nodes.Keys)
+                {
+                    Items.Add(name);
+                }
+                UpdateVisibleItems(SearchFilter);
+            });
+        }
+    }
+    
+    public async void btnImport_Click()
+    {
+        var path = await _strategy.ImportAsync(Items);
+        if (path != null)
+            CachedPath = path;
     }
+    
+
+    public async void btnReImport_Click()
+    {
+        await _strategy.ReImportAsync(CachedPath);
+    }
+    
+    public async void btnExport_Click()
+    {
+        await _strategy.ExportAsync(SelectedItem);
+    }
+    
+    public async void btnDelete_Click()
+    {
+        await _strategy.DeleteAsync(SelectedItem);
+    }
+    
+    protected override bool IsSamePage(EditorPageViewModel other)
+    {
+        var page = other as SpritePageViewModel;
+        return AssetType == page?.AssetType;
+    }
+    
+    
+    public async void mnuReIndex_Click()
+    {
+        try
+        {
+            ReIndex();
+        }
+        catch (Exception ex)
+        {
+            DiagManager.Instance.LogError(ex, false);
+            await MessageBoxWindowView.Show(_context.DialogService, "Error when reindexing.\n\n" + ex.Message, "Reindex Failed", MessageBoxWindowView.MessageBoxButtons.Ok);
+            return;
+        }
+    }
+    
+    public void ReIndex()
+    {
+        DevForm.ExecuteOrPend(() => { tryReIndex(); });
+
+        LoadDataEntriesForTiles();
+    }
+
+    
+    private void tryReIndex()
+    {
+        lock (GameBase.lockObj)
+        {
+            GraphicsManager.RebuildIndices(GraphicsManager.AssetType.Tile);
+            GraphicsManager.ClearCaches(GraphicsManager.AssetType.Tile);
+
+            DiagManager.Instance.LogInfo("All files re-indexed.");
+        }
+    }
+    
+    public bool IsTileAsset => AssetType == GraphicsManager.AssetType.Tile;
+    
+    
 }
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/ISpriteOperationStrategy.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/ISpriteRootOperationStrategy.cs
similarity index 86%
rename from RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/ISpriteOperationStrategy.cs
rename to RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/ISpriteRootOperationStrategy.cs
index 2325254d..360ff6ba 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/ISpriteOperationStrategy.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/ISpriteRootOperationStrategy.cs
@@ -2,7 +2,7 @@
 
 namespace RogueEssence.Dev.ViewModels;
 
-public interface ISpriteOperationStrategy
+public interface ISpriteRootOperationStrategy
 {
     Task<NodeBase> AddAsync();
     Task DeleteAsync(DataItemNode node);
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/NodeBase.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/NodeBase.cs
index 50ea781b..15e8b839 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/NodeBase.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/NodeBase.cs
@@ -701,16 +701,16 @@ protected override int GetHashCodeCore()
 // SpriteRootNode have additional properties like mass exporting
 public class SpriteRootNode : ItemRootNode
 {
-    private readonly ISpriteOperationStrategy _strategy;
+    private readonly ISpriteRootOperationStrategy _strategy;
     
     public readonly GraphicsManager.AssetType AssetType;
 
     
     public ReactiveCommand<Unit, Unit> MassExportCommand { get; }
     public ReactiveCommand<Unit, Unit> MassImportCommand { get; }
-    public ReactiveCommand<DataItemNode, Unit> ExportCommand { get; }
-    public ReactiveCommand<Unit, Unit> ImportCommand { get; }
-    public ReactiveCommand<Unit, Unit> ReImportCommand { get; }
+    // public ReactiveCommand<DataItemNode, Unit> ExportCommand { get; }
+    // public ReactiveCommand<Unit, Unit> ImportCommand { get; }
+    // public ReactiveCommand<Unit, Unit> ReImportCommand { get; }
 
     private string _cachedPath;
     public string CachedPath
@@ -735,19 +735,19 @@ public SpriteRootNode(
 
         if (AssetType == GraphicsManager.AssetType.Tile)
         {
-            _strategy = new SpriteTileStrategy(dialogService, nodeFactory, this);
+            _strategy = new SpriteRootTileStrategy(dialogService, nodeFactory, this);
         }
         else
         {
-            _strategy = new SpriteAssetTypeStrategy(dialogService, nodeFactory, this);
+            _strategy = new SpriteRootAssetTypeStrategy(dialogService, nodeFactory, this);
             
         }
         
         MassExportCommand = ReactiveCommand.CreateFromTask(MassExportAsync);
         MassImportCommand = ReactiveCommand.CreateFromTask(MassImportAsync);
-        ExportCommand = ReactiveCommand.CreateFromTask<DataItemNode>(ExportSpriteAsync);
-        ImportCommand = ReactiveCommand.CreateFromTask(ImportSpriteAsync);
-        ReImportCommand = ReactiveCommand.CreateFromTask(ReImportSpriteAsync);
+        // ExportCommand = ReactiveCommand.CreateFromTask<DataItemNode>(ExportSpriteAsync);
+        // ImportCommand = ReactiveCommand.CreateFromTask(ImportSpriteAsync);
+        // ReImportCommand = ReactiveCommand.CreateFromTask(ReImportSpriteAsync);
     }
 
     public override async Task AddItem()
@@ -760,30 +760,30 @@ public override async Task DeleteItem(string key)
         // await _strategy.DeleteAsync(node);
     }
 
-    private async Task MassExportAsync()
+    public async Task MassExportAsync()
     {
         await _strategy.MassExportAsync();
     }
 
-    private async Task MassImportAsync()
+    public async Task MassImportAsync()
     {
         await _strategy.MassImportAsync();
     }
 
-    private async Task ExportSpriteAsync(DataItemNode node)
-    {
-        await _strategy.ExportAsync(node);
-    }
-
-    private async Task ImportSpriteAsync()
-    {
-        await _strategy.ImportAsync();
-    }
+    // private async Task ExportSpriteAsync(DataItemNode node)
+    // {
+    //     await _strategy.ExportAsync(node);
+    // }
 
-    private async Task ReImportSpriteAsync()
-    {
-        await _strategy.ReImportAsync();
-    }
+    // private async Task ImportSpriteAsync()
+    // {
+    //     await _strategy.ImportAsync();
+    // }
+    //
+    // private async Task ReImportSpriteAsync()
+    // {
+    //     await _strategy.ReImportAsync();
+    // }
 }
 
 public class SpriteTileRootNode : SpriteRootNode
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/SpriteAssetTypeStrategy.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/SpriteRootAssetTypeStrategy.cs
similarity index 97%
rename from RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/SpriteAssetTypeStrategy.cs
rename to RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/SpriteRootAssetTypeStrategy.cs
index 9eb1e93c..fbe48d20 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/SpriteAssetTypeStrategy.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/SpriteRootAssetTypeStrategy.cs
@@ -10,7 +10,7 @@
 
 namespace RogueEssence.Dev.ViewModels;
 
-public class SpriteAssetTypeStrategy : ISpriteOperationStrategy
+public class SpriteRootAssetTypeStrategy : ISpriteRootOperationStrategy
 {
     private readonly IDialogService _dialogService;
     private readonly NodeFactory _nodeFactory;
@@ -65,7 +65,7 @@ private bool _massExport(string currentPath, GraphicsManager.AssetType assetType
         return success;
     }
 
-    public SpriteAssetTypeStrategy(IDialogService dialogService, NodeFactory nodeFactory, SpriteRootNode spriteRootNode)
+    public SpriteRootAssetTypeStrategy(IDialogService dialogService, NodeFactory nodeFactory, SpriteRootNode spriteRootNode)
     {
         _dialogService = dialogService;
         _nodeFactory = nodeFactory;
@@ -124,7 +124,7 @@ await Dispatcher.UIThread.InvokeAsync(async () =>
         {
             var options = new FolderPickerOpenOptions
             {
-                Title = "Select folder to mass export to",
+                Title = $"Select folder to mass export {name} to",
                 AllowMultiple = false,
             };
             var folder = await _dialogService.ShowFolderPickerAsync(options, folderName);
@@ -152,7 +152,7 @@ public async Task MassImportAsync()
 
         var options = new FolderPickerOpenOptions
         {
-            Title = "Select folder to mass import",
+            Title = $"Select folder to mass import \"{name}\" from",
             AllowMultiple = false,
         };
         var result = await _dialogService.ShowFolderPickerAsync(options, folderName);
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/SpriteTileStrategy.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/SpriteRootTileStrategy.cs
similarity index 98%
rename from RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/SpriteTileStrategy.cs
rename to RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/SpriteRootTileStrategy.cs
index 462ff0a2..482b5223 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/SpriteTileStrategy.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/SpriteRootTileStrategy.cs
@@ -15,7 +15,7 @@
 
 namespace RogueEssence.Dev.ViewModels;
 
-public class SpriteTileStrategy : ISpriteOperationStrategy
+public class SpriteRootTileStrategy : ISpriteRootOperationStrategy
 {
     private int _cachedSize;
 
@@ -23,7 +23,7 @@ public class SpriteTileStrategy : ISpriteOperationStrategy
     private readonly NodeFactory _nodeFactory;
     private readonly SpriteRootNode _spriteRootNode;
 
-    public SpriteTileStrategy(IDialogService dialogService, NodeFactory nodeFactory, SpriteRootNode spriteRootNode)
+    public SpriteRootTileStrategy(IDialogService dialogService, NodeFactory nodeFactory, SpriteRootNode spriteRootNode)
     {
         _dialogService = dialogService;
         _nodeFactory = nodeFactory;
diff --git a/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml.cs b/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml.cs
index 2ab14ee7..adfc3508 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml.cs
@@ -565,6 +565,8 @@ private void ShowDataItemNodeMenu(TreeDataGridRow current, DataItemNode node, Da
     private void ShowSpriteItemNodeMenu(TreeDataGridRow current, DataItemNode node, SpriteRootNode parentNode,
         ContextRequestedEventArgs e)
     {
+        // var contextMenu = ContextMenuHelper.CreateDataItemMenu(parentNode, node.ItemKey);
+
         // var menu = new ContextMenu
         // {
         //     Items =
@@ -597,24 +599,27 @@ private void ShowRootNodeMenu(TreeDataGridRow current, DataRootNode root, Contex
     
     private void ShowSpriteRootNodeMenu(TreeDataGridRow current, SpriteRootNode root, ContextRequestedEventArgs e)
     {
-        var menu = new ContextMenu
-        {
-            Items =
-            {
-                new MenuItem { Header = "Mass Import", Command = root.MassImportCommand, Icon = App.CreateMenuIcon("Icons.DownloadSimpleFill") },
-                new MenuItem { Header = "Mass Export", Command = root.MassExportCommand, Icon = App.CreateMenuIcon("Icons.ExportFill") },
-                
-                
-                new Separator(),
-                new MenuItem { Header = "Import", Command = root.ImportCommand, Icon = App.CreateMenuIcon("Icons.Plus") },
-                new MenuItem { Header = "Re-Import", Command = root.ReImportCommand, Icon = App.CreateMenuIcon("Icons.RepeatFill") },
-                // new MenuItem { Header = "Add", Command = root.AddCommand,  Icon = App.CreateMenuIcon("Icons.Plus") }
-            }
-        };
+     //    var menu = new ContextMenu
+     //    {
+     //        Items =
+     //        {
+     //            new MenuItem { Header = "Mass Import", Command = root.MassImportCommand, Icon = App.CreateMenuIcon("Icons.DownloadSimpleFill") },
+     //            new MenuItem { Header = "Mass Export", Command = root.MassExportCommand, Icon = App.CreateMenuIcon("Icons.ExportFill") },
+     //            
+     //            
+     // ,
+     //            // new MenuItem { Header = "Import", Command = root.ImportCommand, Icon = App.CreateMenuIcon("Icons.Plus") },
+     //            // new MenuItem { Header = "Re-Import", Command = root.ReImportCommand, Icon = App.CreateMenuIcon("Icons.RepeatFill") },
+     //            // new MenuItem { Header = "Add", Command = root.AddCommand,  Icon = App.CreateMenuIcon("Icons.Plus") }
+     //        }
+     //    };
+
+        var menu = ContextMenuHelper.CreateSpriteItemMenu(root);
 
         if (root is SpriteTileRootNode node)
         {
-            menu.Items.Insert(0, new MenuItem { Header = "Re-Index", Command = node.ReIndexCommand, Icon = App.CreateMenuIcon("Icons.ListNumbersFill") } );
+            menu.Items.Add(new Separator());
+            menu.Items.Add(new MenuItem { Header = "Re-Index", Command = node.ReIndexCommand, Icon = App.CreateMenuIcon("Icons.ListNumbersFill")});
         };
 
         AttachAndOpenMenu(current, menu, e);
@@ -664,13 +669,13 @@ private void LeftTreeDataGrid_OnContextRequested(object? sender, ContextRequeste
                 ShowDataItemNodeMenu(row, itemNode, root, e);
                 break;
     
-            case DataItemNode itemNode when parent is SpriteRootNode spriteRoot:
-                ShowSpriteItemNodeMenu(row, itemNode, spriteRoot, e);
-                break;
-    
-            case DataRootNode rootNode:
-                ShowRootNodeMenu(row, rootNode, e);
-                break;
+            // case DataItemNode itemNode when parent is SpriteRootNode spriteRoot:
+            //     ShowSpriteItemNodeMenu(row, itemNode, spriteRoot, e);
+            //     break;
+            //
+            // case DataRootNode rootNode:
+            //     ShowRootNodeMenu(row, rootNode, e);
+            //     break;
     
             case SpriteRootNode spriteRoot:
                 ShowSpriteRootNodeMenu(row, spriteRoot, e);
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/DataListPageView.axaml b/RogueEssence.Editor.Avalonia/Views/New/Editors/DataListPageView.axaml
index 965c5541..1e80ba41 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/Editors/DataListPageView.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/New/Editors/DataListPageView.axaml
@@ -83,7 +83,6 @@
 
             <TextBox Grid.Row="0"
                      Height="24"
-                     x:Name="TabSwitcherTextBox"
                      HorizontalAlignment="Stretch"
                      Margin="0"
                      BorderThickness="1"
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/DataListPageView.axaml.cs b/RogueEssence.Editor.Avalonia/Views/New/Editors/DataListPageView.axaml.cs
index c700521a..71b9f6fc 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/Editors/DataListPageView.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/New/Editors/DataListPageView.axaml.cs
@@ -20,7 +20,7 @@ public DataListPageView()
     private void DataListPageListBox_OnDoubleTapped(object sender, TappedEventArgs e)
     {
         if (DataContext is DataListPageViewModel vm)
-            vm.AddUnderParentNode(vm.SelectedItem);
+            vm.AddChildItemUnderParent(vm.SelectedItem);
     }
 
 
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/SpeciesEditPageView.axaml b/RogueEssence.Editor.Avalonia/Views/New/Editors/SpeciesEditPageView.axaml
index 69f43967..1afc6199 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/Editors/SpeciesEditPageView.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/New/Editors/SpeciesEditPageView.axaml
@@ -189,8 +189,9 @@
                     <v:IconText Text="Export" Icon="Icons.ExportFill" IconSize="12" />
                 </Button>
                 <Button Classes="flat" Width="100" Margin="24,0,0,0"
-                        Command="{Binding btnExport_Click}"
-                        IsEnabled="{Binding ChosenMonster, Converter={x:Static ObjectConverters.IsNotNull}}">
+                        Command="{Binding btnDelete_Click}"
+                        IsEnabled="{Binding 
+                        ChosenMonster, Converter={x:Static ObjectConverters.IsNotNull}}">
                     <v:IconText Text="Delete" Icon="Icons.TrashFill" IconSize="12" />
                 </Button>
             </StackPanel>
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/SpritePageView.axaml b/RogueEssence.Editor.Avalonia/Views/New/Editors/SpritePageView.axaml
index 689823d9..349b5f86 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/Editors/SpritePageView.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/New/Editors/SpritePageView.axaml
@@ -8,15 +8,121 @@
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:DataType="vm:SpritePageViewModel"
              x:Class="RogueEssence.Dev.Views.SpritePageView">
-    <!-- <UserControl.DataContext> -->
-    <!--     <vm:SpritePageViewModel/> -->
-    <!-- </UserControl.DataContext> -->
-    <StackPanel>
-        <Button Command="{Binding CreateATab}" Content="Add a child tab to this one!"/>
-        <Button Command="{Binding CreateATopTab}" Content="Add a top level tab!"/>
-        <Button Command="{Binding  TestDialog}" Content="Test out a dialogue!"/>
+    <Design.DataContext>
+        <vm:SpritePageViewModel/>
+    </Design.DataContext>
+    <Grid RowDefinitions="Auto, 32, Auto, 20, Auto">
+        <DockPanel Grid.Row="0" VerticalAlignment="Top">
+            <Menu DockPanel.Dock="Top">
+                <MenuItem Header="_Edit">
+                    <MenuItem Header="Mass Import" Command="{Binding mnuMassImport_Click}"/>
+                    <MenuItem Header="Mass Export" Command="{Binding mnuMassExport_Click}"/>
+                    <Separator IsVisible="{Binding IsTileAsset}"/>
+                    <MenuItem IsVisible="{Binding IsTileAsset}" Header="Re-Index" Command="{Binding mnuReIndex_Click}"/>
+                </MenuItem>
+            </Menu>
+            
+            
+            <!-- <Grid RowDefinitions="*, 34" ColumnDefinitions="*, *, *, *"> -->
+            <!--     <views:SearchListBox DataContext="{Binding Anims}" Margin="4" Grid.ColumnSpan="4"/> -->
+            <!--     <Button Command="{Binding btnImport_Click}" Margin="4" Grid.Row="1" Grid.Column="0" IsEnabled="{Binding ChosenAnim, Converter={x:Static ObjectConverters.IsNotNull}}">Import</Button> -->
+            <!--     <Button Command="{Binding btnReImport_Click}" Margin="4" Grid.Row="1" Grid.Column="1" IsEnabled="{Binding CachedPath, Converter={x:Static StringConverters.IsNotNullOrEmpty}}">Re-Import</Button> -->
+            <!--     <Button Command="{Binding btnExport_Click}" Margin="4" Grid.Row="1" Grid.Column="2" IsEnabled="{Binding ChosenAnim, Converter={x:Static ObjectConverters.IsNotNull}}">Export</Button> -->
+            <!--     <Button Command="{Binding btnDelete_Click}" Margin="4" Grid.Row="1" Grid.Column="3" IsEnabled="{Binding ChosenAnim, Converter={x:Static ObjectConverters.IsNotNull}}">Delete</Button> -->
+            <!-- </Grid> -->
+        </DockPanel>
+        <TextBlock Grid.Row="2" HorizontalAlignment="Center" Classes="table_header" FontSize="16"
+                   Text="{Binding AssetType}" />
+        
+                <Grid Grid.Row="3" RowDefinitions="Auto, 16, Auto, 12, Auto" Margin="64, 8" MinWidth="600">
 
-        <Button Command="{Binding  RemoveSelfTab}" Content="Close out this tab!"/>
-    </StackPanel>
- 
+            <TextBox Grid.Row="0"
+                     Height="24"
+                     HorizontalAlignment="Stretch"
+                     Margin="0"
+                     BorderThickness="1"
+                     CornerRadius="0"
+                     Watermark="Search..."
+                     Text="{Binding SearchFilter, Mode=TwoWay}"
+                     BorderBrush="{DynamicResource Brush.Border2}"
+                     VerticalContentAlignment="Center">
+                <TextBox.InnerLeftContent>
+                    <Path
+                        Fill="{DynamicResource Brush.FG2}"
+                        Width="14" Height="14"
+                        Margin="6,1,0,0"
+                        Data="{StaticResource Icons.MagnifyingGlassFill}" />
+                </TextBox.InnerLeftContent>
+            </TextBox>
+
+            <ListBox Grid.Row="2"
+                     x:Name="SpritePageListBox"
+                     SelectionChanged="SpritePageListBox_OnSelectionChanged"
+                     ContextRequested="SpritePageListBox_OnContextRequested"
+                     Background="{DynamicResource Brush.ListBox.Background}"
+                     SelectedItem="{Binding SelectedItem}"
+                     ItemsSource="{Binding FilteredItems}" Height="400" BorderBrush="{DynamicResource Brush.Border2}"
+                     BorderThickness="1">
+                <ListBox.Styles>
+                    <Style Selector="ListBoxItem">
+                        <Setter Property="Background" Value="{DynamicResource Brush.ListBox.Background}" />
+                    </Style>
+                </ListBox.Styles>
+                <ListBox.ItemContainerTheme>
+                    <StaticResource ResourceKey="CompactListBoxItem"/>
+                </ListBox.ItemContainerTheme>
+                <ListBox.ItemTemplate>
+                    <DataTemplate>
+                        <TextBlock Text="{Binding}" Padding="4" />
+                    </DataTemplate>
+                </ListBox.ItemTemplate>
+            </ListBox>
+            
+            <StackPanel Grid.Row="4" Orientation="Horizontal">
+                <Button Classes="flat" Width="100"
+                        Command="{Binding btnImport_Click}">
+                    <v:IconText Text="Import" Icon="Icons.DownloadFill" IconSize="12" />
+                </Button>
+                <Button Classes="flat" Width="100" Margin="24,0,0,0"
+                        Command="{Binding btnReImport_Click}"
+                        IsEnabled="{Binding CachedPath, Converter={x:Static StringConverters.IsNotNullOrEmpty}}">
+                    <v:IconText Text="Re-Import" Icon="Icons.RepeatFill" IconSize="12" />
+                </Button>
+                <Button Classes="flat" Width="100" Margin="24,0,0,0"
+                        Command="{Binding btnExport_Click}"
+                        IsEnabled="{Binding SelectedItem, Converter={x:Static StringConverters.IsNotNullOrEmpty}}">
+                    <v:IconText Text="Export" Icon="Icons.ExportFill" IconSize="12" />
+                </Button>
+                <Button Classes="flat" Width="100" Margin="24,0,0,0"
+                        Command="{Binding btnDelete_Click}"
+                        IsEnabled="{Binding SelectedItem, Converter={x:Static StringConverters.IsNotNullOrEmpty}}">
+                    <v:IconText Text="Delete" Icon="Icons.TrashFill" IconSize="12" />
+                </Button>
+            </StackPanel>
+            <!--          -->
+            <!-- <StackPanel Grid.Row="3" Orientation="Horizontal"> -->
+            <!--     <Button Classes="flat" Width="100" -->
+            <!--             Command="{Binding btnImport_Click}" -->
+            <!--             IsEnabled="{Binding ChosenMonster, Converter={x:Static ObjectConverters.IsNotNull}}"> -->
+            <!--         <v:IconText Text="Import" Icon="Icons.DownloadFill" IconSize="12" /> -->
+            <!--     </Button> -->
+            <!--     <Button Classes="flat" Width="100" Margin="24,0,0,0" -->
+            <!--             Command="{Binding btnReImport_Click}" -->
+            <!--             IsEnabled="{Binding CachedPath, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"> -->
+            <!--         <v:IconText Text="Re-Import" Icon="Icons.RepeatFill" IconSize="12" /> -->
+            <!--     </Button> -->
+            <!--     <Button Classes="flat" Width="100" Margin="24,0,0,0" -->
+            <!--             Command="{Binding btnExport_Click}" -->
+            <!--             IsEnabled="{Binding ChosenMonster, Converter={x:Static ObjectConverters.IsNotNull}}"> -->
+            <!--         <v:IconText Text="Export" Icon="Icons.ExportFill" IconSize="12" /> -->
+            <!--     </Button> -->
+            <!--     <Button Classes="flat" Width="100" Margin="24,0,0,0" -->
+            <!--             Command="{Binding btnExport_Click}" -->
+            <!--             IsEnabled="{Binding ChosenMonster, Converter={x:Static ObjectConverters.IsNotNull}}"> -->
+            <!--         <v:IconText Text="Delete" Icon="Icons.TrashFill" IconSize="12" /> -->
+            <!--     </Button> -->
+            <!-- </StackPanel> -->
+            
+        </Grid>
+    </Grid>
 </UserControl>
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/SpritePageView.axaml.cs b/RogueEssence.Editor.Avalonia/Views/New/Editors/SpritePageView.axaml.cs
index c00bac0d..62ec3980 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/Editors/SpritePageView.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/New/Editors/SpritePageView.axaml.cs
@@ -1,6 +1,12 @@
+using System;
 using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Input;
+using Avalonia.Interactivity;
 using Avalonia.Markup.Xaml;
+using RogueEssence.Content;
+using RogueEssence.Dev.ViewModels;
+using RogueEssence.Dungeon;
 
 namespace RogueEssence.Dev.Views;
 
@@ -10,4 +16,73 @@ public SpritePageView()
     {
         InitializeComponent();
     }
+    
+    protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
+    {
+        base.OnAttachedToVisualTree(e);
+
+        if (DataContext is SpritePageViewModel vm)
+        {
+            vm.OnPageRemovedAction = () =>
+            {
+                lock (GameBase.lockObj)
+                {
+                    if (DungeonScene.Instance != null && vm.AssetType == DungeonScene.Instance.DebugAsset)
+                    {
+                        DungeonScene.Instance.DebugAsset = GraphicsManager.AssetType.None;
+                        DungeonScene.Instance.DebugAnim = null;
+                    }
+                }
+            };
+        }
+    }
+    
+
+    private void SpritePageListBox_OnContextRequested(object sender, ContextRequestedEventArgs e)
+    {
+        // if (e.Source is not Visual)
+        //     return;
+        //
+        // if (sender is not ListBox listBox || listBox.SelectedItem is not DataListEntry entry ||
+        //     listBox.DataContext is not DataListPageViewModel vm)
+        //     return;
+        //
+        // var contextMenu = ContextMenuHelper.CreateDataItemMenu(vm.Node, entry.Key);
+        // contextMenu.Open(this);
+        //
+    }
+    
+    private void SpritePageListBox_OnSelectionChanged(object sender, SelectionChangedEventArgs e)
+    {
+        if (sender is not ListBox list)
+            return;
+
+        if (list.SelectedItem is not string entry || DataContext is not SpritePageViewModel vm)
+        {
+            lock (GameBase.lockObj)
+            {
+                if (DungeonScene.Instance != null)
+                {
+                    DungeonScene.Instance.DebugAsset = GraphicsManager.AssetType.None;
+                    DungeonScene.Instance.DebugAnim = null;
+                }
+            }
+            return;
+        }
+
+        if (DungeonScene.Instance == null)
+            return;
+
+        GraphicsManager.AssetType debugAsset = vm.AssetType;
+        string? debugAnim = null;
+
+        if (debugAsset.IsAnimEdit())
+            debugAnim = entry;
+
+        lock (GameBase.lockObj)
+        {
+            DungeonScene.Instance.DebugAsset = debugAsset;
+            DungeonScene.Instance.DebugAnim = debugAnim;
+        }
+    }
 }
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/ZoneEditorPageView.axaml b/RogueEssence.Editor.Avalonia/Views/New/Editors/ZoneEditorPageView.axaml
index 6f552277..2c75fd7e 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/Editors/ZoneEditorPageView.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/New/Editors/ZoneEditorPageView.axaml
@@ -8,7 +8,7 @@
              x:DataType="vm:ZoneEditorPageViewModel"
              x:Class="RogueEssence.Dev.Views.ZoneEditorPageView">
     <ScrollViewer>
-        <TextBlock>Hi there, this is just a temporary page! :D</TextBlock>
+        <TextBlock>Hi there, this is just a temporary page! The end is never the end is never the end is never the end.</TextBlock>
         <!-- <StackPanel Spacing="8" Margin="16"> -->
         <!--     <TextBlock Text="Zone Edit" FontSize="24" FontWeight="Bold"/> -->
         <!--     <DataGrid x:Name="ZoneDataGrid" -->
diff --git a/RogueEssence.Editor.Avalonia/Views/SearchListBox.axaml b/RogueEssence.Editor.Avalonia/Views/SearchListBox.axaml
index fb9d2e37..8be2ec78 100644
--- a/RogueEssence.Editor.Avalonia/Views/SearchListBox.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/SearchListBox.axaml
@@ -11,12 +11,14 @@
   </Design.DataContext>
   <Grid Margin="4" >
     <Grid.RowDefinitions>
+      <RowDefinition Height="Auto"/>
       <RowDefinition Height="14"/>
-      <RowDefinition Height="40"/>
-      <RowDefinition Height="*"/>
     </Grid.RowDefinitions>
+    <TextBlock Grid.Row="0" HorizontalAlignment="Center" Classes="table_header" FontSize="16" Text="{Binding DataName}" />
     <TextBlock VerticalAlignment="Bottom" Text="{Binding DataName}" Grid.Row="0" Grid.Column="0"></TextBlock>
-    <TextBox Name="txtSearch" TextWrapping="Wrap" VerticalAlignment="Center" Text="{Binding SearchText}" Margin="0,2" Grid.Row="1" Grid.Column="0"/>
+    <TextBox Name="txtSearch" TextWrapping="Wrap" VerticalAlignment="Center" Text="{Binding SearchText, Mode=TwoWay}" Margin="0,2" Grid.Row="1" Grid.Column="0"/>
     <ListBox Name="lbxItems" SelectionMode="AlwaysSelected" ItemsSource="{Binding SearchItems}" SelectedIndex="{Binding SelectedSearchIndex}" DoubleTapped="doubleClickStart" PointerReleased="lbxItems_DoubleClick" Grid.Row="2" Grid.Column="0"/>
+    
+    
   </Grid>
 </UserControl>

From bf0373b76dee6d248d30f62aadeb903d9eafc48b Mon Sep 17 00:00:00 2001
From: Kace <41309226+DoubleTrio@users.noreply.github.com>
Date: Thu, 14 May 2026 16:16:53 -0400
Subject: [PATCH 28/51] mod status page start

---
 RogueEssence.Editor.Avalonia/App.axaml.cs         |  4 ++--
 .../ViewModels/New/DevFormViewModel.cs            | 15 ++-------------
 ...EditorViewModel.cs => ModEditPageViewModel.cs} |  4 ++--
 ...InfoEditorView.axaml => ModEditPageView.axaml} |  8 +++++---
 ...itorView.axaml.cs => ModEditPageView.axaml.cs} |  4 ++--
 5 files changed, 13 insertions(+), 22 deletions(-)
 rename RogueEssence.Editor.Avalonia/ViewModels/New/Editors/{ModInfoEditorViewModel.cs => ModEditPageViewModel.cs} (73%)
 rename RogueEssence.Editor.Avalonia/Views/New/Editors/{ModInfoEditorView.axaml => ModEditPageView.axaml} (73%)
 rename RogueEssence.Editor.Avalonia/Views/New/Editors/{ModInfoEditorView.axaml.cs => ModEditPageView.axaml.cs} (64%)

diff --git a/RogueEssence.Editor.Avalonia/App.axaml.cs b/RogueEssence.Editor.Avalonia/App.axaml.cs
index 47c7a41a..df61615a 100644
--- a/RogueEssence.Editor.Avalonia/App.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/App.axaml.cs
@@ -65,7 +65,7 @@ public static void AddCommonServices(this IServiceCollection collection)
             collection.AddTransient<GroundEditorPageViewModel>();
             collection.AddTransient<RandomInfoPageViewModel>();
             collection.AddTransient<SpritePageViewModel>();
-            collection.AddTransient<ModInfoEditorViewModel>();
+            collection.AddTransient<ModEditPageViewModel>();
             collection.AddTransient<DevEditPageViewModel>();
             collection.AddTransient<SpeciesEditPageViewModel>();
             collection.AddTransient<DataListPageViewModel>();
@@ -110,7 +110,7 @@ public static void RegisterPages(this IServiceProvider provider)
             pageFactory.Register<GroundEditorPageViewModel>();
             pageFactory.Register<RandomInfoPageViewModel>();
             pageFactory.Register<SpritePageViewModel>();
-            pageFactory.Register<ModInfoEditorViewModel>();
+            pageFactory.Register<ModEditPageViewModel>();
             pageFactory.Register<DevEditPageViewModel>();
             pageFactory.Register<SpeciesEditPageViewModel>();
             pageFactory.Register<DataListPageViewModel>();
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs
index 5909e63d..beb8d98b 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs
@@ -527,7 +527,7 @@ public void LoadDevTree()
         //
         CreateSpriteNode(root);
 
-        // CreateModNode(root);
+        CreateModNode(root);
         Nodes.Add(root);
 
         AttachEventsRecursive(root);
@@ -943,19 +943,8 @@ private void HandleSprites()
 
     private void CreateModNode(NodeBase parent)
     {
-        var modsViewModel = _context.PageFactory.GetRequiredService<DevTabModsViewModel>();
-        var modRoot = _context.NodeFactory.CreateModRootNode<DevEditPageViewModel>("Mods", "Icons.ScrollFill");
+        var modRoot = _context.NodeFactory.CreateOpenEditorNode<ModEditPageViewModel>("Mods", "Icons.ScrollFill");
 
-        foreach (ModsNodeViewModel mod in modsViewModel.Mods)
-        {
-            var name = mod.Namespace == "origin" ? "Origins" : mod.Name;
-            var itemNode = _context.NodeFactory.CreateDataItemNode<DevEditPageViewModel>(
-                mod.Namespace,
-                $"{mod.Namespace}: {name}",
-                "Icons.ScrollFill");
-
-            modRoot.SubNodes.Add(itemNode);
-        }
 
         parent.SubNodes.Add(modRoot);
     }
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ModInfoEditorViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ModEditPageViewModel.cs
similarity index 73%
rename from RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ModInfoEditorViewModel.cs
rename to RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ModEditPageViewModel.cs
index cb0e565c..e6d1b2f5 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ModInfoEditorViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ModEditPageViewModel.cs
@@ -4,7 +4,7 @@ namespace RogueEssence.Dev.ViewModels;
 
 using Dev.Services;
 
-public class ModInfoEditorViewModel : EditorPageViewModel
+public class ModEditPageViewModel : EditorPageViewModel
 {
     // public override string? Title => "Mod Info";
     
@@ -12,7 +12,7 @@ public class ModInfoEditorViewModel : EditorPageViewModel
 
     public TestComboBoxViewModel Fruits { get; }
     
-    public ModInfoEditorViewModel(EditorContext context, NodeBase node, Action<EditorPageViewModel> onPageOpen = null) : base(context, node, onPageOpen) 
+    public ModEditPageViewModel(EditorContext context, NodeBase node, Action<EditorPageViewModel> onPageOpen = null) : base(context, node, onPageOpen) 
     {
        
         Fruits = new TestComboBoxViewModel();
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/ModInfoEditorView.axaml b/RogueEssence.Editor.Avalonia/Views/New/Editors/ModEditPageView.axaml
similarity index 73%
rename from RogueEssence.Editor.Avalonia/Views/New/Editors/ModInfoEditorView.axaml
rename to RogueEssence.Editor.Avalonia/Views/New/Editors/ModEditPageView.axaml
index 649dc078..999e82fe 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/Editors/ModInfoEditorView.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/New/Editors/ModEditPageView.axaml
@@ -4,7 +4,9 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:vm="using:RogueEssence.Dev.ViewModels"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:DataType="vm:ModInfoEditorViewModel"
-             x:Class="RogueEssence.Dev.Views.ModInfoEditorView">
-    Welcome to Avalonia!
+             x:DataType="vm:ModEditPageViewModel"
+             x:Class="RogueEssence.Dev.Views.ModEditPageView">
+    Welcome to Mod Editor
+    
+    
 </UserControl>
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/ModInfoEditorView.axaml.cs b/RogueEssence.Editor.Avalonia/Views/New/Editors/ModEditPageView.axaml.cs
similarity index 64%
rename from RogueEssence.Editor.Avalonia/Views/New/Editors/ModInfoEditorView.axaml.cs
rename to RogueEssence.Editor.Avalonia/Views/New/Editors/ModEditPageView.axaml.cs
index 59bdd546..9bc51679 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/Editors/ModInfoEditorView.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/New/Editors/ModEditPageView.axaml.cs
@@ -4,9 +4,9 @@
 
 namespace RogueEssence.Dev.Views;
 
-public partial class ModInfoEditorView : UserControl
+public partial class ModEditPageView : UserControl
 {
-    public ModInfoEditorView()
+    public ModEditPageView()
     {
         InitializeComponent();
     }

From 9c8f11c3d3469d1e7da59a9e7b9e7e141a429ce6 Mon Sep 17 00:00:00 2001
From: Kace <41309226+DoubleTrio@users.noreply.github.com>
Date: Thu, 14 May 2026 16:48:21 -0400
Subject: [PATCH 29/51] remove different node types

---
 .../Assets/Styles.axaml                       |  23 +
 .../EditorContext/NodeFactory.cs              |  27 +-
 .../ViewModels/New/DevFormViewModel.cs        |  38 +-
 .../New/Editors/ReflectedDataPageViewModel.cs |   1 -
 .../ViewModels/New/Nodes/NodeBase.cs          | 567 +++---------------
 .../Views/New/DevForm.axaml                   |  26 +-
 .../Views/New/Editors/DataListPageView.axaml  |  21 +-
 .../New/Editors/SpeciesEditPageView.axaml     |  23 +-
 .../Views/New/Editors/SpritePageView.axaml    |  47 +-
 .../Views/New/TabSwitcherView.axaml           |  19 +-
 10 files changed, 145 insertions(+), 647 deletions(-)

diff --git a/RogueEssence.Editor.Avalonia/Assets/Styles.axaml b/RogueEssence.Editor.Avalonia/Assets/Styles.axaml
index 184dffc4..fc77f610 100644
--- a/RogueEssence.Editor.Avalonia/Assets/Styles.axaml
+++ b/RogueEssence.Editor.Avalonia/Assets/Styles.axaml
@@ -778,6 +778,29 @@
     <!--     <Setter Property="Background" Value="{DynamicResource Brush.TabHeader.BackgroundHovered}"/> -->
     <!-- </Style> -->
 
+    <Style Selector="TextBox.search">
+        <Setter Property="Height" Value="24"/>
+        <Setter Property="HorizontalAlignment" Value="Stretch"/>
+        <Setter Property="Margin" Value="0"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="CornerRadius" Value="0"/>
+        <Setter Property="Watermark" Value="Search..."/>
+        <Setter Property="BorderBrush" Value="{DynamicResource Brush.Border2}"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="InnerLeftContent">
+            <Setter.Value>
+                <Template>
+                    <Path
+                        Fill="{DynamicResource Brush.FG2}"
+                        Width="14" Height="14"
+                        Margin="6,1,0,0"
+                        Data="{StaticResource Icons.MagnifyingGlassFill}" />
+                </Template>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    
+    
     <Style Selector="NumericUpDown">
         <Style Selector="^ /template/ ButtonSpinner#PART_Spinner">
             <Setter Property="MinHeight" Value="0" />
diff --git a/RogueEssence.Editor.Avalonia/EditorContext/NodeFactory.cs b/RogueEssence.Editor.Avalonia/EditorContext/NodeFactory.cs
index e64a29b6..7c99fd88 100644
--- a/RogueEssence.Editor.Avalonia/EditorContext/NodeFactory.cs
+++ b/RogueEssence.Editor.Avalonia/EditorContext/NodeFactory.cs
@@ -65,12 +65,12 @@ public DataRootNode CreateDataRootNode<TEditor>(
         where TEditor : EditorPageViewModel
         => Create<DataRootNode>(dataType, typeof(TEditor), title, icon, CreateCallback(onOpen));
 
-    public ModRootNode CreateModRootNode<TEditor>(
-        string title,
-        string? icon = null,
-        Action<TEditor>? onOpen = null)
-        where TEditor : EditorPageViewModel
-        => Create<ModRootNode>(typeof(TEditor), title, icon, CreateCallback(onOpen));
+    // public ModRootNode CreateModRootNode<TEditor>(
+    //     string title,
+    //     string? icon = null,
+    //     Action<TEditor>? onOpen = null)
+    //     where TEditor : EditorPageViewModel
+    //     => Create<ModRootNode>(typeof(TEditor), title, icon, CreateCallback(onOpen));
 
     public DataItemNode CreateDataItemNode<TEditor>(
         string key,
@@ -80,8 +80,9 @@ public DataItemNode CreateDataItemNode<TEditor>(
         where TEditor : EditorPageViewModel
         => Create<DataItemNode>(key, typeof(TEditor), title, icon, CreateCallback(onOpen));
 
+    // _serviceProvider.GetService<IDialogService>()
     public PageNode CreatePageNode(EditorPageViewModel childPage, PageNode? parentNode = null)
-        => new PageNode(_serviceProvider.GetService<IDialogService>(), this, childPage, parentNode);
+        => new PageNode(this, childPage, parentNode);
 
     public SpriteRootNode CreateSpriteRootNode<TEditor>(
         GraphicsManager.AssetType assetType,
@@ -91,12 +92,12 @@ public SpriteRootNode CreateSpriteRootNode<TEditor>(
         where TEditor : EditorPageViewModel
         => Create<SpriteRootNode>(assetType, typeof(TEditor), title, icon, CreateCallback(onOpen));
 
-    public SpriteTileRootNode CreateSpriteTileRootNode<TEditor>(
-        string title,
-        string? icon = null,
-        Action<TEditor>? onOpen = null)
-        where TEditor : EditorPageViewModel
-        => Create<SpriteTileRootNode>(typeof(TEditor), title, icon, CreateCallback(onOpen));
+    // public SpriteTileRootNode CreateSpriteTileRootNode<TEditor>(
+    //     string title,
+    //     string? icon = null,
+    //     Action<TEditor>? onOpen = null)
+    //     where TEditor : EditorPageViewModel
+    //     => Create<SpriteTileRootNode>(typeof(TEditor), title, icon, CreateCallback(onOpen));
 
     public OpenEditorNodeFX<T> CreateOpenEditorNodeFX<T, TEditor>(
         string title,
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs
index beb8d98b..33419483 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs
@@ -630,23 +630,7 @@ private void CreateConstantsNode(NodeBase parent)
         var gameplayTextNode = _context.NodeFactory.CreateOpenEditorNodeWithParams<StringEditPageViewModel>("Gameplay Text", [true], "Icons.TableFill");
         stringsNode.SubNodes.Add(menuTextNode);
         stringsNode.SubNodes.Add(gameplayTextNode);
-        // var universalEventsNode = _context.NodeFactory.CreateOpenEditorNode<ReflectedDataPageViewModel>("Universal Events", "Icons.ListFill");
-
-        //             public void btnEditStartParams_Click()
-        //     {
-        //         OpenItem<StartParams>("Start Params", DataManager.Instance.Start, (obj) => {
-        //             DataManager.Instance.Start = obj;
-        //             DataManager.Instance.SaveStartParams();
-        //         });
-        //     }
-        //
-        //     public void btnEditUniversal_Click()
-        //     {
-        //         OpenItem<UniversalBaseEffect>("Universal Event", (UniversalBaseEffect)DataManager.Instance.UniversalEvent, (obj) => {
-        //             DataManager.Instance.UniversalEvent = obj;
-        //             DataManager.SaveData(obj, DataManager.DATA_PATH, "Universal", DataManager.DATA_EXT);
-        //         });
-        //     }
+   
         //     public async void mnuUniversalFile_Click()
         //     {
         //         DevForm parent = (DevForm)DiagManager.Instance.DevEditor;
@@ -678,25 +662,7 @@ private void CreateConstantsNode(NodeBase parent)
         //             await MessageBox.Show(parent, "Universal is now saved as a patch.", "Complete", MessageBox.MessageBoxButtons.Ok);
         //     }
         //
-        //     public void btnEditStrings_Click()
-        //     {
-        //         StringsEditViewModel mv = new StringsEditViewModel();
-        //         Views.StringsEditForm editForm = new Views.StringsEditForm();
-        //         mv.LoadStringEntries(false, editForm);
-        //         editForm.DataContext = mv;
-        //         editForm.Show();
-        //     }
-        //
-        //     public void btnEditStringsEx_Click()
-        //     {
-        //         StringsEditViewModel mv = new StringsEditViewModel();
-        //         Views.StringsEditForm editForm = new Views.StringsEditForm();
-        //         mv.LoadStringEntries(true, editForm);
-        //         editForm.DataContext = mv;
-        //         editForm.Show();
-        //     }
-        //
-        //
+ 
 
         constantsNode.SubNodes.Add(startParamsNode);
         
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ReflectedDataPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ReflectedDataPageViewModel.cs
index 45e69b8f..c3516a3d 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ReflectedDataPageViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ReflectedDataPageViewModel.cs
@@ -12,7 +12,6 @@ namespace RogueEssence.Dev.ViewModels;
 
 public class ReflectedDataPageViewModel : EditorPageViewModel<NodeBase>
 {
-    
     public Action<StackPanel> OnLoadAction;
     public Func<StackPanel, Task<bool>> OnOKAction;
     
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/NodeBase.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/NodeBase.cs
index 15e8b839..3bc20542 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/NodeBase.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/NodeBase.cs
@@ -266,25 +266,25 @@ public async Task OnClickAsync()
     }
 }
 
-public abstract class ItemRootNode : OpenEditorNode
-{
-    
-    public ReactiveCommand<NodeBase, Unit> DeleteCommand { get; }
-
-// In constructor:
-
-    public abstract Task AddItem();
-    public abstract Task DeleteItem(string key);
-
-    protected ItemRootNode(string title, Type? editorKey, string icon = null, Action<EditorPageViewModel>? onPageLoad = null)
-        : base(title, editorKey, icon, onPageLoad)
-    {
-        DeleteCommand = ReactiveCommand.Create<NodeBase>(RemoveNode);
-        
-    }
-}
+// public abstract class ItemRootNode : OpenEditorNode
+// {
+//     
+//     public ReactiveCommand<NodeBase, Unit> DeleteCommand { get; }
+//
+// // In constructor:
+//
+//     public abstract Task AddItem();
+//     public abstract Task DeleteItem(string key);
+//
+//     protected ItemRootNode(string title, Type? editorKey, string icon = null, Action<EditorPageViewModel>? onPageLoad = null)
+//         : base(title, editorKey, icon, onPageLoad)
+//     {
+//         DeleteCommand = ReactiveCommand.Create<NodeBase>(RemoveNode);
+//         
+//     }
+// }
 
-public class DataRootNode : ItemRootNode
+public class DataRootNode : OpenEditorNode
 {
     public DataManager.DataType DataType { get; }
 
@@ -312,94 +312,6 @@ protected override int GetHashCodeCore()
         return EditorType.GetHashCode() ^ DataType.GetHashCode();
     }
 
-    public override async Task AddItem()
-    {
-        var vm = new RenameWindowViewModel();
-        bool result = await _dialogService.ShowDialogAsync<RenameWindowViewModel, bool>(vm, $"Add new {DataType}");
-
-        if (!result)
-            return;
-
-        SubNodes.Add(_nodeFactory.CreateDataItemNode<DevEditPageViewModel>(vm.Name, $"{vm.Name}:", "Icons.GhostFill"));
-        IsExpanded = true;
-        Console.WriteLine($"Added {DataType} item: {vm.Name}");
-    }
-
-    public override async Task DeleteItem(string key)
-    {
-        // if (node is null)
-        //     return;
-
-        // var res = await MessageBoxWindowView.Show(_dialogService,
-        //     $"Deleting {key} will reset it back to the base game.", $"Delete {key}", MessageBoxWindowView.MessageBoxButtons.YesNo, true);
-
-        // if (res != MessageBoxWindowView.MessageBoxResult.Yes)
-        //     return;
-
-        // SubNodes.Remove(node);
-        // Console.WriteLine($"Deleted {key} of type {DataType}");
-        
-        var modStatus = DataManager.GetEntryDataModStatus(key, DataType.ToString());
-
-        if (PathMod.Quest.IsValid() && modStatus == DataManager.ModStatus.Base)
-        {
-            await MessageBoxWindowView.Show(_dialogService,
-                string.Format("The {0} {1} is not a part of the currently edited mod and cannot be deleted.", DataType.ToString(), key),
-                "Delete " + DataType.ToString(), MessageBoxWindowView.MessageBoxButtons.Ok);
-            return;
-        }
-
-        MessageBoxWindowView.MessageBoxResult result;
-        if (modStatus == DataManager.ModStatus.Base || modStatus == DataManager.ModStatus.Added)
-            result = await MessageBoxWindowView.Show(_dialogService,
-                string.Format("Are you sure you want to delete the following {0}:\n{1}", DataType.ToString(), key),
-                "Delete " + DataType.ToString(), MessageBoxWindowView.MessageBoxButtons.YesNo);
-        else
-            result = await MessageBoxWindowView.Show(_dialogService,
-                string.Format("The following {0} will be reset back to the base game:\n{1}", DataType.ToString(), key),
-                "Delete " + DataType.ToString(), MessageBoxWindowView.MessageBoxButtons.YesNo);
-
-        if (result == MessageBoxWindowView.MessageBoxResult.No)
-            return;
-
-        lock (GameBase.lockObj)
-        {
-            DataManager.Instance.ContentChanged(DataType, key, null);
-            // choices.DeleteEntry(key);
-        
-            if (DataManager.Instance.DataIndices[DataType].ContainsKey(key))
-            {
-                string newName = DataManager.Instance.DataIndices[DataType].Get(key).GetLocalString(true);
-                // choices.AddEntry(key, newName);
-            }
-
-            if (DataType == DataManager.DataType.Zone)
-            {
-                string str = LuaEngine.MakeZoneScriptPath(key, "");
-                if (Directory.Exists(str))
-                    Directory.Delete(str, true);
-            }
-        }
-    }
-
-    public async Task ReIndex()
-    {
-        Console.WriteLine($"Reindexing {DataType}...");
-        await Task.Delay(100);
-    }
-
-    public async Task ResaveAllAsFile()
-    {
-        Console.WriteLine($"Resaving all {DataType} as file...");
-        await Task.Delay(100);
-    }
-
-    public async Task ResaveAllAsDiff()
-    {
-        Console.WriteLine($"Resaving all {DataType} as diff...");
-        await Task.Delay(100);
-    }
-
     public async Task ResaveItemAsFile(string key)
     {
         if (DataManager.GetEntryDataModStatus(key, DataType.ToString()) == DataManager.ModStatus.Base)
@@ -407,7 +319,7 @@ public async Task ResaveItemAsFile(string key)
             await MessageBoxWindowView.Show(_dialogService, string.Format("{0} must have saved edits first!", key), "Error", MessageBoxWindowView.MessageBoxButtons.Ok);
             return;
         }
-
+    
         lock (GameBase.lockObj)
         {
             var entry = DataRegistry.Map[DataType];
@@ -415,10 +327,10 @@ public async Task ResaveItemAsFile(string key)
             DataManager.Instance.ContentResaved(DataType, key, data, false);
             string newName = DataManager.Instance.DataIndices[DataType].Get(key).GetLocalString(true);
         }
-
+    
         await MessageBoxWindowView.Show(_dialogService, string.Format("{0} is now saved as a file.", key), "Complete", MessageBoxWindowView.MessageBoxButtons.Ok);
     }
-
+    
     public async Task ResaveItemAsPatch(string key)
     {
         var modStatus = DataManager.GetEntryDataModStatus(key, DataType.ToString());
@@ -434,14 +346,14 @@ public async Task ResaveItemAsPatch(string key)
             await MessageBoxWindowView.Show(_dialogService, string.Format("{0} is newly added in this mod and cannot be saved as patch.", key), "Error", MessageBoxWindowView.MessageBoxButtons.Ok);
             return;
         }
-
+    
         lock (GameBase.lockObj)
         {
             var entry = DataRegistry.Map[DataType];
             IEntryData data = entry.GetEntry(key);
             DataManager.Instance.ContentResaved(DataType, key, data, true);
         }
-
+    
         if (DataManager.GetEntryDataModStatus(key, DataType.ToString()) == DataManager.ModStatus.Base)
             await MessageBoxWindowView.Show(_dialogService, string.Format("Modded {0} was identical to base. Unneeded patch removed.", key), "Complete", MessageBoxWindowView.MessageBoxButtons.Ok);
         else
@@ -451,235 +363,11 @@ public async Task ResaveItemAsPatch(string key)
     
 }
 
-
-// For Skills, Zones, Monsters, Items, etc.
-// public class DataRootNode : ItemRootNode
-// {
-//     public DataManager.DataType DataType { get; }
-//
-//     private readonly NodeFactory _nodeFactory;
-//
-//     private readonly IDialogService _dialogService;
-//     
-//     public override ReactiveCommand<Unit, Unit> AddCommand { get; }
-//     public override ReactiveCommand<DataItemNode, Unit> DeleteCommand { get; }
-//
-//     public ReactiveCommand<Unit, Unit> ReIndexCommand { get; }
-//     public ReactiveCommand<Unit, Unit> ResaveAllAsFileCommand { get; }
-//     public ReactiveCommand<Unit, Unit> ResaveAllAsDiffCommand { get; }
-//
-//     public ReactiveCommand<string, Unit> ResaveAsFile { get; }
-//     public ReactiveCommand<string, Unit> ResaveAsPatch { get; }
-//
-//     public DataRootNode(NodeFactory nodeFactory, IDialogService dialogService, DataManager.DataType dataType,
-//         Type? editorType, string title, string? icon = null)
-//         : base(title, editorType, icon ?? "")
-//     {
-//         _nodeFactory = nodeFactory;
-//         _dialogService = dialogService;
-//         DataType = dataType;
-//
-//         AddCommand = ReactiveCommand.CreateFromTask(AddItemAsync);
-//         AddCommand.CanExecute.Subscribe(canExecute =>
-//             Console.WriteLine($"Add Command - CanExecute: {canExecute}"));
-//
-//         DeleteCommand = ReactiveCommand.CreateFromTask<DataItemNode>(DeleteItemAsync);
-//
-//         ReIndexCommand = ReactiveCommand.CreateFromTask(ReIndexAsync);
-//         ResaveAllAsFileCommand = ReactiveCommand.CreateFromTask(ResaveAllAsFileAsync);
-//         ResaveAllAsDiffCommand = ReactiveCommand.CreateFromTask(ResaveAllAsDiffAsync);
-//
-//
-//         ResaveAsFile = ReactiveCommand.CreateFromTask<string>(
-//             execute: async (key) => await ResaveItemAsFileAsync(key),
-//             canExecute: Observable.Return(true)
-//         );
-//         ResaveAsFile.ThrownExceptions.Subscribe(ex => Console.WriteLine(ex.Message));
-//         ResaveAsFile.IsExecuting.Subscribe(x => Console.WriteLine($"IsExecuting: {x}"));
-//         ResaveAsPatch = ReactiveCommand.CreateFromTask<string>(ResaveItemAsPatchAsync);
-//     }
-//
-//     protected override bool EqualsCore(NodeBase other)
-//     {
-//         if (other is not DataRootNode node)
-//             return false;
-//         return DataType == node.DataType && EditorType == node.EditorType;
-//     }
-//     protected override int GetHashCodeCore()
-//     {
-//         return EditorType.GetHashCode() ^ DataType.GetHashCode();;
-//     }
-//     
-//     private async Task AddItemAsync()
-//     {
-//         var vm = new RenameWindowViewModel();
-//         bool result = await _dialogService.ShowDialogAsync<RenameWindowViewModel, bool>(vm, $"Add new {DataType}");
-//
-//         if (!result)
-//             return;
-//
-//         SubNodes.Add(_nodeFactory.CreateDataItemNode<DevEditPageViewModel>(vm.Name, $"{vm.Name}:", "Icons.GhostFill"));
-//         IsExpanded = true;
-//         Console.WriteLine($"Added {DataType} item: {vm.Name}");
-//     }
-//
-//     private async Task DeleteItemAsync(DataItemNode? node)
-//     {
-//         if (node is null)
-//             return;
-//
-//         var res = await MessageBoxWindowView.Show(_dialogService,
-//             $"Deleting {node.ItemKey} will reset it back to the base game.", $"Delete {node.ItemKey}", MessageBoxWindowView.MessageBoxButtons.YesNo, true);
-//
-//         if (res != MessageBoxWindowView.MessageBoxResult.Yes)
-//             return;
-//
-//         SubNodes.Remove(node);
-//         Console.WriteLine($"Deleted {node.Title} of type {DataType}");
-//     }
-//
-//     private async Task ReIndexAsync()
-//     {
-//         Console.WriteLine($"Reindexing {DataType}...");
-//         await Task.Delay(100);
-//     }
-//
-//     private async Task ResaveAllAsFileAsync()
-//     {
-//         Console.WriteLine($"Resaving all {DataType} as file...");
-//         await Task.Delay(100);
-//     }
-//
-//     private async Task ResaveAllAsDiffAsync()
-//     {
-//         Console.WriteLine($"Resaving all {DataType} as diff...");
-//         await Task.Delay(100);
-//     }
-//     
-//     public async Task ResaveItemAsFileAsync(string key)
-//     {
-//         await Task.Run(async () =>
-//         {
-//             if (DataManager.GetEntryDataModStatus(key, DataType.ToString()) == DataManager.ModStatus.Base)
-//             {
-//                 await Dispatcher.UIThread.InvokeAsync(() =>
-//                     MessageBoxWindowView.Show(_dialogService,
-//                         string.Format("{0} must have saved edits first!", key), "Error", MessageBoxWindowView.MessageBoxButtons.Ok));
-//                 return;
-//             }
-//
-//             lock (GameBase.lockObj)
-//             {
-//                 var entry = DataRegistry.Map[DataType];
-//                 IEntryData data = entry.GetEntry(key);
-//                 DataManager.Instance.ContentResaved(DataType, key, data, false);
-//                 string newName = DataManager.Instance.DataIndices[DataType].Get(key).GetLocalString(true);
-//             }
-//
-//             await Dispatcher.UIThread.InvokeAsync(() =>
-//                 MessageBoxWindowView.Show(_dialogService,
-//                     string.Format("{0} is now saved as a file.", key), "Complete", MessageBoxWindowView.MessageBoxButtons.Ok));
-//         });
-//     }
-    // private async Task ResaveItemAsFileAsync(string key)
-    // {
-    //     Console.WriteLine("3");
-    //     
-    //     await Task.Yield(); // force off the calling context
-    //
-    //     Console.WriteLine("4");
-    //     await Task.Delay(1000).ConfigureAwait(false);
-    //     Console.WriteLine("5");
-        // if (DataManager.GetEntryDataModStatus(key, DataType.ToString()) == DataManager.ModStatus.Base)
-        // {
-        //     await MessageBoxWindowView.Show(_dialogService,
-        //         string.Format("{0} must have saved edits first!", key), "Error", MessageBoxWindowView.MessageBoxButtons.Ok);
-        // }
-        // else
-        // {
-        //     await Task.Run(() =>
-        //     {
-        //         lock (GameBase.lockObj)
-        //         {
-        //             var entry = DataRegistry.Map[DataType];
-        //             IEntryData data = entry.GetEntry(key);
-        //             DataManager.Instance.ContentResaved(DataType, key, data, false);
-        //             string newName = DataManager.Instance.DataIndices[DataType].Get(key).GetLocalString(true);
-        //         }
-        //     });
-        //
-        //     await MessageBoxWindowView.Show(_dialogService,
-        //         string.Format("{0} is now saved as a file.", key), "Complete", MessageBoxWindowView.MessageBoxButtons.Ok);
-        // }
-    // }
-
-
-    // private async Task ResaveItemAsFileAsync(string key)
-    // {
-    //     if (DataManager.GetEntryDataModStatus(key, DataType.ToString()) == DataManager.ModStatus.Base)
-    //     {
-    //         
-    //         
-    //        await MessageBoxWindowView.Show(_dialogService,
-    //             String.Format("{0} must have saved edits first!", key), "Errir", MessageBoxWindowView.MessageBoxButtons.Ok);
-    //        
-    //        return;
-    //     }
-    //     
-    //     // Do the locked work synchronously, outside of any await
-    //     await Task.Run(() =>
-    //     {
-    //         lock (GameBase.lockObj)
-    //         {
-    //             var entry = DataRegistry.Map[DataType];
-    //             IEntryData data = entry.GetEntry(key);
-    //             DataManager.Instance.ContentResaved(DataType, key, data, false);
-    //
-    //             string newName = DataManager.Instance.DataIndices[DataType].Get(key).GetLocalString(true);
-    //             // choices.ModifyEntry(entryNum, newName);
-    //         }
-    //     });
-    //
-    //     // lock (GameBase.lockObj)
-    //     // {
-    //     //
-    //     //     var entry = DataRegistry.Map[DataType];
-    //     //     IEntryData data = entry.GetEntry(key);
-    //     //     DataManager.Instance.ContentResaved(DataType, key, data, false);
-    //     //
-    //     //     string newName = DataManager.Instance.DataIndices[DataType].Get(key).GetLocalString(true);
-    //     //
-    //     // }
-    //
-    //                
-    //     await MessageBoxWindowView.Show(_dialogService,
-    //         String.Format("{0} is now saved as a file.", key), "Complete", MessageBoxWindowView.MessageBoxButtons.Ok);
-    // }
-
-
-// }
-
 // Children of the DataRootNode
-
 public class DataItemNode : OpenEditorNode
 {
     public string ItemKey { get; }
-
-    // private string _value = "";
-    //
-    // public string Value
-    // {
-    //     get => _value;
-    //     set => this.RaiseAndSetIfChanged(ref _value, value);
-    // }
-
-    // private bool _editorKey = false;
-    // public bool EditorKey
-    // {
-    //     get => _editorKey;
-    //     set => this.RaiseAndSetIfChanged(ref _editorKey, value);
-    // }
-
+    
     public DataItemNode(string itemKey, Type? editorType, string? title, string? icon = null, Action<EditorPageViewModel>? onPageLoad = null)
         : base(title ?? "", editorType, icon ?? "", onPageLoad)
     {
@@ -699,7 +387,7 @@ protected override int GetHashCodeCore()
 }
 
 // SpriteRootNode have additional properties like mass exporting
-public class SpriteRootNode : ItemRootNode
+public class SpriteRootNode : OpenEditorNode
 {
     private readonly ISpriteRootOperationStrategy _strategy;
     
@@ -750,12 +438,12 @@ public SpriteRootNode(
         // ReImportCommand = ReactiveCommand.CreateFromTask(ReImportSpriteAsync);
     }
 
-    public override async Task AddItem()
+    public async Task AddItem()
     {
         await _strategy.ImportAsync();
     }
 
-    public override async Task DeleteItem(string key)
+    public async Task DeleteItem(string key)
     {
         // await _strategy.DeleteAsync(node);
     }
@@ -786,127 +474,64 @@ public async Task MassImportAsync()
     // }
 }
 
-public class SpriteTileRootNode : SpriteRootNode
-{
-    private readonly NodeFactory _nodeFactory;
-    private readonly IDialogService _dialogService;
-    public ReactiveCommand<Unit, Unit> ReIndexCommand { get; }
-
-    public SpriteTileRootNode(IDialogService dialogService, NodeFactory nodeFactory, Type? editorType, string title, string? icon = null, Action<EditorPageViewModel>? onPageLoad = null)
-        : base(dialogService, nodeFactory, GraphicsManager.AssetType.Tile, editorType, title, icon, onPageLoad)
-    {
-        _nodeFactory = nodeFactory;
-        _dialogService = dialogService;
-        ReIndexCommand = ReactiveCommand.CreateFromTask(ReIndexAsync);
-    }
-    
-    private async Task ReIndexAsync()
-    {
-        try
-        {
-            _reIndex();
-        }
-        catch (Exception ex)
-        {
-            DiagManager.Instance.LogError(ex, false);
-            await MessageBoxWindowView.Show(_dialogService, "Error when reindexing.\n\n" + ex.Message, "Reindex Failed", MessageBoxWindowView.MessageBoxButtons.Ok);
-            return;
-        }
-    }
-    
-    private void _reloadFullList()
-    {
-        Console.WriteLine("TODO: Reuse this... This is already identical to SpriteTileStrategy...");
-        lock (GameBase.lockObj)
-        {
-            SubNodes.Clear();
-            foreach (string name in GraphicsManager.TileIndex.Nodes.Keys)
-            {
-                SubNodes.Add(
-                    _nodeFactory.CreateDataItemNode<DevEditPageViewModel>(name, name + ":", this.AssetType.GetIcon())
-                );
-            }
-        }
-    }
-
-    private void _reIndex()
-    {
-        DevForm.ExecuteOrPend(() => { _tryReIndex(); });
-
-        _reloadFullList();
-    }
-
-    private void _tryReIndex()
-    {
-        lock (GameBase.lockObj)
-        {
-            GraphicsManager.RebuildIndices(GraphicsManager.AssetType.Tile);
-            GraphicsManager.ClearCaches(GraphicsManager.AssetType.Tile);
-
-            DiagManager.Instance.LogInfo("All files re-indexed.");
-        }
-    }
-}
-
-
-public class ModRootNode : ItemRootNode
-{
-    private readonly NodeFactory _nodeFactory;
-
-    private readonly IDialogService _dialogService;
-    public ModRootNode(NodeFactory nodeFactory, IDialogService dialogService,
-        Type? editorType, string title, string? icon = null, Action<EditorPageViewModel>? onPageLoad = null)
-        : base(title, editorType, icon ?? "", onPageLoad)
-    {
-        _nodeFactory = nodeFactory;
-        _dialogService = dialogService;
-        
-    }
-
-    public override async Task AddItem()
-    {
-        ModHeader header = new ModHeader("", "", "", "", "", Guid.NewGuid(), new Version(), new Version(), PathMod.ModType.Mod, new RelatedMod[0] { });
-        var vm = new ModConfigWindowViewModel(_dialogService, header);
-        bool result = await _dialogService.ShowDialogAsync<ModConfigWindowViewModel, bool>(vm, "Mod Config");
-        
-        if (!result)
-            return;
-        
-        // SubNodes.Add(_nodeFactory.CreateDataItemNode(vm.Name, "MonsterEditor", $"{vm.Name}:", "Icons.GhostFill"));
-        // IsExpanded = true;
-        // Console.WriteLine($"Added {DataType} item: {vm.Name}");
-    }
-
-    public override async Task DeleteItem(string key)
-    {
-        // if (node is null)
-        //     return;
-        //
-        // var res = await MessageBoxWindowView.Show(_dialogService,
-        //     $"Deleting {node.ItemKey} will reset it back to the base game.", $"Delete {node.ItemKey}", MessageBoxWindowView.MessageBoxButtons.YesNo, true);
-        //
-        // if (res != MessageBoxWindowView.MessageBoxResult.Yes)
-        //     return;
-        //
-        // SubNodes.Remove(node);
-        // Console.WriteLine($"Deleted {node.Title} of type {DataType}");
-    }
-}
+// public class ModRootNode : ItemRootNode
+// {
+//     private readonly NodeFactory _nodeFactory;
+//
+//     private readonly IDialogService _dialogService;
+//     public ModRootNode(NodeFactory nodeFactory, IDialogService dialogService,
+//         Type? editorType, string title, string? icon = null, Action<EditorPageViewModel>? onPageLoad = null)
+//         : base(title, editorType, icon ?? "", onPageLoad)
+//     {
+//         _nodeFactory = nodeFactory;
+//         _dialogService = dialogService;
+//         
+//     }
+//
+//     public override async Task AddItem()
+//     {
+//         ModHeader header = new ModHeader("", "", "", "", "", Guid.NewGuid(), new Version(), new Version(), PathMod.ModType.Mod, new RelatedMod[0] { });
+//         var vm = new ModConfigWindowViewModel(_dialogService, header);
+//         bool result = await _dialogService.ShowDialogAsync<ModConfigWindowViewModel, bool>(vm, "Mod Config");
+//         
+//         if (!result)
+//             return;
+//         
+//         // SubNodes.Add(_nodeFactory.CreateDataItemNode(vm.Name, "MonsterEditor", $"{vm.Name}:", "Icons.GhostFill"));
+//         // IsExpanded = true;
+//         // Console.WriteLine($"Added {DataType} item: {vm.Name}");
+//     }
+//
+//     public override async Task DeleteItem(string key)
+//     {
+//         // if (node is null)
+//         //     return;
+//         //
+//         // var res = await MessageBoxWindowView.Show(_dialogService,
+//         //     $"Deleting {node.ItemKey} will reset it back to the base game.", $"Delete {node.ItemKey}", MessageBoxWindowView.MessageBoxButtons.YesNo, true);
+//         //
+//         // if (res != MessageBoxWindowView.MessageBoxResult.Yes)
+//         //     return;
+//         //
+//         // SubNodes.Remove(node);
+//         // Console.WriteLine($"Deleted {node.Title} of type {DataType}");
+//     }
+// }
 
 // Used by TabSwitcher
 public class PageNode : NodeBase
 {
     private readonly NodeFactory _nodeFactory;
-    private readonly IDialogService _dialogService;
+    // private readonly IDialogService _dialogService;
     public EditorPageViewModel Page { get; }
     public PageNode? Parent { get; set; }
     public bool IsTopLevel => Parent == null;
 
-    public PageNode(IDialogService dialogService, NodeFactory nodeFactory, EditorPageViewModel page,
+    public PageNode(NodeFactory nodeFactory, EditorPageViewModel page,
         PageNode? parent = null)
         : base(page.Title, page.Icon)
     {
-        _dialogService = dialogService;
+        // _dialogService = dialogService;
         _nodeFactory = nodeFactory;
         Page = page;
         Parent = parent;
@@ -926,48 +551,4 @@ public void RemoveChild(PageNode childNode)
         SubNodes.Remove(childNode);
         childNode.Parent = null;
     }
-}
-
-// public interface IItemCommands
-// {
-//     ReactiveCommand<Unit, Unit> AddCommand { get; }
-//     ReactiveCommand<DataItemNode, Unit> DeleteCommand { get; }
-// }
-
-// public class DefaultItemCommands : IItemCommands
-// {
-//     public ReactiveCommand<Unit, Unit> AddCommand { get; }
-//     public ReactiveCommand<Unit, Unit> DeleteCommand { get; }
-//
-//     public DefaultItemCommands(Action onAdd, Action onDelete)
-//     {
-//         // AddCommand = ReactiveCommand.CreateFromTask(onAdd);
-//         // DeleteCommand = ReactiveCommand.Create(onDelete);
-//     }
-// }
-//
-
-
-// public class DataRootItemCommands : IItemCommands
-// {
-//     public ReactiveCommand<Unit, Unit> AddCommand { get; }
-//     public ReactiveCommand<DataItemNode, Unit> DeleteCommand { get; }
-//     
-//     public DataRootItemCommands(ItemRootNode node)
-//     {
-//         AddCommand = ReactiveCommand.CreateFromTask(async () =>
-//         {
-//             Console.WriteLine($"[DATA] Adding {dataType}...");
-//             await Task.Delay(500); // simulate work
-//             Console.WriteLine($"[DATA] Done adding {dataType}");
-//         });
-//
-//         DeleteCommand = ReactiveCommand.CreateFromTask(async () =>
-//         {
-//             Console.WriteLine($"[DATA] Deleting {dataType}...");
-//             await Task.Delay(500);
-//             Console.WriteLine($"[DATA] Done deleting {dataType}");
-//         });
-//     }
-//
-// }
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml b/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml
index 8e392efa..64ea2b13 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml
@@ -101,25 +101,12 @@
             <Border Grid.Column="0" Margin="0,0,0,0" BorderThickness="1"
                     BorderBrush="{DynamicResource Brush.ToolBar}" CornerRadius="6">
                 <Grid RowDefinitions="28, 3, *">
-                    <TextBox
-                        Margin="0,0,0,0"
-                        Height="28"
-
-                        BorderThickness="0"
-                        CornerRadius="0"
-                        BorderBrush="{DynamicResource Brush.Border2}"
-                        Watermark="Search..."
-                        Text="{Binding Filter, Mode=TwoWay}"
-                        VerticalContentAlignment="Center">
-                        <TextBox.InnerLeftContent>
-                            <Path
-                                Fill="{DynamicResource Brush.FG2}"
-                                Width="12" Height="12"
-                                Margin="6,0,0,0"
-                                Data="{StaticResource Icons.MagnifyingGlassFill}" />
-
-
-                        </TextBox.InnerLeftContent>
+                    <TextBox Classes="search"
+                             Margin="0,0,0,0"
+                             Height="28"
+                             BorderThickness="0"
+                             Watermark="Search..."
+                             Text="{Binding Filter, Mode=TwoWay}">
                         <TextBox.InnerRightContent>
                             <Button Classes="icon_button"
                                     Width="16"
@@ -129,6 +116,7 @@
                                     IsVisible="{Binding Filter, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"
                                     HorizontalAlignment="Right">
                                 <Path
+                                    Fill="{DynamicResource Brush.FG2}"
                                     Width="14" Height="14"
                                     Margin="0,1,0,0"
                                     Data="{StaticResource Icons.XCircleFill}" />
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/DataListPageView.axaml b/RogueEssence.Editor.Avalonia/Views/New/Editors/DataListPageView.axaml
index 1e80ba41..e037c035 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/Editors/DataListPageView.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/New/Editors/DataListPageView.axaml
@@ -81,24 +81,9 @@
         <!-- Search Grid -->
         <Grid Grid.Row="3" RowDefinitions="Auto, 16, Auto, 12, Auto" Margin="64, 8" MinWidth="600">
 
-            <TextBox Grid.Row="0"
-                     Height="24"
-                     HorizontalAlignment="Stretch"
-                     Margin="0"
-                     BorderThickness="1"
-                     CornerRadius="0"
-                     Watermark="Search..."
-                     Text="{Binding SearchFilter, Mode=TwoWay}"
-                     BorderBrush="{DynamicResource Brush.Border2}"
-                     VerticalContentAlignment="Center">
-                <TextBox.InnerLeftContent>
-                    <Path
-                        Fill="{DynamicResource Brush.FG2}"
-                        Width="14" Height="14"
-                        Margin="6,1,0,0"
-                        Data="{StaticResource Icons.MagnifyingGlassFill}" />
-                </TextBox.InnerLeftContent>
-            </TextBox>
+            <TextBox Classes="search"
+                     Grid.Row="0"
+                     Text="{Binding SearchFilter, Mode=TwoWay}"/>
 
             <ListBox Grid.Row="2"
                      ContextRequested="DataListPageListBox_OnContextRequested"
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/SpeciesEditPageView.axaml b/RogueEssence.Editor.Avalonia/Views/New/Editors/SpeciesEditPageView.axaml
index 1afc6199..359fd651 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/Editors/SpeciesEditPageView.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/New/Editors/SpeciesEditPageView.axaml
@@ -122,26 +122,9 @@
         <!-- Search Grid -->
         <Grid Grid.Row="3" RowDefinitions="Auto, 16, Auto, 32, Auto" Margin="64, 8" MinWidth="600">
 
-            <TextBox Grid.Row="0"
-                     Height="24"
-                     x:Name="TabSwitcherTextBox"
-                     HorizontalAlignment="Stretch"
-                     Margin="0"
-                     BorderThickness="1"
-                     CornerRadius="0"
-                     Watermark="Search..."
-                     Text="{Binding Filter, Mode=TwoWay}"
-
-                     BorderBrush="{DynamicResource Brush.Border2}"
-                     VerticalContentAlignment="Center">
-                <TextBox.InnerLeftContent>
-                    <Path
-                        Fill="{DynamicResource Brush.FG2}"
-                        Width="14" Height="14"
-                        Margin="6,1,0,0"
-                        Data="{StaticResource Icons.MagnifyingGlassFill}" />
-                </TextBox.InnerLeftContent>
-            </TextBox>
+            <TextBox Classes="search"
+                     Grid.Row="0"
+                     Text="{Binding Filter, Mode=TwoWay}"/>
 
             <TreeDataGrid x:Name="SpeciesEditTreeDataGrid" Background="{DynamicResource Brush.Contents}"
                           SelectionChanging="SpeciesEditTreeDataGrid_OnSelectionChanging" ShowColumnHeaders="False"
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/SpritePageView.axaml b/RogueEssence.Editor.Avalonia/Views/New/Editors/SpritePageView.axaml
index 349b5f86..1316bab9 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/Editors/SpritePageView.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/New/Editors/SpritePageView.axaml
@@ -9,20 +9,20 @@
              x:DataType="vm:SpritePageViewModel"
              x:Class="RogueEssence.Dev.Views.SpritePageView">
     <Design.DataContext>
-        <vm:SpritePageViewModel/>
+        <vm:SpritePageViewModel />
     </Design.DataContext>
     <Grid RowDefinitions="Auto, 32, Auto, 20, Auto">
         <DockPanel Grid.Row="0" VerticalAlignment="Top">
             <Menu DockPanel.Dock="Top">
                 <MenuItem Header="_Edit">
-                    <MenuItem Header="Mass Import" Command="{Binding mnuMassImport_Click}"/>
-                    <MenuItem Header="Mass Export" Command="{Binding mnuMassExport_Click}"/>
-                    <Separator IsVisible="{Binding IsTileAsset}"/>
-                    <MenuItem IsVisible="{Binding IsTileAsset}" Header="Re-Index" Command="{Binding mnuReIndex_Click}"/>
+                    <MenuItem Header="Mass Import" Command="{Binding mnuMassImport_Click}" />
+                    <MenuItem Header="Mass Export" Command="{Binding mnuMassExport_Click}" />
+                    <Separator IsVisible="{Binding IsTileAsset}" />
+                    <MenuItem IsVisible="{Binding IsTileAsset}" Header="Re-Index" Command="{Binding mnuReIndex_Click}" />
                 </MenuItem>
             </Menu>
-            
-            
+
+
             <!-- <Grid RowDefinitions="*, 34" ColumnDefinitions="*, *, *, *"> -->
             <!--     <views:SearchListBox DataContext="{Binding Anims}" Margin="4" Grid.ColumnSpan="4"/> -->
             <!--     <Button Command="{Binding btnImport_Click}" Margin="4" Grid.Row="1" Grid.Column="0" IsEnabled="{Binding ChosenAnim, Converter={x:Static ObjectConverters.IsNotNull}}">Import</Button> -->
@@ -33,27 +33,12 @@
         </DockPanel>
         <TextBlock Grid.Row="2" HorizontalAlignment="Center" Classes="table_header" FontSize="16"
                    Text="{Binding AssetType}" />
-        
-                <Grid Grid.Row="3" RowDefinitions="Auto, 16, Auto, 12, Auto" Margin="64, 8" MinWidth="600">
 
-            <TextBox Grid.Row="0"
-                     Height="24"
-                     HorizontalAlignment="Stretch"
-                     Margin="0"
-                     BorderThickness="1"
-                     CornerRadius="0"
-                     Watermark="Search..."
-                     Text="{Binding SearchFilter, Mode=TwoWay}"
-                     BorderBrush="{DynamicResource Brush.Border2}"
-                     VerticalContentAlignment="Center">
-                <TextBox.InnerLeftContent>
-                    <Path
-                        Fill="{DynamicResource Brush.FG2}"
-                        Width="14" Height="14"
-                        Margin="6,1,0,0"
-                        Data="{StaticResource Icons.MagnifyingGlassFill}" />
-                </TextBox.InnerLeftContent>
-            </TextBox>
+        <Grid Grid.Row="3" RowDefinitions="Auto, 16, Auto, 12, Auto" Margin="64, 8" MinWidth="600">
+
+            <TextBox Classes="search"
+                     Grid.Row="0"
+                     Text="{Binding SearchFilter, Mode=TwoWay}" />
 
             <ListBox Grid.Row="2"
                      x:Name="SpritePageListBox"
@@ -69,7 +54,7 @@
                     </Style>
                 </ListBox.Styles>
                 <ListBox.ItemContainerTheme>
-                    <StaticResource ResourceKey="CompactListBoxItem"/>
+                    <StaticResource ResourceKey="CompactListBoxItem" />
                 </ListBox.ItemContainerTheme>
                 <ListBox.ItemTemplate>
                     <DataTemplate>
@@ -77,7 +62,7 @@
                     </DataTemplate>
                 </ListBox.ItemTemplate>
             </ListBox>
-            
+
             <StackPanel Grid.Row="4" Orientation="Horizontal">
                 <Button Classes="flat" Width="100"
                         Command="{Binding btnImport_Click}">
@@ -122,7 +107,7 @@
             <!--         <v:IconText Text="Delete" Icon="Icons.TrashFill" IconSize="12" /> -->
             <!--     </Button> -->
             <!-- </StackPanel> -->
-            
+
         </Grid>
     </Grid>
-</UserControl>
+</UserControl>
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/New/TabSwitcherView.axaml b/RogueEssence.Editor.Avalonia/Views/New/TabSwitcherView.axaml
index 555337f5..b9bac833 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/TabSwitcherView.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/New/TabSwitcherView.axaml
@@ -18,26 +18,13 @@
     </UserControl.Resources>
     <Grid RowDefinitions="Auto, Auto">
         <!-- <Grid Grid.Row="0" ColumnDefinitions="*, Auto" HorizontalAlignment="Stretch"> -->
-        <TextBox Grid.Row="0"
-                 Height="24"
+        <TextBox Classes="search"
+                 Grid.Row="0"
                  x:Name="TabSwitcherTextBox"
-                 HorizontalAlignment="Stretch"
                  MaxWidth="400"
-                 Margin="0"
-                 BorderThickness="1"
-                 CornerRadius="0"
                  Watermark="Search for tabs.."
                  KeyDown="TabSwitcherTextBox_KeyDown"
-                 Text="{Binding SearchFilter, Mode=TwoWay}"
-                 BorderBrush="{DynamicResource Brush.Border2}"
-                 VerticalContentAlignment="Center">
-            <TextBox.InnerLeftContent>
-                <Path
-                    Fill="{DynamicResource Brush.FG2}"
-                    Width="14" Height="14"
-                    Margin="6,1,0,0"
-                    Data="{StaticResource Icons.MagnifyingGlassFill}" />
-            </TextBox.InnerLeftContent>
+                 Text="{Binding SearchFilter, Mode=TwoWay}">
 
             <TextBox.InnerRightContent>
                 <StackPanel Orientation="Horizontal">

From 5942e4d4f495b3d25d3a4b8335a557cb99c7c2cf Mon Sep 17 00:00:00 2001
From: Kace <41309226+DoubleTrio@users.noreply.github.com>
Date: Fri, 15 May 2026 00:21:12 -0400
Subject: [PATCH 30/51] context menu for dataroot and tab/node name change when
 renaming entries

---
 .../Assets/NodeTemplates.axaml                |  68 ++---
 .../EditorContext/NodeFactory.cs              |  24 +-
 .../Utility/ContextMenuHelper.cs              |  41 ++-
 .../ViewModels/New/DevFormViewModel.cs        |  72 ++---
 .../New/Editors/DataListPageViewModel.cs      |  82 +++---
 .../New/Editors/EditorPageViewModel.cs        |  10 +-
 .../New/Nodes/ISpriteRootOperationStrategy.cs |   2 -
 .../ViewModels/New/Nodes/NodeBase.cs          | 273 +++++++++++++-----
 .../New/Nodes/SpriteRootAssetTypeStrategy.cs  |  29 +-
 .../New/Nodes/SpriteRootTileStrategy.cs       |  45 ++-
 .../Views/New/DevForm.axaml                   |  16 +-
 .../Views/New/DevForm.axaml.cs                |  59 ++--
 .../New/Editors/DataListPageView.axaml.cs     |   4 +
 RogueEssence/Data/DataManager.cs              |   4 +-
 14 files changed, 419 insertions(+), 310 deletions(-)

diff --git a/RogueEssence.Editor.Avalonia/Assets/NodeTemplates.axaml b/RogueEssence.Editor.Avalonia/Assets/NodeTemplates.axaml
index 30c80c1d..eb8dc49d 100644
--- a/RogueEssence.Editor.Avalonia/Assets/NodeTemplates.axaml
+++ b/RogueEssence.Editor.Avalonia/Assets/NodeTemplates.axaml
@@ -9,25 +9,25 @@
         <v:IconText Text="{Binding Title}" Icon="{Binding Icon}" IconSize="12" />
     </DataTemplate>
 
-    <DataTemplate x:Key="ItemRootDataTemplate" DataType="vm:ItemRootNode">
-        <Grid ColumnDefinitions="Auto, *, 16" Height="16">
-            <ContentPresenter Content="{Binding}"
-                              ContentTemplate="{StaticResource NodeContentTemplate}" />
-            <Button x:Name="DataRootAddButton" Grid.Column="2" Classes="icon_button"
-                    IsVisible="{Binding IsPointerOver, RelativeSource={RelativeSource AncestorType=TreeViewItem}}"
-                    Command="{Binding AddCommand}">
-                <Path Stretch="Fill"
-                      Fill="{DynamicResource Brush.FG1}"
-                      Width="10" Height="10"
-                      Data="{StaticResource Icons.Plus}" />
-            </Button>
-        </Grid>
-    </DataTemplate>
-
-    <TreeDataTemplate x:Key="ItemRootTemplate" DataType="vm:ItemRootNode" ItemsSource="{Binding SubNodes}">
-        <ContentPresenter Content="{Binding}"
-                          ContentTemplate="{StaticResource ItemRootDataTemplate}" />
-    </TreeDataTemplate>
+    <!-- <DataTemplate x:Key="ItemRootDataTemplate" DataType="vm:ItemRootNode"> -->
+    <!--     <Grid ColumnDefinitions="Auto, *, 16" Height="16"> -->
+    <!--         <ContentPresenter Content="{Binding}" -->
+    <!--                           ContentTemplate="{StaticResource NodeContentTemplate}" /> -->
+    <!--         <Button x:Name="DataRootAddButton" Grid.Column="2" Classes="icon_button" -->
+    <!--                 IsVisible="{Binding IsPointerOver, RelativeSource={RelativeSource AncestorType=TreeViewItem}}" -->
+    <!--                 Command="{Binding AddCommand}"> -->
+    <!--             <Path Stretch="Fill" -->
+    <!--                   Fill="{DynamicResource Brush.FG1}" -->
+    <!--                   Width="10" Height="10" -->
+    <!--                   Data="{StaticResource Icons.Plus}" /> -->
+    <!--         </Button> -->
+    <!--     </Grid> -->
+    <!-- </DataTemplate> -->
+    <!-- -->
+    <!-- <TreeDataTemplate x:Key="ItemRootTemplate" DataType="vm:ItemRootNode" ItemsSource="{Binding SubNodes}"> -->
+    <!--     <ContentPresenter Content="{Binding}" -->
+    <!--                       ContentTemplate="{StaticResource ItemRootDataTemplate}" /> -->
+    <!-- </TreeDataTemplate> -->
 
     <TreeDataTemplate x:Key="DataItemTemplate" DataType="vm:DataItemNode" ItemsSource="{Binding SubNodes}">
         <Grid ColumnDefinitions="*,Auto"
@@ -36,21 +36,21 @@
               Height="16">
             <ContentPresenter Content="{Binding}"
                               ContentTemplate="{StaticResource NodeContentTemplate}" />
-            <Button Grid.Column="1"
-                    Classes="icon_button"
-                    Width="16" Height="16"
-                    Command="{Binding $parent[TreeViewItem;1].((vm:ItemRootNode)DataContext).DeleteCommand}"
-                    CommandParameter="{Binding}"
-                    IsVisible="{Binding IsPointerOver, RelativeSource={RelativeSource AncestorType=TreeViewItem}}"
-                    VerticalAlignment="Center"
-                    HorizontalAlignment="Right"
-                    Background="Transparent"
-                    BorderThickness="0">
-                <Path Stretch="Fill"
-                      Fill="{DynamicResource Brush.FG1}"
-                      Width="10" Height="10"
-                      Data="{StaticResource Icons.TrashFill}" />
-            </Button>
+            <!-- <Button Grid.Column="1" -->
+            <!--         Classes="icon_button" -->
+            <!--         Width="16" Height="16" -->
+            <!--         Command="{Binding $parent[TreeViewItem;1].((vm:ItemRootNode)DataContext).DeleteCommand}" -->
+            <!--         CommandParameter="{Binding}" -->
+            <!--         IsVisible="{Binding IsPointerOver, RelativeSource={RelativeSource AncestorType=TreeViewItem}}" -->
+            <!--         VerticalAlignment="Center" -->
+            <!--         HorizontalAlignment="Right" -->
+            <!--         Background="Transparent" -->
+            <!--         BorderThickness="0"> -->
+            <!--     <Path Stretch="Fill" -->
+            <!--           Fill="{DynamicResource Brush.FG1}" -->
+            <!--           Width="10" Height="10" -->
+            <!--           Data="{StaticResource Icons.TrashFill}" /> -->
+            <!-- </Button> -->
         </Grid>
     </TreeDataTemplate>
 
diff --git a/RogueEssence.Editor.Avalonia/EditorContext/NodeFactory.cs b/RogueEssence.Editor.Avalonia/EditorContext/NodeFactory.cs
index 7c99fd88..114e8b97 100644
--- a/RogueEssence.Editor.Avalonia/EditorContext/NodeFactory.cs
+++ b/RogueEssence.Editor.Avalonia/EditorContext/NodeFactory.cs
@@ -41,6 +41,13 @@ public OpenEditorNode CreateOpenEditorNode<TEditor>(
         where TEditor : EditorPageViewModel
         => Create<OpenEditorNode>(title, typeof(TEditor), icon, CreateCallback(onOpen));
 
+    public OpenEditorNode CreateUniversalNode<TEditor>(
+        string title,
+        string? icon = null,
+        Action<TEditor>? onOpen = null)
+        where TEditor : EditorPageViewModel
+        => Create<UniversalNode>(title, typeof(TEditor), icon, CreateCallback(onOpen));
+    
     public ReflectedDataNode CreateReflectedDataNode<TEditor>(
         string title,
         string? icon = null,
@@ -91,20 +98,13 @@ public SpriteRootNode CreateSpriteRootNode<TEditor>(
         Action<TEditor>? onOpen = null)
         where TEditor : EditorPageViewModel
         => Create<SpriteRootNode>(assetType, typeof(TEditor), title, icon, CreateCallback(onOpen));
-
-    // public SpriteTileRootNode CreateSpriteTileRootNode<TEditor>(
-    //     string title,
-    //     string? icon = null,
-    //     Action<TEditor>? onOpen = null)
-    //     where TEditor : EditorPageViewModel
-    //     => Create<SpriteTileRootNode>(typeof(TEditor), title, icon, CreateCallback(onOpen));
-
-    public OpenEditorNodeFX<T> CreateOpenEditorNodeFX<T, TEditor>(
+    
+    
+        
+    public SpriteTileRootNode CreateSpriteTileRootNode<TEditor>(
         string title,
-        Func<T> getter,
-        Action<T> setter,
         string? icon = null,
         Action<TEditor>? onOpen = null)
         where TEditor : EditorPageViewModel
-        => Create<OpenEditorNodeFX<T>>(title, typeof(TEditor), getter, setter, icon, CreateCallback(onOpen));
+        => Create<SpriteTileRootNode>(typeof(TEditor), title, icon, CreateCallback(onOpen));
 }
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Utility/ContextMenuHelper.cs b/RogueEssence.Editor.Avalonia/Utility/ContextMenuHelper.cs
index 33f7d66b..9a70f87e 100644
--- a/RogueEssence.Editor.Avalonia/Utility/ContextMenuHelper.cs
+++ b/RogueEssence.Editor.Avalonia/Utility/ContextMenuHelper.cs
@@ -2,6 +2,7 @@
 using System.Threading.Tasks;
 using Avalonia.Controls;
 using Avalonia.Layout;
+using RogueEssence.Data;
 using RogueEssence.Dev.ViewModels;
 
 namespace RogueEssence.Dev.Utility;
@@ -31,6 +32,21 @@ public static ContextMenu CreateContextMenu(params Control[] items)
         return menu;
     }
     
+    public static ContextMenu CreateDataRootMenu(DataRootNode node)
+    {
+        var menu = CreateContextMenu(
+            CreateMenuItem("Re-Index", "Icons.FileFill", async () => await node.ReIndexAsync())
+        );
+
+        if (node.DataType != DataManager.DataType.AutoTile)
+        {
+            menu.Items.Add(new Separator());
+            menu.Items.Add(CreateMenuItem("Resave all as File", "Icons.FileFill", () => node.ResaveAllAsync(false)));
+            menu.Items.Add(CreateMenuItem("Resave all as Patch", "Icons.FileTextFill", () => node.ResaveAllAsync(true)));
+        }
+        return menu;
+    }
+    
     public static ContextMenu CreateDataItemMenu(DataRootNode node, string key)
     {
         return CreateContextMenu(
@@ -39,11 +55,30 @@ public static ContextMenu CreateDataItemMenu(DataRootNode node, string key)
         );
     }
     
-    public static ContextMenu CreateSpriteItemMenu(SpriteRootNode node)
+    public static ContextMenu CreateSpriteRootMenu(SpriteRootNode root)
+    {
+        var menu = CreateContextMenu(
+            CreateMenuItem("Mass Import", "Icons.DownloadFill", async () => await root.MassImportAsync()),
+            CreateMenuItem("Mass Export", "Icons.ExportFill", async () => await root.MassExportAsync())
+        );
+        
+        if (root is SpriteTileRootNode node)
+        {
+            menu.Items.Add(new Separator());
+            var reIndexItem = new MenuItem { Header = "Re-Index", Icon = App.CreateMenuIcon("Icons.ListNumbersFill") };
+            reIndexItem.Click += async (_, _) => await node.ReIndexAsync();
+            menu.Items.Add(reIndexItem);
+        };
+
+        return menu;
+
+    }
+    
+    public static ContextMenu CreateUniversalRootMenu(UniversalNode node)
     {
         return CreateContextMenu(
-            CreateMenuItem("Mass Import", "Icons.DownloadFill", async () => await node.MassImportAsync()),
-            CreateMenuItem("Mass Export", "Icons.ExportFill", async () => await node.MassExportAsync())
+            CreateMenuItem("Resave as File", "Icons.DownloadFill", async () => await node.ResaveAsFile()),
+            CreateMenuItem("Resave as Patch", "Icons.ExportFill", async () => await node.ResaveAsDiff())
         );
     }
 }
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs
index 33419483..61a5b62e 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs
@@ -524,7 +524,7 @@ public void LoadDevTree()
 
         CreateDataNode(root);
         CreateConstantsNode(root);
-        //
+        
         CreateSpriteNode(root);
 
         CreateModNode(root);
@@ -613,7 +613,7 @@ private void CreateConstantsNode(NodeBase parent)
                 parent)
         );
 
-        var universalEventsNode = _context.NodeFactory.CreateOpenEditorNode<ReflectedDataPageViewModel>(
+        var universalEventsNode = _context.NodeFactory.CreateUniversalNode<ReflectedDataPageViewModel>(
             "Universal Event", "Icons.ListFill",
             CreateDataOnOpen(
                 () => (UniversalBaseEffect)DataManager.Instance.UniversalEvent,
@@ -798,9 +798,21 @@ private void CreateSpriteNode(NodeBase parent)
                 type == GraphicsManager.AssetType.Font)
                 continue;
 
-            spriteNode.SubNodes.Add(
-                _context.NodeFactory.CreateSpriteRootNode<SpritePageViewModel>(type, type.ToString(), type.GetIcon()));
 
+            if (type != GraphicsManager.AssetType.Tile)
+            {
+
+                spriteNode.SubNodes.Add(
+                    _context.NodeFactory.CreateSpriteRootNode<SpritePageViewModel>(type, type.ToString(),
+                        type.GetIcon()));
+            }
+            else
+            {
+                spriteNode.SubNodes.Add(
+                    _context.NodeFactory.CreateSpriteTileRootNode<SpritePageViewModel>(type.ToString(),
+                        type.GetIcon()));
+                
+            }
             // if (type == GraphicsManager.AssetType.Tile)
             // {
             //     var tileRootNode = _nodeFactory.CreateSpriteTileRootNode(
@@ -856,57 +868,9 @@ private void CreateSpriteNode(NodeBase parent)
 
 
         parent.SubNodes.Add(spriteNode);
-
-        // lock (GameBase.lockObj)
-        // {
-        // anims.Clear();
-        // Anims.Clear();
-        // string assetPattern = GraphicsManager.GetPattern(assetType);
-        // string[] dirs = PathMod.GetModFiles(Path.GetDirectoryName(assetPattern), String.Format(Path.GetFileName(assetPattern), "*"));
-        // for (int ii = 0; ii < dirs.Length; ii++)
-        // {
-        //     string filename = Path.GetFileNameWithoutExtension(dirs[ii]);
-        //     anims.Add(filename);
-        // }
-        // Anims.SetItems(anims);
-        // }
-
-
-        // var dataNode = _nodeFactory.CreateSpriteRootNode("aaaa", "Icons.FloppyDiskFill", "Sprite");
-
-        // foreach (var type in Enum.GetValues<DataManager.DataType>())
-        // {
-        //     if (type == DataManager.DataType.All || type == DataManager.DataType.None)
-        //         continue;
-        //
-        //
-        //     var dataItemRootNode = _nodeFactory.CreateDataRootNode(
-        //         type,
-        //         "TODO",
-        //         type.ToString(),
-        //         type.GetIcon());
-        //     dataNode.SubNodes.Add(dataItemRootNode);
-        //     var entries = DataManager.Instance.DataIndices[type].GetLocalStringArray(true);
-        //
-        //     foreach (string key in entries.Keys)
-        //     {
-        //         var itemNode = _nodeFactory.CreateDataItemNode(
-        //             key,
-        //             "DevEditEditor",
-        //             $"{key}: {entries[key]}",
-        //             type.GetIcon());
-        //
-        //         dataItemRootNode.SubNodes.Add(itemNode);
-        //     }
-        // }
-        //
-        // parent.SubNodes.Add(dataNode);
-    }
-
-    private void HandleSprites()
-    {
+        
     }
-
+    
     private void CreateModNode(NodeBase parent)
     {
         var modRoot = _context.NodeFactory.CreateOpenEditorNode<ModEditPageViewModel>("Mods", "Icons.ScrollFill");
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DataListPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DataListPageViewModel.cs
index d3ac9a0b..e54a04b7 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DataListPageViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DataListPageViewModel.cs
@@ -74,6 +74,7 @@ private void ReloadEntries()
     public override void OnPageLoad()
     {
         ReloadEntries();
+        Node.OnReload += ReloadEntries;
 
         // ResaveAsFileCommand = Node.ResaveAsFile;
 
@@ -81,11 +82,11 @@ public override void OnPageLoad()
 
         EditMenuItems.Clear();
 
-        EditMenuItems.Add(new DataOpContainer("Re-Index", ReIndexAsync));
+        EditMenuItems.Add(new DataOpContainer("Re-Index", Node.ReIndexAsync));
         if (DataType != DataManager.DataType.AutoTile)
         {
-            EditMenuItems.Add(new DataOpContainer("Resave all as File", () => ResaveAllAsync(false)));
-            EditMenuItems.Add(new DataOpContainer("Resave all as Diff", () => ResaveAllAsync(true)));
+            EditMenuItems.Add(new DataOpContainer("Resave all as File", () => Node.ResaveAllAsync(false)));
+            EditMenuItems.Add(new DataOpContainer("Resave all as Diff", () => Node.ResaveAllAsync(true)));
         }
         else
         {
@@ -198,25 +199,18 @@ private async Task ExportDtefAsync()
     // }
 
 
-    private async Task ResaveAllAsync(bool asDiff)
+
+
+
+
+    public override void OnPageRemoved()
     {
-        await Task.Run(() =>
-        {
-            lock (GameBase.lockObj)
-            {
-                DevHelper.Resave(DataType, asDiff);
-                DevHelper.RunIndexing(DataType);
-                DevHelper.RunExtraIndexing(DataType);
-                DataManager.Instance.LoadIndex(DataType);
-                DataManager.Instance.LoadUniversalIndices();
-                DataManager.Instance.ClearCache(DataType);
-                DiagManager.Instance.DevEditor.ReloadData(DataType);
-                ReloadEntries();
-            }
-        });
-    }
+        Node.OnReload -= ReloadEntries;
+        base.OnPageRemoved();
 
+    }
 
+ 
     protected override bool IsSamePage(EditorPageViewModel other)
     {
         var page = other as DataListPageViewModel;
@@ -275,11 +269,29 @@ private void _configurePage(EditorPageViewModel vm)
                 pg.SetPageTitle(
                     DataEditor.GetWindowTitle(String.Format("{0} #{1}", dataType.ToString(), key), newName, obj,
                         obj.GetType()), pg.Node.Icon);
+                
+                // TODO: This needs to update after pressing OK on the default name too...
+                
+                pg.Node.Title = $"{key}: {newName}";
+                pg.Title = $"{key}: {newName}";
+                ModifyEntry(key, newName);
+            
             }
 
             return true;
         };
     }
+    
+    
+    
+    public void ModifyEntry(string key, string newValue)
+    {
+        var item = Items.FirstOrDefault(x => x.Key == key);
+        if (item == null) return;
+        int index = Items.IndexOf(item);
+        Items[index] = item with { Value = newValue };
+        UpdateVisibleItems(SearchFilter);
+    }
 
     public async Task AddItem()
     {
@@ -314,22 +326,22 @@ public async Task AddItem()
         // Console.WriteLine($"Added {DataType} item: {vm.Name}");
     }
 
-    private async Task ReIndexAsync()
-    {
-        await Task.Run(() =>
-        {
-            lock (GameBase.lockObj)
-            {
-                DevHelper.RunIndexing(DataType);
-                DevHelper.RunExtraIndexing(DataType);
-                DataManager.Instance.LoadIndex(DataType);
-                DataManager.Instance.LoadUniversalIndices();
-                DataManager.Instance.ClearCache(DataType);
-                DiagManager.Instance.DevEditor.ReloadData(DataType);
-                ReloadEntries();
-            }
-        });
-    }
+    // private async Task ReIndexAsync()
+    // {
+    //     await Task.Run(() =>
+    //     {
+    //         lock (GameBase.lockObj)
+    //         {
+    //             DevHelper.RunIndexing(DataType);
+    //             DevHelper.RunExtraIndexing(DataType);
+    //             DataManager.Instance.LoadIndex(DataType);
+    //             DataManager.Instance.LoadUniversalIndices();
+    //             DataManager.Instance.ClearCache(DataType);
+    //             DiagManager.Instance.DevEditor.ReloadData(DataType);
+    //             ReloadEntries();
+    //         }
+    //     });
+    // }
 
 
     public async Task DeleteItem()
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/EditorPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/EditorPageViewModel.cs
index 90073bd4..4490e261 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/EditorPageViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/EditorPageViewModel.cs
@@ -56,11 +56,11 @@ public virtual void OnPageLoad()
     
         
     private string _title = "";
-
-
-    // Tab title
-    public string Title =>
-        string.IsNullOrEmpty(_title) ? DefaultTitle : _title;
+    public string Title
+    {
+        get => string.IsNullOrEmpty(_title) ? DefaultTitle : _title;
+        set => this.RaiseAndSetIfChanged(ref _title, value);
+    }
     
     public bool Equals(EditorPageViewModel? other)
     {
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/ISpriteRootOperationStrategy.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/ISpriteRootOperationStrategy.cs
index 360ff6ba..175d43e5 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/ISpriteRootOperationStrategy.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/ISpriteRootOperationStrategy.cs
@@ -4,8 +4,6 @@ namespace RogueEssence.Dev.ViewModels;
 
 public interface ISpriteRootOperationStrategy
 {
-    Task<NodeBase> AddAsync();
-    Task DeleteAsync(DataItemNode node);
     Task MassExportAsync();
     Task MassImportAsync();
     Task ExportAsync(DataItemNode node);
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/NodeBase.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/NodeBase.cs
index 3bc20542..d94245a0 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/NodeBase.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/NodeBase.cs
@@ -51,7 +51,7 @@ public string Icon
     }
 
     public event Action? SubNodesChanged;
-    
+
 
     public NodeBase(string title = "", string? icon = null)
     {
@@ -81,7 +81,7 @@ public bool IsVisible
         get => _isVisible;
         set => this.RaiseAndSetIfChanged(ref _isVisible, value);
     }
-    
+
     public bool Equals(NodeBase? other)
     {
         if (other is null) return false;
@@ -89,12 +89,12 @@ public bool Equals(NodeBase? other)
         return EqualsCore(other);
     }
 
-    public override bool Equals(object? obj) => (obj is NodeBase) && this.Equals((NodeBase) obj);
+    public override bool Equals(object? obj) => (obj is NodeBase) && this.Equals((NodeBase)obj);
     public override int GetHashCode() => GetHashCodeCore();
 
     protected virtual bool EqualsCore(NodeBase other) => ReferenceEquals(this, other);
     protected virtual int GetHashCodeCore() => RuntimeHelpers.GetHashCode(this);
-    
+
 
     private void OnSubNodesChanged(object? s, NotifyCollectionChangedEventArgs e)
     {
@@ -106,7 +106,7 @@ private void OnSubNodesChanged(object? s, NotifyCollectionChangedEventArgs e)
                 child.SubNodesChanged += SubNodesChanged;
             }
         }
-        
+
         if (e.OldItems != null)
         {
             foreach (NodeBase child in e.OldItems)
@@ -131,6 +131,7 @@ public void CollapseChildren()
             child.CollapseChildren();
         }
     }
+
     public bool AddNodeIfNotExists(NodeBase node)
     {
         bool added = false;
@@ -140,15 +141,15 @@ public bool AddNodeIfNotExists(NodeBase node)
             SubNodes.Add(node);
             added = true;
         }
-        
+
         return added;
     }
-    
+
     public void RemoveNode(NodeBase node)
     {
         SubNodes.Remove(node);
     }
-    
+
     // NOTE: Include itself while looking for a match
     public T FindNode<T>() where T : NodeBase
     {
@@ -169,22 +170,24 @@ public T FindNode<T>() where T : NodeBase
 public class OpenEditorNode : NodeBase
 {
     public Type EditorType { get; }
-    
+
     public readonly Action<EditorPageViewModel>? OnPageLoad;
-    
-    public OpenEditorNode(string title, Type? editorType, string? icon = null, Action<EditorPageViewModel>? onPageLoad = null)
+
+    public OpenEditorNode(string title, Type? editorType, string? icon = null,
+        Action<EditorPageViewModel>? onPageLoad = null)
         : base(title, icon ?? "")
     {
         OnPageLoad = onPageLoad;
         EditorType = editorType;
     }
-    
+
     protected override bool EqualsCore(NodeBase other)
     {
         if (other is not OpenEditorNode node)
             return false;
         return EditorType == node.EditorType;
     }
+
     protected override int GetHashCodeCore()
     {
         return EditorType.GetHashCode();
@@ -223,7 +226,6 @@ protected override bool EqualsCore(NodeBase other)
     protected override int GetHashCodeCore() => _identifier.GetHashCode();
 }
 
-
 // TODO: Remove
 public class OpenEditorNodeWithParams : OpenEditorNode
 {
@@ -233,7 +235,7 @@ public OpenEditorNodeWithParams(
         string title,
         Type? editorType,
         object[] extraParams,
-        string? icon = null, 
+        string? icon = null,
         Action<EditorPageViewModel>? onPageLoad = null)
         : base(title, editorType, icon, onPageLoad)
     {
@@ -241,31 +243,6 @@ public OpenEditorNodeWithParams(
     }
 }
 
-public class OpenEditorNodeFX<T> : OpenEditorNode
-{
-    private readonly Func<T> _getter;
-    private readonly Action<T> _setter;
-
-    public OpenEditorNodeFX(
-        string title, 
-        Type? editorType,
-        Func<T> getter, 
-        Action<T> setter,
-        string? icon = null,
-        Action<EditorPageViewModel>? onPageLoad = null
-        )
-        : base(title, editorType, icon, onPageLoad)
-    {
-        _getter = getter;
-        _setter = setter;
-    }
-
-    public async Task OnClickAsync()
-    {
-
-    }
-}
-
 // public abstract class ItemRootNode : OpenEditorNode
 // {
 //     
@@ -284,13 +261,106 @@ public async Task OnClickAsync()
 //     }
 // }
 
+public class UniversalNode : OpenEditorNode
+{
+    private IDialogService _dialogService;
+
+    public UniversalNode(IDialogService dialogService,
+        Type? editorType, string title, string? icon = null, Action<EditorPageViewModel>? onPageLoad = null)
+        : base(title, editorType, icon ?? "", onPageLoad)
+    {
+        _dialogService = dialogService;
+    }
+
+    public async Task ResaveAsFile()
+    {
+        if (DataManager.GetDataModStatus(DataManager.DATA_PATH, "Universal", DataManager.DATA_EXT) ==
+            DataManager.ModStatus.Base)
+        {
+            await MessageBoxWindowView.Show(_dialogService, "Universal data must have saved edits first!", "Error",
+                MessageBoxWindowView.MessageBoxButtons.Ok);
+            return;
+        }
+
+        DataManager.SaveData(DataManager.Instance.UniversalEvent, DataManager.DATA_PATH, "Universal",
+            DataManager.DATA_EXT, DataManager.SavePolicy.File);
+
+        await MessageBoxWindowView.Show(_dialogService, "Universal is now saved as a file.", "Complete",
+            MessageBoxWindowView.MessageBoxButtons.Ok);
+    }
+
+    public async Task ResaveAsDiff()
+    {
+        if (DataManager.GetDataModStatus(DataManager.DATA_PATH, "Universal", DataManager.DATA_EXT) ==
+            DataManager.ModStatus.Base)
+        {
+            await MessageBoxWindowView.Show(_dialogService, "Universal data must have saved edits first!", "Error",
+                MessageBoxWindowView.MessageBoxButtons.Ok);
+            return;
+        }
+
+        //you can't make a diff for the base game!
+        DataManager.SaveData(DataManager.Instance.UniversalEvent, DataManager.DATA_PATH, "Universal",
+            DataManager.DATA_EXT, DataManager.SavePolicy.Diff);
+
+        if (DataManager.GetDataModStatus(DataManager.DATA_PATH, "Universal", DataManager.DATA_EXT) ==
+            DataManager.ModStatus.Base)
+            await MessageBoxWindowView.Show(_dialogService, "Modded Universal was identical to base. Unneeded patch removed.", "Complete",
+                MessageBoxWindowView.MessageBoxButtons.Ok);
+        else
+            await MessageBoxWindowView.Show(_dialogService, "Universal is now saved as a patch.", "Complete",
+                MessageBoxWindowView.MessageBoxButtons.Ok);
+    }
+}
+
 public class DataRootNode : OpenEditorNode
 {
     public DataManager.DataType DataType { get; }
 
     private readonly NodeFactory _nodeFactory;
     private readonly IDialogService _dialogService;
-
+    public Action OnReload;
+    
+    public void Reload()
+    {
+        OnReload?.Invoke(); 
+    }
+    
+    public async Task ReIndexAsync()
+    {
+        await Task.Run(() =>
+        {
+            lock (GameBase.lockObj)
+            {
+                DevHelper.RunIndexing(DataType);
+                DevHelper.RunExtraIndexing(DataType);
+                DataManager.Instance.LoadIndex(DataType);
+                DataManager.Instance.LoadUniversalIndices();
+                DataManager.Instance.ClearCache(DataType);
+                DiagManager.Instance.DevEditor.ReloadData(DataType);
+                Reload();
+            }
+        });
+    }
+    
+    public async Task ResaveAllAsync(bool asDiff)
+    {
+        await Task.Run(() =>
+        {
+            lock (GameBase.lockObj)
+            {
+                DevHelper.Resave(DataType, asDiff);
+                DevHelper.RunIndexing(DataType);
+                DevHelper.RunExtraIndexing(DataType);
+                DataManager.Instance.LoadIndex(DataType);
+                DataManager.Instance.LoadUniversalIndices();
+                DataManager.Instance.ClearCache(DataType);
+                DiagManager.Instance.DevEditor.ReloadData(DataType);
+                Reload();
+            }
+        });
+    }
+    
     public DataRootNode(NodeFactory nodeFactory, IDialogService dialogService, DataManager.DataType dataType,
         Type? editorType, string title, string? icon = null, Action<EditorPageViewModel>? onPageLoad = null)
         : base(title, editorType, icon ?? "", onPageLoad)
@@ -311,15 +381,18 @@ protected override int GetHashCodeCore()
     {
         return EditorType.GetHashCode() ^ DataType.GetHashCode();
     }
+    
+    
 
     public async Task ResaveItemAsFile(string key)
     {
         if (DataManager.GetEntryDataModStatus(key, DataType.ToString()) == DataManager.ModStatus.Base)
         {
-            await MessageBoxWindowView.Show(_dialogService, string.Format("{0} must have saved edits first!", key), "Error", MessageBoxWindowView.MessageBoxButtons.Ok);
+            await MessageBoxWindowView.Show(_dialogService, string.Format("{0} must have saved edits first!", key),
+                "Error", MessageBoxWindowView.MessageBoxButtons.Ok);
             return;
         }
-    
+
         lock (GameBase.lockObj)
         {
             var entry = DataRegistry.Map[DataType];
@@ -327,37 +400,44 @@ public async Task ResaveItemAsFile(string key)
             DataManager.Instance.ContentResaved(DataType, key, data, false);
             string newName = DataManager.Instance.DataIndices[DataType].Get(key).GetLocalString(true);
         }
-    
-        await MessageBoxWindowView.Show(_dialogService, string.Format("{0} is now saved as a file.", key), "Complete", MessageBoxWindowView.MessageBoxButtons.Ok);
+
+        await MessageBoxWindowView.Show(_dialogService, string.Format("{0} is now saved as a file.", key), "Complete",
+            MessageBoxWindowView.MessageBoxButtons.Ok);
     }
-    
+
     public async Task ResaveItemAsPatch(string key)
     {
         var modStatus = DataManager.GetEntryDataModStatus(key, DataType.ToString());
-    
+
         if (modStatus == DataManager.ModStatus.Base)
         {
-            await MessageBoxWindowView.Show(_dialogService, string.Format("{0} must have saved edits first!", key), "Error", MessageBoxWindowView.MessageBoxButtons.Ok);
+            await MessageBoxWindowView.Show(_dialogService, string.Format("{0} must have saved edits first!", key),
+                "Error", MessageBoxWindowView.MessageBoxButtons.Ok);
             return;
         }
-    
+
         if (modStatus == DataManager.ModStatus.Added)
         {
-            await MessageBoxWindowView.Show(_dialogService, string.Format("{0} is newly added in this mod and cannot be saved as patch.", key), "Error", MessageBoxWindowView.MessageBoxButtons.Ok);
+            await MessageBoxWindowView.Show(_dialogService,
+                string.Format("{0} is newly added in this mod and cannot be saved as patch.", key), "Error",
+                MessageBoxWindowView.MessageBoxButtons.Ok);
             return;
         }
-    
+
         lock (GameBase.lockObj)
         {
             var entry = DataRegistry.Map[DataType];
             IEntryData data = entry.GetEntry(key);
             DataManager.Instance.ContentResaved(DataType, key, data, true);
         }
-    
+
         if (DataManager.GetEntryDataModStatus(key, DataType.ToString()) == DataManager.ModStatus.Base)
-            await MessageBoxWindowView.Show(_dialogService, string.Format("Modded {0} was identical to base. Unneeded patch removed.", key), "Complete", MessageBoxWindowView.MessageBoxButtons.Ok);
+            await MessageBoxWindowView.Show(_dialogService,
+                string.Format("Modded {0} was identical to base. Unneeded patch removed.", key), "Complete",
+                MessageBoxWindowView.MessageBoxButtons.Ok);
         else
-            await MessageBoxWindowView.Show(_dialogService, string.Format("{0} is now saved as a patch.", key), "Complete", MessageBoxWindowView.MessageBoxButtons.Ok);
+            await MessageBoxWindowView.Show(_dialogService, string.Format("{0} is now saved as a patch.", key),
+                "Complete", MessageBoxWindowView.MessageBoxButtons.Ok);
     }
     
     
@@ -367,19 +447,21 @@ public async Task ResaveItemAsPatch(string key)
 public class DataItemNode : OpenEditorNode
 {
     public string ItemKey { get; }
-    
-    public DataItemNode(string itemKey, Type? editorType, string? title, string? icon = null, Action<EditorPageViewModel>? onPageLoad = null)
+
+    public DataItemNode(string itemKey, Type? editorType, string? title, string? icon = null,
+        Action<EditorPageViewModel>? onPageLoad = null)
         : base(title ?? "", editorType, icon ?? "", onPageLoad)
     {
         ItemKey = itemKey;
     }
-    
+
     protected override bool EqualsCore(NodeBase other)
     {
         if (other is not DataItemNode node)
             return false;
         return ItemKey == node.ItemKey && EditorType == node.EditorType;
     }
+
     protected override int GetHashCodeCore()
     {
         return EditorType.GetHashCode() ^ ItemKey.GetHashCode();
@@ -389,25 +471,27 @@ protected override int GetHashCodeCore()
 // SpriteRootNode have additional properties like mass exporting
 public class SpriteRootNode : OpenEditorNode
 {
-    private readonly ISpriteRootOperationStrategy _strategy;
-    
+    protected ISpriteRootOperationStrategy _strategy;
+
     public readonly GraphicsManager.AssetType AssetType;
 
-    
+
     public ReactiveCommand<Unit, Unit> MassExportCommand { get; }
+
     public ReactiveCommand<Unit, Unit> MassImportCommand { get; }
     // public ReactiveCommand<DataItemNode, Unit> ExportCommand { get; }
     // public ReactiveCommand<Unit, Unit> ImportCommand { get; }
     // public ReactiveCommand<Unit, Unit> ReImportCommand { get; }
 
     private string _cachedPath;
+
     public string CachedPath
     {
         get => _cachedPath;
         set => this.RaiseAndSetIfChanged(ref _cachedPath, value);
     }
 
-    
+
     public SpriteRootNode(
         IDialogService dialogService,
         NodeFactory nodeFactory,
@@ -421,16 +505,10 @@ public SpriteRootNode(
         // _dialogService = dialogService;
         // _nodeFactory = nodeFactory;
 
-        if (AssetType == GraphicsManager.AssetType.Tile)
-        {
-            _strategy = new SpriteRootTileStrategy(dialogService, nodeFactory, this);
-        }
-        else
-        {
-            _strategy = new SpriteRootAssetTypeStrategy(dialogService, nodeFactory, this);
-            
-        }
-        
+
+        _strategy = CreateStrategy(dialogService);
+        // _strategy = new SpriteRootTileStrategy(dialogService, nodeFactory, this);
+
         MassExportCommand = ReactiveCommand.CreateFromTask(MassExportAsync);
         MassImportCommand = ReactiveCommand.CreateFromTask(MassImportAsync);
         // ExportCommand = ReactiveCommand.CreateFromTask<DataItemNode>(ExportSpriteAsync);
@@ -438,6 +516,9 @@ public SpriteRootNode(
         // ReImportCommand = ReactiveCommand.CreateFromTask(ReImportSpriteAsync);
     }
 
+    protected virtual ISpriteRootOperationStrategy CreateStrategy(IDialogService dialogService)
+        => new SpriteRootAssetTypeStrategy(dialogService, this);
+
     public async Task AddItem()
     {
         await _strategy.ImportAsync();
@@ -474,6 +555,57 @@ public async Task MassImportAsync()
     // }
 }
 
+public class SpriteTileRootNode : SpriteRootNode
+{
+    private readonly IDialogService _dialogService;
+    public ReactiveCommand<Unit, Unit> ReIndexCommand { get; }
+
+
+    public SpriteTileRootNode(IDialogService dialogService, NodeFactory nodeFactory, Type? editorType, string title,
+        string? icon = null, Action<EditorPageViewModel>? onPageLoad = null)
+        : base(dialogService, nodeFactory, GraphicsManager.AssetType.Tile, editorType, title, icon, onPageLoad)
+    {
+        _dialogService = dialogService;
+
+        ReIndexCommand = ReactiveCommand.CreateFromTask(ReIndexAsync);
+    }
+
+    protected override ISpriteRootOperationStrategy CreateStrategy(IDialogService dialogService)
+        => new SpriteRootTileStrategy(dialogService, this);
+
+
+    public async Task ReIndexAsync()
+    {
+        try
+        {
+            _reIndex();
+        }
+        catch (Exception ex)
+        {
+            DiagManager.Instance.LogError(ex, false);
+            await MessageBoxWindowView.Show(_dialogService, "Error when reindexing.\n\n" + ex.Message, "Reindex Failed",
+                MessageBoxWindowView.MessageBoxButtons.Ok);
+            return;
+        }
+    }
+
+    private void _reIndex()
+    {
+        DevForm.ExecuteOrPend(() => { _tryReIndex(); });
+    }
+
+    private void _tryReIndex()
+    {
+        lock (GameBase.lockObj)
+        {
+            GraphicsManager.RebuildIndices(GraphicsManager.AssetType.Tile);
+            GraphicsManager.ClearCaches(GraphicsManager.AssetType.Tile);
+
+            DiagManager.Instance.LogInfo("All files re-indexed.");
+        }
+    }
+}
+
 // public class ModRootNode : ItemRootNode
 // {
 //     private readonly NodeFactory _nodeFactory;
@@ -522,6 +654,7 @@ public async Task MassImportAsync()
 public class PageNode : NodeBase
 {
     private readonly NodeFactory _nodeFactory;
+
     // private readonly IDialogService _dialogService;
     public EditorPageViewModel Page { get; }
     public PageNode? Parent { get; set; }
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/SpriteRootAssetTypeStrategy.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/SpriteRootAssetTypeStrategy.cs
index fbe48d20..41dbd731 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/SpriteRootAssetTypeStrategy.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/SpriteRootAssetTypeStrategy.cs
@@ -65,26 +65,25 @@ private bool _massExport(string currentPath, GraphicsManager.AssetType assetType
         return success;
     }
 
-    public SpriteRootAssetTypeStrategy(IDialogService dialogService, NodeFactory nodeFactory, SpriteRootNode spriteRootNode)
+    public SpriteRootAssetTypeStrategy(IDialogService dialogService, SpriteRootNode spriteRootNode)
     {
         _dialogService = dialogService;
-        _nodeFactory = nodeFactory;
         _spriteRootNode = spriteRootNode;
     }
 
-    public async Task<NodeBase> AddAsync()
-    {
-        
-        Console.WriteLine("TODO: Resolve this later...");
-        var vm = new RenameWindowViewModel();
-        bool result = await _dialogService.ShowDialogAsync<RenameWindowViewModel, bool>(
-            vm, "Add sprite ID");
-
-        if (!result) return null;
-
-        return _nodeFactory.CreateDataItemNode<DevEditPageViewModel>(
-            vm.Name, vm.Name + ":", "Icons.PaintBrushFill");
-    }
+    // public async Task<NodeBase> AddAsync()
+    // {
+    //     
+    //     Console.WriteLine("TODO: Resolve this later...");
+    //     var vm = new RenameWindowViewModel();
+    //     bool result = await _dialogService.ShowDialogAsync<RenameWindowViewModel, bool>(
+    //         vm, "Add sprite ID");
+    //
+    //     if (!result) return null;
+    //
+    //     return _nodeFactory.CreateDataItemNode<DevEditPageViewModel>(
+    //         vm.Name, vm.Name + ":", "Icons.PaintBrushFill");
+    // }
 
     public async Task DeleteAsync(DataItemNode node)
     {
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/SpriteRootTileStrategy.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/SpriteRootTileStrategy.cs
index 482b5223..29f99ccf 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/SpriteRootTileStrategy.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/SpriteRootTileStrategy.cs
@@ -20,27 +20,16 @@ public class SpriteRootTileStrategy : ISpriteRootOperationStrategy
     private int _cachedSize;
 
     private readonly IDialogService _dialogService;
-    private readonly NodeFactory _nodeFactory;
+    // private readonly NodeFactory _nodeFactory;
     private readonly SpriteRootNode _spriteRootNode;
 
-    public SpriteRootTileStrategy(IDialogService dialogService, NodeFactory nodeFactory, SpriteRootNode spriteRootNode)
+    public SpriteRootTileStrategy(IDialogService dialogService, SpriteRootNode spriteRootNode)
     {
         _dialogService = dialogService;
-        _nodeFactory = nodeFactory;
         _spriteRootNode = spriteRootNode;
     }
 
-    public async Task<NodeBase> AddAsync()
-    {
-        var vm = new RenameWindowViewModel();
-        bool result = await _dialogService.ShowDialogAsync<RenameWindowViewModel, bool>(
-            vm, "Add sprite ID");
-
-        if (!result) return null;
 
-        return _nodeFactory.CreateDataItemNode<DevEditPageViewModel>(
-            vm.Name, vm.Name + ":", "Icons.PaintBrushFill");
-    }
 
     public async Task DeleteAsync(DataItemNode node)
     {
@@ -266,19 +255,19 @@ await MessageBoxWindowView.Show(_dialogService,
         }
     }
 
-    private void _reloadFullList()
-    {
-        lock (GameBase.lockObj)
-        {
-            _spriteRootNode.SubNodes.Clear();
-            foreach (string name in GraphicsManager.TileIndex.Nodes.Keys)
-            {
-                _spriteRootNode.SubNodes.Add(
-                    _nodeFactory.CreateDataItemNode<DevEditPageViewModel>(name, name + ":", _spriteRootNode.AssetType.GetIcon())
-                );
-            }
-        }
-    }
+    // private void _reloadFullList()
+    // {
+    //     lock (GameBase.lockObj)
+    //     {
+    //         _spriteRootNode.SubNodes.Clear();
+    //         foreach (string name in GraphicsManager.TileIndex.Nodes.Keys)
+    //         {
+    //             _spriteRootNode.SubNodes.Add(
+    //                 _nodeFactory.CreateDataItemNode<DevEditPageViewModel>(name, name + ":", _spriteRootNode.AssetType.GetIcon())
+    //             );
+    //         }
+    //     }
+    // }
 
 
     private void _import(string currentPath, int tileSize)
@@ -286,7 +275,7 @@ private void _import(string currentPath, int tileSize)
         DevForm.ExecuteOrPend(() => { _tryImport(currentPath, tileSize); });
 
         //recompute
-        _reloadFullList();
+        // _reloadFullList();
     }
 
     private void _tryImport(string currentPath, int tileSize)
@@ -321,7 +310,7 @@ private void _massImport(string currentPath, int tileSize)
         DevForm.ExecuteOrPend(() => { _tryMassImport(currentPath, tileSize); });
 
         //recompute
-        _reloadFullList();
+        // _reloadFullList();
     }
 
     private void _tryMassImport(string currentPath, int tileSize)
diff --git a/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml b/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml
index 64ea2b13..65f9afe6 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml
@@ -142,12 +142,12 @@
                             <DataTemplate x:Key="TreeDataGridNodeBaseTemplate" DataType="vm:NodeBase">
                                 <ContentControl Content="{Binding}">
                                     <ContentControl.DataTemplates>
-                                        <DataTemplate DataType="vm:ItemRootNode">
-                                            <Grid ColumnDefinitions="*, 32" Height="16" Margin="8, 0, 0, 0">
-                                                <v:IconText Grid.Column="0" Grid.ColumnSpan="2"
-                                                            Text="{Binding Title}"
-                                                            Icon="{Binding Icon}"
-                                                            IconSize="12" />
+                                        <!-- <DataTemplate DataType="vm:ItemRootNode"> -->
+                                        <!--     <Grid ColumnDefinitions="*, 32" Height="16" Margin="8, 0, 0, 0"> -->
+                                        <!--         <v:IconText Grid.Column="0" Grid.ColumnSpan="2" -->
+                                        <!--                     Text="{Binding Title}" -->
+                                        <!--                     Icon="{Binding Icon}" -->
+                                        <!--                     IconSize="12" /> -->
 
                                                 <!-- <Button Grid.Column="1" HorizontalAlignment="Left" -->
                                                 <!--         Classes="icon_button" -->
@@ -161,8 +161,8 @@
                                                 <!--           Width="12" Height="12" -->
                                                 <!--           Data="{StaticResource Icons.Plus}" /> -->
                                                 <!-- </Button> -->
-                                            </Grid>
-                                        </DataTemplate>
+                                        <!--     </Grid> -->
+                                        <!-- </DataTemplate> -->
 
                                         <DataTemplate DataType="vm:DataItemNode">
                                             <Grid ColumnDefinitions="*,32" Height="16" Margin="8, 0, 0, 0">
diff --git a/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml.cs b/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml.cs
index adfc3508..a526bfbe 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml.cs
@@ -561,40 +561,17 @@ private void ShowDataItemNodeMenu(TreeDataGridRow current, DataItemNode node, Da
         
         AttachAndOpenMenu(current, contextMenu, e);
     }
-
-    private void ShowSpriteItemNodeMenu(TreeDataGridRow current, DataItemNode node, SpriteRootNode parentNode,
-        ContextRequestedEventArgs e)
+    
+    private void ShowRootNodeMenu(TreeDataGridRow current, DataRootNode root, ContextRequestedEventArgs e)
     {
-        // var contextMenu = ContextMenuHelper.CreateDataItemMenu(parentNode, node.ItemKey);
-
-        // var menu = new ContextMenu
-        // {
-        //     Items =
-        //     {
-        //         new MenuItem { Header = "Export", Command = parentNode.ExportCommand, CommandParameter = node, Icon = App.CreateMenuIcon("Icons.ExportFill") },
-        //         new Separator(),
-        //         new MenuItem { Header = "Delete", Command = parentNode.DeleteCommand, CommandParameter = node, Icon =  App.CreateMenuIcon("Icons.TrashFill") }
-        //     }
-        // };
-
-        // AttachAndOpenMenu(current, menu, e);
+        var menu = ContextMenuHelper.CreateDataRootMenu(root);
+        AttachAndOpenMenu(current, menu, e);
     }
-
-    private void ShowRootNodeMenu(TreeDataGridRow current, DataRootNode root, ContextRequestedEventArgs e)
+    
+    private void ShowUniversalNodeMenu(TreeDataGridRow current, UniversalNode node, ContextRequestedEventArgs e)
     {
-        // var menu = new ContextMenu
-        // {
-        //     Items =
-        //     {
-        //         new MenuItem { Header = "Re-Index", Command = root.ReIndexCommand, Icon = App.CreateMenuIcon("Icons.ListNumbersFill") },
-        //         new MenuItem { Header = "Resave all as File", Command = root.ResaveAllAsFileCommand, Icon = App.CreateMenuIcon("Icons.FileFill") },
-        //         new MenuItem { Header = "Resave all as Diff", Command = root.ResaveAllAsDiffCommand, Icon = App.CreateMenuIcon("Icons.PlusMinusFill") },
-        //         new Separator(),
-        //         new MenuItem { Header = "Add", Command = root.AddCommand, Icon = App.CreateMenuIcon("Icons.Plus") }
-        //     }
-        // };
-        //
-        // AttachAndOpenMenu(current, menu, e);
+        var menu = ContextMenuHelper.CreateUniversalRootMenu(node);
+        AttachAndOpenMenu(current, menu, e);
     }
     
     private void ShowSpriteRootNodeMenu(TreeDataGridRow current, SpriteRootNode root, ContextRequestedEventArgs e)
@@ -614,14 +591,8 @@ private void ShowSpriteRootNodeMenu(TreeDataGridRow current, SpriteRootNode root
      //        }
      //    };
 
-        var menu = ContextMenuHelper.CreateSpriteItemMenu(root);
-
-        if (root is SpriteTileRootNode node)
-        {
-            menu.Items.Add(new Separator());
-            menu.Items.Add(new MenuItem { Header = "Re-Index", Command = node.ReIndexCommand, Icon = App.CreateMenuIcon("Icons.ListNumbersFill")});
-        };
-
+        var menu = ContextMenuHelper.CreateSpriteRootMenu(root);
+        
         AttachAndOpenMenu(current, menu, e);
     }
 
@@ -673,9 +644,13 @@ private void LeftTreeDataGrid_OnContextRequested(object? sender, ContextRequeste
             //     ShowSpriteItemNodeMenu(row, itemNode, spriteRoot, e);
             //     break;
             //
-            // case DataRootNode rootNode:
-            //     ShowRootNodeMenu(row, rootNode, e);
-            //     break;
+            case DataRootNode rootNode:
+                ShowRootNodeMenu(row, rootNode, e);
+                break;
+            
+            case UniversalNode universalNode:
+                ShowUniversalNodeMenu(row, universalNode, e);
+                break;
     
             case SpriteRootNode spriteRoot:
                 ShowSpriteRootNodeMenu(row, spriteRoot, e);
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/DataListPageView.axaml.cs b/RogueEssence.Editor.Avalonia/Views/New/Editors/DataListPageView.axaml.cs
index 71b9f6fc..dcd2f2c2 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/Editors/DataListPageView.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/New/Editors/DataListPageView.axaml.cs
@@ -4,6 +4,7 @@
 using Avalonia.Input;
 using Avalonia.Markup.Xaml;
 using Avalonia.Threading;
+using RogueEssence.Data;
 using RogueEssence.Dev.Utility;
 using RogueEssence.Dev.ViewModels;
 
@@ -33,6 +34,9 @@ private void DataListPageListBox_OnContextRequested(object sender, ContextReques
             listBox.DataContext is not DataListPageViewModel vm)
             return;
 
+        if (vm.DataType == DataManager.DataType.AutoTile) 
+            return;
+        
         var contextMenu = ContextMenuHelper.CreateDataItemMenu(vm.Node, entry.Key);
         contextMenu.Open(this);
     }
diff --git a/RogueEssence/Data/DataManager.cs b/RogueEssence/Data/DataManager.cs
index 8ea94560..f6f9765c 100644
--- a/RogueEssence/Data/DataManager.cs
+++ b/RogueEssence/Data/DataManager.cs
@@ -101,7 +101,7 @@ public static Type GetClassType(this DataManager.DataType dataType)
             DataManager.DataType.Item => "Icons.JarLabelFill",
             DataManager.DataType.Intrinsic => "Icons.SwordFill",
             DataManager.DataType.Status => "Icons.HeartFill",
-            DataManager.DataType.MapStatus => "Icons.HeartFill",
+            DataManager.DataType.MapStatus => "Icons.WarningFill",
             DataManager.DataType.Terrain => "Icons.MountainsFill",
             DataManager.DataType.Tile => "Icons.SquaresFourFill",
             DataManager.DataType.Zone => "Icons.StairsFill",
@@ -109,7 +109,7 @@ public static Type GetClassType(this DataManager.DataType dataType)
             DataManager.DataType.AutoTile => "Icons.SquaresFourFill",
             DataManager.DataType.Element => "Icons.LightningFill",
             DataManager.DataType.GrowthGroup => "Icons.TrendUpFill",
-            DataManager.DataType.SkillGroup => "Icons.ListFill",
+            DataManager.DataType.SkillGroup => "Icons.WindFill",
             DataManager.DataType.AI => "Icons.BrainFill",
             DataManager.DataType.Rank => "Icons.BinaryFill",
             DataManager.DataType.Skin => "Icons.SparkleFill",

From 7f47736e2c046f7063293bb4cb117add98cea7ad Mon Sep 17 00:00:00 2001
From: Kace <41309226+DoubleTrio@users.noreply.github.com>
Date: Fri, 15 May 2026 15:26:20 -0400
Subject: [PATCH 31/51] mod pages finished

---
 RogueEssence.Editor.Avalonia/App.axaml.cs     |   7 +-
 .../EditorContext/NodeFactory.cs              |  10 +
 .../RogueEssence.Editor.Avalonia.csproj       |   4 +
 .../ViewModels/New/DevFormViewModel.cs        |   2 +-
 .../New/Editors/DataListPageViewModel.cs      |   3 +-
 .../New/Editors/ModConfigPageViewModel.cs     | 276 ++++++++++++++++
 .../New/Editors/ModEditPageViewModel.cs       |  27 --
 .../New/Editors/ModListPageViewModel.cs       | 298 ++++++++++++++++++
 .../ViewModels/New/Nodes/NodeBase.cs          |  47 ++-
 .../Views/New/Editors/DataListPageView.axaml  |  23 +-
 .../Views/New/Editors/ModConfigPageView.axaml |  93 ++++++
 .../New/Editors/ModConfigPageView.axaml.cs    |  38 +++
 .../Views/New/Editors/ModEditPageView.axaml   |  12 -
 .../New/Editors/ModEditPageView.axaml.cs      |  13 -
 .../Views/New/Editors/ModListPageView.axaml   |  81 +++++
 .../New/Editors/ModListPageView.axaml.cs      |  22 ++
 16 files changed, 891 insertions(+), 65 deletions(-)
 create mode 100644 RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ModConfigPageViewModel.cs
 delete mode 100644 RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ModEditPageViewModel.cs
 create mode 100644 RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ModListPageViewModel.cs
 create mode 100644 RogueEssence.Editor.Avalonia/Views/New/Editors/ModConfigPageView.axaml
 create mode 100644 RogueEssence.Editor.Avalonia/Views/New/Editors/ModConfigPageView.axaml.cs
 delete mode 100644 RogueEssence.Editor.Avalonia/Views/New/Editors/ModEditPageView.axaml
 delete mode 100644 RogueEssence.Editor.Avalonia/Views/New/Editors/ModEditPageView.axaml.cs
 create mode 100644 RogueEssence.Editor.Avalonia/Views/New/Editors/ModListPageView.axaml
 create mode 100644 RogueEssence.Editor.Avalonia/Views/New/Editors/ModListPageView.axaml.cs

diff --git a/RogueEssence.Editor.Avalonia/App.axaml.cs b/RogueEssence.Editor.Avalonia/App.axaml.cs
index df61615a..925136b3 100644
--- a/RogueEssence.Editor.Avalonia/App.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/App.axaml.cs
@@ -45,6 +45,7 @@ public static void AddCommonServices(this IServiceCollection collection)
             collection.AddTransient<DataItemNode>();
             collection.AddTransient<OpenEditorNode>();
             collection.AddTransient<PageNode>();
+            collection.AddTransient<ModItemNode>();
 
             // TODO: remove?
             // collection.AddSingleton<Func<Type, NodeBase>>(x => type => type switch
@@ -65,7 +66,8 @@ public static void AddCommonServices(this IServiceCollection collection)
             collection.AddTransient<GroundEditorPageViewModel>();
             collection.AddTransient<RandomInfoPageViewModel>();
             collection.AddTransient<SpritePageViewModel>();
-            collection.AddTransient<ModEditPageViewModel>();
+            collection.AddTransient<ModListPageViewModel>();
+            collection.AddTransient<ModConfigPageViewModel>();
             collection.AddTransient<DevEditPageViewModel>();
             collection.AddTransient<SpeciesEditPageViewModel>();
             collection.AddTransient<DataListPageViewModel>();
@@ -110,7 +112,8 @@ public static void RegisterPages(this IServiceProvider provider)
             pageFactory.Register<GroundEditorPageViewModel>();
             pageFactory.Register<RandomInfoPageViewModel>();
             pageFactory.Register<SpritePageViewModel>();
-            pageFactory.Register<ModEditPageViewModel>();
+            pageFactory.Register<ModListPageViewModel>();
+            pageFactory.Register<ModConfigPageViewModel>();
             pageFactory.Register<DevEditPageViewModel>();
             pageFactory.Register<SpeciesEditPageViewModel>();
             pageFactory.Register<DataListPageViewModel>();
diff --git a/RogueEssence.Editor.Avalonia/EditorContext/NodeFactory.cs b/RogueEssence.Editor.Avalonia/EditorContext/NodeFactory.cs
index 114e8b97..669e9144 100644
--- a/RogueEssence.Editor.Avalonia/EditorContext/NodeFactory.cs
+++ b/RogueEssence.Editor.Avalonia/EditorContext/NodeFactory.cs
@@ -87,6 +87,16 @@ public DataItemNode CreateDataItemNode<TEditor>(
         where TEditor : EditorPageViewModel
         => Create<DataItemNode>(key, typeof(TEditor), title, icon, CreateCallback(onOpen));
 
+    
+    public ModItemNode CreatModItemNode<TEditor>(
+        string path,
+        string title,
+        string? icon = null,
+        Action<TEditor>? onOpen = null)
+        where TEditor : EditorPageViewModel
+        => Create<ModItemNode>(path, typeof(TEditor), title, icon, CreateCallback(onOpen));
+
+    
     // _serviceProvider.GetService<IDialogService>()
     public PageNode CreatePageNode(EditorPageViewModel childPage, PageNode? parentNode = null)
         => new PageNode(this, childPage, parentNode);
diff --git a/RogueEssence.Editor.Avalonia/RogueEssence.Editor.Avalonia.csproj b/RogueEssence.Editor.Avalonia/RogueEssence.Editor.Avalonia.csproj
index 1cbd30cd..1bc45f9a 100644
--- a/RogueEssence.Editor.Avalonia/RogueEssence.Editor.Avalonia.csproj
+++ b/RogueEssence.Editor.Avalonia/RogueEssence.Editor.Avalonia.csproj
@@ -215,6 +215,10 @@
       <DependentUpon>StringEditPageView.axaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
+    <Compile Update="Views\New\Editors\ModConfigPageView.axaml.cs">
+      <DependentUpon>ModConfigPageView.axaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Models\" />
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs
index 61a5b62e..be2a580a 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs
@@ -873,7 +873,7 @@ private void CreateSpriteNode(NodeBase parent)
     
     private void CreateModNode(NodeBase parent)
     {
-        var modRoot = _context.NodeFactory.CreateOpenEditorNode<ModEditPageViewModel>("Mods", "Icons.ScrollFill");
+        var modRoot = _context.NodeFactory.CreateOpenEditorNode<ModListPageViewModel>("Mods", "Icons.ScrollFill");
 
 
         parent.SubNodes.Add(modRoot);
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DataListPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DataListPageViewModel.cs
index e54a04b7..92dbc621 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DataListPageViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DataListPageViewModel.cs
@@ -73,6 +73,7 @@ private void ReloadEntries()
 
     public override void OnPageLoad()
     {
+        base.OnPageLoad();
         ReloadEntries();
         Node.OnReload += ReloadEntries;
 
@@ -221,7 +222,7 @@ private void UpdateVisibleItems(string filter)
     {
         FilteredItems.Clear();
         var strategy = new BeginningTitleFilterStrategy();
-        foreach (var item in Items.Where(e => strategy.Matches(e.Title, filter)))
+        foreach (var item in Items.Where(e => strategy.Matches(e.Title, filter) || strategy.Matches(e.Key, filter)))
             FilteredItems.Add(item);
     }
     
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ModConfigPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ModConfigPageViewModel.cs
new file mode 100644
index 00000000..1d33170d
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ModConfigPageViewModel.cs
@@ -0,0 +1,276 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Threading.Tasks;
+using RogueEssence.Dev.Services;
+using RogueEssence.Dev.Utility;
+using RogueEssence.Dev.Views;
+
+namespace RogueEssence.Dev.ViewModels;
+
+public class ModConfigPageViewModel : EditorPageViewModel
+{
+    public Action OnOKValidAction;
+    
+    private string _path;
+
+    public ModConfigPageViewModel(EditorContext context, ModItemNode node,
+        Action<EditorPageViewModel> onPageOpen = null) : base(context, node, onPageOpen)
+    {
+        _path = node.Path;
+    }
+
+    public void LoadDataFromPath()
+    {
+        // string fullPath = PathMod.FromApp(PathMod.Quest.Path);
+        // ModHeader resultHeader = new ModHeader(PathMod.Quest.Path, vm.Name.Trim(), vm.Author.Trim(), vm.Description.Trim(), Text.Sanitize(vm.Namespace).ToLower(), Guid.Parse(vm.UUID), Version.Parse(vm.Version), Version.Parse(vm.GameVersion), (PathMod.ModType)vm.ChosenModType, vm.GetRelationshipArray());
+        // PathMod.SaveModDetails(fullPath, resultHeader);
+
+
+        ModHeader header = PathMod.GetModDetails(PathMod.FromApp(_path));
+        Name = header.Name;
+        Namespace = header.Namespace;
+        Author = header.Author;
+        Description = header.Description;
+        UUID = header.UUID.ToString().ToUpper();
+        Vers = header.Version.ToString();
+        GameVersion = header.GameVersion.ToString();
+
+        for (int ii = 0; ii < (int)PathMod.ModType.Count; ii++)
+            ModTypes.Add(((PathMod.ModType)ii).ToLocal());
+        ChosenModType = (int)header.ModType;
+
+        Relationships =
+            new CollectionBoxViewModel(_context.DialogService, new StringConv(typeof(RelatedMod), new object[0]));
+        Relationships.OnEditItem += Relationships_EditItem;
+        Relationships.LoadFromList(header.Relationships);
+    }
+
+
+    public override void OnPageLoad()
+    {
+        base.OnPageLoad();
+        LoadDataFromPath();
+    }
+
+
+    // public ModConfigWindowViewModel(IDialogService dialogService, ModHeader header)
+    // {
+    //     Name = header.Name;
+    //     Namespace = header.Namespace;
+    //     Author = header.Author;
+    //     Description = header.Description;
+    //     UUID = header.UUID.ToString().ToUpper();
+    //     Version = header.Version.ToString();
+    //     GameVersion = header.GameVersion.ToString();
+    //
+    //     ModTypes = new ObservableCollection<string>();
+    //     for (int ii = 0; ii < (int)PathMod.ModType.Count; ii++)
+    //         ModTypes.Add(((PathMod.ModType)ii).ToLocal());
+    //     ChosenModType = (int)header.ModType;
+    //
+    //     DevForm form = (DevForm)DiagManager.Instance.DevEditor;
+    //     Relationships = new CollectionBoxViewModel(dialogService, new StringConv(typeof(RelatedMod), new object[0]));
+    //     Relationships.OnEditItem += Relationships_EditItem;
+    //     Relationships.LoadFromList(header.Relationships);
+    // }
+
+    private string name;
+
+    public string Name
+    {
+        get => name;
+        set => this.SetIfChanged(ref name, value);
+    }
+
+    private string author;
+
+    public string Author
+    {
+        get => author;
+        set => this.SetIfChanged(ref author, value);
+    }
+
+    private string description;
+
+    public string Description
+    {
+        get => description;
+        set => this.SetIfChanged(ref description, value);
+    }
+
+    private string editNamespace;
+
+    public string Namespace
+    {
+        get => editNamespace;
+        set => this.SetIfChanged(ref editNamespace, value);
+    }
+
+    private string uuid;
+
+    public string UUID
+    {
+        get => uuid;
+        set => this.SetIfChanged(ref uuid, value);
+    }
+
+
+    private string vers;
+
+    public string Vers
+    {
+        get => vers;
+        set => this.SetIfChanged(ref vers, value);
+    }
+
+
+    private string gameVersion;
+
+    public string GameVersion
+    {
+        get => gameVersion;
+        set => this.SetIfChanged(ref gameVersion, value);
+    }
+
+    public ObservableCollection<string> ModTypes { get; } = new();
+
+    private int chosenModType;
+
+    public int ChosenModType
+    {
+        get => chosenModType;
+        set => this.SetIfChanged(ref chosenModType, value);
+    }
+
+    public CollectionBoxViewModel Relationships { get; set; }
+
+    public void Relationships_EditItem(int index, object element, bool advancedEdit,
+        CollectionBoxViewModel.EditElementOp op)
+    {
+        EditorPageViewModel pageViewModel = this;
+
+        string elementName = "Relationship[" + index + "]";
+        string title =
+            DataEditor.GetWindowTitle("Relationship", elementName, element, typeof(RelatedMod), new object[0]);
+
+        NodeBase node =
+            _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(elementName,
+                pageViewModel.Node.Icon, pageViewModel.Node);
+        pageViewModel.Node.AddNodeIfNotExists(node);
+        NodeHelper.ExpandParents(node, true);
+
+        ReflectedDataPageViewModel newEditor = _context.PageFactory.CreatePage<ReflectedDataPageViewModel>(node);
+
+        newEditor.SetPageTitle(elementName, pageViewModel.Node.Icon);
+        newEditor.OnLoadAction = panel =>
+        {
+            newEditor.SetPageTitle(elementName, pageViewModel.Node.Icon);
+            DataEditor.LoadClassControls(panel, "Relationship", null, elementName, typeof(RelatedMod),
+                new object[0], element, true, new Type[0], advancedEdit);
+        };
+
+        newEditor.OnOKAction = async panel =>
+        {
+            element = DataEditor.SaveClassControls(panel, elementName, typeof(RelatedMod), new object[0],
+                true, new Type[0], advancedEdit);
+
+            bool itemExists = false;
+
+            List<RelatedMod> relations = Relationships.GetList<List<RelatedMod>>();
+            for (int ii = 0; ii < relations.Count; ii++)
+            {
+                if (ii != index)
+                {
+                    if (relations[ii].UUID == ((RelatedMod)element).UUID)
+                        itemExists = true;
+                }
+            }
+
+            if (String.IsNullOrEmpty(((RelatedMod)element).Namespace))
+            {
+                await MessageBoxWindowView.Show(_context.DialogService, "Related mod needs a namespace!",
+                    "Namespace needed.",
+                    MessageBoxWindowView.MessageBoxButtons.Ok);
+                return false;
+            }
+
+            if (itemExists)
+            {
+                await MessageBoxWindowView.Show(_context.DialogService, "Cannot add duplicate entries.",
+                    "Entry with UUID already exists.",
+                    MessageBoxWindowView.MessageBoxButtons.Ok);
+                return false;
+            }
+            else
+            {
+                op(index, element);
+                return true;
+            }
+        };
+        
+        _context.TabEvents.AddChildPage(pageViewModel, newEditor);
+    }
+
+
+    public RelatedMod[] GetRelationshipArray()
+    {
+        List<RelatedMod> relationships = Relationships.GetList<List<RelatedMod>>();
+        return relationships.ToArray();
+    }
+
+    public void btnRegenUUID_Click()
+    {
+        UUID = Guid.NewGuid().ToString().ToUpper();
+    }
+
+
+    public override void OnPageRemoved()
+    {
+        RemoveNodeFromTree();
+        base.OnPageRemoved();
+    }
+
+    public void RemoveNodeFromTree()
+    {
+        Node.Parent?.SubNodes.Remove(Node);
+    }
+    
+    public void Close()
+    {
+        _context.TabEvents.RemoveTab(this);
+        RemoveNodeFromTree();
+    }
+    
+    public async Task<bool> Validate()
+    {
+        var result = false;
+        try
+        {
+            if (String.IsNullOrWhiteSpace(Text.Sanitize(Name)))
+                throw new InvalidOperationException("Invalid Name");
+            if (String.IsNullOrWhiteSpace(Text.Sanitize(Namespace).ToLower()))
+                throw new InvalidOperationException("Invalid Namespace");
+
+            Guid uuid = Guid.Parse(UUID);
+            if (uuid == Guid.Empty)
+                throw new InvalidOperationException("Invalid UUID");
+
+            Version.Parse(Vers);
+            Version.Parse(GameVersion);
+
+            if (ChosenModType < 0 || ChosenModType >= (int)PathMod.ModType.Count)
+                throw new InvalidOperationException("Invalid ModType");
+
+            result = true;
+        }
+        catch (Exception ex)
+        {
+            DiagManager.Instance.LogError(ex, false);
+            await MessageBoxWindowView.Show(_context.DialogService, ex.Message, "Invalid Input",
+                MessageBoxWindowView.MessageBoxButtons.Ok);
+        }
+
+        return result;
+    }
+}
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ModEditPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ModEditPageViewModel.cs
deleted file mode 100644
index e6d1b2f5..00000000
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ModEditPageViewModel.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System;
-
-namespace RogueEssence.Dev.ViewModels;
-
-using Dev.Services;
-
-public class ModEditPageViewModel : EditorPageViewModel
-{
-    // public override string? Title => "Mod Info";
-    
-    // public override bool AddNewTab => true;
-
-    public TestComboBoxViewModel Fruits { get; }
-    
-    public ModEditPageViewModel(EditorContext context, NodeBase node, Action<EditorPageViewModel> onPageOpen = null) : base(context, node, onPageOpen) 
-    {
-       
-        Fruits = new TestComboBoxViewModel();
-    }
-    
-    // public ModInfoEditorViewModel() : base(new PageFactory(new DesignServiceProvider()), new TabEvents(new PageFactory(new DesignServiceProvider())), new DialogService())
-    // {
-    //     // Title = "Dev Control";
-    //     Fruits = new TestComboBoxViewModel();
-    // }
-    
-}
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ModListPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ModListPageViewModel.cs
new file mode 100644
index 00000000..5bc50944
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ModListPageViewModel.cs
@@ -0,0 +1,298 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using ReactiveUI;
+using RogueEssence.Content;
+using RogueEssence.Data;
+using RogueEssence.Dev.Utility;
+using RogueEssence.Dev.Views;
+using RogueEssence.Menu;
+using RogueEssence.Script;
+
+namespace RogueEssence.Dev.ViewModels;
+
+public class ModsEntryViewModel : ViewModelBase
+{
+    private string _name;
+
+    public string Name
+    {
+        get => _name;
+        set => this.RaiseAndSetIfChanged(ref _name, value);
+    }
+
+    private string _editNamespace;
+
+    public string Namespace
+    {
+        get => _editNamespace;
+        set => this.RaiseAndSetIfChanged(ref _editNamespace, value);
+    }
+
+    public string Path;
+
+    public ModsEntryViewModel(string name, string newNamespace, string fullPath)
+    {
+        this._name = name;
+        this._editNamespace = newNamespace;
+        this.Path = fullPath;
+    }
+    
+    public string Display => $"{_editNamespace}: {_name}";
+}
+
+public class ModListPageViewModel : EditorPageViewModel
+{
+    private string _searchFilter = string.Empty;
+
+    public string SearchFilter
+    {
+        get => _searchFilter;
+        set => this.RaiseAndSetIfChanged(ref _searchFilter, value);
+    }
+
+
+    private ModsEntryViewModel? _selectedItem;
+
+    public ModsEntryViewModel? SelectedItem
+    {
+        get => _selectedItem;
+        set => this.RaiseAndSetIfChanged(ref _selectedItem, value);
+    }
+
+
+    public ObservableCollection<ModsEntryViewModel> Items { get; } = new();
+    public ObservableCollection<ModsEntryViewModel> FilteredItems { get; } = new();
+
+    public ObservableCollection<ModsEntryViewModel> EditMenuItems { get; } = new();
+
+
+    private string currentMod;
+
+    public string CurrentMod
+    {
+        get => currentMod;
+        set => this.SetIfChanged(ref currentMod, value);
+    }
+
+    public async void btnSwitch_Click()
+    {
+        //give a pop up warning that the game will be reloaded and wait for confirmation
+        MessageBoxWindowView.MessageBoxResult result = await MessageBoxWindowView.Show(_context.DialogService,
+            $"The game will be reloaded to use content from {SelectedItem.Namespace}.\nClick OK to proceed.", "Are you sure?",
+            MessageBoxWindowView.MessageBoxButtons.OkCancel);
+        if (result == MessageBoxWindowView.MessageBoxResult.Cancel)
+            return;
+
+        DevForm.ExecuteOrPend(doSwitch);
+    }
+
+    private void doSwitch()
+    {
+        //modify and reload
+        lock (GameBase.lockObj)
+        {
+            LuaEngine.Instance.BreakScripts();
+            MenuManager.Instance.ClearMenus();
+            if (!String.IsNullOrEmpty(SelectedItem.Path))
+                GameManager.Instance.SetQuest(PathMod.GetModDetails(PathMod.FromApp(SelectedItem.Path)),
+                    new ModHeader[0] { }, new List<int>() { -1 });
+            else
+                GameManager.Instance.SetQuest(ModHeader.Invalid, new ModHeader[0] { }, new List<int>() { });
+
+            DiagManager.Instance.PrintModSettings();
+            DiagManager.Instance.SaveModSettings();
+        }
+    }
+
+    public ModListPageViewModel(EditorContext context, NodeBase node, Action<EditorPageViewModel> onPageOpen = null) :
+        base(context, node, onPageOpen)
+    {
+    }
+    private void UpdateVisibleItems(string filter)
+    {
+        FilteredItems.Clear();
+        var strategy = new BeginningTitleFilterStrategy();
+        foreach (var item in Items.Where(e => strategy.Matches(e.Name, filter) || strategy.Matches(e.Namespace, filter)))
+            FilteredItems.Add(item);
+    }
+
+    public override void OnPageLoad()
+    {
+        base.OnPageLoad();
+        currentMod = null;
+        this.WhenAnyValue(x => x.SearchFilter).Subscribe(UpdateVisibleItems);
+
+        // Items = new ObservableCollection<ModsEntryViewModel>();
+        reloadMods();
+       
+    }
+
+    
+    public async void btnAdd_Click()
+    {
+        ModConfigWindowView window = new ModConfigWindowView();
+        ModHeader header = new ModHeader("", "", "", "", "", Guid.NewGuid(), new Version(), new Version(),
+            PathMod.ModType.Mod, new RelatedMod[0] { });
+        ModConfigViewModel2 vm = new ModConfigViewModel2(_context.DialogService, header);
+        window.DataContext = vm;
+
+        DevForm form = (DevForm)DiagManager.Instance.DevEditor;
+        bool result = await window.ShowDialog<bool>(form);
+        if (!result)
+            return;
+
+        string newName = Text.Sanitize(vm.Name);
+        string newNamespace = Text.Sanitize(vm.Namespace).ToLower();
+
+        //sanitize name and check for name conflicts
+        if (String.IsNullOrWhiteSpace(newName))
+            return;
+        if (String.IsNullOrWhiteSpace(newNamespace))
+            return;
+
+        //check for children name conflicts
+        foreach (ModsEntryViewModel child in Items)
+        {
+            if (String.Equals(child.Name, newName, StringComparison.OrdinalIgnoreCase))
+            {
+                //already exists, pop up message
+                await MessageBoxWindowView.Show(_context.DialogService, newName + " already exists!",
+                    "Add Failed", MessageBoxWindowView.MessageBoxButtons.Ok);
+                return;
+            }
+
+            if (String.Equals(child.Namespace, newNamespace, StringComparison.OrdinalIgnoreCase))
+            {
+                //already exists, pop up message
+                await MessageBoxWindowView.Show(_context.DialogService, newName + " (Namespace) already exists!",
+                    "Add Failed", MessageBoxWindowView.MessageBoxButtons.Ok);
+                return;
+            }
+        }
+
+        ModsEntryViewModel newNode =
+            new ModsEntryViewModel(newName, newNamespace, Path.Combine(PathMod.MODS_FOLDER, newName));
+        string fullPath = PathMod.FromApp(newNode.Path);
+        //add all asset folders
+        Directory.CreateDirectory(fullPath);
+        //create the mod xml
+        ModHeader newHeader = new ModHeader(fullPath, vm.Name.Trim(), vm.Author.Trim(), vm.Description.Trim(),
+            Text.Sanitize(vm.Namespace).ToLower(), Guid.Parse(vm.UUID), Version.Parse(vm.Version),
+            Version.Parse(vm.GameVersion), (PathMod.ModType)vm.ChosenModType, vm.GetRelationshipArray());
+        PathMod.SaveModDetails(fullPath, newHeader);
+
+        //add Strings
+        Directory.CreateDirectory(Path.Join(fullPath, "Strings"));
+        //Content
+        GraphicsManager.InitContentFolders(fullPath);
+        //Data
+        DataManager.InitDataDirs(fullPath);
+        //Script
+        LuaEngine.InitScriptFolders(fullPath, vm.Namespace);
+
+        //add node
+        Items.Add(newNode);
+        UpdateVisibleItems(SearchFilter);
+    }
+    
+    public async void btnDelete_Click()
+    {
+        //prohibit the deletion of the current node or the base node
+        if (SelectedItem == Items[0])
+        {
+            await MessageBoxWindowView.Show(_context.DialogService, "Cannot delete the root mod!", "Delete Failed", MessageBoxWindowView.MessageBoxButtons.Ok);
+            return;
+        }
+        //ask for confirmation
+        MessageBoxWindowView.MessageBoxResult result = await MessageBoxWindowView.Show(_context.DialogService, "Are you sure you want to delete the mod in directory:\n" + SelectedItem.Path, "Are you sure?",
+            MessageBoxWindowView.MessageBoxButtons.YesNo);
+        if (result == MessageBoxWindowView.MessageBoxResult.No)
+            return;
+
+        string fullPath = PathMod.FromApp(SelectedItem.Path);
+        //delete folder
+        Directory.Delete(fullPath, true);
+
+        //and then delete node
+        Items.Remove(SelectedItem);
+    }
+    
+    public async void btnEdit_Click()
+    {
+        ModConfigWindowView window = new ModConfigWindowView();
+        ModHeader header = PathMod.Quest;
+        ModConfigViewModel2 vm = new ModConfigViewModel2(_context.DialogService, header);
+        window.DataContext = vm;
+
+        DevForm form = (DevForm)DiagManager.Instance.DevEditor;
+        bool result = await window.ShowDialog<bool>(form);
+
+        if (result)
+        {
+            //save the mod data
+            string fullPath = PathMod.FromApp(PathMod.Quest.Path);
+            ModHeader resultHeader = new ModHeader(PathMod.Quest.Path, vm.Name.Trim(), vm.Author.Trim(), vm.Description.Trim(), Text.Sanitize(vm.Namespace).ToLower(), Guid.Parse(vm.UUID), Version.Parse(vm.Version), Version.Parse(vm.GameVersion), (PathMod.ModType)vm.ChosenModType, vm.GetRelationshipArray());
+            PathMod.SaveModDetails(fullPath, resultHeader);
+
+            reloadMods();
+            DevForm.ExecuteOrPend(doSwitch);
+        }
+    }
+
+    public async Task AddChildItemUnderParent(ModsEntryViewModel entry)
+    {
+        if (entry == Items[0])
+        {
+            await MessageBoxWindowView.Show(_context.DialogService, "Cannot edit the root mod!", "Edit Failed", MessageBoxWindowView.MessageBoxButtons.Ok);
+            
+        }
+        else
+        {
+            Node.AddNodeIfNotExists(_context.NodeFactory.CreatModItemNode<ModConfigPageViewModel>(entry.Path, entry.Display, Node.Icon,
+                async (page) =>
+                {
+
+                    page.OnOKValidAction = () =>
+                    {
+                        string fullPath = PathMod.FromApp(PathMod.Quest.Path);
+                        ModHeader resultHeader = new ModHeader(PathMod.Quest.Path, page.Name.Trim(), page.Author.Trim(), page.Description.Trim(), Text.Sanitize(page.Namespace).ToLower(), Guid.Parse(page.UUID), Version.Parse(page.Vers), Version.Parse(page.GameVersion), (PathMod.ModType)page.ChosenModType, page.GetRelationshipArray());
+                        PathMod.SaveModDetails(fullPath, resultHeader);
+                    
+                        reloadMods();
+                        // DevForm.ExecuteOrPend(doSwitch);
+                    };
+                }));
+            NodeHelper.ExpandParents(Node, true);
+        }
+
+    }
+    
+    private void reloadMods()
+    {
+        Items.Clear();
+        Items.Add(new ModsEntryViewModel("Origin", PathMod.BaseNamespace, ""));
+        string[] modsPath = Directory.GetDirectories(PathMod.MODS_PATH);
+        ModsEntryViewModel chosenModel = null;
+        foreach (string modPath in modsPath)
+        {
+            ModHeader header = PathMod.GetModDetails(modPath);
+            Items.Add(new ModsEntryViewModel(getModName(header), header.Namespace, Path.Combine(PathMod.MODS_FOLDER, Path.GetFileName(modPath))));
+            if (PathMod.Quest.Path == header.Path)
+                chosenModel = Items[Items.Count - 1];
+        }
+        SelectedItem = chosenModel;
+        UpdateVisibleItems(SearchFilter);
+    }
+
+    private static string getModName(ModHeader mod)
+    {
+        if (!mod.IsValid())
+            return null;
+        return mod.GetMenuName();
+    }
+
+}
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/NodeBase.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/NodeBase.cs
index d94245a0..599a613f 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/NodeBase.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/NodeBase.cs
@@ -243,6 +243,22 @@ public OpenEditorNodeWithParams(
     }
 }
 
+
+// public class OpenEditorNodeWithParams : OpenEditorNode
+// {
+//     public object[] ExtraParams { get; }
+//
+//     public OpenEditorNodeWithParams(
+//         string title,
+//         Type? editorType,
+//         object[] extraParams,
+//         string? icon = null,
+//         Action<EditorPageViewModel>? onPageLoad = null)
+//         : base(title, editorType, icon, onPageLoad)
+//     {
+//         ExtraParams = extraParams;
+//     }
+// }
 // public abstract class ItemRootNode : OpenEditorNode
 // {
 //     
@@ -313,6 +329,31 @@ await MessageBoxWindowView.Show(_dialogService, "Universal is now saved as a pat
     }
 }
 
+
+public class ModItemNode : OpenEditorNode
+{
+    public string Path { get; }
+
+    public ModItemNode(string path, Type? editorType, string? title, string? icon = null,
+        Action<EditorPageViewModel>? onPageLoad = null)
+        : base(title ?? "", editorType, icon ?? "", onPageLoad)
+    {
+        Path = path;
+    }
+
+    protected override bool EqualsCore(NodeBase other)
+    {
+        if (other is not ModItemNode node)
+            return false;
+        return Path == node.Path && EditorType == node.EditorType;
+    }
+
+    protected override int GetHashCodeCore()
+    {
+        return Path.GetHashCode() ^ EditorType.GetHashCode();
+    }
+}
+
 public class DataRootNode : OpenEditorNode
 {
     public DataManager.DataType DataType { get; }
@@ -555,19 +596,17 @@ public async Task MassImportAsync()
     // }
 }
 
+
 public class SpriteTileRootNode : SpriteRootNode
 {
     private readonly IDialogService _dialogService;
-    public ReactiveCommand<Unit, Unit> ReIndexCommand { get; }
-
 
     public SpriteTileRootNode(IDialogService dialogService, NodeFactory nodeFactory, Type? editorType, string title,
         string? icon = null, Action<EditorPageViewModel>? onPageLoad = null)
         : base(dialogService, nodeFactory, GraphicsManager.AssetType.Tile, editorType, title, icon, onPageLoad)
     {
         _dialogService = dialogService;
-
-        ReIndexCommand = ReactiveCommand.CreateFromTask(ReIndexAsync);
+        
     }
 
     protected override ISpriteRootOperationStrategy CreateStrategy(IDialogService dialogService)
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/DataListPageView.axaml b/RogueEssence.Editor.Avalonia/Views/New/Editors/DataListPageView.axaml
index e037c035..abba9348 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/Editors/DataListPageView.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/New/Editors/DataListPageView.axaml
@@ -3,6 +3,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:vm="using:RogueEssence.Dev.ViewModels"
+             xmlns:v="clr-namespace:RogueEssence.Dev.Views"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:DataType="vm:DataListPageViewModel"
              x:Class="RogueEssence.Dev.Views.DataListPageView">
@@ -106,14 +107,26 @@
                 </ListBox.ItemTemplate>
             </ListBox>
 
-            <StackPanel Grid.Row="4" Orientation="Horizontal" HorizontalAlignment="Right" Spacing="4">
-                <Button Command="{Binding AddItem}" Classes="secondary" Margin="0, 0" Padding="4,3, 4, 3">
-                    <Path Width="14" Height="14" Data="{StaticResource Icons.Plus}" />
+            <StackPanel Grid.Row="4" Orientation="Horizontal">
+                <Button Classes="flat" Width="100"
+                        Command="{Binding AddItem}">
+                    <v:IconText Text="Add" Icon="Icons.Plus" IconSize="12" />
                 </Button>
-                <Button Command="{Binding DeleteItem}" Classes="secondary" Margin="0, 0" Padding="4,3, 4, 3">
-                    <Path Width="14" Height="14" Data="{StaticResource Icons.Minus}" />
+                <Button Classes="flat" Width="100" Margin="24,0,0,0"
+                        Command="{Binding DeleteItem}"
+                        IsEnabled="{Binding SelectedItem, Converter={x:Static ObjectConverters.IsNotNull}}"
+                        >
+                    <v:IconText Text="Delete" Icon="Icons.TrashFill" IconSize="12" />
                 </Button>
             </StackPanel>
+            <!-- <StackPanel Grid.Row="4" Orientation="Horizontal" HorizontalAlignment="Right" Spacing="4"> -->
+            <!--     <Button Command="{Binding AddItem}" Classes="secondary" Margin="0, 0" Padding="4,3, 4, 3"> -->
+            <!--         <Path Width="14" Height="14" Data="{StaticResource Icons.Plus}" /> -->
+            <!--     </Button> -->
+            <!--     <Button Command="{Binding DeleteItem}" Classes="secondary" Margin="0, 0" Padding="4,3, 4, 3"> -->
+            <!--         <Path Width="14" Height="14" Data="{StaticResource Icons.Minus}" /> -->
+            <!--     </Button> -->
+            <!-- </StackPanel> -->
         </Grid>
     </Grid>
 </UserControl>
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/ModConfigPageView.axaml b/RogueEssence.Editor.Avalonia/Views/New/Editors/ModConfigPageView.axaml
new file mode 100644
index 00000000..fdd4144b
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/Views/New/Editors/ModConfigPageView.axaml
@@ -0,0 +1,93 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:vm="using:RogueEssence.Dev.ViewModels"
+             xmlns:views="clr-namespace:RogueEssence.Dev.Views"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:DataType="vm:ModConfigPageViewModel"
+             x:Class="RogueEssence.Dev.Views.ModConfigPageView">
+    <Design.DataContext>
+        <vm:ModConfigPageViewModel />
+    </Design.DataContext>
+    <Grid RowDefinitions="*,Auto">
+        <ScrollViewer Grid.Row="0" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled">
+            <Grid Margin="4" RowDefinitions="Auto, Auto">
+                <Grid RowDefinitions="36, 36, 36, 80" ColumnDefinitions="72, *">
+                    <TextBlock Margin="4,2" Text="Name:" VerticalAlignment="Center" HorizontalAlignment="Right" />
+                    <Grid Grid.Row="0" Grid.Column="1">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition />
+                            <ColumnDefinition Width="48" />
+                            <ColumnDefinition Width="90" />
+                        </Grid.ColumnDefinitions>
+                        <TextBox Text="{Binding Name}" VerticalAlignment="Center" Margin="4" />
+                        <TextBlock Margin="4,2" Text="Type:" VerticalAlignment="Center" HorizontalAlignment="Right"
+                                   Grid.Column="1" />
+                        <views:SearchComboBox Margin="4,2" ItemsSource="{Binding ModTypes}"
+                                              SelectedIndex="{Binding ChosenModType}" Grid.Column="2" />
+                    </Grid>
+
+                    <TextBlock Margin="4,2" Text="Namespace:" VerticalAlignment="Center" HorizontalAlignment="Right"
+                               Grid.Row="1" />
+                    <Grid Grid.Row="1" Grid.Column="1">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition />
+                            <ColumnDefinition Width="48" />
+                            <ColumnDefinition Width="72" />
+                        </Grid.ColumnDefinitions>
+                        <TextBox Text="{Binding Namespace}" VerticalAlignment="Center" Margin="4" />
+                        <TextBlock Margin="4,2" Text="Version:" VerticalAlignment="Center" HorizontalAlignment="Right"
+                                   Grid.Column="1" />
+                        <TextBox Text="{Binding Version}" VerticalAlignment="Center" Margin="4" Grid.Column="2" />
+                    </Grid>
+
+                    <TextBlock Margin="4,2" Text="Author:" VerticalAlignment="Center" HorizontalAlignment="Right"
+                               Grid.Row="2" />
+                    <TextBox Text="{Binding Author}" VerticalAlignment="Center" Margin="4" Grid.Row="2" Grid.Column="1" />
+                    <TextBlock Margin="4,2" Text="Description:" VerticalAlignment="Top" HorizontalAlignment="Right"
+                               Grid.Row="3" />
+                    <TextBox Text="{Binding Description}" VerticalAlignment="Stretch" VerticalContentAlignment="Top"
+                             AcceptsReturn="True" Margin="4" Grid.Row="3" Grid.Column="1" />
+                </Grid>
+
+                <Expander Grid.Row="1"
+                          HorizontalAlignment="Stretch"
+                          VerticalAlignment="Top"
+                          HorizontalContentAlignment="Stretch">
+                    <Expander.Header>
+                        <Label Content="Advanced"></Label>
+                    </Expander.Header>
+                    <Grid RowDefinitions="36, 36, Auto" ColumnDefinitions="80, *">
+                        <TextBlock Margin="4,2" Text="UUID:" VerticalAlignment="Center" HorizontalAlignment="Right"
+                                   Grid.Row="0" />
+                        <Grid Grid.Row="0" Grid.Column="1">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition />
+                                <ColumnDefinition Width="64" />
+                            </Grid.ColumnDefinitions>
+                            <TextBox Text="{Binding UUID}" IsReadOnly="True" VerticalAlignment="Center" Margin="4" />
+                            <Button Command="{Binding btnRegenUUID_Click}" Margin="4" Grid.Column="1">Regen</Button>
+                        </Grid>
+
+                        <TextBlock Margin="4,2" Text="Game Version:" VerticalAlignment="Center"
+                                   HorizontalAlignment="Right"
+                                   Grid.Row="1" />
+                        <TextBox Text="{Binding GameVersion}" VerticalAlignment="Center" Margin="4" Grid.Row="1"
+                                 Grid.Column="1" />
+
+                        <TextBlock Margin="4,6,4,2" VerticalAlignment="Top" HorizontalAlignment="Right" Grid.Row="2">Relations:</TextBlock>
+                        <views:CollectionBox DataContext="{Binding Relationships}" Margin="4" Grid.Row="2"
+                                             Grid.Column="1" MinHeight="150" />
+
+                    </Grid>
+                </Expander>
+            </Grid>
+        </ScrollViewer>
+
+        <Grid Grid.Row="1" Margin="4" ColumnDefinitions="*, *">
+            <Button Classes="flat" Click="btnOK_Click" Margin="4" Grid.Column="0">OK</Button>
+            <Button Classes="flat" Click="btnCancel_Click" Margin="4" Grid.Column="1">Cancel</Button>
+        </Grid>
+    </Grid>
+</UserControl>
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/ModConfigPageView.axaml.cs b/RogueEssence.Editor.Avalonia/Views/New/Editors/ModConfigPageView.axaml.cs
new file mode 100644
index 00000000..13fa341b
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/Views/New/Editors/ModConfigPageView.axaml.cs
@@ -0,0 +1,38 @@
+using System;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+using Avalonia.Markup.Xaml;
+using RogueEssence.Dev.ViewModels;
+
+namespace RogueEssence.Dev.Views;
+
+public partial class ModConfigPageView : UserControl
+{
+    public ModConfigPageView()
+    {
+        InitializeComponent();
+    }
+    
+    public async void btnOK_Click(object sender, RoutedEventArgs e)
+    {
+        ModConfigPageViewModel vm = (ModConfigPageViewModel)DataContext;
+
+        bool isValid = await vm.Validate();
+
+        if (isValid)
+        {
+            vm.OnOKValidAction.Invoke();
+            vm.Close();
+        }
+           
+    }
+
+
+    public void btnCancel_Click(object sender, RoutedEventArgs e)
+    {
+        
+        ModConfigPageViewModel vm = (ModConfigPageViewModel)DataContext;
+        vm.Close();
+    }
+}
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/ModEditPageView.axaml b/RogueEssence.Editor.Avalonia/Views/New/Editors/ModEditPageView.axaml
deleted file mode 100644
index 999e82fe..00000000
--- a/RogueEssence.Editor.Avalonia/Views/New/Editors/ModEditPageView.axaml
+++ /dev/null
@@ -1,12 +0,0 @@
-<UserControl xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:vm="using:RogueEssence.Dev.ViewModels"
-             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:DataType="vm:ModEditPageViewModel"
-             x:Class="RogueEssence.Dev.Views.ModEditPageView">
-    Welcome to Mod Editor
-    
-    
-</UserControl>
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/ModEditPageView.axaml.cs b/RogueEssence.Editor.Avalonia/Views/New/Editors/ModEditPageView.axaml.cs
deleted file mode 100644
index 9bc51679..00000000
--- a/RogueEssence.Editor.Avalonia/Views/New/Editors/ModEditPageView.axaml.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
-
-namespace RogueEssence.Dev.Views;
-
-public partial class ModEditPageView : UserControl
-{
-    public ModEditPageView()
-    {
-        InitializeComponent();
-    }
-}
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/ModListPageView.axaml b/RogueEssence.Editor.Avalonia/Views/New/Editors/ModListPageView.axaml
new file mode 100644
index 00000000..886a7986
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/Views/New/Editors/ModListPageView.axaml
@@ -0,0 +1,81 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:vm="using:RogueEssence.Dev.ViewModels"
+             xmlns:v="clr-namespace:RogueEssence.Dev.Views"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:DataType="vm:ModListPageViewModel"
+             x:Class="RogueEssence.Dev.Views.ModListPageView">
+    <Design.DataContext>
+        <vm:ModListPageViewModel/>
+    </Design.DataContext>
+    <Grid RowDefinitions="64, Auto, Auto, Auto">
+
+
+        <TextBlock Grid.Row="1" HorizontalAlignment="Center" Classes="table_header" FontSize="16"
+                   Text="Mods" />
+
+        <!-- Search Grid -->
+        <Grid Grid.Row="2" RowDefinitions="Auto, 16, Auto, 12, Auto" Margin="64, 8" MinWidth="600">
+
+            <TextBox Classes="search"
+                     Grid.Row="0"
+                     Text="{Binding SearchFilter, Mode=TwoWay}"/>
+
+         
+            <ListBox Grid.Row="2"
+                     DoubleTapped="ModListPageListBox_OnDoubleTapped"
+                     Background="{DynamicResource Brush.ListBox.Background}"
+                     x:Name="ModListPageListBox" SelectedItem="{Binding SelectedItem}"
+                     ItemsSource="{Binding FilteredItems}" Height="400" BorderBrush="{DynamicResource Brush.Border2}"
+                     BorderThickness="1">
+                <ListBox.Styles>
+                    <Style Selector="ListBoxItem">
+                        <Setter Property="Background" Value="{DynamicResource Brush.ListBox.Background}" />
+                    </Style>
+                </ListBox.Styles>
+                <ListBox.ItemContainerTheme>
+                    <StaticResource ResourceKey="CompactListBoxItem"/>
+                </ListBox.ItemContainerTheme>
+   
+                <ListBox.ItemTemplate>
+                    <DataTemplate>
+                        <TextBlock Text="{Binding Display}" Padding="4" />
+                    </DataTemplate>
+                </ListBox.ItemTemplate>
+            </ListBox>
+
+            <StackPanel Grid.Row="4" Orientation="Horizontal">
+                <Button Classes="flat" Width="100"
+                        Command="{Binding btnSwitch_Click}"
+                        IsEnabled="{Binding SelectedItem, Converter={x:Static ObjectConverters.IsNotNull}}">
+                    <v:IconText Text="Switch To" Icon="Icons.RepeatFill" IconSize="12" />
+                </Button>
+                <Button Classes="flat" Width="100" Margin="24,0,0,0"
+                        Command="{Binding btnAdd_Click}">
+                    <v:IconText Text="Add" Icon="Icons.Plus" IconSize="12" />
+                </Button>
+                <Button Classes="flat" Width="100" Margin="24,0,0,0"
+                        Command="{Binding btnDelete_Click}"
+                        IsEnabled="{Binding SelectedItem, Converter={x:Static ObjectConverters.IsNotNull}}">
+                    <v:IconText Text="Delete" Icon="Icons.TrashFill" IconSize="12" />
+                </Button>
+            </StackPanel>
+            <!-- -->
+            <!-- <Button Command="{Binding btnSwitch_Click}" Margin="4" Grid.Row="2" Grid.Column="0">Switch To</Button> -->
+            <!-- <Button Command="{Binding btnAdd_Click}" Margin="4" Grid.Row="2" Grid.Column="1">Add New</Button> -->
+            <!-- <Button Command="{Binding btnDelete_Click}" Margin="4" Grid.Row="2" Grid.Column="2">Delete</Button> -->
+            <!-- -->
+            <!-- <StackPanel Grid.Row="4" Orientation="Horizontal" HorizontalAlignment="Right" Spacing="4"> -->
+            <!--     <Button Command="{Binding AddItem}" Classes="secondary" Margin="0, 0" Padding="4,3, 4, 3"> -->
+            <!--         <Path Width="14" Height="14" Data="{StaticResource Icons.Plus}" /> -->
+            <!--     </Button> -->
+            <!--     <Button Command="{Binding DeleteItem}" Classes="secondary" Margin="0, 0" Padding="4,3, 4, 3"> -->
+            <!--         <Path Width="14" Height="14" Data="{StaticResource Icons.Minus}" /> -->
+            <!--     </Button> -->
+            <!-- </StackPanel> -->
+        </Grid>
+    </Grid>
+    
+</UserControl>
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/ModListPageView.axaml.cs b/RogueEssence.Editor.Avalonia/Views/New/Editors/ModListPageView.axaml.cs
new file mode 100644
index 00000000..188a5f1b
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/Views/New/Editors/ModListPageView.axaml.cs
@@ -0,0 +1,22 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Input;
+using Avalonia.Markup.Xaml;
+using RogueEssence.Dev.ViewModels;
+
+namespace RogueEssence.Dev.Views;
+
+public partial class ModListPageView : UserControl
+{
+    public ModListPageView()
+    {
+        InitializeComponent();
+    }
+    
+    private async void ModListPageListBox_OnDoubleTapped(object sender, TappedEventArgs e)
+    {
+        if (DataContext is ModListPageViewModel vm)
+            await vm.AddChildItemUnderParent(vm.SelectedItem);
+    }
+    
+}

From d58cb7c6c4ef52028d087334f12cc736daacbbb5 Mon Sep 17 00:00:00 2001
From: Kace <41309226+DoubleTrio@users.noreply.github.com>
Date: Sun, 17 May 2026 02:23:11 -0400
Subject: [PATCH 32/51] convert map editor page start

---
 RogueEssence.Editor.Avalonia/App.axaml.cs     |  39 +-
 .../ViewModels/New/DevFormViewModel.cs        |  16 +-
 .../New/Editors/MapEditorPageViewModel.cs     | 806 ++++++++++++++++++
 .../New/Editors/ZoneEditorPageViewModel.cs    |  16 -
 .../Views/New/Editors/MapEditorPageView.axaml |  72 ++
 ...ew.axaml.cs => MapEditorPageView.axaml.cs} |   4 +-
 .../Views/New/Editors/ModListPageView.axaml   |   2 -
 .../New/Editors/ZoneEditorPageView.axaml      |  29 -
 8 files changed, 914 insertions(+), 70 deletions(-)
 create mode 100644 RogueEssence.Editor.Avalonia/ViewModels/New/Editors/MapEditorPageViewModel.cs
 delete mode 100644 RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ZoneEditorPageViewModel.cs
 create mode 100644 RogueEssence.Editor.Avalonia/Views/New/Editors/MapEditorPageView.axaml
 rename RogueEssence.Editor.Avalonia/Views/New/Editors/{ZoneEditorPageView.axaml.cs => MapEditorPageView.axaml.cs} (93%)
 delete mode 100644 RogueEssence.Editor.Avalonia/Views/New/Editors/ZoneEditorPageView.axaml

diff --git a/RogueEssence.Editor.Avalonia/App.axaml.cs b/RogueEssence.Editor.Avalonia/App.axaml.cs
index 925136b3..5cf34864 100644
--- a/RogueEssence.Editor.Avalonia/App.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/App.axaml.cs
@@ -34,6 +34,7 @@ public static void AddCommonServices(this IServiceCollection collection)
        
             AddDevTabViewModels(collection);
             AddMapEditViewModels(collection);
+            AddGroundEditViewModels(collection);
             
             collection.AddTransient<TabSwitcherViewModel>();
 
@@ -62,8 +63,7 @@ public static void AddCommonServices(this IServiceCollection collection)
             collection.AddSingleton<IDialogService, DialogService>();
 
             collection.AddTransient<DevControlViewModel>();
-            collection.AddTransient<ZoneEditorPageViewModel>();
-            collection.AddTransient<GroundEditorPageViewModel>();
+            collection.AddTransient<MapEditorPageViewModel>();
             collection.AddTransient<RandomInfoPageViewModel>();
             collection.AddTransient<SpritePageViewModel>();
             collection.AddTransient<ModListPageViewModel>();
@@ -77,17 +77,28 @@ public static void AddCommonServices(this IServiceCollection collection)
 
         private static void AddMapEditViewModels(this IServiceCollection services)
         {
-            services.AddSingleton<MapTabTexturesViewModel>();
-            services.AddSingleton<MapTabDecorationsViewModel>();
-            services.AddSingleton<MapTabTerrainViewModel>();
-            services.AddSingleton<MapTabTilesViewModel>();
-            services.AddSingleton<MapTabItemsViewModel>();
-            services.AddSingleton<MapTabEntitiesViewModel>();
-            services.AddSingleton<MapTabEntrancesViewModel>();
-            services.AddSingleton<MapTabSpawnsViewModel>();
-            services.AddSingleton<MapTabEffectsViewModel>();
-            services.AddSingleton<MapTabPropertiesViewModel>();
-            services.AddSingleton<MapEditViewModel>();
+            services.AddTransient<MapTabTexturesViewModel>();
+            services.AddTransient<MapTabDecorationsViewModel>();
+            services.AddTransient<MapTabTerrainViewModel>();
+            services.AddTransient<MapTabTilesViewModel>();
+            services.AddTransient<MapTabItemsViewModel>();
+            services.AddTransient<MapTabEntitiesViewModel>();
+            services.AddTransient<MapTabEntrancesViewModel>();
+            services.AddTransient<MapTabSpawnsViewModel>();
+            services.AddTransient<MapTabEffectsViewModel>();
+            services.AddTransient<MapTabPropertiesViewModel>();
+            services.AddTransient<MapEditorPageViewModel>();
+        }
+        
+        private static void AddGroundEditViewModels(this IServiceCollection services)
+        {
+            services.AddTransient<GroundTabDecorationsViewModel>();
+            services.AddTransient<GroundTabWallsViewModel>();
+            services.AddTransient<GroundTabEntitiesViewModel>();
+            services.AddTransient<GroundTabPropertiesViewModel>();
+            services.AddTransient<GroundTabStringsViewModel>();
+            services.AddTransient<GroundTabScriptViewModel>();
+            services.AddTransient<GroundEditorPageViewModel>();
         }
         
         private static void AddDevTabViewModels(this IServiceCollection services)
@@ -107,7 +118,7 @@ public static void RegisterPages(this IServiceProvider provider)
             var pageFactory = provider.GetRequiredService<PageFactory>();
 
             pageFactory.Register<DevControlViewModel>();
-            pageFactory.Register<ZoneEditorPageViewModel>();
+            pageFactory.Register<MapEditorPageViewModel>();
             pageFactory.Register<ReflectedDataPageViewModel>();
             pageFactory.Register<GroundEditorPageViewModel>();
             pageFactory.Register<RandomInfoPageViewModel>();
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs
index be2a580a..a8191205 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs
@@ -506,8 +506,10 @@ public void LoadDevTree()
         // _nodeFactory.CreateOpenEditorNode("Dev Control",  typeof(DevControlViewModel), "Icons.GameControllerFill"));
         root.SubNodes.Add(
             _nodeFactory.CreateOpenEditorNode<DevControlViewModel>("Dev Control", "Icons.GameControllerFill"));
-        // root.SubNodes.Add(
-        //     _nodeFactory.CreateOpenEditorNode<ZoneEditorPageViewModel>("Zone Editor", "Icons.StairsFill"));
+        root.SubNodes.Add(
+            _nodeFactory.CreateOpenEditorNode<MapEditorPageViewModel>("Map Editor", "Icons.StairsFill"));
+        root.SubNodes.Add(
+            _nodeFactory.CreateOpenEditorNode<GroundEditorPageViewModel>("Ground Editor", "Icons.IslandFill"));
         // root.SubNodes.Add(
         // _nodeFactory.CreateOpenEditorNode("Ground Editor", typeof(GroundEditorPageViewModel), "Icons.MapTrifoldFill"));
         // root.SubNodes.Add(_nodeFactory.CreateOpenEditorNode("Testing", "Icons.BedFill", "RandomInfo"));
@@ -599,7 +601,7 @@ private Action<ReflectedDataPageViewModel> CreateFXOnOpen<T>(Func<T> getter, Act
     private void CreateConstantsNode(NodeBase parent)
     {
         var constantsNode =
-            _context.NodeFactory.CreateReflectedDataNode<ZoneEditorPageViewModel>("Constants", "Icons.ListFill", parent);
+            _context.NodeFactory.CreateReflectedDataNode<MapEditorPageViewModel>("Constants", "Icons.ListFill", parent);
         var startParamsNode = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>("Start Params",
             "Icons.ListFill",
             parent,
@@ -625,7 +627,7 @@ private void CreateConstantsNode(NodeBase parent)
                 parent));
 
         
-        var stringsNode = _context.NodeFactory.CreateOpenEditorNode<ZoneEditorPageViewModel>("Strings", "Icons.TableFill");
+        var stringsNode = _context.NodeFactory.CreateOpenEditorNode<MapEditorPageViewModel>("Strings", "Icons.TableFill");
         var menuTextNode = _context.NodeFactory.CreateOpenEditorNodeWithParams<StringEditPageViewModel>("Menu Text", [false], "Icons.TableFill");
         var gameplayTextNode = _context.NodeFactory.CreateOpenEditorNodeWithParams<StringEditPageViewModel>("Gameplay Text", [true], "Icons.TableFill");
         stringsNode.SubNodes.Add(menuTextNode);
@@ -670,7 +672,7 @@ private void CreateConstantsNode(NodeBase parent)
         constantsNode.SubNodes.Add(stringsNode);
         
         var effectsNode =
-            _context.NodeFactory.CreateOpenEditorNode<ZoneEditorPageViewModel>("Effects", "Icons.SparkleFill");
+            _context.NodeFactory.CreateOpenEditorNode<MapEditorPageViewModel>("Effects", "Icons.SparkleFill");
         effectsNode.SubNodes.Add(_context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>("Heal FX",
             "Icons.SparkleFill",
             effectsNode,
@@ -747,7 +749,7 @@ private void CreateConstantsNode(NodeBase parent)
     private void CreateDataNode(NodeBase parent)
     {
         var dataNode =
-            _context.NodeFactory.CreateOpenEditorNode<ZoneEditorPageViewModel>("Datazz", "Icons.FloppyDiskFill");
+            _context.NodeFactory.CreateOpenEditorNode<MapEditorPageViewModel>("Datazz", "Icons.FloppyDiskFill");
         foreach (var type in Enum.GetValues<DataManager.DataType>())
         {
             if (type is DataManager.DataType.All or DataManager.DataType.None)
@@ -779,7 +781,7 @@ private void CreateSpriteNode(NodeBase parent)
     {
         // var spritesViewModel = _pageFactory.GetRequiredService<DevTabSpritesViewModel>();
         var spriteNode =
-            _context.NodeFactory.CreateOpenEditorNode<ZoneEditorPageViewModel>("Sprites", "Icons.PaintBrushFill");
+            _context.NodeFactory.CreateOpenEditorNode<MapEditorPageViewModel>("Sprites", "Icons.PaintBrushFill");
         //
         spriteNode.SubNodes.Add(
             _context.NodeFactory.CreateOpenEditorNodeWithParams<SpeciesEditPageViewModel>("Char Sprites", [true],
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/MapEditorPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/MapEditorPageViewModel.cs
new file mode 100644
index 00000000..7d10f0d9
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/MapEditorPageViewModel.cs
@@ -0,0 +1,806 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using Avalonia.Controls;
+using Avalonia.Platform.Storage;
+using Avalonia.Threading;
+using RogueElements;
+using RogueEssence.Content;
+using RogueEssence.Data;
+using RogueEssence.Dev.Services;
+using RogueEssence.Dev.Views;
+using RogueEssence.Dungeon;
+using RogueEssence.Ground;
+using RogueEssence.Menu;
+using RogueEssence.Script;
+
+namespace RogueEssence.Dev.ViewModels;
+
+public class MapEditorPageViewModel : EditorPageViewModel, IMapEditor
+{
+    public bool Active { get; private set; }
+    public UndoStack Edits { get; }
+
+
+    public void ProcessInput(InputManager input)
+    {
+        DevForm.ExecuteOrInvoke(() => _processInput(input));
+    }
+    
+    public MapEditorPageViewModel(
+        // MapTabTexturesViewModel textures,
+        // MapTabDecorationsViewModel decorations,
+        // MapTabTerrainViewModel terrain,
+        // MapTabTilesViewModel tiles,
+        // MapTabItemsViewModel items,
+        // MapTabEntitiesViewModel entities,
+        // MapTabEntrancesViewModel entrances,
+        // MapTabSpawnsViewModel spawns,
+        // MapTabEffectsViewModel effects,
+        // MapTabPropertiesViewModel properties,
+        EditorContext context, NodeBase node, Action<EditorPageViewModel> onPageOpen = null) : base(context, node,
+        onPageOpen)
+    {
+        Edits = new UndoStack();
+        // Textures = textures;
+        // Decorations = decorations;
+        // Terrain = terrain;
+        // Tiles = tiles;
+        // Items = items;
+        // Entities = entities;
+        // Entrances = entrances;
+        // Spawns = spawns;
+        // Effects = effects;
+        // Properties = properties;
+        CurrentFile = "";
+    }
+
+    public override void OnPageLoad()
+    {
+        lock (GameBase.lockObj)
+        {
+            Views.DevForm form = (Views.DevForm)DiagManager.Instance.DevEditor;
+            if (form.MapEditForm == null)
+            {
+                LuaEngine.Instance.BreakScripts();
+                MenuManager.Instance.ClearMenus();
+                if (ZoneManager.Instance.CurrentMap != null)
+                    GameManager.Instance.SceneOutcome = GameManager.Instance.MoveToEditor(false, ZoneManager.Instance.CurrentMap.AssetName);
+                else
+                    GameManager.Instance.SceneOutcome = GameManager.Instance.MoveToEditor(false, "");
+            }
+        }
+        
+        
+        
+        base.OnPageLoad();
+        
+    }
+
+    public MapTabTexturesViewModel Textures { get; set; }
+    public MapTabDecorationsViewModel Decorations { get; set; }
+    public MapTabTerrainViewModel Terrain { get; set; }
+    public MapTabTilesViewModel Tiles { get; set; }
+    public MapTabItemsViewModel Items { get; set; }
+    public MapTabEntitiesViewModel Entities { get; set; }
+    public MapTabEntrancesViewModel Entrances { get; set; }
+    public MapTabSpawnsViewModel Spawns { get; set; }
+    public MapTabEffectsViewModel Effects { get; set; }
+    public MapTabPropertiesViewModel Properties { get; set; }
+
+    private string currentFile;
+
+    public string CurrentFile
+    {
+        get => currentFile;
+        set => this.SetIfChanged(ref currentFile, value);
+    }
+
+    private int selectedTabIndex;
+
+    public int SelectedTabIndex
+    {
+        get => selectedTabIndex;
+        set
+        {
+            this.SetIfChanged(ref selectedTabIndex, value);
+            TabChanged();
+        }
+    }
+
+
+    public void mnuNew_Click()
+    {
+        CurrentFile = "";
+
+        lock (GameBase.lockObj) //Schedule the map creation
+            DoNew();
+    }
+
+    
+    public async void mnuOpen_Click()
+    {
+        string mapDir = Path.GetFullPath(PathMod.ModPath(DataManager.MAP_PATH));
+
+        var options = new FilePickerOpenOptions
+        {
+            Title = "Open .rsmap File",
+            AllowMultiple = false,
+            FileTypeFilter =
+            [
+                new FilePickerFileType("Map Files")
+                {
+                    Patterns = [$"*{DataManager.MAP_EXT}"]
+                }
+            ]
+        };
+
+        string result = await _context.DialogService.ShowFilePickerAsync(options, mapDir);
+
+        if (result != null)
+        {
+            bool legalPath = false;
+            foreach (string proposedPath in PathMod.FallbackPaths(DataManager.MAP_PATH))
+            {
+                if (comparePaths(proposedPath, Path.GetDirectoryName(result)))
+                    legalPath = true;
+            }
+
+            if (!legalPath)
+            {
+                await MessageBoxWindowView.Show(_context.DialogService,
+                    String.Format("Map can only be loaded from:\n{0}\nOr one of its parents.",
+                        PathMod.ModPath(DataManager.MAP_PATH)), "Error", MessageBoxWindowView.MessageBoxButtons.Ok);
+            }
+            else
+            {
+                lock (GameBase.lockObj)
+                    DoLoad(Path.GetFileNameWithoutExtension(result));
+            }
+        }
+    }
+    // public async void mnuOpen_Click()
+    // {
+    //     string mapDir = Path.GetFullPath(PathMod.ModPath(DataManager.MAP_PATH));
+    //     DevForm form = (DevForm)DiagManager.Instance.DevEditor;
+    //     IStorageFolder directory = await form.GroundEditForm.StorageProvider.TryGetFolderFromPathAsync(mapDir);
+    //
+    //     await Dispatcher.UIThread.InvokeAsync(async () =>
+    //     {
+    //         IReadOnlyList<IStorageFile> results = await form.StorageProvider.OpenFilePickerAsync(
+    //             new FilePickerOpenOptions
+    //             {
+    //                 Title = "Open .rsmap File",
+    //                 SuggestedStartLocation = directory,
+    //                 AllowMultiple = false,
+    //                 FileTypeFilter =
+    //                 [
+    //                     new FilePickerFileType("Map Files")
+    //                     {
+    //                         Patterns = ["*." + DataManager.MAP_EXT.Substring(1)]
+    //                     }
+    //                 ]
+    //             });
+    //         if (results.Count > 0)
+    //         {
+    //             IStorageFile result = results.First();
+    //
+    //             bool legalPath = false;
+    //             foreach (string proposedPath in PathMod.FallbackPaths(DataManager.MAP_PATH))
+    //             {
+    //                 if (comparePaths(proposedPath, Path.GetDirectoryName(result.Path.LocalPath)))
+    //                     legalPath = true;
+    //             }
+    //
+    //             if (!legalPath)
+    //                 await MessageBox.Show(form.MapEditForm,
+    //                     String.Format("Map can only be loaded from:\n{0}\nOr one of its parents.",
+    //                         PathMod.ModPath(DataManager.MAP_PATH)), "Error", MessageBox.MessageBoxButtons.Ok);
+    //             else
+    //             {
+    //                 lock (GameBase.lockObj)
+    //                     DoLoad(Path.GetFileNameWithoutExtension(results.First().Name));
+    //             }
+    //         }
+    //     });
+    // }
+
+
+    public async void mnuExportAsGround_Click()
+    {
+        string mapDir = Path.GetFullPath(PathMod.ModPath(DataManager.GROUND_PATH));
+
+        var options = new FilePickerSaveOptions
+        {
+            FileTypeChoices = new[]
+            {
+                new FilePickerFileType("Ground Files")
+                {
+                    Patterns = new[] { $"*{DataManager.GROUND_EXT}" }
+                }
+            }
+        };
+
+        string result = await _context.DialogService.TryGetSaveFileAsync(options, mapDir);
+        if (!String.IsNullOrEmpty(result))
+        {
+            string reqDir = PathMod.HardMod(DataManager.GROUND_PATH);
+            if (!comparePaths(reqDir, Path.GetDirectoryName(result)))
+                await MessageBoxWindowView.Show(_context.DialogService, String.Format("Map can only be saved to:\n{0}", reqDir),
+                    "Error", MessageBoxWindowView.MessageBoxButtons.Ok);
+            else if (Path.GetFileName(result).Contains(" "))
+                await MessageBoxWindowView.Show(_context.DialogService,
+                    String.Format("Save file should not contain white space:\n{0}", Path.GetFileName(result)), "Error",
+                    MessageBoxWindowView.MessageBoxButtons.Ok);
+            else
+            {
+                lock (GameBase.lockObj)
+                {
+                    //Schedule saving the map
+                    ExportToGround(ZoneManager.Instance.CurrentMap, result);
+                }
+
+                await MessageBoxWindowView.Show(_context.DialogService, String.Format("Textures have been saved to Ground!"), "Success",
+                    MessageBoxWindowView.MessageBoxButtons.Ok);
+            }
+        }
+    }
+
+    public async Task<bool> mnuSave_Click()
+    {
+        if (CurrentFile == "")
+            return
+                await mnuSaveAs_Click(); //Since its the same thing, might as well re-use the function! It makes everyone's lives easier!
+        else
+        {
+            string reqDir = PathMod.HardMod(DataManager.MAP_PATH);
+            string result = Path.Join(reqDir, Path.GetFileName(CurrentFile));
+            lock (GameBase.lockObj)
+            {
+                string oldFilename = CurrentFile;
+                DoSave(ZoneManager.Instance.CurrentMap, result, oldFilename);
+            }
+
+            return true;
+        }
+    }
+
+    
+    public async Task<bool> mnuSaveAs_Click()
+    {
+        string mapDir = Path.GetFullPath(PathMod.ModPath(DataManager.MAP_PATH));
+
+        var options = new FilePickerSaveOptions
+        {
+            FileTypeChoices =
+            [
+                new FilePickerFileType("Map Files")
+                {
+                    Patterns = [$"*{DataManager.MAP_EXT}"]
+                }
+            ]
+        };
+
+        string result = await _context.DialogService.TryGetSaveFileAsync(options, mapDir);
+
+        if (!string.IsNullOrEmpty(result))
+        {
+            string reqDir = PathMod.HardMod(DataManager.MAP_PATH);
+            if (!comparePaths(reqDir, Path.GetDirectoryName(result)))
+                await MessageBoxWindowView.Show(_context.DialogService,
+                    string.Format("Map can only be saved to:\n{0}", reqDir),
+                    "Error", MessageBoxWindowView.MessageBoxButtons.Ok);
+            else if (Path.GetFileName(result).Contains(" "))
+                await MessageBoxWindowView.Show(_context.DialogService,
+                    string.Format("Save file should not contain white space:\n{0}", Path.GetFileName(result)),
+                    "Error", MessageBoxWindowView.MessageBoxButtons.Ok);
+            else
+            {
+                lock (GameBase.lockObj)
+                {
+                    string oldFilename = CurrentFile;
+                    DoSave(ZoneManager.Instance.CurrentMap, result, oldFilename);
+                }
+
+                return true;
+            }
+        }
+
+        return false;
+    }
+    // public async Task<bool> mnuSaveAs_Click()
+    // {
+    //     string mapDir = Path.GetFullPath(PathMod.ModPath(DataManager.MAP_PATH));
+    //     SaveFileDialog saveFileDialog = new SaveFileDialog();
+    //     saveFileDialog.Directory = mapDir;
+    //
+    //     FileDialogFilter filter = new FileDialogFilter();
+    //     filter.Name = "Map Files";
+    //     filter.Extensions.Add(DataManager.MAP_EXT.Substring(1));
+    //     saveFileDialog.Filters.Add(filter);
+    //
+    //     DevForm form = (DevForm)DiagManager.Instance.DevEditor;
+    //
+    //     string result = await saveFileDialog.ShowAsync(form.MapEditForm);
+    //
+    //     if (!String.IsNullOrEmpty(result))
+    //     {
+    //         string reqDir = PathMod.HardMod(DataManager.MAP_PATH);
+    //         if (!comparePaths(reqDir, Path.GetDirectoryName(result)))
+    //             await MessageBoxWindowView.Show(_context.DialogService, String.Format("Map can only be saved to:\n{0}", reqDir),
+    //                 "Error", MessageBoxWindowView.MessageBoxButtons.Ok);
+    //         else if (Path.GetFileName(result).Contains(" "))
+    //             await MessageBoxWindowView.Show(_context.DialogService,
+    //                 String.Format("Save file should not contain white space:\n{0}", Path.GetFileName(result)), "Error",
+    //                 MessageBoxWindowView.MessageBoxButtons.Ok);
+    //         else
+    //         {
+    //             lock (GameBase.lockObj)
+    //             {
+    //                 string oldFilename = CurrentFile;
+    //
+    //                 //Schedule saving the map
+    //                 DoSave(ZoneManager.Instance.CurrentMap, result, oldFilename);
+    //             }
+    //
+    //             return true;
+    //         }
+    //     }
+    //
+    //     return false;
+    // }
+
+    public async void mnuTest_Click()
+    {
+        bool saved = await mnuSave_Click();
+        if (saved)
+        {
+            lock (GameBase.lockObj)
+            {
+                DevForm form = (DevForm)DiagManager.Instance.DevEditor;
+                form.MapEditForm.SilentClose();
+                form.MapEditForm = null;
+                GameManager.Instance.SceneOutcome =
+                    GameManager.Instance.TestWarp(ZoneManager.Instance.CurrentMap.AssetName, false,
+                        MathUtils.Rand.NextUInt64());
+            }
+        }
+    }
+
+    public async void mnuImportFromPng_Click()
+    {
+        string mapDir = Path.GetFullPath(PathMod.ModPath(DataManager.MAP_PATH));
+
+        var options = new FilePickerOpenOptions
+        {
+            Title = "Open .png File",
+            AllowMultiple = false,
+            FileTypeFilter =
+            [
+                new FilePickerFileType("PNG Files")
+                {
+                    Patterns = ["*.PNG"]
+                }
+            ]
+        };
+
+        string result = await _context.DialogService.ShowFilePickerAsync(options, mapDir);
+
+        if (result != null)
+            DoImportPng(result);
+    }
+
+    public void mnuClearLayer_Click()
+    {
+        lock (GameBase.lockObj)
+            DoClearLayer();
+    }
+
+
+    public async void mnuImportFromTileset_Click()
+    {
+        
+        if (Textures.TileBrowser.CurrentTileset == "")
+            await MessageBoxWindowView.Show(_context.DialogService, String.Format("No tileset to import!"), "Error",
+                MessageBoxWindowView.MessageBoxButtons.Ok);
+        else
+        {
+            lock (GameBase.lockObj)
+                DoImportTileset(Textures.TileBrowser.CurrentTileset);
+        }
+    }
+
+
+    public async void mnuReSize_Click()
+    {
+        MapResizeWindow window = new MapResizeWindow();
+        MapResizeViewModel viewModel = new MapResizeViewModel(ZoneManager.Instance.CurrentMap.Width,
+            ZoneManager.Instance.CurrentMap.Height);
+        window.DataContext = viewModel;
+
+        DevForm form = (DevForm)DiagManager.Instance.DevEditor;
+
+        bool result = await window.ShowDialog<bool>(form.MapEditForm);
+
+        lock (GameBase.lockObj)
+        {
+            if (result)
+            {
+                //TODO: support undo for this
+                DiagManager.Instance.DevEditor.MapEditor.Edits.Clear();
+
+                DiagManager.Instance.LoadMsg = "Resizing Map...";
+                DevForm.EnterLoadPhase(GameBase.LoadPhase.Content);
+
+                ZoneManager.Instance.CurrentMap.ResizeJustified(viewModel.MapWidth, viewModel.MapHeight,
+                    viewModel.ResizeDir);
+
+                DevForm.EnterLoadPhase(GameBase.LoadPhase.Ready);
+            }
+        }
+    }
+
+    public void mnuUndo_Click()
+    {
+        if (DiagManager.Instance.DevEditor.MapEditor.Edits.CanUndo)
+        {
+            DiagManager.Instance.DevEditor.MapEditor.Edits.Undo();
+            ProcessUndo();
+        }
+    }
+
+    public void mnuRedo_Click()
+    {
+        if (DiagManager.Instance.DevEditor.MapEditor.Edits.CanRedo)
+            DiagManager.Instance.DevEditor.MapEditor.Edits.Redo();
+    }
+
+    private void DoNew()
+    {
+        DiagManager.Instance.DevEditor.MapEditor.Edits.Clear();
+
+        //take all the necessary steps before and after moving to the map
+        DiagManager.Instance.LoadMsg = "Loading Map...";
+        DevForm.EnterLoadPhase(GameBase.LoadPhase.Content);
+        GameManager.Instance.ForceReady();
+
+        ZoneManager.Instance.CurrentZone.DevNewMap();
+
+        loadEditorSettings();
+        DevForm.EnterLoadPhase(GameBase.LoadPhase.Ready);
+    }
+
+    private void DoLoad(string mapName)
+    {
+        DiagManager.Instance.DevEditor.MapEditor.Edits.Clear();
+
+        //take all the necessary steps before and after moving to the map
+        DiagManager.Instance.LoadMsg = "Loading Map...";
+        DevForm.EnterLoadPhase(GameBase.LoadPhase.Content);
+        GameManager.Instance.ForceReady();
+
+        ZoneManager.Instance.CurrentZone.DevLoadMap(mapName);
+
+        CurrentFile = PathMod.ModPath(Path.Combine(DataManager.MAP_PATH, mapName + DataManager.MAP_EXT));
+        loadEditorSettings();
+        DevForm.EnterLoadPhase(GameBase.LoadPhase.Ready);
+    }
+
+    public void LoadFromCurrentMap()
+    {
+        if (ZoneManager.Instance.CurrentMap.AssetName != "")
+            CurrentFile = PathMod.ModPath(Path.Combine(DataManager.MAP_PATH,
+                ZoneManager.Instance.CurrentMap.AssetName + DataManager.MAP_EXT));
+        else
+            CurrentFile = "";
+
+        loadEditorSettings();
+    }
+
+    private void loadEditorSettings()
+    {
+        Textures.Layers.LoadLayers();
+        Textures.TileBrowser.TileSize = GraphicsManager.TileSize;
+        Textures.AutotileBrowser.TileSize = GraphicsManager.TileSize;
+        Terrain.TileBrowser.TileSize = GraphicsManager.TileSize;
+        Terrain.AutotileBrowser.TileSize = GraphicsManager.TileSize;
+
+        Decorations.SelectEntity(null);
+        Decorations.Layers.LoadLayers();
+
+        Terrain.SetupLayerVisibility();
+        Entrances.SetupLayerVisibility();
+
+        Entities.SelectEntity(null);
+        //Entities.Teams.LoadTeams();
+        Spawns.LoadMapSpawns();
+        Effects.LoadMapEffects();
+        Properties.LoadMapProperties();
+    }
+
+    private void DoImportPng(string filePath)
+    {
+        DevForm.ExecuteOrPend(() => { tryImportPng(filePath); });
+
+        string sheetName = Path.GetFileNameWithoutExtension(filePath);
+        lock (GameBase.lockObj)
+        {
+            Textures.TileBrowser.UpdateTilesList();
+            Terrain.TileBrowser.UpdateTilesList();
+        }
+
+        Textures.TileBrowser.SelectTileset(sheetName);
+        Terrain.TileBrowser.SelectTileset(sheetName);
+    }
+
+    private void tryImportPng(string filePath)
+    {
+        lock (GameBase.lockObj)
+        {
+            string sheetName = Path.GetFileNameWithoutExtension(filePath);
+            string outputFile = PathMod.HardMod(String.Format(GraphicsManager.TILE_PATTERN, sheetName));
+
+            //load into tilesets
+            using (BaseSheet tileset = BaseSheet.Import(filePath))
+            {
+                List<BaseSheet[]> tileList = new List<BaseSheet[]>();
+                tileList.Add(new BaseSheet[] { tileset });
+                ImportHelper.SaveTileSheet(tileList, outputFile, GraphicsManager.TileSize);
+            }
+
+            GraphicsManager.RebuildIndices(GraphicsManager.AssetType.Tile);
+            GraphicsManager.ClearCaches(GraphicsManager.AssetType.Tile);
+            DevDataManager.ClearCaches();
+        }
+    }
+
+    private void DoClearLayer()
+    {
+        //TODO: support undo for this
+        DiagManager.Instance.DevEditor.MapEditor.Edits.Clear();
+
+        DiagManager.Instance.LoadMsg = "Loading Map...";
+        DevForm.EnterLoadPhase(GameBase.LoadPhase.Content);
+
+        //set tilesets
+        for (int yy = 0; yy < ZoneManager.Instance.CurrentMap.Height; yy++)
+        {
+            for (int xx = 0; xx < ZoneManager.Instance.CurrentMap.Width; xx++)
+                ZoneManager.Instance.CurrentMap.Layers[Textures.Layers.ChosenLayer].Tiles[xx][yy] = new AutoTile();
+        }
+
+        DevForm.EnterLoadPhase(GameBase.LoadPhase.Ready);
+    }
+
+    private void DoImportTileset(string sheetName)
+    {
+        //TODO: support undo for this
+        DiagManager.Instance.DevEditor.MapEditor.Edits.Clear();
+
+        Loc newSize = GraphicsManager.TileIndex.GetTileDims(sheetName);
+
+        DiagManager.Instance.LoadMsg = "Loading Map...";
+        DevForm.EnterLoadPhase(GameBase.LoadPhase.Content);
+
+        ZoneManager.Instance.CurrentMap.ResizeJustified(newSize.X, newSize.Y, Dir8.UpLeft);
+
+        //set tilesets
+        for (int yy = 0; yy < newSize.Y; yy++)
+        {
+            for (int xx = 0; xx < newSize.X; xx++)
+                ZoneManager.Instance.CurrentMap.Layers[Textures.Layers.ChosenLayer].Tiles[xx][yy] =
+                    new AutoTile(new TileLayer(new Loc(xx, yy), sheetName));
+        }
+
+        DevForm.EnterLoadPhase(GameBase.LoadPhase.Ready);
+    }
+
+    private void DoSave(Map curmap, string filepath, string oldfname)
+    {
+        curmap.AssetName = Path.GetFileNameWithoutExtension(filepath); //Set the assetname to the file name!
+        DataManager.SaveObject(curmap, filepath);
+
+        CurrentFile = filepath;
+    }
+
+    private void ExportToGround(Map curmap, string filepath)
+    {
+        GroundMap curgrnd = new GroundMap();
+        curgrnd.CreateNew(curmap.Width, curmap.Height, GraphicsManager.DungeonTexSize);
+
+        curgrnd.Layers.Clear();
+
+        foreach (MapLayer layer in curmap.Layers)
+        {
+            if (layer.Layer == DrawLayer.Under)
+            {
+                //Add layers marked "under", using DrawLayer.Bottom
+                MapLayer newLayer = new MapLayer(layer.Name);
+                newLayer.Layer = DrawLayer.Bottom;
+                newLayer.Visible = layer.Visible;
+                newLayer.Tiles = layer.Tiles;
+                curgrnd.Layers.Add(newLayer);
+            }
+        }
+
+        //Add terrain
+        {
+            MapLayer newLayer = new MapLayer("Terrain");
+            newLayer.CreateNew(curmap.Width, curmap.Height);
+            newLayer.Layer = DrawLayer.Bottom;
+            newLayer.Visible = true;
+            for (int xx = 0; xx < curmap.Width; xx++)
+            {
+                for (int yy = 0; yy < curmap.Height; yy++)
+                    newLayer.Tiles[xx][yy] = curmap.Tiles[xx][yy].Data.TileTex;
+            }
+
+            curgrnd.Layers.Add(newLayer);
+        }
+
+        //Add layers marked Bottom, using DrawLayer.Bottom
+        foreach (MapLayer layer in curmap.Layers)
+        {
+            if (layer.Layer != DrawLayer.Under && layer.Layer != DrawLayer.Top)
+            {
+                //Add layers marked "under", using DrawLayer.Bottom
+                MapLayer newLayer = new MapLayer(layer.Name);
+                newLayer.Layer = DrawLayer.Bottom;
+                newLayer.Visible = layer.Visible;
+                newLayer.Tiles = layer.Tiles;
+                curgrnd.Layers.Add(newLayer);
+            }
+        }
+
+        //add layers marked top, using DrawLayer.Top
+        foreach (MapLayer layer in curmap.Layers)
+        {
+            if (layer.Layer == DrawLayer.Top)
+            {
+                //Add layers marked "Top", using DrawLayer.Top
+                MapLayer newLayer = new MapLayer(layer.Name);
+                newLayer.Layer = DrawLayer.Top;
+                newLayer.Visible = layer.Visible;
+                newLayer.Tiles = layer.Tiles;
+                curgrnd.Layers.Add(newLayer);
+            }
+        }
+
+        //Add decorations
+        curgrnd.Decorations.Clear();
+        foreach (AnimLayer layer in curmap.Decorations)
+        {
+            AnimLayer newLayer = new AnimLayer(layer.Name);
+            newLayer.Layer = layer.Layer;
+            newLayer.Visible = layer.Visible;
+            newLayer.Anims = layer.Anims;
+            curgrnd.Decorations.Add(newLayer);
+        }
+
+        curgrnd.AssetName = Path.GetFileNameWithoutExtension(filepath); //Set the assetname to the file name!
+        DataManager.SaveObject(curgrnd, filepath);
+
+        //Actually create the script folder, and default script file.
+        GroundEditViewModel.CreateOrCopyScriptData("", filepath);
+
+        CurrentFile = filepath;
+    }
+
+
+    private static bool comparePaths(string path1, string path2)
+    {
+        return String.Compare(Path.GetFullPath(path1).TrimEnd('\\').TrimEnd('/'),
+            Path.GetFullPath(path2).TrimEnd('\\').TrimEnd('/'),
+            StringComparison.InvariantCultureIgnoreCase) == 0;
+    }
+
+
+    public void TabChanged()
+    {
+        switch (selectedTabIndex)
+        {
+            case 0: //Textures
+                DungeonEditScene.Instance.EditMode = DungeonEditScene.EditorMode.Texture;
+                break;
+            case 1: //Decorations
+                DungeonEditScene.Instance.EditMode = DungeonEditScene.EditorMode.Decoration;
+                Decorations.TabbedIn();
+                break;
+            case 2: //Terrain
+                DungeonEditScene.Instance.EditMode = DungeonEditScene.EditorMode.Terrain;
+                break;
+            case 3: //Tiles
+                DungeonEditScene.Instance.EditMode = DungeonEditScene.EditorMode.Tile;
+                break;
+            case 4: //Items
+                DungeonEditScene.Instance.EditMode = DungeonEditScene.EditorMode.Item;
+                Items.TabbedIn();
+                break;
+            case 5: //Entities
+                DungeonEditScene.Instance.EditMode = DungeonEditScene.EditorMode.Entity;
+                Entities.TabbedIn();
+                break;
+            case 6: //Entrances
+                DungeonEditScene.Instance.EditMode = DungeonEditScene.EditorMode.Entrance;
+                break;
+            default:
+                DungeonEditScene.Instance.EditMode = DungeonEditScene.EditorMode.Other;
+                break;
+        }
+
+        if (selectedTabIndex != 1)
+            Decorations.TabbedOut();
+        if (selectedTabIndex != 4)
+            Items.TabbedOut();
+        if (selectedTabIndex != 5)
+            Entities.TabbedOut();
+    }
+
+    public void _processInput(InputManager input)
+    {
+        lock (GameBase.lockObj)
+        {
+            if (input.BaseKeyDown(Microsoft.Xna.Framework.Input.Keys.LeftControl))
+            {
+                if (input.BaseKeyPressed(Microsoft.Xna.Framework.Input.Keys.Z) &&
+                    input.BaseKeyDown(Microsoft.Xna.Framework.Input.Keys.LeftShift)
+                    || input.BaseKeyPressed(Microsoft.Xna.Framework.Input.Keys.Y))
+                {
+                    mnuRedo_Click();
+                    return;
+                }
+                else if (input.BaseKeyPressed(Microsoft.Xna.Framework.Input.Keys.Z))
+                {
+                    mnuUndo_Click();
+                    return;
+                }
+            }
+
+            switch (selectedTabIndex)
+            {
+                case 0: //Textures
+                    Textures.ProcessInput(input);
+                    break;
+                case 1: //Decorations
+                    Decorations.ProcessInput(input);
+                    break;
+                case 2: //Terrain
+                    Terrain.ProcessInput(input);
+                    break;
+                case 3: //Tiles
+                    Tiles.ProcessInput(input);
+                    break;
+                case 4: //Items
+                    Items.ProcessInput(input);
+                    break;
+                case 5: //Entities
+                    Entities.ProcessInput(input);
+                    break;
+                case 6: //Entrances
+                    Entrances.ProcessInput(input);
+                    break;
+            }
+        }
+    }
+
+    public void ProcessUndo()
+    {
+        lock (GameBase.lockObj)
+        {
+            switch (selectedTabIndex)
+            {
+                case 3: //Items
+                    Items.ProcessUndo();
+                    break;
+                case 4: //Entities
+                    Entities.ProcessUndo();
+                    break;
+                case 5: //Entrances
+                    Entrances.ProcessUndo();
+                    break;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ZoneEditorPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ZoneEditorPageViewModel.cs
deleted file mode 100644
index 68005a48..00000000
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ZoneEditorPageViewModel.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System;
-using RogueEssence.Dev.Services;
-
-namespace RogueEssence.Dev.ViewModels;
-
-public class ZoneEditorPageViewModel : EditorPageViewModel
-{
-    // public override string Title => "Zone Editor";
-    
-    public ZoneEditorPageViewModel(EditorContext context, NodeBase node, Action<EditorPageViewModel> onPageOpen = null) : base(context, node, onPageOpen)
-    {
-        
-    }
-    
-}
-    
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/MapEditorPageView.axaml b/RogueEssence.Editor.Avalonia/Views/New/Editors/MapEditorPageView.axaml
new file mode 100644
index 00000000..02184f11
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/Views/New/Editors/MapEditorPageView.axaml
@@ -0,0 +1,72 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:vm="using:RogueEssence.Dev.ViewModels"
+             xmlns:v="using:RogueEssence.Dev.Views"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:DataType="vm:MapEditorPageViewModel"
+             x:Class="RogueEssence.Dev.Views.MapEditorPageView">
+  <Design.DataContext>
+    <vm:MapEditorPageViewModel></vm:MapEditorPageViewModel>
+  </Design.DataContext>
+    <TextBlock>Hi</TextBlock>
+  <!-- <DockPanel> -->
+  <!--   <Menu DockPanel.Dock="Top"> -->
+  <!--     <MenuItem Header="_File"> -->
+  <!--       <MenuItem Header="_New" Command="{Binding mnuNew_Click}"/> -->
+  <!--       <MenuItem Header="_Open" Command="{Binding mnuOpen_Click}"/> -->
+  <!--       <MenuItem Header="_Save" Command="{Binding mnuSave_Click}"/> -->
+  <!--       <MenuItem Header="_Save As" Command="{Binding mnuSaveAs_Click}"/> -->
+  <!--       <MenuItem Header="_Save and Test" Command="{Binding mnuTest_Click}"/> -->
+  <!--       <MenuItem Header="_Export as Ground" Command="{Binding mnuExportAsGround_Click}"/> -->
+  <!--     </MenuItem> -->
+  <!--     <MenuItem Header="_Edit"> -->
+  <!--       <MenuItem Header="Resize Map" Command="{Binding mnuReSize_Click}"/> -->
+  <!--       <Separator/> -->
+  <!--       <MenuItem Header="Undo" Command="{Binding mnuUndo_Click}"/> -->
+  <!--       <MenuItem Header="Redo" Command="{Binding mnuRedo_Click}"/> -->
+  <!--     </MenuItem> -->
+  <!--     <MenuItem Header="_Tiles"> -->
+  <!--       <MenuItem Header="_Load from .png into Tileset" Command="{Binding mnuImportFromPng_Click}"/> -->
+  <!--       <MenuItem Header="_Load Tileset into Layer" Command="{Binding mnuImportFromTileset_Click}"/> -->
+  <!--       <MenuItem Header="_Clear Layer" Command="{Binding mnuClearLayer_Click}"/> -->
+  <!--       <MenuItem Header="_Load Standardize Frame Length" Command="{Binding mnuStandardizeFrameLength_Click}"/> -->
+  <!--     </MenuItem> -->
+  <!--   </Menu> -->
+  <!--   <Grid> -->
+  <!--     <TabControl Name="tabOptions" TabStripPlacement="Top" SelectedIndex="{Binding SelectedTabIndex}" Margin="2"> -->
+  <!--       <TabItem Name="tabTextures" Header="Textures" > -->
+  <!--         <v:MapTabTextures DataContext="{Binding Textures}"/> -->
+  <!--       </TabItem> -->
+  <!--       <TabItem Name="tabDecorations" Header="Decorations" > -->
+  <!--         <v:MapTabDecorations DataContext="{Binding Decorations}"/> -->
+  <!--       </TabItem> -->
+  <!--       <TabItem Name="tabTerrain" Header="Terrain" > -->
+  <!--         <v:MapTabTerrain DataContext="{Binding Terrain}"/> -->
+  <!--       </TabItem> -->
+  <!--       <TabItem Name="tabTiles" Header="Tiles" > -->
+  <!--         <v:MapTabTiles DataContext="{Binding Tiles}"/> -->
+  <!--       </TabItem> -->
+  <!--       <TabItem Name="tabItems" Header="Items" > -->
+  <!--         <v:MapTabItems DataContext="{Binding Items}"/> -->
+  <!--       </TabItem> -->
+  <!--       <TabItem Name="tabEntities" Header="Entities" > -->
+  <!--         <v:MapTabEntities DataContext="{Binding Entities}"/> -->
+  <!--       </TabItem> -->
+  <!--       <TabItem Name="tabEntrances" Header="Entrances" > -->
+  <!--         <v:MapTabEntrances DataContext="{Binding Entrances}"/> -->
+  <!--       </TabItem> -->
+  <!--       <TabItem Name="tabSpawns" Header="Spawns" > -->
+  <!--         <v:MapTabSpawns DataContext="{Binding Spawns}"/> -->
+  <!--       </TabItem> -->
+  <!--       <TabItem Name="tabEffects" Header="Effects" > -->
+  <!--         <v:MapTabEffects DataContext="{Binding Effects}"/> -->
+  <!--       </TabItem> -->
+  <!--       <TabItem Name="tabProperties" Header="Properties" > -->
+  <!--         <v:MapTabProperties DataContext="{Binding Properties}"/> -->
+  <!--       </TabItem> -->
+  <!--     </TabControl> -->
+  <!--   </Grid> -->
+  <!-- </DockPanel> -->
+</UserControl>
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/ZoneEditorPageView.axaml.cs b/RogueEssence.Editor.Avalonia/Views/New/Editors/MapEditorPageView.axaml.cs
similarity index 93%
rename from RogueEssence.Editor.Avalonia/Views/New/Editors/ZoneEditorPageView.axaml.cs
rename to RogueEssence.Editor.Avalonia/Views/New/Editors/MapEditorPageView.axaml.cs
index ec7a0c7a..0f33bd46 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/Editors/ZoneEditorPageView.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/New/Editors/MapEditorPageView.axaml.cs
@@ -13,9 +13,9 @@ public class ZoneMockEntry
     public int MapCount { get; set; }
     public string Music { get; set; }
 }
-public partial class ZoneEditorPageView : UserControl
+public partial class MapEditorPageView : UserControl
 {
-    public ZoneEditorPageView()
+    public MapEditorPageView()
     {
         InitializeComponent();
         // ZoneDataGrid.ItemsSource = GetMockData();
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/ModListPageView.axaml b/RogueEssence.Editor.Avalonia/Views/New/Editors/ModListPageView.axaml
index 886a7986..2785ce26 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/Editors/ModListPageView.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/New/Editors/ModListPageView.axaml
@@ -11,8 +11,6 @@
         <vm:ModListPageViewModel/>
     </Design.DataContext>
     <Grid RowDefinitions="64, Auto, Auto, Auto">
-
-
         <TextBlock Grid.Row="1" HorizontalAlignment="Center" Classes="table_header" FontSize="16"
                    Text="Mods" />
 
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/ZoneEditorPageView.axaml b/RogueEssence.Editor.Avalonia/Views/New/Editors/ZoneEditorPageView.axaml
deleted file mode 100644
index 2c75fd7e..00000000
--- a/RogueEssence.Editor.Avalonia/Views/New/Editors/ZoneEditorPageView.axaml
+++ /dev/null
@@ -1,29 +0,0 @@
-<UserControl xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:vm="using:RogueEssence.Dev.ViewModels"
-             xmlns:v="using:RogueEssence.Dev.Views"
-             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:DataType="vm:ZoneEditorPageViewModel"
-             x:Class="RogueEssence.Dev.Views.ZoneEditorPageView">
-    <ScrollViewer>
-        <TextBlock>Hi there, this is just a temporary page! The end is never the end is never the end is never the end.</TextBlock>
-        <!-- <StackPanel Spacing="8" Margin="16"> -->
-        <!--     <TextBlock Text="Zone Edit" FontSize="24" FontWeight="Bold"/> -->
-        <!--     <DataGrid x:Name="ZoneDataGrid" -->
-        <!--               x:DataType="v:ZoneMockEntry" -->
-        <!--               Classes="default" -->
-        <!-- -->
-        <!--               > -->
-        <!--         <DataGrid.Columns> -->
-        <!--             <DataGridTextColumn Header="ID" Binding="{Binding Id}" Width="60"/> -->
-        <!--             <DataGridTextColumn Header="Name" Binding="{Binding Name}" Width="200"/> -->
-        <!--             <DataGridTextColumn Header="Level Range" Binding="{Binding LevelRange}" Width="120"/> -->
-        <!--             <DataGridTextColumn Header="Map Count" Binding="{Binding MapCount}" Width="100"/> -->
-        <!--             <DataGridTextColumn Header="Music" Binding="{Binding Music}" Width="200"/> -->
-        <!--         </DataGrid.Columns> -->
-        <!--     </DataGrid> -->
-        <!-- </StackPanel> -->
-    </ScrollViewer>
-</UserControl>
\ No newline at end of file

From a302aa623dcd1e159016ad77ce1e3b06998725db Mon Sep 17 00:00:00 2001
From: Kace <41309226+DoubleTrio@users.noreply.github.com>
Date: Tue, 19 May 2026 01:00:40 -0400
Subject: [PATCH 33/51] map edit page progress

---
 .../Assets/ListBoxStyles.axaml                |  10 +
 .../Assets/Styles.axaml                       |  83 ++++-
 .../DataEditor/Editors/Editor.cs              |   2 +-
 .../RogueElements/PriorityListEditor.cs       |   4 +-
 .../Editors/RogueElements/RangeDictEditor.cs  |   4 +-
 .../Editors/RogueElements/SpawnListEditor.cs  |   2 +-
 .../RogueElements/SpawnRangeListEditor.cs     |   2 +-
 .../Editors/RogueElements/TypeDictEditor.cs   |   2 +-
 .../RogueEssence/CategorySpawnEditor.cs       |   6 +-
 .../RogueEssence/Tiles/AutoTileBaseEditor.cs  |   2 +-
 .../Editors/RogueEssence/Tiles/TileBox.axaml  |   8 +-
 .../DataEditor/Editors/System/ArrayEditor.cs  |   2 +-
 .../Editors/System/DictionaryEditor.cs        |   5 +-
 .../Editors/System/HashSetEditor.cs           |   2 +-
 .../DataEditor/Editors/System/ListEditor.cs   |   2 +-
 .../Editors/System/NoDupeListEditor.cs        |   2 +-
 .../EditorContext/NodeFactory.cs              |   9 +-
 .../EditorContext/PageFactory.cs              |  19 +-
 .../ViewModels/DevForm/DevTabDataViewModel.cs |   2 +-
 .../Layers/AnimLayerBoxViewModel.cs           |   3 +-
 .../Layers/TextureLayerBoxViewModel.cs        |   4 +-
 .../MapEditForm/MapEditViewModel.cs           | 291 +++++++++---------
 .../MapEditForm/MapTabEffectsViewModel.cs     | 101 +++---
 .../MapEditForm/MapTabEntitiesViewModel.cs    |  67 ++--
 .../MapEditForm/MapTabPropertiesViewModel.cs  | 113 ++++---
 .../MapEditForm/MapTabTilesViewModel.cs       |  46 +--
 .../ViewModels/New/DevFormViewModel.cs        | 122 +++++---
 .../New/Editors/DataListPageViewModel.cs      |   2 +-
 .../New/Editors/EditorPageViewModel.cs        |  11 +
 .../New/Editors/MapEditorPageViewModel.cs     | 261 +++++++++++-----
 .../New/Editors/ModConfigPageViewModel.cs     |   3 +-
 .../New/Editors/ReflectedDataPageViewModel.cs |   2 +-
 .../UserControls/TeamBoxViewModel.cs          |   2 +-
 .../Views/MapEditForm/MapEditForm.axaml.cs    |   2 +-
 .../Views/MapEditForm/MapTabEffects.axaml     |  20 +-
 .../Views/MapEditForm/MapTabEntrances.axaml   |   4 +-
 .../Views/MapEditForm/MapTabProperties.axaml  |  38 +--
 .../Views/MapEditForm/MapTabTiles.axaml       |  47 +--
 .../Views/New/DevForm.axaml.cs                |  33 +-
 .../Views/New/Editors/DataListPageView.axaml  |  14 +-
 .../Views/New/Editors/MapEditorPageView.axaml | 118 +++----
 RogueEssence/Dev/EmptyEditor.cs               |   2 +-
 RogueEssence/Dev/IRootEditor.cs               |   2 +-
 RogueEssence/DiagManager.cs                   |   2 +-
 44 files changed, 822 insertions(+), 656 deletions(-)

diff --git a/RogueEssence.Editor.Avalonia/Assets/ListBoxStyles.axaml b/RogueEssence.Editor.Avalonia/Assets/ListBoxStyles.axaml
index 5d9a166c..5e99ddd3 100644
--- a/RogueEssence.Editor.Avalonia/Assets/ListBoxStyles.axaml
+++ b/RogueEssence.Editor.Avalonia/Assets/ListBoxStyles.axaml
@@ -6,4 +6,14 @@
             <Setter Property="Padding" Value="4,2"/>
         </ControlTheme>
     </Styles.Resources>
+
+    <Style Selector="ListBox.datalist">
+        <Setter Property="Background" Value="{DynamicResource Brush.ListBox.Background}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource Brush.Border2}" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="ItemContainerTheme" Value="{StaticResource CompactListBoxItem}" />
+    </Style>
+    <Style Selector="ListBox.datalist ListBoxItem">
+        <Setter Property="Background" Value="{DynamicResource Brush.ListBox.Background}" />
+    </Style>
 </Styles>
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Assets/Styles.axaml b/RogueEssence.Editor.Avalonia/Assets/Styles.axaml
index fc77f610..8d13812c 100644
--- a/RogueEssence.Editor.Avalonia/Assets/Styles.axaml
+++ b/RogueEssence.Editor.Avalonia/Assets/Styles.axaml
@@ -10,6 +10,62 @@
         </StackPanel>
     </Design.PreviewWith>
 
+    <Style Selector="RadioButton">
+        <Setter Property="Template">
+            <ControlTemplate TargetType="RadioButton">
+                <Border
+                    Name="RootBorder"
+                    Background="{TemplateBinding Background}"
+                    BorderBrush="{TemplateBinding BorderBrush}"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    CornerRadius="{TemplateBinding CornerRadius}">
+                    <Grid ColumnDefinitions="16,*">
+                        <Grid Height="{DynamicResource RadioButtonMinHeight}" VerticalAlignment="Center">
+
+                            <Ellipse
+                                Name="OuterEllipse"
+                                Width="16"
+                                Height="16"
+                                Fill="{DynamicResource RadioButtonOuterEllipseFill}"
+                                Stroke="{DynamicResource RadioButtonOuterEllipseStroke}"
+                                StrokeThickness="{DynamicResource RadioButtonBorderThemeThickness}"
+                                UseLayoutRounding="False" />
+
+                            <Ellipse
+                                Name="CheckOuterEllipse"
+                                Width="16"
+                                Height="16"
+                                Fill="{DynamicResource RadioButtonOuterEllipseCheckedFill}"
+                                Opacity="0"
+                                Stroke="{DynamicResource RadioButtonOuterEllipseCheckedStroke}"
+                                StrokeThickness="{DynamicResource RadioButtonBorderThemeThickness}"
+                                UseLayoutRounding="False" />
+
+                            <Ellipse
+                                Name="CheckGlyph"
+                                Width="6"
+                                Height="6"
+                                Fill="{DynamicResource RadioButtonCheckGlyphFill}"
+                                Opacity="0"
+                                Stroke="{DynamicResource RadioButtonCheckGlyphStroke}"
+                                UseLayoutRounding="False" />
+                        </Grid>
+
+                        <ContentPresenter
+                            Name="PART_ContentPresenter"
+                            Grid.Column="1"
+                            Margin="{TemplateBinding Padding}"
+                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                            Content="{TemplateBinding Content}"
+                            ContentTemplate="{TemplateBinding ContentTemplate}"
+                            Foreground="{TemplateBinding Foreground}" />
+                    </Grid>
+                </Border>
+            </ControlTemplate>
+        </Setter>
+
+    </Style>
 
     <Style Selector="Expander">
         <Setter Property="HorizontalContentAlignment" Value="Stretch"></Setter>
@@ -65,11 +121,12 @@
         </Style>
 
         <Style Selector="^ /template/ ToggleButton#ExpanderHeader /template/ Border#ExpandCollapseChevronBorder">
-            <Setter Property="RenderTransform" Value="rotate(90deg)"/>
+            <Setter Property="RenderTransform" Value="rotate(90deg)" />
         </Style>
 
-        <Style Selector="^:expanded /template/ ToggleButton#ExpanderHeader /template/ Border#ExpandCollapseChevronBorder">
-            <Setter Property="RenderTransform" Value="rotate(180deg)"/>
+        <Style
+            Selector="^:expanded /template/ ToggleButton#ExpanderHeader /template/ Border#ExpandCollapseChevronBorder">
+            <Setter Property="RenderTransform" Value="rotate(180deg)" />
         </Style>
     </Style>
     <Style Selector="UserControl">
@@ -779,14 +836,14 @@
     <!-- </Style> -->
 
     <Style Selector="TextBox.search">
-        <Setter Property="Height" Value="24"/>
-        <Setter Property="HorizontalAlignment" Value="Stretch"/>
-        <Setter Property="Margin" Value="0"/>
-        <Setter Property="BorderThickness" Value="1"/>
-        <Setter Property="CornerRadius" Value="0"/>
-        <Setter Property="Watermark" Value="Search..."/>
-        <Setter Property="BorderBrush" Value="{DynamicResource Brush.Border2}"/>
-        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="Height" Value="24" />
+        <Setter Property="HorizontalAlignment" Value="Stretch" />
+        <Setter Property="Margin" Value="0" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="CornerRadius" Value="0" />
+        <Setter Property="Watermark" Value="Search..." />
+        <Setter Property="BorderBrush" Value="{DynamicResource Brush.Border2}" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
         <Setter Property="InnerLeftContent">
             <Setter.Value>
                 <Template>
@@ -799,8 +856,8 @@
             </Setter.Value>
         </Setter>
     </Style>
-    
-    
+
+
     <Style Selector="NumericUpDown">
         <Style Selector="^ /template/ ButtonSpinner#PART_Spinner">
             <Setter Property="MinHeight" Value="0" />
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/Editor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/Editor.cs
index 5568606e..e8b2e632 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/Editor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/Editor.cs
@@ -332,7 +332,7 @@ void IEditor.LoadClassControls(StackPanel control, string parent, Type parentTyp
                     
                                     
                     string title = DataEditor.GetWindowTitle(parent, name, element, type, ReflectionExt.GetPassableAttributes(0, attributes));
-                    NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(title, vm.Node.Icon, vm.Node);
+                    NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(title, vm.Node, vm.Node.Icon);
                     vm.Node.AddNodeIfNotExists(node);
                     
                     NodeHelper.ExpandParents(node, true);
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/PriorityListEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/PriorityListEditor.cs
index 0077ee83..0a199fd1 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/PriorityListEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/PriorityListEditor.cs
@@ -61,7 +61,7 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
                 string elementName = name + "[" + priority.ToString() + "]";
                 string title = DataEditor.GetWindowTitle(parent, elementName, element, elementType, ReflectionExt.GetPassableAttributes(2, attributes));
 
-                NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(elementName, pageViewModel.Node.Icon, pageViewModel.Node);
+                NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(elementName, pageViewModel.Node, pageViewModel.Node.Icon);
                 pageViewModel.Node.AddNodeIfNotExists(node);
 
                 NodeHelper.ExpandParents(node, true);
@@ -88,7 +88,7 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
                 EditorPageViewModel pageViewModel = control.FindAncestorViewModel<EditorPageViewModel>();
                 string elementName = name + "<Priority>";
         
-                NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(elementName, pageViewModel.Node.Icon);
+                NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(elementName, null, pageViewModel.Node.Icon);
                 pageViewModel.Node.AddNodeIfNotExists(node);
 
                 NodeHelper.ExpandParents(node, true);
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/RangeDictEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/RangeDictEditor.cs
index e5585243..2166a909 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/RangeDictEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/RangeDictEditor.cs
@@ -80,7 +80,7 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
                 string elementName = name + "[" + key.ToString() + "]";
                 // string title = DataEditor.GetWindowTitle(parent, elementName, element, elementType, ReflectionExt.GetPassableAttributes(1, attributes));
 
-                NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(elementName, pageViewModel.Node.Icon, pageViewModel.Node);
+                NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(elementName, pageViewModel.Node, pageViewModel.Node.Icon);
                 pageViewModel.Node.AddNodeIfNotExists(node);
 
                 NodeHelper.ExpandParents(node, true);
@@ -113,7 +113,7 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
 
                 // string title = DataEditor.GetWindowTitle(parent, elementName, key, keyType, attrList.ToArray());
 
-                NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(elementName, pageViewModel.Node.Icon);
+                NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(elementName, null, pageViewModel.Node.Icon);
                 pageViewModel.Node.AddNodeIfNotExists(node);
 
                 NodeHelper.ExpandParents(node, true);
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/SpawnListEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/SpawnListEditor.cs
index d80b6988..ba08fbb4 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/SpawnListEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/SpawnListEditor.cs
@@ -52,7 +52,7 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
                 string elementName = name + "[" + index + "]";
                 // string title = DataEditor.GetWindowTitle(parent, elementName, element, elementType, ReflectionExt.GetPassableAttributes(1, attributes));
 
-                NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(elementName, pageViewModel.Node.Icon, pageViewModel.Node);
+                NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(elementName, pageViewModel.Node, pageViewModel.Node.Icon);
                 pageViewModel.Node.AddNodeIfNotExists(node);
 
                 NodeHelper.ExpandParents(node, true);
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/SpawnRangeListEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/SpawnRangeListEditor.cs
index 8e1a821b..2303f70b 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/SpawnRangeListEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/SpawnRangeListEditor.cs
@@ -76,7 +76,7 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
                 string elementName = name + "[" + index + "]";
                 // string title = DataEditor.GetWindowTitle(parent, elementName, element, elementType, ReflectionExt.GetPassableAttributes(2, attributes));
 
-                NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(elementName, pageViewModel.Node.Icon, pageViewModel.Node);
+                NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(elementName, pageViewModel.Node, pageViewModel.Node.Icon);
                 pageViewModel.Node.AddNodeIfNotExists(node);
 
                 NodeHelper.ExpandParents(node, true);
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/TypeDictEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/TypeDictEditor.cs
index 1ea40404..c5cfff30 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/TypeDictEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/TypeDictEditor.cs
@@ -57,7 +57,7 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
                 // string title = DataEditor.GetWindowTitle(parent, elementName, element, elementType, ReflectionExt.GetPassableAttributes(1, attributes));
 
                 NodeBase node =
-                    _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(elementName,
+                    _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(elementName, null,
                         pageViewModel.Node.Icon);
                 pageViewModel.Node.AddNodeIfNotExists(node);
 
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/CategorySpawnEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/CategorySpawnEditor.cs
index accf089e..fb5c7e3d 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/CategorySpawnEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/CategorySpawnEditor.cs
@@ -68,7 +68,7 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
                 string elementName = name + "[" + key.ToString() + "]";
                 // string title = DataEditor.GetWindowTitle(parent, elementName, element, elementType, ReflectionExt.GetPassableAttributes(2, attributes));
 
-                NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(elementName, pageViewModel.Node.Icon, pageViewModel.Node);
+                NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(elementName, pageViewModel.Node, pageViewModel.Node.Icon);
                 pageViewModel.Node.AddNodeIfNotExists(node);
 
                 NodeHelper.ExpandParents(node, true);
@@ -96,7 +96,7 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
                 string elementName = name + "<Key>";
                 // string title = DataEditor.GetWindowTitle(parent, elementName, key, keyType, ReflectionExt.GetPassableAttributes(1, attributes));
 
-                NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(elementName, pageViewModel.Node.Icon, pageViewModel.Node);
+                NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(elementName, pageViewModel.Node, pageViewModel.Node.Icon);
                 pageViewModel.Node.AddNodeIfNotExists(node);
 
                 NodeHelper.ExpandParents(node, true);
@@ -261,7 +261,7 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
                 string elementName = name + "[" + index + "]";
                 string title = DataEditor.GetWindowTitle(parent, elementName, key, keyType, ReflectionExt.GetPassableAttributes(1, attributes));
 
-                NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(elementName, pageViewModel.Node.Icon);
+                NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(elementName, null, pageViewModel.Node.Icon);
                 pageViewModel.Node.AddNodeIfNotExists(node);
 
                 NodeHelper.ExpandParents(node, true);
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Tiles/AutoTileBaseEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Tiles/AutoTileBaseEditor.cs
index 522b2a6d..002065ca 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Tiles/AutoTileBaseEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Tiles/AutoTileBaseEditor.cs
@@ -34,7 +34,7 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
                 object[] elementAttr = new object[1];
                 elementAttr[0] = new AnimAttribute(0, "Tile");
 
-                NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(title, pageViewModel.Node.Icon, pageViewModel.Node);
+                NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(title, pageViewModel.Node, pageViewModel.Node.Icon);
                 pageViewModel.Node.AddNodeIfNotExists(node);
 
                 NodeHelper.ExpandParents(node, true);
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Tiles/TileBox.axaml b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Tiles/TileBox.axaml
index 716f4069..4c7ec438 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Tiles/TileBox.axaml
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Tiles/TileBox.axaml
@@ -12,12 +12,8 @@
   <UserControl.Resources>
     <converters:TileConverter x:Key="TileConverter"/>
   </UserControl.Resources>
-  <Grid>
-    <Grid.ColumnDefinitions>
-      <ColumnDefinition Width="80"/>
-      <ColumnDefinition/>
-    </Grid.ColumnDefinitions>
-    <Button Command="{Binding btnEdit_Click}">Edit</Button>
+  <Grid ColumnDefinitions="80, *">
+    <Button Classes="flat" Command="{Binding btnEdit_Click}">Edit</Button>
     <Image Source="{Binding Preview, Converter={StaticResource TileConverter}}" Margin="4" VerticalAlignment="Center" HorizontalAlignment="Left" Stretch="None" Grid.Column="1"/>
   </Grid>
 </UserControl>
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/ArrayEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/ArrayEditor.cs
index 6eb6c7dc..8e04d71b 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/ArrayEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/ArrayEditor.cs
@@ -78,7 +78,7 @@ private CollectionBoxViewModel createViewModel(StackPanel control, string parent
                 string elementName = name + "[" + index + "]";
                 string title = DataEditor.GetWindowTitle(parent, elementName, element, elementType, ReflectionExt.GetPassableAttributes(0, attributes));
 
-                NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(elementName, pageViewModel.Node.Icon);
+                NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(elementName, pageViewModel.Node, pageViewModel.Node.Icon);
                 pageViewModel.Node.AddNodeIfNotExists(node);
 
                 NodeHelper.ExpandParents(node, true);
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/DictionaryEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/DictionaryEditor.cs
index 243055fa..92132540 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/DictionaryEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/DictionaryEditor.cs
@@ -56,8 +56,7 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
                     ReflectionExt.GetPassableAttributes(2, attributes));
 
                 NodeBase node =
-                    _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(title,
-                        pageViewModel.Node.Icon, pageViewModel.Node);
+                    _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(title, pageViewModel.Node, pageViewModel.Node.Icon);
                 pageViewModel.Node.AddNodeIfNotExists(node);
 
                 NodeHelper.ExpandParents(node, true);
@@ -91,7 +90,7 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
                     ReflectionExt.GetPassableAttributes(1, attributes));
 
                 NodeBase node =
-                    _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(elementName, pageViewModel.Node.Icon);
+                    _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(elementName, pageViewModel.Node, pageViewModel.Node.Icon);
                 pageViewModel.Node.AddNodeIfNotExists(node);
 
                 NodeHelper.ExpandParents(node, true);
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/HashSetEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/HashSetEditor.cs
index a101e388..e5443b4e 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/HashSetEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/HashSetEditor.cs
@@ -50,7 +50,7 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
                 string elementName = name + "[" + index + "]";
                 string title = DataEditor.GetWindowTitle(parent, elementName, element, elementType, ReflectionExt.GetPassableAttributes(1, attributes));
 
-                NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(elementName, pageViewModel.Node.Icon, pageViewModel.Node);
+                NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(elementName, pageViewModel.Node, pageViewModel.Node.Icon);
                 pageViewModel.Node.AddNodeIfNotExists(node);
 
                 NodeHelper.ExpandParents(node, true);
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/ListEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/ListEditor.cs
index 65a9e694..4b227aa7 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/ListEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/ListEditor.cs
@@ -193,7 +193,7 @@ private CollectionBoxViewModel createViewModel(StackPanel control, string parent
                 string elementName = name + "[" + index + "]";
                 // string title = DataEditor.GetWindowTitle(parent, elementName, element, elementType, ReflectionExt.GetPassableAttributes(1, attributes));
 
-                NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(elementName, pageViewModel.Node.Icon, pageViewModel.Node);
+                NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(elementName, pageViewModel.Node, pageViewModel.Node.Icon);
                 
                 pageViewModel.Node.AddNodeIfNotExists(node);
                 
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/NoDupeListEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/NoDupeListEditor.cs
index 4b554477..ca4566b2 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/NoDupeListEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/NoDupeListEditor.cs
@@ -63,7 +63,7 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
                     ReflectionExt.GetPassableAttributes(1, attributes));
 
                 NodeBase node =
-                    _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(elementName, pageViewModel.Node.Icon, pageViewModel.Node);
+                    _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(elementName, pageViewModel.Node, pageViewModel.Node.Icon);
                 pageViewModel.Node.AddNodeIfNotExists(node);
 
                 NodeHelper.ExpandParents(node, true);
diff --git a/RogueEssence.Editor.Avalonia/EditorContext/NodeFactory.cs b/RogueEssence.Editor.Avalonia/EditorContext/NodeFactory.cs
index 669e9144..ffc7276c 100644
--- a/RogueEssence.Editor.Avalonia/EditorContext/NodeFactory.cs
+++ b/RogueEssence.Editor.Avalonia/EditorContext/NodeFactory.cs
@@ -48,11 +48,10 @@ public OpenEditorNode CreateUniversalNode<TEditor>(
         where TEditor : EditorPageViewModel
         => Create<UniversalNode>(title, typeof(TEditor), icon, CreateCallback(onOpen));
     
-    public ReflectedDataNode CreateReflectedDataNode<TEditor>(
-        string title,
-        string? icon = null,
-        NodeBase? parent = null,
-        Action<TEditor>? onOpen = null)
+    public ReflectedDataNode CreateReflectedDataNode<TEditor>(string title,
+        NodeBase parent,
+        string icon = null,
+        Action<TEditor> onOpen = null)
         where TEditor : EditorPageViewModel
         => Create<ReflectedDataNode>(title, typeof(TEditor), icon, parent, CreateCallback(onOpen));
 
diff --git a/RogueEssence.Editor.Avalonia/EditorContext/PageFactory.cs b/RogueEssence.Editor.Avalonia/EditorContext/PageFactory.cs
index d3aeb2e4..f48d3202 100644
--- a/RogueEssence.Editor.Avalonia/EditorContext/PageFactory.cs
+++ b/RogueEssence.Editor.Avalonia/EditorContext/PageFactory.cs
@@ -67,7 +67,7 @@ public void Register<TPage>() where TPage : EditorPageViewModel
             return (TPage)_provider.GetRequiredService(type);
         }
         
-        public EditorPageViewModel? CreatePage(Type pageType, NodeBase? node = null, Action<EditorPageViewModel> onOpen = null)
+        public EditorPageViewModel? CreatePage(Type pageType, NodeBase node, Action<EditorPageViewModel> onOpen = null)
         {
             
             // Make sure it's a page
@@ -83,22 +83,13 @@ public void Register<TPage>() where TPage : EditorPageViewModel
                 return null;
             }
             
-            EditorPageViewModel page;
-
-       
-            if (node != null)
-            {
-                if (onOpen == null)
-                {
-                    onOpen = (vm) => { };
-                }
-                page = (EditorPageViewModel)ActivatorUtilities.CreateInstance(_provider, pageType, node, onOpen);
-            }
-            else
+            if (onOpen == null)
             {
-                page = (EditorPageViewModel)_provider.GetRequiredService(pageType);
+                onOpen = (vm) => { };
             }
+            EditorPageViewModel page = (EditorPageViewModel)ActivatorUtilities.CreateInstance(_provider, pageType, node, onOpen);
             
+           
             return page;
         }
 
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevTabDataViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevTabDataViewModel.cs
index 49d86b57..adb5793e 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevTabDataViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevTabDataViewModel.cs
@@ -520,7 +520,7 @@ public void btnMapEditor_Click()
             lock (GameBase.lockObj)
             {
                 Views.DevForm form = (Views.DevForm)DiagManager.Instance.DevEditor;
-                if (form.MapEditForm == null)
+                if (form.MapEditPage == null)
                 {
                     LuaEngine.Instance.BreakScripts();
                     MenuManager.Instance.ClearMenus();
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/Layers/AnimLayerBoxViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/Layers/AnimLayerBoxViewModel.cs
index 22671ee3..4e55ff9c 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/Layers/AnimLayerBoxViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/Layers/AnimLayerBoxViewModel.cs
@@ -40,7 +40,8 @@ public override async Task EditLayer()
                 AnimLayerWindow window = new AnimLayerWindow();
                 window.DataContext = vm;
 
-                result = await window.ShowDialog<bool>(form.MapEditForm);
+                // result = await window.ShowDialog<bool>(form.MapEditPage);
+                result = true;
             }
 
             lock (GameBase.lockObj)
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/Layers/TextureLayerBoxViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/Layers/TextureLayerBoxViewModel.cs
index bb3424bf..f9228422 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/Layers/TextureLayerBoxViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/Layers/TextureLayerBoxViewModel.cs
@@ -39,7 +39,9 @@ public override async Task EditLayer()
                 MapLayerWindow window = new MapLayerWindow();
                 window.DataContext = vm;
 
-                result = await window.ShowDialog<bool>(form.MapEditForm);
+
+                result = true;
+                // result = await window.ShowDialog<bool>(form.MapEditPage);
             }
 
             lock (GameBase.lockObj)
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/MapEditForm/MapEditViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/MapEditForm/MapEditViewModel.cs
index 4ec1aff6..a13fdd44 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/MapEditForm/MapEditViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/MapEditForm/MapEditViewModel.cs
@@ -26,28 +26,9 @@ namespace RogueEssence.Dev.ViewModels
 {
     public class MapEditViewModel : ViewModelBase
     {
-        public MapEditViewModel(
-            MapTabTexturesViewModel textures,
-            MapTabDecorationsViewModel decorations,
-            MapTabTerrainViewModel terrain,
-            MapTabTilesViewModel tiles,
-            MapTabItemsViewModel items,
-            MapTabEntitiesViewModel entities,
-            MapTabEntrancesViewModel entrances,
-            MapTabSpawnsViewModel spawns,
-            MapTabEffectsViewModel effects,
-            MapTabPropertiesViewModel properties)
+        public MapEditViewModel()
         {
-            Textures = textures;
-            Decorations = decorations;
-            Terrain = terrain;
-            Tiles = tiles;
-            Items = items;
-            Entities = entities;
-            Entrances = entrances;
-            Spawns = spawns;
-            Effects = effects;
-            Properties = properties;
+            
             CurrentFile = "";
         }
 
@@ -91,84 +72,85 @@ public void mnuNew_Click()
 
         public async void mnuOpen_Click()
         {
-            string mapDir = Path.GetFullPath(PathMod.ModPath(DataManager.MAP_PATH));
-            DevForm form = (DevForm)DiagManager.Instance.DevEditor;
-            IStorageFolder directory = await form.GroundEditForm.StorageProvider.TryGetFolderFromPathAsync(mapDir);
-            
-            await Dispatcher.UIThread.InvokeAsync(async () =>
-            {
-                IReadOnlyList<IStorageFile> results = await form.StorageProvider.OpenFilePickerAsync(new FilePickerOpenOptions
-                {
-                    Title = "Open .rsmap File",
-                    SuggestedStartLocation = directory,
-                    AllowMultiple = false,
-                    FileTypeFilter =
-                    [
-                        new FilePickerFileType("Map Files")
-                        {
-                            Patterns = ["*." + DataManager.MAP_EXT.Substring(1)]
-                        }
-                    ]
-                });
-                if (results.Count > 0)
-                {
-                    IStorageFile result = results.First();
-                    
-                    bool legalPath = false;
-                    foreach (string proposedPath in PathMod.FallbackPaths(DataManager.MAP_PATH))
-                    {
-                        if (comparePaths(proposedPath, Path.GetDirectoryName(result.Path.LocalPath)))
-                            legalPath = true;
-                    }
-                    if (!legalPath)
-                        await MessageBox.Show(form.MapEditForm, String.Format("Map can only be loaded from:\n{0}\nOr one of its parents.", PathMod.ModPath(DataManager.MAP_PATH)), "Error", MessageBox.MessageBoxButtons.Ok);
-                    else
-                    {
-                        lock (GameBase.lockObj)
-                            DoLoad(Path.GetFileNameWithoutExtension(results.First().Name));
-                    }
-                }
-                
-            });
+            // string mapDir = Path.GetFullPath(PathMod.ModPath(DataManager.MAP_PATH));
+            // DevForm form = (DevForm)DiagManager.Instance.DevEditor;
+            // IStorageFolder directory = await form.GroundEditForm.StorageProvider.TryGetFolderFromPathAsync(mapDir);
+            //
+            // await Dispatcher.UIThread.InvokeAsync(async () =>
+            // {
+            //     IReadOnlyList<IStorageFile> results = await form.StorageProvider.OpenFilePickerAsync(new FilePickerOpenOptions
+            //     {
+            //         Title = "Open .rsmap File",
+            //         SuggestedStartLocation = directory,
+            //         AllowMultiple = false,
+            //         FileTypeFilter =
+            //         [
+            //             new FilePickerFileType("Map Files")
+            //             {
+            //                 Patterns = ["*." + DataManager.MAP_EXT.Substring(1)]
+            //             }
+            //         ]
+            //     });
+            //     if (results.Count > 0)
+            //     {
+            //         IStorageFile result = results.First();
+            //         
+            //         bool legalPath = false;
+            //         foreach (string proposedPath in PathMod.FallbackPaths(DataManager.MAP_PATH))
+            //         {
+            //             if (comparePaths(proposedPath, Path.GetDirectoryName(result.Path.LocalPath)))
+            //                 legalPath = true;
+            //         }
+            //         if (!legalPath)
+            //             await MessageBox.Show(form.MapEditPage, String.Format("Map can only be loaded from:\n{0}\nOr one of its parents.", PathMod.ModPath(DataManager.MAP_PATH)), "Error", MessageBox.MessageBoxButtons.Ok);
+            //         else
+            //         {
+            //             lock (GameBase.lockObj)
+            //                 DoLoad(Path.GetFileNameWithoutExtension(results.First().Name));
+            //         }
+            //     }
+            //     
+            // });
         }
 
 
         public async void mnuExportAsGround_Click()
         {
-            string mapDir = Path.GetFullPath(PathMod.ModPath(DataManager.GROUND_PATH));
-            SaveFileDialog saveFileDialog = new SaveFileDialog();
-            saveFileDialog.Directory = mapDir;
-
-            FileDialogFilter filter = new FileDialogFilter();
-            filter.Name = "Ground Files";
-            filter.Extensions.Add(DataManager.GROUND_EXT.Substring(1));
-            saveFileDialog.Filters.Add(filter);
-
-            DevForm form = (DevForm)DiagManager.Instance.DevEditor;
-
-            string result = await saveFileDialog.ShowAsync(form.MapEditForm);
-
-            if (!String.IsNullOrEmpty(result))
-            {
-                string reqDir = PathMod.HardMod(DataManager.GROUND_PATH);
-                if (!comparePaths(reqDir, Path.GetDirectoryName(result)))
-                    await MessageBox.Show(form.MapEditForm, String.Format("Map can only be saved to:\n{0}", reqDir), "Error", MessageBox.MessageBoxButtons.Ok);
-                else if (Path.GetFileName(result).Contains(" "))
-                    await MessageBox.Show(form.MapEditForm, String.Format("Save file should not contain white space:\n{0}", Path.GetFileName(result)), "Error", MessageBox.MessageBoxButtons.Ok);
-                else
-                {
-                    lock (GameBase.lockObj)
-                    {
-                        //Schedule saving the map
-                        ExportToGround(ZoneManager.Instance.CurrentMap, result);
-                    }
-                    await MessageBox.Show(form.MapEditForm, String.Format("Textures have been saved to Ground!"), "Success", MessageBox.MessageBoxButtons.Ok);
-                }
-            }
+            // string mapDir = Path.GetFullPath(PathMod.ModPath(DataManager.GROUND_PATH));
+            // SaveFileDialog saveFileDialog = new SaveFileDialog();
+            // saveFileDialog.Directory = mapDir;
+            //
+            // FileDialogFilter filter = new FileDialogFilter();
+            // filter.Name = "Ground Files";
+            // filter.Extensions.Add(DataManager.GROUND_EXT.Substring(1));
+            // saveFileDialog.Filters.Add(filter);
+            //
+            // DevForm form = (DevForm)DiagManager.Instance.DevEditor;
+            //
+            // string result = await saveFileDialog.ShowAsync(form.MapEditPage);
+            //
+            // if (!String.IsNullOrEmpty(result))
+            // {
+            //     string reqDir = PathMod.HardMod(DataManager.GROUND_PATH);
+            //     if (!comparePaths(reqDir, Path.GetDirectoryName(result)))
+            //         await MessageBox.Show(form.MapEditPage, String.Format("Map can only be saved to:\n{0}", reqDir), "Error", MessageBox.MessageBoxButtons.Ok);
+            //     else if (Path.GetFileName(result).Contains(" "))
+            //         await MessageBox.Show(form.MapEditPage, String.Format("Save file should not contain white space:\n{0}", Path.GetFileName(result)), "Error", MessageBox.MessageBoxButtons.Ok);
+            //     else
+            //     {
+            //         lock (GameBase.lockObj)
+            //         {
+            //             //Schedule saving the map
+            //             ExportToGround(ZoneManager.Instance.CurrentMap, result);
+            //         }
+            //         await MessageBox.Show(form.MapEditPage, String.Format("Textures have been saved to Ground!"), "Success", MessageBox.MessageBoxButtons.Ok);
+            //     }
+            // }
         }
 
         public async Task<bool> mnuSave_Click()
         {
+            Console.WriteLine(ZoneManager.Instance.CurrentMap + "MAP?");
             if (CurrentFile == "")
                 return await mnuSaveAs_Click(); //Since its the same thing, might as well re-use the function! It makes everyone's lives easier!
             else
@@ -185,38 +167,39 @@ public async Task<bool> mnuSave_Click()
         }
         public async Task<bool> mnuSaveAs_Click()
         {
-            string mapDir = Path.GetFullPath(PathMod.ModPath(DataManager.MAP_PATH));
-            SaveFileDialog saveFileDialog = new SaveFileDialog();
-            saveFileDialog.Directory = mapDir;
-
-            FileDialogFilter filter = new FileDialogFilter();
-            filter.Name = "Map Files";
-            filter.Extensions.Add(DataManager.MAP_EXT.Substring(1));
-            saveFileDialog.Filters.Add(filter);
-
-            DevForm form = (DevForm)DiagManager.Instance.DevEditor;
-
-            string result = await saveFileDialog.ShowAsync(form.MapEditForm);
-
-            if (!String.IsNullOrEmpty(result))
-            {
-                string reqDir = PathMod.HardMod(DataManager.MAP_PATH);
-                if (!comparePaths(reqDir, Path.GetDirectoryName(result)))
-                    await MessageBox.Show(form.MapEditForm, String.Format("Map can only be saved to:\n{0}", reqDir), "Error", MessageBox.MessageBoxButtons.Ok);
-                else if (Path.GetFileName(result).Contains(" "))
-                    await MessageBox.Show(form.MapEditForm, String.Format("Save file should not contain white space:\n{0}", Path.GetFileName(result)), "Error", MessageBox.MessageBoxButtons.Ok);
-                else
-                {
-                    lock (GameBase.lockObj)
-                    {
-                        string oldFilename = CurrentFile;
-
-                        //Schedule saving the map
-                        DoSave(ZoneManager.Instance.CurrentMap, result, oldFilename);
-                    }
-                    return true;
-                }
-            }
+            // string mapDir = Path.GetFullPath(PathMod.ModPath(DataManager.MAP_PATH));
+            // SaveFileDialog saveFileDialog = new SaveFileDialog();
+            // saveFileDialog.Directory = mapDir;
+            //
+            // FileDialogFilter filter = new FileDialogFilter();
+            // filter.Name = "Map Files";
+            // filter.Extensions.Add(DataManager.MAP_EXT.Substring(1));
+            // saveFileDialog.Filters.Add(filter);
+            //
+            // DevForm form = (DevForm)DiagManager.Instance.DevEditor;
+            //
+            // string result = await saveFileDialog.ShowAsync(form.MapEditPage);
+            //
+            // if (!String.IsNullOrEmpty(result))
+            // {
+            //     string reqDir = PathMod.HardMod(DataManager.MAP_PATH);
+            //     if (!comparePaths(reqDir, Path.GetDirectoryName(result)))
+            //         await MessageBox.Show(form.MapEditPage, String.Format("Map can only be saved to:\n{0}", reqDir), "Error", MessageBox.MessageBoxButtons.Ok);
+            //     else if (Path.GetFileName(result).Contains(" "))
+            //         await MessageBox.Show(form.MapEditPage, String.Format("Save file should not contain white space:\n{0}", Path.GetFileName(result)), "Error", MessageBox.MessageBoxButtons.Ok);
+            //     else
+            //     {
+            //         lock (GameBase.lockObj)
+            //         {
+            //             string oldFilename = CurrentFile;
+            //
+            //             //Schedule saving the map
+            //             DoSave(ZoneManager.Instance.CurrentMap, result, oldFilename);
+            //         }
+            //         return true;
+            //     }
+            // }
+            // return false;
             return false;
         }
 
@@ -228,8 +211,8 @@ public async void mnuTest_Click()
                 lock (GameBase.lockObj)
                 {
                     DevForm form = (DevForm)DiagManager.Instance.DevEditor;
-                    form.MapEditForm.SilentClose();
-                    form.MapEditForm = null;
+                    form.MapEditPage.SilentClose();
+                    form.MapEditPage = null;
                     GameManager.Instance.SceneOutcome = GameManager.Instance.TestWarp(ZoneManager.Instance.CurrentMap.AssetName, false, MathUtils.Rand.NextUInt64());
                 }
             }
@@ -237,33 +220,33 @@ public async void mnuTest_Click()
 
         public async void mnuImportFromPng_Click()
         {
-            string mapDir = Path.GetFullPath(PathMod.ModPath(DataManager.MAP_PATH));
-            DevForm form = (DevForm)DiagManager.Instance.DevEditor;
-            IStorageFolder directory = await form.MapEditForm.StorageProvider.TryGetFolderFromPathAsync(mapDir);
-
-            await Dispatcher.UIThread.InvokeAsync(async () =>
-            {
-                IReadOnlyList<IStorageFile> results = await form.MapEditForm.StorageProvider.OpenFilePickerAsync(new FilePickerOpenOptions
-                {
-                    Title = "Open .png File",
-                    SuggestedStartLocation = directory,
-                    AllowMultiple = false,
-                    FileTypeFilter =
-                    [
-                        new FilePickerFileType("PNG Files")
-                        {
-                            Patterns = ["*.PNG"]
-                        }
-                    ]
-                });
-                
-                if (results.Count > 0)
-                {
-                    IStorageFile result = results.First();
-                    DoImportPng(result.Path.LocalPath);
-
-                }
-            });
+            // string mapDir = Path.GetFullPath(PathMod.ModPath(DataManager.MAP_PATH));
+            // DevForm form = (DevForm)DiagManager.Instance.DevEditor;
+            // IStorageFolder directory = await form.MapEditPage.StorageProvider.TryGetFolderFromPathAsync(mapDir);
+            //
+            // await Dispatcher.UIThread.InvokeAsync(async () =>
+            // {
+            //     IReadOnlyList<IStorageFile> results = await form.MapEditPage.StorageProvider.OpenFilePickerAsync(new FilePickerOpenOptions
+            //     {
+            //         Title = "Open .png File",
+            //         SuggestedStartLocation = directory,
+            //         AllowMultiple = false,
+            //         FileTypeFilter =
+            //         [
+            //             new FilePickerFileType("PNG Files")
+            //             {
+            //                 Patterns = ["*.PNG"]
+            //             }
+            //         ]
+            //     });
+            //     
+            //     if (results.Count > 0)
+            //     {
+            //         IStorageFile result = results.First();
+            //         DoImportPng(result.Path.LocalPath);
+            //
+            //     }
+            // });
         }
 
         public void mnuClearLayer_Click()
@@ -278,7 +261,8 @@ public async void mnuImportFromTileset_Click()
             DevForm form = (DevForm)DiagManager.Instance.DevEditor;
 
             if (Textures.TileBrowser.CurrentTileset == "")
-                await MessageBox.Show(form.MapEditForm, String.Format("No tileset to import!"), "Error", MessageBox.MessageBoxButtons.Ok);
+                Console.WriteLine("hi");
+                // await MessageBox.Show(form.MapEditPage, String.Format("No tileset to import!"), "Error", MessageBox.MessageBoxButtons.Ok);
             else
             {
                 lock (GameBase.lockObj)
@@ -295,8 +279,9 @@ public async void mnuReSize_Click()
 
             DevForm form = (DevForm)DiagManager.Instance.DevEditor;
 
-            bool result = await window.ShowDialog<bool>(form.MapEditForm);
+            // bool result = await window.ShowDialog<bool>(form.MapEditPage);
 
+            bool result = true;
             lock (GameBase.lockObj)
             {
                 if (result)
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/MapEditForm/MapTabEffectsViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/MapEditForm/MapTabEffectsViewModel.cs
index 6e681a77..6ffae88f 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/MapEditForm/MapTabEffectsViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/MapEditForm/MapTabEffectsViewModel.cs
@@ -9,15 +9,20 @@
 using System.Collections.ObjectModel;
 using System.IO;
 using System.Text;
+using RogueEssence.Dev.Utility;
 
 namespace RogueEssence.Dev.ViewModels
 {
     public class MapTabEffectsViewModel : ViewModelBase
     {
-        public MapTabEffectsViewModel(EditorContext context)
+        private EditorContext _context;
+        private EditorPageViewModel _parent;
+        
+        public MapTabEffectsViewModel(EditorContext context, EditorPageViewModel parent)
         {
-            DevForm form = (DevForm)DiagManager.Instance.DevEditor;
-            Statuses = new CollectionBoxViewModel(context.DialogService, new StringConv(typeof(MapStatus), new object[0]));
+            _context = context;
+            _parent = parent;
+            Statuses = new CollectionBoxViewModel(_context.DialogService, new StringConv(typeof(MapStatus), new object[0]));
             Statuses.OnMemberChanged += Statuses_Changed;
             Statuses.OnEditItem += Statuses_EditItem;
 
@@ -41,22 +46,29 @@ public void MapEffect_Changed()
         public void MapEffect_Edit(object element, bool advancedEdit, ClassBoxViewModel.EditElementOp op)
         {
             string elementName = "MapEffect";
-            DataEditForm frmData = new DataEditRootForm();
-            frmData.Title = DataEditor.GetWindowTitle(ZoneManager.Instance.CurrentMap.AssetName, elementName, element, typeof(ActiveEffect), new object[0]);
 
-            DataEditor.LoadClassControls(frmData.ControlPanel, ZoneManager.Instance.CurrentMap.AssetName, null, elementName, typeof(ActiveEffect), new object[0], element, true, new Type[0], advancedEdit);
-            DataEditor.TrackTypeSize(frmData, typeof(ActiveEffect));
+            NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(elementName, _parent.Node, _parent.Icon);
+            _parent.Node.AddNodeIfNotExists(node);
+            NodeHelper.ExpandParents(node, true);
 
-            frmData.SelectedOKEvent += async () =>
+            ReflectedDataPageViewModel newEditor = _context.PageFactory.CreatePage<ReflectedDataPageViewModel>(node);
+            newEditor.SetPageTitle(elementName, _parent.Node.Icon);
+            newEditor.SetRootPage(true);
+            newEditor.SetRemoveNode(true);
+
+            newEditor.OnLoadAction = stack =>
+            {
+                DataEditor.LoadClassControls(stack, ZoneManager.Instance.CurrentMap.AssetName, null, elementName, typeof(ActiveEffect), new object[0], element, true, new Type[0], advancedEdit);
+            };
+
+            newEditor.OnOKAction = async stack =>
             {
-                element = DataEditor.SaveClassControls(frmData.ControlPanel, elementName, typeof(ActiveEffect), new object[0], true, new Type[0], advancedEdit);
+                element = DataEditor.SaveClassControls(stack, elementName, typeof(ActiveEffect), new object[0], true, new Type[0], advancedEdit);
                 op(element);
                 return true;
             };
 
-            DevForm form = (DevForm)DiagManager.Instance.DevEditor;
-            form.MapEditForm.RegisterChild(frmData);
-            frmData.Show();
+            _context.TabEvents.AddChildPage(_parent, newEditor);
         }
 
         public void Statuses_Changed()
@@ -72,16 +84,25 @@ public void Statuses_Changed()
         public void Statuses_EditItem(int index, object element, bool advancedEdit, CollectionBoxViewModel.EditElementOp op)
         {
             string elementName = "Statuses[" + index + "]";
-            DataEditForm frmData = new DataEditRootForm();
-            frmData.Title = DataEditor.GetWindowTitle(ZoneManager.Instance.CurrentMap.AssetName, elementName, element, typeof(MapStatus), new object[0]);
+            // string title = DataEditor.GetWindowTitle(ZoneManager.Instance.CurrentMap.AssetName, elementName, element, typeof(MapStatus), new object[0]);
 
-            DataEditor.LoadClassControls(frmData.ControlPanel, ZoneManager.Instance.CurrentMap.AssetName, null, elementName, typeof(MapStatus), new object[0], element, true, new Type[0], advancedEdit);
-            DataEditor.TrackTypeSize(frmData, typeof(MapStatus));
+            NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(elementName, _parent.Node, _parent.Icon);
+            _parent.Node.AddNodeIfNotExists(node);
+            NodeHelper.ExpandParents(node, true);
+
+            ReflectedDataPageViewModel newEditor = _context.PageFactory.CreatePage<ReflectedDataPageViewModel>(node);
+            newEditor.SetPageTitle(elementName, _parent.Node.Icon);
+            newEditor.SetRootPage(true);
+            newEditor.SetRemoveNode(true);
+
+            newEditor.OnLoadAction = stack =>
+            {
+                DataEditor.LoadClassControls(stack, ZoneManager.Instance.CurrentMap.AssetName, null, elementName, typeof(MapStatus), new object[0], element, true, new Type[0], advancedEdit);
+            };
 
-            DevForm form = (DevForm)DiagManager.Instance.DevEditor;
-            frmData.SelectedOKEvent += async () =>
+            newEditor.OnOKAction = async stack =>
             {
-                element = DataEditor.SaveClassControls(frmData.ControlPanel, elementName, typeof(MapStatus), new object[0], true, new Type[0], advancedEdit);
+                element = DataEditor.SaveClassControls(stack, elementName, typeof(MapStatus), new object[0], true, new Type[0], advancedEdit);
 
                 bool itemExists = false;
 
@@ -97,40 +118,46 @@ public void Statuses_EditItem(int index, object element, bool advancedEdit, Coll
 
                 if (itemExists)
                 {
-                    await MessageBox.Show(frmData, "Cannot add duplicate IDs.", "Entry already exists.", MessageBox.MessageBoxButtons.Ok);
+                    await MessageBoxWindowView.Show(_context.DialogService, "Cannot add duplicate IDs.", "Entry already exists.", MessageBoxWindowView.MessageBoxButtons.Ok);
                     return false;
                 }
-                else
-                {
-                    op(index, element);
-                    return true;
-                }
+
+                op(index, element);
+                return true;
             };
 
-            form.MapEditForm.RegisterChild(frmData);
-            frmData.Show();
+            _context.TabEvents.AddChildPage(_parent, newEditor);
         }
 
         public void Events_EditItem(int index, object element, bool advancedEdit, CollectionBoxViewModel.EditElementOp op)
         {
             string elementName = "Events[" + index + "]";
-            DataEditForm frmData = new DataEditRootForm();
-            frmData.Title = DataEditor.GetWindowTitle(ZoneManager.Instance.CurrentMap.AssetName, elementName, element, typeof(SingleCharEvent), new object[0]);
-
-            DataEditor.LoadClassControls(frmData.ControlPanel, ZoneManager.Instance.CurrentMap.AssetName, null, elementName, typeof(SingleCharEvent), new object[0], element, true, new Type[0], advancedEdit);
-            DataEditor.TrackTypeSize(frmData, typeof(SingleCharEvent));
+            string title = DataEditor.GetWindowTitle(ZoneManager.Instance.CurrentMap.AssetName, elementName, element, typeof(SingleCharEvent), new object[0]);
+
+            NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(elementName,  _parent.Node, _parent.Icon);
+            _parent.Node.AddNodeIfNotExists(node);
+            NodeHelper.ExpandParents(node, true);
+
+            ReflectedDataPageViewModel newEditor = _context.PageFactory.CreatePage<ReflectedDataPageViewModel>(node);
+            newEditor.SetPageTitle(title, _parent.Node.Icon);
+            newEditor.SetRootPage(true);
+            newEditor.SetRemoveNode(true);
+            
+            newEditor.OnLoadAction = stack =>
+            {
+                DataEditor.LoadClassControls(stack, ZoneManager.Instance.CurrentMap.AssetName, null, elementName, typeof(SingleCharEvent), new object[0], element, true, new Type[0], advancedEdit);
+            };
 
-            frmData.SelectedOKEvent += async () =>
+            newEditor.OnOKAction = async stack =>
             {
-                element = DataEditor.SaveClassControls(frmData.ControlPanel, elementName, typeof(SingleCharEvent), new object[0], true, new Type[0], advancedEdit);
+                element = DataEditor.SaveClassControls(stack, elementName, typeof(SingleCharEvent), new object[0], true, new Type[0], advancedEdit);
                 op(index, element);
                 return true;
             };
 
-            DevForm form = (DevForm)DiagManager.Instance.DevEditor;
-            form.MapEditForm.RegisterChild(frmData);
-            frmData.Show();
+            _context.TabEvents.AddChildPage(_parent, newEditor);
         }
+        
 
         public void LoadMapEffects()
         {
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/MapEditForm/MapTabEntitiesViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/MapEditForm/MapTabEntitiesViewModel.cs
index d2e683f3..3379fd6f 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/MapEditForm/MapTabEntitiesViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/MapEditForm/MapTabEntitiesViewModel.cs
@@ -8,6 +8,7 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using RogueEssence.Dev.Utility;
 using RogueEssence.LevelGen;
 
 namespace RogueEssence.Dev.ViewModels
@@ -16,8 +17,12 @@ public class MapTabEntitiesViewModel : ViewModelBase
     {
         public delegate void EntityOp(Character ent);
 
-        public MapTabEntitiesViewModel(EditorContext context)
+        private EditorContext _context;
+        private EditorPageViewModel _parent;
+        public MapTabEntitiesViewModel(EditorContext context, EditorPageViewModel parent)
         {
+            _context = context;
+            _parent = parent;
             //Teams = new TeamBoxViewModel(DiagManager.Instance.DevEditor.MapEditor.Edits);
 
             MonsterTeam team = new MonsterTeam();
@@ -561,23 +566,29 @@ public void ActionEvents_Changed()
         public void ActionEvents_EditItem(int index, object element, bool advancedEdit, CollectionBoxViewModel.EditElementOp op)
         {
             string elementName = "Action Events[" + index + "]";
-            DataEditForm frmData = new DataEditRootForm();
-            frmData.Title = DataEditor.GetWindowTitle(SelectedEntity.Name, elementName, element, typeof(BattleEvent), new object[0]);
 
-            DataEditor.LoadClassControls(frmData.ControlPanel, ZoneManager.Instance.CurrentMap.AssetName, null, elementName, typeof(BattleEvent), new object[0], element, true, new Type[0], advancedEdit);
-            DataEditor.TrackTypeSize(frmData, typeof(BattleEvent));
+            NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(elementName, _parent.Node, _parent.Icon);
+            _parent.Node.AddNodeIfNotExists(node);
+            NodeHelper.ExpandParents(node, true);
 
-            DevForm form = (DevForm)DiagManager.Instance.DevEditor;
-            frmData.SelectedOKEvent += async () =>
+            ReflectedDataPageViewModel newEditor = _context.PageFactory.CreatePage<ReflectedDataPageViewModel>(node);
+            newEditor.SetPageTitle(elementName, _parent.Node.Icon);
+            newEditor.SetRootPage(true);
+            newEditor.SetRemoveNode(true);
+
+            newEditor.OnLoadAction = stack =>
             {
-                element = DataEditor.SaveClassControls(frmData.ControlPanel, elementName, typeof(BattleEvent), new object[0], true, new Type[0], advancedEdit);
+                DataEditor.LoadClassControls(stack, ZoneManager.Instance.CurrentMap.AssetName, null, elementName, typeof(BattleEvent), new object[0], element, true, new Type[0], advancedEdit);
+            };
 
+            newEditor.OnOKAction = async stack =>
+            {
+                element = DataEditor.SaveClassControls(stack, elementName, typeof(BattleEvent), new object[0], true, new Type[0], advancedEdit);
                 op(index, element);
                 return true;
             };
 
-            form.MapEditForm.RegisterChild(frmData);
-            frmData.Show();
+            _context.TabEvents.AddChildPage(_parent, newEditor);
         }
 
         public void Statuses_Changed()
@@ -592,17 +603,24 @@ public void Statuses_Changed()
         public void Statuses_EditItem(int index, object element, bool advancedEdit, CollectionBoxViewModel.EditElementOp op)
         {
             string elementName = "Statuses[" + index + "]";
-            DataEditForm frmData = new DataEditRootForm();
-            frmData.Title = DataEditor.GetWindowTitle(SelectedEntity.Name, elementName, element, typeof(StatusEffect), new object[0]);
 
-            
-            DataEditor.LoadClassControls(frmData.ControlPanel, ZoneManager.Instance.CurrentMap.AssetName, null, elementName, typeof(StatusEffect), new object[0], element, true, new Type[0], advancedEdit);
-            DataEditor.TrackTypeSize(frmData, typeof(StatusEffect));
+            NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(elementName, _parent.Node, _parent.Icon);
+            _parent.Node.AddNodeIfNotExists(node);
+            NodeHelper.ExpandParents(node, true);
 
-            DevForm form = (DevForm)DiagManager.Instance.DevEditor;
-            frmData.SelectedOKEvent += async () =>
+            ReflectedDataPageViewModel newEditor = _context.PageFactory.CreatePage<ReflectedDataPageViewModel>(node);
+            newEditor.SetPageTitle(elementName, _parent.Node.Icon);
+            newEditor.SetRootPage(true);
+            newEditor.SetRemoveNode(true);
+
+            newEditor.OnLoadAction = stack =>
             {
-                element = DataEditor.SaveClassControls(frmData.ControlPanel, elementName, typeof(StatusEffect), new object[0], true, new Type[0], advancedEdit);
+                DataEditor.LoadClassControls(stack, ZoneManager.Instance.CurrentMap.AssetName, null, elementName, typeof(StatusEffect), new object[0], element, true, new Type[0], advancedEdit);
+            };
+
+            newEditor.OnOKAction = async stack =>
+            {
+                element = DataEditor.SaveClassControls(stack, elementName, typeof(StatusEffect), new object[0], true, new Type[0], advancedEdit);
 
                 bool itemExists = false;
 
@@ -618,18 +636,15 @@ public void Statuses_EditItem(int index, object element, bool advancedEdit, Coll
 
                 if (itemExists)
                 {
-                    await MessageBox.Show(frmData, "Cannot add duplicate IDs.", "Entry already exists.", MessageBox.MessageBoxButtons.Ok);
+                    await MessageBoxWindowView.Show(_context.DialogService, "Cannot add duplicate IDs.", "Entry already exists.", MessageBoxWindowView.MessageBoxButtons.Ok);
                     return false;
                 }
-                else
-                {
-                    op(index, element);
-                    return true;
-                }
+
+                op(index, element);
+                return true;
             };
 
-            form.MapEditForm.RegisterChild(frmData);
-            frmData.Show();
+            _context.TabEvents.AddChildPage(_parent, newEditor);
         }
 
         /// <summary>
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/MapEditForm/MapTabPropertiesViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/MapEditForm/MapTabPropertiesViewModel.cs
index d3c66c3d..524b5488 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/MapEditForm/MapTabPropertiesViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/MapEditForm/MapTabPropertiesViewModel.cs
@@ -10,14 +10,22 @@
 using System.Collections.ObjectModel;
 using System.IO;
 using System.Text;
+using DynamicData;
 using RogueEssence.Dev.Services;
+using RogueEssence.Dev.Utility;
 
 namespace RogueEssence.Dev.ViewModels
 {
     public class MapTabPropertiesViewModel : ViewModelBase
     {
-        public MapTabPropertiesViewModel(IDialogService dialogService)
+
+        private EditorContext _context;
+        private EditorPageViewModel _parent;
+        public MapTabPropertiesViewModel(EditorContext context, EditorPageViewModel parent)
         {
+            _context = context;
+            _parent = parent;
+            
             Sights = new ObservableCollection<string>();
             for (int ii = 0; ii <= (int)Map.SightRange.Blind; ii++)
                 Sights.Add(((Map.SightRange)ii).ToLocal());
@@ -44,7 +52,7 @@ public MapTabPropertiesViewModel(IDialogService dialogService)
             BlankBG.OnEditItem += AutoTile_Edit;
 
             DevForm form = (DevForm)DiagManager.Instance.DevEditor;
-            TextureMap = new DictionaryBoxViewModel(dialogService, new StringConv(typeof(AutoTile), new object[0]));
+            TextureMap = new DictionaryBoxViewModel(_context.DialogService, new StringConv(typeof(AutoTile), new object[0]));
             TextureMap.OnMemberChanged += TextureMap_Changed;
             TextureMap.OnEditKey += TextureMap_EditKey;
             TextureMap.OnEditItem += TextureMap_EditItem;
@@ -139,32 +147,40 @@ public void BG_Changed()
         {
             ZoneManager.Instance.CurrentMap.Background = BG.GetObject<IBackgroundSprite>();
         }
-
+        
+        
+        public void BlankBG_Changed()
+        {
+            ZoneManager.Instance.CurrentMap.BlankBG = BlankBG.Tile;
+        }
         public void MapBG_Edit(object element, bool advancedEdit, ClassBoxViewModel.EditElementOp op)
         {
             Type type = typeof(IBackgroundSprite);
             string elementName = type.Name;
-            DataEditForm frmData = new DataEditRootForm();
-            frmData.Title = DataEditor.GetWindowTitle(ZoneManager.Instance.CurrentMap.AssetName, elementName, element, type, new object[0]);
+            string title = DataEditor.GetWindowTitle(ZoneManager.Instance.CurrentMap.AssetName, elementName, element, type, new object[0]);
 
-            DataEditor.LoadClassControls(frmData.ControlPanel, ZoneManager.Instance.CurrentMap.AssetName, null, elementName, type, new object[0], element, true, new Type[0], advancedEdit);
-            DataEditor.TrackTypeSize(frmData, type);
+            NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(elementName, _parent.Node, _parent.Icon);
+            _parent.Node.AddNodeIfNotExists(node);
+            NodeHelper.ExpandParents(node, true);
 
-            frmData.SelectedOKEvent += async () =>
+            ReflectedDataPageViewModel newEditor = _context.PageFactory.CreatePage<ReflectedDataPageViewModel>(node);
+            newEditor.SetPageTitle(elementName, _parent.Node.Icon);
+            newEditor.SetRootPage(true);
+            newEditor.SetRemoveNode(true);
+
+            newEditor.OnLoadAction = stack =>
             {
-                element = DataEditor.SaveClassControls(frmData.ControlPanel, elementName, type, new object[0], true, new Type[0], advancedEdit);
+                DataEditor.LoadClassControls(stack, ZoneManager.Instance.CurrentMap.AssetName, null, elementName, type, new object[0], element, true, new Type[0], advancedEdit);
+            };
+
+            newEditor.OnOKAction = async stack =>
+            {
+                element = DataEditor.SaveClassControls(stack, elementName, type, new object[0], true, new Type[0], advancedEdit);
                 op(element);
                 return true;
             };
 
-            DevForm form = (DevForm)DiagManager.Instance.DevEditor;
-            form.MapEditForm.RegisterChild(frmData);
-            frmData.Show();
-        }
-
-        public void BlankBG_Changed()
-        {
-            ZoneManager.Instance.CurrentMap.BlankBG = BlankBG.Tile;
+            _context.TabEvents.AddChildPage(_parent, newEditor);
         }
 
         public void AutoTile_Edit(AutoTile element, TileBoxViewModel.EditElementOp op)
@@ -191,7 +207,7 @@ public void AutoTile_Edit(AutoTile element, TileBoxViewModel.EditElementOp op)
             };
 
             DevForm form = (DevForm)DiagManager.Instance.DevEditor;
-            form.MapEditForm.RegisterChild(frmData);
+            // form.MapEditPage.RegisterChild(frmData);
             frmData.Show();
         }
 
@@ -202,50 +218,67 @@ public void TextureMap_Changed()
             ZoneManager.Instance.CurrentMap.CalculateTerrainAutotiles(Loc.Zero, new Loc(ZoneManager.Instance.CurrentMap.Width, ZoneManager.Instance.CurrentMap.Height));
         }
 
+    
         public void TextureMap_EditKey(object key, object element, bool advancedEdit, DictionaryBoxViewModel.EditElementOp op)
         {
             string elementName = "TextureMap<Key>";
-            DataEditForm frmKey = new DataEditRootForm();
-            frmKey.Title = DataEditor.GetWindowTitle(ZoneManager.Instance.CurrentMap.AssetName, elementName, element, typeof(string), new object[0]);
-
             DataTypeAttribute attr = new DataTypeAttribute(1, DataManager.DataType.Terrain, false);
-            DataEditor.LoadClassControls(frmKey.ControlPanel, ZoneManager.Instance.CurrentMap.AssetName, null, elementName, typeof(string), new object[1] { attr }, key, true, new Type[0], advancedEdit);
-            DataEditor.TrackTypeSize(frmKey, typeof(int));
+            // string title = DataEditor.GetWindowTitle(ZoneManager.Instance.CurrentMap.AssetName, elementName, element, typeof(string), new object[0]);
+
+            NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(elementName, _parent.Node, _parent.Icon);
+            _parent.Node.AddNodeIfNotExists(node);
+            NodeHelper.ExpandParents(node, true);
+
+            ReflectedDataPageViewModel newEditor = _context.PageFactory.CreatePage<ReflectedDataPageViewModel>(node);
+            newEditor.SetPageTitle(elementName, _parent.Node.Icon);
+            newEditor.SetRootPage(true);
+            newEditor.SetRemoveNode(true);
+            
+            newEditor.OnLoadAction = stack =>
+            {
+                DataEditor.LoadClassControls(stack, ZoneManager.Instance.CurrentMap.AssetName, null, elementName, typeof(string), new object[1] { attr }, key, true, new Type[0], advancedEdit);
+            };
 
-            frmKey.SelectedOKEvent += async () =>
+            newEditor.OnOKAction = async stack =>
             {
-                object newKey = DataEditor.SaveClassControls(frmKey.ControlPanel, elementName, typeof(string), new object[1] { attr }, true, new Type[0], advancedEdit);
+                object newKey = DataEditor.SaveClassControls(stack, elementName, typeof(string), new object[1] { attr }, true, new Type[0], advancedEdit);
                 op(key, newKey, element);
                 return true;
             };
+        
 
-            DevForm form = (DevForm)DiagManager.Instance.DevEditor;
-            form.MapEditForm.RegisterChild(frmKey);
-            frmKey.Show();
+            _context.TabEvents.AddChildPage(_parent, newEditor);
         }
-
+        
         public void TextureMap_EditItem(object key, object element, bool advancedEdit, DictionaryBoxViewModel.EditElementOp op)
         {
             string elementName = "TextureMap[" + key.ToString() + "]";
-            DataEditForm frmData = new DataEditRootForm();
-            frmData.Title = DataEditor.GetWindowTitle(ZoneManager.Instance.CurrentMap.AssetName, elementName, element, typeof(AutoTile), new object[0]);
+            // string title = DataEditor.GetWindowTitle(ZoneManager.Instance.CurrentMap.AssetName, elementName, element, typeof(AutoTile), new object[0]);
 
-            DataEditor.LoadClassControls(frmData.ControlPanel, ZoneManager.Instance.CurrentMap.AssetName, null, elementName, typeof(AutoTile), new object[0], element, true, new Type[0], advancedEdit);
-            DataEditor.TrackTypeSize(frmData, typeof(AutoTile));
+            NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(elementName, _parent.Node, _parent.Icon);
+            _parent.Node.AddNodeIfNotExists(node);
+            NodeHelper.ExpandParents(node, true);
 
-            frmData.SelectedOKEvent += async () =>
+            ReflectedDataPageViewModel newEditor = _context.PageFactory.CreatePage<ReflectedDataPageViewModel>(node);
+            newEditor.SetPageTitle(elementName, _parent.Node.Icon);
+            newEditor.SetRootPage(true);
+            newEditor.SetRemoveNode(true);
+
+            newEditor.OnLoadAction = stack =>
+            {
+                DataEditor.LoadClassControls(stack, ZoneManager.Instance.CurrentMap.AssetName, null, elementName, typeof(AutoTile), new object[0], element, true, new Type[0], advancedEdit);
+            };
+
+            newEditor.OnOKAction = async stack =>
             {
-                element = DataEditor.SaveClassControls(frmData.ControlPanel, elementName, typeof(AutoTile), new object[0], true, new Type[0], advancedEdit);
+                element = DataEditor.SaveClassControls(stack, elementName, typeof(AutoTile), new object[0], true, new Type[0], advancedEdit);
                 op(key, key, element);
                 return true;
             };
 
-            DevForm form = (DevForm)DiagManager.Instance.DevEditor;
-            form.MapEditForm.RegisterChild(frmData);
-            frmData.Show();
+            _context.TabEvents.AddChildPage(_parent, newEditor);
         }
 
-
         public void btnReloadMusic_Click()
         {
             reloadMusic();
@@ -266,7 +299,7 @@ private void reloadMusic()
                 {
                     string song = Path.GetFileName(files[ii]);
                     Music.Add(song);
-                    if (song == ZoneManager.Instance.CurrentMap.Music)
+                    if (ZoneManager.Instance.CurrentMap != null && song == ZoneManager.Instance.CurrentMap.Music)
                         ChosenMusic = ii+1;
                 }
             }
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/MapEditForm/MapTabTilesViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/MapEditForm/MapTabTilesViewModel.cs
index 1e507713..963cf04d 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/MapEditForm/MapTabTilesViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/MapEditForm/MapTabTilesViewModel.cs
@@ -8,14 +8,19 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using RogueEssence.Dev.Utility;
 
 namespace RogueEssence.Dev.ViewModels
 {
     public class MapTabTilesViewModel : ViewModelBase
     {
-
-        public MapTabTilesViewModel(EditorContext context)
+        
+        private EditorContext _context;
+        private EditorPageViewModel _parent;
+        public MapTabTilesViewModel(EditorContext context, EditorPageViewModel parent)
         {
+            _context = context;
+            _parent = parent;
             TileTypes = new ObservableCollection<string>();
             Dictionary<string, string> tile_names = DataManager.Instance.DataIndices[DataManager.DataType.Tile].GetLocalStringArray(true);
             keys = new List<string>();
@@ -88,17 +93,25 @@ public int ChosenOwner
         public void TileStates_EditItem(int index, object element, bool advancedEdit, CollectionBoxViewModel.EditElementOp op)
         {
             string elementName = "TileStates[" + index + "]";
-            DataEditForm frmData = new DataEditRootForm();
-            frmData.Title = DataEditor.GetWindowTitle("Tile", elementName, element, typeof(TileState), new object[0]);
 
-            //TODO: make this a member and reference it that way
-            DataEditor.LoadClassControls(frmData.ControlPanel, "Tile", null, elementName, typeof(TileState), new object[0], element, true, new Type[0], advancedEdit);
-            DataEditor.TrackTypeSize(frmData, typeof(TileState));
+            NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(elementName, _parent.Node, _parent.Icon);
+            _parent.Node.AddNodeIfNotExists(node);
+            NodeHelper.ExpandParents(node, true);
 
-            DevForm form = (DevForm)DiagManager.Instance.DevEditor;
-            frmData.SelectedOKEvent += async () =>
+            ReflectedDataPageViewModel newEditor = _context.PageFactory.CreatePage<ReflectedDataPageViewModel>(node);
+            newEditor.SetPageTitle(elementName, _parent.Node.Icon);
+            newEditor.SetRootPage(true);
+            newEditor.SetRemoveNode(true);
+
+            newEditor.OnLoadAction = stack =>
             {
-                element = DataEditor.SaveClassControls(frmData.ControlPanel, elementName, typeof(TileState), new object[0], true, new Type[0], advancedEdit);
+                //TODO: make this a member and reference it that way
+                DataEditor.LoadClassControls(stack, "Tile", null, elementName, typeof(TileState), new object[0], element, true, new Type[0], advancedEdit);
+            };
+
+            newEditor.OnOKAction = async stack =>
+            {
+                element = DataEditor.SaveClassControls(stack, elementName, typeof(TileState), new object[0], true, new Type[0], advancedEdit);
 
                 bool itemExists = false;
 
@@ -114,18 +127,15 @@ public void TileStates_EditItem(int index, object element, bool advancedEdit, Co
 
                 if (itemExists)
                 {
-                    await MessageBox.Show(frmData, "Cannot add duplicate states.", "Entry already exists.", MessageBox.MessageBoxButtons.Ok);
+                    await MessageBoxWindowView.Show(_context.DialogService, "Cannot add duplicate states.", "Entry already exists.", MessageBoxWindowView.MessageBoxButtons.Ok);
                     return false;
                 }
-                else
-                {
-                    op(index, element);
-                    return true;
-                }
+
+                op(index, element);
+                return true;
             };
 
-            form.MapEditForm.RegisterChild(frmData);
-            frmData.Show();
+            _context.TabEvents.AddChildPage(_parent, newEditor);
         }
 
         public void ProcessInput(InputManager input)
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs
index a8191205..797f52c9 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs
@@ -17,6 +17,7 @@
 using RogueEssence.Data;
 using RogueEssence.Dev.Utility;
 using RogueEssence.Dev.Views;
+using RogueEssence.Dungeon;
 using RogueEssence.Menu;
 using RogueEssence.Script;
 
@@ -237,8 +238,13 @@ public ObservableCollection<PageNode> TopLevelPages
 
     public void AddTopLevelPage(EditorPageViewModel page)
     {
-        var navigated = TryNavigateToExistingPage(page);
-        if (navigated) return;
+        var navigatedPage = TryNavigateToExistingPage(page);
+        if (navigatedPage != null)
+        {
+            if (navigatedPage is IPageReloadable reloadable)
+                reloadable.Reload();
+            return;
+        }
 
         if (!page.AddNewTab)
         {
@@ -259,8 +265,8 @@ public void AddTopLevelPage(EditorPageViewModel page)
 
     public void AddChildPage(EditorPageViewModel parentPage, EditorPageViewModel childPage)
     {
-        var navigated = TryNavigateToExistingPage(childPage);
-        if (navigated) return;
+        var navigatedPage = TryNavigateToExistingPage(childPage);
+        if (navigatedPage != null) return;
 
 
         // Otherwise... add to the list of tabs
@@ -287,17 +293,17 @@ public void AddChildPage(EditorPageViewModel parentPage, EditorPageViewModel chi
     }
 
     // Returns whether the navigation was successful
-    private bool TryNavigateToExistingPage(EditorPageViewModel page)
+    private EditorPageViewModel? TryNavigateToExistingPage(EditorPageViewModel page)
     {
         var existing = Pages.FirstOrDefault(p => p.Equals(page));
         if (existing != null)
         {
             TemporaryTab = null;
             ActivePage = existing;
-            return true;
+            return existing;
         }
 
-        return false;
+        return null;
     }
 
     public bool PageHasChildren(EditorPageViewModel page)
@@ -471,6 +477,11 @@ await _context.DialogService.ShowDialogAsync<PreferencesWindowViewModel, bool>(
             PreferencesWindowViewModel.Instance, "Preferences");
     }
 
+    public NodeBase Root { get; internal set; }
+    public NodeBase MapEditorNode { get; internal set; }
+    
+    public NodeBase GroundEditorNode { get; internal set; }
+    
     public void LoadDevTree()
     {
         NodeFactory _nodeFactory = _context.NodeFactory;
@@ -483,11 +494,7 @@ public void LoadDevTree()
         _pageToNodeMap.Clear();
 
 
-        // TODO: Attach the DevControlNode to this tab rather than keeping it null... 
-        var tab = _context.PageFactory.CreatePage(typeof(DevControlViewModel), null);
-        tab.Icon = "Icons.GameControllerFill";
-        AddTopLevelPage(tab);
-
+       
 
         foreach (var n in Nodes)
         {
@@ -502,14 +509,30 @@ public void LoadDevTree()
         var root = _nodeFactory.CreateOpenEditorNode<DevEditPageViewModel>(rootStr, "Icons.ScrollFill");
 
 
+        Root = root;
         // root.SubNodes.Add(
         // _nodeFactory.CreateOpenEditorNode("Dev Control",  typeof(DevControlViewModel), "Icons.GameControllerFill"));
-        root.SubNodes.Add(
-            _nodeFactory.CreateOpenEditorNode<DevControlViewModel>("Dev Control", "Icons.GameControllerFill"));
-        root.SubNodes.Add(
-            _nodeFactory.CreateOpenEditorNode<MapEditorPageViewModel>("Map Editor", "Icons.StairsFill"));
-        root.SubNodes.Add(
-            _nodeFactory.CreateOpenEditorNode<GroundEditorPageViewModel>("Ground Editor", "Icons.IslandFill"));
+
+        var devControlNode =
+            _nodeFactory.CreateOpenEditorNode<DevControlViewModel>("Dev Control", "Icons.GameControllerFill");
+        root.SubNodes.Add(devControlNode);
+        
+        // TODO: Attach the DevControlNode to this tab rather than keeping it null... 
+        var tab = _context.PageFactory.CreatePage(typeof(DevControlViewModel), devControlNode);
+        // tab.Icon = "Icons.GameControllerFill";
+        AddTopLevelPage(tab);
+
+
+        var mapEditorNode = _nodeFactory.CreateOpenEditorNode<MapEditorPageViewModel>("Map Editor", "Icons.StairsFill");
+        root.SubNodes.Add(mapEditorNode);
+        
+        MapEditorNode = mapEditorNode;
+
+        var groundEditorNode =
+            _nodeFactory.CreateOpenEditorNode<GroundEditorPageViewModel>("Ground Editor", "Icons.IslandFill");
+
+        root.SubNodes.Add(groundEditorNode);
+        GroundEditorNode = groundEditorNode;
         // root.SubNodes.Add(
         // _nodeFactory.CreateOpenEditorNode("Ground Editor", typeof(GroundEditorPageViewModel), "Icons.MapTrifoldFill"));
         // root.SubNodes.Add(_nodeFactory.CreateOpenEditorNode("Testing", "Icons.BedFill", "RandomInfo"));
@@ -572,7 +595,7 @@ private Action<ReflectedDataPageViewModel> CreateDataOnOpen<T>(Func<T> getter, A
         return vm =>
         {
             vm.SetRemoveNode(false);
-            vm.SetIsRootPage(true);
+            vm.SetRootPage(true);
             vm.OnLoadAction = stack => { DataEditor.LoadDataControls("", getter(), stack); };
 
             vm.OnOKAction = async stack =>
@@ -601,19 +624,17 @@ private Action<ReflectedDataPageViewModel> CreateFXOnOpen<T>(Func<T> getter, Act
     private void CreateConstantsNode(NodeBase parent)
     {
         var constantsNode =
-            _context.NodeFactory.CreateReflectedDataNode<MapEditorPageViewModel>("Constants", "Icons.ListFill", parent);
+            _context.NodeFactory.CreateReflectedDataNode<MapEditorPageViewModel>("Constants", parent, "Icons.ListFill");
         var startParamsNode = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>("Start Params",
-            "Icons.ListFill",
             parent,
-            CreateDataOnOpen(
+            "Icons.ListFill", CreateDataOnOpen(
                 () => DataManager.Instance.Start,
                 obj =>
                 {
                     DataManager.Instance.Start = obj;
                     DataManager.Instance.SaveStartParams();
                 },
-                parent)
-        );
+                parent));
 
         var universalEventsNode = _context.NodeFactory.CreateUniversalNode<ReflectedDataPageViewModel>(
             "Universal Event", "Icons.ListFill",
@@ -674,72 +695,67 @@ private void CreateConstantsNode(NodeBase parent)
         var effectsNode =
             _context.NodeFactory.CreateOpenEditorNode<MapEditorPageViewModel>("Effects", "Icons.SparkleFill");
         effectsNode.SubNodes.Add(_context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>("Heal FX",
-            "Icons.SparkleFill",
             effectsNode,
-            CreateFXOnOpen(() => DataManager.Instance.HealFX, fx => DataManager.Instance.HealFX = fx, "Heal", parent)));
+            "Icons.SparkleFill", CreateFXOnOpen(() => DataManager.Instance.HealFX, fx => DataManager.Instance.HealFX = fx, "Heal", parent)));
 
         effectsNode.SubNodes.Add(_context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(
-            "Restore Charge FX", "Icons.SparkleFill",
+            "Restore Charge FX",
             effectsNode,
-            CreateFXOnOpen(() => DataManager.Instance.RestoreChargeFX, fx => DataManager.Instance.RestoreChargeFX = fx,
+            "Icons.SparkleFill", CreateFXOnOpen(() => DataManager.Instance.RestoreChargeFX, fx => DataManager.Instance.RestoreChargeFX = fx,
                 "RestoreCharge", parent)));
 
         effectsNode.SubNodes.Add(_context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(
-            "Lose Charge FX", "Icons.SparkleFill",
+            "Lose Charge FX",
             effectsNode,
-            CreateFXOnOpen(() => DataManager.Instance.LoseChargeFX, fx => DataManager.Instance.LoseChargeFX = fx,
+            "Icons.SparkleFill", CreateFXOnOpen(() => DataManager.Instance.LoseChargeFX, fx => DataManager.Instance.LoseChargeFX = fx,
                 "LoseCharge", parent)));
 
         effectsNode.SubNodes.Add(_context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(
-            "No Charge FX", "Icons.SparkleFill",
+            "No Charge FX",
             effectsNode,
-            CreateFXOnOpen(() => DataManager.Instance.NoChargeFX, fx => DataManager.Instance.NoChargeFX = fx,
+            "Icons.SparkleFill", CreateFXOnOpen(() => DataManager.Instance.NoChargeFX, fx => DataManager.Instance.NoChargeFX = fx,
                 "NoCharge", parent)));
 
         effectsNode.SubNodes.Add(_context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>("Element FX",
-            "Icons.SparkleFill",
             effectsNode,
-            CreateFXOnOpen(() => DataManager.Instance.ElementFX, fx => DataManager.Instance.ElementFX = fx, "Element",
+            "Icons.SparkleFill", CreateFXOnOpen(() => DataManager.Instance.ElementFX, fx => DataManager.Instance.ElementFX = fx, "Element",
                 parent)));
 
         effectsNode.SubNodes.Add(_context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(
-            "Intrinsic FX", "Icons.SparkleFill",
+            "Intrinsic FX",
             effectsNode,
-            CreateFXOnOpen(() => DataManager.Instance.IntrinsicFX, fx => DataManager.Instance.IntrinsicFX = fx,
+            "Icons.SparkleFill", CreateFXOnOpen(() => DataManager.Instance.IntrinsicFX, fx => DataManager.Instance.IntrinsicFX = fx,
                 "Intrinsic", parent)));
 
         effectsNode.SubNodes.Add(_context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(
-            "Send Home FX", "Icons.SparkleFill",
+            "Send Home FX",
             effectsNode,
-            CreateFXOnOpen(() => DataManager.Instance.SendHomeFX, fx => DataManager.Instance.SendHomeFX = fx,
+            "Icons.SparkleFill", CreateFXOnOpen(() => DataManager.Instance.SendHomeFX, fx => DataManager.Instance.SendHomeFX = fx,
                 "SendHome", parent)));
 
         effectsNode.SubNodes.Add(_context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(
-            "Item Lost FX", "Icons.SparkleFill",
+            "Item Lost FX",
             effectsNode,
-            CreateFXOnOpen(() => DataManager.Instance.ItemLostFX, fx => DataManager.Instance.ItemLostFX = fx,
+            "Icons.SparkleFill", CreateFXOnOpen(() => DataManager.Instance.ItemLostFX, fx => DataManager.Instance.ItemLostFX = fx,
                 "ItemLost", parent)));
 
         effectsNode.SubNodes.Add(_context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>("Warp FX",
-            "Icons.SparkleFill",
             effectsNode,
-            CreateFXOnOpen(() => DataManager.Instance.WarpFX, fx => DataManager.Instance.WarpFX = fx, "Warp", parent)));
+            "Icons.SparkleFill", CreateFXOnOpen(() => DataManager.Instance.WarpFX, fx => DataManager.Instance.WarpFX = fx, "Warp", parent)));
 
         effectsNode.SubNodes.Add(_context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(
-            "Knockback FX", "Icons.SparkleFill",
+            "Knockback FX",
             effectsNode,
-            CreateFXOnOpen(() => DataManager.Instance.KnockbackFX, fx => DataManager.Instance.KnockbackFX = fx,
+            "Icons.SparkleFill", CreateFXOnOpen(() => DataManager.Instance.KnockbackFX, fx => DataManager.Instance.KnockbackFX = fx,
                 "Knockback", parent)));
 
         effectsNode.SubNodes.Add(_context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>("Jump FX",
-            "Icons.SparkleFill",
             effectsNode,
-            CreateFXOnOpen(() => DataManager.Instance.JumpFX, fx => DataManager.Instance.JumpFX = fx, "Jump", parent)));
+            "Icons.SparkleFill", CreateFXOnOpen(() => DataManager.Instance.JumpFX, fx => DataManager.Instance.JumpFX = fx, "Jump", parent)));
 
         effectsNode.SubNodes.Add(_context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>("Throw FX",
-            "Icons.SparkleFill",
             effectsNode,
-            CreateFXOnOpen(() => DataManager.Instance.ThrowFX, fx => DataManager.Instance.ThrowFX = fx, "Throw",
+            "Icons.SparkleFill", CreateFXOnOpen(() => DataManager.Instance.ThrowFX, fx => DataManager.Instance.ThrowFX = fx, "Throw",
                 parent)));
 
         constantsNode.SubNodes.Add(effectsNode);
@@ -963,6 +979,9 @@ public ModSwitcherViewModel? ModSwitcher
 
     public void AddPageFromTreeNode(OpenEditorNode node)
     {
+        if (node.EditorType.IsAssignableTo(typeof(IPreCreatePage)))
+            node.EditorType.GetMethod("OnPreCreate")?.Invoke(null, null);
+        
         var editor = _context.PageFactory.CreatePage(node.EditorType, node, node.OnPageLoad);
         
         if (editor != null)
@@ -991,5 +1010,12 @@ public async Task<bool> TryCloseTabAsync(EditorPageViewModel page)
     }
 
 
+    public void OpenMapEditor()
+    {
+        var page = _context.PageFactory.CreatePage<MapEditorPageViewModel>(MapEditorNode);
+        page.SetPageTitle("Map Editor", "Icons.StairsFill");
+        AddTopLevelPage(page);
+    }
+
     // public TreeSearchViewModel TreeSearch { get; } = new TreeSearchViewModel();
 }
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DataListPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DataListPageViewModel.cs
index 92dbc621..253ce408 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DataListPageViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DataListPageViewModel.cs
@@ -237,7 +237,7 @@ private void _configurePage(EditorPageViewModel vm)
     {
         ReflectedDataPageViewModel pg = (ReflectedDataPageViewModel)vm;
     
-        pg.SetIsRootPage(true);
+        pg.SetRootPage(true);
     
         var dataRoot = pg.Node.FindNode<DataRootNode>();
         var dataItem = pg.Node.FindNode<DataItemNode>();
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/EditorPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/EditorPageViewModel.cs
index 4490e261..569a9519 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/EditorPageViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/EditorPageViewModel.cs
@@ -9,6 +9,17 @@
 
 namespace RogueEssence.Dev.ViewModels;
 
+public interface IPreCreatePage
+{
+    static virtual void OnPreCreate() { }
+}
+
+
+public interface IPageReloadable
+{
+    public void Reload();
+}
+
 public abstract class EditorPageViewModel<TNode> : EditorPageViewModel
     where TNode : NodeBase
 {
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/MapEditorPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/MapEditorPageViewModel.cs
index 7d10f0d9..d0b3d4a0 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/MapEditorPageViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/MapEditorPageViewModel.cs
@@ -6,6 +6,7 @@
 using Avalonia.Controls;
 using Avalonia.Platform.Storage;
 using Avalonia.Threading;
+using ReactiveUI;
 using RogueElements;
 using RogueEssence.Content;
 using RogueEssence.Data;
@@ -18,9 +19,29 @@
 
 namespace RogueEssence.Dev.ViewModels;
 
-public class MapEditorPageViewModel : EditorPageViewModel, IMapEditor
+public class MapEditorPageViewModel : EditorPageViewModel, IMapEditor, IPreCreatePage, IPageReloadable
 {
+    // This is probably not the ideal way of doing this...
+    public static void OnPreCreate()
+    {
+        lock (GameBase.lockObj)
+        {
+            Views.DevForm form = (Views.DevForm)DiagManager.Instance.DevEditor;
+            if (form.MapEditPage == null)
+            {
+                LuaEngine.Instance.BreakScripts();
+                MenuManager.Instance.ClearMenus();
+                if (ZoneManager.Instance.CurrentMap != null)
+                    GameManager.Instance.SceneOutcome = GameManager.Instance.MoveToEditor(false, ZoneManager.Instance.CurrentMap.AssetName);
+                else
+                    GameManager.Instance.SceneOutcome = GameManager.Instance.MoveToEditor(false, "");
+            }
+        }
+    }
     public bool Active { get; private set; }
+    
+    
+
     public UndoStack Edits { get; }
 
 
@@ -44,41 +65,50 @@ public MapEditorPageViewModel(
         onPageOpen)
     {
         Edits = new UndoStack();
-        // Textures = textures;
-        // Decorations = decorations;
-        // Terrain = terrain;
-        // Tiles = tiles;
-        // Items = items;
-        // Entities = entities;
-        // Entrances = entrances;
-        // Spawns = spawns;
-        // Effects = effects;
-        // Properties = properties;
-        CurrentFile = "";
     }
 
-    public override void OnPageLoad()
+    private void _reload()
     {
-        lock (GameBase.lockObj)
+        AllowEdit = true;
+        DiagManager.Instance.DevEditor.MapEditor = this;
+
+        DevForm.ExecuteOrInvoke(() =>
         {
-            Views.DevForm form = (Views.DevForm)DiagManager.Instance.DevEditor;
-            if (form.MapEditForm == null)
-            {
-                LuaEngine.Instance.BreakScripts();
-                MenuManager.Instance.ClearMenus();
-                if (ZoneManager.Instance.CurrentMap != null)
-                    GameManager.Instance.SceneOutcome = GameManager.Instance.MoveToEditor(false, ZoneManager.Instance.CurrentMap.AssetName);
-                else
-                    GameManager.Instance.SceneOutcome = GameManager.Instance.MoveToEditor(false, "");
-            }
-        }
+            Textures = new MapTabTexturesViewModel();
+            Decorations = new MapTabDecorationsViewModel();
+            Terrain = new MapTabTerrainViewModel();
+            Tiles = new MapTabTilesViewModel(_context, this);
+            Items = new MapTabItemsViewModel();
+            Entities = new MapTabEntitiesViewModel(_context, this);
+            Entrances = new MapTabEntrancesViewModel();
+            Spawns = new MapTabSpawnsViewModel();
+            Effects = new MapTabEffectsViewModel(_context, this);
+            Properties = new MapTabPropertiesViewModel(_context, this);
+        
+            CurrentFile = "";
+
+        
         
+            LoadFromCurrentMap();
+            Active = true;
+        });
         
         
+       
         base.OnPageLoad();
         
     }
 
+    public void Reload()
+    {
+        _reload();
+    }
+
+    public override void OnPageLoad()
+    {
+        _reload();
+    }
+
     public MapTabTexturesViewModel Textures { get; set; }
     public MapTabDecorationsViewModel Decorations { get; set; }
     public MapTabTerrainViewModel Terrain { get; set; }
@@ -137,29 +167,32 @@ public async void mnuOpen_Click()
             ]
         };
 
-        string result = await _context.DialogService.ShowFilePickerAsync(options, mapDir);
+        await Dispatcher.UIThread.InvokeAsync(async () => { 
 
-        if (result != null)
-        {
-            bool legalPath = false;
-            foreach (string proposedPath in PathMod.FallbackPaths(DataManager.MAP_PATH))
-            {
-                if (comparePaths(proposedPath, Path.GetDirectoryName(result)))
-                    legalPath = true;
-            }
+            string result = await _context.DialogService.ShowFilePickerAsync(options, mapDir);
 
-            if (!legalPath)
-            {
-                await MessageBoxWindowView.Show(_context.DialogService,
-                    String.Format("Map can only be loaded from:\n{0}\nOr one of its parents.",
-                        PathMod.ModPath(DataManager.MAP_PATH)), "Error", MessageBoxWindowView.MessageBoxButtons.Ok);
-            }
-            else
+            if (result != null)
             {
-                lock (GameBase.lockObj)
-                    DoLoad(Path.GetFileNameWithoutExtension(result));
+                bool legalPath = false;
+                foreach (string proposedPath in PathMod.FallbackPaths(DataManager.MAP_PATH))
+                {
+                    if (comparePaths(proposedPath, Path.GetDirectoryName(result)))
+                        legalPath = true;
+                }
+
+                if (!legalPath)
+                {
+                    await MessageBoxWindowView.Show(_context.DialogService,
+                        String.Format("Map can only be loaded from:\n{0}\nOr one of its parents.",
+                            PathMod.ModPath(DataManager.MAP_PATH)), "Error", MessageBoxWindowView.MessageBoxButtons.Ok);
+                }
+                else
+                {
+                    lock (GameBase.lockObj)
+                        DoLoad(Path.GetFileNameWithoutExtension(result));
+                }
             }
-        }
+        });
     }
     // public async void mnuOpen_Click()
     // {
@@ -282,32 +315,37 @@ public async Task<bool> mnuSaveAs_Click()
                 }
             ]
         };
+        await Dispatcher.UIThread.InvokeAsync(async () => { 
 
-        string result = await _context.DialogService.TryGetSaveFileAsync(options, mapDir);
+            string result = await _context.DialogService.TryGetSaveFileAsync(options, mapDir);
 
-        if (!string.IsNullOrEmpty(result))
-        {
-            string reqDir = PathMod.HardMod(DataManager.MAP_PATH);
-            if (!comparePaths(reqDir, Path.GetDirectoryName(result)))
-                await MessageBoxWindowView.Show(_context.DialogService,
-                    string.Format("Map can only be saved to:\n{0}", reqDir),
-                    "Error", MessageBoxWindowView.MessageBoxButtons.Ok);
-            else if (Path.GetFileName(result).Contains(" "))
-                await MessageBoxWindowView.Show(_context.DialogService,
-                    string.Format("Save file should not contain white space:\n{0}", Path.GetFileName(result)),
-                    "Error", MessageBoxWindowView.MessageBoxButtons.Ok);
-            else
+            if (!string.IsNullOrEmpty(result))
             {
-                lock (GameBase.lockObj)
+                string reqDir = PathMod.HardMod(DataManager.MAP_PATH);
+                if (!comparePaths(reqDir, Path.GetDirectoryName(result)))
+                    await MessageBoxWindowView.Show(_context.DialogService,
+                        string.Format("Map can only be saved to:\n{0}", reqDir),
+                        "Error", MessageBoxWindowView.MessageBoxButtons.Ok);
+                else if (Path.GetFileName(result).Contains(" "))
+                    await MessageBoxWindowView.Show(_context.DialogService,
+                        string.Format("Save file should not contain white space:\n{0}", Path.GetFileName(result)),
+                        "Error", MessageBoxWindowView.MessageBoxButtons.Ok);
+                else
                 {
-                    string oldFilename = CurrentFile;
-                    DoSave(ZoneManager.Instance.CurrentMap, result, oldFilename);
-                }
+                    lock (GameBase.lockObj)
+                    {
+                        string oldFilename = CurrentFile;
+                        DoSave(ZoneManager.Instance.CurrentMap, result, oldFilename);
+                    }
 
-                return true;
+                    return true;
+                }
             }
-        }
+            
+       
 
+            return false;
+        });
         return false;
     }
     // public async Task<bool> mnuSaveAs_Click()
@@ -360,11 +398,12 @@ public async void mnuTest_Click()
             lock (GameBase.lockObj)
             {
                 DevForm form = (DevForm)DiagManager.Instance.DevEditor;
-                form.MapEditForm.SilentClose();
-                form.MapEditForm = null;
+                form.MapEditPage.SilentClose();
+                form.MapEditPage = null;
                 GameManager.Instance.SceneOutcome =
                     GameManager.Instance.TestWarp(ZoneManager.Instance.CurrentMap.AssetName, false,
                         MathUtils.Rand.NextUInt64());
+                AllowEdit = false;
             }
         }
     }
@@ -421,25 +460,25 @@ public async void mnuReSize_Click()
         window.DataContext = viewModel;
 
         DevForm form = (DevForm)DiagManager.Instance.DevEditor;
-
-        bool result = await window.ShowDialog<bool>(form.MapEditForm);
-
-        lock (GameBase.lockObj)
-        {
-            if (result)
-            {
-                //TODO: support undo for this
-                DiagManager.Instance.DevEditor.MapEditor.Edits.Clear();
-
-                DiagManager.Instance.LoadMsg = "Resizing Map...";
-                DevForm.EnterLoadPhase(GameBase.LoadPhase.Content);
-
-                ZoneManager.Instance.CurrentMap.ResizeJustified(viewModel.MapWidth, viewModel.MapHeight,
-                    viewModel.ResizeDir);
-
-                DevForm.EnterLoadPhase(GameBase.LoadPhase.Ready);
-            }
-        }
+        //
+        // bool result = await window.ShowDialog<bool>(form.MapEditPage);
+        //
+        // lock (GameBase.lockObj)
+        // {
+        //     if (result)
+        //     {
+        //         //TODO: support undo for this
+        //         DiagManager.Instance.DevEditor.MapEditor.Edits.Clear();
+        //
+        //         DiagManager.Instance.LoadMsg = "Resizing Map...";
+        //         DevForm.EnterLoadPhase(GameBase.LoadPhase.Content);
+        //
+        //         ZoneManager.Instance.CurrentMap.ResizeJustified(viewModel.MapWidth, viewModel.MapHeight,
+        //             viewModel.ResizeDir);
+        //
+        //         DevForm.EnterLoadPhase(GameBase.LoadPhase.Ready);
+        //     }
+        // }
     }
 
     public void mnuUndo_Click()
@@ -803,4 +842,58 @@ public void ProcessUndo()
             }
         }
     }
+    
+ 
+    
+    public void Window_Loaded(object sender, EventArgs e)
+    {
+        Active = true;
+    }
+    
+    private bool silentClose;
+
+    public void SilentClose()
+    {
+        silentClose = true;
+        // Close();
+    }
+
+    public override void OnPageRemoved()
+    {
+        base.OnPageRemoved();
+        Active = false;
+        if (!silentClose)
+            GameManager.Instance.SceneOutcome = exitMapEdit();
+        
+    }
+    
+    
+    private IEnumerator<YieldInstruction> exitMapEdit()
+    {
+        DevForm form = (DevForm)DiagManager.Instance.DevEditor;
+        form.MapEditPage = null;
+
+        //move to the previous scene or the title, if there was none
+        if (DataManager.Instance.Save != null && DataManager.Instance.Save.NextDest.IsValid())
+            yield return CoroutineManager.Instance.StartCoroutine(GameManager.Instance.MoveToZone(DataManager.Instance.Save.NextDest, true, false));
+        else
+            yield return CoroutineManager.Instance.StartCoroutine(GameManager.Instance.RestartToTitle());
+    }
+    
+    public void Close()
+    {
+        _context.TabEvents.RemoveTab(this);
+    }
+
+    // Keeps track of whether the map editor while testing in-game
+    private bool _allowEdit;
+    public bool AllowEdit
+    {
+        get { return _allowEdit; }
+        set
+        {
+            this.RaiseAndSetIfChanged(ref _allowEdit, value);
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ModConfigPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ModConfigPageViewModel.cs
index 1d33170d..91b4f7e2 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ModConfigPageViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ModConfigPageViewModel.cs
@@ -155,8 +155,7 @@ public void Relationships_EditItem(int index, object element, bool advancedEdit,
             DataEditor.GetWindowTitle("Relationship", elementName, element, typeof(RelatedMod), new object[0]);
 
         NodeBase node =
-            _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(elementName,
-                pageViewModel.Node.Icon, pageViewModel.Node);
+            _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(elementName, pageViewModel.Node, pageViewModel.Node.Icon);
         pageViewModel.Node.AddNodeIfNotExists(node);
         NodeHelper.ExpandParents(node, true);
 
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ReflectedDataPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ReflectedDataPageViewModel.cs
index c3516a3d..1c29a59f 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ReflectedDataPageViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ReflectedDataPageViewModel.cs
@@ -36,7 +36,7 @@ public bool IsRootPage
     }
 
     // If the page is the root page, it will include the "Save All Sub-Windows" button
-    public void SetIsRootPage(bool isRoot)
+    public void SetRootPage(bool isRoot)
     {
         IsRootPage = isRoot;
     }
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/UserControls/TeamBoxViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/UserControls/TeamBoxViewModel.cs
index a9f804b2..fbab479d 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/UserControls/TeamBoxViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/UserControls/TeamBoxViewModel.cs
@@ -85,7 +85,7 @@ public async Task EditTeam()
 
             DevForm form = (DevForm)DiagManager.Instance.DevEditor;
 
-            bool result = await window.ShowDialog<bool>(form.MapEditForm);
+            // bool result = await window.ShowDialog<bool>(form.MapEditPage);
 
             //lock (GameBase.lockObj)
             //{
diff --git a/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapEditForm.axaml.cs b/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapEditForm.axaml.cs
index a0676768..abb4feb5 100644
--- a/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapEditForm.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapEditForm.axaml.cs
@@ -58,7 +58,7 @@ public void Window_Closed(object sender, EventArgs e)
         private IEnumerator<YieldInstruction> exitMapEdit()
         {
             DevForm form = (DevForm)DiagManager.Instance.DevEditor;
-            form.MapEditForm = null;
+            form.MapEditPage = null;
 
             //move to the previous scene or the title, if there was none
             if (DataManager.Instance.Save != null && DataManager.Instance.Save.NextDest.IsValid())
diff --git a/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabEffects.axaml b/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabEffects.axaml
index 969511da..dd5b37f2 100644
--- a/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabEffects.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabEffects.axaml
@@ -9,27 +9,11 @@
   <Design.DataContext>
     <vm:MapTabEffectsViewModel/>
   </Design.DataContext>
-  <Grid Margin="4" >
-    <Grid.ColumnDefinitions>
-      <ColumnDefinition/>
-      <ColumnDefinition/>
-    </Grid.ColumnDefinitions>
-    <Grid.RowDefinitions>
-      <RowDefinition Height="240"/>
-      <RowDefinition Height="40"/>
-      <RowDefinition/>
-    </Grid.RowDefinitions>
-    <Grid Grid.Row="0" Grid.Column="0">
-      <Grid.RowDefinitions>
-        <RowDefinition Height="20"/>
-        <RowDefinition/>
-      </Grid.RowDefinitions>
+  <Grid Margin="4" ColumnDefinitions="*, *" RowDefinitions="200, 40">
+    <Grid Grid.Row="0" Grid.Column="0" RowDefinitions="20, *">
       <TextBlock Margin="4" VerticalAlignment="Bottom" Grid.Row="0">Map Statuses</TextBlock>
       <views:CollectionBox DataContext="{Binding Statuses}" Margin="4" Grid.Row="1"/>
     </Grid>
     <views:ClassBox DataContext="{Binding MapEffect}" Margin="4,2" Grid.Row="1" Grid.Column="0"/>
   </Grid>
-
-  
-  
 </UserControl>
diff --git a/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabEntrances.axaml b/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabEntrances.axaml
index 2beff3b8..5f9aa685 100644
--- a/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabEntrances.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabEntrances.axaml
@@ -35,8 +35,8 @@
         <ColumnDefinition/>
       </Grid.ColumnDefinitions>
       <TextBlock Margin="4,2" VerticalAlignment="Bottom" Grid.Row="0" Grid.Column="0">Mode</TextBlock>
-      <RadioButton IsChecked="{Binding Path=EntMode, Converter={StaticResource ComparisonConverter}, ConverterParameter={x:Static local:EntEditMode.SelectEntity}}" VerticalAlignment="Top" Margin="2" Grid.Row="1" Grid.Column="0">Select/Move</RadioButton>
-      <RadioButton IsChecked="{Binding Path=EntMode, Converter={StaticResource ComparisonConverter}, ConverterParameter={x:Static local:EntEditMode.PlaceEntity}}" VerticalAlignment="Top" Margin="2" Grid.Row="1" Grid.Column="1">Add/Delete</RadioButton>
+      <RadioButton IsChecked="{Binding Path=EntMode, Converter={StaticResource ComparisonConverter}, ConverterParameter={x:Static local:EntEditMode.SelectEntity}}" Margin="2" Grid.Row="1" Grid.Column="0">Select/Move</RadioButton>
+      <RadioButton IsChecked="{Binding Path=EntMode, Converter={StaticResource ComparisonConverter}, ConverterParameter={x:Static local:EntEditMode.PlaceEntity}}" Margin="2" Grid.Row="1" Grid.Column="1">Add/Delete</RadioButton>
     </Grid>
     <TextBlock Margin="4,2" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="1" Grid.Column="0">Direction:</TextBlock>
     <views:SearchComboBox ItemsSource="{Binding Directions}" SelectedIndex="{Binding ChosenDir}" VerticalAlignment="Center" Margin="4,2" Grid.Row="1" Grid.Column="1"/>
diff --git a/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabProperties.axaml b/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabProperties.axaml
index 0f127595..86c632e0 100644
--- a/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabProperties.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabProperties.axaml
@@ -9,31 +9,8 @@
   <Design.DataContext>
     <vm:MapTabPropertiesViewModel/>
   </Design.DataContext>
-  <Grid Margin="4" >
-    <Grid.ColumnDefinitions>
-      <ColumnDefinition/>
-      <ColumnDefinition/>
-    </Grid.ColumnDefinitions>
-    <Grid.RowDefinitions>
-      <RowDefinition/>
-    </Grid.RowDefinitions>
-    <Grid Grid.Row="0" Grid.Column="0" Grid.RowSpan="1">
-      <Grid.RowDefinitions>
-        <RowDefinition Height="36"/>
-        <RowDefinition Height="36"/>
-        <RowDefinition Height="36"/>
-        <RowDefinition Height="36"/>
-        <RowDefinition Height="36"/>
-        <RowDefinition Height="22"/>
-        <RowDefinition Height="48"/>
-        <RowDefinition />
-      </Grid.RowDefinitions>
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition Width="80"/>
-        <ColumnDefinition/>
-        <ColumnDefinition Width="80"/>
-        <ColumnDefinition/>
-      </Grid.ColumnDefinitions>
+  <Grid Margin="4" ColumnDefinitions="*,*" RowDefinitions="*">
+    <Grid Grid.Row="0" Grid.Column="0" RowDefinitions="36,36,36,36,36,22,48,*" ColumnDefinitions="80,*,80,*">
       <TextBlock Margin="4,2" VerticalAlignment="Center" HorizontalAlignment="Right" ToolTip.Tip="Map name in the current language.">Map Name:</TextBlock>
       <TextBox Text="{Binding MapName}" VerticalAlignment="Center" Margin="4" Grid.Column="1" Grid.ColumnSpan="3"/>
       <TextBlock Margin="4,2" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="1" ToolTip.Tip="The darkness of the map, for seeing tiles.">Tile Sight:</TextBlock>
@@ -57,15 +34,10 @@
         <views:DictionaryBox DataContext="{Binding TextureMap}" Margin="4" Grid.Row="1"/>
       </Grid>
     </Grid>
-    <Grid Grid.Row="0" Grid.Column="1">
-      <Grid.RowDefinitions>
-        <RowDefinition Height="20"/>
-        <RowDefinition/>
-        <RowDefinition Height="34"/>
-      </Grid.RowDefinitions>
+    <Grid Grid.Row="0" Grid.Column="1" RowDefinitions="20, *, 34">
       <TextBlock Margin="4" VerticalAlignment="Bottom" Grid.Row="0">Music:</TextBlock>
-      <ListBox Name="lbxMusic" SelectionMode="AlwaysSelected" ItemsSource="{Binding Music}" SelectedIndex="{Binding ChosenMusic}" Margin="4" Grid.Row="1"/>
-      <Button Name="btnReloadMusic" Command="{Binding btnReloadMusic_Click}" Margin="4" Grid.Row="2">Reload Music</Button>
+      <ListBox Classes="datalist" Name="lbxMusic" SelectionMode="AlwaysSelected" ItemsSource="{Binding Music}" SelectedIndex="{Binding ChosenMusic}" Margin="4" Grid.Row="1"/>
+      <Button Classes="flat" Name="btnReloadMusic" Command="{Binding btnReloadMusic_Click}" Margin="4" Grid.Row="2">Reload Music</Button>
     </Grid>
   </Grid>
 
diff --git a/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabTiles.axaml b/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabTiles.axaml
index 944dd81b..48b391d7 100644
--- a/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabTiles.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabTiles.axaml
@@ -14,61 +14,24 @@
   <UserControl.Resources>
     <converters:ComparisonConverter x:Key="ComparisonConverter"/>
   </UserControl.Resources>
-  <Grid Margin="4" >
-    <Grid.RowDefinitions>
-      <RowDefinition Height="38"/>
-      <RowDefinition Height="38"/>
-      <RowDefinition Height="38"/>
-      <RowDefinition/>
-    </Grid.RowDefinitions>
-    <Grid.ColumnDefinitions>
-      <ColumnDefinition/>
-    </Grid.ColumnDefinitions>
-    <Grid Grid.Row="0">
-      <Grid.RowDefinitions>
-        <RowDefinition Height="16"/>
-        <RowDefinition Height="26"/>
-      </Grid.RowDefinitions>
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition/>
-        <ColumnDefinition/>
-        <ColumnDefinition/>
-        <ColumnDefinition/>
-      </Grid.ColumnDefinitions>
+  <Grid Margin="4" RowDefinitions="38, 38, 38, *">
+    <Grid Grid.Row="0" RowDefinitions="16, 28" ColumnDefinitions="*, *, *, *">
       <TextBlock Margin="4,2" VerticalAlignment="Bottom" Grid.Row="0" Grid.Column="0">Mode</TextBlock>
       <RadioButton IsChecked="{Binding Path=TileMode, Converter={StaticResource ComparisonConverter}, ConverterParameter={x:Static local:TileEditMode.Draw}}" VerticalAlignment="Top" Margin="2" Grid.Row="1" Grid.Column="0">Draw</RadioButton>
       <RadioButton IsChecked="{Binding Path=TileMode, Converter={StaticResource ComparisonConverter}, ConverterParameter={x:Static local:TileEditMode.Rectangle}}" VerticalAlignment="Top" Margin="2" Grid.Row="1" Grid.Column="1">Rectangle</RadioButton>
       <RadioButton IsChecked="{Binding Path=TileMode, Converter={StaticResource ComparisonConverter}, ConverterParameter={x:Static local:TileEditMode.Fill}}" VerticalAlignment="Top" Margin="2" Grid.Row="1" Grid.Column="2">Fill</RadioButton>
       <RadioButton IsChecked="{Binding Path=TileMode, Converter={StaticResource ComparisonConverter}, ConverterParameter={x:Static local:TileEditMode.Eyedrop}}" VerticalAlignment="Top" Margin="2" Grid.Row="1" Grid.Column="3">Eyedrop</RadioButton>
     </Grid>
-    <Grid Grid.Row="1">
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition Width="80"/>
-        <ColumnDefinition/>
-        <ColumnDefinition Width="80"/>
-        <ColumnDefinition/>
-      </Grid.ColumnDefinitions>
+    <Grid Grid.Row="1" ColumnDefinitions="80, *, 80, *">
       <TextBlock Margin="4,2" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Column="0">Tile:</TextBlock>
       <views:SearchComboBox ItemsSource="{Binding TileTypes}" SelectedIndex="{Binding ChosenTile}"  VerticalAlignment="Center" Margin="4,2" Grid.Column="1"/>
       <TextBlock Margin="4,2" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Column="2">Owner:</TextBlock>
       <views:SearchComboBox ItemsSource="{Binding Owners}" SelectedIndex="{Binding ChosenOwner}" VerticalAlignment="Center" Margin="4,2" Grid.Column="3"/>
     </Grid>
-    <Grid Grid.Row="2">
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition/>
-        <ColumnDefinition/>
-      </Grid.ColumnDefinitions>
+    <Grid Grid.Row="2" ColumnDefinitions="*, *">
       <CheckBox Margin="4" IsChecked="{Binding IsRevealed}" Grid.Column="0">Revealed</CheckBox>
     </Grid>
-    <Grid Grid.Row="3">
-      <Grid.RowDefinitions>
-        <RowDefinition Height="20"/>
-        <RowDefinition/>
-      </Grid.RowDefinitions>
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition/>
-        <ColumnDefinition/>
-      </Grid.ColumnDefinitions>
+    <Grid Grid.Row="3" RowDefinitions="20, *" ColumnDefinitions="*, *">
       <TextBlock Margin="4" VerticalAlignment="Bottom" Grid.Row="0">Tile States</TextBlock>
       <views:CollectionBox DataContext="{Binding TileStates}" Margin="4" Grid.Row="1" Grid.Column="0"/>
     </Grid>
diff --git a/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml.cs b/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml.cs
index a526bfbe..9f316a6e 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml.cs
@@ -29,13 +29,17 @@ public partial class DevForm : ChromelessWindow, IRootEditor
 {
     public bool LoadComplete { get; private set; }
 
-        public MapEditForm MapEditForm;
+        public MapEditorPageViewModel MapEditPage;
         public GroundEditForm GroundEditForm;
 
         private Action pendingEditorAction;
         private Exception pendingException;
 
-        public IMapEditor MapEditor { get { return MapEditForm; } }
+        public IMapEditor MapEditor 
+        { 
+            get { return MapEditPage; }
+            set { MapEditPage = (MapEditorPageViewModel)value; }
+        }
         public IGroundEditor GroundEditor { get { return GroundEditForm; } }
         public bool AteMouse { get { return false; } }
         public bool AteKeyboard { get { return false; } }
@@ -178,9 +182,10 @@ private void update()
                     ViewModels.GroundEditViewModel vm = (ViewModels.GroundEditViewModel)GroundEditForm.DataContext;
                     vm.Textures.TileBrowser.UpdateFrame();
                 }
-                if (MapEditForm != null)
+                if (MapEditPage != null)
                 {
-                    ViewModels.MapEditViewModel vm = (ViewModels.MapEditViewModel)MapEditForm.DataContext;
+
+                    MapEditorPageViewModel vm = MapEditPage;
                     vm.Textures.TileBrowser.UpdateFrame();
                     vm.Terrain.TileBrowser.UpdateFrame();
                 }
@@ -212,12 +217,9 @@ public void OpenMap()
 
         public void openMap()
         {
-            // TODO: Resolve this!
-            // MapEditForm = new MapEditForm();
-            // ViewModels.MapEditViewModel vm = new ViewModels.MapEditViewModel();
-            // MapEditForm.DataContext = vm;
-            // vm.LoadFromCurrentMap();
-            // MapEditForm.Show();
+            DevFormViewModel vm  = (DevFormViewModel)this.DataContext;
+            vm.OpenMapEditor();
+
         }
 
         public void groundEditorClosed(object sender, EventArgs e)
@@ -234,10 +236,10 @@ public void mapEditorClosed(object sender, EventArgs e)
         private IEnumerator<YieldInstruction> resetEditors()
         {
             GroundEditForm = null;
-            MapEditForm = null;
+            MapEditPage = null;
             yield return CoroutineManager.Instance.StartCoroutine(GameManager.Instance.RestartToTitle());
         }
-
+        
 
         public void CloseGround()
         {
@@ -247,11 +249,10 @@ public void CloseGround()
 
         public void CloseMap()
         {
-            if (MapEditForm != null)
-                MapEditForm.Close();
+            if (MapEditPage != null)
+                MapEditPage.Close();
         }
-
-
+        
         void LoadGame()
         {
             // Windows - CAN run game in new thread, CAN run game in same thread via dispatch.
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/DataListPageView.axaml b/RogueEssence.Editor.Avalonia/Views/New/Editors/DataListPageView.axaml
index abba9348..21b3d598 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/Editors/DataListPageView.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/New/Editors/DataListPageView.axaml
@@ -88,18 +88,10 @@
 
             <ListBox Grid.Row="2"
                      ContextRequested="DataListPageListBox_OnContextRequested"
-                     Background="{DynamicResource Brush.ListBox.Background}"
                      x:Name="DataListPageListBox" SelectedItem="{Binding SelectedItem}"
-                     ItemsSource="{Binding FilteredItems}" Height="400" BorderBrush="{DynamicResource Brush.Border2}"
-                     BorderThickness="1" DoubleTapped="DataListPageListBox_OnDoubleTapped">
-                <ListBox.Styles>
-                    <Style Selector="ListBoxItem">
-                        <Setter Property="Background" Value="{DynamicResource Brush.ListBox.Background}" />
-                    </Style>
-                </ListBox.Styles>
-                <ListBox.ItemContainerTheme>
-                    <StaticResource ResourceKey="CompactListBoxItem"/>
-                </ListBox.ItemContainerTheme>
+                     ItemsSource="{Binding FilteredItems}" Height="400"
+                     Classes="datalist"
+                     DoubleTapped="DataListPageListBox_OnDoubleTapped">
                 <ListBox.ItemTemplate>
                     <DataTemplate>
                         <TextBlock Text="{Binding Title}" Padding="4" />
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/MapEditorPageView.axaml b/RogueEssence.Editor.Avalonia/Views/New/Editors/MapEditorPageView.axaml
index 02184f11..8920debf 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/Editors/MapEditorPageView.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/New/Editors/MapEditorPageView.axaml
@@ -10,63 +10,63 @@
   <Design.DataContext>
     <vm:MapEditorPageViewModel></vm:MapEditorPageViewModel>
   </Design.DataContext>
-    <TextBlock>Hi</TextBlock>
-  <!-- <DockPanel> -->
-  <!--   <Menu DockPanel.Dock="Top"> -->
-  <!--     <MenuItem Header="_File"> -->
-  <!--       <MenuItem Header="_New" Command="{Binding mnuNew_Click}"/> -->
-  <!--       <MenuItem Header="_Open" Command="{Binding mnuOpen_Click}"/> -->
-  <!--       <MenuItem Header="_Save" Command="{Binding mnuSave_Click}"/> -->
-  <!--       <MenuItem Header="_Save As" Command="{Binding mnuSaveAs_Click}"/> -->
-  <!--       <MenuItem Header="_Save and Test" Command="{Binding mnuTest_Click}"/> -->
-  <!--       <MenuItem Header="_Export as Ground" Command="{Binding mnuExportAsGround_Click}"/> -->
-  <!--     </MenuItem> -->
-  <!--     <MenuItem Header="_Edit"> -->
-  <!--       <MenuItem Header="Resize Map" Command="{Binding mnuReSize_Click}"/> -->
-  <!--       <Separator/> -->
-  <!--       <MenuItem Header="Undo" Command="{Binding mnuUndo_Click}"/> -->
-  <!--       <MenuItem Header="Redo" Command="{Binding mnuRedo_Click}"/> -->
-  <!--     </MenuItem> -->
-  <!--     <MenuItem Header="_Tiles"> -->
-  <!--       <MenuItem Header="_Load from .png into Tileset" Command="{Binding mnuImportFromPng_Click}"/> -->
-  <!--       <MenuItem Header="_Load Tileset into Layer" Command="{Binding mnuImportFromTileset_Click}"/> -->
-  <!--       <MenuItem Header="_Clear Layer" Command="{Binding mnuClearLayer_Click}"/> -->
-  <!--       <MenuItem Header="_Load Standardize Frame Length" Command="{Binding mnuStandardizeFrameLength_Click}"/> -->
-  <!--     </MenuItem> -->
-  <!--   </Menu> -->
-  <!--   <Grid> -->
-  <!--     <TabControl Name="tabOptions" TabStripPlacement="Top" SelectedIndex="{Binding SelectedTabIndex}" Margin="2"> -->
-  <!--       <TabItem Name="tabTextures" Header="Textures" > -->
-  <!--         <v:MapTabTextures DataContext="{Binding Textures}"/> -->
-  <!--       </TabItem> -->
-  <!--       <TabItem Name="tabDecorations" Header="Decorations" > -->
-  <!--         <v:MapTabDecorations DataContext="{Binding Decorations}"/> -->
-  <!--       </TabItem> -->
-  <!--       <TabItem Name="tabTerrain" Header="Terrain" > -->
-  <!--         <v:MapTabTerrain DataContext="{Binding Terrain}"/> -->
-  <!--       </TabItem> -->
-  <!--       <TabItem Name="tabTiles" Header="Tiles" > -->
-  <!--         <v:MapTabTiles DataContext="{Binding Tiles}"/> -->
-  <!--       </TabItem> -->
-  <!--       <TabItem Name="tabItems" Header="Items" > -->
-  <!--         <v:MapTabItems DataContext="{Binding Items}"/> -->
-  <!--       </TabItem> -->
-  <!--       <TabItem Name="tabEntities" Header="Entities" > -->
-  <!--         <v:MapTabEntities DataContext="{Binding Entities}"/> -->
-  <!--       </TabItem> -->
-  <!--       <TabItem Name="tabEntrances" Header="Entrances" > -->
-  <!--         <v:MapTabEntrances DataContext="{Binding Entrances}"/> -->
-  <!--       </TabItem> -->
-  <!--       <TabItem Name="tabSpawns" Header="Spawns" > -->
-  <!--         <v:MapTabSpawns DataContext="{Binding Spawns}"/> -->
-  <!--       </TabItem> -->
-  <!--       <TabItem Name="tabEffects" Header="Effects" > -->
-  <!--         <v:MapTabEffects DataContext="{Binding Effects}"/> -->
-  <!--       </TabItem> -->
-  <!--       <TabItem Name="tabProperties" Header="Properties" > -->
-  <!--         <v:MapTabProperties DataContext="{Binding Properties}"/> -->
-  <!--       </TabItem> -->
-  <!--     </TabControl> -->
-  <!--   </Grid> -->
-  <!-- </DockPanel> -->
+    <!-- <TextBlock>Hi</TextBlock> -->
+  <DockPanel>
+    <Menu DockPanel.Dock="Top" IsEnabled="{Binding AllowEdit}">
+      <MenuItem Header="_File">
+        <MenuItem Header="_New" Command="{Binding mnuNew_Click}"/>
+        <MenuItem Header="_Open" Command="{Binding mnuOpen_Click}"/>
+        <MenuItem Header="_Save" Command="{Binding mnuSave_Click}"/>
+        <MenuItem Header="_Save As" Command="{Binding mnuSaveAs_Click}"/>
+        <MenuItem Header="_Save and Test" Command="{Binding mnuTest_Click}"/>
+        <MenuItem Header="_Export as Ground" Command="{Binding mnuExportAsGround_Click}"/>
+      </MenuItem>
+      <MenuItem Header="_Edit">
+        <MenuItem Header="Resize Map" Command="{Binding mnuReSize_Click}"/>
+        <Separator/>
+        <MenuItem Header="Undo" Command="{Binding mnuUndo_Click}"/>
+        <MenuItem Header="Redo" Command="{Binding mnuRedo_Click}"/>
+      </MenuItem>
+      <MenuItem Header="_Tiles">
+        <MenuItem Header="_Load from .png into Tileset" Command="{Binding mnuImportFromPng_Click}"/>
+        <MenuItem Header="_Load Tileset into Layer" Command="{Binding mnuImportFromTileset_Click}"/>
+        <MenuItem Header="_Clear Layer" Command="{Binding mnuClearLayer_Click}"/>
+        <MenuItem Header="_Load Standardize Frame Length" Command="{Binding mnuStandardizeFrameLength_Click}"/>
+      </MenuItem>
+    </Menu>
+    <Grid>
+      <TabControl Name="tabOptions" TabStripPlacement="Top" SelectedIndex="{Binding SelectedTabIndex}" Margin="2" IsEnabled="{Binding AllowEdit}">
+        <TabItem Name="tabTextures" Header="Textures" >
+          <v:MapTabTextures DataContext="{Binding Textures}"/>
+        </TabItem>
+        <TabItem Name="tabDecorations" Header="Decorations" >
+          <v:MapTabDecorations DataContext="{Binding Decorations}"/>
+        </TabItem>
+        <TabItem Name="tabTerrain" Header="Terrain" >
+          <v:MapTabTerrain DataContext="{Binding Terrain}"/>
+        </TabItem>
+        <TabItem Name="tabTiles" Header="Tiles" >
+          <v:MapTabTiles DataContext="{Binding Tiles}"/>
+        </TabItem>
+        <TabItem Name="tabItems" Header="Items" >
+          <v:MapTabItems DataContext="{Binding Items}"/>
+        </TabItem>
+        <TabItem Name="tabEntities" Header="Entities" >
+          <v:MapTabEntities DataContext="{Binding Entities}"/>
+        </TabItem>
+        <TabItem Name="tabEntrances" Header="Entrances" >
+          <v:MapTabEntrances DataContext="{Binding Entrances}"/>
+        </TabItem>
+        <TabItem Name="tabSpawns" Header="Spawns" >
+          <v:MapTabSpawns DataContext="{Binding Spawns}"/>
+        </TabItem>
+        <TabItem Name="tabEffects" Header="Effects" >
+          <v:MapTabEffects DataContext="{Binding Effects}"/>
+        </TabItem>
+        <TabItem Name="tabProperties" Header="Properties" >
+          <v:MapTabProperties DataContext="{Binding Properties}"/>
+        </TabItem>
+      </TabControl>
+    </Grid>
+  </DockPanel>
 </UserControl>
\ No newline at end of file
diff --git a/RogueEssence/Dev/EmptyEditor.cs b/RogueEssence/Dev/EmptyEditor.cs
index b4837b8b..f7488579 100644
--- a/RogueEssence/Dev/EmptyEditor.cs
+++ b/RogueEssence/Dev/EmptyEditor.cs
@@ -7,7 +7,7 @@ public class EmptyEditor : IRootEditor
     {
         public bool LoadComplete => true;
         public IGroundEditor GroundEditor => null;
-        public IMapEditor MapEditor => null;
+        public IMapEditor MapEditor { get; set; }
         public bool AteMouse { get { return false; } }
         public bool AteKeyboard { get { return false; } }
 
diff --git a/RogueEssence/Dev/IRootEditor.cs b/RogueEssence/Dev/IRootEditor.cs
index 862bada5..d541fc79 100644
--- a/RogueEssence/Dev/IRootEditor.cs
+++ b/RogueEssence/Dev/IRootEditor.cs
@@ -9,7 +9,7 @@ public interface IRootEditor
         bool AteMouse { get; }
         bool AteKeyboard { get; }
         IGroundEditor GroundEditor { get; }
-        IMapEditor MapEditor { get; }
+        IMapEditor MapEditor { get; set; }
 
         void ReloadData(DataManager.DataType dataType);
         void Load(GameBase game);
diff --git a/RogueEssence/DiagManager.cs b/RogueEssence/DiagManager.cs
index 1897f2a5..9e90b817 100644
--- a/RogueEssence/DiagManager.cs
+++ b/RogueEssence/DiagManager.cs
@@ -100,7 +100,7 @@ public DiagManager()
             FNALoggerEXT.LogWarn = LogInfo;
             FNALoggerEXT.LogError = LogInfo;
         }
-
+        
         public void SetErrorListener(LogAdded errorAdded, ErrorTrace errorTrace)
         {
             errorAddedEvent = errorAdded;

From 2c4e4420c7570e719f677a20a5bd25d735ec84c4 Mon Sep 17 00:00:00 2001
From: Kace <41309226+DoubleTrio@users.noreply.github.com>
Date: Thu, 21 May 2026 02:14:42 -0400
Subject: [PATCH 34/51] added ground editing, clean up

---
 RogueEssence.Editor.Avalonia/App.axaml.cs     |   2 +-
 .../Assets/Icons.axaml                        |  10 +
 .../Assets/ListBoxStyles.axaml                |  13 +
 .../Assets/Styles.axaml                       |   6 +-
 .../DataEditor/CollectionBox.axaml            |   2 +-
 .../DataEditor/CollectionBoxViewModel.cs      |   7 +-
 .../RogueElements/PriorityListEditor.cs       |   2 +-
 .../Editors/RogueElements/TypeDictEditor.cs   |   2 +-
 .../RogueEssence/Tiles/AutoTileEditor.cs      |  12 +-
 .../RogueEssence/Tiles/AutotileBrowser.axaml  |  44 +-
 .../RogueEssence/Tiles/TileBrowser.axaml      |  36 +-
 .../RogueEssence/Tiles/TileEditForm.axaml     |  35 -
 .../RogueEssence/Tiles/TileEditForm.axaml.cs  |  29 -
 .../Tiles/TileEditWindowView.axaml            |  55 ++
 .../Tiles/TileEditWindowView.axaml.cs         |  43 +
 ...iewModel.cs => TileEditWindowViewModel.cs} |   4 +-
 .../DataEditor/SpawnRangeListBoxViewModel.cs  |   6 +-
 .../RogueEssence.Editor.Avalonia.csproj       |  16 +-
 .../Content/TilesetEditViewModel.cs           |   4 +-
 .../ViewModels/DevForm/DevTabDataViewModel.cs |   4 +-
 ...odsViewModel.cs => ModManagerViewModel.cs} |  39 +-
 .../GroundEditForm/GroundEditViewModel.cs     | 365 ++++-----
 .../GroundTabPropertiesViewModel.cs           |  40 +-
 .../GroundTabScriptViewModel.cs               |   9 +-
 .../GroundTabTexturesViewModel.cs             |   5 +-
 .../Layers/AnimLayerBoxViewModel.cs           |   4 +-
 .../Layers/EntityLayerBoxViewModel.cs         |   4 +-
 .../Layers/TextureLayerBoxViewModel.cs        |  23 +-
 .../MapEditForm/MapEditViewModel.cs           |   4 +-
 .../MapEditForm/MapTabPropertiesViewModel.cs  |   4 +-
 .../MapEditForm/MapTabTexturesViewModel.cs    |   6 +-
 .../ViewModels/New/DevFormViewModel.cs        | 195 +----
 .../DialogBoxes/MapLayerWindowViewModel.cs    |  62 ++
 .../DialogBoxes/MapResizeWindowViewModel.cs   |  94 +++
 .../New/DialogBoxes/ModNameWindowViewModel.cs |  38 +
 .../New/Editors/AnimEditPageViewModel.cs      |   6 -
 .../New/Editors/DataListPageViewModel.cs      |  24 +-
 .../New/Editors/EditorPageViewModel.cs        |   8 +-
 .../New/Editors/EmptyPageViewModel.cs         |  13 +
 .../New/Editors/GroundEditorPageViewModel.cs  | 739 +++++++++++++++++-
 .../New/Editors/MapEditorPageViewModel.cs     |  65 +-
 .../New/Editors/ModConfigPageViewModel.cs     |   8 +-
 .../New/Editors/ModListPageViewModel.cs       |  68 +-
 .../ViewModels/New/ModSwitcherViewModel.cs    |   4 +-
 .../New/Nodes/ISpriteRootOperationStrategy.cs |   2 -
 .../ViewModels/New/Nodes/NodeBase.cs          |   6 +-
 .../UserControls/LayerBoxViewModel.cs         |  27 +
 .../Views/DevForm/DevTabMods.axaml            |  30 +-
 .../Views/DevForm/DevTabPlayer.axaml          |  15 +-
 .../Views/DialogBoxes/MapRetileWindow2.axaml  |   2 +-
 .../Views/GroundEditForm/EntityBrowser.axaml  | 278 +++----
 .../GroundEditForm/GroundEditForm.axaml.cs    |   2 +-
 .../GroundEditForm/GroundTabDecorations.axaml |  87 +--
 .../GroundEditForm/GroundTabEntities.axaml    |  29 +-
 .../GroundEditForm/GroundTabProperties.axaml  |  69 +-
 .../GroundEditForm/GroundTabScript.axaml      |  38 +-
 .../GroundEditForm/GroundTabStrings.axaml     |  79 +-
 .../Views/GroundEditForm/GroundTabWalls.axaml |  21 +-
 .../Views/MapEditForm/MapEditForm.axaml.cs    |   2 +-
 .../Views/MapEditForm/MapTabDecorations.axaml |  97 +--
 .../Views/MapEditForm/MapTabEntities.axaml    | 119 +--
 .../Views/MapEditForm/MapTabEntrances.axaml   |  28 +-
 .../Views/MapEditForm/MapTabItems.axaml       |  93 +--
 .../Views/MapEditForm/MapTabProperties.axaml  |   4 +-
 .../Views/MapEditForm/MapTabTerrain.axaml     | 106 +--
 .../Views/MapEditForm/MapTabTextures.axaml    |  32 +-
 .../Views/New/DevForm.axaml                   | 139 +---
 .../Views/New/DevForm.axaml.cs                |  46 +-
 .../New/DialogBoxes/MapLayerWindowView.axaml  |  52 ++
 .../DialogBoxes/MapLayerWindowView.axaml.cs   |  27 +
 .../New/DialogBoxes/MapResizeWindowView.axaml |  88 +++
 .../DialogBoxes/MapResizeWindowView.axaml.cs  |  30 +
 ...Window.axaml => MapRetileWindowView.axaml} |  21 +-
 ....axaml.cs => MapRetileWindowView.axaml.cs} |   7 +-
 .../New/DialogBoxes/ModNameWindowView.axaml   |  54 ++
 .../DialogBoxes/ModNameWindowView.axaml.cs    |  27 +
 .../New/DialogBoxes/RenameWindowView.axaml    |  13 +-
 .../Views/New/Editors/DataListPageView.axaml  |  68 +-
 .../Editors/DevControl/DevControlView.axaml   |  58 --
 .../New/Editors/GroundEditorPageView.axaml    |  62 +-
 .../Views/New/Editors/MapEditorPageView.axaml |   1 -
 .../New/Editors/MapEditorPageView.axaml.cs    |  20 -
 .../Views/New/Editors/ModConfigPageView.axaml |   2 +-
 .../New/Editors/SpeciesEditPageView.axaml     |   2 +-
 .../Views/New/Editors/SpritePageView.axaml    |  28 +-
 .../Views/SearchListBox.axaml                 |  25 +-
 .../Views/UserControls/LayerBox.axaml         | 113 ++-
 RogueEssence/Dev/EmptyEditor.cs               |   2 +-
 RogueEssence/Dev/IRootEditor.cs               |   2 +-
 89 files changed, 2389 insertions(+), 1823 deletions(-)
 delete mode 100644 RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Tiles/TileEditForm.axaml
 delete mode 100644 RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Tiles/TileEditForm.axaml.cs
 create mode 100644 RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Tiles/TileEditWindowView.axaml
 create mode 100644 RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Tiles/TileEditWindowView.axaml.cs
 rename RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Tiles/{TileEditViewModel.cs => TileEditWindowViewModel.cs} (94%)
 rename RogueEssence.Editor.Avalonia/ViewModels/DevForm/{DevTabModsViewModel.cs => ModManagerViewModel.cs} (90%)
 create mode 100644 RogueEssence.Editor.Avalonia/ViewModels/New/DialogBoxes/MapLayerWindowViewModel.cs
 create mode 100644 RogueEssence.Editor.Avalonia/ViewModels/New/DialogBoxes/MapResizeWindowViewModel.cs
 create mode 100644 RogueEssence.Editor.Avalonia/ViewModels/New/DialogBoxes/ModNameWindowViewModel.cs
 delete mode 100644 RogueEssence.Editor.Avalonia/ViewModels/New/Editors/AnimEditPageViewModel.cs
 create mode 100644 RogueEssence.Editor.Avalonia/ViewModels/New/Editors/EmptyPageViewModel.cs
 create mode 100644 RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/MapLayerWindowView.axaml
 create mode 100644 RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/MapLayerWindowView.axaml.cs
 create mode 100644 RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/MapResizeWindowView.axaml
 create mode 100644 RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/MapResizeWindowView.axaml.cs
 rename RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/{MapRetileWindow.axaml => MapRetileWindowView.axaml} (76%)
 rename RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/{MapRetileWindow.axaml.cs => MapRetileWindowView.axaml.cs} (84%)
 create mode 100644 RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/ModNameWindowView.axaml
 create mode 100644 RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/ModNameWindowView.axaml.cs

diff --git a/RogueEssence.Editor.Avalonia/App.axaml.cs b/RogueEssence.Editor.Avalonia/App.axaml.cs
index 5cf34864..b88b2dac 100644
--- a/RogueEssence.Editor.Avalonia/App.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/App.axaml.cs
@@ -109,7 +109,7 @@ private static void AddDevTabViewModels(this IServiceCollection services)
             services.AddSingleton<DevTabTravelViewModel>();
             services.AddSingleton<DevTabSpritesViewModel>();
             services.AddSingleton<DevTabScriptViewModel>();
-            services.AddSingleton<DevTabModsViewModel>();
+            services.AddSingleton<ModManagerViewModel>();
             services.AddSingleton<DevTabConstantsViewModel>();
         }
 
diff --git a/RogueEssence.Editor.Avalonia/Assets/Icons.axaml b/RogueEssence.Editor.Avalonia/Assets/Icons.axaml
index d96ae6da..0b5f4dbc 100644
--- a/RogueEssence.Editor.Avalonia/Assets/Icons.axaml
+++ b/RogueEssence.Editor.Avalonia/Assets/Icons.axaml
@@ -1,4 +1,14 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <StreamGeometry x:Key="Icons.NumIndexChange">
+    M -8.8300781 -43.015625 L -12.210938 -42.972656 C -14.561849 -42.970775 -16.912767 -42.966805 -19.263672 -42.960938 C -22.9795 -42.923003 -26.694118 -42.887185 -30.410156 -42.882812 C -32.833697 -42.883133 -35.258121 -42.877327 -37.681641 -42.867188 L -41.148438 -42.847656 L -44.535156 -42.841797 L -47.660156 -42.802734 C -51.587861 -42.76984 -54.324115 -42.884947 -54.880859 -38.316406 L -54.904297 -35.558594 L -54.943359 -32.433594 L -54.949219 -29.046875 C -54.962888 -26.697279 -54.974545 -24.347663 -54.984375 -21.998047 C -54.983883 -18.27992 -54.98888 -14.56367 -55.025391 -10.845703 C -55.050113 -8.424024 -55.066221 -6.0018759 -55.072266 -3.5800781 L -55.074219 -0.109375 L -55.117188 3.2714844 L -55.099609 6.40625 L -55.107422 9.1660156 C -54.612946 11.48744 -54.613798 11.488802 -52.818359 13.285156 C -50.095323 14.771878 -47.738355 14.829089 -44.671875 14.828125 L -42.347656 14.78125 C -39.875012 14.768021 -37.402112 14.751287 -34.929688 14.714844 C -33.211013 14.688858 -31.492242 14.667418 -29.773438 14.652344 C -24.719348 14.616188 -19.666955 14.56251 -14.613281 14.488281 L -13.613281 10.488281 L -50.613281 9.4882812 L -50.613281 -38.511719 L -2.6132812 -38.511719 L -1.6132812 -1.5117188 L 2.3867188 -2.5117188 C 2.4484163 -6.7122173 2.5001761 -10.912455 2.5332031 -15.113281 C 2.5454801 -16.829436 2.5591678 -18.545586 2.5742188 -20.261719 C 2.6124238 -22.788536 2.6492605 -25.314737 2.6660156 -27.841797 L 2.6796875 -30.246094 C 2.7551033 -33.980928 3.0220566 -37.349521 1.1835938 -40.716797 C -0.61276065 -42.512236 -0.61412281 -42.511384 -2.9355469 -43.005859 L -5.6953125 -42.998047 L -8.8300781 -43.015625 z
+    M -28.613281 -30.511719 C -29.762136 -29.362864 -29.76214 -29.362855 -32.851562 -21.234375 L -34.113281 -17.886719 C -36.585366 -11.465422 -39.059732 -5.4113143 -39.613281 1.4882812 L -36.613281 1.4882812 L -35.5625 -1.4570312 C -33.891208 -4.8556841 -33.891202 -4.8556879 -30.257812 -5.3164062 L -26.425781 -5.3867188 C -24.155616 -5.4557207 -21.884487 -5.5057182 -19.613281 -5.5117188 C -19.017842 -3.4893716 -18.346307 -1.4883597 -17.613281 0.48828125 C -15.488283 1.3632804 -15.488279 1.3632814 -13.613281 1.4882812 C -13.613281 -3.1375952 -13.613285 -3.1376091 -16.923828 -12.412109 C -17.617147 -14.310793 -18.303616 -16.210289 -18.962891 -18.121094 L -19.619141 -20.021484 L -20.9375 -23.648438 C -22.127684 -26.983151 -22.127687 -26.983157 -23.613281 -29.511719 C -26.218015 -30.440673 -26.21802 -30.440674 -28.613281 -30.511719 z
+    M 14.386719 -30.511719 C 10.497834 -30.511719 10.497825 -30.511715 5.3867188 -26.511719 C 4.5117196 -24.261721 4.5117186 -24.261717 4.3867188 -22.511719 C 7.6747653 -19.599449 9.9855792 -18.014706 14.386719 -17.511719 L 14.386719 -20.511719 C 16.718367 -20.846701 16.718372 -20.846701 19.386719 -20.511719 C 22.529229 -18.201049 23.310251 -16.945037 23.996094 -13.058594 L 24.136719 -9.2617188 L 24.308594 -5.4335938 L 24.386719 -2.5117188 L 28.386719 -1.5117188 C 28.405818 -3.3749713 28.423754 -5.2382493 28.435547 -7.1015625 L 28.449219 -9.3867188 C 28.488466 -12.882749 28.98084 -16.323476 27.386719 -19.511719 C 24.55499 -22.944117 22.354416 -24.769347 18.074219 -25.824219 L 14.386719 -26.511719 L 14.386719 -30.511719 z
+    M -27.613281 -22.511719 L -25.613281 -22.511719 C -25.006728 -20.692058 -24.417159 -18.866447 -23.859375 -17.03125 L -23.050781 -14.324219 C -22.571177 -12.720185 -22.091873 -11.116055 -21.613281 -9.5117188 L -31.613281 -9.5117188 C -31.779613 -12.478572 -31.779613 -12.478578 -30.738281 -14.992188 L -29.613281 -17.699219 C -28.951504 -19.305407 -28.286331 -20.910221 -27.613281 -22.511719 z
+    M -1.4453125 -0.017578125 C -4.6096944 -0.011913349 -6.4518369 0.38284857 -9.4902344 2.3398438 C -12.10445 6.2141358 -12.210805 8.6829205 -12.255859 13.271484 L -12.207031 16.335938 C -12.207114 18.488932 -12.204426 20.641934 -12.199219 22.794922 C -12.154907 26.181605 -12.112309 29.566115 -12.113281 32.953125 C -12.117781 35.168 -12.116268 37.382803 -12.105469 39.597656 L -12.082031 42.773438 L -12.082031 45.845703 L -12.033203 48.707031 C -12.003738 51.607417 -11.774554 53.184 -10.404297 55.755859 C -8.6129016 57.48741 -8.6124397 57.487946 -6.2910156 57.982422 L -3.53125 57.974609 L -0.39648438 57.992188 L 2.984375 57.949219 C 5.3352866 57.947337 7.6862043 57.943368 10.037109 57.9375 C 13.752937 57.899566 17.467555 57.863748 21.183594 57.859375 C 23.607134 57.859696 26.031559 57.85389 28.455078 57.84375 L 31.921875 57.824219 L 35.308594 57.818359 L 38.433594 57.779297 C 41.192029 57.756195 41.192278 57.755707 43.386719 57.488281 C 45.386717 55.488283 45.386872 55.487409 45.654297 53.292969 L 45.677734 50.535156 L 45.716797 47.410156 L 45.722656 44.023438 C 45.736325 41.673841 45.747982 39.324225 45.757812 36.974609 C 45.75732 33.256482 45.762318 29.540232 45.798828 25.822266 C 45.823551 23.400587 45.839658 20.978438 45.845703 18.556641 L 45.847656 15.085938 L 45.890625 11.705078 L 45.873047 8.5703125 C 45.883375 5.268803 45.951894 4.0577042 43.599609 1.6894531 C 40.840615 0.19241843 38.447935 0.18233284 35.347656 0.22460938 L 33.136719 0.30078125 C 30.552097 0.34773372 27.970683 0.40715679 25.386719 0.48828125 L 25.386719 4.4882812 L 41.386719 5.4882812 L 41.386719 53.488281 L -6.6132812 53.488281 L -6.6757812 30.050781 C -6.688675 26.588512 -6.7017817 23.126352 -6.7070312 19.664062 L -6.7109375 16.867188 L -6.7265625 13.806641 L -6.7265625 10.916016 C -6.7304998 9.4395445 -6.7063213 7.9618233 -6.6132812 6.4882812 C -5.5310803 5.1890444 -5.5313207 5.1892874 -2.9296875 5.2832031 L 0.609375 5.171875 C 2.5478541 5.1074243 4.4870861 5.0439131 6.4257812 4.9863281 C 7.7770693 4.9463974 9.1273345 4.9047259 10.478516 4.8613281 C 13.596256 4.7591383 16.714061 4.6594069 19.832031 4.5644531 L 22.386719 4.4882812 L 21.386719 0.48828125 C 18.150392 0.38519331 14.915217 0.30300395 11.677734 0.24414062 L 7.6992188 0.17578125 L 3.7792969 0.048828125 L 0 0 C -0.51336052 -0.01172056 -0.99325794 -0.018387379 -1.4453125 -0.017578125 z
+    M 12.386719 11.488281 L 11.386719 20.488281 L 7.3867188 20.488281 L 6.3867188 23.488281 L 10.386719 24.488281 L 9.3867188 32.488281 L 5.3867188 32.488281 L 5.3867188 36.488281 L 8.3867188 37.488281 L 8.3867188 46.488281 L 12.386719 45.488281 L 13.386719 36.488281 L 20.386719 36.488281 C 19.26172 38.738279 19.261719 38.738289 19.386719 46.488281 L 23.386719 45.488281 L 24.386719 36.488281 L 28.386719 36.488281 L 28.386719 32.488281 L 25.386719 32.488281 L 25.386719 24.488281 L 29.386719 24.488281 L 30.386719 21.488281 L 26.386719 20.488281 L 27.386719 11.488281 L 23.386719 11.488281 L 22.386719 20.488281 L 15.386719 20.488281 L 16.386719 11.488281 L 12.386719 11.488281 z
+    M -37.613281 16.488281 C -37.632381 18.351534 -37.650316 20.214812 -37.662109 22.078125 L -37.675781 24.363281 C -37.715029 27.859311 -38.207402 31.300039 -36.613281 34.488281 C -33.781553 37.92068 -31.580979 39.74591 -27.300781 40.800781 L -23.613281 41.488281 L -23.613281 45.488281 C -19.724396 45.488281 -19.724387 45.488277 -14.613281 41.488281 C -13.738282 39.238283 -13.738281 39.23828 -13.613281 37.488281 C -16.901328 34.576011 -19.212142 32.991269 -23.613281 32.488281 L -23.613281 35.488281 C -25.944929 35.823264 -25.944934 35.823264 -28.613281 35.488281 C -31.755792 33.177612 -32.536813 31.921599 -33.222656 28.035156 L -33.363281 24.238281 L -33.535156 20.410156 L -33.613281 17.488281 L -37.613281 16.488281 z
+    M 14.386719 24.488281 L 21.386719 24.488281 C 21.451733 27.478946 21.741114 29.779491 20.386719 32.488281 L 13.386719 32.488281 L 14.386719 24.488281 z
+  </StreamGeometry>
   <StreamGeometry x:Key="Icons.Action">M41 512c0-128 46-241 138-333C271 87 384 41 512 41s241 46 333 138c92 92 138 205 138 333s-46 241-138 333c-92 92-205 138-333 138s-241-46-333-138C87 753 41 640 41 512zm87 0c0 108 36 195 113 271s164 113 271 113c108 0 195-36 271-113s113-164 113-271-36-195-113-271c-77-77-164-113-271-113-108 0-195 36-271 113C164 317 128 404 128 512zm256 148V292l195 113L768 512l-195 113-195 113v-77zm148-113-61 36V440l61 36 61 36-61 36z</StreamGeometry>
   <StreamGeometry x:Key="Icons.AIAssist">M304 464a128 128 0 01128-128c71 0 128 57 128 128v224a32 32 0 01-64 0V592h-128v95a32 32 0 01-64 0v-224zm64 1v64h128v-64a64 64 0 00-64-64c-35 0-64 29-64 64zM688 337c18 0 32 14 32 32v319a32 32 0 01-32 32c-18 0-32-14-32-32v-319a32 32 0 0132-32zM84 911l60-143A446 446 0 0164 512C64 265 265 64 512 64s448 201 448 448-201 448-448 448c-54 0-105-9-153-27l-242 22a32 32 0 01-32-44zm133-150-53 126 203-18 13 5c41 15 85 23 131 23 212 0 384-172 384-384S724 128 512 128 128 300 128 512c0 82 26 157 69 220l20 29z</StreamGeometry>
   <StreamGeometry x:Key="Icons.Archive">M296 392h64v64h-64zM296 582v160h128V582h-64v-62h-64v62zm80 48v64h-32v-64h32zM360 328h64v64h-64zM296 264h64v64h-64zM360 456h64v64h-64zM360 200h64v64h-64zM855 289 639 73c-6-6-14-9-23-9H192c-18 0-32 14-32 32v832c0 18 14 32 32 32h640c18 0 32-14 32-32V311c0-9-3-17-9-23zM790 326H602V138L790 326zm2 562H232V136h64v64h64v-64h174v216c0 23 19 42 42 42h216v494z</StreamGeometry>
diff --git a/RogueEssence.Editor.Avalonia/Assets/ListBoxStyles.axaml b/RogueEssence.Editor.Avalonia/Assets/ListBoxStyles.axaml
index 5e99ddd3..32e47c99 100644
--- a/RogueEssence.Editor.Avalonia/Assets/ListBoxStyles.axaml
+++ b/RogueEssence.Editor.Avalonia/Assets/ListBoxStyles.axaml
@@ -16,4 +16,17 @@
     <Style Selector="ListBox.datalist ListBoxItem">
         <Setter Property="Background" Value="{DynamicResource Brush.ListBox.Background}" />
     </Style>
+    
+    
+    
+    <Style Selector="ListBox.borderless">
+        <Setter Property="Background" Value="{DynamicResource Brush.ListBox.Background}" />
+        <Setter Property="ItemContainerTheme" Value="{StaticResource CompactListBoxItem}" />
+        <Setter Property="CornerRadius" Value="4" />
+    </Style>
+    <Style Selector="ListBox.borderless ListBoxItem">
+        <Setter Property="Background" Value="{DynamicResource Brush.ListBox.Background}" />
+    </Style>
+    
+
 </Styles>
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Assets/Styles.axaml b/RogueEssence.Editor.Avalonia/Assets/Styles.axaml
index 8d13812c..9a58f569 100644
--- a/RogueEssence.Editor.Avalonia/Assets/Styles.axaml
+++ b/RogueEssence.Editor.Avalonia/Assets/Styles.axaml
@@ -9,7 +9,11 @@
             <Button>Hello</Button>
         </StackPanel>
     </Design.PreviewWith>
-
+    
+    <Style Selector="NumericUpDown">
+        <Setter Property="Increment" Value="1"/>
+    </Style>
+    
     <Style Selector="RadioButton">
         <Setter Property="Template">
             <ControlTemplate TargetType="RadioButton">
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/CollectionBox.axaml b/RogueEssence.Editor.Avalonia/DataEditor/CollectionBox.axaml
index d5f4aafd..cb01d523 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/CollectionBox.axaml
+++ b/RogueEssence.Editor.Avalonia/DataEditor/CollectionBox.axaml
@@ -16,8 +16,8 @@
         <ListBox Name="lbxItems" ItemsSource="{Binding Collection}" SelectedIndex="{Binding SelectedIndex}"
                  DoubleTapped="doubleClickStart" PointerReleased="lbxCollection_DoubleClick" Margin="4"
                  CornerRadius="4"
-                 HorizontalAlignment="Stretch"
                  Background="{DynamicResource Brush.ListBox.Background}"
+                 HorizontalAlignment="Stretch"
                  Grid.RowSpan="2" Grid.ColumnSpan="2">
             <ListBox.ItemTemplate>
                 <DataTemplate>
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/CollectionBoxViewModel.cs b/RogueEssence.Editor.Avalonia/DataEditor/CollectionBoxViewModel.cs
index 88425deb..cf1a8103 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/CollectionBoxViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/CollectionBoxViewModel.cs
@@ -182,9 +182,10 @@ public void lbxCollection_DoubleClick(object sender, PointerReleasedEventArgs e)
 
         public void btnAdd_Click(bool advancedEdit)
         {
-            int index = SelectedIndex;
-            if (index < 0)
-                index = Collection.Count;
+            // int index = SelectedIndex;
+            // if (index < 0)
+            // index = Collection.Count;
+            int index = Collection.Count;
             object element = null;
             OnEditItem?.Invoke(index, element, advancedEdit, InsertItem);
         }
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/PriorityListEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/PriorityListEditor.cs
index 0a199fd1..619f82cb 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/PriorityListEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/PriorityListEditor.cs
@@ -88,7 +88,7 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
                 EditorPageViewModel pageViewModel = control.FindAncestorViewModel<EditorPageViewModel>();
                 string elementName = name + "<Priority>";
         
-                NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(elementName, null, pageViewModel.Node.Icon);
+                NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(elementName, pageViewModel.Node, pageViewModel.Node.Icon);
                 pageViewModel.Node.AddNodeIfNotExists(node);
 
                 NodeHelper.ExpandParents(node, true);
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/TypeDictEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/TypeDictEditor.cs
index c5cfff30..24f8b68c 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/TypeDictEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/TypeDictEditor.cs
@@ -57,7 +57,7 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
                 // string title = DataEditor.GetWindowTitle(parent, elementName, element, elementType, ReflectionExt.GetPassableAttributes(1, attributes));
 
                 NodeBase node =
-                    _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(elementName, null,
+                    _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(elementName, pageViewModel.Node,
                         pageViewModel.Node.Icon);
                 pageViewModel.Node.AddNodeIfNotExists(node);
 
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Tiles/AutoTileEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Tiles/AutoTileEditor.cs
index cba6ac30..d3cb24f2 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Tiles/AutoTileEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Tiles/AutoTileEditor.cs
@@ -26,9 +26,8 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
             //add lambda expression for editing a single element
             mv.OnEditItem += (AutoTile element, TileBoxViewModel.EditElementOp op) =>
             {
-                TileEditForm frmData = new TileEditForm();
-                TileEditViewModel tmv = new TileEditViewModel();
-                frmData.DataContext = tmv;
+    
+                TileEditWindowViewModel tmv = new TileEditWindowViewModel();
                 tmv.Name = name + "/" + type.Name;
 
                 //load as if eyedropping
@@ -39,15 +38,14 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
                 {
                     element = tmv.GetTile();
                     op(element);
-                    frmData.Close();
+                    // frmData.Close();
                 };
                 tmv.SelectedCancelEvent += () =>
                 {
-                    frmData.Close();
+                    // frmData.Close();
                 };
 
-                control.GetOwningForm().RegisterChild(frmData);
-                frmData.Show();
+                _context.DialogService.ShowDialogAsync<TileEditWindowViewModel, bool>(tmv, "Auto Tile Editor");
             };
             mv.LoadFromSource(member);
             control.Children.Add(cbxValue);
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Tiles/AutotileBrowser.axaml b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Tiles/AutotileBrowser.axaml
index cd42fde1..059bc01e 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Tiles/AutotileBrowser.axaml
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Tiles/AutotileBrowser.axaml
@@ -16,41 +16,27 @@
     <converters:TileConverter x:Key="TileConverter"/>
     <converters:DataEntryConverter x:Key="DataEntryConverter"/>
   </UserControl.Resources>
-  <Grid Margin="4" >
-    <Grid.RowDefinitions>
-      <RowDefinition Height="48"/>
-      <RowDefinition/>
-    </Grid.RowDefinitions>
-    <Grid.ColumnDefinitions>
-      <ColumnDefinition/>
-      <ColumnDefinition/>
-      <ColumnDefinition/>
-    </Grid.ColumnDefinitions>
-    <Image Source="{Binding Preview, Converter={StaticResource TileConverter}}"  VerticalAlignment="Top" HorizontalAlignment="Left" Stretch="None" Grid.Row="0" Grid.Column="0"/>
-    <Image Source="{Binding AssociatePreview, Converter={StaticResource TileConverter}}"  VerticalAlignment="Top" HorizontalAlignment="Left" Stretch="None" Grid.Row="0" Grid.Column="1"/>
-
-    <views:SearchListBox DataContext="{Binding Autotiles}" Margin="4" Grid.Row="1" Grid.Column="0" ToolTip.Tip="Choose the autotile.&#x0a;Its texture will be automatically calculated when placed on the map."/>
-    <views:SearchListBox DataContext="{Binding AssociateAutotiles}" Margin="4" Grid.Row="1" Grid.Column="1" ToolTip.Tip="Autotiles in the associate list will treat this tile as one of their own in texture calculation.&#x0a;The autotile chosen here will have no effect unless added to the list using the Add button."/>
-    
-    <Grid Grid.Row="1" Grid.Column="2">
-      <Grid.RowDefinitions>
-        <RowDefinition/>
-        <RowDefinition Height="36"/>
-      </Grid.RowDefinitions>
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition/>
-        <ColumnDefinition/>
-      </Grid.ColumnDefinitions>
-      <ListBox SelectionMode="AlwaysSelected" ItemsSource="{Binding Associates}" SelectedIndex="{Binding ChosenAssociate}" Margin="4,2" Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" ToolTip.Tip="The actual list of associate tiles.">
+  <Grid Margin="4" RowDefinitions="48,*" ColumnDefinitions="*,*,*">
+    <Image Source="{Binding Preview, Converter={StaticResource TileConverter}}" VerticalAlignment="Top" HorizontalAlignment="Left" Stretch="None"/>
+    <Image Source="{Binding AssociatePreview, Converter={StaticResource TileConverter}}" VerticalAlignment="Top" HorizontalAlignment="Left" Stretch="None" Grid.Column="1"/>
+    <views:SearchListBox DataContext="{Binding Autotiles}" Margin="4, 4, 4, 0" Grid.Row="1" ToolTip.Tip="Choose the autotile.&#x0a;Its texture will be automatically calculated when placed on the map."/>
+    <views:SearchListBox DataContext="{Binding AssociateAutotiles}" Margin="4, 4, 4, 0" Grid.Row="1" Grid.Column="1" ToolTip.Tip="Autotiles in the associate list will treat this tile as one of their own in texture calculation.&#x0a;The autotile chosen here will have no effect unless added to the list using the Add button."/>
+    <Grid Grid.Row="1" Grid.Column="2" RowDefinitions="*,36" ColumnDefinitions="*,30">
+      <ListBox Classes="borderless" SelectionMode="AlwaysSelected" ItemsSource="{Binding Associates}" SelectedIndex="{Binding ChosenAssociate}" Margin="4,2" Grid.RowSpan="2" ToolTip.Tip="The actual list of associate tiles.">
         <ListBox.ItemTemplate>
           <DataTemplate>
             <TextBlock Text="{Binding Converter={StaticResource DataEntryConverter}, ConverterParameter=1024}"/>
           </DataTemplate>
         </ListBox.ItemTemplate>
       </ListBox>
-      <Button Command="{Binding btnAddTile_Click}" Margin="4,2" Grid.Row="1" Grid.Column="0" ToolTip.Tip="Add to the associate list.">Add</Button>
-      <Button Command="{Binding btnDeleteTile_Click}" Margin="4,2" Grid.Row="1" Grid.Column="1" ToolTip.Tip="Delete from the associate list.">Delete</Button>
+      <StackPanel Grid.RowSpan="2" Grid.Column="1" Margin="4,0,0,0" VerticalAlignment="Top">
+        <Button Command="{Binding btnAddTile_Click}" Classes="secondary" Margin="0" Padding="4,3" ToolTip.Tip="Add to the associate list.">
+          <Path Width="10" Height="10" Margin="0,2,0,0" Data="{StaticResource Icons.Plus}"/>
+        </Button>
+        <Button Command="{Binding btnDeleteTile_Click}" Classes="secondary" Margin="0" Padding="4,3" ToolTip.Tip="Delete from the associate list.">
+          <Path Width="10" Height="10" Data="{StaticResource Icons.Minus}"/>
+        </Button>
+      </StackPanel>
     </Grid>
-  
   </Grid>
 </UserControl>
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Tiles/TileBrowser.axaml b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Tiles/TileBrowser.axaml
index c38f442a..84618a4f 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Tiles/TileBrowser.axaml
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Tiles/TileBrowser.axaml
@@ -42,29 +42,31 @@
       <CheckBox Margin="4" IsChecked="{Binding Animated}" VerticalAlignment="Bottom" Grid.Row="0" Grid.Column="0">Animated</CheckBox>
       <TextBlock Margin="4,2" Text="{Binding Frames[0], Converter={StaticResource FrameConverter}}" IsVisible="{Binding !Animated}" VerticalAlignment="Top" Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2"/>
       <TextBlock Margin="4,2" Text="{Binding MultiSelect, Converter={StaticResource MultiSelectConverter}}" IsVisible="{Binding !Animated}" VerticalAlignment="Top" Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2"/>
-      <Grid Grid.Row="1" Grid.Column="0" Grid.RowSpan="2" Grid.ColumnSpan="2" IsVisible="{Binding Animated}">
-        <Grid.RowDefinitions>
-          <RowDefinition Height="42"/>
-          <RowDefinition/>
-          <RowDefinition Height="16"/>
-          <RowDefinition Height="34"/>
-        </Grid.RowDefinitions>
-        <Grid.ColumnDefinitions>
-          <ColumnDefinition/>
-          <ColumnDefinition/>
-        </Grid.ColumnDefinitions>
-        <TextBlock Margin="4" VerticalAlignment="Center" HorizontalAlignment="Right" Text="Frame Length:" Grid.Row="0" Grid.Column="0"/>
-        <NumericUpDown Value="{Binding FrameLength}" Minimum="1" Margin="4" Grid.Row="0" Grid.Column="1" />
-        <ListBox SelectionMode="AlwaysSelected" ItemsSource="{Binding Frames}" SelectedIndex="{Binding ChosenFrame}" Margin="4" Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2">
+      <Grid Grid.Row="1" Grid.Column="0" Grid.RowSpan="2" Grid.ColumnSpan="2" IsVisible="{Binding Animated}"
+            RowDefinitions="42,*,16" ColumnDefinitions="*,*,30">
+        <TextBlock Margin="4" VerticalAlignment="Center" HorizontalAlignment="Right" Text="Frame Length:"/>
+        <NumericUpDown Increment="1" Value="{Binding FrameLength}" Minimum="1" Margin="4" Grid.Column="1" Grid.ColumnSpan="2"/>
+        <ListBox 
+          Classes="borderless" 
+          SelectionMode="AlwaysSelected" ItemsSource="{Binding Frames}" SelectedIndex="{Binding ChosenFrame}" Margin="4" Grid.Row="1" Grid.ColumnSpan="2">
           <ListBox.ItemTemplate>
             <DataTemplate>
               <TextBlock Text="{Binding Converter={StaticResource FrameConverter}}"/>
             </DataTemplate>
           </ListBox.ItemTemplate>
         </ListBox>
-        <TextBlock Margin="4,2" Text="{Binding MultiSelect, Converter={StaticResource MultiSelectConverter}}" Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2"/>
-        <Button Command="{Binding btnAddFrame_Click}" Margin="4,2" Grid.Row="3" Grid.Column="0" >Add</Button>
-        <Button Command="{Binding btnDeleteFrame_Click}" Margin="4,2" Grid.Row="3" Grid.Column="1">Delete</Button>
+        
+
+        <StackPanel Grid.Row="1" Grid.RowSpan="2" Grid.Column="2" Margin="4,0,0,0" VerticalAlignment="Top">
+          <Button Command="{Binding btnAddFrame_Click}" Classes="secondary" Margin="0" Padding="4,3">
+            <Path Width="10" Height="10" Margin="0,2,0,0" Data="{StaticResource Icons.Plus}"/>
+          </Button>
+          <Button Command="{Binding btnDeleteFrame_Click}" Classes="secondary" Margin="0" Padding="4,3">
+            <Path Width="10" Height="10" Data="{StaticResource Icons.Minus}"/>
+          </Button>
+        </StackPanel>
+        
+        <TextBlock Margin="4,2" Text="{Binding MultiSelect, Converter={StaticResource MultiSelectConverter}}" Grid.Row="2" Grid.ColumnSpan="2"/>
       </Grid>
     </Grid>
     <ScrollViewer HorizontalScrollBarVisibility="Visible" VerticalScrollBarVisibility="Visible" Grid.Row="0" Grid.Column="0" Grid.RowSpan="3">
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Tiles/TileEditForm.axaml b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Tiles/TileEditForm.axaml
deleted file mode 100644
index 072c5353..00000000
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Tiles/TileEditForm.axaml
+++ /dev/null
@@ -1,35 +0,0 @@
-<Window xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:vm="clr-namespace:RogueEssence.Dev.ViewModels;assembly=RogueEssence.Editor.Avalonia"
-        xmlns:views="clr-namespace:RogueEssence.Dev.Views"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        mc:Ignorable="d"
-        xmlns:converters="clr-namespace:RogueEssence.Dev.Converters"
-        x:Class="RogueEssence.Dev.Views.TileEditForm"
-        Title="{Binding Name}" Width="640" Height="420" >
-  <!--Icon="/Assets/app-logo.ico"-->
-    <Design.DataContext>
-      <vm:TileEditViewModel/>
-    </Design.DataContext>
-  <Grid>
-    <Grid.RowDefinitions>
-      <RowDefinition/>
-      <RowDefinition Height="34"/>
-    </Grid.RowDefinitions>
-    <Grid.ColumnDefinitions>
-      <ColumnDefinition/>
-      <ColumnDefinition/>
-    </Grid.ColumnDefinitions>
-    <TabControl TabStripPlacement="Top" SelectedIndex="{Binding TabIndex}" Margin="4" Grid.ColumnSpan="2">
-      <TabItem Header="Tiles" >
-        <views:TileBrowser DataContext="{Binding TileBrowser}"/>
-      </TabItem>
-      <TabItem Header="Autotiles" >
-        <views:AutotileBrowser DataContext="{Binding AutotileBrowser}"/>
-      </TabItem>
-    </TabControl>
-    <Button Command="{Binding btnOK_Click}" Margin="4" Grid.Row="1" Grid.Column="0">OK</Button>
-    <Button Command="{Binding btnCancel_Click}" Margin="4" Grid.Row="1" Grid.Column="1">Cancel</Button>
-  </Grid>
-</Window>
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Tiles/TileEditForm.axaml.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Tiles/TileEditForm.axaml.cs
deleted file mode 100644
index 79e99dfc..00000000
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Tiles/TileEditForm.axaml.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
-using Avalonia.Input;
-using Avalonia.Interactivity;
-using System;
-using System.IO;
-using RogueEssence;
-using RogueEssence.Dev;
-using Microsoft.Xna.Framework;
-using Avalonia.Threading;
-using System.Threading;
-using RogueEssence.Data;
-using RogueEssence.Content;
-using System.Collections.Generic;
-using RogueEssence.Dev.ViewModels;
-
-namespace RogueEssence.Dev.Views
-{
-    public partial class TileEditForm : Window
-    {
-
-        public TileEditForm()
-        {
-            InitializeComponent();
-
-        }
-    }
-}
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Tiles/TileEditWindowView.axaml b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Tiles/TileEditWindowView.axaml
new file mode 100644
index 00000000..1a0ae22c
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Tiles/TileEditWindowView.axaml
@@ -0,0 +1,55 @@
+<v:ChromelessWindow xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:vm="clr-namespace:RogueEssence.Dev.ViewModels;assembly=RogueEssence.Editor.Avalonia"
+        xmlns:v="clr-namespace:RogueEssence.Dev.Views"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        mc:Ignorable="d"
+        x:Name="ThisControl"
+        xmlns:converters="clr-namespace:RogueEssence.Dev.Converters"
+        x:Class="RogueEssence.Dev.Views.TileEditWindowView"
+        MaxWidth="800"
+        Title="{Binding Name}" Width="640" Height="420" >
+  <!--Icon="/Assets/app-logo.ico"-->
+    <Design.DataContext>
+      <vm:TileEditWindowViewModel/>
+    </Design.DataContext>
+  <Grid RowDefinitions="Auto,*">
+      <!-- TitleBar -->
+      <Grid Grid.Row="0" Height="28" IsVisible="{Binding !#ThisControl.UseSystemWindowFrame}">
+          <Border Background="{DynamicResource Brush.TitleBar}"
+                  BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border0}"
+                  PointerPressed="BeginMoveWindow" />
+
+          <Path Width="14" Height="14"
+                Margin="10,0,0,0"
+                HorizontalAlignment="Left"
+                Data="{StaticResource Icons.SoftwareUpdate}"
+                IsVisible="{OnPlatform True, macOS=False}" />
+
+          <TextBlock Classes="bold"
+                     x:Name="TitleText"
+                     Text="{Binding #ThisControl.Title}"
+                     HorizontalAlignment="Center" VerticalAlignment="Center"
+                     IsHitTestVisible="False" />
+            
+          <v:CaptionButtons HorizontalAlignment="Right"
+                            IsCloseButtonOnly="True"
+                            IsVisible="{OnPlatform True, macOS=False}"/>
+            
+      </Grid>
+      <Grid Grid.Row="1" RowDefinitions="*, 34" ColumnDefinitions="*, *">
+          <TabControl TabStripPlacement="Top" SelectedIndex="{Binding TabIndex}" Margin="4" Grid.ColumnSpan="2">
+              <TabItem Header="Tiles" >
+                  <v:TileBrowser DataContext="{Binding TileBrowser}"/>
+              </TabItem>
+              <TabItem Header="Autotiles" >
+                  <v:AutotileBrowser DataContext="{Binding AutotileBrowser}"/>
+              </TabItem>
+          </TabControl>
+
+          <Button Classes="flat" Command="{Binding btnCancel_Click}" Margin="4" Grid.Row="1" Grid.Column="0">Cancel</Button>
+          <Button Classes="flat primary" Command="{Binding btnOK_Click}" Margin="4" Grid.Row="1" Grid.Column="1">OK</Button>
+      </Grid>
+  </Grid>
+</v:ChromelessWindow>
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Tiles/TileEditWindowView.axaml.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Tiles/TileEditWindowView.axaml.cs
new file mode 100644
index 00000000..ce0ef695
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Tiles/TileEditWindowView.axaml.cs
@@ -0,0 +1,43 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+using Avalonia.Input;
+using Avalonia.Interactivity;
+using System;
+using System.IO;
+using RogueEssence;
+using RogueEssence.Dev;
+using Microsoft.Xna.Framework;
+using Avalonia.Threading;
+using System.Threading;
+using RogueEssence.Data;
+using RogueEssence.Content;
+using System.Collections.Generic;
+using RogueEssence.Dev.ViewModels;
+
+namespace RogueEssence.Dev.Views
+{
+    public partial class TileEditWindowView : ChromelessWindow
+    {
+
+        public TileEditWindowView()
+        {
+            InitializeComponent();
+
+        }
+
+        protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
+        {
+            var vm = DataContext as TileEditWindowViewModel;
+            vm.SelectedOKEvent += this.Close;
+            vm.SelectedCancelEvent += this.Close;
+        }
+
+        protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e)
+        {
+            var vm = DataContext as TileEditWindowViewModel;
+            vm.SelectedOKEvent -= this.Close;
+            vm.SelectedCancelEvent -= this.Close;
+        }
+    }
+}
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Tiles/TileEditViewModel.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Tiles/TileEditWindowViewModel.cs
similarity index 94%
rename from RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Tiles/TileEditViewModel.cs
rename to RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Tiles/TileEditWindowViewModel.cs
index 1d20ac1d..5111f71c 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Tiles/TileEditViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/Tiles/TileEditWindowViewModel.cs
@@ -5,12 +5,12 @@
 
 namespace RogueEssence.Dev.ViewModels
 {
-    public class TileEditViewModel : ViewModelBase
+    public class TileEditWindowViewModel : ViewModelBase
     {
         public event Action SelectedOKEvent;
         public event Action SelectedCancelEvent;
 
-        public TileEditViewModel()
+        public TileEditWindowViewModel()
         {
             TileBrowser = new TileBrowserViewModel();
             TileBrowser.CanMultiSelect = false;
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/SpawnRangeListBoxViewModel.cs b/RogueEssence.Editor.Avalonia/DataEditor/SpawnRangeListBoxViewModel.cs
index 32e14028..391e058b 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/SpawnRangeListBoxViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/SpawnRangeListBoxViewModel.cs
@@ -270,9 +270,9 @@ public void gridCollection_DoubleClick(object sender, PointerReleasedEventArgs e
 
         public void btnAdd_Click(bool advancedEdit)
         {
-            int index = CurrentElement;
-            if (index < 0)
-                index = Collection.Count;
+            // int index = CurrentElement;
+            // if (index < 0) 
+            int index = Collection.Count;
             object element = null;
             OnEditItem?.Invoke(index, element, advancedEdit, insertItem);
         }
diff --git a/RogueEssence.Editor.Avalonia/RogueEssence.Editor.Avalonia.csproj b/RogueEssence.Editor.Avalonia/RogueEssence.Editor.Avalonia.csproj
index 1bc45f9a..da23595c 100644
--- a/RogueEssence.Editor.Avalonia/RogueEssence.Editor.Avalonia.csproj
+++ b/RogueEssence.Editor.Avalonia/RogueEssence.Editor.Avalonia.csproj
@@ -30,7 +30,7 @@
     <Compile Update="DataEditor\RangeDictBox.axaml.cs">
       <DependentUpon>RangeDictBox.axaml</DependentUpon>
     </Compile>
-    <Compile Update="DataEditor\Editors\RogueEssence\Tiles\TileEditForm.axaml.cs">
+    <Compile Update="DataEditor\Editors\RogueEssence\Tiles\TileEditWindowView.axaml.cs">
       <DependentUpon>TileEditForm.axaml</DependentUpon>
     </Compile>
     <Compile Update="DataEditor\Editors\RogueEssence\Tiles\TileBox.axaml.cs">
@@ -191,7 +191,7 @@
       <DependentUpon>DevTabGame.axaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
-    <Compile Update="Views\New\DialogBoxes\MapRetileWindow.axaml.cs">
+    <Compile Update="Views\New\DialogBoxes\MapRetileWindowView.axaml.cs">
       <DependentUpon>MapRetileWindow.axaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
@@ -219,6 +219,18 @@
       <DependentUpon>ModConfigPageView.axaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
+    <Compile Update="Views\New\DialogBoxes\MapLayerWindowView.axaml.cs">
+      <DependentUpon>MapLayerWindowView.axaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Update="Views\New\DialogBoxes\MapResizeWindowView.axaml.cs">
+      <DependentUpon>MapResizeWindowView.axaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Update="Views\New\DialogBoxes\ModNameWindowView.axaml.cs">
+      <DependentUpon>ModNameWindowView.axaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Models\" />
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/Content/TilesetEditViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/Content/TilesetEditViewModel.cs
index f73797b1..9af94275 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/Content/TilesetEditViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/Content/TilesetEditViewModel.cs
@@ -87,7 +87,7 @@ await Dispatcher.UIThread.InvokeAsync(async () =>
 
                 string folder = results.First().Path.LocalPath;
                 
-                MapRetileWindow window = new MapRetileWindow();
+                MapRetileWindowView window = new MapRetileWindowView();
                 MapRetileViewModel viewModel = new MapRetileViewModel(GraphicsManager.TileSize, "Tile size must be divisible by 8.");
                 window.DataContext = viewModel;
 
@@ -202,7 +202,7 @@ await Dispatcher.UIThread.InvokeAsync(async () =>
                         return;
                 }
 
-                MapRetileWindow window = new MapRetileWindow();
+                MapRetileWindowView window = new MapRetileWindowView();
                 MapRetileViewModel viewModel =
                     new MapRetileViewModel(GraphicsManager.TileSize, "Tile size must be divisible by 8.");
                 window.DataContext = viewModel;
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevTabDataViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevTabDataViewModel.cs
index adb5793e..35acb279 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevTabDataViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevTabDataViewModel.cs
@@ -520,7 +520,7 @@ public void btnMapEditor_Click()
             lock (GameBase.lockObj)
             {
                 Views.DevForm form = (Views.DevForm)DiagManager.Instance.DevEditor;
-                if (form.MapEditPage == null)
+                if (form.MapEditorPage == null)
                 {
                     LuaEngine.Instance.BreakScripts();
                     MenuManager.Instance.ClearMenus();
@@ -537,7 +537,7 @@ public void btnGroundEditor_Click()
             lock (GameBase.lockObj)
             {
                 Views.DevForm form = (Views.DevForm)DiagManager.Instance.DevEditor;
-                if (form.GroundEditForm == null)
+                if (form.GroundEditorPage == null)
                 {
                     LuaEngine.Instance.BreakScripts();
                     MenuManager.Instance.ClearMenus();
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevTabModsViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/DevForm/ModManagerViewModel.cs
similarity index 90%
rename from RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevTabModsViewModel.cs
rename to RogueEssence.Editor.Avalonia/ViewModels/DevForm/ModManagerViewModel.cs
index 092deecb..1df5652c 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevTabModsViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/DevForm/ModManagerViewModel.cs
@@ -13,6 +13,37 @@
 using RogueEssence.Content;
 using RogueEssence.Dev.Views;
 using Avalonia.Controls;
+using RogueEssence.Dev;
+
+public class ModsEntryViewModel : ViewModelBase
+{
+    private string _name;
+
+    public string Name
+    {
+        get => _name;
+        set => this.RaiseAndSetIfChanged(ref _name, value);
+    }
+
+    private string _editNamespace;
+
+    public string Namespace
+    {
+        get => _editNamespace;
+        set => this.RaiseAndSetIfChanged(ref _editNamespace, value);
+    }
+
+    public string Path;
+
+    public ModsEntryViewModel(string name, string newNamespace, string fullPath)
+    {
+        this._name = name;
+        this._editNamespace = newNamespace;
+        this.Path = fullPath;
+    }
+    
+    public string Display => $"{_editNamespace}: {_name}";
+}
 
 namespace RogueEssence.Dev.ViewModels
 {
@@ -34,22 +65,22 @@ public string Namespace
 
         public string Path;
 
-        public ObservableCollection<ModsNodeViewModel> Nodes { get; }
+        public ObservableCollection<ModsNodeViewModel> ModList { get; }
 
         public ModsNodeViewModel(string name, string newNamespace, string fullPath)
         {
             this.name = name;
             this.editNamespace = newNamespace;
             this.Path = fullPath;
-            Nodes = new ObservableCollection<ModsNodeViewModel>();
+            ModList = new ObservableCollection<ModsNodeViewModel>();
         }
 
     }
 
-    public class DevTabModsViewModel : ViewModelBase
+    public class ModManagerViewModel : ViewModelBase
     {
         private EditorContext _context;
-        public DevTabModsViewModel(EditorContext context)
+        public ModManagerViewModel(EditorContext context)
         {
             currentMod = null;
             _context = context;
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/GroundEditViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/GroundEditViewModel.cs
index fd59fa2e..a9608148 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/GroundEditViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/GroundEditViewModel.cs
@@ -26,14 +26,14 @@ public class GroundEditViewModel : ViewModelBase
     {
         public GroundEditViewModel()
         {
-            Textures = new GroundTabTexturesViewModel();
-            Decorations = new GroundTabDecorationsViewModel();
-            Walls = new GroundTabWallsViewModel();
-            Entities = new GroundTabEntitiesViewModel();
-            Properties = new GroundTabPropertiesViewModel();
-            Strings = new GroundTabStringsViewModel();
-            Script = new GroundTabScriptViewModel();
-            CurrentFile = "";
+            // Textures = new GroundTabTexturesViewModel(null);
+            // Decorations = new GroundTabDecorationsViewModel();
+            // Walls = new GroundTabWallsViewModel();
+            // Entities = new GroundTabEntitiesViewModel();
+            // Properties = new GroundTabPropertiesViewModel();
+            // Strings = new GroundTabStringsViewModel();
+            // Script = new GroundTabScriptViewModel();
+            // CurrentFile = "";
         }
 
         public GroundTabTexturesViewModel Textures { get; set; }
@@ -74,48 +74,48 @@ public void mnuNew_Click()
         public async void mnuOpen_Click()
         {
 
-            string mapDir = Path.GetFullPath(PathMod.ModPath(DataManager.GROUND_PATH));
-            DevForm form = (DevForm)DiagManager.Instance.DevEditor;
-            IStorageFolder directory = await form.GroundEditForm.StorageProvider.TryGetFolderFromPathAsync(mapDir);
-            await Dispatcher.UIThread.InvokeAsync(async () =>
-            {
-                IReadOnlyList<IStorageFile> results = await form.GroundEditForm.StorageProvider.OpenFilePickerAsync(new FilePickerOpenOptions
-                {
-                    Title = "Open .rsground File",
-                    SuggestedStartLocation = directory,
-                    AllowMultiple = false,
-                    FileTypeFilter =
-                    [
-                        new FilePickerFileType("Ground Files")
-                        {
-                            Patterns = ["*." + DataManager.GROUND_EXT.Substring(1)]
-                        }
-                    ]
-                });
-                
-                if (results.Count > 0)
-                {
-                    IStorageFile result = results.First();
-                   
-                    bool legalPath = false;
-                    foreach (string proposedPath in PathMod.FallbackPaths(DataManager.GROUND_PATH))
-                    {
-                        if (comparePaths(proposedPath, Path.GetDirectoryName(result.Path.LocalPath)))
-                            legalPath = true;
-                    }
-
-                    if (!legalPath)
-                        await MessageBox.Show(form.GroundEditForm,
-                            String.Format("Map can only be loaded from:\n{0}\nOr one of its parents.",
-                                PathMod.ModPath(DataManager.GROUND_PATH)), "Error",
-                            MessageBox.MessageBoxButtons.Ok);
-                    else
-                    {
-                        lock (GameBase.lockObj)
-                            DoLoad(Path.GetFileNameWithoutExtension(result.Name));
-                    }
-                }
-            });
+            // string mapDir = Path.GetFullPath(PathMod.ModPath(DataManager.GROUND_PATH));
+            // DevForm form = (DevForm)DiagManager.Instance.DevEditor;
+            // IStorageFolder directory = await form.GroundEditorPage.StorageProvider.TryGetFolderFromPathAsync(mapDir);
+            // await Dispatcher.UIThread.InvokeAsync(async () =>
+            // {
+            //     IReadOnlyList<IStorageFile> results = await form.GroundEditorPage.StorageProvider.OpenFilePickerAsync(new FilePickerOpenOptions
+            //     {
+            //         Title = "Open .rsground File",
+            //         SuggestedStartLocation = directory,
+            //         AllowMultiple = false,
+            //         FileTypeFilter =
+            //         [
+            //             new FilePickerFileType("Ground Files")
+            //             {
+            //                 Patterns = ["*." + DataManager.GROUND_EXT.Substring(1)]
+            //             }
+            //         ]
+            //     });
+            //     
+            //     if (results.Count > 0)
+            //     {
+            //         IStorageFile result = results.First();
+            //        
+            //         bool legalPath = false;
+            //         foreach (string proposedPath in PathMod.FallbackPaths(DataManager.GROUND_PATH))
+            //         {
+            //             if (comparePaths(proposedPath, Path.GetDirectoryName(result.Path.LocalPath)))
+            //                 legalPath = true;
+            //         }
+            //
+            //         if (!legalPath)
+            //             await MessageBox.Show(form.GroundEditorPage,
+            //                 String.Format("Map can only be loaded from:\n{0}\nOr one of its parents.",
+            //                     PathMod.ModPath(DataManager.GROUND_PATH)), "Error",
+            //                 MessageBox.MessageBoxButtons.Ok);
+            //         else
+            //         {
+            //             lock (GameBase.lockObj)
+            //                 DoLoad(Path.GetFileNameWithoutExtension(result.Name));
+            //         }
+            //     }
+            // });
         }
 
         public async Task<bool> mnuSave_Click()
@@ -136,86 +136,87 @@ public async Task<bool> mnuSave_Click()
         }
         public async Task<bool> mnuSaveAs_Click()
         {
-            string mapDir = Path.GetFullPath(PathMod.ModPath(DataManager.GROUND_PATH));
-            SaveFileDialog saveFileDialog = new SaveFileDialog();
-            saveFileDialog.Directory = mapDir;
-
-            FileDialogFilter filter = new FileDialogFilter();
-            filter.Name = "Ground Files";
-            filter.Extensions.Add(DataManager.GROUND_EXT.Substring(1));
-            saveFileDialog.Filters.Add(filter);
-
-            DevForm form = (DevForm)DiagManager.Instance.DevEditor;
-
-            string result = await saveFileDialog.ShowAsync(form.GroundEditForm);
-
-            if (!String.IsNullOrEmpty(result))
-            {
-                string reqDir = PathMod.HardMod(DataManager.GROUND_PATH);
-                if (!comparePaths(reqDir, Path.GetDirectoryName(result)))
-                    await MessageBox.Show(form.GroundEditForm, String.Format("Map can only be saved to:\n{0}", reqDir), "Error", MessageBox.MessageBoxButtons.Ok);
-                else if (Path.GetFileName(result).Contains(" "))
-                    await MessageBox.Show(form.GroundEditForm, String.Format("Save file should not contain white space:\n{0}", Path.GetFileName(result)), "Error", MessageBox.MessageBoxButtons.Ok);
-                else
-                {
-                    lock (GameBase.lockObj)
-                    {
-                        string oldFilename = CurrentFile;
-
-                        //Schedule saving the map
-                        DoSave(ZoneManager.Instance.CurrentGround, result, oldFilename);
-                    }
-                    return true;
-                }
-            }
+            // string mapDir = Path.GetFullPath(PathMod.ModPath(DataManager.GROUND_PATH));
+            // SaveFileDialog saveFileDialog = new SaveFileDialog();
+            // saveFileDialog.Directory = mapDir;
+            //
+            // FileDialogFilter filter = new FileDialogFilter();
+            // filter.Name = "Ground Files";
+            // filter.Extensions.Add(DataManager.GROUND_EXT.Substring(1));
+            // saveFileDialog.Filters.Add(filter);
+            //
+            // DevForm form = (DevForm)DiagManager.Instance.DevEditor;
+            //
+            // string result = await saveFileDialog.ShowAsync(form.GroundEditorPage);
+            //
+            // if (!String.IsNullOrEmpty(result))
+            // {
+            //     string reqDir = PathMod.HardMod(DataManager.GROUND_PATH);
+            //     if (!comparePaths(reqDir, Path.GetDirectoryName(result)))
+            //         await MessageBox.Show(form.GroundEditorPage, String.Format("Map can only be saved to:\n{0}", reqDir), "Error", MessageBox.MessageBoxButtons.Ok);
+            //     else if (Path.GetFileName(result).Contains(" "))
+            //         await MessageBox.Show(form.GroundEditorPage, String.Format("Save file should not contain white space:\n{0}", Path.GetFileName(result)), "Error", MessageBox.MessageBoxButtons.Ok);
+            //     else
+            //     {
+            //         lock (GameBase.lockObj)
+            //         {
+            //             string oldFilename = CurrentFile;
+            //
+            //             //Schedule saving the map
+            //             DoSave(ZoneManager.Instance.CurrentGround, result, oldFilename);
+            //         }
+            //         return true;
+            //     }
+            // }
+            // return false;
             return false;
         }
 
         public async void mnuTest_Click()
         {
-            bool saved = await mnuSave_Click();
-            if (saved)
-            {
-                lock (GameBase.lockObj)
-                {
-                    DevForm form = (DevForm)DiagManager.Instance.DevEditor;
-                    form.GroundEditForm.SilentClose();
-                    form.GroundEditForm = null;
-                    GameManager.Instance.SceneOutcome = GameManager.Instance.TestWarp(ZoneManager.Instance.CurrentGround.AssetName, true, MathUtils.Rand.NextUInt64());
-                }
-            }
+            // bool saved = await mnuSave_Click();
+            // if (saved)
+            // {
+            //     lock (GameBase.lockObj)
+            //     {
+            //         DevForm form = (DevForm)DiagManager.Instance.DevEditor;
+            //         form.GroundEditorPage.SilentClose();
+            //         form.GroundEditorPage = null;
+            //         GameManager.Instance.SceneOutcome = GameManager.Instance.TestWarp(ZoneManager.Instance.CurrentGround.AssetName, true, MathUtils.Rand.NextUInt64());
+            //     }
+            // }
         }
 
         public async void mnuImportFromPng_Click()
         {
-            string mapDir = Path.GetFullPath(PathMod.ModPath(DataManager.GROUND_PATH));
-
-
-            DevForm form = (DevForm)DiagManager.Instance.DevEditor;
-
-            
-            IStorageFolder directory = await form.GroundEditForm.StorageProvider.TryGetFolderFromPathAsync(mapDir);
-            await Dispatcher.UIThread.InvokeAsync(async () =>
-            {
-                IReadOnlyList<IStorageFile> results = await form.GroundEditForm.StorageProvider.OpenFilePickerAsync(new FilePickerOpenOptions 
-                    {
-                        Title = "Open .png File",
-                        SuggestedStartLocation = directory,
-                        AllowMultiple = false,
-                        FileTypeFilter =
-                        [
-                            new FilePickerFileType("PNG Files")
-                            {
-                                Patterns = ["*.PNG"]
-                            }
-                        ]
-                    }
-                );
-                
-                if (results.Count > 0)
-                    DoImportPng(results.First().Path.LocalPath);
-  
-            });
+            // string mapDir = Path.GetFullPath(PathMod.ModPath(DataManager.GROUND_PATH));
+            //
+            //
+            // DevForm form = (DevForm)DiagManager.Instance.DevEditor;
+            //
+            //
+            // IStorageFolder directory = await form.GroundEditorPage.StorageProvider.TryGetFolderFromPathAsync(mapDir);
+            // await Dispatcher.UIThread.InvokeAsync(async () =>
+            // {
+            //     IReadOnlyList<IStorageFile> results = await form.GroundEditorPage.StorageProvider.OpenFilePickerAsync(new FilePickerOpenOptions 
+            //         {
+            //             Title = "Open .png File",
+            //             SuggestedStartLocation = directory,
+            //             AllowMultiple = false,
+            //             FileTypeFilter =
+            //             [
+            //                 new FilePickerFileType("PNG Files")
+            //                 {
+            //                     Patterns = ["*.PNG"]
+            //                 }
+            //             ]
+            //         }
+            //     );
+            //     
+            //     if (results.Count > 0)
+            //         DoImportPng(results.First().Path.LocalPath);
+            //
+            // });
         }
 
 
@@ -228,77 +229,77 @@ public void mnuClearLayer_Click()
 
         public async void mnuImportFromTileset_Click()
         {
-            DevForm form = (DevForm)DiagManager.Instance.DevEditor;
-
-            if (Textures.TileBrowser.CurrentTileset == "")
-                await MessageBox.Show(form.GroundEditForm, String.Format("No tileset to import!"), "Error", MessageBox.MessageBoxButtons.Ok);
-            else
-            {
-                lock (GameBase.lockObj)
-                    DoImportTileset(Textures.TileBrowser.CurrentTileset);
-            }
+            // DevForm form = (DevForm)DiagManager.Instance.DevEditor;
+            //
+            // if (Textures.TileBrowser.CurrentTileset == "")
+            //     await MessageBox.Show(form.GroundEditorPage, String.Format("No tileset to import!"), "Error", MessageBox.MessageBoxButtons.Ok);
+            // else
+            // {
+            //     lock (GameBase.lockObj)
+            //         DoImportTileset(Textures.TileBrowser.CurrentTileset);
+            // }
         }
 
 
         public async void mnuReSize_Click()
         {
 
-            MapResizeWindow window = new MapResizeWindow();
-            MapResizeViewModel viewModel = new MapResizeViewModel(ZoneManager.Instance.CurrentGround.Width, ZoneManager.Instance.CurrentGround.Height);
-            window.DataContext = viewModel;
-
-            DevForm form = (DevForm)DiagManager.Instance.DevEditor;
-
-            bool result = await window.ShowDialog<bool>(form.GroundEditForm);
-
-            lock (GameBase.lockObj)
-            {
-                if (result)
-                {
-                    //TODO: support undo for this
-                    DiagManager.Instance.DevEditor.GroundEditor.Edits.Clear();
-
-                    DiagManager.Instance.LoadMsg = "Resizing Map...";
-                    DevForm.EnterLoadPhase(GameBase.LoadPhase.Content);
-
-                    ZoneManager.Instance.CurrentGround.ResizeJustified(viewModel.MapWidth, viewModel.MapHeight, viewModel.ResizeDir);
-
-                    DevForm.EnterLoadPhase(GameBase.LoadPhase.Ready);
-                }
-            }
+            // MapResizeWindow window = new MapResizeWindow();
+            // MapResizeViewModel viewModel = new MapResizeViewModel(ZoneManager.Instance.CurrentGround.Width, ZoneManager.Instance.CurrentGround.Height);
+            // window.DataContext = viewModel;
+            //
+            // DevForm form = (DevForm)DiagManager.Instance.DevEditor;
+            //
+            // bool result = await window.ShowDialog<bool>(form.GroundEditorPage);
+            //
+            // lock (GameBase.lockObj)
+            // {
+            //     if (result)
+            //     {
+            //         //TODO: support undo for this
+            //         DiagManager.Instance.DevEditor.GroundEditor.Edits.Clear();
+            //
+            //         DiagManager.Instance.LoadMsg = "Resizing Map...";
+            //         DevForm.EnterLoadPhase(GameBase.LoadPhase.Content);
+            //
+            //         ZoneManager.Instance.CurrentGround.ResizeJustified(viewModel.MapWidth, viewModel.MapHeight, viewModel.ResizeDir);
+            //
+            //         DevForm.EnterLoadPhase(GameBase.LoadPhase.Ready);
+            //     }
+            // }
         }
 
         public async void mnuReTile_Click()
         {
-            MapRetileWindow window = new MapRetileWindow();
-            MapRetileViewModel viewModel = new MapRetileViewModel(ZoneManager.Instance.CurrentGround.TileSize, "Tile size must be divisible by 8. All textures will be erased from all layers upon completing this operation.");
-            window.DataContext = viewModel;
-
-            DevForm form = (DevForm)DiagManager.Instance.DevEditor;
-
-            bool result = await window.ShowDialog<bool>(form.GroundEditForm);
-
-            lock (GameBase.lockObj)
-            {
-                bool sizeChanged = viewModel.TileSize != ZoneManager.Instance.CurrentGround.TileSize;
-                if (result && sizeChanged)
-                {
-                    //TODO: support undo for this
-                    DiagManager.Instance.DevEditor.GroundEditor.Edits.Clear();
-
-                    DiagManager.Instance.LoadMsg = "Retiling Map...";
-                    DevForm.EnterLoadPhase(GameBase.LoadPhase.Content);
-
-                    ZoneManager.Instance.CurrentGround.Retile(viewModel.TileSize / GraphicsManager.TEX_SIZE);
-
-                    Textures.TileBrowser.TileSize = ZoneManager.Instance.CurrentGround.TileSize;
-                    Textures.AutotileBrowser.TileSize = ZoneManager.Instance.CurrentGround.TileSize;
-                    ZoneManager.Instance.CurrentGround.BlankBG = new AutoTile();
-                    Properties.BlankBG.LoadFromSource(ZoneManager.Instance.CurrentGround.BlankBG);
-
-                    DevForm.EnterLoadPhase(GameBase.LoadPhase.Ready);
-                }
-            }
+            // MapRetileWindow window = new MapRetileWindow();
+            // MapRetileViewModel viewModel = new MapRetileViewModel(ZoneManager.Instance.CurrentGround.TileSize, "Tile size must be divisible by 8. All textures will be erased from all layers upon completing this operation.");
+            // window.DataContext = viewModel;
+            //
+            // DevForm form = (DevForm)DiagManager.Instance.DevEditor;
+            //
+            // bool result = await window.ShowDialog<bool>(form.GroundEditorPage);
+            //
+            // lock (GameBase.lockObj)
+            // {
+            //     bool sizeChanged = viewModel.TileSize != ZoneManager.Instance.CurrentGround.TileSize;
+            //     if (result && sizeChanged)
+            //     {
+            //         //TODO: support undo for this
+            //         DiagManager.Instance.DevEditor.GroundEditor.Edits.Clear();
+            //
+            //         DiagManager.Instance.LoadMsg = "Retiling Map...";
+            //         DevForm.EnterLoadPhase(GameBase.LoadPhase.Content);
+            //
+            //         ZoneManager.Instance.CurrentGround.Retile(viewModel.TileSize / GraphicsManager.TEX_SIZE);
+            //
+            //         Textures.TileBrowser.TileSize = ZoneManager.Instance.CurrentGround.TileSize;
+            //         Textures.AutotileBrowser.TileSize = ZoneManager.Instance.CurrentGround.TileSize;
+            //         ZoneManager.Instance.CurrentGround.BlankBG = new AutoTile();
+            //         Properties.BlankBG.LoadFromSource(ZoneManager.Instance.CurrentGround.BlankBG);
+            //
+            //         DevForm.EnterLoadPhase(GameBase.LoadPhase.Ready);
+            //     }
+            // }
         }
 
         public void mnuUndo_Click()
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/GroundTabPropertiesViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/GroundTabPropertiesViewModel.cs
index cb0342a7..d1226a7c 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/GroundTabPropertiesViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/GroundTabPropertiesViewModel.cs
@@ -9,13 +9,19 @@
 using System.Collections.ObjectModel;
 using System.IO;
 using System.Text;
+using RogueEssence.Dev.Utility;
 
 namespace RogueEssence.Dev.ViewModels
 {
     public class GroundTabPropertiesViewModel : ViewModelBase
     {
-        public GroundTabPropertiesViewModel()
+        EditorContext _context;
+        GroundEditorPageViewModel _parent;
+        public GroundTabPropertiesViewModel(EditorContext context, GroundEditorPageViewModel parent)
         {
+            _context = context;
+            _parent = parent;
+            
             ScrollEdges = new ObservableCollection<string>();
             for (int ii = 0; ii <= (int)Map.ScrollEdge.Wrap; ii++)
                 ScrollEdges.Add(((Map.ScrollEdge)ii).ToLocal());
@@ -103,22 +109,30 @@ public void MapBG_Edit(object element, bool advancedEdit, ClassBoxViewModel.Edit
         {
             Type type = typeof(IBackgroundSprite);
             string elementName = type.Name;
-            DataEditForm frmData = new DataEditRootForm();
-            frmData.Title = DataEditor.GetWindowTitle(ZoneManager.Instance.CurrentGround.AssetName, elementName, element, type, new object[0]);
 
-            DataEditor.LoadClassControls(frmData.ControlPanel, ZoneManager.Instance.CurrentGround.AssetName, null, elementName, type, new object[0], element, true, new Type[0], advancedEdit);
-            DataEditor.TrackTypeSize(frmData, type);
+ 
+            NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(elementName, _parent.Node, _parent.Icon);
+            _parent.Node.AddNodeIfNotExists(node);
+            NodeHelper.ExpandParents(node, true);
+
+            ReflectedDataPageViewModel newEditor = _context.PageFactory.CreatePage<ReflectedDataPageViewModel>(node);
+            newEditor.SetPageTitle(elementName, _parent.Node.Icon);
+            newEditor.SetRootPage(true);
+            newEditor.SetRemoveNode(true);
 
-            frmData.SelectedOKEvent += async () =>
+            newEditor.OnLoadAction = stack =>
             {
-                element = DataEditor.SaveClassControls(frmData.ControlPanel, elementName, type, new object[0], true, new Type[0], advancedEdit);
+                DataEditor.LoadClassControls(stack, ZoneManager.Instance.CurrentGround.AssetName, null, elementName, type, new object[0], element, true, new Type[0], advancedEdit);
+            };
+
+            newEditor.OnOKAction = async stack =>
+            {
+                element = DataEditor.SaveClassControls(stack, elementName, type, new object[0], true, new Type[0], advancedEdit);
                 op(element);
                 return true;
             };
 
-            DevForm form = (DevForm)DiagManager.Instance.DevEditor;
-            form.GroundEditForm.RegisterChild(frmData);
-            frmData.Show();
+            _context.TabEvents.AddChildPage(_parent, newEditor);
         }
 
 
@@ -129,8 +143,8 @@ public void BlankBG_Changed()
 
         public void AutoTile_Edit(AutoTile element, TileBoxViewModel.EditElementOp op)
         {
-            TileEditForm frmData = new TileEditForm();
-            TileEditViewModel tmv = new TileEditViewModel();
+            TileEditWindowView frmData = new TileEditWindowView();
+            TileEditWindowViewModel tmv = new TileEditWindowViewModel();
             frmData.DataContext = tmv;
             tmv.Name = element.ToString();
 
@@ -151,7 +165,7 @@ public void AutoTile_Edit(AutoTile element, TileBoxViewModel.EditElementOp op)
             };
 
             DevForm form = (DevForm)DiagManager.Instance.DevEditor;
-            form.GroundEditForm.RegisterChild(frmData);
+            // form.GroundEditorPage.RegisterChild(frmData);
             frmData.Show();
         }
 
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/GroundTabScriptViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/GroundTabScriptViewModel.cs
index a4bfae98..ea7fcaf9 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/GroundTabScriptViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/GroundTabScriptViewModel.cs
@@ -23,8 +23,11 @@ namespace RogueEssence.Dev.ViewModels
 {
     public class GroundTabScriptViewModel : ViewModelBase
     {
-        public GroundTabScriptViewModel()
+        
+        private EditorContext _context;
+        public GroundTabScriptViewModel(EditorContext context)
         {
+            _context = context;
             ScriptItems = new ObservableCollection<ScriptItem>();
             foreach (LuaEngine.EMapCallbacks v in LuaEngine.EnumerateCallbackTypes())
                 ScriptItems.Add(new ScriptItem(v, false));
@@ -37,12 +40,12 @@ public async void btnOpenScriptDir_Click()
         {
             DevForm form = (DevForm)DiagManager.Instance.DevEditor;
 
-            string file = Path.GetFileNameWithoutExtension(((GroundEditViewModel)form.GroundEditForm.DataContext).CurrentFile);
+            string file = Path.GetFileNameWithoutExtension(((GroundEditorPageViewModel)form.GroundEditorPage).CurrentFile);
             string mapscriptdir = LuaEngine.MakeGroundMapScriptPath(file, "");
 
             if (!Directory.Exists(mapscriptdir))
             {
-                await MessageBox.Show(form.GroundEditForm, String.Format("This map has not been saved under the current mod-under-edit.  Please switch to the desired mod and save it first."), "Invalid Operation", MessageBox.MessageBoxButtons.Ok);
+                await MessageBoxWindowView.Show(_context.DialogService, String.Format("This map has not been saved under the current mod-under-edit.  Please switch to the desired mod and save it first."), "Invalid Operation", MessageBoxWindowView.MessageBoxButtons.Ok);
             }
             else
             {
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/GroundTabTexturesViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/GroundTabTexturesViewModel.cs
index 9e5605d0..750d9994 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/GroundTabTexturesViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/GroundTabTexturesViewModel.cs
@@ -8,9 +8,10 @@ namespace RogueEssence.Dev.ViewModels
 {
     public class GroundTabTexturesViewModel : ViewModelBase
     {
-        public GroundTabTexturesViewModel()
+        private EditorContext _context;
+        public GroundTabTexturesViewModel(EditorContext context)
         {
-            Layers = new TextureLayerBoxViewModel(true);
+            Layers = new TextureLayerBoxViewModel(true, context.DialogService);
             TileBrowser = new TileBrowserViewModel();
             TileBrowser.CanMultiSelect = true;
             AutotileBrowser = new AutotileBrowserViewModel();
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/Layers/AnimLayerBoxViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/Layers/AnimLayerBoxViewModel.cs
index 4e55ff9c..f00e2dce 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/Layers/AnimLayerBoxViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/Layers/AnimLayerBoxViewModel.cs
@@ -33,7 +33,7 @@ public override async Task EditLayer()
                 AnimLayerWindow window = new AnimLayerWindow();
                 window.DataContext = vm;
 
-                result = await window.ShowDialog<bool>(form.GroundEditForm);
+                // result = await window.ShowDialog<bool>(form.GroundEditorPage);
             }
             else
             {
@@ -44,6 +44,8 @@ public override async Task EditLayer()
                 result = true;
             }
 
+            result = false;
+
             lock (GameBase.lockObj)
             {
                 if (result)
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/Layers/EntityLayerBoxViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/Layers/EntityLayerBoxViewModel.cs
index d3856c28..0c5ba785 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/Layers/EntityLayerBoxViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/Layers/EntityLayerBoxViewModel.cs
@@ -27,8 +27,10 @@ public override async Task EditLayer()
 
             DevForm form = (DevForm)DiagManager.Instance.DevEditor;
 
-            bool result = await window.ShowDialog<bool>(form.GroundEditForm);
+            // bool result = await window.ShowDialog<bool>(form.GroundEditorPage);
 
+            // bool result = await window.ShowDialog<bool>(form.GroundEditorPage);
+            bool result = false;
             lock (GameBase.lockObj)
             {
                 if (result)
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/Layers/TextureLayerBoxViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/Layers/TextureLayerBoxViewModel.cs
index f9228422..c1d01321 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/Layers/TextureLayerBoxViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/Layers/TextureLayerBoxViewModel.cs
@@ -9,6 +9,7 @@
 using Avalonia.Controls;
 using System.Collections.ObjectModel;
 using System.Threading.Tasks;
+using RogueEssence.Dev.Services;
 using RogueEssence.Dev.Views;
 
 namespace RogueEssence.Dev.ViewModels
@@ -17,14 +18,16 @@ namespace RogueEssence.Dev.ViewModels
     public class TextureLayerBoxViewModel : LayerBoxViewModel<MapLayer>
     {
         private bool groundMode;
-        public TextureLayerBoxViewModel(bool groundMode) : base(groundMode ? DiagManager.Instance.DevEditor.GroundEditor.Edits : DiagManager.Instance.DevEditor.MapEditor.Edits)
+        private IDialogService _dialogService;
+        public TextureLayerBoxViewModel(bool groundMode, IDialogService dialogService) : base(groundMode ? DiagManager.Instance.DevEditor.GroundEditor.Edits : DiagManager.Instance.DevEditor.MapEditor.Edits)
         {
+            _dialogService = dialogService;
             this.groundMode = groundMode;
         }
 
         public override async Task EditLayer()
         {
-            MapLayerViewModel vm = new MapLayerViewModel(Layers[ChosenLayer]);
+            MapLayerWindowViewModel vm = new MapLayerWindowViewModel(Layers[ChosenLayer]);
             DevForm form = (DevForm)DiagManager.Instance.DevEditor;
             bool result;
             if (groundMode)
@@ -32,18 +35,24 @@ public override async Task EditLayer()
                 GroundLayerWindow window = new GroundLayerWindow();
                 window.DataContext = vm;
 
-                result = await window.ShowDialog<bool>(form.GroundEditForm);
+                // result = await window.ShowDialog<bool>(form.GroundEditorPage);
             }
             else
             {
-                MapLayerWindow window = new MapLayerWindow();
-                window.DataContext = vm;
-
-
+                
+                Console.WriteLine(_dialogService);
+                bool animResult = await _dialogService.ShowDialogAsync<MapLayerWindowViewModel, bool>(vm, "Map Layer");
+                if (!animResult)
+                    return;
+                // MapLayerWindow window = new MapLayerWindow();
+                // window.DataContext = vm;
+                // result = true;
                 result = true;
                 // result = await window.ShowDialog<bool>(form.MapEditPage);
             }
 
+            
+            result = false;
             lock (GameBase.lockObj)
             {
                 if (result)
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/MapEditForm/MapEditViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/MapEditForm/MapEditViewModel.cs
index a13fdd44..a9216aea 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/MapEditForm/MapEditViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/MapEditForm/MapEditViewModel.cs
@@ -211,8 +211,8 @@ public async void mnuTest_Click()
                 lock (GameBase.lockObj)
                 {
                     DevForm form = (DevForm)DiagManager.Instance.DevEditor;
-                    form.MapEditPage.SilentClose();
-                    form.MapEditPage = null;
+                    form.MapEditorPage.SilentClose();
+                    form.MapEditorPage = null;
                     GameManager.Instance.SceneOutcome = GameManager.Instance.TestWarp(ZoneManager.Instance.CurrentMap.AssetName, false, MathUtils.Rand.NextUInt64());
                 }
             }
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/MapEditForm/MapTabPropertiesViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/MapEditForm/MapTabPropertiesViewModel.cs
index 524b5488..2f2f1ee9 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/MapEditForm/MapTabPropertiesViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/MapEditForm/MapTabPropertiesViewModel.cs
@@ -185,8 +185,8 @@ public void MapBG_Edit(object element, bool advancedEdit, ClassBoxViewModel.Edit
 
         public void AutoTile_Edit(AutoTile element, TileBoxViewModel.EditElementOp op)
         {
-            TileEditForm frmData = new TileEditForm();
-            TileEditViewModel tmv = new TileEditViewModel();
+            TileEditWindowView frmData = new TileEditWindowView();
+            TileEditWindowViewModel tmv = new TileEditWindowViewModel();
             frmData.DataContext = tmv;
             tmv.Name = element.ToString();
 
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/MapEditForm/MapTabTexturesViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/MapEditForm/MapTabTexturesViewModel.cs
index 736bcf50..c0f81b9b 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/MapEditForm/MapTabTexturesViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/MapEditForm/MapTabTexturesViewModel.cs
@@ -8,9 +8,11 @@ namespace RogueEssence.Dev.ViewModels
 {
     public class MapTabTexturesViewModel : ViewModelBase
     {
-        public MapTabTexturesViewModel()
+        private EditorContext _context;
+        public MapTabTexturesViewModel(EditorContext context)
         {
-            Layers = new TextureLayerBoxViewModel(false);
+            _context = context;
+            Layers = new TextureLayerBoxViewModel(false, context.DialogService);
             TileBrowser = new TileBrowserViewModel();
             TileBrowser.CanMultiSelect = true;
             AutotileBrowser = new AutotileBrowserViewModel();
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs
index 797f52c9..ece44c11 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs
@@ -35,14 +35,10 @@ public HierarchicalTreeDataGridSource<NodeBase> NodeSource
 
     public DevTabGameViewModel Game { get; set; }
     public DevTabPlayerViewModel Player { get; set; }
-    public DevTabDataViewModel Data { get; set; }
     public DevTabTravelViewModel Travel { get; set; }
-    public DevTabSpritesViewModel Sprites { get; set; }
-
     public DevTabScriptViewModel Script { get; set; }
 
-    // public DevTabModsViewModel Mods { get; set; }
-    public DevTabConstantsViewModel Constants { get; set; }
+    public ModManagerViewModel ModsManager { get; set; }
 
 
     public ObservableCollection<ModsNodeViewModel> Mods { get; }
@@ -403,18 +399,12 @@ public ObservableCollection<NodeBase> Nodes
         get => _nodes;
         set => this.RaiseAndSetIfChanged(ref _nodes, value);
     }
-    // public DevFormViewModel() : this(new PageFactory(new DesignServiceProvider()),
-    //     new NodeFactory(new DesignServiceProvider()), new DialogService(),
-    //     new TabEvents(new PageFactory(new DesignServiceProvider())), new DevTabGameViewModel(), new DevTabPlayerViewModel())
-    // {
-    // }
-
+    
     private EditorContext _context;
 
     public DevFormViewModel(EditorContext context, DevTabGameViewModel game, DevTabPlayerViewModel player,
-        DevTabDataViewModel data,
         DevTabTravelViewModel travel, DevTabSpritesViewModel sprites, DevTabScriptViewModel script,
-        DevTabModsViewModel mods,
+        ModManagerViewModel mods,
         DevTabConstantsViewModel constants)
     {
         _context = context;
@@ -422,13 +412,10 @@ public DevFormViewModel(EditorContext context, DevTabGameViewModel game, DevTabP
         // NOTE: These should all be private readonly
         Game = game;
         Player = player;
-        Data = data;
         Travel = travel;
-        Sprites = sprites;
         Script = script;
-        // Mods = mods;
-        Constants = constants;
-
+        ModsManager = mods;
+        
         InitializeTabEvents();
 
         this.WhenAnyValue(x => x.ActivePage)
@@ -493,9 +480,6 @@ public void LoadDevTree()
         Pages.Clear();
         _pageToNodeMap.Clear();
 
-
-       
-
         foreach (var n in Nodes)
         {
             DetachEventsRecursive(n);
@@ -504,22 +488,16 @@ public void LoadDevTree()
         Nodes.Clear();
 
         var rootStr = ChosenMod.Name;
-
-        // TODO: change to Mod Edit Page View Model
+        
         var root = _nodeFactory.CreateOpenEditorNode<DevEditPageViewModel>(rootStr, "Icons.ScrollFill");
 
-
         Root = root;
-        // root.SubNodes.Add(
-        // _nodeFactory.CreateOpenEditorNode("Dev Control",  typeof(DevControlViewModel), "Icons.GameControllerFill"));
-
         var devControlNode =
             _nodeFactory.CreateOpenEditorNode<DevControlViewModel>("Dev Control", "Icons.GameControllerFill");
         root.SubNodes.Add(devControlNode);
         
-        // TODO: Attach the DevControlNode to this tab rather than keeping it null... 
         var tab = _context.PageFactory.CreatePage(typeof(DevControlViewModel), devControlNode);
-        // tab.Icon = "Icons.GameControllerFill";
+        tab.SetPageTitle("Dev Control", "Icons.GameControllerFill");
         AddTopLevelPage(tab);
 
 
@@ -533,19 +511,6 @@ public void LoadDevTree()
 
         root.SubNodes.Add(groundEditorNode);
         GroundEditorNode = groundEditorNode;
-        // root.SubNodes.Add(
-        // _nodeFactory.CreateOpenEditorNode("Ground Editor", typeof(GroundEditorPageViewModel), "Icons.MapTrifoldFill"));
-        // root.SubNodes.Add(_nodeFactory.CreateOpenEditorNode("Testing", "Icons.BedFill", "RandomInfo"));
-        // root.SubNodes.Add(_nodeFactory.CreateOpenEditorNode("Tab Test", "Icons.AirplaneFill", "SpritePage"));
-
-        // var particlesRoot = _nodeFactory.CreateSpriteRootNode("particles", "", "Particles", "Icons.PaintBrushFill");
-        // particlesRoot.SubNodes.Add(_nodeFactory.CreateDataItemNode("Acid_Blue", "SpriteEditor", "Acid_Blue",
-        //     "Icons.PaintBrushFill"));
-        // particlesRoot.SubNodes.Add(_nodeFactory.CreateDataItemNode("Acid_Red", "SpriteEditor", "Acid_Red",
-        //     "Icons.PaintBrushFill"));
-        //
-        // halcyonNode.SubNodes.Add(particlesRoot);
-
 
         CreateDataNode(root);
         CreateConstantsNode(root);
@@ -558,38 +523,7 @@ public void LoadDevTree()
         AttachEventsRecursive(root);
         root.IsExpanded = true;
     }
-
-
-    private void OpenItem<T>(string name, T data, Action<T> saveOp, NodeBase parentNode)
-    {
-        lock (GameBase.lockObj)
-        {
-            ReflectedDataPageViewModel newEditor = _context.PageFactory.CreatePage<ReflectedDataPageViewModel>(
-                parentNode,
-                vm =>
-                {
-                    var pg = vm as ReflectedDataPageViewModel;
-                    pg.SetPageTitle(name, parentNode.Icon);
-
-
-                    pg.OnLoadAction = (StackPanel stack) => { DataEditor.LoadDataControls("", data, stack); };
-
-                    pg.OnOKAction = async (StackPanel stack) =>
-                    {
-                        lock (GameBase.lockObj)
-                        {
-                            object obj = data;
-                            DataEditor.SaveDataControls(ref obj, stack, new Type[0]);
-                            saveOp((T)obj);
-                        }
-
-                        return true;
-                    };
-                });
-            _context.TabEvents.AddTopLevelTab(newEditor);
-        }
-    }
-
+    
     private Action<ReflectedDataPageViewModel> CreateDataOnOpen<T>(Func<T> getter, Action<T> setter, NodeBase parent)
     {
         return vm =>
@@ -624,7 +558,7 @@ private Action<ReflectedDataPageViewModel> CreateFXOnOpen<T>(Func<T> getter, Act
     private void CreateConstantsNode(NodeBase parent)
     {
         var constantsNode =
-            _context.NodeFactory.CreateReflectedDataNode<MapEditorPageViewModel>("Constants", parent, "Icons.ListFill");
+            _context.NodeFactory.CreateReflectedDataNode<EmptyPageViewModel>("Constants", parent, "Icons.ListFill");
         var startParamsNode = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>("Start Params",
             parent,
             "Icons.ListFill", CreateDataOnOpen(
@@ -648,47 +582,12 @@ private void CreateConstantsNode(NodeBase parent)
                 parent));
 
         
-        var stringsNode = _context.NodeFactory.CreateOpenEditorNode<MapEditorPageViewModel>("Strings", "Icons.TableFill");
+        var stringsNode = _context.NodeFactory.CreateOpenEditorNode<EmptyPageViewModel>("Strings", "Icons.TableFill");
         var menuTextNode = _context.NodeFactory.CreateOpenEditorNodeWithParams<StringEditPageViewModel>("Menu Text", [false], "Icons.TableFill");
         var gameplayTextNode = _context.NodeFactory.CreateOpenEditorNodeWithParams<StringEditPageViewModel>("Gameplay Text", [true], "Icons.TableFill");
         stringsNode.SubNodes.Add(menuTextNode);
         stringsNode.SubNodes.Add(gameplayTextNode);
-   
-        //     public async void mnuUniversalFile_Click()
-        //     {
-        //         DevForm parent = (DevForm)DiagManager.Instance.DevEditor;
-        //         if (DataManager.GetDataModStatus(DataManager.DATA_PATH, "Universal", DataManager.DATA_EXT) == DataManager.ModStatus.Base)
-        //         {
-        //             await MessageBox.Show(parent, "Universal data must have saved edits first!", "Error", MessageBox.MessageBoxButtons.Ok);
-        //             return;
-        //         }
-        //
-        //         DataManager.SaveData(DataManager.Instance.UniversalEvent, DataManager.DATA_PATH, "Universal", DataManager.DATA_EXT, DataManager.SavePolicy.File);
-        //
-        //         await MessageBox.Show(parent, "Universal is now saved as a file.", "Complete", MessageBox.MessageBoxButtons.Ok);
-        //     }
-        //     public async void mnuUniversalDiff_Click()
-        //     {
-        //         DevForm parent = (DevForm)DiagManager.Instance.DevEditor;
-        //         if (DataManager.GetDataModStatus(DataManager.DATA_PATH, "Universal", DataManager.DATA_EXT) == DataManager.ModStatus.Base)
-        //         {
-        //             await MessageBox.Show(parent, "Universal data must have saved edits first!", "Error", MessageBox.MessageBoxButtons.Ok);
-        //             return;
-        //         }
-        //
-        //         //you can't make a diff for the base game!
-        //         DataManager.SaveData(DataManager.Instance.UniversalEvent, DataManager.DATA_PATH, "Universal", DataManager.DATA_EXT, DataManager.SavePolicy.Diff);
-        //
-        //         if (DataManager.GetDataModStatus(DataManager.DATA_PATH, "Universal", DataManager.DATA_EXT) == DataManager.ModStatus.Base)
-        //             await MessageBox.Show(parent, "Modded Universal was identical to base. Unneeded patch removed.", "Complete", MessageBox.MessageBoxButtons.Ok);
-        //         else
-        //             await MessageBox.Show(parent, "Universal is now saved as a patch.", "Complete", MessageBox.MessageBoxButtons.Ok);
-        //     }
-        //
- 
-
         constantsNode.SubNodes.Add(startParamsNode);
-        
         constantsNode.SubNodes.Add(universalEventsNode);
         constantsNode.SubNodes.Add(stringsNode);
         
@@ -765,7 +664,7 @@ private void CreateConstantsNode(NodeBase parent)
     private void CreateDataNode(NodeBase parent)
     {
         var dataNode =
-            _context.NodeFactory.CreateOpenEditorNode<MapEditorPageViewModel>("Datazz", "Icons.FloppyDiskFill");
+            _context.NodeFactory.CreateOpenEditorNode<EmptyPageViewModel>("Data", "Icons.FloppyDiskFill");
         foreach (var type in Enum.GetValues<DataManager.DataType>())
         {
             if (type is DataManager.DataType.All or DataManager.DataType.None)
@@ -778,16 +677,6 @@ private void CreateDataNode(NodeBase parent)
                 type.ToString(),
                 entry.Icon);
             dataNode.SubNodes.Add(dataItemRootNode);
-            // var entries = DataManager.Instance.DataIndices[type].GetLocalStringArray(true);
-            //
-            // foreach (string key in entries.Keys)
-            // {
-            //     var itemNode = _nodeFactory.CreateDataItemNode<DataListPageViewModel>(
-            //         key,
-            //         $"{key}: {entries[key]}",
-            //         type.GetIcon());
-            //     dataItemRootNode.SubNodes.Add(itemNode);
-            // }
         }
 
         parent.SubNodes.Add(dataNode);
@@ -795,9 +684,8 @@ private void CreateDataNode(NodeBase parent)
 
     private void CreateSpriteNode(NodeBase parent)
     {
-        // var spritesViewModel = _pageFactory.GetRequiredService<DevTabSpritesViewModel>();
         var spriteNode =
-            _context.NodeFactory.CreateOpenEditorNode<MapEditorPageViewModel>("Sprites", "Icons.PaintBrushFill");
+            _context.NodeFactory.CreateOpenEditorNode<EmptyPageViewModel>("Sprites", "Icons.PaintBrushFill");
         //
         spriteNode.SubNodes.Add(
             _context.NodeFactory.CreateOpenEditorNodeWithParams<SpeciesEditPageViewModel>("Char Sprites", [true],
@@ -831,57 +719,6 @@ private void CreateSpriteNode(NodeBase parent)
                         type.GetIcon()));
                 
             }
-            // if (type == GraphicsManager.AssetType.Tile)
-            // {
-            //     var tileRootNode = _nodeFactory.CreateSpriteTileRootNode(
-            //         "",
-            //         type.ToString(),
-            //         type.GetIcon());
-            //     lock (GameBase.lockObj)
-            //     {
-            //         foreach (string name in GraphicsManager.TileIndex.Nodes.Keys.OrderBy(n => n))
-            //         {
-            //             var itemNode = _nodeFactory.CreateDataItemNode(
-            //                 name,
-            //                 "",
-            //                 name,
-            //                 type.GetIcon());
-            //             tileRootNode.SubNodes.Add(itemNode);
-            //         }
-            //     }
-            //
-            //     spriteNode.SubNodes.Add(tileRootNode);
-            //     continue;
-            // }
-            //
-            // string assetPattern = GraphicsManager.GetPattern(type);
-            // string[] dirs = PathMod.GetModFiles(Path.GetDirectoryName(assetPattern),
-            //     String.Format(Path.GetFileName(assetPattern), "*"));
-            //
-            // // var spriteRootNode = _nodeFactory.CreateSpriteRootNode(
-            //     type,
-            //     "TODO",
-            //     type.ToString(),
-            //     type.GetIcon());
-            // // dataNode.SubNodes.Add(dataItemRootNode);
-            // spriteNode.SubNodes.Add(spriteRootNode);
-
-
-            // lock (GameBase.lockObj)
-            // {
-            //     for (int ii = 0; ii < dirs.Length; ii++)
-            //     {
-            //         string filename = Path.GetFileNameWithoutExtension(dirs[ii]);
-            //         // anims.Add(filename);
-            //         var itemNode = _nodeFactory.CreateDataItemNode(
-            //             filename,
-            //             "",
-            //             filename,
-            //             type.GetIcon());
-            //
-            //         spriteRootNode.SubNodes.Add(itemNode);
-            //     }
-            // }
         }
 
 
@@ -1016,6 +853,10 @@ public void OpenMapEditor()
         page.SetPageTitle("Map Editor", "Icons.StairsFill");
         AddTopLevelPage(page);
     }
-
-    // public TreeSearchViewModel TreeSearch { get; } = new TreeSearchViewModel();
+    public void OpenGroundEditor()
+    {
+        var page = _context.PageFactory.CreatePage<GroundEditorPageViewModel>(GroundEditorNode);
+        page.SetPageTitle("Ground Editor", "Icons.IslandFill");
+        AddTopLevelPage(page);
+    }
 }
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/DialogBoxes/MapLayerWindowViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/DialogBoxes/MapLayerWindowViewModel.cs
new file mode 100644
index 00000000..a26316c9
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/DialogBoxes/MapLayerWindowViewModel.cs
@@ -0,0 +1,62 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using RogueEssence;
+using RogueEssence.Dungeon;
+using RogueEssence.Ground;
+using RogueEssence.Data;
+using ReactiveUI;
+using System.Collections.ObjectModel;
+using RogueEssence.Content;
+
+namespace RogueEssence.Dev.ViewModels
+{
+    public class MapLayerWindowViewModel : ViewModelBase
+    {
+        public MapLayerWindowViewModel(MapLayer layer)
+        {
+            name = layer.Name;
+            front = layer.Layer == Content.DrawLayer.Top;
+            back = layer.Layer == Content.DrawLayer.Under;
+            mid = !front && !back;
+        }
+
+        private string name;
+        public string Name
+        {
+            get => name;
+            set => this.SetIfChanged(ref name, value);
+        }
+
+        private bool front;
+        public bool Front
+        {
+            get { return front; }
+            set
+            {
+                this.SetIfChanged(ref front, value);
+            }
+        }
+
+        private bool mid;
+        public bool Mid
+        {
+            get { return mid; }
+            set
+            {
+                this.SetIfChanged(ref mid, value);
+            }
+        }
+
+        private bool back;
+        public bool Back
+        {
+            get { return back; }
+            set
+            {
+                this.SetIfChanged(ref back, value);
+            }
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/DialogBoxes/MapResizeWindowViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/DialogBoxes/MapResizeWindowViewModel.cs
new file mode 100644
index 00000000..eeedeccb
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/DialogBoxes/MapResizeWindowViewModel.cs
@@ -0,0 +1,94 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using RogueEssence;
+using RogueEssence.Dungeon;
+using RogueEssence.Ground;
+using RogueEssence.Data;
+using ReactiveUI;
+using System.Collections.ObjectModel;
+using RogueElements;
+using RogueEssence.Dev.Services;
+using RogueEssence.Dev.Views;
+
+namespace RogueEssence.Dev.ViewModels
+{
+    public class MapResizeWindowViewModel : ViewModelBase
+    {
+        public MapResizeWindowViewModel(int mapWidth, int mapHeight)
+        {
+            this.mapWidth = mapWidth;
+            this.mapHeight = mapHeight;
+            this.resizeDir = Dir8.None;
+        }
+
+        private int mapWidth;
+        public int MapWidth
+        {
+            get { return mapWidth; }
+            set
+            {
+                this.SetIfChanged(ref mapWidth, value);
+            }
+        }
+
+        private int mapHeight;
+        public int MapHeight
+        {
+            get { return mapHeight; }
+            set
+            {
+                this.SetIfChanged(ref mapHeight, value);
+            }
+        }
+
+        private Dir8 resizeDir;
+        public Dir8 ResizeDir
+        {
+            get { return resizeDir; }
+            set
+            {
+                this.SetIfChanged(ref resizeDir, value);
+            }
+        }
+
+        public void btnUpLeft_Click()
+        {
+            ResizeDir = Dir8.UpLeft;
+        }
+        public void btnUp_Click()
+        {
+            ResizeDir = Dir8.Up;
+        }
+        public void btnUpRight_Click()
+        {
+            ResizeDir = Dir8.UpRight;
+        }
+
+        public void btnLeft_Click()
+        {
+            ResizeDir = Dir8.Left;
+        }
+        public void btnNone_Click()
+        {
+            ResizeDir = Dir8.None;
+        }
+        public void btnRight_Click()
+        {
+            ResizeDir = Dir8.Right;
+        }
+
+        public void btnDownLeft_Click()
+        {
+            ResizeDir = Dir8.DownLeft;
+        }
+        public void btnDown_Click()
+        {
+            ResizeDir = Dir8.Down;
+        }
+        public void btnDownRight_Click()
+        {
+            ResizeDir = Dir8.DownRight;
+        }
+    }
+}
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/DialogBoxes/ModNameWindowViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/DialogBoxes/ModNameWindowViewModel.cs
new file mode 100644
index 00000000..475443ae
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/DialogBoxes/ModNameWindowViewModel.cs
@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using RogueEssence;
+using RogueEssence.Dungeon;
+using RogueEssence.Ground;
+using RogueEssence.Data;
+using ReactiveUI;
+using System.Collections.ObjectModel;
+using RogueEssence.Dev.Services;
+using RogueEssence.Dev.Views;
+
+namespace RogueEssence.Dev.ViewModels
+{
+    public class ModNameWindowViewModel : ViewModelBase
+    {
+        public ModNameWindowViewModel()
+        {
+            Name = "";
+            Namespace = "";
+        }
+
+        private string name;
+        public string Name
+        {
+            get => name;
+            set => this.SetIfChanged(ref name, value);
+        }
+
+        
+        private string editNamespace;
+        public string Namespace
+        {
+            get => editNamespace;
+            set => this.SetIfChanged(ref editNamespace, value);
+        }
+    }
+}
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/AnimEditPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/AnimEditPageViewModel.cs
deleted file mode 100644
index 2ffbb4ba..00000000
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/AnimEditPageViewModel.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace RogueEssence.Dev.ViewModels;
-
-public class AnimEditPageViewModel
-{
-    
-}
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DataListPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DataListPageViewModel.cs
index 253ce408..aa76d108 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DataListPageViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DataListPageViewModel.cs
@@ -48,7 +48,7 @@ public DataListEntry? SelectedItem
     public ObservableCollection<DataListEntry> Items { get; } = new();
     public ObservableCollection<DataListEntry> FilteredItems { get; } = new();
 
-    public ObservableCollection<DataOpContainer> EditMenuItems { get; } = new();
+    public ObservableCollection<MenuItem> EditMenuItems { get; } = new();
 
     public DataManager.DataType DataType => Node.DataType;
 
@@ -83,16 +83,26 @@ public override void OnPageLoad()
 
         EditMenuItems.Clear();
 
-        EditMenuItems.Add(new DataOpContainer("Re-Index", Node.ReIndexAsync));
+        
+        var reIndex = new MenuItem { Header = "Re-Index" };
+        reIndex.Click += async (s, e) => await Node.ReIndexAsync();
+ 
+        
         if (DataType != DataManager.DataType.AutoTile)
         {
-            EditMenuItems.Add(new DataOpContainer("Resave all as File", () => Node.ResaveAllAsync(false)));
-            EditMenuItems.Add(new DataOpContainer("Resave all as Diff", () => Node.ResaveAllAsync(true)));
+            var resaveFile = new MenuItem { Header = "Resave all as File" };
+            resaveFile.Click += async (s, e) => await Node.ResaveAllAsync(false);
+            EditMenuItems.Add(resaveFile);
+
+            var resaveDiff = new MenuItem { Header = "Resave all as Diff" };
+            resaveDiff.Click += async (s, e) => await Node.ResaveAllAsync(true);
+            EditMenuItems.Add(resaveDiff);
         }
         else
         {
-            EditMenuItems.Add(new DataOpContainer("Import DTEF", ImportDtefAsync));
-            // EditMenuItems.Add(new DataOpContainer("Export as DTEF", ExportDtefAsync));
+            var importDtef = new MenuItem { Header = "Import DTEF" };
+            importDtef.Click += async (s, e) => await ImportDtefAsync();
+            EditMenuItems.Add(importDtef);
         }
     }
 
@@ -319,7 +329,7 @@ public async Task AddItem()
         DataListEntry data = new(vm.Name, "");
         Items.Add(data);
         UpdateVisibleItems(SearchFilter);
-
+        AddChildItemUnderParent(data);
 
         // TODO: Determine whether to add the new item to the tree
         // SubNodes.Add(_nodeFactory.CreateDataItemNode<DevEditPageViewModel>(assetName, $"{assetName}:", "Icons.GhostFill"));
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/EditorPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/EditorPageViewModel.cs
index 569a9519..18ce4bfc 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/EditorPageViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/EditorPageViewModel.cs
@@ -162,18 +162,18 @@ public void SetPageTitleFromNode(NodeBase node)
 
     public void SetPageTitle(string title, string icon)
     {
-        _title = title;
-        _icon = icon;
+        Title = title;
+        Icon = icon;
     }
     
     public void SetTitle(string title)
     {
-        _title = title;
+        Title = title;
     }
     
     public void SetIcon(string icon)
     {
-        _icon = icon;
+        Icon = icon;
     }
     
     // public RepositoryNode Node
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/EmptyPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/EmptyPageViewModel.cs
new file mode 100644
index 00000000..7433ec55
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/EmptyPageViewModel.cs
@@ -0,0 +1,13 @@
+using System;
+
+namespace RogueEssence.Dev.ViewModels;
+
+public class EmptyPageViewModel : EditorPageViewModel
+{
+    public override bool AddNewTab => false;
+    
+    public EmptyPageViewModel(EditorContext context, NodeBase node, Action<EditorPageViewModel> onPageOpen = null) : base(context, node, onPageOpen)
+    {
+    }
+    
+}
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/GroundEditorPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/GroundEditorPageViewModel.cs
index 74697a7c..23b27766 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/GroundEditorPageViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/GroundEditorPageViewModel.cs
@@ -1,12 +1,743 @@
 using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Reactive.Linq;
+using System.Threading.Tasks;
+using Avalonia.Controls;
+using Avalonia.Platform.Storage;
+using Avalonia.Threading;
+using ReactiveUI;
+using RogueElements;
+using RogueEssence.Content;
+using RogueEssence.Data;
 using RogueEssence.Dev.Services;
+using RogueEssence.Dev.Views;
+using RogueEssence.Dungeon;
+using RogueEssence.Ground;
+using RogueEssence.Menu;
+using RogueEssence.Script;
 
 namespace RogueEssence.Dev.ViewModels;
 
-public class GroundEditorPageViewModel : EditorPageViewModel
+public class GroundEditorPageViewModel : EditorPageViewModel, IGroundEditor, IPreCreatePage, IPageReloadable
 {
-    // public override string Title => "Ground Editor Long Name";
+    // Keeps track of whether the map editor while testing in-game
+    private bool _allowEdit;
+    public bool AllowEdit
+    {
+        get { return _allowEdit; }
+        set
+        {
+            this.RaiseAndSetIfChanged(ref _allowEdit, value);
+        }
+    }
     
-    public GroundEditorPageViewModel(EditorContext context, NodeBase node, Action<EditorPageViewModel> onPageOpen = null) : base(context, node, onPageOpen)
-    { }
+
+    // This is probably not the ideal way of doing this...
+    public static void OnPreCreate()
+    {
+        lock (GameBase.lockObj)
+        {
+            Views.DevForm form = (Views.DevForm)DiagManager.Instance.DevEditor;
+            if (form.GroundEditorPage == null)
+            {
+                LuaEngine.Instance.BreakScripts();
+                MenuManager.Instance.ClearMenus();
+                if (ZoneManager.Instance.CurrentGround != null)
+                    GameManager.Instance.SceneOutcome = GameManager.Instance.MoveToEditor(true, ZoneManager.Instance.CurrentGround.AssetName);
+                else
+                    GameManager.Instance.SceneOutcome = GameManager.Instance.MoveToEditor(true, "");
+            }
+        }
+    }
+    public bool Active { get; private set; }
+
+    public UndoStack Edits { get; }
+    
+    public GroundEditorPageViewModel(EditorContext context, NodeBase node,
+        Action<EditorPageViewModel> onPageOpen = null) : base(context, node, onPageOpen)
+    {
+        Edits = new UndoStack();
+    }
+
+    public GroundTabTexturesViewModel Textures { get; set; }
+    public GroundTabDecorationsViewModel Decorations { get; set; }
+    public GroundTabWallsViewModel Walls { get; set; }
+    public GroundTabEntitiesViewModel Entities { get; set; }
+    public GroundTabPropertiesViewModel Properties { get; set; }
+    public GroundTabStringsViewModel Strings { get; set; }
+    public GroundTabScriptViewModel Script { get; set; }
+
+    public void Reload()
+    {
+        _reload();
+    }
+
+    public override void OnPageLoad()
+    {
+        _reload();
+        this.WhenAnyValue(x => x.CurrentFile)
+            .Select(file => string.IsNullOrEmpty(file) ? "New File" : Path.GetFileNameWithoutExtension(file))
+            .Subscribe(SetTitle);
+    }
+    
+    public void Close()
+    {
+        DiagManager.Instance.DevEditor.GroundEditor = null;
+        _context.TabEvents.RemoveTab(this);
+    }
+    
+    private void _reload()
+    {
+        AllowEdit = true;
+        DiagManager.Instance.DevEditor.GroundEditor = this;
+
+        DevForm.ExecuteOrInvoke(() =>
+        {
+            Textures = new GroundTabTexturesViewModel(_context);
+            Decorations = new GroundTabDecorationsViewModel();
+            Walls = new GroundTabWallsViewModel();
+            Entities = new GroundTabEntitiesViewModel();
+            Properties = new GroundTabPropertiesViewModel(_context, this);
+            Strings = new GroundTabStringsViewModel();
+            Script = new GroundTabScriptViewModel(_context);
+            CurrentFile = "";
+            LoadFromCurrentGround();
+            Active = true;
+        });
+        
+        
+       
+        base.OnPageLoad();
+        
+    }
+    
+    private string currentFile;
+
+    public string CurrentFile
+    {
+        get => currentFile;
+        set => this.RaiseAndSetIfChanged(ref currentFile, value);
+    }
+
+    private int selectedTabIndex;
+
+    public int SelectedTabIndex
+    {
+        get => selectedTabIndex;
+        set
+        {
+            this.SetIfChanged(ref selectedTabIndex, value);
+            TabChanged();
+        }
+    }
+
+
+    public void mnuNew_Click()
+    {
+        CurrentFile = "";
+
+        lock (GameBase.lockObj) //Schedule the map creation
+            DoNew();
+    }
+
+    public async void mnuOpen_Click()
+    {
+        string mapDir = Path.GetFullPath(PathMod.ModPath(DataManager.GROUND_PATH));
+
+        var options = new FilePickerOpenOptions
+        {
+            Title = "Open .rsground File",
+            AllowMultiple = false,
+            FileTypeFilter =
+            [
+                new FilePickerFileType("Ground Files")
+                {
+                    Patterns = ["*." + DataManager.GROUND_EXT.Substring(1)]
+                }
+            ]
+        };
+
+        await Dispatcher.UIThread.InvokeAsync(async () =>
+        {
+            string result = await _context.DialogService.ShowFilePickerAsync(options, mapDir);
+
+      
+            if (!string.IsNullOrEmpty(result))
+            {
+                bool legalPath = false;
+                foreach (string proposedPath in PathMod.FallbackPaths(DataManager.GROUND_PATH))
+                {
+                    if (comparePaths(proposedPath, Path.GetDirectoryName(result)))
+                        legalPath = true;
+                }
+
+                if (!legalPath)
+                    await MessageBoxWindowView.Show(_context.DialogService,
+                        String.Format("Map can only be loaded from:\n{0}\nOr one of its parents.",
+                            PathMod.ModPath(DataManager.GROUND_PATH)), "Error",
+                        MessageBoxWindowView.MessageBoxButtons.Ok);
+                else
+                {
+                    lock (GameBase.lockObj)
+                        DoLoad(Path.GetFileNameWithoutExtension(result));
+                }
+            }
+        });
+    }
+
+    public async Task<bool> mnuSave_Click()
+    {
+        if (CurrentFile == "")
+            return
+                await mnuSaveAs_Click(); //Since its the same thing, might as well re-use the function! It makes everyone's lives easier!
+        else
+        {
+            string reqDir = PathMod.HardMod(DataManager.GROUND_PATH);
+            string result = Path.Join(reqDir, Path.GetFileName(CurrentFile));
+            lock (GameBase.lockObj)
+            {
+                string oldFilename = CurrentFile;
+                DoSave(ZoneManager.Instance.CurrentGround, result, oldFilename);
+            }
+
+            return true;
+        }
+    }
+
+    public async Task<bool> mnuSaveAs_Click()
+    {
+        string mapDir = Path.GetFullPath(PathMod.ModPath(DataManager.GROUND_PATH));
+
+        var options = new FilePickerSaveOptions
+        {
+            FileTypeChoices =
+            [
+                new FilePickerFileType("Ground Files")
+                {
+                    Patterns = [$"*{DataManager.GROUND_EXT}"]
+                }
+            ]
+        };
+
+        await Dispatcher.UIThread.InvokeAsync(async () =>
+        {
+            string result = await _context.DialogService.TryGetSaveFileAsync(options, mapDir);
+
+            if (!string.IsNullOrEmpty(result))
+            {
+                string reqDir = PathMod.HardMod(DataManager.GROUND_PATH);
+                if (!comparePaths(reqDir, Path.GetDirectoryName(result)))
+                    await MessageBoxWindowView.Show(_context.DialogService,
+                        string.Format("Map can only be saved to:\n{0}", reqDir),
+                        "Error", MessageBoxWindowView.MessageBoxButtons.Ok);
+                else if (Path.GetFileName(result).Contains(" "))
+                    await MessageBoxWindowView.Show(_context.DialogService,
+                        string.Format("Save file should not contain white space:\n{0}", Path.GetFileName(result)),
+                        "Error", MessageBoxWindowView.MessageBoxButtons.Ok);
+                else
+                {
+                    lock (GameBase.lockObj)
+                    {
+                        string oldFilename = CurrentFile;
+                        DoSave(ZoneManager.Instance.CurrentGround, result, oldFilename);
+                    }
+
+                    return true;
+                }
+            }
+            return false;
+        });
+        return false;
+    }
+    
+    private bool silentClose;
+    public void SilentClose()
+    {
+        silentClose = true;
+        // Close();
+    }
+
+
+    public async void mnuTest_Click()
+    {
+        bool saved = await mnuSave_Click();
+        if (saved)
+        {
+            lock (GameBase.lockObj)
+            {
+                DevForm form = (DevForm)DiagManager.Instance.DevEditor;
+                form.GroundEditorPage.SilentClose();
+                form.GroundEditorPage = null;
+                GameManager.Instance.SceneOutcome =
+                    GameManager.Instance.TestWarp(ZoneManager.Instance.CurrentGround.AssetName, true,
+                        MathUtils.Rand.NextUInt64());
+                AllowEdit = false;
+            }
+        }
+    }
+
+    public async void mnuImportFromPng_Click()
+    {
+        string mapDir = Path.GetFullPath(PathMod.ModPath(DataManager.GROUND_PATH));
+
+        var options = new FilePickerOpenOptions
+        {
+            Title = "Open .png File",
+            AllowMultiple = false,
+            FileTypeFilter =
+            [
+                new FilePickerFileType("PNG Files")
+                {
+                    Patterns = ["*.png"]
+                }
+            ]
+        };
+
+        await Dispatcher.UIThread.InvokeAsync(async () =>
+        {
+            string result = await _context.DialogService.ShowFilePickerAsync(options, mapDir);
+
+            if (!string.IsNullOrEmpty(result))
+                DoImportPng(result);
+        });
+    }
+
+
+    public void mnuClearLayer_Click()
+    {
+        lock (GameBase.lockObj)
+            DoClearLayer();
+    }
+
+
+    public async void mnuImportFromTileset_Click()
+    {
+        if (Textures.TileBrowser.CurrentTileset == "")
+            await MessageBoxWindowView.Show(_context.DialogService, String.Format("No tileset to import!"), "Error",
+                MessageBoxWindowView.MessageBoxButtons.Ok);
+        else
+        {
+            lock (GameBase.lockObj)
+                DoImportTileset(Textures.TileBrowser.CurrentTileset);
+        }
+    }
+    
+    
+
+
+    public async void mnuReSize_Click()
+    {
+        MapResizeWindowViewModel vm = new MapResizeWindowViewModel(ZoneManager.Instance.CurrentGround.Width, ZoneManager.Instance.CurrentGround.Height);
+        bool result = await _context.DialogService.ShowDialogAsync<MapResizeWindowViewModel, bool>(vm, "Resize Map");
+        lock (GameBase.lockObj)
+        {
+            if (result)
+            {
+                //TODO: support undo for this
+                DiagManager.Instance.DevEditor.GroundEditor.Edits.Clear();
+        
+                DiagManager.Instance.LoadMsg = "Resizing Map...";
+                DevForm.EnterLoadPhase(GameBase.LoadPhase.Content);
+        
+                ZoneManager.Instance.CurrentGround.ResizeJustified(vm.MapWidth, vm.MapHeight,
+                    vm.ResizeDir);
+        
+                DevForm.EnterLoadPhase(GameBase.LoadPhase.Ready);
+            }
+        }
+    }
+
+    public async void mnuReTile_Click()
+    {
+        
+        MapRetileWindowViewModel vm = new MapRetileWindowViewModel(ZoneManager.Instance.CurrentGround.TileSize, "Tile size must be divisible by 8. All textures will be erased from all layers upon completing this operation.");
+
+        bool result = await _context.DialogService.ShowDialogAsync<MapRetileWindowViewModel, bool>(vm, "Tileset Size");
+
+        if (result)
+        {
+            lock (GameBase.lockObj)
+            {
+                bool sizeChanged = vm.TileSize != ZoneManager.Instance.CurrentGround.TileSize;
+                if (result && sizeChanged)
+                {
+                    //TODO: support undo for this
+                    DiagManager.Instance.DevEditor.GroundEditor.Edits.Clear();
+
+                    DiagManager.Instance.LoadMsg = "Retiling Map...";
+                    DevForm.EnterLoadPhase(GameBase.LoadPhase.Content);
+
+                    ZoneManager.Instance.CurrentGround.Retile(vm.TileSize / GraphicsManager.TEX_SIZE);
+
+                    Textures.TileBrowser.TileSize = ZoneManager.Instance.CurrentGround.TileSize;
+                    Textures.AutotileBrowser.TileSize = ZoneManager.Instance.CurrentGround.TileSize;
+                    ZoneManager.Instance.CurrentGround.BlankBG = new AutoTile();
+                    Properties.BlankBG.LoadFromSource(ZoneManager.Instance.CurrentGround.BlankBG);
+
+                    DevForm.EnterLoadPhase(GameBase.LoadPhase.Ready);
+                }
+            }
+        }
+    }
+    
+    public override void OnPageRemoved()
+    {
+        base.OnPageRemoved();
+        Active = false;
+        if (!silentClose)
+            GameManager.Instance.SceneOutcome = exitGroundEdit();
+        Node.SubNodes.Clear();
+    }
+
+    private IEnumerator<YieldInstruction> exitGroundEdit()
+    {
+        DevForm form = (DevForm)DiagManager.Instance.DevEditor;
+        form.GroundEditorPage = null;
+
+        //move to the previous scene or the title, if there was none
+        if (DataManager.Instance.Save != null && DataManager.Instance.Save.NextDest.IsValid())
+            yield return CoroutineManager.Instance.StartCoroutine(GameManager.Instance.MoveToZone(DataManager.Instance.Save.NextDest, true, false));
+        else
+            yield return CoroutineManager.Instance.StartCoroutine(GameManager.Instance.RestartToTitle());
+    }
+    
+    public void mnuUndo_Click()
+    {
+        if (DiagManager.Instance.DevEditor.GroundEditor.Edits.CanUndo)
+        {
+            DiagManager.Instance.DevEditor.GroundEditor.Edits.Undo();
+            ProcessUndo();
+        }
+    }
+
+    public void mnuRedo_Click()
+    {
+        if (DiagManager.Instance.DevEditor.GroundEditor.Edits.CanRedo)
+            DiagManager.Instance.DevEditor.GroundEditor.Edits.Redo();
+    }
+
+    private void DoNew()
+    {
+        DiagManager.Instance.DevEditor.GroundEditor.Edits.Clear();
+        //take all the necessary steps before and after moving to the map
+
+        DiagManager.Instance.LoadMsg = "Loading Map...";
+        DevForm.EnterLoadPhase(GameBase.LoadPhase.Content);
+        GameManager.Instance.ForceReady();
+
+        ZoneManager.Instance.CurrentZone.DevNewGround();
+        ZoneManager.Instance.CurrentGround.OnEditorInit();
+
+        loadEditorSettings();
+        DevForm.EnterLoadPhase(GameBase.LoadPhase.Ready);
+    }
+
+    private void DoLoad(string mapName)
+    {
+        DiagManager.Instance.DevEditor.GroundEditor.Edits.Clear();
+        //take all the necessary steps before and after moving to the map
+
+        DiagManager.Instance.LoadMsg = "Loading Map...";
+        DevForm.EnterLoadPhase(GameBase.LoadPhase.Content);
+        GameManager.Instance.ForceReady();
+
+        ZoneManager.Instance.CurrentZone.DevLoadGround(mapName);
+        ZoneManager.Instance.CurrentGround.OnEditorInit();
+
+        CurrentFile = PathMod.ModPath(Path.Combine(DataManager.GROUND_PATH, mapName + DataManager.GROUND_EXT));
+        loadEditorSettings();
+        DevForm.EnterLoadPhase(GameBase.LoadPhase.Ready);
+    }
+
+    public void LoadFromCurrentGround()
+    {
+        if (ZoneManager.Instance.CurrentGround.AssetName != "")
+            CurrentFile = PathMod.ModPath(Path.Combine(DataManager.GROUND_PATH,
+                ZoneManager.Instance.CurrentGround.AssetName + DataManager.GROUND_EXT));
+        else
+            CurrentFile = "";
+
+        loadEditorSettings();
+    }
+
+    private void loadEditorSettings()
+    {
+        Textures.Layers.LoadLayers();
+        Textures.TileBrowser.TileSize = ZoneManager.Instance.CurrentGround.TileSize;
+        Textures.AutotileBrowser.TileSize = ZoneManager.Instance.CurrentGround.TileSize;
+
+        Decorations.SelectEntity(null);
+        Decorations.Layers.LoadLayers();
+
+        Entities.SelectEntity(null);
+        Entities.Layers.LoadLayers();
+
+        Walls.SetupLayerVisibility();
+        Properties.LoadMapProperties();
+        Script.LoadScripts();
+        Strings.LoadStrings();
+    }
+
+    private void DoImportPng(string filePath)
+    {
+        DevForm.ExecuteOrPend(() => { tryImportPng(filePath); });
+
+        string sheetName = Path.GetFileNameWithoutExtension(filePath);
+        lock (GameBase.lockObj)
+        {
+            Textures.TileBrowser.UpdateTilesList();
+        }
+
+        Textures.TileBrowser.SelectTileset(sheetName);
+    }
+
+    private void tryImportPng(string filePath)
+    {
+        lock (GameBase.lockObj)
+        {
+            string sheetName = Path.GetFileNameWithoutExtension(filePath);
+            string outputFile = PathMod.HardMod(String.Format(GraphicsManager.TILE_PATTERN, sheetName));
+
+            //load into tilesets
+            using (BaseSheet tileset = BaseSheet.Import(filePath))
+            {
+                List<BaseSheet[]> tileList = new List<BaseSheet[]>();
+                tileList.Add(new BaseSheet[] { tileset });
+                ImportHelper.SaveTileSheet(tileList, outputFile, ZoneManager.Instance.CurrentGround.TileSize);
+            }
+
+            GraphicsManager.RebuildIndices(GraphicsManager.AssetType.Tile);
+            GraphicsManager.ClearCaches(GraphicsManager.AssetType.Tile);
+            DevDataManager.ClearCaches();
+        }
+    }
+
+    private void DoClearLayer()
+    {
+        //TODO: support undo for this
+        DiagManager.Instance.DevEditor.GroundEditor.Edits.Clear();
+
+        DiagManager.Instance.LoadMsg = "Loading Map...";
+        DevForm.EnterLoadPhase(GameBase.LoadPhase.Content);
+
+        //set tilesets
+        for (int yy = 0; yy < ZoneManager.Instance.CurrentGround.Height; yy++)
+        {
+            for (int xx = 0; xx < ZoneManager.Instance.CurrentGround.Width; xx++)
+                ZoneManager.Instance.CurrentGround.Layers[Textures.Layers.ChosenLayer].Tiles[xx][yy] = new AutoTile();
+        }
+
+        DevForm.EnterLoadPhase(GameBase.LoadPhase.Ready);
+    }
+
+    private void DoImportTileset(string sheetName)
+    {
+        //TODO: support undo for this
+        DiagManager.Instance.DevEditor.GroundEditor.Edits.Clear();
+
+        Loc newSize = GraphicsManager.TileIndex.GetTileDims(sheetName);
+
+        DiagManager.Instance.LoadMsg = "Loading Map...";
+        DevForm.EnterLoadPhase(GameBase.LoadPhase.Content);
+
+        ZoneManager.Instance.CurrentGround.ResizeJustified(
+            Math.Max(newSize.X, ZoneManager.Instance.CurrentGround.Width),
+            Math.Max(newSize.Y, ZoneManager.Instance.CurrentGround.Height), Dir8.UpLeft);
+
+        //set tilesets
+        for (int yy = 0; yy < newSize.Y; yy++)
+        {
+            for (int xx = 0; xx < newSize.X; xx++)
+            {
+                AutoTile tile = new AutoTile();
+                TileFrame newFrame = new TileFrame(new Loc(xx, yy), sheetName);
+                //check for emptiness
+                long tilePos = GraphicsManager.TileIndex.GetPosition(newFrame.Sheet, newFrame.TexLoc);
+                if (tilePos > 0)
+                    tile.Layers.Add(new TileLayer(newFrame));
+
+                ZoneManager.Instance.CurrentGround.Layers[Textures.Layers.ChosenLayer].Tiles[xx][yy] = tile;
+            }
+        }
+
+        DevForm.EnterLoadPhase(GameBase.LoadPhase.Ready);
+    }
+
+    //TODO: standardize adding of frames
+    private void DoImportTilesetToFrames(string sheetName)
+    {
+        //TODO: support undo for this
+        DiagManager.Instance.DevEditor.GroundEditor.Edits.Clear();
+
+        Loc newSize = GraphicsManager.TileIndex.GetTileDims(sheetName);
+
+        DiagManager.Instance.LoadMsg = "Loading Map...";
+        DevForm.EnterLoadPhase(GameBase.LoadPhase.Content);
+
+        ZoneManager.Instance.CurrentGround.ResizeJustified(
+            Math.Max(newSize.X, ZoneManager.Instance.CurrentGround.Width),
+            Math.Max(newSize.Y, ZoneManager.Instance.CurrentGround.Height), Dir8.UpLeft);
+
+        //count highest frames
+        int maxFrames = 0;
+        for (int yy = 0; yy < newSize.Y; yy++)
+        {
+            for (int xx = 0; xx < newSize.X; xx++)
+            {
+                AutoTile tile = ZoneManager.Instance.CurrentGround.Layers[Textures.Layers.ChosenLayer].Tiles[xx][yy];
+                if (tile.Layers.Count > 0)
+                    maxFrames = Math.Max(tile.Layers[0].Frames.Count, maxFrames);
+            }
+        }
+        
+
+        //set tilesets
+        for (int yy = 0; yy < newSize.Y; yy++)
+        {
+            for (int xx = 0; xx < newSize.X; xx++)
+            {
+                AutoTile tile = ZoneManager.Instance.CurrentGround.Layers[Textures.Layers.ChosenLayer].Tiles[xx][yy];
+                TileFrame newFrame = new TileFrame(new Loc(xx, yy), sheetName);
+                //check for emptiness
+                long tilePos = GraphicsManager.TileIndex.GetPosition(newFrame.Sheet, newFrame.TexLoc);
+                if (tilePos > 0)
+                {
+                    if (tile.Layers.Count == 0)
+                        tile.Layers.Add(new TileLayer(60));
+                    while (tile.Layers[0].Frames.Count < maxFrames)
+                        tile.Layers[0].Frames.Add(TileFrame.Empty);
+                    tile.Layers[0].Frames.Add(newFrame);
+                }
+            }
+        }
+
+        DevForm.EnterLoadPhase(GameBase.LoadPhase.Ready);
+    }
+
+    private void DoSave(GroundMap curgrnd, string filepath, string oldfname)
+    {
+        curgrnd.AssetName = Path.GetFileNameWithoutExtension(filepath); //Set the assetname to the file name!
+        DataManager.SaveObject(curgrnd, filepath);
+
+        //Actually create the script folder, and default script file.
+        CreateOrCopyScriptData(oldfname, filepath);
+        //create or update the strings
+        Strings.SaveStrings();
+
+        CurrentFile = filepath;
+    }
+
+
+    private static bool comparePaths(string path1, string path2)
+    {
+        return String.Compare(Path.GetFullPath(path1).TrimEnd('\\').TrimEnd('/'),
+            Path.GetFullPath(path2).TrimEnd('\\').TrimEnd('/'),
+            StringComparison.InvariantCultureIgnoreCase) == 0;
+    }
+
+    /// <summary>
+    /// Call this when saving as, so that if the previous map name has a script folder with data in it,
+    /// we can copy it. And if it doesn't, we create a "blank slate" one!
+    /// </summary>
+    /// <param name="oldfilepath"></param>
+    /// <param name="newfilepath"></param>
+    public static void CreateOrCopyScriptData(string oldfilepath, string newfilepath)
+    {
+        //If we are not resaving an old map, create a new script file
+        if (String.IsNullOrEmpty(oldfilepath))
+        {
+            //We just create a new one straight away!
+            LuaEngine.Instance.CreateGroundMapScriptDir(Path.GetFileNameWithoutExtension(newfilepath));
+        }
+        else
+        {
+            //just make the dir path
+            string mappath = LuaEngine.MakeGroundMapScriptPath(Path.GetFileNameWithoutExtension(newfilepath), "");
+
+            //Check if files exists already
+            if (!Directory.Exists(mappath))
+                Directory.CreateDirectory(mappath);
+        }
+    }
+
+    public void TabChanged()
+    {
+        switch (selectedTabIndex)
+        {
+            case 0: //Textures
+                GroundEditScene.Instance.EditMode = GroundEditScene.EditorMode.Texture;
+                break;
+            case 1: //Decorations
+                GroundEditScene.Instance.EditMode = GroundEditScene.EditorMode.Decoration;
+                Decorations.TabbedIn();
+                break;
+            case 2: //Walls
+                GroundEditScene.Instance.EditMode = GroundEditScene.EditorMode.Wall;
+                break;
+            case 3: //Entities
+                GroundEditScene.Instance.EditMode = GroundEditScene.EditorMode.Entity;
+                Entities.TabbedIn();
+                break;
+            default:
+                GroundEditScene.Instance.EditMode = GroundEditScene.EditorMode.Other;
+                break;
+        }
+
+        if (selectedTabIndex != 1)
+            Decorations.TabbedOut();
+        if (selectedTabIndex != 3)
+            Entities.TabbedOut();
+    }
+
+    public void ProcessInput(InputManager input)
+    {
+        lock (GameBase.lockObj)
+        {
+            if (input.BaseKeyDown(Microsoft.Xna.Framework.Input.Keys.LeftControl))
+            {
+                if (input.BaseKeyPressed(Microsoft.Xna.Framework.Input.Keys.Z) &&
+                    input.BaseKeyDown(Microsoft.Xna.Framework.Input.Keys.LeftShift))
+                {
+                    mnuRedo_Click();
+                    return;
+                }
+                else if (input.BaseKeyPressed(Microsoft.Xna.Framework.Input.Keys.Z))
+                {
+                    mnuUndo_Click();
+                    return;
+                }
+            }
+
+            switch (selectedTabIndex)
+            {
+                case 0: //Textures
+                    Textures.ProcessInput(input);
+                    break;
+                case 1: //Decorations
+                    Decorations.ProcessInput(input);
+                    break;
+                case 2: //Walls
+                    Walls.ProcessInput(input);
+                    break;
+                case 3: //Entities
+                    Entities.ProcessInput(input);
+                    break;
+            }
+        }
+    }
+
+    public void ProcessUndo()
+    {
+        lock (GameBase.lockObj)
+        {
+            switch (selectedTabIndex)
+            {
+                case 3: //Entities
+                    Entities.ProcessUndo();
+                    break;
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/MapEditorPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/MapEditorPageViewModel.cs
index d0b3d4a0..4f471d60 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/MapEditorPageViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/MapEditorPageViewModel.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Reactive.Linq;
 using System.Threading.Tasks;
 using Avalonia.Controls;
 using Avalonia.Platform.Storage;
@@ -27,7 +28,7 @@ public static void OnPreCreate()
         lock (GameBase.lockObj)
         {
             Views.DevForm form = (Views.DevForm)DiagManager.Instance.DevEditor;
-            if (form.MapEditPage == null)
+            if (form.MapEditorPage == null)
             {
                 LuaEngine.Instance.BreakScripts();
                 MenuManager.Instance.ClearMenus();
@@ -39,8 +40,6 @@ public static void OnPreCreate()
         }
     }
     public bool Active { get; private set; }
-    
-    
 
     public UndoStack Edits { get; }
 
@@ -67,6 +66,8 @@ public MapEditorPageViewModel(
         Edits = new UndoStack();
     }
 
+   
+  
     private void _reload()
     {
         AllowEdit = true;
@@ -74,7 +75,7 @@ private void _reload()
 
         DevForm.ExecuteOrInvoke(() =>
         {
-            Textures = new MapTabTexturesViewModel();
+            Textures = new MapTabTexturesViewModel(_context);
             Decorations = new MapTabDecorationsViewModel();
             Terrain = new MapTabTerrainViewModel();
             Tiles = new MapTabTilesViewModel(_context, this);
@@ -107,6 +108,9 @@ public void Reload()
     public override void OnPageLoad()
     {
         _reload();
+        this.WhenAnyValue(x => x.CurrentFile)
+            .Select(file => string.IsNullOrEmpty(file) ? "New File" : Path.GetFileNameWithoutExtension(file))
+            .Subscribe(SetTitle);
     }
 
     public MapTabTexturesViewModel Textures { get; set; }
@@ -398,8 +402,8 @@ public async void mnuTest_Click()
             lock (GameBase.lockObj)
             {
                 DevForm form = (DevForm)DiagManager.Instance.DevEditor;
-                form.MapEditPage.SilentClose();
-                form.MapEditPage = null;
+                form.MapEditorPage.SilentClose();
+                form.MapEditorPage = null;
                 GameManager.Instance.SceneOutcome =
                     GameManager.Instance.TestWarp(ZoneManager.Instance.CurrentMap.AssetName, false,
                         MathUtils.Rand.NextUInt64());
@@ -454,31 +458,27 @@ await MessageBoxWindowView.Show(_context.DialogService, String.Format("No tilese
 
     public async void mnuReSize_Click()
     {
-        MapResizeWindow window = new MapResizeWindow();
-        MapResizeViewModel viewModel = new MapResizeViewModel(ZoneManager.Instance.CurrentMap.Width,
+        MapResizeWindowViewModel vm = new MapResizeWindowViewModel(ZoneManager.Instance.CurrentMap.Width,
             ZoneManager.Instance.CurrentMap.Height);
-        window.DataContext = viewModel;
-
-        DevForm form = (DevForm)DiagManager.Instance.DevEditor;
-        //
-        // bool result = await window.ShowDialog<bool>(form.MapEditPage);
-        //
-        // lock (GameBase.lockObj)
-        // {
-        //     if (result)
-        //     {
-        //         //TODO: support undo for this
-        //         DiagManager.Instance.DevEditor.MapEditor.Edits.Clear();
-        //
-        //         DiagManager.Instance.LoadMsg = "Resizing Map...";
-        //         DevForm.EnterLoadPhase(GameBase.LoadPhase.Content);
-        //
-        //         ZoneManager.Instance.CurrentMap.ResizeJustified(viewModel.MapWidth, viewModel.MapHeight,
-        //             viewModel.ResizeDir);
-        //
-        //         DevForm.EnterLoadPhase(GameBase.LoadPhase.Ready);
-        //     }
-        // }
+        
+        
+        bool result = await _context.DialogService.ShowDialogAsync<MapResizeWindowViewModel, bool>(vm, "Resize Map");
+        
+        lock (GameBase.lockObj)
+        {
+            if (result)
+            {
+                //TODO: support undo for this
+                DiagManager.Instance.DevEditor.MapEditor.Edits.Clear();
+        
+                DiagManager.Instance.LoadMsg = "Resizing Map...";
+                DevForm.EnterLoadPhase(GameBase.LoadPhase.Content);
+        
+                ZoneManager.Instance.CurrentMap.ResizeJustified(vm.MapWidth, vm.MapHeight, vm.ResizeDir);
+        
+                DevForm.EnterLoadPhase(GameBase.LoadPhase.Ready);
+            }
+        }
     }
 
     public void mnuUndo_Click()
@@ -864,14 +864,14 @@ public override void OnPageRemoved()
         Active = false;
         if (!silentClose)
             GameManager.Instance.SceneOutcome = exitMapEdit();
-        
+        Node.SubNodes.Clear();
     }
     
     
     private IEnumerator<YieldInstruction> exitMapEdit()
     {
         DevForm form = (DevForm)DiagManager.Instance.DevEditor;
-        form.MapEditPage = null;
+        form.MapEditorPage = null;
 
         //move to the previous scene or the title, if there was none
         if (DataManager.Instance.Save != null && DataManager.Instance.Save.NextDest.IsValid())
@@ -882,6 +882,7 @@ private IEnumerator<YieldInstruction> exitMapEdit()
     
     public void Close()
     {
+        DiagManager.Instance.DevEditor.MapEditor = null;
         _context.TabEvents.RemoveTab(this);
     }
 
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ModConfigPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ModConfigPageViewModel.cs
index 91b4f7e2..bf180bc2 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ModConfigPageViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ModConfigPageViewModel.cs
@@ -8,16 +8,16 @@
 
 namespace RogueEssence.Dev.ViewModels;
 
-public class ModConfigPageViewModel : EditorPageViewModel
+public class ModConfigPageViewModel : EditorPageViewModel<ModItemNode>
 {
     public Action OnOKValidAction;
     
-    private string _path;
 
+    public string Path => Node.Path;
     public ModConfigPageViewModel(EditorContext context, ModItemNode node,
         Action<EditorPageViewModel> onPageOpen = null) : base(context, node, onPageOpen)
     {
-        _path = node.Path;
+  
     }
 
     public void LoadDataFromPath()
@@ -27,7 +27,7 @@ public void LoadDataFromPath()
         // PathMod.SaveModDetails(fullPath, resultHeader);
 
 
-        ModHeader header = PathMod.GetModDetails(PathMod.FromApp(_path));
+        ModHeader header = PathMod.GetModDetails(PathMod.FromApp(Path));
         Name = header.Name;
         Namespace = header.Namespace;
         Author = header.Author;
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ModListPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ModListPageViewModel.cs
index 5bc50944..2e0a9ce1 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ModListPageViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ModListPageViewModel.cs
@@ -14,36 +14,6 @@
 
 namespace RogueEssence.Dev.ViewModels;
 
-public class ModsEntryViewModel : ViewModelBase
-{
-    private string _name;
-
-    public string Name
-    {
-        get => _name;
-        set => this.RaiseAndSetIfChanged(ref _name, value);
-    }
-
-    private string _editNamespace;
-
-    public string Namespace
-    {
-        get => _editNamespace;
-        set => this.RaiseAndSetIfChanged(ref _editNamespace, value);
-    }
-
-    public string Path;
-
-    public ModsEntryViewModel(string name, string newNamespace, string fullPath)
-    {
-        this._name = name;
-        this._editNamespace = newNamespace;
-        this.Path = fullPath;
-    }
-    
-    public string Display => $"{_editNamespace}: {_name}";
-}
-
 public class ModListPageViewModel : EditorPageViewModel
 {
     private string _searchFilter = string.Empty;
@@ -67,9 +37,7 @@ public ModsEntryViewModel? SelectedItem
     public ObservableCollection<ModsEntryViewModel> Items { get; } = new();
     public ObservableCollection<ModsEntryViewModel> FilteredItems { get; } = new();
 
-    public ObservableCollection<ModsEntryViewModel> EditMenuItems { get; } = new();
-
-
+    
     private string currentMod;
 
     public string CurrentMod
@@ -105,12 +73,16 @@ private void doSwitch()
 
             DiagManager.Instance.PrintModSettings();
             DiagManager.Instance.SaveModSettings();
+            DiagManager.Instance.DevEditor.MapEditor = null;
+            DiagManager.Instance.DevEditor.GroundEditor = null;
         }
     }
+    ModManagerViewModel _modManager;
 
-    public ModListPageViewModel(EditorContext context, NodeBase node, Action<EditorPageViewModel> onPageOpen = null) :
+    public ModListPageViewModel(EditorContext context, ModManagerViewModel modManager, NodeBase node, Action<EditorPageViewModel> onPageOpen = null) :
         base(context, node, onPageOpen)
     {
+        _modManager = modManager;
     }
     private void UpdateVisibleItems(string filter)
     {
@@ -134,14 +106,11 @@ public override void OnPageLoad()
     
     public async void btnAdd_Click()
     {
-        ModConfigWindowView window = new ModConfigWindowView();
-        ModHeader header = new ModHeader("", "", "", "", "", Guid.NewGuid(), new Version(), new Version(),
-            PathMod.ModType.Mod, new RelatedMod[0] { });
-        ModConfigViewModel2 vm = new ModConfigViewModel2(_context.DialogService, header);
-        window.DataContext = vm;
+       
 
-        DevForm form = (DevForm)DiagManager.Instance.DevEditor;
-        bool result = await window.ShowDialog<bool>(form);
+        ModNameWindowViewModel vm = new ModNameWindowViewModel();
+
+        bool result = await _context.DialogService.ShowDialogAsync<ModNameWindowViewModel, bool>(vm, "Add Mod and Namespace");
         if (!result)
             return;
 
@@ -174,15 +143,15 @@ await MessageBoxWindowView.Show(_context.DialogService, newName + " (Namespace)
             }
         }
 
-        ModsEntryViewModel newNode =
+        ModsEntryViewModel newEntry =
             new ModsEntryViewModel(newName, newNamespace, Path.Combine(PathMod.MODS_FOLDER, newName));
-        string fullPath = PathMod.FromApp(newNode.Path);
+        string fullPath = PathMod.FromApp(newEntry.Path);
         //add all asset folders
         Directory.CreateDirectory(fullPath);
         //create the mod xml
-        ModHeader newHeader = new ModHeader(fullPath, vm.Name.Trim(), vm.Author.Trim(), vm.Description.Trim(),
-            Text.Sanitize(vm.Namespace).ToLower(), Guid.Parse(vm.UUID), Version.Parse(vm.Version),
-            Version.Parse(vm.GameVersion), (PathMod.ModType)vm.ChosenModType, vm.GetRelationshipArray());
+        ModHeader newHeader = new ModHeader(fullPath, vm.Name.Trim(), "", "",
+            Text.Sanitize(vm.Namespace).ToLower(), Guid.NewGuid(), new Version(),
+            new Version(), PathMod.ModType.Mod, new RelatedMod[0]);
         PathMod.SaveModDetails(fullPath, newHeader);
 
         //add Strings
@@ -195,8 +164,9 @@ await MessageBoxWindowView.Show(_context.DialogService, newName + " (Namespace)
         LuaEngine.InitScriptFolders(fullPath, vm.Namespace);
 
         //add node
-        Items.Add(newNode);
+        Items.Add(newEntry);
         UpdateVisibleItems(SearchFilter);
+        await AddChildItemUnderParent(newEntry);
     }
     
     public async void btnDelete_Click()
@@ -219,6 +189,8 @@ public async void btnDelete_Click()
 
         //and then delete node
         Items.Remove(SelectedItem);
+        UpdateVisibleItems(SearchFilter);
+        
     }
     
     public async void btnEdit_Click()
@@ -258,7 +230,7 @@ public async Task AddChildItemUnderParent(ModsEntryViewModel entry)
 
                     page.OnOKValidAction = () =>
                     {
-                        string fullPath = PathMod.FromApp(PathMod.Quest.Path);
+                        string fullPath = PathMod.FromApp(page.Path);
                         ModHeader resultHeader = new ModHeader(PathMod.Quest.Path, page.Name.Trim(), page.Author.Trim(), page.Description.Trim(), Text.Sanitize(page.Namespace).ToLower(), Guid.Parse(page.UUID), Version.Parse(page.Vers), Version.Parse(page.GameVersion), (PathMod.ModType)page.ChosenModType, page.GetRelationshipArray());
                         PathMod.SaveModDetails(fullPath, resultHeader);
                     
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/ModSwitcherViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/ModSwitcherViewModel.cs
index 490bb1bd..637d9f67 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/ModSwitcherViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/ModSwitcherViewModel.cs
@@ -56,8 +56,6 @@ public ModsNodeViewModel CurrentMod
 
     public bool IsCurrent(ModsNodeViewModel head)
     { 
-        Console.WriteLine("0" + _mainWindow.ChosenMod);
-        Console.WriteLine("1" + head.Namespace);
         return head.Namespace == _mainWindow.ChosenMod.Namespace;
     }
     
@@ -75,6 +73,8 @@ private void _doSwitch(ModsNodeViewModel mod)
 
             DiagManager.Instance.PrintModSettings();
             DiagManager.Instance.SaveModSettings();
+            DiagManager.Instance.DevEditor.MapEditor = null;
+            // DiagManager.Instance.DevEditor.GroundEditor = null;
         }
     }
 }
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/ISpriteRootOperationStrategy.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/ISpriteRootOperationStrategy.cs
index 175d43e5..3f6d985d 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/ISpriteRootOperationStrategy.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/ISpriteRootOperationStrategy.cs
@@ -6,7 +6,5 @@ public interface ISpriteRootOperationStrategy
 {
     Task MassExportAsync();
     Task MassImportAsync();
-    Task ExportAsync(DataItemNode node);
     Task ImportAsync();
-    Task ReImportAsync();
 }
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/NodeBase.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/NodeBase.cs
index 599a613f..ee8b9012 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/NodeBase.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/NodeBase.cs
@@ -559,11 +559,7 @@ public SpriteRootNode(
 
     protected virtual ISpriteRootOperationStrategy CreateStrategy(IDialogService dialogService)
         => new SpriteRootAssetTypeStrategy(dialogService, this);
-
-    public async Task AddItem()
-    {
-        await _strategy.ImportAsync();
-    }
+    
 
     public async Task DeleteItem(string key)
     {
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/UserControls/LayerBoxViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/UserControls/LayerBoxViewModel.cs
index 3915c853..e5199f5a 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/UserControls/LayerBoxViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/UserControls/LayerBoxViewModel.cs
@@ -22,7 +22,34 @@ public LayerBoxViewModel(UndoStack stack)
         {
             this.edits = stack;
             Layers = new WrappedObservableCollection<T>();
+           
+            this.WhenAnyValue(x => x.ChosenLayer)
+                .Subscribe(_ =>
+                {
+                    _raiseChanges();
+                });
+            
+            Layers.CollectionChanged += (_, _) =>
+            {
+                _raiseChanges();
+
+            };
+            ChosenLayer = 0;
+        }
+
+
+        private void _raiseChanges()
+        {
+            this.RaisePropertyChanged(nameof(CanMoveUp));
+            this.RaisePropertyChanged(nameof(CanMoveDown));
+            this.RaisePropertyChanged(nameof(CanDupe));
+            this.RaisePropertyChanged(nameof(CanEdit));
         }
+        public bool CanMoveUp => chosenLayer > 0;
+        public bool CanMoveDown => chosenLayer < Layers.Count - 1;
+        public bool CanDupe => chosenLayer >= 0;
+        public bool CanEdit => CanDupe && Layers.Count > 1;
+
 
         public WrappedObservableCollection<T> Layers { get; }
         public void SetLayer(int idx, T val)
diff --git a/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabMods.axaml b/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabMods.axaml
index 9f119069..94892560 100644
--- a/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabMods.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabMods.axaml
@@ -7,7 +7,7 @@
              xmlns:converters="clr-namespace:RogueEssence.Dev.Converters"
              x:Class="RogueEssence.Dev.Views.DevTabMods">
   <Design.DataContext>
-    <vm:DevTabModsViewModel/>
+    <vm:ModManagerViewModel/>
   </Design.DataContext>
   <UserControl.Resources>
     <converters:NullableToStringConverter x:Key="NullableToStringConverter"/>
@@ -25,20 +25,20 @@
     </Grid.ColumnDefinitions>
     <TextBlock VerticalAlignment="Bottom" Text="{Binding CurrentMod, Converter={StaticResource NullableToStringConverter}, StringFormat=Currently Editing Mod: {0}}" Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2"></TextBlock>
     <Button Command="{Binding btnEdit_Click}" IsEnabled="{Binding CurrentMod, Converter={x:Static StringConverters.IsNotNullOrEmpty}}" Margin="4" Grid.Row="0" Grid.Column="2">Edit</Button>
-    <TreeView ItemsSource="{Binding Mods}" SelectedItem="{Binding ChosenMod}" SelectionMode="AlwaysSelected" Margin="4" Grid.Row="1" Grid.ColumnSpan="3">
-      <TreeView.DataTemplates>
-        <TreeDataTemplate DataType="vm:ModsNodeViewModel" ItemsSource="{Binding Nodes}">
-          <TextBlock VerticalAlignment="Center">
-            <TextBlock.Text>
-              <MultiBinding StringFormat="{} {0} / {1}">
-                <Binding Path="Name" Converter="{StaticResource NullableToStringConverter}"/>
-                <Binding Path="Namespace"/>
-              </MultiBinding>
-            </TextBlock.Text>
-          </TextBlock>
-        </TreeDataTemplate>
-      </TreeView.DataTemplates>
-    </TreeView>
+    <!-- <TreeView ItemsSource="{Binding Mods}" SelectedItem="{Binding ChosenMod}" SelectionMode="AlwaysSelected" Margin="4" Grid.Row="1" Grid.ColumnSpan="3"> -->
+    <!--   <TreeView.DataTemplates> -->
+    <!--     <TreeDataTemplate DataType="vm:ModsNodeViewModel" ItemsSource="{Binding Nodes}"> -->
+    <!--       <TextBlock VerticalAlignment="Center"> -->
+    <!--         <TextBlock.Text> -->
+    <!--           <MultiBinding StringFormat="{} {0} / {1}"> -->
+    <!--             <Binding Path="Name" Converter="{StaticResource NullableToStringConverter}"/> -->
+    <!--             <Binding Path="Namespace"/> -->
+    <!--           </MultiBinding> -->
+    <!--         </TextBlock.Text> -->
+    <!--       </TextBlock> -->
+    <!--     </TreeDataTemplate> -->
+    <!--   </TreeView.DataTemplates> -->
+    <!-- </TreeView> -->
     <Button Command="{Binding btnSwitch_Click}" Margin="4" Grid.Row="2" Grid.Column="0">Switch To</Button>
     <Button Command="{Binding btnAdd_Click}" Margin="4" Grid.Row="2" Grid.Column="1">Add New</Button>
     <Button Command="{Binding btnDelete_Click}" Margin="4" Grid.Row="2" Grid.Column="2">Delete</Button>
diff --git a/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabPlayer.axaml b/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabPlayer.axaml
index bcbbf943..55c91270 100644
--- a/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabPlayer.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabPlayer.axaml
@@ -24,18 +24,11 @@
     <NumericUpDown  Name="nudLevel" Value="{Binding Level}" Minimum="1" Maximum="100" Increment="1" Grid.Row="1" Grid.Column="0"/>
     <Button Classes="flat" Name="btnRollSkill" Command="{Binding btnRollSkill_Click}" Grid.Row="1" Grid.Column="1">Reroll Skills</Button>
     <TextBlock Margin="4,0" VerticalAlignment="Bottom" Grid.Row="2" Grid.Column="0">Species</TextBlock>
-    <Grid Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2">
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition/>
-        <ColumnDefinition Width="40"/>
-      </Grid.ColumnDefinitions>
+    <Grid Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2" ColumnDefinitions="*, Auto">
 	  <views:SearchComboBox Name="cbDexNum" ItemsSource="{Binding Monsters}" SelectedIndex="{Binding ChosenMonster}" Margin="4"/>
-	  <Button Classes="icon_button" Name="btnChangeOrder" Command="{Binding btnChangeOrder_Click}"  Grid.Column="1" ToolTip.Tip="Switch Ordering">
-        <Panel>
-          <Image Source="/Assets/AssetOrder.png" Width="20"
-                          Height="20" VerticalAlignment="Center" HorizontalAlignment="Center" />
-        </Panel>
-	  </Button>
+	    <Button Padding="8" Classes="secondary" Height="28" Width="28" Name="btnChangeOrder" Command="{Binding btnChangeOrder_Click}"  Grid.Column="1" ToolTip.Tip="Switch Ordering">
+          <Path Height="16" Width="16" Data="{StaticResource Icons.NumIndexChange}"></Path>
+	    </Button>
     </Grid>
     <TextBlock Margin="4,0" VerticalAlignment="Bottom" Grid.Row="4">Form</TextBlock>
 	  <views:SearchComboBox Name="cbForm" ItemsSource="{Binding Forms}" SelectedIndex="{Binding ChosenForm}" Margin="4" Grid.Row="5" Grid.ColumnSpan="2"/>
diff --git a/RogueEssence.Editor.Avalonia/Views/DialogBoxes/MapRetileWindow2.axaml b/RogueEssence.Editor.Avalonia/Views/DialogBoxes/MapRetileWindow2.axaml
index 75439dfa..9ad7f338 100644
--- a/RogueEssence.Editor.Avalonia/Views/DialogBoxes/MapRetileWindow2.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/DialogBoxes/MapRetileWindow2.axaml
@@ -6,7 +6,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         mc:Ignorable="d"
         x:Class="RogueEssence.Dev.Views.MapRetileWindow2"
-        Title="Tileset Size" Height="180" Width="280" Opened="Window_Loaded">
+        Title="Tileset Size" Height="200" Width="280" Opened="Window_Loaded">
   <Design.DataContext>
     <vm:MapRetileViewModel/>
   </Design.DataContext>
diff --git a/RogueEssence.Editor.Avalonia/Views/GroundEditForm/EntityBrowser.axaml b/RogueEssence.Editor.Avalonia/Views/GroundEditForm/EntityBrowser.axaml
index 7f679138..4e2d841b 100644
--- a/RogueEssence.Editor.Avalonia/Views/GroundEditForm/EntityBrowser.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/GroundEditForm/EntityBrowser.axaml
@@ -14,217 +14,119 @@
   <UserControl.Resources>
     <converters:IntInSetConverter x:Key="IntInSetConverter"/>
   </UserControl.Resources>
-  <Grid>
-    <Grid.RowDefinitions>
-      <RowDefinition Height="36"/>
-      <RowDefinition Height="36"/>
-      <RowDefinition Height="36"/>
-      <RowDefinition Height="42"/>
-      <RowDefinition Height="36"/>
-      <RowDefinition/>
-    </Grid.RowDefinitions>
-
-    <Grid Grid.Row="0" IsVisible="True">
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition Width="60"/>
-        <ColumnDefinition/>
-      </Grid.ColumnDefinitions>
+  <Grid RowDefinitions="36, 36, 36, 42, 36, *">
+    <Grid Grid.Row="0" IsVisible="True" ColumnDefinitions="60, *">
       <TextBlock Margin="4,2" Text="Type:" VerticalAlignment="Center" HorizontalAlignment="Right"/>
       <views:SearchComboBox Margin="4,2" Grid.Column="1" ItemsSource="{Binding EntityTypes}" SelectedIndex="{Binding ChosenEntityType}" IsEnabled="{Binding AllowEntTypes}"/>
     </Grid>
-    <Grid Grid.Row="1" IsVisible="True">
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition Width="60"/>
-        <ColumnDefinition/>
-      </Grid.ColumnDefinitions>
+    <Grid Grid.Row="1" IsVisible="True" ColumnDefinitions="60, *">
       <TextBlock Margin="4,2" Text="Name:" VerticalAlignment="Center" HorizontalAlignment="Right"/>
       <TextBox Text="{Binding EntName}" VerticalAlignment="Center" Margin="4,2" Grid.Column="1"/>
     </Grid>
-    <Grid Grid.Row="2" IsVisible="True">
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition Width="60"/>
-        <ColumnDefinition/>
-      </Grid.ColumnDefinitions>
+    <Grid Grid.Row="2" IsVisible="True" ColumnDefinitions="60, *">
       <TextBlock Margin="4,2" Text="Direction:" VerticalAlignment="Center" HorizontalAlignment="Right"/>
       <views:SearchComboBox Margin="4,2" Grid.Column="1" ItemsSource="{Binding Directions}" SelectedIndex="{Binding ChosenDirection}" IsEnabled="{Binding Path=ChosenEntityType, Converter={StaticResource IntInSetConverter}, ConverterParameter=0|1|2|3}"/>
     </Grid>
-    <Grid Grid.Row="3" IsVisible="True">
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition Width="60"/>
-        <ColumnDefinition/>
-        <ColumnDefinition/>
-      </Grid.ColumnDefinitions>
+    <Grid Grid.Row="3" IsVisible="True" ColumnDefinitions="60, *, *">
       <TextBlock Margin="4,2" Text="Bounds:" VerticalAlignment="Center" HorizontalAlignment="Right"/>
       <NumericUpDown Minimum="1" Value="{Binding BoundsX}" Margin="4,2" Grid.Column="1" IsEnabled="{Binding Path=ChosenEntityType, Converter={StaticResource IntInSetConverter}, ConverterParameter=0}"/>
       <NumericUpDown Minimum="1" Value="{Binding BoundsY}" Margin="4,2" Grid.Column="2" IsEnabled="{Binding Path=ChosenEntityType, Converter={StaticResource IntInSetConverter}, ConverterParameter=0}"/>
     </Grid>
-    <Grid Grid.Row="4" IsVisible="True">
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition Width="60"/>
-        <ColumnDefinition/>
-      </Grid.ColumnDefinitions>
+    <Grid Grid.Row="4" IsVisible="True" ColumnDefinitions="60, *">
       <TextBlock Margin="4,2" Text="Enabled:" VerticalAlignment="Center" HorizontalAlignment="Right"/>
       <CheckBox IsChecked="{Binding EntEnabled}" Margin="4,2" Grid.Column="1" />
     </Grid>
     
     <TabControl TabStripPlacement="Top" SelectedIndex="{Binding TabIndex}" IsVisible="{Binding Path=ChosenEntityType, Converter={StaticResource IntInSetConverter}, ConverterParameter=0|1|3}" Margin="0,2,0,0" Grid.Row="5">
-      <TabItem Header="Script" >
-        <Grid>
-          <Grid.RowDefinitions>
-            <RowDefinition Height="36"/>
-            <RowDefinition/>
-            <RowDefinition/>
-          </Grid.RowDefinitions>
-          <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="80"/>
-            <ColumnDefinition/>
-          </Grid.ColumnDefinitions>
-          <TextBlock Margin="4,2" Text="Trigger Type:" VerticalAlignment="Center" HorizontalAlignment="Right"/>
-          <views:SearchComboBox ItemsSource="{Binding TriggerTypes}" SelectedItem="{Binding ChosenTriggerType}" IsEnabled="{Binding Path=ChosenEntityType, Converter={StaticResource IntInSetConverter}, ConverterParameter=0|1}" VerticalAlignment="Center" Margin="4,2" Grid.Column="1"/>
-          <TextBlock Margin="4,2" Text="Callbacks:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="1"/>
-          <Border Margin="4,2" BorderThickness="1" BorderBrush="Black" Grid.Row="1" Grid.Column="1">
-            <ItemsControl ItemsSource="{Binding ScriptItems}">
-              <ItemsControl.ItemTemplate>
-                <DataTemplate>
-                  <Grid>
-                    <Grid.ColumnDefinitions>
-                      <ColumnDefinition Width="28"/>
-                      <ColumnDefinition/>
-                    </Grid.ColumnDefinitions>
-                    <CheckBox Margin="4" 
-                              IsEnabled="False"
-                              IsChecked="{Binding IsChecked}"/>
-                    <TextBlock Margin="0,4" Grid.Column="1" VerticalAlignment="Center"
-                      Text="{Binding EventType}"
-                      ToolTip.Tip="{Binding Definition}">
-                      <TextBlock.ContextMenu>
-                        <ContextMenu>
-                          <MenuItem Header="Copy Function" Command="{Binding mnuCopyFun_Click}"/>
-                        </ContextMenu>
-                      </TextBlock.ContextMenu>
-                    </TextBlock>
-                  </Grid>
-                </DataTemplate>
-              </ItemsControl.ItemTemplate>
-            </ItemsControl>
-          </Border>
-          <TextBlock Margin="4,2" Text="Spawn&#xA;Callbacks:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="2" IsVisible="{Binding Path=ChosenEntityType, Converter={StaticResource IntInSetConverter}, ConverterParameter=3}"/>
-          <Border Margin="4,2" BorderThickness="1" BorderBrush="Black" Grid.Row="2" Grid.Column="1" IsVisible="{Binding Path=ChosenEntityType, Converter={StaticResource IntInSetConverter}, ConverterParameter=3}">
-            <ItemsControl ItemsSource="{Binding SpawnScriptItems}">
-              <ItemsControl.ItemTemplate>
-                <DataTemplate>
-                  <CheckBox Margin="4"
-                            IsChecked="{Binding IsChecked}"
-                            Content="{Binding EventType}"
-                            IsEnabled="False"/>
-                </DataTemplate>
-              </ItemsControl.ItemTemplate>
-            </ItemsControl>
-          </Border>
+    <TabItem Header="Script">
+        <Grid RowDefinitions="36,*,*" ColumnDefinitions="80,*">
+            <TextBlock Margin="4,2" Text="Trigger Type:" VerticalAlignment="Center" HorizontalAlignment="Right"/>
+            <views:SearchComboBox ItemsSource="{Binding TriggerTypes}" SelectedItem="{Binding ChosenTriggerType}" IsEnabled="{Binding Path=ChosenEntityType, Converter={StaticResource IntInSetConverter}, ConverterParameter=0|1}" VerticalAlignment="Center" Margin="4,2" Grid.Column="1"/>
+            <TextBlock Margin="4,2" Text="Callbacks:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="1"/>
+            <Border Margin="4,2" BorderThickness="1" BorderBrush="{DynamicResource Brush.SubStackBorder}" Grid.Row="1" Grid.Column="1">
+                <ItemsControl ItemsSource="{Binding ScriptItems}">
+                    <ItemsControl.ItemTemplate>
+                        <DataTemplate>
+                            <Grid ColumnDefinitions="28,*">
+                                <CheckBox Margin="4" IsEnabled="False" IsChecked="{Binding IsChecked}"/>
+                                <TextBlock Margin="0,4" Grid.Column="1" VerticalAlignment="Center" Text="{Binding EventType}" ToolTip.Tip="{Binding Definition}">
+                                    <TextBlock.ContextMenu>
+                                        <ContextMenu>
+                                            <MenuItem Header="Copy Function" Command="{Binding mnuCopyFun_Click}"/>
+                                        </ContextMenu>
+                                    </TextBlock.ContextMenu>
+                                </TextBlock>
+                            </Grid>
+                        </DataTemplate>
+                    </ItemsControl.ItemTemplate>
+                </ItemsControl>
+            </Border>
+            <TextBlock Margin="4,2" Text="Spawn&#xA;Callbacks:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="2" IsVisible="{Binding Path=ChosenEntityType, Converter={StaticResource IntInSetConverter}, ConverterParameter=3}"/>
+            <Border Margin="4,2" BorderThickness="1" BorderBrush="{DynamicResource Brush.SubStackBorder}" Grid.Row="2" Grid.Column="1" IsVisible="{Binding Path=ChosenEntityType, Converter={StaticResource IntInSetConverter}, ConverterParameter=3}">
+                <ItemsControl ItemsSource="{Binding SpawnScriptItems}">
+                    <ItemsControl.ItemTemplate>
+                        <DataTemplate>
+                            <CheckBox Margin="4" IsChecked="{Binding IsChecked}" Content="{Binding EventType}" IsEnabled="False"/>
+                        </DataTemplate>
+                    </ItemsControl.ItemTemplate>
+                </ItemsControl>
+            </Border>
         </Grid>
-      </TabItem>
-      <TabItem Header="Char Display" IsVisible="{Binding Path=ChosenEntityType, Converter={StaticResource IntInSetConverter}, ConverterParameter=1}">
-        <Grid>
-          <Grid.RowDefinitions>
-            <RowDefinition Height="36"/>
-            <RowDefinition Height="36"/>
-            <RowDefinition Height="36"/>
-            <RowDefinition Height="36"/>
-          </Grid.RowDefinitions>
-          <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="80"/>
-            <ColumnDefinition/>
-          </Grid.ColumnDefinitions>
-          <TextBlock Margin="4,2" Text="Species:" VerticalAlignment="Center" HorizontalAlignment="Right"/>
-          <views:SearchComboBox ItemsSource="{Binding Monsters}" SelectedIndex="{Binding ChosenMonster}" VerticalAlignment="Center" Margin="4,2" Grid.Row="0" Grid.Column="1"/>
-          <TextBlock Margin="4,2" Text="Form:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="1"/>
-          <views:SearchComboBox ItemsSource="{Binding Forms}" SelectedIndex="{Binding ChosenForm}" VerticalAlignment="Center" Margin="4,2" Grid.Row="1" Grid.Column="1"/>
-          <TextBlock Margin="4,2" Text="Skin:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="2"/>
-          <views:SearchComboBox ItemsSource="{Binding Skins}" SelectedIndex="{Binding ChosenSkin}" VerticalAlignment="Center" Margin="4,2" Grid.Row="2" Grid.Column="1"/>
-          <TextBlock Margin="4,2" Text="Gender:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="3"/>
-          <views:SearchComboBox ItemsSource="{Binding Genders}" SelectedIndex="{Binding ChosenGender}" VerticalAlignment="Center" Margin="4,2" Grid.Row="3" Grid.Column="1"/>
+    </TabItem>
+    <TabItem Header="Char Display" IsVisible="{Binding Path=ChosenEntityType, Converter={StaticResource IntInSetConverter}, ConverterParameter=1}">
+        <Grid RowDefinitions="36,36,36,36" ColumnDefinitions="80,*">
+            <TextBlock Margin="4,2" Text="Species:" VerticalAlignment="Center" HorizontalAlignment="Right"/>
+            <views:SearchComboBox ItemsSource="{Binding Monsters}" SelectedIndex="{Binding ChosenMonster}" VerticalAlignment="Center" Margin="4,2" Grid.Column="1"/>
+            <TextBlock Margin="4,2" Text="Form:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="1"/>
+            <views:SearchComboBox ItemsSource="{Binding Forms}" SelectedIndex="{Binding ChosenForm}" VerticalAlignment="Center" Margin="4,2" Grid.Row="1" Grid.Column="1"/>
+            <TextBlock Margin="4,2" Text="Skin:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="2"/>
+            <views:SearchComboBox ItemsSource="{Binding Skins}" SelectedIndex="{Binding ChosenSkin}" VerticalAlignment="Center" Margin="4,2" Grid.Row="2" Grid.Column="1"/>
+            <TextBlock Margin="4,2" Text="Gender:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="3"/>
+            <views:SearchComboBox ItemsSource="{Binding Genders}" SelectedIndex="{Binding ChosenGender}" VerticalAlignment="Center" Margin="4,2" Grid.Row="3" Grid.Column="1"/>
         </Grid>
-      </TabItem>
-      <TabItem Header="Char Data" IsVisible="{Binding Path=ChosenEntityType, Converter={StaticResource IntInSetConverter}, ConverterParameter=1}">
-        <Grid>
-          <Grid.RowDefinitions>
-            <RowDefinition Height="36"/>
-            <RowDefinition Height="36"/>
-          </Grid.RowDefinitions>
-          <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="80"/>
-            <ColumnDefinition/>
-          </Grid.ColumnDefinitions>
-          <TextBlock Margin="4,2" Text="Name:" VerticalAlignment="Center" HorizontalAlignment="Right"/>
-          <TextBox Text="{Binding Nickname}" VerticalAlignment="Center" Margin="4,2" Grid.Column="1"/>
-          <TextBlock Margin="4,2" Text="AI Enabled:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="1"/>
-          <CheckBox IsChecked="{Binding AIEnabled}" VerticalAlignment="Center" Margin="4,2" Grid.Row="1" Grid.Column="1"/>
+    </TabItem>
+    <TabItem Header="Char Data" IsVisible="{Binding Path=ChosenEntityType, Converter={StaticResource IntInSetConverter}, ConverterParameter=1}">
+        <Grid RowDefinitions="36,36" ColumnDefinitions="80,*">
+            <TextBlock Margin="4,2" Text="Name:" VerticalAlignment="Center" HorizontalAlignment="Right"/>
+            <TextBox Text="{Binding Nickname}" VerticalAlignment="Center" Margin="4,2" Grid.Column="1"/>
+            <TextBlock Margin="4,2" Text="AI Enabled:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="1"/>
+            <CheckBox IsChecked="{Binding AIEnabled}" VerticalAlignment="Center" Margin="4,2" Grid.Row="1" Grid.Column="1"/>
         </Grid>
-      </TabItem>
-      <TabItem Header="Object Display" IsVisible="{Binding Path=ChosenEntityType, Converter={StaticResource IntInSetConverter}, ConverterParameter=0}">
-        <Grid>
-          <Grid.RowDefinitions>
-            <RowDefinition Height="36"/>
-            <RowDefinition Height="36"/>
-            <RowDefinition Height="42"/>
-            <RowDefinition Height="42"/>
-            <RowDefinition Height="42"/>
-            <RowDefinition Height="42"/>
-          </Grid.RowDefinitions>
-          <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="80"/>
-            <ColumnDefinition/>
-            <ColumnDefinition Width="80"/>
-            <ColumnDefinition/>
-          </Grid.ColumnDefinitions>
-          <TextBlock Margin="4,2" Text="Type:" VerticalAlignment="Center" HorizontalAlignment="Right"/>
-          <views:SearchComboBox ItemsSource="{Binding AnimTypes}" SelectedIndex="{Binding ChosenAnimType}" VerticalAlignment="Center" Margin="4,2" Grid.Row="0" Grid.Column="1" Grid.ColumnSpan="3"/>
-          <TextBlock Margin="4,2" Text="Sprite:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="1"/>
-          <views:SearchComboBox ItemsSource="{Binding ObjectAnims}" SelectedIndex="{Binding ChosenObjectAnim}" VerticalAlignment="Center" Margin="4,2" Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="3"/>
-          <TextBlock Margin="4,2" Text="X Offset:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="2"/>
-          <NumericUpDown Value="{Binding OffsetX}" VerticalAlignment="Center" Margin="4,2" Grid.Row="2" Grid.Column="1"/>
-          <TextBlock Margin="4,2" Text="Y Offset:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="2" Grid.Column="2"/>
-          <NumericUpDown Value="{Binding OffsetY}" VerticalAlignment="Center" Margin="4,2" Grid.Row="2" Grid.Column="3"/>
-          <TextBlock Margin="4,2" Text="Start Frame:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="3"/>
-          <NumericUpDown Minimum="-1" Value="{Binding StartFrame}" VerticalAlignment="Center" Margin="4,2" Grid.Row="3" Grid.Column="1"/>
-          <TextBlock Margin="4,2" Text="End Frame:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="3" Grid.Column="2"/>
-          <NumericUpDown Minimum="-1" Value="{Binding EndFrame}" VerticalAlignment="Center" Margin="4,2" Grid.Row="3" Grid.Column="3"/>
-          <TextBlock Margin="4,2" Text="Frame Length:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="4"/>
-          <NumericUpDown Minimum="1" Value="{Binding FrameLength}" VerticalAlignment="Center" Margin="4,2" Grid.Row="4" Grid.Column="1" Grid.ColumnSpan="3"/>
-          <!--TextBlock Margin="4,2" Text="Alpha:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="5"/>
-          <NumericUpDown VerticalAlignment="Center" Margin="4,2" Grid.Row="5" Grid.Column="1" Grid.ColumnSpan="3"/-->
+    </TabItem>
+    <TabItem Header="Object Display" IsVisible="{Binding Path=ChosenEntityType, Converter={StaticResource IntInSetConverter}, ConverterParameter=0}">
+        <Grid RowDefinitions="36,36,42,42,42,42" ColumnDefinitions="80,*,80,*">
+            <TextBlock Margin="4,2" Text="Type:" VerticalAlignment="Center" HorizontalAlignment="Right"/>
+            <views:SearchComboBox ItemsSource="{Binding AnimTypes}" SelectedIndex="{Binding ChosenAnimType}" VerticalAlignment="Center" Margin="4,2" Grid.Column="1" Grid.ColumnSpan="3"/>
+            <TextBlock Margin="4,2" Text="Sprite:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="1"/>
+            <views:SearchComboBox ItemsSource="{Binding ObjectAnims}" SelectedIndex="{Binding ChosenObjectAnim}" VerticalAlignment="Center" Margin="4,2" Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="3"/>
+            <TextBlock Margin="4,2" Text="X Offset:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="2"/>
+            <NumericUpDown Value="{Binding OffsetX}" VerticalAlignment="Center" Margin="4,2" Grid.Row="2" Grid.Column="1"/>
+            <TextBlock Margin="4,2" Text="Y Offset:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="2" Grid.Column="2"/>
+            <NumericUpDown Value="{Binding OffsetY}" VerticalAlignment="Center" Margin="4,2" Grid.Row="2" Grid.Column="3"/>
+            <TextBlock Margin="4,2" Text="Start Frame:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="3"/>
+            <NumericUpDown Minimum="-1" Value="{Binding StartFrame}" VerticalAlignment="Center" Margin="4,2" Grid.Row="3" Grid.Column="1"/>
+            <TextBlock Margin="4,2" Text="End Frame:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="3" Grid.Column="2"/>
+            <NumericUpDown Minimum="-1" Value="{Binding EndFrame}" VerticalAlignment="Center" Margin="4,2" Grid.Row="3" Grid.Column="3"/>
+            <TextBlock Margin="4,2" Text="Frame Length:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="4"/>
+            <NumericUpDown Minimum="1" Value="{Binding FrameLength}" VerticalAlignment="Center" Margin="4,2" Grid.Row="4" Grid.Column="1" Grid.ColumnSpan="3"/>
+            <!--TextBlock Margin="4,2" Text="Alpha:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="5"/>
+            <NumericUpDown VerticalAlignment="Center" Margin="4,2" Grid.Row="5" Grid.Column="1" Grid.ColumnSpan="3"/-->
         </Grid>
-      </TabItem>
-      <TabItem Header="Object Data" IsVisible="{Binding Path=ChosenEntityType, Converter={StaticResource IntInSetConverter}, ConverterParameter=0}" >
-        <Grid>
-          <Grid.RowDefinitions>
-            <RowDefinition Height="36"/>
-            <RowDefinition Height="36"/>
-          </Grid.RowDefinitions>
-          <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="80"/>
-            <ColumnDefinition/>
-          </Grid.ColumnDefinitions>
-          <TextBlock Margin="4,2" Text="Pass-Through:" VerticalAlignment="Center" HorizontalAlignment="Right"/>
-          <CheckBox IsChecked="{Binding Passable}" Margin="4,2" Grid.Column="1" />
+    </TabItem>
+    <TabItem Header="Object Data" IsVisible="{Binding Path=ChosenEntityType, Converter={StaticResource IntInSetConverter}, ConverterParameter=0}">
+        <Grid RowDefinitions="36,36" ColumnDefinitions="80,*">
+            <TextBlock Margin="4,2" Text="Pass-Through:" VerticalAlignment="Center" HorizontalAlignment="Right"/>
+            <CheckBox IsChecked="{Binding Passable}" Margin="4,2" Grid.Column="1"/>
         </Grid>
-      </TabItem>
-      <TabItem Header="Spawner Data" IsVisible="{Binding Path=ChosenEntityType, Converter={StaticResource IntInSetConverter}, ConverterParameter=3}" >
-        <Grid>
-          <Grid.RowDefinitions>
-            <RowDefinition Height="36"/>
-            <RowDefinition Height="36"/>
-          </Grid.RowDefinitions>
-          <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="80"/>
-            <ColumnDefinition/>
-          </Grid.ColumnDefinitions>
-          <TextBlock Margin="4,2" Text="Spawn Name:" VerticalAlignment="Center" HorizontalAlignment="Right"/>
-          <TextBox Text="{Binding SpawnName}" VerticalAlignment="Center" Margin="4,2" Grid.Column="1"/>
-          <!--TextBlock Margin="4,2" Text="Spawner Type:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="1"/>
-          <views:SearchComboBox VerticalAlignment="Center" Margin="4,2" Grid.Row="1" Grid.Column="1"/-->
+    </TabItem>
+    <TabItem Header="Spawner Data" IsVisible="{Binding Path=ChosenEntityType, Converter={StaticResource IntInSetConverter}, ConverterParameter=3}">
+        <Grid RowDefinitions="36,36" ColumnDefinitions="80,*">
+            <TextBlock Margin="4,2" Text="Spawn Name:" VerticalAlignment="Center" HorizontalAlignment="Right"/>
+            <TextBox Text="{Binding SpawnName}" VerticalAlignment="Center" Margin="4,2" Grid.Column="1"/>
+            <!--TextBlock Margin="4,2" Text="Spawner Type:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="1"/>
+            <views:SearchComboBox VerticalAlignment="Center" Margin="4,2" Grid.Row="1" Grid.Column="1"/-->
         </Grid>
-      </TabItem>
-    </TabControl>
+    </TabItem>
+</TabControl>
   </Grid>
 </UserControl>
diff --git a/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundEditForm.axaml.cs b/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundEditForm.axaml.cs
index 6472ef07..67a72c44 100644
--- a/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundEditForm.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundEditForm.axaml.cs
@@ -64,7 +64,7 @@ public void Window_Closed(object sender, EventArgs e)
         private IEnumerator<YieldInstruction> exitGroundEdit()
         {
             DevForm form = (DevForm)DiagManager.Instance.DevEditor;
-            form.GroundEditForm = null;
+            form.GroundEditorPage = null;
 
             //move to the previous scene or the title, if there was none
             if (DataManager.Instance.Save != null && DataManager.Instance.Save.NextDest.IsValid())
diff --git a/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabDecorations.axaml b/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabDecorations.axaml
index fa6dfc37..6d04a4a0 100644
--- a/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabDecorations.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabDecorations.axaml
@@ -14,64 +14,33 @@
   <UserControl.Resources>
     <converters:ComparisonConverter x:Key="ComparisonConverter"/>
   </UserControl.Resources>
-  <Grid Margin="4" >
-    <Grid.RowDefinitions>
-      <RowDefinition Height="38"/>
-      <RowDefinition/>
-    </Grid.RowDefinitions>
-    <Grid.ColumnDefinitions>
-      <ColumnDefinition Width="180"/>
-      <ColumnDefinition/>
-    </Grid.ColumnDefinitions>
-    <CheckBox Margin="4" IsChecked="{Binding ShowBoxes}" Grid.Row="0" Grid.Column="0">Show Boxes</CheckBox>
-    <views:LayerBox DataContext="{Binding Layers}" Grid.Row="1" Grid.RowSpan="1" Grid.Column="0"/>
-    <Grid Margin="4" Grid.Row="1" Grid.Column="1">
-      <Grid.RowDefinitions>
-        <RowDefinition Height="36"/>
-        <RowDefinition Height="36"/>
-        <RowDefinition Height="42"/>
-        <RowDefinition Height="42"/>
-        <RowDefinition Height="42"/>
-        <RowDefinition Height="36"/>
-      </Grid.RowDefinitions>
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition Width="80"/>
-        <ColumnDefinition/>
-        <ColumnDefinition Width="80"/>
-        <ColumnDefinition/>
-      </Grid.ColumnDefinitions>
-      <TextBlock Margin="4,2" Text="Type:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="0"/>
-      <views:SearchComboBox ItemsSource="{Binding AnimTypes}" SelectedIndex="{Binding ChosenAnimType}" VerticalAlignment="Center" Margin="4,2" Grid.Row="0" Grid.Column="1"/>
-      <TextBlock Margin="4,2" Text="Sprite:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="1"/>
-      <views:SearchComboBox ItemsSource="{Binding ObjectAnims}" SelectedIndex="{Binding ChosenObjectAnim}" VerticalAlignment="Center" Margin="4,2" Grid.Row="1" Grid.Column="1"/>
-      <TextBlock Margin="4,2" Text="Direction:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="1" Grid.Column="2"/>
-      <views:SearchComboBox Margin="4,2" ItemsSource="{Binding Directions}" SelectedIndex="{Binding ChosenDirection}" Grid.Row="1" Grid.Column="3"/>
-      <TextBlock Margin="4,2" Text="Start Frame:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="2"/>
-      <NumericUpDown Minimum="-1" Value="{Binding StartFrame}" VerticalAlignment="Center" Margin="4,2" Grid.Row="2" Grid.Column="1"/>
-      <TextBlock Margin="4,2" Text="End Frame:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="2" Grid.Column="2"/>
-      <NumericUpDown Minimum="-1" Value="{Binding EndFrame}" VerticalAlignment="Center" Margin="4,2" Grid.Row="2" Grid.Column="3"/>
-      <TextBlock Margin="4,2" Text="Frame Length:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="3"/>
-      <NumericUpDown Minimum="1" Value="{Binding FrameLength}" VerticalAlignment="Center" Margin="4,2" Grid.Row="3" Grid.Column="1" Grid.ColumnSpan="3"/>
-      <TextBlock Margin="4,2" Text="Flip Horiz:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="4" Grid.Column="0"/>
-      <CheckBox IsChecked="{Binding FlipHoriz}" Margin="4,2" Grid.Row="4" Grid.Column="1"/>
-      <TextBlock Margin="4,2" Text="Flip Vert:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="4" Grid.Column="2"/>
-      <CheckBox IsChecked="{Binding FlipVert}" Margin="4,2" Grid.Row="4" Grid.Column="3"/>
-      <!--TextBlock Margin="4,2" Text="Alpha:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="4"/>
-      <NumericUpDown VerticalAlignment="Center" Margin="4,2" Grid.Row="4" Grid.Column="1" Grid.ColumnSpan="3"/-->
+      <Grid Margin="4" RowDefinitions="38,*" ColumnDefinitions="180,*">
+        <CheckBox Margin="4" IsChecked="{Binding ShowBoxes}">Show Boxes</CheckBox>
+        <views:LayerBox DataContext="{Binding Layers}" Grid.Row="1"/>
+        <Grid Grid.Row="1" Grid.Column="1" RowDefinitions="36,36,42,42,42,36" ColumnDefinitions="80,*,80,*">
+            <TextBlock Margin="4,2" Text="Type:" VerticalAlignment="Center" HorizontalAlignment="Right"/>
+            <views:SearchComboBox ItemsSource="{Binding AnimTypes}" SelectedIndex="{Binding ChosenAnimType}" VerticalAlignment="Center" Margin="4,2" Grid.Column="1"/>
+            <TextBlock Margin="4,2" Text="Sprite:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="1"/>
+            <views:SearchComboBox ItemsSource="{Binding ObjectAnims}" SelectedIndex="{Binding ChosenObjectAnim}" VerticalAlignment="Center" Margin="4,2" Grid.Row="1" Grid.Column="1"/>
+            <TextBlock Margin="4,2" Text="Direction:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="1" Grid.Column="2"/>
+            <views:SearchComboBox Margin="4,2" ItemsSource="{Binding Directions}" SelectedIndex="{Binding ChosenDirection}" Grid.Row="1" Grid.Column="3"/>
+            <TextBlock Margin="4,2" Text="Start Frame:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="2"/>
+            <NumericUpDown Minimum="-1" Value="{Binding StartFrame}" VerticalAlignment="Center" Margin="4,2" Grid.Row="2" Grid.Column="1"/>
+            <TextBlock Margin="4,2" Text="End Frame:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="2" Grid.Column="2"/>
+            <NumericUpDown Minimum="-1" Value="{Binding EndFrame}" VerticalAlignment="Center" Margin="4,2" Grid.Row="2" Grid.Column="3"/>
+            <TextBlock Margin="4,2" Text="Frame Length:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="3"/>
+            <NumericUpDown Minimum="1" Value="{Binding FrameLength}" VerticalAlignment="Center" Margin="4,2" Grid.Row="3" Grid.Column="1" Grid.ColumnSpan="3"/>
+            <TextBlock Margin="4,2" Text="Flip Horiz:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="4"/>
+            <CheckBox IsChecked="{Binding FlipHoriz}" Margin="4,2" Grid.Row="4" Grid.Column="1"/>
+            <TextBlock Margin="4,2" Text="Flip Vert:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="4" Grid.Column="2"/>
+            <CheckBox IsChecked="{Binding FlipVert}" Margin="4,2" Grid.Row="4" Grid.Column="3"/>
+            <!--TextBlock Margin="4,2" Text="Alpha:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="4"/>
+            <NumericUpDown VerticalAlignment="Center" Margin="4,2" Grid.Row="4" Grid.Column="1" Grid.ColumnSpan="3"/-->
+        </Grid>
+        <Grid Grid.Column="1" RowDefinitions="16,26" ColumnDefinitions="*,*">
+            <TextBlock Margin="4,2" VerticalAlignment="Bottom">Mode</TextBlock>
+            <RadioButton IsChecked="{Binding Path=EntMode, Converter={StaticResource ComparisonConverter}, ConverterParameter={x:Static local:EntEditMode.SelectEntity}}" VerticalAlignment="Top" Margin="2" Grid.Row="1">Select/Move</RadioButton>
+            <RadioButton IsChecked="{Binding Path=EntMode, Converter={StaticResource ComparisonConverter}, ConverterParameter={x:Static local:EntEditMode.PlaceEntity}}" VerticalAlignment="Top" Margin="2" Grid.Row="1" Grid.Column="1">Add/Delete</RadioButton>
+        </Grid>
     </Grid>
-    <Grid Grid.Row="0" Grid.Column="1" Margin="4">
-      <Grid.RowDefinitions>
-        <RowDefinition Height="16"/>
-        <RowDefinition Height="26"/>
-      </Grid.RowDefinitions>
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition/>
-        <ColumnDefinition/>
-      </Grid.ColumnDefinitions>
-      <TextBlock Margin="4,2" VerticalAlignment="Bottom" Grid.Row="0" Grid.Column="0">Mode</TextBlock>
-      <RadioButton IsChecked="{Binding Path=EntMode, Converter={StaticResource ComparisonConverter}, ConverterParameter={x:Static local:EntEditMode.SelectEntity}}" VerticalAlignment="Top" Margin="2" Grid.Row="1" Grid.Column="0">Select/Move</RadioButton>
-      <RadioButton IsChecked="{Binding Path=EntMode, Converter={StaticResource ComparisonConverter}, ConverterParameter={x:Static local:EntEditMode.PlaceEntity}}" VerticalAlignment="Top" Margin="2" Grid.Row="1" Grid.Column="1">Add/Delete</RadioButton>
-    </Grid>
-    
-  </Grid>
 </UserControl>
diff --git a/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabEntities.axaml b/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabEntities.axaml
index 9af6b43a..0376a00c 100644
--- a/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabEntities.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabEntities.axaml
@@ -14,31 +14,14 @@
   <UserControl.Resources>
     <converters:ComparisonConverter x:Key="ComparisonConverter"/>
   </UserControl.Resources>
-  <Grid Margin="4" >
-    <Grid.RowDefinitions>
-      <RowDefinition Height="38"/>
-      <RowDefinition/>
-    </Grid.RowDefinitions>
-    <Grid.ColumnDefinitions>
-      <ColumnDefinition Width="180"/>
-      <ColumnDefinition/>
-    </Grid.ColumnDefinitions>
-    <CheckBox Margin="4" IsChecked="{Binding ShowBoxes}" Grid.Row="0" Grid.Column="0">Show Boxes</CheckBox>
-    <!--views:LayerBox DataContext="{Binding Layers}" Grid.Row="1" Grid.RowSpan="1" Grid.Column="0"/-->
+  <Grid Margin="4" RowDefinitions="38, *" ColumnDefinitions="180, *">
+    <CheckBox Margin="4" IsChecked="{Binding ShowBoxes}">Show Boxes</CheckBox>
+    <!--views:LayerBox DataContext="{Binding Layers}" Grid.Row="1" Grid.Column="0"/-->
     <views:EntityBrowser Margin="4" DataContext="{Binding EntBrowser}" Grid.Row="1" Grid.Column="1"/>
-    <Grid Grid.Row="0" Grid.Column="1" Margin="4">
-      <Grid.RowDefinitions>
-        <RowDefinition Height="16"/>
-        <RowDefinition Height="26"/>
-      </Grid.RowDefinitions>
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition/>
-        <ColumnDefinition/>
-      </Grid.ColumnDefinitions>
-      <TextBlock Margin="4,2" VerticalAlignment="Bottom" Grid.Row="0" Grid.Column="0">Mode</TextBlock>
-      <RadioButton IsChecked="{Binding Path=EntMode, Converter={StaticResource ComparisonConverter}, ConverterParameter={x:Static local:EntEditMode.SelectEntity}}" VerticalAlignment="Top" Margin="2" Grid.Row="1" Grid.Column="0">Select/Move</RadioButton>
+    <Grid Grid.Column="1" RowDefinitions="16,26" ColumnDefinitions="*,*">
+      <TextBlock Margin="4,2" VerticalAlignment="Bottom">Mode</TextBlock>
+      <RadioButton IsChecked="{Binding Path=EntMode, Converter={StaticResource ComparisonConverter}, ConverterParameter={x:Static local:EntEditMode.SelectEntity}}" VerticalAlignment="Top" Margin="2" Grid.Row="1">Select/Move</RadioButton>
       <RadioButton IsChecked="{Binding Path=EntMode, Converter={StaticResource ComparisonConverter}, ConverterParameter={x:Static local:EntEditMode.PlaceEntity}}" VerticalAlignment="Top" Margin="2" Grid.Row="1" Grid.Column="1">Add/Delete</RadioButton>
     </Grid>
-    
   </Grid>
 </UserControl>
diff --git a/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabProperties.axaml b/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabProperties.axaml
index aac0ecc1..031e20ea 100644
--- a/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabProperties.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabProperties.axaml
@@ -6,52 +6,25 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              mc:Ignorable="d"
              x:Class="RogueEssence.Dev.Views.GroundTabProperties">
-  <Design.DataContext>
-    <vm:GroundTabPropertiesViewModel/>
-  </Design.DataContext>
-  <Grid Margin="4" >
-    <Grid.ColumnDefinitions>
-      <ColumnDefinition/>
-      <ColumnDefinition/>
-    </Grid.ColumnDefinitions>
-    <Grid>
-      <Grid.RowDefinitions>
-        <RowDefinition Height="40"/>
-        <RowDefinition Height="40"/>
-        <RowDefinition Height="36"/>
-        <RowDefinition Height="26"/>
-        <RowDefinition Height="42"/>
-        <RowDefinition/>
-      </Grid.RowDefinitions>
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition Width="80"/>
-        <ColumnDefinition/>
-        <ColumnDefinition Width="80"/>
-        <ColumnDefinition/>
-      </Grid.ColumnDefinitions>
-      <TextBlock Margin="4" VerticalAlignment="Center" HorizontalAlignment="Right" ToolTip.Tip="Map name in the current language.">Map Name:</TextBlock>
-      <TextBox Text="{Binding MapName}" VerticalAlignment="Center" Margin="4" Grid.Column="1" Grid.ColumnSpan="3"/>
-      <TextBlock Margin="4" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="1" ToolTip.Tip="Choose how the edge of the map is handled.">Scroll Edge:</TextBlock>
-      <views:SearchComboBox ItemsSource="{Binding ScrollEdges}" SelectedIndex="{Binding ChosenScroll}" Margin="4" Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="3"/>
-      <CheckBox Margin="4,2" IsChecked="{Binding NoSwitch}" Grid.Row="2" Grid.Column="1" Grid.ColumnSpan="3" ToolTip.Tip="Prevents leader switching.">No Switch</CheckBox>
-      <TextBlock Margin="4,2" VerticalAlignment="Bottom" Grid.Row="3" Grid.ColumnSpan="2" ToolTip.Tip="Graphics to use for the background.">Background:</TextBlock>
-      <views:ClassBox DataContext="{Binding BG}" Margin="4,2" Grid.Row="4" Grid.ColumnSpan="2"/>
-      <TextBlock Margin="4,2" VerticalAlignment="Bottom" Grid.Row="3" Grid.Column="2" Grid.ColumnSpan="2" ToolTip.Tip="The tile to repeat when showing out-of-bounds tiles.&#x0a;Only used when Scroll Edge is set to Blank.">Blank Tiles:</TextBlock>
-      <views:TileBox DataContext="{Binding BlankBG}" Margin="4,2" Grid.Row="4" Grid.Column="2" Grid.ColumnSpan="2"/>
-
-    </Grid>
-
-
-    <Grid Grid.Column="1">
-      <Grid.RowDefinitions>
-        <RowDefinition Height="20"/>
-        <RowDefinition/>
-        <RowDefinition Height="34"/>
-      </Grid.RowDefinitions>
-
-      <TextBlock Margin="4" VerticalAlignment="Bottom" Grid.Row="0">Music:</TextBlock>
-      <ListBox Name="lbxMusic" SelectionMode="AlwaysSelected" ItemsSource="{Binding Music}" SelectedIndex="{Binding ChosenMusic}" Margin="4" Grid.Row="1"/>
-      <Button Name="btnReloadMusic" Command="{Binding btnReloadMusic_Click}" Margin="4" Grid.Row="2">Reload Music</Button>
-    </Grid>
-  </Grid>
+      <Design.DataContext>
+        <vm:GroundTabPropertiesViewModel/>
+      </Design.DataContext>
+      <Grid Margin="4" ColumnDefinitions="*,*">
+            <Grid RowDefinitions="40,40,36,26,42,*" ColumnDefinitions="80,*,80,*">
+                <TextBlock Margin="4" VerticalAlignment="Center" HorizontalAlignment="Right" ToolTip.Tip="Map name in the current language.">Map Name:</TextBlock>
+                <TextBox Text="{Binding MapName}" VerticalAlignment="Center" Margin="4" Grid.Column="1" Grid.ColumnSpan="3"/>
+                <TextBlock Margin="4" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="1" ToolTip.Tip="Choose how the edge of the map is handled.">Scroll Edge:</TextBlock>
+                <views:SearchComboBox ItemsSource="{Binding ScrollEdges}" SelectedIndex="{Binding ChosenScroll}" Margin="4" Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="3"/>
+                <CheckBox Margin="4,2" IsChecked="{Binding NoSwitch}" Grid.Row="2" Grid.Column="1" Grid.ColumnSpan="3" ToolTip.Tip="Prevents leader switching.">No Switch</CheckBox>
+                <TextBlock Margin="4,2" VerticalAlignment="Bottom" Grid.Row="3" Grid.ColumnSpan="2" ToolTip.Tip="Graphics to use for the background.">Background:</TextBlock>
+                <views:ClassBox DataContext="{Binding BG}" Margin="4,2" Grid.Row="4" Grid.ColumnSpan="2"/>
+                <TextBlock Margin="4,2" VerticalAlignment="Bottom" Grid.Row="3" Grid.Column="2" Grid.ColumnSpan="2" ToolTip.Tip="The tile to repeat when showing out-of-bounds tiles.&#x0a;Only used when Scroll Edge is set to Blank.">Blank Tiles:</TextBlock>
+                <views:TileBox DataContext="{Binding BlankBG}" Margin="4,2" Grid.Row="4" Grid.Column="2" Grid.ColumnSpan="2"/>
+            </Grid>
+            <Grid Grid.Column="1" RowDefinitions="20,*,34">
+                <TextBlock Margin="4" VerticalAlignment="Bottom">Music:</TextBlock>
+                <ListBox Classes="datalist" Name="lbxMusic" SelectionMode="AlwaysSelected" ItemsSource="{Binding Music}" SelectedIndex="{Binding ChosenMusic}" Margin="4" Grid.Row="1"/>
+                <Button Classes="flat" Name="btnReloadMusic" Command="{Binding btnReloadMusic_Click}" Margin="4" Grid.Row="2">Reload Music</Button>
+            </Grid>
+      </Grid>
 </UserControl>
diff --git a/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabScript.axaml b/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabScript.axaml
index b0da0a5e..b1f1ec24 100644
--- a/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabScript.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabScript.axaml
@@ -13,38 +13,18 @@
     <converters:StringNotEmptyConverter x:Key="StringNotEmptyConverter"/>
     <converters:MapScriptPathConverter x:Key="MapScriptPathConverter"/>
   </UserControl.Resources>
-  <Grid Margin="4" >
-    <Grid.RowDefinitions>
-      <RowDefinition Height="20"/>
-      <RowDefinition Height="34"/>
-      <RowDefinition Height="20"/>
-      <RowDefinition/>
-    </Grid.RowDefinitions>
-    <Grid.ColumnDefinitions>
-      <ColumnDefinition Width="120"/>
-      <ColumnDefinition Width="120"/>
-      <ColumnDefinition/>
-    </Grid.ColumnDefinitions>
-    <TextBlock Margin="4" VerticalAlignment="Bottom" Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="3" Text="{Binding Path=CurrentFile, Converter={StaticResource MapScriptPathConverter}}"/>
-    <Button Name="btnOpenScriptDir" Command="{Binding btnOpenScriptDir_Click}" IsEnabled="{Binding Path=CurrentFile, Converter={StaticResource StringNotEmptyConverter}}" Margin="4" Grid.Row="1" Grid.Column="0">Open Script Folder</Button>
-    <Button Name="btnReloadScripts" Command="{Binding btnReloadScripts_Click}" IsEnabled="{Binding Path=CurrentFile, Converter={StaticResource StringNotEmptyConverter}}" Margin="4" Grid.Row="1" Grid.Column="1">Reload Scripts</Button>
-    <TextBlock Margin="4" VerticalAlignment="Bottom" Grid.Row="2" Grid.Column="0">Map Callbacks</TextBlock>
-    <Border Grid.Row="3" Grid.ColumnSpan="2" Margin="4" BorderThickness="1" BorderBrush="Black">
+  <Grid Margin="4" RowDefinitions="20,34,20,*" ColumnDefinitions="130,130,*">
+    <TextBlock Margin="4" VerticalAlignment="Bottom" Grid.ColumnSpan="3" Text="{Binding Path=CurrentFile, Converter={StaticResource MapScriptPathConverter}}"/>
+    <Button Classes="flat" Width="130" HorizontalContentAlignment="Center" Name="btnOpenScriptDir" Command="{Binding btnOpenScriptDir_Click}" IsEnabled="{Binding Path=CurrentFile, Converter={StaticResource StringNotEmptyConverter}}" Margin="4" Grid.Row="1">Open Script Folder</Button>
+    <Button  Classes="flat" Width="130"  HorizontalContentAlignment="Center" Name="btnReloadScripts" Command="{Binding btnReloadScripts_Click}" IsEnabled="{Binding Path=CurrentFile, Converter={StaticResource StringNotEmptyConverter}}" Margin="4" Grid.Row="1" Grid.Column="1">Reload Scripts</Button>
+    <TextBlock Margin="4" VerticalAlignment="Bottom" Grid.Row="2">Map Callbacks</TextBlock>
+    <Border Grid.Row="3" Grid.ColumnSpan="2" Margin="4" BorderThickness="1" BorderBrush="{DynamicResource Brush.SubStackBorder}">
       <ItemsControl ItemsSource="{Binding ScriptItems}" IsEnabled="{Binding Path=CurrentFile, Converter={StaticResource StringNotEmptyConverter}}">
         <ItemsControl.ItemTemplate>
           <DataTemplate>
-            <Grid>
-              <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="28"/>
-                <ColumnDefinition/>
-              </Grid.ColumnDefinitions>
-              <CheckBox
-                Margin="4"
-                        IsEnabled="False"
-                        IsChecked="{Binding IsChecked}"/>
-              <TextBlock Margin="0,4" Grid.Column="1" VerticalAlignment="Center"
-                Text="{Binding EventType}"
-                ToolTip.Tip="{Binding Definition}">
+            <Grid ColumnDefinitions="28,*">
+              <CheckBox Margin="4" IsEnabled="False" IsChecked="{Binding IsChecked}"/>
+              <TextBlock Margin="0,4" Grid.Column="1" VerticalAlignment="Center" Text="{Binding EventType}" ToolTip.Tip="{Binding Definition}">
                 <TextBlock.ContextMenu>
                   <ContextMenu>
                     <MenuItem Header="Copy Function" Command="{Binding mnuCopyFun_Click}"/>
diff --git a/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabStrings.axaml b/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabStrings.axaml
index 604d008b..97e7a31f 100644
--- a/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabStrings.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabStrings.axaml
@@ -3,54 +3,47 @@
              xmlns:vm="clr-namespace:RogueEssence.Dev.ViewModels;assembly=RogueEssence.Editor.Avalonia"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:v="clr-namespace:RogueEssence.Dev.Views"
              mc:Ignorable="d"
              x:Class="RogueEssence.Dev.Views.GroundTabStrings">
   <Design.DataContext>
     <vm:GroundTabStringsViewModel/>
   </Design.DataContext>
 
-
-  <Grid Margin="4" >
-
-    <Grid.RowDefinitions>
-      <RowDefinition Height="Auto"/>
-      <RowDefinition/>
-      <RowDefinition Height="34"/>
-    </Grid.RowDefinitions>
-
-    <TextBlock Margin="4" VerticalAlignment="Bottom" Grid.Row="0" TextWrapping="Wrap">Add, edit, or remove localized strings to be used by scripts on the map.</TextBlock>
-
-    <DataGrid Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="5" ItemsSource="{Binding MapStrings}" SelectedIndex="{Binding CurrentString, Mode=TwoWay}"
-              CanUserResizeColumns="True" HorizontalScrollBarVisibility="Disabled">
-
-      <DataGrid.Styles>
-        <Style Selector="TextBlock">
-          <Setter Property="TextWrapping" Value="WrapWithOverflow" />
-        </Style>
-        <Style Selector="TextBox">
-          <Setter Property="TextWrapping" Value="Wrap" />
-          <Setter Property="AcceptsReturn" Value="True" />
-        </Style>
-      </DataGrid.Styles>
-
-      <DataGrid.Columns>
-        <DataGridTextColumn Header="Key" Binding="{Binding Key}" Width="1*"/>
-        <DataGridTextColumn Header="Comment" Binding="{Binding Comment}" Width="1*"/>
-        <DataGridTextColumn Header="String" Binding="{Binding String}" Width="3*"/>
-      </DataGrid.Columns>
-    </DataGrid>
-
-    <Grid Margin="0" Grid.Row="2" >
-
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition/>
-        <ColumnDefinition/>
-      </Grid.ColumnDefinitions>
-
-      <Button Command="{Binding btnAddString_Click}" Margin="0,4,4,4" Grid.Column="0">Add String</Button>
-      <Button Command="{Binding btnDeleteString_Click}" Margin="4,4,0,4" Grid.Column="1">Delete String</Button>
-
+    <Grid RowDefinitions="Auto" Margin="64, 32" MinWidth="600" >
+        <StackPanel>
+            <TextBlock Margin="4" VerticalAlignment="Bottom" TextWrapping="Wrap">Add, edit, or remove localized strings to be used by scripts on the map.</TextBlock>
+            <DataGrid Classes="default"
+                      Height="400"
+                      BorderBrush="{DynamicResource Brush.Border2}" 
+                      BorderThickness="1"
+                      Margin="0, 0, 0, 8"
+                      ItemsSource="{Binding MapStrings}" SelectedIndex="{Binding CurrentString, Mode=TwoWay}" CanUserResizeColumns="True" HorizontalScrollBarVisibility="Disabled">
+                <DataGrid.Styles>
+                    <Style Selector="TextBlock">
+                        <Setter Property="TextWrapping" Value="WrapWithOverflow"/>
+                    </Style>
+                    <Style Selector="TextBox">
+                        <Setter Property="TextWrapping" Value="Wrap"/>
+                        <Setter Property="AcceptsReturn" Value="True"/>
+                    </Style>
+                </DataGrid.Styles>
+                <DataGrid.Columns>
+                    <DataGridTextColumn Header="Key" Binding="{Binding Key}" Width="1*"/>
+                    <DataGridTextColumn Header="Comment" Binding="{Binding Comment}" Width="1*"/>
+                    <DataGridTextColumn Header="String" Binding="{Binding String}" Width="3*"/>
+                </DataGrid.Columns>
+            </DataGrid>
+            <StackPanel Grid.Row="2" Orientation="Horizontal">
+                <Button x:Name="StringDataGridButtonAdd" Classes="flat" Width="100"
+                        Command="{Binding btnAddString_Click}">
+                    <v:IconText Text="Add" Icon="Icons.Plus" IconSize="12" />
+                </Button>
+                <Button Classes="flat" Width="100" Margin="24,0,0,0"
+                        Command="{Binding btnDeleteString_Click}">
+                    <v:IconText Text="Delete" Icon="Icons.TrashFill" IconSize="12" />
+                </Button>
+            </StackPanel>
+        </StackPanel>
     </Grid>
-
-  </Grid>
 </UserControl>
diff --git a/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabWalls.axaml b/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabWalls.axaml
index 52f93c95..583f083d 100644
--- a/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabWalls.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabWalls.axaml
@@ -13,26 +13,9 @@
   <UserControl.Resources>
     <converters:ComparisonConverter x:Key="ComparisonConverter"/>
   </UserControl.Resources>
-  <Grid Margin="4" >
-    <Grid.RowDefinitions>
-      <RowDefinition Height="38"/>
-      <RowDefinition/>
-    </Grid.RowDefinitions>
-    <Grid.ColumnDefinitions>
-      <ColumnDefinition Width="180"/>
-      <ColumnDefinition/>
-    </Grid.ColumnDefinitions>
+  <Grid Margin="4" RowDefinitions="38, *" ColumnDefinitions="180, *">
     <CheckBox Margin="4" IsChecked="{Binding ShowWalls}" Grid.Row="0" Grid.Column="0">Show Walls</CheckBox>
-    <Grid Grid.Row="0" Grid.Column="1">
-      <Grid.RowDefinitions>
-        <RowDefinition Height="16"/>
-        <RowDefinition Height="26"/>
-      </Grid.RowDefinitions>
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition/>
-        <ColumnDefinition/>
-        <ColumnDefinition/>
-      </Grid.ColumnDefinitions>
+    <Grid Grid.Row="0" Grid.Column="1" RowDefinitions="16, 26" ColumnDefinitions="*, *, *">
       <TextBlock Margin="4,2" VerticalAlignment="Bottom" Grid.Row="0" Grid.Column="0">Mode</TextBlock>
       <RadioButton Name="rbDraw" IsChecked="{Binding Path=BlockMode, Converter={StaticResource ComparisonConverter}, ConverterParameter={x:Static local:TileEditMode.Draw}}" VerticalAlignment="Top" Margin="2" Grid.Row="1" Grid.Column="0">Draw</RadioButton>
       <RadioButton Name="rbRect" IsChecked="{Binding Path=BlockMode, Converter={StaticResource ComparisonConverter}, ConverterParameter={x:Static local:TileEditMode.Rectangle}}" VerticalAlignment="Top" Margin="2" Grid.Row="1" Grid.Column="1">Rectangle</RadioButton>
diff --git a/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapEditForm.axaml.cs b/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapEditForm.axaml.cs
index abb4feb5..4ccdcf41 100644
--- a/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapEditForm.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapEditForm.axaml.cs
@@ -58,7 +58,7 @@ public void Window_Closed(object sender, EventArgs e)
         private IEnumerator<YieldInstruction> exitMapEdit()
         {
             DevForm form = (DevForm)DiagManager.Instance.DevEditor;
-            form.MapEditPage = null;
+            form.MapEditorPage = null;
 
             //move to the previous scene or the title, if there was none
             if (DataManager.Instance.Save != null && DataManager.Instance.Save.NextDest.IsValid())
diff --git a/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabDecorations.axaml b/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabDecorations.axaml
index 58e82540..f12a7df7 100644
--- a/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabDecorations.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabDecorations.axaml
@@ -8,70 +8,37 @@
              xmlns:converters="clr-namespace:RogueEssence.Dev.Converters"
              mc:Ignorable="d"
              x:Class="RogueEssence.Dev.Views.MapTabDecorations">
-  <Design.DataContext>
-    <vm:MapTabDecorationsViewModel/>
-  </Design.DataContext>
-  <UserControl.Resources>
-    <converters:ComparisonConverter x:Key="ComparisonConverter"/>
-  </UserControl.Resources>
-  <Grid Margin="4" >
-    <Grid.RowDefinitions>
-      <RowDefinition Height="38"/>
-      <RowDefinition/>
-    </Grid.RowDefinitions>
-    <Grid.ColumnDefinitions>
-      <ColumnDefinition Width="180"/>
-      <ColumnDefinition/>
-    </Grid.ColumnDefinitions>
-    <CheckBox Margin="4" IsChecked="{Binding ShowBoxes}" Grid.Row="0" Grid.Column="0">Show Boxes</CheckBox>
-    <views:LayerBox DataContext="{Binding Layers}" Grid.Row="1" Grid.RowSpan="1" Grid.Column="0"/>
-    <Grid Margin="4" Grid.Row="1" Grid.Column="1">
-      <Grid.RowDefinitions>
-        <RowDefinition Height="36"/>
-        <RowDefinition Height="36"/>
-        <RowDefinition Height="42"/>
-        <RowDefinition Height="42"/>
-        <RowDefinition Height="42"/>
-        <RowDefinition Height="36"/>
-      </Grid.RowDefinitions>
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition Width="80"/>
-        <ColumnDefinition/>
-        <ColumnDefinition Width="80"/>
-        <ColumnDefinition/>
-      </Grid.ColumnDefinitions>
-      <TextBlock Margin="4,2" Text="Type:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="0"/>
-      <views:SearchComboBox ItemsSource="{Binding AnimTypes}" SelectedIndex="{Binding ChosenAnimType}" VerticalAlignment="Center" Margin="4,2" Grid.Row="0" Grid.Column="1"/>
-      <TextBlock Margin="4,2" Text="Sprite:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="1"/>
-      <views:SearchComboBox ItemsSource="{Binding ObjectAnims}" SelectedIndex="{Binding ChosenObjectAnim}" VerticalAlignment="Center" Margin="4,2" Grid.Row="1" Grid.Column="1"/>
-      <TextBlock Margin="4,2" Text="Direction:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="1" Grid.Column="2"/>
-      <views:SearchComboBox Margin="4,2" ItemsSource="{Binding Directions}" SelectedIndex="{Binding ChosenDirection}" Grid.Row="1" Grid.Column="3"/>
-      <TextBlock Margin="4,2" Text="Start Frame:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="2"/>
-      <NumericUpDown Minimum="-1" Value="{Binding StartFrame}" VerticalAlignment="Center" Margin="4,2" Grid.Row="2" Grid.Column="1"/>
-      <TextBlock Margin="4,2" Text="End Frame:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="2" Grid.Column="2"/>
-      <NumericUpDown Minimum="-1" Value="{Binding EndFrame}" VerticalAlignment="Center" Margin="4,2" Grid.Row="2" Grid.Column="3"/>
-      <TextBlock Margin="4,2" Text="Frame Length:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="3"/>
-      <NumericUpDown Minimum="1" Value="{Binding FrameLength}" VerticalAlignment="Center" Margin="4,2" Grid.Row="3" Grid.Column="1" Grid.ColumnSpan="3"/>
-      <TextBlock Margin="4,2" Text="Flip Horiz:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="4" Grid.Column="0"/>
-      <CheckBox IsChecked="{Binding FlipHoriz}" Margin="4,2" Grid.Row="4" Grid.Column="1"/>
-      <TextBlock Margin="4,2" Text="Flip Vert:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="4" Grid.Column="2"/>
-      <CheckBox IsChecked="{Binding FlipVert}" Margin="4,2" Grid.Row="4" Grid.Column="3"/>
-      <!--TextBlock Margin="4,2" Text="Alpha:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="4"/>
-      <NumericUpDown VerticalAlignment="Center" Margin="4,2" Grid.Row="4" Grid.Column="1" Grid.ColumnSpan="3"/-->
+    <Design.DataContext>
+        <vm:MapTabDecorationsViewModel/>
+    </Design.DataContext>
+    <UserControl.Resources>
+        <converters:ComparisonConverter x:Key="ComparisonConverter"/>
+    </UserControl.Resources>
+    <Grid Margin="4" RowDefinitions="38,*" ColumnDefinitions="180,*">
+        <CheckBox Margin="4" IsChecked="{Binding ShowBoxes}">Show Boxes</CheckBox>
+        <views:LayerBox DataContext="{Binding Layers}" Grid.Row="1"/>
+        <Grid Grid.Row="1" Grid.Column="1" RowDefinitions="36,36,42,42,42,36" ColumnDefinitions="80,*,80,*">
+            <TextBlock Margin="4,2" Text="Type:" VerticalAlignment="Center" HorizontalAlignment="Right"/>
+            <views:SearchComboBox ItemsSource="{Binding AnimTypes}" SelectedIndex="{Binding ChosenAnimType}" VerticalAlignment="Center" Margin="4,2" Grid.Column="1"/>
+            <TextBlock Margin="4,2" Text="Sprite:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="1"/>
+            <views:SearchComboBox ItemsSource="{Binding ObjectAnims}" SelectedIndex="{Binding ChosenObjectAnim}" VerticalAlignment="Center" Margin="4,2" Grid.Row="1" Grid.Column="1"/>
+            <TextBlock Margin="4,2" Text="Direction:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="1" Grid.Column="2"/>
+            <views:SearchComboBox Margin="4,2" ItemsSource="{Binding Directions}" SelectedIndex="{Binding ChosenDirection}" Grid.Row="1" Grid.Column="3"/>
+            <TextBlock Margin="4,2" Text="Start Frame:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="2"/>
+            <NumericUpDown Increment="1" Minimum="-1" Value="{Binding StartFrame}" VerticalAlignment="Center" Margin="4,2" Grid.Row="2" Grid.Column="1"/>
+            <TextBlock Margin="4,2" Text="End Frame:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="2" Grid.Column="2"/>
+            <NumericUpDown Increment="1" Minimum="-1" Value="{Binding EndFrame}" VerticalAlignment="Center" Margin="4,2" Grid.Row="2" Grid.Column="3"/>
+            <TextBlock Margin="4,2" Text="Frame Length:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="3"/>
+            <NumericUpDown Increment="1" Minimum="1" Value="{Binding FrameLength}" VerticalAlignment="Center" Margin="4,2" Grid.Row="3" Grid.Column="1" Grid.ColumnSpan="3"/>
+            <TextBlock Margin="4,2" Text="Flip Horiz:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="4"/>
+            <CheckBox IsChecked="{Binding FlipHoriz}" Margin="4,2" Grid.Row="4" Grid.Column="1"/>
+            <TextBlock Margin="4,2" Text="Flip Vert:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="4" Grid.Column="2"/>
+            <CheckBox IsChecked="{Binding FlipVert}" Margin="4,2" Grid.Row="4" Grid.Column="3"/>
+        </Grid>
+        <Grid Grid.Column="1" RowDefinitions="16,26" ColumnDefinitions="*,*">
+            <TextBlock Margin="4,2" VerticalAlignment="Bottom">Mode</TextBlock>
+            <RadioButton IsChecked="{Binding Path=EntMode, Converter={StaticResource ComparisonConverter}, ConverterParameter={x:Static local:EntEditMode.SelectEntity}}" VerticalAlignment="Top" Margin="2" Grid.Row="1">Select/Move</RadioButton>
+            <RadioButton IsChecked="{Binding Path=EntMode, Converter={StaticResource ComparisonConverter}, ConverterParameter={x:Static local:EntEditMode.PlaceEntity}}" VerticalAlignment="Top" Margin="2" Grid.Row="1" Grid.Column="1">Add/Delete</RadioButton>
+        </Grid>
     </Grid>
-    <Grid Grid.Row="0" Grid.Column="1" Margin="4">
-      <Grid.RowDefinitions>
-        <RowDefinition Height="16"/>
-        <RowDefinition Height="26"/>
-      </Grid.RowDefinitions>
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition/>
-        <ColumnDefinition/>
-      </Grid.ColumnDefinitions>
-      <TextBlock Margin="4,2" VerticalAlignment="Bottom" Grid.Row="0" Grid.Column="0">Mode</TextBlock>
-      <RadioButton IsChecked="{Binding Path=EntMode, Converter={StaticResource ComparisonConverter}, ConverterParameter={x:Static local:EntEditMode.SelectEntity}}" VerticalAlignment="Top" Margin="2" Grid.Row="1" Grid.Column="0">Select/Move</RadioButton>
-      <RadioButton IsChecked="{Binding Path=EntMode, Converter={StaticResource ComparisonConverter}, ConverterParameter={x:Static local:EntEditMode.PlaceEntity}}" VerticalAlignment="Top" Margin="2" Grid.Row="1" Grid.Column="1">Add/Delete</RadioButton>
-    </Grid>
-    
-  </Grid>
 </UserControl>
diff --git a/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabEntities.axaml b/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabEntities.axaml
index 881755c8..581a7212 100644
--- a/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabEntities.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabEntities.axaml
@@ -14,53 +14,15 @@
   <UserControl.Resources>
     <converters:ComparisonConverter x:Key="ComparisonConverter"/>
   </UserControl.Resources>
-  <Grid Margin="4" >
-    <Grid.RowDefinitions>
-      <RowDefinition Height="38"/>
-      <RowDefinition/>
-    </Grid.RowDefinitions>
-    <Grid.ColumnDefinitions>
-      <ColumnDefinition Width="50"/>
-      <ColumnDefinition/>
-    </Grid.ColumnDefinitions>
+  <Grid Margin="4" RowDefinitions="38, *" ColumnDefinitions="50, *">
     <!--<views:TeamBox DataContext="{Binding Teams}" Grid.Row="0" Grid.RowSpan="2" Grid.Column="0"/>-->
-    <Grid Margin="4" Grid.Row="0" Grid.Column="1">
-      <Grid.RowDefinitions>
-        <RowDefinition Height="16"/>
-        <RowDefinition Height="26"/>
-      </Grid.RowDefinitions>
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition/>
-        <ColumnDefinition/>
-      </Grid.ColumnDefinitions>
+    <Grid Margin="4" Grid.Row="0" Grid.Column="1" RowDefinitions="16, 26" ColumnDefinitions="*, *">
       <TextBlock Margin="4,2" VerticalAlignment="Bottom" Grid.Row="0" Grid.Column="0">Mode</TextBlock>
       <RadioButton IsChecked="{Binding Path=EntMode, Converter={StaticResource ComparisonConverter}, ConverterParameter={x:Static local:EntEditMode.SelectEntity}}" VerticalAlignment="Top" Margin="2" Grid.Row="1" Grid.Column="0">Select/Move</RadioButton>
       <RadioButton IsChecked="{Binding Path=EntMode, Converter={StaticResource ComparisonConverter}, ConverterParameter={x:Static local:EntEditMode.PlaceEntity}}" VerticalAlignment="Top" Margin="2" Grid.Row="1" Grid.Column="1">Add/Delete</RadioButton>
     </Grid>
-    <Grid Margin="4" Grid.Row="1" Grid.Column="1">
-      <Grid.RowDefinitions>
-        <RowDefinition Height="36"/>
-        <RowDefinition Height="72"/>
-        <RowDefinition Height="40"/>
-        <RowDefinition Height="280"/>
-        <RowDefinition/>
-      </Grid.RowDefinitions>
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition/>
-      </Grid.ColumnDefinitions>
-      
-      <Grid Grid.Row="0">
-        <Grid.RowDefinitions>
-          <RowDefinition/>
-        </Grid.RowDefinitions>
-        <Grid.ColumnDefinitions>
-          <ColumnDefinition Width="80"/>
-          <ColumnDefinition/>
-          <ColumnDefinition Width="80"/>
-          <ColumnDefinition/>
-          <ColumnDefinition Width="80"/>
-          <ColumnDefinition/>
-        </Grid.ColumnDefinitions>
+    <Grid Margin="4" Grid.Row="1" Grid.Column="1" RowDefinitions="36, 72, 40, 200">
+      <Grid Grid.Row="0" ColumnDefinitions="88, *, 80, *, 80, *">
         <TextBlock Margin="4,2" Text="Direction:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="0" Grid.Column="0"/>
         <views:SearchComboBox ItemsSource="{Binding Directions}" SelectedIndex="{Binding ChosenDir}" VerticalAlignment="Center" Margin="4,2" Grid.Row="0" Grid.Column="1"/>
         <TextBlock Margin="4,2" Text="Tactic:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="0" Grid.Column="2"/>
@@ -69,17 +31,7 @@
         <TextBox Text="{Binding Nickname}" VerticalAlignment="Center" Margin="4,2" Grid.Row="0" Grid.Column="5"/>
       </Grid>
       
-      <Grid Grid.Row="1">
-        <Grid.RowDefinitions>
-          <RowDefinition/>
-          <RowDefinition/>
-        </Grid.RowDefinitions>
-        <Grid.ColumnDefinitions>
-          <ColumnDefinition Width="80"/>
-          <ColumnDefinition/>
-          <ColumnDefinition Width="80"/>
-          <ColumnDefinition/>
-        </Grid.ColumnDefinitions>
+      <Grid Grid.Row="1" RowDefinitions="*,*" ColumnDefinitions="80,*,80,*">
         <TextBlock Margin="4,2" Text="Species:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="0"/>
         <views:SearchComboBox ItemsSource="{Binding Monsters}" SelectedIndex="{Binding ChosenMonster}" VerticalAlignment="Center" Margin="4,2" Grid.Row="0" Grid.Column="1"/>
         <TextBlock Margin="4,2" Text="Form:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="0" Grid.Column="2"/>
@@ -90,46 +42,15 @@
         <views:SearchComboBox ItemsSource="{Binding Genders}" SelectedIndex="{Binding ChosenGender}" VerticalAlignment="Center" Margin="4,2" Grid.Row="1" Grid.Column="3"/>
       </Grid>
 
-      <Grid Grid.Row="2">
-        <Grid.RowDefinitions>
-          <RowDefinition/>
-        </Grid.RowDefinitions>
-        <Grid.ColumnDefinitions>
-          <ColumnDefinition Width="80"/>
-          <ColumnDefinition/>
-          <ColumnDefinition Width="80"/>
-          <ColumnDefinition/>
-          <ColumnDefinition Width="80"/>
-          <ColumnDefinition/>
-        </Grid.ColumnDefinitions>
+      <Grid Grid.Row="2" RowDefinitions="*" ColumnDefinitions="80,*,80,*,80,*">
         <TextBlock Margin="4,2" Text="Level:" VerticalAlignment="Center" HorizontalAlignment="Right"/>
-        <NumericUpDown Value="{Binding Level}" Minimum="1" VerticalAlignment="Center" Margin="4,2" Grid.Row="0" Grid.Column="1"/>
+        <NumericUpDown Increment="1" Value="{Binding Level}" Minimum="1" VerticalAlignment="Center" Margin="4,2" Grid.Row="0" Grid.Column="1"/>
         <TextBlock Margin="4,2" Text="Intrinsic:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Column="2"/>
         <views:SearchComboBox ItemsSource="{Binding Intrinsics}" SelectedIndex="{Binding ChosenIntrinsic}" VerticalAlignment="Center" Margin="4,2" Grid.Column="3"/>
         <TextBlock Margin="4,2" Text="Equip:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Column="4"/>
         <views:SearchComboBox ItemsSource="{Binding Equips}" SelectedIndex="{Binding ChosenEquip}" VerticalAlignment="Center" Margin="4,2" Grid.Column="5"/>
       </Grid>
-      <Grid Grid.Row="3">
-        <Grid.RowDefinitions>
-          <RowDefinition Height="34"/>
-          <RowDefinition Height="34"/>
-          <RowDefinition Height="34"/>
-          <RowDefinition Height="34"/>
-          <RowDefinition Height="38"/>
-          <RowDefinition Height="38"/>
-          <RowDefinition Height="38"/>
-          <RowDefinition/>
-        </Grid.RowDefinitions>
-        <Grid.ColumnDefinitions>
-          <ColumnDefinition Width="72"/>
-          <ColumnDefinition/>
-          <ColumnDefinition/>
-          <ColumnDefinition Width="72"/>
-          <ColumnDefinition/>
-          <ColumnDefinition/>
-          <ColumnDefinition Width="180"/>
-          <ColumnDefinition Width="180"/>
-        </Grid.ColumnDefinitions>
+      <Grid Grid.Row="3" RowDefinitions="34,34,34,34,38,38,38,*" ColumnDefinitions="72,*,*,72,*,*,180,180">
         <TextBlock Margin="4,2" Text="Skill 1:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="0"/>
         <views:SearchComboBox ItemsSource="{Binding Skills}" SelectedIndex="{Binding ChosenSkill0}" VerticalAlignment="Center" Margin="4,2" Grid.Row="0" Grid.Column="1" Grid.ColumnSpan="4"/>
         <CheckBox Margin="4" IsChecked="{Binding SkillsOn0}" Grid.Row="0" Grid.Column="5">Enable</CheckBox>
@@ -143,40 +64,32 @@
         <views:SearchComboBox ItemsSource="{Binding Skills}" SelectedIndex="{Binding ChosenSkill3}" VerticalAlignment="Center" Margin="4,2" Grid.Row="3" Grid.Column="1" Grid.ColumnSpan="4"/>
         <CheckBox Margin="4" IsChecked="{Binding SkillsOn3}" Grid.Row="3" Grid.Column="5">Enable</CheckBox>
         <TextBlock Margin="4,2" Text="+HP:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="4"/>
-        <NumericUpDown Value="{Binding HPBonus}" VerticalAlignment="Center" Margin="4,2" Grid.Row="4" Grid.Column="1"/>
+        <NumericUpDown Increment="1" Value="{Binding HPBonus}" VerticalAlignment="Center" Margin="4,2" Grid.Row="4" Grid.Column="1"/>
         <TextBlock Margin="4,2" Text="{Binding HPTotal}" VerticalAlignment="Center" HorizontalAlignment="Left" Grid.Row="4" Grid.Column="2"/>
         <TextBlock Margin="4,2" Text="+Speed:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="4" Grid.Column="3"/>
-        <NumericUpDown Value="{Binding SpeedBonus}" VerticalAlignment="Center" Margin="4,2" Grid.Row="4" Grid.Column="4"/>
+        <NumericUpDown Increment="1" Value="{Binding SpeedBonus}" VerticalAlignment="Center" Margin="4,2" Grid.Row="4" Grid.Column="4"/>
         <TextBlock Margin="4,2" Text="{Binding SpeedTotal}" VerticalAlignment="Center" HorizontalAlignment="Left" Grid.Row="4" Grid.Column="5"/>
         <TextBlock Margin="4,2" Text="+Attack:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="5"/>
-        <NumericUpDown Value="{Binding AtkBonus}" VerticalAlignment="Center" Margin="4,2" Grid.Row="5" Grid.Column="1"/>
+        <NumericUpDown Increment="1" Value="{Binding AtkBonus}" VerticalAlignment="Center" Margin="4,2" Grid.Row="5" Grid.Column="1"/>
         <TextBlock Margin="4,2" Text="{Binding AtkTotal}" VerticalAlignment="Center" HorizontalAlignment="Left" Grid.Row="5" Grid.Column="2"/>
         <TextBlock Margin="4,2" Text="+Defense:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="5" Grid.Column="3"/>
-        <NumericUpDown Value="{Binding DefBonus}" VerticalAlignment="Center" Margin="4,2" Grid.Row="5" Grid.Column="4"/>
+        <NumericUpDown Increment="1" Value="{Binding DefBonus}" VerticalAlignment="Center" Margin="4,2" Grid.Row="5" Grid.Column="4"/>
         <TextBlock Margin="4,2" Text="{Binding DefTotal}" VerticalAlignment="Center" HorizontalAlignment="Left" Grid.Row="5" Grid.Column="5"/>
         <TextBlock Margin="4,2" Text="+M.Atk:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="6"/>
-        <NumericUpDown Value="{Binding MAtkBonus}" VerticalAlignment="Center" Margin="4,2" Grid.Row="6" Grid.Column="1"/>
+        <NumericUpDown Increment="1" Value="{Binding MAtkBonus}" VerticalAlignment="Center" Margin="4,2" Grid.Row="6" Grid.Column="1"/>
         <TextBlock Margin="4,2" Text="{Binding MAtkTotal}" VerticalAlignment="Center" HorizontalAlignment="Left" Grid.Row="6" Grid.Column="2"/>
         <TextBlock Margin="4,2" Text="+M.Def:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="6" Grid.Column="3"/>
-        <NumericUpDown Value="{Binding MDefBonus}" VerticalAlignment="Center" Margin="4,2" Grid.Row="6" Grid.Column="4"/>
+        <NumericUpDown Increment="1" Value="{Binding MDefBonus}" VerticalAlignment="Center" Margin="4,2" Grid.Row="6" Grid.Column="4"/>
         <TextBlock Margin="4,2" Text="{Binding MDefTotal}" VerticalAlignment="Center" HorizontalAlignment="Left" Grid.Row="6" Grid.Column="5"/>
         <TextBlock Margin="4,2" Text="{Binding MDefTotal}" VerticalAlignment="Center" HorizontalAlignment="Left" Grid.Row="6" Grid.Column="5"/>
 		    <CheckBox Margin="4" IsChecked="{Binding Unrecruitable}" Grid.Row="7" Grid.Column="1" Grid.ColumnSpan="3">Unrecruitable</CheckBox>
         <CheckBox Margin="4" IsChecked="{Binding Ally}" Grid.Row="7" Grid.Column="4" Grid.ColumnSpan="3">Ally</CheckBox>
 
-        <Grid Grid.RowSpan="8" Grid.Column="6">
-          <Grid.RowDefinitions>
-            <RowDefinition Height="20"/>
-            <RowDefinition/>
-          </Grid.RowDefinitions>
+        <Grid Grid.RowSpan="8" Grid.Column="6" RowDefinitions="20, *">
           <TextBlock Margin="4" VerticalAlignment="Bottom" Grid.Row="0">Action Events</TextBlock>
           <views:CollectionBox DataContext="{Binding ActionEvents}" Margin="4" Grid.Row="1"/>
         </Grid>
-        <Grid Grid.RowSpan="8" Grid.Column="7">
-          <Grid.RowDefinitions>
-            <RowDefinition Height="20"/>
-            <RowDefinition/>
-          </Grid.RowDefinitions>
+        <Grid Grid.RowSpan="8" Grid.Column="7" RowDefinitions="20, *">
           <TextBlock Margin="4" VerticalAlignment="Bottom" Grid.Row="0">Statuses</TextBlock>
           <views:CollectionBox DataContext="{Binding Statuses}" Margin="4" Grid.Row="1"/>
         </Grid>
diff --git a/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabEntrances.axaml b/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabEntrances.axaml
index 5f9aa685..c6217f6c 100644
--- a/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabEntrances.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabEntrances.axaml
@@ -15,30 +15,14 @@
     <converters:ComparisonConverter x:Key="ComparisonConverter"/>
     <converters:IntInSetConverter x:Key="ValidIdxConverter"/>
   </UserControl.Resources>
-  <Grid Margin="4" >
-    <Grid.RowDefinitions>
-      <RowDefinition Height="38"/>
-      <RowDefinition Height="40"/>
-    </Grid.RowDefinitions>
-    <Grid.ColumnDefinitions>
-      <ColumnDefinition Width="180"/>
-      <ColumnDefinition/>
-    </Grid.ColumnDefinitions>
-    <CheckBox Margin="4" IsChecked="{Binding ShowEntrances}" Grid.Row="0" Grid.Column="0">Show Entrances</CheckBox>
-    <Grid Grid.Row="0" Grid.Column="1" Margin="4">
-      <Grid.RowDefinitions>
-        <RowDefinition Height="16"/>
-        <RowDefinition Height="26"/>
-      </Grid.RowDefinitions>
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition/>
-        <ColumnDefinition/>
-      </Grid.ColumnDefinitions>
-      <TextBlock Margin="4,2" VerticalAlignment="Bottom" Grid.Row="0" Grid.Column="0">Mode</TextBlock>
-      <RadioButton IsChecked="{Binding Path=EntMode, Converter={StaticResource ComparisonConverter}, ConverterParameter={x:Static local:EntEditMode.SelectEntity}}" Margin="2" Grid.Row="1" Grid.Column="0">Select/Move</RadioButton>
+  <Grid Margin="4" RowDefinitions="38,40" ColumnDefinitions="180,*">
+    <CheckBox Margin="4" IsChecked="{Binding ShowEntrances}">Show Entrances</CheckBox>
+    <Grid Grid.Column="1" RowDefinitions="16,26" ColumnDefinitions="*,*">
+      <TextBlock Margin="4,2" VerticalAlignment="Bottom">Mode</TextBlock>
+      <RadioButton IsChecked="{Binding Path=EntMode, Converter={StaticResource ComparisonConverter}, ConverterParameter={x:Static local:EntEditMode.SelectEntity}}" Margin="2" Grid.Row="1">Select/Move</RadioButton>
       <RadioButton IsChecked="{Binding Path=EntMode, Converter={StaticResource ComparisonConverter}, ConverterParameter={x:Static local:EntEditMode.PlaceEntity}}" Margin="2" Grid.Row="1" Grid.Column="1">Add/Delete</RadioButton>
     </Grid>
-    <TextBlock Margin="4,2" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="1" Grid.Column="0">Direction:</TextBlock>
+    <TextBlock Margin="4,2" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="1">Direction:</TextBlock>
     <views:SearchComboBox ItemsSource="{Binding Directions}" SelectedIndex="{Binding ChosenDir}" VerticalAlignment="Center" Margin="4,2" Grid.Row="1" Grid.Column="1"/>
   </Grid>
 </UserControl>
diff --git a/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabItems.axaml b/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabItems.axaml
index b6ff3848..cf1a10f3 100644
--- a/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabItems.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabItems.axaml
@@ -15,71 +15,32 @@
     <converters:ComparisonConverter x:Key="ComparisonConverter"/>
     <converters:IntInSetConverter x:Key="ValidIdxConverter"/>
   </UserControl.Resources>
-  <Grid Margin="4" >
-    <Grid.RowDefinitions>
-      <RowDefinition Height="38"/>
-      <RowDefinition/>
-    </Grid.RowDefinitions>
-    <Grid.ColumnDefinitions>
-      <ColumnDefinition/>
-    </Grid.ColumnDefinitions>
-    <Grid Grid.Row="0" Margin="4">
-      <Grid.RowDefinitions>
-        <RowDefinition Height="16"/>
-        <RowDefinition Height="26"/>
-      </Grid.RowDefinitions>
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition/>
-        <ColumnDefinition/>
-      </Grid.ColumnDefinitions>
-      <TextBlock Margin="4,2" VerticalAlignment="Bottom" Grid.Row="0" Grid.Column="0">Mode</TextBlock>
-      <RadioButton IsChecked="{Binding Path=EntMode, Converter={StaticResource ComparisonConverter}, ConverterParameter={x:Static local:EntEditMode.SelectEntity}}" VerticalAlignment="Top" Margin="2" Grid.Row="1" Grid.Column="0">Select/Move</RadioButton>
-      <RadioButton IsChecked="{Binding Path=EntMode, Converter={StaticResource ComparisonConverter}, ConverterParameter={x:Static local:EntEditMode.PlaceEntity}}" VerticalAlignment="Top" Margin="2" Grid.Row="1" Grid.Column="1">Add/Delete</RadioButton>
+    <Grid Margin="4" RowDefinitions="38,*">
+        <Grid RowDefinitions="16,26" ColumnDefinitions="*,*">
+            <TextBlock Margin="4,2" VerticalAlignment="Bottom">Mode</TextBlock>
+            <RadioButton IsChecked="{Binding Path=EntMode, Converter={StaticResource ComparisonConverter}, ConverterParameter={x:Static local:EntEditMode.SelectEntity}}" VerticalAlignment="Top" Margin="2" Grid.Row="1">Select/Move</RadioButton>
+            <RadioButton IsChecked="{Binding Path=EntMode, Converter={StaticResource ComparisonConverter}, ConverterParameter={x:Static local:EntEditMode.PlaceEntity}}" VerticalAlignment="Top" Margin="2" Grid.Row="1" Grid.Column="1">Add/Delete</RadioButton>
+        </Grid>
+        <Grid Grid.Row="1" Margin="4" RowDefinitions="40,*" ColumnDefinitions="80,*">
+            <TextBlock Margin="4,2" VerticalAlignment="Center" HorizontalAlignment="Right">Item:</TextBlock>
+            <views:SearchComboBox ItemsSource="{Binding ItemTypes}" SelectedIndex="{Binding ChosenItem}" VerticalAlignment="Center" Margin="4,2" Grid.Column="1"/>
+            <TabControl TabStripPlacement="Top" SelectedIndex="{Binding TabIndex}" Margin="4" Grid.Row="1" Grid.ColumnSpan="2">
+                <TabItem Header="Money" IsVisible="{Binding Path=ChosenItem, Converter={StaticResource ValidIdxConverter}, ConverterParameter=true}">
+                    <Grid RowDefinitions="40" ColumnDefinitions="80,*">
+                        <TextBlock Margin="4,2" VerticalAlignment="Center" HorizontalAlignment="Right">Amount:</TextBlock>
+                        <NumericUpDown Value="{Binding Amount}" Minimum="1" VerticalAlignment="Center" Margin="4,2" Grid.Column="1"/>
+                    </Grid>
+                </TabItem>
+                <TabItem Header="Item" IsVisible="{Binding Path=ChosenItem, Converter={StaticResource ValidIdxConverter}, ConverterParameter=true}">
+                    <Grid RowDefinitions="40,40,40" ColumnDefinitions="80,*">
+                        <TextBlock Margin="4,2" VerticalAlignment="Center" HorizontalAlignment="Right">Amount:</TextBlock>
+                        <NumericUpDown Value="{Binding Amount}" VerticalAlignment="Center" Margin="4,2" Grid.Column="1"/>
+                        <TextBlock Margin="4,2" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="1">Hidden Value:</TextBlock>
+                        <TextBox Text="{Binding HiddenValue}" VerticalAlignment="Center" Margin="4,2" Grid.Row="1" Grid.Column="1"/>
+                        <CheckBox Margin="4" IsChecked="{Binding Cursed}" Grid.Row="2" Grid.ColumnSpan="2">Cursed</CheckBox>
+                    </Grid>
+                </TabItem>
+            </TabControl>
+        </Grid>
     </Grid>
-    <Grid Grid.Row="1" Margin="4">
-      <Grid.RowDefinitions>
-        <RowDefinition Height="40"/>
-        <RowDefinition/>
-      </Grid.RowDefinitions>
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition Width="80"/>
-        <ColumnDefinition/>
-      </Grid.ColumnDefinitions>
-      <TextBlock Margin="4,2" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Column="0">Item:</TextBlock>
-      <views:SearchComboBox ItemsSource="{Binding ItemTypes}" SelectedIndex="{Binding ChosenItem}"  VerticalAlignment="Center" Margin="4,2" Grid.Column="1"/>
-      <TabControl TabStripPlacement="Top" SelectedIndex="{Binding TabIndex}" Margin="4" Grid.Row="1" Grid.ColumnSpan="2">
-        <TabItem Header="Money" IsVisible="{Binding Path=ChosenItem, Converter={StaticResource ValidIdxConverter}, ConverterParameter=true}">
-          <Grid>
-            <Grid.RowDefinitions>
-              <RowDefinition Height="40"/>
-            </Grid.RowDefinitions>
-            <Grid.ColumnDefinitions>
-              <ColumnDefinition Width="80"/>
-              <ColumnDefinition/>
-            </Grid.ColumnDefinitions>
-            <TextBlock Margin="4,2" VerticalAlignment="Center" HorizontalAlignment="Right">Amount:</TextBlock>
-            <NumericUpDown Value="{Binding Amount}" Minimum="1" VerticalAlignment="Center" Margin="4,2" Grid.Column="1"></NumericUpDown>
-          </Grid>
-        </TabItem>
-        <TabItem Header="Item" IsVisible="{Binding Path=ChosenItem, Converter={StaticResource ValidIdxConverter}, ConverterParameter=true}">
-          <Grid>
-            <Grid.RowDefinitions>
-              <RowDefinition Height="40"/>
-              <RowDefinition Height="40"/>
-              <RowDefinition Height="40"/>
-            </Grid.RowDefinitions>
-            <Grid.ColumnDefinitions>
-              <ColumnDefinition Width="80"/>
-              <ColumnDefinition/>
-            </Grid.ColumnDefinitions>
-            <TextBlock Margin="4,2" VerticalAlignment="Center" HorizontalAlignment="Right">Amount:</TextBlock>
-            <NumericUpDown Value="{Binding Amount}" VerticalAlignment="Center" Margin="4,2" Grid.Column="1"></NumericUpDown>
-            <TextBlock Margin="4,2" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="1">Hidden Value:</TextBlock>
-            <TextBox Text="{Binding HiddenValue}" VerticalAlignment="Center" Margin="4,2" Grid.Row="1" Grid.Column="1"/>
-            <CheckBox Margin="4" IsChecked="{Binding Cursed}" Grid.Row="2" Grid.ColumnSpan="2">Cursed</CheckBox>
-          </Grid>
-        </TabItem>
-      </TabControl>
-    </Grid>
-  </Grid>
 </UserControl>
diff --git a/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabProperties.axaml b/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabProperties.axaml
index 86c632e0..46db0358 100644
--- a/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabProperties.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabProperties.axaml
@@ -25,13 +25,13 @@
       <views:ClassBox DataContext="{Binding BG}" Margin="4,2" Grid.Row="6" Grid.ColumnSpan="2"/>
       <TextBlock Margin="4,2" VerticalAlignment="Bottom" Grid.Row="5" Grid.Column="2" Grid.ColumnSpan="2" ToolTip.Tip="The tile to repeat when showing out-of-bounds tiles.&#x0a;Only used when Scroll Edge is set to Blank.">Blank Tiles:</TextBlock>
       <views:TileBox DataContext="{Binding BlankBG}" Margin="4,2" Grid.Row="6" Grid.Column="2" Grid.ColumnSpan="2"/>
-      <Grid Grid.Row="7" Grid.ColumnSpan="2">
+      <Grid Grid.Row="7" Grid.ColumnSpan="4">
         <Grid.RowDefinitions>
           <RowDefinition Height="20"/>
           <RowDefinition/>
         </Grid.RowDefinitions>
         <TextBlock Margin="4" VerticalAlignment="Bottom" Grid.Row="0" ToolTip.Tip="Maps terrain types to autotiles.&#x0a;All instances of a spacified terrain will use the specified autotile.&#x0a;This will override the terrain's original autotile.">Texture Mapping:</TextBlock>
-        <views:DictionaryBox DataContext="{Binding TextureMap}" Margin="4" Grid.Row="1"/>
+        <views:DictionaryBox DataContext="{Binding TextureMap}" Grid.Row="1" Grid.ColumnSpan="2" />
       </Grid>
     </Grid>
     <Grid Grid.Row="0" Grid.Column="1" RowDefinitions="20, *, 34">
diff --git a/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabTerrain.axaml b/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabTerrain.axaml
index f407c31f..df5f0fd3 100644
--- a/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabTerrain.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabTerrain.axaml
@@ -8,57 +8,57 @@
              xmlns:converters="clr-namespace:RogueEssence.Dev.Converters"
              mc:Ignorable="d"
              x:Class="RogueEssence.Dev.Views.MapTabTerrain">
-  <Design.DataContext>
-    <vm:MapTabTerrainViewModel/>
-  </Design.DataContext>
-  <UserControl.Resources>
-    <converters:ComparisonConverter x:Key="ComparisonConverter"/>
-  </UserControl.Resources>
-  
-  <Grid Margin="4" >
-    <Grid.RowDefinitions>
-      <RowDefinition Height="38"/>
-      <RowDefinition Height="38"/>
-      <RowDefinition/>
-    </Grid.RowDefinitions>
-    <Grid.ColumnDefinitions>
-      <ColumnDefinition Width="180"/>
-      <ColumnDefinition/>
-    </Grid.ColumnDefinitions>
-    <CheckBox Margin="4" IsChecked="{Binding ShowTerrain}" Grid.Row="0" Grid.Column="0">Show Terrain</CheckBox>
-    <Grid Grid.Row="0" Grid.Column="1">
-      <Grid.RowDefinitions>
-        <RowDefinition Height="16"/>
-        <RowDefinition Height="26"/>
-      </Grid.RowDefinitions>
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition/>
-        <ColumnDefinition/>
-        <ColumnDefinition/>
-        <ColumnDefinition/>
-      </Grid.ColumnDefinitions>
-      <TextBlock Margin="4,2" VerticalAlignment="Bottom" Grid.Row="0" Grid.Column="0">Mode</TextBlock>
-      <RadioButton IsChecked="{Binding Path=TerrainMode, Converter={StaticResource ComparisonConverter}, ConverterParameter={x:Static local:TileEditMode.Draw}}" VerticalAlignment="Top" Margin="2" Grid.Row="1" Grid.Column="0">Draw</RadioButton>
-      <RadioButton IsChecked="{Binding Path=TerrainMode, Converter={StaticResource ComparisonConverter}, ConverterParameter={x:Static local:TileEditMode.Rectangle}}" VerticalAlignment="Top" Margin="2" Grid.Row="1" Grid.Column="1">Rectangle</RadioButton>
-      <RadioButton IsChecked="{Binding Path=TerrainMode, Converter={StaticResource ComparisonConverter}, ConverterParameter={x:Static local:TileEditMode.Fill}}" VerticalAlignment="Top" Margin="2" Grid.Row="1" Grid.Column="2">Fill</RadioButton>
-      <RadioButton IsChecked="{Binding Path=TerrainMode, Converter={StaticResource ComparisonConverter}, ConverterParameter={x:Static local:TileEditMode.Eyedrop}}" VerticalAlignment="Top" Margin="2" Grid.Row="1" Grid.Column="3">Eyedrop</RadioButton>
+    <Design.DataContext>
+        <vm:MapTabTerrainViewModel />
+    </Design.DataContext>
+    <UserControl.Resources>
+        <converters:ComparisonConverter x:Key="ComparisonConverter" />
+    </UserControl.Resources>
+
+    <Grid Margin="4">
+        <Grid RowDefinitions="38,38,*" ColumnDefinitions="180,*">
+            <CheckBox Margin="4" IsChecked="{Binding ShowTerrain}" Grid.Row="0" Grid.Column="0">Show Terrain</CheckBox>
+            <Grid Grid.Row="0" Grid.Column="1" RowDefinitions="16,26" ColumnDefinitions="*,*,*,*">
+                <TextBlock Margin="4,2" VerticalAlignment="Bottom">Mode</TextBlock>
+                <RadioButton
+                    IsChecked="{Binding Path=TerrainMode, Converter={StaticResource ComparisonConverter}, ConverterParameter={x:Static local:TileEditMode.Draw}}"
+                    VerticalAlignment="Top" Margin="2" Grid.Row="1">
+                    Draw
+                </RadioButton>
+                <RadioButton
+                    IsChecked="{Binding Path=TerrainMode, Converter={StaticResource ComparisonConverter}, ConverterParameter={x:Static local:TileEditMode.Rectangle}}"
+                    VerticalAlignment="Top" Margin="2" Grid.Row="1" Grid.Column="1">
+                    Rectangle
+                </RadioButton>
+                <RadioButton
+                    IsChecked="{Binding Path=TerrainMode, Converter={StaticResource ComparisonConverter}, ConverterParameter={x:Static local:TileEditMode.Fill}}"
+                    VerticalAlignment="Top" Margin="2" Grid.Row="1" Grid.Column="2">
+                    Fill
+                </RadioButton>
+                <RadioButton
+                    IsChecked="{Binding Path=TerrainMode, Converter={StaticResource ComparisonConverter}, ConverterParameter={x:Static local:TileEditMode.Eyedrop}}"
+                    VerticalAlignment="Top" Margin="2" Grid.Row="1" Grid.Column="3">
+                    Eyedrop
+                </RadioButton>
+            </Grid>
+            <TextBlock Margin="4,2" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="1">Terrain:</TextBlock>
+            <Grid Grid.Row="1" Grid.Column="1" ColumnDefinitions="*,120">
+                <views:SearchComboBox ItemsSource="{Binding TerrainTypes}" SelectedIndex="{Binding ChosenTerrain}"
+                                      VerticalAlignment="Center" Margin="4,2" />
+                <CheckBox Margin="4" IsChecked="{Binding StableTex}" Grid.Column="1"
+                          ToolTip.Tip="Prevents the texture from being overwritten by the Texture Map.">
+                    Stable Texture
+                </CheckBox>
+            </Grid>
+            <TabControl TabStripPlacement="Top" SelectedIndex="{Binding TabIndex}" Margin="4" Grid.Row="2"
+                        Grid.ColumnSpan="2">
+                <TabItem Header="Tiles">
+                    <views:TileBrowser DataContext="{Binding TileBrowser}" />
+                </TabItem>
+                <TabItem Header="Autotiles">
+                    <views:AutotileBrowser DataContext="{Binding AutotileBrowser}" />
+                </TabItem>
+            </TabControl>
+        </Grid>
     </Grid>
-    <TextBlock Margin="4,2" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="1" Grid.Column="0">Terrain:</TextBlock>
-    <Grid Grid.Row="1" Grid.Column="1">
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition/>
-        <ColumnDefinition Width="120"/>
-      </Grid.ColumnDefinitions>
-      <views:SearchComboBox ItemsSource="{Binding TerrainTypes}" SelectedIndex="{Binding ChosenTerrain}" VerticalAlignment="Center" Margin="4,2" Grid.Column="0"/>
-      <CheckBox Margin="4" IsChecked="{Binding StableTex}" Grid.Column="1" ToolTip.Tip="Prevents the texture from being overwritten by the Texture Map.">Stable Texture</CheckBox>
-    </Grid>
-    <TabControl TabStripPlacement="Top" SelectedIndex="{Binding TabIndex}" Margin="4" Grid.Row="2" Grid.ColumnSpan="2">
-      <TabItem Header="Tiles" >
-        <views:TileBrowser DataContext="{Binding TileBrowser}"/>
-      </TabItem>
-      <TabItem Header="Autotiles" >
-        <views:AutotileBrowser DataContext="{Binding AutotileBrowser}"/>
-      </TabItem>
-    </TabControl>
-  </Grid>
-</UserControl>
+</UserControl>
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabTextures.axaml b/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabTextures.axaml
index a674d01f..1982e15d 100644
--- a/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabTextures.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabTextures.axaml
@@ -14,38 +14,20 @@
   <UserControl.Resources>
     <converters:ComparisonConverter x:Key="ComparisonConverter"/>
   </UserControl.Resources>
-  <Grid Margin="4" >
-    <Grid.RowDefinitions>
-      <RowDefinition Height="38"/>
-      <RowDefinition/>
-    </Grid.RowDefinitions>
-    <Grid.ColumnDefinitions>
-      <ColumnDefinition Width="180"/>
-      <ColumnDefinition/>
-    </Grid.ColumnDefinitions>
-    <views:LayerBox DataContext="{Binding Layers}" Grid.Row="0" Grid.RowSpan="2" Grid.Column="0"/>
-    <Grid Grid.Row="0" Grid.Column="1">
-      <Grid.RowDefinitions>
-        <RowDefinition Height="16"/>
-        <RowDefinition Height="26"/>
-      </Grid.RowDefinitions>
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition/>
-        <ColumnDefinition/>
-        <ColumnDefinition/>
-        <ColumnDefinition/>
-      </Grid.ColumnDefinitions>
-      <TextBlock Margin="4,2" VerticalAlignment="Bottom" Grid.Row="0" Grid.Column="0">Mode</TextBlock>
-      <RadioButton IsChecked="{Binding Path=TexMode, Converter={StaticResource ComparisonConverter}, ConverterParameter={x:Static local:TileEditMode.Draw}}" VerticalAlignment="Top" Margin="2" Grid.Row="1" Grid.Column="0">Draw</RadioButton>
+  <Grid Margin="4" RowDefinitions="38,*" ColumnDefinitions="180,*">
+    <views:LayerBox DataContext="{Binding Layers}" Grid.RowSpan="2"/>
+    <Grid Grid.Column="1" RowDefinitions="16,26" ColumnDefinitions="*,*,*,*">
+      <TextBlock Margin="4,2" VerticalAlignment="Bottom">Mode</TextBlock>
+      <RadioButton IsChecked="{Binding Path=TexMode, Converter={StaticResource ComparisonConverter}, ConverterParameter={x:Static local:TileEditMode.Draw}}" VerticalAlignment="Top" Margin="2" Grid.Row="1">Draw</RadioButton>
       <RadioButton IsChecked="{Binding Path=TexMode, Converter={StaticResource ComparisonConverter}, ConverterParameter={x:Static local:TileEditMode.Rectangle}}" VerticalAlignment="Top" Margin="2" Grid.Row="1" Grid.Column="1">Rectangle</RadioButton>
       <RadioButton IsChecked="{Binding Path=TexMode, Converter={StaticResource ComparisonConverter}, ConverterParameter={x:Static local:TileEditMode.Fill}}" VerticalAlignment="Top" Margin="2" Grid.Row="1" Grid.Column="2">Fill</RadioButton>
       <RadioButton IsChecked="{Binding Path=TexMode, Converter={StaticResource ComparisonConverter}, ConverterParameter={x:Static local:TileEditMode.Eyedrop}}" VerticalAlignment="Top" Margin="2" Grid.Row="1" Grid.Column="3">Eyedrop</RadioButton>
     </Grid>
     <TabControl TabStripPlacement="Top" SelectedIndex="{Binding TabIndex}" Margin="4" Grid.Row="1" Grid.Column="1">
-      <TabItem Header="Tiles" >
+      <TabItem Header="Tiles">
         <views:TileBrowser DataContext="{Binding TileBrowser}"/>
       </TabItem>
-      <TabItem Header="Autotiles" >
+      <TabItem Header="Autotiles">
         <views:AutotileBrowser DataContext="{Binding AutotileBrowser}"/>
       </TabItem>
     </TabControl>
diff --git a/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml b/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml
index 65f9afe6..ed9afd82 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml
@@ -11,29 +11,16 @@
                     d:DesignHeight="450"
                     x:Class="RogueEssence.Dev.Views.DevForm"
                     x:Name="WindowMain"
+                    MinHeight="400"
+                    MinWidth="600"
                     Opened="Window_Loaded" Closed="Window_Closed"
-                    Title="Avalonia PMD Editor">
+                    Title="PMDO Editor">
 
     <Design.DataContext>
-
-
         <vm:DevFormViewModel />
-
-
     </Design.DataContext>
-    <!-- <v:ChromelessWindow.DataContext> -->
-    <!--   <vm:MainWindowViewModel /> -->
-    <!-- </v:ChromelessWindow.DataContext> -->
-
-    <!-- x:DataType="vm:MainWindowViewModel" -->
-    <!-- Icon="/Assets/avalonia-logo.ico" -->
-    <!-- x:DataType="vm:MainWindowViewModel" -->
-    <!-- <Design.DataContext> -->
-    <!-- <vm:MainWindowViewModel /> -->
-    <!-- </Design.DataContext> -->
     <Window.Resources>
         <c:WindowStateToColumnConverter x:Key="WindowStateToColumnConverter" />
-
     </Window.Resources>
     <Grid>
         <Grid.RowDefinitions>
@@ -138,7 +125,7 @@
                                   ShowColumnHeaders="False"
                                   Source="{Binding NodeSource}">
                         <TreeDataGrid.Resources>
-                    
+
                             <DataTemplate x:Key="TreeDataGridNodeBaseTemplate" DataType="vm:NodeBase">
                                 <ContentControl Content="{Binding}">
                                     <ContentControl.DataTemplates>
@@ -149,18 +136,18 @@
                                         <!--                     Icon="{Binding Icon}" -->
                                         <!--                     IconSize="12" /> -->
 
-                                                <!-- <Button Grid.Column="1" HorizontalAlignment="Left" -->
-                                                <!--         Classes="icon_button" -->
-                                                <!--         Padding="4, 0, 0, 0" -->
-                                                <!--         Width="18" Height="18" -->
-                                                <!--         IsVisible="{Binding IsPointerOver, RelativeSource={RelativeSource AncestorType=TreeDataGridRow}}" -->
-                                                <!-- -->
-                                                <!--         Command="{Binding AddCommand}"> -->
-                                                <!--     <Path Stretch="Fill" -->
-                                                <!--           Fill="{DynamicResource Brush.FG1}" -->
-                                                <!--           Width="12" Height="12" -->
-                                                <!--           Data="{StaticResource Icons.Plus}" /> -->
-                                                <!-- </Button> -->
+                                        <!-- <Button Grid.Column="1" HorizontalAlignment="Left" -->
+                                        <!--         Classes="icon_button" -->
+                                        <!--         Padding="4, 0, 0, 0" -->
+                                        <!--         Width="18" Height="18" -->
+                                        <!--         IsVisible="{Binding IsPointerOver, RelativeSource={RelativeSource AncestorType=TreeDataGridRow}}" -->
+                                        <!-- -->
+                                        <!--         Command="{Binding AddCommand}"> -->
+                                        <!--     <Path Stretch="Fill" -->
+                                        <!--           Fill="{DynamicResource Brush.FG1}" -->
+                                        <!--           Width="12" Height="12" -->
+                                        <!--           Data="{StaticResource Icons.Plus}" /> -->
+                                        <!-- </Button> -->
                                         <!--     </Grid> -->
                                         <!-- </DataTemplate> -->
 
@@ -226,77 +213,29 @@
 
                 </Border>
 
-      <!-- Editor Content -->
-<Panel Grid.Row="1" Background="{DynamicResource Brush.PageBackground}">
-    
-    <!-- Temporary tab still uses ContentControl since it's transient -->
-    <ContentControl Content="{Binding TemporaryTab}"
-                    IsVisible="{Binding TemporaryTab, Converter={x:Static ObjectConverters.IsNotNull}}" />
-    
-    <!-- All permanent pages kept alive, just toggling visibility -->
-    <ItemsControl ItemsSource="{Binding Pages}"
-                  IsVisible="{Binding TemporaryTab, Converter={x:Static ObjectConverters.IsNull}}">
-        <ItemsControl.ItemsPanel>
-            <ItemsPanelTemplate>
-                <Panel/>
-            </ItemsPanelTemplate>
-        </ItemsControl.ItemsPanel>
-        <ItemsControl.ItemTemplate>
-            <DataTemplate>
-                <ContentControl Content="{Binding}" IsVisible="{Binding IsActive}"/>
-            </DataTemplate>
-        </ItemsControl.ItemTemplate>
-    </ItemsControl>
-    
-</Panel>
+                <!-- Editor Content -->
+                <Panel Grid.Row="1" Background="{DynamicResource Brush.PageBackground}">
+
+                    <!-- Temporary tab still uses ContentControl since it's transient -->
+                    <ContentControl Content="{Binding TemporaryTab}"
+                                    IsVisible="{Binding TemporaryTab, Converter={x:Static ObjectConverters.IsNotNull}}" />
+
+                    <!-- All permanent pages kept alive, just toggling visibility -->
+                    <ItemsControl ItemsSource="{Binding Pages}"
+                                  IsVisible="{Binding TemporaryTab, Converter={x:Static ObjectConverters.IsNull}}">
+                        <ItemsControl.ItemsPanel>
+                            <ItemsPanelTemplate>
+                                <Panel />
+                            </ItemsPanelTemplate>
+                        </ItemsControl.ItemsPanel>
+                        <ItemsControl.ItemTemplate>
+                            <DataTemplate>
+                                <ContentControl Content="{Binding}" IsVisible="{Binding IsActive}" />
+                            </DataTemplate>
+                        </ItemsControl.ItemTemplate>
+                    </ItemsControl>
+                </Panel>
             </Grid>
         </Grid>
-
     </Grid>
-
-</v:ChromelessWindow>
-
-
-<!-- <views:ChromelessWindow xmlns="https://github.com/avaloniaui" -->
-<!--         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" -->
-<!--         xmlns:vm="clr-namespace:RogueEssence.Dev.ViewModels;assembly=RogueEssence.Editor.Avalonia" -->
-<!--         xmlns:views="clr-namespace:RogueEssence.Dev.Views" -->
-<!--         xmlns:d="http://schemas.microsoft.com/expression/blend/2008" -->
-<!--         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" -->
-<!--         xmlns:v="clr-namespace:RogueEssence.Dev.Views" -->
-<!--         mc:Ignorable="d" -->
-<!--         x:Class="RogueEssence.Dev.Views.MainWindow" -->
-<!--         Title="Dev Controls" Height="480" Width="460" Opened="Window_Loaded" Closed="Window_Closed"> -->
-<!--     ~1~Icon="/Assets/app-logo.ico"@1@ -->
-<!--     <Design.DataContext> -->
-<!--         <vm:DevFormViewModel/> -->
-<!--     </Design.DataContext> -->
-<!--     <Grid> -->
-<!--         <TabControl TabStripPlacement="Top" Margin="2"> -->
-<!--             <TabItem Header="Game" > -->
-<!--                 <views:DevTabGame DataContext="{Binding Game}"/> -->
-<!--             </TabItem> -->
-<!--             <TabItem Header="Player" > -->
-<!--                 <views:DevTabPlayer DataContext="{Binding Player}"/> -->
-<!--             </TabItem> -->
-<!--             <TabItem Header="Travel" > -->
-<!--                 <views:DevTabTravel DataContext="{Binding Travel}"/> -->
-<!--             </TabItem> -->
-<!--             <TabItem Header="Data" > -->
-<!--                 <views:DevTabData DataContext="{Binding Data}"/> -->
-<!--             </TabItem> -->
-<!--             <TabItem Header="Sprites" > -->
-<!--                 <views:DevTabSprites DataContext="{Binding Sprites}"/> -->
-<!--             </TabItem> -->
-<!--             <TabItem Header="Script" > -->
-<!--                 <views:DevTabScript DataContext="{Binding Script}"/> -->
-<!--             </TabItem> -->
-<!--             <TabItem Header="Mods" > -->
-<!--                 <views:DevTabMods DataContext="{Binding Mods}"/> -->
-<!--             </TabItem> -->
-<!--             <TabItem Header="Constants" > -->
-<!--                 <views:DevTabConstants DataContext="{Binding Constants}"/> -->
-<!--             </TabItem> -->
-<!--         </TabControl> -->
-<!--     </Grid> -->
-<!-- </views:ChromelessWindow> -->
\ No newline at end of file
+</v:ChromelessWindow>
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml.cs b/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml.cs
index 9f316a6e..aee50683 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml.cs
@@ -29,18 +29,24 @@ public partial class DevForm : ChromelessWindow, IRootEditor
 {
     public bool LoadComplete { get; private set; }
 
-        public MapEditorPageViewModel MapEditPage;
-        public GroundEditForm GroundEditForm;
+        public MapEditorPageViewModel MapEditorPage;
+        public GroundEditorPageViewModel GroundEditorPage;
 
         private Action pendingEditorAction;
         private Exception pendingException;
 
         public IMapEditor MapEditor 
         { 
-            get { return MapEditPage; }
-            set { MapEditPage = (MapEditorPageViewModel)value; }
+            get { return MapEditorPage; }
+            set { MapEditorPage = (MapEditorPageViewModel)value; }
         }
-        public IGroundEditor GroundEditor { get { return GroundEditForm; } }
+        
+        public IGroundEditor GroundEditor 
+        { 
+            get { return GroundEditorPage; }
+            set { GroundEditorPage = (GroundEditorPageViewModel)value; }
+        }
+        
         public bool AteMouse { get { return false; } }
         public bool AteKeyboard { get { return false; } }
 
@@ -177,15 +183,15 @@ private void update()
                     }
                     devViewModel.Player.UpdateSpecies(Dungeon.DungeonScene.Instance.FocusedCharacter.BaseForm);
                 }
-                if (GroundEditForm != null)
+                if (GroundEditorPage != null)
                 {
-                    ViewModels.GroundEditViewModel vm = (ViewModels.GroundEditViewModel)GroundEditForm.DataContext;
+                    ViewModels.GroundEditorPageViewModel vm = GroundEditorPage;
                     vm.Textures.TileBrowser.UpdateFrame();
                 }
-                if (MapEditPage != null)
+                if (MapEditorPage != null)
                 {
 
-                    MapEditorPageViewModel vm = MapEditPage;
+                    MapEditorPageViewModel vm = MapEditorPage;
                     vm.Textures.TileBrowser.UpdateFrame();
                     vm.Terrain.TileBrowser.UpdateFrame();
                 }
@@ -203,11 +209,8 @@ public void OpenGround()
 
         private void openGround()
         {
-            GroundEditForm = new GroundEditForm();
-            ViewModels.GroundEditViewModel vm = new ViewModels.GroundEditViewModel();
-            GroundEditForm.DataContext = vm;
-            vm.LoadFromCurrentGround();
-            GroundEditForm.Show();
+            DevFormViewModel vm  = (DevFormViewModel)this.DataContext;
+            vm.OpenGroundEditor();
         }
 
         public void OpenMap()
@@ -219,7 +222,6 @@ public void openMap()
         {
             DevFormViewModel vm  = (DevFormViewModel)this.DataContext;
             vm.OpenMapEditor();
-
         }
 
         public void groundEditorClosed(object sender, EventArgs e)
@@ -235,22 +237,22 @@ public void mapEditorClosed(object sender, EventArgs e)
 
         private IEnumerator<YieldInstruction> resetEditors()
         {
-            GroundEditForm = null;
-            MapEditPage = null;
+            GroundEditorPage = null;
+            MapEditorPage = null;
             yield return CoroutineManager.Instance.StartCoroutine(GameManager.Instance.RestartToTitle());
         }
         
 
         public void CloseGround()
         {
-            if (GroundEditForm != null)
-                GroundEditForm.Close();
+            if (GroundEditorPage != null)
+                GroundEditorPage.Close();
         }
 
         public void CloseMap()
         {
-            if (MapEditPage != null)
-                MapEditPage.Close();
+            if (MapEditorPage != null)
+                MapEditorPage.Close();
         }
         
         void LoadGame()
@@ -610,7 +612,7 @@ private void LeftTreeDataGrid_OnDoubleTapped(object? sender, TappedEventArgs e)
         if (DataContext is DevFormViewModel vm && sender is TreeDataGrid treeView)
         {
             var selectedItem = (OpenEditorNode)treeView.RowSelection.SelectedItem;
-            if (selectedItem != null)
+            if (selectedItem != null && selectedItem.EditorType != typeof(EmptyPageViewModel))
             {
                 vm.AddPageFromTreeNode(selectedItem);
             }
diff --git a/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/MapLayerWindowView.axaml b/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/MapLayerWindowView.axaml
new file mode 100644
index 00000000..5f797b59
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/MapLayerWindowView.axaml
@@ -0,0 +1,52 @@
+<v:ChromelessWindow xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:vm="using:RogueEssence.Dev.ViewModels"
+                    x:Class="RogueEssence.Dev.Views.MapLayerWindowView"
+                    xmlns:v="using:RogueEssence.Dev.Views"
+                    x:DataType="vm:MapLayerWindowViewModel"
+                    CanResize="False"
+                    Width="500"
+                    MaxWidth="350"
+                    
+                    Height="210"
+                    x:Name="ThisControl">
+
+    <Design.DataContext>
+        <vm:MapLayerWindowViewModel/>
+    </Design.DataContext>
+    <Grid RowDefinitions="Auto,*">
+        <!-- TitleBar -->
+        <Grid Grid.Row="0" Height="28" IsVisible="{Binding !#ThisControl.UseSystemWindowFrame}">
+            <Border Background="{DynamicResource Brush.TitleBar}"
+                    BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border0}"
+                    PointerPressed="BeginMoveWindow" />
+
+            <Path Width="14" Height="14"
+                  Margin="10,0,0,0"
+                  HorizontalAlignment="Left"
+                  Data="{StaticResource Icons.SoftwareUpdate}"
+                  IsVisible="{OnPlatform True, macOS=False}" />
+
+            <TextBlock Classes="bold"
+                       x:Name="TitleText"
+                       Text="{Binding #ThisControl.Title}"
+                       HorizontalAlignment="Center" VerticalAlignment="Center"
+                       IsHitTestVisible="False" />
+            
+            <v:CaptionButtons HorizontalAlignment="Right"
+                              IsCloseButtonOnly="True"
+                              IsVisible="{OnPlatform True, macOS=False}"/>
+            
+        </Grid>
+        
+        <Grid Grid.Row="1" Margin="4" RowDefinitions="20,42,26,26,26,42" ColumnDefinitions="*,*">
+            <TextBlock VerticalAlignment="Bottom" Grid.ColumnSpan="2">Layer Name</TextBlock>
+            <TextBox Text="{Binding Name}" VerticalAlignment="Center" Margin="4" Grid.Row="1" Grid.ColumnSpan="2"/>
+            <RadioButton Margin="4,0" IsChecked="{Binding Front}" VerticalAlignment="Center" Grid.Row="2" Grid.ColumnSpan="2">Draw in Front</RadioButton>
+            <RadioButton Margin="4,0" IsChecked="{Binding Mid}" VerticalAlignment="Center" Grid.Row="3" Grid.ColumnSpan="2">Draw on Terrain</RadioButton>
+            <RadioButton Margin="4,0" IsChecked="{Binding Back}" VerticalAlignment="Center" Grid.Row="4" Grid.ColumnSpan="2">Draw below Terrain</RadioButton>
+            <Button Classes="flat"  Click="btnCancel_Click" Margin="4" Grid.Row="5" Grid.Column="0">Cancel</Button>
+            <Button Classes="flat primary" Grid.Column="1" Click="btnOK_Click" IsEnabled="{Binding AllowConfirm}" Margin="4" Grid.Row="5">OK</Button>
+        </Grid>
+    </Grid>
+</v:ChromelessWindow>
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/MapLayerWindowView.axaml.cs b/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/MapLayerWindowView.axaml.cs
new file mode 100644
index 00000000..b2ad2223
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/MapLayerWindowView.axaml.cs
@@ -0,0 +1,27 @@
+using System;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+using Avalonia.Markup.Xaml;
+
+namespace RogueEssence.Dev.Views
+{
+    public partial class MapLayerWindowView: ChromelessWindow
+    {
+        public MapLayerWindowView()
+        {
+            this.InitializeComponent();
+        }
+
+        public void btnOK_Click(object sender, RoutedEventArgs e)
+        {
+            this.Close(true);
+        }
+
+
+        public void btnCancel_Click(object sender, RoutedEventArgs e)
+        {
+            this.Close(false);
+        }
+    }
+}
diff --git a/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/MapResizeWindowView.axaml b/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/MapResizeWindowView.axaml
new file mode 100644
index 00000000..7c9100da
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/MapResizeWindowView.axaml
@@ -0,0 +1,88 @@
+<v:ChromelessWindow xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:vm="using:RogueEssence.Dev.ViewModels"
+                    x:Class="RogueEssence.Dev.Views.MapResizeWindowView"
+                    x:DataType="vm:MapResizeWindowViewModel"
+                    xmlns:v="using:RogueEssence.Dev.Views"
+                    CanResize="False"
+                    Title="Resize Map" 
+                    Height="380" 
+                    Width="260"
+                    xmlns:converters="clr-namespace:RogueEssence.Dev.Converters"
+                    xmlns:local="clr-namespace:RogueElements;assembly=RogueElements"
+                    x:Name="ThisControl">
+
+    <v:ChromelessWindow.Resources>
+        <converters:ComparisonXConverter x:Key="ComparisonXConverter"/>
+    </v:ChromelessWindow.Resources>
+    <Design.DataContext>
+        <vm:MapResizeWindowViewModel />
+    </Design.DataContext>
+
+    <Grid RowDefinitions="Auto, *, 30">
+        <!-- TitleBar -->
+        <Grid Grid.Row="0" Height="28" IsVisible="{Binding !#ThisControl.UseSystemWindowFrame}">
+            <Border Background="{DynamicResource Brush.TitleBar}"
+                    BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border0}"
+                    PointerPressed="BeginMoveWindow" />
+
+            <Path Width="14" Height="14"
+                  Margin="10,0,0,0"
+                  HorizontalAlignment="Left"
+                  Data="{StaticResource Icons.SoftwareUpdate}"
+                  IsVisible="{OnPlatform True, macOS=False}" />
+
+            <TextBlock Classes="bold"
+                       x:Name="TitleText"
+                       Text="{Binding #ThisControl.Title}"
+                       HorizontalAlignment="Center" VerticalAlignment="Center"
+                       IsHitTestVisible="False" />
+
+            <v:CaptionButtons HorizontalAlignment="Right"
+                              IsCloseButtonOnly="True"
+                              IsVisible="{OnPlatform True, macOS=False}" />
+
+        </Grid>
+        
+
+        <Grid Grid.Row="1" Margin="4" RowDefinitions="20,42,20,42,20,40,80,40" ColumnDefinitions="*,*,*,*">
+            <Grid.Styles>
+                <!-- <Grid.Styles> -->
+                <Style Selector="Button">
+                    <Setter Property="HorizontalAlignment" Value="Stretch"/>
+                    <Setter Property="VerticalAlignment" Value="Stretch"/>
+                    <Setter Property="HorizontalContentAlignment" Value="Center"/>
+                    <Setter Property="VerticalContentAlignment" Value="Center"/>
+                    <Setter Property="Background" Value="{DynamicResource Brush.ListBox.Background}" />
+                    <Setter Property="BorderBrush" Value="{DynamicResource Brush.Border2}" />
+                    <Setter Property="BorderThickness" Value="1" />
+                    <Setter Property="CornerRadius" Value="0" />
+                </Style>
+                <Style Selector="Button:pointerover">
+                    <Setter Property="BorderBrush" Value="{DynamicResource Brush.Border2}"/>
+                    <Setter Property="BorderThickness" Value="1"/>
+                </Style>
+                <!-- </Grid.Styles> -->
+            </Grid.Styles>
+            <TextBlock Margin="4" VerticalAlignment="Bottom" Grid.ColumnSpan="4">Width</TextBlock>
+            <NumericUpDown Increment="1" Value="{Binding MapWidth}" Minimum="1" Maximum="1000" Margin="4" Grid.Row="1" Grid.ColumnSpan="4"/>
+            <TextBlock Margin="4" VerticalAlignment="Bottom" Grid.Row="2" Grid.ColumnSpan="4">Height</TextBlock>
+            <NumericUpDown  Increment="1" Value="{Binding MapHeight}" Minimum="1" Maximum="1000" Margin="4" Grid.Row="3" Grid.ColumnSpan="4"/>
+            <TextBlock Margin="4" VerticalAlignment="Bottom" Grid.Row="4" Grid.ColumnSpan="4">Anchor</TextBlock>
+            <Button Command="{Binding btnUpLeft_Click}" Content="{Binding Path=ResizeDir, Converter={StaticResource ComparisonXConverter}, ConverterParameter={x:Static local:Dir8.UpLeft}}" Margin="4" Grid.Row="5"/>
+            <Button Command="{Binding btnUp_Click}" Content="{Binding Path=ResizeDir, Converter={StaticResource ComparisonXConverter}, ConverterParameter={x:Static local:Dir8.Up}}" Margin="4" Grid.Row="5" Grid.Column="1" Grid.ColumnSpan="2"/>
+            <Button Command="{Binding btnUpRight_Click}" Content="{Binding Path=ResizeDir, Converter={StaticResource ComparisonXConverter}, ConverterParameter={x:Static local:Dir8.UpRight}}" Margin="4" Grid.Row="5" Grid.Column="3"/>
+            <Button Command="{Binding btnLeft_Click}" Content="{Binding Path=ResizeDir, Converter={StaticResource ComparisonXConverter}, ConverterParameter={x:Static local:Dir8.Left}}" Margin="4" Grid.Row="6"/>
+            <Button Command="{Binding btnNone_Click}" Content="{Binding Path=ResizeDir, Converter={StaticResource ComparisonXConverter}, ConverterParameter={x:Static local:Dir8.None}}" Margin="4" Grid.Row="6" Grid.Column="1" Grid.ColumnSpan="2"/>
+            <Button Command="{Binding btnRight_Click}" Content="{Binding Path=ResizeDir, Converter={StaticResource ComparisonXConverter}, ConverterParameter={x:Static local:Dir8.Right}}" Margin="4" Grid.Row="6" Grid.Column="3"/>
+            <Button Command="{Binding btnDownLeft_Click}" Content="{Binding Path=ResizeDir, Converter={StaticResource ComparisonXConverter}, ConverterParameter={x:Static local:Dir8.DownLeft}}" Margin="4" Grid.Row="7"/>
+            <Button Command="{Binding btnDown_Click}" Content="{Binding Path=ResizeDir, Converter={StaticResource ComparisonXConverter}, ConverterParameter={x:Static local:Dir8.Down}}" Margin="4" Grid.Row="7" Grid.Column="1" Grid.ColumnSpan="2"/>
+            <Button Command="{Binding btnDownRight_Click}" Content="{Binding Path=ResizeDir, Converter={StaticResource ComparisonXConverter}, ConverterParameter={x:Static local:Dir8.DownRight}}" Margin="4" Grid.Row="7" Grid.Column="3"/>
+        </Grid>
+        <Grid Grid.Row="2" ColumnDefinitions="*, *">
+            <Button Classes="flat" Click="btnCancel_Click" Margin="4" Grid.Column="0">Cancel</Button>
+            <Button Classes="flat primary" Click="btnOK_Click" Margin="4" Grid.Column="1">OK</Button>
+        </Grid>
+    </Grid>
+
+</v:ChromelessWindow>
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/MapResizeWindowView.axaml.cs b/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/MapResizeWindowView.axaml.cs
new file mode 100644
index 00000000..3fde4c80
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/MapResizeWindowView.axaml.cs
@@ -0,0 +1,30 @@
+using System.Linq;
+using System.Threading.Tasks;
+using Avalonia.Controls;
+using Avalonia.Controls.ApplicationLifetimes;
+using Avalonia.Interactivity;
+using RogueEssence.Dev.Services;
+using RogueEssence.Dev.ViewModels;
+
+namespace RogueEssence.Dev.Views
+{
+    public partial class MapResizeWindowView : ChromelessWindow
+    {
+        public MapResizeWindowView()
+        {
+            this.InitializeComponent();
+        }
+    
+        
+        public void btnOK_Click(object sender, RoutedEventArgs e)
+        {
+            this.Close(true);
+        }
+
+
+        public void btnCancel_Click(object sender, RoutedEventArgs e)
+        {
+            this.Close(false);
+        }
+    }
+}
diff --git a/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/MapRetileWindow.axaml b/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/MapRetileWindowView.axaml
similarity index 76%
rename from RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/MapRetileWindow.axaml
rename to RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/MapRetileWindowView.axaml
index 5516d5b2..3bcb063a 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/MapRetileWindow.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/MapRetileWindowView.axaml
@@ -1,14 +1,14 @@
 <v:ChromelessWindow xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:vm="using:RogueEssence.Dev.ViewModels"
-                    x:Class="RogueEssence.Dev.Views.MapRetileWindow"
+                    x:Class="RogueEssence.Dev.Views.MapRetileWindowView"
                     x:DataType="vm:MapRetileWindowViewModel"
                     xmlns:v="using:RogueEssence.Dev.Views"
                     CanResize="False"
-                    MaxWidth="400"
-                    MinWidth="300"
-                    x:Name="ThisControl"
-                    SizeToContent="WidthAndHeight">
+      
+                    Height="240"
+                    Width="300"
+                    x:Name="ThisControl">
 
     <Design.DataContext>
         <vm:MapRetileWindowViewModel />
@@ -28,7 +28,7 @@
                   IsVisible="{OnPlatform True, macOS=False}" />
 
             <TextBlock Classes="bold"
-                       Text="{Binding Title}"
+                       Text="{Binding !#ThisControl.Title}"
                        HorizontalAlignment="Center" VerticalAlignment="Center"
                        IsHitTestVisible="False" />
 
@@ -37,16 +37,15 @@
                               IsVisible="{OnPlatform True, macOS=False}" />
 
         </Grid>
-        <Grid Grid.Row="1" Margin="4" RowDefinitions="20, 42, *, 42" ColumnDefinitions="*, *">
+        <Grid Grid.Row="1" Margin="4" RowDefinitions="20, 42, *, 30" ColumnDefinitions="*, *">
             <TextBlock Margin="4" VerticalAlignment="Bottom" Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2">Tile Size (Pixels)</TextBlock>
-            <NumericUpDown Value="{Binding TileSize}" Minimum="1" Maximum="256" Margin="4" Grid.Row="1" Grid.Column="0"
+            <NumericUpDown Increment="1" Value="{Binding TileSize}" Minimum="1" Maximum="256" Margin="4" Grid.Row="1" Grid.Column="0"
                            Grid.ColumnSpan="2">
             </NumericUpDown>
             <TextBlock Margin="4" TextWrapping="Wrap" Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2"
                        Text="{Binding Message}" />
-            <Button Click="btnOK_Click" IsEnabled="{Binding AllowConfirm}" Margin="4" Grid.Row="3" Grid.Column="0">OK</Button>
-            <Button Click="btnCancel_Click" Margin="4" Grid.Row="3" Grid.Column="1">Cancel</Button>
+            <Button Classes="flat" Click="btnCancel_Click" Margin="4" Grid.Row="3" Grid.Column="0">Cancel</Button>
+            <Button Classes="flat primary" Click="btnOK_Click" IsEnabled="{Binding AllowConfirm}" Margin="4" Grid.Row="3" Grid.Column="1">OK</Button>
         </Grid>
     </Grid>
-
 </v:ChromelessWindow>
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/MapRetileWindow.axaml.cs b/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/MapRetileWindowView.axaml.cs
similarity index 84%
rename from RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/MapRetileWindow.axaml.cs
rename to RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/MapRetileWindowView.axaml.cs
index 483b4d58..67c71caa 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/MapRetileWindow.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/MapRetileWindowView.axaml.cs
@@ -8,14 +8,14 @@
 
 namespace RogueEssence.Dev.Views
 {
-    public partial class MapRetileWindow : ChromelessWindow
+    public partial class MapRetileWindowView : ChromelessWindow
     {
-        public MapRetileWindow()
+        public MapRetileWindowView()
         {
             // var pref = ViewModels.PreferencesWindowViewModel.Instance;
             // DataContext = pref;
             // CloseOnESC = true;
-            // InitializeComponent();
+            this.InitializeComponent();
         }
     
         protected override void OnClosing(WindowClosingEventArgs e)
@@ -36,6 +36,7 @@ public void btnOK_Click(object sender, RoutedEventArgs e)
 
         public void btnCancel_Click(object sender, RoutedEventArgs e)
         {
+            this.Close(false);
         }
     }
 }
diff --git a/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/ModNameWindowView.axaml b/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/ModNameWindowView.axaml
new file mode 100644
index 00000000..f1010748
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/ModNameWindowView.axaml
@@ -0,0 +1,54 @@
+<v:ChromelessWindow xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:vm="using:RogueEssence.Dev.ViewModels"
+                    x:Class="RogueEssence.Dev.Views.ModNameWindowView"
+                    xmlns:v="using:RogueEssence.Dev.Views"
+                    x:DataType="vm:ModNameWindowViewModel"
+                    CanResize="False"
+                    Width="500"
+                    MaxWidth="350"
+                    Height="160"
+                    x:Name="ThisControl">
+
+    <Design.DataContext>
+        <vm:ModNameWindowViewModel></vm:ModNameWindowViewModel>
+    </Design.DataContext>
+    <Grid RowDefinitions="Auto,*">
+        <!-- TitleBar -->
+        <Grid Grid.Row="0" Height="28" IsVisible="{Binding !#ThisControl.UseSystemWindowFrame}">
+            <Border Background="{DynamicResource Brush.TitleBar}"
+                    BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border0}"
+                    PointerPressed="BeginMoveWindow" />
+
+            <Path Width="14" Height="14"
+                  Margin="10,0,0,0"
+                  HorizontalAlignment="Left"
+                  Data="{StaticResource Icons.SoftwareUpdate}"
+                  IsVisible="{OnPlatform True, macOS=False}" />
+
+            <TextBlock Classes="bold"
+                       x:Name="TitleText"
+                       Text="{Binding #ThisControl.Title}"
+                       HorizontalAlignment="Center" VerticalAlignment="Center"
+                       IsHitTestVisible="False" />
+            
+            <v:CaptionButtons HorizontalAlignment="Right"
+                              IsCloseButtonOnly="True"
+                              IsVisible="{OnPlatform True, macOS=False}"/>
+            
+        </Grid>
+        
+        <Grid Grid.Row="1" Margin="4" RowDefinitions="Auto, Auto">
+            <Grid RowDefinitions="36, 36" ColumnDefinitions="72, *">
+                <TextBlock Margin="4,2" Text="Name:" VerticalAlignment="Center" HorizontalAlignment="Right" />
+                <TextBox Grid.Column="1" Text="{Binding Name}" VerticalAlignment="Center" Margin="4" />
+                <TextBlock  Grid.Row="1" Margin="4,2" Text="Namespace:" VerticalAlignment="Center" HorizontalAlignment="Right" />
+                <TextBox Grid.Row="1" Grid.Column="1" Text="{Binding Namespace}" VerticalAlignment="Center" Margin="4" />
+            </Grid>
+            <Grid Grid.Row="1" Margin="4" ColumnDefinitions="*, *">
+                <Button Classes="flat" HorizontalContentAlignment="Center" Click="btnCancel_Click" Margin="4" Grid.Column="0">Cancel</Button>
+                <Button Classes="flat primary"  Click="btnOK_Click" Margin="4" Grid.Column="1">OK</Button>
+            </Grid>    
+        </Grid>
+    </Grid>
+</v:ChromelessWindow>
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/ModNameWindowView.axaml.cs b/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/ModNameWindowView.axaml.cs
new file mode 100644
index 00000000..95028dea
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/ModNameWindowView.axaml.cs
@@ -0,0 +1,27 @@
+using System;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+using Avalonia.Markup.Xaml;
+
+namespace RogueEssence.Dev.Views
+{
+    public partial class ModNameWindowView: ChromelessWindow
+    {
+        public ModNameWindowView()
+        {
+            this.InitializeComponent();
+        }
+
+        public void btnOK_Click(object sender, RoutedEventArgs e)
+        {
+            this.Close(true);
+        }
+
+
+        public void btnCancel_Click(object sender, RoutedEventArgs e)
+        {
+            this.Close(false);
+        }
+    }
+}
diff --git a/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/RenameWindowView.axaml b/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/RenameWindowView.axaml
index f5285cb8..1adf0ae6 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/RenameWindowView.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/RenameWindowView.axaml
@@ -10,6 +10,9 @@
                     Height="120"
                     x:Name="ThisControl">
 
+    <Design.DataContext>
+        <vm:RenameWindowViewModel></vm:RenameWindowViewModel>
+    </Design.DataContext>
     <Grid RowDefinitions="Auto,*">
         <!-- TitleBar -->
         <Grid Grid.Row="0" Height="28" IsVisible="{Binding !#ThisControl.UseSystemWindowFrame}">
@@ -35,15 +38,7 @@
             
         </Grid>
         
-        <Grid Grid.Row="1" Margin="4" >
-            <Grid.RowDefinitions>
-                <RowDefinition Height="42"/>
-                <RowDefinition Height="42"/>
-            </Grid.RowDefinitions>
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition/>
-                <ColumnDefinition/>
-            </Grid.ColumnDefinitions>
+        <Grid Grid.Row="1" Margin="4" RowDefinitions="42, 42" ColumnDefinitions="*, *">
             <TextBox Text="{Binding Name}" VerticalAlignment="Center" Margin="4" Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2"/>
             <Button Classes="flat" HorizontalContentAlignment="Center" Click="btnCancel_Click" Margin="4" Grid.Row="1" Grid.Column="0">Cancel</Button>
             <Button Classes="flat primary"  Click="btnOK_Click" Margin="4" Grid.Row="1" Grid.Column="1">OK</Button>
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/DataListPageView.axaml b/RogueEssence.Editor.Avalonia/Views/New/Editors/DataListPageView.axaml
index 21b3d598..a5165416 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/Editors/DataListPageView.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/New/Editors/DataListPageView.axaml
@@ -11,69 +11,12 @@
     <Design.DataContext>
         <vm:DataListPageViewModel />
     </Design.DataContext>
-
-    <!-- // var menu = new ContextMenu -->
-    <!-- // { -->
-    <!-- //     Items = -->
-    <!-- //     { -->
-    <!-- //         new MenuItem { Header = "Re-Index", Command = root.ReIndexCommand, Icon = App.CreateMenuIcon("Icons.ListNumbersFill") }, -->
-    <!-- //         new MenuItem { Header = "Resave all as File", Command = root.ResaveAllAsFileCommand, Icon = App.CreateMenuIcon("Icons.FileFill") }, -->
-    <!-- //         new MenuItem { Header = "Resave all as Diff", Command = root.ResaveAllAsDiffCommand, Icon = App.CreateMenuIcon("Icons.PlusMinusFill") }, -->
-    <!-- //         new Separator(), -->
-    <!-- //         new MenuItem { Header = "Add", Command = root.AddCommand, Icon = App.CreateMenuIcon("Icons.Plus") } -->
-    <!-- //     } -->
-    <!-- // }; -->
-    <!-- // -->
-    <!-- // AttachAndOpenMenu(current, menu, e); -->
-    <Grid RowDefinitions="Auto, 32, Auto, Auto">
+<Grid RowDefinitions="Auto, 32, Auto, Auto">
 
 
         <DockPanel Grid.Row="0" VerticalAlignment="Top">
-            <Menu x:Name="DataListPageViewEditMenu" DockPanel.Dock="Left"
-                  ContextRequested="DataListPageViewEditMenu_OnContextRequested">
-                <!-- <Menu.Styles> -->
-                <!--     <Style Selector="MenuItem"> -->
-                <!--         <Setter Property="Theme" Value="{DynamicResource CustomMenuItemTheme}" /> -->
-                <!--     </Style> -->
-                <!-- </Menu.Styles> -->
-
-
-                <Menu DockPanel.Dock="Top">
-
-
-                    <MenuItem Header="Edit" ItemsSource="{Binding EditMenuItems}">
-                        <MenuItem.DataTemplates>
-                            <!-- <Menu.DataTemplates> -->
-                            <DataTemplate x:DataType="vm:DataOpContainer">
-                                <MenuItem Header="{Binding Name}"
-                                          Command="{Binding Command}" />
-                            </DataTemplate>
-
-                            <!-- </Menu.DataTemplates> -->
-                        </MenuItem.DataTemplates>
-
-
-                    </MenuItem>
-
-                    <!-- <Menu DockPanel.Dock="Top" ItemsSource="{Binding OpList}"> -->
-                    <!--     <Menu.Styles> -->
-                    <!--         <Style Selector="MenuItem"> -->
-                    <!--             <Setter Property="Header" Value="{Binding Name}"/> -->
-                    <!--             <Setter Property="Command" Value="{Binding Command}"/> -->
-                    <!--             <Setter Property="ItemsSource" Value="{Binding Items}"/> -->
-                    <!--         </Style> -->
-                    <!--     </Menu.Styles> -->
-                    <!-- </Menu> -->
-                    <!--   -->
-                    <!-- <Menu.Styles> -->
-                    <!--   <Style Selector="MenuItem"> -->
-                    <!--     <Setter Property="Header" Value="{Binding Name}"/> -->
-                    <!--     <Setter Property="Command" Value="{Binding Command}"/> -->
-                    <!--     <Setter Property="ItemsSource" Value="{Binding Items}"/> -->
-                    <!--   </Style> -->
-                    <!-- </Menu.Styles> -->
-                </Menu>
-
+            <Menu x:Name="DataListPageViewEditMenu" DockPanel.Dock="Left">
+                <MenuItem Header="Edit" ItemsSource="{Binding EditMenuItems}" />
             </Menu>
         </DockPanel>
         <TextBlock Grid.Row="2" HorizontalAlignment="Center" Classes="table_header" FontSize="16"
@@ -84,7 +27,7 @@
 
             <TextBox Classes="search"
                      Grid.Row="0"
-                     Text="{Binding SearchFilter, Mode=TwoWay}"/>
+                     Text="{Binding SearchFilter, Mode=TwoWay}" />
 
             <ListBox Grid.Row="2"
                      ContextRequested="DataListPageListBox_OnContextRequested"
@@ -106,8 +49,7 @@
                 </Button>
                 <Button Classes="flat" Width="100" Margin="24,0,0,0"
                         Command="{Binding DeleteItem}"
-                        IsEnabled="{Binding SelectedItem, Converter={x:Static ObjectConverters.IsNotNull}}"
-                        >
+                        IsEnabled="{Binding SelectedItem, Converter={x:Static ObjectConverters.IsNotNull}}">
                     <v:IconText Text="Delete" Icon="Icons.TrashFill" IconSize="12" />
                 </Button>
             </StackPanel>
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/DevControl/DevControlView.axaml b/RogueEssence.Editor.Avalonia/Views/New/Editors/DevControl/DevControlView.axaml
index 0cdcbb18..df211e0a 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/Editors/DevControl/DevControlView.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/New/Editors/DevControl/DevControlView.axaml
@@ -68,71 +68,13 @@
             </TabItem>
             <TabItem Header="Player">
                 <views:DevTabPlayer DataContext="{Binding Player}"/>
-                <!-- <Grid RowDefinitions="30, Auto, 30, Auto, 30, Auto, 30, Auto, 30, Auto, Auto, Auto" ColumnDefinitions="*, *" ColumnSpacing="8"> -->
-                <!--     <TextBlock Margin="4,0" VerticalAlignment="Bottom" Grid.Row="0" Grid.Column="0">Lv.</TextBlock> -->
-                <!--     <NumericUpDown MinHeight="40" Name="nudLevel" Value="20" Minimum="1" Increment="1" Maximum="100" Grid.Row="1" Grid.Column="0"/> -->
-                <!--     <Button Classes="flat"  Name="btnRollSkill" Margin="4" Grid.Row="1" Grid.Column="1">Reroll Skills</Button> -->
-                <!--     ~1~ <Button Name="btnRollSkill" Command="{Binding btnRollSkill_Click}" Margin="4" Grid.Row="1" Grid.Column="1">Reroll Skills</Button> @1@ -->
-                <!--     <TextBlock VerticalAlignment="Bottom" Grid.Row="2" Grid.Column="0">Species</TextBlock> -->
-                <!--     <Grid Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2" ColumnDefinitions="*, Auto" ColumnSpacing="4"> -->
-                <!--   -->
-                <!--           -->
-                <!--           -->
-                <!--           -->
-                <!--     ~1~ <views:SearchComboBox Name="cbDexNum" Items="{Binding Monsters}" SelectedIndex="{Binding ChosenMonster}" VirtualizationMode="Simple" Margin="4"/> @1@ -->
-                <!--     <ComboBox ItemsSource="{Binding Fruits}" HorizontalAlignment="Stretch"/> -->
-                <!--        -->
-                <!--     <Button HorizontalAlignment="Stretch" HorizontalContentAlignment="Center" Classes="icon_button" Height="20" Width="20" Name="btnChangeOrder" Grid.Column="1" ToolTip.Tip="Switch Ordering"> -->
-                <!--          ~1~ <Panel> @1@ -->
-                <!--          ~1~   <Image Source="/Assets/AssetOrder.png" Width="26" @1@ -->
-                <!--          ~1~                   Height="26" VerticalAlignment="Center" HorizontalAlignment="Center" /> @1@ -->
-                <!--          ~1~ </Panel> @1@ -->
-                <!--          <Path -->
-                <!--              Width="20" Height="20" -->
-                <!--              Margin="0,1,0,0" -->
-                <!--              Data="{StaticResource Icons.ListNumbersFill}" /> -->
-                <!--     </Button> -->
-                <!-- -->
-                <!--     </Grid> -->
-                <!--      -->
-                <!--     <TextBlock VerticalAlignment="Bottom" Grid.Row="4">Form</TextBlock> -->
-                <!--     <ComboBox ItemsSource="{Binding Fruits}" HorizontalAlignment="Stretch" Grid.Row="5" Grid.ColumnSpan="2"/> -->
-                <!--          -->
-                <!--     <TextBlock  VerticalAlignment="Bottom" Grid.Row="6" Grid.Column="0">Skin</TextBlock> -->
-                <!--     <TextBlock  VerticalAlignment="Bottom" Grid.Row="6" Grid.Column="1">Gender</TextBlock> -->
-                <!--     <ComboBox  ItemsSource="{Binding Fruits}" HorizontalAlignment="Stretch" Grid.Row="7" Grid.Column="0"/> -->
-                <!--         -->
-                <!--     <ComboBox ItemsSource="{Binding Fruits}" HorizontalAlignment="Stretch" Grid.Row="7" Grid.Column="1"/> -->
-                <!--        -->
-                <!--      -->
-                <!--     <TextBlock VerticalAlignment="Bottom" Grid.Row="8" Grid.Column="0">Animation</TextBlock> -->
-                <!--      -->
-                <!--     <ComboBox ItemsSource="{Binding Fruits}" HorizontalAlignment="Stretch" Grid.Row="9" Grid.Column="0" Grid.ColumnSpan="2"/> -->
-                <!--          -->
-                <!--      -->
-                <!--     <CheckBox Name="chkJustMe" VerticalAlignment="Center" Grid.Row="10" Grid.Column="0">Just Me</CheckBox> -->
-                <!--     <CheckBox Name="chkJustOnce" VerticalAlignment="Center" Grid.Row="10" Grid.Column="1">Just Once</CheckBox> -->
-                <!--     <Button Classes="flat"  Name="btnResetAnim" Grid.Row="11" Grid.Column="0" Grid.ColumnSpan="2">Restart All Anims</Button> -->
-                <!--     -->
-                <!--     </Grid> -->
             </TabItem>
             <TabItem Header="Travel">
                 <views:DevTabTravel DataContext="{Binding Travel}"/>
             </TabItem>
             <TabItem Header="Script">
                 <views:DevTabScript DataContext="{Binding Script}"/>
-              
-                <!-- <Grid RowDefinitions="34, 26, Auto, 40" ColumnDefinitions="*, *" ColumnSpacing="8" RowSpacing="8"> -->
-                    <!-- -->
-                    <!--     <Button Classes="flat" Name="btnReloadScripts"  Grid.Row="0" Grid.Column="0" >Reload Scripts</Button> -->
-                    <!--     <Button  Classes="flat" Name="btnTextTest"  Grid.Row="0" Grid.Column="1" >Text Test</Button> -->
-                    <!--     <TextBlock VerticalAlignment="Bottom" Grid.Row="1" Grid.Column="0">Lua Console:</TextBlock> -->
-                    <!--     <TextBox Name="txtScriptOutput" Height="300"  IsReadOnly="True" Grid.Row="2" Grid.ColumnSpan="2"/> -->
-                    <!--     <TextBox Name="txtScriptInput" Grid.Row="3" Grid.ColumnSpan="2"></TextBox> -->
-                    <!-- </Grid> -->
-                    <!-- -->
             </TabItem>
-
         </TabControl>
     </Border>
 </UserControl>
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/GroundEditorPageView.axaml b/RogueEssence.Editor.Avalonia/Views/New/Editors/GroundEditorPageView.axaml
index 4487dd33..e212d178 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/Editors/GroundEditorPageView.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/New/Editors/GroundEditorPageView.axaml
@@ -3,8 +3,68 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:vm="using:RogueEssence.Dev.ViewModels"
+             xmlns:views="clr-namespace:RogueEssence.Dev.Views"
+             xmlns:converters="clr-namespace:RogueEssence.Dev.Converters"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:DataType="vm:GroundEditorPageViewModel"
              x:Class="RogueEssence.Dev.Views.GroundEditorPageView">
-    Welcome to the GroundEditor
+
+  <Design.DataContext>
+    <vm:GroundEditorPageViewModel></vm:GroundEditorPageViewModel>
+  </Design.DataContext>
+  <UserControl.Resources>
+    <converters:FileToTitleConverter x:Key="FileToTitleConverter"/>
+  </UserControl.Resources>
+  <!-- <Window.Title> -->
+  <!--   <Binding Path="CurrentFile" Converter="{StaticResource FileToTitleConverter}"/> -->
+  <!-- </Window.Title> -->
+  <DockPanel IsEnabled="{Binding AllowEdit}">
+    <Menu DockPanel.Dock="Top">
+      <MenuItem Header="_File">
+        <MenuItem Header="_New" Command="{Binding mnuNew_Click}"/>
+        <MenuItem Header="_Open" Command="{Binding mnuOpen_Click}"/>
+        <MenuItem Header="_Save" Command="{Binding mnuSave_Click}"/>
+        <MenuItem Header="_Save As" Command="{Binding mnuSaveAs_Click}"/>
+        <MenuItem Header="_Save and Test" Command="{Binding mnuTest_Click}"/>
+      </MenuItem>
+      <MenuItem Header="_Edit">
+        <MenuItem Header="Resize Map" Command="{Binding mnuReSize_Click}"/>
+        <MenuItem Header="Re-Tile Map" Command="{Binding mnuReTile_Click}"/>
+        <Separator/>
+        <MenuItem Header="Undo" Command="{Binding mnuUndo_Click}"/>
+        <MenuItem Header="Redo" Command="{Binding mnuRedo_Click}"/>
+      </MenuItem>
+      <MenuItem Header="_Tiles">
+        <MenuItem Header="_Load from .png into Tileset" Command="{Binding mnuImportFromPng_Click}"/>
+        <MenuItem Header="_Load Tileset into Layer" Command="{Binding mnuImportFromTileset_Click}"/>
+        <MenuItem Header="_Clear Layer" Command="{Binding mnuClearLayer_Click}"/>
+        <MenuItem Header="_Load Standardize Frame Length" Command="{Binding mnuStandardizeFrameLength_Click}"/>
+      </MenuItem>
+    </Menu>
+    <Grid>
+      <TabControl Name="tabOptions" IsEnabled="{Binding AllowEdit}" TabStripPlacement="Top" SelectedIndex="{Binding SelectedTabIndex}" Margin="2">
+        <TabItem Name="tabTextures" Header="Textures" >
+          <views:GroundTabTextures DataContext="{Binding Textures}"/>
+        </TabItem>
+        <TabItem Name="tabDecorations" Header="Decorations" >
+          <views:GroundTabDecorations DataContext="{Binding Decorations}"/>
+        </TabItem>
+        <TabItem Name="tabWalls" Header="Walls" >
+          <views:GroundTabWalls DataContext="{Binding Walls}"/>
+        </TabItem>
+        <TabItem Name="tabEntities" Header="Entities" >
+          <views:GroundTabEntities DataContext="{Binding Entities}"/>
+        </TabItem>
+        <TabItem Name="tabProperties" Header="Properties" >
+          <views:GroundTabProperties DataContext="{Binding Properties}"/>
+        </TabItem>
+        <TabItem Name="tabStrings" Header="Strings" >
+          <views:GroundTabStrings DataContext="{Binding Strings}"/>
+        </TabItem>
+        <TabItem Name="tabScript" Header="Script" >
+          <views:GroundTabScript DataContext="{Binding Script}"/>
+        </TabItem>
+      </TabControl>
+    </Grid>
+  </DockPanel>
 </UserControl>
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/MapEditorPageView.axaml b/RogueEssence.Editor.Avalonia/Views/New/Editors/MapEditorPageView.axaml
index 8920debf..7169aecf 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/Editors/MapEditorPageView.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/New/Editors/MapEditorPageView.axaml
@@ -10,7 +10,6 @@
   <Design.DataContext>
     <vm:MapEditorPageViewModel></vm:MapEditorPageViewModel>
   </Design.DataContext>
-    <!-- <TextBlock>Hi</TextBlock> -->
   <DockPanel>
     <Menu DockPanel.Dock="Top" IsEnabled="{Binding AllowEdit}">
       <MenuItem Header="_File">
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/MapEditorPageView.axaml.cs b/RogueEssence.Editor.Avalonia/Views/New/Editors/MapEditorPageView.axaml.cs
index 0f33bd46..54119bb3 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/Editors/MapEditorPageView.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/New/Editors/MapEditorPageView.axaml.cs
@@ -5,30 +5,10 @@
 
 namespace RogueEssence.Dev.Views;
 
-public class ZoneMockEntry
-{
-    public int Id { get; set; }
-    public string Name { get; set; }
-    public string LevelRange { get; set; }
-    public int MapCount { get; set; }
-    public string Music { get; set; }
-}
 public partial class MapEditorPageView : UserControl
 {
     public MapEditorPageView()
     {
         InitializeComponent();
-        // ZoneDataGrid.ItemsSource = GetMockData();
     }
-    
-    private List<ZoneMockEntry> GetMockData() => new List<ZoneMockEntry>
-    {
-        new ZoneMockEntry { Id = 0, Name = "Tiny Woods", LevelRange = "1-5", MapCount = 3, Music = "tiny_woods.ogg" },
-        new ZoneMockEntry { Id = 1, Name = "Thunderwave Cave", LevelRange = "6-11", MapCount = 5, Music = "thunderwave.ogg" },
-        new ZoneMockEntry { Id = 2, Name = "Mt. Steel", LevelRange = "11-19", MapCount = 7, Music = "mt_steel.ogg" },
-        new ZoneMockEntry { Id = 3, Name = "Sinister Woods", LevelRange = "14-22", MapCount = 6, Music = "sinister_woods.ogg" },
-        new ZoneMockEntry { Id = 4, Name = "Silent Chasm", LevelRange = "20-28", MapCount = 8, Music = "silent_chasm.ogg" },
-    };
-
-
 }
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/ModConfigPageView.axaml b/RogueEssence.Editor.Avalonia/Views/New/Editors/ModConfigPageView.axaml
index fdd4144b..b99ecc1e 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/Editors/ModConfigPageView.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/New/Editors/ModConfigPageView.axaml
@@ -67,7 +67,7 @@
                                 <ColumnDefinition Width="64" />
                             </Grid.ColumnDefinitions>
                             <TextBox Text="{Binding UUID}" IsReadOnly="True" VerticalAlignment="Center" Margin="4" />
-                            <Button Command="{Binding btnRegenUUID_Click}" Margin="4" Grid.Column="1">Regen</Button>
+                            <Button Classes="flat" Command="{Binding btnRegenUUID_Click}" Margin="4" Grid.Column="1">Regen</Button>
                         </Grid>
 
                         <TextBlock Margin="4,2" Text="Game Version:" VerticalAlignment="Center"
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/SpeciesEditPageView.axaml b/RogueEssence.Editor.Avalonia/Views/New/Editors/SpeciesEditPageView.axaml
index 359fd651..2c22f75d 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/Editors/SpeciesEditPageView.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/New/Editors/SpeciesEditPageView.axaml
@@ -18,7 +18,7 @@
     <Grid RowDefinitions="Auto, 32, Auto Auto">
         <DockPanel>
             <Menu DockPanel.Dock="Top">
-                <MenuItem Header="_Edit">
+                <MenuItem Header="Edit">
                     <MenuItem.Styles>
                         <Style Selector="MenuItem">
                             <Setter Property="Template">
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/SpritePageView.axaml b/RogueEssence.Editor.Avalonia/Views/New/Editors/SpritePageView.axaml
index 1316bab9..3259003c 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/Editors/SpritePageView.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/New/Editors/SpritePageView.axaml
@@ -11,10 +11,10 @@
     <Design.DataContext>
         <vm:SpritePageViewModel />
     </Design.DataContext>
-    <Grid RowDefinitions="Auto, 32, Auto, 20, Auto">
+    <Grid RowDefinitions="Auto, 32, Auto, 8, Auto">
         <DockPanel Grid.Row="0" VerticalAlignment="Top">
             <Menu DockPanel.Dock="Top">
-                <MenuItem Header="_Edit">
+                <MenuItem Header="Edit">
                     <MenuItem Header="Mass Import" Command="{Binding mnuMassImport_Click}" />
                     <MenuItem Header="Mass Export" Command="{Binding mnuMassExport_Click}" />
                     <Separator IsVisible="{Binding IsTileAsset}" />
@@ -84,30 +84,6 @@
                     <v:IconText Text="Delete" Icon="Icons.TrashFill" IconSize="12" />
                 </Button>
             </StackPanel>
-            <!--          -->
-            <!-- <StackPanel Grid.Row="3" Orientation="Horizontal"> -->
-            <!--     <Button Classes="flat" Width="100" -->
-            <!--             Command="{Binding btnImport_Click}" -->
-            <!--             IsEnabled="{Binding ChosenMonster, Converter={x:Static ObjectConverters.IsNotNull}}"> -->
-            <!--         <v:IconText Text="Import" Icon="Icons.DownloadFill" IconSize="12" /> -->
-            <!--     </Button> -->
-            <!--     <Button Classes="flat" Width="100" Margin="24,0,0,0" -->
-            <!--             Command="{Binding btnReImport_Click}" -->
-            <!--             IsEnabled="{Binding CachedPath, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"> -->
-            <!--         <v:IconText Text="Re-Import" Icon="Icons.RepeatFill" IconSize="12" /> -->
-            <!--     </Button> -->
-            <!--     <Button Classes="flat" Width="100" Margin="24,0,0,0" -->
-            <!--             Command="{Binding btnExport_Click}" -->
-            <!--             IsEnabled="{Binding ChosenMonster, Converter={x:Static ObjectConverters.IsNotNull}}"> -->
-            <!--         <v:IconText Text="Export" Icon="Icons.ExportFill" IconSize="12" /> -->
-            <!--     </Button> -->
-            <!--     <Button Classes="flat" Width="100" Margin="24,0,0,0" -->
-            <!--             Command="{Binding btnExport_Click}" -->
-            <!--             IsEnabled="{Binding ChosenMonster, Converter={x:Static ObjectConverters.IsNotNull}}"> -->
-            <!--         <v:IconText Text="Delete" Icon="Icons.TrashFill" IconSize="12" /> -->
-            <!--     </Button> -->
-            <!-- </StackPanel> -->
-
         </Grid>
     </Grid>
 </UserControl>
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/SearchListBox.axaml b/RogueEssence.Editor.Avalonia/Views/SearchListBox.axaml
index 8be2ec78..948dfb8c 100644
--- a/RogueEssence.Editor.Avalonia/Views/SearchListBox.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/SearchListBox.axaml
@@ -6,19 +6,12 @@
              mc:Ignorable="d"
              x:Class="RogueEssence.Dev.Views.SearchListBox"
              DataContextChanged="slb_DataContextChanged">
-  <Design.DataContext>
-    <vm:SearchListBoxViewModel/>
-  </Design.DataContext>
-  <Grid Margin="4" >
-    <Grid.RowDefinitions>
-      <RowDefinition Height="Auto"/>
-      <RowDefinition Height="14"/>
-    </Grid.RowDefinitions>
-    <TextBlock Grid.Row="0" HorizontalAlignment="Center" Classes="table_header" FontSize="16" Text="{Binding DataName}" />
-    <TextBlock VerticalAlignment="Bottom" Text="{Binding DataName}" Grid.Row="0" Grid.Column="0"></TextBlock>
-    <TextBox Name="txtSearch" TextWrapping="Wrap" VerticalAlignment="Center" Text="{Binding SearchText, Mode=TwoWay}" Margin="0,2" Grid.Row="1" Grid.Column="0"/>
-    <ListBox Name="lbxItems" SelectionMode="AlwaysSelected" ItemsSource="{Binding SearchItems}" SelectedIndex="{Binding SelectedSearchIndex}" DoubleTapped="doubleClickStart" PointerReleased="lbxItems_DoubleClick" Grid.Row="2" Grid.Column="0"/>
-    
-    
-  </Grid>
-</UserControl>
+    <Design.DataContext>
+        <vm:SearchListBoxViewModel/>
+    </Design.DataContext>
+    <Grid Margin="4" RowDefinitions="14, 40, 8, *">
+        <TextBlock VerticalAlignment="Bottom" Text="{Binding DataName, Mode=TwoWay}" Grid.Row="0" Grid.Column="0"></TextBlock>
+        <TextBox Classes="search" Name="txtSearch" Watermark="Search..." TextWrapping="Wrap" VerticalAlignment="Center" Text="{Binding SearchText, Mode=TwoWay}" Margin="0,0" Grid.Row="1" Grid.Column="0"/>
+        <ListBox ScrollViewer.HorizontalScrollBarVisibility="Auto" Classes="datalist" Name="lbxItems" SelectionMode="AlwaysSelected" ItemsSource="{Binding SearchItems}" SelectedIndex="{Binding SelectedSearchIndex}" DoubleTapped="doubleClickStart" PointerReleased="lbxItems_DoubleClick" Grid.Row="3" Grid.Column="0"/>
+    </Grid>
+</UserControl>
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/UserControls/LayerBox.axaml b/RogueEssence.Editor.Avalonia/Views/UserControls/LayerBox.axaml
index ce99e30f..537e3dc4 100644
--- a/RogueEssence.Editor.Avalonia/Views/UserControls/LayerBox.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/UserControls/LayerBox.axaml
@@ -4,73 +4,48 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              mc:Ignorable="d"
+             x:DataType="vm:TextureLayerBoxViewModel"
              x:Class="RogueEssence.Dev.Views.LayerBox">
-  <UserControl.Resources>
-  </UserControl.Resources>
-  <Grid>
-    <Grid.RowDefinitions>
-      <RowDefinition Height="16"/>
-      <RowDefinition/>
-      <RowDefinition Height="34"/>
-    </Grid.RowDefinitions>
-    <Grid.ColumnDefinitions>
-      <ColumnDefinition/>
-      <ColumnDefinition/>
-      <ColumnDefinition/>
-      <ColumnDefinition/>
-      <ColumnDefinition/>
-      <ColumnDefinition/>
-    </Grid.ColumnDefinitions>
-    <TextBlock Margin="4,2" VerticalAlignment="Bottom" Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="6">Layers:</TextBlock>
-    <ListBox Margin="2" SelectionMode="AlwaysSelected" ItemsSource="{Binding Layers}" SelectedIndex="{Binding ChosenLayer, Mode=TwoWay}" DoubleTapped="doubleClickStart" PointerReleased="lbxItems_DoubleClick" Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="6">
-      <ListBox.ItemTemplate>
-        <DataTemplate>
-          <Grid>
-            <Grid.ColumnDefinitions>
-              <ColumnDefinition Width="26"/>
-              <ColumnDefinition/>
-            </Grid.ColumnDefinitions>
-            <CheckBox IsChecked="{Binding Path=Visible}" Grid.Column="0"/>
-            <TextBlock Text="{Binding Path=Name}" VerticalAlignment="Center" Grid.Column="1"/>
-          </Grid>
-        </DataTemplate>
-      </ListBox.ItemTemplate>
-    </ListBox>
-    <Button Command="{Binding AddLayer}" Margin="2" Grid.Row="2" Grid.Column="0" ToolTip.Tip="Add Layer">
-      <Panel>
-        <Image Source="/Assets/LayerAdd.png" Width="24"
-                          Height="24" VerticalAlignment="Center" HorizontalAlignment="Center" />
-      </Panel>
-    </Button>
-    <Button Command="{Binding DeleteLayer}" Margin="2" Grid.Row="2" Grid.Column="1" ToolTip.Tip="Delete Layer">
-      <Panel>
-        <Image Source="/Assets/LayerDelete.png" Width="24"
-                          Height="24" VerticalAlignment="Center" HorizontalAlignment="Center" />
-      </Panel>
-    </Button>
-    <Button Command="{Binding DupeLayer}" Margin="2" Grid.Row="2" Grid.Column="2" ToolTip.Tip="Duplicate Layer">
-      <Panel>
-        <Image Source="/Assets/LayerDupe.png" Width="24"
-                          Height="24" VerticalAlignment="Center" HorizontalAlignment="Center" />
-      </Panel>
-    </Button>
-    <Button Command="{Binding MergeLayer}" Margin="2" Grid.Row="2" Grid.Column="3" ToolTip.Tip="Merge Layer">
-      <Panel>
-        <Image Source="/Assets/LayerMerge.png" Width="24"
-                          Height="24" VerticalAlignment="Center" HorizontalAlignment="Center" />
-      </Panel>
-    </Button>
-    <Button Command="{Binding MoveLayerUp}" Margin="2" Grid.Row="2" Grid.Column="4" ToolTip.Tip="Move Layer Up">
-      <Panel>
-        <Image Source="/Assets/LayerUp.png" Width="24"
-                          Height="24" VerticalAlignment="Center" HorizontalAlignment="Center" />
-      </Panel>
-    </Button>
-    <Button Command="{Binding MoveLayerDown}" Margin="2" Grid.Row="2" Grid.Column="5" ToolTip.Tip="Move Layer Down">
-      <Panel>
-        <Image Source="/Assets/LayerDown.png" Width="24"
-                          Height="24" VerticalAlignment="Center" HorizontalAlignment="Center" />
-      </Panel>
-    </Button>
-  </Grid>
-</UserControl>
+    
+    
+    <Design.DataContext>
+        <vm:TextureLayerBoxViewModel>
+            
+        </vm:TextureLayerBoxViewModel>
+    </Design.DataContext>
+    
+    <Grid RowDefinitions="16,*,34" ColumnDefinitions="*,*,*,*,*,*">
+        <TextBlock Margin="4,2" VerticalAlignment="Bottom" Grid.ColumnSpan="6">Layers:</TextBlock>
+        <ListBox Margin="2" 
+                 
+                Classes="datalist"
+                SelectionMode="AlwaysSelected" ItemsSource="{Binding Layers}" SelectedIndex="{Binding ChosenLayer, Mode=TwoWay}" DoubleTapped="doubleClickStart" PointerReleased="lbxItems_DoubleClick" Grid.Row="1" Grid.ColumnSpan="6">
+            <ListBox.ItemTemplate>
+                <DataTemplate>
+                    <Grid ColumnDefinitions="26,*">
+                        <CheckBox IsChecked="{Binding Path=Visible}"/>
+                        <TextBlock Text="{Binding Path=Name}" VerticalAlignment="Center" Grid.Column="1"/>
+                    </Grid>
+                </DataTemplate>
+            </ListBox.ItemTemplate>
+        </ListBox>
+        <Button Classes="secondary" Command="{Binding AddLayer}" Margin="2" Grid.Row="2" ToolTip.Tip="Add Layer">
+            <Path Width="10" Height="10" Margin="0, 2, 0, 0" Data="{StaticResource Icons.Plus}" />
+        </Button>
+        <Button Classes="secondary" Command="{Binding DeleteLayer}" Margin="2" Grid.Row="2" Grid.Column="1" ToolTip.Tip="Delete Layer" IsEnabled="{Binding CanEdit}">
+            <Path Width="10" Height="10" Margin="0, 2, 0, 0" Data="{StaticResource Icons.TrashFill}" />
+        </Button>
+        <Button Classes="secondary" Command="{Binding DupeLayer}" Margin="2" Grid.Row="2" Grid.Column="2" ToolTip.Tip="Duplicate Layer" IsEnabled="{Binding CanDupe}">
+            <Path Width="10" Height="10" Margin="0, 2, 0, 0" Data="{StaticResource Icons.CopyFill}" />
+        </Button>
+        <Button Classes="secondary" Command="{Binding MergeLayer}" Margin="2" Grid.Row="2" Grid.Column="3" ToolTip.Tip="Merge Layer" IsEnabled="{Binding CanEdit}">
+            <Path Width="10" Height="10" Margin="4, 2, 0, 0" Data="{StaticResource Icons.ArrowsMergeFill}" />
+        </Button>
+        <Button Classes="secondary" Command="{Binding MoveLayerUp}" Margin="2" Grid.Row="2" Grid.Column="4" ToolTip.Tip="Move Layer Up" IsEnabled="{Binding CanMoveUp}">
+            <Path Width="10" Height="10" Margin="0, 2, 0, 0" Data="{StaticResource Icons.CaretUpFill}" />
+        </Button>
+        <Button Classes="secondary" Command="{Binding MoveLayerDown}" Margin="2" Grid.Row="2" Grid.Column="5" ToolTip.Tip="Move Layer Down"  IsEnabled="{Binding CanMoveDown}">
+            <Path Width="10" Height="10" Margin="0, 2, 0, 0" Data="{StaticResource Icons.CaretDownFill}" />
+        </Button>
+    </Grid>
+</UserControl>
\ No newline at end of file
diff --git a/RogueEssence/Dev/EmptyEditor.cs b/RogueEssence/Dev/EmptyEditor.cs
index f7488579..7e909dfb 100644
--- a/RogueEssence/Dev/EmptyEditor.cs
+++ b/RogueEssence/Dev/EmptyEditor.cs
@@ -6,7 +6,7 @@ namespace RogueEssence.Dev
     public class EmptyEditor : IRootEditor
     {
         public bool LoadComplete => true;
-        public IGroundEditor GroundEditor => null;
+        public IGroundEditor GroundEditor { get; set; }
         public IMapEditor MapEditor { get; set; }
         public bool AteMouse { get { return false; } }
         public bool AteKeyboard { get { return false; } }
diff --git a/RogueEssence/Dev/IRootEditor.cs b/RogueEssence/Dev/IRootEditor.cs
index d541fc79..68e201cf 100644
--- a/RogueEssence/Dev/IRootEditor.cs
+++ b/RogueEssence/Dev/IRootEditor.cs
@@ -8,7 +8,7 @@ public interface IRootEditor
         bool LoadComplete { get; }
         bool AteMouse { get; }
         bool AteKeyboard { get; }
-        IGroundEditor GroundEditor { get; }
+        IGroundEditor GroundEditor { get; set; }
         IMapEditor MapEditor { get; set; }
 
         void ReloadData(DataManager.DataType dataType);

From 1704e796cf6743231263066603fe3c3894d54683 Mon Sep 17 00:00:00 2001
From: Kace <41309226+DoubleTrio@users.noreply.github.com>
Date: Thu, 21 May 2026 04:21:17 -0400
Subject: [PATCH 35/51] unify modswitcher and mod page

---
 .../ViewModels/DevForm/ModManagerViewModel.cs | 257 ++++++------------
 .../ViewModels/New/DevFormViewModel.cs        |  90 +-----
 .../New/Editors/DataListPageViewModel.cs      |  21 +-
 .../New/Editors/GroundEditorPageViewModel.cs  |   2 +-
 .../New/Editors/MapEditorPageViewModel.cs     |   4 +-
 .../New/Editors/ModListPageViewModel.cs       | 115 ++------
 .../ViewModels/New/ModSwitcherViewModel.cs    |  52 +---
 .../Views/DevForm/DevTabMods.axaml            |  10 +-
 .../Views/New/DevForm.axaml                   |   2 +-
 .../Views/New/DevForm.axaml.cs                |   4 +-
 .../Views/New/ModSwitcherView.axaml           |   2 +-
 .../Views/New/ModSwitcherView.axaml.cs        |  21 +-
 12 files changed, 149 insertions(+), 431 deletions(-)

diff --git a/RogueEssence.Editor.Avalonia/ViewModels/DevForm/ModManagerViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/DevForm/ModManagerViewModel.cs
index 1df5652c..f4f27cac 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/DevForm/ModManagerViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/DevForm/ModManagerViewModel.cs
@@ -9,74 +9,48 @@
 using RogueEssence.Menu;
 using System.IO;
 using System.Text.RegularExpressions;
+using System.Threading.Tasks;
 using RogueEssence.Data;
 using RogueEssence.Content;
 using RogueEssence.Dev.Views;
 using Avalonia.Controls;
 using RogueEssence.Dev;
 
-public class ModsEntryViewModel : ViewModelBase
-{
-    private string _name;
-
-    public string Name
-    {
-        get => _name;
-        set => this.RaiseAndSetIfChanged(ref _name, value);
-    }
-
-    private string _editNamespace;
-
-    public string Namespace
-    {
-        get => _editNamespace;
-        set => this.RaiseAndSetIfChanged(ref _editNamespace, value);
-    }
-
-    public string Path;
 
-    public ModsEntryViewModel(string name, string newNamespace, string fullPath)
-    {
-        this._name = name;
-        this._editNamespace = newNamespace;
-        this.Path = fullPath;
-    }
-    
-    public string Display => $"{_editNamespace}: {_name}";
-}
 
 namespace RogueEssence.Dev.ViewModels
 {
-    public class ModsNodeViewModel : ViewModelBase
+    
+    public class ModsEntryViewModel : ViewModelBase
     {
-        private string name;
+        private string _name;
+
         public string Name
         {
-            get => name;
-            set => this.SetIfChanged(ref name, value);
+            get => _name;
+            set => this.RaiseAndSetIfChanged(ref _name, value);
         }
 
-        private string editNamespace;
+        private string _editNamespace;
+
         public string Namespace
         {
-            get => editNamespace;
-            set => this.SetIfChanged(ref editNamespace, value);
+            get => _editNamespace;
+            set => this.RaiseAndSetIfChanged(ref _editNamespace, value);
         }
 
         public string Path;
 
-        public ObservableCollection<ModsNodeViewModel> ModList { get; }
-
-        public ModsNodeViewModel(string name, string newNamespace, string fullPath)
+        public ModsEntryViewModel(string name, string newNamespace, string fullPath)
         {
-            this.name = name;
-            this.editNamespace = newNamespace;
+            this._name = name;
+            this._editNamespace = newNamespace;
             this.Path = fullPath;
-            ModList = new ObservableCollection<ModsNodeViewModel>();
         }
-
+    
+        public string Display => $"{_editNamespace}: {_name}";
     }
-
+    
     public class ModManagerViewModel : ViewModelBase
     {
         private EditorContext _context;
@@ -85,178 +59,111 @@ public ModManagerViewModel(EditorContext context)
             currentMod = null;
             _context = context;
 
-            Mods = new ObservableCollection<ModsNodeViewModel>();
-            reloadMods();
+            ModsList = new ObservableCollection<ModsEntryViewModel>();
+            ReloadMods();
         }
+        
+        
+        private string currentModString;
 
-        private string currentMod;
-        public string CurrentMod
+        public string CurrentModString
         {
-            get => currentMod;
-            set => this.SetIfChanged(ref currentMod, value);
+            get => currentModString;
+            set => this.SetIfChanged(ref currentModString, value);
         }
 
-        private ModsNodeViewModel chosenMod;
-        public ModsNodeViewModel ChosenMod
-        {
-            get => chosenMod;
-            set => this.SetIfChanged(ref chosenMod, value);
-        }
-
-        public ObservableCollection<ModsNodeViewModel> Mods { get; }
-
         public void UpdateMod()
         {
-            CurrentMod = getModName(PathMod.Quest);
+            CurrentModString = _getModName(PathMod.Quest);
         }
-
-        public async void btnSwitch_Click()
+    
+        private static string _getModName(ModHeader mod)
         {
-            //give a pop up warning that the game will be reloaded and wait for confirmation
-            MessageBox.MessageBoxResult result = await MessageBox.Show((Window)DiagManager.Instance.DevEditor, "The game will be reloaded to use content from the new path.\nClick OK to proceed.", "Are you sure?",
-                MessageBox.MessageBoxButtons.OkCancel);
-            if (result == MessageBox.MessageBoxResult.Cancel)
-                return;
-
-            DevForm.ExecuteOrPend(doSwitch);
+            if (!mod.IsValid())
+                return "Origin";
+            return mod.GetMenuName();
         }
+        
+        
 
-        private void doSwitch()
+        private ModsEntryViewModel currentMod;
+        public ModsEntryViewModel CurrentMod
         {
-            //modify and reload
-            lock (GameBase.lockObj)
+            get => currentMod;
+            set
             {
-                LuaEngine.Instance.BreakScripts();
-                MenuManager.Instance.ClearMenus();
-                if (!String.IsNullOrEmpty(chosenMod.Path))
-                    GameManager.Instance.SetQuest(PathMod.GetModDetails(PathMod.FromApp(chosenMod.Path)), new ModHeader[0] { }, new List<int>() { -1 });
-                else
-                    GameManager.Instance.SetQuest(ModHeader.Invalid, new ModHeader[0] { }, new List<int>() { });
-
-                DiagManager.Instance.PrintModSettings();
-                DiagManager.Instance.SaveModSettings();
+                this.SetIfChanged(ref currentMod, value);
             }
         }
 
-        public async void btnAdd_Click()
+        public ObservableCollection<ModsEntryViewModel> ModsList { get; }
+        
+        public async Task AskSwitchTo(ModsEntryViewModel mod)
         {
-            ModConfigWindowView window = new ModConfigWindowView();
-            ModHeader header = new ModHeader("", "", "", "", "", Guid.NewGuid(), new Version(), new Version(), PathMod.ModType.Mod, new RelatedMod[0] { });
-            ModConfigViewModel2 vm = new ModConfigViewModel2(_context.DialogService, header);
-            window.DataContext = vm;
-
-            DevForm form = (DevForm)DiagManager.Instance.DevEditor;
-            bool result = await window.ShowDialog<bool>(form);
-            if (!result)
-                return;
-
-            string newName = Text.Sanitize(vm.Name);
-            string newNamespace = Text.Sanitize(vm.Namespace).ToLower();
-
-            //sanitize name and check for name conflicts
-            if (String.IsNullOrWhiteSpace(newName))
-                return;
-            if (String.IsNullOrWhiteSpace(newNamespace))
+            
+            //give a pop up warning that the game will be reloaded and wait for confirmation
+            MessageBoxWindowView.MessageBoxResult result = await MessageBoxWindowView.Show(_context.DialogService, $"The game will be reloaded to use content from {mod.Name}.\nClick OK to proceed.", "Are you sure?",
+                MessageBoxWindowView.MessageBoxButtons.OkCancel);
+            if (result == MessageBoxWindowView.MessageBoxResult.Cancel)
                 return;
 
-            //check for children name conflicts
-            foreach (ModsNodeViewModel child in Mods)
-            {
-                if (String.Equals(child.Name, newName, StringComparison.OrdinalIgnoreCase))
-                {
-                    //already exists, pop up message
-                    await MessageBox.Show((Window)DiagManager.Instance.DevEditor, newName + " already exists!", "Add Failed", MessageBox.MessageBoxButtons.Ok);
-                    return;
-                }
-                if (String.Equals(child.Namespace, newNamespace, StringComparison.OrdinalIgnoreCase))
-                {
-                    //already exists, pop up message
-                    await MessageBox.Show((Window)DiagManager.Instance.DevEditor, newName + " (Namespace) already exists!", "Add Failed", MessageBox.MessageBoxButtons.Ok);
-                    return;
-                }
-            }
-
-            ModsNodeViewModel newNode = new ModsNodeViewModel(newName, newNamespace, Path.Combine(PathMod.MODS_FOLDER, newName));
-            string fullPath = PathMod.FromApp(newNode.Path);
-            //add all asset folders
-            Directory.CreateDirectory(fullPath);
-            //create the mod xml
-            ModHeader newHeader = new ModHeader(fullPath, vm.Name.Trim(), vm.Author.Trim(), vm.Description.Trim(), Text.Sanitize(vm.Namespace).ToLower(), Guid.Parse(vm.UUID), Version.Parse(vm.Version), Version.Parse(vm.GameVersion), (PathMod.ModType)vm.ChosenModType, vm.GetRelationshipArray());
-            PathMod.SaveModDetails(fullPath, newHeader);
-
-            //add Strings
-            Directory.CreateDirectory(Path.Join(fullPath, "Strings"));
-            //Content
-            GraphicsManager.InitContentFolders(fullPath);
-            //Data
-            DataManager.InitDataDirs(fullPath);
-            //Script
-            LuaEngine.InitScriptFolders(fullPath, vm.Namespace);
-
-            //add node
-            Mods.Add(newNode);
+            DevForm.ExecuteOrPend(() => _switchTo(mod));
         }
-
-        public async void btnDelete_Click()
+        
+        public async Task<bool> CheckIsCurrentMod(ModsEntryViewModel mod)
         {
-            //prohibit the deletion of the current node or the base node
-            if (chosenMod == Mods[0])
+            if (mod.Namespace == CurrentMod.Namespace)
             {
-                await MessageBox.Show((Window)DiagManager.Instance.DevEditor, "Cannot delete the root mod!", "Delete Failed", MessageBox.MessageBoxButtons.Ok);
-                return;
+                await MessageBoxWindowView.Show(_context.DialogService, $"{CurrentMod.Name} is already currently active", "Switch Failed", MessageBoxWindowView.MessageBoxButtons.Ok);
+                return true;
             }
-            //ask for confirmation
-            MessageBox.MessageBoxResult result = await MessageBox.Show((Window)DiagManager.Instance.DevEditor, "Are you sure you want to delete the mod in directory:\n" + chosenMod.Path, "Are you sure?",
-                MessageBox.MessageBoxButtons.YesNo);
-            if (result == MessageBox.MessageBoxResult.No)
-                return;
 
-            string fullPath = PathMod.FromApp(chosenMod.Path);
-            //delete folder
-            Directory.Delete(fullPath, true);
-
-            //and then delete node
-            Mods.Remove(chosenMod);
+            return false;
         }
-
-        public async void btnEdit_Click()
+        
+        private void _switchTo(ModsEntryViewModel mod)
         {
-            ModConfigWindowView window = new ModConfigWindowView();
-            ModHeader header = PathMod.Quest;
-            ModConfigViewModel2 vm = new ModConfigViewModel2(_context.DialogService, header);
-            window.DataContext = vm;
-
-            DevForm form = (DevForm)DiagManager.Instance.DevEditor;
-            bool result = await window.ShowDialog<bool>(form);
-
-            if (result)
+            //modify and reload
+            lock (GameBase.lockObj)
             {
-                //save the mod data
-                string fullPath = PathMod.FromApp(PathMod.Quest.Path);
-                ModHeader resultHeader = new ModHeader(PathMod.Quest.Path, vm.Name.Trim(), vm.Author.Trim(), vm.Description.Trim(), Text.Sanitize(vm.Namespace).ToLower(), Guid.Parse(vm.UUID), Version.Parse(vm.Version), Version.Parse(vm.GameVersion), (PathMod.ModType)vm.ChosenModType, vm.GetRelationshipArray());
-                PathMod.SaveModDetails(fullPath, resultHeader);
+                LuaEngine.Instance.BreakScripts();
+                MenuManager.Instance.ClearMenus();
+                if (!String.IsNullOrEmpty(mod.Path))
+                    GameManager.Instance.SetQuest(PathMod.GetModDetails(PathMod.FromApp(mod.Path)), new ModHeader[0] { }, new List<int>() { -1 });
+                else
+                    GameManager.Instance.SetQuest(ModHeader.Invalid, new ModHeader[0] { }, new List<int>() { });
 
-                reloadMods();
-                DevForm.ExecuteOrPend(doSwitch);
+                DiagManager.Instance.PrintModSettings();
+                DiagManager.Instance.SaveModSettings();
+                DiagManager.Instance.DevEditor.MapEditor = null;
+                DiagManager.Instance.DevEditor.GroundEditor = null;
             }
+      
         }
 
-        private void reloadMods()
+        public void ReloadMods()
         {
-            Mods.Clear();
-            Mods.Add(new ModsNodeViewModel(null, PathMod.BaseNamespace, ""));
+            ModsList.Clear();
+            ModsList.Add(new ModsEntryViewModel("Origin", PathMod.BaseNamespace, ""));
             string[] modsPath = Directory.GetDirectories(PathMod.MODS_PATH);
-            ModsNodeViewModel chosenModel = null;
+            ModsEntryViewModel chosenModel = null;
             foreach (string modPath in modsPath)
             {
                 ModHeader header = PathMod.GetModDetails(modPath);
-                Mods.Add(new ModsNodeViewModel(getModName(header), header.Namespace, Path.Combine(PathMod.MODS_FOLDER, Path.GetFileName(modPath))));
+                ModsList.Add(new ModsEntryViewModel(getModName(header), header.Namespace, Path.Combine(PathMod.MODS_FOLDER, Path.GetFileName(modPath))));
                 if (PathMod.Quest.Path == header.Path)
-                    chosenModel = Mods[Mods.Count - 1];
+                    chosenModel = ModsList[ModsList.Count - 1];
             }
-            ChosenMod = chosenModel;
+
+ 
+            CurrentMod = chosenModel;
         }
 
+        public void RemoveMod(ModsEntryViewModel mod)
+        {
+            ModsList.Remove(mod);
+        }
+        
         private static string getModName(ModHeader mod)
         {
             if (!mod.IsValid())
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs
index ece44c11..a6e34e58 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs
@@ -39,77 +39,8 @@ public HierarchicalTreeDataGridSource<NodeBase> NodeSource
     public DevTabScriptViewModel Script { get; set; }
 
     public ModManagerViewModel ModsManager { get; set; }
-
-
-    public ObservableCollection<ModsNodeViewModel> Mods { get; }
-
-
-    private ModsNodeViewModel _chosenMod;
-
-    public ModsNodeViewModel ChosenMod
-    {
-        get => _chosenMod;
-        set { this.RaiseAndSetIfChanged(ref _chosenMod, value); }
-    }
-
-    private string currentMod;
-
-    public string CurrentMod
-    {
-        get => currentMod;
-        set => this.SetIfChanged(ref currentMod, value);
-    }
-
-    public void UpdateMod()
-    {
-        CurrentMod = _getModName(PathMod.Quest);
-    }
-
-    private void _reloadMods()
-    {
-        Mods.Clear();
-
-        string[] modsPath = Directory.GetDirectories(PathMod.MODS_PATH);
-        ModsNodeViewModel chosenModel = new ModsNodeViewModel("Origins", PathMod.BaseNamespace, "");
-        Mods.Add(chosenModel);
-        foreach (string modPath in modsPath)
-        {
-            ModHeader header = PathMod.GetModDetails(modPath);
-            Mods.Add(new ModsNodeViewModel(_getModName(header), header.Namespace,
-                Path.Combine(PathMod.MODS_FOLDER, Path.GetFileName(modPath))));
-            if (PathMod.Quest.Path == header.Path)
-            {
-                chosenModel = Mods[Mods.Count - 1];
-            }
-        }
-
-        ChosenMod = chosenModel;
-    }
-
-    private void DoSwitch()
-    {
-        //modify and reload
-        lock (GameBase.lockObj)
-        {
-            LuaEngine.Instance.BreakScripts();
-            MenuManager.Instance.ClearMenus();
-            if (!String.IsNullOrEmpty(_chosenMod.Path))
-                GameManager.Instance.SetQuest(PathMod.GetModDetails(PathMod.FromApp(_chosenMod.Path)),
-                    new ModHeader[0] { }, new List<int>() { -1 });
-            else
-                GameManager.Instance.SetQuest(ModHeader.Invalid, new ModHeader[0] { }, new List<int>() { });
-
-            DiagManager.Instance.PrintModSettings();
-            DiagManager.Instance.SaveModSettings();
-        }
-    }
-
-    private static string _getModName(ModHeader mod)
-    {
-        if (!mod.IsValid())
-            return null;
-        return mod.GetMenuName();
-    }
+    
+ 
 
     private bool _isTreeView;
 
@@ -403,25 +334,26 @@ public ObservableCollection<NodeBase> Nodes
     private EditorContext _context;
 
     public DevFormViewModel(EditorContext context, DevTabGameViewModel game, DevTabPlayerViewModel player,
-        DevTabTravelViewModel travel, DevTabSpritesViewModel sprites, DevTabScriptViewModel script,
-        ModManagerViewModel mods,
-        DevTabConstantsViewModel constants)
+        DevTabTravelViewModel travel, DevTabScriptViewModel script,
+        ModManagerViewModel mods)
     {
         _context = context;
-        Mods = new ObservableCollection<ModsNodeViewModel>();
-        // NOTE: These should all be private readonly
         Game = game;
         Player = player;
         Travel = travel;
         Script = script;
         ModsManager = mods;
         
+        
+        
         InitializeTabEvents();
 
         this.WhenAnyValue(x => x.ActivePage)
             .Where(activePage => activePage != null)
             .Subscribe(_ => TemporaryTab = null);
 
+    
+        
         Pages = new ObservableCollection<EditorPageViewModel>();
         TopLevelPages = new ObservableCollection<PageNode>();
         _pageToNodeMap = new Dictionary<EditorPageViewModel, PageNode>();
@@ -473,7 +405,6 @@ public void LoadDevTree()
     {
         NodeFactory _nodeFactory = _context.NodeFactory;
         Filter = "";
-        _reloadMods();
 
         ActivePage = null;
         TopLevelPages.Clear();
@@ -487,11 +418,14 @@ public void LoadDevTree()
 
         Nodes.Clear();
 
-        var rootStr = ChosenMod.Name;
+        var rootStr = ModsManager.CurrentModString;
         
         var root = _nodeFactory.CreateOpenEditorNode<DevEditPageViewModel>(rootStr, "Icons.ScrollFill");
 
         Root = root;
+        ModsManager.WhenAnyValue(x => x.CurrentMod.Name)
+            .Subscribe(str => Root.Title = str ?? "Origin");
+        
         var devControlNode =
             _nodeFactory.CreateOpenEditorNode<DevControlViewModel>("Dev Control", "Icons.GameControllerFill");
         root.SubNodes.Add(devControlNode);
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DataListPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DataListPageViewModel.cs
index aa76d108..a997b858 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DataListPageViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DataListPageViewModel.cs
@@ -236,6 +236,7 @@ private void UpdateVisibleItems(string filter)
             FilteredItems.Add(item);
     }
     
+    
     public void AddChildItemUnderParent(DataListEntry entry)
     {
         Node.AddNodeIfNotExists(
@@ -336,25 +337,7 @@ public async Task AddItem()
         // IsExpanded = true;
         // Console.WriteLine($"Added {DataType} item: {vm.Name}");
     }
-
-    // private async Task ReIndexAsync()
-    // {
-    //     await Task.Run(() =>
-    //     {
-    //         lock (GameBase.lockObj)
-    //         {
-    //             DevHelper.RunIndexing(DataType);
-    //             DevHelper.RunExtraIndexing(DataType);
-    //             DataManager.Instance.LoadIndex(DataType);
-    //             DataManager.Instance.LoadUniversalIndices();
-    //             DataManager.Instance.ClearCache(DataType);
-    //             DiagManager.Instance.DevEditor.ReloadData(DataType);
-    //             ReloadEntries();
-    //         }
-    //     });
-    // }
-
-
+    
     public async Task DeleteItem()
     {
         var key = SelectedItem?.Key;
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/GroundEditorPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/GroundEditorPageViewModel.cs
index 23b27766..77fb9e3f 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/GroundEditorPageViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/GroundEditorPageViewModel.cs
@@ -152,7 +152,7 @@ public async void mnuOpen_Click()
             AllowMultiple = false,
             FileTypeFilter =
             [
-                new FilePickerFileType("Ground Files")
+                new FilePickerFileType(".rsground")
                 {
                     Patterns = ["*." + DataManager.GROUND_EXT.Substring(1)]
                 }
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/MapEditorPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/MapEditorPageViewModel.cs
index 4f471d60..98965521 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/MapEditorPageViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/MapEditorPageViewModel.cs
@@ -164,7 +164,7 @@ public async void mnuOpen_Click()
             AllowMultiple = false,
             FileTypeFilter =
             [
-                new FilePickerFileType("Map Files")
+                new FilePickerFileType(".rsmap")
                 {
                     Patterns = [$"*{DataManager.MAP_EXT}"]
                 }
@@ -313,7 +313,7 @@ public async Task<bool> mnuSaveAs_Click()
         {
             FileTypeChoices =
             [
-                new FilePickerFileType("Map Files")
+                new FilePickerFileType(".rsmap")
                 {
                     Patterns = [$"*{DataManager.MAP_EXT}"]
                 }
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ModListPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ModListPageViewModel.cs
index 2e0a9ce1..12369e0c 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ModListPageViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ModListPageViewModel.cs
@@ -14,6 +14,7 @@
 
 namespace RogueEssence.Dev.ViewModels;
 
+
 public class ModListPageViewModel : EditorPageViewModel
 {
     private string _searchFilter = string.Empty;
@@ -32,51 +33,20 @@ public ModsEntryViewModel? SelectedItem
         get => _selectedItem;
         set => this.RaiseAndSetIfChanged(ref _selectedItem, value);
     }
-
-
-    public ObservableCollection<ModsEntryViewModel> Items { get; } = new();
+    
     public ObservableCollection<ModsEntryViewModel> FilteredItems { get; } = new();
-
     
-    private string currentMod;
-
-    public string CurrentMod
-    {
-        get => currentMod;
-        set => this.SetIfChanged(ref currentMod, value);
-    }
-
     public async void btnSwitch_Click()
     {
-        //give a pop up warning that the game will be reloaded and wait for confirmation
-        MessageBoxWindowView.MessageBoxResult result = await MessageBoxWindowView.Show(_context.DialogService,
-            $"The game will be reloaded to use content from {SelectedItem.Namespace}.\nClick OK to proceed.", "Are you sure?",
-            MessageBoxWindowView.MessageBoxButtons.OkCancel);
-        if (result == MessageBoxWindowView.MessageBoxResult.Cancel)
-            return;
-
-        DevForm.ExecuteOrPend(doSwitch);
-    }
+        bool isCurrentMod = await _modManager.CheckIsCurrentMod(SelectedItem);
 
-    private void doSwitch()
-    {
-        //modify and reload
-        lock (GameBase.lockObj)
+        if (!isCurrentMod)
         {
-            LuaEngine.Instance.BreakScripts();
-            MenuManager.Instance.ClearMenus();
-            if (!String.IsNullOrEmpty(SelectedItem.Path))
-                GameManager.Instance.SetQuest(PathMod.GetModDetails(PathMod.FromApp(SelectedItem.Path)),
-                    new ModHeader[0] { }, new List<int>() { -1 });
-            else
-                GameManager.Instance.SetQuest(ModHeader.Invalid, new ModHeader[0] { }, new List<int>() { });
-
-            DiagManager.Instance.PrintModSettings();
-            DiagManager.Instance.SaveModSettings();
-            DiagManager.Instance.DevEditor.MapEditor = null;
-            DiagManager.Instance.DevEditor.GroundEditor = null;
+            await _modManager.AskSwitchTo(SelectedItem);
         }
     }
+
+  
     ModManagerViewModel _modManager;
 
     public ModListPageViewModel(EditorContext context, ModManagerViewModel modManager, NodeBase node, Action<EditorPageViewModel> onPageOpen = null) :
@@ -88,26 +58,19 @@ private void UpdateVisibleItems(string filter)
     {
         FilteredItems.Clear();
         var strategy = new BeginningTitleFilterStrategy();
-        foreach (var item in Items.Where(e => strategy.Matches(e.Name, filter) || strategy.Matches(e.Namespace, filter)))
+        foreach (var item in _modManager.ModsList.Where(e => strategy.Matches(e.Name, filter) || strategy.Matches(e.Namespace, filter)))
             FilteredItems.Add(item);
     }
 
     public override void OnPageLoad()
     {
         base.OnPageLoad();
-        currentMod = null;
         this.WhenAnyValue(x => x.SearchFilter).Subscribe(UpdateVisibleItems);
-
-        // Items = new ObservableCollection<ModsEntryViewModel>();
-        reloadMods();
-       
     }
 
     
     public async void btnAdd_Click()
     {
-       
-
         ModNameWindowViewModel vm = new ModNameWindowViewModel();
 
         bool result = await _context.DialogService.ShowDialogAsync<ModNameWindowViewModel, bool>(vm, "Add Mod and Namespace");
@@ -124,7 +87,7 @@ public async void btnAdd_Click()
             return;
 
         //check for children name conflicts
-        foreach (ModsEntryViewModel child in Items)
+        foreach (ModsEntryViewModel child in _modManager.ModsList)
         {
             if (String.Equals(child.Name, newName, StringComparison.OrdinalIgnoreCase))
             {
@@ -164,7 +127,7 @@ await MessageBoxWindowView.Show(_context.DialogService, newName + " (Namespace)
         LuaEngine.InitScriptFolders(fullPath, vm.Namespace);
 
         //add node
-        Items.Add(newEntry);
+        _modManager.ModsList.Add(newEntry);
         UpdateVisibleItems(SearchFilter);
         await AddChildItemUnderParent(newEntry);
     }
@@ -172,7 +135,7 @@ await MessageBoxWindowView.Show(_context.DialogService, newName + " (Namespace)
     public async void btnDelete_Click()
     {
         //prohibit the deletion of the current node or the base node
-        if (SelectedItem == Items[0])
+        if (SelectedItem == _modManager.ModsList[0])
         {
             await MessageBoxWindowView.Show(_context.DialogService, "Cannot delete the root mod!", "Delete Failed", MessageBoxWindowView.MessageBoxButtons.Ok);
             return;
@@ -187,37 +150,15 @@ public async void btnDelete_Click()
         //delete folder
         Directory.Delete(fullPath, true);
 
-        //and then delete node
-        Items.Remove(SelectedItem);
+        //and then delete mod
+        _modManager.RemoveMod(SelectedItem);
         UpdateVisibleItems(SearchFilter);
         
     }
     
-    public async void btnEdit_Click()
-    {
-        ModConfigWindowView window = new ModConfigWindowView();
-        ModHeader header = PathMod.Quest;
-        ModConfigViewModel2 vm = new ModConfigViewModel2(_context.DialogService, header);
-        window.DataContext = vm;
-
-        DevForm form = (DevForm)DiagManager.Instance.DevEditor;
-        bool result = await window.ShowDialog<bool>(form);
-
-        if (result)
-        {
-            //save the mod data
-            string fullPath = PathMod.FromApp(PathMod.Quest.Path);
-            ModHeader resultHeader = new ModHeader(PathMod.Quest.Path, vm.Name.Trim(), vm.Author.Trim(), vm.Description.Trim(), Text.Sanitize(vm.Namespace).ToLower(), Guid.Parse(vm.UUID), Version.Parse(vm.Version), Version.Parse(vm.GameVersion), (PathMod.ModType)vm.ChosenModType, vm.GetRelationshipArray());
-            PathMod.SaveModDetails(fullPath, resultHeader);
-
-            reloadMods();
-            DevForm.ExecuteOrPend(doSwitch);
-        }
-    }
-
     public async Task AddChildItemUnderParent(ModsEntryViewModel entry)
     {
-        if (entry == Items[0])
+        if (entry == _modManager.ModsList[0])
         {
             await MessageBoxWindowView.Show(_context.DialogService, "Cannot edit the root mod!", "Edit Failed", MessageBoxWindowView.MessageBoxButtons.Ok);
             
@@ -234,37 +175,13 @@ public async Task AddChildItemUnderParent(ModsEntryViewModel entry)
                         ModHeader resultHeader = new ModHeader(PathMod.Quest.Path, page.Name.Trim(), page.Author.Trim(), page.Description.Trim(), Text.Sanitize(page.Namespace).ToLower(), Guid.Parse(page.UUID), Version.Parse(page.Vers), Version.Parse(page.GameVersion), (PathMod.ModType)page.ChosenModType, page.GetRelationshipArray());
                         PathMod.SaveModDetails(fullPath, resultHeader);
                     
-                        reloadMods();
-                        // DevForm.ExecuteOrPend(doSwitch);
+                        _modManager.ReloadMods();
+                        UpdateVisibleItems(SearchFilter);
                     };
                 }));
             NodeHelper.ExpandParents(Node, true);
         }
 
     }
-    
-    private void reloadMods()
-    {
-        Items.Clear();
-        Items.Add(new ModsEntryViewModel("Origin", PathMod.BaseNamespace, ""));
-        string[] modsPath = Directory.GetDirectories(PathMod.MODS_PATH);
-        ModsEntryViewModel chosenModel = null;
-        foreach (string modPath in modsPath)
-        {
-            ModHeader header = PathMod.GetModDetails(modPath);
-            Items.Add(new ModsEntryViewModel(getModName(header), header.Namespace, Path.Combine(PathMod.MODS_FOLDER, Path.GetFileName(modPath))));
-            if (PathMod.Quest.Path == header.Path)
-                chosenModel = Items[Items.Count - 1];
-        }
-        SelectedItem = chosenModel;
-        UpdateVisibleItems(SearchFilter);
-    }
-
-    private static string getModName(ModHeader mod)
-    {
-        if (!mod.IsValid())
-            return null;
-        return mod.GetMenuName();
-    }
 
 }
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/ModSwitcherViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/ModSwitcherViewModel.cs
index 637d9f67..c4246b43 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/ModSwitcherViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/ModSwitcherViewModel.cs
@@ -14,23 +14,24 @@ namespace RogueEssence.Dev.ViewModels;
 public class ModSwitcherViewModel : ViewModelBase
 {
 
-    private readonly IDialogService _dialogService;
+    // private readonly IDialogService _dialogService;
     private readonly DevFormViewModel _mainWindow;
-    private ModsNodeViewModel _selectedMod;
-    
-    public ModsNodeViewModel SelectedMod
+    private ModsEntryViewModel _selectedMod;
+    private ModManagerViewModel _modManager;
+    public ModsEntryViewModel SelectedMod
     {
         get => _selectedMod;
         set { this.RaiseAndSetIfChanged(ref _selectedMod, value); }
     }
     
-    public ObservableCollection<ModsNodeViewModel> Mods { get; }
-    public ModSwitcherViewModel(DevFormViewModel mainWindowViewModel, IDialogService dialogService)
+    public ObservableCollection<ModsEntryViewModel> Mods { get; }
+    public ModSwitcherViewModel(DevFormViewModel mainWindowViewModel, ModManagerViewModel modManager)
     {
+        _modManager = modManager;
         _mainWindow = mainWindowViewModel;
-        _dialogService = dialogService;
+        
 
-        Mods = new ObservableCollection<ModsNodeViewModel>(mainWindowViewModel.Mods);
+        Mods = new ObservableCollection<ModsEntryViewModel>(mainWindowViewModel.ModsManager.ModsList);
     }
     
     
@@ -41,42 +42,17 @@ public void CloseSwitcher()
     
     public async Task ConfirmModSwitchAsync()
     {
-        var res = await MessageBoxWindowView.Show(_dialogService, "The game will be reloaded to use content from the new path. Click OK to proceed. Your changes will not be saved.", "Are you sure?", MessageBoxWindowView.MessageBoxButtons.OkCancel);
-        if (res == MessageBoxWindowView.MessageBoxResult.Ok)
-        {
-            DevForm.ExecuteOrPend(() => _doSwitch(SelectedMod));
-        }
+        await _modManager.AskSwitchTo(SelectedMod);
     }
     
-    public ModsNodeViewModel CurrentMod
-    {
-        get => _mainWindow.ChosenMod;
-        set => _mainWindow.ChosenMod = value;
-    }
 
-    public bool IsCurrent(ModsNodeViewModel head)
+    public async Task<bool> CheckIsCurrentMod(ModsEntryViewModel mod)
     { 
-        return head.Namespace == _mainWindow.ChosenMod.Namespace;
+        return await _modManager.CheckIsCurrentMod(mod);
     }
     
-    private void _doSwitch(ModsNodeViewModel mod)
-    {
-        //modify and reload
-        lock (GameBase.lockObj)
-        {
-            LuaEngine.Instance.BreakScripts();
-            MenuManager.Instance.ClearMenus();
-            if (!String.IsNullOrEmpty(mod.Path))
-                GameManager.Instance.SetQuest(PathMod.GetModDetails(PathMod.FromApp(mod.Path)), new ModHeader[0] { }, new List<int>() { -1 });
-            else
-                GameManager.Instance.SetQuest(ModHeader.Invalid, new ModHeader[0] { }, new List<int>() { });
-
-            DiagManager.Instance.PrintModSettings();
-            DiagManager.Instance.SaveModSettings();
-            DiagManager.Instance.DevEditor.MapEditor = null;
-            // DiagManager.Instance.DevEditor.GroundEditor = null;
-        }
-    }
+    
+    
 }
 
 
diff --git a/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabMods.axaml b/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabMods.axaml
index 94892560..bcf19ca4 100644
--- a/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabMods.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabMods.axaml
@@ -23,8 +23,8 @@
       <ColumnDefinition/>
       <ColumnDefinition/>
     </Grid.ColumnDefinitions>
-    <TextBlock VerticalAlignment="Bottom" Text="{Binding CurrentMod, Converter={StaticResource NullableToStringConverter}, StringFormat=Currently Editing Mod: {0}}" Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2"></TextBlock>
-    <Button Command="{Binding btnEdit_Click}" IsEnabled="{Binding CurrentMod, Converter={x:Static StringConverters.IsNotNullOrEmpty}}" Margin="4" Grid.Row="0" Grid.Column="2">Edit</Button>
+    <!-- <TextBlock VerticalAlignment="Bottom" Text="{Binding CurrentMod, Converter={StaticResource NullableToStringConverter}, StringFormat=Currently Editing Mod: {0}}" Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2"></TextBlock> -->
+    <!-- <Button Command="{Binding btnEdit_Click}" IsEnabled="{Binding CurrentMod, Converter={x:Static StringConverters.IsNotNullOrEmpty}}" Margin="4" Grid.Row="0" Grid.Column="2">Edit</Button> -->
     <!-- <TreeView ItemsSource="{Binding Mods}" SelectedItem="{Binding ChosenMod}" SelectionMode="AlwaysSelected" Margin="4" Grid.Row="1" Grid.ColumnSpan="3"> -->
     <!--   <TreeView.DataTemplates> -->
     <!--     <TreeDataTemplate DataType="vm:ModsNodeViewModel" ItemsSource="{Binding Nodes}"> -->
@@ -39,8 +39,8 @@
     <!--     </TreeDataTemplate> -->
     <!--   </TreeView.DataTemplates> -->
     <!-- </TreeView> -->
-    <Button Command="{Binding btnSwitch_Click}" Margin="4" Grid.Row="2" Grid.Column="0">Switch To</Button>
-    <Button Command="{Binding btnAdd_Click}" Margin="4" Grid.Row="2" Grid.Column="1">Add New</Button>
-    <Button Command="{Binding btnDelete_Click}" Margin="4" Grid.Row="2" Grid.Column="2">Delete</Button>
+    <!-- <Button Command="{Binding btnSwitch_Click}" Margin="4" Grid.Row="2" Grid.Column="0">Switch To</Button> -->
+    <!-- <Button Command="{Binding btnAdd_Click}" Margin="4" Grid.Row="2" Grid.Column="1">Add New</Button> -->
+    <!-- <Button Command="{Binding btnDelete_Click}" Margin="4" Grid.Row="2" Grid.Column="2">Delete</Button> -->
   </Grid>
 </UserControl>
diff --git a/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml b/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml
index ed9afd82..ba030585 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml
@@ -55,7 +55,7 @@
                         ToolTip.Tip="testing tooltip">
                     <StackPanel Orientation="Horizontal"
                                 VerticalAlignment="Center">
-                        <TextBlock Padding="0,0,6,0" Text="{Binding ChosenMod.Name}"
+                        <TextBlock Padding="0,0,6,0" Text="{Binding ModsManager.CurrentMod.Name, FallbackValue='Origin'}"
                                    MaxWidth="200"
                                    TextTrimming="CharacterEllipsis" />
                         <Path HorizontalAlignment="Center" Width="10" Height="10" Margin="0,2,0,0"
diff --git a/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml.cs b/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml.cs
index aee50683..81d2114c 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml.cs
@@ -131,7 +131,9 @@ private void reload(DataManager.DataType dataType)
 
                 if (dataType == DataManager.DataType.All)
                 {
-                    devViewModel.UpdateMod();
+                    devViewModel.ModsManager.UpdateMod();
+                    devViewModel.ModsManager.ReloadMods();
+                    
                     devViewModel.LoadDevTree();
                 }
 
diff --git a/RogueEssence.Editor.Avalonia/Views/New/ModSwitcherView.axaml b/RogueEssence.Editor.Avalonia/Views/New/ModSwitcherView.axaml
index f501625c..816041d0 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/ModSwitcherView.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/New/ModSwitcherView.axaml
@@ -55,7 +55,7 @@
             
 
             <ListBox.ItemTemplate>
-                <DataTemplate DataType="vm:ModsNodeViewModel">
+                <DataTemplate DataType="vm:ModsEntryViewModel">
                     <!-- Tapped="OnItemTapped" -->
                     <Grid RowDefinitions="Auto, Auto" Background="Transparent" Tapped="OnItemTapped" >
                         <TextBlock FontSize="14" Classes="primary"  Text="{Binding Name}" ></TextBlock>
diff --git a/RogueEssence.Editor.Avalonia/Views/New/ModSwitcherView.axaml.cs b/RogueEssence.Editor.Avalonia/Views/New/ModSwitcherView.axaml.cs
index 0fc428fa..531b6fa9 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/ModSwitcherView.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/New/ModSwitcherView.axaml.cs
@@ -34,11 +34,15 @@ protected override async void OnKeyDown(KeyEventArgs e)
         if (e.Key != Key.Enter || DataContext is not ViewModels.ModSwitcherViewModel switcher)
             return;
 
-        var selected = ModsListBox.SelectedItem as ModsNodeViewModel;
+        var selected = ModsListBox.SelectedItem as ModsEntryViewModel;
         if (selected is null)
             return;
+
+
+        bool isCurrentMod = await switcher.CheckIsCurrentMod(selected);
         
-        if (switcher.IsCurrent(selected))
+        // Don't prompt if the mod is already selected.
+        if (isCurrentMod)
         {
             switcher.CloseSwitcher();
             e.Handled = true;
@@ -47,13 +51,7 @@ protected override async void OnKeyDown(KeyEventArgs e)
         
         switcher.CloseSwitcher();
         await switcher.ConfirmModSwitchAsync();
-        // if (result == MessageBoxWindowView.MessageBoxResult.Cancel)
-        //     return;
-        
-        // switcher.CurrentMod = selected;
-      
 
-        // DevForm.ExecuteOrPend(() => _doSwitch(selected));
         e.Handled = true;
     }
 
@@ -82,17 +80,18 @@ private async void OnItemTapped(object sender, TappedEventArgs e)
         if (DataContext is not ModSwitcherViewModel switcher)
             return;
 
-        var selected = ModsListBox.SelectedItem as ModsNodeViewModel;
+        var selected = ModsListBox.SelectedItem as ModsEntryViewModel;
         if (selected is null)
             return;
         
-        if (switcher.IsCurrent(selected))
+        bool isCurrentMod = await switcher.CheckIsCurrentMod(selected);
+        if (isCurrentMod)
         {
             switcher.CloseSwitcher();
             e.Handled = true;
             return;
         }
-        
+    
         switcher.CloseSwitcher();
         await switcher.ConfirmModSwitchAsync();
         

From 7ed5b873dd7c6fc41d0944fe928039de91cbb74e Mon Sep 17 00:00:00 2001
From: Kace <41309226+DoubleTrio@users.noreply.github.com>
Date: Thu, 21 May 2026 04:27:15 -0400
Subject: [PATCH 36/51] add empty page, clean up spacing

---
 RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs | 2 +-
 .../Views/New/Editors/SpeciesEditPageView.axaml                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs
index a6e34e58..87a85aee 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs
@@ -526,7 +526,7 @@ private void CreateConstantsNode(NodeBase parent)
         constantsNode.SubNodes.Add(stringsNode);
         
         var effectsNode =
-            _context.NodeFactory.CreateOpenEditorNode<MapEditorPageViewModel>("Effects", "Icons.SparkleFill");
+            _context.NodeFactory.CreateOpenEditorNode<EmptyPageViewModel>("Effects", "Icons.SparkleFill");
         effectsNode.SubNodes.Add(_context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>("Heal FX",
             effectsNode,
             "Icons.SparkleFill", CreateFXOnOpen(() => DataManager.Instance.HealFX, fx => DataManager.Instance.HealFX = fx, "Heal", parent)));
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/SpeciesEditPageView.axaml b/RogueEssence.Editor.Avalonia/Views/New/Editors/SpeciesEditPageView.axaml
index 2c22f75d..3b0d4adf 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/Editors/SpeciesEditPageView.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/New/Editors/SpeciesEditPageView.axaml
@@ -120,7 +120,7 @@
 
         <!-- Text="{Binding SearchFilter, Mode=TwoWay}" -->
         <!-- Search Grid -->
-        <Grid Grid.Row="3" RowDefinitions="Auto, 16, Auto, 32, Auto" Margin="64, 8" MinWidth="600">
+        <Grid Grid.Row="3" RowDefinitions="Auto, 16, Auto, 8, Auto" Margin="64, 8" MinWidth="600">
 
             <TextBox Classes="search"
                      Grid.Row="0"

From 65088ff334187f08cfe1c4549f66c824999f5e9e Mon Sep 17 00:00:00 2001
From: Kace <41309226+DoubleTrio@users.noreply.github.com>
Date: Thu, 21 May 2026 04:45:44 -0400
Subject: [PATCH 37/51] check for null mod

---
 .../ViewModels/DevForm/ModManagerViewModel.cs         | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/RogueEssence.Editor.Avalonia/ViewModels/DevForm/ModManagerViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/DevForm/ModManagerViewModel.cs
index f4f27cac..c528ce76 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/DevForm/ModManagerViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/DevForm/ModManagerViewModel.cs
@@ -144,7 +144,8 @@ private void _switchTo(ModsEntryViewModel mod)
         public void ReloadMods()
         {
             ModsList.Clear();
-            ModsList.Add(new ModsEntryViewModel("Origin", PathMod.BaseNamespace, ""));
+            CurrentMod = new ModsEntryViewModel("Origin", PathMod.BaseNamespace, "");
+            ModsList.Add(CurrentMod);
             string[] modsPath = Directory.GetDirectories(PathMod.MODS_PATH);
             ModsEntryViewModel chosenModel = null;
             foreach (string modPath in modsPath)
@@ -152,11 +153,11 @@ public void ReloadMods()
                 ModHeader header = PathMod.GetModDetails(modPath);
                 ModsList.Add(new ModsEntryViewModel(getModName(header), header.Namespace, Path.Combine(PathMod.MODS_FOLDER, Path.GetFileName(modPath))));
                 if (PathMod.Quest.Path == header.Path)
-                    chosenModel = ModsList[ModsList.Count - 1];
+                {
+                    CurrentMod = ModsList[ModsList.Count - 1];
+                    break;
+                }
             }
-
- 
-            CurrentMod = chosenModel;
         }
 
         public void RemoveMod(ModsEntryViewModel mod)

From 62915e947f60a543146ffe3ee0cde4bfef9c7c95 Mon Sep 17 00:00:00 2001
From: Kace <41309226+DoubleTrio@users.noreply.github.com>
Date: Thu, 21 May 2026 16:15:09 -0400
Subject: [PATCH 38/51] adjust spacing and icons

---
 .../ViewModels/New/DevFormViewModel.cs                      | 4 ++--
 .../Views/DevForm/DevTabPlayer.axaml                        | 4 ++--
 .../Views/DevForm/DevTabTravel.axaml                        | 6 +++---
 RogueEssence/Data/DataManager.cs                            | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs
index 87a85aee..9630bf19 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs
@@ -420,7 +420,7 @@ public void LoadDevTree()
 
         var rootStr = ModsManager.CurrentModString;
         
-        var root = _nodeFactory.CreateOpenEditorNode<DevEditPageViewModel>(rootStr, "Icons.ScrollFill");
+        var root = _nodeFactory.CreateOpenEditorNode<EmptyPageViewModel>(rootStr, "Icons.ScrollFill");
 
         Root = root;
         ModsManager.WhenAnyValue(x => x.CurrentMod.Name)
@@ -627,7 +627,7 @@ private void CreateSpriteNode(NodeBase parent)
         );
         spriteNode.SubNodes.Add(
             _context.NodeFactory.CreateOpenEditorNodeWithParams<SpeciesEditPageViewModel>("Portraits", [false],
-                "Icons.PersonFill")
+                "Icons.UserSquareFill")
         );
      
         foreach (var type in Enum.GetValues<GraphicsManager.AssetType>())
diff --git a/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabPlayer.axaml b/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabPlayer.axaml
index 55c91270..649d4ecb 100644
--- a/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabPlayer.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabPlayer.axaml
@@ -20,8 +20,8 @@
         <Setter Property="VerticalContentAlignment" Value="Center" />
       </Style>
     </Grid.Styles>
-    <TextBlock  Margin="4,0" VerticalAlignment="Bottom" Grid.Row="0" Grid.Column="0">Lv.</TextBlock>
-    <NumericUpDown  Name="nudLevel" Value="{Binding Level}" Minimum="1" Maximum="100" Increment="1" Grid.Row="1" Grid.Column="0"/>
+    <TextBlock Margin="4,0" VerticalAlignment="Bottom" Grid.Row="0" Grid.Column="0">Lv.</TextBlock>
+    <NumericUpDown Name="nudLevel" Value="{Binding Level}" Minimum="1" Maximum="100" Increment="1" Grid.Row="1" Grid.Column="0"/>
     <Button Classes="flat" Name="btnRollSkill" Command="{Binding btnRollSkill_Click}" Grid.Row="1" Grid.Column="1">Reroll Skills</Button>
     <TextBlock Margin="4,0" VerticalAlignment="Bottom" Grid.Row="2" Grid.Column="0">Species</TextBlock>
     <Grid Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2" ColumnDefinitions="*, Auto">
diff --git a/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabTravel.axaml b/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabTravel.axaml
index da16d8f5..419581cc 100644
--- a/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabTravel.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabTravel.axaml
@@ -14,7 +14,7 @@
     <converters:ListNotEmptyConverter x:Key="ListNotEmptyConverter"/>
   </UserControl.Resources>
   <Grid RowDefinitions="Auto, 30, 30, Auto, 30, Auto, 30, Auto, 10, Auto" ColumnDefinitions="*, *" ColumnSpacing="8">
-    <Button Margin="0, 10" Classes="flat" Command="{Binding btnReloadMap_Click}" Grid.Row="0" Grid.ColumnSpan="2">Reload Current Map</Button>
+    <Button  Margin="4" Classes="flat" Command="{Binding btnReloadMap_Click}" Grid.Row="0" Grid.ColumnSpan="2">Reload Current Map</Button>
     <CheckBox Name="chkDebugGen" Margin="4" IsChecked="{Binding DebugGen}" VerticalAlignment="Center" Grid.Row="1" Grid.ColumnSpan="2">Show Generation Steps</CheckBox>
     <TextBlock Margin="4,0" VerticalAlignment="Bottom" Grid.Row="2">Zone:</TextBlock>
     <views:SearchComboBox Margin="4" ItemsSource="{Binding Zones}" SelectedIndex="{Binding ChosenZone}" Grid.Row="3" Grid.ColumnSpan="2"/>
@@ -22,9 +22,9 @@
     <views:SearchComboBox Margin="4" ItemsSource="{Binding Structures}" IsEnabled="{Binding Path=Structures, Converter={StaticResource ListNotEmptyConverter}}" SelectedIndex="{Binding ChosenStructure}" Grid.Row="5" Grid.ColumnSpan="2" />
     <TextBlock Margin="4,0" VerticalAlignment="Bottom" Grid.Row="6" Grid.Column="0">Ground:</TextBlock>
     <views:SearchComboBox Margin="4,0" ItemsSource="{Binding Grounds}" SelectedIndex="{Binding ChosenGround}" IsEnabled="{Binding Path=Grounds, Converter={StaticResource ListNotEmptyConverter}}" Grid.Row="7" Grid.Column="0"/>
-    <Button Classes="flat" Command="{Binding btnEnterGround_Click}" IsEnabled="{Binding Path=Grounds, Converter={StaticResource ListNotEmptyConverter}}" Grid.Row="9" Grid.Column="0">Enter Ground</Button>
+    <Button Margin="4,0" Classes="flat" Command="{Binding btnEnterGround_Click}" IsEnabled="{Binding Path=Grounds, Converter={StaticResource ListNotEmptyConverter}}" Grid.Row="9" Grid.Column="0">Enter Ground</Button>
     <TextBlock Margin="4,0" VerticalAlignment="Bottom" Grid.Row="6" Grid.Column="1" >Floor:</TextBlock>
     <views:SearchComboBox  Margin="4,0" ItemsSource="{Binding Floors}" IsEnabled="{Binding Path=Floors, Converter={StaticResource ListNotEmptyConverter}}" SelectedIndex="{Binding ChosenFloor}" Grid.Row="7" Grid.Column="1"/>
-    <Button Classes="flat" Command="{Binding btnEnterDungeon_Click}" IsEnabled="{Binding Path=Floors, Converter={StaticResource ListNotEmptyConverter}}" Grid.Row="9" Grid.Column="1">Enter Map</Button>
+    <Button Margin="4,0" Classes="flat" Command="{Binding btnEnterDungeon_Click}" IsEnabled="{Binding Path=Floors, Converter={StaticResource ListNotEmptyConverter}}" Grid.Row="9" Grid.Column="1">Enter Map</Button>
   </Grid>
 </UserControl>
\ No newline at end of file
diff --git a/RogueEssence/Data/DataManager.cs b/RogueEssence/Data/DataManager.cs
index f6f9765c..67f43dd8 100644
--- a/RogueEssence/Data/DataManager.cs
+++ b/RogueEssence/Data/DataManager.cs
@@ -33,7 +33,7 @@ static DataRegistry()
             Register(DataManager.DataType.Item, typeof(ItemData), DataManager.Instance.GetItem, () => new ItemData(), "Icons.JarLabelFill");
             Register(DataManager.DataType.Intrinsic, typeof(IntrinsicData), DataManager.Instance.GetIntrinsic, () => new IntrinsicData(), "Icons.SwordFill");
             Register(DataManager.DataType.Status, typeof(StatusData), DataManager.Instance.GetStatus, () => new StatusData(), "Icons.HeartFill");
-            Register(DataManager.DataType.MapStatus, typeof(MapStatusData), DataManager.Instance.GetMapStatus, () => new MapStatusData(), "Icons.HeartFill");
+            Register(DataManager.DataType.MapStatus, typeof(MapStatusData), DataManager.Instance.GetMapStatus, () => new MapStatusData(), "Icons.CloudRainFill");
             Register(DataManager.DataType.Terrain, typeof(TerrainData), DataManager.Instance.GetTerrain, () => new TerrainData(), "Icons.MountainsFill");
             Register(DataManager.DataType.Tile, typeof(TileData), DataManager.Instance.GetTile, () => new TileData(), "Icons.SquaresFourFill");
             Register(DataManager.DataType.Zone, typeof(ZoneData), DataManager.Instance.GetZone, () => new ZoneData(), "Icons.StairsFill");
@@ -43,7 +43,7 @@ static DataRegistry()
             Register(DataManager.DataType.GrowthGroup, typeof(GrowthData), DataManager.Instance.GetGrowth, () => new GrowthData(), "Icons.TrendUpFill");
             Register(DataManager.DataType.SkillGroup, typeof(SkillGroupData), DataManager.Instance.GetSkillGroup, () => new SkillGroupData(), "Icons.ListFill");
             Register(DataManager.DataType.AI, typeof(AITactic), DataManager.Instance.GetAITactic, () => new AITactic(), "Icons.BrainFill");
-            Register(DataManager.DataType.Rank, typeof(RankData), DataManager.Instance.GetRank, () => new RankData(), "Icons.BinaryFill");
+            Register(DataManager.DataType.Rank, typeof(RankData), DataManager.Instance.GetRank, () => new RankData(), "Icons.RankingFill");
             Register(DataManager.DataType.Skin, typeof(SkinData), DataManager.Instance.GetSkin, () => new SkinData(), "Icons.SparkleFill");
         }
 

From 4eb3d9228fa6ff6e4c683c0f0640e88f8afc3465 Mon Sep 17 00:00:00 2001
From: Kace <41309226+DoubleTrio@users.noreply.github.com>
Date: Thu, 21 May 2026 18:03:13 -0400
Subject: [PATCH 39/51] file restructures

---
 RogueEssence.Editor.Avalonia/App.axaml.cs     |   19 +-
 .../DataEditor/CategorySpawnBoxViewModel.cs   |  115 +-
 .../DataEditor/DataEditRootForm.axaml         |   10 +-
 .../DataEditor/DataEditRootForm.axaml.cs      |    4 +-
 .../RogueEssence/CategorySpawnEditor.cs       |    2 +-
 .../DataEditor/RankedCollectionBox.axaml      |    2 +-
 .../EditorContext/TabEvents.cs                |    3 +-
 .../RogueEssence.Editor.Avalonia.csproj       |  168 ++-
 .../ViewModels/Content/AnimEditViewModel.cs   |  478 -------
 .../ViewModels/Content/BeamEditViewModel.cs   |  812 ++++++------
 .../Content/SpeciesEditViewModel.cs           |  803 -----------
 .../Content/StringsEditViewModel.cs           |  200 ---
 .../Content/TilesetEditViewModel.cs           |  431 ------
 .../ViewModels/DevForm/DevFormViewModel.cs    |  835 +++++++++++-
 .../DevForm/DevTabConstantsViewModel.cs       |  230 ----
 .../ViewModels/DevForm/DevTabDataViewModel.cs |  553 --------
 .../DevForm/DevTabSpritesViewModel.cs         |   93 --
 .../{New => DevForm}/ModSwitcherViewModel.cs  |    0
 .../Nodes/ISpriteRootOperationStrategy.cs     |    0
 .../{New => DevForm}/Nodes/NodeBase.cs        |    0
 .../Nodes/SpriteRootAssetTypeStrategy.cs      |    1 -
 .../Nodes/SpriteRootTileStrategy.cs           |   12 +-
 .../{New => DevForm}/TabSwitcherViewModel.cs  |    0
 .../DialogBoxes/AnimChoiceViewModel.cs        |   33 -
 .../DialogBoxes/AnimChoiceWindowViewModel.cs  |    0
 .../{New => }/DialogBoxes/DialogViewModel.cs  |    0
 .../DialogBoxes/MapLayerWindowViewModel.cs    |    0
 .../DialogBoxes/MapResizeViewModel.cs         |   91 --
 .../DialogBoxes/MapResizeWindowViewModel.cs   |    0
 .../DialogBoxes/MapRetileViewModel.cs         |   52 -
 .../DialogBoxes/MapRetileWindowViewModel.cs   |    0
 .../DialogBoxes/MessageBoxWindowViewModel.cs  |    0
 .../DialogBoxes/ModConfigViewModel2.cs        |  159 ---
 .../ModManagerViewModel.cs                    |    0
 .../DialogBoxes/ModNameWindowViewModel.cs     |    0
 .../DialogBoxes/PreferencesWindowViewModel.cs |    0
 .../ViewModels/DialogBoxes/RenameViewModel.cs |   27 -
 .../DialogBoxes/RenameWindowViewModel.cs      |    0
 .../GroundEditForm/GroundEditViewModel.cs     |  633 ---------
 .../MapEditForm/MapEditViewModel.cs           |  657 ---------
 .../ViewModels/New/DevFormViewModel.cs        |  796 -----------
 .../DialogBoxes/ModConfigWindowViewModel.cs   |  159 ---
 .../New/Editors/DevEditPageViewModel.cs       |   82 --
 .../ViewModels/New/TestComboBoxViewModel.cs   |   41 -
 .../ViewModels/New/TreeSearchViewModel.cs     |  123 --
 .../DataListPageViewModel.cs                  |    0
 .../DevControlPageViewModel.cs}               |    4 +-
 .../DevControlPage}/DevTabGameViewModel.cs    |    0
 .../DevControlPage}/DevTabPlayerViewModel.cs  |    0
 .../DevControlPage}/DevTabScriptViewModel.cs  |    0
 .../DevControlPage}/DevTabTravelViewModel.cs  |    0
 .../Editors => Pages}/EditorPageViewModel.cs  |    0
 .../Editors => Pages}/EmptyPageViewModel.cs   |    0
 .../GroundEditPage}/EntScriptItem.cs          |    0
 .../GroundEditPage}/EntityBrowserViewModel.cs |    0
 .../GroundEditPageViewModel.cs}               |    4 +-
 .../GroundTabDecorationsViewModel.cs          |    0
 .../GroundTabEntitiesViewModel.cs             |    0
 .../GroundTabPropertiesViewModel.cs           |    4 +-
 .../GroundTabScriptViewModel.cs               |    2 +-
 .../GroundTabStringsViewModel.cs              |    0
 .../GroundTabTexturesViewModel.cs             |    0
 .../GroundTabWallsViewModel.cs                |    0
 .../Layers/AnimLayerBoxViewModel.cs           |    0
 .../Layers/AnimLayerViewModel.cs              |    0
 .../Layers/EntityLayerBoxViewModel.cs         |    0
 .../Layers/EntityLayerViewModel.cs            |    0
 .../Layers/MapLayerViewModel.cs               |    0
 .../Layers/TextureLayerBoxViewModel.cs        |    0
 .../GroundEditPage}/MapString.cs              |    0
 .../GroundEditPage}/ScriptItem.cs             |    0
 .../MapEditPage/MapEditPageViewModel.cs}      |    6 +-
 .../MapTabDecorationsViewModel.cs             |    0
 .../MapEditPage}/MapTabEffectsViewModel.cs    |    0
 .../MapEditPage}/MapTabEntitiesViewModel.cs   |    0
 .../MapEditPage}/MapTabEntrancesViewModel.cs  |    0
 .../MapEditPage}/MapTabItemsViewModel.cs      |    0
 .../MapEditPage}/MapTabPropertiesViewModel.cs |    0
 .../MapEditPage}/MapTabSpawnsViewModel.cs     |    0
 .../MapEditPage}/MapTabTerrainViewModel.cs    |    0
 .../MapEditPage}/MapTabTexturesViewModel.cs   |    0
 .../MapEditPage}/MapTabTilesViewModel.cs      |    0
 .../MapEditPage}/Teams/TeamViewModel.cs       |    0
 .../ModConfigPageViewModel.cs                 |    0
 .../Editors => Pages}/ModListPageViewModel.cs |    0
 .../RandomInfoPageViewModel.cs                |    0
 .../ReflectedDataPageViewModel.cs             |    0
 .../SpeciesEditPageViewModel.cs               |    0
 .../Editors => Pages}/SpritePageViewModel.cs  |    5 +-
 .../StringEditPageViewModel.cs                |    0
 .../Views/Content/AnimEditForm.axaml          |   43 -
 .../Views/Content/AnimEditForm.axaml.cs       |   36 -
 .../Views/Content/SpeciesEditForm.axaml       |   69 -
 .../Views/Content/SpeciesEditForm.axaml.cs    |   23 -
 .../Views/Content/StringsEditForm.axaml       |   53 -
 .../Views/Content/StringsEditForm.axaml.cs    |   24 -
 .../Views/Content/TilesetEditForm.axaml       |   44 -
 .../Views/Content/TilesetEditForm.axaml.cs    |   24 -
 .../Views/DataListForm.axaml                  |   54 -
 .../Views/DataListForm.axaml.cs               |   29 -
 .../{New => DevForm}/CaptionButtons.axaml     |    0
 .../{New => DevForm}/CaptionButtons.axaml.cs  |    0
 .../{New => DevForm}/ChromelessWindow.cs      |    0
 .../Views/DevForm/DevForm.axaml               |  285 +++-
 .../Views/DevForm/DevForm.axaml.cs            | 1180 +++++++++++------
 .../Views/DevForm/DevTabConstants.axaml       |   50 -
 .../Views/DevForm/DevTabConstants.axaml.cs    |   14 -
 .../Views/DevForm/DevTabData.axaml            |   48 -
 .../Views/DevForm/DevTabData.axaml.cs         |   14 -
 .../Views/DevForm/DevTabMods.axaml            |   46 -
 .../Views/DevForm/DevTabMods.axaml.cs         |   16 -
 .../Views/DevForm/DevTabSprites.axaml         |   34 -
 .../Views/DevForm/DevTabSprites.axaml.cs      |   14 -
 .../{New => DevForm}/ModSwitcherView.axaml    |    0
 .../{New => DevForm}/ModSwitcherView.axaml.cs |    0
 .../Views/{New => DevForm}/TabBarView.axaml   |    0
 .../{New => DevForm}/TabBarView.axaml.cs      |    0
 .../{New => DevForm}/TabSwitcherView.axaml    |    0
 .../{New => DevForm}/TabSwitcherView.axaml.cs |    0
 .../Views/DialogBoxes/AnimChoiceWindow.axaml  |   26 -
 .../DialogBoxes/AnimChoiceWindow.axaml.cs     |   26 -
 .../DialogBoxes/AnimChoiceWindowView.axaml    |    0
 .../DialogBoxes/AnimChoiceWindowView.axaml.cs |    0
 .../DialogBoxes/MapLayerWindowView.axaml      |    0
 .../DialogBoxes/MapLayerWindowView.axaml.cs   |    0
 .../Views/DialogBoxes/MapResizeWindow.axaml   |   56 -
 .../DialogBoxes/MapResizeWindow.axaml.cs      |   27 -
 .../DialogBoxes/MapResizeWindowView.axaml     |    0
 .../DialogBoxes/MapResizeWindowView.axaml.cs  |    0
 .../Views/DialogBoxes/MapRetileWindow2.axaml  |   30 -
 .../DialogBoxes/MapRetileWindow2.axaml.cs     |   38 -
 .../DialogBoxes/MapRetileWindowView.axaml     |    0
 .../DialogBoxes/MapRetileWindowView.axaml.cs  |    0
 .../DialogBoxes/MessageBoxWindowView.axaml    |    0
 .../DialogBoxes/MessageBoxWindowView.axaml.cs |    0
 .../Views/DialogBoxes/ModConfigWindow.axaml   |   90 --
 .../DialogBoxes/ModConfigWindow.axaml.cs      |   53 -
 .../DialogBoxes/ModNameWindowView.axaml       |    0
 .../DialogBoxes/ModNameWindowView.axaml.cs    |    0
 .../DialogBoxes/PreferencesWindowView.axaml   |    0
 .../PreferencesWindowView.axaml.cs            |    0
 .../Views/DialogBoxes/RenameWindow.axaml      |   26 -
 .../Views/DialogBoxes/RenameWindow.axaml.cs   |   26 -
 .../DialogBoxes/RenameWindowView.axaml        |    0
 .../DialogBoxes/RenameWindowView.axaml.cs     |    0
 .../Views/GroundEditForm/GroundEditForm.axaml |   70 -
 .../GroundEditForm/GroundEditForm.axaml.cs    |   76 --
 .../Views/MapEditForm/MapEditForm.axaml       |   79 --
 .../Views/MapEditForm/MapEditForm.axaml.cs    |   70 -
 .../Views/New/DevForm.axaml                   |  241 ----
 .../Views/New/DevForm.axaml.cs                |  738 -----------
 .../New/DialogBoxes/ModConfigWindowView.axaml |  122 --
 .../DialogBoxes/ModConfigWindowView.axaml.cs  |   53 -
 .../Editors => Pages}/DataListPageView.axaml  |    0
 .../DataListPageView.axaml.cs                 |    0
 .../DevControlPage/DevControlPageView.axaml}  |   33 +-
 .../DevControlPageView.axaml.cs}              |    4 +-
 .../DevControlPage}/DevTabGame.axaml          |    0
 .../DevControlPage}/DevTabGame.axaml.cs       |    0
 .../DevControlPage}/DevTabPlayer.axaml        |    0
 .../DevControlPage}/DevTabPlayer.axaml.cs     |    0
 .../DevControlPage}/DevTabScript.axaml        |    0
 .../DevControlPage}/DevTabScript.axaml.cs     |    0
 .../DevControlPage}/DevTabTravel.axaml        |    0
 .../DevControlPage}/DevTabTravel.axaml.cs     |    0
 .../Editors => Pages}/DevEditPageView.axaml   |    0
 .../DevEditPageView.axaml.cs                  |    0
 .../GroundEditPage}/EntityBrowser.axaml       |    0
 .../GroundEditPage}/EntityBrowser.axaml.cs    |    0
 .../GroundEditPage/GroundEditPageView.axaml}  |    6 +-
 .../GroundEditPageView.axaml.cs}              |    4 +-
 .../GroundTabDecorations.axaml                |    0
 .../GroundTabDecorations.axaml.cs             |    0
 .../GroundEditPage}/GroundTabEntities.axaml   |    0
 .../GroundTabEntities.axaml.cs                |    0
 .../GroundEditPage}/GroundTabProperties.axaml |    0
 .../GroundTabProperties.axaml.cs              |    0
 .../GroundEditPage}/GroundTabScript.axaml     |    0
 .../GroundEditPage}/GroundTabScript.axaml.cs  |    0
 .../GroundEditPage}/GroundTabStrings.axaml    |    0
 .../GroundEditPage}/GroundTabStrings.axaml.cs |    0
 .../GroundEditPage}/GroundTabTextures.axaml   |    0
 .../GroundTabTextures.axaml.cs                |    0
 .../GroundEditPage}/GroundTabWalls.axaml      |    0
 .../GroundEditPage}/GroundTabWalls.axaml.cs   |    0
 .../Layers/AnimLayerWindow.axaml              |    0
 .../Layers/AnimLayerWindow.axaml.cs           |    0
 .../Layers/EntityLayerWindow.axaml            |    0
 .../Layers/EntityLayerWindow.axaml.cs         |    0
 .../Layers/GroundLayerWindow.axaml            |    0
 .../Layers/GroundLayerWindow.axaml.cs         |    0
 .../Layers/MapLayerWindow.axaml               |    0
 .../Layers/MapLayerWindow.axaml.cs            |    0
 .../MapEditPage/MapEditPageView.axaml}        |    6 +-
 .../MapEditPage/MapEditPageView.axaml.cs}     |    4 +-
 .../MapEditPage}/MapTabDecorations.axaml      |    0
 .../MapEditPage}/MapTabDecorations.axaml.cs   |    0
 .../MapEditPage}/MapTabEffects.axaml          |    0
 .../MapEditPage}/MapTabEffects.axaml.cs       |    0
 .../MapEditPage}/MapTabEntities.axaml         |    0
 .../MapEditPage}/MapTabEntities.axaml.cs      |    0
 .../MapEditPage}/MapTabEntrances.axaml        |    0
 .../MapEditPage}/MapTabEntrances.axaml.cs     |    0
 .../MapEditPage}/MapTabItems.axaml            |    0
 .../MapEditPage}/MapTabItems.axaml.cs         |    0
 .../MapEditPage}/MapTabProperties.axaml       |    0
 .../MapEditPage}/MapTabProperties.axaml.cs    |    0
 .../MapEditPage}/MapTabSpawns.axaml           |    0
 .../MapEditPage}/MapTabSpawns.axaml.cs        |    0
 .../MapEditPage}/MapTabTerrain.axaml          |    0
 .../MapEditPage}/MapTabTerrain.axaml.cs       |    0
 .../MapEditPage}/MapTabTextures.axaml         |    0
 .../MapEditPage}/MapTabTextures.axaml.cs      |    0
 .../MapEditPage}/MapTabTiles.axaml            |    0
 .../MapEditPage}/MapTabTiles.axaml.cs         |    0
 .../MapEditPage}/Teams/TeamWindow.axaml       |    0
 .../MapEditPage}/Teams/TeamWindow.axaml.cs    |    0
 .../Editors => Pages}/ModConfigPageView.axaml |    0
 .../ModConfigPageView.axaml.cs                |    0
 .../Editors => Pages}/ModListPageView.axaml   |    0
 .../ModListPageView.axaml.cs                  |    0
 .../RandomInfoPageView.axaml                  |    2 +-
 .../RandomInfoPageView.axaml.cs               |    0
 .../ReflectedDataPageView.axaml               |    0
 .../ReflectedDataPageView.axaml.cs            |    0
 .../SpeciesEditPageView.axaml                 |    0
 .../SpeciesEditPageView.axaml.cs              |    0
 .../Editors => Pages}/SpritePageView.axaml    |    0
 .../Editors => Pages}/SpritePageView.axaml.cs |    0
 .../StringEditPageView.axaml                  |    0
 .../StringEditPageView.axaml.cs               |    0
 .../IconText.axaml                            |    0
 .../IconText.axaml.cs                         |    0
 233 files changed, 2410 insertions(+), 9245 deletions(-)
 delete mode 100644 RogueEssence.Editor.Avalonia/ViewModels/Content/AnimEditViewModel.cs
 delete mode 100644 RogueEssence.Editor.Avalonia/ViewModels/Content/SpeciesEditViewModel.cs
 delete mode 100644 RogueEssence.Editor.Avalonia/ViewModels/Content/StringsEditViewModel.cs
 delete mode 100644 RogueEssence.Editor.Avalonia/ViewModels/Content/TilesetEditViewModel.cs
 delete mode 100644 RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevTabConstantsViewModel.cs
 delete mode 100644 RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevTabDataViewModel.cs
 delete mode 100644 RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevTabSpritesViewModel.cs
 rename RogueEssence.Editor.Avalonia/ViewModels/{New => DevForm}/ModSwitcherViewModel.cs (100%)
 rename RogueEssence.Editor.Avalonia/ViewModels/{New => DevForm}/Nodes/ISpriteRootOperationStrategy.cs (100%)
 rename RogueEssence.Editor.Avalonia/ViewModels/{New => DevForm}/Nodes/NodeBase.cs (100%)
 rename RogueEssence.Editor.Avalonia/ViewModels/{New => DevForm}/Nodes/SpriteRootAssetTypeStrategy.cs (98%)
 rename RogueEssence.Editor.Avalonia/ViewModels/{New => DevForm}/Nodes/SpriteRootTileStrategy.cs (96%)
 rename RogueEssence.Editor.Avalonia/ViewModels/{New => DevForm}/TabSwitcherViewModel.cs (100%)
 delete mode 100644 RogueEssence.Editor.Avalonia/ViewModels/DialogBoxes/AnimChoiceViewModel.cs
 rename RogueEssence.Editor.Avalonia/ViewModels/{New => }/DialogBoxes/AnimChoiceWindowViewModel.cs (100%)
 rename RogueEssence.Editor.Avalonia/ViewModels/{New => }/DialogBoxes/DialogViewModel.cs (100%)
 rename RogueEssence.Editor.Avalonia/ViewModels/{New => }/DialogBoxes/MapLayerWindowViewModel.cs (100%)
 delete mode 100644 RogueEssence.Editor.Avalonia/ViewModels/DialogBoxes/MapResizeViewModel.cs
 rename RogueEssence.Editor.Avalonia/ViewModels/{New => }/DialogBoxes/MapResizeWindowViewModel.cs (100%)
 delete mode 100644 RogueEssence.Editor.Avalonia/ViewModels/DialogBoxes/MapRetileViewModel.cs
 rename RogueEssence.Editor.Avalonia/ViewModels/{New => }/DialogBoxes/MapRetileWindowViewModel.cs (100%)
 rename RogueEssence.Editor.Avalonia/ViewModels/{New => }/DialogBoxes/MessageBoxWindowViewModel.cs (100%)
 delete mode 100644 RogueEssence.Editor.Avalonia/ViewModels/DialogBoxes/ModConfigViewModel2.cs
 rename RogueEssence.Editor.Avalonia/ViewModels/{DevForm => DialogBoxes}/ModManagerViewModel.cs (100%)
 rename RogueEssence.Editor.Avalonia/ViewModels/{New => }/DialogBoxes/ModNameWindowViewModel.cs (100%)
 rename RogueEssence.Editor.Avalonia/ViewModels/{New => }/DialogBoxes/PreferencesWindowViewModel.cs (100%)
 delete mode 100644 RogueEssence.Editor.Avalonia/ViewModels/DialogBoxes/RenameViewModel.cs
 rename RogueEssence.Editor.Avalonia/ViewModels/{New => }/DialogBoxes/RenameWindowViewModel.cs (100%)
 delete mode 100644 RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/GroundEditViewModel.cs
 delete mode 100644 RogueEssence.Editor.Avalonia/ViewModels/MapEditForm/MapEditViewModel.cs
 delete mode 100644 RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs
 delete mode 100644 RogueEssence.Editor.Avalonia/ViewModels/New/DialogBoxes/ModConfigWindowViewModel.cs
 delete mode 100644 RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DevEditPageViewModel.cs
 delete mode 100644 RogueEssence.Editor.Avalonia/ViewModels/New/TestComboBoxViewModel.cs
 delete mode 100644 RogueEssence.Editor.Avalonia/ViewModels/New/TreeSearchViewModel.cs
 rename RogueEssence.Editor.Avalonia/ViewModels/{New/Editors => Pages}/DataListPageViewModel.cs (100%)
 rename RogueEssence.Editor.Avalonia/ViewModels/{New/Editors/DevControlViewModel.cs => Pages/DevControlPage/DevControlPageViewModel.cs} (89%)
 rename RogueEssence.Editor.Avalonia/ViewModels/{DevForm => Pages/DevControlPage}/DevTabGameViewModel.cs (100%)
 rename RogueEssence.Editor.Avalonia/ViewModels/{DevForm => Pages/DevControlPage}/DevTabPlayerViewModel.cs (100%)
 rename RogueEssence.Editor.Avalonia/ViewModels/{DevForm => Pages/DevControlPage}/DevTabScriptViewModel.cs (100%)
 rename RogueEssence.Editor.Avalonia/ViewModels/{DevForm => Pages/DevControlPage}/DevTabTravelViewModel.cs (100%)
 rename RogueEssence.Editor.Avalonia/ViewModels/{New/Editors => Pages}/EditorPageViewModel.cs (100%)
 rename RogueEssence.Editor.Avalonia/ViewModels/{New/Editors => Pages}/EmptyPageViewModel.cs (100%)
 rename RogueEssence.Editor.Avalonia/ViewModels/{GroundEditForm => Pages/GroundEditPage}/EntScriptItem.cs (100%)
 rename RogueEssence.Editor.Avalonia/ViewModels/{GroundEditForm => Pages/GroundEditPage}/EntityBrowserViewModel.cs (100%)
 rename RogueEssence.Editor.Avalonia/ViewModels/{New/Editors/GroundEditorPageViewModel.cs => Pages/GroundEditPage/GroundEditPageViewModel.cs} (99%)
 rename RogueEssence.Editor.Avalonia/ViewModels/{GroundEditForm => Pages/GroundEditPage}/GroundTabDecorationsViewModel.cs (100%)
 rename RogueEssence.Editor.Avalonia/ViewModels/{GroundEditForm => Pages/GroundEditPage}/GroundTabEntitiesViewModel.cs (100%)
 rename RogueEssence.Editor.Avalonia/ViewModels/{GroundEditForm => Pages/GroundEditPage}/GroundTabPropertiesViewModel.cs (98%)
 rename RogueEssence.Editor.Avalonia/ViewModels/{GroundEditForm => Pages/GroundEditPage}/GroundTabScriptViewModel.cs (98%)
 rename RogueEssence.Editor.Avalonia/ViewModels/{GroundEditForm => Pages/GroundEditPage}/GroundTabStringsViewModel.cs (100%)
 rename RogueEssence.Editor.Avalonia/ViewModels/{GroundEditForm => Pages/GroundEditPage}/GroundTabTexturesViewModel.cs (100%)
 rename RogueEssence.Editor.Avalonia/ViewModels/{GroundEditForm => Pages/GroundEditPage}/GroundTabWallsViewModel.cs (100%)
 rename RogueEssence.Editor.Avalonia/ViewModels/{GroundEditForm => Pages/GroundEditPage}/Layers/AnimLayerBoxViewModel.cs (100%)
 rename RogueEssence.Editor.Avalonia/ViewModels/{GroundEditForm => Pages/GroundEditPage}/Layers/AnimLayerViewModel.cs (100%)
 rename RogueEssence.Editor.Avalonia/ViewModels/{GroundEditForm => Pages/GroundEditPage}/Layers/EntityLayerBoxViewModel.cs (100%)
 rename RogueEssence.Editor.Avalonia/ViewModels/{GroundEditForm => Pages/GroundEditPage}/Layers/EntityLayerViewModel.cs (100%)
 rename RogueEssence.Editor.Avalonia/ViewModels/{GroundEditForm => Pages/GroundEditPage}/Layers/MapLayerViewModel.cs (100%)
 rename RogueEssence.Editor.Avalonia/ViewModels/{GroundEditForm => Pages/GroundEditPage}/Layers/TextureLayerBoxViewModel.cs (100%)
 rename RogueEssence.Editor.Avalonia/ViewModels/{GroundEditForm => Pages/GroundEditPage}/MapString.cs (100%)
 rename RogueEssence.Editor.Avalonia/ViewModels/{GroundEditForm => Pages/GroundEditPage}/ScriptItem.cs (100%)
 rename RogueEssence.Editor.Avalonia/ViewModels/{New/Editors/MapEditorPageViewModel.cs => Pages/MapEditPage/MapEditPageViewModel.cs} (99%)
 rename RogueEssence.Editor.Avalonia/ViewModels/{MapEditForm => Pages/MapEditPage}/MapTabDecorationsViewModel.cs (100%)
 rename RogueEssence.Editor.Avalonia/ViewModels/{MapEditForm => Pages/MapEditPage}/MapTabEffectsViewModel.cs (100%)
 rename RogueEssence.Editor.Avalonia/ViewModels/{MapEditForm => Pages/MapEditPage}/MapTabEntitiesViewModel.cs (100%)
 rename RogueEssence.Editor.Avalonia/ViewModels/{MapEditForm => Pages/MapEditPage}/MapTabEntrancesViewModel.cs (100%)
 rename RogueEssence.Editor.Avalonia/ViewModels/{MapEditForm => Pages/MapEditPage}/MapTabItemsViewModel.cs (100%)
 rename RogueEssence.Editor.Avalonia/ViewModels/{MapEditForm => Pages/MapEditPage}/MapTabPropertiesViewModel.cs (100%)
 rename RogueEssence.Editor.Avalonia/ViewModels/{MapEditForm => Pages/MapEditPage}/MapTabSpawnsViewModel.cs (100%)
 rename RogueEssence.Editor.Avalonia/ViewModels/{MapEditForm => Pages/MapEditPage}/MapTabTerrainViewModel.cs (100%)
 rename RogueEssence.Editor.Avalonia/ViewModels/{MapEditForm => Pages/MapEditPage}/MapTabTexturesViewModel.cs (100%)
 rename RogueEssence.Editor.Avalonia/ViewModels/{MapEditForm => Pages/MapEditPage}/MapTabTilesViewModel.cs (100%)
 rename RogueEssence.Editor.Avalonia/ViewModels/{MapEditForm => Pages/MapEditPage}/Teams/TeamViewModel.cs (100%)
 rename RogueEssence.Editor.Avalonia/ViewModels/{New/Editors => Pages}/ModConfigPageViewModel.cs (100%)
 rename RogueEssence.Editor.Avalonia/ViewModels/{New/Editors => Pages}/ModListPageViewModel.cs (100%)
 rename RogueEssence.Editor.Avalonia/ViewModels/{New/Editors => Pages}/RandomInfoPageViewModel.cs (100%)
 rename RogueEssence.Editor.Avalonia/ViewModels/{New/Editors => Pages}/ReflectedDataPageViewModel.cs (100%)
 rename RogueEssence.Editor.Avalonia/ViewModels/{New/Editors => Pages}/SpeciesEditPageViewModel.cs (100%)
 rename RogueEssence.Editor.Avalonia/ViewModels/{New/Editors => Pages}/SpritePageViewModel.cs (99%)
 rename RogueEssence.Editor.Avalonia/ViewModels/{New/Editors => Pages}/StringEditPageViewModel.cs (100%)
 delete mode 100644 RogueEssence.Editor.Avalonia/Views/Content/AnimEditForm.axaml
 delete mode 100644 RogueEssence.Editor.Avalonia/Views/Content/AnimEditForm.axaml.cs
 delete mode 100644 RogueEssence.Editor.Avalonia/Views/Content/SpeciesEditForm.axaml
 delete mode 100644 RogueEssence.Editor.Avalonia/Views/Content/SpeciesEditForm.axaml.cs
 delete mode 100644 RogueEssence.Editor.Avalonia/Views/Content/StringsEditForm.axaml
 delete mode 100644 RogueEssence.Editor.Avalonia/Views/Content/StringsEditForm.axaml.cs
 delete mode 100644 RogueEssence.Editor.Avalonia/Views/Content/TilesetEditForm.axaml
 delete mode 100644 RogueEssence.Editor.Avalonia/Views/Content/TilesetEditForm.axaml.cs
 delete mode 100644 RogueEssence.Editor.Avalonia/Views/DataListForm.axaml
 delete mode 100644 RogueEssence.Editor.Avalonia/Views/DataListForm.axaml.cs
 rename RogueEssence.Editor.Avalonia/Views/{New => DevForm}/CaptionButtons.axaml (100%)
 rename RogueEssence.Editor.Avalonia/Views/{New => DevForm}/CaptionButtons.axaml.cs (100%)
 rename RogueEssence.Editor.Avalonia/Views/{New => DevForm}/ChromelessWindow.cs (100%)
 delete mode 100644 RogueEssence.Editor.Avalonia/Views/DevForm/DevTabConstants.axaml
 delete mode 100644 RogueEssence.Editor.Avalonia/Views/DevForm/DevTabConstants.axaml.cs
 delete mode 100644 RogueEssence.Editor.Avalonia/Views/DevForm/DevTabData.axaml
 delete mode 100644 RogueEssence.Editor.Avalonia/Views/DevForm/DevTabData.axaml.cs
 delete mode 100644 RogueEssence.Editor.Avalonia/Views/DevForm/DevTabMods.axaml
 delete mode 100644 RogueEssence.Editor.Avalonia/Views/DevForm/DevTabMods.axaml.cs
 delete mode 100644 RogueEssence.Editor.Avalonia/Views/DevForm/DevTabSprites.axaml
 delete mode 100644 RogueEssence.Editor.Avalonia/Views/DevForm/DevTabSprites.axaml.cs
 rename RogueEssence.Editor.Avalonia/Views/{New => DevForm}/ModSwitcherView.axaml (100%)
 rename RogueEssence.Editor.Avalonia/Views/{New => DevForm}/ModSwitcherView.axaml.cs (100%)
 rename RogueEssence.Editor.Avalonia/Views/{New => DevForm}/TabBarView.axaml (100%)
 rename RogueEssence.Editor.Avalonia/Views/{New => DevForm}/TabBarView.axaml.cs (100%)
 rename RogueEssence.Editor.Avalonia/Views/{New => DevForm}/TabSwitcherView.axaml (100%)
 rename RogueEssence.Editor.Avalonia/Views/{New => DevForm}/TabSwitcherView.axaml.cs (100%)
 delete mode 100644 RogueEssence.Editor.Avalonia/Views/DialogBoxes/AnimChoiceWindow.axaml
 delete mode 100644 RogueEssence.Editor.Avalonia/Views/DialogBoxes/AnimChoiceWindow.axaml.cs
 rename RogueEssence.Editor.Avalonia/Views/{New => }/DialogBoxes/AnimChoiceWindowView.axaml (100%)
 rename RogueEssence.Editor.Avalonia/Views/{New => }/DialogBoxes/AnimChoiceWindowView.axaml.cs (100%)
 rename RogueEssence.Editor.Avalonia/Views/{New => }/DialogBoxes/MapLayerWindowView.axaml (100%)
 rename RogueEssence.Editor.Avalonia/Views/{New => }/DialogBoxes/MapLayerWindowView.axaml.cs (100%)
 delete mode 100644 RogueEssence.Editor.Avalonia/Views/DialogBoxes/MapResizeWindow.axaml
 delete mode 100644 RogueEssence.Editor.Avalonia/Views/DialogBoxes/MapResizeWindow.axaml.cs
 rename RogueEssence.Editor.Avalonia/Views/{New => }/DialogBoxes/MapResizeWindowView.axaml (100%)
 rename RogueEssence.Editor.Avalonia/Views/{New => }/DialogBoxes/MapResizeWindowView.axaml.cs (100%)
 delete mode 100644 RogueEssence.Editor.Avalonia/Views/DialogBoxes/MapRetileWindow2.axaml
 delete mode 100644 RogueEssence.Editor.Avalonia/Views/DialogBoxes/MapRetileWindow2.axaml.cs
 rename RogueEssence.Editor.Avalonia/Views/{New => }/DialogBoxes/MapRetileWindowView.axaml (100%)
 rename RogueEssence.Editor.Avalonia/Views/{New => }/DialogBoxes/MapRetileWindowView.axaml.cs (100%)
 rename RogueEssence.Editor.Avalonia/Views/{New => }/DialogBoxes/MessageBoxWindowView.axaml (100%)
 rename RogueEssence.Editor.Avalonia/Views/{New => }/DialogBoxes/MessageBoxWindowView.axaml.cs (100%)
 delete mode 100644 RogueEssence.Editor.Avalonia/Views/DialogBoxes/ModConfigWindow.axaml
 delete mode 100644 RogueEssence.Editor.Avalonia/Views/DialogBoxes/ModConfigWindow.axaml.cs
 rename RogueEssence.Editor.Avalonia/Views/{New => }/DialogBoxes/ModNameWindowView.axaml (100%)
 rename RogueEssence.Editor.Avalonia/Views/{New => }/DialogBoxes/ModNameWindowView.axaml.cs (100%)
 rename RogueEssence.Editor.Avalonia/Views/{New => }/DialogBoxes/PreferencesWindowView.axaml (100%)
 rename RogueEssence.Editor.Avalonia/Views/{New => }/DialogBoxes/PreferencesWindowView.axaml.cs (100%)
 delete mode 100644 RogueEssence.Editor.Avalonia/Views/DialogBoxes/RenameWindow.axaml
 delete mode 100644 RogueEssence.Editor.Avalonia/Views/DialogBoxes/RenameWindow.axaml.cs
 rename RogueEssence.Editor.Avalonia/Views/{New => }/DialogBoxes/RenameWindowView.axaml (100%)
 rename RogueEssence.Editor.Avalonia/Views/{New => }/DialogBoxes/RenameWindowView.axaml.cs (100%)
 delete mode 100644 RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundEditForm.axaml
 delete mode 100644 RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundEditForm.axaml.cs
 delete mode 100644 RogueEssence.Editor.Avalonia/Views/MapEditForm/MapEditForm.axaml
 delete mode 100644 RogueEssence.Editor.Avalonia/Views/MapEditForm/MapEditForm.axaml.cs
 delete mode 100644 RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml
 delete mode 100644 RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml.cs
 delete mode 100644 RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/ModConfigWindowView.axaml
 delete mode 100644 RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/ModConfigWindowView.axaml.cs
 rename RogueEssence.Editor.Avalonia/Views/{New/Editors => Pages}/DataListPageView.axaml (100%)
 rename RogueEssence.Editor.Avalonia/Views/{New/Editors => Pages}/DataListPageView.axaml.cs (100%)
 rename RogueEssence.Editor.Avalonia/Views/{New/Editors/DevControl/DevControlView.axaml => Pages/DevControlPage/DevControlPageView.axaml} (50%)
 rename RogueEssence.Editor.Avalonia/Views/{New/Editors/DevControl/DevControlView.axaml.cs => Pages/DevControlPage/DevControlPageView.axaml.cs} (63%)
 rename RogueEssence.Editor.Avalonia/Views/{New/Editors/DevControl => Pages/DevControlPage}/DevTabGame.axaml (100%)
 rename RogueEssence.Editor.Avalonia/Views/{New/Editors/DevControl => Pages/DevControlPage}/DevTabGame.axaml.cs (100%)
 rename RogueEssence.Editor.Avalonia/Views/{DevForm => Pages/DevControlPage}/DevTabPlayer.axaml (100%)
 rename RogueEssence.Editor.Avalonia/Views/{DevForm => Pages/DevControlPage}/DevTabPlayer.axaml.cs (100%)
 rename RogueEssence.Editor.Avalonia/Views/{DevForm => Pages/DevControlPage}/DevTabScript.axaml (100%)
 rename RogueEssence.Editor.Avalonia/Views/{DevForm => Pages/DevControlPage}/DevTabScript.axaml.cs (100%)
 rename RogueEssence.Editor.Avalonia/Views/{DevForm => Pages/DevControlPage}/DevTabTravel.axaml (100%)
 rename RogueEssence.Editor.Avalonia/Views/{DevForm => Pages/DevControlPage}/DevTabTravel.axaml.cs (100%)
 rename RogueEssence.Editor.Avalonia/Views/{New/Editors => Pages}/DevEditPageView.axaml (100%)
 rename RogueEssence.Editor.Avalonia/Views/{New/Editors => Pages}/DevEditPageView.axaml.cs (100%)
 rename RogueEssence.Editor.Avalonia/Views/{GroundEditForm => Pages/GroundEditPage}/EntityBrowser.axaml (100%)
 rename RogueEssence.Editor.Avalonia/Views/{GroundEditForm => Pages/GroundEditPage}/EntityBrowser.axaml.cs (100%)
 rename RogueEssence.Editor.Avalonia/Views/{New/Editors/GroundEditorPageView.axaml => Pages/GroundEditPage/GroundEditPageView.axaml} (94%)
 rename RogueEssence.Editor.Avalonia/Views/{New/Editors/GroundEditorPageView.axaml.cs => Pages/GroundEditPage/GroundEditPageView.axaml.cs} (62%)
 rename RogueEssence.Editor.Avalonia/Views/{GroundEditForm => Pages/GroundEditPage}/GroundTabDecorations.axaml (100%)
 rename RogueEssence.Editor.Avalonia/Views/{GroundEditForm => Pages/GroundEditPage}/GroundTabDecorations.axaml.cs (100%)
 rename RogueEssence.Editor.Avalonia/Views/{GroundEditForm => Pages/GroundEditPage}/GroundTabEntities.axaml (100%)
 rename RogueEssence.Editor.Avalonia/Views/{GroundEditForm => Pages/GroundEditPage}/GroundTabEntities.axaml.cs (100%)
 rename RogueEssence.Editor.Avalonia/Views/{GroundEditForm => Pages/GroundEditPage}/GroundTabProperties.axaml (100%)
 rename RogueEssence.Editor.Avalonia/Views/{GroundEditForm => Pages/GroundEditPage}/GroundTabProperties.axaml.cs (100%)
 rename RogueEssence.Editor.Avalonia/Views/{GroundEditForm => Pages/GroundEditPage}/GroundTabScript.axaml (100%)
 rename RogueEssence.Editor.Avalonia/Views/{GroundEditForm => Pages/GroundEditPage}/GroundTabScript.axaml.cs (100%)
 rename RogueEssence.Editor.Avalonia/Views/{GroundEditForm => Pages/GroundEditPage}/GroundTabStrings.axaml (100%)
 rename RogueEssence.Editor.Avalonia/Views/{GroundEditForm => Pages/GroundEditPage}/GroundTabStrings.axaml.cs (100%)
 rename RogueEssence.Editor.Avalonia/Views/{GroundEditForm => Pages/GroundEditPage}/GroundTabTextures.axaml (100%)
 rename RogueEssence.Editor.Avalonia/Views/{GroundEditForm => Pages/GroundEditPage}/GroundTabTextures.axaml.cs (100%)
 rename RogueEssence.Editor.Avalonia/Views/{GroundEditForm => Pages/GroundEditPage}/GroundTabWalls.axaml (100%)
 rename RogueEssence.Editor.Avalonia/Views/{GroundEditForm => Pages/GroundEditPage}/GroundTabWalls.axaml.cs (100%)
 rename RogueEssence.Editor.Avalonia/Views/{GroundEditForm => Pages/GroundEditPage}/Layers/AnimLayerWindow.axaml (100%)
 rename RogueEssence.Editor.Avalonia/Views/{GroundEditForm => Pages/GroundEditPage}/Layers/AnimLayerWindow.axaml.cs (100%)
 rename RogueEssence.Editor.Avalonia/Views/{GroundEditForm => Pages/GroundEditPage}/Layers/EntityLayerWindow.axaml (100%)
 rename RogueEssence.Editor.Avalonia/Views/{GroundEditForm => Pages/GroundEditPage}/Layers/EntityLayerWindow.axaml.cs (100%)
 rename RogueEssence.Editor.Avalonia/Views/{GroundEditForm => Pages/GroundEditPage}/Layers/GroundLayerWindow.axaml (100%)
 rename RogueEssence.Editor.Avalonia/Views/{GroundEditForm => Pages/GroundEditPage}/Layers/GroundLayerWindow.axaml.cs (100%)
 rename RogueEssence.Editor.Avalonia/Views/{GroundEditForm => Pages/GroundEditPage}/Layers/MapLayerWindow.axaml (100%)
 rename RogueEssence.Editor.Avalonia/Views/{GroundEditForm => Pages/GroundEditPage}/Layers/MapLayerWindow.axaml.cs (100%)
 rename RogueEssence.Editor.Avalonia/Views/{New/Editors/MapEditorPageView.axaml => Pages/MapEditPage/MapEditPageView.axaml} (95%)
 rename RogueEssence.Editor.Avalonia/Views/{New/Editors/MapEditorPageView.axaml.cs => Pages/MapEditPage/MapEditPageView.axaml.cs} (68%)
 rename RogueEssence.Editor.Avalonia/Views/{MapEditForm => Pages/MapEditPage}/MapTabDecorations.axaml (100%)
 rename RogueEssence.Editor.Avalonia/Views/{MapEditForm => Pages/MapEditPage}/MapTabDecorations.axaml.cs (100%)
 rename RogueEssence.Editor.Avalonia/Views/{MapEditForm => Pages/MapEditPage}/MapTabEffects.axaml (100%)
 rename RogueEssence.Editor.Avalonia/Views/{MapEditForm => Pages/MapEditPage}/MapTabEffects.axaml.cs (100%)
 rename RogueEssence.Editor.Avalonia/Views/{MapEditForm => Pages/MapEditPage}/MapTabEntities.axaml (100%)
 rename RogueEssence.Editor.Avalonia/Views/{MapEditForm => Pages/MapEditPage}/MapTabEntities.axaml.cs (100%)
 rename RogueEssence.Editor.Avalonia/Views/{MapEditForm => Pages/MapEditPage}/MapTabEntrances.axaml (100%)
 rename RogueEssence.Editor.Avalonia/Views/{MapEditForm => Pages/MapEditPage}/MapTabEntrances.axaml.cs (100%)
 rename RogueEssence.Editor.Avalonia/Views/{MapEditForm => Pages/MapEditPage}/MapTabItems.axaml (100%)
 rename RogueEssence.Editor.Avalonia/Views/{MapEditForm => Pages/MapEditPage}/MapTabItems.axaml.cs (100%)
 rename RogueEssence.Editor.Avalonia/Views/{MapEditForm => Pages/MapEditPage}/MapTabProperties.axaml (100%)
 rename RogueEssence.Editor.Avalonia/Views/{MapEditForm => Pages/MapEditPage}/MapTabProperties.axaml.cs (100%)
 rename RogueEssence.Editor.Avalonia/Views/{MapEditForm => Pages/MapEditPage}/MapTabSpawns.axaml (100%)
 rename RogueEssence.Editor.Avalonia/Views/{MapEditForm => Pages/MapEditPage}/MapTabSpawns.axaml.cs (100%)
 rename RogueEssence.Editor.Avalonia/Views/{MapEditForm => Pages/MapEditPage}/MapTabTerrain.axaml (100%)
 rename RogueEssence.Editor.Avalonia/Views/{MapEditForm => Pages/MapEditPage}/MapTabTerrain.axaml.cs (100%)
 rename RogueEssence.Editor.Avalonia/Views/{MapEditForm => Pages/MapEditPage}/MapTabTextures.axaml (100%)
 rename RogueEssence.Editor.Avalonia/Views/{MapEditForm => Pages/MapEditPage}/MapTabTextures.axaml.cs (100%)
 rename RogueEssence.Editor.Avalonia/Views/{MapEditForm => Pages/MapEditPage}/MapTabTiles.axaml (100%)
 rename RogueEssence.Editor.Avalonia/Views/{MapEditForm => Pages/MapEditPage}/MapTabTiles.axaml.cs (100%)
 rename RogueEssence.Editor.Avalonia/Views/{MapEditForm => Pages/MapEditPage}/Teams/TeamWindow.axaml (100%)
 rename RogueEssence.Editor.Avalonia/Views/{MapEditForm => Pages/MapEditPage}/Teams/TeamWindow.axaml.cs (100%)
 rename RogueEssence.Editor.Avalonia/Views/{New/Editors => Pages}/ModConfigPageView.axaml (100%)
 rename RogueEssence.Editor.Avalonia/Views/{New/Editors => Pages}/ModConfigPageView.axaml.cs (100%)
 rename RogueEssence.Editor.Avalonia/Views/{New/Editors => Pages}/ModListPageView.axaml (100%)
 rename RogueEssence.Editor.Avalonia/Views/{New/Editors => Pages}/ModListPageView.axaml.cs (100%)
 rename RogueEssence.Editor.Avalonia/Views/{New/Editors => Pages}/RandomInfoPageView.axaml (90%)
 rename RogueEssence.Editor.Avalonia/Views/{New/Editors => Pages}/RandomInfoPageView.axaml.cs (100%)
 rename RogueEssence.Editor.Avalonia/Views/{New/Editors => Pages}/ReflectedDataPageView.axaml (100%)
 rename RogueEssence.Editor.Avalonia/Views/{New/Editors => Pages}/ReflectedDataPageView.axaml.cs (100%)
 rename RogueEssence.Editor.Avalonia/Views/{New/Editors => Pages}/SpeciesEditPageView.axaml (100%)
 rename RogueEssence.Editor.Avalonia/Views/{New/Editors => Pages}/SpeciesEditPageView.axaml.cs (100%)
 rename RogueEssence.Editor.Avalonia/Views/{New/Editors => Pages}/SpritePageView.axaml (100%)
 rename RogueEssence.Editor.Avalonia/Views/{New/Editors => Pages}/SpritePageView.axaml.cs (100%)
 rename RogueEssence.Editor.Avalonia/Views/{New/Editors => Pages}/StringEditPageView.axaml (100%)
 rename RogueEssence.Editor.Avalonia/Views/{New/Editors => Pages}/StringEditPageView.axaml.cs (100%)
 rename RogueEssence.Editor.Avalonia/Views/{New/Components => UserControls}/IconText.axaml (100%)
 rename RogueEssence.Editor.Avalonia/Views/{New/Components => UserControls}/IconText.axaml.cs (100%)

diff --git a/RogueEssence.Editor.Avalonia/App.axaml.cs b/RogueEssence.Editor.Avalonia/App.axaml.cs
index b88b2dac..195588ee 100644
--- a/RogueEssence.Editor.Avalonia/App.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/App.axaml.cs
@@ -62,13 +62,12 @@ public static void AddCommonServices(this IServiceCollection collection)
             collection.AddSingleton<ViewLocator>();
             collection.AddSingleton<IDialogService, DialogService>();
 
-            collection.AddTransient<DevControlViewModel>();
-            collection.AddTransient<MapEditorPageViewModel>();
+            collection.AddTransient<DevControlPageViewModel>();
+            collection.AddTransient<MapEditPageViewModel>();
             collection.AddTransient<RandomInfoPageViewModel>();
             collection.AddTransient<SpritePageViewModel>();
             collection.AddTransient<ModListPageViewModel>();
             collection.AddTransient<ModConfigPageViewModel>();
-            collection.AddTransient<DevEditPageViewModel>();
             collection.AddTransient<SpeciesEditPageViewModel>();
             collection.AddTransient<DataListPageViewModel>();
             collection.AddTransient<ReflectedDataPageViewModel>();
@@ -87,7 +86,7 @@ private static void AddMapEditViewModels(this IServiceCollection services)
             services.AddTransient<MapTabSpawnsViewModel>();
             services.AddTransient<MapTabEffectsViewModel>();
             services.AddTransient<MapTabPropertiesViewModel>();
-            services.AddTransient<MapEditorPageViewModel>();
+            services.AddTransient<MapEditPageViewModel>();
         }
         
         private static void AddGroundEditViewModels(this IServiceCollection services)
@@ -98,34 +97,30 @@ private static void AddGroundEditViewModels(this IServiceCollection services)
             services.AddTransient<GroundTabPropertiesViewModel>();
             services.AddTransient<GroundTabStringsViewModel>();
             services.AddTransient<GroundTabScriptViewModel>();
-            services.AddTransient<GroundEditorPageViewModel>();
+            services.AddTransient<GroundEditPageViewModel>();
         }
         
         private static void AddDevTabViewModels(this IServiceCollection services)
         {
             services.AddSingleton<DevTabGameViewModel>();
             services.AddSingleton<DevTabPlayerViewModel>();
-            services.AddSingleton<DevTabDataViewModel>();
             services.AddSingleton<DevTabTravelViewModel>();
-            services.AddSingleton<DevTabSpritesViewModel>();
             services.AddSingleton<DevTabScriptViewModel>();
             services.AddSingleton<ModManagerViewModel>();
-            services.AddSingleton<DevTabConstantsViewModel>();
         }
 
         public static void RegisterPages(this IServiceProvider provider)
         {
             var pageFactory = provider.GetRequiredService<PageFactory>();
 
-            pageFactory.Register<DevControlViewModel>();
-            pageFactory.Register<MapEditorPageViewModel>();
+            pageFactory.Register<DevControlPageViewModel>();
+            pageFactory.Register<MapEditPageViewModel>();
             pageFactory.Register<ReflectedDataPageViewModel>();
-            pageFactory.Register<GroundEditorPageViewModel>();
+            pageFactory.Register<GroundEditPageViewModel>();
             pageFactory.Register<RandomInfoPageViewModel>();
             pageFactory.Register<SpritePageViewModel>();
             pageFactory.Register<ModListPageViewModel>();
             pageFactory.Register<ModConfigPageViewModel>();
-            pageFactory.Register<DevEditPageViewModel>();
             pageFactory.Register<SpeciesEditPageViewModel>();
             pageFactory.Register<DataListPageViewModel>();
             pageFactory.Register<StringEditPageViewModel>();
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/CategorySpawnBoxViewModel.cs b/RogueEssence.Editor.Avalonia/DataEditor/CategorySpawnBoxViewModel.cs
index 9476a806..a822596c 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/CategorySpawnBoxViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/CategorySpawnBoxViewModel.cs
@@ -7,6 +7,7 @@
 using Avalonia.Controls;
 using Avalonia.Input;
 using RogueElements;
+using RogueEssence.Dev.Services;
 using RogueEssence.Dev.Views;
 
 namespace RogueEssence.Dev.ViewModels
@@ -60,10 +61,10 @@ public string Prefix
         {
             get { return (category ? "" : "  \u2022"); }
         }
-
+    
         private StringConv conv;
         private bool category;
-
+    
         public CategorySpawnElement(StringConv conv, bool category, int weight, double chance, object val)
         {
             this.conv = conv;
@@ -73,35 +74,35 @@ public CategorySpawnElement(StringConv conv, bool category, int weight, double c
             this.val = val;
         }
     }
-
+    
     public class CategorySpawnBoxViewModel : ViewModelBase
     {
         public delegate void EditElementOp(int index, object element);
         public delegate void ElementOp(int index, object element, bool advancedEdit, EditElementOp op);
-
+    
         public event ElementOp OnEditItem;
         public event ElementOp OnEditKey;
-
+    
         public StringConv CategoryConv;
         public StringConv StringConv;
-
-
-        private Window parent;
-
+    
+        
+    
         public bool ConfirmDelete;
-
-        public CategorySpawnBoxViewModel(Window parent, StringConv categoryConv, StringConv conv)
+    
+        private IDialogService _dialogService;
+        public CategorySpawnBoxViewModel(IDialogService dialogService, StringConv categoryConv, StringConv conv)
         {
+            _dialogService = dialogService;
             CategoryConv = categoryConv;
             StringConv = conv;
-            this.parent = parent;
             heirarchy = new List<(CategorySpawnElement, List<CategorySpawnElement>)>();
             Collection = new ObservableCollection<CategorySpawnElement>();
         }
-
+    
         private List<(CategorySpawnElement, List<CategorySpawnElement>)> heirarchy;
         public ObservableCollection<CategorySpawnElement> Collection { get; }
-
+    
         private int currentElement;
         public int CurrentElement
         {
@@ -115,7 +116,7 @@ public int CurrentElement
                     CurrentWeight = 1;
             }
         }
-
+    
         private int currentWeight;
         public int CurrentWeight
         {
@@ -130,7 +131,7 @@ public int CurrentWeight
                 }
             }
         }
-
+    
         private void updatePercentages()
         {
             int categoryTotal = 0;
@@ -150,7 +151,7 @@ private void updatePercentages()
                     item.Chance = (double)item.Weight / spawnTotal[ii] * category.Item1.Weight / categoryTotal;
             }
         }
-
+    
         public ISpawnDict GetDict(Type type)
         {
             Type spawnListType = ReflectionExt.GetBaseTypeArg(typeof(ISpawnDict<,>), type, 1);
@@ -166,7 +167,7 @@ public ISpawnDict GetDict(Type type)
             }
             return result;
         }
-
+    
         public void LoadFromDict(ISpawnDict source)
         {
             heirarchy.Clear();
@@ -178,7 +179,7 @@ public void LoadFromDict(ISpawnDict source)
                 CategorySpawnElement categorySpawn = new CategorySpawnElement(CategoryConv, true, rate, 0, key);
                 List<CategorySpawnElement> elements = new List<CategorySpawnElement>();
                 Collection.Add(categorySpawn);
-
+    
                 for (int ii = 0; ii < list.Count; ii++)
                 {
                     object obj = list.GetSpawn(ii);
@@ -191,24 +192,24 @@ public void LoadFromDict(ISpawnDict source)
             }
             updatePercentages();
         }
-
-
+    
+    
         private async void editCategory(int index, object element)
         {
             int existingIndex = getCategoryFromKey(element);
             if (existingIndex > -1)
             {
-                await MessageBox.Show(parent, "Spawnlist already contains this category!", "Error", MessageBox.MessageBoxButtons.Ok);
+                await MessageBoxWindowView.Show(_dialogService, "Spawnlist already contains this category!", "Error", MessageBoxWindowView.MessageBoxButtons.Ok);
                 return;
             }
-
+    
             index = Math.Min(Math.Max(0, index), Collection.Count);
             int categoryIndex = getCategoryIndex(index);
             CategorySpawnElement listElement = new CategorySpawnElement(CategoryConv, true, Collection[index].Weight, Collection[index].Chance, element);
             heirarchy[categoryIndex] = (listElement, heirarchy[categoryIndex].Item2);
             Collection[index] = listElement;
         }
-
+    
         private void editItem(int index, object element)
         {
             index = Math.Min(Math.Max(0, index), Collection.Count);
@@ -217,39 +218,39 @@ private void editItem(int index, object element)
             listIndex.Item1[listIndex.Item2] = listElement;
             Collection[index] = listElement;
         }
-
+    
         private async void insertCategory(int index, object element)
         {
             int existingIndex = getCategoryFromKey(element);
             if (existingIndex > -1)
             {
-                await MessageBox.Show(parent, "Spawnlist already contains this category!", "Error", MessageBox.MessageBoxButtons.Ok);
+                await MessageBoxWindowView.Show(_dialogService, "Spawnlist already contains this category!", "Error", MessageBoxWindowView.MessageBoxButtons.Ok);
                 return;
             }
-
+    
             index = Math.Min(Math.Max(0, index), Collection.Count + 1);
             int categoryIndex = getCategoryIndex(index);
             //account for inserting while non-selecting
             if (categoryIndex < 0)
                 categoryIndex = heirarchy.Count;
-
+    
             CategorySpawnElement listElement = new CategorySpawnElement(CategoryConv, true, 10, 0, element);
             heirarchy.Insert(categoryIndex, (listElement, new List<CategorySpawnElement>()));
             Collection.Insert(index, listElement);
             updatePercentages();
         }
-
+    
         private void insertItem(int index, object element)
         {
             index = Math.Min(Math.Max(0, index), Collection.Count + 1);
             (List<CategorySpawnElement>, int) listIndex = getHeirarchyListIndex(index);
             CategorySpawnElement listElement = new CategorySpawnElement(StringConv, false, 10, 0, element);
-
+    
             listIndex.Item1.Insert(listIndex.Item2, listElement);
             Collection.Insert(index, listElement);
             updatePercentages();
         }
-
+    
         public void gridCollection_DoubleClick(object sender, PointerReleasedEventArgs e)
         {
             //int index = lbxCollection.IndexFromPoint(e.X, e.Y);
@@ -265,7 +266,7 @@ public void gridCollection_DoubleClick(object sender, PointerReleasedEventArgs e
                     OnEditItem?.Invoke(index, element.Value, advancedEdit, editItem);
             }
         }
-
+    
         public void btnAddCategory_Click(bool advancedEdit)
         {
             int index = CurrentElement;
@@ -287,7 +288,7 @@ public void btnAddCategory_Click(bool advancedEdit)
             }
             OnEditKey?.Invoke(index, element, advancedEdit, insertCategory);
         }
-
+    
         public async void btnAddItem_Click(bool advancedEdit)
         {
             int index = CurrentElement;
@@ -296,10 +297,10 @@ public async void btnAddItem_Click(bool advancedEdit)
             
             if (index == Collection.Count)
             {
-                await MessageBox.Show(parent, "Choose a category first!", "Error", MessageBox.MessageBoxButtons.Ok);
+                await MessageBoxWindowView.Show(_dialogService, "Choose a category first!", "Error", MessageBoxWindowView.MessageBoxButtons.Ok);
                 return;
             }
-
+    
             object element = null;
             if (isCategory(index))
             {
@@ -313,19 +314,19 @@ public async void btnAddItem_Click(bool advancedEdit)
             }
             OnEditItem?.Invoke(index, element, advancedEdit, insertItem);
         }
-
+    
         private async void btnDelete_Click()
         {
             if (CurrentElement > -1 && CurrentElement < Collection.Count)
             {
                 if (ConfirmDelete)
                 {
-                    MessageBox.MessageBoxResult result = await MessageBox.Show(parent, "Are you sure you want to delete this item:\n" + Collection[currentElement].DisplayValue, "Confirm Delete",
-                    MessageBox.MessageBoxButtons.YesNo);
-                    if (result == MessageBox.MessageBoxResult.No)
+                    MessageBoxWindowView.MessageBoxResult result = await MessageBoxWindowView.Show(_dialogService, "Are you sure you want to delete this item:\n" + Collection[currentElement].DisplayValue, "Confirm Delete",
+                    MessageBoxWindowView.MessageBoxButtons.YesNo);
+                    if (result == MessageBoxWindowView.MessageBoxResult.No)
                         return;
                 }
-
+    
                 if (isCategory(CurrentElement))
                 {
                     int categoryIndex = getCategoryIndex(CurrentElement);
@@ -344,14 +345,14 @@ private async void btnDelete_Click()
                 }
             }
         }
-
+    
         private void Switch(int a, int b)
         {
             CategorySpawnElement obj = Collection[a];
             Collection[a] = Collection[b];
             Collection[b] = obj;
         }
-
+    
         private void SwitchRange(IntRange a, IntRange b)
         {
             CategorySpawnElement[] aCache = new CategorySpawnElement[a.Length];
@@ -366,14 +367,14 @@ private void SwitchRange(IntRange a, IntRange b)
                 bCache[ii] = Collection[b.Min + ii];
                 Collection[b.Min + ii] = new CategorySpawnElement(StringConv, false, 0, 0, "");
             }
-
-
+    
+    
             for (int ii = 0; ii < b.Length; ii++)
                 Collection[a.Min + ii] = bCache[ii];
             for (int ii = 0; ii < a.Length; ii++)
                 Collection[a.Min + b.Length + ii] = aCache[ii];
-
-
+    
+    
             //CategorySpawnElement[] aCache = new CategorySpawnElement[a.Length];
             //for (int ii = 0; ii < a.Length; ii++)
             //{
@@ -383,14 +384,14 @@ private void SwitchRange(IntRange a, IntRange b)
             //for (int ii = 0; ii < a.Length; ii++)
             //    Collection.Insert(a.Min + b.Length + ii, aCache[ii]);
         }
-
+    
         private void SwitchCategory(int a, int b)
         {
             (CategorySpawnElement, List<CategorySpawnElement>) category = heirarchy[a];
             heirarchy[a] = heirarchy[b];
             heirarchy[b] = category;
         }
-
+    
         private void btnUp_Click()
         {
             if (isCategory(CurrentElement))
@@ -420,12 +421,12 @@ private void btnUp_Click()
                 }
             }
         }
-
+    
         private void btnDown_Click()
         {
             if (CurrentElement < 0)
                 return;
-
+    
             if (isCategory(CurrentElement))
             {
                 // check against being the last category
@@ -454,7 +455,7 @@ private void btnDown_Click()
                 }
             }
         }
-
+    
         /// <summary>
         /// Determines if the index points to a category
         /// </summary>
@@ -470,7 +471,7 @@ private bool isCategory(int index)
             }
             return false;
         }
-
+    
         /// <summary>
         /// Get the index in the heirarchy given an index in collection
         /// </summary>
@@ -480,7 +481,7 @@ private int getCategoryIndex(int index)
         {
             if (index < 0 || index >= Collection.Count)
                 return -1;
-
+    
             CategorySpawnElement element = Collection[index];
             for (int ii = 0; ii < heirarchy.Count; ii++)
             {
@@ -489,7 +490,7 @@ private int getCategoryIndex(int index)
             }
             return -1;
         }
-
+    
         private int getCategoryFromKey(object obj)
         {
             for (int ii = 0; ii < heirarchy.Count; ii++)
@@ -500,7 +501,7 @@ private int getCategoryFromKey(object obj)
             }
             return -1;
         }
-
+    
         /// <summary>
         /// Gets the Collections index of the category owning the input Collections index
         /// </summary>
@@ -516,7 +517,7 @@ private int getOwningCategoryIndex(int index)
             }
             return -1;
         }
-
+    
         /// <summary>
         /// Get the index in the heirarchy given an index in collection.  If choosing a category itself, return the length of the list as the index.
         /// </summary>
@@ -533,6 +534,6 @@ private int getOwningCategoryIndex(int index)
                     return (heirarchy[categoryIndex].Item2, index - ii - 1);
             }
             return (null, -1);
-        }
+    }
     }
 }
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/DataEditRootForm.axaml b/RogueEssence.Editor.Avalonia/DataEditor/DataEditRootForm.axaml
index 12890c50..6e27b267 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/DataEditRootForm.axaml
+++ b/RogueEssence.Editor.Avalonia/DataEditor/DataEditRootForm.axaml
@@ -7,8 +7,10 @@
         mc:Ignorable="d"
         xmlns:converters="clr-namespace:RogueEssence.Dev.Converters"
         x:Class="RogueEssence.Dev.Views.DataEditRootForm"
-        Title="{Binding Name}" Width="340" Height="540" Opened="Window_Loaded" Closing="Window_Closing">
+     
+        Title="{Binding Name}" Width="340" Height="540">
   <!--Icon="/Assets/app-logo.ico"-->
+  <!-- Opened="Window_Loaded" Closing="Window_Closing" -->
   <Window.Resources>
   </Window.Resources>
   <Grid>
@@ -27,8 +29,8 @@
         
       </StackPanel>
     </ScrollViewer>
-    <Button Click="btnApply_Click" Margin="4" Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2">Save All Sub-Windows</Button>
-    <Button Click="btnOK_Click" Margin="4" Grid.Row="2" Grid.Column="0">OK</Button>
-    <Button Click="btnCancel_Click" Margin="4" Grid.Row="2" Grid.Column="1">Cancel</Button>
+    <!-- <Button Click="btnApply_Click" Margin="4" Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2">Save All Sub-Windows</Button> -->
+    <!-- <Button Click="btnOK_Click" Margin="4" Grid.Row="2" Grid.Column="0">OK</Button> -->
+    <!-- <Button Click="btnCancel_Click" Margin="4" Grid.Row="2" Grid.Column="1">Cancel</Button> -->
   </Grid>
 </Window>
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/DataEditRootForm.axaml.cs b/RogueEssence.Editor.Avalonia/DataEditor/DataEditRootForm.axaml.cs
index b23eccd8..98594a11 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/DataEditRootForm.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/DataEditRootForm.axaml.cs
@@ -23,11 +23,11 @@ public async void btnApply_Click(object sender, RoutedEventArgs e)
             if (SelectedOKEvent != null)
                 await SelectedOKEvent.Invoke();
         }
-
+    
         public override async void Window_Closing(object sender, WindowClosingEventArgs e)
         {
             base.Window_Closing(sender, e);
-
+    
             DevDataManager.SaveEditorSettings();
         }
     }
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/CategorySpawnEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/CategorySpawnEditor.cs
index fb5c7e3d..5bddcc8b 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/CategorySpawnEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/CategorySpawnEditor.cs
@@ -230,7 +230,7 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
             else
                 lbxValue.MaxHeight = 180;
 
-            CategorySpawnBoxViewModel vm = new CategorySpawnBoxViewModel(control.GetOwningForm(), new StringConv(keyType, ReflectionExt.GetPassableAttributes(1, attributes)), new StringConv(elementType, ReflectionExt.GetPassableAttributes(1, ReflectionExt.GetPassableAttributes(2, attributes))));
+            CategorySpawnBoxViewModel vm = new CategorySpawnBoxViewModel(_context.DialogService, new StringConv(keyType, ReflectionExt.GetPassableAttributes(1, attributes)), new StringConv(elementType, ReflectionExt.GetPassableAttributes(1, ReflectionExt.GetPassableAttributes(2, attributes))));
             lbxValue.DataContext = vm;
             lbxValue.MinHeight = lbxValue.MaxHeight;//TODO: Uptake Avalonia fix for improperly updating Grid control dimensions
 
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/RankedCollectionBox.axaml b/RogueEssence.Editor.Avalonia/DataEditor/RankedCollectionBox.axaml
index a51b261e..5eb365e4 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/RankedCollectionBox.axaml
+++ b/RogueEssence.Editor.Avalonia/DataEditor/RankedCollectionBox.axaml
@@ -41,7 +41,7 @@
         <Path Width="10" Height="10" Margin="0,2,0,0" Data="{StaticResource Icons.Plus}" />
       </Button>
       <Button Command="{Binding DeleteItemAsync}" Classes="secondary" Margin="0,0" Padding="4,3">
-        <Path Width="10" Height="10" Data="{StaticResource Icons.CactusFill}" />
+        <Path Width="10" Height="10" Data="{StaticResource Icons.CaretDownFill}" />
       </Button>
     </StackPanel>
 
diff --git a/RogueEssence.Editor.Avalonia/EditorContext/TabEvents.cs b/RogueEssence.Editor.Avalonia/EditorContext/TabEvents.cs
index 70264714..442b2697 100644
--- a/RogueEssence.Editor.Avalonia/EditorContext/TabEvents.cs
+++ b/RogueEssence.Editor.Avalonia/EditorContext/TabEvents.cs
@@ -32,8 +32,7 @@ public void RequestCloseTabsForEntry(string key, DataManager.DataType dataType)
         {
             CloseTabsForEntry?.Invoke(key, dataType);
         }
-
-        // Navigate tab to ID
+        
 
         public TabEvents(PageFactory pageFactory)
         {
diff --git a/RogueEssence.Editor.Avalonia/RogueEssence.Editor.Avalonia.csproj b/RogueEssence.Editor.Avalonia/RogueEssence.Editor.Avalonia.csproj
index da23595c..0729045e 100644
--- a/RogueEssence.Editor.Avalonia/RogueEssence.Editor.Avalonia.csproj
+++ b/RogueEssence.Editor.Avalonia/RogueEssence.Editor.Avalonia.csproj
@@ -21,9 +21,6 @@
     <PackageReference Include="Tabalonia" Version="0.10.7" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Update="DataEditor\DataEditRootForm.axaml.cs">
-      <DependentUpon>DataEditRootForm.axaml</DependentUpon>
-    </Compile>
     <Compile Update="DataEditor\RankedCollectionBox.axaml.cs">
       <DependentUpon>RankedCollectionBox.axaml</DependentUpon>
     </Compile>
@@ -63,27 +60,9 @@
     <Compile Update="DataEditor\DataEditForm.axaml.cs">
       <DependentUpon>DataEditForm.axaml</DependentUpon>
     </Compile>
-    <Compile Update="Views\Content\StringsEditForm.axaml.cs">
-      <DependentUpon>StringsEditForm.axaml</DependentUpon>
-    </Compile>
-    <Compile Update="Views\Content\TilesetEditForm.axaml.cs">
-      <DependentUpon>TilesetEditForm.axaml</DependentUpon>
-    </Compile>
-    <Compile Update="Views\Content\AnimEditForm.axaml.cs">
-      <DependentUpon>AnimEditForm.axaml</DependentUpon>
-    </Compile>
     <Compile Update="DataEditor\ClassBox.axaml.cs">
       <DependentUpon>ClassBox.axaml</DependentUpon>
     </Compile>
-    <Compile Update="Views\Content\SpeciesEditForm.axaml.cs">
-      <DependentUpon>SpeciesEditForm.axaml</DependentUpon>
-    </Compile>
-    <Compile Update="Views\DataListForm.axaml.cs">
-      <DependentUpon>DataListForm.axaml</DependentUpon>
-    </Compile>
-    <Compile Update="Views\DialogBoxes\ModConfigWindow.axaml.cs">
-      <DependentUpon>ModConfigWindow.axaml</DependentUpon>
-    </Compile>
     <Compile Update="Views\GroundEditForm\Layers\GroundLayerWindow.axaml.cs">
       <DependentUpon>GroundLayerWindow.axaml</DependentUpon>
     </Compile>
@@ -102,12 +81,6 @@
     <Compile Update="Views\DevForm\DevTabMods.axaml.cs">
       <DependentUpon>DevTabMods.axaml</DependentUpon>
     </Compile>
-    <Compile Update="Views\DialogBoxes\AnimChoiceWindow.axaml.cs">
-      <DependentUpon>AnimChoiceWindow.axaml</DependentUpon>
-    </Compile>
-    <Compile Update="Views\DialogBoxes\RenameWindow.axaml.cs">
-      <DependentUpon>RenameWindow.axaml</DependentUpon>
-    </Compile>
     <Compile Update="Views\GroundEditForm\GroundTabScript.axaml.cs">
       <DependentUpon>GroundTabScript.axaml</DependentUpon>
     </Compile>
@@ -150,9 +123,6 @@
     <Compile Update="Views\MapEditForm\MapTabTextures.axaml.cs">
       <DependentUpon>MapTabTextures.axaml</DependentUpon>
     </Compile>
-    <Compile Update="Views\MapEditForm\MapEditForm.axaml.cs">
-      <DependentUpon>MapEditForm.axaml</DependentUpon>
-    </Compile>
     <Compile Update="Views\SearchListBox.axaml.cs">
       <DependentUpon>SearchListBox.axaml</DependentUpon>
     </Compile>
@@ -183,56 +153,154 @@
     <Compile Update="DataEditor\Editors\RogueEssence\Tiles\TileBrowser.axaml.cs">
       <DependentUpon>TileBrowser.axaml</DependentUpon>
     </Compile>
-    <Compile Update="Views\New\Editors\DevControl\DevControlView.axaml.cs">
-      <DependentUpon>DevControlView.axaml</DependentUpon>
+    <Compile Update="Views\Pages\MapEditPage\MapEditPageView.axaml.cs">
+      <DependentUpon>MapEditPageView.axaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Update="Views\Pages\GroundEditPage\GroundEditPageView.axaml.cs">
+      <DependentUpon>GroundEditPageView.axaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
-    <Compile Update="Views\New\Editors\DevControl\DevTabGame.axaml.cs">
+    <Compile Update="Views\Pages\DevControlPage\DevControlPageView.axaml.cs">
+      <DependentUpon>DevControlPageView.axaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Update="Views\Pages\DevControlPage\DevTabGame.axaml.cs">
       <DependentUpon>DevTabGame.axaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
-    <Compile Update="Views\New\DialogBoxes\MapRetileWindowView.axaml.cs">
-      <DependentUpon>MapRetileWindow.axaml</DependentUpon>
+    <Compile Update="Views\Pages\DevControlPage\DevTabPlayer.axaml.cs">
+      <DependentUpon>DevTabPlayer.axaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
-    <Compile Update="Views\New\Editors\SpeciesEditPageView.axaml.cs">
-      <DependentUpon>SpeciesEditPageView.axaml</DependentUpon>
+    <Compile Update="Views\Pages\DevControlPage\DevTabTravel.axaml.cs">
+      <DependentUpon>DevTabTravel.axaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
-    <Compile Update="Views\New\DialogBoxes\ModConfigWindowView.axaml.cs">
-      <DependentUpon>ModConfigWindow.axaml</DependentUpon>
+    <Compile Update="Views\Pages\DevControlPage\DevTabScript.axaml.cs">
+      <DependentUpon>DevTabScript.axaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
-    <Compile Update="Views\New\Editors\DataListPageView.axaml.cs">
+    <Compile Update="Views\Pages\DataListPageView.axaml.cs">
       <DependentUpon>DataListPageView.axaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
-    <Compile Update="Views\New\DialogBoxes\AnimChoiceWindowView.axaml.cs">
-      <DependentUpon>AnimChoiceWindowView.axaml</DependentUpon>
+    <Compile Update="Views\Pages\DevEditPageView.axaml.cs">
+      <DependentUpon>DevEditPageView.axaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Update="Views\Pages\ModConfigPageView.axaml.cs">
+      <DependentUpon>ModConfigPageView.axaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Update="Views\Pages\ModListPageView.axaml.cs">
+      <DependentUpon>ModListPageView.axaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Update="Views\Pages\RandomInfoPageView.axaml.cs">
+      <DependentUpon>RandomInfoPageView.axaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Update="Views\Pages\ReflectedDataPageView.axaml.cs">
+      <DependentUpon>ReflectedDataPageView.axaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Update="Views\Pages\SpeciesEditPageView.axaml.cs">
+      <DependentUpon>SpeciesEditPageView.axaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Update="Views\Pages\SpritePageView.axaml.cs">
+      <DependentUpon>SpritePageView.axaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
-    <Compile Update="Views\New\Editors\StringEditPageView.axaml.cs">
+    <Compile Update="Views\Pages\StringEditPageView.axaml.cs">
       <DependentUpon>StringEditPageView.axaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
-    <Compile Update="Views\New\Editors\ModConfigPageView.axaml.cs">
-      <DependentUpon>ModConfigPageView.axaml</DependentUpon>
+    <Compile Update="Views\DevForm\CaptionButtons.axaml.cs">
+      <DependentUpon>CaptionButtons.axaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
-    <Compile Update="Views\New\DialogBoxes\MapLayerWindowView.axaml.cs">
-      <DependentUpon>MapLayerWindowView.axaml</DependentUpon>
+    <Compile Update="Views\DevForm\DevForm.axaml.cs">
+      <DependentUpon>DevForm.axaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
-    <Compile Update="Views\New\DialogBoxes\MapResizeWindowView.axaml.cs">
-      <DependentUpon>MapResizeWindowView.axaml</DependentUpon>
+    <Compile Update="Views\DevForm\ModSwitcherView.axaml.cs">
+      <DependentUpon>ModSwitcherView.axaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Update="Views\DevForm\TabBarView.axaml.cs">
+      <DependentUpon>TabBarView.axaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Update="Views\DevForm\TabSwitcherView.axaml.cs">
+      <DependentUpon>TabSwitcherView.axaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Update="Views\UserControls\IconText.axaml.cs">
+      <DependentUpon>IconText.axaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Update="Views\DialogBoxes\AnimChoiceWindowView.axaml.cs">
+      <DependentUpon>AnimChoiceWindowView.axaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Update="Views\DialogBoxes\PreferencesWindowView.axaml.cs">
+      <DependentUpon>PreferencesWindowView.axaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
-    <Compile Update="Views\New\DialogBoxes\ModNameWindowView.axaml.cs">
+    <Compile Update="Views\DialogBoxes\RenameWindowView.axaml.cs">
+      <DependentUpon>RenameWindowView.axaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Update="Views\DialogBoxes\MessageBoxWindowView.axaml.cs">
+      <DependentUpon>MessageBoxWindowView.axaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Update="Views\DialogBoxes\ModNameWindowView.axaml.cs">
       <DependentUpon>ModNameWindowView.axaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
+    <Compile Update="Views\DialogBoxes\MapResizeWindowView.axaml.cs">
+      <DependentUpon>MapResizeWindowView.axaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Update="Views\DialogBoxes\MapRetileWindowView.axaml.cs">
+      <DependentUpon>MapRetileWindowView.axaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Update="Views\DialogBoxes\MapLayerWindowView.axaml.cs">
+      <DependentUpon>MapLayerWindowView.axaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Models\" />
   </ItemGroup>
+  <ItemGroup>
+    <AdditionalFiles Include="Views\Pages\GroundEditPage\EntityBrowser.axaml" />
+    <AdditionalFiles Include="Views\Pages\GroundEditPage\GroundEditForm.axaml" />
+    <AdditionalFiles Include="Views\Pages\GroundEditPage\GroundTabDecorations.axaml" />
+    <AdditionalFiles Include="Views\Pages\GroundEditPage\GroundTabEntities.axaml" />
+    <AdditionalFiles Include="Views\Pages\GroundEditPage\GroundTabProperties.axaml" />
+    <AdditionalFiles Include="Views\Pages\GroundEditPage\GroundTabScript.axaml" />
+    <AdditionalFiles Include="Views\Pages\GroundEditPage\GroundTabStrings.axaml" />
+    <AdditionalFiles Include="Views\Pages\GroundEditPage\GroundTabTextures.axaml" />
+    <AdditionalFiles Include="Views\Pages\GroundEditPage\GroundTabWalls.axaml" />
+    <AdditionalFiles Include="Views\Pages\GroundEditPage\Layers\AnimLayerWindow.axaml" />
+    <AdditionalFiles Include="Views\Pages\GroundEditPage\Layers\EntityLayerWindow.axaml" />
+    <AdditionalFiles Include="Views\Pages\GroundEditPage\Layers\GroundLayerWindow.axaml" />
+    <AdditionalFiles Include="Views\Pages\GroundEditPage\Layers\MapLayerWindow.axaml" />
+    <AdditionalFiles Include="Views\Pages\MapEditPage\MapTabDecorations.axaml" />
+    <AdditionalFiles Include="Views\Pages\MapEditPage\MapTabEffects.axaml" />
+    <AdditionalFiles Include="Views\Pages\MapEditPage\MapTabEntities.axaml" />
+    <AdditionalFiles Include="Views\Pages\MapEditPage\MapTabEntrances.axaml" />
+    <AdditionalFiles Include="Views\Pages\MapEditPage\MapTabItems.axaml" />
+    <AdditionalFiles Include="Views\Pages\MapEditPage\MapTabProperties.axaml" />
+    <AdditionalFiles Include="Views\Pages\MapEditPage\MapTabSpawns.axaml" />
+    <AdditionalFiles Include="Views\Pages\MapEditPage\MapTabTerrain.axaml" />
+    <AdditionalFiles Include="Views\Pages\MapEditPage\MapTabTextures.axaml" />
+    <AdditionalFiles Include="Views\Pages\MapEditPage\MapTabTiles.axaml" />
+    <AdditionalFiles Include="Views\Pages\MapEditPage\Teams\TeamWindow.axaml" />
+  </ItemGroup>
 </Project>
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/Content/AnimEditViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/Content/AnimEditViewModel.cs
deleted file mode 100644
index 913b0cdd..00000000
--- a/RogueEssence.Editor.Avalonia/ViewModels/Content/AnimEditViewModel.cs
+++ /dev/null
@@ -1,478 +0,0 @@
-using Avalonia.Interactivity;
-using System;
-using System.Collections.Generic;
-using System.Text;
-using ReactiveUI;
-using System.Collections.ObjectModel;
-using Avalonia.Controls;
-using RogueEssence.Dungeon;
-using RogueEssence.Data;
-using RogueEssence.Content;
-using System.IO;
-using System.Linq;
-using Avalonia.Media.Imaging;
-using Avalonia.Platform.Storage;
-using Avalonia.Threading;
-using RogueElements;
-using RogueEssence.Dev.Views;
-
-namespace RogueEssence.Dev.ViewModels
-{
-    public class AnimEditViewModel : ViewModelBase
-    {
-        private GraphicsManager.AssetType assetType;
-        private Window parent;
-
-
-        public string Name { get { return assetType.ToString(); } }
-
-
-        private List<string> anims;
-        public SearchListBoxViewModel Anims { get; set; }
-
-        private string cachedPath;
-        public string CachedPath
-        {
-            get => cachedPath;
-            set => this.SetIfChanged(ref cachedPath, value);
-        }
-
-
-        public AnimEditViewModel()
-        {
-            anims = new List<string>();
-
-            Anims = new SearchListBoxViewModel();
-            Anims.DataName = "Graphics:";
-            Anims.SelectedIndexChanged += Anims_SelectedIndexChanged;
-
-        }
-
-        public void LoadDataEntries(GraphicsManager.AssetType assetType, Window parent)
-        {
-            this.assetType = assetType;
-            this.parent = parent;
-
-            //Anims.DataName = assetType.ToString() + ":";
-            recomputeAnimList();
-        }
-
-        private void recomputeAnimList()
-        {
-            lock (GameBase.lockObj)
-            {
-                anims.Clear();
-                Anims.Clear();
-                string assetPattern = GraphicsManager.GetPattern(assetType);
-                string[] dirs = PathMod.GetModFiles(Path.GetDirectoryName(assetPattern), String.Format(Path.GetFileName(assetPattern), "*"));
-                for (int ii = 0; ii < dirs.Length; ii++)
-                {
-                    string filename = Path.GetFileNameWithoutExtension(dirs[ii]);
-                    anims.Add(filename);
-                }
-                Anims.SetItems(anims);
-            }
-        }
-
-        public async void mnuMassImport_Click()
-        {
-            await MessageBox.Show(parent, "Note: Importing a sprite to a slot that is already filled will automatically overwrite the old one.", "Mass Import", MessageBox.MessageBoxButtons.Ok);
-
-            //remember addresses in registry
-            string folderName = DevForm.GetConfig(Name + "Dir", Directory.GetCurrentDirectory());
-
-            //open window to choose directory
-            IStorageFolder directory = await parent.StorageProvider.TryGetFolderFromPathAsync(folderName);
-            await Dispatcher.UIThread.InvokeAsync(async () =>
-            {
-                IReadOnlyList<IStorageFolder> results = await parent.StorageProvider.OpenFolderPickerAsync(new FolderPickerOpenOptions
-                {
-                    Title = "Select folder to mass import",
-                    SuggestedStartLocation = directory,
-                    AllowMultiple = false,
-                    
-
-                });
-
-                if (results.Count <= 0) 
-                    return;
-
-                string folder = results.First().Path.LocalPath;
-                DevForm.SetConfig(Name + "Dir", folder);
-                CachedPath = folder + "/";
-
-                try
-                {
-                    MassImport(CachedPath);
-                }
-                catch (Exception ex)
-                {
-                    DiagManager.Instance.LogError(ex, false);
-                    await MessageBox.Show(parent, "Error importing from\n" + CachedPath + "\n\n" + ex.Message, "Import Failed", MessageBox.MessageBoxButtons.Ok);
-                    return;
-                }
-            });
-        }
-
-        public async void mnuMassExport_Click()
-        {
-            //remember addresses in registry
-            string folderName = DevForm.GetConfig(Name + "Dir", Directory.GetCurrentDirectory());
-
-            //open window to choose directory
-            IStorageFolder directory = await parent.StorageProvider.TryGetFolderFromPathAsync(folderName);
-            await Dispatcher.UIThread.InvokeAsync(async () =>
-            {
-                IReadOnlyList<IStorageFolder> results = await parent.StorageProvider.OpenFolderPickerAsync(
-                    new FolderPickerOpenOptions
-                    {
-                        Title = "Select folder to mass export to",
-                        SuggestedStartLocation = directory,
-                        AllowMultiple = false,
-                    });
-
-                if (results.Count <= 0)
-                    return;
-
-                string folder = results.First().Path.LocalPath;
-                
-                DevForm.SetConfig(Name + "Dir", folder);
-                CachedPath = folder + "/";
-
-                bool success = MassExport(CachedPath);
-                if (!success)
-                    await MessageBox.Show(parent, "Errors found exporting to\n" + CachedPath + "\n\nCheck logs for more info.", "Mass Export Failed", MessageBox.MessageBoxButtons.Ok);
-            });
-        }
-
-        public async void btnImport_Click()
-        {
-            //remember addresses in registry
-            string folderName = DevForm.GetConfig(Name + "Dir", Directory.GetCurrentDirectory());
-
-            //open window to choose directory
-            IStorageFolder directory = await parent.StorageProvider.TryGetFolderFromPathAsync(folderName);
-            await Dispatcher.UIThread.InvokeAsync(async () =>
-            {
-                IReadOnlyList<IStorageFile> results = await parent.StorageProvider.OpenFilePickerAsync(new FilePickerOpenOptions 
-                {
-                    Title = "Open .png or .xml File",
-                    SuggestedStartLocation = directory,
-                    AllowMultiple = false,
-                    FileTypeFilter =
-                    [
-                        new FilePickerFileType("PNG Files")
-                        {
-                            Patterns = ["*.png"]
-                        },
-                        new FilePickerFileType("DirData XML")
-                        {
-                            Patterns = ["*.xml"]
-                        }
-                    ]
-                });
-
-                if (results.Count > 0)
-                {
-                    string filePath = results.First().Path.LocalPath;
-                    string animName = Path.GetFileNameWithoutExtension(filePath);
-
-                    if (anims.Contains(animName))
-                    {
-                        MessageBox.MessageBoxResult result = await MessageBox.Show(parent,
-                            "Are you sure you want to overwrite the existing sheet:\n" + animName,
-                            "Sprite Sheet already exists.",
-                            MessageBox.MessageBoxButtons.YesNo);
-                        if (result == MessageBox.MessageBoxResult.No)
-                            return;
-                    }
-                    DevForm.SetConfig(Name + "Dir", Path.GetDirectoryName(filePath));
-                    if (Path.GetExtension(filePath) == ".xml")
-                        CachedPath = Path.GetDirectoryName(filePath);
-                    else
-                        CachedPath = filePath;
-
-                    try
-                    {
-                        Import(CachedPath);
-                    }
-                    catch (Exception ex)
-                    {
-                        DiagManager.Instance.LogError(ex, false);
-                        await MessageBox.Show(parent, "Error importing from\n" + CachedPath + "\n\n" + ex.Message, "Import Failed", MessageBox.MessageBoxButtons.Ok);
-                        return;
-                    }
-                }
-            });
-        }
-
-        public async void btnReImport_Click()
-        {
-            try
-            {
-                Import(CachedPath);
-            }
-            catch (Exception ex)
-            {
-                DiagManager.Instance.LogError(ex, false);
-                await MessageBox.Show(parent, "Error importing from\n" + CachedPath + "\n\n" + ex.Message, "Import Failed", MessageBox.MessageBoxButtons.Ok);
-                return;
-            }
-        }
-
-        // public async void btnExport_Click()
-        // {
-        //     //get current sprite
-        //     string animData = anims[Anims.InternalIndex];
-        //
-        //     //remember addresses in registry
-        //     string folderName = DevForm.GetConfig(Name + "Dir", Directory.GetCurrentDirectory());
-        //
-        //     SaveFileDialog saveFileDialog = new SaveFileDialog();
-        //     saveFileDialog.Directory = folderName;
-        //
-        //     FileDialogFilter filter = new FileDialogFilter();
-        //     filter.Name = "PNG Files";
-        //     filter.Extensions.Add("png");
-        //     saveFileDialog.Filters.Add(filter);
-        //
-        //     string folder = await saveFileDialog.ShowAsync(parent);
-        //
-        //     if (!String.IsNullOrEmpty(folder))
-        //     {
-        //         DevForm.SetConfig(Name + "Dir", Path.GetDirectoryName(folder));
-        //         //CachedPath = folder;
-        //
-        //         try
-        //         {
-        //             DevForm.ExecuteOrPend(() => { Export(folder, animData); });
-        //         }
-        //         catch (Exception ex)
-        //         {
-        //             DiagManager.Instance.LogError(ex, false);
-        //             await MessageBox.Show(parent, "Error exporting to\n" + CachedPath + "\n\n" + ex.Message, "Export Failed", MessageBox.MessageBoxButtons.Ok);
-        //             return;
-        //         }
-        //     }
-        // }
-
-        
-        public async void btnExport_Click()
-        {
-            //get current sprite
-            string animData = anims[Anims.InternalIndex];
-
-            //remember addresses in registry
-            string folderName = DevForm.GetConfig(Name + "Dir", Directory.GetCurrentDirectory());
-
-            var options = new FilePickerSaveOptions
-            {
-                Title = "Export PNG",
-                SuggestedStartLocation = await parent.StorageProvider.TryGetFolderFromPathAsync(folderName),
-                DefaultExtension = "png",
-                SuggestedFileName = "export.png",
-                FileTypeChoices =
-                [
-                    new FilePickerFileType("PNG Files")
-                    {
-                        Patterns = new[] { "*.png" }
-                    }
-                ]
-            };
-            
-            var saveFile = await parent.StorageProvider.SaveFilePickerAsync(options);
-
-            if (saveFile != null)
-            {
-                string filePath = saveFile.Path.LocalPath;
-                DevForm.SetConfig(Name + "Dir", Path.GetDirectoryName(filePath));
-
-                try
-                {
-                    DevForm.ExecuteOrPend(() => { Export(filePath, animData); });
-                }
-                catch (Exception ex)
-                {
-                    DiagManager.Instance.LogError(ex, false);
-            
-                    
-                    await MessageBox.Show(parent,
-                        "Export Failed",
-                        $"Error exporting to\n{filePath}\n\n{ex.Message}",
-                        MessageBox.MessageBoxButtons.Ok);
-                    return;
-                }
-            }
-        }
-        public async void btnDelete_Click()
-        {
-            //get current sprite
-            int animIdx = Anims.InternalIndex;
-
-            MessageBox.MessageBoxResult result = await MessageBox.Show(parent, "Are you sure you want to delete the following sheet:\n" + anims[animIdx], "Delete Sprite Sheet.",
-                MessageBox.MessageBoxButtons.YesNo);
-            if (result == MessageBox.MessageBoxResult.No)
-                return;
-
-            Delete(animIdx);
-        }
-
-
-
-        private void MassImport(string currentPath)
-        {
-            DevForm.ExecuteOrPend(() => { tryMassImport(currentPath); });
-            //recompute
-            recomputeAnimList();
-        }
-
-        private void tryMassImport(string currentPath)
-        {
-            lock (GameBase.lockObj)
-            {
-                string assetPattern = GraphicsManager.GetPattern(assetType);
-                if (!Directory.Exists(Path.GetDirectoryName(PathMod.HardMod(assetPattern))))
-                    Directory.CreateDirectory(Path.GetDirectoryName(PathMod.HardMod(assetPattern)));
-                ImportHelper.ImportAllNameDirs(currentPath, PathMod.HardMod(assetPattern));
-
-                GraphicsManager.RebuildIndices(assetType);
-                GraphicsManager.ClearCaches(assetType);
-
-                DiagManager.Instance.LogInfo("Mass import complete.");
-            }
-        }
-
-
-        private void Import(string currentPath)
-        {
-            DevForm.ExecuteOrPend(() => { tryImport(currentPath); });
-
-            //recompute
-            recomputeAnimList();
-        }
-
-        private void tryImport(string currentPath)
-        {
-            lock (GameBase.lockObj)
-            {
-                string assetPattern = GraphicsManager.GetPattern(assetType);
-                string destFile;
-                string animName = Path.GetFileNameWithoutExtension(currentPath);
-                if (Directory.Exists(currentPath))
-                    destFile = PathMod.HardMod(String.Format(assetPattern, animName));
-                else
-                {
-                    string[] components = animName.Split('.');
-                    if (components.Length != 2)
-                        throw new ArgumentException("The input filename does not fit the convention of \"<Anim Name>.<Anim Type>.png\"!");
-                    destFile = PathMod.HardMod(String.Format(assetPattern, components[0]));
-                }
-
-                if (!Directory.Exists(Path.GetDirectoryName(destFile)))
-                    Directory.CreateDirectory(Path.GetDirectoryName(destFile));
-
-                //write sprite data
-                using (DirSheet sheet = DirSheet.Import(currentPath))
-                {
-                    using (FileStream stream = File.OpenWrite(destFile))
-                    {
-                        //save data
-                        using (BinaryWriter writer = new BinaryWriter(stream))
-                            sheet.Save(writer);
-                    }
-                }
-                GraphicsManager.RebuildIndices(assetType);
-                GraphicsManager.ClearCaches(assetType);
-
-                DiagManager.Instance.LogInfo("Frames from:\n" +
-                    currentPath + "\nhave been imported.");
-            }
-        }
-
-
-        private bool MassExport(string currentPath)
-        {
-            bool success = true;
-            string assetPattern = GraphicsManager.GetPattern(assetType);
-            string[] dirs = PathMod.GetModFiles(Path.GetDirectoryName(assetPattern), String.Format(Path.GetFileName(assetPattern), "*"));
-            for (int ii = 0; ii < dirs.Length; ii++)
-            {
-                try
-                {
-                    string filename = Path.GetFileNameWithoutExtension(dirs[ii]);
-                    DevForm.ExecuteOrPend(() => { Export(currentPath + filename, filename); });
-                }
-                catch (Exception ex)
-                {
-                    DiagManager.Instance.LogError(ex, false);
-                    success = false;
-                }
-            }
-            return success;
-        }
-
-        private void Export(string currentPath, string anim)
-        {
-            lock (GameBase.lockObj)
-            {
-                string animPath = PathMod.ModPath(String.Format(GraphicsManager.GetPattern(assetType), anim));
-                if (File.Exists(animPath))
-                {
-                    //read file and read binary data
-                    using (FileStream fileStream = File.OpenRead(animPath))
-                    {
-                        using (BinaryReader reader = new BinaryReader(fileStream))
-                        {
-                            DirSheet sheet = DirSheet.Load(reader);
-
-                            string filename = DirSheet.GetExportString(sheet, Path.GetFileNameWithoutExtension(currentPath));
-                            string dirname = Path.GetDirectoryName(currentPath);
-                            DirSheet.Export(sheet, Path.Combine(dirname, filename + ".png"));
-                        }
-                    }
-                }
-
-                DiagManager.Instance.LogInfo("Frames from:\n" +
-                    anim +
-                    "\nhave been exported to:" + currentPath);
-            }
-        }
-
-
-        private void Delete(int animIdx)
-        {
-            lock (GameBase.lockObj)
-            {
-                string anim = anims[animIdx];
-                string animPath = PathMod.ModPath(String.Format(GraphicsManager.GetPattern(assetType), anim));
-                if (File.Exists(animPath))
-                    File.Delete(animPath);
-
-                GraphicsManager.RebuildIndices(assetType);
-                GraphicsManager.ClearCaches(assetType);
-
-                DiagManager.Instance.LogInfo("Deleted frames for:" + anim);
-
-                anims.RemoveAt(animIdx);
-                Anims.RemoveInternalAt(animIdx);
-            }
-        }
-
-
-        private void Anims_SelectedIndexChanged()
-        {
-            CachedPath = null;
-            if (Anims.InternalIndex == -1)
-                return;
-
-            lock (GameBase.lockObj)
-            {
-                if (DungeonScene.Instance != null)
-                {
-                    DungeonScene.Instance.DebugAsset = assetType;
-                    DungeonScene.Instance.DebugAnim = anims[Anims.InternalIndex];
-                }
-            }
-        }
-    }
-}
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/Content/BeamEditViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/Content/BeamEditViewModel.cs
index 29f99a55..54112353 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/Content/BeamEditViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/Content/BeamEditViewModel.cs
@@ -1,406 +1,406 @@
-using Avalonia.Interactivity;
-using System;
-using System.Collections.Generic;
-using System.Text;
-using ReactiveUI;
-using System.Collections.ObjectModel;
-using Avalonia.Controls;
-using RogueEssence.Dungeon;
-using RogueEssence.Data;
-using RogueEssence.Content;
-using System.IO;
-using System.Linq;
-using Avalonia.Media.Imaging;
-using Avalonia.Platform.Storage;
-using Avalonia.Threading;
-using RogueElements;
-using RogueEssence.Dev.Views;
-
-namespace RogueEssence.Dev.ViewModels
-{
-    public class BeamEditViewModel : ViewModelBase
-    {
-        private GraphicsManager.AssetType assetType;
-        private Window parent;
-
-
-        public string Name { get { return assetType.ToString(); } }
-
-
-        private List<string> anims;
-        public SearchListBoxViewModel Anims { get; set; }
-
-        private string cachedPath;
-        public string CachedPath
-        {
-            get => cachedPath;
-            set => this.SetIfChanged(ref cachedPath, value);
-        }
-
-
-        public BeamEditViewModel()
-        {
-            anims = new List<string>();
-
-            Anims = new SearchListBoxViewModel();
-            Anims.DataName = "Graphics:";
-            //TODO: properly support beam/column anims
-            //Anims.SelectedIndexChanged += Anims_SelectedIndexChanged;
-
-        }
-
-        public void LoadDataEntries(GraphicsManager.AssetType assetType, Window parent)
-        {
-            this.assetType = assetType;
-            this.parent = parent;
-
-            //Anims.DataName = assetType.ToString() + ":";
-            recomputeAnimList();
-        }
-
-        private void recomputeAnimList()
-        {
-            lock (GameBase.lockObj)
-            {
-                anims.Clear();
-                Anims.Clear();
-                string assetPattern = GraphicsManager.GetPattern(assetType);
-                string[] dirs = PathMod.GetModFiles(Path.GetDirectoryName(assetPattern), String.Format(Path.GetFileName(assetPattern), "*"));
-                for (int ii = 0; ii < dirs.Length; ii++)
-                {
-                    string filename = Path.GetFileNameWithoutExtension(dirs[ii]);
-                    anims.Add(filename);
-                }
-                Anims.SetItems(anims);
-            }
-        }
-
-        public async void mnuMassImport_Click()
-        {
-            await MessageBox.Show(parent, "Note: Importing a sprite to a slot that is already filled will automatically overwrite the old one.", "Mass Import", MessageBox.MessageBoxButtons.Ok);
-
-            //remember addresses in registry
-            string folderName = DevForm.GetConfig(Name + "Dir", Directory.GetCurrentDirectory());
-            
-            //open window to choose directory
-            IStorageFolder directory = await parent.StorageProvider.TryGetFolderFromPathAsync(folderName);
-            await Dispatcher.UIThread.InvokeAsync(async () =>
-            {
-                IReadOnlyList<IStorageFolder> results = await parent.StorageProvider.OpenFolderPickerAsync(
-                    new FolderPickerOpenOptions
-                    {
-                        Title = "Select folder to mass import",
-                        SuggestedStartLocation = directory,
-                        AllowMultiple = false,
-                    });
-
-                if (results.Count <= 0)
-                    return;
-
-                string folder = results.First().Path.LocalPath;
-                
-                DevForm.SetConfig(Name + "Dir", folder);
-                CachedPath = folder + "/";
-
-                try
-                {
-                    lock (GameBase.lockObj)
-                        MassImport(CachedPath);
-                }
-                catch (Exception ex)
-                {
-                    DiagManager.Instance.LogError(ex, false);
-                    await MessageBox.Show(parent, "Error importing from\n" + CachedPath + "\n\n" + ex.Message, "Import Failed", MessageBox.MessageBoxButtons.Ok);
-                    return;
-                }
-
-            });
-
-        }
-
-        public async void mnuMassExport_Click()
-        {
-            //remember addresses in registry
-            string folderName = DevForm.GetConfig(Name + "Dir", Directory.GetCurrentDirectory());
-
-            //open window to choose directory
-            IStorageFolder directory = await parent.StorageProvider.TryGetFolderFromPathAsync(folderName);
-            await Dispatcher.UIThread.InvokeAsync(async () =>
-            {
-                IReadOnlyList<IStorageFolder> results = await parent.StorageProvider.OpenFolderPickerAsync(
-                    new FolderPickerOpenOptions
-                    {
-                        Title = "Select folder to mass export to",
-                        SuggestedStartLocation = directory,
-                        AllowMultiple = false,
-                    });
-
-                if (results.Count <= 0)
-                    return;
-
-                string folder = results.First().Path.LocalPath;
-                DevForm.SetConfig(Name + "Dir", folder);
-                CachedPath = folder + "/";
-
-                bool success = MassExport(CachedPath);
-                if (!success)
-                    await MessageBox.Show(parent, "Errors found exporting to\n" + CachedPath + "\n\nCheck logs for more info.", "Mass Export Failed", MessageBox.MessageBoxButtons.Ok);
-            });
-        }
-
-        public async void btnImport_Click()
-        {
-            //remember addresses in registry
-            string folderName = DevForm.GetConfig(Name + "Dir", Directory.GetCurrentDirectory());
-
-            //open window to choose directory
-            IStorageFolder directory = await parent.StorageProvider.TryGetFolderFromPathAsync(folderName);
-            await Dispatcher.UIThread.InvokeAsync(async () =>
-            {
-                IReadOnlyList<IStorageFolder> results = await parent.StorageProvider.OpenFolderPickerAsync(
-                    new FolderPickerOpenOptions
-                    {
-                        Title = "Select folder to import",
-                        SuggestedStartLocation = directory,
-                        AllowMultiple = false,
-                    });
-
-                if (results.Count <= 0)
-                    return;
-
-                string folder = results.First().Path.LocalPath;
-                string animName = Path.GetFileNameWithoutExtension(folder);
-
-                if (anims.Contains(animName))
-                {
-                    MessageBox.MessageBoxResult result = await MessageBox.Show(parent, "Are you sure you want to overwrite the existing sheet:\n" + animName, "Sprite Sheet already exists.",
-                        MessageBox.MessageBoxButtons.YesNo);
-                    if (result == MessageBox.MessageBoxResult.No)
-                        return;
-                }
-
-                DevForm.SetConfig(Name + "Dir", Path.GetDirectoryName(folder));
-                CachedPath = folder;
-
-                try
-                {
-                    Import(CachedPath);
-                }
-                catch (Exception ex)
-                {
-                    DiagManager.Instance.LogError(ex, false);
-                    await MessageBox.Show(parent, "Error importing from\n" + CachedPath + "\n\n" + ex.Message, "Import Failed", MessageBox.MessageBoxButtons.Ok);
-                    return;
-                }
-            });
-        }
-
-        public async void btnReImport_Click()
-        {
-            try
-            {
-                Import(CachedPath);
-            }
-            catch (Exception ex)
-            {
-                DiagManager.Instance.LogError(ex, false);
-                await MessageBox.Show(parent, "Error importing from\n" + CachedPath + "\n\n" + ex.Message, "Import Failed", MessageBox.MessageBoxButtons.Ok);
-                return;
-            }
-        }
-
-        public async void btnExport_Click()
-        {
-            //get current sprite
-            string animData = anims[Anims.InternalIndex];
-
-            //remember addresses in registry
-            string folderName = DevForm.GetConfig(Name + "Dir", Directory.GetCurrentDirectory());
-
-            //open window to choose directory
-            IStorageFolder directory = await parent.StorageProvider.TryGetFolderFromPathAsync(folderName);
-            await Dispatcher.UIThread.InvokeAsync(async () =>
-            {
-                IReadOnlyList<IStorageFolder> results = await parent.StorageProvider.OpenFolderPickerAsync(
-                    new FolderPickerOpenOptions
-                    {
-                        Title = "Select folder to export to",
-                        SuggestedStartLocation = directory,
-                        AllowMultiple = false,
-                    });
-
-                if (results.Count <= 0)
-                    return;
-
-                string folder = results.First().Path.LocalPath;
-                DevForm.SetConfig(Name + "Dir", Path.GetDirectoryName(folder));
-                //CachedPath = folder;
-
-                try
-                {
-                    DevForm.ExecuteOrPend(() => { Export(folder, animData); });
-                }
-                catch (Exception ex)
-                {
-                    DiagManager.Instance.LogError(ex, false);
-                    await MessageBox.Show(parent, "Error exporting to\n" + CachedPath + "\n\n" + ex.Message, "Export Failed", MessageBox.MessageBoxButtons.Ok);
-                    return;
-                }
-            });
-        }
-
-        public async void btnDelete_Click()
-        {
-            //get current sprite
-            int animIdx = Anims.InternalIndex;
-
-            MessageBox.MessageBoxResult result = await MessageBox.Show(parent, "Are you sure you want to delete the following sheet:\n" + anims[animIdx], "Delete Sprite Sheet.",
-                MessageBox.MessageBoxButtons.YesNo);
-            if (result == MessageBox.MessageBoxResult.No)
-                return;
-
-            Delete(animIdx);
-        }
-
-
-
-        private void MassImport(string currentPath)
-        {
-            string assetPattern = GraphicsManager.GetPattern(assetType);
-            if (!Directory.Exists(Path.GetDirectoryName(PathMod.HardMod(assetPattern))))
-                Directory.CreateDirectory(Path.GetDirectoryName(PathMod.HardMod(assetPattern)));
-            ImportHelper.ImportAllBeams(currentPath, PathMod.HardMod(assetPattern));
-
-            GraphicsManager.RebuildIndices(assetType);
-            GraphicsManager.ClearCaches(assetType);
-
-            DiagManager.Instance.LogInfo("Mass import complete.");
-
-            //recompute
-            recomputeAnimList();
-        }
-
-
-        private void Import(string currentPath)
-        {
-            DevForm.ExecuteOrPend(() => { tryImport(currentPath); });
-
-            //recompute
-            recomputeAnimList();
-        }
-
-        private void tryImport(string currentPath)
-        {
-            lock (GameBase.lockObj)
-            {
-                string animName = Path.GetFileNameWithoutExtension(currentPath);
-                string destFile = PathMod.HardMod(String.Format(GraphicsManager.GetPattern(assetType), animName));
-                if (!Directory.Exists(Path.GetDirectoryName(destFile)))
-                    Directory.CreateDirectory(Path.GetDirectoryName(destFile));
-
-                //write sprite data
-                using (BeamSheet sheet = BeamSheet.Import(currentPath + "/"))
-                {
-                    using (FileStream stream = File.OpenWrite(destFile))
-                    {
-                        using (BinaryWriter writer = new BinaryWriter(stream))
-                            sheet.Save(writer);
-                    }
-                }
-
-                GraphicsManager.RebuildIndices(assetType);
-                GraphicsManager.ClearCaches(assetType);
-
-                DiagManager.Instance.LogInfo("Frames from:\n" +
-                    currentPath + "\nhave been imported.");
-            }
-        }
-
-
-        private bool MassExport(string currentPath)
-        {
-            bool success = true;
-            string assetPattern = GraphicsManager.GetPattern(assetType);
-            string[] dirs = PathMod.GetModFiles(Path.GetDirectoryName(assetPattern), String.Format(Path.GetFileName(assetPattern), "*"));
-            for (int ii = 0; ii < dirs.Length; ii++)
-            {
-                try
-                {
-                    string filename = Path.GetFileNameWithoutExtension(dirs[ii]);
-                    DevForm.ExecuteOrPend(() => { Export(currentPath + filename, filename); });
-                }
-                catch (Exception ex)
-                {
-                    DiagManager.Instance.LogError(ex, false);
-                    success = false;
-                }
-            }
-            return success;
-        }
-
-        private void Export(string currentPath, string anim)
-        {
-            lock (GameBase.lockObj)
-            {
-                if (!Directory.Exists(currentPath))
-                    Directory.CreateDirectory(currentPath);
-
-                string animPath = PathMod.ModPath(String.Format(GraphicsManager.GetPattern(assetType), anim));
-                if (File.Exists(animPath))
-                {
-                    //read file and read binary data
-                    using (FileStream fileStream = File.OpenRead(animPath))
-                    {
-                        using (BinaryReader reader = new BinaryReader(fileStream))
-                        {
-                            BeamSheet sheet = BeamSheet.Load(reader);
-                            BeamSheet.Export(sheet, currentPath + "/");
-                        }
-                    }
-                }
-
-                DiagManager.Instance.LogInfo("Frames from:\n" +
-                    anim +
-                    "\nhave been exported to:" + currentPath);
-            }
-        }
-
-
-        private void Delete(int animIdx)
-        {
-            lock (GameBase.lockObj)
-            {
-                string anim = anims[animIdx];
-
-                string animPath = PathMod.ModPath(String.Format(GraphicsManager.GetPattern(assetType), anim));
-                if (File.Exists(animPath))
-                    File.Delete(animPath);
-
-                GraphicsManager.RebuildIndices(assetType);
-                GraphicsManager.ClearCaches(assetType);
-
-                DiagManager.Instance.LogInfo("Deleted frames for:" + anim);
-
-                anims.RemoveAt(animIdx);
-                Anims.RemoveInternalAt(animIdx);
-            }
-        }
-
-
-        private void Anims_SelectedIndexChanged()
-        {
-            CachedPath = null;
-            if (Anims.InternalIndex == -1)
-                return;
-
-            lock (GameBase.lockObj)
-            {
-                if (DungeonScene.Instance != null)
-                {
-                    DungeonScene.Instance.DebugAsset = assetType;
-                    DungeonScene.Instance.DebugAnim = anims[Anims.InternalIndex];
-                }
-            }
-        }
-    }
-}
+// using Avalonia.Interactivity;
+// using System;
+// using System.Collections.Generic;
+// using System.Text;
+// using ReactiveUI;
+// using System.Collections.ObjectModel;
+// using Avalonia.Controls;
+// using RogueEssence.Dungeon;
+// using RogueEssence.Data;
+// using RogueEssence.Content;
+// using System.IO;
+// using System.Linq;
+// using Avalonia.Media.Imaging;
+// using Avalonia.Platform.Storage;
+// using Avalonia.Threading;
+// using RogueElements;
+// using RogueEssence.Dev.Views;
+//
+// namespace RogueEssence.Dev.ViewModels
+// {
+//     public class BeamEditViewModel : ViewModelBase
+//     {
+//         private GraphicsManager.AssetType assetType;
+//         private Window parent;
+//
+//
+//         public string Name { get { return assetType.ToString(); } }
+//
+//
+//         private List<string> anims;
+//         public SearchListBoxViewModel Anims { get; set; }
+//
+//         private string cachedPath;
+//         public string CachedPath
+//         {
+//             get => cachedPath;
+//             set => this.SetIfChanged(ref cachedPath, value);
+//         }
+//
+//
+//         public BeamEditViewModel()
+//         {
+//             anims = new List<string>();
+//
+//             Anims = new SearchListBoxViewModel();
+//             Anims.DataName = "Graphics:";
+//             //TODO: properly support beam/column anims
+//             //Anims.SelectedIndexChanged += Anims_SelectedIndexChanged;
+//
+//         }
+//
+//         public void LoadDataEntries(GraphicsManager.AssetType assetType, Window parent)
+//         {
+//             this.assetType = assetType;
+//             this.parent = parent;
+//
+//             //Anims.DataName = assetType.ToString() + ":";
+//             recomputeAnimList();
+//         }
+//
+//         private void recomputeAnimList()
+//         {
+//             lock (GameBase.lockObj)
+//             {
+//                 anims.Clear();
+//                 Anims.Clear();
+//                 string assetPattern = GraphicsManager.GetPattern(assetType);
+//                 string[] dirs = PathMod.GetModFiles(Path.GetDirectoryName(assetPattern), String.Format(Path.GetFileName(assetPattern), "*"));
+//                 for (int ii = 0; ii < dirs.Length; ii++)
+//                 {
+//                     string filename = Path.GetFileNameWithoutExtension(dirs[ii]);
+//                     anims.Add(filename);
+//                 }
+//                 Anims.SetItems(anims);
+//             }
+//         }
+//
+//         public async void mnuMassImport_Click()
+//         {
+//             await MessageBox.Show(parent, "Note: Importing a sprite to a slot that is already filled will automatically overwrite the old one.", "Mass Import", MessageBox.MessageBoxButtons.Ok);
+//
+//             //remember addresses in registry
+//             string folderName = DevForm.GetConfig(Name + "Dir", Directory.GetCurrentDirectory());
+//             
+//             //open window to choose directory
+//             IStorageFolder directory = await parent.StorageProvider.TryGetFolderFromPathAsync(folderName);
+//             await Dispatcher.UIThread.InvokeAsync(async () =>
+//             {
+//                 IReadOnlyList<IStorageFolder> results = await parent.StorageProvider.OpenFolderPickerAsync(
+//                     new FolderPickerOpenOptions
+//                     {
+//                         Title = "Select folder to mass import",
+//                         SuggestedStartLocation = directory,
+//                         AllowMultiple = false,
+//                     });
+//
+//                 if (results.Count <= 0)
+//                     return;
+//
+//                 string folder = results.First().Path.LocalPath;
+//                 
+//                 DevForm.SetConfig(Name + "Dir", folder);
+//                 CachedPath = folder + "/";
+//
+//                 try
+//                 {
+//                     lock (GameBase.lockObj)
+//                         MassImport(CachedPath);
+//                 }
+//                 catch (Exception ex)
+//                 {
+//                     DiagManager.Instance.LogError(ex, false);
+//                     await MessageBox.Show(parent, "Error importing from\n" + CachedPath + "\n\n" + ex.Message, "Import Failed", MessageBox.MessageBoxButtons.Ok);
+//                     return;
+//                 }
+//
+//             });
+//
+//         }
+//
+//         public async void mnuMassExport_Click()
+//         {
+//             //remember addresses in registry
+//             string folderName = DevForm.GetConfig(Name + "Dir", Directory.GetCurrentDirectory());
+//
+//             //open window to choose directory
+//             IStorageFolder directory = await parent.StorageProvider.TryGetFolderFromPathAsync(folderName);
+//             await Dispatcher.UIThread.InvokeAsync(async () =>
+//             {
+//                 IReadOnlyList<IStorageFolder> results = await parent.StorageProvider.OpenFolderPickerAsync(
+//                     new FolderPickerOpenOptions
+//                     {
+//                         Title = "Select folder to mass export to",
+//                         SuggestedStartLocation = directory,
+//                         AllowMultiple = false,
+//                     });
+//
+//                 if (results.Count <= 0)
+//                     return;
+//
+//                 string folder = results.First().Path.LocalPath;
+//                 DevForm.SetConfig(Name + "Dir", folder);
+//                 CachedPath = folder + "/";
+//
+//                 bool success = MassExport(CachedPath);
+//                 if (!success)
+//                     await MessageBox.Show(parent, "Errors found exporting to\n" + CachedPath + "\n\nCheck logs for more info.", "Mass Export Failed", MessageBox.MessageBoxButtons.Ok);
+//             });
+//         }
+//
+//         public async void btnImport_Click()
+//         {
+//             //remember addresses in registry
+//             string folderName = DevForm.GetConfig(Name + "Dir", Directory.GetCurrentDirectory());
+//
+//             //open window to choose directory
+//             IStorageFolder directory = await parent.StorageProvider.TryGetFolderFromPathAsync(folderName);
+//             await Dispatcher.UIThread.InvokeAsync(async () =>
+//             {
+//                 IReadOnlyList<IStorageFolder> results = await parent.StorageProvider.OpenFolderPickerAsync(
+//                     new FolderPickerOpenOptions
+//                     {
+//                         Title = "Select folder to import",
+//                         SuggestedStartLocation = directory,
+//                         AllowMultiple = false,
+//                     });
+//
+//                 if (results.Count <= 0)
+//                     return;
+//
+//                 string folder = results.First().Path.LocalPath;
+//                 string animName = Path.GetFileNameWithoutExtension(folder);
+//
+//                 if (anims.Contains(animName))
+//                 {
+//                     MessageBox.MessageBoxResult result = await MessageBox.Show(parent, "Are you sure you want to overwrite the existing sheet:\n" + animName, "Sprite Sheet already exists.",
+//                         MessageBox.MessageBoxButtons.YesNo);
+//                     if (result == MessageBox.MessageBoxResult.No)
+//                         return;
+//                 }
+//
+//                 DevForm.SetConfig(Name + "Dir", Path.GetDirectoryName(folder));
+//                 CachedPath = folder;
+//
+//                 try
+//                 {
+//                     Import(CachedPath);
+//                 }
+//                 catch (Exception ex)
+//                 {
+//                     DiagManager.Instance.LogError(ex, false);
+//                     await MessageBox.Show(parent, "Error importing from\n" + CachedPath + "\n\n" + ex.Message, "Import Failed", MessageBox.MessageBoxButtons.Ok);
+//                     return;
+//                 }
+//             });
+//         }
+//
+//         public async void btnReImport_Click()
+//         {
+//             try
+//             {
+//                 Import(CachedPath);
+//             }
+//             catch (Exception ex)
+//             {
+//                 DiagManager.Instance.LogError(ex, false);
+//                 await MessageBox.Show(parent, "Error importing from\n" + CachedPath + "\n\n" + ex.Message, "Import Failed", MessageBox.MessageBoxButtons.Ok);
+//                 return;
+//             }
+//         }
+//
+//         public async void btnExport_Click()
+//         {
+//             //get current sprite
+//             string animData = anims[Anims.InternalIndex];
+//
+//             //remember addresses in registry
+//             string folderName = DevForm.GetConfig(Name + "Dir", Directory.GetCurrentDirectory());
+//
+//             //open window to choose directory
+//             IStorageFolder directory = await parent.StorageProvider.TryGetFolderFromPathAsync(folderName);
+//             await Dispatcher.UIThread.InvokeAsync(async () =>
+//             {
+//                 IReadOnlyList<IStorageFolder> results = await parent.StorageProvider.OpenFolderPickerAsync(
+//                     new FolderPickerOpenOptions
+//                     {
+//                         Title = "Select folder to export to",
+//                         SuggestedStartLocation = directory,
+//                         AllowMultiple = false,
+//                     });
+//
+//                 if (results.Count <= 0)
+//                     return;
+//
+//                 string folder = results.First().Path.LocalPath;
+//                 DevForm.SetConfig(Name + "Dir", Path.GetDirectoryName(folder));
+//                 //CachedPath = folder;
+//
+//                 try
+//                 {
+//                     DevForm.ExecuteOrPend(() => { Export(folder, animData); });
+//                 }
+//                 catch (Exception ex)
+//                 {
+//                     DiagManager.Instance.LogError(ex, false);
+//                     await MessageBox.Show(parent, "Error exporting to\n" + CachedPath + "\n\n" + ex.Message, "Export Failed", MessageBox.MessageBoxButtons.Ok);
+//                     return;
+//                 }
+//             });
+//         }
+//
+//         public async void btnDelete_Click()
+//         {
+//             //get current sprite
+//             int animIdx = Anims.InternalIndex;
+//
+//             MessageBox.MessageBoxResult result = await MessageBox.Show(parent, "Are you sure you want to delete the following sheet:\n" + anims[animIdx], "Delete Sprite Sheet.",
+//                 MessageBox.MessageBoxButtons.YesNo);
+//             if (result == MessageBox.MessageBoxResult.No)
+//                 return;
+//
+//             Delete(animIdx);
+//         }
+//
+//
+//
+//         private void MassImport(string currentPath)
+//         {
+//             string assetPattern = GraphicsManager.GetPattern(assetType);
+//             if (!Directory.Exists(Path.GetDirectoryName(PathMod.HardMod(assetPattern))))
+//                 Directory.CreateDirectory(Path.GetDirectoryName(PathMod.HardMod(assetPattern)));
+//             ImportHelper.ImportAllBeams(currentPath, PathMod.HardMod(assetPattern));
+//
+//             GraphicsManager.RebuildIndices(assetType);
+//             GraphicsManager.ClearCaches(assetType);
+//
+//             DiagManager.Instance.LogInfo("Mass import complete.");
+//
+//             //recompute
+//             recomputeAnimList();
+//         }
+//
+//
+//         private void Import(string currentPath)
+//         {
+//             DevForm.ExecuteOrPend(() => { tryImport(currentPath); });
+//
+//             //recompute
+//             recomputeAnimList();
+//         }
+//
+//         private void tryImport(string currentPath)
+//         {
+//             lock (GameBase.lockObj)
+//             {
+//                 string animName = Path.GetFileNameWithoutExtension(currentPath);
+//                 string destFile = PathMod.HardMod(String.Format(GraphicsManager.GetPattern(assetType), animName));
+//                 if (!Directory.Exists(Path.GetDirectoryName(destFile)))
+//                     Directory.CreateDirectory(Path.GetDirectoryName(destFile));
+//
+//                 //write sprite data
+//                 using (BeamSheet sheet = BeamSheet.Import(currentPath + "/"))
+//                 {
+//                     using (FileStream stream = File.OpenWrite(destFile))
+//                     {
+//                         using (BinaryWriter writer = new BinaryWriter(stream))
+//                             sheet.Save(writer);
+//                     }
+//                 }
+//
+//                 GraphicsManager.RebuildIndices(assetType);
+//                 GraphicsManager.ClearCaches(assetType);
+//
+//                 DiagManager.Instance.LogInfo("Frames from:\n" +
+//                     currentPath + "\nhave been imported.");
+//             }
+//         }
+//
+//
+//         private bool MassExport(string currentPath)
+//         {
+//             bool success = true;
+//             string assetPattern = GraphicsManager.GetPattern(assetType);
+//             string[] dirs = PathMod.GetModFiles(Path.GetDirectoryName(assetPattern), String.Format(Path.GetFileName(assetPattern), "*"));
+//             for (int ii = 0; ii < dirs.Length; ii++)
+//             {
+//                 try
+//                 {
+//                     string filename = Path.GetFileNameWithoutExtension(dirs[ii]);
+//                     DevForm.ExecuteOrPend(() => { Export(currentPath + filename, filename); });
+//                 }
+//                 catch (Exception ex)
+//                 {
+//                     DiagManager.Instance.LogError(ex, false);
+//                     success = false;
+//                 }
+//             }
+//             return success;
+//         }
+//
+//         private void Export(string currentPath, string anim)
+//         {
+//             lock (GameBase.lockObj)
+//             {
+//                 if (!Directory.Exists(currentPath))
+//                     Directory.CreateDirectory(currentPath);
+//
+//                 string animPath = PathMod.ModPath(String.Format(GraphicsManager.GetPattern(assetType), anim));
+//                 if (File.Exists(animPath))
+//                 {
+//                     //read file and read binary data
+//                     using (FileStream fileStream = File.OpenRead(animPath))
+//                     {
+//                         using (BinaryReader reader = new BinaryReader(fileStream))
+//                         {
+//                             BeamSheet sheet = BeamSheet.Load(reader);
+//                             BeamSheet.Export(sheet, currentPath + "/");
+//                         }
+//                     }
+//                 }
+//
+//                 DiagManager.Instance.LogInfo("Frames from:\n" +
+//                     anim +
+//                     "\nhave been exported to:" + currentPath);
+//             }
+//         }
+//
+//
+//         private void Delete(int animIdx)
+//         {
+//             lock (GameBase.lockObj)
+//             {
+//                 string anim = anims[animIdx];
+//
+//                 string animPath = PathMod.ModPath(String.Format(GraphicsManager.GetPattern(assetType), anim));
+//                 if (File.Exists(animPath))
+//                     File.Delete(animPath);
+//
+//                 GraphicsManager.RebuildIndices(assetType);
+//                 GraphicsManager.ClearCaches(assetType);
+//
+//                 DiagManager.Instance.LogInfo("Deleted frames for:" + anim);
+//
+//                 anims.RemoveAt(animIdx);
+//                 Anims.RemoveInternalAt(animIdx);
+//             }
+//         }
+//
+//
+//         private void Anims_SelectedIndexChanged()
+//         {
+//             CachedPath = null;
+//             if (Anims.InternalIndex == -1)
+//                 return;
+//
+//             lock (GameBase.lockObj)
+//             {
+//                 if (DungeonScene.Instance != null)
+//                 {
+//                     DungeonScene.Instance.DebugAsset = assetType;
+//                     DungeonScene.Instance.DebugAnim = anims[Anims.InternalIndex];
+//                 }
+//             }
+//         }
+//     }
+// }
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/Content/SpeciesEditViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/Content/SpeciesEditViewModel.cs
deleted file mode 100644
index 01d340a7..00000000
--- a/RogueEssence.Editor.Avalonia/ViewModels/Content/SpeciesEditViewModel.cs
+++ /dev/null
@@ -1,803 +0,0 @@
-using Avalonia.Interactivity;
-using System;
-using System.Collections.Generic;
-using System.Text;
-using ReactiveUI;
-using System.Collections.ObjectModel;
-using Avalonia.Controls;
-using RogueEssence.Dungeon;
-using RogueEssence.Data;
-using RogueEssence.Content;
-using System.IO;
-using System.Linq;
-using Avalonia.Media.Imaging;
-using Avalonia.Platform.Storage;
-using Avalonia.Threading;
-using RogueElements;
-using RogueEssence.Dev.Views;
-
-namespace RogueEssence.Dev.ViewModels
-{
-    public class SpeciesOpContainer2
-    {
-        public Action CommandAction;
-        public CharSheetOp Op;
-        public string Name { get { return Op.Name; } }
-
-        public SpeciesOpContainer2(CharSheetOp op, Action command)
-        {
-            Op = op;
-            CommandAction = command;
-        }
-
-        public void Command()
-        {
-            CommandAction();
-        }
-    }
-
-    public class MonsterNodeViewModel2 : ViewModelBase
-    {
-
-        private bool filled;
-        public bool Filled
-        {
-            get => filled;
-            set => this.SetIfChanged(ref filled, value);
-        }
-
-        private string name;
-        public string Name
-        {
-            get => name;
-            set => this.SetIfChanged(ref name, value);
-        }
-
-        public CharID ID;
-
-        public ObservableCollection<MonsterNodeViewModel2> Nodes { get; }
-
-        public MonsterNodeViewModel2(string name, CharID id, bool filled)
-        {
-            this.name = name;
-            this.ID = id;
-            this.filled = filled;
-            Nodes = new ObservableCollection<MonsterNodeViewModel2>();
-        }
-
-    }
-
-    public class SpeciesEditViewModel2 : ViewModelBase
-    {
-
-        private bool checkSprites;
-        private bool notifiedImport;
-
-        private Window parent;
-
-
-        public string Name
-        {
-            get { return checkSprites ? GraphicsManager.AssetType.Chara.ToString() : GraphicsManager.AssetType.Portrait.ToString(); }
-            set { }
-        }
-
-        private List<string> monsterKeys;
-        private List<string> skinKeys;
-
-        public ObservableCollection<MonsterNodeViewModel2> Monsters { get; }
-        public ObservableCollection<SpeciesOpContainer2> OpList { get; }
-
-
-        private MonsterNodeViewModel2 chosenMonster;
-        public MonsterNodeViewModel2 ChosenMonster
-        {
-            get => chosenMonster;
-            set
-            {
-                this.SetIfChanged(ref chosenMonster, value);
-                CachedPath = null;
-            }
-        }
-
-        //ReImport enabled if CachedPath is not null
-
-        private string cachedPath;
-        public string CachedPath
-        {
-            get => cachedPath;
-            set => this.SetIfChanged(ref cachedPath, value);
-        }
-
-
-        public SpeciesEditViewModel2()
-        {
-            Monsters = new ObservableCollection<MonsterNodeViewModel2>();
-            OpList = new ObservableCollection<SpeciesOpContainer2>();
-        }
-
-
-        private bool hasSprite(CharaIndexNode parent, CharID id)
-        {
-            return GraphicsManager.GetFallbackForm(parent, id) == id;
-        }
-
-        private async void applyOpToCharSheet(CharSheetOp op)
-        {
-            //get current sprite
-            CharID currentForm = chosenMonster.ID;
-            string fileName = GetFilename(currentForm.Species);
-            if (!Directory.Exists(Path.GetDirectoryName(fileName)))
-                Directory.CreateDirectory(Path.GetDirectoryName(fileName));
-
-            if (!chosenMonster.Filled)
-            {
-                await MessageBox.Show(parent, String.Format("No graphics exist for {0}.", chosenMonster.Name), "Error", MessageBox.MessageBoxButtons.Ok);
-                return;
-            }
-
-            int[] animOptions = op.Anims;
-            int chosenAnim = -1;
-            if (animOptions.Length > 0)
-            {
-                AnimChoiceWindow window = new AnimChoiceWindow();
-                AnimChoiceViewModel viewModel = new AnimChoiceViewModel(animOptions);
-                window.DataContext = viewModel;
-
-                bool animResult = await window.ShowDialog<bool>(parent);
-                if (!animResult)
-                    return;
-                chosenAnim = animOptions[viewModel.ChosenAnim];
-            }
-
-            DevForm.ExecuteOrPend(() => { tryApplyOpToCharSheet(op, currentForm, fileName, chosenAnim); });
-        }
-
-        private void tryApplyOpToCharSheet(CharSheetOp op, CharID currentForm, string fileName, int chosenAnim)
-        {
-            lock (GameBase.lockObj)
-            {
-                CharSheet sheet = GraphicsManager.GetChara(currentForm);
-
-                op.Apply(sheet, chosenAnim);
-
-                //load data
-                Dictionary<CharID, byte[]> data = LoadSpeciesData(currentForm.Species);
-
-                //write sprite data
-                WriteSpeciesData(data, currentForm, sheet);
-
-                //save data
-                ImportHelper.SaveSpecies(fileName, data);
-
-                GraphicsManager.RebuildIndices(GraphicsManager.AssetType.Chara);
-                GraphicsManager.ClearCaches(GraphicsManager.AssetType.Chara);
-
-
-                DiagManager.Instance.LogInfo(String.Format("{0} applied to: {1}", op.Name, GetFormString(currentForm)));
-            }
-        }
-
-        public void LoadFormDataEntries(bool sprites, Window parent)
-        {
-            checkSprites = sprites;
-            this.parent = parent;
-            OpList.Add(new SpeciesOpContainer2(new CharSheetDummyOp("Export as Multi Sheet"), ExportMultiSheet));
-            if (sprites)
-            {
-                foreach (CharSheetOp op in DevDataManager.CharSheetOps)
-                    OpList.Add(new SpeciesOpContainer2(op, () => applyOpToCharSheet(op)));
-            }
-
-            monsterKeys = DataManager.Instance.DataIndices[DataManager.DataType.Monster].GetMappedKeys();
-            skinKeys = DataManager.Instance.DataIndices[DataManager.DataType.Skin].GetMappedKeys();
-
-            reloadFullList();
-        }
-
-
-        public async void mnuMassImport_Click()
-        {
-            await MessageBox.Show(parent, "Note: Importing a sprite to a slot that is already filled will automatically overwrite the old one.", "Mass Import", MessageBox.MessageBoxButtons.Ok);
-
-            //remember addresses in registry
-            string folderName = DevForm.GetConfig(Name + "Dir", Directory.GetCurrentDirectory());
-
-            //open window to choose directory
-            IStorageFolder directory = await parent.StorageProvider.TryGetFolderFromPathAsync(folderName);
-            await Dispatcher.UIThread.InvokeAsync(async () =>
-            {
-            
-                IReadOnlyList<IStorageFolder> results = await parent.StorageProvider.OpenFolderPickerAsync(
-                    new FolderPickerOpenOptions
-                    {
-                        Title = "Select sprite folder to mass import",
-                        SuggestedStartLocation = directory,
-                        AllowMultiple = false,
-                    });
-
-                if (results.Count <= 0)
-                    return;
-
-                string folder = results.First().Path.LocalPath;
-                
-                DevForm.SetConfig(Name + "Dir", folder);
-                CachedPath = folder + "/";
-
-                try
-                {
-                    MassImport(CachedPath);
-                }
-                catch (Exception ex)
-                {
-                    DiagManager.Instance.LogError(ex, false);
-                    await MessageBox.Show(parent, "Error importing from\n" + CachedPath + "\n\n" + ex.Message, "Import Failed", MessageBox.MessageBoxButtons.Ok);
-                    return;
-                }
-                
-
-
-            });
-        }
-
-        public void mnuMassExportMulti_Click()
-        {
-            MassExportFlow(false);
-        }
-        public void mnuMassExport_Click()
-        {
-            MassExportFlow(true);
-        }
-
-        public async void MassExportFlow(bool singleSheet)
-        {
-            //remember addresses in registry
-            string folderName = DevForm.GetConfig(Name + "Dir", Directory.GetCurrentDirectory());
-
-            //open window to choose directory
-            IStorageFolder directory = await parent.StorageProvider.TryGetFolderFromPathAsync(folderName);
-            await Dispatcher.UIThread.InvokeAsync(async () =>
-            {
-                IReadOnlyList<IStorageFolder> results = await parent.StorageProvider.OpenFolderPickerAsync(
-                    new FolderPickerOpenOptions
-                    {
-                        Title = "Select folder to mass export to",
-                        SuggestedStartLocation = directory,
-                        AllowMultiple = false,
-                    });
-
-                if (results.Count <= 0)
-                    return;
-
-                string folder = results.First().Path.LocalPath;
-                DevForm.SetConfig(Name + "Dir", folder);
-                CachedPath = folder + "/";
-
-                bool success = MassExport(CachedPath, singleSheet);
-                if (!success)
-                    await MessageBox.Show(parent, "Errors found exporting to\n" + CachedPath + "\n\nCheck logs for more info.", "Mass Export Failed", MessageBox.MessageBoxButtons.Ok);
-            });
-        }
-
-        public async void mnuReIndex_Click()
-        {
-            try
-            {
-                ReIndex();
-            }
-            catch (Exception ex)
-            {
-                DiagManager.Instance.LogError(ex, false);
-                await MessageBox.Show(parent, "Error when reindexing.\n\n" + ex.Message, "Reindex Failed", MessageBox.MessageBoxButtons.Ok);
-                return;
-            }
-        }
-
-
-        public async void btnImport_Click()
-        {
-            //get current sprite
-            CharID formdata = chosenMonster.ID;
-
-            if (chosenMonster.Filled)
-            {
-                MessageBox.MessageBoxResult result = await MessageBox.Show(parent, "Are you sure you want to overwrite the existing sheet:\n" + GetFormString(formdata), "Sprite Sheet already exists.",
-                    MessageBox.MessageBoxButtons.YesNo);
-                if (result == MessageBox.MessageBoxResult.No)
-                    return;
-            }
-
-            //notify (once) that sprites need to follow a rigid guideline
-            if (!notifiedImport)
-            {
-                await MessageBox.Show(parent, "When importing sprites, " +
-                    "make sure that all files in each folder adhere to the naming convention.", "Sprite Importing", MessageBox.MessageBoxButtons.Ok);
-                notifiedImport = true;
-            }
-
-            //remember addresses in registry
-            string folderName = DevForm.GetConfig(Name + "Dir", Directory.GetCurrentDirectory());
-
-            //open window to choose directory
-            IStorageFolder directory = await parent.StorageProvider.TryGetFolderFromPathAsync(folderName);
-            await Dispatcher.UIThread.InvokeAsync(async () =>
-            {
-                IReadOnlyList<IStorageFolder> results = await parent.StorageProvider.OpenFolderPickerAsync(
-                    new FolderPickerOpenOptions
-                    {
-                        Title = "Select folder to mass export to",
-                        SuggestedStartLocation = directory,
-                        AllowMultiple = false,
-                    });
-
-                if (results.Count <= 0)
-                    return;
-
-                string folder = results.First().Path.LocalPath;
-                DevForm.SetConfig(Name + "Dir", folder);
-                CachedPath = folder + "/";
-
-                try
-                {
-                    Import(CachedPath, formdata);
-                }
-                catch (Exception ex)
-                {
-                    DiagManager.Instance.LogError(ex, false);
-                    await MessageBox.Show(parent, "Error importing from\n" + CachedPath + "\n\n" + ex.Message, "Import Failed", MessageBox.MessageBoxButtons.Ok);
-                    return;
-                }
-            });
-        }
-
-        public async void btnReImport_Click()
-        {
-            try
-            {
-                Import(CachedPath, chosenMonster.ID);
-            }
-            catch (Exception ex)
-            {
-                DiagManager.Instance.LogError(ex, false);
-                await MessageBox.Show(parent, "Error importing from\n" + CachedPath + "\n\n" + ex.Message, "Import Failed", MessageBox.MessageBoxButtons.Ok);
-                return;
-            }
-        }
-
-        public void ExportMultiSheet()
-        {
-            ExportFlow(false);
-        }
-
-        public void btnExport_Click()
-        {
-            ExportFlow(true);
-        }
-
-        public async void ExportFlow(bool singleSheet)
-        {
-            //get current sprite
-            CharID formdata = chosenMonster.ID;
-
-            if (!chosenMonster.Filled)
-            {
-                await MessageBox.Show(parent, String.Format("No graphics exist for {0}.", chosenMonster.Name), "Error", MessageBox.MessageBoxButtons.Ok);
-                return;
-            }
-
-            //remember addresses in registry
-            string folderName = DevForm.GetConfig(Name + "Dir", Directory.GetCurrentDirectory());
-
-            //open window to choose directory
-            IStorageFolder directory = await parent.StorageProvider.TryGetFolderFromPathAsync(folderName);
-            await Dispatcher.UIThread.InvokeAsync(async () =>
-            {
-                IReadOnlyList<IStorageFolder> results = await parent.StorageProvider.OpenFolderPickerAsync(
-                    new FolderPickerOpenOptions
-                    {
-                        Title = "Select folder to export to",
-                        SuggestedStartLocation = directory,
-                        AllowMultiple = false,
-                    });
-
-                if (results.Count <= 0)
-                    return;
-
-                string folder = results.First().Path.LocalPath;
-                
-                DevForm.SetConfig(Name + "Dir", folder);
-                CachedPath = folder + "/";
-
-                try
-                {
-                    DevForm.ExecuteOrPend(() => { Export(CachedPath, formdata, singleSheet); });
-                }
-                catch (Exception ex)
-                {
-                    DiagManager.Instance.LogError(ex, false);
-                    await MessageBox.Show(parent, "Error exporting to\n" + CachedPath + "\n\n" + ex.Message, "Export Failed", MessageBox.MessageBoxButtons.Ok);
-                    return;
-                }
-            });
-        }
-
-        public async void btnDelete_Click()
-        {
-            if (!chosenMonster.Filled)
-            {
-                await MessageBox.Show(parent, String.Format("No graphics exist for {0}.", chosenMonster.Name), "Error", MessageBox.MessageBoxButtons.Ok);
-                return;
-            }
-
-            //get current sprite
-            CharID formdata = chosenMonster.ID;
-
-            MessageBox.MessageBoxResult result = await MessageBox.Show(parent, "Are you sure you want to delete the following sheet:\n" + GetFormString(formdata), "Delete Sprite Sheet.",
-                MessageBox.MessageBoxButtons.YesNo);
-            if (result == MessageBox.MessageBoxResult.No)
-                return;
-
-            Delete(formdata);
-        }
-
-
-
-
-        private void reloadFullList()
-        {
-            lock (GameBase.lockObj)
-            {
-                Monsters.Clear();
-                CharaIndexNode charaNode = GetIndexNode();
-                for (int ii = 0; ii < monsterKeys.Count; ii++)
-                {
-                    if (monsterKeys[ii] == null) // in case of non continuous index of Dex numbers
-                        continue;
-                    MonsterEntrySummary dex = (MonsterEntrySummary)DataManager.Instance.DataIndices[DataManager.DataType.Monster].Get(monsterKeys[ii]);
-
-                    CharID dexID = new CharID(ii, -1, -1, -1);
-                    MonsterNodeViewModel2 node = new MonsterNodeViewModel2("#" + ii.ToString() + ": " + dex.Name.ToLocal(), dexID, hasSprite(charaNode, dexID));
-                    for (int jj = 0; jj < dex.Forms.Count; jj++)
-                    {
-                        CharID formID = new CharID(ii, jj, -1, -1);
-                        MonsterNodeViewModel2 formNode = new MonsterNodeViewModel2("Form" + jj.ToString() + ": " + dex.Forms[jj].Name.ToLocal(), formID, hasSprite(charaNode, formID));
-                        for (int kk = 0; kk < skinKeys.Count; kk++)
-                        {
-                            SkinData skinData = DataManager.Instance.GetSkin(skinKeys[kk]);
-                            if (!skinData.Challenge)
-                            {
-                                CharID skinID = new CharID(ii, jj, kk, -1);
-                                MonsterNodeViewModel2 skinNode = new MonsterNodeViewModel2(skinData.Name.ToLocal(), skinID, hasSprite(charaNode, skinID));
-                                for (int mm = 0; mm < 3; mm++)
-                                {
-                                    CharID genderID = new CharID(ii, jj, kk, mm);
-                                    MonsterNodeViewModel2 genderNode = new MonsterNodeViewModel2(((Gender)mm).ToString(), genderID, hasSprite(charaNode, genderID));
-                                    skinNode.Nodes.Add(genderNode);
-                                }
-
-                                formNode.Nodes.Add(skinNode);
-                            }
-                        }
-
-                        node.Nodes.Add(formNode);
-                    }
-
-                    Monsters.Add(node);
-                }
-            }
-        }
-
-        private void MassImport(string currentPath)
-        {
-            DevForm.ExecuteOrPend(() => { tryMassImport(currentPath); });
-
-            reloadFullList();
-        }
-
-        private void tryMassImport(string currentPath)
-        {
-            lock (GameBase.lockObj)
-            {
-                string assetPattern = PathMod.HardMod(GetPattern());
-                if (!Directory.Exists(Path.GetDirectoryName(assetPattern)))
-                    Directory.CreateDirectory(Path.GetDirectoryName(assetPattern));
-
-                if (checkSprites)
-                    ImportHelper.ImportAllChars(currentPath, assetPattern);
-                else
-                    ImportHelper.ImportAllPortraits(currentPath, assetPattern);
-
-                GraphicsManager.RebuildIndices(GetAssetType());
-                GraphicsManager.ClearCaches(GetAssetType());
-
-                DiagManager.Instance.LogInfo("Mass import complete.");
-            }
-        }
-
-        private void ReIndex()
-        {
-            DevForm.ExecuteOrPend(() => { tryReIndex(); });
-
-            reloadFullList();
-        }
-
-        private void tryReIndex()
-        {
-            lock (GameBase.lockObj)
-            {
-                GraphicsManager.RebuildIndices(GetAssetType());
-                GraphicsManager.ClearCaches(GetAssetType());
-
-                DiagManager.Instance.LogInfo("All files re-indexed.");
-            }
-        }
-
-        private void Import(string currentPath, CharID currentForm)
-        {
-            DevForm.ExecuteOrPend(() => { tryImport(currentPath, currentForm); });
-
-            chosenMonster.Filled = true;
-        }
-
-        private void tryImport(string currentPath, CharID currentForm)
-        {
-            lock (GameBase.lockObj)
-            {
-                string fileName = GetFilename(currentForm.Species);
-                if (!Directory.Exists(Path.GetDirectoryName(fileName)))
-                    Directory.CreateDirectory(Path.GetDirectoryName(fileName));
-
-                //load data
-                Dictionary<CharID, byte[]> data = LoadSpeciesData(currentForm.Species);
-
-                //write sprite data
-                if (checkSprites)
-                    ImportHelper.BakeCharSheet(currentPath, data, currentForm);
-                else
-                    ImportHelper.BakePortrait(currentPath, data, currentForm);
-
-                //save data
-                ImportHelper.SaveSpecies(fileName, data);
-
-                GraphicsManager.RebuildIndices(GetAssetType());
-                GraphicsManager.ClearCaches(GetAssetType());
-
-
-                DiagManager.Instance.LogInfo("Frames from:\n" +
-                    currentPath +
-                    "\nhave been imported to:" + GetFormString(currentForm));
-            }
-        }
-
-
-        private bool MassExport(string currentPath, bool singleSheet)
-        {
-            bool success = true;
-            CharaIndexNode charaNode = GetIndexNode();
-            foreach (int ii in charaNode.Nodes.Keys)
-            {
-                CharID dexID = new CharID(ii, -1, -1, -1);
-
-                try
-                {
-                    DevForm.ExecuteOrPend(() => { Export(currentPath + ii.ToString("D4") + "/", dexID, singleSheet); });
-                }
-                catch (Exception ex)
-                {
-                    DiagManager.Instance.LogError(ex, false);
-                    success = false;
-                }
-
-                CharaIndexNode formNode = charaNode.Nodes[ii];
-                foreach (int jj in formNode.Nodes.Keys)
-                {
-                    CharID formID = new CharID(ii, jj, -1, -1);
-
-                    try
-                    {
-                        DevForm.ExecuteOrPend(() => { Export(currentPath + ii.ToString("D4") + "/" + jj.ToString("D4") + "/", formID, singleSheet); });
-                    }
-                    catch (Exception ex)
-                    {
-                        DiagManager.Instance.LogError(ex, false);
-                        success = false;
-                    }
-
-                    CharaIndexNode skinNode = formNode.Nodes[jj];
-                    foreach (int kk in skinNode.Nodes.Keys)
-                    {
-                        CharID skinID = new CharID(ii, jj, kk, -1);
-
-                        try
-                        {
-                            DevForm.ExecuteOrPend(() => { Export(currentPath + ii.ToString("D4") + "/" + jj.ToString("D4") + "/" + kk.ToString("D4") + "/", skinID, singleSheet); });
-                        }
-                        catch (Exception ex)
-                        {
-                            DiagManager.Instance.LogError(ex, false);
-                            success = false;
-                        }
-
-                        CharaIndexNode genderNode = skinNode.Nodes[kk];
-                        foreach (int mm in genderNode.Nodes.Keys)
-                        {
-                            CharID genderID = new CharID(ii, jj, kk, mm);
-
-                            try
-                            {
-                                DevForm.ExecuteOrPend(() => { Export(currentPath + ii.ToString("D4") + "/" + jj.ToString("D4") + "/" + kk.ToString("D4") + "/" + mm.ToString("D4") + "/", genderID, singleSheet); });
-                            }
-                            catch (Exception ex)
-                            {
-                                DiagManager.Instance.LogError(ex, false);
-                                success = false;
-                            }
-                        }
-                    }
-                }
-            }
-            return success;
-        }
-
-        private void Export(string currentPath, CharID currentForm, bool singleSheet)
-        {
-            lock (GameBase.lockObj)
-            {
-                if (!Directory.Exists(currentPath))
-                    Directory.CreateDirectory(currentPath);
-
-                CharID fallback = GraphicsManager.GetFallbackForm(GraphicsManager.CharaIndex, currentForm);
-                if (fallback == currentForm)
-                {
-                    if (checkSprites)
-                    {
-                        CharSheet sheet = GraphicsManager.GetChara(currentForm);
-                        CharSheet.Export(sheet, currentPath, singleSheet);
-                    }
-                    else
-                    {
-                        PortraitSheet sheet = GraphicsManager.GetPortrait(currentForm);
-                        PortraitSheet.Export(sheet, currentPath, singleSheet);
-                    }
-
-                    DiagManager.Instance.LogInfo("Frames from:\n" +
-                        GetFormString(currentForm) +
-                        "\nhave been exported to:" + currentPath);
-                }
-            }
-        }
-
-
-        private void Delete(CharID formdata)
-        {
-            DevForm.ExecuteOrPend(() => { tryDelete(formdata); });
-
-            chosenMonster.Filled = false;
-        }
-
-        private void tryDelete(CharID formdata)
-        {
-            lock (GameBase.lockObj)
-            {
-                string fileName = GetFilename(formdata.Species);
-                if (!Directory.Exists(Path.GetDirectoryName(fileName)))
-                    Directory.CreateDirectory(Path.GetDirectoryName(fileName));
-
-                Dictionary<CharID, byte[]> data = LoadSpeciesData(formdata.Species);
-
-                //delete sprite data
-                data.Remove(formdata);
-
-                //save data
-                ImportHelper.SaveSpecies(fileName, data);
-
-                GraphicsManager.RebuildIndices(GetAssetType());
-                GraphicsManager.ClearCaches(GetAssetType());
-
-                DiagManager.Instance.LogInfo("Deleted frames for:" + GetFormString(formdata));
-            }
-        }
-
-        private void WriteSpeciesData(Dictionary<CharID, byte[]> spriteData, CharID formData, CharSheet sprite)
-        {
-            using (MemoryStream stream = new MemoryStream())
-            {
-                using (BinaryWriter writer = new BinaryWriter(stream))
-                    sprite.Save(writer);
-
-                byte[] writingBytes = stream.ToArray();
-                spriteData[formData] = writingBytes;
-            }
-        }
-
-        private Dictionary<CharID, byte[]> LoadSpeciesData(int num)
-        {
-            Dictionary<CharID, byte[]> dict = new Dictionary<CharID, byte[]>();
-
-            CharaIndexNode charaNode = GetIndexNode();
-
-            if (charaNode.Nodes.ContainsKey(num))
-            {
-                if (charaNode.Nodes[num].Position > 0)
-                    LoadSpeciesFormData(dict, new CharID(num, -1, -1, -1));
-
-                foreach (int form in charaNode.Nodes[num].Nodes.Keys)
-                {
-                    if (charaNode.Nodes[num].Nodes[form].Position > 0)
-                        LoadSpeciesFormData(dict, new CharID(num, form, -1, -1));
-
-                    foreach (int skin in charaNode.Nodes[num].Nodes[form].Nodes.Keys)
-                    {
-                        if (charaNode.Nodes[num].Nodes[form].Nodes[skin].Position > 0)
-                            LoadSpeciesFormData(dict, new CharID(num, form, skin, -1));
-
-                        foreach (int gender in charaNode.Nodes[num].Nodes[form].Nodes[skin].Nodes.Keys)
-                        {
-                            if (charaNode.Nodes[num].Nodes[form].Nodes[skin].Nodes[gender].Position > 0)
-                                LoadSpeciesFormData(dict, new CharID(num, form, skin, gender));
-                        }
-                    }
-                }
-            }
-
-            return dict;
-        }
-
-        private void LoadSpeciesFormData(Dictionary<CharID, byte[]> data, CharID formData)
-        {
-            using (MemoryStream stream = new MemoryStream())
-            {
-                using (BinaryWriter writer = new BinaryWriter(stream))
-                {
-                    if (checkSprites)
-                        GraphicsManager.GetChara(formData).Save(writer);
-                    else
-                        GraphicsManager.GetPortrait(formData).Save(writer);
-                }
-                byte[] writingBytes = stream.ToArray();
-                data[formData] = writingBytes;
-            }
-        }
-
-        private string GetFormString(CharID formdata)
-        {
-            string name = DataManager.Instance.DataIndices[DataManager.DataType.Monster].Get(monsterKeys[formdata.Species]).Name.ToLocal();
-            if (formdata.Form > -1)
-                name += ", " + DataManager.Instance.GetMonster(monsterKeys[formdata.Species]).Forms[formdata.Form].FormName.ToLocal() + " form";
-            if (formdata.Skin > -1)
-                name += ", " + DataManager.Instance.DataIndices[DataManager.DataType.Skin].Get(skinKeys[formdata.Skin]).Name.ToLocal() + " skin";
-            if (formdata.Gender > -1)
-                name += ", " + (Gender)formdata.Gender + " gender";
-            return name;
-        }
-
-        private CharaIndexNode GetIndexNode()
-        {
-            if (checkSprites)
-                return GraphicsManager.CharaIndex;
-            else
-                return GraphicsManager.PortraitIndex;
-        }
-
-        private string GetFilename(int num)
-        {
-            return PathMod.HardMod(String.Format(GetPattern(), num));
-        }
-
-        private string GetPattern()
-        {
-            if (checkSprites)
-                return GraphicsManager.CHARA_PATTERN;
-            else
-                return GraphicsManager.PORTRAIT_PATTERN;
-        }
-
-        private GraphicsManager.AssetType GetAssetType()
-        {
-            if (checkSprites)
-                return GraphicsManager.AssetType.Chara;
-            else
-                return GraphicsManager.AssetType.Portrait;
-        }
-    }
-}
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/Content/StringsEditViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/Content/StringsEditViewModel.cs
deleted file mode 100644
index e2f21e53..00000000
--- a/RogueEssence.Editor.Avalonia/ViewModels/Content/StringsEditViewModel.cs
+++ /dev/null
@@ -1,200 +0,0 @@
-using Avalonia.Interactivity;
-using System;
-using System.Collections.Generic;
-using System.Text;
-using ReactiveUI;
-using System.Collections.ObjectModel;
-using Avalonia.Controls;
-using RogueEssence.Dungeon;
-using RogueEssence.Data;
-using RogueEssence.Content;
-using System.IO;
-using Avalonia.Media.Imaging;
-using RogueElements;
-using RogueEssence.Dev.Views;
-using RogueEssence.Script;
-using DynamicData;
-using Microsoft.VisualBasic;
-using static RogueEssence.Content.GraphicsManager;
-
-namespace RogueEssence.Dev.ViewModels
-{
-    public class StringsEditViewModel : ViewModelBase
-    {
-        private bool stringsEx;
-        private Window parent;
-
-        public string Name { get { return stringsEx ? "stringsEx" : "strings"; } }
-
-
-        // Later: implement variable length columns workaround https://github.com/AvaloniaUI/Avalonia/issues/2781
-        public ObservableCollection<MapString> GameStrings { get; set; }
-
-        private int currentString;
-        public int CurrentString
-        {
-            get { return currentString; }
-            set
-            {
-                this.SetIfChanged(ref currentString, value);
-            }
-        }
-
-
-        public void btnAddString_Click()
-        {
-            string defname = String.Format("String_{0}", GameStrings.Count);
-            //if (CurrentString > -1)
-            //    GameStrings.Insert(CurrentString, new MapString(defname, "", ""));
-            //else
-            GameStrings.Add(new MapString(defname, "", ""));
-        }
-        public void btnDeleteString_Click()
-        {
-            GameStrings.RemoveAt(CurrentString);
-        }
-
-
-        public StringsEditViewModel()
-        {
-            GameStrings = new ObservableCollection<MapString>();
-        }
-
-        public void LoadStringEntries(bool stringsEx, Window parent)
-        {
-            this.stringsEx = stringsEx;
-            this.parent = parent;
-
-            LoadStrings();
-        }
-
-
-
-
-        public void btnAdd_Click()
-        {
-            string defname = String.Format("STRING_{0}", GameStrings.Count);
-            GameStrings.Add(new MapString(defname, "", ""));
-            CurrentString = GameStrings.Count - 1;
-        }
-        public void btnDelete_Click()
-        {
-            GameStrings.RemoveAt(CurrentString);
-        }
-
-        public void btnSave_Click()
-        {
-            SaveStrings();
-        }
-
-
-        /// <summary>
-        /// Loads the strings files content into the data grid view for editing
-        /// </summary>
-        /// <param name="stringsdir">Directory in which string resx files are stored!</param>
-        public void LoadStrings()
-        {
-            populateStringTable(GameStrings, false);
-        }
-
-        private void populateStringTable(IList<MapString> strings, bool skipTopMod)
-        {
-            string stringsdir = "Strings/";
-            //Clear old strings
-            Dictionary<string, Dictionary<string, (string val, string comment)>> rawStrings = new Dictionary<string, Dictionary<string, (string, string)>>();
-
-
-            string FMTStr = String.Format("{0}{1}{2}", Name, "{0}", Text.STRINGS_FILE_EXT);
-            foreach (string code in Text.SupportedLangs)
-            {
-                string fname = String.Format(FMTStr, code == "en" ? "" : ("." + code));//special case for english, which is default
-                string path = Path.Combine(stringsdir, fname);
-
-                bool first = true;
-                foreach (string modPath in PathMod.FallbackPaths(path))
-                {
-                    if (first && skipTopMod)
-                    {
-                        first = false;
-                        continue;
-                    }
-                    Dictionary<string, (string val, string comment)> xmlDict = Text.LoadDevStringResx(modPath);
-                    foreach (string name in xmlDict.Keys)
-                    {
-                        if (!rawStrings.ContainsKey(name))
-                            rawStrings.Add(name, new Dictionary<string, (string val, string comment)>());
-
-                        if (!rawStrings[name].ContainsKey(code))
-                            rawStrings[name].Add(code, xmlDict[name]);
-                    }
-                    first = false;
-                }
-            }
-
-            strings.Clear();
-            foreach (string key in rawStrings.Keys)
-            {
-                Dictionary<string, string> comments = new Dictionary<string, string>();
-                Dictionary<string, string> vals = new Dictionary<string, string>();
-                foreach (string name in rawStrings[key].Keys)
-                {
-                    comments[name] = rawStrings[key][name].comment;
-                    vals[name] = rawStrings[key][name].val;
-                }
-                strings.Add(new MapString(key, comments, vals));
-            }
-        }
-
-        /// <summary>
-        /// Writes the content of the dataview into a set of resx files for each languages
-        /// </summary>
-        public void SaveStrings()
-        {
-            string stringsdir = "Strings/";
-
-            string FMTStr = String.Format("{0}{1}{2}", Name, "{0}", Text.STRINGS_FILE_EXT);
-            foreach (string code in Text.SupportedLangs)
-            {
-                string fname = String.Format(FMTStr, code == "en" ? "" : ("." + code));//special case for english, which is default
-                string path = Path.Combine(stringsdir, fname);
-                string modPath = PathMod.HardMod(path);
-                Dictionary<string, (string val, string comment)> stringDict = new Dictionary<string, (string val, string comment)>();
-                List<MapString> baseStrings = new List<MapString>();
-                populateStringTable(baseStrings, true);
-
-                foreach (MapString str in GameStrings)
-                {
-                    string cm, tl;
-                    if (!str.Comments.TryGetValue(code, out cm))
-                        cm = "";
-                    if (!str.Translations.TryGetValue(code, out tl))
-                        tl = "";
-                    if (tl != "" || code == "en")
-                        stringDict[str.Key] = (tl, cm);
-                }
-
-                //remove the ones identical to baseStrings
-                foreach (MapString str in baseStrings)
-                {
-                    string cm, tl;
-                    if (!str.Comments.TryGetValue(code, out cm))
-                        cm = "";
-                    if (!str.Translations.TryGetValue(code, out tl))
-                        tl = "";
-                    (string val, string comment) item;
-                    if (stringDict.TryGetValue(str.Key, out item))
-                    {
-                        if (item.val == tl && item.comment == cm)
-                            stringDict.Remove(str.Key);
-                    }
-                }
-
-                Text.SaveStringResx(modPath, stringDict);
-
-
-                lock (GameBase.lockObj)
-                    Text.SetCultureCode(DiagManager.Instance.CurSettings.Language);
-            }
-        }
-    }
-}
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/Content/TilesetEditViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/Content/TilesetEditViewModel.cs
deleted file mode 100644
index 9af94275..00000000
--- a/RogueEssence.Editor.Avalonia/ViewModels/Content/TilesetEditViewModel.cs
+++ /dev/null
@@ -1,431 +0,0 @@
-using Avalonia.Interactivity;
-using System;
-using System.Collections.Generic;
-using System.Text;
-using ReactiveUI;
-using System.Collections.ObjectModel;
-using Avalonia.Controls;
-using RogueEssence.Dungeon;
-using RogueEssence.Data;
-using RogueEssence.Content;
-using System.IO;
-using System.Linq;
-using Avalonia.Media.Imaging;
-using RogueElements;
-using RogueEssence.Dev.Views;
-using Avalonia.Platform.Storage;
-using Avalonia.Threading;
-
-namespace RogueEssence.Dev.ViewModels
-{
-    public class TilesetEditViewModel : ViewModelBase
-    {
-        private Window parent;
-
-        private List<string> tileIndices;
-        public SearchListBoxViewModel Tilesets { get; set; }
-
-        private string cachedPath;
-        public string CachedPath
-        {
-            get => cachedPath;
-            set => this.SetIfChanged(ref cachedPath, value);
-        }
-        private int cachedSize;
-
-
-        public TilesetEditViewModel()
-        {
-            tileIndices = new List<string>();
-
-            Tilesets = new SearchListBoxViewModel();
-            Tilesets.DataName = "Tilesets:";
-
-        }
-
-        public void LoadDataEntries(Window parent)
-        {
-            this.parent = parent;
-
-            reloadFullList();
-        }
-
-        private void reloadFullList()
-        {
-            lock (GameBase.lockObj)
-            {
-                tileIndices.Clear();
-                Tilesets.Clear();
-
-                foreach (string name in GraphicsManager.TileIndex.Nodes.Keys)
-                    tileIndices.Add(name);
-                Tilesets.SetItems(tileIndices);
-            }
-        }
-
-        public async void mnuMassImport_Click()
-        {
-            await MessageBox.Show(parent, "Note: Importing a tileset to a slot that is already filled will automatically overwrite the old one.", "Mass Import", MessageBox.MessageBoxButtons.Ok);
-
-            //remember addresses in registry
-            string folderName = DevForm.GetConfig("TilesetDir", Directory.GetCurrentDirectory());
-
-            //open window to choose directory
-            IStorageFolder directory = await parent.StorageProvider.TryGetFolderFromPathAsync(folderName);
-            await Dispatcher.UIThread.InvokeAsync(async () =>
-            {
-                IReadOnlyList<IStorageFolder> results = await parent.StorageProvider.OpenFolderPickerAsync(
-                    new FolderPickerOpenOptions
-                    {
-                        Title = "Select tileset folder to mass import",
-                        SuggestedStartLocation = directory,
-                        AllowMultiple = false,
-                    });
-
-                if (results.Count <= 0)
-                    return;
-
-                string folder = results.First().Path.LocalPath;
-                
-                MapRetileWindowView window = new MapRetileWindowView();
-                MapRetileViewModel viewModel = new MapRetileViewModel(GraphicsManager.TileSize, "Tile size must be divisible by 8.");
-                window.DataContext = viewModel;
-
-                bool sizeResult = await window.ShowDialog<bool>(parent);
-                int size = viewModel.TileSize;
-
-                if (!sizeResult || size == 0)
-                    return;
-
-                DevForm.SetConfig("TilesetDir", folder);
-                CachedPath = folder + "/";
-                cachedSize = size;
-
-                try
-                {
-                    MassImport(CachedPath, cachedSize);
-                }
-                catch (Exception ex)
-                {
-                    DiagManager.Instance.LogError(ex, false);
-                    await MessageBox.Show(parent, "Error importing from\n" + CachedPath + "\n\n" + ex.Message, "Import Failed", MessageBox.MessageBoxButtons.Ok);
-                    return;
-                }
-            });
-        }
-
-
-        public async void mnuMassExport_Click()
-        {
-            //remember addresses in registry
-            string folderName = DevForm.GetConfig("TilesetDir", Directory.GetCurrentDirectory());
-
-   
-            //open window to choose directory
-            IStorageFolder directory = await parent.StorageProvider.TryGetFolderFromPathAsync(folderName);
-            await Dispatcher.UIThread.InvokeAsync(async () =>
-            {
-                IReadOnlyList<IStorageFolder> results = await parent.StorageProvider.OpenFolderPickerAsync(
-                    new FolderPickerOpenOptions
-                    {
-                        Title = "Select folder to mass export to",
-                        SuggestedStartLocation = directory,
-                        AllowMultiple = false,
-                    });
-
-                if (results.Count <= 0)
-                    return;
-
-                string folder = results.First().Path.LocalPath;
-                DevForm.SetConfig("TilesetDir", folder);
-                CachedPath = folder + "/";
-
-                bool success = MassExport(CachedPath);
-                if (!success)
-                    await MessageBox.Show(parent, "Errors found exporting to\n" + CachedPath + "\n\nCheck logs for more info.", "Mass Export Failed", MessageBox.MessageBoxButtons.Ok);
-            });
-        }
-
-        
-        public async void mnuReIndex_Click()
-        {
-            try
-            {
-                ReIndex();
-            }
-            catch (Exception ex)
-            {
-                DiagManager.Instance.LogError(ex, false);
-                await MessageBox.Show(parent, "Error when reindexing.\n\n" + ex.Message, "Reindex Failed", MessageBox.MessageBoxButtons.Ok);
-                return;
-            }
-        }
-
-        public async void btnImport_Click()
-        {
-            //remember addresses in registry
-            string folderName = DevForm.GetConfig("TilesetDir", Directory.GetCurrentDirectory());
-
-            //open window to choose directory
-            IStorageFolder directory = await parent.StorageProvider.TryGetFolderFromPathAsync(folderName);
-            await Dispatcher.UIThread.InvokeAsync(async () =>
-            {
-                IReadOnlyList<IStorageFile> results = await parent.StorageProvider.OpenFilePickerAsync(new FilePickerOpenOptions 
-                    {
-                        Title = "Open .png File",
-                        SuggestedStartLocation = directory,
-                        AllowMultiple = false,
-                        FileTypeFilter =
-                        [
-                            new FilePickerFileType("PNG Files")
-                            {
-                                Patterns = ["*.PNG"]
-                            }
-                        ]
-                    }
-                );
-
-
-
-                if (results.Count <= 0)
-                    return;
-
-                string animName = Path.GetFileNameWithoutExtension(results.First().Path.LocalPath);
-
-                if (tileIndices.Contains(animName))
-                {
-                    MessageBox.MessageBoxResult result = await MessageBox.Show(parent,
-                        "Are you sure you want to overwrite the existing sheet:\n" + animName,
-                        "Sprite Sheet already exists.",
-                        MessageBox.MessageBoxButtons.YesNo);
-                    if (result == MessageBox.MessageBoxResult.No)
-                        return;
-                }
-
-                MapRetileWindowView window = new MapRetileWindowView();
-                MapRetileViewModel viewModel =
-                    new MapRetileViewModel(GraphicsManager.TileSize, "Tile size must be divisible by 8.");
-                window.DataContext = viewModel;
-
-                bool sizeResult = await window.ShowDialog<bool>(parent);
-                int size = viewModel.TileSize;
-
-                if (!sizeResult || size == 0)
-                    return;
-
-                DevForm.SetConfig("TilesetDir", Path.GetDirectoryName(results.First().Path.LocalPath));
-                CachedPath = results.First().Path.LocalPath;
-                cachedSize = size;
-                
-                try
-                {
-                    Import(CachedPath, cachedSize);
-                }
-                catch (Exception ex)
-                {
-                    DiagManager.Instance.LogError(ex, false);
-                    await MessageBox.Show(parent, "Error importing from\n" + CachedPath + "\n\n" + ex.Message,
-                        "Import Failed", MessageBox.MessageBoxButtons.Ok);
-                    return;
-                }
-            });
-        }
-
-        public async void btnReImport_Click()
-        {
-            try
-            {
-                Import(CachedPath, cachedSize);
-            }
-            catch (Exception ex)
-            {
-                DiagManager.Instance.LogError(ex, false);
-                await MessageBox.Show(parent, "Error importing from\n" + CachedPath + "\n\n" + ex.Message, "Import Failed", MessageBox.MessageBoxButtons.Ok);
-                return;
-            }
-        }
-
-        public async void btnExport_Click()
-        {
-            //get current sprite
-            string animData = tileIndices[Tilesets.InternalIndex];
-
-            //remember addresses in registry
-            string folderName = DevForm.GetConfig("TilesetDir", Directory.GetCurrentDirectory());
-
-            SaveFileDialog saveFileDialog = new SaveFileDialog();
-            saveFileDialog.Directory = folderName;
-
-            FileDialogFilter filter = new FileDialogFilter();
-            filter.Name = "PNG Files";
-            filter.Extensions.Add("png");
-            saveFileDialog.Filters.Add(filter);
-
-            string folder = await saveFileDialog.ShowAsync(parent);
-
-            if (!String.IsNullOrEmpty(folder))
-            {
-                DevForm.SetConfig("TilesetDir", Path.GetDirectoryName(folder));
-                //CachedPath = folder;
-
-                try
-                {
-                    DevForm.ExecuteOrPend(() => { Export(folder, animData); });
-                }
-                catch (Exception ex)
-                {
-                    DiagManager.Instance.LogError(ex, false);
-                    await MessageBox.Show(parent, "Error exporting to\n" + CachedPath + "\n\n" + ex.Message, "Export Failed", MessageBox.MessageBoxButtons.Ok);
-                    return;
-                }
-            }
-        }
-
-
-        public async void btnDelete_Click()
-        {
-            //get current sprite
-            int animIdx = Tilesets.InternalIndex;
-
-            MessageBox.MessageBoxResult result = await MessageBox.Show(parent, "Are you sure you want to delete the following sheet:\n" + tileIndices[animIdx], "Delete Sprite Sheet.",
-                MessageBox.MessageBoxButtons.YesNo);
-            if (result == MessageBox.MessageBoxResult.No)
-                return;
-
-            DevForm.ExecuteOrPend(() => { Delete(animIdx); });
-        }
-
-
-
-        private void MassImport(string currentPath, int tileSize)
-        {
-            DevForm.ExecuteOrPend(() => { tryMassImport(currentPath, tileSize); });
-
-            //recompute
-            reloadFullList();
-        }
-        private void tryMassImport(string currentPath, int tileSize)
-        {
-            lock (GameBase.lockObj)
-            {
-                if (!Directory.Exists(Path.GetDirectoryName(PathMod.HardMod(GraphicsManager.TILE_PATTERN))))
-                    Directory.CreateDirectory(Path.GetDirectoryName(PathMod.HardMod(GraphicsManager.TILE_PATTERN)));
-
-                ImportHelper.ImportAllTiles(currentPath, PathMod.HardMod(GraphicsManager.TILE_PATTERN), tileSize);
-
-                GraphicsManager.RebuildIndices(GraphicsManager.AssetType.Tile);
-                GraphicsManager.ClearCaches(GraphicsManager.AssetType.Tile);
-
-                DiagManager.Instance.LogInfo("Mass import complete.");
-            }
-        }
-
-        private void ReIndex()
-        {
-            DevForm.ExecuteOrPend(() => { tryReIndex(); });
-
-            reloadFullList();
-        }
-
-        private void tryReIndex()
-        {
-            lock (GameBase.lockObj)
-            {
-                GraphicsManager.RebuildIndices(GraphicsManager.AssetType.Tile);
-                GraphicsManager.ClearCaches(GraphicsManager.AssetType.Tile);
-
-                DiagManager.Instance.LogInfo("All files re-indexed.");
-            }
-        }
-
-        private void Import(string currentPath, int tileSize)
-        {
-            DevForm.ExecuteOrPend(() => { tryImport(currentPath, tileSize); });
-
-            //recompute
-            reloadFullList();
-        }
-
-        private void tryImport(string currentPath, int tileSize)
-        {
-            lock (GameBase.lockObj)
-            {
-                string sheetName = Path.GetFileNameWithoutExtension(currentPath);
-                string outputFile = PathMod.HardMod(String.Format(GraphicsManager.TILE_PATTERN, sheetName));
-
-                if (!Directory.Exists(Path.GetDirectoryName(outputFile)))
-                    Directory.CreateDirectory(Path.GetDirectoryName(outputFile));
-
-                //load into tilesets
-                using (BaseSheet tileset = BaseSheet.Import(currentPath))
-                {
-                    List<BaseSheet[]> tileList = new List<BaseSheet[]>();
-                    tileList.Add(new BaseSheet[] { tileset });
-                    ImportHelper.SaveTileSheet(tileList, outputFile, tileSize);
-                }
-
-                GraphicsManager.RebuildIndices(GraphicsManager.AssetType.Tile);
-                GraphicsManager.ClearCaches(GraphicsManager.AssetType.Tile);
-                DevDataManager.ClearCaches();
-
-                DiagManager.Instance.LogInfo("Tiles from:\n" +
-                    currentPath + "\nhave been imported.");
-            }
-        }
-
-        private bool MassExport(string currentPath)
-        {
-            bool success = true;
-            string[] dirs = PathMod.GetModFiles(Path.GetDirectoryName(GraphicsManager.TILE_PATTERN), String.Format(Path.GetFileName(GraphicsManager.TILE_PATTERN), "*"));
-            for (int ii = 0; ii < dirs.Length; ii++)
-            {
-                try
-                {
-                    string filename = Path.GetFileNameWithoutExtension(dirs[ii]);
-                    DevForm.ExecuteOrPend(() => { Export(Path.Combine(currentPath, filename + ".png"), filename); });
-                }
-                catch (Exception ex)
-                {
-                    DiagManager.Instance.LogError(ex, false);
-                    success = false;
-                }
-            }
-            return success;
-        }
-
-        private void Export(string currentPath, string anim)
-        {
-            lock (GameBase.lockObj)
-            {
-                string animPath = PathMod.ModPath(String.Format(GraphicsManager.TILE_PATTERN, anim));
-                ImportHelper.ExportTileSheet(animPath, currentPath);
-
-                DiagManager.Instance.LogInfo("Frames from:\n" +
-                    anim + "\nhave been exported to:" + currentPath);
-            }
-        }
-
-
-
-        private void Delete(int animIdx)
-        {
-            lock (GameBase.lockObj)
-            {
-                string anim = tileIndices[animIdx];
-
-                string animPath = PathMod.ModPath(String.Format(GraphicsManager.TILE_PATTERN, anim));
-                if (File.Exists(animPath))
-                    File.Delete(animPath);
-
-                GraphicsManager.RebuildIndices(GraphicsManager.AssetType.Tile);
-                GraphicsManager.ClearCaches(GraphicsManager.AssetType.Tile);
-
-                DiagManager.Instance.LogInfo("Deleted frames for:" + anim);
-
-                tileIndices.RemoveAt(animIdx);
-                Tilesets.RemoveInternalAt(animIdx);
-            }
-        }
-
-    }
-}
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevFormViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevFormViewModel.cs
index 7beda25a..4ddd960b 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevFormViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevFormViewModel.cs
@@ -1,39 +1,796 @@
-// using System;
-// using System.Collections.Generic;
-// using System.Text;
-// using RogueEssence;
-// using RogueEssence.Dungeon;
-// using RogueEssence.Ground;
-// using RogueEssence.Data;
-//
-// namespace RogueEssence.Dev.ViewModels
-// {
-//     public class DevFormViewModel : ViewModelBase
-//     {
-//         public DevFormViewModel()
-//         {
-//             Game = new DevTabGameViewModel();
-//             Player = new DevTabPlayerViewModel();
-//             Data = new DevTabDataViewModel();
-//             Travel = new DevTabTravelViewModel();
-//             Sprites = new DevTabSpritesViewModel();
-//             Script = new DevTabScriptViewModel();
-//             Mods = new DevTabModsViewModel();
-//             Constants = new DevTabConstantsViewModel();
-//         }
-//
-//         public DevTabGameViewModel Game { get; set; }
-//         public DevTabPlayerViewModel Player { get; set; }
-//         public DevTabDataViewModel Data { get; set; }
-//         public DevTabTravelViewModel Travel { get; set; }
-//         public DevTabSpritesViewModel Sprites { get; set; }
-//         public DevTabScriptViewModel Script { get; set; }
-//         public DevTabModsViewModel Mods { get; set; }
-//         public DevTabConstantsViewModel Constants { get; set; }
-//
-//
-//
-//
-//
-//     }
-// }
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Collections.Specialized;
+using System.IO;
+using System.Linq;
+using System.Reactive;
+using System.Reactive.Linq;
+using System.Threading.Tasks;
+using Avalonia.Controls;
+using Avalonia.Controls.Models.TreeDataGrid;
+using Avalonia.Threading;
+using RogueEssence.Dev.Models;
+using RogueEssence.Dev.Services;
+using ReactiveUI;
+using RogueEssence.Content;
+using RogueEssence.Data;
+using RogueEssence.Dev.Utility;
+using RogueEssence.Dev.Views;
+using RogueEssence.Dungeon;
+using RogueEssence.Menu;
+using RogueEssence.Script;
+
+namespace RogueEssence.Dev.ViewModels;
+
+public class DevFormViewModel : ViewModelBase
+{
+    private HierarchicalTreeDataGridSource<NodeBase> _nodeSource;
+
+    public HierarchicalTreeDataGridSource<NodeBase> NodeSource
+    {
+        get => _nodeSource;
+        set => this.RaiseAndSetIfChanged(ref _nodeSource, value);
+    }
+
+    public DevTabGameViewModel Game { get; set; }
+    public DevTabPlayerViewModel Player { get; set; }
+    public DevTabTravelViewModel Travel { get; set; }
+    public DevTabScriptViewModel Script { get; set; }
+
+    public ModManagerViewModel ModsManager { get; set; }
+    
+ 
+
+    private bool _isTreeView;
+
+    public bool IsTreeView
+    {
+        get => _isTreeView;
+        set { this.RaiseAndSetIfChanged(ref _isTreeView, value); }
+    }
+
+    public void OpenTabSwitcher()
+    {
+        TabSwitcher = _context.PageFactory.GetRequiredService<TabSwitcherViewModel>();
+    }
+
+    public event Action? TabSwitcherClosed;
+
+    public void CloseTabSwitcher()
+    {
+        TabSwitcher = null;
+        TabSwitcherClosed?.Invoke();
+    }
+
+    public void OnModSwitcherOpened()
+    {
+        if (ModSwitcher == null)
+        {
+            // TODO: Doesn't look ideal
+            ModSwitcher = _context.PageFactory.GetRequiredService<ModSwitcherViewModel>();
+        }
+    }
+
+
+    public event Action? ModSwitcherClosed;
+
+    public void OnModSwitcherClosed()
+    {
+        if (ModSwitcher != null)
+        {
+            ModSwitcher = null;
+            ModSwitcherClosed?.Invoke();
+        }
+    }
+
+
+    private string _filter = "";
+
+    public string Filter
+    {
+        get { return _filter; }
+        set { this.RaiseAndSetIfChanged(ref _filter, value); }
+    }
+
+
+    private void ApplyFilter(string filter)
+    {
+        Dispatcher.UIThread.Post(() =>
+        {
+            foreach (var node in Nodes)
+            {
+                NodeHelper.FilterRecursive(node, filter, new BeginningTitleFilterStrategy());
+            }
+
+            RefreshTreeDataGrid();
+        });
+    }
+
+    private void RefreshTreeDataGrid()
+    {
+        NodeSource = new HierarchicalTreeDataGridSource<NodeBase>(Nodes)
+        {
+            Columns =
+            {
+                new HierarchicalExpanderColumn<NodeBase>(
+                    new TemplateColumn<NodeBase>(
+                        null,
+                        "TreeDataGridNodeBaseTemplate",
+                        null,
+                        new GridLength(1, GridUnitType.Star)),
+                    x => x.SubNodes.Where(n => n.IsVisible),
+                    x => x.SubNodes.Count > 0,
+                    x => x.IsExpanded)
+            },
+        };
+    }
+
+
+    private ObservableCollection<EditorPageViewModel> _pages;
+
+    public ObservableCollection<EditorPageViewModel> Pages
+    {
+        get => _pages;
+        set => this.RaiseAndSetIfChanged(ref _pages, value);
+    }
+
+    private EditorPageViewModel? _activePage;
+
+    public EditorPageViewModel? ActivePage
+    {
+        get => _activePage;
+        set => this.RaiseAndSetIfChanged(ref _activePage, value);
+    }
+
+    private EditorPageViewModel? _temporaryTab;
+
+
+    public EditorPageViewModel? TemporaryTab
+    {
+        get => _temporaryTab;
+        set => this.RaiseAndSetIfChanged(ref _temporaryTab, value);
+    }
+
+    private ObservableCollection<PageNode> _topLevelPages;
+
+    public ObservableCollection<PageNode> TopLevelPages
+    {
+        get => _topLevelPages;
+        set => this.RaiseAndSetIfChanged(ref _topLevelPages, value);
+    }
+
+    private Dictionary<EditorPageViewModel, PageNode> _pageToNodeMap;
+
+
+    public void AddTopLevelPage(EditorPageViewModel page)
+    {
+        var navigatedPage = TryNavigateToExistingPage(page);
+        if (navigatedPage != null)
+        {
+            if (navigatedPage is IPageReloadable reloadable)
+                reloadable.Reload();
+            return;
+        }
+
+        if (!page.AddNewTab)
+        {
+            TemporaryTab = page;
+            return;
+        }
+
+        // Only load the data once it is confirmed that the tab doesn't already exist
+        page.OnPageLoad();
+
+        Pages.Add(page);
+        var node = _context.NodeFactory.CreatePageNode(page, null);
+        TopLevelPages.Add(node);
+        _pageToNodeMap[page] = node;
+        ActivePage = page;
+    }
+
+
+    public void AddChildPage(EditorPageViewModel parentPage, EditorPageViewModel childPage)
+    {
+        var navigatedPage = TryNavigateToExistingPage(childPage);
+        if (navigatedPage != null) return;
+
+
+        // Otherwise... add to the list of tabs
+        if (_pageToNodeMap.TryGetValue(parentPage, out var parentNode))
+        {
+            var childNode = parentNode.AddChild(childPage);
+            _pageToNodeMap[childPage] = childNode;
+
+            // Try to insert the child page to the right of the parent
+            var parentIndex = Pages.IndexOf(parentPage);
+            if (parentIndex == -1)
+            {
+                Pages.Add(childPage);
+            }
+            else
+            {
+                Pages.Insert(parentIndex + 1, childPage);
+            }
+        }
+        else
+        {
+            AddTopLevelPage(parentPage);
+        }
+    }
+
+    // Returns whether the navigation was successful
+    private EditorPageViewModel? TryNavigateToExistingPage(EditorPageViewModel page)
+    {
+        var existing = Pages.FirstOrDefault(p => p.Equals(page));
+        if (existing != null)
+        {
+            TemporaryTab = null;
+            ActivePage = existing;
+            return existing;
+        }
+
+        return null;
+    }
+
+    public bool PageHasChildren(EditorPageViewModel page)
+    {
+        if (!_pageToNodeMap.TryGetValue(page, out var node))
+            return false;
+
+        return node.SubNodes.Count > 0;
+    }
+
+    private PageNode GetTopLevelNode(PageNode node)
+    {
+        var current = node;
+        while (!current.IsTopLevel)
+            current = current.Parent;
+        return current;
+    }
+
+    public void RemoveTab(EditorPageViewModel page)
+    {
+        // Console.WriteLine($"Removing tab {page}" + "hmmm");
+        if (!_pageToNodeMap.TryGetValue(page, out var node))
+            return;
+
+        int removeIdx = Pages.IndexOf(page);
+        
+        // Console.WriteLine($"Removing tab {page} at index {removeIdx}");
+
+        ClosePageAndChildren(node);
+
+
+        // TODO:
+        // We want to prioritize setting the left tab to be the active tab since our editors open stuff to the right first
+        // Maybe we want to set the active page to be the parent if it exists?
+        // For after deleting Datatype entries, should it go back to the last previously visited tab?
+        if (Pages.Count == 0)
+        {
+            ActivePage = null;
+        }
+        else
+        {
+            if (removeIdx > 0 && removeIdx - 1 < Pages.Count)
+            {
+                ActivePage = Pages[removeIdx - 1];
+            }
+            else if (removeIdx > 0)
+            {
+                ActivePage = Pages[Pages.Count - 1];
+            }
+            else
+            {
+                ActivePage = Pages[0];
+            }
+        }
+    }
+
+    public async Task SaveChildren(EditorPageViewModel page)
+    {
+        if (!_pageToNodeMap.TryGetValue(page, out var pageNode))
+            return;
+
+        foreach (var child in pageNode.SubNodes.Cast<PageNode>().ToList())
+        {
+            await SaveChildren(child.Page);
+            if (child.Page.AttachedView is ISaveable saveable)
+                await saveable.Save();
+        }
+    }
+
+    private void ClosePageAndChildren(PageNode node)
+    {
+        var children = node.SubNodes.Cast<PageNode>().ToList();
+        foreach (var child in children)
+        {
+            ClosePageAndChildren(child);
+        }
+
+        Pages.Remove(node.Page);
+
+
+        if (node.IsTopLevel)
+        {
+            TopLevelPages.Remove(node);
+        }
+        else
+        {
+            node.Parent.RemoveChild(node);
+        }
+
+        _pageToNodeMap.Remove(node.Page);
+    }
+
+    private ObservableCollection<NodeBase> _nodes = new();
+
+    public ObservableCollection<NodeBase> Nodes
+    {
+        get => _nodes;
+        set => this.RaiseAndSetIfChanged(ref _nodes, value);
+    }
+    
+    private EditorContext _context;
+
+    public DevFormViewModel(EditorContext context, DevTabGameViewModel game, DevTabPlayerViewModel player,
+        DevTabTravelViewModel travel, DevTabScriptViewModel script,
+        ModManagerViewModel mods)
+    {
+        _context = context;
+        Game = game;
+        Player = player;
+        Travel = travel;
+        Script = script;
+        ModsManager = mods;
+        
+        
+        
+        InitializeTabEvents();
+
+        this.WhenAnyValue(x => x.ActivePage)
+            .Where(activePage => activePage != null)
+            .Subscribe(_ => TemporaryTab = null);
+
+    
+        
+        Pages = new ObservableCollection<EditorPageViewModel>();
+        TopLevelPages = new ObservableCollection<PageNode>();
+        _pageToNodeMap = new Dictionary<EditorPageViewModel, PageNode>();
+
+        this.WhenAnyValue(x => x.ActivePage)
+            .Buffer(2, 1)
+            .Subscribe(pair =>
+            {
+                if (pair.Count > 1 && pair[0] != null) pair[0].IsActive = false;
+                if (pair.Count > 0 && pair[^1] != null) pair[^1].IsActive = true;
+            });
+
+        this.WhenAnyValue(x => x.Filter).Throttle(TimeSpan.FromMilliseconds(300)).Subscribe(ApplyFilter);
+
+        NodeSource = new HierarchicalTreeDataGridSource<NodeBase>(Nodes)
+        {
+            Columns =
+            {
+                new HierarchicalExpanderColumn<NodeBase>(
+                    new TemplateColumn<NodeBase>(
+                        null,
+                        "TreeDataGridNodeBaseTemplate",
+                        null,
+                        new GridLength(1, GridUnitType.Star)),
+                    x => x.SubNodes.Where(n => n.IsVisible),
+                    x => x.SubNodes.Count > 0,
+                    x => x.IsExpanded)
+            },
+        };
+    }
+
+    public void ClearFilter()
+    {
+        Filter = "";
+    }
+
+    public async void ShowPreferencesWindow()
+    {
+        await _context.DialogService.ShowDialogAsync<PreferencesWindowViewModel, bool>(
+            PreferencesWindowViewModel.Instance, "Preferences");
+    }
+
+    public NodeBase Root { get; internal set; }
+    public NodeBase MapEditorNode { get; internal set; }
+    
+    public NodeBase GroundEditorNode { get; internal set; }
+    
+    public void LoadDevTree()
+    {
+        NodeFactory _nodeFactory = _context.NodeFactory;
+        Filter = "";
+
+        ActivePage = null;
+        TopLevelPages.Clear();
+        Pages.Clear();
+        _pageToNodeMap.Clear();
+
+        foreach (var n in Nodes)
+        {
+            DetachEventsRecursive(n);
+        }
+
+        Nodes.Clear();
+
+        var rootStr = ModsManager.CurrentModString;
+        
+        var root = _nodeFactory.CreateOpenEditorNode<EmptyPageViewModel>(rootStr, "Icons.ScrollFill");
+
+        Root = root;
+        ModsManager.WhenAnyValue(x => x.CurrentMod.Name)
+            .Subscribe(str => Root.Title = str ?? "Origin");
+        
+        var devControlNode =
+            _nodeFactory.CreateOpenEditorNode<DevControlPageViewModel>("Dev Control", "Icons.GameControllerFill");
+        root.SubNodes.Add(devControlNode);
+        
+        var tab = _context.PageFactory.CreatePage(typeof(DevControlPageViewModel), devControlNode);
+        tab.SetPageTitle("Dev Control", "Icons.GameControllerFill");
+        AddTopLevelPage(tab);
+
+
+        var mapEditorNode = _nodeFactory.CreateOpenEditorNode<MapEditPageViewModel>("Map Editor", "Icons.StairsFill");
+        root.SubNodes.Add(mapEditorNode);
+        
+        MapEditorNode = mapEditorNode;
+
+        var groundEditorNode =
+            _nodeFactory.CreateOpenEditorNode<GroundEditPageViewModel>("Ground Editor", "Icons.IslandFill");
+
+        root.SubNodes.Add(groundEditorNode);
+        GroundEditorNode = groundEditorNode;
+
+        CreateDataNode(root);
+        CreateConstantsNode(root);
+        
+        CreateSpriteNode(root);
+
+        CreateModNode(root);
+        Nodes.Add(root);
+
+        AttachEventsRecursive(root);
+        root.IsExpanded = true;
+    }
+    
+    private Action<ReflectedDataPageViewModel> CreateDataOnOpen<T>(Func<T> getter, Action<T> setter, NodeBase parent)
+    {
+        return vm =>
+        {
+            vm.SetRemoveNode(false);
+            vm.SetRootPage(true);
+            vm.OnLoadAction = stack => { DataEditor.LoadDataControls("", getter(), stack); };
+
+            vm.OnOKAction = async stack =>
+            {
+                lock (GameBase.lockObj)
+                {
+                    object obj = getter();
+                    DataEditor.SaveDataControls(ref obj, stack, new Type[0]);
+                    setter((T)obj);
+                }
+
+                return true;
+            };
+        };
+    }
+
+    private Action<ReflectedDataPageViewModel> CreateFXOnOpen<T>(Func<T> getter, Action<T> setter, string fxKey,
+        NodeBase parent)
+        => CreateDataOnOpen(getter, fx =>
+        {
+            setter(fx);
+            DataManager.SaveData(fx, DataManager.FX_PATH, fxKey, DataManager.DATA_EXT);
+        }, parent);
+
+
+    private void CreateConstantsNode(NodeBase parent)
+    {
+        var constantsNode =
+            _context.NodeFactory.CreateReflectedDataNode<EmptyPageViewModel>("Constants", parent, "Icons.ListFill");
+        var startParamsNode = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>("Start Params",
+            parent,
+            "Icons.ListFill", CreateDataOnOpen(
+                () => DataManager.Instance.Start,
+                obj =>
+                {
+                    DataManager.Instance.Start = obj;
+                    DataManager.Instance.SaveStartParams();
+                },
+                parent));
+
+        var universalEventsNode = _context.NodeFactory.CreateUniversalNode<ReflectedDataPageViewModel>(
+            "Universal Event", "Icons.ListFill",
+            CreateDataOnOpen(
+                () => (UniversalBaseEffect)DataManager.Instance.UniversalEvent,
+                obj =>
+                {
+                    DataManager.Instance.UniversalEvent = obj;
+                    DataManager.SaveData(obj, DataManager.DATA_PATH, "Universal", DataManager.DATA_EXT);
+                },
+                parent));
+
+        
+        var stringsNode = _context.NodeFactory.CreateOpenEditorNode<EmptyPageViewModel>("Strings", "Icons.TableFill");
+        var menuTextNode = _context.NodeFactory.CreateOpenEditorNodeWithParams<StringEditPageViewModel>("Menu Text", [false], "Icons.TableFill");
+        var gameplayTextNode = _context.NodeFactory.CreateOpenEditorNodeWithParams<StringEditPageViewModel>("Gameplay Text", [true], "Icons.TableFill");
+        stringsNode.SubNodes.Add(menuTextNode);
+        stringsNode.SubNodes.Add(gameplayTextNode);
+        constantsNode.SubNodes.Add(startParamsNode);
+        constantsNode.SubNodes.Add(universalEventsNode);
+        constantsNode.SubNodes.Add(stringsNode);
+        
+        var effectsNode =
+            _context.NodeFactory.CreateOpenEditorNode<EmptyPageViewModel>("Effects", "Icons.SparkleFill");
+        effectsNode.SubNodes.Add(_context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>("Heal FX",
+            effectsNode,
+            "Icons.SparkleFill", CreateFXOnOpen(() => DataManager.Instance.HealFX, fx => DataManager.Instance.HealFX = fx, "Heal", parent)));
+
+        effectsNode.SubNodes.Add(_context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(
+            "Restore Charge FX",
+            effectsNode,
+            "Icons.SparkleFill", CreateFXOnOpen(() => DataManager.Instance.RestoreChargeFX, fx => DataManager.Instance.RestoreChargeFX = fx,
+                "RestoreCharge", parent)));
+
+        effectsNode.SubNodes.Add(_context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(
+            "Lose Charge FX",
+            effectsNode,
+            "Icons.SparkleFill", CreateFXOnOpen(() => DataManager.Instance.LoseChargeFX, fx => DataManager.Instance.LoseChargeFX = fx,
+                "LoseCharge", parent)));
+
+        effectsNode.SubNodes.Add(_context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(
+            "No Charge FX",
+            effectsNode,
+            "Icons.SparkleFill", CreateFXOnOpen(() => DataManager.Instance.NoChargeFX, fx => DataManager.Instance.NoChargeFX = fx,
+                "NoCharge", parent)));
+
+        effectsNode.SubNodes.Add(_context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>("Element FX",
+            effectsNode,
+            "Icons.SparkleFill", CreateFXOnOpen(() => DataManager.Instance.ElementFX, fx => DataManager.Instance.ElementFX = fx, "Element",
+                parent)));
+
+        effectsNode.SubNodes.Add(_context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(
+            "Intrinsic FX",
+            effectsNode,
+            "Icons.SparkleFill", CreateFXOnOpen(() => DataManager.Instance.IntrinsicFX, fx => DataManager.Instance.IntrinsicFX = fx,
+                "Intrinsic", parent)));
+
+        effectsNode.SubNodes.Add(_context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(
+            "Send Home FX",
+            effectsNode,
+            "Icons.SparkleFill", CreateFXOnOpen(() => DataManager.Instance.SendHomeFX, fx => DataManager.Instance.SendHomeFX = fx,
+                "SendHome", parent)));
+
+        effectsNode.SubNodes.Add(_context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(
+            "Item Lost FX",
+            effectsNode,
+            "Icons.SparkleFill", CreateFXOnOpen(() => DataManager.Instance.ItemLostFX, fx => DataManager.Instance.ItemLostFX = fx,
+                "ItemLost", parent)));
+
+        effectsNode.SubNodes.Add(_context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>("Warp FX",
+            effectsNode,
+            "Icons.SparkleFill", CreateFXOnOpen(() => DataManager.Instance.WarpFX, fx => DataManager.Instance.WarpFX = fx, "Warp", parent)));
+
+        effectsNode.SubNodes.Add(_context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(
+            "Knockback FX",
+            effectsNode,
+            "Icons.SparkleFill", CreateFXOnOpen(() => DataManager.Instance.KnockbackFX, fx => DataManager.Instance.KnockbackFX = fx,
+                "Knockback", parent)));
+
+        effectsNode.SubNodes.Add(_context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>("Jump FX",
+            effectsNode,
+            "Icons.SparkleFill", CreateFXOnOpen(() => DataManager.Instance.JumpFX, fx => DataManager.Instance.JumpFX = fx, "Jump", parent)));
+
+        effectsNode.SubNodes.Add(_context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>("Throw FX",
+            effectsNode,
+            "Icons.SparkleFill", CreateFXOnOpen(() => DataManager.Instance.ThrowFX, fx => DataManager.Instance.ThrowFX = fx, "Throw",
+                parent)));
+
+        constantsNode.SubNodes.Add(effectsNode);
+        parent.SubNodes.Add(constantsNode);
+    }
+
+    private void CreateDataNode(NodeBase parent)
+    {
+        var dataNode =
+            _context.NodeFactory.CreateOpenEditorNode<EmptyPageViewModel>("Data", "Icons.FloppyDiskFill");
+        foreach (var type in Enum.GetValues<DataManager.DataType>())
+        {
+            if (type is DataManager.DataType.All or DataManager.DataType.None)
+                continue;
+
+            var entry = DataRegistry.Map[type];
+
+            var dataItemRootNode = _context.NodeFactory.CreateDataRootNode<DataListPageViewModel>(
+                type,
+                type.ToString(),
+                entry.Icon);
+            dataNode.SubNodes.Add(dataItemRootNode);
+        }
+
+        parent.SubNodes.Add(dataNode);
+    }
+
+    private void CreateSpriteNode(NodeBase parent)
+    {
+        var spriteNode =
+            _context.NodeFactory.CreateOpenEditorNode<EmptyPageViewModel>("Sprites", "Icons.PaintBrushFill");
+        //
+        spriteNode.SubNodes.Add(
+            _context.NodeFactory.CreateOpenEditorNodeWithParams<SpeciesEditPageViewModel>("Char Sprites", [true],
+                "Icons.PersonFill")
+        );
+        spriteNode.SubNodes.Add(
+            _context.NodeFactory.CreateOpenEditorNodeWithParams<SpeciesEditPageViewModel>("Portraits", [false],
+                "Icons.UserSquareFill")
+        );
+     
+        foreach (var type in Enum.GetValues<GraphicsManager.AssetType>())
+        {
+            if (type == GraphicsManager.AssetType.None || type == GraphicsManager.AssetType.All ||
+                type == GraphicsManager.AssetType.Count || type == GraphicsManager.AssetType.Autotile ||
+                type == GraphicsManager.AssetType.Chara || type == GraphicsManager.AssetType.Portrait ||
+                type == GraphicsManager.AssetType.Font)
+                continue;
+
+
+            if (type != GraphicsManager.AssetType.Tile)
+            {
+
+                spriteNode.SubNodes.Add(
+                    _context.NodeFactory.CreateSpriteRootNode<SpritePageViewModel>(type, type.ToString(),
+                        type.GetIcon()));
+            }
+            else
+            {
+                spriteNode.SubNodes.Add(
+                    _context.NodeFactory.CreateSpriteTileRootNode<SpritePageViewModel>(type.ToString(),
+                        type.GetIcon()));
+                
+            }
+        }
+
+
+        parent.SubNodes.Add(spriteNode);
+        
+    }
+    
+    private void CreateModNode(NodeBase parent)
+    {
+        var modRoot = _context.NodeFactory.CreateOpenEditorNode<ModListPageViewModel>("Mods", "Icons.ScrollFill");
+
+
+        parent.SubNodes.Add(modRoot);
+    }
+
+    private void InitializeTabEvents()
+    {
+        TabEvents _tabEvents = _context.TabEvents;
+        _tabEvents.AddChildTabEvent += (parent, child) =>
+        {
+            AddChildPage(parent, child);
+            ActivePage = child;
+        };
+
+        _tabEvents.SaveChildrenEvent += SaveChildren;
+
+        _tabEvents.AddTopLevelTabEvent += (tab) => { AddTopLevelPage(tab); };
+
+        _tabEvents.RemoveTabEvent += (tab) => { RemoveTab(tab); };
+
+        _tabEvents.NavigateToTabEvent += (tab) => { ActivePage = tab; };
+
+        // TODO: Check if this works if the page is a children of a tab. What if it closes the children first before the parent...
+        _tabEvents.CloseTabsForEntry += (key, dataType) =>
+        {
+            var topLevelPagesToClose = Pages
+                .OfType<ReflectedDataPageViewModel>()
+                .Where(p => p.Node is DataItemNode dataItemNode
+                            && dataItemNode.ItemKey == key
+                            && dataItemNode.Parent is DataRootNode rootNode
+                            && rootNode.DataType == dataType)
+                .Cast<EditorPageViewModel>()
+                .Select(page =>
+                {
+                    if (!_pageToNodeMap.TryGetValue(page, out var node)) return null;
+                    if (node is not PageNode pageNode) return null;
+                    return GetTopLevelNode(pageNode).Page;
+                })
+                .Where(p => p != null)
+                .Distinct()
+                .ToList();
+
+            foreach (var page in topLevelPagesToClose)
+                RemoveTab(page);
+        };
+    }
+
+    private void AttachEventsRecursive(NodeBase node)
+    {
+        node.SubNodesChanged += () => OnSubNodesChanged();
+
+        foreach (var child in node.SubNodes)
+            AttachEventsRecursive(child);
+    }
+
+    private void DetachEventsRecursive(NodeBase node)
+    {
+        node.SubNodesChanged -= OnSubNodesChanged;
+
+        foreach (var child in node.SubNodes)
+            DetachEventsRecursive(child);
+    }
+
+    private void OnSubNodesChanged()
+    {
+        RefreshTreeDataGrid();
+    }
+
+    private TabSwitcherViewModel? _tabSwitcher;
+
+    public TabSwitcherViewModel? TabSwitcher
+    {
+        get => _tabSwitcher;
+        set => this.RaiseAndSetIfChanged(ref _tabSwitcher, value);
+    }
+
+
+    private ModSwitcherViewModel? _modSwitcher;
+
+    public ModSwitcherViewModel? ModSwitcher
+    {
+        get => _modSwitcher;
+        set => this.RaiseAndSetIfChanged(ref _modSwitcher, value);
+    }
+
+    public void AddPageFromTreeNode(OpenEditorNode node)
+    {
+        if (node.EditorType.IsAssignableTo(typeof(IPreCreatePage)))
+            node.EditorType.GetMethod("OnPreCreate")?.Invoke(null, null);
+        
+        var editor = _context.PageFactory.CreatePage(node.EditorType, node, node.OnPageLoad);
+        
+        if (editor != null)
+        {
+            editor.SetPageTitleFromNode(node);
+            AddTopLevelPage(editor);
+        }
+    }
+
+    public async Task<bool> TryCloseTabAsync(EditorPageViewModel page)
+    {
+        if (PageHasChildren(page))
+        {
+            // TODO: Add a can close method and check if any of the subtabs has any unsaved changes.
+            var result = await MessageBoxWindowView.Show(_context.DialogService,
+                "Are you sure you want to close all subtabs?  Your changes will not be saved.", "Confirm Close",
+                MessageBoxWindowView.MessageBoxButtons.YesNo);
+
+            if (result != MessageBoxWindowView.MessageBoxResult.Yes)
+                return false;
+        }
+
+        RemoveTab(page);
+        page.OnPageRemoved();
+        return true;
+    }
+
+
+    public void OpenMapEditor()
+    {
+        var page = _context.PageFactory.CreatePage<MapEditPageViewModel>(MapEditorNode);
+        page.SetPageTitle("Map Editor", "Icons.StairsFill");
+        AddTopLevelPage(page);
+    }
+    public void OpenGroundEditor()
+    {
+        var page = _context.PageFactory.CreatePage<GroundEditPageViewModel>(GroundEditorNode);
+        page.SetPageTitle("Ground Editor", "Icons.IslandFill");
+        AddTopLevelPage(page);
+    }
+}
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevTabConstantsViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevTabConstantsViewModel.cs
deleted file mode 100644
index a21ee58b..00000000
--- a/RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevTabConstantsViewModel.cs
+++ /dev/null
@@ -1,230 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Avalonia.Controls;
-using RogueElements;
-using RogueEssence.Content;
-using RogueEssence.Data;
-using RogueEssence.Dev.Utility;
-using RogueEssence.Dungeon;
-using RogueEssence.Menu;
-using RogueEssence.Script;
-using RogueEssence.Dev.Views;
-
-namespace RogueEssence.Dev.ViewModels
-{
-    public class DevTabConstantsViewModel : ViewModelBase
-    {
-
-        private EditorContext _context;
-        public DevTabConstantsViewModel(EditorContext context)
-        {
-            _context = context;
-        }
-        // public void btnEditStartParams_Click()
-        // {
-        //     OpenItem<StartParams>("Start Params", DataManager.Instance.Start, (obj) => {
-        //         DataManager.Instance.Start = obj;
-        //         DataManager.Instance.SaveStartParams();
-        //     });
-        // }
-        //
-        // public void btnEditUniversal_Click()
-        // {
-        //     OpenItem<UniversalBaseEffect>("Universal Event", (UniversalBaseEffect)DataManager.Instance.UniversalEvent, (obj) => {
-        //         DataManager.Instance.UniversalEvent = obj;
-        //         DataManager.SaveData(obj, DataManager.DATA_PATH, "Universal", DataManager.DATA_EXT);
-        //     });
-        // }
-        public async void mnuUniversalFile_Click()
-        {
-            if (DataManager.GetDataModStatus(DataManager.DATA_PATH, "Universal", DataManager.DATA_EXT) == DataManager.ModStatus.Base)
-            {
-                await MessageBoxWindowView.Show(_context.DialogService, "Universal data must have saved edits first!", "Error", MessageBoxWindowView.MessageBoxButtons.Ok);
-                return;
-            }
-
-            DataManager.SaveData(DataManager.Instance.UniversalEvent, DataManager.DATA_PATH, "Universal", DataManager.DATA_EXT, DataManager.SavePolicy.File);
-
-            await MessageBoxWindowView.Show(_context.DialogService, "Universal is now saved as a file.", "Complete", MessageBoxWindowView.MessageBoxButtons.Ok);
-        }
-        public async void mnuUniversalDiff_Click()
-        {
-            if (DataManager.GetDataModStatus(DataManager.DATA_PATH, "Universal", DataManager.DATA_EXT) == DataManager.ModStatus.Base)
-            {
-                await MessageBoxWindowView.Show(_context.DialogService,"Universal data must have saved edits first!", "Error", MessageBoxWindowView.MessageBoxButtons.Ok);
-                return;
-            }
-
-            //you can't make a diff for the base game!
-            DataManager.SaveData(DataManager.Instance.UniversalEvent, DataManager.DATA_PATH, "Universal", DataManager.DATA_EXT, DataManager.SavePolicy.Diff);
-
-            if (DataManager.GetDataModStatus(DataManager.DATA_PATH, "Universal", DataManager.DATA_EXT) == DataManager.ModStatus.Base)
-                await MessageBoxWindowView.Show(_context.DialogService, "Modded Universal was identical to base. Unneeded patch removed.", "Complete", MessageBoxWindowView.MessageBoxButtons.Ok);
-            else
-                await MessageBoxWindowView.Show(_context.DialogService, "Universal is now saved as a patch.", "Complete", MessageBoxWindowView.MessageBoxButtons.Ok);
-        }
-
-        public void btnEditStrings_Click()
-        {
-            StringsEditViewModel mv = new StringsEditViewModel();
-            Views.StringsEditForm editForm = new Views.StringsEditForm();
-            mv.LoadStringEntries(false, editForm);
-            editForm.DataContext = mv;
-            editForm.Show();
-        }
-        
-        public void btnEditStringsEx_Click()
-        {
-            StringsEditViewModel mv = new StringsEditViewModel();
-            Views.StringsEditForm editForm = new Views.StringsEditForm();
-            mv.LoadStringEntries(true, editForm);
-            editForm.DataContext = mv;
-            editForm.Show();
-        }
-        //
-        //
-        //
-        // public void btnEditHeal_Click()
-        // {
-        //     OpenItem<BattleFX>("Heal FX", DataManager.Instance.HealFX, (fx) => {
-        //         DataManager.Instance.HealFX = fx;
-        //         DataManager.SaveData(fx, DataManager.FX_PATH, "Heal", DataManager.DATA_EXT);
-        //     });
-        // }
-        // public void btnEditRestoreCharge_Click()
-        // {
-        //     OpenItem<BattleFX>("Restore Charge FX", DataManager.Instance.RestoreChargeFX, (fx) => {
-        //         DataManager.Instance.RestoreChargeFX = fx;
-        //         DataManager.SaveData(fx, DataManager.FX_PATH, "RestoreCharge", DataManager.DATA_EXT);
-        //     });
-        // }
-        // public void btnEditLoseCharge_Click()
-        // {
-        //     OpenItem<BattleFX>("Lose Charge FX", DataManager.Instance.LoseChargeFX, (fx) => {
-        //         DataManager.Instance.LoseChargeFX = fx;
-        //         DataManager.SaveData(fx, DataManager.FX_PATH, "LoseCharge", DataManager.DATA_EXT);
-        //     });
-        // }
-        // public void btnEditNoCharge_Click()
-        // {
-        //     OpenItem<EmoteFX>("No Charge FX", DataManager.Instance.NoChargeFX, (fx) => {
-        //         DataManager.Instance.NoChargeFX = fx;
-        //         DataManager.SaveData(fx, DataManager.FX_PATH, "NoCharge", DataManager.DATA_EXT);
-        //     });
-        // }
-        // public void btnEditElement_Click()
-        // {
-        //     OpenItem<BattleFX>("Element FX", DataManager.Instance.ElementFX, (fx) => {
-        //         DataManager.Instance.ElementFX = fx;
-        //         DataManager.SaveData(fx, DataManager.FX_PATH, "Element", DataManager.DATA_EXT);
-        //     });
-        // }
-        // public void btnEditIntrinsic_Click()
-        // {
-        //     OpenItem<BattleFX>("Intrinsic FX", DataManager.Instance.IntrinsicFX, (fx) => {
-        //         DataManager.Instance.IntrinsicFX = fx;
-        //         DataManager.SaveData(fx, DataManager.FX_PATH, "Intrinsic", DataManager.DATA_EXT);
-        //     });
-        // }
-        // public void btnEditSendHome_Click()
-        // {
-        //     OpenItem<BattleFX>("Send Home FX", DataManager.Instance.SendHomeFX, (fx) => {
-        //         DataManager.Instance.SendHomeFX = fx;
-        //         DataManager.SaveData(fx, DataManager.FX_PATH, "SendHome", DataManager.DATA_EXT);
-        //     });
-        // }
-        // public void btnEditItemLost_Click()
-        // {
-        //     OpenItem<BattleFX>("Item Lost FX", DataManager.Instance.ItemLostFX, (fx) => {
-        //         DataManager.Instance.ItemLostFX = fx;
-        //         DataManager.SaveData(fx, DataManager.FX_PATH, "ItemLost", DataManager.DATA_EXT);
-        //     });
-        // }
-        // public void btnEditWarp_Click()
-        // {
-        //     OpenItem<BattleFX>("Warp FX", DataManager.Instance.WarpFX, (fx) => {
-        //         DataManager.Instance.WarpFX = fx;
-        //         DataManager.SaveData(fx, DataManager.FX_PATH, "Warp", DataManager.DATA_EXT);
-        //     });
-        // }
-        //
-        // public void btnEditKnockback_Click()
-        // {
-        //     OpenItem<BattleFX>("Knockback FX", DataManager.Instance.KnockbackFX, (fx) => {
-        //         DataManager.Instance.KnockbackFX = fx;
-        //         DataManager.SaveData(fx, DataManager.FX_PATH, "Knockback", DataManager.DATA_EXT);
-        //     });
-        // }
-        //
-        // public void btnEditJump_Click()
-        // {
-        //     OpenItem<BattleFX>("Jump FX", DataManager.Instance.JumpFX, (fx) => {
-        //         DataManager.Instance.JumpFX = fx;
-        //         DataManager.SaveData(fx, DataManager.FX_PATH, "Jump", DataManager.DATA_EXT);
-        //     });
-        // }
-        //
-        // public void btnEditThrow_Click()
-        // {
-        //     OpenItem<BattleFX>("Throw FX", DataManager.Instance.ThrowFX, (fx) => { DataManager.Instance.ThrowFX = fx;
-        //         DataManager.SaveData(fx, DataManager.FX_PATH, "Throw", DataManager.DATA_EXT);
-        //     });
-        // }
-
-        // private delegate void SaveFX<T>(T obj);
-        // private void OpenItem<T>(string name, T data, SaveFX<T> saveOp)
-        // {
-        //     lock (GameBase.lockObj)
-        //     {
-        //         Views.DataEditForm editor = new Views.DataEditRootForm();
-        //         // EditorPageViewModel page = new EditorPageViewModel();
-        //         // pag
-        //         editor.Title = DataEditor.GetWindowTitle("", name, data, data.GetType());
-        //         DataEditor.LoadDataControls("", data, editor);
-        //         editor.SelectedOKEvent += async () =>
-        //         {
-        //             lock (GameBase.lockObj)
-        //             {
-        //                 object obj = data;
-        //                 DataEditor.SaveDataControls(ref obj, editor.ControlPanel, new Type[0]);
-        //                 saveOp((T)obj);
-        //                 return true;
-        //             }
-        //         };
-        //
-        //         editor.Show();
-        //
-        //     }
-        // }
-        //
-        
-        private void OpenItem<T>(string name, T data, Action<T> saveOp, NodeBase parentNode)
-        {
-            lock (GameBase.lockObj)
-            {
-                ReflectedDataPageViewModel newEditor = _context.PageFactory.CreatePage<ReflectedDataPageViewModel>(parentNode);
-                newEditor.SetPageTitle(name, parentNode.Icon);
-
-                newEditor.OnLoadAction = (StackPanel stack) =>
-                {
-                    DataEditor.LoadDataControls("", data, stack);
-                };
-
-                newEditor.OnOKAction = async (StackPanel stack) =>
-                {
-                    lock (GameBase.lockObj)
-                    {
-                        object obj = data;
-                        DataEditor.SaveDataControls(ref obj, stack, new Type[0]);
-                        saveOp((T)obj);
-                    }
-                    return true;
-                };
-
-                _context.TabEvents.AddTopLevelTab(newEditor);
-            }
-        }
-
-    }
-}
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevTabDataViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevTabDataViewModel.cs
deleted file mode 100644
index 35acb279..00000000
--- a/RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevTabDataViewModel.cs
+++ /dev/null
@@ -1,553 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Avalonia.Controls;
-using RogueElements;
-using RogueEssence.Content;
-using RogueEssence.Data;
-using RogueEssence.Dev.Views;
-using RogueEssence.Dungeon;
-using RogueEssence.Menu;
-using RogueEssence.Script;
-using Avalonia.Interactivity;
-using Avalonia.Platform.Storage;
-using Avalonia.Threading;
-
-namespace RogueEssence.Dev.ViewModels
-{
-    public class DevTabDataViewModel : ViewModelBase
-    {
-
-        public void btnEditMonster_Click()
-        {
-            OpenList(DataManager.DataType.Monster, DataManager.Instance.GetMonster, () => { return new MonsterData(); });
-        }
-        public void btnEditSkill_Click()
-        {
-            OpenList(DataManager.DataType.Skill, DataManager.Instance.GetSkill, () => { return new SkillData(); });
-        }
-        public void btnEditIntrinsics_Click()
-        {
-            OpenList(DataManager.DataType.Intrinsic, DataManager.Instance.GetIntrinsic, () => { return new IntrinsicData(); });
-        }
-        public void btnEditItem_Click()
-        {
-            OpenList(DataManager.DataType.Item, DataManager.Instance.GetItem, () => { return new ItemData(); });
-        }
-        public void btnEditZone_Click()
-        {
-            OpenList(DataManager.DataType.Zone, DataManager.Instance.GetZone, () => { return new ZoneData(); });
-        }
-        public void btnEditStatuses_Click()
-        {
-            OpenList(DataManager.DataType.Status, DataManager.Instance.GetStatus, () => { return new StatusData(); });
-        }
-        public void btnEditMapStatuses_Click()
-        {
-            OpenList(DataManager.DataType.MapStatus, DataManager.Instance.GetMapStatus, () => { return new MapStatusData(); });
-        }
-        public void btnEditTerrain_Click()
-        {
-            OpenList(DataManager.DataType.Terrain, DataManager.Instance.GetTerrain, () => { return new TerrainData(); });
-        }
-        public void btnEditTiles_Click()
-        {
-            OpenList(DataManager.DataType.Tile, DataManager.Instance.GetTile, () => { return new TileData(); });
-        }
-        public void btnEditAutoTile_Click()
-        {
-            DataManager.DataType dataType = DataManager.DataType.AutoTile;
-            GetEntry entryOp = DataManager.Instance.GetAutoTile;
-            CreateEntry createOp = () => { return new AutoTileData(); };
-
-            lock (GameBase.lockObj)
-            {
-                DataListForm dataListForm = new DataListForm();
-                DataListFormViewModel choices = createChoices(dataListForm, dataType, entryOp, createOp);
-                DataOpContainer reindexOp = createReindexOp(dataType, choices);
-
-                DataOpContainer.TaskAction importAction = async () => { await importDtef(dataListForm, choices); }; ;
-                DataOpContainer importOp = new DataOpContainer("Import DTEF", importAction);
-
-
-                DataOpContainer.TaskAction exportAction = async () => { await exportDtef(dataListForm, choices.SearchList.InternalIndex); };
-                
-                DataOpContainer exportOp = new DataOpContainer("Export as DTEF", exportAction);
-                choices.SetOps(reindexOp, importOp/*, exportOp*/);
-
-                dataListForm.DataContext = choices;
-                dataListForm.Show();
-            }
-        }
-
-        private async Task importDtef(DataListForm listForm, DataListFormViewModel choices)
-        {
-            //remember addresses in registry
-            string folderName = DevForm.GetConfig("TilesetDir", Directory.GetCurrentDirectory());
-
-            //open window to choose directory
-            IStorageFolder directory = await listForm.StorageProvider.TryGetFolderFromPathAsync(folderName);
-            await Dispatcher.UIThread.InvokeAsync(async () =>
-            {
-                IReadOnlyList<IStorageFolder> results = await listForm.StorageProvider.OpenFolderPickerAsync(
-                    new FolderPickerOpenOptions
-                    {
-                        Title = "Select DTEF folder",
-                        SuggestedStartLocation = directory,
-                        AllowMultiple = false,
-                    });
-
-                if (results.Count <= 0)
-                    return;
-                
-                string folder = results.First().Path.LocalPath;
-                
-                string animName = Path.GetFileNameWithoutExtension(folder);
-
-                bool conflict = false;
-                foreach (string name in GraphicsManager.TileIndex.Nodes.Keys)
-                {
-                    if (name.ToLower() == animName.ToLower())
-                    {
-                        conflict = true;
-                        break;
-                    }
-                }
-
-                if (conflict)
-                {
-                    MessageBox.MessageBoxResult result = await MessageBox.Show(listForm, "Are you sure you want to overwrite the existing sheet:\n" + animName, "Tileset already exists.",
-                        MessageBox.MessageBoxButtons.YesNo);
-                    if (result == MessageBox.MessageBoxResult.No)
-                        return;
-                }
-
-                DevForm.SetConfig("TilesetDir", Path.GetDirectoryName(folder));
-
-                try
-                {
-                    DevForm.ExecuteOrPend(() => { tryImportDtef(choices, folder, animName); });
-                }
-                catch (Exception ex)
-                {
-                    DiagManager.Instance.LogError(ex, false);
-                    await MessageBox.Show(listForm, "Error importing from\n" + folder + "\n\n" + ex.Message, "Import Failed", MessageBox.MessageBoxButtons.Ok);
-                    return;
-                }
-            });
-            
-        }
-
-        private void tryImportDtef(DataListFormViewModel choices, string folder, string animName)
-        {
-            lock (GameBase.lockObj)
-            {
-                string destFile = PathMod.HardMod(string.Format(Content.GraphicsManager.TILE_PATTERN, animName));
-                DtefImportHelper.ImportDtef(folder, destFile);
-
-                //reindex graphics
-                GraphicsManager.RebuildIndices(GraphicsManager.AssetType.Tile);
-                GraphicsManager.ClearCaches(GraphicsManager.AssetType.Tile);
-                DevDataManager.ClearCaches();
-
-                //reindex data
-                DevHelper.RunIndexing(DataManager.DataType.AutoTile);
-                DevHelper.RunExtraIndexing(DataManager.DataType.AutoTile);
-                DataManager.Instance.LoadIndex(DataManager.DataType.AutoTile);
-                DataManager.Instance.LoadUniversalIndices();
-                DataManager.Instance.ClearCache(DataManager.DataType.AutoTile);
-                DiagManager.Instance.DevEditor.ReloadData(DataManager.DataType.AutoTile);
-                Dictionary<string, string> entries = DataManager.Instance.DataIndices[DataManager.DataType.AutoTile].GetLocalStringArray(true);
-                choices.SetEntries(entries);
-            }
-        }
-
-        private async Task exportDtef(DataListForm listForm, int entryIndex)
-        {
-            if (entryIndex > -1)
-            {
-                //remember addresses in registry
-                string folderName = DevForm.GetConfig("TilesetDir", Directory.GetCurrentDirectory());
-
-                IStorageFolder directory = await listForm.StorageProvider.TryGetFolderFromPathAsync(folderName);
-                await Dispatcher.UIThread.InvokeAsync(async () =>
-                {
-                    IReadOnlyList<IStorageFolder> results = await listForm.StorageProvider.OpenFolderPickerAsync(
-                        new FolderPickerOpenOptions
-                        {
-                            Title = "Select folder to export the DTEF to",
-                            SuggestedStartLocation = directory,
-                            AllowMultiple = false,
-                        });
-
-                    if (results.Count <= 0)
-                        return;
-
-                    string folder = results.First().Path.LocalPath;
-                    DevForm.SetConfig("TilesetDir", Path.GetDirectoryName(folder));
-
-                    DevForm.ExecuteOrPend(() => { tryExportDtef(entryIndex, folder); });
-                });
-            }
-        }
-        private void tryExportDtef(int entryIndex, string folder)
-        {
-            lock (GameBase.lockObj)
-            {
-                DtefImportHelper.ExportDtefTile(entryIndex, folder);
-            }
-        }
-
-        private List<string> getDtefConflictSheets(string animName)
-        {
-            List<string> conflicts = new List<string>();
-
-            foreach (string name in GraphicsManager.TileIndex.Nodes.Keys)
-            {
-                foreach (string suffix in DtefImportHelper.TileTitles)
-                {
-                    string subName = animName + suffix;
-                    if (name.ToLower() == subName.ToLower())
-                        conflicts.Add(name);
-                }
-            }
-
-            return conflicts;
-        }
-
-        public void btnEditEmote_Click()
-        {
-            OpenList(DataManager.DataType.Emote, DataManager.Instance.GetEmote, () => { return new EmoteData(); });
-        }
-
-        public void btnEditElement_Click()
-        {
-            OpenList(DataManager.DataType.Element, DataManager.Instance.GetElement, () => { return new ElementData(); });
-        }
-
-        public void btnEditGrowthGroup_Click()
-        {
-            OpenList(DataManager.DataType.GrowthGroup, DataManager.Instance.GetGrowth, () => { return new GrowthData(); });
-        }
-
-        public void btnEditSkillGroup_Click()
-        {
-            OpenList(DataManager.DataType.SkillGroup, DataManager.Instance.GetSkillGroup, () => { return new SkillGroupData(); });
-        }
-
-        public void btnEditRank_Click()
-        {
-            OpenList(DataManager.DataType.Rank, DataManager.Instance.GetRank, () => { return new RankData(); });
-        }
-
-        public void btnEditSkin_Click()
-        {
-            OpenList(DataManager.DataType.Skin, DataManager.Instance.GetSkin, () => { return new SkinData(); });
-        }
-
-        public void btnEditAI_Click()
-        {
-            OpenList(DataManager.DataType.AI, DataManager.Instance.GetAITactic, () => { return new AITactic(); });
-        }
-
-
-        private delegate string[] GetEntryNames();
-        private delegate IEntryData GetEntry(string entryNum);
-        private delegate IEntryData CreateEntry();
-        private void OpenList(DataManager.DataType dataType, GetEntry entryOp, CreateEntry createOp)
-        {
-            lock (GameBase.lockObj)
-            {
-                DataListForm dataListForm = new DataListForm();
-                DataListFormViewModel choices = createChoices(dataListForm, dataType, entryOp, createOp);
-                DataOpContainer reindexOp = createReindexOp(dataType, choices);
-                DataOpContainer resaveFileOp = createResaveFileDiffOp(dataType, choices, entryOp, false);
-                DataOpContainer resaveDiffOp = createResaveFileDiffOp(dataType, choices, entryOp, true);
-                choices.SetOps(reindexOp, resaveFileOp, resaveDiffOp);
-
-                dataListForm.DataContext = choices;
-                dataListForm.SetListContextMenu(CreateContextMenu(choices));
-                dataListForm.Show();
-            }
-        }
-
-        private DataOpContainer createReindexOp(DataManager.DataType dataType, DataListFormViewModel choices)
-        {
-#pragma warning disable CS1998 // Async method lacks 'await' operators and will run synchronously
-            DataOpContainer.TaskAction reindexAction = async () =>
-#pragma warning restore CS1998 // Async method lacks 'await' operators and will run synchronously
-            {
-                lock (GameBase.lockObj)
-                {
-                    DevHelper.RunIndexing(dataType);
-                    DevHelper.RunExtraIndexing(dataType);
-                    DataManager.Instance.LoadIndex(dataType);
-                    DataManager.Instance.LoadUniversalIndices();
-                    DataManager.Instance.ClearCache(dataType);
-                    DiagManager.Instance.DevEditor.ReloadData(dataType);
-                    Dictionary<string, string> entries = DataManager.Instance.DataIndices[dataType].GetLocalStringArray(true);
-                    choices.SetEntries(entries);
-                }
-            };
-            return new DataOpContainer("Re-Index", reindexAction);
-        }
-
-
-        private DataOpContainer createResaveFileDiffOp(DataManager.DataType dataType, DataListFormViewModel choices, GetEntry entryOp, bool asDiff)
-        {
-#pragma warning disable CS1998 // Async method lacks 'await' operators and will run synchronously
-            DataOpContainer.TaskAction reindexAction = async () =>
-#pragma warning restore CS1998 // Async method lacks 'await' operators and will run synchronously
-            {
-                lock (GameBase.lockObj)
-                {
-                    DevHelper.Resave(dataType, asDiff);
-
-                    //then you have to reindex everything anyway
-                    DevHelper.RunIndexing(dataType);
-                    DevHelper.RunExtraIndexing(dataType);
-                    DataManager.Instance.LoadIndex(dataType);
-                    DataManager.Instance.LoadUniversalIndices();
-                    DataManager.Instance.ClearCache(dataType);
-                    DiagManager.Instance.DevEditor.ReloadData(dataType);
-                    Dictionary<string, string> entries = DataManager.Instance.DataIndices[dataType].GetLocalStringArray(true);
-                    choices.SetEntries(entries);
-                }
-            };
-            if (asDiff)
-                return new DataOpContainer("Resave all as Diff", reindexAction);
-            else
-                return new DataOpContainer("Resave all as File", reindexAction);
-        }
-
-        private DataListFormViewModel createChoices(DataListForm form, DataManager.DataType dataType, GetEntry entryOp, CreateEntry createOp)
-        {
-            DataListFormViewModel choices = new DataListFormViewModel();
-            choices.Name = dataType.ToString();
-            Dictionary<string, string> entries = DataManager.Instance.DataIndices[dataType].GetLocalStringArray(true);
-            choices.SetEntries(entries);
-
-            choices.SelectedOKEvent += async () =>
-            {
-                if (choices.ChosenAsset != null)
-                {
-                    lock (GameBase.lockObj)
-                    {
-                        string entryNum = choices.ChosenAsset;
-                        IEntryData data = entryOp(entryNum);
-
-                        DataEditForm editor = new DataEditRootForm();
-                        editor.Title = DataEditor.GetWindowTitle(String.Format("{0} #{1}", dataType.ToString(), entryNum), data.Name.ToLocal(), data, data.GetType());
-                        DataEditor.LoadDataControls(entryNum, data, editor);
-                        editor.SelectedOKEvent += async () =>
-                        {
-                            lock (GameBase.lockObj)
-                            {
-                                object obj = data;
-                                DataEditor.SaveDataControls(ref obj, editor.ControlPanel, new Type[0]);
-                                DataManager.Instance.ContentChanged(dataType, entryNum, (IEntryData)obj);
-
-                                string newName = DataManager.Instance.DataIndices[dataType].Get(entryNum).GetLocalString(true);
-                                choices.ModifyEntry(entryNum, newName);
-                                return true;
-                            }
-                        };
-
-                        editor.Show();
-                    }
-                }
-            };
-
-            choices.SelectedAddEvent += async () =>
-            {
-                // Show a name entry window
-                RenameWindow window = new RenameWindow();
-                RenameViewModel vm = new RenameViewModel();
-                window.DataContext = vm;
-
-                bool result = await window.ShowDialog<bool>(form);
-                if (!result)
-                    return;
-
-                lock (GameBase.lockObj)
-                {
-                    string assetName = Text.GetNonConflictingName(Text.Sanitize(vm.Name).ToLower(), DataManager.Instance.DataIndices[dataType].ContainsKey);
-                    DataManager.Instance.ContentChanged(dataType, assetName, createOp());
-                    string newName = DataManager.Instance.DataIndices[dataType].Get(assetName).GetLocalString(true);
-                    choices.AddEntry(assetName, newName);
-
-                    if (dataType == DataManager.DataType.Zone)
-                        LuaEngine.Instance.CreateZoneScriptDir(assetName);
-                }
-            };
-
-
-            choices.SelectedDeleteEvent += async () =>
-            {
-                string assetName = choices.ChosenAsset;
-
-                DataManager.ModStatus modStatus = DataManager.GetEntryDataModStatus(assetName, dataType.ToString());
-
-                if (PathMod.Quest.IsValid() && modStatus == DataManager.ModStatus.Base)
-                {
-                    await MessageBox.Show(form, String.Format("The {0} {1} is not a part of the currently edited mod cannot be deleted.", dataType.ToString(), assetName), "Delete " + dataType.ToString(),
-                        MessageBox.MessageBoxButtons.Ok);
-                    return;
-                }
-
-                MessageBox.MessageBoxResult result;
-                if (modStatus == DataManager.ModStatus.Base || modStatus == DataManager.ModStatus.Added)
-                    result = await MessageBox.Show(form, String.Format("Are you sure you want to delete the following {0}:\n{1}", dataType.ToString(), assetName), "Delete " + dataType.ToString(),
-                        MessageBox.MessageBoxButtons.YesNo);
-                else
-                    result = await MessageBox.Show(form, String.Format("The following {0} will be reset back to the base game:\n{1}", dataType.ToString(), assetName), "Delete " + dataType.ToString(),
-                        MessageBox.MessageBoxButtons.YesNo);
-
-                if (result == MessageBox.MessageBoxResult.No)
-                    return;
-
-                lock (GameBase.lockObj)
-                {
-                    DataManager.Instance.ContentChanged(dataType, assetName, null);
-                    choices.DeleteEntry(assetName);
-                    if (DataManager.Instance.DataIndices[dataType].ContainsKey(assetName))
-                    {
-                        string newName = DataManager.Instance.DataIndices[dataType].Get(assetName).GetLocalString(true);
-                        choices.AddEntry(assetName, newName);
-                    }
-
-                    if (dataType == DataManager.DataType.Zone)
-                    {
-                        string str = LuaEngine.MakeZoneScriptPath(assetName, "");
-                        if (Directory.Exists(str))
-                            Directory.Delete(str, true);
-                    }
-                }
-            };
-
-            choices.SelectedSaveFileEvent += async () =>
-            {
-                string entryNum = choices.ChosenAsset;
-                if (DataManager.GetEntryDataModStatus(entryNum, dataType.ToString()) == DataManager.ModStatus.Base)
-                {
-                    await MessageBox.Show(form, String.Format("{0} must have saved edits first!", entryNum), "Error", MessageBox.MessageBoxButtons.Ok);
-                    return;
-                }
-
-                lock (GameBase.lockObj)
-                {
-                    IEntryData data = entryOp(entryNum);
-                    DataManager.Instance.ContentResaved(dataType, entryNum, data, false);
-
-                    string newName = DataManager.Instance.DataIndices[dataType].Get(entryNum).GetLocalString(true);
-                    choices.ModifyEntry(entryNum, newName);
-                }
-
-                await MessageBox.Show(form, String.Format("{0} is now saved as a file.", entryNum), "Complete", MessageBox.MessageBoxButtons.Ok);
-            };
-
-            choices.SelectedSaveDiffEvent += async () =>
-            {
-                string entryNum = choices.ChosenAsset;
-                DataManager.ModStatus modStatus = DataManager.GetEntryDataModStatus(entryNum, dataType.ToString());
-                if (modStatus == DataManager.ModStatus.Base)
-                {
-                    await MessageBox.Show(form, String.Format("{0} must have saved edits first!", entryNum), "Error", MessageBox.MessageBoxButtons.Ok);
-                    return;
-                }
-                else if (modStatus == DataManager.ModStatus.Added)
-                {
-                    await MessageBox.Show(form, String.Format("{0} is newly added in this mod and cannot be saved as patch.", entryNum), "Error", MessageBox.MessageBoxButtons.Ok);
-                    return;
-                }
-
-                lock (GameBase.lockObj)
-                {
-                    IEntryData data = entryOp(entryNum);
-                    DataManager.Instance.ContentResaved(dataType, entryNum, data, true);
-
-                    string newName = DataManager.Instance.DataIndices[dataType].Get(entryNum).GetLocalString(true);
-                    choices.ModifyEntry(entryNum, newName);
-                }
-
-                if (DataManager.GetEntryDataModStatus(entryNum, dataType.ToString()) == DataManager.ModStatus.Base)
-                    await MessageBox.Show(form, String.Format("Modded {0} was identical to base. Unneeded patch removed.", entryNum), "Complete", MessageBox.MessageBoxButtons.Ok);
-                else
-                    await MessageBox.Show(form, String.Format("{0} is now saved as a patch.", entryNum), "Complete", MessageBox.MessageBoxButtons.Ok);
-            };
-
-            return choices;
-        }
-
-
-        public static ContextMenu CreateContextMenu(DataListFormViewModel vm)
-        {
-            ContextMenu saveAsStrip = new ContextMenu();
-
-            MenuItem saveAsFileMenuItem = new MenuItem();
-            MenuItem saveAsDiffMenuItem = new MenuItem();
-
-            Avalonia.Collections.AvaloniaList<object> list = new Avalonia.Collections.AvaloniaList<object>();
-            list.AddRange(new MenuItem[] {
-                            saveAsFileMenuItem,
-                            saveAsDiffMenuItem});
-            saveAsStrip.ItemsSource = list;
-
-            saveAsFileMenuItem.Header = "Resave as File";
-            saveAsDiffMenuItem.Header = "Resave as Patch";
-
-#pragma warning disable CS1998 // Async method lacks 'await' operators and will run synchronously
-            saveAsFileMenuItem.Click += async (object copySender, RoutedEventArgs copyE) =>
-#pragma warning restore CS1998 // Async method lacks 'await' operators and will run synchronously
-            {
-                vm.mnuDataFile_Click();
-            };
-#pragma warning disable CS1998 // Async method lacks 'await' operators and will run synchronously
-            saveAsDiffMenuItem.Click += async (object copySender, RoutedEventArgs copyE) =>
-#pragma warning restore CS1998 // Async method lacks 'await' operators and will run synchronously
-            {
-                vm.mnuDataDiff_Click();
-            };
-            return saveAsStrip;
-        }
-
-
-        public void btnMapEditor_Click()
-        {
-            lock (GameBase.lockObj)
-            {
-                Views.DevForm form = (Views.DevForm)DiagManager.Instance.DevEditor;
-                if (form.MapEditorPage == null)
-                {
-                    LuaEngine.Instance.BreakScripts();
-                    MenuManager.Instance.ClearMenus();
-                    if (ZoneManager.Instance.CurrentMap != null)
-                        GameManager.Instance.SceneOutcome = GameManager.Instance.MoveToEditor(false, ZoneManager.Instance.CurrentMap.AssetName);
-                    else
-                        GameManager.Instance.SceneOutcome = GameManager.Instance.MoveToEditor(false, "");
-                }
-            }
-        }
-
-        public void btnGroundEditor_Click()
-        {
-            lock (GameBase.lockObj)
-            {
-                Views.DevForm form = (Views.DevForm)DiagManager.Instance.DevEditor;
-                if (form.GroundEditorPage == null)
-                {
-                    LuaEngine.Instance.BreakScripts();
-                    MenuManager.Instance.ClearMenus();
-                    if (ZoneManager.Instance.CurrentGround != null)
-                        GameManager.Instance.SceneOutcome = GameManager.Instance.MoveToEditor(true, ZoneManager.Instance.CurrentGround.AssetName);
-                    else
-                        GameManager.Instance.SceneOutcome = GameManager.Instance.MoveToEditor(true, "");
-                }
-            }
-        }
-
-    }
-}
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevTabSpritesViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevTabSpritesViewModel.cs
deleted file mode 100644
index 41c0f64f..00000000
--- a/RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevTabSpritesViewModel.cs
+++ /dev/null
@@ -1,93 +0,0 @@
-using RogueEssence.Content;
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace RogueEssence.Dev.ViewModels
-{
-    public class DevTabSpritesViewModel : ViewModelBase
-    {
-
-        public void btnEditSprites_Click()
-        {
-            SpeciesEditViewModel2 mv = new SpeciesEditViewModel2();
-            Views.SpeciesEditForm editForm = new Views.SpeciesEditForm();
-            mv.LoadFormDataEntries(true, editForm);
-            editForm.DataContext = mv;
-            editForm.Show();
-        }
-
-        public void btnEditPortraits_Click()
-        {
-            SpeciesEditViewModel2 mv = new SpeciesEditViewModel2();
-            Views.SpeciesEditForm editForm = new Views.SpeciesEditForm();
-            mv.LoadFormDataEntries(false, editForm);
-            editForm.DataContext = mv;
-            editForm.Show();
-        }
-
-        public void btnEditParticles_Click()
-        {
-            AnimEditViewModel mv = new AnimEditViewModel();
-            Views.AnimEditForm editForm = new Views.AnimEditForm();
-            mv.LoadDataEntries(GraphicsManager.AssetType.Particle, editForm);
-            editForm.DataContext = mv;
-            editForm.Show();
-        }
-
-        public void btnEditBeams_Click()
-        {
-            BeamEditViewModel mv = new BeamEditViewModel();
-            Views.AnimEditForm editForm = new Views.AnimEditForm();
-            mv.LoadDataEntries(GraphicsManager.AssetType.Beam, editForm);
-            editForm.DataContext = mv;
-            editForm.Show();
-        }
-
-        public void btnEditBGs_Click()
-        {
-            AnimEditViewModel mv = new AnimEditViewModel();
-            Views.AnimEditForm editForm = new Views.AnimEditForm();
-            mv.LoadDataEntries(GraphicsManager.AssetType.BG, editForm);
-            editForm.DataContext = mv;
-            editForm.Show();
-        }
-
-
-        public void btnEditEmotes_Click()
-        {
-            AnimEditViewModel mv = new AnimEditViewModel();
-            Views.AnimEditForm editForm = new Views.AnimEditForm();
-            mv.LoadDataEntries(GraphicsManager.AssetType.Icon, editForm);
-            editForm.DataContext = mv;
-            editForm.Show();
-        }
-
-        public void btnEditTiles_Click()
-        {
-            TilesetEditViewModel mv = new TilesetEditViewModel();
-            Views.TilesetEditForm editForm = new Views.TilesetEditForm();
-            mv.LoadDataEntries(editForm);
-            editForm.DataContext = mv;
-            editForm.Show();
-        }
-
-        public void btnEditItems_Click()
-        {
-            AnimEditViewModel mv = new AnimEditViewModel();
-            Views.AnimEditForm editForm = new Views.AnimEditForm();
-            mv.LoadDataEntries(GraphicsManager.AssetType.Item, editForm);
-            editForm.DataContext = mv;
-            editForm.Show();
-        }
-
-        public void btnEditObjects_Click()
-        {
-            AnimEditViewModel mv = new AnimEditViewModel();
-            Views.AnimEditForm editForm = new Views.AnimEditForm();
-            mv.LoadDataEntries(GraphicsManager.AssetType.Object, editForm);
-            editForm.DataContext = mv;
-            editForm.Show();
-        }
-    }
-}
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/ModSwitcherViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/DevForm/ModSwitcherViewModel.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/ViewModels/New/ModSwitcherViewModel.cs
rename to RogueEssence.Editor.Avalonia/ViewModels/DevForm/ModSwitcherViewModel.cs
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/ISpriteRootOperationStrategy.cs b/RogueEssence.Editor.Avalonia/ViewModels/DevForm/Nodes/ISpriteRootOperationStrategy.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/ISpriteRootOperationStrategy.cs
rename to RogueEssence.Editor.Avalonia/ViewModels/DevForm/Nodes/ISpriteRootOperationStrategy.cs
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/NodeBase.cs b/RogueEssence.Editor.Avalonia/ViewModels/DevForm/Nodes/NodeBase.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/NodeBase.cs
rename to RogueEssence.Editor.Avalonia/ViewModels/DevForm/Nodes/NodeBase.cs
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/SpriteRootAssetTypeStrategy.cs b/RogueEssence.Editor.Avalonia/ViewModels/DevForm/Nodes/SpriteRootAssetTypeStrategy.cs
similarity index 98%
rename from RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/SpriteRootAssetTypeStrategy.cs
rename to RogueEssence.Editor.Avalonia/ViewModels/DevForm/Nodes/SpriteRootAssetTypeStrategy.cs
index 41dbd731..d7910dba 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/SpriteRootAssetTypeStrategy.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/DevForm/Nodes/SpriteRootAssetTypeStrategy.cs
@@ -185,7 +185,6 @@ private void _recomputeAnimList()
             for (int ii = 0; ii < dirs.Length; ii++)
             {
                 string filename = Path.GetFileNameWithoutExtension(dirs[ii]);
-                _spriteRootNode.SubNodes.Add(_nodeFactory.CreateDataItemNode<DevEditPageViewModel>(filename, filename, "Icons.PaintBrushFill"));
             }
         }
     }
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/SpriteRootTileStrategy.cs b/RogueEssence.Editor.Avalonia/ViewModels/DevForm/Nodes/SpriteRootTileStrategy.cs
similarity index 96%
rename from RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/SpriteRootTileStrategy.cs
rename to RogueEssence.Editor.Avalonia/ViewModels/DevForm/Nodes/SpriteRootTileStrategy.cs
index 29f99ccf..a3103b18 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Nodes/SpriteRootTileStrategy.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/DevForm/Nodes/SpriteRootTileStrategy.cs
@@ -108,9 +108,9 @@ await Dispatcher.UIThread.InvokeAsync(async () =>
 
             // string folder = results.First().Path.LocalPath;
 
-            MapRetileViewModel viewModel =
-                new MapRetileViewModel(GraphicsManager.TileSize, "Tile size must be divisible by 8.");
-            bool sizeResult = await _dialogService.ShowDialogAsync<MapRetileViewModel, bool>(viewModel, "");
+            MapRetileWindowViewModel viewModel =
+                new MapRetileWindowViewModel(GraphicsManager.TileSize, "Tile size must be divisible by 8.");
+            bool sizeResult = await _dialogService.ShowDialogAsync<MapRetileWindowViewModel, bool>(viewModel, "");
 
             int size = viewModel.TileSize;
 
@@ -212,9 +212,9 @@ public async Task ImportAsync()
                 return;
         }
 
-        MapRetileViewModel viewModel =
-            new MapRetileViewModel(GraphicsManager.TileSize, "Tile size must be divisible by 8.");
-        bool sizeResult = await _dialogService.ShowDialogAsync<MapRetileViewModel, bool>(viewModel, "");
+        MapRetileWindowViewModel viewModel =
+            new MapRetileWindowViewModel(GraphicsManager.TileSize, "Tile size must be divisible by 8.");
+        bool sizeResult = await _dialogService.ShowDialogAsync<MapRetileWindowViewModel, bool>(viewModel, "");
 
         int size = viewModel.TileSize;
 
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/TabSwitcherViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/DevForm/TabSwitcherViewModel.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/ViewModels/New/TabSwitcherViewModel.cs
rename to RogueEssence.Editor.Avalonia/ViewModels/DevForm/TabSwitcherViewModel.cs
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/DialogBoxes/AnimChoiceViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/DialogBoxes/AnimChoiceViewModel.cs
deleted file mode 100644
index c8c2464e..00000000
--- a/RogueEssence.Editor.Avalonia/ViewModels/DialogBoxes/AnimChoiceViewModel.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using RogueEssence;
-using RogueEssence.Dungeon;
-using RogueEssence.Ground;
-using RogueEssence.Data;
-using ReactiveUI;
-using System.Collections.ObjectModel;
-using RogueEssence.Content;
-
-namespace RogueEssence.Dev.ViewModels
-{
-    public class AnimChoiceViewModel : ViewModelBase
-    {
-        public AnimChoiceViewModel(int[] anims)
-        {
-            Anims = new ObservableCollection<string>();
-            foreach (int anim in anims)
-                Anims.Add(GraphicsManager.Actions[anim].Name);
-        }
-
-        public ObservableCollection<string> Anims { get; }
-
-        private int chosenAnim;
-        public int ChosenAnim
-        {
-            get => chosenAnim;
-            set => this.SetIfChanged(ref chosenAnim, value);
-        }
-
-    }
-}
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/DialogBoxes/AnimChoiceWindowViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/DialogBoxes/AnimChoiceWindowViewModel.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/ViewModels/New/DialogBoxes/AnimChoiceWindowViewModel.cs
rename to RogueEssence.Editor.Avalonia/ViewModels/DialogBoxes/AnimChoiceWindowViewModel.cs
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/DialogBoxes/DialogViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/DialogBoxes/DialogViewModel.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/ViewModels/New/DialogBoxes/DialogViewModel.cs
rename to RogueEssence.Editor.Avalonia/ViewModels/DialogBoxes/DialogViewModel.cs
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/DialogBoxes/MapLayerWindowViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/DialogBoxes/MapLayerWindowViewModel.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/ViewModels/New/DialogBoxes/MapLayerWindowViewModel.cs
rename to RogueEssence.Editor.Avalonia/ViewModels/DialogBoxes/MapLayerWindowViewModel.cs
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/DialogBoxes/MapResizeViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/DialogBoxes/MapResizeViewModel.cs
deleted file mode 100644
index e32bde42..00000000
--- a/RogueEssence.Editor.Avalonia/ViewModels/DialogBoxes/MapResizeViewModel.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using RogueEssence;
-using RogueEssence.Dungeon;
-using RogueEssence.Ground;
-using RogueEssence.Data;
-using ReactiveUI;
-using RogueElements;
-
-namespace RogueEssence.Dev.ViewModels
-{
-    public class MapResizeViewModel : ViewModelBase
-    {
-        public MapResizeViewModel(int mapWidth, int mapHeight)
-        {
-            this.mapWidth = mapWidth;
-            this.mapHeight = mapHeight;
-            this.resizeDir = Dir8.None;
-        }
-
-        private int mapWidth;
-        public int MapWidth
-        {
-            get { return mapWidth; }
-            set
-            {
-                this.SetIfChanged(ref mapWidth, value);
-            }
-        }
-
-        private int mapHeight;
-        public int MapHeight
-        {
-            get { return mapHeight; }
-            set
-            {
-                this.SetIfChanged(ref mapHeight, value);
-            }
-        }
-
-        private Dir8 resizeDir;
-        public Dir8 ResizeDir
-        {
-            get { return resizeDir; }
-            set
-            {
-                this.SetIfChanged(ref resizeDir, value);
-            }
-        }
-
-        public void btnUpLeft_Click()
-        {
-            ResizeDir = Dir8.UpLeft;
-        }
-        public void btnUp_Click()
-        {
-            ResizeDir = Dir8.Up;
-        }
-        public void btnUpRight_Click()
-        {
-            ResizeDir = Dir8.UpRight;
-        }
-
-        public void btnLeft_Click()
-        {
-            ResizeDir = Dir8.Left;
-        }
-        public void btnNone_Click()
-        {
-            ResizeDir = Dir8.None;
-        }
-        public void btnRight_Click()
-        {
-            ResizeDir = Dir8.Right;
-        }
-
-        public void btnDownLeft_Click()
-        {
-            ResizeDir = Dir8.DownLeft;
-        }
-        public void btnDown_Click()
-        {
-            ResizeDir = Dir8.Down;
-        }
-        public void btnDownRight_Click()
-        {
-            ResizeDir = Dir8.DownRight;
-        }
-    }
-}
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/DialogBoxes/MapResizeWindowViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/DialogBoxes/MapResizeWindowViewModel.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/ViewModels/New/DialogBoxes/MapResizeWindowViewModel.cs
rename to RogueEssence.Editor.Avalonia/ViewModels/DialogBoxes/MapResizeWindowViewModel.cs
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/DialogBoxes/MapRetileViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/DialogBoxes/MapRetileViewModel.cs
deleted file mode 100644
index 3db28a2d..00000000
--- a/RogueEssence.Editor.Avalonia/ViewModels/DialogBoxes/MapRetileViewModel.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using RogueEssence;
-using RogueEssence.Dungeon;
-using RogueEssence.Ground;
-using RogueEssence.Data;
-using ReactiveUI;
-
-namespace RogueEssence.Dev.ViewModels
-{
-    public class MapRetileViewModel : ViewModelBase
-    {
-        public MapRetileViewModel(int origSize, string msg)
-        {
-            TileSize = origSize;
-            Message = msg;
-        }
-
-        private int tileSize;
-        public int TileSize
-        {
-            get { return tileSize; }
-            set
-            {
-                this.SetIfChanged(ref tileSize, value);
-                AllowConfirm = (tileSize % 8 == 0);
-            }
-        }
-
-        private bool allowConfirm;
-        public bool AllowConfirm
-        {
-            get { return allowConfirm; }
-            set
-            {
-                this.SetIfChanged(ref allowConfirm, value);
-            }
-        }
-
-
-        private string message;
-        public string Message
-        {
-            get { return message; }
-            set
-            {
-                this.SetIfChanged(ref message, value);
-            }
-        }
-    }
-}
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/DialogBoxes/MapRetileWindowViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/DialogBoxes/MapRetileWindowViewModel.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/ViewModels/New/DialogBoxes/MapRetileWindowViewModel.cs
rename to RogueEssence.Editor.Avalonia/ViewModels/DialogBoxes/MapRetileWindowViewModel.cs
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/DialogBoxes/MessageBoxWindowViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/DialogBoxes/MessageBoxWindowViewModel.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/ViewModels/New/DialogBoxes/MessageBoxWindowViewModel.cs
rename to RogueEssence.Editor.Avalonia/ViewModels/DialogBoxes/MessageBoxWindowViewModel.cs
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/DialogBoxes/ModConfigViewModel2.cs b/RogueEssence.Editor.Avalonia/ViewModels/DialogBoxes/ModConfigViewModel2.cs
deleted file mode 100644
index c273c8ec..00000000
--- a/RogueEssence.Editor.Avalonia/ViewModels/DialogBoxes/ModConfigViewModel2.cs
+++ /dev/null
@@ -1,159 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using RogueEssence;
-using RogueEssence.Dungeon;
-using RogueEssence.Ground;
-using RogueEssence.Data;
-using ReactiveUI;
-using System.Collections.ObjectModel;
-using RogueEssence.Dev.Services;
-using RogueEssence.Dev.Views;
-
-namespace RogueEssence.Dev.ViewModels
-{
-    public class ModConfigViewModel2 : ViewModelBase
-    {
-        public ModConfigViewModel2(IDialogService dialogService, ModHeader header)
-        {
-            Name = header.Name;
-            Namespace = header.Namespace;
-            Author = header.Author;
-            Description = header.Description;
-            UUID = header.UUID.ToString().ToUpper();
-            Version = header.Version.ToString();
-            GameVersion = header.GameVersion.ToString();
-
-            ModTypes = new ObservableCollection<string>();
-            for (int ii = 0; ii < (int)PathMod.ModType.Count; ii++)
-                ModTypes.Add(((PathMod.ModType)ii).ToLocal());
-            ChosenModType = (int)header.ModType;
-
-            DevForm form = (DevForm)DiagManager.Instance.DevEditor;
-            Relationships = new CollectionBoxViewModel(dialogService, new StringConv(typeof(RelatedMod), new object[0]));
-            Relationships.OnEditItem += Relationships_EditItem;
-            Relationships.LoadFromList(header.Relationships);
-        }
-
-        private string name;
-        public string Name
-        {
-            get => name;
-            set => this.SetIfChanged(ref name, value);
-        }
-
-        private string author;
-        public string Author
-        {
-            get => author;
-            set => this.SetIfChanged(ref author, value);
-        }
-
-        private string description;
-        public string Description
-        {
-            get => description;
-            set => this.SetIfChanged(ref description, value);
-        }
-
-        private string editNamespace;
-        public string Namespace
-        {
-            get => editNamespace;
-            set => this.SetIfChanged(ref editNamespace, value);
-        }
-
-        private string uuid;
-        public string UUID
-        {
-            get => uuid;
-            set => this.SetIfChanged(ref uuid, value);
-        }
-
-
-        private string version;
-        public string Version
-        {
-            get => version;
-            set => this.SetIfChanged(ref version, value);
-        }
-
-
-        private string gameVersion;
-        public string GameVersion
-        {
-            get => gameVersion;
-            set => this.SetIfChanged(ref gameVersion, value);
-        }
-
-        public ObservableCollection<string> ModTypes { get; }
-
-        private int chosenModType;
-        public int ChosenModType
-        {
-            get => chosenModType;
-            set => this.SetIfChanged(ref chosenModType, value);
-        }
-
-        public CollectionBoxViewModel Relationships { get; set; }
-
-
-        public void Relationships_EditItem(int index, object element, bool advancedEdit, CollectionBoxViewModel.EditElementOp op)
-        {
-            string elementName = "Relationship[" + index + "]";
-            DataEditForm frmData = new DataEditRootForm();
-            frmData.Title = DataEditor.GetWindowTitle("Relationship", elementName, element, typeof(RelatedMod), new object[0]);
-
-            //TODO: make this a member and reference it that way
-            DataEditor.LoadClassControls(frmData.ControlPanel, "Relationship", null, elementName, typeof(RelatedMod), new object[0], element, true, new Type[0], advancedEdit);
-            DataEditor.TrackTypeSize(frmData, typeof(RelatedMod));
-
-            frmData.SelectedOKEvent += async () =>
-            {
-                element = DataEditor.SaveClassControls(frmData.ControlPanel, elementName, typeof(RelatedMod), new object[0], true, new Type[0], advancedEdit);
-
-                bool itemExists = false;
-
-                List<RelatedMod> relations = Relationships.GetList<List<RelatedMod>>();
-                for (int ii = 0; ii < relations.Count; ii++)
-                {
-                    if (ii != index)
-                    {
-                        if (relations[ii].UUID == ((RelatedMod)element).UUID)
-                            itemExists = true;
-                    }
-                }
-
-                if (String.IsNullOrEmpty(((RelatedMod)element).Namespace))
-                {
-                    await MessageBox.Show(frmData, "Related mod needs a namespace!", "Namespace needed.", MessageBox.MessageBoxButtons.Ok);
-                    return false;
-                }
-                if (itemExists)
-                {
-                    await MessageBox.Show(frmData, "Cannot add duplicate entries.", "Entry with UUID already exists.", MessageBox.MessageBoxButtons.Ok);
-                    return false;
-                }
-                else
-                {
-                    op(index, element);
-                    return true;
-                }
-            };
-
-            //this.RegisterChild(frmData);
-            frmData.Show();
-        }
-
-        public RelatedMod[] GetRelationshipArray()
-        {
-            List<RelatedMod> relationships = Relationships.GetList<List<RelatedMod>>();
-            return relationships.ToArray();
-        }
-
-        public void btnRegenUUID_Click()
-        {
-            UUID = Guid.NewGuid().ToString().ToUpper();
-        }
-    }
-}
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/DevForm/ModManagerViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/DialogBoxes/ModManagerViewModel.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/ViewModels/DevForm/ModManagerViewModel.cs
rename to RogueEssence.Editor.Avalonia/ViewModels/DialogBoxes/ModManagerViewModel.cs
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/DialogBoxes/ModNameWindowViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/DialogBoxes/ModNameWindowViewModel.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/ViewModels/New/DialogBoxes/ModNameWindowViewModel.cs
rename to RogueEssence.Editor.Avalonia/ViewModels/DialogBoxes/ModNameWindowViewModel.cs
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/DialogBoxes/PreferencesWindowViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/DialogBoxes/PreferencesWindowViewModel.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/ViewModels/New/DialogBoxes/PreferencesWindowViewModel.cs
rename to RogueEssence.Editor.Avalonia/ViewModels/DialogBoxes/PreferencesWindowViewModel.cs
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/DialogBoxes/RenameViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/DialogBoxes/RenameViewModel.cs
deleted file mode 100644
index 9bc1fde3..00000000
--- a/RogueEssence.Editor.Avalonia/ViewModels/DialogBoxes/RenameViewModel.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using RogueEssence;
-using RogueEssence.Dungeon;
-using RogueEssence.Ground;
-using RogueEssence.Data;
-using ReactiveUI;
-
-namespace RogueEssence.Dev.ViewModels
-{
-    public class RenameViewModel : ViewModelBase
-    {
-        public RenameViewModel()
-        {
-            Name = "";
-        }
-
-        private string name;
-        public string Name
-        {
-            get => name;
-            set => this.SetIfChanged(ref name, value);
-        }
-
-    }
-}
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/DialogBoxes/RenameWindowViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/DialogBoxes/RenameWindowViewModel.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/ViewModels/New/DialogBoxes/RenameWindowViewModel.cs
rename to RogueEssence.Editor.Avalonia/ViewModels/DialogBoxes/RenameWindowViewModel.cs
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/GroundEditViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/GroundEditViewModel.cs
deleted file mode 100644
index a9608148..00000000
--- a/RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/GroundEditViewModel.cs
+++ /dev/null
@@ -1,633 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Text;
-using RogueEssence;
-using RogueEssence.Dungeon;
-using RogueEssence.Ground;
-using RogueEssence.Data;
-using Avalonia.Controls;
-using System.IO;
-using RogueEssence.Dev.Views;
-using RogueEssence.Content;
-using RogueElements;
-using RogueEssence.Script;
-using System.Linq;
-using ReactiveUI;
-using System.Collections.ObjectModel;
-using System.Diagnostics;
-using System.Threading.Tasks;
-using Avalonia.Platform.Storage;
-using Avalonia.Threading;
-
-namespace RogueEssence.Dev.ViewModels
-{
-    public class GroundEditViewModel : ViewModelBase
-    {
-        public GroundEditViewModel()
-        {
-            // Textures = new GroundTabTexturesViewModel(null);
-            // Decorations = new GroundTabDecorationsViewModel();
-            // Walls = new GroundTabWallsViewModel();
-            // Entities = new GroundTabEntitiesViewModel();
-            // Properties = new GroundTabPropertiesViewModel();
-            // Strings = new GroundTabStringsViewModel();
-            // Script = new GroundTabScriptViewModel();
-            // CurrentFile = "";
-        }
-
-        public GroundTabTexturesViewModel Textures { get; set; }
-        public GroundTabDecorationsViewModel Decorations { get; set; }
-        public GroundTabWallsViewModel Walls { get; set; }
-        public GroundTabEntitiesViewModel Entities { get; set; }
-        public GroundTabPropertiesViewModel Properties { get; set; }
-        public GroundTabStringsViewModel Strings { get; set; }
-        public GroundTabScriptViewModel Script { get; set; }
-
-        private string currentFile;
-        public string CurrentFile
-        {
-            get => currentFile;
-            set => this.SetIfChanged(ref currentFile, value);
-        }
-
-        private int selectedTabIndex;
-        public int SelectedTabIndex
-        {
-            get => selectedTabIndex;
-            set
-            {
-                this.SetIfChanged(ref selectedTabIndex, value);
-                TabChanged();
-            }
-        }
-
-
-        public void mnuNew_Click()
-        {
-            CurrentFile = "";
-
-            lock (GameBase.lockObj) //Schedule the map creation
-                DoNew();
-        }
-
-        public async void mnuOpen_Click()
-        {
-
-            // string mapDir = Path.GetFullPath(PathMod.ModPath(DataManager.GROUND_PATH));
-            // DevForm form = (DevForm)DiagManager.Instance.DevEditor;
-            // IStorageFolder directory = await form.GroundEditorPage.StorageProvider.TryGetFolderFromPathAsync(mapDir);
-            // await Dispatcher.UIThread.InvokeAsync(async () =>
-            // {
-            //     IReadOnlyList<IStorageFile> results = await form.GroundEditorPage.StorageProvider.OpenFilePickerAsync(new FilePickerOpenOptions
-            //     {
-            //         Title = "Open .rsground File",
-            //         SuggestedStartLocation = directory,
-            //         AllowMultiple = false,
-            //         FileTypeFilter =
-            //         [
-            //             new FilePickerFileType("Ground Files")
-            //             {
-            //                 Patterns = ["*." + DataManager.GROUND_EXT.Substring(1)]
-            //             }
-            //         ]
-            //     });
-            //     
-            //     if (results.Count > 0)
-            //     {
-            //         IStorageFile result = results.First();
-            //        
-            //         bool legalPath = false;
-            //         foreach (string proposedPath in PathMod.FallbackPaths(DataManager.GROUND_PATH))
-            //         {
-            //             if (comparePaths(proposedPath, Path.GetDirectoryName(result.Path.LocalPath)))
-            //                 legalPath = true;
-            //         }
-            //
-            //         if (!legalPath)
-            //             await MessageBox.Show(form.GroundEditorPage,
-            //                 String.Format("Map can only be loaded from:\n{0}\nOr one of its parents.",
-            //                     PathMod.ModPath(DataManager.GROUND_PATH)), "Error",
-            //                 MessageBox.MessageBoxButtons.Ok);
-            //         else
-            //         {
-            //             lock (GameBase.lockObj)
-            //                 DoLoad(Path.GetFileNameWithoutExtension(result.Name));
-            //         }
-            //     }
-            // });
-        }
-
-        public async Task<bool> mnuSave_Click()
-        {
-            if (CurrentFile == "")
-                return await mnuSaveAs_Click(); //Since its the same thing, might as well re-use the function! It makes everyone's lives easier!
-            else
-            {
-                string reqDir = PathMod.HardMod(DataManager.GROUND_PATH);
-                string result = Path.Join(reqDir, Path.GetFileName(CurrentFile));
-                lock (GameBase.lockObj)
-                {
-                    string oldFilename = CurrentFile;
-                    DoSave(ZoneManager.Instance.CurrentGround, result, oldFilename);
-                }
-                return true;
-            }
-        }
-        public async Task<bool> mnuSaveAs_Click()
-        {
-            // string mapDir = Path.GetFullPath(PathMod.ModPath(DataManager.GROUND_PATH));
-            // SaveFileDialog saveFileDialog = new SaveFileDialog();
-            // saveFileDialog.Directory = mapDir;
-            //
-            // FileDialogFilter filter = new FileDialogFilter();
-            // filter.Name = "Ground Files";
-            // filter.Extensions.Add(DataManager.GROUND_EXT.Substring(1));
-            // saveFileDialog.Filters.Add(filter);
-            //
-            // DevForm form = (DevForm)DiagManager.Instance.DevEditor;
-            //
-            // string result = await saveFileDialog.ShowAsync(form.GroundEditorPage);
-            //
-            // if (!String.IsNullOrEmpty(result))
-            // {
-            //     string reqDir = PathMod.HardMod(DataManager.GROUND_PATH);
-            //     if (!comparePaths(reqDir, Path.GetDirectoryName(result)))
-            //         await MessageBox.Show(form.GroundEditorPage, String.Format("Map can only be saved to:\n{0}", reqDir), "Error", MessageBox.MessageBoxButtons.Ok);
-            //     else if (Path.GetFileName(result).Contains(" "))
-            //         await MessageBox.Show(form.GroundEditorPage, String.Format("Save file should not contain white space:\n{0}", Path.GetFileName(result)), "Error", MessageBox.MessageBoxButtons.Ok);
-            //     else
-            //     {
-            //         lock (GameBase.lockObj)
-            //         {
-            //             string oldFilename = CurrentFile;
-            //
-            //             //Schedule saving the map
-            //             DoSave(ZoneManager.Instance.CurrentGround, result, oldFilename);
-            //         }
-            //         return true;
-            //     }
-            // }
-            // return false;
-            return false;
-        }
-
-        public async void mnuTest_Click()
-        {
-            // bool saved = await mnuSave_Click();
-            // if (saved)
-            // {
-            //     lock (GameBase.lockObj)
-            //     {
-            //         DevForm form = (DevForm)DiagManager.Instance.DevEditor;
-            //         form.GroundEditorPage.SilentClose();
-            //         form.GroundEditorPage = null;
-            //         GameManager.Instance.SceneOutcome = GameManager.Instance.TestWarp(ZoneManager.Instance.CurrentGround.AssetName, true, MathUtils.Rand.NextUInt64());
-            //     }
-            // }
-        }
-
-        public async void mnuImportFromPng_Click()
-        {
-            // string mapDir = Path.GetFullPath(PathMod.ModPath(DataManager.GROUND_PATH));
-            //
-            //
-            // DevForm form = (DevForm)DiagManager.Instance.DevEditor;
-            //
-            //
-            // IStorageFolder directory = await form.GroundEditorPage.StorageProvider.TryGetFolderFromPathAsync(mapDir);
-            // await Dispatcher.UIThread.InvokeAsync(async () =>
-            // {
-            //     IReadOnlyList<IStorageFile> results = await form.GroundEditorPage.StorageProvider.OpenFilePickerAsync(new FilePickerOpenOptions 
-            //         {
-            //             Title = "Open .png File",
-            //             SuggestedStartLocation = directory,
-            //             AllowMultiple = false,
-            //             FileTypeFilter =
-            //             [
-            //                 new FilePickerFileType("PNG Files")
-            //                 {
-            //                     Patterns = ["*.PNG"]
-            //                 }
-            //             ]
-            //         }
-            //     );
-            //     
-            //     if (results.Count > 0)
-            //         DoImportPng(results.First().Path.LocalPath);
-            //
-            // });
-        }
-
-
-        public void mnuClearLayer_Click()
-        {
-            lock (GameBase.lockObj)
-                DoClearLayer();
-        }
-
-
-        public async void mnuImportFromTileset_Click()
-        {
-            // DevForm form = (DevForm)DiagManager.Instance.DevEditor;
-            //
-            // if (Textures.TileBrowser.CurrentTileset == "")
-            //     await MessageBox.Show(form.GroundEditorPage, String.Format("No tileset to import!"), "Error", MessageBox.MessageBoxButtons.Ok);
-            // else
-            // {
-            //     lock (GameBase.lockObj)
-            //         DoImportTileset(Textures.TileBrowser.CurrentTileset);
-            // }
-        }
-
-
-        public async void mnuReSize_Click()
-        {
-
-            // MapResizeWindow window = new MapResizeWindow();
-            // MapResizeViewModel viewModel = new MapResizeViewModel(ZoneManager.Instance.CurrentGround.Width, ZoneManager.Instance.CurrentGround.Height);
-            // window.DataContext = viewModel;
-            //
-            // DevForm form = (DevForm)DiagManager.Instance.DevEditor;
-            //
-            // bool result = await window.ShowDialog<bool>(form.GroundEditorPage);
-            //
-            // lock (GameBase.lockObj)
-            // {
-            //     if (result)
-            //     {
-            //         //TODO: support undo for this
-            //         DiagManager.Instance.DevEditor.GroundEditor.Edits.Clear();
-            //
-            //         DiagManager.Instance.LoadMsg = "Resizing Map...";
-            //         DevForm.EnterLoadPhase(GameBase.LoadPhase.Content);
-            //
-            //         ZoneManager.Instance.CurrentGround.ResizeJustified(viewModel.MapWidth, viewModel.MapHeight, viewModel.ResizeDir);
-            //
-            //         DevForm.EnterLoadPhase(GameBase.LoadPhase.Ready);
-            //     }
-            // }
-        }
-
-        public async void mnuReTile_Click()
-        {
-            // MapRetileWindow window = new MapRetileWindow();
-            // MapRetileViewModel viewModel = new MapRetileViewModel(ZoneManager.Instance.CurrentGround.TileSize, "Tile size must be divisible by 8. All textures will be erased from all layers upon completing this operation.");
-            // window.DataContext = viewModel;
-            //
-            // DevForm form = (DevForm)DiagManager.Instance.DevEditor;
-            //
-            // bool result = await window.ShowDialog<bool>(form.GroundEditorPage);
-            //
-            // lock (GameBase.lockObj)
-            // {
-            //     bool sizeChanged = viewModel.TileSize != ZoneManager.Instance.CurrentGround.TileSize;
-            //     if (result && sizeChanged)
-            //     {
-            //         //TODO: support undo for this
-            //         DiagManager.Instance.DevEditor.GroundEditor.Edits.Clear();
-            //
-            //         DiagManager.Instance.LoadMsg = "Retiling Map...";
-            //         DevForm.EnterLoadPhase(GameBase.LoadPhase.Content);
-            //
-            //         ZoneManager.Instance.CurrentGround.Retile(viewModel.TileSize / GraphicsManager.TEX_SIZE);
-            //
-            //         Textures.TileBrowser.TileSize = ZoneManager.Instance.CurrentGround.TileSize;
-            //         Textures.AutotileBrowser.TileSize = ZoneManager.Instance.CurrentGround.TileSize;
-            //         ZoneManager.Instance.CurrentGround.BlankBG = new AutoTile();
-            //         Properties.BlankBG.LoadFromSource(ZoneManager.Instance.CurrentGround.BlankBG);
-            //
-            //         DevForm.EnterLoadPhase(GameBase.LoadPhase.Ready);
-            //     }
-            // }
-        }
-
-        public void mnuUndo_Click()
-        {
-            if (DiagManager.Instance.DevEditor.GroundEditor.Edits.CanUndo)
-            {
-                DiagManager.Instance.DevEditor.GroundEditor.Edits.Undo();
-                ProcessUndo();
-            }
-        }
-
-        public void mnuRedo_Click()
-        {
-            if (DiagManager.Instance.DevEditor.GroundEditor.Edits.CanRedo)
-                DiagManager.Instance.DevEditor.GroundEditor.Edits.Redo();
-        }
-
-        private void DoNew()
-        {
-            DiagManager.Instance.DevEditor.GroundEditor.Edits.Clear();
-            //take all the necessary steps before and after moving to the map
-
-            DiagManager.Instance.LoadMsg = "Loading Map...";
-            DevForm.EnterLoadPhase(GameBase.LoadPhase.Content);
-            GameManager.Instance.ForceReady();
-
-            ZoneManager.Instance.CurrentZone.DevNewGround();
-            ZoneManager.Instance.CurrentGround.OnEditorInit();
-
-            loadEditorSettings();
-            DevForm.EnterLoadPhase(GameBase.LoadPhase.Ready);
-        }
-        private void DoLoad(string mapName)
-        {
-            DiagManager.Instance.DevEditor.GroundEditor.Edits.Clear();
-            //take all the necessary steps before and after moving to the map
-
-            DiagManager.Instance.LoadMsg = "Loading Map...";
-            DevForm.EnterLoadPhase(GameBase.LoadPhase.Content);
-            GameManager.Instance.ForceReady();
-
-            ZoneManager.Instance.CurrentZone.DevLoadGround(mapName);
-            ZoneManager.Instance.CurrentGround.OnEditorInit();
-
-            CurrentFile = PathMod.ModPath(Path.Combine(DataManager.GROUND_PATH, mapName + DataManager.GROUND_EXT));
-            loadEditorSettings();
-            DevForm.EnterLoadPhase(GameBase.LoadPhase.Ready);
-
-        }
-
-        public void LoadFromCurrentGround()
-        {
-            if (ZoneManager.Instance.CurrentGround.AssetName != "")
-                CurrentFile = PathMod.ModPath(Path.Combine(DataManager.GROUND_PATH, ZoneManager.Instance.CurrentGround.AssetName + DataManager.GROUND_EXT));
-            else
-                CurrentFile = "";
-
-            loadEditorSettings();
-        }
-
-        private void loadEditorSettings()
-        {
-            Textures.Layers.LoadLayers();
-            Textures.TileBrowser.TileSize = ZoneManager.Instance.CurrentGround.TileSize;
-            Textures.AutotileBrowser.TileSize = ZoneManager.Instance.CurrentGround.TileSize;
-
-            Decorations.SelectEntity(null);
-            Decorations.Layers.LoadLayers();
-            
-            Entities.SelectEntity(null);
-            Entities.Layers.LoadLayers();
-
-            Walls.SetupLayerVisibility();
-            Properties.LoadMapProperties();
-            Script.LoadScripts();
-            Strings.LoadStrings();
-        }
-
-        private void DoImportPng(string filePath)
-        {
-            DevForm.ExecuteOrPend(() => { tryImportPng(filePath); });
-
-            string sheetName = Path.GetFileNameWithoutExtension(filePath);
-            lock (GameBase.lockObj)
-            {
-                Textures.TileBrowser.UpdateTilesList();
-            }
-            Textures.TileBrowser.SelectTileset(sheetName);
-        }
-
-        private void tryImportPng(string filePath)
-        {
-            lock (GameBase.lockObj)
-            {
-                string sheetName = Path.GetFileNameWithoutExtension(filePath);
-                string outputFile = PathMod.HardMod(String.Format(GraphicsManager.TILE_PATTERN, sheetName));
-
-                //load into tilesets
-                using (BaseSheet tileset = BaseSheet.Import(filePath))
-                {
-                    List<BaseSheet[]> tileList = new List<BaseSheet[]>();
-                    tileList.Add(new BaseSheet[] { tileset });
-                    ImportHelper.SaveTileSheet(tileList, outputFile, ZoneManager.Instance.CurrentGround.TileSize);
-                }
-
-                GraphicsManager.RebuildIndices(GraphicsManager.AssetType.Tile);
-                GraphicsManager.ClearCaches(GraphicsManager.AssetType.Tile);
-                DevDataManager.ClearCaches();
-            }
-        }
-
-        private void DoClearLayer()
-        {
-            //TODO: support undo for this
-            DiagManager.Instance.DevEditor.GroundEditor.Edits.Clear();
-
-            DiagManager.Instance.LoadMsg = "Loading Map...";
-            DevForm.EnterLoadPhase(GameBase.LoadPhase.Content);
-
-            //set tilesets
-            for (int yy = 0; yy < ZoneManager.Instance.CurrentGround.Height; yy++)
-            {
-                for (int xx = 0; xx < ZoneManager.Instance.CurrentGround.Width; xx++)
-                    ZoneManager.Instance.CurrentGround.Layers[Textures.Layers.ChosenLayer].Tiles[xx][yy] = new AutoTile();
-            }
-
-            DevForm.EnterLoadPhase(GameBase.LoadPhase.Ready);
-        }
-
-        private void DoImportTileset(string sheetName)
-        {
-            //TODO: support undo for this
-            DiagManager.Instance.DevEditor.GroundEditor.Edits.Clear();
-
-            Loc newSize = GraphicsManager.TileIndex.GetTileDims(sheetName);
-
-            DiagManager.Instance.LoadMsg = "Loading Map...";
-            DevForm.EnterLoadPhase(GameBase.LoadPhase.Content);
-
-            ZoneManager.Instance.CurrentGround.ResizeJustified(Math.Max(newSize.X, ZoneManager.Instance.CurrentGround.Width), Math.Max(newSize.Y, ZoneManager.Instance.CurrentGround.Height), Dir8.UpLeft);
-
-            //set tilesets
-            for (int yy = 0; yy < newSize.Y; yy++)
-            {
-                for (int xx = 0; xx < newSize.X; xx++)
-                {
-                    AutoTile tile = new AutoTile();
-                    TileFrame newFrame = new TileFrame(new Loc(xx, yy), sheetName);
-                    //check for emptiness
-                    long tilePos = GraphicsManager.TileIndex.GetPosition(newFrame.Sheet, newFrame.TexLoc);
-                    if (tilePos > 0)
-                        tile.Layers.Add(new TileLayer(newFrame));
-
-                    ZoneManager.Instance.CurrentGround.Layers[Textures.Layers.ChosenLayer].Tiles[xx][yy] = tile;
-                }
-            }
-
-            DevForm.EnterLoadPhase(GameBase.LoadPhase.Ready);
-        }
-
-        //TODO: standardize adding of frames
-        private void DoImportTilesetToFrames(string sheetName)
-        {
-            //TODO: support undo for this
-            DiagManager.Instance.DevEditor.GroundEditor.Edits.Clear();
-
-            Loc newSize = GraphicsManager.TileIndex.GetTileDims(sheetName);
-
-            DiagManager.Instance.LoadMsg = "Loading Map...";
-            DevForm.EnterLoadPhase(GameBase.LoadPhase.Content);
-
-            ZoneManager.Instance.CurrentGround.ResizeJustified(Math.Max(newSize.X, ZoneManager.Instance.CurrentGround.Width), Math.Max(newSize.Y, ZoneManager.Instance.CurrentGround.Height), Dir8.UpLeft);
-
-            //count highest frames
-            int maxFrames = 0;
-            for (int yy = 0; yy < newSize.Y; yy++)
-            {
-                for (int xx = 0; xx < newSize.X; xx++)
-                {
-                    AutoTile tile = ZoneManager.Instance.CurrentGround.Layers[Textures.Layers.ChosenLayer].Tiles[xx][yy];
-                    if (tile.Layers.Count > 0)
-                        maxFrames = Math.Max(tile.Layers[0].Frames.Count, maxFrames);
-                }
-            }
-
-            //set tilesets
-            for (int yy = 0; yy < newSize.Y; yy++)
-            {
-                for (int xx = 0; xx < newSize.X; xx++)
-                {
-                    AutoTile tile = ZoneManager.Instance.CurrentGround.Layers[Textures.Layers.ChosenLayer].Tiles[xx][yy];
-                    TileFrame newFrame = new TileFrame(new Loc(xx, yy), sheetName);
-                    //check for emptiness
-                    long tilePos = GraphicsManager.TileIndex.GetPosition(newFrame.Sheet, newFrame.TexLoc);
-                    if (tilePos > 0)
-                    {
-                        if (tile.Layers.Count == 0)
-                            tile.Layers.Add(new TileLayer(60));
-                        while (tile.Layers[0].Frames.Count < maxFrames)
-                            tile.Layers[0].Frames.Add(TileFrame.Empty);
-                        tile.Layers[0].Frames.Add(newFrame);
-                    }
-                }
-            }
-
-            DevForm.EnterLoadPhase(GameBase.LoadPhase.Ready);
-        }
-
-        private void DoSave(GroundMap curgrnd, string filepath, string oldfname)
-        {
-            curgrnd.AssetName = Path.GetFileNameWithoutExtension(filepath); //Set the assetname to the file name!
-            DataManager.SaveObject(curgrnd, filepath);
-
-            //Actually create the script folder, and default script file.
-            CreateOrCopyScriptData(oldfname, filepath);
-            //create or update the strings
-            Strings.SaveStrings();
-
-            CurrentFile = filepath;
-        }
-
-
-        private static bool comparePaths(string path1, string path2)
-        {
-            return String.Compare(Path.GetFullPath(path1).TrimEnd('\\').TrimEnd('/'),
-                Path.GetFullPath(path2).TrimEnd('\\').TrimEnd('/'),
-                StringComparison.InvariantCultureIgnoreCase) == 0;
-        }
-
-        /// <summary>
-        /// Call this when saving as, so that if the previous map name has a script folder with data in it,
-        /// we can copy it. And if it doesn't, we create a "blank slate" one!
-        /// </summary>
-        /// <param name="oldfilepath"></param>
-        /// <param name="newfilepath"></param>
-        public static void CreateOrCopyScriptData(string oldfilepath, string newfilepath)
-        {
-            //If we are not resaving an old map, create a new script file
-            if (String.IsNullOrEmpty(oldfilepath))
-            {
-                //We just create a new one straight away!
-                LuaEngine.Instance.CreateGroundMapScriptDir(Path.GetFileNameWithoutExtension(newfilepath));
-            }
-            else
-            {
-                //just make the dir path
-                string mappath = LuaEngine.MakeGroundMapScriptPath(Path.GetFileNameWithoutExtension(newfilepath), "");
-
-                //Check if files exists already
-                if (!Directory.Exists(mappath))
-                    Directory.CreateDirectory(mappath);
-            }
-        }
-
-        public void TabChanged()
-        {
-            switch (selectedTabIndex)
-            {
-                case 0://Textures
-                    GroundEditScene.Instance.EditMode = GroundEditScene.EditorMode.Texture;
-                    break;
-                case 1://Decorations
-                    GroundEditScene.Instance.EditMode = GroundEditScene.EditorMode.Decoration;
-                    Decorations.TabbedIn();
-                    break;
-                case 2://Walls
-                    GroundEditScene.Instance.EditMode = GroundEditScene.EditorMode.Wall;
-                    break;
-                case 3://Entities
-                    GroundEditScene.Instance.EditMode = GroundEditScene.EditorMode.Entity;
-                    Entities.TabbedIn();
-                    break;
-                default:
-                    GroundEditScene.Instance.EditMode = GroundEditScene.EditorMode.Other;
-                    break;
-            }
-            if (selectedTabIndex != 1)
-                Decorations.TabbedOut();
-            if (selectedTabIndex != 3)
-                Entities.TabbedOut();
-        }
-
-        public void ProcessInput(InputManager input)
-        {
-            lock (GameBase.lockObj)
-            {
-                if (input.BaseKeyDown(Microsoft.Xna.Framework.Input.Keys.LeftControl))
-                {
-                    if (input.BaseKeyPressed(Microsoft.Xna.Framework.Input.Keys.Z) && input.BaseKeyDown(Microsoft.Xna.Framework.Input.Keys.LeftShift))
-                    {
-                        mnuRedo_Click();
-                        return;
-                    }
-                    else if (input.BaseKeyPressed(Microsoft.Xna.Framework.Input.Keys.Z))
-                    {
-                        mnuUndo_Click();
-                        return;
-                    }
-                }
-                switch (selectedTabIndex)
-                {
-                    case 0://Textures
-                        Textures.ProcessInput(input);
-                        break;
-                    case 1://Decorations
-                        Decorations.ProcessInput(input);
-                        break;
-                    case 2://Walls
-                        Walls.ProcessInput(input);
-                        break;
-                    case 3://Entities
-                        Entities.ProcessInput(input);
-                        break;
-                }
-            }
-        }
-
-        public void ProcessUndo()
-        {
-            lock (GameBase.lockObj)
-            {
-                switch (selectedTabIndex)
-                {
-                    case 3://Entities
-                        Entities.ProcessUndo();
-                        break;
-                }
-            }
-        }
-    }
-}
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/MapEditForm/MapEditViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/MapEditForm/MapEditViewModel.cs
deleted file mode 100644
index a9216aea..00000000
--- a/RogueEssence.Editor.Avalonia/ViewModels/MapEditForm/MapEditViewModel.cs
+++ /dev/null
@@ -1,657 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Text;
-using RogueEssence;
-using RogueEssence.Dungeon;
-using RogueEssence.Ground;
-using RogueEssence.Data;
-using Avalonia.Controls;
-using System.IO;
-using RogueEssence.Dev.Views;
-using RogueEssence.Content;
-using RogueElements;
-using RogueEssence.Script;
-using System.Linq;
-using ReactiveUI;
-using System.Collections.ObjectModel;
-using System.Diagnostics;
-using System.Threading.Tasks;
-using Microsoft.VisualBasic;
-using System.Reflection.Emit;
-using Avalonia.Platform.Storage;
-using Avalonia.Threading;
-
-namespace RogueEssence.Dev.ViewModels
-{
-    public class MapEditViewModel : ViewModelBase
-    {
-        public MapEditViewModel()
-        {
-            
-            CurrentFile = "";
-        }
-
-        public MapTabTexturesViewModel Textures { get; set; }
-        public MapTabDecorationsViewModel Decorations { get; set; }
-        public MapTabTerrainViewModel Terrain { get; set; }
-        public MapTabTilesViewModel Tiles { get; set; }
-        public MapTabItemsViewModel Items { get; set; }
-        public MapTabEntitiesViewModel Entities { get; set; }
-        public MapTabEntrancesViewModel Entrances { get; set; }
-        public MapTabSpawnsViewModel Spawns { get; set; }
-        public MapTabEffectsViewModel Effects { get; set; }
-        public MapTabPropertiesViewModel Properties { get; set; }
-
-        private string currentFile;
-        public string CurrentFile
-        {
-            get => currentFile;
-            set => this.SetIfChanged(ref currentFile, value);
-        }
-
-        private int selectedTabIndex;
-        public int SelectedTabIndex
-        {
-            get => selectedTabIndex;
-            set
-            {
-                this.SetIfChanged(ref selectedTabIndex, value);
-                TabChanged();
-            }
-        }
-
-
-        public void mnuNew_Click()
-        {
-            CurrentFile = "";
-
-            lock (GameBase.lockObj) //Schedule the map creation
-                DoNew();
-        }
-
-        public async void mnuOpen_Click()
-        {
-            // string mapDir = Path.GetFullPath(PathMod.ModPath(DataManager.MAP_PATH));
-            // DevForm form = (DevForm)DiagManager.Instance.DevEditor;
-            // IStorageFolder directory = await form.GroundEditForm.StorageProvider.TryGetFolderFromPathAsync(mapDir);
-            //
-            // await Dispatcher.UIThread.InvokeAsync(async () =>
-            // {
-            //     IReadOnlyList<IStorageFile> results = await form.StorageProvider.OpenFilePickerAsync(new FilePickerOpenOptions
-            //     {
-            //         Title = "Open .rsmap File",
-            //         SuggestedStartLocation = directory,
-            //         AllowMultiple = false,
-            //         FileTypeFilter =
-            //         [
-            //             new FilePickerFileType("Map Files")
-            //             {
-            //                 Patterns = ["*." + DataManager.MAP_EXT.Substring(1)]
-            //             }
-            //         ]
-            //     });
-            //     if (results.Count > 0)
-            //     {
-            //         IStorageFile result = results.First();
-            //         
-            //         bool legalPath = false;
-            //         foreach (string proposedPath in PathMod.FallbackPaths(DataManager.MAP_PATH))
-            //         {
-            //             if (comparePaths(proposedPath, Path.GetDirectoryName(result.Path.LocalPath)))
-            //                 legalPath = true;
-            //         }
-            //         if (!legalPath)
-            //             await MessageBox.Show(form.MapEditPage, String.Format("Map can only be loaded from:\n{0}\nOr one of its parents.", PathMod.ModPath(DataManager.MAP_PATH)), "Error", MessageBox.MessageBoxButtons.Ok);
-            //         else
-            //         {
-            //             lock (GameBase.lockObj)
-            //                 DoLoad(Path.GetFileNameWithoutExtension(results.First().Name));
-            //         }
-            //     }
-            //     
-            // });
-        }
-
-
-        public async void mnuExportAsGround_Click()
-        {
-            // string mapDir = Path.GetFullPath(PathMod.ModPath(DataManager.GROUND_PATH));
-            // SaveFileDialog saveFileDialog = new SaveFileDialog();
-            // saveFileDialog.Directory = mapDir;
-            //
-            // FileDialogFilter filter = new FileDialogFilter();
-            // filter.Name = "Ground Files";
-            // filter.Extensions.Add(DataManager.GROUND_EXT.Substring(1));
-            // saveFileDialog.Filters.Add(filter);
-            //
-            // DevForm form = (DevForm)DiagManager.Instance.DevEditor;
-            //
-            // string result = await saveFileDialog.ShowAsync(form.MapEditPage);
-            //
-            // if (!String.IsNullOrEmpty(result))
-            // {
-            //     string reqDir = PathMod.HardMod(DataManager.GROUND_PATH);
-            //     if (!comparePaths(reqDir, Path.GetDirectoryName(result)))
-            //         await MessageBox.Show(form.MapEditPage, String.Format("Map can only be saved to:\n{0}", reqDir), "Error", MessageBox.MessageBoxButtons.Ok);
-            //     else if (Path.GetFileName(result).Contains(" "))
-            //         await MessageBox.Show(form.MapEditPage, String.Format("Save file should not contain white space:\n{0}", Path.GetFileName(result)), "Error", MessageBox.MessageBoxButtons.Ok);
-            //     else
-            //     {
-            //         lock (GameBase.lockObj)
-            //         {
-            //             //Schedule saving the map
-            //             ExportToGround(ZoneManager.Instance.CurrentMap, result);
-            //         }
-            //         await MessageBox.Show(form.MapEditPage, String.Format("Textures have been saved to Ground!"), "Success", MessageBox.MessageBoxButtons.Ok);
-            //     }
-            // }
-        }
-
-        public async Task<bool> mnuSave_Click()
-        {
-            Console.WriteLine(ZoneManager.Instance.CurrentMap + "MAP?");
-            if (CurrentFile == "")
-                return await mnuSaveAs_Click(); //Since its the same thing, might as well re-use the function! It makes everyone's lives easier!
-            else
-            {
-                string reqDir = PathMod.HardMod(DataManager.MAP_PATH);
-                string result = Path.Join(reqDir, Path.GetFileName(CurrentFile));
-                lock (GameBase.lockObj)
-                {
-                    string oldFilename = CurrentFile;
-                    DoSave(ZoneManager.Instance.CurrentMap, result, oldFilename);
-                }
-                return true;
-            }
-        }
-        public async Task<bool> mnuSaveAs_Click()
-        {
-            // string mapDir = Path.GetFullPath(PathMod.ModPath(DataManager.MAP_PATH));
-            // SaveFileDialog saveFileDialog = new SaveFileDialog();
-            // saveFileDialog.Directory = mapDir;
-            //
-            // FileDialogFilter filter = new FileDialogFilter();
-            // filter.Name = "Map Files";
-            // filter.Extensions.Add(DataManager.MAP_EXT.Substring(1));
-            // saveFileDialog.Filters.Add(filter);
-            //
-            // DevForm form = (DevForm)DiagManager.Instance.DevEditor;
-            //
-            // string result = await saveFileDialog.ShowAsync(form.MapEditPage);
-            //
-            // if (!String.IsNullOrEmpty(result))
-            // {
-            //     string reqDir = PathMod.HardMod(DataManager.MAP_PATH);
-            //     if (!comparePaths(reqDir, Path.GetDirectoryName(result)))
-            //         await MessageBox.Show(form.MapEditPage, String.Format("Map can only be saved to:\n{0}", reqDir), "Error", MessageBox.MessageBoxButtons.Ok);
-            //     else if (Path.GetFileName(result).Contains(" "))
-            //         await MessageBox.Show(form.MapEditPage, String.Format("Save file should not contain white space:\n{0}", Path.GetFileName(result)), "Error", MessageBox.MessageBoxButtons.Ok);
-            //     else
-            //     {
-            //         lock (GameBase.lockObj)
-            //         {
-            //             string oldFilename = CurrentFile;
-            //
-            //             //Schedule saving the map
-            //             DoSave(ZoneManager.Instance.CurrentMap, result, oldFilename);
-            //         }
-            //         return true;
-            //     }
-            // }
-            // return false;
-            return false;
-        }
-
-        public async void mnuTest_Click()
-        {
-            bool saved = await mnuSave_Click();
-            if (saved)
-            {
-                lock (GameBase.lockObj)
-                {
-                    DevForm form = (DevForm)DiagManager.Instance.DevEditor;
-                    form.MapEditorPage.SilentClose();
-                    form.MapEditorPage = null;
-                    GameManager.Instance.SceneOutcome = GameManager.Instance.TestWarp(ZoneManager.Instance.CurrentMap.AssetName, false, MathUtils.Rand.NextUInt64());
-                }
-            }
-        }
-
-        public async void mnuImportFromPng_Click()
-        {
-            // string mapDir = Path.GetFullPath(PathMod.ModPath(DataManager.MAP_PATH));
-            // DevForm form = (DevForm)DiagManager.Instance.DevEditor;
-            // IStorageFolder directory = await form.MapEditPage.StorageProvider.TryGetFolderFromPathAsync(mapDir);
-            //
-            // await Dispatcher.UIThread.InvokeAsync(async () =>
-            // {
-            //     IReadOnlyList<IStorageFile> results = await form.MapEditPage.StorageProvider.OpenFilePickerAsync(new FilePickerOpenOptions
-            //     {
-            //         Title = "Open .png File",
-            //         SuggestedStartLocation = directory,
-            //         AllowMultiple = false,
-            //         FileTypeFilter =
-            //         [
-            //             new FilePickerFileType("PNG Files")
-            //             {
-            //                 Patterns = ["*.PNG"]
-            //             }
-            //         ]
-            //     });
-            //     
-            //     if (results.Count > 0)
-            //     {
-            //         IStorageFile result = results.First();
-            //         DoImportPng(result.Path.LocalPath);
-            //
-            //     }
-            // });
-        }
-
-        public void mnuClearLayer_Click()
-        {
-            lock (GameBase.lockObj)
-                DoClearLayer();
-        }
-
-
-        public async void mnuImportFromTileset_Click()
-        {
-            DevForm form = (DevForm)DiagManager.Instance.DevEditor;
-
-            if (Textures.TileBrowser.CurrentTileset == "")
-                Console.WriteLine("hi");
-                // await MessageBox.Show(form.MapEditPage, String.Format("No tileset to import!"), "Error", MessageBox.MessageBoxButtons.Ok);
-            else
-            {
-                lock (GameBase.lockObj)
-                    DoImportTileset(Textures.TileBrowser.CurrentTileset);
-            }
-        }
-
-
-        public async void mnuReSize_Click()
-        {
-            MapResizeWindow window = new MapResizeWindow();
-            MapResizeViewModel viewModel = new MapResizeViewModel(ZoneManager.Instance.CurrentMap.Width, ZoneManager.Instance.CurrentMap.Height);
-            window.DataContext = viewModel;
-
-            DevForm form = (DevForm)DiagManager.Instance.DevEditor;
-
-            // bool result = await window.ShowDialog<bool>(form.MapEditPage);
-
-            bool result = true;
-            lock (GameBase.lockObj)
-            {
-                if (result)
-                {
-                    //TODO: support undo for this
-                    DiagManager.Instance.DevEditor.MapEditor.Edits.Clear();
-
-                    DiagManager.Instance.LoadMsg = "Resizing Map...";
-                    DevForm.EnterLoadPhase(GameBase.LoadPhase.Content);
-
-                    ZoneManager.Instance.CurrentMap.ResizeJustified(viewModel.MapWidth, viewModel.MapHeight, viewModel.ResizeDir);
-
-                    DevForm.EnterLoadPhase(GameBase.LoadPhase.Ready);
-                }
-            }
-        }
-
-        public void mnuUndo_Click()
-        {
-            if (DiagManager.Instance.DevEditor.MapEditor.Edits.CanUndo)
-            {
-                DiagManager.Instance.DevEditor.MapEditor.Edits.Undo();
-                ProcessUndo();
-            }
-        }
-
-        public void mnuRedo_Click()
-        {
-            if (DiagManager.Instance.DevEditor.MapEditor.Edits.CanRedo)
-                DiagManager.Instance.DevEditor.MapEditor.Edits.Redo();
-        }
-
-        private void DoNew()
-        {
-            DiagManager.Instance.DevEditor.MapEditor.Edits.Clear();
-
-            //take all the necessary steps before and after moving to the map
-            DiagManager.Instance.LoadMsg = "Loading Map...";
-            DevForm.EnterLoadPhase(GameBase.LoadPhase.Content);
-            GameManager.Instance.ForceReady();
-
-            ZoneManager.Instance.CurrentZone.DevNewMap();
-
-            loadEditorSettings();
-            DevForm.EnterLoadPhase(GameBase.LoadPhase.Ready);
-        }
-        private void DoLoad(string mapName)
-        {
-            DiagManager.Instance.DevEditor.MapEditor.Edits.Clear();
-
-            //take all the necessary steps before and after moving to the map
-            DiagManager.Instance.LoadMsg = "Loading Map...";
-            DevForm.EnterLoadPhase(GameBase.LoadPhase.Content);
-            GameManager.Instance.ForceReady();
-
-            ZoneManager.Instance.CurrentZone.DevLoadMap(mapName);
-
-            CurrentFile = PathMod.ModPath(Path.Combine(DataManager.MAP_PATH, mapName + DataManager.MAP_EXT));
-            loadEditorSettings();
-            DevForm.EnterLoadPhase(GameBase.LoadPhase.Ready);
-
-        }
-
-        public void LoadFromCurrentMap()
-        {
-            if (ZoneManager.Instance.CurrentMap.AssetName != "")
-                CurrentFile = PathMod.ModPath(Path.Combine(DataManager.MAP_PATH, ZoneManager.Instance.CurrentMap.AssetName + DataManager.MAP_EXT));
-            else
-                CurrentFile = "";
-
-            loadEditorSettings();
-        }
-
-        private void loadEditorSettings()
-        {
-            Textures.Layers.LoadLayers();
-            Textures.TileBrowser.TileSize = GraphicsManager.TileSize;
-            Textures.AutotileBrowser.TileSize = GraphicsManager.TileSize;
-            Terrain.TileBrowser.TileSize = GraphicsManager.TileSize;
-            Terrain.AutotileBrowser.TileSize = GraphicsManager.TileSize;
-
-            Decorations.SelectEntity(null);
-            Decorations.Layers.LoadLayers();
-
-            Terrain.SetupLayerVisibility();
-            Entrances.SetupLayerVisibility();
-
-            Entities.SelectEntity(null);
-            //Entities.Teams.LoadTeams();
-            Spawns.LoadMapSpawns();
-            Effects.LoadMapEffects();
-            Properties.LoadMapProperties();
-        }
-
-        private void DoImportPng(string filePath)
-        {
-            DevForm.ExecuteOrPend(() => { tryImportPng(filePath); });
-
-            string sheetName = Path.GetFileNameWithoutExtension(filePath);
-            lock (GameBase.lockObj)
-            {
-                Textures.TileBrowser.UpdateTilesList();
-                Terrain.TileBrowser.UpdateTilesList();
-            }
-            Textures.TileBrowser.SelectTileset(sheetName);
-            Terrain.TileBrowser.SelectTileset(sheetName);
-        }
-
-        private void tryImportPng(string filePath)
-        {
-            lock (GameBase.lockObj)
-            {
-                string sheetName = Path.GetFileNameWithoutExtension(filePath);
-                string outputFile = PathMod.HardMod(String.Format(GraphicsManager.TILE_PATTERN, sheetName));
-
-                //load into tilesets
-                using (BaseSheet tileset = BaseSheet.Import(filePath))
-                {
-                    List<BaseSheet[]> tileList = new List<BaseSheet[]>();
-                    tileList.Add(new BaseSheet[] { tileset });
-                    ImportHelper.SaveTileSheet(tileList, outputFile, GraphicsManager.TileSize);
-                }
-
-                GraphicsManager.RebuildIndices(GraphicsManager.AssetType.Tile);
-                GraphicsManager.ClearCaches(GraphicsManager.AssetType.Tile);
-                DevDataManager.ClearCaches();
-            }
-        }
-
-        private void DoClearLayer()
-        {
-            //TODO: support undo for this
-            DiagManager.Instance.DevEditor.MapEditor.Edits.Clear();
-
-            DiagManager.Instance.LoadMsg = "Loading Map...";
-            DevForm.EnterLoadPhase(GameBase.LoadPhase.Content);
-
-            //set tilesets
-            for (int yy = 0; yy < ZoneManager.Instance.CurrentMap.Height; yy++)
-            {
-                for (int xx = 0; xx < ZoneManager.Instance.CurrentMap.Width; xx++)
-                    ZoneManager.Instance.CurrentMap.Layers[Textures.Layers.ChosenLayer].Tiles[xx][yy] = new AutoTile();
-            }
-
-            DevForm.EnterLoadPhase(GameBase.LoadPhase.Ready);
-        }
-
-        private void DoImportTileset(string sheetName)
-        {
-            //TODO: support undo for this
-            DiagManager.Instance.DevEditor.MapEditor.Edits.Clear();
-
-            Loc newSize = GraphicsManager.TileIndex.GetTileDims(sheetName);
-
-            DiagManager.Instance.LoadMsg = "Loading Map...";
-            DevForm.EnterLoadPhase(GameBase.LoadPhase.Content);
-
-            ZoneManager.Instance.CurrentMap.ResizeJustified(newSize.X, newSize.Y, Dir8.UpLeft);
-
-            //set tilesets
-            for (int yy = 0; yy < newSize.Y; yy++)
-            {
-                for (int xx = 0; xx < newSize.X; xx++)
-                    ZoneManager.Instance.CurrentMap.Layers[Textures.Layers.ChosenLayer].Tiles[xx][yy] = new AutoTile(new TileLayer(new Loc(xx, yy), sheetName));
-            }
-
-            DevForm.EnterLoadPhase(GameBase.LoadPhase.Ready);
-        }
-
-        private void DoSave(Map curmap, string filepath, string oldfname)
-        {
-            curmap.AssetName = Path.GetFileNameWithoutExtension(filepath); //Set the assetname to the file name!
-            DataManager.SaveObject(curmap, filepath);
-
-            CurrentFile = filepath;
-        }
-
-        private void ExportToGround(Map curmap, string filepath)
-        {
-            GroundMap curgrnd = new GroundMap();
-            curgrnd.CreateNew(curmap.Width, curmap.Height, GraphicsManager.DungeonTexSize);
-
-            curgrnd.Layers.Clear();
-
-            foreach (MapLayer layer in curmap.Layers)
-            {
-                if (layer.Layer == DrawLayer.Under)
-                {
-                    //Add layers marked "under", using DrawLayer.Bottom
-                    MapLayer newLayer = new MapLayer(layer.Name);
-                    newLayer.Layer = DrawLayer.Bottom;
-                    newLayer.Visible = layer.Visible;
-                    newLayer.Tiles = layer.Tiles;
-                    curgrnd.Layers.Add(newLayer);
-                }
-            }
-
-            //Add terrain
-            {
-                MapLayer newLayer = new MapLayer("Terrain");
-                newLayer.CreateNew(curmap.Width, curmap.Height);
-                newLayer.Layer = DrawLayer.Bottom;
-                newLayer.Visible = true;
-                for (int xx = 0; xx < curmap.Width; xx++)
-                {
-                    for (int yy = 0; yy < curmap.Height; yy++)
-                        newLayer.Tiles[xx][yy] = curmap.Tiles[xx][yy].Data.TileTex;
-                }
-                curgrnd.Layers.Add(newLayer);
-            }
-
-            //Add layers marked Bottom, using DrawLayer.Bottom
-            foreach (MapLayer layer in curmap.Layers)
-            {
-                if (layer.Layer != DrawLayer.Under && layer.Layer != DrawLayer.Top)
-                {
-                    //Add layers marked "under", using DrawLayer.Bottom
-                    MapLayer newLayer = new MapLayer(layer.Name);
-                    newLayer.Layer = DrawLayer.Bottom;
-                    newLayer.Visible = layer.Visible;
-                    newLayer.Tiles = layer.Tiles;
-                    curgrnd.Layers.Add(newLayer);
-                }
-            }
-
-            //add layers marked top, using DrawLayer.Top
-            foreach (MapLayer layer in curmap.Layers)
-            {
-                if (layer.Layer == DrawLayer.Top)
-                {
-                    //Add layers marked "Top", using DrawLayer.Top
-                    MapLayer newLayer = new MapLayer(layer.Name);
-                    newLayer.Layer = DrawLayer.Top;
-                    newLayer.Visible = layer.Visible;
-                    newLayer.Tiles = layer.Tiles;
-                    curgrnd.Layers.Add(newLayer);
-                }
-            }
-
-            //Add decorations
-            curgrnd.Decorations.Clear();
-            foreach (AnimLayer layer in curmap.Decorations)
-            {
-                AnimLayer newLayer = new AnimLayer(layer.Name);
-                newLayer.Layer = layer.Layer;
-                newLayer.Visible = layer.Visible;
-                newLayer.Anims = layer.Anims;
-                curgrnd.Decorations.Add(newLayer);
-            }
-
-            curgrnd.AssetName = Path.GetFileNameWithoutExtension(filepath); //Set the assetname to the file name!
-            DataManager.SaveObject(curgrnd, filepath);
-
-            //Actually create the script folder, and default script file.
-            GroundEditViewModel.CreateOrCopyScriptData("", filepath);
-
-            CurrentFile = filepath;
-        }
-
-
-        private static bool comparePaths(string path1, string path2)
-        {
-            return String.Compare(Path.GetFullPath(path1).TrimEnd('\\').TrimEnd('/'),
-                Path.GetFullPath(path2).TrimEnd('\\').TrimEnd('/'),
-                StringComparison.InvariantCultureIgnoreCase) == 0;
-        }
-
-
-        public void TabChanged()
-        {
-            switch (selectedTabIndex)
-            {
-                case 0://Textures
-                    DungeonEditScene.Instance.EditMode = DungeonEditScene.EditorMode.Texture;
-                    break;
-                case 1://Decorations
-                    DungeonEditScene.Instance.EditMode = DungeonEditScene.EditorMode.Decoration;
-                    Decorations.TabbedIn();
-                    break;
-                case 2://Terrain
-                    DungeonEditScene.Instance.EditMode = DungeonEditScene.EditorMode.Terrain;
-                    break;
-                case 3://Tiles
-                    DungeonEditScene.Instance.EditMode = DungeonEditScene.EditorMode.Tile;
-                    break;
-                case 4://Items
-                    DungeonEditScene.Instance.EditMode = DungeonEditScene.EditorMode.Item;
-                    Items.TabbedIn();
-                    break;
-                case 5://Entities
-                    DungeonEditScene.Instance.EditMode = DungeonEditScene.EditorMode.Entity;
-                    Entities.TabbedIn();
-                    break;
-                case 6://Entrances
-                    DungeonEditScene.Instance.EditMode = DungeonEditScene.EditorMode.Entrance;
-                    break;
-                default:
-                    DungeonEditScene.Instance.EditMode = DungeonEditScene.EditorMode.Other;
-                    break;
-            }
-            if (selectedTabIndex != 1)
-                Decorations.TabbedOut();
-            if (selectedTabIndex != 4)
-                Items.TabbedOut();
-            if (selectedTabIndex != 5)
-                Entities.TabbedOut();
-        }
-
-        public void ProcessInput(InputManager input)
-        {
-            lock (GameBase.lockObj)
-            {
-                if (input.BaseKeyDown(Microsoft.Xna.Framework.Input.Keys.LeftControl))
-                {
-                    if (input.BaseKeyPressed(Microsoft.Xna.Framework.Input.Keys.Z) && input.BaseKeyDown(Microsoft.Xna.Framework.Input.Keys.LeftShift)
-                        || input.BaseKeyPressed(Microsoft.Xna.Framework.Input.Keys.Y))
-                    {
-                        mnuRedo_Click();
-                        return;
-                    }
-                    else if (input.BaseKeyPressed(Microsoft.Xna.Framework.Input.Keys.Z))
-                    {
-                        mnuUndo_Click();
-                        return;
-                    }
-                }
-                switch (selectedTabIndex)
-                {
-                    case 0://Textures
-                        Textures.ProcessInput(input);
-                        break;
-                    case 1://Decorations
-                        Decorations.ProcessInput(input);
-                        break;
-                    case 2://Terrain
-                        Terrain.ProcessInput(input);
-                        break;
-                    case 3://Tiles
-                        Tiles.ProcessInput(input);
-                        break;
-                    case 4://Items
-                        Items.ProcessInput(input);
-                        break;
-                    case 5://Entities
-                        Entities.ProcessInput(input);
-                        break;
-                    case 6://Entrances
-                        Entrances.ProcessInput(input);
-                        break;
-                }
-            }
-        }
-
-        public void ProcessUndo()
-        {
-            lock (GameBase.lockObj)
-            {
-                switch (selectedTabIndex)
-                {
-                    case 3://Items
-                        Items.ProcessUndo();
-                        break;
-                    case 4://Entities
-                        Entities.ProcessUndo();
-                        break;
-                    case 5://Entrances
-                        Entrances.ProcessUndo();
-                        break;
-                }
-            }
-        }
-    }
-}
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs
deleted file mode 100644
index 9630bf19..00000000
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/DevFormViewModel.cs
+++ /dev/null
@@ -1,796 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Collections.Specialized;
-using System.IO;
-using System.Linq;
-using System.Reactive;
-using System.Reactive.Linq;
-using System.Threading.Tasks;
-using Avalonia.Controls;
-using Avalonia.Controls.Models.TreeDataGrid;
-using Avalonia.Threading;
-using RogueEssence.Dev.Models;
-using RogueEssence.Dev.Services;
-using ReactiveUI;
-using RogueEssence.Content;
-using RogueEssence.Data;
-using RogueEssence.Dev.Utility;
-using RogueEssence.Dev.Views;
-using RogueEssence.Dungeon;
-using RogueEssence.Menu;
-using RogueEssence.Script;
-
-namespace RogueEssence.Dev.ViewModels;
-
-public class DevFormViewModel : ViewModelBase
-{
-    private HierarchicalTreeDataGridSource<NodeBase> _nodeSource;
-
-    public HierarchicalTreeDataGridSource<NodeBase> NodeSource
-    {
-        get => _nodeSource;
-        set => this.RaiseAndSetIfChanged(ref _nodeSource, value);
-    }
-
-    public DevTabGameViewModel Game { get; set; }
-    public DevTabPlayerViewModel Player { get; set; }
-    public DevTabTravelViewModel Travel { get; set; }
-    public DevTabScriptViewModel Script { get; set; }
-
-    public ModManagerViewModel ModsManager { get; set; }
-    
- 
-
-    private bool _isTreeView;
-
-    public bool IsTreeView
-    {
-        get => _isTreeView;
-        set { this.RaiseAndSetIfChanged(ref _isTreeView, value); }
-    }
-
-    public void OpenTabSwitcher()
-    {
-        TabSwitcher = _context.PageFactory.GetRequiredService<TabSwitcherViewModel>();
-    }
-
-    public event Action? TabSwitcherClosed;
-
-    public void CloseTabSwitcher()
-    {
-        TabSwitcher = null;
-        TabSwitcherClosed?.Invoke();
-    }
-
-    public void OnModSwitcherOpened()
-    {
-        if (ModSwitcher == null)
-        {
-            // TODO: Doesn't look ideal
-            ModSwitcher = _context.PageFactory.GetRequiredService<ModSwitcherViewModel>();
-        }
-    }
-
-
-    public event Action? ModSwitcherClosed;
-
-    public void OnModSwitcherClosed()
-    {
-        if (ModSwitcher != null)
-        {
-            ModSwitcher = null;
-            ModSwitcherClosed?.Invoke();
-        }
-    }
-
-
-    private string _filter = "";
-
-    public string Filter
-    {
-        get { return _filter; }
-        set { this.RaiseAndSetIfChanged(ref _filter, value); }
-    }
-
-
-    private void ApplyFilter(string filter)
-    {
-        Dispatcher.UIThread.Post(() =>
-        {
-            foreach (var node in Nodes)
-            {
-                NodeHelper.FilterRecursive(node, filter, new BeginningTitleFilterStrategy());
-            }
-
-            RefreshTreeDataGrid();
-        });
-    }
-
-    private void RefreshTreeDataGrid()
-    {
-        NodeSource = new HierarchicalTreeDataGridSource<NodeBase>(Nodes)
-        {
-            Columns =
-            {
-                new HierarchicalExpanderColumn<NodeBase>(
-                    new TemplateColumn<NodeBase>(
-                        null,
-                        "TreeDataGridNodeBaseTemplate",
-                        null,
-                        new GridLength(1, GridUnitType.Star)),
-                    x => x.SubNodes.Where(n => n.IsVisible),
-                    x => x.SubNodes.Count > 0,
-                    x => x.IsExpanded)
-            },
-        };
-    }
-
-
-    private ObservableCollection<EditorPageViewModel> _pages;
-
-    public ObservableCollection<EditorPageViewModel> Pages
-    {
-        get => _pages;
-        set => this.RaiseAndSetIfChanged(ref _pages, value);
-    }
-
-    private EditorPageViewModel? _activePage;
-
-    public EditorPageViewModel? ActivePage
-    {
-        get => _activePage;
-        set => this.RaiseAndSetIfChanged(ref _activePage, value);
-    }
-
-    private EditorPageViewModel? _temporaryTab;
-
-
-    public EditorPageViewModel? TemporaryTab
-    {
-        get => _temporaryTab;
-        set => this.RaiseAndSetIfChanged(ref _temporaryTab, value);
-    }
-
-    private ObservableCollection<PageNode> _topLevelPages;
-
-    public ObservableCollection<PageNode> TopLevelPages
-    {
-        get => _topLevelPages;
-        set => this.RaiseAndSetIfChanged(ref _topLevelPages, value);
-    }
-
-    private Dictionary<EditorPageViewModel, PageNode> _pageToNodeMap;
-
-
-    public void AddTopLevelPage(EditorPageViewModel page)
-    {
-        var navigatedPage = TryNavigateToExistingPage(page);
-        if (navigatedPage != null)
-        {
-            if (navigatedPage is IPageReloadable reloadable)
-                reloadable.Reload();
-            return;
-        }
-
-        if (!page.AddNewTab)
-        {
-            TemporaryTab = page;
-            return;
-        }
-
-        // Only load the data once it is confirmed that the tab doesn't already exist
-        page.OnPageLoad();
-
-        Pages.Add(page);
-        var node = _context.NodeFactory.CreatePageNode(page, null);
-        TopLevelPages.Add(node);
-        _pageToNodeMap[page] = node;
-        ActivePage = page;
-    }
-
-
-    public void AddChildPage(EditorPageViewModel parentPage, EditorPageViewModel childPage)
-    {
-        var navigatedPage = TryNavigateToExistingPage(childPage);
-        if (navigatedPage != null) return;
-
-
-        // Otherwise... add to the list of tabs
-        if (_pageToNodeMap.TryGetValue(parentPage, out var parentNode))
-        {
-            var childNode = parentNode.AddChild(childPage);
-            _pageToNodeMap[childPage] = childNode;
-
-            // Try to insert the child page to the right of the parent
-            var parentIndex = Pages.IndexOf(parentPage);
-            if (parentIndex == -1)
-            {
-                Pages.Add(childPage);
-            }
-            else
-            {
-                Pages.Insert(parentIndex + 1, childPage);
-            }
-        }
-        else
-        {
-            AddTopLevelPage(parentPage);
-        }
-    }
-
-    // Returns whether the navigation was successful
-    private EditorPageViewModel? TryNavigateToExistingPage(EditorPageViewModel page)
-    {
-        var existing = Pages.FirstOrDefault(p => p.Equals(page));
-        if (existing != null)
-        {
-            TemporaryTab = null;
-            ActivePage = existing;
-            return existing;
-        }
-
-        return null;
-    }
-
-    public bool PageHasChildren(EditorPageViewModel page)
-    {
-        if (!_pageToNodeMap.TryGetValue(page, out var node))
-            return false;
-
-        return node.SubNodes.Count > 0;
-    }
-
-    private PageNode GetTopLevelNode(PageNode node)
-    {
-        var current = node;
-        while (!current.IsTopLevel)
-            current = current.Parent;
-        return current;
-    }
-
-    public void RemoveTab(EditorPageViewModel page)
-    {
-        // Console.WriteLine($"Removing tab {page}" + "hmmm");
-        if (!_pageToNodeMap.TryGetValue(page, out var node))
-            return;
-
-        int removeIdx = Pages.IndexOf(page);
-        
-        // Console.WriteLine($"Removing tab {page} at index {removeIdx}");
-
-        ClosePageAndChildren(node);
-
-
-        // TODO:
-        // We want to prioritize setting the left tab to be the active tab since our editors open stuff to the right first
-        // Maybe we want to set the active page to be the parent if it exists?
-        // For after deleting Datatype entries, should it go back to the last previously visited tab?
-        if (Pages.Count == 0)
-        {
-            ActivePage = null;
-        }
-        else
-        {
-            if (removeIdx > 0 && removeIdx - 1 < Pages.Count)
-            {
-                ActivePage = Pages[removeIdx - 1];
-            }
-            else if (removeIdx > 0)
-            {
-                ActivePage = Pages[Pages.Count - 1];
-            }
-            else
-            {
-                ActivePage = Pages[0];
-            }
-        }
-    }
-
-    public async Task SaveChildren(EditorPageViewModel page)
-    {
-        if (!_pageToNodeMap.TryGetValue(page, out var pageNode))
-            return;
-
-        foreach (var child in pageNode.SubNodes.Cast<PageNode>().ToList())
-        {
-            await SaveChildren(child.Page);
-            if (child.Page.AttachedView is ISaveable saveable)
-                await saveable.Save();
-        }
-    }
-
-    private void ClosePageAndChildren(PageNode node)
-    {
-        var children = node.SubNodes.Cast<PageNode>().ToList();
-        foreach (var child in children)
-        {
-            ClosePageAndChildren(child);
-        }
-
-        Pages.Remove(node.Page);
-
-
-        if (node.IsTopLevel)
-        {
-            TopLevelPages.Remove(node);
-        }
-        else
-        {
-            node.Parent.RemoveChild(node);
-        }
-
-        _pageToNodeMap.Remove(node.Page);
-    }
-
-    private ObservableCollection<NodeBase> _nodes = new();
-
-    public ObservableCollection<NodeBase> Nodes
-    {
-        get => _nodes;
-        set => this.RaiseAndSetIfChanged(ref _nodes, value);
-    }
-    
-    private EditorContext _context;
-
-    public DevFormViewModel(EditorContext context, DevTabGameViewModel game, DevTabPlayerViewModel player,
-        DevTabTravelViewModel travel, DevTabScriptViewModel script,
-        ModManagerViewModel mods)
-    {
-        _context = context;
-        Game = game;
-        Player = player;
-        Travel = travel;
-        Script = script;
-        ModsManager = mods;
-        
-        
-        
-        InitializeTabEvents();
-
-        this.WhenAnyValue(x => x.ActivePage)
-            .Where(activePage => activePage != null)
-            .Subscribe(_ => TemporaryTab = null);
-
-    
-        
-        Pages = new ObservableCollection<EditorPageViewModel>();
-        TopLevelPages = new ObservableCollection<PageNode>();
-        _pageToNodeMap = new Dictionary<EditorPageViewModel, PageNode>();
-
-        this.WhenAnyValue(x => x.ActivePage)
-            .Buffer(2, 1)
-            .Subscribe(pair =>
-            {
-                if (pair.Count > 1 && pair[0] != null) pair[0].IsActive = false;
-                if (pair.Count > 0 && pair[^1] != null) pair[^1].IsActive = true;
-            });
-
-        this.WhenAnyValue(x => x.Filter).Throttle(TimeSpan.FromMilliseconds(300)).Subscribe(ApplyFilter);
-
-        NodeSource = new HierarchicalTreeDataGridSource<NodeBase>(Nodes)
-        {
-            Columns =
-            {
-                new HierarchicalExpanderColumn<NodeBase>(
-                    new TemplateColumn<NodeBase>(
-                        null,
-                        "TreeDataGridNodeBaseTemplate",
-                        null,
-                        new GridLength(1, GridUnitType.Star)),
-                    x => x.SubNodes.Where(n => n.IsVisible),
-                    x => x.SubNodes.Count > 0,
-                    x => x.IsExpanded)
-            },
-        };
-    }
-
-    public void ClearFilter()
-    {
-        Filter = "";
-    }
-
-    public async void ShowPreferencesWindow()
-    {
-        await _context.DialogService.ShowDialogAsync<PreferencesWindowViewModel, bool>(
-            PreferencesWindowViewModel.Instance, "Preferences");
-    }
-
-    public NodeBase Root { get; internal set; }
-    public NodeBase MapEditorNode { get; internal set; }
-    
-    public NodeBase GroundEditorNode { get; internal set; }
-    
-    public void LoadDevTree()
-    {
-        NodeFactory _nodeFactory = _context.NodeFactory;
-        Filter = "";
-
-        ActivePage = null;
-        TopLevelPages.Clear();
-        Pages.Clear();
-        _pageToNodeMap.Clear();
-
-        foreach (var n in Nodes)
-        {
-            DetachEventsRecursive(n);
-        }
-
-        Nodes.Clear();
-
-        var rootStr = ModsManager.CurrentModString;
-        
-        var root = _nodeFactory.CreateOpenEditorNode<EmptyPageViewModel>(rootStr, "Icons.ScrollFill");
-
-        Root = root;
-        ModsManager.WhenAnyValue(x => x.CurrentMod.Name)
-            .Subscribe(str => Root.Title = str ?? "Origin");
-        
-        var devControlNode =
-            _nodeFactory.CreateOpenEditorNode<DevControlViewModel>("Dev Control", "Icons.GameControllerFill");
-        root.SubNodes.Add(devControlNode);
-        
-        var tab = _context.PageFactory.CreatePage(typeof(DevControlViewModel), devControlNode);
-        tab.SetPageTitle("Dev Control", "Icons.GameControllerFill");
-        AddTopLevelPage(tab);
-
-
-        var mapEditorNode = _nodeFactory.CreateOpenEditorNode<MapEditorPageViewModel>("Map Editor", "Icons.StairsFill");
-        root.SubNodes.Add(mapEditorNode);
-        
-        MapEditorNode = mapEditorNode;
-
-        var groundEditorNode =
-            _nodeFactory.CreateOpenEditorNode<GroundEditorPageViewModel>("Ground Editor", "Icons.IslandFill");
-
-        root.SubNodes.Add(groundEditorNode);
-        GroundEditorNode = groundEditorNode;
-
-        CreateDataNode(root);
-        CreateConstantsNode(root);
-        
-        CreateSpriteNode(root);
-
-        CreateModNode(root);
-        Nodes.Add(root);
-
-        AttachEventsRecursive(root);
-        root.IsExpanded = true;
-    }
-    
-    private Action<ReflectedDataPageViewModel> CreateDataOnOpen<T>(Func<T> getter, Action<T> setter, NodeBase parent)
-    {
-        return vm =>
-        {
-            vm.SetRemoveNode(false);
-            vm.SetRootPage(true);
-            vm.OnLoadAction = stack => { DataEditor.LoadDataControls("", getter(), stack); };
-
-            vm.OnOKAction = async stack =>
-            {
-                lock (GameBase.lockObj)
-                {
-                    object obj = getter();
-                    DataEditor.SaveDataControls(ref obj, stack, new Type[0]);
-                    setter((T)obj);
-                }
-
-                return true;
-            };
-        };
-    }
-
-    private Action<ReflectedDataPageViewModel> CreateFXOnOpen<T>(Func<T> getter, Action<T> setter, string fxKey,
-        NodeBase parent)
-        => CreateDataOnOpen(getter, fx =>
-        {
-            setter(fx);
-            DataManager.SaveData(fx, DataManager.FX_PATH, fxKey, DataManager.DATA_EXT);
-        }, parent);
-
-
-    private void CreateConstantsNode(NodeBase parent)
-    {
-        var constantsNode =
-            _context.NodeFactory.CreateReflectedDataNode<EmptyPageViewModel>("Constants", parent, "Icons.ListFill");
-        var startParamsNode = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>("Start Params",
-            parent,
-            "Icons.ListFill", CreateDataOnOpen(
-                () => DataManager.Instance.Start,
-                obj =>
-                {
-                    DataManager.Instance.Start = obj;
-                    DataManager.Instance.SaveStartParams();
-                },
-                parent));
-
-        var universalEventsNode = _context.NodeFactory.CreateUniversalNode<ReflectedDataPageViewModel>(
-            "Universal Event", "Icons.ListFill",
-            CreateDataOnOpen(
-                () => (UniversalBaseEffect)DataManager.Instance.UniversalEvent,
-                obj =>
-                {
-                    DataManager.Instance.UniversalEvent = obj;
-                    DataManager.SaveData(obj, DataManager.DATA_PATH, "Universal", DataManager.DATA_EXT);
-                },
-                parent));
-
-        
-        var stringsNode = _context.NodeFactory.CreateOpenEditorNode<EmptyPageViewModel>("Strings", "Icons.TableFill");
-        var menuTextNode = _context.NodeFactory.CreateOpenEditorNodeWithParams<StringEditPageViewModel>("Menu Text", [false], "Icons.TableFill");
-        var gameplayTextNode = _context.NodeFactory.CreateOpenEditorNodeWithParams<StringEditPageViewModel>("Gameplay Text", [true], "Icons.TableFill");
-        stringsNode.SubNodes.Add(menuTextNode);
-        stringsNode.SubNodes.Add(gameplayTextNode);
-        constantsNode.SubNodes.Add(startParamsNode);
-        constantsNode.SubNodes.Add(universalEventsNode);
-        constantsNode.SubNodes.Add(stringsNode);
-        
-        var effectsNode =
-            _context.NodeFactory.CreateOpenEditorNode<EmptyPageViewModel>("Effects", "Icons.SparkleFill");
-        effectsNode.SubNodes.Add(_context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>("Heal FX",
-            effectsNode,
-            "Icons.SparkleFill", CreateFXOnOpen(() => DataManager.Instance.HealFX, fx => DataManager.Instance.HealFX = fx, "Heal", parent)));
-
-        effectsNode.SubNodes.Add(_context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(
-            "Restore Charge FX",
-            effectsNode,
-            "Icons.SparkleFill", CreateFXOnOpen(() => DataManager.Instance.RestoreChargeFX, fx => DataManager.Instance.RestoreChargeFX = fx,
-                "RestoreCharge", parent)));
-
-        effectsNode.SubNodes.Add(_context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(
-            "Lose Charge FX",
-            effectsNode,
-            "Icons.SparkleFill", CreateFXOnOpen(() => DataManager.Instance.LoseChargeFX, fx => DataManager.Instance.LoseChargeFX = fx,
-                "LoseCharge", parent)));
-
-        effectsNode.SubNodes.Add(_context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(
-            "No Charge FX",
-            effectsNode,
-            "Icons.SparkleFill", CreateFXOnOpen(() => DataManager.Instance.NoChargeFX, fx => DataManager.Instance.NoChargeFX = fx,
-                "NoCharge", parent)));
-
-        effectsNode.SubNodes.Add(_context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>("Element FX",
-            effectsNode,
-            "Icons.SparkleFill", CreateFXOnOpen(() => DataManager.Instance.ElementFX, fx => DataManager.Instance.ElementFX = fx, "Element",
-                parent)));
-
-        effectsNode.SubNodes.Add(_context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(
-            "Intrinsic FX",
-            effectsNode,
-            "Icons.SparkleFill", CreateFXOnOpen(() => DataManager.Instance.IntrinsicFX, fx => DataManager.Instance.IntrinsicFX = fx,
-                "Intrinsic", parent)));
-
-        effectsNode.SubNodes.Add(_context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(
-            "Send Home FX",
-            effectsNode,
-            "Icons.SparkleFill", CreateFXOnOpen(() => DataManager.Instance.SendHomeFX, fx => DataManager.Instance.SendHomeFX = fx,
-                "SendHome", parent)));
-
-        effectsNode.SubNodes.Add(_context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(
-            "Item Lost FX",
-            effectsNode,
-            "Icons.SparkleFill", CreateFXOnOpen(() => DataManager.Instance.ItemLostFX, fx => DataManager.Instance.ItemLostFX = fx,
-                "ItemLost", parent)));
-
-        effectsNode.SubNodes.Add(_context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>("Warp FX",
-            effectsNode,
-            "Icons.SparkleFill", CreateFXOnOpen(() => DataManager.Instance.WarpFX, fx => DataManager.Instance.WarpFX = fx, "Warp", parent)));
-
-        effectsNode.SubNodes.Add(_context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(
-            "Knockback FX",
-            effectsNode,
-            "Icons.SparkleFill", CreateFXOnOpen(() => DataManager.Instance.KnockbackFX, fx => DataManager.Instance.KnockbackFX = fx,
-                "Knockback", parent)));
-
-        effectsNode.SubNodes.Add(_context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>("Jump FX",
-            effectsNode,
-            "Icons.SparkleFill", CreateFXOnOpen(() => DataManager.Instance.JumpFX, fx => DataManager.Instance.JumpFX = fx, "Jump", parent)));
-
-        effectsNode.SubNodes.Add(_context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>("Throw FX",
-            effectsNode,
-            "Icons.SparkleFill", CreateFXOnOpen(() => DataManager.Instance.ThrowFX, fx => DataManager.Instance.ThrowFX = fx, "Throw",
-                parent)));
-
-        constantsNode.SubNodes.Add(effectsNode);
-        parent.SubNodes.Add(constantsNode);
-    }
-
-    private void CreateDataNode(NodeBase parent)
-    {
-        var dataNode =
-            _context.NodeFactory.CreateOpenEditorNode<EmptyPageViewModel>("Data", "Icons.FloppyDiskFill");
-        foreach (var type in Enum.GetValues<DataManager.DataType>())
-        {
-            if (type is DataManager.DataType.All or DataManager.DataType.None)
-                continue;
-
-            var entry = DataRegistry.Map[type];
-
-            var dataItemRootNode = _context.NodeFactory.CreateDataRootNode<DataListPageViewModel>(
-                type,
-                type.ToString(),
-                entry.Icon);
-            dataNode.SubNodes.Add(dataItemRootNode);
-        }
-
-        parent.SubNodes.Add(dataNode);
-    }
-
-    private void CreateSpriteNode(NodeBase parent)
-    {
-        var spriteNode =
-            _context.NodeFactory.CreateOpenEditorNode<EmptyPageViewModel>("Sprites", "Icons.PaintBrushFill");
-        //
-        spriteNode.SubNodes.Add(
-            _context.NodeFactory.CreateOpenEditorNodeWithParams<SpeciesEditPageViewModel>("Char Sprites", [true],
-                "Icons.PersonFill")
-        );
-        spriteNode.SubNodes.Add(
-            _context.NodeFactory.CreateOpenEditorNodeWithParams<SpeciesEditPageViewModel>("Portraits", [false],
-                "Icons.UserSquareFill")
-        );
-     
-        foreach (var type in Enum.GetValues<GraphicsManager.AssetType>())
-        {
-            if (type == GraphicsManager.AssetType.None || type == GraphicsManager.AssetType.All ||
-                type == GraphicsManager.AssetType.Count || type == GraphicsManager.AssetType.Autotile ||
-                type == GraphicsManager.AssetType.Chara || type == GraphicsManager.AssetType.Portrait ||
-                type == GraphicsManager.AssetType.Font)
-                continue;
-
-
-            if (type != GraphicsManager.AssetType.Tile)
-            {
-
-                spriteNode.SubNodes.Add(
-                    _context.NodeFactory.CreateSpriteRootNode<SpritePageViewModel>(type, type.ToString(),
-                        type.GetIcon()));
-            }
-            else
-            {
-                spriteNode.SubNodes.Add(
-                    _context.NodeFactory.CreateSpriteTileRootNode<SpritePageViewModel>(type.ToString(),
-                        type.GetIcon()));
-                
-            }
-        }
-
-
-        parent.SubNodes.Add(spriteNode);
-        
-    }
-    
-    private void CreateModNode(NodeBase parent)
-    {
-        var modRoot = _context.NodeFactory.CreateOpenEditorNode<ModListPageViewModel>("Mods", "Icons.ScrollFill");
-
-
-        parent.SubNodes.Add(modRoot);
-    }
-
-    private void InitializeTabEvents()
-    {
-        TabEvents _tabEvents = _context.TabEvents;
-        _tabEvents.AddChildTabEvent += (parent, child) =>
-        {
-            AddChildPage(parent, child);
-            ActivePage = child;
-        };
-
-        _tabEvents.SaveChildrenEvent += SaveChildren;
-
-        _tabEvents.AddTopLevelTabEvent += (tab) => { AddTopLevelPage(tab); };
-
-        _tabEvents.RemoveTabEvent += (tab) => { RemoveTab(tab); };
-
-        _tabEvents.NavigateToTabEvent += (tab) => { ActivePage = tab; };
-
-        // TODO: Check if this works if the page is a children of a tab. What if it closes the children first before the parent...
-        _tabEvents.CloseTabsForEntry += (key, dataType) =>
-        {
-            var topLevelPagesToClose = Pages
-                .OfType<ReflectedDataPageViewModel>()
-                .Where(p => p.Node is DataItemNode dataItemNode
-                            && dataItemNode.ItemKey == key
-                            && dataItemNode.Parent is DataRootNode rootNode
-                            && rootNode.DataType == dataType)
-                .Cast<EditorPageViewModel>()
-                .Select(page =>
-                {
-                    if (!_pageToNodeMap.TryGetValue(page, out var node)) return null;
-                    if (node is not PageNode pageNode) return null;
-                    return GetTopLevelNode(pageNode).Page;
-                })
-                .Where(p => p != null)
-                .Distinct()
-                .ToList();
-
-            foreach (var page in topLevelPagesToClose)
-                RemoveTab(page);
-        };
-    }
-
-    private void AttachEventsRecursive(NodeBase node)
-    {
-        node.SubNodesChanged += () => OnSubNodesChanged();
-
-        foreach (var child in node.SubNodes)
-            AttachEventsRecursive(child);
-    }
-
-    private void DetachEventsRecursive(NodeBase node)
-    {
-        node.SubNodesChanged -= OnSubNodesChanged;
-
-        foreach (var child in node.SubNodes)
-            DetachEventsRecursive(child);
-    }
-
-    private void OnSubNodesChanged()
-    {
-        RefreshTreeDataGrid();
-    }
-
-    private TabSwitcherViewModel? _tabSwitcher;
-
-    public TabSwitcherViewModel? TabSwitcher
-    {
-        get => _tabSwitcher;
-        set => this.RaiseAndSetIfChanged(ref _tabSwitcher, value);
-    }
-
-
-    private ModSwitcherViewModel? _modSwitcher;
-
-    public ModSwitcherViewModel? ModSwitcher
-    {
-        get => _modSwitcher;
-        set => this.RaiseAndSetIfChanged(ref _modSwitcher, value);
-    }
-
-    public void AddPageFromTreeNode(OpenEditorNode node)
-    {
-        if (node.EditorType.IsAssignableTo(typeof(IPreCreatePage)))
-            node.EditorType.GetMethod("OnPreCreate")?.Invoke(null, null);
-        
-        var editor = _context.PageFactory.CreatePage(node.EditorType, node, node.OnPageLoad);
-        
-        if (editor != null)
-        {
-            editor.SetPageTitleFromNode(node);
-            AddTopLevelPage(editor);
-        }
-    }
-
-    public async Task<bool> TryCloseTabAsync(EditorPageViewModel page)
-    {
-        if (PageHasChildren(page))
-        {
-            // TODO: Add a can close method and check if any of the subtabs has any unsaved changes.
-            var result = await MessageBoxWindowView.Show(_context.DialogService,
-                "Are you sure you want to close all subtabs?  Your changes will not be saved.", "Confirm Close",
-                MessageBoxWindowView.MessageBoxButtons.YesNo);
-
-            if (result != MessageBoxWindowView.MessageBoxResult.Yes)
-                return false;
-        }
-
-        RemoveTab(page);
-        page.OnPageRemoved();
-        return true;
-    }
-
-
-    public void OpenMapEditor()
-    {
-        var page = _context.PageFactory.CreatePage<MapEditorPageViewModel>(MapEditorNode);
-        page.SetPageTitle("Map Editor", "Icons.StairsFill");
-        AddTopLevelPage(page);
-    }
-    public void OpenGroundEditor()
-    {
-        var page = _context.PageFactory.CreatePage<GroundEditorPageViewModel>(GroundEditorNode);
-        page.SetPageTitle("Ground Editor", "Icons.IslandFill");
-        AddTopLevelPage(page);
-    }
-}
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/DialogBoxes/ModConfigWindowViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/DialogBoxes/ModConfigWindowViewModel.cs
deleted file mode 100644
index c5c680cb..00000000
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/DialogBoxes/ModConfigWindowViewModel.cs
+++ /dev/null
@@ -1,159 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using RogueEssence;
-using RogueEssence.Dungeon;
-using RogueEssence.Ground;
-using RogueEssence.Data;
-using ReactiveUI;
-using System.Collections.ObjectModel;
-using RogueEssence.Dev.Services;
-using RogueEssence.Dev.Views;
-
-namespace RogueEssence.Dev.ViewModels
-{
-    public class ModConfigWindowViewModel : ViewModelBase
-    {
-        public ModConfigWindowViewModel(IDialogService dialogService, ModHeader header)
-        {
-            Name = header.Name;
-            Namespace = header.Namespace;
-            Author = header.Author;
-            Description = header.Description;
-            UUID = header.UUID.ToString().ToUpper();
-            Version = header.Version.ToString();
-            GameVersion = header.GameVersion.ToString();
-
-            ModTypes = new ObservableCollection<string>();
-            for (int ii = 0; ii < (int)PathMod.ModType.Count; ii++)
-                ModTypes.Add(((PathMod.ModType)ii).ToLocal());
-            ChosenModType = (int)header.ModType;
-
-            DevForm form = (DevForm)DiagManager.Instance.DevEditor;
-            Relationships = new CollectionBoxViewModel(dialogService, new StringConv(typeof(RelatedMod), new object[0]));
-            Relationships.OnEditItem += Relationships_EditItem;
-            Relationships.LoadFromList(header.Relationships);
-        }
-
-        private string name;
-        public string Name
-        {
-            get => name;
-            set => this.SetIfChanged(ref name, value);
-        }
-
-        private string author;
-        public string Author
-        {
-            get => author;
-            set => this.SetIfChanged(ref author, value);
-        }
-
-        private string description;
-        public string Description
-        {
-            get => description;
-            set => this.SetIfChanged(ref description, value);
-        }
-
-        private string editNamespace;
-        public string Namespace
-        {
-            get => editNamespace;
-            set => this.SetIfChanged(ref editNamespace, value);
-        }
-
-        private string uuid;
-        public string UUID
-        {
-            get => uuid;
-            set => this.SetIfChanged(ref uuid, value);
-        }
-
-
-        private string version;
-        public string Version
-        {
-            get => version;
-            set => this.SetIfChanged(ref version, value);
-        }
-
-
-        private string gameVersion;
-        public string GameVersion
-        {
-            get => gameVersion;
-            set => this.SetIfChanged(ref gameVersion, value);
-        }
-
-        public ObservableCollection<string> ModTypes { get; }
-
-        private int chosenModType;
-        public int ChosenModType
-        {
-            get => chosenModType;
-            set => this.SetIfChanged(ref chosenModType, value);
-        }
-
-        public CollectionBoxViewModel Relationships { get; set; }
-
-
-        public void Relationships_EditItem(int index, object element, bool advancedEdit, CollectionBoxViewModel.EditElementOp op)
-        {
-            string elementName = "Relationship[" + index + "]";
-            DataEditForm frmData = new DataEditRootForm();
-            frmData.Title = DataEditor.GetWindowTitle("Relationship", elementName, element, typeof(RelatedMod), new object[0]);
-
-            //TODO: make this a member and reference it that way
-            DataEditor.LoadClassControls(frmData.ControlPanel, "Relationship", null, elementName, typeof(RelatedMod), new object[0], element, true, new Type[0], advancedEdit);
-            DataEditor.TrackTypeSize(frmData, typeof(RelatedMod));
-
-            frmData.SelectedOKEvent += async () =>
-            {
-                element = DataEditor.SaveClassControls(frmData.ControlPanel, elementName, typeof(RelatedMod), new object[0], true, new Type[0], advancedEdit);
-
-                bool itemExists = false;
-
-                List<RelatedMod> relations = Relationships.GetList<List<RelatedMod>>();
-                for (int ii = 0; ii < relations.Count; ii++)
-                {
-                    if (ii != index)
-                    {
-                        if (relations[ii].UUID == ((RelatedMod)element).UUID)
-                            itemExists = true;
-                    }
-                }
-
-                if (String.IsNullOrEmpty(((RelatedMod)element).Namespace))
-                {
-                    await MessageBox.Show(frmData, "Related mod needs a namespace!", "Namespace needed.", MessageBox.MessageBoxButtons.Ok);
-                    return false;
-                }
-                if (itemExists)
-                {
-                    await MessageBox.Show(frmData, "Cannot add duplicate entries.", "Entry with UUID already exists.", MessageBox.MessageBoxButtons.Ok);
-                    return false;
-                }
-                else
-                {
-                    op(index, element);
-                    return true;
-                }
-            };
-
-            //this.RegisterChild(frmData);
-            frmData.Show();
-        }
-
-        public RelatedMod[] GetRelationshipArray()
-        {
-            List<RelatedMod> relationships = Relationships.GetList<List<RelatedMod>>();
-            return relationships.ToArray();
-        }
-
-        public void btnRegenUUID_Click()
-        {
-            UUID = Guid.NewGuid().ToString().ToUpper();
-        }
-    }
-}
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DevEditPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DevEditPageViewModel.cs
deleted file mode 100644
index bc8f2182..00000000
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DevEditPageViewModel.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-using System;
-using RogueEssence.Data;
-
-namespace RogueEssence.Dev.ViewModels;
-
-using Dev.Services;
-
-public class DevEditPageViewModel : EditorPageViewModel
-{
-    public void btnEditEmote_Click()
-    {
-        OpenList(DataManager.DataType.Emote, DataManager.Instance.GetEmote, () => { return new EmoteData(); });
-    }
-
-    public void btnEditElement_Click()
-    {
-        OpenList(DataManager.DataType.Element, DataManager.Instance.GetElement, () => { return new ElementData(); });
-    }
-
-    public void btnEditGrowthGroup_Click()
-    {
-        OpenList(DataManager.DataType.GrowthGroup, DataManager.Instance.GetGrowth, () => { return new GrowthData(); });
-    }
-
-    public void btnEditSkillGroup_Click()
-    {
-        OpenList(DataManager.DataType.SkillGroup, DataManager.Instance.GetSkillGroup,
-            () => { return new SkillGroupData(); });
-    }
-
-    public void btnEditRank_Click()
-    {
-        OpenList(DataManager.DataType.Rank, DataManager.Instance.GetRank, () => { return new RankData(); });
-    }
-
-    public void btnEditSkin_Click()
-    {
-        OpenList(DataManager.DataType.Skin, DataManager.Instance.GetSkin, () => { return new SkinData(); });
-    }
-
-    public void btnEditAI_Click()
-    {
-        OpenList(DataManager.DataType.AI, DataManager.Instance.GetAITactic, () => { return new AITactic(); });
-    }
-
-
-    private delegate IEntryData GetEntry(string entryNum);
-
-    private delegate IEntryData CreateEntry();
-
-    private void OpenList(DataManager.DataType dataType, GetEntry entryOp, CreateEntry createOp)
-    {
-        lock (GameBase.lockObj)
-        {
-            // DataListForm dataListForm = new DataListForm();
-            // DataListFormViewModel choices = createChoices(dataListForm, dataType, entryOp, createOp);
-            // DataOpContainer reindexOp = createReindexOp(dataType, choices);
-            // DataOpContainer resaveFileOp = createResaveFileDiffOp(dataType, choices, entryOp, false);
-            // DataOpContainer resaveDiffOp = createResaveFileDiffOp(dataType, choices, entryOp, true);
-            // choices.SetOps(reindexOp, resaveFileOp, resaveDiffOp);
-            //
-            // dataListForm.DataContext = choices;
-            // dataListForm.SetListContextMenu(CreateContextMenu(choices));
-            // dataListForm.Show();
-        }
-    }
-    
-    // public override string? Title => "Dev Edit";
-
-    public DevEditPageViewModel(EditorContext context, NodeBase node, Action<EditorPageViewModel> onPageOpen = null) : base(context, node, onPageOpen)
-    {
-        var n = node as DataItemNode;
-        var nn = node.Parent as DataRootNode;
-        // var dt = nn.DataType;
-    }
-
-    // public DevEditPageViewModel() : base(new PageFactory(new DesignServiceProvider()),
-    //     new TabEvents(new PageFactory(new DesignServiceProvider())), new DialogService())
-    // {
-    //     // Title = "Dev Edit";
-    // }
-}
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/TestComboBoxViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/TestComboBoxViewModel.cs
deleted file mode 100644
index 5dc465b6..00000000
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/TestComboBoxViewModel.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using ReactiveUI;
-
-namespace RogueEssence.Dev.ViewModels;
-
-public class TestComboBoxViewModel : ViewModelBase
-{
-    private ObservableCollection<string> _fruits = new ObservableCollection<string>
-    {
-        "Pineapple", "Banana", "Cherry", "Dragonfruit",
-        "Elderberry", "Fig", "Grapes", "Honeydew"
-    };
-    
-    public ObservableCollection<string> Fruits
-    {
-        get => _fruits;
-        set => this.RaiseAndSetIfChanged(ref _fruits, value);
-    }
-    
-    private string? _selectedFruit;
-    public string? SelectedFruit
-    {
-        get => _selectedFruit;
-        set => this.RaiseAndSetIfChanged(ref _selectedFruit, value);
-    }
-    
-     
-
-    public TestComboBoxViewModel()
-    {
-        Fruits = new ObservableCollection<string>
-        {
-            "Pineapple", "Banana", "Cherry", "Dragonfruit",
-            "Elderberry", "Fig", "Grapes", "Honeydew"
-        };
-    }
-        
-    
-    
-}
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/TreeSearchViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/New/TreeSearchViewModel.cs
deleted file mode 100644
index 0bb9d81f..00000000
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/TreeSearchViewModel.cs
+++ /dev/null
@@ -1,123 +0,0 @@
-using System.Collections.ObjectModel;
-using System.Linq;
-using DynamicData;
-
-
-namespace RogueEssence.Dev.ViewModels;
-
-public class TreeSearchViewModel : ViewModelBase
-{
-    public ObservableCollection<NodeBase> Nodes { get; }
-    public ObservableCollection<NodeBase> SelectedNodes { get; }
-
-    public TreeSearchViewModel()
-    {
-        // SelectedNodes = new ObservableCollection<NodeBase>();
-        // Nodes = new ObservableCollection<NodeBase>
-        // {
-        //     new OpenEditorNode("Halcyon", "Icons.FloppyDiskBackFill")
-        //     {
-        //         SubNodes = new ObservableCollection<NodeBase>
-        //         {
-        //             new OpenEditorNode("Dev Control", "Icons.GameControllerFill", "DevControl"),
-        //             new OpenEditorNode("Zone Editor", "Icons.StairsFill", "ZoneEditor"),
-        //             new OpenEditorNode("Ground Editor", "Icons.MapTrifoldFill", "GroundEditor"),
-        //             new OpenEditorNode("Testing", "Icons.BedFill", "RandomInfo"),
-        //             new OpenEditorNode("Constants", "Icons.ListFill")
-        //             {
-        //                 SubNodes = new ObservableCollection<NodeBase>
-        //                 {
-        //                     new OpenEditorNode("Start Parameters", "Icons.ListFill"),
-        //                     new OpenEditorNode("Universal Events", "Icons.ListFill"),
-        //                     new OpenEditorNode("Strings", "Icons.TableFill")
-        //                     {
-        //                         SubNodes = new ObservableCollection<NodeBase>
-        //                         {
-        //                             new OpenEditorNode("English", "Icons.TableFill"),
-        //                             new OpenEditorNode("Chinese", "Icons.TableFill")
-        //                         }
-        //                     },
-        //                     new OpenEditorNode("Effects", "Icons.SparkleFill")
-        //                     {
-        //                         SubNodes = new ObservableCollection<NodeBase>
-        //                         {
-        //                             new OpenEditorNode("Heal FX", "Icons.SparkleFill"),
-        //                             new OpenEditorNode("+Charge FX", "Icons.SparkleFill"),
-        //                         }
-        //                     },
-        //                 }
-        //             },
-        //             new OpenEditorNode("Data", "Icons.FloppyDiskFill")
-        //             {
-        //                 SubNodes =
-        //                 {
-        //                     new DataRootNode("Monsters", "Monsters", "Monsters", "Icons.GhostFill")
-        //                     {
-        //                         SubNodes =
-        //                         {
-        //                             // TODO: Change later
-        //                             new DataItemNode("eevee", "MonsterEditor", "eevee: Eevee", "Icons.GhostFill"),
-        //                             new DataItemNode("seviper", "MonsterEditor", "seviper: Seviper", "Icons.GhostFill")
-        //                         }
-        //                     },
-        //                     new ActionDataNode("Items", "Icons.JarLabelFill")
-        //                     {
-        //                         SubNodes = new ObservableCollection<NodeBase>
-        //                         {
-        //                             new NodeBase("ammo_cacnea_spike: Ammo Cacnea Spike", "Icons.JarLabelFill"),
-        //                         }
-        //                     },
-        //                     new ActionDataNode("Zones", "Icons.StairsFill")
-        //                     {
-        //                         SubNodes = new ObservableCollection<NodeBase>
-        //                         {
-        //                             new NodeBase("ambush_forest: Ambush Forest", "Icons.StairsFill"),
-        //                         }
-        //                     },
-        //                     new ActionDataNode("Statuses", "Icons.HeartFill")
-        //                     {
-        //                         SubNodes = new ObservableCollection<NodeBase>
-        //                         {
-        //                             new NodeBase("para: Paralyzed", "Icons.HeartFill"),
-        //                         }
-        //                     },
-        //                 }
-        //             },
-        //             new NodeBase("Sprites", "Icons.PaintBrushFill")
-        //             {
-        //                 SubNodes = new ObservableCollection<NodeBase>
-        //                 {
-        //                     new NodeBase("Char Sprites", "Icons.GhostFill"),
-        //                     new NodeBase("Portraits", "Icons.ImagesSquareFill"),
-        //                     new ActionDataNode("Particles", "Icons.ShootingStarFill")
-        //                     {
-        //                         SubNodes = new ObservableCollection<NodeBase>
-        //                         {
-        //                             new NodeBase("Absorb", "Icons.ShootingStarFill"),
-        //                             new NodeBase("Acid_Blue", "Icons.ShootingStarFill"),
-        //                         }
-        //                     },
-        //                     new ActionDataNode("Beam", "Icons.HeadlightsFill")
-        //                     {
-        //                         SubNodes = new ObservableCollection<NodeBase>
-        //                         {
-        //                             new NodeBase("Beam_2", "Icons.HeadlightsFill"),
-        //                             new NodeBase("Beam_Pink", "Icons.HeadlightsFill"),
-        //                         }
-        //                     },
-        //                 }
-        //             },
-        //             new NodeBase("Mods", "Icons.SwordFill")
-        //             {
-        //                 SubNodes = new ObservableCollection<NodeBase>
-        //                 {
-        //                     new NodeBase("halcyon: Halcyon", "Icons.SwordFill"),
-        //                     new NodeBase("zorea_mystery_dungeon: Zorea Mystery Dungeon", "Icons.SwordFill"),
-        //                 }
-        //             }
-        //         }
-        //     },
-        // };
-        // Nodes.First().IsExpanded = true;
-    }
-}
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DataListPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/Pages/DataListPageViewModel.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DataListPageViewModel.cs
rename to RogueEssence.Editor.Avalonia/ViewModels/Pages/DataListPageViewModel.cs
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DevControlViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/Pages/DevControlPage/DevControlPageViewModel.cs
similarity index 89%
rename from RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DevControlViewModel.cs
rename to RogueEssence.Editor.Avalonia/ViewModels/Pages/DevControlPage/DevControlPageViewModel.cs
index 830719bd..c914e4bb 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/DevControlViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/Pages/DevControlPage/DevControlPageViewModel.cs
@@ -3,7 +3,7 @@
 
 namespace RogueEssence.Dev.ViewModels;
 
-public class DevControlViewModel : EditorPageViewModel
+public class DevControlPageViewModel : EditorPageViewModel
 {
     public DevTabGameViewModel Game { get; }
     public DevTabPlayerViewModel Player { get; }
@@ -15,7 +15,7 @@ public class DevControlViewModel : EditorPageViewModel
     public override string DefaultTitle => "Dev Control";
     
 
-    public DevControlViewModel(EditorContext context,
+    public DevControlPageViewModel(EditorContext context,
         DevTabGameViewModel game, DevTabPlayerViewModel player, DevTabTravelViewModel travel,
         DevTabScriptViewModel script, NodeBase node, Action<EditorPageViewModel> onPageOpen = null) : base(context, node, onPageOpen)
     {
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevTabGameViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/Pages/DevControlPage/DevTabGameViewModel.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevTabGameViewModel.cs
rename to RogueEssence.Editor.Avalonia/ViewModels/Pages/DevControlPage/DevTabGameViewModel.cs
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevTabPlayerViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/Pages/DevControlPage/DevTabPlayerViewModel.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevTabPlayerViewModel.cs
rename to RogueEssence.Editor.Avalonia/ViewModels/Pages/DevControlPage/DevTabPlayerViewModel.cs
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevTabScriptViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/Pages/DevControlPage/DevTabScriptViewModel.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevTabScriptViewModel.cs
rename to RogueEssence.Editor.Avalonia/ViewModels/Pages/DevControlPage/DevTabScriptViewModel.cs
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevTabTravelViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/Pages/DevControlPage/DevTabTravelViewModel.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevTabTravelViewModel.cs
rename to RogueEssence.Editor.Avalonia/ViewModels/Pages/DevControlPage/DevTabTravelViewModel.cs
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/EditorPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/Pages/EditorPageViewModel.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/ViewModels/New/Editors/EditorPageViewModel.cs
rename to RogueEssence.Editor.Avalonia/ViewModels/Pages/EditorPageViewModel.cs
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/EmptyPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/Pages/EmptyPageViewModel.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/ViewModels/New/Editors/EmptyPageViewModel.cs
rename to RogueEssence.Editor.Avalonia/ViewModels/Pages/EmptyPageViewModel.cs
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/EntScriptItem.cs b/RogueEssence.Editor.Avalonia/ViewModels/Pages/GroundEditPage/EntScriptItem.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/EntScriptItem.cs
rename to RogueEssence.Editor.Avalonia/ViewModels/Pages/GroundEditPage/EntScriptItem.cs
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/EntityBrowserViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/Pages/GroundEditPage/EntityBrowserViewModel.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/EntityBrowserViewModel.cs
rename to RogueEssence.Editor.Avalonia/ViewModels/Pages/GroundEditPage/EntityBrowserViewModel.cs
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/GroundEditorPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/Pages/GroundEditPage/GroundEditPageViewModel.cs
similarity index 99%
rename from RogueEssence.Editor.Avalonia/ViewModels/New/Editors/GroundEditorPageViewModel.cs
rename to RogueEssence.Editor.Avalonia/ViewModels/Pages/GroundEditPage/GroundEditPageViewModel.cs
index 77fb9e3f..8a0c0b87 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/GroundEditorPageViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/Pages/GroundEditPage/GroundEditPageViewModel.cs
@@ -20,7 +20,7 @@
 
 namespace RogueEssence.Dev.ViewModels;
 
-public class GroundEditorPageViewModel : EditorPageViewModel, IGroundEditor, IPreCreatePage, IPageReloadable
+public class GroundEditPageViewModel : EditorPageViewModel, IGroundEditor, IPreCreatePage, IPageReloadable
 {
     // Keeps track of whether the map editor while testing in-game
     private bool _allowEdit;
@@ -55,7 +55,7 @@ public static void OnPreCreate()
 
     public UndoStack Edits { get; }
     
-    public GroundEditorPageViewModel(EditorContext context, NodeBase node,
+    public GroundEditPageViewModel(EditorContext context, NodeBase node,
         Action<EditorPageViewModel> onPageOpen = null) : base(context, node, onPageOpen)
     {
         Edits = new UndoStack();
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/GroundTabDecorationsViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/Pages/GroundEditPage/GroundTabDecorationsViewModel.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/GroundTabDecorationsViewModel.cs
rename to RogueEssence.Editor.Avalonia/ViewModels/Pages/GroundEditPage/GroundTabDecorationsViewModel.cs
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/GroundTabEntitiesViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/Pages/GroundEditPage/GroundTabEntitiesViewModel.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/GroundTabEntitiesViewModel.cs
rename to RogueEssence.Editor.Avalonia/ViewModels/Pages/GroundEditPage/GroundTabEntitiesViewModel.cs
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/GroundTabPropertiesViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/Pages/GroundEditPage/GroundTabPropertiesViewModel.cs
similarity index 98%
rename from RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/GroundTabPropertiesViewModel.cs
rename to RogueEssence.Editor.Avalonia/ViewModels/Pages/GroundEditPage/GroundTabPropertiesViewModel.cs
index d1226a7c..d3a11ff1 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/GroundTabPropertiesViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/Pages/GroundEditPage/GroundTabPropertiesViewModel.cs
@@ -16,8 +16,8 @@ namespace RogueEssence.Dev.ViewModels
     public class GroundTabPropertiesViewModel : ViewModelBase
     {
         EditorContext _context;
-        GroundEditorPageViewModel _parent;
-        public GroundTabPropertiesViewModel(EditorContext context, GroundEditorPageViewModel parent)
+        GroundEditPageViewModel _parent;
+        public GroundTabPropertiesViewModel(EditorContext context, GroundEditPageViewModel parent)
         {
             _context = context;
             _parent = parent;
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/GroundTabScriptViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/Pages/GroundEditPage/GroundTabScriptViewModel.cs
similarity index 98%
rename from RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/GroundTabScriptViewModel.cs
rename to RogueEssence.Editor.Avalonia/ViewModels/Pages/GroundEditPage/GroundTabScriptViewModel.cs
index ea7fcaf9..095653a6 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/GroundTabScriptViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/Pages/GroundEditPage/GroundTabScriptViewModel.cs
@@ -40,7 +40,7 @@ public async void btnOpenScriptDir_Click()
         {
             DevForm form = (DevForm)DiagManager.Instance.DevEditor;
 
-            string file = Path.GetFileNameWithoutExtension(((GroundEditorPageViewModel)form.GroundEditorPage).CurrentFile);
+            string file = Path.GetFileNameWithoutExtension(((GroundEditPageViewModel)form.GroundEditorPage).CurrentFile);
             string mapscriptdir = LuaEngine.MakeGroundMapScriptPath(file, "");
 
             if (!Directory.Exists(mapscriptdir))
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/GroundTabStringsViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/Pages/GroundEditPage/GroundTabStringsViewModel.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/GroundTabStringsViewModel.cs
rename to RogueEssence.Editor.Avalonia/ViewModels/Pages/GroundEditPage/GroundTabStringsViewModel.cs
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/GroundTabTexturesViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/Pages/GroundEditPage/GroundTabTexturesViewModel.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/GroundTabTexturesViewModel.cs
rename to RogueEssence.Editor.Avalonia/ViewModels/Pages/GroundEditPage/GroundTabTexturesViewModel.cs
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/GroundTabWallsViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/Pages/GroundEditPage/GroundTabWallsViewModel.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/GroundTabWallsViewModel.cs
rename to RogueEssence.Editor.Avalonia/ViewModels/Pages/GroundEditPage/GroundTabWallsViewModel.cs
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/Layers/AnimLayerBoxViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/Pages/GroundEditPage/Layers/AnimLayerBoxViewModel.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/Layers/AnimLayerBoxViewModel.cs
rename to RogueEssence.Editor.Avalonia/ViewModels/Pages/GroundEditPage/Layers/AnimLayerBoxViewModel.cs
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/Layers/AnimLayerViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/Pages/GroundEditPage/Layers/AnimLayerViewModel.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/Layers/AnimLayerViewModel.cs
rename to RogueEssence.Editor.Avalonia/ViewModels/Pages/GroundEditPage/Layers/AnimLayerViewModel.cs
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/Layers/EntityLayerBoxViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/Pages/GroundEditPage/Layers/EntityLayerBoxViewModel.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/Layers/EntityLayerBoxViewModel.cs
rename to RogueEssence.Editor.Avalonia/ViewModels/Pages/GroundEditPage/Layers/EntityLayerBoxViewModel.cs
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/Layers/EntityLayerViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/Pages/GroundEditPage/Layers/EntityLayerViewModel.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/Layers/EntityLayerViewModel.cs
rename to RogueEssence.Editor.Avalonia/ViewModels/Pages/GroundEditPage/Layers/EntityLayerViewModel.cs
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/Layers/MapLayerViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/Pages/GroundEditPage/Layers/MapLayerViewModel.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/Layers/MapLayerViewModel.cs
rename to RogueEssence.Editor.Avalonia/ViewModels/Pages/GroundEditPage/Layers/MapLayerViewModel.cs
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/Layers/TextureLayerBoxViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/Pages/GroundEditPage/Layers/TextureLayerBoxViewModel.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/Layers/TextureLayerBoxViewModel.cs
rename to RogueEssence.Editor.Avalonia/ViewModels/Pages/GroundEditPage/Layers/TextureLayerBoxViewModel.cs
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/MapString.cs b/RogueEssence.Editor.Avalonia/ViewModels/Pages/GroundEditPage/MapString.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/MapString.cs
rename to RogueEssence.Editor.Avalonia/ViewModels/Pages/GroundEditPage/MapString.cs
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/ScriptItem.cs b/RogueEssence.Editor.Avalonia/ViewModels/Pages/GroundEditPage/ScriptItem.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/ScriptItem.cs
rename to RogueEssence.Editor.Avalonia/ViewModels/Pages/GroundEditPage/ScriptItem.cs
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/MapEditorPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/Pages/MapEditPage/MapEditPageViewModel.cs
similarity index 99%
rename from RogueEssence.Editor.Avalonia/ViewModels/New/Editors/MapEditorPageViewModel.cs
rename to RogueEssence.Editor.Avalonia/ViewModels/Pages/MapEditPage/MapEditPageViewModel.cs
index 98965521..903a31c0 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/MapEditorPageViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/Pages/MapEditPage/MapEditPageViewModel.cs
@@ -20,7 +20,7 @@
 
 namespace RogueEssence.Dev.ViewModels;
 
-public class MapEditorPageViewModel : EditorPageViewModel, IMapEditor, IPreCreatePage, IPageReloadable
+public class MapEditPageViewModel : EditorPageViewModel, IMapEditor, IPreCreatePage, IPageReloadable
 {
     // This is probably not the ideal way of doing this...
     public static void OnPreCreate()
@@ -49,7 +49,7 @@ public void ProcessInput(InputManager input)
         DevForm.ExecuteOrInvoke(() => _processInput(input));
     }
     
-    public MapEditorPageViewModel(
+    public MapEditPageViewModel(
         // MapTabTexturesViewModel textures,
         // MapTabDecorationsViewModel decorations,
         // MapTabTerrainViewModel terrain,
@@ -722,7 +722,7 @@ private void ExportToGround(Map curmap, string filepath)
         DataManager.SaveObject(curgrnd, filepath);
 
         //Actually create the script folder, and default script file.
-        GroundEditViewModel.CreateOrCopyScriptData("", filepath);
+        GroundEditPageViewModel.CreateOrCopyScriptData("", filepath);
 
         CurrentFile = filepath;
     }
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/MapEditForm/MapTabDecorationsViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/Pages/MapEditPage/MapTabDecorationsViewModel.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/ViewModels/MapEditForm/MapTabDecorationsViewModel.cs
rename to RogueEssence.Editor.Avalonia/ViewModels/Pages/MapEditPage/MapTabDecorationsViewModel.cs
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/MapEditForm/MapTabEffectsViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/Pages/MapEditPage/MapTabEffectsViewModel.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/ViewModels/MapEditForm/MapTabEffectsViewModel.cs
rename to RogueEssence.Editor.Avalonia/ViewModels/Pages/MapEditPage/MapTabEffectsViewModel.cs
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/MapEditForm/MapTabEntitiesViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/Pages/MapEditPage/MapTabEntitiesViewModel.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/ViewModels/MapEditForm/MapTabEntitiesViewModel.cs
rename to RogueEssence.Editor.Avalonia/ViewModels/Pages/MapEditPage/MapTabEntitiesViewModel.cs
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/MapEditForm/MapTabEntrancesViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/Pages/MapEditPage/MapTabEntrancesViewModel.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/ViewModels/MapEditForm/MapTabEntrancesViewModel.cs
rename to RogueEssence.Editor.Avalonia/ViewModels/Pages/MapEditPage/MapTabEntrancesViewModel.cs
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/MapEditForm/MapTabItemsViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/Pages/MapEditPage/MapTabItemsViewModel.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/ViewModels/MapEditForm/MapTabItemsViewModel.cs
rename to RogueEssence.Editor.Avalonia/ViewModels/Pages/MapEditPage/MapTabItemsViewModel.cs
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/MapEditForm/MapTabPropertiesViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/Pages/MapEditPage/MapTabPropertiesViewModel.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/ViewModels/MapEditForm/MapTabPropertiesViewModel.cs
rename to RogueEssence.Editor.Avalonia/ViewModels/Pages/MapEditPage/MapTabPropertiesViewModel.cs
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/MapEditForm/MapTabSpawnsViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/Pages/MapEditPage/MapTabSpawnsViewModel.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/ViewModels/MapEditForm/MapTabSpawnsViewModel.cs
rename to RogueEssence.Editor.Avalonia/ViewModels/Pages/MapEditPage/MapTabSpawnsViewModel.cs
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/MapEditForm/MapTabTerrainViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/Pages/MapEditPage/MapTabTerrainViewModel.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/ViewModels/MapEditForm/MapTabTerrainViewModel.cs
rename to RogueEssence.Editor.Avalonia/ViewModels/Pages/MapEditPage/MapTabTerrainViewModel.cs
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/MapEditForm/MapTabTexturesViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/Pages/MapEditPage/MapTabTexturesViewModel.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/ViewModels/MapEditForm/MapTabTexturesViewModel.cs
rename to RogueEssence.Editor.Avalonia/ViewModels/Pages/MapEditPage/MapTabTexturesViewModel.cs
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/MapEditForm/MapTabTilesViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/Pages/MapEditPage/MapTabTilesViewModel.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/ViewModels/MapEditForm/MapTabTilesViewModel.cs
rename to RogueEssence.Editor.Avalonia/ViewModels/Pages/MapEditPage/MapTabTilesViewModel.cs
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/MapEditForm/Teams/TeamViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/Pages/MapEditPage/Teams/TeamViewModel.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/ViewModels/MapEditForm/Teams/TeamViewModel.cs
rename to RogueEssence.Editor.Avalonia/ViewModels/Pages/MapEditPage/Teams/TeamViewModel.cs
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ModConfigPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/Pages/ModConfigPageViewModel.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ModConfigPageViewModel.cs
rename to RogueEssence.Editor.Avalonia/ViewModels/Pages/ModConfigPageViewModel.cs
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ModListPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/Pages/ModListPageViewModel.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ModListPageViewModel.cs
rename to RogueEssence.Editor.Avalonia/ViewModels/Pages/ModListPageViewModel.cs
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/RandomInfoPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/Pages/RandomInfoPageViewModel.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/ViewModels/New/Editors/RandomInfoPageViewModel.cs
rename to RogueEssence.Editor.Avalonia/ViewModels/Pages/RandomInfoPageViewModel.cs
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ReflectedDataPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/Pages/ReflectedDataPageViewModel.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/ViewModels/New/Editors/ReflectedDataPageViewModel.cs
rename to RogueEssence.Editor.Avalonia/ViewModels/Pages/ReflectedDataPageViewModel.cs
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/SpeciesEditPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/Pages/SpeciesEditPageViewModel.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/ViewModels/New/Editors/SpeciesEditPageViewModel.cs
rename to RogueEssence.Editor.Avalonia/ViewModels/Pages/SpeciesEditPageViewModel.cs
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/SpritePageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/Pages/SpritePageViewModel.cs
similarity index 99%
rename from RogueEssence.Editor.Avalonia/ViewModels/New/Editors/SpritePageViewModel.cs
rename to RogueEssence.Editor.Avalonia/ViewModels/Pages/SpritePageViewModel.cs
index 8475d00e..f37e217e 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/SpritePageViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/Pages/SpritePageViewModel.cs
@@ -372,9 +372,10 @@ await MessageBoxWindowView.Show(_dialogService,
         {
             items.Add(animName);
         }
+        
 
-        MapRetileViewModel viewModel = new MapRetileViewModel(GraphicsManager.TileSize, "Tile size must be divisible by 8.");
-        bool sizeResult = await _dialogService.ShowDialogAsync<MapRetileViewModel, bool>(viewModel, "");
+        MapRetileWindowViewModel viewModel = new MapRetileWindowViewModel(GraphicsManager.TileSize, "Tile size must be divisible by 8.");
+        bool sizeResult = await _dialogService.ShowDialogAsync<MapRetileWindowViewModel, bool>(viewModel, "");
 
         int size = viewModel.TileSize;
 
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/New/Editors/StringEditPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/Pages/StringEditPageViewModel.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/ViewModels/New/Editors/StringEditPageViewModel.cs
rename to RogueEssence.Editor.Avalonia/ViewModels/Pages/StringEditPageViewModel.cs
diff --git a/RogueEssence.Editor.Avalonia/Views/Content/AnimEditForm.axaml b/RogueEssence.Editor.Avalonia/Views/Content/AnimEditForm.axaml
deleted file mode 100644
index b0ad0877..00000000
--- a/RogueEssence.Editor.Avalonia/Views/Content/AnimEditForm.axaml
+++ /dev/null
@@ -1,43 +0,0 @@
-<Window xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:vm="clr-namespace:RogueEssence.Dev.ViewModels;assembly=RogueEssence.Editor.Avalonia"
-        xmlns:views="clr-namespace:RogueEssence.Dev.Views"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        mc:Ignorable="d"
-        xmlns:converters="clr-namespace:RogueEssence.Dev.Converters"
-        x:Class="RogueEssence.Dev.Views.AnimEditForm"
-        Title="{Binding Name}" Height="280" Width="300" Closed="Window_Closed">
-  <!--Icon="/Assets/app-logo.ico"-->
-    <Design.DataContext>
-      <vm:AnimEditViewModel/>
-    </Design.DataContext>
-  <Window.Resources>
-  </Window.Resources>
-  <DockPanel>
-    <Menu DockPanel.Dock="Top">
-      <MenuItem Header="_Edit">
-        <MenuItem Header="Mass Import" Command="{Binding mnuMassImport_Click}"/>
-        <Separator/>
-        <MenuItem Header="Mass Export" Command="{Binding mnuMassExport_Click}"/>
-      </MenuItem>
-    </Menu>
-    <Grid>
-      <Grid.RowDefinitions>
-        <RowDefinition Height="*"/>
-        <RowDefinition Height="34"/>
-      </Grid.RowDefinitions>
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition/>
-        <ColumnDefinition/>
-        <ColumnDefinition/>
-        <ColumnDefinition/>
-      </Grid.ColumnDefinitions>
-      <views:SearchListBox DataContext="{Binding Anims}" Margin="4" Grid.ColumnSpan="4"/>
-      <Button Command="{Binding btnImport_Click}" Margin="4" Grid.Row="1" Grid.Column="0" IsEnabled="{Binding ChosenAnim, Converter={x:Static ObjectConverters.IsNotNull}}">Import</Button>
-      <Button Command="{Binding btnReImport_Click}" Margin="4" Grid.Row="1" Grid.Column="1" IsEnabled="{Binding CachedPath, Converter={x:Static StringConverters.IsNotNullOrEmpty}}">Re-Import</Button>
-      <Button Command="{Binding btnExport_Click}" Margin="4" Grid.Row="1" Grid.Column="2" IsEnabled="{Binding ChosenAnim, Converter={x:Static ObjectConverters.IsNotNull}}">Export</Button>
-      <Button Command="{Binding btnDelete_Click}" Margin="4" Grid.Row="1" Grid.Column="3" IsEnabled="{Binding ChosenAnim, Converter={x:Static ObjectConverters.IsNotNull}}">Delete</Button>
-    </Grid>
-  </DockPanel>
-</Window>
diff --git a/RogueEssence.Editor.Avalonia/Views/Content/AnimEditForm.axaml.cs b/RogueEssence.Editor.Avalonia/Views/Content/AnimEditForm.axaml.cs
deleted file mode 100644
index e1be2953..00000000
--- a/RogueEssence.Editor.Avalonia/Views/Content/AnimEditForm.axaml.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
-using Avalonia.Input;
-using Avalonia.Interactivity;
-using System;
-using RogueEssence;
-using RogueEssence.Dev;
-using Microsoft.Xna.Framework;
-using Avalonia.Threading;
-using System.Threading;
-using RogueEssence.Dungeon;
-
-namespace RogueEssence.Dev.Views
-{
-    public partial class AnimEditForm : Window
-    {
-
-        public AnimEditForm()
-        {
-            InitializeComponent();
-        }
-        
-        public void Window_Closed(object sender, EventArgs e)
-        {
-            lock (GameBase.lockObj)
-            {
-                if (DungeonScene.Instance != null)
-                {
-                    DungeonScene.Instance.DebugAsset = RogueEssence.Content.GraphicsManager.AssetType.None;
-                    DungeonScene.Instance.DebugAnim = "";
-                }
-            }
-        }
-    }
-}
diff --git a/RogueEssence.Editor.Avalonia/Views/Content/SpeciesEditForm.axaml b/RogueEssence.Editor.Avalonia/Views/Content/SpeciesEditForm.axaml
deleted file mode 100644
index e22535a2..00000000
--- a/RogueEssence.Editor.Avalonia/Views/Content/SpeciesEditForm.axaml
+++ /dev/null
@@ -1,69 +0,0 @@
-<Window xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:vm="clr-namespace:RogueEssence.Dev.ViewModels;assembly=RogueEssence.Editor.Avalonia"
-        xmlns:views="clr-namespace:RogueEssence.Dev.Views"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        mc:Ignorable="d"
-        xmlns:converters="clr-namespace:RogueEssence.Dev.Converters"
-        x:Class="RogueEssence.Dev.Views.SpeciesEditForm"
-        Title="{Binding Name}" Height="280" Width="300">
-  <!--Icon="/Assets/app-logo.ico"-->
-    <Design.DataContext>
-      <vm:SpeciesEditViewModel2/>
-    </Design.DataContext>
-  <Window.Resources>
-    <converters:OXConverter x:Key="OXConverter"/>
-  </Window.Resources>
-  <DockPanel>
-    <Menu DockPanel.Dock="Top">
-      <MenuItem Header="_Edit">
-        <MenuItem Header="Mass Import" Command="{Binding mnuMassImport_Click}"/>
-        <MenuItem Header="Re-Index" Command="{Binding mnuReIndex_Click}"/>
-        <Separator/>
-        <MenuItem Header="Mass Export" Command="{Binding mnuMassExport_Click}"/>
-        <MenuItem Header="Mass Export Multi Sheet" Command="{Binding mnuMassExportMulti_Click}"/>
-      </MenuItem>
-    </Menu>
-    <Grid>
-      <Grid.RowDefinitions>
-        <RowDefinition Height="*"/>
-        <RowDefinition Height="34"/>
-      </Grid.RowDefinitions>
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition/>
-        <ColumnDefinition/>
-        <ColumnDefinition/>
-        <ColumnDefinition/>
-      </Grid.ColumnDefinitions>
-      <TreeView ItemsSource="{Binding Monsters}" SelectedItem="{Binding ChosenMonster}" SelectionMode="AlwaysSelected" Margin="4" Grid.ColumnSpan="4">
-        <TreeView.DataTemplates>
-          <TreeDataTemplate DataType="vm:MonsterNodeViewModel2" ItemsSource="{Binding Nodes}">
-            <Grid>
-              <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="24"/>
-                <ColumnDefinition/>
-              </Grid.ColumnDefinitions>
-              <Image Source="{Binding Filled, Converter={StaticResource OXConverter}}" Stretch="None" Grid.Column="0"/>
-              <TextBlock Text="{Binding Name}" VerticalAlignment="Center" Grid.Column="1"/>
-            </Grid>
-          </TreeDataTemplate>
-        </TreeView.DataTemplates>
-        <TreeView.ContextMenu>
-          <ContextMenu ItemsSource="{Binding OpList}">
-            <ContextMenu.Styles>
-              <Style Selector="MenuItem">
-                <Setter Property="Header" Value="{Binding Name}"/>
-                <Setter Property="Command" Value="{Binding Command}"/>
-              </Style>
-            </ContextMenu.Styles>
-          </ContextMenu>
-        </TreeView.ContextMenu>
-      </TreeView>
-      <Button Command="{Binding btnImport_Click}" Margin="4" Grid.Row="1" Grid.Column="0" IsEnabled="{Binding ChosenMonster, Converter={x:Static ObjectConverters.IsNotNull}}">Import</Button>
-      <Button Command="{Binding btnReImport_Click}" Margin="4" Grid.Row="1" Grid.Column="1" IsEnabled="{Binding CachedPath, Converter={x:Static StringConverters.IsNotNullOrEmpty}}">Re-Import</Button>
-      <Button Command="{Binding btnExport_Click}" Margin="4" Grid.Row="1" Grid.Column="2" IsEnabled="{Binding ChosenMonster, Converter={x:Static ObjectConverters.IsNotNull}}">Export</Button>
-      <Button Command="{Binding btnDelete_Click}" Margin="4" Grid.Row="1" Grid.Column="3" IsEnabled="{Binding ChosenMonster, Converter={x:Static ObjectConverters.IsNotNull}}">Delete</Button>
-    </Grid>
-  </DockPanel>
-</Window>
diff --git a/RogueEssence.Editor.Avalonia/Views/Content/SpeciesEditForm.axaml.cs b/RogueEssence.Editor.Avalonia/Views/Content/SpeciesEditForm.axaml.cs
deleted file mode 100644
index b72076e3..00000000
--- a/RogueEssence.Editor.Avalonia/Views/Content/SpeciesEditForm.axaml.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
-using Avalonia.Input;
-using Avalonia.Interactivity;
-using System;
-using RogueEssence;
-using RogueEssence.Dev;
-using Microsoft.Xna.Framework;
-using Avalonia.Threading;
-using System.Threading;
-
-namespace RogueEssence.Dev.Views
-{
-    public partial class SpeciesEditForm : Window
-    {
-
-        public SpeciesEditForm()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/RogueEssence.Editor.Avalonia/Views/Content/StringsEditForm.axaml b/RogueEssence.Editor.Avalonia/Views/Content/StringsEditForm.axaml
deleted file mode 100644
index df56604c..00000000
--- a/RogueEssence.Editor.Avalonia/Views/Content/StringsEditForm.axaml
+++ /dev/null
@@ -1,53 +0,0 @@
-<Window xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:vm="clr-namespace:RogueEssence.Dev.ViewModels;assembly=RogueEssence.Editor.Avalonia"
-        xmlns:views="clr-namespace:RogueEssence.Dev.Views"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        mc:Ignorable="d"
-        xmlns:converters="clr-namespace:RogueEssence.Dev.Converters"
-        x:Class="RogueEssence.Dev.Views.StringsEditForm"
-        Title="{Binding Name}" Height="300" Width="480">
-  <!--Icon="/Assets/app-logo.ico"-->
-    <Design.DataContext>
-      <vm:StringsEditViewModel/>
-    </Design.DataContext>
-  <Window.Resources>
-  </Window.Resources>
-  <DockPanel>
-    <Grid>
-      <Grid.RowDefinitions>
-        <RowDefinition Height="*"/>
-        <RowDefinition Height="34"/>
-      </Grid.RowDefinitions>
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition/>
-        <ColumnDefinition/>
-        <ColumnDefinition/>
-      </Grid.ColumnDefinitions>
-      <DataGrid Grid.ColumnSpan="3" ItemsSource="{Binding GameStrings}" SelectedIndex="{Binding CurrentString, Mode=TwoWay}"
-                CanUserResizeColumns="True" HorizontalScrollBarVisibility="Disabled" Margin="4">
-
-        <DataGrid.Styles>
-          <Style Selector="TextBlock">
-            <Setter Property="TextWrapping" Value="WrapWithOverflow" />
-          </Style>
-          <Style Selector="TextBox">
-            <Setter Property="TextWrapping" Value="Wrap" />
-            <Setter Property="AcceptsReturn" Value="True" />
-          </Style>
-        </DataGrid.Styles>
-
-        <DataGrid.Columns>
-          <DataGridTextColumn Header="Key" Binding="{Binding Key}" Width="1*"/>
-          <DataGridTextColumn Header="Comment" Binding="{Binding Comment}" Width="1*"/>
-          <DataGridTextColumn Header="String" Binding="{Binding String}" Width="3*"/>
-        </DataGrid.Columns>
-      </DataGrid>
-
-      <Button Command="{Binding btnAdd_Click}" Margin="4" Grid.Row="1" Grid.Column="0">Add</Button>
-      <Button Command="{Binding btnDelete_Click}" Margin="4" Grid.Row="1" Grid.Column="1">Delete</Button>
-      <Button Command="{Binding btnSave_Click}" Margin="4" Grid.Row="1" Grid.Column="2">Save All</Button>
-    </Grid>
-  </DockPanel>
-</Window>
diff --git a/RogueEssence.Editor.Avalonia/Views/Content/StringsEditForm.axaml.cs b/RogueEssence.Editor.Avalonia/Views/Content/StringsEditForm.axaml.cs
deleted file mode 100644
index 803f78d9..00000000
--- a/RogueEssence.Editor.Avalonia/Views/Content/StringsEditForm.axaml.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
-using Avalonia.Input;
-using Avalonia.Interactivity;
-using System;
-using RogueEssence;
-using RogueEssence.Dev;
-using Microsoft.Xna.Framework;
-using Avalonia.Threading;
-using System.Threading;
-using RogueEssence.Dungeon;
-
-namespace RogueEssence.Dev.Views
-{
-    public partial class StringsEditForm : Window
-    {
-
-        public StringsEditForm()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/RogueEssence.Editor.Avalonia/Views/Content/TilesetEditForm.axaml b/RogueEssence.Editor.Avalonia/Views/Content/TilesetEditForm.axaml
deleted file mode 100644
index 93959eb7..00000000
--- a/RogueEssence.Editor.Avalonia/Views/Content/TilesetEditForm.axaml
+++ /dev/null
@@ -1,44 +0,0 @@
-<Window xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:vm="clr-namespace:RogueEssence.Dev.ViewModels;assembly=RogueEssence.Editor.Avalonia"
-        xmlns:views="clr-namespace:RogueEssence.Dev.Views"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        mc:Ignorable="d"
-        xmlns:converters="clr-namespace:RogueEssence.Dev.Converters"
-        x:Class="RogueEssence.Dev.Views.TilesetEditForm"
-        Title="Tiles" Height="280" Width="300">
-  <!--Icon="/Assets/app-logo.ico"-->
-    <Design.DataContext>
-      <vm:TilesetEditViewModel/>
-    </Design.DataContext>
-  <Window.Resources>
-  </Window.Resources>
-  <DockPanel>
-    <Menu DockPanel.Dock="Top">
-      <MenuItem Header="_Edit">
-        <MenuItem Header="Mass Import" Command="{Binding mnuMassImport_Click}"/>
-        <MenuItem Header="Re-Index" Command="{Binding mnuReIndex_Click}"/>
-        <Separator/>
-        <MenuItem Header="Mass Export" Command="{Binding mnuMassExport_Click}"/>
-      </MenuItem>
-    </Menu>
-    <Grid>
-      <Grid.RowDefinitions>
-        <RowDefinition Height="*"/>
-        <RowDefinition Height="34"/>
-      </Grid.RowDefinitions>
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition/>
-        <ColumnDefinition/>
-        <ColumnDefinition/>
-        <ColumnDefinition/>
-      </Grid.ColumnDefinitions>
-      <views:SearchListBox DataContext="{Binding Tilesets}" Margin="4" Grid.ColumnSpan="4"/>
-      <Button Command="{Binding btnImport_Click}" Margin="4" Grid.Row="1" Grid.Column="0" IsEnabled="{Binding ChosenAnim, Converter={x:Static ObjectConverters.IsNotNull}}">Import</Button>
-      <Button Command="{Binding btnReImport_Click}" Margin="4" Grid.Row="1" Grid.Column="1" IsEnabled="{Binding CachedPath, Converter={x:Static StringConverters.IsNotNullOrEmpty}}">Re-Import</Button>
-      <Button Command="{Binding btnExport_Click}" Margin="4" Grid.Row="1" Grid.Column="2" IsEnabled="{Binding ChosenAnim, Converter={x:Static ObjectConverters.IsNotNull}}">Export</Button>
-      <Button Command="{Binding btnDelete_Click}" Margin="4" Grid.Row="1" Grid.Column="3" IsEnabled="{Binding ChosenAnim, Converter={x:Static ObjectConverters.IsNotNull}}">Delete</Button>
-    </Grid>
-  </DockPanel>
-</Window>
diff --git a/RogueEssence.Editor.Avalonia/Views/Content/TilesetEditForm.axaml.cs b/RogueEssence.Editor.Avalonia/Views/Content/TilesetEditForm.axaml.cs
deleted file mode 100644
index 44919bc3..00000000
--- a/RogueEssence.Editor.Avalonia/Views/Content/TilesetEditForm.axaml.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
-using Avalonia.Input;
-using Avalonia.Interactivity;
-using System;
-using RogueEssence;
-using RogueEssence.Dev;
-using Microsoft.Xna.Framework;
-using Avalonia.Threading;
-using System.Threading;
-using RogueEssence.Dungeon;
-
-namespace RogueEssence.Dev.Views
-{
-    public partial class TilesetEditForm : Window
-    {
-
-        public TilesetEditForm()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/RogueEssence.Editor.Avalonia/Views/DataListForm.axaml b/RogueEssence.Editor.Avalonia/Views/DataListForm.axaml
deleted file mode 100644
index 4ff7d6c1..00000000
--- a/RogueEssence.Editor.Avalonia/Views/DataListForm.axaml
+++ /dev/null
@@ -1,54 +0,0 @@
-<Window xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:vm="clr-namespace:RogueEssence.Dev.ViewModels;assembly=RogueEssence.Editor.Avalonia"
-        xmlns:views="clr-namespace:RogueEssence.Dev.Views"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        mc:Ignorable="d"
-        x:Class="RogueEssence.Dev.Views.DataListForm"
-        Title="{Binding Name}" Height="260" Width="200">
-  <!--Icon="/Assets/app-logo.ico"-->
-    <Design.DataContext>
-        <vm:DataListFormViewModel/>
-    </Design.DataContext>
-
-  <DockPanel>
-    <!--Menu DockPanel.Dock="Top">
-      <MenuItem Header="_Edit">
-        <MenuItem Header="Re-Index" Command="{Binding mnuReIndex_Click}"/>
-      </MenuItem>
-    </Menu-->
-
-    <Menu DockPanel.Dock="Top" ItemsSource="{Binding OpList}">
-      <Menu.Styles>
-        <Style Selector="MenuItem">
-          <Setter Property="Header" Value="{Binding Name}"/>
-          <Setter Property="Command" Value="{Binding Command}"/>
-          <Setter Property="ItemsSource" Value="{Binding Items}"/>
-        </Style>
-      </Menu.Styles>
-    </Menu>
-
-    <!--Menu DockPanel.Dock="Top" Items="{Binding OpList}">
-      <Menu.Styles>
-        <Style Selector="MenuItem">
-          <Setter Property="Header" Value="{Binding Name}"/>
-          <Setter Property="Command" Value="{Binding Command}"/>
-        </Style>
-      </Menu.Styles>
-    </Menu-->
-    <Grid>
-      <Grid.RowDefinitions>
-        <RowDefinition Height="*"/>
-        <RowDefinition Height="34"/>
-      </Grid.RowDefinitions>
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition/>
-        <ColumnDefinition/>
-      </Grid.ColumnDefinitions>
-      <views:SearchListBox Name="lbxItems" DataContext="{Binding SearchList}" Margin="4" Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2"/>
-      <Button Name="btnAdd" Command="{Binding btnAdd_Click}" Margin="4" Grid.Row="1" Grid.Column="0" >Add</Button>
-      <Button Name="btnDelete" Command="{Binding btnDelete_Click}" Margin="4" Grid.Row="1" Grid.Column="1">Delete</Button>
-    </Grid>
-  </DockPanel>
-</Window>
diff --git a/RogueEssence.Editor.Avalonia/Views/DataListForm.axaml.cs b/RogueEssence.Editor.Avalonia/Views/DataListForm.axaml.cs
deleted file mode 100644
index 16d39fc0..00000000
--- a/RogueEssence.Editor.Avalonia/Views/DataListForm.axaml.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
-using Avalonia.Input;
-using Avalonia.Interactivity;
-using System;
-using RogueEssence;
-using RogueEssence.Dev;
-using Microsoft.Xna.Framework;
-using Avalonia.Threading;
-using System.Threading;
-
-namespace RogueEssence.Dev.Views
-{
-    public partial class DataListForm : Window
-    {
-
-        public DataListForm()
-        {
-            InitializeComponent();
-        }
-        
-        public void SetListContextMenu(ContextMenu menu)
-        {
-            SearchListBox lbx = this.FindControl<SearchListBox>("lbxItems");
-            lbx.ContextMenu = menu;
-        }
-    }
-}
diff --git a/RogueEssence.Editor.Avalonia/Views/New/CaptionButtons.axaml b/RogueEssence.Editor.Avalonia/Views/DevForm/CaptionButtons.axaml
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/New/CaptionButtons.axaml
rename to RogueEssence.Editor.Avalonia/Views/DevForm/CaptionButtons.axaml
diff --git a/RogueEssence.Editor.Avalonia/Views/New/CaptionButtons.axaml.cs b/RogueEssence.Editor.Avalonia/Views/DevForm/CaptionButtons.axaml.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/New/CaptionButtons.axaml.cs
rename to RogueEssence.Editor.Avalonia/Views/DevForm/CaptionButtons.axaml.cs
diff --git a/RogueEssence.Editor.Avalonia/Views/New/ChromelessWindow.cs b/RogueEssence.Editor.Avalonia/Views/DevForm/ChromelessWindow.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/New/ChromelessWindow.cs
rename to RogueEssence.Editor.Avalonia/Views/DevForm/ChromelessWindow.cs
diff --git a/RogueEssence.Editor.Avalonia/Views/DevForm/DevForm.axaml b/RogueEssence.Editor.Avalonia/Views/DevForm/DevForm.axaml
index 4290e1dd..ba030585 100644
--- a/RogueEssence.Editor.Avalonia/Views/DevForm/DevForm.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/DevForm/DevForm.axaml
@@ -1,44 +1,241 @@
-<Window xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:vm="clr-namespace:RogueEssence.Dev.ViewModels;assembly=RogueEssence.Editor.Avalonia"
-        xmlns:views="clr-namespace:RogueEssence.Dev.Views"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        mc:Ignorable="d"
-
-        Title="Dev Controls" Height="480" Width="460">
-    <!-- x:Class="RogueEssence.Dev.Views.DevForm" -->
-    <!--  Opened="Window_Loaded" Closed="Window_Closed -->
-  <!--Icon="/Assets/app-logo.ico"-->
-  <!--   <Design.DataContext> -->
-  <!--       <vm:DevFormViewModel/> -->
-  <!--   </Design.DataContext> -->
-  <!-- <Grid> -->
-  <!--   <TabControl TabStripPlacement="Top" Margin="2"> -->
-  <!--     <TabItem Header="Game" > -->
-  <!--       <views:DevTabGame DataContext="{Binding Game}"/> -->
-  <!--     </TabItem> -->
-  <!--     <TabItem Header="Player" > -->
-  <!--       <views:DevTabPlayer DataContext="{Binding Player}"/> -->
-  <!--     </TabItem> -->
-  <!--     <TabItem Header="Travel" > -->
-  <!--       <views:DevTabTravel DataContext="{Binding Travel}"/> -->
-  <!--     </TabItem> -->
-  <!--     <TabItem Header="Data" > -->
-  <!--       <views:DevTabData DataContext="{Binding Data}"/> -->
-  <!--     </TabItem> -->
-  <!--     <TabItem Header="Sprites" > -->
-  <!--       <views:DevTabSprites DataContext="{Binding Sprites}"/> -->
-  <!--     </TabItem> -->
-  <!--     <TabItem Header="Script" > -->
-  <!--       <views:DevTabScript DataContext="{Binding Script}"/> -->
-  <!--     </TabItem> -->
-  <!--     <TabItem Header="Mods" > -->
-  <!--       <views:DevTabMods DataContext="{Binding Mods}"/> -->
-  <!--     </TabItem> -->
-  <!--     <TabItem Header="Constants" > -->
-  <!--       <views:DevTabConstants DataContext="{Binding Constants}"/> -->
-  <!--     </TabItem> -->
-  <!--   </TabControl> -->
-  <!-- </Grid> -->
-</Window>
+<v:ChromelessWindow xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:vm="clr-namespace:RogueEssence.Dev.ViewModels"
+                    xmlns:v="clr-namespace:RogueEssence.Dev.Views"
+                    xmlns:c="clr-namespace:RogueEssence.Dev.Converters"
+                    xmlns:views="clr-namespace:RogueEssence.Dev.Views"
+                    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+                    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+                    mc:Ignorable="d"
+                    d:DesignWidth="1024"
+                    d:DesignHeight="450"
+                    x:Class="RogueEssence.Dev.Views.DevForm"
+                    x:Name="WindowMain"
+                    MinHeight="400"
+                    MinWidth="600"
+                    Opened="Window_Loaded" Closed="Window_Closed"
+                    Title="PMDO Editor">
+
+    <Design.DataContext>
+        <vm:DevFormViewModel />
+    </Design.DataContext>
+    <Window.Resources>
+        <c:WindowStateToColumnConverter x:Key="WindowStateToColumnConverter" />
+    </Window.Resources>
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="{Binding #WindowMain.CaptionHeight}" />
+            <RowDefinition Height="*" />
+        </Grid.RowDefinitions>
+
+        <!-- Top Bar -->
+        <Grid Grid.Row="0" ColumnDefinitions="Auto, Auto, *, Auto">
+            <Border Grid.Column="0" Grid.ColumnSpan="4"
+                    DoubleTapped="MaximizeOrRestoreWindow"
+                    PointerPressed="BeginMoveWindow"
+                    Background="{DynamicResource Brush.TitleBar}"
+                    BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border0}" />
+            <Border Grid.Column="0" Width="72" IsVisible="{Binding #WindowMain.HasLeftCaptionButton}" />
+
+            <StackPanel
+                Grid.Column="{Binding #WindowMain.WindowState, Converter={StaticResource WindowStateToColumnConverter}}"
+                Orientation="Horizontal">
+                <!-- Settings -->
+                <Button Classes="icon_button" Command="{Binding ShowPreferencesWindow}"
+                        Padding="8, 4, 0, 0">
+                    <Path HorizontalAlignment="Center" Width="14" Height="14" Margin="0,2,0,0"
+                          Data="{StaticResource Icons.GearFill}" />
+                </Button>
+
+                <!-- Switch Mod Button  -->
+                <!-- TODO: figure out why tooltips won't work -->
+                <Button Margin="12,0,0,0" Grid.Column="3"
+                        Classes="icon_button"
+                        x:Name="ModSwitcherFlyoutButton" Padding="0,4,0,0"
+                        ToolTip.Tip="testing tooltip">
+                    <StackPanel Orientation="Horizontal"
+                                VerticalAlignment="Center">
+                        <TextBlock Padding="0,0,6,0" Text="{Binding ModsManager.CurrentMod.Name, FallbackValue='Origin'}"
+                                   MaxWidth="200"
+                                   TextTrimming="CharacterEllipsis" />
+                        <Path HorizontalAlignment="Center" Width="10" Height="10" Margin="0,2,0,0"
+                              Data="{StaticResource Icons.CaretDownFill}" />
+                    </StackPanel>
+                    <Button.Flyout>
+                        <Flyout Placement="BottomEdgeAlignedLeft"
+                                VerticalOffset="8"
+                                Opened="ModSwitcherFlyout_OnOpened"
+                                Closed="ModSwitcherFlyout_OnClosed">
+                            <StackPanel Orientation="Vertical" Background="{DynamicResource Brush.Popup}">
+                                <ContentControl Content="{Binding ModSwitcher}" Margin="8,8,8,8" />
+                            </StackPanel>
+                        </Flyout>
+                    </Button.Flyout>
+                </Button>
+            </StackPanel>
+
+            <Border Grid.Column="3" Margin="16,0,0,0" IsVisible="{Binding #WindowMain.HasRightCaptionButton}">
+                <v:CaptionButtons Height="30" VerticalAlignment="Top" />
+            </Border>
+        </Grid>
+        <Grid Grid.Row="1">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="250" MinWidth="100" MaxWidth="500" />
+                <ColumnDefinition Width="0" />
+                <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
+            <!-- Left Side -->
+            <Border Grid.Column="0" Margin="0,0,0,0" BorderThickness="1"
+                    BorderBrush="{DynamicResource Brush.ToolBar}" CornerRadius="6">
+                <Grid RowDefinitions="28, 3, *">
+                    <TextBox Classes="search"
+                             Margin="0,0,0,0"
+                             Height="28"
+                             BorderThickness="0"
+                             Watermark="Search..."
+                             Text="{Binding Filter, Mode=TwoWay}">
+                        <TextBox.InnerRightContent>
+                            <Button Classes="icon_button"
+                                    Width="16"
+                                    Height="16"
+                                    Margin="0,0,6,0"
+                                    Command="{Binding ClearFilter}"
+                                    IsVisible="{Binding Filter, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"
+                                    HorizontalAlignment="Right">
+                                <Path
+                                    Fill="{DynamicResource Brush.FG2}"
+                                    Width="14" Height="14"
+                                    Margin="0,1,0,0"
+                                    Data="{StaticResource Icons.XCircleFill}" />
+                            </Button>
+                        </TextBox.InnerRightContent>
+                    </TextBox>
+                    <Border Grid.Row="1"
+                            Height="1"
+                            Background="{DynamicResource Brush.Border2}"
+                            HorizontalAlignment="Stretch" />
+                    <TreeDataGrid Grid.Row="2"
+                                  MinHeight="200" MinWidth="200"
+                                  x:Name="LeftTreeDataGrid"
+                                  Loaded="LeftTreeDataGrid_OnLoaded"
+                                  DoubleTapped="LeftTreeDataGrid_OnDoubleTapped"
+                                  ContextRequested="LeftTreeDataGrid_OnContextRequested"
+                                  PointerPressed="LeftTreeDataGrid_OnPointerPressed"
+                                  LostFocus="LeftTreeDataGrid_OnLostFocus"
+                                  ShowColumnHeaders="False"
+                                  Source="{Binding NodeSource}">
+                        <TreeDataGrid.Resources>
+
+                            <DataTemplate x:Key="TreeDataGridNodeBaseTemplate" DataType="vm:NodeBase">
+                                <ContentControl Content="{Binding}">
+                                    <ContentControl.DataTemplates>
+                                        <!-- <DataTemplate DataType="vm:ItemRootNode"> -->
+                                        <!--     <Grid ColumnDefinitions="*, 32" Height="16" Margin="8, 0, 0, 0"> -->
+                                        <!--         <v:IconText Grid.Column="0" Grid.ColumnSpan="2" -->
+                                        <!--                     Text="{Binding Title}" -->
+                                        <!--                     Icon="{Binding Icon}" -->
+                                        <!--                     IconSize="12" /> -->
+
+                                        <!-- <Button Grid.Column="1" HorizontalAlignment="Left" -->
+                                        <!--         Classes="icon_button" -->
+                                        <!--         Padding="4, 0, 0, 0" -->
+                                        <!--         Width="18" Height="18" -->
+                                        <!--         IsVisible="{Binding IsPointerOver, RelativeSource={RelativeSource AncestorType=TreeDataGridRow}}" -->
+                                        <!-- -->
+                                        <!--         Command="{Binding AddCommand}"> -->
+                                        <!--     <Path Stretch="Fill" -->
+                                        <!--           Fill="{DynamicResource Brush.FG1}" -->
+                                        <!--           Width="12" Height="12" -->
+                                        <!--           Data="{StaticResource Icons.Plus}" /> -->
+                                        <!-- </Button> -->
+                                        <!--     </Grid> -->
+                                        <!-- </DataTemplate> -->
+
+                                        <DataTemplate DataType="vm:DataItemNode">
+                                            <Grid ColumnDefinitions="*,32" Height="16" Margin="8, 0, 0, 0">
+                                                <v:IconText Text="{Binding Title}"
+                                                            Icon="{Binding Icon}"
+                                                            IconSize="12" />
+                                                <!-- -->
+                                                <!-- <Button Grid.Column="1" -->
+                                                <!--         Padding="4, 0, 0, 0" -->
+                                                <!--         HorizontalAlignment="Left" -->
+                                                <!--         Command="{Binding ((vm:ItemRootNode)Parent).DeleteCommand}" -->
+                                                <!--         CommandParameter="{Binding}" -->
+                                                <!--         IsVisible="{Binding IsPointerOver, RelativeSource={RelativeSource AncestorType=TreeDataGridRow}}" -->
+                                                <!--         Classes="icon_button" -->
+                                                <!--         Width="18" Height="18" -->
+                                                <!--         VerticalAlignment="Center"> -->
+                                                <!--     <Path Stretch="Fill" -->
+                                                <!--           Fill="{DynamicResource Brush.FG1}" -->
+                                                <!--           Width="12" Height="12" -->
+                                                <!--           Data="{StaticResource Icons.Minus}" /> -->
+                                                <!-- </Button> -->
+                                            </Grid>
+                                        </DataTemplate>
+
+
+                                        <DataTemplate DataType="vm:OpenEditorNode">
+                                            <v:IconText Margin="8, 0, 0, 0" Text="{Binding Title}"
+                                                        Icon="{Binding Icon}"
+                                                        IconSize="12" />
+                                        </DataTemplate>
+
+
+                                        <DataTemplate DataType="vm:NodeBase">
+                                            <v:IconText Margin="8, 0, 0, 0" Text="{Binding Title}"
+                                                        Icon="{Binding Icon}"
+                                                        IconSize="12" />
+                                        </DataTemplate>
+
+                                    </ContentControl.DataTemplates>
+                                </ContentControl>
+                            </DataTemplate>
+                        </TreeDataGrid.Resources>
+                    </TreeDataGrid>
+                </Grid>
+            </Border>
+
+            <!--  Splitter -->
+            <GridSplitter Grid.Column="1"
+                          BorderBrush="{DynamicResource Brush.Border0}"
+                          Background="Transparent"
+                          MinWidth="3"
+                          HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
+                          BorderThickness="0,0,1,0" />
+
+            <!-- Editor Panel -->
+            <Grid Margin="2, 0, 0, 0" Grid.Column="2" RowDefinitions="Auto, *">
+                <Border BorderThickness="0, 0, 0, 1" BorderBrush="{DynamicResource Brush.Border0}"
+                        Background="{DynamicResource TabControlWindowActiveBackgroundBrush}">
+                    <!-- Tab Bar -->
+                    <views:TabBarView Height="30" VerticalAlignment="Bottom" Margin="0,0,0,0" />
+
+                </Border>
+
+                <!-- Editor Content -->
+                <Panel Grid.Row="1" Background="{DynamicResource Brush.PageBackground}">
+
+                    <!-- Temporary tab still uses ContentControl since it's transient -->
+                    <ContentControl Content="{Binding TemporaryTab}"
+                                    IsVisible="{Binding TemporaryTab, Converter={x:Static ObjectConverters.IsNotNull}}" />
+
+                    <!-- All permanent pages kept alive, just toggling visibility -->
+                    <ItemsControl ItemsSource="{Binding Pages}"
+                                  IsVisible="{Binding TemporaryTab, Converter={x:Static ObjectConverters.IsNull}}">
+                        <ItemsControl.ItemsPanel>
+                            <ItemsPanelTemplate>
+                                <Panel />
+                            </ItemsPanelTemplate>
+                        </ItemsControl.ItemsPanel>
+                        <ItemsControl.ItemTemplate>
+                            <DataTemplate>
+                                <ContentControl Content="{Binding}" IsVisible="{Binding IsActive}" />
+                            </DataTemplate>
+                        </ItemsControl.ItemTemplate>
+                    </ItemsControl>
+                </Panel>
+            </Grid>
+        </Grid>
+    </Grid>
+</v:ChromelessWindow>
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/DevForm/DevForm.axaml.cs b/RogueEssence.Editor.Avalonia/Views/DevForm/DevForm.axaml.cs
index 72afc3b1..2dc08cde 100644
--- a/RogueEssence.Editor.Avalonia/Views/DevForm/DevForm.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/DevForm/DevForm.axaml.cs
@@ -1,442 +1,738 @@
-// using Avalonia;
-// using Avalonia.Controls;
-// using Avalonia.Markup.Xaml;
-// using Avalonia.Input;
-// using Avalonia.Interactivity;
-// using System;
-// using RogueEssence;
-// using RogueEssence.Dev;
-// using Microsoft.Xna.Framework;
-// using Avalonia.Threading;
-// using System.Threading;
-// using RogueEssence.Data;
-// using RogueEssence.Content;
-// using System.Collections;
-// using System.Collections.Generic;
-// using System.IO;
-//
-// namespace RogueEssence.Dev.Views
-// {
-//     public partial class DevForm : Window, IRootEditor
-//     {
-//         public bool LoadComplete { get; private set; }
-//
-//         public MapEditForm MapEditForm;
-//         public GroundEditForm GroundEditForm;
-//
-//         private Action pendingEditorAction;
-//         private Exception pendingException;
-//
-//         public IMapEditor MapEditor { get { return MapEditForm; } }
-//         public IGroundEditor GroundEditor { get { return GroundEditForm; } }
-//         public bool AteMouse { get { return false; } }
-//         public bool AteKeyboard { get { return false; } }
-//
-//         private static Dictionary<string, string> devConfig;
-//         private static bool canSave;
-//
-//
-//
-//         public DevForm()
-//         {
-//             InitializeComponent();
-//         }
-//         
-//         void IRootEditor.Load(GameBase game)
-//         {
-//             ExecuteOrInvoke(load);
-//         }
-//
-//         private void load()
-//         {
-//             lock (GameBase.lockObj)
-//             {
-//                 DevDataManager.Init();
-//
-//                 loadDevConfig();
-//
-//                 reload(DataManager.DataType.All);
-//
-//                 LoadComplete = true;
-//             }
-//         }
-//
-//
-//         void IRootEditor.ReloadData(DataManager.DataType dataType)
-//         {
-//             ExecuteOrInvoke(() => { reload(dataType); });
-//         }
-//
-//         private void reload(DataManager.DataType dataType)
-//         {
-//             lock (GameBase.lockObj)
-//             {
-//                 if (dataType == DataManager.DataType.All)
-//                     DevDataManager.ClearCaches();
-//
-//                 ViewModels.DevFormViewModel devViewModel = (ViewModels.DevFormViewModel)this.DataContext;
-//
-//                 if (dataType == DataManager.DataType.All)
-//                 {
-//                     devViewModel.Game.HideSprites = DataManager.Instance.HideChars;
-//                     devViewModel.Game.HideObjects = DataManager.Instance.HideObjects;
-//                     devViewModel.Travel.DebugGen = DiagManager.Instance.ListenGen;
-//                 }
-//
-//                 if ((dataType & DataManager.DataType.Skill) != DataManager.DataType.None)
-//                     devViewModel.Game.ReloadSkills();
-//
-//                 if ((dataType & DataManager.DataType.Intrinsic) != DataManager.DataType.None)
-//                     devViewModel.Game.ReloadIntrinsics();
-//
-//                 if ((dataType & DataManager.DataType.Status) != DataManager.DataType.None)
-//                     devViewModel.Game.ReloadStatuses();
-//
-//                 if ((dataType & DataManager.DataType.Item) != DataManager.DataType.None)
-//                     devViewModel.Game.ReloadItems();
-//
-//
-//                 if ((dataType & DataManager.DataType.Monster) != DataManager.DataType.None)
-//                 {
-//                     devViewModel.Player.LoadMonstersNumeric();
-//                     devViewModel.Player.ReloadMonsters();
-//                 }
-//
-//                 if (dataType == DataManager.DataType.All)
-//                 {
-//                     int globalIdle = GraphicsManager.GlobalIdle;
-//                     devViewModel.Player.Anims.Clear();
-//                     for (int ii = 0; ii < GraphicsManager.Actions.Count; ii++)
-//                         devViewModel.Player.Anims.Add(GraphicsManager.Actions[ii].Name);
-//                     devViewModel.Player.ChosenAnim = -1;
-//                     devViewModel.Player.ChosenAnim = globalIdle;
-//                 }
-//
-//                 if ((dataType & DataManager.DataType.Zone) != DataManager.DataType.None)
-//                     devViewModel.Travel.ReloadZones();
-//
-//                 if (dataType == DataManager.DataType.All)
-//                     devViewModel.Mods.UpdateMod();
-//
-//                 LoadComplete = true;
-//             }
-//         }
-//
-//
-//         public void Update(GameTime gameTime)
-//         {
-//             if (pendingEditorAction != null)
-//             {
-//                 try
-//                 {
-//                     pendingEditorAction();
-//                     pendingException = null;
-//                 }
-//                 catch (Exception ex)
-//                 {
-//                     pendingException = ex;
-//                 }
-//                 pendingEditorAction = null;
-//             }
-//
-//             ExecuteOrInvoke(update);
-//         }
-//
-//         private void update()
-//         {
-//             lock (GameBase.lockObj)
-//             {
-//                 ViewModels.DevFormViewModel devViewModel = (ViewModels.DevFormViewModel)this.DataContext;
-//
-//                 devViewModel.Player.UpdateLevel();
-//                 if (GameManager.Instance.IsInGame())
-//                 {
-//                     if (!devViewModel.Player.JustOnce)
-//                     {
-//                         if (devViewModel.Player.JustMe)
-//                         {
-//                             int currentIdle = Dungeon.DungeonScene.Instance.FocusedCharacter.IdleOverride;
-//                             if (currentIdle < 0)
-//                                 currentIdle = GraphicsManager.GlobalIdle;
-//                             devViewModel.Player.ChosenAnim = currentIdle;
-//                         }
-//                         else
-//                             devViewModel.Player.ChosenAnim = GraphicsManager.GlobalIdle;
-//                     }
-//                     devViewModel.Player.UpdateSpecies(Dungeon.DungeonScene.Instance.FocusedCharacter.BaseForm);
-//                 }
-//                 if (GroundEditForm != null)
-//                 {
-//                     ViewModels.GroundEditViewModel vm = (ViewModels.GroundEditViewModel)GroundEditForm.DataContext;
-//                     vm.Textures.TileBrowser.UpdateFrame();
-//                 }
-//                 if (MapEditForm != null)
-//                 {
-//                     ViewModels.MapEditViewModel vm = (ViewModels.MapEditViewModel)MapEditForm.DataContext;
-//                     vm.Textures.TileBrowser.UpdateFrame();
-//                     vm.Terrain.TileBrowser.UpdateFrame();
-//                 }
-//
-//                 if (canSave)
-//                     saveConfig();
-//             }
-//         }
-//         public void Draw() { }
-//
-//         public void OpenGround()
-//         {
-//             ExecuteOrInvoke(openGround);
-//         }
-//
-//         private void openGround()
-//         {
-//             GroundEditForm = new GroundEditForm();
-//             ViewModels.GroundEditViewModel vm = new ViewModels.GroundEditViewModel();
-//             GroundEditForm.DataContext = vm;
-//             vm.LoadFromCurrentGround();
-//             GroundEditForm.Show();
-//         }
-//
-//         public void OpenMap()
-//         {
-//             ExecuteOrInvoke(openMap);
-//         }
-//
-//         public void openMap()
-//         {
-//             MapEditForm = new MapEditForm();
-//             ViewModels.MapEditViewModel vm = new ViewModels.MapEditViewModel();
-//             MapEditForm.DataContext = vm;
-//             vm.LoadFromCurrentMap();
-//             MapEditForm.Show();
-//         }
-//
-//         public void groundEditorClosed(object sender, EventArgs e)
-//         {
-//             GameManager.Instance.SceneOutcome = resetEditors();
-//         }
-//
-//         public void mapEditorClosed(object sender, EventArgs e)
-//         {
-//             GameManager.Instance.SceneOutcome = resetEditors();
-//         }
-//
-//
-//         private IEnumerator<YieldInstruction> resetEditors()
-//         {
-//             GroundEditForm = null;
-//             MapEditForm = null;
-//             yield return CoroutineManager.Instance.StartCoroutine(GameManager.Instance.RestartToTitle());
-//         }
-//
-//
-//         public void CloseGround()
-//         {
-//             if (GroundEditForm != null)
-//                 GroundEditForm.Close();
-//         }
-//
-//         public void CloseMap()
-//         {
-//             if (MapEditForm != null)
-//                 MapEditForm.Close();
-//         }
-//
-//
-//         void LoadGame()
-//         {
-//             // Windows - CAN run game in new thread, CAN run game in same thread via dispatch.
-//             // Mac - CANNOT run game in new thread, CAN run game in same thread via dispatch.
-//             // Linux - CAN run the game in new thread, CANNOT run game in same thread via dispatch.
-//
-//             // When the game is started, it should run a continuous loop, blocking the UI
-//             // However, this is only happening on linux.  Why not windows and mac?
-//             // With Mac, cocoa can ONLY start the game window if it's on the main thread. Weird...
-//
-//             if (!OperatingSystem.IsLinux())
-//                 LoadGameDelegate();
-//             else
-//             {
-//                 Thread thread = new Thread(LoadGameDelegate);
-//                 thread.IsBackground = true;
-//                 thread.Start();
-//             }
-//         }
-//
-//         /// <summary>
-//         /// A method intended to be called from the editor thread, that sends a function pointer to the Game thread,
-//         /// waits for it to complete (blocking the thread), and then continues execution.
-//         /// This call cannot be performed within a lock!!
-//         /// </summary>
-//         /// <param name="action"></param>
-//         public static void ExecuteOrPend(Action action)
-//         {
-//             if (!OperatingSystem.IsLinux())
-//                 action();
-//             else
-//             {
-//                 DevForm editor = (DevForm)DiagManager.Instance.DevEditor;
-//                 editor.pendingEditorAction = action;
-//
-//                 SpinWait.SpinUntil(() => editor.pendingEditorAction == null);
-//
-//                 if (editor.pendingException != null)
-//                 {
-//                     Exception ex = editor.pendingException;
-//                     throw ex;
-//                 }
-//             }
-//         }
-//
-//         public static void ExecuteOrInvoke(Action action)
-//         {
-//             if (!OperatingSystem.IsLinux())
-//                 action();
-//             else
-//                 Dispatcher.UIThread.InvokeAsync(action, DispatcherPriority.Background);
-//         }
-//
-//         void LoadGameDelegate()
-//         {
-//             try
-//             {
-//                 DiagManager.Instance.DevEditor = this;
-//                 using (GameBase game = new GameBase())
-//                     game.Run();
-//             }
-//             catch (Exception ex)
-//             {
-//                 DiagManager.Instance.LogError(ex);
-//             }
-//             ExecuteOrInvoke(Close);
-//         }
-//
-//         public void Window_Loaded(object sender, EventArgs e)
-//         {
-//             if (Design.IsDesignMode)
-//                 return;
-//             //Thread thread = new Thread(LoadGame);
-//             //thread.IsBackground = true;
-//             //thread.Start();
-//             Dispatcher.UIThread.InvokeAsync(LoadGame, DispatcherPriority.Background);
-//             //LoadGame();
-//         }
-//
-//         public void Window_Closed(object sender, EventArgs e)
-//         {
-//             DiagManager.Instance.LoadMsg = "Closing...";
-//             EnterLoadPhase(GameBase.LoadPhase.Unload);
-//         }
-//
-//         public static void EnterLoadPhase(GameBase.LoadPhase loadState)
-//         {
-//             GameBase.CurrentPhase = loadState;
-//         }
-//
-//
-//
-//         private static void loadDevConfig()
-//         {
-//             devConfig = new Dictionary<string, string>();
-//
-//             try
-//             {
-//                 string configPath = GetConfigPath();
-//                 string folderPath = Path.GetDirectoryName(configPath);
-//                 if (!Directory.Exists(folderPath))
-//                     Directory.CreateDirectory(folderPath);
-//
-//                 if (File.Exists(configPath))
-//                 {
-//                     using (FileStream stream = File.OpenRead(configPath))
-//                     {
-//                         using (BinaryReader reader = new BinaryReader(stream))
-//                         {
-//                             while (reader.BaseStream.Position < reader.BaseStream.Length)
-//                             {
-//                                 string key = reader.ReadString();
-//                                 string val = reader.ReadString();
-//                                 devConfig[key] = val;
-//                             }
-//                         }
-//                     }
-//                 }
-//             }
-//             catch (Exception ex)
-//             {
-//                 DiagManager.Instance.LogError(ex);
-//             }
-//         }
-//
-//
-//         private static void saveConfig()
-//         {
-//             //save whole file
-//             try
-//             {
-//                 using (var writer = new BinaryWriter(new FileStream(GetConfigPath(), FileMode.Create, FileAccess.Write, FileShare.None)))
-//                 {
-//                     foreach (string curKey in devConfig.Keys)
-//                     {
-//                         writer.Write(curKey);
-//                         writer.Write(devConfig[curKey]);
-//                     }
-//                 }
-//             }
-//             catch (IOException ioEx)
-//             {
-//                 DiagManager.Instance.LogError(ioEx, false);
-//             }
-//             catch (Exception ex)
-//             {
-//                 DiagManager.Instance.LogError(ex);
-//             }
-//         }
-//
-//         public static string GetConfig(string key, string def)
-//         {
-//             string val;
-//             if (devConfig.TryGetValue(key, out val))
-//                 return val;
-//             return def;
-//         }
-//
-//         public static int GetConfig(string key, int def)
-//         {
-//             string val;
-//             if (devConfig.TryGetValue(key, out val))
-//             {
-//                 int result;
-//                 if (Int32.TryParse(val, out result))
-//                     return result;
-//             }
-//             return def;
-//         }
-//
-//         public static void SetConfig(string key, int val)
-//         {
-//             SetConfig(key, val.ToString());
-//         }
-//
-//         public static void SetConfig(string key, string val)
-//         {
-//             if (val == null && devConfig.ContainsKey(key))
-//                 devConfig.Remove(key);
-//             else
-//                 devConfig[key] = val;
-//
-//             canSave = true;
-//         }
-//
-//         public static string GetConfigPath()
-//         {
-//             //https://jimrich.sk/environment-specialfolder-on-windows-linux-and-os-x/
-//             //MacOS actually uses a different folder for config data, traditionally
-//             //I guess it's the odd one out...
-//             if (OperatingSystem.IsMacOS())
-//                 return PathMod.FromApp("./devConfig");//Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Personal), "/Library/Application Support/RogueEssence/config");
-//             else
-//                 return PathMod.FromApp("./devConfig");//Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "RogueEssence /devConfig");
-//         }
-//     }
-// }
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Controls.Primitives;
+using Avalonia.Controls.Templates;
+using Avalonia.Input;
+using Avalonia.Interactivity;
+using Avalonia.LogicalTree;
+using Avalonia.Platform.Storage;
+using Avalonia.Threading;
+using Avalonia.VisualTree;
+using Avalonia.Platform;
+using Microsoft.Xna.Framework;
+using RogueEssence.Content;
+using RogueEssence.Data;
+using RogueEssence.Dev.Utility;
+using RogueEssence.Dev.ViewModels;
+using RogueEssence.Dungeon;
+
+namespace RogueEssence.Dev.Views;
+
+public partial class DevForm : ChromelessWindow, IRootEditor
+{
+    public bool LoadComplete { get; private set; }
+
+        public MapEditPageViewModel MapEditorPage;
+        public GroundEditPageViewModel GroundEditorPage;
+
+        private Action pendingEditorAction;
+        private Exception pendingException;
+
+        public IMapEditor MapEditor 
+        { 
+            get { return MapEditorPage; }
+            set { MapEditorPage = (MapEditPageViewModel)value; }
+        }
+        
+        public IGroundEditor GroundEditor 
+        { 
+            get { return GroundEditorPage; }
+            set { GroundEditorPage = (GroundEditPageViewModel)value; }
+        }
+        
+        public bool AteMouse { get { return false; } }
+        public bool AteKeyboard { get { return false; } }
+
+        private static Dictionary<string, string> devConfig;
+        private static bool canSave;
+
+    
+        
+        void IRootEditor.Load(GameBase game)
+        {
+            Console.WriteLine("Loading Dev Editor");
+            ExecuteOrInvoke(load);
+        }
+
+        private void load()
+        {
+            lock (GameBase.lockObj)
+            {
+                DevDataManager.Init();
+
+                loadDevConfig();
+
+                reload(DataManager.DataType.All);
+
+                LoadComplete = true;
+            }
+        }
+
+
+        void IRootEditor.ReloadData(DataManager.DataType dataType)
+        {
+            ExecuteOrInvoke(() => { reload(dataType); });
+        }
+
+        private void reload(DataManager.DataType dataType)
+        {
+            lock (GameBase.lockObj)
+            {
+                if (dataType == DataManager.DataType.All)
+                    DevDataManager.ClearCaches();
+
+                ViewModels.DevFormViewModel devViewModel = (ViewModels.DevFormViewModel)this.DataContext;
+
+                if (dataType == DataManager.DataType.All)
+                {
+                    devViewModel.Game.HideSprites = DataManager.Instance.HideChars;
+                    devViewModel.Game.HideObjects = DataManager.Instance.HideObjects;
+                    devViewModel.Travel.DebugGen = DiagManager.Instance.ListenGen;
+                }
+
+                if ((dataType & DataManager.DataType.Skill) != DataManager.DataType.None)
+                    devViewModel.Game.ReloadSkills();
+
+                if ((dataType & DataManager.DataType.Intrinsic) != DataManager.DataType.None)
+                    devViewModel.Game.ReloadIntrinsics();
+
+                if ((dataType & DataManager.DataType.Status) != DataManager.DataType.None)
+                    devViewModel.Game.ReloadStatuses();
+
+                if ((dataType & DataManager.DataType.Item) != DataManager.DataType.None)
+                    devViewModel.Game.ReloadItems();
+
+
+                if ((dataType & DataManager.DataType.Monster) != DataManager.DataType.None)
+                {
+                    devViewModel.Player.LoadMonstersNumeric();
+                    devViewModel.Player.ReloadMonsters();
+                }
+
+                if (dataType == DataManager.DataType.All)
+                {
+                    int globalIdle = GraphicsManager.GlobalIdle;
+                    devViewModel.Player.Anims.Clear();
+                    for (int ii = 0; ii < GraphicsManager.Actions.Count; ii++)
+                        devViewModel.Player.Anims.Add(GraphicsManager.Actions[ii].Name);
+                    devViewModel.Player.ChosenAnim = -1;
+                    devViewModel.Player.ChosenAnim = globalIdle;
+                }
+
+                if ((dataType & DataManager.DataType.Zone) != DataManager.DataType.None)
+                    devViewModel.Travel.ReloadZones();
+
+                if (dataType == DataManager.DataType.All)
+                {
+                    devViewModel.ModsManager.UpdateMod();
+                    devViewModel.ModsManager.ReloadMods();
+                    
+                    devViewModel.LoadDevTree();
+                }
+
+                LoadComplete = true;
+                
+            }
+        }
+
+
+        public void Update(GameTime gameTime)
+        {
+            if (pendingEditorAction != null)
+            {
+                try
+                {
+                    pendingEditorAction();
+                    pendingException = null;
+                }
+                catch (Exception ex)
+                {
+                    pendingException = ex;
+                }
+                pendingEditorAction = null;
+            }
+
+            ExecuteOrInvoke(update);
+        }
+
+        private void update()
+        {
+            lock (GameBase.lockObj)
+            {
+                ViewModels.DevFormViewModel devViewModel = (ViewModels.DevFormViewModel)this.DataContext;
+
+                devViewModel.Player.UpdateLevel();
+                if (GameManager.Instance.IsInGame())
+                {
+                    if (!devViewModel.Player.JustOnce)
+                    {
+                        if (devViewModel.Player.JustMe)
+                        {
+                            int currentIdle = Dungeon.DungeonScene.Instance.FocusedCharacter.IdleOverride;
+                            if (currentIdle < 0)
+                                currentIdle = GraphicsManager.GlobalIdle;
+                            devViewModel.Player.ChosenAnim = currentIdle;
+                        }
+                        else
+                            devViewModel.Player.ChosenAnim = GraphicsManager.GlobalIdle;
+                    }
+                    devViewModel.Player.UpdateSpecies(Dungeon.DungeonScene.Instance.FocusedCharacter.BaseForm);
+                }
+                if (GroundEditorPage != null)
+                {
+                    ViewModels.GroundEditPageViewModel vm = GroundEditorPage;
+                    vm.Textures.TileBrowser.UpdateFrame();
+                }
+                if (MapEditorPage != null)
+                {
+
+                    MapEditPageViewModel vm = MapEditorPage;
+                    vm.Textures.TileBrowser.UpdateFrame();
+                    vm.Terrain.TileBrowser.UpdateFrame();
+                }
+
+                if (canSave)
+                    saveConfig();
+            }
+        }
+        public void Draw() { }
+
+        public void OpenGround()
+        {
+            ExecuteOrInvoke(openGround);
+        }
+
+        private void openGround()
+        {
+            DevFormViewModel vm  = (DevFormViewModel)this.DataContext;
+            vm.OpenGroundEditor();
+        }
+
+        public void OpenMap()
+        {
+            ExecuteOrInvoke(openMap);
+        }
+
+        public void openMap()
+        {
+            DevFormViewModel vm  = (DevFormViewModel)this.DataContext;
+            vm.OpenMapEditor();
+        }
+
+        public void groundEditorClosed(object sender, EventArgs e)
+        {
+            GameManager.Instance.SceneOutcome = resetEditors();
+        }
+
+        public void mapEditorClosed(object sender, EventArgs e)
+        {
+            GameManager.Instance.SceneOutcome = resetEditors();
+        }
+
+
+        private IEnumerator<YieldInstruction> resetEditors()
+        {
+            GroundEditorPage = null;
+            MapEditorPage = null;
+            yield return CoroutineManager.Instance.StartCoroutine(GameManager.Instance.RestartToTitle());
+        }
+        
+
+        public void CloseGround()
+        {
+            if (GroundEditorPage != null)
+                GroundEditorPage.Close();
+        }
+
+        public void CloseMap()
+        {
+            if (MapEditorPage != null)
+                MapEditorPage.Close();
+        }
+        
+        void LoadGame()
+        {
+            // Windows - CAN run game in new thread, CAN run game in same thread via dispatch.
+            // Mac - CANNOT run game in new thread, CAN run game in same thread via dispatch.
+            // Linux - CAN run the game in new thread, CANNOT run game in same thread via dispatch.
+
+            // When the game is started, it should run a continuous loop, blocking the UI
+            // However, this is only happening on linux.  Why not windows and mac?
+            // With Mac, cocoa can ONLY start the game window if it's on the main thread. Weird...
+
+            if (!OperatingSystem.IsLinux())
+                LoadGameDelegate();
+            else
+            {
+                Thread thread = new Thread(LoadGameDelegate);
+                thread.IsBackground = true;
+                thread.Start();
+            }
+        }
+
+        /// <summary>
+        /// A method intended to be called from the editor thread, that sends a function pointer to the Game thread,
+        /// waits for it to complete (blocking the thread), and then continues execution.
+        /// This call cannot be performed within a lock!!
+        /// </summary>
+        /// <param name="action"></param>
+        public static void ExecuteOrPend(Action action)
+        {
+            if (!OperatingSystem.IsLinux())
+                action();
+            else
+            {
+                DevForm editor = (DevForm)DiagManager.Instance.DevEditor;
+                editor.pendingEditorAction = action;
+
+                SpinWait.SpinUntil(() => editor.pendingEditorAction == null);
+
+                if (editor.pendingException != null)
+                {
+                    Exception ex = editor.pendingException;
+                    throw ex;
+                }
+            }
+        }
+
+        public static void ExecuteOrInvoke(Action action)
+        {
+            if (!OperatingSystem.IsLinux())
+                action();
+            else
+                Dispatcher.UIThread.InvokeAsync(action, DispatcherPriority.Background);
+        }
+
+        void LoadGameDelegate()
+        {
+            try
+            {
+                DiagManager.Instance.DevEditor = this;
+                using (GameBase game = new GameBase())
+                    game.Run();
+            }
+            catch (Exception ex)
+            {
+                DiagManager.Instance.LogError(ex);
+            }
+            ExecuteOrInvoke(Close);
+        }
+
+        public void Window_Loaded(object sender, EventArgs e)
+        {
+            if (Design.IsDesignMode)
+                return;
+            //Thread thread = new Thread(LoadGame);
+            //thread.IsBackground = true;
+            //thread.Start();
+            Dispatcher.UIThread.InvokeAsync(LoadGame, DispatcherPriority.Background);
+            //LoadGame();
+        }
+
+        public void Window_Closed(object sender, EventArgs e)
+        {
+            DiagManager.Instance.LoadMsg = "Closing...";
+            EnterLoadPhase(GameBase.LoadPhase.Unload);
+        }
+
+        public static void EnterLoadPhase(GameBase.LoadPhase loadState)
+        {
+            GameBase.CurrentPhase = loadState;
+        }
+
+
+
+        private static void loadDevConfig()
+        {
+            devConfig = new Dictionary<string, string>();
+
+            try
+            {
+                string configPath = GetConfigPath();
+                string folderPath = Path.GetDirectoryName(configPath);
+                if (!Directory.Exists(folderPath))
+                    Directory.CreateDirectory(folderPath);
+
+                if (File.Exists(configPath))
+                {
+                    using (FileStream stream = File.OpenRead(configPath))
+                    {
+                        using (BinaryReader reader = new BinaryReader(stream))
+                        {
+                            while (reader.BaseStream.Position < reader.BaseStream.Length)
+                            {
+                                string key = reader.ReadString();
+                                string val = reader.ReadString();
+                                devConfig[key] = val;
+                            }
+                        }
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                DiagManager.Instance.LogError(ex);
+            }
+        }
+
+
+        private static void saveConfig()
+        {
+            //save whole file
+            try
+            {
+                using (var writer = new BinaryWriter(new FileStream(GetConfigPath(), FileMode.Create, FileAccess.Write, FileShare.None)))
+                {
+                    foreach (string curKey in devConfig.Keys)
+                    {
+                        writer.Write(curKey);
+                        writer.Write(devConfig[curKey]);
+                    }
+                }
+            }
+            catch (IOException ioEx)
+            {
+                DiagManager.Instance.LogError(ioEx, false);
+            }
+            catch (Exception ex)
+            {
+                DiagManager.Instance.LogError(ex);
+            }
+        }
+
+        public static string GetConfig(string key, string def)
+        {
+            string val;
+            if (devConfig.TryGetValue(key, out val))
+                return val;
+            return def;
+        }
+
+        public static int GetConfig(string key, int def)
+        {
+            string val;
+            if (devConfig.TryGetValue(key, out val))
+            {
+                int result;
+                if (Int32.TryParse(val, out result))
+                    return result;
+            }
+            return def;
+        }
+
+        public static void SetConfig(string key, int val)
+        {
+            SetConfig(key, val.ToString());
+        }
+
+        public static void SetConfig(string key, string val)
+        {
+            if (val == null && devConfig.ContainsKey(key))
+                devConfig.Remove(key);
+            else
+                devConfig[key] = val;
+
+            canSave = true;
+        }
+
+        public static string GetConfigPath()
+        {
+            //https://jimrich.sk/environment-specialfolder-on-windows-linux-and-os-x/
+            //MacOS actually uses a different folder for config data, traditionally
+            //I guess it's the odd one out...
+            if (OperatingSystem.IsMacOS())
+                return PathMod.FromApp("./devConfig");//Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Personal), "/Library/Application Support/RogueEssence/config");
+            else
+                return PathMod.FromApp("./devConfig");//Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "RogueEssence /devConfig");
+        }
+        
+        
+    public static readonly StyledProperty<GridLength> CaptionHeightProperty =
+        AvaloniaProperty.Register<DevForm, GridLength>(nameof(CaptionHeight));
+
+    public GridLength CaptionHeight
+    {
+        get => GetValue(CaptionHeightProperty);
+        set => SetValue(CaptionHeightProperty, value);
+    }
+
+    public static readonly StyledProperty<bool> HasLeftCaptionButtonProperty =
+        AvaloniaProperty.Register<DevForm, bool>(nameof(HasLeftCaptionButton));
+
+    public bool HasLeftCaptionButton
+    {
+        get => GetValue(HasLeftCaptionButtonProperty);
+        set => SetValue(HasLeftCaptionButtonProperty, value);
+    }
+
+    public bool HasRightCaptionButton
+    {
+        get
+        {
+            if (OperatingSystem.IsLinux())
+                return !Native.OS.UseSystemWindowFrame;
+
+            return OperatingSystem.IsWindows();
+        }
+    }
+    
+    
+    
+    public DevForm()
+    {
+        
+        if (OperatingSystem.IsMacOS())
+        {
+            HasLeftCaptionButton = true;
+            CaptionHeight = new GridLength(34);
+            ExtendClientAreaChromeHints =
+                ExtendClientAreaChromeHints.SystemChrome | ExtendClientAreaChromeHints.OSXThickTitleBar;
+        }
+        else if (UseSystemWindowFrame)
+        {
+            CaptionHeight = new GridLength(30);
+        }
+        else
+        {
+            CaptionHeight = new GridLength(38);
+        }
+        
+        InitializeComponent();
+    }
+    
+    protected override void OnDataContextChanged(EventArgs e)
+    {
+        base.OnDataContextChanged(e);
+        if (DataContext is DevFormViewModel vm)
+        {
+            vm.ModSwitcherClosed += () => ModSwitcherFlyoutButton.Flyout?.Hide();;
+        }
+    }
+    
+    private void ModSwitcherFlyout_OnOpened(object? sender, EventArgs e)
+    {
+        if (DataContext is DevFormViewModel vm)
+        {
+            vm.OnModSwitcherOpened();
+        }
+    }
+    
+    private void ModSwitcherFlyout_OnClosed(object? sender, EventArgs e)
+    {
+        if (DataContext is DevFormViewModel vm)
+        {
+            vm.OnModSwitcherClosed();
+            // ModSwitcherFlyoutButton.Flyout?.Hide();
+        }
+    }
+    
+    protected override void OnClosing(WindowClosingEventArgs e)
+    {
+        base.OnClosing(e);
+
+        if (!Design.IsDesignMode && DataContext is ViewModels.DevFormViewModel)
+        {
+            PreferencesWindowViewModel.Instance.Save();
+        }
+    }
+    
+    private void ShowDataItemNodeMenu(TreeDataGridRow current, DataItemNode node, DataRootNode parentNode,
+        ContextRequestedEventArgs e)
+    {
+        
+        var contextMenu = ContextMenuHelper.CreateDataItemMenu(parentNode, node.ItemKey);
+
+        // contextMenu.Open(this);
+        
+        // var menu = new ContextMenu
+        // {
+        //     Items =
+        //     {
+        //         new MenuItem { Header = "Resave as File", Command = parentNode.ResaveItemAsFile, CommandParameter = node.ItemKey, Icon = App.CreateMenuIcon("Icons.FileFill") },
+        //         new MenuItem
+        //             { Header = "Resave as Patch", Command = parentNode.ResaveAsPatch, CommandParameter = node, Icon = App.CreateMenuIcon("Icons.FileTextFill") },
+        //         new Separator(),
+        //         new MenuItem { Header = "Edit", Icon = App.CreateMenuIcon("Icons.PencilFill") },
+        //         new MenuItem { Header = "Delete", Command = parentNode.DeleteCommand, CommandParameter = node,  Icon = App.CreateMenuIcon("Icons.TrashFill") }
+        //     }
+        // };
+        
+        AttachAndOpenMenu(current, contextMenu, e);
+    }
+    
+    private void ShowRootNodeMenu(TreeDataGridRow current, DataRootNode root, ContextRequestedEventArgs e)
+    {
+        var menu = ContextMenuHelper.CreateDataRootMenu(root);
+        AttachAndOpenMenu(current, menu, e);
+    }
+    
+    private void ShowUniversalNodeMenu(TreeDataGridRow current, UniversalNode node, ContextRequestedEventArgs e)
+    {
+        var menu = ContextMenuHelper.CreateUniversalRootMenu(node);
+        AttachAndOpenMenu(current, menu, e);
+    }
+    
+    private void ShowSpriteRootNodeMenu(TreeDataGridRow current, SpriteRootNode root, ContextRequestedEventArgs e)
+    {
+     //    var menu = new ContextMenu
+     //    {
+     //        Items =
+     //        {
+     //            new MenuItem { Header = "Mass Import", Command = root.MassImportCommand, Icon = App.CreateMenuIcon("Icons.DownloadSimpleFill") },
+     //            new MenuItem { Header = "Mass Export", Command = root.MassExportCommand, Icon = App.CreateMenuIcon("Icons.ExportFill") },
+     //            
+     //            
+     // ,
+     //            // new MenuItem { Header = "Import", Command = root.ImportCommand, Icon = App.CreateMenuIcon("Icons.Plus") },
+     //            // new MenuItem { Header = "Re-Import", Command = root.ReImportCommand, Icon = App.CreateMenuIcon("Icons.RepeatFill") },
+     //            // new MenuItem { Header = "Add", Command = root.AddCommand,  Icon = App.CreateMenuIcon("Icons.Plus") }
+     //        }
+     //    };
+
+        var menu = ContextMenuHelper.CreateSpriteRootMenu(root);
+        
+        AttachAndOpenMenu(current, menu, e);
+    }
+
+    private void AttachAndOpenMenu(TreeDataGridRow current, ContextMenu menu, ContextRequestedEventArgs e)
+    {
+        menu.Closed += (_, _) => LeftTreeDataGrid.ContextMenu = null;
+        LeftTreeDataGrid.ContextMenu = menu;
+        menu.Open(LeftTreeDataGrid);
+        e.Handled = true;
+    }
+    
+    private void LeftTreeDataGrid_OnDoubleTapped(object? sender, TappedEventArgs e)
+    {
+        if (DataContext is DevFormViewModel vm && sender is TreeDataGrid treeView)
+        {
+            var selectedItem = (OpenEditorNode)treeView.RowSelection.SelectedItem;
+            if (selectedItem != null && selectedItem.EditorType != typeof(EmptyPageViewModel))
+            {
+                vm.AddPageFromTreeNode(selectedItem);
+            }
+
+        }
+    }
+    
+    private void LeftTreeDataGrid_OnContextRequested(object? sender, ContextRequestedEventArgs e)
+    {
+        if (e.Source is not Visual visual)
+            return;
+    
+        var row = visual.GetSelfAndVisualAncestors()
+            .OfType<TreeDataGridRow>()
+            .FirstOrDefault();
+    
+        if (row == null)
+            return;
+        
+        if (row.DataContext is not NodeBase node)
+            return;
+        
+        var parent = node.Parent;
+        
+        switch (node)
+        {
+            case DataItemNode itemNode when parent is DataRootNode root:
+                ShowDataItemNodeMenu(row, itemNode, root, e);
+                break;
+    
+            // case DataItemNode itemNode when parent is SpriteRootNode spriteRoot:
+            //     ShowSpriteItemNodeMenu(row, itemNode, spriteRoot, e);
+            //     break;
+            //
+            case DataRootNode rootNode:
+                ShowRootNodeMenu(row, rootNode, e);
+                break;
+            
+            case UniversalNode universalNode:
+                ShowUniversalNodeMenu(row, universalNode, e);
+                break;
+    
+            case SpriteRootNode spriteRoot:
+                ShowSpriteRootNodeMenu(row, spriteRoot, e);
+                break;
+        }
+    }
+
+    private async void LeftTreeDataGrid_OnLoaded(object sender, RoutedEventArgs e)
+    {
+    }
+
+    // Show the sprite in-game when the user clicks on the sprite node in the tree
+    private void LeftTreeDataGrid_OnPointerPressed(object? sender, PointerPressedEventArgs e)
+    {
+        if (sender is not TreeDataGrid treeDataGrid)
+            return;
+        
+        var point = e.GetPosition(treeDataGrid);
+        var visual = treeDataGrid.InputHitTest(point);
+        
+        var element = visual as Control;
+        while (element != null && element is not TreeDataGridRow)
+        {
+            element = element.Parent as Control;
+        }
+    
+        if (DungeonScene.Instance == null)
+            return;
+
+        GraphicsManager.AssetType debugAsset = GraphicsManager.AssetType.None;
+        string? debugAnim = null;
+        
+        if (element is TreeDataGridRow row &&
+            row.DataContext is DataItemNode node &&
+            node.Parent is SpriteRootNode parent &&
+            parent.AssetType.IsAnimEdit())
+        {
+            debugAsset = parent.AssetType;
+            debugAnim = node.ItemKey;
+        }
+
+        lock (GameBase.lockObj)
+        {
+            DungeonScene.Instance.DebugAsset = debugAsset;
+            DungeonScene.Instance.DebugAnim = debugAnim;
+        }
+
+    }
+
+    private void LeftTreeDataGrid_OnLostFocus(object sender, RoutedEventArgs e)
+    {
+        
+        if (sender is not TreeDataGrid grid)
+            return;
+        
+        
+        if (grid.IsKeyboardFocusWithin)
+            return;
+        
+        if (grid.ContextMenu?.IsOpen == true)
+            return;
+        
+        var window = grid.GetVisualRoot() as Window;
+        if (window is { IsActive: false })
+            return; 
+        // (grid.RowSelection.SelectedItem as DataItemNode)?.Parent?.ResaveAsFile(grid.RowSelection.SelectedItem as DataItemNode)
+        // Not sure why it doesn't clear the grid...
+        grid.RowSelection.Clear();
+        
+        lock (GameBase.lockObj)
+        {
+            if (DungeonScene.Instance != null)
+            {
+                DungeonScene.Instance.DebugAsset = GraphicsManager.AssetType.None;
+                DungeonScene.Instance.DebugAnim = null;
+            }
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabConstants.axaml b/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabConstants.axaml
deleted file mode 100644
index dac8c4c1..00000000
--- a/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabConstants.axaml
+++ /dev/null
@@ -1,50 +0,0 @@
-<UserControl xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:vm="clr-namespace:RogueEssence.Dev.ViewModels;assembly=RogueEssence.Editor.Avalonia"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             mc:Ignorable="d"
-             x:Class="RogueEssence.Dev.Views.DevTabConstants">
-  <Design.DataContext>
-    <vm:DevTabConstantsViewModel/>
-  </Design.DataContext>
-  <Grid Margin="4" >
-    <Grid.RowDefinitions>
-      <RowDefinition/>
-      <RowDefinition/>
-      <RowDefinition/>
-      <RowDefinition/>
-      <RowDefinition/>
-      <RowDefinition/>
-      <RowDefinition/>
-      <RowDefinition/>
-    </Grid.RowDefinitions>
-    <Grid.ColumnDefinitions>
-      <ColumnDefinition/>
-      <ColumnDefinition/>
-    </Grid.ColumnDefinitions>
-    <Button Name="btnEditStartParams" Command="{Binding btnEditStartParams_Click}" Margin="4" Grid.Row="0" Grid.Column="0" >Start Parameters</Button>
-    <Button Name="btnEditUniversal" Command="{Binding btnEditUniversal_Click}" Margin="4" Grid.Row="0" Grid.Column="1" Content="Universal" >
-      <Button.ContextMenu>
-        <ContextMenu >
-          <MenuItem Header="Resave as File" Command="{Binding mnuUniversalFile_Click}"/>
-          <MenuItem Header="Resave as Patch" Command="{Binding mnuUniversalDiff_Click}"/>
-        </ContextMenu>
-      </Button.ContextMenu>
-    </Button>
-    <Button Name="btnEditStrings" Command="{Binding btnEditStrings_Click}" Margin="4" Grid.Row="1" Grid.Column="0" >Menu Text</Button>
-    <Button Name="btnEditStringsEx" Command="{Binding btnEditStringsEx_Click}" Margin="4" Grid.Row="1" Grid.Column="1" >Gameplay Text</Button>
-    <Button Name="btnEditHeal" Command="{Binding btnEditHeal_Click}" Margin="4" Grid.Row="2" Grid.Column="0" >Heal FX</Button>
-    <Button Name="btnEditRestoreCharge" Command="{Binding btnEditRestoreCharge_Click}" Margin="4" Grid.Row="2" Grid.Column="1" >+Charge FX</Button>
-    <Button Name="btnEditLoseCharge" Command="{Binding btnEditLoseCharge_Click}" Margin="4" Grid.Row="3" Grid.Column="0" >-Charge FX</Button>
-    <Button Name="btnEditNoCharge" Command="{Binding btnEditNoCharge_Click}" Margin="4" Grid.Row="3" Grid.Column="1" >No Charge FX</Button>
-    <Button Name="btnEditElement" Command="{Binding btnEditElement_Click}" Margin="4" Grid.Row="4" Grid.Column="0" >Element FX</Button>
-    <Button Name="btnEditIntrinsic" Command="{Binding btnEditIntrinsic_Click}" Margin="4" Grid.Row="4" Grid.Column="1" >Intrinsic FX</Button>
-    <Button Name="btnEditSendHome" Command="{Binding btnEditSendHome_Click}" Margin="4" Grid.Row="5" Grid.Column="0" >Send Home FX</Button>
-    <Button Name="btnEditItemLost" Command="{Binding btnEditItemLost_Click}" Margin="4" Grid.Row="5" Grid.Column="1" >Item Lost FX</Button>
-    <Button Name="btnEditWarp" Command="{Binding btnEditWarp_Click}" Margin="4" Grid.Row="6" Grid.Column="0" >Warp FX</Button>
-    <Button Name="btnEditKnockback" Command="{Binding btnEditKnockback_Click}" Margin="4" Grid.Row="6" Grid.Column="1" >Knockback FX</Button>
-    <Button Name="btnEditJump" Command="{Binding btnEditJump_Click}" Margin="4" Grid.Row="7" Grid.Column="0" >Jump FX</Button>
-    <Button Name="btnEditThrow" Command="{Binding btnEditThrow_Click}" Margin="4" Grid.Row="7" Grid.Column="1" >Throw FX</Button>
-  </Grid>
-</UserControl>
diff --git a/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabConstants.axaml.cs b/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabConstants.axaml.cs
deleted file mode 100644
index 4656d618..00000000
--- a/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabConstants.axaml.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
-
-namespace RogueEssence.Dev.Views
-{
-    public partial class DevTabConstants : UserControl
-    {
-        public DevTabConstants()
-        {
-            this.InitializeComponent();
-        }
-    }
-}
diff --git a/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabData.axaml b/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabData.axaml
deleted file mode 100644
index b17c2d9e..00000000
--- a/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabData.axaml
+++ /dev/null
@@ -1,48 +0,0 @@
-<UserControl xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:vm="clr-namespace:RogueEssence.Dev.ViewModels;assembly=RogueEssence.Editor.Avalonia"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             mc:Ignorable="d"
-             x:Class="RogueEssence.Dev.Views.DevTabData">
-  <Design.DataContext>
-    <vm:DevTabDataViewModel/>
-  </Design.DataContext>
-  <Grid Margin="4" >
-    <Grid.RowDefinitions>
-      <RowDefinition/>
-      <RowDefinition/>
-      <RowDefinition/>
-      <RowDefinition/>
-      <RowDefinition/>
-      <RowDefinition/>
-      <RowDefinition/>
-      <RowDefinition/>
-      <RowDefinition/>
-      <RowDefinition/>
-    </Grid.RowDefinitions>
-    <Grid.ColumnDefinitions>
-      <ColumnDefinition/>
-      <ColumnDefinition/>
-    </Grid.ColumnDefinitions>
-    <Button Name="btnEditMonster" Command="{Binding btnEditMonster_Click}" Margin="4" Grid.Row="0" Grid.Column="0" >Monster</Button>
-    <Button Name="btnEditZone" Command="{Binding btnEditZone_Click}" Margin="4" Grid.Row="0" Grid.Column="1" >Zones</Button>
-    <Button Name="btnEditItem" Command="{Binding btnEditItem_Click}" Margin="4" Grid.Row="1" Grid.Column="0" >Items</Button>
-    <Button Name="btnEditSkill" Command="{Binding btnEditSkill_Click}" Margin="4" Grid.Row="1" Grid.Column="1" >Skills</Button>
-    <Button Name="btnEditIntrinsics" Command="{Binding btnEditIntrinsics_Click}" Margin="4" Grid.Row="2" Grid.Column="0" >Intrinsics</Button>
-    <Button Name="btnEditStatuses" Command="{Binding btnEditStatuses_Click}" Margin="4" Grid.Row="2" Grid.Column="1" >Statuses</Button>
-    <Button Name="btnEditMapStatuses" Command="{Binding btnEditMapStatuses_Click}" Margin="4" Grid.Row="3" Grid.Column="0" >Map Statuses</Button>
-    <Button Name="btnEditAutoTile" Command="{Binding btnEditAutoTile_Click}" Margin="4" Grid.Row="3" Grid.Column="1" >AutoTiles</Button>
-    <Button Name="btnEditTiles" Command="{Binding btnEditTiles_Click}" Margin="4" Grid.Row="4" Grid.Column="0" >Tiles</Button>
-    <Button Name="btnEditTerrain" Command="{Binding btnEditTerrain_Click}" Margin="4" Grid.Row="4" Grid.Column="1" >Terrain</Button>
-    <Button Name="btnEditEmote" Command="{Binding btnEditEmote_Click}" Margin="4" Grid.Row="5" Grid.Column="0" >Emote</Button>
-    <Button Name="btnEditElement" Command="{Binding btnEditElement_Click}" Margin="4" Grid.Row="5" Grid.Column="1" >Element</Button>
-    <Button Name="btnEditGrowthGroup" Command="{Binding btnEditGrowthGroup_Click}" Margin="4" Grid.Row="6" Grid.Column="0" >Growth Groups</Button>
-    <Button Name="btnEditSkillGroup" Command="{Binding btnEditSkillGroup_Click}" Margin="4" Grid.Row="6" Grid.Column="1" >Skill Groups</Button>
-    <Button Name="btnEditRank" Command="{Binding btnEditRank_Click}" Margin="4" Grid.Row="7" Grid.Column="0" >Rank</Button>
-    <Button Name="btnEditSkin" Command="{Binding btnEditSkin_Click}" Margin="4" Grid.Row="7" Grid.Column="1" >Skin</Button>
-    <Button Name="btnEditAI" Command="{Binding btnEditAI_Click}" Margin="4" Grid.Row="8" Grid.Column="0" >Tactics</Button>
-    <Button Name="btnMapEditor" Command="{Binding btnMapEditor_Click}" Margin="4" Grid.Row="9" Grid.Column="0" >Edit Map</Button>
-    <Button Name="btnGroundEditor" Command="{Binding btnGroundEditor_Click}" Margin="4" Grid.Row="9" Grid.Column="1" >Edit Ground</Button>
-  </Grid>
-</UserControl>
diff --git a/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabData.axaml.cs b/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabData.axaml.cs
deleted file mode 100644
index 85b43b25..00000000
--- a/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabData.axaml.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
-
-namespace RogueEssence.Dev.Views
-{
-    public partial class DevTabData : UserControl
-    {
-        public DevTabData()
-        {
-            this.InitializeComponent();
-        }
-    }
-}
diff --git a/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabMods.axaml b/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabMods.axaml
deleted file mode 100644
index bcf19ca4..00000000
--- a/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabMods.axaml
+++ /dev/null
@@ -1,46 +0,0 @@
-<UserControl xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:vm="clr-namespace:RogueEssence.Dev.ViewModels;assembly=RogueEssence.Editor.Avalonia"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             mc:Ignorable="d"
-             xmlns:converters="clr-namespace:RogueEssence.Dev.Converters"
-             x:Class="RogueEssence.Dev.Views.DevTabMods">
-  <Design.DataContext>
-    <vm:ModManagerViewModel/>
-  </Design.DataContext>
-  <UserControl.Resources>
-    <converters:NullableToStringConverter x:Key="NullableToStringConverter"/>
-  </UserControl.Resources>
-  <Grid Margin="4">
-    <Grid.RowDefinitions>
-      <RowDefinition Height="32"/>
-      <RowDefinition Height="*"/>
-      <RowDefinition Height="40"/>
-    </Grid.RowDefinitions>
-    <Grid.ColumnDefinitions>
-      <ColumnDefinition/>
-      <ColumnDefinition/>
-      <ColumnDefinition/>
-    </Grid.ColumnDefinitions>
-    <!-- <TextBlock VerticalAlignment="Bottom" Text="{Binding CurrentMod, Converter={StaticResource NullableToStringConverter}, StringFormat=Currently Editing Mod: {0}}" Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2"></TextBlock> -->
-    <!-- <Button Command="{Binding btnEdit_Click}" IsEnabled="{Binding CurrentMod, Converter={x:Static StringConverters.IsNotNullOrEmpty}}" Margin="4" Grid.Row="0" Grid.Column="2">Edit</Button> -->
-    <!-- <TreeView ItemsSource="{Binding Mods}" SelectedItem="{Binding ChosenMod}" SelectionMode="AlwaysSelected" Margin="4" Grid.Row="1" Grid.ColumnSpan="3"> -->
-    <!--   <TreeView.DataTemplates> -->
-    <!--     <TreeDataTemplate DataType="vm:ModsNodeViewModel" ItemsSource="{Binding Nodes}"> -->
-    <!--       <TextBlock VerticalAlignment="Center"> -->
-    <!--         <TextBlock.Text> -->
-    <!--           <MultiBinding StringFormat="{} {0} / {1}"> -->
-    <!--             <Binding Path="Name" Converter="{StaticResource NullableToStringConverter}"/> -->
-    <!--             <Binding Path="Namespace"/> -->
-    <!--           </MultiBinding> -->
-    <!--         </TextBlock.Text> -->
-    <!--       </TextBlock> -->
-    <!--     </TreeDataTemplate> -->
-    <!--   </TreeView.DataTemplates> -->
-    <!-- </TreeView> -->
-    <!-- <Button Command="{Binding btnSwitch_Click}" Margin="4" Grid.Row="2" Grid.Column="0">Switch To</Button> -->
-    <!-- <Button Command="{Binding btnAdd_Click}" Margin="4" Grid.Row="2" Grid.Column="1">Add New</Button> -->
-    <!-- <Button Command="{Binding btnDelete_Click}" Margin="4" Grid.Row="2" Grid.Column="2">Delete</Button> -->
-  </Grid>
-</UserControl>
diff --git a/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabMods.axaml.cs b/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabMods.axaml.cs
deleted file mode 100644
index d11d9e5d..00000000
--- a/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabMods.axaml.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
-using Avalonia.Input;
-using RogueEssence.Dev.ViewModels;
-
-namespace RogueEssence.Dev.Views
-{
-    public partial class DevTabMods : UserControl
-    {
-        public DevTabMods()
-        {
-            this.InitializeComponent();
-        }
-    }
-}
diff --git a/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabSprites.axaml b/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabSprites.axaml
deleted file mode 100644
index 95d7eb5f..00000000
--- a/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabSprites.axaml
+++ /dev/null
@@ -1,34 +0,0 @@
-<UserControl xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:vm="clr-namespace:RogueEssence.Dev.ViewModels;assembly=RogueEssence.Editor.Avalonia"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             mc:Ignorable="d"
-             x:Class="RogueEssence.Dev.Views.DevTabSprites">
-  <Design.DataContext>
-    <vm:DevTabSpritesViewModel/>
-  </Design.DataContext>
-  <Grid Margin="4" >
-    <Grid.RowDefinitions>
-      <RowDefinition/>
-      <RowDefinition/>
-      <RowDefinition/>
-      <RowDefinition/>
-      <RowDefinition/>
-      <RowDefinition/>
-    </Grid.RowDefinitions>
-    <Grid.ColumnDefinitions>
-      <ColumnDefinition/>
-      <ColumnDefinition/>
-    </Grid.ColumnDefinitions>
-    <Button Name="btnEditSprites" Margin="4" Command="{Binding btnEditSprites_Click}" Grid.Row="0" Grid.Column="0" >Char Sprites</Button>
-    <Button Name="btnEditPortraits" Margin="4" Command="{Binding btnEditPortraits_Click}" Grid.Row="0" Grid.Column="1" >Portraits</Button>
-    <Button Name="btnEditParticles" Margin="4" Command="{Binding btnEditParticles_Click}" Grid.Row="1" Grid.Column="0" >Particles</Button>
-    <Button Name="btnEditBeams" Margin="4" Command="{Binding btnEditBeams_Click}" Grid.Row="1" Grid.Column="1" >Beams</Button>
-    <Button Name="btnEditBGs" Margin="4" Command="{Binding btnEditBGs_Click}" Grid.Row="2" Grid.Column="0" >Backgrounds</Button>
-    <Button Name="btnEmotes" Margin="4" Command="{Binding btnEditEmotes_Click}" Grid.Row="2" Grid.Column="1" >Emotes</Button>
-    <Button Name="btnTileSprites" Margin="4" Command="{Binding btnEditTiles_Click}" Grid.Row="3" Grid.Column="0" >Tiles</Button>
-    <Button Name="btnItemSprites" Margin="4" Command="{Binding btnEditItems_Click}" Grid.Row="3" Grid.Column="1" >Items</Button>
-    <Button Name="btnObjectSprites" Margin="4" Command="{Binding btnEditObjects_Click}" Grid.Row="4" Grid.Column="0" >Objects</Button>
-  </Grid>
-</UserControl>
diff --git a/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabSprites.axaml.cs b/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabSprites.axaml.cs
deleted file mode 100644
index a73be737..00000000
--- a/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabSprites.axaml.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
-
-namespace RogueEssence.Dev.Views
-{
-    public partial class DevTabSprites : UserControl
-    {
-        public DevTabSprites()
-        {
-            this.InitializeComponent();
-        }
-    }
-}
diff --git a/RogueEssence.Editor.Avalonia/Views/New/ModSwitcherView.axaml b/RogueEssence.Editor.Avalonia/Views/DevForm/ModSwitcherView.axaml
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/New/ModSwitcherView.axaml
rename to RogueEssence.Editor.Avalonia/Views/DevForm/ModSwitcherView.axaml
diff --git a/RogueEssence.Editor.Avalonia/Views/New/ModSwitcherView.axaml.cs b/RogueEssence.Editor.Avalonia/Views/DevForm/ModSwitcherView.axaml.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/New/ModSwitcherView.axaml.cs
rename to RogueEssence.Editor.Avalonia/Views/DevForm/ModSwitcherView.axaml.cs
diff --git a/RogueEssence.Editor.Avalonia/Views/New/TabBarView.axaml b/RogueEssence.Editor.Avalonia/Views/DevForm/TabBarView.axaml
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/New/TabBarView.axaml
rename to RogueEssence.Editor.Avalonia/Views/DevForm/TabBarView.axaml
diff --git a/RogueEssence.Editor.Avalonia/Views/New/TabBarView.axaml.cs b/RogueEssence.Editor.Avalonia/Views/DevForm/TabBarView.axaml.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/New/TabBarView.axaml.cs
rename to RogueEssence.Editor.Avalonia/Views/DevForm/TabBarView.axaml.cs
diff --git a/RogueEssence.Editor.Avalonia/Views/New/TabSwitcherView.axaml b/RogueEssence.Editor.Avalonia/Views/DevForm/TabSwitcherView.axaml
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/New/TabSwitcherView.axaml
rename to RogueEssence.Editor.Avalonia/Views/DevForm/TabSwitcherView.axaml
diff --git a/RogueEssence.Editor.Avalonia/Views/New/TabSwitcherView.axaml.cs b/RogueEssence.Editor.Avalonia/Views/DevForm/TabSwitcherView.axaml.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/New/TabSwitcherView.axaml.cs
rename to RogueEssence.Editor.Avalonia/Views/DevForm/TabSwitcherView.axaml.cs
diff --git a/RogueEssence.Editor.Avalonia/Views/DialogBoxes/AnimChoiceWindow.axaml b/RogueEssence.Editor.Avalonia/Views/DialogBoxes/AnimChoiceWindow.axaml
deleted file mode 100644
index ff31bb07..00000000
--- a/RogueEssence.Editor.Avalonia/Views/DialogBoxes/AnimChoiceWindow.axaml
+++ /dev/null
@@ -1,26 +0,0 @@
-<Window xmlns="https://github.com/avaloniaui"
-        xmlns:vm="clr-namespace:RogueEssence.Dev.ViewModels;assembly=RogueEssence.Editor.Avalonia"
-        xmlns:views="clr-namespace:RogueEssence.Dev.Views"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        mc:Ignorable="d"
-        x:Class="RogueEssence.Dev.Views.AnimChoiceWindow"
-        Title="Anim" Width="200" Height="100">
-  <Design.DataContext>
-    <vm:AnimChoiceViewModel/>
-  </Design.DataContext>
-  <Grid Margin="4" >
-    <Grid.RowDefinitions>
-      <RowDefinition Height="42"/>
-      <RowDefinition Height="42"/>
-    </Grid.RowDefinitions>
-    <Grid.ColumnDefinitions>
-      <ColumnDefinition/>
-      <ColumnDefinition/>
-    </Grid.ColumnDefinitions>
-    <views:SearchComboBox ItemsSource="{Binding Anims}" SelectedIndex="{Binding ChosenAnim}" Margin="4" Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2"/>
-    <Button Click="btnOK_Click" Margin="4" Grid.Row="1" Grid.Column="0">OK</Button>
-    <Button Click="btnCancel_Click" Margin="4" Grid.Row="1" Grid.Column="1">Cancel</Button>
-  </Grid>
-</Window>
diff --git a/RogueEssence.Editor.Avalonia/Views/DialogBoxes/AnimChoiceWindow.axaml.cs b/RogueEssence.Editor.Avalonia/Views/DialogBoxes/AnimChoiceWindow.axaml.cs
deleted file mode 100644
index 6ece2c8a..00000000
--- a/RogueEssence.Editor.Avalonia/Views/DialogBoxes/AnimChoiceWindow.axaml.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Interactivity;
-using Avalonia.Markup.Xaml;
-
-namespace RogueEssence.Dev.Views
-{
-    public partial class AnimChoiceWindow : Window
-    {
-        public AnimChoiceWindow()
-        {
-            this.InitializeComponent();
-        }
-        
-        public void btnOK_Click(object sender, RoutedEventArgs e)
-        {
-            this.Close(true);
-        }
-
-
-        public void btnCancel_Click(object sender, RoutedEventArgs e)
-        {
-            this.Close(false);
-        }
-    }
-}
diff --git a/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/AnimChoiceWindowView.axaml b/RogueEssence.Editor.Avalonia/Views/DialogBoxes/AnimChoiceWindowView.axaml
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/AnimChoiceWindowView.axaml
rename to RogueEssence.Editor.Avalonia/Views/DialogBoxes/AnimChoiceWindowView.axaml
diff --git a/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/AnimChoiceWindowView.axaml.cs b/RogueEssence.Editor.Avalonia/Views/DialogBoxes/AnimChoiceWindowView.axaml.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/AnimChoiceWindowView.axaml.cs
rename to RogueEssence.Editor.Avalonia/Views/DialogBoxes/AnimChoiceWindowView.axaml.cs
diff --git a/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/MapLayerWindowView.axaml b/RogueEssence.Editor.Avalonia/Views/DialogBoxes/MapLayerWindowView.axaml
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/MapLayerWindowView.axaml
rename to RogueEssence.Editor.Avalonia/Views/DialogBoxes/MapLayerWindowView.axaml
diff --git a/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/MapLayerWindowView.axaml.cs b/RogueEssence.Editor.Avalonia/Views/DialogBoxes/MapLayerWindowView.axaml.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/MapLayerWindowView.axaml.cs
rename to RogueEssence.Editor.Avalonia/Views/DialogBoxes/MapLayerWindowView.axaml.cs
diff --git a/RogueEssence.Editor.Avalonia/Views/DialogBoxes/MapResizeWindow.axaml b/RogueEssence.Editor.Avalonia/Views/DialogBoxes/MapResizeWindow.axaml
deleted file mode 100644
index 8abfe93a..00000000
--- a/RogueEssence.Editor.Avalonia/Views/DialogBoxes/MapResizeWindow.axaml
+++ /dev/null
@@ -1,56 +0,0 @@
-<Window xmlns="https://github.com/avaloniaui"
-        xmlns:vm="clr-namespace:RogueEssence.Dev.ViewModels;assembly=RogueEssence.Editor.Avalonia"
-        xmlns:views="clr-namespace:RogueEssence.Dev.Views"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:RogueElements;assembly=RogueElements"
-        mc:Ignorable="d"
-        xmlns:converters="clr-namespace:RogueEssence.Dev.Converters"
-        x:Class="RogueEssence.Dev.Views.MapResizeWindow"
-        Title="Resize Map" Height="380" Width="200">
-  <Design.DataContext>
-    <vm:MapResizeViewModel/>
-  </Design.DataContext>
-  <Window.Resources>
-    <converters:ComparisonXConverter x:Key="ComparisonXConverter"/>
-  </Window.Resources>
-  <Grid Margin="4" >
-    <Grid.RowDefinitions>
-      <RowDefinition Height="20"/>
-      <RowDefinition Height="42"/>
-      <RowDefinition Height="20"/>
-      <RowDefinition Height="42"/>
-      <RowDefinition Height="20"/>
-      <RowDefinition/>
-      <RowDefinition Height="2*"/>
-      <RowDefinition/>
-      <RowDefinition Height="10"/>
-      <RowDefinition Height="42"/>
-    </Grid.RowDefinitions>
-    <Grid.ColumnDefinitions>
-      <ColumnDefinition/>
-      <ColumnDefinition/>
-      <ColumnDefinition/>
-      <ColumnDefinition/>
-    </Grid.ColumnDefinitions>
-    <TextBlock Margin="4" VerticalAlignment="Bottom" Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="4">Width</TextBlock>
-    <NumericUpDown Value="{Binding MapWidth}" Minimum="1" Maximum="1000" Margin="4" Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="4"></NumericUpDown>
-    <TextBlock Margin="4" VerticalAlignment="Bottom" Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="4">Height</TextBlock>
-    <NumericUpDown Value="{Binding MapHeight}" Minimum="1" Maximum="1000" Margin="4" Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="4"></NumericUpDown>
-    <TextBlock Margin="4" VerticalAlignment="Bottom" Grid.Row="4" Grid.Column="0" Grid.ColumnSpan="4">Anchor</TextBlock>
-
-    <Button Command="{Binding btnUpLeft_Click}" Content="{Binding Path=ResizeDir, Converter={StaticResource ComparisonXConverter}, ConverterParameter={x:Static local:Dir8.UpLeft}}" Margin="4" Grid.Row="5" Grid.Column="0" Grid.ColumnSpan="1"/>
-    <Button Command="{Binding btnUp_Click}" Content="{Binding Path=ResizeDir, Converter={StaticResource ComparisonXConverter}, ConverterParameter={x:Static local:Dir8.Up}}" Margin="4" Grid.Row="5" Grid.Column="1" Grid.ColumnSpan="2"/>
-    <Button Command="{Binding btnUpRight_Click}" Content="{Binding Path=ResizeDir, Converter={StaticResource ComparisonXConverter}, ConverterParameter={x:Static local:Dir8.UpRight}}" Margin="4" Grid.Row="5" Grid.Column="3" Grid.ColumnSpan="1"/>
-    <Button Command="{Binding btnLeft_Click}" Content="{Binding Path=ResizeDir, Converter={StaticResource ComparisonXConverter}, ConverterParameter={x:Static local:Dir8.Left}}" Margin="4" Grid.Row="6" Grid.Column="0" Grid.ColumnSpan="1"/>
-    <Button Command="{Binding btnNone_Click}" Content="{Binding Path=ResizeDir, Converter={StaticResource ComparisonXConverter}, ConverterParameter={x:Static local:Dir8.None}}" Margin="4" Grid.Row="6" Grid.Column="1" Grid.ColumnSpan="2"/>
-    <Button Command="{Binding btnRight_Click}" Content="{Binding Path=ResizeDir, Converter={StaticResource ComparisonXConverter}, ConverterParameter={x:Static local:Dir8.Right}}" Margin="4" Grid.Row="6" Grid.Column="3" Grid.ColumnSpan="1"/>
-    <Button Command="{Binding btnDownLeft_Click}" Content="{Binding Path=ResizeDir, Converter={StaticResource ComparisonXConverter}, ConverterParameter={x:Static local:Dir8.DownLeft}}" Margin="4" Grid.Row="7" Grid.Column="0" Grid.ColumnSpan="1"/>
-    <Button Command="{Binding btnDown_Click}" Content="{Binding Path=ResizeDir, Converter={StaticResource ComparisonXConverter}, ConverterParameter={x:Static local:Dir8.Down}}" Margin="4" Grid.Row="7" Grid.Column="1" Grid.ColumnSpan="2"/>
-    <Button Command="{Binding btnDownRight_Click}" Content="{Binding Path=ResizeDir, Converter={StaticResource ComparisonXConverter}, ConverterParameter={x:Static local:Dir8.DownRight}}" Margin="4" Grid.Row="7" Grid.Column="3" Grid.ColumnSpan="1"/>
-    
-    <Button Click="btnOK_Click" Margin="4" Grid.Row="9" Grid.Column="0" Grid.ColumnSpan="2">OK</Button>
-    <Button Click="btnCancel_Click" Margin="4" Grid.Row="9" Grid.Column="2" Grid.ColumnSpan="2">Cancel</Button>
-  </Grid>
-</Window>
diff --git a/RogueEssence.Editor.Avalonia/Views/DialogBoxes/MapResizeWindow.axaml.cs b/RogueEssence.Editor.Avalonia/Views/DialogBoxes/MapResizeWindow.axaml.cs
deleted file mode 100644
index ac506f22..00000000
--- a/RogueEssence.Editor.Avalonia/Views/DialogBoxes/MapResizeWindow.axaml.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Interactivity;
-using Avalonia.Markup.Xaml;
-
-namespace RogueEssence.Dev.Views
-{
-    public partial class MapResizeWindow : Window
-    {
-        public MapResizeWindow()
-        {
-            this.InitializeComponent();
-
-        }
-        
-        public void btnOK_Click(object sender, RoutedEventArgs e)
-        {
-            this.Close(true);
-        }
-
-
-        public void btnCancel_Click(object sender, RoutedEventArgs e)
-        {
-            this.Close(false);
-        }
-    }
-}
diff --git a/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/MapResizeWindowView.axaml b/RogueEssence.Editor.Avalonia/Views/DialogBoxes/MapResizeWindowView.axaml
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/MapResizeWindowView.axaml
rename to RogueEssence.Editor.Avalonia/Views/DialogBoxes/MapResizeWindowView.axaml
diff --git a/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/MapResizeWindowView.axaml.cs b/RogueEssence.Editor.Avalonia/Views/DialogBoxes/MapResizeWindowView.axaml.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/MapResizeWindowView.axaml.cs
rename to RogueEssence.Editor.Avalonia/Views/DialogBoxes/MapResizeWindowView.axaml.cs
diff --git a/RogueEssence.Editor.Avalonia/Views/DialogBoxes/MapRetileWindow2.axaml b/RogueEssence.Editor.Avalonia/Views/DialogBoxes/MapRetileWindow2.axaml
deleted file mode 100644
index 9ad7f338..00000000
--- a/RogueEssence.Editor.Avalonia/Views/DialogBoxes/MapRetileWindow2.axaml
+++ /dev/null
@@ -1,30 +0,0 @@
-<Window xmlns="https://github.com/avaloniaui"
-        xmlns:vm="clr-namespace:RogueEssence.Dev.ViewModels;assembly=RogueEssence.Editor.Avalonia"
-        xmlns:views="clr-namespace:RogueEssence.Dev.Views"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        mc:Ignorable="d"
-        x:Class="RogueEssence.Dev.Views.MapRetileWindow2"
-        Title="Tileset Size" Height="200" Width="280" Opened="Window_Loaded">
-  <Design.DataContext>
-    <vm:MapRetileViewModel/>
-  </Design.DataContext>
-  <Grid Margin="4" >
-    <Grid.RowDefinitions>
-      <RowDefinition Height="20"/>
-      <RowDefinition Height="42"/>
-      <RowDefinition/>
-      <RowDefinition Height="42"/>
-    </Grid.RowDefinitions>
-    <Grid.ColumnDefinitions>
-      <ColumnDefinition/>
-      <ColumnDefinition/>
-    </Grid.ColumnDefinitions>
-    <TextBlock Margin="4" VerticalAlignment="Bottom" Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2">Tile Size (Pixels)</TextBlock>
-    <NumericUpDown Value="{Binding TileSize}" Minimum="1" Maximum="256" Margin="4" Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2"></NumericUpDown>
-    <TextBlock Margin="4" TextWrapping="Wrap" Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2" Text="{Binding Message}"/>
-    <Button Click="btnOK_Click" IsEnabled="{Binding AllowConfirm}" Margin="4" Grid.Row="3" Grid.Column="0">OK</Button>
-    <Button Click="btnCancel_Click" Margin="4" Grid.Row="3" Grid.Column="1">Cancel</Button>
-  </Grid>
-</Window>
diff --git a/RogueEssence.Editor.Avalonia/Views/DialogBoxes/MapRetileWindow2.axaml.cs b/RogueEssence.Editor.Avalonia/Views/DialogBoxes/MapRetileWindow2.axaml.cs
deleted file mode 100644
index b23e8057..00000000
--- a/RogueEssence.Editor.Avalonia/Views/DialogBoxes/MapRetileWindow2.axaml.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Interactivity;
-using Avalonia.Markup.Xaml;
-using System;
-
-namespace RogueEssence.Dev.Views
-{
-    public partial class MapRetileWindow2 : Window
-    {
-        public MapRetileWindow2()
-        {
-            this.InitializeComponent();
-        }
-
-        //TODO: this is a workaround to a bug in text wrapping
-        //the window size must be modified in order to invalidate a cached value for width
-        //remove this once the bug is fixed
-        public void Window_Loaded(object sender, EventArgs e)
-        {
-            if (Design.IsDesignMode)
-                return;
-            this.Width = this.Width + 10;
-        }
-
-
-        public void btnOK_Click(object sender, RoutedEventArgs e)
-        {
-            this.Close(true);
-        }
-
-
-        public void btnCancel_Click(object sender, RoutedEventArgs e)
-        {
-            this.Close(false);
-        }
-    }
-}
diff --git a/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/MapRetileWindowView.axaml b/RogueEssence.Editor.Avalonia/Views/DialogBoxes/MapRetileWindowView.axaml
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/MapRetileWindowView.axaml
rename to RogueEssence.Editor.Avalonia/Views/DialogBoxes/MapRetileWindowView.axaml
diff --git a/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/MapRetileWindowView.axaml.cs b/RogueEssence.Editor.Avalonia/Views/DialogBoxes/MapRetileWindowView.axaml.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/MapRetileWindowView.axaml.cs
rename to RogueEssence.Editor.Avalonia/Views/DialogBoxes/MapRetileWindowView.axaml.cs
diff --git a/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/MessageBoxWindowView.axaml b/RogueEssence.Editor.Avalonia/Views/DialogBoxes/MessageBoxWindowView.axaml
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/MessageBoxWindowView.axaml
rename to RogueEssence.Editor.Avalonia/Views/DialogBoxes/MessageBoxWindowView.axaml
diff --git a/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/MessageBoxWindowView.axaml.cs b/RogueEssence.Editor.Avalonia/Views/DialogBoxes/MessageBoxWindowView.axaml.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/MessageBoxWindowView.axaml.cs
rename to RogueEssence.Editor.Avalonia/Views/DialogBoxes/MessageBoxWindowView.axaml.cs
diff --git a/RogueEssence.Editor.Avalonia/Views/DialogBoxes/ModConfigWindow.axaml b/RogueEssence.Editor.Avalonia/Views/DialogBoxes/ModConfigWindow.axaml
deleted file mode 100644
index a51a1e37..00000000
--- a/RogueEssence.Editor.Avalonia/Views/DialogBoxes/ModConfigWindow.axaml
+++ /dev/null
@@ -1,90 +0,0 @@
-<v:ChromelessWindow xmlns="https://github.com/avaloniaui"
-        xmlns:vm="clr-namespace:RogueEssence.Dev.ViewModels;assembly=RogueEssence.Editor.Avalonia"
-        xmlns:v="clr-namespace:RogueEssence.Dev.Views"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        mc:Ignorable="d"
-        SizeToContent="WidthAndHeight"
-        x:Class="RogueEssence.Dev.Views.ModConfigWindow"
-        
-        Title="Mod Config" Width="500" Height="600">
-  <Design.DataContext>
-    <vm:ModConfigWindowViewModel/>
-  </Design.DataContext>
-
-  <Grid Margin="4" RowDefinitions="188, *">
-    <Grid RowDefinitions="36,36,36,80" ColumnDefinitions="72,*">
-    <TextBlock Margin="4,2" Text="Name:" VerticalAlignment="Center" HorizontalAlignment="Right"/>
-    <Grid Grid.Row="0" Grid.Column="1">
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition/>
-        <ColumnDefinition Width="48"/>
-        <ColumnDefinition Width="72"/>
-      </Grid.ColumnDefinitions>
-      <TextBox Text="{Binding Name}" VerticalAlignment="Center" Margin="4"/>
-      <TextBlock Margin="4,2" Text="Type:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Column="1"/>
-      <v:SearchComboBox Margin="4,2" ItemsSource="{Binding ModTypes}" SelectedIndex="{Binding ChosenModType}" Grid.Column="2"/>
-    </Grid>
-
-    <TextBlock Margin="4,2" Text="Namespace:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="1"/>
-    <Grid Grid.Row="1" Grid.Column="1">
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition/>
-        <ColumnDefinition Width="48"/>
-        <ColumnDefinition Width="72"/>
-      </Grid.ColumnDefinitions>
-      <TextBox Text="{Binding Namespace}" VerticalAlignment="Center" Margin="4"/>
-      <TextBlock Margin="4,2" Text="Version:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Column="1"/>
-      <TextBox Text="{Binding Version}" VerticalAlignment="Center" Margin="4" Grid.Column="2"/>
-    </Grid>
-    
-    <TextBlock Margin="4,2" Text="Author:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="2"/>
-    <TextBox Text="{Binding Author}" VerticalAlignment="Center" Margin="4" Grid.Row="2" Grid.Column="1"/>
-    <TextBlock Margin="4,2" Text="Description:" VerticalAlignment="Top" HorizontalAlignment="Right" Grid.Row="3"/>
-    <TextBox Text="{Binding Description}" AcceptsReturn="True" Margin="4" Grid.Row="3" Grid.Column="1"/>
-  </Grid>
-
-    <Expander Grid.Row="1">
-      <Expander.Header>
-        <Label Content="Advanced"></Label>
-      </Expander.Header>
-      <Grid>
-        <Grid.RowDefinitions>
-          <RowDefinition Height="36"/>
-          <RowDefinition Height="36"/>
-          <RowDefinition Height="*"/>
-        </Grid.RowDefinitions>
-        <Grid.ColumnDefinitions>
-          <ColumnDefinition Width="80"/>
-          <ColumnDefinition/>
-        </Grid.ColumnDefinitions>
-
-        <TextBlock Margin="4,2" Text="UUID:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="0"/>
-        <Grid Grid.Row="0" Grid.Column="1">
-          <Grid.ColumnDefinitions>
-            <ColumnDefinition/>
-            <ColumnDefinition Width="64"/>
-          </Grid.ColumnDefinitions>
-          <TextBox Text="{Binding UUID}" IsReadOnly="True" VerticalAlignment="Center" Margin="4"/>
-          <Button Command="{Binding btnRegenUUID_Click}" Margin="4" Grid.Column="1">Regen</Button>
-        </Grid>
-
-        <TextBlock Margin="4,2" Text="Game Version:" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="1"/>
-        <TextBox Text="{Binding GameVersion}" VerticalAlignment="Center" Margin="4" Grid.Row="1" Grid.Column="1"/>
-        
-        <TextBlock Margin="4" VerticalAlignment="Top" HorizontalAlignment="Right" Grid.Row="2">Relations:</TextBlock>
-        <v:CollectionBox DataContext="{Binding Relationships}" Margin="4" Grid.Row="2" Grid.Column="1"/>
-
-      </Grid>
-    </Expander>
-  <!-- <Grid Grid.Row="2"> -->
-  <!--   <Grid.ColumnDefinitions> -->
-  <!--     <ColumnDefinition/> -->
-  <!--     <ColumnDefinition/> -->
-  <!--   </Grid.ColumnDefinitions> -->
-  <!--   <Button Click="btnOK_Click" Margin="4" Grid.Column="0">OK</Button> -->
-  <!--   <Button Click="btnCancel_Click" Margin="4" Grid.Column="1">Cancel</Button> -->
-  <!-- </Grid> -->
-  </Grid>
-</v:ChromelessWindow>
diff --git a/RogueEssence.Editor.Avalonia/Views/DialogBoxes/ModConfigWindow.axaml.cs b/RogueEssence.Editor.Avalonia/Views/DialogBoxes/ModConfigWindow.axaml.cs
deleted file mode 100644
index 691a1247..00000000
--- a/RogueEssence.Editor.Avalonia/Views/DialogBoxes/ModConfigWindow.axaml.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Interactivity;
-using Avalonia.Markup.Xaml;
-using RogueEssence.Dev.ViewModels;
-using System;
-
-namespace RogueEssence.Dev.Views
-{
-    public partial class ModConfigWindow : ChromelessWindow
-    {
-        public ModConfigWindow()
-        {
-            this.InitializeComponent();
-        }
-
-        public async void btnOK_Click(object sender, RoutedEventArgs e)
-        {
-            ModConfigWindowViewModel vm = (ModConfigWindowViewModel)DataContext;
-            try
-            {
-                if (String.IsNullOrWhiteSpace(Text.Sanitize(vm.Name)))
-                    throw new InvalidOperationException("Invalid Name");
-                if (String.IsNullOrWhiteSpace(Text.Sanitize(vm.Namespace).ToLower()))
-                    throw new InvalidOperationException("Invalid Namespace");
-
-                Guid uuid = Guid.Parse(vm.UUID);
-                if (uuid == Guid.Empty)
-                    throw new InvalidOperationException("Invalid UUID");
-
-                Version.Parse(vm.Version);
-                Version.Parse(vm.GameVersion);
-
-                if (vm.ChosenModType < 0 || vm.ChosenModType >= (int)PathMod.ModType.Count)
-                    throw new InvalidOperationException("Invalid ModType");
-            }
-            catch (Exception ex)
-            {
-                DiagManager.Instance.LogError(ex, false);
-                await MessageBox.Show(this, ex.Message, "Invalid Input", MessageBox.MessageBoxButtons.Ok);
-                return;
-            }
-
-            this.Close(true);
-        }
-
-
-        public void btnCancel_Click(object sender, RoutedEventArgs e)
-        {
-            this.Close(false);
-        }
-    }
-}
diff --git a/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/ModNameWindowView.axaml b/RogueEssence.Editor.Avalonia/Views/DialogBoxes/ModNameWindowView.axaml
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/ModNameWindowView.axaml
rename to RogueEssence.Editor.Avalonia/Views/DialogBoxes/ModNameWindowView.axaml
diff --git a/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/ModNameWindowView.axaml.cs b/RogueEssence.Editor.Avalonia/Views/DialogBoxes/ModNameWindowView.axaml.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/ModNameWindowView.axaml.cs
rename to RogueEssence.Editor.Avalonia/Views/DialogBoxes/ModNameWindowView.axaml.cs
diff --git a/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/PreferencesWindowView.axaml b/RogueEssence.Editor.Avalonia/Views/DialogBoxes/PreferencesWindowView.axaml
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/PreferencesWindowView.axaml
rename to RogueEssence.Editor.Avalonia/Views/DialogBoxes/PreferencesWindowView.axaml
diff --git a/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/PreferencesWindowView.axaml.cs b/RogueEssence.Editor.Avalonia/Views/DialogBoxes/PreferencesWindowView.axaml.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/PreferencesWindowView.axaml.cs
rename to RogueEssence.Editor.Avalonia/Views/DialogBoxes/PreferencesWindowView.axaml.cs
diff --git a/RogueEssence.Editor.Avalonia/Views/DialogBoxes/RenameWindow.axaml b/RogueEssence.Editor.Avalonia/Views/DialogBoxes/RenameWindow.axaml
deleted file mode 100644
index 673be045..00000000
--- a/RogueEssence.Editor.Avalonia/Views/DialogBoxes/RenameWindow.axaml
+++ /dev/null
@@ -1,26 +0,0 @@
-<Window xmlns="https://github.com/avaloniaui"
-        xmlns:vm="clr-namespace:RogueEssence.Dev.ViewModels;assembly=RogueEssence.Editor.Avalonia"
-        xmlns:views="clr-namespace:RogueEssence.Dev.Views"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        mc:Ignorable="d"
-        x:Class="RogueEssence.Dev.Views.RenameWindow"
-        Title="Name" Width="200" Height="100">
-  <Design.DataContext>
-    <vm:RenameViewModel/>
-  </Design.DataContext>
-  <Grid Margin="4" >
-    <Grid.RowDefinitions>
-      <RowDefinition Height="42"/>
-      <RowDefinition Height="42"/>
-    </Grid.RowDefinitions>
-    <Grid.ColumnDefinitions>
-      <ColumnDefinition/>
-      <ColumnDefinition/>
-    </Grid.ColumnDefinitions>
-    <TextBox Text="{Binding Name}" VerticalAlignment="Center" Margin="4" Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2"/>
-    <Button Click="btnOK_Click" Margin="4" Grid.Row="1" Grid.Column="0">OK</Button>
-    <Button Click="btnCancel_Click" Margin="4" Grid.Row="1" Grid.Column="1">Cancel</Button>
-  </Grid>
-</Window>
diff --git a/RogueEssence.Editor.Avalonia/Views/DialogBoxes/RenameWindow.axaml.cs b/RogueEssence.Editor.Avalonia/Views/DialogBoxes/RenameWindow.axaml.cs
deleted file mode 100644
index 6000c354..00000000
--- a/RogueEssence.Editor.Avalonia/Views/DialogBoxes/RenameWindow.axaml.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Interactivity;
-using Avalonia.Markup.Xaml;
-
-namespace RogueEssence.Dev.Views
-{
-    public partial class RenameWindow : Window
-    {
-        public RenameWindow()
-        {
-            this.InitializeComponent();
-        }
-
-        public void btnOK_Click(object sender, RoutedEventArgs e)
-        {
-            this.Close(true);
-        }
-
-
-        public void btnCancel_Click(object sender, RoutedEventArgs e)
-        {
-            this.Close(false);
-        }
-    }
-}
diff --git a/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/RenameWindowView.axaml b/RogueEssence.Editor.Avalonia/Views/DialogBoxes/RenameWindowView.axaml
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/RenameWindowView.axaml
rename to RogueEssence.Editor.Avalonia/Views/DialogBoxes/RenameWindowView.axaml
diff --git a/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/RenameWindowView.axaml.cs b/RogueEssence.Editor.Avalonia/Views/DialogBoxes/RenameWindowView.axaml.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/RenameWindowView.axaml.cs
rename to RogueEssence.Editor.Avalonia/Views/DialogBoxes/RenameWindowView.axaml.cs
diff --git a/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundEditForm.axaml b/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundEditForm.axaml
deleted file mode 100644
index d25889bc..00000000
--- a/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundEditForm.axaml
+++ /dev/null
@@ -1,70 +0,0 @@
-<Window xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:vm="clr-namespace:RogueEssence.Dev.ViewModels;assembly=RogueEssence.Editor.Avalonia"
-        xmlns:views="clr-namespace:RogueEssence.Dev.Views"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        mc:Ignorable="d"
-        xmlns:converters="clr-namespace:RogueEssence.Dev.Converters"
-        x:Class="RogueEssence.Dev.Views.GroundEditForm"
-        Width="850" Height="540" Opened="Window_Loaded" Closed="Window_Closed">
-  <!--Icon="/Assets/app-logo.ico"-->
-    <Design.DataContext>
-        <vm:GroundEditViewModel/>
-    </Design.DataContext>
-  <Window.Resources>
-    <converters:FileToTitleConverter x:Key="FileToTitleConverter"/>
-  </Window.Resources>
-  <Window.Title>
-    <Binding Path="CurrentFile" Converter="{StaticResource FileToTitleConverter}"/>
-  </Window.Title>
-  <DockPanel>
-    <Menu DockPanel.Dock="Top">
-      <MenuItem Header="_File">
-        <MenuItem Header="_New" Command="{Binding mnuNew_Click}"/>
-        <MenuItem Header="_Open" Command="{Binding mnuOpen_Click}"/>
-        <MenuItem Header="_Save" Command="{Binding mnuSave_Click}"/>
-        <MenuItem Header="_Save As" Command="{Binding mnuSaveAs_Click}"/>
-        <MenuItem Header="_Save and Test" Command="{Binding mnuTest_Click}"/>
-      </MenuItem>
-      <MenuItem Header="_Edit">
-        <MenuItem Header="Resize Map" Command="{Binding mnuReSize_Click}"/>
-        <MenuItem Header="Re-Tile Map" Command="{Binding mnuReTile_Click}"/>
-        <Separator/>
-        <MenuItem Header="Undo" Command="{Binding mnuUndo_Click}"/>
-        <MenuItem Header="Redo" Command="{Binding mnuRedo_Click}"/>
-      </MenuItem>
-      <MenuItem Header="_Tiles">
-        <MenuItem Header="_Load from .png into Tileset" Command="{Binding mnuImportFromPng_Click}"/>
-        <MenuItem Header="_Load Tileset into Layer" Command="{Binding mnuImportFromTileset_Click}"/>
-        <MenuItem Header="_Clear Layer" Command="{Binding mnuClearLayer_Click}"/>
-        <MenuItem Header="_Load Standardize Frame Length" Command="{Binding mnuStandardizeFrameLength_Click}"/>
-      </MenuItem>
-    </Menu>
-    <Grid>
-      <TabControl Name="tabOptions" TabStripPlacement="Top" SelectedIndex="{Binding SelectedTabIndex}" Margin="2">
-        <TabItem Name="tabTextures" Header="Textures" >
-          <views:GroundTabTextures DataContext="{Binding Textures}"/>
-        </TabItem>
-        <TabItem Name="tabDecorations" Header="Decorations" >
-          <views:GroundTabDecorations DataContext="{Binding Decorations}"/>
-        </TabItem>
-        <TabItem Name="tabWalls" Header="Walls" >
-          <views:GroundTabWalls DataContext="{Binding Walls}"/>
-        </TabItem>
-        <TabItem Name="tabEntities" Header="Entities" >
-          <views:GroundTabEntities DataContext="{Binding Entities}"/>
-        </TabItem>
-        <TabItem Name="tabProperties" Header="Properties" >
-          <views:GroundTabProperties DataContext="{Binding Properties}"/>
-        </TabItem>
-        <TabItem Name="tabStrings" Header="Strings" >
-          <views:GroundTabStrings DataContext="{Binding Strings}"/>
-        </TabItem>
-        <TabItem Name="tabScript" Header="Script" >
-          <views:GroundTabScript DataContext="{Binding Script}"/>
-        </TabItem>
-      </TabControl>
-    </Grid>
-  </DockPanel>
-</Window>
diff --git a/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundEditForm.axaml.cs b/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundEditForm.axaml.cs
deleted file mode 100644
index 67a72c44..00000000
--- a/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundEditForm.axaml.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
-using Avalonia.Input;
-using Avalonia.Interactivity;
-using System;
-using System.IO;
-using RogueEssence;
-using RogueEssence.Dev;
-using Microsoft.Xna.Framework;
-using Avalonia.Threading;
-using System.Threading;
-using RogueEssence.Data;
-using RogueEssence.Content;
-using System.Collections.Generic;
-using RogueEssence.Dev.ViewModels;
-
-namespace RogueEssence.Dev.Views
-{
-    public partial class GroundEditForm : ParentForm, IGroundEditor
-    {
-
-        public bool Active { get; private set; }
-
-        // TODO: make undo/redo enabled/disabled based on if there's anything left on the stack
-        public UndoStack Edits { get; }
-        public GroundEditForm()
-        {
-            InitializeComponent();
-
-            Edits = new UndoStack();
-
-        }
-        
-        public void ProcessInput(InputManager input)
-        {
-            DevForm.ExecuteOrInvoke(() => ((GroundEditViewModel)DataContext).ProcessInput(input));
-        }
-
-
-
-
-        public void Window_Loaded(object sender, EventArgs e)
-        {
-            Active = true;
-        }
-
-        private bool silentClose;
-        public void SilentClose()
-        {
-            silentClose = true;
-            Close();
-        }
-
-        public void Window_Closed(object sender, EventArgs e)
-        {
-            Active = false;
-            CloseChildren();
-            if (!silentClose)
-                GameManager.Instance.SceneOutcome = exitGroundEdit();
-        }
-
-
-        private IEnumerator<YieldInstruction> exitGroundEdit()
-        {
-            DevForm form = (DevForm)DiagManager.Instance.DevEditor;
-            form.GroundEditorPage = null;
-
-            //move to the previous scene or the title, if there was none
-            if (DataManager.Instance.Save != null && DataManager.Instance.Save.NextDest.IsValid())
-                yield return CoroutineManager.Instance.StartCoroutine(GameManager.Instance.MoveToZone(DataManager.Instance.Save.NextDest, true, false));
-            else
-                yield return CoroutineManager.Instance.StartCoroutine(GameManager.Instance.RestartToTitle());
-        }
-    }
-}
diff --git a/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapEditForm.axaml b/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapEditForm.axaml
deleted file mode 100644
index 1dd54b65..00000000
--- a/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapEditForm.axaml
+++ /dev/null
@@ -1,79 +0,0 @@
-<Window xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:vm="clr-namespace:RogueEssence.Dev.ViewModels;assembly=RogueEssence.Editor.Avalonia"
-        xmlns:views="clr-namespace:RogueEssence.Dev.Views"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        mc:Ignorable="d"
-        xmlns:converters="clr-namespace:RogueEssence.Dev.Converters"
-        x:Class="RogueEssence.Dev.Views.MapEditForm"
-        Width="850" Height="540" Opened="Window_Loaded" Closed="Window_Closed">
-  <!--Icon="/Assets/app-logo.ico"-->
-    <Design.DataContext>
-        <vm:MapEditViewModel/>
-    </Design.DataContext>
-  <Window.Resources>
-    <converters:FileToTitleConverter x:Key="FileToTitleConverter"/>
-  </Window.Resources>
-  <Window.Title>
-    <Binding Path="CurrentFile" Converter="{StaticResource FileToTitleConverter}"/>
-  </Window.Title>
-  <DockPanel>
-    <Menu DockPanel.Dock="Top">
-      <MenuItem Header="_File">
-        <MenuItem Header="_New" Command="{Binding mnuNew_Click}"/>
-        <MenuItem Header="_Open" Command="{Binding mnuOpen_Click}"/>
-        <MenuItem Header="_Save" Command="{Binding mnuSave_Click}"/>
-        <MenuItem Header="_Save As" Command="{Binding mnuSaveAs_Click}"/>
-        <MenuItem Header="_Save and Test" Command="{Binding mnuTest_Click}"/>
-        <MenuItem Header="_Export as Ground" Command="{Binding mnuExportAsGround_Click}"/>
-      </MenuItem>
-      <MenuItem Header="_Edit">
-        <MenuItem Header="Resize Map" Command="{Binding mnuReSize_Click}"/>
-        <Separator/>
-        <MenuItem Header="Undo" Command="{Binding mnuUndo_Click}"/>
-        <MenuItem Header="Redo" Command="{Binding mnuRedo_Click}"/>
-      </MenuItem>
-      <MenuItem Header="_Tiles">
-        <MenuItem Header="_Load from .png into Tileset" Command="{Binding mnuImportFromPng_Click}"/>
-        <MenuItem Header="_Load Tileset into Layer" Command="{Binding mnuImportFromTileset_Click}"/>
-        <MenuItem Header="_Clear Layer" Command="{Binding mnuClearLayer_Click}"/>
-        <MenuItem Header="_Load Standardize Frame Length" Command="{Binding mnuStandardizeFrameLength_Click}"/>
-      </MenuItem>
-    </Menu>
-    <Grid>
-      <TabControl Name="tabOptions" TabStripPlacement="Top" SelectedIndex="{Binding SelectedTabIndex}" Margin="2">
-        <TabItem Name="tabTextures" Header="Textures" >
-          <views:MapTabTextures DataContext="{Binding Textures}"/>
-        </TabItem>
-        <TabItem Name="tabDecorations" Header="Decorations" >
-          <views:MapTabDecorations DataContext="{Binding Decorations}"/>
-        </TabItem>
-        <TabItem Name="tabTerrain" Header="Terrain" >
-          <views:MapTabTerrain DataContext="{Binding Terrain}"/>
-        </TabItem>
-        <TabItem Name="tabTiles" Header="Tiles" >
-          <views:MapTabTiles DataContext="{Binding Tiles}"/>
-        </TabItem>
-        <TabItem Name="tabItems" Header="Items" >
-          <views:MapTabItems DataContext="{Binding Items}"/>
-        </TabItem>
-        <TabItem Name="tabEntities" Header="Entities" >
-          <views:MapTabEntities DataContext="{Binding Entities}"/>
-        </TabItem>
-        <TabItem Name="tabEntrances" Header="Entrances" >
-          <views:MapTabEntrances DataContext="{Binding Entrances}"/>
-        </TabItem>
-        <TabItem Name="tabSpawns" Header="Spawns" >
-          <views:MapTabSpawns DataContext="{Binding Spawns}"/>
-        </TabItem>
-        <TabItem Name="tabEffects" Header="Effects" >
-          <views:MapTabEffects DataContext="{Binding Effects}"/>
-        </TabItem>
-        <TabItem Name="tabProperties" Header="Properties" >
-          <views:MapTabProperties DataContext="{Binding Properties}"/>
-        </TabItem>
-      </TabControl>
-    </Grid>
-  </DockPanel>
-</Window>
diff --git a/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapEditForm.axaml.cs b/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapEditForm.axaml.cs
deleted file mode 100644
index 4ccdcf41..00000000
--- a/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapEditForm.axaml.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
-using Avalonia.Input;
-using Avalonia.Interactivity;
-using System;
-using System.IO;
-using RogueEssence;
-using RogueEssence.Dev;
-using Microsoft.Xna.Framework;
-using Avalonia.Threading;
-using System.Threading;
-using RogueEssence.Data;
-using RogueEssence.Content;
-using System.Collections.Generic;
-using RogueEssence.Dev.ViewModels;
-
-namespace RogueEssence.Dev.Views
-{
-    public partial class MapEditForm : ParentForm, IMapEditor
-    {
-
-        public bool Active { get; private set; }
-        public UndoStack Edits { get; }
-        public MapEditForm()
-        {
-            InitializeComponent();
-            Edits = new UndoStack();
-
-        }
-        
-        public void ProcessInput(InputManager input)
-        {
-            DevForm.ExecuteOrInvoke(() => ((MapEditViewModel)DataContext).ProcessInput(input));
-        }
-        
-        public void Window_Loaded(object sender, EventArgs e)
-        {
-            Active = true;
-        }
-
-        private bool silentClose;
-        public void SilentClose()
-        {
-            silentClose = true;
-            Close();
-        }
-
-        public void Window_Closed(object sender, EventArgs e)
-        {
-            Active = false;
-            CloseChildren();
-            if (!silentClose)
-                GameManager.Instance.SceneOutcome = exitMapEdit();
-        }
-
-
-        private IEnumerator<YieldInstruction> exitMapEdit()
-        {
-            DevForm form = (DevForm)DiagManager.Instance.DevEditor;
-            form.MapEditorPage = null;
-
-            //move to the previous scene or the title, if there was none
-            if (DataManager.Instance.Save != null && DataManager.Instance.Save.NextDest.IsValid())
-                yield return CoroutineManager.Instance.StartCoroutine(GameManager.Instance.MoveToZone(DataManager.Instance.Save.NextDest, true, false));
-            else
-                yield return CoroutineManager.Instance.StartCoroutine(GameManager.Instance.RestartToTitle());
-        }
-    }
-}
diff --git a/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml b/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml
deleted file mode 100644
index ba030585..00000000
--- a/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml
+++ /dev/null
@@ -1,241 +0,0 @@
-<v:ChromelessWindow xmlns="https://github.com/avaloniaui"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:vm="clr-namespace:RogueEssence.Dev.ViewModels"
-                    xmlns:v="clr-namespace:RogueEssence.Dev.Views"
-                    xmlns:c="clr-namespace:RogueEssence.Dev.Converters"
-                    xmlns:views="clr-namespace:RogueEssence.Dev.Views"
-                    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-                    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-                    mc:Ignorable="d"
-                    d:DesignWidth="1024"
-                    d:DesignHeight="450"
-                    x:Class="RogueEssence.Dev.Views.DevForm"
-                    x:Name="WindowMain"
-                    MinHeight="400"
-                    MinWidth="600"
-                    Opened="Window_Loaded" Closed="Window_Closed"
-                    Title="PMDO Editor">
-
-    <Design.DataContext>
-        <vm:DevFormViewModel />
-    </Design.DataContext>
-    <Window.Resources>
-        <c:WindowStateToColumnConverter x:Key="WindowStateToColumnConverter" />
-    </Window.Resources>
-    <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="{Binding #WindowMain.CaptionHeight}" />
-            <RowDefinition Height="*" />
-        </Grid.RowDefinitions>
-
-        <!-- Top Bar -->
-        <Grid Grid.Row="0" ColumnDefinitions="Auto, Auto, *, Auto">
-            <Border Grid.Column="0" Grid.ColumnSpan="4"
-                    DoubleTapped="MaximizeOrRestoreWindow"
-                    PointerPressed="BeginMoveWindow"
-                    Background="{DynamicResource Brush.TitleBar}"
-                    BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border0}" />
-            <Border Grid.Column="0" Width="72" IsVisible="{Binding #WindowMain.HasLeftCaptionButton}" />
-
-            <StackPanel
-                Grid.Column="{Binding #WindowMain.WindowState, Converter={StaticResource WindowStateToColumnConverter}}"
-                Orientation="Horizontal">
-                <!-- Settings -->
-                <Button Classes="icon_button" Command="{Binding ShowPreferencesWindow}"
-                        Padding="8, 4, 0, 0">
-                    <Path HorizontalAlignment="Center" Width="14" Height="14" Margin="0,2,0,0"
-                          Data="{StaticResource Icons.GearFill}" />
-                </Button>
-
-                <!-- Switch Mod Button  -->
-                <!-- TODO: figure out why tooltips won't work -->
-                <Button Margin="12,0,0,0" Grid.Column="3"
-                        Classes="icon_button"
-                        x:Name="ModSwitcherFlyoutButton" Padding="0,4,0,0"
-                        ToolTip.Tip="testing tooltip">
-                    <StackPanel Orientation="Horizontal"
-                                VerticalAlignment="Center">
-                        <TextBlock Padding="0,0,6,0" Text="{Binding ModsManager.CurrentMod.Name, FallbackValue='Origin'}"
-                                   MaxWidth="200"
-                                   TextTrimming="CharacterEllipsis" />
-                        <Path HorizontalAlignment="Center" Width="10" Height="10" Margin="0,2,0,0"
-                              Data="{StaticResource Icons.CaretDownFill}" />
-                    </StackPanel>
-                    <Button.Flyout>
-                        <Flyout Placement="BottomEdgeAlignedLeft"
-                                VerticalOffset="8"
-                                Opened="ModSwitcherFlyout_OnOpened"
-                                Closed="ModSwitcherFlyout_OnClosed">
-                            <StackPanel Orientation="Vertical" Background="{DynamicResource Brush.Popup}">
-                                <ContentControl Content="{Binding ModSwitcher}" Margin="8,8,8,8" />
-                            </StackPanel>
-                        </Flyout>
-                    </Button.Flyout>
-                </Button>
-            </StackPanel>
-
-            <Border Grid.Column="3" Margin="16,0,0,0" IsVisible="{Binding #WindowMain.HasRightCaptionButton}">
-                <v:CaptionButtons Height="30" VerticalAlignment="Top" />
-            </Border>
-        </Grid>
-        <Grid Grid.Row="1">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="250" MinWidth="100" MaxWidth="500" />
-                <ColumnDefinition Width="0" />
-                <ColumnDefinition Width="*" />
-            </Grid.ColumnDefinitions>
-            <!-- Left Side -->
-            <Border Grid.Column="0" Margin="0,0,0,0" BorderThickness="1"
-                    BorderBrush="{DynamicResource Brush.ToolBar}" CornerRadius="6">
-                <Grid RowDefinitions="28, 3, *">
-                    <TextBox Classes="search"
-                             Margin="0,0,0,0"
-                             Height="28"
-                             BorderThickness="0"
-                             Watermark="Search..."
-                             Text="{Binding Filter, Mode=TwoWay}">
-                        <TextBox.InnerRightContent>
-                            <Button Classes="icon_button"
-                                    Width="16"
-                                    Height="16"
-                                    Margin="0,0,6,0"
-                                    Command="{Binding ClearFilter}"
-                                    IsVisible="{Binding Filter, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"
-                                    HorizontalAlignment="Right">
-                                <Path
-                                    Fill="{DynamicResource Brush.FG2}"
-                                    Width="14" Height="14"
-                                    Margin="0,1,0,0"
-                                    Data="{StaticResource Icons.XCircleFill}" />
-                            </Button>
-                        </TextBox.InnerRightContent>
-                    </TextBox>
-                    <Border Grid.Row="1"
-                            Height="1"
-                            Background="{DynamicResource Brush.Border2}"
-                            HorizontalAlignment="Stretch" />
-                    <TreeDataGrid Grid.Row="2"
-                                  MinHeight="200" MinWidth="200"
-                                  x:Name="LeftTreeDataGrid"
-                                  Loaded="LeftTreeDataGrid_OnLoaded"
-                                  DoubleTapped="LeftTreeDataGrid_OnDoubleTapped"
-                                  ContextRequested="LeftTreeDataGrid_OnContextRequested"
-                                  PointerPressed="LeftTreeDataGrid_OnPointerPressed"
-                                  LostFocus="LeftTreeDataGrid_OnLostFocus"
-                                  ShowColumnHeaders="False"
-                                  Source="{Binding NodeSource}">
-                        <TreeDataGrid.Resources>
-
-                            <DataTemplate x:Key="TreeDataGridNodeBaseTemplate" DataType="vm:NodeBase">
-                                <ContentControl Content="{Binding}">
-                                    <ContentControl.DataTemplates>
-                                        <!-- <DataTemplate DataType="vm:ItemRootNode"> -->
-                                        <!--     <Grid ColumnDefinitions="*, 32" Height="16" Margin="8, 0, 0, 0"> -->
-                                        <!--         <v:IconText Grid.Column="0" Grid.ColumnSpan="2" -->
-                                        <!--                     Text="{Binding Title}" -->
-                                        <!--                     Icon="{Binding Icon}" -->
-                                        <!--                     IconSize="12" /> -->
-
-                                        <!-- <Button Grid.Column="1" HorizontalAlignment="Left" -->
-                                        <!--         Classes="icon_button" -->
-                                        <!--         Padding="4, 0, 0, 0" -->
-                                        <!--         Width="18" Height="18" -->
-                                        <!--         IsVisible="{Binding IsPointerOver, RelativeSource={RelativeSource AncestorType=TreeDataGridRow}}" -->
-                                        <!-- -->
-                                        <!--         Command="{Binding AddCommand}"> -->
-                                        <!--     <Path Stretch="Fill" -->
-                                        <!--           Fill="{DynamicResource Brush.FG1}" -->
-                                        <!--           Width="12" Height="12" -->
-                                        <!--           Data="{StaticResource Icons.Plus}" /> -->
-                                        <!-- </Button> -->
-                                        <!--     </Grid> -->
-                                        <!-- </DataTemplate> -->
-
-                                        <DataTemplate DataType="vm:DataItemNode">
-                                            <Grid ColumnDefinitions="*,32" Height="16" Margin="8, 0, 0, 0">
-                                                <v:IconText Text="{Binding Title}"
-                                                            Icon="{Binding Icon}"
-                                                            IconSize="12" />
-                                                <!-- -->
-                                                <!-- <Button Grid.Column="1" -->
-                                                <!--         Padding="4, 0, 0, 0" -->
-                                                <!--         HorizontalAlignment="Left" -->
-                                                <!--         Command="{Binding ((vm:ItemRootNode)Parent).DeleteCommand}" -->
-                                                <!--         CommandParameter="{Binding}" -->
-                                                <!--         IsVisible="{Binding IsPointerOver, RelativeSource={RelativeSource AncestorType=TreeDataGridRow}}" -->
-                                                <!--         Classes="icon_button" -->
-                                                <!--         Width="18" Height="18" -->
-                                                <!--         VerticalAlignment="Center"> -->
-                                                <!--     <Path Stretch="Fill" -->
-                                                <!--           Fill="{DynamicResource Brush.FG1}" -->
-                                                <!--           Width="12" Height="12" -->
-                                                <!--           Data="{StaticResource Icons.Minus}" /> -->
-                                                <!-- </Button> -->
-                                            </Grid>
-                                        </DataTemplate>
-
-
-                                        <DataTemplate DataType="vm:OpenEditorNode">
-                                            <v:IconText Margin="8, 0, 0, 0" Text="{Binding Title}"
-                                                        Icon="{Binding Icon}"
-                                                        IconSize="12" />
-                                        </DataTemplate>
-
-
-                                        <DataTemplate DataType="vm:NodeBase">
-                                            <v:IconText Margin="8, 0, 0, 0" Text="{Binding Title}"
-                                                        Icon="{Binding Icon}"
-                                                        IconSize="12" />
-                                        </DataTemplate>
-
-                                    </ContentControl.DataTemplates>
-                                </ContentControl>
-                            </DataTemplate>
-                        </TreeDataGrid.Resources>
-                    </TreeDataGrid>
-                </Grid>
-            </Border>
-
-            <!--  Splitter -->
-            <GridSplitter Grid.Column="1"
-                          BorderBrush="{DynamicResource Brush.Border0}"
-                          Background="Transparent"
-                          MinWidth="3"
-                          HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
-                          BorderThickness="0,0,1,0" />
-
-            <!-- Editor Panel -->
-            <Grid Margin="2, 0, 0, 0" Grid.Column="2" RowDefinitions="Auto, *">
-                <Border BorderThickness="0, 0, 0, 1" BorderBrush="{DynamicResource Brush.Border0}"
-                        Background="{DynamicResource TabControlWindowActiveBackgroundBrush}">
-                    <!-- Tab Bar -->
-                    <views:TabBarView Height="30" VerticalAlignment="Bottom" Margin="0,0,0,0" />
-
-                </Border>
-
-                <!-- Editor Content -->
-                <Panel Grid.Row="1" Background="{DynamicResource Brush.PageBackground}">
-
-                    <!-- Temporary tab still uses ContentControl since it's transient -->
-                    <ContentControl Content="{Binding TemporaryTab}"
-                                    IsVisible="{Binding TemporaryTab, Converter={x:Static ObjectConverters.IsNotNull}}" />
-
-                    <!-- All permanent pages kept alive, just toggling visibility -->
-                    <ItemsControl ItemsSource="{Binding Pages}"
-                                  IsVisible="{Binding TemporaryTab, Converter={x:Static ObjectConverters.IsNull}}">
-                        <ItemsControl.ItemsPanel>
-                            <ItemsPanelTemplate>
-                                <Panel />
-                            </ItemsPanelTemplate>
-                        </ItemsControl.ItemsPanel>
-                        <ItemsControl.ItemTemplate>
-                            <DataTemplate>
-                                <ContentControl Content="{Binding}" IsVisible="{Binding IsActive}" />
-                            </DataTemplate>
-                        </ItemsControl.ItemTemplate>
-                    </ItemsControl>
-                </Panel>
-            </Grid>
-        </Grid>
-    </Grid>
-</v:ChromelessWindow>
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml.cs b/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml.cs
deleted file mode 100644
index 81d2114c..00000000
--- a/RogueEssence.Editor.Avalonia/Views/New/DevForm.axaml.cs
+++ /dev/null
@@ -1,738 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.IO;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Controls.Primitives;
-using Avalonia.Controls.Templates;
-using Avalonia.Input;
-using Avalonia.Interactivity;
-using Avalonia.LogicalTree;
-using Avalonia.Platform.Storage;
-using Avalonia.Threading;
-using Avalonia.VisualTree;
-using Avalonia.Platform;
-using Microsoft.Xna.Framework;
-using RogueEssence.Content;
-using RogueEssence.Data;
-using RogueEssence.Dev.Utility;
-using RogueEssence.Dev.ViewModels;
-using RogueEssence.Dungeon;
-
-namespace RogueEssence.Dev.Views;
-
-public partial class DevForm : ChromelessWindow, IRootEditor
-{
-    public bool LoadComplete { get; private set; }
-
-        public MapEditorPageViewModel MapEditorPage;
-        public GroundEditorPageViewModel GroundEditorPage;
-
-        private Action pendingEditorAction;
-        private Exception pendingException;
-
-        public IMapEditor MapEditor 
-        { 
-            get { return MapEditorPage; }
-            set { MapEditorPage = (MapEditorPageViewModel)value; }
-        }
-        
-        public IGroundEditor GroundEditor 
-        { 
-            get { return GroundEditorPage; }
-            set { GroundEditorPage = (GroundEditorPageViewModel)value; }
-        }
-        
-        public bool AteMouse { get { return false; } }
-        public bool AteKeyboard { get { return false; } }
-
-        private static Dictionary<string, string> devConfig;
-        private static bool canSave;
-
-    
-        
-        void IRootEditor.Load(GameBase game)
-        {
-            Console.WriteLine("Loading Dev Editor");
-            ExecuteOrInvoke(load);
-        }
-
-        private void load()
-        {
-            lock (GameBase.lockObj)
-            {
-                DevDataManager.Init();
-
-                loadDevConfig();
-
-                reload(DataManager.DataType.All);
-
-                LoadComplete = true;
-            }
-        }
-
-
-        void IRootEditor.ReloadData(DataManager.DataType dataType)
-        {
-            ExecuteOrInvoke(() => { reload(dataType); });
-        }
-
-        private void reload(DataManager.DataType dataType)
-        {
-            lock (GameBase.lockObj)
-            {
-                if (dataType == DataManager.DataType.All)
-                    DevDataManager.ClearCaches();
-
-                ViewModels.DevFormViewModel devViewModel = (ViewModels.DevFormViewModel)this.DataContext;
-
-                if (dataType == DataManager.DataType.All)
-                {
-                    devViewModel.Game.HideSprites = DataManager.Instance.HideChars;
-                    devViewModel.Game.HideObjects = DataManager.Instance.HideObjects;
-                    devViewModel.Travel.DebugGen = DiagManager.Instance.ListenGen;
-                }
-
-                if ((dataType & DataManager.DataType.Skill) != DataManager.DataType.None)
-                    devViewModel.Game.ReloadSkills();
-
-                if ((dataType & DataManager.DataType.Intrinsic) != DataManager.DataType.None)
-                    devViewModel.Game.ReloadIntrinsics();
-
-                if ((dataType & DataManager.DataType.Status) != DataManager.DataType.None)
-                    devViewModel.Game.ReloadStatuses();
-
-                if ((dataType & DataManager.DataType.Item) != DataManager.DataType.None)
-                    devViewModel.Game.ReloadItems();
-
-
-                if ((dataType & DataManager.DataType.Monster) != DataManager.DataType.None)
-                {
-                    devViewModel.Player.LoadMonstersNumeric();
-                    devViewModel.Player.ReloadMonsters();
-                }
-
-                if (dataType == DataManager.DataType.All)
-                {
-                    int globalIdle = GraphicsManager.GlobalIdle;
-                    devViewModel.Player.Anims.Clear();
-                    for (int ii = 0; ii < GraphicsManager.Actions.Count; ii++)
-                        devViewModel.Player.Anims.Add(GraphicsManager.Actions[ii].Name);
-                    devViewModel.Player.ChosenAnim = -1;
-                    devViewModel.Player.ChosenAnim = globalIdle;
-                }
-
-                if ((dataType & DataManager.DataType.Zone) != DataManager.DataType.None)
-                    devViewModel.Travel.ReloadZones();
-
-                if (dataType == DataManager.DataType.All)
-                {
-                    devViewModel.ModsManager.UpdateMod();
-                    devViewModel.ModsManager.ReloadMods();
-                    
-                    devViewModel.LoadDevTree();
-                }
-
-                LoadComplete = true;
-                
-            }
-        }
-
-
-        public void Update(GameTime gameTime)
-        {
-            if (pendingEditorAction != null)
-            {
-                try
-                {
-                    pendingEditorAction();
-                    pendingException = null;
-                }
-                catch (Exception ex)
-                {
-                    pendingException = ex;
-                }
-                pendingEditorAction = null;
-            }
-
-            ExecuteOrInvoke(update);
-        }
-
-        private void update()
-        {
-            lock (GameBase.lockObj)
-            {
-                ViewModels.DevFormViewModel devViewModel = (ViewModels.DevFormViewModel)this.DataContext;
-
-                devViewModel.Player.UpdateLevel();
-                if (GameManager.Instance.IsInGame())
-                {
-                    if (!devViewModel.Player.JustOnce)
-                    {
-                        if (devViewModel.Player.JustMe)
-                        {
-                            int currentIdle = Dungeon.DungeonScene.Instance.FocusedCharacter.IdleOverride;
-                            if (currentIdle < 0)
-                                currentIdle = GraphicsManager.GlobalIdle;
-                            devViewModel.Player.ChosenAnim = currentIdle;
-                        }
-                        else
-                            devViewModel.Player.ChosenAnim = GraphicsManager.GlobalIdle;
-                    }
-                    devViewModel.Player.UpdateSpecies(Dungeon.DungeonScene.Instance.FocusedCharacter.BaseForm);
-                }
-                if (GroundEditorPage != null)
-                {
-                    ViewModels.GroundEditorPageViewModel vm = GroundEditorPage;
-                    vm.Textures.TileBrowser.UpdateFrame();
-                }
-                if (MapEditorPage != null)
-                {
-
-                    MapEditorPageViewModel vm = MapEditorPage;
-                    vm.Textures.TileBrowser.UpdateFrame();
-                    vm.Terrain.TileBrowser.UpdateFrame();
-                }
-
-                if (canSave)
-                    saveConfig();
-            }
-        }
-        public void Draw() { }
-
-        public void OpenGround()
-        {
-            ExecuteOrInvoke(openGround);
-        }
-
-        private void openGround()
-        {
-            DevFormViewModel vm  = (DevFormViewModel)this.DataContext;
-            vm.OpenGroundEditor();
-        }
-
-        public void OpenMap()
-        {
-            ExecuteOrInvoke(openMap);
-        }
-
-        public void openMap()
-        {
-            DevFormViewModel vm  = (DevFormViewModel)this.DataContext;
-            vm.OpenMapEditor();
-        }
-
-        public void groundEditorClosed(object sender, EventArgs e)
-        {
-            GameManager.Instance.SceneOutcome = resetEditors();
-        }
-
-        public void mapEditorClosed(object sender, EventArgs e)
-        {
-            GameManager.Instance.SceneOutcome = resetEditors();
-        }
-
-
-        private IEnumerator<YieldInstruction> resetEditors()
-        {
-            GroundEditorPage = null;
-            MapEditorPage = null;
-            yield return CoroutineManager.Instance.StartCoroutine(GameManager.Instance.RestartToTitle());
-        }
-        
-
-        public void CloseGround()
-        {
-            if (GroundEditorPage != null)
-                GroundEditorPage.Close();
-        }
-
-        public void CloseMap()
-        {
-            if (MapEditorPage != null)
-                MapEditorPage.Close();
-        }
-        
-        void LoadGame()
-        {
-            // Windows - CAN run game in new thread, CAN run game in same thread via dispatch.
-            // Mac - CANNOT run game in new thread, CAN run game in same thread via dispatch.
-            // Linux - CAN run the game in new thread, CANNOT run game in same thread via dispatch.
-
-            // When the game is started, it should run a continuous loop, blocking the UI
-            // However, this is only happening on linux.  Why not windows and mac?
-            // With Mac, cocoa can ONLY start the game window if it's on the main thread. Weird...
-
-            if (!OperatingSystem.IsLinux())
-                LoadGameDelegate();
-            else
-            {
-                Thread thread = new Thread(LoadGameDelegate);
-                thread.IsBackground = true;
-                thread.Start();
-            }
-        }
-
-        /// <summary>
-        /// A method intended to be called from the editor thread, that sends a function pointer to the Game thread,
-        /// waits for it to complete (blocking the thread), and then continues execution.
-        /// This call cannot be performed within a lock!!
-        /// </summary>
-        /// <param name="action"></param>
-        public static void ExecuteOrPend(Action action)
-        {
-            if (!OperatingSystem.IsLinux())
-                action();
-            else
-            {
-                DevForm editor = (DevForm)DiagManager.Instance.DevEditor;
-                editor.pendingEditorAction = action;
-
-                SpinWait.SpinUntil(() => editor.pendingEditorAction == null);
-
-                if (editor.pendingException != null)
-                {
-                    Exception ex = editor.pendingException;
-                    throw ex;
-                }
-            }
-        }
-
-        public static void ExecuteOrInvoke(Action action)
-        {
-            if (!OperatingSystem.IsLinux())
-                action();
-            else
-                Dispatcher.UIThread.InvokeAsync(action, DispatcherPriority.Background);
-        }
-
-        void LoadGameDelegate()
-        {
-            try
-            {
-                DiagManager.Instance.DevEditor = this;
-                using (GameBase game = new GameBase())
-                    game.Run();
-            }
-            catch (Exception ex)
-            {
-                DiagManager.Instance.LogError(ex);
-            }
-            ExecuteOrInvoke(Close);
-        }
-
-        public void Window_Loaded(object sender, EventArgs e)
-        {
-            if (Design.IsDesignMode)
-                return;
-            //Thread thread = new Thread(LoadGame);
-            //thread.IsBackground = true;
-            //thread.Start();
-            Dispatcher.UIThread.InvokeAsync(LoadGame, DispatcherPriority.Background);
-            //LoadGame();
-        }
-
-        public void Window_Closed(object sender, EventArgs e)
-        {
-            DiagManager.Instance.LoadMsg = "Closing...";
-            EnterLoadPhase(GameBase.LoadPhase.Unload);
-        }
-
-        public static void EnterLoadPhase(GameBase.LoadPhase loadState)
-        {
-            GameBase.CurrentPhase = loadState;
-        }
-
-
-
-        private static void loadDevConfig()
-        {
-            devConfig = new Dictionary<string, string>();
-
-            try
-            {
-                string configPath = GetConfigPath();
-                string folderPath = Path.GetDirectoryName(configPath);
-                if (!Directory.Exists(folderPath))
-                    Directory.CreateDirectory(folderPath);
-
-                if (File.Exists(configPath))
-                {
-                    using (FileStream stream = File.OpenRead(configPath))
-                    {
-                        using (BinaryReader reader = new BinaryReader(stream))
-                        {
-                            while (reader.BaseStream.Position < reader.BaseStream.Length)
-                            {
-                                string key = reader.ReadString();
-                                string val = reader.ReadString();
-                                devConfig[key] = val;
-                            }
-                        }
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                DiagManager.Instance.LogError(ex);
-            }
-        }
-
-
-        private static void saveConfig()
-        {
-            //save whole file
-            try
-            {
-                using (var writer = new BinaryWriter(new FileStream(GetConfigPath(), FileMode.Create, FileAccess.Write, FileShare.None)))
-                {
-                    foreach (string curKey in devConfig.Keys)
-                    {
-                        writer.Write(curKey);
-                        writer.Write(devConfig[curKey]);
-                    }
-                }
-            }
-            catch (IOException ioEx)
-            {
-                DiagManager.Instance.LogError(ioEx, false);
-            }
-            catch (Exception ex)
-            {
-                DiagManager.Instance.LogError(ex);
-            }
-        }
-
-        public static string GetConfig(string key, string def)
-        {
-            string val;
-            if (devConfig.TryGetValue(key, out val))
-                return val;
-            return def;
-        }
-
-        public static int GetConfig(string key, int def)
-        {
-            string val;
-            if (devConfig.TryGetValue(key, out val))
-            {
-                int result;
-                if (Int32.TryParse(val, out result))
-                    return result;
-            }
-            return def;
-        }
-
-        public static void SetConfig(string key, int val)
-        {
-            SetConfig(key, val.ToString());
-        }
-
-        public static void SetConfig(string key, string val)
-        {
-            if (val == null && devConfig.ContainsKey(key))
-                devConfig.Remove(key);
-            else
-                devConfig[key] = val;
-
-            canSave = true;
-        }
-
-        public static string GetConfigPath()
-        {
-            //https://jimrich.sk/environment-specialfolder-on-windows-linux-and-os-x/
-            //MacOS actually uses a different folder for config data, traditionally
-            //I guess it's the odd one out...
-            if (OperatingSystem.IsMacOS())
-                return PathMod.FromApp("./devConfig");//Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Personal), "/Library/Application Support/RogueEssence/config");
-            else
-                return PathMod.FromApp("./devConfig");//Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "RogueEssence /devConfig");
-        }
-        
-        
-    public static readonly StyledProperty<GridLength> CaptionHeightProperty =
-        AvaloniaProperty.Register<DevForm, GridLength>(nameof(CaptionHeight));
-
-    public GridLength CaptionHeight
-    {
-        get => GetValue(CaptionHeightProperty);
-        set => SetValue(CaptionHeightProperty, value);
-    }
-
-    public static readonly StyledProperty<bool> HasLeftCaptionButtonProperty =
-        AvaloniaProperty.Register<DevForm, bool>(nameof(HasLeftCaptionButton));
-
-    public bool HasLeftCaptionButton
-    {
-        get => GetValue(HasLeftCaptionButtonProperty);
-        set => SetValue(HasLeftCaptionButtonProperty, value);
-    }
-
-    public bool HasRightCaptionButton
-    {
-        get
-        {
-            if (OperatingSystem.IsLinux())
-                return !Native.OS.UseSystemWindowFrame;
-
-            return OperatingSystem.IsWindows();
-        }
-    }
-    
-    
-    
-    public DevForm()
-    {
-        
-        if (OperatingSystem.IsMacOS())
-        {
-            HasLeftCaptionButton = true;
-            CaptionHeight = new GridLength(34);
-            ExtendClientAreaChromeHints =
-                ExtendClientAreaChromeHints.SystemChrome | ExtendClientAreaChromeHints.OSXThickTitleBar;
-        }
-        else if (UseSystemWindowFrame)
-        {
-            CaptionHeight = new GridLength(30);
-        }
-        else
-        {
-            CaptionHeight = new GridLength(38);
-        }
-        
-        InitializeComponent();
-    }
-    
-    protected override void OnDataContextChanged(EventArgs e)
-    {
-        base.OnDataContextChanged(e);
-        if (DataContext is DevFormViewModel vm)
-        {
-            vm.ModSwitcherClosed += () => ModSwitcherFlyoutButton.Flyout?.Hide();;
-        }
-    }
-    
-    private void ModSwitcherFlyout_OnOpened(object? sender, EventArgs e)
-    {
-        if (DataContext is DevFormViewModel vm)
-        {
-            vm.OnModSwitcherOpened();
-        }
-    }
-    
-    private void ModSwitcherFlyout_OnClosed(object? sender, EventArgs e)
-    {
-        if (DataContext is DevFormViewModel vm)
-        {
-            vm.OnModSwitcherClosed();
-            // ModSwitcherFlyoutButton.Flyout?.Hide();
-        }
-    }
-    
-    protected override void OnClosing(WindowClosingEventArgs e)
-    {
-        base.OnClosing(e);
-
-        if (!Design.IsDesignMode && DataContext is ViewModels.DevFormViewModel)
-        {
-            PreferencesWindowViewModel.Instance.Save();
-        }
-    }
-    
-    private void ShowDataItemNodeMenu(TreeDataGridRow current, DataItemNode node, DataRootNode parentNode,
-        ContextRequestedEventArgs e)
-    {
-        
-        var contextMenu = ContextMenuHelper.CreateDataItemMenu(parentNode, node.ItemKey);
-
-        // contextMenu.Open(this);
-        
-        // var menu = new ContextMenu
-        // {
-        //     Items =
-        //     {
-        //         new MenuItem { Header = "Resave as File", Command = parentNode.ResaveItemAsFile, CommandParameter = node.ItemKey, Icon = App.CreateMenuIcon("Icons.FileFill") },
-        //         new MenuItem
-        //             { Header = "Resave as Patch", Command = parentNode.ResaveAsPatch, CommandParameter = node, Icon = App.CreateMenuIcon("Icons.FileTextFill") },
-        //         new Separator(),
-        //         new MenuItem { Header = "Edit", Icon = App.CreateMenuIcon("Icons.PencilFill") },
-        //         new MenuItem { Header = "Delete", Command = parentNode.DeleteCommand, CommandParameter = node,  Icon = App.CreateMenuIcon("Icons.TrashFill") }
-        //     }
-        // };
-        
-        AttachAndOpenMenu(current, contextMenu, e);
-    }
-    
-    private void ShowRootNodeMenu(TreeDataGridRow current, DataRootNode root, ContextRequestedEventArgs e)
-    {
-        var menu = ContextMenuHelper.CreateDataRootMenu(root);
-        AttachAndOpenMenu(current, menu, e);
-    }
-    
-    private void ShowUniversalNodeMenu(TreeDataGridRow current, UniversalNode node, ContextRequestedEventArgs e)
-    {
-        var menu = ContextMenuHelper.CreateUniversalRootMenu(node);
-        AttachAndOpenMenu(current, menu, e);
-    }
-    
-    private void ShowSpriteRootNodeMenu(TreeDataGridRow current, SpriteRootNode root, ContextRequestedEventArgs e)
-    {
-     //    var menu = new ContextMenu
-     //    {
-     //        Items =
-     //        {
-     //            new MenuItem { Header = "Mass Import", Command = root.MassImportCommand, Icon = App.CreateMenuIcon("Icons.DownloadSimpleFill") },
-     //            new MenuItem { Header = "Mass Export", Command = root.MassExportCommand, Icon = App.CreateMenuIcon("Icons.ExportFill") },
-     //            
-     //            
-     // ,
-     //            // new MenuItem { Header = "Import", Command = root.ImportCommand, Icon = App.CreateMenuIcon("Icons.Plus") },
-     //            // new MenuItem { Header = "Re-Import", Command = root.ReImportCommand, Icon = App.CreateMenuIcon("Icons.RepeatFill") },
-     //            // new MenuItem { Header = "Add", Command = root.AddCommand,  Icon = App.CreateMenuIcon("Icons.Plus") }
-     //        }
-     //    };
-
-        var menu = ContextMenuHelper.CreateSpriteRootMenu(root);
-        
-        AttachAndOpenMenu(current, menu, e);
-    }
-
-    private void AttachAndOpenMenu(TreeDataGridRow current, ContextMenu menu, ContextRequestedEventArgs e)
-    {
-        menu.Closed += (_, _) => LeftTreeDataGrid.ContextMenu = null;
-        LeftTreeDataGrid.ContextMenu = menu;
-        menu.Open(LeftTreeDataGrid);
-        e.Handled = true;
-    }
-    
-    private void LeftTreeDataGrid_OnDoubleTapped(object? sender, TappedEventArgs e)
-    {
-        if (DataContext is DevFormViewModel vm && sender is TreeDataGrid treeView)
-        {
-            var selectedItem = (OpenEditorNode)treeView.RowSelection.SelectedItem;
-            if (selectedItem != null && selectedItem.EditorType != typeof(EmptyPageViewModel))
-            {
-                vm.AddPageFromTreeNode(selectedItem);
-            }
-
-        }
-    }
-    
-    private void LeftTreeDataGrid_OnContextRequested(object? sender, ContextRequestedEventArgs e)
-    {
-        if (e.Source is not Visual visual)
-            return;
-    
-        var row = visual.GetSelfAndVisualAncestors()
-            .OfType<TreeDataGridRow>()
-            .FirstOrDefault();
-    
-        if (row == null)
-            return;
-        
-        if (row.DataContext is not NodeBase node)
-            return;
-        
-        var parent = node.Parent;
-        
-        switch (node)
-        {
-            case DataItemNode itemNode when parent is DataRootNode root:
-                ShowDataItemNodeMenu(row, itemNode, root, e);
-                break;
-    
-            // case DataItemNode itemNode when parent is SpriteRootNode spriteRoot:
-            //     ShowSpriteItemNodeMenu(row, itemNode, spriteRoot, e);
-            //     break;
-            //
-            case DataRootNode rootNode:
-                ShowRootNodeMenu(row, rootNode, e);
-                break;
-            
-            case UniversalNode universalNode:
-                ShowUniversalNodeMenu(row, universalNode, e);
-                break;
-    
-            case SpriteRootNode spriteRoot:
-                ShowSpriteRootNodeMenu(row, spriteRoot, e);
-                break;
-        }
-    }
-
-    private async void LeftTreeDataGrid_OnLoaded(object sender, RoutedEventArgs e)
-    {
-    }
-
-    // Show the sprite in-game when the user clicks on the sprite node in the tree
-    private void LeftTreeDataGrid_OnPointerPressed(object? sender, PointerPressedEventArgs e)
-    {
-        if (sender is not TreeDataGrid treeDataGrid)
-            return;
-        
-        var point = e.GetPosition(treeDataGrid);
-        var visual = treeDataGrid.InputHitTest(point);
-        
-        var element = visual as Control;
-        while (element != null && element is not TreeDataGridRow)
-        {
-            element = element.Parent as Control;
-        }
-    
-        if (DungeonScene.Instance == null)
-            return;
-
-        GraphicsManager.AssetType debugAsset = GraphicsManager.AssetType.None;
-        string? debugAnim = null;
-        
-        if (element is TreeDataGridRow row &&
-            row.DataContext is DataItemNode node &&
-            node.Parent is SpriteRootNode parent &&
-            parent.AssetType.IsAnimEdit())
-        {
-            debugAsset = parent.AssetType;
-            debugAnim = node.ItemKey;
-        }
-
-        lock (GameBase.lockObj)
-        {
-            DungeonScene.Instance.DebugAsset = debugAsset;
-            DungeonScene.Instance.DebugAnim = debugAnim;
-        }
-
-    }
-
-    private void LeftTreeDataGrid_OnLostFocus(object sender, RoutedEventArgs e)
-    {
-        
-        if (sender is not TreeDataGrid grid)
-            return;
-        
-        
-        if (grid.IsKeyboardFocusWithin)
-            return;
-        
-        if (grid.ContextMenu?.IsOpen == true)
-            return;
-        
-        var window = grid.GetVisualRoot() as Window;
-        if (window is { IsActive: false })
-            return; 
-        // (grid.RowSelection.SelectedItem as DataItemNode)?.Parent?.ResaveAsFile(grid.RowSelection.SelectedItem as DataItemNode)
-        // Not sure why it doesn't clear the grid...
-        grid.RowSelection.Clear();
-        
-        lock (GameBase.lockObj)
-        {
-            if (DungeonScene.Instance != null)
-            {
-                DungeonScene.Instance.DebugAsset = GraphicsManager.AssetType.None;
-                DungeonScene.Instance.DebugAnim = null;
-            }
-        }
-    }
-
-}
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/ModConfigWindowView.axaml b/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/ModConfigWindowView.axaml
deleted file mode 100644
index 82f952c5..00000000
--- a/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/ModConfigWindowView.axaml
+++ /dev/null
@@ -1,122 +0,0 @@
-<v:ChromelessWindow xmlns="https://github.com/avaloniaui"
-                    xmlns:vm="clr-namespace:RogueEssence.Dev.ViewModels;assembly=RogueEssence.Editor.Avalonia"
-                    xmlns:views="clr-namespace:RogueEssence.Dev.Views"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-                    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-                    xmlns:v="using:RogueEssence.Dev.Views"
-                    mc:Ignorable="d"
-                    x:Name="ThisControl"
-                    x:Class="RogueEssence.Dev.Views.ModConfigWindowView"
-                    Title="Mod Config" Width="420" Height="600">
-    <Design.DataContext>
-        <vm:ModConfigWindowViewModel />
-    </Design.DataContext>
-    <Grid RowDefinitions="Auto,*,Auto">
-        <!-- TitleBar -->
-        <Grid Grid.Row="0" Height="28" IsVisible="{Binding !#ThisControl.UseSystemWindowFrame}">
-            <Border Background="{DynamicResource Brush.TitleBar}"
-                    BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border0}"
-                    PointerPressed="BeginMoveWindow" />
-
-            <Path Width="14" Height="14"
-                  Margin="10,0,0,0"
-                  HorizontalAlignment="Left"
-                  Data="{StaticResource Icons.SoftwareUpdate}"
-                  IsVisible="{OnPlatform True, macOS=False}" />
-
-            <TextBlock Classes="bold"
-                       Text="{Binding #ThisControl.Title}"
-                       HorizontalAlignment="Center" VerticalAlignment="Center"
-                       IsHitTestVisible="False" />
-
-            <v:CaptionButtons HorizontalAlignment="Right"
-                              IsCloseButtonOnly="True"
-                              IsVisible="{OnPlatform True, macOS=False}" />
-
-        </Grid>
-
-        <ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled">
-            <Grid Margin="4" RowDefinitions="Auto, Auto">
-                <Grid RowDefinitions="36, 36, 36, 80" ColumnDefinitions="72, *">
-                    <TextBlock Margin="4,2" Text="Name:" VerticalAlignment="Center" HorizontalAlignment="Right" />
-                    <Grid Grid.Row="0" Grid.Column="1">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition />
-                            <ColumnDefinition Width="48" />
-                            <ColumnDefinition Width="90" />
-                        </Grid.ColumnDefinitions>
-                        <TextBox Text="{Binding Name}" VerticalAlignment="Center" Margin="4" />
-                        <TextBlock Margin="4,2" Text="Type:" VerticalAlignment="Center" HorizontalAlignment="Right"
-                                   Grid.Column="1" />
-                        <views:SearchComboBox Margin="4,2" ItemsSource="{Binding ModTypes}"
-                                              SelectedIndex="{Binding ChosenModType}" Grid.Column="2" />
-                    </Grid>
-
-                    <TextBlock Margin="4,2" Text="Namespace:" VerticalAlignment="Center" HorizontalAlignment="Right"
-                               Grid.Row="1" />
-                    <Grid Grid.Row="1" Grid.Column="1">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition />
-                            <ColumnDefinition Width="48" />
-                            <ColumnDefinition Width="72" />
-                        </Grid.ColumnDefinitions>
-                        <TextBox Text="{Binding Namespace}" VerticalAlignment="Center" Margin="4" />
-                        <TextBlock Margin="4,2" Text="Version:" VerticalAlignment="Center" HorizontalAlignment="Right"
-                                   Grid.Column="1" />
-                        <TextBox Text="{Binding Version}" VerticalAlignment="Center" Margin="4" Grid.Column="2" />
-                    </Grid>
-
-                    <TextBlock Margin="4,2" Text="Author:" VerticalAlignment="Center" HorizontalAlignment="Right"
-                               Grid.Row="2" />
-                    <TextBox Text="{Binding Author}" VerticalAlignment="Center" Margin="4" Grid.Row="2" Grid.Column="1" />
-                    <TextBlock Margin="4,2" Text="Description:" VerticalAlignment="Top" HorizontalAlignment="Right"
-                               Grid.Row="3" />
-                    <TextBox Text="{Binding Description}" VerticalAlignment="Stretch" VerticalContentAlignment="Top"
-                             AcceptsReturn="True" Margin="4" Grid.Row="3" Grid.Column="1" />
-                </Grid>
-
-                <Expander Grid.Row="1"
-                          HorizontalAlignment="Stretch"
-                          VerticalAlignment="Top"
-                          HorizontalContentAlignment="Stretch">
-                    <Expander.Header>
-                        <Label Content="Advanced"></Label>
-                    </Expander.Header>
-                    <Grid RowDefinitions="36, 36, Auto" ColumnDefinitions="80, *">
-                        <TextBlock Margin="4,2" Text="UUID:" VerticalAlignment="Center" HorizontalAlignment="Right"
-                                   Grid.Row="0" />
-                        <Grid Grid.Row="0" Grid.Column="1">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition />
-                                <ColumnDefinition Width="64" />
-                            </Grid.ColumnDefinitions>
-                            <TextBox Text="{Binding UUID}" IsReadOnly="True" VerticalAlignment="Center" Margin="4" />
-                            <Button Command="{Binding btnRegenUUID_Click}" Margin="4" Grid.Column="1">Regen</Button>
-                        </Grid>
-
-                        <TextBlock Margin="4,2" Text="Game Version:" VerticalAlignment="Center"
-                                   HorizontalAlignment="Right"
-                                   Grid.Row="1" />
-                        <TextBox Text="{Binding GameVersion}" VerticalAlignment="Center" Margin="4" Grid.Row="1"
-                                 Grid.Column="1" />
-
-                        <TextBlock Margin="4,6,4,2" VerticalAlignment="Top" HorizontalAlignment="Right" Grid.Row="2">Relations:</TextBlock>
-                        <views:CollectionBox DataContext="{Binding Relationships}" Margin="4" Grid.Row="2"
-                                             Grid.Column="1" MinHeight="150" />
-
-                    </Grid>
-                </Expander>
-            </Grid>
-        </ScrollViewer>
-
-        <Grid Grid.Row="2" Margin="4">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition />
-                <ColumnDefinition />
-            </Grid.ColumnDefinitions>
-            <Button Classes="flat" Click="btnOK_Click" Margin="4" Grid.Column="0">OK</Button>
-            <Button Classes="flat" Click="btnCancel_Click" Margin="4" Grid.Column="1">Cancel</Button>
-        </Grid>
-    </Grid>
-</v:ChromelessWindow>
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/ModConfigWindowView.axaml.cs b/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/ModConfigWindowView.axaml.cs
deleted file mode 100644
index 8b519be6..00000000
--- a/RogueEssence.Editor.Avalonia/Views/New/DialogBoxes/ModConfigWindowView.axaml.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Interactivity;
-using Avalonia.Markup.Xaml;
-using RogueEssence.Dev.ViewModels;
-using System;
-
-namespace RogueEssence.Dev.Views
-{
-    public partial class ModConfigWindowView : ChromelessWindow
-    {
-        public ModConfigWindowView()
-        {
-            this.InitializeComponent();
-        }
-
-        public async void btnOK_Click(object sender, RoutedEventArgs e)
-        {
-            ModConfigWindowViewModel vm = (ModConfigWindowViewModel)DataContext;
-            try
-            {
-                if (String.IsNullOrWhiteSpace(Text.Sanitize(vm.Name)))
-                    throw new InvalidOperationException("Invalid Name");
-                if (String.IsNullOrWhiteSpace(Text.Sanitize(vm.Namespace).ToLower()))
-                    throw new InvalidOperationException("Invalid Namespace");
-
-                Guid uuid = Guid.Parse(vm.UUID);
-                if (uuid == Guid.Empty)
-                    throw new InvalidOperationException("Invalid UUID");
-
-                Version.Parse(vm.Version);
-                Version.Parse(vm.GameVersion);
-
-                if (vm.ChosenModType < 0 || vm.ChosenModType >= (int)PathMod.ModType.Count)
-                    throw new InvalidOperationException("Invalid ModType");
-            }
-            catch (Exception ex)
-            {
-                DiagManager.Instance.LogError(ex, false);
-                await MessageBox.Show(this, ex.Message, "Invalid Input", MessageBox.MessageBoxButtons.Ok);
-                return;
-            }
-
-            this.Close(true);
-        }
-
-
-        public void btnCancel_Click(object sender, RoutedEventArgs e)
-        {
-            this.Close(false);
-        }
-    }
-}
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/DataListPageView.axaml b/RogueEssence.Editor.Avalonia/Views/Pages/DataListPageView.axaml
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/New/Editors/DataListPageView.axaml
rename to RogueEssence.Editor.Avalonia/Views/Pages/DataListPageView.axaml
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/DataListPageView.axaml.cs b/RogueEssence.Editor.Avalonia/Views/Pages/DataListPageView.axaml.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/New/Editors/DataListPageView.axaml.cs
rename to RogueEssence.Editor.Avalonia/Views/Pages/DataListPageView.axaml.cs
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/DevControl/DevControlView.axaml b/RogueEssence.Editor.Avalonia/Views/Pages/DevControlPage/DevControlPageView.axaml
similarity index 50%
rename from RogueEssence.Editor.Avalonia/Views/New/Editors/DevControl/DevControlView.axaml
rename to RogueEssence.Editor.Avalonia/Views/Pages/DevControlPage/DevControlPageView.axaml
index df211e0a..39cd2e7c 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/Editors/DevControl/DevControlView.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/Pages/DevControlPage/DevControlPageView.axaml
@@ -6,41 +6,14 @@
              xmlns:views="clr-namespace:RogueEssence.Dev.Views"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              FontSize="12"
-             x:DataType="vm:DevControlViewModel"
-             x:Class="RogueEssence.Dev.Views.DevControlView">
+             x:DataType="vm:DevControlPageViewModel"
+             x:Class="RogueEssence.Dev.Views.DevControlPageView">
     
     
     <Design.DataContext>
-        <vm:DevControlViewModel/>
+        <vm:DevControlPageViewModel/>
     </Design.DataContext>
-    <!-- The Game/Player/Travel/Script Tabs will be moved inside here... -->
-
     
-    <!-- <Style Selector="Button.flat"> -->
-    <!--     <Setter Property="BorderThickness" Value="1" /> -->
-    <!--     <Setter Property="BorderBrush" Value="{DynamicResource Brush.Border2}" /> -->
-    <!--     <Setter Property="TextBlock.TextAlignment" Value="Center" /> -->
-    <!--     <Setter Property="Foreground" Value="{DynamicResource Brush.FG1}" /> -->
-    <!--     <Setter Property="Background" Value="{DynamicResource Brush.FlatButton.Background}" /> -->
-    <!--     <Setter Property="VerticalContentAlignment" Value="Center" /> -->
-    <!--     <Setter Property="Template"> -->
-    <!--         <ControlTemplate> -->
-    <!--             <Grid> -->
-    <!--                 <Border x:Name="PART_Border" -->
-    <!--                         Background="{TemplateBinding Background}" -->
-    <!--                         BorderBrush="{TemplateBinding BorderBrush}" -->
-    <!--                         BorderThickness="{TemplateBinding BorderThickness}" -->
-    <!--                         CornerRadius="{TemplateBinding CornerRadius}" /> -->
-    <!-- -->
-    <!--                 <ContentPresenter x:Name="PART_ContentPresenter" -->
-    <!--                                   Background="Transparent" -->
-    <!--                                   Padding="{TemplateBinding Padding}" -->
-    <!--                                   Content="{TemplateBinding Content}" -->
-    <!--                                   ContentTemplate="{TemplateBinding ContentTemplate}" -->
-    <!--                                   HorizontalContentAlignment="Center" -->
-    <!--                                   VerticalContentAlignment="Center" /> -->
-    <!--                  -->
-                    
     <UserControl.Styles>
         <Style Selector="Button">
             <Setter Property="Padding" Value="10"></Setter>
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/DevControl/DevControlView.axaml.cs b/RogueEssence.Editor.Avalonia/Views/Pages/DevControlPage/DevControlPageView.axaml.cs
similarity index 63%
rename from RogueEssence.Editor.Avalonia/Views/New/Editors/DevControl/DevControlView.axaml.cs
rename to RogueEssence.Editor.Avalonia/Views/Pages/DevControlPage/DevControlPageView.axaml.cs
index ad91f432..391a9130 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/Editors/DevControl/DevControlView.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/Pages/DevControlPage/DevControlPageView.axaml.cs
@@ -4,9 +4,9 @@
 
 namespace RogueEssence.Dev.Views;
 
-public partial class DevControlView : UserControl
+public partial class DevControlPageView : UserControl
 {
-    public DevControlView()
+    public DevControlPageView()
     {
         InitializeComponent();
     }
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/DevControl/DevTabGame.axaml b/RogueEssence.Editor.Avalonia/Views/Pages/DevControlPage/DevTabGame.axaml
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/New/Editors/DevControl/DevTabGame.axaml
rename to RogueEssence.Editor.Avalonia/Views/Pages/DevControlPage/DevTabGame.axaml
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/DevControl/DevTabGame.axaml.cs b/RogueEssence.Editor.Avalonia/Views/Pages/DevControlPage/DevTabGame.axaml.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/New/Editors/DevControl/DevTabGame.axaml.cs
rename to RogueEssence.Editor.Avalonia/Views/Pages/DevControlPage/DevTabGame.axaml.cs
diff --git a/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabPlayer.axaml b/RogueEssence.Editor.Avalonia/Views/Pages/DevControlPage/DevTabPlayer.axaml
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/DevForm/DevTabPlayer.axaml
rename to RogueEssence.Editor.Avalonia/Views/Pages/DevControlPage/DevTabPlayer.axaml
diff --git a/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabPlayer.axaml.cs b/RogueEssence.Editor.Avalonia/Views/Pages/DevControlPage/DevTabPlayer.axaml.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/DevForm/DevTabPlayer.axaml.cs
rename to RogueEssence.Editor.Avalonia/Views/Pages/DevControlPage/DevTabPlayer.axaml.cs
diff --git a/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabScript.axaml b/RogueEssence.Editor.Avalonia/Views/Pages/DevControlPage/DevTabScript.axaml
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/DevForm/DevTabScript.axaml
rename to RogueEssence.Editor.Avalonia/Views/Pages/DevControlPage/DevTabScript.axaml
diff --git a/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabScript.axaml.cs b/RogueEssence.Editor.Avalonia/Views/Pages/DevControlPage/DevTabScript.axaml.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/DevForm/DevTabScript.axaml.cs
rename to RogueEssence.Editor.Avalonia/Views/Pages/DevControlPage/DevTabScript.axaml.cs
diff --git a/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabTravel.axaml b/RogueEssence.Editor.Avalonia/Views/Pages/DevControlPage/DevTabTravel.axaml
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/DevForm/DevTabTravel.axaml
rename to RogueEssence.Editor.Avalonia/Views/Pages/DevControlPage/DevTabTravel.axaml
diff --git a/RogueEssence.Editor.Avalonia/Views/DevForm/DevTabTravel.axaml.cs b/RogueEssence.Editor.Avalonia/Views/Pages/DevControlPage/DevTabTravel.axaml.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/DevForm/DevTabTravel.axaml.cs
rename to RogueEssence.Editor.Avalonia/Views/Pages/DevControlPage/DevTabTravel.axaml.cs
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/DevEditPageView.axaml b/RogueEssence.Editor.Avalonia/Views/Pages/DevEditPageView.axaml
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/New/Editors/DevEditPageView.axaml
rename to RogueEssence.Editor.Avalonia/Views/Pages/DevEditPageView.axaml
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/DevEditPageView.axaml.cs b/RogueEssence.Editor.Avalonia/Views/Pages/DevEditPageView.axaml.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/New/Editors/DevEditPageView.axaml.cs
rename to RogueEssence.Editor.Avalonia/Views/Pages/DevEditPageView.axaml.cs
diff --git a/RogueEssence.Editor.Avalonia/Views/GroundEditForm/EntityBrowser.axaml b/RogueEssence.Editor.Avalonia/Views/Pages/GroundEditPage/EntityBrowser.axaml
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/GroundEditForm/EntityBrowser.axaml
rename to RogueEssence.Editor.Avalonia/Views/Pages/GroundEditPage/EntityBrowser.axaml
diff --git a/RogueEssence.Editor.Avalonia/Views/GroundEditForm/EntityBrowser.axaml.cs b/RogueEssence.Editor.Avalonia/Views/Pages/GroundEditPage/EntityBrowser.axaml.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/GroundEditForm/EntityBrowser.axaml.cs
rename to RogueEssence.Editor.Avalonia/Views/Pages/GroundEditPage/EntityBrowser.axaml.cs
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/GroundEditorPageView.axaml b/RogueEssence.Editor.Avalonia/Views/Pages/GroundEditPage/GroundEditPageView.axaml
similarity index 94%
rename from RogueEssence.Editor.Avalonia/Views/New/Editors/GroundEditorPageView.axaml
rename to RogueEssence.Editor.Avalonia/Views/Pages/GroundEditPage/GroundEditPageView.axaml
index e212d178..7a910de6 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/Editors/GroundEditorPageView.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/Pages/GroundEditPage/GroundEditPageView.axaml
@@ -6,11 +6,11 @@
              xmlns:views="clr-namespace:RogueEssence.Dev.Views"
              xmlns:converters="clr-namespace:RogueEssence.Dev.Converters"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:DataType="vm:GroundEditorPageViewModel"
-             x:Class="RogueEssence.Dev.Views.GroundEditorPageView">
+             x:DataType="vm:GroundEditPageViewModel"
+             x:Class="RogueEssence.Dev.Views.GroundEditPageView">
 
   <Design.DataContext>
-    <vm:GroundEditorPageViewModel></vm:GroundEditorPageViewModel>
+    <vm:GroundEditPageViewModel></vm:GroundEditPageViewModel>
   </Design.DataContext>
   <UserControl.Resources>
     <converters:FileToTitleConverter x:Key="FileToTitleConverter"/>
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/GroundEditorPageView.axaml.cs b/RogueEssence.Editor.Avalonia/Views/Pages/GroundEditPage/GroundEditPageView.axaml.cs
similarity index 62%
rename from RogueEssence.Editor.Avalonia/Views/New/Editors/GroundEditorPageView.axaml.cs
rename to RogueEssence.Editor.Avalonia/Views/Pages/GroundEditPage/GroundEditPageView.axaml.cs
index b40dad9b..29b6a760 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/Editors/GroundEditorPageView.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/Pages/GroundEditPage/GroundEditPageView.axaml.cs
@@ -4,9 +4,9 @@
 
 namespace RogueEssence.Dev.Views;
 
-public partial class GroundEditorPageView : UserControl
+public partial class GroundEditPageView : UserControl
 {
-    public GroundEditorPageView()
+    public GroundEditPageView()
     {
         InitializeComponent();
     }
diff --git a/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabDecorations.axaml b/RogueEssence.Editor.Avalonia/Views/Pages/GroundEditPage/GroundTabDecorations.axaml
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabDecorations.axaml
rename to RogueEssence.Editor.Avalonia/Views/Pages/GroundEditPage/GroundTabDecorations.axaml
diff --git a/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabDecorations.axaml.cs b/RogueEssence.Editor.Avalonia/Views/Pages/GroundEditPage/GroundTabDecorations.axaml.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabDecorations.axaml.cs
rename to RogueEssence.Editor.Avalonia/Views/Pages/GroundEditPage/GroundTabDecorations.axaml.cs
diff --git a/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabEntities.axaml b/RogueEssence.Editor.Avalonia/Views/Pages/GroundEditPage/GroundTabEntities.axaml
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabEntities.axaml
rename to RogueEssence.Editor.Avalonia/Views/Pages/GroundEditPage/GroundTabEntities.axaml
diff --git a/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabEntities.axaml.cs b/RogueEssence.Editor.Avalonia/Views/Pages/GroundEditPage/GroundTabEntities.axaml.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabEntities.axaml.cs
rename to RogueEssence.Editor.Avalonia/Views/Pages/GroundEditPage/GroundTabEntities.axaml.cs
diff --git a/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabProperties.axaml b/RogueEssence.Editor.Avalonia/Views/Pages/GroundEditPage/GroundTabProperties.axaml
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabProperties.axaml
rename to RogueEssence.Editor.Avalonia/Views/Pages/GroundEditPage/GroundTabProperties.axaml
diff --git a/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabProperties.axaml.cs b/RogueEssence.Editor.Avalonia/Views/Pages/GroundEditPage/GroundTabProperties.axaml.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabProperties.axaml.cs
rename to RogueEssence.Editor.Avalonia/Views/Pages/GroundEditPage/GroundTabProperties.axaml.cs
diff --git a/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabScript.axaml b/RogueEssence.Editor.Avalonia/Views/Pages/GroundEditPage/GroundTabScript.axaml
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabScript.axaml
rename to RogueEssence.Editor.Avalonia/Views/Pages/GroundEditPage/GroundTabScript.axaml
diff --git a/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabScript.axaml.cs b/RogueEssence.Editor.Avalonia/Views/Pages/GroundEditPage/GroundTabScript.axaml.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabScript.axaml.cs
rename to RogueEssence.Editor.Avalonia/Views/Pages/GroundEditPage/GroundTabScript.axaml.cs
diff --git a/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabStrings.axaml b/RogueEssence.Editor.Avalonia/Views/Pages/GroundEditPage/GroundTabStrings.axaml
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabStrings.axaml
rename to RogueEssence.Editor.Avalonia/Views/Pages/GroundEditPage/GroundTabStrings.axaml
diff --git a/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabStrings.axaml.cs b/RogueEssence.Editor.Avalonia/Views/Pages/GroundEditPage/GroundTabStrings.axaml.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabStrings.axaml.cs
rename to RogueEssence.Editor.Avalonia/Views/Pages/GroundEditPage/GroundTabStrings.axaml.cs
diff --git a/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabTextures.axaml b/RogueEssence.Editor.Avalonia/Views/Pages/GroundEditPage/GroundTabTextures.axaml
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabTextures.axaml
rename to RogueEssence.Editor.Avalonia/Views/Pages/GroundEditPage/GroundTabTextures.axaml
diff --git a/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabTextures.axaml.cs b/RogueEssence.Editor.Avalonia/Views/Pages/GroundEditPage/GroundTabTextures.axaml.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabTextures.axaml.cs
rename to RogueEssence.Editor.Avalonia/Views/Pages/GroundEditPage/GroundTabTextures.axaml.cs
diff --git a/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabWalls.axaml b/RogueEssence.Editor.Avalonia/Views/Pages/GroundEditPage/GroundTabWalls.axaml
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabWalls.axaml
rename to RogueEssence.Editor.Avalonia/Views/Pages/GroundEditPage/GroundTabWalls.axaml
diff --git a/RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabWalls.axaml.cs b/RogueEssence.Editor.Avalonia/Views/Pages/GroundEditPage/GroundTabWalls.axaml.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/GroundEditForm/GroundTabWalls.axaml.cs
rename to RogueEssence.Editor.Avalonia/Views/Pages/GroundEditPage/GroundTabWalls.axaml.cs
diff --git a/RogueEssence.Editor.Avalonia/Views/GroundEditForm/Layers/AnimLayerWindow.axaml b/RogueEssence.Editor.Avalonia/Views/Pages/GroundEditPage/Layers/AnimLayerWindow.axaml
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/GroundEditForm/Layers/AnimLayerWindow.axaml
rename to RogueEssence.Editor.Avalonia/Views/Pages/GroundEditPage/Layers/AnimLayerWindow.axaml
diff --git a/RogueEssence.Editor.Avalonia/Views/GroundEditForm/Layers/AnimLayerWindow.axaml.cs b/RogueEssence.Editor.Avalonia/Views/Pages/GroundEditPage/Layers/AnimLayerWindow.axaml.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/GroundEditForm/Layers/AnimLayerWindow.axaml.cs
rename to RogueEssence.Editor.Avalonia/Views/Pages/GroundEditPage/Layers/AnimLayerWindow.axaml.cs
diff --git a/RogueEssence.Editor.Avalonia/Views/GroundEditForm/Layers/EntityLayerWindow.axaml b/RogueEssence.Editor.Avalonia/Views/Pages/GroundEditPage/Layers/EntityLayerWindow.axaml
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/GroundEditForm/Layers/EntityLayerWindow.axaml
rename to RogueEssence.Editor.Avalonia/Views/Pages/GroundEditPage/Layers/EntityLayerWindow.axaml
diff --git a/RogueEssence.Editor.Avalonia/Views/GroundEditForm/Layers/EntityLayerWindow.axaml.cs b/RogueEssence.Editor.Avalonia/Views/Pages/GroundEditPage/Layers/EntityLayerWindow.axaml.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/GroundEditForm/Layers/EntityLayerWindow.axaml.cs
rename to RogueEssence.Editor.Avalonia/Views/Pages/GroundEditPage/Layers/EntityLayerWindow.axaml.cs
diff --git a/RogueEssence.Editor.Avalonia/Views/GroundEditForm/Layers/GroundLayerWindow.axaml b/RogueEssence.Editor.Avalonia/Views/Pages/GroundEditPage/Layers/GroundLayerWindow.axaml
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/GroundEditForm/Layers/GroundLayerWindow.axaml
rename to RogueEssence.Editor.Avalonia/Views/Pages/GroundEditPage/Layers/GroundLayerWindow.axaml
diff --git a/RogueEssence.Editor.Avalonia/Views/GroundEditForm/Layers/GroundLayerWindow.axaml.cs b/RogueEssence.Editor.Avalonia/Views/Pages/GroundEditPage/Layers/GroundLayerWindow.axaml.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/GroundEditForm/Layers/GroundLayerWindow.axaml.cs
rename to RogueEssence.Editor.Avalonia/Views/Pages/GroundEditPage/Layers/GroundLayerWindow.axaml.cs
diff --git a/RogueEssence.Editor.Avalonia/Views/GroundEditForm/Layers/MapLayerWindow.axaml b/RogueEssence.Editor.Avalonia/Views/Pages/GroundEditPage/Layers/MapLayerWindow.axaml
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/GroundEditForm/Layers/MapLayerWindow.axaml
rename to RogueEssence.Editor.Avalonia/Views/Pages/GroundEditPage/Layers/MapLayerWindow.axaml
diff --git a/RogueEssence.Editor.Avalonia/Views/GroundEditForm/Layers/MapLayerWindow.axaml.cs b/RogueEssence.Editor.Avalonia/Views/Pages/GroundEditPage/Layers/MapLayerWindow.axaml.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/GroundEditForm/Layers/MapLayerWindow.axaml.cs
rename to RogueEssence.Editor.Avalonia/Views/Pages/GroundEditPage/Layers/MapLayerWindow.axaml.cs
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/MapEditorPageView.axaml b/RogueEssence.Editor.Avalonia/Views/Pages/MapEditPage/MapEditPageView.axaml
similarity index 95%
rename from RogueEssence.Editor.Avalonia/Views/New/Editors/MapEditorPageView.axaml
rename to RogueEssence.Editor.Avalonia/Views/Pages/MapEditPage/MapEditPageView.axaml
index 7169aecf..2e571d2e 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/Editors/MapEditorPageView.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/Pages/MapEditPage/MapEditPageView.axaml
@@ -5,10 +5,10 @@
              xmlns:vm="using:RogueEssence.Dev.ViewModels"
              xmlns:v="using:RogueEssence.Dev.Views"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:DataType="vm:MapEditorPageViewModel"
-             x:Class="RogueEssence.Dev.Views.MapEditorPageView">
+             x:DataType="vm:MapEditPageViewModel"
+             x:Class="RogueEssence.Dev.Views.MapEditPageView">
   <Design.DataContext>
-    <vm:MapEditorPageViewModel></vm:MapEditorPageViewModel>
+    <vm:MapEditPageViewModel></vm:MapEditPageViewModel>
   </Design.DataContext>
   <DockPanel>
     <Menu DockPanel.Dock="Top" IsEnabled="{Binding AllowEdit}">
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/MapEditorPageView.axaml.cs b/RogueEssence.Editor.Avalonia/Views/Pages/MapEditPage/MapEditPageView.axaml.cs
similarity index 68%
rename from RogueEssence.Editor.Avalonia/Views/New/Editors/MapEditorPageView.axaml.cs
rename to RogueEssence.Editor.Avalonia/Views/Pages/MapEditPage/MapEditPageView.axaml.cs
index 54119bb3..805a1d0d 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/Editors/MapEditorPageView.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/Pages/MapEditPage/MapEditPageView.axaml.cs
@@ -5,9 +5,9 @@
 
 namespace RogueEssence.Dev.Views;
 
-public partial class MapEditorPageView : UserControl
+public partial class MapEditPageView : UserControl
 {
-    public MapEditorPageView()
+    public MapEditPageView()
     {
         InitializeComponent();
     }
diff --git a/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabDecorations.axaml b/RogueEssence.Editor.Avalonia/Views/Pages/MapEditPage/MapTabDecorations.axaml
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabDecorations.axaml
rename to RogueEssence.Editor.Avalonia/Views/Pages/MapEditPage/MapTabDecorations.axaml
diff --git a/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabDecorations.axaml.cs b/RogueEssence.Editor.Avalonia/Views/Pages/MapEditPage/MapTabDecorations.axaml.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabDecorations.axaml.cs
rename to RogueEssence.Editor.Avalonia/Views/Pages/MapEditPage/MapTabDecorations.axaml.cs
diff --git a/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabEffects.axaml b/RogueEssence.Editor.Avalonia/Views/Pages/MapEditPage/MapTabEffects.axaml
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabEffects.axaml
rename to RogueEssence.Editor.Avalonia/Views/Pages/MapEditPage/MapTabEffects.axaml
diff --git a/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabEffects.axaml.cs b/RogueEssence.Editor.Avalonia/Views/Pages/MapEditPage/MapTabEffects.axaml.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabEffects.axaml.cs
rename to RogueEssence.Editor.Avalonia/Views/Pages/MapEditPage/MapTabEffects.axaml.cs
diff --git a/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabEntities.axaml b/RogueEssence.Editor.Avalonia/Views/Pages/MapEditPage/MapTabEntities.axaml
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabEntities.axaml
rename to RogueEssence.Editor.Avalonia/Views/Pages/MapEditPage/MapTabEntities.axaml
diff --git a/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabEntities.axaml.cs b/RogueEssence.Editor.Avalonia/Views/Pages/MapEditPage/MapTabEntities.axaml.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabEntities.axaml.cs
rename to RogueEssence.Editor.Avalonia/Views/Pages/MapEditPage/MapTabEntities.axaml.cs
diff --git a/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabEntrances.axaml b/RogueEssence.Editor.Avalonia/Views/Pages/MapEditPage/MapTabEntrances.axaml
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabEntrances.axaml
rename to RogueEssence.Editor.Avalonia/Views/Pages/MapEditPage/MapTabEntrances.axaml
diff --git a/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabEntrances.axaml.cs b/RogueEssence.Editor.Avalonia/Views/Pages/MapEditPage/MapTabEntrances.axaml.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabEntrances.axaml.cs
rename to RogueEssence.Editor.Avalonia/Views/Pages/MapEditPage/MapTabEntrances.axaml.cs
diff --git a/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabItems.axaml b/RogueEssence.Editor.Avalonia/Views/Pages/MapEditPage/MapTabItems.axaml
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabItems.axaml
rename to RogueEssence.Editor.Avalonia/Views/Pages/MapEditPage/MapTabItems.axaml
diff --git a/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabItems.axaml.cs b/RogueEssence.Editor.Avalonia/Views/Pages/MapEditPage/MapTabItems.axaml.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabItems.axaml.cs
rename to RogueEssence.Editor.Avalonia/Views/Pages/MapEditPage/MapTabItems.axaml.cs
diff --git a/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabProperties.axaml b/RogueEssence.Editor.Avalonia/Views/Pages/MapEditPage/MapTabProperties.axaml
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabProperties.axaml
rename to RogueEssence.Editor.Avalonia/Views/Pages/MapEditPage/MapTabProperties.axaml
diff --git a/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabProperties.axaml.cs b/RogueEssence.Editor.Avalonia/Views/Pages/MapEditPage/MapTabProperties.axaml.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabProperties.axaml.cs
rename to RogueEssence.Editor.Avalonia/Views/Pages/MapEditPage/MapTabProperties.axaml.cs
diff --git a/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabSpawns.axaml b/RogueEssence.Editor.Avalonia/Views/Pages/MapEditPage/MapTabSpawns.axaml
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabSpawns.axaml
rename to RogueEssence.Editor.Avalonia/Views/Pages/MapEditPage/MapTabSpawns.axaml
diff --git a/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabSpawns.axaml.cs b/RogueEssence.Editor.Avalonia/Views/Pages/MapEditPage/MapTabSpawns.axaml.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabSpawns.axaml.cs
rename to RogueEssence.Editor.Avalonia/Views/Pages/MapEditPage/MapTabSpawns.axaml.cs
diff --git a/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabTerrain.axaml b/RogueEssence.Editor.Avalonia/Views/Pages/MapEditPage/MapTabTerrain.axaml
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabTerrain.axaml
rename to RogueEssence.Editor.Avalonia/Views/Pages/MapEditPage/MapTabTerrain.axaml
diff --git a/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabTerrain.axaml.cs b/RogueEssence.Editor.Avalonia/Views/Pages/MapEditPage/MapTabTerrain.axaml.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabTerrain.axaml.cs
rename to RogueEssence.Editor.Avalonia/Views/Pages/MapEditPage/MapTabTerrain.axaml.cs
diff --git a/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabTextures.axaml b/RogueEssence.Editor.Avalonia/Views/Pages/MapEditPage/MapTabTextures.axaml
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabTextures.axaml
rename to RogueEssence.Editor.Avalonia/Views/Pages/MapEditPage/MapTabTextures.axaml
diff --git a/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabTextures.axaml.cs b/RogueEssence.Editor.Avalonia/Views/Pages/MapEditPage/MapTabTextures.axaml.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabTextures.axaml.cs
rename to RogueEssence.Editor.Avalonia/Views/Pages/MapEditPage/MapTabTextures.axaml.cs
diff --git a/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabTiles.axaml b/RogueEssence.Editor.Avalonia/Views/Pages/MapEditPage/MapTabTiles.axaml
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabTiles.axaml
rename to RogueEssence.Editor.Avalonia/Views/Pages/MapEditPage/MapTabTiles.axaml
diff --git a/RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabTiles.axaml.cs b/RogueEssence.Editor.Avalonia/Views/Pages/MapEditPage/MapTabTiles.axaml.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/MapEditForm/MapTabTiles.axaml.cs
rename to RogueEssence.Editor.Avalonia/Views/Pages/MapEditPage/MapTabTiles.axaml.cs
diff --git a/RogueEssence.Editor.Avalonia/Views/MapEditForm/Teams/TeamWindow.axaml b/RogueEssence.Editor.Avalonia/Views/Pages/MapEditPage/Teams/TeamWindow.axaml
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/MapEditForm/Teams/TeamWindow.axaml
rename to RogueEssence.Editor.Avalonia/Views/Pages/MapEditPage/Teams/TeamWindow.axaml
diff --git a/RogueEssence.Editor.Avalonia/Views/MapEditForm/Teams/TeamWindow.axaml.cs b/RogueEssence.Editor.Avalonia/Views/Pages/MapEditPage/Teams/TeamWindow.axaml.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/MapEditForm/Teams/TeamWindow.axaml.cs
rename to RogueEssence.Editor.Avalonia/Views/Pages/MapEditPage/Teams/TeamWindow.axaml.cs
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/ModConfigPageView.axaml b/RogueEssence.Editor.Avalonia/Views/Pages/ModConfigPageView.axaml
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/New/Editors/ModConfigPageView.axaml
rename to RogueEssence.Editor.Avalonia/Views/Pages/ModConfigPageView.axaml
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/ModConfigPageView.axaml.cs b/RogueEssence.Editor.Avalonia/Views/Pages/ModConfigPageView.axaml.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/New/Editors/ModConfigPageView.axaml.cs
rename to RogueEssence.Editor.Avalonia/Views/Pages/ModConfigPageView.axaml.cs
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/ModListPageView.axaml b/RogueEssence.Editor.Avalonia/Views/Pages/ModListPageView.axaml
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/New/Editors/ModListPageView.axaml
rename to RogueEssence.Editor.Avalonia/Views/Pages/ModListPageView.axaml
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/ModListPageView.axaml.cs b/RogueEssence.Editor.Avalonia/Views/Pages/ModListPageView.axaml.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/New/Editors/ModListPageView.axaml.cs
rename to RogueEssence.Editor.Avalonia/Views/Pages/ModListPageView.axaml.cs
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/RandomInfoPageView.axaml b/RogueEssence.Editor.Avalonia/Views/Pages/RandomInfoPageView.axaml
similarity index 90%
rename from RogueEssence.Editor.Avalonia/Views/New/Editors/RandomInfoPageView.axaml
rename to RogueEssence.Editor.Avalonia/Views/Pages/RandomInfoPageView.axaml
index 42228e33..694e9613 100644
--- a/RogueEssence.Editor.Avalonia/Views/New/Editors/RandomInfoPageView.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/Pages/RandomInfoPageView.axaml
@@ -4,7 +4,7 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              xmlns:vm="using:RogueEssence.Dev.ViewModels"
-             x:DataType="vm:GroundEditorPageViewModel"
+             x:DataType="vm:GroundEditPageViewModel"
              x:Class="RogueEssence.Dev.Views.RandomInfoPageView">
    Some random page info! This shouldn't add any tabs!
 </UserControl>
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/RandomInfoPageView.axaml.cs b/RogueEssence.Editor.Avalonia/Views/Pages/RandomInfoPageView.axaml.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/New/Editors/RandomInfoPageView.axaml.cs
rename to RogueEssence.Editor.Avalonia/Views/Pages/RandomInfoPageView.axaml.cs
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/ReflectedDataPageView.axaml b/RogueEssence.Editor.Avalonia/Views/Pages/ReflectedDataPageView.axaml
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/New/Editors/ReflectedDataPageView.axaml
rename to RogueEssence.Editor.Avalonia/Views/Pages/ReflectedDataPageView.axaml
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/ReflectedDataPageView.axaml.cs b/RogueEssence.Editor.Avalonia/Views/Pages/ReflectedDataPageView.axaml.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/New/Editors/ReflectedDataPageView.axaml.cs
rename to RogueEssence.Editor.Avalonia/Views/Pages/ReflectedDataPageView.axaml.cs
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/SpeciesEditPageView.axaml b/RogueEssence.Editor.Avalonia/Views/Pages/SpeciesEditPageView.axaml
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/New/Editors/SpeciesEditPageView.axaml
rename to RogueEssence.Editor.Avalonia/Views/Pages/SpeciesEditPageView.axaml
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/SpeciesEditPageView.axaml.cs b/RogueEssence.Editor.Avalonia/Views/Pages/SpeciesEditPageView.axaml.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/New/Editors/SpeciesEditPageView.axaml.cs
rename to RogueEssence.Editor.Avalonia/Views/Pages/SpeciesEditPageView.axaml.cs
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/SpritePageView.axaml b/RogueEssence.Editor.Avalonia/Views/Pages/SpritePageView.axaml
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/New/Editors/SpritePageView.axaml
rename to RogueEssence.Editor.Avalonia/Views/Pages/SpritePageView.axaml
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/SpritePageView.axaml.cs b/RogueEssence.Editor.Avalonia/Views/Pages/SpritePageView.axaml.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/New/Editors/SpritePageView.axaml.cs
rename to RogueEssence.Editor.Avalonia/Views/Pages/SpritePageView.axaml.cs
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/StringEditPageView.axaml b/RogueEssence.Editor.Avalonia/Views/Pages/StringEditPageView.axaml
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/New/Editors/StringEditPageView.axaml
rename to RogueEssence.Editor.Avalonia/Views/Pages/StringEditPageView.axaml
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Editors/StringEditPageView.axaml.cs b/RogueEssence.Editor.Avalonia/Views/Pages/StringEditPageView.axaml.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/New/Editors/StringEditPageView.axaml.cs
rename to RogueEssence.Editor.Avalonia/Views/Pages/StringEditPageView.axaml.cs
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Components/IconText.axaml b/RogueEssence.Editor.Avalonia/Views/UserControls/IconText.axaml
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/New/Components/IconText.axaml
rename to RogueEssence.Editor.Avalonia/Views/UserControls/IconText.axaml
diff --git a/RogueEssence.Editor.Avalonia/Views/New/Components/IconText.axaml.cs b/RogueEssence.Editor.Avalonia/Views/UserControls/IconText.axaml.cs
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Views/New/Components/IconText.axaml.cs
rename to RogueEssence.Editor.Avalonia/Views/UserControls/IconText.axaml.cs

From 427c9e20f5f0170bb94a9b99aff867ccaa29d785 Mon Sep 17 00:00:00 2001
From: Kace <41309226+DoubleTrio@users.noreply.github.com>
Date: Thu, 21 May 2026 23:50:40 -0400
Subject: [PATCH 40/51] can import beams correctly, sprite refactor

---
 .../Nodes/ISpriteRootOperationStrategy.cs     |  10 -
 .../Sprite/ISpriteRootOperationStrategy.cs    |  17 +
 .../Sprite/SpriteRootAssetTypeStrategy.cs     | 337 +++++++++++++++
 .../{ => Sprite}/SpriteRootTileStrategy.cs    | 392 ++++++++----------
 .../Nodes/SpriteRootAssetTypeStrategy.cs      | 380 -----------------
 5 files changed, 528 insertions(+), 608 deletions(-)
 delete mode 100644 RogueEssence.Editor.Avalonia/ViewModels/DevForm/Nodes/ISpriteRootOperationStrategy.cs
 create mode 100644 RogueEssence.Editor.Avalonia/ViewModels/DevForm/Nodes/Sprite/ISpriteRootOperationStrategy.cs
 create mode 100644 RogueEssence.Editor.Avalonia/ViewModels/DevForm/Nodes/Sprite/SpriteRootAssetTypeStrategy.cs
 rename RogueEssence.Editor.Avalonia/ViewModels/DevForm/Nodes/{ => Sprite}/SpriteRootTileStrategy.cs (57%)
 delete mode 100644 RogueEssence.Editor.Avalonia/ViewModels/DevForm/Nodes/SpriteRootAssetTypeStrategy.cs

diff --git a/RogueEssence.Editor.Avalonia/ViewModels/DevForm/Nodes/ISpriteRootOperationStrategy.cs b/RogueEssence.Editor.Avalonia/ViewModels/DevForm/Nodes/ISpriteRootOperationStrategy.cs
deleted file mode 100644
index 3f6d985d..00000000
--- a/RogueEssence.Editor.Avalonia/ViewModels/DevForm/Nodes/ISpriteRootOperationStrategy.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System.Threading.Tasks;
-
-namespace RogueEssence.Dev.ViewModels;
-
-public interface ISpriteRootOperationStrategy
-{
-    Task MassExportAsync();
-    Task MassImportAsync();
-    Task ImportAsync();
-}
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/DevForm/Nodes/Sprite/ISpriteRootOperationStrategy.cs b/RogueEssence.Editor.Avalonia/ViewModels/DevForm/Nodes/Sprite/ISpriteRootOperationStrategy.cs
new file mode 100644
index 00000000..702a24f0
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/ViewModels/DevForm/Nodes/Sprite/ISpriteRootOperationStrategy.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.ObjectModel;
+using System.Threading.Tasks;
+
+namespace RogueEssence.Dev.ViewModels;
+
+public interface ISpriteRootOperationStrategy
+{
+    
+    public event Action OnReload;
+    Task MassExportAsync();
+    Task MassImportAsync();
+    Task ReImportAsync();
+    Task DeleteAsync(string path);
+    Task ExportAsync(string path);
+    Task ImportAsync(ObservableCollection<string> items);
+}
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/DevForm/Nodes/Sprite/SpriteRootAssetTypeStrategy.cs b/RogueEssence.Editor.Avalonia/ViewModels/DevForm/Nodes/Sprite/SpriteRootAssetTypeStrategy.cs
new file mode 100644
index 00000000..51922f1f
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/ViewModels/DevForm/Nodes/Sprite/SpriteRootAssetTypeStrategy.cs
@@ -0,0 +1,337 @@
+using System;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using Avalonia.Platform.Storage;
+using Avalonia.Threading;
+using RogueEssence.Content;
+using RogueEssence.Dev.Services;
+using RogueEssence.Dev.Views;
+
+namespace RogueEssence.Dev.ViewModels;
+
+public class SpriteRootAssetTypeStrategy : ISpriteRootOperationStrategy
+{
+    private readonly IDialogService _dialogService;
+    private readonly SpriteRootNode _spriteRootNode;
+    public event Action OnReload;
+
+    public SpriteRootAssetTypeStrategy(IDialogService dialogService, SpriteRootNode spriteRootNode)
+    {
+        _dialogService = dialogService;
+        _spriteRootNode = spriteRootNode;
+    }
+
+    private GraphicsManager.AssetType AssetType => _spriteRootNode.AssetType;
+    private string Name => _spriteRootNode.AssetType.ToString();
+    
+    private void _export(string currentPath, string anim)
+    {
+        lock (GameBase.lockObj)
+        {
+            string animPath = PathMod.ModPath(String.Format(GraphicsManager.GetPattern(AssetType), anim));
+            if (File.Exists(animPath))
+            {
+                using (FileStream fileStream = File.OpenRead(animPath))
+                using (BinaryReader reader = new BinaryReader(fileStream))
+                {
+                    DirSheet sheet = DirSheet.Load(reader);
+                    string filename = DirSheet.GetExportString(sheet, Path.GetFileNameWithoutExtension(currentPath));
+                    string dirname = Path.GetDirectoryName(currentPath);
+                    DirSheet.Export(sheet, Path.Combine(dirname, filename + ".png"));
+                }
+            }
+
+            DiagManager.Instance.LogInfo("Frames from:\n" + anim + "\nhave been exported to:" + currentPath);
+        }
+    }
+
+    private void _import(string currentPath)
+    {
+        DevForm.ExecuteOrPend(() => { _tryImport(currentPath); });
+        OnReload?.Invoke();
+    }
+
+    private void _tryImport(string currentPath)
+    {
+        lock (GameBase.lockObj)
+        {
+            string assetPattern = GraphicsManager.GetPattern(AssetType);
+            string destFile;
+            string animName = Path.GetFileNameWithoutExtension(currentPath);
+            if (Directory.Exists(currentPath))
+                destFile = PathMod.HardMod(String.Format(assetPattern, animName));
+            else
+            {
+                string[] components = animName.Split('.');
+                if (components.Length != 2)
+                    throw new ArgumentException(
+                        "The input filename does not fit the convention of \"<Anim Name>.<Anim Type>.png\"!");
+                destFile = PathMod.HardMod(String.Format(assetPattern, components[0]));
+            }
+
+            if (!Directory.Exists(Path.GetDirectoryName(destFile)))
+                Directory.CreateDirectory(Path.GetDirectoryName(destFile));
+
+            using (DirSheet sheet = DirSheet.Import(currentPath))
+            using (FileStream stream = File.OpenWrite(destFile))
+            using (BinaryWriter writer = new BinaryWriter(stream))
+                sheet.Save(writer);
+
+            GraphicsManager.RebuildIndices(AssetType);
+            GraphicsManager.ClearCaches(AssetType);
+
+            DiagManager.Instance.LogInfo("Frames from:\n" + currentPath + "\nhave been imported.");
+        }
+    }
+
+    private bool _massExport(string currentPath)
+    {
+        bool success = true;
+        string assetPattern = GraphicsManager.GetPattern(AssetType);
+        string[] dirs = PathMod.GetModFiles(Path.GetDirectoryName(assetPattern), String.Format(Path.GetFileName(assetPattern), "*"));
+        for (int ii = 0; ii < dirs.Length; ii++)
+        {
+            try
+            {
+                string filename = Path.GetFileNameWithoutExtension(dirs[ii]);
+                DevForm.ExecuteOrPend(() => { _export(currentPath + filename, filename); });
+            }
+            catch (Exception ex)
+            {
+                DiagManager.Instance.LogError(ex, false);
+                success = false;
+            }
+        }
+        return success;
+    }
+
+    private void _recomputeAnimList()
+    {
+        lock (GameBase.lockObj)
+        {
+            string assetPattern = GraphicsManager.GetPattern(AssetType);
+            string[] dirs = PathMod.GetModFiles(Path.GetDirectoryName(assetPattern), String.Format(Path.GetFileName(assetPattern), "*"));
+            for (int ii = 0; ii < dirs.Length; ii++)
+            {
+                string filename = Path.GetFileNameWithoutExtension(dirs[ii]);
+            }
+        }
+    }
+
+    private void MassImport(string currentPath)
+    {
+        DevForm.ExecuteOrPend(() => { _tryMassImport(currentPath); });
+        _recomputeAnimList();
+    }
+
+    private void _tryMassImport(string currentPath)
+    {
+        lock (GameBase.lockObj)
+        {
+            string assetPattern = GraphicsManager.GetPattern(AssetType);
+            if (!Directory.Exists(Path.GetDirectoryName(PathMod.HardMod(assetPattern))))
+                Directory.CreateDirectory(Path.GetDirectoryName(PathMod.HardMod(assetPattern)));
+            ImportHelper.ImportAllNameDirs(currentPath, PathMod.HardMod(assetPattern));
+
+            GraphicsManager.RebuildIndices(AssetType);
+            GraphicsManager.ClearCaches(AssetType);
+
+            DiagManager.Instance.LogInfo("Mass import complete.");
+        }
+    }
+    
+    public async Task MassExportAsync()
+    {
+        string folderName = DevForm.GetConfig(Name + "Dir", Directory.GetCurrentDirectory());
+
+        var options = new FolderPickerOpenOptions
+        {
+            Title = $"Select folder to mass export {Name} to",
+            AllowMultiple = false,
+        };
+
+        await Dispatcher.UIThread.InvokeAsync(async () =>
+        {
+            string folder = await _dialogService.ShowFolderPickerAsync(options, folderName);
+            if (string.IsNullOrEmpty(folder)) return;
+
+            DevForm.SetConfig(Name + "Dir", folder);
+            _spriteRootNode.CachedPath = folder + "/";
+
+            bool success = _massExport(_spriteRootNode.CachedPath);
+            if (!success)
+                await MessageBoxWindowView.Show(_dialogService,
+                    "Errors found exporting to\n" + _spriteRootNode.CachedPath + "\n\nCheck logs for more info.",
+                    "Mass Export Failed", MessageBoxWindowView.MessageBoxButtons.Ok);
+        });
+    }
+
+    public async Task MassImportAsync()
+    {
+        await MessageBoxWindowView.Show(_dialogService,
+            "Note: Importing a sprite to a slot that is already filled will automatically overwrite the old one.",
+            "Mass Import", MessageBoxWindowView.MessageBoxButtons.Ok);
+
+        string folderName = DevForm.GetConfig(Name + "Dir", Directory.GetCurrentDirectory());
+
+        var options = new FolderPickerOpenOptions
+        {
+            Title = $"Select folder to mass import \"{Name}\" from",
+            AllowMultiple = false,
+        };
+
+        await Dispatcher.UIThread.InvokeAsync(async () =>
+        {
+            string folder = await _dialogService.ShowFolderPickerAsync(options, folderName);
+            if (string.IsNullOrEmpty(folder)) return;
+
+            DevForm.SetConfig(Name + "Dir", folder);
+            _spriteRootNode.CachedPath = folder + "/";
+
+            try
+            {
+                MassImport(_spriteRootNode.CachedPath);
+            }
+            catch (Exception ex)
+            {
+                DiagManager.Instance.LogError(ex, false);
+                await MessageBoxWindowView.Show(_dialogService,
+                    "Error importing from\n" + _spriteRootNode.CachedPath + "\n\n" + ex.Message,
+                    "Import Failed", MessageBoxWindowView.MessageBoxButtons.Ok);
+            }
+        });
+    }
+    
+    public async Task ImportAsync(ObservableCollection<string> items)
+    {
+        string folderName = DevForm.GetConfig(Name + "Dir", Directory.GetCurrentDirectory());
+        var options = new FilePickerOpenOptions
+        {
+            Title = "Open .png or .xml File",
+            AllowMultiple = false,
+            FileTypeFilter =
+            [
+                new FilePickerFileType("PNG Files") { Patterns = ["*.png"] },
+                new FilePickerFileType("DirData XML") { Patterns = ["*.xml"] }
+            ]
+        };
+
+        string? result = null;
+        await Dispatcher.UIThread.InvokeAsync(async () =>
+        {
+            string filePath = await _dialogService.ShowFilePickerAsync(options, folderName);
+            if (string.IsNullOrEmpty(filePath)) return;
+
+            string animName = Path.GetFileNameWithoutExtension(filePath);
+
+            if (items.Any(item => item == animName))
+            {
+                var res = await MessageBoxWindowView.Show(_dialogService,
+                    "Are you sure you want to overwrite the existing sheet:\n" + animName,
+                    "Sprite Sheet already exists.", MessageBoxWindowView.MessageBoxButtons.YesNo);
+                if (res == MessageBoxWindowView.MessageBoxResult.No) return;
+            }
+            else
+            {
+                items.Add(animName);
+            }
+
+            DevForm.SetConfig(Name + "Dir", Path.GetDirectoryName(filePath));
+            result = Path.GetExtension(filePath) == ".xml"
+                ? Path.GetDirectoryName(filePath)
+                : filePath;
+
+            try
+            {
+                _import(result);
+            }
+            catch (Exception ex)
+            {
+                DiagManager.Instance.LogError(ex, false);
+                await MessageBoxWindowView.Show(_dialogService,
+                    "Error importing from\n" + result + "\n\n" + ex.Message,
+                    "Import Failed", MessageBoxWindowView.MessageBoxButtons.Ok);
+                result = null;
+            }
+        });
+        
+        _spriteRootNode.CachedPath = result;
+    }
+
+    public async Task DeleteAsync(string key)
+    {
+        var res = await MessageBoxWindowView.Show(_dialogService,
+            $"Delete sprite '{key}'?", "Deleting Sprite",
+            MessageBoxWindowView.MessageBoxButtons.YesNo, true);
+
+        if (res == MessageBoxWindowView.MessageBoxResult.Yes)
+        {
+            lock (GameBase.lockObj)
+            {
+                string animPath = PathMod.ModPath(String.Format(GraphicsManager.GetPattern(AssetType), key));
+                if (File.Exists(animPath))
+                    File.Delete(animPath);
+
+                GraphicsManager.RebuildIndices(AssetType);
+                GraphicsManager.ClearCaches(AssetType);
+
+                DiagManager.Instance.LogInfo("Deleted frames for:" + key);
+                OnReload?.Invoke();
+            }
+        }
+    }
+
+    public async Task ExportAsync(string key)
+    {
+        string folderName = DevForm.GetConfig(Name + "Dir", Directory.GetCurrentDirectory());
+        var options = new FilePickerSaveOptions
+        {
+            Title = $"Export {key} as PNG",
+            DefaultExtension = "png",
+            FileTypeChoices =
+            [
+                new FilePickerFileType("PNG Files") { Patterns = ["*.png"] }
+            ]
+        };
+
+        await Dispatcher.UIThread.InvokeAsync(async () =>
+        {
+            string filePath = await _dialogService.TryGetSaveFileAsync(options, folderName);
+            if (string.IsNullOrEmpty(filePath)) return;
+
+            DevForm.SetConfig(Name + "Dir", Path.GetDirectoryName(filePath));
+
+            try
+            {
+                DevForm.ExecuteOrPend(() => { _export(filePath, key); });
+            }
+            catch (Exception ex)
+            {
+                DiagManager.Instance.LogError(ex, false);
+                await MessageBoxWindowView.Show(_dialogService,
+                    $"Error exporting to\n{filePath}\n\n{ex.Message}",
+                    "Export Failed", MessageBoxWindowView.MessageBoxButtons.Ok);
+            }
+        });
+    }
+
+    public async Task ReImportAsync()
+    {
+        await Dispatcher.UIThread.InvokeAsync(async () =>
+        {
+            try
+            {
+                _import(_spriteRootNode.CachedPath);
+            }
+            catch (Exception ex)
+            {
+                DiagManager.Instance.LogError(ex, false);
+                await MessageBoxWindowView.Show(_dialogService,
+                    "Error importing from\n" + _spriteRootNode.CachedPath + "\n\n" + ex.Message,
+                    "Import Failed", MessageBoxWindowView.MessageBoxButtons.Ok);
+            }
+        });
+    }
+}
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/DevForm/Nodes/SpriteRootTileStrategy.cs b/RogueEssence.Editor.Avalonia/ViewModels/DevForm/Nodes/Sprite/SpriteRootTileStrategy.cs
similarity index 57%
rename from RogueEssence.Editor.Avalonia/ViewModels/DevForm/Nodes/SpriteRootTileStrategy.cs
rename to RogueEssence.Editor.Avalonia/ViewModels/DevForm/Nodes/Sprite/SpriteRootTileStrategy.cs
index a3103b18..275b0ed4 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/DevForm/Nodes/SpriteRootTileStrategy.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/DevForm/Nodes/Sprite/SpriteRootTileStrategy.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
@@ -18,70 +19,123 @@ namespace RogueEssence.Dev.ViewModels;
 public class SpriteRootTileStrategy : ISpriteRootOperationStrategy
 {
     private int _cachedSize;
-
     private readonly IDialogService _dialogService;
-    // private readonly NodeFactory _nodeFactory;
     private readonly SpriteRootNode _spriteRootNode;
 
+    public event Action OnReload;
+
     public SpriteRootTileStrategy(IDialogService dialogService, SpriteRootNode spriteRootNode)
     {
         _dialogService = dialogService;
         _spriteRootNode = spriteRootNode;
     }
 
+    private void _export(string currentPath, string anim)
+    {
+        lock (GameBase.lockObj)
+        {
+            string animPath = PathMod.ModPath(String.Format(GraphicsManager.TILE_PATTERN, anim));
+            ImportHelper.ExportTileSheet(animPath, currentPath);
+            DiagManager.Instance.LogInfo("Frames from:\n" + anim + "\nhave been exported to:" + currentPath);
+        }
+    }
 
-
-    public async Task DeleteAsync(DataItemNode node)
+    private void _import(string currentPath, int tileSize)
     {
-        var res = await MessageBoxWindowView.Show(_dialogService, $"Delete sprite '{node.Title}'?", "Deleting Sprite",
-            MessageBoxWindowView.MessageBoxButtons.YesNo, true);
+        DevForm.ExecuteOrPend(() => { _tryImport(currentPath, tileSize); });
+        OnReload?.Invoke();
+    }
 
-        if (res == MessageBoxWindowView.MessageBoxResult.Yes)
+    private void _tryImport(string currentPath, int tileSize)
+    {
+        lock (GameBase.lockObj)
         {
-            lock (GameBase.lockObj)
+            string sheetName = Path.GetFileNameWithoutExtension(currentPath);
+            string outputFile = PathMod.HardMod(String.Format(GraphicsManager.TILE_PATTERN, sheetName));
+
+            if (!Directory.Exists(Path.GetDirectoryName(outputFile)))
+                Directory.CreateDirectory(Path.GetDirectoryName(outputFile));
+
+            using (BaseSheet tileset = BaseSheet.Import(currentPath))
             {
-                string anim = node.ItemKey;
+                List<BaseSheet[]> tileList = new List<BaseSheet[]>();
+                tileList.Add(new BaseSheet[] { tileset });
+                ImportHelper.SaveTileSheet(tileList, outputFile, tileSize);
+            }
 
-                string animPath = PathMod.ModPath(String.Format(GraphicsManager.TILE_PATTERN, anim));
-                if (File.Exists(animPath))
-                    File.Delete(animPath);
+            GraphicsManager.RebuildIndices(GraphicsManager.AssetType.Tile);
+            GraphicsManager.ClearCaches(GraphicsManager.AssetType.Tile);
+            DevDataManager.ClearCaches();
 
-                GraphicsManager.RebuildIndices(GraphicsManager.AssetType.Tile);
-                GraphicsManager.ClearCaches(GraphicsManager.AssetType.Tile);
+            DiagManager.Instance.LogInfo("Tiles from:\n" + currentPath + "\nhave been imported.");
+        }
+    }
 
-                DiagManager.Instance.LogInfo("Deleted frames for:" + anim);
+    private void _massImport(string currentPath, int tileSize)
+    {
+        DevForm.ExecuteOrPend(() => { _tryMassImport(currentPath, tileSize); });
+    }
 
-                _spriteRootNode.SubNodes.Remove(node);
-            }
+    private void _tryMassImport(string currentPath, int tileSize)
+    {
+        lock (GameBase.lockObj)
+        {
+            if (!Directory.Exists(Path.GetDirectoryName(PathMod.HardMod(GraphicsManager.TILE_PATTERN))))
+                Directory.CreateDirectory(Path.GetDirectoryName(PathMod.HardMod(GraphicsManager.TILE_PATTERN)));
+
+            ImportHelper.ImportAllTiles(currentPath, PathMod.HardMod(GraphicsManager.TILE_PATTERN), tileSize);
+
+            GraphicsManager.RebuildIndices(GraphicsManager.AssetType.Tile);
+            GraphicsManager.ClearCaches(GraphicsManager.AssetType.Tile);
+
+            DiagManager.Instance.LogInfo("Mass import complete.");
         }
     }
 
+    private bool _massExport(string currentPath)
+    {
+        bool success = true;
+        string[] dirs = PathMod.GetModFiles(Path.GetDirectoryName(GraphicsManager.TILE_PATTERN),
+            String.Format(Path.GetFileName(GraphicsManager.TILE_PATTERN), "*"));
+        for (int ii = 0; ii < dirs.Length; ii++)
+        {
+            try
+            {
+                string filename = Path.GetFileNameWithoutExtension(dirs[ii]);
+                DevForm.ExecuteOrPend(() => { _export(Path.Combine(currentPath, filename + ".png"), filename); });
+            }
+            catch (Exception ex)
+            {
+                DiagManager.Instance.LogError(ex, false);
+                success = false;
+            }
+        }
+        return success;
+    }
+    
     public async Task MassExportAsync()
     {
-        //remember addresses in registry
         string folderName = DevForm.GetConfig("TilesetDir", Directory.GetCurrentDirectory());
 
-   
-        //open window to choose directory
         var options = new FolderPickerOpenOptions
         {
             Title = "Select folder to mass export to",
             AllowMultiple = false,
         };
-        
+
         await Dispatcher.UIThread.InvokeAsync(async () =>
         {
-            var folder = await _dialogService.ShowFolderPickerAsync(options, folderName);
+            string folder = await _dialogService.ShowFolderPickerAsync(options, folderName);
+            if (string.IsNullOrEmpty(folder)) return;
 
-            if (folder == null)
-                return;
-            
             DevForm.SetConfig("TilesetDir", folder);
             _spriteRootNode.CachedPath = folder + "/";
 
             bool success = _massExport(_spriteRootNode.CachedPath);
             if (!success)
-                await MessageBoxWindowView.Show(_dialogService, "Errors found exporting to\n" + _spriteRootNode.CachedPath + "\n\nCheck logs for more info.", "Mass Export Failed", MessageBoxWindowView.MessageBoxButtons.Ok);
+                await MessageBoxWindowView.Show(_dialogService,
+                    "Errors found exporting to\n" + _spriteRootNode.CachedPath + "\n\nCheck logs for more info.",
+                    "Mass Export Failed", MessageBoxWindowView.MessageBoxButtons.Ok);
         });
     }
 
@@ -91,32 +145,24 @@ await MessageBoxWindowView.Show(_dialogService,
             "Note: Importing a tileset to a slot that is already filled will automatically overwrite the old one.",
             "Mass Import", MessageBoxWindowView.MessageBoxButtons.Ok);
 
-        //remember addresses in registry
         string folderName = DevForm.GetConfig("TilesetDir", Directory.GetCurrentDirectory());
 
-        //open window to choose directory
         var options = new FolderPickerOpenOptions
         {
             Title = "Select tileset folder to mass import",
             AllowMultiple = false,
         };
 
-        // IStorageFolder directory = await parent.StorageProvider.TryGetFolderFromPathAsync(folderName);
         await Dispatcher.UIThread.InvokeAsync(async () =>
         {
-            var folder = await _dialogService.ShowFolderPickerAsync(options, folderName);
-
-            // string folder = results.First().Path.LocalPath;
+            string folder = await _dialogService.ShowFolderPickerAsync(options, folderName);
+            if (string.IsNullOrEmpty(folder)) return;
 
-            MapRetileWindowViewModel viewModel =
-                new MapRetileWindowViewModel(GraphicsManager.TileSize, "Tile size must be divisible by 8.");
+            MapRetileWindowViewModel viewModel = new MapRetileWindowViewModel(GraphicsManager.TileSize, "Tile size must be divisible by 8.");
             bool sizeResult = await _dialogService.ShowDialogAsync<MapRetileWindowViewModel, bool>(viewModel, "");
 
             int size = viewModel.TileSize;
-
-            if (!sizeResult || size == 0)
-                return;
-
+            if (!sizeResult || size == 0) return;
 
             DevForm.SetConfig("TilesetDir", folder);
             _spriteRootNode.CachedPath = folder + "/";
@@ -130,56 +176,15 @@ await Dispatcher.UIThread.InvokeAsync(async () =>
             {
                 DiagManager.Instance.LogError(ex, false);
                 await MessageBoxWindowView.Show(_dialogService,
-                    "Error importing from\n" + _spriteRootNode.CachedPath + "\n\n" + ex.Message, "Import Failed",
-                    MessageBoxWindowView.MessageBoxButtons.Ok);
-                return;
+                    "Error importing from\n" + _spriteRootNode.CachedPath + "\n\n" + ex.Message,
+                    "Import Failed", MessageBoxWindowView.MessageBoxButtons.Ok);
             }
         });
     }
 
-    public async Task ExportAsync(DataItemNode node)
-    {
-        //get current sprite
-        string animData = node.ItemKey;
-
-        //remember addresses in registry
-        string folderName = DevForm.GetConfig("TilesetDir", Directory.GetCurrentDirectory());
-
-        var options = new FilePickerSaveOptions
-        {
-            Title = "Export PNG",
-            DefaultExtension = "png",
-            FileTypeChoices =
-            [
-                new FilePickerFileType("PNG Files")
-                {
-                    Patterns = new[] { "*.png" }
-                }
-            ]
-        };
-        var folder = await _dialogService.TryGetSaveFileAsync(options, folderName);
-        if (!String.IsNullOrEmpty(folder))
-        {
-            DevForm.SetConfig("TilesetDir", Path.GetDirectoryName(folder));
-
-            try
-            {
-                DevForm.ExecuteOrPend(() => { _export(folder, animData); });
-            }
-            catch (Exception ex)
-            {
-                DiagManager.Instance.LogError(ex, false);
-                await MessageBoxWindowView.Show(_dialogService,
-                    "Error exporting to\n" + _spriteRootNode.CachedPath + "\n\n" + ex.Message, "Export Failed",
-                    MessageBoxWindowView.MessageBoxButtons.Ok);
-                return;
-            }
-        }
-    }
-
-    public async Task ImportAsync()
+  
+    public async Task ImportAsync(ObservableCollection<string> items)
     {
-        //remember addresses in registry
         string folderName = DevForm.GetConfig("TilesetDir", Directory.GetCurrentDirectory());
 
         var options = new FilePickerOpenOptions
@@ -188,178 +193,129 @@ public async Task ImportAsync()
             AllowMultiple = false,
             FileTypeFilter =
             [
-                new FilePickerFileType("PNG Files")
-                {
-                    Patterns = ["*.PNG"]
-                }
+                new FilePickerFileType("PNG Files") { Patterns = ["*.png"] }
             ]
         };
 
-        var file = await _dialogService.ShowFilePickerAsync(options, folderName);
-
-        if (file == null) return;
-
-        string animName = Path.GetFileNameWithoutExtension(file);
-
-
-        if (_spriteRootNode.SubNodes.Any(n => n.Title == animName))
+        string? result = null;
+        await Dispatcher.UIThread.InvokeAsync(async () =>
         {
-            MessageBoxWindowView.MessageBoxResult result = await MessageBoxWindowView.Show(_dialogService,
-                "Are you sure you want to overwrite the existing sheet:\n" + animName,
-                "Sprite Sheet already exists.",
-                MessageBoxWindowView.MessageBoxButtons.YesNo);
-            if (result == MessageBoxWindowView.MessageBoxResult.No)
-                return;
-        }
-
-        MapRetileWindowViewModel viewModel =
-            new MapRetileWindowViewModel(GraphicsManager.TileSize, "Tile size must be divisible by 8.");
-        bool sizeResult = await _dialogService.ShowDialogAsync<MapRetileWindowViewModel, bool>(viewModel, "");
+            string filePath = await _dialogService.ShowFilePickerAsync(options, folderName);
+            if (string.IsNullOrEmpty(filePath)) return;
 
-        int size = viewModel.TileSize;
+            string animName = Path.GetFileNameWithoutExtension(filePath);
 
-        if (!sizeResult || size == 0)
-            return;
-
-        DevForm.SetConfig("TilesetDir", Path.GetDirectoryName(file));
-        _spriteRootNode.CachedPath = file;
-        _cachedSize = size;
-
-        try
-        {
-            _import(_spriteRootNode.CachedPath, _cachedSize);
-        }
-        catch (Exception ex)
-        {
-            DiagManager.Instance.LogError(ex, false);
-            await MessageBoxWindowView.Show(_dialogService,
-                "Error importing from\n" + _spriteRootNode.CachedPath + "\n\n" + ex.Message,
-                "Import Failed", MessageBoxWindowView.MessageBoxButtons.Ok);
-            return;
-        }
-    }
+            if (items.Any(item => item == animName))
+            {
+                var res = await MessageBoxWindowView.Show(_dialogService,
+                    "Are you sure you want to overwrite the existing sheet:\n" + animName,
+                    "Sprite Sheet already exists.", MessageBoxWindowView.MessageBoxButtons.YesNo);
+                if (res == MessageBoxWindowView.MessageBoxResult.No) return;
+            }
+            else
+            {
+                items.Add(animName);
+            }
 
-    public async Task ReImportAsync()
-    {
-        try
-        {
-            _import(_spriteRootNode.CachedPath, _cachedSize);
-        }
-        catch (Exception ex)
-        {
-            DiagManager.Instance.LogError(ex, false);
-            await MessageBoxWindowView.Show(_dialogService,
-                "Error importing from\n" + _spriteRootNode.CachedPath + "\n\n" + ex.Message, "Import Failed",
-                MessageBoxWindowView.MessageBoxButtons.Ok);
-            return;
-        }
-    }
+            MapRetileWindowViewModel viewModel = new MapRetileWindowViewModel(GraphicsManager.TileSize, "Tile size must be divisible by 8.");
+            bool sizeResult = await _dialogService.ShowDialogAsync<MapRetileWindowViewModel, bool>(viewModel, "");
 
-    // private void _reloadFullList()
-    // {
-    //     lock (GameBase.lockObj)
-    //     {
-    //         _spriteRootNode.SubNodes.Clear();
-    //         foreach (string name in GraphicsManager.TileIndex.Nodes.Keys)
-    //         {
-    //             _spriteRootNode.SubNodes.Add(
-    //                 _nodeFactory.CreateDataItemNode<DevEditPageViewModel>(name, name + ":", _spriteRootNode.AssetType.GetIcon())
-    //             );
-    //         }
-    //     }
-    // }
+            int size = viewModel.TileSize;
+            if (!sizeResult || size == 0) return;
 
+            DevForm.SetConfig("TilesetDir", Path.GetDirectoryName(filePath));
+            _cachedSize = size;
 
-    private void _import(string currentPath, int tileSize)
-    {
-        DevForm.ExecuteOrPend(() => { _tryImport(currentPath, tileSize); });
+            try
+            {
+                _import(filePath, _cachedSize);
+                result = filePath;
+            }
+            catch (Exception ex)
+            {
+                DiagManager.Instance.LogError(ex, false);
+                await MessageBoxWindowView.Show(_dialogService,
+                    "Error importing from\n" + filePath + "\n\n" + ex.Message,
+                    "Import Failed", MessageBoxWindowView.MessageBoxButtons.Ok);
+            }
+        });
 
-        //recompute
-        // _reloadFullList();
+        _spriteRootNode.CachedPath = result;
     }
 
-    private void _tryImport(string currentPath, int tileSize)
+    public async Task DeleteAsync(string key)
     {
-        lock (GameBase.lockObj)
-        {
-            string sheetName = Path.GetFileNameWithoutExtension(currentPath);
-            string outputFile = PathMod.HardMod(String.Format(GraphicsManager.TILE_PATTERN, sheetName));
-
-            if (!Directory.Exists(Path.GetDirectoryName(outputFile)))
-                Directory.CreateDirectory(Path.GetDirectoryName(outputFile));
+        var res = await MessageBoxWindowView.Show(_dialogService,
+            $"Delete sprite '{key}'?", "Deleting Sprite",
+            MessageBoxWindowView.MessageBoxButtons.YesNo, true);
 
-            //load into tilesets
-            using (BaseSheet tileset = BaseSheet.Import(currentPath))
+        if (res == MessageBoxWindowView.MessageBoxResult.Yes)
+        {
+            lock (GameBase.lockObj)
             {
-                List<BaseSheet[]> tileList = new List<BaseSheet[]>();
-                tileList.Add(new BaseSheet[] { tileset });
-                ImportHelper.SaveTileSheet(tileList, outputFile, tileSize);
-            }
+                string animPath = PathMod.ModPath(String.Format(GraphicsManager.TILE_PATTERN, key));
+                if (File.Exists(animPath))
+                    File.Delete(animPath);
 
-            GraphicsManager.RebuildIndices(GraphicsManager.AssetType.Tile);
-            GraphicsManager.ClearCaches(GraphicsManager.AssetType.Tile);
-            DevDataManager.ClearCaches();
+                GraphicsManager.RebuildIndices(GraphicsManager.AssetType.Tile);
+                GraphicsManager.ClearCaches(GraphicsManager.AssetType.Tile);
 
-            DiagManager.Instance.LogInfo("Tiles from:\n" +
-                                         currentPath + "\nhave been imported.");
+                DiagManager.Instance.LogInfo("Deleted frames for:" + key);
+                OnReload?.Invoke();
+            }
         }
     }
 
-    private void _massImport(string currentPath, int tileSize)
+    public async Task ExportAsync(string key)
     {
-        DevForm.ExecuteOrPend(() => { _tryMassImport(currentPath, tileSize); });
-
-        //recompute
-        // _reloadFullList();
-    }
+        string folderName = DevForm.GetConfig("TilesetDir", Directory.GetCurrentDirectory());
 
-    private void _tryMassImport(string currentPath, int tileSize)
-    {
-        lock (GameBase.lockObj)
+        var options = new FilePickerSaveOptions
         {
-            if (!Directory.Exists(Path.GetDirectoryName(PathMod.HardMod(GraphicsManager.TILE_PATTERN))))
-                Directory.CreateDirectory(Path.GetDirectoryName(PathMod.HardMod(GraphicsManager.TILE_PATTERN)));
+            Title = "Export PNG",
+            DefaultExtension = "png",
+            FileTypeChoices =
+            [
+                new FilePickerFileType("PNG Files") { Patterns = ["*.png"] }
+            ]
+        };
 
-            ImportHelper.ImportAllTiles(currentPath, PathMod.HardMod(GraphicsManager.TILE_PATTERN), tileSize);
+        await Dispatcher.UIThread.InvokeAsync(async () =>
+        {
+            string filePath = await _dialogService.TryGetSaveFileAsync(options, folderName);
+            if (string.IsNullOrEmpty(filePath)) return;
 
-            GraphicsManager.RebuildIndices(GraphicsManager.AssetType.Tile);
-            GraphicsManager.ClearCaches(GraphicsManager.AssetType.Tile);
+            DevForm.SetConfig("TilesetDir", Path.GetDirectoryName(filePath));
 
-            DiagManager.Instance.LogInfo("Mass import complete.");
-        }
-    }
-    
-    private bool _massExport(string currentPath)
-    {
-        bool success = true;
-        string[] dirs = PathMod.GetModFiles(Path.GetDirectoryName(GraphicsManager.TILE_PATTERN),
-            String.Format(Path.GetFileName(GraphicsManager.TILE_PATTERN), "*"));
-        for (int ii = 0; ii < dirs.Length; ii++)
-        {
             try
             {
-                string filename = Path.GetFileNameWithoutExtension(dirs[ii]);
-                DevForm.ExecuteOrPend(() => { _export(Path.Combine(currentPath, filename + ".png"), filename); });
+                DevForm.ExecuteOrPend(() => { _export(filePath, key); });
             }
             catch (Exception ex)
             {
                 DiagManager.Instance.LogError(ex, false);
-                success = false;
+                await MessageBoxWindowView.Show(_dialogService,
+                    "Error exporting to\n" + filePath + "\n\n" + ex.Message,
+                    "Export Failed", MessageBoxWindowView.MessageBoxButtons.Ok);
             }
-        }
-
-        return success;
+        });
     }
 
-    private void _export(string currentPath, string anim)
+    public async Task ReImportAsync()
     {
-        lock (GameBase.lockObj)
+        await Dispatcher.UIThread.InvokeAsync(async () =>
         {
-            string animPath = PathMod.ModPath(String.Format(GraphicsManager.TILE_PATTERN, anim));
-            ImportHelper.ExportTileSheet(animPath, currentPath);
-
-            DiagManager.Instance.LogInfo("Frames from:\n" +
-                                         anim + "\nhave been exported to:" + currentPath);
-        }
+            try
+            {
+                _import(_spriteRootNode.CachedPath, _cachedSize);
+            }
+            catch (Exception ex)
+            {
+                DiagManager.Instance.LogError(ex, false);
+                await MessageBoxWindowView.Show(_dialogService,
+                    "Error importing from\n" + _spriteRootNode.CachedPath + "\n\n" + ex.Message,
+                    "Import Failed", MessageBoxWindowView.MessageBoxButtons.Ok);
+            }
+        });
     }
 }
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/DevForm/Nodes/SpriteRootAssetTypeStrategy.cs b/RogueEssence.Editor.Avalonia/ViewModels/DevForm/Nodes/SpriteRootAssetTypeStrategy.cs
deleted file mode 100644
index d7910dba..00000000
--- a/RogueEssence.Editor.Avalonia/ViewModels/DevForm/Nodes/SpriteRootAssetTypeStrategy.cs
+++ /dev/null
@@ -1,380 +0,0 @@
-using System;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-using Avalonia.Platform.Storage;
-using Avalonia.Threading;
-using RogueEssence.Content;
-using RogueEssence.Dev.Services;
-using RogueEssence.Dev.Views;
-
-namespace RogueEssence.Dev.ViewModels;
-
-public class SpriteRootAssetTypeStrategy : ISpriteRootOperationStrategy
-{
-    private readonly IDialogService _dialogService;
-    private readonly NodeFactory _nodeFactory;
-    private readonly SpriteRootNode _spriteRootNode;
-    
-    
-    private void _export(string currentPath, string anim)
-    {
-        lock (GameBase.lockObj)
-        {
-            string animPath = PathMod.ModPath(String.Format(GraphicsManager.GetPattern(_spriteRootNode.AssetType), anim));
-            if (File.Exists(animPath))
-            {
-                //read file and read binary data
-                using (FileStream fileStream = File.OpenRead(animPath))
-                {
-                    using (BinaryReader reader = new BinaryReader(fileStream))
-                    {
-                        DirSheet sheet = DirSheet.Load(reader);
-
-                        string filename = DirSheet.GetExportString(sheet, Path.GetFileNameWithoutExtension(currentPath));
-                        string dirname = Path.GetDirectoryName(currentPath);
-                        DirSheet.Export(sheet, Path.Combine(dirname, filename + ".png"));
-                    }
-                }
-            }
-
-            DiagManager.Instance.LogInfo("Frames from:\n" +
-                                         anim +
-                                         "\nhave been exported to:" + currentPath);
-        }
-    }
-    
-    private bool _massExport(string currentPath, GraphicsManager.AssetType assetType)
-    {
-        bool success = true;
-        string assetPattern = GraphicsManager.GetPattern(assetType);
-        string[] dirs = PathMod.GetModFiles(Path.GetDirectoryName(assetPattern), String.Format(Path.GetFileName(assetPattern), "*"));
-        for (int ii = 0; ii < dirs.Length; ii++)
-        {
-            try
-            {
-                string filename = Path.GetFileNameWithoutExtension(dirs[ii]);
-                DevForm.ExecuteOrPend(() => { _export(currentPath + filename, filename); });
-            }
-            catch (Exception ex)
-            {
-                DiagManager.Instance.LogError(ex, false);
-                success = false;
-            }
-        }
-        return success;
-    }
-
-    public SpriteRootAssetTypeStrategy(IDialogService dialogService, SpriteRootNode spriteRootNode)
-    {
-        _dialogService = dialogService;
-        _spriteRootNode = spriteRootNode;
-    }
-
-    // public async Task<NodeBase> AddAsync()
-    // {
-    //     
-    //     Console.WriteLine("TODO: Resolve this later...");
-    //     var vm = new RenameWindowViewModel();
-    //     bool result = await _dialogService.ShowDialogAsync<RenameWindowViewModel, bool>(
-    //         vm, "Add sprite ID");
-    //
-    //     if (!result) return null;
-    //
-    //     return _nodeFactory.CreateDataItemNode<DevEditPageViewModel>(
-    //         vm.Name, vm.Name + ":", "Icons.PaintBrushFill");
-    // }
-
-    public async Task DeleteAsync(DataItemNode node)
-    {
-        var res = await MessageBoxWindowView.Show(_dialogService, $"Delete sprite '{node.Title}'?", "Deleting Sprite", MessageBoxWindowView.MessageBoxButtons.YesNo, true);
-
-        var assetType = _spriteRootNode.AssetType;
-        if (res == MessageBoxWindowView.MessageBoxResult.Yes)
-        {
-            lock (GameBase.lockObj)
-            {
-                string anim = node.ItemKey;
-                string animPath = PathMod.ModPath(String.Format(GraphicsManager.GetPattern(assetType), anim));
-                if (File.Exists(animPath))
-                    File.Delete(animPath);
-
-                GraphicsManager.RebuildIndices(assetType);
-                GraphicsManager.ClearCaches(assetType);
-
-                DiagManager.Instance.LogInfo("Deleted frames for:" + anim);
-                _spriteRootNode.SubNodes.Remove(node);
-            }
-            
-        }
-    }
-
-
-    public async Task MassExportAsync()
-    {
-        string name = _spriteRootNode.AssetType.ToString();
-        
-        //remember addresses in registry
-        string folderName = DevForm.GetConfig(name+ "Dir", Directory.GetCurrentDirectory());
-
-        
-        //open window to choose directory
-        await Dispatcher.UIThread.InvokeAsync(async () =>
-        {
-            var options = new FolderPickerOpenOptions
-            {
-                Title = $"Select folder to mass export {name} to",
-                AllowMultiple = false,
-            };
-            var folder = await _dialogService.ShowFolderPickerAsync(options, folderName);
-            if (folder == null) return;
-
-            DevForm.SetConfig(name + "Dir", folder);
-            _spriteRootNode.CachedPath = folder + "/";
-
-
-            bool success = _massExport(_spriteRootNode.CachedPath, _spriteRootNode.AssetType);
-            if (!success)
-            {
-                await MessageBoxWindowView.Show(_dialogService, "Errors found exporting to\n" + _spriteRootNode.CachedPath + "\n\nCheck logs for more info.", "Mass Export Failed", MessageBoxWindowView.MessageBoxButtons.Ok);
-            }
-        });
-    }
-
-    public async Task MassImportAsync()
-    {
-        await MessageBoxWindowView.Show(_dialogService, "Note: Importing a sprite to a slot that is already filled will automatically overwrite the old one.", "Mass Import", MessageBoxWindowView.MessageBoxButtons.Ok);
-        string name = _spriteRootNode.AssetType.ToString();
-        
-        //remember addresses in registry
-        string folderName = DevForm.GetConfig(name + "Dir", Directory.GetCurrentDirectory());
-
-        var options = new FolderPickerOpenOptions
-        {
-            Title = $"Select folder to mass import \"{name}\" from",
-            AllowMultiple = false,
-        };
-        var result = await _dialogService.ShowFolderPickerAsync(options, folderName);
-
-        if (result == null) return;
-        
-        DevForm.SetConfig(name + "Dir", result);
-        _spriteRootNode.CachedPath = result + "/";
-        
-        try
-        {
-            MassImport(_spriteRootNode.CachedPath);
-        }
-        catch (Exception ex)
-        {
-            DiagManager.Instance.LogError(ex, false);
-            
-            await MessageBoxWindowView.Show(_dialogService, "Error importing from\n" + _spriteRootNode.CachedPath + "\n\n" + ex.Message, "Import Failed", MessageBoxWindowView.MessageBoxButtons.Ok);
-        }
-        
-    }
-    
-    private void _recomputeAnimList()
-    {
-        lock (GameBase.lockObj)
-        {
-            _spriteRootNode.SubNodes.Clear();
-            GraphicsManager.AssetType assetType = _spriteRootNode.AssetType;
-            string assetPattern = GraphicsManager.GetPattern(assetType);
-            string[] dirs = PathMod.GetModFiles(Path.GetDirectoryName(assetPattern), String.Format(Path.GetFileName(assetPattern), "*"));
-            for (int ii = 0; ii < dirs.Length; ii++)
-            {
-                string filename = Path.GetFileNameWithoutExtension(dirs[ii]);
-            }
-        }
-    }
-    
-    private void _import(string currentPath)
-    {
-        DevForm.ExecuteOrPend(() => { _tryImport(currentPath); });
-
-        //recompute
-        _recomputeAnimList();
-    }
-
-    private void _tryImport(string currentPath)
-    {
-        lock (GameBase.lockObj)
-        {
-            GraphicsManager.AssetType assetType = _spriteRootNode.AssetType;
-            string assetPattern = GraphicsManager.GetPattern(assetType);
-            string destFile;
-            string animName = Path.GetFileNameWithoutExtension(currentPath);
-            if (Directory.Exists(currentPath))
-                destFile = PathMod.HardMod(String.Format(assetPattern, animName));
-            else
-            {
-                string[] components = animName.Split('.');
-                if (components.Length != 2)
-                    throw new ArgumentException(
-                        "The input filename does not fit the convention of \"<Anim Name>.<Anim Type>.png\"!");
-                destFile = PathMod.HardMod(String.Format(assetPattern, components[0]));
-            }
-
-            if (!Directory.Exists(Path.GetDirectoryName(destFile)))
-                Directory.CreateDirectory(Path.GetDirectoryName(destFile));
-
-            //write sprite data
-            using (DirSheet sheet = DirSheet.Import(currentPath))
-            {
-                using (FileStream stream = File.OpenWrite(destFile))
-                {
-                    //save data
-                    using (BinaryWriter writer = new BinaryWriter(stream))
-                        sheet.Save(writer);
-                }
-            }
-
-            GraphicsManager.RebuildIndices(assetType);
-            GraphicsManager.ClearCaches(assetType);
-
-            DiagManager.Instance.LogInfo("Frames from:\n" +
-                                         currentPath + "\nhave been imported.");
-        }
-    }
-
-
-    private void MassImport(string currentPath)
-    {
-        DevForm.ExecuteOrPend(() => { _tryMassImport(currentPath); });
-        //recompute
-        _recomputeAnimList();
-    }
-    private void _tryMassImport(string currentPath)
-    {
-        lock (GameBase.lockObj)
-        {
-            GraphicsManager.AssetType assetType = _spriteRootNode.AssetType;
-            string assetPattern = GraphicsManager.GetPattern(assetType);
-            if (!Directory.Exists(Path.GetDirectoryName(PathMod.HardMod(assetPattern))))
-                Directory.CreateDirectory(Path.GetDirectoryName(PathMod.HardMod(assetPattern)));
-            ImportHelper.ImportAllNameDirs(currentPath, PathMod.HardMod(assetPattern));
-
-            GraphicsManager.RebuildIndices(assetType);
-            GraphicsManager.ClearCaches(assetType);
-
-            DiagManager.Instance.LogInfo("Mass import complete.");
-        }
-    }
-
-    public async Task ExportAsync(DataItemNode node)
-    {
-        string name = _spriteRootNode.AssetType.ToString();
-        string folderName = DevForm.GetConfig(name + "Dir", Directory.GetCurrentDirectory());
-        var options = new FilePickerSaveOptions
-        {
-            Title = "Export PNG",
-            DefaultExtension = "png",
-            FileTypeChoices =
-            [
-                new FilePickerFileType("PNG Files")
-                {
-                    Patterns = new[] { "*.png" }
-                }
-            ]
-        };
-
-        await Dispatcher.UIThread.InvokeAsync(async () =>
-        {
-
-            var filePath = await _dialogService.TryGetSaveFileAsync(options, folderName);
-            if (!String.IsNullOrEmpty(filePath))
-            {
-                DevForm.SetConfig(name + "Dir", Path.GetDirectoryName(filePath));
-
-                try
-                {
-                    DevForm.ExecuteOrPend(() => { _export(filePath, node.ItemKey); });
-                }
-                catch (Exception ex)
-                {
-                    DiagManager.Instance.LogError(ex, false);
-
-
-                    await MessageBoxWindowView.Show(_dialogService, $"Error exporting to\n{filePath}\n\n{ex.Message}", "Export Failed", MessageBoxWindowView.MessageBoxButtons.Ok);
-                }
-            }
-        });
-
-    }
-
-    public async Task ImportAsync()
-    {
-        string name = _spriteRootNode.AssetType.ToString();
-        string folderName = DevForm.GetConfig(name + "Dir", Directory.GetCurrentDirectory());
-        var options = new FilePickerOpenOptions
-        {
-            Title = "Open .png or .xml File",
-            AllowMultiple = false,
-            FileTypeFilter =
-            [
-                new FilePickerFileType("PNG Files")
-                {
-                    Patterns = ["*.png"]
-                },
-                new FilePickerFileType("DirData XML")
-                {
-                    Patterns = ["*.xml"]
-                }
-            ]
-        };
-        await Dispatcher.UIThread.InvokeAsync(async () =>
-        {
-
-            var filePath = await _dialogService.ShowFilePickerAsync(options, folderName);
-
-            if (filePath != null)
-            {
-                string animName = Path.GetFileNameWithoutExtension(filePath);
-                if (_spriteRootNode.SubNodes.Any(n => n.Title == animName))
-                {
-
-                    MessageBoxWindowView.MessageBoxResult result = await MessageBoxWindowView.Show(_dialogService, "Are you sure you want to overwrite the existing sheet:\n" + animName, "Sprite Sheet already exists.", MessageBoxWindowView.MessageBoxButtons.YesNo);
-                    if (result == MessageBoxWindowView.MessageBoxResult.No)
-                        return;
-                }
-
-                DevForm.SetConfig(name + "Dir", Path.GetDirectoryName(filePath));
-                if (Path.GetExtension(filePath) == ".xml")
-                    _spriteRootNode.CachedPath = Path.GetDirectoryName(filePath);
-                else
-                    _spriteRootNode.CachedPath = filePath;
-
-                try
-                {
-                    _import(_spriteRootNode.CachedPath);
-                }
-                catch (Exception ex)
-                {
-                    DiagManager.Instance.LogError(ex, false);
-                    await MessageBoxWindowView.Show(_dialogService, "Error importing from\n" + _spriteRootNode.CachedPath + "\n\n" + ex.Message, "Import Failed", MessageBoxWindowView.MessageBoxButtons.Ok);
-                    return;
-                }
-
-            }
-        });
-    }
-
-    public async Task ReImportAsync()
-    {
-        await Dispatcher.UIThread.InvokeAsync(async () =>
-        {
-            try
-            {
-                _import(_spriteRootNode.CachedPath);
-            }
-            catch (Exception ex)
-            {
-                DiagManager.Instance.LogError(ex, false);
-                await MessageBoxWindowView.Show(_dialogService, "Error importing from\n" + _spriteRootNode.CachedPath + "\n\n" + ex.Message, "Import Failed", MessageBoxWindowView.MessageBoxButtons.Ok);
-                return;
-            }
-
-        });
-    }
-}
\ No newline at end of file

From 457312dd7d0a2d4f8a34653d3ad9d7fc27450fdd Mon Sep 17 00:00:00 2001
From: Kace <41309226+DoubleTrio@users.noreply.github.com>
Date: Thu, 21 May 2026 23:50:56 -0400
Subject: [PATCH 41/51] more refactor

---
 .../ViewModels/Content/BeamEditViewModel.cs   | 812 +++++++++---------
 .../ViewModels/DevForm/Nodes/NodeBase.cs      | 159 +---
 .../ViewModels/Pages/SpritePageViewModel.cs   | 526 +-----------
 .../Views/Pages/SpritePageView.axaml          |   2 +-
 4 files changed, 430 insertions(+), 1069 deletions(-)

diff --git a/RogueEssence.Editor.Avalonia/ViewModels/Content/BeamEditViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/Content/BeamEditViewModel.cs
index 54112353..29f99a55 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/Content/BeamEditViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/Content/BeamEditViewModel.cs
@@ -1,406 +1,406 @@
-// using Avalonia.Interactivity;
-// using System;
-// using System.Collections.Generic;
-// using System.Text;
-// using ReactiveUI;
-// using System.Collections.ObjectModel;
-// using Avalonia.Controls;
-// using RogueEssence.Dungeon;
-// using RogueEssence.Data;
-// using RogueEssence.Content;
-// using System.IO;
-// using System.Linq;
-// using Avalonia.Media.Imaging;
-// using Avalonia.Platform.Storage;
-// using Avalonia.Threading;
-// using RogueElements;
-// using RogueEssence.Dev.Views;
-//
-// namespace RogueEssence.Dev.ViewModels
-// {
-//     public class BeamEditViewModel : ViewModelBase
-//     {
-//         private GraphicsManager.AssetType assetType;
-//         private Window parent;
-//
-//
-//         public string Name { get { return assetType.ToString(); } }
-//
-//
-//         private List<string> anims;
-//         public SearchListBoxViewModel Anims { get; set; }
-//
-//         private string cachedPath;
-//         public string CachedPath
-//         {
-//             get => cachedPath;
-//             set => this.SetIfChanged(ref cachedPath, value);
-//         }
-//
-//
-//         public BeamEditViewModel()
-//         {
-//             anims = new List<string>();
-//
-//             Anims = new SearchListBoxViewModel();
-//             Anims.DataName = "Graphics:";
-//             //TODO: properly support beam/column anims
-//             //Anims.SelectedIndexChanged += Anims_SelectedIndexChanged;
-//
-//         }
-//
-//         public void LoadDataEntries(GraphicsManager.AssetType assetType, Window parent)
-//         {
-//             this.assetType = assetType;
-//             this.parent = parent;
-//
-//             //Anims.DataName = assetType.ToString() + ":";
-//             recomputeAnimList();
-//         }
-//
-//         private void recomputeAnimList()
-//         {
-//             lock (GameBase.lockObj)
-//             {
-//                 anims.Clear();
-//                 Anims.Clear();
-//                 string assetPattern = GraphicsManager.GetPattern(assetType);
-//                 string[] dirs = PathMod.GetModFiles(Path.GetDirectoryName(assetPattern), String.Format(Path.GetFileName(assetPattern), "*"));
-//                 for (int ii = 0; ii < dirs.Length; ii++)
-//                 {
-//                     string filename = Path.GetFileNameWithoutExtension(dirs[ii]);
-//                     anims.Add(filename);
-//                 }
-//                 Anims.SetItems(anims);
-//             }
-//         }
-//
-//         public async void mnuMassImport_Click()
-//         {
-//             await MessageBox.Show(parent, "Note: Importing a sprite to a slot that is already filled will automatically overwrite the old one.", "Mass Import", MessageBox.MessageBoxButtons.Ok);
-//
-//             //remember addresses in registry
-//             string folderName = DevForm.GetConfig(Name + "Dir", Directory.GetCurrentDirectory());
-//             
-//             //open window to choose directory
-//             IStorageFolder directory = await parent.StorageProvider.TryGetFolderFromPathAsync(folderName);
-//             await Dispatcher.UIThread.InvokeAsync(async () =>
-//             {
-//                 IReadOnlyList<IStorageFolder> results = await parent.StorageProvider.OpenFolderPickerAsync(
-//                     new FolderPickerOpenOptions
-//                     {
-//                         Title = "Select folder to mass import",
-//                         SuggestedStartLocation = directory,
-//                         AllowMultiple = false,
-//                     });
-//
-//                 if (results.Count <= 0)
-//                     return;
-//
-//                 string folder = results.First().Path.LocalPath;
-//                 
-//                 DevForm.SetConfig(Name + "Dir", folder);
-//                 CachedPath = folder + "/";
-//
-//                 try
-//                 {
-//                     lock (GameBase.lockObj)
-//                         MassImport(CachedPath);
-//                 }
-//                 catch (Exception ex)
-//                 {
-//                     DiagManager.Instance.LogError(ex, false);
-//                     await MessageBox.Show(parent, "Error importing from\n" + CachedPath + "\n\n" + ex.Message, "Import Failed", MessageBox.MessageBoxButtons.Ok);
-//                     return;
-//                 }
-//
-//             });
-//
-//         }
-//
-//         public async void mnuMassExport_Click()
-//         {
-//             //remember addresses in registry
-//             string folderName = DevForm.GetConfig(Name + "Dir", Directory.GetCurrentDirectory());
-//
-//             //open window to choose directory
-//             IStorageFolder directory = await parent.StorageProvider.TryGetFolderFromPathAsync(folderName);
-//             await Dispatcher.UIThread.InvokeAsync(async () =>
-//             {
-//                 IReadOnlyList<IStorageFolder> results = await parent.StorageProvider.OpenFolderPickerAsync(
-//                     new FolderPickerOpenOptions
-//                     {
-//                         Title = "Select folder to mass export to",
-//                         SuggestedStartLocation = directory,
-//                         AllowMultiple = false,
-//                     });
-//
-//                 if (results.Count <= 0)
-//                     return;
-//
-//                 string folder = results.First().Path.LocalPath;
-//                 DevForm.SetConfig(Name + "Dir", folder);
-//                 CachedPath = folder + "/";
-//
-//                 bool success = MassExport(CachedPath);
-//                 if (!success)
-//                     await MessageBox.Show(parent, "Errors found exporting to\n" + CachedPath + "\n\nCheck logs for more info.", "Mass Export Failed", MessageBox.MessageBoxButtons.Ok);
-//             });
-//         }
-//
-//         public async void btnImport_Click()
-//         {
-//             //remember addresses in registry
-//             string folderName = DevForm.GetConfig(Name + "Dir", Directory.GetCurrentDirectory());
-//
-//             //open window to choose directory
-//             IStorageFolder directory = await parent.StorageProvider.TryGetFolderFromPathAsync(folderName);
-//             await Dispatcher.UIThread.InvokeAsync(async () =>
-//             {
-//                 IReadOnlyList<IStorageFolder> results = await parent.StorageProvider.OpenFolderPickerAsync(
-//                     new FolderPickerOpenOptions
-//                     {
-//                         Title = "Select folder to import",
-//                         SuggestedStartLocation = directory,
-//                         AllowMultiple = false,
-//                     });
-//
-//                 if (results.Count <= 0)
-//                     return;
-//
-//                 string folder = results.First().Path.LocalPath;
-//                 string animName = Path.GetFileNameWithoutExtension(folder);
-//
-//                 if (anims.Contains(animName))
-//                 {
-//                     MessageBox.MessageBoxResult result = await MessageBox.Show(parent, "Are you sure you want to overwrite the existing sheet:\n" + animName, "Sprite Sheet already exists.",
-//                         MessageBox.MessageBoxButtons.YesNo);
-//                     if (result == MessageBox.MessageBoxResult.No)
-//                         return;
-//                 }
-//
-//                 DevForm.SetConfig(Name + "Dir", Path.GetDirectoryName(folder));
-//                 CachedPath = folder;
-//
-//                 try
-//                 {
-//                     Import(CachedPath);
-//                 }
-//                 catch (Exception ex)
-//                 {
-//                     DiagManager.Instance.LogError(ex, false);
-//                     await MessageBox.Show(parent, "Error importing from\n" + CachedPath + "\n\n" + ex.Message, "Import Failed", MessageBox.MessageBoxButtons.Ok);
-//                     return;
-//                 }
-//             });
-//         }
-//
-//         public async void btnReImport_Click()
-//         {
-//             try
-//             {
-//                 Import(CachedPath);
-//             }
-//             catch (Exception ex)
-//             {
-//                 DiagManager.Instance.LogError(ex, false);
-//                 await MessageBox.Show(parent, "Error importing from\n" + CachedPath + "\n\n" + ex.Message, "Import Failed", MessageBox.MessageBoxButtons.Ok);
-//                 return;
-//             }
-//         }
-//
-//         public async void btnExport_Click()
-//         {
-//             //get current sprite
-//             string animData = anims[Anims.InternalIndex];
-//
-//             //remember addresses in registry
-//             string folderName = DevForm.GetConfig(Name + "Dir", Directory.GetCurrentDirectory());
-//
-//             //open window to choose directory
-//             IStorageFolder directory = await parent.StorageProvider.TryGetFolderFromPathAsync(folderName);
-//             await Dispatcher.UIThread.InvokeAsync(async () =>
-//             {
-//                 IReadOnlyList<IStorageFolder> results = await parent.StorageProvider.OpenFolderPickerAsync(
-//                     new FolderPickerOpenOptions
-//                     {
-//                         Title = "Select folder to export to",
-//                         SuggestedStartLocation = directory,
-//                         AllowMultiple = false,
-//                     });
-//
-//                 if (results.Count <= 0)
-//                     return;
-//
-//                 string folder = results.First().Path.LocalPath;
-//                 DevForm.SetConfig(Name + "Dir", Path.GetDirectoryName(folder));
-//                 //CachedPath = folder;
-//
-//                 try
-//                 {
-//                     DevForm.ExecuteOrPend(() => { Export(folder, animData); });
-//                 }
-//                 catch (Exception ex)
-//                 {
-//                     DiagManager.Instance.LogError(ex, false);
-//                     await MessageBox.Show(parent, "Error exporting to\n" + CachedPath + "\n\n" + ex.Message, "Export Failed", MessageBox.MessageBoxButtons.Ok);
-//                     return;
-//                 }
-//             });
-//         }
-//
-//         public async void btnDelete_Click()
-//         {
-//             //get current sprite
-//             int animIdx = Anims.InternalIndex;
-//
-//             MessageBox.MessageBoxResult result = await MessageBox.Show(parent, "Are you sure you want to delete the following sheet:\n" + anims[animIdx], "Delete Sprite Sheet.",
-//                 MessageBox.MessageBoxButtons.YesNo);
-//             if (result == MessageBox.MessageBoxResult.No)
-//                 return;
-//
-//             Delete(animIdx);
-//         }
-//
-//
-//
-//         private void MassImport(string currentPath)
-//         {
-//             string assetPattern = GraphicsManager.GetPattern(assetType);
-//             if (!Directory.Exists(Path.GetDirectoryName(PathMod.HardMod(assetPattern))))
-//                 Directory.CreateDirectory(Path.GetDirectoryName(PathMod.HardMod(assetPattern)));
-//             ImportHelper.ImportAllBeams(currentPath, PathMod.HardMod(assetPattern));
-//
-//             GraphicsManager.RebuildIndices(assetType);
-//             GraphicsManager.ClearCaches(assetType);
-//
-//             DiagManager.Instance.LogInfo("Mass import complete.");
-//
-//             //recompute
-//             recomputeAnimList();
-//         }
-//
-//
-//         private void Import(string currentPath)
-//         {
-//             DevForm.ExecuteOrPend(() => { tryImport(currentPath); });
-//
-//             //recompute
-//             recomputeAnimList();
-//         }
-//
-//         private void tryImport(string currentPath)
-//         {
-//             lock (GameBase.lockObj)
-//             {
-//                 string animName = Path.GetFileNameWithoutExtension(currentPath);
-//                 string destFile = PathMod.HardMod(String.Format(GraphicsManager.GetPattern(assetType), animName));
-//                 if (!Directory.Exists(Path.GetDirectoryName(destFile)))
-//                     Directory.CreateDirectory(Path.GetDirectoryName(destFile));
-//
-//                 //write sprite data
-//                 using (BeamSheet sheet = BeamSheet.Import(currentPath + "/"))
-//                 {
-//                     using (FileStream stream = File.OpenWrite(destFile))
-//                     {
-//                         using (BinaryWriter writer = new BinaryWriter(stream))
-//                             sheet.Save(writer);
-//                     }
-//                 }
-//
-//                 GraphicsManager.RebuildIndices(assetType);
-//                 GraphicsManager.ClearCaches(assetType);
-//
-//                 DiagManager.Instance.LogInfo("Frames from:\n" +
-//                     currentPath + "\nhave been imported.");
-//             }
-//         }
-//
-//
-//         private bool MassExport(string currentPath)
-//         {
-//             bool success = true;
-//             string assetPattern = GraphicsManager.GetPattern(assetType);
-//             string[] dirs = PathMod.GetModFiles(Path.GetDirectoryName(assetPattern), String.Format(Path.GetFileName(assetPattern), "*"));
-//             for (int ii = 0; ii < dirs.Length; ii++)
-//             {
-//                 try
-//                 {
-//                     string filename = Path.GetFileNameWithoutExtension(dirs[ii]);
-//                     DevForm.ExecuteOrPend(() => { Export(currentPath + filename, filename); });
-//                 }
-//                 catch (Exception ex)
-//                 {
-//                     DiagManager.Instance.LogError(ex, false);
-//                     success = false;
-//                 }
-//             }
-//             return success;
-//         }
-//
-//         private void Export(string currentPath, string anim)
-//         {
-//             lock (GameBase.lockObj)
-//             {
-//                 if (!Directory.Exists(currentPath))
-//                     Directory.CreateDirectory(currentPath);
-//
-//                 string animPath = PathMod.ModPath(String.Format(GraphicsManager.GetPattern(assetType), anim));
-//                 if (File.Exists(animPath))
-//                 {
-//                     //read file and read binary data
-//                     using (FileStream fileStream = File.OpenRead(animPath))
-//                     {
-//                         using (BinaryReader reader = new BinaryReader(fileStream))
-//                         {
-//                             BeamSheet sheet = BeamSheet.Load(reader);
-//                             BeamSheet.Export(sheet, currentPath + "/");
-//                         }
-//                     }
-//                 }
-//
-//                 DiagManager.Instance.LogInfo("Frames from:\n" +
-//                     anim +
-//                     "\nhave been exported to:" + currentPath);
-//             }
-//         }
-//
-//
-//         private void Delete(int animIdx)
-//         {
-//             lock (GameBase.lockObj)
-//             {
-//                 string anim = anims[animIdx];
-//
-//                 string animPath = PathMod.ModPath(String.Format(GraphicsManager.GetPattern(assetType), anim));
-//                 if (File.Exists(animPath))
-//                     File.Delete(animPath);
-//
-//                 GraphicsManager.RebuildIndices(assetType);
-//                 GraphicsManager.ClearCaches(assetType);
-//
-//                 DiagManager.Instance.LogInfo("Deleted frames for:" + anim);
-//
-//                 anims.RemoveAt(animIdx);
-//                 Anims.RemoveInternalAt(animIdx);
-//             }
-//         }
-//
-//
-//         private void Anims_SelectedIndexChanged()
-//         {
-//             CachedPath = null;
-//             if (Anims.InternalIndex == -1)
-//                 return;
-//
-//             lock (GameBase.lockObj)
-//             {
-//                 if (DungeonScene.Instance != null)
-//                 {
-//                     DungeonScene.Instance.DebugAsset = assetType;
-//                     DungeonScene.Instance.DebugAnim = anims[Anims.InternalIndex];
-//                 }
-//             }
-//         }
-//     }
-// }
+using Avalonia.Interactivity;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using ReactiveUI;
+using System.Collections.ObjectModel;
+using Avalonia.Controls;
+using RogueEssence.Dungeon;
+using RogueEssence.Data;
+using RogueEssence.Content;
+using System.IO;
+using System.Linq;
+using Avalonia.Media.Imaging;
+using Avalonia.Platform.Storage;
+using Avalonia.Threading;
+using RogueElements;
+using RogueEssence.Dev.Views;
+
+namespace RogueEssence.Dev.ViewModels
+{
+    public class BeamEditViewModel : ViewModelBase
+    {
+        private GraphicsManager.AssetType assetType;
+        private Window parent;
+
+
+        public string Name { get { return assetType.ToString(); } }
+
+
+        private List<string> anims;
+        public SearchListBoxViewModel Anims { get; set; }
+
+        private string cachedPath;
+        public string CachedPath
+        {
+            get => cachedPath;
+            set => this.SetIfChanged(ref cachedPath, value);
+        }
+
+
+        public BeamEditViewModel()
+        {
+            anims = new List<string>();
+
+            Anims = new SearchListBoxViewModel();
+            Anims.DataName = "Graphics:";
+            //TODO: properly support beam/column anims
+            //Anims.SelectedIndexChanged += Anims_SelectedIndexChanged;
+
+        }
+
+        public void LoadDataEntries(GraphicsManager.AssetType assetType, Window parent)
+        {
+            this.assetType = assetType;
+            this.parent = parent;
+
+            //Anims.DataName = assetType.ToString() + ":";
+            recomputeAnimList();
+        }
+
+        private void recomputeAnimList()
+        {
+            lock (GameBase.lockObj)
+            {
+                anims.Clear();
+                Anims.Clear();
+                string assetPattern = GraphicsManager.GetPattern(assetType);
+                string[] dirs = PathMod.GetModFiles(Path.GetDirectoryName(assetPattern), String.Format(Path.GetFileName(assetPattern), "*"));
+                for (int ii = 0; ii < dirs.Length; ii++)
+                {
+                    string filename = Path.GetFileNameWithoutExtension(dirs[ii]);
+                    anims.Add(filename);
+                }
+                Anims.SetItems(anims);
+            }
+        }
+
+        public async void mnuMassImport_Click()
+        {
+            await MessageBox.Show(parent, "Note: Importing a sprite to a slot that is already filled will automatically overwrite the old one.", "Mass Import", MessageBox.MessageBoxButtons.Ok);
+
+            //remember addresses in registry
+            string folderName = DevForm.GetConfig(Name + "Dir", Directory.GetCurrentDirectory());
+            
+            //open window to choose directory
+            IStorageFolder directory = await parent.StorageProvider.TryGetFolderFromPathAsync(folderName);
+            await Dispatcher.UIThread.InvokeAsync(async () =>
+            {
+                IReadOnlyList<IStorageFolder> results = await parent.StorageProvider.OpenFolderPickerAsync(
+                    new FolderPickerOpenOptions
+                    {
+                        Title = "Select folder to mass import",
+                        SuggestedStartLocation = directory,
+                        AllowMultiple = false,
+                    });
+
+                if (results.Count <= 0)
+                    return;
+
+                string folder = results.First().Path.LocalPath;
+                
+                DevForm.SetConfig(Name + "Dir", folder);
+                CachedPath = folder + "/";
+
+                try
+                {
+                    lock (GameBase.lockObj)
+                        MassImport(CachedPath);
+                }
+                catch (Exception ex)
+                {
+                    DiagManager.Instance.LogError(ex, false);
+                    await MessageBox.Show(parent, "Error importing from\n" + CachedPath + "\n\n" + ex.Message, "Import Failed", MessageBox.MessageBoxButtons.Ok);
+                    return;
+                }
+
+            });
+
+        }
+
+        public async void mnuMassExport_Click()
+        {
+            //remember addresses in registry
+            string folderName = DevForm.GetConfig(Name + "Dir", Directory.GetCurrentDirectory());
+
+            //open window to choose directory
+            IStorageFolder directory = await parent.StorageProvider.TryGetFolderFromPathAsync(folderName);
+            await Dispatcher.UIThread.InvokeAsync(async () =>
+            {
+                IReadOnlyList<IStorageFolder> results = await parent.StorageProvider.OpenFolderPickerAsync(
+                    new FolderPickerOpenOptions
+                    {
+                        Title = "Select folder to mass export to",
+                        SuggestedStartLocation = directory,
+                        AllowMultiple = false,
+                    });
+
+                if (results.Count <= 0)
+                    return;
+
+                string folder = results.First().Path.LocalPath;
+                DevForm.SetConfig(Name + "Dir", folder);
+                CachedPath = folder + "/";
+
+                bool success = MassExport(CachedPath);
+                if (!success)
+                    await MessageBox.Show(parent, "Errors found exporting to\n" + CachedPath + "\n\nCheck logs for more info.", "Mass Export Failed", MessageBox.MessageBoxButtons.Ok);
+            });
+        }
+
+        public async void btnImport_Click()
+        {
+            //remember addresses in registry
+            string folderName = DevForm.GetConfig(Name + "Dir", Directory.GetCurrentDirectory());
+
+            //open window to choose directory
+            IStorageFolder directory = await parent.StorageProvider.TryGetFolderFromPathAsync(folderName);
+            await Dispatcher.UIThread.InvokeAsync(async () =>
+            {
+                IReadOnlyList<IStorageFolder> results = await parent.StorageProvider.OpenFolderPickerAsync(
+                    new FolderPickerOpenOptions
+                    {
+                        Title = "Select folder to import",
+                        SuggestedStartLocation = directory,
+                        AllowMultiple = false,
+                    });
+
+                if (results.Count <= 0)
+                    return;
+
+                string folder = results.First().Path.LocalPath;
+                string animName = Path.GetFileNameWithoutExtension(folder);
+
+                if (anims.Contains(animName))
+                {
+                    MessageBox.MessageBoxResult result = await MessageBox.Show(parent, "Are you sure you want to overwrite the existing sheet:\n" + animName, "Sprite Sheet already exists.",
+                        MessageBox.MessageBoxButtons.YesNo);
+                    if (result == MessageBox.MessageBoxResult.No)
+                        return;
+                }
+
+                DevForm.SetConfig(Name + "Dir", Path.GetDirectoryName(folder));
+                CachedPath = folder;
+
+                try
+                {
+                    Import(CachedPath);
+                }
+                catch (Exception ex)
+                {
+                    DiagManager.Instance.LogError(ex, false);
+                    await MessageBox.Show(parent, "Error importing from\n" + CachedPath + "\n\n" + ex.Message, "Import Failed", MessageBox.MessageBoxButtons.Ok);
+                    return;
+                }
+            });
+        }
+
+        public async void btnReImport_Click()
+        {
+            try
+            {
+                Import(CachedPath);
+            }
+            catch (Exception ex)
+            {
+                DiagManager.Instance.LogError(ex, false);
+                await MessageBox.Show(parent, "Error importing from\n" + CachedPath + "\n\n" + ex.Message, "Import Failed", MessageBox.MessageBoxButtons.Ok);
+                return;
+            }
+        }
+
+        public async void btnExport_Click()
+        {
+            //get current sprite
+            string animData = anims[Anims.InternalIndex];
+
+            //remember addresses in registry
+            string folderName = DevForm.GetConfig(Name + "Dir", Directory.GetCurrentDirectory());
+
+            //open window to choose directory
+            IStorageFolder directory = await parent.StorageProvider.TryGetFolderFromPathAsync(folderName);
+            await Dispatcher.UIThread.InvokeAsync(async () =>
+            {
+                IReadOnlyList<IStorageFolder> results = await parent.StorageProvider.OpenFolderPickerAsync(
+                    new FolderPickerOpenOptions
+                    {
+                        Title = "Select folder to export to",
+                        SuggestedStartLocation = directory,
+                        AllowMultiple = false,
+                    });
+
+                if (results.Count <= 0)
+                    return;
+
+                string folder = results.First().Path.LocalPath;
+                DevForm.SetConfig(Name + "Dir", Path.GetDirectoryName(folder));
+                //CachedPath = folder;
+
+                try
+                {
+                    DevForm.ExecuteOrPend(() => { Export(folder, animData); });
+                }
+                catch (Exception ex)
+                {
+                    DiagManager.Instance.LogError(ex, false);
+                    await MessageBox.Show(parent, "Error exporting to\n" + CachedPath + "\n\n" + ex.Message, "Export Failed", MessageBox.MessageBoxButtons.Ok);
+                    return;
+                }
+            });
+        }
+
+        public async void btnDelete_Click()
+        {
+            //get current sprite
+            int animIdx = Anims.InternalIndex;
+
+            MessageBox.MessageBoxResult result = await MessageBox.Show(parent, "Are you sure you want to delete the following sheet:\n" + anims[animIdx], "Delete Sprite Sheet.",
+                MessageBox.MessageBoxButtons.YesNo);
+            if (result == MessageBox.MessageBoxResult.No)
+                return;
+
+            Delete(animIdx);
+        }
+
+
+
+        private void MassImport(string currentPath)
+        {
+            string assetPattern = GraphicsManager.GetPattern(assetType);
+            if (!Directory.Exists(Path.GetDirectoryName(PathMod.HardMod(assetPattern))))
+                Directory.CreateDirectory(Path.GetDirectoryName(PathMod.HardMod(assetPattern)));
+            ImportHelper.ImportAllBeams(currentPath, PathMod.HardMod(assetPattern));
+
+            GraphicsManager.RebuildIndices(assetType);
+            GraphicsManager.ClearCaches(assetType);
+
+            DiagManager.Instance.LogInfo("Mass import complete.");
+
+            //recompute
+            recomputeAnimList();
+        }
+
+
+        private void Import(string currentPath)
+        {
+            DevForm.ExecuteOrPend(() => { tryImport(currentPath); });
+
+            //recompute
+            recomputeAnimList();
+        }
+
+        private void tryImport(string currentPath)
+        {
+            lock (GameBase.lockObj)
+            {
+                string animName = Path.GetFileNameWithoutExtension(currentPath);
+                string destFile = PathMod.HardMod(String.Format(GraphicsManager.GetPattern(assetType), animName));
+                if (!Directory.Exists(Path.GetDirectoryName(destFile)))
+                    Directory.CreateDirectory(Path.GetDirectoryName(destFile));
+
+                //write sprite data
+                using (BeamSheet sheet = BeamSheet.Import(currentPath + "/"))
+                {
+                    using (FileStream stream = File.OpenWrite(destFile))
+                    {
+                        using (BinaryWriter writer = new BinaryWriter(stream))
+                            sheet.Save(writer);
+                    }
+                }
+
+                GraphicsManager.RebuildIndices(assetType);
+                GraphicsManager.ClearCaches(assetType);
+
+                DiagManager.Instance.LogInfo("Frames from:\n" +
+                    currentPath + "\nhave been imported.");
+            }
+        }
+
+
+        private bool MassExport(string currentPath)
+        {
+            bool success = true;
+            string assetPattern = GraphicsManager.GetPattern(assetType);
+            string[] dirs = PathMod.GetModFiles(Path.GetDirectoryName(assetPattern), String.Format(Path.GetFileName(assetPattern), "*"));
+            for (int ii = 0; ii < dirs.Length; ii++)
+            {
+                try
+                {
+                    string filename = Path.GetFileNameWithoutExtension(dirs[ii]);
+                    DevForm.ExecuteOrPend(() => { Export(currentPath + filename, filename); });
+                }
+                catch (Exception ex)
+                {
+                    DiagManager.Instance.LogError(ex, false);
+                    success = false;
+                }
+            }
+            return success;
+        }
+
+        private void Export(string currentPath, string anim)
+        {
+            lock (GameBase.lockObj)
+            {
+                if (!Directory.Exists(currentPath))
+                    Directory.CreateDirectory(currentPath);
+
+                string animPath = PathMod.ModPath(String.Format(GraphicsManager.GetPattern(assetType), anim));
+                if (File.Exists(animPath))
+                {
+                    //read file and read binary data
+                    using (FileStream fileStream = File.OpenRead(animPath))
+                    {
+                        using (BinaryReader reader = new BinaryReader(fileStream))
+                        {
+                            BeamSheet sheet = BeamSheet.Load(reader);
+                            BeamSheet.Export(sheet, currentPath + "/");
+                        }
+                    }
+                }
+
+                DiagManager.Instance.LogInfo("Frames from:\n" +
+                    anim +
+                    "\nhave been exported to:" + currentPath);
+            }
+        }
+
+
+        private void Delete(int animIdx)
+        {
+            lock (GameBase.lockObj)
+            {
+                string anim = anims[animIdx];
+
+                string animPath = PathMod.ModPath(String.Format(GraphicsManager.GetPattern(assetType), anim));
+                if (File.Exists(animPath))
+                    File.Delete(animPath);
+
+                GraphicsManager.RebuildIndices(assetType);
+                GraphicsManager.ClearCaches(assetType);
+
+                DiagManager.Instance.LogInfo("Deleted frames for:" + anim);
+
+                anims.RemoveAt(animIdx);
+                Anims.RemoveInternalAt(animIdx);
+            }
+        }
+
+
+        private void Anims_SelectedIndexChanged()
+        {
+            CachedPath = null;
+            if (Anims.InternalIndex == -1)
+                return;
+
+            lock (GameBase.lockObj)
+            {
+                if (DungeonScene.Instance != null)
+                {
+                    DungeonScene.Instance.DebugAsset = assetType;
+                    DungeonScene.Instance.DebugAnim = anims[Anims.InternalIndex];
+                }
+            }
+        }
+    }
+}
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/DevForm/Nodes/NodeBase.cs b/RogueEssence.Editor.Avalonia/ViewModels/DevForm/Nodes/NodeBase.cs
index ee8b9012..05da626f 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/DevForm/Nodes/NodeBase.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/DevForm/Nodes/NodeBase.cs
@@ -1,27 +1,14 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
-using System.Diagnostics;
-using System.IO;
-using System.Linq;
-using System.Reactive;
 using System.Reactive.Linq;
 using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
-using System.Windows.Input;
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Controls.ApplicationLifetimes;
-using Avalonia.Platform.Storage;
-using Avalonia.ReactiveUI;
-using Avalonia.Threading;
-using DynamicData;
 using RogueEssence.Dev.Services;
 using ReactiveUI;
 using RogueEssence.Content;
 using RogueEssence.Data;
 using RogueEssence.Dev.Views;
-using RogueEssence.Script;
 
 
 namespace RogueEssence.Dev.ViewModels;
@@ -243,40 +230,6 @@ public OpenEditorNodeWithParams(
     }
 }
 
-
-// public class OpenEditorNodeWithParams : OpenEditorNode
-// {
-//     public object[] ExtraParams { get; }
-//
-//     public OpenEditorNodeWithParams(
-//         string title,
-//         Type? editorType,
-//         object[] extraParams,
-//         string? icon = null,
-//         Action<EditorPageViewModel>? onPageLoad = null)
-//         : base(title, editorType, icon, onPageLoad)
-//     {
-//         ExtraParams = extraParams;
-//     }
-// }
-// public abstract class ItemRootNode : OpenEditorNode
-// {
-//     
-//     public ReactiveCommand<NodeBase, Unit> DeleteCommand { get; }
-//
-// // In constructor:
-//
-//     public abstract Task AddItem();
-//     public abstract Task DeleteItem(string key);
-//
-//     protected ItemRootNode(string title, Type? editorKey, string icon = null, Action<EditorPageViewModel>? onPageLoad = null)
-//         : base(title, editorKey, icon, onPageLoad)
-//     {
-//         DeleteCommand = ReactiveCommand.Create<NodeBase>(RemoveNode);
-//         
-//     }
-// }
-
 public class UniversalNode : OpenEditorNode
 {
     private IDialogService _dialogService;
@@ -509,21 +462,12 @@ protected override int GetHashCodeCore()
     }
 }
 
-// SpriteRootNode have additional properties like mass exporting
 public class SpriteRootNode : OpenEditorNode
 {
-    protected ISpriteRootOperationStrategy _strategy;
+    public ISpriteRootOperationStrategy Strategy;
 
     public readonly GraphicsManager.AssetType AssetType;
 
-
-    public ReactiveCommand<Unit, Unit> MassExportCommand { get; }
-
-    public ReactiveCommand<Unit, Unit> MassImportCommand { get; }
-    // public ReactiveCommand<DataItemNode, Unit> ExportCommand { get; }
-    // public ReactiveCommand<Unit, Unit> ImportCommand { get; }
-    // public ReactiveCommand<Unit, Unit> ReImportCommand { get; }
-
     private string _cachedPath;
 
     public string CachedPath
@@ -532,10 +476,8 @@ public string CachedPath
         set => this.RaiseAndSetIfChanged(ref _cachedPath, value);
     }
 
-
     public SpriteRootNode(
         IDialogService dialogService,
-        NodeFactory nodeFactory,
         GraphicsManager.AssetType assetType,
         Type? editorType,
         string title,
@@ -543,53 +485,24 @@ public SpriteRootNode(
         : base(title, editorType, icon ?? "", onPageLoad)
     {
         AssetType = assetType;
-        // _dialogService = dialogService;
-        // _nodeFactory = nodeFactory;
-
-
-        _strategy = CreateStrategy(dialogService);
-        // _strategy = new SpriteRootTileStrategy(dialogService, nodeFactory, this);
-
-        MassExportCommand = ReactiveCommand.CreateFromTask(MassExportAsync);
-        MassImportCommand = ReactiveCommand.CreateFromTask(MassImportAsync);
-        // ExportCommand = ReactiveCommand.CreateFromTask<DataItemNode>(ExportSpriteAsync);
-        // ImportCommand = ReactiveCommand.CreateFromTask(ImportSpriteAsync);
-        // ReImportCommand = ReactiveCommand.CreateFromTask(ReImportSpriteAsync);
+        Strategy = CreateStrategy(dialogService);
     }
 
     protected virtual ISpriteRootOperationStrategy CreateStrategy(IDialogService dialogService)
-        => new SpriteRootAssetTypeStrategy(dialogService, this);
-    
-
-    public async Task DeleteItem(string key)
-    {
-        // await _strategy.DeleteAsync(node);
-    }
-
-    public async Task MassExportAsync()
     {
-        await _strategy.MassExportAsync();
-    }
+        if (AssetType == GraphicsManager.AssetType.Beam)
+            return new SpriteRootBeamStrategy(dialogService, this);
 
-    public async Task MassImportAsync()
-    {
-        await _strategy.MassImportAsync();
+        return new SpriteRootAssetTypeStrategy(dialogService, this);
     }
 
-    // private async Task ExportSpriteAsync(DataItemNode node)
-    // {
-    //     await _strategy.ExportAsync(node);
-    // }
-
-    // private async Task ImportSpriteAsync()
-    // {
-    //     await _strategy.ImportAsync();
-    // }
-    //
-    // private async Task ReImportSpriteAsync()
-    // {
-    //     await _strategy.ReImportAsync();
-    // }
+    public async Task MassExportAsync() => await Strategy.MassExportAsync();
+    public async Task MassImportAsync() => await Strategy.MassImportAsync();
+    public async Task ReImportAsync() => await Strategy.ReImportAsync();
+    public async Task DeleteAsync(string key) => await Strategy.DeleteAsync(key);
+    public async Task ExportAsync(string key) => await Strategy.ExportAsync(key);
+    
+    public async Task ImportAsync(ObservableCollection<string> items) => await Strategy.ImportAsync(items);
 }
 
 
@@ -597,9 +510,9 @@ public class SpriteTileRootNode : SpriteRootNode
 {
     private readonly IDialogService _dialogService;
 
-    public SpriteTileRootNode(IDialogService dialogService, NodeFactory nodeFactory, Type? editorType, string title,
+    public SpriteTileRootNode(IDialogService dialogService, Type? editorType, string title,
         string? icon = null, Action<EditorPageViewModel>? onPageLoad = null)
-        : base(dialogService, nodeFactory, GraphicsManager.AssetType.Tile, editorType, title, icon, onPageLoad)
+        : base(dialogService, GraphicsManager.AssetType.Tile, editorType, title, icon, onPageLoad)
     {
         _dialogService = dialogService;
         
@@ -641,50 +554,6 @@ private void _tryReIndex()
     }
 }
 
-// public class ModRootNode : ItemRootNode
-// {
-//     private readonly NodeFactory _nodeFactory;
-//
-//     private readonly IDialogService _dialogService;
-//     public ModRootNode(NodeFactory nodeFactory, IDialogService dialogService,
-//         Type? editorType, string title, string? icon = null, Action<EditorPageViewModel>? onPageLoad = null)
-//         : base(title, editorType, icon ?? "", onPageLoad)
-//     {
-//         _nodeFactory = nodeFactory;
-//         _dialogService = dialogService;
-//         
-//     }
-//
-//     public override async Task AddItem()
-//     {
-//         ModHeader header = new ModHeader("", "", "", "", "", Guid.NewGuid(), new Version(), new Version(), PathMod.ModType.Mod, new RelatedMod[0] { });
-//         var vm = new ModConfigWindowViewModel(_dialogService, header);
-//         bool result = await _dialogService.ShowDialogAsync<ModConfigWindowViewModel, bool>(vm, "Mod Config");
-//         
-//         if (!result)
-//             return;
-//         
-//         // SubNodes.Add(_nodeFactory.CreateDataItemNode(vm.Name, "MonsterEditor", $"{vm.Name}:", "Icons.GhostFill"));
-//         // IsExpanded = true;
-//         // Console.WriteLine($"Added {DataType} item: {vm.Name}");
-//     }
-//
-//     public override async Task DeleteItem(string key)
-//     {
-//         // if (node is null)
-//         //     return;
-//         //
-//         // var res = await MessageBoxWindowView.Show(_dialogService,
-//         //     $"Deleting {node.ItemKey} will reset it back to the base game.", $"Delete {node.ItemKey}", MessageBoxWindowView.MessageBoxButtons.YesNo, true);
-//         //
-//         // if (res != MessageBoxWindowView.MessageBoxResult.Yes)
-//         //     return;
-//         //
-//         // SubNodes.Remove(node);
-//         // Console.WriteLine($"Deleted {node.Title} of type {DataType}");
-//     }
-// }
-
 // Used by TabSwitcher
 public class PageNode : NodeBase
 {
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/Pages/SpritePageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/Pages/SpritePageViewModel.cs
index f37e217e..3b5d1ff1 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/Pages/SpritePageViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/Pages/SpritePageViewModel.cs
@@ -17,462 +17,6 @@
 
 namespace RogueEssence.Dev.ViewModels;
 
-
-
-public interface ISpriteItemOperationStrategy
-{
-    Task<string?> ImportAsync(ObservableCollection<string> items);
-    Task ReImportAsync(string cachedPath);
-    Task DeleteAsync(string path);
-    Task ExportAsync(string path);
-}
-
-public class SpriteItemAssetTypeStrategy : ISpriteItemOperationStrategy
-{
-    private readonly IDialogService _dialogService;
-    private readonly GraphicsManager.AssetType _assetType;
-    private readonly Action _onReload;
-
-
-    public async Task<string?> ImportAsync(ObservableCollection<string> items)
-    {
-        string name = _assetType.ToString();
-        string folderName = DevForm.GetConfig(name + "Dir", Directory.GetCurrentDirectory());
-        var options = new FilePickerOpenOptions
-        {
-            Title = "Open .png or .xml File",
-            AllowMultiple = false,
-            FileTypeFilter =
-            [
-                new FilePickerFileType("PNG Files") { Patterns = ["*.png"] },
-                new FilePickerFileType("DirData XML") { Patterns = ["*.xml"] }
-            ]
-        };
-
-        string? result = null;
-        await Dispatcher.UIThread.InvokeAsync((Func<Task>)(async () =>
-        {
-            var filePath = await _dialogService.ShowFilePickerAsync(options, folderName);
-
-            if (filePath == null)
-                return;
-
-            string animName = Path.GetFileNameWithoutExtension(filePath);
-
-            if (items.Any(item => item == animName))
-            {
-                MessageBoxWindowView.MessageBoxResult res = await MessageBoxWindowView.Show(_dialogService, "Are you sure you want to overwrite the existing sheet:\n" + animName, "Sprite Sheet already exists.", MessageBoxWindowView.MessageBoxButtons.YesNo);
-                if (res == MessageBoxWindowView.MessageBoxResult.No)
-                    return;
-            }
-            else
-            {
-                items.Add(animName);
-            }
-
-            DevForm.SetConfig(name + "Dir", Path.GetDirectoryName(filePath));
-            result = Path.GetExtension(filePath) == ".xml"
-                ? Path.GetDirectoryName(filePath)
-                : filePath;
-
-            try
-            {
-                _import(result);
-            }
-            catch (Exception ex)
-            {
-                DiagManager.Instance.LogError(ex, false);
-                await MessageBoxWindowView.Show(_dialogService, "Error importing from\n" + result + "\n\n" + ex.Message, "Import Failed", MessageBoxWindowView.MessageBoxButtons.Ok);
-                result = null;
-            }
-        }));
-
-        return result;
-    }
-    
-    
-    public async Task DeleteAsync(string key)
-    {
-        var res = await MessageBoxWindowView.Show(_dialogService, $"Delete sprite '{key}'?", "Deleting Sprite", MessageBoxWindowView.MessageBoxButtons.YesNo, true);
-        
-        if (res == MessageBoxWindowView.MessageBoxResult.Yes)
-        {
-            lock (GameBase.lockObj)
-            {
-                string anim = key;
-                string animPath = PathMod.ModPath(String.Format(GraphicsManager.GetPattern(_assetType), anim));
-                if (File.Exists(animPath))
-                    File.Delete(animPath);
-
-                GraphicsManager.RebuildIndices(_assetType);
-                GraphicsManager.ClearCaches(_assetType);
-
-                DiagManager.Instance.LogInfo("Deleted frames for:" + anim);
-                _onReload?.Invoke();
-            }
-            
-        }
-    }
-    
-    public async Task ExportAsync(string key)
-    {
-        string name = _assetType.ToString();
-        string folderName = DevForm.GetConfig(name + "Dir", Directory.GetCurrentDirectory());
-        var options = new FilePickerSaveOptions
-        {
-            Title = $"Export {key} as PNG",
-            DefaultExtension = "png",
-            FileTypeChoices =
-            [
-                new FilePickerFileType("PNG Files")
-                {
-                    Patterns = new[] { "*.png" }
-                }
-            ]
-        };
-
-        await Dispatcher.UIThread.InvokeAsync((Func<Task>)(async () =>
-        {
-
-            var filePath = await _dialogService.TryGetSaveFileAsync(options, folderName);
-            if (!String.IsNullOrEmpty(filePath))
-            {
-                DevForm.SetConfig(name + "Dir", Path.GetDirectoryName(filePath));
-
-                try
-                {
-                    DevForm.ExecuteOrPend(() => { _export(filePath, key); });
-                }
-                catch (Exception ex)
-                {
-                    DiagManager.Instance.LogError(ex, false);
-
-
-                    await MessageBoxWindowView.Show(_dialogService, $"Error exporting to\n{filePath}\n\n{ex.Message}", "Export Failed", MessageBoxWindowView.MessageBoxButtons.Ok);
-                }
-            }
-        }));
-
-    }
-    
-    public async Task ReImportAsync(string cachedPatg)
-    {
-        await Dispatcher.UIThread.InvokeAsync((Func<Task>)(async () =>
-        {
-            try
-            {
-                _import(cachedPatg);
-            }
-            catch (Exception ex)
-            {
-                DiagManager.Instance.LogError(ex, false);
-                await MessageBoxWindowView.Show(_dialogService, "Error importing from\n" + cachedPatg + "\n\n" + ex.Message, "Import Failed", MessageBoxWindowView.MessageBoxButtons.Ok);
-                return;
-            }
-
-        }));
-    }
-
-    private void _export(string currentPath, string anim)
-    {
-        lock (GameBase.lockObj)
-        {
-            string animPath = PathMod.ModPath(String.Format(GraphicsManager.GetPattern(_assetType), anim));
-            if (File.Exists(animPath))
-            {
-                //read file and read binary data
-                using (FileStream fileStream = File.OpenRead(animPath))
-                {
-                    using (BinaryReader reader = new BinaryReader(fileStream))
-                    {
-                        DirSheet sheet = DirSheet.Load(reader);
-
-                        string filename = DirSheet.GetExportString(sheet, Path.GetFileNameWithoutExtension(currentPath));
-                        string dirname = Path.GetDirectoryName(currentPath);
-                        DirSheet.Export(sheet, Path.Combine(dirname, filename + ".png"));
-                    }
-                }
-            }
-
-            DiagManager.Instance.LogInfo("Frames from:\n" +
-                                         anim +
-                                         "\nhave been exported to:" + currentPath);
-        }
-    }
-    
-    
-    private void _import(string currentPath)
-    {
-        DevForm.ExecuteOrPend(() => { _tryImport(currentPath); });
-
-        //recompute
-        _onReload?.Invoke();
-    }
-
-    private void _tryImport(string currentPath)
-    {
-        lock (GameBase.lockObj)
-        {
-            string assetPattern = GraphicsManager.GetPattern(_assetType);
-            string destFile;
-            string animName = Path.GetFileNameWithoutExtension(currentPath);
-            if (Directory.Exists(currentPath))
-                destFile = PathMod.HardMod(String.Format(assetPattern, animName));
-            else
-            {
-                string[] components = animName.Split('.');
-                if (components.Length != 2)
-                    throw new ArgumentException(
-                        "The input filename does not fit the convention of \"<Anim Name>.<Anim Type>.png\"!");
-                destFile = PathMod.HardMod(String.Format(assetPattern, components[0]));
-            }
-
-            if (!Directory.Exists(Path.GetDirectoryName(destFile)))
-                Directory.CreateDirectory(Path.GetDirectoryName(destFile));
-
-            //write sprite data
-            using (DirSheet sheet = DirSheet.Import(currentPath))
-            {
-                using (FileStream stream = File.OpenWrite(destFile))
-                {
-                    //save data
-                    using (BinaryWriter writer = new BinaryWriter(stream))
-                        sheet.Save(writer);
-                }
-            }
-
-            GraphicsManager.RebuildIndices(_assetType);
-            GraphicsManager.ClearCaches(_assetType);
-
-            DiagManager.Instance.LogInfo("Frames from:\n" +
-                                         currentPath + "\nhave been imported.");
-        }
-    }
-
-    public SpriteItemAssetTypeStrategy(IDialogService dialogService, GraphicsManager.AssetType assetType, Action onReload)
-    {
-        _dialogService = dialogService;
-        _assetType = assetType;
-        _onReload = onReload;
-    }
-}
-
-
-
-
-
-public class SpriteItemTileStrategy : ISpriteItemOperationStrategy
-{
-    private int _cachedSize;
-
-    private readonly IDialogService _dialogService;
-    
-    private Action _onReload;
-    public SpriteItemTileStrategy(IDialogService dialogService, Action onReload)
-    {
-        _dialogService = dialogService;
-        _onReload = onReload;
-    }
-    
-    public async Task DeleteAsync(string key)
-    {
-        var res = await MessageBoxWindowView.Show(_dialogService, $"Delete sprite '{key}'?", "Deleting Sprite",
-            MessageBoxWindowView.MessageBoxButtons.YesNo, true);
-
-        if (res == MessageBoxWindowView.MessageBoxResult.Yes)
-        {
-            lock (GameBase.lockObj)
-            {
-                string anim = key;
-
-                string animPath = PathMod.ModPath(String.Format(GraphicsManager.TILE_PATTERN, anim));
-                if (File.Exists(animPath))
-                    File.Delete(animPath);
-
-                GraphicsManager.RebuildIndices(GraphicsManager.AssetType.Tile);
-                GraphicsManager.ClearCaches(GraphicsManager.AssetType.Tile);
-
-                DiagManager.Instance.LogInfo("Deleted frames for:" + anim);
-                _onReload?.Invoke();
-            }
-        }
-    }
-    
-    public async Task ExportAsync(string key)
-    {
-        //get current sprite
-        string animData = key;
-
-        //remember addresses in registry
-        string folderName = DevForm.GetConfig("TilesetDir", Directory.GetCurrentDirectory());
-
-        var options = new FilePickerSaveOptions
-        {
-            Title = "Export PNG",
-            DefaultExtension = "png",
-            FileTypeChoices =
-            [
-                new FilePickerFileType("PNG Files")
-                {
-                    Patterns = new[] { "*.png" }
-                }
-            ]
-        };
-        var folder = await _dialogService.TryGetSaveFileAsync(options, folderName);
-        if (!String.IsNullOrEmpty(folder))
-        {
-            DevForm.SetConfig("TilesetDir", Path.GetDirectoryName(folder));
-
-            try
-            {
-                DevForm.ExecuteOrPend(() => { _export(folder, animData); });
-            }
-            catch (Exception ex)
-            {
-                DiagManager.Instance.LogError(ex, false);
-                await MessageBoxWindowView.Show(_dialogService,
-                    "Error exporting to\n" + folderName + "\n\n" + ex.Message, "Export Failed",
-                    MessageBoxWindowView.MessageBoxButtons.Ok);
-                return;
-            }
-        }
-    }
-    
-    
-    public async Task<string?> ImportAsync(ObservableCollection<string> items)
-    {
-        //remember addresses in registry
-        string folderName = DevForm.GetConfig("TilesetDir", Directory.GetCurrentDirectory());
-
-        var options = new FilePickerOpenOptions
-        {
-            Title = "Open .png File",
-            AllowMultiple = false,
-            FileTypeFilter =
-            [
-                new FilePickerFileType("PNG Files") { Patterns = ["*.PNG"] }
-            ]
-        };
-
-        var file = await _dialogService.ShowFilePickerAsync(options, folderName);
-        if (file == null) return null;
-
-        string animName = Path.GetFileNameWithoutExtension(file);
-
-        if (items.Any(item => item == animName))
-        {
-            MessageBoxWindowView.MessageBoxResult result = await MessageBoxWindowView.Show(_dialogService,
-                "Are you sure you want to overwrite the existing sheet:\n" + animName,
-                "Sprite Sheet already exists.",
-                MessageBoxWindowView.MessageBoxButtons.YesNo);
-            if (result == MessageBoxWindowView.MessageBoxResult.No)
-                return null;
-        }
-        else
-        {
-            items.Add(animName);
-        }
-        
-
-        MapRetileWindowViewModel viewModel = new MapRetileWindowViewModel(GraphicsManager.TileSize, "Tile size must be divisible by 8.");
-        bool sizeResult = await _dialogService.ShowDialogAsync<MapRetileWindowViewModel, bool>(viewModel, "");
-
-        int size = viewModel.TileSize;
-
-        if (!sizeResult || size == 0)
-            return null;
-
-        //open window to choose directory
-        DevForm.SetConfig("TilesetDir", Path.GetDirectoryName(file));
-        _cachedSize = size;
-
-        try
-        {
-            _import(file, _cachedSize);
-            return file;
-        }
-        catch (Exception ex)
-        {
-            DiagManager.Instance.LogError(ex, false);
-            await MessageBoxWindowView.Show(_dialogService,
-                "Error importing from\n" + file + "\n\n" + ex.Message,
-                "Import Failed", MessageBoxWindowView.MessageBoxButtons.Ok);
-            return null;
-        }
-    }
-    
-    public async Task ReImportAsync(string cachedPath)
-    {
-        try
-        {
-            _import(cachedPath, _cachedSize);
-        }
-        catch (Exception ex)
-        {
-            DiagManager.Instance.LogError(ex, false);
-            await MessageBoxWindowView.Show(_dialogService,
-                "Error importing from\n" + cachedPath + "\n\n" + ex.Message, "Import Failed",
-                MessageBoxWindowView.MessageBoxButtons.Ok);
-            return;
-        }
-    }
-    
-    private void _import(string currentPath, int tileSize)
-    {
-        DevForm.ExecuteOrPend(() => { _tryImport(currentPath, tileSize); });
-
-        //recompute
-        _onReload?.Invoke();
-    }
-
-    
-    private void _tryImport(string currentPath, int tileSize)
-    {
-        lock (GameBase.lockObj)
-        {
-            string sheetName = Path.GetFileNameWithoutExtension(currentPath);
-            string outputFile = PathMod.HardMod(String.Format(GraphicsManager.TILE_PATTERN, sheetName));
-
-            if (!Directory.Exists(Path.GetDirectoryName(outputFile)))
-                Directory.CreateDirectory(Path.GetDirectoryName(outputFile));
-
-            //load into tilesets
-            using (BaseSheet tileset = BaseSheet.Import(currentPath))
-            {
-                List<BaseSheet[]> tileList = new List<BaseSheet[]>();
-                tileList.Add(new BaseSheet[] { tileset });
-                ImportHelper.SaveTileSheet(tileList, outputFile, tileSize);
-            }
-
-            GraphicsManager.RebuildIndices(GraphicsManager.AssetType.Tile);
-            GraphicsManager.ClearCaches(GraphicsManager.AssetType.Tile);
-            DevDataManager.ClearCaches();
-
-            DiagManager.Instance.LogInfo("Tiles from:\n" +
-                                         currentPath + "\nhave been imported.");
-        }
-    }
-
-    
-    private void _export(string currentPath, string anim)
-    {
-        lock (GameBase.lockObj)
-        {
-            string animPath = PathMod.ModPath(String.Format(GraphicsManager.TILE_PATTERN, anim));
-            ImportHelper.ExportTileSheet(animPath, currentPath);
-
-            DiagManager.Instance.LogInfo("Frames from:\n" +
-                                         anim + "\nhave been exported to:" + currentPath);
-        }
-    }
-    
-    
-
-
-}
-
-
-
 public class SpritePageViewModel : EditorPageViewModel<SpriteRootNode>
 {
     
@@ -484,16 +28,6 @@ public string SearchFilter
         set => this.RaiseAndSetIfChanged(ref _searchFilter, value);
     }
     
-    // private List<string> anims;
-    // public SearchListBoxViewModel Anims { get; set; }
-
-    private string cachedPath;
-    public string CachedPath
-    {
-        get => cachedPath;
-        set => this.RaiseAndSetIfChanged(ref cachedPath, value);
-    }
-    
     private string? _selectedItem;
 
     public string? SelectedItem
@@ -508,8 +42,6 @@ public string? SelectedItem
 
     public ObservableCollection<DataOpContainer> EditMenuItems { get; } = new();
     
-    public string Name { get { return AssetType.ToString(); } }
-
     private void UpdateVisibleItems(string filter)
     {
         FilteredItems.Clear();
@@ -521,20 +53,10 @@ private void UpdateVisibleItems(string filter)
     
     public GraphicsManager.AssetType AssetType => Node.AssetType;
     
-    private ISpriteItemOperationStrategy _strategy;
     
     public SpritePageViewModel(EditorContext context, SpriteRootNode node, Action<EditorPageViewModel> onPageOpen = null) : base(context, node, onPageOpen)
     {
-
-        if (AssetType == GraphicsManager.AssetType.Tile)
-        {
-            _strategy = new SpriteItemTileStrategy(context.DialogService, LoadDataEntriesForTiles);
-        }
-        else
-        {
-            _strategy = new SpriteItemAssetTypeStrategy(context.DialogService, AssetType,
-                () => LoadDataEntries(AssetType));
-        }
+        
     }
     
     public Action? OnPageRemovedAction { get; set; }
@@ -542,6 +64,7 @@ public SpritePageViewModel(EditorContext context, SpriteRootNode node, Action<Ed
     public override void OnPageRemoved()
     {
         OnPageRemovedAction?.Invoke();
+        Node.Strategy.OnReload -= () => LoadDataEntries(AssetType);
         base.OnPageRemoved();
     }
     
@@ -557,42 +80,13 @@ public override void OnPageLoad()
         {
             LoadDataEntries(AssetType);
         }
+        Node.Strategy.OnReload += () => LoadDataEntries(AssetType);
         
-      
         this.WhenAnyValue(x => x.SearchFilter).Subscribe(UpdateVisibleItems);
-        this.WhenAnyValue(x => x.SelectedItem).Subscribe(_ => CachedPath = null);
-        CachedPath = null;
-        // EditMenuItems.Add(new DataOpContainer("Re-Index", ReIndexAsync));
-        // if (DataType != DataManager.DataType.AutoTile)
-        // {
-        //     EditMenuItems.Add(new DataOpContainer("Resave all as File", () => ResaveAllAsync(false)));
-        //     EditMenuItems.Add(new DataOpContainer("Resave all as Diff", () => ResaveAllAsync(true)));
-        // }
-        // else
-        // {
-        //     EditMenuItems.Add(new DataOpContainer("Import DTEF", ImportDtefAsync));
-        //     // EditMenuItems.Add(new DataOpContainer("Export as DTEF", ExportDtefAsync));
-        // }
+        this.WhenAnyValue(x => x.SelectedItem).Subscribe(_ => Node.CachedPath = null);
     }
     
-    // private void Delete(int animIdx)
-    // {
-    //     lock (GameBase.lockObj)
-    //     {
-    //         string anim = anims[animIdx];
-    //         string animPath = PathMod.ModPath(String.Format(GraphicsManager.GetPattern(AssetType), anim));
-    //         if (File.Exists(animPath))
-    //             File.Delete(animPath);
-    //
-    //         GraphicsManager.RebuildIndices(AssetType);
-    //         GraphicsManager.ClearCaches(AssetType);
-    //
-    //         DiagManager.Instance.LogInfo("Deleted frames for:" + anim);
-    //
-    //         anims.RemoveAt(animIdx);
-    //         Anims.RemoveInternalAt(animIdx);
-    //     }
-    // }
+
     
     public async void mnuMassExport_Click()
     {
@@ -645,25 +139,23 @@ public void LoadDataEntriesForTiles()
     
     public async void btnImport_Click()
     {
-        var path = await _strategy.ImportAsync(Items);
-        if (path != null)
-            CachedPath = path;
+        await Node.ImportAsync(Items);
     }
     
 
     public async void btnReImport_Click()
     {
-        await _strategy.ReImportAsync(CachedPath);
+        await Node.ReImportAsync();
     }
     
     public async void btnExport_Click()
     {
-        await _strategy.ExportAsync(SelectedItem);
+        await Node.ExportAsync(SelectedItem);
     }
     
     public async void btnDelete_Click()
     {
-        await _strategy.DeleteAsync(SelectedItem);
+        await Node.DeleteAsync(SelectedItem);
     }
     
     protected override bool IsSamePage(EditorPageViewModel other)
diff --git a/RogueEssence.Editor.Avalonia/Views/Pages/SpritePageView.axaml b/RogueEssence.Editor.Avalonia/Views/Pages/SpritePageView.axaml
index 3259003c..6fcbc8c6 100644
--- a/RogueEssence.Editor.Avalonia/Views/Pages/SpritePageView.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/Pages/SpritePageView.axaml
@@ -70,7 +70,7 @@
                 </Button>
                 <Button Classes="flat" Width="100" Margin="24,0,0,0"
                         Command="{Binding btnReImport_Click}"
-                        IsEnabled="{Binding CachedPath, Converter={x:Static StringConverters.IsNotNullOrEmpty}}">
+                        IsEnabled="{Binding Node.CachedPath, Converter={x:Static StringConverters.IsNotNullOrEmpty}}">
                     <v:IconText Text="Re-Import" Icon="Icons.RepeatFill" IconSize="12" />
                 </Button>
                 <Button Classes="flat" Width="100" Margin="24,0,0,0"

From 5933eee453a592e0684b57b1874daa3ef2ee4822 Mon Sep 17 00:00:00 2001
From: Kace <41309226+DoubleTrio@users.noreply.github.com>
Date: Thu, 21 May 2026 23:51:39 -0400
Subject: [PATCH 42/51] add beam strat

---
 .../Nodes/Sprite/SpriteRootBeamStrategy.cs    | 307 ++++++++++++++++++
 1 file changed, 307 insertions(+)
 create mode 100644 RogueEssence.Editor.Avalonia/ViewModels/DevForm/Nodes/Sprite/SpriteRootBeamStrategy.cs

diff --git a/RogueEssence.Editor.Avalonia/ViewModels/DevForm/Nodes/Sprite/SpriteRootBeamStrategy.cs b/RogueEssence.Editor.Avalonia/ViewModels/DevForm/Nodes/Sprite/SpriteRootBeamStrategy.cs
new file mode 100644
index 00000000..17706111
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/ViewModels/DevForm/Nodes/Sprite/SpriteRootBeamStrategy.cs
@@ -0,0 +1,307 @@
+using System;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using Avalonia.Platform.Storage;
+using Avalonia.Threading;
+using RogueEssence;
+using RogueEssence.Content;
+using RogueEssence.Dev;
+using RogueEssence.Dev.Services;
+using RogueEssence.Dev.ViewModels;
+using RogueEssence.Dev.Views;
+
+public class SpriteRootBeamStrategy : ISpriteRootOperationStrategy
+{
+    private readonly IDialogService _dialogService;
+    private readonly SpriteRootNode _spriteRootNode;
+
+    public event Action OnReload;
+
+    public SpriteRootBeamStrategy(IDialogService dialogService, SpriteRootNode spriteRootNode)
+    {
+        _dialogService = dialogService;
+        _spriteRootNode = spriteRootNode;
+    }
+
+    private GraphicsManager.AssetType AssetType => _spriteRootNode.AssetType;
+    private string Name => _spriteRootNode.AssetType.ToString();
+
+    // ── Shared private helpers ──────────────────────────────────────────────
+
+    private void _export(string currentPath, string anim)
+    {
+        lock (GameBase.lockObj)
+        {
+            if (!Directory.Exists(currentPath))
+                Directory.CreateDirectory(currentPath);
+
+            string animPath = PathMod.ModPath(String.Format(GraphicsManager.GetPattern(AssetType), anim));
+            if (File.Exists(animPath))
+            {
+                using (FileStream fileStream = File.OpenRead(animPath))
+                using (BinaryReader reader = new BinaryReader(fileStream))
+                {
+                    BeamSheet sheet = BeamSheet.Load(reader);
+                    BeamSheet.Export(sheet, currentPath + "/");
+                }
+            }
+
+            DiagManager.Instance.LogInfo("Frames from:\n" + anim + "\nhave been exported to:" + currentPath);
+        }
+    }
+
+    private void _import(string currentPath)
+    {
+        DevForm.ExecuteOrPend(() => { _tryImport(currentPath); });
+        OnReload?.Invoke();
+    }
+
+    private void _tryImport(string currentPath)
+    {
+        lock (GameBase.lockObj)
+        {
+            string animName = Path.GetFileNameWithoutExtension(currentPath);
+            string destFile = PathMod.HardMod(String.Format(GraphicsManager.GetPattern(AssetType), animName));
+
+            if (!Directory.Exists(Path.GetDirectoryName(destFile)))
+                Directory.CreateDirectory(Path.GetDirectoryName(destFile));
+
+            using (BeamSheet sheet = BeamSheet.Import(currentPath + "/"))
+            using (FileStream stream = File.OpenWrite(destFile))
+            using (BinaryWriter writer = new BinaryWriter(stream))
+                sheet.Save(writer);
+
+            GraphicsManager.RebuildIndices(AssetType);
+            GraphicsManager.ClearCaches(AssetType);
+
+            DiagManager.Instance.LogInfo("Frames from:\n" + currentPath + "\nhave been imported.");
+        }
+    }
+
+    private bool _massExport(string currentPath)
+    {
+        bool success = true;
+        string assetPattern = GraphicsManager.GetPattern(AssetType);
+        string[] dirs = PathMod.GetModFiles(Path.GetDirectoryName(assetPattern), String.Format(Path.GetFileName(assetPattern), "*"));
+        for (int ii = 0; ii < dirs.Length; ii++)
+        {
+            try
+            {
+                string filename = Path.GetFileNameWithoutExtension(dirs[ii]);
+                DevForm.ExecuteOrPend(() => { _export(currentPath + filename, filename); });
+            }
+            catch (Exception ex)
+            {
+                DiagManager.Instance.LogError(ex, false);
+                success = false;
+            }
+        }
+        return success;
+    }
+
+    private void _massImport(string currentPath)
+    {
+        lock (GameBase.lockObj)
+        {
+            string assetPattern = GraphicsManager.GetPattern(AssetType);
+            if (!Directory.Exists(Path.GetDirectoryName(PathMod.HardMod(assetPattern))))
+                Directory.CreateDirectory(Path.GetDirectoryName(PathMod.HardMod(assetPattern)));
+
+            ImportHelper.ImportAllBeams(currentPath, PathMod.HardMod(assetPattern));
+
+            GraphicsManager.RebuildIndices(AssetType);
+            GraphicsManager.ClearCaches(AssetType);
+
+            DiagManager.Instance.LogInfo("Mass import complete.");
+        }
+    }
+
+    // ── ISpriteRootOperationStrategy ───────────────────────────────────────
+
+    public async Task MassExportAsync()
+    {
+        string folderName = DevForm.GetConfig(Name + "Dir", Directory.GetCurrentDirectory());
+
+        var options = new FolderPickerOpenOptions
+        {
+            Title = "Select folder to mass export to",
+            AllowMultiple = false,
+        };
+
+        await Dispatcher.UIThread.InvokeAsync(async () =>
+        {
+            string folder = await _dialogService.ShowFolderPickerAsync(options, folderName);
+            if (string.IsNullOrEmpty(folder)) return;
+
+            DevForm.SetConfig(Name + "Dir", folder);
+            _spriteRootNode.CachedPath = folder + "/";
+
+            bool success = _massExport(_spriteRootNode.CachedPath);
+            if (!success)
+                await MessageBoxWindowView.Show(_dialogService,
+                    "Errors found exporting to\n" + _spriteRootNode.CachedPath + "\n\nCheck logs for more info.",
+                    "Mass Export Failed", MessageBoxWindowView.MessageBoxButtons.Ok);
+        });
+    }
+
+    public async Task MassImportAsync()
+    {
+        await MessageBoxWindowView.Show(_dialogService,
+            "Note: Importing a beam to a slot that is already filled will automatically overwrite the old one.",
+            "Mass Import", MessageBoxWindowView.MessageBoxButtons.Ok);
+
+        string folderName = DevForm.GetConfig(Name + "Dir", Directory.GetCurrentDirectory());
+
+        var options = new FolderPickerOpenOptions
+        {
+            Title = "Select folder to mass import",
+            AllowMultiple = false,
+        };
+
+        await Dispatcher.UIThread.InvokeAsync(async () =>
+        {
+            string folder = await _dialogService.ShowFolderPickerAsync(options, folderName);
+            if (string.IsNullOrEmpty(folder)) return;
+
+            DevForm.SetConfig(Name + "Dir", folder);
+            _spriteRootNode.CachedPath = folder + "/";
+
+            try
+            {
+                _massImport(_spriteRootNode.CachedPath);
+            }
+            catch (Exception ex)
+            {
+                DiagManager.Instance.LogError(ex, false);
+                await MessageBoxWindowView.Show(_dialogService,
+                    "Error importing from\n" + _spriteRootNode.CachedPath + "\n\n" + ex.Message,
+                    "Import Failed", MessageBoxWindowView.MessageBoxButtons.Ok);
+            }
+        });
+    }
+    
+
+    public async Task ImportAsync(ObservableCollection<string> items)
+    {
+        string folderName = DevForm.GetConfig(Name + "Dir", Directory.GetCurrentDirectory());
+
+        var options = new FolderPickerOpenOptions
+        {
+            Title = "Select folder to import",
+            AllowMultiple = false,
+        };
+
+        string? result = null;
+        await Dispatcher.UIThread.InvokeAsync(async () =>
+        {
+            string folder = await _dialogService.ShowFolderPickerAsync(options, folderName);
+            if (string.IsNullOrEmpty(folder)) return;
+
+            string animName = Path.GetFileNameWithoutExtension(folder);
+
+            if (items.Any(item => item == animName))
+            {
+                var res = await MessageBoxWindowView.Show(_dialogService,
+                    "Are you sure you want to overwrite the existing sheet:\n" + animName,
+                    "Sprite Sheet already exists.", MessageBoxWindowView.MessageBoxButtons.YesNo);
+                if (res == MessageBoxWindowView.MessageBoxResult.No) return;
+            }
+            else
+            {
+                items.Add(animName);
+            }
+
+            DevForm.SetConfig(Name + "Dir", Path.GetDirectoryName(folder));
+            result = folder;
+
+            try
+            {
+                _import(result);
+            }
+            catch (Exception ex)
+            {
+                DiagManager.Instance.LogError(ex, false);
+                await MessageBoxWindowView.Show(_dialogService,
+                    "Error importing from\n" + result + "\n\n" + ex.Message,
+                    "Import Failed", MessageBoxWindowView.MessageBoxButtons.Ok);
+                result = null;
+            }
+        });
+
+        _spriteRootNode.CachedPath = result;
+    }
+
+    public async Task DeleteAsync(string key)
+    {
+        var res = await MessageBoxWindowView.Show(_dialogService,
+            $"Delete sprite '{key}'?", "Deleting Sprite",
+            MessageBoxWindowView.MessageBoxButtons.YesNo, true);
+
+        if (res == MessageBoxWindowView.MessageBoxResult.Yes)
+        {
+            lock (GameBase.lockObj)
+            {
+                string animPath = PathMod.ModPath(String.Format(GraphicsManager.GetPattern(AssetType), key));
+                if (File.Exists(animPath))
+                    File.Delete(animPath);
+
+                GraphicsManager.RebuildIndices(AssetType);
+                GraphicsManager.ClearCaches(AssetType);
+
+                DiagManager.Instance.LogInfo("Deleted frames for:" + key);
+                OnReload?.Invoke();
+            }
+        }
+    }
+
+    public async Task ExportAsync(string key)
+    {
+        string folderName = DevForm.GetConfig(Name + "Dir", Directory.GetCurrentDirectory());
+
+        var options = new FolderPickerOpenOptions
+        {
+            Title = "Select folder to export to",
+            AllowMultiple = false,
+        };
+
+        await Dispatcher.UIThread.InvokeAsync(async () =>
+        {
+            string folder = await _dialogService.ShowFolderPickerAsync(options, folderName);
+            if (string.IsNullOrEmpty(folder)) return;
+
+            DevForm.SetConfig(Name + "Dir", Path.GetDirectoryName(folder));
+
+            try
+            {
+                DevForm.ExecuteOrPend(() => { _export(folder, key); });
+            }
+            catch (Exception ex)
+            {
+                DiagManager.Instance.LogError(ex, false);
+                await MessageBoxWindowView.Show(_dialogService,
+                    $"Error exporting to\n{folder}\n\n{ex.Message}",
+                    "Export Failed", MessageBoxWindowView.MessageBoxButtons.Ok);
+            }
+        });
+    }
+
+    public async Task ReImportAsync()
+    {
+        await Dispatcher.UIThread.InvokeAsync(async () =>
+        {
+            try
+            {
+                _import(_spriteRootNode.CachedPath);
+            }
+            catch (Exception ex)
+            {
+                DiagManager.Instance.LogError(ex, false);
+                await MessageBoxWindowView.Show(_dialogService,
+                    "Error importing from\n" + _spriteRootNode.CachedPath + "\n\n" + ex.Message,
+                    "Import Failed", MessageBoxWindowView.MessageBoxButtons.Ok);
+            }
+        });
+    }
+}
\ No newline at end of file

From 1ca119f1958ca86b4bb67ed1306350245e889fbe Mon Sep 17 00:00:00 2001
From: Kace <41309226+DoubleTrio@users.noreply.github.com>
Date: Fri, 22 May 2026 00:10:54 -0400
Subject: [PATCH 43/51] menu location to the right

---
 .../Assets/MenuItemStyles.axaml               | 261 ++--------------
 .../Assets/MenuItemStylesResouce.axaml        | 289 ++++++++++++++++++
 2 files changed, 318 insertions(+), 232 deletions(-)
 create mode 100644 RogueEssence.Editor.Avalonia/Assets/MenuItemStylesResouce.axaml

diff --git a/RogueEssence.Editor.Avalonia/Assets/MenuItemStyles.axaml b/RogueEssence.Editor.Avalonia/Assets/MenuItemStyles.axaml
index 76b40aeb..e84d36e7 100644
--- a/RogueEssence.Editor.Avalonia/Assets/MenuItemStyles.axaml
+++ b/RogueEssence.Editor.Avalonia/Assets/MenuItemStyles.axaml
@@ -1,217 +1,52 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<Styles xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Design.PreviewWith>
+        <Border Padding="20">
+            <!-- Add Controls for Previewer Here -->
+        </Border>
+    </Design.PreviewWith>
     
-
-    <ControlTheme x:Key="CommandMenuItemTheme" TargetType="MenuItem"  BasedOn="{StaticResource {x:Type MenuItem}}">
-        <ControlTheme.Resources>
-            <StreamGeometry x:Key="MenuItemChevronPathData">M 0,1 L 10,10 L 20,1 L 19,0 L 10,8 L 1,0 Z</StreamGeometry>
-            <Thickness x:Key="MenuInputGestureTextMargin">0,0,0,0</Thickness>
-        </ControlTheme.Resources>
-        
-       <Setter Property="Template">
+    <Style Selector="MenuItem.menuright">
+        <Setter Property="Template">
             <ControlTemplate>
                 <Panel>
                     <Border Name="PART_LayoutRoot"
-                            Padding="0,0,4,0"
+                            Padding="{TemplateBinding Padding}"
                             Background="{TemplateBinding Background}"
                             BorderBrush="{TemplateBinding BorderBrush}"
                             BorderThickness="{TemplateBinding BorderThickness}"
-                            CornerRadius="3">
-                        <Grid>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="28" SharedSizeGroup="MenuItemIcon" />
-                                <ColumnDefinition Width="*" />
-                                <ColumnDefinition Width="Auto" SharedSizeGroup="MenuItemIGT" />
-                                <ColumnDefinition Width="Auto" SharedSizeGroup="MenuItemChevron" />
-                            </Grid.ColumnDefinitions>
-
+                            CornerRadius="{TemplateBinding CornerRadius}">
+                        <Grid ColumnDefinitions="Auto,Auto,*,Auto">
                             <ContentControl Grid.Column="0"
-                                            x:Name="PART_IconPresenter"
-                                            Content="{TemplateBinding Icon}"
+                                            x:Name="PART_ToggleIconPresenter"
                                             IsVisible="False"
-                                            HorizontalAlignment="Center"
-                                            VerticalAlignment="Center" />
-
-                            <ContentPresenter Grid.Column="1"
-                                              x:Name="PART_HeaderPresenter"
-                                              Content="{TemplateBinding Header}"
-                                              Foreground="{TemplateBinding Foreground}"
-                                              ContentTemplate="{TemplateBinding HeaderTemplate}"
-                                              VerticalAlignment="Center"
-                                              HorizontalAlignment="Stretch"
-                                              RecognizesAccessKey="False" />
-
-                            <TextBlock Grid.Column="2"
-                                       Classes="CaptionTextBlockStyle"
-                                       Margin="{DynamicResource MenuInputGestureTextMargin}"
-                                       Text="{TemplateBinding InputGesture, Converter={StaticResource KeyGestureConverter}}"
-                                       HorizontalAlignment="Right"
-                                       VerticalAlignment="Center"
-                                       Foreground="{DynamicResource MenuFlyoutItemKeyboardAcceleratorTextForeground}"
-                                       FontSize="11" />
-
-                            <TextBlock Grid.Column="2"
-                                       Classes="CaptionTextBlockStyle"
-                                       Margin="{DynamicResource MenuInputGestureTextMargin}"
-                                       Text="{TemplateBinding Tag}"
-                                       HorizontalAlignment="Right"
-                                       VerticalAlignment="Center"
-                                       Foreground="{DynamicResource MenuFlyoutItemKeyboardAcceleratorTextForeground}"
-                                       FontSize="11"
-                                       IsVisible="{TemplateBinding InputGesture, Converter={x:Static ObjectConverters.IsNull}}" />
-
-                            <Path Name="PART_ChevronPath"
-                                  Width="6"
-                                  Data="M573 512 215 881c-20 20-20 51 0 61l61 61c20 20 51 20 61 0l461-461c10-10 10-20 10-31s0-20-10-31L338 20C317 0 287 0 276 20L215 82c-20 20-20 51 0 61L573 512z"
-                                  Fill="{DynamicResource Brush.FG2}"
-                                  Margin="8,0,0,0"
-                                  VerticalAlignment="Center"
-                                  Grid.Column="3" />
-                        </Grid>
-                    </Border>
-                    <Popup Name="PART_Popup"
-                           WindowManagerAddShadowHint="False"
-                           Placement="RightEdgeAlignedTop"
-                           MaxHeight="400"
-                           IsLightDismissEnabled="False"
-                           HorizontalOffset="-4"
-                           VerticalOffset="-4"
-                           IsOpen="{TemplateBinding IsSubMenuOpen, Mode=TwoWay}">
-                        <Grid>
-                            <Border Background="{DynamicResource Brush.Popup}" Margin="4"
-                                    CornerRadius="{DynamicResource OverlayCornerRadius}">
-                                <Border.Effect>
-                                    <DropShadowEffect OffsetX="0" OffsetY="0" Color="Black" BlurRadius="4" Opacity=".6" />
-                                </Border.Effect>
-                            </Border>
-
-                            <Border BorderThickness="0" Margin="8,4" MaxHeight="400">
-                                <ScrollViewer Theme="{StaticResource FluentMenuScrollViewer}">
-                                    <ItemsPresenter Name="PART_ItemsPresenter"
-                                                    Margin="{DynamicResource MenuFlyoutScrollerMargin}"
-                                                    Grid.IsSharedSizeScope="True">
-                                        <ItemsPresenter.ItemsPanel>
-                                            <ItemsPanelTemplate>
-                                                <VirtualizingStackPanel Orientation="Vertical" />
-                                            </ItemsPanelTemplate>
-                                        </ItemsPresenter.ItemsPanel>
-                                    </ItemsPresenter>
-                                </ScrollViewer>
-                            </Border>
-                        </Grid>
-                    </Popup>
-                </Panel>
-            </ControlTemplate>
-        </Setter>
-        
-        <!-- Icon visibility -->
-        <Style Selector="^:icon /template/ ContentControl#PART_IconPresenter">
-            <Setter Property="IsVisible" Value="True" />
-        </Style>
-
-        <!-- Selected state -->
-        <Style Selector="^:selected /template/ Border#PART_LayoutRoot">
-            <Setter Property="Background" Value="{DynamicResource MenuFlyoutItemBackgroundPointerOver}" />
-        </Style>
-        <Style Selector="^:selected /template/ ContentPresenter#PART_HeaderPresenter">
-            <Setter Property="Foreground" Value="{DynamicResource MenuFlyoutItemForegroundPointerOver}" />
-        </Style>
-        <Style Selector="^:selected /template/ Path#PART_ChevronPath">
-            <Setter Property="Fill" Value="{DynamicResource MenuFlyoutSubItemChevronPointerOver}" />
-        </Style>
-
-        <!-- Disabled state -->
-        <Style Selector="^:disabled">
-            <Setter Property="Opacity" Value="0.65" />
-            <Setter Property="Background" Value="Transparent" />
-        </Style>
-
-        <!-- Empty (no submenu) -->
-        <Style Selector="^:empty /template/ Path#PART_ChevronPath">
-            <Setter Property="IsVisible" Value="False" />
-        </Style>
-
-        <!-- Separator -->
-        <Style Selector="^:separator">
-            <Setter Property="Height" Value="5" />
-            <Setter Property="Template">
-                <ControlTemplate>
-                    <Separator Margin="28,0,4,0" Height=".5" VerticalAlignment="Center"
-                               Background="{DynamicResource Brush.Border2}" />
-                </ControlTemplate>
-            </Setter>
-        </Style>
-    </ControlTheme>
-    
-    
-      <ControlTheme x:Key="IconMenuItemTheme" TargetType="MenuItem">
-        <!-- Base property setters -->
-        <Setter Property="Height" Value="28" />
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="Foreground" Value="{DynamicResource Brush.FG1}" />
-        <Setter Property="Cursor" Value="Arrow" />
-        
-        <Setter Property="Template">
-            <ControlTemplate>
-                <Panel>
-                    <Border Name="PART_LayoutRoot"
-                            Padding="0,0,4,0"
-                            Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            CornerRadius="3">
-                        <Grid>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="28" SharedSizeGroup="MenuItemIcon" />
-                                <ColumnDefinition Width="*" />
-                                <ColumnDefinition Width="Auto" SharedSizeGroup="MenuItemIGT" />
-                                <ColumnDefinition Width="Auto" SharedSizeGroup="MenuItemChevron" />
-                            </Grid.ColumnDefinitions>
+                                            Theme="{StaticResource FluentMenuItemIconTheme}"
+                                            Margin="{DynamicResource MenuIconPresenterMargin}" />
 
-                            <ContentControl Grid.Column="0"
+                            <ContentControl Grid.Column="1"
                                             x:Name="PART_IconPresenter"
-                                            Content="{TemplateBinding Icon}"
                                             IsVisible="False"
-                                            HorizontalAlignment="Center"
-                                            VerticalAlignment="Center" />
+                                            Theme="{StaticResource FluentMenuItemIconTheme}"
+                                            Content="{TemplateBinding Icon}"
+                                            Margin="{DynamicResource MenuIconPresenterMargin}" />
 
-                            <ContentPresenter Grid.Column="1"
-                                              x:Name="PART_HeaderPresenter"
+                            <ContentPresenter Name="PART_HeaderPresenter"
                                               Content="{TemplateBinding Header}"
-                                              Foreground="{TemplateBinding Foreground}"
                                               ContentTemplate="{TemplateBinding HeaderTemplate}"
                                               VerticalAlignment="Center"
                                               HorizontalAlignment="Stretch"
-                                              RecognizesAccessKey="False" />
+                                              Grid.Column="2" />
 
-                            <TextBlock Grid.Column="2"
-                                       Classes="CaptionTextBlockStyle"
+                            <TextBlock x:Name="PART_InputGestureText"
+                                       Grid.Column="3"
                                        Margin="{DynamicResource MenuInputGestureTextMargin}"
                                        Text="{TemplateBinding InputGesture, Converter={StaticResource KeyGestureConverter}}"
                                        HorizontalAlignment="Right"
                                        VerticalAlignment="Center"
-                                       Foreground="{DynamicResource MenuFlyoutItemKeyboardAcceleratorTextForeground}"
-                                       FontSize="11" />
-
-                            <TextBlock Grid.Column="2"
-                                       Classes="CaptionTextBlockStyle"
-                                       Margin="{DynamicResource MenuInputGestureTextMargin}"
-                                       Text="{TemplateBinding Tag}"
-                                       HorizontalAlignment="Right"
-                                       VerticalAlignment="Center"
-                                       Foreground="{DynamicResource MenuFlyoutItemKeyboardAcceleratorTextForeground}"
-                                       FontSize="11"
-                                       IsVisible="{TemplateBinding InputGesture, Converter={x:Static ObjectConverters.IsNull}}" />
-
-                            <Path Name="PART_ChevronPath"
-                                  Width="6"
-                                  Data="M573 512 215 881c-20 20-20 51 0 61l61 61c20 20 51 20 61 0l461-461c10-10 10-20 10-31s0-20-10-31L338 20C317 0 287 0 276 20L215 82c-20 20-20 51 0 61L573 512z"
-                                  Fill="{DynamicResource Brush.FG2}"
-                                  Margin="8,0,0,0"
-                                  VerticalAlignment="Center"
-                                  Grid.Column="3" />
+                                       Foreground="{DynamicResource MenuFlyoutItemKeyboardAcceleratorTextForeground}" />
                         </Grid>
                     </Border>
+
                     <Popup Name="PART_Popup"
                            WindowManagerAddShadowHint="False"
                            Placement="RightEdgeAlignedTop"
@@ -224,7 +59,8 @@
                             <Border Background="{DynamicResource Brush.Popup}" Margin="4"
                                     CornerRadius="{DynamicResource OverlayCornerRadius}">
                                 <Border.Effect>
-                                    <DropShadowEffect OffsetX="0" OffsetY="0" Color="Black" BlurRadius="4" Opacity=".6" />
+                                    <DropShadowEffect OffsetX="0" OffsetY="0" Color="Black"
+                                                      BlurRadius="4" Opacity=".6" />
                                 </Border.Effect>
                             </Border>
 
@@ -246,44 +82,5 @@
                 </Panel>
             </ControlTemplate>
         </Setter>
-        
-        <!-- Icon visibility -->
-        <Style Selector="^:icon /template/ ContentControl#PART_IconPresenter">
-            <Setter Property="IsVisible" Value="True" />
-        </Style>
-
-        <!-- Selected state -->
-        <Style Selector="^:selected /template/ Border#PART_LayoutRoot">
-            <Setter Property="Background" Value="{DynamicResource MenuFlyoutItemBackgroundPointerOver}" />
-        </Style>
-        <Style Selector="^:selected /template/ ContentPresenter#PART_HeaderPresenter">
-            <Setter Property="Foreground" Value="{DynamicResource MenuFlyoutItemForegroundPointerOver}" />
-        </Style>
-        <Style Selector="^:selected /template/ Path#PART_ChevronPath">
-            <Setter Property="Fill" Value="{DynamicResource MenuFlyoutSubItemChevronPointerOver}" />
-        </Style>
-
-        <!-- Disabled state -->
-        <Style Selector="^:disabled">
-            <Setter Property="Opacity" Value="0.65" />
-            <Setter Property="Background" Value="Transparent" />
-        </Style>
-
-        <!-- Empty (no submenu) -->
-        <Style Selector="^:empty /template/ Path#PART_ChevronPath">
-            <Setter Property="IsVisible" Value="False" />
-        </Style>
-
-        <!-- Separator -->
-        <Style Selector="^:separator">
-            <Setter Property="Height" Value="5" />
-            <Setter Property="Template">
-                <ControlTemplate>
-                    <Separator Margin="28,0,4,0" Height=".5" VerticalAlignment="Center"
-                               Background="{DynamicResource Brush.Border2}" />
-                </ControlTemplate>
-            </Setter>
-        </Style>
-    </ControlTheme>
-    
-</ResourceDictionary>
\ No newline at end of file
+    </Style>
+</Styles>
diff --git a/RogueEssence.Editor.Avalonia/Assets/MenuItemStylesResouce.axaml b/RogueEssence.Editor.Avalonia/Assets/MenuItemStylesResouce.axaml
new file mode 100644
index 00000000..76b40aeb
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/Assets/MenuItemStylesResouce.axaml
@@ -0,0 +1,289 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    
+
+    <ControlTheme x:Key="CommandMenuItemTheme" TargetType="MenuItem"  BasedOn="{StaticResource {x:Type MenuItem}}">
+        <ControlTheme.Resources>
+            <StreamGeometry x:Key="MenuItemChevronPathData">M 0,1 L 10,10 L 20,1 L 19,0 L 10,8 L 1,0 Z</StreamGeometry>
+            <Thickness x:Key="MenuInputGestureTextMargin">0,0,0,0</Thickness>
+        </ControlTheme.Resources>
+        
+       <Setter Property="Template">
+            <ControlTemplate>
+                <Panel>
+                    <Border Name="PART_LayoutRoot"
+                            Padding="0,0,4,0"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="3">
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="28" SharedSizeGroup="MenuItemIcon" />
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="Auto" SharedSizeGroup="MenuItemIGT" />
+                                <ColumnDefinition Width="Auto" SharedSizeGroup="MenuItemChevron" />
+                            </Grid.ColumnDefinitions>
+
+                            <ContentControl Grid.Column="0"
+                                            x:Name="PART_IconPresenter"
+                                            Content="{TemplateBinding Icon}"
+                                            IsVisible="False"
+                                            HorizontalAlignment="Center"
+                                            VerticalAlignment="Center" />
+
+                            <ContentPresenter Grid.Column="1"
+                                              x:Name="PART_HeaderPresenter"
+                                              Content="{TemplateBinding Header}"
+                                              Foreground="{TemplateBinding Foreground}"
+                                              ContentTemplate="{TemplateBinding HeaderTemplate}"
+                                              VerticalAlignment="Center"
+                                              HorizontalAlignment="Stretch"
+                                              RecognizesAccessKey="False" />
+
+                            <TextBlock Grid.Column="2"
+                                       Classes="CaptionTextBlockStyle"
+                                       Margin="{DynamicResource MenuInputGestureTextMargin}"
+                                       Text="{TemplateBinding InputGesture, Converter={StaticResource KeyGestureConverter}}"
+                                       HorizontalAlignment="Right"
+                                       VerticalAlignment="Center"
+                                       Foreground="{DynamicResource MenuFlyoutItemKeyboardAcceleratorTextForeground}"
+                                       FontSize="11" />
+
+                            <TextBlock Grid.Column="2"
+                                       Classes="CaptionTextBlockStyle"
+                                       Margin="{DynamicResource MenuInputGestureTextMargin}"
+                                       Text="{TemplateBinding Tag}"
+                                       HorizontalAlignment="Right"
+                                       VerticalAlignment="Center"
+                                       Foreground="{DynamicResource MenuFlyoutItemKeyboardAcceleratorTextForeground}"
+                                       FontSize="11"
+                                       IsVisible="{TemplateBinding InputGesture, Converter={x:Static ObjectConverters.IsNull}}" />
+
+                            <Path Name="PART_ChevronPath"
+                                  Width="6"
+                                  Data="M573 512 215 881c-20 20-20 51 0 61l61 61c20 20 51 20 61 0l461-461c10-10 10-20 10-31s0-20-10-31L338 20C317 0 287 0 276 20L215 82c-20 20-20 51 0 61L573 512z"
+                                  Fill="{DynamicResource Brush.FG2}"
+                                  Margin="8,0,0,0"
+                                  VerticalAlignment="Center"
+                                  Grid.Column="3" />
+                        </Grid>
+                    </Border>
+                    <Popup Name="PART_Popup"
+                           WindowManagerAddShadowHint="False"
+                           Placement="RightEdgeAlignedTop"
+                           MaxHeight="400"
+                           IsLightDismissEnabled="False"
+                           HorizontalOffset="-4"
+                           VerticalOffset="-4"
+                           IsOpen="{TemplateBinding IsSubMenuOpen, Mode=TwoWay}">
+                        <Grid>
+                            <Border Background="{DynamicResource Brush.Popup}" Margin="4"
+                                    CornerRadius="{DynamicResource OverlayCornerRadius}">
+                                <Border.Effect>
+                                    <DropShadowEffect OffsetX="0" OffsetY="0" Color="Black" BlurRadius="4" Opacity=".6" />
+                                </Border.Effect>
+                            </Border>
+
+                            <Border BorderThickness="0" Margin="8,4" MaxHeight="400">
+                                <ScrollViewer Theme="{StaticResource FluentMenuScrollViewer}">
+                                    <ItemsPresenter Name="PART_ItemsPresenter"
+                                                    Margin="{DynamicResource MenuFlyoutScrollerMargin}"
+                                                    Grid.IsSharedSizeScope="True">
+                                        <ItemsPresenter.ItemsPanel>
+                                            <ItemsPanelTemplate>
+                                                <VirtualizingStackPanel Orientation="Vertical" />
+                                            </ItemsPanelTemplate>
+                                        </ItemsPresenter.ItemsPanel>
+                                    </ItemsPresenter>
+                                </ScrollViewer>
+                            </Border>
+                        </Grid>
+                    </Popup>
+                </Panel>
+            </ControlTemplate>
+        </Setter>
+        
+        <!-- Icon visibility -->
+        <Style Selector="^:icon /template/ ContentControl#PART_IconPresenter">
+            <Setter Property="IsVisible" Value="True" />
+        </Style>
+
+        <!-- Selected state -->
+        <Style Selector="^:selected /template/ Border#PART_LayoutRoot">
+            <Setter Property="Background" Value="{DynamicResource MenuFlyoutItemBackgroundPointerOver}" />
+        </Style>
+        <Style Selector="^:selected /template/ ContentPresenter#PART_HeaderPresenter">
+            <Setter Property="Foreground" Value="{DynamicResource MenuFlyoutItemForegroundPointerOver}" />
+        </Style>
+        <Style Selector="^:selected /template/ Path#PART_ChevronPath">
+            <Setter Property="Fill" Value="{DynamicResource MenuFlyoutSubItemChevronPointerOver}" />
+        </Style>
+
+        <!-- Disabled state -->
+        <Style Selector="^:disabled">
+            <Setter Property="Opacity" Value="0.65" />
+            <Setter Property="Background" Value="Transparent" />
+        </Style>
+
+        <!-- Empty (no submenu) -->
+        <Style Selector="^:empty /template/ Path#PART_ChevronPath">
+            <Setter Property="IsVisible" Value="False" />
+        </Style>
+
+        <!-- Separator -->
+        <Style Selector="^:separator">
+            <Setter Property="Height" Value="5" />
+            <Setter Property="Template">
+                <ControlTemplate>
+                    <Separator Margin="28,0,4,0" Height=".5" VerticalAlignment="Center"
+                               Background="{DynamicResource Brush.Border2}" />
+                </ControlTemplate>
+            </Setter>
+        </Style>
+    </ControlTheme>
+    
+    
+      <ControlTheme x:Key="IconMenuItemTheme" TargetType="MenuItem">
+        <!-- Base property setters -->
+        <Setter Property="Height" Value="28" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Foreground" Value="{DynamicResource Brush.FG1}" />
+        <Setter Property="Cursor" Value="Arrow" />
+        
+        <Setter Property="Template">
+            <ControlTemplate>
+                <Panel>
+                    <Border Name="PART_LayoutRoot"
+                            Padding="0,0,4,0"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="3">
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="28" SharedSizeGroup="MenuItemIcon" />
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="Auto" SharedSizeGroup="MenuItemIGT" />
+                                <ColumnDefinition Width="Auto" SharedSizeGroup="MenuItemChevron" />
+                            </Grid.ColumnDefinitions>
+
+                            <ContentControl Grid.Column="0"
+                                            x:Name="PART_IconPresenter"
+                                            Content="{TemplateBinding Icon}"
+                                            IsVisible="False"
+                                            HorizontalAlignment="Center"
+                                            VerticalAlignment="Center" />
+
+                            <ContentPresenter Grid.Column="1"
+                                              x:Name="PART_HeaderPresenter"
+                                              Content="{TemplateBinding Header}"
+                                              Foreground="{TemplateBinding Foreground}"
+                                              ContentTemplate="{TemplateBinding HeaderTemplate}"
+                                              VerticalAlignment="Center"
+                                              HorizontalAlignment="Stretch"
+                                              RecognizesAccessKey="False" />
+
+                            <TextBlock Grid.Column="2"
+                                       Classes="CaptionTextBlockStyle"
+                                       Margin="{DynamicResource MenuInputGestureTextMargin}"
+                                       Text="{TemplateBinding InputGesture, Converter={StaticResource KeyGestureConverter}}"
+                                       HorizontalAlignment="Right"
+                                       VerticalAlignment="Center"
+                                       Foreground="{DynamicResource MenuFlyoutItemKeyboardAcceleratorTextForeground}"
+                                       FontSize="11" />
+
+                            <TextBlock Grid.Column="2"
+                                       Classes="CaptionTextBlockStyle"
+                                       Margin="{DynamicResource MenuInputGestureTextMargin}"
+                                       Text="{TemplateBinding Tag}"
+                                       HorizontalAlignment="Right"
+                                       VerticalAlignment="Center"
+                                       Foreground="{DynamicResource MenuFlyoutItemKeyboardAcceleratorTextForeground}"
+                                       FontSize="11"
+                                       IsVisible="{TemplateBinding InputGesture, Converter={x:Static ObjectConverters.IsNull}}" />
+
+                            <Path Name="PART_ChevronPath"
+                                  Width="6"
+                                  Data="M573 512 215 881c-20 20-20 51 0 61l61 61c20 20 51 20 61 0l461-461c10-10 10-20 10-31s0-20-10-31L338 20C317 0 287 0 276 20L215 82c-20 20-20 51 0 61L573 512z"
+                                  Fill="{DynamicResource Brush.FG2}"
+                                  Margin="8,0,0,0"
+                                  VerticalAlignment="Center"
+                                  Grid.Column="3" />
+                        </Grid>
+                    </Border>
+                    <Popup Name="PART_Popup"
+                           WindowManagerAddShadowHint="False"
+                           Placement="RightEdgeAlignedTop"
+                           MaxHeight="400"
+                           IsLightDismissEnabled="False"
+                           HorizontalOffset="-4"
+                           VerticalOffset="-4"
+                           IsOpen="{TemplateBinding IsSubMenuOpen, Mode=TwoWay}">
+                        <Grid>
+                            <Border Background="{DynamicResource Brush.Popup}" Margin="4"
+                                    CornerRadius="{DynamicResource OverlayCornerRadius}">
+                                <Border.Effect>
+                                    <DropShadowEffect OffsetX="0" OffsetY="0" Color="Black" BlurRadius="4" Opacity=".6" />
+                                </Border.Effect>
+                            </Border>
+
+                            <Border BorderThickness="0" Margin="8,4" MaxHeight="400">
+                                <ScrollViewer Theme="{StaticResource FluentMenuScrollViewer}">
+                                    <ItemsPresenter Name="PART_ItemsPresenter"
+                                                    Margin="{DynamicResource MenuFlyoutScrollerMargin}"
+                                                    Grid.IsSharedSizeScope="True">
+                                        <ItemsPresenter.ItemsPanel>
+                                            <ItemsPanelTemplate>
+                                                <VirtualizingStackPanel Orientation="Vertical" />
+                                            </ItemsPanelTemplate>
+                                        </ItemsPresenter.ItemsPanel>
+                                    </ItemsPresenter>
+                                </ScrollViewer>
+                            </Border>
+                        </Grid>
+                    </Popup>
+                </Panel>
+            </ControlTemplate>
+        </Setter>
+        
+        <!-- Icon visibility -->
+        <Style Selector="^:icon /template/ ContentControl#PART_IconPresenter">
+            <Setter Property="IsVisible" Value="True" />
+        </Style>
+
+        <!-- Selected state -->
+        <Style Selector="^:selected /template/ Border#PART_LayoutRoot">
+            <Setter Property="Background" Value="{DynamicResource MenuFlyoutItemBackgroundPointerOver}" />
+        </Style>
+        <Style Selector="^:selected /template/ ContentPresenter#PART_HeaderPresenter">
+            <Setter Property="Foreground" Value="{DynamicResource MenuFlyoutItemForegroundPointerOver}" />
+        </Style>
+        <Style Selector="^:selected /template/ Path#PART_ChevronPath">
+            <Setter Property="Fill" Value="{DynamicResource MenuFlyoutSubItemChevronPointerOver}" />
+        </Style>
+
+        <!-- Disabled state -->
+        <Style Selector="^:disabled">
+            <Setter Property="Opacity" Value="0.65" />
+            <Setter Property="Background" Value="Transparent" />
+        </Style>
+
+        <!-- Empty (no submenu) -->
+        <Style Selector="^:empty /template/ Path#PART_ChevronPath">
+            <Setter Property="IsVisible" Value="False" />
+        </Style>
+
+        <!-- Separator -->
+        <Style Selector="^:separator">
+            <Setter Property="Height" Value="5" />
+            <Setter Property="Template">
+                <ControlTemplate>
+                    <Separator Margin="28,0,4,0" Height=".5" VerticalAlignment="Center"
+                               Background="{DynamicResource Brush.Border2}" />
+                </ControlTemplate>
+            </Setter>
+        </Style>
+    </ControlTheme>
+    
+</ResourceDictionary>
\ No newline at end of file

From 16a51703bc95fdb64f1588c5d4b29d2b13829214 Mon Sep 17 00:00:00 2001
From: Kace <41309226+DoubleTrio@users.noreply.github.com>
Date: Fri, 22 May 2026 00:11:39 -0400
Subject: [PATCH 44/51] rename

---
 RogueEssence.Editor.Avalonia/App.axaml        |  3 +-
 .../Assets/Icons.axaml                        | 20 ++--
 .../Assets/ListBoxStyles.axaml                |  2 -
 ...uce.axaml => MenuItemStylesResource.axaml} |  0
 .../DataEditor/RankedCollectionBox.axaml      |  2 +-
 .../Views/Pages/DataListPageView.axaml        |  2 +-
 .../Views/Pages/SpeciesEditPageView.axaml     | 95 +------------------
 .../Views/Pages/SpritePageView.axaml          | 11 +--
 .../Views/Pages/SpritePageView.axaml.cs       | 10 --
 9 files changed, 18 insertions(+), 127 deletions(-)
 rename RogueEssence.Editor.Avalonia/Assets/{MenuItemStylesResouce.axaml => MenuItemStylesResource.axaml} (100%)

diff --git a/RogueEssence.Editor.Avalonia/App.axaml b/RogueEssence.Editor.Avalonia/App.axaml
index 96b3258b..5ab5c9b2 100644
--- a/RogueEssence.Editor.Avalonia/App.axaml
+++ b/RogueEssence.Editor.Avalonia/App.axaml
@@ -17,7 +17,7 @@
                 <ResourceInclude Source="/Assets/Icons.axaml"/>
                 <ResourceInclude Source="/Assets/Themes.axaml"/>
                 <ResourceInclude Source="/Assets/NodeTemplates.axaml"/>
-                <ResourceInclude Source="/Assets/MenuItemStyles.axaml" />
+                <ResourceInclude Source="/Assets/MenuItemStylesResource.axaml" />
             </ResourceDictionary.MergedDictionaries>
             <ResourceDictionary.ThemeDictionaries>
                 <ResourceDictionary x:Key="Light">
@@ -46,6 +46,7 @@
          <fluent:CustomTheme/>
          <StyleInclude Source="/Assets/Styles.axaml"/>
          <StyleInclude Source="/Assets/ListBoxStyles.axaml"/>
+         <StyleInclude Source="/Assets/MenuItemStyles.axaml"/>
          <StyleInclude Source="avares://Avalonia.Controls.TreeDataGrid/Themes/Fluent.axaml"/>
          <StyleInclude Source="avares://Avalonia.Controls.DataGrid/Themes/Fluent.xaml"/>
          <StyleInclude Source="/Assets/TreeStyles.axaml"/>
diff --git a/RogueEssence.Editor.Avalonia/Assets/Icons.axaml b/RogueEssence.Editor.Avalonia/Assets/Icons.axaml
index 0b5f4dbc..92a004da 100644
--- a/RogueEssence.Editor.Avalonia/Assets/Icons.axaml
+++ b/RogueEssence.Editor.Avalonia/Assets/Icons.axaml
@@ -1,14 +1,4 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-  <StreamGeometry x:Key="Icons.NumIndexChange">
-    M -8.8300781 -43.015625 L -12.210938 -42.972656 C -14.561849 -42.970775 -16.912767 -42.966805 -19.263672 -42.960938 C -22.9795 -42.923003 -26.694118 -42.887185 -30.410156 -42.882812 C -32.833697 -42.883133 -35.258121 -42.877327 -37.681641 -42.867188 L -41.148438 -42.847656 L -44.535156 -42.841797 L -47.660156 -42.802734 C -51.587861 -42.76984 -54.324115 -42.884947 -54.880859 -38.316406 L -54.904297 -35.558594 L -54.943359 -32.433594 L -54.949219 -29.046875 C -54.962888 -26.697279 -54.974545 -24.347663 -54.984375 -21.998047 C -54.983883 -18.27992 -54.98888 -14.56367 -55.025391 -10.845703 C -55.050113 -8.424024 -55.066221 -6.0018759 -55.072266 -3.5800781 L -55.074219 -0.109375 L -55.117188 3.2714844 L -55.099609 6.40625 L -55.107422 9.1660156 C -54.612946 11.48744 -54.613798 11.488802 -52.818359 13.285156 C -50.095323 14.771878 -47.738355 14.829089 -44.671875 14.828125 L -42.347656 14.78125 C -39.875012 14.768021 -37.402112 14.751287 -34.929688 14.714844 C -33.211013 14.688858 -31.492242 14.667418 -29.773438 14.652344 C -24.719348 14.616188 -19.666955 14.56251 -14.613281 14.488281 L -13.613281 10.488281 L -50.613281 9.4882812 L -50.613281 -38.511719 L -2.6132812 -38.511719 L -1.6132812 -1.5117188 L 2.3867188 -2.5117188 C 2.4484163 -6.7122173 2.5001761 -10.912455 2.5332031 -15.113281 C 2.5454801 -16.829436 2.5591678 -18.545586 2.5742188 -20.261719 C 2.6124238 -22.788536 2.6492605 -25.314737 2.6660156 -27.841797 L 2.6796875 -30.246094 C 2.7551033 -33.980928 3.0220566 -37.349521 1.1835938 -40.716797 C -0.61276065 -42.512236 -0.61412281 -42.511384 -2.9355469 -43.005859 L -5.6953125 -42.998047 L -8.8300781 -43.015625 z
-    M -28.613281 -30.511719 C -29.762136 -29.362864 -29.76214 -29.362855 -32.851562 -21.234375 L -34.113281 -17.886719 C -36.585366 -11.465422 -39.059732 -5.4113143 -39.613281 1.4882812 L -36.613281 1.4882812 L -35.5625 -1.4570312 C -33.891208 -4.8556841 -33.891202 -4.8556879 -30.257812 -5.3164062 L -26.425781 -5.3867188 C -24.155616 -5.4557207 -21.884487 -5.5057182 -19.613281 -5.5117188 C -19.017842 -3.4893716 -18.346307 -1.4883597 -17.613281 0.48828125 C -15.488283 1.3632804 -15.488279 1.3632814 -13.613281 1.4882812 C -13.613281 -3.1375952 -13.613285 -3.1376091 -16.923828 -12.412109 C -17.617147 -14.310793 -18.303616 -16.210289 -18.962891 -18.121094 L -19.619141 -20.021484 L -20.9375 -23.648438 C -22.127684 -26.983151 -22.127687 -26.983157 -23.613281 -29.511719 C -26.218015 -30.440673 -26.21802 -30.440674 -28.613281 -30.511719 z
-    M 14.386719 -30.511719 C 10.497834 -30.511719 10.497825 -30.511715 5.3867188 -26.511719 C 4.5117196 -24.261721 4.5117186 -24.261717 4.3867188 -22.511719 C 7.6747653 -19.599449 9.9855792 -18.014706 14.386719 -17.511719 L 14.386719 -20.511719 C 16.718367 -20.846701 16.718372 -20.846701 19.386719 -20.511719 C 22.529229 -18.201049 23.310251 -16.945037 23.996094 -13.058594 L 24.136719 -9.2617188 L 24.308594 -5.4335938 L 24.386719 -2.5117188 L 28.386719 -1.5117188 C 28.405818 -3.3749713 28.423754 -5.2382493 28.435547 -7.1015625 L 28.449219 -9.3867188 C 28.488466 -12.882749 28.98084 -16.323476 27.386719 -19.511719 C 24.55499 -22.944117 22.354416 -24.769347 18.074219 -25.824219 L 14.386719 -26.511719 L 14.386719 -30.511719 z
-    M -27.613281 -22.511719 L -25.613281 -22.511719 C -25.006728 -20.692058 -24.417159 -18.866447 -23.859375 -17.03125 L -23.050781 -14.324219 C -22.571177 -12.720185 -22.091873 -11.116055 -21.613281 -9.5117188 L -31.613281 -9.5117188 C -31.779613 -12.478572 -31.779613 -12.478578 -30.738281 -14.992188 L -29.613281 -17.699219 C -28.951504 -19.305407 -28.286331 -20.910221 -27.613281 -22.511719 z
-    M -1.4453125 -0.017578125 C -4.6096944 -0.011913349 -6.4518369 0.38284857 -9.4902344 2.3398438 C -12.10445 6.2141358 -12.210805 8.6829205 -12.255859 13.271484 L -12.207031 16.335938 C -12.207114 18.488932 -12.204426 20.641934 -12.199219 22.794922 C -12.154907 26.181605 -12.112309 29.566115 -12.113281 32.953125 C -12.117781 35.168 -12.116268 37.382803 -12.105469 39.597656 L -12.082031 42.773438 L -12.082031 45.845703 L -12.033203 48.707031 C -12.003738 51.607417 -11.774554 53.184 -10.404297 55.755859 C -8.6129016 57.48741 -8.6124397 57.487946 -6.2910156 57.982422 L -3.53125 57.974609 L -0.39648438 57.992188 L 2.984375 57.949219 C 5.3352866 57.947337 7.6862043 57.943368 10.037109 57.9375 C 13.752937 57.899566 17.467555 57.863748 21.183594 57.859375 C 23.607134 57.859696 26.031559 57.85389 28.455078 57.84375 L 31.921875 57.824219 L 35.308594 57.818359 L 38.433594 57.779297 C 41.192029 57.756195 41.192278 57.755707 43.386719 57.488281 C 45.386717 55.488283 45.386872 55.487409 45.654297 53.292969 L 45.677734 50.535156 L 45.716797 47.410156 L 45.722656 44.023438 C 45.736325 41.673841 45.747982 39.324225 45.757812 36.974609 C 45.75732 33.256482 45.762318 29.540232 45.798828 25.822266 C 45.823551 23.400587 45.839658 20.978438 45.845703 18.556641 L 45.847656 15.085938 L 45.890625 11.705078 L 45.873047 8.5703125 C 45.883375 5.268803 45.951894 4.0577042 43.599609 1.6894531 C 40.840615 0.19241843 38.447935 0.18233284 35.347656 0.22460938 L 33.136719 0.30078125 C 30.552097 0.34773372 27.970683 0.40715679 25.386719 0.48828125 L 25.386719 4.4882812 L 41.386719 5.4882812 L 41.386719 53.488281 L -6.6132812 53.488281 L -6.6757812 30.050781 C -6.688675 26.588512 -6.7017817 23.126352 -6.7070312 19.664062 L -6.7109375 16.867188 L -6.7265625 13.806641 L -6.7265625 10.916016 C -6.7304998 9.4395445 -6.7063213 7.9618233 -6.6132812 6.4882812 C -5.5310803 5.1890444 -5.5313207 5.1892874 -2.9296875 5.2832031 L 0.609375 5.171875 C 2.5478541 5.1074243 4.4870861 5.0439131 6.4257812 4.9863281 C 7.7770693 4.9463974 9.1273345 4.9047259 10.478516 4.8613281 C 13.596256 4.7591383 16.714061 4.6594069 19.832031 4.5644531 L 22.386719 4.4882812 L 21.386719 0.48828125 C 18.150392 0.38519331 14.915217 0.30300395 11.677734 0.24414062 L 7.6992188 0.17578125 L 3.7792969 0.048828125 L 0 0 C -0.51336052 -0.01172056 -0.99325794 -0.018387379 -1.4453125 -0.017578125 z
-    M 12.386719 11.488281 L 11.386719 20.488281 L 7.3867188 20.488281 L 6.3867188 23.488281 L 10.386719 24.488281 L 9.3867188 32.488281 L 5.3867188 32.488281 L 5.3867188 36.488281 L 8.3867188 37.488281 L 8.3867188 46.488281 L 12.386719 45.488281 L 13.386719 36.488281 L 20.386719 36.488281 C 19.26172 38.738279 19.261719 38.738289 19.386719 46.488281 L 23.386719 45.488281 L 24.386719 36.488281 L 28.386719 36.488281 L 28.386719 32.488281 L 25.386719 32.488281 L 25.386719 24.488281 L 29.386719 24.488281 L 30.386719 21.488281 L 26.386719 20.488281 L 27.386719 11.488281 L 23.386719 11.488281 L 22.386719 20.488281 L 15.386719 20.488281 L 16.386719 11.488281 L 12.386719 11.488281 z
-    M -37.613281 16.488281 C -37.632381 18.351534 -37.650316 20.214812 -37.662109 22.078125 L -37.675781 24.363281 C -37.715029 27.859311 -38.207402 31.300039 -36.613281 34.488281 C -33.781553 37.92068 -31.580979 39.74591 -27.300781 40.800781 L -23.613281 41.488281 L -23.613281 45.488281 C -19.724396 45.488281 -19.724387 45.488277 -14.613281 41.488281 C -13.738282 39.238283 -13.738281 39.23828 -13.613281 37.488281 C -16.901328 34.576011 -19.212142 32.991269 -23.613281 32.488281 L -23.613281 35.488281 C -25.944929 35.823264 -25.944934 35.823264 -28.613281 35.488281 C -31.755792 33.177612 -32.536813 31.921599 -33.222656 28.035156 L -33.363281 24.238281 L -33.535156 20.410156 L -33.613281 17.488281 L -37.613281 16.488281 z
-    M 14.386719 24.488281 L 21.386719 24.488281 C 21.451733 27.478946 21.741114 29.779491 20.386719 32.488281 L 13.386719 32.488281 L 14.386719 24.488281 z
-  </StreamGeometry>
   <StreamGeometry x:Key="Icons.Action">M41 512c0-128 46-241 138-333C271 87 384 41 512 41s241 46 333 138c92 92 138 205 138 333s-46 241-138 333c-92 92-205 138-333 138s-241-46-333-138C87 753 41 640 41 512zm87 0c0 108 36 195 113 271s164 113 271 113c108 0 195-36 271-113s113-164 113-271-36-195-113-271c-77-77-164-113-271-113-108 0-195 36-271 113C164 317 128 404 128 512zm256 148V292l195 113L768 512l-195 113-195 113v-77zm148-113-61 36V440l61 36 61 36-61 36z</StreamGeometry>
   <StreamGeometry x:Key="Icons.AIAssist">M304 464a128 128 0 01128-128c71 0 128 57 128 128v224a32 32 0 01-64 0V592h-128v95a32 32 0 01-64 0v-224zm64 1v64h128v-64a64 64 0 00-64-64c-35 0-64 29-64 64zM688 337c18 0 32 14 32 32v319a32 32 0 01-32 32c-18 0-32-14-32-32v-319a32 32 0 0132-32zM84 911l60-143A446 446 0 0164 512C64 265 265 64 512 64s448 201 448 448-201 448-448 448c-54 0-105-9-153-27l-242 22a32 32 0 01-32-44zm133-150-53 126 203-18 13 5c41 15 85 23 131 23 212 0 384-172 384-384S724 128 512 128 128 300 128 512c0 82 26 157 69 220l20 29z</StreamGeometry>
   <StreamGeometry x:Key="Icons.Archive">M296 392h64v64h-64zM296 582v160h128V582h-64v-62h-64v62zm80 48v64h-32v-64h32zM360 328h64v64h-64zM296 264h64v64h-64zM360 456h64v64h-64zM360 200h64v64h-64zM855 289 639 73c-6-6-14-9-23-9H192c-18 0-32 14-32 32v832c0 18 14 32 32 32h640c18 0 32-14 32-32V311c0-9-3-17-9-23zM790 326H602V138L790 326zm2 562H232V136h64v64h64v-64h174v216c0 23 19 42 42 42h216v494z</StreamGeometry>
@@ -187,6 +177,16 @@
   <StreamGeometry x:Key="Icons.TidalLogoFill">M253.66,101.66l-36,36a8,8,0,0,1-11.32,0l-36-36-.34-.38-.34.38L135.31,136l34.35,34.34a8,8,0,0,1,0,11.32l-36,36a8,8,0,0,1-11.32,0l-36-36a8,8,0,0,1,0-11.32L120.69,136,86.34,101.66l-.34-.38-.34.38-36,36a8,8,0,0,1-11.32,0l-36-36a8,8,0,0,1,0-11.32l36-36a8,8,0,0,1,11.32,0l36,36,.34.38.34-.38,36-36a8,8,0,0,1,11.32,0l36,36,.34.38.34-.38,36-36a8,8,0,0,1,11.32,0l36,36A8,8,0,0,1,253.66,101.66Z</StreamGeometry>
   <StreamGeometry x:Key="Icons.ChartBarFill">M232,208a8,8,0,0,1-8,8H32a8,8,0,0,1,0-16h8V136a8,8,0,0,1,8-8H72a8,8,0,0,1,8,8v64H96V88a8,8,0,0,1,8-8h32a8,8,0,0,1,8,8V200h16V40a8,8,0,0,1,8-8h40a8,8,0,0,1,8,8V200h8A8,8,0,0,1,232,208Z</StreamGeometry>
   <StreamGeometry x:Key="Icons.NumberSquareNineFill">M145.33,118l0,0A20,20,0,1,1,138,90.68,20,20,0,0,1,145.31,118ZM224,48V208a16,16,0,0,1-16,16H48a16,16,0,0,1-16-16V48A16,16,0,0,1,48,32H208A16,16,0,0,1,224,48ZM146,76.82A36,36,0,1,0,127.94,144q.94,0,1.89-.06l-16.7,28a8,8,0,0,0,2.77,11,8,8,0,0,0,11-2.77L159.18,126A36.05,36.05,0,0,0,146,76.82Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.NumIndexChange">
+    M -8.8300781 -43.015625 L -12.210938 -42.972656 C -14.561849 -42.970775 -16.912767 -42.966805 -19.263672 -42.960938 C -22.9795 -42.923003 -26.694118 -42.887185 -30.410156 -42.882812 C -32.833697 -42.883133 -35.258121 -42.877327 -37.681641 -42.867188 L -41.148438 -42.847656 L -44.535156 -42.841797 L -47.660156 -42.802734 C -51.587861 -42.76984 -54.324115 -42.884947 -54.880859 -38.316406 L -54.904297 -35.558594 L -54.943359 -32.433594 L -54.949219 -29.046875 C -54.962888 -26.697279 -54.974545 -24.347663 -54.984375 -21.998047 C -54.983883 -18.27992 -54.98888 -14.56367 -55.025391 -10.845703 C -55.050113 -8.424024 -55.066221 -6.0018759 -55.072266 -3.5800781 L -55.074219 -0.109375 L -55.117188 3.2714844 L -55.099609 6.40625 L -55.107422 9.1660156 C -54.612946 11.48744 -54.613798 11.488802 -52.818359 13.285156 C -50.095323 14.771878 -47.738355 14.829089 -44.671875 14.828125 L -42.347656 14.78125 C -39.875012 14.768021 -37.402112 14.751287 -34.929688 14.714844 C -33.211013 14.688858 -31.492242 14.667418 -29.773438 14.652344 C -24.719348 14.616188 -19.666955 14.56251 -14.613281 14.488281 L -13.613281 10.488281 L -50.613281 9.4882812 L -50.613281 -38.511719 L -2.6132812 -38.511719 L -1.6132812 -1.5117188 L 2.3867188 -2.5117188 C 2.4484163 -6.7122173 2.5001761 -10.912455 2.5332031 -15.113281 C 2.5454801 -16.829436 2.5591678 -18.545586 2.5742188 -20.261719 C 2.6124238 -22.788536 2.6492605 -25.314737 2.6660156 -27.841797 L 2.6796875 -30.246094 C 2.7551033 -33.980928 3.0220566 -37.349521 1.1835938 -40.716797 C -0.61276065 -42.512236 -0.61412281 -42.511384 -2.9355469 -43.005859 L -5.6953125 -42.998047 L -8.8300781 -43.015625 z
+    M -28.613281 -30.511719 C -29.762136 -29.362864 -29.76214 -29.362855 -32.851562 -21.234375 L -34.113281 -17.886719 C -36.585366 -11.465422 -39.059732 -5.4113143 -39.613281 1.4882812 L -36.613281 1.4882812 L -35.5625 -1.4570312 C -33.891208 -4.8556841 -33.891202 -4.8556879 -30.257812 -5.3164062 L -26.425781 -5.3867188 C -24.155616 -5.4557207 -21.884487 -5.5057182 -19.613281 -5.5117188 C -19.017842 -3.4893716 -18.346307 -1.4883597 -17.613281 0.48828125 C -15.488283 1.3632804 -15.488279 1.3632814 -13.613281 1.4882812 C -13.613281 -3.1375952 -13.613285 -3.1376091 -16.923828 -12.412109 C -17.617147 -14.310793 -18.303616 -16.210289 -18.962891 -18.121094 L -19.619141 -20.021484 L -20.9375 -23.648438 C -22.127684 -26.983151 -22.127687 -26.983157 -23.613281 -29.511719 C -26.218015 -30.440673 -26.21802 -30.440674 -28.613281 -30.511719 z
+    M 14.386719 -30.511719 C 10.497834 -30.511719 10.497825 -30.511715 5.3867188 -26.511719 C 4.5117196 -24.261721 4.5117186 -24.261717 4.3867188 -22.511719 C 7.6747653 -19.599449 9.9855792 -18.014706 14.386719 -17.511719 L 14.386719 -20.511719 C 16.718367 -20.846701 16.718372 -20.846701 19.386719 -20.511719 C 22.529229 -18.201049 23.310251 -16.945037 23.996094 -13.058594 L 24.136719 -9.2617188 L 24.308594 -5.4335938 L 24.386719 -2.5117188 L 28.386719 -1.5117188 C 28.405818 -3.3749713 28.423754 -5.2382493 28.435547 -7.1015625 L 28.449219 -9.3867188 C 28.488466 -12.882749 28.98084 -16.323476 27.386719 -19.511719 C 24.55499 -22.944117 22.354416 -24.769347 18.074219 -25.824219 L 14.386719 -26.511719 L 14.386719 -30.511719 z
+    M -27.613281 -22.511719 L -25.613281 -22.511719 C -25.006728 -20.692058 -24.417159 -18.866447 -23.859375 -17.03125 L -23.050781 -14.324219 C -22.571177 -12.720185 -22.091873 -11.116055 -21.613281 -9.5117188 L -31.613281 -9.5117188 C -31.779613 -12.478572 -31.779613 -12.478578 -30.738281 -14.992188 L -29.613281 -17.699219 C -28.951504 -19.305407 -28.286331 -20.910221 -27.613281 -22.511719 z
+    M -1.4453125 -0.017578125 C -4.6096944 -0.011913349 -6.4518369 0.38284857 -9.4902344 2.3398438 C -12.10445 6.2141358 -12.210805 8.6829205 -12.255859 13.271484 L -12.207031 16.335938 C -12.207114 18.488932 -12.204426 20.641934 -12.199219 22.794922 C -12.154907 26.181605 -12.112309 29.566115 -12.113281 32.953125 C -12.117781 35.168 -12.116268 37.382803 -12.105469 39.597656 L -12.082031 42.773438 L -12.082031 45.845703 L -12.033203 48.707031 C -12.003738 51.607417 -11.774554 53.184 -10.404297 55.755859 C -8.6129016 57.48741 -8.6124397 57.487946 -6.2910156 57.982422 L -3.53125 57.974609 L -0.39648438 57.992188 L 2.984375 57.949219 C 5.3352866 57.947337 7.6862043 57.943368 10.037109 57.9375 C 13.752937 57.899566 17.467555 57.863748 21.183594 57.859375 C 23.607134 57.859696 26.031559 57.85389 28.455078 57.84375 L 31.921875 57.824219 L 35.308594 57.818359 L 38.433594 57.779297 C 41.192029 57.756195 41.192278 57.755707 43.386719 57.488281 C 45.386717 55.488283 45.386872 55.487409 45.654297 53.292969 L 45.677734 50.535156 L 45.716797 47.410156 L 45.722656 44.023438 C 45.736325 41.673841 45.747982 39.324225 45.757812 36.974609 C 45.75732 33.256482 45.762318 29.540232 45.798828 25.822266 C 45.823551 23.400587 45.839658 20.978438 45.845703 18.556641 L 45.847656 15.085938 L 45.890625 11.705078 L 45.873047 8.5703125 C 45.883375 5.268803 45.951894 4.0577042 43.599609 1.6894531 C 40.840615 0.19241843 38.447935 0.18233284 35.347656 0.22460938 L 33.136719 0.30078125 C 30.552097 0.34773372 27.970683 0.40715679 25.386719 0.48828125 L 25.386719 4.4882812 L 41.386719 5.4882812 L 41.386719 53.488281 L -6.6132812 53.488281 L -6.6757812 30.050781 C -6.688675 26.588512 -6.7017817 23.126352 -6.7070312 19.664062 L -6.7109375 16.867188 L -6.7265625 13.806641 L -6.7265625 10.916016 C -6.7304998 9.4395445 -6.7063213 7.9618233 -6.6132812 6.4882812 C -5.5310803 5.1890444 -5.5313207 5.1892874 -2.9296875 5.2832031 L 0.609375 5.171875 C 2.5478541 5.1074243 4.4870861 5.0439131 6.4257812 4.9863281 C 7.7770693 4.9463974 9.1273345 4.9047259 10.478516 4.8613281 C 13.596256 4.7591383 16.714061 4.6594069 19.832031 4.5644531 L 22.386719 4.4882812 L 21.386719 0.48828125 C 18.150392 0.38519331 14.915217 0.30300395 11.677734 0.24414062 L 7.6992188 0.17578125 L 3.7792969 0.048828125 L 0 0 C -0.51336052 -0.01172056 -0.99325794 -0.018387379 -1.4453125 -0.017578125 z
+    M 12.386719 11.488281 L 11.386719 20.488281 L 7.3867188 20.488281 L 6.3867188 23.488281 L 10.386719 24.488281 L 9.3867188 32.488281 L 5.3867188 32.488281 L 5.3867188 36.488281 L 8.3867188 37.488281 L 8.3867188 46.488281 L 12.386719 45.488281 L 13.386719 36.488281 L 20.386719 36.488281 C 19.26172 38.738279 19.261719 38.738289 19.386719 46.488281 L 23.386719 45.488281 L 24.386719 36.488281 L 28.386719 36.488281 L 28.386719 32.488281 L 25.386719 32.488281 L 25.386719 24.488281 L 29.386719 24.488281 L 30.386719 21.488281 L 26.386719 20.488281 L 27.386719 11.488281 L 23.386719 11.488281 L 22.386719 20.488281 L 15.386719 20.488281 L 16.386719 11.488281 L 12.386719 11.488281 z
+    M -37.613281 16.488281 C -37.632381 18.351534 -37.650316 20.214812 -37.662109 22.078125 L -37.675781 24.363281 C -37.715029 27.859311 -38.207402 31.300039 -36.613281 34.488281 C -33.781553 37.92068 -31.580979 39.74591 -27.300781 40.800781 L -23.613281 41.488281 L -23.613281 45.488281 C -19.724396 45.488281 -19.724387 45.488277 -14.613281 41.488281 C -13.738282 39.238283 -13.738281 39.23828 -13.613281 37.488281 C -16.901328 34.576011 -19.212142 32.991269 -23.613281 32.488281 L -23.613281 35.488281 C -25.944929 35.823264 -25.944934 35.823264 -28.613281 35.488281 C -31.755792 33.177612 -32.536813 31.921599 -33.222656 28.035156 L -33.363281 24.238281 L -33.535156 20.410156 L -33.613281 17.488281 L -37.613281 16.488281 z
+    M 14.386719 24.488281 L 21.386719 24.488281 C 21.451733 27.478946 21.741114 29.779491 20.386719 32.488281 L 13.386719 32.488281 L 14.386719 24.488281 z
+  </StreamGeometry>
   <StreamGeometry x:Key="Icons.VectorTwoFill">M229.66,197.66l-32,32A8,8,0,0,1,184,224V200H80a8,8,0,0,1-8-8V80H48a8,8,0,0,1-5.66-13.66l32-32a8,8,0,0,1,11.32,0l32,32A8,8,0,0,1,112,80H88V184h96V160a8,8,0,0,1,13.66-5.66l32,32A8,8,0,0,1,229.66,197.66Z</StreamGeometry>
   <StreamGeometry x:Key="Icons.MapPinSimpleAreaFill">M88,64a40,40,0,1,1,48,39.19V176a8,8,0,0,1-16,0V103.19A40.05,40.05,0,0,1,88,64Zm130,82.59c-12.26-6.94-29.12-12.27-48.77-15.42A8,8,0,1,0,166.73,147c17.54,2.82,33,7.63,43.42,13.55C219,165.5,224,171.14,224,176c0,13.36-36.52,32-96,32s-96-18.64-96-32c0-4.86,5-10.5,13.85-15.49,10.46-5.92,25.88-10.73,43.42-13.55a8,8,0,1,0-2.54-15.79c-19.65,3.15-36.51,8.48-48.77,15.42C19.81,156.87,16,168.26,16,176c0,31.18,57.71,48,112,48s112-16.82,112-48C240,168.26,236.19,156.87,218,146.59Z</StreamGeometry>
   <StreamGeometry x:Key="Icons.ArrowBendRightDownFill">M205.66,181.66l-48,48a8,8,0,0,1-11.32,0l-48-48A8,8,0,0,1,104,168h40V128A88.1,88.1,0,0,0,56,40a8,8,0,0,1,0-16A104.11,104.11,0,0,1,160,128v40h40a8,8,0,0,1,5.66,13.66Z</StreamGeometry>
diff --git a/RogueEssence.Editor.Avalonia/Assets/ListBoxStyles.axaml b/RogueEssence.Editor.Avalonia/Assets/ListBoxStyles.axaml
index 32e47c99..d4ded261 100644
--- a/RogueEssence.Editor.Avalonia/Assets/ListBoxStyles.axaml
+++ b/RogueEssence.Editor.Avalonia/Assets/ListBoxStyles.axaml
@@ -17,8 +17,6 @@
         <Setter Property="Background" Value="{DynamicResource Brush.ListBox.Background}" />
     </Style>
     
-    
-    
     <Style Selector="ListBox.borderless">
         <Setter Property="Background" Value="{DynamicResource Brush.ListBox.Background}" />
         <Setter Property="ItemContainerTheme" Value="{StaticResource CompactListBoxItem}" />
diff --git a/RogueEssence.Editor.Avalonia/Assets/MenuItemStylesResouce.axaml b/RogueEssence.Editor.Avalonia/Assets/MenuItemStylesResource.axaml
similarity index 100%
rename from RogueEssence.Editor.Avalonia/Assets/MenuItemStylesResouce.axaml
rename to RogueEssence.Editor.Avalonia/Assets/MenuItemStylesResource.axaml
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/RankedCollectionBox.axaml b/RogueEssence.Editor.Avalonia/DataEditor/RankedCollectionBox.axaml
index 5eb365e4..76b5ec50 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/RankedCollectionBox.axaml
+++ b/RogueEssence.Editor.Avalonia/DataEditor/RankedCollectionBox.axaml
@@ -41,7 +41,7 @@
         <Path Width="10" Height="10" Margin="0,2,0,0" Data="{StaticResource Icons.Plus}" />
       </Button>
       <Button Command="{Binding DeleteItemAsync}" Classes="secondary" Margin="0,0" Padding="4,3">
-        <Path Width="10" Height="10" Data="{StaticResource Icons.CaretDownFill}" />
+        <Path Width="10" Height="10" Data="{StaticResource Icons.Minus}" />
       </Button>
     </StackPanel>
 
diff --git a/RogueEssence.Editor.Avalonia/Views/Pages/DataListPageView.axaml b/RogueEssence.Editor.Avalonia/Views/Pages/DataListPageView.axaml
index a5165416..7942219e 100644
--- a/RogueEssence.Editor.Avalonia/Views/Pages/DataListPageView.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/Pages/DataListPageView.axaml
@@ -16,7 +16,7 @@
 
         <DockPanel Grid.Row="0" VerticalAlignment="Top">
             <Menu x:Name="DataListPageViewEditMenu" DockPanel.Dock="Left">
-                <MenuItem Header="Edit" ItemsSource="{Binding EditMenuItems}" />
+                <MenuItem Header="Edit" Classes="menuright" ItemsSource="{Binding EditMenuItems}" />
             </Menu>
         </DockPanel>
         <TextBlock Grid.Row="2" HorizontalAlignment="Center" Classes="table_header" FontSize="16"
diff --git a/RogueEssence.Editor.Avalonia/Views/Pages/SpeciesEditPageView.axaml b/RogueEssence.Editor.Avalonia/Views/Pages/SpeciesEditPageView.axaml
index 3b0d4adf..e9b8598a 100644
--- a/RogueEssence.Editor.Avalonia/Views/Pages/SpeciesEditPageView.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/Pages/SpeciesEditPageView.axaml
@@ -18,95 +18,8 @@
     <Grid RowDefinitions="Auto, 32, Auto Auto">
         <DockPanel>
             <Menu DockPanel.Dock="Top">
-                <MenuItem Header="Edit">
-                    <MenuItem.Styles>
-                        <Style Selector="MenuItem">
-                            <Setter Property="Template">
-                                <ControlTemplate>
-                                    <Panel>
-                                        <Border Name="PART_LayoutRoot"
-                                                Padding="{TemplateBinding Padding}"
-                                                Background="{TemplateBinding Background}"
-                                                BorderBrush="{TemplateBinding BorderBrush}"
-                                                BorderThickness="{TemplateBinding BorderThickness}"
-                                                CornerRadius="{TemplateBinding CornerRadius}">
-                                            <Grid>
-                                                <Grid.ColumnDefinitions>
-                                                    <ColumnDefinition Width="Auto"
-                                                                      SharedSizeGroup="ToggleIcon" />
-                                                    <ColumnDefinition Width="Auto"
-                                                                      SharedSizeGroup="MenuItemIcon" />
-                                                    <ColumnDefinition Width="*" />
-                                                    <ColumnDefinition Width="Auto"
-                                                                      SharedSizeGroup="MenuItemIGT" />
-                                                </Grid.ColumnDefinitions>
-
-                                                <ContentControl Grid.Column="0"
-                                                                x:Name="PART_ToggleIconPresenter"
-                                                                IsVisible="False"
-                                                                Theme="{StaticResource FluentMenuItemIconTheme}"
-                                                                Margin="{DynamicResource MenuIconPresenterMargin}" />
-
-                                                <ContentControl Grid.Column="1"
-                                                                x:Name="PART_IconPresenter"
-                                                                IsVisible="False"
-                                                                Theme="{StaticResource FluentMenuItemIconTheme}"
-                                                                Content="{TemplateBinding Icon}"
-                                                                Margin="{DynamicResource MenuIconPresenterMargin}" />
-
-                                                <ContentPresenter Name="PART_HeaderPresenter"
-                                                                  Content="{TemplateBinding Header}"
-                                                                  ContentTemplate="{TemplateBinding HeaderTemplate}"
-                                                                  VerticalAlignment="Center"
-                                                                  HorizontalAlignment="Stretch"
-                                                                  Grid.Column="2" />
-                                                <TextBlock x:Name="PART_InputGestureText"
-                                                           Grid.Column="3"
-                                                           Margin="{DynamicResource MenuInputGestureTextMargin}"
-                                                           Text="{TemplateBinding InputGesture, Converter={StaticResource KeyGestureConverter}}"
-                                                           HorizontalAlignment="Right"
-                                                           VerticalAlignment="Center"
-                                                           Foreground="{DynamicResource MenuFlyoutItemKeyboardAcceleratorTextForeground}" />
-                                            </Grid>
-                                        </Border>
-                                        <Popup Name="PART_Popup"
-                                               WindowManagerAddShadowHint="False"
-                                               Placement="RightEdgeAlignedTop"
-                                               MaxHeight="400"
-                                               IsLightDismissEnabled="False"
-                                               HorizontalOffset="-4"
-                                               VerticalOffset="-4"
-                                               IsOpen="{TemplateBinding IsSubMenuOpen, Mode=TwoWay}">
-                                            <Grid>
-                                                <Border Background="{DynamicResource Brush.Popup}" Margin="4"
-                                                        CornerRadius="{DynamicResource OverlayCornerRadius}">
-                                                    <Border.Effect>
-                                                        <DropShadowEffect OffsetX="0" OffsetY="0" Color="Black"
-                                                                          BlurRadius="4" Opacity=".6" />
-                                                    </Border.Effect>
-                                                </Border>
-
-                                                <Border BorderThickness="0" Margin="8,4" MaxHeight="400">
-                                                    <ScrollViewer Theme="{StaticResource FluentMenuScrollViewer}">
-                                                        <ItemsPresenter Name="PART_ItemsPresenter"
-                                                                        Margin="{DynamicResource MenuFlyoutScrollerMargin}"
-                                                                        Grid.IsSharedSizeScope="True">
-                                                            <ItemsPresenter.ItemsPanel>
-                                                                <ItemsPanelTemplate>
-                                                                    <VirtualizingStackPanel Orientation="Vertical" />
-                                                                </ItemsPanelTemplate>
-                                                            </ItemsPresenter.ItemsPanel>
-                                                        </ItemsPresenter>
-                                                    </ScrollViewer>
-                                                </Border>
-                                            </Grid>
-                                        </Popup>
-                                    </Panel>
-                                </ControlTemplate>
-                            </Setter>
-                        </Style>
-
-                    </MenuItem.Styles>
+                <MenuItem Header="Edit" Classes="menuright">
+                    
                     <MenuItem Header="Mass Import" Command="{Binding mnuMassImport_Click}" />
                     <MenuItem Header="Re-Index" Command="{Binding mnuReIndex_Click}" />
                     <Separator />
@@ -117,9 +30,7 @@
         </DockPanel>
         <TextBlock Grid.Row="2" HorizontalAlignment="Center" Classes="table_header" FontSize="16"
                    Text="{Binding HeaderText}" />
-
-        <!-- Text="{Binding SearchFilter, Mode=TwoWay}" -->
-        <!-- Search Grid -->
+        
         <Grid Grid.Row="3" RowDefinitions="Auto, 16, Auto, 8, Auto" Margin="64, 8" MinWidth="600">
 
             <TextBox Classes="search"
diff --git a/RogueEssence.Editor.Avalonia/Views/Pages/SpritePageView.axaml b/RogueEssence.Editor.Avalonia/Views/Pages/SpritePageView.axaml
index 6fcbc8c6..54a9eb5f 100644
--- a/RogueEssence.Editor.Avalonia/Views/Pages/SpritePageView.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/Pages/SpritePageView.axaml
@@ -14,22 +14,13 @@
     <Grid RowDefinitions="Auto, 32, Auto, 8, Auto">
         <DockPanel Grid.Row="0" VerticalAlignment="Top">
             <Menu DockPanel.Dock="Top">
-                <MenuItem Header="Edit">
+                <MenuItem Header="Edit" Classes="menuright">
                     <MenuItem Header="Mass Import" Command="{Binding mnuMassImport_Click}" />
                     <MenuItem Header="Mass Export" Command="{Binding mnuMassExport_Click}" />
                     <Separator IsVisible="{Binding IsTileAsset}" />
                     <MenuItem IsVisible="{Binding IsTileAsset}" Header="Re-Index" Command="{Binding mnuReIndex_Click}" />
                 </MenuItem>
             </Menu>
-
-
-            <!-- <Grid RowDefinitions="*, 34" ColumnDefinitions="*, *, *, *"> -->
-            <!--     <views:SearchListBox DataContext="{Binding Anims}" Margin="4" Grid.ColumnSpan="4"/> -->
-            <!--     <Button Command="{Binding btnImport_Click}" Margin="4" Grid.Row="1" Grid.Column="0" IsEnabled="{Binding ChosenAnim, Converter={x:Static ObjectConverters.IsNotNull}}">Import</Button> -->
-            <!--     <Button Command="{Binding btnReImport_Click}" Margin="4" Grid.Row="1" Grid.Column="1" IsEnabled="{Binding CachedPath, Converter={x:Static StringConverters.IsNotNullOrEmpty}}">Re-Import</Button> -->
-            <!--     <Button Command="{Binding btnExport_Click}" Margin="4" Grid.Row="1" Grid.Column="2" IsEnabled="{Binding ChosenAnim, Converter={x:Static ObjectConverters.IsNotNull}}">Export</Button> -->
-            <!--     <Button Command="{Binding btnDelete_Click}" Margin="4" Grid.Row="1" Grid.Column="3" IsEnabled="{Binding ChosenAnim, Converter={x:Static ObjectConverters.IsNotNull}}">Delete</Button> -->
-            <!-- </Grid> -->
         </DockPanel>
         <TextBlock Grid.Row="2" HorizontalAlignment="Center" Classes="table_header" FontSize="16"
                    Text="{Binding AssetType}" />
diff --git a/RogueEssence.Editor.Avalonia/Views/Pages/SpritePageView.axaml.cs b/RogueEssence.Editor.Avalonia/Views/Pages/SpritePageView.axaml.cs
index 62ec3980..0f96648d 100644
--- a/RogueEssence.Editor.Avalonia/Views/Pages/SpritePageView.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/Pages/SpritePageView.axaml.cs
@@ -40,16 +40,6 @@ protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
 
     private void SpritePageListBox_OnContextRequested(object sender, ContextRequestedEventArgs e)
     {
-        // if (e.Source is not Visual)
-        //     return;
-        //
-        // if (sender is not ListBox listBox || listBox.SelectedItem is not DataListEntry entry ||
-        //     listBox.DataContext is not DataListPageViewModel vm)
-        //     return;
-        //
-        // var contextMenu = ContextMenuHelper.CreateDataItemMenu(vm.Node, entry.Key);
-        // contextMenu.Open(this);
-        //
     }
     
     private void SpritePageListBox_OnSelectionChanged(object sender, SelectionChangedEventArgs e)

From 718356e7228b2e433a61a3692f87d090388e30ca Mon Sep 17 00:00:00 2001
From: Kace <41309226+DoubleTrio@users.noreply.github.com>
Date: Fri, 22 May 2026 01:09:07 -0400
Subject: [PATCH 45/51] removed unused + allow dtef import from tree

---
 .../EditorContext/NodeFactory.cs              |   7 +
 .../RogueEssence.Editor.Avalonia.csproj       |   5 -
 .../Utility/ContextMenuHelper.cs              |   5 +
 .../ViewModels/Content/BeamEditViewModel.cs   | 406 ------------------
 .../ViewModels/DevForm/DevFormViewModel.cs    | 112 +++--
 .../DevForm/ModSwitcherViewModel.cs           |   2 -
 .../ViewModels/DevForm/Nodes/NodeBase.cs      | 104 ++++-
 .../ViewModels/DialogBoxes/DialogViewModel.cs |  38 --
 .../ViewModels/Pages/DataListPageViewModel.cs |  81 +---
 .../DevControlPage/DevControlPageViewModel.cs |   7 -
 .../DevControlPage/DevTabPlayerViewModel.cs   |   1 -
 .../DevControlPage/DevTabScriptViewModel.cs   |   2 +-
 .../ViewModels/Pages/EditorPageViewModel.cs   | 169 +-------
 .../Pages/MapEditPage/MapEditPageViewModel.cs |  46 --
 .../Pages/ModConfigPageViewModel.cs           |  29 +-
 .../Views/DevForm/DevForm.axaml               |  60 +--
 .../Views/DevForm/DevForm.axaml.cs            |   5 +-
 .../DialogBoxes/AnimChoiceWindowView.axaml    |  10 +-
 .../DialogBoxes/MessageBoxWindowView.axaml    |   3 +
 .../DevControlPage/DevControlPageView.axaml   |  21 -
 .../Views/Pages/DevEditPageView.axaml         |   8 -
 .../Views/Pages/DevEditPageView.axaml.cs      |  13 -
 .../Views/Pages/ModConfigPageView.axaml       |  15 +-
 .../Views/Pages/ModListPageView.axaml         |  13 -
 .../Views/Pages/ReflectedDataPageView.axaml   |   1 -
 25 files changed, 193 insertions(+), 970 deletions(-)
 delete mode 100644 RogueEssence.Editor.Avalonia/ViewModels/Content/BeamEditViewModel.cs
 delete mode 100644 RogueEssence.Editor.Avalonia/ViewModels/DialogBoxes/DialogViewModel.cs
 delete mode 100644 RogueEssence.Editor.Avalonia/Views/Pages/DevEditPageView.axaml
 delete mode 100644 RogueEssence.Editor.Avalonia/Views/Pages/DevEditPageView.axaml.cs

diff --git a/RogueEssence.Editor.Avalonia/EditorContext/NodeFactory.cs b/RogueEssence.Editor.Avalonia/EditorContext/NodeFactory.cs
index ffc7276c..fa962199 100644
--- a/RogueEssence.Editor.Avalonia/EditorContext/NodeFactory.cs
+++ b/RogueEssence.Editor.Avalonia/EditorContext/NodeFactory.cs
@@ -71,6 +71,13 @@ public DataRootNode CreateDataRootNode<TEditor>(
         where TEditor : EditorPageViewModel
         => Create<DataRootNode>(dataType, typeof(TEditor), title, icon, CreateCallback(onOpen));
 
+    public AutoTileRootNode CreateAutoTileRootNode<TEditor>(
+        string title,
+        string? icon = null,
+        Action<TEditor>? onOpen = null)
+        where TEditor : EditorPageViewModel
+        => Create<AutoTileRootNode>(typeof(TEditor), title, icon, CreateCallback(onOpen));
+
     // public ModRootNode CreateModRootNode<TEditor>(
     //     string title,
     //     string? icon = null,
diff --git a/RogueEssence.Editor.Avalonia/RogueEssence.Editor.Avalonia.csproj b/RogueEssence.Editor.Avalonia/RogueEssence.Editor.Avalonia.csproj
index 0729045e..0261a355 100644
--- a/RogueEssence.Editor.Avalonia/RogueEssence.Editor.Avalonia.csproj
+++ b/RogueEssence.Editor.Avalonia/RogueEssence.Editor.Avalonia.csproj
@@ -185,10 +185,6 @@
       <DependentUpon>DataListPageView.axaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
-    <Compile Update="Views\Pages\DevEditPageView.axaml.cs">
-      <DependentUpon>DevEditPageView.axaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Update="Views\Pages\ModConfigPageView.axaml.cs">
       <DependentUpon>ModConfigPageView.axaml</DependentUpon>
       <SubType>Code</SubType>
@@ -279,7 +275,6 @@
   </ItemGroup>
   <ItemGroup>
     <AdditionalFiles Include="Views\Pages\GroundEditPage\EntityBrowser.axaml" />
-    <AdditionalFiles Include="Views\Pages\GroundEditPage\GroundEditForm.axaml" />
     <AdditionalFiles Include="Views\Pages\GroundEditPage\GroundTabDecorations.axaml" />
     <AdditionalFiles Include="Views\Pages\GroundEditPage\GroundTabEntities.axaml" />
     <AdditionalFiles Include="Views\Pages\GroundEditPage\GroundTabProperties.axaml" />
diff --git a/RogueEssence.Editor.Avalonia/Utility/ContextMenuHelper.cs b/RogueEssence.Editor.Avalonia/Utility/ContextMenuHelper.cs
index 9a70f87e..a1988094 100644
--- a/RogueEssence.Editor.Avalonia/Utility/ContextMenuHelper.cs
+++ b/RogueEssence.Editor.Avalonia/Utility/ContextMenuHelper.cs
@@ -34,6 +34,7 @@ public static ContextMenu CreateContextMenu(params Control[] items)
     
     public static ContextMenu CreateDataRootMenu(DataRootNode node)
     {
+        
         var menu = CreateContextMenu(
             CreateMenuItem("Re-Index", "Icons.FileFill", async () => await node.ReIndexAsync())
         );
@@ -44,6 +45,10 @@ public static ContextMenu CreateDataRootMenu(DataRootNode node)
             menu.Items.Add(CreateMenuItem("Resave all as File", "Icons.FileFill", () => node.ResaveAllAsync(false)));
             menu.Items.Add(CreateMenuItem("Resave all as Patch", "Icons.FileTextFill", () => node.ResaveAllAsync(true)));
         }
+        else
+        {
+            menu.Items.Add(CreateMenuItem("Import DTEF", "Icons.DownloadFill", () => ((AutoTileRootNode)node).ImportDtefAsync()));
+        }
         return menu;
     }
     
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/Content/BeamEditViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/Content/BeamEditViewModel.cs
deleted file mode 100644
index 29f99a55..00000000
--- a/RogueEssence.Editor.Avalonia/ViewModels/Content/BeamEditViewModel.cs
+++ /dev/null
@@ -1,406 +0,0 @@
-using Avalonia.Interactivity;
-using System;
-using System.Collections.Generic;
-using System.Text;
-using ReactiveUI;
-using System.Collections.ObjectModel;
-using Avalonia.Controls;
-using RogueEssence.Dungeon;
-using RogueEssence.Data;
-using RogueEssence.Content;
-using System.IO;
-using System.Linq;
-using Avalonia.Media.Imaging;
-using Avalonia.Platform.Storage;
-using Avalonia.Threading;
-using RogueElements;
-using RogueEssence.Dev.Views;
-
-namespace RogueEssence.Dev.ViewModels
-{
-    public class BeamEditViewModel : ViewModelBase
-    {
-        private GraphicsManager.AssetType assetType;
-        private Window parent;
-
-
-        public string Name { get { return assetType.ToString(); } }
-
-
-        private List<string> anims;
-        public SearchListBoxViewModel Anims { get; set; }
-
-        private string cachedPath;
-        public string CachedPath
-        {
-            get => cachedPath;
-            set => this.SetIfChanged(ref cachedPath, value);
-        }
-
-
-        public BeamEditViewModel()
-        {
-            anims = new List<string>();
-
-            Anims = new SearchListBoxViewModel();
-            Anims.DataName = "Graphics:";
-            //TODO: properly support beam/column anims
-            //Anims.SelectedIndexChanged += Anims_SelectedIndexChanged;
-
-        }
-
-        public void LoadDataEntries(GraphicsManager.AssetType assetType, Window parent)
-        {
-            this.assetType = assetType;
-            this.parent = parent;
-
-            //Anims.DataName = assetType.ToString() + ":";
-            recomputeAnimList();
-        }
-
-        private void recomputeAnimList()
-        {
-            lock (GameBase.lockObj)
-            {
-                anims.Clear();
-                Anims.Clear();
-                string assetPattern = GraphicsManager.GetPattern(assetType);
-                string[] dirs = PathMod.GetModFiles(Path.GetDirectoryName(assetPattern), String.Format(Path.GetFileName(assetPattern), "*"));
-                for (int ii = 0; ii < dirs.Length; ii++)
-                {
-                    string filename = Path.GetFileNameWithoutExtension(dirs[ii]);
-                    anims.Add(filename);
-                }
-                Anims.SetItems(anims);
-            }
-        }
-
-        public async void mnuMassImport_Click()
-        {
-            await MessageBox.Show(parent, "Note: Importing a sprite to a slot that is already filled will automatically overwrite the old one.", "Mass Import", MessageBox.MessageBoxButtons.Ok);
-
-            //remember addresses in registry
-            string folderName = DevForm.GetConfig(Name + "Dir", Directory.GetCurrentDirectory());
-            
-            //open window to choose directory
-            IStorageFolder directory = await parent.StorageProvider.TryGetFolderFromPathAsync(folderName);
-            await Dispatcher.UIThread.InvokeAsync(async () =>
-            {
-                IReadOnlyList<IStorageFolder> results = await parent.StorageProvider.OpenFolderPickerAsync(
-                    new FolderPickerOpenOptions
-                    {
-                        Title = "Select folder to mass import",
-                        SuggestedStartLocation = directory,
-                        AllowMultiple = false,
-                    });
-
-                if (results.Count <= 0)
-                    return;
-
-                string folder = results.First().Path.LocalPath;
-                
-                DevForm.SetConfig(Name + "Dir", folder);
-                CachedPath = folder + "/";
-
-                try
-                {
-                    lock (GameBase.lockObj)
-                        MassImport(CachedPath);
-                }
-                catch (Exception ex)
-                {
-                    DiagManager.Instance.LogError(ex, false);
-                    await MessageBox.Show(parent, "Error importing from\n" + CachedPath + "\n\n" + ex.Message, "Import Failed", MessageBox.MessageBoxButtons.Ok);
-                    return;
-                }
-
-            });
-
-        }
-
-        public async void mnuMassExport_Click()
-        {
-            //remember addresses in registry
-            string folderName = DevForm.GetConfig(Name + "Dir", Directory.GetCurrentDirectory());
-
-            //open window to choose directory
-            IStorageFolder directory = await parent.StorageProvider.TryGetFolderFromPathAsync(folderName);
-            await Dispatcher.UIThread.InvokeAsync(async () =>
-            {
-                IReadOnlyList<IStorageFolder> results = await parent.StorageProvider.OpenFolderPickerAsync(
-                    new FolderPickerOpenOptions
-                    {
-                        Title = "Select folder to mass export to",
-                        SuggestedStartLocation = directory,
-                        AllowMultiple = false,
-                    });
-
-                if (results.Count <= 0)
-                    return;
-
-                string folder = results.First().Path.LocalPath;
-                DevForm.SetConfig(Name + "Dir", folder);
-                CachedPath = folder + "/";
-
-                bool success = MassExport(CachedPath);
-                if (!success)
-                    await MessageBox.Show(parent, "Errors found exporting to\n" + CachedPath + "\n\nCheck logs for more info.", "Mass Export Failed", MessageBox.MessageBoxButtons.Ok);
-            });
-        }
-
-        public async void btnImport_Click()
-        {
-            //remember addresses in registry
-            string folderName = DevForm.GetConfig(Name + "Dir", Directory.GetCurrentDirectory());
-
-            //open window to choose directory
-            IStorageFolder directory = await parent.StorageProvider.TryGetFolderFromPathAsync(folderName);
-            await Dispatcher.UIThread.InvokeAsync(async () =>
-            {
-                IReadOnlyList<IStorageFolder> results = await parent.StorageProvider.OpenFolderPickerAsync(
-                    new FolderPickerOpenOptions
-                    {
-                        Title = "Select folder to import",
-                        SuggestedStartLocation = directory,
-                        AllowMultiple = false,
-                    });
-
-                if (results.Count <= 0)
-                    return;
-
-                string folder = results.First().Path.LocalPath;
-                string animName = Path.GetFileNameWithoutExtension(folder);
-
-                if (anims.Contains(animName))
-                {
-                    MessageBox.MessageBoxResult result = await MessageBox.Show(parent, "Are you sure you want to overwrite the existing sheet:\n" + animName, "Sprite Sheet already exists.",
-                        MessageBox.MessageBoxButtons.YesNo);
-                    if (result == MessageBox.MessageBoxResult.No)
-                        return;
-                }
-
-                DevForm.SetConfig(Name + "Dir", Path.GetDirectoryName(folder));
-                CachedPath = folder;
-
-                try
-                {
-                    Import(CachedPath);
-                }
-                catch (Exception ex)
-                {
-                    DiagManager.Instance.LogError(ex, false);
-                    await MessageBox.Show(parent, "Error importing from\n" + CachedPath + "\n\n" + ex.Message, "Import Failed", MessageBox.MessageBoxButtons.Ok);
-                    return;
-                }
-            });
-        }
-
-        public async void btnReImport_Click()
-        {
-            try
-            {
-                Import(CachedPath);
-            }
-            catch (Exception ex)
-            {
-                DiagManager.Instance.LogError(ex, false);
-                await MessageBox.Show(parent, "Error importing from\n" + CachedPath + "\n\n" + ex.Message, "Import Failed", MessageBox.MessageBoxButtons.Ok);
-                return;
-            }
-        }
-
-        public async void btnExport_Click()
-        {
-            //get current sprite
-            string animData = anims[Anims.InternalIndex];
-
-            //remember addresses in registry
-            string folderName = DevForm.GetConfig(Name + "Dir", Directory.GetCurrentDirectory());
-
-            //open window to choose directory
-            IStorageFolder directory = await parent.StorageProvider.TryGetFolderFromPathAsync(folderName);
-            await Dispatcher.UIThread.InvokeAsync(async () =>
-            {
-                IReadOnlyList<IStorageFolder> results = await parent.StorageProvider.OpenFolderPickerAsync(
-                    new FolderPickerOpenOptions
-                    {
-                        Title = "Select folder to export to",
-                        SuggestedStartLocation = directory,
-                        AllowMultiple = false,
-                    });
-
-                if (results.Count <= 0)
-                    return;
-
-                string folder = results.First().Path.LocalPath;
-                DevForm.SetConfig(Name + "Dir", Path.GetDirectoryName(folder));
-                //CachedPath = folder;
-
-                try
-                {
-                    DevForm.ExecuteOrPend(() => { Export(folder, animData); });
-                }
-                catch (Exception ex)
-                {
-                    DiagManager.Instance.LogError(ex, false);
-                    await MessageBox.Show(parent, "Error exporting to\n" + CachedPath + "\n\n" + ex.Message, "Export Failed", MessageBox.MessageBoxButtons.Ok);
-                    return;
-                }
-            });
-        }
-
-        public async void btnDelete_Click()
-        {
-            //get current sprite
-            int animIdx = Anims.InternalIndex;
-
-            MessageBox.MessageBoxResult result = await MessageBox.Show(parent, "Are you sure you want to delete the following sheet:\n" + anims[animIdx], "Delete Sprite Sheet.",
-                MessageBox.MessageBoxButtons.YesNo);
-            if (result == MessageBox.MessageBoxResult.No)
-                return;
-
-            Delete(animIdx);
-        }
-
-
-
-        private void MassImport(string currentPath)
-        {
-            string assetPattern = GraphicsManager.GetPattern(assetType);
-            if (!Directory.Exists(Path.GetDirectoryName(PathMod.HardMod(assetPattern))))
-                Directory.CreateDirectory(Path.GetDirectoryName(PathMod.HardMod(assetPattern)));
-            ImportHelper.ImportAllBeams(currentPath, PathMod.HardMod(assetPattern));
-
-            GraphicsManager.RebuildIndices(assetType);
-            GraphicsManager.ClearCaches(assetType);
-
-            DiagManager.Instance.LogInfo("Mass import complete.");
-
-            //recompute
-            recomputeAnimList();
-        }
-
-
-        private void Import(string currentPath)
-        {
-            DevForm.ExecuteOrPend(() => { tryImport(currentPath); });
-
-            //recompute
-            recomputeAnimList();
-        }
-
-        private void tryImport(string currentPath)
-        {
-            lock (GameBase.lockObj)
-            {
-                string animName = Path.GetFileNameWithoutExtension(currentPath);
-                string destFile = PathMod.HardMod(String.Format(GraphicsManager.GetPattern(assetType), animName));
-                if (!Directory.Exists(Path.GetDirectoryName(destFile)))
-                    Directory.CreateDirectory(Path.GetDirectoryName(destFile));
-
-                //write sprite data
-                using (BeamSheet sheet = BeamSheet.Import(currentPath + "/"))
-                {
-                    using (FileStream stream = File.OpenWrite(destFile))
-                    {
-                        using (BinaryWriter writer = new BinaryWriter(stream))
-                            sheet.Save(writer);
-                    }
-                }
-
-                GraphicsManager.RebuildIndices(assetType);
-                GraphicsManager.ClearCaches(assetType);
-
-                DiagManager.Instance.LogInfo("Frames from:\n" +
-                    currentPath + "\nhave been imported.");
-            }
-        }
-
-
-        private bool MassExport(string currentPath)
-        {
-            bool success = true;
-            string assetPattern = GraphicsManager.GetPattern(assetType);
-            string[] dirs = PathMod.GetModFiles(Path.GetDirectoryName(assetPattern), String.Format(Path.GetFileName(assetPattern), "*"));
-            for (int ii = 0; ii < dirs.Length; ii++)
-            {
-                try
-                {
-                    string filename = Path.GetFileNameWithoutExtension(dirs[ii]);
-                    DevForm.ExecuteOrPend(() => { Export(currentPath + filename, filename); });
-                }
-                catch (Exception ex)
-                {
-                    DiagManager.Instance.LogError(ex, false);
-                    success = false;
-                }
-            }
-            return success;
-        }
-
-        private void Export(string currentPath, string anim)
-        {
-            lock (GameBase.lockObj)
-            {
-                if (!Directory.Exists(currentPath))
-                    Directory.CreateDirectory(currentPath);
-
-                string animPath = PathMod.ModPath(String.Format(GraphicsManager.GetPattern(assetType), anim));
-                if (File.Exists(animPath))
-                {
-                    //read file and read binary data
-                    using (FileStream fileStream = File.OpenRead(animPath))
-                    {
-                        using (BinaryReader reader = new BinaryReader(fileStream))
-                        {
-                            BeamSheet sheet = BeamSheet.Load(reader);
-                            BeamSheet.Export(sheet, currentPath + "/");
-                        }
-                    }
-                }
-
-                DiagManager.Instance.LogInfo("Frames from:\n" +
-                    anim +
-                    "\nhave been exported to:" + currentPath);
-            }
-        }
-
-
-        private void Delete(int animIdx)
-        {
-            lock (GameBase.lockObj)
-            {
-                string anim = anims[animIdx];
-
-                string animPath = PathMod.ModPath(String.Format(GraphicsManager.GetPattern(assetType), anim));
-                if (File.Exists(animPath))
-                    File.Delete(animPath);
-
-                GraphicsManager.RebuildIndices(assetType);
-                GraphicsManager.ClearCaches(assetType);
-
-                DiagManager.Instance.LogInfo("Deleted frames for:" + anim);
-
-                anims.RemoveAt(animIdx);
-                Anims.RemoveInternalAt(animIdx);
-            }
-        }
-
-
-        private void Anims_SelectedIndexChanged()
-        {
-            CachedPath = null;
-            if (Anims.InternalIndex == -1)
-                return;
-
-            lock (GameBase.lockObj)
-            {
-                if (DungeonScene.Instance != null)
-                {
-                    DungeonScene.Instance.DebugAsset = assetType;
-                    DungeonScene.Instance.DebugAnim = anims[Anims.InternalIndex];
-                }
-            }
-        }
-    }
-}
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevFormViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevFormViewModel.cs
index 4ddd960b..db4da3e9 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevFormViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevFormViewModel.cs
@@ -39,8 +39,7 @@ public HierarchicalTreeDataGridSource<NodeBase> NodeSource
     public DevTabScriptViewModel Script { get; set; }
 
     public ModManagerViewModel ModsManager { get; set; }
-    
- 
+
 
     private bool _isTreeView;
 
@@ -256,7 +255,7 @@ public void RemoveTab(EditorPageViewModel page)
             return;
 
         int removeIdx = Pages.IndexOf(page);
-        
+
         // Console.WriteLine($"Removing tab {page} at index {removeIdx}");
 
         ClosePageAndChildren(node);
@@ -330,7 +329,7 @@ public ObservableCollection<NodeBase> Nodes
         get => _nodes;
         set => this.RaiseAndSetIfChanged(ref _nodes, value);
     }
-    
+
     private EditorContext _context;
 
     public DevFormViewModel(EditorContext context, DevTabGameViewModel game, DevTabPlayerViewModel player,
@@ -343,17 +342,15 @@ public DevFormViewModel(EditorContext context, DevTabGameViewModel game, DevTabP
         Travel = travel;
         Script = script;
         ModsManager = mods;
-        
-        
-        
+
+
         InitializeTabEvents();
 
         this.WhenAnyValue(x => x.ActivePage)
             .Where(activePage => activePage != null)
             .Subscribe(_ => TemporaryTab = null);
 
-    
-        
+
         Pages = new ObservableCollection<EditorPageViewModel>();
         TopLevelPages = new ObservableCollection<PageNode>();
         _pageToNodeMap = new Dictionary<EditorPageViewModel, PageNode>();
@@ -398,9 +395,9 @@ await _context.DialogService.ShowDialogAsync<PreferencesWindowViewModel, bool>(
 
     public NodeBase Root { get; internal set; }
     public NodeBase MapEditorNode { get; internal set; }
-    
+
     public NodeBase GroundEditorNode { get; internal set; }
-    
+
     public void LoadDevTree()
     {
         NodeFactory _nodeFactory = _context.NodeFactory;
@@ -419,17 +416,17 @@ public void LoadDevTree()
         Nodes.Clear();
 
         var rootStr = ModsManager.CurrentModString;
-        
+
         var root = _nodeFactory.CreateOpenEditorNode<EmptyPageViewModel>(rootStr, "Icons.ScrollFill");
 
         Root = root;
         ModsManager.WhenAnyValue(x => x.CurrentMod.Name)
             .Subscribe(str => Root.Title = str ?? "Origin");
-        
+
         var devControlNode =
             _nodeFactory.CreateOpenEditorNode<DevControlPageViewModel>("Dev Control", "Icons.GameControllerFill");
         root.SubNodes.Add(devControlNode);
-        
+
         var tab = _context.PageFactory.CreatePage(typeof(DevControlPageViewModel), devControlNode);
         tab.SetPageTitle("Dev Control", "Icons.GameControllerFill");
         AddTopLevelPage(tab);
@@ -437,7 +434,7 @@ public void LoadDevTree()
 
         var mapEditorNode = _nodeFactory.CreateOpenEditorNode<MapEditPageViewModel>("Map Editor", "Icons.StairsFill");
         root.SubNodes.Add(mapEditorNode);
-        
+
         MapEditorNode = mapEditorNode;
 
         var groundEditorNode =
@@ -448,7 +445,7 @@ public void LoadDevTree()
 
         CreateDataNode(root);
         CreateConstantsNode(root);
-        
+
         CreateSpriteNode(root);
 
         CreateModNode(root);
@@ -457,7 +454,7 @@ public void LoadDevTree()
         AttachEventsRecursive(root);
         root.IsExpanded = true;
     }
-    
+
     private Action<ReflectedDataPageViewModel> CreateDataOnOpen<T>(Func<T> getter, Action<T> setter, NodeBase parent)
     {
         return vm =>
@@ -515,80 +512,96 @@ private void CreateConstantsNode(NodeBase parent)
                 },
                 parent));
 
-        
+
         var stringsNode = _context.NodeFactory.CreateOpenEditorNode<EmptyPageViewModel>("Strings", "Icons.TableFill");
-        var menuTextNode = _context.NodeFactory.CreateOpenEditorNodeWithParams<StringEditPageViewModel>("Menu Text", [false], "Icons.TableFill");
-        var gameplayTextNode = _context.NodeFactory.CreateOpenEditorNodeWithParams<StringEditPageViewModel>("Gameplay Text", [true], "Icons.TableFill");
+        var menuTextNode =
+            _context.NodeFactory.CreateOpenEditorNodeWithParams<StringEditPageViewModel>("Menu Text", [false],
+                "Icons.TableFill");
+        var gameplayTextNode =
+            _context.NodeFactory.CreateOpenEditorNodeWithParams<StringEditPageViewModel>("Gameplay Text", [true],
+                "Icons.TableFill");
         stringsNode.SubNodes.Add(menuTextNode);
         stringsNode.SubNodes.Add(gameplayTextNode);
         constantsNode.SubNodes.Add(startParamsNode);
         constantsNode.SubNodes.Add(universalEventsNode);
         constantsNode.SubNodes.Add(stringsNode);
-        
+
         var effectsNode =
             _context.NodeFactory.CreateOpenEditorNode<EmptyPageViewModel>("Effects", "Icons.SparkleFill");
         effectsNode.SubNodes.Add(_context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>("Heal FX",
             effectsNode,
-            "Icons.SparkleFill", CreateFXOnOpen(() => DataManager.Instance.HealFX, fx => DataManager.Instance.HealFX = fx, "Heal", parent)));
+            "Icons.SparkleFill",
+            CreateFXOnOpen(() => DataManager.Instance.HealFX, fx => DataManager.Instance.HealFX = fx, "Heal", parent)));
 
         effectsNode.SubNodes.Add(_context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(
             "Restore Charge FX",
             effectsNode,
-            "Icons.SparkleFill", CreateFXOnOpen(() => DataManager.Instance.RestoreChargeFX, fx => DataManager.Instance.RestoreChargeFX = fx,
+            "Icons.SparkleFill", CreateFXOnOpen(() => DataManager.Instance.RestoreChargeFX,
+                fx => DataManager.Instance.RestoreChargeFX = fx,
                 "RestoreCharge", parent)));
 
         effectsNode.SubNodes.Add(_context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(
             "Lose Charge FX",
             effectsNode,
-            "Icons.SparkleFill", CreateFXOnOpen(() => DataManager.Instance.LoseChargeFX, fx => DataManager.Instance.LoseChargeFX = fx,
+            "Icons.SparkleFill", CreateFXOnOpen(() => DataManager.Instance.LoseChargeFX,
+                fx => DataManager.Instance.LoseChargeFX = fx,
                 "LoseCharge", parent)));
 
         effectsNode.SubNodes.Add(_context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(
             "No Charge FX",
             effectsNode,
-            "Icons.SparkleFill", CreateFXOnOpen(() => DataManager.Instance.NoChargeFX, fx => DataManager.Instance.NoChargeFX = fx,
+            "Icons.SparkleFill", CreateFXOnOpen(() => DataManager.Instance.NoChargeFX,
+                fx => DataManager.Instance.NoChargeFX = fx,
                 "NoCharge", parent)));
 
         effectsNode.SubNodes.Add(_context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>("Element FX",
             effectsNode,
-            "Icons.SparkleFill", CreateFXOnOpen(() => DataManager.Instance.ElementFX, fx => DataManager.Instance.ElementFX = fx, "Element",
+            "Icons.SparkleFill", CreateFXOnOpen(() => DataManager.Instance.ElementFX,
+                fx => DataManager.Instance.ElementFX = fx, "Element",
                 parent)));
 
         effectsNode.SubNodes.Add(_context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(
             "Intrinsic FX",
             effectsNode,
-            "Icons.SparkleFill", CreateFXOnOpen(() => DataManager.Instance.IntrinsicFX, fx => DataManager.Instance.IntrinsicFX = fx,
+            "Icons.SparkleFill", CreateFXOnOpen(() => DataManager.Instance.IntrinsicFX,
+                fx => DataManager.Instance.IntrinsicFX = fx,
                 "Intrinsic", parent)));
 
         effectsNode.SubNodes.Add(_context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(
             "Send Home FX",
             effectsNode,
-            "Icons.SparkleFill", CreateFXOnOpen(() => DataManager.Instance.SendHomeFX, fx => DataManager.Instance.SendHomeFX = fx,
+            "Icons.SparkleFill", CreateFXOnOpen(() => DataManager.Instance.SendHomeFX,
+                fx => DataManager.Instance.SendHomeFX = fx,
                 "SendHome", parent)));
 
         effectsNode.SubNodes.Add(_context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(
             "Item Lost FX",
             effectsNode,
-            "Icons.SparkleFill", CreateFXOnOpen(() => DataManager.Instance.ItemLostFX, fx => DataManager.Instance.ItemLostFX = fx,
+            "Icons.SparkleFill", CreateFXOnOpen(() => DataManager.Instance.ItemLostFX,
+                fx => DataManager.Instance.ItemLostFX = fx,
                 "ItemLost", parent)));
 
         effectsNode.SubNodes.Add(_context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>("Warp FX",
             effectsNode,
-            "Icons.SparkleFill", CreateFXOnOpen(() => DataManager.Instance.WarpFX, fx => DataManager.Instance.WarpFX = fx, "Warp", parent)));
+            "Icons.SparkleFill",
+            CreateFXOnOpen(() => DataManager.Instance.WarpFX, fx => DataManager.Instance.WarpFX = fx, "Warp", parent)));
 
         effectsNode.SubNodes.Add(_context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(
             "Knockback FX",
             effectsNode,
-            "Icons.SparkleFill", CreateFXOnOpen(() => DataManager.Instance.KnockbackFX, fx => DataManager.Instance.KnockbackFX = fx,
+            "Icons.SparkleFill", CreateFXOnOpen(() => DataManager.Instance.KnockbackFX,
+                fx => DataManager.Instance.KnockbackFX = fx,
                 "Knockback", parent)));
 
         effectsNode.SubNodes.Add(_context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>("Jump FX",
             effectsNode,
-            "Icons.SparkleFill", CreateFXOnOpen(() => DataManager.Instance.JumpFX, fx => DataManager.Instance.JumpFX = fx, "Jump", parent)));
+            "Icons.SparkleFill",
+            CreateFXOnOpen(() => DataManager.Instance.JumpFX, fx => DataManager.Instance.JumpFX = fx, "Jump", parent)));
 
         effectsNode.SubNodes.Add(_context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>("Throw FX",
             effectsNode,
-            "Icons.SparkleFill", CreateFXOnOpen(() => DataManager.Instance.ThrowFX, fx => DataManager.Instance.ThrowFX = fx, "Throw",
+            "Icons.SparkleFill", CreateFXOnOpen(() => DataManager.Instance.ThrowFX,
+                fx => DataManager.Instance.ThrowFX = fx, "Throw",
                 parent)));
 
         constantsNode.SubNodes.Add(effectsNode);
@@ -606,10 +619,23 @@ private void CreateDataNode(NodeBase parent)
 
             var entry = DataRegistry.Map[type];
 
-            var dataItemRootNode = _context.NodeFactory.CreateDataRootNode<DataListPageViewModel>(
-                type,
-                type.ToString(),
-                entry.Icon);
+            DataRootNode dataItemRootNode;
+
+
+            if (type is DataManager.DataType.AutoTile)
+            {
+                dataItemRootNode = _context.NodeFactory.CreateAutoTileRootNode<DataListPageViewModel>(
+                    type.ToString(),
+                    entry.Icon);
+            }
+            else
+            {
+                dataItemRootNode = _context.NodeFactory.CreateDataRootNode<DataListPageViewModel>(
+                    type,
+                    type.ToString(),
+                    entry.Icon);
+            }
+
             dataNode.SubNodes.Add(dataItemRootNode);
         }
 
@@ -629,7 +655,7 @@ private void CreateSpriteNode(NodeBase parent)
             _context.NodeFactory.CreateOpenEditorNodeWithParams<SpeciesEditPageViewModel>("Portraits", [false],
                 "Icons.UserSquareFill")
         );
-     
+
         foreach (var type in Enum.GetValues<GraphicsManager.AssetType>())
         {
             if (type == GraphicsManager.AssetType.None || type == GraphicsManager.AssetType.All ||
@@ -641,7 +667,6 @@ private void CreateSpriteNode(NodeBase parent)
 
             if (type != GraphicsManager.AssetType.Tile)
             {
-
                 spriteNode.SubNodes.Add(
                     _context.NodeFactory.CreateSpriteRootNode<SpritePageViewModel>(type, type.ToString(),
                         type.GetIcon()));
@@ -651,15 +676,13 @@ private void CreateSpriteNode(NodeBase parent)
                 spriteNode.SubNodes.Add(
                     _context.NodeFactory.CreateSpriteTileRootNode<SpritePageViewModel>(type.ToString(),
                         type.GetIcon()));
-                
             }
         }
 
 
         parent.SubNodes.Add(spriteNode);
-        
     }
-    
+
     private void CreateModNode(NodeBase parent)
     {
         var modRoot = _context.NodeFactory.CreateOpenEditorNode<ModListPageViewModel>("Mods", "Icons.ScrollFill");
@@ -752,9 +775,9 @@ public void AddPageFromTreeNode(OpenEditorNode node)
     {
         if (node.EditorType.IsAssignableTo(typeof(IPreCreatePage)))
             node.EditorType.GetMethod("OnPreCreate")?.Invoke(null, null);
-        
+
         var editor = _context.PageFactory.CreatePage(node.EditorType, node, node.OnPageLoad);
-        
+
         if (editor != null)
         {
             editor.SetPageTitleFromNode(node);
@@ -787,6 +810,7 @@ public void OpenMapEditor()
         page.SetPageTitle("Map Editor", "Icons.StairsFill");
         AddTopLevelPage(page);
     }
+
     public void OpenGroundEditor()
     {
         var page = _context.PageFactory.CreatePage<GroundEditPageViewModel>(GroundEditorNode);
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/DevForm/ModSwitcherViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/DevForm/ModSwitcherViewModel.cs
index c4246b43..edd583ee 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/DevForm/ModSwitcherViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/DevForm/ModSwitcherViewModel.cs
@@ -13,8 +13,6 @@ namespace RogueEssence.Dev.ViewModels;
 
 public class ModSwitcherViewModel : ViewModelBase
 {
-
-    // private readonly IDialogService _dialogService;
     private readonly DevFormViewModel _mainWindow;
     private ModsEntryViewModel _selectedMod;
     private ModManagerViewModel _modManager;
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/DevForm/Nodes/NodeBase.cs b/RogueEssence.Editor.Avalonia/ViewModels/DevForm/Nodes/NodeBase.cs
index 05da626f..7f4cd85d 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/DevForm/Nodes/NodeBase.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/DevForm/Nodes/NodeBase.cs
@@ -1,9 +1,12 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
+using System.IO;
 using System.Reactive.Linq;
 using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
+using Avalonia.Platform.Storage;
+using Avalonia.Threading;
 using RogueEssence.Dev.Services;
 using ReactiveUI;
 using RogueEssence.Content;
@@ -183,6 +186,8 @@ protected override int GetHashCodeCore()
 
 public class ReflectedDataNode : OpenEditorNode
 {
+    // Used to ID each individual node, so up the tree and take each title and concat to 
+    // form the identifier. NOTE: When adding items (onEdit) use the last index (not the selected index) so pages don't get messed up?
     private string BuildIdentifier(NodeBase? parent)
     {
         var parts = new List<string> { Title };
@@ -213,7 +218,6 @@ protected override bool EqualsCore(NodeBase other)
     protected override int GetHashCodeCore() => _identifier.GetHashCode();
 }
 
-// TODO: Remove
 public class OpenEditorNodeWithParams : OpenEditorNode
 {
     public object[] ExtraParams { get; }
@@ -355,12 +359,11 @@ await Task.Run(() =>
         });
     }
     
-    public DataRootNode(NodeFactory nodeFactory, IDialogService dialogService, DataManager.DataType dataType,
+    public DataRootNode(DataManager.DataType dataType,
         Type? editorType, string title, string? icon = null, Action<EditorPageViewModel>? onPageLoad = null)
         : base(title, editorType, icon ?? "", onPageLoad)
     {
-        _nodeFactory = nodeFactory;
-        _dialogService = dialogService;
+    
         DataType = dataType;
     }
 
@@ -433,10 +436,101 @@ await MessageBoxWindowView.Show(_dialogService,
             await MessageBoxWindowView.Show(_dialogService, string.Format("{0} is now saved as a patch.", key),
                 "Complete", MessageBoxWindowView.MessageBoxButtons.Ok);
     }
+}
+
+public class AutoTileRootNode : DataRootNode
+{
+    private readonly EditorContext _context;
+    public AutoTileRootNode(EditorContext context, Type? editorType, string title, string? icon = null,
+        Action<EditorPageViewModel>? onPageLoad = null)
+        : base(DataManager.DataType.AutoTile, editorType, title, icon, onPageLoad)
+    {
+        _context = context;
+    }
     
     
-}
+    public async Task ImportDtefAsync()
+    {
+        //remember addresses in registry
+        string folderName = DevForm.GetConfig("TilesetDir", Directory.GetCurrentDirectory());
 
+        var options = new FolderPickerOpenOptions
+        {
+            Title = "Select DTEF folder",
+            AllowMultiple = false,
+        };
+        Dispatcher.UIThread.InvokeAsync(async () =>
+        {
+            string? folder = await _context.DialogService.ShowFolderPickerAsync(options, folderName);
+
+
+
+            if (folder is null)
+                return;
+
+            string animName = Path.GetFileNameWithoutExtension(folder);
+
+            bool conflict = false;
+            foreach (string name in GraphicsManager.TileIndex.Nodes.Keys)
+            {
+                if (name.ToLower() == animName.ToLower())
+                {
+                    conflict = true;
+                    break;
+                }
+            }
+
+            if (conflict)
+            {
+                var result = await MessageBoxWindowView.Show(_context.DialogService,
+                    $"Are you sure you want to overwrite the existing sheet:\n{animName}",
+                    "Tileset already exists.", MessageBoxWindowView.MessageBoxButtons.YesNo);
+
+                if (result == MessageBoxWindowView.MessageBoxResult.No)
+                    return;
+            }
+
+            DevForm.SetConfig("TilesetDir", Path.GetDirectoryName(folder));
+
+            try
+            {
+                DevForm.ExecuteOrPend(() => { _tryImportDtef(folder, animName); });
+            }
+            catch (Exception ex)
+            {
+                DiagManager.Instance.LogError(ex, false);
+                await MessageBoxWindowView.Show(_context.DialogService,
+                    $"Error importing from\n{folder}\n\n{ex.Message}",
+                    "Import Failed", MessageBoxWindowView.MessageBoxButtons.Ok);
+                return;
+            }
+        });
+    }
+    
+    
+    private void _tryImportDtef(string folder, string animName)
+    {
+        lock (GameBase.lockObj)
+        {
+            string destFile = PathMod.HardMod(string.Format(Content.GraphicsManager.TILE_PATTERN, animName));
+            DtefImportHelper.ImportDtef(folder, destFile);
+
+            //reindex graphics
+            GraphicsManager.RebuildIndices(GraphicsManager.AssetType.Tile);
+            GraphicsManager.ClearCaches(GraphicsManager.AssetType.Tile);
+            DevDataManager.ClearCaches();
+
+            //reindex data
+            DevHelper.RunIndexing(DataManager.DataType.AutoTile);
+            DevHelper.RunExtraIndexing(DataManager.DataType.AutoTile);
+            DataManager.Instance.LoadIndex(DataManager.DataType.AutoTile);
+            DataManager.Instance.LoadUniversalIndices();
+            DataManager.Instance.ClearCache(DataManager.DataType.AutoTile);
+            DiagManager.Instance.DevEditor.ReloadData(DataManager.DataType.AutoTile);
+            // TODO: Reload
+        }
+    }
+}
 // Children of the DataRootNode
 public class DataItemNode : OpenEditorNode
 {
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/DialogBoxes/DialogViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/DialogBoxes/DialogViewModel.cs
deleted file mode 100644
index 0c1c42f3..00000000
--- a/RogueEssence.Editor.Avalonia/ViewModels/DialogBoxes/DialogViewModel.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using System.Threading.Tasks;
-using ReactiveUI;
-
-namespace RogueEssence.Dev.ViewModels;
-
-
-public class DialogViewModel : ViewModelBase
-{
-    private bool _isDialogOpen;
-
-    public bool IsDialogOpen
-    {
-        get => _isDialogOpen;
-        set { this.RaiseAndSetIfChanged(ref _isDialogOpen, value); }
-    }
-
-    protected TaskCompletionSource closeTask = new TaskCompletionSource();
-
-    public async Task WaitAsnyc()
-    {
-        await closeTask.Task;
-    }
-    
-    public void Show()
-    {
-        if (closeTask.Task.IsCompleted)
-            closeTask = new TaskCompletionSource();
-    
-        IsDialogOpen = true;
-    }
-
-    public void Close()
-    {
-        IsDialogOpen = false;
-        
-        closeTask.TrySetResult();
-    }
-}
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/Pages/DataListPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/Pages/DataListPageViewModel.cs
index a997b858..b0aeead2 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/Pages/DataListPageViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/Pages/DataListPageViewModel.cs
@@ -82,11 +82,10 @@ public override void OnPageLoad()
         this.WhenAnyValue(x => x.SearchFilter).Subscribe(UpdateVisibleItems);
 
         EditMenuItems.Clear();
-
         
         var reIndex = new MenuItem { Header = "Re-Index" };
         reIndex.Click += async (s, e) => await Node.ReIndexAsync();
- 
+        EditMenuItems.Add(reIndex);
         
         if (DataType != DataManager.DataType.AutoTile)
         {
@@ -101,85 +100,11 @@ public override void OnPageLoad()
         else
         {
             var importDtef = new MenuItem { Header = "Import DTEF" };
-            importDtef.Click += async (s, e) => await ImportDtefAsync();
+            importDtef.Click += async (s, e) => await ((AutoTileRootNode)Node).ImportDtefAsync();
             EditMenuItems.Add(importDtef);
         }
     }
-
-    private void tryImportDtef(string folder, string animName)
-    {
-        lock (GameBase.lockObj)
-        {
-            string destFile = PathMod.HardMod(string.Format(Content.GraphicsManager.TILE_PATTERN, animName));
-            DtefImportHelper.ImportDtef(folder, destFile);
-
-            //reindex graphics
-            GraphicsManager.RebuildIndices(GraphicsManager.AssetType.Tile);
-            GraphicsManager.ClearCaches(GraphicsManager.AssetType.Tile);
-            DevDataManager.ClearCaches();
-
-            //reindex data
-            DevHelper.RunIndexing(DataManager.DataType.AutoTile);
-            DevHelper.RunExtraIndexing(DataManager.DataType.AutoTile);
-            DataManager.Instance.LoadIndex(DataManager.DataType.AutoTile);
-            DataManager.Instance.LoadUniversalIndices();
-            DataManager.Instance.ClearCache(DataManager.DataType.AutoTile);
-            DiagManager.Instance.DevEditor.ReloadData(DataManager.DataType.AutoTile);
-            ReloadEntries();
-        }
-    }
-
-    private async Task ImportDtefAsync()
-    {
-        //remember addresses in registry
-        string folderName = DevForm.GetConfig("TilesetDir", Directory.GetCurrentDirectory());
-
-        string? folder = await _context.DialogService.ShowFolderPickerAsync(new FolderPickerOpenOptions
-        {
-            Title = "Select DTEF folder",
-            AllowMultiple = false,
-        }, folderName);
-
-        if (folder is null)
-            return;
-
-        string animName = Path.GetFileNameWithoutExtension(folder);
-
-        bool conflict = false;
-        foreach (string name in GraphicsManager.TileIndex.Nodes.Keys)
-        {
-            if (name.ToLower() == animName.ToLower())
-            {
-                conflict = true;
-                break;
-            }
-        }
-
-        if (conflict)
-        {
-            var result = await MessageBoxWindowView.Show(_context.DialogService,
-                $"Are you sure you want to overwrite the existing sheet:\n{animName}",
-                "Tileset already exists.", MessageBoxWindowView.MessageBoxButtons.YesNo);
-
-            if (result == MessageBoxWindowView.MessageBoxResult.No)
-                return;
-        }
-
-        DevForm.SetConfig("TilesetDir", Path.GetDirectoryName(folder));
-
-        try
-        {
-            DevForm.ExecuteOrPend(() => { tryImportDtef(folder, animName); });
-        }
-        catch (Exception ex)
-        {
-            DiagManager.Instance.LogError(ex, false);
-            await MessageBoxWindowView.Show(_context.DialogService, $"Error importing from\n{folder}\n\n{ex.Message}",
-                "Import Failed", MessageBoxWindowView.MessageBoxButtons.Ok);
-            return;
-        }
-    }
-
+    
     private async Task ExportDtefAsync()
     {
         if (SelectedItem != null)
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/Pages/DevControlPage/DevControlPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/Pages/DevControlPage/DevControlPageViewModel.cs
index c914e4bb..5ef81a26 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/Pages/DevControlPage/DevControlPageViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/Pages/DevControlPage/DevControlPageViewModel.cs
@@ -24,11 +24,4 @@ public DevControlPageViewModel(EditorContext context,
         Travel = travel;
         Script = script;
     }
-
-    // public DevControlViewModel() : base(new PageFactory(new DesignServiceProvider()),
-    //     new TabEvents(new PageFactory(new DesignServiceProvider())), new DialogService())
-    // {
-    //     // Title = "Dev Control";
-    //     Fruits = new TestComboBoxViewModel();
-    // }
 }
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/Pages/DevControlPage/DevTabPlayerViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/Pages/DevControlPage/DevTabPlayerViewModel.cs
index 00ff44b0..86d212f4 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/Pages/DevControlPage/DevTabPlayerViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/Pages/DevControlPage/DevTabPlayerViewModel.cs
@@ -471,6 +471,5 @@ private void UpdateSprite()
                 }
             }
         }
-
     }
 }
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/Pages/DevControlPage/DevTabScriptViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/Pages/DevControlPage/DevTabScriptViewModel.cs
index f619a5f7..d4baf13c 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/Pages/DevControlPage/DevTabScriptViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/Pages/DevControlPage/DevTabScriptViewModel.cs
@@ -14,7 +14,7 @@ namespace RogueEssence.Dev.ViewModels
     public class DevTabScriptViewModel : ViewModelBase
     {
         private Stack<string> m_lastcommands;
-        private int m_cntDownArrow;   //counts the ammount of times the down arrow has been pressed in a row, for looking through the last commands!
+        private int m_cntDownArrow;   //counts the amount of times the down arrow has been pressed in a row, for looking through the last commands!
 
         public DevTabScriptViewModel()
         {
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/Pages/EditorPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/Pages/EditorPageViewModel.cs
index 18ce4bfc..f0f04e4f 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/Pages/EditorPageViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/Pages/EditorPageViewModel.cs
@@ -85,20 +85,7 @@ public bool Equals(EditorPageViewModel? other)
     
     protected virtual bool IsSamePage(EditorPageViewModel other) => true;
     protected virtual int GetHashCodeCore() => RuntimeHelpers.GetHashCode(this);
-    //
-    // private string _data = "";
-    //
-    //
-    // public string Data
-    // {
-    //     get { return _data; }
-    //     set
-    //     {
-    //         this.RaiseAndSetIfChanged(ref _data, value);
-    //     }
-    // }
-    //
- 
+    
 
     private bool _isActive;
     public bool IsActive
@@ -139,22 +126,6 @@ protected EditorPageViewModel(EditorContext context, NodeBase node, Action<Edito
         _onPageLoad = onPageLoad;
     }
     
-    // public (NodeBase node, ReflectedDataPageViewModel? editor) AddNewNodeAndTab(string title, string icon = "Icons.PaintBrushFill")
-    // {
-    //     NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(title, icon);
-    //     Node.SubNodes.Add(node);
-    //     ReflectedDataPageViewModel editor = _context.PageFactory.CreatePage<ReflectedDataPageViewModel>(node);
-    //     if (editor != null)
-    //     {
-    //         editor.SetPageTitle(title, icon);
-    //         _context.TabEvents.AddChildPage(this, editor);
-    //     }
-    //
-    //     return (node, editor);
-    // }
-    //
-    
-
     public void SetPageTitleFromNode(NodeBase node)
     {
         SetPageTitle(node.Title, node.Icon);
@@ -175,142 +146,4 @@ public void SetIcon(string icon)
     {
         Icon = icon;
     }
-    
-    // public RepositoryNode Node
-    // {
-    //     get => _node;
-    //     set => SetProperty(ref _node, value);
-    // }
-
-    // public LauncherPage()
-    // {
-    // _node = new RepositoryNode() { Id = Guid.NewGuid().ToString() };
-    // _data = Welcome.Instance;
-
-    // New welcome page will clear the search filter before.
-    // Welcome.Instance.ClearSearchFilter();
-    // }
-
-
-    // public class LauncherPage : ObservableObject
-    // {
-    //     public RepositoryNode Node
-    //     {
-    //         get => _node;
-    //         set => SetProperty(ref _node, value);
-    //     }
-    //
-    //     public object Data
-    //     {
-    //         get => _data;
-    //         set => SetProperty(ref _data, value);
-    //     }
-    //
-    //     public Models.DirtyState DirtyState
-    //     {
-    //         get => _dirtyState;
-    //         private set => SetProperty(ref _dirtyState, value);
-    //     }
-    //
-    //     public Popup Popup
-    //     {
-    //         get => _popup;
-    //         set => SetProperty(ref _popup, value);
-    //     }
-    //
-    //     public AvaloniaList<Models.Notification> Notifications
-    //     {
-    //         get;
-    //         set;
-    //     } = new AvaloniaList<Models.Notification>();
-    //
-    //     public LauncherPage()
-    //     {
-    //         _node = new RepositoryNode() { Id = Guid.NewGuid().ToString() };
-    //         _data = Welcome.Instance;
-    //
-    //         // New welcome page will clear the search filter before.
-    //         Welcome.Instance.ClearSearchFilter();
-    //     }
-    //
-    //     public LauncherPage(RepositoryNode node, Repository repo)
-    //     {
-    //         _node = node;
-    //         _data = repo;
-    //     }
-    //
-    //     public void ClearNotifications()
-    //     {
-    //         Notifications.Clear();
-    //     }
-    //
-    //     public async Task CopyPathAsync()
-    //     {
-    //         if (_node.IsRepository)
-    //             await App.CopyTextAsync(_node.Id);
-    //     }
-    //
-    //     public void ChangeDirtyState(Models.DirtyState flag, bool remove)
-    //     {
-    //         var state = _dirtyState;
-    //         if (remove)
-    //         {
-    //             if (state.HasFlag(flag))
-    //                 state -= flag;
-    //         }
-    //         else
-    //         {
-    //             state |= flag;
-    //         }
-    //
-    //         DirtyState = state;
-    //     }
-    //
-    //     public bool CanCreatePopup()
-    //     {
-    //         return _popup is not { InProgress: true };
-    //     }
-    //
-    //     public async Task ProcessPopupAsync()
-    //     {
-    //         if (_popup is { InProgress: false } dump)
-    //         {
-    //             if (!dump.Check())
-    //                 return;
-    //
-    //             dump.InProgress = true;
-    //
-    //             try
-    //             {
-    //                 var finished = await dump.Sure();
-    //                 if (finished)
-    //                 {
-    //                     dump.Cleanup();
-    //                     Popup = null;
-    //                 }
-    //             }
-    //             catch (Exception e)
-    //             {
-    //                 App.LogException(e);
-    //             }
-    //
-    //             dump.InProgress = false;
-    //         }
-    //     }
-    //
-    //     public void CancelPopup()
-    //     {
-    //         if (_popup == null || _popup.InProgress)
-    //             return;
-    //
-    //         _popup?.Cleanup();
-    //         Popup = null;
-    //     }
-    //
-    //     private RepositoryNode _node = null;
-
-    //     private Models.DirtyState _dirtyState = Models.DirtyState.None;
-    //     private Popup _popup = null;
-    // }
-
 }
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/Pages/MapEditPage/MapEditPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/Pages/MapEditPage/MapEditPageViewModel.cs
index 903a31c0..611ad955 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/Pages/MapEditPage/MapEditPageViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/Pages/MapEditPage/MapEditPageViewModel.cs
@@ -198,52 +198,6 @@ await MessageBoxWindowView.Show(_context.DialogService,
             }
         });
     }
-    // public async void mnuOpen_Click()
-    // {
-    //     string mapDir = Path.GetFullPath(PathMod.ModPath(DataManager.MAP_PATH));
-    //     DevForm form = (DevForm)DiagManager.Instance.DevEditor;
-    //     IStorageFolder directory = await form.GroundEditForm.StorageProvider.TryGetFolderFromPathAsync(mapDir);
-    //
-    //     await Dispatcher.UIThread.InvokeAsync(async () =>
-    //     {
-    //         IReadOnlyList<IStorageFile> results = await form.StorageProvider.OpenFilePickerAsync(
-    //             new FilePickerOpenOptions
-    //             {
-    //                 Title = "Open .rsmap File",
-    //                 SuggestedStartLocation = directory,
-    //                 AllowMultiple = false,
-    //                 FileTypeFilter =
-    //                 [
-    //                     new FilePickerFileType("Map Files")
-    //                     {
-    //                         Patterns = ["*." + DataManager.MAP_EXT.Substring(1)]
-    //                     }
-    //                 ]
-    //             });
-    //         if (results.Count > 0)
-    //         {
-    //             IStorageFile result = results.First();
-    //
-    //             bool legalPath = false;
-    //             foreach (string proposedPath in PathMod.FallbackPaths(DataManager.MAP_PATH))
-    //             {
-    //                 if (comparePaths(proposedPath, Path.GetDirectoryName(result.Path.LocalPath)))
-    //                     legalPath = true;
-    //             }
-    //
-    //             if (!legalPath)
-    //                 await MessageBox.Show(form.MapEditForm,
-    //                     String.Format("Map can only be loaded from:\n{0}\nOr one of its parents.",
-    //                         PathMod.ModPath(DataManager.MAP_PATH)), "Error", MessageBox.MessageBoxButtons.Ok);
-    //             else
-    //             {
-    //                 lock (GameBase.lockObj)
-    //                     DoLoad(Path.GetFileNameWithoutExtension(results.First().Name));
-    //             }
-    //         }
-    //     });
-    // }
-
 
     public async void mnuExportAsGround_Click()
     {
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/Pages/ModConfigPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/Pages/ModConfigPageViewModel.cs
index bf180bc2..6a3e620e 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/Pages/ModConfigPageViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/Pages/ModConfigPageViewModel.cs
@@ -22,11 +22,6 @@ public ModConfigPageViewModel(EditorContext context, ModItemNode node,
 
     public void LoadDataFromPath()
     {
-        // string fullPath = PathMod.FromApp(PathMod.Quest.Path);
-        // ModHeader resultHeader = new ModHeader(PathMod.Quest.Path, vm.Name.Trim(), vm.Author.Trim(), vm.Description.Trim(), Text.Sanitize(vm.Namespace).ToLower(), Guid.Parse(vm.UUID), Version.Parse(vm.Version), Version.Parse(vm.GameVersion), (PathMod.ModType)vm.ChosenModType, vm.GetRelationshipArray());
-        // PathMod.SaveModDetails(fullPath, resultHeader);
-
-
         ModHeader header = PathMod.GetModDetails(PathMod.FromApp(Path));
         Name = header.Name;
         Namespace = header.Namespace;
@@ -52,29 +47,7 @@ public override void OnPageLoad()
         base.OnPageLoad();
         LoadDataFromPath();
     }
-
-
-    // public ModConfigWindowViewModel(IDialogService dialogService, ModHeader header)
-    // {
-    //     Name = header.Name;
-    //     Namespace = header.Namespace;
-    //     Author = header.Author;
-    //     Description = header.Description;
-    //     UUID = header.UUID.ToString().ToUpper();
-    //     Version = header.Version.ToString();
-    //     GameVersion = header.GameVersion.ToString();
-    //
-    //     ModTypes = new ObservableCollection<string>();
-    //     for (int ii = 0; ii < (int)PathMod.ModType.Count; ii++)
-    //         ModTypes.Add(((PathMod.ModType)ii).ToLocal());
-    //     ChosenModType = (int)header.ModType;
-    //
-    //     DevForm form = (DevForm)DiagManager.Instance.DevEditor;
-    //     Relationships = new CollectionBoxViewModel(dialogService, new StringConv(typeof(RelatedMod), new object[0]));
-    //     Relationships.OnEditItem += Relationships_EditItem;
-    //     Relationships.LoadFromList(header.Relationships);
-    // }
-
+    
     private string name;
 
     public string Name
diff --git a/RogueEssence.Editor.Avalonia/Views/DevForm/DevForm.axaml b/RogueEssence.Editor.Avalonia/Views/DevForm/DevForm.axaml
index ba030585..17d57f7f 100644
--- a/RogueEssence.Editor.Avalonia/Views/DevForm/DevForm.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/DevForm/DevForm.axaml
@@ -117,7 +117,6 @@
                     <TreeDataGrid Grid.Row="2"
                                   MinHeight="200" MinWidth="200"
                                   x:Name="LeftTreeDataGrid"
-                                  Loaded="LeftTreeDataGrid_OnLoaded"
                                   DoubleTapped="LeftTreeDataGrid_OnDoubleTapped"
                                   ContextRequested="LeftTreeDataGrid_OnContextRequested"
                                   PointerPressed="LeftTreeDataGrid_OnPointerPressed"
@@ -129,65 +128,11 @@
                             <DataTemplate x:Key="TreeDataGridNodeBaseTemplate" DataType="vm:NodeBase">
                                 <ContentControl Content="{Binding}">
                                     <ContentControl.DataTemplates>
-                                        <!-- <DataTemplate DataType="vm:ItemRootNode"> -->
-                                        <!--     <Grid ColumnDefinitions="*, 32" Height="16" Margin="8, 0, 0, 0"> -->
-                                        <!--         <v:IconText Grid.Column="0" Grid.ColumnSpan="2" -->
-                                        <!--                     Text="{Binding Title}" -->
-                                        <!--                     Icon="{Binding Icon}" -->
-                                        <!--                     IconSize="12" /> -->
-
-                                        <!-- <Button Grid.Column="1" HorizontalAlignment="Left" -->
-                                        <!--         Classes="icon_button" -->
-                                        <!--         Padding="4, 0, 0, 0" -->
-                                        <!--         Width="18" Height="18" -->
-                                        <!--         IsVisible="{Binding IsPointerOver, RelativeSource={RelativeSource AncestorType=TreeDataGridRow}}" -->
-                                        <!-- -->
-                                        <!--         Command="{Binding AddCommand}"> -->
-                                        <!--     <Path Stretch="Fill" -->
-                                        <!--           Fill="{DynamicResource Brush.FG1}" -->
-                                        <!--           Width="12" Height="12" -->
-                                        <!--           Data="{StaticResource Icons.Plus}" /> -->
-                                        <!-- </Button> -->
-                                        <!--     </Grid> -->
-                                        <!-- </DataTemplate> -->
-
-                                        <DataTemplate DataType="vm:DataItemNode">
-                                            <Grid ColumnDefinitions="*,32" Height="16" Margin="8, 0, 0, 0">
-                                                <v:IconText Text="{Binding Title}"
-                                                            Icon="{Binding Icon}"
-                                                            IconSize="12" />
-                                                <!-- -->
-                                                <!-- <Button Grid.Column="1" -->
-                                                <!--         Padding="4, 0, 0, 0" -->
-                                                <!--         HorizontalAlignment="Left" -->
-                                                <!--         Command="{Binding ((vm:ItemRootNode)Parent).DeleteCommand}" -->
-                                                <!--         CommandParameter="{Binding}" -->
-                                                <!--         IsVisible="{Binding IsPointerOver, RelativeSource={RelativeSource AncestorType=TreeDataGridRow}}" -->
-                                                <!--         Classes="icon_button" -->
-                                                <!--         Width="18" Height="18" -->
-                                                <!--         VerticalAlignment="Center"> -->
-                                                <!--     <Path Stretch="Fill" -->
-                                                <!--           Fill="{DynamicResource Brush.FG1}" -->
-                                                <!--           Width="12" Height="12" -->
-                                                <!--           Data="{StaticResource Icons.Minus}" /> -->
-                                                <!-- </Button> -->
-                                            </Grid>
-                                        </DataTemplate>
-
-
-                                        <DataTemplate DataType="vm:OpenEditorNode">
-                                            <v:IconText Margin="8, 0, 0, 0" Text="{Binding Title}"
-                                                        Icon="{Binding Icon}"
-                                                        IconSize="12" />
-                                        </DataTemplate>
-
-
                                         <DataTemplate DataType="vm:NodeBase">
                                             <v:IconText Margin="8, 0, 0, 0" Text="{Binding Title}"
                                                         Icon="{Binding Icon}"
                                                         IconSize="12" />
                                         </DataTemplate>
-
                                     </ContentControl.DataTemplates>
                                 </ContentControl>
                             </DataTemplate>
@@ -215,12 +160,9 @@
 
                 <!-- Editor Content -->
                 <Panel Grid.Row="1" Background="{DynamicResource Brush.PageBackground}">
-
-                    <!-- Temporary tab still uses ContentControl since it's transient -->
                     <ContentControl Content="{Binding TemporaryTab}"
                                     IsVisible="{Binding TemporaryTab, Converter={x:Static ObjectConverters.IsNotNull}}" />
-
-                    <!-- All permanent pages kept alive, just toggling visibility -->
+                    
                     <ItemsControl ItemsSource="{Binding Pages}"
                                   IsVisible="{Binding TemporaryTab, Converter={x:Static ObjectConverters.IsNull}}">
                         <ItemsControl.ItemsPanel>
diff --git a/RogueEssence.Editor.Avalonia/Views/DevForm/DevForm.axaml.cs b/RogueEssence.Editor.Avalonia/Views/DevForm/DevForm.axaml.cs
index 2dc08cde..43971f35 100644
--- a/RogueEssence.Editor.Avalonia/Views/DevForm/DevForm.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/DevForm/DevForm.axaml.cs
@@ -662,10 +662,7 @@ private void LeftTreeDataGrid_OnContextRequested(object? sender, ContextRequeste
                 break;
         }
     }
-
-    private async void LeftTreeDataGrid_OnLoaded(object sender, RoutedEventArgs e)
-    {
-    }
+    
 
     // Show the sprite in-game when the user clicks on the sprite node in the tree
     private void LeftTreeDataGrid_OnPointerPressed(object? sender, PointerPressedEventArgs e)
diff --git a/RogueEssence.Editor.Avalonia/Views/DialogBoxes/AnimChoiceWindowView.axaml b/RogueEssence.Editor.Avalonia/Views/DialogBoxes/AnimChoiceWindowView.axaml
index ce5d9fc2..4ff9931b 100644
--- a/RogueEssence.Editor.Avalonia/Views/DialogBoxes/AnimChoiceWindowView.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/DialogBoxes/AnimChoiceWindowView.axaml
@@ -39,15 +39,7 @@
             
         </Grid>
         
-        <Grid Margin="4" >
-            <Grid.RowDefinitions>
-                <RowDefinition Height="42"/>
-                <RowDefinition Height="42"/>
-            </Grid.RowDefinitions>
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition/>
-                <ColumnDefinition/>
-            </Grid.ColumnDefinitions>
+        <Grid Margin="4" RowDefinitions="42, 42" ColumnDefinitions="*, *">
             <v:SearchComboBox ItemsSource="{Binding Anims}" SelectedIndex="{Binding ChosenAnim}" Margin="4" Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2"/>
             <Button Click="btnOK_Click" Margin="4" Grid.Row="1" Grid.Column="0">OK</Button>
             <Button Click="btnCancel_Click" Margin="4" Grid.Row="1" Grid.Column="1">Cancel</Button>
diff --git a/RogueEssence.Editor.Avalonia/Views/DialogBoxes/MessageBoxWindowView.axaml b/RogueEssence.Editor.Avalonia/Views/DialogBoxes/MessageBoxWindowView.axaml
index 92627ad1..4e0ace72 100644
--- a/RogueEssence.Editor.Avalonia/Views/DialogBoxes/MessageBoxWindowView.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/DialogBoxes/MessageBoxWindowView.axaml
@@ -10,6 +10,9 @@
                     x:Name="ThisControl"
                     SizeToContent="WidthAndHeight">
 
+    <Design.DataContext>
+        <vm:MessageBoxWindowViewModel/>
+    </Design.DataContext>
     <Grid RowDefinitions="Auto,*">
         <!-- TitleBar -->
         <Grid Grid.Row="0" Height="28" IsVisible="{Binding !#ThisControl.UseSystemWindowFrame}">
diff --git a/RogueEssence.Editor.Avalonia/Views/Pages/DevControlPage/DevControlPageView.axaml b/RogueEssence.Editor.Avalonia/Views/Pages/DevControlPage/DevControlPageView.axaml
index 39cd2e7c..05faa2ab 100644
--- a/RogueEssence.Editor.Avalonia/Views/Pages/DevControlPage/DevControlPageView.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/Pages/DevControlPage/DevControlPageView.axaml
@@ -13,28 +13,7 @@
     <Design.DataContext>
         <vm:DevControlPageViewModel/>
     </Design.DataContext>
-    
-    <UserControl.Styles>
-        <Style Selector="Button">
-            <Setter Property="Padding" Value="10"></Setter>
-            <Setter Property="HorizontalAlignment" Value="Stretch"></Setter>
-            <Setter Property="HorizontalContentAlignment" Value="Center"></Setter>
-        </Style>
-        <Style Selector="ComboBox">
-            <Setter Property="Padding" Value="8"></Setter>
-            <!-- <Setter Property="Foreground" Value="Red" />  -->
-            <!-- <Setter Property="Background" Value="Red" /> -->
-        </Style>
-        
-        <!-- -->
-        <!-- <Style Selector="TabControl /template/ ContentPresenter#PART_SelectedContentHost"> -->
-        <!--     <Setter Property="Margin" Value="2"/> -->
-        <!-- </Style> -->
-    </UserControl.Styles>
-
- 
     <Border>
-        
         <TabControl>
             <TabItem Header="Game">
                 <views:DevTabGame DataContext="{Binding Game}"/>
diff --git a/RogueEssence.Editor.Avalonia/Views/Pages/DevEditPageView.axaml b/RogueEssence.Editor.Avalonia/Views/Pages/DevEditPageView.axaml
deleted file mode 100644
index 058576cb..00000000
--- a/RogueEssence.Editor.Avalonia/Views/Pages/DevEditPageView.axaml
+++ /dev/null
@@ -1,8 +0,0 @@
-<UserControl xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="RogueEssence.Dev.Views.DevEditPageView">
-    Welcome to Avalonia!
-</UserControl>
diff --git a/RogueEssence.Editor.Avalonia/Views/Pages/DevEditPageView.axaml.cs b/RogueEssence.Editor.Avalonia/Views/Pages/DevEditPageView.axaml.cs
deleted file mode 100644
index 0e2bbef7..00000000
--- a/RogueEssence.Editor.Avalonia/Views/Pages/DevEditPageView.axaml.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
-
-namespace RogueEssence.Dev.Views;
-
-public partial class DevEditPageView : UserControl
-{
-    public DevEditPageView()
-    {
-        InitializeComponent();
-    }
-}
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/Pages/ModConfigPageView.axaml b/RogueEssence.Editor.Avalonia/Views/Pages/ModConfigPageView.axaml
index b99ecc1e..3c1f9a66 100644
--- a/RogueEssence.Editor.Avalonia/Views/Pages/ModConfigPageView.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/Pages/ModConfigPageView.axaml
@@ -15,12 +15,7 @@
             <Grid Margin="4" RowDefinitions="Auto, Auto">
                 <Grid RowDefinitions="36, 36, 36, 80" ColumnDefinitions="72, *">
                     <TextBlock Margin="4,2" Text="Name:" VerticalAlignment="Center" HorizontalAlignment="Right" />
-                    <Grid Grid.Row="0" Grid.Column="1">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition />
-                            <ColumnDefinition Width="48" />
-                            <ColumnDefinition Width="90" />
-                        </Grid.ColumnDefinitions>
+                    <Grid Grid.Row="0" Grid.Column="1" ColumnDefinitions="*, 48, 90">
                         <TextBox Text="{Binding Name}" VerticalAlignment="Center" Margin="4" />
                         <TextBlock Margin="4,2" Text="Type:" VerticalAlignment="Center" HorizontalAlignment="Right"
                                    Grid.Column="1" />
@@ -30,12 +25,7 @@
 
                     <TextBlock Margin="4,2" Text="Namespace:" VerticalAlignment="Center" HorizontalAlignment="Right"
                                Grid.Row="1" />
-                    <Grid Grid.Row="1" Grid.Column="1">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition />
-                            <ColumnDefinition Width="48" />
-                            <ColumnDefinition Width="72" />
-                        </Grid.ColumnDefinitions>
+                    <Grid Grid.Row="1" Grid.Column="1" ColumnDefinitions="*, 48, 72">
                         <TextBox Text="{Binding Namespace}" VerticalAlignment="Center" Margin="4" />
                         <TextBlock Margin="4,2" Text="Version:" VerticalAlignment="Center" HorizontalAlignment="Right"
                                    Grid.Column="1" />
@@ -79,7 +69,6 @@
                         <TextBlock Margin="4,6,4,2" VerticalAlignment="Top" HorizontalAlignment="Right" Grid.Row="2">Relations:</TextBlock>
                         <views:CollectionBox DataContext="{Binding Relationships}" Margin="4" Grid.Row="2"
                                              Grid.Column="1" MinHeight="150" />
-
                     </Grid>
                 </Expander>
             </Grid>
diff --git a/RogueEssence.Editor.Avalonia/Views/Pages/ModListPageView.axaml b/RogueEssence.Editor.Avalonia/Views/Pages/ModListPageView.axaml
index 2785ce26..88abbe60 100644
--- a/RogueEssence.Editor.Avalonia/Views/Pages/ModListPageView.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/Pages/ModListPageView.axaml
@@ -60,19 +60,6 @@
                     <v:IconText Text="Delete" Icon="Icons.TrashFill" IconSize="12" />
                 </Button>
             </StackPanel>
-            <!-- -->
-            <!-- <Button Command="{Binding btnSwitch_Click}" Margin="4" Grid.Row="2" Grid.Column="0">Switch To</Button> -->
-            <!-- <Button Command="{Binding btnAdd_Click}" Margin="4" Grid.Row="2" Grid.Column="1">Add New</Button> -->
-            <!-- <Button Command="{Binding btnDelete_Click}" Margin="4" Grid.Row="2" Grid.Column="2">Delete</Button> -->
-            <!-- -->
-            <!-- <StackPanel Grid.Row="4" Orientation="Horizontal" HorizontalAlignment="Right" Spacing="4"> -->
-            <!--     <Button Command="{Binding AddItem}" Classes="secondary" Margin="0, 0" Padding="4,3, 4, 3"> -->
-            <!--         <Path Width="14" Height="14" Data="{StaticResource Icons.Plus}" /> -->
-            <!--     </Button> -->
-            <!--     <Button Command="{Binding DeleteItem}" Classes="secondary" Margin="0, 0" Padding="4,3, 4, 3"> -->
-            <!--         <Path Width="14" Height="14" Data="{StaticResource Icons.Minus}" /> -->
-            <!--     </Button> -->
-            <!-- </StackPanel> -->
         </Grid>
     </Grid>
     
diff --git a/RogueEssence.Editor.Avalonia/Views/Pages/ReflectedDataPageView.axaml b/RogueEssence.Editor.Avalonia/Views/Pages/ReflectedDataPageView.axaml
index 66b12504..66d8fbb3 100644
--- a/RogueEssence.Editor.Avalonia/Views/Pages/ReflectedDataPageView.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/Pages/ReflectedDataPageView.axaml
@@ -11,7 +11,6 @@
         <vm:ReflectedDataPageViewModel></vm:ReflectedDataPageViewModel>
     </Design.DataContext>
     <Grid RowDefinitions="*, Auto, 32" ColumnDefinitions="*, *">
-        <!--ScrollViewer HorizontalScrollBarVisibility="Visible" VerticalScrollBarVisibility="Visible" Grid.ColumnSpan="2"-->
         <ScrollViewer Grid.ColumnSpan="2">
             <StackPanel Name="stkContent" Margin="12, 4">
         

From 9687f2e99d55466b9e88645db5beca0e0726585b Mon Sep 17 00:00:00 2001
From: Kace <41309226+DoubleTrio@users.noreply.github.com>
Date: Fri, 22 May 2026 06:48:53 -0400
Subject: [PATCH 46/51] remove more comments

---
 .../DataEditor/DataEditor.cs                  | 193 ------------------
 .../DataEditor/Editors/Editor.cs              |  37 ----
 .../DataEditor/Editors/System/ListEditor.cs   |  65 ------
 3 files changed, 295 deletions(-)

diff --git a/RogueEssence.Editor.Avalonia/DataEditor/DataEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/DataEditor.cs
index da2b8952..7bd72e89 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/DataEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/DataEditor.cs
@@ -216,198 +216,5 @@ public static string GetFriendlyTypeString(this Type type)
             return type.GetDisplayName();
         }
     }
-    
-    
-    
-    
-    // public static class ReflectedDataEditor
-    // {
-    //     private static List<IEditor> editors;
-    //
-    //     public static object clipboardObj;
-    //
-    //     private static Dictionary<Type, string> friendlyTypeNames;
-    //
-    //     public static void Init()
-    //     {
-    //         clipboardObj = new object();
-    //         editors = new List<IEditor>();
-    //         friendlyTypeNames = new Dictionary<Type, string>();
-    //     }
-    //
-    //     public static void AddEditor(IEditor editor)
-    //     {
-    //         //maintain inheritance order
-    //         Type convertingType = editor.GetConvertingType();
-    //         for (int ii = 0; ii < editors.Count; ii++)
-    //         {
-    //             if (convertingType.IsSubclassOf(editors[ii].GetConvertingType()))
-    //             {
-    //                 editors.Insert(ii, editor);
-    //                 return;
-    //             }
-    //             else if (convertingType == editors[ii].GetConvertingType() && convertingType != null && editors[ii].GetAttributeType() == null)
-    //             {
-    //                 editors.Insert(ii, editor);
-    //                 return;
-    //             }
-    //         }
-    //         editors.Add(editor);
-    //
-    //         string friendlyName = editor.GetTypeString();
-    //         if (friendlyName != null && !friendlyTypeNames.ContainsKey(convertingType))
-    //             friendlyTypeNames[convertingType] = friendlyName;
-    //     }
-    //
-    //     public static void LoadDataControls(string assetName, object obj, DataEditForm editor)
-    //     {
-    //         Type editType = obj.GetType();
-    //         LoadClassControls(editor.ControlPanel, assetName, null, obj.ToString(), editType, new object[0], obj, true, new Type[0], false);
-    //         TrackTypeSize(editor, editType);
-    //     }
-    //
-    //     /// <summary>
-    //     /// Sets the editor window based on saved values (if there are any), and sets the event to save editor dimensions when changed.
-    //     /// </summary>
-    //     /// <param name="editor"></param>
-    //     /// <param name="editType"></param>
-    //     public static void TrackTypeSize(DataEditForm editor, Type editType)
-    //     {
-    //         Size savedSize;
-    //         if (DevDataManager.GetTypeSize(editType, out savedSize))
-    //         {
-    //             //TODO: avalonia pls, why you increase the width of the window immediately after opening??
-    //             editor.Width = savedSize.Width - 10;
-    //             editor.Height = savedSize.Height;
-    //         }
-    //
-    //         void editorWindow_SizeChanged(Size size)
-    //         {
-    //             DevDataManager.SetTypeSize(editType, size);
-    //         }
-    //
-    //         editor.GetObservable(TopLevel.ClientSizeProperty).Subscribe(editorWindow_SizeChanged);
-    //     }
-    //
-    //     private static IEditor findEditor(Type objType, object[] attributes, bool noSimple)
-    //     {
-    //         foreach (IEditor editor in editors)
-    //         {
-    //             if (noSimple && editor.SimpleEditor)
-    //                 continue;
-    //
-    //             Type editType = editor.GetConvertingType();
-    //             if (editType.IsAssignableFrom(objType))
-    //             {
-    //                 Type attrType = editor.GetAttributeType();
-    //                 if (attrType == null)
-    //                     return editor;
-    //                 else
-    //                 {
-    //                     foreach (object attr in attributes)
-    //                     {
-    //                         if (attr.GetType() == attrType)
-    //                             return editor;
-    //                     }
-    //                 }
-    //             }
-    //         }
-    //         throw new ArgumentException("Unhandled type!");
-    //     }
-    //
-    //     public static void LoadClassControls(StackPanel control, string parent, Type parentType, string name, Type type, object[] attributes, object member, bool isWindow, Type[] subGroupStack, bool advancedEdit)
-    //     {
-    //         IEditor converter = findEditor(type, attributes, advancedEdit);
-    //         converter.LoadClassControls(control, parent, parentType, name, type, attributes, member, isWindow, subGroupStack, advancedEdit);
-    //     }
-    //
-    //     public static void LoadWindowControls(StackPanel control, string parent, Type parentType, string name, Type type, object[] attributes, object obj, Type[] subGroupStack, bool advancedEdit)
-    //     {
-    //         IEditor converter = findEditor(type, attributes, advancedEdit);
-    //         converter.LoadWindowControls(control, parent, parentType, name, type, attributes, obj, subGroupStack);
-    //     }
-    //
-    //     public static void LoadMemberControl(string parent, object obj, StackPanel control, string name, Type type, object[] attributes, object member, bool isWindow, Type[] subGroupStack)
-    //     {
-    //         IEditor converter = findEditor(obj.GetType(), attributes, false);
-    //         converter.LoadMemberControl(parent, obj, control, name, type, attributes, member, isWindow, subGroupStack);
-    //     }
-    //
-    //     public static void SaveDataControls(ref object obj, StackPanel control, Type[] subGroupStack)
-    //     {
-    //         obj = SaveClassControls(control, obj.ToString(), obj.GetType(), new object[0], true, subGroupStack, false);
-    //     }
-    //
-    //     public static object SaveClassControls(StackPanel control, string name, Type type, object[] attributes, bool isWindow, Type[] subGroupStack, bool advancedEdit)
-    //     {
-    //         IEditor converter = findEditor(type, attributes, advancedEdit);
-    //         return converter.SaveClassControls(control, name, type, attributes, isWindow, subGroupStack, advancedEdit);
-    //     }
-    //
-    //
-    //     public static object SaveWindowControls(StackPanel control, string name, Type type, object[] attributes, Type[] subGroupStack, bool advancedEdit)
-    //     {
-    //         IEditor converter = findEditor(type, attributes, advancedEdit);
-    //         return converter.SaveWindowControls(control, name, type, attributes, subGroupStack);
-    //     }
-    //
-    //
-    //     public static object SaveMemberControl(object obj, StackPanel control, string name, Type type, object[] attributes, bool isWindow, Type[] subGroupStack)
-    //     {
-    //         IEditor converter = findEditor(obj.GetType(), attributes, false);
-    //         return converter.SaveMemberControl(obj, control, name, type, attributes, isWindow, subGroupStack);
-    //     }
-    //
-    //     public static string GetString(object obj, Type type, object[] attributes)
-    //     {
-    //         if (obj == null)
-    //             return "NULL";
-    //         IEditor editor = findEditor(obj.GetType(), attributes, false);
-    //         return editor.GetString(obj, type, attributes);
-    //     }
-    //
-    //     public static string GetWindowTitle(string parent, string name, object obj, Type type)
-    //     {
-    //         return GetWindowTitle(parent, name, obj, type, new object[0]);
-    //     }
-    //
-    //     public static string GetWindowTitle(string parent, string name, object obj, Type type, object[] attributes)
-    //     {
-    //         string parentStr = Text.GetMemberTitle(parent);
-    //         string nameStr = Text.GetMemberTitle(name);
-    //
-    //         //if (obj == null)
-    //         //    return String.Format("{0}.{1}: New {2}", parentStr, nameStr, type.Name);
-    //         //else
-    //         //    return String.Format("{0}.{1}: {2}", parentStr, nameStr, DataEditor.GetString(obj, type, attributes));
-    //         return String.Format("{0}: {1}", parentStr, nameStr);
-    //     }
-    //
-    //     public static void SetClipboardObj(object obj, Type converterType)
-    //     {
-    //         try
-    //         {
-    //             if (converterType == null)
-    //                 clipboardObj = ReflectionExt.SerializeCopy(obj);
-    //             else
-    //             {
-    //                 JsonConverter conv = (JsonConverter)Activator.CreateInstance(converterType);
-    //                 clipboardObj = ReflectionExt.SerializeCopy(obj, conv);
-    //             }
-    //         }
-    //         catch (Exception ex)
-    //         {
-    //             DiagManager.Instance.LogError(ex);
-    //         }
-    //     }
-    //
-    //     public static string GetFriendlyTypeString(this Type type)
-    //     {
-    //         string displayName;
-    //         if (friendlyTypeNames.TryGetValue(type, out displayName))
-    //             return displayName;
-    //         return type.GetDisplayName();
-    //     }
-    // }
 }
 
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/Editor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/Editor.cs
index e8b2e632..d73341d7 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/Editor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/Editor.cs
@@ -356,43 +356,6 @@ void IEditor.LoadClassControls(StackPanel control, string parent, Type parentTyp
                     
                             
                     _context.TabEvents.AddChildPage(vm, newEditor);
-
-                    // _context.OpenElementEditor(vm, title, elementName, elementType, attributes, element, advancedEdit, op);
-                    // DataEditForm frmData = new DataEditForm();
-                    // frmData.Title = DataEditor.GetWindowTitle(parent, name, element, type, ReflectionExt.GetPassableAttributes(0, attributes));
-                    //
-                    // DataEditor.LoadClassControls(frmData.ControlPanel, parent, parentType, name, type, ReflectionExt.GetPassableAttributes(0, attributes), element, true, new Type[0], advancedEdit);
-                    // DataEditor.TrackTypeSize(frmData, type);
-                    //
-                    // frmData.SelectedOKEvent += async () =>
-                    // {
-                    //     element = DataEditor.SaveClassControls(frmData.ControlPanel, name, type, ReflectionExt.GetPassableAttributes(0, attributes), true, new Type[0], advancedEdit);
-                    //     op(element);
-                    //     return true;
-                    // };
-                    //
-                    // control.GetOwningForm().RegisterChild(frmData);
-                    // frmData.Show();
-
-
-
-                    // string title = DataEditor.GetWindowTitle(parent, name, element, type, ReflectionExt.GetPassableAttributes(0, attributes));
-                    // var (node, editor) = vm.AddNewNodeAndTab(title);
-                    // DataEditForm frmData = new DataEditForm();
-                    // frmData.Title = DataEditor.GetWindowTitle(parent, name, element, type, ReflectionExt.GetPassableAttributes(0, attributes));
-                    //
-                    // DataEditor.LoadClassControls(frmData.ControlPanel, parent, parentType, name, type, ReflectionExt.GetPassableAttributes(0, attributes), element, true, new Type[0], advancedEdit);
-                    // DataEditor.TrackTypeSize(frmData, type);
-                    //
-                    // frmData.SelectedOKEvent += async () =>
-                    // {
-                    //     element = DataEditor.SaveClassControls(frmData.ControlPanel, name, type, ReflectionExt.GetPassableAttributes(0, attributes), true, new Type[0], advancedEdit);
-                    //     op(element);
-                    //     return true;
-                    // };
-                    //
-                    // control.GetOwningForm().RegisterChild(frmData);
-                    // frmData.Show();
                 };
 
                 {
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/ListEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/ListEditor.cs
index 4b227aa7..2109cd0a 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/ListEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/ListEditor.cs
@@ -120,71 +120,6 @@ private CollectionBoxViewModel createViewModel(StackPanel control, string parent
             CollectionAttribute confirmAtt = ReflectionExt.FindAttribute<CollectionAttribute>(attributes);
             if (confirmAtt != null)
                 vm.ConfirmDelete = confirmAtt.ConfirmDelete;
-
-          
-            
-            // //add lambda expression for editing a single element
-            // vm.OnEditItem += (int index, object element, bool advancedEdit, CollectionBoxViewModel.EditElementOp op) =>
-            // {
-            //     Console.WriteLine("TRY EDIT");
-            //     // public void TestMethod()
-            //     // {
-            //     //     NodeBase node = NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>("New Node [TODO Change Title]", "Icons.PaintBrushFill");
-            //     //     Node.SubNodes.Add(node);
-            //     //     var editor = PageFactory.CreatePage<ReflectedDataPageViewModel>(node);
-            //     //     if (editor != null)
-            //     //     {
-            //     //         editor.SetPageTitle("New Node [TODO Change Title]", Node.Icon);
-            //     //         TabEvents.AddChildPage(this, editor);
-            //     //     }
-            //     // }
-            //     
-            //     
-            //     
-            //     var new_editor = pageViewModel.PageFactory.CreatePage<ReflectedDataPageViewModel>(pageViewModel.Node);
-            //     var locator = new ViewLocator();
-            //     ReflectedDataPageView view = locator.Build(new_editor) as ReflectedDataPageView;
-            //     
-            //     Console.WriteLine(view + "VIEW DONE");
-            //  
-            //
-            //     
-            //     string elementName = name + "[" + index + "]";
-            //     string title = DataEditor.GetWindowTitle(parent, elementName, element, elementType, ReflectionExt.GetPassableAttributes(1, attributes));
-            //     DataEditor.LoadClassControlsReflected(view.ControlPanel, parent, null, elementName, elementType, ReflectionExt.GetPassableAttributes(1, attributes), element, true, new Type[0], advancedEdit);
-            //
-            //     NodeBase node = pageViewModel.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(title, pageViewModel.Node.Icon);
-            //     
-            //     pageViewModel.Node.SubNodes.Add(node);
-            //     // ReflectedDataPageViewModel editor = PageFactory.CreatePage<ReflectedDataPageViewModel>(node);
-            //     if (new_editor != null)
-            //     {
-            //         new_editor.SetPageTitle(title, pageViewModel.Node.Icon);
-            //         pageViewModel.TabEvents.AddChildPage(pageViewModel, new_editor);
-            //     }
-            //     
-            //     view.SelectedOKEvent += async () =>
-            //     {
-            //         element = DataEditor.SaveClassControls(view.ControlPanel, elementName, elementType, ReflectionExt.GetPassableAttributes(1, attributes), true, new Type[0], advancedEdit);
-            //         op(index, element);
-            //         return true;
-            //     };
-            //
-            //     
-            //     // DataEditor.TrackTypeSize(frmData, elementType);
-            //     //
-            //     // frmData.SelectedOKEvent += async () =>
-            //     // {
-            //     //     element = DataEditor.SaveClassControls(frmData.ControlPanel, elementName, elementType, ReflectionExt.GetPassableAttributes(1, attributes), true, new Type[0], advancedEdit);
-            //     //     op(index, element);
-            //     //     return true;
-            //     // };
-            //
-            //     // control.GetOwningForm().RegisterChild(frmData);
-            //     // // control.FindAncestorOfType<TreeDataGr>()
-            //
-            //     // frmData.Show();
-            // };
             
             //add lambda expression for editing a single element
             vm.OnEditItem += (int index, object element, bool advancedEdit, CollectionBoxViewModel.EditElementOp op) =>

From 0785fee95e4d2334c95a5bfcbe64ce35da47c1b5 Mon Sep 17 00:00:00 2001
From: Kace <41309226+DoubleTrio@users.noreply.github.com>
Date: Fri, 22 May 2026 23:23:28 -0400
Subject: [PATCH 47/51] fix buttons

---
 .../Pages/DevControlPage/DevControlPageView.axaml     | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/RogueEssence.Editor.Avalonia/Views/Pages/DevControlPage/DevControlPageView.axaml b/RogueEssence.Editor.Avalonia/Views/Pages/DevControlPage/DevControlPageView.axaml
index 05faa2ab..a5ace1a3 100644
--- a/RogueEssence.Editor.Avalonia/Views/Pages/DevControlPage/DevControlPageView.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/Pages/DevControlPage/DevControlPageView.axaml
@@ -13,6 +13,17 @@
     <Design.DataContext>
         <vm:DevControlPageViewModel/>
     </Design.DataContext>
+    
+    <UserControl.Styles>
+        <Style Selector="Button">
+            <Setter Property="Padding" Value="10"></Setter>
+            <Setter Property="HorizontalAlignment" Value="Stretch"></Setter>
+            <Setter Property="HorizontalContentAlignment" Value="Center"></Setter>
+        </Style>
+        <Style Selector="ComboBox">
+            <Setter Property="Padding" Value="8"></Setter>
+        </Style>
+    </UserControl.Styles>
     <Border>
         <TabControl>
             <TabItem Header="Game">

From 115eca71c5b46e270ad81008939c795ef215cb11 Mon Sep 17 00:00:00 2001
From: Kace <41309226+DoubleTrio@users.noreply.github.com>
Date: Wed, 27 May 2026 17:09:57 -0400
Subject: [PATCH 48/51] qol changes

---
 .../Editors/System/DictionaryEditor.cs        |   8 +-
 .../EditorContext/TabEvents.cs                |   7 +
 .../ViewModels/DevForm/DevFormViewModel.cs    |  77 ++++-
 .../ViewModels/DevForm/Nodes/NodeBase.cs      |  16 +-
 .../ViewModels/Pages/DataListPageViewModel.cs |  12 +
 .../ViewModels/Pages/EditorPageViewModel.cs   |   4 +
 .../ViewModels/Pages/SpritePageViewModel.cs   | 312 ++++++++++++++++--
 .../Pages/StringEditPageViewModel.cs          |  61 ++--
 .../Views/DevForm/DevForm.axaml               |   4 +
 .../Views/DevForm/TabBarView.axaml            |  20 +-
 .../Views/Pages/DataListPageView.axaml        |  11 +-
 .../Views/Pages/DataListPageView.axaml.cs     |  20 +-
 .../Views/Pages/ModListPageView.axaml         |  13 +-
 .../Views/Pages/SpeciesEditPageView.axaml     |  18 +-
 .../Views/Pages/SpritePageView.axaml          | 196 ++++++++---
 .../Views/Pages/SpritePageView.axaml.cs       |  23 +-
 .../Views/Pages/StringEditPageView.axaml      |  22 +-
 RogueEssence/Data/DataManager.cs              |   2 +-
 18 files changed, 648 insertions(+), 178 deletions(-)

diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/DictionaryEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/DictionaryEditor.cs
index 92132540..e39e2269 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/DictionaryEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/DictionaryEditor.cs
@@ -52,17 +52,17 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
             {
                 EditorPageViewModel pageViewModel = control.FindAncestorViewModel<EditorPageViewModel>();
                 string elementName = name + "[" + key.ToString() + "]";
-                string title = DataEditor.GetWindowTitle(parent, elementName, element, elementType,
-                    ReflectionExt.GetPassableAttributes(2, attributes));
+                // string title = DataEditor.GetWindowTitle(parent, elementName, element, elementType,
+                    // ReflectionExt.GetPassableAttributes(2, attributes));
 
                 NodeBase node =
-                    _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(title, pageViewModel.Node, pageViewModel.Node.Icon);
+                    _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(elementName, pageViewModel.Node, pageViewModel.Node.Icon);
                 pageViewModel.Node.AddNodeIfNotExists(node);
 
                 NodeHelper.ExpandParents(node, true);
                 ReflectedDataPageViewModel
                     newEditor = _context.PageFactory.CreatePage<ReflectedDataPageViewModel>(node);
-                newEditor.SetPageTitle(title, pageViewModel.Node.Icon);
+                newEditor.SetPageTitle(elementName, pageViewModel.Node.Icon);
 
                 newEditor.OnLoadAction = (StackPanel stack) =>
                 {
diff --git a/RogueEssence.Editor.Avalonia/EditorContext/TabEvents.cs b/RogueEssence.Editor.Avalonia/EditorContext/TabEvents.cs
index 442b2697..406190f6 100644
--- a/RogueEssence.Editor.Avalonia/EditorContext/TabEvents.cs
+++ b/RogueEssence.Editor.Avalonia/EditorContext/TabEvents.cs
@@ -14,6 +14,9 @@ public class TabEvents
         public event Action<EditorPageViewModel>? RemoveTabEvent;
         public event Action<EditorPageViewModel>? NavigateToTabEvent;
         
+        public event Action<OpenEditorNode>? AddPageFromTreeNodeEvent;
+
+        
         // Used for closing tabs when a data entry is deleted
         public event Action<string, DataManager.DataType>? CloseTabsForEntry;
         
@@ -65,6 +68,10 @@ public void RemoveTab(EditorPageViewModel page)
         // TODO: remove this?
         public void NavigateToTab(EditorPageViewModel page)
             => NavigateToTabEvent?.Invoke(page);
+        
+        // TODO: remove this?
+        public void AddPageFromTreeNode(OpenEditorNode node)
+            => AddPageFromTreeNodeEvent?.Invoke(node);
 
     }
 }
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevFormViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevFormViewModel.cs
index db4da3e9..973ae74d 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevFormViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevFormViewModel.cs
@@ -248,40 +248,68 @@ private PageNode GetTopLevelNode(PageNode node)
         return current;
     }
 
+    // public void RemoveTab(EditorPageViewModel page)
+    // {
+    //     // Console.WriteLine($"Removing tab {page}" + "hmmm");
+    //     if (!_pageToNodeMap.TryGetValue(page, out var node))
+    //         return;
+    //
+    //     int removeIdx = Pages.IndexOf(page);
+    //
+    //     // Console.WriteLine($"Removing tab {page} at index {removeIdx}");
+    //
+    //     ClosePageAndChildren(node);
+    //
+    //
+    //     // TODO:
+    //     // We want to prioritize setting the left tab to be the active tab since our editors open stuff to the right first
+    //     // Maybe we want to set the active page to be the parent if it exists?
+    //     // For after deleting Datatype entries, should it go back to the last previously visited tab?
+    //
+    //
+    //   Console.WriteLine(ActivePage);
+    //     Console.WriteLine(page.Equals(ActivePage) + "same!!?");
+    //
+    //     if (Pages.Count == 0)
+    //     {
+    //         ActivePage = null;
+    //     }
+    //     else if (page.Equals(ActivePage))
+    //     {
+    //         if (removeIdx < Pages.Count)
+    //         {
+    //             ActivePage = Pages[removeIdx];
+    //         }
+    //         else
+    //         {
+    //             ActivePage = Pages[removeIdx - 1];
+    //         }
+    //     }
+    // }
+    
     public void RemoveTab(EditorPageViewModel page)
     {
-        // Console.WriteLine($"Removing tab {page}" + "hmmm");
         if (!_pageToNodeMap.TryGetValue(page, out var node))
             return;
 
         int removeIdx = Pages.IndexOf(page);
-
-        // Console.WriteLine($"Removing tab {page} at index {removeIdx}");
+        bool wasActive = page.Equals(ActivePage); // capture before removal
 
         ClosePageAndChildren(node);
 
-
-        // TODO:
-        // We want to prioritize setting the left tab to be the active tab since our editors open stuff to the right first
-        // Maybe we want to set the active page to be the parent if it exists?
-        // For after deleting Datatype entries, should it go back to the last previously visited tab?
         if (Pages.Count == 0)
         {
             ActivePage = null;
         }
-        else
+        else if (wasActive)
         {
-            if (removeIdx > 0 && removeIdx - 1 < Pages.Count)
-            {
-                ActivePage = Pages[removeIdx - 1];
-            }
-            else if (removeIdx > 0)
+            if (removeIdx < Pages.Count)
             {
-                ActivePage = Pages[Pages.Count - 1];
+                ActivePage = Pages[removeIdx];
             }
             else
             {
-                ActivePage = Pages[0];
+                ActivePage = Pages[removeIdx - 1];
             }
         }
     }
@@ -299,6 +327,7 @@ public async Task SaveChildren(EditorPageViewModel page)
         }
     }
 
+    
     private void ClosePageAndChildren(PageNode node)
     {
         var children = node.SubNodes.Cast<PageNode>().ToList();
@@ -365,6 +394,14 @@ public DevFormViewModel(EditorContext context, DevTabGameViewModel game, DevTabP
 
         this.WhenAnyValue(x => x.Filter).Throttle(TimeSpan.FromMilliseconds(300)).Subscribe(ApplyFilter);
 
+        EditorPageViewModel? previousPage = null;
+        this.WhenAnyValue(x => x.ActivePage).Subscribe(page =>
+        {
+            previousPage?.OnPageDeactivated();
+            page?.OnPageActivated();
+            previousPage = page;
+        });
+        
         NodeSource = new HierarchicalTreeDataGridSource<NodeBase>(Nodes)
         {
             Columns =
@@ -699,6 +736,7 @@ private void InitializeTabEvents()
             AddChildPage(parent, child);
             ActivePage = child;
         };
+        _tabEvents.AddPageFromTreeNodeEvent += AddPageFromTreeNode;
 
         _tabEvents.SaveChildrenEvent += SaveChildren;
 
@@ -785,6 +823,13 @@ public void AddPageFromTreeNode(OpenEditorNode node)
         }
     }
 
+    public async Task TryCloseCurrentTab()
+    {
+        if (ActivePage != null)
+        { 
+            await TryCloseTabAsync(ActivePage);
+        }
+    }
     public async Task<bool> TryCloseTabAsync(EditorPageViewModel page)
     {
         if (PageHasChildren(page))
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/DevForm/Nodes/NodeBase.cs b/RogueEssence.Editor.Avalonia/ViewModels/DevForm/Nodes/NodeBase.cs
index 7f4cd85d..52b29f2d 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/DevForm/Nodes/NodeBase.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/DevForm/Nodes/NodeBase.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.IO;
+using System.Linq;
 using System.Reactive.Linq;
 using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
@@ -122,17 +123,14 @@ public void CollapseChildren()
         }
     }
 
-    public bool AddNodeIfNotExists(NodeBase node)
+    public NodeBase AddNodeIfNotExists(NodeBase node)
     {
-        bool added = false;
+        var existing = SubNodes.FirstOrDefault(n => n.Equals(node));
+        if (existing != null)
+            return existing;
 
-        if (!SubNodes.Contains(node))
-        {
-            SubNodes.Add(node);
-            added = true;
-        }
-
-        return added;
+        SubNodes.Add(node);
+        return node;
     }
 
     public void RemoveNode(NodeBase node)
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/Pages/DataListPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/Pages/DataListPageViewModel.cs
index b0aeead2..00b007ee 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/Pages/DataListPageViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/Pages/DataListPageViewModel.cs
@@ -168,6 +168,18 @@ public void AddChildItemUnderParent(DataListEntry entry)
             _context.NodeFactory.CreateDataItemNode<ReflectedDataPageViewModel>(entry.Key, entry.Title, Node.Icon, _configurePage));
         NodeHelper.ExpandParents(Node, true);
     }
+    
+      
+    public void AddChildItemUnderParentAndNavigate(DataListEntry entry)
+    {
+        OpenEditorNode node =
+            _context.NodeFactory.CreateDataItemNode<ReflectedDataPageViewModel>(entry.Key, entry.Title, Node.Icon,
+                _configurePage);
+        var n = Node.AddNodeIfNotExists(node);
+        NodeHelper.ExpandParents(Node, true);
+        
+        _context.TabEvents.AddPageFromTreeNode((OpenEditorNode)n);
+    }
 
     private void _configurePage(EditorPageViewModel vm)
     {
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/Pages/EditorPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/Pages/EditorPageViewModel.cs
index f0f04e4f..1c270abf 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/Pages/EditorPageViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/Pages/EditorPageViewModel.cs
@@ -54,6 +54,10 @@ public virtual void OnPageRemoved()
         PageRemoved?.Invoke(this, EventArgs.Empty);
     }
     
+    public virtual void OnPageActivated() { }
+
+    public virtual void OnPageDeactivated() { }
+
     // Whether to add a new tab when this page is added
     public virtual bool AddNewTab => true;
     
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/Pages/SpritePageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/Pages/SpritePageViewModel.cs
index 3b5d1ff1..71876b7f 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/Pages/SpritePageViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/Pages/SpritePageViewModel.cs
@@ -4,10 +4,16 @@
 using System.IO;
 using System.Linq;
 using System.Reactive;
+using System.Runtime.InteropServices;
 using System.Threading.Tasks;
+using Avalonia;
+using Avalonia.Media.Imaging;
+using Avalonia.Platform;
 using Avalonia.Platform.Storage;
 using Avalonia.Threading;
 using DynamicData;
+using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework.Graphics;
 using RogueEssence.Dev.Services;
 using ReactiveUI;
 using RogueEssence.Content;
@@ -17,9 +23,60 @@
 
 namespace RogueEssence.Dev.ViewModels;
 
+public static class PreviewHelper
+{
+    public static Bitmap FromColors(Color[] data, int width, int height)
+    {
+        var bitmap = new WriteableBitmap(
+            new PixelSize(width, height),
+            new Vector(96, 96),
+            PixelFormat.Bgra8888,
+            AlphaFormat.Premul);
+
+        using var fb = bitmap.Lock();
+    
+        byte[] bytes = new byte[data.Length * 4];
+        for (int i = 0; i < data.Length; i++)
+        {
+            bytes[i * 4 + 0] = data[i].B;
+            bytes[i * 4 + 1] = data[i].G;
+            bytes[i * 4 + 2] = data[i].R;
+            bytes[i * 4 + 3] = data[i].A;
+        }
+
+        Marshal.Copy(bytes, 0, fb.Address, bytes.Length);
+        return bitmap;
+    }
+    public static Bitmap FromSheet(BaseSheet sheet)
+    {
+        Color[] data = BaseSheet.GetData(sheet);
+        return FromColors(data, sheet.Width, sheet.Height);
+    }
+
+    public static Bitmap FromSheet(BaseSheet sheet, int frameX, int frameY, int width, int height)
+    {
+        Color[] data = BaseSheet.GetData(sheet, frameX, frameY, width, height);
+        return FromColors(data, width, height);
+    }
+}
+
 public class SpritePageViewModel : EditorPageViewModel<SpriteRootNode>
 {
     
+    // 
+    
+    private double _zoomLevel = 1.0;
+    public double ZoomLevel
+    {
+        get => _zoomLevel;
+        set => this.RaiseAndSetIfChanged(ref _zoomLevel, value);
+    }
+    
+    
+    public double PreviewWidth => (PreviewBitmap?.PixelSize.Width ?? 0) * ZoomLevel;
+    public double PreviewHeight => (PreviewBitmap?.PixelSize.Height ?? 0) * ZoomLevel;
+    
+    
     private string _searchFilter = string.Empty;
 
     public string SearchFilter
@@ -27,7 +84,7 @@ public string SearchFilter
         get => _searchFilter;
         set => this.RaiseAndSetIfChanged(ref _searchFilter, value);
     }
-    
+
     private string? _selectedItem;
 
     public string? SelectedItem
@@ -41,7 +98,7 @@ public string? SelectedItem
     public ObservableCollection<string> FilteredItems { get; } = new();
 
     public ObservableCollection<DataOpContainer> EditMenuItems { get; } = new();
-    
+
     private void UpdateVisibleItems(string filter)
     {
         FilteredItems.Clear();
@@ -50,65 +107,96 @@ private void UpdateVisibleItems(string filter)
             FilteredItems.Add(item);
     }
 
-    
+
     public GraphicsManager.AssetType AssetType => Node.AssetType;
-    
-    
-    public SpritePageViewModel(EditorContext context, SpriteRootNode node, Action<EditorPageViewModel> onPageOpen = null) : base(context, node, onPageOpen)
+
+
+    public SpritePageViewModel(EditorContext context, SpriteRootNode node,
+        Action<EditorPageViewModel> onPageOpen = null) : base(context, node, onPageOpen)
     {
-        
     }
-    
+
     public Action? OnPageRemovedAction { get; set; }
 
+    // public override void OnPageRemoved()
+    // {
+    //     OnPageRemovedAction?.Invoke();
+    //     Node.Strategy.OnReload -= () => LoadDataEntries(AssetType);
+    //     base.OnPageRemoved();
+    // }
     public override void OnPageRemoved()
     {
+        StopPreview();
         OnPageRemovedAction?.Invoke();
         Node.Strategy.OnReload -= () => LoadDataEntries(AssetType);
         base.OnPageRemoved();
     }
     
-    
+
+
     public override void OnPageLoad()
     {
-        
         if (AssetType == GraphicsManager.AssetType.Tile)
-        { 
+        {
             LoadDataEntriesForTiles();
         }
         else
         {
             LoadDataEntries(AssetType);
         }
+
         Node.Strategy.OnReload += () => LoadDataEntries(AssetType);
-        
+
         this.WhenAnyValue(x => x.SearchFilter).Subscribe(UpdateVisibleItems);
-        this.WhenAnyValue(x => x.SelectedItem).Subscribe(_ => Node.CachedPath = null);
+        this.WhenAnyValue(x => x.SelectedItem).Subscribe(item =>
+        {
+            Node.CachedPath = null;
+            StartPreview(item);
+        });
+        this.WhenAnyValue(x => x.ZoomLevel, x => x.PreviewBitmap)
+            .Subscribe(_ =>
+            {
+                this.RaisePropertyChanged(nameof(PreviewWidth));
+                this.RaisePropertyChanged(nameof(PreviewHeight));
+            });
+        
+        this.WhenAnyValue(x => x.IsPaused).Subscribe(paused =>
+        {
+            if (paused)
+                _animTimer?.Stop();
+            else
+                _animTimer?.Start();
+        });
+        
+        this.WhenAnyValue(x => x.PreviewFps).Subscribe(fps =>
+        {
+            if (_animTimer != null)
+                _animTimer.Interval = TimeSpan.FromSeconds(1.0 / fps);
+        });
     }
-    
 
-    
+
     public async void mnuMassExport_Click()
     {
         await Node.MassExportAsync();
     }
-    
+
     public async void mnuMassImport_Click()
     {
         await Node.MassImportAsync();
     }
-    
-    
+
+
     public void LoadDataEntries(GraphicsManager.AssetType assetType)
     {
         lock (GameBase.lockObj)
         {
-            
             Dispatcher.UIThread.Post(() =>
             {
                 Items.Clear();
                 string assetPattern = GraphicsManager.GetPattern(assetType);
-                string[] dirs = PathMod.GetModFiles(Path.GetDirectoryName(assetPattern), String.Format(Path.GetFileName(assetPattern), "*"));
+                string[] dirs = PathMod.GetModFiles(Path.GetDirectoryName(assetPattern),
+                    String.Format(Path.GetFileName(assetPattern), "*"));
                 for (int ii = 0; ii < dirs.Length; ii++)
                 {
                     string filename = Path.GetFileNameWithoutExtension(dirs[ii]);
@@ -127,44 +215,45 @@ public void LoadDataEntriesForTiles()
             Dispatcher.UIThread.Post(() =>
             {
                 Items.Clear();
-                
+
                 foreach (string name in GraphicsManager.TileIndex.Nodes.Keys)
                 {
                     Items.Add(name);
                 }
+
                 UpdateVisibleItems(SearchFilter);
             });
         }
     }
-    
+
     public async void btnImport_Click()
     {
         await Node.ImportAsync(Items);
     }
-    
+
 
     public async void btnReImport_Click()
     {
         await Node.ReImportAsync();
     }
-    
+
     public async void btnExport_Click()
     {
         await Node.ExportAsync(SelectedItem);
     }
-    
+
     public async void btnDelete_Click()
     {
         await Node.DeleteAsync(SelectedItem);
     }
-    
+
     protected override bool IsSamePage(EditorPageViewModel other)
     {
         var page = other as SpritePageViewModel;
         return AssetType == page?.AssetType;
     }
-    
-    
+
+
     public async void mnuReIndex_Click()
     {
         try
@@ -174,11 +263,12 @@ public async void mnuReIndex_Click()
         catch (Exception ex)
         {
             DiagManager.Instance.LogError(ex, false);
-            await MessageBoxWindowView.Show(_context.DialogService, "Error when reindexing.\n\n" + ex.Message, "Reindex Failed", MessageBoxWindowView.MessageBoxButtons.Ok);
+            await MessageBoxWindowView.Show(_context.DialogService, "Error when reindexing.\n\n" + ex.Message,
+                "Reindex Failed", MessageBoxWindowView.MessageBoxButtons.Ok);
             return;
         }
     }
-    
+
     public void ReIndex()
     {
         DevForm.ExecuteOrPend(() => { tryReIndex(); });
@@ -186,7 +276,7 @@ public void ReIndex()
         LoadDataEntriesForTiles();
     }
 
-    
+
     private void tryReIndex()
     {
         lock (GameBase.lockObj)
@@ -197,8 +287,166 @@ private void tryReIndex()
             DiagManager.Instance.LogInfo("All files re-indexed.");
         }
     }
-    
+
     public bool IsTileAsset => AssetType == GraphicsManager.AssetType.Tile;
+
+    private Bitmap? _previewBitmap;
+
+    public Bitmap? PreviewBitmap
+    {
+        get => _previewBitmap;
+        set => this.RaiseAndSetIfChanged(ref _previewBitmap, value);
+    }
+
+    private DispatcherTimer? _animTimer;
+    private DirSheet? _currentSheet;
+    private int _currentFrame;
+    
+    
+    
+    
+    private BaseSheet _currentBaseSheet;
+    private BeamSheet _currentBeamSheet;
+    
+
+    private void StartPreview(string? item)
+    {
+        StopPreview();
+        if (item == null) return;
+
+        DevForm.ExecuteOrPend(() =>
+        {
+            lock (GameBase.lockObj)
+            {
+                try
+                {
+                    if (AssetType == GraphicsManager.AssetType.Tile)
+                    {
+                        var bmp = DevDataManager.GetTileset(item);
+                        Dispatcher.UIThread.Post(() => PreviewBitmap = bmp);
+                    }
+                    else if (AssetType == GraphicsManager.AssetType.Beam)
+                    {
+                        var beamSheet = GraphicsManager.GetBeam(item);
+                        Dispatcher.UIThread.Post(() => PreviewBitmap = PreviewHelper.FromSheet(beamSheet));
+                    }
+                    else
+                    {
+                        var sheet = AssetType switch
+                        {
+                            GraphicsManager.AssetType.Particle => GraphicsManager.GetAttackSheet(item),
+                            _ => GraphicsManager.GetDirSheet(AssetType, item)
+                        };
+                        _currentSheet = sheet;
+                        _currentFrame = 0;
+                        Dispatcher.UIThread.Post(() =>
+                        {
+                            PreviewBitmap = PreviewHelper.FromSheet(sheet, 0, 0, sheet.TileWidth, sheet.TileHeight);
+                            HasAnimation = sheet.TotalX > 1;
+    
+                            if (sheet.TotalX > 1)
+                            {
+                                _animTimer = new DispatcherTimer(DispatcherPriority.Render);
+                                _animTimer.Interval = TimeSpan.FromSeconds(1.0 / PreviewFps);
+                           
+                                _animTimer.Tick += (_, _) =>
+                                {
+                                  
+                                    _currentFrame = (_currentFrame + 1) % sheet.TotalX;
+                                    int frameX = _currentFrame * sheet.TileWidth;
+                                    PreviewBitmap = PreviewHelper.FromSheet(sheet, frameX, 0, sheet.TileWidth, sheet.TileHeight);
+                                    this.RaisePropertyChanged(nameof(CurrentFrameDisplay));
+                                };
+                                _animTimer.Start();
+                     
+                            }
+                        });
+                    }
+                }
+                catch (Exception ex)
+                {
+                    DiagManager.Instance.LogError(ex, false);
+                }
+            }
+        });
+    }
+
+    /*private void UpdatePreviewFrame()
+    {
+        if (_currentSheet == null)
+        {
+            Console.WriteLine("UpdatePreviewFrame: _currentSheet is null");
+            return;
+        }
+        Console.WriteLine($"UpdatePreviewFrame: frame={_currentFrame} TotalX={_currentSheet.TotalX} TileWidth={_currentSheet.TileWidth} TileHeight={_currentSheet.TileHeight} SheetW={_currentSheet.Width} SheetH={_currentSheet.Height}");
+        int frameX = (_currentFrame % _currentSheet.TotalX) * _currentSheet.TileWidth;
+        int frameY = 0;
+        PreviewBitmap = PreviewHelper.FromSheet(_currentSheet, frameX, frameY, _currentSheet.TileWidth, _currentSheet.TileHeight);
+        Console.WriteLine($"UpdatePreviewFrame: PreviewBitmap set to {PreviewBitmap?.Size}");
+    }*/
+    
+    private void UpdatePreviewFrame()
+    {
+        if (_currentSheet == null)
+        {
+            Console.WriteLine("UpdatePreviewFrame: _currentSheet is null");
+            return;
+        }
+        Console.WriteLine($"UpdatePreviewFrame: frame={_currentFrame}");
+        int frameX = (_currentFrame % _currentSheet.TotalX) * _currentSheet.TileWidth;
+        PreviewBitmap = PreviewHelper.FromSheet(_currentSheet, frameX, 0, _currentSheet.TileWidth, _currentSheet.TileHeight);
+    }
+
+    private void StopPreview()
+    {
+        _animTimer?.Stop();
+        _animTimer = null;
+        _currentSheet = null;
+        _currentFrame = 0;
+    }
+    
+    public override void OnPageActivated()
+    {
+        ResumePreview();
+    }
+
+    public override void OnPageDeactivated()
+    {
+        PausePreview();
+    }
+    
+    private double _previewFps = 12;
+    public double PreviewFps
+    {
+        get => _previewFps;
+        set => this.RaiseAndSetIfChanged(ref _previewFps, value);
+    }
+    
+    private bool _isPaused;
+    public bool IsPaused
+    {
+        get => _isPaused;
+        set => this.RaiseAndSetIfChanged(ref _isPaused, value);
+    }
+
+    private bool _hasAnimation;
+    public bool HasAnimation
+    {
+        get => _hasAnimation;
+        set => this.RaiseAndSetIfChanged(ref _hasAnimation, value);
+    }
+  
+    public void TogglePreview()
+    {
+        IsPaused = !IsPaused;
+    }
+    
+    public void ResumePreview() => IsPaused = false;
+
+    public void PausePreview() => IsPaused = true;
     
+    public string CurrentFrameDisplay => _currentSheet != null 
+        ? $"Frame: {_currentFrame + 1} / {_currentSheet.TotalX}" 
+        : "Frame: -";
     
 }
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/Pages/StringEditPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/Pages/StringEditPageViewModel.cs
index 96b641f5..24901dbb 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/Pages/StringEditPageViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/Pages/StringEditPageViewModel.cs
@@ -2,10 +2,13 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.IO;
+using System.Linq;
 using System.Reactive;
 using Avalonia.Controls;
 using Avalonia.Platform.Storage;
+using Avalonia.Threading;
 using ReactiveUI;
+using RogueEssence.Dev.Utility;
 
 namespace RogueEssence.Dev.ViewModels;
 
@@ -21,12 +24,25 @@ public StringEditPageViewModel(EditorContext context, OpenEditorNodeWithParams n
         GameStrings = new ObservableCollection<MapString>();
         IsMenuText = (bool)node.ExtraParams[0];
         HeaderText = node.Title;
+        this.WhenAnyValue(x => x.SearchFilter).Subscribe(UpdateVisibleItems);
     }
     public override void OnPageLoad()
     {
-        LoadStringEntries();
+        LoadStrings();
     }
-    
+
+    private void UpdateVisibleItems(string filter)
+    {
+        FilteredItems.Clear();
+        var strategy = new BeginningTitleFilterStrategy();
+        foreach (var item in GameStrings.Where(e =>
+                     strategy.Matches(e.Key, filter) || strategy.Matches(e.String, filter)))
+        {
+            Console.WriteLine(item.Key);
+            FilteredItems.Add(item);
+        }
+    }
+
     protected override bool IsSamePage(EditorPageViewModel other)
     {
         if (other is not StringEditPageViewModel stringPage)
@@ -35,6 +51,14 @@ protected override bool IsSamePage(EditorPageViewModel other)
         return this.IsMenuText == stringPage.IsMenuText;
     }
         
+    private string _searchFilter = string.Empty;
+
+    public string SearchFilter
+    {
+        get => _searchFilter;
+        set => this.RaiseAndSetIfChanged(ref _searchFilter, value);
+    }
+
     
     public string Name
     {
@@ -45,6 +69,8 @@ public string Name
     // Later: implement variable length columns workaround https://github.com/AvaloniaUI/Avalonia/issues/2781
     public ObservableCollection<MapString> GameStrings { get; set; }
 
+    public ObservableCollection<MapString> FilteredItems { get; } = new();
+    
     private int currentString;
 
     public int CurrentString
@@ -53,38 +79,17 @@ public int CurrentString
         set { this.SetIfChanged(ref currentString, value); }
     }
 
-
-    public void btnAddString_Click()
-    {
-        string defname = String.Format("String_{0}", GameStrings.Count);
-        //if (CurrentString > -1)
-        //    GameStrings.Insert(CurrentString, new MapString(defname, "", ""));
-        //else
-        GameStrings.Add(new MapString(defname, "", ""));
-    }
-
-    public void btnDeleteString_Click()
-    {
-        GameStrings.RemoveAt(CurrentString);
-    }
-
-    
-
-    public void LoadStringEntries()
-    {
-        LoadStrings();
-    }
-
-
     public void btnAdd_Click()
     {
         string defname = String.Format("STRING_{0}", GameStrings.Count);
         GameStrings.Add(new MapString(defname, "", ""));
+        UpdateVisibleItems(SearchFilter);
     }
 
     public void btnDelete_Click()
     {
         GameStrings.RemoveAt(CurrentString);
+        UpdateVisibleItems(SearchFilter);
     }
 
     public void btnSave_Click()
@@ -99,7 +104,11 @@ public void btnSave_Click()
     /// <param name="stringsdir">Directory in which string resx files are stored!</param>
     public void LoadStrings()
     {
-        populateStringTable(GameStrings, false);
+        Dispatcher.UIThread.Post(() =>
+        {
+            populateStringTable(GameStrings, false);
+            UpdateVisibleItems(SearchFilter);
+        });
     }
 
     private void populateStringTable(IList<MapString> strings, bool skipTopMod)
diff --git a/RogueEssence.Editor.Avalonia/Views/DevForm/DevForm.axaml b/RogueEssence.Editor.Avalonia/Views/DevForm/DevForm.axaml
index 17d57f7f..2de4c361 100644
--- a/RogueEssence.Editor.Avalonia/Views/DevForm/DevForm.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/DevForm/DevForm.axaml
@@ -22,6 +22,10 @@
     <Window.Resources>
         <c:WindowStateToColumnConverter x:Key="WindowStateToColumnConverter" />
     </Window.Resources>
+    <Window.KeyBindings>
+        <KeyBinding Gesture="Cmd+W" Command="{Binding TryCloseCurrentTab}" />
+    </Window.KeyBindings>
+    <!-- </Window.KeyBindings> -->
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="{Binding #WindowMain.CaptionHeight}" />
diff --git a/RogueEssence.Editor.Avalonia/Views/DevForm/TabBarView.axaml b/RogueEssence.Editor.Avalonia/Views/DevForm/TabBarView.axaml
index 1d9083d0..546836a2 100644
--- a/RogueEssence.Editor.Avalonia/Views/DevForm/TabBarView.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/DevForm/TabBarView.axaml
@@ -121,23 +121,19 @@
             </Style>
         </Style>
 
-
-        <!-- 1. default hidden -->
+        
         <Style Selector="Button#CloseTabButton">
             <Setter Property="Opacity" Value="0" />
         </Style>
-
-        <!-- 2. show on any tab hover -->
+        
         <Style Selector="controls|DragTabItem:pointerover Button#CloseTabButton">
             <Setter Property="Opacity" Value="1" />
         </Style>
-
-        <!-- 3. hide on selected (not hovered) -->
+        
         <Style Selector="controls|DragTabItem:selected Button#CloseTabButton">
             <Setter Property="Opacity" Value="0" />
         </Style>
-
-        <!-- 4. show on selected + hovered -->
+        
         <Style Selector="controls|DragTabItem:selected:pointerover Button#CloseTabButton">
             <Setter Property="Opacity" Value="1" />
         </Style>
@@ -246,6 +242,14 @@
                               ToolTip.Tip="{Binding Title}"
                               IsHitTestVisible="True"
                               HorizontalAlignment="Left">
+                            
+                            <Grid.ContextMenu>
+                                <ContextMenu>
+                                    <MenuItem Header="Close" Click="OnCloseTab" />
+                                    <MenuItem Header="Close Others" />
+                                    <MenuItem Header="Close All" />
+                                </ContextMenu>
+                            </Grid.ContextMenu>
                             <Border IsHitTestVisible="True" ToolTip.Tip="{Binding Title}" Padding="8, 0, 16, 0"
                                     Background="Transparent" BorderBrush="{DynamicResource Color.Window}"
                                     BorderThickness="0 0 0 1"
diff --git a/RogueEssence.Editor.Avalonia/Views/Pages/DataListPageView.axaml b/RogueEssence.Editor.Avalonia/Views/Pages/DataListPageView.axaml
index 7942219e..18c451ee 100644
--- a/RogueEssence.Editor.Avalonia/Views/Pages/DataListPageView.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/Pages/DataListPageView.axaml
@@ -11,7 +11,7 @@
     <Design.DataContext>
         <vm:DataListPageViewModel />
     </Design.DataContext>
-<Grid RowDefinitions="Auto, 32, Auto, Auto">
+    <Grid RowDefinitions="Auto, 32, Auto, Auto">
 
 
         <DockPanel Grid.Row="0" VerticalAlignment="Top">
@@ -34,6 +34,7 @@
                      x:Name="DataListPageListBox" SelectedItem="{Binding SelectedItem}"
                      ItemsSource="{Binding FilteredItems}" Height="400"
                      Classes="datalist"
+                     Tapped="DataListPageListBox_OnTapped"
                      DoubleTapped="DataListPageListBox_OnDoubleTapped">
                 <ListBox.ItemTemplate>
                     <DataTemplate>
@@ -53,14 +54,6 @@
                     <v:IconText Text="Delete" Icon="Icons.TrashFill" IconSize="12" />
                 </Button>
             </StackPanel>
-            <!-- <StackPanel Grid.Row="4" Orientation="Horizontal" HorizontalAlignment="Right" Spacing="4"> -->
-            <!--     <Button Command="{Binding AddItem}" Classes="secondary" Margin="0, 0" Padding="4,3, 4, 3"> -->
-            <!--         <Path Width="14" Height="14" Data="{StaticResource Icons.Plus}" /> -->
-            <!--     </Button> -->
-            <!--     <Button Command="{Binding DeleteItem}" Classes="secondary" Margin="0, 0" Padding="4,3, 4, 3"> -->
-            <!--         <Path Width="14" Height="14" Data="{StaticResource Icons.Minus}" /> -->
-            <!--     </Button> -->
-            <!-- </StackPanel> -->
         </Grid>
     </Grid>
 </UserControl>
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/Pages/DataListPageView.axaml.cs b/RogueEssence.Editor.Avalonia/Views/Pages/DataListPageView.axaml.cs
index dcd2f2c2..6f88cd5b 100644
--- a/RogueEssence.Editor.Avalonia/Views/Pages/DataListPageView.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/Pages/DataListPageView.axaml.cs
@@ -21,7 +21,11 @@ public DataListPageView()
     private void DataListPageListBox_OnDoubleTapped(object sender, TappedEventArgs e)
     {
         if (DataContext is DataListPageViewModel vm)
-            vm.AddChildItemUnderParent(vm.SelectedItem);
+        {
+            vm.AddChildItemUnderParentAndNavigate(vm.SelectedItem);
+        }
+
+  
     }
 
 
@@ -53,4 +57,18 @@ private void DataListPageViewEditMenu_OnContextRequested(object sender, ContextR
         var contextMenu = ContextMenuHelper.CreateDataItemMenu(vm.Node, entry.Key);
         contextMenu.Open(this);
     }
+
+    private void DataListPageListBox_OnTapped(object sender, TappedEventArgs e)
+    {
+        KeyModifiers modifiers = e.KeyModifiers;
+        bool navigate = modifiers.HasFlag(KeyModifiers.Shift);
+
+        if (DataContext is DataListPageViewModel vm)
+        {
+            if (navigate)
+            {
+                vm.AddChildItemUnderParent(vm.SelectedItem);
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/Pages/ModListPageView.axaml b/RogueEssence.Editor.Avalonia/Views/Pages/ModListPageView.axaml
index 88abbe60..add28001 100644
--- a/RogueEssence.Editor.Avalonia/Views/Pages/ModListPageView.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/Pages/ModListPageView.axaml
@@ -11,19 +11,22 @@
         <vm:ModListPageViewModel/>
     </Design.DataContext>
     <Grid RowDefinitions="64, Auto, Auto, Auto">
-        <TextBlock Grid.Row="1" HorizontalAlignment="Center" Classes="table_header" FontSize="16"
-                   Text="Mods" />
+
 
         <!-- Search Grid -->
-        <Grid Grid.Row="2" RowDefinitions="Auto, 16, Auto, 12, Auto" Margin="64, 8" MinWidth="600">
+        <Grid Grid.Row="2" RowDefinitions="Auto, Auto, Auto, Auto" Margin="64, 8">
 
+            <TextBlock Grid.Row="0" HorizontalAlignment="Center" Classes="table_header" FontSize="16"
+                       Text="Mods" />
+            
             <TextBox Classes="search"
-                     Grid.Row="0"
+                     Grid.Row="1"
                      Text="{Binding SearchFilter, Mode=TwoWay}"/>
 
          
             <ListBox Grid.Row="2"
                      DoubleTapped="ModListPageListBox_OnDoubleTapped"
+                     Margin="0, 16, 0, 8"
                      Background="{DynamicResource Brush.ListBox.Background}"
                      x:Name="ModListPageListBox" SelectedItem="{Binding SelectedItem}"
                      ItemsSource="{Binding FilteredItems}" Height="400" BorderBrush="{DynamicResource Brush.Border2}"
@@ -44,7 +47,7 @@
                 </ListBox.ItemTemplate>
             </ListBox>
 
-            <StackPanel Grid.Row="4" Orientation="Horizontal">
+            <StackPanel Grid.Row="3" Orientation="Horizontal">
                 <Button Classes="flat" Width="100"
                         Command="{Binding btnSwitch_Click}"
                         IsEnabled="{Binding SelectedItem, Converter={x:Static ObjectConverters.IsNotNull}}">
diff --git a/RogueEssence.Editor.Avalonia/Views/Pages/SpeciesEditPageView.axaml b/RogueEssence.Editor.Avalonia/Views/Pages/SpeciesEditPageView.axaml
index e9b8598a..38a07c33 100644
--- a/RogueEssence.Editor.Avalonia/Views/Pages/SpeciesEditPageView.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/Pages/SpeciesEditPageView.axaml
@@ -15,7 +15,7 @@
     <UserControl.Resources>
         <converters:OXConverter x:Key="OXConverter" />
     </UserControl.Resources>
-    <Grid RowDefinitions="Auto, 32, Auto Auto">
+    <Grid RowDefinitions="Auto, 32, Auto, Auto">
         <DockPanel>
             <Menu DockPanel.Dock="Top">
                 <MenuItem Header="Edit" Classes="menuright">
@@ -28,16 +28,18 @@
                 </MenuItem>
             </Menu>
         </DockPanel>
-        <TextBlock Grid.Row="2" HorizontalAlignment="Center" Classes="table_header" FontSize="16"
-                   Text="{Binding HeaderText}" />
-        
-        <Grid Grid.Row="3" RowDefinitions="Auto, 16, Auto, 8, Auto" Margin="64, 8" MinWidth="600">
 
+        <Grid Grid.Row="3" RowDefinitions="Auto, Auto, Auto, Auto" Margin="64, 8">
+
+            <TextBlock Grid.Row="0" HorizontalAlignment="Center" Classes="table_header" FontSize="16"
+                       Text="{Binding HeaderText}" />
+
+            
             <TextBox Classes="search"
-                     Grid.Row="0"
+                     Grid.Row="1"
                      Text="{Binding Filter, Mode=TwoWay}"/>
 
-            <TreeDataGrid x:Name="SpeciesEditTreeDataGrid" Background="{DynamicResource Brush.Contents}"
+            <TreeDataGrid Margin="0, 16, 0, 8" x:Name="SpeciesEditTreeDataGrid" Background="{DynamicResource Brush.Contents}"
                           SelectionChanging="SpeciesEditTreeDataGrid_OnSelectionChanging" ShowColumnHeaders="False"
                           Grid.Row="2" Source="{Binding NodeSource}" Grid.ColumnSpan="4" Height="400"
                           BorderBrush="{DynamicResource Brush.Border2}" BorderThickness="1">
@@ -66,7 +68,7 @@
                     </ContextMenu>
                 </TreeDataGrid.ContextMenu>
             </TreeDataGrid>
-            <StackPanel Grid.Row="4" Orientation="Horizontal">
+            <StackPanel Grid.Row="3" Orientation="Horizontal">
                 <Button Classes="flat" Width="100"
                         Command="{Binding btnImport_Click}"
                         IsEnabled="{Binding ChosenMonster, Converter={x:Static ObjectConverters.IsNotNull}}">
diff --git a/RogueEssence.Editor.Avalonia/Views/Pages/SpritePageView.axaml b/RogueEssence.Editor.Avalonia/Views/Pages/SpritePageView.axaml
index 54a9eb5f..5cd2a6a9 100644
--- a/RogueEssence.Editor.Avalonia/Views/Pages/SpritePageView.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/Pages/SpritePageView.axaml
@@ -11,70 +11,164 @@
     <Design.DataContext>
         <vm:SpritePageViewModel />
     </Design.DataContext>
-    <Grid RowDefinitions="Auto, 32, Auto, 8, Auto">
+
+    <Grid RowDefinitions="Auto, 32, *, Auto">
         <DockPanel Grid.Row="0" VerticalAlignment="Top">
             <Menu DockPanel.Dock="Top">
                 <MenuItem Header="Edit" Classes="menuright">
                     <MenuItem Header="Mass Import" Command="{Binding mnuMassImport_Click}" />
                     <MenuItem Header="Mass Export" Command="{Binding mnuMassExport_Click}" />
                     <Separator IsVisible="{Binding IsTileAsset}" />
-                    <MenuItem IsVisible="{Binding IsTileAsset}" Header="Re-Index" Command="{Binding mnuReIndex_Click}" />
+                    <MenuItem IsVisible="{Binding IsTileAsset}" Header="Re-Index"
+                              Command="{Binding mnuReIndex_Click}" />
                 </MenuItem>
             </Menu>
         </DockPanel>
-        <TextBlock Grid.Row="2" HorizontalAlignment="Center" Classes="table_header" FontSize="16"
-                   Text="{Binding AssetType}" />
 
-        <Grid Grid.Row="3" RowDefinitions="Auto, 16, Auto, 12, Auto" Margin="64, 8" MinWidth="600">
 
-            <TextBox Classes="search"
-                     Grid.Row="0"
-                     Text="{Binding SearchFilter, Mode=TwoWay}" />
+        <Grid Grid.Row="2" ColumnDefinitions="300, 64, 200" Margin="64, 8" ShowGridLines="True">
+            <Grid Grid.Row="0" RowDefinitions="Auto, Auto, 16, Auto, 12, Auto"  MinWidth="300">
+
+                <TextBlock Grid.Row="0" HorizontalAlignment="Center" Classes="table_header" FontSize="16"
+                           Text="{Binding AssetType}" />
+
+                <TextBox Classes="search"
+                         Grid.Row="1"
+                         Text="{Binding SearchFilter, Mode=TwoWay}" />
+
+                <ListBox Grid.Row="3"
+                         x:Name="SpritePageListBox"
+                         SelectionChanged="SpritePageListBox_OnSelectionChanged"
+                         ContextRequested="SpritePageListBox_OnContextRequested"
+                         Background="{DynamicResource Brush.ListBox.Background}"
+                         SelectedItem="{Binding SelectedItem}"
+                         ItemsSource="{Binding FilteredItems}" Height="400"
+                         BorderBrush="{DynamicResource Brush.Border2}"
+                         BorderThickness="1">
+                    <ListBox.Styles>
+                        <Style Selector="ListBoxItem">
+                            <Setter Property="Background" Value="{DynamicResource Brush.ListBox.Background}" />
+                        </Style>
+                    </ListBox.Styles>
+                    <ListBox.ItemContainerTheme>
+                        <StaticResource ResourceKey="CompactListBoxItem" />
+                    </ListBox.ItemContainerTheme>
+                    <ListBox.ItemTemplate>
+                        <DataTemplate>
+                            <TextBlock Text="{Binding}" Padding="4" />
+                        </DataTemplate>
+                    </ListBox.ItemTemplate>
+                </ListBox>
 
-            <ListBox Grid.Row="2"
-                     x:Name="SpritePageListBox"
-                     SelectionChanged="SpritePageListBox_OnSelectionChanged"
-                     ContextRequested="SpritePageListBox_OnContextRequested"
-                     Background="{DynamicResource Brush.ListBox.Background}"
-                     SelectedItem="{Binding SelectedItem}"
-                     ItemsSource="{Binding FilteredItems}" Height="400" BorderBrush="{DynamicResource Brush.Border2}"
-                     BorderThickness="1">
-                <ListBox.Styles>
-                    <Style Selector="ListBoxItem">
-                        <Setter Property="Background" Value="{DynamicResource Brush.ListBox.Background}" />
-                    </Style>
-                </ListBox.Styles>
-                <ListBox.ItemContainerTheme>
-                    <StaticResource ResourceKey="CompactListBoxItem" />
-                </ListBox.ItemContainerTheme>
-                <ListBox.ItemTemplate>
-                    <DataTemplate>
-                        <TextBlock Text="{Binding}" Padding="4" />
-                    </DataTemplate>
-                </ListBox.ItemTemplate>
-            </ListBox>
+                <StackPanel Grid.Row="5" Orientation="Horizontal">
+                    <Button Classes="flat" Width="100"
+                            Command="{Binding btnImport_Click}">
+                        <v:IconText Text="Import" Icon="Icons.DownloadFill" IconSize="12" />
+                    </Button>
+                    <Button Classes="flat" Width="100" Margin="24,0,0,0"
+                            Command="{Binding btnReImport_Click}"
+                            IsEnabled="{Binding Node.CachedPath, Converter={x:Static StringConverters.IsNotNullOrEmpty}}">
+                        <v:IconText Text="Re-Import" Icon="Icons.RepeatFill" IconSize="12" />
+                    </Button>
+                    <Button Classes="flat" Width="100" Margin="24,0,0,0"
+                            Command="{Binding btnExport_Click}"
+                            IsEnabled="{Binding SelectedItem, Converter={x:Static StringConverters.IsNotNullOrEmpty}}">
+                        <v:IconText Text="Export" Icon="Icons.ExportFill" IconSize="12" />
+                    </Button>
+                    <Button Classes="flat" Width="100" Margin="24,0,0,0"
+                            Command="{Binding btnDelete_Click}"
+                            IsEnabled="{Binding SelectedItem, Converter={x:Static StringConverters.IsNotNullOrEmpty}}">
+                        <v:IconText Text="Delete" Icon="Icons.TrashFill" IconSize="12" />
+                    </Button>
+                </StackPanel>
+            </Grid>
+            
+            <Grid Grid.Column="2" RowDefinitions="Auto, Auto">
+                <Border HorizontalAlignment="Stretch"
+                        VerticalAlignment="Center"
+                        Height="400"
+                        CornerRadius="4"
+                        Background="{DynamicResource Brush.ListBox.Background}"
+                        BorderThickness="1"
+                        Padding="8">
+                    <DockPanel>
+                        <Slider DockPanel.Dock="Bottom"
+                                Minimum="0.25"
+                                Maximum="8"
+                                Value="{Binding ZoomLevel}"
+                                TickFrequency="0.25"
+                                IsSnapToTickEnabled="True"
+                                Width="200"
+                                HorizontalAlignment="Center"
+                                Margin="0,4" />
 
-            <StackPanel Grid.Row="4" Orientation="Horizontal">
-                <Button Classes="flat" Width="100"
-                        Command="{Binding btnImport_Click}">
-                    <v:IconText Text="Import" Icon="Icons.DownloadFill" IconSize="12" />
-                </Button>
-                <Button Classes="flat" Width="100" Margin="24,0,0,0"
-                        Command="{Binding btnReImport_Click}"
-                        IsEnabled="{Binding Node.CachedPath, Converter={x:Static StringConverters.IsNotNullOrEmpty}}">
-                    <v:IconText Text="Re-Import" Icon="Icons.RepeatFill" IconSize="12" />
-                </Button>
-                <Button Classes="flat" Width="100" Margin="24,0,0,0"
-                        Command="{Binding btnExport_Click}"
-                        IsEnabled="{Binding SelectedItem, Converter={x:Static StringConverters.IsNotNullOrEmpty}}">
-                    <v:IconText Text="Export" Icon="Icons.ExportFill" IconSize="12" />
-                </Button>
-                <Button Classes="flat" Width="100" Margin="24,0,0,0"
-                        Command="{Binding btnDelete_Click}"
-                        IsEnabled="{Binding SelectedItem, Converter={x:Static StringConverters.IsNotNullOrEmpty}}">
-                    <v:IconText Text="Delete" Icon="Icons.TrashFill" IconSize="12" />
-                </Button>
-            </StackPanel>
+                        <ScrollViewer HorizontalScrollBarVisibility="Auto"
+                                      x:Name="SpritePagePreviewScrollViewer"
+                                      VerticalScrollBarVisibility="Auto">
+                            <ScrollViewer.GestureRecognizers>
+                                <PinchGestureRecognizer />
+                            </ScrollViewer.GestureRecognizers>
+                            <Image Source="{Binding PreviewBitmap}"
+                                   RenderOptions.BitmapInterpolationMode="None"
+                                   x:Name="SpritePagePreviewImage"
+                                   Width="{Binding PreviewWidth}"
+                                   Height="{Binding PreviewHeight}"
+                                   Stretch="Fill" >
+                                <Image.GestureRecognizers>
+                                    <PinchGestureRecognizer/>
+                                </Image.GestureRecognizers>
+                            </Image>
+                        </ScrollViewer>
+                    </DockPanel>
+                    <!-- <Panel> -->
+                    <!--     <Viewbox Stretch="Uniform"> -->
+                    <!--         <Image Source="{Binding PreviewBitmap}" -->
+                    <!--                RenderOptions.BitmapInterpolationMode="None" /> -->
+                    <!--     </Viewbox> -->
+                    <!-- -->
+                    <!-- </Panel> -->
+                
+                    <!-- <ScrollViewer HorizontalScrollBarVisibility="Auto" -->
+                    <!--               VerticalScrollBarVisibility="Auto"> -->
+                    <!--     <Image Source="{Binding PreviewBitmap}" -->
+                    <!--            RenderOptions.BitmapInterpolationMode="None" -->
+                    <!--            HorizontalAlignment="Center" -->
+                    <!--            VerticalAlignment="Center" -->
+                    <!--            Stretch="None"> -->
+                    <!--         <Image.RenderTransform> -->
+                    <!--             <ScaleTransform ScaleX="2" ScaleY="2" /> -->
+                    <!--         </Image.RenderTransform> -->
+                    <!--     </Image> -->
+                    <!-- </ScrollViewer> -->
+                </Border>
+                <StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Center" Spacing="8" IsVisible="{Binding HasAnimation}">
+                    <TextBlock Text="Speed:" VerticalAlignment="Center" />
+                    <Slider Minimum="1" Maximum="60"
+                            Value="{Binding PreviewFps}"
+                            Width="120"
+                            VerticalAlignment="Center" />
+                    <TextBlock Text="{Binding PreviewFps, StringFormat={}{0:F0} fps}"
+                               VerticalAlignment="Center" />
+                    <Button Classes="secondary" Command="{Binding TogglePreview}">
+                        <Panel>
+                            <Path Width="10" Height="10" Margin="0, 2, 0, 0" Data="{StaticResource Icons.PauseFill}" IsVisible="{Binding !IsPaused}" />
+                            <Path Width="10" Height="10" Margin="0, 2, 0, 0" Data="{StaticResource Icons.PlayFill}" IsVisible="{Binding IsPaused}" />
+                        </Panel>
+                    </Button>
+                </StackPanel>
+            </Grid>
         </Grid>
+  
+  
+        <!-- MaxWidth="256" MaxHeight="256" -->
+        <!-- <ScrollViewer HorizontalScrollBarVisibility="Auto" -->
+        <!--               VerticalScrollBarVisibility="Auto"> -->
+        <!-- -->
+        <!--     <Image Source="{Binding PreviewBitmap}" -->
+        <!-- -->
+        <!--            VerticalAlignment="Center" -->
+        <!--            HorizontalAlignment="Center" -->
+        <!--            Stretch="None" /> -->
+        <!-- </ScrollViewer> -->
     </Grid>
 </UserControl>
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/Pages/SpritePageView.axaml.cs b/RogueEssence.Editor.Avalonia/Views/Pages/SpritePageView.axaml.cs
index 0f96648d..d4222460 100644
--- a/RogueEssence.Editor.Avalonia/Views/Pages/SpritePageView.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/Pages/SpritePageView.axaml.cs
@@ -15,12 +15,19 @@ public partial class SpritePageView : UserControl
     public SpritePageView()
     {
         InitializeComponent();
+        SpritePagePreviewScrollViewer.AddHandler(Gestures.PinchEvent, OnPinchUpdated);
+        
+        SpritePagePreviewImage.AddHandler(Gestures.PinchEvent, (s, e) => { Console.WriteLine("Pinch"); });
+        SpritePagePreviewImage.AddHandler(Gestures.PinchEndedEvent, (s, e) => { Console.WriteLine("PinchEnded"); });
+
     }
     
     protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
     {
         base.OnAttachedToVisualTree(e);
-
+        
+    
+        
         if (DataContext is SpritePageViewModel vm)
         {
             vm.OnPageRemovedAction = () =>
@@ -75,4 +82,18 @@ private void SpritePageListBox_OnSelectionChanged(object sender, SelectionChange
             DungeonScene.Instance.DebugAnim = debugAnim;
         }
     }
+    private void OnPinchUpdated(object? sender, PinchEventArgs e)
+    {
+        Console.WriteLine("Pinch: " + e.Scale);
+        // var vm = DataContext as SpritePageViewModel;
+        // if (vm == null) return;
+        //
+        // if (e.Scale == 1)
+        //     _pinchStartZoom = vm.ZoomLevel;
+        //
+        // vm.ZoomLevel = Math.Clamp(_pinchStartZoom * e.Scale, 0.25, 8);
+    }
+    
+
+    
 }
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/Pages/StringEditPageView.axaml b/RogueEssence.Editor.Avalonia/Views/Pages/StringEditPageView.axaml
index 4ff76f80..6ada60d5 100644
--- a/RogueEssence.Editor.Avalonia/Views/Pages/StringEditPageView.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/Pages/StringEditPageView.axaml
@@ -10,19 +10,27 @@
     <Design.DataContext>
         <vm:StringEditPageViewModel/>
     </Design.DataContext>
-    <Grid RowDefinitions="64, Auto, Auto, Auto">
-        <TextBlock Grid.Row="1" HorizontalAlignment="Center" Classes="table_header" FontSize="16"
-                   Text="{Binding HeaderText}" />
+    <Grid RowDefinitions="64, Auto">
+        
+        
+        <Grid Grid.Row="1" RowDefinitions="Auto, Auto, Auto, Auto" Margin="64, 8">
+            
+            <TextBlock Grid.Row="0" HorizontalAlignment="Center" Classes="table_header" FontSize="16"
+                       Text="{Binding HeaderText}" />
+            
+            <TextBox Classes="search"
+                     Grid.Row="1"
+                     Text="{Binding SearchFilter, Mode=TwoWay}" />
 
-        <Grid Grid.Row="2" RowDefinitions="Auto, 16, Auto, 32, Auto" Margin="64, 8" MinWidth="600">
-            <DataGrid x:Name="StringDataGrid" Grid.Row="2" ItemsSource="{Binding GameStrings}" Classes="default" 
+            <DataGrid x:Name="StringDataGrid" Grid.Row="2" 
+                      Margin="0, 16, 0, 8"
+                      ItemsSource="{Binding FilteredItems}" Classes="default" 
                       SelectedIndex="{Binding CurrentString, Mode=TwoWay}"
                       CanUserResizeColumns="True" 
                       HorizontalScrollBarVisibility="Disabled" 
                       Height="400"
                       BorderBrush="{DynamicResource Brush.Border2}" 
-                      BorderThickness="1"
-                      Margin="4">
+                      BorderThickness="1">
                 <DataGrid.Styles>
                     <Style Selector="TextBlock">
                         <Setter Property="TextWrapping" Value="WrapWithOverflow" />
diff --git a/RogueEssence/Data/DataManager.cs b/RogueEssence/Data/DataManager.cs
index 67f43dd8..349e9481 100644
--- a/RogueEssence/Data/DataManager.cs
+++ b/RogueEssence/Data/DataManager.cs
@@ -31,7 +31,7 @@ static DataRegistry()
             Register(DataManager.DataType.Monster, typeof(MonsterData), DataManager.Instance.GetMonster, () => new MonsterData(), "Icons.GhostFill");
             Register(DataManager.DataType.Skill, typeof(SkillData), DataManager.Instance.GetSkill, () => new SkillData(), "Icons.SwordFill");
             Register(DataManager.DataType.Item, typeof(ItemData), DataManager.Instance.GetItem, () => new ItemData(), "Icons.JarLabelFill");
-            Register(DataManager.DataType.Intrinsic, typeof(IntrinsicData), DataManager.Instance.GetIntrinsic, () => new IntrinsicData(), "Icons.SwordFill");
+            Register(DataManager.DataType.Intrinsic, typeof(IntrinsicData), DataManager.Instance.GetIntrinsic, () => new IntrinsicData(), "Icons.ShieldCheckeredFill");
             Register(DataManager.DataType.Status, typeof(StatusData), DataManager.Instance.GetStatus, () => new StatusData(), "Icons.HeartFill");
             Register(DataManager.DataType.MapStatus, typeof(MapStatusData), DataManager.Instance.GetMapStatus, () => new MapStatusData(), "Icons.CloudRainFill");
             Register(DataManager.DataType.Terrain, typeof(TerrainData), DataManager.Instance.GetTerrain, () => new TerrainData(), "Icons.MountainsFill");

From 306c24342fe61528b33b78011451c75068a9f43e Mon Sep 17 00:00:00 2001
From: Kace <41309226+DoubleTrio@users.noreply.github.com>
Date: Sun, 31 May 2026 03:25:55 -0400
Subject: [PATCH 49/51] more qol changes wip like sprite preview and close tab
 options

---
 .../Assets/Styles.axaml                       | 146 ++++++++++++++
 .../Converters/New/StringConverters.cs        |   4 +
 .../DataEditor/Editors/Editor.cs              |  16 +-
 .../RogueElements/PriorityListEditor.cs       |   2 +-
 .../Editors/RogueElements/TypeDictEditor.cs   |   2 +-
 .../Editors/RogueEssence/ZoneDataEditor.cs    |   2 +-
 .../EditorContext/TabEvents.cs                |   7 +
 .../ViewModels/DevForm/DevFormViewModel.cs    | 185 +++++++++++++-----
 .../ViewModels/DevForm/Nodes/NodeBase.cs      |   5 +
 .../ViewModels/Pages/DataListPageViewModel.cs |   4 +
 .../ViewModels/Pages/SpritePageViewModel.cs   |   6 +-
 .../Views/DevForm/DevForm.axaml               |   3 +-
 .../Views/DevForm/DevForm.axaml.cs            | 112 ++++++++---
 .../Views/DevForm/TabBarView.axaml            |  10 +-
 .../Views/DevForm/TabBarView.axaml.cs         | 142 +++++++++++---
 .../Views/Pages/DataListPageView.axaml        |   2 +-
 .../Views/Pages/SpritePageView.axaml          |  15 +-
 RogueEssence/Data/StartParams.cs              |   1 +
 .../CustomAttributes/RenameLabelAttribute.cs  |  15 ++
 19 files changed, 564 insertions(+), 115 deletions(-)
 create mode 100644 RogueEssence/Dev/CustomAttributes/RenameLabelAttribute.cs

diff --git a/RogueEssence.Editor.Avalonia/Assets/Styles.axaml b/RogueEssence.Editor.Avalonia/Assets/Styles.axaml
index 9a58f569..afb155e7 100644
--- a/RogueEssence.Editor.Avalonia/Assets/Styles.axaml
+++ b/RogueEssence.Editor.Avalonia/Assets/Styles.axaml
@@ -525,6 +525,152 @@
             </ControlTemplate>
         </Setter>
     </Style>
+    <Style Selector="MenuItem">
+    <Setter Property="Height" Value="28"/>
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="Foreground" Value="{DynamicResource Brush.FG1}" />
+    <Setter Property="Cursor" Value="Arrow"/>
+
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Panel>
+          <Border Name="PART_LayoutRoot"
+                  Padding="0,0,4,0"
+                  Background="{TemplateBinding Background}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  CornerRadius="3">
+            <Grid>
+              <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="28" SharedSizeGroup="MenuItemIcon" />
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="Auto" SharedSizeGroup="MenuItemIGT" />
+                <ColumnDefinition Width="Auto" SharedSizeGroup="MenuItemChevron" />
+              </Grid.ColumnDefinitions>
+
+              <ContentControl Grid.Column="0"
+                              x:Name="PART_IconPresenter"
+                              Content="{TemplateBinding Icon}"
+                              IsVisible="False"
+                              HorizontalAlignment="Center"
+                              VerticalAlignment="Center"/>
+
+              <ContentPresenter Grid.Column="1"
+                                x:Name="PART_HeaderPresenter"
+                                Content="{TemplateBinding Header}"
+                                Foreground="{TemplateBinding Foreground}"
+                                ContentTemplate="{TemplateBinding HeaderTemplate}"
+                                VerticalAlignment="Center"
+                                HorizontalAlignment="Stretch"
+                                RecognizesAccessKey="False">
+                <ContentPresenter.DataTemplates>
+                  <!-- <DataTemplate DataType="x:String"> -->
+                  <!--   <v:NameHighlightedTextBlock Text="{Binding}" VerticalAlignment="Center"/> -->
+                  <!-- </DataTemplate> -->
+                  <!-- -->
+                  <!-- <DataTemplate DataType="vm:FilterModeInGraph"> -->
+                  <!--   <v:FilterModeInGraph/> -->
+                  <!-- </DataTemplate> -->
+                  <!-- -->
+                  <!-- <DataTemplate DataType="vm:CustomActionContextMenuLabel"> -->
+                  <!--   <StackPanel Orientation="Horizontal"> -->
+                  <!--     <TextBlock Text="{Binding Name}" VerticalAlignment="Center"/> -->
+                  <!--     <Border Margin="4,0,0,0" Height="16" Background="Green" CornerRadius="8" VerticalAlignment="Center" IsVisible="{Binding IsGlobal}"> -->
+                  <!--       <TextBlock Text="GLOBAL" Margin="8,0" FontSize="10" Foreground="White"/> -->
+                  <!--     </Border> -->
+                  <!--   </StackPanel> -->
+                  <!-- </DataTemplate> -->
+                </ContentPresenter.DataTemplates>
+              </ContentPresenter>
+
+              <TextBlock Grid.Column="2"
+                         Margin="{DynamicResource MenuInputGestureTextMargin}"
+                         Text="{TemplateBinding InputGesture, Converter={x:Static c:StringConverters.FromKeyGesture}}"
+                         HorizontalAlignment="Right"
+                         VerticalAlignment="Center"
+                         Foreground="{DynamicResource MenuFlyoutItemKeyboardAcceleratorTextForeground}"
+                         FontSize="11"/>
+
+              <TextBlock Grid.Column="2"
+                         Margin="{DynamicResource MenuInputGestureTextMargin}"
+                         Text="{TemplateBinding Tag}"
+                         HorizontalAlignment="Right"
+                         VerticalAlignment="Center"
+                         Foreground="{DynamicResource MenuFlyoutItemKeyboardAcceleratorTextForeground}"
+                         FontSize="11"
+                         IsVisible="{TemplateBinding InputGesture, Converter={x:Static ObjectConverters.IsNull}}"/>
+
+              <Path Name="PART_ChevronPath"
+                    Width="6"
+                    Data="M573 512 215 881c-20 20-20 51 0 61l61 61c20 20 51 20 61 0l461-461c10-10 10-20 10-31s0-20-10-31L338 20C317 0 287 0 276 20L215 82c-20 20-20 51 0 61L573 512z"
+                    Fill="{DynamicResource Brush.FG2}"
+                    Margin="8,0,0,0"
+                    VerticalAlignment="Center"
+                    Grid.Column="3" />
+            </Grid>
+          </Border>
+          <Popup Name="PART_Popup"
+                 WindowManagerAddShadowHint="False"
+                 Placement="RightEdgeAlignedTop"
+                 MaxHeight="400"
+                 IsLightDismissEnabled="False"
+                 HorizontalOffset="-4"
+                 VerticalOffset="-4"
+                 IsOpen="{TemplateBinding IsSubMenuOpen, Mode=TwoWay}">
+            <Grid Margin="4" Effect="drop-shadow(0 0 4 #A0000000)">
+              <Border BorderThickness="0" Padding="8,4" MaxHeight="400" Background="{DynamicResource Brush.Popup}" CornerRadius="{DynamicResource OverlayCornerRadius}">
+                <ScrollViewer>
+                  <ItemsPresenter Name="PART_ItemsPresenter"
+                                  Margin="{DynamicResource MenuFlyoutScrollerMargin}"
+                                  Grid.IsSharedSizeScope="True">
+                    <ItemsPresenter.ItemsPanel>
+                      <ItemsPanelTemplate>
+                        <VirtualizingStackPanel Orientation="Vertical"/>
+                      </ItemsPanelTemplate>
+                    </ItemsPresenter.ItemsPanel>
+                  </ItemsPresenter>
+                </ScrollViewer>
+              </Border>
+            </Grid>
+          </Popup>
+        </Panel>
+      </ControlTemplate>
+    </Setter>
+
+    <Style Selector="^:icon /template/ ContentControl#PART_IconPresenter">
+      <Setter Property="IsVisible" Value="True" />
+    </Style>
+
+    <Style Selector="^:selected">
+      <Style Selector="^ /template/ Border#PART_LayoutRoot">
+        <Setter Property="Background" Value="{DynamicResource MenuFlyoutItemBackgroundPointerOver}" />
+      </Style>
+      <Style Selector="^ /template/ ContentPresenter#PART_HeaderPresenter">
+        <Setter Property="Foreground" Value="{DynamicResource MenuFlyoutItemForegroundPointerOver}" />
+      </Style>
+      <Style Selector="^ /template/ Path#PART_ChevronPath">
+        <Setter Property="Fill" Value="{DynamicResource MenuFlyoutSubItemChevronPointerOver}" />
+      </Style>
+    </Style>
+
+    <Style Selector="^:disabled">
+      <Setter Property="Opacity" Value="0.65"/>
+      <Setter Property="Background" Value="Transparent" />
+    </Style>
+
+    <Style Selector="^:empty /template/ Path#PART_ChevronPath">
+      <Setter Property="IsVisible" Value="False" />
+    </Style>
+
+    <Style Selector="^:separator">
+      <Setter Property="Height" Value="5"/>
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Separator Margin="28,0,4,0" Height=".5" VerticalAlignment="Center" Background="{DynamicResource Brush.Border2}"/>
+        </ControlTemplate>
+      </Setter>
+    </Style>
+  </Style>
 
     <!-- <Style Selector="MenuItem"> -->
     <!--     <Setter Property="Height" Value="28" /> -->
diff --git a/RogueEssence.Editor.Avalonia/Converters/New/StringConverters.cs b/RogueEssence.Editor.Avalonia/Converters/New/StringConverters.cs
index bfc98278..be3b4cca 100644
--- a/RogueEssence.Editor.Avalonia/Converters/New/StringConverters.cs
+++ b/RogueEssence.Editor.Avalonia/Converters/New/StringConverters.cs
@@ -2,6 +2,7 @@
 using System;
 using System.Globalization;
 using Avalonia.Data.Converters;
+using Avalonia.Input;
 using Avalonia.Styling;
 
 namespace RogueEssence.Dev.Converters
@@ -45,6 +46,9 @@ public object ConvertBack(object value, Type targetType, object parameter, Cultu
                 return (value as ThemeVariant)?.Key;
             }
         }
+        
+        public static readonly FuncValueConverter<KeyGesture, string> FromKeyGesture =
+            new FuncValueConverter<KeyGesture, string>(v => v?.ToString("p", null) ?? string.Empty);
 
         public static readonly ToThemeConverter ToTheme = new ToThemeConverter();
     }
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/Editor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/Editor.cs
index d73341d7..230788d5 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/Editor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/Editor.cs
@@ -48,11 +48,17 @@ protected Editor(EditorContext context)
         /// </summary>
         public virtual bool SimpleEditor => false;
 
-        public static void LoadLabelControl(StackPanel control, string name, string desc)
+        public static void LoadLabelControl(StackPanel control, string name, string desc, object[] attributes)
         {
             TextBlock lblName = new TextBlock();
             lblName.Margin = new Thickness(0, 4, 0, 0);
-            lblName.Text = Text.GetMemberTitle(name) + ":";
+
+            // Check for RenameLabel override first
+            RenameLabelAttribute renameAtt = ReflectionExt.FindAttribute<RenameLabelAttribute>(attributes);
+            if (renameAtt != null)
+                lblName.Text = renameAtt.Label + ":";
+            else
+                lblName.Text = Text.GetMemberTitle(name) + ":";
 
             if (desc != null)
                 ToolTip.SetTip(lblName, desc);
@@ -298,7 +304,7 @@ void IEditor.LoadClassControls(StackPanel control, string parent, Type parentTyp
             if (!subGroup)
             {
                 string desc = DevDataManager.GetMemberDoc(parentType, name);
-                LoadLabelControl(control, name, desc);
+                LoadLabelControl(control, name, desc, attributes);
                 if (member == null)
                 {
                     Type[] children;
@@ -440,7 +446,7 @@ void IEditor.LoadClassControls(StackPanel control, string parent, Type parentTyp
                     if (includeLabel)
                     {
                         string desc = DevDataManager.GetMemberDoc(parentType, name);
-                        LoadLabelControl(control, name, desc);
+                        LoadLabelControl(control, name, desc, attributes);
                     }
 
                     if (includeDecoration)
@@ -526,7 +532,7 @@ void IEditor.LoadClassControls(StackPanel control, string parent, Type parentTyp
                     if (includeLabel)
                     {
                         string desc = DevDataManager.GetMemberDoc(parentType, name);
-                        LoadLabelControl(control, name, desc);
+                        LoadLabelControl(control, name, desc, attributes);
                     }
 
 
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/PriorityListEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/PriorityListEditor.cs
index 619f82cb..1f60b993 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/PriorityListEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/PriorityListEditor.cs
@@ -131,7 +131,7 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
             }
             else
             {
-                LoadLabelControl(control, name, desc);
+                LoadLabelControl(control, name, desc, attributes);
                 control.Children.Add(lbxValue);
             }
         }
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/TypeDictEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/TypeDictEditor.cs
index 24f8b68c..d59fbc1c 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/TypeDictEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/TypeDictEditor.cs
@@ -132,7 +132,7 @@ await MessageBoxWindowView.Show(_context.DialogService, "Cannot add duplicate st
             }
             else
             {
-                LoadLabelControl(control, name, desc);
+                LoadLabelControl(control, name, desc, attributes);
                 control.Children.Add(lbxValue);
             }
         }
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/ZoneDataEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/ZoneDataEditor.cs
index 6a94d461..f5b03d47 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/ZoneDataEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/ZoneDataEditor.cs
@@ -23,7 +23,7 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
         {
             base.LoadWindowControls(control, parent, parentType, name, type, attributes, obj, subGroupStack);
 
-            LoadLabelControl(control, "Script Events", "Events that can be created in the lua script for this zone.");
+            LoadLabelControl(control, "Script Events", "Events that can be created in the lua script for this zone.", attributes);
 
             Button btnTest = new Button();
             btnTest.Margin = new Thickness(0, 4, 0, 0);
diff --git a/RogueEssence.Editor.Avalonia/EditorContext/TabEvents.cs b/RogueEssence.Editor.Avalonia/EditorContext/TabEvents.cs
index 406190f6..5ea61c67 100644
--- a/RogueEssence.Editor.Avalonia/EditorContext/TabEvents.cs
+++ b/RogueEssence.Editor.Avalonia/EditorContext/TabEvents.cs
@@ -16,6 +16,13 @@ public class TabEvents
         
         public event Action<OpenEditorNode>? AddPageFromTreeNodeEvent;
 
+        public event Action<EditorPageViewModel>? TryNavigateToParentTabEvent;
+        
+        public void TryNavigateToParentTab(EditorPageViewModel page)
+        {
+            TryNavigateToParentTabEvent?.Invoke(page);
+        }
+
         
         // Used for closing tabs when a data entry is deleted
         public event Action<string, DataManager.DataType>? CloseTabsForEntry;
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevFormViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevFormViewModel.cs
index 973ae74d..80cb98fe 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevFormViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevFormViewModel.cs
@@ -25,6 +25,8 @@ namespace RogueEssence.Dev.ViewModels;
 
 public class DevFormViewModel : ViewModelBase
 {
+    
+    
     private HierarchicalTreeDataGridSource<NodeBase> _nodeSource;
 
     public HierarchicalTreeDataGridSource<NodeBase> NodeSource
@@ -54,6 +56,15 @@ public void OpenTabSwitcher()
         TabSwitcher = _context.PageFactory.GetRequiredService<TabSwitcherViewModel>();
     }
 
+    
+    public event Action<EditorPageViewModel>? ActivePageSet;
+    
+    public void OnActivePageSet(EditorPageViewModel page)
+    {
+       ActivePageSet?.Invoke(page);
+    }
+    
+    
     public event Action? TabSwitcherClosed;
 
     public void CloseTabSwitcher()
@@ -248,61 +259,135 @@ private PageNode GetTopLevelNode(PageNode node)
         return current;
     }
 
-    // public void RemoveTab(EditorPageViewModel page)
-    // {
-    //     // Console.WriteLine($"Removing tab {page}" + "hmmm");
-    //     if (!_pageToNodeMap.TryGetValue(page, out var node))
-    //         return;
-    //
-    //     int removeIdx = Pages.IndexOf(page);
-    //
-    //     // Console.WriteLine($"Removing tab {page} at index {removeIdx}");
-    //
-    //     ClosePageAndChildren(node);
-    //
-    //
-    //     // TODO:
-    //     // We want to prioritize setting the left tab to be the active tab since our editors open stuff to the right first
-    //     // Maybe we want to set the active page to be the parent if it exists?
-    //     // For after deleting Datatype entries, should it go back to the last previously visited tab?
-    //
-    //
-    //   Console.WriteLine(ActivePage);
-    //     Console.WriteLine(page.Equals(ActivePage) + "same!!?");
-    //
-    //     if (Pages.Count == 0)
-    //     {
-    //         ActivePage = null;
-    //     }
-    //     else if (page.Equals(ActivePage))
-    //     {
-    //         if (removeIdx < Pages.Count)
-    //         {
-    //             ActivePage = Pages[removeIdx];
-    //         }
-    //         else
-    //         {
-    //             ActivePage = Pages[removeIdx - 1];
-    //         }
-    //     }
-    // }
+    public bool CanCloseLeft(EditorPageViewModel page = null)
+    {
+        return Pages.IndexOf(page) > 0;
+    }
+
+    public bool CanCloseRight(EditorPageViewModel page = null)
+    {
+        return Pages.IndexOf(page) < Pages.Count - 1;
+    }
+
+    public bool CanCloseOthers()
+    {
+        return Pages.Count > 1;
+    }
     
-    public void RemoveTab(EditorPageViewModel page)
+    private async Task<bool> ClosePages(IEnumerable<EditorPageViewModel> pages)
     {
-        if (!_pageToNodeMap.TryGetValue(page, out var node))
+        var toClose = pages.ToList();
+        var toCloseNodes = toClose.Select(p => p.Node).ToHashSet();
+
+        var sorted = toClose.OrderBy(p =>
+        {
+            int depth = 0;
+            var parent = p.Node.Parent;
+            while (parent != null)
+            {
+                depth++;
+                parent = parent.Parent;
+            }
+            return depth;
+        }).ToList();
+
+        foreach (var page in sorted)
+        {
+            if (!Pages.Contains(page)) continue;
+
+            if ((page is ReflectedDataPageViewModel rdp && rdp.IsRootPage) || page is ModListPageViewModel)
+            {
+                await TryCloseTabAsync(page, true);
+                continue;
+            }
+
+            var parent = page.Node.Parent;
+            bool hasAncestorInSet = false;
+            
+            if (toCloseNodes.Contains(parent))
+            {
+                continue;
+        
+                
+            }
+            
+
+            await TryCloseTabAsync(page, true);
+        }
+
+        return true;
+    }
+    public async Task<bool> CloseLeftAsync(EditorPageViewModel? relativeTo = null)
+    {
+        relativeTo ??= ActivePage;
+        int idx = Pages.IndexOf(relativeTo);
+        return await ClosePages(Pages.Take(idx));
+    }
+
+    public async Task<bool> CloseRightAsync(EditorPageViewModel? relativeTo = null)
+    {
+        relativeTo ??= ActivePage;
+        int idx = Pages.IndexOf(relativeTo);
+        return await ClosePages(Pages.Skip(idx + 1));
+    }
+
+    public async Task<bool> CloseOthersAsync(EditorPageViewModel? relativeTo = null)
+    {
+        relativeTo ??= ActivePage;
+        var pagesToClose = Pages.Where(p => !p.Equals(relativeTo));
+        Console.WriteLine("Closing pages: " + string.Join(", ", pagesToClose.Select(p => p.Title)));
+        Console.WriteLine(pagesToClose.Count() + " pages to close");
+        return await ClosePages(pagesToClose);
+    }
+    public async Task<bool> CloseAllAsync()
+    {
+        Console.WriteLine("Closing all pages");
+        return await ClosePages(Pages);
+    }
+
+    public void TryNavigateToParent(EditorPageViewModel page)
+    {
+        if (!_pageToNodeMap.TryGetValue(page, out PageNode node))
+            return;
+        
+        var parent = node.Parent;
+        if (parent != null)
+        {
+            ActivePage = parent.Page;
+        }
+        
+    }
+    
+    public void RemoveTab(EditorPageViewModel page, bool tryNavigateToParent = false)
+    {
+        if (!_pageToNodeMap.TryGetValue(page, out PageNode node))
             return;
 
         int removeIdx = Pages.IndexOf(page);
-        bool wasActive = page.Equals(ActivePage); // capture before removal
+        bool wasActive = page.Equals(ActivePage);
 
         ClosePageAndChildren(node);
 
+
+        if (tryNavigateToParent)
+        {
+            var parent = node.Parent;
+            if (parent != null)
+            {
+                ActivePage = parent.Page;
+                return;
+            }
+        }
+        
+        
+
         if (Pages.Count == 0)
         {
             ActivePage = null;
         }
         else if (wasActive)
         {
+            // try right tab, then left tab
             if (removeIdx < Pages.Count)
             {
                 ActivePage = Pages[removeIdx];
@@ -365,6 +450,7 @@ public DevFormViewModel(EditorContext context, DevTabGameViewModel game, DevTabP
         DevTabTravelViewModel travel, DevTabScriptViewModel script,
         ModManagerViewModel mods)
     {
+        Console.WriteLine("DevFormViewModel created");
         _context = context;
         Game = game;
         Player = player;
@@ -384,6 +470,7 @@ public DevFormViewModel(EditorContext context, DevTabGameViewModel game, DevTabP
         TopLevelPages = new ObservableCollection<PageNode>();
         _pageToNodeMap = new Dictionary<EditorPageViewModel, PageNode>();
 
+        
         this.WhenAnyValue(x => x.ActivePage)
             .Buffer(2, 1)
             .Subscribe(pair =>
@@ -397,8 +484,10 @@ public DevFormViewModel(EditorContext context, DevTabGameViewModel game, DevTabP
         EditorPageViewModel? previousPage = null;
         this.WhenAnyValue(x => x.ActivePage).Subscribe(page =>
         {
+            Console.WriteLine("Active page changed: " + page?.Title);
             previousPage?.OnPageDeactivated();
             page?.OnPageActivated();
+            OnActivePageSet(page);
             previousPage = page;
         });
         
@@ -743,6 +832,8 @@ private void InitializeTabEvents()
         _tabEvents.AddTopLevelTabEvent += (tab) => { AddTopLevelPage(tab); };
 
         _tabEvents.RemoveTabEvent += (tab) => { RemoveTab(tab); };
+        
+        _tabEvents.TryNavigateToParentTabEvent += (tab) => { TryNavigateToParent(tab); };
 
         _tabEvents.NavigateToTabEvent += (tab) => { ActivePage = tab; };
 
@@ -827,14 +918,18 @@ public async Task TryCloseCurrentTab()
     {
         if (ActivePage != null)
         { 
-            await TryCloseTabAsync(ActivePage);
+            await TryCloseTabAsync(ActivePage, false);
         }
     }
-    public async Task<bool> TryCloseTabAsync(EditorPageViewModel page)
+    public async Task<bool> TryCloseTabAsync(EditorPageViewModel page, bool navigateToBeforeClosing)
     {
         if (PageHasChildren(page))
         {
-            // TODO: Add a can close method and check if any of the subtabs has any unsaved changes.
+            if (navigateToBeforeClosing)
+            {
+                ActivePage = page;
+            }
+            // TODO: Add a can close method and check if any of the subtabs has any unsaved changes?
             var result = await MessageBoxWindowView.Show(_context.DialogService,
                 "Are you sure you want to close all subtabs?  Your changes will not be saved.", "Confirm Close",
                 MessageBoxWindowView.MessageBoxButtons.YesNo);
@@ -842,6 +937,8 @@ public async Task<bool> TryCloseTabAsync(EditorPageViewModel page)
             if (result != MessageBoxWindowView.MessageBoxResult.Yes)
                 return false;
         }
+        
+        
 
         RemoveTab(page);
         page.OnPageRemoved();
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/DevForm/Nodes/NodeBase.cs b/RogueEssence.Editor.Avalonia/ViewModels/DevForm/Nodes/NodeBase.cs
index 52b29f2d..0f30664a 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/DevForm/Nodes/NodeBase.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/DevForm/Nodes/NodeBase.cs
@@ -595,6 +595,11 @@ protected virtual ISpriteRootOperationStrategy CreateStrategy(IDialogService dia
     public async Task ExportAsync(string key) => await Strategy.ExportAsync(key);
     
     public async Task ImportAsync(ObservableCollection<string> items) => await Strategy.ImportAsync(items);
+    
+    protected override int GetHashCodeCore()
+    {
+        return EditorType.GetHashCode() ^ AssetType.GetHashCode();
+    }
 }
 
 
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/Pages/DataListPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/Pages/DataListPageViewModel.cs
index 00b007ee..df9f421f 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/Pages/DataListPageViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/Pages/DataListPageViewModel.cs
@@ -134,6 +134,10 @@ private async Task ExportDtefAsync()
     //     }
     // }
 
+    public override int GetHashCode()
+    {
+        return DataType.GetHashCode();
+    }
 
 
 
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/Pages/SpritePageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/Pages/SpritePageViewModel.cs
index 71876b7f..4906d275 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/Pages/SpritePageViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/Pages/SpritePageViewModel.cs
@@ -131,9 +131,13 @@ public override void OnPageRemoved()
         Node.Strategy.OnReload -= () => LoadDataEntries(AssetType);
         base.OnPageRemoved();
     }
-    
 
 
+    public override int GetHashCode()
+    {
+        return AssetType.GetHashCode();
+    }
+
     public override void OnPageLoad()
     {
         if (AssetType == GraphicsManager.AssetType.Tile)
diff --git a/RogueEssence.Editor.Avalonia/Views/DevForm/DevForm.axaml b/RogueEssence.Editor.Avalonia/Views/DevForm/DevForm.axaml
index 2de4c361..2dca17ba 100644
--- a/RogueEssence.Editor.Avalonia/Views/DevForm/DevForm.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/DevForm/DevForm.axaml
@@ -118,13 +118,14 @@
                             Height="1"
                             Background="{DynamicResource Brush.Border2}"
                             HorizontalAlignment="Stretch" />
+                    <!-- LostFocus="LeftTreeDataGrid_OnLostFocus" -->
                     <TreeDataGrid Grid.Row="2"
                                   MinHeight="200" MinWidth="200"
                                   x:Name="LeftTreeDataGrid"
                                   DoubleTapped="LeftTreeDataGrid_OnDoubleTapped"
                                   ContextRequested="LeftTreeDataGrid_OnContextRequested"
                                   PointerPressed="LeftTreeDataGrid_OnPointerPressed"
-                                  LostFocus="LeftTreeDataGrid_OnLostFocus"
+                              
                                   ShowColumnHeaders="False"
                                   Source="{Binding NodeSource}">
                         <TreeDataGrid.Resources>
diff --git a/RogueEssence.Editor.Avalonia/Views/DevForm/DevForm.axaml.cs b/RogueEssence.Editor.Avalonia/Views/DevForm/DevForm.axaml.cs
index 43971f35..ea4ebf60 100644
--- a/RogueEssence.Editor.Avalonia/Views/DevForm/DevForm.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/DevForm/DevForm.axaml.cs
@@ -512,7 +512,8 @@ protected override void OnDataContextChanged(EventArgs e)
         base.OnDataContextChanged(e);
         if (DataContext is DevFormViewModel vm)
         {
-            vm.ModSwitcherClosed += () => ModSwitcherFlyoutButton.Flyout?.Hide();;
+            vm.ModSwitcherClosed += () => ModSwitcherFlyoutButton.Flyout?.Hide();
+            vm.ActivePageSet += OnActivePageSet;
         }
     }
     
@@ -702,34 +703,99 @@ node.Parent is SpriteRootNode parent &&
 
     }
 
-    private void LeftTreeDataGrid_OnLostFocus(object sender, RoutedEventArgs e)
+    public void OnActivePageSet(EditorPageViewModel page)
     {
+        Console.WriteLine("OnActivePageSet: " + page.Title);
+        if (DataContext is DevFormViewModel vm)
+        {
+            if (vm.Pages.Count == 0)
+            {
+                return;
+            }
+            
+            var path = FindIndexPath<NodeBase>(vm.NodeSource.Items, page.Node, n => n.SubNodes);
+            Console.WriteLine("Page?: " + path);
+            if (path.HasValue)
+                // Dispatcher.UIThread.Post(() =>
+                // {
+                //     Dispatcher.UIThread.Post(() =>
+                //     {[[[
+                //         LeftTreeDataGrid.RowSelection.Select(path.Value);
+                //     }, DispatcherPriority.Background);
+                // }, DispatcherPriority.Background);
+                Dispatcher.UIThread.Invoke(() => LeftTreeDataGrid.RowSelection.Select(path.Value), DispatcherPriority.Background);
         
-        if (sender is not TreeDataGrid grid)
-            return;
-        
-        
-        if (grid.IsKeyboardFocusWithin)
-            return;
-        
-        if (grid.ContextMenu?.IsOpen == true)
-            return;
-        
-        var window = grid.GetVisualRoot() as Window;
-        if (window is { IsActive: false })
-            return; 
-        // (grid.RowSelection.SelectedItem as DataItemNode)?.Parent?.ResaveAsFile(grid.RowSelection.SelectedItem as DataItemNode)
-        // Not sure why it doesn't clear the grid...
-        grid.RowSelection.Clear();
-        
-        lock (GameBase.lockObj)
+        }
+    }
+    //
+    // var source = LeftTreeDataGrid.Source as HierarchicalTreeDataGridSource<NodeBase>;
+    //     if (source == null) return;
+    //
+    // for (int i = 0; i < source.Rows.Count; i++)
+    // {
+    //     if (source.Rows[i] is IRow<NodeBase> row && row.Model.Equals(page.Node))
+    //     {
+    //         Dispatcher.UIThread.Invoke(() =>
+    //         {
+    //             LeftTreeDataGrid.RowSelection!.Select(new IndexPath(i));
+    //                    
+    //         });
+    //         break;
+    //     }
+    // }
+    //
+    
+
+    // Example: IndexPath: [0, 2] means the first root node, then the third node under the root
+    // Perhaps NodeBase should maintain the IndexPath?
+    public static IndexPath? FindIndexPath<T>(IEnumerable<T> items, T target, Func<T, IEnumerable<T>> getChildren, IndexPath current = default) where T : class
+    {
+        int i = 0;
+        foreach (var item in items)
         {
-            if (DungeonScene.Instance != null)
+            var path = current.Append(i);
+            if (item == target)
+                return path;
+
+            var children = getChildren(item);
+            if (children != null)
             {
-                DungeonScene.Instance.DebugAsset = GraphicsManager.AssetType.None;
-                DungeonScene.Instance.DebugAnim = null;
+                var found = FindIndexPath(children, target, getChildren, path);
+                if (found.HasValue)
+                    return found;
             }
+            i += 1;
         }
+        return null;
     }
+    // private void LeftTreeDataGrid_OnLostFocus(object sender, RoutedEventArgs e)
+    // {
+    //     
+    //     if (sender is not TreeDataGrid grid)
+    //         return;
+    //     
+    //     
+    //     if (grid.IsKeyboardFocusWithin)
+    //         return;
+    //     
+    //     if (grid.ContextMenu?.IsOpen == true)
+    //         return;
+    //     
+    //     var window = grid.GetVisualRoot() as Window;
+    //     if (window is { IsActive: false })
+    //         return; 
+    //     // (grid.RowSelection.SelectedItem as DataItemNode)?.Parent?.ResaveAsFile(grid.RowSelection.SelectedItem as DataItemNode)
+    //     // Not sure why it doesn't clear the grid...
+    //     grid.RowSelection.Clear();
+    //     
+    //     lock (GameBase.lockObj)
+    //     {
+    //         if (DungeonScene.Instance != null)
+    //         {
+    //             DungeonScene.Instance.DebugAsset = GraphicsManager.AssetType.None;
+    //             DungeonScene.Instance.DebugAnim = null;
+    //         }
+    //     }
+    // }
 
 }
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/DevForm/TabBarView.axaml b/RogueEssence.Editor.Avalonia/Views/DevForm/TabBarView.axaml
index 546836a2..322bcadd 100644
--- a/RogueEssence.Editor.Avalonia/Views/DevForm/TabBarView.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/DevForm/TabBarView.axaml
@@ -206,6 +206,7 @@
         <Grid ColumnDefinitions="*">
             <controls:TabsControl SelectedItem="{Binding ActivePage}"
                                   ShowDefaultCloseButton="False"
+                                  x:Name="TabsControl"
                                   ShowDefaultAddButton="False"
                                   TabItemWidth="175"
                                   ScrollViewer.HorizontalScrollBarVisibility="Visible"
@@ -243,13 +244,8 @@
                               IsHitTestVisible="True"
                               HorizontalAlignment="Left">
                             
-                            <Grid.ContextMenu>
-                                <ContextMenu>
-                                    <MenuItem Header="Close" Click="OnCloseTab" />
-                                    <MenuItem Header="Close Others" />
-                                    <MenuItem Header="Close All" />
-                                </ContextMenu>
-                            </Grid.ContextMenu>
+                       
+                        
                             <Border IsHitTestVisible="True" ToolTip.Tip="{Binding Title}" Padding="8, 0, 16, 0"
                                     Background="Transparent" BorderBrush="{DynamicResource Color.Window}"
                                     BorderThickness="0 0 0 1"
diff --git a/RogueEssence.Editor.Avalonia/Views/DevForm/TabBarView.axaml.cs b/RogueEssence.Editor.Avalonia/Views/DevForm/TabBarView.axaml.cs
index 0dd32774..877cc754 100644
--- a/RogueEssence.Editor.Avalonia/Views/DevForm/TabBarView.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/DevForm/TabBarView.axaml.cs
@@ -1,51 +1,137 @@
 using System;
+using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Controls.Shapes;
+using Avalonia.Input;
 using Avalonia.Interactivity;
+using Avalonia.Media;
+using Avalonia.VisualTree;
 using RogueEssence.Dev.ViewModels;
 
-namespace RogueEssence.Dev.Views
+public static class ControlExtensions
 {
-    public partial class TabBarView : UserControl
+
+    public static Path CreateMenuIcon(this Control control, string iconKey)
     {
-        public TabBarView()
+        if (control?.FindResource(iconKey) is StreamGeometry geo)
         {
-            InitializeComponent();
+            return new Path()
+            {
+                Data = geo,
+                Width = 12,
+                Height = 12,
+                Stretch = Stretch.Uniform
+            };
         }
-        
-        protected override void OnDataContextChanged(EventArgs e)
+
+        return null;
+    }
+}
+
+namespace RogueEssence.Dev.Views
+{
+    public partial class TabBarView : UserControl
+{
+    private ContextMenu _tabContextMenu;
+    private EditorPageViewModel? _contextMenuPage;
+
+    public TabBarView()
+    {
+        InitializeComponent();
+
+        _tabContextMenu = new ContextMenu();
+        TabsControl.ContextMenu = _tabContextMenu;
+        TabsControl.AddHandler(InputElement.PointerPressedEvent, OnTabBarPointerPressed, RoutingStrategies.Tunnel);
+    }
+
+    private void OnTabBarPointerPressed(object? sender, PointerPressedEventArgs e)
+    {
+        if (!e.GetCurrentPoint(this).Properties.IsRightButtonPressed) return;
+
+        var current = e.Source as Visual;
+        EditorPageViewModel? page = null;
+
+        while (current != null)
         {
-            base.OnDataContextChanged(e);
-            if (DataContext is DevFormViewModel vm)
+            if (current.DataContext is EditorPageViewModel vm)
             {
-                vm.TabSwitcherClosed += () => TabSwitcherFlyoutButton.Flyout?.Hide();;
+                page = vm;
+                break;
             }
+            current = current.GetVisualParent();
         }
 
-        private async void OnCloseTab(object? sender, RoutedEventArgs e)
+        if (page == null) return;
+        if (DataContext is not DevFormViewModel devVm) return;
+
+        _contextMenuPage = page;
+        BuildContextMenu(devVm, page);
+        _tabContextMenu.Open(TabsControl);
+        e.Handled = true;
+    }
+
+    private void BuildContextMenu(DevFormViewModel vm, EditorPageViewModel page)
+    {
+        _tabContextMenu.Items.Clear();
+
+        var close = new MenuItem { Header = "Close" };
+        close.InputGesture = new KeyGesture(Key.W, OperatingSystem.IsMacOS() ? KeyModifiers.Meta : KeyModifiers.Control);
+        close.Click += (_, _) => vm.TryCloseTabAsync(page, false);
+        _tabContextMenu.Items.Add(close);
+        
+        bool canLeft = vm.CanCloseLeft(page);
+        bool canRight = vm.CanCloseRight(page);
+
+        if (vm.CanCloseOthers())
         {
-            if (DataContext is not DevFormViewModel vm) return;
-            if (sender is not Button { DataContext: EditorPageViewModel page }) return;
+            var closeOthers = new MenuItem { Header = "Close Others" };
+            closeOthers.Click += (_, _) => vm.CloseOthersAsync(page);
+            _tabContextMenu.Items.Add(closeOthers);
             
-            bool closed = await vm.TryCloseTabAsync(page);
-            if (!closed)
-                e.Handled = true;
+            var closeAll = new MenuItem { Header = "Close All" };
+            closeAll.Click += (_, _) => vm.CloseAllAsync();
+            _tabContextMenu.Items.Add(closeAll);
         }
         
-        
-        private void TabSwitcherFlyout_OnOpened(object? sender, EventArgs e)
+        if (canLeft && canRight)
         {
-            if (DataContext is DevFormViewModel vm)
-            {
-                vm.OpenTabSwitcher();
-            }
-        }
+            var closeLeft = new MenuItem { Header = "Close Left" };
+            closeLeft.Click += (_, _) => vm.CloseLeftAsync(page);
+            _tabContextMenu.Items.Add(closeLeft);
 
-        private void TabSwitcherFlyout_OnClosed(object? sender, EventArgs e)
-        {
-            if (DataContext is DevFormViewModel vm)
-            {
-                vm.CloseTabSwitcher();
-            }
+            var closeRight = new MenuItem { Header = "Close Right" };
+            closeRight.Click += (_, _) => vm.CloseRightAsync(page);
+            _tabContextMenu.Items.Add(closeRight);
         }
     }
+
+    protected override void OnDataContextChanged(EventArgs e)
+    {
+        base.OnDataContextChanged(e);
+        if (DataContext is DevFormViewModel vm)
+            vm.TabSwitcherClosed += () => TabSwitcherFlyoutButton.Flyout?.Hide();
+    }
+
+    private async void OnCloseTab(object? sender, RoutedEventArgs e)
+    {
+        if (DataContext is not DevFormViewModel vm) return;
+        if (sender is not Button { DataContext: EditorPageViewModel page }) return;
+
+        bool closed = await vm.TryCloseTabAsync(page, false);
+        if (!closed)
+            e.Handled = true;
+    }
+
+    private void TabSwitcherFlyout_OnOpened(object? sender, EventArgs e)
+    {
+        if (DataContext is DevFormViewModel vm)
+            vm.OpenTabSwitcher();
+    }
+
+    private void TabSwitcherFlyout_OnClosed(object? sender, EventArgs e)
+    {
+        if (DataContext is DevFormViewModel vm)
+            vm.CloseTabSwitcher();
+    }
+}
 }
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/Pages/DataListPageView.axaml b/RogueEssence.Editor.Avalonia/Views/Pages/DataListPageView.axaml
index 18c451ee..45b33956 100644
--- a/RogueEssence.Editor.Avalonia/Views/Pages/DataListPageView.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/Pages/DataListPageView.axaml
@@ -23,7 +23,7 @@
                    Text="{Binding Node.DataType}" />
 
         <!-- Search Grid -->
-        <Grid Grid.Row="3" RowDefinitions="Auto, 16, Auto, 12, Auto" Margin="64, 8" MinWidth="600">
+        <Grid Grid.Row="3" RowDefinitions="Auto, 16, Auto, 12, Auto" Margin="64, 8">
 
             <TextBox Classes="search"
                      Grid.Row="0"
diff --git a/RogueEssence.Editor.Avalonia/Views/Pages/SpritePageView.axaml b/RogueEssence.Editor.Avalonia/Views/Pages/SpritePageView.axaml
index 5cd2a6a9..b5baa2a1 100644
--- a/RogueEssence.Editor.Avalonia/Views/Pages/SpritePageView.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/Pages/SpritePageView.axaml
@@ -155,11 +155,22 @@
                             <Path Width="10" Height="10" Margin="0, 2, 0, 0" Data="{StaticResource Icons.PlayFill}" IsVisible="{Binding IsPaused}" />
                         </Panel>
                     </Button>
-                </StackPanel>
+                </StackPanel>               
             </Grid>
         </Grid>
   
-  
+        <Border Grid.Row="3"
+                Background="{DynamicResource B}"
+                Padding="8,4">
+            <StackPanel Orientation="Horizontal" Spacing="16">
+                <TextBlock VerticalAlignment="Center"
+                           Foreground="White"
+                           Text="{Binding PreviewBitmap.Size, StringFormat='Size: {0}'}" />
+                <TextBlock VerticalAlignment="Center"
+                           Foreground="White"
+                           Text="{Binding CurrentFrameDisplay}" />
+            </StackPanel>
+        </Border>
         <!-- MaxWidth="256" MaxHeight="256" -->
         <!-- <ScrollViewer HorizontalScrollBarVisibility="Auto" -->
         <!--               VerticalScrollBarVisibility="Auto"> -->
diff --git a/RogueEssence/Data/StartParams.cs b/RogueEssence/Data/StartParams.cs
index ffdf3e9a..c11b5565 100644
--- a/RogueEssence/Data/StartParams.cs
+++ b/RogueEssence/Data/StartParams.cs
@@ -8,6 +8,7 @@ namespace RogueEssence.Data
     [Serializable]
     public class StartParams
     {
+        [RenameLabel("Starting Characters")]
         public List<StartChar> Chars;
         public int Personality;
         public ZoneLoc Map;
diff --git a/RogueEssence/Dev/CustomAttributes/RenameLabelAttribute.cs b/RogueEssence/Dev/CustomAttributes/RenameLabelAttribute.cs
new file mode 100644
index 00000000..73db8cec
--- /dev/null
+++ b/RogueEssence/Dev/CustomAttributes/RenameLabelAttribute.cs
@@ -0,0 +1,15 @@
+using System;
+
+namespace RogueEssence.Dev
+{
+    [AttributeUsage(AttributeTargets.Field | AttributeTargets.Property)]
+    public class RenameLabelAttribute : Attribute
+    {
+        public string Label { get; }
+
+        public RenameLabelAttribute(string label)
+        {
+            Label = label;
+        }
+    }
+}
\ No newline at end of file

From 955b9cf6e08268e216d7f031fb0c9bc8d64893f8 Mon Sep 17 00:00:00 2001
From: Kace <41309226+DoubleTrio@users.noreply.github.com>
Date: Sat, 6 Jun 2026 03:07:03 -0400
Subject: [PATCH 50/51] editable datagrids, tab changes

---
 .../Converters/MathAddConverter.cs            |  30 +++
 .../RogueElements/PriorityListEditor.cs       |  26 ---
 .../RogueEssence/CategorySpawnEditor.cs       |  47 +++--
 .../DataEditor/PriorityListBox.axaml          |  21 +-
 .../DataEditor/PriorityListBox.axaml.cs       |  90 ++++++---
 .../DataEditor/PriorityListBoxViewModel.cs    |  42 ++--
 .../DataEditor/RangeDictBox.axaml             |  42 ++--
 .../DataEditor/RangeDictBox.axaml.cs          |  46 ++---
 .../DataEditor/RangeDictBoxViewModel.cs       |  16 +-
 .../DataEditor/SpawnListBox.axaml             |  24 +--
 .../DataEditor/SpawnListBox.axaml.cs          |  47 +++--
 .../DataEditor/SpawnListBoxViewModel.cs       |   4 +-
 .../DataEditor/SpawnRangeListBox.axaml        |  45 ++---
 .../DataEditor/SpawnRangeListBox.axaml.cs     |  68 +++++--
 .../DataEditor/SpawnRangeListBoxViewModel.cs  |  43 +++-
 .../EditorContext/TabEvents.cs                |   9 +-
 .../RogueEssence.Editor.Avalonia.csproj       |   4 +
 .../ViewModels/DevForm/DevFormViewModel.cs    | 112 ++++++-----
 .../ReflectedDataWindowViewModel.cs           |  18 ++
 .../Pages/ReflectedDataPageViewModel.cs       |  13 ++
 .../Pages/SpeciesEditPageViewModel.cs         | 166 ++++++++-------
 .../ViewModels/Pages/SpritePageViewModel.cs   | 149 +++++++++++---
 .../Views/DevForm/DevForm.axaml               |   2 +-
 .../Views/DevForm/DevForm.axaml.cs            |   4 +-
 .../Views/DevForm/TabBarView.axaml            |   7 +-
 .../Views/DevForm/TabBarView.axaml.cs         | 182 +++++++++--------
 .../DialogBoxes/ReflectedDataWindowView.axaml |  59 ++++++
 .../ReflectedDataWindowView.axaml.cs          |  52 +++++
 .../Pages/ReflectedDataPageView.axaml.cs      |  47 ++---
 .../Views/Pages/SpritePageView.axaml          | 182 +++++++++++------
 .../Views/Pages/SpritePageView.axaml.cs       | 189 +++++++++++++++++-
 31 files changed, 1201 insertions(+), 585 deletions(-)
 create mode 100644 RogueEssence.Editor.Avalonia/Converters/MathAddConverter.cs
 create mode 100644 RogueEssence.Editor.Avalonia/ViewModels/DialogBoxes/ReflectedDataWindowViewModel.cs
 create mode 100644 RogueEssence.Editor.Avalonia/Views/DialogBoxes/ReflectedDataWindowView.axaml
 create mode 100644 RogueEssence.Editor.Avalonia/Views/DialogBoxes/ReflectedDataWindowView.axaml.cs

diff --git a/RogueEssence.Editor.Avalonia/Converters/MathAddConverter.cs b/RogueEssence.Editor.Avalonia/Converters/MathAddConverter.cs
new file mode 100644
index 00000000..29f3cc05
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/Converters/MathAddConverter.cs
@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Text;
+using Avalonia.Data;
+using Avalonia.Data.Converters;
+using RogueEssence.Script;
+
+namespace RogueEssence.Dev.Converters
+{
+    public class MathAdd : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            var intValue = (int)value;
+            var paramStr = (string)parameter;
+            var isParseable = int.TryParse(paramStr, out var offset);
+    
+            if (!isParseable) return value;
+    
+            return intValue + offset;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotSupportedException();
+        }
+    }
+}
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/PriorityListEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/PriorityListEditor.cs
index 1f60b993..24e1f5e7 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/PriorityListEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueElements/PriorityListEditor.cs
@@ -83,32 +83,6 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
                 _context.TabEvents.AddChildPage(pageViewModel, newEditor);
             };
             
-            vm.OnEditPriority = (Priority priority, int index, bool advancedEdit, PriorityListBoxViewModel.EditPriorityOp op) =>
-            {
-                EditorPageViewModel pageViewModel = control.FindAncestorViewModel<EditorPageViewModel>();
-                string elementName = name + "<Priority>";
-        
-                NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(elementName, pageViewModel.Node, pageViewModel.Node.Icon);
-                pageViewModel.Node.AddNodeIfNotExists(node);
-
-                NodeHelper.ExpandParents(node, true);
-                ReflectedDataPageViewModel newEditor = _context.PageFactory.CreatePage<ReflectedDataPageViewModel>(node);
-                newEditor.SetPageTitle(elementName, pageViewModel.Node.Icon);
-
-                newEditor.OnLoadAction = (StackPanel stack) =>
-                {
-                    DataEditor.LoadClassControls(stack, parent, null, elementName, typeof(Priority), ReflectionExt.GetPassableAttributes(1, attributes), priority, true, new Type[0], advancedEdit);
-                };
-
-                newEditor.OnOKAction = async (StackPanel stack) =>
-                {
-                    object priorityObj = DataEditor.SaveClassControls(stack, elementName, typeof(Priority), ReflectionExt.GetPassableAttributes(1, attributes), true, new Type[0], advancedEdit);
-                    op(priority, index, (Priority)priorityObj);
-                    return true;
-                };
-
-                _context.TabEvents.AddChildPage(pageViewModel, newEditor);
-            };
             vm.LoadFromList(member);
 
 
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/CategorySpawnEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/CategorySpawnEditor.cs
index 5bddcc8b..6aaf2046 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/CategorySpawnEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/RogueEssence/CategorySpawnEditor.cs
@@ -146,6 +146,7 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
             Button btnTest = new Button();
             btnTest.Margin = new Thickness(4, 4, 0, 0);
             btnTest.Content = "Get Summary";
+            btnTest.Classes.Add("flat");
             btnTest.Click += (object sender, RoutedEventArgs e) =>
             {
                 int floor = (int)nudValueTestFloor.Value;
@@ -165,11 +166,7 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
                 }
 
                 List<(object, double)> flatSpawns = CategorySpawnHelper.CollapseSpawnDict<string, InvItem>(spawns);
-
-                DataEditForm frmData = new DataEditForm();
-                frmData.Title = "Spawn Summary";
-                StackPanel viewPanel = frmData.ControlPanel;
-
+                
                 SpawnListViewBox lbxValue = new SpawnListViewBox();
                 SpawnListBoxViewModel mv = new SpawnListBoxViewModel(_context.DialogService, new StringConv(elementType, ReflectionExt.GetPassableAttributes(1, attributes)));
 
@@ -182,12 +179,16 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
                 lbxValue.MinHeight = lbxValue.MaxHeight;//TODO: Uptake Avalonia fix for improperly updating Grid control dimensions
 
                 mv.LoadFromTupleList(flatSpawns);
-                viewPanel.Children.Add(lbxValue);
-
-                frmData.SetViewOnly();
-
-                control.GetOwningForm().RegisterChild(frmData);
-                frmData.Show();
+                
+                var reflectedVm = new ReflectedDataWindowViewModel();
+                reflectedVm.OnLoadAction = (StackPanel stack) =>
+                {
+                    stack.Children.Add(lbxValue);
+                };
+                
+                
+                int selectedFloor = (int)nudValueTestFloor.Value;
+                _context.DialogService.ShowDialogAsync<ReflectedDataWindowViewModel, bool>(reflectedVm, $"Floor {selectedFloor} Spawn Summary");
             };
             btnTest.SetValue(Avalonia.Controls.Grid.ColumnProperty, 2);
             innerPanel.ColumnDefinitions[2].Width = new GridLength(120);
@@ -237,22 +238,30 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
             //add lambda expression for editing a single element
             vm.OnEditItem += (int index, object element, bool advancedEdit, CategorySpawnBoxViewModel.EditElementOp op) =>
             {
+                EditorPageViewModel pageViewModel = control.FindAncestorViewModel<EditorPageViewModel>();
                 string elementName = name + "[" + index + "]";
-                DataEditForm frmData = new DataEditForm();
-                frmData.Title = DataEditor.GetWindowTitle(parent, elementName, element, elementType, ReflectionExt.GetPassableAttributes(1, ReflectionExt.GetPassableAttributes(2, attributes)));
+                string title = DataEditor.GetWindowTitle(parent, elementName, element, elementType, ReflectionExt.GetPassableAttributes(1, ReflectionExt.GetPassableAttributes(2, attributes)));
 
-                DataEditor.LoadClassControls(frmData.ControlPanel, parent, null, elementName, elementType, ReflectionExt.GetPassableAttributes(1, ReflectionExt.GetPassableAttributes(2, attributes)), element, true, new Type[0], advancedEdit);
-                DataEditor.TrackTypeSize(frmData, elementType);
+                NodeBase node = _context.NodeFactory.CreateReflectedDataNode<ReflectedDataPageViewModel>(elementName, null, pageViewModel.Node.Icon);
+                pageViewModel.Node.AddNodeIfNotExists(node);
 
-                frmData.SelectedOKEvent += async () =>
+                NodeHelper.ExpandParents(node, true);
+                ReflectedDataPageViewModel newEditor = _context.PageFactory.CreatePage<ReflectedDataPageViewModel>(node);
+                newEditor.SetPageTitle(title, pageViewModel.Node.Icon);
+
+                newEditor.OnLoadAction = (StackPanel stack) =>
                 {
-                    element = DataEditor.SaveClassControls(frmData.ControlPanel, elementName, elementType, ReflectionExt.GetPassableAttributes(1, ReflectionExt.GetPassableAttributes(2, attributes)), true, new Type[0], advancedEdit);
+                    DataEditor.LoadClassControls(stack, parent, null, elementName, elementType, ReflectionExt.GetPassableAttributes(1, ReflectionExt.GetPassableAttributes(2, attributes)), element, true, new Type[0], advancedEdit);
+                };
+
+                newEditor.OnOKAction = async (StackPanel stack) =>
+                {
+                    element = DataEditor.SaveClassControls(stack, elementName, elementType, ReflectionExt.GetPassableAttributes(1, ReflectionExt.GetPassableAttributes(2, attributes)), true, new Type[0], advancedEdit);
                     op(index, element);
                     return true;
                 };
 
-                control.GetOwningForm().RegisterChild(frmData);
-                frmData.Show();
+                _context.TabEvents.AddChildPage(pageViewModel, newEditor);
             };
 
             vm.OnEditKey += (int index, object key, bool advancedEdit, CategorySpawnBoxViewModel.EditElementOp op) =>
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/PriorityListBox.axaml b/RogueEssence.Editor.Avalonia/DataEditor/PriorityListBox.axaml
index 9c93b9d2..fb51bfe5 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/PriorityListBox.axaml
+++ b/RogueEssence.Editor.Avalonia/DataEditor/PriorityListBox.axaml
@@ -8,6 +8,7 @@
              HorizontalAlignment="Stretch"
              VerticalAlignment="Stretch"
              xmlns:converters="clr-namespace:RogueEssence.Dev.Converters"
+             x:DataType="vm:PriorityListBoxViewModel"
              x:Class="RogueEssence.Dev.Views.PriorityListBox">
     <UserControl.Resources>
     </UserControl.Resources>
@@ -16,13 +17,14 @@
     </Design.DataContext>
     <Grid RowDefinitions="*, 40, *" ColumnDefinitions="*, *, 30">
         <DataGrid
-            Name="gridItems"
-            IsReadOnly="true"
+            x:Name="PriorityListBoxDataGrid"
             HorizontalAlignment="Stretch"
             ItemsSource="{Binding Collection}"
             SelectedIndex="{Binding SelectedIndex, Mode=TwoWay}"
-            DoubleTapped="doubleClickStart"
-            PointerReleased="lbxCollection_DoubleClick"
+        
+            CellPointerPressed="PriorityListBoxDataGrid_OnCellPointerPressed"
+            CellEditEnding="PriorityListBoxDataGrid_OnCellEditEnding"
+            
             Margin="4" Grid.RowSpan="3"
             Grid.ColumnSpan="2"
             MinHeight="50"
@@ -30,9 +32,11 @@
             Classes="default">
             <DataGrid.Columns>
                 <DataGridTextColumn Header="Priority"
+                                    IsReadOnly="False"
                                     Binding="{Binding PriorityObj}"
                                     Width="80" />
                 <DataGridTextColumn Header="Value"
+                                    IsReadOnly="True"
                                     Binding="{Binding Path=DisplayValue}"
                                     Width="*" />
             </DataGrid.Columns>
@@ -50,15 +54,10 @@
                 </Button>
             </StackPanel>
             <StackPanel>
-                <Button Command="{Binding btnUp_Click}" IsEnabled="{Binding CanMoveUp}" Classes="secondary" Margin="0, 0" Padding="4,3, 4, 3">
+                <Button Command="{Binding btnUp_Click}" Classes="secondary" Margin="0, 0" Padding="4,3, 4, 3">
                     <Path Width="10" Height="10" Margin="0, 2,0,0" Data="{StaticResource Icons.CaretUpFill}" />
                 </Button>
-                <Button x:Name="PriorityListBoxEditButton"
-                        PointerReleased="PriorityListBoxEditButton_OnPointerReleased" IsEnabled="{Binding HasSelection}" Classes="secondary" Margin="0, 0"
-                        Padding="4,3, 4, 3">
-                    <Path Width="10" Height="10" Margin="0,0,0,0" Data="{StaticResource Icons.SortDescendingFill}" />
-                </Button>
-                <Button Command="{Binding btnDown_Click}" IsEnabled="{Binding CanMoveDown}" Classes="secondary" Margin="0, 0" Padding="4,3, 4, 3">
+                <Button Command="{Binding btnDown_Click}" Classes="secondary" Margin="0, 0" Padding="4,3, 4, 3">
                     <Path Width="10" Height="10" Margin="0,0,0,0" Data="{StaticResource Icons.CaretDownFill}" />
                 </Button>
             </StackPanel>
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/PriorityListBox.axaml.cs b/RogueEssence.Editor.Avalonia/DataEditor/PriorityListBox.axaml.cs
index abef21ea..0a226bb0 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/PriorityListBox.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/PriorityListBox.axaml.cs
@@ -7,7 +7,9 @@
 using System.Collections;
 using System.Collections.ObjectModel;
 using System.Reactive.Subjects;
+using Avalonia.Controls.Presenters;
 using Avalonia.Input;
+using Avalonia.VisualTree;
 using RogueEssence.Dev.ViewModels;
 
 namespace RogueEssence.Dev.Views
@@ -17,36 +19,26 @@ public partial class PriorityListBox : UserControl
         public PriorityListBox()
         {
             this.InitializeComponent();
-            Button addButton = this.FindControl<Button>("PriorityListBoxAddButton");
-            addButton.AddHandler(PointerReleasedEvent, PriorityListBoxAddButton_OnPointerReleased, RoutingStrategies.Tunnel);
-            
-            Button editButton = this.FindControl<Button>("PriorityListBoxEditButton");
-            editButton.AddHandler(PointerReleasedEvent, PriorityListBoxEditButton_OnPointerReleased, RoutingStrategies.Tunnel);
+            PriorityListBoxAddButton.AddHandler(PointerReleasedEvent, PriorityListBoxAddButton_OnPointerReleased, RoutingStrategies.Tunnel);
         }
         
 
-        bool doubleclick;
-        public void doubleClickStart(object sender, RoutedEventArgs e)
-        {
-            doubleclick = true;
-        }
-
-        public void lbxCollection_DoubleClick(object sender, PointerReleasedEventArgs e)
-        {
-            if (!doubleclick)
-                return;
-            doubleclick = false;
-
-            ViewModels.PriorityListBoxViewModel viewModel = (ViewModels.PriorityListBoxViewModel)DataContext;
-            if (viewModel == null)
-                return;
-            viewModel.lbxCollection_DoubleClick(sender, e);
-        }
+     
+        // public void lbxCollection_DoubleClick(object sender, PointerReleasedEventArgs e)
+        // {
+        //     if (!doubleclick)
+        //         return;
+        //     doubleclick = false;
+        //
+        //     ViewModels.PriorityListBoxViewModel viewModel = (ViewModels.PriorityListBoxViewModel)DataContext;
+        //     if (viewModel == null)
+        //         return;
+        //     viewModel.lbxCollection_DoubleClick(sender, e);
+        // }
 
         public void SetListContextMenu(ContextMenu menu)
         {
-            DataGrid lbx = this.FindControl<DataGrid>("gridItems");
-            lbx.ContextMenu = menu;
+            PriorityListBoxDataGrid.ContextMenu = menu;
         }
 
         private void PriorityListBoxAddButton_OnPointerReleased(object sender, PointerReleasedEventArgs e)
@@ -56,13 +48,51 @@ private void PriorityListBoxAddButton_OnPointerReleased(object sender, PointerRe
             PriorityListBoxViewModel vm = (PriorityListBoxViewModel) DataContext;
             vm.btnAdd_Click(advancedEdit);
         }
-
-        private void PriorityListBoxEditButton_OnPointerReleased(object sender, PointerReleasedEventArgs e)
+        
+        private Priority? ParsePriority(string text)
         {
-            KeyModifiers modifiers = e.KeyModifiers;
-            bool advancedEdit = modifiers.HasFlag(KeyModifiers.Shift);
-            PriorityListBoxViewModel vm = (PriorityListBoxViewModel) DataContext;
-            vm.btnEditKey_Click(advancedEdit);
+            string[] divText = text.Trim().Split('.');
+            int[] divNums = new int[divText.Length];
+            for (int ii = 0; ii < divText.Length; ii++)
+            {
+                if (!int.TryParse(divText[ii], out divNums[ii]))
+                    return null;
+            }
+            return new Priority(divNums);
+        }
+        
+        private void PriorityListBoxDataGrid_OnCellPointerPressed(object sender, DataGridCellPointerPressedEventArgs e)
+        {
+            ViewModels.PriorityListBoxViewModel viewModel = (ViewModels.PriorityListBoxViewModel)DataContext;
+            if (e.PointerPressedEventArgs.ClickCount != 2) return;
+            if (e.Column.DisplayIndex != 1) return;
+            if (viewModel == null)
+                return;
+            viewModel.lbxCollection_DoubleClick(sender, e);
+        }
+        
+        // This is a really hacky way to prevent the priority from being edited twice.
+        // I think OnCellEditEnding is being called twice since it is removed and then added which focuses the textbox again and retriggers
+        private bool _isEditingPriority;
+        
+        private void PriorityListBoxDataGrid_OnCellEditEnding(object sender, DataGridCellEditEndingEventArgs e)
+        {
+            if (_isEditingPriority) return;
+            if (e.EditAction != DataGridEditAction.Commit) return;
+            if (e.Column.DisplayIndex != 0) return;
+            
+            var textBox = e.EditingElement as TextBox;
+            if (textBox == null) return;
+        
+            Priority? newPriority = ParsePriority(textBox.Text);
+            if (newPriority == null) return;
+        
+            e.Cancel = true;
+        
+            _isEditingPriority = true;
+            PriorityListBoxViewModel viewModel = (PriorityListBoxViewModel)DataContext;
+            viewModel?.ChangePriority(newPriority.Value);
+            _isEditingPriority = false;
         }
     }
 }
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/PriorityListBoxViewModel.cs b/RogueEssence.Editor.Avalonia/DataEditor/PriorityListBoxViewModel.cs
index 5ead0df1..229b06eb 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/PriorityListBoxViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/PriorityListBoxViewModel.cs
@@ -36,7 +36,7 @@ public string DisplayValue
         {
             get { return conv.GetString(value); }
         }
-
+        
         private StringConv conv;
 
 
@@ -50,8 +50,6 @@ public PriorityElement(StringConv conv, Priority priority, object value)
 
     public class PriorityListBoxViewModel : ViewModelBase
     {
-        public bool CanMoveUp => SelectedIndex > 0;
-        public bool CanMoveDown => SelectedIndex >= 0 && SelectedIndex < Collection.Count - 1;
         public bool HasSelection => SelectedIndex >= 0 && SelectedIndex < Collection.Count;
         public ObservableCollection<PriorityElement> Collection { get; }
 
@@ -65,13 +63,9 @@ public int SelectedIndex
 
         public delegate void EditElementOp(Priority priority, int index, object element);
         public delegate void ElementOp(Priority priority, int index, object element, bool advancedEdit, EditElementOp op);
-
-        public delegate void EditPriorityOp(Priority priority, int index, Priority newPriority);
-        public delegate void PriorityOp(Priority priority, int index, bool advancedEdit, EditPriorityOp op);
-
+        
         public ElementOp OnEditItem;
-        public PriorityOp OnEditPriority;
-
+      
         public StringConv StringConv;
         
         private IDialogService _dialogService;
@@ -86,15 +80,11 @@ public PriorityListBoxViewModel(IDialogService dialogService, StringConv conv)
             
             this.WhenAnyValue(x => x.SelectedIndex).Subscribe(_ =>
             {
-                this.RaisePropertyChanged(nameof(CanMoveUp));
-                this.RaisePropertyChanged(nameof(CanMoveDown));
                 this.RaisePropertyChanged(nameof(HasSelection));
             });
 
             Collection.CollectionChanged += (_, _) =>
             {
-                this.RaisePropertyChanged(nameof(CanMoveUp));
-                this.RaisePropertyChanged(nameof(CanMoveDown));
                 this.RaisePropertyChanged(nameof(HasSelection));
             };
         }
@@ -171,11 +161,19 @@ private int findBoxIndex(Priority priority, int index)
             return Collection.Count;
         }
 
-        public void lbxCollection_DoubleClick(object sender, PointerReleasedEventArgs e)
+        public void ChangePriority(Priority newPriority)
+        {
+            if (SelectedIndex >= 0)
+            {
+                changePriority(SelectedIndex, newPriority);
+            }
+        }
+        
+        public void lbxCollection_DoubleClick(object sender, DataGridCellPointerPressedEventArgs e)
         {
             //int boxIndex = lbxCollection.IndexFromPoint(e.X, e.Y);
             int boxIndex = SelectedIndex;
-            KeyModifiers modifiers = e.KeyModifiers;
+            KeyModifiers modifiers = e.PointerPressedEventArgs.KeyModifiers;
             bool advancedEdit = modifiers.HasFlag(KeyModifiers.Shift);
             if (boxIndex > -1)
             {
@@ -276,7 +274,7 @@ public void btnDown_Click()
             }
         }
 
-        private void changePriority(Priority priority, int index, Priority newPriority)
+        private void changePriority(int index, Priority newPriority)
         {
             PriorityElement item = Collection[index];
             Collection.RemoveAt(index);
@@ -285,17 +283,7 @@ private void changePriority(Priority priority, int index, Priority newPriority)
             Collection.Insert(newBoxIndex, new PriorityElement(StringConv, newPriority, item.Value));
             SelectedIndex = newBoxIndex;
         }
-
-        public void btnEditKey_Click(bool advancedEdit)
-        {
-            if (SelectedIndex > -1)
-            {
-                Priority priority = Collection[SelectedIndex].Priority;
-                OnEditPriority(priority, SelectedIndex, advancedEdit, changePriority);
-            }
-        }
-
-
+        
         /// <summary>
         /// Gets the lowest tier in which the two priorities differ.
         /// If two priorities are the same up to the last tier of one of them, that tier is selected instead.
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/RangeDictBox.axaml b/RogueEssence.Editor.Avalonia/DataEditor/RangeDictBox.axaml
index 3a46a8f4..785cc83e 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/RangeDictBox.axaml
+++ b/RogueEssence.Editor.Avalonia/DataEditor/RangeDictBox.axaml
@@ -17,22 +17,22 @@
 
   <Grid RowDefinitions="*, 42" ColumnDefinitions="*, 30">
 
-    <DataGrid Name="gridItems"
-              IsReadOnly="true"
+    <DataGrid x:Name="RangeDictBoxDataGrid"
+              IsReadOnly="False"
               HorizontalAlignment="Stretch"
               ItemsSource="{Binding Collection}"
               SelectedIndex="{Binding CurrentElement, Mode=TwoWay}"
-              DoubleTapped="doubleClickStart"
-              PointerReleased="lbxCollection_DoubleClick"
+              CellPointerPressed="RangeDictBoxDataGrid_OnCellPointerPressed"
+              CellEditEnded="RangeDictBoxDataGrid_OnCellEditEnded"
               Margin="4"
               Grid.Row="0"
               Grid.Column="0"
               MinHeight="60"
               Classes="default">
       <DataGrid.Columns>
-        <DataGridTextColumn Header="Start" Binding="{Binding DisplayStart}" Width="60" />
-        <DataGridTextColumn Header="End"   Binding="{Binding DisplayEnd}"   Width="60" />
-        <DataGridTextColumn Header="Value" Binding="{Binding Path=DisplayValue}" Width="*" />
+        <DataGridTextColumn Header="Start" Binding="{Binding DisplayStart}" Width="60" IsReadOnly="False" />
+        <DataGridTextColumn Header="End"   Binding="{Binding DisplayEnd}"   Width="60" IsReadOnly="False" />
+        <DataGridTextColumn Header="Value" Binding="{Binding DisplayValue}" Width="*"  IsReadOnly="True" />
       </DataGrid.Columns>
     </DataGrid>
 
@@ -49,20 +49,20 @@
       </Button>
     </StackPanel>
 
-    <Grid Grid.Row="1" Grid.Column="0" ColumnDefinitions="Auto, *, Auto, *">
-      <TextBlock VerticalAlignment="Center" Margin="4,0" Grid.Column="0">Start:</TextBlock>
-      <NumericUpDown IsEnabled="{Binding Path=CurrentElement, Converter={StaticResource ValidIdxConverter}, ConverterParameter=false}"
-                     Value="{Binding CurrentStart}"
-                     Increment="1"
-                     ValueChanged="nudStart_ValueChanged"
-                     Margin="4" Grid.Column="1"/>
-      <TextBlock VerticalAlignment="Center" Margin="4,0" Grid.Column="2">End:</TextBlock>
-      <NumericUpDown IsEnabled="{Binding Path=CurrentElement, Converter={StaticResource ValidIdxConverter}, ConverterParameter=false}"
-                     Value="{Binding CurrentEnd}"
-                     Increment="1"
-                     ValueChanged="nudEnd_ValueChanged"
-                     Margin="4" Grid.Column="3"/>
-    </Grid>
+    <!-- <Grid Grid.Row="1" Grid.Column="0" ColumnDefinitions="Auto, *, Auto, *"> -->
+    <!--   <TextBlock VerticalAlignment="Center" Margin="4,0" Grid.Column="0">Start:</TextBlock> -->
+    <!--   <NumericUpDown IsEnabled="{Binding Path=CurrentElement, Converter={StaticResource ValidIdxConverter}, ConverterParameter=false}" -->
+    <!--                  Value="{Binding CurrentStart}" -->
+    <!--                  Increment="1" -->
+    <!--                  ValueChanged="nudStart_ValueChanged" -->
+    <!--                  Margin="4" Grid.Column="1"/> -->
+    <!--   <TextBlock VerticalAlignment="Center" Margin="4,0" Grid.Column="2">End:</TextBlock> -->
+    <!--   <NumericUpDown IsEnabled="{Binding Path=CurrentElement, Converter={StaticResource ValidIdxConverter}, ConverterParameter=false}" -->
+    <!--                  Value="{Binding CurrentEnd}" -->
+    <!--                  Increment="1" -->
+    <!--                  ValueChanged="nudEnd_ValueChanged" -->
+    <!--                  Margin="4" Grid.Column="3"/> -->
+    <!-- </Grid> -->
 
   </Grid>
 </UserControl>
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/RangeDictBox.axaml.cs b/RogueEssence.Editor.Avalonia/DataEditor/RangeDictBox.axaml.cs
index bba066f3..4fa7498f 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/RangeDictBox.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/RangeDictBox.axaml.cs
@@ -8,6 +8,7 @@
 using System.Reactive.Subjects;
 using Avalonia.VisualTree;
 using Avalonia.Input;
+using RogueEssence.Dev.ViewModels;
 
 namespace RogueEssence.Dev.Views
 {
@@ -18,41 +19,38 @@ public RangeDictBox()
             this.InitializeComponent();
         }
         
-
-        bool doubleclick;
-        public void doubleClickStart(object sender, RoutedEventArgs e)
+        
+        public void SetListContextMenu(ContextMenu menu)
         {
-            doubleclick = true;
+            RangeDictBoxDataGrid.ContextMenu = menu;
         }
 
-        public void lbxCollection_DoubleClick(object sender, PointerReleasedEventArgs e)
+        private void RangeDictBoxDataGrid_OnCellPointerPressed(object sender, DataGridCellPointerPressedEventArgs e)
         {
-            if (!doubleclick)
-                return;
-            doubleclick = false;
+            if (e.PointerPressedEventArgs.ClickCount != 2) return;
+            if (e.Column.DisplayIndex != 2) return; // Value column only
 
-            ViewModels.RangeDictBoxViewModel viewModel = (ViewModels.RangeDictBoxViewModel)DataContext;
-            if (viewModel == null)
-                return;
+            RangeDictBoxViewModel viewModel = (RangeDictBoxViewModel)DataContext;
+            if (viewModel == null) return;
             viewModel.lbxCollection_DoubleClick(sender, e);
         }
 
-        public void nudStart_ValueChanged(object sender, NumericUpDownValueChangedEventArgs e)
+        private void RangeDictBoxDataGrid_OnCellEditEnded(object sender, DataGridCellEditEndedEventArgs e)
         {
-            ViewModels.RangeDictBoxViewModel viewModel = (ViewModels.RangeDictBoxViewModel)DataContext;
-            viewModel.AdjustOtherLimit((int)e.NewValue, false);
-        }
+            if (e.EditAction != DataGridEditAction.Commit) return;
 
-        public void nudEnd_ValueChanged(object sender, NumericUpDownValueChangedEventArgs e)
-        {
-            ViewModels.RangeDictBoxViewModel viewModel = (ViewModels.RangeDictBoxViewModel)DataContext;
-            viewModel.AdjustOtherLimit((int)e.NewValue, true);
-        }
+            var element = (RangeDictElement)e.Row.DataContext;
+            var columnIndex = e.Column.DisplayIndex;
 
-        public void SetListContextMenu(ContextMenu menu)
-        {
-            DataGrid lbx = this.FindControl<DataGrid>("gridItems");
-            lbx.ContextMenu = menu;
+            RangeDictBoxViewModel viewModel = (RangeDictBoxViewModel)DataContext;
+            if (viewModel == null) return;
+
+            // Start
+            if (columnIndex == 0) 
+                viewModel.AdjustOtherLimit(element.DisplayStart, false);
+            // End
+            else if (columnIndex == 1)
+                viewModel.AdjustOtherLimit(element.DisplayEnd, true);
         }
     }
 }
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/RangeDictBoxViewModel.cs b/RogueEssence.Editor.Avalonia/DataEditor/RangeDictBoxViewModel.cs
index 152bf01c..daf8f0fa 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/RangeDictBoxViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/RangeDictBoxViewModel.cs
@@ -42,14 +42,22 @@ public int End
         public int DisplayStart
         {
             get { return start + addMin; }
-            set { this.RaisePropertyChanged(); }
+            set 
+            { 
+                start = value - addMin;
+                this.RaisePropertyChanged();
+            }
         }
+
         public int DisplayEnd
         {
             get { return end + addMax; }
-            set { this.RaisePropertyChanged(); }
+            set 
+            { 
+                end = value - addMax;
+                this.RaisePropertyChanged();
+            }
         }
-
         private object value;
         public object Value
         {
@@ -298,7 +306,7 @@ private int getIndexFromKey(IntRange key)
         }
 
 
-        public void lbxCollection_DoubleClick(object sender, RoutedEventArgs e)
+        public void lbxCollection_DoubleClick(object sender, DataGridCellPointerPressedEventArgs e)
         {
             //int index = lbxDictionary.IndexFromPoint(e.X, e.Y);
             int index = CurrentElement;
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/SpawnListBox.axaml b/RogueEssence.Editor.Avalonia/DataEditor/SpawnListBox.axaml
index b946fd6f..120549bf 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/SpawnListBox.axaml
+++ b/RogueEssence.Editor.Avalonia/DataEditor/SpawnListBox.axaml
@@ -19,23 +19,23 @@
     <Grid RowDefinitions="*, 42" ColumnDefinitions="*, 30">
 
         <DataGrid Name="gridItems"
-                  IsReadOnly="true"
+                  x:Name="SpawnListBoxDataGrid"
                   HorizontalAlignment="Stretch"
                   ItemsSource="{Binding Collection}"
                   SelectedIndex="{Binding CurrentElement, Mode=TwoWay}"
-                  DoubleTapped="doubleClickStart"
-                  PointerReleased="gridCollection_DoubleClick"
+                  CellEditEnded="SpawnListBoxDataGrid_OnCellEditEnded"
+                  CellPointerPressed="SpawnListBoxDataGrid_OnCellPointerPressed"
                   Margin="4"
                   Grid.Row="0"
                   Grid.Column="0"
                   MinHeight="50"
                   Classes="default">
             <DataGrid.Columns>
-                <DataGridTextColumn Header="Weight" Binding="{Binding Weight}" Width="70" />
-                <DataGridTextColumn Header="Chance"
+                <DataGridTextColumn IsReadOnly="False" Header="Weight" Binding="{Binding Weight}" Width="70" />
+                <DataGridTextColumn IsReadOnly="True" Header="Chance"
                                     Binding="{Binding Path=Chance, Converter={StaticResource PercentConverter}, Mode=OneWay}"
                                     Width="80" />
-                <DataGridTextColumn Header="Value" Binding="{Binding Path=DisplayValue}" Width="*" />
+                <DataGridTextColumn IsReadOnly="True" Header="Value" Binding="{Binding Path=DisplayValue}" Width="*" />
             </DataGrid.Columns>
         </DataGrid>
 
@@ -66,17 +66,7 @@
                 </Button>
             </StackPanel>
         </StackPanel>
-
-        <Grid Grid.Row="1" Grid.Column="0" ColumnDefinitions="*, Auto">
-            <TextBlock VerticalAlignment="Center" HorizontalAlignment="Right" Margin="4" Grid.Column="0">Weight:</TextBlock>
-            <NumericUpDown Increment="1"
-                           IsEnabled="{Binding Path=CurrentElement, Converter={StaticResource ValidIdxConverter}, ConverterParameter=false}"
-                           Value="{Binding CurrentWeight}"
-                           Minimum="1"
-                           Margin="4" Grid.Column="1"
-                           Width="100" />
-        </Grid>
-
+        
     </Grid>
 
 </UserControl>
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/SpawnListBox.axaml.cs b/RogueEssence.Editor.Avalonia/DataEditor/SpawnListBox.axaml.cs
index d5d141fb..81785364 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/SpawnListBox.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/SpawnListBox.axaml.cs
@@ -18,32 +18,12 @@ public partial class SpawnListBox : UserControl
         public SpawnListBox()
         {
             this.InitializeComponent();
-            Button button = this.FindControl<Button>("SpawnListBoxAddButton");
-            button.AddHandler(PointerReleasedEvent, SpawnListBoxAddButton_OnPointerReleased, RoutingStrategies.Tunnel);
+            SpawnListBoxAddButton.AddHandler(PointerReleasedEvent, SpawnListBoxAddButton_OnPointerReleased, RoutingStrategies.Tunnel);
         }
         
-        bool doubleclick;
-        public void doubleClickStart(object sender, RoutedEventArgs e)
-        {
-            doubleclick = true;
-        }
-
-        public void gridCollection_DoubleClick(object sender, PointerReleasedEventArgs e)
-        {
-            if (!doubleclick)
-                return;
-            doubleclick = false;
-
-            ViewModels.SpawnListBoxViewModel viewModel = (ViewModels.SpawnListBoxViewModel)DataContext;
-            if (viewModel == null)
-                return;
-            viewModel.gridCollection_DoubleClick(sender, e);
-        }
-
         public void SetListContextMenu(ContextMenu menu)
         {
-            DataGrid lbx = this.FindControl<DataGrid>("gridItems");
-            lbx.ContextMenu = menu;
+            gridItems.ContextMenu = menu;
         }
 
         private void SpawnListBoxAddButton_OnPointerReleased(object sender, PointerReleasedEventArgs e)
@@ -53,5 +33,28 @@ private void SpawnListBoxAddButton_OnPointerReleased(object sender, PointerRelea
             SpawnListBoxViewModel vm = (SpawnListBoxViewModel) DataContext;
             vm.btnAdd_Click(advancedEdit);
         }
+
+        private void SpawnListBoxDataGrid_OnCellEditEnded(object sender, DataGridCellEditEndedEventArgs e)
+        {
+            if (e.EditAction != DataGridEditAction.Commit) return;
+    
+            var element = (SpawnListElement)e.Row.DataContext;
+            var columnIndex = e.Column.DisplayIndex;
+
+            ViewModels.SpawnListBoxViewModel viewModel = (ViewModels.SpawnListBoxViewModel)DataContext;
+            if (viewModel == null) return;
+            viewModel.CurrentWeight = element.Weight;
+        }
+
+        private void SpawnListBoxDataGrid_OnCellPointerPressed(object sender, DataGridCellPointerPressedEventArgs e)
+        {
+            if (e.PointerPressedEventArgs.ClickCount != 2) return;
+            if (e.Column.DisplayIndex != 2) return;
+
+            ViewModels.SpawnListBoxViewModel viewModel = (ViewModels.SpawnListBoxViewModel)DataContext;
+            if (viewModel == null)
+                return;
+            viewModel.gridCollection_DoubleClick(sender, e);
+        }
     }
 }
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/SpawnListBoxViewModel.cs b/RogueEssence.Editor.Avalonia/DataEditor/SpawnListBoxViewModel.cs
index 17f18c56..b270deac 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/SpawnListBoxViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/SpawnListBoxViewModel.cs
@@ -198,11 +198,11 @@ public void InsertOnKey(int index, object element)
             CurrentElement = index;
         }
 
-        public void gridCollection_DoubleClick(object sender, PointerReleasedEventArgs e)
+        public void gridCollection_DoubleClick(object sender, DataGridCellPointerPressedEventArgs e)
         {
             //int index = lbxCollection.IndexFromPoint(e.X, e.Y);
             int index = CurrentElement;
-            KeyModifiers modifiers = e.KeyModifiers;
+            KeyModifiers modifiers = e.PointerPressedEventArgs.KeyModifiers;
             bool advancedEdit = modifiers.HasFlag(KeyModifiers.Shift);
             if (index > -1)
             {
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/SpawnRangeListBox.axaml b/RogueEssence.Editor.Avalonia/DataEditor/SpawnRangeListBox.axaml
index b418ea4e..8c95a0a4 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/SpawnRangeListBox.axaml
+++ b/RogueEssence.Editor.Avalonia/DataEditor/SpawnRangeListBox.axaml
@@ -19,23 +19,22 @@
   <Grid RowDefinitions="*, 42" ColumnDefinitions="*, 30">
 
     <!-- DataGrid: row 0 only, first column -->
-    <DataGrid Name="gridItems"
-              IsReadOnly="true"
+    <DataGrid x:Name="SpawnRangeListDataGrid"
               HorizontalAlignment="Stretch"
               ItemsSource="{Binding Collection}"
               SelectedIndex="{Binding CurrentElement, Mode=TwoWay}"
-              DoubleTapped="doubleClickStart"
-              PointerReleased="gridCollection_DoubleClick"
+              CellEditEnded="SpawnRangeListDataGrid_OnCellEditEnded"
+              CellPointerPressed="SpawnRangeListDataGrid_OnCellPointerPressed"
               Margin="4"
               Grid.Row="0"
               Grid.Column="0"
               MinHeight="50"
               Classes="default">
       <DataGrid.Columns>
-        <DataGridTextColumn Header="Start"  Binding="{Binding DisplayStart}" Width="70" />
+        <DataGridTextColumn Header="Start" Binding="{Binding DisplayStart}" Width="70" />
         <DataGridTextColumn Header="End" Binding="{Binding DisplayEnd}" Width="70" />
         <DataGridTextColumn Header="Weight" Binding="{Binding Weight}" Width="70" />
-        <DataGridTextColumn Header="Value"  Binding="{Binding Path=DisplayValue}" Width="*" />
+        <DataGridTextColumn Header="Value" IsReadOnly="True"  Binding="{Binding Path=DisplayValue}" Width="*" />
       </DataGrid.Columns>
     </DataGrid>
 
@@ -67,23 +66,23 @@
       </StackPanel>
     </StackPanel>
     
-    <Grid Grid.Row="1" Grid.Column="0" ColumnDefinitions="Auto, *, Auto, *, Auto, *">
-      <TextBlock VerticalAlignment="Center" Margin="4,0" Grid.Column="0">Start:</TextBlock>
-      <NumericUpDown IsEnabled="{Binding Path=CurrentElement, Converter={StaticResource ValidIdxConverter}, ConverterParameter=false}"
-                     Value="{Binding CurrentStart}"
-                     ValueChanged="nudStart_ValueChanged"
-                     Margin="4" Grid.Column="1"/>
-      <TextBlock VerticalAlignment="Center" Margin="4,0" Grid.Column="2">End:</TextBlock>
-      <NumericUpDown IsEnabled="{Binding Path=CurrentElement, Converter={StaticResource ValidIdxConverter}, ConverterParameter=false}"
-                     Value="{Binding CurrentEnd}"
-                     ValueChanged="nudEnd_ValueChanged"
-                     Margin="4" Grid.Column="3"/>
-      <TextBlock VerticalAlignment="Center" Margin="4,0" Grid.Column="4">Weight:</TextBlock>
-      <NumericUpDown IsEnabled="{Binding Path=CurrentElement, Converter={StaticResource ValidIdxConverter}, ConverterParameter=false}"
-                     Value="{Binding CurrentWeight}"
-                     Minimum="1"
-                     Margin="4" Grid.Column="5"/>
-    </Grid>
+    <!-- <Grid Grid.Row="1" Grid.Column="0" ColumnDefinitions="Auto, *, Auto, *, Auto, *"> -->
+    <!--   <TextBlock VerticalAlignment="Center" Margin="4,0" Grid.Column="0">Start:</TextBlock> -->
+    <!--   <NumericUpDown IsEnabled="{Binding Path=CurrentElement, Converter={StaticResource ValidIdxConverter}, ConverterParameter=false}" -->
+    <!--                  Value="{Binding CurrentStart}" -->
+    <!--                  ValueChanged="nudStart_ValueChanged" -->
+    <!--                  Margin="4" Grid.Column="1"/> -->
+    <!--   <TextBlock VerticalAlignment="Center" Margin="4,0" Grid.Column="2">End:</TextBlock> -->
+    <!--   <NumericUpDown IsEnabled="{Binding Path=CurrentElement, Converter={StaticResource ValidIdxConverter}, ConverterParameter=false}" -->
+    <!--                  Value="{Binding CurrentEnd}" -->
+    <!--                  ValueChanged="nudEnd_ValueChanged" -->
+    <!--                  Margin="4" Grid.Column="3"/> -->
+    <!--   <TextBlock VerticalAlignment="Center" Margin="4,0" Grid.Column="4">Weight:</TextBlock> -->
+    <!--   <NumericUpDown IsEnabled="{Binding Path=CurrentElement, Converter={StaticResource ValidIdxConverter}, ConverterParameter=false}" -->
+    <!--                  Value="{Binding CurrentWeight}" -->
+    <!--                  Minimum="1" -->
+    <!--                  Margin="4" Grid.Column="5"/> -->
+    <!-- </Grid> -->
 
   </Grid>
 </UserControl>
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/SpawnRangeListBox.axaml.cs b/RogueEssence.Editor.Avalonia/DataEditor/SpawnRangeListBox.axaml.cs
index a3100c08..a25dd90a 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/SpawnRangeListBox.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/SpawnRangeListBox.axaml.cs
@@ -18,27 +18,21 @@ public partial class SpawnRangeListBox : UserControl
         public SpawnRangeListBox()
         {
             this.InitializeComponent();
-            Button button = this.FindControl<Button>("SpawnRangeListBoxAddButton");
-            button.AddHandler(PointerReleasedEvent, SpawnRangeListBoxAddButton_OnPointerReleased, RoutingStrategies.Tunnel);
-        }
-        
-        bool doubleclick;
-        public void doubleClickStart(object sender, RoutedEventArgs e)
-        {
-            doubleclick = true;
+            SpawnRangeListBoxAddButton.AddHandler(PointerReleasedEvent, SpawnRangeListBoxAddButton_OnPointerReleased, RoutingStrategies.Tunnel);
         }
+  
 
-        public void gridCollection_DoubleClick(object sender, PointerReleasedEventArgs e)
-        {
-            if (!doubleclick)
-                return;
-            doubleclick = false;
-
-            ViewModels.SpawnRangeListBoxViewModel viewModel = (ViewModels.SpawnRangeListBoxViewModel)DataContext;
-            if (viewModel == null)
-                return;
-            viewModel.gridCollection_DoubleClick(sender, e);
-        }
+        // public void gridCollection_DoubleClick(object sender, PointerReleasedEventArgs e)
+        // {
+        //     if (!doubleclick)
+        //         return;
+        //     doubleclick = false;
+        //
+        //     ViewModels.SpawnRangeListBoxViewModel viewModel = (ViewModels.SpawnRangeListBoxViewModel)DataContext;
+        //     if (viewModel == null)
+        //         return;
+        //     viewModel.gridCollection_DoubleClick(sender, e);
+        // }
 
         public void nudStart_ValueChanged(object sender, NumericUpDownValueChangedEventArgs e)
         {
@@ -54,8 +48,7 @@ public void nudEnd_ValueChanged(object sender, NumericUpDownValueChangedEventArg
 
         public void SetListContextMenu(ContextMenu menu)
         {
-            DataGrid lbx = this.FindControl<DataGrid>("gridItems");
-            lbx.ContextMenu = menu;
+            SpawnRangeListDataGrid.ContextMenu = menu;
         }
 
         private void SpawnRangeListBoxAddButton_OnPointerReleased(object sender, PointerReleasedEventArgs e)
@@ -65,5 +58,38 @@ private void SpawnRangeListBoxAddButton_OnPointerReleased(object sender, Pointer
             SpawnRangeListBoxViewModel vm = (SpawnRangeListBoxViewModel) DataContext;
             vm.btnAdd_Click(advancedEdit);
         }
+
+       
+
+        private void SpawnRangeListDataGrid_OnCellPointerPressed(object sender, DataGridCellPointerPressedEventArgs e)
+        {
+            if (e.PointerPressedEventArgs.ClickCount != 2) return;
+            if (e.Column.DisplayIndex != 3) return;
+
+            ViewModels.SpawnRangeListBoxViewModel viewModel = (ViewModels.SpawnRangeListBoxViewModel)DataContext;
+            if (viewModel == null)
+                return;
+            viewModel.gridCollection_DoubleClick(sender, e);
+        }
+
+        private void SpawnRangeListDataGrid_OnCellEditEnded(object sender, DataGridCellEditEndedEventArgs e)
+        {
+            if (e.EditAction != DataGridEditAction.Commit) return;
+    
+            var element = (SpawnRangeListElement)e.Row.DataContext;
+            var columnIndex = e.Column.DisplayIndex;
+
+            ViewModels.SpawnRangeListBoxViewModel viewModel = (ViewModels.SpawnRangeListBoxViewModel)DataContext;
+            if (viewModel == null) return;
+
+            
+            // Start Column
+            if (columnIndex == 0)
+                viewModel.AdjustOtherLimit(element.DisplayStart, false);
+            
+            // End Column
+            else if (columnIndex == 1) 
+                viewModel.AdjustOtherLimit(element.DisplayEnd, true);
+        }
     }
 }
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/SpawnRangeListBoxViewModel.cs b/RogueEssence.Editor.Avalonia/DataEditor/SpawnRangeListBoxViewModel.cs
index 391e058b..219af40f 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/SpawnRangeListBoxViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/SpawnRangeListBoxViewModel.cs
@@ -6,6 +6,7 @@
 using Avalonia.Interactivity;
 using Avalonia.Controls;
 using Avalonia.Input;
+using Avalonia.VisualTree;
 using RogueElements;
 using RogueEssence.Dev.Services;
 using RogueEssence.Dev.Views;
@@ -39,14 +40,22 @@ public int End
         public int DisplayStart
         {
             get { return start + addMin; }
-            set { this.RaisePropertyChanged(); }
+            set 
+            { 
+                start = value - addMin;
+                this.RaisePropertyChanged();
+            }
         }
+
         public int DisplayEnd
         {
             get { return end + addMax; }
-            set { this.RaisePropertyChanged(); }
+            set 
+            { 
+                end = value - addMax;
+                this.RaisePropertyChanged();
+            }
         }
-
         private int weight;
         public int Weight
         {
@@ -253,15 +262,37 @@ public void InsertOnKey(int index, object element)
             Collection.Insert(index, new SpawnRangeListElement(StringConv, AddMin, AddMax, start, end, rate, element));
             CurrentElement = index;
         }
-
-        public void gridCollection_DoubleClick(object sender, PointerReleasedEventArgs e)
+        
+        // public void gridCollection_DoubleClick(object sender, PointerReleasedEventArgs e)
+        // {
+        //     var source = e.Source as Control;
+        //     var cell = source?.FindAncestorOfType<DataGridCell>();
+        //     if (cell == null) return;
+        //     
+        //     Console.WriteLine(cell);
+        //     // cell.
+        //
+        //     // var columnIndex = ((DataGrid)sender).Columns.;
+        //     // if (columnIndex != 3) return; // Value column only
+        //
+        //     int index = CurrentElement;
+        //     if (index > -1)
+        //     {
+        //         SpawnRangeListElement element = Collection[index];
+        //         bool advancedEdit = e.KeyModifiers.HasFlag(KeyModifiers.Shift);
+        //         OnEditItem?.Invoke(index, element.Value, advancedEdit, editItem);
+        //     }
+        // }
+        //
+
+        public void gridCollection_DoubleClick(object sender, DataGridCellPointerPressedEventArgs e)
         {
             //int index = lbxCollection.IndexFromPoint(e.X, e.Y);
             int index = CurrentElement;
             if (index > -1)
             {
                 SpawnRangeListElement element = Collection[index];
-                KeyModifiers modifiers = e.KeyModifiers;
+                KeyModifiers modifiers = e.PointerPressedEventArgs.KeyModifiers;
                 bool advancedEdit = modifiers.HasFlag(KeyModifiers.Shift);
                 OnEditItem?.Invoke(index, element.Value, advancedEdit, editItem);
             }
diff --git a/RogueEssence.Editor.Avalonia/EditorContext/TabEvents.cs b/RogueEssence.Editor.Avalonia/EditorContext/TabEvents.cs
index 5ea61c67..dca9bea2 100644
--- a/RogueEssence.Editor.Avalonia/EditorContext/TabEvents.cs
+++ b/RogueEssence.Editor.Avalonia/EditorContext/TabEvents.cs
@@ -16,13 +16,12 @@ public class TabEvents
         
         public event Action<OpenEditorNode>? AddPageFromTreeNodeEvent;
 
-        public event Action<EditorPageViewModel>? TryNavigateToParentTabEvent;
-        
-        public void TryNavigateToParentTab(EditorPageViewModel page)
+        public event Func<EditorPageViewModel, PageNode>? GetPageNodeFunc;
+
+        public PageNode GetPageNode(EditorPageViewModel page)
         {
-            TryNavigateToParentTabEvent?.Invoke(page);
+            return GetPageNodeFunc?.Invoke(page);
         }
-
         
         // Used for closing tabs when a data entry is deleted
         public event Action<string, DataManager.DataType>? CloseTabsForEntry;
diff --git a/RogueEssence.Editor.Avalonia/RogueEssence.Editor.Avalonia.csproj b/RogueEssence.Editor.Avalonia/RogueEssence.Editor.Avalonia.csproj
index 0261a355..ba8b821f 100644
--- a/RogueEssence.Editor.Avalonia/RogueEssence.Editor.Avalonia.csproj
+++ b/RogueEssence.Editor.Avalonia/RogueEssence.Editor.Avalonia.csproj
@@ -269,6 +269,10 @@
       <DependentUpon>MapLayerWindowView.axaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
+    <Compile Update="Views\DialogBoxes\ReflectedDataWindowView.axaml.cs">
+      <DependentUpon>ReflectedDataWindowView.axaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Models\" />
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevFormViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevFormViewModel.cs
index 80cb98fe..bdf86224 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevFormViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevFormViewModel.cs
@@ -348,57 +348,72 @@ public async Task<bool> CloseAllAsync()
     public void TryNavigateToParent(EditorPageViewModel page)
     {
         if (!_pageToNodeMap.TryGetValue(page, out PageNode node))
+        {
+            Console.Write("Could not find node for page: " + page.Title);
+        }
             return;
-        
-        var parent = node.Parent;
+        PageNode parent = node.Parent;
         if (parent != null)
-        {
             ActivePage = parent.Page;
-        }
-        
     }
-    
+
+    // private PageNode FindNode(IEnumerable<PageNode> nodes, EditorPageViewModel page)
+    // {
+    //     foreach (var node in nodes)
+    //     {
+    //         if (node.Page.Equals(page))
+    //             return node;
+    //
+    //         var found = FindNode(node.SubNodes.Cast<PageNode>(), page);
+    //         if (found != null)
+    //             return found;
+    //     }
+    //     return null;
+    // }
+    //
     public void RemoveTab(EditorPageViewModel page, bool tryNavigateToParent = false)
     {
         if (!_pageToNodeMap.TryGetValue(page, out PageNode node))
             return;
 
-        int removeIdx = Pages.IndexOf(page);
-        bool wasActive = page.Equals(ActivePage);
-
-        ClosePageAndChildren(node);
-
-
-        if (tryNavigateToParent)
-        {
-            var parent = node.Parent;
-            if (parent != null)
-            {
-                ActivePage = parent.Page;
-                return;
-            }
-        }
+        PageNode parent = node.Parent;
+        HashSet<EditorPageViewModel> toRemoveSet = CollectPages(node).ToHashSet();
         
-        
-
-        if (Pages.Count == 0)
+        bool activeIsAffected = toRemoveSet.Contains(ActivePage);
+        if (activeIsAffected)
         {
-            ActivePage = null;
-        }
-        else if (wasActive)
-        {
-            // try right tab, then left tab
-            if (removeIdx < Pages.Count)
+            bool navigateToParent = tryNavigateToParent && parent != null && !toRemoveSet.Contains(parent.Page);
+            int removeIdx = Pages.IndexOf(page);
+
+            
+            // First try the parent tab
+            if (navigateToParent)
             {
-                ActivePage = Pages[removeIdx];
+                ActivePage = parent.Page;
             }
+            
+            // Then try the right tab or left tab, whichever is available first and is NOT being removed when closing the current tab
             else
             {
-                ActivePage = Pages[removeIdx - 1];
+                EditorPageViewModel rightTab = Pages.Skip(removeIdx + 1).FirstOrDefault(p => !toRemoveSet.Contains(p));
+                EditorPageViewModel leftTab = Pages.Take(removeIdx).LastOrDefault(p => !toRemoveSet.Contains(p));
+                ActivePage = rightTab ?? leftTab;
             }
         }
+        
+        // Finally, we can close all the tabs now
+        ClosePageAndChildren(node);
     }
 
+    private List<EditorPageViewModel> CollectPages(PageNode node)
+    {
+        var result = new List<EditorPageViewModel>();
+        foreach (var child in node.SubNodes.Cast<PageNode>())
+            result.AddRange(CollectPages(child));
+        result.Add(node.Page);
+        return result;
+    }
+    
     public async Task SaveChildren(EditorPageViewModel page)
     {
         if (!_pageToNodeMap.TryGetValue(page, out var pageNode))
@@ -415,25 +430,18 @@ public async Task SaveChildren(EditorPageViewModel page)
     
     private void ClosePageAndChildren(PageNode node)
     {
-        var children = node.SubNodes.Cast<PageNode>().ToList();
-        foreach (var child in children)
+        var allPages = CollectPages(node);
+
+        foreach (var page in allPages)
         {
-            ClosePageAndChildren(child);
+            Pages.Remove(page);
+            _pageToNodeMap.Remove(page);
         }
 
-        Pages.Remove(node.Page);
-
-
         if (node.IsTopLevel)
-        {
             TopLevelPages.Remove(node);
-        }
         else
-        {
             node.Parent.RemoveChild(node);
-        }
-
-        _pageToNodeMap.Remove(node.Page);
     }
 
     private ObservableCollection<NodeBase> _nodes = new();
@@ -484,7 +492,7 @@ public DevFormViewModel(EditorContext context, DevTabGameViewModel game, DevTabP
         EditorPageViewModel? previousPage = null;
         this.WhenAnyValue(x => x.ActivePage).Subscribe(page =>
         {
-            Console.WriteLine("Active page changed: " + page?.Title);
+            // Console.WriteLine("Active page changed: " + page?.Title);
             previousPage?.OnPageDeactivated();
             page?.OnPageActivated();
             OnActivePageSet(page);
@@ -833,8 +841,15 @@ private void InitializeTabEvents()
 
         _tabEvents.RemoveTabEvent += (tab) => { RemoveTab(tab); };
         
-        _tabEvents.TryNavigateToParentTabEvent += (tab) => { TryNavigateToParent(tab); };
-
+       
+        _tabEvents.GetPageNodeFunc += page =>
+        {
+            if (!_pageToNodeMap.TryGetValue(page, out var node))
+                return null;
+            return node;
+        };
+        
+        
         _tabEvents.NavigateToTabEvent += (tab) => { ActivePage = tab; };
 
         // TODO: Check if this works if the page is a children of a tab. What if it closes the children first before the parent...
@@ -902,6 +917,7 @@ public ModSwitcherViewModel? ModSwitcher
 
     public void AddPageFromTreeNode(OpenEditorNode node)
     {
+        // For the Ground/Map Editor, the game needs to move to it's own editor first
         if (node.EditorType.IsAssignableTo(typeof(IPreCreatePage)))
             node.EditorType.GetMethod("OnPreCreate")?.Invoke(null, null);
 
@@ -940,7 +956,7 @@ public async Task<bool> TryCloseTabAsync(EditorPageViewModel page, bool navigate
         
         
 
-        RemoveTab(page);
+        RemoveTab(page, true);
         page.OnPageRemoved();
         return true;
     }
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/DialogBoxes/ReflectedDataWindowViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/DialogBoxes/ReflectedDataWindowViewModel.cs
new file mode 100644
index 00000000..a83dffd3
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/ViewModels/DialogBoxes/ReflectedDataWindowViewModel.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Threading.Tasks;
+using Avalonia.Controls;
+using ReactiveUI;
+
+namespace RogueEssence.Dev.ViewModels
+{
+    public class ReflectedDataWindowViewModel : ViewModelBase
+    {
+        public Action<StackPanel> OnLoadAction;
+        public Func<StackPanel, Task<bool>> OnOKAction;
+
+        public ReflectedDataWindowViewModel()
+        {
+            
+        }
+    }
+}
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/Pages/ReflectedDataPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/Pages/ReflectedDataPageViewModel.cs
index 1c29a59f..54e63ee7 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/Pages/ReflectedDataPageViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/Pages/ReflectedDataPageViewModel.cs
@@ -46,6 +46,7 @@ public async Task<bool> ApplySave()
         await _context.TabEvents.SaveChildren(this);
         if (AttachedView is ISaveable saveable)
             return await saveable.Save();
+        
         return true;
     }
 
@@ -75,4 +76,16 @@ protected override bool IsSamePage(EditorPageViewModel other)
         
         return otherPage.Node.Equals(Node);
     }
+
+    public PageNode GetPageNode()
+    { 
+        PageNode node = _context.TabEvents.GetPageNode(this);
+        return node;
+    }
+    public void NavigateToTab(EditorPageViewModel page)
+    {
+      
+        _context.TabEvents.NavigateToTab(page);
+        
+    }
 }
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/Pages/SpeciesEditPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/Pages/SpeciesEditPageViewModel.cs
index d8bf3859..d7f16287 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/Pages/SpeciesEditPageViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/Pages/SpeciesEditPageViewModel.cs
@@ -305,31 +305,34 @@ await MessageBoxWindowView.Show(_context.DialogService,
             //remember addresses in registry
             string folderName = DevForm.GetConfig(Name + "Dir", Directory.GetCurrentDirectory());
 
-            //open window to choose directory
-            string? folder = await _context.DialogService.ShowFolderPickerAsync(new FolderPickerOpenOptions
+            await Dispatcher.UIThread.InvokeAsync(async () =>
             {
-                Title = "Select sprite folder to mass import",
-                AllowMultiple = false,
-            }, folderName);
+                //open window to choose directory
+                string? folder = await _context.DialogService.ShowFolderPickerAsync(new FolderPickerOpenOptions
+                {
+                    Title = "Select sprite folder to mass import",
+                    AllowMultiple = false,
+                }, folderName);
 
-            if (string.IsNullOrEmpty(folder))
-                return;
+                if (string.IsNullOrEmpty(folder))
+                    return;
 
-            DevForm.SetConfig(Name + "Dir", folder);
-            CachedPath = folder + "/";
+                DevForm.SetConfig(Name + "Dir", folder);
+                CachedPath = folder + "/";
 
-            try
-            {
-                MassImport(CachedPath);
-            }
-            catch (Exception ex)
-            {
-                DiagManager.Instance.LogError(ex, false);
-                await MessageBoxWindowView.Show(_context.DialogService,
-                    $"Error importing from\n{CachedPath}\n\n{ex.Message}",
-                    "Import Failed", MessageBoxWindowView.MessageBoxButtons.Ok);
-                return;
-            }
+                try
+                {
+                    MassImport(CachedPath);
+                }
+                catch (Exception ex)
+                {
+                    DiagManager.Instance.LogError(ex, false);
+                    await MessageBoxWindowView.Show(_context.DialogService,
+                        $"Error importing from\n{CachedPath}\n\n{ex.Message}",
+                        "Import Failed", MessageBoxWindowView.MessageBoxButtons.Ok);
+                    return;
+                }
+            });
         }
 
         public void mnuMassExportMulti_Click()
@@ -347,22 +350,27 @@ public async void MassExportFlow(bool singleSheet)
             //remember addresses in registry
             string folderName = DevForm.GetConfig(Name + "Dir", Directory.GetCurrentDirectory());
 
-            //open window to choose directory
-            string? folder = await _context.DialogService.ShowFolderPickerAsync(new FolderPickerOpenOptions
+            await Dispatcher.UIThread.InvokeAsync(async () =>
             {
-                Title = "Select folder to mass export to",
-                AllowMultiple = false,
-            }, folderName);
-
-            if (string.IsNullOrEmpty(folder))
-                return;
-            DevForm.SetConfig(Name + "Dir", folder);
-            CachedPath = folder + "/";
+                //open window to choose directory
+                string? folder = await _context.DialogService.ShowFolderPickerAsync(new FolderPickerOpenOptions
+                {
+                    Title = "Select folder to mass export to",
+                    AllowMultiple = false,
+                }, folderName);
 
-            bool success = MassExport(CachedPath, singleSheet);
-            if (!success)
-                await MessageBoxWindowView.Show(_context.DialogService,"Errors found exporting to\n" + CachedPath + "\n\nCheck logs for more info.", "Mass Export Failed",
-                    MessageBoxWindowView.MessageBoxButtons.Ok);
+                if (string.IsNullOrEmpty(folder))
+                    return;
+                DevForm.SetConfig(Name + "Dir", folder);
+                CachedPath = folder + "/";
+
+                bool success = MassExport(CachedPath, singleSheet);
+                if (!success)
+                    await MessageBoxWindowView.Show(_context.DialogService,
+                        "Errors found exporting to\n" + CachedPath + "\n\nCheck logs for more info.",
+                        "Mass Export Failed",
+                        MessageBoxWindowView.MessageBoxButtons.Ok);
+            });
         }
 
         public async void mnuReIndex_Click()
@@ -409,31 +417,34 @@ await MessageBoxWindowView.Show(_context.DialogService, "When importing sprites,
             //remember addresses in registry
             string folderName = DevForm.GetConfig(Name + "Dir", Directory.GetCurrentDirectory());
 
-            //open window to choose directory
-            string? folder = await _context.DialogService.ShowFolderPickerAsync(new FolderPickerOpenOptions
+            await Dispatcher.UIThread.InvokeAsync(async () =>
             {
-                Title = "Select folder to import from",
-                AllowMultiple = false,
-            }, folderName);
+                //open window to choose directory
+                string? folder = await _context.DialogService.ShowFolderPickerAsync(new FolderPickerOpenOptions
+                {
+                    Title = "Select folder to import from",
+                    AllowMultiple = false,
+                }, folderName);
 
-            if (string.IsNullOrEmpty(folder))
-                return;
+                if (string.IsNullOrEmpty(folder))
+                    return;
 
-            DevForm.SetConfig(Name + "Dir", folder);
-            CachedPath = folder + "/";
+                DevForm.SetConfig(Name + "Dir", folder);
+                CachedPath = folder + "/";
 
-            try
-            {
-                Import(CachedPath, formdata);
-            }
-            catch (Exception ex)
-            {
-                DiagManager.Instance.LogError(ex, false);
-                await MessageBoxWindowView.Show(_context.DialogService,
-                    "Error importing from\n" + CachedPath + "\n\n" + ex.Message, "Import Failed",
-                    MessageBoxWindowView.MessageBoxButtons.Ok);
-                return;
-            }
+                try
+                {
+                    Import(CachedPath, formdata);
+                }
+                catch (Exception ex)
+                {
+                    DiagManager.Instance.LogError(ex, false);
+                    await MessageBoxWindowView.Show(_context.DialogService,
+                        "Error importing from\n" + CachedPath + "\n\n" + ex.Message, "Import Failed",
+                        MessageBoxWindowView.MessageBoxButtons.Ok);
+                    return;
+                }
+            });
         }
 
         public async void btnReImport_Click()
@@ -480,30 +491,33 @@ await MessageBoxWindowView.Show(_context.DialogService,
 
             //open window to choose directory
 
-            string folder = await _context.DialogService.ShowFolderPickerAsync(new FolderPickerOpenOptions
+            await Dispatcher.UIThread.InvokeAsync(async () =>
             {
-                Title = "Select folder to export to",
-                AllowMultiple = false,
-            }, folderName);
+                string folder = await _context.DialogService.ShowFolderPickerAsync(new FolderPickerOpenOptions
+                {
+                    Title = "Select folder to export to",
+                    AllowMultiple = false,
+                }, folderName);
 
-            if (String.IsNullOrEmpty(folder))
-                return;
+                if (String.IsNullOrEmpty(folder))
+                    return;
 
-            DevForm.SetConfig(Name + "Dir", folder);
-            CachedPath = folder + "/";
+                DevForm.SetConfig(Name + "Dir", folder);
+                CachedPath = folder + "/";
 
-            try
-            {
-                DevForm.ExecuteOrPend(() => { Export(CachedPath, formdata, singleSheet); });
-            }
-            catch (Exception ex)
-            {
-                DiagManager.Instance.LogError(ex, false);
-                await MessageBoxWindowView.Show(_context.DialogService,
-                    "Error exporting to\n" + CachedPath + "\n\n" + ex.Message, "Export Failed",
-                    MessageBoxWindowView.MessageBoxButtons.Ok);
-                return;
-            }
+                try
+                {
+                    DevForm.ExecuteOrPend(() => { Export(CachedPath, formdata, singleSheet); });
+                }
+                catch (Exception ex)
+                {
+                    DiagManager.Instance.LogError(ex, false);
+                    await MessageBoxWindowView.Show(_context.DialogService,
+                        "Error exporting to\n" + CachedPath + "\n\n" + ex.Message, "Export Failed",
+                        MessageBoxWindowView.MessageBoxButtons.Ok);
+                    return;
+                }
+            });
         }
 
         public async void btnDelete_Click()
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/Pages/SpritePageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/Pages/SpritePageViewModel.cs
index 4906d275..a1bec2f3 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/Pages/SpritePageViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/Pages/SpritePageViewModel.cs
@@ -58,6 +58,25 @@ public static Bitmap FromSheet(BaseSheet sheet, int frameX, int frameY, int widt
         Color[] data = BaseSheet.GetData(sheet, frameX, frameY, width, height);
         return FromColors(data, width, height);
     }
+    
+    public static Bitmap FromPortraitSheet(PortraitSheet sheet, int frameX, int frameY, int width, int height)
+    {
+        Color[] data = PortraitSheet.GetData(sheet, frameX, frameY, width, height);
+        return FromColors(data, width, height);
+    }
+    
+    public static Bitmap FromBeamSheet(BeamSheet sheet, int frameX, int frameY, int width, int height)
+    {
+        Color[] data = BeamSheet.GetData(sheet, frameX, frameY, width, height);
+        return FromColors(data, width, height);
+    }
+    
+    // NOTE: For rendering char sheet, you need consider what animation type is it, how long each frame lasts, so we need the current frame, which anim index or name too, then for the preview we need to tick the correct amount
+    // public static Bitmap FromCharSheet(CharSheet sheet, int frameX, int frameY, int width, int height)
+    // {
+    //     Color[] data = CharSheet.GetData(sheet, frameX, frameY, width, height);
+    //     return FromColors(data, width, height);
+    // };
 }
 
 public class SpritePageViewModel : EditorPageViewModel<SpriteRootNode>
@@ -172,6 +191,11 @@ public override void OnPageLoad()
                 _animTimer?.Start();
         });
         
+        this.WhenAnyValue(x => x.CurrentFrame).Subscribe(paused =>
+        {
+            _updateBitmap();
+        });
+        
         this.WhenAnyValue(x => x.PreviewFps).Subscribe(fps =>
         {
             if (_animTimer != null)
@@ -304,9 +328,27 @@ public Bitmap? PreviewBitmap
 
     private DispatcherTimer? _animTimer;
     private DirSheet? _currentSheet;
-    private int _currentFrame;
     
     
+    private int _currentFrame;
+    public int CurrentFrame
+    {
+        get => _currentFrame;
+        set => this.RaiseAndSetIfChanged(ref _currentFrame, Math.Clamp(value, 0, TotalFrames - 1));
+    }
+
+    public int CurrentFrameDisplay
+    {
+        get => CurrentFrame + 1;
+        set => CurrentFrame = Math.Clamp(value - 1, 0, TotalFrames);
+    }
+    
+    private int _totalFrames = 1;
+    public int TotalFrames
+    {
+        get => _totalFrames;
+        set => this.RaiseAndSetIfChanged(ref _totalFrames, value);
+    }
     
     
     private BaseSheet _currentBaseSheet;
@@ -342,27 +384,22 @@ private void StartPreview(string? item)
                             _ => GraphicsManager.GetDirSheet(AssetType, item)
                         };
                         _currentSheet = sheet;
-                        _currentFrame = 0;
                         Dispatcher.UIThread.Post(() =>
                         {
                             PreviewBitmap = PreviewHelper.FromSheet(sheet, 0, 0, sheet.TileWidth, sheet.TileHeight);
                             HasAnimation = sheet.TotalX > 1;
-    
-                            if (sheet.TotalX > 1)
+                            TotalFrames = sheet.TotalX;
+                            if (_hasAnimation)
                             {
                                 _animTimer = new DispatcherTimer(DispatcherPriority.Render);
                                 _animTimer.Interval = TimeSpan.FromSeconds(1.0 / PreviewFps);
                            
                                 _animTimer.Tick += (_, _) =>
                                 {
-                                  
-                                    _currentFrame = (_currentFrame + 1) % sheet.TotalX;
-                                    int frameX = _currentFrame * sheet.TileWidth;
-                                    PreviewBitmap = PreviewHelper.FromSheet(sheet, frameX, 0, sheet.TileWidth, sheet.TileHeight);
-                                    this.RaisePropertyChanged(nameof(CurrentFrameDisplay));
+                                    CurrentFrame = (CurrentFrame + 1) % sheet.TotalX;
                                 };
-                                _animTimer.Start();
-                     
+                                if (!IsPaused)
+                                    _animTimer.Start();
                             }
                         });
                     }
@@ -375,6 +412,13 @@ private void StartPreview(string? item)
         });
     }
 
+    private void _updateBitmap()
+    {
+        if (_currentSheet == null) return;
+        int frameX = CurrentFrame * _currentSheet.TileWidth;
+        this.RaisePropertyChanged(nameof(CurrentFrameDisplay));
+        PreviewBitmap = PreviewHelper.FromSheet(_currentSheet, frameX, 0, _currentSheet.TileWidth, _currentSheet.TileHeight);
+    }
     /*private void UpdatePreviewFrame()
     {
         if (_currentSheet == null)
@@ -389,38 +433,44 @@ private void StartPreview(string? item)
         Console.WriteLine($"UpdatePreviewFrame: PreviewBitmap set to {PreviewBitmap?.Size}");
     }*/
     
-    private void UpdatePreviewFrame()
-    {
-        if (_currentSheet == null)
-        {
-            Console.WriteLine("UpdatePreviewFrame: _currentSheet is null");
-            return;
-        }
-        Console.WriteLine($"UpdatePreviewFrame: frame={_currentFrame}");
-        int frameX = (_currentFrame % _currentSheet.TotalX) * _currentSheet.TileWidth;
-        PreviewBitmap = PreviewHelper.FromSheet(_currentSheet, frameX, 0, _currentSheet.TileWidth, _currentSheet.TileHeight);
-    }
+    // private void UpdatePreviewFrame()
+    // {
+    //     if (_currentSheet == null)
+    //     {
+    //         Console.WriteLine("UpdatePreviewFrame: _currentSheet is null");
+    //         return;
+    //     }
+    //     Console.WriteLine($"UpdatePreviewFrame: frame={_currentFrame}");
+    //     int frameX = (_currentFrame % _currentSheet.TotalX) * _currentSheet.TileWidth;
+    //     PreviewBitmap = PreviewHelper.FromSheet(_currentSheet, frameX, 0, _currentSheet.TileWidth, _currentSheet.TileHeight);
+    // }
 
     private void StopPreview()
     {
         _animTimer?.Stop();
         _animTimer = null;
         _currentSheet = null;
-        _currentFrame = 0;
+        CurrentFrameDisplay = 1;
     }
     
     public override void OnPageActivated()
     {
-        ResumePreview();
+        if (_wasAnimating)
+        {
+            ResumePreview();
+        }
     }
 
     public override void OnPageDeactivated()
     {
+        _wasAnimating = !_isPaused;
         PausePreview();
     }
+
+    private bool _wasAnimating;
     
-    private double _previewFps = 12;
-    public double PreviewFps
+    private int _previewFps = 12;
+    public int PreviewFps
     {
         get => _previewFps;
         set => this.RaiseAndSetIfChanged(ref _previewFps, value);
@@ -442,15 +492,52 @@ public bool HasAnimation
   
     public void TogglePreview()
     {
-        IsPaused = !IsPaused;
+        if (HasAnimation)
+        {
+            IsPaused = !IsPaused;
+        }
+    }
+    
+    
+    public void StepForward()
+    {
+        if (HasAnimation)
+        {
+            PausePreview();
+            CurrentFrame = (CurrentFrame + 1) % TotalFrames;
+        }
     }
     
+    public void StepBackward()
+    {
+        if (HasAnimation)
+        {
+            PausePreview();
+            CurrentFrame = (CurrentFrame - 1) % TotalFrames;
+        }
+    }
+
+    public void GoBeginningFrame()
+    {
+        if (HasAnimation)
+        {
+            PausePreview();
+            CurrentFrame = 0;
+        }
+    }
+    
+    public void GoEndFrame()
+    {
+        if (HasAnimation)
+        {
+            PausePreview();
+            CurrentFrame = TotalFrames - 1;
+        }
+    }
+
     public void ResumePreview() => IsPaused = false;
 
     public void PausePreview() => IsPaused = true;
     
-    public string CurrentFrameDisplay => _currentSheet != null 
-        ? $"Frame: {_currentFrame + 1} / {_currentSheet.TotalX}" 
-        : "Frame: -";
-    
+
 }
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/DevForm/DevForm.axaml b/RogueEssence.Editor.Avalonia/Views/DevForm/DevForm.axaml
index 2dca17ba..57c12b12 100644
--- a/RogueEssence.Editor.Avalonia/Views/DevForm/DevForm.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/DevForm/DevForm.axaml
@@ -155,7 +155,7 @@
                           BorderThickness="0,0,1,0" />
 
             <!-- Editor Panel -->
-            <Grid Margin="2, 0, 0, 0" Grid.Column="2" RowDefinitions="Auto, *">
+            <Grid Margin="2, 0, 0, 0" Grid.Column="2" RowDefinitions="Auto, *" ZIndex="10">
                 <Border BorderThickness="0, 0, 0, 1" BorderBrush="{DynamicResource Brush.Border0}"
                         Background="{DynamicResource TabControlWindowActiveBackgroundBrush}">
                     <!-- Tab Bar -->
diff --git a/RogueEssence.Editor.Avalonia/Views/DevForm/DevForm.axaml.cs b/RogueEssence.Editor.Avalonia/Views/DevForm/DevForm.axaml.cs
index ea4ebf60..f45b2c0a 100644
--- a/RogueEssence.Editor.Avalonia/Views/DevForm/DevForm.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/DevForm/DevForm.axaml.cs
@@ -705,7 +705,7 @@ node.Parent is SpriteRootNode parent &&
 
     public void OnActivePageSet(EditorPageViewModel page)
     {
-        Console.WriteLine("OnActivePageSet: " + page.Title);
+        // Console.WriteLine("OnActivePageSet: " + page.Title);
         if (DataContext is DevFormViewModel vm)
         {
             if (vm.Pages.Count == 0)
@@ -714,7 +714,7 @@ public void OnActivePageSet(EditorPageViewModel page)
             }
             
             var path = FindIndexPath<NodeBase>(vm.NodeSource.Items, page.Node, n => n.SubNodes);
-            Console.WriteLine("Page?: " + path);
+            // Console.WriteLine("Page?: " + path);
             if (path.HasValue)
                 // Dispatcher.UIThread.Post(() =>
                 // {
diff --git a/RogueEssence.Editor.Avalonia/Views/DevForm/TabBarView.axaml b/RogueEssence.Editor.Avalonia/Views/DevForm/TabBarView.axaml
index 322bcadd..3c6eca3e 100644
--- a/RogueEssence.Editor.Avalonia/Views/DevForm/TabBarView.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/DevForm/TabBarView.axaml
@@ -137,10 +137,6 @@
         <Style Selector="controls|DragTabItem:selected:pointerover Button#CloseTabButton">
             <Setter Property="Opacity" Value="1" />
         </Style>
-      
-        <Style Selector="controls|DragTabItem:selected /template/ controls|LeftPressedThumb#PART_Thumb">
-            <Setter Property="IsHitTestVisible" Value="False" />
-        </Style>
         <Style Selector="Button#CloseTabButton">
             <Setter Property="Opacity" Value="0" />
         </Style>
@@ -186,7 +182,8 @@
                         <Grid ColumnDefinitions="Auto, *, Auto">
                             <Thumb Grid.Column="0" Name="PART_LeftDragWindowThumb"
                                    MinWidth="{TemplateBinding LeftThumbWidth}" />
-                            <ScrollViewer Grid.Column="1" HorizontalScrollBarVisibility="Hidden"
+                            <ScrollViewer x:Name="TabBarViewScrollViewer" Grid.Column="1" HorizontalScrollBarVisibility="Hidden"
+                                          PointerWheelChanged="TabBarViewScrollViewer_OnPointerWheelChanged"
                                           VerticalScrollBarVisibility="Disabled">
                                 <ItemsPresenter Name="PART_ItemsPresenter"
                                                 ItemsPanel="{TemplateBinding ItemsPanel}" Margin="0, 0, 0, 0" />
diff --git a/RogueEssence.Editor.Avalonia/Views/DevForm/TabBarView.axaml.cs b/RogueEssence.Editor.Avalonia/Views/DevForm/TabBarView.axaml.cs
index 877cc754..e2a795ef 100644
--- a/RogueEssence.Editor.Avalonia/Views/DevForm/TabBarView.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/DevForm/TabBarView.axaml.cs
@@ -31,107 +31,131 @@ public static Path CreateMenuIcon(this Control control, string iconKey)
 namespace RogueEssence.Dev.Views
 {
     public partial class TabBarView : UserControl
-{
-    private ContextMenu _tabContextMenu;
-    private EditorPageViewModel? _contextMenuPage;
-
-    public TabBarView()
     {
-        InitializeComponent();
-
-        _tabContextMenu = new ContextMenu();
-        TabsControl.ContextMenu = _tabContextMenu;
-        TabsControl.AddHandler(InputElement.PointerPressedEvent, OnTabBarPointerPressed, RoutingStrategies.Tunnel);
-    }
+        private ContextMenu _tabContextMenu;
+        private EditorPageViewModel? _contextMenuPage;
 
-    private void OnTabBarPointerPressed(object? sender, PointerPressedEventArgs e)
-    {
-        if (!e.GetCurrentPoint(this).Properties.IsRightButtonPressed) return;
+        public TabBarView()
+        {
+            InitializeComponent();
 
-        var current = e.Source as Visual;
-        EditorPageViewModel? page = null;
+            _tabContextMenu = new ContextMenu();
+            TabsControl.ContextMenu = _tabContextMenu;
+            TabsControl.AddHandler(InputElement.PointerPressedEvent, OnTabBarPointerPressed, RoutingStrategies.Tunnel);
+        }
 
-        while (current != null)
+        private void OnTabBarPointerPressed(object? sender, PointerPressedEventArgs e)
         {
-            if (current.DataContext is EditorPageViewModel vm)
+            if (!e.GetCurrentPoint(this).Properties.IsRightButtonPressed) return;
+        
+            var current = e.Source as Visual;
+            EditorPageViewModel? page = null;
+        
+            while (current != null)
             {
-                page = vm;
-                break;
+                if (current.DataContext is EditorPageViewModel vm)
+                {
+                    page = vm;
+                    break;
+                }
+                current = current.GetVisualParent();
             }
-            current = current.GetVisualParent();
+        
+            if (page == null) return;
+            if (DataContext is not DevFormViewModel devVm) return;
+        
+            _contextMenuPage = page;
+            BuildContextMenu(devVm, page);
+            _tabContextMenu.Open(TabsControl);
+            e.Handled = true;
         }
 
-        if (page == null) return;
-        if (DataContext is not DevFormViewModel devVm) return;
+        private void BuildContextMenu(DevFormViewModel vm, EditorPageViewModel page)
+        {
+            _tabContextMenu.Items.Clear();
+
+            var close = new MenuItem { Header = "Close" };
+            close.InputGesture =
+                new KeyGesture(Key.W, OperatingSystem.IsMacOS() ? KeyModifiers.Meta : KeyModifiers.Control);
+            close.Click += (_, _) => vm.TryCloseTabAsync(page, false);
+            _tabContextMenu.Items.Add(close);
 
-        _contextMenuPage = page;
-        BuildContextMenu(devVm, page);
-        _tabContextMenu.Open(TabsControl);
-        e.Handled = true;
-    }
+            bool canLeft = vm.CanCloseLeft(page);
+            bool canRight = vm.CanCloseRight(page);
 
-    private void BuildContextMenu(DevFormViewModel vm, EditorPageViewModel page)
-    {
-        _tabContextMenu.Items.Clear();
+            if (vm.CanCloseOthers())
+            {
+                var closeOthers = new MenuItem { Header = "Close Others" };
+                closeOthers.Click += (_, _) => vm.CloseOthersAsync(page);
+                _tabContextMenu.Items.Add(closeOthers);
 
-        var close = new MenuItem { Header = "Close" };
-        close.InputGesture = new KeyGesture(Key.W, OperatingSystem.IsMacOS() ? KeyModifiers.Meta : KeyModifiers.Control);
-        close.Click += (_, _) => vm.TryCloseTabAsync(page, false);
-        _tabContextMenu.Items.Add(close);
-        
-        bool canLeft = vm.CanCloseLeft(page);
-        bool canRight = vm.CanCloseRight(page);
+                var closeAll = new MenuItem { Header = "Close All" };
+                closeAll.Click += (_, _) => vm.CloseAllAsync();
+                _tabContextMenu.Items.Add(closeAll);
+            }
 
-        if (vm.CanCloseOthers())
+            if (canLeft && canRight)
+            {
+                var closeLeft = new MenuItem { Header = "Close Left" };
+                closeLeft.Click += (_, _) => vm.CloseLeftAsync(page);
+                _tabContextMenu.Items.Add(closeLeft);
+
+                var closeRight = new MenuItem { Header = "Close Right" };
+                closeRight.Click += (_, _) => vm.CloseRightAsync(page);
+                _tabContextMenu.Items.Add(closeRight);
+            }
+        }
+
+        protected override void OnDataContextChanged(EventArgs e)
         {
-            var closeOthers = new MenuItem { Header = "Close Others" };
-            closeOthers.Click += (_, _) => vm.CloseOthersAsync(page);
-            _tabContextMenu.Items.Add(closeOthers);
-            
-            var closeAll = new MenuItem { Header = "Close All" };
-            closeAll.Click += (_, _) => vm.CloseAllAsync();
-            _tabContextMenu.Items.Add(closeAll);
+            base.OnDataContextChanged(e);
+            if (DataContext is DevFormViewModel vm)
+                vm.TabSwitcherClosed += () => TabSwitcherFlyoutButton.Flyout?.Hide();
         }
-        
-        if (canLeft && canRight)
+
+        private async void OnCloseTab(object? sender, RoutedEventArgs e)
         {
-            var closeLeft = new MenuItem { Header = "Close Left" };
-            closeLeft.Click += (_, _) => vm.CloseLeftAsync(page);
-            _tabContextMenu.Items.Add(closeLeft);
+            if (DataContext is not DevFormViewModel vm) return;
+            if (sender is not Button { DataContext: EditorPageViewModel page }) return;
 
-            var closeRight = new MenuItem { Header = "Close Right" };
-            closeRight.Click += (_, _) => vm.CloseRightAsync(page);
-            _tabContextMenu.Items.Add(closeRight);
+            bool closed = await vm.TryCloseTabAsync(page, false);
+            if (!closed)
+                e.Handled = true;
         }
-    }
 
-    protected override void OnDataContextChanged(EventArgs e)
-    {
-        base.OnDataContextChanged(e);
-        if (DataContext is DevFormViewModel vm)
-            vm.TabSwitcherClosed += () => TabSwitcherFlyoutButton.Flyout?.Hide();
-    }
+        private void TabSwitcherFlyout_OnOpened(object? sender, EventArgs e)
+        {
+            if (DataContext is DevFormViewModel vm)
+                vm.OpenTabSwitcher();
+        }
 
-    private async void OnCloseTab(object? sender, RoutedEventArgs e)
-    {
-        if (DataContext is not DevFormViewModel vm) return;
-        if (sender is not Button { DataContext: EditorPageViewModel page }) return;
+        private void TabSwitcherFlyout_OnClosed(object? sender, EventArgs e)
+        {
+            if (DataContext is DevFormViewModel vm)
+                vm.CloseTabSwitcher();
+        }
 
-        bool closed = await vm.TryCloseTabAsync(page, false);
-        if (!closed)
-            e.Handled = true;
-    }
 
-    private void TabSwitcherFlyout_OnOpened(object? sender, EventArgs e)
-    {
-        if (DataContext is DevFormViewModel vm)
-            vm.OpenTabSwitcher();
-    }
+        private void TabBarViewScrollViewer_OnPointerWheelChanged(object sender, PointerWheelEventArgs e)
+        {
+            
+            if (sender is ScrollViewer scrollViewer)
+            {
 
-    private void TabSwitcherFlyout_OnClosed(object? sender, EventArgs e)
-    {
-        if (DataContext is DevFormViewModel vm)
-            vm.CloseTabSwitcher();
+                double speed = 40;
+
+                double totalHorizontalDelta = Math.Abs(e.Delta.X) > Math.Abs(e.Delta.Y) ? e.Delta.X : -e.Delta.Y;
+
+                double newOffset = scrollViewer.Offset.X - (totalHorizontalDelta * speed);
+
+
+                double maxOffset = scrollViewer.Extent.Width - scrollViewer.Viewport.Width;
+                newOffset = Math.Clamp(newOffset, 0, maxOffset);
+
+                scrollViewer.Offset = new Vector(newOffset, scrollViewer.Offset.Y);
+
+                e.Handled = true;
+            }
+        }
     }
-}
 }
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/DialogBoxes/ReflectedDataWindowView.axaml b/RogueEssence.Editor.Avalonia/Views/DialogBoxes/ReflectedDataWindowView.axaml
new file mode 100644
index 00000000..249c3184
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/Views/DialogBoxes/ReflectedDataWindowView.axaml
@@ -0,0 +1,59 @@
+<v:ChromelessWindow xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:vm="using:RogueEssence.Dev.ViewModels"
+                    x:Class="RogueEssence.Dev.Views.ReflectedDataWindowView"
+                    xmlns:v="using:RogueEssence.Dev.Views"
+                    x:DataType="vm:AnimChoiceWindowViewModel"
+                    CanResize="False"
+                    Width="340" Height="540" 
+                    x:Name="ThisControl">
+    
+    <Design.DataContext>
+        <vm:ReflectedDataWindowViewModel/>
+    </Design.DataContext>
+
+    <Grid RowDefinitions="Auto,*">
+        <!-- TitleBar -->
+        <Grid Grid.Row="0" Height="28" IsVisible="{Binding !#ThisControl.UseSystemWindowFrame}">
+            <Border Background="{DynamicResource Brush.TitleBar}"
+                    BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border0}"
+                    PointerPressed="BeginMoveWindow" />
+
+            <Path Width="14" Height="14"
+                  Margin="10,0,0,0"
+                  HorizontalAlignment="Left"
+                  Data="{StaticResource Icons.SoftwareUpdate}"
+                  IsVisible="{OnPlatform True, macOS=False}" />
+
+            <TextBlock Classes="bold"
+                       x:Name="TitleText"
+                       Text="{Binding #ThisControl.Title}"
+                       HorizontalAlignment="Center" VerticalAlignment="Center"
+                       IsHitTestVisible="False" />
+            
+            <v:CaptionButtons HorizontalAlignment="Right"
+                              IsCloseButtonOnly="True"
+                              IsVisible="{OnPlatform True, macOS=False}"/>
+            
+        </Grid>
+        
+        <Grid Grid.Row="1">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="*"/>
+                <RowDefinition Height="34"/>
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition/>
+                <ColumnDefinition/>
+            </Grid.ColumnDefinitions>
+            <!--ScrollViewer HorizontalScrollBarVisibility="Visible" VerticalScrollBarVisibility="Visible" Grid.ColumnSpan="2"-->
+            <ScrollViewer Grid.ColumnSpan="2">
+                <StackPanel Name="stkContent" Margin="4">
+        
+                </StackPanel>
+            </ScrollViewer>
+            <Button Classes="flat" Name="btnOK" Click="btnOK_Click" Margin="4" Grid.Row="1" Grid.Column="0">OK</Button>
+            <Button Classes="flat" Name="btnCancel" Click="btnCancel_Click" Margin="4" Grid.Row="1" Grid.Column="1">Cancel</Button>
+        </Grid>
+    </Grid>
+</v:ChromelessWindow>
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/DialogBoxes/ReflectedDataWindowView.axaml.cs b/RogueEssence.Editor.Avalonia/Views/DialogBoxes/ReflectedDataWindowView.axaml.cs
new file mode 100644
index 00000000..5332e74e
--- /dev/null
+++ b/RogueEssence.Editor.Avalonia/Views/DialogBoxes/ReflectedDataWindowView.axaml.cs
@@ -0,0 +1,52 @@
+using System;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+using Avalonia.Markup.Xaml;
+using RogueEssence.Dev.ViewModels;
+
+// NOTE: The ReflectedDataWindowView is only used for the CategorySpawnEditor so far. This probably needs to be adjusted further for nested saving to work if implemented
+namespace RogueEssence.Dev.Views
+{
+    public partial class ReflectedDataWindowView: ChromelessWindow
+    {
+        public StackPanel ControlPanel { get; }
+        
+        public ReflectedDataWindowView()
+        {
+            this.InitializeComponent();
+            ControlPanel = stkContent;
+        }
+        
+        
+        protected override void OnDataContextChanged(EventArgs e)
+        {
+            base.OnDataContextChanged(e);
+            if (DataContext is not ReflectedDataWindowViewModel vm) return;
+            
+
+            if (vm.OnLoadAction != null)
+                vm.OnLoadAction(ControlPanel);
+        }
+        
+
+        public void btnOK_Click(object sender, RoutedEventArgs e)
+        {
+            if (DataContext is not ReflectedDataWindowViewModel vm) return;
+            vm.OnOKAction?.Invoke(ControlPanel);
+            this.Close(true);
+        }
+
+
+        public void btnCancel_Click(object sender, RoutedEventArgs e)
+        {
+            this.Close(false);
+        }
+        
+        // public void SetViewOnly()
+        // {
+        //     Button button = this.FindControl<Button>("btnOK");
+        //     button.IsEnabled = false;
+        // }
+    }
+}
diff --git a/RogueEssence.Editor.Avalonia/Views/Pages/ReflectedDataPageView.axaml.cs b/RogueEssence.Editor.Avalonia/Views/Pages/ReflectedDataPageView.axaml.cs
index ef7220e4..75a53df9 100644
--- a/RogueEssence.Editor.Avalonia/Views/Pages/ReflectedDataPageView.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/Pages/ReflectedDataPageView.axaml.cs
@@ -17,7 +17,6 @@ public interface ISaveable
 public partial class ReflectedDataPageView : UserControl, ISaveable
 {
     public StackPanel ControlPanel { get; }
-
     
     public ReflectedDataPageView()
     {
@@ -29,8 +28,8 @@ public async Task<bool> Save()
     {
         if (DataContext is ReflectedDataPageViewModel vm && vm.OnOKAction != null)
         {
-            return await vm.OnOKAction(ControlPanel);
-            
+            bool result = await vm.OnOKAction(ControlPanel);
+            return result;
         }
         return true;
     }
@@ -44,38 +43,40 @@ public async void btnOK_Click(object sender, RoutedEventArgs e)
     {
         if (DataContext is ReflectedDataPageViewModel vm)
         {
+            PageNode pageNode = vm.GetPageNode();
+            PageNode parent = pageNode.Parent;
             bool close = await vm.ApplySave();
             if (close)
                 vm.Close();
+            if (parent != null)
+            {
+                vm.NavigateToTab(parent.Page);
+            }
         }
     }
     
     public void btnCancel_Click(object sender, RoutedEventArgs e)
     {
         if (DataContext is ReflectedDataPageViewModel vm)
+        {
+            PageNode pageNode = vm.GetPageNode();
+            PageNode parent = pageNode.Parent;
             vm.Close();
+            if (parent != null)
+            {
+                vm.NavigateToTab(parent.Page);
+            }
+        }
     }
-
-    protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
-    {
-        base.OnAttachedToVisualTree(e);
-        DataContextChanged += OnDataContextChanged;
-        OnDataContextChanged(this, EventArgs.Empty);
-    }
-
-    protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e)
-    {
-        base.OnDetachedFromVisualTree(e);
-        DataContextChanged -= OnDataContextChanged;
-    }
-
-    private void OnDataContextChanged(object? sender, EventArgs e)
+    
+    protected override void OnDataContextChanged(EventArgs e)
     {
+        base.OnDataContextChanged(e);
         if (DataContext is not EditorPageViewModel vm) return;
-    
+
         vm.AttachedView = this;
 
-        if (DataContext is ReflectedDataPageViewModel reflectedVm && reflectedVm.OnLoadAction != null)
+        if (vm is ReflectedDataPageViewModel reflectedVm && reflectedVm.OnLoadAction != null)
             reflectedVm.OnLoadAction(ControlPanel);
     }
     
@@ -129,9 +130,5 @@ private void OnDataContextChanged(object? sender, EventArgs e)
     //     Close();
     // }
     //
-    // public void SetViewOnly()
-    // {
-    //     Button button = this.FindControl<Button>("btnOK");
-    //     button.IsEnabled = false;
-    // }
+  
 }
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/Views/Pages/SpritePageView.axaml b/RogueEssence.Editor.Avalonia/Views/Pages/SpritePageView.axaml
index b5baa2a1..4795d880 100644
--- a/RogueEssence.Editor.Avalonia/Views/Pages/SpritePageView.axaml
+++ b/RogueEssence.Editor.Avalonia/Views/Pages/SpritePageView.axaml
@@ -4,6 +4,7 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:vm="using:RogueEssence.Dev.ViewModels"
              xmlns:v="using:RogueEssence.Dev.Views"
+             xmlns:conv="using:RogueEssence.Dev.Converters"
              xmlns:views="clr-namespace:RogueEssence.Dev.Views"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:DataType="vm:SpritePageViewModel"
@@ -12,6 +13,16 @@
         <vm:SpritePageViewModel />
     </Design.DataContext>
 
+    <UserControl.Resources>
+        <conv:MathAdd x:Key="AddConverter" />
+    </UserControl.Resources>
+    <UserControl.KeyBindings>
+        <KeyBinding Gesture="Enter" Command="{Binding TogglePreview}" />
+        <KeyBinding Gesture="Left" Command="{Binding StepBackward}" />
+        <KeyBinding Gesture="Right" Command="{Binding StepForward}" />
+        <KeyBinding Gesture="Home" Command="{Binding GoBeginningFrame}" />
+        <KeyBinding Gesture="End" Command="{Binding GoEndFrame}" />
+    </UserControl.KeyBindings>
     <Grid RowDefinitions="Auto, 32, *, Auto">
         <DockPanel Grid.Row="0" VerticalAlignment="Top">
             <Menu DockPanel.Dock="Top">
@@ -24,11 +35,8 @@
                 </MenuItem>
             </Menu>
         </DockPanel>
-
-
-        <Grid Grid.Row="2" ColumnDefinitions="300, 64, 200" Margin="64, 8" ShowGridLines="True">
-            <Grid Grid.Row="0" RowDefinitions="Auto, Auto, 16, Auto, 12, Auto"  MinWidth="300">
-
+        <Grid Grid.Row="2" ColumnDefinitions="Auto, 64, 380" RowDefinitions="Auto, Auto, 16, Auto, 12, Auto" Margin="64, 8">
+           
                 <TextBlock Grid.Row="0" HorizontalAlignment="Center" Classes="table_header" FontSize="16"
                            Text="{Binding AssetType}" />
 
@@ -81,45 +89,34 @@
                         <v:IconText Text="Delete" Icon="Icons.TrashFill" IconSize="12" />
                     </Button>
                 </StackPanel>
-            </Grid>
-            
-            <Grid Grid.Column="2" RowDefinitions="Auto, Auto">
-                <Border HorizontalAlignment="Stretch"
-                        VerticalAlignment="Center"
-                        Height="400"
+     
+                <Border Grid.Column="2" Grid.Row="3" HorizontalAlignment="Stretch"
+                        VerticalAlignment="Bottom"
+                        Height="300"
                         CornerRadius="4"
                         Background="{DynamicResource Brush.ListBox.Background}"
                         BorderThickness="1"
                         Padding="8">
-                    <DockPanel>
-                        <Slider DockPanel.Dock="Bottom"
-                                Minimum="0.25"
-                                Maximum="8"
-                                Value="{Binding ZoomLevel}"
-                                TickFrequency="0.25"
-                                IsSnapToTickEnabled="True"
-                                Width="200"
-                                HorizontalAlignment="Center"
-                                Margin="0,4" />
-
+                
                         <ScrollViewer HorizontalScrollBarVisibility="Auto"
-                                      x:Name="SpritePagePreviewScrollViewer"
-                                      VerticalScrollBarVisibility="Auto">
-                            <ScrollViewer.GestureRecognizers>
-                                <PinchGestureRecognizer />
-                            </ScrollViewer.GestureRecognizers>
+                                      VerticalScrollBarVisibility="Auto"
+                                      Focusable="True"
+                                      PointerWheelChanged="SpritePagePreviewScrollViewer_OnPointerWheelChanged"
+                                      x:Name="SpritePagePreviewScrollViewer">
+                       
                             <Image Source="{Binding PreviewBitmap}"
-                                   RenderOptions.BitmapInterpolationMode="None"
-                                   x:Name="SpritePagePreviewImage"
                                    Width="{Binding PreviewWidth}"
                                    Height="{Binding PreviewHeight}"
-                                   Stretch="Fill" >
+                                   x:Name="SpritePagePreviewImage"
+                                   RenderOptions.BitmapInterpolationMode="None" >
                                 <Image.GestureRecognizers>
                                     <PinchGestureRecognizer/>
+                                    <ScrollGestureRecognizer ScrollStartDistance="0" CanHorizontallyScroll="True" CanVerticallyScroll="True"/>
                                 </Image.GestureRecognizers>
                             </Image>
+                    
                         </ScrollViewer>
-                    </DockPanel>
+         
                     <!-- <Panel> -->
                     <!--     <Viewbox Stretch="Uniform"> -->
                     <!--         <Image Source="{Binding PreviewBitmap}" -->
@@ -141,36 +138,107 @@
                     <!--     </Image> -->
                     <!-- </ScrollViewer> -->
                 </Border>
-                <StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Center" Spacing="8" IsVisible="{Binding HasAnimation}">
-                    <TextBlock Text="Speed:" VerticalAlignment="Center" />
-                    <Slider Minimum="1" Maximum="60"
-                            Value="{Binding PreviewFps}"
-                            Width="120"
-                            VerticalAlignment="Center" />
-                    <TextBlock Text="{Binding PreviewFps, StringFormat={}{0:F0} fps}"
-                               VerticalAlignment="Center" />
-                    <Button Classes="secondary" Command="{Binding TogglePreview}">
-                        <Panel>
-                            <Path Width="10" Height="10" Margin="0, 2, 0, 0" Data="{StaticResource Icons.PauseFill}" IsVisible="{Binding !IsPaused}" />
-                            <Path Width="10" Height="10" Margin="0, 2, 0, 0" Data="{StaticResource Icons.PlayFill}" IsVisible="{Binding IsPaused}" />
-                        </Panel>
-                    </Button>
-                </StackPanel>               
             </Grid>
-        </Grid>
   
         <Border Grid.Row="3"
-                Background="{DynamicResource B}"
-                Padding="8,4">
-            <StackPanel Orientation="Horizontal" Spacing="16">
-                <TextBlock VerticalAlignment="Center"
-                           Foreground="White"
-                           Text="{Binding PreviewBitmap.Size, StringFormat='Size: {0}'}" />
-                <TextBlock VerticalAlignment="Center"
-                           Foreground="White"
-                           Text="{Binding CurrentFrameDisplay}" />
+        Background="{DynamicResource Brush.Window}"
+        BorderThickness="0, 1, 0, 0"
+        BorderBrush="{DynamicResource Brush.Border0}"
+        Padding="8,4">
+    <Grid ColumnDefinitions="*, 510, Auto">
+        
+        <StackPanel Grid.Column="0" Orientation="Horizontal" Spacing="16" VerticalAlignment="Center"
+                    IsVisible="{Binding SelectedItem, Converter={x:Static StringConverters.IsNotNullOrEmpty}}">
+            <TextBlock VerticalAlignment="Center" Text="{Binding SelectedItem}" />
+            <v:IconText Text="{Binding PreviewBitmap.Size}" Icon="Icons.ResizeFill" IconSize="12" />
+        </StackPanel>
+        
+        <StackPanel Grid.Column="2" Orientation="Horizontal" Spacing="16">
+            
+            <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Spacing="4" IsVisible="{Binding HasAnimation}">
+                <Button Classes="secondary" Command="{Binding GoBeginningFrame}">
+                    <Path Width="10" Height="10" Margin="0, 2, 0, 0" Data="{StaticResource Icons.SkipBackFill}" />
+                </Button>
+                
+                <Button Classes="secondary" Command="{Binding StepBackward}" Padding="7, 4, 7, 3">
+                    <Path Width="12" Height="12" Margin="0, 4, 0, 0" Data="{StaticResource Icons.RewindFill}" />
+                </Button>
+                <Button Classes="secondary" Command="{Binding TogglePreview}">
+                    <Panel>
+                        <Path Width="10" Height="10" Margin="0, 2, 0, 0" Data="{StaticResource Icons.PauseFill}" IsVisible="{Binding !IsPaused}" />
+                        <Path Width="10" Height="10" Margin="0, 2, 0, 0" Data="{StaticResource Icons.PlayFill}" IsVisible="{Binding IsPaused}" />
+                    </Panel>
+                </Button>
+                <Button Classes="secondary" Command="{Binding StepForward}" Padding="7, 4, 7, 3">
+                    <Path Width="12" Height="12" Margin="0, 4, 0, 0" Data="{StaticResource Icons.FastForwardFill}" />
+                </Button>
+                <Button Classes="secondary" Command="{Binding GoEndFrame}">
+                    <Path Width="10" Height="10" Margin="0, 2, 0, 0" Data="{StaticResource Icons.SkipForwardFill}" />
+                </Button>
+               
+            </StackPanel>
+
+            
+            <StackPanel Orientation="Horizontal" Spacing="8" IsVisible="{Binding HasAnimation}">
+                <TextBlock VerticalAlignment="Center" Text="Speed:" />
+                <TextBox VerticalAlignment="Center"
+                         MaxLength="3"
+                         MinWidth="50"
+                         PointerWheelChanged="SpritePageViewFPSTextBox_OnPointerWheelChanged"
+                         x:Name="SpritePageViewFPSTextBox"
+                         TextAlignment="Right"
+                         Text="{Binding PreviewFps}">
+                    <TextBox.InnerRightContent>
+                        <TextBlock Margin="0,10,4,0"
+                                   Foreground="{DynamicResource Brush.FG2}"
+                                   FontSize="10"
+                                   Text="fps" />
+                    </TextBox.InnerRightContent>
+                </TextBox>
+            </StackPanel>
+
+            <StackPanel Orientation="Horizontal" Spacing="8" IsVisible="{Binding HasAnimation}">
+                <TextBlock VerticalAlignment="Center" Text="Frame:" />
+                <TextBox VerticalAlignment="Center"
+                         MaxLength="3"
+                         MinWidth="50"
+                         TextAlignment="Right"
+                         PointerWheelChanged="SpritePageViewFrameTextBox_OnPointerWheelChanged"
+                         x:Name="SpritePageViewFrameTextBox"
+                         Text="{Binding CurrentFrameDisplay}">
+                    <TextBox.InnerRightContent>
+                        <TextBlock Margin="0,10,4,0"
+                                   Foreground="{DynamicResource Brush.FG2}"
+                                   FontSize="10"
+                                   Text="{Binding TotalFrames, StringFormat='/{0}', FallbackValue='1'}" />
+                    </TextBox.InnerRightContent>
+                </TextBox>
             </StackPanel>
-        </Border>
+
+            <StackPanel Orientation="Horizontal" Spacing="8">
+                <TextBlock VerticalAlignment="Center" Text="Zoom:" />
+                <TextBox VerticalAlignment="Center"
+                         MaxLength="6"
+                         x:Name="SpritePageViewZoomTextBox"
+                         MinWidth="70"
+                         TextAlignment="Right"
+                         PointerWheelChanged="SpritePageViewZoomTextBox_OnPointerWheelChanged"
+                         Padding="4, 4, 8, 4"
+                         Text="{Binding ZoomLevel}">
+                    <TextBox.InnerRightContent>
+                        <TextBlock Margin="-3,5,4,0"
+                                   Padding="0"
+                                   Foreground="{DynamicResource Brush.FG2}"
+                                   FontSize="10"
+                                   Text="x" />
+                    </TextBox.InnerRightContent>
+                </TextBox>
+            </StackPanel>
+
+        </StackPanel>
+    </Grid>
+</Border>
+
         <!-- MaxWidth="256" MaxHeight="256" -->
         <!-- <ScrollViewer HorizontalScrollBarVisibility="Auto" -->
         <!--               VerticalScrollBarVisibility="Auto"> -->
diff --git a/RogueEssence.Editor.Avalonia/Views/Pages/SpritePageView.axaml.cs b/RogueEssence.Editor.Avalonia/Views/Pages/SpritePageView.axaml.cs
index d4222460..697040db 100644
--- a/RogueEssence.Editor.Avalonia/Views/Pages/SpritePageView.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/Pages/SpritePageView.axaml.cs
@@ -4,6 +4,7 @@
 using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.Markup.Xaml;
+using Avalonia.Threading;
 using RogueEssence.Content;
 using RogueEssence.Dev.ViewModels;
 using RogueEssence.Dungeon;
@@ -17,11 +18,29 @@ public SpritePageView()
         InitializeComponent();
         SpritePagePreviewScrollViewer.AddHandler(Gestures.PinchEvent, OnPinchUpdated);
         
-        SpritePagePreviewImage.AddHandler(Gestures.PinchEvent, (s, e) => { Console.WriteLine("Pinch"); });
-        SpritePagePreviewImage.AddHandler(Gestures.PinchEndedEvent, (s, e) => { Console.WriteLine("PinchEnded"); });
+        SpritePagePreviewScrollViewer.AddHandler(
+            Gestures.PinchEvent,
+            SpritePagePreviewScrollViewer_OnPinch);
+        
+        SpritePagePreviewImage.AddHandler(Gestures.PinchEvent, SpritePagePreviewScrollViewer_OnPinch);
+        // SpritePagePreviewImage.AddHandler(InputElement.P, (s, e) => { });
+        // SpritePagePreviewImage.AddHandler(Gestures.PinchEvent, (s, e) => { Console.WriteLine("Pinch"); });
+        // SpritePagePreviewImage.AddHandler(Gestures.PinchEndedEvent, (s, e) => { Console.WriteLine("PinchEnded"); });
 
     }
     
+    private void SpritePagePreviewScrollViewer_OnPinch(object? sender, PinchEventArgs e)
+    {
+        Console.WriteLine("Pinch: " + e.Scale);
+        // _currentScale = Math.Clamp(
+        //     _currentScale * e.Scale,
+        //     MinScale,
+        //     MaxScale);
+        //
+        // SpritePagePreviewImage.Width  = PreviewBaseWidth  * _currentScale;
+        // SpritePagePreviewImage.Height = PreviewBaseHeight * _currentScale;
+    }
+    
     protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
     {
         base.OnAttachedToVisualTree(e);
@@ -42,6 +61,10 @@ protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
                 }
             };
         }
+        SpritePagePreviewScrollViewer.AddHandler(
+            PointerWheelChangedEvent,
+            SpritePagePreviewScrollViewer_OnPointerWheelChanged,
+            RoutingStrategies.Tunnel); // tunnel fires before ScrollViewer's bubble handler
     }
     
 
@@ -93,7 +116,167 @@ private void OnPinchUpdated(object? sender, PinchEventArgs e)
         //
         // vm.ZoomLevel = Math.Clamp(_pinchStartZoom * e.Scale, 0.25, 8);
     }
+
+
+    
+         
+    // <!-- Size: 320x240: -->
+    
+    
+    // <!-- Zoom 0.75x: -->
+    // Mouse: 95.6015625, 190.68359375 Image: 117.1015625, 109.68359375
+    // Scroll View Offset: 21.5, 0
+    // Extent: 240, 180
+
+        
+    // <!-- Zoom 1x: -->
+    // <!-- Mouse: 83.75, 195.1640625 Image: 158.25, 144.1640625 -->
+    // <!-- Scroll View Offset: 74.5, 0 -->
+    // <!-- Extent: 320, 240 -->
+    //
+    //                     
+    // <!-- Zoom 2x -->
+    // <!-- Mouse: 93.28515625, 184.52734375 Image: 331.28515625, 292.52734375 -->
+    // <!-- Scroll View Offset: 238, 108 -->
+    // <!-- Extent: 640, 480 -->
+    //
+    //                     
+    // <!-- Zoom 3x -->
+    // <!-- Mouse: 85.765625, 199.52734375 Image: 477.765625, 430.52734375 -->
+    // <!-- Scroll View Offset: 392, 231 -->
+    // <!-- Extent: 960, 720 -->
+    //                     
+    // <!-- Zoom 4x -->
+    // <!-- Mouse: 90.7421875, 186.6796875 Image: 630.7421875, 573.6796875 -->
+    // <!-- Scroll View Offset: 540, 387 -->
+    // <!-- Extent: 1280, 960 -->
+    // Note: there's probably a formula to figure the offset for the scrollviewer so that it stays zoomed in on the right pixel
+    // private void SpritePagePreviewScrollViewer_OnPointerWheelChanged(object sender, PointerWheelEventArgs e)
+    // {
+    //     
+    //     
+    //     var sv = SpritePagePreviewScrollViewer;
+    //     var vm = (SpritePageViewModel)DataContext!;
+    //     // var mousePosInSv = e.GetPosition(sv);
+    //     var image = SpritePagePreviewImage; // give your Image x:Name="SpritePagePreviewImage"
+    //
+    //
+    //     if (!e.KeyModifiers.HasFlag(KeyModifiers.Control)) return;
+    //
+    //
+    //     
+    //
+    //    
+    //     double oldZoom = vm.ZoomLevel;
+    //
+    //
+    //     double delta = e.Delta.Y > 0 ? 1.25 : 0.8;
+    //     
+    //     double rawZoom = Math.Max(oldZoom * delta, 0.25);
+    //     double newZoom = Math.Clamp(Math.Round(rawZoom / 0.25, MidpointRounding.AwayFromZero) * 0.25, 0.25, 16.0);
+    //     
+    //
+    //     
+    //     vm.ZoomLevel = newZoom;
+    //
+    //
+    //
+    //     e.Handled = true;
+    // }
+    
+    private void SpritePagePreviewScrollViewer_OnPointerWheelChanged(object sender, PointerWheelEventArgs e)
+    {
+        if (!e.KeyModifiers.HasFlag(KeyModifiers.Control)) return;
+
+
+        SpritePageViewModel vm = DataContext as SpritePageViewModel;
+        vm.ZoomLevel = GetNewValueFromScroll(e, vm.ZoomLevel, 0.25, 0.25, 10.0);
+        e.Handled = true;
+    }
+
+    // private void SpritePageViewZoomTextBox_OnPointerWheelChanged(object sender, PointerWheelEventArgs e)
+    // {
+    //     var vm = (SpritePageViewModel)DataContext!;
+    //     double oldZoom = vm.ZoomLevel;
+    //     
+    //     // We want the ability to scroll either horizontally or vertically... choose the one that's higher
+    //     double delta = Math.Abs(e.Delta.Y) >= Math.Abs(e.Delta.X) ? e.Delta.Y : e.Delta.X;
+    //
+    //     // More sensitive
+    //     if (Math.Abs(delta) < 0.1) return;
+    //     
+    //     // Step is 0.25x
+    //     double step = delta > 0 ? 0.25 : -0.25;
+    //
+    //     // Make ensure it's between 0.25x and 10x
+    //     double newZoom = Math.Clamp(oldZoom + step, 0.25, 10.0);
+    //     
+    //     vm.ZoomLevel = newZoom;
+    //
+    //     e.Handled = true;
+    // }
+    //
+    // private void SpritePageViewFPSTextBox_OnPointerWheelChanged(object sender, PointerWheelEventArgs e)
+    // {
+    //    
+    //     var vm = (SpritePageViewModel)DataContext!;
+    //     double oldFps = vm.PreviewFps;
+    //     
+    //     // We want the ability to scroll either horizontally or vertically... choose the one that's higher
+    //     double delta = Math.Abs(e.Delta.Y) >= Math.Abs(e.Delta.X) ? e.Delta.Y : e.Delta.X;
+    //
+    //     // More sensitive
+    //     if (Math.Abs(delta) < 0.1) return;
+    //     
+    //     // Step is 0.25x
+    //     int step = delta > 0 ? 1 : -1;
+    //
+    //     int newFps = (int)Math.Clamp(oldFps + step, 1, 60);
+    //     
+    //     vm.PreviewFps = newFps;
+    //
+    //     e.Handled = true;
+    // }
+    //
+    
+    public static double GetNewValueFromScroll(PointerWheelEventArgs e, double current, double step, double min, double max, double deltaThreshold = 0.1)
+    {
+        double delta = Math.Abs(e.Delta.Y) >= Math.Abs(e.Delta.X) ? e.Delta.Y : e.Delta.X;
+        if (Math.Abs(delta) < deltaThreshold) return current;
+        return Math.Clamp(current + (delta > 0 ? step : -step), min, max);
+    }
+
+    private void SpritePageViewZoomTextBox_OnPointerWheelChanged(object sender, PointerWheelEventArgs e)
+    {
+        SpritePageViewModel vm = DataContext as SpritePageViewModel;
+        vm.ZoomLevel = GetNewValueFromScroll(e, vm.ZoomLevel, 0.25, 0.25, 10.0);
+        e.Handled = true;
+    }
+
+    private void SpritePageViewFPSTextBox_OnPointerWheelChanged(object sender, PointerWheelEventArgs e)
+    {
+        SpritePageViewModel vm = DataContext as SpritePageViewModel;
+        vm.PreviewFps = (int)GetNewValueFromScroll(e, vm.PreviewFps, 1, 1, 60);
+        e.Handled = true;
+    }
     
+    protected override void OnDataContextChanged(EventArgs e)
+    {
+        base.OnDataContextChanged(e);
+        if (DataContext is not SpritePageViewModel vm) return;
 
+        // vm.RequestRender += () => SpritePagePreviewImage.InvalidateVisual();
+    }
     
-}
\ No newline at end of file
+
+    private void SpritePageViewFrameTextBox_OnPointerWheelChanged(object sender, PointerWheelEventArgs e)
+    {
+        SpritePageViewModel vm = DataContext as SpritePageViewModel;
+
+        if (vm.IsPaused)
+        {
+            vm.CurrentFrameDisplay = (int)GetNewValueFromScroll(e, vm.CurrentFrameDisplay, 1, 1, (double)vm.TotalFrames);
+            e.Handled = true;
+        }
+    }
+}

From 5902bdbd80c1df7c64128f97258930f10e610406 Mon Sep 17 00:00:00 2001
From: Kace <41309226+DoubleTrio@users.noreply.github.com>
Date: Sun, 7 Jun 2026 01:37:57 -0400
Subject: [PATCH 51/51] dictionary editor, do not navigate to parent after
 finishing adding key page

---
 .../DataEditor/DictionaryBoxViewModel.cs       |  3 +++
 .../Editors/System/DictionaryEditor.cs         |  7 ++++---
 .../Pages/ReflectedDataPageViewModel.cs        | 18 ++++++++++++++----
 .../ViewModels/Pages/SpritePageViewModel.cs    | 12 ++++++------
 .../Views/Pages/ReflectedDataPageView.axaml.cs |  4 ++--
 5 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/RogueEssence.Editor.Avalonia/DataEditor/DictionaryBoxViewModel.cs b/RogueEssence.Editor.Avalonia/DataEditor/DictionaryBoxViewModel.cs
index fb423eac..a500b9ee 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/DictionaryBoxViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/DictionaryBoxViewModel.cs
@@ -40,6 +40,9 @@ public DictionaryElement(StringConv conv, object key, object value)
         }
     }
 
+    
+    // TODO: Allow the user to edit primitive types (probably just numbers and strings) directly through the DataGrid
+    // Check for the type of the object in the key and value and have some ifs...
     public class DictionaryBoxViewModel : ViewModelBase
     {
         public ObservableCollection<DictionaryElement> Collection { get; }
diff --git a/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/DictionaryEditor.cs b/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/DictionaryEditor.cs
index e39e2269..86cb9cc1 100644
--- a/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/DictionaryEditor.cs
+++ b/RogueEssence.Editor.Avalonia/DataEditor/Editors/System/DictionaryEditor.cs
@@ -85,7 +85,7 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
             vm.OnEditKey += (object key, object element, bool advancedEdit, DictionaryBoxViewModel.EditElementOp op) =>
             {
                 EditorPageViewModel pageViewModel = control.FindAncestorViewModel<EditorPageViewModel>();
-                string elementName = name + "<Key>";
+                string elementName = name + "<KeySSS>";
                 string title = DataEditor.GetWindowTitle(parent, elementName, key, keyType,
                     ReflectionExt.GetPassableAttributes(1, attributes));
 
@@ -94,10 +94,11 @@ public override void LoadWindowControls(StackPanel control, string parent, Type
                 pageViewModel.Node.AddNodeIfNotExists(node);
 
                 NodeHelper.ExpandParents(node, true);
-                ReflectedDataPageViewModel
-                    newEditor = _context.PageFactory.CreatePage<ReflectedDataPageViewModel>(node);
+                ReflectedDataPageViewModel 
+                newEditor = _context.PageFactory.CreatePage<ReflectedDataPageViewModel>(node);
                 newEditor.SetPageTitle(title, pageViewModel.Node.Icon);
 
+                newEditor.ShouldNavigateAfterClosing(false);
                 newEditor.OnLoadAction = (StackPanel stack) =>
                 {
                     DataEditor.LoadClassControls(stack, parent, null, elementName, keyType,
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/Pages/ReflectedDataPageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/Pages/ReflectedDataPageViewModel.cs
index 54e63ee7..cb0ef004 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/Pages/ReflectedDataPageViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/Pages/ReflectedDataPageViewModel.cs
@@ -16,6 +16,7 @@ public class ReflectedDataPageViewModel : EditorPageViewModel<NodeBase>
     public Func<StackPanel, Task<bool>> OnOKAction;
     
     private bool _shouldRemoveNode = true;
+    private bool _shouldNavigateAfterClosing = true;
     
     public ReflectedDataPageViewModel(EditorContext context,
         NodeBase node, Action<EditorPageViewModel> onPageLoad) : base(context, node, onPageLoad)
@@ -28,6 +29,14 @@ public void SetRemoveNode(bool remove)
         _shouldRemoveNode = remove;
     }
     
+    // Whether to navigate to a tab after closing. This is only used in the DictionaryEditor since
+    // it requires adding two consecutive pages -- one for adding a key and another for adding the value
+    // We don't want to navigate back to the parent after adding a key
+    public void ShouldNavigateAfterClosing(bool navigate)
+    {
+        _shouldNavigateAfterClosing = navigate;
+    }
+    
     private bool _isRootPage;
     public bool IsRootPage
     {
@@ -82,10 +91,11 @@ public PageNode GetPageNode()
         PageNode node = _context.TabEvents.GetPageNode(this);
         return node;
     }
-    public void NavigateToTab(EditorPageViewModel page)
+    public void TryNavigateToTab(EditorPageViewModel page)
     {
-      
-        _context.TabEvents.NavigateToTab(page);
-        
+        if (_shouldNavigateAfterClosing)
+        {
+            _context.TabEvents.NavigateToTab(page);
+        }
     }
 }
\ No newline at end of file
diff --git a/RogueEssence.Editor.Avalonia/ViewModels/Pages/SpritePageViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/Pages/SpritePageViewModel.cs
index a1bec2f3..162bcbcd 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/Pages/SpritePageViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/Pages/SpritePageViewModel.cs
@@ -360,7 +360,9 @@ private void StartPreview(string? item)
         StopPreview();
         if (item == null) return;
 
-        DevForm.ExecuteOrPend(() =>
+        // DevForm.ExecuteOrPend(() =>
+        // {
+        Dispatcher.UIThread.InvokeAsync(() =>
         {
             lock (GameBase.lockObj)
             {
@@ -393,11 +395,8 @@ private void StartPreview(string? item)
                             {
                                 _animTimer = new DispatcherTimer(DispatcherPriority.Render);
                                 _animTimer.Interval = TimeSpan.FromSeconds(1.0 / PreviewFps);
-                           
-                                _animTimer.Tick += (_, _) =>
-                                {
-                                    CurrentFrame = (CurrentFrame + 1) % sheet.TotalX;
-                                };
+
+                                _animTimer.Tick += (_, _) => { CurrentFrame = (CurrentFrame + 1) % sheet.TotalX; };
                                 if (!IsPaused)
                                     _animTimer.Start();
                             }
@@ -410,6 +409,7 @@ private void StartPreview(string? item)
                 }
             }
         });
+        // });
     }
 
     private void _updateBitmap()
diff --git a/RogueEssence.Editor.Avalonia/Views/Pages/ReflectedDataPageView.axaml.cs b/RogueEssence.Editor.Avalonia/Views/Pages/ReflectedDataPageView.axaml.cs
index 75a53df9..0fcc573b 100644
--- a/RogueEssence.Editor.Avalonia/Views/Pages/ReflectedDataPageView.axaml.cs
+++ b/RogueEssence.Editor.Avalonia/Views/Pages/ReflectedDataPageView.axaml.cs
@@ -50,7 +50,7 @@ public async void btnOK_Click(object sender, RoutedEventArgs e)
                 vm.Close();
             if (parent != null)
             {
-                vm.NavigateToTab(parent.Page);
+                vm.TryNavigateToTab(parent.Page);
             }
         }
     }
@@ -64,7 +64,7 @@ public void btnCancel_Click(object sender, RoutedEventArgs e)
             vm.Close();
             if (parent != null)
             {
-                vm.NavigateToTab(parent.Page);
+                vm.TryNavigateToTab(parent.Page);
             }
         }
     }