diff --git a/crowdin.yml b/crowdin.yml
index 82ec1a89..66e78b98 100644
--- a/crowdin.yml
+++ b/crowdin.yml
@@ -1,3 +1,5 @@
 files:
   - source: /src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx
     translation: /src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.%osx_locale%.resx
+  - source: /src/Snap.Hutao/Snap.Hutao/Resource/Localization/SHRegex.resx
+    translation: /src/Snap.Hutao/Snap.Hutao/Resource/Localization/SHRegex.%osx_locale%.resx
\ No newline at end of file
diff --git a/src/Snap.Hutao/Snap.Hutao/App.xaml b/src/Snap.Hutao/Snap.Hutao/App.xaml
index 125db5cf..f23c174d 100644
--- a/src/Snap.Hutao/Snap.Hutao/App.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/App.xaml
@@ -9,6 +9,9 @@
                 <ResourceDictionary Source="ms-appx:///CommunityToolkit.WinUI.Controls.SettingsControls/SettingsCard/SettingsCard.xaml"/>
                 <ResourceDictionary Source="ms-appx:///CommunityToolkit.WinUI.Controls.TokenizingTextBox/TokenizingTextBox.xaml"/>
                 <ResourceDictionary Source="ms-appx:///UI/Xaml/Control/Loading.xaml"/>
+                <ResourceDictionary Source="ms-appx:///UI/Xaml/Control/Card/CardBlock.xaml"/>
+                <ResourceDictionary Source="ms-appx:///UI/Xaml/Control/Card/CardProgressBar.xaml"/>
+                <ResourceDictionary Source="ms-appx:///UI/Xaml/Control/Card/HorizontalCard.xaml"/>
                 <ResourceDictionary Source="ms-appx:///UI/Xaml/Control/Image/CachedImage.xaml"/>
                 <ResourceDictionary Source="ms-appx:///UI/Xaml/Control/Theme/Card.xaml"/>
                 <ResourceDictionary Source="ms-appx:///UI/Xaml/Control/Theme/Color.xaml"/>
@@ -30,7 +33,6 @@
                 <ResourceDictionary Source="ms-appx:///UI/Xaml/Control/Theme/TransitionCollection.xaml"/>
                 <ResourceDictionary Source="ms-appx:///UI/Xaml/Control/Theme/Uri.xaml"/>
                 <ResourceDictionary Source="ms-appx:///UI/Xaml/Control/Theme/WindowOverride.xaml"/>
-                <ResourceDictionary Source="ms-appx:///View/Card/Primitive/CardProgressBar.xaml"/>
                 <ResourceDictionary Source="ms-appx:///View/Control/RateDeltaTextBlockStyle.xaml"/>
             </ResourceDictionary.MergedDictionaries>
 
diff --git a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/AchievementIconConverter.cs b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/AchievementIconConverter.cs
index 7c448e0f..58bc1350 100644
--- a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/AchievementIconConverter.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/AchievementIconConverter.cs
@@ -1,7 +1,7 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
-using Snap.Hutao.UI.Xaml.Data;
+using Snap.Hutao.UI.Xaml.Data.Converter;
 
 namespace Snap.Hutao.Model.Metadata.Converter;
 
diff --git a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/AssociationTypeIconConverter.cs b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/AssociationTypeIconConverter.cs
index af0cd3ca..6ce9994c 100644
--- a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/AssociationTypeIconConverter.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/AssociationTypeIconConverter.cs
@@ -3,7 +3,7 @@
 
 using Snap.Hutao.Core.ExceptionService;
 using Snap.Hutao.Model.Intrinsic;
-using Snap.Hutao.UI.Xaml.Data;
+using Snap.Hutao.UI.Xaml.Data.Converter;
 
 namespace Snap.Hutao.Model.Metadata.Converter;
 
diff --git a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/AvatarCardConverter.cs b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/AvatarCardConverter.cs
index c3f241c7..e5dccfd4 100644
--- a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/AvatarCardConverter.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/AvatarCardConverter.cs
@@ -1,7 +1,7 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
-using Snap.Hutao.UI.Xaml.Data;
+using Snap.Hutao.UI.Xaml.Data.Converter;
 
 namespace Snap.Hutao.Model.Metadata.Converter;
 
diff --git a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/AvatarIconCircleConverter.cs b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/AvatarIconCircleConverter.cs
index c875b93b..26cccbea 100644
--- a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/AvatarIconCircleConverter.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/AvatarIconCircleConverter.cs
@@ -1,7 +1,7 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
-using Snap.Hutao.UI.Xaml.Data;
+using Snap.Hutao.UI.Xaml.Data.Converter;
 
 namespace Snap.Hutao.Model.Metadata.Converter;
 
diff --git a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/AvatarIconConverter.cs b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/AvatarIconConverter.cs
index c918f0f2..5d62802c 100644
--- a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/AvatarIconConverter.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/AvatarIconConverter.cs
@@ -1,7 +1,7 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
-using Snap.Hutao.UI.Xaml.Data;
+using Snap.Hutao.UI.Xaml.Data.Converter;
 
 namespace Snap.Hutao.Model.Metadata.Converter;
 
diff --git a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/AvatarNameCardPicConverter.cs b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/AvatarNameCardPicConverter.cs
index 3fa499f7..b3132c07 100644
--- a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/AvatarNameCardPicConverter.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/AvatarNameCardPicConverter.cs
@@ -1,7 +1,7 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
-using Snap.Hutao.UI.Xaml.Data;
+using Snap.Hutao.UI.Xaml.Data.Converter;
 
 namespace Snap.Hutao.Model.Metadata.Converter;
 
diff --git a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/AvatarSideIconConverter.cs b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/AvatarSideIconConverter.cs
index f4846312..a173be9e 100644
--- a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/AvatarSideIconConverter.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/AvatarSideIconConverter.cs
@@ -1,7 +1,7 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
-using Snap.Hutao.UI.Xaml.Data;
+using Snap.Hutao.UI.Xaml.Data.Converter;
 
 namespace Snap.Hutao.Model.Metadata.Converter;
 
diff --git a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/DescriptionsParametersDescriptor.cs b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/DescriptionsParametersDescriptor.cs
index d08c4648..003fdb77 100644
--- a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/DescriptionsParametersDescriptor.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/DescriptionsParametersDescriptor.cs
@@ -5,7 +5,7 @@ using Snap.Hutao.Core.ExceptionService;
 using Snap.Hutao.Metadata;
 using Snap.Hutao.Model.Metadata.Avatar;
 using Snap.Hutao.Model.Primitive;
-using Snap.Hutao.UI.Xaml.Data;
+using Snap.Hutao.UI.Xaml.Data.Converter;
 using System.Globalization;
 using System.Runtime.InteropServices;
 using System.Text.RegularExpressions;
diff --git a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/ElementNameIconConverter.cs b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/ElementNameIconConverter.cs
index b3bc5141..db711f59 100644
--- a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/ElementNameIconConverter.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/ElementNameIconConverter.cs
@@ -2,7 +2,7 @@
 // Licensed under the MIT license.
 
 using Snap.Hutao.Model.Intrinsic;
-using Snap.Hutao.UI.Xaml.Data;
+using Snap.Hutao.UI.Xaml.Data.Converter;
 using System.Collections.Frozen;
 
 namespace Snap.Hutao.Model.Metadata.Converter;
diff --git a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/EmotionIconConverter.cs b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/EmotionIconConverter.cs
index ce553ccb..760a339e 100644
--- a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/EmotionIconConverter.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/EmotionIconConverter.cs
@@ -1,7 +1,7 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
-using Snap.Hutao.UI.Xaml.Data;
+using Snap.Hutao.UI.Xaml.Data.Converter;
 
 namespace Snap.Hutao.Model.Metadata.Converter;
 
diff --git a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/EquipIconConverter.cs b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/EquipIconConverter.cs
index 303799b1..09626ec8 100644
--- a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/EquipIconConverter.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/EquipIconConverter.cs
@@ -1,7 +1,7 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
-using Snap.Hutao.UI.Xaml.Data;
+using Snap.Hutao.UI.Xaml.Data.Converter;
 
 namespace Snap.Hutao.Model.Metadata.Converter;
 
diff --git a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/GachaAvatarIconConverter.cs b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/GachaAvatarIconConverter.cs
index 9768f400..5ae05bc0 100644
--- a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/GachaAvatarIconConverter.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/GachaAvatarIconConverter.cs
@@ -1,7 +1,7 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
-using Snap.Hutao.UI.Xaml.Data;
+using Snap.Hutao.UI.Xaml.Data.Converter;
 
 namespace Snap.Hutao.Model.Metadata.Converter;
 
diff --git a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/GachaAvatarImgConverter.cs b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/GachaAvatarImgConverter.cs
index a157513b..1ec6bf6e 100644
--- a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/GachaAvatarImgConverter.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/GachaAvatarImgConverter.cs
@@ -1,7 +1,7 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
-using Snap.Hutao.UI.Xaml.Data;
+using Snap.Hutao.UI.Xaml.Data.Converter;
 
 namespace Snap.Hutao.Model.Metadata.Converter;
 
diff --git a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/GachaEquipIconConverter.cs b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/GachaEquipIconConverter.cs
index 6a406c72..6c749768 100644
--- a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/GachaEquipIconConverter.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/GachaEquipIconConverter.cs
@@ -1,7 +1,7 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
-using Snap.Hutao.UI.Xaml.Data;
+using Snap.Hutao.UI.Xaml.Data.Converter;
 
 namespace Snap.Hutao.Model.Metadata.Converter;
 
diff --git a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/ItemIconConverter.cs b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/ItemIconConverter.cs
index b5bac2bd..f1769c55 100644
--- a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/ItemIconConverter.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/ItemIconConverter.cs
@@ -1,7 +1,7 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
-using Snap.Hutao.UI.Xaml.Data;
+using Snap.Hutao.UI.Xaml.Data.Converter;
 
 namespace Snap.Hutao.Model.Metadata.Converter;
 
diff --git a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/MonsterIconConverter.cs b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/MonsterIconConverter.cs
index 5c9e9f09..47f6a4ea 100644
--- a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/MonsterIconConverter.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/MonsterIconConverter.cs
@@ -1,7 +1,7 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
-using Snap.Hutao.UI.Xaml.Data;
+using Snap.Hutao.UI.Xaml.Data.Converter;
 
 namespace Snap.Hutao.Model.Metadata.Converter;
 
diff --git a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/PropertiesParametersDescriptor.cs b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/PropertiesParametersDescriptor.cs
index 370c8f19..acf216c2 100644
--- a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/PropertiesParametersDescriptor.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/PropertiesParametersDescriptor.cs
@@ -2,7 +2,7 @@
 // Licensed under the MIT license.
 
 using Snap.Hutao.Model.Intrinsic;
-using Snap.Hutao.UI.Xaml.Data;
+using Snap.Hutao.UI.Xaml.Data.Converter;
 
 namespace Snap.Hutao.Model.Metadata.Converter;
 
diff --git a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/QualityColorConverter.cs b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/QualityColorConverter.cs
index 6c55c2c4..be3c3424 100644
--- a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/QualityColorConverter.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/QualityColorConverter.cs
@@ -4,7 +4,7 @@
 using Microsoft.UI;
 using Snap.Hutao.Model.Intrinsic;
 using Snap.Hutao.UI.Xaml.Control.Theme;
-using Snap.Hutao.UI.Xaml.Data;
+using Snap.Hutao.UI.Xaml.Data.Converter;
 using System.Collections.Frozen;
 using Windows.UI;
 
diff --git a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/QualityConverter.cs b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/QualityConverter.cs
index 1c932bab..1b52ed30 100644
--- a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/QualityConverter.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/QualityConverter.cs
@@ -2,7 +2,7 @@
 // Licensed under the MIT license.
 
 using Snap.Hutao.Model.Intrinsic;
-using Snap.Hutao.UI.Xaml.Data;
+using Snap.Hutao.UI.Xaml.Data.Converter;
 
 namespace Snap.Hutao.Model.Metadata.Converter;
 
diff --git a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/RelicIconConverter.cs b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/RelicIconConverter.cs
index c7d916d7..b73cc6c2 100644
--- a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/RelicIconConverter.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/RelicIconConverter.cs
@@ -1,7 +1,7 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
-using Snap.Hutao.UI.Xaml.Data;
+using Snap.Hutao.UI.Xaml.Data.Converter;
 
 namespace Snap.Hutao.Model.Metadata.Converter;
 
diff --git a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/SkillIconConverter.cs b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/SkillIconConverter.cs
index 237fedc6..2fa8c568 100644
--- a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/SkillIconConverter.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/SkillIconConverter.cs
@@ -1,7 +1,7 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
-using Snap.Hutao.UI.Xaml.Data;
+using Snap.Hutao.UI.Xaml.Data.Converter;
 
 namespace Snap.Hutao.Model.Metadata.Converter;
 
diff --git a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/WeaponTypeIconConverter.cs b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/WeaponTypeIconConverter.cs
index f75b6354..e49a15a0 100644
--- a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/WeaponTypeIconConverter.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/WeaponTypeIconConverter.cs
@@ -3,7 +3,7 @@
 
 using Snap.Hutao.Core.ExceptionService;
 using Snap.Hutao.Model.Intrinsic;
-using Snap.Hutao.UI.Xaml.Data;
+using Snap.Hutao.UI.Xaml.Data.Converter;
 using System.Collections.Frozen;
 
 namespace Snap.Hutao.Model.Metadata.Converter;
diff --git a/src/Snap.Hutao/Snap.Hutao/Service/Abstraction/DbStoreOptions.cs b/src/Snap.Hutao/Snap.Hutao/Service/Abstraction/DbStoreOptions.cs
index 9e9aa78a..7774526e 100644
--- a/src/Snap.Hutao/Snap.Hutao/Service/Abstraction/DbStoreOptions.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Service/Abstraction/DbStoreOptions.cs
@@ -4,8 +4,10 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 using Microsoft.EntityFrameworkCore;
 using Snap.Hutao.Core.Database;
+using Snap.Hutao.Model.Entity;
 using Snap.Hutao.Model.Entity.Database;
 using System.Globalization;
+using System.Linq.Expressions;
 using System.Runtime.CompilerServices;
 
 namespace Snap.Hutao.Service.Abstraction;
@@ -30,6 +32,18 @@ internal abstract partial class DbStoreOptions : ObservableObject
         return input.ToStringOrEmpty();
     }
 
+    protected void InitializeOptions(string keyLike, Expression<Func<SettingEntry, bool>> entrySelector, Action<string, string?> entryAction)
+    {
+        using (IServiceScope scope = serviceProvider.CreateScope())
+        {
+            AppDbContext appDbContext = scope.ServiceProvider.GetRequiredService<AppDbContext>();
+            foreach (SettingEntry entry in appDbContext.Settings.Where(entrySelector))
+            {
+                entryAction(entry.Key, entry.Value);
+            }
+        }
+    }
+
     protected string GetOption(ref string? storage, string key, string defaultValue = "")
     {
         return GetOption(ref storage, key, () => defaultValue);
diff --git a/src/Snap.Hutao/Snap.Hutao/Service/Abstraction/IAppInfrastructureService.cs b/src/Snap.Hutao/Snap.Hutao/Service/Abstraction/IAppInfrastructureService.cs
index 0cff36dd..76a1ca4e 100644
--- a/src/Snap.Hutao/Snap.Hutao/Service/Abstraction/IAppInfrastructureService.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Service/Abstraction/IAppInfrastructureService.cs
@@ -3,7 +3,7 @@
 
 namespace Snap.Hutao.Service.Abstraction;
 
-internal interface IAppInfrastructureService
+internal interface IAppInfrastructureService : IAppService
 {
     IServiceProvider ServiceProvider { get; }
 }
\ No newline at end of file
diff --git a/src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj b/src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj
index 95d8169f..aea37823 100644
--- a/src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj
+++ b/src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj
@@ -90,6 +90,8 @@
     <None Remove="Control\Image\CachedImage.xaml" />
     <None Remove="Control\Loading.xaml" />
     <None Remove="Control\Panel\LayoutSwitch.xaml" />
+    <None Remove="UI\Xaml\Control\Card\CardBlock.xaml" />
+    <None Remove="UI\Xaml\Control\Card\HorizontalCard.xaml" />
     <None Remove="UI\Xaml\Control\Theme\Card.xaml" />
     <None Remove="UI\Xaml\Control\Theme\Color.xaml" />
     <None Remove="UI\Xaml\Control\Theme\ComboBox.xaml" />
@@ -148,8 +150,6 @@
     <None Remove="View\Card\DailyNoteCard.xaml" />
     <None Remove="View\Card\GachaStatisticsCard.xaml" />
     <None Remove="View\Card\LaunchGameCard.xaml" />
-    <None Remove="View\Card\Primitive\CardProgressBar.xaml" />
-    <None Remove="View\Card\Primitive\HorizontalCard.xaml" />
     <None Remove="View\Control\BaseValueSlider.xaml" />
     <None Remove="View\Control\BottomTextControl.xaml" />
     <None Remove="View\Control\DescParamComboBox.xaml" />
@@ -416,11 +416,6 @@
       <Generator>MSBuild:Compile</Generator>
     </Page>
   </ItemGroup>
-  <ItemGroup>
-    <Page Update="View\Card\Primitive\HorizontalCard.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-  </ItemGroup>
 
   <ItemGroup>
     <Page Update="View\Dialog\HutaoPassportUnregisterDialog.xaml">
@@ -458,12 +453,6 @@
     </Page>
   </ItemGroup>
 
-  <ItemGroup>
-    <Page Update="View\Card\Primitive\CardProgressBar.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-  </ItemGroup>
-
   <ItemGroup>
     <Page Update="View\Card\CardBlock.xaml">
       <Generator>MSBuild:Compile</Generator>
@@ -778,5 +767,16 @@
   <ItemGroup>
     <Folder Include="UI\Xaml\Control\Image\" />
     <Folder Include="UI\Shell\" />
+    <Folder Include="View\Converter\" />
+  </ItemGroup>
+  <ItemGroup>
+    <Page Update="UI\Xaml\Control\Card\HorizontalCard.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+  <ItemGroup>
+    <Page Update="UI\Xaml\Control\Card\CardBlock.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
   </ItemGroup>
 </Project>
diff --git a/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Control/Card/CardBlock.cs b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Control/Card/CardBlock.cs
new file mode 100644
index 00000000..6c2ecccd
--- /dev/null
+++ b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Control/Card/CardBlock.cs
@@ -0,0 +1,16 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+namespace Snap.Hutao.UI.Xaml.Control.Card;
+
+[DependencyProperty("Text", typeof(string))]
+[DependencyProperty("ImageSource", typeof(object))]
+[DependencyProperty("IsDotVisible", typeof(bool), false)]
+[DependencyProperty("IconSquareLength", typeof(double))]
+internal sealed partial class CardBlock : Microsoft.UI.Xaml.Controls.Control
+{
+    public CardBlock()
+    {
+        DefaultStyleKey = typeof(CardBlock);
+    }
+}
\ No newline at end of file
diff --git a/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Control/Card/CardBlock.xaml b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Control/Card/CardBlock.xaml
new file mode 100644
index 00000000..c4ea2e93
--- /dev/null
+++ b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Control/Card/CardBlock.xaml
@@ -0,0 +1,37 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:shux="using:Snap.Hutao.UI.Xaml"
+    xmlns:shuxcc="using:Snap.Hutao.UI.Xaml.Control.Card"
+    xmlns:shuxci="using:Snap.Hutao.UI.Xaml.Control.Image">
+
+    <Style BasedOn="{StaticResource DefaultCardBlockStyle}" TargetType="shuxcc:CardBlock"/>
+
+    <Style x:Key="DefaultCardBlockStyle" TargetType="shuxcc:CardBlock">
+        <Setter Property="IconSquareLength" Value="32"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="shuxcc:CardBlock">
+                    <Grid>
+                        <StackPanel VerticalAlignment="Center">
+                            <shuxci:CachedImage shux:FrameworkElementHelper.SquareLength="{TemplateBinding IconSquareLength}" Source="{TemplateBinding ImageSource}"/>
+                            <TextBlock
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center"
+                                Style="{StaticResource CaptionTextBlockStyle}"
+                                Text="{TemplateBinding Text}"/>
+                        </StackPanel>
+                        <InfoBadge
+                            Margin="8"
+                            HorizontalAlignment="Right"
+                            VerticalAlignment="Top"
+                            shux:FrameworkElementHelper.SquareLength="8"
+                            Style="{ThemeResource AttentionDotInfoBadgeStyle}"
+                            Visibility="{Binding IsDotVisible, Source={RelativeSource TemplatedParent}, Converter={StaticResource BoolToVisibilityConverter}}"/>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+</ResourceDictionary>
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Card/Primitive/CardProgressBar.cs b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Control/Card/CardProgressBar.cs
similarity index 74%
rename from src/Snap.Hutao/Snap.Hutao/View/Card/Primitive/CardProgressBar.cs
rename to src/Snap.Hutao/Snap.Hutao/UI/Xaml/Control/Card/CardProgressBar.cs
index a4da71e4..63159821 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Card/Primitive/CardProgressBar.cs
+++ b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Control/Card/CardProgressBar.cs
@@ -5,7 +5,7 @@ using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Media;
 
-namespace Snap.Hutao.View.Card.Primitive;
+namespace Snap.Hutao.UI.Xaml.Control.Card;
 
 [DependencyProperty("ProgressForeground", typeof(Brush))]
 [DependencyProperty("TextForeground", typeof(Brush))]
@@ -13,9 +13,10 @@ namespace Snap.Hutao.View.Card.Primitive;
 [DependencyProperty("Value", typeof(double))]
 [DependencyProperty("Header", typeof(string))]
 [DependencyProperty("Description", typeof(string))]
-internal sealed partial class CardProgressBar : ContentControl
+internal sealed partial class CardProgressBar : Microsoft.UI.Xaml.Controls.Control
 {
     public CardProgressBar()
     {
+        DefaultStyleKey = typeof(CardProgressBar);
     }
-}
+}
\ No newline at end of file
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Card/Primitive/CardProgressBar.xaml b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Control/Card/CardProgressBar.xaml
similarity index 63%
rename from src/Snap.Hutao/Snap.Hutao/View/Card/Primitive/CardProgressBar.xaml
rename to src/Snap.Hutao/Snap.Hutao/UI/Xaml/Control/Card/CardProgressBar.xaml
index baf105b4..88eccf99 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Card/Primitive/CardProgressBar.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Control/Card/CardProgressBar.xaml
@@ -1,16 +1,16 @@
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:shvcp="using:Snap.Hutao.View.Card.Primitive">
+    xmlns:shuxcc="using:Snap.Hutao.UI.Xaml.Control.Card">
 
-    <Style BasedOn="{StaticResource DefaultCardProgressBarStyle}" TargetType="shvcp:CardProgressBar"/>
+    <Style BasedOn="{StaticResource DefaultCardProgressBarStyle}" TargetType="shuxcc:CardProgressBar"/>
 
-    <Style x:Key="DefaultCardProgressBarStyle" TargetType="shvcp:CardProgressBar">
+    <Style x:Key="DefaultCardProgressBarStyle" TargetType="shuxcc:CardProgressBar">
         <Setter Property="TextForeground" Value="{ThemeResource TextFillColorPrimaryBrush}"/>
         <Setter Property="MinHeight" Value="40"/>
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate>
+                <ControlTemplate TargetType="shuxcc:CardProgressBar">
                     <Grid MinHeight="{TemplateBinding MinHeight}" Style="{ThemeResource GridCardStyle}">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="auto"/>
@@ -21,25 +21,25 @@
                             MinHeight="{TemplateBinding MinHeight}"
                             Background="Transparent"
                             CornerRadius="{StaticResource ControlCornerRadius}"
-                            Foreground="{Binding ProgressForeground, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}"
-                            Maximum="{Binding Maximum, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}"
+                            Foreground="{TemplateBinding ProgressForeground}"
+                            Maximum="{TemplateBinding Maximum}"
                             Opacity="{StaticResource LargeBackgroundProgressBarOpacity}"
-                            Value="{Binding Value, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}"/>
+                            Value="{TemplateBinding Value}"/>
                         <TextBlock
                             Grid.Column="0"
                             Margin="6,0"
                             HorizontalAlignment="Center"
                             VerticalAlignment="Center"
-                            Foreground="{Binding TextForeground, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}"
+                            Foreground="{TemplateBinding TextForeground}"
                             Style="{StaticResource CaptionTextBlockStyle}"
-                            Text="{Binding Header, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}"/>
+                            Text="{TemplateBinding Header}"/>
                         <TextBlock
                             Grid.Column="1"
                             HorizontalAlignment="Center"
                             VerticalAlignment="Center"
-                            Foreground="{Binding TextForeground, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}"
+                            Foreground="{TemplateBinding TextForeground}"
                             Style="{StaticResource CaptionTextBlockStyle}"
-                            Text="{Binding Description, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}"/>
+                            Text="{TemplateBinding Description}"/>
                     </Grid>
                 </ControlTemplate>
             </Setter.Value>
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Card/Primitive/CardReference.cs b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Control/Card/CardReference.cs
similarity index 88%
rename from src/Snap.Hutao/Snap.Hutao/View/Card/Primitive/CardReference.cs
rename to src/Snap.Hutao/Snap.Hutao/UI/Xaml/Control/Card/CardReference.cs
index 2fb443b2..789cfd9f 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Card/Primitive/CardReference.cs
+++ b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Control/Card/CardReference.cs
@@ -3,7 +3,7 @@
 
 using Microsoft.UI.Xaml.Controls;
 
-namespace Snap.Hutao.View.Card.Primitive;
+namespace Snap.Hutao.UI.Xaml.Control.Card;
 
 /// <summary>
 /// 保存对卡片的引用
diff --git a/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Control/Card/HorizontalCard.cs b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Control/Card/HorizontalCard.cs
new file mode 100644
index 00000000..ed2799e8
--- /dev/null
+++ b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Control/Card/HorizontalCard.cs
@@ -0,0 +1,16 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+using Microsoft.UI.Xaml;
+
+namespace Snap.Hutao.UI.Xaml.Control.Card;
+
+[DependencyProperty("Left", typeof(UIElement), default!)]
+[DependencyProperty("Right", typeof(UIElement), default!)]
+internal sealed partial class HorizontalCard : Microsoft.UI.Xaml.Controls.Control
+{
+    public HorizontalCard()
+    {
+        DefaultStyleKey = typeof(HorizontalCard);
+    }
+}
diff --git a/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Control/Card/HorizontalCard.xaml b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Control/Card/HorizontalCard.xaml
new file mode 100644
index 00000000..91abefa4
--- /dev/null
+++ b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Control/Card/HorizontalCard.xaml
@@ -0,0 +1,31 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:shuxcc="using:Snap.Hutao.UI.Xaml.Control.Card">
+
+    <Style BasedOn="{StaticResource DefaultHorizontalCardStyle}" TargetType="shuxcc:HorizontalCard"/>
+
+    <Style x:Key="DefaultHorizontalCardStyle" TargetType="shuxcc:HorizontalCard">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="shuxcc:HorizontalCard">
+                    <Border Style="{StaticResource BorderCardStyle}">
+                        <Grid Background="{TemplateBinding Background}">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="auto"/>
+                                <ColumnDefinition Width="*"/>
+                            </Grid.ColumnDefinitions>
+                            <Border Child="{TemplateBinding Left}"/>
+                            <Border
+                                Grid.Column="1"
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Center"
+                                Child="{TemplateBinding Right}"/>
+                        </Grid>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Control/Theme/Converter.xaml b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Control/Theme/Converter.xaml
index d9b8a21e..663d2642 100644
--- a/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Control/Theme/Converter.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Control/Theme/Converter.xaml
@@ -3,7 +3,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:cwc="using:CommunityToolkit.WinUI.Converters"
     xmlns:shmmc="using:Snap.Hutao.Model.Metadata.Converter"
-    xmlns:shvc="using:Snap.Hutao.View.Converter">
+    xmlns:shuxdc="using:Snap.Hutao.UI.Xaml.Data.Converter">
     <cwc:BoolNegationConverter x:Key="BoolNegationConverter"/>
     <cwc:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter"/>
     <cwc:FileSizeToFriendlyStringConverter x:Key="FileSizeToFriendlyStringConverter"/>
@@ -25,12 +25,12 @@
     <shmmc:PropertiesParametersDescriptor x:Key="PropertyDescriptor"/>
     <shmmc:QualityColorConverter x:Key="QualityColorConverter"/>
     <shmmc:WeaponTypeIconConverter x:Key="WeaponTypeIconConverter"/>
-    <shvc:BoolToVisibilityRevertConverter x:Key="BoolToVisibilityRevertConverter"/>
-    <shvc:EmptyObjectToBoolConverter x:Key="EmptyObjectToBoolConverter"/>
-    <shvc:EmptyObjectToBoolRevertConverter x:Key="EmptyObjectToBoolRevertConverter"/>
-    <shvc:EmptyObjectToVisibilityConverter x:Key="EmptyObjectToVisibilityConverter"/>
-    <shvc:EmptyObjectToVisibilityRevertConverter x:Key="EmptyObjectToVisibilityRevertConverter"/>
-    <shvc:Int32ToVisibilityConverter x:Key="Int32ToVisibilityConverter"/>
-    <shvc:Int32ToVisibilityRevertConverter x:Key="Int32ToVisibilityRevertConverter"/>
-    <shvc:StringBoolConverter x:Key="StringBoolConverter"/>
-</ResourceDictionary>
+    <shuxdc:BoolToVisibilityRevertConverter x:Key="BoolToVisibilityRevertConverter"/>
+    <shuxdc:EmptyObjectToBoolConverter x:Key="EmptyObjectToBoolConverter"/>
+    <shuxdc:EmptyObjectToBoolRevertConverter x:Key="EmptyObjectToBoolRevertConverter"/>
+    <shuxdc:EmptyObjectToVisibilityConverter x:Key="EmptyObjectToVisibilityConverter"/>
+    <shuxdc:EmptyObjectToVisibilityRevertConverter x:Key="EmptyObjectToVisibilityRevertConverter"/>
+    <shuxdc:Int32ToVisibilityConverter x:Key="Int32ToVisibilityConverter"/>
+    <shuxdc:Int32ToVisibilityRevertConverter x:Key="Int32ToVisibilityRevertConverter"/>
+    <shuxdc:StringBoolConverter x:Key="StringBoolConverter"/>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Converter/BoolToVisibilityRevertConverter.cs b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Data/Converter/BoolToVisibilityRevertConverter.cs
similarity index 93%
rename from src/Snap.Hutao/Snap.Hutao/View/Converter/BoolToVisibilityRevertConverter.cs
rename to src/Snap.Hutao/Snap.Hutao/UI/Xaml/Data/Converter/BoolToVisibilityRevertConverter.cs
index f4ec39d6..2cfa0f62 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Converter/BoolToVisibilityRevertConverter.cs
+++ b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Data/Converter/BoolToVisibilityRevertConverter.cs
@@ -4,7 +4,7 @@
 using CommunityToolkit.WinUI.Converters;
 using Microsoft.UI.Xaml;
 
-namespace Snap.Hutao.View.Converter;
+namespace Snap.Hutao.UI.Xaml.Data.Converter;
 
 /// <summary>
 /// This class converts a boolean value into a Visibility enumeration.
diff --git a/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Data/DependencyValueConverter.cs b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Data/Converter/DependencyValueConverter.cs
similarity index 94%
rename from src/Snap.Hutao/Snap.Hutao/UI/Xaml/Data/DependencyValueConverter.cs
rename to src/Snap.Hutao/Snap.Hutao/UI/Xaml/Data/Converter/DependencyValueConverter.cs
index af71065f..39513e0f 100644
--- a/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Data/DependencyValueConverter.cs
+++ b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Data/Converter/DependencyValueConverter.cs
@@ -5,7 +5,7 @@ using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Data;
 using Snap.Hutao.Core.ExceptionService;
 
-namespace Snap.Hutao.UI.Xaml.Data;
+namespace Snap.Hutao.UI.Xaml.Data.Converter;
 
 internal abstract class DependencyValueConverter<TFrom, TTo> : DependencyObject, IValueConverter
 {
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Converter/EmptyObjectToBoolConverter.cs b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Data/Converter/EmptyObjectToBoolConverter.cs
similarity index 92%
rename from src/Snap.Hutao/Snap.Hutao/View/Converter/EmptyObjectToBoolConverter.cs
rename to src/Snap.Hutao/Snap.Hutao/UI/Xaml/Data/Converter/EmptyObjectToBoolConverter.cs
index e80875e9..a05094ea 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Converter/EmptyObjectToBoolConverter.cs
+++ b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Data/Converter/EmptyObjectToBoolConverter.cs
@@ -3,7 +3,7 @@
 
 using CommunityToolkit.WinUI.Converters;
 
-namespace Snap.Hutao.View.Converter;
+namespace Snap.Hutao.UI.Xaml.Data.Converter;
 
 /// <summary>
 /// This class converts a object? value into a boolean.
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Converter/EmptyObjectToBoolRevertConverter.cs b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Data/Converter/EmptyObjectToBoolRevertConverter.cs
similarity index 92%
rename from src/Snap.Hutao/Snap.Hutao/View/Converter/EmptyObjectToBoolRevertConverter.cs
rename to src/Snap.Hutao/Snap.Hutao/UI/Xaml/Data/Converter/EmptyObjectToBoolRevertConverter.cs
index cbdd8947..8e4cfd8f 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Converter/EmptyObjectToBoolRevertConverter.cs
+++ b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Data/Converter/EmptyObjectToBoolRevertConverter.cs
@@ -3,7 +3,7 @@
 
 using CommunityToolkit.WinUI.Converters;
 
-namespace Snap.Hutao.View.Converter;
+namespace Snap.Hutao.UI.Xaml.Data.Converter;
 
 /// <summary>
 /// This class converts a object? value into a boolean in reverse.
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Converter/EmptyObjectToVisibilityConverter.cs b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Data/Converter/EmptyObjectToVisibilityConverter.cs
similarity index 93%
rename from src/Snap.Hutao/Snap.Hutao/View/Converter/EmptyObjectToVisibilityConverter.cs
rename to src/Snap.Hutao/Snap.Hutao/UI/Xaml/Data/Converter/EmptyObjectToVisibilityConverter.cs
index 3a05915a..1bf9efd8 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Converter/EmptyObjectToVisibilityConverter.cs
+++ b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Data/Converter/EmptyObjectToVisibilityConverter.cs
@@ -4,7 +4,7 @@
 using CommunityToolkit.WinUI.Converters;
 using Microsoft.UI.Xaml;
 
-namespace Snap.Hutao.View.Converter;
+namespace Snap.Hutao.UI.Xaml.Data.Converter;
 
 /// <summary>
 /// This class converts a object? value into a Visibility enumeration.
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Converter/EmptyObjectToVisibilityRevertConverter.cs b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Data/Converter/EmptyObjectToVisibilityRevertConverter.cs
similarity index 93%
rename from src/Snap.Hutao/Snap.Hutao/View/Converter/EmptyObjectToVisibilityRevertConverter.cs
rename to src/Snap.Hutao/Snap.Hutao/UI/Xaml/Data/Converter/EmptyObjectToVisibilityRevertConverter.cs
index aa56db4a..6bab3a8b 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Converter/EmptyObjectToVisibilityRevertConverter.cs
+++ b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Data/Converter/EmptyObjectToVisibilityRevertConverter.cs
@@ -4,7 +4,7 @@
 using CommunityToolkit.WinUI.Converters;
 using Microsoft.UI.Xaml;
 
-namespace Snap.Hutao.View.Converter;
+namespace Snap.Hutao.UI.Xaml.Data.Converter;
 
 /// <summary>
 /// This class converts a object? value into a Visibility enumeration in reverse.
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Converter/Int32ToVisibilityConverter.cs b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Data/Converter/Int32ToVisibilityConverter.cs
similarity index 93%
rename from src/Snap.Hutao/Snap.Hutao/View/Converter/Int32ToVisibilityConverter.cs
rename to src/Snap.Hutao/Snap.Hutao/UI/Xaml/Data/Converter/Int32ToVisibilityConverter.cs
index 92881058..e35f6806 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Converter/Int32ToVisibilityConverter.cs
+++ b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Data/Converter/Int32ToVisibilityConverter.cs
@@ -5,7 +5,7 @@ using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Data;
 using Snap.Hutao.Core.ExceptionService;
 
-namespace Snap.Hutao.View.Converter;
+namespace Snap.Hutao.UI.Xaml.Data.Converter;
 
 /// <summary>
 /// Int32 转 Visibility
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Converter/Int32ToVisibilityRevertConverter.cs b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Data/Converter/Int32ToVisibilityRevertConverter.cs
similarity index 94%
rename from src/Snap.Hutao/Snap.Hutao/View/Converter/Int32ToVisibilityRevertConverter.cs
rename to src/Snap.Hutao/Snap.Hutao/UI/Xaml/Data/Converter/Int32ToVisibilityRevertConverter.cs
index da318110..e30062d1 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Converter/Int32ToVisibilityRevertConverter.cs
+++ b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Data/Converter/Int32ToVisibilityRevertConverter.cs
@@ -5,7 +5,7 @@ using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Data;
 using Snap.Hutao.Core.ExceptionService;
 
-namespace Snap.Hutao.View.Converter;
+namespace Snap.Hutao.UI.Xaml.Data.Converter;
 
 /// <summary>
 /// Int32 反转 Visibility
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Converter/Specialized/BackdropTypeToOpacityConverter.cs b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Data/Converter/Specialized/BackdropTypeToOpacityConverter.cs
similarity index 81%
rename from src/Snap.Hutao/Snap.Hutao/View/Converter/Specialized/BackdropTypeToOpacityConverter.cs
rename to src/Snap.Hutao/Snap.Hutao/UI/Xaml/Data/Converter/Specialized/BackdropTypeToOpacityConverter.cs
index 3c74030e..8d2f89f4 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Converter/Specialized/BackdropTypeToOpacityConverter.cs
+++ b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Data/Converter/Specialized/BackdropTypeToOpacityConverter.cs
@@ -1,10 +1,9 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
-using Snap.Hutao.UI.Xaml.Data;
 using Snap.Hutao.UI.Xaml.Media.Backdrop;
 
-namespace Snap.Hutao.View.Converter.Specialized;
+namespace Snap.Hutao.UI.Xaml.Data.Converter.Specialized;
 
 internal sealed class BackdropTypeToOpacityConverter : ValueConverter<BackdropType, double>
 {
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Converter/BoolToGridLengthConverter.cs b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Data/Converter/Specialized/BoolToGridLengthConverter.cs
similarity index 87%
rename from src/Snap.Hutao/Snap.Hutao/View/Converter/BoolToGridLengthConverter.cs
rename to src/Snap.Hutao/Snap.Hutao/UI/Xaml/Data/Converter/Specialized/BoolToGridLengthConverter.cs
index e7b5e77f..5d8b4476 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Converter/BoolToGridLengthConverter.cs
+++ b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Data/Converter/Specialized/BoolToGridLengthConverter.cs
@@ -4,7 +4,7 @@
 using CommunityToolkit.WinUI.Converters;
 using Microsoft.UI.Xaml;
 
-namespace Snap.Hutao.View.Converter;
+namespace Snap.Hutao.UI.Xaml.Data.Converter.Specialized;
 
 internal sealed class BoolToGridLengthConverter : BoolToObjectConverter
 {
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Converter/Int32ToGradientColorConverter.cs b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Data/Converter/Specialized/Int32ToGradientColorConverter.cs
similarity index 93%
rename from src/Snap.Hutao/Snap.Hutao/View/Converter/Int32ToGradientColorConverter.cs
rename to src/Snap.Hutao/Snap.Hutao/UI/Xaml/Data/Converter/Specialized/Int32ToGradientColorConverter.cs
index 45328f15..e55830ad 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Converter/Int32ToGradientColorConverter.cs
+++ b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Data/Converter/Specialized/Int32ToGradientColorConverter.cs
@@ -2,12 +2,12 @@
 // Licensed under the MIT license.
 
 using Microsoft.UI.Xaml;
-using Snap.Hutao.UI.Xaml.Data;
+using Snap.Hutao.UI.Xaml.Data.Converter;
 using Snap.Hutao.Win32;
 using System.Runtime.CompilerServices;
 using Windows.UI;
 
-namespace Snap.Hutao.View.Converter;
+namespace Snap.Hutao.UI.Xaml.Data.Converter.Specialized;
 
 /// <summary>
 /// Int32 转 色阶颜色
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Converter/PanelSelectorModeConverter.cs b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Data/Converter/Specialized/LayoutSwitchModeConverter.cs
similarity index 86%
rename from src/Snap.Hutao/Snap.Hutao/View/Converter/PanelSelectorModeConverter.cs
rename to src/Snap.Hutao/Snap.Hutao/UI/Xaml/Data/Converter/Specialized/LayoutSwitchModeConverter.cs
index cce47a2a..f23866e2 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Converter/PanelSelectorModeConverter.cs
+++ b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Data/Converter/Specialized/LayoutSwitchModeConverter.cs
@@ -3,9 +3,9 @@
 
 using Microsoft.UI.Xaml;
 using Snap.Hutao.UI.Xaml.Control;
-using Snap.Hutao.UI.Xaml.Data;
+using Snap.Hutao.UI.Xaml.Data.Converter;
 
-namespace Snap.Hutao.View.Converter;
+namespace Snap.Hutao.UI.Xaml.Data.Converter.Specialized;
 
 /// <summary>
 /// 条件转换器
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Converter/UInt32ToGradientColorConverter.cs b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Data/Converter/Specialized/UInt32ToGradientColorConverter.cs
similarity index 93%
rename from src/Snap.Hutao/Snap.Hutao/View/Converter/UInt32ToGradientColorConverter.cs
rename to src/Snap.Hutao/Snap.Hutao/UI/Xaml/Data/Converter/Specialized/UInt32ToGradientColorConverter.cs
index 321c2e3e..87006d3f 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Converter/UInt32ToGradientColorConverter.cs
+++ b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Data/Converter/Specialized/UInt32ToGradientColorConverter.cs
@@ -2,12 +2,12 @@
 // Licensed under the MIT license.
 
 using Microsoft.UI.Xaml;
-using Snap.Hutao.UI.Xaml.Data;
+using Snap.Hutao.UI.Xaml.Data.Converter;
 using Snap.Hutao.Win32;
 using System.Runtime.CompilerServices;
 using Windows.UI;
 
-namespace Snap.Hutao.View.Converter;
+namespace Snap.Hutao.UI.Xaml.Data.Converter.Specialized;
 
 /// <summary>
 /// UInt32 转 色阶颜色
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Converter/StringBoolConverter.cs b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Data/Converter/StringBoolConverter.cs
similarity index 91%
rename from src/Snap.Hutao/Snap.Hutao/View/Converter/StringBoolConverter.cs
rename to src/Snap.Hutao/Snap.Hutao/UI/Xaml/Data/Converter/StringBoolConverter.cs
index ffc079b7..8415dbe1 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Converter/StringBoolConverter.cs
+++ b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Data/Converter/StringBoolConverter.cs
@@ -3,7 +3,7 @@
 
 using CommunityToolkit.WinUI.Converters;
 
-namespace Snap.Hutao.View.Converter;
+namespace Snap.Hutao.UI.Xaml.Data.Converter;
 
 /// <summary>
 /// 字符串空检查转换器
diff --git a/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Data/ValueConverter.cs b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Data/Converter/ValueConverter.cs
similarity index 93%
rename from src/Snap.Hutao/Snap.Hutao/UI/Xaml/Data/ValueConverter.cs
rename to src/Snap.Hutao/Snap.Hutao/UI/Xaml/Data/Converter/ValueConverter.cs
index 58cf81a4..65cfdad4 100644
--- a/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Data/ValueConverter.cs
+++ b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Data/Converter/ValueConverter.cs
@@ -4,7 +4,7 @@
 using Microsoft.UI.Xaml.Data;
 using Snap.Hutao.Core.ExceptionService;
 
-namespace Snap.Hutao.UI.Xaml.Data;
+namespace Snap.Hutao.UI.Xaml.Data.Converter;
 
 internal abstract class ValueConverter<TFrom, TTo> : IValueConverter
 {
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Converter/VisibilityToObjectConverter.cs b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Data/Converter/VisibilityToObjectConverter.cs
similarity index 92%
rename from src/Snap.Hutao/Snap.Hutao/View/Converter/VisibilityToObjectConverter.cs
rename to src/Snap.Hutao/Snap.Hutao/UI/Xaml/Data/Converter/VisibilityToObjectConverter.cs
index 62a55620..125004fd 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Converter/VisibilityToObjectConverter.cs
+++ b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Data/Converter/VisibilityToObjectConverter.cs
@@ -2,7 +2,7 @@
 // Licensed under the MIT license.
 
 using Microsoft.UI.Xaml;
-using Snap.Hutao.UI.Xaml.Data;
+using Snap.Hutao.UI.Xaml.Data.Converter;
 
 namespace Snap.Hutao.View.Converter;
 
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Card/DailyNoteCard.xaml b/src/Snap.Hutao/Snap.Hutao/View/Card/DailyNoteCard.xaml
index b9e42a41..ed5b7882 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Card/DailyNoteCard.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Card/DailyNoteCard.xaml
@@ -9,7 +9,7 @@
     xmlns:shuxb="using:Snap.Hutao.UI.Xaml.Behavior"
     xmlns:shuxm="using:Snap.Hutao.UI.Xaml.Markup"
     xmlns:shvc="using:Snap.Hutao.View.Control"
-    xmlns:shvcp="using:Snap.Hutao.View.Card.Primitive"
+    xmlns:shuxcc="using:Snap.Hutao.UI.Xaml.Control.Card"
     xmlns:shvd="using:Snap.Hutao.ViewModel.DailyNote"
     Padding="0"
     HorizontalAlignment="Stretch"
@@ -57,7 +57,7 @@
                     Style="{StaticResource CaptionTextBlockStyle}"
                     Text="{Binding RefreshTimeFormatted}"/>
 
-                <shvcp:CardBlock
+                <shuxcc:CardBlock
                     Grid.Row="1"
                     Grid.Column="0"
                     IconSquareLength="64"
@@ -73,12 +73,12 @@
                         <RowDefinition/>
                         <RowDefinition/>
                     </Grid.RowDefinitions>
-                    <shvcp:CardBlock
+                    <shuxcc:CardBlock
                         Grid.Row="0"
                         ImageSource="{StaticResource UI_ItemIcon_204}"
                         IsDotVisible="{Binding HomeCoinNotifySuppressed}"
                         Text="{Binding DailyNote.HomeCoinFormatted}"/>
-                    <shvcp:CardBlock
+                    <shuxcc:CardBlock
                         Grid.Row="1"
                         ImageSource="{StaticResource UI_MarkQuest_Events_Proce}"
                         IsDotVisible="{Binding DailyTaskNotifySuppressed}"
@@ -92,11 +92,11 @@
                         <RowDefinition/>
                         <RowDefinition/>
                     </Grid.RowDefinitions>
-                    <shvcp:CardBlock
+                    <shuxcc:CardBlock
                         Grid.Row="0"
                         ImageSource="{StaticResource UI_MarkTower}"
                         Text="{Binding DailyNote.ResinDiscountFormatted}"/>
-                    <shvcp:CardBlock
+                    <shuxcc:CardBlock
                         Grid.Row="1"
                         ImageSource="{StaticResource UI_ItemIcon_220021}"
                         IsDotVisible="{Binding TransformerNotifySuppressed}"
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Card/GachaStatisticsCard.xaml b/src/Snap.Hutao/Snap.Hutao/View/Card/GachaStatisticsCard.xaml
index 187b0e5d..3ff3c5e8 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Card/GachaStatisticsCard.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Card/GachaStatisticsCard.xaml
@@ -6,9 +6,9 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:mxi="using:Microsoft.Xaml.Interactivity"
     xmlns:shuxb="using:Snap.Hutao.UI.Xaml.Behavior"
+    xmlns:shuxcc="using:Snap.Hutao.UI.Xaml.Control.Card"
     xmlns:shuxm="using:Snap.Hutao.UI.Xaml.Markup"
     xmlns:shvc="using:Snap.Hutao.View.Control"
-    xmlns:shvcp="using:Snap.Hutao.View.Card.Primitive"
     xmlns:shvg="using:Snap.Hutao.ViewModel.GachaLog"
     Padding="0"
     HorizontalAlignment="Stretch"
@@ -64,7 +64,7 @@
                         TextTrimming="CharacterEllipsis"
                         TextWrapping="NoWrap"/>
 
-                    <shvcp:CardProgressBar
+                    <shuxcc:CardProgressBar
                         Grid.Column="0"
                         Description="{Binding LastOrangePull}"
                         Header="{shuxm:ResourceString Name=ViewControlStatisticsCardOrangeText}"
@@ -72,7 +72,7 @@
                         ProgressForeground="{StaticResource OrangeColorBrush}"
                         TextForeground="{StaticResource OrangeColorBrush}"
                         Value="{Binding LastOrangePull, Mode=OneWay}"/>
-                    <shvcp:CardProgressBar
+                    <shuxcc:CardProgressBar
                         Grid.Column="0"
                         Description="{Binding LastPurplePull}"
                         Header="{shuxm:ResourceString Name=ViewControlStatisticsCardPurpleText}"
@@ -96,7 +96,7 @@
                         TextTrimming="CharacterEllipsis"
                         TextWrapping="NoWrap"/>
 
-                    <shvcp:CardProgressBar
+                    <shuxcc:CardProgressBar
                         Grid.Column="0"
                         Description="{Binding LastOrangePull}"
                         Header="{shuxm:ResourceString Name=ViewControlStatisticsCardOrangeText}"
@@ -104,7 +104,7 @@
                         ProgressForeground="{StaticResource OrangeColorBrush}"
                         TextForeground="{StaticResource OrangeColorBrush}"
                         Value="{Binding LastOrangePull}"/>
-                    <shvcp:CardProgressBar
+                    <shuxcc:CardProgressBar
                         Grid.Column="0"
                         Description="{Binding LastPurplePull}"
                         Header="{shuxm:ResourceString Name=ViewControlStatisticsCardPurpleText}"
@@ -127,7 +127,7 @@
                         TextTrimming="CharacterEllipsis"
                         TextWrapping="NoWrap"/>
 
-                    <shvcp:CardProgressBar
+                    <shuxcc:CardProgressBar
                         Grid.Column="0"
                         Description="{Binding LastOrangePull}"
                         Header="{shuxm:ResourceString Name=ViewControlStatisticsCardOrangeText}"
@@ -135,7 +135,7 @@
                         ProgressForeground="{StaticResource OrangeColorBrush}"
                         TextForeground="{StaticResource OrangeColorBrush}"
                         Value="{Binding LastOrangePull}"/>
-                    <shvcp:CardProgressBar
+                    <shuxcc:CardProgressBar
                         Grid.Column="0"
                         Description="{Binding LastPurplePull}"
                         Header="{shuxm:ResourceString Name=ViewControlStatisticsCardPurpleText}"
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Card/Primitive/CardBlock.xaml b/src/Snap.Hutao/Snap.Hutao/View/Card/Primitive/CardBlock.xaml
deleted file mode 100644
index e00df735..00000000
--- a/src/Snap.Hutao/Snap.Hutao/View/Card/Primitive/CardBlock.xaml
+++ /dev/null
@@ -1,27 +0,0 @@
-<Grid
-    x:Class="Snap.Hutao.View.Card.Primitive.CardBlock"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    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:shux="using:Snap.Hutao.UI.Xaml"
-    xmlns:shuxci="using:Snap.Hutao.UI.Xaml.Control.Image"
-    Style="{ThemeResource GridCardStyle}"
-    mc:Ignorable="d">
-
-    <StackPanel VerticalAlignment="Center">
-        <shuxci:CachedImage shux:FrameworkElementHelper.SquareLength="{x:Bind IconSquareLength}" Source="{x:Bind ImageSource, Mode=OneWay}"/>
-        <TextBlock
-            HorizontalAlignment="Center"
-            VerticalAlignment="Center"
-            Style="{StaticResource CaptionTextBlockStyle}"
-            Text="{x:Bind Text, Mode=OneWay}"/>
-    </StackPanel>
-    <InfoBadge
-        Margin="8"
-        HorizontalAlignment="Right"
-        VerticalAlignment="Top"
-        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
deleted file mode 100644
index 51108dbc..00000000
--- a/src/Snap.Hutao/Snap.Hutao/View/Card/Primitive/CardBlock.xaml.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
-
-namespace Snap.Hutao.View.Card.Primitive;
-
-[DependencyProperty("Text", typeof(string))]
-[DependencyProperty("ImageSource", typeof(object))]
-[DependencyProperty("IsDotVisible", typeof(bool), false)]
-[DependencyProperty("IconSquareLength", typeof(double), 32D)]
-internal sealed partial class CardBlock : Grid
-{
-    public CardBlock()
-    {
-        // TODO: Convert to custom control
-        InitializeComponent();
-    }
-}
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Card/Primitive/HorizontalCard.xaml b/src/Snap.Hutao/Snap.Hutao/View/Card/Primitive/HorizontalCard.xaml
deleted file mode 100644
index 14c6d654..00000000
--- a/src/Snap.Hutao/Snap.Hutao/View/Card/Primitive/HorizontalCard.xaml
+++ /dev/null
@@ -1,24 +0,0 @@
-<UserControl
-    x:Class="Snap.Hutao.View.Card.Primitive.HorizontalCard"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    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"
-    mc:Ignorable="d">
-
-    <Border Style="{StaticResource BorderCardStyle}">
-        <Grid Background="{x:Bind Background, Mode=OneWay}">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="auto"/>
-                <ColumnDefinition Width="*"/>
-            </Grid.ColumnDefinitions>
-            <Border Child="{x:Bind Left, Mode=OneWay}"/>
-            <Border
-                Grid.Column="1"
-                HorizontalAlignment="Stretch"
-                VerticalAlignment="Center"
-                Child="{x:Bind Right, Mode=OneWay}"/>
-        </Grid>
-    </Border>
-
-</UserControl>
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Card/Primitive/HorizontalCard.xaml.cs b/src/Snap.Hutao/Snap.Hutao/View/Card/Primitive/HorizontalCard.xaml.cs
deleted file mode 100644
index b31a5606..00000000
--- a/src/Snap.Hutao/Snap.Hutao/View/Card/Primitive/HorizontalCard.xaml.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
-
-namespace Snap.Hutao.View.Card.Primitive;
-
-[DependencyProperty("Left", typeof(UIElement), default!)]
-[DependencyProperty("Right", typeof(UIElement), default!)]
-internal sealed partial class HorizontalCard : UserControl
-{
-    public HorizontalCard()
-    {
-        InitializeComponent();
-    }
-}
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Control/StatisticsCard.xaml b/src/Snap.Hutao/Snap.Hutao/View/Control/StatisticsCard.xaml
index d1edca97..ffe2df8d 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Control/StatisticsCard.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Control/StatisticsCard.xaml
@@ -9,24 +9,25 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:shux="using:Snap.Hutao.UI.Xaml"
     xmlns:shuxc="using:Snap.Hutao.UI.Xaml.Control"
+    xmlns:shuxcc="using:Snap.Hutao.UI.Xaml.Control.Card"
     xmlns:shuxci="using:Snap.Hutao.UI.Xaml.Control.Image"
+    xmlns:shuxdc="using:Snap.Hutao.UI.Xaml.Data.Converter"
+    xmlns:shuxdcs="using:Snap.Hutao.UI.Xaml.Data.Converter.Specialized"
     xmlns:shuxm="using:Snap.Hutao.UI.Xaml.Markup"
     xmlns:shvcont="using:Snap.Hutao.View.Control"
-    xmlns:shvconv="using:Snap.Hutao.View.Converter"
-    xmlns:shvcp="using:Snap.Hutao.View.Card.Primitive"
     xmlns:shvg="using:Snap.Hutao.ViewModel.GachaLog"
     cw:Effects.Shadow="{ThemeResource CompatCardShadow}"
     d:DataContext="{d:DesignInstance shvg:TypedWishSummary}"
     mc:Ignorable="d">
 
     <UserControl.Resources>
-        <shvconv:BoolToGridLengthConverter x:Key="BoolToGridLengthConverter"/>
-        <shvconv:BoolToGridLengthConverter
+        <shuxdcs:BoolToGridLengthConverter x:Key="BoolToGridLengthConverter"/>
+        <shuxdcs:BoolToGridLengthConverter
             x:Key="BoolToGridLengthSpacingConverter"
             FalseValue="0"
             TrueValue="4"/>
 
-        <shvconv:Int32ToGradientColorConverter x:Key="Int32ToGradientColorConverter" MaximumValue="{Binding GuaranteeOrangeThreshold}"/>
+        <shuxdcs:Int32ToGradientColorConverter x:Key="Int32ToGradientColorConverter" MaximumValue="{Binding GuaranteeOrangeThreshold}"/>
 
         <DataTemplate x:Key="OrangeListTemplate" d:DataType="shvg:SummaryItem">
             <Grid Margin="0" Style="{ThemeResource GridCardStyle}">
@@ -183,7 +184,7 @@
                             <ColumnDefinition/>
                             <ColumnDefinition/>
                         </Grid.ColumnDefinitions>
-                        <shvcp:CardProgressBar
+                        <shuxcc:CardProgressBar
                             Grid.Column="0"
                             MinHeight="32"
                             Description="{Binding LastOrangePull}"
@@ -192,7 +193,7 @@
                             ProgressForeground="{StaticResource OrangeColorBrush}"
                             TextForeground="{StaticResource OrangeColorBrush}"
                             Value="{Binding LastOrangePull}"/>
-                        <shvcp:CardProgressBar
+                        <shuxcc:CardProgressBar
                             Grid.Column="1"
                             MinHeight="32"
                             Description="{Binding LastPurplePull}"
diff --git a/src/Snap.Hutao/Snap.Hutao/View/MainView.xaml b/src/Snap.Hutao/Snap.Hutao/View/MainView.xaml
index 7a486430..b8d532c8 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/MainView.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/MainView.xaml
@@ -7,9 +7,9 @@
     xmlns:mxi="using:Microsoft.Xaml.Interactivity"
     xmlns:shuxb="using:Snap.Hutao.UI.Xaml.Behavior"
     xmlns:shuxc="using:Snap.Hutao.UI.Xaml.Control"
+    xmlns:shuxdcs="using:Snap.Hutao.UI.Xaml.Data.Converter.Specialized"
     xmlns:shuxm="using:Snap.Hutao.UI.Xaml.Markup"
     xmlns:shv="using:Snap.Hutao.View"
-    xmlns:shvcs="using:Snap.Hutao.View.Converter.Specialized"
     xmlns:shvh="using:Snap.Hutao.View.Helper"
     xmlns:shvm="using:Snap.Hutao.ViewModel"
     xmlns:shvp="using:Snap.Hutao.View.Page"
@@ -25,7 +25,7 @@
         <Thickness x:Key="NavigationViewContentGridBorderThickness">0,1,0,0</Thickness>
         <x:Double x:Key="NavigationViewItemOnLeftIconBoxHeight">24</x:Double>
         <SolidColorBrush x:Key="NavigationViewExpandedPaneBackground" Color="Transparent"/>
-        <shvcs:BackdropTypeToOpacityConverter x:Key="BackdropTypeToOpacityConverter"/>
+        <shuxdcs:BackdropTypeToOpacityConverter x:Key="BackdropTypeToOpacityConverter"/>
     </UserControl.Resources>
 
     <Grid>
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/AnnouncementPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/AnnouncementPage.xaml
index fd97945a..2510e884 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/AnnouncementPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/AnnouncementPage.xaml
@@ -13,11 +13,11 @@
     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:shuxcc="using:Snap.Hutao.UI.Xaml.Control.Card"
     xmlns:shuxci="using:Snap.Hutao.UI.Xaml.Control.Image"
     xmlns:shuxm="using:Snap.Hutao.UI.Xaml.Markup"
     xmlns:shuxma="using:Snap.Hutao.UI.Xaml.Media.Animation"
     xmlns:shvco="using:Snap.Hutao.View.Control"
-    xmlns:shvcp="using:Snap.Hutao.View.Card.Primitive"
     xmlns:shvh="using:Snap.Hutao.ViewModel.Home"
     d:DataContext="{d:DesignInstance shvh:AnnouncementViewModel}"
     Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
@@ -195,7 +195,7 @@
             </InfoBar>
         </DataTemplate>
 
-        <DataTemplate x:Key="CardTemplate" x:DataType="shvcp:CardReference">
+        <DataTemplate x:Key="CardTemplate" x:DataType="shuxcc:CardReference">
             <ItemContainer cw:Effects.Shadow="{ThemeResource CompatCardShadow}">
                 <ItemContainer.Resources>
                     <SolidColorBrush x:Key="ItemContainerPointerOverBackground" Color="Transparent"/>
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/AvatarPropertyPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/AvatarPropertyPage.xaml
index 03eec16c..81c7c842 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/AvatarPropertyPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/AvatarPropertyPage.xaml
@@ -16,7 +16,8 @@
     xmlns:shuxm="using:Snap.Hutao.UI.Xaml.Markup"
     xmlns:shva="using:Snap.Hutao.ViewModel.AvatarProperty"
     xmlns:shvcont="using:Snap.Hutao.View.Control"
-    xmlns:shvconv="using:Snap.Hutao.View.Converter"
+    xmlns:shuxdc="using:Snap.Hutao.UI.Xaml.Data.Converter"
+    xmlns:shuxdcs="using:Snap.Hutao.UI.Xaml.Data.Converter.Specialized"
     d:DataContext="{d:DesignInstance shva:AvatarPropertyViewModel}"
     Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
     mc:Ignorable="d">
@@ -29,13 +30,13 @@
         <ResourceDictionary>
             <ResourceDictionary.ThemeDictionaries>
                 <ResourceDictionary x:Key="Light">
-                    <shvconv:UInt32ToGradientColorConverter
+                    <shuxdcs:UInt32ToGradientColorConverter
                         x:Key="CountToGradientColorConverter"
                         Maximum="#FFFD0093"
                         Minimum="#FF4B00D9"/>
                 </ResourceDictionary>
                 <ResourceDictionary x:Key="Dark">
-                    <shvconv:UInt32ToGradientColorConverter
+                    <shuxdcs:UInt32ToGradientColorConverter
                         x:Key="CountToGradientColorConverter"
                         Maximum="#FFFF69BF"
                         Minimum="#FF9F69FF"/>
@@ -51,7 +52,7 @@
                 </cwconv:BoolToObjectConverter.FalseValue>
             </cwconv:BoolToObjectConverter>
 
-            <shvconv:LayoutSwitchModeConverter
+            <shuxdcs:LayoutSwitchModeConverter
                 x:Key="LayoutSwitchModeConverter"
                 GridValue="{x:Bind GridImageExportPanel}"
                 ListValue="{x:Bind ListImageExportPanel}"/>
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/CultivationPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/CultivationPage.xaml
index 8ea27aff..5acb30b4 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/CultivationPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/CultivationPage.xaml
@@ -11,11 +11,11 @@
     xmlns:shux="using:Snap.Hutao.UI.Xaml"
     xmlns:shuxb="using:Snap.Hutao.UI.Xaml.Behavior"
     xmlns:shuxc="using:Snap.Hutao.UI.Xaml.Control"
+    xmlns:shuxcc="using:Snap.Hutao.UI.Xaml.Control.Card"
     xmlns:shuxci="using:Snap.Hutao.UI.Xaml.Control.Image"
     xmlns:shuxcl="using:Snap.Hutao.UI.Xaml.Control.Layout"
     xmlns:shuxm="using:Snap.Hutao.UI.Xaml.Markup"
     xmlns:shvco="using:Snap.Hutao.View.Control"
-    xmlns:shvcp="using:Snap.Hutao.View.Card.Primitive"
     xmlns:shvcu="using:Snap.Hutao.ViewModel.Cultivation"
     d:DataContext="{d:DesignInstance shvcu:CultivationViewModel}"
     Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
@@ -173,8 +173,8 @@
                         <SolidColorBrush x:Key="ItemContainerPointerOverBackground" Color="Transparent"/>
                         <SolidColorBrush x:Key="ItemContainerPressedBackground" Color="Transparent"/>
                     </ItemContainer.Resources>
-                    <shvcp:HorizontalCard>
-                        <shvcp:HorizontalCard.Left>
+                    <shuxcc:HorizontalCard>
+                        <shuxcc:HorizontalCard.Left>
                             <Grid Grid.Column="0">
                                 <shvco:ItemIcon
                                     Width="40"
@@ -189,8 +189,8 @@
                                     Glyph="&#xE73E;"
                                     Visibility="{Binding IsFinished, Converter={StaticResource BoolToVisibilityConverter}}"/>
                             </Grid>
-                        </shvcp:HorizontalCard.Left>
-                        <shvcp:HorizontalCard.Right>
+                        </shuxcc:HorizontalCard.Left>
+                        <shuxcc:HorizontalCard.Right>
                             <Grid Margin="16,0">
                                 <Grid.ColumnDefinitions>
                                     <ColumnDefinition/>
@@ -208,8 +208,8 @@
                                     VerticalAlignment="Center"
                                     Text="{Binding CountFormatted}"/>
                             </Grid>
-                        </shvcp:HorizontalCard.Right>
-                    </shvcp:HorizontalCard>
+                        </shuxcc:HorizontalCard.Right>
+                    </shuxcc:HorizontalCard>
                 </ItemContainer>
             </DataTemplate>
 
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/DailyNotePage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/DailyNotePage.xaml
index 02348c6a..3ab515b1 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/DailyNotePage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/DailyNotePage.xaml
@@ -12,10 +12,10 @@
     xmlns:shux="using:Snap.Hutao.UI.Xaml"
     xmlns:shuxb="using:Snap.Hutao.UI.Xaml.Behavior"
     xmlns:shuxc="using:Snap.Hutao.UI.Xaml.Control"
+    xmlns:shuxcc="using:Snap.Hutao.UI.Xaml.Control.Card"
     xmlns:shuxci="using:Snap.Hutao.UI.Xaml.Control.Image"
     xmlns:shuxm="using:Snap.Hutao.UI.Xaml.Markup"
     xmlns:shvc="using:Snap.Hutao.View.Control"
-    xmlns:shvcp="using:Snap.Hutao.View.Card.Primitive"
     xmlns:shvd="using:Snap.Hutao.ViewModel.DailyNote"
     d:DataContext="{d:DesignInstance shvd:DailyNoteViewModel}"
     Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
@@ -282,7 +282,7 @@
                                         <ItemsControl Margin="0,-3,0,0" ItemsSource="{Binding DailyNote.DailyTask.AttendanceRewards}">
                                             <ItemsControl.ItemTemplate>
                                                 <DataTemplate>
-                                                    <shvcp:CardProgressBar
+                                                    <shuxcc:CardProgressBar
                                                         MinWidth="120"
                                                         MinHeight="32"
                                                         Margin="0,3,0,0"
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/SpiralAbyssRecordPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/SpiralAbyssRecordPage.xaml
index 136d6630..5c55c773 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/SpiralAbyssRecordPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/SpiralAbyssRecordPage.xaml
@@ -11,13 +11,13 @@
     xmlns:shux="using:Snap.Hutao.UI.Xaml"
     xmlns:shuxb="using:Snap.Hutao.UI.Xaml.Behavior"
     xmlns:shuxc="using:Snap.Hutao.UI.Xaml.Control"
+    xmlns:shuxcc="using:Snap.Hutao.UI.Xaml.Control.Card"
     xmlns:shuxci="using:Snap.Hutao.UI.Xaml.Control.Image"
     xmlns:shuxcp="using:Snap.Hutao.UI.Xaml.Control.Panel"
     xmlns:shuxct="using:Snap.Hutao.UI.Xaml.Control.TextBlock"
     xmlns:shuxm="using:Snap.Hutao.UI.Xaml.Markup"
     xmlns:shvcom="using:Snap.Hutao.ViewModel.Complex"
     xmlns:shvcon="using:Snap.Hutao.View.Control"
-    xmlns:shvcp="using:Snap.Hutao.View.Card.Primitive"
     xmlns:shvs="using:Snap.Hutao.ViewModel.SpiralAbyss"
     d:DataContext="{d:DesignInstance shvs:SpiralAbyssRecordViewModel}"
     Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
@@ -562,15 +562,15 @@
                         </DataTemplate>
 
                         <DataTemplate x:Key="RatedAvatarTemplate" x:DataType="shvcom:AvatarView">
-                            <shvcp:HorizontalCard>
-                                <shvcp:HorizontalCard.Left>
+                            <shuxcc:HorizontalCard>
+                                <shuxcc:HorizontalCard.Left>
                                     <shvcon:ItemIcon
                                         Width="56"
                                         Height="56"
                                         Icon="{Binding Icon}"
                                         Quality="{Binding Quality}"/>
-                                </shvcp:HorizontalCard.Left>
-                                <shvcp:HorizontalCard.Right>
+                                </shuxcc:HorizontalCard.Left>
+                                <shuxcc:HorizontalCard.Right>
                                     <StackPanel
                                         Width="64"
                                         Margin="8,8,8,8"
@@ -582,8 +582,8 @@
                                             Text="{Binding RateDelta}"
                                             TextStyle="{StaticResource CaptionTextBlockStyle}"/>
                                     </StackPanel>
-                                </shvcp:HorizontalCard.Right>
-                            </shvcp:HorizontalCard>
+                                </shuxcc:HorizontalCard.Right>
+                            </shuxcc:HorizontalCard>
                         </DataTemplate>
                     </Grid.Resources>
 
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/WikiAvatarPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/WikiAvatarPage.xaml
index 0e114750..aa152394 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/WikiAvatarPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/WikiAvatarPage.xaml
@@ -10,12 +10,12 @@
     xmlns:shuxb="using:Snap.Hutao.UI.Xaml.Behavior"
     xmlns:shuxc="using:Snap.Hutao.UI.Xaml.Control"
     xmlns:shuxca="using:Snap.Hutao.UI.Xaml.Control.AutoSuggestBox"
+    xmlns:shuxcc="using:Snap.Hutao.UI.Xaml.Control.Card"
     xmlns:shuxci="using:Snap.Hutao.UI.Xaml.Control.Image"
     xmlns:shuxct="using:Snap.Hutao.UI.Xaml.Control.TextBlock"
     xmlns:shuxm="using:Snap.Hutao.UI.Xaml.Markup"
     xmlns:shvcont="using:Snap.Hutao.View.Control"
     xmlns:shvconv="using:Snap.Hutao.View.Converter"
-    xmlns:shvcp="using:Snap.Hutao.View.Card.Primitive"
     xmlns:shvw="using:Snap.Hutao.ViewModel.Wiki"
     d:DataContext="{d:DesignInstance Type=shvw:WikiAvatarViewModel}"
     Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
@@ -132,33 +132,33 @@
         </DataTemplate>
 
         <DataTemplate x:Key="CultivationItemTemplate">
-            <shvcp:HorizontalCard>
-                <shvcp:HorizontalCard.Left>
+            <shuxcc:HorizontalCard>
+                <shuxcc:HorizontalCard.Left>
                     <shvcont:ItemIcon
                         Width="40"
                         Height="40"
                         Icon="{Binding Icon, Converter={StaticResource ItemIconConverter}}"
                         Quality="{Binding RankLevel}"/>
-                </shvcp:HorizontalCard.Left>
-                <shvcp:HorizontalCard.Right>
+                </shuxcc:HorizontalCard.Left>
+                <shuxcc:HorizontalCard.Right>
                     <TextBlock
                         HorizontalAlignment="Center"
                         VerticalAlignment="Center"
                         Text="{Binding Name}"/>
-                </shvcp:HorizontalCard.Right>
-            </shvcp:HorizontalCard>
+                </shuxcc:HorizontalCard.Right>
+            </shuxcc:HorizontalCard>
         </DataTemplate>
 
         <DataTemplate x:Key="CollocationTemplate">
-            <shvcp:HorizontalCard>
-                <shvcp:HorizontalCard.Left>
+            <shuxcc:HorizontalCard>
+                <shuxcc:HorizontalCard.Left>
                     <shvcont:ItemIcon
                         Width="48"
                         Height="48"
                         Icon="{Binding Icon}"
                         Quality="{Binding Quality}"/>
-                </shvcp:HorizontalCard.Left>
-                <shvcp:HorizontalCard.Right>
+                </shuxcc:HorizontalCard.Left>
+                <shuxcc:HorizontalCard.Right>
                     <StackPanel Margin="8,0,0,0" HorizontalAlignment="Left">
                         <TextBlock Text="{Binding Name}"/>
                         <StackPanel Orientation="Horizontal" Spacing="4">
@@ -172,13 +172,13 @@
                                 TextStyle="{StaticResource CaptionTextBlockStyle}"/>
                         </StackPanel>
                     </StackPanel>
-                </shvcp:HorizontalCard.Right>
-            </shvcp:HorizontalCard>
+                </shuxcc:HorizontalCard.Right>
+            </shuxcc:HorizontalCard>
         </DataTemplate>
 
         <DataTemplate x:Key="CollocationReliquaryTemplate">
-            <shvcp:HorizontalCard>
-                <shvcp:HorizontalCard.Left>
+            <shuxcc:HorizontalCard>
+                <shuxcc:HorizontalCard.Left>
                     <cwc:SwitchPresenter Value="{Binding Icons.Count, Mode=OneWay}">
                         <cwc:Case IsDefault="True">
                             <cwc:Case.Value>
@@ -228,8 +228,8 @@
                             </Grid>
                         </cwc:Case>
                     </cwc:SwitchPresenter>
-                </shvcp:HorizontalCard.Left>
-                <shvcp:HorizontalCard.Right>
+                </shuxcc:HorizontalCard.Left>
+                <shuxcc:HorizontalCard.Right>
                     <StackPanel Margin="8,0,8,0" HorizontalAlignment="Left">
                         <TextBlock
                             Text="{Binding Name}"
@@ -246,8 +246,8 @@
                                 TextStyle="{StaticResource CaptionTextBlockStyle}"/>
                         </StackPanel>
                     </StackPanel>
-                </shvcp:HorizontalCard.Right>
-            </shvcp:HorizontalCard>
+                </shuxcc:HorizontalCard.Right>
+            </shuxcc:HorizontalCard>
         </DataTemplate>
 
         <DataTemplate x:Key="CostumeTemplate">
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/WikiMonsterPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/WikiMonsterPage.xaml
index 3e7139d1..10cc5975 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/WikiMonsterPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/WikiMonsterPage.xaml
@@ -10,11 +10,11 @@
     xmlns:mxi="using:Microsoft.Xaml.Interactivity"
     xmlns:shuxb="using:Snap.Hutao.UI.Xaml.Behavior"
     xmlns:shuxc="using:Snap.Hutao.UI.Xaml.Control"
+    xmlns:shuxcc="using:Snap.Hutao.UI.Xaml.Control.Card"
     xmlns:shuxci="using:Snap.Hutao.UI.Xaml.Control.Image"
     xmlns:shuxct="using:Snap.Hutao.UI.Xaml.Control.TextBlock"
     xmlns:shuxm="using:Snap.Hutao.UI.Xaml.Markup"
     xmlns:shvc="using:Snap.Hutao.View.Control"
-    xmlns:shvcp="using:Snap.Hutao.View.Card.Primitive"
     xmlns:shvw="using:Snap.Hutao.ViewModel.Wiki"
     d:DataContext="{d:DesignInstance Type=shvw:WikiMonsterViewModel}"
     Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
@@ -57,21 +57,21 @@
         </DataTemplate>
 
         <DataTemplate x:Key="MonsterDropTemplate">
-            <shvcp:HorizontalCard>
-                <shvcp:HorizontalCard.Left>
+            <shuxcc:HorizontalCard>
+                <shuxcc:HorizontalCard.Left>
                     <shvc:ItemIcon
                         Width="40"
                         Height="40"
                         Icon="{Binding Icon, Converter={StaticResource ItemIconConverter}}"
                         Quality="{Binding RankLevel}"/>
-                </shvcp:HorizontalCard.Left>
-                <shvcp:HorizontalCard.Right>
+                </shuxcc:HorizontalCard.Left>
+                <shuxcc:HorizontalCard.Right>
                     <TextBlock
                         HorizontalAlignment="Center"
                         VerticalAlignment="Center"
                         Text="{Binding Name}"/>
-                </shvcp:HorizontalCard.Right>
-            </shvcp:HorizontalCard>
+                </shuxcc:HorizontalCard.Right>
+            </shuxcc:HorizontalCard>
         </DataTemplate>
 
         <DataTemplate x:Key="MonsterGridTemplate">
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/WikiWeaponPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/WikiWeaponPage.xaml
index a441b272..47b80fd9 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/WikiWeaponPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/WikiWeaponPage.xaml
@@ -10,11 +10,11 @@
     xmlns:shuxb="using:Snap.Hutao.UI.Xaml.Behavior"
     xmlns:shuxc="using:Snap.Hutao.UI.Xaml.Control"
     xmlns:shuxca="using:Snap.Hutao.UI.Xaml.Control.AutoSuggestBox"
+    xmlns:shuxcc="using:Snap.Hutao.UI.Xaml.Control.Card"
     xmlns:shuxci="using:Snap.Hutao.UI.Xaml.Control.Image"
     xmlns:shuxct="using:Snap.Hutao.UI.Xaml.Control.TextBlock"
     xmlns:shuxm="using:Snap.Hutao.UI.Xaml.Markup"
     xmlns:shvc="using:Snap.Hutao.View.Control"
-    xmlns:shvcp="using:Snap.Hutao.View.Card.Primitive"
     xmlns:shvw="using:Snap.Hutao.ViewModel.Wiki"
     d:DataContext="{d:DesignInstance Type=shvw:WikiWeaponViewModel}"
     Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
@@ -91,21 +91,21 @@
         </DataTemplate>
 
         <DataTemplate x:Key="CultivateItemTemplate">
-            <shvcp:HorizontalCard>
-                <shvcp:HorizontalCard.Left>
+            <shuxcc:HorizontalCard>
+                <shuxcc:HorizontalCard.Left>
                     <shvc:ItemIcon
                         Width="40"
                         Height="40"
                         Icon="{Binding Icon, Converter={StaticResource ItemIconConverter}}"
                         Quality="{Binding RankLevel}"/>
-                </shvcp:HorizontalCard.Left>
-                <shvcp:HorizontalCard.Right>
+                </shuxcc:HorizontalCard.Left>
+                <shuxcc:HorizontalCard.Right>
                     <TextBlock
                         HorizontalAlignment="Center"
                         VerticalAlignment="Center"
                         Text="{Binding Name}"/>
-                </shvcp:HorizontalCard.Right>
-            </shvcp:HorizontalCard>
+                </shuxcc:HorizontalCard.Right>
+            </shuxcc:HorizontalCard>
         </DataTemplate>
 
         <DataTemplate x:Key="AffixPivotHeaderTemplate">
@@ -123,15 +123,15 @@
         </DataTemplate>
 
         <DataTemplate x:Key="CollocationTemplate">
-            <shvcp:HorizontalCard>
-                <shvcp:HorizontalCard.Left>
+            <shuxcc:HorizontalCard>
+                <shuxcc:HorizontalCard.Left>
                     <shvc:ItemIcon
                         Width="48"
                         Height="48"
                         Icon="{Binding Icon}"
                         Quality="{Binding Quality}"/>
-                </shvcp:HorizontalCard.Left>
-                <shvcp:HorizontalCard.Right>
+                </shuxcc:HorizontalCard.Left>
+                <shuxcc:HorizontalCard.Right>
                     <StackPanel Margin="8,0,0,0" HorizontalAlignment="Left">
                         <TextBlock Text="{Binding Name}"/>
                         <StackPanel Orientation="Horizontal" Spacing="4">
@@ -145,8 +145,8 @@
                                 TextStyle="{StaticResource CaptionTextBlockStyle}"/>
                         </StackPanel>
                     </StackPanel>
-                </shvcp:HorizontalCard.Right>
-            </shvcp:HorizontalCard>
+                </shuxcc:HorizontalCard.Right>
+            </shuxcc:HorizontalCard>
         </DataTemplate>
 
         <DataTemplate x:Key="WeaponGridTemplate">
diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/Home/AnnouncementViewModel.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/Home/AnnouncementViewModel.cs
index e78f73c1..8ff93298 100644
--- a/src/Snap.Hutao/Snap.Hutao/ViewModel/Home/AnnouncementViewModel.cs
+++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/Home/AnnouncementViewModel.cs
@@ -5,8 +5,8 @@ using Snap.Hutao.Core.Setting;
 using Snap.Hutao.Service;
 using Snap.Hutao.Service.Announcement;
 using Snap.Hutao.Service.Hutao;
+using Snap.Hutao.UI.Xaml.Control.Card;
 using Snap.Hutao.View.Card;
-using Snap.Hutao.View.Card.Primitive;
 using Snap.Hutao.Web.Hoyolab.Hk4e.Common.Announcement;
 using System.Collections.ObjectModel;