diff --git a/src/Snap.Hutao/Snap.Hutao/App.xaml b/src/Snap.Hutao/Snap.Hutao/App.xaml
index 2f382bce..e2ad5be8 100644
--- a/src/Snap.Hutao/Snap.Hutao/App.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/App.xaml
@@ -1,275 +1,30 @@
 <Application
     x:Class="Snap.Hutao.App"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:cwcont="using:CommunityToolkit.WinUI.Controls"
-    xmlns:cwconv="using:CommunityToolkit.WinUI.Converters"
-    xmlns:cwm="using:CommunityToolkit.WinUI.Media"
-    xmlns:shci="using:Snap.Hutao.Control.Image"
-    xmlns:shmmc="using:Snap.Hutao.Model.Metadata.Converter"
-    xmlns:shvc="using:Snap.Hutao.View.Converter">
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
                 <XamlControlsResources/>
-                <ResourceDictionary Source="Control/Theme/FontStyle.xaml"/>
-                <ResourceDictionary Source="Control/Theme/InfoBarOverride.xaml"/>
-                <ResourceDictionary Source="Control/Theme/PageOverride.xaml"/>
-                <ResourceDictionary Source="Control/Theme/PivotOverride.xaml"/>
-                <ResourceDictionary Source="Control/Theme/SettingsStyle.xaml"/>
-                <ResourceDictionary Source="Control/Theme/TransitionCollection.xaml"/>
-                <ResourceDictionary Source="Control/Theme/WindowOverride.xaml"/>
-                <ResourceDictionary Source="Control/Loading.xaml"/>
+                <ResourceDictionary Source="ms-appx:///Control/Loading.xaml"/>
+                <ResourceDictionary Source="ms-appx:///Control/Image/CachedImage.xaml"/>
+                <ResourceDictionary Source="ms-appx:///Control/Theme/Card.xaml"/>
+                <ResourceDictionary Source="ms-appx:///Control/Theme/Color.xaml"/>
+                <ResourceDictionary Source="ms-appx:///Control/Theme/Converter.xaml"/>
+                <ResourceDictionary Source="ms-appx:///Control/Theme/CornerRadius.xaml"/>
+                <ResourceDictionary Source="ms-appx:///Control/Theme/FontStyle.xaml"/>
+                <ResourceDictionary Source="ms-appx:///Control/Theme/Glyph.xaml"/>
+                <ResourceDictionary Source="ms-appx:///Control/Theme/InfoBarOverride.xaml"/>
+                <ResourceDictionary Source="ms-appx:///Control/Theme/ItemContainerStyle.xaml"/>
+                <ResourceDictionary Source="ms-appx:///Control/Theme/ItemsPanelTemplate.xaml"/>
+                <ResourceDictionary Source="ms-appx:///Control/Theme/NumericValue.xaml"/>
+                <ResourceDictionary Source="ms-appx:///Control/Theme/PageOverride.xaml"/>
+                <ResourceDictionary Source="ms-appx:///Control/Theme/PivotOverride.xaml"/>
+                <ResourceDictionary Source="ms-appx:///Control/Theme/SettingsStyle.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"/>
             </ResourceDictionary.MergedDictionaries>
-
-            <ResourceDictionary.ThemeDictionaries>
-                <ResourceDictionary x:Key="Light">
-                    <Color x:Key="AvatarPropertyAddValueColor">#FF74BF00</Color>
-                    <Color x:Key="CompatBackgroundColor">#FFF4F4F4</Color>
-                    <SolidColorBrush x:Key="DarkOnlyOverlayMaskBrush" Color="#00000000"/>
-                </ResourceDictionary>
-                <ResourceDictionary x:Key="Dark">
-                    <Color x:Key="AvatarPropertyAddValueColor">#FF90E800</Color>
-                    <Color x:Key="CompatBackgroundColor">#FF242424</Color>
-                    <SolidColorBrush x:Key="DarkOnlyOverlayMaskBrush" Color="#60000000"/>
-                </ResourceDictionary>
-            </ResourceDictionary.ThemeDictionaries>
-
-            <!--  CornerRadius  -->
-            <CornerRadius x:Key="ControlCornerRadiusTop">4,4,0,0</CornerRadius>
-            <CornerRadius x:Key="ControlCornerRadiusBottom">0,0,4,4</CornerRadius>
-            <CornerRadius x:Key="CompatCornerRadius">6</CornerRadius>
-            <CornerRadius x:Key="CompatCornerRadiusTop">6,6,0,0</CornerRadius>
-            <CornerRadius x:Key="CompatCornerRadiusRight">0,6,6,0</CornerRadius>
-            <CornerRadius x:Key="CompatCornerRadiusBottom">0,0,6,6</CornerRadius>
-            <CornerRadius x:Key="CompatCornerRadiusSmall">2</CornerRadius>
-            <!--  Length  -->
-            <GridLength x:Key="CompatGridLength2">288</GridLength>
-            <x:Double x:Key="CompatSplitViewOpenPaneLength">212</x:Double>
-            <x:Double x:Key="CompatSplitViewOpenPaneLength2">304</x:Double>
-            <x:Double x:Key="CompatSplitViewOpenPaneLength3">320</x:Double>
-            <x:Double x:Key="HomeAdaptiveCardHeight">180</x:Double>
-            <x:Double x:Key="ContentDialogMinHeight">64</x:Double>
-            <x:Double x:Key="LargeAppBarButtonWidth">100</x:Double>
-            <!--  ProgressBar  -->
-            <x:Double x:Key="LargeBackgroundProgressBarOpacity">0.2</x:Double>
-            <!--  Brushes  -->
-            <SolidColorBrush x:Key="AvatarPropertyAddValueBrush" Color="{ThemeResource AvatarPropertyAddValueColor}"/>
-            <SolidColorBrush x:Key="BlueBrush" Color="#FF5180CB"/>
-            <SolidColorBrush x:Key="PurpleBrush" Color="#FFA156E0"/>
-            <SolidColorBrush x:Key="OrangeBrush" Color="#FFBC6932"/>
-            <SolidColorBrush x:Key="GuaranteePullBrush" Color="#FF0063FF"/>
-            <SolidColorBrush x:Key="UpPullBrush" Color="#FFFFA400"/>
-
-            <!--  Uris  -->
-            <x:String x:Key="DocumentLink_MhyAccountSwitch">https://hut.ao/features/mhy-account-switch.html</x:String>
-            <x:String x:Key="DocumentLink_BugReport">https://hut.ao/statements/bug-report.html</x:String>
-            <x:String x:Key="DocumentLink_Translate">https://translate.hut.ao</x:String>
-            <x:String x:Key="DocumentLink_Home">https://hut.ao</x:String>
-            <x:String x:Key="HolographicHat_GetToken_Release">https://github.com/HolographicHat/GetToken/releases/latest</x:String>
-            <x:String x:Key="Sponsor_Afadian">https://afdian.net/a/DismissedLight</x:String>
-
-            <!--  Images  -->
-            <x:String x:Key="UI_ItemIcon_None">https://static.snapgenshin.com/Bg/UI_ItemIcon_None.png</x:String>
-            <x:String x:Key="UI_MarkTower">https://static.snapgenshin.com/Bg/UI_MarkTower.png</x:String>
-            <x:String x:Key="UI_Icon_Intee_Explore_1">https://static.snapgenshin.com/Bg/UI_Icon_Intee_Explore_1.png</x:String>
-            <x:String x:Key="UI_MarkQuest_Events_Proce">https://static.snapgenshin.com/Bg/UI_MarkQuest_Events_Proce.png</x:String>
-            <x:String x:Key="UI_ItemIcon_201">https://static.snapgenshin.com/ItemIcon/UI_ItemIcon_201.png</x:String>
-            <x:String x:Key="UI_ItemIcon_204">https://static.snapgenshin.com/ItemIcon/UI_ItemIcon_204.png</x:String>
-            <x:String x:Key="UI_ItemIcon_210">https://static.snapgenshin.com/ItemIcon/UI_ItemIcon_210.png</x:String>
-            <x:String x:Key="UI_ItemIcon_220021">https://static.snapgenshin.com/ItemIcon/UI_ItemIcon_220021.png</x:String>
-            <x:String x:Key="UI_ImgSign_ItemIcon">https://static.snapgenshin.com/Bg/UI_ImgSign_ItemIcon.png</x:String>
-            <x:String x:Key="UI_AvatarIcon_Costume_Card">https://static.snapgenshin.com/AvatarCard/UI_AvatarIcon_Costume_Card.png</x:String>
-            <x:String x:Key="UI_EmotionIcon25">https://static.snapgenshin.com/EmotionIcon/UI_EmotionIcon25.png</x:String>
-            <x:String x:Key="UI_EmotionIcon71">https://static.snapgenshin.com/EmotionIcon/UI_EmotionIcon71.png</x:String>
-            <x:String x:Key="UI_EmotionIcon250">https://static.snapgenshin.com/EmotionIcon/UI_EmotionIcon250.png</x:String>
-            <x:String x:Key="UI_EmotionIcon272">https://static.snapgenshin.com/EmotionIcon/UI_EmotionIcon272.png</x:String>
-            <x:String x:Key="UI_EmotionIcon293">https://static.snapgenshin.com/EmotionIcon/UI_EmotionIcon293.png</x:String>
-
-            <!--  FontIcon Content  -->
-            <x:String x:Key="FontIconContentAdd">&#xE710;</x:String>
-            <x:String x:Key="FontIconContentSetting">&#xE713;</x:String>
-            <x:String x:Key="FontIconContentRefresh">&#xE72C;</x:String>
-            <x:String x:Key="FontIconContentDelete">&#xE74D;</x:String>
-            <x:String x:Key="FontIconContentFolder">&#xE8B7;</x:String>
-            <x:String x:Key="FontIconContentCheckList">&#xE9D5;</x:String>
-            <x:String x:Key="FontIconContentAsteriskBadge12">&#xEDAD;</x:String>
-            <x:String x:Key="FontIconContentZipFolder">&#xF012;</x:String>
-            <!--  Converters  -->
-            <cwconv:BoolNegationConverter x:Key="BoolNegationConverter"/>
-            <cwconv:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter"/>
-            <cwconv:FileSizeToFriendlyStringConverter x:Key="FileSizeToFriendlyStringConverter"/>
-            <shmmc:AchievementIconConverter x:Key="AchievementIconConverter"/>
-            <shmmc:AvatarCardConverter x:Key="AvatarCardConverter"/>
-            <shmmc:AvatarIconConverter x:Key="AvatarIconConverter"/>
-            <shmmc:AvatarNameCardPicConverter x:Key="AvatarNameCardPicConverter"/>
-            <shmmc:AvatarSideIconConverter x:Key="AvatarSideIconConverter"/>
-            <shmmc:DescriptionsParametersDescriptor x:Key="DescParamDescriptor"/>
-            <shmmc:ElementNameIconConverter x:Key="ElementNameIconConverter"/>
-            <shmmc:EmotionIconConverter x:Key="EmotionIconConverter"/>
-            <shmmc:EquipIconConverter x:Key="EquipIconConverter"/>
-            <shmmc:GachaAvatarImgConverter x:Key="GachaAvatarImgConverter"/>
-            <shmmc:GachaAvatarIconConverter x:Key="GachaAvatarIconConverter"/>
-            <shmmc:GachaEquipIconConverter x:Key="GachaEquipIconConverter"/>
-            <shmmc:ItemIconConverter x:Key="ItemIconConverter"/>
-            <shmmc:MonsterIconConverter x:Key="MonsterIconConverter"/>
-            <shmmc:PropertiesParametersDescriptor x:Key="PropertyDescriptor"/>
-            <shmmc:QualityColorConverter x:Key="QualityColorConverter"/>
-            <shmmc:WeaponTypeIconConverter x:Key="WeaponTypeIconConverter"/>
-            <shvc:BoolToVisibilityRevertConverter x:Key="BoolToVisibilityRevertConverter"/>
-            <shvc:EmptyObjectToBoolConverter x:Key="EmptyObjectToBoolConverter"/>
-            <shvc:EmptyObjectToBoolRevertConverter x:Key="EmptyObjectToBoolRevertConverter"/>
-            <shvc:EmptyObjectToVisibilityConverter x:Key="EmptyObjectToVisibilityConverter"/>
-            <shvc:EmptyObjectToVisibilityRevertConverter x:Key="EmptyObjectToVisibilityRevertConverter"/>
-            <shvc:Int32ToVisibilityConverter x:Key="Int32ToVisibilityConverter"/>
-            <shvc:Int32ToVisibilityRevertConverter x:Key="Int32ToVisibilityRevertConverter"/>
-            <shvc:StringBoolConverter x:Key="StringBoolConverter"/>
-
-            <!--  Styles  -->
-            <Style
-                x:Key="LargeGridViewItemStyle"
-                BasedOn="{StaticResource DefaultGridViewItemStyle}"
-                TargetType="GridViewItem">
-                <Setter Property="Margin" Value="0,0,12,12"/>
-            </Style>
-            <Style
-                x:Key="SettingButtonStyle"
-                BasedOn="{StaticResource DefaultButtonStyle}"
-                TargetType="Button">
-                <Setter Property="BorderBrush" Value="{ThemeResource CardBorderBrush}"/>
-                <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}"/>
-                <Setter Property="Padding" Value="16,6,16,6"/>
-                <Setter Property="HorizontalAlignment" Value="Stretch"/>
-                <Setter Property="HorizontalContentAlignment" Value="Center"/>
-            </Style>
-            <Style x:Key="BorderCardStyle" TargetType="Border">
-                <Setter Property="Background" Value="{ThemeResource CardBackgroundFillColorDefaultBrush}"/>
-                <Setter Property="BorderBrush" Value="{ThemeResource CardStrokeColorDefaultBrush}"/>
-                <Setter Property="BorderThickness" Value="1"/>
-                <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}"/>
-            </Style>
-            <Style x:Key="BorderGridStyle" TargetType="Grid">
-                <Setter Property="Background" Value="{ThemeResource CardBackgroundFillColorDefaultBrush}"/>
-                <Setter Property="BorderBrush" Value="{ThemeResource CardStrokeColorDefaultBrush}"/>
-                <Setter Property="BorderThickness" Value="1"/>
-                <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}"/>
-            </Style>
-            <Style
-                x:Name="NoneSelectionListViewItemStyle"
-                BasedOn="{StaticResource DefaultListViewItemStyle}"
-                TargetType="ListViewItem">
-                <Setter Property="Padding" Value="0"/>
-                <Setter Property="Margin" Value="0,4,0,0"/>
-            </Style>
-            <Style
-                x:Name="NoneSelectionGridViewItemStyle"
-                BasedOn="{StaticResource DefaultGridViewItemStyle}"
-                TargetType="GridViewItem">
-                <Setter Property="Padding" Value="0"/>
-                <Setter Property="Margin" Value="0,0,2,4"/>
-            </Style>
-            <Style TargetType="shci:CachedImage">
-                <Setter Property="Background" Value="Transparent"/>
-                <Setter Property="Foreground" Value="{ThemeResource ApplicationForegroundThemeBrush}"/>
-                <Setter Property="IsTabStop" Value="False"/>
-                <Setter Property="LazyLoadingThreshold" Value="256"/>
-                <Setter Property="Template">
-                    <Setter.Value>
-                        <ControlTemplate TargetType="shci:CachedImage">
-                            <Grid
-                                Background="{TemplateBinding Background}"
-                                BorderBrush="{TemplateBinding BorderBrush}"
-                                BorderThickness="{TemplateBinding BorderThickness}"
-                                CornerRadius="{TemplateBinding CornerRadius}">
-                                <Image
-                                    Name="PlaceholderImage"
-                                    HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
-                                    VerticalAlignment="{TemplateBinding VerticalAlignment}"
-                                    Opacity="1.0"
-                                    Source="{TemplateBinding PlaceholderSource}"
-                                    Stretch="{TemplateBinding PlaceholderStretch}"/>
-                                <Image
-                                    Name="Image"
-                                    HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
-                                    VerticalAlignment="{TemplateBinding VerticalAlignment}"
-                                    NineGrid="{TemplateBinding NineGrid}"
-                                    Opacity="0.0"
-                                    Stretch="{TemplateBinding Stretch}"/>
-                                <VisualStateManager.VisualStateGroups>
-                                    <VisualStateGroup x:Name="CommonStates">
-                                        <VisualState x:Name="Failed">
-                                            <Storyboard>
-                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Image" Storyboard.TargetProperty="Opacity">
-                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="0"/>
-                                                </ObjectAnimationUsingKeyFrames>
-                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PlaceholderImage" Storyboard.TargetProperty="Opacity">
-                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="1"/>
-                                                </ObjectAnimationUsingKeyFrames>
-                                            </Storyboard>
-                                        </VisualState>
-                                        <VisualState x:Name="Loading">
-                                            <Storyboard>
-                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Image" Storyboard.TargetProperty="Opacity">
-                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="0"/>
-                                                </ObjectAnimationUsingKeyFrames>
-                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PlaceholderImage" Storyboard.TargetProperty="Opacity">
-                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="1"/>
-                                                </ObjectAnimationUsingKeyFrames>
-                                            </Storyboard>
-                                        </VisualState>
-                                        <VisualState x:Name="Loaded">
-                                            <Storyboard>
-                                                <DoubleAnimation
-                                                    AutoReverse="False"
-                                                    BeginTime="0"
-                                                    Storyboard.TargetName="Image"
-                                                    Storyboard.TargetProperty="Opacity"
-                                                    From="0"
-                                                    To="1"
-                                                    Duration="0:0:0.5"/>
-                                                <DoubleAnimation
-                                                    AutoReverse="False"
-                                                    BeginTime="0"
-                                                    Storyboard.TargetName="PlaceholderImage"
-                                                    Storyboard.TargetProperty="Opacity"
-                                                    From="1"
-                                                    To="0"
-                                                    Duration="0:0:0.5"/>
-                                            </Storyboard>
-                                        </VisualState>
-                                        <VisualState x:Name="Unloaded"/>
-                                    </VisualStateGroup>
-                                </VisualStateManager.VisualStateGroups>
-                            </Grid>
-                        </ControlTemplate>
-                    </Setter.Value>
-                </Setter>
-            </Style>
-            <!--  ItemsPanelTemplate  -->
-            <ItemsPanelTemplate x:Key="ItemsStackPanelTemplate">
-                <ItemsStackPanel/>
-            </ItemsPanelTemplate>
-            <ItemsPanelTemplate x:Key="WrapPanelSpacing0Template">
-                <cwcont:WrapPanel/>
-            </ItemsPanelTemplate>
-            <ItemsPanelTemplate x:Key="WrapPanelSpacing4Template">
-                <cwcont:WrapPanel HorizontalSpacing="4" VerticalSpacing="4"/>
-            </ItemsPanelTemplate>
-            <ItemsPanelTemplate x:Key="HorizontalStackPanelTemplate">
-                <StackPanel Orientation="Horizontal"/>
-            </ItemsPanelTemplate>
-            <ItemsPanelTemplate x:Key="UniformGridColumns5Spacing4Template">
-                <cwcont:UniformGrid
-                    ColumnSpacing="4"
-                    Columns="5"
-                    RowSpacing="4"/>
-            </ItemsPanelTemplate>
-
-
-            <cwm:AttachedCardShadow
-                x:Key="CompatCardShadow"
-                Opacity="0.1"
-                Offset="0,4,0"/>
         </ResourceDictionary>
     </Application.Resources>
 </Application>
\ No newline at end of file
diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Image/CachedImage.xaml b/src/Snap.Hutao/Snap.Hutao/Control/Image/CachedImage.xaml
new file mode 100644
index 00000000..e64ab600
--- /dev/null
+++ b/src/Snap.Hutao/Snap.Hutao/Control/Image/CachedImage.xaml
@@ -0,0 +1,82 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:shci="using:Snap.Hutao.Control.Image">
+    <Style TargetType="shci:CachedImage">
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Foreground" Value="{ThemeResource ApplicationForegroundThemeBrush}"/>
+        <Setter Property="IsTabStop" Value="False"/>
+        <Setter Property="LazyLoadingThreshold" Value="256"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="shci:CachedImage">
+                    <Grid
+                        Background="{TemplateBinding Background}"
+                        BorderBrush="{TemplateBinding BorderBrush}"
+                        BorderThickness="{TemplateBinding BorderThickness}"
+                        CornerRadius="{TemplateBinding CornerRadius}">
+                        <Image
+                            Name="PlaceholderImage"
+                            HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                            VerticalAlignment="{TemplateBinding VerticalAlignment}"
+                            Opacity="1.0"
+                            Source="{TemplateBinding PlaceholderSource}"
+                            Stretch="{TemplateBinding PlaceholderStretch}"/>
+                        <Image
+                            Name="Image"
+                            HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                            VerticalAlignment="{TemplateBinding VerticalAlignment}"
+                            NineGrid="{TemplateBinding NineGrid}"
+                            Opacity="0.0"
+                            Stretch="{TemplateBinding Stretch}"/>
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="CommonStates">
+                                <VisualState x:Name="Failed">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Image" Storyboard.TargetProperty="Opacity">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="0"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PlaceholderImage" Storyboard.TargetProperty="Opacity">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="1"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Loading">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Image" Storyboard.TargetProperty="Opacity">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="0"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PlaceholderImage" Storyboard.TargetProperty="Opacity">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="1"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Loaded">
+                                    <Storyboard>
+                                        <DoubleAnimation
+                                            AutoReverse="False"
+                                            BeginTime="0"
+                                            Storyboard.TargetName="Image"
+                                            Storyboard.TargetProperty="Opacity"
+                                            From="0"
+                                            To="1"
+                                            Duration="0:0:0.5"/>
+                                        <DoubleAnimation
+                                            AutoReverse="False"
+                                            BeginTime="0"
+                                            Storyboard.TargetName="PlaceholderImage"
+                                            Storyboard.TargetProperty="Opacity"
+                                            From="1"
+                                            To="0"
+                                            Duration="0:0:0.5"/>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Unloaded"/>
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+</ResourceDictionary>
diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Image/CompositionImage.cs b/src/Snap.Hutao/Snap.Hutao/Control/Image/CompositionImage.cs
index 73edd26f..da2127fa 100644
--- a/src/Snap.Hutao/Snap.Hutao/Control/Image/CompositionImage.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Control/Image/CompositionImage.cs
@@ -164,11 +164,26 @@ internal abstract partial class CompositionImage : Microsoft.UI.Xaml.Controls.Co
     private async ValueTask<LoadedImageSurface> LoadImageSurfaceAsync(string file, CancellationToken token)
     {
         surfaceLoadTaskCompletionSource = new();
-        LoadedImageSurface surface = LoadedImageSurface.StartLoadFromUri(file.ToUri());
-        surface.LoadCompleted += loadedImageSourceLoadCompletedEventHandler;
-        await surfaceLoadTaskCompletionSource.Task.ConfigureAwait(true);
-        LoadImageSurfaceCompleted(surface);
-        return surface;
+        LoadedImageSurface? surface = default;
+        try
+        {
+            surface = LoadedImageSurface.StartLoadFromUri(file.ToUri());
+            surface.LoadCompleted += loadedImageSourceLoadCompletedEventHandler;
+            if (surface.NaturalSize.Size() <= 0D)
+            {
+                await surfaceLoadTaskCompletionSource.Task.ConfigureAwait(true);
+            }
+
+            LoadImageSurfaceCompleted(surface);
+            return surface;
+        }
+        finally
+        {
+            if (surface is not null)
+            {
+                surface.LoadCompleted -= loadedImageSourceLoadCompletedEventHandler;
+            }
+        }
     }
 
     private async ValueTask ShowAsync(CancellationToken token)
@@ -216,7 +231,6 @@ internal abstract partial class CompositionImage : Microsoft.UI.Xaml.Controls.Co
     private void OnLoadImageSurfaceLoadCompleted(LoadedImageSurface surface, LoadedImageSourceLoadCompletedEventArgs e)
     {
         surfaceLoadTaskCompletionSource?.TrySetResult();
-        surface.LoadCompleted -= loadedImageSourceLoadCompletedEventHandler;
     }
 
     private void OnSizeChanged(object sender, SizeChangedEventArgs e)
diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Theme/Card.xaml b/src/Snap.Hutao/Snap.Hutao/Control/Theme/Card.xaml
new file mode 100644
index 00000000..d42eb68e
--- /dev/null
+++ b/src/Snap.Hutao/Snap.Hutao/Control/Theme/Card.xaml
@@ -0,0 +1,21 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:cwm="using:CommunityToolkit.WinUI.Media">
+    <Style x:Key="BorderCardStyle" TargetType="Border">
+        <Setter Property="Background" Value="{ThemeResource CardBackgroundFillColorDefaultBrush}"/>
+        <Setter Property="BorderBrush" Value="{ThemeResource CardStrokeColorDefaultBrush}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}"/>
+    </Style>
+    <Style x:Key="GridCardStyle" TargetType="Grid">
+        <Setter Property="Background" Value="{ThemeResource CardBackgroundFillColorDefaultBrush}"/>
+        <Setter Property="BorderBrush" Value="{ThemeResource CardStrokeColorDefaultBrush}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}"/>
+    </Style>
+    <cwm:AttachedCardShadow
+        x:Key="CompatCardShadow"
+        Opacity="0.1"
+        Offset="0,4,0"/>
+</ResourceDictionary>
diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Theme/Color.xaml b/src/Snap.Hutao/Snap.Hutao/Control/Theme/Color.xaml
new file mode 100644
index 00000000..8557c744
--- /dev/null
+++ b/src/Snap.Hutao/Snap.Hutao/Control/Theme/Color.xaml
@@ -0,0 +1,31 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <ResourceDictionary.ThemeDictionaries>
+        <ResourceDictionary x:Key="Light">
+            <Color x:Key="AvatarPropertyAddValueColor">#FF74BF00</Color>
+            <Color x:Key="CompatBackgroundColor">#FFF4F4F4</Color>
+            <Color x:Key="DarkOnlyOverlayMaskColor">#00000000</Color>
+        </ResourceDictionary>
+        <ResourceDictionary x:Key="Dark">
+            <Color x:Key="AvatarPropertyAddValueColor">#FF90E800</Color>
+            <Color x:Key="CompatBackgroundColor">#FF242424</Color>
+            <Color x:Key="DarkOnlyOverlayMaskColor">#60000000</Color>
+        </ResourceDictionary>
+    </ResourceDictionary.ThemeDictionaries>
+
+    <Color x:Key="BlueColor">#FF5180CB</Color>
+    <Color x:Key="PurpleColor">#FFA156E0</Color>
+    <Color x:Key="OrangeColor">#FFBC6932</Color>
+
+    <Color x:Key="GuaranteePullColor">#FF0063FF</Color>
+    <Color x:Key="UpPullColor">#FFFFA400</Color>
+
+    <SolidColorBrush x:Key="BlueColorBrush" Color="{ThemeResource BlueColor}"/>
+    <SolidColorBrush x:Key="PurpleColorBrush" Color="{ThemeResource PurpleColor}"/>
+    <SolidColorBrush x:Key="OrangeColorBrush" Color="{ThemeResource OrangeColor}"/>
+
+    <SolidColorBrush x:Key="GuaranteePullCoolorBrush" Color="{ThemeResource GuaranteePullColor}"/>
+    <SolidColorBrush x:Key="UpPullColorBrush" Color="{ThemeResource UpPullColor}"/>
+
+    <SolidColorBrush x:Key="DarkOnlyOverlayMaskColorBrush" Color="{ThemeResource DarkOnlyOverlayMaskColor}"/>
+    <SolidColorBrush x:Key="AvatarPropertyAddValueColorBrush" Color="{ThemeResource AvatarPropertyAddValueColor}"/>
+</ResourceDictionary>
diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Theme/Converter.xaml b/src/Snap.Hutao/Snap.Hutao/Control/Theme/Converter.xaml
new file mode 100644
index 00000000..beef99ac
--- /dev/null
+++ b/src/Snap.Hutao/Snap.Hutao/Control/Theme/Converter.xaml
@@ -0,0 +1,35 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:cwc="using:CommunityToolkit.WinUI.Converters"
+    xmlns:shmmc="using:Snap.Hutao.Model.Metadata.Converter"
+    xmlns:shvc="using:Snap.Hutao.View.Converter">
+    <cwc:BoolNegationConverter x:Key="BoolNegationConverter"/>
+    <cwc:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter"/>
+    <cwc:FileSizeToFriendlyStringConverter x:Key="FileSizeToFriendlyStringConverter"/>
+    <shmmc:AchievementIconConverter x:Key="AchievementIconConverter"/>
+    <shmmc:AvatarCardConverter x:Key="AvatarCardConverter"/>
+    <shmmc:AvatarIconConverter x:Key="AvatarIconConverter"/>
+    <shmmc:AvatarNameCardPicConverter x:Key="AvatarNameCardPicConverter"/>
+    <shmmc:AvatarSideIconConverter x:Key="AvatarSideIconConverter"/>
+    <shmmc:DescriptionsParametersDescriptor x:Key="DescParamDescriptor"/>
+    <shmmc:ElementNameIconConverter x:Key="ElementNameIconConverter"/>
+    <shmmc:EmotionIconConverter x:Key="EmotionIconConverter"/>
+    <shmmc:EquipIconConverter x:Key="EquipIconConverter"/>
+    <shmmc:GachaAvatarImgConverter x:Key="GachaAvatarImgConverter"/>
+    <shmmc:GachaAvatarIconConverter x:Key="GachaAvatarIconConverter"/>
+    <shmmc:GachaEquipIconConverter x:Key="GachaEquipIconConverter"/>
+    <shmmc:ItemIconConverter x:Key="ItemIconConverter"/>
+    <shmmc:MonsterIconConverter x:Key="MonsterIconConverter"/>
+    <shmmc:PropertiesParametersDescriptor x:Key="PropertyDescriptor"/>
+    <shmmc:QualityColorConverter x:Key="QualityColorConverter"/>
+    <shmmc:WeaponTypeIconConverter x:Key="WeaponTypeIconConverter"/>
+    <shvc:BoolToVisibilityRevertConverter x:Key="BoolToVisibilityRevertConverter"/>
+    <shvc:EmptyObjectToBoolConverter x:Key="EmptyObjectToBoolConverter"/>
+    <shvc:EmptyObjectToBoolRevertConverter x:Key="EmptyObjectToBoolRevertConverter"/>
+    <shvc:EmptyObjectToVisibilityConverter x:Key="EmptyObjectToVisibilityConverter"/>
+    <shvc:EmptyObjectToVisibilityRevertConverter x:Key="EmptyObjectToVisibilityRevertConverter"/>
+    <shvc:Int32ToVisibilityConverter x:Key="Int32ToVisibilityConverter"/>
+    <shvc:Int32ToVisibilityRevertConverter x:Key="Int32ToVisibilityRevertConverter"/>
+    <shvc:StringBoolConverter x:Key="StringBoolConverter"/>
+</ResourceDictionary>
diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Theme/CornerRadius.xaml b/src/Snap.Hutao/Snap.Hutao/Control/Theme/CornerRadius.xaml
new file mode 100644
index 00000000..f2ebb9f5
--- /dev/null
+++ b/src/Snap.Hutao/Snap.Hutao/Control/Theme/CornerRadius.xaml
@@ -0,0 +1,4 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <CornerRadius x:Key="ControlCornerRadiusTop">4,4,0,0</CornerRadius>
+    <CornerRadius x:Key="ControlCornerRadiusBottom">0,0,4,4</CornerRadius>
+</ResourceDictionary>
diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Theme/FontStyle.xaml b/src/Snap.Hutao/Snap.Hutao/Control/Theme/FontStyle.xaml
index 18fd7359..3d7f052c 100644
--- a/src/Snap.Hutao/Snap.Hutao/Control/Theme/FontStyle.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/Control/Theme/FontStyle.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:shch="using:Snap.Hutao.Control.Helper">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <FontFamily x:Key="MiSans">ms-appx:///Resource/Font/MiSans-Regular.ttf#MiSans</FontFamily>
     <FontFamily x:Key="CascadiaMonoAndMiSans">ms-appx:///Resource/Font/CascadiaMono.ttf#Cascadia Mono, ms-appx:///Resource/Font/MiSans-Regular.ttf#MiSans</FontFamily>
 
diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Theme/Glyph.xaml b/src/Snap.Hutao/Snap.Hutao/Control/Theme/Glyph.xaml
new file mode 100644
index 00000000..8e5db5ad
--- /dev/null
+++ b/src/Snap.Hutao/Snap.Hutao/Control/Theme/Glyph.xaml
@@ -0,0 +1,10 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <x:String x:Key="FontIconContentAdd">&#xE710;</x:String>
+    <x:String x:Key="FontIconContentSetting">&#xE713;</x:String>
+    <x:String x:Key="FontIconContentRefresh">&#xE72C;</x:String>
+    <x:String x:Key="FontIconContentDelete">&#xE74D;</x:String>
+    <x:String x:Key="FontIconContentFolder">&#xE8B7;</x:String>
+    <x:String x:Key="FontIconContentCheckList">&#xE9D5;</x:String>
+    <x:String x:Key="FontIconContentAsteriskBadge12">&#xEDAD;</x:String>
+    <x:String x:Key="FontIconContentZipFolder">&#xF012;</x:String>
+</ResourceDictionary>
diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Theme/ItemContainerStyle.xaml b/src/Snap.Hutao/Snap.Hutao/Control/Theme/ItemContainerStyle.xaml
new file mode 100644
index 00000000..d2a12ec4
--- /dev/null
+++ b/src/Snap.Hutao/Snap.Hutao/Control/Theme/ItemContainerStyle.xaml
@@ -0,0 +1,25 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <ResourceDictionary.MergedDictionaries>
+        <XamlControlsResources/>
+    </ResourceDictionary.MergedDictionaries>
+    <Style
+        x:Key="LargeGridViewItemStyle"
+        BasedOn="{StaticResource DefaultGridViewItemStyle}"
+        TargetType="GridViewItem">
+        <Setter Property="Margin" Value="0,0,12,12"/>
+    </Style>
+    <Style
+        x:Name="NoneSelectionListViewItemStyle"
+        BasedOn="{StaticResource DefaultListViewItemStyle}"
+        TargetType="ListViewItem">
+        <Setter Property="Padding" Value="0"/>
+        <Setter Property="Margin" Value="0,4,0,0"/>
+    </Style>
+    <Style
+        x:Name="NoneSelectionGridViewItemStyle"
+        BasedOn="{StaticResource DefaultGridViewItemStyle}"
+        TargetType="GridViewItem">
+        <Setter Property="Padding" Value="0"/>
+        <Setter Property="Margin" Value="0,0,2,4"/>
+    </Style>
+</ResourceDictionary>
diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Theme/ItemsPanelTemplate.xaml b/src/Snap.Hutao/Snap.Hutao/Control/Theme/ItemsPanelTemplate.xaml
new file mode 100644
index 00000000..46d10041
--- /dev/null
+++ b/src/Snap.Hutao/Snap.Hutao/Control/Theme/ItemsPanelTemplate.xaml
@@ -0,0 +1,23 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:cwcont="using:CommunityToolkit.WinUI.Controls">
+    <ItemsPanelTemplate x:Key="ItemsStackPanelTemplate">
+        <ItemsStackPanel/>
+    </ItemsPanelTemplate>
+    <ItemsPanelTemplate x:Key="WrapPanelSpacing0Template">
+        <cwcont:WrapPanel/>
+    </ItemsPanelTemplate>
+    <ItemsPanelTemplate x:Key="WrapPanelSpacing4Template">
+        <cwcont:WrapPanel HorizontalSpacing="4" VerticalSpacing="4"/>
+    </ItemsPanelTemplate>
+    <ItemsPanelTemplate x:Key="HorizontalStackPanelTemplate">
+        <StackPanel Orientation="Horizontal"/>
+    </ItemsPanelTemplate>
+    <ItemsPanelTemplate x:Key="UniformGridColumns5Spacing4Template">
+        <cwcont:UniformGrid
+            ColumnSpacing="4"
+            Columns="5"
+            RowSpacing="4"/>
+    </ItemsPanelTemplate>
+</ResourceDictionary>
diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Theme/NumericValue.xaml b/src/Snap.Hutao/Snap.Hutao/Control/Theme/NumericValue.xaml
new file mode 100644
index 00000000..89cef2a7
--- /dev/null
+++ b/src/Snap.Hutao/Snap.Hutao/Control/Theme/NumericValue.xaml
@@ -0,0 +1,14 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <!--  Length  -->
+    <GridLength x:Key="CompatGridLength2">288</GridLength>
+
+    <x:Double x:Key="CompatSplitViewOpenPaneLength">212</x:Double>
+    <x:Double x:Key="CompatSplitViewOpenPaneLength2">304</x:Double>
+    <x:Double x:Key="CompatSplitViewOpenPaneLength3">320</x:Double>
+    <x:Double x:Key="HomeAdaptiveCardHeight">180</x:Double>
+    <x:Double x:Key="ContentDialogMinHeight">64</x:Double>
+    <x:Double x:Key="LargeAppBarButtonWidth">100</x:Double>
+
+    <!--  ProgressBar  -->
+    <x:Double x:Key="LargeBackgroundProgressBarOpacity">0.2</x:Double>
+</ResourceDictionary>
diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Theme/PageOverride.xaml b/src/Snap.Hutao/Snap.Hutao/Control/Theme/PageOverride.xaml
index 50327554..fadb4b6a 100644
--- a/src/Snap.Hutao/Snap.Hutao/Control/Theme/PageOverride.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/Control/Theme/PageOverride.xaml
@@ -2,5 +2,5 @@
     <!--  Page Transparent Background  -->
     <StaticResource x:Key="ApplicationPageBackgroundThemeBrush" ResourceKey="ControlFillColorTransparentBrush"/>
     <!--  https://github.com/microsoft/microsoft-ui-xaml/issues/4811  -->
-    <x:Int32 x:Key="__Discard">0</x:Int32>
+    <x:Int32 x:Key="__DiscardPageOverride">0</x:Int32>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Theme/SettingsStyle.xaml b/src/Snap.Hutao/Snap.Hutao/Control/Theme/SettingsStyle.xaml
index 144c250c..f0182d63 100644
--- a/src/Snap.Hutao/Snap.Hutao/Control/Theme/SettingsStyle.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/Control/Theme/SettingsStyle.xaml
@@ -18,4 +18,14 @@
         TargetType="ComboBox">
         <Setter Property="MinWidth" Value="120"/>
     </Style>
+    <Style
+        x:Key="SettingButtonStyle"
+        BasedOn="{StaticResource DefaultButtonStyle}"
+        TargetType="Button">
+        <Setter Property="BorderBrush" Value="{ThemeResource CardBorderBrush}"/>
+        <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}"/>
+        <Setter Property="Padding" Value="16,6,16,6"/>
+        <Setter Property="HorizontalAlignment" Value="Stretch"/>
+        <Setter Property="HorizontalContentAlignment" Value="Center"/>
+    </Style>
 </ResourceDictionary>
diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Theme/Uri.xaml b/src/Snap.Hutao/Snap.Hutao/Control/Theme/Uri.xaml
new file mode 100644
index 00000000..3e50461f
--- /dev/null
+++ b/src/Snap.Hutao/Snap.Hutao/Control/Theme/Uri.xaml
@@ -0,0 +1,34 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <!--  DocumentLink  -->
+    <x:String x:Key="DocumentLink_BugReport">https://hut.ao/statements/bug-report.html</x:String>
+    <x:String x:Key="DocumentLink_Home">https://hut.ao</x:String>
+    <x:String x:Key="DocumentLink_MhyAccountSwitch">https://hut.ao/features/mhy-account-switch.html</x:String>
+    <x:String x:Key="DocumentLink_Translate">https://translate.hut.ao</x:String>
+
+    <!--  Other  -->
+    <x:String x:Key="HolographicHat_GetToken_Release">https://github.com/HolographicHat/GetToken/releases/latest</x:String>
+    <x:String x:Key="Sponsor_Afadian">https://afdian.net/a/DismissedLight</x:String>
+
+    <!--  AvatarCard  -->
+    <x:String x:Key="UI_AvatarIcon_Costume_Card">https://static.snapgenshin.com/AvatarCard/UI_AvatarIcon_Costume_Card.png</x:String>
+
+    <!--  Bg  -->
+    <x:String x:Key="UI_Icon_Intee_Explore_1">https://static.snapgenshin.com/Bg/UI_Icon_Intee_Explore_1.png</x:String>
+    <x:String x:Key="UI_ImgSign_ItemIcon">https://static.snapgenshin.com/Bg/UI_ImgSign_ItemIcon.png</x:String>
+    <x:String x:Key="UI_ItemIcon_None">https://static.snapgenshin.com/Bg/UI_ItemIcon_None.png</x:String>
+    <x:String x:Key="UI_MarkQuest_Events_Proce">https://static.snapgenshin.com/Bg/UI_MarkQuest_Events_Proce.png</x:String>
+    <x:String x:Key="UI_MarkTower">https://static.snapgenshin.com/Bg/UI_MarkTower.png</x:String>
+
+    <!--  ItemIcon  -->
+    <x:String x:Key="UI_ItemIcon_201">https://static.snapgenshin.com/ItemIcon/UI_ItemIcon_201.png</x:String>
+    <x:String x:Key="UI_ItemIcon_204">https://static.snapgenshin.com/ItemIcon/UI_ItemIcon_204.png</x:String>
+    <x:String x:Key="UI_ItemIcon_210">https://static.snapgenshin.com/ItemIcon/UI_ItemIcon_210.png</x:String>
+    <x:String x:Key="UI_ItemIcon_220021">https://static.snapgenshin.com/ItemIcon/UI_ItemIcon_220021.png</x:String>
+
+    <!--  EmotionIcon  -->
+    <x:String x:Key="UI_EmotionIcon25">https://static.snapgenshin.com/EmotionIcon/UI_EmotionIcon25.png</x:String>
+    <x:String x:Key="UI_EmotionIcon71">https://static.snapgenshin.com/EmotionIcon/UI_EmotionIcon71.png</x:String>
+    <x:String x:Key="UI_EmotionIcon250">https://static.snapgenshin.com/EmotionIcon/UI_EmotionIcon250.png</x:String>
+    <x:String x:Key="UI_EmotionIcon272">https://static.snapgenshin.com/EmotionIcon/UI_EmotionIcon272.png</x:String>
+    <x:String x:Key="UI_EmotionIcon293">https://static.snapgenshin.com/EmotionIcon/UI_EmotionIcon293.png</x:String>
+</ResourceDictionary>
diff --git a/src/Snap.Hutao/Snap.Hutao/Core/ExceptionService/ExceptionRecorder.cs b/src/Snap.Hutao/Snap.Hutao/Core/ExceptionService/ExceptionRecorder.cs
index 979b767b..358f83b8 100644
--- a/src/Snap.Hutao/Snap.Hutao/Core/ExceptionService/ExceptionRecorder.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Core/ExceptionService/ExceptionRecorder.cs
@@ -14,9 +14,7 @@ namespace Snap.Hutao.Core.ExceptionService;
 internal sealed partial class ExceptionRecorder
 {
     private readonly ILogger<ExceptionRecorder> logger;
-#if RELEASE
     private readonly IServiceProvider serviceProvider;
-#endif
 
     /// <summary>
     /// 记录应用程序异常
@@ -31,13 +29,11 @@ internal sealed partial class ExceptionRecorder
 
     private void OnAppUnhandledException(object? sender, Microsoft.UI.Xaml.UnhandledExceptionEventArgs e)
     {
-#if RELEASE
         serviceProvider
             .GetRequiredService<Web.Hutao.Log.HomaLogUploadClient>()
             .UploadLogAsync(e.Exception)
             .GetAwaiter()
             .GetResult();
-#endif
 
         logger.LogError("未经处理的全局异常:\r\n{Detail}", ExceptionFormat.Format(e.Exception));
     }
diff --git a/src/Snap.Hutao/Snap.Hutao/Core/Windowing/HotKey/HotKeyController.cs b/src/Snap.Hutao/Snap.Hutao/Core/Windowing/HotKey/HotKeyController.cs
index 30da56c5..a2b4c497 100644
--- a/src/Snap.Hutao/Snap.Hutao/Core/Windowing/HotKey/HotKeyController.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Core/Windowing/HotKey/HotKeyController.cs
@@ -48,7 +48,7 @@ internal sealed class HotKeyController : IHotKeyController
 
     public void OnHotKeyPressed(in HotKeyParameter parameter)
     {
-        if (parameter is { Key: VIRTUAL_KEY.VK_F8, Modifier: 0 })
+        if (parameter is { Key: VIRTUAL_KEY.VK_F8, NativeModifier: 0 })
         {
             lock (locker)
             {
diff --git a/src/Snap.Hutao/Snap.Hutao/Core/Windowing/HotKey/HotKeyParameter.cs b/src/Snap.Hutao/Snap.Hutao/Core/Windowing/HotKey/HotKeyParameter.cs
index 4cc9b88e..8a8cf3e2 100644
--- a/src/Snap.Hutao/Snap.Hutao/Core/Windowing/HotKey/HotKeyParameter.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Core/Windowing/HotKey/HotKeyParameter.cs
@@ -7,6 +7,11 @@ namespace Snap.Hutao.Core.Windowing.HotKey;
 
 internal readonly struct HotKeyParameter
 {
-    public readonly ushort Modifier;
+    public readonly ushort NativeModifier;
     public readonly VIRTUAL_KEY Key;
+
+    public readonly HOT_KEY_MODIFIERS Modifier
+    {
+        get => (HOT_KEY_MODIFIERS)NativeModifier;
+    }
 }
\ No newline at end of file
diff --git a/src/Snap.Hutao/Snap.Hutao/Core/Windowing/IMinMaxInfoHandler.cs b/src/Snap.Hutao/Snap.Hutao/Core/Windowing/IMinMaxInfoHandler.cs
new file mode 100644
index 00000000..eee91675
--- /dev/null
+++ b/src/Snap.Hutao/Snap.Hutao/Core/Windowing/IMinMaxInfoHandler.cs
@@ -0,0 +1,16 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+using Windows.Win32.UI.WindowsAndMessaging;
+
+namespace Snap.Hutao.Core.Windowing;
+
+internal interface IMinMaxInfoHandler
+{
+    /// <summary>
+    /// 处理最大最小信息
+    /// </summary>
+    /// <param name="info">信息</param>
+    /// <param name="scalingFactor">缩放比</param>
+    unsafe void HandleMinMaxInfo(ref MINMAXINFO info, double scalingFactor);
+}
\ No newline at end of file
diff --git a/src/Snap.Hutao/Snap.Hutao/Core/Windowing/IWindowOptionsSource.cs b/src/Snap.Hutao/Snap.Hutao/Core/Windowing/IWindowOptionsSource.cs
index 8861026c..5c878657 100644
--- a/src/Snap.Hutao/Snap.Hutao/Core/Windowing/IWindowOptionsSource.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Core/Windowing/IWindowOptionsSource.cs
@@ -1,8 +1,6 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
-using Windows.Win32.UI.WindowsAndMessaging;
-
 namespace Snap.Hutao.Core.Windowing;
 
 /// <summary>
@@ -14,11 +12,4 @@ internal interface IWindowOptionsSource
     /// 窗体选项
     /// </summary>
     WindowOptions WindowOptions { get; }
-
-    /// <summary>
-    /// 处理最大最小信息
-    /// </summary>
-    /// <param name="pInfo">信息指针</param>
-    /// <param name="scalingFactor">缩放比</param>
-    unsafe void ProcessMinMaxInfo(MINMAXINFO* pInfo, double scalingFactor);
 }
\ No newline at end of file
diff --git a/src/Snap.Hutao/Snap.Hutao/Core/Windowing/WindowController.cs b/src/Snap.Hutao/Snap.Hutao/Core/Windowing/WindowController.cs
index af847d74..946fc5bc 100644
--- a/src/Snap.Hutao/Snap.Hutao/Core/Windowing/WindowController.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Core/Windowing/WindowController.cs
@@ -76,15 +76,15 @@ internal sealed class WindowController
     {
         // Set first launch size
         double scale = options.GetWindowScale();
-        SizeInt32 transformedSize = options.InitSize.Scale(scale);
-        RectInt32 rect = StructMarshal.RectInt32(transformedSize);
+        SizeInt32 scaledSize = options.InitSize.Scale(scale);
+        RectInt32 rect = StructMarshal.RectInt32(scaledSize);
 
         if (options.PersistSize)
         {
             RectInt32 persistedRect = (CompactRect)LocalSetting.Get(SettingKeys.WindowRect, (CompactRect)rect);
             if (persistedRect.Size() >= options.InitSize.Size())
             {
-                rect = persistedRect;
+                rect = persistedRect.Scale(scale);
             }
         }
 
@@ -105,7 +105,8 @@ internal sealed class WindowController
         // prevent save value when we are maximized.
         if (!windowPlacement.showCmd.HasFlag(SHOW_WINDOW_CMD.SW_SHOWMAXIMIZED))
         {
-            LocalSetting.Set(SettingKeys.WindowRect, (CompactRect)window.AppWindow.GetRect());
+            double scale = 1 / options.GetWindowScale();
+            LocalSetting.Set(SettingKeys.WindowRect, (CompactRect)window.AppWindow.GetRect().Scale(scale));
         }
     }
 
@@ -113,8 +114,10 @@ internal sealed class WindowController
     {
         if (e.PropertyName == nameof(AppOptions.BackdropType))
         {
-            ArgumentNullException.ThrowIfNull(sender);
-            UpdateSystemBackdrop(((AppOptions)sender).BackdropType);
+            if (sender is AppOptions options)
+            {
+                UpdateSystemBackdrop(options.BackdropType);
+            }
         }
     }
 
diff --git a/src/Snap.Hutao/Snap.Hutao/Core/Windowing/WindowSubclass.cs b/src/Snap.Hutao/Snap.Hutao/Core/Windowing/WindowSubclass.cs
index 640c0a6f..14cc9297 100644
--- a/src/Snap.Hutao/Snap.Hutao/Core/Windowing/WindowSubclass.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Core/Windowing/WindowSubclass.cs
@@ -71,17 +71,16 @@ internal sealed class WindowSubclass : IDisposable
     /// <inheritdoc/>
     public void Dispose()
     {
+        hotKeyController.Unregister(options.Hwnd);
+
         RemoveWindowSubclass(options.Hwnd, windowProc, WindowSubclassId);
         windowProc = null;
 
-        if (!options.UseLegacyDragBarImplementation)
+        if (options.UseLegacyDragBarImplementation)
         {
-            return;
+            RemoveWindowSubclass(options.Hwnd, legacyDragBarProc, DragBarSubclassId);
+            legacyDragBarProc = null;
         }
-
-        hotKeyController.Unregister(options.Hwnd);
-        RemoveWindowSubclass(options.Hwnd, legacyDragBarProc, DragBarSubclassId);
-        legacyDragBarProc = null;
     }
 
     [SuppressMessage("", "SH002")]
@@ -91,16 +90,18 @@ internal sealed class WindowSubclass : IDisposable
         {
             case WM_GETMINMAXINFO:
                 {
-                    uint dpi = GetDpiForWindow(hwnd);
-                    double scalingFactor = Math.Round(dpi / 96D, 2, MidpointRounding.AwayFromZero);
-                    ((IWindowOptionsSource)window).ProcessMinMaxInfo((MINMAXINFO*)lParam.Value, scalingFactor);
+                    if (window is IMinMaxInfoHandler handler)
+                    {
+                        handler.HandleMinMaxInfo(ref *(MINMAXINFO*)lParam.Value, options.GetWindowScale());
+                    }
+
                     break;
                 }
 
             case WM_NCRBUTTONDOWN:
             case WM_NCRBUTTONUP:
                 {
-                    return (LRESULT)(nint)WM_NULL;
+                    return default;
                 }
 
             case WM_HOTKEY:
diff --git a/src/Snap.Hutao/Snap.Hutao/Extension/StructExtension.cs b/src/Snap.Hutao/Snap.Hutao/Extension/StructExtension.cs
index bb009b57..c8b7f949 100644
--- a/src/Snap.Hutao/Snap.Hutao/Extension/StructExtension.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Extension/StructExtension.cs
@@ -62,4 +62,9 @@ internal static class StructExtension
     {
         return sizeInt32.Width * sizeInt32.Height;
     }
+
+    public static double Size(this Windows.Foundation.Size size)
+    {
+        return size.Width * size.Height;
+    }
 }
\ No newline at end of file
diff --git a/src/Snap.Hutao/Snap.Hutao/GuideWindow.xaml.cs b/src/Snap.Hutao/Snap.Hutao/GuideWindow.xaml.cs
index f477a883..82122e58 100644
--- a/src/Snap.Hutao/Snap.Hutao/GuideWindow.xaml.cs
+++ b/src/Snap.Hutao/Snap.Hutao/GuideWindow.xaml.cs
@@ -11,7 +11,7 @@ namespace Snap.Hutao;
 /// 指引窗口
 /// </summary>
 [Injection(InjectAs.Singleton)]
-internal sealed partial class GuideWindow : Window, IWindowOptionsSource
+internal sealed partial class GuideWindow : Window, IWindowOptionsSource, IMinMaxInfoHandler
 {
     private const int MinWidth = 1000;
     private const int MinHeight = 600;
@@ -30,11 +30,11 @@ internal sealed partial class GuideWindow : Window, IWindowOptionsSource
 
     WindowOptions IWindowOptionsSource.WindowOptions { get => windowOptions; }
 
-    public unsafe void ProcessMinMaxInfo(MINMAXINFO* pInfo, double scalingFactor)
+    public unsafe void HandleMinMaxInfo(ref MINMAXINFO info, double scalingFactor)
     {
-        pInfo->ptMinTrackSize.X = (int)Math.Max(MinWidth * scalingFactor, pInfo->ptMinTrackSize.X);
-        pInfo->ptMinTrackSize.Y = (int)Math.Max(MinHeight * scalingFactor, pInfo->ptMinTrackSize.Y);
-        pInfo->ptMaxTrackSize.X = (int)Math.Min(MaxWidth * scalingFactor, pInfo->ptMaxTrackSize.X);
-        pInfo->ptMaxTrackSize.Y = (int)Math.Min(MaxHeight * scalingFactor, pInfo->ptMaxTrackSize.Y);
+        info.ptMinTrackSize.X = (int)Math.Max(MinWidth * scalingFactor, info.ptMinTrackSize.X);
+        info.ptMinTrackSize.Y = (int)Math.Max(MinHeight * scalingFactor, info.ptMinTrackSize.Y);
+        info.ptMaxTrackSize.X = (int)Math.Min(MaxWidth * scalingFactor, info.ptMaxTrackSize.X);
+        info.ptMaxTrackSize.Y = (int)Math.Min(MaxHeight * scalingFactor, info.ptMaxTrackSize.Y);
     }
 }
diff --git a/src/Snap.Hutao/Snap.Hutao/LaunchGameWindow.xaml.cs b/src/Snap.Hutao/Snap.Hutao/LaunchGameWindow.xaml.cs
index cba90226..43d75331 100644
--- a/src/Snap.Hutao/Snap.Hutao/LaunchGameWindow.xaml.cs
+++ b/src/Snap.Hutao/Snap.Hutao/LaunchGameWindow.xaml.cs
@@ -13,7 +13,7 @@ namespace Snap.Hutao;
 /// </summary>
 [HighQuality]
 [Injection(InjectAs.Singleton)]
-internal sealed partial class LaunchGameWindow : Window, IDisposable, IWindowOptionsSource
+internal sealed partial class LaunchGameWindow : Window, IDisposable, IWindowOptionsSource, IMinMaxInfoHandler
 {
     private const int MinWidth = 240;
     private const int MinHeight = 240;
@@ -48,11 +48,11 @@ internal sealed partial class LaunchGameWindow : Window, IDisposable, IWindowOpt
     }
 
     /// <inheritdoc/>
-    public unsafe void ProcessMinMaxInfo(MINMAXINFO* pInfo, double scalingFactor)
+    public unsafe void HandleMinMaxInfo(ref MINMAXINFO info, double scalingFactor)
     {
-        pInfo->ptMinTrackSize.X = (int)Math.Max(MinWidth * scalingFactor, pInfo->ptMinTrackSize.X);
-        pInfo->ptMinTrackSize.Y = (int)Math.Max(MinHeight * scalingFactor, pInfo->ptMinTrackSize.Y);
-        pInfo->ptMaxTrackSize.X = (int)Math.Min(MaxWidth * scalingFactor, pInfo->ptMaxTrackSize.X);
-        pInfo->ptMaxTrackSize.Y = (int)Math.Min(MaxHeight * scalingFactor, pInfo->ptMaxTrackSize.Y);
+        info.ptMinTrackSize.X = (int)Math.Max(MinWidth * scalingFactor, info.ptMinTrackSize.X);
+        info.ptMinTrackSize.Y = (int)Math.Max(MinHeight * scalingFactor, info.ptMinTrackSize.Y);
+        info.ptMaxTrackSize.X = (int)Math.Min(MaxWidth * scalingFactor, info.ptMaxTrackSize.X);
+        info.ptMaxTrackSize.Y = (int)Math.Min(MaxHeight * scalingFactor, info.ptMaxTrackSize.Y);
     }
 }
\ No newline at end of file
diff --git a/src/Snap.Hutao/Snap.Hutao/MainWindow.xaml.cs b/src/Snap.Hutao/Snap.Hutao/MainWindow.xaml.cs
index e49d951d..52532905 100644
--- a/src/Snap.Hutao/Snap.Hutao/MainWindow.xaml.cs
+++ b/src/Snap.Hutao/Snap.Hutao/MainWindow.xaml.cs
@@ -14,7 +14,7 @@ namespace Snap.Hutao;
 [HighQuality]
 [Injection(InjectAs.Singleton)]
 [SuppressMessage("", "CA1001")]
-internal sealed partial class MainWindow : Window, IWindowOptionsSource
+internal sealed partial class MainWindow : Window, IWindowOptionsSource, IMinMaxInfoHandler
 {
     private const int MinWidth = 848;
     private const int MinHeight = 524;
@@ -46,10 +46,10 @@ internal sealed partial class MainWindow : Window, IWindowOptionsSource
     public WindowOptions WindowOptions { get => windowOptions; }
 
     /// <inheritdoc/>
-    public unsafe void ProcessMinMaxInfo(MINMAXINFO* pInfo, double scalingFactor)
+    public unsafe void HandleMinMaxInfo(ref MINMAXINFO pInfo, double scalingFactor)
     {
-        pInfo->ptMinTrackSize.X = (int)Math.Max(MinWidth * scalingFactor, pInfo->ptMinTrackSize.X);
-        pInfo->ptMinTrackSize.Y = (int)Math.Max(MinHeight * scalingFactor, pInfo->ptMinTrackSize.Y);
+        pInfo.ptMinTrackSize.X = (int)Math.Max(MinWidth * scalingFactor, pInfo.ptMinTrackSize.X);
+        pInfo.ptMinTrackSize.Y = (int)Math.Max(MinHeight * scalingFactor, pInfo.ptMinTrackSize.Y);
     }
 
     private void OnClosed(object sender, WindowEventArgs args)
diff --git a/src/Snap.Hutao/Snap.Hutao/Service/Game/Unlocker/GameFpsUnlocker.cs b/src/Snap.Hutao/Snap.Hutao/Service/Game/Unlocker/GameFpsUnlocker.cs
index e7a0ed68..b7d3178b 100644
--- a/src/Snap.Hutao/Snap.Hutao/Service/Game/Unlocker/GameFpsUnlocker.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Service/Game/Unlocker/GameFpsUnlocker.cs
@@ -235,7 +235,7 @@ internal sealed class GameFpsUnlocker : IGameFpsUnlocker
 
         using (localMemory)
         {
-            int offset = IndexOfPattern(localMemory.Span[(int)moduleEntryInfo.UnityPlayer.Size..]);
+            int offset = IndexOfPattern(localMemory.AsSpan()[(int)moduleEntryInfo.UnityPlayer.Size..]);
             Must.Range(offset >= 0, SH.ServiceGameUnlockerInterestedPatternNotFound);
 
             byte* pLocalMemory = (byte*)localMemory.Pointer;
diff --git a/src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj b/src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj
index 67d6b18a..93573a54 100644
--- a/src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj
+++ b/src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj
@@ -72,14 +72,24 @@
     <None Remove="Assets\Wide310x150Logo.scale-200.png" />
     <None Remove="Assets\Wide310x150Logo.scale-400.png" />
     <None Remove="CodeMetricsConfig.txt" />
+    <None Remove="Control\Image\CachedImage.xaml" />
     <None Remove="Control\Loading.xaml" />
     <None Remove="Control\Panel\PanelSelector.xaml" />
+    <None Remove="Control\Theme\Card.xaml" />
+    <None Remove="Control\Theme\Color.xaml" />
+    <None Remove="Control\Theme\Converter.xaml" />
+    <None Remove="Control\Theme\CornerRadius.xaml" />
     <None Remove="Control\Theme\FontStyle.xaml" />
+    <None Remove="Control\Theme\Glyph.xaml" />
     <None Remove="Control\Theme\InfoBarOverride.xaml" />
+    <None Remove="Control\Theme\ItemContainerStyle.xaml" />
+    <None Remove="Control\Theme\ItemsPanelTemplate.xaml" />
+    <None Remove="Control\Theme\NumericValue.xaml" />
     <None Remove="Control\Theme\PageOverride.xaml" />
     <None Remove="Control\Theme\PivotOverride.xaml" />
     <None Remove="Control\Theme\SettingsStyle.xaml" />
     <None Remove="Control\Theme\TransitionCollection.xaml" />
+    <None Remove="Control\Theme\Uri.xaml" />
     <None Remove="Control\Theme\WindowOverride.xaml" />
     <None Remove="GuideWindow.xaml" />
     <None Remove="IdentityStructs.json" />
@@ -239,12 +249,12 @@
   <!-- Packages -->
   <ItemGroup>
     <!-- https://pkgs.dev.azure.com/dotnet/CommunityToolkit/_packaging/CommunityToolkit-Labs/nuget/v3/index.json -->
-    <PackageReference Include="CommunityToolkit.Labs.WinUI.Controls.DataTable" Version="0.1.230809" />
-    <PackageReference Include="CommunityToolkit.Labs.WinUI.MarqueeText" Version="0.1.230809" />
-    <PackageReference Include="CommunityToolkit.Labs.WinUI.Shimmer" Version="0.1.230809" />
-    <PackageReference Include="CommunityToolkit.Labs.WinUI.TokenView" Version="0.1.230809" />
-    <PackageReference Include="CommunityToolkit.Labs.WinUI.TransitionHelper" Version="0.1.230809" />
-    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2-build.1" />
+    <PackageReference Include="CommunityToolkit.Labs.WinUI.Controls.DataTable" Version="0.1.230830" />
+    <PackageReference Include="CommunityToolkit.Labs.WinUI.MarqueeText" Version="0.1.230830" />
+    <PackageReference Include="CommunityToolkit.Labs.WinUI.Shimmer" Version="0.1.230830" />
+    <PackageReference Include="CommunityToolkit.Labs.WinUI.TokenView" Version="0.1.230830" />
+    <PackageReference Include="CommunityToolkit.Labs.WinUI.TransitionHelper" Version="0.1.230830" />
+    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2-build.2" />
     <PackageReference Include="CommunityToolkit.WinUI.Behaviors" Version="8.0.230907" />
     <PackageReference Include="CommunityToolkit.WinUI.Collections" Version="8.0.230907" />
     <PackageReference Include="CommunityToolkit.WinUI.Controls.HeaderedControls" Version="8.0.230907" />
@@ -253,8 +263,8 @@
     <PackageReference Include="CommunityToolkit.WinUI.Controls.SettingsControls" Version="8.0.230907" />
     <PackageReference Include="CommunityToolkit.WinUI.Media" Version="8.0.230907" />
     <PackageReference Include="CommunityToolkit.WinUI.Notifications" Version="7.1.2" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.11" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.11">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.12" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.12">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
@@ -262,7 +272,7 @@
     <PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
     <PackageReference Include="Microsoft.VisualStudio.Validation" Version="17.6.11" />
     <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.756" />
-    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.230913002" />
+    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.231008000" />
     <PackageReference Include="StyleCop.Analyzers.Unstable" Version="1.2.0.507">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -303,6 +313,66 @@
     </EmbeddedResource>
   </ItemGroup>
 
+  <ItemGroup>
+    <Page Update="Control\Theme\NumericValue.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Page Update="Control\Theme\CornerRadius.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Page Update="Control\Theme\Color.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Page Update="Control\Theme\Card.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Page Update="Control\Theme\ItemContainerStyle.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Page Update="Control\Image\CachedImage.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Page Update="Control\Theme\ItemsPanelTemplate.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Page Update="Control\Theme\Converter.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Page Update="Control\Theme\Glyph.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Page Update="Control\Theme\Uri.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+
   <ItemGroup>
     <Page Update="Control\Theme\TransitionCollection.xaml">
       <Generator>MSBuild:Compile</Generator>
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Card/GachaStatisticsCard.xaml b/src/Snap.Hutao/Snap.Hutao/View/Card/GachaStatisticsCard.xaml
index b77f3fc6..be224ffb 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Card/GachaStatisticsCard.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Card/GachaStatisticsCard.xaml
@@ -66,16 +66,16 @@
                         Description="{Binding LastOrangePull}"
                         Header="{shcm:ResourceString Name=ViewControlStatisticsCardOrangeText}"
                         Maximum="{Binding GuaranteeOrangeThreshold}"
-                        ProgressForeground="{StaticResource OrangeBrush}"
-                        TextForeground="{StaticResource OrangeBrush}"
+                        ProgressForeground="{StaticResource OrangeColorBrush}"
+                        TextForeground="{StaticResource OrangeColorBrush}"
                         Value="{Binding LastOrangePull}"/>
                     <shvcp:CardProgressBar
                         Grid.Column="0"
                         Description="{Binding LastPurplePull}"
                         Header="{shcm:ResourceString Name=ViewControlStatisticsCardPurpleText}"
                         Maximum="{Binding GuaranteePurpleThreshold}"
-                        ProgressForeground="{StaticResource PurpleBrush}"
-                        TextForeground="{StaticResource PurpleBrush}"
+                        ProgressForeground="{StaticResource PurpleColorBrush}"
+                        TextForeground="{StaticResource PurpleColorBrush}"
                         Value="{Binding LastPurplePull}"/>
                 </StackPanel>
 
@@ -98,16 +98,16 @@
                         Description="{Binding LastOrangePull}"
                         Header="{shcm:ResourceString Name=ViewControlStatisticsCardOrangeText}"
                         Maximum="{Binding GuaranteeOrangeThreshold}"
-                        ProgressForeground="{StaticResource OrangeBrush}"
-                        TextForeground="{StaticResource OrangeBrush}"
+                        ProgressForeground="{StaticResource OrangeColorBrush}"
+                        TextForeground="{StaticResource OrangeColorBrush}"
                         Value="{Binding LastOrangePull}"/>
                     <shvcp:CardProgressBar
                         Grid.Column="0"
                         Description="{Binding LastPurplePull}"
                         Header="{shcm:ResourceString Name=ViewControlStatisticsCardPurpleText}"
                         Maximum="{Binding GuaranteePurpleThreshold}"
-                        ProgressForeground="{StaticResource PurpleBrush}"
-                        TextForeground="{StaticResource PurpleBrush}"
+                        ProgressForeground="{StaticResource PurpleColorBrush}"
+                        TextForeground="{StaticResource PurpleColorBrush}"
                         Value="{Binding LastPurplePull}"/>
                 </StackPanel>
 
@@ -129,16 +129,16 @@
                         Description="{Binding LastOrangePull}"
                         Header="{shcm:ResourceString Name=ViewControlStatisticsCardOrangeText}"
                         Maximum="{Binding GuaranteeOrangeThreshold}"
-                        ProgressForeground="{StaticResource OrangeBrush}"
-                        TextForeground="{StaticResource OrangeBrush}"
+                        ProgressForeground="{StaticResource OrangeColorBrush}"
+                        TextForeground="{StaticResource OrangeColorBrush}"
                         Value="{Binding LastOrangePull}"/>
                     <shvcp:CardProgressBar
                         Grid.Column="0"
                         Description="{Binding LastPurplePull}"
                         Header="{shcm:ResourceString Name=ViewControlStatisticsCardPurpleText}"
                         Maximum="{Binding GuaranteePurpleThreshold}"
-                        ProgressForeground="{StaticResource PurpleBrush}"
-                        TextForeground="{StaticResource PurpleBrush}"
+                        ProgressForeground="{StaticResource PurpleColorBrush}"
+                        TextForeground="{StaticResource PurpleColorBrush}"
                         Value="{Binding LastPurplePull}"/>
                 </StackPanel>
             </Grid>
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Card/Primitive/CardBlock.xaml b/src/Snap.Hutao/Snap.Hutao/View/Card/Primitive/CardBlock.xaml
index 33faaff1..7d7dccaa 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Card/Primitive/CardBlock.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Card/Primitive/CardBlock.xaml
@@ -6,7 +6,7 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:shch="using:Snap.Hutao.Control.Helper"
     xmlns:shci="using:Snap.Hutao.Control.Image"
-    Style="{StaticResource BorderGridStyle}"
+    Style="{ThemeResource GridCardStyle}"
     mc:Ignorable="d">
 
     <StackPanel VerticalAlignment="Center">
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Card/Primitive/CardProgressBar.xaml b/src/Snap.Hutao/Snap.Hutao/View/Card/Primitive/CardProgressBar.xaml
index d3fb37cf..8c622def 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Card/Primitive/CardProgressBar.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Card/Primitive/CardProgressBar.xaml
@@ -5,7 +5,7 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     MinHeight="40"
-    Style="{StaticResource BorderGridStyle}"
+    Style="{ThemeResource GridCardStyle}"
     mc:Ignorable="d">
 
     <Grid.ColumnDefinitions>
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Control/HutaoStatisticsCard.xaml b/src/Snap.Hutao/Snap.Hutao/View/Control/HutaoStatisticsCard.xaml
index 75365135..028c986f 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Control/HutaoStatisticsCard.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Control/HutaoStatisticsCard.xaml
@@ -26,7 +26,7 @@
         </DataTemplate>
     </UserControl.Resources>
 
-    <Grid Style="{StaticResource BorderGridStyle}">
+    <Grid Style="{ThemeResource GridCardStyle}">
         <Grid.RowDefinitions>
             <RowDefinition Height="auto"/>
             <RowDefinition/>
@@ -36,7 +36,7 @@
             Grid.Row="0"
             cw:UIElementExtensions.ClipToBounds="True"
             CornerRadius="{StaticResource ControlCornerRadiusTop}"
-            Style="{StaticResource BorderGridStyle}">
+            Style="{ThemeResource GridCardStyle}">
             <cwc:ConstrainedBox
                 Margin="-1"
                 HorizontalAlignment="Center"
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Control/StatisticsCard.xaml b/src/Snap.Hutao/Snap.Hutao/View/Control/StatisticsCard.xaml
index e46acd12..ba262a12 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Control/StatisticsCard.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Control/StatisticsCard.xaml
@@ -23,7 +23,7 @@
         <shvconv:Int32ToGradientColorConverter x:Key="Int32ToGradientColorConverter" MaximumValue="{Binding GuaranteeOrangeThreshold}"/>
 
         <DataTemplate x:Key="OrangeListTemplate" d:DataType="shvg:SummaryItem">
-            <Grid Margin="0" Style="{StaticResource BorderGridStyle}">
+            <Grid Margin="0" Style="{ThemeResource GridCardStyle}">
                 <ToolTipService.ToolTip>
                     <TextBlock Text="{Binding TimeFormatted}"/>
                 </ToolTipService.ToolTip>
@@ -59,13 +59,13 @@
                     <TextBlock
                         Margin="0,0,8,0"
                         VerticalAlignment="Center"
-                        Foreground="{StaticResource GuaranteePullBrush}"
+                        Foreground="{StaticResource GuaranteePullCoolorBrush}"
                         Text="{shcm:ResourceString Name=ViewControlStatisticsCardGuaranteeText}"
                         Visibility="{Binding IsGuarantee, Converter={StaticResource BoolToVisibilityConverter}}"/>
                     <TextBlock
                         Margin="0,0,8,0"
                         VerticalAlignment="Center"
-                        Foreground="{StaticResource UpPullBrush}"
+                        Foreground="{StaticResource UpPullColorBrush}"
                         Text="{shcm:ResourceString Name=ViewControlStatisticsCardUpText}"
                         Visibility="{Binding IsUp, Converter={StaticResource BoolToVisibilityConverter}}"/>
 
@@ -103,7 +103,7 @@
         </DataTemplate>
     </UserControl.Resources>
 
-    <Grid Style="{StaticResource BorderGridStyle}">
+    <Grid Style="{ThemeResource GridCardStyle}">
         <Grid.RowDefinitions>
             <RowDefinition Height="auto"/>
             <RowDefinition Height="auto"/>
@@ -181,8 +181,8 @@
                             Description="{Binding LastOrangePull}"
                             Header="{shcm:ResourceString Name=ViewControlStatisticsCardToLastOrangeText}"
                             Maximum="{Binding GuaranteeOrangeThreshold}"
-                            ProgressForeground="{StaticResource OrangeBrush}"
-                            TextForeground="{StaticResource OrangeBrush}"
+                            ProgressForeground="{StaticResource OrangeColorBrush}"
+                            TextForeground="{StaticResource OrangeColorBrush}"
                             Value="{Binding LastOrangePull}"/>
                         <shvcp:CardProgressBar
                             Grid.Column="1"
@@ -190,8 +190,8 @@
                             Description="{Binding LastPurplePull}"
                             Header="{shcm:ResourceString Name=ViewControlStatisticsCardToLastPurpleText}"
                             Maximum="{Binding GuaranteePurpleThreshold}"
-                            ProgressForeground="{StaticResource PurpleBrush}"
-                            TextForeground="{StaticResource PurpleBrush}"
+                            ProgressForeground="{StaticResource PurpleColorBrush}"
+                            TextForeground="{StaticResource PurpleColorBrush}"
                             Value="{Binding LastPurplePull}"/>
                     </Grid>
                 </StackPanel>
@@ -243,37 +243,37 @@
                         <StackPanel Spacing="2">
                             <Grid>
                                 <TextBlock
-                                    Foreground="{StaticResource OrangeBrush}"
+                                    Foreground="{StaticResource OrangeColorBrush}"
                                     Style="{StaticResource BodyTextBlockStyle}"
                                     Text="{shcm:ResourceString Name=ViewControlStatisticsCardOrangeText}"/>
                                 <TextBlock
                                     HorizontalAlignment="Right"
                                     FontFamily="{StaticResource CascadiaMonoAndMiSans}"
-                                    Foreground="{StaticResource OrangeBrush}"
+                                    Foreground="{StaticResource OrangeColorBrush}"
                                     Style="{StaticResource BodyTextBlockStyle}"
                                     Text="{Binding TotalOrangeFormatted}"/>
                             </Grid>
                             <Grid>
                                 <TextBlock
-                                    Foreground="{StaticResource PurpleBrush}"
+                                    Foreground="{StaticResource PurpleColorBrush}"
                                     Style="{StaticResource BodyTextBlockStyle}"
                                     Text="{shcm:ResourceString Name=ViewControlStatisticsCardPurpleText}"/>
                                 <TextBlock
                                     HorizontalAlignment="Right"
                                     FontFamily="{StaticResource CascadiaMonoAndMiSans}"
-                                    Foreground="{StaticResource PurpleBrush}"
+                                    Foreground="{StaticResource PurpleColorBrush}"
                                     Style="{StaticResource BodyTextBlockStyle}"
                                     Text="{Binding TotalPurpleFormatted}"/>
                             </Grid>
                             <Grid>
                                 <TextBlock
-                                    Foreground="{StaticResource BlueBrush}"
+                                    Foreground="{StaticResource BlueColorBrush}"
                                     Style="{StaticResource BodyTextBlockStyle}"
                                     Text="{shcm:ResourceString Name=ViewControlStatisticsCardBlueText}"/>
                                 <TextBlock
                                     HorizontalAlignment="Right"
                                     FontFamily="{StaticResource CascadiaMonoAndMiSans}"
-                                    Foreground="{StaticResource BlueBrush}"
+                                    Foreground="{StaticResource BlueColorBrush}"
                                     Style="{StaticResource BodyTextBlockStyle}"
                                     Text="{Binding TotalBlueFormatted}"/>
                             </Grid>
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Control/WebViewer.xaml.cs b/src/Snap.Hutao/Snap.Hutao/View/Control/WebViewer.xaml.cs
index 480e2a44..e9326fa2 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Control/WebViewer.xaml.cs
+++ b/src/Snap.Hutao/Snap.Hutao/View/Control/WebViewer.xaml.cs
@@ -2,8 +2,10 @@
 // Licensed under the MIT license.
 
 using CommunityToolkit.Mvvm.Messaging;
+using Microsoft.UI.Content;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Hosting;
 using Microsoft.Web.WebView2.Core;
 using Snap.Hutao.Message;
 using Snap.Hutao.Service.Notification;
@@ -20,7 +22,6 @@ internal partial class WebViewer : UserControl, IRecipient<UserChangedMessage>
     private readonly RoutedEventHandler loadEventHandler;
     private readonly RoutedEventHandler unloadEventHandler;
 
-    [SuppressMessage("", "IDE0052")]
     private MiHoYoJSInterface? jsInterface;
 
     public WebViewer()
@@ -49,7 +50,6 @@ internal partial class WebViewer : UserControl, IRecipient<UserChangedMessage>
 
     private void OnUnloaded(object sender, RoutedEventArgs e)
     {
-        jsInterface = null;
         Loaded -= loadEventHandler;
         Unloaded -= unloadEventHandler;
     }
@@ -86,13 +86,16 @@ internal partial class WebViewer : UserControl, IRecipient<UserChangedMessage>
                     string source = SourceProvider.GetSource(userAndUid);
                     if (!string.IsNullOrEmpty(source))
                     {
-                        await coreWebView2.DeleteCookiesAsync(".mihoyo.com").ConfigureAwait(true);
-                        coreWebView2.SetCookie(user.CookieToken, user.LToken, user.SToken);
-                        _ = userAndUid.User.IsOversea ? coreWebView2.SetMobileOverseaUserAgent() : coreWebView2.SetMobileUserAgent();
-                        jsInterface = SourceProvider.CreateJsInterface(serviceProvider, coreWebView2, userAndUid);
+                        await coreWebView2.Profile.ClearBrowsingDataAsync();
 
                         CoreWebView2Navigator navigator = new(coreWebView2);
                         await navigator.NavigateAsync("about:blank").ConfigureAwait(true);
+
+                        coreWebView2.SetCookie(user.CookieToken, user.LToken, user.SToken);
+                        _ = userAndUid.User.IsOversea ? coreWebView2.SetMobileOverseaUserAgent() : coreWebView2.SetMobileUserAgent();
+                        jsInterface?.Detach();
+                        jsInterface = SourceProvider.CreateJsInterface(serviceProvider, coreWebView2, userAndUid);
+
                         await navigator.NavigateAsync(source).ConfigureAwait(true);
                     }
                 }
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Dialog/CultivatePromotionDeltaDialog.xaml b/src/Snap.Hutao/Snap.Hutao/View/Dialog/CultivatePromotionDeltaDialog.xaml
index 7d0de834..71055f38 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Dialog/CultivatePromotionDeltaDialog.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Dialog/CultivatePromotionDeltaDialog.xaml
@@ -76,7 +76,7 @@
             <Grid
                 Margin="8"
                 DataContext="{x:Bind Avatar}"
-                Style="{StaticResource BorderGridStyle}">
+                Style="{ThemeResource GridCardStyle}">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="auto"/>
                     <ColumnDefinition Width="160"/>
@@ -129,7 +129,7 @@
             <Grid
                 Margin="8"
                 DataContext="{x:Bind Weapon}"
-                Style="{StaticResource BorderGridStyle}">
+                Style="{ThemeResource GridCardStyle}">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="auto"/>
                     <ColumnDefinition Width="160"/>
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/AvatarPropertyPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/AvatarPropertyPage.xaml
index 35679ff6..8aef9263 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/AvatarPropertyPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/AvatarPropertyPage.xaml
@@ -314,7 +314,7 @@
                                         HorizontalAlignment="Left">
                                         <!--  卡片面板  -->
                                         <Border Margin="16" cw:Effects.Shadow="{ThemeResource CompatCardShadow}">
-                                            <Grid cw:UIElementExtensions.ClipToBounds="True" Style="{StaticResource BorderGridStyle}">
+                                            <Grid cw:UIElementExtensions.ClipToBounds="True" Style="{ThemeResource GridCardStyle}">
                                                 <Grid.RowDefinitions>
                                                     <RowDefinition/>
                                                     <RowDefinition Height="auto"/>
@@ -636,7 +636,7 @@
                                                                     Grid.Column="3"
                                                                     Margin="8,0,0,0"
                                                                     HorizontalAlignment="Left"
-                                                                    Foreground="{StaticResource AvatarPropertyAddValueBrush}"
+                                                                    Foreground="{StaticResource AvatarPropertyAddValueColorBrush}"
                                                                     Text="{Binding AddValue}"/>
                                                             </Grid>
                                                         </DataTemplate>
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/DailyNotePage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/DailyNotePage.xaml
index cef97178..3ea16f55 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/DailyNotePage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/DailyNotePage.xaml
@@ -193,7 +193,7 @@
                                     <SolidColorBrush x:Key="ItemContainerPointerOverBackground" Color="Transparent"/>
                                     <SolidColorBrush x:Key="ItemContainerPressedBackground" Color="Transparent"/>
                                 </ItemContainer.Resources>
-                                <Grid Padding="8" Style="{StaticResource BorderGridStyle}">
+                                <Grid Padding="8" Style="{ThemeResource GridCardStyle}">
                                     <Grid.RowDefinitions>
                                         <RowDefinition Height="auto"/>
                                         <RowDefinition Height="auto"/>
@@ -284,7 +284,7 @@
                                         Grid.Row="1"
                                         Margin="0,8,0,0"
                                         Spacing="6">
-                                        <Grid Style="{ThemeResource BorderGridStyle}">
+                                        <Grid Style="{ThemeResource GridCardStyle}">
                                             <Grid.ColumnDefinitions>
                                                 <ColumnDefinition Width="auto"/>
                                                 <ColumnDefinition/>
@@ -321,7 +321,7 @@
                                                     TextWrapping="NoWrap"/>
                                             </StackPanel>
                                         </Grid>
-                                        <Grid Style="{ThemeResource BorderGridStyle}">
+                                        <Grid Style="{ThemeResource GridCardStyle}">
                                             <Grid.ColumnDefinitions>
                                                 <ColumnDefinition Width="auto"/>
                                                 <ColumnDefinition/>
@@ -358,7 +358,7 @@
                                                     TextWrapping="NoWrap"/>
                                             </StackPanel>
                                         </Grid>
-                                        <Grid Style="{ThemeResource BorderGridStyle}">
+                                        <Grid Style="{ThemeResource GridCardStyle}">
                                             <Grid.ColumnDefinitions>
                                                 <ColumnDefinition Width="auto"/>
                                                 <ColumnDefinition/>
@@ -395,7 +395,7 @@
                                                     TextWrapping="NoWrap"/>
                                             </StackPanel>
                                         </Grid>
-                                        <Grid Style="{ThemeResource BorderGridStyle}">
+                                        <Grid Style="{ThemeResource GridCardStyle}">
                                             <Grid.ColumnDefinitions>
                                                 <ColumnDefinition Width="auto"/>
                                                 <ColumnDefinition/>
@@ -432,7 +432,7 @@
                                                     TextWrapping="NoWrap"/>
                                             </StackPanel>
                                         </Grid>
-                                        <Grid Style="{ThemeResource BorderGridStyle}">
+                                        <Grid Style="{ThemeResource GridCardStyle}">
                                             <Grid.ColumnDefinitions>
                                                 <ColumnDefinition Width="auto"/>
                                                 <ColumnDefinition/>
@@ -487,7 +487,7 @@
                                         </ItemsControl.ItemsPanel>
                                         <ItemsControl.ItemTemplate>
                                             <DataTemplate>
-                                                <Grid Style="{ThemeResource BorderGridStyle}">
+                                                <Grid Style="{ThemeResource GridCardStyle}">
                                                     <Grid.ColumnDefinitions>
                                                         <ColumnDefinition Width="auto"/>
                                                         <ColumnDefinition/>
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/ISupportLoginByWebView.cs b/src/Snap.Hutao/Snap.Hutao/View/Page/ISupportLoginByWebView.cs
index 357aa8a8..34046301 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/ISupportLoginByWebView.cs
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/ISupportLoginByWebView.cs
@@ -17,11 +17,11 @@ internal interface ISupportLoginByWebView
         try
         {
             await webView2.EnsureCoreWebView2Async();
-            await webView2.CoreWebView2.DeleteCookiesAsync("https://user.mihoyo.com").ConfigureAwait(true);
+            await webView2.CoreWebView2.DeleteCookiesAsync(cookie).ConfigureAwait(true);
             webView2.CoreWebView2.DisableDevToolsOnReleaseBuild();
             webView2.CoreWebView2.DisableAutoCompletion();
 
-            webView2.CoreWebView2.Navigate("https://user.mihoyo.com/#/login/password");
+            webView2.CoreWebView2.Navigate(navigate);
         }
         catch (Exception ex)
         {
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/LoginMihoyoUserPage.xaml.cs b/src/Snap.Hutao/Snap.Hutao/View/Page/LoginMihoyoUserPage.xaml.cs
index 1863556e..c32a41d0 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/LoginMihoyoUserPage.xaml.cs
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/LoginMihoyoUserPage.xaml.cs
@@ -44,7 +44,7 @@ internal sealed partial class LoginMihoyoUserPage : Microsoft.UI.Xaml.Controls.P
         IReadOnlyList<CoreWebView2Cookie> cookies = await WebView.CoreWebView2.CookieManager.GetCookiesAsync("https://user.mihoyo.com");
         Cookie webCookie = Cookie.FromCoreWebView2Cookies(cookies);
 
-        if (!webCookie.TryGetCookieToken(out Cookie? loginTicketCookie))
+        if (!webCookie.TryGetLoginTicket(out Cookie? loginTicketCookie))
         {
             return;
         }
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/SettingPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/SettingPage.xaml
index 7270a3d5..23a69bd9 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/SettingPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/SettingPage.xaml
@@ -21,7 +21,7 @@
             </Grid.ColumnDefinitions>
             <StackPanel Margin="16,16,16,16" Spacing="{StaticResource SettingsCardSpacing}">
                 <Border cw:Effects.Shadow="{ThemeResource CompatCardShadow}">
-                    <Grid Height="280" Style="{ThemeResource BorderGridStyle}">
+                    <Grid Height="280" Style="{ThemeResource GridCardStyle}">
                         <Image
                             VerticalAlignment="Center"
                             Source="ms-appx:///Resource/BlurBackground.png"
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/TestPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/TestPage.xaml
index 8b9f1321..8e8541f1 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/TestPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/TestPage.xaml
@@ -95,6 +95,12 @@
                 Header="Compensation GachaLog Service Time For 15 Days"
                 IsClickEnabled="True"/>
 
+            <cwc:SettingsCard Header="Crash">
+                <StackPanel Orientation="Horizontal">
+                    <Button Command="{Binding ExceptionCommand}" Content="Activate"/>
+                </StackPanel>
+            </cwc:SettingsCard>
+
             <Expander
                 HorizontalAlignment="Stretch"
                 HorizontalContentAlignment="Stretch"
@@ -120,6 +126,7 @@
                     <Button Command="{Binding UploadAnnouncementCommand}" Content="Upload"/>
                 </StackPanel>
             </Expander>
+
         </StackPanel>
     </ScrollViewer>
 </shc:ScopedPage>
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/WikiAvatarPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/WikiAvatarPage.xaml
index 3af94fb4..1fa863ef 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/WikiAvatarPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/WikiAvatarPage.xaml
@@ -424,7 +424,7 @@
                                             Text="{shcm:ResourceString Name=ViewPageWiKiAvatarMiscHeader}"/>
                                         <Border Margin="16,16,0,0" cw:Effects.Shadow="{ThemeResource CompatCardShadow}">
                                             <cwc:ConstrainedBox AspectRatio="2048:1024">
-                                                <Grid Style="{StaticResource BorderGridStyle}">
+                                                <Grid Style="{ThemeResource GridCardStyle}">
                                                     <Grid.ColumnDefinitions>
                                                         <ColumnDefinition Width="auto"/>
                                                         <ColumnDefinition/>
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/WikiWeaponPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/WikiWeaponPage.xaml
index 2d5b567b..10410981 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/WikiWeaponPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/WikiWeaponPage.xaml
@@ -134,7 +134,7 @@
                                                 <mxi:Interaction.Behaviors>
                                                     <shcb:AutoHeightBehavior TargetHeight="1024" TargetWidth="2048"/>
                                                 </mxi:Interaction.Behaviors>
-                                                <Border Grid.ColumnSpan="2" Background="{ThemeResource DarkOnlyOverlayMaskBrush}"/>
+                                                <Border Grid.ColumnSpan="2" Background="{ThemeResource DarkOnlyOverlayMaskColorBrush}"/>
                                                 <ScrollViewer
                                                     Grid.Column="0"
                                                     Margin="16"
diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/TestViewModel.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/TestViewModel.cs
index 96a1a597..e894f15b 100644
--- a/src/Snap.Hutao/Snap.Hutao/ViewModel/TestViewModel.cs
+++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/TestViewModel.cs
@@ -50,6 +50,12 @@ internal sealed partial class TestViewModel : Abstraction.ViewModel
         LocalSetting.Set(SettingKeys.Major1Minor7Revision0GuideState, (uint)GuideState.Language);
     }
 
+    [Command("ExceptionCommand")]
+    private static void ThrowTestException()
+    {
+        Must.NeverHappen();
+    }
+
     [Command("ResetMainWindowSizeCommand")]
     private void ResetMainWindowSize()
     {
diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Bridge/CoreWebView2Extension.cs b/src/Snap.Hutao/Snap.Hutao/Web/Bridge/CoreWebView2Extension.cs
index afde86ed..fd763312 100644
--- a/src/Snap.Hutao/Snap.Hutao/Web/Bridge/CoreWebView2Extension.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Web/Bridge/CoreWebView2Extension.cs
@@ -76,17 +76,24 @@ internal static class CoreWebView2Extension
 
         if (cookieToken is not null)
         {
-            cookieManager.AddMihoyoCookie(Cookie.ACCOUNT_ID, cookieToken, isOversea).AddMihoyoCookie(Cookie.COOKIE_TOKEN, cookieToken, isOversea);
+            cookieManager
+                .AddMihoyoCookie(Cookie.ACCOUNT_ID, cookieToken, isOversea)
+                .AddMihoyoCookie(Cookie.COOKIE_TOKEN, cookieToken, isOversea);
         }
 
         if (lToken is not null)
         {
-            cookieManager.AddMihoyoCookie(Cookie.LTUID, lToken, isOversea).AddMihoyoCookie(Cookie.LTOKEN, lToken, isOversea);
+            cookieManager
+                .AddMihoyoCookie(Cookie.LTUID, lToken, isOversea)
+                .AddMihoyoCookie(Cookie.LTOKEN, lToken, isOversea);
         }
 
         if (sToken is not null)
         {
-            cookieManager.AddMihoyoCookie(Cookie.STUID, sToken, isOversea).AddMihoyoCookie(Cookie.STOKEN, sToken, isOversea);
+            cookieManager
+                .AddMihoyoCookie(Cookie.MID, sToken, isOversea)
+                .AddMihoyoCookie(Cookie.STUID, sToken, isOversea)
+                .AddMihoyoCookie(Cookie.STOKEN, sToken, isOversea);
         }
 
         return webView;
diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Bridge/MiHoYoJSInterface.cs b/src/Snap.Hutao/Snap.Hutao/Web/Bridge/MiHoYoJSInterface.cs
index 22dbc19d..fb4911ec 100644
--- a/src/Snap.Hutao/Snap.Hutao/Web/Bridge/MiHoYoJSInterface.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Web/Bridge/MiHoYoJSInterface.cs
@@ -39,9 +39,10 @@ internal class MiHoYoJSInterface
         document.querySelector('body').appendChild(st);
         """;
 
+    private readonly Guid interfaceId = Guid.NewGuid();
     private readonly IServiceProvider serviceProvider;
-    private readonly CoreWebView2 webView;
     private readonly UserAndUid userAndUid;
+    private CoreWebView2 webView;
 
     private readonly ITaskContext taskContext;
     private readonly ILogger<MiHoYoJSInterface> logger;
@@ -342,6 +343,14 @@ internal class MiHoYoJSInterface
         throw new NotImplementedException();
     }
 
+    public void Detach()
+    {
+        webView.WebMessageReceived -= webMessageReceivedEventHandler;
+        webView.DOMContentLoaded -= domContentLoadedEventHandler;
+        webView.NavigationStarting -= navigationStartingEventHandler;
+        webView = default!;
+    }
+
     private async ValueTask<string> ExecuteCallbackScriptAsync(string callback, string? payload = null)
     {
         if (string.IsNullOrEmpty(callback))
@@ -360,7 +369,7 @@ internal class MiHoYoJSInterface
             .Append(')')
             .ToString();
 
-        logger?.LogInformation("[ExecuteScript: {callback}]\n{payload}", callback, payload);
+        logger?.LogInformation("[{Id}][ExecuteScript: {callback}]\n{payload}", interfaceId, callback, payload);
 
         await taskContext.SwitchToMainThreadAsync();
         try
@@ -378,7 +387,7 @@ internal class MiHoYoJSInterface
     private async void OnWebMessageReceived(CoreWebView2 webView2, CoreWebView2WebMessageReceivedEventArgs args)
     {
         string message = args.TryGetWebMessageAsString();
-        logger.LogInformation("[OnRawMessage]\n{message}", message);
+        logger.LogInformation("[{Id}][OnRawMessage]\n{message}", interfaceId, message);
         JsParam? param = JsonSerializer.Deserialize<JsParam>(message);
 
         ArgumentNullException.ThrowIfNull(param);
@@ -445,7 +454,7 @@ internal class MiHoYoJSInterface
         if (uriHostSpan.EndsWith("mihoyo.com") || uriHostSpan.EndsWith("hoyolab.com"))
         {
             // Execute this solve issue: When open same site second time,there might be no bridge init.
-            coreWebView2.AddScriptToExecuteOnDocumentCreatedAsync(InitializeJsInterfaceScript2).AsTask().SafeForget(logger);
+            // coreWebView2.AddScriptToExecuteOnDocumentCreatedAsync(InitializeJsInterfaceScript2).AsTask().SafeForget(logger);
             coreWebView2.ExecuteScriptAsync(InitializeJsInterfaceScript2).AsTask().SafeForget(logger);
         }
     }
diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/Log/HomaLogUploadClient.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/Log/HomaLogUploadClient.cs
index 482854ca..7574e59b 100644
--- a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/Log/HomaLogUploadClient.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/Log/HomaLogUploadClient.cs
@@ -31,7 +31,7 @@ internal sealed partial class HomaLogUploadClient
     public async ValueTask<string?> UploadLogAsync(Exception exception)
     {
         HttpRequestMessageBuilder builder = httpRequestMessageBuilderFactory.Create()
-            .SetRequestUri(HutaoEndpoints.GachaLogUpload)
+            .SetRequestUri(HutaoEndpoints.HutaoLogUpload)
             .PostJson(BuildFromException(exception));
 
         Response<string>? resp = await builder
diff --git a/src/Snap.Hutao/Snap.Hutao/Win32/Memory/IUnmanagedMemory.cs b/src/Snap.Hutao/Snap.Hutao/Win32/Memory/IUnmanagedMemory.cs
index c9b090d7..0de89228 100644
--- a/src/Snap.Hutao/Snap.Hutao/Win32/Memory/IUnmanagedMemory.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Win32/Memory/IUnmanagedMemory.cs
@@ -17,9 +17,4 @@ internal unsafe interface IUnmanagedMemory : IDisposable
     /// Gets size of referenced unmanaged memory, in bytes.
     /// </summary>
     uint Size { get; }
-
-    /// <summary>
-    /// Gets a span of bytes from the current instance.
-    /// </summary>
-    Span<byte> Span { get; }
 }
\ No newline at end of file
diff --git a/src/Snap.Hutao/Snap.Hutao/Win32/Memory/UnmanagedMemoryExtension.cs b/src/Snap.Hutao/Snap.Hutao/Win32/Memory/UnmanagedMemoryExtension.cs
new file mode 100644
index 00000000..b8873ba8
--- /dev/null
+++ b/src/Snap.Hutao/Snap.Hutao/Win32/Memory/UnmanagedMemoryExtension.cs
@@ -0,0 +1,12 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+namespace Snap.Hutao.Win32.Memory;
+
+internal static class UnmanagedMemoryExtension
+{
+    public static unsafe Span<byte> AsSpan(this IUnmanagedMemory unmanagedMemory)
+    {
+        return new(unmanagedMemory.Pointer, (int)unmanagedMemory.Size);
+    }
+}
\ No newline at end of file
diff --git a/src/Snap.Hutao/Snap.Hutao/Win32/Memory/VirtualMemory.cs b/src/Snap.Hutao/Snap.Hutao/Win32/Memory/VirtualMemory.cs
index 4b629e12..a0787a65 100644
--- a/src/Snap.Hutao/Snap.Hutao/Win32/Memory/VirtualMemory.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Win32/Memory/VirtualMemory.cs
@@ -7,7 +7,7 @@ using static Windows.Win32.PInvoke;
 namespace Snap.Hutao.Win32.Memory;
 
 /// <summary>
-/// NativeMemory.AllocZeroed wrapper
+/// VirtualAlloc wrapper
 /// </summary>
 internal readonly unsafe struct VirtualMemory : IUnmanagedMemory
 {
@@ -38,9 +38,6 @@ internal readonly unsafe struct VirtualMemory : IUnmanagedMemory
     /// <inheritdoc/>
     public uint Size { get => size; }
 
-    /// <inheritdoc/>
-    public Span<byte> Span { get => new(pointer, (int)size); }
-
     /// <inheritdoc/>
     public void Dispose()
     {