diff --git a/src/Snap.Hutao/Snap.Hutao/Core/Windowing/ExtendedWindow.cs b/src/Snap.Hutao/Snap.Hutao/Core/Windowing/ExtendedWindow.cs
index 5b847406..3e842baa 100644
--- a/src/Snap.Hutao/Snap.Hutao/Core/Windowing/ExtendedWindow.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Core/Windowing/ExtendedWindow.cs
@@ -11,8 +11,11 @@ using Snap.Hutao.Message;
 using Snap.Hutao.Service;
 using Snap.Hutao.Win32;
 using System.IO;
+using Windows.Win32.Foundation;
 using Windows.Graphics;
 using Windows.UI;
+using Windows.Win32.Graphics.Dwm;
+using static Windows.Win32.PInvoke;
 
 namespace Snap.Hutao.Core.Windowing;
 
@@ -65,22 +68,23 @@ internal sealed class ExtendedWindow<TWindow> : IRecipient<FlyoutOpenCloseMessag
         ExtendsContentIntoTitleBar();
 
         Persistence.RecoverOrInit(options);
+        UpdateImmersiveDarkMode(options.TitleBar, default!);
 
         // appWindow.Show(true);
         // appWindow.Show can't bring window to top.
-        options.Window.Activate();
+        // options.Window.Activate();
+        Persistence.BringToForeground(options.Hwnd);
 
         AppOptions appOptions = serviceProvider.GetRequiredService<AppOptions>();
         UpdateSystemBackdrop(appOptions.BackdropType);
         appOptions.PropertyChanged += OnOptionsPropertyChanged;
 
         bool subClassApplied = subclass.Initialize();
-        logger.LogInformation("Apply {name} : {result}", nameof(WindowSubclass<TWindow>), subClassApplied ? "succeed" : "failed");
 
-        IMessenger messenger = serviceProvider.GetRequiredService<IMessenger>();
-        messenger.Register(this);
+        serviceProvider.GetRequiredService<IMessenger>().Register(this);
 
         options.Window.Closed += OnWindowClosed;
+        options.TitleBar.ActualThemeChanged += UpdateImmersiveDarkMode;
     }
 
     private void OnOptionsPropertyChanged(object? sender, PropertyChangedEventArgs e)
@@ -159,6 +163,12 @@ internal sealed class ExtendedWindow<TWindow> : IRecipient<FlyoutOpenCloseMessag
         appTitleBar.ButtonPressedForegroundColor = systemBaseHighColor;
     }
 
+    private unsafe void UpdateImmersiveDarkMode(FrameworkElement titleBar, object discard)
+    {
+        BOOL isDarkMode = Control.Theme.ThemeHelper.IsDarkMode(titleBar.ActualTheme);
+        DwmSetWindowAttribute(options.Hwnd, DWMWINDOWATTRIBUTE.DWMWA_USE_IMMERSIVE_DARK_MODE, &isDarkMode, unchecked((uint)sizeof(BOOL)));
+    }
+
     private void UpdateDragRectangles(bool isFlyoutOpened = false)
     {
         AppWindowTitleBar appTitleBar = options.AppWindow.TitleBar;
diff --git a/src/Snap.Hutao/Snap.Hutao/Core/Windowing/Persistence.cs b/src/Snap.Hutao/Snap.Hutao/Core/Windowing/Persistence.cs
index 58e913f7..4aa4c5b8 100644
--- a/src/Snap.Hutao/Snap.Hutao/Core/Windowing/Persistence.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Core/Windowing/Persistence.cs
@@ -74,6 +74,29 @@ internal static class Persistence
         return Math.Round(dpi / 96D, 2, MidpointRounding.AwayFromZero);
     }
 
+    /// <summary>
+    /// 将窗口设为前台窗口
+    /// </summary>
+    /// <param name="hwnd">窗口句柄</param>
+    public static unsafe void BringToForeground(in HWND hwnd)
+    {
+        HWND fgHwnd = GetForegroundWindow();
+
+        uint threadIdHwnd = GetWindowThreadProcessId(hwnd);
+        uint threadIdfgHwnd = GetWindowThreadProcessId(fgHwnd);
+
+        if (threadIdHwnd != threadIdfgHwnd)
+        {
+            AttachThreadInput(threadIdHwnd, threadIdfgHwnd, true);
+            SetForegroundWindow(hwnd);
+            AttachThreadInput(threadIdHwnd, threadIdfgHwnd, false);
+        }
+        else
+        {
+            SetForegroundWindow(hwnd);
+        }
+    }
+
     private static void TransformToCenterScreen(ref RectInt32 rect)
     {
         DisplayArea displayArea = DisplayArea.GetFromRect(rect, DisplayAreaFallback.Primary);
diff --git a/src/Snap.Hutao/Snap.Hutao/NativeMethods.txt b/src/Snap.Hutao/Snap.Hutao/NativeMethods.txt
index 16a0d474..29666b74 100644
--- a/src/Snap.Hutao/Snap.Hutao/NativeMethods.txt
+++ b/src/Snap.Hutao/Snap.Hutao/NativeMethods.txt
@@ -14,6 +14,10 @@ DefSubclassProc
 RemoveWindowSubclass
 SetWindowSubclass
 
+// DWMAPI
+DwmGetWindowAttribute
+DwmSetWindowAttribute
+
 // GDI32
 GetDeviceCaps
 
@@ -30,10 +34,14 @@ WriteProcessMemory
 CoWaitForMultipleObjects
 
 // USER32
+AttachThreadInput
 FindWindowEx
 GetDC
 GetDpiForWindow
+GetForegroundWindow
 GetWindowPlacement
+GetWindowThreadProcessId
+SetForegroundWindow
 
 // WinRT
 IMemoryBufferByteAccess
\ No newline at end of file
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Card/AchievementCard.xaml b/src/Snap.Hutao/Snap.Hutao/View/Card/AchievementCard.xaml
index 906c87ae..8f396782 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Card/AchievementCard.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Card/AchievementCard.xaml
@@ -52,7 +52,8 @@
                                             Opacity="0.8"
                                             Style="{StaticResource SubtitleTextBlockStyle}"
                                             Text="{Binding Inner.Title}"
-                                            TextTrimming="CharacterEllipsis"/>
+                                            TextTrimming="CharacterEllipsis"
+                                            TextWrapping="NoWrap"/>
                                         <TextBlock
                                             Opacity="0.6"
                                             Style="{StaticResource CaptionTextBlockStyle}"
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Card/GachaStatisticsCard.xaml b/src/Snap.Hutao/Snap.Hutao/View/Card/GachaStatisticsCard.xaml
index 41347ce9..47bca8c3 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Card/GachaStatisticsCard.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Card/GachaStatisticsCard.xaml
@@ -88,7 +88,7 @@
                                         Value="{Binding LastOrangePull}"/>
                                     <TextBlock
                                         Grid.Column="0"
-                                        Margin="12,0"
+                                        Margin="6,0"
                                         HorizontalAlignment="Center"
                                         VerticalAlignment="Center"
                                         Foreground="{StaticResource OrangeBrush}"
@@ -121,7 +121,7 @@
                                         Value="{Binding LastPurplePull}"/>
                                     <TextBlock
                                         Grid.Column="0"
-                                        Margin="12,0"
+                                        Margin="6,0"
                                         HorizontalAlignment="Center"
                                         VerticalAlignment="Center"
                                         Foreground="{StaticResource PurpleBrush}"
@@ -168,7 +168,7 @@
                                         Value="{Binding LastOrangePull}"/>
                                     <TextBlock
                                         Grid.Column="0"
-                                        Margin="12,0"
+                                        Margin="6,0"
                                         HorizontalAlignment="Center"
                                         VerticalAlignment="Center"
                                         Foreground="{StaticResource OrangeBrush}"
@@ -201,7 +201,7 @@
                                         Value="{Binding LastPurplePull}"/>
                                     <TextBlock
                                         Grid.Column="0"
-                                        Margin="12,0"
+                                        Margin="6,0"
                                         HorizontalAlignment="Center"
                                         VerticalAlignment="Center"
                                         Foreground="{StaticResource PurpleBrush}"
@@ -248,7 +248,7 @@
                                         Value="{Binding LastOrangePull}"/>
                                     <TextBlock
                                         Grid.Column="0"
-                                        Margin="12,0"
+                                        Margin="6,0"
                                         HorizontalAlignment="Center"
                                         VerticalAlignment="Center"
                                         Foreground="{StaticResource OrangeBrush}"
@@ -281,7 +281,7 @@
                                         Value="{Binding LastPurplePull}"/>
                                     <TextBlock
                                         Grid.Column="0"
-                                        Margin="12,0"
+                                        Margin="6,0"
                                         HorizontalAlignment="Center"
                                         VerticalAlignment="Center"
                                         Foreground="{StaticResource PurpleBrush}"