diff --git a/README.md b/README.md
index acb68ba4..e266306c 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@ The following is on my roadmap for future updates:
 
 ### Prerequisites
 
-OpenTracker is a .NET 8.0 application.  You will be required to install a .NET runtime version 8.0 or greater.  You can find it at this link: https://dotnet.microsoft.com/download/dotnet
+OpenTracker is a .NET 10.0 application.  You will be required to install a .NET runtime version 10.0 or greater.  You can find it at this link: https://dotnet.microsoft.com/download/dotnet
 
 ### Windows
 
diff --git a/src/OpenTracker.Models/AutoTracking/SNESConnectors/Requests/GetDeviceInfoRequest.cs b/src/OpenTracker.Models/AutoTracking/SNESConnectors/Requests/GetDeviceInfoRequest.cs
index e1491bed..6b928f0b 100644
--- a/src/OpenTracker.Models/AutoTracking/SNESConnectors/Requests/GetDeviceInfoRequest.cs
+++ b/src/OpenTracker.Models/AutoTracking/SNESConnectors/Requests/GetDeviceInfoRequest.cs
@@ -1,10 +1,9 @@
-using System;
 using System.Collections.Generic;
 using System.Threading;
 using Newtonsoft.Json;
 using OpenTracker.Models.AutoTracking.SNESConnectors.Socket;
+using OpenTracker.Models.Exceptions;
 using OpenTracker.Models.Logging;
-using LogLevel = OpenTracker.Models.Logging.LogLevel;
 
 namespace OpenTracker.Models.AutoTracking.SNESConnectors.Requests
 {
@@ -34,8 +33,7 @@ public override IEnumerable<string> ProcessResponseAndReturnResults(IMessageEven
 
             if (!deserialized!.TryGetValue("Results", out var results))
             {
-                throw new Exception(
-                    $"Request \'{Description}\' is invalid and does not contain a \'Results\' key.");
+                throw new InvalidRequestResponseException(Description, "Results");
             }
             
             Logger.Debug("Request \'{Description}\' response successfully deserialized",
diff --git a/src/OpenTracker.Models/AutoTracking/SNESConnectors/Requests/GetDevicesRequest.cs b/src/OpenTracker.Models/AutoTracking/SNESConnectors/Requests/GetDevicesRequest.cs
index 227f41b0..8d81b3de 100644
--- a/src/OpenTracker.Models/AutoTracking/SNESConnectors/Requests/GetDevicesRequest.cs
+++ b/src/OpenTracker.Models/AutoTracking/SNESConnectors/Requests/GetDevicesRequest.cs
@@ -3,8 +3,8 @@
 using System.Threading;
 using Newtonsoft.Json;
 using OpenTracker.Models.AutoTracking.SNESConnectors.Socket;
+using OpenTracker.Models.Exceptions;
 using OpenTracker.Models.Logging;
-using LogLevel = OpenTracker.Models.Logging.LogLevel;
 
 namespace OpenTracker.Models.AutoTracking.SNESConnectors.Requests
 {
@@ -34,8 +34,7 @@ public override IEnumerable<string> ProcessResponseAndReturnResults(IMessageEven
 
             if (!deserialized!.TryGetValue("Results", out var results))
             {
-                throw new Exception(
-                    $"Request \'{Description}\' is invalid and does not contain a \'Results\' key.");
+                throw new InvalidRequestResponseException(Description, "Results");
             }
             
             Logger.Debug("Request \'{Description}\' response successfully deserialized",
diff --git a/src/OpenTracker.Models/AutoTracking/SNESConnectors/Requests/RegisterNameRequest.cs b/src/OpenTracker.Models/AutoTracking/SNESConnectors/Requests/RegisterNameRequest.cs
index e96ecec9..06ae0969 100644
--- a/src/OpenTracker.Models/AutoTracking/SNESConnectors/Requests/RegisterNameRequest.cs
+++ b/src/OpenTracker.Models/AutoTracking/SNESConnectors/Requests/RegisterNameRequest.cs
@@ -3,7 +3,6 @@
 using System.Threading;
 using OpenTracker.Models.AutoTracking.SNESConnectors.Socket;
 using OpenTracker.Models.Logging;
-using WebSocketSharp;
 
 namespace OpenTracker.Models.AutoTracking.SNESConnectors.Requests
 {
diff --git a/src/OpenTracker.Models/AutoTracking/SNESConnectors/Requests/RequestBase.cs b/src/OpenTracker.Models/AutoTracking/SNESConnectors/Requests/RequestBase.cs
index a535ad5a..6db257d5 100644
--- a/src/OpenTracker.Models/AutoTracking/SNESConnectors/Requests/RequestBase.cs
+++ b/src/OpenTracker.Models/AutoTracking/SNESConnectors/Requests/RequestBase.cs
@@ -3,7 +3,6 @@
 using Newtonsoft.Json;
 using OpenTracker.Models.AutoTracking.SNESConnectors.Socket;
 using OpenTracker.Models.Logging;
-using LogLevel = OpenTracker.Models.Logging.LogLevel;
 
 namespace OpenTracker.Models.AutoTracking.SNESConnectors.Requests
 {
diff --git a/src/OpenTracker.Models/Exceptions/InvalidRequestResponseException.cs b/src/OpenTracker.Models/Exceptions/InvalidRequestResponseException.cs
new file mode 100644
index 00000000..16b51101
--- /dev/null
+++ b/src/OpenTracker.Models/Exceptions/InvalidRequestResponseException.cs
@@ -0,0 +1,16 @@
+using System;
+
+namespace OpenTracker.Models.Exceptions;
+
+public class InvalidRequestResponseException : Exception
+{
+    public string RequestDescription { get; }
+    public string MissingKey { get; }
+
+    public InvalidRequestResponseException(string requestDescription, string missingKey)
+        : base($"Request '{requestDescription}' is invalid and does not contain a '{missingKey}' key.")
+    {
+        RequestDescription = requestDescription;
+        MissingKey = missingKey;
+    }
+}
\ No newline at end of file
diff --git a/src/OpenTracker.Models/OpenTracker.Models.csproj b/src/OpenTracker.Models/OpenTracker.Models.csproj
index 5b669df5..8c6ec6bf 100644
--- a/src/OpenTracker.Models/OpenTracker.Models.csproj
+++ b/src/OpenTracker.Models/OpenTracker.Models.csproj
@@ -1,20 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <Nullable>enable</Nullable>
     <Version>1.8.7</Version>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0">
+    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="10.0.100">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="ReactiveUI.Fody" Version="19.4.1" />
-    <PackageReference Include="Serilog.Sinks.Debug" Version="2.0.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
+    <PackageReference Include="ReactiveUI.Fody" Version="19.5.41" />
+    <PackageReference Include="Serilog.Sinks.Debug" Version="3.0.0" />
     <PackageReference Include="WebSocketSharp-netstandard" Version="1.0.1" />
   </ItemGroup>
 
diff --git a/src/OpenTracker.Utils/OpenTracker.Utils.csproj b/src/OpenTracker.Utils/OpenTracker.Utils.csproj
index 4707db4f..cb36b90d 100644
--- a/src/OpenTracker.Utils/OpenTracker.Utils.csproj
+++ b/src/OpenTracker.Utils/OpenTracker.Utils.csproj
@@ -1,22 +1,22 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <Nullable>enable</Nullable>
     <Version>1.8.5</Version>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Autofac" Version="7.1.0" />
-    <PackageReference Include="Avalonia" Version="0.10.22" />
-    <PackageReference Include="Avalonia.Markup.Xaml.Loader" Version="0.10.22" />
-    <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.22" />
-    <PackageReference Include="JetBrains.Annotations" Version="2023.2.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="ReactiveUI.Fody" Version="19.4.1" />
-    <PackageReference Include="Serilog" Version="3.0.1" />
-    <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
+    <PackageReference Include="Autofac" Version="8.4.0" />
+    <PackageReference Include="Avalonia" Version="11.3.8" />
+    <PackageReference Include="Avalonia.Markup.Xaml.Loader" Version="11.3.8" />
+    <PackageReference Include="Avalonia.ReactiveUI" Version="11.3.8" />
+    <PackageReference Include="JetBrains.Annotations" Version="2025.2.2" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
+    <PackageReference Include="ReactiveUI.Fody" Version="19.5.41" />
+    <PackageReference Include="Serilog" Version="4.3.0" />
+    <PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
   </ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/src/OpenTracker.Utils/ViewLocator.cs b/src/OpenTracker.Utils/ViewLocator.cs
index aa6ea41d..dec10973 100644
--- a/src/OpenTracker.Utils/ViewLocator.cs
+++ b/src/OpenTracker.Utils/ViewLocator.cs
@@ -11,8 +11,11 @@ public class ViewLocator : IDataTemplate
         public static bool SupportsRecycling =>
             false;
 
-        public IControl Build(object data)
+        public Control? Build(object? data)
         {
+            if (data == null)
+                return null;
+
             var assembly = Assembly.GetEntryAssembly() ??
                 throw new NullReferenceException();
             var viewTypes = assembly.GetTypes();
@@ -29,7 +32,7 @@ public IControl Build(object data)
             }
         }
 
-        public bool Match(object data)
+        public bool Match(object? data)
         {
             return data is ViewModelBase;
         }
diff --git a/src/OpenTracker/App.axaml b/src/OpenTracker/App.axaml
index 2e0071ad..25789cce 100644
--- a/src/OpenTracker/App.axaml
+++ b/src/OpenTracker/App.axaml
@@ -8,9 +8,8 @@
 	</Application.DataTemplates>
 
 	<Application.Styles>
-    
-		<StyleInclude Source="avares://Avalonia.Themes.Default/DefaultTheme.xaml" />
-		<StyleInclude Source="avares://ThemeEditor.Controls.ColorPicker/ColorPicker.axaml" />
+		<StyleInclude Source="avares://Avalonia.Themes.Fluent/FluentTheme.xaml" />
+		<StyleInclude Source="avares://Avalonia.Controls.ColorPicker/Themes/Fluent/Fluent.xaml" />
 
 		<Style Selector="Border.AutoTrackerLog">
 			<Setter Property="Background" Value="{DynamicResource ThemeAccentBrush}" />
diff --git a/src/OpenTracker/App.axaml.cs b/src/OpenTracker/App.axaml.cs
index 79b389ef..a57f9b40 100644
--- a/src/OpenTracker/App.axaml.cs
+++ b/src/OpenTracker/App.axaml.cs
@@ -3,9 +3,7 @@
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
-using Avalonia.Logging;
 using Avalonia.Markup.Xaml;
-using OpenTracker.Models;
 using OpenTracker.Models.SaveLoad;
 using OpenTracker.Utils;
 using OpenTracker.Utils.Themes;
@@ -53,8 +51,10 @@ private static void SetThemeToLastOrDefault(IThemeManager selector)
 
         public override void Initialize()
         {
-            Logger.Sink = new AvaloniaSerilogSink(
-                AppPath.AvaloniaLogFilePath, Serilog.Events.LogEventLevel.Warning);
+            // Note: Avalonia 11 logging integration
+            // Logger.Sink has been replaced with more modern logging patterns
+            // For now, we rely on LogToTrace() in Program.cs and Serilog for app-level logging
+            // If Avalonia-specific logging is needed, consider using a logging bridge
 
             AvaloniaXamlLoader.Load(this);
         }
diff --git a/src/OpenTracker/Autofac/ContainerBuilderAvaloniaExtensions.cs b/src/OpenTracker/Autofac/ContainerBuilderAvaloniaExtensions.cs
index b169862a..beffdba5 100644
--- a/src/OpenTracker/Autofac/ContainerBuilderAvaloniaExtensions.cs
+++ b/src/OpenTracker/Autofac/ContainerBuilderAvaloniaExtensions.cs
@@ -1,6 +1,5 @@
 using Autofac;
 using Avalonia.ReactiveUI;
-using Avalonia.Threading;
 using ReactiveUI;
 using Splat;
 using Splat.Autofac;
@@ -13,20 +12,26 @@ namespace OpenTracker.Autofac;
 public static class ContainerBuilderAvaloniaExtensions
 {
     public static ContainerBuilder ConfigureAvalonia(this ContainerBuilder builder)
-    {
-        var autofacResolver = builder.UseAutofacDependencyResolver();
-        builder.RegisterInstance(autofacResolver);
-        autofacResolver.InitializeReactiveUI();
-        
-        RxApp.MainThreadScheduler = AvaloniaScheduler.Instance;
-        
-        Locator.CurrentMutable.RegisterConstant(
-            new AvaloniaActivationForViewFetcher(),
-            typeof(IActivationForViewFetcher));
-        Locator.CurrentMutable.RegisterConstant(
-            new AutoDataTemplateBindingHook(),
-            typeof(IPropertyBindingHook));
-        
-        return builder;
-    }
+{
+    ConfigureAutofacResolver(builder);
+    ConfigureReactiveUIServices();
+    return builder;
+}
+
+private static void ConfigureAutofacResolver(ContainerBuilder builder)
+{
+    var autofacResolver = builder.UseAutofacDependencyResolver();
+    builder.RegisterInstance(autofacResolver);
+    RxApp.MainThreadScheduler = AvaloniaScheduler.Instance;
+}
+
+private static void ConfigureReactiveUIServices()
+{
+    Locator.CurrentMutable.RegisterConstant(
+        new AvaloniaActivationForViewFetcher(),
+        typeof(IActivationForViewFetcher));
+    Locator.CurrentMutable.RegisterConstant(
+        new AutoDataTemplateBindingHook(),
+        typeof(IPropertyBindingHook));
+}
 }
\ No newline at end of file
diff --git a/src/OpenTracker/Models/AvaloniaSerilogSink.cs b/src/OpenTracker/Models/AvaloniaSerilogSink.cs
index bfde3f8a..98570657 100644
--- a/src/OpenTracker/Models/AvaloniaSerilogSink.cs
+++ b/src/OpenTracker/Models/AvaloniaSerilogSink.cs
@@ -116,7 +116,7 @@ public void Log(LogEventLevel level, string area, object? source, string message
         /// </returns>
         private static object? GetHierarchy(object? source)
         {
-            if (source is not IControl visual)
+            if (source is not Control visual)
             {
                 return source;
             }
@@ -130,10 +130,16 @@ public void Log(LogEventLevel level, string area, object? source, string message
 
             while (visual.Parent is not null)
             {
-                visual = visual.Parent;
-                visualString = visual.ToString() ?? throw new NullReferenceException();
-
-                hierarchy.Insert(0, visualString);
+                if (visual.Parent is Control parentControl)
+                {
+                    visual = parentControl;
+                    visualString = visual.ToString() ?? throw new NullReferenceException();
+                    hierarchy.Insert(0, visualString);
+                }
+                else
+                {
+                    break;
+                }
             }
 
             return string.Join("/", hierarchy);
diff --git a/src/OpenTracker/OpenTracker.csproj b/src/OpenTracker/OpenTracker.csproj
index 42b98c80..adbc9a3c 100644
--- a/src/OpenTracker/OpenTracker.csproj
+++ b/src/OpenTracker/OpenTracker.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <SelfContained>True</SelfContained>
     <ApplicationIcon>triforce.ico</ApplicationIcon>
     <Win32Resource />
@@ -36,43 +36,46 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Autofac" Version="7.1.0" />
-    <PackageReference Include="Avalonia" Version="0.10.22" />
-    <PackageReference Include="Avalonia.Desktop" Version="0.10.22" />
-    <PackageReference Include="Avalonia.Diagnostics" Version="0.10.22" />
-    <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.22" />
-    <PackageReference Include="Avalonia.Xaml.Behaviors" Version="0.10.22" />
+    <PackageReference Include="Autofac" Version="8.4.0" />
+    <PackageReference Include="Avalonia" Version="11.3.8" />
+    <PackageReference Include="Avalonia.Desktop" Version="11.3.8" />
+    <PackageReference Include="Avalonia.Diagnostics" Version="11.3.8" />
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.8" />
+    <PackageReference Include="Avalonia.ReactiveUI" Version="11.3.8" />
+    <PackageReference Include="Avalonia.Xaml.Interactivity" Version="11.3.0.6" />
+    <PackageReference Include="Avalonia.Xaml.Interactions" Version="11.3.0.6" />
+    <PackageReference Include="Avalonia.Xaml.Interactions.DragAndDrop" Version="11.3.0.6" />
     <PackageReference Include="Dotnet.Bundle" Version="0.9.13" />
-    <PackageReference Include="JetBrains.Annotations" Version="2023.2.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4">
+    <PackageReference Include="JetBrains.Annotations" Version="2025.2.2" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.7.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.7.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.7.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0">
+    <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.14.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.14.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.14.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="10.0.100">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.CodeAnalysis.Scripting.Common" Version="4.7.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="ReactiveMarbles.ObservableEvents.SourceGenerator" Version="1.2.3">
+    <PackageReference Include="Microsoft.CodeAnalysis.Scripting.Common" Version="4.14.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
+    <PackageReference Include="ReactiveMarbles.ObservableEvents.SourceGenerator" Version="1.3.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="ReactiveProperty" Version="9.3.1" />
-    <PackageReference Include="ReactiveUI.Fody" Version="19.4.1" />
-    <PackageReference Include="Serilog" Version="3.0.1" />
-    <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
-    <PackageReference Include="SkiaSharp" Version="2.88.6" />
-    <PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="2.88.6" />
-    <PackageReference Include="SkiaSharp.NativeAssets.macOS" Version="2.88.6" />
-    <PackageReference Include="SkiaSharp.NativeAssets.WebAssembly" Version="2.88.6" />
-    <PackageReference Include="SkiaSharp.NativeAssets.Win32" Version="2.88.6" />
-    <PackageReference Include="Splat.Autofac" Version="14.7.1" />
-    <PackageReference Include="System.Drawing.Common" Version="7.0.0" />
-    <PackageReference Include="ThemeEditor.Controls.ColorPicker" Version="0.10.17" />
+    <PackageReference Include="ReactiveProperty" Version="9.8.0" />
+    <PackageReference Include="ReactiveUI.Fody" Version="19.5.41" />
+    <PackageReference Include="Serilog" Version="4.3.0" />
+    <PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
+    <PackageReference Include="SkiaSharp" Version="3.119.1" />
+    <PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="3.119.1" />
+    <PackageReference Include="SkiaSharp.NativeAssets.macOS" Version="3.119.1" />
+    <PackageReference Include="SkiaSharp.NativeAssets.WebAssembly" Version="3.119.1" />
+    <PackageReference Include="SkiaSharp.NativeAssets.Win32" Version="3.119.1" />
+    <PackageReference Include="Splat.Autofac" Version="17.1.1" />
+    <PackageReference Include="System.Drawing.Common" Version="10.0.0" />
+    <PackageReference Include="Avalonia.Controls.ColorPicker" Version="11.3.8" />
     <PackageReference Update="Packaging.Targets">
       <Version>0.1.232</Version>
     </PackageReference>
diff --git a/src/OpenTracker/Program.cs b/src/OpenTracker/Program.cs
index afa37668..04b1b6a4 100644
--- a/src/OpenTracker/Program.cs
+++ b/src/OpenTracker/Program.cs
@@ -13,7 +13,9 @@ public static void Main(string[] args) =>
 
         // Avalonia configuration, don't remove; also used by visual designer.
         public static AppBuilder BuildAvaloniaApp() =>
-            AppBuilder.Configure<App>().UsePlatformDetect().LogToTrace().UseReactiveUI()
-            .With(new AvaloniaNativePlatformOptions { UseGpu = false });
+            AppBuilder.Configure<App>()
+                .UsePlatformDetect()
+                .LogToTrace()
+                .UseReactiveUI();
     }
 }
diff --git a/src/OpenTracker/ValueConverters/BitmapValueConverter.cs b/src/OpenTracker/ValueConverters/BitmapValueConverter.cs
index c1cf3051..6cc3959b 100644
--- a/src/OpenTracker/ValueConverters/BitmapValueConverter.cs
+++ b/src/OpenTracker/ValueConverters/BitmapValueConverter.cs
@@ -2,7 +2,6 @@
 using System.Diagnostics;
 using System.Globalization;
 using System.IO;
-using Avalonia;
 using Avalonia.Data.Converters;
 using Avalonia.Media;
 using Avalonia.Media.Imaging;
@@ -39,8 +38,8 @@ public class BitmapValueConverter : IValueConverter
                         default:
                             try
                             {
-                                var assets = AvaloniaLocator.Current.GetService<IAssetLoader>();
-                                return new Bitmap(assets?.Open(uri));
+                                var assets = AssetLoader.Open(uri);
+                                return new Bitmap(assets);
                             }
                             catch (FileNotFoundException ex)
                             {
@@ -56,7 +55,7 @@ public class BitmapValueConverter : IValueConverter
 
         public object ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
         {
-            throw new Exception("All bindings should be one-way.");
+            throw new NotSupportedException("All bindings should be one-way.");
         }
     }
 }
diff --git a/src/OpenTracker/ViewModels/MapLocations/EntranceMapLocationVM.cs b/src/OpenTracker/ViewModels/MapLocations/EntranceMapLocationVM.cs
index 1e1fd35a..c7a16e7b 100644
--- a/src/OpenTracker/ViewModels/MapLocations/EntranceMapLocationVM.cs
+++ b/src/OpenTracker/ViewModels/MapLocations/EntranceMapLocationVM.cs
@@ -33,8 +33,8 @@ public class EntranceMapLocationVM : ViewModelBase, IEntranceMapLocationVM
 
         public ReactiveCommand<PointerReleasedEventArgs, Unit> HandleClick { get; }
         public ReactiveCommand<RoutedEventArgs, Unit> HandleDoubleClick { get; }
-        public ReactiveCommand<PointerEventArgs, Unit> HandlePointerEnter { get; }
-        public ReactiveCommand<PointerEventArgs, Unit> HandlePointerLeave { get; }
+        public ReactiveCommand<PointerEventArgs, Unit> HandlePointerEntered { get; }
+        public ReactiveCommand<PointerEventArgs, Unit> HandlePointerExited { get; }
 
         public delegate EntranceMapLocationVM Factory(
             IMapLocation mapLocation, double offsetX, double offsetY, List<Point> points);
@@ -80,8 +80,8 @@ public EntranceMapLocationVM(
 
             HandleClick = ReactiveCommand.Create<PointerReleasedEventArgs>(HandleClickImpl);
             HandleDoubleClick = ReactiveCommand.Create<RoutedEventArgs>(HandleDoubleClickImpl);
-            HandlePointerEnter = _colorProvider.HandlePointerEnter;
-            HandlePointerLeave = _colorProvider.HandlePointerLeave;
+            HandlePointerEntered = _colorProvider.HandlePointerEntered;
+            HandlePointerExited = _colorProvider.HandlePointerExited;
 
             _colorProvider.PropertyChanged += OnColorProviderChanged;
         }
diff --git a/src/OpenTracker/ViewModels/MapLocations/IMapLocationColorProvider.cs b/src/OpenTracker/ViewModels/MapLocations/IMapLocationColorProvider.cs
index 7b09e5f2..4a435455 100644
--- a/src/OpenTracker/ViewModels/MapLocations/IMapLocationColorProvider.cs
+++ b/src/OpenTracker/ViewModels/MapLocations/IMapLocationColorProvider.cs
@@ -9,8 +9,8 @@ public interface IMapLocationColorProvider : IReactiveObject
     {
         string BorderColor { get; }
         string Color { get; }
-        ReactiveCommand<PointerEventArgs, Unit> HandlePointerEnter { get; }
-        ReactiveCommand<PointerEventArgs, Unit> HandlePointerLeave { get; }
+        ReactiveCommand<PointerEventArgs, Unit> HandlePointerEntered { get; }
+        ReactiveCommand<PointerEventArgs, Unit> HandlePointerExited { get; }
 
         delegate IMapLocationColorProvider Factory(IMapLocation mapLocation);
     }
diff --git a/src/OpenTracker/ViewModels/MapLocations/IShapedMapLocationVMBase.cs b/src/OpenTracker/ViewModels/MapLocations/IShapedMapLocationVMBase.cs
index 8aa2a877..e46e0132 100644
--- a/src/OpenTracker/ViewModels/MapLocations/IShapedMapLocationVMBase.cs
+++ b/src/OpenTracker/ViewModels/MapLocations/IShapedMapLocationVMBase.cs
@@ -9,7 +9,7 @@ public interface IShapedMapLocationVMBase : IReactiveObject
         double OffsetX { get; }
         double OffsetY { get; }
         
-        ReactiveCommand<PointerEventArgs, Unit> HandlePointerEnter { get; }
-        ReactiveCommand<PointerEventArgs, Unit> HandlePointerLeave { get; }
+        ReactiveCommand<PointerEventArgs, Unit> HandlePointerEntered { get; }
+        ReactiveCommand<PointerEventArgs, Unit> HandlePointerExited { get; }
     }
 }
\ No newline at end of file
diff --git a/src/OpenTracker/ViewModels/MapLocations/MapLocationColorProvider.cs b/src/OpenTracker/ViewModels/MapLocations/MapLocationColorProvider.cs
index 6760bd45..b1ff8a47 100644
--- a/src/OpenTracker/ViewModels/MapLocations/MapLocationColorProvider.cs
+++ b/src/OpenTracker/ViewModels/MapLocations/MapLocationColorProvider.cs
@@ -34,8 +34,8 @@ private bool Highlighted
         public string BorderColor => Highlighted ? "#ffffffff" : "#ff000000";
         public string Color => _colorSettings.AccessibilityColors[_mapLocation.Location.Accessibility];
         
-        public ReactiveCommand<PointerEventArgs, Unit> HandlePointerEnter { get; }
-        public ReactiveCommand<PointerEventArgs, Unit> HandlePointerLeave { get; }
+        public ReactiveCommand<PointerEventArgs, Unit> HandlePointerEntered { get; }
+        public ReactiveCommand<PointerEventArgs, Unit> HandlePointerExited { get; }
 
         /// <summary>
         /// Constructor
@@ -51,8 +51,8 @@ public MapLocationColorProvider(IColorSettings colorSettings, IMapLocation mapLo
             _colorSettings = colorSettings;
             _mapLocation = mapLocation;
 
-            HandlePointerEnter = ReactiveCommand.Create<PointerEventArgs>(HandlePointerEnterImpl);
-            HandlePointerLeave = ReactiveCommand.Create<PointerEventArgs>(HandlePointerLeaveImpl);
+            HandlePointerEntered = ReactiveCommand.Create<PointerEventArgs>(HandlePointerEnteredImpl);
+            HandlePointerExited = ReactiveCommand.Create<PointerEventArgs>(HandlePointerExitedImpl);
 
             _colorSettings.PropertyChanged += OnColorChanged;
             _mapLocation.Location.PropertyChanged += OnLocationChanged;
@@ -110,9 +110,9 @@ private void Unhighlight()
         /// Handles pointer entering the control.
         /// </summary>
         /// <param name="e">
-        /// The PointerEnter event args.
+        /// The PointerEntered event args.
         /// </param>
-        private void HandlePointerEnterImpl(PointerEventArgs e)
+        private void HandlePointerEnteredImpl(PointerEventArgs e)
         {
             Highlight();
         }
@@ -121,9 +121,9 @@ private void HandlePointerEnterImpl(PointerEventArgs e)
         /// Handles pointer leaving the control.
         /// </summary>
         /// <param name="e">
-        /// The PointerLeave event args.
+        /// The PointerExited event args.
         /// </param>
-        private void HandlePointerLeaveImpl(PointerEventArgs e)
+        private void HandlePointerExitedImpl(PointerEventArgs e)
         {
             Unhighlight();
         }
diff --git a/src/OpenTracker/ViewModels/MapLocations/MapLocationVM.cs b/src/OpenTracker/ViewModels/MapLocations/MapLocationVM.cs
index 86947452..5b429871 100644
--- a/src/OpenTracker/ViewModels/MapLocations/MapLocationVM.cs
+++ b/src/OpenTracker/ViewModels/MapLocations/MapLocationVM.cs
@@ -108,8 +108,8 @@ private double MarkingOffsetY
         public double CanvasX => BaseX + Location.OffsetX + MarkingOffsetX;
         public double CanvasY => BaseY + Location.OffsetY + MarkingOffsetY;
         
-        public ReactiveCommand<PointerEventArgs, Unit> HandlePointerEnter { get; }
-        public ReactiveCommand<PointerEventArgs, Unit> HandlePointerLeave { get; }
+        public ReactiveCommand<PointerEventArgs, Unit> HandlePointerEntered { get; }
+        public ReactiveCommand<PointerEventArgs, Unit> HandlePointerExited { get; }
 
         /// <summary>
         /// Constructor
@@ -154,8 +154,8 @@ public MapLocationVM(
             Location = location;
             ToolTip = toolTip;
 
-            HandlePointerEnter = Location.HandlePointerEnter;
-            HandlePointerLeave = Location.HandlePointerLeave;
+            HandlePointerEntered = Location.HandlePointerEntered;
+            HandlePointerExited = Location.HandlePointerExited;
 
             PropertyChanged += OnPropertyChanged;
             _appSettings.Layout.PropertyChanged += OnLayoutChanged;
diff --git a/src/OpenTracker/ViewModels/MapLocations/ShopMapLocationVM.cs b/src/OpenTracker/ViewModels/MapLocations/ShopMapLocationVM.cs
index 415ac751..1c19e57c 100644
--- a/src/OpenTracker/ViewModels/MapLocations/ShopMapLocationVM.cs
+++ b/src/OpenTracker/ViewModels/MapLocations/ShopMapLocationVM.cs
@@ -27,8 +27,8 @@ public class ShopMapLocationVM : ViewModelBase, IShapedMapLocationVMBase
         
         public ReactiveCommand<PointerReleasedEventArgs, Unit> HandleClick { get; }
         public ReactiveCommand<RoutedEventArgs, Unit> HandleDoubleClick { get; }
-        public ReactiveCommand<PointerEventArgs, Unit> HandlePointerEnter { get; }
-        public ReactiveCommand<PointerEventArgs, Unit> HandlePointerLeave { get; }
+        public ReactiveCommand<PointerEventArgs, Unit> HandlePointerEntered { get; }
+        public ReactiveCommand<PointerEventArgs, Unit> HandlePointerExited { get; }
 
         public delegate ShopMapLocationVM Factory(IMapLocation mapLocation);
 
@@ -54,8 +54,8 @@ public ShopMapLocationVM(
 
             HandleClick = ReactiveCommand.Create<PointerReleasedEventArgs>(HandleClickImpl);
             HandleDoubleClick = ReactiveCommand.Create<RoutedEventArgs>(HandleDoubleClickImpl);
-            HandlePointerEnter = _colorProvider.HandlePointerEnter;
-            HandlePointerLeave = _colorProvider.HandlePointerLeave;
+            HandlePointerEntered = _colorProvider.HandlePointerEntered;
+            HandlePointerExited = _colorProvider.HandlePointerExited;
 
             _colorProvider.PropertyChanged += OnColorProviderChanged;
         }
diff --git a/src/OpenTracker/ViewModels/MapLocations/StandardMapLocationVM.cs b/src/OpenTracker/ViewModels/MapLocations/StandardMapLocationVM.cs
index d2102483..666fa4bc 100644
--- a/src/OpenTracker/ViewModels/MapLocations/StandardMapLocationVM.cs
+++ b/src/OpenTracker/ViewModels/MapLocations/StandardMapLocationVM.cs
@@ -82,8 +82,8 @@ public string? Label
         
         public ReactiveCommand<PointerReleasedEventArgs, Unit> HandleClick { get; }
         public ReactiveCommand<RoutedEventArgs, Unit> HandleDoubleClick { get; }
-        public ReactiveCommand<PointerEventArgs, Unit> HandlePointerEnter { get; }
-        public ReactiveCommand<PointerEventArgs, Unit> HandlePointerLeave { get; }
+        public ReactiveCommand<PointerEventArgs, Unit> HandlePointerEntered { get; }
+        public ReactiveCommand<PointerEventArgs, Unit> HandlePointerExited { get; }
 
         public delegate StandardMapLocationVM Factory(IMapLocation mapLocation);
 
@@ -120,8 +120,8 @@ public StandardMapLocationVM(
             
             HandleClick = ReactiveCommand.Create<PointerReleasedEventArgs>(HandleClickImpl);
             HandleDoubleClick = ReactiveCommand.Create<RoutedEventArgs>(HandleDoubleClickImpl);
-            HandlePointerEnter = _colorProvider.HandlePointerEnter;
-            HandlePointerLeave = _colorProvider.HandlePointerLeave;
+            HandlePointerEntered = _colorProvider.HandlePointerEntered;
+            HandlePointerExited = _colorProvider.HandlePointerExited;
 
             PropertyChanged += OnPropertyChanged;
             _trackerSettings.PropertyChanged += OnTrackerSettingsChanged;
diff --git a/src/OpenTracker/ViewModels/MapLocations/TakeAnyMapLocationVM.cs b/src/OpenTracker/ViewModels/MapLocations/TakeAnyMapLocationVM.cs
index 09e8bb63..ff880bb8 100644
--- a/src/OpenTracker/ViewModels/MapLocations/TakeAnyMapLocationVM.cs
+++ b/src/OpenTracker/ViewModels/MapLocations/TakeAnyMapLocationVM.cs
@@ -27,8 +27,8 @@ public class TakeAnyMapLocationVM : ViewModelBase, IShapedMapLocationVMBase
         
         public ReactiveCommand<PointerReleasedEventArgs, Unit> HandleClick { get; }
         public ReactiveCommand<RoutedEventArgs, Unit> HandleDoubleClick { get; }
-        public ReactiveCommand<PointerEventArgs, Unit> HandlePointerEnter { get; }
-        public ReactiveCommand<PointerEventArgs, Unit> HandlePointerLeave { get; }
+        public ReactiveCommand<PointerEventArgs, Unit> HandlePointerEntered { get; }
+        public ReactiveCommand<PointerEventArgs, Unit> HandlePointerExited { get; }
 
         public delegate TakeAnyMapLocationVM Factory(IMapLocation mapLocation);
 
@@ -54,8 +54,8 @@ public TakeAnyMapLocationVM(
 
             HandleClick = ReactiveCommand.Create<PointerReleasedEventArgs>(HandleClickImpl);
             HandleDoubleClick = ReactiveCommand.Create<RoutedEventArgs>(HandleDoubleClickImpl);
-            HandlePointerEnter = _colorProvider.HandlePointerEnter;
-            HandlePointerLeave = _colorProvider.HandlePointerLeave;
+            HandlePointerEntered = _colorProvider.HandlePointerEntered;
+            HandlePointerExited = _colorProvider.HandlePointerExited;
 
             _colorProvider.PropertyChanged += OnColorProviderChanged;
         }
diff --git a/src/OpenTracker/ViewModels/Maps/MapConnectionVM.cs b/src/OpenTracker/ViewModels/Maps/MapConnectionVM.cs
index 640b30f2..aa46121b 100644
--- a/src/OpenTracker/ViewModels/Maps/MapConnectionVM.cs
+++ b/src/OpenTracker/ViewModels/Maps/MapConnectionVM.cs
@@ -62,8 +62,8 @@ public bool Highlighted
         public string Color => Highlighted ? "#ffffffff" : _colorSettings.ConnectorColor;
         
         public ReactiveCommand<PointerReleasedEventArgs, Unit> HandleClick { get; }
-        public ReactiveCommand<PointerEventArgs, Unit> HandlePointerEnter { get; }
-        public ReactiveCommand<PointerEventArgs, Unit> HandlePointerLeave { get; }
+        public ReactiveCommand<PointerEventArgs, Unit> HandlePointerEntered { get; }
+        public ReactiveCommand<PointerEventArgs, Unit> HandlePointerExited { get; }
 
         /// <summary>
         /// Constructor
@@ -95,8 +95,8 @@ public MapConnectionVM(
             _undoRedoManager = undoRedoManager;
 
             HandleClick = ReactiveCommand.Create<PointerReleasedEventArgs>(HandleClickImpl);
-            HandlePointerEnter = ReactiveCommand.Create<PointerEventArgs>(HandlePointerEnterImpl);
-            HandlePointerLeave = ReactiveCommand.Create<PointerEventArgs>(HandlePointerLeaveImpl);
+            HandlePointerEntered = ReactiveCommand.Create<PointerEventArgs>(HandlePointerEnteredImpl);
+            HandlePointerExited = ReactiveCommand.Create<PointerEventArgs>(HandlePointerExitedImpl);
 
             PropertyChanged += OnPropertyChanged;
             _mapArea.PropertyChanged += OnMapAreaChanged;
@@ -225,9 +225,9 @@ private void HandleClickImpl(PointerReleasedEventArgs e)
         /// Handles pointer entering the control.
         /// </summary>
         /// <param name="e">
-        /// The PointerEnter event args.
+        /// The PointerEntered event args.
         /// </param>
-        private void HandlePointerEnterImpl(PointerEventArgs e)
+        private void HandlePointerEnteredImpl(PointerEventArgs e)
         {
             Highlight();
         }
@@ -236,9 +236,9 @@ private void HandlePointerEnterImpl(PointerEventArgs e)
         /// Handles pointer leaving the control.
         /// </summary>
         /// <param name="e">
-        /// The PointerLeave event args.
+        /// The PointerExited event args.
         /// </param>
-        private void HandlePointerLeaveImpl(PointerEventArgs e)
+        private void HandlePointerExitedImpl(PointerEventArgs e)
         {
             Unhighlight();
         }
diff --git a/src/OpenTracker/Views/Areas/MapArea.axaml b/src/OpenTracker/Views/Areas/MapArea.axaml
index aca5894e..9995223d 100644
--- a/src/OpenTracker/Views/Areas/MapArea.axaml
+++ b/src/OpenTracker/Views/Areas/MapArea.axaml
@@ -14,7 +14,7 @@
     <Viewbox Classes="MapArea">
       <Panel>
 
-        <ItemsControl Items="{Binding Maps}">
+        <ItemsControl ItemsSource="{Binding Maps}">
           <ItemsControl.ItemsPanel>
             <ItemsPanelTemplate>
               <StackPanel Orientation="{Binding Orientation, Mode=OneWay}" />
@@ -22,15 +22,15 @@
           </ItemsControl.ItemsPanel>
         </ItemsControl>
 
-        <ItemsControl Items="{Binding Connectors}">
+        <ItemsControl ItemsSource="{Binding Connectors}">
           <ItemsControl.ItemsPanel>
             <ItemsPanelTemplate>
               <Panel Classes="MapArea" />
             </ItemsPanelTemplate>
           </ItemsControl.ItemsPanel>
         </ItemsControl>
-        
-        <ItemsControl Classes="Canvas" Items="{Binding MapLocations}">
+
+        <ItemsControl Classes="Canvas" ItemsSource="{Binding MapLocations}">
           
           <ItemsControl.Styles>
             <Style Selector="ItemsControl.Canvas > ContentPresenter">
diff --git a/src/OpenTracker/Views/Areas/MapArea.axaml.cs b/src/OpenTracker/Views/Areas/MapArea.axaml.cs
index bb8c66a2..8d4f66de 100644
--- a/src/OpenTracker/Views/Areas/MapArea.axaml.cs
+++ b/src/OpenTracker/Views/Areas/MapArea.axaml.cs
@@ -3,7 +3,7 @@
 
 namespace OpenTracker.Views.Areas
 {
-    public class MapArea : UserControl
+    public partial class MapArea : UserControl
     {
         public MapArea()
         {
diff --git a/src/OpenTracker/Views/Areas/UIPanelArea.axaml.cs b/src/OpenTracker/Views/Areas/UIPanelArea.axaml.cs
index 2eb2fe88..20109541 100644
--- a/src/OpenTracker/Views/Areas/UIPanelArea.axaml.cs
+++ b/src/OpenTracker/Views/Areas/UIPanelArea.axaml.cs
@@ -3,7 +3,7 @@
 
 namespace OpenTracker.Views.Areas
 {
-    public class UIPanelArea : UserControl
+    public partial class UIPanelArea : UserControl
     {
         public UIPanelArea()
         {
diff --git a/src/OpenTracker/Views/AutoTracking/AutoTrackerLog.axaml b/src/OpenTracker/Views/AutoTracking/AutoTrackerLog.axaml
index 87615eab..f20b51e8 100644
--- a/src/OpenTracker/Views/AutoTracking/AutoTrackerLog.axaml
+++ b/src/OpenTracker/Views/AutoTracking/AutoTrackerLog.axaml
@@ -15,7 +15,7 @@
       <StackPanel Margin="10" HorizontalAlignment="Center" Orientation="Horizontal">
         <TextBlock Classes="AutoTrackerLabel">Logging Level:</TextBlock>
         <ComboBox Classes="AutoTrackerLogLevel"
-                  Items="{Binding LogLevelOptions, Mode=OneWay}"
+                  ItemsSource="{Binding LogLevelOptions, Mode=OneWay}"
                   SelectedItem="{Binding LogLevel, Mode=TwoWay}" />
       </StackPanel>
 
diff --git a/src/OpenTracker/Views/AutoTracking/AutoTrackerLog.axaml.cs b/src/OpenTracker/Views/AutoTracking/AutoTrackerLog.axaml.cs
index 79cd71a1..a1bd5bc9 100644
--- a/src/OpenTracker/Views/AutoTracking/AutoTrackerLog.axaml.cs
+++ b/src/OpenTracker/Views/AutoTracking/AutoTrackerLog.axaml.cs
@@ -3,7 +3,7 @@
 
 namespace OpenTracker.Views.AutoTracking
 {
-    public class AutoTrackerLog : UserControl
+    public partial class AutoTrackerLog : UserControl
     {
         public AutoTrackerLog()
         {
diff --git a/src/OpenTracker/Views/AutoTracking/AutoTrackerStatus.axaml.cs b/src/OpenTracker/Views/AutoTracking/AutoTrackerStatus.axaml.cs
index 4b97cd96..1dc9190f 100644
--- a/src/OpenTracker/Views/AutoTracking/AutoTrackerStatus.axaml.cs
+++ b/src/OpenTracker/Views/AutoTracking/AutoTrackerStatus.axaml.cs
@@ -3,7 +3,7 @@
 
 namespace OpenTracker.Views.AutoTracking
 {
-    public class AutoTrackerStatus : UserControl
+    public partial class AutoTrackerStatus : UserControl
     {
         public AutoTrackerStatus()
         {
diff --git a/src/OpenTracker/Views/BossSelect/BossSelectButton.axaml.cs b/src/OpenTracker/Views/BossSelect/BossSelectButton.axaml.cs
index 460880b1..9cecba3e 100644
--- a/src/OpenTracker/Views/BossSelect/BossSelectButton.axaml.cs
+++ b/src/OpenTracker/Views/BossSelect/BossSelectButton.axaml.cs
@@ -3,7 +3,7 @@
 
 namespace OpenTracker.Views.BossSelect
 {
-    public class BossSelectButton : UserControl
+    public partial class BossSelectButton : UserControl
     {
         public BossSelectButton()
         {
diff --git a/src/OpenTracker/Views/BossSelect/BossSelectPopup.axaml b/src/OpenTracker/Views/BossSelect/BossSelectPopup.axaml
index e75023f2..e0a50750 100644
--- a/src/OpenTracker/Views/BossSelect/BossSelectPopup.axaml
+++ b/src/OpenTracker/Views/BossSelect/BossSelectPopup.axaml
@@ -20,7 +20,7 @@
 
 			<Border Classes="Popup">
 				<StackPanel Orientation="Vertical">
-					<ItemsControl Items="{Binding Buttons}">
+					<ItemsControl ItemsSource="{Binding Buttons}">
 						<ItemsControl.ItemsPanel>
 							<ItemsPanelTemplate>
 								<WrapPanel ItemWidth="34" ItemHeight="40" MaxWidth="136" MaxHeight="120" Margin="0"
diff --git a/src/OpenTracker/Views/BossSelect/BossSelectPopup.axaml.cs b/src/OpenTracker/Views/BossSelect/BossSelectPopup.axaml.cs
index 88edc974..c548c5a1 100644
--- a/src/OpenTracker/Views/BossSelect/BossSelectPopup.axaml.cs
+++ b/src/OpenTracker/Views/BossSelect/BossSelectPopup.axaml.cs
@@ -3,7 +3,7 @@
 
 namespace OpenTracker.Views.BossSelect
 {
-    public class BossSelectPopup : UserControl
+    public partial class BossSelectPopup : UserControl
     {
         public BossSelectPopup()
         {
diff --git a/src/OpenTracker/Views/Capture/CaptureWindow.axaml.cs b/src/OpenTracker/Views/Capture/CaptureWindow.axaml.cs
index a24845f8..c223848e 100644
--- a/src/OpenTracker/Views/Capture/CaptureWindow.axaml.cs
+++ b/src/OpenTracker/Views/Capture/CaptureWindow.axaml.cs
@@ -4,7 +4,7 @@
 
 namespace OpenTracker.Views.Capture
 {
-    public class CaptureWindow : DialogWindowBase
+    public partial class CaptureWindow : DialogWindowBase
     {
         public CaptureWindow()
         {
diff --git a/src/OpenTracker/Views/Capture/Design/CaptureDesignDialog.axaml b/src/OpenTracker/Views/Capture/Design/CaptureDesignDialog.axaml
index a2d14a11..c0afbab2 100644
--- a/src/OpenTracker/Views/Capture/Design/CaptureDesignDialog.axaml
+++ b/src/OpenTracker/Views/Capture/Design/CaptureDesignDialog.axaml
@@ -16,7 +16,7 @@
     <Panel DockPanel.Dock="Left">
       <ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
         <TreeView Margin="1" Width="240"
-                  Items="{Binding Windows}">
+                  ItemsSource="{Binding Windows}">
           <TreeView.DataTemplates>
             <TreeDataTemplate DataType="capture:ICaptureControlVM">
               <TextBlock Text="{Binding Name}" />
diff --git a/src/OpenTracker/Views/Capture/Design/CaptureDesignDialog.axaml.cs b/src/OpenTracker/Views/Capture/Design/CaptureDesignDialog.axaml.cs
index 35a8d7f6..8f0d458c 100644
--- a/src/OpenTracker/Views/Capture/Design/CaptureDesignDialog.axaml.cs
+++ b/src/OpenTracker/Views/Capture/Design/CaptureDesignDialog.axaml.cs
@@ -4,7 +4,7 @@
 
 namespace OpenTracker.Views.Capture.Design
 {
-    public class CaptureDesignDialog : DialogWindowBase
+    public partial class CaptureDesignDialog : DialogWindowBase
     {
         public CaptureDesignDialog()
         {
diff --git a/src/OpenTracker/Views/Capture/Design/CaptureWindowDesign.axaml.cs b/src/OpenTracker/Views/Capture/Design/CaptureWindowDesign.axaml.cs
index 56aaf967..df817a0c 100644
--- a/src/OpenTracker/Views/Capture/Design/CaptureWindowDesign.axaml.cs
+++ b/src/OpenTracker/Views/Capture/Design/CaptureWindowDesign.axaml.cs
@@ -3,7 +3,7 @@
 
 namespace OpenTracker.Views.Capture.Design
 {
-    public class CaptureWindowDesign : UserControl
+    public partial class CaptureWindowDesign : UserControl
     {
         public CaptureWindowDesign()
         {
diff --git a/src/OpenTracker/Views/ColorSelect/ColorPickerControl.axaml b/src/OpenTracker/Views/ColorSelect/ColorPickerControl.axaml
deleted file mode 100644
index 910d7103..00000000
--- a/src/OpenTracker/Views/ColorSelect/ColorPickerControl.axaml
+++ /dev/null
@@ -1,14 +0,0 @@
-<UserControl xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:cp="clr-namespace:ThemeEditor.Controls.ColorPicker;assembly=ThemeEditor.Controls.ColorPicker"
-             mc:Ignorable="d" x:Class="OpenTracker.Views.ColorSelect.ColorPickerControl">
-	
-	<Design.DataContext>
-		<SolidColorBrush />
-	</Design.DataContext>
-	
-	<cp:ColorPicker Color="{Binding Path=Color, Mode=TwoWay}" />
-	
-</UserControl>
diff --git a/src/OpenTracker/Views/ColorSelect/ColorPickerControl.axaml.cs b/src/OpenTracker/Views/ColorSelect/ColorPickerControl.axaml.cs
deleted file mode 100644
index 44f3b0d9..00000000
--- a/src/OpenTracker/Views/ColorSelect/ColorPickerControl.axaml.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
-
-namespace OpenTracker.Views.ColorSelect
-{
-    public class ColorPickerControl : UserControl
-    {
-        public ColorPickerControl()
-        {
-            InitializeComponent();
-        }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-    }
-}
diff --git a/src/OpenTracker/Views/ColorSelect/ColorSelectControl.axaml b/src/OpenTracker/Views/ColorSelect/ColorSelectControl.axaml
index f6196f34..74de6766 100644
--- a/src/OpenTracker/Views/ColorSelect/ColorSelectControl.axaml
+++ b/src/OpenTracker/Views/ColorSelect/ColorSelectControl.axaml
@@ -12,16 +12,11 @@
   
   <StackPanel Orientation="Vertical">
     <Grid ColumnDefinitions="Auto * Auto">
-      <ToggleButton Classes="ColorSelect"
-                    Background="{Binding Color}"
-                    IsChecked="{Binding PickerOpen, Mode=TwoWay}" />
+      <ColorPicker Grid.Column="0"
+                   Color="{Binding Color.Color, Mode=TwoWay}" />
       <TextBlock Classes="ColorSelectLabel" Grid.Column="2"
                  Text="{Binding Label}" />
     </Grid>
-    <Border Classes="ColorPicker"
-            IsVisible="{Binding PickerOpen}">
-      <view:ColorPickerControl DataContext="{Binding Color}" />
-    </Border>
   </StackPanel>
   
 </UserControl>
diff --git a/src/OpenTracker/Views/ColorSelect/ColorSelectControl.axaml.cs b/src/OpenTracker/Views/ColorSelect/ColorSelectControl.axaml.cs
index 43a0e883..a924a6ac 100644
--- a/src/OpenTracker/Views/ColorSelect/ColorSelectControl.axaml.cs
+++ b/src/OpenTracker/Views/ColorSelect/ColorSelectControl.axaml.cs
@@ -3,7 +3,7 @@
 
 namespace OpenTracker.Views.ColorSelect
 {
-    public class ColorSelectControl : UserControl
+    public partial class ColorSelectControl : UserControl
     {
         public ColorSelectControl()
         {
diff --git a/src/OpenTracker/Views/ColorSelect/ColorSelectDialog.axaml b/src/OpenTracker/Views/ColorSelect/ColorSelectDialog.axaml
index 1852873c..940a2721 100644
--- a/src/OpenTracker/Views/ColorSelect/ColorSelectDialog.axaml
+++ b/src/OpenTracker/Views/ColorSelect/ColorSelectDialog.axaml
@@ -4,7 +4,8 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         mc:Ignorable="d" x:Class="OpenTracker.Views.ColorSelect.ColorSelectDialog"
-        Width="420" Height="554" Padding="5" CanResize="True" WindowStartupLocation="CenterScreen"
+        Background="{DynamicResource ThemeBackgroundBrush}"
+        SizeToContent="WidthAndHeight" Padding="5" CanResize="True" WindowStartupLocation="CenterOwner"
         Icon="avares://OpenTracker/Assets/Images/triforce.png" Title="OpenTracker - Color Select">
 	
 	<Design.DataContext>
@@ -12,11 +13,11 @@
 	</Design.DataContext>
 	
 	<ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
-		<StackPanel Orientation="Vertical">
+		<StackPanel Width="420" Orientation="Vertical">
 			
 			<TextBlock Classes="ColorSelectTitle" Text="Font Colors" />
 			
-			<ItemsControl Items="{Binding FontColors}">
+			<ItemsControl ItemsSource="{Binding FontColors}">
 				<ItemsControl.ItemsPanel>
 					<ItemsPanelTemplate>
 						<StackPanel Orientation="Vertical" />
@@ -26,7 +27,7 @@
 			
 			<TextBlock Classes="ColorSelectTitle" Text="Accessibility Colors" />
 			
-			<ItemsControl Items="{Binding  AccessibilityColors}">
+			<ItemsControl ItemsSource="{Binding  AccessibilityColors}">
 				<ItemsControl.ItemsPanel>
 					<ItemsPanelTemplate>
 						<StackPanel Orientation="Vertical" />
@@ -36,7 +37,7 @@
 			
 			<TextBlock Classes="ColorSelectTitle" Text="Connector Colors" />
 			
-			<ItemsControl Items="{Binding ConnectorColors}">
+			<ItemsControl ItemsSource="{Binding ConnectorColors}">
 				<ItemsControl.ItemsPanel>
 					<ItemsPanelTemplate>
 						<StackPanel Orientation="Vertical" />
diff --git a/src/OpenTracker/Views/ColorSelect/ColorSelectDialog.axaml.cs b/src/OpenTracker/Views/ColorSelect/ColorSelectDialog.axaml.cs
index 04fa4194..9f738717 100644
--- a/src/OpenTracker/Views/ColorSelect/ColorSelectDialog.axaml.cs
+++ b/src/OpenTracker/Views/ColorSelect/ColorSelectDialog.axaml.cs
@@ -4,7 +4,7 @@
 
 namespace OpenTracker.Views.ColorSelect
 {
-    public class ColorSelectDialog : DialogWindowBase
+    public partial class ColorSelectDialog : DialogWindowBase
     {
         public ColorSelectDialog()
         {
diff --git a/src/OpenTracker/Views/Dialogs/AboutDialog.axaml b/src/OpenTracker/Views/Dialogs/AboutDialog.axaml
index a93548ec..09fc8af3 100644
--- a/src/OpenTracker/Views/Dialogs/AboutDialog.axaml
+++ b/src/OpenTracker/Views/Dialogs/AboutDialog.axaml
@@ -4,6 +4,7 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         mc:Ignorable="d" x:Class="OpenTracker.Views.Dialogs.AboutDialog"
+        Background="{DynamicResource ThemeBackgroundBrush}"
         CanResize="False" SizeToContent="WidthAndHeight" WindowStartupLocation="CenterOwner"
         Icon="avares://OpenTracker/Assets/Images/triforce.png" Title="OpenTracker - About">
   
diff --git a/src/OpenTracker/Views/Dialogs/AboutDialog.axaml.cs b/src/OpenTracker/Views/Dialogs/AboutDialog.axaml.cs
index cd86118b..1d5264ca 100644
--- a/src/OpenTracker/Views/Dialogs/AboutDialog.axaml.cs
+++ b/src/OpenTracker/Views/Dialogs/AboutDialog.axaml.cs
@@ -4,7 +4,7 @@
 
 namespace OpenTracker.Views.Dialogs
 {
-    public class AboutDialog : DialogWindowBase
+    public partial class AboutDialog : DialogWindowBase
     {
         public AboutDialog()
         {
diff --git a/src/OpenTracker/Views/Dialogs/AutoTrackerDialog.axaml b/src/OpenTracker/Views/Dialogs/AutoTrackerDialog.axaml
index 86826313..b6acee04 100644
--- a/src/OpenTracker/Views/Dialogs/AutoTrackerDialog.axaml
+++ b/src/OpenTracker/Views/Dialogs/AutoTrackerDialog.axaml
@@ -4,6 +4,7 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         mc:Ignorable="d" x:Class="OpenTracker.Views.Dialogs.AutoTrackerDialog"
+        Background="{DynamicResource ThemeBackgroundBrush}"
         WindowStartupLocation="CenterOwner"
         Icon="avares://OpenTracker/Assets/Images/triforce.png"
         Title="OpenTracker - Auto-Tracker"
@@ -40,7 +41,7 @@
                 HorizontalAlignment="Center">
       <TextBlock Classes="AutoTrackerLabel">Device:</TextBlock>
       <ComboBox Classes="AutoTrackerDevices"
-                Items="{Binding Devices, Mode=OneWay}"
+                ItemsSource="{Binding Devices, Mode=OneWay}"
                 SelectedItem="{Binding Device, Mode=TwoWay}"
                 IsEnabled="{Binding DevicesComboBoxEnabled}" />
     </StackPanel>
diff --git a/src/OpenTracker/Views/Dialogs/AutoTrackerDialog.axaml.cs b/src/OpenTracker/Views/Dialogs/AutoTrackerDialog.axaml.cs
index 0c3d850c..98ea848b 100644
--- a/src/OpenTracker/Views/Dialogs/AutoTrackerDialog.axaml.cs
+++ b/src/OpenTracker/Views/Dialogs/AutoTrackerDialog.axaml.cs
@@ -4,7 +4,7 @@
 
 namespace OpenTracker.Views.Dialogs
 {
-    public class AutoTrackerDialog : DialogWindowBase
+    public partial class AutoTrackerDialog : DialogWindowBase
     {
         public AutoTrackerDialog()
         {
diff --git a/src/OpenTracker/Views/Dialogs/ErrorBoxDialog.axaml b/src/OpenTracker/Views/Dialogs/ErrorBoxDialog.axaml
index 253a99f5..219304f6 100644
--- a/src/OpenTracker/Views/Dialogs/ErrorBoxDialog.axaml
+++ b/src/OpenTracker/Views/Dialogs/ErrorBoxDialog.axaml
@@ -5,6 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         CanResize="False" mc:Ignorable="d" x:Class="OpenTracker.Views.Dialogs.ErrorBoxDialog"
         MaxWidth="400" SizeToContent="Height" Padding="5" WindowStartupLocation="CenterOwner"
+        Background="{DynamicResource ThemeBackgroundBrush}"
         Icon="avares://OpenTracker/Assets/Images/triforce.png"
         Title="{Binding Title}">
 
diff --git a/src/OpenTracker/Views/Dialogs/ErrorBoxDialog.axaml.cs b/src/OpenTracker/Views/Dialogs/ErrorBoxDialog.axaml.cs
index 986c8a43..2a140cb9 100644
--- a/src/OpenTracker/Views/Dialogs/ErrorBoxDialog.axaml.cs
+++ b/src/OpenTracker/Views/Dialogs/ErrorBoxDialog.axaml.cs
@@ -4,7 +4,7 @@
 
 namespace OpenTracker.Views.Dialogs
 {
-    public class ErrorBoxDialog : DialogWindowBase
+    public partial class ErrorBoxDialog : DialogWindowBase
     {
         public ErrorBoxDialog()
         {
diff --git a/src/OpenTracker/Views/Dialogs/MessageBoxDialog.axaml b/src/OpenTracker/Views/Dialogs/MessageBoxDialog.axaml
index cb583553..cfeca217 100644
--- a/src/OpenTracker/Views/Dialogs/MessageBoxDialog.axaml
+++ b/src/OpenTracker/Views/Dialogs/MessageBoxDialog.axaml
@@ -5,6 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         mc:Ignorable="d" x:Class="OpenTracker.Views.Dialogs.MessageBoxDialog"
         CanResize="False" MaxWidth="400" SizeToContent="Height" Padding="5" WindowStartupLocation="CenterOwner"
+        Background="{DynamicResource ThemeBackgroundBrush}"
         Icon="avares://OpenTracker/Assets/Images/triforce.png"
         Title="{Binding Title}">
 	
diff --git a/src/OpenTracker/Views/Dialogs/MessageBoxDialog.axaml.cs b/src/OpenTracker/Views/Dialogs/MessageBoxDialog.axaml.cs
index 11757fd5..efa07df3 100644
--- a/src/OpenTracker/Views/Dialogs/MessageBoxDialog.axaml.cs
+++ b/src/OpenTracker/Views/Dialogs/MessageBoxDialog.axaml.cs
@@ -4,7 +4,7 @@
 
 namespace OpenTracker.Views.Dialogs
 {
-    public class MessageBoxDialog : DialogWindowBase<bool>
+    public partial class MessageBoxDialog : DialogWindowBase<bool>
     {
         public MessageBoxDialog()
         {
diff --git a/src/OpenTracker/Views/Dialogs/SequenceBreakDialog.axaml b/src/OpenTracker/Views/Dialogs/SequenceBreakDialog.axaml
index bfe4f58e..35f594d3 100644
--- a/src/OpenTracker/Views/Dialogs/SequenceBreakDialog.axaml
+++ b/src/OpenTracker/Views/Dialogs/SequenceBreakDialog.axaml
@@ -4,7 +4,8 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         mc:Ignorable="d" x:Class="OpenTracker.Views.Dialogs.SequenceBreakDialog"
-        Padding="5" CanResize="False" WindowStartupLocation="CenterScreen" SizeToContent="WidthAndHeight"
+        Padding="5" CanResize="False" WindowStartupLocation="CenterOwner" SizeToContent="WidthAndHeight"
+        Background="{DynamicResource ThemeBackgroundBrush}"
         Icon="avares://OpenTracker/Assets/Images/triforce.png" Title="OpenTracker - Sequence Breaks">
   
   <Design.DataContext>
@@ -17,7 +18,7 @@
       <TextBlock Classes="SequenceBreakTitle" Text="Bomb Duplication" />
 
       <Panel HorizontalAlignment="Stretch">
-        <ItemsControl Items="{Binding BombDuplication}">
+        <ItemsControl ItemsSource="{Binding BombDuplication}">
           <ItemsControl.ItemsPanel>
             <ItemsPanelTemplate>
               <UniformGrid Columns="3" />
@@ -29,7 +30,7 @@
       <TextBlock Classes="SequenceBreakTitle" Text="Bomb Jumps" />
 
       <Panel HorizontalAlignment="Stretch">
-        <ItemsControl Items="{Binding BombJumps}">
+        <ItemsControl ItemsSource="{Binding BombJumps}">
           <ItemsControl.ItemsPanel>
             <ItemsPanelTemplate>
               <UniformGrid Columns="3" />
@@ -41,7 +42,7 @@
       <TextBlock Classes="SequenceBreakTitle" Text="Dark Rooms" />
 
       <Panel HorizontalAlignment="Stretch">
-        <ItemsControl Items="{Binding DarkRooms}">
+        <ItemsControl ItemsSource="{Binding DarkRooms}">
           <ItemsControl.ItemsPanel>
             <ItemsPanelTemplate>
               <UniformGrid Columns="3" />
@@ -53,7 +54,7 @@
       <TextBlock Classes="SequenceBreakTitle" Text="Fake Flippers/WaterWalk" />
 
       <Panel HorizontalAlignment="Stretch">
-        <ItemsControl Items="{Binding FakeFlippersWaterWalk}">
+        <ItemsControl ItemsSource="{Binding FakeFlippersWaterWalk}">
           <ItemsControl.ItemsPanel>
             <ItemsPanelTemplate>
               <UniformGrid Columns="3" />
@@ -65,7 +66,7 @@
       <TextBlock Classes="SequenceBreakTitle" Text="Super Bunny" />
 
       <Panel HorizontalAlignment="Stretch">
-        <ItemsControl Items="{Binding SuperBunny}">
+        <ItemsControl ItemsSource="{Binding SuperBunny}">
           <ItemsControl.ItemsPanel>
             <ItemsPanelTemplate>
               <UniformGrid Columns="3" />
@@ -77,7 +78,7 @@
       <TextBlock Classes="SequenceBreakTitle" Text="Other" />
 
       <Panel HorizontalAlignment="Stretch">
-        <ItemsControl Items="{Binding Other}">
+        <ItemsControl ItemsSource="{Binding Other}">
           <ItemsControl.ItemsPanel>
             <ItemsPanelTemplate>
               <UniformGrid Columns="3" />
diff --git a/src/OpenTracker/Views/Dialogs/SequenceBreakDialog.axaml.cs b/src/OpenTracker/Views/Dialogs/SequenceBreakDialog.axaml.cs
index 667d6f58..92db1d4b 100644
--- a/src/OpenTracker/Views/Dialogs/SequenceBreakDialog.axaml.cs
+++ b/src/OpenTracker/Views/Dialogs/SequenceBreakDialog.axaml.cs
@@ -4,7 +4,7 @@
 
 namespace OpenTracker.Views.Dialogs
 {
-    public class SequenceBreakDialog : DialogWindowBase
+    public partial class SequenceBreakDialog : DialogWindowBase
     {
         public SequenceBreakDialog()
         {
diff --git a/src/OpenTracker/Views/Dungeons/DungeonItem.axaml.cs b/src/OpenTracker/Views/Dungeons/DungeonItem.axaml.cs
index 6ee4a126..1d1c752f 100644
--- a/src/OpenTracker/Views/Dungeons/DungeonItem.axaml.cs
+++ b/src/OpenTracker/Views/Dungeons/DungeonItem.axaml.cs
@@ -3,7 +3,7 @@
 
 namespace OpenTracker.Views.Dungeons
 {
-    public class DungeonItem : UserControl
+    public partial class DungeonItem : UserControl
     {
         public DungeonItem()
         {
diff --git a/src/OpenTracker/Views/Dungeons/DungeonItemSection.axaml.cs b/src/OpenTracker/Views/Dungeons/DungeonItemSection.axaml.cs
index aaa87ab1..2a6a49ac 100644
--- a/src/OpenTracker/Views/Dungeons/DungeonItemSection.axaml.cs
+++ b/src/OpenTracker/Views/Dungeons/DungeonItemSection.axaml.cs
@@ -3,7 +3,7 @@
 
 namespace OpenTracker.Views.Dungeons
 {
-    public class DungeonItemSection : UserControl
+    public partial class DungeonItemSection : UserControl
     {
         public DungeonItemSection()
         {
diff --git a/src/OpenTracker/Views/Dungeons/DungeonPanel.axaml.cs b/src/OpenTracker/Views/Dungeons/DungeonPanel.axaml.cs
index 98289548..e4d02b99 100644
--- a/src/OpenTracker/Views/Dungeons/DungeonPanel.axaml.cs
+++ b/src/OpenTracker/Views/Dungeons/DungeonPanel.axaml.cs
@@ -3,7 +3,7 @@
 
 namespace OpenTracker.Views.Dungeons
 {
-    public class DungeonPanel : UserControl
+    public partial class DungeonPanel : UserControl
     {
         public DungeonPanel()
         {
diff --git a/src/OpenTracker/Views/Dungeons/HorizontalDungeonPanel.axaml b/src/OpenTracker/Views/Dungeons/HorizontalDungeonPanel.axaml
index 3b94c310..1920cd93 100644
--- a/src/OpenTracker/Views/Dungeons/HorizontalDungeonPanel.axaml
+++ b/src/OpenTracker/Views/Dungeons/HorizontalDungeonPanel.axaml
@@ -16,7 +16,7 @@
 
 			<StackPanel Margin="0 0 4 0" Orientation="Horizontal">
 				<Image Classes="DungeonLabel" Source="avares://OpenTracker/Assets/Images/hc.png" />
-				<ItemsControl Items="{Binding HCItems}">
+				<ItemsControl ItemsSource="{Binding HCItems}">
 					<ItemsControl.ItemsPanel>
 						<ItemsPanelTemplate>
 							<StackPanel Orientation="Horizontal" />
@@ -28,7 +28,7 @@
 			<StackPanel Orientation="Horizontal"
 			            IsVisible="{Binding ATItemsVisible}">
 				<Image Classes="DungeonLabel" Source="avares://OpenTracker/Assets/Images/at.png" />
-				<ItemsControl Items="{Binding ATItems}">
+				<ItemsControl ItemsSource="{Binding ATItems}">
 					<ItemsControl.ItemsPanel>
 						<ItemsPanelTemplate>
 							<StackPanel Orientation="Horizontal" />
@@ -41,7 +41,7 @@
 
 		<StackPanel Orientation="Horizontal">
 			<Image Classes="DungeonLabel" Source="avares://OpenTracker/Assets/Images/ep.png" />
-			<ItemsControl Items="{Binding EPItems}">
+			<ItemsControl ItemsSource="{Binding EPItems}">
 				<ItemsControl.ItemsPanel>
 					<ItemsPanelTemplate>
 						<StackPanel Orientation="Horizontal" />
@@ -52,7 +52,7 @@
 
 		<StackPanel Orientation="Horizontal">
 			<Image Classes="DungeonLabel" Source="avares://OpenTracker/Assets/Images/dp.png" />
-			<ItemsControl Items="{Binding DPItems}">
+			<ItemsControl ItemsSource="{Binding DPItems}">
 				<ItemsControl.ItemsPanel>
 					<ItemsPanelTemplate>
 						<StackPanel Orientation="Horizontal" />
@@ -63,7 +63,7 @@
 
 		<StackPanel Orientation="Horizontal">
 			<Image Classes="DungeonLabel" Source="avares://OpenTracker/Assets/Images/th.png" />
-			<ItemsControl Items="{Binding ToHItems}">
+			<ItemsControl ItemsSource="{Binding ToHItems}">
 				<ItemsControl.ItemsPanel>
 					<ItemsPanelTemplate>
 						<StackPanel Orientation="Horizontal" />
@@ -74,7 +74,7 @@
 
 		<StackPanel Orientation="Horizontal">
 			<Image Classes="DungeonLabel" Source="avares://OpenTracker/Assets/Images/pd.png" />
-			<ItemsControl Items="{Binding PoDItems}">
+			<ItemsControl ItemsSource="{Binding PoDItems}">
 				<ItemsControl.ItemsPanel>
 					<ItemsPanelTemplate>
 						<StackPanel Orientation="Horizontal" />
@@ -85,7 +85,7 @@
 
 		<StackPanel Orientation="Horizontal">
 			<Image Classes="DungeonLabel" Source="avares://OpenTracker/Assets/Images/sp.png" />
-			<ItemsControl Items="{Binding SPItems}">
+			<ItemsControl ItemsSource="{Binding SPItems}">
 				<ItemsControl.ItemsPanel>
 					<ItemsPanelTemplate>
 						<StackPanel Orientation="Horizontal" />
@@ -96,7 +96,7 @@
 
 		<StackPanel Orientation="Horizontal">
 			<Image Classes="DungeonLabel" Source="avares://OpenTracker/Assets/Images/sw.png" />
-			<ItemsControl Items="{Binding SWItems}">
+			<ItemsControl ItemsSource="{Binding SWItems}">
 				<ItemsControl.ItemsPanel>
 					<ItemsPanelTemplate>
 						<StackPanel Orientation="Horizontal" />
@@ -107,7 +107,7 @@
 
 		<StackPanel Orientation="Horizontal">
 			<Image Classes="DungeonLabel" Source="avares://OpenTracker/Assets/Images/tt.png" />
-			<ItemsControl Items="{Binding TTItems}">
+			<ItemsControl ItemsSource="{Binding TTItems}">
 				<ItemsControl.ItemsPanel>
 					<ItemsPanelTemplate>
 						<StackPanel Orientation="Horizontal" />
@@ -118,7 +118,7 @@
 
 		<StackPanel Orientation="Horizontal">
 			<Image Classes="DungeonLabel" Source="avares://OpenTracker/Assets/Images/ip.png" />
-			<ItemsControl Items="{Binding IPItems}">
+			<ItemsControl ItemsSource="{Binding IPItems}">
 				<ItemsControl.ItemsPanel>
 					<ItemsPanelTemplate>
 						<StackPanel Orientation="Horizontal" />
@@ -129,7 +129,7 @@
 
 		<StackPanel Orientation="Horizontal">
 			<Image Classes="DungeonLabel" Source="avares://OpenTracker/Assets/Images/mm.png" />
-			<ItemsControl Items="{Binding MMItems}">
+			<ItemsControl ItemsSource="{Binding MMItems}">
 				<ItemsControl.ItemsPanel>
 					<ItemsPanelTemplate>
 						<StackPanel Orientation="Horizontal" />
@@ -140,7 +140,7 @@
 
 		<StackPanel Orientation="Horizontal">
 			<Image Classes="DungeonLabel" Source="avares://OpenTracker/Assets/Images/tr.png" />
-			<ItemsControl Items="{Binding TRItems}">
+			<ItemsControl ItemsSource="{Binding TRItems}">
 				<ItemsControl.ItemsPanel>
 					<ItemsPanelTemplate>
 						<StackPanel Orientation="Horizontal" />
@@ -151,7 +151,7 @@
 
 		<StackPanel Orientation="Horizontal">
 			<Image Classes="DungeonLabel" Source="avares://OpenTracker/Assets/Images/gt.png" />
-			<ItemsControl Items="{Binding GTItems}">
+			<ItemsControl ItemsSource="{Binding GTItems}">
 				<ItemsControl.ItemsPanel>
 					<ItemsPanelTemplate>
 						<StackPanel Orientation="Horizontal" />
diff --git a/src/OpenTracker/Views/Dungeons/HorizontalDungeonPanel.axaml.cs b/src/OpenTracker/Views/Dungeons/HorizontalDungeonPanel.axaml.cs
index b054eca3..22ad1ef9 100644
--- a/src/OpenTracker/Views/Dungeons/HorizontalDungeonPanel.axaml.cs
+++ b/src/OpenTracker/Views/Dungeons/HorizontalDungeonPanel.axaml.cs
@@ -3,7 +3,7 @@
 
 namespace OpenTracker.Views.Dungeons
 {
-    public class HorizontalDungeonPanel : UserControl
+    public partial class HorizontalDungeonPanel : UserControl
     {
         public HorizontalDungeonPanel()
         {
diff --git a/src/OpenTracker/Views/Dungeons/VerticalDungeonPanel.axaml b/src/OpenTracker/Views/Dungeons/VerticalDungeonPanel.axaml
index 8cacc49f..597a7071 100644
--- a/src/OpenTracker/Views/Dungeons/VerticalDungeonPanel.axaml
+++ b/src/OpenTracker/Views/Dungeons/VerticalDungeonPanel.axaml
@@ -16,7 +16,7 @@
 
 			<StackPanel Orientation="Horizontal">
 				<Image Classes="DungeonLabel" Source="avares://OpenTracker/Assets/Images/hc.png" />
-				<ItemsControl Items="{Binding HCItems}">
+				<ItemsControl ItemsSource="{Binding HCItems}">
 					<ItemsControl.ItemsPanel>
 						<ItemsPanelTemplate>
 							<StackPanel Orientation="Horizontal" />
@@ -30,7 +30,7 @@
 				            IsVisible="{Binding ATItemsVisible}">
 					<Image Classes="DungeonLabel"
 					       Source="avares://OpenTracker/Assets/Images/at.png" />
-					<ItemsControl Items="{Binding ATItems}">
+					<ItemsControl ItemsSource="{Binding ATItems}">
 						<ItemsControl.ItemsPanel>
 							<ItemsPanelTemplate>
 								<StackPanel Orientation="Horizontal" />
@@ -42,7 +42,7 @@
 
 			<StackPanel Orientation="Horizontal">
 				<Image Classes="DungeonLabel" Source="avares://OpenTracker/Assets/Images/ep.png" />
-				<ItemsControl Items="{Binding EPItems}">
+				<ItemsControl ItemsSource="{Binding EPItems}">
 					<ItemsControl.ItemsPanel>
 						<ItemsPanelTemplate>
 							<StackPanel Orientation="Horizontal" />
@@ -53,7 +53,7 @@
 
 			<StackPanel Orientation="Horizontal">
 				<Image Classes="DungeonLabel" Source="avares://OpenTracker/Assets/Images/dp.png" />
-				<ItemsControl Items="{Binding DPItems}">
+				<ItemsControl ItemsSource="{Binding DPItems}">
 					<ItemsControl.ItemsPanel>
 						<ItemsPanelTemplate>
 							<StackPanel Orientation="Horizontal" />
@@ -64,7 +64,7 @@
 
 			<StackPanel Margin="0 0 0 8" Orientation="Horizontal">
 				<Image Classes="DungeonLabel" Source="avares://OpenTracker/Assets/Images/th.png" />
-				<ItemsControl Items="{Binding ToHItems}">
+				<ItemsControl ItemsSource="{Binding ToHItems}">
 					<ItemsControl.ItemsPanel>
 						<ItemsPanelTemplate>
 							<StackPanel Orientation="Horizontal" />
@@ -75,7 +75,7 @@
 
 			<StackPanel Orientation="Horizontal">
 				<Image Classes="DungeonLabel" Source="avares://OpenTracker/Assets/Images/gt.png" />
-				<ItemsControl Items="{Binding GTItems}">
+				<ItemsControl ItemsSource="{Binding GTItems}">
 					<ItemsControl.ItemsPanel>
 						<ItemsPanelTemplate>
 							<StackPanel Orientation="Horizontal" />
@@ -90,7 +90,7 @@
 
 			<StackPanel Orientation="Horizontal">
 				<Image Classes="DungeonLabel" Source="avares://OpenTracker/Assets/Images/pd.png" />
-				<ItemsControl Items="{Binding PoDItems}">
+				<ItemsControl ItemsSource="{Binding PoDItems}">
 					<ItemsControl.ItemsPanel>
 						<ItemsPanelTemplate>
 							<StackPanel Orientation="Horizontal" />
@@ -101,7 +101,7 @@
 
 			<StackPanel Orientation="Horizontal">
 				<Image Classes="DungeonLabel" Source="avares://OpenTracker/Assets/Images/sp.png" />
-				<ItemsControl Items="{Binding SPItems}">
+				<ItemsControl ItemsSource="{Binding SPItems}">
 					<ItemsControl.ItemsPanel>
 						<ItemsPanelTemplate>
 							<StackPanel Orientation="Horizontal" />
@@ -112,7 +112,7 @@
 
 			<StackPanel Orientation="Horizontal">
 				<Image Classes="DungeonLabel" Source="avares://OpenTracker/Assets/Images/sw.png" />
-				<ItemsControl Items="{Binding SWItems}">
+				<ItemsControl ItemsSource="{Binding SWItems}">
 					<ItemsControl.ItemsPanel>
 						<ItemsPanelTemplate>
 							<StackPanel Orientation="Horizontal" />
@@ -123,7 +123,7 @@
 
 			<StackPanel Orientation="Horizontal">
 				<Image Classes="DungeonLabel" Source="avares://OpenTracker/Assets/Images/tt.png" />
-				<ItemsControl Items="{Binding TTItems}">
+				<ItemsControl ItemsSource="{Binding TTItems}">
 					<ItemsControl.ItemsPanel>
 						<ItemsPanelTemplate>
 							<StackPanel Orientation="Horizontal" />
@@ -134,7 +134,7 @@
 
 			<StackPanel Orientation="Horizontal">
 				<Image Classes="DungeonLabel" Source="avares://OpenTracker/Assets/Images/ip.png" />
-				<ItemsControl Items="{Binding IPItems}">
+				<ItemsControl ItemsSource="{Binding IPItems}">
 					<ItemsControl.ItemsPanel>
 						<ItemsPanelTemplate>
 							<StackPanel Orientation="Horizontal" />
@@ -145,7 +145,7 @@
 
 			<StackPanel Orientation="Horizontal">
 				<Image Classes="DungeonLabel" Source="avares://OpenTracker/Assets/Images/mm.png" />
-				<ItemsControl Items="{Binding MMItems}">
+				<ItemsControl ItemsSource="{Binding MMItems}">
 					<ItemsControl.ItemsPanel>
 						<ItemsPanelTemplate>
 							<StackPanel Orientation="Horizontal" />
@@ -156,7 +156,7 @@
 
 			<StackPanel Orientation="Horizontal">
 				<Image Classes="DungeonLabel" Source="avares://OpenTracker/Assets/Images/tr.png" />
-				<ItemsControl Items="{Binding TRItems}">
+				<ItemsControl ItemsSource="{Binding TRItems}">
 					<ItemsControl.ItemsPanel>
 						<ItemsPanelTemplate>
 							<StackPanel Orientation="Horizontal" />
diff --git a/src/OpenTracker/Views/Dungeons/VerticalDungeonPanel.axaml.cs b/src/OpenTracker/Views/Dungeons/VerticalDungeonPanel.axaml.cs
index b4b6aafb..dc67638e 100644
--- a/src/OpenTracker/Views/Dungeons/VerticalDungeonPanel.axaml.cs
+++ b/src/OpenTracker/Views/Dungeons/VerticalDungeonPanel.axaml.cs
@@ -3,7 +3,7 @@
 
 namespace OpenTracker.Views.Dungeons
 {
-    public class VerticalDungeonPanel : UserControl
+    public partial class VerticalDungeonPanel : UserControl
     {
         public VerticalDungeonPanel()
         {
diff --git a/src/OpenTracker/Views/Items/Item.axaml.cs b/src/OpenTracker/Views/Items/Item.axaml.cs
index 3696a2fe..2f78d7ce 100644
--- a/src/OpenTracker/Views/Items/Item.axaml.cs
+++ b/src/OpenTracker/Views/Items/Item.axaml.cs
@@ -3,7 +3,7 @@
 
 namespace OpenTracker.Views.Items
 {
-    public class Item : UserControl
+    public partial class Item : UserControl
     {
         public Item()
         {
diff --git a/src/OpenTracker/Views/Items/LargeItem.axaml.cs b/src/OpenTracker/Views/Items/LargeItem.axaml.cs
index bf6a4439..41fcf776 100644
--- a/src/OpenTracker/Views/Items/LargeItem.axaml.cs
+++ b/src/OpenTracker/Views/Items/LargeItem.axaml.cs
@@ -3,7 +3,7 @@
 
 namespace OpenTracker.Views.Items
 {
-    public class LargeItem : UserControl
+    public partial class LargeItem : UserControl
     {
         public LargeItem()
         {
diff --git a/src/OpenTracker/Views/Items/LargeItemPanel.axaml b/src/OpenTracker/Views/Items/LargeItemPanel.axaml
index e40a7d14..60fd2904 100644
--- a/src/OpenTracker/Views/Items/LargeItemPanel.axaml
+++ b/src/OpenTracker/Views/Items/LargeItemPanel.axaml
@@ -9,7 +9,7 @@
 		<vm:LargeItemPanelVM />
 	</Design.DataContext>
 	
-	<ItemsControl Items="{Binding Items}">
+	<ItemsControl ItemsSource="{Binding Items}">
 		<ItemsControl.ItemsPanel>
 			<ItemsPanelTemplate>
 				<WrapPanel ItemWidth="34" ItemHeight="40" MaxWidth="238" MaxHeight="200" Orientation="Horizontal"
diff --git a/src/OpenTracker/Views/Items/LargeItemPanel.axaml.cs b/src/OpenTracker/Views/Items/LargeItemPanel.axaml.cs
index 50642c65..abaabf44 100644
--- a/src/OpenTracker/Views/Items/LargeItemPanel.axaml.cs
+++ b/src/OpenTracker/Views/Items/LargeItemPanel.axaml.cs
@@ -3,7 +3,7 @@
 
 namespace OpenTracker.Views.Items
 {
-    public class LargeItemPanel : UserControl
+    public partial class LargeItemPanel : UserControl
     {
         public LargeItemPanel()
         {
diff --git a/src/OpenTracker/Views/MainWindow.axaml b/src/OpenTracker/Views/MainWindow.axaml
index 54353262..5632602f 100644
--- a/src/OpenTracker/Views/MainWindow.axaml
+++ b/src/OpenTracker/Views/MainWindow.axaml
@@ -1,8 +1,8 @@
 <Window xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:vm="clr-namespace:OpenTracker.ViewModels;assembly=OpenTracker"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:vm="clr-namespace:OpenTracker.ViewModels;assembly=OpenTracker"
         mc:Ignorable="d" x:Class="OpenTracker.Views.MainWindow"
         Icon="avares://OpenTracker/Assets/Images/triforce.png" UseLayoutRounding="True" WindowStartupLocation="Manual"
         Background="{DynamicResource ThemeBackgroundBrush}"
@@ -26,12 +26,11 @@
 		            Command="{Binding ToggleDisplayAllLocations}" />
 	</Window.KeyBindings>
 
-  <DockPanel>
-    <ContentControl Content="{Binding TopMenu}" DockPanel.Dock="Top" />
-    <ContentControl Content="{Binding StatusBar}" DockPanel.Dock="Bottom" />
+	<DockPanel>
+		<ContentControl Content="{Binding TopMenu}" DockPanel.Dock="Top" />
+		<ContentControl Content="{Binding StatusBar}" DockPanel.Dock="Bottom" />
 		<ContentControl Content="{Binding UIPanel}"
 		                DockPanel.Dock="{Binding UIDock, Mode=OneWay}" />
 		<ContentControl Content="{Binding MapArea}" />
 	</DockPanel>
-
 </Window>
diff --git a/src/OpenTracker/Views/MainWindow.axaml.cs b/src/OpenTracker/Views/MainWindow.axaml.cs
index 281318bb..ad03ba77 100644
--- a/src/OpenTracker/Views/MainWindow.axaml.cs
+++ b/src/OpenTracker/Views/MainWindow.axaml.cs
@@ -5,13 +5,12 @@
 using Avalonia.Platform;
 using OpenTracker.ViewModels;
 using System;
-using System.ComponentModel;
 using System.Linq;
 using OpenTracker.Utils.Dialog;
 
 namespace OpenTracker.Views
 {
-    public class MainWindow : DialogWindowBase
+    public partial class MainWindow : DialogWindowBase
     {
         private Orientation? _orientation;
 
@@ -27,7 +26,7 @@ public MainWindow()
 #endif
         }
 
-        protected override void OnClosing(CancelEventArgs e)
+        protected override void OnClosing(WindowClosingEventArgs e)
         {
             ViewModel?.OnClose(WindowState == WindowState.Maximized, Bounds, Position);
 
diff --git a/src/OpenTracker/Views/MapLocations/EntranceMapLocation.axaml.cs b/src/OpenTracker/Views/MapLocations/EntranceMapLocation.axaml.cs
index 73d50b9a..1a284a85 100644
--- a/src/OpenTracker/Views/MapLocations/EntranceMapLocation.axaml.cs
+++ b/src/OpenTracker/Views/MapLocations/EntranceMapLocation.axaml.cs
@@ -3,7 +3,7 @@
 
 namespace OpenTracker.Views.MapLocations
 {
-    public class EntranceMapLocation : UserControl
+    public partial class EntranceMapLocation : UserControl
     {
         public EntranceMapLocation()
         {
diff --git a/src/OpenTracker/Views/MapLocations/MapLocation.axaml b/src/OpenTracker/Views/MapLocations/MapLocation.axaml
index d771a360..23ce8ecd 100644
--- a/src/OpenTracker/Views/MapLocations/MapLocation.axaml
+++ b/src/OpenTracker/Views/MapLocations/MapLocation.axaml
@@ -15,12 +15,12 @@
     
     <i:Interaction.Behaviors>
       
-      <EventTriggerBehavior EventName="PointerEnter">
-        <ia:InvokeCommandAction Command="{Binding HandlePointerEnter}" />
+      <EventTriggerBehavior EventName="PointerEntered">
+        <ia:InvokeCommandAction Command="{Binding HandlePointerEntered}" />
       </EventTriggerBehavior>
       
-      <EventTriggerBehavior EventName="PointerLeave">
-        <ia:InvokeCommandAction Command="{Binding HandlePointerLeave}" />
+      <EventTriggerBehavior EventName="PointerExited">
+        <ia:InvokeCommandAction Command="{Binding HandlePointerExited}" />
       </EventTriggerBehavior>
       
     </i:Interaction.Behaviors>
diff --git a/src/OpenTracker/Views/MapLocations/MapLocation.axaml.cs b/src/OpenTracker/Views/MapLocations/MapLocation.axaml.cs
index 109e55e8..9ef194e2 100644
--- a/src/OpenTracker/Views/MapLocations/MapLocation.axaml.cs
+++ b/src/OpenTracker/Views/MapLocations/MapLocation.axaml.cs
@@ -3,7 +3,7 @@
 
 namespace OpenTracker.Views.MapLocations
 {
-    public class MapLocation : UserControl
+    public partial class MapLocation : UserControl
     {
         public MapLocation()
         {
diff --git a/src/OpenTracker/Views/MapLocations/MapLocationMarking.axaml.cs b/src/OpenTracker/Views/MapLocations/MapLocationMarking.axaml.cs
index 83c28629..149df43a 100644
--- a/src/OpenTracker/Views/MapLocations/MapLocationMarking.axaml.cs
+++ b/src/OpenTracker/Views/MapLocations/MapLocationMarking.axaml.cs
@@ -3,7 +3,7 @@
 
 namespace OpenTracker.Views.MapLocations
 {
-    public class MapLocationMarking : UserControl
+    public partial class MapLocationMarking : UserControl
     {
         public MapLocationMarking()
         {
diff --git a/src/OpenTracker/Views/MapLocations/ShopMapLocation.axaml.cs b/src/OpenTracker/Views/MapLocations/ShopMapLocation.axaml.cs
index 920140f6..1c8b58bc 100644
--- a/src/OpenTracker/Views/MapLocations/ShopMapLocation.axaml.cs
+++ b/src/OpenTracker/Views/MapLocations/ShopMapLocation.axaml.cs
@@ -3,7 +3,7 @@
 
 namespace OpenTracker.Views.MapLocations
 {
-    public class ShopMapLocation : UserControl
+    public partial class ShopMapLocation : UserControl
     {
         public ShopMapLocation()
         {
diff --git a/src/OpenTracker/Views/MapLocations/StandardMapLocation.axaml.cs b/src/OpenTracker/Views/MapLocations/StandardMapLocation.axaml.cs
index 1a529c92..f6d495cf 100644
--- a/src/OpenTracker/Views/MapLocations/StandardMapLocation.axaml.cs
+++ b/src/OpenTracker/Views/MapLocations/StandardMapLocation.axaml.cs
@@ -3,7 +3,7 @@
 
 namespace OpenTracker.Views.MapLocations
 {
-    public class StandardMapLocation : UserControl
+    public partial class StandardMapLocation : UserControl
     {
         public StandardMapLocation()
         {
diff --git a/src/OpenTracker/Views/MapLocations/TakeAnyMapLocation.axaml.cs b/src/OpenTracker/Views/MapLocations/TakeAnyMapLocation.axaml.cs
index 28b3be87..653839fc 100644
--- a/src/OpenTracker/Views/MapLocations/TakeAnyMapLocation.axaml.cs
+++ b/src/OpenTracker/Views/MapLocations/TakeAnyMapLocation.axaml.cs
@@ -3,7 +3,7 @@
 
 namespace OpenTracker.Views.MapLocations
 {
-    public class TakeAnyMapLocation : UserControl
+    public partial class TakeAnyMapLocation : UserControl
     {
         public TakeAnyMapLocation()
         {
diff --git a/src/OpenTracker/Views/Maps/Map.axaml.cs b/src/OpenTracker/Views/Maps/Map.axaml.cs
index 904cfa2a..bd103a45 100644
--- a/src/OpenTracker/Views/Maps/Map.axaml.cs
+++ b/src/OpenTracker/Views/Maps/Map.axaml.cs
@@ -3,7 +3,7 @@
 
 namespace OpenTracker.Views.Maps
 {
-    public class Map : UserControl
+    public partial class Map : UserControl
     {
         public Map()
         {
diff --git a/src/OpenTracker/Views/Maps/MapConnection.axaml b/src/OpenTracker/Views/Maps/MapConnection.axaml
index 88c5e2d7..8357b19c 100644
--- a/src/OpenTracker/Views/Maps/MapConnection.axaml
+++ b/src/OpenTracker/Views/Maps/MapConnection.axaml
@@ -22,12 +22,12 @@
         <ia:InvokeCommandAction Command="{Binding HandleClick}" PassEventArgsToCommand="True" />
       </ia:EventTriggerBehavior>
       
-      <ia:EventTriggerBehavior EventName="PointerEnter">
-        <ia:InvokeCommandAction Command="{Binding HandlePointerEnter}" />
+      <ia:EventTriggerBehavior EventName="PointerEntered">
+        <ia:InvokeCommandAction Command="{Binding HandlePointerEntered}" />
       </ia:EventTriggerBehavior>
 
-      <ia:EventTriggerBehavior EventName="PointerLeave">
-        <ia:InvokeCommandAction Command="{Binding HandlePointerLeave}" />
+      <ia:EventTriggerBehavior EventName="PointerExited">
+        <ia:InvokeCommandAction Command="{Binding HandlePointerExited}" />
       </ia:EventTriggerBehavior>
       
     </i:Interaction.Behaviors>
diff --git a/src/OpenTracker/Views/Maps/MapConnection.axaml.cs b/src/OpenTracker/Views/Maps/MapConnection.axaml.cs
index 78623832..edd62d01 100644
--- a/src/OpenTracker/Views/Maps/MapConnection.axaml.cs
+++ b/src/OpenTracker/Views/Maps/MapConnection.axaml.cs
@@ -3,7 +3,7 @@
 
 namespace OpenTracker.Views.Maps
 {
-    public class MapConnection : UserControl
+    public partial class MapConnection : UserControl
     {
         public MapConnection()
         {
diff --git a/src/OpenTracker/Views/Markings/Images/ItemMarkingImage.axaml.cs b/src/OpenTracker/Views/Markings/Images/ItemMarkingImage.axaml.cs
index 0b74868d..2e9d4e69 100644
--- a/src/OpenTracker/Views/Markings/Images/ItemMarkingImage.axaml.cs
+++ b/src/OpenTracker/Views/Markings/Images/ItemMarkingImage.axaml.cs
@@ -3,7 +3,7 @@
 
 namespace OpenTracker.Views.Markings.Images
 {
-    public class ItemMarkingImage : UserControl
+    public partial class ItemMarkingImage : UserControl
     {
         public ItemMarkingImage()
         {
diff --git a/src/OpenTracker/Views/Markings/Images/MarkingImage.axaml.cs b/src/OpenTracker/Views/Markings/Images/MarkingImage.axaml.cs
index e9e4f1b8..fda08e59 100644
--- a/src/OpenTracker/Views/Markings/Images/MarkingImage.axaml.cs
+++ b/src/OpenTracker/Views/Markings/Images/MarkingImage.axaml.cs
@@ -3,7 +3,7 @@
 
 namespace OpenTracker.Views.Markings.Images
 {
-    public class MarkingImage : UserControl
+    public partial class MarkingImage : UserControl
     {
         public MarkingImage()
         {
diff --git a/src/OpenTracker/Views/Markings/MarkingSelect.axaml b/src/OpenTracker/Views/Markings/MarkingSelect.axaml
index 513cd17c..0c8f5ce5 100644
--- a/src/OpenTracker/Views/Markings/MarkingSelect.axaml
+++ b/src/OpenTracker/Views/Markings/MarkingSelect.axaml
@@ -21,7 +21,7 @@
       <Border Classes="Popup">
         <StackPanel Orientation="Vertical">
 
-          <ItemsControl Items="{Binding Buttons}">
+          <ItemsControl ItemsSource="{Binding Buttons}">
             <ItemsControl.ItemsPanel>
               <ItemsPanelTemplate>
                 <WrapPanel ItemWidth="34" ItemHeight="40" Margin="0 0 0 10" Orientation="Horizontal"
diff --git a/src/OpenTracker/Views/Markings/MarkingSelect.axaml.cs b/src/OpenTracker/Views/Markings/MarkingSelect.axaml.cs
index 36647f41..b88b0172 100644
--- a/src/OpenTracker/Views/Markings/MarkingSelect.axaml.cs
+++ b/src/OpenTracker/Views/Markings/MarkingSelect.axaml.cs
@@ -3,7 +3,7 @@
 
 namespace OpenTracker.Views.Markings
 {
-    public class MarkingSelect : UserControl
+    public partial class MarkingSelect : UserControl
     {
         public MarkingSelect()
         {
diff --git a/src/OpenTracker/Views/Markings/MarkingSelectButton.axaml.cs b/src/OpenTracker/Views/Markings/MarkingSelectButton.axaml.cs
index 841af09c..450961de 100644
--- a/src/OpenTracker/Views/Markings/MarkingSelectButton.axaml.cs
+++ b/src/OpenTracker/Views/Markings/MarkingSelectButton.axaml.cs
@@ -3,7 +3,7 @@
 
 namespace OpenTracker.Views.Markings
 {
-    public class MarkingSelectButton : UserControl
+    public partial class MarkingSelectButton : UserControl
     {
         public MarkingSelectButton()
         {
diff --git a/src/OpenTracker/Views/Markings/MarkingSelectSpacer.axaml.cs b/src/OpenTracker/Views/Markings/MarkingSelectSpacer.axaml.cs
index da1e4ea1..95429cad 100644
--- a/src/OpenTracker/Views/Markings/MarkingSelectSpacer.axaml.cs
+++ b/src/OpenTracker/Views/Markings/MarkingSelectSpacer.axaml.cs
@@ -3,7 +3,7 @@
 
 namespace OpenTracker.Views.Markings
 {
-    public class MarkingSelectSpacer : UserControl
+    public partial class MarkingSelectSpacer : UserControl
     {
         public MarkingSelectSpacer()
         {
diff --git a/src/OpenTracker/Views/Markings/NoteMarkingSelect.axaml b/src/OpenTracker/Views/Markings/NoteMarkingSelect.axaml
index a1277454..07cb5ca2 100644
--- a/src/OpenTracker/Views/Markings/NoteMarkingSelect.axaml
+++ b/src/OpenTracker/Views/Markings/NoteMarkingSelect.axaml
@@ -21,7 +21,7 @@
       <Border Classes="Popup">
         <StackPanel Orientation="Vertical">
 
-          <ItemsControl Items="{Binding Buttons}">
+          <ItemsControl ItemsSource="{Binding Buttons}">
             <ItemsControl.ItemsPanel>
               <ItemsPanelTemplate>
                 <WrapPanel ItemWidth="34" ItemHeight="40" MaxWidth="238" MaxHeight="200" Margin="0 0 0 10"
diff --git a/src/OpenTracker/Views/Markings/NoteMarkingSelect.axaml.cs b/src/OpenTracker/Views/Markings/NoteMarkingSelect.axaml.cs
index 07a75b7d..22ebabaa 100644
--- a/src/OpenTracker/Views/Markings/NoteMarkingSelect.axaml.cs
+++ b/src/OpenTracker/Views/Markings/NoteMarkingSelect.axaml.cs
@@ -3,7 +3,7 @@
 
 namespace OpenTracker.Views.Markings
 {
-    public class NoteMarkingSelect : UserControl
+    public partial class NoteMarkingSelect : UserControl
     {
         public NoteMarkingSelect()
         {
diff --git a/src/OpenTracker/Views/Menus/MenuHotkeyHeader.axaml.cs b/src/OpenTracker/Views/Menus/MenuHotkeyHeader.axaml.cs
index 58e01049..adc56e26 100644
--- a/src/OpenTracker/Views/Menus/MenuHotkeyHeader.axaml.cs
+++ b/src/OpenTracker/Views/Menus/MenuHotkeyHeader.axaml.cs
@@ -3,7 +3,7 @@
 
 namespace OpenTracker.Views.Menus
 {
-    public class MenuHotkeyHeader : UserControl
+    public partial class MenuHotkeyHeader : UserControl
     {
         public MenuHotkeyHeader()
         {
diff --git a/src/OpenTracker/Views/Menus/MenuItemCheckBox.axaml.cs b/src/OpenTracker/Views/Menus/MenuItemCheckBox.axaml.cs
index 82718750..25014301 100644
--- a/src/OpenTracker/Views/Menus/MenuItemCheckBox.axaml.cs
+++ b/src/OpenTracker/Views/Menus/MenuItemCheckBox.axaml.cs
@@ -3,7 +3,7 @@
 
 namespace OpenTracker.Views.Menus
 {
-    public class MenuItemCheckBox : UserControl
+    public partial class MenuItemCheckBox : UserControl
     {
         public MenuItemCheckBox()
         {
diff --git a/src/OpenTracker/Views/Menus/TopMenu.axaml b/src/OpenTracker/Views/Menus/TopMenu.axaml
index 80197500..3cceb70f 100644
--- a/src/OpenTracker/Views/Menus/TopMenu.axaml
+++ b/src/OpenTracker/Views/Menus/TopMenu.axaml
@@ -10,7 +10,7 @@
   </Design.DataContext>
   
   <Border Classes="ControlBorder" BorderThickness="0 0 0 1">
-    <Menu Items="{Binding Items}">
+    <Menu ItemsSource="{Binding Items}">
       <Menu.Styles>
         <Style Selector="MenuItem">
           
@@ -22,7 +22,7 @@
           <Setter Property="Icon" Value="{Binding Icon}" />
           <Setter Property="Command" Value="{Binding Command}" />
           <Setter Property="CommandParameter" Value="{Binding CommandParameter}" />
-          <Setter Property="Items" Value="{Binding Items}" />
+          <Setter Property="ItemsSource" Value="{Binding Items}" />
         </Style>
       </Menu.Styles>
       
diff --git a/src/OpenTracker/Views/Menus/TopMenu.axaml.cs b/src/OpenTracker/Views/Menus/TopMenu.axaml.cs
index 6865bbb4..39dd7caa 100644
--- a/src/OpenTracker/Views/Menus/TopMenu.axaml.cs
+++ b/src/OpenTracker/Views/Menus/TopMenu.axaml.cs
@@ -3,7 +3,7 @@
 
 namespace OpenTracker.Views.Menus
 {
-    public class TopMenu : UserControl
+    public partial class TopMenu : UserControl
     {
         public TopMenu()
         {
diff --git a/src/OpenTracker/Views/ModeSettings.axaml.cs b/src/OpenTracker/Views/ModeSettings.axaml.cs
index 299c57c9..2de50190 100644
--- a/src/OpenTracker/Views/ModeSettings.axaml.cs
+++ b/src/OpenTracker/Views/ModeSettings.axaml.cs
@@ -3,7 +3,7 @@
 
 namespace OpenTracker.Views
 {
-    public class ModeSettings : UserControl
+    public partial class ModeSettings : UserControl
     {
         public ModeSettings()
         {
diff --git a/src/OpenTracker/Views/PinnedLocations/Notes/PinnedLocationNote.axaml.cs b/src/OpenTracker/Views/PinnedLocations/Notes/PinnedLocationNote.axaml.cs
index 06c86254..b03544d2 100644
--- a/src/OpenTracker/Views/PinnedLocations/Notes/PinnedLocationNote.axaml.cs
+++ b/src/OpenTracker/Views/PinnedLocations/Notes/PinnedLocationNote.axaml.cs
@@ -3,7 +3,7 @@
 
 namespace OpenTracker.Views.PinnedLocations.Notes
 {
-    public class PinnedLocationNote : UserControl
+    public partial class PinnedLocationNote : UserControl
     {
         public PinnedLocationNote()
         {
diff --git a/src/OpenTracker/Views/PinnedLocations/Notes/PinnedLocationNoteArea.axaml b/src/OpenTracker/Views/PinnedLocations/Notes/PinnedLocationNoteArea.axaml
index d5516169..ce95a423 100644
--- a/src/OpenTracker/Views/PinnedLocations/Notes/PinnedLocationNoteArea.axaml
+++ b/src/OpenTracker/Views/PinnedLocations/Notes/PinnedLocationNoteArea.axaml
@@ -12,7 +12,7 @@
   <StackPanel Margin="4 2 4 0" Orientation="Horizontal"
               HorizontalAlignment="{Binding Alignment}">
 
-    <ItemsControl Items="{Binding Notes}">
+    <ItemsControl ItemsSource="{Binding Notes}">
       <ItemsControl.ItemsPanel>
         <ItemsPanelTemplate>
           <StackPanel Margin="0 2 0 4" Orientation="Horizontal" />
diff --git a/src/OpenTracker/Views/PinnedLocations/Notes/PinnedLocationNoteArea.axaml.cs b/src/OpenTracker/Views/PinnedLocations/Notes/PinnedLocationNoteArea.axaml.cs
index 76266df4..c5d72b7c 100644
--- a/src/OpenTracker/Views/PinnedLocations/Notes/PinnedLocationNoteArea.axaml.cs
+++ b/src/OpenTracker/Views/PinnedLocations/Notes/PinnedLocationNoteArea.axaml.cs
@@ -3,7 +3,7 @@
 
 namespace OpenTracker.Views.PinnedLocations.Notes
 {
-    public class PinnedLocationNoteArea : UserControl
+    public partial class PinnedLocationNoteArea : UserControl
     {
         public PinnedLocationNoteArea()
         {
diff --git a/src/OpenTracker/Views/PinnedLocations/PinnedLocation.axaml b/src/OpenTracker/Views/PinnedLocations/PinnedLocation.axaml
index c50ece7c..35c54325 100644
--- a/src/OpenTracker/Views/PinnedLocations/PinnedLocation.axaml
+++ b/src/OpenTracker/Views/PinnedLocations/PinnedLocation.axaml
@@ -38,7 +38,7 @@
 
         <Border Classes="Separator" Margin="0 2" />
 
-        <ItemsControl Items="{Binding Sections}">
+        <ItemsControl ItemsSource="{Binding Sections}">
           <ItemsControl.ItemsPanel>
             <ItemsPanelTemplate>
               <StackPanel Margin="0 2" Orientation="Horizontal" />
diff --git a/src/OpenTracker/Views/PinnedLocations/PinnedLocation.axaml.cs b/src/OpenTracker/Views/PinnedLocations/PinnedLocation.axaml.cs
index f32c285b..ffe4586a 100644
--- a/src/OpenTracker/Views/PinnedLocations/PinnedLocation.axaml.cs
+++ b/src/OpenTracker/Views/PinnedLocations/PinnedLocation.axaml.cs
@@ -3,7 +3,7 @@
 
 namespace OpenTracker.Views.PinnedLocations
 {
-    public class PinnedLocation : UserControl
+    public partial class PinnedLocation : UserControl
     {
         public PinnedLocation()
         {
diff --git a/src/OpenTracker/Views/PinnedLocations/PinnedLocationsPanel.axaml b/src/OpenTracker/Views/PinnedLocations/PinnedLocationsPanel.axaml
index ba090c43..59243023 100644
--- a/src/OpenTracker/Views/PinnedLocations/PinnedLocationsPanel.axaml
+++ b/src/OpenTracker/Views/PinnedLocations/PinnedLocationsPanel.axaml
@@ -9,7 +9,7 @@
     <vm:PinnedLocationsPanelVM />
   </Design.DataContext>
   
-  <ItemsControl Items="{Binding Locations}">
+  <ItemsControl ItemsSource="{Binding Locations}">
     <ItemsControl.ItemsPanel>
       <ItemsPanelTemplate>
         <WrapPanel Orientation="{Binding Orientation, Mode=OneWay}" />
diff --git a/src/OpenTracker/Views/PinnedLocations/PinnedLocationsPanel.axaml.cs b/src/OpenTracker/Views/PinnedLocations/PinnedLocationsPanel.axaml.cs
index 84d19717..c8249a37 100644
--- a/src/OpenTracker/Views/PinnedLocations/PinnedLocationsPanel.axaml.cs
+++ b/src/OpenTracker/Views/PinnedLocations/PinnedLocationsPanel.axaml.cs
@@ -3,7 +3,7 @@
 
 namespace OpenTracker.Views.PinnedLocations
 {
-    public class PinnedLocationsPanel : UserControl
+    public partial class PinnedLocationsPanel : UserControl
     {
         public PinnedLocationsPanel()
         {
diff --git a/src/OpenTracker/Views/PinnedLocations/Sections/BossSectionIcon.axaml.cs b/src/OpenTracker/Views/PinnedLocations/Sections/BossSectionIcon.axaml.cs
index e8788a55..eedc308d 100644
--- a/src/OpenTracker/Views/PinnedLocations/Sections/BossSectionIcon.axaml.cs
+++ b/src/OpenTracker/Views/PinnedLocations/Sections/BossSectionIcon.axaml.cs
@@ -3,7 +3,7 @@
 
 namespace OpenTracker.Views.PinnedLocations.Sections
 {
-    public class BossSectionIcon : UserControl
+    public partial class BossSectionIcon : UserControl
     {
         public BossSectionIcon()
         {
diff --git a/src/OpenTracker/Views/PinnedLocations/Sections/MarkingSectionIcon.axaml.cs b/src/OpenTracker/Views/PinnedLocations/Sections/MarkingSectionIcon.axaml.cs
index 9b0f97f2..4f44c225 100644
--- a/src/OpenTracker/Views/PinnedLocations/Sections/MarkingSectionIcon.axaml.cs
+++ b/src/OpenTracker/Views/PinnedLocations/Sections/MarkingSectionIcon.axaml.cs
@@ -3,7 +3,7 @@
 
 namespace OpenTracker.Views.PinnedLocations.Sections
 {
-    public class MarkingSectionIcon : UserControl
+    public partial class MarkingSectionIcon : UserControl
     {
         public MarkingSectionIcon()
         {
diff --git a/src/OpenTracker/Views/PinnedLocations/Sections/PrizeSectionIcon.axaml.cs b/src/OpenTracker/Views/PinnedLocations/Sections/PrizeSectionIcon.axaml.cs
index a8c70d00..b652e171 100644
--- a/src/OpenTracker/Views/PinnedLocations/Sections/PrizeSectionIcon.axaml.cs
+++ b/src/OpenTracker/Views/PinnedLocations/Sections/PrizeSectionIcon.axaml.cs
@@ -3,7 +3,7 @@
 
 namespace OpenTracker.Views.PinnedLocations.Sections
 {
-    public class PrizeSectionIcon : UserControl
+    public partial class PrizeSectionIcon : UserControl
     {
         public PrizeSectionIcon()
         {
diff --git a/src/OpenTracker/Views/PinnedLocations/Sections/Section.axaml b/src/OpenTracker/Views/PinnedLocations/Sections/Section.axaml
index 7b9a884f..e5bced02 100644
--- a/src/OpenTracker/Views/PinnedLocations/Sections/Section.axaml
+++ b/src/OpenTracker/Views/PinnedLocations/Sections/Section.axaml
@@ -33,7 +33,7 @@
       </i:Interaction.Behaviors>
     </TextBlock>
 
-    <ItemsControl Items="{Binding Icons}">
+    <ItemsControl ItemsSource="{Binding Icons}">
       <ItemsControl.ItemsPanel>
         <ItemsPanelTemplate>
           <StackPanel Orientation="Horizontal" Spacing="4" />
diff --git a/src/OpenTracker/Views/PinnedLocations/Sections/Section.axaml.cs b/src/OpenTracker/Views/PinnedLocations/Sections/Section.axaml.cs
index bc713f96..d9dc9135 100644
--- a/src/OpenTracker/Views/PinnedLocations/Sections/Section.axaml.cs
+++ b/src/OpenTracker/Views/PinnedLocations/Sections/Section.axaml.cs
@@ -3,7 +3,7 @@
 
 namespace OpenTracker.Views.PinnedLocations.Sections
 {
-    public class Section : UserControl
+    public partial class Section : UserControl
     {
         public Section()
         {
diff --git a/src/OpenTracker/Views/PinnedLocations/Sections/SectionIcon.axaml.cs b/src/OpenTracker/Views/PinnedLocations/Sections/SectionIcon.axaml.cs
index 26105b4f..b41ffd27 100644
--- a/src/OpenTracker/Views/PinnedLocations/Sections/SectionIcon.axaml.cs
+++ b/src/OpenTracker/Views/PinnedLocations/Sections/SectionIcon.axaml.cs
@@ -3,7 +3,7 @@
 
 namespace OpenTracker.Views.PinnedLocations.Sections
 {
-    public class SectionIcon : UserControl
+    public partial class SectionIcon : UserControl
     {
         public SectionIcon()
         {
diff --git a/src/OpenTracker/Views/SequenceBreaks/SequenceBreakControl.axaml.cs b/src/OpenTracker/Views/SequenceBreaks/SequenceBreakControl.axaml.cs
index efa79aba..e55c8aef 100644
--- a/src/OpenTracker/Views/SequenceBreaks/SequenceBreakControl.axaml.cs
+++ b/src/OpenTracker/Views/SequenceBreaks/SequenceBreakControl.axaml.cs
@@ -3,7 +3,7 @@
 
 namespace OpenTracker.Views.SequenceBreaks
 {
-    public class SequenceBreakControl : UserControl
+    public partial class SequenceBreakControl : UserControl
     {
         public SequenceBreakControl()
         {
diff --git a/src/OpenTracker/Views/StatusBar.axaml.cs b/src/OpenTracker/Views/StatusBar.axaml.cs
index 441b495c..57158815 100644
--- a/src/OpenTracker/Views/StatusBar.axaml.cs
+++ b/src/OpenTracker/Views/StatusBar.axaml.cs
@@ -3,7 +3,7 @@
 
 namespace OpenTracker.Views
 {
-    public class StatusBar : UserControl
+    public partial class StatusBar : UserControl
     {
         public StatusBar()
         {
diff --git a/src/OpenTracker/Views/ToolTips/MapLocationToolTip.axaml b/src/OpenTracker/Views/ToolTips/MapLocationToolTip.axaml
index 671db213..bd7d8e51 100644
--- a/src/OpenTracker/Views/ToolTips/MapLocationToolTip.axaml
+++ b/src/OpenTracker/Views/ToolTips/MapLocationToolTip.axaml
@@ -25,7 +25,7 @@
         
         <ContentControl Content="{Binding SectionMarking}" />
 
-        <ItemsControl Items="{Binding Notes}">
+        <ItemsControl ItemsSource="{Binding Notes}">
           <ItemsControl.ItemsPanel>
             <ItemsPanelTemplate>
               <StackPanel Orientation="Horizontal" />
diff --git a/src/OpenTracker/Views/ToolTips/MapLocationToolTip.axaml.cs b/src/OpenTracker/Views/ToolTips/MapLocationToolTip.axaml.cs
index 9261d45e..8443f8b8 100644
--- a/src/OpenTracker/Views/ToolTips/MapLocationToolTip.axaml.cs
+++ b/src/OpenTracker/Views/ToolTips/MapLocationToolTip.axaml.cs
@@ -3,7 +3,7 @@
 
 namespace OpenTracker.Views.ToolTips
 {
-    public class MapLocationToolTip : UserControl
+    public partial class MapLocationToolTip : UserControl
     {
         public MapLocationToolTip()
         {
diff --git a/src/OpenTracker/Views/ToolTips/MapLocationToolTipMarking.axaml.cs b/src/OpenTracker/Views/ToolTips/MapLocationToolTipMarking.axaml.cs
index 21c24136..e389157b 100644
--- a/src/OpenTracker/Views/ToolTips/MapLocationToolTipMarking.axaml.cs
+++ b/src/OpenTracker/Views/ToolTips/MapLocationToolTipMarking.axaml.cs
@@ -3,7 +3,7 @@
 
 namespace OpenTracker.Views.ToolTips
 {
-    public class MapLocationToolTipMarking : UserControl
+    public partial class MapLocationToolTipMarking : UserControl
     {
         public MapLocationToolTipMarking()
         {
diff --git a/src/OpenTracker/Views/UIPanels/UIPanel.axaml.cs b/src/OpenTracker/Views/UIPanels/UIPanel.axaml.cs
index 8c6b7d65..e923ca77 100644
--- a/src/OpenTracker/Views/UIPanels/UIPanel.axaml.cs
+++ b/src/OpenTracker/Views/UIPanels/UIPanel.axaml.cs
@@ -3,7 +3,7 @@
 
 namespace OpenTracker.Views.UIPanels
 {
-    public class UIPanel : UserControl
+    public partial class UIPanel : UserControl
     {
         public UIPanel()
         {
diff --git a/tests/OpenTracker.UnitTests/Models/Dungeons/Nodes/Factories/SPDungeonNodeFactoryTests.cs b/tests/OpenTracker.UnitTests/Models/Dungeons/Nodes/Factories/SPDungeonNodeFactoryTests.cs
index 87c7ef52..5ca80ce4 100644
--- a/tests/OpenTracker.UnitTests/Models/Dungeons/Nodes/Factories/SPDungeonNodeFactoryTests.cs
+++ b/tests/OpenTracker.UnitTests/Models/Dungeons/Nodes/Factories/SPDungeonNodeFactoryTests.cs
@@ -77,6 +77,7 @@ private static void PopulateExpectedValues()
             ExpectedEntryValues.Clear();
             ExpectedNoRequirementValues.Clear();
             ExpectedBossValues.Clear();
+            ExpectedComplexValues.Clear();
             ExpectedItemValues.Clear();
             ExpectedKeyDoorValues.Clear();
             
@@ -250,7 +251,8 @@ public void PopulateNodeConnections_ShouldCreateExpectedEntryConnections(
             var connections = new List<INodeConnection>();
             _sut.PopulateNodeConnections(dungeonData, id, node, connections);
 
-            Assert.Contains(_entryFactoryCalls, x => x == _overworldNodes[fromNodeID]);
+            Assert.True(_entryFactoryCalls.Contains(_overworldNodes[fromNodeID]),
+                $"Expected entry factory to be called with overworld node {fromNodeID}");
         }
 
         public static IEnumerable<object[]> PopulateNodeConnections_ShouldCreateExpectedEntryConnectionsData()
@@ -270,10 +272,16 @@ public void PopulateNodeConnections_ShouldCreateExpectedNoRequirementConnections
             var dungeonData = Substitute.For<IMutableDungeon>();
             var node = Substitute.For<IDungeonNode>();
             var connections = new List<INodeConnection>();
+            
+            // Configure the substitute to return consistent node instances
+            var expectedNode = Substitute.For<INode>();
+            dungeonData.Nodes[fromNodeID].Returns(expectedNode);
+            
             _sut.PopulateNodeConnections(dungeonData, id, node, connections);
 
-            Assert.Contains(_connectionFactoryCalls, x =>
-                x.fromNode == dungeonData.Nodes[fromNodeID] && x.requirement == null);
+            Assert.True(_connectionFactoryCalls.Any(x =>
+                x.fromNode == expectedNode && x.requirement == null),
+                $"Expected connection from {fromNodeID} with no requirement for node {id}");
         }
 
         public static IEnumerable<object[]> PopulateNodeConnections_ShouldCreateExpectedNoRequirementConnectionsData()
@@ -293,10 +301,17 @@ public void PopulateNodeConnections_ShouldCreateExpectedBossConnections(
             var dungeonData = Substitute.For<IMutableDungeon>();
             var node = Substitute.For<IDungeonNode>();
             var connections = new List<INodeConnection>();
+            
+            // Configure the substitute to return consistent node instances
+            var expectedNode = Substitute.For<INode>();
+            dungeonData.Nodes[fromNodeID].Returns(expectedNode);
+            
             _sut.PopulateNodeConnections(dungeonData, id, node, connections);
 
-            Assert.Contains(_connectionFactoryCalls, x =>
-                x.fromNode == dungeonData.Nodes[fromNodeID] && x.requirement == _bossRequirements[bossID]);
+            Assert.True(_connectionFactoryCalls.Any(x =>
+                x.fromNode == expectedNode && 
+                ReferenceEquals(x.requirement, _bossRequirements[bossID])),
+                $"Expected boss connection from {fromNodeID} with boss {bossID} for node {id}");
         }
 
         public static IEnumerable<object[]> PopulateNodeConnections_ShouldCreateExpectedBossConnectionsData()
@@ -315,10 +330,17 @@ public void PopulateNodeConnections_ShouldCreateExpectedComplexConnections(
             var dungeonData = Substitute.For<IMutableDungeon>();
             var node = Substitute.For<IDungeonNode>();
             var connections = new List<INodeConnection>();
+            
+            // Configure the substitute to return consistent node instances
+            var expectedNode = Substitute.For<INode>();
+            dungeonData.Nodes[fromNodeID].Returns(expectedNode);
+            
             _sut.PopulateNodeConnections(dungeonData, id, node, connections);
 
-            Assert.Contains(_connectionFactoryCalls, x =>
-                x.fromNode == dungeonData.Nodes[fromNodeID] && x.requirement == _complexRequirements[requirementType]);
+            Assert.True(_connectionFactoryCalls.Any(x =>
+                x.fromNode == expectedNode && 
+                ReferenceEquals(x.requirement, _complexRequirements[requirementType])),
+                $"Expected complex connection from {fromNodeID} with type {requirementType} for node {id}");
         }
 
         public static IEnumerable<object[]> PopulateNodeConnections_ShouldCreateExpectedComplexConnectionsData()
@@ -338,10 +360,17 @@ public void PopulateNodeConnections_ShouldCreateExpectedItemConnections(
             var dungeonData = Substitute.For<IMutableDungeon>();
             var node = Substitute.For<IDungeonNode>();
             var connections = new List<INodeConnection>();
+            
+            // Configure the substitute to return consistent node instances
+            var expectedNode = Substitute.For<INode>();
+            dungeonData.Nodes[fromNodeID].Returns(expectedNode);
+            
             _sut.PopulateNodeConnections(dungeonData, id, node, connections);
 
-            Assert.Contains(_connectionFactoryCalls, x =>
-                x.fromNode == dungeonData.Nodes[fromNodeID] && x.requirement == _itemRequirements[(type, count)]);
+            Assert.True(_connectionFactoryCalls.Any(x =>
+                x.fromNode == expectedNode && 
+                ReferenceEquals(x.requirement, _itemRequirements[(type, count)])),
+                $"Expected item connection from {fromNodeID} requiring {type}x{count} for node {id}");
         }
 
         public static IEnumerable<object[]> PopulateNodeConnections_ShouldCreateExpectedItemConnectionsData()
@@ -360,11 +389,17 @@ public void PopulateNodeConnections_ShouldCreateExpectedKeyDoorConnections(
             var dungeonData = Substitute.For<IMutableDungeon>();
             var node = Substitute.For<IDungeonNode>();
             var connections = new List<INodeConnection>();
+            
+            // Configure the substitute to return consistent node instances
+            var expectedNode = Substitute.For<INode>();
+            dungeonData.Nodes[fromNodeID].Returns(expectedNode);
+            
             _sut.PopulateNodeConnections(dungeonData, id, node, connections);
 
-            Assert.Contains(_connectionFactoryCalls, x =>
-                x.fromNode == dungeonData.Nodes[fromNodeID] &&
-                x.requirement == dungeonData.KeyDoors[keyDoor].Requirement);
+            Assert.True(_connectionFactoryCalls.Any(x =>
+                x.fromNode == expectedNode &&
+                ReferenceEquals(x.requirement, dungeonData.KeyDoors[keyDoor].Requirement)),
+                $"Expected key door connection from {fromNodeID} with door {keyDoor} for node {id}");
         }
         
         public static IEnumerable<object[]> PopulateNodeConnections_ShouldCreateExpectedKeyDoorConnectionsData()
diff --git a/tests/OpenTracker.UnitTests/OpenTracker.UnitTests.csproj b/tests/OpenTracker.UnitTests/OpenTracker.UnitTests.csproj
index 7c245294..0a52d729 100644
--- a/tests/OpenTracker.UnitTests/OpenTracker.UnitTests.csproj
+++ b/tests/OpenTracker.UnitTests/OpenTracker.UnitTests.csproj
@@ -1,25 +1,25 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="ExpectedObjects" Version="3.5.4" />
-    <PackageReference Include="FluentAssertions" Version="6.12.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
-    <PackageReference Include="NSubstitute" Version="5.1.0" />
-    <PackageReference Include="ReactiveUI.Fody" Version="19.4.1" />
+    <PackageReference Include="FluentAssertions" Version="8.8.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
+    <PackageReference Include="NSubstitute" Version="5.3.0" />
+    <PackageReference Include="ReactiveUI.Fody" Version="19.5.41" />
     <PackageReference Include="System.Net.Http" Version="4.3.4" />
     <PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
-    <PackageReference Include="xunit" Version="2.5.1" />
-    <PackageReference Include="xunit.runner.console" Version="2.5.1">
+    <PackageReference Include="xunit" Version="2.9.3" />
+    <PackageReference Include="xunit.runner.console" Version="2.9.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.1">
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>