diff --git a/MusicDecrypto.Avalonia/App.axaml b/MusicDecrypto.Avalonia/App.axaml
index d5054b1..96528ca 100644
--- a/MusicDecrypto.Avalonia/App.axaml
+++ b/MusicDecrypto.Avalonia/App.axaml
@@ -1,48 +1,64 @@
-<Application xmlns="https://github.com/avaloniaui"
-  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-  xmlns:sty="using:FluentAvalonia.Styling"
-  x:Class="MusicDecrypto.Avalonia.App">
-
-  <Application.Styles>
-    <sty:FluentAvaloniaTheme />
-
-    <StyleInclude Source="/Controls/OptionsDisplayItem.axaml" />
-    <StyleInclude Source="/Controls/UrlTextBlock.axaml" />
-
-    <Style Selector="TextBlock.BaseTextBlockStyle">
-      <Setter Property="LineHeight" Value="20" />
-      <Setter Property="ClipToBounds" Value="False" />
-    </Style>
-
-    <Style Selector="TextBlock.CaptionTextBlockStyle">
-      <Setter Property="LineHeight" Value="16" />
-      <Setter Property="ClipToBounds" Value="False" />
-    </Style>
-
-    <Style Selector="TextBlock.BodyTextBlockStyle">
-      <Setter Property="LineHeight" Value="20" />
-      <Setter Property="ClipToBounds" Value="False" />
-    </Style>
-
-    <Style Selector="TextBlock.BodyStrongTextBlockStyle">
-      <Setter Property="LineHeight" Value="20" />
-      <Setter Property="ClipToBounds" Value="False" />
-    </Style>
-
-    <Style Selector="TextBlock.SubtitleTextBlockStyle">
-      <Setter Property="LineHeight" Value="28" />
-      <Setter Property="ClipToBounds" Value="False" />
-    </Style>
-
-    <Style Selector="TextBlock.TitleTextBlockStyle">
-      <Setter Property="LineHeight" Value="36" />
-      <Setter Property="ClipToBounds" Value="False" />
-    </Style>
-
-    <Style Selector="TextBlock.DisplayTextBlockStyle">
-      <Setter Property="LineHeight" Value="92" />
-      <Setter Property="ClipToBounds" Value="False" />
-    </Style>
-  </Application.Styles>
+<Application x:Class="MusicDecrypto.Avalonia.App"
+             xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:ic="using:FluentIcons.FluentAvalonia"
+             xmlns:sty="using:FluentAvalonia.Styling">
+
+    <Application.Resources>
+        <ResourceDictionary>
+            <ic:SymbolIconSource x:Key="BoxMultipleIcon" Symbol="BoxMultiple" />
+            <ic:SymbolIconSource x:Key="CodeIcon" Symbol="Code" />
+            <ic:SymbolIconSource x:Key="DocumentBulletListIcon" Symbol="DocumentBulletList" />
+            <ic:SymbolIconSource x:Key="OpenIcon" Symbol="Open" />
+            <ic:SymbolIconSource x:Key="PaintBrushIcon" Symbol="PaintBrush" />
+
+            <ControlTheme x:Key="FluentBaseTextBlockStyle"
+                          BasedOn="{StaticResource BaseTextBlockStyle}" TargetType="TextBlock">
+                <Setter Property="LineHeight" Value="20" />
+                <Setter Property="ClipToBounds" Value="False" />
+            </ControlTheme>
+
+            <ControlTheme x:Key="FluentCaptionTextBlockStyle"
+                          BasedOn="{StaticResource CaptionTextBlockStyle}" TargetType="TextBlock">
+                <Setter Property="LineHeight" Value="16" />
+                <Setter Property="ClipToBounds" Value="False" />
+            </ControlTheme>
+
+            <ControlTheme x:Key="FluentBodyTextBlockStyle"
+                          BasedOn="{StaticResource BodyTextBlockStyle}" TargetType="TextBlock">
+                <Setter Property="LineHeight" Value="20" />
+                <Setter Property="ClipToBounds" Value="False" />
+            </ControlTheme>
+
+            <ControlTheme x:Key="FluentBodyStrongTextBlockStyle"
+                          BasedOn="{StaticResource BodyStrongTextBlockStyle}" TargetType="TextBlock">
+                <Setter Property="LineHeight" Value="20" />
+                <Setter Property="ClipToBounds" Value="False" />
+            </ControlTheme>
+
+            <ControlTheme x:Key="FluentSubtitleTextBlockStyle"
+                          BasedOn="{StaticResource SubtitleTextBlockStyle}" TargetType="TextBlock">
+                <Setter Property="LineHeight" Value="28" />
+                <Setter Property="ClipToBounds" Value="False" />
+            </ControlTheme>
+
+            <ControlTheme x:Key="FluentTitleTextBlockStyle"
+                          BasedOn="{StaticResource TitleTextBlockStyle}" TargetType="TextBlock">
+                <Setter Property="LineHeight" Value="36" />
+                <Setter Property="ClipToBounds" Value="False" />
+            </ControlTheme>
+
+            <ControlTheme x:Key="FluentDisplayTextBlockStyle"
+                          BasedOn="{StaticResource DisplayTextBlockStyle}" TargetType="TextBlock">
+                <Setter Property="LineHeight" Value="92" />
+                <Setter Property="ClipToBounds" Value="False" />
+            </ControlTheme>
+        </ResourceDictionary>
+    </Application.Resources>
+
+    <Application.Styles>
+        <sty:FluentAvaloniaTheme />
+        <StyleInclude Source="/Controls/UrlTextBlock.axaml" />
+    </Application.Styles>
 
 </Application>
\ No newline at end of file
diff --git a/MusicDecrypto.Avalonia/Controls/MatchDialogContent.axaml b/MusicDecrypto.Avalonia/Controls/MatchDialogContent.axaml
index 164f84c..8722a08 100644
--- a/MusicDecrypto.Avalonia/Controls/MatchDialogContent.axaml
+++ b/MusicDecrypto.Avalonia/Controls/MatchDialogContent.axaml
@@ -1,11 +1,12 @@
 <UserControl x:Class="MusicDecrypto.Avalonia.Controls.MatchDialogContent"
              xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             mc:Ignorable="d" d:DesignHeight="450" d:DesignWidth="800">
+             d:DesignWidth="800" d:DesignHeight="450"
+             mc:Ignorable="d">
 
-    <DataGrid CanUserSortColumns="False" IsReadOnly="True" Items="{Binding Properties}">
+    <DataGrid ItemsSource="{Binding Properties}" IsReadOnly="True" CanUserSortColumns="False">
         <DataGrid.Columns>
             <DataGridTextColumn Binding="{Binding Key}" Header="Source" />
             <DataGridTextColumn Binding="{Binding Title}" Header="Title" />
diff --git a/MusicDecrypto.Avalonia/Controls/MatchDialogContent.axaml.cs b/MusicDecrypto.Avalonia/Controls/MatchDialogContent.axaml.cs
index 013cbca..d2a8106 100644
--- a/MusicDecrypto.Avalonia/Controls/MatchDialogContent.axaml.cs
+++ b/MusicDecrypto.Avalonia/Controls/MatchDialogContent.axaml.cs
@@ -9,9 +9,4 @@ public MatchDialogContent()
     {
         InitializeComponent();
     }
-
-    private void InitializeComponent()
-    {
-        AvaloniaXamlLoader.Load(this);
-    }
 }
diff --git a/MusicDecrypto.Avalonia/Controls/OptionsDisplayItem.axaml b/MusicDecrypto.Avalonia/Controls/OptionsDisplayItem.axaml
deleted file mode 100644
index b53bc89..0000000
--- a/MusicDecrypto.Avalonia/Controls/OptionsDisplayItem.axaml
+++ /dev/null
@@ -1,161 +0,0 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:ic="using:FluentIcons.FluentAvalonia"
-        xmlns:local="using:MusicDecrypto.Avalonia.Controls">
-
-    <Design.PreviewWith>
-        <Border MinWidth="400" MinHeight="300" Padding="20">
-            <StackPanel>
-                <local:OptionsDisplayItem Description="This is a description of whatver this does" Header="Header"
-                                          Icon="Save" Navigates="True" />
-
-                <local:OptionsDisplayItem Content="Hello World" Description="This is a description of whatver this does"
-                                          Expands="True" Header="Header" Icon="Save" />
-
-                <local:OptionsDisplayItem Classes="Vertical" Content="Hello World"
-                                          Description="This is a description of whatver this does" Expands="True"
-                                          Header="Header" Icon="Save" />
-            </StackPanel>
-        </Border>
-    </Design.PreviewWith>
-
-    <Style Selector="local|OptionsDisplayItem">
-        <Setter Property="Background" Value="{DynamicResource ControlFillColorDefaultBrush}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource CardStrokeColorDefaultBrush}" />
-        <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="Padding" Value="{StaticResource ButtonPadding}" />
-        <Setter Property="CornerRadius" Value="{StaticResource ControlCornerRadius}" />
-        <Setter Property="Template">
-            <ControlTemplate>
-                <StackPanel>
-                    <Border Name="LayoutRoot"
-                            Padding="16"
-                            Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            CornerRadius="{TemplateBinding CornerRadius}">
-                        <Grid ColumnDefinitions="Auto,*,Auto,Auto">
-                            <Viewbox Name="IconHost"
-                                     Grid.RowSpan="2"
-                                     Width="24" Height="24"
-                                     Margin="0,6,12,6" VerticalAlignment="Center">
-                                <ContentPresenter Content="{TemplateBinding Icon}" />
-                            </Viewbox>
-
-                            <StackPanel Grid.Column="1" Margin="4,0,0,0" VerticalAlignment="Center">
-                                <TextBlock Grid.Column="2"
-                                           Classes="BodyTextBlockStyle" Text="{TemplateBinding Header}"
-                                           TextTrimming="WordEllipsis" />
-
-                                <TextBlock Grid.Column="2"
-                                           Foreground="{DynamicResource TextFillColorSecondaryBrush}"
-                                           Classes="CaptionTextBlockStyle" Text="{TemplateBinding Description}"
-                                           TextWrapping="Wrap" />
-                            </StackPanel>
-
-                            <ContentPresenter Grid.Column="2" VerticalAlignment="Center" Content="{TemplateBinding ActionButton}" />
-
-                            <ic:SymbolIcon Name="Chevron"
-                                           Grid.Column="3"
-                                           Margin="12,0,0,0" VerticalAlignment="Center"
-                                           FontSize="18" />
-                        </Grid>
-                    </Border>
-
-                    <ContentPresenter Name="ExpandedContentPresenter"
-                                      Grid.Row="2" Grid.ColumnSpan="4"
-                                      Padding="16" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
-                                      HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch"
-                                      Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"
-                                      BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="1,0,1,1"
-                                      Content="{TemplateBinding Content}" />
-                </StackPanel>
-            </ControlTemplate>
-        </Setter>
-    </Style>
-
-
-    <Style Selector="local|OptionsDisplayItem /template/ Viewbox#IconHost">
-        <Setter Property="IsVisible" Value="False" />
-    </Style>
-    <Style Selector="local|OptionsDisplayItem /template/ ic|SymbolIcon#Chevron">
-        <Setter Property="IsVisible" Value="False" />
-    </Style>
-    <Style Selector="local|OptionsDisplayItem /template/ ContentPresenter#ExpandedContentPresenter">
-        <Setter Property="IsVisible" Value="False" />
-    </Style>
-
-    <Style Selector="local|OptionsDisplayItem /template/ Border#LayoutRoot:pointerover">
-        <Setter Property="Background" Value="{DynamicResource ControlFillColorSecondaryBrush}" />
-    </Style>
-    <Style Selector="local|OptionsDisplayItem:pressed /template/ Border#LayoutRoot:pointerover">
-        <Setter Property="Background" Value="{DynamicResource ControlFillColorTertiaryBrush}" />
-    </Style>
-
-    <Style Selector="local|OptionsDisplayItem:icon /template/ Viewbox#IconHost">
-        <Setter Property="IsVisible" Value="True" />
-    </Style>
-
-    <Style Selector="local|OptionsDisplayItem:navigates /template/ ic|SymbolIcon#Chevron">
-        <Setter Property="IsVisible" Value="True" />
-        <Setter Property="Symbol" Value="ChevronRight" />
-    </Style>
-
-    <Style Selector="local|OptionsDisplayItem:links /template/ ic|SymbolIcon#Chevron">
-        <Setter Property="IsVisible" Value="True" />
-        <Setter Property="Symbol" Value="Open" />
-    </Style>
-
-    <Style Selector="local|OptionsDisplayItem:expands /template/ ic|SymbolIcon#Chevron">
-        <Setter Property="IsVisible" Value="True" />
-        <Setter Property="Symbol" Value="ChevronDown" />
-    </Style>
-    <Style Selector="local|OptionsDisplayItem:expanded /template/ ic|SymbolIcon#Chevron">
-        <Setter Property="Symbol" Value="ChevronUp" />
-    </Style>
-    <Style Selector="local|OptionsDisplayItem:expanded /template/ ContentPresenter#ExpandedContentPresenter">
-        <Setter Property="IsVisible" Value="True" />
-        <Setter Property="CornerRadius" Value="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BottomCornerRadiusFilterConverter}}" />
-    </Style>
-    <Style Selector="local|OptionsDisplayItem:expanded /template/ Border#LayoutRoot">
-        <Setter Property="CornerRadius" Value="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource TopCornerRadiusFilterConverter}}" />
-    </Style>
-    <Style Selector="local|OptionsDisplayItem:not(:expands):expanded /template/ ContentPresenter#ExpandedContentPresenter">
-        <Setter Property="IsVisible" Value="False" />
-    </Style>
-
-
-    <!--  Vertical Style  -->
-    <Style Selector="local|OptionsDisplayItem.Vertical">
-        <Setter Property="Template">
-            <ControlTemplate>
-                <Border Name="LayoutRoot"
-                        Padding="16"
-                        Background="{TemplateBinding Background}"
-                        BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="{TemplateBinding BorderThickness}"
-                        CornerRadius="{TemplateBinding CornerRadius}">
-                    <Grid RowDefinitions="*,*,*">
-                        <Border Width="72" Height="72"
-                                Margin="8"
-                                Background="Transparent"
-                                ClipToBounds="True" CornerRadius="{StaticResource OverlayCornerRadius}">
-                            <Viewbox Name="IconHost">
-                                <ContentPresenter Content="{TemplateBinding Icon}" />
-                            </Viewbox>
-                        </Border>
-
-                        <TextBlock Grid.Row="1"
-                                   Classes="BaseTextBlockStyle" Text="{TemplateBinding Header}"
-                                   TextTrimming="WordEllipsis" />
-
-                        <TextBlock Grid.Row="2"
-                                   Foreground="{DynamicResource TextFillColorSecondaryBrush}"
-                                   Classes="CaptionTextBlockStyle" Text="{TemplateBinding Description}"
-                                   TextWrapping="Wrap" />
-                    </Grid>
-                </Border>
-            </ControlTemplate>
-        </Setter>
-    </Style>
-</Styles>
diff --git a/MusicDecrypto.Avalonia/Controls/OptionsDisplayItem.axaml.cs b/MusicDecrypto.Avalonia/Controls/OptionsDisplayItem.axaml.cs
deleted file mode 100644
index dc2721c..0000000
--- a/MusicDecrypto.Avalonia/Controls/OptionsDisplayItem.axaml.cs
+++ /dev/null
@@ -1,206 +0,0 @@
-using System;
-using System.Windows.Input;
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Controls.Primitives;
-using Avalonia.Input;
-using Avalonia.Interactivity;
-using FluentIcons.FluentAvalonia;
-using MusicDecrypto.Avalonia.Helpers;
-
-namespace MusicDecrypto.Avalonia.Controls;
-
-public class OptionsDisplayItem : TemplatedControl
-{
-    public static readonly StyledProperty<string> HeaderProperty =
-        AvaloniaProperty.Register<OptionsDisplayItem, string>(nameof(Header));
-
-    public static readonly StyledProperty<string> DescriptionProperty =
-        AvaloniaProperty.Register<OptionsDisplayItem, string>(nameof(Description));
-
-    public static readonly StyledProperty<SymbolIcon> IconProperty =
-        AvaloniaProperty.Register<OptionsDisplayItem, SymbolIcon>(nameof(Icon));
-
-    public static readonly StyledProperty<IControl> ActionButtonProperty =
-        AvaloniaProperty.Register<OptionsDisplayItem, IControl>(nameof(ActionButton));
-
-    public static readonly StyledProperty<bool> NavigatesProperty =
-        AvaloniaProperty.Register<OptionsDisplayItem, bool>(nameof(Navigates));
-
-    public static readonly StyledProperty<ICommand> NavigationCommandProperty =
-        AvaloniaProperty.Register<OptionsDisplayItem, ICommand>(nameof(NavigationCommand));
-
-    public static readonly StyledProperty<bool> ExpandsProperty =
-        AvaloniaProperty.Register<OptionsDisplayItem, bool>(nameof(Expands));
-
-    public static readonly StyledProperty<object> ContentProperty =
-        ContentControl.ContentProperty.AddOwner<OptionsDisplayItem>();
-
-    public static readonly DirectProperty<OptionsDisplayItem, bool> IsExpandedProperty =
-        Expander.IsExpandedProperty.AddOwner<OptionsDisplayItem>(x => x.IsExpanded,
-            (x, v) => x.IsExpanded = v);
-
-    public static readonly StyledProperty<bool> LinksProprerty =
-        AvaloniaProperty.Register<OptionsDisplayItem, bool>(nameof(Links));
-
-    public static readonly StyledProperty<string> HrefProprerty =
-        AvaloniaProperty.Register<OptionsDisplayItem, string>(nameof(Href));
-
-    public string Header
-    {
-        get => GetValue(HeaderProperty);
-        set => SetValue(HeaderProperty, value);
-    }
-
-    public string Description
-    {
-        get => GetValue(DescriptionProperty);
-        set => SetValue(DescriptionProperty, value);
-    }
-
-    public SymbolIcon Icon
-    {
-        get => GetValue(IconProperty);
-        set => SetValue(IconProperty, value);
-    }
-
-    public IControl ActionButton
-    {
-        get => GetValue(ActionButtonProperty);
-        set => SetValue(ActionButtonProperty, value);
-    }
-
-    public bool Navigates
-    {
-        get => GetValue(NavigatesProperty);
-        set => SetValue(NavigatesProperty, value);
-    }
-
-    public ICommand NavigationCommand
-    {
-        get => GetValue(NavigationCommandProperty);
-        set => SetValue(NavigationCommandProperty, value);
-    }
-
-    public bool Expands
-    {
-        get => GetValue(ExpandsProperty);
-        set => SetValue(ExpandsProperty, value);
-    }
-
-    public bool IsExpanded
-    {
-        get => _isExpanded;
-        set => SetAndRaise(IsExpandedProperty, ref _isExpanded, value);
-    }
-
-    public object Content
-    {
-        get => GetValue(ContentProperty);
-        set => SetValue(ContentProperty, value);
-    }
-
-    public bool Links
-    {
-        get => GetValue(LinksProprerty);
-        set => SetValue(LinksProprerty, value);
-    }
-
-    public string Href
-    {
-        get => GetValue(HrefProprerty);
-        set => SetValue(HrefProprerty, value);
-    }
-
-    public static readonly RoutedEvent<RoutedEventArgs> NavigationRequestedEvent =
-        RoutedEvent.Register<OptionsDisplayItem, RoutedEventArgs>(nameof(NavigationRequested), RoutingStrategies.Bubble);
-
-    public event EventHandler<RoutedEventArgs> NavigationRequested
-    {
-        add => AddHandler(NavigationRequestedEvent, value);
-        remove => RemoveHandler(NavigationRequestedEvent, value);
-    }
-
-    protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
-    {
-        base.OnPropertyChanged(change);
-
-        if (change.Property == NavigatesProperty)
-        {
-            if (Expands || Links)
-                throw new InvalidOperationException("Navigating control cannot Expand or Link");
-
-            PseudoClasses.Set(":navigates", change.NewValue.GetValueOrDefault<bool>());
-        }
-        else if (change.Property == ExpandsProperty)
-        {
-            if (Navigates || Links)
-                throw new InvalidOperationException("Expanding control cannot Navigate or Link");
-
-            PseudoClasses.Set(":expands", change.NewValue.GetValueOrDefault<bool>());
-        }
-        else if (change.Property == LinksProprerty)
-        {
-            if (Expands || Navigates)
-                throw new InvalidOperationException("Linking control cannot Expand or Link");
-
-            PseudoClasses.Set(":links", change.NewValue.GetValueOrDefault<bool>());
-        }
-        else if (change.Property == IsExpandedProperty)
-        {
-            PseudoClasses.Set(":expanded", change.NewValue.GetValueOrDefault<bool>());
-        }
-        else if (change.Property == IconProperty)
-        {
-            PseudoClasses.Set(":icon", change.NewValue.GetValueOrDefault() is not null);
-        }
-    }
-
-    protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
-    {
-        base.OnApplyTemplate(e);
-
-        _layoutRoot = e.NameScope.Find<Border>("LayoutRoot");
-        _layoutRoot.PointerPressed += OnLayoutRootPointerPressed;
-        _layoutRoot.PointerReleased += OnLayoutRootPointerReleased;
-        _layoutRoot.PointerCaptureLost += OnLayoutRootPointerCaptureLost;
-    }
-
-    private void OnLayoutRootPointerPressed(object? sender, PointerPressedEventArgs e)
-    {
-        if (e.GetCurrentPoint(this).Properties.PointerUpdateKind == PointerUpdateKind.LeftButtonPressed)
-        {
-            _isPressed = true;
-            PseudoClasses.Set(":pressed", true);
-        }
-    }
-
-    private void OnLayoutRootPointerReleased(object? sender, PointerReleasedEventArgs e)
-    {
-        var pt = e.GetCurrentPoint(this);
-        if (_isPressed && pt.Properties.PointerUpdateKind == PointerUpdateKind.LeftButtonReleased)
-        {
-            _isPressed = false;
-
-            PseudoClasses.Set(":pressed", false);
-
-            if (Expands) IsExpanded = !IsExpanded;
-            else if (Navigates)
-            {
-                RaiseEvent(new RoutedEventArgs(NavigationRequestedEvent, this));
-                NavigationCommand?.Execute(null);
-            }
-            else if (Links) UrlHelper.OpenLink(Href);
-        }
-    }
-
-    private void OnLayoutRootPointerCaptureLost(object? sender, PointerCaptureLostEventArgs e)
-    {
-        _isPressed = false;
-        PseudoClasses.Set(":pressed", false);
-    }
-
-    private bool _isPressed;
-    private bool _isExpanded;
-    private Border? _layoutRoot;
-}
diff --git a/MusicDecrypto.Avalonia/Controls/UrlTextBlock.axaml b/MusicDecrypto.Avalonia/Controls/UrlTextBlock.axaml
index 042bdec..3620e11 100644
--- a/MusicDecrypto.Avalonia/Controls/UrlTextBlock.axaml
+++ b/MusicDecrypto.Avalonia/Controls/UrlTextBlock.axaml
@@ -6,13 +6,16 @@
     <Design.PreviewWith>
         <local:UrlTextBlock Text="External link" />
     </Design.PreviewWith>
+    <Design.PreviewWith>
+        <local:UrlTextBlock Text="External link" />
+    </Design.PreviewWith>
 
     <Style Selector="local|UrlTextBlock">
         <Setter Property="Foreground" Value="{DynamicResource AccentTextFillColorPrimaryBrush}" />
         <Setter Property="Template">
             <ControlTemplate>
                 <StackPanel Name="LayoutRoot" Orientation="Horizontal" Spacing="2">
-                    <TextBlock Classes="BodyStrongTextBlockStyle" Text="{TemplateBinding Text}" />
+                    <TextBlock Theme="{StaticResource FluentBodyStrongTextBlockStyle}" Text="{TemplateBinding Text}" />
                     <ic:SymbolIcon VerticalAlignment="Center" FontSize="14" Symbol="Open" />
                 </StackPanel>
             </ControlTemplate>
@@ -26,4 +29,11 @@
         <Setter Property="Foreground" Value="{DynamicResource AccentTextFillColorSecondaryBrush}" />
     </Style>
 
+    <Style Selector="local|UrlTextBlock /template/ StackPanel#LayoutRoot:pointerover TextBlock">
+        <Setter Property="Foreground" Value="{DynamicResource AccentTextFillColorTertiaryBrush}" />
+    </Style>
+    <Style Selector="local|UrlTextBlock:pressed /template/ StackPanel#LayoutRoot:pointerover TextBlock">
+        <Setter Property="Foreground" Value="{DynamicResource AccentTextFillColorSecondaryBrush}" />
+    </Style>
+
 </Styles>
diff --git a/MusicDecrypto.Avalonia/Controls/UrlTextBlock.axaml.cs b/MusicDecrypto.Avalonia/Controls/UrlTextBlock.axaml.cs
index 67b70b5..19bf345 100644
--- a/MusicDecrypto.Avalonia/Controls/UrlTextBlock.axaml.cs
+++ b/MusicDecrypto.Avalonia/Controls/UrlTextBlock.axaml.cs
@@ -11,16 +11,15 @@ public partial class UrlTextBlock : TemplatedControl
     private StackPanel? _layoutRoot;
     private bool _isPressed;
 
-    public static readonly StyledProperty<string> TextProperty =
-        AvaloniaProperty.Register<OptionsDisplayItem, string>(nameof(Text));
-    public static readonly StyledProperty<string> HrefProperty =
-        AvaloniaProperty.Register<OptionsDisplayItem, string>(nameof(Href));
+        public static readonly StyledProperty<string> TextProperty =
+            AvaloniaProperty.Register<UrlTextBlock, string>(nameof(Text));
+        public static readonly StyledProperty<string> HrefProperty =
+            AvaloniaProperty.Register<UrlTextBlock, string>(nameof(Href));
 
-    public string _text = string.Empty;
     public string Text
     {
-        get => _text;
-        set => SetAndRaise(TextProperty, ref _text, value);
+        get => GetValue(TextProperty);
+        set => SetValue(TextProperty, value);
     }
 
     public string Href
diff --git a/MusicDecrypto.Avalonia/MusicDecrypto.Avalonia.csproj b/MusicDecrypto.Avalonia/MusicDecrypto.Avalonia.csproj
index b3b0214..2f99828 100644
--- a/MusicDecrypto.Avalonia/MusicDecrypto.Avalonia.csproj
+++ b/MusicDecrypto.Avalonia/MusicDecrypto.Avalonia.csproj
@@ -14,11 +14,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="0.10.*" />
-    <PackageReference Include="Avalonia.Desktop" Version="0.10.*" />
-    <PackageReference Include="Avalonia.Diagnostics" Version="0.10.*" Condition=" '$(Configuration)' == 'Debug' " />
+    <PackageReference Include="Avalonia" Version="11.0.*" />
+    <PackageReference Include="Avalonia.Desktop" Version="11.0.*" />
+    <PackageReference Include="Avalonia.Diagnostics" Version="11.0.*" Condition=" '$(Configuration)' == 'Debug' " />
     <PackageReference Include="ByteSize" Version="2.1.*" />
-    <PackageReference Include="FluentAvaloniaUI" Version="1.4.*" />
+    <PackageReference Include="FluentAvaloniaUI" Version="2.0.*" />
     <PackageReference Include="FluentIcons.FluentAvalonia" Version="1.1.*" />
   </ItemGroup>
 
@@ -35,4 +35,3 @@
   </ItemGroup>
 
 </Project>
-  
\ No newline at end of file
diff --git a/MusicDecrypto.Avalonia/Pages/HomePage.axaml b/MusicDecrypto.Avalonia/Pages/HomePage.axaml
index 715bd2d..4c2bcbe 100644
--- a/MusicDecrypto.Avalonia/Pages/HomePage.axaml
+++ b/MusicDecrypto.Avalonia/Pages/HomePage.axaml
@@ -1,11 +1,12 @@
 <UserControl x:Class="MusicDecrypto.Avalonia.Pages.HomePage"
              xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:ctrl="using:MusicDecrypto.Avalonia.Controls"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:ctrl="using:MusicDecrypto.Avalonia.Controls"
              xmlns:vm="using:MusicDecrypto.Avalonia.ViewModels"
-             mc:Ignorable="d" d:DesignHeight="450" d:DesignWidth="800">
+             d:DesignWidth="800" d:DesignHeight="450"
+             mc:Ignorable="d">
 
     <Design.DataContext>
         <vm:MainViewModel />
@@ -14,12 +15,13 @@
     <Grid>
         <TextBlock Grid.Row="1" Grid.ColumnSpan="3"
                    Padding="16" HorizontalAlignment="Center" VerticalAlignment="Center"
-                   Classes="SubtitleTextBlockStyle" IsVisible="{Binding IsEmpty}" Opacity=".25">
+                   Theme="{StaticResource FluentSubtitleTextBlockStyle}"
+                   Opacity=".25" IsVisible="{Binding IsEmpty}">
             Drag and drop here or use the button above.
         </TextBlock>
 
         <ScrollViewer DragDrop.AllowDrop="True">
-            <ItemsControl Items="{Binding Items}">
+            <ItemsControl ItemsSource="{Binding Items}">
                 <ItemsControl.Styles>
                     <Style Selector="TextBlock">
                         <Setter Property="TextWrapping" Value="NoWrap" />
@@ -31,8 +33,8 @@
                 </ItemsControl.Styles>
                 <ItemsControl.ItemsPanel>
                     <ItemsPanelTemplate>
-                        <ctrl:StaggeredPanel Padding="24" RowSpacing="8" ColumnSpacing="8"
-                                             DesiredColumnWidth="288" />
+                        <ctrl:StaggeredPanel DesiredColumnWidth="288" Padding="24" RowSpacing="8"
+                                             ColumnSpacing="8" />
                     </ItemsPanelTemplate>
                 </ItemsControl.ItemsPanel>
                 <ItemsControl.ItemTemplate>
@@ -40,21 +42,25 @@
                         <Border Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"
                                 BorderBrush="{DynamicResource CardStrokeColorDefaultBrush}" BorderThickness="1"
                                 CornerRadius="{DynamicResource ControlCornerRadius}">
-                            <Grid Margin="8" ColumnDefinitions="70,12,*" RowDefinitions="20,16,16,18">
+                            <Grid Margin="8"
+                                  ColumnDefinitions="70,12,*" RowDefinitions="20,16,16,18">
                                 <Border Grid.RowSpan="4"
                                         Background="{DynamicResource SolidBackgroundFillColorSecondaryBrush}"
                                         ClipToBounds="True" CornerRadius="2">
                                     <Image Source="{Binding Cover}" Stretch="UniformToFill" />
                                 </Border>
                                 <TextBlock Grid.Row="0" Grid.Column="2"
-                                           Classes="BaseTextBlockStyle" Text="{Binding Title}" />
+                                           Theme="{StaticResource FluentBaseTextBlockStyle}"
+                                           Text="{Binding Title}" />
                                 <TextBlock Grid.Row="1" Grid.Column="2"
-                                           Classes="CaptionTextBlockStyle" Text="{Binding Performers}" />
+                                           Theme="{StaticResource FluentCaptionTextBlockStyle}"
+                                           Text="{Binding Performers}" />
                                 <TextBlock Grid.Row="2" Grid.Column="2"
-                                           Classes="CaptionTextBlockStyle" Text="{Binding Album}" />
+                                           Theme="{StaticResource FluentCaptionTextBlockStyle}"
+                                           Text="{Binding Album}" />
                                 <TextBlock Grid.Row="3" Grid.Column="2"
-                                           Classes="CaptionTextBlockStyle" Text="{Binding Info}"
-                                           ToolTip.Tip="{Binding Messages}" />
+                                           Theme="{StaticResource FluentCaptionTextBlockStyle}"
+                                           Text="{Binding Info}" ToolTip.Tip="{Binding Messages}" />
                             </Grid>
                         </Border>
                     </DataTemplate>
diff --git a/MusicDecrypto.Avalonia/Pages/HomePage.axaml.cs b/MusicDecrypto.Avalonia/Pages/HomePage.axaml.cs
index 895bcb0..6377f27 100644
--- a/MusicDecrypto.Avalonia/Pages/HomePage.axaml.cs
+++ b/MusicDecrypto.Avalonia/Pages/HomePage.axaml.cs
@@ -9,9 +9,4 @@ public HomePage()
     {
         InitializeComponent();
     }
-
-    private void InitializeComponent()
-    {
-        AvaloniaXamlLoader.Load(this);
-    }
 }
diff --git a/MusicDecrypto.Avalonia/Pages/SettingsPage.axaml b/MusicDecrypto.Avalonia/Pages/SettingsPage.axaml
index 1e32c4b..4f8fdc2 100644
--- a/MusicDecrypto.Avalonia/Pages/SettingsPage.axaml
+++ b/MusicDecrypto.Avalonia/Pages/SettingsPage.axaml
@@ -1,25 +1,28 @@
-<UserControl xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+<UserControl x:Class="MusicDecrypto.Avalonia.Pages.SettingsPage"
+             xmlns="https://github.com/avaloniaui"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:ctrl="using:MusicDecrypto.Avalonia.Controls"
-             xmlns:ic="using:FluentIcons.Avalonia"
+             xmlns:ic="using:FluentIcons.FluentAvalonia"
+             xmlns:ui="using:FluentAvalonia.UI.Controls"
              xmlns:vm="using:MusicDecrypto.Avalonia.ViewModels"
-             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="MusicDecrypto.Avalonia.Pages.SettingsPage">
-    
+             d:DesignWidth="800" d:DesignHeight="450"
+             mc:Ignorable="d">
+
     <Design.DataContext>
         <vm:SettingsViewModel />
     </Design.DataContext>
 
     <ScrollViewer>
-        <StackPanel Margin="24" Orientation="Vertical" Spacing="8">
+        <StackPanel Orientation="Vertical" Margin="24" Spacing="8">
 
             <Grid ColumnDefinitions="Auto,*,Auto,Auto">
                 <Grid.Styles>
                     <Style Selector="Button.AppBarButton">
                         <Setter Property="Padding" Value="8" />
                         <Setter Property="Margin" Value="8 0 0 0" />
+                        <Setter Property="BorderThickness" Value="0" />
                     </Style>
                     <Style Selector="Button.AppBarButton Image">
                         <Setter Property="Width" Value="36" />
@@ -30,65 +33,76 @@
                     </Style>
                 </Grid.Styles>
 
-                <Image Height="64" Width="64" HorizontalAlignment="Left" Source="/Assets/logo.ico" />
-                
-                <StackPanel Grid.Column="1" VerticalAlignment="Center" Margin="12 0 0 0">
-                    <TextBlock Classes="SubtitleTextBlockStyle" Text="MusicDecrypto" />
-                    <TextBlock Classes="BodyTextBlockStyle" Text="{Binding Version, StringFormat='Version {0}'}"
-                               Foreground="{DynamicResource TextFillColorSecondaryBrush}" />
+                <Image Width="64" Height="64" HorizontalAlignment="Left"
+                       Source="/Assets/logo.ico"
+                       RenderOptions.BitmapInterpolationMode="HighQuality" />
+
+                <StackPanel Grid.Column="1"
+                            Margin="12,0,0,0" VerticalAlignment="Center">
+                    <TextBlock Theme="{StaticResource FluentSubtitleTextBlockStyle}" Text="MusicDecrypto" />
+                    <TextBlock Theme="{StaticResource FluentBodyTextBlockStyle}"
+                               Foreground="{DynamicResource TextFillColorSecondaryBrush}"
+                               Text="{Binding Version, StringFormat='Version {0}'}" />
                 </StackPanel>
 
-                <Button Grid.Column="2" Classes="AppBarButton"
-                        Command="{Binding OpenAvaloniaLink}">
+                <Button Grid.Column="2"
+                        Theme="{StaticResource TransparentButton}"
+                        Classes="AppBarButton" Command="{Binding OpenAvaloniaLink}">
                     <Button.Content>
-                        <Grid ColumnDefinitions="Auto,8,Auto"
-                              RowDefinitions="Auto,Auto">
-                            <Image Grid.RowSpan="2" Source="/Assets/logo-avalonia.ico" />
-                            <TextBlock Grid.Column="2" Grid.Row="0"
-                                       Classes="CaptionTextBlockStyle"
+                        <Grid ColumnDefinitions="Auto,8,Auto" RowDefinitions="Auto,Auto">
+                            <Image Grid.RowSpan="2"
+                                   Source="/Assets/logo-avalonia.ico"
+                                   RenderOptions.BitmapInterpolationMode="HighQuality" />
+                            <TextBlock Grid.Row="0" Grid.Column="2"
+                                       Theme="{StaticResource FluentCaptionTextBlockStyle}"
                                        Text="Powered by" />
-                            <TextBlock Grid.Column="2" Grid.Row="1"
-                                       Classes="BodyStrongTextBlockStyle"
+                            <TextBlock Grid.Row="1" Grid.Column="2"
+                                       Theme="{StaticResource FluentBodyStrongTextBlockStyle}"
                                        Text="Avalonia" />
                         </Grid>
                     </Button.Content>
                 </Button>
 
-                <Button Grid.Column="3" Classes="AppBarButton"
-                        Command="{Binding OpenFluentAvaloniaLink}">
+                <Button Grid.Column="3"
+                        Theme="{StaticResource TransparentButton}"
+                        Classes="AppBarButton" Command="{Binding OpenFluentAvaloniaLink}">
                     <Button.Content>
-                        <Grid ColumnDefinitions="Auto,8,Auto"
-                              RowDefinitions="Auto,Auto">
-                            <Image Grid.RowSpan="2" Source="/Assets/logo-fluentavalonia.ico" />
-                            <TextBlock Grid.Column="2" Grid.Row="0"
-                                       Classes="CaptionTextBlockStyle"
+                        <Grid ColumnDefinitions="Auto,8,Auto" RowDefinitions="Auto,Auto">
+                            <Image Grid.RowSpan="2"
+                                   Source="/Assets/logo-fluentavalonia.ico"
+                                   RenderOptions.BitmapInterpolationMode="HighQuality" />
+                            <TextBlock Grid.Row="0" Grid.Column="2"
+                                       Theme="{StaticResource FluentCaptionTextBlockStyle}"
                                        Text="Theme based on" />
-                            <TextBlock Grid.Column="2" Grid.Row="1"
-                                       Classes="BodyStrongTextBlockStyle"
+                            <TextBlock Grid.Row="1" Grid.Column="2"
+                                       Theme="{StaticResource FluentBodyStrongTextBlockStyle}"
                                        Text="FluentAvalonia" />
                         </Grid>
                     </Button.Content>
                 </Button>
 
             </Grid>
-            
-            <TextBlock Classes="BodyStrongTextBlockStyle" Margin="0 20 0 0" Text="Settings" />
 
-            <ctrl:OptionsDisplayItem Icon="PaintBrush" Header="Theme"
-                                     Description="Change the current app theme.">
-                <ctrl:OptionsDisplayItem.ActionButton>
-                    <ComboBox SelectedItem="{Binding CurrentAppTheme}"
-                              Items="{Binding AppThemes}"
-                              MinWidth="120"/>
-                </ctrl:OptionsDisplayItem.ActionButton>
-            </ctrl:OptionsDisplayItem>
+            <TextBlock Margin="0,20,0,0"
+                       Theme="{StaticResource FluentBodyStrongTextBlockStyle}"
+                       Text="Settings" />
 
-            <TextBlock Classes="BodyStrongTextBlockStyle" Margin="0 20 0 0" Text="About" />
+            <ui:SettingsExpander Description="Change the current app theme." Header="Theme"
+                                 IconSource="{StaticResource PaintBrushIcon}">
+                <ui:SettingsExpander.Footer>
+                    <ComboBox MinWidth="120"
+                              ItemsSource="{Binding AppThemes}" SelectedItem="{Binding CurrentAppTheme}" />
+                </ui:SettingsExpander.Footer>
+            </ui:SettingsExpander>
 
-            <ctrl:OptionsDisplayItem Icon="BoxMultiple" Header="Credits" Expands="True"
-                                     Description="Third party open-source projects.">
-                <ctrl:OptionsDisplayItem.Content>
-                    <ItemsControl Items="{Binding Credits}">
+            <TextBlock Margin="0,20,0,0"
+                       Theme="{StaticResource FluentBodyStrongTextBlockStyle}"
+                       Text="About" />
+
+            <ui:SettingsExpander Description="Third party open-source projects." Header="Credits"
+                                 IconSource="{StaticResource BoxMultipleIcon}">
+                <ui:SettingsExpanderItem>
+                    <ItemsControl ItemsSource="{Binding Credits}">
                         <ItemsControl.Styles>
                             <Style Selector="StackPanel.Row">
                                 <Setter Property="Orientation" Value="Horizontal" />
@@ -107,24 +121,23 @@
                         <ItemsControl.ItemTemplate>
                             <DataTemplate>
                                 <StackPanel Classes="Row">
-                                    <ctrl:UrlTextBlock Text="{Binding Name}" Href="{Binding Url}" />
-                                    <TextBlock Classes="CaptionTextBlockStyle" Text="{Binding License, StringFormat='({0})'}" />
+                                    <ctrl:UrlTextBlock Href="{Binding Url}" Text="{Binding Name}" />
+                                    <TextBlock Theme="{StaticResource FluentCaptionTextBlockStyle}" Text="{Binding License, StringFormat='({0})'}" />
                                 </StackPanel>
                             </DataTemplate>
                         </ItemsControl.ItemTemplate>
                     </ItemsControl>
-                </ctrl:OptionsDisplayItem.Content>
-            </ctrl:OptionsDisplayItem>
-
-            <ctrl:OptionsDisplayItem Icon="DocumentBulletList" Header="License"
-                                     Links="True" Href="https://www.gnu.org/licenses/agpl-3.0.html"
-                                     Description="This program is distributed under GNU AGPL-3.0." />
+                </ui:SettingsExpanderItem>
+            </ui:SettingsExpander>
 
-            <ctrl:OptionsDisplayItem Icon="Code" Header="GitHub repository"
-                                     Links="True" Href="https://github.com/davidxuang/MusicDecrypto"
-                                     Description="Check out the source code and get in touch." />
+            <ui:SettingsExpander ActionIconSource="{StaticResource OpenIcon}" Click="OnLicenseClick"
+                                 Description="This program is distributed under GNU AGPL-3.0." Header="License"
+                                 IconSource="{StaticResource DocumentBulletListIcon}" IsClickEnabled="True" />
 
+            <ui:SettingsExpander ActionIconSource="{StaticResource OpenIcon}" Click="OnGitHubClick"
+                                 Description="Check out the source code." Header="GitHub repository"
+                                 IconSource="{StaticResource CodeIcon}" IsClickEnabled="True" />
         </StackPanel>
     </ScrollViewer>
-    
+
 </UserControl>
diff --git a/MusicDecrypto.Avalonia/Pages/SettingsPage.axaml.cs b/MusicDecrypto.Avalonia/Pages/SettingsPage.axaml.cs
index ec9e014..817d9b6 100644
--- a/MusicDecrypto.Avalonia/Pages/SettingsPage.axaml.cs
+++ b/MusicDecrypto.Avalonia/Pages/SettingsPage.axaml.cs
@@ -1,5 +1,7 @@
 using Avalonia.Controls;
+using Avalonia.Interactivity;
 using Avalonia.Markup.Xaml;
+using MusicDecrypto.Avalonia.Helpers;
 using MusicDecrypto.Avalonia.ViewModels;
 
 namespace MusicDecrypto.Avalonia.Pages;
@@ -13,8 +15,6 @@ public SettingsPage()
         InitializeComponent();
     }
 
-    private void InitializeComponent()
-    {
-        AvaloniaXamlLoader.Load(this);
-    }
+    private void OnLicenseClick(object? sender, RoutedEventArgs? eventArgs) => UrlHelper.OpenLink("https://www.gnu.org/licenses/agpl-3.0.html");
+    private void OnGitHubClick(object? sender, RoutedEventArgs? eventArgs) => UrlHelper.OpenLink("https://github.com/davidxuang/MusicDecrypto");
 }
diff --git a/MusicDecrypto.Avalonia/Program.cs b/MusicDecrypto.Avalonia/Program.cs
index 539bef7..d85705b 100644
--- a/MusicDecrypto.Avalonia/Program.cs
+++ b/MusicDecrypto.Avalonia/Program.cs
@@ -1,5 +1,6 @@
 using System;
 using Avalonia;
+using FluentAvalonia.UI.Windowing;
 
 namespace MusicDecrypto.Avalonia;
 
@@ -12,10 +13,5 @@ public static void Main(string[] args) => BuildAvaloniaApp()
     public static AppBuilder BuildAvaloniaApp()
         => AppBuilder.Configure<App>()
             .UsePlatformDetect()
-            .With(new Win32PlatformOptions()
-            {
-                UseWindowsUIComposition = true,
-                EnableMultitouch = true,
-                CompositionBackdropCornerRadius = 8f
-            });
+            .LogToTrace();
 }
diff --git a/MusicDecrypto.Avalonia/ViewModels/MainViewModel.cs b/MusicDecrypto.Avalonia/ViewModels/MainViewModel.cs
index 57b2de8..49ea671 100644
--- a/MusicDecrypto.Avalonia/ViewModels/MainViewModel.cs
+++ b/MusicDecrypto.Avalonia/ViewModels/MainViewModel.cs
@@ -7,9 +7,9 @@
 using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
-using Avalonia;
 using Avalonia.Media.Imaging;
 using Avalonia.Platform;
+using Avalonia.Platform.Storage;
 using Avalonia.Threading;
 using ByteSizeLib;
 using FluentAvalonia.UI.Controls;
@@ -31,14 +31,14 @@ public partial class MainViewModel : ViewModelBase
 
     public MainViewModel()
     {
-        Items.CollectionChanged += (s, e) => PropertyHasChanged(nameof(IsEmpty));
+        Items.CollectionChanged += (s, e) => RaisePropertyChanged(nameof(IsEmpty));
     }
 
-    public void AddFile(string path)
+    public void AddFile(IStorageFile file)
     {
-        if (File.Exists(path) && DecryptoFactory.KnownExtensions.Contains(Path.GetExtension(path)))
+        if (file.CanBookmark && DecryptoFactory.KnownExtensions.Contains(Path.GetExtension(file.Name)))
         {
-            var item = new Item(path);
+            var item = new Item(file);
             Items.Add(item);
             Task.Run(async () => await DecryptFileAsync(item));
         }
@@ -49,18 +49,17 @@ public static async ValueTask DecryptFileAsync(Item item)
         try
         {
             using var buffer = new MarshalMemoryStream();
-            string outPath;
 
-            var match = _regex.Match(Path.GetFileNameWithoutExtension(item.FilePath));
+            var match = _regex.Match(Path.GetFileNameWithoutExtension(item.File.Name));
             if (match.Success)
             {
                 item.Performers = match.Groups[1].Value;
                 item.Title = match.Groups[2].Value;
             }
-            else item.Title = Path.GetFileNameWithoutExtension(item.FilePath);
+            else item.Title = Path.GetFileNameWithoutExtension(item.File.Name);
 
             item.State = Item.States.Loading;
-            await using (var file = new FileStream(item.FilePath, FileMode.Open, FileAccess.Read, FileShare.Read))
+            await using (var file = await item.File.OpenReadAsync())
             {
                 buffer.SetLengthWithPadding(file.Length);
                 await file.CopyToAsync(buffer);
@@ -69,7 +68,7 @@ public static async ValueTask DecryptFileAsync(Item item)
 
             using var decrypto = DecryptoFactory.Create(
                 buffer,
-                Path.GetFileName(item.FilePath),
+                Path.GetFileName(item.File.Name),
                 item.AddMessage,
                 OnRequestMatchAsync);
 
@@ -78,18 +77,15 @@ public static async ValueTask DecryptFileAsync(Item item)
             item.Title = info.Title ?? item.Title;
             item.Performers = info.Performers ?? item.Performers;
             item.Album = info.Album ?? item.Album;
-            outPath = Path.Combine(Path.GetDirectoryName(item.FilePath)!, info.NewName);
-            if (info.Cover is not null)
+            
+            var newFile = await (await item.File.GetParentAsync())!.CreateFileAsync(info.NewName);
+            if (info.Cover != null)
             {
                 using var stream = new MemoryStream(info.Cover);
                 item.Cover = Bitmap.DecodeToWidth(stream, 256);
             }
 
-            await using (var file = new FileStream(
-                outPath,
-                FileMode.Create,
-                FileAccess.Write,
-                FileShare.None))
+            await using (var file = await newFile!.OpenWriteAsync())
             {
                 await buffer.CopyToAsync(file);
             }
@@ -136,26 +132,20 @@ private static async ValueTask<bool> OnRequestMatchAsync(string message, IEnumer
 
     public class Item : INotifyPropertyChanged
     {
-        public event PropertyChangedEventHandler? PropertyChanged;
-        public void PropertyHasChanged(string propName)
-        {
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propName));
-        }
+        private static readonly Bitmap _coverFallback = new Bitmap(AssetLoader.Open(new Uri("avares://musicdecrypto-avalonia/Assets/MusicNote.png")));
 
-        static Item()
+        public Item(IStorageFile file)
         {
-            var assets = AvaloniaLocator.Current.GetService<IAssetLoader>();
-            _coverFallback = new Bitmap(assets!.Open(new Uri("avares://musicdecrypto-avalonia/Assets/MusicNote.png")));
+            File = file;
         }
 
-        public Item(string path)
+        public event PropertyChangedEventHandler? PropertyChanged;
+        public void PropertyHasChanged(string propName)
         {
-            FilePath = path;
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propName));
         }
 
-        public string FilePath { get; init; }
-
-        private static readonly Bitmap _coverFallback;
+        public IStorageFile File { get; init; }
 
         private Bitmap? _cover;
         public Bitmap Cover
@@ -179,13 +169,13 @@ public string Title
             }
         }
 
-        private string? _artist;
+        private string? _performers;
         public string Performers
         {
-            get => _artist ?? "N/A";
+            get => _performers ?? "N/A";
             set
             {
-                _artist = value;
+                _performers = value;
                 PropertyHasChanged(nameof(Performers));
             }
         }
diff --git a/MusicDecrypto.Avalonia/ViewModels/SettingsViewModel.cs b/MusicDecrypto.Avalonia/ViewModels/SettingsViewModel.cs
index 7888f85..484b60c 100644
--- a/MusicDecrypto.Avalonia/ViewModels/SettingsViewModel.cs
+++ b/MusicDecrypto.Avalonia/ViewModels/SettingsViewModel.cs
@@ -1,5 +1,6 @@
-using System;
+using System.Diagnostics.CodeAnalysis;
 using Avalonia;
+using Avalonia.Styling;
 using FluentAvalonia.Styling;
 using MusicDecrypto.Avalonia.Helpers;
 
@@ -7,54 +8,57 @@ namespace MusicDecrypto.Avalonia.ViewModels;
 
 public class SettingsViewModel : ViewModelBase
 {
+    private readonly FluentAvaloniaTheme _faTheme;
     public SettingsViewModel()
     {
-        if (AvaloniaLocator.Current.GetService<FluentAvaloniaTheme>() is FluentAvaloniaTheme theme)
-        {
-            theme.RequestedThemeChanged += OnAppThemeChanged;
-            _currentAppTheme = theme.RequestedTheme;
-        }
-        else throw new NullReferenceException("Can not access FluentAvaloniaTheme.");
+        _faTheme = (FluentAvaloniaTheme)Application.Current!.Styles[0];
     }
 
-    public static string Version => typeof(Program).Assembly.GetName().Version!.ToString();
-
-    public static void OpenAvaloniaLink() => UrlHelper.OpenLink("https://avaloniaui.net/");
-    public static void OpenFluentAvaloniaLink() => UrlHelper.OpenLink("https://github.com/amwx/FluentAvalonia");
-
-    private string _currentAppTheme;
-    public string CurrentAppTheme
+    private string? _currentAppTheme = _systemModeString;
+    public string? CurrentAppTheme
     {
         get => _currentAppTheme;
         set
         {
-            if (_currentAppTheme != value)
+            if (RaiseAndSetIfChanged(ref _currentAppTheme, value))
             {
-                if (AvaloniaLocator.Current.GetService<FluentAvaloniaTheme>() is FluentAvaloniaTheme theme)
+                if (TryGetThemeVariant(value, out var theme))
+                {
+                    Application.Current!.RequestedThemeVariant = theme;
+                    _faTheme.PreferSystemTheme = false;
+                }
+                else
                 {
-                    _currentAppTheme = value;
-                    theme.RequestedTheme = value;
+                    _faTheme.PreferSystemTheme = true;
                 }
-                PropertyHasChanged(nameof(CurrentAppTheme));
             }
         }
     }
 
+    private static bool TryGetThemeVariant(string? value, [NotNullWhen(true)] out ThemeVariant? theme)
+    {
+        theme = value switch
+        {
+            FluentAvaloniaTheme.LightModeString => ThemeVariant.Light,
+            FluentAvaloniaTheme.DarkModeString  => ThemeVariant.Dark,
+            _                                   => null,
+        };
+        return theme is not null;
+    }
+
+    private static string _systemModeString = "System";
     public static string[] AppThemes => new[]
     {
+        _systemModeString,
         FluentAvaloniaTheme.LightModeString,
         FluentAvaloniaTheme.DarkModeString,
-        FluentAvaloniaTheme.HighContrastModeString
+        // FluentAvaloniaTheme.HighContrastModeString
     };
 
-    private void OnAppThemeChanged(FluentAvaloniaTheme sender, RequestedThemeChangedEventArgs args)
-    {
-        if (_currentAppTheme != args.NewTheme)
-        {
-            _currentAppTheme = args.NewTheme;
-            PropertyHasChanged(nameof(CurrentAppTheme));
-        }
-    }
+    public static string Version => typeof(Program).Assembly.GetName().Version!.ToString();
+
+    public static void OpenAvaloniaLink() => UrlHelper.OpenLink("https://avaloniaui.net/");
+    public static void OpenFluentAvaloniaLink() => UrlHelper.OpenLink("https://github.com/amwx/FluentAvalonia");
 
     public record class CreditItem(
         string Name,
diff --git a/MusicDecrypto.Avalonia/ViewModels/ViewModelBase.cs b/MusicDecrypto.Avalonia/ViewModels/ViewModelBase.cs
index 45beed0..5845d9d 100644
--- a/MusicDecrypto.Avalonia/ViewModels/ViewModelBase.cs
+++ b/MusicDecrypto.Avalonia/ViewModels/ViewModelBase.cs
@@ -1,4 +1,6 @@
+using System.Collections.Generic;
 using System.ComponentModel;
+using System.Runtime.CompilerServices;
 
 namespace MusicDecrypto.Avalonia.ViewModels;
 
@@ -6,7 +8,18 @@ public abstract class ViewModelBase : INotifyPropertyChanged
 {
     public event PropertyChangedEventHandler? PropertyChanged;
 
-    protected void PropertyHasChanged(string propName)
+    protected bool RaiseAndSetIfChanged<T>(ref T field, T value, [CallerMemberName] string propertyName = "")
+    {
+        if (!EqualityComparer<T>.Default.Equals(field, value))
+        {
+            field = value;
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+            return true;
+        }
+        return false;
+    }
+
+    protected void RaisePropertyChanged(string propName)
     {
         PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propName));
     }
diff --git a/MusicDecrypto.Avalonia/Views/MainView.axaml b/MusicDecrypto.Avalonia/Views/MainView.axaml
index 176c98a..a21c4e1 100644
--- a/MusicDecrypto.Avalonia/Views/MainView.axaml
+++ b/MusicDecrypto.Avalonia/Views/MainView.axaml
@@ -1,54 +1,61 @@
 <UserControl x:Class="MusicDecrypto.Avalonia.Views.MainView"
              xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:ic="using:FluentIcons.FluentAvalonia"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:ic="using:FluentIcons.FluentAvalonia"
              xmlns:ui="using:FluentAvalonia.UI.Controls"
-             mc:Ignorable="d" d:DesignHeight="450" d:DesignWidth="800">
+             d:DesignWidth="800" d:DesignHeight="450"
+             mc:Ignorable="d">
+
+    <Grid RowDefinitions="Auto,*">
+        <Grid Name="TitleBarHost"
+              Background="Transparent"
+              ColumnDefinitions="Auto,Auto,*,Auto,0">
+            <Grid.Styles>
+                <Style Selector="Button.AppBarButton">
+                    <Setter Property="Padding" Value="8" />
+                    <Setter Property="FontSize" Value="20" />
+                    <Setter Property="BorderThickness" Value="0" />
+                    <Setter Property="Theme" Value="{StaticResource TransparentButton}" />
+                </Style>
+            </Grid.Styles>
 
-    <Grid RowDefinitions="48,*">
-        <Grid Name="TitleBarHost" Background="Transparent" ColumnDefinitions="Auto,Auto,*,Auto">
-            <Image Width="20" Height="20"
-                   Margin="14"
-                   IsHitTestVisible="False" IsVisible="{Binding !#FrameView.CanGoBack}"
-                   Source="/Assets/logo.ico" />
+            <Image Width="20" Height="20" Margin="14"
+                   Source="/Assets/logo.ico" IsHitTestVisible="False"
+                   IsVisible="{Binding !#FrameView.CanGoBack}"
+                   RenderOptions.BitmapInterpolationMode="HighQuality" />
 
-            <ui:Button Margin="6" Padding="8"
-                       Classes="AppBarButton" Command="{Binding #FrameView.GoBack}"
-                       IsEnabled="{Binding #FrameView.CanGoBack}"
-                       IsVisible="{Binding #FrameView.CanGoBack}">
+            <Button Margin="6"
+                    Classes="AppBarButton" Command="{Binding #FrameView.GoBack}"
+                    IsEnabled="{Binding #FrameView.CanGoBack}"
+                    IsVisible="{Binding #FrameView.CanGoBack}">
                 <Button.Content>
                     <ic:SymbolIcon FontSize="20" Symbol="ArrowLeft" />
                 </Button.Content>
                 <ToolTip.Tip>Back</ToolTip.Tip>
-            </ui:Button>
+            </Button>
 
             <TextBlock Grid.Column="1"
                        VerticalAlignment="Center"
                        FontSize="12"
-                       IsHitTestVisible="False" Text="MusicDecrypto" />
+                       Text="MusicDecrypto" IsHitTestVisible="False" />
 
             <StackPanel Grid.Column="3"
-                        Margin="6"
-                        Orientation="Horizontal" Spacing="6">
-                <ui:Button Name="OpenFilesButton"
-                           Padding="8" VerticalAlignment="Center"
-                           Classes="AppBarButton">
+                        Orientation="Horizontal" Margin="6" Spacing="6">
+                <Button Name="OpenFilesButton" Classes="AppBarButton">
                     <Button.Content>
-                        <ic:SymbolIcon FontSize="20" Symbol="DocumentAdd" />
+                        <ic:SymbolIcon Symbol="DocumentAdd" />
                     </Button.Content>
                     <ToolTip.Tip>Open files</ToolTip.Tip>
-                </ui:Button>
+                </Button>
 
-                <ui:Button Name="SettingsButton"
-                           Padding="8" VerticalAlignment="Center"
-                           Classes="AppBarButton">
+                <Button Name="SettingsButton" Classes="AppBarButton">
                     <Button.Content>
-                        <ic:SymbolIcon FontSize="20" Symbol="Settings" />
+                        <ic:SymbolIcon Symbol="Settings" />
                     </Button.Content>
                     <ToolTip.Tip>Settings</ToolTip.Tip>
-                </ui:Button>
+                </Button>
             </StackPanel>
         </Grid>
 
diff --git a/MusicDecrypto.Avalonia/Views/MainView.axaml.cs b/MusicDecrypto.Avalonia/Views/MainView.axaml.cs
index 5191035..dd5f713 100644
--- a/MusicDecrypto.Avalonia/Views/MainView.axaml.cs
+++ b/MusicDecrypto.Avalonia/Views/MainView.axaml.cs
@@ -1,10 +1,9 @@
-using System;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Interactivity;
-using Avalonia.Markup.Xaml;
-using FluentAvalonia.Core.ApplicationModel;
+using Avalonia.Platform.Storage;
 using FluentAvalonia.UI.Controls;
+using FluentAvalonia.UI.Windowing;
 using MusicDecrypto.Avalonia.Pages;
 using MusicDecrypto.Avalonia.ViewModels;
 
@@ -12,80 +11,55 @@ namespace MusicDecrypto.Avalonia.Views;
 
 public partial class MainView : UserControl
 {
-    private Window? _parent;
+    private Window? _window;
 
     private Frame? _frameView;
-    private FluentAvalonia.UI.Controls.Button? _openFilesButton;
-    private FluentAvalonia.UI.Controls.Button? _settingsButton;
+    private Button? _openFilesButton;
+    private Button? _settingsButton;
 
     public MainView()
     {
         InitializeComponent();
     }
 
-    private void InitializeComponent()
-    {
-        AvaloniaXamlLoader.Load(this);
-    }
-
     protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
     {
         base.OnAttachedToVisualTree(e);
 
-        _parent = (Window)e.Root;
-        _parent.Opened += OnParentWindowsOpened;
+        _window = e.Root as Window;
 
         _frameView = this.FindControl<Frame>("FrameView");
-        _frameView.Navigate(typeof(HomePage));
-
-        _openFilesButton = this.FindControl<FluentAvalonia.UI.Controls.Button>("OpenFilesButton");
-        _openFilesButton.Click += OnOpenFilesButtonClickAsync;
-
-        _settingsButton = this.FindControl<FluentAvalonia.UI.Controls.Button>("SettingsButton");
-        _settingsButton.Click += OnSettingsButtonClick;
+        _frameView?.Navigate(typeof(HomePage));
+        _openFilesButton = this.FindControl<Button>("OpenFilesButton");
+        if (_openFilesButton != null) _openFilesButton.Click += OnOpenFilesButtonClickAsync;
+        _settingsButton = this.FindControl<Button>("SettingsButton");
+        if (_settingsButton != null) _settingsButton.Click += OnSettingsButtonClick;
     }
 
-    private void OnParentWindowsOpened(object? sender, EventArgs e)
+    protected override void OnLoaded(RoutedEventArgs e)
     {
-        if (sender is Window w) w.Opened -= OnParentWindowsOpened;
+        base.OnLoaded(e);
 
-        if (sender is CoreWindow cw)
+        if (VisualRoot is AppWindow window)
         {
-            var titleBar = cw.TitleBar;
-            if (titleBar is not null)
-            {
-                titleBar.ExtendViewIntoTitleBar = true;
-                titleBar.LayoutMetricsChanged += OnApplicationTitleBarLayoutMetricsChanged;
-
-                if (this.FindControl<Grid>("TitleBarHost") is Grid g)
-                {
-                    cw.SetTitleBar(g);
-                    g.Margin = new Thickness(titleBar.SystemOverlayLeftInset, 0, titleBar.SystemOverlayRightInset, 0);
-                }
-            }
-        }
-    }
-
-    private void OnApplicationTitleBarLayoutMetricsChanged(CoreApplicationViewTitleBar sender, object args)
-    {
-        if (this.FindControl<Grid>("TitleBarHost") is Grid g)
-        {
-            g.Margin = new Thickness(0, 0, sender.SystemOverlayRightInset, 0);
+            TitleBarHost.ColumnDefinitions[4].Width = new GridLength(window.TitleBar.RightInset, GridUnitType.Pixel);
         }
     }
 
     private async void OnOpenFilesButtonClickAsync(object? sender, RoutedEventArgs args)
     {
-        OpenFileDialog dialog = new()
+        var storage = _window?.StorageProvider;
+        if (storage?.CanOpen == true && DataContext is MainViewModel vm)
         {
-            AllowMultiple = true,
-            Directory = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile),
-        };
-        var paths = await dialog.ShowAsync(_parent!);
-        if (paths is not null && DataContext is MainViewModel vm)
-        {
-            foreach (var path in paths)
-                vm.AddFile(path);
+            var options = new FilePickerOpenOptions
+            {
+                AllowMultiple = true,
+                SuggestedStartLocation = await storage.TryGetWellKnownFolderAsync(WellKnownFolder.Music),
+            };
+            foreach (var file in await storage.OpenFilePickerAsync(options))
+            {
+                vm.AddFile(file);
+            }
         }
     }
 
diff --git a/MusicDecrypto.Avalonia/Views/MainWindow.axaml b/MusicDecrypto.Avalonia/Views/MainWindow.axaml
index 0f9f2ab..b092650 100644
--- a/MusicDecrypto.Avalonia/Views/MainWindow.axaml
+++ b/MusicDecrypto.Avalonia/Views/MainWindow.axaml
@@ -1,13 +1,13 @@
-<Window xmlns="https://github.com/avaloniaui"
+<Window x:Class="MusicDecrypto.Avalonia.Views.MainWindow"
+        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:views="using:MusicDecrypto.Avalonia.Views"
-        mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-        x:Class="MusicDecrypto.Avalonia.Views.MainWindow"
         MinWidth="640" MinHeight="480"
         Background="{DynamicResource AcrylicBackgroundFillColorDefaultBrush}"
-        Icon="/Assets/logo.ico" Title="MusicDecrypto">
+        Icon="/Assets/logo.ico" Title="MusicDecrypto"
+        mc:Ignorable="d" d:DesignHeight="450" d:DesignWidth="800">
 
     <Panel>
         <views:MainView />
diff --git a/MusicDecrypto.Avalonia/Views/MainWindow.axaml.cs b/MusicDecrypto.Avalonia/Views/MainWindow.axaml.cs
index 20d6ed5..a2be4eb 100644
--- a/MusicDecrypto.Avalonia/Views/MainWindow.axaml.cs
+++ b/MusicDecrypto.Avalonia/Views/MainWindow.axaml.cs
@@ -1,20 +1,16 @@
 using System;
-using System.IO;
-using System.Runtime.InteropServices;
+using System.Threading.Tasks;
 using Avalonia;
-using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Markup.Xaml;
-using Avalonia.Media;
-using Avalonia.Media.Immutable;
+using Avalonia.Platform.Storage;
 using FluentAvalonia.Styling;
-using FluentAvalonia.UI.Controls;
-using FluentAvalonia.UI.Media;
+using FluentAvalonia.UI.Windowing;
 using MusicDecrypto.Avalonia.ViewModels;
 
 namespace MusicDecrypto.Avalonia.Views;
 
-public partial class MainWindow : CoreWindow
+public partial class MainWindow : AppWindow
 {
     public MainWindow()
     {
@@ -23,14 +19,16 @@ public MainWindow()
         InitializeComponent();
 
         SetupDnd();
+
 #if DEBUG
         this.AttachDevTools();
 #endif
-    }
 
-    private void InitializeComponent()
-    {
-        AvaloniaXamlLoader.Load(this);
+        // SplashScreen = new MainAppSplashScreen(this);
+        TitleBar.ExtendsContentIntoTitleBar = true;
+        TitleBar.TitleBarHitTestType = TitleBarHitTestType.Complex;
+
+        Application.Current!.ActualThemeVariantChanged += OnActualThemeVariantChanged;
     }
 
     private void SetupDnd()
@@ -39,7 +37,7 @@ void DragOver(object? sender, DragEventArgs e)
         {
             e.DragEffects &= DragDropEffects.Copy;
 
-            if (!e.Data.Contains(DataFormats.FileNames))
+            if (!e.Data.Contains(DataFormats.Files))
                 e.DragEffects = DragDropEffects.None;
         }
 
@@ -47,20 +45,23 @@ void Drop(object? sender, DragEventArgs e)
         {
             e.DragEffects &= DragDropEffects.Copy;
 
-            if (e.Data.Contains(DataFormats.FileNames))
+            if (e.Data.Contains(DataFormats.Files) && DataContext is MainViewModel vm)
             {
-                if (DataContext is MainViewModel vm)
+                foreach (var item in e.Data.GetFiles()!)
                 {
-                    foreach (var path in e.Data.GetFileNames()!)
+                    if (item is IStorageFolder folder)
                     {
-                        if (Directory.Exists(path))
+                        foreach (var child in folder.GetItemsAsync().ToBlockingEnumerable())
                         {
-                            Array.ForEach(
-                                Directory.GetFiles(path, "*", SearchOption.AllDirectories),
-                                f => vm.AddFile(f));
+                            if (child is IStorageFile file)
+                            {
+                                vm.AddFile(file);
+                            }
                         }
-                        else if (File.Exists(path))
-                            vm.AddFile(path);
+                    }
+                    else if (item is IStorageFile file)
+                    {
+                        vm.AddFile(file);
                     }
                 }
             }
@@ -75,63 +76,31 @@ protected override void OnOpened(EventArgs e)
     {
         base.OnOpened(e);
 
-        if (AvaloniaLocator.Current.GetService<FluentAvaloniaTheme>() is FluentAvaloniaTheme thm)
+        var theme = ActualThemeVariant;
+        if (IsWindows11 && theme != FluentAvaloniaTheme.HighContrastTheme)
         {
-            thm.RequestedThemeChanged += OnRequestedThemeChanged;
-
-            // Enable Mica on Windows 11
-            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-            {
-                if (IsWindows11 && thm.RequestedTheme != FluentAvaloniaTheme.HighContrastModeString)
-                {
-                    TransparencyBackgroundFallback = Brushes.Transparent;
-                    TransparencyLevelHint = WindowTransparencyLevel.Mica;
-
-                    TryEnableMicaEffect(thm);
-                }
-            }
-
-            thm.ForceWin32WindowToTheme(this);
+            TryEnableMicaEffect();
         }
     }
 
-    private void OnRequestedThemeChanged(FluentAvaloniaTheme sender, RequestedThemeChangedEventArgs args)
+    private void OnActualThemeVariantChanged(object? sender, EventArgs e)
     {
-        if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+        if (IsWindows11)
         {
-            // TODO: add Windows version to CoreWindow
-            if (IsWindows11 && args.NewTheme != FluentAvaloniaTheme.HighContrastModeString)
+            if (ActualThemeVariant != FluentAvaloniaTheme.HighContrastTheme)
             {
-                TryEnableMicaEffect(sender);
+                TryEnableMicaEffect();
             }
-            else if (args.NewTheme == FluentAvaloniaTheme.HighContrastModeString)
+            else
             {
-                // Clear the local value here, and let the normal styles take over for HighContrast theme
-                SetValue(BackgroundProperty, AvaloniaProperty.UnsetValue);
+                ClearValue(BackgroundProperty);
+                ClearValue(TransparencyBackgroundFallbackProperty);
             }
         }
     }
 
-    private void TryEnableMicaEffect(FluentAvaloniaTheme thm)
+    private void TryEnableMicaEffect()
     {
-#pragma warning disable CS8605 // Unboxing possibly null value.
-        if (thm.RequestedTheme == FluentAvaloniaTheme.DarkModeString)
-        {
-            var color = this.TryFindResource("SolidBackgroundFillColorBase", out var value) ? (Color2)(Color)value : new Color2(32, 32, 32);
-
-            color = color.LightenPercent(-0.8f);
-
-            Background = new ImmutableSolidColorBrush(color, 0.78);
-        }
-        else if (thm.RequestedTheme == FluentAvaloniaTheme.LightModeString)
-        {
-            // Similar effect here
-            var color = this.TryFindResource("SolidBackgroundFillColorBase", out var value) ? (Color2)(Color)value : new Color2(243, 243, 243);
-
-            color = color.LightenPercent(0.5f);
-
-            Background = new ImmutableSolidColorBrush(color, 0.9);
-        }
-#pragma warning restore CS8605
+        return; // TODO
     }
 }