diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Builder/ButtonBase/ButtonBaseBuilder.cs b/src/Snap.Hutao/Snap.Hutao/Control/Builder/ButtonBase/ButtonBaseBuilder.cs
deleted file mode 100644
index 23bcc271..00000000
--- a/src/Snap.Hutao/Snap.Hutao/Control/Builder/ButtonBase/ButtonBaseBuilder.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-namespace Snap.Hutao.Control.Builder.ButtonBase;
-
-internal class ButtonBaseBuilder<TButton> : IButtonBaseBuilder<TButton>
-    where TButton : Microsoft.UI.Xaml.Controls.Primitives.ButtonBase, new()
-{
-    public TButton Button { get; } = new();
-}
\ No newline at end of file
diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Builder/ButtonBase/ButtonBaseBuilderExtension.cs b/src/Snap.Hutao/Snap.Hutao/Control/Builder/ButtonBase/ButtonBaseBuilderExtension.cs
deleted file mode 100644
index 58ad45a5..00000000
--- a/src/Snap.Hutao/Snap.Hutao/Control/Builder/ButtonBase/ButtonBaseBuilderExtension.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using Snap.Hutao.Core.Abstraction.Extension;
-
-namespace Snap.Hutao.Control.Builder.ButtonBase;
-
-internal static class ButtonBaseBuilderExtension
-{
-    public static TBuilder SetContent<TBuilder, TButton>(this TBuilder builder, object? content)
-        where TBuilder : IButtonBaseBuilder<TButton>
-        where TButton : Microsoft.UI.Xaml.Controls.Primitives.ButtonBase
-    {
-        builder.Configure(builder => builder.Button.Content = content);
-        return builder;
-    }
-
-    public static TBuilder SetCommand<TBuilder, TButton>(this TBuilder builder, ICommand command)
-        where TBuilder : IButtonBaseBuilder<TButton>
-        where TButton : Microsoft.UI.Xaml.Controls.Primitives.ButtonBase
-    {
-        builder.Configure(builder => builder.Button.Command = command);
-        return builder;
-    }
-}
\ No newline at end of file
diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Builder/ButtonBase/ButtonBuilder.cs b/src/Snap.Hutao/Snap.Hutao/Control/Builder/ButtonBase/ButtonBuilder.cs
deleted file mode 100644
index 6274b5d0..00000000
--- a/src/Snap.Hutao/Snap.Hutao/Control/Builder/ButtonBase/ButtonBuilder.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using Microsoft.UI.Xaml.Controls;
-
-namespace Snap.Hutao.Control.Builder.ButtonBase;
-
-internal sealed class ButtonBuilder : ButtonBaseBuilder<Button>;
\ No newline at end of file
diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Builder/ButtonBase/ButtonBuilderExtension.cs b/src/Snap.Hutao/Snap.Hutao/Control/Builder/ButtonBase/ButtonBuilderExtension.cs
deleted file mode 100644
index 13d161d5..00000000
--- a/src/Snap.Hutao/Snap.Hutao/Control/Builder/ButtonBase/ButtonBuilderExtension.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using Microsoft.UI.Xaml.Controls;
-
-namespace Snap.Hutao.Control.Builder.ButtonBase;
-
-internal static class ButtonBuilderExtension
-{
-    public static ButtonBuilder SetContent(this ButtonBuilder builder, object? content)
-    {
-        return builder.SetContent<ButtonBuilder, Button>(content);
-    }
-
-    public static ButtonBuilder SetCommand(this ButtonBuilder builder, ICommand command)
-    {
-        return builder.SetCommand<ButtonBuilder, Button>(command);
-    }
-}
\ No newline at end of file
diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Builder/ButtonBase/IButtonBaseBuilder.cs b/src/Snap.Hutao/Snap.Hutao/Control/Builder/ButtonBase/IButtonBaseBuilder.cs
deleted file mode 100644
index 6d6a4f9e..00000000
--- a/src/Snap.Hutao/Snap.Hutao/Control/Builder/ButtonBase/IButtonBaseBuilder.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using Snap.Hutao.Core.Abstraction;
-
-namespace Snap.Hutao.Control.Builder.ButtonBase;
-
-internal interface IButtonBaseBuilder<TButton> : IBuilder
-    where TButton : Microsoft.UI.Xaml.Controls.Primitives.ButtonBase
-{
-    TButton Button { get; }
-}
\ No newline at end of file
diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Helper/FrameworkElementHelper.cs b/src/Snap.Hutao/Snap.Hutao/Control/Helper/FrameworkElementHelper.cs
deleted file mode 100644
index ac36e619..00000000
--- a/src/Snap.Hutao/Snap.Hutao/Control/Helper/FrameworkElementHelper.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using Microsoft.UI.Xaml;
-
-namespace Snap.Hutao.Control.Helper;
-
-[SuppressMessage("", "SH001")]
-[DependencyProperty("SquareLength", typeof(double), 0D, nameof(OnSquareLengthChanged), IsAttached = true, AttachedType = typeof(FrameworkElement))]
-[DependencyProperty("IsActualThemeBindingEnabled", typeof(bool), false, nameof(OnIsActualThemeBindingEnabled), IsAttached = true, AttachedType = typeof(FrameworkElement))]
-[DependencyProperty("ActualTheme", typeof(ElementTheme), ElementTheme.Default, IsAttached = true, AttachedType = typeof(FrameworkElement))]
-public sealed partial class FrameworkElementHelper
-{
-    private static void OnSquareLengthChanged(DependencyObject dp, DependencyPropertyChangedEventArgs e)
-    {
-        FrameworkElement element = (FrameworkElement)dp;
-        element.Width = (double)e.NewValue;
-        element.Height = (double)e.NewValue;
-    }
-
-    private static void OnIsActualThemeBindingEnabled(DependencyObject dp, DependencyPropertyChangedEventArgs e)
-    {
-        FrameworkElement element = (FrameworkElement)dp;
-        if ((bool)e.NewValue)
-        {
-            element.ActualThemeChanged += OnActualThemeChanged;
-        }
-        else
-        {
-            element.ActualThemeChanged -= OnActualThemeChanged;
-        }
-
-        static void OnActualThemeChanged(FrameworkElement sender, object args)
-        {
-            SetActualTheme(sender, sender.ActualTheme);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Image/CachedImage.cs b/src/Snap.Hutao/Snap.Hutao/Control/Image/CachedImage.cs
index 80ec988e..99f7972c 100644
--- a/src/Snap.Hutao/Snap.Hutao/Control/Image/CachedImage.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Control/Image/CachedImage.cs
@@ -1,37 +1,174 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
+using CommunityToolkit.WinUI;
+using Microsoft.UI.Composition;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Media;
 using Microsoft.UI.Xaml.Media.Imaging;
-using Snap.Hutao.Control.Extension;
 using Snap.Hutao.Core.Caching;
 using Snap.Hutao.Core.ExceptionService;
 using Snap.Hutao.Core.IO.DataTransfer;
+using Snap.Hutao.UI.Xaml;
 using System.IO;
 using System.Runtime.InteropServices;
 using Windows.Graphics.Imaging;
+using Windows.Media.Casting;
 using Windows.Storage.Streams;
 
 namespace Snap.Hutao.Control.Image;
 
-/// <summary>
-/// 缓存图像
-/// </summary>
-[HighQuality]
+[SuppressMessage("", "CA1001")]
+[SuppressMessage("", "SH003")]
+[TemplateVisualState(Name = LoadingState, GroupName = CommonGroup)]
+[TemplateVisualState(Name = LoadedState, GroupName = CommonGroup)]
+[TemplateVisualState(Name = UnloadedState, GroupName = CommonGroup)]
+[TemplateVisualState(Name = FailedState, GroupName = CommonGroup)]
+[TemplatePart(Name = PartImage, Type = typeof(object))]
+[TemplatePart(Name = PartPlaceholderImage, Type = typeof(object))]
 [DependencyProperty("SourceName", typeof(string), "Unknown")]
 [DependencyProperty("CachedName", typeof(string), "Unknown")]
-internal sealed partial class CachedImage : Implementation.ImageEx
+[DependencyProperty("NineGrid", typeof(Thickness))]
+[DependencyProperty("Stretch", typeof(Stretch), Stretch.Uniform)]
+[DependencyProperty("PlaceholderSource", typeof(object), default(object))]
+[DependencyProperty("PlaceholderStretch", typeof(Stretch), Stretch.Uniform)]
+[DependencyProperty("PlaceholderMargin", typeof(Thickness))]
+[DependencyProperty("Source", typeof(object), default(object), nameof(SourceChanged))]
+internal sealed partial class CachedImage : Microsoft.UI.Xaml.Controls.Control, IAlphaMaskProvider
 {
-    /// <summary>
-    /// 构造一个新的缓存图像
-    /// </summary>
+    private const string PartImage = "Image";
+    private const string PartPlaceholderImage = "PlaceholderImage";
+    private const string CommonGroup = "CommonStates";
+    private const string LoadingState = "Loading";
+    private const string LoadedState = "Loaded";
+    private const string UnloadedState = "Unloaded";
+    private const string FailedState = "Failed";
+
+    private CancellationTokenSource? tokenSource;
+
     public CachedImage()
     {
         DefaultStyleKey = typeof(CachedImage);
         DefaultStyleResourceUri = "ms-appx:///Control/Image/CachedImage.xaml".ToUri();
     }
 
-    /// <inheritdoc/>
-    protected override async Task<Uri?> ProvideCachedResourceAsync(Uri imageUri, CancellationToken token)
+    public bool IsInitialized { get; private set; }
+
+    public bool WaitUntilLoaded
+    {
+        get => true;
+    }
+
+    private object? Image { get; set; }
+
+    private object? PlaceholderImage { get; set; }
+
+    public CompositionBrush GetAlphaMask()
+    {
+        if (IsInitialized && Image is Microsoft.UI.Xaml.Controls.Image image)
+        {
+            return image.GetAlphaMask();
+        }
+
+        return default!;
+    }
+
+    public CastingSource GetAsCastingSource()
+    {
+        if (IsInitialized && Image is Microsoft.UI.Xaml.Controls.Image image)
+        {
+            return image.GetAsCastingSource();
+        }
+
+        return default!;
+    }
+
+    protected override void OnApplyTemplate()
+    {
+        RemoveImageOpened(OnImageOpened);
+        RemoveImageFailed(OnImageFailed);
+
+        Image = GetTemplateChild(PartImage);
+
+        IsInitialized = true;
+
+        SetSource(Source);
+
+        AttachImageOpened(OnImageOpened);
+        AttachImageFailed(OnImageFailed);
+
+        base.OnApplyTemplate();
+
+        void AttachImageOpened(RoutedEventHandler handler)
+        {
+            if (Image is Microsoft.UI.Xaml.Controls.Image image)
+            {
+                image.ImageOpened += handler;
+            }
+            else if (Image is ImageBrush brush)
+            {
+                brush.ImageOpened += handler;
+            }
+        }
+
+        void AttachImageFailed(ExceptionRoutedEventHandler handler)
+        {
+            if (Image is Microsoft.UI.Xaml.Controls.Image image)
+            {
+                image.ImageFailed += handler;
+            }
+            else if (Image is ImageBrush brush)
+            {
+                brush.ImageFailed += handler;
+            }
+        }
+
+        void RemoveImageOpened(RoutedEventHandler handler)
+        {
+            if (Image is Microsoft.UI.Xaml.Controls.Image image)
+            {
+                image.ImageOpened -= handler;
+            }
+            else if (Image is ImageBrush brush)
+            {
+                brush.ImageOpened -= handler;
+            }
+        }
+
+        void RemoveImageFailed(ExceptionRoutedEventHandler handler)
+        {
+            if (Image is Microsoft.UI.Xaml.Controls.Image image)
+            {
+                image.ImageFailed -= handler;
+            }
+            else if (Image is ImageBrush brush)
+            {
+                brush.ImageFailed -= handler;
+            }
+        }
+    }
+
+    private static void SourceChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        if (d is not CachedImage control)
+        {
+            return;
+        }
+
+        if (e.OldValue is not null && e.NewValue is not null && e.OldValue.Equals(e.NewValue))
+        {
+            return;
+        }
+
+        control.SetSource(e.NewValue);
+    }
+
+    private static bool IsHttpUri(Uri uri)
+    {
+        return uri.IsAbsoluteUri && (uri.Scheme == "http" || uri.Scheme == "https");
+    }
+
+    private async Task<Uri?> ProvideCachedResourceAsync(Uri imageUri, CancellationToken token)
     {
         SourceName = Path.GetFileName(imageUri.ToString());
         IImageCache imageCache = this.ServiceProvider().GetRequiredService<IImageCache>();
@@ -52,6 +189,188 @@ internal sealed partial class CachedImage : Implementation.ImageEx
         }
     }
 
+    private void OnImageOpened(object sender, RoutedEventArgs e)
+    {
+        VisualStateManager.GoToState(this, LoadedState, true);
+    }
+
+    private void OnImageFailed(object sender, ExceptionRoutedEventArgs e)
+    {
+        VisualStateManager.GoToState(this, FailedState, true);
+    }
+
+    private void AttachSource(BitmapImage? source, Uri? uri)
+    {
+        if (Image is Microsoft.UI.Xaml.Controls.Image image)
+        {
+            image.Source = source;
+        }
+        else if (Image is ImageBrush brush)
+        {
+            brush.ImageSource = source;
+        }
+
+        if (source is null)
+        {
+            VisualStateManager.GoToState(this, UnloadedState, true);
+        }
+        else
+        {
+            // https://learn.microsoft.com/en-us/windows/uwp/debug-test-perf/optimize-animations-and-media#optimize-image-resources
+            source.UriSource = uri;
+            VisualStateManager.GoToState(this, LoadedState, true);
+        }
+    }
+
+    private void AttachPlaceholderSource(BitmapImage? source, Uri? uri)
+    {
+        if (PlaceholderImage is Microsoft.UI.Xaml.Controls.Image image)
+        {
+            image.Source = source;
+        }
+        else if (PlaceholderImage is ImageBrush brush)
+        {
+            brush.ImageSource = source;
+        }
+
+        if (source is null)
+        {
+            VisualStateManager.GoToState(this, UnloadedState, true);
+        }
+        else
+        {
+            // https://learn.microsoft.com/en-us/windows/uwp/debug-test-perf/optimize-animations-and-media#optimize-image-resources
+            source.UriSource = uri;
+            VisualStateManager.GoToState(this, LoadedState, true);
+        }
+    }
+
+    private async void SetSource(object? source)
+    {
+        if (!IsInitialized)
+        {
+            return;
+        }
+
+        tokenSource?.Cancel();
+        tokenSource = new CancellationTokenSource();
+
+        AttachSource(default, default);
+
+        if (source is null)
+        {
+            return;
+        }
+
+        VisualStateManager.GoToState(this, LoadingState, true);
+
+        if (source as Uri is not { } uri)
+        {
+            string? url = source as string ?? source.ToString();
+            if (!Uri.TryCreate(url, UriKind.RelativeOrAbsolute, out uri))
+            {
+                VisualStateManager.GoToState(this, FailedState, true);
+                return;
+            }
+        }
+
+        if (!IsHttpUri(uri) && !uri.IsAbsoluteUri)
+        {
+            uri = new Uri("ms-appx:///" + uri.OriginalString.TrimStart('/'));
+        }
+
+        try
+        {
+            await LoadImageAsync(uri, tokenSource.Token).ConfigureAwait(true);
+        }
+        catch (Exception ex)
+        {
+            SetPlaceholderSource(PlaceholderSource);
+
+            if (ex is OperationCanceledException)
+            {
+                // nothing to do as cancellation has been requested.
+            }
+            else
+            {
+                VisualStateManager.GoToState(this, FailedState, true);
+            }
+        }
+    }
+
+    private async void SetPlaceholderSource(object? source)
+    {
+        if (!IsInitialized)
+        {
+            return;
+        }
+
+        tokenSource?.Cancel();
+        tokenSource = new();
+
+        AttachPlaceholderSource(default, default);
+
+        if (source is null)
+        {
+            return;
+        }
+
+        if (source as Uri is not { } uri)
+        {
+            string? url = source as string ?? source.ToString();
+            if (!Uri.TryCreate(url, UriKind.RelativeOrAbsolute, out uri))
+            {
+                return;
+            }
+        }
+
+        if (!IsHttpUri(uri) && !uri.IsAbsoluteUri)
+        {
+            uri = new Uri("ms-appx:///" + uri.OriginalString.TrimStart('/'));
+        }
+
+        try
+        {
+            if (uri is null)
+            {
+                return;
+            }
+
+            Uri? actualUri = await ProvideCachedResourceAsync(uri, tokenSource.Token).ConfigureAwait(true);
+
+            ArgumentNullException.ThrowIfNull(tokenSource);
+            if (!tokenSource.IsCancellationRequested)
+            {
+                // Only attach our image if we still have a valid request.
+                AttachPlaceholderSource(new BitmapImage(), actualUri);
+            }
+        }
+        catch (OperationCanceledException)
+        {
+            // nothing to do as cancellation has been requested.
+        }
+        catch
+        {
+        }
+    }
+
+    private async Task LoadImageAsync(Uri imageUri, CancellationToken token)
+    {
+        if (imageUri is null)
+        {
+            return;
+        }
+
+        Uri? actualUri = await ProvideCachedResourceAsync(imageUri, token).ConfigureAwait(true);
+
+        ArgumentNullException.ThrowIfNull(tokenSource);
+        if (!tokenSource.IsCancellationRequested)
+        {
+            // Only attach our image if we still have a valid request.
+            AttachSource(new BitmapImage(), actualUri);
+        }
+    }
+
     [Command("CopyToClipboardCommand")]
     private async Task CopyToClipboard()
     {
diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Image/CachedImage.xaml b/src/Snap.Hutao/Snap.Hutao/Control/Image/CachedImage.xaml
index 1d351541..970a9e80 100644
--- a/src/Snap.Hutao/Snap.Hutao/Control/Image/CachedImage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/Control/Image/CachedImage.xaml
@@ -1,7 +1,8 @@
 <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">
+    xmlns:shci="using:Snap.Hutao.Control.Image"
+    xmlns:shcm="using:Snap.Hutao.Control.Markup">
     <Style TargetType="shci:CachedImage">
         <Setter Property="Background" Value="Transparent"/>
         <Setter Property="Foreground" Value="{ThemeResource ApplicationForegroundThemeBrush}"/>
@@ -18,7 +19,7 @@
                             <MenuFlyout>
                                 <MenuFlyoutItem IsEnabled="False" Text="{TemplateBinding SourceName}"/>
                                 <MenuFlyoutItem IsEnabled="False" Text="{TemplateBinding CachedName}"/>
-                                <MenuFlyoutItem Command="{Binding CopyToClipboardCommand, RelativeSource={RelativeSource TemplatedParent}}" Text="复制图像"/>
+                                <MenuFlyoutItem Command="{Binding CopyToClipboardCommand, RelativeSource={RelativeSource TemplatedParent}}" Text="{shcm:ResourceString Name=UIXamlControlCachedImageCopyImage}"/>
                             </MenuFlyout>
                         </Grid.ContextFlyout>
                         <Image
diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Image/CompositionImage.cs b/src/Snap.Hutao/Snap.Hutao/Control/Image/CompositionImage.cs
index 0218d598..c1f89d5d 100644
--- a/src/Snap.Hutao/Snap.Hutao/Control/Image/CompositionImage.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Control/Image/CompositionImage.cs
@@ -6,9 +6,9 @@ using Microsoft.UI.Composition;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Hosting;
 using Microsoft.UI.Xaml.Media;
-using Snap.Hutao.Control.Extension;
 using Snap.Hutao.Core.Caching;
 using Snap.Hutao.Service.Notification;
+using Snap.Hutao.UI.Xaml;
 using Snap.Hutao.UI.Xaml.Media.Animation;
 using System.IO;
 using System.Net.Http;
diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Image/Implementation/ImageEx.cs b/src/Snap.Hutao/Snap.Hutao/Control/Image/Implementation/ImageEx.cs
deleted file mode 100644
index f1e3accd..00000000
--- a/src/Snap.Hutao/Snap.Hutao/Control/Image/Implementation/ImageEx.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using Microsoft.UI.Composition;
-using Microsoft.UI.Xaml;
-using Windows.Media.Casting;
-
-namespace Snap.Hutao.Control.Image.Implementation;
-
-[DependencyProperty("NineGrid", typeof(Thickness))]
-internal partial class ImageEx : ImageExBase
-{
-    public ImageEx()
-        : base()
-    {
-    }
-
-    public override CompositionBrush GetAlphaMask()
-    {
-        if (IsInitialized && Image is Microsoft.UI.Xaml.Controls.Image image)
-        {
-            return image.GetAlphaMask();
-        }
-
-        return default!;
-    }
-
-    public CastingSource GetAsCastingSource()
-    {
-        if (IsInitialized && Image is Microsoft.UI.Xaml.Controls.Image image)
-        {
-            return image.GetAsCastingSource();
-        }
-
-        return default!;
-    }
-}
\ No newline at end of file
diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Image/Implementation/ImageExBase.cs b/src/Snap.Hutao/Snap.Hutao/Control/Image/Implementation/ImageExBase.cs
deleted file mode 100644
index cd2b8a26..00000000
--- a/src/Snap.Hutao/Snap.Hutao/Control/Image/Implementation/ImageExBase.cs
+++ /dev/null
@@ -1,322 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using CommunityToolkit.WinUI;
-using Microsoft.UI.Composition;
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Media;
-using Microsoft.UI.Xaml.Media.Imaging;
-
-namespace Snap.Hutao.Control.Image.Implementation;
-
-[SuppressMessage("", "CA1001")]
-[SuppressMessage("", "SH003")]
-[TemplateVisualState(Name = LoadingState, GroupName = CommonGroup)]
-[TemplateVisualState(Name = LoadedState, GroupName = CommonGroup)]
-[TemplateVisualState(Name = UnloadedState, GroupName = CommonGroup)]
-[TemplateVisualState(Name = FailedState, GroupName = CommonGroup)]
-[TemplatePart(Name = PartImage, Type = typeof(object))]
-[TemplatePart(Name = PartPlaceholderImage, Type = typeof(object))]
-[DependencyProperty("Stretch", typeof(Stretch), Stretch.Uniform)]
-[DependencyProperty("PlaceholderSource", typeof(object), default(object))]
-[DependencyProperty("PlaceholderStretch", typeof(Stretch), Stretch.Uniform)]
-[DependencyProperty("PlaceholderMargin", typeof(Thickness))]
-[DependencyProperty("Source", typeof(object), default(object), nameof(SourceChanged))]
-internal abstract partial class ImageExBase : Microsoft.UI.Xaml.Controls.Control, IAlphaMaskProvider
-{
-    protected const string PartImage = "Image";
-    protected const string PartPlaceholderImage = "PlaceholderImage";
-    protected const string CommonGroup = "CommonStates";
-    protected const string LoadingState = "Loading";
-    protected const string LoadedState = "Loaded";
-    protected const string UnloadedState = "Unloaded";
-    protected const string FailedState = "Failed";
-
-    private CancellationTokenSource? tokenSource;
-
-    public bool IsInitialized { get; private set; }
-
-    public bool WaitUntilLoaded
-    {
-        get => true;
-    }
-
-    protected object? Image { get; private set; }
-
-    protected object? PlaceholderImage { get; private set; }
-
-    public abstract CompositionBrush GetAlphaMask();
-
-    protected virtual Task<Uri?> ProvideCachedResourceAsync(Uri imageUri, CancellationToken token)
-    {
-        // By default we just use the built-in UWP image cache provided within the Image control.
-        return Task.FromResult<Uri?>(imageUri);
-    }
-
-    protected virtual void OnImageOpened(object sender, RoutedEventArgs e)
-    {
-        VisualStateManager.GoToState(this, LoadedState, true);
-    }
-
-    protected virtual void OnImageFailed(object sender, ExceptionRoutedEventArgs e)
-    {
-        VisualStateManager.GoToState(this, FailedState, true);
-    }
-
-    protected override void OnApplyTemplate()
-    {
-        RemoveImageOpened(OnImageOpened);
-        RemoveImageFailed(OnImageFailed);
-
-        Image = GetTemplateChild(PartImage);
-
-        IsInitialized = true;
-
-        SetSource(Source);
-
-        AttachImageOpened(OnImageOpened);
-        AttachImageFailed(OnImageFailed);
-
-        base.OnApplyTemplate();
-
-        void AttachImageOpened(RoutedEventHandler handler)
-        {
-            if (Image is Microsoft.UI.Xaml.Controls.Image image)
-            {
-                image.ImageOpened += handler;
-            }
-            else if (Image is ImageBrush brush)
-            {
-                brush.ImageOpened += handler;
-            }
-        }
-
-        void AttachImageFailed(ExceptionRoutedEventHandler handler)
-        {
-            if (Image is Microsoft.UI.Xaml.Controls.Image image)
-            {
-                image.ImageFailed += handler;
-            }
-            else if (Image is ImageBrush brush)
-            {
-                brush.ImageFailed += handler;
-            }
-        }
-
-        void RemoveImageOpened(RoutedEventHandler handler)
-        {
-            if (Image is Microsoft.UI.Xaml.Controls.Image image)
-            {
-                image.ImageOpened -= handler;
-            }
-            else if (Image is ImageBrush brush)
-            {
-                brush.ImageOpened -= handler;
-            }
-        }
-
-        void RemoveImageFailed(ExceptionRoutedEventHandler handler)
-        {
-            if (Image is Microsoft.UI.Xaml.Controls.Image image)
-            {
-                image.ImageFailed -= handler;
-            }
-            else if (Image is ImageBrush brush)
-            {
-                brush.ImageFailed -= handler;
-            }
-        }
-    }
-
-    private static void SourceChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-    {
-        if (d is not ImageExBase control)
-        {
-            return;
-        }
-
-        if (e.OldValue is not null && e.NewValue is not null && e.OldValue.Equals(e.NewValue))
-        {
-            return;
-        }
-
-        control.SetSource(e.NewValue);
-    }
-
-    private static bool IsHttpUri(Uri uri)
-    {
-        return uri.IsAbsoluteUri && (uri.Scheme == "http" || uri.Scheme == "https");
-    }
-
-    private void AttachSource(BitmapImage? source, Uri? uri)
-    {
-        if (Image is Microsoft.UI.Xaml.Controls.Image image)
-        {
-            image.Source = source;
-        }
-        else if (Image is ImageBrush brush)
-        {
-            brush.ImageSource = source;
-        }
-
-        if (source is null)
-        {
-            VisualStateManager.GoToState(this, UnloadedState, true);
-        }
-        else
-        {
-            // https://learn.microsoft.com/en-us/windows/uwp/debug-test-perf/optimize-animations-and-media#optimize-image-resources
-            source.UriSource = uri;
-            VisualStateManager.GoToState(this, LoadedState, true);
-        }
-    }
-
-    private void AttachPlaceholderSource(BitmapImage? source, Uri? uri)
-    {
-        if (PlaceholderImage is Microsoft.UI.Xaml.Controls.Image image)
-        {
-            image.Source = source;
-        }
-        else if (PlaceholderImage is ImageBrush brush)
-        {
-            brush.ImageSource = source;
-        }
-
-        if (source is null)
-        {
-            VisualStateManager.GoToState(this, UnloadedState, true);
-        }
-        else
-        {
-            // https://learn.microsoft.com/en-us/windows/uwp/debug-test-perf/optimize-animations-and-media#optimize-image-resources
-            source.UriSource = uri;
-            VisualStateManager.GoToState(this, LoadedState, true);
-        }
-    }
-
-    private async void SetSource(object? source)
-    {
-        if (!IsInitialized)
-        {
-            return;
-        }
-
-        tokenSource?.Cancel();
-        tokenSource = new CancellationTokenSource();
-
-        AttachSource(default, default);
-
-        if (source is null)
-        {
-            return;
-        }
-
-        VisualStateManager.GoToState(this, LoadingState, true);
-
-        if (source as Uri is not { } uri)
-        {
-            string? url = source as string ?? source.ToString();
-            if (!Uri.TryCreate(url, UriKind.RelativeOrAbsolute, out uri))
-            {
-                VisualStateManager.GoToState(this, FailedState, true);
-                return;
-            }
-        }
-
-        if (!IsHttpUri(uri) && !uri.IsAbsoluteUri)
-        {
-            uri = new Uri("ms-appx:///" + uri.OriginalString.TrimStart('/'));
-        }
-
-        try
-        {
-            await LoadImageAsync(uri, tokenSource.Token).ConfigureAwait(true);
-        }
-        catch (Exception ex)
-        {
-            SetPlaceholderSource(PlaceholderSource);
-
-            if (ex is OperationCanceledException)
-            {
-                // nothing to do as cancellation has been requested.
-            }
-            else
-            {
-                VisualStateManager.GoToState(this, FailedState, true);
-            }
-        }
-    }
-
-    private async void SetPlaceholderSource(object? source)
-    {
-        if (!IsInitialized)
-        {
-            return;
-        }
-
-        tokenSource?.Cancel();
-        tokenSource = new();
-
-        AttachPlaceholderSource(default, default);
-
-        if (source is null)
-        {
-            return;
-        }
-
-        if (source as Uri is not { } uri)
-        {
-            string? url = source as string ?? source.ToString();
-            if (!Uri.TryCreate(url, UriKind.RelativeOrAbsolute, out uri))
-            {
-                return;
-            }
-        }
-
-        if (!IsHttpUri(uri) && !uri.IsAbsoluteUri)
-        {
-            uri = new Uri("ms-appx:///" + uri.OriginalString.TrimStart('/'));
-        }
-
-        try
-        {
-            if (uri is null)
-            {
-                return;
-            }
-
-            Uri? actualUri = await ProvideCachedResourceAsync(uri, tokenSource.Token).ConfigureAwait(true);
-
-            ArgumentNullException.ThrowIfNull(tokenSource);
-            if (!tokenSource.IsCancellationRequested)
-            {
-                // Only attach our image if we still have a valid request.
-                AttachPlaceholderSource(new BitmapImage(), actualUri);
-            }
-        }
-        catch (OperationCanceledException)
-        {
-            // nothing to do as cancellation has been requested.
-        }
-        catch
-        {
-        }
-    }
-
-    private async Task LoadImageAsync(Uri imageUri, CancellationToken token)
-    {
-        if (imageUri is null)
-        {
-            return;
-        }
-
-        Uri? actualUri = await ProvideCachedResourceAsync(imageUri, token).ConfigureAwait(true);
-
-        ArgumentNullException.ThrowIfNull(tokenSource);
-        if (!tokenSource.IsCancellationRequested)
-        {
-            // Only attach our image if we still have a valid request.
-            AttachSource(new BitmapImage(), actualUri);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Text/DescriptionTextBlock.cs b/src/Snap.Hutao/Snap.Hutao/Control/Text/DescriptionTextBlock.cs
index 78de940b..554f441c 100644
--- a/src/Snap.Hutao/Snap.Hutao/Control/Text/DescriptionTextBlock.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Control/Text/DescriptionTextBlock.cs
@@ -5,11 +5,11 @@ using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Documents;
 using Microsoft.UI.Xaml.Media;
-using Snap.Hutao.Control.Extension;
 using Snap.Hutao.Control.Media;
 using Snap.Hutao.Control.Text.Syntax.MiHoYo;
 using Snap.Hutao.Control.Theme;
 using Snap.Hutao.Metadata;
+using Snap.Hutao.UI.Xaml;
 using Windows.Foundation;
 using Windows.UI;
 
diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Text/HtmlDescriptionTextBlock.cs b/src/Snap.Hutao/Snap.Hutao/Control/Text/HtmlDescriptionTextBlock.cs
index adcc0690..ef81c83a 100644
--- a/src/Snap.Hutao/Snap.Hutao/Control/Text/HtmlDescriptionTextBlock.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Control/Text/HtmlDescriptionTextBlock.cs
@@ -6,9 +6,9 @@ using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Documents;
 using Microsoft.UI.Xaml.Media;
-using Snap.Hutao.Control.Extension;
 using Snap.Hutao.Control.Media;
 using Snap.Hutao.Control.Theme;
+using Snap.Hutao.UI.Xaml;
 using Windows.Foundation;
 using Windows.UI;
 
diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Theme/InfoBarOverride.xaml b/src/Snap.Hutao/Snap.Hutao/Control/Theme/InfoBarOverride.xaml
index 74e9a9fd..52802302 100644
--- a/src/Snap.Hutao/Snap.Hutao/Control/Theme/InfoBarOverride.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/Control/Theme/InfoBarOverride.xaml
@@ -1,7 +1,7 @@
 <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">
+    xmlns:shuxc="using:Snap.Hutao.UI.Xaml.Control">
     <ResourceDictionary.ThemeDictionaries>
         <ResourceDictionary x:Key="Light">
             <AcrylicBrush
@@ -49,9 +49,10 @@
         </ResourceDictionary>
     </ResourceDictionary.ThemeDictionaries>
 
+    <x:Double x:Key="InfoBarIconFontSize">20</x:Double>
+
     <Thickness x:Key="InfoBarIconMargin">19,16,19,16</Thickness>
     <Thickness x:Key="InfoBarContentRootPadding">0,0,0,0</Thickness>
-    <x:Double x:Key="InfoBarIconFontSize">20</x:Double>
 
     <Thickness x:Key="InfoBarTitleHorizontalOrientationMargin">0,0,0,0</Thickness>
     <Thickness x:Key="InfoBarMessageHorizontalOrientationMargin">12,0,0,0</Thickness>
@@ -60,7 +61,7 @@
 
     <!--  TODO: When will DefaultInfoBarStyle added  -->
     <Style TargetType="InfoBar">
-        <Setter Property="shch:InfoBarHelper.IsTextSelectionEnabled" Value="False"/>
+        <Setter Property="shuxc:InfoBarHelper.IsTextSelectionEnabled" Value="False"/>
         <Setter Property="FontFamily" Value="{StaticResource MiSans}"/>
         <Setter Property="IsTabStop" Value="False"/>
         <Setter Property="CloseButtonStyle" Value="{StaticResource InfoBarCloseButtonStyle}"/>
@@ -144,7 +145,7 @@
                                     Foreground="{ThemeResource InfoBarTitleForeground}"
                                     InfoBarPanel.HorizontalOrientationMargin="{StaticResource InfoBarTitleHorizontalOrientationMargin}"
                                     InfoBarPanel.VerticalOrientationMargin="{StaticResource InfoBarTitleVerticalOrientationMargin}"
-                                    IsTextSelectionEnabled="{TemplateBinding shch:InfoBarHelper.IsTextSelectionEnabled}"
+                                    IsTextSelectionEnabled="{TemplateBinding shuxc:InfoBarHelper.IsTextSelectionEnabled}"
                                     Text="{TemplateBinding Title}"
                                     TextWrapping="WrapWholeWords"/>
                                 <TextBlock
@@ -154,7 +155,7 @@
                                     Foreground="{ThemeResource InfoBarMessageForeground}"
                                     InfoBarPanel.HorizontalOrientationMargin="{StaticResource InfoBarMessageHorizontalOrientationMargin}"
                                     InfoBarPanel.VerticalOrientationMargin="{StaticResource InfoBarMessageVerticalOrientationMargin}"
-                                    IsTextSelectionEnabled="{TemplateBinding shch:InfoBarHelper.IsTextSelectionEnabled}"
+                                    IsTextSelectionEnabled="{TemplateBinding shuxc:InfoBarHelper.IsTextSelectionEnabled}"
                                     Text="{TemplateBinding Message}"
                                     TextWrapping="WrapWholeWords"/>
                                 <ContentPresenter
diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Theme/ScrollViewer.xaml b/src/Snap.Hutao/Snap.Hutao/Control/Theme/ScrollViewer.xaml
index 0395733d..10d73953 100644
--- a/src/Snap.Hutao/Snap.Hutao/Control/Theme/ScrollViewer.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/Control/Theme/ScrollViewer.xaml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="utf-8" ?>
 <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">
+    xmlns:shuxc="using:Snap.Hutao.UI.Xaml.Control">
     <Style x:Key="TwoPanelScrollViewerStyle" TargetType="ScrollViewer">
         <Setter Property="HorizontalScrollMode" Value="Auto"/>
         <Setter Property="VerticalScrollMode" Value="Auto"/>
@@ -46,7 +45,7 @@
                                     <ColumnDefinition Width="Auto"/>
                                 </Grid.ColumnDefinitions>
                                 <ScrollContentPresenter x:Name="ScrollContentPresenter" ContentTemplate="{TemplateBinding ContentTemplate}"/>
-                                <ContentPresenter Grid.Column="1" Content="{Binding Path=(shch:ScrollViewerHelper.RightPanel), RelativeSource={RelativeSource Mode=TemplatedParent}}"/>
+                                <ContentPresenter Grid.Column="1" Content="{Binding Path=(shuxc:ScrollViewerHelper.RightPanel), RelativeSource={RelativeSource Mode=TemplatedParent}}"/>
                             </Grid>
 
                             <Grid Grid.RowSpan="2" Grid.ColumnSpan="2"/>
diff --git a/src/Snap.Hutao/Snap.Hutao/Core/Windowing/NotifyIcon/NotifyIconContextMenu.xaml.cs b/src/Snap.Hutao/Snap.Hutao/Core/Windowing/NotifyIcon/NotifyIconContextMenu.xaml.cs
index de02e04f..bcffe213 100644
--- a/src/Snap.Hutao/Snap.Hutao/Core/Windowing/NotifyIcon/NotifyIconContextMenu.xaml.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Core/Windowing/NotifyIcon/NotifyIconContextMenu.xaml.cs
@@ -2,7 +2,7 @@
 // Licensed under the MIT license.
 
 using Microsoft.UI.Xaml.Controls;
-using Snap.Hutao.Control.Extension;
+using Snap.Hutao.UI.Xaml;
 using Snap.Hutao.ViewModel;
 
 namespace Snap.Hutao.Core.Windowing.NotifyIcon;
diff --git a/src/Snap.Hutao/Snap.Hutao/LaunchGameWindow.xaml.cs b/src/Snap.Hutao/Snap.Hutao/LaunchGameWindow.xaml.cs
index 02b19c8c..fd222923 100644
--- a/src/Snap.Hutao/Snap.Hutao/LaunchGameWindow.xaml.cs
+++ b/src/Snap.Hutao/Snap.Hutao/LaunchGameWindow.xaml.cs
@@ -3,9 +3,9 @@
 
 using Microsoft.UI.Windowing;
 using Microsoft.UI.Xaml;
-using Snap.Hutao.Control.Extension;
 using Snap.Hutao.Core.Windowing;
 using Snap.Hutao.Core.Windowing.Abstraction;
+using Snap.Hutao.UI.Xaml;
 using Snap.Hutao.ViewModel.Game;
 using Snap.Hutao.Win32.UI.WindowsAndMessaging;
 using Windows.Graphics;
diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx
index e10ed543..bd8ee11c 100644
--- a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx
+++ b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx
@@ -1094,6 +1094,9 @@
   <data name="ServiceUserProcessCookieRequestUserInfoFailed" xml:space="preserve">
     <value>输入的 Cookie 无法获取用户信息</value>
   </data>
+  <data name="UIXamlControlCachedImageCopyImage" xml:space="preserve">
+    <value>复制图像</value>
+  </data>
   <data name="ViewAchievementHeader" xml:space="preserve">
     <value>成就管理</value>
   </data>
diff --git a/src/Snap.Hutao/Snap.Hutao/Service/Game/Launching/Handler/LaunchExecutionEnsureGameResourceHandler.cs b/src/Snap.Hutao/Snap.Hutao/Service/Game/Launching/Handler/LaunchExecutionEnsureGameResourceHandler.cs
index 9047e496..127327f3 100644
--- a/src/Snap.Hutao/Snap.Hutao/Service/Game/Launching/Handler/LaunchExecutionEnsureGameResourceHandler.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Service/Game/Launching/Handler/LaunchExecutionEnsureGameResourceHandler.cs
@@ -2,13 +2,13 @@
 // Licensed under the MIT license.
 
 using Microsoft.Win32.SafeHandles;
-using Snap.Hutao.Control.Extension;
 using Snap.Hutao.Core.Setting;
 using Snap.Hutao.Factory.ContentDialog;
 using Snap.Hutao.Factory.Progress;
 using Snap.Hutao.Model.Intrinsic;
 using Snap.Hutao.Service.Game.Configuration;
 using Snap.Hutao.Service.Game.Package;
+using Snap.Hutao.UI.Xaml.Control;
 using Snap.Hutao.View.Dialog;
 using Snap.Hutao.Web.Hoyolab.HoyoPlay.Connect;
 using Snap.Hutao.Web.Hoyolab.HoyoPlay.Connect.ChannelSDK;
diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Extension/CommandInvocation.cs b/src/Snap.Hutao/Snap.Hutao/UI/Input/CommandInvocation.cs
similarity index 90%
rename from src/Snap.Hutao/Snap.Hutao/Control/Extension/CommandInvocation.cs
rename to src/Snap.Hutao/Snap.Hutao/UI/Input/CommandInvocation.cs
index 41f83527..109e5775 100644
--- a/src/Snap.Hutao/Snap.Hutao/Control/Extension/CommandInvocation.cs
+++ b/src/Snap.Hutao/Snap.Hutao/UI/Input/CommandInvocation.cs
@@ -1,7 +1,7 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
-namespace Snap.Hutao.Control.Extension;
+namespace Snap.Hutao.UI.Input;
 
 internal static class CommandInvocation
 {
diff --git a/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Behavior/InvokeCommandOnLoadedBehavior.cs b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Behavior/InvokeCommandOnLoadedBehavior.cs
index 5205eeab..5fcd1382 100644
--- a/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Behavior/InvokeCommandOnLoadedBehavior.cs
+++ b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Behavior/InvokeCommandOnLoadedBehavior.cs
@@ -3,7 +3,7 @@
 
 using CommunityToolkit.WinUI.Behaviors;
 using Microsoft.UI.Xaml;
-using Snap.Hutao.Control.Extension;
+using Snap.Hutao.UI.Input;
 
 namespace Snap.Hutao.UI.Xaml.Behavior;
 
diff --git a/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Behavior/PeriodicInvokeCommandOrOnActualThemeChangedBehavior.cs b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Behavior/PeriodicInvokeCommandOrOnActualThemeChangedBehavior.cs
index 452b51f8..0bdb3803 100644
--- a/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Behavior/PeriodicInvokeCommandOrOnActualThemeChangedBehavior.cs
+++ b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Behavior/PeriodicInvokeCommandOrOnActualThemeChangedBehavior.cs
@@ -3,7 +3,7 @@
 
 using CommunityToolkit.WinUI.Behaviors;
 using Microsoft.UI.Xaml;
-using Snap.Hutao.Control.Extension;
+using Snap.Hutao.UI.Input;
 
 namespace Snap.Hutao.UI.Xaml.Behavior;
 
diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Collection/Selector/ComboBox2.cs b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Control/ComboBox2.cs
similarity index 74%
rename from src/Snap.Hutao/Snap.Hutao/Control/Collection/Selector/ComboBox2.cs
rename to src/Snap.Hutao/Snap.Hutao/UI/Xaml/Control/ComboBox2.cs
index 03ab717f..4e54a316 100644
--- a/src/Snap.Hutao/Snap.Hutao/Control/Collection/Selector/ComboBox2.cs
+++ b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Control/ComboBox2.cs
@@ -5,19 +5,18 @@ using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Data;
 
-namespace Snap.Hutao.Control.Collection.Selector;
+namespace Snap.Hutao.UI.Xaml.Control;
 
 [DependencyProperty("EnableMemberPath", typeof(string))]
 internal sealed partial class ComboBox2 : ComboBox
 {
     protected override void PrepareContainerForItemOverride(DependencyObject element, object item)
     {
+        base.PrepareContainerForItemOverride(element, item);
+
         if (element is ComboBoxItem comboBoxItem)
         {
-            Binding binding = new() { Path = new(EnableMemberPath) };
-            comboBoxItem.SetBinding(IsEnabledProperty, binding);
+            comboBoxItem.SetBinding(IsEnabledProperty, new Binding() { Path = new(EnableMemberPath) });
         }
-
-        base.PrepareContainerForItemOverride(element, item);
     }
 }
\ No newline at end of file
diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Extension/ContentDialogExtension.cs b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Control/ContentDialogExtension.cs
similarity index 68%
rename from src/Snap.Hutao/Snap.Hutao/Control/Extension/ContentDialogExtension.cs
rename to src/Snap.Hutao/Snap.Hutao/UI/Xaml/Control/ContentDialogExtension.cs
index 4d85edba..97dbf566 100644
--- a/src/Snap.Hutao/Snap.Hutao/Control/Extension/ContentDialogExtension.cs
+++ b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Control/ContentDialogExtension.cs
@@ -3,7 +3,7 @@
 
 using Microsoft.UI.Xaml.Controls;
 
-namespace Snap.Hutao.Control.Extension;
+namespace Snap.Hutao.UI.Xaml.Control;
 
 /// <summary>
 /// 对话框扩展
@@ -17,13 +17,13 @@ internal static class ContentDialogExtension
     /// <param name="contentDialog">对话框</param>
     /// <param name="taskContext">任务上下文</param>
     /// <returns>用于恢复用户交互</returns>
-    public static async ValueTask<ContentDialogHideToken> BlockAsync(this ContentDialog contentDialog, ITaskContext taskContext)
+    public static async ValueTask<ContentDialogScope> BlockAsync(this ContentDialog contentDialog, ITaskContext taskContext)
     {
         await taskContext.SwitchToMainThreadAsync();
 
         // E_ASYNC_OPERATION_NOT_STARTED 0x80000019
         // Only a single ContentDialog can be open at any time.
-        contentDialog.ShowAsync().AsTask().SafeForget();
-        return new ContentDialogHideToken(contentDialog, taskContext);
+        _ = contentDialog.ShowAsync();
+        return new ContentDialogScope(contentDialog, taskContext);
     }
 }
\ No newline at end of file
diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Extension/ContentDialogHideToken.cs b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Control/ContentDialogScope.cs
similarity index 82%
rename from src/Snap.Hutao/Snap.Hutao/Control/Extension/ContentDialogHideToken.cs
rename to src/Snap.Hutao/Snap.Hutao/UI/Xaml/Control/ContentDialogScope.cs
index 2b5f14af..c80c5642 100644
--- a/src/Snap.Hutao/Snap.Hutao/Control/Extension/ContentDialogHideToken.cs
+++ b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Control/ContentDialogScope.cs
@@ -3,9 +3,9 @@
 
 using Microsoft.UI.Xaml.Controls;
 
-namespace Snap.Hutao.Control.Extension;
+namespace Snap.Hutao.UI.Xaml.Control;
 
-internal struct ContentDialogHideToken : IDisposable, IAsyncDisposable
+internal struct ContentDialogScope : IDisposable, IAsyncDisposable
 {
     private readonly ContentDialog contentDialog;
     private readonly ITaskContext taskContext;
@@ -13,7 +13,7 @@ internal struct ContentDialogHideToken : IDisposable, IAsyncDisposable
     private bool disposing = false;
     private bool disposed = false;
 
-    public ContentDialogHideToken(ContentDialog contentDialog, ITaskContext taskContext)
+    public ContentDialogScope(ContentDialog contentDialog, ITaskContext taskContext)
     {
         this.contentDialog = contentDialog;
         this.taskContext = taskContext;
diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Helper/InfoBarHelper.cs b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Control/InfoBarHelper.cs
similarity index 90%
rename from src/Snap.Hutao/Snap.Hutao/Control/Helper/InfoBarHelper.cs
rename to src/Snap.Hutao/Snap.Hutao/UI/Xaml/Control/InfoBarHelper.cs
index 8f69a804..5e754571 100644
--- a/src/Snap.Hutao/Snap.Hutao/Control/Helper/InfoBarHelper.cs
+++ b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Control/InfoBarHelper.cs
@@ -4,7 +4,7 @@
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 
-namespace Snap.Hutao.Control.Helper;
+namespace Snap.Hutao.UI.Xaml.Control;
 
 [SuppressMessage("", "SH001")]
 [DependencyProperty("IsTextSelectionEnabled", typeof(bool), false, IsAttached = true, AttachedType = typeof(InfoBar))]
diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Helper/NavigationViewHelper.cs b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Control/NavigationViewHelper.cs
similarity index 58%
rename from src/Snap.Hutao/Snap.Hutao/Control/Helper/NavigationViewHelper.cs
rename to src/Snap.Hutao/Snap.Hutao/UI/Xaml/Control/NavigationViewHelper.cs
index 38a54492..ff121a5c 100644
--- a/src/Snap.Hutao/Snap.Hutao/Control/Helper/NavigationViewHelper.cs
+++ b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Control/NavigationViewHelper.cs
@@ -5,7 +5,7 @@ using CommunityToolkit.WinUI;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 
-namespace Snap.Hutao.Control.Helper;
+namespace Snap.Hutao.UI.Xaml.Control;
 
 [SuppressMessage("", "SH001")]
 [DependencyProperty("PaneCornerRadius", typeof(CornerRadius), default, nameof(OnPaneCornerRadiusChanged), IsAttached = true, AttachedType = typeof(NavigationView))]
@@ -18,22 +18,27 @@ public sealed partial class NavigationViewHelper
 
         if (navigationView.IsLoaded)
         {
-            SetNavigationViewPaneCornerRadius(navigationView, newValue);
+            SetLoadedNavigationViewPaneCornerRadius(navigationView, newValue);
             return;
         }
 
-        navigationView.Loaded += (s, e) =>
-        {
-            NavigationView loadedNavigationView = (NavigationView)s;
-            SetNavigationViewPaneCornerRadius(loadedNavigationView, newValue);
-        };
+        navigationView.Loaded += SetNavigationViewPaneCornerRadius;
     }
 
-    private static void SetNavigationViewPaneCornerRadius(NavigationView navigationView, CornerRadius value)
+    private static void SetNavigationViewPaneCornerRadius(object sender, RoutedEventArgs args)
+    {
+        NavigationView navigationView = (NavigationView)sender;
+        CornerRadius value = GetPaneCornerRadius(navigationView);
+        SetLoadedNavigationViewPaneCornerRadius(navigationView, value);
+
+        navigationView.Loaded -= SetNavigationViewPaneCornerRadius;
+    }
+
+    private static void SetLoadedNavigationViewPaneCornerRadius(NavigationView navigationView, CornerRadius value)
     {
         if (navigationView.FindDescendant("RootSplitView") is SplitView splitView)
         {
             splitView.CornerRadius = value;
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Helper/ScrollViewerHelper.cs b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Control/ScrollViewerHelper.cs
similarity index 89%
rename from src/Snap.Hutao/Snap.Hutao/Control/Helper/ScrollViewerHelper.cs
rename to src/Snap.Hutao/Snap.Hutao/UI/Xaml/Control/ScrollViewerHelper.cs
index b8cb9aff..e76d9d4c 100644
--- a/src/Snap.Hutao/Snap.Hutao/Control/Helper/ScrollViewerHelper.cs
+++ b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Control/ScrollViewerHelper.cs
@@ -4,7 +4,7 @@
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 
-namespace Snap.Hutao.Control.Helper;
+namespace Snap.Hutao.UI.Xaml.Control;
 
 [SuppressMessage("", "SH001")]
 [DependencyProperty("RightPanel", typeof(UIElement), IsAttached = true, AttachedType = typeof(ScrollViewer))]
diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Helper/SettingsExpanderHelper.cs b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Control/SettingsExpanderHelper.cs
similarity index 95%
rename from src/Snap.Hutao/Snap.Hutao/Control/Helper/SettingsExpanderHelper.cs
rename to src/Snap.Hutao/Snap.Hutao/UI/Xaml/Control/SettingsExpanderHelper.cs
index f68c70ce..6e882410 100644
--- a/src/Snap.Hutao/Snap.Hutao/Control/Helper/SettingsExpanderHelper.cs
+++ b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Control/SettingsExpanderHelper.cs
@@ -4,7 +4,7 @@
 using CommunityToolkit.WinUI.Controls;
 using Microsoft.UI.Xaml;
 
-namespace Snap.Hutao.Control.Helper;
+namespace Snap.Hutao.UI.Xaml.Control;
 
 [SuppressMessage("", "SH001")]
 [DependencyProperty("IsItemsEnabled", typeof(bool), true, nameof(OnIsItemsEnabledChanged), IsAttached = true, AttachedType = typeof(SettingsExpander))]
diff --git a/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Control/Tokenizing/AutoSuggestTokenBox.cs b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Control/Tokenizing/AutoSuggestTokenBox.cs
index d52dac2d..637903c5 100644
--- a/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Control/Tokenizing/AutoSuggestTokenBox.cs
+++ b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Control/Tokenizing/AutoSuggestTokenBox.cs
@@ -6,7 +6,7 @@ using CommunityToolkit.WinUI.Controls;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Controls.Primitives;
-using Snap.Hutao.Control.Extension;
+using Snap.Hutao.UI.Input;
 using System.Collections;
 
 namespace Snap.Hutao.UI.Xaml.Control.Tokenizing;
diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Collection/AdvancedCollectionView/AdvancedCollectionView.cs b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Data/AdvancedCollectionView.cs
similarity index 99%
rename from src/Snap.Hutao/Snap.Hutao/Control/Collection/AdvancedCollectionView/AdvancedCollectionView.cs
rename to src/Snap.Hutao/Snap.Hutao/UI/Xaml/Data/AdvancedCollectionView.cs
index a0bf2e4a..5b789e8a 100644
--- a/src/Snap.Hutao/Snap.Hutao/Control/Collection/AdvancedCollectionView/AdvancedCollectionView.cs
+++ b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Data/AdvancedCollectionView.cs
@@ -13,7 +13,7 @@ using Windows.Foundation;
 using Windows.Foundation.Collections;
 using NotifyCollectionChangedAction = System.Collections.Specialized.NotifyCollectionChangedAction;
 
-namespace Snap.Hutao.Control.Collection.AdvancedCollectionView;
+namespace Snap.Hutao.UI.Xaml.Data;
 
 internal sealed class AdvancedCollectionView<T> : IAdvancedCollectionView<T>, INotifyPropertyChanged, ISupportIncrementalLoading, IComparer<object>
     where T : class
diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Collection/AdvancedCollectionView/IAdvancedCollectionView.cs b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Data/IAdvancedCollectionView.cs
similarity index 96%
rename from src/Snap.Hutao/Snap.Hutao/Control/Collection/AdvancedCollectionView/IAdvancedCollectionView.cs
rename to src/Snap.Hutao/Snap.Hutao/UI/Xaml/Data/IAdvancedCollectionView.cs
index e8fd0810..ffcb74c4 100644
--- a/src/Snap.Hutao/Snap.Hutao/Control/Collection/AdvancedCollectionView/IAdvancedCollectionView.cs
+++ b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Data/IAdvancedCollectionView.cs
@@ -5,7 +5,7 @@ using CommunityToolkit.WinUI.Collections;
 using Microsoft.UI.Xaml.Data;
 using System.Collections;
 
-namespace Snap.Hutao.Control.Collection.AdvancedCollectionView;
+namespace Snap.Hutao.UI.Xaml.Data;
 
 internal interface IAdvancedCollectionView<T> : ICollectionView, IEnumerable
     where T : class
diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Collection/AdvancedCollectionView/VectorChangedEventArgs.cs b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Data/VectorChangedEventArgs.cs
similarity index 87%
rename from src/Snap.Hutao/Snap.Hutao/Control/Collection/AdvancedCollectionView/VectorChangedEventArgs.cs
rename to src/Snap.Hutao/Snap.Hutao/UI/Xaml/Data/VectorChangedEventArgs.cs
index c5cb362b..575cef19 100644
--- a/src/Snap.Hutao/Snap.Hutao/Control/Collection/AdvancedCollectionView/VectorChangedEventArgs.cs
+++ b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Data/VectorChangedEventArgs.cs
@@ -3,7 +3,7 @@
 
 using Windows.Foundation.Collections;
 
-namespace Snap.Hutao.Control.Collection.AdvancedCollectionView;
+namespace Snap.Hutao.UI.Xaml.Data;
 
 internal sealed class VectorChangedEventArgs : IVectorChangedEventArgs
 {
diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Extension/DependencyObjectExtension.cs b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/DependencyObjectExtension.cs
similarity index 90%
rename from src/Snap.Hutao/Snap.Hutao/Control/Extension/DependencyObjectExtension.cs
rename to src/Snap.Hutao/Snap.Hutao/UI/Xaml/DependencyObjectExtension.cs
index 61e5dddc..5cf832f6 100644
--- a/src/Snap.Hutao/Snap.Hutao/Control/Extension/DependencyObjectExtension.cs
+++ b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/DependencyObjectExtension.cs
@@ -4,7 +4,7 @@
 using Microsoft.UI.Xaml;
 using System.Runtime.CompilerServices;
 
-namespace Snap.Hutao.Control.Extension;
+namespace Snap.Hutao.UI.Xaml;
 
 internal static class DependencyObjectExtension
 {
diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Extension/FrameworkElementExtension.cs b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/FrameworkElementExtension.cs
similarity index 97%
rename from src/Snap.Hutao/Snap.Hutao/Control/Extension/FrameworkElementExtension.cs
rename to src/Snap.Hutao/Snap.Hutao/UI/Xaml/FrameworkElementExtension.cs
index fb2c6e34..b89dc686 100644
--- a/src/Snap.Hutao/Snap.Hutao/Control/Extension/FrameworkElementExtension.cs
+++ b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/FrameworkElementExtension.cs
@@ -3,7 +3,7 @@
 
 using Microsoft.UI.Xaml;
 
-namespace Snap.Hutao.Control.Extension;
+namespace Snap.Hutao.UI.Xaml;
 
 internal static class FrameworkElementExtension
 {
diff --git a/src/Snap.Hutao/Snap.Hutao/UI/Xaml/FrameworkElementHelper.cs b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/FrameworkElementHelper.cs
new file mode 100644
index 00000000..33eab965
--- /dev/null
+++ b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/FrameworkElementHelper.cs
@@ -0,0 +1,18 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+using Microsoft.UI.Xaml;
+
+namespace Snap.Hutao.UI.Xaml;
+
+[SuppressMessage("", "SH001")]
+[DependencyProperty("SquareLength", typeof(double), 0D, nameof(OnSquareLengthChanged), IsAttached = true, AttachedType = typeof(FrameworkElement))]
+public sealed partial class FrameworkElementHelper
+{
+    private static void OnSquareLengthChanged(DependencyObject dp, DependencyPropertyChangedEventArgs e)
+    {
+        FrameworkElement element = (FrameworkElement)dp;
+        element.Width = (double)e.NewValue;
+        element.Height = (double)e.NewValue;
+    }
+}
\ No newline at end of file
diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Helper/UIElementHelper.cs b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/UIElementHelper.cs
similarity index 96%
rename from src/Snap.Hutao/Snap.Hutao/Control/Helper/UIElementHelper.cs
rename to src/Snap.Hutao/Snap.Hutao/UI/Xaml/UIElementHelper.cs
index 988bfe5d..e506369c 100644
--- a/src/Snap.Hutao/Snap.Hutao/Control/Helper/UIElementHelper.cs
+++ b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/UIElementHelper.cs
@@ -3,7 +3,7 @@
 
 using Microsoft.UI.Xaml;
 
-namespace Snap.Hutao.Control.Helper;
+namespace Snap.Hutao.UI.Xaml;
 
 [SuppressMessage("", "SH001")]
 [DependencyProperty("VisibilityObject", typeof(object), null, nameof(OnVisibilityObjectChanged), IsAttached = true, AttachedType = typeof(UIElement))]
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Card/AchievementCard.xaml.cs b/src/Snap.Hutao/Snap.Hutao/View/Card/AchievementCard.xaml.cs
index cfdf65ee..634059ce 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Card/AchievementCard.xaml.cs
+++ b/src/Snap.Hutao/Snap.Hutao/View/Card/AchievementCard.xaml.cs
@@ -2,7 +2,7 @@
 // Licensed under the MIT license.
 
 using Microsoft.UI.Xaml.Controls;
-using Snap.Hutao.Control.Extension;
+using Snap.Hutao.UI.Xaml;
 
 namespace Snap.Hutao.View.Card;
 
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Card/DailyNoteCard.xaml.cs b/src/Snap.Hutao/Snap.Hutao/View/Card/DailyNoteCard.xaml.cs
index c73dd9f1..6b625ed1 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Card/DailyNoteCard.xaml.cs
+++ b/src/Snap.Hutao/Snap.Hutao/View/Card/DailyNoteCard.xaml.cs
@@ -2,7 +2,7 @@
 // Licensed under the MIT license.
 
 using Microsoft.UI.Xaml.Controls;
-using Snap.Hutao.Control.Extension;
+using Snap.Hutao.UI.Xaml;
 
 namespace Snap.Hutao.View.Card;
 
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Card/GachaStatisticsCard.xaml.cs b/src/Snap.Hutao/Snap.Hutao/View/Card/GachaStatisticsCard.xaml.cs
index 190fcc8c..6283a205 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Card/GachaStatisticsCard.xaml.cs
+++ b/src/Snap.Hutao/Snap.Hutao/View/Card/GachaStatisticsCard.xaml.cs
@@ -2,7 +2,7 @@
 // Licensed under the MIT license.
 
 using Microsoft.UI.Xaml.Controls;
-using Snap.Hutao.Control.Extension;
+using Snap.Hutao.UI.Xaml;
 
 namespace Snap.Hutao.View.Card;
 
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Card/LaunchGameCard.xaml.cs b/src/Snap.Hutao/Snap.Hutao/View/Card/LaunchGameCard.xaml.cs
index d2fc5cc4..25fec27f 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Card/LaunchGameCard.xaml.cs
+++ b/src/Snap.Hutao/Snap.Hutao/View/Card/LaunchGameCard.xaml.cs
@@ -2,7 +2,7 @@
 // Licensed under the MIT license.
 
 using Microsoft.UI.Xaml.Controls;
-using Snap.Hutao.Control.Extension;
+using Snap.Hutao.UI.Xaml;
 
 namespace Snap.Hutao.View.Card;
 
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 7d7dccaa..aa2078d4 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Card/Primitive/CardBlock.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Card/Primitive/CardBlock.xaml
@@ -4,13 +4,13 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:shch="using:Snap.Hutao.Control.Helper"
     xmlns:shci="using:Snap.Hutao.Control.Image"
+    xmlns:shux="using:Snap.Hutao.UI.Xaml"
     Style="{ThemeResource GridCardStyle}"
     mc:Ignorable="d">
 
     <StackPanel VerticalAlignment="Center">
-        <shci:CachedImage shch:FrameworkElementHelper.SquareLength="{x:Bind IconSquareLength}" Source="{x:Bind ImageSource, Mode=OneWay}"/>
+        <shci:CachedImage shux:FrameworkElementHelper.SquareLength="{x:Bind IconSquareLength}" Source="{x:Bind ImageSource, Mode=OneWay}"/>
         <TextBlock
             HorizontalAlignment="Center"
             VerticalAlignment="Center"
@@ -21,7 +21,7 @@
         Margin="8"
         HorizontalAlignment="Right"
         VerticalAlignment="Top"
-        shch:FrameworkElementHelper.SquareLength="8"
+        shux:FrameworkElementHelper.SquareLength="8"
         Style="{ThemeResource AttentionDotInfoBadgeStyle}"
         Visibility="{x:Bind IsDotVisible, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}"/>
 </Grid>
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Card/Primitive/CardBlock.xaml.cs b/src/Snap.Hutao/Snap.Hutao/View/Card/Primitive/CardBlock.xaml.cs
index 631c3fdb..51108dbc 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Card/Primitive/CardBlock.xaml.cs
+++ b/src/Snap.Hutao/Snap.Hutao/View/Card/Primitive/CardBlock.xaml.cs
@@ -14,6 +14,7 @@ internal sealed partial class CardBlock : Grid
 {
     public CardBlock()
     {
+        // TODO: Convert to custom control
         InitializeComponent();
     }
 }
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Control/AnnouncementContentViewer.xaml.cs b/src/Snap.Hutao/Snap.Hutao/View/Control/AnnouncementContentViewer.xaml.cs
index 4fbc1f56..5ebff26e 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Control/AnnouncementContentViewer.xaml.cs
+++ b/src/Snap.Hutao/Snap.Hutao/View/Control/AnnouncementContentViewer.xaml.cs
@@ -4,9 +4,9 @@
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.Web.WebView2.Core;
-using Snap.Hutao.Control.Extension;
 using Snap.Hutao.Control.Theme;
 using Snap.Hutao.Web.Hoyolab.Hk4e.Common.Announcement;
+using Snap.Hutao.Web.WebView2;
 using System.Collections.Frozen;
 using System.Text;
 using System.Text.RegularExpressions;
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Control/HutaoStatisticsCard.xaml b/src/Snap.Hutao/Snap.Hutao/View/Control/HutaoStatisticsCard.xaml
index 4143f0c3..8aa0014e 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Control/HutaoStatisticsCard.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Control/HutaoStatisticsCard.xaml
@@ -6,9 +6,9 @@
     xmlns:cwc="using:CommunityToolkit.WinUI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:shch="using:Snap.Hutao.Control.Helper"
     xmlns:shci="using:Snap.Hutao.Control.Image"
     xmlns:shcm="using:Snap.Hutao.Control.Markup"
+    xmlns:shux="using:Snap.Hutao.UI.Xaml"
     xmlns:shvcont="using:Snap.Hutao.View.Control"
     xmlns:shvg="using:Snap.Hutao.ViewModel.GachaLog"
     cw:Effects.Shadow="{ThemeResource CompatCardShadow}"
@@ -19,7 +19,7 @@
         <DataTemplate x:Key="GridTemplate" d:DataType="shvg:StatisticsItem">
             <shvcont:BottomTextControl Text="{Binding Count}" TextStyle="{StaticResource CaptionTextBlockStyle}">
                 <shvcont:ItemIcon
-                    shch:FrameworkElementHelper.SquareLength="40"
+                    shux:FrameworkElementHelper.SquareLength="40"
                     Icon="{Binding Icon}"
                     Quality="{Binding Quality}"/>
             </shvcont:BottomTextControl>
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Control/ItemIcon.xaml b/src/Snap.Hutao/Snap.Hutao/View/Control/ItemIcon.xaml
index 1f71de94..ad3a821f 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Control/ItemIcon.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Control/ItemIcon.xaml
@@ -4,17 +4,16 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:shch="using:Snap.Hutao.Control.Helper"
     xmlns:shci="using:Snap.Hutao.Control.Image"
     xmlns:shmmc="using:Snap.Hutao.Model.Metadata.Converter"
-    shch:FrameworkElementHelper.SquareLength="80"
+    xmlns:shux="using:Snap.Hutao.UI.Xaml"
+    shux:FrameworkElementHelper.SquareLength="80"
     mc:Ignorable="d">
     <UserControl.Resources>
         <shmmc:QualityConverter x:Key="QualityConverter"/>
     </UserControl.Resources>
     <Grid>
         <Grid CornerRadius="{StaticResource ControlCornerRadius}">
-            <!--  Disable some CachedImage's LazyLoading function here can increase response speed  -->
             <shci:CachedImage Source="{x:Bind Quality, Converter={StaticResource QualityConverter}, Mode=OneWay}"/>
             <shci:CachedImage Source="{StaticResource UI_ImgSign_ItemIcon}"/>
             <shci:CachedImage Source="{x:Bind Icon, Mode=OneWay}"/>
@@ -22,7 +21,7 @@
                 Margin="2"
                 HorizontalAlignment="Left"
                 VerticalAlignment="Top"
-                shch:FrameworkElementHelper.SquareLength="16"
+                shux:FrameworkElementHelper.SquareLength="16"
                 Source="{x:Bind Badge, Mode=OneWay}"/>
         </Grid>
     </Grid>
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Control/SkillPivot.xaml b/src/Snap.Hutao/Snap.Hutao/View/Control/SkillPivot.xaml
index d3ce34f5..4dec979a 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Control/SkillPivot.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Control/SkillPivot.xaml
@@ -5,9 +5,9 @@
     xmlns:cwc="using:CommunityToolkit.WinUI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:shch="using:Snap.Hutao.Control.Helper"
     xmlns:shci="using:Snap.Hutao.Control.Image"
     xmlns:shmmc="using:Snap.Hutao.Model.Metadata.Converter"
+    xmlns:shux="using:Snap.Hutao.UI.Xaml"
     mc:Ignorable="d">
 
     <UserControl.Resources>
@@ -19,7 +19,7 @@
 
         <DataTemplate x:Key="SkillHeaderTemplate">
             <StackPanel Background="Transparent" ToolTipService.ToolTip="{Binding Name}">
-                <shci:MonoChrome shch:FrameworkElementHelper.SquareLength="36" Source="{Binding Icon, Converter={StaticResource SkillIconConverter}}"/>
+                <shci:MonoChrome shux:FrameworkElementHelper.SquareLength="36" Source="{Binding Icon, Converter={StaticResource SkillIconConverter}}"/>
             </StackPanel>
         </DataTemplate>
     </UserControl.Resources>
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Control/StatisticsCard.xaml b/src/Snap.Hutao/Snap.Hutao/View/Control/StatisticsCard.xaml
index 61f9c7c5..b0e07cd3 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Control/StatisticsCard.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Control/StatisticsCard.xaml
@@ -7,11 +7,10 @@
     xmlns:cwconv="using:CommunityToolkit.WinUI.Converters"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:shcb="using:Snap.Hutao.Control.Brush"
-    xmlns:shch="using:Snap.Hutao.Control.Helper"
     xmlns:shci="using:Snap.Hutao.Control.Image"
     xmlns:shcm="using:Snap.Hutao.Control.Markup"
     xmlns:shcp="using:Snap.Hutao.Control.Panel"
+    xmlns:shux="using:Snap.Hutao.UI.Xaml"
     xmlns:shvcont="using:Snap.Hutao.View.Control"
     xmlns:shvconv="using:Snap.Hutao.View.Converter"
     xmlns:shvcp="using:Snap.Hutao.View.Card.Primitive"
@@ -49,7 +48,7 @@
 
                 <StackPanel HorizontalAlignment="Left" Orientation="Horizontal">
                     <shci:CachedImage
-                        shch:FrameworkElementHelper.SquareLength="40"
+                        shux:FrameworkElementHelper.SquareLength="40"
                         CornerRadius="{ThemeResource ControlCornerRadius}"
                         Source="{Binding Icon}"/>
                     <TextBlock
@@ -103,7 +102,7 @@
                     <SolidColorBrush Color="{Binding Color}"/>
                 </shvcont:BottomTextControl.Foreground>
                 <shvcont:ItemIcon
-                    shch:FrameworkElementHelper.SquareLength="40"
+                    shux:FrameworkElementHelper.SquareLength="40"
                     Icon="{Binding Icon}"
                     Quality="{Binding Quality}"/>
             </shvcont:BottomTextControl>
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 32a3d29c..c7a4d54e 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Control/WebViewer.xaml.cs
+++ b/src/Snap.Hutao/Snap.Hutao/View/Control/WebViewer.xaml.cs
@@ -5,12 +5,12 @@ using CommunityToolkit.Mvvm.Messaging;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.Web.WebView2.Core;
-using Snap.Hutao.Control.Extension;
 using Snap.Hutao.Message;
 using Snap.Hutao.Service.Notification;
 using Snap.Hutao.Service.User;
 using Snap.Hutao.ViewModel.User;
 using Snap.Hutao.Web.Bridge;
+using Snap.Hutao.Web.WebView2;
 using Windows.Foundation;
 
 namespace Snap.Hutao.View.Control;
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Dialog/GachaLogRefreshProgressDialog.xaml b/src/Snap.Hutao/Snap.Hutao/View/Dialog/GachaLogRefreshProgressDialog.xaml
index 82f8417c..26d9a99b 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Dialog/GachaLogRefreshProgressDialog.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Dialog/GachaLogRefreshProgressDialog.xaml
@@ -5,8 +5,8 @@
     xmlns:cwc="using:CommunityToolkit.WinUI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:shch="using:Snap.Hutao.Control.Helper"
     xmlns:shcm="using:Snap.Hutao.Control.Markup"
+    xmlns:shux="using:Snap.Hutao.UI.Xaml"
     xmlns:shvc="using:Snap.Hutao.View.Control"
     Title="{shcm:ResourceString Name=ViewDialogGachaLogRefreshProgressTitle}"
     Style="{StaticResource DefaultContentDialogStyle}"
@@ -15,7 +15,7 @@
     <ContentDialog.Resources>
         <DataTemplate x:Key="GachaItemDataTemplate">
             <shvc:ItemIcon
-                shch:FrameworkElementHelper.SquareLength="60"
+                shux:FrameworkElementHelper.SquareLength="60"
                 Badge="{Binding Badge}"
                 Icon="{Binding Icon}"
                 Quality="{Binding Quality}"/>
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Dialog/LaunchGameConfigurationFixDialog.xaml b/src/Snap.Hutao/Snap.Hutao/View/Dialog/LaunchGameConfigurationFixDialog.xaml
index c8cdbab6..bc9a9d0a 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Dialog/LaunchGameConfigurationFixDialog.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Dialog/LaunchGameConfigurationFixDialog.xaml
@@ -4,8 +4,8 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:shccs="using:Snap.Hutao.Control.Collection.Selector"
     xmlns:shcm="using:Snap.Hutao.Control.Markup"
+    xmlns:shuxc="using:Snap.Hutao.UI.Xaml.Control"
     xmlns:shvd="using:Snap.Hutao.View.Dialog"
     Title="{shcm:ResourceString Name=ViewDialogLaunchGameConfigurationFixDialogTitle}"
     d:DataContext="{d:DesignInstance shvd:LaunchGameConfigurationFixDialog}"
@@ -14,7 +14,7 @@
     Style="{StaticResource DefaultContentDialogStyle}"
     mc:Ignorable="d">
 
-    <shccs:ComboBox2
+    <shuxc:ComboBox2
         HorizontalAlignment="Stretch"
         VerticalAlignment="Center"
         DisplayMemberPath="DisplayName"
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Guide/GuideView.xaml.cs b/src/Snap.Hutao/Snap.Hutao/View/Guide/GuideView.xaml.cs
index 0296865f..e2d09c5e 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Guide/GuideView.xaml.cs
+++ b/src/Snap.Hutao/Snap.Hutao/View/Guide/GuideView.xaml.cs
@@ -2,7 +2,7 @@
 // Licensed under the MIT license.
 
 using Microsoft.UI.Xaml.Controls;
-using Snap.Hutao.Control.Extension;
+using Snap.Hutao.UI.Xaml;
 using Snap.Hutao.ViewModel.Guide;
 
 namespace Snap.Hutao.View.Guide;
diff --git a/src/Snap.Hutao/Snap.Hutao/View/MainView.xaml b/src/Snap.Hutao/Snap.Hutao/View/MainView.xaml
index c361e6f8..680d801c 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/MainView.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/MainView.xaml
@@ -5,9 +5,9 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:mxi="using:Microsoft.Xaml.Interactivity"
-    xmlns:shch="using:Snap.Hutao.Control.Helper"
     xmlns:shcm="using:Snap.Hutao.Control.Markup"
     xmlns:shuxb="using:Snap.Hutao.UI.Xaml.Behavior"
+    xmlns:shuxc="using:Snap.Hutao.UI.Xaml.Control"
     xmlns:shv="using:Snap.Hutao.View"
     xmlns:shvcs="using:Snap.Hutao.View.Converter.Specialized"
     xmlns:shvh="using:Snap.Hutao.View.Helper"
@@ -45,7 +45,7 @@
         <NavigationView
             x:Name="NavView"
             Margin="0,0,0,0"
-            shch:NavigationViewHelper.PaneCornerRadius="0"
+            shuxc:NavigationViewHelper.PaneCornerRadius="0"
             CompactPaneLength="48"
             IsBackEnabled="{x:Bind ContentFrame.CanGoBack, Mode=OneWay}"
             IsPaneOpen="True"
diff --git a/src/Snap.Hutao/Snap.Hutao/View/MainView.xaml.cs b/src/Snap.Hutao/Snap.Hutao/View/MainView.xaml.cs
index a9eb72e9..0bb45f99 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/MainView.xaml.cs
+++ b/src/Snap.Hutao/Snap.Hutao/View/MainView.xaml.cs
@@ -2,8 +2,8 @@
 // Licensed under the MIT license.
 
 using Microsoft.UI.Xaml.Controls;
-using Snap.Hutao.Control.Extension;
 using Snap.Hutao.Service.Navigation;
+using Snap.Hutao.UI.Xaml;
 using Snap.Hutao.View.Page;
 using Snap.Hutao.ViewModel;
 
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/AchievementPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/AchievementPage.xaml
index 6d290834..31b0afeb 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/AchievementPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/AchievementPage.xaml
@@ -9,10 +9,10 @@
     xmlns:mxi="using:Microsoft.Xaml.Interactivity"
     xmlns:mxic="using:Microsoft.Xaml.Interactions.Core"
     xmlns:shc="using:Snap.Hutao.Control"
-    xmlns:shch="using:Snap.Hutao.Control.Helper"
     xmlns:shci="using:Snap.Hutao.Control.Image"
     xmlns:shcm="using:Snap.Hutao.Control.Markup"
     xmlns:shcp="using:Snap.Hutao.Control.Panel"
+    xmlns:shux="using:Snap.Hutao.UI.Xaml"
     xmlns:shuxb="using:Snap.Hutao.UI.Xaml.Behavior"
     xmlns:shva="using:Snap.Hutao.ViewModel.Achievement"
     d:DataContext="{d:DesignInstance shva:AchievementViewModel}"
@@ -159,7 +159,7 @@
                             Visibility="{Binding IsChecked, Converter={StaticResource BoolToVisibilityConverter}}"/>
                         <shci:CachedImage
                             Grid.Column="2"
-                            shch:FrameworkElementHelper.SquareLength="32"
+                            shux:FrameworkElementHelper.SquareLength="32"
                             Source="{StaticResource UI_ItemIcon_201}"/>
                         <TextBlock
                             Grid.Column="3"
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/AnnouncementPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/AnnouncementPage.xaml
index c600e2ac..feac6b2e 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/AnnouncementPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/AnnouncementPage.xaml
@@ -10,11 +10,11 @@
     xmlns:mxi="using:Microsoft.Xaml.Interactivity"
     xmlns:mxic="using:Microsoft.Xaml.Interactions.Core"
     xmlns:shc="using:Snap.Hutao.Control"
-    xmlns:shch="using:Snap.Hutao.Control.Helper"
     xmlns:shci="using:Snap.Hutao.Control.Image"
     xmlns:shcm="using:Snap.Hutao.Control.Markup"
     xmlns:shuxb="using:Snap.Hutao.UI.Xaml.Behavior"
     xmlns:shuxba="using:Snap.Hutao.UI.Xaml.Behavior.Action"
+    xmlns:shuxc="using:Snap.Hutao.UI.Xaml.Control"
     xmlns:shuxma="using:Snap.Hutao.UI.Xaml.Media.Animation"
     xmlns:shvco="using:Snap.Hutao.View.Control"
     xmlns:shvcp="using:Snap.Hutao.View.Card.Primitive"
@@ -178,7 +178,7 @@
             <InfoBar
                 Title="{Binding Title}"
                 Margin="0,0,0,0"
-                shch:InfoBarHelper.IsTextSelectionEnabled="True"
+                shuxc:InfoBarHelper.IsTextSelectionEnabled="True"
                 CloseButtonCommand="{Binding DismissCommand}"
                 CloseButtonCommandParameter="{Binding}"
                 IsOpen="True"
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/DailyNotePage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/DailyNotePage.xaml
index 71e2448a..067eebb3 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/DailyNotePage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/DailyNotePage.xaml
@@ -9,10 +9,10 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:mxi="using:Microsoft.Xaml.Interactivity"
     xmlns:shc="using:Snap.Hutao.Control"
-    xmlns:shch="using:Snap.Hutao.Control.Helper"
     xmlns:shci="using:Snap.Hutao.Control.Image"
     xmlns:shcm="using:Snap.Hutao.Control.Markup"
     xmlns:shme="using:Snap.Hutao.Model.Entity"
+    xmlns:shux="using:Snap.Hutao.UI.Xaml"
     xmlns:shuxb="using:Snap.Hutao.UI.Xaml.Behavior"
     xmlns:shvc="using:Snap.Hutao.View.Control"
     xmlns:shvcp="using:Snap.Hutao.View.Card.Primitive"
@@ -92,7 +92,7 @@
                                 Margin="8,0,0,0"
                                 HorizontalAlignment="Right"
                                 VerticalAlignment="Stretch"
-                                shch:FrameworkElementHelper.SquareLength="40"
+                                shux:FrameworkElementHelper.SquareLength="40"
                                 Background="Transparent"
                                 BorderBrush="{x:Null}"
                                 BorderThickness="0"
@@ -104,7 +104,7 @@
                             <Button
                                 Margin="8,0,0,0"
                                 VerticalAlignment="Stretch"
-                                shch:FrameworkElementHelper.SquareLength="40"
+                                shux:FrameworkElementHelper.SquareLength="40"
                                 Background="Transparent"
                                 BorderBrush="{x:Null}"
                                 BorderThickness="0"
@@ -138,7 +138,7 @@
                                 Grid.Column="0"
                                 Margin="4"
                                 VerticalAlignment="Center"
-                                shch:FrameworkElementHelper.SquareLength="32"
+                                shux:FrameworkElementHelper.SquareLength="32"
                                 Source="{Binding DailyNote.IsArchonQuestFinished, Converter={StaticResource ArchonQuestIconConverter}}"/>
                             <StackPanel
                                 Grid.Column="1"
@@ -175,7 +175,7 @@
                                 Grid.Column="0"
                                 Margin="4"
                                 VerticalAlignment="Center"
-                                shch:FrameworkElementHelper.SquareLength="32"
+                                shux:FrameworkElementHelper.SquareLength="32"
                                 Source="{StaticResource UI_ItemIcon_210}"/>
                             <StackPanel
                                 Grid.Column="1"
@@ -212,7 +212,7 @@
                                 Grid.Column="0"
                                 Margin="4"
                                 VerticalAlignment="Center"
-                                shch:FrameworkElementHelper.SquareLength="32"
+                                shux:FrameworkElementHelper.SquareLength="32"
                                 Source="{StaticResource UI_ItemIcon_204}"/>
                             <StackPanel
                                 Grid.Column="1"
@@ -250,7 +250,7 @@
                                 Grid.Column="0"
                                 Margin="4"
                                 VerticalAlignment="Center"
-                                shch:FrameworkElementHelper.SquareLength="32"
+                                shux:FrameworkElementHelper.SquareLength="32"
                                 Source="{Binding DailyNote.DailyTask.IsExtraTaskRewardReceived, Converter={StaticResource DailyTaskIconConverter}}"/>
                             <StackPanel
                                 Grid.Column="1"
@@ -316,7 +316,7 @@
                                 Grid.Column="0"
                                 Margin="4"
                                 VerticalAlignment="Center"
-                                shch:FrameworkElementHelper.SquareLength="32"
+                                shux:FrameworkElementHelper.SquareLength="32"
                                 Source="{StaticResource UI_MarkTower}"/>
                             <StackPanel
                                 Grid.Column="1"
@@ -353,7 +353,7 @@
                                 Grid.Column="0"
                                 Margin="4"
                                 VerticalAlignment="Center"
-                                shch:FrameworkElementHelper.SquareLength="32"
+                                shux:FrameworkElementHelper.SquareLength="32"
                                 Source="{StaticResource UI_ItemIcon_220021}"/>
                             <StackPanel
                                 Grid.Column="1"
@@ -406,7 +406,7 @@
                                         Value="{Binding PassedTime, Mode=OneWay}"/>
                                     <shci:CachedImage
                                         Margin="0,0,0,8"
-                                        shch:FrameworkElementHelper.SquareLength="32"
+                                        shux:FrameworkElementHelper.SquareLength="32"
                                         Source="{Binding AvatarSideIcon, Mode=OneWay}"/>
                                     <TextBlock
                                         Grid.Column="1"
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/ISupportLoginByWebView.cs b/src/Snap.Hutao/Snap.Hutao/View/Page/ISupportLoginByWebView.cs
index 0a560cbd..da725462 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/ISupportLoginByWebView.cs
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/ISupportLoginByWebView.cs
@@ -2,11 +2,11 @@
 // Licensed under the MIT license.
 
 using Microsoft.UI.Xaml.Controls;
-using Snap.Hutao.Control.Extension;
 using Snap.Hutao.Service.Navigation;
 using Snap.Hutao.Service.Notification;
 using Snap.Hutao.Service.User;
 using Snap.Hutao.Web.Bridge;
+using Snap.Hutao.Web.WebView2;
 
 namespace Snap.Hutao.View.Page;
 
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/LaunchGamePage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/LaunchGamePage.xaml
index 97bce196..9f942b21 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/LaunchGamePage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/LaunchGamePage.xaml
@@ -8,11 +8,11 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:mxi="using:Microsoft.Xaml.Interactivity"
     xmlns:shc="using:Snap.Hutao.Control"
-    xmlns:shccs="using:Snap.Hutao.Control.Collection.Selector"
     xmlns:shch="using:Snap.Hutao.Control.Helper"
     xmlns:shci="using:Snap.Hutao.Control.Image"
     xmlns:shcm="using:Snap.Hutao.Control.Markup"
     xmlns:shuxb="using:Snap.Hutao.UI.Xaml.Behavior"
+    xmlns:shuxc="using:Snap.Hutao.UI.Xaml.Control"
     xmlns:shvc="using:Snap.Hutao.View.Control"
     xmlns:shvg="using:Snap.Hutao.ViewModel.Game"
     d:DataContext="{d:DesignInstance shvg:LaunchGameViewModel}"
@@ -172,7 +172,7 @@
                                             <StackPanel Orientation="Horizontal" Spacing="{ThemeResource SettingsCardContentControlSpacing}">
                                                 <shvc:Elevation Visibility="{Binding RuntimeOptions.IsElevated, Converter={StaticResource BoolToVisibilityRevertConverter}}"/>
                                                 <shc:SizeRestrictedContentControl>
-                                                    <shccs:ComboBox2
+                                                    <shuxc:ComboBox2
                                                         DisplayMemberPath="DisplayName"
                                                         EnableMemberPath="IsNotCompatOnly"
                                                         ItemsSource="{Binding KnownSchemes}"
@@ -237,7 +237,7 @@
                                             Style="{StaticResource SettingsSectionHeaderTextBlockStyle}"
                                             Text="{shcm:ResourceString Name=ViewPageLaunchGameProcessHeader}"/>
                                         <cwc:SettingsExpander
-                                            shch:SettingsExpanderHelper.IsItemsEnabled="{Binding LaunchOptions.IsEnabled}"
+                                            shuxc:SettingsExpanderHelper.IsItemsEnabled="{Binding LaunchOptions.IsEnabled}"
                                             Description="{shcm:ResourceString Name=ViewPageLaunchGameArgumentsDescription}"
                                             Header="{shcm:ResourceString Name=ViewPageLaunchGameArgumentsHeader}"
                                             HeaderIcon="{shcm:FontIcon Glyph=&#xE943;}"
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/SettingPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/SettingPage.xaml
index 0f30de80..f3bd65ca 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/SettingPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/SettingPage.xaml
@@ -10,9 +10,9 @@
     xmlns:mxi="using:Microsoft.Xaml.Interactivity"
     xmlns:mxic="using:Microsoft.Xaml.Interactions.Core"
     xmlns:shc="using:Snap.Hutao.Control"
-    xmlns:shch="using:Snap.Hutao.Control.Helper"
     xmlns:shcm="using:Snap.Hutao.Control.Markup"
     xmlns:shuxb="using:Snap.Hutao.UI.Xaml.Behavior"
+    xmlns:shuxc="using:Snap.Hutao.UI.Xaml.Control"
     xmlns:shvc="using:Snap.Hutao.View.Control"
     xmlns:shvs="using:Snap.Hutao.ViewModel.Setting"
     d:DataContext="{d:DesignInstance shvs:SettingViewModel}"
@@ -25,7 +25,7 @@
 
     <Grid x:Name="SettingPageGrid">
         <ScrollViewer Style="{StaticResource TwoPanelScrollViewerStyle}">
-            <shch:ScrollViewerHelper.RightPanel>
+            <shuxc:ScrollViewerHelper.RightPanel>
                 <Border
                     x:Name="ScrollViwerRightPanel"
                     Width="400"
@@ -109,7 +109,7 @@
                         </StackPanel>
                     </Grid>
                 </Border>
-            </shch:ScrollViewerHelper.RightPanel>
+            </shuxc:ScrollViewerHelper.RightPanel>
             <Grid HorizontalAlignment="Left">
                 <StackPanel
                     Grid.Column="0"
@@ -595,7 +595,7 @@
                                     <ToggleSwitch Width="120" IsOn="{Binding IsAllocConsoleDebugModeEnabled, Mode=TwoWay}"/>
                                 </cwc:SettingsCard>
                                 <cwc:SettingsExpander
-                                    shch:SettingsExpanderHelper.IsItemsEnabled="{Binding RuntimeOptions.IsElevated}"
+                                    shuxc:SettingsExpanderHelper.IsItemsEnabled="{Binding RuntimeOptions.IsElevated}"
                                     Header="{shcm:ResourceString Name=ViewPageSettingIsAdvancedLaunchOptionsEnabledHeader}"
                                     HeaderIcon="{shcm:FontIcon Glyph=&#xE730;}"
                                     IsEnabled="{Binding RuntimeOptions.IsElevated}"
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/SpiralAbyssRecordPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/SpiralAbyssRecordPage.xaml
index 15d294e1..eccf645b 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/SpiralAbyssRecordPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/SpiralAbyssRecordPage.xaml
@@ -9,11 +9,11 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:mxi="using:Microsoft.Xaml.Interactivity"
     xmlns:shc="using:Snap.Hutao.Control"
-    xmlns:shch="using:Snap.Hutao.Control.Helper"
     xmlns:shci="using:Snap.Hutao.Control.Image"
     xmlns:shcm="using:Snap.Hutao.Control.Markup"
     xmlns:shcp="using:Snap.Hutao.Control.Panel"
     xmlns:shct="using:Snap.Hutao.Control.Text"
+    xmlns:shux="using:Snap.Hutao.UI.Xaml"
     xmlns:shuxb="using:Snap.Hutao.UI.Xaml.Behavior"
     xmlns:shvcom="using:Snap.Hutao.ViewModel.Complex"
     xmlns:shvcon="using:Snap.Hutao.View.Control"
@@ -509,7 +509,7 @@
                             <shvcon:ItemIcon
                                 Width="40"
                                 Height="40"
-                                shch:UIElementHelper.OpacityObject="{Binding Icon}"
+                                shux:UIElementHelper.OpacityObject="{Binding Icon}"
                                 Icon="{Binding Icon}"
                                 Opacity="0"
                                 Quality="{Binding Quality}"/>
diff --git a/src/Snap.Hutao/Snap.Hutao/View/TitleView.xaml.cs b/src/Snap.Hutao/Snap.Hutao/View/TitleView.xaml.cs
index 3ba335c1..e246df36 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/TitleView.xaml.cs
+++ b/src/Snap.Hutao/Snap.Hutao/View/TitleView.xaml.cs
@@ -3,7 +3,7 @@
 
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
-using Snap.Hutao.Control.Extension;
+using Snap.Hutao.UI.Xaml;
 using Snap.Hutao.ViewModel;
 
 namespace Snap.Hutao.View;
diff --git a/src/Snap.Hutao/Snap.Hutao/View/UserView.xaml.cs b/src/Snap.Hutao/Snap.Hutao/View/UserView.xaml.cs
index 514addd7..ee6db832 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/UserView.xaml.cs
+++ b/src/Snap.Hutao/Snap.Hutao/View/UserView.xaml.cs
@@ -2,7 +2,7 @@
 // Licensed under the MIT license.
 
 using Microsoft.UI.Xaml.Controls;
-using Snap.Hutao.Control.Extension;
+using Snap.Hutao.UI.Xaml;
 using Snap.Hutao.ViewModel.User;
 
 namespace Snap.Hutao.View;
diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/Achievement/AchievementImporter.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/Achievement/AchievementImporter.cs
index 679fcade..4c602aaa 100644
--- a/src/Snap.Hutao/Snap.Hutao/ViewModel/Achievement/AchievementImporter.cs
+++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/Achievement/AchievementImporter.cs
@@ -2,12 +2,12 @@
 // Licensed under the MIT license.
 
 using Microsoft.UI.Xaml.Controls;
-using Snap.Hutao.Control.Extension;
 using Snap.Hutao.Core.IO;
 using Snap.Hutao.Factory.Picker;
 using Snap.Hutao.Model.InterChange.Achievement;
 using Snap.Hutao.Service.Achievement;
 using Snap.Hutao.Service.Notification;
+using Snap.Hutao.UI.Xaml.Control;
 using Snap.Hutao.View.Dialog;
 using EntityAchievementArchive = Snap.Hutao.Model.Entity.AchievementArchive;
 
diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/Achievement/AchievementViewModel.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/Achievement/AchievementViewModel.cs
index 8f50670b..25a6e885 100644
--- a/src/Snap.Hutao/Snap.Hutao/ViewModel/Achievement/AchievementViewModel.cs
+++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/Achievement/AchievementViewModel.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT license.
 
 using Microsoft.UI.Xaml.Controls;
-using Snap.Hutao.Control.Collection.AdvancedCollectionView;
 using Snap.Hutao.Core.ExceptionService;
 using Snap.Hutao.Core.IO;
 using Snap.Hutao.Core.LifeCycle;
@@ -12,6 +11,7 @@ using Snap.Hutao.Service.Metadata;
 using Snap.Hutao.Service.Metadata.ContextAbstraction;
 using Snap.Hutao.Service.Navigation;
 using Snap.Hutao.Service.Notification;
+using Snap.Hutao.UI.Xaml.Data;
 using Snap.Hutao.View.Dialog;
 using System.Collections.ObjectModel;
 using System.Text.RegularExpressions;
diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/AvatarProperty/AvatarPropertyViewModel.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/AvatarProperty/AvatarPropertyViewModel.cs
index 2a839600..30555cf6 100644
--- a/src/Snap.Hutao/Snap.Hutao/ViewModel/AvatarProperty/AvatarPropertyViewModel.cs
+++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/AvatarProperty/AvatarPropertyViewModel.cs
@@ -5,7 +5,6 @@ using CommunityToolkit.Mvvm.Messaging;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Media.Imaging;
-using Snap.Hutao.Control.Extension;
 using Snap.Hutao.Control.Media;
 using Snap.Hutao.Core.ExceptionService;
 using Snap.Hutao.Core.IO.DataTransfer;
@@ -17,6 +16,7 @@ using Snap.Hutao.Service.AvatarInfo;
 using Snap.Hutao.Service.Cultivation;
 using Snap.Hutao.Service.Notification;
 using Snap.Hutao.Service.User;
+using Snap.Hutao.UI.Xaml.Control;
 using Snap.Hutao.View.Dialog;
 using Snap.Hutao.ViewModel.User;
 using Snap.Hutao.Web.Hoyolab.Takumi.Event.Calculate;
diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/Cultivation/CultivationViewModel.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/Cultivation/CultivationViewModel.cs
index 0fe1ee39..8a73ecdd 100644
--- a/src/Snap.Hutao/Snap.Hutao/ViewModel/Cultivation/CultivationViewModel.cs
+++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/Cultivation/CultivationViewModel.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT license.
 
 using Microsoft.UI.Xaml.Controls;
-using Snap.Hutao.Control.Extension;
 using Snap.Hutao.Core.ExceptionService;
 using Snap.Hutao.Factory.ContentDialog;
 using Snap.Hutao.Model.Entity;
@@ -12,6 +11,7 @@ using Snap.Hutao.Service.Metadata;
 using Snap.Hutao.Service.Metadata.ContextAbstraction;
 using Snap.Hutao.Service.Navigation;
 using Snap.Hutao.Service.Notification;
+using Snap.Hutao.UI.Xaml.Control;
 using Snap.Hutao.View.Dialog;
 using System.Collections.ObjectModel;
 
diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/DailyNote/DailyNoteViewModel.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/DailyNote/DailyNoteViewModel.cs
index 9ed8192d..3f626ff5 100644
--- a/src/Snap.Hutao/Snap.Hutao/ViewModel/DailyNote/DailyNoteViewModel.cs
+++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/DailyNote/DailyNoteViewModel.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT license.
 
 using Microsoft.UI.Xaml.Controls;
-using Snap.Hutao.Control.Extension;
 using Snap.Hutao.Core;
 using Snap.Hutao.Core.ExceptionService;
 using Snap.Hutao.Factory.ContentDialog;
@@ -12,6 +11,7 @@ using Snap.Hutao.Service.DailyNote;
 using Snap.Hutao.Service.Metadata;
 using Snap.Hutao.Service.Notification;
 using Snap.Hutao.Service.User;
+using Snap.Hutao.UI.Xaml.Control;
 using Snap.Hutao.View.Control;
 using Snap.Hutao.View.Dialog;
 using Snap.Hutao.ViewModel.User;
diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/GachaLog/GachaLogViewModel.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/GachaLog/GachaLogViewModel.cs
index 062c1d6a..ffd78d3f 100644
--- a/src/Snap.Hutao/Snap.Hutao/ViewModel/GachaLog/GachaLogViewModel.cs
+++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/GachaLog/GachaLogViewModel.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT license.
 
 using Microsoft.UI.Xaml.Controls;
-using Snap.Hutao.Control.Extension;
 using Snap.Hutao.Core.Database;
 using Snap.Hutao.Core.ExceptionService;
 using Snap.Hutao.Core.IO;
@@ -14,6 +13,7 @@ using Snap.Hutao.Model.InterChange.GachaLog;
 using Snap.Hutao.Service.GachaLog;
 using Snap.Hutao.Service.GachaLog.QueryProvider;
 using Snap.Hutao.Service.Notification;
+using Snap.Hutao.UI.Xaml.Control;
 using Snap.Hutao.View.Dialog;
 using System.Collections.ObjectModel;
 using System.Runtime.InteropServices;
@@ -152,7 +152,7 @@ internal sealed partial class GachaLogViewModel : Abstraction.ViewModel
 
             GachaLogRefreshProgressDialog dialog = await contentDialogFactory.CreateInstanceAsync<GachaLogRefreshProgressDialog>().ConfigureAwait(false);
 
-            ContentDialogHideToken hideToken;
+            ContentDialogScope hideToken;
             try
             {
                 hideToken = await dialog.BlockAsync(taskContext).ConfigureAwait(false);
diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/GachaLog/HutaoCloudViewModel.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/GachaLog/HutaoCloudViewModel.cs
index 6829162d..09304e9f 100644
--- a/src/Snap.Hutao/Snap.Hutao/ViewModel/GachaLog/HutaoCloudViewModel.cs
+++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/GachaLog/HutaoCloudViewModel.cs
@@ -2,13 +2,13 @@
 // Licensed under the MIT license.
 
 using Microsoft.UI.Xaml.Controls;
-using Snap.Hutao.Control.Extension;
 using Snap.Hutao.Factory.ContentDialog;
 using Snap.Hutao.Model.Entity;
 using Snap.Hutao.Service.GachaLog;
 using Snap.Hutao.Service.Hutao;
 using Snap.Hutao.Service.Navigation;
 using Snap.Hutao.Service.Notification;
+using Snap.Hutao.UI.Xaml.Control;
 using Snap.Hutao.Web.Hutao.GachaLog;
 using Snap.Hutao.Web.Response;
 using System.Collections.ObjectModel;
diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/Game/LaunchGameViewModel.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/Game/LaunchGameViewModel.cs
index 1a5984c4..0e4e4a06 100644
--- a/src/Snap.Hutao/Snap.Hutao/ViewModel/Game/LaunchGameViewModel.cs
+++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/Game/LaunchGameViewModel.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT license.
 
 using Microsoft.Extensions.Caching.Memory;
-using Snap.Hutao.Control.Collection.AdvancedCollectionView;
 using Snap.Hutao.Core;
 using Snap.Hutao.Core.Database;
 using Snap.Hutao.Core.Diagnostics.CodeAnalysis;
@@ -15,6 +14,7 @@ using Snap.Hutao.Service.Game.PathAbstraction;
 using Snap.Hutao.Service.Game.Scheme;
 using Snap.Hutao.Service.Notification;
 using Snap.Hutao.Service.User;
+using Snap.Hutao.UI.Xaml.Data;
 using Snap.Hutao.Web.Hoyolab.HoyoPlay.Connect;
 using Snap.Hutao.Web.Hoyolab.HoyoPlay.Connect.Package;
 using System.Collections.Immutable;
diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/Game/LaunchGameViewModelSlim.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/Game/LaunchGameViewModelSlim.cs
index 36fb5b0b..3f02d7c1 100644
--- a/src/Snap.Hutao/Snap.Hutao/ViewModel/Game/LaunchGameViewModelSlim.cs
+++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/Game/LaunchGameViewModelSlim.cs
@@ -1,11 +1,11 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
-using Snap.Hutao.Control.Collection.AdvancedCollectionView;
 using Snap.Hutao.Model.Entity;
 using Snap.Hutao.Service.Game;
 using Snap.Hutao.Service.Game.Scheme;
 using Snap.Hutao.Service.Notification;
+using Snap.Hutao.UI.Xaml.Data;
 using System.Collections.ObjectModel;
 
 namespace Snap.Hutao.ViewModel.Game;
diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/Setting/SettingViewModel.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/Setting/SettingViewModel.cs
index afb12e26..e35ec642 100644
--- a/src/Snap.Hutao/Snap.Hutao/ViewModel/Setting/SettingViewModel.cs
+++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/Setting/SettingViewModel.cs
@@ -5,7 +5,6 @@ using CommunityToolkit.Mvvm.Messaging;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.Windows.AppLifecycle;
-using Snap.Hutao.Control.Extension;
 using Snap.Hutao.Core;
 using Snap.Hutao.Core.Caching;
 using Snap.Hutao.Core.Logging;
@@ -24,6 +23,7 @@ using Snap.Hutao.Service.Hutao;
 using Snap.Hutao.Service.Navigation;
 using Snap.Hutao.Service.Notification;
 using Snap.Hutao.Service.User;
+using Snap.Hutao.UI.Xaml.Control;
 using Snap.Hutao.View.Dialog;
 using Snap.Hutao.ViewModel.Guide;
 using Snap.Hutao.Web.Hoyolab;
diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/TitleViewModel.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/TitleViewModel.cs
index 6094f845..2883573f 100644
--- a/src/Snap.Hutao/Snap.Hutao/ViewModel/TitleViewModel.cs
+++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/TitleViewModel.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT license.
 
 using Microsoft.UI.Xaml.Controls;
-using Snap.Hutao.Control.Extension;
 using Snap.Hutao.Core;
 using Snap.Hutao.Core.Windowing.HotKey;
 using Snap.Hutao.Factory.ContentDialog;
@@ -10,6 +9,7 @@ using Snap.Hutao.Factory.Progress;
 using Snap.Hutao.Service.Abstraction;
 using Snap.Hutao.Service.Notification;
 using Snap.Hutao.Service.Update;
+using Snap.Hutao.UI.Xaml.Control;
 using Snap.Hutao.View.Dialog;
 using System.Globalization;
 using System.Text;
diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/Wiki/WikiAvatarViewModel.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/Wiki/WikiAvatarViewModel.cs
index f14a76bd..a59215db 100644
--- a/src/Snap.Hutao/Snap.Hutao/ViewModel/Wiki/WikiAvatarViewModel.cs
+++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/Wiki/WikiAvatarViewModel.cs
@@ -1,7 +1,6 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
-using Snap.Hutao.Control.Collection.AdvancedCollectionView;
 using Snap.Hutao.Core.ExceptionService;
 using Snap.Hutao.Factory.ContentDialog;
 using Snap.Hutao.Model.Calculable;
@@ -19,6 +18,7 @@ using Snap.Hutao.Service.Metadata;
 using Snap.Hutao.Service.Notification;
 using Snap.Hutao.Service.User;
 using Snap.Hutao.UI.Xaml.Control.Tokenizing;
+using Snap.Hutao.UI.Xaml.Data;
 using Snap.Hutao.View.Dialog;
 using Snap.Hutao.ViewModel.User;
 using Snap.Hutao.Web.Response;
diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/Wiki/WikiMonsterViewModel.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/Wiki/WikiMonsterViewModel.cs
index 0ddd9446..85f05af0 100644
--- a/src/Snap.Hutao/Snap.Hutao/ViewModel/Wiki/WikiMonsterViewModel.cs
+++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/Wiki/WikiMonsterViewModel.cs
@@ -1,12 +1,12 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
-using Snap.Hutao.Control.Collection.AdvancedCollectionView;
 using Snap.Hutao.Model.Intrinsic;
 using Snap.Hutao.Model.Metadata.Item;
 using Snap.Hutao.Model.Metadata.Monster;
 using Snap.Hutao.Model.Primitive;
 using Snap.Hutao.Service.Metadata;
+using Snap.Hutao.UI.Xaml.Data;
 
 namespace Snap.Hutao.ViewModel.Wiki;
 
diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/Wiki/WikiWeaponViewModel.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/Wiki/WikiWeaponViewModel.cs
index caff82f8..6f14b0a4 100644
--- a/src/Snap.Hutao/Snap.Hutao/ViewModel/Wiki/WikiWeaponViewModel.cs
+++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/Wiki/WikiWeaponViewModel.cs
@@ -1,7 +1,6 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
-using Snap.Hutao.Control.Collection.AdvancedCollectionView;
 using Snap.Hutao.Core.ExceptionService;
 using Snap.Hutao.Factory.ContentDialog;
 using Snap.Hutao.Model.Calculable;
@@ -19,6 +18,7 @@ using Snap.Hutao.Service.Metadata;
 using Snap.Hutao.Service.Notification;
 using Snap.Hutao.Service.User;
 using Snap.Hutao.UI.Xaml.Control.Tokenizing;
+using Snap.Hutao.UI.Xaml.Data;
 using Snap.Hutao.View.Dialog;
 using Snap.Hutao.ViewModel.User;
 using Snap.Hutao.Web.Response;
diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Bridge/HoyolabCoreWebView2Extension.cs b/src/Snap.Hutao/Snap.Hutao/Web/Bridge/HoyolabCoreWebView2Extension.cs
index a9d97c86..dd55fb0b 100644
--- a/src/Snap.Hutao/Snap.Hutao/Web/Bridge/HoyolabCoreWebView2Extension.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Web/Bridge/HoyolabCoreWebView2Extension.cs
@@ -2,8 +2,8 @@
 // Licensed under the MIT license.
 
 using Microsoft.Web.WebView2.Core;
-using Snap.Hutao.Control.Extension;
 using Snap.Hutao.Web.Hoyolab;
+using Snap.Hutao.Web.WebView2;
 
 namespace Snap.Hutao.Web.Bridge;
 
diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Extension/WebView2Extension.cs b/src/Snap.Hutao/Snap.Hutao/Web/WebView2/WebView2Extension.cs
similarity index 90%
rename from src/Snap.Hutao/Snap.Hutao/Control/Extension/WebView2Extension.cs
rename to src/Snap.Hutao/Snap.Hutao/Web/WebView2/WebView2Extension.cs
index 9d28ef31..70794999 100644
--- a/src/Snap.Hutao/Snap.Hutao/Control/Extension/WebView2Extension.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Web/WebView2/WebView2Extension.cs
@@ -1,11 +1,10 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
-using Microsoft.UI.Xaml.Controls;
 using Microsoft.Web.WebView2.Core;
 using System.Diagnostics;
 
-namespace Snap.Hutao.Control.Extension;
+namespace Snap.Hutao.Web.WebView2;
 
 /// <summary>
 /// Bridge 拓展
@@ -39,7 +38,7 @@ internal static class WebView2Extension
         }
     }
 
-    public static bool IsDisposed(this WebView2 webView2)
+    public static bool IsDisposed(this Microsoft.UI.Xaml.Controls.WebView2 webView2)
     {
         return WinRTExtension.IsDisposed(webView2);
     }