diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3 (Package)/BetterLyrics.WinUI3 (Package).wapproj b/BetterLyrics.WinUI3/BetterLyrics.WinUI3 (Package)/BetterLyrics.WinUI3 (Package).wapproj
index 097329d..09862d7 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3 (Package)/BetterLyrics.WinUI3 (Package).wapproj	
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3 (Package)/BetterLyrics.WinUI3 (Package).wapproj	
@@ -37,8 +37,8 @@
   <PropertyGroup>
     <ProjectGuid>6576cd19-ef92-4099-b37d-e2d8ebdb6bf5</ProjectGuid>
     <TargetPlatformVersion>10.0.26100.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
-    <AssetTargetFallback>net8.0-windows$(TargetPlatformVersion);$(AssetTargetFallback)</AssetTargetFallback>
+    <TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
+    <AssetTargetFallback>net10.0-windows$(TargetPlatformVersion);$(AssetTargetFallback)</AssetTargetFallback>
     <DefaultLanguage>zh-CN</DefaultLanguage>
     <AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>
     <EntryPointProjectUniqueName>..\BetterLyrics.WinUI3\BetterLyrics.WinUI3.csproj</EntryPointProjectUniqueName>
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3 (Package)/Package.appxmanifest b/BetterLyrics.WinUI3/BetterLyrics.WinUI3 (Package)/Package.appxmanifest
index 038fb22..24c58d7 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3 (Package)/Package.appxmanifest	
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3 (Package)/Package.appxmanifest	
@@ -12,7 +12,7 @@
 	<Identity
 	  Name="37412.BetterLyrics"
 	  Publisher="CN=E1428B0E-DC1D-4EA4-ACB1-4556569D5BA9"
-	  Version="1.0.115.0" />
+	  Version="1.0.117.0" />
 
 	<mp:PhoneIdentity PhoneProductId="ca4a4830-fc19-40d9-b823-53e2bff3d816" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
 
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/App.xaml.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/App.xaml.cs
index 7eefa79..d61843a 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/App.xaml.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/App.xaml.cs
@@ -1,8 +1,6 @@
 // 2025/6/23 by Zhe Fang
 
-using BetterLyrics.WinUI3.Enums;
 using BetterLyrics.WinUI3.Helper;
-using BetterLyrics.WinUI3.Services;
 using BetterLyrics.WinUI3.Services.AlbumArtSearchService;
 using BetterLyrics.WinUI3.Services.LastFMService;
 using BetterLyrics.WinUI3.Services.LibWatcherService;
@@ -18,14 +16,10 @@ using BetterLyrics.WinUI3.Views;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using Microsoft.UI.Dispatching;
 using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
 using Microsoft.Windows.ApplicationModel.Resources;
 using Serilog;
 using System;
-using System.Diagnostics;
-using System.Linq;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/BetterLyrics.WinUI3.csproj b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/BetterLyrics.WinUI3.csproj
index f7be7b6..5867ab9 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/BetterLyrics.WinUI3.csproj
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/BetterLyrics.WinUI3.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
 		<OutputType>WinExe</OutputType>
-		<TargetFramework>net8.0-windows10.0.26100.0</TargetFramework>
+		<TargetFramework>net10.0-windows10.0.26100.0</TargetFramework>
 		<TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
 		<RootNamespace>BetterLyrics.WinUI3</RootNamespace>
 		<Platforms>x86;x64;ARM64</Platforms>
@@ -345,8 +345,5 @@
 		<AssemblyInfoVersionType>SettingsVersion</AssemblyInfoVersionType>
 		<InheritWinAppVersionFrom>AssemblyVersion</InheritWinAppVersionFrom>
 		<PackageVersionSettings>AssemblyVersion.None.None</PackageVersionSettings>
-		<Version>2025.6.0</Version>
-		<AssemblyVersion>2025.6.18.0110</AssemblyVersion>
-		<FileVersion>2025.6.18.0110</FileVersion>
 	</PropertyGroup>
 </Project>
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/AmllTTmlDB.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/AmllTTmlDB.cs
index a20ff9b..d1da3fd 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/AmllTTmlDB.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/AmllTTmlDB.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Constants
+namespace BetterLyrics.WinUI3.Constants
 {
     public static class AmllTTmlDB
     {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/App.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/App.cs
index 0a9110a..299c314 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/App.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/App.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Constants
+namespace BetterLyrics.WinUI3.Constants
 {
     public static class App
     {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/AppleMusic.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/AppleMusic.cs
index b75feb9..2f156b7 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/AppleMusic.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/AppleMusic.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Constants
+namespace BetterLyrics.WinUI3.Constants
 {
     public static class AppleMusic
     {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/LXMusic.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/LXMusic.cs
index 60028ff..3132c65 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/LXMusic.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/LXMusic.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Constants
+namespace BetterLyrics.WinUI3.Constants
 {
     public static class LXMusic
     {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/Link.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/Link.cs
index 79d1179..d1b4704 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/Link.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/Link.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Constants
+namespace BetterLyrics.WinUI3.Constants
 {
     public static class Link
     {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/PlayerID.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/PlayerID.cs
index 0e9e19a..778004c 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/PlayerID.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/PlayerID.cs
@@ -1,11 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Windows.ApplicationModel;
-
-namespace BetterLyrics.WinUI3.Constants
+namespace BetterLyrics.WinUI3.Constants
 {
     public static class PlayerID
     {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/PlayerName.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/PlayerName.cs
index 2a392f6..7b4b661 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/PlayerName.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/PlayerName.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Constants
+namespace BetterLyrics.WinUI3.Constants
 {
     public class PlayerName
     {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/Time.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/Time.cs
index 1d5ad53..f459c25 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/Time.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/Time.cs
@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.Constants
 {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/iTunes.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/iTunes.cs
index dd61c97..fdab250 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/iTunes.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/iTunes.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Constants
+namespace BetterLyrics.WinUI3.Constants
 {
     public static class iTunes
     {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/AboutControl.xaml.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/AboutControl.xaml.cs
index 00d1dfc..58f04a8 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/AboutControl.xaml.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/AboutControl.xaml.cs
@@ -1,19 +1,6 @@
 using BetterLyrics.WinUI3.ViewModels;
 using CommunityToolkit.Mvvm.DependencyInjection;
-using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Controls.Primitives;
-using Microsoft.UI.Xaml.Data;
-using Microsoft.UI.Xaml.Input;
-using Microsoft.UI.Xaml.Media;
-using Microsoft.UI.Xaml.Navigation;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
 
 // To learn more about WinUI, the WinUI project structure,
 // and more about our project templates, see: http://aka.ms/winui-project-info.
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/AlbumArtLayoutSettingsControl.xaml b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/AlbumArtLayoutSettingsControl.xaml
index 4ff2b65..fd4367b 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/AlbumArtLayoutSettingsControl.xaml
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/AlbumArtLayoutSettingsControl.xaml
@@ -99,6 +99,9 @@
                             <dev:SettingsCard x:Uid="SettingsPageShowArtists">
                                 <ToggleSwitch IsEnabled="{x:Bind AlbumArtLayoutSettings.ShowTitle, Mode=OneWay}" IsOn="{x:Bind AlbumArtLayoutSettings.ShowArtists, Mode=TwoWay}" />
                             </dev:SettingsCard>
+                            <dev:SettingsCard x:Uid="SettingsPageShowAlbum">
+                                <ToggleSwitch IsEnabled="{x:Bind AlbumArtLayoutSettings.ShowTitle, Mode=OneWay}" IsOn="{x:Bind AlbumArtLayoutSettings.ShowAlbum, Mode=TwoWay}" />
+                            </dev:SettingsCard>
                         </dev:SettingsExpander.Items>
                     </dev:SettingsExpander>
 
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/AlbumArtLayoutSettingsControl.xaml.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/AlbumArtLayoutSettingsControl.xaml.cs
index ade6507..e61c9bb 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/AlbumArtLayoutSettingsControl.xaml.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/AlbumArtLayoutSettingsControl.xaml.cs
@@ -1,20 +1,6 @@
 using BetterLyrics.WinUI3.Models.Settings;
-using BetterLyrics.WinUI3.ViewModels;
-using CommunityToolkit.Mvvm.DependencyInjection;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Controls.Primitives;
-using Microsoft.UI.Xaml.Data;
-using Microsoft.UI.Xaml.Input;
-using Microsoft.UI.Xaml.Media;
-using Microsoft.UI.Xaml.Navigation;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
 
 // To learn more about WinUI, the WinUI project structure,
 // and more about our project templates, see: http://aka.ms/winui-project-info.
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/AppSettingsControl.xaml.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/AppSettingsControl.xaml.cs
index e63b47d..0ea212f 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/AppSettingsControl.xaml.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/AppSettingsControl.xaml.cs
@@ -1,23 +1,7 @@
-using BetterLyrics.WinUI3.Helper;
-using BetterLyrics.WinUI3.Models;
-using BetterLyrics.WinUI3.Models.Settings;
 using BetterLyrics.WinUI3.ViewModels;
-using BetterLyrics.WinUI3.Views;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Controls.Primitives;
-using Microsoft.UI.Xaml.Data;
-using Microsoft.UI.Xaml.Input;
-using Microsoft.UI.Xaml.Media;
-using Microsoft.UI.Xaml.Navigation;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
 
 // To learn more about WinUI, the WinUI project structure,
 // and more about our project templates, see: http://aka.ms/winui-project-info.
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/DemoWindowGrid.xaml.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/DemoWindowGrid.xaml.cs
index a742987..1eb5f99 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/DemoWindowGrid.xaml.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/DemoWindowGrid.xaml.cs
@@ -1,18 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
+using BetterLyrics.WinUI3.Models;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Controls.Primitives;
-using Microsoft.UI.Xaml.Data;
-using Microsoft.UI.Xaml.Input;
-using Microsoft.UI.Xaml.Media;
-using Microsoft.UI.Xaml.Navigation;
-using BetterLyrics.WinUI3.Models;
 
 // To learn more about WinUI, the WinUI project structure,
 // and more about our project templates, see: http://aka.ms/winui-project-info.
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/ExtendedSlider.xaml.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/ExtendedSlider.xaml.cs
index 2f60e3f..9bc219f 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/ExtendedSlider.xaml.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/ExtendedSlider.xaml.cs
@@ -1,19 +1,8 @@
 using BetterLyrics.WinUI3.Events;
-using Microsoft.UI.Input;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Controls.Primitives;
-using Microsoft.UI.Xaml.Data;
 using Microsoft.UI.Xaml.Input;
-using Microsoft.UI.Xaml.Media;
-using Microsoft.UI.Xaml.Navigation;
 using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
 
 // To learn more about WinUI, the WinUI project structure,
 // and more about our project templates, see: http://aka.ms/winui-project-info.
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/FontFamilyAutoSuggestBox.xaml.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/FontFamilyAutoSuggestBox.xaml.cs
index 2858a0a..344364a 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/FontFamilyAutoSuggestBox.xaml.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/FontFamilyAutoSuggestBox.xaml.cs
@@ -1,20 +1,8 @@
 using BetterLyrics.WinUI3.Helper;
-using BetterLyrics.WinUI3.Models.Settings;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Controls.Primitives;
-using Microsoft.UI.Xaml.Data;
-using Microsoft.UI.Xaml.Input;
-using Microsoft.UI.Xaml.Media;
-using Microsoft.UI.Xaml.Navigation;
-using System;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.IO;
 using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
 
 // To learn more about WinUI, the WinUI project structure,
 // and more about our project templates, see: http://aka.ms/winui-project-info.
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsBackgroundSettingsControl.xaml.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsBackgroundSettingsControl.xaml.cs
index c0e7c14..36c205d 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsBackgroundSettingsControl.xaml.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsBackgroundSettingsControl.xaml.cs
@@ -1,20 +1,6 @@
 using BetterLyrics.WinUI3.Models.Settings;
-using BetterLyrics.WinUI3.ViewModels;
-using CommunityToolkit.Mvvm.DependencyInjection;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Controls.Primitives;
-using Microsoft.UI.Xaml.Data;
-using Microsoft.UI.Xaml.Input;
-using Microsoft.UI.Xaml.Media;
-using Microsoft.UI.Xaml.Navigation;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
 
 // To learn more about WinUI, the WinUI project structure,
 // and more about our project templates, see: http://aka.ms/winui-project-info.
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsEffectSettingsControl.xaml.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsEffectSettingsControl.xaml.cs
index 75ef360..e12dee4 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsEffectSettingsControl.xaml.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsEffectSettingsControl.xaml.cs
@@ -1,20 +1,6 @@
-using BetterLyrics.WinUI3.Helper;
 using BetterLyrics.WinUI3.Models.Settings;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Controls.Primitives;
-using Microsoft.UI.Xaml.Data;
-using Microsoft.UI.Xaml.Input;
-using Microsoft.UI.Xaml.Media;
-using Microsoft.UI.Xaml.Navigation;
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
 
 // To learn more about WinUI, the WinUI project structure,
 // and more about our project templates, see: http://aka.ms/winui-project-info.
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsSearchControl.xaml.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsSearchControl.xaml.cs
index 321848d..18cf197 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsSearchControl.xaml.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsSearchControl.xaml.cs
@@ -1,21 +1,7 @@
 using BetterLyrics.WinUI3.Models;
 using BetterLyrics.WinUI3.ViewModels;
 using CommunityToolkit.Mvvm.DependencyInjection;
-using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Controls.Primitives;
-using Microsoft.UI.Xaml.Data;
-using Microsoft.UI.Xaml.Input;
-using Microsoft.UI.Xaml.Media;
-using Microsoft.UI.Xaml.Navigation;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Ude.Core;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
 
 // To learn more about WinUI, the WinUI project structure,
 // and more about our project templates, see: http://aka.ms/winui-project-info.
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsStyleSettingsControl.xaml.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsStyleSettingsControl.xaml.cs
index 82eb766..d28d5ee 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsStyleSettingsControl.xaml.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsStyleSettingsControl.xaml.cs
@@ -1,20 +1,6 @@
-using BetterLyrics.WinUI3.Helper;
 using BetterLyrics.WinUI3.Models.Settings;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Controls.Primitives;
-using Microsoft.UI.Xaml.Data;
-using Microsoft.UI.Xaml.Input;
-using Microsoft.UI.Xaml.Media;
-using Microsoft.UI.Xaml.Navigation;
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
 
 // To learn more about WinUI, the WinUI project structure,
 // and more about our project templates, see: http://aka.ms/winui-project-info.
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsWindowSettingsControl.xaml.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsWindowSettingsControl.xaml.cs
index b93f1ba..5eb0274 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsWindowSettingsControl.xaml.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsWindowSettingsControl.xaml.cs
@@ -1,6 +1,5 @@
 using BetterLyrics.WinUI3.Helper;
 using BetterLyrics.WinUI3.Models;
-using BetterLyrics.WinUI3.Models.Settings;
 using BetterLyrics.WinUI3.Serialization;
 using BetterLyrics.WinUI3.Services.LiveStatesService;
 using BetterLyrics.WinUI3.Services.ResourceService;
@@ -10,22 +9,12 @@ using BetterLyrics.WinUI3.Views;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Controls.Primitives;
-using Microsoft.UI.Xaml.Data;
 using Microsoft.UI.Xaml.Input;
-using Microsoft.UI.Xaml.Media;
-using Microsoft.UI.Xaml.Navigation;
 using NTextCat.Commons;
-using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
 using Windows.Storage;
-using WinRT.Interop;
-using static Vanara.PInvoke.ComCtl32;
 
 // To learn more about WinUI, the WinUI project structure,
 // and more about our project templates, see: http://aka.ms/winui-project-info.
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsWindowSwitchControl.xaml.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsWindowSwitchControl.xaml.cs
index 148c0d1..d19baea 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsWindowSwitchControl.xaml.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsWindowSwitchControl.xaml.cs
@@ -4,19 +4,8 @@ using BetterLyrics.WinUI3.Views;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Controls.Primitives;
-using Microsoft.UI.Xaml.Data;
 using Microsoft.UI.Xaml.Input;
-using Microsoft.UI.Xaml.Media;
-using Microsoft.UI.Xaml.Navigation;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
 using System.Threading.Tasks;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
 
 // To learn more about WinUI, the WinUI project structure,
 // and more about our project templates, see: http://aka.ms/winui-project-info.
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/MediaSettingsControl.xaml.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/MediaSettingsControl.xaml.cs
index b737cf5..4393667 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/MediaSettingsControl.xaml.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/MediaSettingsControl.xaml.cs
@@ -3,18 +3,7 @@ using BetterLyrics.WinUI3.ViewModels;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Controls.Primitives;
-using Microsoft.UI.Xaml.Data;
-using Microsoft.UI.Xaml.Input;
-using Microsoft.UI.Xaml.Media;
-using Microsoft.UI.Xaml.Navigation;
 using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
 using Windows.System;
 
 // To learn more about WinUI, the WinUI project structure,
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/PlaybackSettingsControl.xaml.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/PlaybackSettingsControl.xaml.cs
index cf2aa55..6cd21aa 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/PlaybackSettingsControl.xaml.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/PlaybackSettingsControl.xaml.cs
@@ -1,19 +1,6 @@
 using BetterLyrics.WinUI3.ViewModels;
 using CommunityToolkit.Mvvm.DependencyInjection;
-using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Controls.Primitives;
-using Microsoft.UI.Xaml.Data;
-using Microsoft.UI.Xaml.Input;
-using Microsoft.UI.Xaml.Media;
-using Microsoft.UI.Xaml.Navigation;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
 
 // To learn more about WinUI, the WinUI project structure,
 // and more about our project templates, see: http://aka.ms/winui-project-info.
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/ShortcutTextBox.xaml.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/ShortcutTextBox.xaml.cs
index 9131663..8282fd9 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/ShortcutTextBox.xaml.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/ShortcutTextBox.xaml.cs
@@ -4,18 +4,8 @@ using CommunityToolkit.Mvvm.DependencyInjection;
 using Microsoft.UI.Input;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Controls.Primitives;
-using Microsoft.UI.Xaml.Data;
 using Microsoft.UI.Xaml.Input;
-using Microsoft.UI.Xaml.Media;
-using Microsoft.UI.Xaml.Navigation;
-using System;
 using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
 using Windows.UI.Core;
 
 // To learn more about WinUI, the WinUI project structure,
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/AlbumArtSearchProviderToDisplayNameConverter.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/AlbumArtSearchProviderToDisplayNameConverter.cs
index fd6c0d2..4b07edc 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/AlbumArtSearchProviderToDisplayNameConverter.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/AlbumArtSearchProviderToDisplayNameConverter.cs
@@ -3,10 +3,6 @@ using BetterLyrics.WinUI3.Services.ResourceService;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Microsoft.UI.Xaml.Data;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.Converter
 {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/BoolNegationToOpacityConverter.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/BoolNegationToOpacityConverter.cs
index 47512f0..967c355 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/BoolNegationToOpacityConverter.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/BoolNegationToOpacityConverter.cs
@@ -1,13 +1,9 @@
 using Microsoft.UI.Xaml.Data;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.Converter
 {
-    public partial class BoolNegationToOpacityConverter: IValueConverter
+    public partial class BoolNegationToOpacityConverter : IValueConverter
     {
         public object Convert(object value, Type targetType, object parameter, string language)
         {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/BoolToOpacityConverter.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/BoolToOpacityConverter.cs
index 877214e..7076807 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/BoolToOpacityConverter.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/BoolToOpacityConverter.cs
@@ -1,9 +1,5 @@
 using Microsoft.UI.Xaml.Data;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.Converter
 {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/BoolToPartialOpacityConverter.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/BoolToPartialOpacityConverter.cs
index ee17c8b..6e84b9f 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/BoolToPartialOpacityConverter.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/BoolToPartialOpacityConverter.cs
@@ -1,9 +1,5 @@
 using Microsoft.UI.Xaml.Data;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.Converter
 {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/ByteArrayToImageConverter.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/ByteArrayToImageConverter.cs
index 2e20356..a636257 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/ByteArrayToImageConverter.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/ByteArrayToImageConverter.cs
@@ -2,11 +2,7 @@
 using Microsoft.UI.Xaml.Data;
 using Microsoft.UI.Xaml.Media.Imaging;
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.Converter
 {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/ColorToBrushConverter.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/ColorToBrushConverter.cs
index 05dc306..53eb987 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/ColorToBrushConverter.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/ColorToBrushConverter.cs
@@ -1,8 +1,8 @@
 // 2025/6/23 by Zhe Fang
 
-using System;
 using Microsoft.UI.Xaml.Data;
 using Microsoft.UI.Xaml.Media;
+using System;
 using Windows.UI;
 
 namespace BetterLyrics.WinUI3.Converter
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/CornerRadiusToDoubleConverter.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/CornerRadiusToDoubleConverter.cs
index 16c8aca..14860f2 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/CornerRadiusToDoubleConverter.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/CornerRadiusToDoubleConverter.cs
@@ -1,5 +1,5 @@
-using System;
-using Microsoft.UI.Xaml.Data;
+using Microsoft.UI.Xaml.Data;
+using System;
 
 namespace BetterLyrics.WinUI3.Converter
 {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/DisplayLanguageCodeToIndexConverter.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/DisplayLanguageCodeToIndexConverter.cs
index 60a14fa..31dcbfb 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/DisplayLanguageCodeToIndexConverter.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/DisplayLanguageCodeToIndexConverter.cs
@@ -1,11 +1,7 @@
 using BetterLyrics.WinUI3.Helper;
 using Microsoft.UI.Xaml.Data;
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Windows.Globalization;
 
 namespace BetterLyrics.WinUI3.Converter
 {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/EnumToIntConverter.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/EnumToIntConverter.cs
index 8998b9e..5c3326f 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/EnumToIntConverter.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/EnumToIntConverter.cs
@@ -1,7 +1,7 @@
 // 2025/6/23 by Zhe Fang
 
-using System;
 using Microsoft.UI.Xaml.Data;
+using System;
 
 namespace BetterLyrics.WinUI3.Converter
 {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/FPSToTimeSpanConverter.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/FPSToTimeSpanConverter.cs
index 7c8f698..316f80b 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/FPSToTimeSpanConverter.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/FPSToTimeSpanConverter.cs
@@ -1,9 +1,5 @@
 using Microsoft.UI.Xaml.Data;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.Converter
 {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/IndexToDisplayConverter.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/IndexToDisplayConverter.cs
index 07432f8..a639a71 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/IndexToDisplayConverter.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/IndexToDisplayConverter.cs
@@ -1,9 +1,5 @@
 using Microsoft.UI.Xaml.Data;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.Converter
 {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/IntToBoolConverter.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/IntToBoolConverter.cs
index 62baef7..f3980d3 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/IntToBoolConverter.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/IntToBoolConverter.cs
@@ -1,9 +1,5 @@
 using Microsoft.UI.Xaml.Data;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.Converter
 {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/IntToCornerRadius.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/IntToCornerRadius.cs
index acdcb67..6f997de 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/IntToCornerRadius.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/IntToCornerRadius.cs
@@ -1,7 +1,7 @@
 // 2025/6/23 by Zhe Fang
 
-using System;
 using Microsoft.UI.Xaml.Data;
+using System;
 
 namespace BetterLyrics.WinUI3.Converter
 {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/LanguageCodeToDisplayedNameConverter.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/LanguageCodeToDisplayedNameConverter.cs
index efd5993..ed2130e 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/LanguageCodeToDisplayedNameConverter.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/LanguageCodeToDisplayedNameConverter.cs
@@ -1,11 +1,6 @@
 using BetterLyrics.WinUI3.Helper;
-using BetterLyrics.WinUI3.Services;
 using Microsoft.UI.Xaml.Data;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Windows.Globalization;
 
 namespace BetterLyrics.WinUI3.Converter
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/MediaSourceProviderToDisplayedNameConverter.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/MediaSourceProviderToDisplayedNameConverter.cs
index 1bb0618..1cd9531 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/MediaSourceProviderToDisplayedNameConverter.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/MediaSourceProviderToDisplayedNameConverter.cs
@@ -1,11 +1,6 @@
 using BetterLyrics.WinUI3.Constants;
-using BetterLyrics.WinUI3.Helper;
 using Microsoft.UI.Xaml.Data;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.Converter
 {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/MediaSourceProviderToLogoUriConverter.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/MediaSourceProviderToLogoUriConverter.cs
index a83589b..e92b1c9 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/MediaSourceProviderToLogoUriConverter.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/MediaSourceProviderToLogoUriConverter.cs
@@ -16,7 +16,7 @@ namespace BetterLyrics.WinUI3.Converter
                     PlayerID.Spotify => PathHelper.SpotifyLogoPath,
                     PlayerID.AppleMusic => PathHelper.AppleMusicLogoPath,
                     PlayerID.AppleMusicAlternative => PathHelper.AppleMusicLogoPath,
-                    PlayerID.iTunes  => PathHelper.iTunesLogoPath,
+                    PlayerID.iTunes => PathHelper.iTunesLogoPath,
                     PlayerID.KugouMusic => PathHelper.KugouMusicLogoPath,
                     PlayerID.NetEaseCloudMusic => PathHelper.NetEaseCloudMusicLogoPath,
                     PlayerID.QQMusic => PathHelper.QQMusicLogoPath,
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/MillisecondsToFormattedTimeConverter.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/MillisecondsToFormattedTimeConverter.cs
index dcf7e57..f352f95 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/MillisecondsToFormattedTimeConverter.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/MillisecondsToFormattedTimeConverter.cs
@@ -1,9 +1,5 @@
 using Microsoft.UI.Xaml.Data;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.Converter
 {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/PathToParentFolderConverter.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/PathToParentFolderConverter.cs
index 29d34cd..679b485 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/PathToParentFolderConverter.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/PathToParentFolderConverter.cs
@@ -1,10 +1,6 @@
 using Microsoft.UI.Xaml.Data;
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.Converter
 {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/RectToMarginConverter.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/RectToMarginConverter.cs
index 34e5954..5b78399 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/RectToMarginConverter.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/RectToMarginConverter.cs
@@ -1,9 +1,5 @@
 using Microsoft.UI.Xaml.Data;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.Converter
 {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/SecondsToFormattedTimeConverter.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/SecondsToFormattedTimeConverter.cs
index 17fe60e..b325420 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/SecondsToFormattedTimeConverter.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/SecondsToFormattedTimeConverter.cs
@@ -1,9 +1,5 @@
 using Microsoft.UI.Xaml.Data;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.Converter
 {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/ShortcutToStringConverter.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/ShortcutToStringConverter.cs
index 4296134..fa1db33 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/ShortcutToStringConverter.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/ShortcutToStringConverter.cs
@@ -1,9 +1,6 @@
 using Microsoft.UI.Xaml.Data;
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.Converter
 {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/TrackToLyricsConverter.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/TrackToLyricsConverter.cs
index 9502a3e..bfd3bf3 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/TrackToLyricsConverter.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/TrackToLyricsConverter.cs
@@ -2,10 +2,6 @@
 using BetterLyrics.WinUI3.Helper;
 using Microsoft.UI.Xaml.Data;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.Converter
 {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/AlbumArtSearchProvider.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/AlbumArtSearchProvider.cs
index 1e98253..3905d91 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/AlbumArtSearchProvider.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/AlbumArtSearchProvider.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Enums
+namespace BetterLyrics.WinUI3.Enums
 {
     public enum AlbumArtSearchProvider
     {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/ChineseRomanization.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/ChineseRomanization.cs
index 3a9148d..722e186 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/ChineseRomanization.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/ChineseRomanization.cs
@@ -1,9 +1,5 @@
 using BetterLyrics.WinUI3.Helper;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.Enums
 {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/CommonSongProperty.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/CommonSongProperty.cs
index 15f3012..d818f9d 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/CommonSongProperty.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/CommonSongProperty.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Enums
+namespace BetterLyrics.WinUI3.Enums
 {
     public enum CommonSongProperty
     {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/DockPlacement.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/DockPlacement.cs
index 97cd2ca..9bc713c 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/DockPlacement.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/DockPlacement.cs
@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.Enums
 {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/Language.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/Language.cs
index 2ac0aa7..1b60b8a 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/Language.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/Language.cs
@@ -1,11 +1,5 @@
 // 2025/6/23 by Zhe Fang
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
 namespace BetterLyrics.WinUI3.Enums
 {
     public enum Language
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/LineMaskType.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/LineMaskType.cs
index 9487bda..146f60d 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/LineMaskType.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/LineMaskType.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Enums
+namespace BetterLyrics.WinUI3.Enums
 {
     public enum LineMaskType
     {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/LyricsFontWeight.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/LyricsFontWeight.cs
index fcad81d..de12ba9 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/LyricsFontWeight.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/LyricsFontWeight.cs
@@ -1,7 +1,7 @@
 // 2025/6/23 by Zhe Fang
 
-using System;
 using Microsoft.UI.Text;
+using System;
 using Windows.UI.Text;
 
 namespace BetterLyrics.WinUI3.Enums
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/LyricsLayoutOrientation.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/LyricsLayoutOrientation.cs
index 96df6ad..5115644 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/LyricsLayoutOrientation.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/LyricsLayoutOrientation.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Enums
+namespace BetterLyrics.WinUI3.Enums
 {
     public enum LyricsLayoutOrientation
     {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/PaletteGeneratorType.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/PaletteGeneratorType.cs
index e2e5589..f12ce62 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/PaletteGeneratorType.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/PaletteGeneratorType.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Enums
+namespace BetterLyrics.WinUI3.Enums
 {
     public enum PaletteGeneratorType
     {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/PlaybackOrder.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/PlaybackOrder.cs
index 483dcd1..b340ceb 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/PlaybackOrder.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/PlaybackOrder.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Enums
+namespace BetterLyrics.WinUI3.Enums
 {
     public enum PlaybackOrder
     {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/SettingsStoreType.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/SettingsStoreType.cs
index cdaa996..5cdb7dd 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/SettingsStoreType.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/SettingsStoreType.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Enums
+namespace BetterLyrics.WinUI3.Enums
 {
     public enum SettingsStoreType
     {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/ShortcutID.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/ShortcutID.cs
index 0d3e9ee..0f141ff 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/ShortcutID.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/ShortcutID.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Enums
+namespace BetterLyrics.WinUI3.Enums
 {
     public enum ShortcutID
     {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/TitleBarArea.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/TitleBarArea.cs
index 7538884..0160d80 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/TitleBarArea.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/TitleBarArea.cs
@@ -1,12 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Enums
+namespace BetterLyrics.WinUI3.Enums
 {
-    public  enum TitleBarArea
+    public enum TitleBarArea
     {
         None,
         Top,
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/TranslationSearchProvider.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/TranslationSearchProvider.cs
index 50c0c0f..68bcac4 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/TranslationSearchProvider.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/TranslationSearchProvider.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Enums
+namespace BetterLyrics.WinUI3.Enums
 {
     public enum TranslationSearchProvider
     {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/AlbumArtChangedEventArgs.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/AlbumArtChangedEventArgs.cs
index 49e68c3..0f25bd3 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/AlbumArtChangedEventArgs.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/AlbumArtChangedEventArgs.cs
@@ -1,8 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Windows.Graphics.Imaging;
 using Windows.UI;
 
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/ExtendedSliderValueChangedByUserEventArgs.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/ExtendedSliderValueChangedByUserEventArgs.cs
index d7c4068..fcc7ffc 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/ExtendedSliderValueChangedByUserEventArgs.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/ExtendedSliderValueChangedByUserEventArgs.cs
@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.Events
 {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/LastFMIsAuthenticatedChangedEventArgs.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/LastFMIsAuthenticatedChangedEventArgs.cs
index 175a8b5..a6eeb8d 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/LastFMIsAuthenticatedChangedEventArgs.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/LastFMIsAuthenticatedChangedEventArgs.cs
@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.Events
 {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/LastFMUserChangedEventArgs.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/LastFMUserChangedEventArgs.cs
index d838ba9..4ba140f 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/LastFMUserChangedEventArgs.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/LastFMUserChangedEventArgs.cs
@@ -1,9 +1,5 @@
 using Hqub.Lastfm.Entities;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.Events
 {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/LibChangedEventArgs.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/LibChangedEventArgs.cs
index 45509da..dbddb56 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/LibChangedEventArgs.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/LibChangedEventArgs.cs
@@ -1,11 +1,7 @@
 // 2025/6/23 by Zhe Fang
 
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.Events
 {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/LyricsChangedEventArgs.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/LyricsChangedEventArgs.cs
index 9b1960d..ae47797 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/LyricsChangedEventArgs.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/LyricsChangedEventArgs.cs
@@ -1,9 +1,5 @@
 using BetterLyrics.WinUI3.Models;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.Events
 {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/MediaSourceProvidersInfoEventArgs.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/MediaSourceProvidersInfoEventArgs.cs
index 892430d..2090521 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/MediaSourceProvidersInfoEventArgs.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/MediaSourceProvidersInfoEventArgs.cs
@@ -1,13 +1,10 @@
 using BetterLyrics.WinUI3.Models;
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.Events
 {
-    public class MediaSourceProvidersInfoEventArgs(List<MediaSourceProviderInfo> sessionIds):EventArgs
+    public class MediaSourceProvidersInfoEventArgs(List<MediaSourceProviderInfo> sessionIds) : EventArgs
     {
         public List<MediaSourceProviderInfo> MediaSourceProviersInfo { get; set; } = sessionIds;
     }
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/SongInfoChangedEventArgs.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/SongInfoChangedEventArgs.cs
index b1f1677..c23a976 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/SongInfoChangedEventArgs.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/SongInfoChangedEventArgs.cs
@@ -1,7 +1,7 @@
 // 2025/6/23 by Zhe Fang
 
-using System;
 using BetterLyrics.WinUI3.Models;
+using System;
 
 namespace BetterLyrics.WinUI3.Events
 {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/FullyObservableCollection.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/FullyObservableCollection.cs
index 52a630e..5795a14 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/FullyObservableCollection.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/FullyObservableCollection.cs
@@ -3,9 +3,6 @@ using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Collections.Specialized;
 using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.Extensions
 {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/AppWindowHelper.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/AppWindowHelper.cs
index 7ee80cb..76fc33e 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/AppWindowHelper.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/AppWindowHelper.cs
@@ -1,9 +1,4 @@
 using Microsoft.UI.Windowing;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.Helper
 {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/AppleMusic.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/AppleMusic.cs
index 983e517..7b98f88 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/AppleMusic.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/AppleMusic.cs
@@ -1,10 +1,6 @@
-using BetterLyrics.WinUI3.Constants;
-using System;
-using System.Collections.Generic;
-using System.Linq;
+using System;
 using System.Net;
 using System.Net.Http;
-using System.Text;
 using System.Text.Json;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/CanvasHelper.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/CanvasHelper.cs
index 0bddd5e..1304188 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/CanvasHelper.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/CanvasHelper.cs
@@ -3,16 +3,11 @@ using BetterLyrics.WinUI3.Models;
 using Microsoft.Graphics.Canvas;
 using Microsoft.Graphics.Canvas.Brushes;
 using Microsoft.Graphics.Canvas.Effects;
-using Microsoft.Graphics.Canvas.Geometry;
-using Microsoft.Graphics.Canvas.Text;
 using Microsoft.Graphics.Canvas.UI.Xaml;
 using Microsoft.UI;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Numerics;
-using System.Text;
-using System.Threading.Tasks;
 using Windows.Foundation;
 using Windows.Graphics.Effects;
 using Windows.UI;
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/CanvasTextLayoutHelper.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/CanvasTextLayoutHelper.cs
index 27256e5..0f021d1 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/CanvasTextLayoutHelper.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/CanvasTextLayoutHelper.cs
@@ -1,9 +1,4 @@
 using Microsoft.Graphics.Canvas.Text;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.Helper
 {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/CollectionHelper.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/CollectionHelper.cs
index 9800dc1..67ae127 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/CollectionHelper.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/CollectionHelper.cs
@@ -1,13 +1,8 @@
-using ATL;
-using BetterLyrics.WinUI3.Models;
-using BetterLyrics.WinUI3.Services;
+using BetterLyrics.WinUI3.Models;
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.Helper
 {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/ColorHelper.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/ColorHelper.cs
index 5ba3b42..d0a2d98 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/ColorHelper.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/ColorHelper.cs
@@ -1,7 +1,6 @@
 // 2025/6/23 by Zhe Fang
 
 using BetterLyrics.WinUI3.Enums;
-using Microsoft.UI;
 using Microsoft.UI.Xaml;
 using System;
 using System.Collections.Generic;
@@ -9,7 +8,6 @@ using System.Drawing;
 using System.Drawing.Imaging;
 using System.Numerics;
 using Vanara.PInvoke;
-using Windows.UI;
 
 using Color = Windows.UI.Color;
 
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/DirectoryHelper.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/DirectoryHelper.cs
index d58031d..171c53d 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/DirectoryHelper.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/DirectoryHelper.cs
@@ -1,18 +1,8 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Helper
+namespace BetterLyrics.WinUI3.Helper
 {
     using System;
     using System.Collections.Generic;
-    using System.Diagnostics;
     using System.IO;
-    using System.Linq;
-    using System.Text;
-    using System.Threading.Tasks;
 
     namespace BetterLyrics.WinUI3.Helper
     {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/EasingHelper.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/EasingHelper.cs
index 576ff5b..ba504e6 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/EasingHelper.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/EasingHelper.cs
@@ -1,10 +1,6 @@
 // 2025/6/23 by Zhe Fang
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.Helper
 {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/EnumHelper.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/EnumHelper.cs
index 8342769..91f72d3 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/EnumHelper.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/EnumHelper.cs
@@ -1,10 +1,4 @@
-using BetterLyrics.WinUI3.Enums;
-using BetterLyrics.WinUI3.Models.Settings;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System;
 
 namespace BetterLyrics.WinUI3.Helper
 {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/FileHelper.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/FileHelper.cs
index c1796b2..5b81b8c 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/FileHelper.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/FileHelper.cs
@@ -1,12 +1,8 @@
 // 2025/6/23 by Zhe Fang
 
-using ATL;
 using BetterLyrics.WinUI3.Enums;
-using BetterLyrics.WinUI3.Models;
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Text;
 using Ude;
 
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/FontHelper.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/FontHelper.cs
index 7915589..eecfebc 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/FontHelper.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/FontHelper.cs
@@ -1,11 +1,5 @@
-using BetterLyrics.WinUI3.Services.SettingsService;
-using CommunityToolkit.Mvvm.DependencyInjection;
-using Microsoft.Graphics.Canvas.Text;
-using System;
-using System.Collections.Generic;
+using Microsoft.Graphics.Canvas.Text;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.Helper
 {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/ForegroundWindowWatcher.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/ForegroundWindowWatcher.cs
index 7cae2c0..52b1f46 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/ForegroundWindowWatcher.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/ForegroundWindowWatcher.cs
@@ -1,13 +1,7 @@
-using System;
+using Microsoft.UI.Xaml;
+using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
-using CommunityToolkit.WinUI;
-using Microsoft.UI.Xaml;
 using Vanara.PInvoke;
-using Windows.System;
 
 namespace BetterLyrics.WinUI3.Helper
 {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/GlobalHotKeyHelper.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/GlobalHotKeyHelper.cs
index 8682122..0fa9fbc 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/GlobalHotKeyHelper.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/GlobalHotKeyHelper.cs
@@ -1,10 +1,6 @@
 using BetterLyrics.WinUI3.Enums;
-using Microsoft.UI.Xaml;
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Vanara.PInvoke;
 using Windows.System;
 using WinRT.Interop;
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/ImageHelper.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/ImageHelper.cs
index 51350f5..3e03f22 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/ImageHelper.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/ImageHelper.cs
@@ -1,17 +1,10 @@
 // 2025/6/23 by Zhe Fang
 
 using BetterLyrics.WinUI3.Enums;
-using BetterLyrics.WinUI3.Models.Settings;
-using CommunityToolkit.WinUI.Helpers;
 using Impressionist.Abstractions;
-using Impressionist.Implementations;
 using Microsoft.Graphics.Canvas;
-using Microsoft.Graphics.Canvas.Text;
-using Microsoft.UI;
-using Microsoft.UI.Xaml.Media.Imaging;
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using System.Net.Http;
 using System.Numerics;
@@ -20,8 +13,6 @@ using System.Threading.Tasks;
 using Windows.Graphics.Imaging;
 using Windows.Storage;
 using Windows.Storage.Streams;
-using Windows.UI;
-using static Vanara.PInvoke.Ole32;
 
 namespace BetterLyrics.WinUI3.Helper
 {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/LanguageHelper.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/LanguageHelper.cs
index 4bdd856..7042896 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/LanguageHelper.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/LanguageHelper.cs
@@ -1,12 +1,9 @@
-using BetterLyrics.WinUI3.Helper;
-using BetterLyrics.WinUI3.Models;
+using BetterLyrics.WinUI3.Models;
 using BetterLyrics.WinUI3.Services.ResourceService;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using NTextCat;
-using NTextCat.Commons;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Windows.Globalization;
 
 namespace BetterLyrics.WinUI3.Helper
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/LatestOnlyTaskRunner.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/LatestOnlyTaskRunner.cs
index 815d4e4..26d2f87 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/LatestOnlyTaskRunner.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/LatestOnlyTaskRunner.cs
@@ -1,7 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/LauncherHelper.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/LauncherHelper.cs
index c1fdd7a..e8b42c0 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/LauncherHelper.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/LauncherHelper.cs
@@ -1,7 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 using Windows.Storage;
 using Windows.System;
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/LyricsParser.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/LyricsParser.cs
index 740dc1d..c4a100d 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/LyricsParser.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/LyricsParser.cs
@@ -2,16 +2,13 @@
 
 using BetterLyrics.WinUI3.Enums;
 using BetterLyrics.WinUI3.Models;
-using BetterLyrics.WinUI3.Services;
 using Lyricify.Lyrics.Models;
 using Lyricify.Lyrics.Parsers;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.RegularExpressions;
-using System.Threading.Tasks;
 using System.Xml.Linq;
-using Vanara.PInvoke;
 using LyricsData = BetterLyrics.WinUI3.Models.LyricsData;
 
 namespace BetterLyrics.WinUI3.Helper
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/MonitorHelper.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/MonitorHelper.cs
index eb28033..63558c6 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/MonitorHelper.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/MonitorHelper.cs
@@ -1,11 +1,7 @@
 using Microsoft.UI.Xaml;
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
 using Vanara.PInvoke;
 using WinRT.Interop;
 
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/NetHelper.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/NetHelper.cs
index 8a68874..3b14100 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/NetHelper.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/NetHelper.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.Helper
 {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/ObjectHelper.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/ObjectHelper.cs
index c0f0b1c..d9a1c7f 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/ObjectHelper.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/ObjectHelper.cs
@@ -1,10 +1,6 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.Helper
 {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/PaletteHelper.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/PaletteHelper.cs
index 8c91863..417dcd5 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/PaletteHelper.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/PaletteHelper.cs
@@ -5,11 +5,8 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Numerics;
-using System.Runtime.InteropServices.WindowsRuntime;
-using System.Text;
 using System.Threading.Tasks;
 using Windows.Graphics.Imaging;
-using Windows.Storage.Streams;
 
 namespace BetterLyrics.WinUI3.Helper
 {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/PasswordVaultHelper.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/PasswordVaultHelper.cs
index 3b9ca16..18d023e 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/PasswordVaultHelper.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/PasswordVaultHelper.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Windows.Security.Credentials;
+using Windows.Security.Credentials;
 
 namespace BetterLyrics.WinUI3.Helper
 {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/PathHelper.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/PathHelper.cs
index fbf0661..f013c3b 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/PathHelper.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/PathHelper.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.IO;
 using Windows.ApplicationModel;
 using Windows.Storage;
 
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/PhoneticHelper.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/PhoneticHelper.cs
index a2dc2c2..963f49c 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/PhoneticHelper.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/PhoneticHelper.cs
@@ -1,10 +1,6 @@
 using BetterLyrics.WinUI3.Services.ResourceService;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.Helper
 {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/PickerHelper.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/PickerHelper.cs
index e3ff7dc..da3a1c3 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/PickerHelper.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/PickerHelper.cs
@@ -1,7 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 using Windows.Storage;
 using WinRT.Interop;
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/PointHelper.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/PointHelper.cs
index 7bab427..e6374f3 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/PointHelper.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/PointHelper.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Windows.Foundation;
+using Windows.Foundation;
 using Windows.Graphics;
 
 namespace BetterLyrics.WinUI3.Helper
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/RectHelper.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/RectHelper.cs
index f188208..948d940 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/RectHelper.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/RectHelper.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Windows.Graphics;
+using Windows.Graphics;
 
 namespace BetterLyrics.WinUI3.Helper
 {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/StringHelper.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/StringHelper.cs
index bd6ce23..1ea2fed 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/StringHelper.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/StringHelper.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Linq;
 
 namespace BetterLyrics.WinUI3.Helper
 {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/SystemVolumeHelper.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/SystemVolumeHelper.cs
index f844d77..b2e16f3 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/SystemVolumeHelper.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/SystemVolumeHelper.cs
@@ -1,10 +1,6 @@
 using Microsoft.UI.Dispatching;
 using NAudio.CoreAudioApi;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.Helper
 {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/TrackHelper.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/TrackHelper.cs
index 3c3659d..8ab8e42 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/TrackHelper.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/TrackHelper.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.IO;
 
 namespace BetterLyrics.WinUI3.Helper
 {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/ValueTransition.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/ValueTransition.cs
index b37ca59..c33ceac 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/ValueTransition.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/ValueTransition.cs
@@ -1,7 +1,7 @@
 // 2025/6/23 by Zhe Fang
 
-using System;
 using BetterLyrics.WinUI3.Enums;
+using System;
 
 namespace BetterLyrics.WinUI3.Helper
 {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/VectorHelper.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/VectorHelper.cs
index 1d44eba..8863736 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/VectorHelper.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/VectorHelper.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Numerics;
-using System.Text;
-using System.Threading.Tasks;
+using System.Numerics;
 
 namespace BetterLyrics.WinUI3.Helper
 {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/WindowHelper.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/WindowHelper.cs
index 1ad713f..dc36834 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/WindowHelper.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/WindowHelper.cs
@@ -12,7 +12,6 @@ using Microsoft.UI.Xaml;
 using System;
 using System.Collections.Generic;
 using System.Runtime.InteropServices;
-using System.Threading.Tasks;
 using Vanara.PInvoke;
 using Windows.ApplicationModel.Core;
 using Windows.Foundation;
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/ExtendedLanguage.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/ExtendedLanguage.cs
index 1979bf6..5a2070e 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/ExtendedLanguage.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/ExtendedLanguage.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Windows.Globalization;
+using Windows.Globalization;
 
 namespace BetterLyrics.WinUI3.Models
 {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/GroupInfoList.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/GroupInfoList.cs
index 7a24702..2da0e03 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/GroupInfoList.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/GroupInfoList.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.Models
 {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LiveStates.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LiveStates.cs
index 1f60821..6ddef95 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LiveStates.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LiveStates.cs
@@ -1,16 +1,4 @@
-using BetterLyrics.WinUI3.Enums;
-using BetterLyrics.WinUI3.Helper;
-using BetterLyrics.WinUI3.Models.Settings;
-using BetterLyrics.WinUI3.Views;
-using CommunityToolkit.Mvvm.ComponentModel;
-using CommunityToolkit.Mvvm.Messaging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Vanara.PInvoke;
-using Windows.Foundation;
+using CommunityToolkit.Mvvm.ComponentModel;
 
 namespace BetterLyrics.WinUI3.Models
 {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LyricsChar.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LyricsChar.cs
index 2730a98..13b75a4 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LyricsChar.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LyricsChar.cs
@@ -1,7 +1,5 @@
 // 2025/6/23 by Zhe Fang
 
-using BetterLyrics.WinUI3.Helper;
-
 namespace BetterLyrics.WinUI3.Models
 {
     public class LyricsChar
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LyricsData.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LyricsData.cs
index 8b86bce..9f8c269 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LyricsData.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LyricsData.cs
@@ -1,14 +1,9 @@
-using BetterLyrics.WinUI3.Enums;
-using BetterLyrics.WinUI3.Helper;
-using BetterLyrics.WinUI3.Services;
+using BetterLyrics.WinUI3.Helper;
 using BetterLyrics.WinUI3.Services.ResourceService;
 using CommunityToolkit.Mvvm.DependencyInjection;
-using Lyricify.Lyrics.Helpers.General;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using StringHelper = BetterLyrics.WinUI3.Helper.StringHelper;
 
 namespace BetterLyrics.WinUI3.Models
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LyricsLine.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LyricsLine.cs
index 3029a1c..f40592f 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LyricsLine.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LyricsLine.cs
@@ -2,21 +2,11 @@
 
 using BetterLyrics.WinUI3.Enums;
 using BetterLyrics.WinUI3.Helper;
-using BetterLyrics.WinUI3.Services;
-using Microsoft.Graphics.Canvas;
-using Microsoft.Graphics.Canvas.Effects;
 using Microsoft.Graphics.Canvas.Geometry;
 using Microsoft.Graphics.Canvas.Text;
 using Microsoft.Graphics.Canvas.UI.Xaml;
-using Microsoft.UI;
-using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Shapes;
 using System.Collections.Generic;
-using System.Linq;
 using System.Numerics;
-using Windows.Foundation;
-using Windows.Graphics.Effects;
-using Windows.UI;
 
 namespace BetterLyrics.WinUI3.Models
 {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LyricsSearchResult.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LyricsSearchResult.cs
index 997761f..d9e7628 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LyricsSearchResult.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LyricsSearchResult.cs
@@ -1,9 +1,4 @@
 using BetterLyrics.WinUI3.Enums;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.Models
 {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LyricsWindowStatus.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LyricsWindowStatus.cs
index 1a5ca38..3983ee9 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LyricsWindowStatus.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LyricsWindowStatus.cs
@@ -5,7 +5,6 @@ using BetterLyrics.WinUI3.Services.ResourceService;
 using BetterLyrics.WinUI3.Views;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.DependencyInjection;
-using Microsoft.UI.Windowing;
 using System;
 using Windows.Foundation;
 
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/MappedSongSearchQuery.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/MappedSongSearchQuery.cs
index 96119e0..87c1b8f 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/MappedSongSearchQuery.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/MappedSongSearchQuery.cs
@@ -1,10 +1,5 @@
 using BetterLyrics.WinUI3.Enums;
 using CommunityToolkit.Mvvm.ComponentModel;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.Models
 {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/MediaSourceProviderInfo.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/MediaSourceProviderInfo.cs
index 11d1705..d3eb256 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/MediaSourceProviderInfo.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/MediaSourceProviderInfo.cs
@@ -4,8 +4,6 @@ using BetterLyrics.WinUI3.Enums;
 using BetterLyrics.WinUI3.Extensions;
 using CommunityToolkit.Mvvm.ComponentModel;
 using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
 using System.Linq;
 
 namespace BetterLyrics.WinUI3.Models
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/PlayQueueItem.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/PlayQueueItem.cs
index 1abf08b..56c4ce3 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/PlayQueueItem.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/PlayQueueItem.cs
@@ -1,9 +1,4 @@
 using ATL;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.Models
 {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/AdvancedSettings.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/AdvancedSettings.cs
index 098559a..d7b5592 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/AdvancedSettings.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/AdvancedSettings.cs
@@ -1,10 +1,4 @@
-using BetterLyrics.WinUI3.Enums;
-using CommunityToolkit.Mvvm.ComponentModel;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using CommunityToolkit.Mvvm.ComponentModel;
 
 namespace BetterLyrics.WinUI3.Models.Settings
 {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/AlbumArtLayoutSettings.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/AlbumArtLayoutSettings.cs
index d40a3ae..38793e2 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/AlbumArtLayoutSettings.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/AlbumArtLayoutSettings.cs
@@ -1,10 +1,6 @@
 using BetterLyrics.WinUI3.Enums;
 using CommunityToolkit.Mvvm.ComponentModel;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.Models.Settings
 {
@@ -17,6 +13,7 @@ namespace BetterLyrics.WinUI3.Models.Settings
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial int SongInfoFontSize { get; set; } = 18;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool ShowTitle { get; set; } = true;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool ShowArtists { get; set; } = true;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool ShowAlbum { get; set; } = true;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial int AlbumArtSize { get; set; } = 64;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool AutoAlbumArtSize { get; set; } = true;
 
@@ -33,6 +30,7 @@ namespace BetterLyrics.WinUI3.Models.Settings
                 SongInfoFontSize = this.SongInfoFontSize,
                 ShowTitle = this.ShowTitle,
                 ShowArtists = this.ShowArtists,
+                ShowAlbum = this.ShowAlbum,
                 AlbumArtSize = this.AlbumArtSize,
                 AutoAlbumArtSize = this.AutoAlbumArtSize,
             };
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/AppSettings.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/AppSettings.cs
index e8fd654..cae6da3 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/AppSettings.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/AppSettings.cs
@@ -1,8 +1,5 @@
-using BetterLyrics.WinUI3.Enums;
-using BetterLyrics.WinUI3.Extensions;
-using BetterLyrics.WinUI3.Services;
+using BetterLyrics.WinUI3.Extensions;
 using CommunityToolkit.Mvvm.ComponentModel;
-using System.Collections.ObjectModel;
 
 namespace BetterLyrics.WinUI3.Models.Settings
 {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/BaseModeSettings.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/BaseModeSettings.cs
index 3c0c683..9cf0c2d 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/BaseModeSettings.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/BaseModeSettings.cs
@@ -1,10 +1,4 @@
-using BetterLyrics.WinUI3.Enums;
-using CommunityToolkit.Mvvm.ComponentModel;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using CommunityToolkit.Mvvm.ComponentModel;
 
 namespace BetterLyrics.WinUI3.Models.Settings
 {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/GeneralSettings.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/GeneralSettings.cs
index c741e2a..c408ea7 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/GeneralSettings.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/GeneralSettings.cs
@@ -1,13 +1,5 @@
-using BetterLyrics.WinUI3.Enums;
-using BetterLyrics.WinUI3.Helper;
-using BetterLyrics.WinUI3.Services;
-using CommunityToolkit.Mvvm.ComponentModel;
-using System;
+using CommunityToolkit.Mvvm.ComponentModel;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Windows.Globalization;
 
 namespace BetterLyrics.WinUI3.Models.Settings
 {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/LastFMSettings.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/LastFMSettings.cs
index ad6246f..cf6ade3 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/LastFMSettings.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/LastFMSettings.cs
@@ -1,9 +1,4 @@
 using CommunityToolkit.Mvvm.ComponentModel;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.Models.Settings
 {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/LyricsBackgroundSettings.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/LyricsBackgroundSettings.cs
index 8f4e1aa..a5a2098 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/LyricsBackgroundSettings.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/LyricsBackgroundSettings.cs
@@ -1,12 +1,7 @@
 using BetterLyrics.WinUI3.Enums;
 using CommunityToolkit.Mvvm.ComponentModel;
 using Microsoft.UI.Xaml;
-using BetterLyrics.WinUI3.Helper;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.Models.Settings
 {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/LyricsEffectSettings.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/LyricsEffectSettings.cs
index a270305..ff9ac3f 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/LyricsEffectSettings.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/LyricsEffectSettings.cs
@@ -1,10 +1,6 @@
 using BetterLyrics.WinUI3.Enums;
 using CommunityToolkit.Mvvm.ComponentModel;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.Models.Settings
 {
@@ -26,7 +22,7 @@ namespace BetterLyrics.WinUI3.Models.Settings
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial int PhoneticLyricsHighlightAmount { get; set; } = 60; // 100% 是上界
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial int OriginalLyricsHighlightAmount { get; set; } = 100; // 100% 是上界
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial int TranslatedLyricsHighlightAmount { get; set; } = 60; // 100% 是上界
-        
+
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsLyricsFloatAnimationEnabled { get; set; } = true;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial int LyricsFloatAmount { get; set; } = 1;
 
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/LyricsStyleSettings.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/LyricsStyleSettings.cs
index 99e44d5..173eef9 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/LyricsStyleSettings.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/LyricsStyleSettings.cs
@@ -3,10 +3,7 @@ using BetterLyrics.WinUI3.Helper;
 using CommunityToolkit.Mvvm.ComponentModel;
 using Microsoft.UI;
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Windows.UI;
 
 namespace BetterLyrics.WinUI3.Models.Settings
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/MusicGallerySettings.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/MusicGallerySettings.cs
index 2d5cd33..81667d0 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/MusicGallerySettings.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/MusicGallerySettings.cs
@@ -1,11 +1,6 @@
 using BetterLyrics.WinUI3.Enums;
 using CommunityToolkit.Mvvm.ComponentModel;
-using System;
-using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.Models.Settings
 {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/TranslationSettings.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/TranslationSettings.cs
index f0a70ff..4afd484 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/TranslationSettings.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/TranslationSettings.cs
@@ -1,11 +1,6 @@
 using BetterLyrics.WinUI3.Enums;
 using BetterLyrics.WinUI3.Helper;
 using CommunityToolkit.Mvvm.ComponentModel;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.Models.Settings
 {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/SongInfo.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/SongInfo.cs
index 0ae7134..a80bbdf 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/SongInfo.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/SongInfo.cs
@@ -1,9 +1,6 @@
 // 2025/6/23 by Zhe Fang
 
 using CommunityToolkit.Mvvm.ComponentModel;
-using System;
-using Windows.Graphics.Imaging;
-using Windows.UI;
 
 namespace BetterLyrics.WinUI3.Models
 {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/TranslateResponse.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/TranslateResponse.cs
index 3300eeb..651f111 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/TranslateResponse.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/TranslateResponse.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Text.Json.Serialization;
-using System.Threading.Tasks;
+using System.Text.Json.Serialization;
 
 namespace BetterLyrics.WinUI3.Models
 {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/TrimmedTrack.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/TrimmedTrack.cs
index c906f6f..1121ce1 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/TrimmedTrack.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/TrimmedTrack.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Models
+namespace BetterLyrics.WinUI3.Models
 {
     public class TrimmedTrack
     {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Properties/PublishProfiles/win-arm64.pubxml b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Properties/PublishProfiles/win-arm64.pubxml
index eacbe99..a67ec27 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Properties/PublishProfiles/win-arm64.pubxml
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Properties/PublishProfiles/win-arm64.pubxml
@@ -11,6 +11,6 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <SelfContained>true</SelfContained>
     <PublishSingleFile>false</PublishSingleFile>
     <Configuration>Release</Configuration>
-    <TargetFramework>net8.0-windows10.0.26100.0</TargetFramework>
+    <TargetFramework>net10.0-windows10.0.26100.0</TargetFramework>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Properties/PublishProfiles/win-x64.pubxml b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Properties/PublishProfiles/win-x64.pubxml
index b5df898..d442d5e 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Properties/PublishProfiles/win-x64.pubxml
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Properties/PublishProfiles/win-x64.pubxml
@@ -11,6 +11,6 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <SelfContained>true</SelfContained>
     <PublishSingleFile>false</PublishSingleFile>
     <Configuration>Release</Configuration>
-    <TargetFramework>net8.0-windows10.0.26100.0</TargetFramework>
+    <TargetFramework>net10.0-windows10.0.26100.0</TargetFramework>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Properties/PublishProfiles/win-x86.pubxml b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Properties/PublishProfiles/win-x86.pubxml
index 802b669..7967d91 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Properties/PublishProfiles/win-x86.pubxml
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Properties/PublishProfiles/win-x86.pubxml
@@ -11,6 +11,6 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <SelfContained>true</SelfContained>
     <PublishSingleFile>false</PublishSingleFile>
     <Configuration>Release</Configuration>
-    <TargetFramework>net8.0-windows10.0.26100.0</TargetFramework>
+    <TargetFramework>net10.0-windows10.0.26100.0</TargetFramework>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Renderer/LyricsRenderer.xaml.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Renderer/LyricsRenderer.xaml.cs
index 56e2ffb..31d544c 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Renderer/LyricsRenderer.xaml.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Renderer/LyricsRenderer.xaml.cs
@@ -2,11 +2,7 @@
 
 using BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel;
 using CommunityToolkit.Mvvm.DependencyInjection;
-using CommunityToolkit.WinUI;
-using Microsoft.Graphics.Canvas.Effects;
 using Microsoft.UI.Xaml.Controls;
-using Windows.Storage;
-using Windows.Storage.Streams;
 
 namespace BetterLyrics.WinUI3.Renderer
 {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/AlbumArtSearchService/IAlbumArtSearchService.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/AlbumArtSearchService/IAlbumArtSearchService.cs
index a505280..34f4cb3 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/AlbumArtSearchService/IAlbumArtSearchService.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/AlbumArtSearchService/IAlbumArtSearchService.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading;
+using System.Threading;
 using System.Threading.Tasks;
 using Windows.Storage.Streams;
 
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LastFMService/ILastFMService.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LastFMService/ILastFMService.cs
index 3e29844..9948b1e 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LastFMService/ILastFMService.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LastFMService/ILastFMService.cs
@@ -2,9 +2,6 @@
 using BetterLyrics.WinUI3.Models;
 using Hqub.Lastfm.Entities;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.Services.LastFMService
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LastFMService/LastFMService.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LastFMService/LastFMService.cs
index c576616..32dd49b 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LastFMService/LastFMService.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LastFMService/LastFMService.cs
@@ -3,22 +3,10 @@ using BetterLyrics.WinUI3.Helper;
 using BetterLyrics.WinUI3.Models;
 using BetterLyrics.WinUI3.Services.ResourceService;
 using BetterLyrics.WinUI3.Services.SettingsService;
-using BetterLyrics.WinUI3.ViewModels;
 using BetterLyrics.WinUI3.Views;
-using CommunityToolkit.Mvvm.ComponentModel;
-using CommunityToolkit.Mvvm.DependencyInjection;
-using CommunityToolkit.Mvvm.Input;
-using CommunityToolkit.Mvvm.Messaging;
-using CommunityToolkit.Mvvm.Messaging.Messages;
 using Hqub.Lastfm;
-using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Diagnostics;
-using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 using Windows.System;
 
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LibWatcherService/ILibWatcherService.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LibWatcherService/ILibWatcherService.cs
index c6470a5..82652ae 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LibWatcherService/ILibWatcherService.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LibWatcherService/ILibWatcherService.cs
@@ -1,12 +1,7 @@
 // 2025/6/23 by Zhe Fang
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using BetterLyrics.WinUI3.Events;
-using BetterLyrics.WinUI3.Models;
+using System;
 
 namespace BetterLyrics.WinUI3.Services.LibWatcherService
 {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LibWatcherService/LibWatcherService.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LibWatcherService/LibWatcherService.cs
index 3a3ee75..e564293 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LibWatcherService/LibWatcherService.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LibWatcherService/LibWatcherService.cs
@@ -1,14 +1,13 @@
 // 2025/6/23 by Zhe Fang
 
+using BetterLyrics.WinUI3.Events;
+using BetterLyrics.WinUI3.Services.SettingsService;
+using BetterLyrics.WinUI3.ViewModels;
+using Microsoft.UI.Dispatching;
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using BetterLyrics.WinUI3.Events;
-using BetterLyrics.WinUI3.Models;
-using BetterLyrics.WinUI3.Services.SettingsService;
-using BetterLyrics.WinUI3.ViewModels;
-using Microsoft.UI.Dispatching;
 
 namespace BetterLyrics.WinUI3.Services.LibWatcherService
 {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LiveStatesService/ILiveStatesService.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LiveStatesService/ILiveStatesService.cs
index 9ecd732..fcf5190 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LiveStatesService/ILiveStatesService.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LiveStatesService/ILiveStatesService.cs
@@ -1,9 +1,4 @@
 using BetterLyrics.WinUI3.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.Services.LiveStatesService
 {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LiveStatesService/LiveStatesService.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LiveStatesService/LiveStatesService.cs
index 8f34be5..53aae60 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LiveStatesService/LiveStatesService.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LiveStatesService/LiveStatesService.cs
@@ -5,11 +5,8 @@ using BetterLyrics.WinUI3.ViewModels;
 using BetterLyrics.WinUI3.Views;
 using CommunityToolkit.Mvvm.Messaging;
 using CommunityToolkit.Mvvm.Messaging.Messages;
-using CommunityToolkit.WinUI.Controls;
-using System;
 using System.Linq;
 using System.Threading.Tasks;
-using Windows.Foundation;
 
 namespace BetterLyrics.WinUI3.Services.LiveStatesService
 {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LyricsSearchService/ILyricsSearchService.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LyricsSearchService/ILyricsSearchService.cs
index 5afd8df..bab4ad2 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LyricsSearchService/ILyricsSearchService.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LyricsSearchService/ILyricsSearchService.cs
@@ -1,8 +1,6 @@
 // 2025/6/23 by Zhe Fang
 
-using BetterLyrics.WinUI3.Enums;
 using BetterLyrics.WinUI3.Models;
-using System;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LyricsSearchService/LyricsSearchService.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LyricsSearchService/LyricsSearchService.cs
index 32f5093..1ff53b2 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LyricsSearchService/LyricsSearchService.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LyricsSearchService/LyricsSearchService.cs
@@ -8,7 +8,6 @@ using BetterLyrics.WinUI3.Models;
 using BetterLyrics.WinUI3.Services.SettingsService;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Lyricify.Lyrics.Helpers;
-using Lyricify.Lyrics.Providers.Web.Kugou;
 using Lyricify.Lyrics.Searchers;
 using Microsoft.Extensions.Logging;
 using NTextCat.Commons;
@@ -17,11 +16,9 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Net.Http;
-using System.Text;
 using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
-using Windows.Storage;
 
 namespace BetterLyrics.WinUI3.Services.LyricsSearchService
 {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/MediaSessionsService/IMediaSessionsService.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/MediaSessionsService/IMediaSessionsService.cs
index e1a19be..042c9e9 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/MediaSessionsService/IMediaSessionsService.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/MediaSessionsService/IMediaSessionsService.cs
@@ -4,9 +4,7 @@ using BetterLyrics.WinUI3.Enums;
 using BetterLyrics.WinUI3.Events;
 using BetterLyrics.WinUI3.Models;
 using System;
-using System.Collections.Generic;
 using System.Threading.Tasks;
-using TagLib.Riff;
 
 namespace BetterLyrics.WinUI3.Services.MediaSessionsService
 {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/MediaSessionsService/MediaSessionsService.AlbumArtUpdater.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/MediaSessionsService/MediaSessionsService.AlbumArtUpdater.cs
index be871c4..3f0ee4f 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/MediaSessionsService/MediaSessionsService.AlbumArtUpdater.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/MediaSessionsService/MediaSessionsService.AlbumArtUpdater.cs
@@ -1,12 +1,8 @@
 using BetterLyrics.WinUI3.Events;
 using BetterLyrics.WinUI3.Helper;
 using Microsoft.Extensions.Logging;
-using Microsoft.UI.Dispatching;
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using Windows.Graphics.Imaging;
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/MediaSessionsService/MediaSessionsService.LyricsUpdater.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/MediaSessionsService/MediaSessionsService.LyricsUpdater.cs
index 03a00ca..639ae26 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/MediaSessionsService/MediaSessionsService.LyricsUpdater.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/MediaSessionsService/MediaSessionsService.LyricsUpdater.cs
@@ -9,10 +9,8 @@ using Microsoft.UI.Dispatching;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using Vanara.PInvoke;
 
 namespace BetterLyrics.WinUI3.Services.MediaSessionsService
 {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/ResourceService/IResourceService.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/ResourceService/IResourceService.cs
index 776501d..f2b5b46 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/ResourceService/IResourceService.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/ResourceService/IResourceService.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Services.ResourceService
+namespace BetterLyrics.WinUI3.Services.ResourceService
 {
     public interface IResourceService
     {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/ResourceService/ResourceService.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/ResourceService/ResourceService.cs
index 8ba56c3..73be9ae 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/ResourceService/ResourceService.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/ResourceService/ResourceService.cs
@@ -1,9 +1,4 @@
 using Microsoft.Windows.ApplicationModel.Resources;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.Services.ResourceService
 {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/SettingsService/ISettingsService.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/SettingsService/ISettingsService.cs
index a97680e..0b88465 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/SettingsService/ISettingsService.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/SettingsService/ISettingsService.cs
@@ -1,11 +1,6 @@
 // 2025/6/23 by Zhe Fang
 
-using System.Collections.Generic;
-using BetterLyrics.WinUI3.Enums;
-using BetterLyrics.WinUI3.Models;
 using BetterLyrics.WinUI3.Models.Settings;
-using Microsoft.UI.Xaml;
-using Windows.UI;
 
 namespace BetterLyrics.WinUI3.Services.SettingsService
 {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/TranslateService/ITranslateService.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/TranslateService/ITranslateService.cs
index d48bfdc..5316a25 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/TranslateService/ITranslateService.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/TranslateService/ITranslateService.cs
@@ -1,8 +1,5 @@
 using BetterLyrics.WinUI3.Models;
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/TranslateService/TranslateService.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/TranslateService/TranslateService.cs
index 7d0bf2e..b1367a8 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/TranslateService/TranslateService.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/TranslateService/TranslateService.cs
@@ -5,10 +5,7 @@ using BetterLyrics.WinUI3.Services.SettingsService;
 using BetterLyrics.WinUI3.ViewModels;
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Net.Http;
-using System.Net.Http.Json;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/en-US/Resources.resw b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/en-US/Resources.resw
index a312184..9338441 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/en-US/Resources.resw
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/en-US/Resources.resw
@@ -1231,6 +1231,9 @@ If you encounter any problems, please go to the Settings page, About tab, and vi
   <data name="SettingsPageShortcutRegSuccessInfo" xml:space="preserve">
     <value>This hotkey has been successfully registered</value>
   </data>
+  <data name="SettingsPageShowAlbum.Header" xml:space="preserve">
+    <value>Show album</value>
+  </data>
   <data name="SettingsPageShowArtists.Header" xml:space="preserve">
     <value>Show artists</value>
   </data>
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ja-JP/Resources.resw b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ja-JP/Resources.resw
index 7191b87..43258b9 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ja-JP/Resources.resw
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ja-JP/Resources.resw
@@ -1231,6 +1231,9 @@
   <data name="SettingsPageShortcutRegSuccessInfo" xml:space="preserve">
     <value>このホットキーは正常に登録されています</value>
   </data>
+  <data name="SettingsPageShowAlbum.Header" xml:space="preserve">
+    <value>アルバムを表示</value>
+  </data>
   <data name="SettingsPageShowArtists.Header" xml:space="preserve">
     <value>アーティスト</value>
   </data>
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ko-KR/Resources.resw b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ko-KR/Resources.resw
index 6d8bef7..fd3a865 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ko-KR/Resources.resw
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ko-KR/Resources.resw
@@ -1231,6 +1231,9 @@
   <data name="SettingsPageShortcutRegSuccessInfo" xml:space="preserve">
     <value>이 핫키는 성공적으로 등록되었습니다</value>
   </data>
+  <data name="SettingsPageShowAlbum.Header" xml:space="preserve">
+    <value>앨범을 보여주세요</value>
+  </data>
   <data name="SettingsPageShowArtists.Header" xml:space="preserve">
     <value>예술가</value>
   </data>
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-CN/Resources.resw b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-CN/Resources.resw
index aacc2cf..09d945d 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-CN/Resources.resw
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-CN/Resources.resw
@@ -1231,6 +1231,9 @@
   <data name="SettingsPageShortcutRegSuccessInfo" xml:space="preserve">
     <value>该热键已成功注册</value>
   </data>
+  <data name="SettingsPageShowAlbum.Header" xml:space="preserve">
+    <value>显示专辑</value>
+  </data>
   <data name="SettingsPageShowArtists.Header" xml:space="preserve">
     <value>显示艺术家</value>
   </data>
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-TW/Resources.resw b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-TW/Resources.resw
index 89a5a33..fafaae8 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-TW/Resources.resw
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-TW/Resources.resw
@@ -1231,6 +1231,9 @@
   <data name="SettingsPageShortcutRegSuccessInfo" xml:space="preserve">
     <value>該熱鍵已成功註冊</value>
   </data>
+  <data name="SettingsPageShowAlbum.Header" xml:space="preserve">
+    <value>顯示專輯</value>
+  </data>
   <data name="SettingsPageShowArtists.Header" xml:space="preserve">
     <value>界面設計</value>
   </data>
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/AboutControlViewModel.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/AboutControlViewModel.cs
index 5859723..90e716f 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/AboutControlViewModel.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/AboutControlViewModel.cs
@@ -1,16 +1,12 @@
 using BetterLyrics.WinUI3.Helper;
 using BetterLyrics.WinUI3.Helper.BetterLyrics.WinUI3.Helper;
 using BetterLyrics.WinUI3.Models.Settings;
-using BetterLyrics.WinUI3.Services.MediaSessionsService;
 using BetterLyrics.WinUI3.Services.ResourceService;
 using BetterLyrics.WinUI3.Services.SettingsService;
 using BetterLyrics.WinUI3.Views;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.ViewModels
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/AppSettingsControlViewModel.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/AppSettingsControlViewModel.cs
index 3739d5f..21fc9f4 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/AppSettingsControlViewModel.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/AppSettingsControlViewModel.cs
@@ -1,14 +1,9 @@
 using BetterLyrics.WinUI3.Helper;
-using BetterLyrics.WinUI3.Models;
 using BetterLyrics.WinUI3.Models.Settings;
-using BetterLyrics.WinUI3.Services;
-using BetterLyrics.WinUI3.Services.LiveStatesService;
 using BetterLyrics.WinUI3.Services.SettingsService;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
 using System.Threading.Tasks;
 using Windows.ApplicationModel;
 
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/BaseViewModel.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/BaseViewModel.cs
index d88c83a..c36b45d 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/BaseViewModel.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/BaseViewModel.cs
@@ -1,10 +1,7 @@
 // 2025/6/23 by Zhe Fang
 
-using BetterLyrics.WinUI3.Services.SettingsService;
 using CommunityToolkit.Mvvm.ComponentModel;
 using Microsoft.UI.Dispatching;
-using System;
-using System.Runtime.InteropServices;
 
 namespace BetterLyrics.WinUI3.ViewModels
 {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/BaseWindowViewModel.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/BaseWindowViewModel.cs
index 2007d91..bf2ac6b 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/BaseWindowViewModel.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/BaseWindowViewModel.cs
@@ -1,15 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using BetterLyrics.WinUI3.Services.SettingsService;
-using CommunityToolkit.Mvvm.ComponentModel;
-using CommunityToolkit.Mvvm.Messaging;
-using CommunityToolkit.Mvvm.Messaging.Messages;
-using Microsoft.UI.Xaml;
-
-namespace BetterLyrics.WinUI3.ViewModels
+namespace BetterLyrics.WinUI3.ViewModels
 {
     public partial class BaseWindowViewModel : BaseViewModel
     {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsPageViewModel.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsPageViewModel.cs
index bcb23aa..15b1f2c 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsPageViewModel.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsPageViewModel.cs
@@ -1,9 +1,7 @@
 // 2025/6/23 by Zhe Fang
 
-using BetterLyrics.WinUI3.Enums;
 using BetterLyrics.WinUI3.Helper;
 using BetterLyrics.WinUI3.Models;
-using BetterLyrics.WinUI3.Models.Settings;
 using BetterLyrics.WinUI3.Services.LiveStatesService;
 using BetterLyrics.WinUI3.Services.MediaSessionsService;
 using BetterLyrics.WinUI3.Services.SettingsService;
@@ -12,12 +10,8 @@ using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using CommunityToolkit.Mvvm.Messaging;
 using CommunityToolkit.Mvvm.Messaging.Messages;
-using CommunityToolkit.WinUI;
 using Microsoft.UI.Dispatching;
-using Microsoft.UI.Xaml;
 using System;
-using System.Diagnostics;
-using System.Numerics;
 using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.ViewModels
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsRendererViewModel/LyricsRendererViewModel.CreateResources.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsRendererViewModel/LyricsRendererViewModel.CreateResources.cs
index a888bc8..fbab275 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsRendererViewModel/LyricsRendererViewModel.CreateResources.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsRendererViewModel/LyricsRendererViewModel.CreateResources.cs
@@ -1,9 +1,4 @@
 using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
 {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsRendererViewModel/LyricsRendererViewModel.Draw.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsRendererViewModel/LyricsRendererViewModel.Draw.cs
index 9e4ebb1..ca823ff 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsRendererViewModel/LyricsRendererViewModel.Draw.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsRendererViewModel/LyricsRendererViewModel.Draw.cs
@@ -1,7 +1,5 @@
-using BetterLyrics.WinUI3.Enums;
-using BetterLyrics.WinUI3.Helper;
+using BetterLyrics.WinUI3.Helper;
 using CommunityToolkit.WinUI;
-using Hqub.Lastfm;
 using Microsoft.Graphics.Canvas;
 using Microsoft.Graphics.Canvas.Brushes;
 using Microsoft.Graphics.Canvas.Effects;
@@ -9,14 +7,11 @@ using Microsoft.Graphics.Canvas.Geometry;
 using Microsoft.Graphics.Canvas.Text;
 using Microsoft.Graphics.Canvas.UI.Xaml;
 using Microsoft.UI;
-using Microsoft.UI.Xaml.Media;
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
 using System.Numerics;
 using Windows.Foundation;
-using Windows.Graphics.Effects;
 using Windows.UI;
 using static Vanara.PInvoke.Shell32;
 
@@ -69,7 +64,7 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
             ds.DrawImage(combined);
 
             DrawAlbumArt(control, ds);
-            DrawTitleAndArtist(control, ds);
+            DrawSongInfo(control, ds);
 
             if (_isDebugOverlayEnabled)
             {
@@ -269,52 +264,45 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
             }
         }
 
-        private void DrawTitleAndArtist(ICanvasAnimatedControl control, CanvasDrawingSession ds)
+        private void DrawSongInfo(ICanvasAnimatedControl control, CanvasDrawingSession ds)
         {
-            if (_lastSongTitle != null || _lastSongArtist != null)
-            {
-                DrawSingleTitleAndArtist(control, ds, _lastSongTitle, _lastSongArtist, 1 - _songInfoOpacityTransition.Value);
-            }
-            if (_songTitle != null || _songArtist != null)
-            {
-                DrawSingleTitleAndArtist(control, ds, _songTitle, _songArtist, _songInfoOpacityTransition.Value);
-            }
-        }
-
-        private void DrawSingleTitleAndArtist(ICanvasAnimatedControl control, CanvasDrawingSession ds, string? title, string? artist, double opacity)
-        {
-            var maxWidth = _liveStatesService.LiveStates.LyricsWindowStatus.LyricsLayoutOrientation switch
-            {
-                LyricsLayoutOrientation.Horizontal => _albumArtSize,
-                LyricsLayoutOrientation.Vertical => _canvasWidth - _leftMargin - _albumArtSize - _rightMargin,
-                _ => 0f
-            };
-            if (maxWidth <= 0)
+            if (_maxSongInfoWidth <= 0)
             {
                 return;
             }
 
-            using CanvasTextLayout titleLayout = new(
-                control, title ?? string.Empty,
-                _titleTextFormat, (float)maxWidth, (float)_canvasHeight
-            );
-            using CanvasTextLayout artistLayout = new(
-                control, artist ?? string.Empty,
-                _artistTextFormat, (float)maxWidth, (float)_canvasHeight
-            );
+            DrawSingleSongInfo(control, ds, _lastTitleTextLayout, _lastArtistTextLayout, _lastAlbumTextLayout, 1 - _songInfoOpacityTransition.Value);
+            DrawSingleSongInfo(control, ds, _titleTextLayout, _artistTextLayout, _albumTextLayout, _songInfoOpacityTransition.Value);
+        }
 
-            if (_liveStatesService.LiveStates.LyricsWindowStatus.AlbumArtLayoutSettings.ShowTitle)
+        private void DrawSingleSongInfo(ICanvasAnimatedControl control, CanvasDrawingSession ds, CanvasTextLayout? titleLayout, CanvasTextLayout? artistLayout, CanvasTextLayout? albumLayout, double opacity)
+        {
+            if (_liveStatesService.LiveStates.LyricsWindowStatus.AlbumArtLayoutSettings.ShowTitle && titleLayout != null)
             {
+                double y = 0;
+
                 ds.DrawTextLayout(
                     titleLayout,
-                    new Vector2((float)_titleXTransition.Value, (float)_titleYTransition.Value),
+                    new Vector2((float)_titleXTransition.Value, (float)y),
                     _bgFontColor.WithAlpha((byte)(_albumArtOpacityTransition.Value * 255 * opacity)));
 
-                if (_liveStatesService.LiveStates.LyricsWindowStatus.AlbumArtLayoutSettings.ShowArtists)
+                y += _titleYTransition.Value;
+
+                if (_liveStatesService.LiveStates.LyricsWindowStatus.AlbumArtLayoutSettings.ShowArtists && artistLayout != null)
                 {
                     ds.DrawTextLayout(
                         artistLayout,
-                        new Vector2((float)_titleXTransition.Value, (float)(_titleYTransition.Value + titleLayout.LayoutBounds.Height)),
+                        new Vector2((float)_titleXTransition.Value, (float)y),
+                        _bgFontColor.WithAlpha((byte)(_albumArtOpacityTransition.Value * 128 * opacity)));
+
+                    y += titleLayout.LayoutBounds.Height;
+                }
+
+                if (_liveStatesService.LiveStates.LyricsWindowStatus.AlbumArtLayoutSettings.ShowAlbum && albumLayout != null)
+                {
+                    ds.DrawTextLayout(
+                        albumLayout,
+                        new Vector2((float)_titleXTransition.Value, (float)y),
                         _bgFontColor.WithAlpha((byte)(_albumArtOpacityTransition.Value * 128 * opacity)));
                 }
             }
@@ -361,7 +349,6 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
                 using var backgroundEffect = CanvasHelper.CreateBackgroundEffect(line, backgroundFontEffect, _lyricsOpacityTransition.Value);
                 combinedDs.DrawImage(backgroundEffect);
 
-                //if (i == _playingLineIndex)
                 if (line.HighlightOpacityTransition.Value != 0)
                 {
                     GetLinePlayingProgress(i, out int charStartIndex, out int charLength, out double charProgress);
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsRendererViewModel/LyricsRendererViewModel.Messages.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsRendererViewModel/LyricsRendererViewModel.Messages.cs
index 6b5f99f..ea5cadb 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsRendererViewModel/LyricsRendererViewModel.Messages.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsRendererViewModel/LyricsRendererViewModel.Messages.cs
@@ -1,16 +1,9 @@
 using BetterLyrics.WinUI3.Enums;
-using BetterLyrics.WinUI3.Extensions;
 using BetterLyrics.WinUI3.Models;
 using BetterLyrics.WinUI3.Models.Settings;
 using CommunityToolkit.Mvvm.Messaging;
 using CommunityToolkit.Mvvm.Messaging.Messages;
-using Microsoft.Extensions.Logging;
 using Microsoft.UI.Xaml;
-using System;
-using System.Collections.ObjectModel;
-using System.Diagnostics;
-using System.Linq;
-using System.Threading.Tasks;
 using Windows.UI;
 
 namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
@@ -83,7 +76,7 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
                 }
                 else if (message.PropertyName == nameof(AlbumArtLayoutSettings.ShowArtists))
                 {
-                    _isSongArtistsVisibilityChanged = true;
+                    _isSongArtistVisibilityChanged = true;
                 }
                 else if (message.PropertyName == nameof(AlbumArtLayoutSettings.AutoAlbumArtSize))
                 {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsRendererViewModel/LyricsRendererViewModel.Transition.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsRendererViewModel/LyricsRendererViewModel.Transition.cs
index 8dbe8c4..4c3b9da 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsRendererViewModel/LyricsRendererViewModel.Transition.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsRendererViewModel/LyricsRendererViewModel.Transition.cs
@@ -1,11 +1,6 @@
 using BetterLyrics.WinUI3.Enums;
 using BetterLyrics.WinUI3.Helper;
 using Microsoft.UI;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Windows.UI;
 
 namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsRendererViewModel/LyricsRendererViewModel.Update.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsRendererViewModel/LyricsRendererViewModel.Update.cs
index 934f495..b40922a 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsRendererViewModel/LyricsRendererViewModel.Update.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsRendererViewModel/LyricsRendererViewModel.Update.cs
@@ -1,26 +1,14 @@
-using BetterLyrics.WinUI3.Constants;
-using BetterLyrics.WinUI3.Enums;
+using BetterLyrics.WinUI3.Enums;
 using BetterLyrics.WinUI3.Helper;
 using BetterLyrics.WinUI3.Models;
-using BetterLyrics.WinUI3.Services;
-using CommunityToolkit.WinUI;
 using Microsoft.Graphics.Canvas;
-using Microsoft.Graphics.Canvas.Effects;
-using Microsoft.Graphics.Canvas.Text;
 using Microsoft.Graphics.Canvas.UI.Xaml;
-using Microsoft.UI;
 using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Media.Imaging;
-using Microsoft.UI.Xaml.Shapes;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using System.Numerics;
-using System.Threading.Tasks;
-using Windows.Graphics.Imaging;
-using Windows.UI;
 
 namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
 {
@@ -52,7 +40,11 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
         private bool _isAlbumArtEffectChanged = false;
 
         private bool _isSongTitleVisibilityChanged = false;
-        private bool _isSongArtistsVisibilityChanged = false;
+        private bool _isSongArtistVisibilityChanged = false;
+
+        private bool _isSongTitleChanged = false;
+        private bool _isSongArtistChanged = false;
+        private bool _isSongAlbumChanged = false;
 
         private bool _isSongInfoFontSizeChanged = false;
         private bool _isAlbumArtSizeChanged = false;
@@ -206,39 +198,27 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
                 _topMargin = _bottomMargin = _leftMargin = _middleMargin = _rightMargin = Math.Max(_canvasWidth, _canvasHeight) / 30.0;
             }
 
-            if (_isSongInfoFontSizeChanged || _isSongTitleVisibilityChanged || _isSongArtistsVisibilityChanged)
-            {
-                _songInfoHeight = 0;
-                if (_liveStatesService.LiveStates.LyricsWindowStatus.AlbumArtLayoutSettings.ShowTitle)
-                {
-                    _songInfoHeight += (int)(_titleTextFormat.FontSize * (1.0 + 0.5));
-                    if (_liveStatesService.LiveStates.LyricsWindowStatus.AlbumArtLayoutSettings.ShowArtists)
-                    {
-                        _songInfoHeight += (int)_artistTextFormat.FontSize;
-                    }
-                }
-            }
-
             if (_isDeviceChanged || _isDisplayTypeChanged || _isLyricsLayoutOrientationChanged || _isAlbumArtSizeChanged ||
-                _isSongInfoFontSizeChanged || _isSongTitleVisibilityChanged || _isSongArtistsVisibilityChanged ||
+                _isSongInfoFontSizeChanged || _isSongTitleVisibilityChanged || _isSongArtistVisibilityChanged ||
+                _isSongTitleChanged || _isSongArtistChanged ||
                 _isCanvasWidthChanged || _isCanvasHeightChanged ||
                 _isAlbumArtSizeChanged)
             {
+                UpdateAlbumArtSize();
+                UpdateMaxSongInfoWidth();
+
+                UpdateSongTitle(control);
+                UpdateSongArtist(control);
+                UpdateSongAlbum(control);
+
+                UpdateSongInfoHeight();
+
                 bool jumpTo = !_isDisplayTypeChanged && !_isLyricsLayoutOrientationChanged &&
                     (_isCanvasWidthChanged || _isCanvasHeightChanged);
+
                 switch (_liveStatesService.LiveStates.LyricsWindowStatus.LyricsLayoutOrientation)
                 {
                     case LyricsLayoutOrientation.Horizontal:
-                        if (_liveStatesService.LiveStates.LyricsWindowStatus.AlbumArtLayoutSettings.AutoAlbumArtSize)
-                        {
-                            _albumArtSize = Math.Min((_canvasHeight - _topMargin - _bottomMargin) * 8.5 / 16.0,
-                                (_canvasWidth - _leftMargin - _middleMargin - _rightMargin) / 2.0);
-                            _albumArtSize = Math.Max(0, _albumArtSize);
-                        }
-                        else
-                        {
-                            _albumArtSize = _liveStatesService.LiveStates.LyricsWindowStatus.AlbumArtLayoutSettings.AlbumArtSize;
-                        }
                         _albumArtYTransition.StartTransition((_canvasHeight - _albumArtSize - _songInfoHeight) / 2.0, jumpTo);
                         _titleYTransition.StartTransition(_albumArtYTransition.TargetValue + _albumArtSize * 1.05, jumpTo);
                         _lyricsYTransition.StartTransition(0, jumpTo);
@@ -267,16 +247,6 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
                         }
                         break;
                     case LyricsLayoutOrientation.Vertical:
-                        if (_liveStatesService.LiveStates.LyricsWindowStatus.AlbumArtLayoutSettings.AutoAlbumArtSize)
-                        {
-                            _albumArtSize = Math.Min((_canvasHeight - _topMargin - _bottomMargin) * 3.0 / 16.0,
-                                (_canvasWidth - _leftMargin - _middleMargin - _rightMargin) * 4.0 / 16.0);
-                            _albumArtSize = Math.Max(0, _albumArtSize);
-                        }
-                        else
-                        {
-                            _albumArtSize = _liveStatesService.LiveStates.LyricsWindowStatus.AlbumArtLayoutSettings.AlbumArtSize;
-                        }
                         _lyricsX = _leftMargin;
                         _albumArtXTransition.StartTransition(_leftMargin, jumpTo);
                         _titleXTransition.StartTransition(_leftMargin + _albumArtSize * 1.2, jumpTo);
@@ -311,7 +281,7 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
 
                 _isSongInfoFontSizeChanged = false;
                 _isSongTitleVisibilityChanged = false;
-                _isSongArtistsVisibilityChanged = false;
+                _isSongArtistVisibilityChanged = false;
 
                 _isLyrics3DMatrixChanged = true;
                 _isLyricsXChanged = true;
@@ -940,5 +910,123 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
                 perspective *
                 Matrix4x4.CreateTranslation(center);
         }
+
+        private void UpdateMaxSongInfoWidth()
+        {
+            switch (_liveStatesService.LiveStates.LyricsWindowStatus.LyricsLayoutOrientation)
+            {
+                case LyricsLayoutOrientation.Horizontal:
+                    _maxSongInfoWidth = _albumArtSize;
+                    break;
+                case LyricsLayoutOrientation.Vertical:
+                    _maxSongInfoWidth = _canvasWidth - _leftMargin - _albumArtSize - _rightMargin;
+                    break;
+            }
+        }
+
+        private void UpdateSongTitle(ICanvasAnimatedControl control)
+        {
+            _lastTitleTextLayout?.Dispose();
+            _lastTitleTextLayout = null;
+            _lastTitleTextLayout = new(
+                control, _lastSongTitle ?? string.Empty,
+                _titleTextFormat, (float)_maxSongInfoWidth, (float)_canvasHeight
+            );
+
+            _titleTextLayout?.Dispose();
+            _titleTextLayout = null;
+            _titleTextLayout = new(
+                control, _songTitle ?? string.Empty,
+                _titleTextFormat, (float)_maxSongInfoWidth, (float)_canvasHeight
+            );
+
+            _isSongTitleChanged = false;
+        }
+
+        private void UpdateSongArtist(ICanvasAnimatedControl control)
+        {
+            _lastArtistTextLayout?.Dispose();
+            _lastArtistTextLayout = null;
+            _lastArtistTextLayout = new(
+                control, _lastSongArtist ?? string.Empty,
+                _artistTextFormat, (float)_maxSongInfoWidth, (float)_canvasHeight
+            );
+
+            _artistTextLayout?.Dispose();
+            _artistTextLayout = null;
+            _artistTextLayout = new(
+                control, _songArtist ?? string.Empty,
+                _artistTextFormat, (float)_maxSongInfoWidth, (float)_canvasHeight
+            );
+
+            _isSongArtistChanged = false;
+        }
+
+        private void UpdateSongAlbum(ICanvasAnimatedControl control)
+        {
+            _lastAlbumTextLayout?.Dispose();
+            _lastAlbumTextLayout = null;
+            _lastAlbumTextLayout = new(
+                control, _lastSongAlbum ?? string.Empty,
+                _albumTextFormat, (float)_maxSongInfoWidth, (float)_canvasHeight
+            );
+
+            _albumTextLayout?.Dispose();
+            _albumTextLayout = null;
+            _albumTextLayout = new(
+                control, _songAlbum ?? string.Empty,
+                _albumTextFormat, (float)_maxSongInfoWidth, (float)_canvasHeight
+            );
+
+            _isSongAlbumChanged = false;
+        }
+
+        private void UpdateSongInfoHeight()
+        {
+            _songInfoHeight = 0;
+            if (_liveStatesService.LiveStates.LyricsWindowStatus.AlbumArtLayoutSettings.ShowTitle)
+            {
+                _songInfoHeight += (int)(_titleTextLayout?.LayoutBounds.Height ?? 0);
+                if (_liveStatesService.LiveStates.LyricsWindowStatus.AlbumArtLayoutSettings.ShowArtists)
+                {
+                    _songInfoHeight += (int)(_artistTextLayout?.LayoutBounds.Height ?? 0);
+                }
+                if (_liveStatesService.LiveStates.LyricsWindowStatus.AlbumArtLayoutSettings.ShowAlbum)
+                {
+                    _songInfoHeight += (int)(_albumTextLayout?.LayoutBounds.Height ?? 0);
+                }
+            }
+        }
+
+        private void UpdateAlbumArtSize()
+        {
+            switch (_liveStatesService.LiveStates.LyricsWindowStatus.LyricsLayoutOrientation)
+            {
+                case LyricsLayoutOrientation.Horizontal:
+                    if (_liveStatesService.LiveStates.LyricsWindowStatus.AlbumArtLayoutSettings.AutoAlbumArtSize)
+                    {
+                        _albumArtSize = Math.Min((_canvasHeight - _topMargin - _bottomMargin) * 8.5 / 16.0,
+                            (_canvasWidth - _leftMargin - _middleMargin - _rightMargin) / 2.0);
+                        _albumArtSize = Math.Max(0, _albumArtSize);
+                    }
+                    else
+                    {
+                        _albumArtSize = _liveStatesService.LiveStates.LyricsWindowStatus.AlbumArtLayoutSettings.AlbumArtSize;
+                    }
+                    break;
+                case LyricsLayoutOrientation.Vertical:
+                    if (_liveStatesService.LiveStates.LyricsWindowStatus.AlbumArtLayoutSettings.AutoAlbumArtSize)
+                    {
+                        _albumArtSize = Math.Min((_canvasHeight - _topMargin - _bottomMargin) * 3.0 / 16.0,
+                            (_canvasWidth - _leftMargin - _middleMargin - _rightMargin) * 4.0 / 16.0);
+                        _albumArtSize = Math.Max(0, _albumArtSize);
+                    }
+                    else
+                    {
+                        _albumArtSize = _liveStatesService.LiveStates.LyricsWindowStatus.AlbumArtLayoutSettings.AlbumArtSize;
+                    }
+                    break;
+            }
+        }
     }
 }
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsRendererViewModel/LyricsRendererViewModel.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsRendererViewModel/LyricsRendererViewModel.cs
index 2a449ad..98724d6 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsRendererViewModel/LyricsRendererViewModel.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsRendererViewModel/LyricsRendererViewModel.cs
@@ -5,20 +5,14 @@ using BetterLyrics.WinUI3.Events;
 using BetterLyrics.WinUI3.Helper;
 using BetterLyrics.WinUI3.Models;
 using BetterLyrics.WinUI3.Models.Settings;
-using BetterLyrics.WinUI3.Services;
 using BetterLyrics.WinUI3.Services.LastFMService;
-using BetterLyrics.WinUI3.Services.LibWatcherService;
 using BetterLyrics.WinUI3.Services.LiveStatesService;
-using BetterLyrics.WinUI3.Services.LyricsSearchService;
 using BetterLyrics.WinUI3.Services.MediaSessionsService;
 using BetterLyrics.WinUI3.Services.SettingsService;
-using BetterLyrics.WinUI3.Services.TranslateService;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.DependencyInjection;
-using CommunityToolkit.WinUI;
 using Microsoft.Extensions.Logging;
 using Microsoft.Graphics.Canvas;
-using Microsoft.Graphics.Canvas.Effects;
 using Microsoft.Graphics.Canvas.Text;
 using Microsoft.UI;
 using Microsoft.UI.Text;
@@ -28,8 +22,6 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using System.Numerics;
-using System.Threading;
-using System.Threading.Tasks;
 using Windows.Graphics.Imaging;
 using Windows.UI;
 
@@ -92,6 +84,9 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
         private string? _lastSongArtist;
         private string? _songArtist;
 
+        private string? _lastSongAlbum;
+        private string? _songAlbum;
+
         private double _canvasWidth = 0f;
         private double _canvasHeight = 0f;
 
@@ -105,6 +100,7 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
 
         private double _lyricsX = 0f;
         private double _maxLyricsWidth = 0f;
+        private double _maxSongInfoWidth = 0f;
 
         private readonly ISettingsService _settingsService;
         private readonly IMediaSessionsService _mediaSessionsService;
@@ -158,18 +154,18 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
             FontSize = 18,
             FontWeight = FontWeights.Bold,
             HorizontalAlignment = CanvasHorizontalAlignment.Left,
-            WordWrapping = CanvasWordWrapping.NoWrap,
-            TrimmingSign = CanvasTrimmingSign.Ellipsis,
-            TrimmingGranularity = CanvasTextTrimmingGranularity.Character,
         };
         private CanvasTextFormat _artistTextFormat = new()
         {
             FontSize = 16,
             FontWeight = FontWeights.Bold,
             HorizontalAlignment = CanvasHorizontalAlignment.Left,
-            WordWrapping = CanvasWordWrapping.NoWrap,
-            TrimmingSign = CanvasTrimmingSign.Ellipsis,
-            TrimmingGranularity = CanvasTextTrimmingGranularity.Character,
+        };
+        private CanvasTextFormat _albumTextFormat = new()
+        {
+            FontSize = 16,
+            FontWeight = FontWeights.Bold,
+            HorizontalAlignment = CanvasHorizontalAlignment.Left,
         };
         private CanvasTextFormat _debugTextFormat = new()
         {
@@ -177,6 +173,15 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
             FontWeight = FontWeights.ExtraBlack,
         };
 
+        private CanvasTextLayout? _lastTitleTextLayout = null;
+        private CanvasTextLayout? _titleTextLayout = null;
+
+        private CanvasTextLayout? _lastArtistTextLayout = null;
+        private CanvasTextLayout? _artistTextLayout = null;
+
+        private CanvasTextLayout? _lastAlbumTextLayout = null;
+        private CanvasTextLayout? _albumTextLayout = null;
+
         //private LyricsLayoutOrientation _lyricsLayoutOrientation;
 
         [ObservableProperty]
@@ -391,9 +396,15 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
             {
                 _lastSongTitle = _songTitle;
                 _songTitle = SongInfo?.Title;
+                _isSongTitleChanged = true;
 
                 _lastSongArtist = _songArtist;
                 _songArtist = SongInfo?.Artist;
+                _isSongArtistChanged = true;
+
+                _lastSongAlbum = _songAlbum;
+                _songAlbum = SongInfo?.Album;
+                _isSongAlbumChanged = true;
 
                 _songDurationMs = (int)(SongInfo?.DurationMs ?? TimeSpan.FromMinutes(99).TotalMilliseconds);
 
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsSearchControlViewModel.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsSearchControlViewModel.cs
index e5a0214..3607d4a 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsSearchControlViewModel.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsSearchControlViewModel.cs
@@ -5,15 +5,9 @@ using BetterLyrics.WinUI3.Services.LyricsSearchService;
 using BetterLyrics.WinUI3.Services.MediaSessionsService;
 using BetterLyrics.WinUI3.Services.SettingsService;
 using CommunityToolkit.Mvvm.ComponentModel;
-using CommunityToolkit.Mvvm.DependencyInjection;
 using CommunityToolkit.Mvvm.Input;
-using CommunityToolkit.Mvvm.Messaging;
-using CommunityToolkit.Mvvm.Messaging.Messages;
-using System;
-using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.ViewModels
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsWindowSettingsControlViewModel.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsWindowSettingsControlViewModel.cs
index 4bf1267..f66eaa5 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsWindowSettingsControlViewModel.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsWindowSettingsControlViewModel.cs
@@ -1,22 +1,13 @@
 using BetterLyrics.WinUI3.Helper;
 using BetterLyrics.WinUI3.Models;
 using BetterLyrics.WinUI3.Models.Settings;
-using BetterLyrics.WinUI3.Serialization;
 using BetterLyrics.WinUI3.Services.LiveStatesService;
 using BetterLyrics.WinUI3.Services.ResourceService;
 using BetterLyrics.WinUI3.Services.SettingsService;
-using BetterLyrics.WinUI3.Views;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
-using Microsoft.UI.Xaml.Controls;
-using System;
-using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.IO;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using static Vanara.PInvoke.User32.RAWINPUT;
 
 namespace BetterLyrics.WinUI3.ViewModels
 {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsWindowSwitchControlViewModel.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsWindowSwitchControlViewModel.cs
index d008e4c..accb6a2 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsWindowSwitchControlViewModel.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsWindowSwitchControlViewModel.cs
@@ -1,14 +1,8 @@
-using BetterLyrics.WinUI3.Helper;
-using BetterLyrics.WinUI3.Models;
+using BetterLyrics.WinUI3.Models;
 using BetterLyrics.WinUI3.Models.Settings;
 using BetterLyrics.WinUI3.Services.LiveStatesService;
 using BetterLyrics.WinUI3.Services.SettingsService;
 using CommunityToolkit.Mvvm.ComponentModel;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.ViewModels
 {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsWindowSwitchWindowViewModel.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsWindowSwitchWindowViewModel.cs
index 6630e97..9b401f3 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsWindowSwitchWindowViewModel.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsWindowSwitchWindowViewModel.cs
@@ -1,9 +1,4 @@
 using CommunityToolkit.Mvvm.ComponentModel;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.ViewModels
 {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsWindowViewModel.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsWindowViewModel.cs
index d0867f2..e576270 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsWindowViewModel.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsWindowViewModel.cs
@@ -11,18 +11,13 @@ using BetterLyrics.WinUI3.ViewModels;
 using BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel;
 using BetterLyrics.WinUI3.Views;
 using CommunityToolkit.Mvvm.ComponentModel;
-using CommunityToolkit.Mvvm.DependencyInjection;
-using CommunityToolkit.Mvvm.Input;
 using CommunityToolkit.Mvvm.Messaging;
 using CommunityToolkit.Mvvm.Messaging.Messages;
 using CommunityToolkit.WinUI;
 using Microsoft.UI.Dispatching;
 using Microsoft.UI.Windowing;
 using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
 using System.Collections.Generic;
-using Vanara.PInvoke;
-using Windows.Foundation;
 using Windows.UI;
 using WinRT.Interop;
 using WinUIEx;
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/MediaSettingsControlViewModel.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/MediaSettingsControlViewModel.cs
index 091cf36..44f4cca 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/MediaSettingsControlViewModel.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/MediaSettingsControlViewModel.cs
@@ -1,22 +1,16 @@
 using BetterLyrics.WinUI3.Helper;
 using BetterLyrics.WinUI3.Models;
 using BetterLyrics.WinUI3.Models.Settings;
-using BetterLyrics.WinUI3.Services.LibWatcherService;
 using BetterLyrics.WinUI3.Services.ResourceService;
 using BetterLyrics.WinUI3.Services.SettingsService;
 using BetterLyrics.WinUI3.Views;
 using CommunityToolkit.Mvvm.ComponentModel;
-using CommunityToolkit.Mvvm.DependencyInjection;
 using CommunityToolkit.Mvvm.Input;
 using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
-using WinRT.Interop;
 
 namespace BetterLyrics.WinUI3.ViewModels
 {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/MusicGalleryViewModel.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/MusicGalleryViewModel.cs
index 4877469..bee14bf 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/MusicGalleryViewModel.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/MusicGalleryViewModel.cs
@@ -5,31 +5,25 @@ using BetterLyrics.WinUI3.Helper;
 using BetterLyrics.WinUI3.Helper.BetterLyrics.WinUI3.Helper;
 using BetterLyrics.WinUI3.Models;
 using BetterLyrics.WinUI3.Models.Settings;
-using BetterLyrics.WinUI3.Services;
 using BetterLyrics.WinUI3.Services.LibWatcherService;
 using BetterLyrics.WinUI3.Services.ResourceService;
 using BetterLyrics.WinUI3.Services.SettingsService;
 using BetterLyrics.WinUI3.Views;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
-using CommunityToolkit.Mvvm.Messaging;
-using CommunityToolkit.Mvvm.Messaging.Messages;
 using CommunityToolkit.WinUI;
 using Microsoft.UI.Dispatching;
-using Microsoft.UI.Xaml.Controls;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.IO;
 using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 using Windows.ApplicationModel;
 using Windows.Media;
 using Windows.Media.Core;
 using Windows.Media.Playback;
 using Windows.Storage;
-using WinRT.Interop;
 
 namespace BetterLyrics.WinUI3.ViewModels
 {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/PlaybackSettingsControlViewModel.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/PlaybackSettingsControlViewModel.cs
index 15ee135..ec75c0e 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/PlaybackSettingsControlViewModel.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/PlaybackSettingsControlViewModel.cs
@@ -1,9 +1,7 @@
 using BetterLyrics.WinUI3.Enums;
-using BetterLyrics.WinUI3.Extensions;
 using BetterLyrics.WinUI3.Helper;
 using BetterLyrics.WinUI3.Models;
 using BetterLyrics.WinUI3.Models.Settings;
-using BetterLyrics.WinUI3.Services;
 using BetterLyrics.WinUI3.Services.LastFMService;
 using BetterLyrics.WinUI3.Services.MediaSessionsService;
 using BetterLyrics.WinUI3.Services.ResourceService;
@@ -13,16 +11,11 @@ using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using CommunityToolkit.Mvvm.Messaging;
 using CommunityToolkit.Mvvm.Messaging.Messages;
-using CommunityToolkit.WinUI;
 using Hqub.Lastfm.Entities;
 using Microsoft.UI.Dispatching;
-using Microsoft.UI.Xaml.Controls;
 using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
 using System.Linq;
 using System.Threading.Tasks;
-using Windows.Globalization;
 
 namespace BetterLyrics.WinUI3.ViewModels
 {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/SettingsPageViewModel.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/SettingsPageViewModel.cs
index 8e7fa63..10312de 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/SettingsPageViewModel.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/SettingsPageViewModel.cs
@@ -1,16 +1,6 @@
 // 2025/6/23 by Zhe Fang
 
-using BetterLyrics.WinUI3.Helper;
-using BetterLyrics.WinUI3.Helper.BetterLyrics.WinUI3.Helper;
-using BetterLyrics.WinUI3.Models.Settings;
-using BetterLyrics.WinUI3.Services.MediaSessionsService;
-using BetterLyrics.WinUI3.Services.ResourceService;
-using BetterLyrics.WinUI3.Services.SettingsService;
-using BetterLyrics.WinUI3.Views;
 using CommunityToolkit.Mvvm.ComponentModel;
-using CommunityToolkit.Mvvm.Input;
-using System;
-using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.ViewModels
 {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/SettingsWindowViewModel.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/SettingsWindowViewModel.cs
index 08ca6da..4c3f684 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/SettingsWindowViewModel.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/SettingsWindowViewModel.cs
@@ -1,6 +1,4 @@
-using BetterLyrics.WinUI3.Services.SettingsService;
-
-namespace BetterLyrics.WinUI3.ViewModels
+namespace BetterLyrics.WinUI3.ViewModels
 {
     public partial class SettingsWindowViewModel : BaseWindowViewModel
     {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/SystemTrayViewModel.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/SystemTrayViewModel.cs
index 21e28a9..2a1cad4 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/SystemTrayViewModel.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/SystemTrayViewModel.cs
@@ -3,10 +3,6 @@ using BetterLyrics.WinUI3.Services.SettingsService;
 using BetterLyrics.WinUI3.Views;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
-using CommunityToolkit.Mvvm.Messaging;
-using CommunityToolkit.Mvvm.Messaging.Messages;
-using Microsoft.UI.Xaml;
-using System;
 using WinUIEx;
 
 namespace BetterLyrics.WinUI3.ViewModels
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsPage.xaml.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsPage.xaml.cs
index e3144df..bedb839 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsPage.xaml.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsPage.xaml.cs
@@ -1,22 +1,15 @@
 // 2025/6/23 by Zhe Fang
 
 using BetterLyrics.WinUI3.Controls;
-using BetterLyrics.WinUI3.Enums;
 using BetterLyrics.WinUI3.Helper;
-using BetterLyrics.WinUI3.Models.Settings;
 using BetterLyrics.WinUI3.Services.MediaSessionsService;
 using BetterLyrics.WinUI3.Services.SettingsService;
 using BetterLyrics.WinUI3.ViewModels;
 using BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel;
 using CommunityToolkit.Mvvm.DependencyInjection;
-using Microsoft.UI.Input;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
-using System.Diagnostics;
-using System.Linq;
 using System.Numerics;
-using System.Runtime.CompilerServices;
-using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.Views
 {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsSearchWindow.xaml.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsSearchWindow.xaml.cs
index 0599af1..37da3fc 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsSearchWindow.xaml.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsSearchWindow.xaml.cs
@@ -3,19 +3,6 @@ using BetterLyrics.WinUI3.Services.ResourceService;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Microsoft.UI.Windowing;
 using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Controls.Primitives;
-using Microsoft.UI.Xaml.Data;
-using Microsoft.UI.Xaml.Input;
-using Microsoft.UI.Xaml.Media;
-using Microsoft.UI.Xaml.Navigation;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
 
 // To learn more about WinUI, the WinUI project structure,
 // and more about our project templates, see: http://aka.ms/winui-project-info.
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsWindow.xaml.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsWindow.xaml.cs
index 312b96b..63109f9 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsWindow.xaml.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsWindow.xaml.cs
@@ -2,22 +2,13 @@
 
 using BetterLyrics.WinUI3.Enums;
 using BetterLyrics.WinUI3.Helper;
-using BetterLyrics.WinUI3.Models;
 using BetterLyrics.WinUI3.Services.LiveStatesService;
 using BetterLyrics.WinUI3.Services.ResourceService;
-using BetterLyrics.WinUI3.Services.SettingsService;
 using CommunityToolkit.Mvvm.DependencyInjection;
-using CommunityToolkit.WinUI;
 using Microsoft.UI.Windowing;
 using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Input;
-using System;
-using System.Diagnostics;
-using System.Linq;
 using Vanara.PInvoke;
-using WinRT.Interop;
-using WinUIEx;
 using WinUIEx.Messaging;
 
 namespace BetterLyrics.WinUI3.Views
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsWindowSwitchWindow.xaml.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsWindowSwitchWindow.xaml.cs
index 9064f60..07c0abf 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsWindowSwitchWindow.xaml.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsWindowSwitchWindow.xaml.cs
@@ -2,19 +2,6 @@ using BetterLyrics.WinUI3.Helper;
 using BetterLyrics.WinUI3.ViewModels;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Controls.Primitives;
-using Microsoft.UI.Xaml.Data;
-using Microsoft.UI.Xaml.Input;
-using Microsoft.UI.Xaml.Media;
-using Microsoft.UI.Xaml.Navigation;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
 using WinUIEx;
 
 // To learn more about WinUI, the WinUI project structure,
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/MusicGalleryPage.xaml.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/MusicGalleryPage.xaml.cs
index c5e9294..8f86467 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/MusicGalleryPage.xaml.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/MusicGalleryPage.xaml.cs
@@ -6,22 +6,13 @@ using BetterLyrics.WinUI3.Models.Settings;
 using BetterLyrics.WinUI3.Services.ResourceService;
 using BetterLyrics.WinUI3.ViewModels;
 using CommunityToolkit.Mvvm.DependencyInjection;
-using CommunityToolkit.WinUI;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Controls.Primitives;
-using Microsoft.UI.Xaml.Data;
 using Microsoft.UI.Xaml.Input;
-using Microsoft.UI.Xaml.Media;
-using Microsoft.UI.Xaml.Navigation;
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
-using Windows.System;
 
 // To learn more about WinUI, the WinUI project structure,
 // and more about our project templates, see: http://aka.ms/winui-project-info.
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/MusicGalleryWindow.xaml.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/MusicGalleryWindow.xaml.cs
index d4704b4..897211d 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/MusicGalleryWindow.xaml.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/MusicGalleryWindow.xaml.cs
@@ -3,20 +3,6 @@ using BetterLyrics.WinUI3.Services.ResourceService;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Microsoft.UI.Windowing;
 using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Controls.Primitives;
-using Microsoft.UI.Xaml.Data;
-using Microsoft.UI.Xaml.Input;
-using Microsoft.UI.Xaml.Media;
-using Microsoft.UI.Xaml.Navigation;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
-using WinUIEx;
 
 // To learn more about WinUI, the WinUI project structure,
 // and more about our project templates, see: http://aka.ms/winui-project-info.
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/SettingsPage.xaml.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/SettingsPage.xaml.cs
index 0928fa3..b5e7b63 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/SettingsPage.xaml.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/SettingsPage.xaml.cs
@@ -1,14 +1,8 @@
 // 2025/6/23 by Zhe Fang
 
-using BetterLyrics.WinUI3.Helper;
-using BetterLyrics.WinUI3.Models;
 using BetterLyrics.WinUI3.ViewModels;
 using CommunityToolkit.Mvvm.DependencyInjection;
-using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
-using System;
-using System.Threading.Tasks;
-using Windows.System;
 
 namespace BetterLyrics.WinUI3.Views
 {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/SettingsWindow.xaml.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/SettingsWindow.xaml.cs
index 51c7e7e..ecc9ced 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/SettingsWindow.xaml.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/SettingsWindow.xaml.cs
@@ -4,7 +4,6 @@ using BetterLyrics.WinUI3.ViewModels;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Microsoft.UI.Windowing;
 using Microsoft.UI.Xaml;
-using WinUIEx;
 
 namespace BetterLyrics.WinUI3.Views
 {
diff --git a/ColorThief.WinUI3/CMap.cs b/ColorThief.WinUI3/CMap.cs
index 04459bb..7f69626 100644
--- a/ColorThief.WinUI3/CMap.cs
+++ b/ColorThief.WinUI3/CMap.cs
@@ -20,12 +20,12 @@ namespace ColorThiefDotNet
 
         public List<QuantizedColor> GeneratePalette()
         {
-            if(palette == null)
+            if (palette == null)
             {
                 palette = (from vBox in vboxes
-                    let rgb = vBox.Avg(false)
-                    let color = FromRgb(rgb[0], rgb[1], rgb[2])
-                    select new QuantizedColor(color, vBox.Count(false))).ToList();
+                           let rgb = vBox.Avg(false)
+                           let color = FromRgb(rgb[0], rgb[1], rgb[2])
+                           select new QuantizedColor(color, vBox.Count(false))).ToList();
             }
 
             return palette;
@@ -38,7 +38,7 @@ namespace ColorThiefDotNet
 
         public int[] Map(int[] color)
         {
-            foreach(var vbox in vboxes.Where(vbox => vbox.Contains(color)))
+            foreach (var vbox in vboxes.Where(vbox => vbox.Contains(color)))
             {
                 return vbox.Avg(false);
             }
@@ -50,13 +50,13 @@ namespace ColorThiefDotNet
             var d1 = double.MaxValue;
             int[] pColor = null;
 
-            foreach(var t in vboxes)
+            foreach (var t in vboxes)
             {
                 var vbColor = t.Avg(false);
                 var d2 = Math.Sqrt(Math.Pow(color[0] - vbColor[0], 2)
                                    + Math.Pow(color[1] - vbColor[1], 2)
                                    + Math.Pow(color[2] - vbColor[2], 2));
-                if(d2 < d1)
+                if (d2 < d1)
                 {
                     d1 = d2;
                     pColor = vbColor;
@@ -71,20 +71,20 @@ namespace ColorThiefDotNet
             double maxValue = 0;
             var highestPopulation = vboxes.Select(p => p.Count(false)).Max();
 
-            foreach(var swatch in vboxes)
+            foreach (var swatch in vboxes)
             {
                 var avg = swatch.Avg(false);
                 var hsl = FromRgb(avg[0], avg[1], avg[2]).ToHsl();
                 var sat = hsl.S;
                 var luma = hsl.L;
 
-                if(sat >= minSaturation && sat <= maxSaturation &&
+                if (sat >= minSaturation && sat <= maxSaturation &&
                    luma >= minLuma && luma <= maxLuma)
                 {
                     var thisValue = Mmcq.CreateComparisonValue(sat, targetSaturation, luma, targetLuma,
                         swatch.Count(false), highestPopulation);
 
-                    if(max == null || thisValue > maxValue)
+                    if (max == null || thisValue > maxValue)
                     {
                         max = swatch;
                         maxValue = thisValue;
diff --git a/ColorThief.WinUI3/Color.cs b/ColorThief.WinUI3/Color.cs
index dffd499..b3fe6b7 100644
--- a/ColorThief.WinUI3/Color.cs
+++ b/ColorThief.WinUI3/Color.cs
@@ -43,25 +43,25 @@ namespace ColorThiefDotNet
             double h1;
 
             // ReSharper disable CompareOfFloatsByEqualityOperator
-            if(chroma == 0)
+            if (chroma == 0)
             {
                 h1 = 0;
             }
-            else if(max == r)
+            else if (max == r)
             {
                 h1 = (g - b) / chroma % 6;
             }
-            else if(max == g)
+            else if (max == g)
             {
                 h1 = 2 + (b - r) / chroma;
             }
             else //if (max == b)
             {
-                h1 = 4 + (r - g)/chroma;
+                h1 = 4 + (r - g) / chroma;
             }
 
             var lightness = 0.5 * (max - min);
-            var saturation = chroma == 0 ? 0 : chroma / (1 - Math.Abs(2*lightness - 1));
+            var saturation = chroma == 0 ? 0 : chroma / (1 - Math.Abs(2 * lightness - 1));
             HslColor ret;
             ret.H = 60 * h1;
             ret.S = saturation;
@@ -83,7 +83,7 @@ namespace ColorThiefDotNet
 
         public override string ToString()
         {
-            if(A == 255)
+            if (A == 255)
             {
                 return ToHexString();
             }
diff --git a/ColorThief.WinUI3/ColorThief.WinUI3.cs b/ColorThief.WinUI3/ColorThief.WinUI3.cs
index a2f9dcc..09603cf 100644
--- a/ColorThief.WinUI3/ColorThief.WinUI3.cs
+++ b/ColorThief.WinUI3/ColorThief.WinUI3.cs
@@ -53,7 +53,7 @@ namespace ColorThiefDotNet
         {
             var pixelArray = await GetPixelsFast(sourceImage, quality, ignoreWhite);
             var cmap = GetColorMap(pixelArray, colorCount);
-            if(cmap != null)
+            if (cmap != null)
             {
                 var colors = cmap.GeneratePalette();
                 return colors;
@@ -70,13 +70,13 @@ namespace ColorThiefDotNet
 
         private async Task<byte[][]> GetPixelsFast(BitmapDecoder sourceImage, int quality, bool ignoreWhite)
         {
-            if(quality < 1)
+            if (quality < 1)
             {
                 quality = DefaultQuality;
             }
 
             var pixels = await GetIntFromPixel(sourceImage);
-            var pixelCount = sourceImage.PixelWidth*sourceImage.PixelHeight;
+            var pixelCount = sourceImage.PixelWidth * sourceImage.PixelHeight;
 
             return ConvertPixels(pixels, Convert.ToInt32(pixelCount), quality, ignoreWhite);
         }
diff --git a/ColorThief.WinUI3/ColorThief.WinUI3.csproj b/ColorThief.WinUI3/ColorThief.WinUI3.csproj
index 574f92a..8f21b2c 100644
--- a/ColorThief.WinUI3/ColorThief.WinUI3.csproj
+++ b/ColorThief.WinUI3/ColorThief.WinUI3.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0-windows10.0.26100.0</TargetFramework>
-    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
+    <TargetFramework>net10.0-windows10.0.26100.0</TargetFramework>
+    <TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
     <RootNamespace>ColorThief.WinUI3</RootNamespace>
     <RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
     <UseWinUI>true</UseWinUI>
diff --git a/ColorThief.WinUI3/ColorThief.cs b/ColorThief.WinUI3/ColorThief.cs
index 5025fbe..c663f75 100644
--- a/ColorThief.WinUI3/ColorThief.cs
+++ b/ColorThief.WinUI3/ColorThief.cs
@@ -31,10 +31,10 @@ namespace ColorThiefDotNet
 
         private byte[][] ConvertPixels(byte[] pixels, int pixelCount, int quality, bool ignoreWhite)
         {
-            
+
 
             var expectedDataLength = pixelCount * ColorDepth;
-            if(expectedDataLength != pixels.Length)
+            if (expectedDataLength != pixels.Length)
             {
                 throw new ArgumentException("(expectedDataLength = "
                                             + expectedDataLength + ") != (pixels.length = "
@@ -52,7 +52,7 @@ namespace ColorThiefDotNet
             var numUsedPixels = 0;
             var pixelArray = new byte[numRegardedPixels][];
 
-            for(var i = 0; i < pixelCount; i += quality)
+            for (var i = 0; i < pixelCount; i += quality)
             {
                 var offset = i * ColorDepth;
                 var b = pixels[offset];
@@ -61,9 +61,9 @@ namespace ColorThiefDotNet
                 var a = pixels[offset + 3];
 
                 // If pixel is mostly opaque and not white
-                if(a >= 125 && !(ignoreWhite && r > 250 && g > 250 && b > 250))
+                if (a >= 125 && !(ignoreWhite && r > 250 && g > 250 && b > 250))
                 {
-                    pixelArray[numUsedPixels] = new[] {r, g, b};
+                    pixelArray[numUsedPixels] = new[] { r, g, b };
                     numUsedPixels++;
                 }
             }
diff --git a/ColorThief.WinUI3/Mmcq.cs b/ColorThief.WinUI3/Mmcq.cs
index 1294b86..5541818 100644
--- a/ColorThief.WinUI3/Mmcq.cs
+++ b/ColorThief.WinUI3/Mmcq.cs
@@ -32,7 +32,7 @@ namespace ColorThiefDotNet
         {
             var histo = new int[Histosize];
 
-            foreach(var pixel in pixels)
+            foreach (var pixel in pixels)
             {
                 var rval = pixel[0] >> Rshift;
                 var gval = pixel[1] >> Rshift;
@@ -51,36 +51,36 @@ namespace ColorThiefDotNet
 
             // find min/max
             var numPixels = pixels.Count;
-            for(var i = 0; i < numPixels; i++)
+            for (var i = 0; i < numPixels; i++)
             {
                 var pixel = pixels[i];
                 var rval = pixel[0] >> Rshift;
                 var gval = pixel[1] >> Rshift;
                 var bval = pixel[2] >> Rshift;
 
-                if(rval < rmin)
+                if (rval < rmin)
                 {
                     rmin = rval;
                 }
-                else if(rval > rmax)
+                else if (rval > rmax)
                 {
                     rmax = rval;
                 }
 
-                if(gval < gmin)
+                if (gval < gmin)
                 {
                     gmin = gval;
                 }
-                else if(gval > gmax)
+                else if (gval > gmax)
                 {
                     gmax = gval;
                 }
 
-                if(bval < bmin)
+                if (bval < bmin)
                 {
                     bmin = bval;
                 }
-                else if(bval > bmax)
+                else if (bval > bmax)
                 {
                     bmax = bval;
                 }
@@ -94,7 +94,7 @@ namespace ColorThiefDotNet
             int vboxDim1;
             int vboxDim2;
 
-            switch(color)
+            switch (color)
             {
                 case 'r':
                     vboxDim1 = vbox.R1;
@@ -110,9 +110,9 @@ namespace ColorThiefDotNet
                     break;
             }
 
-            for(var i = vboxDim1; i <= vboxDim2; i++)
+            for (var i = vboxDim1; i <= vboxDim2; i++)
             {
-                if(partialsum[i] > total / 2)
+                if (partialsum[i] > total / 2)
                 {
                     var vbox1 = vbox.Clone();
                     var vbox2 = vbox.Clone();
@@ -125,18 +125,18 @@ namespace ColorThiefDotNet
                         : Math.Max(vboxDim1, Math.Abs(Convert.ToInt32(i - 1 - left / 2.0)));
 
                     // avoid 0-count boxes
-                    while(d2 < 0 || partialsum[d2] <= 0)
+                    while (d2 < 0 || partialsum[d2] <= 0)
                     {
                         d2++;
                     }
                     var count2 = lookaheadsum[d2];
-                    while(count2 == 0 && d2 > 0 && partialsum[d2 - 1] > 0)
+                    while (count2 == 0 && d2 > 0 && partialsum[d2 - 1] > 0)
                     {
                         count2 = lookaheadsum[--d2];
                     }
 
                     // set dimensions
-                    switch(color)
+                    switch (color)
                     {
                         case 'r':
                             vbox1.R2 = d2;
@@ -152,7 +152,7 @@ namespace ColorThiefDotNet
                             break;
                     }
 
-                    return new[] {vbox1, vbox2};
+                    return new[] { vbox1, vbox2 };
                 }
             }
 
@@ -161,13 +161,13 @@ namespace ColorThiefDotNet
 
         private static VBox[] MedianCutApply(IList<int> histo, VBox vbox)
         {
-            if(vbox.Count(false) == 0)
+            if (vbox.Count(false) == 0)
             {
                 return null;
             }
-            if(vbox.Count(false) == 1)
+            if (vbox.Count(false) == 1)
             {
-                return new[] {vbox.Clone(), null};
+                return new[] { vbox.Clone(), null };
             }
 
             // only one pixel, no split
@@ -181,28 +181,28 @@ namespace ColorThiefDotNet
             var total = 0;
             var partialsum = new int[VboxLength];
             // -1 = not set / 0 = 0
-            for(var l = 0; l < partialsum.Length; l++)
+            for (var l = 0; l < partialsum.Length; l++)
             {
                 partialsum[l] = -1;
             }
 
             // -1 = not set / 0 = 0
             var lookaheadsum = new int[VboxLength];
-            for(var l = 0; l < lookaheadsum.Length; l++)
+            for (var l = 0; l < lookaheadsum.Length; l++)
             {
                 lookaheadsum[l] = -1;
             }
 
             int i, j, k, sum, index;
 
-            if(maxw == rw)
+            if (maxw == rw)
             {
-                for(i = vbox.R1; i <= vbox.R2; i++)
+                for (i = vbox.R1; i <= vbox.R2; i++)
                 {
                     sum = 0;
-                    for(j = vbox.G1; j <= vbox.G2; j++)
+                    for (j = vbox.G1; j <= vbox.G2; j++)
                     {
-                        for(k = vbox.B1; k <= vbox.B2; k++)
+                        for (k = vbox.B1; k <= vbox.B2; k++)
                         {
                             index = GetColorIndex(i, j, k);
                             sum += histo[index];
@@ -212,14 +212,14 @@ namespace ColorThiefDotNet
                     partialsum[i] = total;
                 }
             }
-            else if(maxw == gw)
+            else if (maxw == gw)
             {
-                for(i = vbox.G1; i <= vbox.G2; i++)
+                for (i = vbox.G1; i <= vbox.G2; i++)
                 {
                     sum = 0;
-                    for(j = vbox.R1; j <= vbox.R2; j++)
+                    for (j = vbox.R1; j <= vbox.R2; j++)
                     {
-                        for(k = vbox.B1; k <= vbox.B2; k++)
+                        for (k = vbox.B1; k <= vbox.B2; k++)
                         {
                             index = GetColorIndex(j, i, k);
                             sum += histo[index];
@@ -231,12 +231,12 @@ namespace ColorThiefDotNet
             }
             else /* maxw == bw */
             {
-                for(i = vbox.B1; i <= vbox.B2; i++)
+                for (i = vbox.B1; i <= vbox.B2; i++)
                 {
                     sum = 0;
-                    for(j = vbox.R1; j <= vbox.R2; j++)
+                    for (j = vbox.R1; j <= vbox.R2; j++)
                     {
-                        for(k = vbox.G1; k <= vbox.G2; k++)
+                        for (k = vbox.G1; k <= vbox.G2; k++)
                         {
                             index = GetColorIndex(j, k, i);
                             sum += histo[index];
@@ -247,9 +247,9 @@ namespace ColorThiefDotNet
                 }
             }
 
-            for(i = 0; i < VboxLength; i++)
+            for (i = 0; i < VboxLength; i++)
             {
-                if(partialsum[i] != -1)
+                if (partialsum[i] != -1)
                 {
                     lookaheadsum[i] = total - partialsum[i];
                 }
@@ -273,10 +273,10 @@ namespace ColorThiefDotNet
             var ncolors = 1;
             var niters = 0;
 
-            while(niters < MaxIterations)
+            while (niters < MaxIterations)
             {
                 var vbox = lh[lh.Count - 1];
-                if(vbox.Count(false) == 0)
+                if (vbox.Count(false) == 0)
                 {
                     lh.Sort(comparator);
                     niters++;
@@ -290,25 +290,25 @@ namespace ColorThiefDotNet
                 var vbox1 = vboxes[0];
                 var vbox2 = vboxes[1];
 
-                if(vbox1 == null)
+                if (vbox1 == null)
                 {
                     throw new Exception(
                         "vbox1 not defined; shouldn't happen!");
                 }
 
                 lh.Add(vbox1);
-                if(vbox2 != null)
+                if (vbox2 != null)
                 {
                     lh.Add(vbox2);
                     ncolors++;
                 }
                 lh.Sort(comparator);
 
-                if(ncolors >= target)
+                if (ncolors >= target)
                 {
                     return;
                 }
-                if(niters++ > MaxIterations)
+                if (niters++ > MaxIterations)
                 {
                     return;
                 }
@@ -318,7 +318,7 @@ namespace ColorThiefDotNet
         public static CMap Quantize(byte[][] pixels, int maxcolors)
         {
             // short-circuit
-            if(pixels.Length == 0 || maxcolors < 2 || maxcolors > 256)
+            if (pixels.Length == 0 || maxcolors < 2 || maxcolors > 256)
             {
                 return null;
             }
@@ -327,7 +327,7 @@ namespace ColorThiefDotNet
 
             // get the beginning vbox from the colors
             var vbox = VboxFromPixels(pixels, histo);
-            var pq = new List<VBox> {vbox};
+            var pq = new List<VBox> { vbox };
 
             // Round up to have the same behaviour as in JavaScript
             var target = (int)Math.Ceiling(FractByPopulation * maxcolors);
@@ -347,7 +347,7 @@ namespace ColorThiefDotNet
 
             // calculate the actual colors
             var cmap = new CMap();
-            foreach(var vb in pq)
+            foreach (var vb in pq)
             {
                 cmap.Push(vb);
             }
@@ -367,7 +367,7 @@ namespace ColorThiefDotNet
             double sum = 0;
             double sumWeight = 0;
 
-            for(var i = 0; i < values.Length; i += 2)
+            for (var i = 0; i < values.Length; i += 2)
             {
                 var value = values[i];
                 var weight = values[i + 1];
diff --git a/ColorThief.WinUI3/VBox.cs b/ColorThief.WinUI3/VBox.cs
index 8b0ff74..41707da 100644
--- a/ColorThief.WinUI3/VBox.cs
+++ b/ColorThief.WinUI3/VBox.cs
@@ -33,7 +33,7 @@ namespace ColorThiefDotNet
 
         public int Volume(bool force)
         {
-            if(volume == null || force)
+            if (volume == null || force)
             {
                 volume = (R2 - R1 + 1) * (G2 - G1 + 1) * (B2 - B1 + 1);
             }
@@ -43,18 +43,18 @@ namespace ColorThiefDotNet
 
         public int Count(bool force)
         {
-            if(count == null || force)
+            if (count == null || force)
             {
                 var npix = 0;
                 int i;
 
-                for(i = R1; i <= R2; i++)
+                for (i = R1; i <= R2; i++)
                 {
                     int j;
-                    for(j = G1; j <= G2; j++)
+                    for (j = G1; j <= G2; j++)
                     {
                         int k;
-                        for(k = B1; k <= B2; k++)
+                        for (k = B1; k <= B2; k++)
                         {
                             var index = Mmcq.GetColorIndex(i, j, k);
                             npix += histo[index];
@@ -75,7 +75,7 @@ namespace ColorThiefDotNet
 
         public int[] Avg(bool force)
         {
-            if(avg == null || force)
+            if (avg == null || force)
             {
                 var ntot = 0;
 
@@ -85,13 +85,13 @@ namespace ColorThiefDotNet
 
                 int i;
 
-                for(i = R1; i <= R2; i++)
+                for (i = R1; i <= R2; i++)
                 {
                     int j;
-                    for(j = G1; j <= G2; j++)
+                    for (j = G1; j <= G2; j++)
                     {
                         int k;
-                        for(k = B1; k <= B2; k++)
+                        for (k = B1; k <= B2; k++)
                         {
                             var histoindex = Mmcq.GetColorIndex(i, j, k);
                             var hval = histo[histoindex];
@@ -103,7 +103,7 @@ namespace ColorThiefDotNet
                     }
                 }
 
-                if(ntot > 0)
+                if (ntot > 0)
                 {
                     avg = new[]
                     {
diff --git a/Impressionist/Impressionist/Implementations/OctTreePaletteGenerator.cs b/Impressionist/Impressionist/Implementations/OctTreePaletteGenerator.cs
index db13f86..c52e8cd 100644
--- a/Impressionist/Impressionist/Implementations/OctTreePaletteGenerator.cs
+++ b/Impressionist/Impressionist/Implementations/OctTreePaletteGenerator.cs
@@ -3,7 +3,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Numerics;
-using System.Threading;
 using System.Threading.Tasks;
 
 namespace Impressionist.Implementations
@@ -69,7 +68,7 @@ namespace Impressionist.Implementations
                     builder = builder.Where(t => !t.Key.RGBVectorLStarIsDark());
                 }
             }
-                var targetColor = builder.ToDictionary(t => t.Key, t => t.Value);
+            var targetColor = builder.ToDictionary(t => t.Key, t => t.Value);
             foreach (var color in targetColor)
             {
                 quantizer.AddColorRange(color.Key, color.Value);
@@ -139,7 +138,7 @@ namespace Impressionist.Implementations
             }
             public List<Vector3> GetPaletteResult(int count)
             {
-                return Root.GetPaletteResult().OrderByDescending(t=>t.Value).Take(count).Select(t=>t.Key).ToList();
+                return Root.GetPaletteResult().OrderByDescending(t => t.Value).Take(count).Select(t => t.Key).ToList();
             }
             public Vector3 GetThemeResult()
             {
diff --git a/Impressionist/Impressionist/Impressionist.csproj b/Impressionist/Impressionist/Impressionist.csproj
index 1f14469..f78fa9f 100644
--- a/Impressionist/Impressionist/Impressionist.csproj
+++ b/Impressionist/Impressionist/Impressionist.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-	  <TargetFramework>net8.0-windows10.0.26100.0</TargetFramework>
+	  <TargetFramework>net10.0-windows10.0.26100.0</TargetFramework>
 	  <IsPublishable>False</IsPublishable>
 	  <RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
   </PropertyGroup>