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/Content/AnimEditViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/Content/AnimEditViewModel.cs
index eb697f80..5b80b6ea 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;
 
@@ -79,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 + "/";
 
@@ -99,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()
@@ -108,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()
@@ -130,53 +151,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;
-
+            IStorageFolder directory = await parent.StorageProvider.TryGetFolderFromPathAsync(folderName);
+            await Dispatcher.UIThread.InvokeAsync(async () =>
             {
-                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)
-            {
-                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/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 0aa69058..84547905 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
 {
@@ -69,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;
+                }
+            });
         }
 
 
@@ -110,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;
-
-            string folder = await openFileDialog.ShowAsync(parent);
-
-            if (!String.IsNullOrEmpty(folder))
+            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()
@@ -147,55 +166,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/DevForm/DevTabDataViewModel.cs b/RogueEssence.Editor.Avalonia/ViewModels/DevForm/DevTabDataViewModel.cs
index 1a2347c6..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)
@@ -470,10 +490,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..fd59fa2e 100644
--- a/RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/GroundEditViewModel.cs
+++ b/RogueEssence.Editor.Avalonia/ViewModels/GroundEditForm/GroundEditViewModel.cs
@@ -17,6 +17,8 @@
 using System.Collections.ObjectModel;
 using System.Diagnostics;
 using System.Threading.Tasks;
+using Avalonia.Platform.Storage;
+using Avalonia.Threading;
 
 namespace RogueEssence.Dev.ViewModels
 {
@@ -71,35 +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/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/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()
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)
         {