From ee39f7fec5764b9e54bec45bc84a5b6b35d20665 Mon Sep 17 00:00:00 2001
From: Lightczx <1686188646@qq.com>
Date: Mon, 5 Feb 2024 13:55:16 +0800
Subject: [PATCH] refine all page ui

---
 src/Snap.Hutao/Snap.Hutao/App.xaml            |   1 +
 .../Control/Theme/SettingsStyle.xaml          |  13 +-
 .../Snap.Hutao/Control/Theme/Thickness.xaml   |   5 +
 .../Snap.Hutao/Resource/Localization/SH.resx  |   3 +
 src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj   |   6 +
 .../Snap.Hutao/View/Page/AchievementPage.xaml |   4 +-
 .../View/Page/AvatarPropertyPage.xaml         |   4 +-
 .../Snap.Hutao/View/Page/GachaLogPage.xaml    |   2 +-
 .../Snap.Hutao/View/Page/SettingPage.xaml     | 909 +++++++++---------
 .../View/Page/SpiralAbyssRecordPage.xaml      |   6 +-
 .../Snap.Hutao/View/Page/WikiAvatarPage.xaml  | 682 +++++++------
 .../Snap.Hutao/View/Page/WikiMonsterPage.xaml | 246 ++---
 .../Snap.Hutao/View/Page/WikiWeaponPage.xaml  | 379 ++++----
 13 files changed, 1197 insertions(+), 1063 deletions(-)
 create mode 100644 src/Snap.Hutao/Snap.Hutao/Control/Theme/Thickness.xaml

diff --git a/src/Snap.Hutao/Snap.Hutao/App.xaml b/src/Snap.Hutao/Snap.Hutao/App.xaml
index 8460a421..92ab950a 100644
--- a/src/Snap.Hutao/Snap.Hutao/App.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/App.xaml
@@ -23,6 +23,7 @@
                 <ResourceDictionary Source="ms-appx:///Control/Theme/PivotOverride.xaml"/>
                 <ResourceDictionary Source="ms-appx:///Control/Theme/ScrollViewer.xaml"/>
                 <ResourceDictionary Source="ms-appx:///Control/Theme/SettingsStyle.xaml"/>
+                <ResourceDictionary Source="ms-appx:///Control/Theme/Thickness.xaml"/>
                 <ResourceDictionary Source="ms-appx:///Control/Theme/TransitionCollection.xaml"/>
                 <ResourceDictionary Source="ms-appx:///Control/Theme/Uri.xaml"/>
                 <ResourceDictionary Source="ms-appx:///Control/Theme/WindowOverride.xaml"/>
diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Theme/SettingsStyle.xaml b/src/Snap.Hutao/Snap.Hutao/Control/Theme/SettingsStyle.xaml
index f94f8c52..e2917c39 100644
--- a/src/Snap.Hutao/Snap.Hutao/Control/Theme/SettingsStyle.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/Control/Theme/SettingsStyle.xaml
@@ -1,7 +1,4 @@
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:cwc="using:CommunityToolkit.WinUI.Controls">
+<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>
@@ -24,6 +21,14 @@
             <Setter Property="Margin" Value="1,29,0,5"/>
         </Style.Setters>
     </Style>
+    <Style
+        x:Key="SettingsCardHeaderTextBlockStyle"
+        BasedOn="{StaticResource BodyStrongTextBlockStyle}"
+        TargetType="TextBlock">
+        <Style.Setters>
+            <Setter Property="Margin" Value="1,0,0,5"/>
+        </Style.Setters>
+    </Style>
     <Style
         x:Key="SettingsContentComboBoxStyle"
         BasedOn="{StaticResource DefaultComboBoxStyle}"
diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Theme/Thickness.xaml b/src/Snap.Hutao/Snap.Hutao/Control/Theme/Thickness.xaml
new file mode 100644
index 00000000..b4992f89
--- /dev/null
+++ b/src/Snap.Hutao/Snap.Hutao/Control/Theme/Thickness.xaml
@@ -0,0 +1,5 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Thickness x:Key="ListViewInSplitPanePadding">0,2</Thickness>
+    <!--  https://github.com/microsoft/microsoft-ui-xaml/issues/4811  -->
+    <x:Int32 x:Key="__DiscardPageOverride">0</x:Int32>
+</ResourceDictionary>
diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx
index 5cdefd0e..99a8d0d9 100644
--- a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx
+++ b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx
@@ -2333,6 +2333,9 @@
   <data name="ViewPageSettingCacheFolderHeader" xml:space="preserve">
     <value>缓存 文件夹</value>
   </data>
+  <data name="ViewPageSettingCardHutaoPassportHeader" xml:space="preserve">
+    <value>胡桃通行证</value>
+  </data>
   <data name="ViewPageSettingCopyDeviceIdAction" xml:space="preserve">
     <value>复制</value>
   </data>
diff --git a/src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj b/src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj
index f227e789..d09132b6 100644
--- a/src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj
+++ b/src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj
@@ -103,6 +103,7 @@
     <None Remove="Control\Theme\PivotOverride.xaml" />
     <None Remove="Control\Theme\ScrollViewer.xaml" />
     <None Remove="Control\Theme\SettingsStyle.xaml" />
+    <None Remove="Control\Theme\Thickness.xaml" />
     <None Remove="Control\Theme\TransitionCollection.xaml" />
     <None Remove="Control\Theme\Uri.xaml" />
     <None Remove="Control\Theme\WindowOverride.xaml" />
@@ -348,6 +349,11 @@
   <ItemGroup>
     <None Include="..\.editorconfig" Link=".editorconfig" />
   </ItemGroup>
+  <ItemGroup>
+    <Page Update="Control\Theme\Thickness.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
   <ItemGroup>
     <Page Update="View\Page\FeedbackPage.xaml">
       <Generator>MSBuild:Compile</Generator>
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/AchievementPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/AchievementPage.xaml
index d5b0d1b9..c64b6387 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/AchievementPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/AchievementPage.xaml
@@ -313,7 +313,7 @@
                                 PaneBackground="{ThemeResource CardBackgroundFillColorSecondaryBrush}">
                                 <SplitView.Pane>
                                     <ListView
-                                        Padding="0,2,0,1"
+                                        Padding="{ThemeResource ListViewInSplitPanePadding}"
                                         ItemContainerStyle="{StaticResource AchievementGoalListViewItemStyle}"
                                         ItemTemplate="{StaticResource AchievementGoalListTemplate}"
                                         ItemsSource="{Binding AchievementGoals}"
@@ -352,7 +352,7 @@
                                 <GridView.ItemsPanel>
                                     <ItemsPanelTemplate>
                                         <shcp:UniformPanel
-                                            Margin="16,16,12,0"
+                                            Margin="16,16,12,4"
                                             ColumnSpacing="0"
                                             MinItemWidth="200"/>
                                     </ItemsPanelTemplate>
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/AvatarPropertyPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/AvatarPropertyPage.xaml
index a5976044..42fae4ba 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/AvatarPropertyPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/AvatarPropertyPage.xaml
@@ -560,7 +560,7 @@
                                 <ScrollViewer>
                                     <StackPanel x:Name="GridImageExportPanel" Background="Transparent">
                                         <GridView
-                                            Margin="16,16,4,-8"
+                                            Margin="16,16,4,-4"
                                             cwa:ItemsReorderAnimation.Duration="0:0:0.1"
                                             ItemContainerStyle="{StaticResource LargeGridViewItemStyle}"
                                             ItemTemplate="{StaticResource AvatarGridViewTemplate}"
@@ -578,7 +578,7 @@
                                     PaneBackground="{ThemeResource CardBackgroundFillColorSecondaryBrush}">
                                     <SplitView.Pane>
                                         <ListView
-                                            Padding="0,2,0,1"
+                                            Padding="{ThemeResource ListViewInSplitPanePadding}"
                                             ItemTemplate="{StaticResource AvatarListViewTemplate}"
                                             ItemsSource="{Binding Summary.Avatars}"
                                             SelectedItem="{Binding SelectedAvatar, Mode=TwoWay}"/>
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/GachaLogPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/GachaLogPage.xaml
index 0147f472..5df060ab 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/GachaLogPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/GachaLogPage.xaml
@@ -316,7 +316,7 @@
                                 PaneBackground="{ThemeResource CardBackgroundFillColorSecondaryBrush}">
                                 <SplitView.Pane>
                                     <ListView
-                                        Padding="0,1"
+                                        Padding="{ThemeResource ListViewInSplitPanePadding}"
                                         ItemTemplate="{StaticResource HistoryWishListTemplate}"
                                         ItemsSource="{Binding Statistics.HistoryWishes}"
                                         SelectedItem="{Binding SelectedHistoryWish, Mode=TwoWay}"/>
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/SettingPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/SettingPage.xaml
index 457cfe08..5348c1c3 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/SettingPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/SettingPage.xaml
@@ -24,18 +24,17 @@
     <Grid x:Name="SettingPageGrid">
         <ScrollViewer Style="{StaticResource TwoPanelScrollViewerStyle}">
             <shch:ScrollViewerHelper.RightPanel>
-                <StackPanel
+                <Border
                     x:Name="ScrollViwerRightPanel"
-                    Width="360"
+                    Width="400"
                     Margin="0,16,16,16"
-                    Spacing="8"
+                    VerticalAlignment="Top"
+                    cw:Effects.Shadow="{ThemeResource CompatCardShadow}"
                     Visibility="Collapsed">
-                    <Border Margin="1,0,1,1" cw:Effects.Shadow="{ThemeResource CompatCardShadow}">
-                        <Grid BorderThickness="0" Style="{ThemeResource GridCardStyle}">
-                            <Border VerticalAlignment="Stretch" cw:UIElementExtensions.ClipToBounds="True">
-                                <Image Source="ms-appx:///Resource/BlurBackground.png" Stretch="Fill"/>
-                            </Border>
-                            <Grid Background="{ThemeResource SystemControlBackgroundAltMediumBrush}">
+                    <Grid Style="{ThemeResource AcrylicGridCardStyle}">
+                        <StackPanel Padding="16" Spacing="{ThemeResource SettingsCardSpacing}">
+
+                            <Grid Style="{ThemeResource GridCardStyle}">
                                 <Grid.RowDefinitions>
                                     <RowDefinition/>
                                     <RowDefinition Height="auto"/>
@@ -49,7 +48,6 @@
                                     Source="ms-appx:///Assets/Square44x44Logo.targetsize-256.png"/>
                                 <cwc:UniformGrid
                                     Grid.Row="1"
-                                    Margin="8,0"
                                     VerticalAlignment="Bottom"
                                     ColumnSpacing="8"
                                     Columns="2"
@@ -84,445 +82,494 @@
                                     Text="Copyright © 2022 - 2024 DGP Studio. All Rights Reserved."
                                     TextWrapping="Wrap"/>
                             </Grid>
-                        </Grid>
+
+                            <cwc:SettingsExpander
+                                Header="{shcm:ResourceString Name=ViewPageSettingElevatedModeHeader}"
+                                HeaderIcon="{shcm:FontIcon Glyph=&#xE7EF;}"
+                                IsExpanded="True">
+                                <cwc:SettingsExpander.Items>
+                                    <cwc:SettingsCard
+                                        Command="{Binding RestartAsElevatedCommand}"
+                                        Description="{shcm:ResourceString Name=ViewPageSettingElevatedModeDescription}"
+                                        Header="{shcm:ResourceString Name=ViewPageSettingElevatedModeRestartAction}"
+                                        IsClickEnabled="True"
+                                        IsEnabled="{Binding RuntimeOptions.IsElevated, Converter={StaticResource BoolNegationConverter}}"/>
+                                    <cwc:SettingsCard
+                                        ActionIconToolTip="{shcm:ResourceString Name=ViewPageSettingCreateDesktopShortcutAction}"
+                                        Command="{Binding CreateDesktopShortcutCommand}"
+                                        Description="{shcm:ResourceString Name=ViewPageSettingCreateDesktopShortcutDescription}"
+                                        Header="{shcm:ResourceString Name=ViewPageSettingCreateDesktopShortcutHeader}"
+                                        IsClickEnabled="True"/>
+                                </cwc:SettingsExpander.Items>
+                            </cwc:SettingsExpander>
+
+                        </StackPanel>
+                    </Grid>
+                </Border>
+            </shch:ScrollViewerHelper.RightPanel>
+            <Grid HorizontalAlignment="Left">
+                <StackPanel
+                    Grid.Column="0"
+                    Padding="16"
+                    Spacing="16">
+
+                    <Border
+                        x:Name="ScrollViwerTopPanel"
+                        Margin="0,0,0,16"
+                        cw:Effects.Shadow="{ThemeResource CompatCardShadow}">
+                        <Border Padding="16" Style="{ThemeResource AcrylicBorderCardStyle}">
+                            <StackPanel Spacing="{StaticResource SettingsCardSpacing}" Visibility="Visible">
+                                <Grid
+                                    MaxHeight="176"
+                                    BorderThickness="0"
+                                    Style="{ThemeResource GridCardStyle}">
+                                    <Grid Padding="48,28,48,28" ColumnSpacing="48">
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="auto"/>
+                                            <ColumnDefinition/>
+                                        </Grid.ColumnDefinitions>
+                                        <Image
+                                            Grid.Row="0"
+                                            Grid.Column="0"
+                                            MaxWidth="120"
+                                            MaxHeight="120"
+                                            Source="ms-appx:///Assets/Square44x44Logo.targetsize-256.png"/>
+                                        <StackPanel
+                                            Grid.Row="0"
+                                            Grid.Column="1"
+                                            VerticalAlignment="Center"
+                                            Spacing="12">
+                                            <cwc:UniformGrid
+                                                VerticalAlignment="Center"
+                                                ColumnSpacing="8"
+                                                Columns="2"
+                                                RowSpacing="8">
+                                                <HyperlinkButton
+                                                    HorizontalAlignment="Stretch"
+                                                    HorizontalContentAlignment="Left"
+                                                    Content="{shcm:ResourceString Name=ViewPageSettingOfficialSiteNavigate}"
+                                                    NavigateUri="{StaticResource DocumentLink_Home}"/>
+                                                <HyperlinkButton
+                                                    HorizontalAlignment="Stretch"
+                                                    HorizontalContentAlignment="Left"
+                                                    Content="{shcm:ResourceString Name=ViewPageSettingFeedbackNavigate}"
+                                                    NavigateUri="{StaticResource DocumentLink_BugReport}"/>
+                                                <HyperlinkButton
+                                                    HorizontalAlignment="Stretch"
+                                                    HorizontalContentAlignment="Left"
+                                                    Content="{shcm:ResourceString Name=ViewPageSettingTranslateNavigate}"
+                                                    NavigateUri="{StaticResource DocumentLink_Translate}"/>
+                                                <HyperlinkButton
+                                                    HorizontalAlignment="Stretch"
+                                                    HorizontalContentAlignment="Left"
+                                                    Content="{shcm:ResourceString Name=ViewPageSettingSponsorNavigate}"
+                                                    NavigateUri="{StaticResource Sponsor_Afadian}"/>
+                                            </cwc:UniformGrid>
+                                            <TextBlock
+                                                Margin="12,0,0,0"
+                                                Opacity="0.7"
+                                                Style="{StaticResource CaptionTextBlockStyle}"
+                                                Text="Copyright © 2022 - 2024 DGP Studio. All Rights Reserved."
+                                                TextWrapping="Wrap"/>
+                                        </StackPanel>
+                                    </Grid>
+                                </Grid>
+
+                                <cwc:SettingsExpander
+                                    Header="{shcm:ResourceString Name=ViewPageSettingElevatedModeHeader}"
+                                    HeaderIcon="{shcm:FontIcon Glyph=&#xE7EF;}"
+                                    IsExpanded="True">
+                                    <cwc:SettingsExpander.Items>
+                                        <cwc:SettingsCard
+                                            Command="{Binding RestartAsElevatedCommand}"
+                                            Description="{shcm:ResourceString Name=ViewPageSettingElevatedModeDescription}"
+                                            Header="{shcm:ResourceString Name=ViewPageSettingElevatedModeRestartAction}"
+                                            IsClickEnabled="True"
+                                            IsEnabled="{Binding RuntimeOptions.IsElevated, Converter={StaticResource BoolNegationConverter}}"/>
+                                        <cwc:SettingsCard
+                                            ActionIconToolTip="{shcm:ResourceString Name=ViewPageSettingCreateDesktopShortcutAction}"
+                                            Command="{Binding CreateDesktopShortcutCommand}"
+                                            Description="{shcm:ResourceString Name=ViewPageSettingCreateDesktopShortcutDescription}"
+                                            Header="{shcm:ResourceString Name=ViewPageSettingCreateDesktopShortcutHeader}"
+                                            IsClickEnabled="True"/>
+                                    </cwc:SettingsExpander.Items>
+                                </cwc:SettingsExpander>
+                            </StackPanel>
+                        </Border>
                     </Border>
 
-                    <cwc:SettingsExpander
-                        Header="{shcm:ResourceString Name=ViewPageSettingElevatedModeHeader}"
-                        HeaderIcon="{shcm:FontIcon Glyph=&#xE7EF;}"
-                        IsExpanded="True">
-                        <cwc:SettingsExpander.Items>
-                            <cwc:SettingsCard
-                                Command="{Binding RestartAsElevatedCommand}"
-                                Description="{shcm:ResourceString Name=ViewPageSettingElevatedModeDescription}"
-                                Header="{shcm:ResourceString Name=ViewPageSettingElevatedModeRestartAction}"
-                                IsClickEnabled="True"
-                                IsEnabled="{Binding RuntimeOptions.IsElevated, Converter={StaticResource BoolNegationConverter}}"/>
-                            <cwc:SettingsCard
-                                ActionIconToolTip="{shcm:ResourceString Name=ViewPageSettingCreateDesktopShortcutAction}"
-                                Command="{Binding CreateDesktopShortcutCommand}"
-                                Description="{shcm:ResourceString Name=ViewPageSettingCreateDesktopShortcutDescription}"
-                                Header="{shcm:ResourceString Name=ViewPageSettingCreateDesktopShortcutHeader}"
-                                IsClickEnabled="True"/>
-                        </cwc:SettingsExpander.Items>
-                    </cwc:SettingsExpander>
-
-                </StackPanel>
-            </shch:ScrollViewerHelper.RightPanel>
-            <Grid Padding="16" HorizontalAlignment="Left">
-                <StackPanel Grid.Column="0" Spacing="{StaticResource SettingsCardSpacing}">
-
-                    <StackPanel
-                        x:Name="ScrollViwerTopPanel"
-                        Margin="0,0,0,3"
-                        Spacing="{StaticResource SettingsCardSpacing}"
-                        Visibility="Visible">
-                        <Border Margin="1,0,1,2" cw:Effects.Shadow="{ThemeResource CompatCardShadow}">
-                            <Grid
-                                MaxHeight="176"
-                                BorderThickness="0"
-                                Style="{ThemeResource GridCardStyle}">
-                                <Image
-                                    VerticalAlignment="Top"
-                                    Source="ms-appx:///Resource/BlurBackground.png"
-                                    Stretch="UniformToFill"/>
-                                <Grid
-                                    Padding="48,28,48,28"
-                                    Background="{ThemeResource SystemControlBackgroundAltMediumBrush}"
-                                    ColumnSpacing="48">
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="auto"/>
-                                        <ColumnDefinition/>
-                                    </Grid.ColumnDefinitions>
-                                    <Image
-                                        Grid.Row="0"
-                                        Grid.Column="0"
-                                        MaxWidth="120"
-                                        MaxHeight="120"
-                                        Source="ms-appx:///Assets/Square44x44Logo.targetsize-256.png"/>
-                                    <StackPanel
-                                        Grid.Row="0"
-                                        Grid.Column="1"
-                                        VerticalAlignment="Center"
-                                        Spacing="12">
-                                        <cwc:UniformGrid
-                                            VerticalAlignment="Center"
-                                            ColumnSpacing="8"
-                                            Columns="2"
-                                            RowSpacing="8">
-                                            <HyperlinkButton
-                                                HorizontalAlignment="Stretch"
-                                                HorizontalContentAlignment="Left"
-                                                Content="{shcm:ResourceString Name=ViewPageSettingOfficialSiteNavigate}"
-                                                NavigateUri="{StaticResource DocumentLink_Home}"/>
-                                            <HyperlinkButton
-                                                HorizontalAlignment="Stretch"
-                                                HorizontalContentAlignment="Left"
-                                                Content="{shcm:ResourceString Name=ViewPageSettingFeedbackNavigate}"
-                                                NavigateUri="{StaticResource DocumentLink_BugReport}"/>
-                                            <HyperlinkButton
-                                                HorizontalAlignment="Stretch"
-                                                HorizontalContentAlignment="Left"
-                                                Content="{shcm:ResourceString Name=ViewPageSettingTranslateNavigate}"
-                                                NavigateUri="{StaticResource DocumentLink_Translate}"/>
-                                            <HyperlinkButton
-                                                HorizontalAlignment="Stretch"
-                                                HorizontalContentAlignment="Left"
-                                                Content="{shcm:ResourceString Name=ViewPageSettingSponsorNavigate}"
-                                                NavigateUri="{StaticResource Sponsor_Afadian}"/>
-                                        </cwc:UniformGrid>
-                                        <TextBlock
-                                            Margin="12,0,0,0"
-                                            Opacity="0.7"
-                                            Style="{StaticResource CaptionTextBlockStyle}"
-                                            Text="Copyright © 2022 - 2024 DGP Studio. All Rights Reserved."
-                                            TextWrapping="Wrap"/>
-                                    </StackPanel>
-                                </Grid>
-                            </Grid>
-                        </Border>
-
-                        <cwc:SettingsExpander
-                            Header="{shcm:ResourceString Name=ViewPageSettingElevatedModeHeader}"
-                            HeaderIcon="{shcm:FontIcon Glyph=&#xE7EF;}"
-                            IsExpanded="True">
-                            <cwc:SettingsExpander.Items>
-                                <cwc:SettingsCard
-                                    Command="{Binding RestartAsElevatedCommand}"
-                                    Description="{shcm:ResourceString Name=ViewPageSettingElevatedModeDescription}"
-                                    Header="{shcm:ResourceString Name=ViewPageSettingElevatedModeRestartAction}"
-                                    IsClickEnabled="True"
-                                    IsEnabled="{Binding RuntimeOptions.IsElevated, Converter={StaticResource BoolNegationConverter}}"/>
-                                <cwc:SettingsCard
-                                    ActionIconToolTip="{shcm:ResourceString Name=ViewPageSettingCreateDesktopShortcutAction}"
-                                    Command="{Binding CreateDesktopShortcutCommand}"
-                                    Description="{shcm:ResourceString Name=ViewPageSettingCreateDesktopShortcutDescription}"
-                                    Header="{shcm:ResourceString Name=ViewPageSettingCreateDesktopShortcutHeader}"
-                                    IsClickEnabled="True"/>
-                            </cwc:SettingsExpander.Items>
-                        </cwc:SettingsExpander>
-
-                    </StackPanel>
-
-                    <!--
-                        https://github.com/DGP-Studio/Snap.Hutao/issues/1072
-                        ItemsRepeater will behave abnormal if no direct scrollhost wrapping it
-                    -->
-                    <ScrollViewer
-                        Margin="0,-3,0,0"
-                        HorizontalScrollBarVisibility="Disabled"
-                        VerticalScrollBarVisibility="Disabled">
-                        <cwc:SettingsExpander
-                            Description="{Binding UserOptions.UserName}"
-                            Header="{shcm:ResourceString Name=ViewPageSettingHutaoPassportHeader}"
-                            HeaderIcon="{shcm:FontIcon Glyph=&#xE716;}"
-                            IsExpanded="True">
-                            <StackPanel Orientation="Horizontal" Spacing="16">
-                                <Button
-                                    Command="{Binding Passport.LoginCommand}"
-                                    Content="{shcm:ResourceString Name=ViewPageSettingHutaoPassportLoginAction}"
-                                    Style="{ThemeResource SettingButtonStyle}"
-                                    Visibility="{Binding UserOptions.IsLoggedIn, Converter={StaticResource BoolToVisibilityRevertConverter}}"/>
-                                <Button
-                                    Command="{Binding Passport.RegisterCommand}"
-                                    Content="{shcm:ResourceString Name=ViewPageSettingHutaoPassportRegisterAction}"
-                                    Style="{ThemeResource SettingButtonStyle}"
-                                    Visibility="{Binding UserOptions.IsLoggedIn, Converter={StaticResource BoolToVisibilityRevertConverter}}"/>
-                                <Button
-                                    Command="{Binding Passport.LogoutCommand}"
-                                    Content="{shcm:ResourceString Name=ViewPageSettingHutaoPassportLogoutAction}"
-                                    Style="{ThemeResource SettingButtonStyle}"
-                                    Visibility="{Binding UserOptions.IsLoggedIn, Converter={StaticResource BoolToVisibilityConverter}}"/>
+                    <Border Margin="0,-16,0,0" cw:Effects.Shadow="{ThemeResource CompatCardShadow}">
+                        <Border Padding="16" Style="{ThemeResource AcrylicBorderCardStyle}">
+                            <StackPanel Spacing="{ThemeResource SettingsCardSpacing}">
+                                <TextBlock Style="{StaticResource SettingsCardHeaderTextBlockStyle}" Text="{shcm:ResourceString Name=ViewPageSettingCardHutaoPassportHeader}"/>
+                                <!--
+                                    https://github.com/DGP-Studio/Snap.Hutao/issues/1072
+                                    ItemsRepeater will behave abnormal if no direct scrollhost wrapping it
+                                -->
+                                <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Disabled">
+                                    <cwc:SettingsExpander
+                                        Description="{Binding UserOptions.UserName}"
+                                        Header="{shcm:ResourceString Name=ViewPageSettingHutaoPassportHeader}"
+                                        HeaderIcon="{shcm:FontIcon Glyph=&#xE716;}"
+                                        IsExpanded="True">
+                                        <StackPanel Orientation="Horizontal" Spacing="16">
+                                            <Button
+                                                Command="{Binding Passport.LoginCommand}"
+                                                Content="{shcm:ResourceString Name=ViewPageSettingHutaoPassportLoginAction}"
+                                                Style="{ThemeResource SettingButtonStyle}"
+                                                Visibility="{Binding UserOptions.IsLoggedIn, Converter={StaticResource BoolToVisibilityRevertConverter}}"/>
+                                            <Button
+                                                Command="{Binding Passport.RegisterCommand}"
+                                                Content="{shcm:ResourceString Name=ViewPageSettingHutaoPassportRegisterAction}"
+                                                Style="{ThemeResource SettingButtonStyle}"
+                                                Visibility="{Binding UserOptions.IsLoggedIn, Converter={StaticResource BoolToVisibilityRevertConverter}}"/>
+                                            <Button
+                                                Command="{Binding Passport.LogoutCommand}"
+                                                Content="{shcm:ResourceString Name=ViewPageSettingHutaoPassportLogoutAction}"
+                                                Style="{ThemeResource SettingButtonStyle}"
+                                                Visibility="{Binding UserOptions.IsLoggedIn, Converter={StaticResource BoolToVisibilityConverter}}"/>
+                                        </StackPanel>
+                                        <cwc:SettingsExpander.Items>
+                                            <cwc:SettingsCard
+                                                Background="{ThemeResource SystemFillColorSuccessBackgroundBrush}"
+                                                Description="{shcm:ResourceString Name=ViewPageSettingHutaoPassportLicensedDeveloperDescription}"
+                                                Header="{shcm:ResourceString Name=ViewPageSettingHutaoPassportLicensedDeveloperHeader}"
+                                                Visibility="{Binding UserOptions.IsLicensedDeveloper, Converter={StaticResource BoolToVisibilityConverter}}">
+                                                <Button
+                                                    Command="{Binding OpenTestPageCommand}"
+                                                    Content="TEST"
+                                                    Style="{ThemeResource SettingButtonStyle}"/>
+                                            </cwc:SettingsCard>
+                                            <cwc:SettingsCard
+                                                Background="{ThemeResource SystemFillColorSuccessBackgroundBrush}"
+                                                Description="{shcm:ResourceString Name=ViewPageSettingHutaoPassportMaintainerDescription}"
+                                                Header="{shcm:ResourceString Name=ViewPageSettingHutaoPassportMaintainerHeader}"
+                                                Visibility="{Binding UserOptions.IsMaintainer, Converter={StaticResource BoolToVisibilityConverter}}"/>
+                                            <cwc:SettingsCard Description="{Binding UserOptions.GachaLogExpireAtSlim}" Header="{shcm:ResourceString Name=ViewPageSettingHutaoPassportGachaLogExpiredAtHeader}"/>
+                                            <cwc:SettingsCard
+                                                Command="{Binding Passport.OpenRedeemWebsiteCommand}"
+                                                Description="{shcm:ResourceString Name=ViewPageSettingHutaoPassportRedeemCodeDescription}"
+                                                Header="{shcm:ResourceString Name=ViewPageSettingHutaoPassportRedeemCodeHeader}"
+                                                IsClickEnabled="True"/>
+                                            <cwc:SettingsCard
+                                                Background="{ThemeResource SystemFillColorCriticalBackgroundBrush}"
+                                                Description="{shcm:ResourceString Name=ViewPageSettingHutaoPassportDangerZoneDescription}"
+                                                Header="{shcm:ResourceString Name=ViewPageSettingHutaoPassportDangerZoneHeader}">
+                                                <StackPanel Orientation="Horizontal" Spacing="16">
+                                                    <Button
+                                                        Command="{Binding Passport.ResetPasswordCommand}"
+                                                        Content="{shcm:ResourceString Name=ViewPageSettingHutaoPassportResetPasswordAction}"
+                                                        Style="{ThemeResource SettingButtonStyle}"/>
+                                                    <Button
+                                                        Command="{Binding Passport.UnregisterCommand}"
+                                                        Content="{shcm:ResourceString Name=ViewPageSettingHutaoPassportUnregisterAction}"
+                                                        Style="{ThemeResource SettingButtonStyle}"/>
+                                                </StackPanel>
+                                            </cwc:SettingsCard>
+                                        </cwc:SettingsExpander.Items>
+                                    </cwc:SettingsExpander>
+                                </ScrollViewer>
                             </StackPanel>
-                            <cwc:SettingsExpander.Items>
+                        </Border>
+                    </Border>
+
+                    <Border cw:Effects.Shadow="{ThemeResource CompatCardShadow}">
+                        <Border Padding="16" Style="{ThemeResource AcrylicBorderCardStyle}">
+                            <StackPanel Spacing="{ThemeResource SettingsCardSpacing}">
+                                <TextBlock Style="{StaticResource SettingsCardHeaderTextBlockStyle}" Text="{shcm:ResourceString Name=ViewPageSettingGeetestVerificationHeader}"/>
                                 <cwc:SettingsCard
-                                    Background="{ThemeResource SystemFillColorSuccessBackgroundBrush}"
-                                    Description="{shcm:ResourceString Name=ViewPageSettingHutaoPassportLicensedDeveloperDescription}"
-                                    Header="{shcm:ResourceString Name=ViewPageSettingHutaoPassportLicensedDeveloperHeader}"
-                                    Visibility="{Binding UserOptions.IsLicensedDeveloper, Converter={StaticResource BoolToVisibilityConverter}}">
-                                    <Button
-                                        Command="{Binding OpenTestPageCommand}"
-                                        Content="TEST"
-                                        Style="{ThemeResource SettingButtonStyle}"/>
+                                    ActionIcon="{shcm:FontIcon Glyph=&#xF32A;}"
+                                    ActionIconToolTip="{shcm:ResourceString Name=ViewPageSettingGeetestCustomUrlAction}"
+                                    Command="{Binding ConfigureGeetestUrlCommand}"
+                                    Description="{shcm:ResourceString Name=ViewPageSettingGeetestCustomUrlDescription}"
+                                    Header="{shcm:ResourceString Name=ViewPageSettingGeetestCustomUrlHeader}"
+                                    HeaderIcon="{shcm:FontIcon Glyph=&#xE776;}"
+                                    IsClickEnabled="True"/>
+                            </StackPanel>
+                        </Border>
+                    </Border>
+
+                    <Border cw:Effects.Shadow="{ThemeResource CompatCardShadow}">
+                        <Border Padding="16" Style="{ThemeResource AcrylicBorderCardStyle}">
+                            <StackPanel Spacing="{ThemeResource SettingsCardSpacing}">
+                                <TextBlock Style="{StaticResource SettingsCardHeaderTextBlockStyle}" Text="{shcm:ResourceString Name=ViewPageSettingApperanceHeader}"/>
+                                <cwc:SettingsCard
+                                    Description="{shcm:ResourceString Name=ViewPageSettingApperanceLanguageDescription}"
+                                    Header="{shcm:ResourceString Name=ViewPageSettingApperanceLanguageHeader}"
+                                    HeaderIcon="{shcm:FontIcon Glyph=&#xF2B7;}">
+                                    <shc:SizeRestrictedContentControl>
+                                        <ComboBox
+                                            DisplayMemberPath="Name"
+                                            ItemsSource="{Binding CultureOptions.Cultures}"
+                                            SelectedItem="{Binding SelectedCulture, Mode=TwoWay}"/>
+                                    </shc:SizeRestrictedContentControl>
                                 </cwc:SettingsCard>
                                 <cwc:SettingsCard
-                                    Background="{ThemeResource SystemFillColorSuccessBackgroundBrush}"
-                                    Description="{shcm:ResourceString Name=ViewPageSettingHutaoPassportMaintainerDescription}"
-                                    Header="{shcm:ResourceString Name=ViewPageSettingHutaoPassportMaintainerHeader}"
-                                    Visibility="{Binding UserOptions.IsMaintainer, Converter={StaticResource BoolToVisibilityConverter}}"/>
-                                <cwc:SettingsCard Description="{Binding UserOptions.GachaLogExpireAtSlim}" Header="{shcm:ResourceString Name=ViewPageSettingHutaoPassportGachaLogExpiredAtHeader}"/>
+                                    Description="{shcm:ResourceString Name=ViewPageSettingBackdropMaterialDescription}"
+                                    Header="{shcm:ResourceString Name=ViewPageSettingBackdropMaterialHeader}"
+                                    HeaderIcon="{shcm:FontIcon Glyph=&#xE7F7;}">
+                                    <shc:SizeRestrictedContentControl>
+                                        <ComboBox
+                                            DisplayMemberPath="Name"
+                                            ItemsSource="{Binding AppOptions.BackdropTypes}"
+                                            SelectedItem="{Binding SelectedBackdropType, Mode=TwoWay}"/>
+                                    </shc:SizeRestrictedContentControl>
+                                </cwc:SettingsCard>
+                            </StackPanel>
+                        </Border>
+                    </Border>
+
+                    <Border cw:Effects.Shadow="{ThemeResource CompatCardShadow}">
+                        <Border Padding="16" Style="{ThemeResource AcrylicBorderCardStyle}">
+                            <StackPanel Spacing="{ThemeResource SettingsCardSpacing}">
+                                <TextBlock Style="{StaticResource SettingsCardHeaderTextBlockStyle}" Text="{shcm:ResourceString Name=ViewPageSettingKeyShortcutHeader}"/>
                                 <cwc:SettingsCard
-                                    Command="{Binding Passport.OpenRedeemWebsiteCommand}"
-                                    Description="{shcm:ResourceString Name=ViewPageSettingHutaoPassportRedeemCodeDescription}"
-                                    Header="{shcm:ResourceString Name=ViewPageSettingHutaoPassportRedeemCodeHeader}"
-                                    IsClickEnabled="True"/>
-                                <cwc:SettingsCard
-                                    Background="{ThemeResource SystemFillColorCriticalBackgroundBrush}"
-                                    Description="{shcm:ResourceString Name=ViewPageSettingHutaoPassportDangerZoneDescription}"
-                                    Header="{shcm:ResourceString Name=ViewPageSettingHutaoPassportDangerZoneHeader}">
-                                    <StackPanel Orientation="Horizontal" Spacing="16">
+                                    Description="{shcm:ResourceString Name=ViewPageSettingKeyShortcutAutoClickingDescription}"
+                                    Header="{shcm:ResourceString Name=ViewPageSettingKeyShortcutAutoClickingHeader}"
+                                    HeaderIcon="{shcm:FontIcon Glyph=&#xE92E;}">
+                                    <StackPanel Orientation="Horizontal" Spacing="8">
                                         <Button
-                                            Command="{Binding Passport.ResetPasswordCommand}"
-                                            Content="{shcm:ResourceString Name=ViewPageSettingHutaoPassportResetPasswordAction}"
-                                            Style="{ThemeResource SettingButtonStyle}"/>
-                                        <Button
-                                            Command="{Binding Passport.UnregisterCommand}"
-                                            Content="{shcm:ResourceString Name=ViewPageSettingHutaoPassportUnregisterAction}"
-                                            Style="{ThemeResource SettingButtonStyle}"/>
+                                            MinWidth="32"
+                                            MinHeight="32"
+                                            Padding="0"
+                                            VerticalAlignment="Center"
+                                            Content="&#xEDA7;"
+                                            FontFamily="{ThemeResource SymbolThemeFontFamily}"
+                                            Style="{ThemeResource SettingButtonStyle}">
+                                            <Button.Flyout>
+                                                <Flyout FlyoutPresenterStyle="{ThemeResource FlyoutPresenterPadding16And10Style}">
+                                                    <cwc:UniformGrid
+                                                        ColumnSpacing="16"
+                                                        Columns="2"
+                                                        Orientation="Horizontal"
+                                                        RowSpacing="0">
+                                                        <CheckBox
+                                                            MinWidth="64"
+                                                            VerticalAlignment="Center"
+                                                            Content="Win"
+                                                            IsChecked="{Binding HotKeyOptions.MouseClickRepeatForeverKeyCombination.ModifierHasWindows, Mode=TwoWay}"/>
+                                                        <CheckBox
+                                                            MinWidth="64"
+                                                            VerticalAlignment="Center"
+                                                            Content="Ctrl"
+                                                            IsChecked="{Binding HotKeyOptions.MouseClickRepeatForeverKeyCombination.ModifierHasControl, Mode=TwoWay}"/>
+                                                        <CheckBox
+                                                            MinWidth="64"
+                                                            VerticalAlignment="Center"
+                                                            Content="Shift"
+                                                            IsChecked="{Binding HotKeyOptions.MouseClickRepeatForeverKeyCombination.ModifierHasShift, Mode=TwoWay}"/>
+                                                        <CheckBox
+                                                            MinWidth="64"
+                                                            VerticalAlignment="Center"
+                                                            Content="Alt"
+                                                            IsChecked="{Binding HotKeyOptions.MouseClickRepeatForeverKeyCombination.ModifierHasAlt, Mode=TwoWay}"/>
+                                                    </cwc:UniformGrid>
+                                                </Flyout>
+                                            </Button.Flyout>
+                                        </Button>
+                                        <shc:SizeRestrictedContentControl VerticalAlignment="Center">
+                                            <ComboBox
+                                                MinWidth="120"
+                                                VerticalAlignment="Center"
+                                                DisplayMemberPath="Name"
+                                                ItemsSource="{Binding HotKeyOptions.VirtualKeys}"
+                                                SelectedItem="{Binding HotKeyOptions.MouseClickRepeatForeverKeyCombination.KeyNameValue, Mode=TwoWay}"/>
+                                        </shc:SizeRestrictedContentControl>
+                                        <ToggleSwitch
+                                            MinWidth="120"
+                                            VerticalAlignment="Center"
+                                            IsOn="{Binding HotKeyOptions.MouseClickRepeatForeverKeyCombination.IsEnabled, Mode=TwoWay}"/>
                                     </StackPanel>
                                 </cwc:SettingsCard>
-                            </cwc:SettingsExpander.Items>
-                        </cwc:SettingsExpander>
-                    </ScrollViewer>
-                    <TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" Text="{shcm:ResourceString Name=ViewPageSettingGeetestVerificationHeader}"/>
-                    <cwc:SettingsCard
-                        ActionIcon="{shcm:FontIcon Glyph=&#xF32A;}"
-                        ActionIconToolTip="{shcm:ResourceString Name=ViewPageSettingGeetestCustomUrlAction}"
-                        Command="{Binding ConfigureGeetestUrlCommand}"
-                        Description="{shcm:ResourceString Name=ViewPageSettingGeetestCustomUrlDescription}"
-                        Header="{shcm:ResourceString Name=ViewPageSettingGeetestCustomUrlHeader}"
-                        HeaderIcon="{shcm:FontIcon Glyph=&#xE776;}"
-                        IsClickEnabled="True"/>
+                            </StackPanel>
+                        </Border>
+                    </Border>
 
-                    <TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" Text="{shcm:ResourceString Name=ViewPageSettingApperanceHeader}"/>
-                    <cwc:SettingsCard
-                        Description="{shcm:ResourceString Name=ViewPageSettingApperanceLanguageDescription}"
-                        Header="{shcm:ResourceString Name=ViewPageSettingApperanceLanguageHeader}"
-                        HeaderIcon="{shcm:FontIcon Glyph=&#xF2B7;}">
-                        <shc:SizeRestrictedContentControl>
-                            <ComboBox
-                                DisplayMemberPath="Name"
-                                ItemsSource="{Binding CultureOptions.Cultures}"
-                                SelectedItem="{Binding SelectedCulture, Mode=TwoWay}"/>
-                        </shc:SizeRestrictedContentControl>
-                    </cwc:SettingsCard>
-                    <cwc:SettingsCard
-                        Description="{shcm:ResourceString Name=ViewPageSettingBackdropMaterialDescription}"
-                        Header="{shcm:ResourceString Name=ViewPageSettingBackdropMaterialHeader}"
-                        HeaderIcon="{shcm:FontIcon Glyph=&#xE7F7;}">
-                        <shc:SizeRestrictedContentControl>
-                            <ComboBox
-                                DisplayMemberPath="Name"
-                                ItemsSource="{Binding AppOptions.BackdropTypes}"
-                                SelectedItem="{Binding SelectedBackdropType, Mode=TwoWay}"/>
-                        </shc:SizeRestrictedContentControl>
-                    </cwc:SettingsCard>
+                    <Border cw:Effects.Shadow="{ThemeResource CompatCardShadow}">
+                        <Border Padding="16" Style="{ThemeResource AcrylicBorderCardStyle}">
+                            <StackPanel Spacing="{ThemeResource SettingsCardSpacing}">
+                                <TextBlock Style="{StaticResource SettingsCardHeaderTextBlockStyle}" Text="{shcm:ResourceString Name=ViewpageSettingHomeHeader}"/>
+                                <cwc:SettingsExpander
+                                    Description="{shcm:ResourceString Name=ViewpageSettingHomeCardDescription}"
+                                    Header="{shcm:ResourceString Name=ViewpageSettingHomeCardHeader}"
+                                    HeaderIcon="{shcm:FontIcon Glyph=&#xEE40;}"
+                                    IsExpanded="True">
+                                    <cwc:SettingsExpander.Items>
+                                        <cwc:SettingsCard Header="{shcm:ResourceString Name=ViewpageSettingHomeCardItemLaunchGameHeader}">
+                                            <ToggleSwitch
+                                                IsOn="{Binding HomeCardOptions.IsHomeCardLaunchGamePresented, Mode=TwoWay}"
+                                                OffContent="{shcm:ResourceString Name=ViewPageSettingHomeCardOff}"
+                                                OnContent="{shcm:ResourceString Name=ViewPageSettingHomeCardOn}"/>
+                                        </cwc:SettingsCard>
+                                        <cwc:SettingsCard Header="{shcm:ResourceString Name=ViewpageSettingHomeCardItemgachaStatisticsHeader}">
+                                            <ToggleSwitch
+                                                IsOn="{Binding HomeCardOptions.IsHomeCardGachaStatisticsPresented, Mode=TwoWay}"
+                                                OffContent="{shcm:ResourceString Name=ViewPageSettingHomeCardOff}"
+                                                OnContent="{shcm:ResourceString Name=ViewPageSettingHomeCardOn}"/>
+                                        </cwc:SettingsCard>
+                                        <cwc:SettingsCard Header="{shcm:ResourceString Name=ViewpageSettingHomeCardItemAchievementHeader}">
+                                            <ToggleSwitch
+                                                IsOn="{Binding HomeCardOptions.IsHomeCardAchievementPresented, Mode=TwoWay}"
+                                                OffContent="{shcm:ResourceString Name=ViewPageSettingHomeCardOff}"
+                                                OnContent="{shcm:ResourceString Name=ViewPageSettingHomeCardOn}"/>
+                                        </cwc:SettingsCard>
+                                        <cwc:SettingsCard Header="{shcm:ResourceString Name=ViewpageSettingHomeCardItemDailyNoteHeader}">
+                                            <ToggleSwitch
+                                                IsOn="{Binding HomeCardOptions.IsHomeCardDailyNotePresented, Mode=TwoWay}"
+                                                OffContent="{shcm:ResourceString Name=ViewPageSettingHomeCardOff}"
+                                                OnContent="{shcm:ResourceString Name=ViewPageSettingHomeCardOn}"/>
+                                        </cwc:SettingsCard>
+                                    </cwc:SettingsExpander.Items>
+                                </cwc:SettingsExpander>
+                                <cwc:SettingsCard
+                                    Description="{shcm:ResourceString Name=ViewPageSettingHomeAnnouncementRegionDescription}"
+                                    Header="{shcm:ResourceString Name=ViewPageSettingHomeAnnouncementRegionHeader}"
+                                    HeaderIcon="{shcm:FontIcon Glyph=&#xE8E4;}">
+                                    <shc:SizeRestrictedContentControl>
+                                        <ComboBox
+                                            DisplayMemberPath="Name"
+                                            ItemsSource="{Binding AppOptions.LazyRegions.Value}"
+                                            SelectedItem="{Binding SelectedRegion, Mode=TwoWay}"/>
+                                    </shc:SizeRestrictedContentControl>
+                                </cwc:SettingsCard>
+                            </StackPanel>
+                        </Border>
+                    </Border>
 
-                    <TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" Text="{shcm:ResourceString Name=ViewPageSettingKeyShortcutHeader}"/>
-                    <cwc:SettingsCard
-                        Description="{shcm:ResourceString Name=ViewPageSettingKeyShortcutAutoClickingDescription}"
-                        Header="{shcm:ResourceString Name=ViewPageSettingKeyShortcutAutoClickingHeader}"
-                        HeaderIcon="{shcm:FontIcon Glyph=&#xE92E;}">
-                        <StackPanel Orientation="Horizontal" Spacing="8">
-                            <Button
-                                MinWidth="32"
-                                MinHeight="32"
-                                Padding="0"
-                                VerticalAlignment="Center"
-                                Content="&#xEDA7;"
-                                FontFamily="{ThemeResource SymbolThemeFontFamily}"
-                                Style="{ThemeResource SettingButtonStyle}">
-                                <Button.Flyout>
-                                    <Flyout FlyoutPresenterStyle="{ThemeResource FlyoutPresenterPadding16And10Style}">
-                                        <cwc:UniformGrid
-                                            ColumnSpacing="16"
-                                            Columns="2"
-                                            Orientation="Horizontal"
-                                            RowSpacing="0">
-                                            <CheckBox
-                                                MinWidth="64"
-                                                VerticalAlignment="Center"
-                                                Content="Win"
-                                                IsChecked="{Binding HotKeyOptions.MouseClickRepeatForeverKeyCombination.ModifierHasWindows, Mode=TwoWay}"/>
-                                            <CheckBox
-                                                MinWidth="64"
-                                                VerticalAlignment="Center"
-                                                Content="Ctrl"
-                                                IsChecked="{Binding HotKeyOptions.MouseClickRepeatForeverKeyCombination.ModifierHasControl, Mode=TwoWay}"/>
-                                            <CheckBox
-                                                MinWidth="64"
-                                                VerticalAlignment="Center"
-                                                Content="Shift"
-                                                IsChecked="{Binding HotKeyOptions.MouseClickRepeatForeverKeyCombination.ModifierHasShift, Mode=TwoWay}"/>
-                                            <CheckBox
-                                                MinWidth="64"
-                                                VerticalAlignment="Center"
-                                                Content="Alt"
-                                                IsChecked="{Binding HotKeyOptions.MouseClickRepeatForeverKeyCombination.ModifierHasAlt, Mode=TwoWay}"/>
-                                        </cwc:UniformGrid>
-                                    </Flyout>
-                                </Button.Flyout>
-                            </Button>
-                            <shc:SizeRestrictedContentControl VerticalAlignment="Center">
-                                <ComboBox
-                                    MinWidth="120"
-                                    VerticalAlignment="Center"
-                                    DisplayMemberPath="Name"
-                                    ItemsSource="{Binding HotKeyOptions.VirtualKeys}"
-                                    SelectedItem="{Binding HotKeyOptions.MouseClickRepeatForeverKeyCombination.KeyNameValue, Mode=TwoWay}"/>
-                            </shc:SizeRestrictedContentControl>
-                            <ToggleSwitch
-                                MinWidth="120"
-                                VerticalAlignment="Center"
-                                IsOn="{Binding HotKeyOptions.MouseClickRepeatForeverKeyCombination.IsEnabled, Mode=TwoWay}"/>
-                        </StackPanel>
-                    </cwc:SettingsCard>
+                    <Border cw:Effects.Shadow="{ThemeResource CompatCardShadow}">
+                        <Border Padding="16" Style="{ThemeResource AcrylicBorderCardStyle}">
+                            <StackPanel Spacing="{ThemeResource SettingsCardSpacing}">
+                                <TextBlock Style="{StaticResource SettingsCardHeaderTextBlockStyle}" Text="{shcm:ResourceString Name=ViewPageSettingGameHeader}"/>
+                                <cwc:SettingsCard
+                                    ActionIcon="{shcm:FontIcon Glyph=&#xE76C;}"
+                                    ActionIconToolTip="{shcm:ResourceString Name=ViewPageSettingDeleteCacheAction}"
+                                    Command="{Binding DeleteGameWebCacheCommand}"
+                                    Description="{shcm:ResourceString Name=ViewPageSettingDeleteCacheDescription}"
+                                    Header="{shcm:ResourceString Name=ViewPageSettingDeleteCacheHeader}"
+                                    HeaderIcon="{shcm:FontIcon Glyph=&#xE74D;}"
+                                    IsClickEnabled="True"/>
+                            </StackPanel>
+                        </Border>
+                    </Border>
 
-                    <TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" Text="{shcm:ResourceString Name=ViewpageSettingHomeHeader}"/>
-                    <cwc:SettingsExpander
-                        Description="{shcm:ResourceString Name=ViewpageSettingHomeCardDescription}"
-                        Header="{shcm:ResourceString Name=ViewpageSettingHomeCardHeader}"
-                        HeaderIcon="{shcm:FontIcon Glyph=&#xEE40;}"
-                        IsExpanded="True">
-                        <cwc:SettingsExpander.Items>
-                            <cwc:SettingsCard Header="{shcm:ResourceString Name=ViewpageSettingHomeCardItemLaunchGameHeader}">
-                                <ToggleSwitch
-                                    IsOn="{Binding HomeCardOptions.IsHomeCardLaunchGamePresented, Mode=TwoWay}"
-                                    OffContent="{shcm:ResourceString Name=ViewPageSettingHomeCardOff}"
-                                    OnContent="{shcm:ResourceString Name=ViewPageSettingHomeCardOn}"/>
-                            </cwc:SettingsCard>
-                            <cwc:SettingsCard Header="{shcm:ResourceString Name=ViewpageSettingHomeCardItemgachaStatisticsHeader}">
-                                <ToggleSwitch
-                                    IsOn="{Binding HomeCardOptions.IsHomeCardGachaStatisticsPresented, Mode=TwoWay}"
-                                    OffContent="{shcm:ResourceString Name=ViewPageSettingHomeCardOff}"
-                                    OnContent="{shcm:ResourceString Name=ViewPageSettingHomeCardOn}"/>
-                            </cwc:SettingsCard>
-                            <cwc:SettingsCard Header="{shcm:ResourceString Name=ViewpageSettingHomeCardItemAchievementHeader}">
-                                <ToggleSwitch
-                                    IsOn="{Binding HomeCardOptions.IsHomeCardAchievementPresented, Mode=TwoWay}"
-                                    OffContent="{shcm:ResourceString Name=ViewPageSettingHomeCardOff}"
-                                    OnContent="{shcm:ResourceString Name=ViewPageSettingHomeCardOn}"/>
-                            </cwc:SettingsCard>
-                            <cwc:SettingsCard Header="{shcm:ResourceString Name=ViewpageSettingHomeCardItemDailyNoteHeader}">
-                                <ToggleSwitch
-                                    IsOn="{Binding HomeCardOptions.IsHomeCardDailyNotePresented, Mode=TwoWay}"
-                                    OffContent="{shcm:ResourceString Name=ViewPageSettingHomeCardOff}"
-                                    OnContent="{shcm:ResourceString Name=ViewPageSettingHomeCardOn}"/>
-                            </cwc:SettingsCard>
-                        </cwc:SettingsExpander.Items>
-                    </cwc:SettingsExpander>
-                    <cwc:SettingsCard
-                        Description="{shcm:ResourceString Name=ViewPageSettingHomeAnnouncementRegionDescription}"
-                        Header="{shcm:ResourceString Name=ViewPageSettingHomeAnnouncementRegionHeader}"
-                        HeaderIcon="{shcm:FontIcon Glyph=&#xE8E4;}">
-                        <shc:SizeRestrictedContentControl>
-                            <ComboBox
-                                DisplayMemberPath="Name"
-                                ItemsSource="{Binding AppOptions.LazyRegions.Value}"
-                                SelectedItem="{Binding SelectedRegion, Mode=TwoWay}"/>
-                        </shc:SizeRestrictedContentControl>
-                    </cwc:SettingsCard>
+                    <Border cw:Effects.Shadow="{ThemeResource CompatCardShadow}">
+                        <Border Padding="16" Style="{ThemeResource AcrylicBorderCardStyle}">
+                            <StackPanel Spacing="{ThemeResource SettingsCardSpacing}">
+                                <TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" Text="{shcm:ResourceString Name=ViewPageSettingGachaLogHeader}"/>
+                                <cwc:SettingsCard
+                                    Description="{shcm:ResourceString Name=ViewPageSettingEmptyHistoryVisibleDescription}"
+                                    Header="{shcm:ResourceString Name=ViewPageSettingEmptyHistoryVisibleHeader}"
+                                    HeaderIcon="{shcm:FontIcon Glyph=&#xE81C;}">
+                                    <ToggleSwitch
+                                        IsOn="{Binding AppOptions.IsEmptyHistoryWishVisible, Mode=TwoWay}"
+                                        OffContent="{shcm:ResourceString Name=ViewPageSettingEmptyHistoryVisibleOff}"
+                                        OnContent="{shcm:ResourceString Name=ViewPageSettingEmptyHistoryVisibleOn}"/>
+                                </cwc:SettingsCard>
+                            </StackPanel>
+                        </Border>
+                    </Border>
 
-                    <TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" Text="{shcm:ResourceString Name=ViewPageSettingGameHeader}"/>
-                    <cwc:SettingsCard
-                        ActionIcon="{shcm:FontIcon Glyph=&#xE76C;}"
-                        ActionIconToolTip="{shcm:ResourceString Name=ViewPageSettingDeleteCacheAction}"
-                        Command="{Binding DeleteGameWebCacheCommand}"
-                        Description="{shcm:ResourceString Name=ViewPageSettingDeleteCacheDescription}"
-                        Header="{shcm:ResourceString Name=ViewPageSettingDeleteCacheHeader}"
-                        HeaderIcon="{shcm:FontIcon Glyph=&#xE74D;}"
-                        IsClickEnabled="True"/>
+                    <Border cw:Effects.Shadow="{ThemeResource CompatCardShadow}">
+                        <Border Padding="16" Style="{ThemeResource AcrylicBorderCardStyle}">
+                            <StackPanel Spacing="{ThemeResource SettingsCardSpacing}">
+                                <TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" Text="{shcm:ResourceString Name=ViewPageSettingStorageHeader}"/>
+                                <cwc:SettingsExpander
+                                    Description="{Binding DataFolderView.Size}"
+                                    Header="{shcm:ResourceString Name=ViewPageSettingDataFolderHeader}"
+                                    HeaderIcon="{shcm:FontIcon Glyph=&#xEC25;}">
+                                    <cwc:SettingsExpander.Content>
+                                        <Button
+                                            Command="{Binding DataFolderView.OpenFolderCommand}"
+                                            Content="{shcm:ResourceString Name=ViewSettingFolderViewOpenFolderAction}"
+                                            Style="{ThemeResource SettingButtonStyle}"/>
+                                    </cwc:SettingsExpander.Content>
+                                    <cwc:SettingsExpander.Items>
+                                        <cwc:SettingsCard
+                                            ActionIcon="{shcm:FontIcon Glyph=&#xE76C;}"
+                                            ActionIconToolTip="{shcm:ResourceString Name=ViewPageSettingStorageSetAction}"
+                                            Command="{Binding SetDataFolderCommand}"
+                                            Description="{shcm:ResourceString Name=ViewPageSettingSetDataFolderDescription}"
+                                            Header="{shcm:ResourceString Name=ViewPageSettingSetDataFolderHeader}"
+                                            IsClickEnabled="True"/>
+                                        <cwc:SettingsCard
+                                            ActionIcon="{shcm:FontIcon Glyph=&#xE76C;}"
+                                            Command="{Binding DeleteServerCacheFolderCommand}"
+                                            Description="{shcm:ResourceString Name=ViewSettingDeleteServerCacheFolderDescription}"
+                                            Header="{shcm:ResourceString Name=ViewSettingDeleteServerCacheFolderHeader}"
+                                            IsClickEnabled="True"/>
+                                    </cwc:SettingsExpander.Items>
+                                </cwc:SettingsExpander>
+                                <cwc:SettingsExpander
+                                    Description="{Binding CacheFolderView.Size}"
+                                    Header="{shcm:ResourceString Name=ViewPageSettingCacheFolderHeader}"
+                                    HeaderIcon="{shcm:FontIcon Glyph=&#xE8B7;}">
+                                    <cwc:SettingsExpander.Content>
+                                        <Button
+                                            Command="{Binding CacheFolderView.OpenFolderCommand}"
+                                            Content="{shcm:ResourceString Name=ViewSettingFolderViewOpenFolderAction}"
+                                            Style="{ThemeResource SettingButtonStyle}"/>
+                                    </cwc:SettingsExpander.Content>
+                                    <cwc:SettingsExpander.Items>
+                                        <cwc:SettingsCard
+                                            ActionIcon="{shcm:FontIcon Glyph=&#xE76C;}"
+                                            ActionIconToolTip="{shcm:ResourceString Name=ViewPageSettingResetAction}"
+                                            Command="{Binding ResetStaticResourceCommand}"
+                                            Description="{shcm:ResourceString Name=ViewPageSettingResetStaticResourceDescription}"
+                                            Header="{shcm:ResourceString Name=ViewPageSettingResetStaticResourceHeader}"
+                                            IsClickEnabled="True"/>
+                                    </cwc:SettingsExpander.Items>
+                                </cwc:SettingsExpander>
+                            </StackPanel>
+                        </Border>
+                    </Border>
 
-                    <TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" Text="{shcm:ResourceString Name=ViewPageSettingGachaLogHeader}"/>
-                    <cwc:SettingsCard
-                        Description="{shcm:ResourceString Name=ViewPageSettingEmptyHistoryVisibleDescription}"
-                        Header="{shcm:ResourceString Name=ViewPageSettingEmptyHistoryVisibleHeader}"
-                        HeaderIcon="{shcm:FontIcon Glyph=&#xE81C;}">
-                        <ToggleSwitch
-                            IsOn="{Binding AppOptions.IsEmptyHistoryWishVisible, Mode=TwoWay}"
-                            OffContent="{shcm:ResourceString Name=ViewPageSettingEmptyHistoryVisibleOff}"
-                            OnContent="{shcm:ResourceString Name=ViewPageSettingEmptyHistoryVisibleOn}"/>
-                    </cwc:SettingsCard>
-
-                    <TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" Text="{shcm:ResourceString Name=ViewPageSettingStorageHeader}"/>
-                    <cwc:SettingsExpander
-                        Description="{Binding DataFolderView.Size}"
-                        Header="{shcm:ResourceString Name=ViewPageSettingDataFolderHeader}"
-                        HeaderIcon="{shcm:FontIcon Glyph=&#xEC25;}">
-                        <cwc:SettingsExpander.Content>
-                            <Button
-                                Command="{Binding DataFolderView.OpenFolderCommand}"
-                                Content="{shcm:ResourceString Name=ViewSettingFolderViewOpenFolderAction}"
-                                Style="{ThemeResource SettingButtonStyle}"/>
-                        </cwc:SettingsExpander.Content>
-                        <cwc:SettingsExpander.Items>
-                            <cwc:SettingsCard
-                                ActionIcon="{shcm:FontIcon Glyph=&#xE76C;}"
-                                ActionIconToolTip="{shcm:ResourceString Name=ViewPageSettingStorageSetAction}"
-                                Command="{Binding SetDataFolderCommand}"
-                                Description="{shcm:ResourceString Name=ViewPageSettingSetDataFolderDescription}"
-                                Header="{shcm:ResourceString Name=ViewPageSettingSetDataFolderHeader}"
-                                IsClickEnabled="True"/>
-                            <cwc:SettingsCard
-                                ActionIcon="{shcm:FontIcon Glyph=&#xE76C;}"
-                                Command="{Binding DeleteServerCacheFolderCommand}"
-                                Description="{shcm:ResourceString Name=ViewSettingDeleteServerCacheFolderDescription}"
-                                Header="{shcm:ResourceString Name=ViewSettingDeleteServerCacheFolderHeader}"
-                                IsClickEnabled="True"/>
-                        </cwc:SettingsExpander.Items>
-                    </cwc:SettingsExpander>
-                    <cwc:SettingsExpander
-                        Description="{Binding CacheFolderView.Size}"
-                        Header="{shcm:ResourceString Name=ViewPageSettingCacheFolderHeader}"
-                        HeaderIcon="{shcm:FontIcon Glyph=&#xE8B7;}">
-                        <cwc:SettingsExpander.Content>
-                            <Button
-                                Command="{Binding CacheFolderView.OpenFolderCommand}"
-                                Content="{shcm:ResourceString Name=ViewSettingFolderViewOpenFolderAction}"
-                                Style="{ThemeResource SettingButtonStyle}"/>
-                        </cwc:SettingsExpander.Content>
-                        <cwc:SettingsExpander.Items>
-                            <cwc:SettingsCard
-                                ActionIcon="{shcm:FontIcon Glyph=&#xE76C;}"
-                                ActionIconToolTip="{shcm:ResourceString Name=ViewPageSettingResetAction}"
-                                Command="{Binding ResetStaticResourceCommand}"
-                                Description="{shcm:ResourceString Name=ViewPageSettingResetStaticResourceDescription}"
-                                Header="{shcm:ResourceString Name=ViewPageSettingResetStaticResourceHeader}"
-                                IsClickEnabled="True"/>
-                        </cwc:SettingsExpander.Items>
-                    </cwc:SettingsExpander>
-
-                    <TextBlock
-                        Foreground="{ThemeResource SystemFillColorCriticalBrush}"
-                        Style="{StaticResource SettingsSectionHeaderTextBlockStyle}"
-                        Text="{shcm:ResourceString Name=ViewPageSettingDangerousHeader}"/>
-                    <cwc:SettingsCard
-                        Description="{shcm:ResourceString Name=ViewSettingAllocConsoleDescription}"
-                        Header="{shcm:ResourceString Name=ViewSettingAllocConsoleHeader}"
-                        HeaderIcon="{cw:FontIcon Glyph=&#xE756;}">
-                        <ToggleSwitch Width="120" IsOn="{Binding IsAllocConsoleDebugModeEnabled, Mode=TwoWay}"/>
-                    </cwc:SettingsCard>
-                    <cwc:SettingsCard
-                        Header="{shcm:ResourceString Name=ViewPageSettingIsAdvancedLaunchOptionsEnabledHeader}"
-                        HeaderIcon="{shcm:FontIcon Glyph=&#xE730;}"
-                        IsEnabled="{Binding RuntimeOptions.IsElevated}">
-                        <cwc:SettingsCard.Description>
-                            <StackPanel>
+                    <Border cw:Effects.Shadow="{ThemeResource CompatCardShadow}">
+                        <Border Padding="16" Style="{ThemeResource AcrylicBorderCardStyle}">
+                            <StackPanel Spacing="{ThemeResource SettingsCardSpacing}">
                                 <TextBlock
                                     Foreground="{ThemeResource SystemFillColorCriticalBrush}"
-                                    Text="{shcm:ResourceString Name=ViewPageSettingFeaturesDangerousHint}"
-                                    Visibility="{Binding LaunchOptions.IsAdvancedLaunchOptionsEnabled, Converter={StaticResource BoolToVisibilityConverter}}"/>
-                                <TextBlock Text="{shcm:ResourceString Name=ViewPageSettingIsAdvancedLaunchOptionsEnabledDescription}" Visibility="{Binding LaunchOptions.IsAdvancedLaunchOptionsEnabled, Converter={StaticResource BoolToVisibilityRevertConverter}}"/>
+                                    Style="{StaticResource SettingsCardHeaderTextBlockStyle}"
+                                    Text="{shcm:ResourceString Name=ViewPageSettingDangerousHeader}"/>
+                                <cwc:SettingsCard
+                                    Description="{shcm:ResourceString Name=ViewSettingAllocConsoleDescription}"
+                                    Header="{shcm:ResourceString Name=ViewSettingAllocConsoleHeader}"
+                                    HeaderIcon="{cw:FontIcon Glyph=&#xE756;}">
+                                    <ToggleSwitch Width="120" IsOn="{Binding IsAllocConsoleDebugModeEnabled, Mode=TwoWay}"/>
+                                </cwc:SettingsCard>
+                                <cwc:SettingsCard
+                                    Header="{shcm:ResourceString Name=ViewPageSettingIsAdvancedLaunchOptionsEnabledHeader}"
+                                    HeaderIcon="{shcm:FontIcon Glyph=&#xE730;}"
+                                    IsEnabled="{Binding RuntimeOptions.IsElevated}">
+                                    <cwc:SettingsCard.Description>
+                                        <StackPanel>
+                                            <TextBlock
+                                                Foreground="{ThemeResource SystemFillColorCriticalBrush}"
+                                                Text="{shcm:ResourceString Name=ViewPageSettingFeaturesDangerousHint}"
+                                                Visibility="{Binding LaunchOptions.IsAdvancedLaunchOptionsEnabled, Converter={StaticResource BoolToVisibilityConverter}}"/>
+                                            <TextBlock Text="{shcm:ResourceString Name=ViewPageSettingIsAdvancedLaunchOptionsEnabledDescription}" Visibility="{Binding LaunchOptions.IsAdvancedLaunchOptionsEnabled, Converter={StaticResource BoolToVisibilityRevertConverter}}"/>
+                                        </StackPanel>
+                                    </cwc:SettingsCard.Description>
+                                    <StackPanel Orientation="Horizontal">
+                                        <shvc:Elevation Visibility="{Binding RuntimeOptions.IsElevated, Converter={StaticResource BoolToVisibilityRevertConverter}}"/>
+                                        <ToggleSwitch Width="120" IsOn="{Binding IsAdvancedLaunchOptionsEnabled, Mode=TwoWay}"/>
+                                    </StackPanel>
+                                </cwc:SettingsCard>
+                                <cwc:SettingsCard
+                                    ActionIconToolTip="{shcm:ResourceString Name=ViewPageSettingDangerousAction}"
+                                    Command="{Binding DeleteUsersCommand}"
+                                    Header="{shcm:ResourceString Name=ViewPageSettingDeleteUserHeader}"
+                                    HeaderIcon="{shcm:FontIcon Glyph=&#xE756;}"
+                                    IsClickEnabled="True">
+                                    <cwc:SettingsCard.Description>
+                                        <StackPanel>
+                                            <TextBlock Foreground="{ThemeResource SystemFillColorCriticalBrush}" Text="{shcm:ResourceString Name=ViewPageSettingDangerousHint}"/>
+                                            <TextBlock Text="{shcm:ResourceString Name=ViewPageSettingDeleteUserDescription}"/>
+                                        </StackPanel>
+                                    </cwc:SettingsCard.Description>
+                                </cwc:SettingsCard>
                             </StackPanel>
-                        </cwc:SettingsCard.Description>
-                        <StackPanel Orientation="Horizontal">
-                            <shvc:Elevation Visibility="{Binding RuntimeOptions.IsElevated, Converter={StaticResource BoolToVisibilityRevertConverter}}"/>
-                            <ToggleSwitch Width="120" IsOn="{Binding IsAdvancedLaunchOptionsEnabled, Mode=TwoWay}"/>
-                        </StackPanel>
-                    </cwc:SettingsCard>
-                    <cwc:SettingsCard
-                        ActionIconToolTip="{shcm:ResourceString Name=ViewPageSettingDangerousAction}"
-                        Command="{Binding DeleteUsersCommand}"
-                        Header="{shcm:ResourceString Name=ViewPageSettingDeleteUserHeader}"
-                        HeaderIcon="{shcm:FontIcon Glyph=&#xE756;}"
-                        IsClickEnabled="True">
-                        <cwc:SettingsCard.Description>
-                            <StackPanel>
-                                <TextBlock Foreground="{ThemeResource SystemFillColorCriticalBrush}" Text="{shcm:ResourceString Name=ViewPageSettingDangerousHint}"/>
-                                <TextBlock Text="{shcm:ResourceString Name=ViewPageSettingDeleteUserDescription}"/>
-                            </StackPanel>
-                        </cwc:SettingsCard.Description>
-                    </cwc:SettingsCard>
+                        </Border>
+                    </Border>
                 </StackPanel>
             </Grid>
         </ScrollViewer>
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/SpiralAbyssRecordPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/SpiralAbyssRecordPage.xaml
index 8688fbd7..76ae8f69 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/SpiralAbyssRecordPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/SpiralAbyssRecordPage.xaml
@@ -328,6 +328,7 @@
                             PaneBackground="Transparent">
                             <SplitView.Pane>
                                 <ListView
+                                    Padding="{ThemeResource ListViewInSplitPanePadding}"
                                     Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
                                     ItemTemplate="{StaticResource SpiralAbyssListTemplate}"
                                     ItemsSource="{Binding SpiralAbyssEntries}"
@@ -851,7 +852,10 @@
 
                         </PivotItem>
                     </Pivot>
-                    <shvcon:LoadingView Margin="16" IsLoading="{Binding Overview, Converter={StaticResource EmptyObjectToBoolRevertConverter}}"/>
+                    <shvcon:LoadingView
+                        Margin="16"
+                        CornerRadius="{ThemeResource ControlCornerRadius}"
+                        IsLoading="{Binding Overview, Converter={StaticResource EmptyObjectToBoolRevertConverter}}"/>
                 </Grid>
             </PivotItem>
         </Pivot>
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/WikiAvatarPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/WikiAvatarPage.xaml
index 01a97009..19ed93a0 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/WikiAvatarPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/WikiAvatarPage.xaml
@@ -302,7 +302,7 @@
                                 PaneBackground="{ThemeResource CardBackgroundFillColorSecondaryBrush}">
                                 <SplitView.Pane>
                                     <ListView
-                                        Margin="0,1"
+                                        Padding="{ThemeResource ListViewInSplitPanePadding}"
                                         ItemTemplate="{StaticResource AvatarListTemplate}"
                                         ItemsSource="{Binding Avatars}"
                                         SelectedItem="{Binding Selected, Mode=TwoWay}"
@@ -314,369 +314,367 @@
 
                                 </SplitView.Pane>
                                 <SplitView.Content>
-                                    <Grid>
-                                        <ScrollViewer>
-                                            <StackPanel
-                                                Padding="16,16,16,16"
-                                                HorizontalAlignment="Left"
-                                                Spacing="16">
-                                                <!--  简介  -->
-                                                <Grid Style="{ThemeResource GridCardStyle}">
+                                    <ScrollViewer>
+                                        <StackPanel
+                                            Padding="16,16,16,16"
+                                            HorizontalAlignment="Left"
+                                            Spacing="16">
+                                            <!--  简介  -->
+                                            <Grid Style="{ThemeResource GridCardStyle}">
+                                                <Grid.RowDefinitions>
+                                                    <RowDefinition/>
+                                                    <RowDefinition/>
+                                                </Grid.RowDefinitions>
+                                                <Grid.ColumnDefinitions>
+                                                    <ColumnDefinition Width="auto"/>
+                                                    <ColumnDefinition/>
+                                                </Grid.ColumnDefinitions>
+                                                <StackPanel Grid.Column="0" Margin="16">
+                                                    <Grid Margin="0,0,0,12" ColumnSpacing="8">
+                                                        <Grid.ColumnDefinitions>
+                                                            <ColumnDefinition Width="auto"/>
+                                                            <ColumnDefinition Width="auto"/>
+                                                        </Grid.ColumnDefinitions>
+                                                        <shci:MonoChrome
+                                                            Grid.Column="0"
+                                                            Width="32"
+                                                            Height="32"
+                                                            HorizontalAlignment="Left"
+                                                            Source="{Binding Selected.FetterInfo.VisionBefore, Converter={StaticResource ElementNameIconConverter}}"/>
+                                                        <shci:MonoChrome
+                                                            Grid.Column="1"
+                                                            Width="32"
+                                                            Height="32"
+                                                            Source="{Binding Selected.Weapon, Converter={StaticResource WeaponTypeIconConverter}}"/>
+                                                    </Grid>
+                                                    <shvcont:ItemIcon
+                                                        Width="128"
+                                                        Height="128"
+                                                        Icon="{Binding Selected.Icon, Converter={StaticResource AvatarIconConverter}, Mode=OneWay}"
+                                                        Quality="{Binding Selected.Quality, Mode=OneWay}"/>
+                                                </StackPanel>
+
+                                                <StackPanel Grid.Column="1" Margin="16">
+                                                    <StackPanel Margin="0,0,0,2" Orientation="Horizontal">
+                                                        <TextBlock
+                                                            VerticalAlignment="Center"
+                                                            Style="{StaticResource SubtitleTextBlockStyle}"
+                                                            Text="{Binding Selected.Name}"/>
+                                                        <TextBlock
+                                                            Margin="24,0,0,0"
+                                                            VerticalAlignment="Center"
+                                                            Style="{StaticResource SubtitleTextBlockStyle}"
+                                                            Text="{Binding Selected.FetterInfo.Title}"/>
+                                                    </StackPanel>
+
+                                                    <TextBlock
+                                                        Opacity="0.7"
+                                                        Style="{StaticResource CaptionTextBlockStyle}"
+                                                        Text="{Binding Selected.FetterInfo.Detail}"
+                                                        TextWrapping="NoWrap"/>
+
+                                                    <cwc:UniformGrid
+                                                        Margin="0,16,0,0"
+                                                        ColumnSpacing="6"
+                                                        Columns="4">
+                                                        <StackPanel>
+                                                            <TextBlock Style="{StaticResource BaseTextBlockStyle}" Text="{shcm:ResourceString Name=ViewPageWiKiAvatarOccupationNameTitle}"/>
+                                                            <TextBlock
+                                                                Margin="0,6,0,0"
+                                                                Style="{StaticResource CaptionTextBlockStyle}"
+                                                                Text="{Binding Selected.FetterInfo.Native}"
+                                                                TextWrapping="NoWrap"/>
+                                                        </StackPanel>
+                                                        <StackPanel>
+                                                            <TextBlock Style="{StaticResource BaseTextBlockStyle}" Text="{shcm:ResourceString Name=ViewPageWiKiAvatarConstellationNameTitle}"/>
+                                                            <TextBlock
+                                                                Margin="0,6,0,0"
+                                                                Style="{StaticResource CaptionTextBlockStyle}"
+                                                                Text="{Binding Selected.FetterInfo.ConstellationBefore}"
+                                                                TextWrapping="NoWrap"/>
+                                                        </StackPanel>
+                                                        <StackPanel>
+                                                            <TextBlock Style="{StaticResource BaseTextBlockStyle}" Text="{shcm:ResourceString Name=ViewPageWiKiAvatarDateofBirthTitle}"/>
+                                                            <TextBlock
+                                                                Margin="0,6,0,0"
+                                                                Style="{StaticResource CaptionTextBlockStyle}"
+                                                                Text="{Binding Selected.FetterInfo.BirthFormatted}"
+                                                                TextWrapping="NoWrap"/>
+                                                        </StackPanel>
+                                                    </cwc:UniformGrid>
+
+                                                    <cwc:UniformGrid
+                                                        Margin="0,12,0,0"
+                                                        ColumnSpacing="6"
+                                                        Columns="4">
+                                                        <StackPanel>
+                                                            <TextBlock Style="{StaticResource BaseTextBlockStyle}" Text="{shcm:ResourceString Name=ViewPageWiKiAvatarChineseCVNameTitle}"/>
+                                                            <TextBlock
+                                                                Margin="0,6,0,0"
+                                                                Style="{StaticResource CaptionTextBlockStyle}"
+                                                                Text="{Binding Selected.FetterInfo.CvChinese}"
+                                                                TextWrapping="NoWrap"/>
+                                                        </StackPanel>
+                                                        <StackPanel>
+                                                            <TextBlock Style="{StaticResource BaseTextBlockStyle}" Text="{shcm:ResourceString Name=ViewPageWiKiAvatarJapaneseCVNameTitle}"/>
+                                                            <TextBlock
+                                                                Margin="0,6,0,0"
+                                                                Style="{StaticResource CaptionTextBlockStyle}"
+                                                                Text="{Binding Selected.FetterInfo.CvJapanese}"
+                                                                TextWrapping="NoWrap"/>
+                                                        </StackPanel>
+                                                        <StackPanel>
+                                                            <TextBlock Style="{StaticResource BaseTextBlockStyle}" Text="{shcm:ResourceString Name=ViewPageWiKiAvatarEnglishCVNameTitle}"/>
+                                                            <TextBlock
+                                                                Margin="0,6,0,0"
+                                                                Style="{StaticResource CaptionTextBlockStyle}"
+                                                                Text="{Binding Selected.FetterInfo.CvEnglish}"
+                                                                TextWrapping="NoWrap"/>
+                                                        </StackPanel>
+                                                        <StackPanel>
+                                                            <TextBlock Style="{StaticResource BaseTextBlockStyle}" Text="{shcm:ResourceString Name=ViewPageWiKiAvatarKoreanCVNameTitle}"/>
+                                                            <TextBlock
+                                                                Margin="0,6,0,0"
+                                                                Style="{StaticResource CaptionTextBlockStyle}"
+                                                                Text="{Binding Selected.FetterInfo.CvKorean}"
+                                                                TextWrapping="NoWrap"/>
+                                                        </StackPanel>
+                                                    </cwc:UniformGrid>
+                                                </StackPanel>
+
+                                                <StackPanel Grid.Row="1" Grid.ColumnSpan="2">
+                                                    <ItemsControl
+                                                        Margin="16,0,16,16"
+                                                        ItemTemplate="{StaticResource CultivationItemTemplate}"
+                                                        ItemsSource="{Binding Selected.CultivationItemsView}">
+                                                        <ItemsControl.ItemsPanel>
+                                                            <ItemsPanelTemplate>
+                                                                <cwc:UniformGrid
+                                                                    ColumnSpacing="8"
+                                                                    Columns="3"
+                                                                    RowSpacing="8"/>
+                                                            </ItemsPanelTemplate>
+                                                        </ItemsControl.ItemsPanel>
+                                                    </ItemsControl>
+                                                </StackPanel>
+                                            </Grid>
+
+                                            <!--  属性  -->
+                                            <Border Style="{ThemeResource BorderCardStyle}">
+                                                <Border.Resources>
+                                                    <SolidColorBrush x:Key="ToggleButtonBackground" Color="Transparent"/>
+                                                    <SolidColorBrush x:Key="ExpanderContentBackground" Color="Transparent"/>
+                                                    <SolidColorBrush x:Key="SettingsCardBackground" Color="Transparent"/>
+                                                    <SolidColorBrush x:Key="SettingsCardBackgroundDisabled" Color="Transparent"/>
+                                                    <SolidColorBrush x:Key="SettingsCardBackgroundPointerOver" Color="Transparent"/>
+                                                    <SolidColorBrush x:Key="SettingsCardBackgroundPressed" Color="Transparent"/>
+                                                </Border.Resources>
+                                                <shvcont:BaseValueSlider
+                                                    HorizontalAlignment="Stretch"
+                                                    HorizontalContentAlignment="Stretch"
+                                                    BaseValueInfo="{Binding BaseValueInfo, Mode=OneWay}"/>
+                                            </Border>
+
+                                            <!--  天赋  -->
+                                            <Border Padding="16" Style="{ThemeResource BorderCardStyle}">
+                                                <shvcont:SkillPivot ItemTemplate="{StaticResource SkillDataTemplate}" Skills="{Binding Selected.SkillDepot.CompositeSkills}"/>
+                                            </Border>
+
+                                            <!--  命座  -->
+                                            <Border Padding="16" Style="{ThemeResource BorderCardStyle}">
+                                                <shvcont:SkillPivot ItemTemplate="{StaticResource TalentDataTemplate}" Skills="{Binding Selected.SkillDepot.Talents}"/>
+                                            </Border>
+
+                                            <!--  搭配  -->
+                                            <Border Padding="16" Style="{ThemeResource BorderCardStyle}">
+                                                <Grid ColumnSpacing="8" RowSpacing="8">
+                                                    <Grid.ColumnDefinitions>
+                                                        <ColumnDefinition/>
+                                                        <ColumnDefinition/>
+                                                        <ColumnDefinition/>
+                                                    </Grid.ColumnDefinitions>
                                                     <Grid.RowDefinitions>
                                                         <RowDefinition/>
                                                         <RowDefinition/>
                                                     </Grid.RowDefinitions>
+                                                    <TextBlock
+                                                        Grid.Row="0"
+                                                        Grid.Column="0"
+                                                        Style="{StaticResource BaseTextBlockStyle}"
+                                                        Text="{shcm:ResourceString Name=ViewPageWiKiAvatarTeamCombinationHeader}"/>
+                                                    <ItemsControl
+                                                        Grid.Row="1"
+                                                        Grid.Column="0"
+                                                        ItemTemplate="{StaticResource CollocationTemplate}"
+                                                        ItemsPanel="{StaticResource StackPanelSpacing4Template}"
+                                                        ItemsSource="{Binding Selected.Collocation.Avatars}"/>
+                                                    <TextBlock
+                                                        Grid.Row="0"
+                                                        Grid.Column="1"
+                                                        Style="{StaticResource BaseTextBlockStyle}"
+                                                        Text="{shcm:ResourceString Name=ViewPageWiKiAvatarWeaponCombinationHeader}"/>
+                                                    <ItemsControl
+                                                        Grid.Row="1"
+                                                        Grid.Column="1"
+                                                        ItemTemplate="{StaticResource CollocationTemplate}"
+                                                        ItemsPanel="{StaticResource StackPanelSpacing4Template}"
+                                                        ItemsSource="{Binding Selected.Collocation.Weapons}"/>
+                                                    <TextBlock
+                                                        Grid.Row="0"
+                                                        Grid.Column="2"
+                                                        Style="{StaticResource BaseTextBlockStyle}"
+                                                        Text="{shcm:ResourceString Name=ViewPageWiKiAvatarArtifactSetCombinationHeader}"/>
+                                                    <ItemsControl
+                                                        Grid.Row="1"
+                                                        Grid.Column="2"
+                                                        ItemTemplate="{StaticResource CollocationReliquaryTemplate}"
+                                                        ItemsPanel="{StaticResource StackPanelSpacing4Template}"
+                                                        ItemsSource="{Binding Selected.Collocation.ReliquarySets}"/>
+                                                </Grid>
+                                            </Border>
+
+                                            <!--  立绘  -->
+                                            <cwc:ConstrainedBox AspectRatio="2048:1024">
+                                                <Grid Style="{ThemeResource GridCardStyle}">
                                                     <Grid.ColumnDefinitions>
                                                         <ColumnDefinition Width="auto"/>
                                                         <ColumnDefinition/>
                                                     </Grid.ColumnDefinitions>
-                                                    <StackPanel Grid.Column="0" Margin="16">
-                                                        <Grid Margin="0,0,0,12" ColumnSpacing="8">
-                                                            <Grid.ColumnDefinitions>
-                                                                <ColumnDefinition Width="auto"/>
-                                                                <ColumnDefinition Width="auto"/>
-                                                            </Grid.ColumnDefinitions>
-                                                            <shci:MonoChrome
-                                                                Grid.Column="0"
-                                                                Width="32"
-                                                                Height="32"
-                                                                HorizontalAlignment="Left"
-                                                                Source="{Binding Selected.FetterInfo.VisionBefore, Converter={StaticResource ElementNameIconConverter}}"/>
-                                                            <shci:MonoChrome
-                                                                Grid.Column="1"
-                                                                Width="32"
-                                                                Height="32"
-                                                                Source="{Binding Selected.Weapon, Converter={StaticResource WeaponTypeIconConverter}}"/>
-                                                        </Grid>
-                                                        <shvcont:ItemIcon
-                                                            Width="128"
-                                                            Height="128"
-                                                            Icon="{Binding Selected.Icon, Converter={StaticResource AvatarIconConverter}, Mode=OneWay}"
-                                                            Quality="{Binding Selected.Quality, Mode=OneWay}"/>
-                                                    </StackPanel>
+                                                    <!--  使其有较低的ZOrder  -->
+                                                    <shci:CachedImage Grid.ColumnSpan="2" Source="{Binding Selected.Icon, Converter={StaticResource GachaAvatarImgConverter}}"/>
 
-                                                    <StackPanel Grid.Column="1" Margin="16">
-                                                        <StackPanel Margin="0,0,0,2" Orientation="Horizontal">
-                                                            <TextBlock
-                                                                VerticalAlignment="Center"
-                                                                Style="{StaticResource SubtitleTextBlockStyle}"
-                                                                Text="{Binding Selected.Name}"/>
-                                                            <TextBlock
-                                                                Margin="24,0,0,0"
-                                                                VerticalAlignment="Center"
-                                                                Style="{StaticResource SubtitleTextBlockStyle}"
-                                                                Text="{Binding Selected.FetterInfo.Title}"/>
-                                                        </StackPanel>
-
-                                                        <TextBlock
-                                                            Opacity="0.7"
-                                                            Style="{StaticResource CaptionTextBlockStyle}"
-                                                            Text="{Binding Selected.FetterInfo.Detail}"
-                                                            TextWrapping="NoWrap"/>
-
-                                                        <cwc:UniformGrid
-                                                            Margin="0,16,0,0"
-                                                            ColumnSpacing="6"
-                                                            Columns="4">
-                                                            <StackPanel>
-                                                                <TextBlock Style="{StaticResource BaseTextBlockStyle}" Text="{shcm:ResourceString Name=ViewPageWiKiAvatarOccupationNameTitle}"/>
-                                                                <TextBlock
-                                                                    Margin="0,6,0,0"
-                                                                    Style="{StaticResource CaptionTextBlockStyle}"
-                                                                    Text="{Binding Selected.FetterInfo.Native}"
-                                                                    TextWrapping="NoWrap"/>
-                                                            </StackPanel>
-                                                            <StackPanel>
-                                                                <TextBlock Style="{StaticResource BaseTextBlockStyle}" Text="{shcm:ResourceString Name=ViewPageWiKiAvatarConstellationNameTitle}"/>
-                                                                <TextBlock
-                                                                    Margin="0,6,0,0"
-                                                                    Style="{StaticResource CaptionTextBlockStyle}"
-                                                                    Text="{Binding Selected.FetterInfo.ConstellationBefore}"
-                                                                    TextWrapping="NoWrap"/>
-                                                            </StackPanel>
-                                                            <StackPanel>
-                                                                <TextBlock Style="{StaticResource BaseTextBlockStyle}" Text="{shcm:ResourceString Name=ViewPageWiKiAvatarDateofBirthTitle}"/>
-                                                                <TextBlock
-                                                                    Margin="0,6,0,0"
-                                                                    Style="{StaticResource CaptionTextBlockStyle}"
-                                                                    Text="{Binding Selected.FetterInfo.BirthFormatted}"
-                                                                    TextWrapping="NoWrap"/>
-                                                            </StackPanel>
-                                                        </cwc:UniformGrid>
-
-                                                        <cwc:UniformGrid
-                                                            Margin="0,12,0,0"
-                                                            ColumnSpacing="6"
-                                                            Columns="4">
-                                                            <StackPanel>
-                                                                <TextBlock Style="{StaticResource BaseTextBlockStyle}" Text="{shcm:ResourceString Name=ViewPageWiKiAvatarChineseCVNameTitle}"/>
-                                                                <TextBlock
-                                                                    Margin="0,6,0,0"
-                                                                    Style="{StaticResource CaptionTextBlockStyle}"
-                                                                    Text="{Binding Selected.FetterInfo.CvChinese}"
-                                                                    TextWrapping="NoWrap"/>
-                                                            </StackPanel>
-                                                            <StackPanel>
-                                                                <TextBlock Style="{StaticResource BaseTextBlockStyle}" Text="{shcm:ResourceString Name=ViewPageWiKiAvatarJapaneseCVNameTitle}"/>
-                                                                <TextBlock
-                                                                    Margin="0,6,0,0"
-                                                                    Style="{StaticResource CaptionTextBlockStyle}"
-                                                                    Text="{Binding Selected.FetterInfo.CvJapanese}"
-                                                                    TextWrapping="NoWrap"/>
-                                                            </StackPanel>
-                                                            <StackPanel>
-                                                                <TextBlock Style="{StaticResource BaseTextBlockStyle}" Text="{shcm:ResourceString Name=ViewPageWiKiAvatarEnglishCVNameTitle}"/>
-                                                                <TextBlock
-                                                                    Margin="0,6,0,0"
-                                                                    Style="{StaticResource CaptionTextBlockStyle}"
-                                                                    Text="{Binding Selected.FetterInfo.CvEnglish}"
-                                                                    TextWrapping="NoWrap"/>
-                                                            </StackPanel>
-                                                            <StackPanel>
-                                                                <TextBlock Style="{StaticResource BaseTextBlockStyle}" Text="{shcm:ResourceString Name=ViewPageWiKiAvatarKoreanCVNameTitle}"/>
-                                                                <TextBlock
-                                                                    Margin="0,6,0,0"
-                                                                    Style="{StaticResource CaptionTextBlockStyle}"
-                                                                    Text="{Binding Selected.FetterInfo.CvKorean}"
-                                                                    TextWrapping="NoWrap"/>
-                                                            </StackPanel>
-                                                        </cwc:UniformGrid>
-                                                    </StackPanel>
-
-                                                    <StackPanel Grid.Row="1" Grid.ColumnSpan="2">
-                                                        <ItemsControl
-                                                            Margin="16,0,16,16"
-                                                            ItemTemplate="{StaticResource CultivationItemTemplate}"
-                                                            ItemsSource="{Binding Selected.CultivationItemsView}">
-                                                            <ItemsControl.ItemsPanel>
-                                                                <ItemsPanelTemplate>
-                                                                    <cwc:UniformGrid
-                                                                        ColumnSpacing="8"
-                                                                        Columns="3"
-                                                                        RowSpacing="8"/>
-                                                                </ItemsPanelTemplate>
-                                                            </ItemsControl.ItemsPanel>
-                                                        </ItemsControl>
-                                                    </StackPanel>
+                                                    <Border
+                                                        Grid.Column="0"
+                                                        Margin="16"
+                                                        Style="{StaticResource BorderCardStyle}">
+                                                        <cwc:ConstrainedBox AspectRatio="320:1024">
+                                                            <shci:CachedImage CornerRadius="{ThemeResource ControlCornerRadius}" Source="{Binding Selected.Icon, Converter={StaticResource GachaAvatarIconConverter}}"/>
+                                                        </cwc:ConstrainedBox>
+                                                    </Border>
                                                 </Grid>
+                                            </cwc:ConstrainedBox>
 
-                                                <!--  属性  -->
-                                                <Border Style="{ThemeResource BorderCardStyle}">
-                                                    <Border.Resources>
-                                                        <SolidColorBrush x:Key="ToggleButtonBackground" Color="Transparent"/>
-                                                        <SolidColorBrush x:Key="ExpanderContentBackground" Color="Transparent"/>
-                                                        <SolidColorBrush x:Key="SettingsCardBackground" Color="Transparent"/>
-                                                        <SolidColorBrush x:Key="SettingsCardBackgroundDisabled" Color="Transparent"/>
-                                                        <SolidColorBrush x:Key="SettingsCardBackgroundPointerOver" Color="Transparent"/>
-                                                        <SolidColorBrush x:Key="SettingsCardBackgroundPressed" Color="Transparent"/>
-                                                    </Border.Resources>
-                                                    <shvcont:BaseValueSlider
-                                                        HorizontalAlignment="Stretch"
-                                                        HorizontalContentAlignment="Stretch"
-                                                        BaseValueInfo="{Binding BaseValueInfo, Mode=OneWay}"/>
-                                                </Border>
-
-                                                <!--  天赋  -->
-                                                <Border Padding="16" Style="{ThemeResource BorderCardStyle}">
-                                                    <shvcont:SkillPivot ItemTemplate="{StaticResource SkillDataTemplate}" Skills="{Binding Selected.SkillDepot.CompositeSkills}"/>
-                                                </Border>
-
-                                                <!--  命座  -->
-                                                <Border Padding="16" Style="{ThemeResource BorderCardStyle}">
-                                                    <shvcont:SkillPivot ItemTemplate="{StaticResource TalentDataTemplate}" Skills="{Binding Selected.SkillDepot.Talents}"/>
-                                                </Border>
-
-                                                <!--  搭配  -->
-                                                <Border Padding="16" Style="{ThemeResource BorderCardStyle}">
-                                                    <Grid ColumnSpacing="8" RowSpacing="8">
-                                                        <Grid.ColumnDefinitions>
-                                                            <ColumnDefinition/>
-                                                            <ColumnDefinition/>
-                                                            <ColumnDefinition/>
-                                                        </Grid.ColumnDefinitions>
+                                            <!--  料理  -->
+                                            <Border Style="{ThemeResource BorderCardStyle}">
+                                                <Border.Resources>
+                                                    <SolidColorBrush x:Key="ExpanderContentBackground" Color="Transparent"/>
+                                                    <SolidColorBrush x:Key="ExpanderHeaderBackground" Color="Transparent"/>
+                                                </Border.Resources>
+                                                <Expander
+                                                    HorizontalAlignment="Stretch"
+                                                    HorizontalContentAlignment="Stretch"
+                                                    Header="{shcm:ResourceString Name=ViewPageWiKiAvatarFoodHeader}"
+                                                    IsExpanded="True">
+                                                    <Grid DataContext="{Binding Selected.CookBonusView}">
                                                         <Grid.RowDefinitions>
-                                                            <RowDefinition/>
-                                                            <RowDefinition/>
+                                                            <RowDefinition Height="auto"/>
+                                                            <RowDefinition Height="auto"/>
+                                                            <RowDefinition Height="auto"/>
+                                                            <RowDefinition Height="auto"/>
                                                         </Grid.RowDefinitions>
-                                                        <TextBlock
-                                                            Grid.Row="0"
-                                                            Grid.Column="0"
-                                                            Style="{StaticResource BaseTextBlockStyle}"
-                                                            Text="{shcm:ResourceString Name=ViewPageWiKiAvatarTeamCombinationHeader}"/>
-                                                        <ItemsControl
-                                                            Grid.Row="1"
-                                                            Grid.Column="0"
-                                                            ItemTemplate="{StaticResource CollocationTemplate}"
-                                                            ItemsPanel="{StaticResource StackPanelSpacing4Template}"
-                                                            ItemsSource="{Binding Selected.Collocation.Avatars}"/>
-                                                        <TextBlock
-                                                            Grid.Row="0"
-                                                            Grid.Column="1"
-                                                            Style="{StaticResource BaseTextBlockStyle}"
-                                                            Text="{shcm:ResourceString Name=ViewPageWiKiAvatarWeaponCombinationHeader}"/>
-                                                        <ItemsControl
-                                                            Grid.Row="1"
-                                                            Grid.Column="1"
-                                                            ItemTemplate="{StaticResource CollocationTemplate}"
-                                                            ItemsPanel="{StaticResource StackPanelSpacing4Template}"
-                                                            ItemsSource="{Binding Selected.Collocation.Weapons}"/>
-                                                        <TextBlock
-                                                            Grid.Row="0"
-                                                            Grid.Column="2"
-                                                            Style="{StaticResource BaseTextBlockStyle}"
-                                                            Text="{shcm:ResourceString Name=ViewPageWiKiAvatarArtifactSetCombinationHeader}"/>
-                                                        <ItemsControl
-                                                            Grid.Row="1"
-                                                            Grid.Column="2"
-                                                            ItemTemplate="{StaticResource CollocationReliquaryTemplate}"
-                                                            ItemsPanel="{StaticResource StackPanelSpacing4Template}"
-                                                            ItemsSource="{Binding Selected.Collocation.ReliquarySets}"/>
-                                                    </Grid>
-                                                </Border>
-
-                                                <!--  立绘  -->
-                                                <cwc:ConstrainedBox AspectRatio="2048:1024">
-                                                    <Grid Style="{ThemeResource GridCardStyle}">
                                                         <Grid.ColumnDefinitions>
+                                                            <ColumnDefinition Width="auto"/>
                                                             <ColumnDefinition Width="auto"/>
                                                             <ColumnDefinition/>
                                                         </Grid.ColumnDefinitions>
-                                                        <!--  使其有较低的ZOrder  -->
-                                                        <shci:CachedImage Grid.ColumnSpan="2" Source="{Binding Selected.Icon, Converter={StaticResource GachaAvatarImgConverter}}"/>
-
-                                                        <Border
+                                                        <TextBlock
                                                             Grid.Column="0"
-                                                            Margin="16"
-                                                            Style="{StaticResource BorderCardStyle}">
-                                                            <cwc:ConstrainedBox AspectRatio="320:1024">
-                                                                <shci:CachedImage CornerRadius="{ThemeResource ControlCornerRadius}" Source="{Binding Selected.Icon, Converter={StaticResource GachaAvatarIconConverter}}"/>
-                                                            </cwc:ConstrainedBox>
-                                                        </Border>
-                                                    </Grid>
-                                                </cwc:ConstrainedBox>
-
-                                                <!--  料理  -->
-                                                <Border Style="{ThemeResource BorderCardStyle}">
-                                                    <Border.Resources>
-                                                        <SolidColorBrush x:Key="ExpanderContentBackground" Color="Transparent"/>
-                                                        <SolidColorBrush x:Key="ExpanderHeaderBackground" Color="Transparent"/>
-                                                    </Border.Resources>
-                                                    <Expander
-                                                        HorizontalAlignment="Stretch"
-                                                        HorizontalContentAlignment="Stretch"
-                                                        Header="{shcm:ResourceString Name=ViewPageWiKiAvatarFoodHeader}"
-                                                        IsExpanded="True">
-                                                        <Grid DataContext="{Binding Selected.CookBonusView}">
-                                                            <Grid.RowDefinitions>
-                                                                <RowDefinition Height="auto"/>
-                                                                <RowDefinition Height="auto"/>
-                                                                <RowDefinition Height="auto"/>
-                                                                <RowDefinition Height="auto"/>
-                                                            </Grid.RowDefinitions>
-                                                            <Grid.ColumnDefinitions>
-                                                                <ColumnDefinition Width="auto"/>
-                                                                <ColumnDefinition Width="auto"/>
-                                                                <ColumnDefinition/>
-                                                            </Grid.ColumnDefinitions>
+                                                            Style="{StaticResource BaseTextBlockStyle}"
+                                                            Text="{shcm:ResourceString Name=ViewPageWiKiAvatarSpecialFoodTitle}"/>
+                                                        <shvcont:BottomTextControl
+                                                            Grid.Row="1"
+                                                            Grid.Column="0"
+                                                            Margin="0,16,0,0"
+                                                            Text="{Binding Item.Name}">
+                                                            <shvcont:ItemIcon Icon="{Binding Item.Icon, Converter={StaticResource ItemIconConverter}}" Quality="{Binding Item.RankLevel}"/>
+                                                        </shvcont:BottomTextControl>
+                                                        <TextBlock
+                                                            Grid.Column="1"
+                                                            Margin="16,0,0,0"
+                                                            Style="{StaticResource BaseTextBlockStyle}"
+                                                            Text="{shcm:ResourceString Name=ViewPageWiKiAvatarOriginalFoodTitle}"/>
+                                                        <shvcont:BottomTextControl
+                                                            Grid.Row="1"
+                                                            Grid.Column="1"
+                                                            Margin="16,16,0,0"
+                                                            Text="{Binding OriginItem.Name}">
+                                                            <shvcont:ItemIcon Icon="{Binding OriginItem.Icon, Converter={StaticResource ItemIconConverter}}" Quality="{Binding OriginItem.RankLevel}"/>
+                                                        </shvcont:BottomTextControl>
+                                                        <StackPanel
+                                                            Grid.RowSpan="4"
+                                                            Grid.Column="2"
+                                                            Margin="16,0,0,0">
                                                             <TextBlock
-                                                                Grid.Column="0"
-                                                                Style="{StaticResource BaseTextBlockStyle}"
-                                                                Text="{shcm:ResourceString Name=ViewPageWiKiAvatarSpecialFoodTitle}"/>
-                                                            <shvcont:BottomTextControl
-                                                                Grid.Row="1"
-                                                                Grid.Column="0"
+                                                                Grid.Row="2"
+                                                                Grid.ColumnSpan="4"
+                                                                Text="{Binding Item.Description}"
+                                                                TextWrapping="Wrap"/>
+                                                            <TextBlock
+                                                                Grid.Row="3"
+                                                                Grid.ColumnSpan="4"
                                                                 Margin="0,16,0,0"
-                                                                Text="{Binding Item.Name}">
-                                                                <shvcont:ItemIcon Icon="{Binding Item.Icon, Converter={StaticResource ItemIconConverter}}" Quality="{Binding Item.RankLevel}"/>
-                                                            </shvcont:BottomTextControl>
-                                                            <TextBlock
-                                                                Grid.Column="1"
-                                                                Margin="16,0,0,0"
-                                                                Style="{StaticResource BaseTextBlockStyle}"
-                                                                Text="{shcm:ResourceString Name=ViewPageWiKiAvatarOriginalFoodTitle}"/>
-                                                            <shvcont:BottomTextControl
-                                                                Grid.Row="1"
-                                                                Grid.Column="1"
-                                                                Margin="16,16,0,0"
-                                                                Text="{Binding OriginItem.Name}">
-                                                                <shvcont:ItemIcon Icon="{Binding OriginItem.Icon, Converter={StaticResource ItemIconConverter}}" Quality="{Binding OriginItem.RankLevel}"/>
-                                                            </shvcont:BottomTextControl>
-                                                            <StackPanel
-                                                                Grid.RowSpan="4"
-                                                                Grid.Column="2"
-                                                                Margin="16,0,0,0">
-                                                                <TextBlock
-                                                                    Grid.Row="2"
-                                                                    Grid.ColumnSpan="4"
-                                                                    Text="{Binding Item.Description}"
-                                                                    TextWrapping="Wrap"/>
-                                                                <TextBlock
-                                                                    Grid.Row="3"
-                                                                    Grid.ColumnSpan="4"
-                                                                    Margin="0,16,0,0"
-                                                                    Text="{Binding Item.EffectDescription}"
-                                                                    TextWrapping="Wrap"/>
-                                                            </StackPanel>
-                                                        </Grid>
-                                                    </Expander>
-                                                </Border>
+                                                                Text="{Binding Item.EffectDescription}"
+                                                                TextWrapping="Wrap"/>
+                                                        </StackPanel>
+                                                    </Grid>
+                                                </Expander>
+                                            </Border>
 
-                                                <!--  衣装  -->
-                                                <Border Style="{ThemeResource BorderCardStyle}">
-                                                    <Border.Resources>
-                                                        <SolidColorBrush x:Key="ExpanderContentBackground" Color="Transparent"/>
-                                                        <SolidColorBrush x:Key="ExpanderHeaderBackground" Color="Transparent"/>
-                                                    </Border.Resources>
-                                                    <Expander
-                                                        HorizontalAlignment="Stretch"
-                                                        HorizontalContentAlignment="Stretch"
-                                                        Header="{shcm:ResourceString Name=ViewPageWiKiAvatarCostumeHeader}"
-                                                        IsExpanded="True">
-                                                        <ItemsControl
-                                                            Margin="0,0,0,-16"
-                                                            ItemTemplate="{StaticResource CostumeTemplate}"
-                                                            ItemsSource="{Binding Selected.Costumes}"/>
-                                                    </Expander>
-                                                </Border>
+                                            <!--  衣装  -->
+                                            <Border Style="{ThemeResource BorderCardStyle}">
+                                                <Border.Resources>
+                                                    <SolidColorBrush x:Key="ExpanderContentBackground" Color="Transparent"/>
+                                                    <SolidColorBrush x:Key="ExpanderHeaderBackground" Color="Transparent"/>
+                                                </Border.Resources>
+                                                <Expander
+                                                    HorizontalAlignment="Stretch"
+                                                    HorizontalContentAlignment="Stretch"
+                                                    Header="{shcm:ResourceString Name=ViewPageWiKiAvatarCostumeHeader}"
+                                                    IsExpanded="True">
+                                                    <ItemsControl
+                                                        Margin="0,0,0,-16"
+                                                        ItemTemplate="{StaticResource CostumeTemplate}"
+                                                        ItemsSource="{Binding Selected.Costumes}"/>
+                                                </Expander>
+                                            </Border>
 
-                                                <!--  资料  -->
-                                                <Border Style="{ThemeResource BorderCardStyle}">
-                                                    <Border.Resources>
-                                                        <SolidColorBrush x:Key="ToggleButtonBackground" Color="Transparent"/>
-                                                        <SolidColorBrush x:Key="ExpanderContentBackground" Color="Transparent"/>
-                                                        <SolidColorBrush x:Key="SettingsCardBackground" Color="Transparent"/>
-                                                        <SolidColorBrush x:Key="SettingsCardBackgroundDisabled" Color="Transparent"/>
-                                                        <SolidColorBrush x:Key="SettingsCardBackgroundPointerOver" Color="Transparent"/>
-                                                        <SolidColorBrush x:Key="SettingsCardBackgroundPressed" Color="Transparent"/>
-                                                    </Border.Resources>
-                                                    <ScrollViewer VerticalScrollBarVisibility="Hidden">
-                                                        <cwc:SettingsExpander
-                                                            Header="{shcm:ResourceString Name=ViewPageWiKiAvatarQuotesHeader}"
-                                                            ItemTemplate="{StaticResource FetterStoryTemplate}"
-                                                            ItemsSource="{Binding Selected.FetterInfo.Fetters}"/>
-                                                    </ScrollViewer>
-                                                </Border>
+                                            <!--  资料  -->
+                                            <Border Style="{ThemeResource BorderCardStyle}">
+                                                <Border.Resources>
+                                                    <SolidColorBrush x:Key="ToggleButtonBackground" Color="Transparent"/>
+                                                    <SolidColorBrush x:Key="ExpanderContentBackground" Color="Transparent"/>
+                                                    <SolidColorBrush x:Key="SettingsCardBackground" Color="Transparent"/>
+                                                    <SolidColorBrush x:Key="SettingsCardBackgroundDisabled" Color="Transparent"/>
+                                                    <SolidColorBrush x:Key="SettingsCardBackgroundPointerOver" Color="Transparent"/>
+                                                    <SolidColorBrush x:Key="SettingsCardBackgroundPressed" Color="Transparent"/>
+                                                </Border.Resources>
+                                                <ScrollViewer VerticalScrollBarVisibility="Hidden">
+                                                    <cwc:SettingsExpander
+                                                        Header="{shcm:ResourceString Name=ViewPageWiKiAvatarQuotesHeader}"
+                                                        ItemTemplate="{StaticResource FetterStoryTemplate}"
+                                                        ItemsSource="{Binding Selected.FetterInfo.Fetters}"/>
+                                                </ScrollViewer>
+                                            </Border>
 
-                                                <!--  故事  -->
-                                                <Border Style="{ThemeResource BorderCardStyle}">
-                                                    <Border.Resources>
-                                                        <SolidColorBrush x:Key="ToggleButtonBackground" Color="Transparent"/>
-                                                        <SolidColorBrush x:Key="ExpanderContentBackground" Color="Transparent"/>
-                                                        <SolidColorBrush x:Key="SettingsCardBackground" Color="Transparent"/>
-                                                        <SolidColorBrush x:Key="SettingsCardBackgroundDisabled" Color="Transparent"/>
-                                                        <SolidColorBrush x:Key="SettingsCardBackgroundPointerOver" Color="Transparent"/>
-                                                        <SolidColorBrush x:Key="SettingsCardBackgroundPressed" Color="Transparent"/>
-                                                    </Border.Resources>
-                                                    <ScrollViewer VerticalScrollBarVisibility="Hidden">
-                                                        <cwc:SettingsExpander
-                                                            Header="{shcm:ResourceString Name=ViewPageWiKiAvatarStoriesHeader}"
-                                                            ItemTemplate="{StaticResource FetterStoryTemplate}"
-                                                            ItemsSource="{Binding Selected.FetterInfo.FetterStories}"/>
-                                                    </ScrollViewer>
-                                                </Border>
-                                            </StackPanel>
-                                        </ScrollViewer>
-                                    </Grid>
+                                            <!--  故事  -->
+                                            <Border Style="{ThemeResource BorderCardStyle}">
+                                                <Border.Resources>
+                                                    <SolidColorBrush x:Key="ToggleButtonBackground" Color="Transparent"/>
+                                                    <SolidColorBrush x:Key="ExpanderContentBackground" Color="Transparent"/>
+                                                    <SolidColorBrush x:Key="SettingsCardBackground" Color="Transparent"/>
+                                                    <SolidColorBrush x:Key="SettingsCardBackgroundDisabled" Color="Transparent"/>
+                                                    <SolidColorBrush x:Key="SettingsCardBackgroundPointerOver" Color="Transparent"/>
+                                                    <SolidColorBrush x:Key="SettingsCardBackgroundPressed" Color="Transparent"/>
+                                                </Border.Resources>
+                                                <ScrollViewer VerticalScrollBarVisibility="Hidden">
+                                                    <cwc:SettingsExpander
+                                                        Header="{shcm:ResourceString Name=ViewPageWiKiAvatarStoriesHeader}"
+                                                        ItemTemplate="{StaticResource FetterStoryTemplate}"
+                                                        ItemsSource="{Binding Selected.FetterInfo.FetterStories}"/>
+                                                </ScrollViewer>
+                                            </Border>
+                                        </StackPanel>
+                                    </ScrollViewer>
                                 </SplitView.Content>
                             </SplitView>
                         </Border>
@@ -686,7 +684,7 @@
                     <Border Margin="16,0,16,16" cw:Effects.Shadow="{ThemeResource CompatCardShadow}">
                         <Border Style="{ThemeResource AcrylicBorderCardStyle}">
                             <GridView
-                                Padding="12,12,2,0"
+                                Padding="16,16,4,4"
                                 HorizontalAlignment="Stretch"
                                 HorizontalContentAlignment="Left"
                                 ItemContainerStyle="{StaticResource LargeGridViewItemStyle}"
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/WikiMonsterPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/WikiMonsterPage.xaml
index 017ee457..9392e979 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/WikiMonsterPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/WikiMonsterPage.xaml
@@ -3,11 +3,11 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:clw="using:CommunityToolkit.Labs.WinUI"
+    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:mxi="using:Microsoft.Xaml.Interactivity"
-    xmlns:mxic="using:Microsoft.Xaml.Interactions.Core"
     xmlns:shc="using:Snap.Hutao.Control"
     xmlns:shcb="using:Snap.Hutao.Control.Behavior"
     xmlns:shci="using:Snap.Hutao.Control.Image"
@@ -15,6 +15,7 @@
     xmlns:shcp="using:Snap.Hutao.Control.Panel"
     xmlns:shct="using:Snap.Hutao.Control.Text"
     xmlns:shvc="using:Snap.Hutao.View.Control"
+    xmlns:shvcp="using:Snap.Hutao.View.Card.Primitive"
     xmlns:shvw="using:Snap.Hutao.ViewModel.Wiki"
     d:DataContext="{d:DesignInstance Type=shvw:WikiMonsterViewModel}"
     Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
@@ -51,9 +52,21 @@
         </DataTemplate>
 
         <DataTemplate x:Key="MonsterDropTemplate">
-            <shvc:BottomTextControl Text="{Binding Name}">
-                <shvc:ItemIcon Icon="{Binding Icon, Converter={StaticResource ItemIconConverter}}" Quality="{Binding RankLevel}"/>
-            </shvc:BottomTextControl>
+            <shvcp:HorizontalCard>
+                <shvcp:HorizontalCard.Left>
+                    <shvc:ItemIcon
+                        Width="40"
+                        Height="40"
+                        Icon="{Binding Icon, Converter={StaticResource ItemIconConverter}}"
+                        Quality="{Binding RankLevel}"/>
+                </shvcp:HorizontalCard.Left>
+                <shvcp:HorizontalCard.Right>
+                    <TextBlock
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        Text="{Binding Name}"/>
+                </shvcp:HorizontalCard.Right>
+            </shvcp:HorizontalCard>
         </DataTemplate>
 
         <DataTemplate x:Key="MonsterGridTemplate">
@@ -69,119 +82,129 @@
                 <RowDefinition Height="auto"/>
                 <RowDefinition/>
             </Grid.RowDefinitions>
-            <CommandBar
-                Grid.Row="0"
-                Background="{StaticResource CardBackgroundFillColorDefaultBrush}"
-                BorderBrush="{x:Null}"
-                BorderThickness="0"
-                DefaultLabelPosition="Right">
-                <CommandBar.Content>
-                    <shcp:PanelSelector
-                        x:Name="ItemsPanelSelector"
-                        Margin="6,8,0,0"
-                        LocalSettingKeySuffixForCurrent="WikiMonsterPage.Monsters"/>
-                </CommandBar.Content>
-                <AppBarElementContainer Visibility="Collapsed">
-                    <AutoSuggestBox
-                        Width="240"
-                        Height="36"
-                        Margin="16,6,6,0"
-                        HorizontalAlignment="Stretch"
-                        VerticalContentAlignment="Center"
-                        PlaceholderText="{shcm:ResourceString Name=ViewPageWiKiMonsterAutoSuggestBoxPlaceHolder}"
-                        QueryIcon="{shcm:FontIcon Glyph=&#xE721;}"
-                        Text="{Binding FilterText, Mode=TwoWay}">
-                        <mxi:Interaction.Behaviors>
-                            <mxic:EventTriggerBehavior EventName="QuerySubmitted">
-                                <mxic:InvokeCommandAction Command="{Binding FilterCommand}" CommandParameter="{Binding FilterText}"/>
-                            </mxic:EventTriggerBehavior>
-                        </mxi:Interaction.Behaviors>
-                    </AutoSuggestBox>
-                </AppBarElementContainer>
-            </CommandBar>
+            <Border Margin="16" cw:Effects.Shadow="{ThemeResource CompatCardShadow}">
+                <Border Style="{ThemeResource AcrylicBaseHighBorderCardStyle}">
+                    <CommandBar
+                        BorderBrush="{x:Null}"
+                        BorderThickness="0"
+                        DefaultLabelPosition="Right">
+                        <CommandBar.Content>
+                            <shcp:PanelSelector
+                                x:Name="ItemsPanelSelector"
+                                Margin="6,8,0,0"
+                                LocalSettingKeySuffixForCurrent="WikiMonsterPage.Monsters"/>
+                        </CommandBar.Content>
+                        <!--<AppBarElementContainer Visibility="Collapsed">
+                            <AutoSuggestBox
+                                Width="240"
+                                Height="36"
+                                Margin="16,6,6,0"
+                                HorizontalAlignment="Stretch"
+                                VerticalContentAlignment="Center"
+                                PlaceholderText="{shcm:ResourceString Name=ViewPageWiKiMonsterAutoSuggestBoxPlaceHolder}"
+                                QueryIcon="{shcm:FontIcon Glyph=&#xE721;}"
+                                Text="{Binding FilterText, Mode=TwoWay}">
+                                <mxi:Interaction.Behaviors>
+                                    <mxic:EventTriggerBehavior EventName="QuerySubmitted">
+                                        <mxic:InvokeCommandAction Command="{Binding FilterCommand}" CommandParameter="{Binding FilterText}"/>
+                                    </mxic:EventTriggerBehavior>
+                                </mxi:Interaction.Behaviors>
+                            </AutoSuggestBox>
+                        </AppBarElementContainer>-->
+                    </CommandBar>
+                </Border>
+            </Border>
 
             <cwc:SwitchPresenter Grid.Row="1" Value="{Binding ElementName=ItemsPanelSelector, Path=Current}">
+
                 <cwc:Case Value="List">
-                    <SplitView
-                        DisplayMode="Inline"
-                        IsPaneOpen="True"
-                        OpenPaneLength="{StaticResource CompatSplitViewOpenPaneLength2}"
-                        PaneBackground="{StaticResource CardBackgroundFillColorSecondary}">
-                        <SplitView.Pane>
-                            <ListView
-                                Grid.Row="1"
-                                ItemTemplate="{StaticResource MonsterListTemplate}"
-                                ItemsSource="{Binding Monsters}"
-                                SelectedItem="{Binding Selected, Mode=TwoWay}"
-                                SelectionMode="Single">
-                                <mxi:Interaction.Behaviors>
-                                    <shcb:SelectedItemInViewBehavior/>
-                                </mxi:Interaction.Behaviors>
-                            </ListView>
-                        </SplitView.Pane>
-                        <SplitView.Content>
-                            <ScrollViewer>
-                                <Grid>
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition MaxWidth="800"/>
-                                        <ColumnDefinition Width="auto"/>
-                                    </Grid.ColumnDefinitions>
-                                    <StackPanel Margin="0,0,16,0">
-                                        <TextBlock
-                                            Margin="16,16,0,0"
-                                            HorizontalAlignment="Stretch"
-                                            VerticalAlignment="Center"
-                                            Style="{StaticResource SubtitleTextBlockStyle}"
-                                            Text="{Binding Selected.Title}"/>
-                                        <shct:DescriptionTextBlock
-                                            Margin="16,16,0,0"
-                                            HorizontalAlignment="Stretch"
-                                            VerticalAlignment="Center"
-                                            Description="{Binding Selected.Description}"
-                                            Opacity="0.7"
-                                            TextStyle="{StaticResource CaptionTextBlockStyle}"/>
-                                        <clw:TokenView
-                                            Margin="16,16,16,0"
-                                            ItemsSource="{Binding Selected.Affixes}"
-                                            SelectionMode="None"/>
-                                        <shvc:BaseValueSlider
-                                            Margin="16,16,0,0"
-                                            HorizontalAlignment="Stretch"
-                                            HorizontalContentAlignment="Stretch"
-                                            BaseValueInfo="{Binding BaseValueInfo, Mode=OneWay}"
-                                            IsPromoteVisible="False"/>
-                                        <ItemsControl
-                                            Margin="16,16,0,0"
-                                            ItemTemplate="{StaticResource MonsterBaseValueTemplate}"
-                                            ItemsPanel="{StaticResource UniformGridColumns2Spacing2Template}"
-                                            ItemsSource="{Binding Selected.BaseValue.SubHurts}">
-                                            <ItemsControl.Resources>
-                                                <x:Double x:Key="SettingsCardMinHeight">0</x:Double>
-                                                <x:Double x:Key="SettingsCardWrapThreshold">0</x:Double>
-                                                <x:Double x:Key="SettingsCardWrapNoIconThreshold">0</x:Double>
-                                            </ItemsControl.Resources>
-                                        </ItemsControl>
-                                        <TextBlock
-                                            Margin="16,32,0,0"
-                                            Style="{StaticResource BaseTextBlockStyle}"
-                                            Text="{shcm:ResourceString Name=ViewPageWikiMonsterDropItems}"
-                                            Visibility="{Binding Selected.DropsView, Converter={StaticResource EmptyObjectToVisibilityConverter}}"/>
-                                        <GridView
-                                            Margin="16,16,-4,12"
-                                            Padding="0"
-                                            ItemTemplate="{StaticResource MonsterDropTemplate}"
-                                            ItemsSource="{Binding Selected.DropsView}"
-                                            SelectionMode="None"
-                                            Visibility="{Binding Selected.DropsView, Converter={StaticResource EmptyObjectToVisibilityConverter}}"/>
-                                    </StackPanel>
-                                </Grid>
-                            </ScrollViewer>
-                        </SplitView.Content>
-                    </SplitView>
+                    <Border Margin="16,0,16,16" cw:Effects.Shadow="{ThemeResource CompatCardShadow}">
+                        <Border Style="{ThemeResource AcrylicBorderCardStyle}">
+                            <SplitView
+                                DisplayMode="Inline"
+                                IsPaneOpen="True"
+                                OpenPaneLength="{StaticResource CompatSplitViewOpenPaneLength2}"
+                                PaneBackground="{StaticResource CardBackgroundFillColorSecondary}">
+                                <SplitView.Pane>
+                                    <ListView
+                                        Grid.Row="1"
+                                        Padding="{ThemeResource ListViewInSplitPanePadding}"
+                                        ItemTemplate="{StaticResource MonsterListTemplate}"
+                                        ItemsSource="{Binding Monsters}"
+                                        SelectedItem="{Binding Selected, Mode=TwoWay}"
+                                        SelectionMode="Single">
+                                        <mxi:Interaction.Behaviors>
+                                            <shcb:SelectedItemInViewBehavior/>
+                                        </mxi:Interaction.Behaviors>
+                                    </ListView>
+                                </SplitView.Pane>
+                                <SplitView.Content>
+                                    <ScrollViewer>
+                                        <Grid>
+                                            <Grid.ColumnDefinitions>
+                                                <ColumnDefinition MaxWidth="800"/>
+                                                <ColumnDefinition Width="auto"/>
+                                            </Grid.ColumnDefinitions>
+                                            <StackPanel Padding="16" Spacing="16">
+                                                <TextBlock
+                                                    HorizontalAlignment="Stretch"
+                                                    VerticalAlignment="Center"
+                                                    Style="{StaticResource SubtitleTextBlockStyle}"
+                                                    Text="{Binding Selected.Title}"/>
+                                                <shct:DescriptionTextBlock
+                                                    HorizontalAlignment="Stretch"
+                                                    VerticalAlignment="Center"
+                                                    Description="{Binding Selected.Description}"
+                                                    Opacity="0.7"
+                                                    TextStyle="{StaticResource CaptionTextBlockStyle}"/>
+                                                <clw:TokenView ItemsSource="{Binding Selected.Affixes}" SelectionMode="None"/>
+                                                <shvc:BaseValueSlider
+                                                    HorizontalAlignment="Stretch"
+                                                    HorizontalContentAlignment="Stretch"
+                                                    BaseValueInfo="{Binding BaseValueInfo, Mode=OneWay}"
+                                                    IsPromoteVisible="False"/>
+                                                <ItemsControl
+                                                    ItemTemplate="{StaticResource MonsterBaseValueTemplate}"
+                                                    ItemsPanel="{StaticResource UniformGridColumns2Spacing2Template}"
+                                                    ItemsSource="{Binding Selected.BaseValue.SubHurts}">
+                                                    <ItemsControl.Resources>
+                                                        <x:Double x:Key="SettingsCardMinHeight">0</x:Double>
+                                                        <x:Double x:Key="SettingsCardWrapThreshold">0</x:Double>
+                                                        <x:Double x:Key="SettingsCardWrapNoIconThreshold">0</x:Double>
+                                                    </ItemsControl.Resources>
+                                                </ItemsControl>
+                                                <Border Padding="16" Style="{ThemeResource BorderCardStyle}">
+                                                    <StackPanel Spacing="16">
+                                                        <TextBlock
+                                                            Style="{StaticResource BaseTextBlockStyle}"
+                                                            Text="{shcm:ResourceString Name=ViewPageWikiMonsterDropItems}"
+                                                            Visibility="{Binding Selected.DropsView, Converter={StaticResource EmptyObjectToVisibilityConverter}}"/>
+                                                        <ItemsControl
+                                                            ItemTemplate="{StaticResource MonsterDropTemplate}"
+                                                            ItemsSource="{Binding Selected.DropsView}"
+                                                            Visibility="{Binding Selected.DropsView, Converter={StaticResource EmptyObjectToVisibilityConverter}}">
+                                                            <ItemsControl.ItemsPanel>
+                                                                <ItemsPanelTemplate>
+                                                                    <cwc:UniformGrid
+                                                                        ColumnSpacing="8"
+                                                                        Columns="3"
+                                                                        RowSpacing="8"/>
+                                                                </ItemsPanelTemplate>
+                                                            </ItemsControl.ItemsPanel>
+                                                        </ItemsControl>
+                                                    </StackPanel>
+                                                </Border>
+                                            </StackPanel>
+                                        </Grid>
+                                    </ScrollViewer>
+                                </SplitView.Content>
+                            </SplitView>
+                        </Border>
+                    </Border>
                 </cwc:Case>
                 <cwc:Case Value="Grid">
                     <GridView
-                        Padding="12,12,2,0"
+                        Padding="16,16,4,4"
                         HorizontalAlignment="Stretch"
                         HorizontalContentAlignment="Left"
                         ItemContainerStyle="{StaticResource LargeGridViewItemStyle}"
@@ -195,7 +218,6 @@
                     </GridView>
                 </cwc:Case>
             </cwc:SwitchPresenter>
-
         </Grid>
         <shvc:LoadingView IsLoading="{Binding Monsters, Converter={StaticResource EmptyObjectToBoolRevertConverter}}"/>
     </Grid>
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/WikiWeaponPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/WikiWeaponPage.xaml
index 5f82bec8..ca36e948 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/WikiWeaponPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/WikiWeaponPage.xaml
@@ -15,6 +15,7 @@
     xmlns:shcp="using:Snap.Hutao.Control.Panel"
     xmlns:shct="using:Snap.Hutao.Control.Text"
     xmlns:shvc="using:Snap.Hutao.View.Control"
+    xmlns:shvcp="using:Snap.Hutao.View.Card.Primitive"
     xmlns:shvw="using:Snap.Hutao.ViewModel.Wiki"
     d:DataContext="{d:DesignInstance Type=shvw:WikiWeaponViewModel}"
     Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
@@ -52,9 +53,21 @@
         </DataTemplate>
 
         <DataTemplate x:Key="CultivateItemTemplate">
-            <shvc:BottomTextControl Text="{Binding Name}">
-                <shvc:ItemIcon Icon="{Binding Icon, Converter={StaticResource ItemIconConverter}}" Quality="{Binding RankLevel}"/>
-            </shvc:BottomTextControl>
+            <shvcp:HorizontalCard>
+                <shvcp:HorizontalCard.Left>
+                    <shvc:ItemIcon
+                        Width="40"
+                        Height="40"
+                        Icon="{Binding Icon, Converter={StaticResource ItemIconConverter}}"
+                        Quality="{Binding RankLevel}"/>
+                </shvcp:HorizontalCard.Left>
+                <shvcp:HorizontalCard.Right>
+                    <TextBlock
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        Text="{Binding Name}"/>
+                </shvcp:HorizontalCard.Right>
+            </shvcp:HorizontalCard>
         </DataTemplate>
 
         <DataTemplate x:Key="AffixPivotHeaderTemplate">
@@ -72,9 +85,24 @@
         </DataTemplate>
 
         <DataTemplate x:Key="CollocationTemplate">
-            <shvc:BottomTextControl Text="{Binding Rate}" ToolTipService.ToolTip="{Binding Name}">
-                <shvc:ItemIcon Icon="{Binding Icon}" Quality="{Binding Quality}"/>
-            </shvc:BottomTextControl>
+            <shvcp:HorizontalCard>
+                <shvcp:HorizontalCard.Left>
+                    <shvc:ItemIcon
+                        Width="48"
+                        Height="48"
+                        Icon="{Binding Icon}"
+                        Quality="{Binding Quality}"/>
+                </shvcp:HorizontalCard.Left>
+                <shvcp:HorizontalCard.Right>
+                    <StackPanel Margin="8,0,0,0" HorizontalAlignment="Left">
+                        <TextBlock Text="{Binding Name}"/>
+                        <TextBlock
+                            Opacity="0.7"
+                            Style="{StaticResource CaptionTextBlockStyle}"
+                            Text="{Binding Rate}"/>
+                    </StackPanel>
+                </shvcp:HorizontalCard.Right>
+            </shvcp:HorizontalCard>
         </DataTemplate>
 
         <DataTemplate x:Key="WeaponGridTemplate">
@@ -90,179 +118,194 @@
                 <RowDefinition Height="auto"/>
                 <RowDefinition/>
             </Grid.RowDefinitions>
-            <CommandBar
-                Grid.Row="0"
-                Background="{StaticResource CardBackgroundFillColorDefaultBrush}"
-                BorderBrush="{x:Null}"
-                BorderThickness="0"
-                DefaultLabelPosition="Right">
-                <CommandBar.Content>
-                    <shcp:PanelSelector
-                        x:Name="ItemsPanelSelector"
-                        Margin="6,8,0,0"
-                        LocalSettingKeySuffixForCurrent="WikiWeaponPage.Weapons"/>
-                </CommandBar.Content>
-                <AppBarElementContainer>
-                    <AutoSuggestBox
-                        Width="240"
-                        Height="36"
-                        Margin="16,6,6,0"
-                        HorizontalAlignment="Stretch"
-                        VerticalContentAlignment="Center"
-                        PlaceholderText="{shcm:ResourceString Name=ViewPageWiKiWeaponAutoSuggestBoxPlaceHolder}"
-                        QueryIcon="{shcm:FontIcon Glyph=&#xE721;}"
-                        Text="{Binding FilterText, Mode=TwoWay}">
-                        <mxi:Interaction.Behaviors>
-                            <mxic:EventTriggerBehavior EventName="QuerySubmitted">
-                                <mxic:InvokeCommandAction Command="{Binding FilterCommand}" CommandParameter="{Binding FilterText}"/>
-                            </mxic:EventTriggerBehavior>
-                        </mxi:Interaction.Behaviors>
-                    </AutoSuggestBox>
-                </AppBarElementContainer>
-                <AppBarButton
-                    Command="{Binding CultivateCommand}"
-                    CommandParameter="{Binding Selected}"
-                    Icon="{shcm:FontIcon Glyph=&#xE8EF;}"
-                    Label="{shcm:ResourceString Name=ViewPageWiKiGeneralAddToDevPlanButtonLabel}"/>
-            </CommandBar>
+            <Border Margin="16" cw:Effects.Shadow="{ThemeResource CompatCardShadow}">
+                <Border Style="{ThemeResource AcrylicBaseHighBorderCardStyle}">
+                    <CommandBar
+                        BorderBrush="{x:Null}"
+                        BorderThickness="0"
+                        DefaultLabelPosition="Right">
+                        <CommandBar.Content>
+                            <shcp:PanelSelector
+                                x:Name="ItemsPanelSelector"
+                                Margin="6,8,0,0"
+                                LocalSettingKeySuffixForCurrent="WikiWeaponPage.Weapons"/>
+                        </CommandBar.Content>
+                        <AppBarElementContainer>
+                            <AutoSuggestBox
+                                Width="240"
+                                Height="36"
+                                Margin="16,6,6,0"
+                                HorizontalAlignment="Stretch"
+                                VerticalContentAlignment="Center"
+                                PlaceholderText="{shcm:ResourceString Name=ViewPageWiKiWeaponAutoSuggestBoxPlaceHolder}"
+                                QueryIcon="{shcm:FontIcon Glyph=&#xE721;}"
+                                Text="{Binding FilterText, Mode=TwoWay}">
+                                <mxi:Interaction.Behaviors>
+                                    <mxic:EventTriggerBehavior EventName="QuerySubmitted">
+                                        <mxic:InvokeCommandAction Command="{Binding FilterCommand}" CommandParameter="{Binding FilterText}"/>
+                                    </mxic:EventTriggerBehavior>
+                                </mxi:Interaction.Behaviors>
+                            </AutoSuggestBox>
+                        </AppBarElementContainer>
+                        <AppBarButton
+                            Command="{Binding CultivateCommand}"
+                            CommandParameter="{Binding Selected}"
+                            Icon="{shcm:FontIcon Glyph=&#xE8EF;}"
+                            Label="{shcm:ResourceString Name=ViewPageWiKiGeneralAddToDevPlanButtonLabel}"/>
+                    </CommandBar>
+                </Border>
+            </Border>
+
             <cwc:SwitchPresenter
                 Grid.Row="1"
                 ContentTransitions="{ThemeResource EntranceThemeTransitions}"
                 Value="{Binding ElementName=ItemsPanelSelector, Path=Current}">
                 <cwc:Case Value="List">
-                    <SplitView
-                        DisplayMode="Inline"
-                        IsPaneOpen="True"
-                        OpenPaneLength="{StaticResource CompatSplitViewOpenPaneLength}"
-                        PaneBackground="{StaticResource CardBackgroundFillColorSecondary}">
-                        <SplitView.Pane>
-                            <ListView
-                                Grid.Row="1"
-                                ItemTemplate="{StaticResource WeaponListTemplate}"
+                    <Border Margin="16,0,16,16" cw:Effects.Shadow="{ThemeResource CompatCardShadow}">
+                        <Border Style="{ThemeResource AcrylicBorderCardStyle}">
+                            <SplitView
+                                DisplayMode="Inline"
+                                IsPaneOpen="True"
+                                OpenPaneLength="{StaticResource CompatSplitViewOpenPaneLength}"
+                                PaneBackground="{StaticResource CardBackgroundFillColorSecondary}">
+                                <SplitView.Pane>
+                                    <ListView
+                                        Grid.Row="1"
+                                        Padding="{ThemeResource ListViewInSplitPanePadding}"
+                                        ItemTemplate="{StaticResource WeaponListTemplate}"
+                                        ItemsSource="{Binding Weapons}"
+                                        SelectedItem="{Binding Selected, Mode=TwoWay}"
+                                        SelectionMode="Single">
+                                        <mxi:Interaction.Behaviors>
+                                            <shcb:SelectedItemInViewBehavior/>
+                                        </mxi:Interaction.Behaviors>
+                                    </ListView>
+                                </SplitView.Pane>
+                                <SplitView.Content>
+                                    <ScrollViewer>
+                                        <StackPanel Padding="16" Spacing="16">
+                                            <Border Style="{ThemeResource BorderCardStyle}">
+                                                <Border.Background>
+                                                    <ImageBrush ImageSource="ms-appx:///Resource/Icon/UI_GachaShowPanel_Bg_Weapon.png"/>
+                                                </Border.Background>
+                                                <cwc:ConstrainedBox AspectRatio="2048:1024">
+                                                    <Grid>
+                                                        <Grid.ColumnDefinitions>
+                                                            <ColumnDefinition Width="auto"/>
+                                                            <ColumnDefinition/>
+                                                        </Grid.ColumnDefinitions>
+                                                        <Border Grid.ColumnSpan="2" Background="{ThemeResource DarkOnlyOverlayMaskColorBrush}"/>
+                                                        <ScrollViewer
+                                                            Grid.Column="0"
+                                                            Margin="16"
+                                                            VerticalScrollBarVisibility="Hidden">
+                                                            <StackPanel>
+                                                                <shvc:BottomTextControl MaxWidth="80" Text="{shcm:ResourceString Name=ViewPageWiKiWeaponBeforeAscensionTitle}">
+                                                                    <shvc:ItemIcon Icon="{Binding Selected.Icon, Converter={StaticResource EquipIconConverter}}" Quality="{Binding Selected.RankLevel}"/>
+                                                                </shvc:BottomTextControl>
+
+                                                                <shvc:BottomTextControl Margin="0,16,0,0" Text="{shcm:ResourceString Name=ViewPageWiKiWeaponAfterAscensionTitle}">
+                                                                    <shvc:ItemIcon Icon="{Binding Selected.AwakenIcon, Converter={StaticResource EquipIconConverter}}" Quality="{Binding Selected.RankLevel}"/>
+                                                                </shvc:BottomTextControl>
+                                                            </StackPanel>
+                                                        </ScrollViewer>
+
+                                                        <Grid Grid.ColumnSpan="2">
+                                                            <Grid.ColumnDefinitions>
+                                                                <ColumnDefinition Width="176*"/>
+                                                                <ColumnDefinition Width="848*"/>
+                                                            </Grid.ColumnDefinitions>
+                                                            <shci:CachedImage
+                                                                Grid.Column="1"
+                                                                HorizontalAlignment="Center"
+                                                                VerticalAlignment="Stretch"
+                                                                Source="{Binding Selected.Icon, Converter={StaticResource GachaEquipIconConverter}}"/>
+                                                        </Grid>
+                                                        <TextBlock
+                                                            Grid.Column="1"
+                                                            Margin="16"
+                                                            HorizontalAlignment="Right"
+                                                            VerticalAlignment="Bottom"
+                                                            Style="{StaticResource SubtitleTextBlockStyle}"
+                                                            Text="{Binding Selected.Name}"/>
+                                                    </Grid>
+                                                </cwc:ConstrainedBox>
+                                            </Border>
+
+                                            <TextBlock Text="{Binding Selected.Description}" TextWrapping="Wrap"/>
+                                            <shvc:BaseValueSlider
+                                                HorizontalAlignment="Stretch"
+                                                HorizontalContentAlignment="Stretch"
+                                                BaseValueInfo="{Binding BaseValueInfo, Mode=OneWay}"/>
+
+                                            <Border Padding="16" Style="{ThemeResource BorderCardStyle}">
+                                                <StackPanel Spacing="16">
+                                                    <TextBlock
+                                                        Margin="0,0,0,0"
+                                                        Style="{StaticResource BaseTextBlockStyle}"
+                                                        Text="{shcm:ResourceString Name=ViewPageWiKiAvatarAscensionMaterialsHeader}"/>
+                                                    <ItemsControl ItemTemplate="{StaticResource CultivateItemTemplate}" ItemsSource="{Binding Selected.CultivationItemsView}">
+                                                        <ItemsControl.ItemsPanel>
+                                                            <ItemsPanelTemplate>
+                                                                <cwc:UniformGrid
+                                                                    ColumnSpacing="8"
+                                                                    Columns="3"
+                                                                    RowSpacing="8"/>
+                                                            </ItemsPanelTemplate>
+                                                        </ItemsControl.ItemsPanel>
+                                                    </ItemsControl>
+                                                </StackPanel>
+                                            </Border>
+
+                                            <StackPanel Visibility="{Binding Selected.Affix, Converter={StaticResource EmptyObjectToVisibilityConverter}}">
+                                                <TextBlock Style="{StaticResource BaseTextBlockStyle}" Text="{Binding Selected.Affix.Name}"/>
+                                                <Pivot
+                                                    Margin="-16,0,0,0"
+                                                    HeaderTemplate="{StaticResource AffixPivotHeaderTemplate}"
+                                                    ItemTemplate="{StaticResource AffixPivotItemTemplate}"
+                                                    ItemsSource="{Binding Selected.Affix.Descriptions}"/>
+                                            </StackPanel>
+
+                                            <Border Padding="16" Style="{ThemeResource BorderCardStyle}">
+                                                <StackPanel Spacing="16">
+                                                    <TextBlock Style="{StaticResource BaseTextBlockStyle}" Text="{shcm:ResourceString Name=ViewPageWiKiAvatarTeamCombinationHeader}"/>
+                                                    <ItemsControl ItemTemplate="{StaticResource CollocationTemplate}" ItemsSource="{Binding Selected.Collocation.Avatars}">
+                                                        <ItemsControl.ItemsPanel>
+                                                            <ItemsPanelTemplate>
+                                                                <cwc:UniformGrid
+                                                                    ColumnSpacing="8"
+                                                                    Columns="3"
+                                                                    RowSpacing="8"/>
+                                                            </ItemsPanelTemplate>
+                                                        </ItemsControl.ItemsPanel>
+                                                    </ItemsControl>
+                                                </StackPanel>
+                                            </Border>
+                                        </StackPanel>
+                                    </ScrollViewer>
+                                </SplitView.Content>
+                            </SplitView>
+                        </Border>
+                    </Border>
+                </cwc:Case>
+                <cwc:Case Value="Grid">
+                    <Border Margin="16,0,16,16" cw:Effects.Shadow="{ThemeResource CompatCardShadow}">
+                        <Border Style="{ThemeResource AcrylicBorderCardStyle}">
+                            <GridView
+                                Padding="16,16,4,4"
+                                HorizontalAlignment="Stretch"
+                                HorizontalContentAlignment="Left"
+                                ItemContainerStyle="{StaticResource LargeGridViewItemStyle}"
+                                ItemTemplate="{StaticResource WeaponGridTemplate}"
                                 ItemsSource="{Binding Weapons}"
                                 SelectedItem="{Binding Selected, Mode=TwoWay}"
                                 SelectionMode="Single">
                                 <mxi:Interaction.Behaviors>
                                     <shcb:SelectedItemInViewBehavior/>
                                 </mxi:Interaction.Behaviors>
-                            </ListView>
-                        </SplitView.Pane>
-                        <SplitView.Content>
-                            <ScrollViewer>
-                                <StackPanel
-                                    MaxWidth="800"
-                                    Margin="0,0,16,0"
-                                    HorizontalAlignment="Left">
-                                    <Border Margin="16,16,0,0" cw:Effects.Shadow="{ThemeResource CompatCardShadow}">
-                                        <Border Style="{ThemeResource BorderCardStyle}">
-                                            <Border.Background>
-                                                <ImageBrush ImageSource="ms-appx:///Resource/Icon/UI_GachaShowPanel_Bg_Weapon.png"/>
-                                            </Border.Background>
-                                            <cwc:ConstrainedBox AspectRatio="2048:1024">
-                                                <Grid>
-                                                    <Grid.ColumnDefinitions>
-                                                        <ColumnDefinition Width="auto"/>
-                                                        <ColumnDefinition/>
-                                                    </Grid.ColumnDefinitions>
-                                                    <Border Grid.ColumnSpan="2" Background="{ThemeResource DarkOnlyOverlayMaskColorBrush}"/>
-                                                    <ScrollViewer
-                                                        Grid.Column="0"
-                                                        Margin="16"
-                                                        VerticalScrollBarVisibility="Hidden">
-                                                        <StackPanel>
-                                                            <shvc:BottomTextControl MaxWidth="80" Text="{shcm:ResourceString Name=ViewPageWiKiWeaponBeforeAscensionTitle}">
-                                                                <shvc:ItemIcon Icon="{Binding Selected.Icon, Converter={StaticResource EquipIconConverter}}" Quality="{Binding Selected.RankLevel}"/>
-                                                            </shvc:BottomTextControl>
-
-                                                            <shvc:BottomTextControl Margin="0,16,0,0" Text="{shcm:ResourceString Name=ViewPageWiKiWeaponAfterAscensionTitle}">
-                                                                <shvc:ItemIcon Icon="{Binding Selected.AwakenIcon, Converter={StaticResource EquipIconConverter}}" Quality="{Binding Selected.RankLevel}"/>
-                                                            </shvc:BottomTextControl>
-                                                        </StackPanel>
-                                                    </ScrollViewer>
-
-                                                    <Grid Grid.ColumnSpan="2">
-                                                        <Grid.ColumnDefinitions>
-                                                            <ColumnDefinition Width="176*"/>
-                                                            <ColumnDefinition Width="848*"/>
-                                                        </Grid.ColumnDefinitions>
-                                                        <shci:CachedImage
-                                                            Grid.Column="1"
-                                                            HorizontalAlignment="Center"
-                                                            VerticalAlignment="Stretch"
-                                                            Source="{Binding Selected.Icon, Converter={StaticResource GachaEquipIconConverter}}"/>
-                                                    </Grid>
-                                                    <TextBlock
-                                                        Grid.Column="1"
-                                                        Margin="16"
-                                                        HorizontalAlignment="Right"
-                                                        VerticalAlignment="Bottom"
-                                                        Style="{StaticResource SubtitleTextBlockStyle}"
-                                                        Text="{Binding Selected.Name}"/>
-                                                </Grid>
-                                            </cwc:ConstrainedBox>
-                                        </Border>
-                                    </Border>
-
-                                    <TextBlock
-                                        Margin="16,16,0,0"
-                                        Text="{Binding Selected.Description}"
-                                        TextWrapping="Wrap"/>
-                                    <shvc:BaseValueSlider
-                                        Margin="16,16,0,0"
-                                        HorizontalAlignment="Stretch"
-                                        HorizontalContentAlignment="Stretch"
-                                        BaseValueInfo="{Binding BaseValueInfo, Mode=OneWay}"/>
-                                    <TextBlock
-                                        Margin="16,32,0,0"
-                                        Style="{StaticResource BaseTextBlockStyle}"
-                                        Text="{shcm:ResourceString Name=ViewPageWiKiAvatarAscensionMaterialsHeader}"/>
-                                    <GridView
-                                        Margin="16,16,0,0"
-                                        ItemTemplate="{StaticResource CultivateItemTemplate}"
-                                        ItemsSource="{Binding Selected.CultivationItemsView}"
-                                        SelectionMode="None"/>
-                                    <StackPanel Visibility="{Binding Selected.Affix, Converter={StaticResource EmptyObjectToVisibilityConverter}}">
-                                        <TextBlock
-                                            Margin="16,16,0,0"
-                                            Style="{StaticResource BaseTextBlockStyle}"
-                                            Text="{Binding Selected.Affix.Name}"/>
-                                        <Pivot
-                                            HeaderTemplate="{StaticResource AffixPivotHeaderTemplate}"
-                                            ItemTemplate="{StaticResource AffixPivotItemTemplate}"
-                                            ItemsSource="{Binding Selected.Affix.Descriptions}"/>
-                                    </StackPanel>
-
-                                    <TextBlock
-                                        Margin="16,32,0,0"
-                                        Style="{StaticResource BaseTextBlockStyle}"
-                                        Text="{shcm:ResourceString Name=ViewPageWiKiAvatarTeamCombinationHeader}"/>
-                                    <GridView
-                                        Margin="16,16,0,0"
-                                        HorizontalAlignment="Stretch"
-                                        HorizontalContentAlignment="Stretch"
-                                        ItemTemplate="{StaticResource CollocationTemplate}"
-                                        ItemsSource="{Binding Selected.Collocation.Avatars}"
-                                        SelectionMode="None"/>
-                                </StackPanel>
-
-                            </ScrollViewer>
-                        </SplitView.Content>
-                    </SplitView>
-                </cwc:Case>
-                <cwc:Case Value="Grid">
-                    <GridView
-                        Padding="12,12,2,0"
-                        HorizontalAlignment="Stretch"
-                        HorizontalContentAlignment="Left"
-                        ItemContainerStyle="{StaticResource LargeGridViewItemStyle}"
-                        ItemTemplate="{StaticResource WeaponGridTemplate}"
-                        ItemsSource="{Binding Weapons}"
-                        SelectedItem="{Binding Selected, Mode=TwoWay}"
-                        SelectionMode="Single">
-                        <mxi:Interaction.Behaviors>
-                            <shcb:SelectedItemInViewBehavior/>
-                        </mxi:Interaction.Behaviors>
-                    </GridView>
+                            </GridView>
+                        </Border>
+                    </Border>
                 </cwc:Case>
             </cwc:SwitchPresenter>