diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Theme/FlyoutStyle.xaml b/src/Snap.Hutao/Snap.Hutao/Control/Theme/FlyoutStyle.xaml
index 74d9ca6f..bd38511d 100644
--- a/src/Snap.Hutao/Snap.Hutao/Control/Theme/FlyoutStyle.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/Control/Theme/FlyoutStyle.xaml
@@ -3,10 +3,16 @@
         <Setter Property="Padding" Value="0"/>
         <Setter Property="BorderBrush" Value="{ThemeResource CardStrokeColorDefaultBrush}"/>
     </Style>
-    <Style x:Key="FlyoutPresenterPadding0And2Style" BasedOn="{StaticResource DefaultFlyoutPresenterStyle}" TargetType="FlyoutPresenter">
+    <Style
+        x:Key="FlyoutPresenterPadding0And2Style"
+        BasedOn="{StaticResource DefaultFlyoutPresenterStyle}"
+        TargetType="FlyoutPresenter">
         <Setter Property="Padding" Value="0,2"/>
     </Style>
-    <Style x:Key="FlyoutPresenterPadding6Style" BasedOn="{StaticResource DefaultFlyoutPresenterStyle}" TargetType="FlyoutPresenter">
+    <Style
+        x:Key="FlyoutPresenterPadding6Style"
+        BasedOn="{StaticResource DefaultFlyoutPresenterStyle}"
+        TargetType="FlyoutPresenter">
         <Setter Property="Padding" Value="6"/>
     </Style>
 </ResourceDictionary>
diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Theme/ItemsPanelTemplate.xaml b/src/Snap.Hutao/Snap.Hutao/Control/Theme/ItemsPanelTemplate.xaml
index a7e91aa2..28a32452 100644
--- a/src/Snap.Hutao/Snap.Hutao/Control/Theme/ItemsPanelTemplate.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/Control/Theme/ItemsPanelTemplate.xaml
@@ -17,6 +17,12 @@
     <ItemsPanelTemplate x:Key="HorizontalStackPanelSpacing2Template">
         <StackPanel Orientation="Horizontal" Spacing="2"/>
     </ItemsPanelTemplate>
+    <ItemsPanelTemplate x:Key="UniformGridColumns2Spacing2Template">
+        <cwcont:UniformGrid
+            ColumnSpacing="2"
+            Columns="2"
+            RowSpacing="2"/>
+    </ItemsPanelTemplate>
     <ItemsPanelTemplate x:Key="UniformGridColumns5Spacing4Template">
         <cwcont:UniformGrid
             ColumnSpacing="4"
diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Theme/TransitionCollection.xaml b/src/Snap.Hutao/Snap.Hutao/Control/Theme/TransitionCollection.xaml
index 146fc0cd..02b9df16 100644
--- a/src/Snap.Hutao/Snap.Hutao/Control/Theme/TransitionCollection.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/Control/Theme/TransitionCollection.xaml
@@ -14,4 +14,10 @@
     <TransitionCollection x:Key="ReorderThemeTransitions">
         <ReorderThemeTransition/>
     </TransitionCollection>
+    <TransitionCollection x:Key="RepositionThemeTransitions">
+        <RepositionThemeTransition/>
+    </TransitionCollection>
+    <TransitionCollection x:Key="NavigationThemeTransitions">
+        <NavigationThemeTransition/>
+    </TransitionCollection>
 </ResourceDictionary>
diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx
index 3393d0f8..ceda545a 100644
--- a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx
+++ b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx
@@ -2489,6 +2489,9 @@
   <data name="ViewSpiralAbyssUploadRecord" xml:space="preserve">
     <value>上传数据</value>
   </data>
+  <data name="ViewTitleAutoClicking" xml:space="preserve">
+    <value>自动连点</value>
+  </data>
   <data name="ViewToolHeader" xml:space="preserve">
     <value>工具</value>
   </data>
diff --git a/src/Snap.Hutao/Snap.Hutao/View/InfoBarView.xaml b/src/Snap.Hutao/Snap.Hutao/View/InfoBarView.xaml
index c2b4e239..cb5f495f 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/InfoBarView.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/InfoBarView.xaml
@@ -12,11 +12,9 @@
             MaxWidth="640"
             Margin="32,48,32,32"
             VerticalAlignment="Bottom"
+            ItemContainerTransitions="{StaticResource RepositionThemeTransition}"
             ItemsSource="{x:Bind InfoBars}"
-            Visibility="{Binding ElementName=VisibilityButton, Path=IsChecked, Converter={StaticResource BoolToVisibilityConverter}}">
-            <ItemsControl.Transitions>
-                <RepositionThemeTransition/>
-            </ItemsControl.Transitions>
+            Visibility="{x:Bind VisibilityButton.IsChecked, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}">
             <ItemsControl.Resources>
                 <ResourceDictionary>
                     <ResourceDictionary.ThemeDictionaries>
diff --git a/src/Snap.Hutao/Snap.Hutao/View/MainView.xaml b/src/Snap.Hutao/Snap.Hutao/View/MainView.xaml
index a652374d..0b2f163c 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/MainView.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/MainView.xaml
@@ -17,7 +17,7 @@
         <NavigationView
             x:Name="NavView"
             CompactPaneLength="48"
-            IsBackEnabled="{Binding ElementName=ContentFrame, Path=CanGoBack}"
+            IsBackEnabled="{x:Bind ContentFrame.CanGoBack, Mode=OneWay}"
             IsPaneOpen="True"
             OpenPaneLength="188"
             PaneDisplayMode="Left"
@@ -86,13 +86,10 @@
                 <shv:UserView/>
             </NavigationView.PaneFooter>
 
-            <Frame x:Name="ContentFrame" UseLayoutRounding="True">
-                <Frame.ContentTransitions>
-                    <TransitionCollection>
-                        <NavigationThemeTransition/>
-                    </TransitionCollection>
-                </Frame.ContentTransitions>
-            </Frame>
+            <Frame
+                x:Name="ContentFrame"
+                ContentTransitions="{StaticResource NavigationThemeTransitions}"
+                UseLayoutRounding="True"/>
         </NavigationView>
 
         <shv:InfoBarView/>
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/WikiAvatarPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/WikiAvatarPage.xaml
index 1fa863ef..3b929193 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/WikiAvatarPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/WikiAvatarPage.xaml
@@ -58,6 +58,132 @@
                 </shct:DescriptionTextBlock.Resources>
             </shct:DescriptionTextBlock>
         </DataTemplate>
+
+        <DataTemplate x:Key="AvatarListTemplate">
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="auto"/>
+                    <ColumnDefinition/>
+                </Grid.ColumnDefinitions>
+                <shci:CachedImage
+                    Grid.Column="0"
+                    Width="48"
+                    Height="48"
+                    Margin="0,0,12,12"
+                    Source="{Binding SideIcon, Converter={StaticResource AvatarSideIconConverter}, Mode=OneWay}"/>
+                <TextBlock
+                    Grid.Column="1"
+                    Margin="12,0,0,0"
+                    VerticalAlignment="Center"
+                    Text="{Binding Name}"/>
+            </Grid>
+        </DataTemplate>
+
+        <DataTemplate x:Key="CultivationItemTemplate">
+            <shvc:BottomTextControl Text="{Binding Name}">
+                <shvc:ItemIcon Icon="{Binding Icon, Converter={StaticResource ItemIconConverter}}" Quality="{Binding RankLevel}"/>
+            </shvc:BottomTextControl>
+        </DataTemplate>
+
+        <DataTemplate x:Key="CollocationTemplate">
+            <shvc:BottomTextControl Text="{Binding Rate}" ToolTipService.ToolTip="{Binding Name}">
+                <shvc:ItemIcon Icon="{Binding Icon}" Quality="{Binding Quality}"/>
+            </shvc:BottomTextControl>
+        </DataTemplate>
+
+        <DataTemplate x:Key="CollocationReliquaryTemplate">
+            <shvc:BottomTextControl Text="{Binding Rate}" ToolTipService.ToolTip="{Binding Name}">
+                <cwc:SwitchPresenter Value="{Binding Icons.Count, Mode=OneWay}">
+                    <cwc:Case IsDefault="True">
+                        <cwc:Case.Value>
+                            <x:Int32>0</x:Int32>
+                        </cwc:Case.Value>
+                        <Grid>
+                            <shvc:ItemIcon
+                                Width="80"
+                                Height="80"
+                                Icon="{StaticResource UI_ItemIcon_None}"
+                                Quality="QUALITY_ORANGE"/>
+                        </Grid>
+                    </cwc:Case>
+                    <cwc:Case>
+                        <cwc:Case.Value>
+                            <x:Int32>1</x:Int32>
+                        </cwc:Case.Value>
+                        <Grid>
+                            <shvc:ItemIcon
+                                Width="80"
+                                Height="80"
+                                Icon="{Binding Icons[0]}"
+                                Quality="QUALITY_ORANGE"/>
+                        </Grid>
+                    </cwc:Case>
+                    <cwc:Case>
+                        <cwc:Case.Value>
+                            <x:Int32>2</x:Int32>
+                        </cwc:Case.Value>
+                        <Grid>
+                            <shvc:ItemIcon Quality="QUALITY_ORANGE"/>
+                            <shci:CachedImage
+                                Width="54"
+                                Margin="0,4,0,0"
+                                HorizontalAlignment="Left"
+                                VerticalAlignment="Top"
+                                Source="{Binding Icons[0]}"/>
+                            <shci:CachedImage
+                                Width="54"
+                                Margin="0,0,0,4"
+                                HorizontalAlignment="Right"
+                                VerticalAlignment="Bottom"
+                                Source="{Binding Icons[1]}"/>
+                        </Grid>
+                    </cwc:Case>
+                </cwc:SwitchPresenter>
+            </shvc:BottomTextControl>
+        </DataTemplate>
+
+        <DataTemplate x:Key="CostumeTemplate">
+            <Grid Margin="0,0,0,16">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="auto"/>
+                    <ColumnDefinition/>
+                </Grid.ColumnDefinitions>
+                <shci:CachedImage
+                    Width="80"
+                    Height="80"
+                    Margin="0,0,16,0"
+                    Source="{StaticResource UI_AvatarIcon_Costume_Card}"/>
+                <shci:CachedImage
+                    Width="80"
+                    Height="80"
+                    Margin="0,0,16,0"
+                    Source="{Binding FrontIcon, Converter={StaticResource AvatarCardConverter}}"/>
+                <StackPanel Grid.Column="1" Margin="0,0,16,-4">
+                    <TextBlock Text="{Binding Name}"/>
+                    <TextBlock
+                        Margin="0,8,0,16"
+                        Style="{StaticResource CaptionTextBlockStyle}"
+                        Text="{Binding Description}"/>
+                </StackPanel>
+            </Grid>
+        </DataTemplate>
+
+        <DataTemplate x:Key="FetterStoryTemplate">
+            <StackPanel Margin="0,0,0,0">
+                <TextBlock Text="{Binding Title}"/>
+                <shct:DescriptionTextBlock
+                    Margin="0,8,0,0"
+                    Description="{Binding Context}"
+                    TextStyle="{StaticResource CaptionTextBlockStyle}"/>
+                <MenuFlyoutSeparator Margin="0,8"/>
+            </StackPanel>
+        </DataTemplate>
+
+        <DataTemplate x:Key="AvatarGridTemplate">
+            <shvc:BottomTextControl Text="{Binding Name}">
+                <shvc:ItemIcon Icon="{Binding Icon, Converter={StaticResource AvatarIconConverter}, Mode=OneWay}" Quality="{Binding Quality}"/>
+            </shvc:BottomTextControl>
+        </DataTemplate>
     </Page.Resources>
 
     <Grid>
@@ -100,12 +226,10 @@
                     Icon="{shcm:FontIcon Glyph=&#xE8EF;}"
                     Label="{shcm:ResourceString Name=ViewPageWiKiGeneralAddToDevPlanButtonLabel}"/>
             </CommandBar>
-            <cwc:SwitchPresenter Grid.Row="1" Value="{Binding ElementName=ItemsPanelSelector, Path=Current}">
-                <cwc:SwitchPresenter.ContentTransitions>
-                    <TransitionCollection>
-                        <ContentThemeTransition/>
-                    </TransitionCollection>
-                </cwc:SwitchPresenter.ContentTransitions>
+            <cwc:SwitchPresenter
+                Grid.Row="1"
+                ContentTransitions="{ThemeResource ContentThemeTransitions}"
+                Value="{Binding ElementName=ItemsPanelSelector, Path=Current}">
                 <cwc:Case Value="List">
                     <SplitView
                         Grid.Row="1"
@@ -116,33 +240,13 @@
                         <SplitView.Pane>
                             <ListView
                                 Grid.Row="1"
+                                ItemTemplate="{StaticResource AvatarListTemplate}"
                                 ItemsSource="{Binding Avatars}"
                                 SelectedItem="{Binding Selected, Mode=TwoWay}"
                                 SelectionMode="Single">
                                 <mxi:Interaction.Behaviors>
                                     <shcb:SelectedItemInViewBehavior/>
                                 </mxi:Interaction.Behaviors>
-                                <ListView.ItemTemplate>
-                                    <DataTemplate>
-                                        <Grid>
-                                            <Grid.ColumnDefinitions>
-                                                <ColumnDefinition Width="auto"/>
-                                                <ColumnDefinition/>
-                                            </Grid.ColumnDefinitions>
-                                            <shci:CachedImage
-                                                Grid.Column="0"
-                                                Width="48"
-                                                Height="48"
-                                                Margin="0,0,12,12"
-                                                Source="{Binding SideIcon, Converter={StaticResource AvatarSideIconConverter}, Mode=OneWay}"/>
-                                            <TextBlock
-                                                Grid.Column="1"
-                                                Margin="12,0,0,0"
-                                                VerticalAlignment="Center"
-                                                Text="{Binding Name}"/>
-                                        </Grid>
-                                    </DataTemplate>
-                                </ListView.ItemTemplate>
                             </ListView>
                         </SplitView.Pane>
                         <SplitView.Content>
@@ -290,16 +394,9 @@
                                             Text="{shcm:ResourceString Name=ViewPageWiKiAvatarAscensionMaterialsHeader}"/>
                                         <GridView
                                             Margin="16,16,0,0"
+                                            ItemTemplate="{StaticResource CultivationItemTemplate}"
                                             ItemsSource="{Binding Selected.CultivationItemsView}"
-                                            SelectionMode="None">
-                                            <GridView.ItemTemplate>
-                                                <DataTemplate>
-                                                    <shvc:BottomTextControl Text="{Binding Name}">
-                                                        <shvc:ItemIcon Icon="{Binding Icon, Converter={StaticResource ItemIconConverter}}" Quality="{Binding RankLevel}"/>
-                                                    </shvc:BottomTextControl>
-                                                </DataTemplate>
-                                            </GridView.ItemTemplate>
-                                        </GridView>
+                                            SelectionMode="None"/>
 
                                         <TextBlock
                                             Margin="16,32,0,0"
@@ -326,16 +423,9 @@
                                             Text="{shcm:ResourceString Name=ViewPageWiKiAvatarTeamCombinationHeader}"/>
                                         <GridView
                                             Margin="16,16,0,0"
+                                            ItemTemplate="{StaticResource CollocationTemplate}"
                                             ItemsSource="{Binding Selected.Collocation.Avatars}"
-                                            SelectionMode="None">
-                                            <GridView.ItemTemplate>
-                                                <DataTemplate>
-                                                    <shvc:BottomTextControl Text="{Binding Rate}" ToolTipService.ToolTip="{Binding Name}">
-                                                        <shvc:ItemIcon Icon="{Binding Icon}" Quality="{Binding Quality}"/>
-                                                    </shvc:BottomTextControl>
-                                                </DataTemplate>
-                                            </GridView.ItemTemplate>
-                                        </GridView>
+                                            SelectionMode="None"/>
                                         <TextBlock
                                             Margin="16,0,0,0"
                                             Style="{StaticResource BaseTextBlockStyle}"
@@ -344,16 +434,9 @@
                                             Margin="16,16,0,0"
                                             HorizontalAlignment="Stretch"
                                             HorizontalContentAlignment="Stretch"
+                                            ItemTemplate="{StaticResource CollocationTemplate}"
                                             ItemsSource="{Binding Selected.Collocation.Weapons}"
-                                            SelectionMode="None">
-                                            <GridView.ItemTemplate>
-                                                <DataTemplate>
-                                                    <shvc:BottomTextControl Text="{Binding Rate}" ToolTipService.ToolTip="{Binding Name}">
-                                                        <shvc:ItemIcon Icon="{Binding Icon}" Quality="{Binding Quality}"/>
-                                                    </shvc:BottomTextControl>
-                                                </DataTemplate>
-                                            </GridView.ItemTemplate>
-                                        </GridView>
+                                            SelectionMode="None"/>
                                         <TextBlock
                                             Margin="16,0,0,0"
                                             Style="{StaticResource BaseTextBlockStyle}"
@@ -362,61 +445,9 @@
                                             Margin="16,16,0,0"
                                             HorizontalAlignment="Stretch"
                                             HorizontalContentAlignment="Stretch"
+                                            ItemTemplate="{StaticResource CollocationReliquaryTemplate}"
                                             ItemsSource="{Binding Selected.Collocation.ReliquarySets}"
-                                            SelectionMode="None">
-                                            <GridView.ItemTemplate>
-                                                <DataTemplate>
-                                                    <shvc:BottomTextControl Text="{Binding Rate}" ToolTipService.ToolTip="{Binding Name}">
-                                                        <cwc:SwitchPresenter Value="{Binding Icons.Count, Mode=OneWay}">
-                                                            <cwc:Case IsDefault="True">
-                                                                <cwc:Case.Value>
-                                                                    <x:Int32>0</x:Int32>
-                                                                </cwc:Case.Value>
-                                                                <Grid>
-                                                                    <shvc:ItemIcon
-                                                                        Width="80"
-                                                                        Height="80"
-                                                                        Icon="{StaticResource UI_ItemIcon_None}"
-                                                                        Quality="QUALITY_ORANGE"/>
-                                                                </Grid>
-                                                            </cwc:Case>
-                                                            <cwc:Case>
-                                                                <cwc:Case.Value>
-                                                                    <x:Int32>1</x:Int32>
-                                                                </cwc:Case.Value>
-                                                                <Grid>
-                                                                    <shvc:ItemIcon
-                                                                        Width="80"
-                                                                        Height="80"
-                                                                        Icon="{Binding Icons[0]}"
-                                                                        Quality="QUALITY_ORANGE"/>
-                                                                </Grid>
-                                                            </cwc:Case>
-                                                            <cwc:Case>
-                                                                <cwc:Case.Value>
-                                                                    <x:Int32>2</x:Int32>
-                                                                </cwc:Case.Value>
-                                                                <Grid>
-                                                                    <shvc:ItemIcon Quality="QUALITY_ORANGE"/>
-                                                                    <shci:CachedImage
-                                                                        Width="54"
-                                                                        Margin="0,4,0,0"
-                                                                        HorizontalAlignment="Left"
-                                                                        VerticalAlignment="Top"
-                                                                        Source="{Binding Icons[0]}"/>
-                                                                    <shci:CachedImage
-                                                                        Width="54"
-                                                                        Margin="0,0,0,4"
-                                                                        HorizontalAlignment="Right"
-                                                                        VerticalAlignment="Bottom"
-                                                                        Source="{Binding Icons[1]}"/>
-                                                                </Grid>
-                                                            </cwc:Case>
-                                                        </cwc:SwitchPresenter>
-                                                    </shvc:BottomTextControl>
-                                                </DataTemplate>
-                                            </GridView.ItemTemplate>
-                                        </GridView>
+                                            SelectionMode="None"/>
 
                                         <TextBlock
                                             Margin="16,32,0,0"
@@ -504,7 +535,6 @@
                                                         Text="{Binding Item.EffectDescription}"
                                                         TextWrapping="Wrap"/>
                                                 </StackPanel>
-
                                             </Grid>
                                         </Expander>
                                         <!--  衣装  -->
@@ -513,35 +543,10 @@
                                             HorizontalAlignment="Stretch"
                                             HorizontalContentAlignment="Stretch"
                                             Header="{shcm:ResourceString Name=ViewPageWiKiAvatarCostumeHeader}">
-                                            <ItemsControl Margin="0,0,0,-16" ItemsSource="{Binding Selected.Costumes}">
-                                                <ItemsControl.ItemTemplate>
-                                                    <DataTemplate>
-                                                        <Grid Margin="0,0,0,16">
-                                                            <Grid.ColumnDefinitions>
-                                                                <ColumnDefinition Width="auto"/>
-                                                                <ColumnDefinition/>
-                                                            </Grid.ColumnDefinitions>
-                                                            <shci:CachedImage
-                                                                Width="80"
-                                                                Height="80"
-                                                                Margin="0,0,16,0"
-                                                                Source="{StaticResource UI_AvatarIcon_Costume_Card}"/>
-                                                            <shci:CachedImage
-                                                                Width="80"
-                                                                Height="80"
-                                                                Margin="0,0,16,0"
-                                                                Source="{Binding FrontIcon, Converter={StaticResource AvatarCardConverter}}"/>
-                                                            <StackPanel Grid.Column="1" Margin="0,0,16,-4">
-                                                                <TextBlock Text="{Binding Name}"/>
-                                                                <TextBlock
-                                                                    Margin="0,8,0,16"
-                                                                    Style="{StaticResource CaptionTextBlockStyle}"
-                                                                    Text="{Binding Description}"/>
-                                                            </StackPanel>
-                                                        </Grid>
-                                                    </DataTemplate>
-                                                </ItemsControl.ItemTemplate>
-                                            </ItemsControl>
+                                            <ItemsControl
+                                                Margin="0,0,0,-16"
+                                                ItemTemplate="{StaticResource CostumeTemplate}"
+                                                ItemsSource="{Binding Selected.Costumes}"/>
                                         </Expander>
                                         <!--  资料  -->
                                         <Expander
@@ -549,20 +554,10 @@
                                             HorizontalAlignment="Stretch"
                                             HorizontalContentAlignment="Stretch"
                                             Header="{shcm:ResourceString Name=ViewPageWiKiAvatarQuotesHeader}">
-                                            <ItemsControl Margin="0,0,0,-24" ItemsSource="{Binding Selected.FetterInfo.Fetters}">
-                                                <ItemsControl.ItemTemplate>
-                                                    <DataTemplate>
-                                                        <StackPanel Margin="0,0,0,0">
-                                                            <TextBlock Text="{Binding Title}"/>
-                                                            <shct:DescriptionTextBlock
-                                                                Margin="0,8,0,0"
-                                                                Description="{Binding Context}"
-                                                                TextStyle="{StaticResource CaptionTextBlockStyle}"/>
-                                                            <MenuFlyoutSeparator Margin="0,8"/>
-                                                        </StackPanel>
-                                                    </DataTemplate>
-                                                </ItemsControl.ItemTemplate>
-                                            </ItemsControl>
+                                            <ItemsControl
+                                                Margin="0,0,0,-24"
+                                                ItemTemplate="{StaticResource FetterStoryTemplate}"
+                                                ItemsSource="{Binding Selected.FetterInfo.Fetters}"/>
                                         </Expander>
                                         <!--  故事  -->
                                         <Expander
@@ -570,20 +565,10 @@
                                             HorizontalAlignment="Stretch"
                                             HorizontalContentAlignment="Stretch"
                                             Header="{shcm:ResourceString Name=ViewPageWiKiAvatarStoriesHeader}">
-                                            <ItemsControl Margin="0,0,0,-24" ItemsSource="{Binding Selected.FetterInfo.FetterStories}">
-                                                <ItemsControl.ItemTemplate>
-                                                    <DataTemplate>
-                                                        <StackPanel Margin="0,0,0,0">
-                                                            <TextBlock Text="{Binding Title}"/>
-                                                            <TextBlock
-                                                                Margin="0,8,0,0"
-                                                                Style="{StaticResource CaptionTextBlockStyle}"
-                                                                Text="{Binding Context}"/>
-                                                            <MenuFlyoutSeparator Margin="0,8"/>
-                                                        </StackPanel>
-                                                    </DataTemplate>
-                                                </ItemsControl.ItemTemplate>
-                                            </ItemsControl>
+                                            <ItemsControl
+                                                Margin="0,0,0,-24"
+                                                ItemTemplate="{StaticResource FetterStoryTemplate}"
+                                                ItemsSource="{Binding Selected.FetterInfo.FetterStories}"/>
                                         </Expander>
                                     </StackPanel>
                                 </ScrollViewer>
@@ -597,23 +582,16 @@
                         HorizontalAlignment="Stretch"
                         HorizontalContentAlignment="Left"
                         ItemContainerStyle="{StaticResource LargeGridViewItemStyle}"
+                        ItemTemplate="{StaticResource AvatarGridTemplate}"
                         ItemsSource="{Binding Avatars}"
                         SelectedItem="{Binding Selected, Mode=TwoWay}"
                         SelectionMode="Single">
                         <mxi:Interaction.Behaviors>
                             <shcb:SelectedItemInViewBehavior/>
                         </mxi:Interaction.Behaviors>
-                        <GridView.ItemTemplate>
-                            <DataTemplate>
-                                <shvc:BottomTextControl Text="{Binding Name}">
-                                    <shvc:ItemIcon Icon="{Binding Icon, Converter={StaticResource AvatarIconConverter}, Mode=OneWay}" Quality="{Binding Quality}"/>
-                                </shvc:BottomTextControl>
-                            </DataTemplate>
-                        </GridView.ItemTemplate>
                     </GridView>
                 </cwc:Case>
             </cwc:SwitchPresenter>
-
         </Grid>
         <shvc:LoadingView IsLoading="{Binding Avatars, Converter={StaticResource EmptyObjectToBoolRevertConverter}}"/>
     </Grid>
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/WikiMonsterPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/WikiMonsterPage.xaml
index f9434cd6..9624fac5 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/WikiMonsterPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/WikiMonsterPage.xaml
@@ -22,6 +22,47 @@
     <mxi:Interaction.Behaviors>
         <shcb:InvokeCommandOnLoadedBehavior Command="{Binding OpenUICommand}"/>
     </mxi:Interaction.Behaviors>
+
+    <Page.Resources>
+        <DataTemplate x:Key="MonsterListTemplate">
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="auto"/>
+                    <ColumnDefinition/>
+                </Grid.ColumnDefinitions>
+                <shci:CachedImage
+                    Grid.Column="0"
+                    Width="48"
+                    Height="48"
+                    Margin="0,6,12,6"
+                    Source="{Binding Icon, Converter={StaticResource MonsterIconConverter}, Mode=OneWay}"/>
+                <TextBlock
+                    Grid.Column="1"
+                    Margin="12,0,0,0"
+                    VerticalAlignment="Center"
+                    Text="{Binding Name}"/>
+            </Grid>
+        </DataTemplate>
+
+        <DataTemplate x:Key="MonsterBaseValueTemplate">
+            <cwc:SettingsCard Header="{Binding Name}">
+                <TextBlock Text="{Binding Value}"/>
+            </cwc:SettingsCard>
+        </DataTemplate>
+
+        <DataTemplate x:Key="MonsterDropTemplate">
+            <shvc:BottomTextControl Text="{Binding Name}">
+                <shvc:ItemIcon Icon="{Binding Icon, Converter={StaticResource ItemIconConverter}}" Quality="{Binding RankLevel}"/>
+            </shvc:BottomTextControl>
+        </DataTemplate>
+
+        <DataTemplate x:Key="MonsterGridTemplate">
+            <shvc:BottomTextControl Text="{Binding Name}">
+                <shvc:ItemIcon Icon="{Binding Icon, Converter={StaticResource MonsterIconConverter}, Mode=OneWay}" Quality="QUALITY_NONE"/>
+            </shvc:BottomTextControl>
+        </DataTemplate>
+    </Page.Resources>
+
     <Grid>
         <Grid Visibility="{Binding Monsters, Converter={StaticResource EmptyObjectToVisibilityConverter}}">
             <Grid.RowDefinitions>
@@ -66,33 +107,13 @@
                         <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.ItemTemplate>
-                                    <DataTemplate>
-                                        <Grid>
-                                            <Grid.ColumnDefinitions>
-                                                <ColumnDefinition Width="auto"/>
-                                                <ColumnDefinition/>
-                                            </Grid.ColumnDefinitions>
-                                            <shci:CachedImage
-                                                Grid.Column="0"
-                                                Width="48"
-                                                Height="48"
-                                                Margin="0,6,12,6"
-                                                Source="{Binding Icon, Converter={StaticResource MonsterIconConverter}, Mode=OneWay}"/>
-                                            <TextBlock
-                                                Grid.Column="1"
-                                                Margin="12,0,0,0"
-                                                VerticalAlignment="Center"
-                                                Text="{Binding Name}"/>
-                                        </Grid>
-                                    </DataTemplate>
-                                </ListView.ItemTemplate>
                             </ListView>
                         </SplitView.Pane>
                         <SplitView.Content>
@@ -126,27 +147,16 @@
                                             HorizontalContentAlignment="Stretch"
                                             BaseValueInfo="{Binding BaseValueInfo, Mode=OneWay}"
                                             IsPromoteVisible="False"/>
-                                        <ItemsControl Margin="16,16,0,0" ItemsSource="{Binding Selected.BaseValue.SubHurts}">
+                                        <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.ItemsPanel>
-                                                <ItemsPanelTemplate>
-                                                    <cwc:UniformGrid
-                                                        ColumnSpacing="2"
-                                                        Columns="2"
-                                                        RowSpacing="2"/>
-                                                </ItemsPanelTemplate>
-                                            </ItemsControl.ItemsPanel>
-                                            <ItemsControl.ItemTemplate>
-                                                <DataTemplate>
-                                                    <cwc:SettingsCard Header="{Binding Name}">
-                                                        <TextBlock Text="{Binding Value}"/>
-                                                    </cwc:SettingsCard>
-                                                </DataTemplate>
-                                            </ItemsControl.ItemTemplate>
                                         </ItemsControl>
                                         <TextBlock
                                             Margin="16,32,0,0"
@@ -156,17 +166,10 @@
                                         <GridView
                                             Margin="16,16,-4,12"
                                             Padding="0"
+                                            ItemTemplate="{StaticResource MonsterDropTemplate}"
                                             ItemsSource="{Binding Selected.DropsView}"
                                             SelectionMode="None"
-                                            Visibility="{Binding Selected.DropsView, Converter={StaticResource EmptyObjectToVisibilityConverter}}">
-                                            <ItemsControl.ItemTemplate>
-                                                <DataTemplate>
-                                                    <shvc:BottomTextControl Text="{Binding Name}">
-                                                        <shvc:ItemIcon Icon="{Binding Icon, Converter={StaticResource ItemIconConverter}}" Quality="{Binding RankLevel}"/>
-                                                    </shvc:BottomTextControl>
-                                                </DataTemplate>
-                                            </ItemsControl.ItemTemplate>
-                                        </GridView>
+                                            Visibility="{Binding Selected.DropsView, Converter={StaticResource EmptyObjectToVisibilityConverter}}"/>
                                     </StackPanel>
                                 </Grid>
                             </ScrollViewer>
@@ -179,24 +182,13 @@
                         HorizontalAlignment="Stretch"
                         HorizontalContentAlignment="Left"
                         ItemContainerStyle="{StaticResource LargeGridViewItemStyle}"
+                        ItemTemplate="{StaticResource MonsterGridTemplate}"
                         ItemsSource="{Binding Monsters}"
                         SelectedItem="{Binding Selected, Mode=TwoWay}"
                         SelectionMode="Single">
                         <mxi:Interaction.Behaviors>
                             <shcb:SelectedItemInViewBehavior/>
                         </mxi:Interaction.Behaviors>
-                        <GridView.ItemsPanel>
-                            <ItemsPanelTemplate>
-                                <ItemsWrapGrid Orientation="Horizontal"/>
-                            </ItemsPanelTemplate>
-                        </GridView.ItemsPanel>
-                        <GridView.ItemTemplate>
-                            <DataTemplate>
-                                <shvc:BottomTextControl Text="{Binding Name}">
-                                    <shvc:ItemIcon Icon="{Binding Icon, Converter={StaticResource MonsterIconConverter}, Mode=OneWay}" Quality="QUALITY_NONE"/>
-                                </shvc:BottomTextControl>
-                            </DataTemplate>
-                        </GridView.ItemTemplate>
                     </GridView>
                 </cwc:Case>
             </cwc:SwitchPresenter>
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/WikiWeaponPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/WikiWeaponPage.xaml
index b02bcd8c..683c7c0d 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/WikiWeaponPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/WikiWeaponPage.xaml
@@ -30,6 +30,58 @@
                 PreferredSelectedIndex="13"
                 Source="{Binding Converter={StaticResource PropertyDescriptor}}"/>
         </DataTemplate>
+
+        <DataTemplate x:Key="WeaponListTemplate">
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="auto"/>
+                    <ColumnDefinition/>
+                </Grid.ColumnDefinitions>
+                <shci:CachedImage
+                    Grid.Column="0"
+                    Width="48"
+                    Height="48"
+                    Margin="0,0,12,6"
+                    Source="{Binding Icon, Converter={StaticResource EquipIconConverter}, Mode=OneWay}"/>
+                <TextBlock
+                    Grid.Column="1"
+                    Margin="12,0,0,0"
+                    VerticalAlignment="Center"
+                    Text="{Binding Name}"/>
+            </Grid>
+        </DataTemplate>
+
+        <DataTemplate x:Key="CultivateItemTemplate">
+            <shvc:BottomTextControl Text="{Binding Name}">
+                <shvc:ItemIcon Icon="{Binding Icon, Converter={StaticResource ItemIconConverter}}" Quality="{Binding RankLevel}"/>
+            </shvc:BottomTextControl>
+        </DataTemplate>
+
+        <DataTemplate x:Key="AffixPivotHeaderTemplate">
+            <TextBlock Style="{StaticResource CaptionTextBlockStyle}" Text="{Binding LevelFormatted}"/>
+        </DataTemplate>
+
+        <DataTemplate x:Key="AffixPivotItemTemplate">
+            <shct:DescriptionTextBlock Margin="16,16,0,0" Description="{Binding Description}">
+                <shct:DescriptionTextBlock.Resources>
+                    <Style BasedOn="{StaticResource BodyTextBlockStyle}" TargetType="TextBlock">
+                        <Setter Property="TextWrapping" Value="Wrap"/>
+                    </Style>
+                </shct:DescriptionTextBlock.Resources>
+            </shct:DescriptionTextBlock>
+        </DataTemplate>
+
+        <DataTemplate x:Key="CollocationTemplate">
+            <shvc:BottomTextControl Text="{Binding Rate}" ToolTipService.ToolTip="{Binding Name}">
+                <shvc:ItemIcon Icon="{Binding Icon}" Quality="{Binding Quality}"/>
+            </shvc:BottomTextControl>
+        </DataTemplate>
+
+        <DataTemplate x:Key="WeaponGridTemplate">
+            <shvc:BottomTextControl Text="{Binding Name}">
+                <shvc:ItemIcon Icon="{Binding Icon, Converter={StaticResource EquipIconConverter}, Mode=OneWay}" Quality="{Binding Quality}"/>
+            </shvc:BottomTextControl>
+        </DataTemplate>
     </Page.Resources>
 
     <Grid>
@@ -70,12 +122,10 @@
                     Icon="{shcm:FontIcon Glyph=&#xE8EF;}"
                     Label="{shcm:ResourceString Name=ViewPageWiKiGeneralAddToDevPlanButtonLabel}"/>
             </CommandBar>
-            <cwc:SwitchPresenter Grid.Row="1" Value="{Binding ElementName=ItemsPanelSelector, Path=Current}">
-                <cwc:SwitchPresenter.ContentTransitions>
-                    <TransitionCollection>
-                        <ContentThemeTransition/>
-                    </TransitionCollection>
-                </cwc:SwitchPresenter.ContentTransitions>
+            <cwc:SwitchPresenter
+                Grid.Row="1"
+                ContentTransitions="{ThemeResource ContentThemeTransitions}"
+                Value="{Binding ElementName=ItemsPanelSelector, Path=Current}">
                 <cwc:Case Value="List">
                     <SplitView
                         DisplayMode="Inline"
@@ -85,35 +135,14 @@
                         <SplitView.Pane>
                             <ListView
                                 Grid.Row="1"
+                                ItemTemplate="{StaticResource WeaponListTemplate}"
                                 ItemsSource="{Binding Weapons}"
                                 SelectedItem="{Binding Selected, Mode=TwoWay}"
                                 SelectionMode="Single">
                                 <mxi:Interaction.Behaviors>
                                     <shcb:SelectedItemInViewBehavior/>
                                 </mxi:Interaction.Behaviors>
-                                <ListView.ItemTemplate>
-                                    <DataTemplate>
-                                        <Grid>
-                                            <Grid.ColumnDefinitions>
-                                                <ColumnDefinition Width="auto"/>
-                                                <ColumnDefinition/>
-                                            </Grid.ColumnDefinitions>
-                                            <shci:CachedImage
-                                                Grid.Column="0"
-                                                Width="48"
-                                                Height="48"
-                                                Margin="0,0,12,6"
-                                                Source="{Binding Icon, Converter={StaticResource EquipIconConverter}, Mode=OneWay}"/>
-                                            <TextBlock
-                                                Grid.Column="1"
-                                                Margin="12,0,0,0"
-                                                VerticalAlignment="Center"
-                                                Text="{Binding Name}"/>
-                                        </Grid>
-                                    </DataTemplate>
-                                </ListView.ItemTemplate>
                             </ListView>
-
                         </SplitView.Pane>
                         <SplitView.Content>
                             <ScrollViewer>
@@ -186,39 +215,18 @@
                                         Text="{shcm:ResourceString Name=ViewPageWiKiAvatarAscensionMaterialsHeader}"/>
                                     <GridView
                                         Margin="16,16,0,0"
+                                        ItemTemplate="{StaticResource CultivateItemTemplate}"
                                         ItemsSource="{Binding Selected.CultivationItemsView}"
-                                        SelectionMode="None">
-                                        <GridView.ItemTemplate>
-                                            <DataTemplate>
-                                                <shvc:BottomTextControl Text="{Binding Name}">
-                                                    <shvc:ItemIcon Icon="{Binding Icon, Converter={StaticResource ItemIconConverter}}" Quality="{Binding RankLevel}"/>
-                                                </shvc:BottomTextControl>
-                                            </DataTemplate>
-                                        </GridView.ItemTemplate>
-                                    </GridView>
+                                        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 ItemsSource="{Binding Selected.Affix.Descriptions}">
-                                            <Pivot.HeaderTemplate>
-                                                <DataTemplate>
-                                                    <TextBlock Style="{StaticResource CaptionTextBlockStyle}" Text="{Binding LevelFormatted}"/>
-                                                </DataTemplate>
-                                            </Pivot.HeaderTemplate>
-                                            <Pivot.ItemTemplate>
-                                                <DataTemplate>
-                                                    <shct:DescriptionTextBlock Margin="16,16,0,0" Description="{Binding Description}">
-                                                        <shct:DescriptionTextBlock.Resources>
-                                                            <Style BasedOn="{StaticResource BodyTextBlockStyle}" TargetType="TextBlock">
-                                                                <Setter Property="TextWrapping" Value="Wrap"/>
-                                                            </Style>
-                                                        </shct:DescriptionTextBlock.Resources>
-                                                    </shct:DescriptionTextBlock>
-                                                </DataTemplate>
-                                            </Pivot.ItemTemplate>
-                                        </Pivot>
+                                        <Pivot
+                                            HeaderTemplate="{StaticResource AffixPivotHeaderTemplate}"
+                                            ItemTemplate="{StaticResource AffixPivotItemTemplate}"
+                                            ItemsSource="{Binding Selected.Affix.Descriptions}"/>
                                     </StackPanel>
 
                                     <TextBlock
@@ -229,16 +237,9 @@
                                         Margin="16,16,0,0"
                                         HorizontalAlignment="Stretch"
                                         HorizontalContentAlignment="Stretch"
+                                        ItemTemplate="{StaticResource CollocationTemplate}"
                                         ItemsSource="{Binding Selected.Collocation.Avatars}"
-                                        SelectionMode="None">
-                                        <GridView.ItemTemplate>
-                                            <DataTemplate>
-                                                <shvc:BottomTextControl Text="{Binding Rate}" ToolTipService.ToolTip="{Binding Name}">
-                                                    <shvc:ItemIcon Icon="{Binding Icon}" Quality="{Binding Quality}"/>
-                                                </shvc:BottomTextControl>
-                                            </DataTemplate>
-                                        </GridView.ItemTemplate>
-                                    </GridView>
+                                        SelectionMode="None"/>
                                 </StackPanel>
 
                             </ScrollViewer>
@@ -251,19 +252,13 @@
                         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.ItemTemplate>
-                            <DataTemplate>
-                                <shvc:BottomTextControl Text="{Binding Name}">
-                                    <shvc:ItemIcon Icon="{Binding Icon, Converter={StaticResource EquipIconConverter}, Mode=OneWay}" Quality="{Binding Quality}"/>
-                                </shvc:BottomTextControl>
-                            </DataTemplate>
-                        </GridView.ItemTemplate>
                     </GridView>
                 </cwc:Case>
             </cwc:SwitchPresenter>
diff --git a/src/Snap.Hutao/Snap.Hutao/View/TitleView.xaml b/src/Snap.Hutao/Snap.Hutao/View/TitleView.xaml
index fc883379..b7b25758 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/TitleView.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/TitleView.xaml
@@ -4,6 +4,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:shcm="using:Snap.Hutao.Control.Markup"
     Height="44"
     VerticalAlignment="Top"
     mc:Ignorable="d">
@@ -38,7 +39,7 @@
                 <TextBlock
                     Grid.Column="1"
                     Margin="6,0,0,0"
-                    Text="自动连点"/>
+                    Text="{shcm:ResourceString Name=ViewTitleAutoClicking}"/>
             </Grid>
         </ToggleButton>
     </Grid>