diff --git a/src/Snap.Hutao/Snap.Hutao/App.xaml b/src/Snap.Hutao/Snap.Hutao/App.xaml
index 3d8f03c0..78b37f1d 100644
--- a/src/Snap.Hutao/Snap.Hutao/App.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/App.xaml
@@ -5,15 +5,19 @@
     xmlns:cwcont="using:CommunityToolkit.WinUI.Controls"
     xmlns:cwconv="using:CommunityToolkit.WinUI.Converters"
     xmlns:cwm="using:CommunityToolkit.WinUI.Media"
-    xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
     xmlns:shci="using:Snap.Hutao.Control.Image"
     xmlns:shmmc="using:Snap.Hutao.Model.Metadata.Converter"
     xmlns:shvc="using:Snap.Hutao.View.Converter">
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <muxc:XamlControlsResources/>
+                <XamlControlsResources/>
                 <ResourceDictionary Source="Control/Theme/FontStyle.xaml"/>
+                <ResourceDictionary Source="Control/Theme/InfoBarOverride.xaml"/>
+                <ResourceDictionary Source="Control/Theme/PageOverride.xaml"/>
+                <ResourceDictionary Source="Control/Theme/PivotOverride.xaml"/>
+                <ResourceDictionary Source="Control/Theme/SettingsStyle.xaml"/>
+                <ResourceDictionary Source="Control/Theme/WindowOverride.xaml"/>
                 <ResourceDictionary Source="Control/Loading.xaml"/>
             </ResourceDictionary.MergedDictionaries>
 
@@ -30,20 +34,9 @@
                 </ResourceDictionary>
             </ResourceDictionary.ThemeDictionaries>
 
-            <!--  Modify Window title bar color  -->
-            <StaticResource x:Key="WindowCaptionBackground" ResourceKey="ControlFillColorTransparentBrush"/>
-            <StaticResource x:Key="WindowCaptionBackgroundDisabled" ResourceKey="ControlFillColorTransparentBrush"/>
-            <!--  Page Transparent Background  -->
-            <StaticResource x:Key="ApplicationPageBackgroundThemeBrush" ResourceKey="ControlFillColorTransparentBrush"/>
-            <!--  InfoBar Resource  -->
-            <Thickness x:Key="InfoBarIconMargin">19,16,19,16</Thickness>
-            <Thickness x:Key="InfoBarContentRootPadding">0,0,0,0</Thickness>
-            <x:Double x:Key="InfoBarIconFontSize">20</x:Double>
-            <!--  Pivot Resource  -->
-            <x:Double x:Key="PivotHeaderItemFontSize">16</x:Double>
-            <Thickness x:Key="PivotHeaderItemMargin">16,0,0,0</Thickness>
-            <Thickness x:Key="PivotItemMargin">0</Thickness>
             <!--  CornerRadius  -->
+            <CornerRadius x:Key="ControlCornerRadiusTop">4,4,0,0</CornerRadius>
+            <CornerRadius x:Key="ControlCornerRadiusBottom">0,0,4,4</CornerRadius>
             <CornerRadius x:Key="CompatCornerRadius">6</CornerRadius>
             <CornerRadius x:Key="CompatCornerRadiusTop">6,6,0,0</CornerRadius>
             <CornerRadius x:Key="CompatCornerRadiusRight">0,6,6,0</CornerRadius>
@@ -59,8 +52,6 @@
             <x:Double x:Key="LargeAppBarButtonWidth">100</x:Double>
             <!--  ProgressBar  -->
             <x:Double x:Key="LargeBackgroundProgressBarOpacity">0.2</x:Double>
-
-            <ThemeShadow x:Key="CompatShadow"/>
             <!--  Brushes  -->
             <SolidColorBrush x:Key="AvatarPropertyAddValueBrush" Color="{ThemeResource AvatarPropertyAddValueColor}"/>
             <SolidColorBrush x:Key="BlueBrush" Color="#FF5180CB"/>
@@ -68,25 +59,7 @@
             <SolidColorBrush x:Key="OrangeBrush" Color="#FFBC6932"/>
             <SolidColorBrush x:Key="GuaranteePullBrush" Color="#FF0063FF"/>
             <SolidColorBrush x:Key="UpPullBrush" Color="#FFFFA400"/>
-            <!--  Settings  -->
-            <x:Double x:Key="SettingsCardSpacing">3</x:Double>
-            <x:Double x:Key="SettingsCardMinHeight">0</x:Double>
-            <x:Double x:Key="SettingsCardWrapThreshold">0</x:Double>
-            <x:Double x:Key="SettingsCardWrapNoIconThreshold">0</x:Double>
-            <Style
-                x:Key="SettingsSectionHeaderTextBlockStyle"
-                BasedOn="{StaticResource BodyStrongTextBlockStyle}"
-                TargetType="TextBlock">
-                <Style.Setters>
-                    <Setter Property="Margin" Value="1,29,0,5"/>
-                </Style.Setters>
-            </Style>
-            <Style
-                x:Key="SettingsContentComboBoxStyle"
-                BasedOn="{StaticResource DefaultComboBoxStyle}"
-                TargetType="ComboBox">
-                <Setter Property="MinWidth" Value="120"/>
-            </Style>
+
             <!--  Uris  -->
             <x:String x:Key="DocumentLink_MhyAccountSwitch">https://hut.ao/features/mhy-account-switch.html</x:String>
             <x:String x:Key="DocumentLink_BugReport">https://hut.ao/statements/bug-report.html</x:String>
diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Panel/AspectRatio.cs b/src/Snap.Hutao/Snap.Hutao/Control/Panel/AspectRatio.cs
deleted file mode 100644
index 4caf15ad..00000000
--- a/src/Snap.Hutao/Snap.Hutao/Control/Panel/AspectRatio.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using Windows.Foundation;
-
-namespace Snap.Hutao.Control.Panel;
-
-/// <summary>
-/// 纵横比控件
-/// </summary>
-[HighQuality]
-[DependencyProperty("TargetWidth", typeof(double), 1.0D)]
-[DependencyProperty("TargetHeight", typeof(double), 1.0D)]
-internal sealed partial class AspectRatio : Microsoft.UI.Xaml.Controls.Control
-{
-    private const double Epsilon = 2.2204460492503131e-016;
-
-    /// <inheritdoc/>
-    protected override Size MeasureOverride(Size availableSize)
-    {
-        double ratio = TargetWidth / TargetHeight;
-        double ratioAvailable = availableSize.Width / availableSize.Height;
-
-        if (Math.Abs(ratioAvailable - ratio) < Epsilon)
-        {
-            return availableSize;
-        }
-
-        // 更宽
-        if (ratioAvailable > ratio)
-        {
-            double newWidth = ratio * availableSize.Height;
-            return new Size(newWidth, availableSize.Height);
-        }
-
-        // 更高
-        if (ratioAvailable < ratio)
-        {
-            double newHeight = availableSize.Width / ratio;
-            return new Size(availableSize.Width, newHeight);
-        }
-
-        return availableSize;
-    }
-}
diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Theme/FontStyle.xaml b/src/Snap.Hutao/Snap.Hutao/Control/Theme/FontStyle.xaml
index fd4e6dce..18fd7359 100644
--- a/src/Snap.Hutao/Snap.Hutao/Control/Theme/FontStyle.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/Control/Theme/FontStyle.xaml
@@ -82,13 +82,6 @@
         <Setter Property="OpticalMarginAlignment" Value="TrimSideBearings"/>
     </Style>
 
-    <x:Double x:Key="SecondaryTextFontSize">12</x:Double>
-
-    <Style x:Key="SecondaryTextStyle" TargetType="TextBlock">
-        <Setter Property="FontSize" Value="{StaticResource SecondaryTextFontSize}"/>
-        <Setter Property="Foreground" Value="{ThemeResource TextFillColorSecondaryBrush}"/>
-    </Style>
-
     <Style BasedOn="{StaticResource DefaultMenuFlyoutItemStyle}" TargetType="MenuFlyoutItem">
         <Setter Property="FontFamily" Value="{StaticResource MiSans}"/>
     </Style>
@@ -100,276 +93,4 @@
     <Style BasedOn="{StaticResource DefaultScrollViewerStyle}" TargetType="ScrollViewer">
         <Setter Property="FontFamily" Value="{StaticResource MiSans}"/>
     </Style>
-    <!--  TODO: When will DefaultInfoBarStyle added  -->
-    <Style TargetType="InfoBar">
-        <Setter Property="shch:InfoBarHelper.IsTextSelectionEnabled" Value="False"/>
-        <Setter Property="FontFamily" Value="{StaticResource MiSans}"/>
-        <Setter Property="IsTabStop" Value="False"/>
-        <Setter Property="CloseButtonStyle" Value="{StaticResource InfoBarCloseButtonStyle}"/>
-        <Setter Property="Background" Value="Transparent"/>
-        <Setter Property="BorderBrush" Value="{ThemeResource InfoBarBorderBrush}"/>
-        <Setter Property="BorderThickness" Value="{ThemeResource InfoBarBorderThickness}"/>
-        <Setter Property="AutomationProperties.LandmarkType" Value="Custom"/>
-        <Setter Property="AutomationProperties.IsDialog" Value="True"/>
-        <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="InfoBar">
-                    <Border
-                        x:Name="ContentRoot"
-                        VerticalAlignment="Top"
-                        Background="{ThemeResource InfoBarInformationalSeverityBackgroundBrush}"
-                        BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="{TemplateBinding BorderThickness}"
-                        CornerRadius="{TemplateBinding CornerRadius}">
-                        <!--  Background is used here so that it overrides the severity status color if set.  -->
-                        <Grid
-                            MinHeight="{ThemeResource InfoBarMinHeight}"
-                            Padding="{StaticResource InfoBarContentRootPadding}"
-                            HorizontalAlignment="Stretch"
-                            Background="{TemplateBinding Background}"
-                            CornerRadius="{TemplateBinding CornerRadius}">
-
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="Auto"/>
-                                <!--  Icon  -->
-                                <ColumnDefinition Width="*"/>
-                                <!--  Title, message, and action  -->
-                                <ColumnDefinition Width="Auto"/>
-                                <!--  Close button  -->
-                            </Grid.ColumnDefinitions>
-
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto"/>
-                                <RowDefinition Height="Auto"/>
-                            </Grid.RowDefinitions>
-                            <Grid x:Name="StandardIconArea" Visibility="Collapsed">
-                                <TextBlock
-                                    x:Name="IconBackground"
-                                    Grid.Column="0"
-                                    Margin="{StaticResource InfoBarIconMargin}"
-                                    VerticalAlignment="Top"
-                                    AutomationProperties.AccessibilityView="Raw"
-                                    FontFamily="{ThemeResource SymbolThemeFontFamily}"
-                                    FontSize="{StaticResource InfoBarIconFontSize}"
-                                    Foreground="{ThemeResource InfoBarInformationalSeverityIconBackground}"
-                                    Text="{StaticResource InfoBarIconBackgroundGlyph}"/>
-                                <TextBlock
-                                    x:Name="StandardIcon"
-                                    Grid.Column="0"
-                                    Margin="{StaticResource InfoBarIconMargin}"
-                                    VerticalAlignment="Top"
-                                    FontFamily="{ThemeResource SymbolThemeFontFamily}"
-                                    FontSize="{StaticResource InfoBarIconFontSize}"
-                                    Foreground="{ThemeResource InfoBarInformationalSeverityIconForeground}"
-                                    Text="{StaticResource InfoBarInformationalIconGlyph}"/>
-                            </Grid>
-                            <Viewbox
-                                x:Name="UserIconBox"
-                                Grid.Column="0"
-                                MaxWidth="{ThemeResource InfoBarIconFontSize}"
-                                MaxHeight="{ThemeResource InfoBarIconFontSize}"
-                                Margin="{ThemeResource InfoBarIconMargin}"
-                                VerticalAlignment="Top"
-                                Child="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.IconElement}"
-                                Visibility="Collapsed"/>
-                            <InfoBarPanel
-                                Grid.Column="1"
-                                Margin="{StaticResource InfoBarPanelMargin}"
-                                HorizontalOrientationPadding="{StaticResource InfoBarPanelHorizontalOrientationPadding}"
-                                VerticalOrientationPadding="{StaticResource InfoBarPanelVerticalOrientationPadding}">
-                                <TextBlock
-                                    x:Name="Title"
-                                    FontSize="{StaticResource InfoBarTitleFontSize}"
-                                    FontWeight="{StaticResource InfoBarTitleFontWeight}"
-                                    Foreground="{ThemeResource InfoBarTitleForeground}"
-                                    InfoBarPanel.HorizontalOrientationMargin="{StaticResource InfoBarTitleHorizontalOrientationMargin}"
-                                    InfoBarPanel.VerticalOrientationMargin="{StaticResource InfoBarTitleVerticalOrientationMargin}"
-                                    IsTextSelectionEnabled="{TemplateBinding shch:InfoBarHelper.IsTextSelectionEnabled}"
-                                    Text="{TemplateBinding Title}"
-                                    TextWrapping="WrapWholeWords"/>
-                                <TextBlock
-                                    x:Name="Message"
-                                    FontSize="{StaticResource InfoBarMessageFontSize}"
-                                    FontWeight="{StaticResource InfoBarMessageFontWeight}"
-                                    Foreground="{ThemeResource InfoBarMessageForeground}"
-                                    InfoBarPanel.HorizontalOrientationMargin="{StaticResource InfoBarMessageHorizontalOrientationMargin}"
-                                    InfoBarPanel.VerticalOrientationMargin="{StaticResource InfoBarMessageVerticalOrientationMargin}"
-                                    IsTextSelectionEnabled="{TemplateBinding shch:InfoBarHelper.IsTextSelectionEnabled}"
-                                    Text="{TemplateBinding Message}"
-                                    TextWrapping="WrapWholeWords"/>
-                                <ContentPresenter
-                                    VerticalAlignment="Top"
-                                    Content="{TemplateBinding ActionButton}"
-                                    InfoBarPanel.HorizontalOrientationMargin="{StaticResource InfoBarActionHorizontalOrientationMargin}"
-                                    InfoBarPanel.VerticalOrientationMargin="{StaticResource InfoBarActionVerticalOrientationMargin}">
-                                    <ContentPresenter.Resources>
-                                        <Style BasedOn="{StaticResource DefaultHyperlinkButtonStyle}" TargetType="HyperlinkButton">
-                                            <Style.Setters>
-                                                <Setter Property="Margin" Value="{StaticResource InfoBarHyperlinkButtonMargin}"/>
-                                                <Setter Property="Foreground" Value="{ThemeResource InfoBarHyperlinkButtonForeground}"/>
-                                            </Style.Setters>
-                                        </Style>
-                                    </ContentPresenter.Resources>
-                                </ContentPresenter>
-                            </InfoBarPanel>
-                            <ContentPresenter
-                                Grid.Row="1"
-                                Grid.Column="1"
-                                Content="{TemplateBinding Content}"
-                                ContentTemplate="{TemplateBinding ContentTemplate}"/>
-                            <Button
-                                Name="CloseButton"
-                                Grid.Column="2"
-                                Command="{TemplateBinding CloseButtonCommand}"
-                                CommandParameter="{TemplateBinding CloseButtonCommandParameter}"
-                                Style="{TemplateBinding CloseButtonStyle}">
-                                <Button.Resources>
-                                    <ResourceDictionary>
-                                        <ResourceDictionary.ThemeDictionaries>
-                                            <ResourceDictionary x:Key="Default">
-                                                <StaticResource x:Key="ButtonBackground" ResourceKey="AppBarButtonBackground"/>
-                                                <StaticResource x:Key="ButtonBackgroundPointerOver" ResourceKey="AppBarButtonBackgroundPointerOver"/>
-                                                <StaticResource x:Key="ButtonBackgroundPressed" ResourceKey="AppBarButtonBackgroundPressed"/>
-                                                <StaticResource x:Key="ButtonBackgroundDisabled" ResourceKey="AppBarButtonBackgroundDisabled"/>
-                                                <StaticResource x:Key="ButtonForeground" ResourceKey="AppBarButtonForeground"/>
-                                                <StaticResource x:Key="ButtonForegroundPointerOver" ResourceKey="AppBarButtonForegroundPointerOver"/>
-                                                <StaticResource x:Key="ButtonForegroundPressed" ResourceKey="AppBarButtonForegroundPressed"/>
-                                                <StaticResource x:Key="ButtonForegroundDisabled" ResourceKey="AppBarButtonForegroundDisabled"/>
-                                                <StaticResource x:Key="ButtonBorderBrush" ResourceKey="AppBarButtonBorderBrush"/>
-                                                <StaticResource x:Key="ButtonBorderBrushPointerOver" ResourceKey="AppBarButtonBorderBrushPointerOver"/>
-                                                <StaticResource x:Key="ButtonBorderBrushPressed" ResourceKey="AppBarButtonBorderBrushPressed"/>
-                                                <StaticResource x:Key="ButtonBorderBrushDisabled" ResourceKey="AppBarButtonBorderBrushDisabled"/>
-                                            </ResourceDictionary>
-                                            <ResourceDictionary x:Key="HighContrast">
-                                                <StaticResource x:Key="ButtonBackground" ResourceKey="AppBarButtonBackground"/>
-                                                <StaticResource x:Key="ButtonBackgroundPointerOver" ResourceKey="AppBarButtonBackgroundPointerOver"/>
-                                                <StaticResource x:Key="ButtonBackgroundPressed" ResourceKey="AppBarButtonBackgroundPressed"/>
-                                                <StaticResource x:Key="ButtonBackgroundDisabled" ResourceKey="AppBarButtonBackgroundDisabled"/>
-                                                <StaticResource x:Key="ButtonForeground" ResourceKey="AppBarButtonForeground"/>
-                                                <StaticResource x:Key="ButtonForegroundPointerOver" ResourceKey="AppBarButtonForegroundPointerOver"/>
-                                                <StaticResource x:Key="ButtonForegroundPressed" ResourceKey="AppBarButtonForegroundPressed"/>
-                                                <StaticResource x:Key="ButtonForegroundDisabled" ResourceKey="AppBarButtonForegroundDisabled"/>
-                                                <StaticResource x:Key="ButtonBorderBrush" ResourceKey="AppBarButtonBorderBrush"/>
-                                                <StaticResource x:Key="ButtonBorderBrushPointerOver" ResourceKey="AppBarButtonBorderBrushPointerOver"/>
-                                                <StaticResource x:Key="ButtonBorderBrushPressed" ResourceKey="AppBarButtonBorderBrushPressed"/>
-                                                <StaticResource x:Key="ButtonBorderBrushDisabled" ResourceKey="AppBarButtonBorderBrushDisabled"/>
-                                            </ResourceDictionary>
-                                            <ResourceDictionary x:Key="Light">
-                                                <StaticResource x:Key="ButtonBackground" ResourceKey="AppBarButtonBackground"/>
-                                                <StaticResource x:Key="ButtonBackgroundPointerOver" ResourceKey="AppBarButtonBackgroundPointerOver"/>
-                                                <StaticResource x:Key="ButtonBackgroundPressed" ResourceKey="AppBarButtonBackgroundPressed"/>
-                                                <StaticResource x:Key="ButtonBackgroundDisabled" ResourceKey="AppBarButtonBackgroundDisabled"/>
-                                                <StaticResource x:Key="ButtonForeground" ResourceKey="AppBarButtonForeground"/>
-                                                <StaticResource x:Key="ButtonForegroundPointerOver" ResourceKey="AppBarButtonForegroundPointerOver"/>
-                                                <StaticResource x:Key="ButtonForegroundPressed" ResourceKey="AppBarButtonForegroundPressed"/>
-                                                <StaticResource x:Key="ButtonForegroundDisabled" ResourceKey="AppBarButtonForegroundDisabled"/>
-                                                <StaticResource x:Key="ButtonBorderBrush" ResourceKey="AppBarButtonBorderBrush"/>
-                                                <StaticResource x:Key="ButtonBorderBrushPointerOver" ResourceKey="AppBarButtonBorderBrushPointerOver"/>
-                                                <StaticResource x:Key="ButtonBorderBrushPressed" ResourceKey="AppBarButtonBorderBrushPressed"/>
-                                                <StaticResource x:Key="ButtonBorderBrushDisabled" ResourceKey="AppBarButtonBorderBrushDisabled"/>
-                                            </ResourceDictionary>
-                                        </ResourceDictionary.ThemeDictionaries>
-                                    </ResourceDictionary>
-                                </Button.Resources>
-                                <Viewbox
-                                    Width="{StaticResource InfoBarCloseButtonGlyphSize}"
-                                    Height="{StaticResource InfoBarCloseButtonGlyphSize}"
-                                    HorizontalAlignment="Center"
-                                    VerticalAlignment="Center">
-                                    <SymbolIcon Symbol="{StaticResource InfoBarCloseButtonSymbol}"/>
-                                </Viewbox>
-                            </Button>
-
-                        </Grid>
-
-                        <VisualStateManager.VisualStateGroups>
-                            <VisualStateGroup x:Name="SeverityLevels">
-                                <VisualState x:Name="Informational"/>
-                                <VisualState x:Name="Error">
-                                    <VisualState.Setters>
-                                        <Setter Target="ContentRoot.Background" Value="{ThemeResource InfoBarErrorSeverityBackgroundBrush}"/>
-                                        <Setter Target="IconBackground.Foreground" Value="{ThemeResource InfoBarErrorSeverityIconBackground}"/>
-                                        <Setter Target="StandardIcon.Text" Value="{StaticResource InfoBarErrorIconGlyph}"/>
-                                        <Setter Target="StandardIcon.Foreground" Value="{ThemeResource InfoBarErrorSeverityIconForeground}"/>
-
-                                    </VisualState.Setters>
-                                </VisualState>
-                                <VisualState x:Name="Warning">
-                                    <VisualState.Setters>
-                                        <Setter Target="ContentRoot.Background" Value="{ThemeResource InfoBarWarningSeverityBackgroundBrush}"/>
-                                        <Setter Target="IconBackground.Foreground" Value="{ThemeResource InfoBarWarningSeverityIconBackground}"/>
-                                        <Setter Target="StandardIcon.Text" Value="{StaticResource InfoBarWarningIconGlyph}"/>
-                                        <Setter Target="StandardIcon.Foreground" Value="{ThemeResource InfoBarWarningSeverityIconForeground}"/>
-
-                                    </VisualState.Setters>
-                                </VisualState>
-                                <VisualState x:Name="Success">
-                                    <VisualState.Setters>
-                                        <Setter Target="ContentRoot.Background" Value="{ThemeResource InfoBarSuccessSeverityBackgroundBrush}"/>
-                                        <Setter Target="IconBackground.Foreground" Value="{ThemeResource InfoBarSuccessSeverityIconBackground}"/>
-                                        <Setter Target="StandardIcon.Text" Value="{StaticResource InfoBarSuccessIconGlyph}"/>
-                                        <Setter Target="StandardIcon.Foreground" Value="{ThemeResource InfoBarSuccessSeverityIconForeground}"/>
-
-                                    </VisualState.Setters>
-                                </VisualState>
-
-                            </VisualStateGroup>
-                            <VisualStateGroup x:Name="IconStates">
-                                <VisualState x:Name="StandardIconVisible">
-                                    <VisualState.Setters>
-                                        <Setter Target="UserIconBox.Visibility" Value="Collapsed"/>
-                                        <Setter Target="StandardIconArea.Visibility" Value="Visible"/>
-
-                                    </VisualState.Setters>
-                                </VisualState>
-                                <VisualState x:Name="UserIconVisible">
-                                    <VisualState.Setters>
-                                        <Setter Target="UserIconBox.Visibility" Value="Visible"/>
-                                        <Setter Target="StandardIconArea.Visibility" Value="Collapsed"/>
-
-                                    </VisualState.Setters>
-                                </VisualState>
-                                <VisualState x:Name="NoIconVisible"/>
-
-                            </VisualStateGroup>
-                            <VisualStateGroup>
-                                <VisualState x:Name="CloseButtonVisible"/>
-                                <VisualState x:Name="CloseButtonCollapsed">
-                                    <VisualState.Setters>
-                                        <Setter Target="CloseButton.Visibility" Value="Collapsed"/>
-
-                                    </VisualState.Setters>
-                                </VisualState>
-
-                            </VisualStateGroup>
-                            <VisualStateGroup x:Name="InfoBarVisibility">
-                                <VisualState x:Name="InfoBarVisible"/>
-                                <VisualState x:Name="InfoBarCollapsed">
-                                    <VisualState.Setters>
-                                        <Setter Target="ContentRoot.Visibility" Value="Collapsed"/>
-
-                                    </VisualState.Setters>
-                                </VisualState>
-
-                            </VisualStateGroup>
-                            <VisualStateGroup>
-                                <VisualState x:Name="ForegroundNotSet"/>
-                                <VisualState x:Name="ForegroundSet">
-                                    <VisualState.Setters>
-                                        <Setter Target="Title.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Foreground}"/>
-                                        <Setter Target="Message.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Foreground}"/>
-
-                                    </VisualState.Setters>
-                                </VisualState>
-
-                            </VisualStateGroup>
-
-                        </VisualStateManager.VisualStateGroups>
-                    </Border>
-
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Theme/InfoBarOverride.xaml b/src/Snap.Hutao/Snap.Hutao/Control/Theme/InfoBarOverride.xaml
new file mode 100644
index 00000000..6873f003
--- /dev/null
+++ b/src/Snap.Hutao/Snap.Hutao/Control/Theme/InfoBarOverride.xaml
@@ -0,0 +1,265 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:shch="using:Snap.Hutao.Control.Helper">
+    <Thickness x:Key="InfoBarIconMargin">19,16,19,16</Thickness>
+    <Thickness x:Key="InfoBarContentRootPadding">0,0,0,0</Thickness>
+    <x:Double x:Key="InfoBarIconFontSize">20</x:Double>
+    <!--  TODO: When will DefaultInfoBarStyle added  -->
+    <Style TargetType="InfoBar">
+        <Setter Property="shch:InfoBarHelper.IsTextSelectionEnabled" Value="False"/>
+        <Setter Property="FontFamily" Value="{StaticResource MiSans}"/>
+        <Setter Property="IsTabStop" Value="False"/>
+        <Setter Property="CloseButtonStyle" Value="{StaticResource InfoBarCloseButtonStyle}"/>
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="BorderBrush" Value="{ThemeResource InfoBarBorderBrush}"/>
+        <Setter Property="BorderThickness" Value="{ThemeResource InfoBarBorderThickness}"/>
+        <Setter Property="AutomationProperties.LandmarkType" Value="Custom"/>
+        <Setter Property="AutomationProperties.IsDialog" Value="True"/>
+        <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="InfoBar">
+                    <Border
+                        x:Name="ContentRoot"
+                        VerticalAlignment="Top"
+                        Background="{ThemeResource InfoBarInformationalSeverityBackgroundBrush}"
+                        BorderBrush="{TemplateBinding BorderBrush}"
+                        BorderThickness="{TemplateBinding BorderThickness}"
+                        CornerRadius="{TemplateBinding CornerRadius}">
+                        <!--  Background is used here so that it overrides the severity status color if set.  -->
+                        <Grid
+                            MinHeight="{ThemeResource InfoBarMinHeight}"
+                            Padding="{StaticResource InfoBarContentRootPadding}"
+                            HorizontalAlignment="Stretch"
+                            Background="{TemplateBinding Background}"
+                            CornerRadius="{TemplateBinding CornerRadius}">
+
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto"/>
+                                <!--  Icon  -->
+                                <ColumnDefinition Width="*"/>
+                                <!--  Title, message, and action  -->
+                                <ColumnDefinition Width="Auto"/>
+                                <!--  Close button  -->
+                            </Grid.ColumnDefinitions>
+
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="Auto"/>
+                                <RowDefinition Height="Auto"/>
+                            </Grid.RowDefinitions>
+                            <Grid x:Name="StandardIconArea" Visibility="Collapsed">
+                                <TextBlock
+                                    x:Name="IconBackground"
+                                    Grid.Column="0"
+                                    Margin="{StaticResource InfoBarIconMargin}"
+                                    VerticalAlignment="Top"
+                                    AutomationProperties.AccessibilityView="Raw"
+                                    FontFamily="{ThemeResource SymbolThemeFontFamily}"
+                                    FontSize="{StaticResource InfoBarIconFontSize}"
+                                    Foreground="{ThemeResource InfoBarInformationalSeverityIconBackground}"
+                                    Text="{StaticResource InfoBarIconBackgroundGlyph}"/>
+                                <TextBlock
+                                    x:Name="StandardIcon"
+                                    Grid.Column="0"
+                                    Margin="{StaticResource InfoBarIconMargin}"
+                                    VerticalAlignment="Top"
+                                    FontFamily="{ThemeResource SymbolThemeFontFamily}"
+                                    FontSize="{StaticResource InfoBarIconFontSize}"
+                                    Foreground="{ThemeResource InfoBarInformationalSeverityIconForeground}"
+                                    Text="{StaticResource InfoBarInformationalIconGlyph}"/>
+                            </Grid>
+                            <Viewbox
+                                x:Name="UserIconBox"
+                                Grid.Column="0"
+                                MaxWidth="{ThemeResource InfoBarIconFontSize}"
+                                MaxHeight="{ThemeResource InfoBarIconFontSize}"
+                                Margin="{ThemeResource InfoBarIconMargin}"
+                                VerticalAlignment="Top"
+                                Child="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.IconElement}"
+                                Visibility="Collapsed"/>
+                            <InfoBarPanel
+                                Grid.Column="1"
+                                Margin="{StaticResource InfoBarPanelMargin}"
+                                HorizontalOrientationPadding="{StaticResource InfoBarPanelHorizontalOrientationPadding}"
+                                VerticalOrientationPadding="{StaticResource InfoBarPanelVerticalOrientationPadding}">
+                                <TextBlock
+                                    x:Name="Title"
+                                    FontSize="{StaticResource InfoBarTitleFontSize}"
+                                    FontWeight="{StaticResource InfoBarTitleFontWeight}"
+                                    Foreground="{ThemeResource InfoBarTitleForeground}"
+                                    InfoBarPanel.HorizontalOrientationMargin="{StaticResource InfoBarTitleHorizontalOrientationMargin}"
+                                    InfoBarPanel.VerticalOrientationMargin="{StaticResource InfoBarTitleVerticalOrientationMargin}"
+                                    IsTextSelectionEnabled="{TemplateBinding shch:InfoBarHelper.IsTextSelectionEnabled}"
+                                    Text="{TemplateBinding Title}"
+                                    TextWrapping="WrapWholeWords"/>
+                                <TextBlock
+                                    x:Name="Message"
+                                    FontSize="{StaticResource InfoBarMessageFontSize}"
+                                    FontWeight="{StaticResource InfoBarMessageFontWeight}"
+                                    Foreground="{ThemeResource InfoBarMessageForeground}"
+                                    InfoBarPanel.HorizontalOrientationMargin="{StaticResource InfoBarMessageHorizontalOrientationMargin}"
+                                    InfoBarPanel.VerticalOrientationMargin="{StaticResource InfoBarMessageVerticalOrientationMargin}"
+                                    IsTextSelectionEnabled="{TemplateBinding shch:InfoBarHelper.IsTextSelectionEnabled}"
+                                    Text="{TemplateBinding Message}"
+                                    TextWrapping="WrapWholeWords"/>
+                                <ContentPresenter
+                                    VerticalAlignment="Top"
+                                    Content="{TemplateBinding ActionButton}"
+                                    InfoBarPanel.HorizontalOrientationMargin="{StaticResource InfoBarActionHorizontalOrientationMargin}"
+                                    InfoBarPanel.VerticalOrientationMargin="{StaticResource InfoBarActionVerticalOrientationMargin}">
+                                    <ContentPresenter.Resources>
+                                        <Style BasedOn="{StaticResource DefaultHyperlinkButtonStyle}" TargetType="HyperlinkButton">
+                                            <Style.Setters>
+                                                <Setter Property="Margin" Value="{StaticResource InfoBarHyperlinkButtonMargin}"/>
+                                                <Setter Property="Foreground" Value="{ThemeResource InfoBarHyperlinkButtonForeground}"/>
+                                            </Style.Setters>
+                                        </Style>
+                                    </ContentPresenter.Resources>
+                                </ContentPresenter>
+                            </InfoBarPanel>
+                            <ContentPresenter
+                                Grid.Row="1"
+                                Grid.Column="1"
+                                Content="{TemplateBinding Content}"
+                                ContentTemplate="{TemplateBinding ContentTemplate}"/>
+                            <Button
+                                Name="CloseButton"
+                                Grid.Column="2"
+                                Command="{TemplateBinding CloseButtonCommand}"
+                                CommandParameter="{TemplateBinding CloseButtonCommandParameter}"
+                                Style="{TemplateBinding CloseButtonStyle}">
+                                <Button.Resources>
+                                    <ResourceDictionary>
+                                        <ResourceDictionary.ThemeDictionaries>
+                                            <ResourceDictionary x:Key="Default">
+                                                <StaticResource x:Key="ButtonBackground" ResourceKey="AppBarButtonBackground"/>
+                                                <StaticResource x:Key="ButtonBackgroundPointerOver" ResourceKey="AppBarButtonBackgroundPointerOver"/>
+                                                <StaticResource x:Key="ButtonBackgroundPressed" ResourceKey="AppBarButtonBackgroundPressed"/>
+                                                <StaticResource x:Key="ButtonBackgroundDisabled" ResourceKey="AppBarButtonBackgroundDisabled"/>
+                                                <StaticResource x:Key="ButtonForeground" ResourceKey="AppBarButtonForeground"/>
+                                                <StaticResource x:Key="ButtonForegroundPointerOver" ResourceKey="AppBarButtonForegroundPointerOver"/>
+                                                <StaticResource x:Key="ButtonForegroundPressed" ResourceKey="AppBarButtonForegroundPressed"/>
+                                                <StaticResource x:Key="ButtonForegroundDisabled" ResourceKey="AppBarButtonForegroundDisabled"/>
+                                                <StaticResource x:Key="ButtonBorderBrush" ResourceKey="AppBarButtonBorderBrush"/>
+                                                <StaticResource x:Key="ButtonBorderBrushPointerOver" ResourceKey="AppBarButtonBorderBrushPointerOver"/>
+                                                <StaticResource x:Key="ButtonBorderBrushPressed" ResourceKey="AppBarButtonBorderBrushPressed"/>
+                                                <StaticResource x:Key="ButtonBorderBrushDisabled" ResourceKey="AppBarButtonBorderBrushDisabled"/>
+                                            </ResourceDictionary>
+                                            <ResourceDictionary x:Key="HighContrast">
+                                                <StaticResource x:Key="ButtonBackground" ResourceKey="AppBarButtonBackground"/>
+                                                <StaticResource x:Key="ButtonBackgroundPointerOver" ResourceKey="AppBarButtonBackgroundPointerOver"/>
+                                                <StaticResource x:Key="ButtonBackgroundPressed" ResourceKey="AppBarButtonBackgroundPressed"/>
+                                                <StaticResource x:Key="ButtonBackgroundDisabled" ResourceKey="AppBarButtonBackgroundDisabled"/>
+                                                <StaticResource x:Key="ButtonForeground" ResourceKey="AppBarButtonForeground"/>
+                                                <StaticResource x:Key="ButtonForegroundPointerOver" ResourceKey="AppBarButtonForegroundPointerOver"/>
+                                                <StaticResource x:Key="ButtonForegroundPressed" ResourceKey="AppBarButtonForegroundPressed"/>
+                                                <StaticResource x:Key="ButtonForegroundDisabled" ResourceKey="AppBarButtonForegroundDisabled"/>
+                                                <StaticResource x:Key="ButtonBorderBrush" ResourceKey="AppBarButtonBorderBrush"/>
+                                                <StaticResource x:Key="ButtonBorderBrushPointerOver" ResourceKey="AppBarButtonBorderBrushPointerOver"/>
+                                                <StaticResource x:Key="ButtonBorderBrushPressed" ResourceKey="AppBarButtonBorderBrushPressed"/>
+                                                <StaticResource x:Key="ButtonBorderBrushDisabled" ResourceKey="AppBarButtonBorderBrushDisabled"/>
+                                            </ResourceDictionary>
+                                            <ResourceDictionary x:Key="Light">
+                                                <StaticResource x:Key="ButtonBackground" ResourceKey="AppBarButtonBackground"/>
+                                                <StaticResource x:Key="ButtonBackgroundPointerOver" ResourceKey="AppBarButtonBackgroundPointerOver"/>
+                                                <StaticResource x:Key="ButtonBackgroundPressed" ResourceKey="AppBarButtonBackgroundPressed"/>
+                                                <StaticResource x:Key="ButtonBackgroundDisabled" ResourceKey="AppBarButtonBackgroundDisabled"/>
+                                                <StaticResource x:Key="ButtonForeground" ResourceKey="AppBarButtonForeground"/>
+                                                <StaticResource x:Key="ButtonForegroundPointerOver" ResourceKey="AppBarButtonForegroundPointerOver"/>
+                                                <StaticResource x:Key="ButtonForegroundPressed" ResourceKey="AppBarButtonForegroundPressed"/>
+                                                <StaticResource x:Key="ButtonForegroundDisabled" ResourceKey="AppBarButtonForegroundDisabled"/>
+                                                <StaticResource x:Key="ButtonBorderBrush" ResourceKey="AppBarButtonBorderBrush"/>
+                                                <StaticResource x:Key="ButtonBorderBrushPointerOver" ResourceKey="AppBarButtonBorderBrushPointerOver"/>
+                                                <StaticResource x:Key="ButtonBorderBrushPressed" ResourceKey="AppBarButtonBorderBrushPressed"/>
+                                                <StaticResource x:Key="ButtonBorderBrushDisabled" ResourceKey="AppBarButtonBorderBrushDisabled"/>
+                                            </ResourceDictionary>
+                                        </ResourceDictionary.ThemeDictionaries>
+                                    </ResourceDictionary>
+                                </Button.Resources>
+                                <Viewbox
+                                    Width="{StaticResource InfoBarCloseButtonGlyphSize}"
+                                    Height="{StaticResource InfoBarCloseButtonGlyphSize}"
+                                    HorizontalAlignment="Center"
+                                    VerticalAlignment="Center">
+                                    <SymbolIcon Symbol="{StaticResource InfoBarCloseButtonSymbol}"/>
+                                </Viewbox>
+                            </Button>
+                        </Grid>
+
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="SeverityLevels">
+                                <VisualState x:Name="Informational"/>
+                                <VisualState x:Name="Error">
+                                    <VisualState.Setters>
+                                        <Setter Target="ContentRoot.Background" Value="{ThemeResource InfoBarErrorSeverityBackgroundBrush}"/>
+                                        <Setter Target="IconBackground.Foreground" Value="{ThemeResource InfoBarErrorSeverityIconBackground}"/>
+                                        <Setter Target="StandardIcon.Text" Value="{StaticResource InfoBarErrorIconGlyph}"/>
+                                        <Setter Target="StandardIcon.Foreground" Value="{ThemeResource InfoBarErrorSeverityIconForeground}"/>
+                                    </VisualState.Setters>
+                                </VisualState>
+                                <VisualState x:Name="Warning">
+                                    <VisualState.Setters>
+                                        <Setter Target="ContentRoot.Background" Value="{ThemeResource InfoBarWarningSeverityBackgroundBrush}"/>
+                                        <Setter Target="IconBackground.Foreground" Value="{ThemeResource InfoBarWarningSeverityIconBackground}"/>
+                                        <Setter Target="StandardIcon.Text" Value="{StaticResource InfoBarWarningIconGlyph}"/>
+                                        <Setter Target="StandardIcon.Foreground" Value="{ThemeResource InfoBarWarningSeverityIconForeground}"/>
+                                    </VisualState.Setters>
+                                </VisualState>
+                                <VisualState x:Name="Success">
+                                    <VisualState.Setters>
+                                        <Setter Target="ContentRoot.Background" Value="{ThemeResource InfoBarSuccessSeverityBackgroundBrush}"/>
+                                        <Setter Target="IconBackground.Foreground" Value="{ThemeResource InfoBarSuccessSeverityIconBackground}"/>
+                                        <Setter Target="StandardIcon.Text" Value="{StaticResource InfoBarSuccessIconGlyph}"/>
+                                        <Setter Target="StandardIcon.Foreground" Value="{ThemeResource InfoBarSuccessSeverityIconForeground}"/>
+                                    </VisualState.Setters>
+                                </VisualState>
+                            </VisualStateGroup>
+                            <VisualStateGroup x:Name="IconStates">
+                                <VisualState x:Name="StandardIconVisible">
+                                    <VisualState.Setters>
+                                        <Setter Target="UserIconBox.Visibility" Value="Collapsed"/>
+                                        <Setter Target="StandardIconArea.Visibility" Value="Visible"/>
+                                    </VisualState.Setters>
+                                </VisualState>
+                                <VisualState x:Name="UserIconVisible">
+                                    <VisualState.Setters>
+                                        <Setter Target="UserIconBox.Visibility" Value="Visible"/>
+                                        <Setter Target="StandardIconArea.Visibility" Value="Collapsed"/>
+                                    </VisualState.Setters>
+                                </VisualState>
+                                <VisualState x:Name="NoIconVisible"/>
+                            </VisualStateGroup>
+                            <VisualStateGroup>
+                                <VisualState x:Name="CloseButtonVisible"/>
+                                <VisualState x:Name="CloseButtonCollapsed">
+                                    <VisualState.Setters>
+                                        <Setter Target="CloseButton.Visibility" Value="Collapsed"/>
+                                    </VisualState.Setters>
+                                </VisualState>
+                            </VisualStateGroup>
+                            <VisualStateGroup x:Name="InfoBarVisibility">
+                                <VisualState x:Name="InfoBarVisible"/>
+                                <VisualState x:Name="InfoBarCollapsed">
+                                    <VisualState.Setters>
+                                        <Setter Target="ContentRoot.Visibility" Value="Collapsed"/>
+                                    </VisualState.Setters>
+                                </VisualState>
+                            </VisualStateGroup>
+                            <VisualStateGroup>
+                                <VisualState x:Name="ForegroundNotSet"/>
+                                <VisualState x:Name="ForegroundSet">
+                                    <VisualState.Setters>
+                                        <Setter Target="Title.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Foreground}"/>
+                                        <Setter Target="Message.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Foreground}"/>
+                                    </VisualState.Setters>
+                                </VisualState>
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                    </Border>
+
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Theme/PageOverride.xaml b/src/Snap.Hutao/Snap.Hutao/Control/Theme/PageOverride.xaml
new file mode 100644
index 00000000..50327554
--- /dev/null
+++ b/src/Snap.Hutao/Snap.Hutao/Control/Theme/PageOverride.xaml
@@ -0,0 +1,6 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <!--  Page Transparent Background  -->
+    <StaticResource x:Key="ApplicationPageBackgroundThemeBrush" ResourceKey="ControlFillColorTransparentBrush"/>
+    <!--  https://github.com/microsoft/microsoft-ui-xaml/issues/4811  -->
+    <x:Int32 x:Key="__Discard">0</x:Int32>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Theme/PivotOverride.xaml b/src/Snap.Hutao/Snap.Hutao/Control/Theme/PivotOverride.xaml
new file mode 100644
index 00000000..59b2f422
--- /dev/null
+++ b/src/Snap.Hutao/Snap.Hutao/Control/Theme/PivotOverride.xaml
@@ -0,0 +1,5 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <x:Double x:Key="PivotHeaderItemFontSize">16</x:Double>
+    <Thickness x:Key="PivotHeaderItemMargin">16,0,0,0</Thickness>
+    <Thickness x:Key="PivotItemMargin">0</Thickness>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Theme/SettingsStyle.xaml b/src/Snap.Hutao/Snap.Hutao/Control/Theme/SettingsStyle.xaml
new file mode 100644
index 00000000..144c250c
--- /dev/null
+++ b/src/Snap.Hutao/Snap.Hutao/Control/Theme/SettingsStyle.xaml
@@ -0,0 +1,21 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <!--  Settings  -->
+    <x:Double x:Key="SettingsCardSpacing">3</x:Double>
+    <x:Double x:Key="SettingsCardMinHeight">0</x:Double>
+    <x:Double x:Key="SettingsCardWrapThreshold">0</x:Double>
+    <x:Double x:Key="SettingsCardWrapNoIconThreshold">0</x:Double>
+    <Style
+        x:Key="SettingsSectionHeaderTextBlockStyle"
+        BasedOn="{StaticResource BodyStrongTextBlockStyle}"
+        TargetType="TextBlock">
+        <Style.Setters>
+            <Setter Property="Margin" Value="1,29,0,5"/>
+        </Style.Setters>
+    </Style>
+    <Style
+        x:Key="SettingsContentComboBoxStyle"
+        BasedOn="{StaticResource DefaultComboBoxStyle}"
+        TargetType="ComboBox">
+        <Setter Property="MinWidth" Value="120"/>
+    </Style>
+</ResourceDictionary>
diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Theme/WindowOverride.xaml b/src/Snap.Hutao/Snap.Hutao/Control/Theme/WindowOverride.xaml
new file mode 100644
index 00000000..cad2444d
--- /dev/null
+++ b/src/Snap.Hutao/Snap.Hutao/Control/Theme/WindowOverride.xaml
@@ -0,0 +1,5 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <!--  Modify Window title bar color  -->
+    <StaticResource x:Key="WindowCaptionBackground" ResourceKey="ControlFillColorTransparentBrush"/>
+    <StaticResource x:Key="WindowCaptionBackgroundDisabled" ResourceKey="ControlFillColorTransparentBrush"/>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj b/src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj
index 45f74a2d..bcc0b29c 100644
--- a/src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj
+++ b/src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj
@@ -75,6 +75,11 @@
     <None Remove="Control\Loading.xaml" />
     <None Remove="Control\Panel\PanelSelector.xaml" />
     <None Remove="Control\Theme\FontStyle.xaml" />
+    <None Remove="Control\Theme\InfoBarOverride.xaml" />
+    <None Remove="Control\Theme\PageOverride.xaml" />
+    <None Remove="Control\Theme\PivotOverride.xaml" />
+    <None Remove="Control\Theme\SettingsStyle.xaml" />
+    <None Remove="Control\Theme\WindowOverride.xaml" />
     <None Remove="GuideWindow.xaml" />
     <None Remove="IdentityStructs.json" />
     <None Remove="LaunchGameWindow.xaml" />
@@ -298,6 +303,36 @@
     </EmbeddedResource>
   </ItemGroup>
 
+  <ItemGroup>
+    <Page Update="Control\Theme\SettingsStyle.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Page Update="Control\Theme\PivotOverride.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Page Update="Control\Theme\PageOverride.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Page Update="Control\Theme\WindowOverride.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Page Update="Control\Theme\InfoBarOverride.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+
   <ItemGroup>
     <Page Update="View\Card\Primitive\CardProgressBar.xaml">
       <Generator>MSBuild:Compile</Generator>
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Card/Primitive/CardProgressBar.xaml b/src/Snap.Hutao/Snap.Hutao/View/Card/Primitive/CardProgressBar.xaml
index 9e3c30a6..d3fb37cf 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Card/Primitive/CardProgressBar.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Card/Primitive/CardProgressBar.xaml
@@ -16,7 +16,7 @@
         Grid.ColumnSpan="2"
         MinHeight="{x:Bind MinHeight, Mode=OneWay}"
         Background="Transparent"
-        CornerRadius="{StaticResource CompatCornerRadius}"
+        CornerRadius="{StaticResource ControlCornerRadius}"
         Foreground="{x:Bind ProgressForeground, Mode=OneWay}"
         Maximum="{x:Bind Maximum, Mode=OneWay}"
         Opacity="{StaticResource LargeBackgroundProgressBarOpacity}"
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Control/HutaoStatisticsCard.xaml b/src/Snap.Hutao/Snap.Hutao/View/Control/HutaoStatisticsCard.xaml
index cb459b6a..ca35d7ca 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Control/HutaoStatisticsCard.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Control/HutaoStatisticsCard.xaml
@@ -2,14 +2,16 @@
     x:Class="Snap.Hutao.View.Control.HutaoStatisticsCard"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:cw="using:CommunityToolkit.WinUI"
+    xmlns:cwc="using:CommunityToolkit.WinUI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:shch="using:Snap.Hutao.Control.Helper"
     xmlns:shci="using:Snap.Hutao.Control.Image"
     xmlns:shcm="using:Snap.Hutao.Control.Markup"
-    xmlns:shcp="using:Snap.Hutao.Control.Panel"
     xmlns:shvcont="using:Snap.Hutao.View.Control"
     xmlns:shvg="using:Snap.Hutao.ViewModel.GachaLog"
+    cw:Effects.Shadow="{ThemeResource CompatCardShadow}"
     d:DataContext="{d:DesignInstance shvg:HutaoWishSummary}"
     mc:Ignorable="d">
 
@@ -32,10 +34,11 @@
 
         <Grid
             Grid.Row="0"
-            CornerRadius="{StaticResource CompatCornerRadiusTop}"
+            CornerRadius="{StaticResource ControlCornerRadiusTop}"
             Style="{StaticResource BorderGridStyle}">
-            <shcp:AspectRatio TargetHeight="320" TargetWidth="690"/>
-            <shci:CachedImage Source="{Binding Event.Banner}"/>
+            <cwc:ConstrainedBox AspectRatio="1080:533">
+                <shci:CachedImage Source="{Binding Event.Banner}"/>
+            </cwc:ConstrainedBox>
         </Grid>
 
         <ScrollViewer Grid.Row="1">
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Control/ItemIcon.xaml b/src/Snap.Hutao/Snap.Hutao/View/Control/ItemIcon.xaml
index 851ffe65..6a28e0de 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Control/ItemIcon.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Control/ItemIcon.xaml
@@ -13,7 +13,7 @@
         <shmmc:QualityConverter x:Key="QualityConverter"/>
     </UserControl.Resources>
     <Grid>
-        <Grid CornerRadius="{StaticResource CompatCornerRadius}">
+        <Grid CornerRadius="{StaticResource ControlCornerRadius}">
             <!--  Disable some CachedImage's LazyLoading function here can increase response speed  -->
             <shci:CachedImage EnableLazyLoading="False" Source="{x:Bind Quality, Converter={StaticResource QualityConverter}, Mode=OneWay}"/>
             <shci:CachedImage EnableLazyLoading="False" Source="{StaticResource UI_ImgSign_ItemIcon}"/>
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Control/StatisticsCard.xaml b/src/Snap.Hutao/Snap.Hutao/View/Control/StatisticsCard.xaml
index 692de146..dba3d053 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Control/StatisticsCard.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Control/StatisticsCard.xaml
@@ -2,6 +2,7 @@
     x:Class="Snap.Hutao.View.Control.StatisticsCard"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:cw="using:CommunityToolkit.WinUI"
     xmlns:cwcont="using:CommunityToolkit.WinUI.Controls"
     xmlns:cwconv="using:CommunityToolkit.WinUI.Converters"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -14,6 +15,7 @@
     xmlns:shvconv="using:Snap.Hutao.View.Converter"
     xmlns:shvcp="using:Snap.Hutao.View.Card.Primitive"
     xmlns:shvg="using:Snap.Hutao.ViewModel.GachaLog"
+    cw:Effects.Shadow="{ThemeResource CompatCardShadow}"
     d:DataContext="{d:DesignInstance shvg:TypedWishSummary}"
     mc:Ignorable="d">
 
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/AchievementPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/AchievementPage.xaml
index b990f1bd..9aa68812 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/AchievementPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/AchievementPage.xaml
@@ -128,7 +128,7 @@
                                     VerticalAlignment="Center"
                                     CornerRadius="2">
                                     <Border.Background>
-                                        <SolidColorBrush Opacity="0.6" Color="{ThemeResource SystemAccentColor}"/>
+                                        <SolidColorBrush Opacity="0.3" Color="{ThemeResource SystemAccentColor}"/>
                                     </Border.Background>
                                     <TextBlock
                                         FontSize="10"
@@ -140,7 +140,8 @@
 
                             <TextBlock
                                 Margin="0,2,0,0"
-                                Style="{StaticResource SecondaryTextStyle}"
+                                Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                Style="{StaticResource CaptionTextBlockStyle}"
                                 Text="{Binding Inner.Description}"
                                 TextTrimming="CharacterEllipsis"/>
                         </StackPanel>
@@ -264,7 +265,7 @@
                     <AppBarToggleButton
                         Command="{Binding SortUncompletedSwitchCommand}"
                         Icon="{shcm:FontIcon Glyph=&#xE8CB;}"
-                        IsChecked="{Binding IsUncompletedItemsFirst}"
+                        IsChecked="{Binding IsUncompletedItemsFirst, Mode=TwoWay}"
                         Label="{shcm:ResourceString Name=ViewPageAchievementSortIncompletedItemsFirst}"/>
                 </CommandBar>
             </Grid>
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/AnnouncementPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/AnnouncementPage.xaml
index 91203b71..9490dd80 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/AnnouncementPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/AnnouncementPage.xaml
@@ -29,7 +29,7 @@
 
         <DataTemplate x:Key="AnnouncementTemplate">
             <ItemsRepeater
-                Margin="16,0,16,16"
+                Margin="16,16,16,16"
                 HorizontalAlignment="Stretch"
                 ItemsSource="{Binding List}">
                 <ItemsRepeater.Layout>
@@ -42,7 +42,7 @@
                 </ItemsRepeater.Layout>
                 <ItemsRepeater.ItemTemplate>
                     <DataTemplate>
-                        <ItemContainer>
+                        <ItemContainer cw:Effects.Shadow="{ThemeResource CompatCardShadow}">
                             <Border Style="{StaticResource BorderCardStyle}">
                                 <Grid>
                                     <Grid.RowDefinitions>
@@ -82,7 +82,7 @@
                                         </Border>
                                     </Grid>
                                     <!--  General Description  -->
-                                    <Border Grid.Row="1" CornerRadius="{StaticResource CompatCornerRadiusBottom}">
+                                    <Border Grid.Row="1">
                                         <StackPanel Margin="4" VerticalAlignment="Bottom">
                                             <TextBlock
                                                 Margin="4,6,0,0"
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/AvatarPropertyPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/AvatarPropertyPage.xaml
index 789706ae..45360f2f 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/AvatarPropertyPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/AvatarPropertyPage.xaml
@@ -307,11 +307,10 @@
                                     <StackPanel
                                         Name="ListImageExportPanel"
                                         MaxWidth="800"
-                                        HorizontalAlignment="Left"
-                                        Background="Transparent">
+                                        HorizontalAlignment="Left">
                                         <!--  卡片面板  -->
-                                        <Border Margin="16" Style="{StaticResource BorderCardStyle}">
-                                            <Grid>
+                                        <Border Margin="16" cw:Effects.Shadow="{ThemeResource CompatCardShadow}">
+                                            <Grid Style="{StaticResource BorderGridStyle}">
                                                 <Grid.RowDefinitions>
                                                     <RowDefinition/>
                                                     <RowDefinition Height="auto"/>
@@ -320,25 +319,20 @@
                                                     <ColumnDefinition/>
                                                     <ColumnDefinition Width="auto"/>
                                                 </Grid.ColumnDefinitions>
-                                                <shcp:AspectRatio
+                                                <cwcont:ConstrainedBox
                                                     Grid.RowSpan="2"
                                                     Grid.ColumnSpan="2"
-                                                    TargetHeight="400"
-                                                    TargetWidth="840"/>
-                                                <shci:CachedImage
-                                                    Grid.RowSpan="2"
-                                                    Grid.ColumnSpan="2"
-                                                    Source="{Binding SelectedAvatar.NameCard}"
-                                                    Stretch="UniformToFill"/>
+                                                    AspectRatio="840:400">
+                                                    <shci:CachedImage
+                                                        Grid.RowSpan="2"
+                                                        Grid.ColumnSpan="2"
+                                                        Source="{Binding SelectedAvatar.NameCard}"
+                                                        Stretch="UniformToFill"/>
+                                                </cwcont:ConstrainedBox>
                                                 <Rectangle
                                                     Grid.RowSpan="2"
                                                     Grid.ColumnSpan="2"
-                                                    Fill="#33000000"
-                                                    Stroke="{x:Null}"/>
-                                                <Border
-                                                    x:Name="ShadowTarget"
-                                                    Grid.RowSpan="2"
-                                                    Grid.ColumnSpan="2"/>
+                                                    Fill="#33000000"/>
                                                 <StackPanel
                                                     Margin="16"
                                                     HorizontalAlignment="Left"
@@ -348,16 +342,10 @@
                                                             <ColumnDefinition/>
                                                             <ColumnDefinition Width="auto"/>
                                                         </Grid.ColumnDefinitions>
-                                                        <shvcont:ItemIcon Icon="{Binding SelectedAvatar.Icon}" Quality="{Binding SelectedAvatar.Quality}">
-                                                            <cw:Effects.Shadow>
-                                                                <cw:AttachedDropShadow
-                                                                    BlurRadius="16"
-                                                                    CastTo="{Binding ElementName=ShadowTarget}"
-                                                                    IsMasked="False"
-                                                                    Opacity="0.6"
-                                                                    Offset="4"/>
-                                                            </cw:Effects.Shadow>
-                                                        </shvcont:ItemIcon>
+                                                        <shvcont:ItemIcon
+                                                            cw:Effects.Shadow="{ThemeResource CompatCardShadow}"
+                                                            Icon="{Binding SelectedAvatar.Icon}"
+                                                            Quality="{Binding SelectedAvatar.Quality}"/>
                                                         <StackPanel Grid.Column="1" Margin="16,0,0,0">
                                                             <TextBlock
                                                                 Foreground="#FFFFFFFF"
@@ -397,19 +385,12 @@
                                                         <Button
                                                             Padding="0"
                                                             BorderBrush="{x:Null}"
-                                                            BorderThickness="0"
-                                                            CornerRadius="{StaticResource CompatCornerRadius}">
+                                                            BorderThickness="0">
                                                             <Button.Content>
-                                                                <shvcont:ItemIcon Icon="{Binding Icon}" Quality="{Binding Quality}">
-                                                                    <cw:Effects.Shadow>
-                                                                        <cw:AttachedDropShadow
-                                                                            BlurRadius="16"
-                                                                            CastTo="{Binding ElementName=ShadowTarget}"
-                                                                            IsMasked="False"
-                                                                            Opacity="0.6"
-                                                                            Offset="4"/>
-                                                                    </cw:Effects.Shadow>
-                                                                </shvcont:ItemIcon>
+                                                                <shvcont:ItemIcon
+                                                                    cw:Effects.Shadow="{ThemeResource CompatCardShadow}"
+                                                                    Icon="{Binding Icon}"
+                                                                    Quality="{Binding Quality}"/>
                                                             </Button.Content>
                                                             <Button.Flyout>
                                                                 <Flyout Placement="BottomEdgeAlignedLeft">
@@ -603,6 +584,7 @@
                                                 </ItemsControl>
                                             </Grid>
                                         </Border>
+
                                         <!--  角色属性  -->
                                         <Expander
                                             Margin="16,0,16,0"
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/CultivationPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/CultivationPage.xaml
index bfcd0f13..ba5c34e4 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/CultivationPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/CultivationPage.xaml
@@ -351,8 +351,7 @@
                                             Padding="0"
                                             Background="Transparent"
                                             BorderBrush="{x:Null}"
-                                            BorderThickness="0"
-                                            CornerRadius="{StaticResource CompatCornerRadius}">
+                                            BorderThickness="0">
                                             <shvco:BottomTextControl Text="{Binding Count, Mode=OneWay}">
                                                 <shvco:ItemIcon Icon="{Binding Inner.Icon, Converter={StaticResource ItemIconConverter}}" Quality="{Binding Inner.RankLevel}"/>
                                             </shvco:BottomTextControl>
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/DailyNotePage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/DailyNotePage.xaml
index 7dc058ed..196d4646 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/DailyNotePage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/DailyNotePage.xaml
@@ -2,6 +2,7 @@
     x:Class="Snap.Hutao.View.Page.DailyNotePage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:cw="using:CommunityToolkit.WinUI"
     xmlns:cwc="using:CommunityToolkit.WinUI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -187,11 +188,11 @@
                             ItemsStretch="Fill"
                             MinColumnSpacing="12"
                             MinItemWidth="300"
-                            MinRowSpacing="-4"/>
+                            MinRowSpacing="12"/>
                     </ItemsRepeater.Layout>
                     <ItemsRepeater.ItemTemplate>
                         <DataTemplate>
-                            <ItemContainer>
+                            <ItemContainer cw:Effects.Shadow="{ThemeResource CompatCardShadow}">
                                 <ItemContainer.Resources>
                                     <SolidColorBrush x:Key="ItemContainerPointerOverBackground" Color="Transparent"/>
                                     <SolidColorBrush x:Key="ItemContainerPressedBackground" Color="Transparent"/>
@@ -533,6 +534,5 @@
                 </ItemsRepeater>
             </ScrollView>
         </SplitView>
-
     </Grid>
 </shc:ScopedPage>
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/GachaLogPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/GachaLogPage.xaml
index 4cf947f2..6b5256ae 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/GachaLogPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/GachaLogPage.xaml
@@ -348,10 +348,9 @@
                                         Margin="0,16,0,0"
                                         HorizontalAlignment="Left"
                                         Style="{StaticResource BorderCardStyle}">
-                                        <Grid>
-                                            <shcp:AspectRatio TargetHeight="320" TargetWidth="690"/>
+                                        <cwc:ConstrainedBox AspectRatio="690:320">
                                             <shci:CachedImage Source="{Binding SelectedHistoryWish.BannerImage}"/>
-                                        </Grid>
+                                        </cwc:ConstrainedBox>
                                     </Border>
 
                                     <TextBlock
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/HutaoPassportPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/HutaoPassportPage.xaml
index 30666eeb..6b5f4802 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/HutaoPassportPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/HutaoPassportPage.xaml
@@ -24,7 +24,7 @@
                 <Pivot
                     Width="360"
                     Background="{StaticResource CardBackgroundFillColorDefaultBrush}"
-                    CornerRadius="{StaticResource CompatCornerRadius}">
+                    CornerRadius="{StaticResource ControlCornerRadius}">
                     <PivotItem Header="{shcm:ResourceString Name=ViewPageHutaoPassportLoginHeader}">
                         <StackPanel Margin="16">
                             <TextBox PlaceholderText="{shcm:ResourceString Name=ViewPageHutaoPassportUserNameHint}" Text="{Binding UserName, Mode=TwoWay}"/>
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/LaunchGamePage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/LaunchGamePage.xaml
index 3b435302..c0917667 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/LaunchGamePage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/LaunchGamePage.xaml
@@ -2,6 +2,7 @@
     x:Class="Snap.Hutao.View.Page.LaunchGamePage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:cw="using:CommunityToolkit.WinUI"
     xmlns:cwc="using:CommunityToolkit.WinUI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -27,10 +28,12 @@
         <Visibility x:Key="VisibilityCollapsed">Collapsed</Visibility>
     </Page.Resources>
     <Grid>
-        <Rectangle
+        <Grid
             Height="{StaticResource AppBarThemeCompactHeight}"
             VerticalAlignment="Top"
-            Fill="{ThemeResource CardBackgroundFillColorDefaultBrush}"
+            Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
+            BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
+            BorderThickness="0,0,0,1"
             IsHitTestVisible="False"/>
         <Pivot>
             <Pivot.RightHeader>
@@ -269,6 +272,7 @@
                             <StackPanel>
                                 <shvc:LaunchGameResourceExpander
                                     Margin="16,16,16,0"
+                                    cw:Effects.Shadow="{ThemeResource CompatCardShadow}"
                                     DataContext="{Binding GameResource.PreDownloadGame.Latest, Mode=OneWay}"
                                     Header="{shcm:ResourceString Name=ViewPageLaunchGameResourcePreDownloadHeader}"
                                     Visibility="{Binding FallbackValue={StaticResource VisibilityCollapsed}, Converter={StaticResource EmptyObjectToVisibilityConverter}}"/>
@@ -277,6 +281,7 @@
                                         <DataTemplate>
                                             <shvc:LaunchGameResourceExpander
                                                 Margin="16,16,16,0"
+                                                cw:Effects.Shadow="{ThemeResource CompatCardShadow}"
                                                 DataContext="{Binding Mode=OneWay}"
                                                 Header="{shcm:ResourceString Name=ViewPageLaunchGameResourceDiffHeader}"/>
                                         </DataTemplate>
@@ -284,6 +289,7 @@
                                 </ItemsControl>
                                 <shvc:LaunchGameResourceExpander
                                     Margin="16,16,16,0"
+                                    cw:Effects.Shadow="{ThemeResource CompatCardShadow}"
                                     DataContext="{Binding GameResource.Game.Latest, Mode=OneWay}"
                                     Header="{shcm:ResourceString Name=ViewPageLaunchGameResourceLatestHeader}"/>
                                 <ItemsControl Margin="0,0,0,16" ItemsSource="{Binding GameResource.Game.Diffs, Mode=OneWay}">
@@ -291,6 +297,7 @@
                                         <DataTemplate>
                                             <shvc:LaunchGameResourceExpander
                                                 Margin="16,16,16,0"
+                                                cw:Effects.Shadow="{ThemeResource CompatCardShadow}"
                                                 DataContext="{Binding Mode=OneWay}"
                                                 Header="{shcm:ResourceString Name=ViewPageLaunchGameResourceDiffHeader}"/>
                                         </DataTemplate>
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/WikiWeaponPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/WikiWeaponPage.xaml
index 982977ab..50253653 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/WikiWeaponPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/WikiWeaponPage.xaml
@@ -120,11 +120,7 @@
                                     MaxWidth="800"
                                     Margin="0,0,16,0"
                                     HorizontalAlignment="Left">
-                                    <Border
-                                        Margin="16,16,0,0"
-                                        BorderBrush="{StaticResource CardStrokeColorDefault}"
-                                        BorderThickness="1"
-                                        CornerRadius="{StaticResource CompatCornerRadius}">
+                                    <Border Margin="16,16,0,0" Style="{ThemeResource BorderCardStyle}">
                                         <Border.Background>
                                             <ImageBrush ImageSource="ms-appx:///Resource/Icon/UI_GachaShowPanel_Bg_Weapon.png"/>
                                         </Border.Background>
diff --git a/src/Snap.Hutao/Snap.Hutao/View/UserView.xaml b/src/Snap.Hutao/Snap.Hutao/View/UserView.xaml
index 316de553..c5504ffc 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/UserView.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/UserView.xaml
@@ -2,7 +2,6 @@
     x:Class="Snap.Hutao.View.UserView"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:cwb="using:CommunityToolkit.WinUI.Behaviors"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:mxi="using:Microsoft.Xaml.Interactivity"
@@ -249,7 +248,6 @@
                                 <ListView
                                     Grid.Row="1"
                                     Margin="4"
-                                    CanReorderItems="True"
                                     ItemsSource="{Binding SelectedUser.UserGameRoles}"
                                     SelectedItem="{Binding SelectedUser.SelectedUserGameRole, Mode=TwoWay}"
                                     SelectionMode="Single">