diff --git a/MapWizard.Desktop/App.axaml b/MapWizard.Desktop/App.axaml
index c144272..d6987cc 100644
--- a/MapWizard.Desktop/App.axaml
+++ b/MapWizard.Desktop/App.axaml
@@ -13,12 +13,12 @@
 
     <Application.Styles>
         <FluentTheme />
-        <StyleInclude Source="avares://Avalonia.Controls.ColorPicker/Themes/Fluent/Fluent.xaml" />
-        <sukiUi:SukiTheme Locale="en-US" ThemeColor="Blue" />
-        <materialIcons:MaterialIconStyles />
-    </Application.Styles>
+        <StyleInclude Source="avares://Avalonia.Controls.ColorPicker/Themes/Fluent/Fluent.xaml" />
+        <sukiUi:SukiTheme Locale="en-US" ThemeColor="Blue" />
+        <materialIcons:MaterialIconStyles />
+    </Application.Styles>
 
     <Application.Resources>
         <converters:IndexToTransformConverter x:Key="IndexToTransformConverter"/>
     </Application.Resources>
-</Application>
\ No newline at end of file
+</Application>
diff --git a/MapWizard.Desktop/App.axaml.cs b/MapWizard.Desktop/App.axaml.cs
index eab5be2..ba00bb2 100644
--- a/MapWizard.Desktop/App.axaml.cs
+++ b/MapWizard.Desktop/App.axaml.cs
@@ -1,6 +1,5 @@
 using Avalonia;
 using Avalonia.Controls.ApplicationLifetimes;
-using Avalonia.Data.Core.Plugins;
 using Avalonia.Markup.Xaml;
 using MapWizard.Desktop.DependencyInjection;
 using MapWizard.Desktop.Services;
@@ -18,7 +17,6 @@ public override void Initialize()
 
     public override void OnFrameworkInitializationCompleted()
     {
-        BindingPlugins.DataValidators.RemoveAt(0);
         var collection = new ServiceCollection();
         collection.AddCommonServices();
         var services = collection.BuildServiceProvider();
diff --git a/MapWizard.Desktop/MapWizard.Desktop.csproj b/MapWizard.Desktop/MapWizard.Desktop.csproj
index 5727297..687daa9 100644
--- a/MapWizard.Desktop/MapWizard.Desktop.csproj
+++ b/MapWizard.Desktop/MapWizard.Desktop.csproj
@@ -11,28 +11,27 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="11.3.12" />
-    <PackageReference Include="Avalonia.Controls.ColorPicker" Version="11.3.12" />
-    <PackageReference Include="Avalonia.Desktop" Version="11.3.12" />
-    <PackageReference Include="Avalonia.Svg.Skia" Version="11.3.0" />
-    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.12" />
-    <PackageReference Include="Avalonia.Fonts.Inter" Version="11.3.12" />
-    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.3.9" />
+    <PackageReference Include="Avalonia" Version="12.1.0" />
+    <PackageReference Include="Avalonia.Controls.ColorPicker" Version="12.1.0" />
+    <PackageReference Include="Avalonia.Desktop" Version="12.1.0" />
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="12.1.0" />
+    <PackageReference Include="Avalonia.Fonts.Inter" Version="12.1.0" />
+    <PackageReference Include="Avalonia.Wayland" Version="12.1.0" />
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.2" />
-    <PackageReference Include="DialogHost.Avalonia" Version="0.11.0" />
-    <PackageReference Include="JAJ.Packages.MiniAudioEx" Version="3.2.1" />
+    <PackageReference Include="DialogHost.Avalonia" Version="0.12.3" />
+    <PackageReference Include="JAJ.Packages.MiniAudioEx" Version="3.3.5" />
     <PackageReference Include="ManagedBass" Version="4.0.2" />
     <PackageReference Include="MapWizard.BeatmapParser" Version="1.0.6" />
-    <PackageReference Include="Material.Icons.Avalonia" Version="3.0.0" />
-    <PackageReference Include="MessageBox.Avalonia" Version="3.3.1.1" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.5" />
-    <PackageReference Include="OsuMemoryDataProvider" Version="0.12.0" />
+    <PackageReference Include="Material.Icons.Avalonia" Version="3.0.2" />
+    <PackageReference Include="MessageBox.Avalonia" Version="12.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.10" />
+    <PackageReference Include="OsuMemoryDataProvider" Version="0.12.2" />
     <PackageReference Include="OsuWineMemReader" Version="1.0.1" />
-    <PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="3.119.2" />
-    <PackageReference Include="SukiUI" Version="6.0.3" />
+    <PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="4.150.1" />
+    <PackageReference Include="SukiUI" Version="7.0.1" />
     <PackageReference Include="System.Reactive" Version="6.1.0" />
-    <PackageReference Include="Velopack" Version="0.0.1298" />
-    <PackageReference Include="Xaml.Behaviors" Version="11.3.9.5" />
+    <PackageReference Include="Velopack" Version="1.2.0" />
+    <PackageReference Include="Xaml.Behaviors" Version="12.0.5" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/MapWizard.Desktop/Program.cs b/MapWizard.Desktop/Program.cs
index 8c42f52..b4f7baf 100644
--- a/MapWizard.Desktop/Program.cs
+++ b/MapWizard.Desktop/Program.cs
@@ -2,14 +2,13 @@
 using System;
 using System.Linq;
 using Velopack;
-
-namespace MapWizard.Desktop;
-
-internal static class Program
-{
-    // Initialization code. Don't use any Avalonia, third-party APIs or any
-    // SynchronizationContext-reliant code before AppMain is called: things aren't initialized
-    // yet and stuff might break.
+namespace MapWizard.Desktop;
+
+internal static class Program
+{
+    // Initialization code. Don't use any Avalonia, third-party APIs or any
+    // SynchronizationContext-reliant code before AppMain is called: things aren't initialized
+    // yet and stuff might break.
     [STAThread]
     public static void Main(string[] args)
     {
@@ -31,6 +30,7 @@ public static void Main(string[] args)
     private static AppBuilder BuildAvaloniaApp(bool forceSoftwareRendering)
         => AppBuilder.Configure<App>()
             .UsePlatformDetect()
+            .UseWayland()
             .WithInterFont()
             .With(new X11PlatformOptions()
             {
@@ -41,9 +41,8 @@ private static AppBuilder BuildAvaloniaApp(bool forceSoftwareRendering)
                         X11RenderingMode.Glx,
                         X11RenderingMode.Vulkan,
                         X11RenderingMode.Software
-                    ],
-                OverlayPopups = true
+                    ]
             })
             .LogToTrace();
-    
-}
+    
+}
diff --git a/MapWizard.Desktop/ViewModels/ComboColourStudioViewModel.cs b/MapWizard.Desktop/ViewModels/ComboColourStudioViewModel.cs
index 4d1b94e..74bc6ef 100644
--- a/MapWizard.Desktop/ViewModels/ComboColourStudioViewModel.cs
+++ b/MapWizard.Desktop/ViewModels/ComboColourStudioViewModel.cs
@@ -177,7 +177,7 @@ private async Task SelectOriginMap(string path)
         }
         catch (Exception ex)
         {
-            MapWizard.Tools.HelperExtensions.MapWizardLogger.LogException(ex);
+            Tools.HelperExtensions.MapWizardLogger.LogException(ex);
             ShowToast(NotificationType.Error, "Combo Colour Studio", ex.Message);
         }
     }
diff --git a/MapWizard.Desktop/ViewModels/MainWindowViewModel.cs b/MapWizard.Desktop/ViewModels/MainWindowViewModel.cs
index 6d9488e..0f2f9cc 100644
--- a/MapWizard.Desktop/ViewModels/MainWindowViewModel.cs
+++ b/MapWizard.Desktop/ViewModels/MainWindowViewModel.cs
@@ -13,7 +13,7 @@ namespace MapWizard.Desktop.ViewModels
 {
     public partial class MainWindowViewModel : ObservableObject
     {
-        private ISukiToastManager ToastManager { get; }
+        public ISukiToastManager ToastManager { get; }
         public ISukiDialogManager DialogManager { get; }
 
         private readonly IThemeService _themeService;
diff --git a/MapWizard.Desktop/Views/ComboColourStudio/ComboColourStudioView.axaml b/MapWizard.Desktop/Views/ComboColourStudio/ComboColourStudioView.axaml
index c81fb31..2124751 100644
--- a/MapWizard.Desktop/Views/ComboColourStudio/ComboColourStudioView.axaml
+++ b/MapWizard.Desktop/Views/ComboColourStudio/ComboColourStudioView.axaml
@@ -8,11 +8,13 @@
     xmlns:materialIcons="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
     xmlns:suki="clr-namespace:SukiUI.Controls;assembly=SukiUI"
     xmlns:theme="https://github.com/kikipoulet/SukiUI"
+    xmlns:models="using:MapWizard.Desktop.Models"
     xmlns:vm="clr-namespace:MapWizard.Desktop.ViewModels"
     mc:Ignorable="d"
     d:DesignWidth="900"
     d:DesignHeight="700"
     x:Class="MapWizard.Desktop.Views.ComboColourStudio.ComboColourStudioView"
+    x:Name="Root"
     x:DataType="vm:ComboColourStudioViewModel"
     Padding="16">
 
@@ -164,7 +166,7 @@
 
                         <ItemsControl ItemsSource="{Binding ComboColours}">
                             <ItemsControl.ItemTemplate>
-                                <DataTemplate>
+                                <DataTemplate x:DataType="models:AvaloniaComboColour">
                                     <Grid ColumnDefinitions="*,Auto" Margin="0,0,0,6">
                                         <TextBlock FontWeight="Bold"
                                                    Text="{Binding Number, StringFormat=Combo {0}}"
@@ -173,7 +175,7 @@
                                             <controls:ModernColorPicker
                                                 SelectedColor="{Binding Colour, Converter={StaticResource AvaloniaColorToColorConverter}, Mode=TwoWay}" />
                                             <Button Classes="Basic"
-                                                    Command="{Binding DataContext.RemoveColourCommand, RelativeSource={RelativeSource AncestorType=UserControl}}"
+                                                    Command="{Binding #Root.DataContext.RemoveColourCommand}"
                                                     CommandParameter="{Binding}"
                                                     ToolTip.Tip="Remove this combo colour">
                                                 <materialIcons:MaterialIcon Kind="Close" Width="20" Height="20" />
@@ -241,7 +243,7 @@
 
                         <ItemsControl ItemsSource="{Binding ColourPoints}">
                             <ItemsControl.ItemTemplate>
-                                <DataTemplate>
+                                <DataTemplate x:DataType="models:AvaloniaComboColourPoint">
                                     <Border Classes="ColourPointCard"
                                             Classes.latest="{Binding IsLatestAdded}"
                                             BorderBrush="{DynamicResource ThemeAccentBrush}"
@@ -268,15 +270,15 @@
                                                         </ItemsPanelTemplate>
                                                     </ItemsControl.ItemsPanel>
                                                     <ItemsControl.ItemTemplate>
-                                                        <DataTemplate>
+                                                        <DataTemplate x:DataType="models:AvaloniaComboColourToken">
                                                             <Border Classes="SequenceTokenDragHost"
                                                                     DragDrop.AllowDrop="True"
                                                                     DragDrop.DragOver="SequenceToken_OnDragOver"
                                                                     DragDrop.Drop="SequenceToken_OnDrop">
                                                                 <controls:ComboColourDropdown
-                                                                    Options="{Binding DataContext.ColourDropdownOptions, RelativeSource={RelativeSource AncestorType=UserControl}}"
+                                                                    Options="{Binding #Root.DataContext.ColourDropdownOptions}"
                                                                     SelectedComboNumber="{Binding ComboNumber, Mode=TwoWay}"
-                                                                    RemoveTokenCommand="{Binding DataContext.RemoveColourFromPointCommand, RelativeSource={RelativeSource AncestorType=UserControl}}"
+                                                                    RemoveTokenCommand="{Binding #Root.DataContext.RemoveColourFromPointCommand}"
                                                                     RemoveTokenCommandParameter="{Binding}" />
                                                             </Border>
                                                         </DataTemplate>
@@ -289,21 +291,21 @@
                                                         Spacing="6"
                                                         HorizontalAlignment="Right">
                                                 <Button Classes="Basic"
-                                                        Command="{Binding DataContext.AddColourToPointCommand, RelativeSource={RelativeSource AncestorType=UserControl}}"
+                                                        Command="{Binding #Root.DataContext.AddColourToPointCommand}"
                                                         CommandParameter="{Binding}"
                                                         ToolTip.Tip="Add combo colour to this point sequence">
                                                     <materialIcons:MaterialIcon Kind="Add" Width="16" Height="16" />
                                                 </Button>
 
                                                 <Button Classes="Basic"
-                                                        Command="{Binding DataContext.AddColourPointFromSequenceCommand, RelativeSource={RelativeSource AncestorType=UserControl}}"
+                                                        Command="{Binding #Root.DataContext.AddColourPointFromSequenceCommand}"
                                                         CommandParameter="{Binding}"
                                                         ToolTip.Tip="Create a new colour point from this sequence">
                                                     <materialIcons:MaterialIcon Kind="ContentCopy" Width="16" Height="16" />
                                                 </Button>
 
                                                 <Button Classes="Basic"
-                                                        Command="{Binding DataContext.RemoveColourPointCommand, RelativeSource={RelativeSource AncestorType=UserControl}}"
+                                                        Command="{Binding #Root.DataContext.RemoveColourPointCommand}"
                                                         CommandParameter="{Binding}"
                                                         ToolTip.Tip="Remove this colour point">
                                                     <materialIcons:MaterialIcon Kind="Delete" Width="18" Height="18" />
diff --git a/MapWizard.Desktop/Views/ComboColourStudio/ComboColourStudioView.axaml.cs b/MapWizard.Desktop/Views/ComboColourStudio/ComboColourStudioView.axaml.cs
index 086327f..6791882 100644
--- a/MapWizard.Desktop/Views/ComboColourStudio/ComboColourStudioView.axaml.cs
+++ b/MapWizard.Desktop/Views/ComboColourStudio/ComboColourStudioView.axaml.cs
@@ -13,10 +13,14 @@ public partial class ComboColourStudioView : UserControl
 {
     private const double DragStartThreshold = 4;
 
-    private Point? _dragStartPoint;
-    private AvaloniaComboColourToken? _pressedToken;
-    private AvaloniaComboColourPoint? _pressedPoint;
-    private Border? _dragSourceHost;
+    private sealed record DragCandidate(
+        PointerPressedEventArgs TriggerEvent,
+        Point StartPosition,
+        Border Host,
+        AvaloniaComboColourToken Token,
+        AvaloniaComboColourPoint Owner);
+
+    private DragCandidate? _dragCandidate;
     private Border? _activeDropHost;
     private bool _dragInProgress;
 
@@ -35,28 +39,25 @@ private void OnPointerPressedTunnel(object? sender, PointerPressedEventArgs e)
             return;
         }
 
-        if (!TryGetTokenContextFromSource(e.Source, out var host, out var token, out var point))
+        if (!TryGetTokenContextFromSource(e.Source, out var host, out var token, out var point) ||
+            !e.GetCurrentPoint(host).Properties.IsLeftButtonPressed)
         {
             ResetDragState();
             return;
         }
 
-        var pointer = e.GetCurrentPoint(host);
-        if (!pointer.Properties.IsLeftButtonPressed)
-        {
-            ResetDragState();
-            return;
-        }
-
-        _pressedToken = token;
-        _pressedPoint = point;
-        _dragSourceHost = host;
-        _dragStartPoint = e.GetPosition(host);
+        _dragCandidate = new DragCandidate(
+            e,
+            e.GetPosition(host),
+            host,
+            token,
+            point);
     }
 
     private async void OnPointerMovedTunnel(object? sender, PointerEventArgs e)
     {
-        if (_dragInProgress || _pressedToken is null || _pressedPoint is null || _dragStartPoint is null || _dragSourceHost is null)
+        var candidate = _dragCandidate;
+        if (_dragInProgress || candidate is null)
         {
             return;
         }
@@ -64,13 +65,13 @@ private async void OnPointerMovedTunnel(object? sender, PointerEventArgs e)
         var current = e.GetCurrentPoint(this);
         if (!current.Properties.IsLeftButtonPressed)
         {
-            ClearDragSourceHost();
             ResetDragState();
             return;
         }
 
-        var currentPosition = e.GetPosition(_dragSourceHost);
-        var dragDistance = Math.Abs(currentPosition.X - _dragStartPoint.Value.X) + Math.Abs(currentPosition.Y - _dragStartPoint.Value.Y);
+        var currentPosition = e.GetPosition(candidate.Host);
+        var dragDistance = Math.Abs(currentPosition.X - candidate.StartPosition.X) +
+                           Math.Abs(currentPosition.Y - candidate.StartPosition.Y);
         if (dragDistance < DragStartThreshold)
         {
             return;
@@ -80,17 +81,17 @@ private async void OnPointerMovedTunnel(object? sender, PointerEventArgs e)
         dragTransfer.Add(DataTransferItem.CreateText("MapWizardComboColourTokenMove"));
 
         _dragInProgress = true;
-        _dragSourceHost.Classes.Set("drag-source", true);
+        candidate.Host.Classes.Set("drag-source", true);
         try
         {
             e.Handled = true;
-            await DragDrop.DoDragDropAsync(e, dragTransfer, DragDropEffects.Move);
+            await DragDrop.DoDragDropAsync(candidate.TriggerEvent, dragTransfer, DragDropEffects.Move);
         }
         finally
         {
+            candidate.Host.Classes.Set("drag-source", false);
             _dragInProgress = false;
             ClearActiveDropHost();
-            ClearDragSourceHost();
             ResetDragState();
         }
     }
@@ -102,7 +103,6 @@ private void OnPointerReleasedTunnel(object? sender, PointerReleasedEventArgs e)
             return;
         }
 
-        ClearDragSourceHost();
         ResetDragState();
     }
 
@@ -196,20 +196,21 @@ private bool TryGetDropContext(
             return false;
         }
 
+        var candidate = _dragCandidate;
         var targetPoint = FindOwningColourPoint(host);
-        if (targetPoint is null || _pressedPoint is null || _pressedToken is null)
+        if (targetPoint is null || candidate is null)
         {
             return false;
         }
 
-        if (!ReferenceEquals(targetPoint, _pressedPoint) ||
-            ReferenceEquals(target, _pressedToken))
+        if (!ReferenceEquals(targetPoint, candidate.Owner) ||
+            ReferenceEquals(target, candidate.Token))
         {
             return false;
         }
 
-        sourcePoint = _pressedPoint;
-        sourceToken = _pressedToken;
+        sourcePoint = candidate.Owner;
+        sourceToken = candidate.Token;
         targetToken = target;
         return true;
     }
@@ -271,10 +272,7 @@ private static bool TryGetTokenContextFromSource(
 
     private void ResetDragState()
     {
-        _dragStartPoint = null;
-        _pressedToken = null;
-        _pressedPoint = null;
-        _dragSourceHost = null;
+        _dragCandidate = null;
     }
 
     private void ClearActiveDropHost()
@@ -288,13 +286,4 @@ private void ClearActiveDropHost()
         _activeDropHost = null;
     }
 
-    private void ClearDragSourceHost()
-    {
-        if (_dragSourceHost is null)
-        {
-            return;
-        }
-
-        _dragSourceHost.Classes.Set("drag-source", false);
-    }
 }
diff --git a/MapWizard.Desktop/Views/Controls/BeatmapSelectionPanel.axaml b/MapWizard.Desktop/Views/Controls/BeatmapSelectionPanel.axaml
index 7ca0e36..a513800 100644
--- a/MapWizard.Desktop/Views/Controls/BeatmapSelectionPanel.axaml
+++ b/MapWizard.Desktop/Views/Controls/BeatmapSelectionPanel.axaml
@@ -4,6 +4,7 @@
   xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
   xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
   xmlns:controls="clr-namespace:MapWizard.Desktop.Views.Controls"
+  xmlns:models="using:MapWizard.Desktop.Models"
   xmlns:materialIcons="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
   mc:Ignorable="d"
   d:DesignWidth="760"
@@ -393,7 +394,7 @@
 
         <Button Grid.Column="1"
                 Classes="Basic"
-                Command="{Binding OpenOriginFolderCommand}"
+                Command="{ReflectionBinding OpenOriginFolderCommand}"
                 IsEnabled="{Binding HasOriginSelection, ElementName=Root}"
                 ToolTip.Tip="Open the folder of the selected origin beatmap">
           <StackPanel Orientation="Horizontal" Spacing="5">
@@ -457,7 +458,7 @@
                     <StackPanel Orientation="Horizontal"
                                 Spacing="4">
                       <Button Classes="Basic Compact"
-                              Command="{Binding SetOriginFromMemoryCommand}"
+                              Command="{ReflectionBinding SetOriginFromMemoryCommand}"
                               Margin="0,0,4,0"
                               ToolTip.Tip="{Binding OriginMemoryToolTip, ElementName=Root}">
                         <StackPanel Orientation="Horizontal" Spacing="4">
@@ -466,7 +467,7 @@
                         </StackPanel>
                       </Button>
                       <Button Classes="Flat Rounded"
-                              Command="{Binding PickOriginFileCommand}"
+                              Command="{ReflectionBinding PickOriginFileCommand}"
                               ToolTip.Tip="Open Map Picker dialog">
                         <StackPanel Orientation="Horizontal" Spacing="4">
                           <materialIcons:MaterialIcon Kind="FileSearchOutline" Width="13" Height="13" />
@@ -513,10 +514,10 @@
                         </ItemsPanelTemplate>
                       </ItemsControl.ItemsPanel>
                       <ItemsControl.ItemTemplate>
-                        <DataTemplate>
+                        <DataTemplate x:DataType="models:MapsetDifficultyCard">
                           <ToggleButton Classes="MapsetDiffChip"
                                         IsChecked="{Binding IsSelected, Mode=OneWay}"
-                                        Command="{Binding DataContext.SelectOriginMapCommand, RelativeSource={RelativeSource AncestorType=controls:BeatmapSelectionPanel}}"
+                                        Command="{ReflectionBinding DataContext.SelectOriginMapCommand, RelativeSource={RelativeSource AncestorType=controls:BeatmapSelectionPanel}}"
                                         CommandParameter="{Binding Path}">
                             <StackPanel Orientation="Horizontal" Spacing="6">
                               <materialIcons:MaterialIcon Kind="CheckCircle"
@@ -550,7 +551,7 @@
                          VerticalAlignment="Center"
                          Margin="0,0,8,0" />
               <Button Classes="Basic Compact"
-                      Command="{Binding SetOriginFromMemoryCommand}"
+                      Command="{ReflectionBinding SetOriginFromMemoryCommand}"
                       ToolTip.Tip="{Binding OriginMemoryToolTip, ElementName=Root}">
                 <StackPanel Orientation="Horizontal" Spacing="4">
                   <materialIcons:MaterialIcon Kind="Import" Width="16" Height="16" />
@@ -563,7 +564,7 @@
                          Opacity="0.8" />
               <Button Classes="Flat Compact"
                       Margin="6,0,0,0"
-                      Command="{Binding PickOriginFileCommand}"
+                      Command="{ReflectionBinding PickOriginFileCommand}"
                       ToolTip.Tip="Open Map Picker dialog">
                 <StackPanel Orientation="Horizontal" Spacing="4">
                   <materialIcons:MaterialIcon Kind="FileSearchOutline" Width="16" Height="16" />
@@ -624,10 +625,10 @@
                         </ItemsPanelTemplate>
                       </ItemsControl.ItemsPanel>
                       <ItemsControl.ItemTemplate>
-                        <DataTemplate>
+                        <DataTemplate x:DataType="models:MapsetDifficultyCard">
                           <ToggleButton Classes="MapsetDiffChip"
                                         IsChecked="{Binding IsSelected, Mode=OneWay}"
-                                        Command="{Binding DataContext.ToggleDestinationMapCommand, RelativeSource={RelativeSource AncestorType=controls:BeatmapSelectionPanel}}"
+                                        Command="{ReflectionBinding DataContext.ToggleDestinationMapCommand, RelativeSource={RelativeSource AncestorType=controls:BeatmapSelectionPanel}}"
                                         CommandParameter="{Binding Path}">
                             <StackPanel Orientation="Horizontal" Spacing="6">
                               <materialIcons:MaterialIcon Kind="CheckCircle"
@@ -663,7 +664,7 @@
           <ItemsControl IsVisible="{Binding HasVisibleDestinationCards, ElementName=Root}"
                         ItemsSource="{Binding VisibleDestinationMapsets, ElementName=Root}">
             <ItemsControl.ItemTemplate>
-              <DataTemplate>
+              <DataTemplate x:DataType="models:DestinationMapsetCard">
                 <Border Classes="DestinationMapsetCard">
                   <Grid RowDefinitions="58,Auto">
                     <Border Grid.Row="0"
@@ -747,10 +748,10 @@
                             </ItemsPanelTemplate>
                           </ItemsControl.ItemsPanel>
                           <ItemsControl.ItemTemplate>
-                            <DataTemplate>
+                            <DataTemplate x:DataType="models:MapsetDifficultyCard">
                               <ToggleButton Classes="MapsetDiffChip"
                                             IsChecked="{Binding IsSelected, Mode=OneWay}"
-                                            Command="{Binding DataContext.ToggleDestinationMapCommand, RelativeSource={RelativeSource AncestorType=controls:BeatmapSelectionPanel}}"
+                                            Command="{ReflectionBinding DataContext.ToggleDestinationMapCommand, RelativeSource={RelativeSource AncestorType=controls:BeatmapSelectionPanel}}"
                                             CommandParameter="{Binding Path}">
                                 <StackPanel Orientation="Horizontal" Spacing="6">
                                   <materialIcons:MaterialIcon Kind="CheckCircle"
@@ -780,7 +781,7 @@
                      ItemHeight="34"
                      Orientation="Horizontal">
             <Button Classes="Basic"
-                    Command="{Binding AddDestinationFromMemoryCommand}"
+                    Command="{ReflectionBinding AddDestinationFromMemoryCommand}"
                     Margin="0,0,8,0"
                     ToolTip.Tip="{Binding DestinationMemoryToolTip, ElementName=Root}">
               <StackPanel Orientation="Horizontal" Spacing="4">
@@ -789,7 +790,7 @@
               </StackPanel>
             </Button>
             <Button Classes="Flat Rounded"
-                    Command="{Binding PickDestinationFileCommand}"
+                    Command="{ReflectionBinding PickDestinationFileCommand}"
                     MinWidth="122"
                     ToolTip.Tip="Open Map Picker dialog">
               <StackPanel Orientation="Horizontal" Spacing="4">
diff --git a/MapWizard.Desktop/Views/Controls/MillisecondFlyoutInput.axaml b/MapWizard.Desktop/Views/Controls/MillisecondFlyoutInput.axaml
index ece2fa6..bae3767 100644
--- a/MapWizard.Desktop/Views/Controls/MillisecondFlyoutInput.axaml
+++ b/MapWizard.Desktop/Views/Controls/MillisecondFlyoutInput.axaml
@@ -70,7 +70,7 @@
                         <Grid ColumnDefinitions="*,Auto" ColumnSpacing="6">
                             <TextBox x:Name="InputTextBox"
                                      Grid.Column="0"
-                                     Watermark="0"
+                                     PlaceholderText="0"
                                      VerticalContentAlignment="Center"
                                      PastingFromClipboard="InputTextBox_OnPastingFromClipboard"
                                      KeyDown="InputTextBox_OnKeyDown" />
diff --git a/MapWizard.Desktop/Views/Controls/ModernColorPicker.axaml b/MapWizard.Desktop/Views/Controls/ModernColorPicker.axaml
index df12276..3705cd9 100644
--- a/MapWizard.Desktop/Views/Controls/ModernColorPicker.axaml
+++ b/MapWizard.Desktop/Views/Controls/ModernColorPicker.axaml
@@ -100,7 +100,7 @@
 
                                 <TextBox x:Name="HexTextBox"
                                          Grid.Column="1"
-                                         Watermark="#RRGGBB"
+                                         PlaceholderText="#RRGGBB"
                                          VerticalContentAlignment="Center"
                                          TextChanged="HexTextBox_OnTextChanged" />
 
diff --git a/MapWizard.Desktop/Views/Dialogs/SongMapsetCard.axaml b/MapWizard.Desktop/Views/Dialogs/SongMapsetCard.axaml
index 1ce09d5..b987bc7 100644
--- a/MapWizard.Desktop/Views/Dialogs/SongMapsetCard.axaml
+++ b/MapWizard.Desktop/Views/Dialogs/SongMapsetCard.axaml
@@ -257,8 +257,8 @@
                         <Button Classes="SelectMapsetDiffsButton"
                                 HorizontalAlignment="Right"
                                 Classes.selected="{Binding AllDifficultiesSelected}"
-                                IsVisible="{Binding DataContext.AllowMultipleSelection, RelativeSource={RelativeSource AncestorType=dialogs:SongSelectDialog}}"
-                                Command="{Binding DataContext.SelectAllDifficultiesInMapsetCommand, RelativeSource={RelativeSource AncestorType=dialogs:SongSelectDialog}}"
+                                IsVisible="{ReflectionBinding DataContext.AllowMultipleSelection, RelativeSource={RelativeSource AncestorType=dialogs:SongSelectDialog}}"
+                                Command="{ReflectionBinding DataContext.SelectAllDifficultiesInMapsetCommand, RelativeSource={RelativeSource AncestorType=dialogs:SongSelectDialog}}"
                                 CommandParameter="{Binding}"
                                 ToolTip.Tip="Select all difficulties in this mapset">
                             <StackPanel Orientation="Horizontal" Spacing="6">
@@ -270,7 +270,7 @@
 
                     <Button Grid.Column="0"
                             Classes="CardHeaderHit"
-                            Command="{Binding DataContext.ToggleMapsetExpansionCommand, RelativeSource={RelativeSource AncestorType=dialogs:SongSelectDialog}}"
+                            Command="{ReflectionBinding DataContext.ToggleMapsetExpansionCommand, RelativeSource={RelativeSource AncestorType=dialogs:SongSelectDialog}}"
                             CommandParameter="{Binding}" />
                 </Grid>
             </Grid>
@@ -288,7 +288,7 @@
                         <DataTemplate x:DataType="vm:SongDifficultyItemViewModel">
                             <ToggleButton Classes="DifficultyChip"
                                           IsChecked="{Binding IsSelected, Mode=OneWay}"
-                                          Command="{Binding DataContext.SelectDifficultyCommand, RelativeSource={RelativeSource AncestorType=dialogs:SongSelectDialog}}"
+                                          Command="{ReflectionBinding DataContext.SelectDifficultyCommand, RelativeSource={RelativeSource AncestorType=dialogs:SongSelectDialog}}"
                                           CommandParameter="{Binding}">
                                 <StackPanel Orientation="Horizontal" Spacing="7">
                                     <materialIcons:MaterialIcon Kind="CheckCircle"
diff --git a/MapWizard.Desktop/Views/Dialogs/SongSelectDialog.axaml b/MapWizard.Desktop/Views/Dialogs/SongSelectDialog.axaml
index c5cacd0..3d3c37e 100644
--- a/MapWizard.Desktop/Views/Dialogs/SongSelectDialog.axaml
+++ b/MapWizard.Desktop/Views/Dialogs/SongSelectDialog.axaml
@@ -33,7 +33,7 @@
         <Grid RowDefinitions="Auto,Auto" RowSpacing="6">
             <Grid ColumnDefinitions="*,Auto,Auto" ColumnSpacing="12">
                 <TextBox Height="38"
-                         Watermark="Search beatmaps..."
+                         PlaceholderText="Search beatmaps..."
                          Text="{Binding SearchText, Mode=TwoWay}" />
 
                 <Button Grid.Column="1"
diff --git a/MapWizard.Desktop/Views/HitSoundVisualizer/HitSoundVisualizerView.axaml.cs b/MapWizard.Desktop/Views/HitSoundVisualizer/HitSoundVisualizerView.axaml.cs
index 86e4c8b..0ce4610 100644
--- a/MapWizard.Desktop/Views/HitSoundVisualizer/HitSoundVisualizerView.axaml.cs
+++ b/MapWizard.Desktop/Views/HitSoundVisualizer/HitSoundVisualizerView.axaml.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using Avalonia.Controls;
 using Avalonia.Input;
+using Avalonia.Input.Platform;
 using Avalonia.Threading;
 using Avalonia.VisualTree;
 using MapWizard.Desktop.ViewModels;
@@ -118,12 +119,11 @@ private async void Root_OnKeyDown(object? sender, KeyEventArgs e)
         if (e.KeyModifiers.HasFlag(KeyModifiers.Control) && e.Key == Key.V)
         {
             var topLevel = TopLevel.GetTopLevel(this);
-            if (topLevel?.Clipboard is not null)
-            {
-                var text = await topLevel.Clipboard.GetTextAsync();
-                vm.PastePointClipboardPayload(text);
-                e.Handled = true;
-            }
+            if (topLevel?.Clipboard is null) return;
+            
+            var text = await topLevel.Clipboard.TryGetTextAsync();
+            vm.PastePointClipboardPayload(text);
+            e.Handled = true;
 
             return;
         }
diff --git a/MapWizard.Desktop/Views/MainWindow.axaml b/MapWizard.Desktop/Views/MainWindow.axaml
index 7ad91c5..0954235 100644
--- a/MapWizard.Desktop/Views/MainWindow.axaml
+++ b/MapWizard.Desktop/Views/MainWindow.axaml
@@ -16,6 +16,8 @@
     IsMenuVisible="False"
     MinWidth="800"
     MinHeight="600"
+    Width="1280"
+    Height="720"
     Title="MapWizard">
 
     <suki:SukiWindow.Styles>
@@ -92,13 +94,6 @@
                RenderOptions.BitmapInterpolationMode="HighQuality" />
     </suki:SukiWindow.LogoContent>
 
-    <suki:SukiWindow.MenuItems>
-        <MenuItem Header="File" Classes="Compact">
-            <MenuItem Header="Load Beatmap" Command="{Binding LoadBeatmapCommand}" />
-            <MenuItem Header="Exit" Command="{Binding ExitCommand}" />
-        </MenuItem>
-    </suki:SukiWindow.MenuItems>
-
     <suki:SukiWindow.RightWindowTitleBarControls>
         <StackPanel Orientation="Horizontal" Spacing="8">
             <Button Classes="Basic Compact"
@@ -114,7 +109,9 @@
         </StackPanel>
     </suki:SukiWindow.RightWindowTitleBarControls>
 
-    <Grid ColumnDefinitions="102,*">
+    <!-- SukiWindow's template has no VisualLayerManager, which Avalonia 12 requires for light-dismiss flyouts. -->
+    <VisualLayerManager>
+        <Grid ColumnDefinitions="102,*">
         <suki:GlassCard Grid.Column="0" Classes="Accent" Margin="8,8,8,8" Padding="4,10" CornerRadius="16">
             <Grid RowDefinitions="Auto,*,Auto">
                 <StackPanel Grid.Row="0" Spacing="8" HorizontalAlignment="Center">
@@ -225,7 +222,7 @@
                                                             HorizontalAlignment="Center"
                                                             VerticalAlignment="Center" />
                             </Grid>
-                            <TextBlock Text="HS Visualizer"
+                            <TextBlock Text="Hitsound Visualizer"
                                        Width="68"
                                        FontSize="11"
                                        Foreground="{DynamicResource SukiText}"
@@ -334,6 +331,12 @@
             </Grid>
         </suki:GlassCard>
 
-        <ContentControl Grid.Column="1" Content="{Binding CurrentPageViewModel}" />
-    </Grid>
+        <TransitioningContentControl Grid.Column="1"
+                                     Content="{Binding CurrentPageViewModel}">
+            <TransitioningContentControl.PageTransition>
+                <CrossFade Duration="0:0:0.18" />
+            </TransitioningContentControl.PageTransition>
+        </TransitioningContentControl>
+        </Grid>
+    </VisualLayerManager>
 </suki:SukiWindow>
diff --git a/MapWizard.Desktop/Views/MapCleaner/MapCleanerView.axaml b/MapWizard.Desktop/Views/MapCleaner/MapCleanerView.axaml
index 29edef9..59f32e2 100644
--- a/MapWizard.Desktop/Views/MapCleaner/MapCleanerView.axaml
+++ b/MapWizard.Desktop/Views/MapCleaner/MapCleanerView.axaml
@@ -160,7 +160,7 @@
                                                 <Separator />
                                                 <StackPanel Orientation="Horizontal" Spacing="8">
                                                     <TextBox Width="170"
-                                                             Watermark="Custom 1/x"
+                                                             PlaceholderText="Custom 1/x"
                                                              Text="{Binding DataContext.CustomSnapInput, Mode=TwoWay, ElementName=Root}" />
                                                     <Button Classes="Basic Compact"
                                                             Command="{Binding DataContext.AddCustomSnapCommand, ElementName=Root}">
diff --git a/MapWizard.Desktop/Views/MetadataManager/MetadataManagerView.axaml b/MapWizard.Desktop/Views/MetadataManager/MetadataManagerView.axaml
index 1680d29..b795738 100644
--- a/MapWizard.Desktop/Views/MetadataManager/MetadataManagerView.axaml
+++ b/MapWizard.Desktop/Views/MetadataManager/MetadataManagerView.axaml
@@ -9,10 +9,12 @@
   xmlns:materialIcons="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
   xmlns:suki="clr-namespace:SukiUI.Controls;assembly=SukiUI"
   xmlns:theme="https://github.com/kikipoulet/SukiUI"
+  xmlns:models="using:MapWizard.Desktop.Models"
   mc:Ignorable="d"
   d:DesignWidth="800"
   d:DesignHeight="450"
   x:Class="MapWizard.Desktop.Views.MetadataManager.MetadataManagerView"
+  x:Name="Root"
   x:DataType="vm:MetadataManagerViewModel"
   Padding="16">
 
@@ -65,14 +67,14 @@
               </Grid>
               <Separator />
               <StackPanel Spacing="8" IsEnabled="{Binding ApplyMetadataSection}">
-                <TextBox theme:TextBoxExtensions.Prefix="Title: " theme:TextBoxExtensions.AddDeleteButton="True" Watermark="Title" Text="{Binding Metadata.Title, Mode=TwoWay}" />
-                <TextBox theme:TextBoxExtensions.Prefix="Romanized Title: " theme:TextBoxExtensions.AddDeleteButton="True" Watermark="Romanized Title" Text="{Binding Metadata.RomanizedTitle, Mode=TwoWay}" />
-                <TextBox theme:TextBoxExtensions.Prefix="Artist: " theme:TextBoxExtensions.AddDeleteButton="True" Watermark="Artist" Text="{Binding Metadata.Artist, Mode=TwoWay}" />
-                <TextBox theme:TextBoxExtensions.Prefix="Romanized Artist: " theme:TextBoxExtensions.AddDeleteButton="True" Watermark="Romanized Artist" Text="{Binding Metadata.RomanizedArtist, Mode=TwoWay}" />
-                <TextBox theme:TextBoxExtensions.Prefix="Creator: " theme:TextBoxExtensions.AddDeleteButton="True" Watermark="Creator" Text="{Binding Metadata.Creator, Mode=TwoWay}" />
-                <TextBox theme:TextBoxExtensions.Prefix="Source: " theme:TextBoxExtensions.AddDeleteButton="True" Watermark="Source" Text="{Binding Metadata.Source, Mode=TwoWay}" />
-                <TextBox theme:TextBoxExtensions.Prefix="Tags: " theme:TextBoxExtensions.AddDeleteButton="True" Watermark="Tags" AcceptsReturn="True" TextWrapping="Wrap" Text="{Binding Metadata.Tags, Mode=TwoWay}" />
-                <TextBox theme:TextBoxExtensions.Prefix="Beatmap Set ID: " theme:TextBoxExtensions.AddDeleteButton="True" Watermark="Beatmap Set ID" Text="{Binding Metadata.BeatmapSetId, Mode=TwoWay}" />
+                <TextBox theme:TextBoxExtensions.Prefix="Title: " theme:TextBoxExtensions.AddDeleteButton="True" PlaceholderText="Title" Text="{Binding Metadata.Title, Mode=TwoWay}" />
+                <TextBox theme:TextBoxExtensions.Prefix="Romanized Title: " theme:TextBoxExtensions.AddDeleteButton="True" PlaceholderText="Romanized Title" Text="{Binding Metadata.RomanizedTitle, Mode=TwoWay}" />
+                <TextBox theme:TextBoxExtensions.Prefix="Artist: " theme:TextBoxExtensions.AddDeleteButton="True" PlaceholderText="Artist" Text="{Binding Metadata.Artist, Mode=TwoWay}" />
+                <TextBox theme:TextBoxExtensions.Prefix="Romanized Artist: " theme:TextBoxExtensions.AddDeleteButton="True" PlaceholderText="Romanized Artist" Text="{Binding Metadata.RomanizedArtist, Mode=TwoWay}" />
+                <TextBox theme:TextBoxExtensions.Prefix="Creator: " theme:TextBoxExtensions.AddDeleteButton="True" PlaceholderText="Creator" Text="{Binding Metadata.Creator, Mode=TwoWay}" />
+                <TextBox theme:TextBoxExtensions.Prefix="Source: " theme:TextBoxExtensions.AddDeleteButton="True" PlaceholderText="Source" Text="{Binding Metadata.Source, Mode=TwoWay}" />
+                <TextBox theme:TextBoxExtensions.Prefix="Tags: " theme:TextBoxExtensions.AddDeleteButton="True" PlaceholderText="Tags" AcceptsReturn="True" TextWrapping="Wrap" Text="{Binding Metadata.Tags, Mode=TwoWay}" />
+                <TextBox theme:TextBoxExtensions.Prefix="Beatmap Set ID: " theme:TextBoxExtensions.AddDeleteButton="True" PlaceholderText="Beatmap Set ID" Text="{Binding Metadata.BeatmapSetId, Mode=TwoWay}" />
               </StackPanel>
             </StackPanel>
           </suki:GlassCard>
@@ -91,18 +93,18 @@
                   <NumericUpDown Grid.Column="1" theme:NumericUpDownExtensions.Unit="ms" Increment="1" Minimum="-1"
                                  Value="{Binding Metadata.PreviewTime, Mode=TwoWay}" />
                 </Grid>
-                <TextBox theme:TextBoxExtensions.Prefix="Audio File: " theme:TextBoxExtensions.AddDeleteButton="True" Watermark="Audio File" Text="{Binding Metadata.AudioFilename, Mode=TwoWay}" />
+                <TextBox theme:TextBoxExtensions.Prefix="Audio File: " theme:TextBoxExtensions.AddDeleteButton="True" PlaceholderText="Audio File" Text="{Binding Metadata.AudioFilename, Mode=TwoWay}" />
                 <Grid ColumnDefinitions="*,Auto">
                   <TextBlock Text="Overwrite background file for all difficulties" VerticalAlignment="Center" />
                   <ToggleSwitch Grid.Column="1" IsChecked="{Binding OverwriteBackground, Mode=TwoWay}" />
                 </Grid>
-                <TextBox IsVisible="{Binding OverwriteBackground}" theme:TextBoxExtensions.Prefix="Background Image: " theme:TextBoxExtensions.AddDeleteButton="True" Watermark="Background Image" Text="{Binding Metadata.BackgroundFilename, Mode=TwoWay}" />
+                <TextBox IsVisible="{Binding OverwriteBackground}" theme:TextBoxExtensions.Prefix="Background Image: " theme:TextBoxExtensions.AddDeleteButton="True" PlaceholderText="Background Image" Text="{Binding Metadata.BackgroundFilename, Mode=TwoWay}" />
                 <Grid ColumnDefinitions="*,Auto">
                   <TextBlock Text="Overwrite video for all difficulties" VerticalAlignment="Center" />
                   <ToggleSwitch Grid.Column="1" IsChecked="{Binding OverwriteVideo, Mode=TwoWay}" />
                 </Grid>
-                <TextBox IsVisible="{Binding OverwriteVideo}" theme:TextBoxExtensions.Prefix="Video Offset: " theme:TextBoxExtensions.AddDeleteButton="True" Watermark="Video Offset" Text="{Binding Metadata.VideoOffset, Mode=TwoWay}" />
-                <TextBox IsVisible="{Binding OverwriteVideo}" theme:TextBoxExtensions.Prefix="Video File: " theme:TextBoxExtensions.AddDeleteButton="True" Watermark="Video File" Text="{Binding Metadata.VideoFilename, Mode=TwoWay}" />
+                <TextBox IsVisible="{Binding OverwriteVideo}" theme:TextBoxExtensions.Prefix="Video Offset: " theme:TextBoxExtensions.AddDeleteButton="True" PlaceholderText="Video Offset" Text="{Binding Metadata.VideoOffset, Mode=TwoWay}" />
+                <TextBox IsVisible="{Binding OverwriteVideo}" theme:TextBoxExtensions.Prefix="Video File: " theme:TextBoxExtensions.AddDeleteButton="True" PlaceholderText="Video File" Text="{Binding Metadata.VideoFilename, Mode=TwoWay}" />
                 <Grid ColumnDefinitions="*,Auto">
                   <TextBlock Text="Widescreen Support" VerticalAlignment="Center" />
                   <ToggleSwitch Grid.Column="1" IsChecked="{Binding Metadata.WidescreenStoryboard, Mode=TwoWay}" />
@@ -168,14 +170,14 @@
               <StackPanel Spacing="8">
                 <ItemsControl ItemsSource="{Binding Metadata.Colours}">
                   <ItemsControl.ItemTemplate>
-                    <DataTemplate>
+                    <DataTemplate x:DataType="models:AvaloniaComboColour">
                       <Grid ColumnDefinitions="*,Auto">
                         <TextBlock FontWeight="Bold" Text="{Binding Number, StringFormat=Combo {0}}" VerticalAlignment="Center" />
                         <StackPanel Grid.Column="1" Orientation="Horizontal" Spacing="8">
                           <controls:ModernColorPicker VerticalAlignment="Center"
                                                       SelectedColor="{Binding Colour, Converter={StaticResource AvaloniaColorToColorConverter}, Mode=TwoWay}" />
                           <Button Classes="Basic" 
-                                  Command="{Binding DataContext.RemoveColourCommand, RelativeSource={RelativeSource AncestorType=UserControl}}" 
+                                  Command="{Binding #Root.DataContext.RemoveColourCommand}"
                                   CommandParameter="{Binding}" 
                                   ToolTip.Tip="Remove this colour">
                             <materialIcons:MaterialIcon Kind="Close" Width="24" Height="24" />
diff --git a/MapWizard.Desktop/Views/Settings/SettingsView.axaml b/MapWizard.Desktop/Views/Settings/SettingsView.axaml
index 0268b6f..b8c629e 100644
--- a/MapWizard.Desktop/Views/Settings/SettingsView.axaml
+++ b/MapWizard.Desktop/Views/Settings/SettingsView.axaml
@@ -55,7 +55,7 @@
                                     <TextBlock Text="Map Picker uses this folder to display recent beatmaps and their backgrounds."
                                                TextWrapping="Wrap" />
                                     <TextBox Text="{Binding SongsPath, Mode=TwoWay}"
-                                             Watermark="Path to osu! Songs folder"
+                                             PlaceholderText="Path to osu! Songs folder"
                                              Margin="0,4,0,0" />
                                     <TextBlock Text="{Binding SongsPathStatusText}"
                                                FontSize="12"
diff --git a/MapWizard.Tests/MapWizard.Tests.csproj b/MapWizard.Tests/MapWizard.Tests.csproj
index 0980351..691ec4b 100644
--- a/MapWizard.Tests/MapWizard.Tests.csproj
+++ b/MapWizard.Tests/MapWizard.Tests.csproj
@@ -21,13 +21,13 @@
 
   <ItemGroup>
     <PackageReference Include="MapWizard.BeatmapParser" Version="1.0.6" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.8.1" />
     <PackageReference Include="xunit" Version="2.9.3" />
     <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="8.0.1">
+    <PackageReference Include="coverlet.collector" Version="10.0.1">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
diff --git a/MapWizard.Tools/MapWizard.Tools.csproj b/MapWizard.Tools/MapWizard.Tools.csproj
index e380e2a..52bc4f3 100644
--- a/MapWizard.Tools/MapWizard.Tools.csproj
+++ b/MapWizard.Tools/MapWizard.Tools.csproj
@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <PackageReference Include="MapWizard.BeatmapParser" Version="1.0.6" />
-    <PackageReference Include="SkiaSharp" Version="3.119.2" />
+    <PackageReference Include="SkiaSharp" Version="4.150.1" />
   </ItemGroup>
 
 </Project>