From fa1a21f340d2eb91b77f359d3504726ee2e6d05f Mon Sep 17 00:00:00 2001
From: Richasy <Thansy@foxmail.com>
Date: Tue, 14 Feb 2023 13:29:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=AE=BE=E7=BD=AE=E6=8E=A7?=
 =?UTF-8?q?=E4=BB=B6=20(#1634)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nuget.config                                  |   1 +
 src/App/App.csproj                            |   8 +-
 src/App/App.xaml.cs                           |   2 +-
 src/App/Controls/App/QuestionPanel.xaml       |  28 +-
 .../Controls/Favorite/VideoFavoritePanel.xaml | 222 ++---
 .../Favorite/VideoFavoritePanel.xaml.cs       |   2 +-
 .../Settings/CacheSettingSection.xaml         |  52 +-
 .../Settings/InitialCheckSection.xaml         |  24 +-
 .../Settings/LoggerSettingSection.xaml        |  71 +-
 .../Settings/NotificationSettingSection.xaml  |  29 +-
 .../Settings/PlayerControlSettingSection.xaml | 203 ++---
 .../Settings/PlayerModeSettingSection.xaml    | 185 ++---
 .../Settings/RoamingSettingSection.xaml       | 189 ++---
 .../Settings/ScreenshotSettingSection.xaml    |  65 +-
 .../Settings/StartupSettingSection.xaml       |  82 +-
 .../Settings/ThemeSettingSection.xaml         |  62 +-
 .../TraditionalChineseSettingSection.xaml     |  24 +-
 .../Pages/Desktop/Overlay/TimeLinePage.xaml   |  74 +-
 .../Desktop/Overlay/VideoPlayerPage.xaml      |   1 -
 src/App/Pages/Desktop/SettingPage.xaml        |   4 +
 src/App/Pages/Xbox/SettingsPage.xaml          |   5 +-
 src/App/Styles/Style.Overwrite.xaml           | 776 +-----------------
 src/Lib/DI.App/DI.App.csproj                  |   2 +-
 src/Lib/DI.App/DIFactory.cs                   |   2 -
 src/Lib/DI.Container/DI.Container.csproj      |   5 +-
 src/Lib/DI.Container/Locator.cs               |  11 +
 .../FrostMaster.Uwp/FrostMaster.Uwp.csproj    |   2 +-
 .../AccountProvider/AccountProvider.cs        |   8 +-
 .../FavoriteProvider/FavoriteProvider.cs      |   2 +-
 .../HomeProvider/HomeProvider.cs              |   4 +-
 .../Lib.Implementation.csproj                 |   2 +-
 .../PlayerProvider.Extension.cs               |   2 +
 src/Models/Models.App/Models.App.csproj       |   2 +-
 .../Models.BiliBili/Models.BiliBili.csproj    |   2 +-
 .../Player/PlayerInformation.cs               |  14 +-
 src/Models/Models.gRPC/Models.gRPC.csproj     |   6 +-
 src/Tasks/Tasks.csproj                        |   2 +-
 .../Toolkit/Toolkit.Uwp/Toolkit.Uwp.csproj    |   2 +-
 .../ViewModels.Interfaces.csproj              |   2 +-
 .../ViewModels.Uwp/Base/ViewModelBase.cs      |   2 +-
 .../ViewModels.Uwp/ViewModels.Uwp.csproj      |   2 +-
 41 files changed, 554 insertions(+), 1629 deletions(-)

diff --git a/nuget.config b/nuget.config
index ad1f6a333..8e5c6118e 100644
--- a/nuget.config
+++ b/nuget.config
@@ -3,6 +3,7 @@
   <packageSources>
     <clear />
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
+    <add key="labs.windows" value="https://pkgs.dev.azure.com/dotnet/CommunityToolkit/_packaging/CommunityToolkit-Labs/nuget/v3/index.json" />
   </packageSources>
     <disabledPackageSources>
         <clear />
diff --git a/src/App/App.csproj b/src/App/App.csproj
index ae49d37a0..2a8f84716 100644
--- a/src/App/App.csproj
+++ b/src/App/App.csproj
@@ -1302,6 +1302,9 @@
     </Page>
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="CommunityToolkit.Labs.Uwp.SettingsControls">
+      <Version>0.0.13</Version>
+    </PackageReference>
     <PackageReference Include="Humanizer.Core.zh-CN">
       <Version>2.14.1</Version>
     </PackageReference>
@@ -1327,10 +1330,7 @@
       <Version>2.8.2-prerelease.220830001</Version>
     </PackageReference>
     <PackageReference Include="Newtonsoft.Json">
-      <Version>13.0.1</Version>
-    </PackageReference>
-    <PackageReference Include="Richasy.ExpanderEx.UWP">
-      <Version>1.0.4</Version>
+      <Version>13.0.2</Version>
     </PackageReference>
     <PackageReference Include="Richasy.FluentIcon.Regular.UWP">
       <Version>1.1.150</Version>
diff --git a/src/App/App.xaml.cs b/src/App/App.xaml.cs
index 8963c089d..7dfa69aea 100644
--- a/src/App/App.xaml.cs
+++ b/src/App/App.xaml.cs
@@ -172,7 +172,7 @@ private void OnSuspending(object sender, SuspendingEventArgs e)
         private void OnUnhandledException(object sender, Windows.UI.Xaml.UnhandledExceptionEventArgs e)
         {
             e.Handled = true;
-            Locator.Instance.GetService<ILogger>().Error(e.Exception);
+            Locator.Instance.GetLogger().Error(e.Exception);
         }
 
         private void NavigateToRootPage(object args = null)
diff --git a/src/App/Controls/App/QuestionPanel.xaml b/src/App/Controls/App/QuestionPanel.xaml
index 4ea61aa8c..166e94ea7 100644
--- a/src/App/Controls/App/QuestionPanel.xaml
+++ b/src/App/Controls/App/QuestionPanel.xaml
@@ -3,7 +3,7 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:exp="using:Richasy.ExpanderEx.Uwp"
+    xmlns:labs="using:CommunityToolkit.Labs.WinUI"
     xmlns:local="using:Bili.App.Controls"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
@@ -54,30 +54,20 @@
                         ItemsSource="{x:Bind ViewModel.CurrentQuestionModule.Questions, Mode=OneWay}">
                         <muxc:ItemsRepeater.ItemTemplate>
                             <DataTemplate x:DataType="other:QuestionItem">
-                                <exp:ExpanderEx ForceUseExpander="True">
-                                    <exp:ExpanderEx.Header>
-                                        <exp:ExpanderExWrapper Style="{StaticResource WrapperInExpanderHeaderStyle}">
-                                            <exp:ExpanderExWrapper.MainContent>
-                                                <exp:ExpanderExDescriptor
-                                                    Title="{x:Bind Title}"
-                                                    DescriptionVisibility="Collapsed"
-                                                    IconVisibility="Collapsed" />
-                                            </exp:ExpanderExWrapper.MainContent>
-                                        </exp:ExpanderExWrapper>
-                                    </exp:ExpanderEx.Header>
-                                    <exp:ExpanderEx.Content>
-                                        <exp:ExpanderExWrapper Style="{StaticResource WrapperInExpanderContentStyle}">
-                                            <exp:ExpanderExWrapper.MainContent>
+                                <labs:SettingsExpander Header="{x:Bind Title}">
+                                    <labs:SettingsExpander.Items>
+                                        <labs:SettingsCard>
+                                            <labs:SettingsCard.Header>
                                                 <TextBlock
                                                     HorizontalAlignment="Left"
                                                     IsTextSelectionEnabled="True"
                                                     LineHeight="24"
                                                     Text="{x:Bind Answer}"
                                                     TextWrapping="Wrap" />
-                                            </exp:ExpanderExWrapper.MainContent>
-                                        </exp:ExpanderExWrapper>
-                                    </exp:ExpanderEx.Content>
-                                </exp:ExpanderEx>
+                                            </labs:SettingsCard.Header>
+                                        </labs:SettingsCard>
+                                    </labs:SettingsExpander.Items>
+                                </labs:SettingsExpander>
                             </DataTemplate>
                         </muxc:ItemsRepeater.ItemTemplate>
                         <muxc:ItemsRepeater.Layout>
diff --git a/src/App/Controls/Favorite/VideoFavoritePanel.xaml b/src/App/Controls/Favorite/VideoFavoritePanel.xaml
index 9f30903f6..24f58cce6 100644
--- a/src/App/Controls/Favorite/VideoFavoritePanel.xaml
+++ b/src/App/Controls/Favorite/VideoFavoritePanel.xaml
@@ -5,9 +5,9 @@
     xmlns:behaviors="using:Bili.App.Behaviors"
     xmlns:controls="using:Bili.App.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:exp="using:Richasy.ExpanderEx.Uwp"
     xmlns:icons="using:Richasy.FluentIcon.Uwp"
     xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
+    xmlns:labs="using:CommunityToolkit.Labs.WinUI"
     xmlns:loc="using:Bili.App.Resources.Extension"
     xmlns:local="using:Bili.App.Controls.Favorite"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -36,151 +36,111 @@
                     <RowDefinition Height="Auto" />
                     <RowDefinition Height="Auto" />
                 </Grid.RowDefinitions>
-                <exp:ExpanderEx
+                <labs:SettingsCard
                     x:Name="DefaultVideoExpander"
                     Click="OnDefaultExpanderClick"
+                    Header="{loc:Locale Name=DefaultFavorite}"
+                    IsClickEnabled="True"
                     IsEnabled="{x:Bind ViewModel.IsDefaultFolderEmpty, Mode=OneWay, Converter={StaticResource ObjectToBoolReverseConverter}}">
-                    <exp:ExpanderEx.Header>
-                        <exp:ExpanderExWrapper Margin="0,10">
-                            <exp:ExpanderExWrapper.MainContent>
-                                <exp:ExpanderExDescriptor Title="{loc:Locale Name=DefaultFavorite}" DescriptionVisibility="Collapsed">
-                                    <exp:ExpanderExDescriptor.Icon>
-                                        <icons:RegularFluentIcon Symbol="VideoClip16" />
-                                    </exp:ExpanderExDescriptor.Icon>
-                                </exp:ExpanderExDescriptor>
-                            </exp:ExpanderExWrapper.MainContent>
-                            <exp:ExpanderExWrapper.WrapContent>
-                                <icons:RegularFluentIcon Margin="0,0,-76,0" Symbol="Open20" />
-                            </exp:ExpanderExWrapper.WrapContent>
-                        </exp:ExpanderExWrapper>
-                    </exp:ExpanderEx.Header>
-                </exp:ExpanderEx>
+                    <labs:SettingsCard.HeaderIcon>
+                        <icons:RegularFluentIcon Symbol="VideoClip16" />
+                    </labs:SettingsCard.HeaderIcon>
+                </labs:SettingsCard>
                 <muxc:ItemsRepeater Grid.Row="1" ItemsSource="{x:Bind ViewModel.Items, Mode=OneWay}">
                     <muxc:ItemsRepeater.Layout>
                         <muxc:StackLayout Spacing="12" />
                     </muxc:ItemsRepeater.Layout>
                     <muxc:ItemsRepeater.ItemTemplate>
                         <DataTemplate x:DataType="video:IVideoFavoriteFolderGroupViewModel">
-                            <exp:ExpanderEx InternalExpanderStyle="{StaticResource NoAnimationExpanderStyle}">
-                                <exp:ExpanderEx.Header>
-                                    <Grid MinHeight="56">
-                                        <exp:ExpanderExDescriptor Title="{x:Bind Data.Title, Mode=OneWay}" DescriptionVisibility="Collapsed">
-                                            <exp:ExpanderExDescriptor.Icon>
-                                                <icons:RegularFluentIcon Symbol="Folder20" />
-                                            </exp:ExpanderExDescriptor.Icon>
-                                        </exp:ExpanderExDescriptor>
-                                    </Grid>
-                                </exp:ExpanderEx.Header>
-                                <exp:ExpanderEx.Content>
-                                    <Grid>
-                                        <Grid.RowDefinitions>
-                                            <RowDefinition Height="Auto" />
-                                            <RowDefinition Height="Auto" />
-                                        </Grid.RowDefinitions>
-                                        <muxc:ItemsRepeater ItemsSource="{x:Bind Items}">
-                                            <muxc:ItemsRepeater.ItemTemplate>
-                                                <DataTemplate x:DataType="video:IVideoFavoriteFolderViewModel">
-                                                    <exp:ExpanderExWrapper Style="{StaticResource WrapperInExpanderContentStyle}" IsTabStop="False">
-                                                        <exp:ExpanderExWrapper.MainContent>
-                                                            <Grid Margin="-12,0,0,0" ColumnSpacing="12">
-                                                                <Grid.ColumnDefinitions>
-                                                                    <ColumnDefinition Width="Auto" />
-                                                                    <ColumnDefinition Width="*" />
-                                                                </Grid.ColumnDefinitions>
-                                                                <Grid CornerRadius="{StaticResource ControlCornerRadius}">
-                                                                    <controls:CommonImageEx
-                                                                        Width="84"
-                                                                        Height="56"
-                                                                        ImageUrl="{x:Bind Folder.Cover.Uri, Mode=OneWay}" />
-                                                                </Grid>
-                                                                <StackPanel
-                                                                    Grid.Column="1"
-                                                                    HorizontalAlignment="Left"
-                                                                    VerticalAlignment="Center">
-                                                                    <TextBlock
-                                                                        FontWeight="Bold"
-                                                                        MaxLines="2"
-                                                                        Text="{x:Bind Folder.Title, Mode=OneWay}"
-                                                                        TextTrimming="CharacterEllipsis"
-                                                                        TextWrapping="Wrap" />
-                                                                    <TextBlock
-                                                                        Style="{StaticResource CaptionTextBlockStyle}"
-                                                                        Margin="0,4,0,0"
-                                                                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                                                        MaxLines="2"
-                                                                        Text="{x:Bind Folder.Description, Mode=OneWay}"
-                                                                        TextTrimming="CharacterEllipsis"
-                                                                        TextWrapping="Wrap"
-                                                                        Visibility="{x:Bind Folder.Description, Converter={StaticResource ObjectToVisibilityConverter}}" />
-                                                                </StackPanel>
-                                                            </Grid>
-                                                        </exp:ExpanderExWrapper.MainContent>
-                                                        <exp:ExpanderExWrapper.WrapContent>
-                                                            <StackPanel
-                                                                Margin="0,0,-12,0"
-                                                                VerticalAlignment="Center"
-                                                                Orientation="Horizontal">
-                                                                <Button
-                                                                    Margin="0,0,8,0"
-                                                                    Command="{x:Bind ShowDetailCommand}"
-                                                                    Content="{loc:Locale Name=SeeDetail}" />
-                                                                <Button
-                                                                    Click="OnRemoveFavoriteButtonClickAsync"
-                                                                    Content="{loc:Locale Name=DeleteFavorite}"
-                                                                    DataContext="{x:Bind}"
-                                                                    Visibility="{x:Bind IsMine, Mode=OneWay}" />
-                                                                <Button
-                                                                    Click="OnRemoveFavoriteButtonClickAsync"
-                                                                    Content="{loc:Locale Name=UnFavorite}"
-                                                                    DataContext="{x:Bind}"
-                                                                    Visibility="{x:Bind IsMine, Mode=OneWay, Converter={StaticResource BoolToVisibilityReverseConverter}}" />
-                                                            </StackPanel>
-                                                        </exp:ExpanderExWrapper.WrapContent>
-                                                    </exp:ExpanderExWrapper>
-                                                </DataTemplate>
-                                            </muxc:ItemsRepeater.ItemTemplate>
-                                            <muxc:ItemsRepeater.Layout>
-                                                <muxc:StackLayout Spacing="8" />
-                                            </muxc:ItemsRepeater.Layout>
-                                        </muxc:ItemsRepeater>
-
-                                        <exp:ExpanderExWrapper
-                                            Style="{StaticResource WrapperInExpanderContentStyle}"
-                                            Grid.Row="1"
-                                            Visibility="{x:Bind HasMore, Mode=OneWay}">
-                                            <exp:ExpanderExWrapper.MainContent>
-                                                <Grid Margin="-12,0" ColumnSpacing="12">
+                            <labs:SettingsExpander Header="{x:Bind Data.Title, Mode=OneWay}" ItemsSource="{x:Bind Items}">
+                                <labs:SettingsExpander.HeaderIcon>
+                                    <icons:RegularFluentIcon Symbol="Folder20" />
+                                </labs:SettingsExpander.HeaderIcon>
+                                <labs:SettingsExpander.ItemTemplate>
+                                    <DataTemplate x:DataType="video:IVideoFavoriteFolderViewModel">
+                                        <labs:SettingsCard>
+                                            <labs:SettingsCard.Header>
+                                                <Grid Margin="-12,0,0,0" ColumnSpacing="12">
                                                     <Grid.ColumnDefinitions>
                                                         <ColumnDefinition Width="Auto" />
-                                                        <ColumnDefinition />
+                                                        <ColumnDefinition Width="*" />
                                                     </Grid.ColumnDefinitions>
-                                                    <HyperlinkButton
-                                                        x:Name="LoadMoreButton"
-                                                        HorizontalAlignment="Left"
-                                                        Command="{x:Bind IncrementalCommand}"
-                                                        Content="{loc:Locale Name=ShowMore}" />
-                                                    <muxc:ProgressBar
+                                                    <Grid CornerRadius="{StaticResource ControlCornerRadius}">
+                                                        <controls:CommonImageEx
+                                                            Width="84"
+                                                            Height="56"
+                                                            ImageUrl="{x:Bind Folder.Cover.Uri, Mode=OneWay}" />
+                                                    </Grid>
+                                                    <StackPanel
                                                         Grid.Column="1"
-                                                        HorizontalAlignment="Stretch"
-                                                        VerticalAlignment="Center"
-                                                        IsIndeterminate="True"
-                                                        Visibility="{x:Bind IsIncrementalLoading, Mode=OneWay}" />
+                                                        HorizontalAlignment="Left"
+                                                        VerticalAlignment="Center">
+                                                        <TextBlock
+                                                            FontWeight="Bold"
+                                                            MaxLines="2"
+                                                            Text="{x:Bind Folder.Title, Mode=OneWay}"
+                                                            TextTrimming="CharacterEllipsis"
+                                                            TextWrapping="Wrap" />
+                                                        <TextBlock
+                                                            Style="{StaticResource CaptionTextBlockStyle}"
+                                                            Margin="0,4,0,0"
+                                                            Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                                            MaxLines="2"
+                                                            Text="{x:Bind Folder.Description, Mode=OneWay}"
+                                                            TextTrimming="CharacterEllipsis"
+                                                            TextWrapping="Wrap"
+                                                            Visibility="{x:Bind Folder.Description, Converter={StaticResource ObjectToVisibilityConverter}}" />
+                                                    </StackPanel>
                                                 </Grid>
-                                            </exp:ExpanderExWrapper.MainContent>
-                                        </exp:ExpanderExWrapper>
-
-                                        <exp:ExpanderExWrapper
-                                            Style="{StaticResource WrapperInExpanderContentStyle}"
-                                            Grid.RowSpan="2"
-                                            Margin="-12,0"
-                                            Visibility="{x:Bind IsEmpty, Mode=OneWay}">
-                                            <exp:ExpanderExWrapper.MainContent>
-                                                <TextBlock HorizontalAlignment="Left" Text="{loc:Locale Name=NoSpecificData}" />
-                                            </exp:ExpanderExWrapper.MainContent>
-                                        </exp:ExpanderExWrapper>
+                                            </labs:SettingsCard.Header>
+                                            <StackPanel
+                                                Margin="0,0,-12,0"
+                                                VerticalAlignment="Center"
+                                                Orientation="Horizontal">
+                                                <Button
+                                                    Margin="0,0,8,0"
+                                                    Command="{x:Bind ShowDetailCommand}"
+                                                    Content="{loc:Locale Name=SeeDetail}" />
+                                                <Button
+                                                    Click="OnRemoveFavoriteButtonClickAsync"
+                                                    Content="{loc:Locale Name=DeleteFavorite}"
+                                                    DataContext="{x:Bind}"
+                                                    Visibility="{x:Bind IsMine, Mode=OneWay}" />
+                                                <Button
+                                                    Click="OnRemoveFavoriteButtonClickAsync"
+                                                    Content="{loc:Locale Name=UnFavorite}"
+                                                    DataContext="{x:Bind}"
+                                                    Visibility="{x:Bind IsMine, Mode=OneWay, Converter={StaticResource BoolToVisibilityReverseConverter}}" />
+                                            </StackPanel>
+                                        </labs:SettingsCard>
+                                    </DataTemplate>
+                                </labs:SettingsExpander.ItemTemplate>
+                                <labs:SettingsExpander.ItemsFooter>
+                                    <Grid>
+                                        <Grid ColumnSpacing="12" Visibility="{x:Bind HasMore, Mode=OneWay}">
+                                            <Grid.ColumnDefinitions>
+                                                <ColumnDefinition Width="Auto" />
+                                                <ColumnDefinition />
+                                            </Grid.ColumnDefinitions>
+                                            <HyperlinkButton
+                                                x:Name="LoadMoreButton"
+                                                HorizontalAlignment="Left"
+                                                Command="{x:Bind IncrementalCommand}"
+                                                Content="{loc:Locale Name=ShowMore}" />
+                                            <muxc:ProgressBar
+                                                Grid.Column="1"
+                                                HorizontalAlignment="Stretch"
+                                                VerticalAlignment="Center"
+                                                IsIndeterminate="True"
+                                                Visibility="{x:Bind IsIncrementalLoading, Mode=OneWay}" />
+                                        </Grid>
+                                        <TextBlock
+                                            HorizontalAlignment="Left"
+                                            Text="{loc:Locale Name=NoSpecificData}"
+                                            Visibility="{x:Bind IsEmpty, Mode=OneWay}" />
                                     </Grid>
-                                </exp:ExpanderEx.Content>
-                            </exp:ExpanderEx>
+                                </labs:SettingsExpander.ItemsFooter>
+                            </labs:SettingsExpander>
                         </DataTemplate>
                     </muxc:ItemsRepeater.ItemTemplate>
                 </muxc:ItemsRepeater>
diff --git a/src/App/Controls/Favorite/VideoFavoritePanel.xaml.cs b/src/App/Controls/Favorite/VideoFavoritePanel.xaml.cs
index 83b351292..10f4d8d6e 100644
--- a/src/App/Controls/Favorite/VideoFavoritePanel.xaml.cs
+++ b/src/App/Controls/Favorite/VideoFavoritePanel.xaml.cs
@@ -51,7 +51,7 @@ private async Task RemoveAsync(object sender)
             }
         }
 
-        private void OnDefaultExpanderClick(object sender, Richasy.ExpanderEx.Uwp.ExpanderExClickEventArgs e)
+        private void OnDefaultExpanderClick(object sender, RoutedEventArgs e)
             => ViewModel.ShowDefaultFolderDetailCommand.Execute(null);
     }
 
diff --git a/src/App/Controls/Settings/CacheSettingSection.xaml b/src/App/Controls/Settings/CacheSettingSection.xaml
index f64ef92cc..0dfdf1ae1 100644
--- a/src/App/Controls/Settings/CacheSettingSection.xaml
+++ b/src/App/Controls/Settings/CacheSettingSection.xaml
@@ -3,8 +3,8 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:exp="using:Richasy.ExpanderEx.Uwp"
     xmlns:icons="using:Richasy.FluentIcon.Uwp"
+    xmlns:labs="using:CommunityToolkit.Labs.WinUI"
     xmlns:loc="using:Bili.App.Resources.Extension"
     xmlns:local="using:Bili.App.Controls"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -13,34 +13,24 @@
     d:DesignWidth="400"
     mc:Ignorable="d">
 
-    <exp:ExpanderEx>
-        <exp:ExpanderEx.Header>
-            <exp:ExpanderExWrapper>
-                <exp:ExpanderExWrapper.MainContent>
-                    <exp:ExpanderExDescriptor Title="{loc:Locale Name=ClearCache}" Description="{loc:Locale Name=ClearCacheDescription}">
-                        <exp:ExpanderExDescriptor.Icon>
-                            <icons:RegularFluentIcon Symbol="FastAcceleration24" />
-                        </exp:ExpanderExDescriptor.Icon>
-                    </exp:ExpanderExDescriptor>
-                </exp:ExpanderExWrapper.MainContent>
-                <exp:ExpanderExWrapper.WrapContent>
-                    <StackPanel Orientation="Horizontal">
-                        <Button
-                            x:Name="ClearButton"
-                            MinWidth="120"
-                            Click="OnClearButtonClickAsync"
-                            Content="{loc:Locale Name=Clear}" />
-                        <muxc:ProgressRing
-                            x:Name="LoadingRing"
-                            Width="20"
-                            Height="20"
-                            Margin="12,0,0,0"
-                            VerticalAlignment="Center"
-                            IsActive="True"
-                            Visibility="Collapsed" />
-                    </StackPanel>
-                </exp:ExpanderExWrapper.WrapContent>
-            </exp:ExpanderExWrapper>
-        </exp:ExpanderEx.Header>
-    </exp:ExpanderEx>
+    <labs:SettingsCard Description="{loc:Locale Name=ClearCacheDescription}" Header="{loc:Locale Name=ClearCache}">
+        <labs:SettingsCard.HeaderIcon>
+            <icons:RegularFluentIcon Symbol="FastAcceleration24" />
+        </labs:SettingsCard.HeaderIcon>
+        <StackPanel Orientation="Horizontal">
+            <Button
+                x:Name="ClearButton"
+                MinWidth="120"
+                Click="OnClearButtonClickAsync"
+                Content="{loc:Locale Name=Clear}" />
+            <muxc:ProgressRing
+                x:Name="LoadingRing"
+                Width="20"
+                Height="20"
+                Margin="12,0,0,0"
+                VerticalAlignment="Center"
+                IsActive="True"
+                Visibility="Collapsed" />
+        </StackPanel>
+    </labs:SettingsCard>
 </local:SettingSectionControl>
diff --git a/src/App/Controls/Settings/InitialCheckSection.xaml b/src/App/Controls/Settings/InitialCheckSection.xaml
index aa12d6e93..a553a9362 100644
--- a/src/App/Controls/Settings/InitialCheckSection.xaml
+++ b/src/App/Controls/Settings/InitialCheckSection.xaml
@@ -3,8 +3,8 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:exp="using:Richasy.ExpanderEx.Uwp"
     xmlns:icons="using:Richasy.FluentIcon.Uwp"
+    xmlns:labs="using:CommunityToolkit.Labs.WinUI"
     xmlns:loc="using:Bili.App.Resources.Extension"
     xmlns:local="using:Bili.App.Controls"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -12,20 +12,10 @@
     d:DesignWidth="400"
     mc:Ignorable="d">
 
-    <exp:ExpanderEx>
-        <exp:ExpanderEx.Header>
-            <exp:ExpanderExWrapper>
-                <exp:ExpanderExWrapper.MainContent>
-                    <exp:ExpanderExDescriptor Title="{loc:Locale Name=InitialCheckTitle}" Description="{loc:Locale Name=InitialCheckDescription}">
-                        <exp:ExpanderExDescriptor.Icon>
-                            <icons:RegularFluentIcon Symbol="AlertUrgent16" />
-                        </exp:ExpanderExDescriptor.Icon>
-                    </exp:ExpanderExDescriptor>
-                </exp:ExpanderExWrapper.MainContent>
-                <exp:ExpanderExWrapper.WrapContent>
-                    <ToggleSwitch Style="{StaticResource RightAlignedCompactToggleSwitchStyle}" IsOn="{x:Bind ViewModel.IsSupportContinuePlay, Mode=TwoWay}" />
-                </exp:ExpanderExWrapper.WrapContent>
-            </exp:ExpanderExWrapper>
-        </exp:ExpanderEx.Header>
-    </exp:ExpanderEx>
+    <labs:SettingsCard Description="{loc:Locale Name=InitialCheckDescription}" Header="{loc:Locale Name=InitialCheckTitle}">
+        <labs:SettingsCard.HeaderIcon>
+            <icons:RegularFluentIcon Symbol="AlertUrgent16" />
+        </labs:SettingsCard.HeaderIcon>
+        <ToggleSwitch IsOn="{x:Bind ViewModel.IsSupportContinuePlay, Mode=TwoWay}" />
+    </labs:SettingsCard>
 </local:SettingSectionControl>
diff --git a/src/App/Controls/Settings/LoggerSettingSection.xaml b/src/App/Controls/Settings/LoggerSettingSection.xaml
index fb9c6957c..6fcc6ccc5 100644
--- a/src/App/Controls/Settings/LoggerSettingSection.xaml
+++ b/src/App/Controls/Settings/LoggerSettingSection.xaml
@@ -4,60 +4,33 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:icons="using:Richasy.FluentIcon.Uwp"
+    xmlns:labs="using:CommunityToolkit.Labs.WinUI"
     xmlns:loc="using:Bili.App.Resources.Extension"
     xmlns:local="using:Bili.App.Controls"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:uwp="using:Richasy.ExpanderEx.Uwp"
     d:DesignHeight="300"
     d:DesignWidth="400"
     mc:Ignorable="d">
 
-    <uwp:ExpanderEx>
-        <uwp:ExpanderEx.Header>
-            <uwp:ExpanderExWrapper Style="{StaticResource WrapperInExpanderHeaderStyle}">
-                <uwp:ExpanderExWrapper.MainContent>
-                    <uwp:ExpanderExDescriptor Title="{loc:Locale Name=LoggerModule}" Description="{loc:Locale Name=LoggerModuleDescription}">
-                        <uwp:ExpanderExDescriptor.Icon>
-                            <icons:RegularFluentIcon Symbol="Channel16" />
-                        </uwp:ExpanderExDescriptor.Icon>
-                    </uwp:ExpanderExDescriptor>
-                </uwp:ExpanderExWrapper.MainContent>
-            </uwp:ExpanderExWrapper>
-        </uwp:ExpanderEx.Header>
-        <uwp:ExpanderEx.Content>
-            <uwp:ExpanderExMenuPanel>
-                <uwp:ExpanderExWrapper Style="{StaticResource WrapperInExpanderContentStyle}">
-                    <uwp:ExpanderExWrapper.MainContent>
-                        <TextBlock
-                            Style="{StaticResource BodyTextBlockStyle}"
-                            VerticalAlignment="Center"
-                            Text="{loc:Locale Name=LoggerFolder}" />
-                    </uwp:ExpanderExWrapper.MainContent>
-                    <uwp:ExpanderExWrapper.WrapContent>
-                        <Button
-                            x:Name="OpenLoggerFolderButton"
-                            MinWidth="120"
-                            Click="OnOpenLoggerFolderButtonClickAsync"
-                            Content="{loc:Locale Name=OpenFolder}" />
-                    </uwp:ExpanderExWrapper.WrapContent>
-                </uwp:ExpanderExWrapper>
-                <uwp:ExpanderExItemSeparator />
-                <uwp:ExpanderExWrapper Style="{StaticResource WrapperInExpanderContentStyle}">
-                    <uwp:ExpanderExWrapper.MainContent>
-                        <TextBlock
-                            Style="{StaticResource BodyTextBlockStyle}"
-                            VerticalAlignment="Center"
-                            Text="{loc:Locale Name=CleanLogger}" />
-                    </uwp:ExpanderExWrapper.MainContent>
-                    <uwp:ExpanderExWrapper.WrapContent>
-                        <Button
-                            x:Name="CleanLoggerButton"
-                            MinWidth="120"
-                            Click="OnCleanLoggerButtonClickAsync"
-                            Content="{loc:Locale Name=Clean}" />
-                    </uwp:ExpanderExWrapper.WrapContent>
-                </uwp:ExpanderExWrapper>
-            </uwp:ExpanderExMenuPanel>
-        </uwp:ExpanderEx.Content>
-    </uwp:ExpanderEx>
+    <labs:SettingsExpander Description="{loc:Locale Name=LoggerModuleDescription}" Header="{loc:Locale Name=LoggerModule}">
+        <labs:SettingsExpander.HeaderIcon>
+            <icons:RegularFluentIcon Symbol="Channel16" />
+        </labs:SettingsExpander.HeaderIcon>
+        <labs:SettingsExpander.Items>
+            <labs:SettingsCard Header="{loc:Locale Name=LoggerFolder}">
+                <Button
+                    x:Name="OpenLoggerFolderButton"
+                    MinWidth="120"
+                    Click="OnOpenLoggerFolderButtonClickAsync"
+                    Content="{loc:Locale Name=OpenFolder}" />
+            </labs:SettingsCard>
+            <labs:SettingsCard Header="{loc:Locale Name=CleanLogger}">
+                <Button
+                    x:Name="CleanLoggerButton"
+                    MinWidth="120"
+                    Click="OnCleanLoggerButtonClickAsync"
+                    Content="{loc:Locale Name=Clean}" />
+            </labs:SettingsCard>
+        </labs:SettingsExpander.Items>
+    </labs:SettingsExpander>
 </local:SettingSectionControl>
diff --git a/src/App/Controls/Settings/NotificationSettingSection.xaml b/src/App/Controls/Settings/NotificationSettingSection.xaml
index 48bf1f965..afd35f862 100644
--- a/src/App/Controls/Settings/NotificationSettingSection.xaml
+++ b/src/App/Controls/Settings/NotificationSettingSection.xaml
@@ -3,8 +3,8 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:exp="using:Richasy.ExpanderEx.Uwp"
     xmlns:icons="using:Richasy.FluentIcon.Uwp"
+    xmlns:labs="using:CommunityToolkit.Labs.WinUI"
     xmlns:loc="using:Bili.App.Resources.Extension"
     xmlns:local="using:Bili.App.Controls"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -12,23 +12,12 @@
     d:DesignWidth="400"
     mc:Ignorable="d">
 
-    <exp:ExpanderEx>
-        <exp:ExpanderEx.Header>
-            <exp:ExpanderExWrapper>
-                <exp:ExpanderExWrapper.MainContent>
-                    <exp:ExpanderExDescriptor Title="{loc:Locale Name=NotificationSetting}" Description="{loc:Locale Name=NotificationSettingDescription}">
-                        <exp:ExpanderExDescriptor.Icon>
-                            <icons:RegularFluentIcon Symbol="CommentNote24" />
-                        </exp:ExpanderExDescriptor.Icon>
-                    </exp:ExpanderExDescriptor>
-                </exp:ExpanderExWrapper.MainContent>
-                <exp:ExpanderExWrapper.WrapContent>
-                    <ToggleSwitch
-                        Style="{StaticResource RightAlignedCompactToggleSwitchStyle}"
-                        IsEnabled="{x:Bind ViewModel.IsEnableBackgroundTask, Mode=OneWay}"
-                        IsOn="{x:Bind ViewModel.IsOpenDynamicNotification, Mode=TwoWay}" />
-                </exp:ExpanderExWrapper.WrapContent>
-            </exp:ExpanderExWrapper>
-        </exp:ExpanderEx.Header>
-    </exp:ExpanderEx>
+    <labs:SettingsCard Description="{loc:Locale Name=NotificationSettingDescription}" Header="{loc:Locale Name=NotificationSetting}">
+        <labs:SettingsCard.HeaderIcon>
+            <icons:RegularFluentIcon Symbol="CommentNote24" />
+        </labs:SettingsCard.HeaderIcon>
+        <ToggleSwitch
+            IsEnabled="{x:Bind ViewModel.IsEnableBackgroundTask, Mode=OneWay}"
+            IsOn="{x:Bind ViewModel.IsOpenDynamicNotification, Mode=TwoWay}" />
+    </labs:SettingsCard>
 </local:SettingSectionControl>
diff --git a/src/App/Controls/Settings/PlayerControlSettingSection.xaml b/src/App/Controls/Settings/PlayerControlSettingSection.xaml
index 47d15a058..f37480ae9 100644
--- a/src/App/Controls/Settings/PlayerControlSettingSection.xaml
+++ b/src/App/Controls/Settings/PlayerControlSettingSection.xaml
@@ -6,8 +6,8 @@
     xmlns:converter="using:Bili.App.Resources.Converter"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:enums="using:Bili.Models.Enums"
-    xmlns:exp="using:Richasy.ExpanderEx.Uwp"
     xmlns:icons="using:Richasy.FluentIcon.Uwp"
+    xmlns:labs="using:CommunityToolkit.Labs.WinUI"
     xmlns:loc="using:Bili.App.Resources.Extension"
     xmlns:local="using:Bili.App.Controls"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -23,143 +23,66 @@
         <converter:PlayerTypeConverter x:Key="PlayerTypeConverter" />
     </local:SettingSectionControl.Resources>
 
-    <exp:ExpanderEx>
-        <exp:ExpanderEx.Header>
-            <exp:ExpanderExWrapper Style="{StaticResource WrapperInExpanderHeaderStyle}">
-                <exp:ExpanderExWrapper.MainContent>
-                    <exp:ExpanderExDescriptor Title="{loc:Locale Name=PlayerControl}" Description="{loc:Locale Name=PlayerControlDescription}">
-                        <exp:ExpanderExDescriptor.Icon>
-                            <icons:RegularFluentIcon Symbol="VideoPlayPause24" />
-                        </exp:ExpanderExDescriptor.Icon>
-                    </exp:ExpanderExDescriptor>
-                </exp:ExpanderExWrapper.MainContent>
-            </exp:ExpanderExWrapper>
-        </exp:ExpanderEx.Header>
-        <exp:ExpanderEx.Content>
-            <exp:ExpanderExMenuPanel>
-
-                <exp:ExpanderExWrapper Style="{StaticResource WrapperInExpanderContentStyle}">
-                    <exp:ExpanderExWrapper.MainContent>
-                        <exp:ExpanderExDescriptor
-                            Title="{loc:Locale Name=PlayerType}"
-                            Description="{loc:Locale Name=PlayerTypeDescription}"
-                            IconVisibility="Collapsed"
-                            IsAutoHideIcon="False" />
-                    </exp:ExpanderExWrapper.MainContent>
-                    <exp:ExpanderExWrapper.WrapContent>
-                        <ComboBox
-                            MinWidth="120"
-                            ItemsSource="{x:Bind ViewModel.PlayerTypeCollection, Mode=OneWay}"
-                            SelectedItem="{x:Bind ViewModel.PlayerType, Mode=TwoWay}">
-                            <ComboBox.ItemTemplate>
-                                <DataTemplate x:DataType="player:PlayerType">
-                                    <TextBlock Text="{x:Bind Converter={StaticResource PlayerTypeConverter}}" />
-                                </DataTemplate>
-                            </ComboBox.ItemTemplate>
-                        </ComboBox>
-                    </exp:ExpanderExWrapper.WrapContent>
-                </exp:ExpanderExWrapper>
-
-                <exp:ExpanderExItemSeparator />
-
-                <exp:ExpanderExWrapper Style="{StaticResource WrapperInExpanderContentStyle}" Visibility="{x:Bind ViewModel.IsFFmpegPlayer, Mode=OneWay}">
-                    <exp:ExpanderExWrapper.MainContent>
-                        <exp:ExpanderExDescriptor
-                            Title="{loc:Locale Name=DecodeType}"
-                            Description="{loc:Locale Name=DecodeTypeDescription}"
-                            IconVisibility="Collapsed"
-                            IsAutoHideIcon="False" />
-                    </exp:ExpanderExWrapper.MainContent>
-                    <exp:ExpanderExWrapper.WrapContent>
-                        <ComboBox
-                            MinWidth="120"
-                            ItemsSource="{x:Bind ViewModel.DecodeTypeCollection, Mode=OneWay}"
-                            SelectedItem="{x:Bind ViewModel.DecodeType, Mode=TwoWay}">
-                            <ComboBox.ItemTemplate>
-                                <DataTemplate x:DataType="app:DecodeType">
-                                    <TextBlock Text="{x:Bind Converter={StaticResource DecodeTypeConverter}}" />
-                                </DataTemplate>
-                            </ComboBox.ItemTemplate>
-                        </ComboBox>
-                    </exp:ExpanderExWrapper.WrapContent>
-                </exp:ExpanderExWrapper>
-
-                <exp:ExpanderExItemSeparator Visibility="{x:Bind ViewModel.IsFFmpegPlayer, Mode=OneWay}" />
-
-                <exp:ExpanderExWrapper Style="{StaticResource WrapperInExpanderContentStyle}">
-                    <exp:ExpanderExWrapper.MainContent>
-                        <exp:ExpanderExDescriptor
-                            Title="{loc:Locale Name=PreferCodec}"
-                            Description="{loc:Locale Name=PreferCodecDescription}"
-                            IconVisibility="Collapsed"
-                            IsAutoHideIcon="False" />
-                    </exp:ExpanderExWrapper.MainContent>
-                    <exp:ExpanderExWrapper.WrapContent>
-                        <ComboBox
-                            MinWidth="120"
-                            ItemsSource="{x:Bind ViewModel.PreferCodecCollection, Mode=OneWay}"
-                            SelectedItem="{x:Bind ViewModel.PreferCodec, Mode=TwoWay}">
-                            <ComboBox.ItemTemplate>
-                                <DataTemplate x:DataType="enums:PreferCodec">
-                                    <TextBlock Text="{x:Bind Converter={StaticResource PreferCodecConverter}}" />
-                                </DataTemplate>
-                            </ComboBox.ItemTemplate>
-                        </ComboBox>
-                    </exp:ExpanderExWrapper.WrapContent>
-                </exp:ExpanderExWrapper>
-
-                <exp:ExpanderExItemSeparator />
-
-                <exp:ExpanderExWrapper Style="{StaticResource WrapperInExpanderContentStyle}">
-                    <exp:ExpanderExWrapper.MainContent>
-                        <exp:ExpanderExDescriptor
-                            Title="{loc:Locale Name=SingleFastForwardAndRewindSpan}"
-                            Description="{loc:Locale Name=SingleFastForwardAndRewindSpanDescription}"
-                            IconVisibility="Collapsed"
-                            IsAutoHideIcon="False" />
-                    </exp:ExpanderExWrapper.MainContent>
-                    <exp:ExpanderExWrapper.WrapContent>
-                        <muxc:NumberBox
-                            MinWidth="120"
-                            LargeChange="50"
-                            Maximum="300"
-                            Minimum="0"
-                            SmallChange="10"
-                            SpinButtonPlacementMode="Compact"
-                            Value="{x:Bind ViewModel.SingleFastForwardAndRewindSpan, Mode=TwoWay}" />
-                    </exp:ExpanderExWrapper.WrapContent>
-                </exp:ExpanderExWrapper>
-
-                <exp:ExpanderExItemSeparator />
-
-                <exp:ExpanderExWrapper Style="{StaticResource WrapperInExpanderContentStyle}">
-                    <exp:ExpanderExWrapper.MainContent>
-                        <exp:ExpanderExDescriptor
-                            Title="{loc:Locale Name=PlaybackRateEnhancement}"
-                            Description="{loc:Locale Name=PlaybackRateEnhancementDescription}"
-                            IconVisibility="Collapsed"
-                            IsAutoHideIcon="False" />
-                    </exp:ExpanderExWrapper.MainContent>
-                    <exp:ExpanderExWrapper.WrapContent>
-                        <ToggleSwitch Style="{StaticResource RightAlignedCompactToggleSwitchStyle}" IsOn="{x:Bind ViewModel.PlaybackRateEnhancement, Mode=TwoWay}" />
-                    </exp:ExpanderExWrapper.WrapContent>
-                </exp:ExpanderExWrapper>
-
-                <exp:ExpanderExItemSeparator />
-
-                <exp:ExpanderExWrapper Style="{StaticResource WrapperInExpanderContentStyle}">
-                    <exp:ExpanderExWrapper.MainContent>
-                        <exp:ExpanderExDescriptor
-                            Title="{loc:Locale Name=GlobalPlaybackRate}"
-                            Description="{loc:Locale Name=GlobalPlaybackRateDescription}"
-                            IconVisibility="Collapsed"
-                            IsAutoHideIcon="False" />
-                    </exp:ExpanderExWrapper.MainContent>
-                    <exp:ExpanderExWrapper.WrapContent>
-                        <ToggleSwitch Style="{StaticResource RightAlignedCompactToggleSwitchStyle}" IsOn="{x:Bind ViewModel.GlobalPlaybackRate, Mode=TwoWay}" />
-                    </exp:ExpanderExWrapper.WrapContent>
-                </exp:ExpanderExWrapper>
-            </exp:ExpanderExMenuPanel>
-        </exp:ExpanderEx.Content>
-    </exp:ExpanderEx>
+    <labs:SettingsExpander Description="{loc:Locale Name=PlayerControlDescription}" Header="{loc:Locale Name=PlayerControl}">
+        <labs:SettingsExpander.HeaderIcon>
+            <icons:RegularFluentIcon Symbol="VideoPlayPause24" />
+        </labs:SettingsExpander.HeaderIcon>
+        <labs:SettingsExpander.Items>
+            <labs:SettingsCard Description="{loc:Locale Name=PlayerTypeDescription}" Header="{loc:Locale Name=PlayerType}">
+                <ComboBox
+                    MinWidth="120"
+                    ItemsSource="{x:Bind ViewModel.PlayerTypeCollection, Mode=OneWay}"
+                    SelectedItem="{x:Bind ViewModel.PlayerType, Mode=TwoWay}">
+                    <ComboBox.ItemTemplate>
+                        <DataTemplate x:DataType="player:PlayerType">
+                            <TextBlock Text="{x:Bind Converter={StaticResource PlayerTypeConverter}}" />
+                        </DataTemplate>
+                    </ComboBox.ItemTemplate>
+                </ComboBox>
+            </labs:SettingsCard>
+            <labs:SettingsCard
+                Description="{loc:Locale Name=DecodeTypeDescription}"
+                Header="{loc:Locale Name=DecodeType}"
+                Visibility="{x:Bind ViewModel.IsFFmpegPlayer, Mode=OneWay}">
+                <ComboBox
+                    MinWidth="120"
+                    ItemsSource="{x:Bind ViewModel.DecodeTypeCollection, Mode=OneWay}"
+                    SelectedItem="{x:Bind ViewModel.DecodeType, Mode=TwoWay}">
+                    <ComboBox.ItemTemplate>
+                        <DataTemplate x:DataType="app:DecodeType">
+                            <TextBlock Text="{x:Bind Converter={StaticResource DecodeTypeConverter}}" />
+                        </DataTemplate>
+                    </ComboBox.ItemTemplate>
+                </ComboBox>
+            </labs:SettingsCard>
+            <labs:SettingsCard Description="{loc:Locale Name=PreferCodecDescription}" Header="{loc:Locale Name=PreferCodec}">
+                <ComboBox
+                    MinWidth="120"
+                    ItemsSource="{x:Bind ViewModel.PreferCodecCollection, Mode=OneWay}"
+                    SelectedItem="{x:Bind ViewModel.PreferCodec, Mode=TwoWay}">
+                    <ComboBox.ItemTemplate>
+                        <DataTemplate x:DataType="enums:PreferCodec">
+                            <TextBlock Text="{x:Bind Converter={StaticResource PreferCodecConverter}}" />
+                        </DataTemplate>
+                    </ComboBox.ItemTemplate>
+                </ComboBox>
+            </labs:SettingsCard>
+            <labs:SettingsCard Description="{loc:Locale Name=SingleFastForwardAndRewindSpanDescription}" Header="{loc:Locale Name=SingleFastForwardAndRewindSpan}">
+                <muxc:NumberBox
+                    MinWidth="120"
+                    LargeChange="50"
+                    Maximum="300"
+                    Minimum="0"
+                    SmallChange="10"
+                    SpinButtonPlacementMode="Compact"
+                    Value="{x:Bind ViewModel.SingleFastForwardAndRewindSpan, Mode=TwoWay}" />
+            </labs:SettingsCard>
+            <labs:SettingsCard Description="{loc:Locale Name=PlaybackRateEnhancementDescription}" Header="{loc:Locale Name=PlaybackRateEnhancement}">
+                <ToggleSwitch IsOn="{x:Bind ViewModel.PlaybackRateEnhancement, Mode=TwoWay}" />
+            </labs:SettingsCard>
+            <labs:SettingsCard Description="{loc:Locale Name=GlobalPlaybackRateDescription}" Header="{loc:Locale Name=GlobalPlaybackRate}">
+                <ToggleSwitch IsOn="{x:Bind ViewModel.GlobalPlaybackRate, Mode=TwoWay}" />
+            </labs:SettingsCard>
+        </labs:SettingsExpander.Items>
+    </labs:SettingsExpander>
 </local:SettingSectionControl>
diff --git a/src/App/Controls/Settings/PlayerModeSettingSection.xaml b/src/App/Controls/Settings/PlayerModeSettingSection.xaml
index f3f8d1474..7a1c5e8ab 100644
--- a/src/App/Controls/Settings/PlayerModeSettingSection.xaml
+++ b/src/App/Controls/Settings/PlayerModeSettingSection.xaml
@@ -5,7 +5,7 @@
     xmlns:converter="using:Bili.App.Resources.Converter"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:enums="using:Bili.Models.Enums"
-    xmlns:exp="using:Richasy.ExpanderEx.Uwp"
+    xmlns:labs="using:CommunityToolkit.Labs.WinUI"
     xmlns:loc="using:Bili.App.Resources.Extension"
     xmlns:local="using:Bili.App.Controls"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -20,122 +20,69 @@
         <converter:PreferQualityConverter x:Key="PreferQualityConverter" />
     </local:SettingSectionControl.Resources>
 
-    <exp:ExpanderEx>
-        <exp:ExpanderEx.Header>
-            <exp:ExpanderExWrapper Style="{StaticResource WrapperInExpanderHeaderStyle}">
-                <exp:ExpanderExWrapper.MainContent>
-                    <exp:ExpanderExDescriptor Title="{loc:Locale Name=PlayerMode}" Description="{loc:Locale Name=PlayerModeDescription}">
-                        <exp:ExpanderExDescriptor.Icon>
-                            <uwp:RegularFluentIcon Symbol="Replay20" />
-                        </exp:ExpanderExDescriptor.Icon>
-                    </exp:ExpanderExDescriptor>
-                </exp:ExpanderExWrapper.MainContent>
-            </exp:ExpanderExWrapper>
-        </exp:ExpanderEx.Header>
-        <exp:ExpanderEx.Content>
-            <exp:ExpanderExMenuPanel>
-                <exp:ExpanderExWrapper Style="{StaticResource WrapperInExpanderContentStyle}">
-                    <exp:ExpanderExWrapper.MainContent>
-                        <TextBlock VerticalAlignment="Center" Text="{loc:Locale Name=DefaultPlayerDisplayMode}" />
-                    </exp:ExpanderExWrapper.MainContent>
-                    <exp:ExpanderExWrapper.WrapContent>
-                        <ComboBox
-                            MinWidth="120"
-                            ItemsSource="{x:Bind ViewModel.PlayerDisplayModeCollection, Mode=OneWay}"
-                            SelectedItem="{x:Bind ViewModel.DefaultPlayerDisplayMode, Mode=TwoWay}">
-                            <ComboBox.ItemTemplate>
-                                <DataTemplate x:DataType="enums:PlayerDisplayMode">
-                                    <TextBlock Text="{x:Bind Converter={StaticResource PlayerDisplayModeConverter}}" />
-                                </DataTemplate>
-                            </ComboBox.ItemTemplate>
-                        </ComboBox>
-                    </exp:ExpanderExWrapper.WrapContent>
-                </exp:ExpanderExWrapper>
-
-                <exp:ExpanderExItemSeparator />
-
-                <exp:ExpanderExWrapper Style="{StaticResource WrapperInExpanderContentStyle}">
-                    <exp:ExpanderExWrapper.MainContent>
-                        <TextBlock VerticalAlignment="Center" Text="{loc:Locale Name=PreferQuality}" />
-                    </exp:ExpanderExWrapper.MainContent>
-                    <exp:ExpanderExWrapper.WrapContent>
-                        <ComboBox
-                            MinWidth="120"
-                            ItemsSource="{x:Bind ViewModel.PreferQualities}"
-                            SelectedItem="{x:Bind ViewModel.PreferQuality, Mode=TwoWay}">
-                            <ComboBox.ItemTemplate>
-                                <DataTemplate x:DataType="player:PreferQuality">
-                                    <TextBlock Text="{x:Bind Converter={StaticResource PreferQualityConverter}}" />
-                                </DataTemplate>
-                            </ComboBox.ItemTemplate>
-                        </ComboBox>
-                    </exp:ExpanderExWrapper.WrapContent>
-                </exp:ExpanderExWrapper>
-
-                <exp:ExpanderExItemSeparator />
-
-                <exp:ExpanderExWrapper Style="{StaticResource WrapperInExpanderContentStyle}">
-                    <exp:ExpanderExWrapper.MainContent>
-                        <TextBlock VerticalAlignment="Center" Text="{loc:Locale Name=AutoPlayWhenLoaded}" />
-                    </exp:ExpanderExWrapper.MainContent>
-                    <exp:ExpanderExWrapper.WrapContent>
-                        <ToggleSwitch Style="{StaticResource RightAlignedCompactToggleSwitchStyle}" IsOn="{x:Bind ViewModel.IsAutoPlayWhenLoaded, Mode=TwoWay}" />
-                    </exp:ExpanderExWrapper.WrapContent>
-                </exp:ExpanderExWrapper>
-
-                <exp:ExpanderExItemSeparator />
-
-                <exp:ExpanderExWrapper Style="{StaticResource WrapperInExpanderContentStyle}">
-                    <exp:ExpanderExWrapper.MainContent>
-                        <StackPanel Orientation="Horizontal" Spacing="4">
-                            <TextBlock VerticalAlignment="Center" Text="{loc:Locale Name=AutoNextRelatedVideo}" />
-                            <uwp:RegularFluentIcon
-                                VerticalAlignment="Center"
-                                FontSize="12"
-                                Foreground="{ThemeResource SystemFillColorAttentionBrush}"
-                                Symbol="QuestionCircle16"
-                                ToolTipService.ToolTip="{loc:Locale Name=AutoNextRelatedVideoDescription}" />
-                        </StackPanel>
-                    </exp:ExpanderExWrapper.MainContent>
-                    <exp:ExpanderExWrapper.WrapContent>
-                        <ToggleSwitch Style="{StaticResource RightAlignedCompactToggleSwitchStyle}" IsOn="{x:Bind ViewModel.IsAutoPlayNextRelatedVideo, Mode=TwoWay}" />
-                    </exp:ExpanderExWrapper.WrapContent>
-                </exp:ExpanderExWrapper>
-
-                <exp:ExpanderExItemSeparator />
-
-                <exp:ExpanderExWrapper Style="{StaticResource WrapperInExpanderContentStyle}">
-                    <exp:ExpanderExWrapper.MainContent>
-                        <StackPanel Orientation="Horizontal" Spacing="4">
-                            <TextBlock VerticalAlignment="Center" Text="{loc:Locale Name=ContinuousPlay}" />
-                            <uwp:RegularFluentIcon
-                                VerticalAlignment="Center"
-                                FontSize="12"
-                                Foreground="{ThemeResource SystemFillColorAttentionBrush}"
-                                Symbol="QuestionCircle16"
-                                ToolTipService.ToolTip="{loc:Locale Name=ContinuousPlayDescription}" />
-                        </StackPanel>
-                    </exp:ExpanderExWrapper.MainContent>
-                    <exp:ExpanderExWrapper.WrapContent>
-                        <ToggleSwitch Style="{StaticResource RightAlignedCompactToggleSwitchStyle}" IsOn="{x:Bind ViewModel.IsContinusPlay, Mode=TwoWay}" />
-                    </exp:ExpanderExWrapper.WrapContent>
-                </exp:ExpanderExWrapper>
-
-                <exp:ExpanderExItemSeparator />
-
-                <exp:ExpanderExWrapper Style="{StaticResource WrapperInExpanderContentStyle}">
-                    <exp:ExpanderExWrapper.MainContent>
-                        <exp:ExpanderExDescriptor
-                            Title="{loc:Locale Name=DisableP2PCdn}"
-                            Description="{loc:Locale Name=DisableP2PCdnDescription}"
-                            IconVisibility="Collapsed"
-                            IsAutoHideIcon="False" />
-                    </exp:ExpanderExWrapper.MainContent>
-                    <exp:ExpanderExWrapper.WrapContent>
-                        <ToggleSwitch Style="{StaticResource RightAlignedCompactToggleSwitchStyle}" IsOn="{x:Bind ViewModel.DisableP2PCdn, Mode=TwoWay}" />
-                    </exp:ExpanderExWrapper.WrapContent>
-                </exp:ExpanderExWrapper>
-            </exp:ExpanderExMenuPanel>
-        </exp:ExpanderEx.Content>
-    </exp:ExpanderEx>
+    <labs:SettingsExpander Description="{loc:Locale Name=PlayerModeDescription}" Header="{loc:Locale Name=PlayerMode}">
+        <labs:SettingsExpander.HeaderIcon>
+            <uwp:RegularFluentIcon Symbol="Replay20" />
+        </labs:SettingsExpander.HeaderIcon>
+        <labs:SettingsExpander.Items>
+            <labs:SettingsCard Header="{loc:Locale Name=DefaultPlayerDisplayMode}">
+                <ComboBox
+                    MinWidth="120"
+                    ItemsSource="{x:Bind ViewModel.PlayerDisplayModeCollection, Mode=OneWay}"
+                    SelectedItem="{x:Bind ViewModel.DefaultPlayerDisplayMode, Mode=TwoWay}">
+                    <ComboBox.ItemTemplate>
+                        <DataTemplate x:DataType="enums:PlayerDisplayMode">
+                            <TextBlock Text="{x:Bind Converter={StaticResource PlayerDisplayModeConverter}}" />
+                        </DataTemplate>
+                    </ComboBox.ItemTemplate>
+                </ComboBox>
+            </labs:SettingsCard>
+            <labs:SettingsCard Header="{loc:Locale Name=PreferQuality}">
+                <ComboBox
+                    MinWidth="120"
+                    ItemsSource="{x:Bind ViewModel.PreferQualities}"
+                    SelectedItem="{x:Bind ViewModel.PreferQuality, Mode=TwoWay}">
+                    <ComboBox.ItemTemplate>
+                        <DataTemplate x:DataType="player:PreferQuality">
+                            <TextBlock Text="{x:Bind Converter={StaticResource PreferQualityConverter}}" />
+                        </DataTemplate>
+                    </ComboBox.ItemTemplate>
+                </ComboBox>
+            </labs:SettingsCard>
+            <labs:SettingsCard Header="{loc:Locale Name=AutoPlayWhenLoaded}">
+                <ToggleSwitch IsOn="{x:Bind ViewModel.IsAutoPlayWhenLoaded, Mode=TwoWay}" />
+            </labs:SettingsCard>
+            <labs:SettingsCard>
+                <labs:SettingsCard.Header>
+                    <StackPanel Orientation="Horizontal" Spacing="4">
+                        <TextBlock VerticalAlignment="Center" Text="{loc:Locale Name=AutoNextRelatedVideo}" />
+                        <uwp:RegularFluentIcon
+                            VerticalAlignment="Center"
+                            FontSize="12"
+                            Foreground="{ThemeResource SystemFillColorAttentionBrush}"
+                            Symbol="QuestionCircle16"
+                            ToolTipService.ToolTip="{loc:Locale Name=AutoNextRelatedVideoDescription}" />
+                    </StackPanel>
+                </labs:SettingsCard.Header>
+                <ToggleSwitch IsOn="{x:Bind ViewModel.IsAutoPlayNextRelatedVideo, Mode=TwoWay}" />
+            </labs:SettingsCard>
+            <labs:SettingsCard>
+                <labs:SettingsCard.Header>
+                    <StackPanel Orientation="Horizontal" Spacing="4">
+                        <TextBlock VerticalAlignment="Center" Text="{loc:Locale Name=ContinuousPlay}" />
+                        <uwp:RegularFluentIcon
+                            VerticalAlignment="Center"
+                            FontSize="12"
+                            Foreground="{ThemeResource SystemFillColorAttentionBrush}"
+                            Symbol="QuestionCircle16"
+                            ToolTipService.ToolTip="{loc:Locale Name=ContinuousPlayDescription}" />
+                    </StackPanel>
+                </labs:SettingsCard.Header>
+                <ToggleSwitch IsOn="{x:Bind ViewModel.IsContinusPlay, Mode=TwoWay}" />
+            </labs:SettingsCard>
+            <labs:SettingsCard Description="{loc:Locale Name=DisableP2PCdnDescription}" Header="{loc:Locale Name=DisableP2PCdn}">
+                <ToggleSwitch IsOn="{x:Bind ViewModel.DisableP2PCdn, Mode=TwoWay}" />
+            </labs:SettingsCard>
+        </labs:SettingsExpander.Items>
+    </labs:SettingsExpander>
 </local:SettingSectionControl>
diff --git a/src/App/Controls/Settings/RoamingSettingSection.xaml b/src/App/Controls/Settings/RoamingSettingSection.xaml
index 9e8cd0b1d..aacf738fc 100644
--- a/src/App/Controls/Settings/RoamingSettingSection.xaml
+++ b/src/App/Controls/Settings/RoamingSettingSection.xaml
@@ -3,8 +3,8 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:exp="using:Richasy.ExpanderEx.Uwp"
     xmlns:ico="using:Richasy.FluentIcon.Uwp"
+    xmlns:labs="using:CommunityToolkit.Labs.WinUI"
     xmlns:loc="using:Bili.App.Resources.Extension"
     xmlns:local="using:Bili.App.Controls"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -12,109 +12,86 @@
     d:DesignWidth="400"
     mc:Ignorable="d">
 
-    <exp:ExpanderEx>
-        <exp:ExpanderEx.Header>
-            <exp:ExpanderExWrapper Style="{StaticResource WrapperInExpanderHeaderStyle}">
-                <exp:ExpanderExWrapper.MainContent>
-                    <exp:ExpanderExDescriptor Title="{loc:Locale Name=ProxySetting}" Description="{loc:Locale Name=ProxySettingDescription}">
-                        <exp:ExpanderExDescriptor.Icon>
-                            <ico:RegularFluentIcon Symbol="GlobeVideo20" />
-                        </exp:ExpanderExDescriptor.Icon>
-                    </exp:ExpanderExDescriptor>
-                </exp:ExpanderExWrapper.MainContent>
-                <exp:ExpanderExWrapper.WrapContent>
-                    <ToggleSwitch Style="{StaticResource RightAlignedCompactToggleSwitchStyle}" IsOn="{x:Bind ViewModel.IsOpenRoaming, Mode=TwoWay}" />
-                </exp:ExpanderExWrapper.WrapContent>
-            </exp:ExpanderExWrapper>
-        </exp:ExpanderEx.Header>
-        <exp:ExpanderEx.Content>
-            <exp:ExpanderExMenuPanel>
-                <exp:ExpanderExWrapper Style="{StaticResource WrapperInExpanderContentStyle}">
-                    <exp:ExpanderExWrapper.MainContent>
-                        <StackPanel>
-                            <TextBlock HorizontalAlignment="Left" Text="{loc:Locale Name=GlobeProxy}" />
-                            <TextBlock
-                                Style="{StaticResource CaptionTextBlockStyle}"
-                                HorizontalAlignment="Left"
-                                Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                Text="{loc:Locale Name=GlobeProxyDescription}"
-                                TextTrimming="CharacterEllipsis" />
-                        </StackPanel>
-                    </exp:ExpanderExWrapper.MainContent>
-                    <exp:ExpanderExWrapper.WrapContent>
-                        <ToggleSwitch Style="{StaticResource RightAlignedCompactToggleSwitchStyle}" IsOn="{x:Bind ViewModel.IsGlobeProxy, Mode=TwoWay}" />
-                    </exp:ExpanderExWrapper.WrapContent>
-                </exp:ExpanderExWrapper>
-                <exp:ExpanderExItemSeparator />
-                <exp:ExpanderExWrapper Style="{StaticResource WrapperInExpanderContentStyle}">
-                    <exp:ExpanderExWrapper.MainContent>
-                        <StackPanel>
-                            <TextBlock HorizontalAlignment="Left" Text="{loc:Locale Name=ProxyViewAddress}" />
-                            <TextBlock FontSize="12">
-                                <Hyperlink NavigateUri="https://github.com/Richasy/Bili.Uwp/wiki/%E7%95%AA%E5%89%A7%E4%BB%A3%E7%90%86#%E8%AF%A6%E6%83%85%E4%BB%A3%E7%90%86">
-                                    <Run Text="{loc:Locale Name=FunctionIntroduce}" />
-                                </Hyperlink>
-                            </TextBlock>
-                        </StackPanel>
-                    </exp:ExpanderExWrapper.MainContent>
-                    <exp:ExpanderExWrapper.WrapContent>
-                        <AutoSuggestBox
-                            MinWidth="240"
-                            MaxWidth="300"
-                            VerticalAlignment="Center"
-                            PlaceholderText="{loc:Locale Name=EnterToEffect}"
-                            QueryIcon="Save"
-                            QuerySubmitted="OnViewAddressBoxSubmitted"
-                            Text="{x:Bind ViewModel.RoamingViewAddress, Mode=OneWay}" />
-                    </exp:ExpanderExWrapper.WrapContent>
-                </exp:ExpanderExWrapper>
-                <exp:ExpanderExItemSeparator />
-                <exp:ExpanderExWrapper Style="{StaticResource WrapperInExpanderContentStyle}">
-                    <exp:ExpanderExWrapper.MainContent>
-                        <StackPanel>
-                            <TextBlock HorizontalAlignment="Left" Text="{loc:Locale Name=ProxyVideoAddress}" />
-                            <TextBlock FontSize="12">
-                                <Hyperlink NavigateUri="https://github.com/Richasy/Bili.Uwp/wiki/%E7%95%AA%E5%89%A7%E4%BB%A3%E7%90%86#%E6%92%AD%E6%94%BE%E4%BB%A3%E7%90%86">
-                                    <Run Text="{loc:Locale Name=FunctionIntroduce}" />
-                                </Hyperlink>
-                            </TextBlock>
-                        </StackPanel>
-                    </exp:ExpanderExWrapper.MainContent>
-                    <exp:ExpanderExWrapper.WrapContent>
-                        <AutoSuggestBox
-                            MinWidth="240"
-                            MaxWidth="300"
-                            VerticalAlignment="Center"
-                            PlaceholderText="{loc:Locale Name=EnterToEffect}"
-                            QueryIcon="Save"
-                            QuerySubmitted="OnVideoAddressBoxSubmitted"
-                            Text="{x:Bind ViewModel.RoamingVideoAddress, Mode=OneWay}" />
-                    </exp:ExpanderExWrapper.WrapContent>
-                </exp:ExpanderExWrapper>
-                <exp:ExpanderExItemSeparator />
-                <exp:ExpanderExWrapper Style="{StaticResource WrapperInExpanderContentStyle}">
-                    <exp:ExpanderExWrapper.MainContent>
-                        <StackPanel>
-                            <TextBlock HorizontalAlignment="Left" Text="{loc:Locale Name=ProxySearchAddress}" />
-                            <TextBlock FontSize="12">
-                                <Hyperlink NavigateUri="https://github.com/Richasy/Bili.Uwp/wiki/%E7%95%AA%E5%89%A7%E4%BB%A3%E7%90%86#%E6%90%9C%E7%B4%A2%E4%BB%A3%E7%90%86">
-                                    <Run Text="{loc:Locale Name=FunctionIntroduce}" />
-                                </Hyperlink>
-                            </TextBlock>
-                        </StackPanel>
-                    </exp:ExpanderExWrapper.MainContent>
-                    <exp:ExpanderExWrapper.WrapContent>
-                        <AutoSuggestBox
-                            MinWidth="240"
-                            MaxWidth="300"
-                            VerticalAlignment="Center"
-                            PlaceholderText="{loc:Locale Name=EnterToEffect}"
-                            QueryIcon="Save"
-                            QuerySubmitted="OnSearchAddressBoxSubmitted"
-                            Text="{x:Bind ViewModel.RoamingSearchAddress, Mode=OneWay}" />
-                    </exp:ExpanderExWrapper.WrapContent>
-                </exp:ExpanderExWrapper>
-            </exp:ExpanderExMenuPanel>
-        </exp:ExpanderEx.Content>
-    </exp:ExpanderEx>
+    <labs:SettingsExpander Description="{loc:Locale Name=ProxySettingDescription}" Header="{loc:Locale Name=ProxySetting}">
+        <labs:SettingsExpander.HeaderIcon>
+            <ico:RegularFluentIcon Symbol="GlobeVideo20" />
+        </labs:SettingsExpander.HeaderIcon>
+        <ToggleSwitch IsOn="{x:Bind ViewModel.IsOpenRoaming, Mode=TwoWay}" />
+        <labs:SettingsExpander.Items>
+            <labs:SettingsCard>
+                <labs:SettingsCard.Header>
+                    <StackPanel>
+                        <TextBlock HorizontalAlignment="Left" Text="{loc:Locale Name=GlobeProxy}" />
+                        <TextBlock
+                            Style="{StaticResource CaptionTextBlockStyle}"
+                            HorizontalAlignment="Left"
+                            Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                            Text="{loc:Locale Name=GlobeProxyDescription}"
+                            TextTrimming="CharacterEllipsis" />
+                    </StackPanel>
+                </labs:SettingsCard.Header>
+                <ToggleSwitch IsOn="{x:Bind ViewModel.IsGlobeProxy, Mode=TwoWay}" />
+            </labs:SettingsCard>
+            <labs:SettingsCard>
+                <labs:SettingsCard.Header>
+                    <StackPanel>
+                        <TextBlock HorizontalAlignment="Left" Text="{loc:Locale Name=ProxyViewAddress}" />
+                        <TextBlock FontSize="12">
+                            <Hyperlink NavigateUri="https://github.com/Richasy/Bili.Uwp/wiki/%E7%95%AA%E5%89%A7%E4%BB%A3%E7%90%86#%E8%AF%A6%E6%83%85%E4%BB%A3%E7%90%86">
+                                <Run Text="{loc:Locale Name=FunctionIntroduce}" />
+                            </Hyperlink>
+                        </TextBlock>
+                    </StackPanel>
+                </labs:SettingsCard.Header>
+                <AutoSuggestBox
+                    MinWidth="240"
+                    MaxWidth="300"
+                    VerticalAlignment="Center"
+                    PlaceholderText="{loc:Locale Name=EnterToEffect}"
+                    QueryIcon="Save"
+                    QuerySubmitted="OnViewAddressBoxSubmitted"
+                    Text="{x:Bind ViewModel.RoamingViewAddress, Mode=OneWay}" />
+            </labs:SettingsCard>
+            <labs:SettingsCard>
+                <labs:SettingsCard.Header>
+                    <StackPanel>
+                        <TextBlock HorizontalAlignment="Left" Text="{loc:Locale Name=ProxyVideoAddress}" />
+                        <TextBlock FontSize="12">
+                            <Hyperlink NavigateUri="https://github.com/Richasy/Bili.Uwp/wiki/%E7%95%AA%E5%89%A7%E4%BB%A3%E7%90%86#%E6%92%AD%E6%94%BE%E4%BB%A3%E7%90%86">
+                                <Run Text="{loc:Locale Name=FunctionIntroduce}" />
+                            </Hyperlink>
+                        </TextBlock>
+                    </StackPanel>
+                </labs:SettingsCard.Header>
+                <AutoSuggestBox
+                    MinWidth="240"
+                    MaxWidth="300"
+                    VerticalAlignment="Center"
+                    PlaceholderText="{loc:Locale Name=EnterToEffect}"
+                    QueryIcon="Save"
+                    QuerySubmitted="OnVideoAddressBoxSubmitted"
+                    Text="{x:Bind ViewModel.RoamingVideoAddress, Mode=OneWay}" />
+            </labs:SettingsCard>
+            <labs:SettingsCard>
+                <labs:SettingsCard.Header>
+                    <StackPanel>
+                        <TextBlock HorizontalAlignment="Left" Text="{loc:Locale Name=ProxySearchAddress}" />
+                        <TextBlock FontSize="12">
+                            <Hyperlink NavigateUri="https://github.com/Richasy/Bili.Uwp/wiki/%E7%95%AA%E5%89%A7%E4%BB%A3%E7%90%86#%E6%90%9C%E7%B4%A2%E4%BB%A3%E7%90%86">
+                                <Run Text="{loc:Locale Name=FunctionIntroduce}" />
+                            </Hyperlink>
+                        </TextBlock>
+                    </StackPanel>
+                </labs:SettingsCard.Header>
+                <AutoSuggestBox
+                    MinWidth="240"
+                    MaxWidth="300"
+                    VerticalAlignment="Center"
+                    PlaceholderText="{loc:Locale Name=EnterToEffect}"
+                    QueryIcon="Save"
+                    QuerySubmitted="OnSearchAddressBoxSubmitted"
+                    Text="{x:Bind ViewModel.RoamingSearchAddress, Mode=OneWay}" />
+            </labs:SettingsCard>
+        </labs:SettingsExpander.Items>
+    </labs:SettingsExpander>
 </local:SettingSectionControl>
diff --git a/src/App/Controls/Settings/ScreenshotSettingSection.xaml b/src/App/Controls/Settings/ScreenshotSettingSection.xaml
index d26d9f046..1df655703 100644
--- a/src/App/Controls/Settings/ScreenshotSettingSection.xaml
+++ b/src/App/Controls/Settings/ScreenshotSettingSection.xaml
@@ -4,56 +4,31 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:icon="using:Richasy.FluentIcon.Uwp"
+    xmlns:labs="using:CommunityToolkit.Labs.WinUI"
     xmlns:loc="using:Bili.App.Resources.Extension"
     xmlns:local="using:Bili.App.Controls"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:uwp="using:Richasy.ExpanderEx.Uwp"
     d:DesignHeight="300"
     d:DesignWidth="400"
     mc:Ignorable="d">
 
-    <uwp:ExpanderEx>
-        <uwp:ExpanderEx.Header>
-            <uwp:ExpanderExWrapper Style="{StaticResource WrapperInExpanderHeaderStyle}">
-                <uwp:ExpanderExWrapper.MainContent>
-                    <uwp:ExpanderExDescriptor Title="{loc:Locale Name=ScreenshotSettings}" Description="{loc:Locale Name=ScreenshotSettingsDescription}">
-                        <uwp:ExpanderExDescriptor.Icon>
-                            <icon:RegularFluentIcon Symbol="Screenshot20" />
-                        </uwp:ExpanderExDescriptor.Icon>
-                    </uwp:ExpanderExDescriptor>
-                </uwp:ExpanderExWrapper.MainContent>
-            </uwp:ExpanderExWrapper>
-        </uwp:ExpanderEx.Header>
-        <uwp:ExpanderEx.Content>
-            <uwp:ExpanderExMenuPanel>
-                <uwp:ExpanderExWrapper>
-                    <uwp:ExpanderExWrapper.MainContent>
-                        <TextBlock Text="{loc:Locale Name=ScreenshotFolder}" />
-                    </uwp:ExpanderExWrapper.MainContent>
-                    <uwp:ExpanderExWrapper.WrapContent>
-                        <Button
-                            MinWidth="120"
-                            Click="OnOpenScreenshotFolderButtonClickAsync"
-                            Content="{loc:Locale Name=OpenFolder}" />
-                    </uwp:ExpanderExWrapper.WrapContent>
-                </uwp:ExpanderExWrapper>
-                <uwp:ExpanderExWrapper>
-                    <uwp:ExpanderExWrapper.MainContent>
-                        <TextBlock Text="{loc:Locale Name=CopyToClipboardAfterScreenshot}" />
-                    </uwp:ExpanderExWrapper.MainContent>
-                    <uwp:ExpanderExWrapper.WrapContent>
-                        <ToggleSwitch Style="{StaticResource RightAlignedCompactToggleSwitchStyle}" IsOn="{x:Bind ViewModel.IsCopyScreenshot, Mode=TwoWay}" />
-                    </uwp:ExpanderExWrapper.WrapContent>
-                </uwp:ExpanderExWrapper>
-                <uwp:ExpanderExWrapper>
-                    <uwp:ExpanderExWrapper.MainContent>
-                        <TextBlock Text="{loc:Locale Name=OpenFileAfterScreenshot}" />
-                    </uwp:ExpanderExWrapper.MainContent>
-                    <uwp:ExpanderExWrapper.WrapContent>
-                        <ToggleSwitch Style="{StaticResource RightAlignedCompactToggleSwitchStyle}" IsOn="{x:Bind ViewModel.IsOpenScreenshotFile, Mode=TwoWay}" />
-                    </uwp:ExpanderExWrapper.WrapContent>
-                </uwp:ExpanderExWrapper>
-            </uwp:ExpanderExMenuPanel>
-        </uwp:ExpanderEx.Content>
-    </uwp:ExpanderEx>
+    <labs:SettingsExpander Description="{loc:Locale Name=ScreenshotSettingsDescription}" Header="{loc:Locale Name=ScreenshotSettings}">
+        <labs:SettingsExpander.HeaderIcon>
+            <icon:RegularFluentIcon Symbol="Screenshot20" />
+        </labs:SettingsExpander.HeaderIcon>
+        <labs:SettingsExpander.Items>
+            <labs:SettingsCard Header="{loc:Locale Name=ScreenshotFolder}">
+                <Button
+                    MinWidth="120"
+                    Click="OnOpenScreenshotFolderButtonClickAsync"
+                    Content="{loc:Locale Name=OpenFolder}" />
+            </labs:SettingsCard>
+            <labs:SettingsCard Header="{loc:Locale Name=CopyToClipboardAfterScreenshot}">
+                <ToggleSwitch IsOn="{x:Bind ViewModel.IsCopyScreenshot, Mode=TwoWay}" />
+            </labs:SettingsCard>
+            <labs:SettingsCard Header="{loc:Locale Name=OpenFileAfterScreenshot}">
+                <ToggleSwitch IsOn="{x:Bind ViewModel.IsOpenScreenshotFile, Mode=TwoWay}" />
+            </labs:SettingsCard>
+        </labs:SettingsExpander.Items>
+    </labs:SettingsExpander>
 </local:SettingSectionControl>
diff --git a/src/App/Controls/Settings/StartupSettingSection.xaml b/src/App/Controls/Settings/StartupSettingSection.xaml
index 43a7a1c49..42b113cb5 100644
--- a/src/App/Controls/Settings/StartupSettingSection.xaml
+++ b/src/App/Controls/Settings/StartupSettingSection.xaml
@@ -4,70 +4,34 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:icons="using:Richasy.FluentIcon.Uwp"
+    xmlns:labs="using:CommunityToolkit.Labs.WinUI"
     xmlns:loc="using:Bili.App.Resources.Extension"
     xmlns:local="using:Bili.App.Controls"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:uwp="using:Richasy.ExpanderEx.Uwp"
     d:DesignHeight="300"
     d:DesignWidth="400"
     mc:Ignorable="d">
 
-    <uwp:ExpanderEx>
-        <uwp:ExpanderEx.Header>
-            <uwp:ExpanderExWrapper Style="{StaticResource WrapperInExpanderHeaderStyle}">
-                <uwp:ExpanderExWrapper.MainContent>
-                    <uwp:ExpanderExDescriptor Title="{loc:Locale Name=StartMethod}" Description="{loc:Locale Name=StartMethodDescription}">
-                        <uwp:ExpanderExDescriptor.Icon>
-                            <icons:RegularFluentIcon Symbol="AirplaneTakeOff16" />
-                        </uwp:ExpanderExDescriptor.Icon>
-                    </uwp:ExpanderExDescriptor>
-                </uwp:ExpanderExWrapper.MainContent>
-            </uwp:ExpanderExWrapper>
-        </uwp:ExpanderEx.Header>
-        <uwp:ExpanderEx.Content>
-            <uwp:ExpanderExMenuPanel>
-                <uwp:ExpanderExWrapper Style="{StaticResource WrapperInExpanderContentStyle}">
-                    <uwp:ExpanderExWrapper.MainContent>
-                        <uwp:ExpanderExDescriptor
-                            Title="{loc:Locale Name=Prelaunch}"
-                            Description="{loc:Locale Name=PrelaunchDescription}"
-                            IconVisibility="Collapsed"
-                            IsAutoHideIcon="False" />
-                    </uwp:ExpanderExWrapper.MainContent>
-                    <uwp:ExpanderExWrapper.WrapContent>
-                        <ToggleSwitch Style="{StaticResource RightAlignedCompactToggleSwitchStyle}" IsOn="{x:Bind ViewModel.IsPrelaunch, Mode=TwoWay}" />
-                    </uwp:ExpanderExWrapper.WrapContent>
-                </uwp:ExpanderExWrapper>
-                <uwp:ExpanderExItemSeparator />
-                <uwp:ExpanderExWrapper Style="{StaticResource WrapperInExpanderContentStyle}">
-                    <uwp:ExpanderExWrapper.MainContent>
-                        <uwp:ExpanderExDescriptor
-                            Title="{loc:Locale Name=Startup}"
-                            Description="{loc:Locale Name=StartupDescription}"
-                            IconVisibility="Collapsed"
-                            IsAutoHideIcon="False" />
-                    </uwp:ExpanderExWrapper.MainContent>
-                    <uwp:ExpanderExWrapper.WrapContent>
-                        <ToggleSwitch Style="{StaticResource RightAlignedCompactToggleSwitchStyle}" IsOn="{x:Bind ViewModel.IsStartup, Mode=TwoWay}" />
-                    </uwp:ExpanderExWrapper.WrapContent>
-                </uwp:ExpanderExWrapper>
-                <uwp:ExpanderExWrapper Style="{StaticResource WrapperInExpanderContentStyle}" Visibility="{x:Bind ViewModel.StartupWarningText, Mode=OneWay, Converter={StaticResource ObjectToVisibilityConverter}}">
-                    <uwp:ExpanderExWrapper.MainContent>
-                        <uwp:ExpanderExDescriptor
-                            Title="{x:Bind ViewModel.StartupWarningText, Mode=OneWay}"
-                            DescriptionVisibility="Collapsed"
-                            Foreground="{ThemeResource SystemFillColorCriticalBrush}"
-                            TitleFontSize="12">
-                            <uwp:ExpanderExDescriptor.Resources>
-                                <SolidColorBrush x:Key="DefaultExpanderDescriptorTitleForeground" Color="{ThemeResource SystemFillColorCritical}" />
-                            </uwp:ExpanderExDescriptor.Resources>
-                            <uwp:ExpanderExDescriptor.Icon>
-                                <icons:RegularFluentIcon Symbol="Warning16" />
-                            </uwp:ExpanderExDescriptor.Icon>
-                        </uwp:ExpanderExDescriptor>
-                    </uwp:ExpanderExWrapper.MainContent>
-                </uwp:ExpanderExWrapper>
-            </uwp:ExpanderExMenuPanel>
-        </uwp:ExpanderEx.Content>
-    </uwp:ExpanderEx>
+    <labs:SettingsExpander Description="{loc:Locale Name=StartMethodDescription}" Header="{loc:Locale Name=StartMethod}">
+        <labs:SettingsExpander.HeaderIcon>
+            <icons:RegularFluentIcon Symbol="AirplaneTakeOff16" />
+        </labs:SettingsExpander.HeaderIcon>
+        <labs:SettingsExpander.Items>
+            <labs:SettingsCard Description="{loc:Locale Name=PrelaunchDescription}" Header="{loc:Locale Name=Prelaunch}">
+                <ToggleSwitch IsOn="{x:Bind ViewModel.IsPrelaunch, Mode=TwoWay}" />
+            </labs:SettingsCard>
+            <labs:SettingsCard Description="{loc:Locale Name=StartupDescription}" Header="{loc:Locale Name=Startup}">
+                <ToggleSwitch IsOn="{x:Bind ViewModel.IsStartup, Mode=TwoWay}" />
+            </labs:SettingsCard>
+            <labs:SettingsCard
+                ContentAlignment="Vertical"
+                Foreground="{ThemeResource SystemFillColorCriticalBrush}"
+                Header="{x:Bind ViewModel.StartupWarningText, Mode=OneWay}"
+                Visibility="{x:Bind ViewModel.StartupWarningText, Mode=OneWay, Converter={StaticResource ObjectToVisibilityConverter}}">
+                <labs:SettingsCard.HeaderIcon>
+                    <icons:RegularFluentIcon Symbol="Warning16" />
+                </labs:SettingsCard.HeaderIcon>
+            </labs:SettingsCard>
+        </labs:SettingsExpander.Items>
+    </labs:SettingsExpander>
 </local:SettingSectionControl>
diff --git a/src/App/Controls/Settings/ThemeSettingSection.xaml b/src/App/Controls/Settings/ThemeSettingSection.xaml
index 040b9bef0..274e3b313 100644
--- a/src/App/Controls/Settings/ThemeSettingSection.xaml
+++ b/src/App/Controls/Settings/ThemeSettingSection.xaml
@@ -4,49 +4,37 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:icons="using:Richasy.FluentIcon.Uwp"
+    xmlns:labs="using:CommunityToolkit.Labs.WinUI"
     xmlns:loc="using:Bili.App.Resources.Extension"
     xmlns:local="using:Bili.App.Controls"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
-    xmlns:uwp="using:Richasy.ExpanderEx.Uwp"
     d:DesignHeight="300"
     d:DesignWidth="400"
     mc:Ignorable="d">
 
-    <uwp:ExpanderEx>
-        <uwp:ExpanderEx.Header>
-            <uwp:ExpanderExWrapper Style="{StaticResource WrapperInExpanderHeaderStyle}">
-                <uwp:ExpanderExWrapper.MainContent>
-                    <uwp:ExpanderExDescriptor Title="{loc:Locale Name=AppTheme}" Description="{loc:Locale Name=AppThemeDescription}">
-                        <uwp:ExpanderExDescriptor.Icon>
-                            <icons:RegularFluentIcon Symbol="Color20" />
-                        </uwp:ExpanderExDescriptor.Icon>
-                    </uwp:ExpanderExDescriptor>
-                </uwp:ExpanderExWrapper.MainContent>
-                <uwp:ExpanderExWrapper.WrapContent>
-                    <TextBlock FontWeight="Bold" Text="{x:Bind ViewModel.AppTheme, Mode=OneWay, Converter={StaticResource ThemeStringConverter}}" />
-                </uwp:ExpanderExWrapper.WrapContent>
-            </uwp:ExpanderExWrapper>
-        </uwp:ExpanderEx.Header>
-        <uwp:ExpanderEx.Content>
-            <uwp:ExpanderExWrapper Style="{StaticResource WrapperInExpanderContentStyle}">
-                <uwp:ExpanderExWrapper.MainContent>
-                    <StackPanel>
-                        <muxc:RadioButtons x:Name="ThemeRadioButtons" SelectionChanged="OnThemeRadioButtonSelectionChanged">
-                            <RadioButton x:Name="LightThemeRadioButton" Content="{loc:Locale Name=Light}" />
-                            <RadioButton x:Name="DarkThemeRadioButton" Content="{loc:Locale Name=Dark}" />
-                            <RadioButton x:Name="SystemThemeRadioButton" Content="{loc:Locale Name=FollowSystem}" />
-                        </muxc:RadioButtons>
-                        <TextBlock
-                            Style="{ThemeResource BodyTextBlockStyle}"
-                            Margin="0,12,0,8"
-                            FontSize="12"
-                            Foreground="{ThemeResource SystemFillColorCautionBrush}"
-                            Text="{loc:Locale Name=RestartWarning}"
-                            Visibility="{x:Bind ViewModel.IsShowThemeRestartTip, Mode=OneWay}" />
-                    </StackPanel>
-                </uwp:ExpanderExWrapper.MainContent>
-            </uwp:ExpanderExWrapper>
-        </uwp:ExpanderEx.Content>
-    </uwp:ExpanderEx>
+    <labs:SettingsExpander Description="{loc:Locale Name=AppThemeDescription}" Header="{loc:Locale Name=AppTheme}">
+        <labs:SettingsExpander.HeaderIcon>
+            <icons:RegularFluentIcon Symbol="Color20" />
+        </labs:SettingsExpander.HeaderIcon>
+        <TextBlock FontWeight="Bold" Text="{x:Bind ViewModel.AppTheme, Mode=OneWay, Converter={StaticResource ThemeStringConverter}}" />
+        <labs:SettingsExpander.Items>
+            <labs:SettingsCard ContentAlignment="Left">
+                <StackPanel>
+                    <muxc:RadioButtons x:Name="ThemeRadioButtons" SelectionChanged="OnThemeRadioButtonSelectionChanged">
+                        <RadioButton x:Name="LightThemeRadioButton" Content="{loc:Locale Name=Light}" />
+                        <RadioButton x:Name="DarkThemeRadioButton" Content="{loc:Locale Name=Dark}" />
+                        <RadioButton x:Name="SystemThemeRadioButton" Content="{loc:Locale Name=FollowSystem}" />
+                    </muxc:RadioButtons>
+                    <TextBlock
+                        Style="{ThemeResource BodyTextBlockStyle}"
+                        Margin="0,12,0,8"
+                        FontSize="12"
+                        Foreground="{ThemeResource SystemFillColorCautionBrush}"
+                        Text="{loc:Locale Name=RestartWarning}"
+                        Visibility="{x:Bind ViewModel.IsShowThemeRestartTip, Mode=OneWay}" />
+                </StackPanel>
+            </labs:SettingsCard>
+        </labs:SettingsExpander.Items>
+    </labs:SettingsExpander>
 </local:SettingSectionControl>
diff --git a/src/App/Controls/Settings/TraditionalChineseSettingSection.xaml b/src/App/Controls/Settings/TraditionalChineseSettingSection.xaml
index 147e8bc68..46115d285 100644
--- a/src/App/Controls/Settings/TraditionalChineseSettingSection.xaml
+++ b/src/App/Controls/Settings/TraditionalChineseSettingSection.xaml
@@ -3,8 +3,8 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:exp="using:Richasy.ExpanderEx.Uwp"
     xmlns:icons="using:Richasy.FluentIcon.Uwp"
+    xmlns:labs="using:CommunityToolkit.Labs.WinUI"
     xmlns:loc="using:Bili.App.Resources.Extension"
     xmlns:local="using:Bili.App.Controls"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -12,20 +12,10 @@
     d:DesignWidth="400"
     mc:Ignorable="d">
 
-    <exp:ExpanderEx>
-        <exp:ExpanderEx.Header>
-            <exp:ExpanderExWrapper>
-                <exp:ExpanderExWrapper.MainContent>
-                    <exp:ExpanderExDescriptor Title="{loc:Locale Name=FullTraditionalChineseTitle}" Description="{loc:Locale Name=FullTraditionalChineseDescription}">
-                        <exp:ExpanderExDescriptor.Icon>
-                            <icons:RegularFluentIcon Symbol="TextQuote16" />
-                        </exp:ExpanderExDescriptor.Icon>
-                    </exp:ExpanderExDescriptor>
-                </exp:ExpanderExWrapper.MainContent>
-                <exp:ExpanderExWrapper.WrapContent>
-                    <ToggleSwitch Style="{StaticResource RightAlignedCompactToggleSwitchStyle}" IsOn="{x:Bind ViewModel.IsFullTraditionalChinese, Mode=TwoWay}" />
-                </exp:ExpanderExWrapper.WrapContent>
-            </exp:ExpanderExWrapper>
-        </exp:ExpanderEx.Header>
-    </exp:ExpanderEx>
+    <labs:SettingsCard Description="{loc:Locale Name=FullTraditionalChineseDescription}" Header="{loc:Locale Name=FullTraditionalChineseTitle}">
+        <labs:SettingsCard.HeaderIcon>
+            <icons:RegularFluentIcon Symbol="TextQuote16" />
+        </labs:SettingsCard.HeaderIcon>
+        <ToggleSwitch IsOn="{x:Bind ViewModel.IsFullTraditionalChinese, Mode=TwoWay}" />
+    </labs:SettingsCard>
 </local:SettingSectionControl>
diff --git a/src/App/Pages/Desktop/Overlay/TimeLinePage.xaml b/src/App/Pages/Desktop/Overlay/TimeLinePage.xaml
index 517651962..51d445c6e 100644
--- a/src/App/Pages/Desktop/Overlay/TimeLinePage.xaml
+++ b/src/App/Pages/Desktop/Overlay/TimeLinePage.xaml
@@ -6,9 +6,9 @@
     xmlns:behaviors="using:Bili.App.Behaviors"
     xmlns:controls="using:Bili.App.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:exp="using:Richasy.ExpanderEx.Uwp"
     xmlns:icons="using:Richasy.FluentIcon.Uwp"
     xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
+    xmlns:labs="using:CommunityToolkit.Labs.WinUI"
     xmlns:loc="using:Bili.App.Resources.Extension"
     xmlns:local="using:Bili.App.Pages.Desktop.Overlay"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -18,42 +18,42 @@
     mc:Ignorable="d">
     <Page.Resources>
         <DataTemplate x:Key="TimlineTemplate" x:DataType="pgc:TimelineInformation">
-            <exp:ExpanderEx IsExpanded="{x:Bind IsToday}">
-                <exp:ExpanderEx.Header>
-                    <exp:ExpanderExDescriptor
-                        Title="{x:Bind DayOfWeek}"
-                        Margin="0,8"
-                        Description="{x:Bind Date}">
-                        <exp:ExpanderExDescriptor.Icon>
-                            <icons:RegularFluentIcon Symbol="CalendarDay16" />
-                        </exp:ExpanderExDescriptor.Icon>
-                    </exp:ExpanderExDescriptor>
-                </exp:ExpanderEx.Header>
-                <exp:ExpanderEx.Content>
-                    <Grid Margin="20,12">
-                        <muxc:ItemsRepeater x:Name="Repeater" ItemsSource="{x:Bind Seasons}">
-                            <muxc:ItemsRepeater.Layout>
-                                <muxc:UniformGridLayout
-                                    ItemsStretch="Fill"
-                                    MinColumnSpacing="12"
-                                    MinItemHeight="160"
-                                    MinItemWidth="300"
-                                    MinRowSpacing="12" />
-                            </muxc:ItemsRepeater.Layout>
-                            <muxc:ItemsRepeater.ItemTemplate>
-                                <DataTemplate x:DataType="pgc:SeasonInformation">
-                                    <pgc1:SeasonItem Style="{StaticResource SlimSeasonItemStyle}" Information="{x:Bind}" />
-                                </DataTemplate>
-                            </muxc:ItemsRepeater.ItemTemplate>
-                        </muxc:ItemsRepeater>
-                        <TextBlock
-                            HorizontalAlignment="Center"
-                            VerticalAlignment="Center"
-                            Text="{loc:Locale Name=TimelineHasNoVideo}"
-                            Visibility="{x:Bind Seasons, Converter={StaticResource ObjectToVisibilityReverseConverter}}" />
-                    </Grid>
-                </exp:ExpanderEx.Content>
-            </exp:ExpanderEx>
+            <labs:SettingsExpander
+                Description="{x:Bind Date}"
+                Header="{x:Bind DayOfWeek}"
+                IsExpanded="{x:Bind IsToday}">
+                <labs:SettingsExpander.HeaderIcon>
+                    <icons:RegularFluentIcon Symbol="CalendarDay16" />
+                </labs:SettingsExpander.HeaderIcon>
+                <labs:SettingsExpander.Items>
+                    <labs:SettingsCard>
+                        <labs:SettingsCard.Header>
+                            <Grid>
+                                <muxc:ItemsRepeater x:Name="Repeater" ItemsSource="{x:Bind Seasons}">
+                                    <muxc:ItemsRepeater.Layout>
+                                        <muxc:UniformGridLayout
+                                            ItemsStretch="Fill"
+                                            MinColumnSpacing="12"
+                                            MinItemHeight="160"
+                                            MinItemWidth="300"
+                                            MinRowSpacing="12" />
+                                    </muxc:ItemsRepeater.Layout>
+                                    <muxc:ItemsRepeater.ItemTemplate>
+                                        <DataTemplate x:DataType="pgc:SeasonInformation">
+                                            <pgc1:SeasonItem Style="{StaticResource SlimSeasonItemStyle}" Information="{x:Bind}" />
+                                        </DataTemplate>
+                                    </muxc:ItemsRepeater.ItemTemplate>
+                                </muxc:ItemsRepeater>
+                                <TextBlock
+                                    HorizontalAlignment="Center"
+                                    VerticalAlignment="Center"
+                                    Text="{loc:Locale Name=TimelineHasNoVideo}"
+                                    Visibility="{x:Bind Seasons, Converter={StaticResource ObjectToVisibilityReverseConverter}}" />
+                            </Grid>
+                        </labs:SettingsCard.Header>
+                    </labs:SettingsCard>
+                </labs:SettingsExpander.Items>
+            </labs:SettingsExpander>
         </DataTemplate>
     </Page.Resources>
 
diff --git a/src/App/Pages/Desktop/Overlay/VideoPlayerPage.xaml b/src/App/Pages/Desktop/Overlay/VideoPlayerPage.xaml
index 8faab57ee..ace1331e4 100644
--- a/src/App/Pages/Desktop/Overlay/VideoPlayerPage.xaml
+++ b/src/App/Pages/Desktop/Overlay/VideoPlayerPage.xaml
@@ -361,7 +361,6 @@
                                 VerticalAlignment="Center"
                                 Text="{loc:Locale Name=InfinityLoop}" />
                             <ToggleSwitch
-                                Style="{StaticResource RightAlignedCompactToggleSwitchStyle}"
                                 RelativePanel.AlignRightWithPanel="True"
                                 RelativePanel.AlignVerticalCenterWithPanel="True"
                                 MinWidth="0"
diff --git a/src/App/Pages/Desktop/SettingPage.xaml b/src/App/Pages/Desktop/SettingPage.xaml
index 47b4a9104..82a0650e9 100644
--- a/src/App/Pages/Desktop/SettingPage.xaml
+++ b/src/App/Pages/Desktop/SettingPage.xaml
@@ -35,6 +35,10 @@
                 Margin="0,0,0,24"
                 Spacing="4"
                 XYFocusKeyboardNavigation="Enabled">
+                <StackPanel.ChildrenTransitions>
+                    <EntranceThemeTransition FromVerticalOffset="50" IsStaggeringEnabled="True" />
+                    <RepositionThemeTransition IsStaggeringEnabled="False" />
+                </StackPanel.ChildrenTransitions>
                 <TextBlock
                     Style="{StaticResource BodyTextBlockStyle}"
                     Margin="0,0,0,8"
diff --git a/src/App/Pages/Xbox/SettingsPage.xaml b/src/App/Pages/Xbox/SettingsPage.xaml
index 241381d55..0eefe4472 100644
--- a/src/App/Pages/Xbox/SettingsPage.xaml
+++ b/src/App/Pages/Xbox/SettingsPage.xaml
@@ -37,7 +37,10 @@
                 Margin="0,0,0,24"
                 Spacing="4"
                 XYFocusKeyboardNavigation="Enabled">
-
+                <StackPanel.ChildrenTransitions>
+                    <EntranceThemeTransition FromVerticalOffset="50" IsStaggeringEnabled="True" />
+                    <RepositionThemeTransition IsStaggeringEnabled="False" />
+                </StackPanel.ChildrenTransitions>
                 <TextBlock
                     Style="{StaticResource BodyTextBlockStyle}"
                     Margin="0,0,0,8"
diff --git a/src/App/Styles/Style.Overwrite.xaml b/src/App/Styles/Style.Overwrite.xaml
index 7bde0db24..b75ac12b6 100644
--- a/src/App/Styles/Style.Overwrite.xaml
+++ b/src/App/Styles/Style.Overwrite.xaml
@@ -1,7 +1,6 @@
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:expander="using:Richasy.ExpanderEx.Uwp"
     xmlns:icons="using:Richasy.FluentIcon.Uwp"
     xmlns:loc="using:Bili.App.Resources.Extension"
     xmlns:muxc="using:Microsoft.UI.Xaml.Controls">
@@ -49,627 +48,20 @@
         <Setter Property="Foreground" Value="{x:Null}" />
     </Style>
 
-    <!-- 在Expander(有内容的ExpanderEx)头部的Wrapper样式 -->
-    <Style x:Key="WrapperInExpanderHeaderStyle" TargetType="expander:ExpanderExWrapper">
-        <Setter Property="InlineWidePadding" Value="0,8,0,12" />
-        <Setter Property="InlineIntermediatePadding" Value="0,8,0,12" />
-        <Setter Property="WrapRowSpacing" Value="0" />
-        <Setter Property="WrapMargin" Value="0,8,0,12" />
-    </Style>
-
-    <!-- 在ExpanderEx内容区域的Wrapper样式 -->
-    <Style x:Key="WrapperInExpanderContentStyle" TargetType="expander:ExpanderExWrapper">
-        <Setter Property="InlineWidePadding" Value="48,8,60,8" />
-        <Setter Property="InlineIntermediatePadding" Value="16,8" />
-        <Setter Property="WrapRowSpacing" Value="8" />
-        <Setter Property="WrapMargin" Value="16,8" />
-    </Style>
-
-    <Style x:Key="TopNavigationViewStyle" TargetType="muxc:NavigationView">
-        <Setter Property="IsBackButtonVisible" Value="Collapsed" />
-        <Setter Property="IsPaneToggleButtonVisible" Value="False" />
-        <Setter Property="IsSettingsVisible" Value="False" />
-        <Setter Property="PaneDisplayMode" Value="Top" />
-    </Style>
-
-    <Style
-        x:Key="XboxSideNavigationViewStyle"
-        BasedOn="{StaticResource TopNavigationViewStyle}"
-        TargetType="muxc:NavigationView">
-        <Setter Property="PaneDisplayMode" Value="Left" />
-        <Setter Property="OpenPaneLength" Value="200" />
-        <Setter Property="Margin" Value="24,0,0,0" />
-    </Style>
-
-    <Style
-        x:Key="RightAlignedCompactToggleSwitchStyle"
-        BasedOn="{StaticResource DefaultToggleSwitchStyle}"
-        TargetType="ToggleSwitch">
-        <Setter Property="MinWidth" Value="0" />
-        <Setter Property="MinHeight" Value="0" />
-        <Setter Property="Foreground" Value="{ThemeResource TextFillColorSecondaryBrush}" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="ToggleSwitch">
-                    <Grid
-                        Background="{TemplateBinding Background}"
-                        BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="{TemplateBinding BorderThickness}"
-                        CornerRadius="{TemplateBinding CornerRadius}">
-
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="*" />
-                        </Grid.RowDefinitions>
-
-                        <VisualStateManager.VisualStateGroups>
-                            <VisualStateGroup x:Name="CommonStates">
-                                <VisualState x:Name="Normal">
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="OuterBorder" Storyboard.TargetProperty="Stroke">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchStrokeOff}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="OuterBorder" Storyboard.TargetProperty="Fill">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchFillOff}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOff" Storyboard.TargetProperty="Fill">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchKnobFillOff}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOn" Storyboard.TargetProperty="Background">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchKnobFillOn}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobBounds" Storyboard.TargetProperty="Fill">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchFillOn}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobBounds" Storyboard.TargetProperty="Stroke">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchStrokeOn}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SwitchAreaGrid" Storyboard.TargetProperty="Background">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchContainerBackground}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <DoubleAnimationUsingKeyFrames
-                                            EnableDependentAnimation="True"
-                                            Storyboard.TargetName="SwitchKnobOn"
-                                            Storyboard.TargetProperty="Width">
-                                            <SplineDoubleKeyFrame
-                                                KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
-                                                KeyTime="{StaticResource ControlFasterAnimationDuration}"
-                                                Value="12" />
-                                        </DoubleAnimationUsingKeyFrames>
-                                        <DoubleAnimationUsingKeyFrames
-                                            EnableDependentAnimation="True"
-                                            Storyboard.TargetName="SwitchKnobOn"
-                                            Storyboard.TargetProperty="Height">
-                                            <SplineDoubleKeyFrame
-                                                KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
-                                                KeyTime="{StaticResource ControlFasterAnimationDuration}"
-                                                Value="12" />
-                                        </DoubleAnimationUsingKeyFrames>
-                                        <DoubleAnimationUsingKeyFrames
-                                            EnableDependentAnimation="True"
-                                            Storyboard.TargetName="SwitchKnobOff"
-                                            Storyboard.TargetProperty="Width">
-                                            <SplineDoubleKeyFrame
-                                                KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
-                                                KeyTime="{StaticResource ControlFasterAnimationDuration}"
-                                                Value="12" />
-                                        </DoubleAnimationUsingKeyFrames>
-                                        <DoubleAnimationUsingKeyFrames
-                                            EnableDependentAnimation="True"
-                                            Storyboard.TargetName="SwitchKnobOff"
-                                            Storyboard.TargetProperty="Height">
-                                            <SplineDoubleKeyFrame
-                                                KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
-                                                KeyTime="{StaticResource ControlFasterAnimationDuration}"
-                                                Value="12" />
-                                        </DoubleAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
-                                <VisualState x:Name="PointerOver">
-                                    <Storyboard>
-                                        <ColorAnimationUsingKeyFrames Storyboard.TargetName="OuterBorder" Storyboard.TargetProperty="(Shape.Stroke).(SolidColorBrush.Color)">
-                                            <LinearColorKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="{ThemeResource ToggleSwitchStrokeOffPointerOver}" />
-                                        </ColorAnimationUsingKeyFrames>
-                                        <ColorAnimationUsingKeyFrames Storyboard.TargetName="OuterBorder" Storyboard.TargetProperty="(Shape.Fill).(SolidColorBrush.Color)">
-                                            <LinearColorKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="{ThemeResource ToggleSwitchFillOffPointerOver}" />
-                                        </ColorAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOff" Storyboard.TargetProperty="Fill">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchKnobFillOffPointerOver}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOn" Storyboard.TargetProperty="Background">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchKnobFillOnPointerOver}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobBounds" Storyboard.TargetProperty="Fill">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchFillOnPointerOver}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobBounds" Storyboard.TargetProperty="Stroke">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchStrokeOnPointerOver}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ColorAnimationUsingKeyFrames Storyboard.TargetName="SwitchAreaGrid" Storyboard.TargetProperty="(Panel.Background).(SolidColorBrush.Color)">
-                                            <LinearColorKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="{ThemeResource ToggleSwitchContainerBackgroundPointerOver}" />
-                                        </ColorAnimationUsingKeyFrames>
-                                        <DoubleAnimationUsingKeyFrames
-                                            EnableDependentAnimation="True"
-                                            Storyboard.TargetName="SwitchKnobOn"
-                                            Storyboard.TargetProperty="Width">
-                                            <SplineDoubleKeyFrame
-                                                KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
-                                                KeyTime="{StaticResource ControlFasterAnimationDuration}"
-                                                Value="14" />
-                                        </DoubleAnimationUsingKeyFrames>
-                                        <DoubleAnimationUsingKeyFrames
-                                            EnableDependentAnimation="True"
-                                            Storyboard.TargetName="SwitchKnobOn"
-                                            Storyboard.TargetProperty="Height">
-                                            <SplineDoubleKeyFrame
-                                                KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
-                                                KeyTime="{StaticResource ControlFasterAnimationDuration}"
-                                                Value="14" />
-                                        </DoubleAnimationUsingKeyFrames>
-                                        <DoubleAnimationUsingKeyFrames
-                                            EnableDependentAnimation="True"
-                                            Storyboard.TargetName="SwitchKnobOff"
-                                            Storyboard.TargetProperty="Width">
-                                            <SplineDoubleKeyFrame
-                                                KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
-                                                KeyTime="{StaticResource ControlFasterAnimationDuration}"
-                                                Value="14" />
-                                        </DoubleAnimationUsingKeyFrames>
-                                        <DoubleAnimationUsingKeyFrames
-                                            EnableDependentAnimation="True"
-                                            Storyboard.TargetName="SwitchKnobOff"
-                                            Storyboard.TargetProperty="Height">
-                                            <SplineDoubleKeyFrame
-                                                KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
-                                                KeyTime="{StaticResource ControlFasterAnimationDuration}"
-                                                Value="14" />
-                                        </DoubleAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
-                                <VisualState x:Name="Pressed">
-
-                                    <VisualState.Setters>
-                                        <Setter Target="SwitchKnobOn.HorizontalAlignment" Value="Right" />
-                                        <Setter Target="SwitchKnobOn.Margin" Value="0,0,3,0" />
-                                        <Setter Target="SwitchKnobOff.HorizontalAlignment" Value="Left" />
-                                        <Setter Target="SwitchKnobOff.Margin" Value="3,0,0,0" />
-                                    </VisualState.Setters>
-
-                                    <Storyboard>
-                                        <ColorAnimationUsingKeyFrames Storyboard.TargetName="OuterBorder" Storyboard.TargetProperty="(Shape.Stroke).(SolidColorBrush.Color)">
-                                            <LinearColorKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="{ThemeResource ToggleSwitchStrokeOffPressed}" />
-                                        </ColorAnimationUsingKeyFrames>
-                                        <ColorAnimationUsingKeyFrames Storyboard.TargetName="OuterBorder" Storyboard.TargetProperty="(Shape.Fill).(SolidColorBrush.Color)">
-                                            <LinearColorKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="{ThemeResource ToggleSwitchFillOffPressed}" />
-                                        </ColorAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobBounds" Storyboard.TargetProperty="Fill">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchFillOnPressed}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobBounds" Storyboard.TargetProperty="Stroke">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchStrokeOnPressed}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOff" Storyboard.TargetProperty="Fill">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchKnobFillOffPressed}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOn" Storyboard.TargetProperty="Background">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchKnobFillOnPressed}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ColorAnimationUsingKeyFrames Storyboard.TargetName="SwitchAreaGrid" Storyboard.TargetProperty="(Panel.Background).(SolidColorBrush.Color)">
-                                            <LinearColorKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="{ThemeResource ToggleSwitchContainerBackgroundPressed}" />
-                                        </ColorAnimationUsingKeyFrames>
-                                        <DoubleAnimationUsingKeyFrames
-                                            EnableDependentAnimation="True"
-                                            Storyboard.TargetName="SwitchKnobOn"
-                                            Storyboard.TargetProperty="Width">
-                                            <SplineDoubleKeyFrame
-                                                KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
-                                                KeyTime="{StaticResource ControlFasterAnimationDuration}"
-                                                Value="17" />
-                                        </DoubleAnimationUsingKeyFrames>
-                                        <DoubleAnimationUsingKeyFrames
-                                            EnableDependentAnimation="True"
-                                            Storyboard.TargetName="SwitchKnobOn"
-                                            Storyboard.TargetProperty="Height">
-                                            <SplineDoubleKeyFrame
-                                                KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
-                                                KeyTime="{StaticResource ControlFasterAnimationDuration}"
-                                                Value="14" />
-                                        </DoubleAnimationUsingKeyFrames>
-                                        <DoubleAnimationUsingKeyFrames
-                                            EnableDependentAnimation="True"
-                                            Storyboard.TargetName="SwitchKnobOff"
-                                            Storyboard.TargetProperty="Width">
-                                            <SplineDoubleKeyFrame
-                                                KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
-                                                KeyTime="{StaticResource ControlFasterAnimationDuration}"
-                                                Value="17" />
-                                        </DoubleAnimationUsingKeyFrames>
-                                        <DoubleAnimationUsingKeyFrames
-                                            EnableDependentAnimation="True"
-                                            Storyboard.TargetName="SwitchKnobOff"
-                                            Storyboard.TargetProperty="Height">
-                                            <SplineDoubleKeyFrame
-                                                KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
-                                                KeyTime="{StaticResource ControlFasterAnimationDuration}"
-                                                Value="14" />
-                                        </DoubleAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
-                                <VisualState x:Name="Disabled">
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HeaderContentPresenter" Storyboard.TargetProperty="Foreground">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchHeaderForegroundDisabled}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="OffContentPresenter" Storyboard.TargetProperty="Foreground">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchContentForegroundDisabled}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="OnContentPresenter" Storyboard.TargetProperty="Foreground">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchContentForegroundDisabled}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ColorAnimationUsingKeyFrames Storyboard.TargetName="OuterBorder" Storyboard.TargetProperty="(Shape.Stroke).(SolidColorBrush.Color)">
-                                            <LinearColorKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="{ThemeResource ToggleSwitchStrokeOffDisabled}" />
-                                        </ColorAnimationUsingKeyFrames>
-                                        <ColorAnimationUsingKeyFrames Storyboard.TargetName="OuterBorder" Storyboard.TargetProperty="(Shape.Fill).(SolidColorBrush.Color)">
-                                            <LinearColorKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="{ThemeResource ToggleSwitchFillOffDisabled}" />
-                                        </ColorAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobBounds" Storyboard.TargetProperty="Fill">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchFillOnDisabled}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobBounds" Storyboard.TargetProperty="Stroke">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchStrokeOnDisabled}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOff" Storyboard.TargetProperty="Fill">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchKnobFillOffDisabled}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOn" Storyboard.TargetProperty="Background">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchKnobFillOnDisabled}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ColorAnimationUsingKeyFrames Storyboard.TargetName="SwitchAreaGrid" Storyboard.TargetProperty="(Panel.Background).(SolidColorBrush.Color)">
-                                            <LinearColorKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="{ThemeResource ToggleSwitchContainerBackgroundDisabled}" />
-                                        </ColorAnimationUsingKeyFrames>
-                                        <DoubleAnimationUsingKeyFrames
-                                            EnableDependentAnimation="True"
-                                            Storyboard.TargetName="SwitchKnobOn"
-                                            Storyboard.TargetProperty="Width">
-                                            <SplineDoubleKeyFrame
-                                                KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
-                                                KeyTime="{StaticResource ControlNormalAnimationDuration}"
-                                                Value="12" />
-                                        </DoubleAnimationUsingKeyFrames>
-                                        <DoubleAnimationUsingKeyFrames
-                                            EnableDependentAnimation="True"
-                                            Storyboard.TargetName="SwitchKnobOn"
-                                            Storyboard.TargetProperty="Height">
-                                            <SplineDoubleKeyFrame
-                                                KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
-                                                KeyTime="{StaticResource ControlNormalAnimationDuration}"
-                                                Value="12" />
-                                        </DoubleAnimationUsingKeyFrames>
-                                        <DoubleAnimationUsingKeyFrames
-                                            EnableDependentAnimation="True"
-                                            Storyboard.TargetName="SwitchKnobOff"
-                                            Storyboard.TargetProperty="Width">
-                                            <SplineDoubleKeyFrame
-                                                KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
-                                                KeyTime="{StaticResource ControlNormalAnimationDuration}"
-                                                Value="12" />
-                                        </DoubleAnimationUsingKeyFrames>
-                                        <DoubleAnimationUsingKeyFrames
-                                            EnableDependentAnimation="True"
-                                            Storyboard.TargetName="SwitchKnobOff"
-                                            Storyboard.TargetProperty="Height">
-                                            <SplineDoubleKeyFrame
-                                                KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
-                                                KeyTime="{StaticResource ControlNormalAnimationDuration}"
-                                                Value="12" />
-                                        </DoubleAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
-
-                            </VisualStateGroup>
-                            <VisualStateGroup x:Name="ToggleStates">
-
-                                <VisualStateGroup.Transitions>
-                                    <VisualTransition
-                                        x:Name="DraggingToOnTransition"
-                                        GeneratedDuration="0"
-                                        From="Dragging"
-                                        To="On">
-
-                                        <Storyboard>
-                                            <RepositionThemeAnimation FromHorizontalOffset="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.KnobCurrentToOnOffset}" TargetName="SwitchKnob" />
-                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobBounds" Storyboard.TargetProperty="Opacity">
-                                                <LinearDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="1" />
-                                            </DoubleAnimationUsingKeyFrames>
-                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="OuterBorder" Storyboard.TargetProperty="Opacity">
-                                                <LinearDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="0" />
-                                            </DoubleAnimationUsingKeyFrames>
-                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOn" Storyboard.TargetProperty="Opacity">
-                                                <LinearDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="1" />
-                                            </DoubleAnimationUsingKeyFrames>
-                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOff" Storyboard.TargetProperty="Opacity">
-                                                <LinearDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="0" />
-                                            </DoubleAnimationUsingKeyFrames>
-                                        </Storyboard>
-                                    </VisualTransition>
-                                    <VisualTransition
-                                        x:Name="OnToDraggingTransition"
-                                        GeneratedDuration="0"
-                                        From="On"
-                                        To="Dragging">
-                                        <Storyboard>
-                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobBounds" Storyboard.TargetProperty="Opacity">
-                                                <LinearDoubleKeyFrame KeyTime="0" Value="1" />
-                                            </DoubleAnimationUsingKeyFrames>
-                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOn" Storyboard.TargetProperty="Opacity">
-                                                <LinearDoubleKeyFrame KeyTime="0" Value="1" />
-                                            </DoubleAnimationUsingKeyFrames>
-                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOff" Storyboard.TargetProperty="Opacity">
-                                                <LinearDoubleKeyFrame KeyTime="0" Value="0" />
-                                            </DoubleAnimationUsingKeyFrames>
-                                        </Storyboard>
-                                    </VisualTransition>
-                                    <VisualTransition
-                                        x:Name="DraggingToOffTransition"
-                                        GeneratedDuration="0"
-                                        From="Dragging"
-                                        To="Off">
-
-                                        <Storyboard>
-                                            <RepositionThemeAnimation FromHorizontalOffset="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.KnobCurrentToOffOffset}" TargetName="SwitchKnob" />
-                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobBounds" Storyboard.TargetProperty="Opacity">
-                                                <LinearDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="0" />
-                                            </DoubleAnimationUsingKeyFrames>
-                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOn" Storyboard.TargetProperty="Opacity">
-                                                <LinearDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="0" />
-                                            </DoubleAnimationUsingKeyFrames>
-                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOff" Storyboard.TargetProperty="Opacity">
-                                                <LinearDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="1" />
-                                            </DoubleAnimationUsingKeyFrames>
-                                        </Storyboard>
-                                    </VisualTransition>
-                                    <VisualTransition
-                                        x:Name="OnToOffTransition"
-                                        GeneratedDuration="0"
-                                        From="On"
-                                        To="Off">
-
-                                        <Storyboard>
-                                            <RepositionThemeAnimation FromHorizontalOffset="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.KnobOnToOffOffset}" TargetName="SwitchKnob" />
-                                        </Storyboard>
-                                    </VisualTransition>
-                                    <VisualTransition
-                                        x:Name="OffToOnTransition"
-                                        GeneratedDuration="0"
-                                        From="Off"
-                                        To="On">
-
-                                        <Storyboard>
-                                            <RepositionThemeAnimation FromHorizontalOffset="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.KnobOffToOnOffset}" TargetName="SwitchKnob" />
-                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobBounds" Storyboard.TargetProperty="Opacity">
-                                                <LinearDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="1" />
-                                            </DoubleAnimationUsingKeyFrames>
-                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="OuterBorder" Storyboard.TargetProperty="Opacity">
-                                                <LinearDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="0" />
-                                            </DoubleAnimationUsingKeyFrames>
-                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOn" Storyboard.TargetProperty="Opacity">
-                                                <LinearDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="1" />
-                                            </DoubleAnimationUsingKeyFrames>
-                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOff" Storyboard.TargetProperty="Opacity">
-                                                <LinearDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="0" />
-                                            </DoubleAnimationUsingKeyFrames>
-                                        </Storyboard>
-                                    </VisualTransition>
-                                </VisualStateGroup.Transitions>
-                                <VisualState x:Name="Dragging" />
-                                <VisualState x:Name="Off" />
-                                <VisualState x:Name="On">
-                                    <Storyboard>
-                                        <DoubleAnimation
-                                            Storyboard.TargetName="KnobTranslateTransform"
-                                            Storyboard.TargetProperty="X"
-                                            To="20"
-                                            Duration="0" />
-                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobBounds" Storyboard.TargetProperty="Opacity">
-                                            <LinearDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="1" />
-                                        </DoubleAnimationUsingKeyFrames>
-                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="OuterBorder" Storyboard.TargetProperty="Opacity">
-                                            <LinearDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="0" />
-                                        </DoubleAnimationUsingKeyFrames>
-                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOn" Storyboard.TargetProperty="Opacity">
-                                            <LinearDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="1" />
-                                        </DoubleAnimationUsingKeyFrames>
-                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOff" Storyboard.TargetProperty="Opacity">
-                                            <LinearDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="0" />
-                                        </DoubleAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
-
-                            </VisualStateGroup>
-                            <VisualStateGroup x:Name="ContentStates">
-                                <VisualState x:Name="OffContent">
-
-                                    <Storyboard>
-                                        <DoubleAnimation
-                                            Storyboard.TargetName="OffContentPresenter"
-                                            Storyboard.TargetProperty="Opacity"
-                                            To="1"
-                                            Duration="0" />
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="OffContentPresenter" Storyboard.TargetProperty="IsHitTestVisible">
-                                            <DiscreteObjectKeyFrame KeyTime="0">
-                                                <DiscreteObjectKeyFrame.Value>
-                                                    <x:Boolean>True</x:Boolean>
-                                                </DiscreteObjectKeyFrame.Value>
-                                            </DiscreteObjectKeyFrame>
-                                        </ObjectAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
-                                <VisualState x:Name="OnContent">
-
-                                    <Storyboard>
-                                        <DoubleAnimation
-                                            Storyboard.TargetName="OnContentPresenter"
-                                            Storyboard.TargetProperty="Opacity"
-                                            To="1"
-                                            Duration="0" />
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="OnContentPresenter" Storyboard.TargetProperty="IsHitTestVisible">
-                                            <DiscreteObjectKeyFrame KeyTime="0">
-                                                <DiscreteObjectKeyFrame.Value>
-                                                    <x:Boolean>True</x:Boolean>
-                                                </DiscreteObjectKeyFrame.Value>
-                                            </DiscreteObjectKeyFrame>
-                                        </ObjectAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
-
-                            </VisualStateGroup>
-
-                        </VisualStateManager.VisualStateGroups>
-
-                        <ContentPresenter
-                            x:Name="HeaderContentPresenter"
-                            Grid.Row="0"
-                            Margin="{ThemeResource ToggleSwitchTopHeaderMargin}"
-                            VerticalAlignment="Top"
-                            x:DeferLoadStrategy="Lazy"
-                            AutomationProperties.AccessibilityView="Raw"
-                            Content="{TemplateBinding Header}"
-                            ContentTemplate="{TemplateBinding HeaderTemplate}"
-                            Foreground="{ThemeResource ToggleSwitchHeaderForeground}"
-                            IsHitTestVisible="False"
-                            TextWrapping="Wrap"
-                            Visibility="Collapsed" />
-                        <Grid
-                            Grid.Row="1"
-                            HorizontalAlignment="Right"
-                            VerticalAlignment="Top">
-
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="4" />
-                                <RowDefinition Height="Auto" />
-                                <RowDefinition Height="4" />
-                            </Grid.RowDefinitions>
-
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="Auto" />
-                                <ColumnDefinition Width="12" MaxWidth="12" />
-                                <ColumnDefinition Width="Auto" />
-                            </Grid.ColumnDefinitions>
-                            <Grid
-                                x:Name="SwitchAreaGrid"
-                                Grid.RowSpan="3"
-                                Grid.ColumnSpan="3"
-                                Margin="0,5"
-                                Background="{ThemeResource ToggleSwitchContainerBackground}"
-                                Control.IsTemplateFocusTarget="True"
-                                CornerRadius="{TemplateBinding CornerRadius}" />
-                            <ContentPresenter
-                                x:Name="OffContentPresenter"
-                                Grid.RowSpan="3"
-                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                AutomationProperties.AccessibilityView="Raw"
-                                Content="{TemplateBinding OffContent}"
-                                ContentTemplate="{TemplateBinding OffContentTemplate}"
-                                FontSize="12"
-                                Foreground="{TemplateBinding Foreground}"
-                                IsHitTestVisible="False"
-                                Opacity="0" />
-                            <ContentPresenter
-                                x:Name="OnContentPresenter"
-                                Grid.RowSpan="3"
-                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                AutomationProperties.AccessibilityView="Raw"
-                                Content="{TemplateBinding OnContent}"
-                                ContentTemplate="{TemplateBinding OnContentTemplate}"
-                                FontSize="12"
-                                Foreground="{TemplateBinding Foreground}"
-                                IsHitTestVisible="False"
-                                Opacity="0" />
-                            <Rectangle
-                                x:Name="OuterBorder"
-                                Grid.Row="1"
-                                Grid.Column="2"
-                                Width="40"
-                                Height="20"
-                                Fill="{ThemeResource ToggleSwitchFillOff}"
-                                RadiusX="10"
-                                RadiusY="10"
-                                Stroke="{ThemeResource ToggleSwitchStrokeOff}"
-                                StrokeThickness="{ThemeResource ToggleSwitchOuterBorderStrokeThickness}" />
-                            <Rectangle
-                                x:Name="SwitchKnobBounds"
-                                Grid.Row="1"
-                                Grid.Column="2"
-                                Width="40"
-                                Height="20"
-                                Fill="{ThemeResource ToggleSwitchFillOn}"
-                                Opacity="0"
-                                RadiusX="10"
-                                RadiusY="10"
-                                Stroke="{ThemeResource ToggleSwitchStrokeOn}"
-                                StrokeThickness="{ThemeResource ToggleSwitchOnStrokeThickness}" />
-                            <Grid
-                                x:Name="SwitchKnob"
-                                Grid.Row="1"
-                                Grid.Column="2"
-                                Width="20"
-                                Height="20"
-                                HorizontalAlignment="Left">
-                                <Border
-                                    x:Name="SwitchKnobOn"
-                                    Width="12"
-                                    Height="12"
-                                    Margin="0,0,3,0"
-                                    HorizontalAlignment="Right"
-                                    Background="{ThemeResource ToggleSwitchKnobFillOn}"
-                                    BackgroundSizing="OuterBorderEdge"
-                                    BorderBrush="{ThemeResource ToggleSwitchKnobStrokeOn}"
-                                    CornerRadius="7"
-                                    Opacity="0"
-                                    RenderTransformOrigin="0.5, 0.5">
-                                    <Border.RenderTransform>
-                                        <CompositeTransform />
-                                    </Border.RenderTransform>
-                                </Border>
-                                <Rectangle
-                                    x:Name="SwitchKnobOff"
-                                    Width="12"
-                                    Height="12"
-                                    Margin="3,0,0,0"
-                                    HorizontalAlignment="Left"
-                                    Fill="{ThemeResource ToggleSwitchKnobFillOff}"
-                                    RadiusX="7"
-                                    RadiusY="7"
-                                    RenderTransformOrigin="0.5, 0.5">
-                                    <Rectangle.RenderTransform>
-                                        <CompositeTransform />
-                                    </Rectangle.RenderTransform>
-                                </Rectangle>
-                                <Grid.RenderTransform>
-                                    <TranslateTransform x:Name="KnobTranslateTransform" />
-                                </Grid.RenderTransform>
-                            </Grid>
-                            <Thumb
-                                x:Name="SwitchThumb"
-                                Grid.RowSpan="3"
-                                Grid.ColumnSpan="3"
-                                AutomationProperties.AccessibilityView="Raw">
-                                <Thumb.Template>
-                                    <ControlTemplate TargetType="Thumb">
-                                        <Rectangle Fill="Transparent" />
-                                    </ControlTemplate>
-                                </Thumb.Template>
-                            </Thumb>
-
-                        </Grid>
-
-                    </Grid>
+    <Style x:Key="TopNavigationViewStyle" TargetType="muxc:NavigationView">
+        <Setter Property="IsBackButtonVisible" Value="Collapsed" />
+        <Setter Property="IsPaneToggleButtonVisible" Value="False" />
+        <Setter Property="IsSettingsVisible" Value="False" />
+        <Setter Property="PaneDisplayMode" Value="Top" />
+    </Style>
 
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
+    <Style
+        x:Key="XboxSideNavigationViewStyle"
+        BasedOn="{StaticResource TopNavigationViewStyle}"
+        TargetType="muxc:NavigationView">
+        <Setter Property="PaneDisplayMode" Value="Left" />
+        <Setter Property="OpenPaneLength" Value="200" />
+        <Setter Property="Margin" Value="24,0,0,0" />
     </Style>
 
     <Style
@@ -1209,148 +601,6 @@
         </Setter>
     </Style>
 
-    <Style x:Key="NoAnimationExpanderStyle" TargetType="muxc:Expander">
-        <Setter Property="IsTabStop" Value="False" />
-        <Setter Property="Background" Value="{ThemeResource ExpanderContentBackground}" />
-        <Setter Property="MinWidth" Value="{ThemeResource FlyoutThemeMinWidth}" />
-        <Setter Property="MinHeight" Value="{StaticResource ExpanderMinHeight}" />
-        <Setter Property="BorderThickness" Value="{ThemeResource ExpanderContentDownBorderThickness}" />
-        <Setter Property="BorderBrush" Value="{ThemeResource ExpanderContentBorderBrush}" />
-        <Setter Property="Padding" Value="{StaticResource ExpanderContentPadding}" />
-        <Setter Property="HorizontalAlignment" Value="Left" />
-        <Setter Property="VerticalAlignment" Value="Center" />
-        <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="muxc:Expander">
-                    <Grid MinWidth="{TemplateBinding MinWidth}" MaxWidth="{TemplateBinding MaxWidth}">
-
-                        <Grid.RowDefinitions>
-                            <RowDefinition x:Name="Row0" Height="Auto" />
-                            <RowDefinition x:Name="Row1" Height="*" />
-                        </Grid.RowDefinitions>
-                        <VisualStateManager.VisualStateGroups>
-                            <VisualStateGroup x:Name="ExpandStates">
-                                <VisualState x:Name="ExpandUp">
-                                    <VisualState.Setters>
-                                        <Setter Target="ExpanderHeader.CornerRadius" Value="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BottomCornerRadiusFilterConverter}}" />
-                                    </VisualState.Setters>
-                                    <VisualState.Storyboard>
-                                        <Storyboard>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ExpanderContent" Storyboard.TargetProperty="Visibility">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="Visible" />
-                                            </ObjectAnimationUsingKeyFrames>
-                                            <!--<DoubleAnimationUsingKeyFrames Storyboard.TargetName="ExpanderContent" Storyboard.TargetProperty="(UIElement.RenderTransform).(CompositeTransform.TranslateY)">
-                                                <DiscreteDoubleKeyFrame KeyTime="0" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ContentHeight}" />
-                                            </DoubleAnimationUsingKeyFrames>-->
-                                        </Storyboard>
-                                    </VisualState.Storyboard>
-                                </VisualState>
-                                <VisualState x:Name="CollapseDown">
-                                    <VisualState.Storyboard>
-                                        <Storyboard>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ExpanderContent" Storyboard.TargetProperty="Visibility">
-                                                <DiscreteObjectKeyFrame KeyTime="0:0:0.2" Value="Collapsed" />
-                                            </ObjectAnimationUsingKeyFrames>
-                                            <!--<DoubleAnimationUsingKeyFrames Storyboard.TargetName="ExpanderContent" Storyboard.TargetProperty="(UIElement.RenderTransform).(CompositeTransform.TranslateY)">
-                                                <DiscreteDoubleKeyFrame KeyTime="0" Value="0" />
-                                            </DoubleAnimationUsingKeyFrames>-->
-                                        </Storyboard>
-                                    </VisualState.Storyboard>
-                                </VisualState>
-                                <VisualState x:Name="ExpandDown">
-                                    <VisualState.Setters>
-                                        <Setter Target="ExpanderHeader.CornerRadius" Value="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource TopCornerRadiusFilterConverter}}" />
-                                    </VisualState.Setters>
-                                    <VisualState.Storyboard>
-                                        <Storyboard>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ExpanderContent" Storyboard.TargetProperty="Visibility">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="Visible" />
-                                            </ObjectAnimationUsingKeyFrames>
-                                            <!--<DoubleAnimationUsingKeyFrames Storyboard.TargetName="ExpanderContent" Storyboard.TargetProperty="(UIElement.RenderTransform).(CompositeTransform.TranslateY)">
-                                                <DiscreteDoubleKeyFrame KeyTime="0" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.NegativeContentHeight}" />
-                                            </DoubleAnimationUsingKeyFrames>-->
-                                        </Storyboard>
-                                    </VisualState.Storyboard>
-                                </VisualState>
-                                <VisualState x:Name="CollapseUp">
-                                    <VisualState.Storyboard>
-                                        <Storyboard>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ExpanderContent" Storyboard.TargetProperty="Visibility">
-                                                <DiscreteObjectKeyFrame KeyTime="0:0:0.167" Value="Collapsed" />
-                                            </ObjectAnimationUsingKeyFrames>
-                                            <!--<DoubleAnimationUsingKeyFrames Storyboard.TargetName="ExpanderContent" Storyboard.TargetProperty="(UIElement.RenderTransform).(CompositeTransform.TranslateY)">
-                                                <DiscreteDoubleKeyFrame KeyTime="0" Value="0" />
-                                            </DoubleAnimationUsingKeyFrames>-->
-                                        </Storyboard>
-                                    </VisualState.Storyboard>
-                                </VisualState>
-                            </VisualStateGroup>
-                            <VisualStateGroup x:Name="ExpandDirectionStates">
-                                <VisualState x:Name="Down" />
-                                <VisualState x:Name="Up">
-                                    <VisualState.Setters>
-                                        <Setter Target="ExpanderHeader.Style" Value="{StaticResource ExpanderHeaderUpStyle}" />
-                                        <Setter Target="ExpanderContent.BorderThickness" Value="{StaticResource ExpanderContentUpBorderThickness}" />
-                                        <Setter Target="ExpanderContent.CornerRadius" Value="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource TopCornerRadiusFilterConverter}}" />
-                                        <Setter Target="ExpanderHeader.(Grid.Row)" Value="1" />
-                                        <Setter Target="ExpanderContentClip.(Grid.Row)" Value="0" />
-                                        <Setter Target="Row0.Height" Value="*" />
-                                        <Setter Target="Row1.Height" Value="Auto" />
-                                    </VisualState.Setters>
-                                </VisualState>
-                            </VisualStateGroup>
-                        </VisualStateManager.VisualStateGroups>
-                        <ToggleButton
-                            x:Name="ExpanderHeader"
-                            AutomationProperties.AutomationId="ExpanderToggleButton"
-                            Style="{StaticResource ExpanderHeaderDownStyle}"
-                            MinHeight="{TemplateBinding MinHeight}"
-                            Padding="{StaticResource ExpanderHeaderPadding}"
-                            HorizontalAlignment="Stretch"
-                            HorizontalContentAlignment="{StaticResource ExpanderHeaderHorizontalContentAlignment}"
-                            VerticalContentAlignment="{StaticResource ExpanderHeaderVerticalContentAlignment}"
-                            Background="{ThemeResource ExpanderHeaderBackground}"
-                            BackgroundSizing="{TemplateBinding BackgroundSizing}"
-                            BorderBrush="{ThemeResource ExpanderHeaderBorderBrush}"
-                            BorderThickness="{ThemeResource ExpanderHeaderBorderThickness}"
-                            Content="{TemplateBinding Header}"
-                            ContentTemplate="{TemplateBinding HeaderTemplate}"
-                            ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}"
-                            CornerRadius="{TemplateBinding CornerRadius}"
-                            IsChecked="{Binding Path=IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
-                            IsEnabled="{TemplateBinding IsEnabled}" />
-                        <!-- The clip is a composition clip applied in code -->
-                        <Border x:Name="ExpanderContentClip" Grid.Row="1">
-                            <Border
-                                x:Name="ExpanderContent"
-                                MinHeight="{TemplateBinding MinHeight}"
-                                Padding="{TemplateBinding Padding}"
-                                HorizontalAlignment="Stretch"
-                                VerticalAlignment="Stretch"
-                                Background="{TemplateBinding Background}"
-                                BackgroundSizing="{TemplateBinding BackgroundSizing}"
-                                BorderBrush="{TemplateBinding BorderBrush}"
-                                BorderThickness="{StaticResource ExpanderContentDownBorderThickness}"
-                                CornerRadius="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BottomCornerRadiusFilterConverter}}"
-                                Visibility="Collapsed">
-                                <ContentPresenter
-                                    HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                    VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                    Content="{TemplateBinding Content}"
-                                    ContentTemplate="{TemplateBinding ContentTemplate}"
-                                    ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
-                                <Border.RenderTransform>
-                                    <CompositeTransform />
-                                </Border.RenderTransform>
-                            </Border>
-                        </Border>
-                    </Grid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
     <Style
         x:Key="TitleBarButtonStyle"
         BasedOn="{StaticResource DefaultButtonStyle}"
diff --git a/src/Lib/DI.App/DI.App.csproj b/src/Lib/DI.App/DI.App.csproj
index 0a59ac940..cda7af04e 100644
--- a/src/Lib/DI.App/DI.App.csproj
+++ b/src/Lib/DI.App/DI.App.csproj
@@ -129,7 +129,7 @@
       <Version>6.2.14</Version>
     </PackageReference>
     <PackageReference Include="NLog">
-      <Version>5.0.5</Version>
+      <Version>5.1.1</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Lib/DI.App/DIFactory.cs b/src/Lib/DI.App/DIFactory.cs
index ef4dd003f..07a7e5002 100644
--- a/src/Lib/DI.App/DIFactory.cs
+++ b/src/Lib/DI.App/DIFactory.cs
@@ -49,9 +49,7 @@ public static void RegisterAppRequiredServices()
             var logFolderName = AppConstants.Location.LoggerFolder;
             var fullPath = $"{rootFolder.Path}\\{logFolderName}\\";
             NLog.GlobalDiagnosticsContext.Set("LogPath", fullPath);
-            var logger = NLog.LogManager.GetLogger("Richasy.Bili");
             Container.Locator.Instance
-                .RegisterConstant(logger)
                 .RegisterSingleton<IResourceToolkit, ResourceToolkit>()
                 .RegisterSingleton<INumberToolkit, NumberToolkit>()
                 .RegisterSingleton<ISettingsToolkit, SettingsToolkit>()
diff --git a/src/Lib/DI.Container/DI.Container.csproj b/src/Lib/DI.Container/DI.Container.csproj
index ef2d657d7..6657d3a46 100644
--- a/src/Lib/DI.Container/DI.Container.csproj
+++ b/src/Lib/DI.Container/DI.Container.csproj
@@ -6,8 +6,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Autofac" Version="6.4.0" />
-    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.0.0" />
+    <PackageReference Include="Autofac" Version="6.5.0" />
+    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.1.0" />
+    <PackageReference Include="NLog" Version="5.1.1" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Lib/DI.Container/Locator.cs b/src/Lib/DI.Container/Locator.cs
index 96856ce8e..de2f84193 100644
--- a/src/Lib/DI.Container/Locator.cs
+++ b/src/Lib/DI.Container/Locator.cs
@@ -2,6 +2,7 @@
 
 using System;
 using Autofac;
+using NLog;
 
 namespace Bili.DI.Container
 {
@@ -76,5 +77,15 @@ public void Build()
         /// <returns>注册的服务.</returns>
         public T GetService<T>()
             => _container.Resolve<T>();
+
+        /// <summary>
+        /// 获取日志记录器.
+        /// </summary>
+        /// <returns><see cref="ILogger"/>.</returns>
+        public ILogger GetLogger()
+        {
+            var logger = NLog.LogManager.GetLogger("Richasy.Bili");
+            return logger;
+        }
     }
 }
diff --git a/src/Lib/FrostMaster.Uwp/FrostMaster.Uwp.csproj b/src/Lib/FrostMaster.Uwp/FrostMaster.Uwp.csproj
index ece3c8965..f501b905f 100644
--- a/src/Lib/FrostMaster.Uwp/FrostMaster.Uwp.csproj
+++ b/src/Lib/FrostMaster.Uwp/FrostMaster.Uwp.csproj
@@ -135,7 +135,7 @@
       <Version>6.2.14</Version>
     </PackageReference>
     <PackageReference Include="Newtonsoft.Json">
-      <Version>13.0.1</Version>
+      <Version>13.0.2</Version>
     </PackageReference>
     <PackageReference Include="Win2D.uwp">
       <Version>1.26.0</Version>
diff --git a/src/Lib/Lib.Implementation/AccountProvider/AccountProvider.cs b/src/Lib/Lib.Implementation/AccountProvider/AccountProvider.cs
index a12e9e696..1a36f530d 100644
--- a/src/Lib/Lib.Implementation/AccountProvider/AccountProvider.cs
+++ b/src/Lib/Lib.Implementation/AccountProvider/AccountProvider.cs
@@ -209,7 +209,7 @@ public async Task<VideoSet> GetViewLaterListAsync()
                 { Query.PageNumber, _viewLaterPageNumber.ToString() },
                 { Query.PageSizeSlim, "40" },
             };
-            var request = await _httpProvider.GetRequestMessageAsync(HttpMethod.Get, Account.ViewLaterList, queryParameters, needToken: true);
+            var request = await _httpProvider.GetRequestMessageAsync(HttpMethod.Get, Account.ViewLaterList, queryParameters, Models.Enums.RequestClientType.IOS, needToken: true);
             var response = await _httpProvider.SendAsync(request);
             var result = await _httpProvider.ParseAsync<ServerResponse<ViewLaterResponse>>(response);
             _viewLaterPageNumber++;
@@ -219,7 +219,7 @@ public async Task<VideoSet> GetViewLaterListAsync()
         /// <inheritdoc/>
         public async Task<bool> ClearViewLaterAsync()
         {
-            var request = await _httpProvider.GetRequestMessageAsync(HttpMethod.Post, Account.ViewLaterClear, needToken: true);
+            var request = await _httpProvider.GetRequestMessageAsync(HttpMethod.Post, Account.ViewLaterClear, type: Models.Enums.RequestClientType.IOS, needToken: true);
             var response = await _httpProvider.SendAsync(request);
             var result = await _httpProvider.ParseAsync<ServerResponse>(response);
             return result.IsSuccess();
@@ -232,7 +232,7 @@ public async Task<bool> AddVideoToViewLaterAsync(string videoId)
             {
                 { Query.Aid, videoId },
             };
-            var request = await _httpProvider.GetRequestMessageAsync(HttpMethod.Post, Account.ViewLaterAdd, queryParameters, needToken: true);
+            var request = await _httpProvider.GetRequestMessageAsync(HttpMethod.Post, Account.ViewLaterAdd, queryParameters, Models.Enums.RequestClientType.IOS, needToken: true);
             var response = await _httpProvider.SendAsync(request);
             var result = await _httpProvider.ParseAsync<ServerResponse>(response);
             return result.IsSuccess();
@@ -246,7 +246,7 @@ public async Task<bool> RemoveVideoFromViewLaterAsync(params string[] videoIds)
             {
                 { Query.Aid, ids },
             };
-            var request = await _httpProvider.GetRequestMessageAsync(HttpMethod.Post, Account.ViewLaterDelete, queryParameters, needToken: true);
+            var request = await _httpProvider.GetRequestMessageAsync(HttpMethod.Post, Account.ViewLaterDelete, queryParameters, Models.Enums.RequestClientType.IOS, needToken: true);
             var response = await _httpProvider.SendAsync(request);
             var result = await _httpProvider.ParseAsync<ServerResponse>(response);
             return result.IsSuccess();
diff --git a/src/Lib/Lib.Implementation/FavoriteProvider/FavoriteProvider.cs b/src/Lib/Lib.Implementation/FavoriteProvider/FavoriteProvider.cs
index 00b9d7c3d..af599145a 100644
--- a/src/Lib/Lib.Implementation/FavoriteProvider/FavoriteProvider.cs
+++ b/src/Lib/Lib.Implementation/FavoriteProvider/FavoriteProvider.cs
@@ -86,7 +86,7 @@ public async Task<VideoFavoriteFolderDetail> GetVideoFavoriteFolderDetailAsync(s
                 { Query.PageNumber, _videoFolderDetailPageNumber.ToString() },
             };
 
-            var request = await _httpProvider.GetRequestMessageAsync(HttpMethod.Get, Account.VideoFavoriteDelta, queryParameters, needToken: true);
+            var request = await _httpProvider.GetRequestMessageAsync(HttpMethod.Get, Account.VideoFavoriteDelta, queryParameters, Models.Enums.RequestClientType.IOS, needToken: true);
             var response = await _httpProvider.SendAsync(request);
             var result = await _httpProvider.ParseAsync<ServerResponse<VideoFavoriteListResponse>>(response);
             _videoFolderDetailPageNumber++;
diff --git a/src/Lib/Lib.Implementation/HomeProvider/HomeProvider.cs b/src/Lib/Lib.Implementation/HomeProvider/HomeProvider.cs
index eba643869..181c1404d 100644
--- a/src/Lib/Lib.Implementation/HomeProvider/HomeProvider.cs
+++ b/src/Lib/Lib.Implementation/HomeProvider/HomeProvider.cs
@@ -133,7 +133,7 @@ public async Task<IEnumerable<VideoInformation>> RequestPopularVideosAsync()
                 return localCache;
             }
 
-            var request = await _httpProvider.GetRequestMessageAsync(HttpMethod.Get, ApiConstants.Partition.PartitionIndex);
+            var request = await _httpProvider.GetRequestMessageAsync(HttpMethod.Get, ApiConstants.Partition.PartitionIndex, type: RequestClientType.IOS);
             var response = await _httpProvider.SendAsync(request);
             var data = await _httpProvider.ParseAsync<Models.BiliBili.ServerResponse<List<Models.BiliBili.Partition>>>(response);
 
@@ -204,7 +204,7 @@ public async Task<VideoPartitionView> GetVideoSubPartitionDataAsync(
                 queryParameters.Add(Query.PageSizeSlim, "30");
             }
 
-            var request = await _httpProvider.GetRequestMessageAsync(HttpMethod.Get, requestUrl, queryParameters);
+            var request = await _httpProvider.GetRequestMessageAsync(HttpMethod.Get, requestUrl, queryParameters, RequestClientType.IOS);
             var response = await _httpProvider.SendAsync(request);
             if (isOffset)
             {
diff --git a/src/Lib/Lib.Implementation/Lib.Implementation.csproj b/src/Lib/Lib.Implementation/Lib.Implementation.csproj
index b29f22d8b..b68ed2d48 100644
--- a/src/Lib/Lib.Implementation/Lib.Implementation.csproj
+++ b/src/Lib/Lib.Implementation/Lib.Implementation.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Google.Protobuf" Version="3.21.9" />
+    <PackageReference Include="Google.Protobuf" Version="3.21.12" />
     <PackageReference Include="HtmlAgilityPack" Version="1.11.46" />
     <PackageReference Include="Websocket.Client" Version="4.4.43" />
   </ItemGroup>
diff --git a/src/Lib/Lib.Implementation/PlayerProvider/PlayerProvider.Extension.cs b/src/Lib/Lib.Implementation/PlayerProvider/PlayerProvider.Extension.cs
index 887bfbd6b..7f06a9f77 100644
--- a/src/Lib/Lib.Implementation/PlayerProvider/PlayerProvider.Extension.cs
+++ b/src/Lib/Lib.Implementation/PlayerProvider/PlayerProvider.Extension.cs
@@ -2,6 +2,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
@@ -118,6 +119,7 @@ private async Task<MediaInformation> InternalGetDashAsync(string cid, string aid
             var data = await _httpProvider.ParseAsync<ServerResponse<PlayerInformation>, ServerResponse2<PlayerInformation>>(response, (str) =>
             {
                 var jobj = JObject.Parse(str);
+                Debug.WriteLine(jobj.ToString());
                 return jobj.ContainsKey("data");
             });
 
diff --git a/src/Models/Models.App/Models.App.csproj b/src/Models/Models.App/Models.App.csproj
index 3cf235df3..abcef5524 100644
--- a/src/Models/Models.App/Models.App.csproj
+++ b/src/Models/Models.App/Models.App.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Models/Models.BiliBili/Models.BiliBili.csproj b/src/Models/Models.BiliBili/Models.BiliBili.csproj
index 57ace61ad..52d5adf64 100644
--- a/src/Models/Models.BiliBili/Models.BiliBili.csproj
+++ b/src/Models/Models.BiliBili/Models.BiliBili.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Models/Models.BiliBili/Player/PlayerInformation.cs b/src/Models/Models.BiliBili/Player/PlayerInformation.cs
index ca3248e81..dad4e43cc 100644
--- a/src/Models/Models.BiliBili/Player/PlayerInformation.cs
+++ b/src/Models/Models.BiliBili/Player/PlayerInformation.cs
@@ -112,13 +112,13 @@ public class DashItem
         /// <summary>
         /// 基链接.
         /// </summary>
-        [JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "baseUrl", Required = Required.Default)]
+        [JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "base_url", Required = Required.Default)]
         public string BaseUrl { get; set; }
 
         /// <summary>
         /// 备份链接.
         /// </summary>
-        [JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "backupUrl", Required = Required.Default)]
+        [JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "backup_url", Required = Required.Default)]
         public List<string> BackupUrl { get; set; }
 
         /// <summary>
@@ -130,7 +130,7 @@ public class DashItem
         /// <summary>
         /// 媒体格式.
         /// </summary>
-        [JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "mimeType", Required = Required.Default)]
+        [JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "mime_type", Required = Required.Default)]
         public string MimeType { get; set; }
 
         /// <summary>
@@ -154,7 +154,7 @@ public class DashItem
         /// <summary>
         /// 帧率.
         /// </summary>
-        [JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "frameRate", Required = Required.Default)]
+        [JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "frame_rate", Required = Required.Default)]
         public string FrameRate { get; set; }
 
         /// <summary>
@@ -166,7 +166,7 @@ public class DashItem
         /// <summary>
         /// 分段的基础信息.
         /// </summary>
-        [JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "SegmentBase", Required = Required.Default)]
+        [JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "segment_base", Required = Required.Default)]
         public SegmentBase SegmentBase { get; set; }
 
         /// <summary>
@@ -185,13 +185,13 @@ public class SegmentBase
         /// <summary>
         /// 起始位置.
         /// </summary>
-        [JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "Initialization", Required = Required.Default)]
+        [JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "initialization", Required = Required.Default)]
         public string Initialization { get; set; }
 
         /// <summary>
         /// 索引范围.
         /// </summary>
-        [JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "indexRange", Required = Required.Default)]
+        [JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "index_range", Required = Required.Default)]
         public string IndexRange { get; set; }
     }
 
diff --git a/src/Models/Models.gRPC/Models.gRPC.csproj b/src/Models/Models.gRPC/Models.gRPC.csproj
index aacc8d8dd..8f422095d 100644
--- a/src/Models/Models.gRPC/Models.gRPC.csproj
+++ b/src/Models/Models.gRPC/Models.gRPC.csproj
@@ -12,9 +12,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Google.Protobuf" Version="3.21.9" />
-    <PackageReference Include="Grpc.Net.Client" Version="2.49.0" />
-    <PackageReference Include="Grpc.Tools" Version="2.50.0">
+    <PackageReference Include="Google.Protobuf" Version="3.21.12" />
+    <PackageReference Include="Grpc.Net.Client" Version="2.51.0" />
+    <PackageReference Include="Grpc.Tools" Version="2.51.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/src/Tasks/Tasks.csproj b/src/Tasks/Tasks.csproj
index ad68e00b8..9ce03b624 100644
--- a/src/Tasks/Tasks.csproj
+++ b/src/Tasks/Tasks.csproj
@@ -126,7 +126,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Google.Protobuf">
-      <Version>3.21.9</Version>
+      <Version>3.21.12</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
       <Version>6.2.14</Version>
diff --git a/src/Utilities/Toolkit/Toolkit.Uwp/Toolkit.Uwp.csproj b/src/Utilities/Toolkit/Toolkit.Uwp/Toolkit.Uwp.csproj
index 8f4fd7eee..5f09cd7e8 100644
--- a/src/Utilities/Toolkit/Toolkit.Uwp/Toolkit.Uwp.csproj
+++ b/src/Utilities/Toolkit/Toolkit.Uwp/Toolkit.Uwp.csproj
@@ -29,7 +29,7 @@
       <Version>6.2.14</Version>
     </PackageReference>
     <PackageReference Include="Newtonsoft.Json">
-      <Version>13.0.1</Version>
+      <Version>13.0.2</Version>
     </PackageReference>
     <PackageReference Include="ToolGood.Words">
       <Version>3.0.3.1</Version>
diff --git a/src/ViewModels/ViewModels.Interfaces/ViewModels.Interfaces.csproj b/src/ViewModels/ViewModels.Interfaces/ViewModels.Interfaces.csproj
index f60cc9785..4be3f807e 100644
--- a/src/ViewModels/ViewModels.Interfaces/ViewModels.Interfaces.csproj
+++ b/src/ViewModels/ViewModels.Interfaces/ViewModels.Interfaces.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.0.0" />
+    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.1.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/ViewModels/ViewModels.Uwp/Base/ViewModelBase.cs b/src/ViewModels/ViewModels.Uwp/Base/ViewModelBase.cs
index 08db79b0f..53919e1cf 100644
--- a/src/ViewModels/ViewModels.Uwp/Base/ViewModelBase.cs
+++ b/src/ViewModels/ViewModels.Uwp/Base/ViewModelBase.cs
@@ -37,7 +37,7 @@ protected string GetErrorMessage(Exception exception)
         protected void LogException(Exception exception)
         {
             Debug.WriteLine(exception.StackTrace);
-            var logger = Locator.Instance.GetService<NLog.ILogger>();
+            var logger = Locator.Instance.GetLogger();
             logger.Error(exception);
         }
 
diff --git a/src/ViewModels/ViewModels.Uwp/ViewModels.Uwp.csproj b/src/ViewModels/ViewModels.Uwp/ViewModels.Uwp.csproj
index 198520f94..64c882773 100644
--- a/src/ViewModels/ViewModels.Uwp/ViewModels.Uwp.csproj
+++ b/src/ViewModels/ViewModels.Uwp/ViewModels.Uwp.csproj
@@ -222,7 +222,7 @@
       <Version>7.1.3</Version>
     </PackageReference>
     <PackageReference Include="NLog">
-      <Version>5.0.5</Version>
+      <Version>5.1.1</Version>
     </PackageReference>
     <PackageReference Include="QueryString.NET">
       <Version>1.0.0</Version>