diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/App.xaml.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/App.xaml.cs
index 137ed65..ba0fccf 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/App.xaml.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/App.xaml.cs
@@ -5,6 +5,7 @@ using BetterLyrics.WinUI3.Hooks;
 using BetterLyrics.WinUI3.Models.Settings;
 using BetterLyrics.WinUI3.Services.AlbumArtSearchService;
 using BetterLyrics.WinUI3.Services.DiscordService;
+using BetterLyrics.WinUI3.Services.FileSystemService;
 using BetterLyrics.WinUI3.Services.LastFMService;
 using BetterLyrics.WinUI3.Services.LibWatcherService;
 using BetterLyrics.WinUI3.Services.LocalizationService;
@@ -123,6 +124,7 @@ namespace BetterLyrics.WinUI3
                     .AddSingleton<ILastFMService, LastFMService>()
                     .AddSingleton<IDiscordService, DiscordService>()
                     .AddSingleton<ILocalizationService, LocalizationService>()
+                    .AddSingleton<IFileSystemService, FileSystemService>()
                     // ViewModels
                     .AddSingleton<AppSettingsControlViewModel>()
                     .AddSingleton<PlaybackSettingsControlViewModel>()
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/BetterLyrics.WinUI3.csproj b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/BetterLyrics.WinUI3.csproj
index 85d2301..88ba61c 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/BetterLyrics.WinUI3.csproj
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/BetterLyrics.WinUI3.csproj
@@ -95,6 +95,7 @@
 		<PackageReference Include="Serilog.Extensions.Logging" Version="10.0.0" />
 		<PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
 		<PackageReference Include="SMBLibrary" Version="1.5.5.1" />
+		<PackageReference Include="sqlite-net-pcl" Version="1.9.172" />
 		<PackageReference Include="System.Drawing.Common" Version="10.0.1" />
 		<PackageReference Include="System.Text.Encoding.CodePages" Version="10.0.1" />
 		<PackageReference Include="TagLibSharp" Version="2.3.0" />
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsSearchControl.xaml b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsSearchControl.xaml
index fc10397..94ff8d2 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsSearchControl.xaml
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsSearchControl.xaml
@@ -25,7 +25,7 @@
                 <ColumnDefinition Width="*" />
             </Grid.ColumnDefinitions>
             <Grid Grid.Column="0">
-                <ScrollViewer>
+                <ScrollViewer Padding="8,0">
                     <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
 
                         <TextBlock x:Uid="LyricsSearchControlSongInfoMapping" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
@@ -153,12 +153,11 @@
                             <CheckBox x:Uid="LyricsSearchControlMarkAsPureMusic" IsChecked="{x:Bind ViewModel.MappedSongSearchQuery.IsMarkedAsPureMusic, Mode=TwoWay}" />
                         </dev:SettingsCard>
 
-                        <dev:SettingsCard x:Uid="LyricsSearchControlTargetSearchProvider">
-                            <Button
-                                x:Uid="LyricsSearchControlSearch"
-                                Command="{x:Bind ViewModel.SearchCommand}"
-                                Style="{StaticResource AccentButtonStyle}" />
-                        </dev:SettingsCard>
+                        <Button
+                            x:Uid="LyricsSearchControlSearch"
+                            HorizontalAlignment="Stretch"
+                            Command="{x:Bind ViewModel.SearchCommand}"
+                            Style="{StaticResource AccentButtonStyle}" />
 
                         <dev:SettingsCard x:Uid="LyricsSearchControlIgnoreCache">
                             <ToggleSwitch IsOn="{x:Bind ViewModel.AppSettings.GeneralSettings.IgnoreCacheWhenSearching, Mode=TwoWay}" />
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsWindowSettingsControl.xaml b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsWindowSettingsControl.xaml
index 03d5063..e99b95f 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsWindowSettingsControl.xaml
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsWindowSettingsControl.xaml
@@ -187,29 +187,51 @@
 
                     <controls:Segmented
                         x:Name="ConfigSegmented"
+                        HorizontalAlignment="Stretch"
                         SelectionChanged="ConfigSegmented_SelectionChanged"
                         Style="{StaticResource PivotSegmentedStyle}">
 
                         <controls:SegmentedItem x:Name="WindowSegmentedItem" Tag="Window">
-                            <TextBlock x:Uid="AppSettingsControlGeneral" />
+                            <TextBlock
+                                x:Uid="AppSettingsControlGeneral"
+                                MaxWidth="120"
+                                TextWrapping="Wrap" />
                         </controls:SegmentedItem>
                         <controls:SegmentedItem x:Name="LayoutSegmentedItem" Tag="Layout">
-                            <TextBlock x:Uid="SettingsPageLayout" />
+                            <TextBlock
+                                x:Uid="SettingsPageLayout"
+                                MaxWidth="120"
+                                TextWrapping="Wrap" />
                         </controls:SegmentedItem>
                         <controls:SegmentedItem x:Name="AlbumArtStyleSegmentedItem" Tag="AlbumArtStyle">
-                            <TextBlock x:Uid="SettingsPageAlbumStyle" />
+                            <TextBlock
+                                x:Uid="SettingsPageAlbumStyle"
+                                MaxWidth="120"
+                                TextWrapping="Wrap" />
                         </controls:SegmentedItem>
                         <controls:SegmentedItem Tag="AlbumArtEffect">
-                            <TextBlock x:Uid="SettingsPageAlbumEffect" />
+                            <TextBlock
+                                x:Uid="SettingsPageAlbumEffect"
+                                MaxWidth="120"
+                                TextWrapping="Wrap" />
                         </controls:SegmentedItem>
                         <controls:SegmentedItem Tag="LyricsStyle">
-                            <TextBlock x:Uid="SettingsPageLyricsStyle" />
+                            <TextBlock
+                                x:Uid="SettingsPageLyricsStyle"
+                                MaxWidth="120"
+                                TextWrapping="Wrap" />
                         </controls:SegmentedItem>
                         <controls:SegmentedItem Tag="LyricsEffect">
-                            <TextBlock x:Uid="SettingsPageLyricsEffect" />
+                            <TextBlock
+                                x:Uid="SettingsPageLyricsEffect"
+                                MaxWidth="120"
+                                TextWrapping="Wrap" />
                         </controls:SegmentedItem>
                         <controls:SegmentedItem Tag="LyricsBackground">
-                            <TextBlock x:Uid="SettingsPageBackgroundOverlay" />
+                            <TextBlock
+                                x:Uid="SettingsPageBackgroundOverlay"
+                                MaxWidth="120"
+                                TextWrapping="Wrap" />
                         </controls:SegmentedItem>
 
                     </controls:Segmented>
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/MediaSettingsControl.xaml b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/MediaSettingsControl.xaml
index 9f1c532..2a3f335 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/MediaSettingsControl.xaml
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/MediaSettingsControl.xaml
@@ -96,13 +96,12 @@
                                         CommandParameter="{Binding ElementName=RootGrid}"
                                         Icon="Folder" />
 
-                                    <MenuFlyoutSeparator Visibility="Collapsed" />
+                                    <MenuFlyoutSeparator />
 
                                     <MenuFlyoutItem
                                         Command="{x:Bind ViewModel.AddRemoteSourceCommand}"
                                         CommandParameter="SMB"
-                                        Text="SMB"
-                                        Visibility="Collapsed">
+                                        Text="SMB">
                                         <MenuFlyoutItem.Icon>
                                             <FontIcon FontFamily="{StaticResource IconFontFamily}" Glyph="&#xE839;" />
                                         </MenuFlyoutItem.Icon>
@@ -111,8 +110,7 @@
                                     <MenuFlyoutItem
                                         Command="{x:Bind ViewModel.AddRemoteSourceCommand}"
                                         CommandParameter="FTP"
-                                        Text="FTP"
-                                        Visibility="Collapsed">
+                                        Text="FTP">
                                         <MenuFlyoutItem.Icon>
                                             <FontIcon FontFamily="{StaticResource IconFontFamily}" Glyph="&#xE838;" />
                                         </MenuFlyoutItem.Icon>
@@ -121,8 +119,7 @@
                                     <MenuFlyoutItem
                                         Command="{x:Bind ViewModel.AddRemoteSourceCommand}"
                                         CommandParameter="WebDAV"
-                                        Text="WebDAV"
-                                        Visibility="Collapsed">
+                                        Text="WebDAV">
                                         <MenuFlyoutItem.Icon>
                                             <FontIcon FontFamily="{StaticResource IconFontFamily}" Glyph="&#xE774;" />
                                         </MenuFlyoutItem.Icon>
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/LyricsDataExtensions.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/LyricsDataExtensions.cs
new file mode 100644
index 0000000..0713873
--- /dev/null
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/LyricsDataExtensions.cs
@@ -0,0 +1,123 @@
+using BetterLyrics.WinUI3.Helper;
+using BetterLyrics.WinUI3.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace BetterLyrics.WinUI3.Extensions
+{
+    public static class LyricsDataExtensions
+    {
+        extension(LyricsData lyricsData)
+        {
+            public static LyricsData GetLoadingPlaceholder()
+            {
+                return new LyricsData()
+                {
+                    LyricsLines = [
+                        new LyricsLine
+                        {
+                            StartMs = 0,
+                            EndMs = (int)TimeSpan.FromMinutes(99).TotalMilliseconds,
+                            OriginalText = "● ● ●",
+                        },
+                    ],
+                    LanguageCode = "N/A",
+                };
+            }
+
+            public void SetTranslatedText(LyricsData translationData, int toleranceMs = 50)
+            {
+                foreach (var line in lyricsData.LyricsLines)
+                {
+                    // 在翻译歌词中查找与当前行开始时间最接近且在容忍范围内的行
+                    var transLine = translationData.LyricsLines
+                        .FirstOrDefault(t => Math.Abs(t.StartMs - line.StartMs) <= toleranceMs);
+
+                    if (transLine != null)
+                    {
+                        // 此处 transLine.OriginalText 指翻译中的“原文”属性
+                        line.TranslatedText = transLine.OriginalText;
+                    }
+                    else
+                    {
+                        // 没有匹配的翻译
+                        line.TranslatedText = "";
+                    }
+                }
+            }
+
+            public void SetPhoneticText(LyricsData phoneticData, int toleranceMs = 50)
+            {
+                foreach (var line in lyricsData.LyricsLines)
+                {
+                    // 在音译歌词中查找与当前行开始时间最接近且在容忍范围内的行
+                    var transLine = phoneticData.LyricsLines
+                        .FirstOrDefault(t => Math.Abs(t.StartMs - line.StartMs) <= toleranceMs);
+
+                    if (transLine != null)
+                    {
+                        // 此处 transLine.OriginalText 指音译中的“原文”属性
+                        line.PhoneticText = transLine.OriginalText;
+                    }
+                    else
+                    {
+                        // 没有匹配的音译
+                        line.PhoneticText = "";
+                    }
+                }
+            }
+
+            public void SetTranslation(string translation)
+            {
+                List<string> translationArr = translation.Split(StringHelper.NewLine).ToList();
+                int i = 0;
+                foreach (var line in lyricsData.LyricsLines)
+                {
+                    if (i >= translationArr.Count)
+                    {
+                        line.TranslatedText = ""; // No translation available, keep empty
+                    }
+                    else
+                    {
+                        line.TranslatedText = translationArr[i];
+                    }
+                    i++;
+                }
+            }
+
+            public void SetTransliteration(string transliteration)
+            {
+                List<string> transliterationArr = transliteration.Split(StringHelper.NewLine).ToList();
+                int i = 0;
+                foreach (var line in lyricsData.LyricsLines)
+                {
+                    if (i >= transliterationArr.Count)
+                    {
+                        line.PhoneticText = ""; // No transliteration available, keep empty
+                    }
+                    else
+                    {
+                        line.PhoneticText = transliterationArr[i];
+                    }
+                    i++;
+                }
+            }
+
+            public LyricsLine? GetLyricsLine(double sec)
+            {
+                for (int i = 0; i < lyricsData.LyricsLines.Count; i++)
+                {
+                    var line = lyricsData.LyricsLines[i];
+                    if (line.StartMs > sec * 1000)
+                    {
+                        return lyricsData.LyricsLines.ElementAtOrDefault(i - 1);
+                    }
+                }
+                return null;
+            }
+
+        }
+    }
+}
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/FileSystem/StreamFileAbstraction.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/StreamFileAbstraction.cs
similarity index 96%
rename from BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/FileSystem/StreamFileAbstraction.cs
rename to BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/StreamFileAbstraction.cs
index b80fdb9..1a81a65 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/FileSystem/StreamFileAbstraction.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/StreamFileAbstraction.cs
@@ -1,7 +1,7 @@
 using System;
 using System.IO;
 
-namespace BetterLyrics.WinUI3.Models.FileSystem
+namespace BetterLyrics.WinUI3.Helper
 {
     public class StreamFileAbstraction : TagLib.File.IFileAbstraction
     {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Hooks/TaskbarHook.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Hooks/TaskbarHook.cs
index 9d545ea..0348a75 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Hooks/TaskbarHook.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Hooks/TaskbarHook.cs
@@ -7,6 +7,7 @@ using FlaUI.Core.EventHandlers;
 using FlaUI.UIA3;
 using Microsoft.UI.Dispatching;
 using System;
+using System.Diagnostics;
 using System.Drawing;
 using System.Threading;
 
@@ -186,7 +187,8 @@ namespace BetterLyrics.WinUI3.Hooks
 
                 if (width < 20) return Rectangle.Empty;
 
-                return new Rectangle(finalLeft, taskbarRect.Top, width, taskbarRect.Height);
+                var finalRect = new Rectangle(finalLeft, taskbarRect.Top, width, taskbarRect.Height);
+                return finalRect;
             }
             catch (Exception ex)
             {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/ExtendedTrack.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/ExtendedTrack.cs
index d9aaf10..2a6f08e 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/ExtendedTrack.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/ExtendedTrack.cs
@@ -1,4 +1,4 @@
-using BetterLyrics.WinUI3.Models.FileSystem;
+using BetterLyrics.WinUI3.Helper;
 using System;
 using System.IO;
 
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/FileCacheEntity.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/FileCacheEntity.cs
new file mode 100644
index 0000000..f55f690
--- /dev/null
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/FileCacheEntity.cs
@@ -0,0 +1,22 @@
+using SQLite;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace BetterLyrics.WinUI3.Models
+{
+    [Table("FileCache")]
+    public class FileCacheEntity : UnifiedFileItem
+    {
+        [PrimaryKey, AutoIncrement]
+        public int Id { get; set; }
+
+        [Indexed]
+        public string ParentPath { get; set; }
+
+        [Indexed(Unique = true)]
+        public string FullPath { get; set; }
+
+        public string Title { get; set; }
+    }
+}
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LyricsData.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LyricsData.cs
index 8b6abf8..95a316a 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LyricsData.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LyricsData.cs
@@ -29,84 +29,6 @@ namespace BetterLyrics.WinUI3.Models
             LyricsLines = lyricsLines;
         }
 
-        public void SetTranslatedText(LyricsData translationData, int toleranceMs = 50)
-        {
-            foreach (var line in LyricsLines)
-            {
-                // 在翻译歌词中查找与当前行开始时间最接近且在容忍范围内的行
-                var transLine = translationData.LyricsLines
-                    .FirstOrDefault(t => Math.Abs(t.StartMs - line.StartMs) <= toleranceMs);
-
-                if (transLine != null)
-                {
-                    // 此处 transLine.OriginalText 指翻译中的“原文”属性
-                    line.TranslatedText = transLine.OriginalText;
-                }
-                else
-                {
-                    // 没有匹配的翻译
-                    line.TranslatedText = "";
-                }
-            }
-        }
-
-        public void SetPhoneticText(LyricsData phoneticData, int toleranceMs = 50)
-        {
-            foreach (var line in LyricsLines)
-            {
-                // 在音译歌词中查找与当前行开始时间最接近且在容忍范围内的行
-                var transLine = phoneticData.LyricsLines
-                    .FirstOrDefault(t => Math.Abs(t.StartMs - line.StartMs) <= toleranceMs);
-
-                if (transLine != null)
-                {
-                    // 此处 transLine.OriginalText 指音译中的“原文”属性
-                    line.PhoneticText = transLine.OriginalText;
-                }
-                else
-                {
-                    // 没有匹配的音译
-                    line.PhoneticText = "";
-                }
-            }
-        }
-
-        public void SetTranslation(string translation)
-        {
-            List<string> translationArr = translation.Split(StringHelper.NewLine).ToList();
-            int i = 0;
-            foreach (var line in LyricsLines)
-            {
-                if (i >= translationArr.Count)
-                {
-                    line.TranslatedText = ""; // No translation available, keep empty
-                }
-                else
-                {
-                    line.TranslatedText = translationArr[i];
-                }
-                i++;
-            }
-        }
-
-        public void SetTransliteration(string transliteration)
-        {
-            List<string> transliterationArr = transliteration.Split(StringHelper.NewLine).ToList();
-            int i = 0;
-            foreach (var line in LyricsLines)
-            {
-                if (i >= transliterationArr.Count)
-                {
-                    line.PhoneticText = ""; // No transliteration available, keep empty
-                }
-                else
-                {
-                    line.PhoneticText = transliterationArr[i];
-                }
-                i++;
-            }
-        }
-
         public static LyricsData GetNotfoundPlaceholder()
         {
             return new LyricsData([new LyricsLine
@@ -117,34 +39,5 @@ namespace BetterLyrics.WinUI3.Models
             }]);
         }
 
-        public static LyricsData GetLoadingPlaceholder()
-        {
-            return new LyricsData()
-            {
-                LyricsLines = [
-                    new LyricsLine
-                    {
-                        StartMs = 0,
-                        EndMs = (int)TimeSpan.FromMinutes(99).TotalMilliseconds,
-                        OriginalText = "● ● ●",
-                    },
-                ],
-                LanguageCode = "N/A",
-            };
-        }
-
-        public LyricsLine? GetLyricsLine(double sec)
-        {
-            for (int i = 0; i < LyricsLines.Count; i++)
-            {
-                var line = LyricsLines[i];
-                if (line.StartMs > sec * 1000)
-                {
-                    return LyricsLines.ElementAtOrDefault(i - 1);
-                }
-            }
-            return null;
-        }
-
     }
 }
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/MediaFolder.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/MediaFolder.cs
index 33c1e69..44d010c 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/MediaFolder.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/MediaFolder.cs
@@ -2,7 +2,8 @@
 
 using BetterLyrics.WinUI3.Enums;
 using BetterLyrics.WinUI3.Helper;
-using BetterLyrics.WinUI3.Models.FileSystem;
+using BetterLyrics.WinUI3.Services.FileSystemService;
+using BetterLyrics.WinUI3.Services.FileSystemService.Providers;
 using CommunityToolkit.Mvvm.ComponentModel;
 using System;
 using System.Text.Json.Serialization;
@@ -27,7 +28,7 @@ namespace BetterLyrics.WinUI3.Models
 
         [ObservableProperty] public partial string UserName { get; set; }
 
-        [ObservableProperty] public partial int Port { get; set; } = -1;
+        [ObservableProperty] public partial int Port { get; set; } = 80;
 
         [JsonIgnore] public string Password { get; set; }
 
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/TrimmedTrack.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/TrimmedTrack.cs
deleted file mode 100644
index 1121ce1..0000000
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/TrimmedTrack.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-namespace BetterLyrics.WinUI3.Models
-{
-    public class TrimmedTrack
-    {
-        public string Title { get; set; }
-        public string Artist { get; set; }
-        public string Album { get; set; }
-        public int? Year { get; set; }
-        public string Genre { get; set; }
-        public string FilePath { get; set; }
-        public int Duration { get; set; }
-        public byte[]? AlbumArt { get; set; }
-    }
-}
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/FileSystem/UnifiedFileItem.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/UnifiedFileItem.cs
similarity index 58%
rename from BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/FileSystem/UnifiedFileItem.cs
rename to BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/UnifiedFileItem.cs
index 9e51a64..6923d1c 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/FileSystem/UnifiedFileItem.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/UnifiedFileItem.cs
@@ -1,13 +1,11 @@
 using System;
 
-namespace BetterLyrics.WinUI3.Models.FileSystem
+namespace BetterLyrics.WinUI3.Models
 {
     public class UnifiedFileItem
     {
         public string Name { get; set; }
         public string FullPath { get; set; }
-        public long Size { get; set; }
         public bool IsFolder { get; set; }
-        public DateTime? LastModified { get; set; }
     }
 }
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/FileSystemService.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/FileSystemService.cs
new file mode 100644
index 0000000..2da71ae
--- /dev/null
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/FileSystemService.cs
@@ -0,0 +1,85 @@
+using BetterLyrics.WinUI3.Models;
+using BetterLyrics.WinUI3.Services.FileSystemService.Providers;
+using SQLite;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace BetterLyrics.WinUI3.Services.FileSystemService
+{
+    public class FileSystemService : IFileSystemService
+    {
+        private readonly IUnifiedFileSystem _provider;
+        private readonly SQLiteAsyncConnection _db;
+        private bool _isInitialized = false;
+
+        public FileSystemService(IUnifiedFileSystem provider)
+        {
+            _provider = provider;
+
+            var dbPath = Path.Combine(Windows.Storage.ApplicationData.Current.LocalFolder.Path, "files_cache.db");
+            _db = new SQLiteAsyncConnection(dbPath);
+        }
+
+        public async Task InitializeAsync()
+        {
+            if (_isInitialized) return;
+
+            await _provider.ConnectAsync();
+
+            await _db.CreateTableAsync<FileCacheEntity>();
+            _isInitialized = true;
+        }
+
+        public async Task<List<UnifiedFileItem>> GetFilesAsync(string relativePath)
+        {
+            await InitializeAsync();
+
+            var cachedEntities = await _db.Table<FileCacheEntity>()
+                .Where(x => x.ParentPath == relativePath)
+                .ToListAsync();
+
+            var result = cachedEntities.Select(x => new UnifiedFileItem
+            {
+                Name = x.Name,
+                FullPath = x.FullPath,
+                IsFolder = x.IsFolder,
+            }).ToList();
+
+            _ = SyncInBackground(relativePath);
+            return result;
+        }
+
+        private async Task SyncInBackground(string relativePath)
+        {
+            var remoteItems = await _provider.GetFilesAsync(relativePath);
+
+            var newEntities = remoteItems.Select(item => new FileCacheEntity
+            {
+                ParentPath = relativePath,
+
+                FullPath = item.FullPath,
+                Name = item.Name,
+                IsFolder = item.IsFolder,
+            });
+
+            await _db.RunInTransactionAsync(conn =>
+            {
+                conn.Execute("DELETE FROM FileCache WHERE ParentPath = ?", relativePath);
+                conn.InsertAll(newEntities);
+            });
+
+            FolderUpdated?.Invoke(this, relativePath);
+        }
+
+        public async Task<Stream> OpenFileAsync(UnifiedFileItem item)
+        {
+            return await _provider.OpenReadAsync(item.FullPath);
+        }
+
+        public event EventHandler<string>? FolderUpdated;
+
+    }
+}
\ No newline at end of file
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/IFileSystemService.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/IFileSystemService.cs
new file mode 100644
index 0000000..26d7146
--- /dev/null
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/IFileSystemService.cs
@@ -0,0 +1,17 @@
+using BetterLyrics.WinUI3.Models;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Threading.Tasks;
+
+namespace BetterLyrics.WinUI3.Services.FileSystemService
+{
+    public interface IFileSystemService
+    {
+        Task InitializeAsync();
+        Task<List<UnifiedFileItem>> GetFilesAsync(string relativePath);
+        Task<Stream> OpenFileAsync(UnifiedFileItem item);
+
+        event EventHandler<string> FolderUpdated;
+    }
+}
\ No newline at end of file
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/FileSystem/IUnifiedFileSystem.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/IUnifiedFileSystem.cs
similarity index 76%
rename from BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/FileSystem/IUnifiedFileSystem.cs
rename to BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/IUnifiedFileSystem.cs
index 6f643e9..3e2a8d4 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/FileSystem/IUnifiedFileSystem.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/IUnifiedFileSystem.cs
@@ -1,9 +1,10 @@
-using System;
+using BetterLyrics.WinUI3.Models;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Threading.Tasks;
 
-namespace BetterLyrics.WinUI3.Models.FileSystem
+namespace BetterLyrics.WinUI3.Services.FileSystemService
 {
     public interface IUnifiedFileSystem : IDisposable
     {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/FileSystem/FTPFileSystem.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/Providers/FTPFileSystem.cs
similarity index 90%
rename from BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/FileSystem/FTPFileSystem.cs
rename to BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/Providers/FTPFileSystem.cs
index 24e8ce5..dd1a99e 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/FileSystem/FTPFileSystem.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/Providers/FTPFileSystem.cs
@@ -1,10 +1,12 @@
-using FluentFTP;
+using BetterLyrics.WinUI3.Models;
+using BetterLyrics.WinUI3.Services.FileSystemService;
+using FluentFTP;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace BetterLyrics.WinUI3.Models.FileSystem
+namespace BetterLyrics.WinUI3.Services.FileSystemService.Providers
 {
     public partial class FTPFileSystem : IUnifiedFileSystem
     {
@@ -37,8 +39,6 @@ namespace BetterLyrics.WinUI3.Models.FileSystem
                 Name = i.Name,
                 FullPath = i.FullName,
                 IsFolder = i.Type == FtpObjectType.Directory,
-                Size = i.Size,
-                LastModified = i.Modified
             }).ToList();
         }
 
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/FileSystem/LocalFileSystem.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/Providers/LocalFileSystem.cs
similarity index 88%
rename from BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/FileSystem/LocalFileSystem.cs
rename to BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/Providers/LocalFileSystem.cs
index b0f0ef7..478bf3f 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/FileSystem/LocalFileSystem.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/Providers/LocalFileSystem.cs
@@ -1,8 +1,10 @@
-using System.Collections.Generic;
+using BetterLyrics.WinUI3.Models;
+using BetterLyrics.WinUI3.Services.FileSystemService;
+using System.Collections.Generic;
 using System.IO;
 using System.Threading.Tasks;
 
-namespace BetterLyrics.WinUI3.Models.FileSystem
+namespace BetterLyrics.WinUI3.Services.FileSystemService.Providers
 {
     public partial class LocalFileSystem : IUnifiedFileSystem
     {
@@ -38,8 +40,6 @@ namespace BetterLyrics.WinUI3.Models.FileSystem
                     Name = item.Name,
                     FullPath = item.FullName,
                     IsFolder = isDir,
-                    Size = isDir ? 0 : ((FileInfo)item).Length,
-                    LastModified = item.LastWriteTime
                 });
             }
             return result;
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/FileSystem/SMBFileSystem.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/Providers/SMBFileSystem.cs
similarity index 96%
rename from BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/FileSystem/SMBFileSystem.cs
rename to BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/Providers/SMBFileSystem.cs
index 1a20faa..47f637a 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/FileSystem/SMBFileSystem.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/Providers/SMBFileSystem.cs
@@ -1,4 +1,6 @@
-using SMBLibrary;
+using BetterLyrics.WinUI3.Models;
+using BetterLyrics.WinUI3.Services.FileSystemService;
+using SMBLibrary;
 using SMBLibrary.Client;
 using System;
 using System.Collections.Generic;
@@ -6,7 +8,7 @@ using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace BetterLyrics.WinUI3.Models.FileSystem
+namespace BetterLyrics.WinUI3.Services.FileSystemService.Providers
 {
     public partial class SMBFileSystem : IUnifiedFileSystem
     {
@@ -85,8 +87,6 @@ namespace BetterLyrics.WinUI3.Models.FileSystem
                         Name = item.FileName,
                         FullPath = Path.Combine(queryPath, item.FileName),
                         IsFolder = (item.FileAttributes & SMBLibrary.FileAttributes.Directory) == SMBLibrary.FileAttributes.Directory,
-                        Size = item.AllocationSize,
-                        LastModified = item.LastWriteTime
                     });
                 }
 
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/FileSystem/SMBReadOnlyStream.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/Providers/SMBReadOnlyStream.cs
similarity index 98%
rename from BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/FileSystem/SMBReadOnlyStream.cs
rename to BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/Providers/SMBReadOnlyStream.cs
index ccf66a1..1046fd6 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/FileSystem/SMBReadOnlyStream.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/Providers/SMBReadOnlyStream.cs
@@ -3,7 +3,7 @@ using SMBLibrary.Client;
 using System;
 using System.IO;
 
-namespace BetterLyrics.WinUI3.Models.FileSystem
+namespace BetterLyrics.WinUI3.Services.FileSystemService.Providers
 {
     public partial class SMBReadOnlyStream : Stream
     {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/FileSystem/WebDavFileSystem.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/Providers/WebDavFileSystem.cs
similarity index 94%
rename from BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/FileSystem/WebDavFileSystem.cs
rename to BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/Providers/WebDavFileSystem.cs
index 9ba3947..18d225c 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/FileSystem/WebDavFileSystem.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/Providers/WebDavFileSystem.cs
@@ -1,11 +1,13 @@
-using System;
+using BetterLyrics.WinUI3.Models;
+using BetterLyrics.WinUI3.Services.FileSystemService;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using WebDav;
 
-namespace BetterLyrics.WinUI3.Models.FileSystem
+namespace BetterLyrics.WinUI3.Services.FileSystemService.Providers
 {
     public partial class WebDavFileSystem : IUnifiedFileSystem
     {
@@ -63,8 +65,6 @@ namespace BetterLyrics.WinUI3.Models.FileSystem
                         Name = name,
                         FullPath = res.Uri.ToString(), // WebDAV 需要完整 URI 
                         IsFolder = res.IsCollection,
-                        Size = res.ContentLength ?? 0,
-                        LastModified = res.LastModifiedDate
                     });
                 }
             }
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ar/Resources.resw b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ar/Resources.resw
index 9d35360..ee25b0e 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ar/Resources.resw
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ar/Resources.resw
@@ -59,46 +59,46 @@
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
-  <xsd:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">
       <xsd:complexType>
         <xsd:choice maxOccurs="unbounded">
           <xsd:element name="metadata">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0"/>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
               </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string"/>
-              <xsd:attribute name="type" type="xsd:string"/>
-              <xsd:attribute name="mimetype" type="xsd:string"/>
-              <xsd:attribute ref="xml:space"/>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="assembly">
             <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string"/>
-              <xsd:attribute name="name" type="xsd:string"/>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="data">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2"/>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1"/>
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3"/>
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4"/>
-              <xsd:attribute ref="xml:space"/>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="resheader">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required"/>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
             </xsd:complexType>
           </xsd:element>
         </xsd:choice>
@@ -303,9 +303,6 @@
   <data name="LyricsSearchControlSongInfoMapping.Text" xml:space="preserve">
     <value>تعيين معلومات الأغنية</value>
   </data>
-  <data name="LyricsSearchControlTargetSearchProvider.Header" xml:space="preserve">
-    <value>مزود بحث الكلمات المستهدف</value>
-  </data>
   <data name="LyricsSearchControlTitle.Header" xml:space="preserve">
     <value>العنوان</value>
   </data>
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/de/Resources.resw b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/de/Resources.resw
index 5c6cf1d..dc18230 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/de/Resources.resw
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/de/Resources.resw
@@ -59,46 +59,46 @@
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
-  <xsd:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">
       <xsd:complexType>
         <xsd:choice maxOccurs="unbounded">
           <xsd:element name="metadata">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0"/>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
               </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string"/>
-              <xsd:attribute name="type" type="xsd:string"/>
-              <xsd:attribute name="mimetype" type="xsd:string"/>
-              <xsd:attribute ref="xml:space"/>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="assembly">
             <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string"/>
-              <xsd:attribute name="name" type="xsd:string"/>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="data">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2"/>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1"/>
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3"/>
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4"/>
-              <xsd:attribute ref="xml:space"/>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="resheader">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required"/>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
             </xsd:complexType>
           </xsd:element>
         </xsd:choice>
@@ -303,9 +303,6 @@
   <data name="LyricsSearchControlSongInfoMapping.Text" xml:space="preserve">
     <value>Song-Info-Zuordnung</value>
   </data>
-  <data name="LyricsSearchControlTargetSearchProvider.Header" xml:space="preserve">
-    <value>Ziel-Suchanbieter für Songtexte</value>
-  </data>
   <data name="LyricsSearchControlTitle.Header" xml:space="preserve">
     <value>Titel</value>
   </data>
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/en/Resources.resw b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/en/Resources.resw
index d3f2020..6d3cd5e 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/en/Resources.resw
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/en/Resources.resw
@@ -303,9 +303,6 @@
   <data name="LyricsSearchControlSongInfoMapping.Text" xml:space="preserve">
     <value>Song Info Mapping</value>
   </data>
-  <data name="LyricsSearchControlTargetSearchProvider.Header" xml:space="preserve">
-    <value>Target Lyrics Search Provider</value>
-  </data>
   <data name="LyricsSearchControlTitle.Header" xml:space="preserve">
     <value>Title</value>
   </data>
@@ -652,7 +649,7 @@
     <value>Clear Cache Files</value>
   </data>
   <data name="SettingsPageCloseStatus.Text" xml:space="preserve">
-    <value>Closed</value>
+    <value>Close</value>
   </data>
   <data name="SettingsPageCollapseDropdown.Content" xml:space="preserve">
     <value>Collapse Dropdown</value>
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/es/Resources.resw b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/es/Resources.resw
index 67da87d..27ace95 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/es/Resources.resw
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/es/Resources.resw
@@ -59,46 +59,46 @@
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
-  <xsd:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">
       <xsd:complexType>
         <xsd:choice maxOccurs="unbounded">
           <xsd:element name="metadata">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0"/>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
               </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string"/>
-              <xsd:attribute name="type" type="xsd:string"/>
-              <xsd:attribute name="mimetype" type="xsd:string"/>
-              <xsd:attribute ref="xml:space"/>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="assembly">
             <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string"/>
-              <xsd:attribute name="name" type="xsd:string"/>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="data">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2"/>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1"/>
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3"/>
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4"/>
-              <xsd:attribute ref="xml:space"/>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="resheader">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required"/>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
             </xsd:complexType>
           </xsd:element>
         </xsd:choice>
@@ -303,9 +303,6 @@
   <data name="LyricsSearchControlSongInfoMapping.Text" xml:space="preserve">
     <value>Mapeo de información de la canción</value>
   </data>
-  <data name="LyricsSearchControlTargetSearchProvider.Header" xml:space="preserve">
-    <value>Proveedor de búsqueda de letras de destino</value>
-  </data>
   <data name="LyricsSearchControlTitle.Header" xml:space="preserve">
     <value>Título</value>
   </data>
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/fr/Resources.resw b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/fr/Resources.resw
index a88ff57..d54cbca 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/fr/Resources.resw
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/fr/Resources.resw
@@ -59,46 +59,46 @@
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
-  <xsd:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">
       <xsd:complexType>
         <xsd:choice maxOccurs="unbounded">
           <xsd:element name="metadata">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0"/>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
               </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string"/>
-              <xsd:attribute name="type" type="xsd:string"/>
-              <xsd:attribute name="mimetype" type="xsd:string"/>
-              <xsd:attribute ref="xml:space"/>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="assembly">
             <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string"/>
-              <xsd:attribute name="name" type="xsd:string"/>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="data">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2"/>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1"/>
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3"/>
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4"/>
-              <xsd:attribute ref="xml:space"/>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="resheader">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required"/>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
             </xsd:complexType>
           </xsd:element>
         </xsd:choice>
@@ -303,9 +303,6 @@
   <data name="LyricsSearchControlSongInfoMapping.Text" xml:space="preserve">
     <value>Mappage des informations de la chanson</value>
   </data>
-  <data name="LyricsSearchControlTargetSearchProvider.Header" xml:space="preserve">
-    <value>Fournisseur de recherche de paroles cible</value>
-  </data>
   <data name="LyricsSearchControlTitle.Header" xml:space="preserve">
     <value>Titre</value>
   </data>
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/hi/Resources.resw b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/hi/Resources.resw
index 8777a9c..c323290 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/hi/Resources.resw
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/hi/Resources.resw
@@ -59,46 +59,46 @@
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
-  <xsd:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">
       <xsd:complexType>
         <xsd:choice maxOccurs="unbounded">
           <xsd:element name="metadata">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0"/>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
               </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string"/>
-              <xsd:attribute name="type" type="xsd:string"/>
-              <xsd:attribute name="mimetype" type="xsd:string"/>
-              <xsd:attribute ref="xml:space"/>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="assembly">
             <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string"/>
-              <xsd:attribute name="name" type="xsd:string"/>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="data">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2"/>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1"/>
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3"/>
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4"/>
-              <xsd:attribute ref="xml:space"/>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="resheader">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required"/>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
             </xsd:complexType>
           </xsd:element>
         </xsd:choice>
@@ -303,9 +303,6 @@
   <data name="LyricsSearchControlSongInfoMapping.Text" xml:space="preserve">
     <value>गीत सूचना मैपिंग</value>
   </data>
-  <data name="LyricsSearchControlTargetSearchProvider.Header" xml:space="preserve">
-    <value>लक्ष्य बोल खोज प्रदाता</value>
-  </data>
   <data name="LyricsSearchControlTitle.Header" xml:space="preserve">
     <value>शीर्षक</value>
   </data>
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/id/Resources.resw b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/id/Resources.resw
index 3a64f8e..c7b0fd5 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/id/Resources.resw
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/id/Resources.resw
@@ -59,46 +59,46 @@
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
-  <xsd:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">
       <xsd:complexType>
         <xsd:choice maxOccurs="unbounded">
           <xsd:element name="metadata">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0"/>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
               </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string"/>
-              <xsd:attribute name="type" type="xsd:string"/>
-              <xsd:attribute name="mimetype" type="xsd:string"/>
-              <xsd:attribute ref="xml:space"/>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="assembly">
             <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string"/>
-              <xsd:attribute name="name" type="xsd:string"/>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="data">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2"/>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1"/>
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3"/>
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4"/>
-              <xsd:attribute ref="xml:space"/>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="resheader">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required"/>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
             </xsd:complexType>
           </xsd:element>
         </xsd:choice>
@@ -303,9 +303,6 @@
   <data name="LyricsSearchControlSongInfoMapping.Text" xml:space="preserve">
     <value>Pemetaan Info Lagu</value>
   </data>
-  <data name="LyricsSearchControlTargetSearchProvider.Header" xml:space="preserve">
-    <value>Penyedia Pencarian Lirik Target</value>
-  </data>
   <data name="LyricsSearchControlTitle.Header" xml:space="preserve">
     <value>Judul</value>
   </data>
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ja/Resources.resw b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ja/Resources.resw
index e7eb8e2..abc3d1a 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ja/Resources.resw
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ja/Resources.resw
@@ -59,46 +59,46 @@
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
-  <xsd:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">
       <xsd:complexType>
         <xsd:choice maxOccurs="unbounded">
           <xsd:element name="metadata">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0"/>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
               </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string"/>
-              <xsd:attribute name="type" type="xsd:string"/>
-              <xsd:attribute name="mimetype" type="xsd:string"/>
-              <xsd:attribute ref="xml:space"/>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="assembly">
             <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string"/>
-              <xsd:attribute name="name" type="xsd:string"/>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="data">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2"/>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1"/>
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3"/>
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4"/>
-              <xsd:attribute ref="xml:space"/>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="resheader">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required"/>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
             </xsd:complexType>
           </xsd:element>
         </xsd:choice>
@@ -303,9 +303,6 @@
   <data name="LyricsSearchControlSongInfoMapping.Text" xml:space="preserve">
     <value>楽曲情報マッピング</value>
   </data>
-  <data name="LyricsSearchControlTargetSearchProvider.Header" xml:space="preserve">
-    <value> </value>
-  </data>
   <data name="LyricsSearchControlTitle.Header" xml:space="preserve">
     <value>タイトル</value>
   </data>
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ko/Resources.resw b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ko/Resources.resw
index 620bc57..709eb99 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ko/Resources.resw
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ko/Resources.resw
@@ -59,46 +59,46 @@
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
-  <xsd:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">
       <xsd:complexType>
         <xsd:choice maxOccurs="unbounded">
           <xsd:element name="metadata">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0"/>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
               </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string"/>
-              <xsd:attribute name="type" type="xsd:string"/>
-              <xsd:attribute name="mimetype" type="xsd:string"/>
-              <xsd:attribute ref="xml:space"/>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="assembly">
             <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string"/>
-              <xsd:attribute name="name" type="xsd:string"/>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="data">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2"/>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1"/>
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3"/>
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4"/>
-              <xsd:attribute ref="xml:space"/>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="resheader">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required"/>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
             </xsd:complexType>
           </xsd:element>
         </xsd:choice>
@@ -303,9 +303,6 @@
   <data name="LyricsSearchControlSongInfoMapping.Text" xml:space="preserve">
     <value>곡 정보 매핑</value>
   </data>
-  <data name="LyricsSearchControlTargetSearchProvider.Header" xml:space="preserve">
-    <value>대상 가사 검색 제공자</value>
-  </data>
   <data name="LyricsSearchControlTitle.Header" xml:space="preserve">
     <value>제목</value>
   </data>
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ms/Resources.resw b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ms/Resources.resw
index a6ed20a..223180a 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ms/Resources.resw
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ms/Resources.resw
@@ -59,46 +59,46 @@
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
-  <xsd:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">
       <xsd:complexType>
         <xsd:choice maxOccurs="unbounded">
           <xsd:element name="metadata">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0"/>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
               </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string"/>
-              <xsd:attribute name="type" type="xsd:string"/>
-              <xsd:attribute name="mimetype" type="xsd:string"/>
-              <xsd:attribute ref="xml:space"/>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="assembly">
             <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string"/>
-              <xsd:attribute name="name" type="xsd:string"/>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="data">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2"/>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1"/>
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3"/>
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4"/>
-              <xsd:attribute ref="xml:space"/>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="resheader">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required"/>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
             </xsd:complexType>
           </xsd:element>
         </xsd:choice>
@@ -303,9 +303,6 @@
   <data name="LyricsSearchControlSongInfoMapping.Text" xml:space="preserve">
     <value>Pemetaan Info Lagu</value>
   </data>
-  <data name="LyricsSearchControlTargetSearchProvider.Header" xml:space="preserve">
-    <value>Penyedia Carian Lirik Sasaran</value>
-  </data>
   <data name="LyricsSearchControlTitle.Header" xml:space="preserve">
     <value>Tajuk</value>
   </data>
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/pt/Resources.resw b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/pt/Resources.resw
index a7a91ad..174b79c 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/pt/Resources.resw
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/pt/Resources.resw
@@ -59,46 +59,46 @@
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
-  <xsd:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">
       <xsd:complexType>
         <xsd:choice maxOccurs="unbounded">
           <xsd:element name="metadata">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0"/>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
               </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string"/>
-              <xsd:attribute name="type" type="xsd:string"/>
-              <xsd:attribute name="mimetype" type="xsd:string"/>
-              <xsd:attribute ref="xml:space"/>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="assembly">
             <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string"/>
-              <xsd:attribute name="name" type="xsd:string"/>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="data">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2"/>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1"/>
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3"/>
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4"/>
-              <xsd:attribute ref="xml:space"/>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="resheader">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required"/>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
             </xsd:complexType>
           </xsd:element>
         </xsd:choice>
@@ -303,9 +303,6 @@
   <data name="LyricsSearchControlSongInfoMapping.Text" xml:space="preserve">
     <value>Mapeamento de Informações da Música</value>
   </data>
-  <data name="LyricsSearchControlTargetSearchProvider.Header" xml:space="preserve">
-    <value>Fornecedor de Pesquisa de Letras Alvo</value>
-  </data>
   <data name="LyricsSearchControlTitle.Header" xml:space="preserve">
     <value>Título</value>
   </data>
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ru/Resources.resw b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ru/Resources.resw
index 185ac51..fa07bc7 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ru/Resources.resw
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ru/Resources.resw
@@ -59,46 +59,46 @@
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
-  <xsd:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">
       <xsd:complexType>
         <xsd:choice maxOccurs="unbounded">
           <xsd:element name="metadata">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0"/>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
               </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string"/>
-              <xsd:attribute name="type" type="xsd:string"/>
-              <xsd:attribute name="mimetype" type="xsd:string"/>
-              <xsd:attribute ref="xml:space"/>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="assembly">
             <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string"/>
-              <xsd:attribute name="name" type="xsd:string"/>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="data">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2"/>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1"/>
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3"/>
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4"/>
-              <xsd:attribute ref="xml:space"/>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="resheader">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required"/>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
             </xsd:complexType>
           </xsd:element>
         </xsd:choice>
@@ -303,9 +303,6 @@
   <data name="LyricsSearchControlSongInfoMapping.Text" xml:space="preserve">
     <value>Сопоставление информации о песне</value>
   </data>
-  <data name="LyricsSearchControlTargetSearchProvider.Header" xml:space="preserve">
-    <value>Целевой поставщик поиска текста</value>
-  </data>
   <data name="LyricsSearchControlTitle.Header" xml:space="preserve">
     <value>Название</value>
   </data>
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/th/Resources.resw b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/th/Resources.resw
index 3c3a6c5..9d66f78 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/th/Resources.resw
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/th/Resources.resw
@@ -59,46 +59,46 @@
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
-  <xsd:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">
       <xsd:complexType>
         <xsd:choice maxOccurs="unbounded">
           <xsd:element name="metadata">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0"/>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
               </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string"/>
-              <xsd:attribute name="type" type="xsd:string"/>
-              <xsd:attribute name="mimetype" type="xsd:string"/>
-              <xsd:attribute ref="xml:space"/>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="assembly">
             <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string"/>
-              <xsd:attribute name="name" type="xsd:string"/>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="data">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2"/>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1"/>
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3"/>
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4"/>
-              <xsd:attribute ref="xml:space"/>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="resheader">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required"/>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
             </xsd:complexType>
           </xsd:element>
         </xsd:choice>
@@ -303,9 +303,6 @@
   <data name="LyricsSearchControlSongInfoMapping.Text" xml:space="preserve">
     <value>การจับคู่ข้อมูลเพลง</value>
   </data>
-  <data name="LyricsSearchControlTargetSearchProvider.Header" xml:space="preserve">
-    <value>ผู้ให้บริการค้นหาเนื้อเพลงเป้าหมาย</value>
-  </data>
   <data name="LyricsSearchControlTitle.Header" xml:space="preserve">
     <value>ชื่อเพลง</value>
   </data>
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/vi/Resources.resw b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/vi/Resources.resw
index 1b657c8..e8aff97 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/vi/Resources.resw
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/vi/Resources.resw
@@ -59,46 +59,46 @@
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
-  <xsd:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">
       <xsd:complexType>
         <xsd:choice maxOccurs="unbounded">
           <xsd:element name="metadata">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0"/>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
               </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string"/>
-              <xsd:attribute name="type" type="xsd:string"/>
-              <xsd:attribute name="mimetype" type="xsd:string"/>
-              <xsd:attribute ref="xml:space"/>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="assembly">
             <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string"/>
-              <xsd:attribute name="name" type="xsd:string"/>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="data">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2"/>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1"/>
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3"/>
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4"/>
-              <xsd:attribute ref="xml:space"/>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="resheader">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required"/>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
             </xsd:complexType>
           </xsd:element>
         </xsd:choice>
@@ -303,9 +303,6 @@
   <data name="LyricsSearchControlSongInfoMapping.Text" xml:space="preserve">
     <value>Ánh xạ thông tin bài hát</value>
   </data>
-  <data name="LyricsSearchControlTargetSearchProvider.Header" xml:space="preserve">
-    <value>Nhà cung cấp tìm kiếm lời bài hát mục tiêu</value>
-  </data>
   <data name="LyricsSearchControlTitle.Header" xml:space="preserve">
     <value>Tiêu đề</value>
   </data>
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-Hans/Resources.resw b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-Hans/Resources.resw
index a2a5cc7..323f7c7 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-Hans/Resources.resw
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-Hans/Resources.resw
@@ -59,46 +59,46 @@
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
-  <xsd:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">
       <xsd:complexType>
         <xsd:choice maxOccurs="unbounded">
           <xsd:element name="metadata">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0"/>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
               </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string"/>
-              <xsd:attribute name="type" type="xsd:string"/>
-              <xsd:attribute name="mimetype" type="xsd:string"/>
-              <xsd:attribute ref="xml:space"/>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="assembly">
             <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string"/>
-              <xsd:attribute name="name" type="xsd:string"/>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="data">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2"/>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1"/>
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3"/>
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4"/>
-              <xsd:attribute ref="xml:space"/>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="resheader">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required"/>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
             </xsd:complexType>
           </xsd:element>
         </xsd:choice>
@@ -303,9 +303,6 @@
   <data name="LyricsSearchControlSongInfoMapping.Text" xml:space="preserve">
     <value>歌曲信息映射</value>
   </data>
-  <data name="LyricsSearchControlTargetSearchProvider.Header" xml:space="preserve">
-    <value>目标歌词搜索提供方</value>
-  </data>
   <data name="LyricsSearchControlTitle.Header" xml:space="preserve">
     <value>标题</value>
   </data>
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-Hant/Resources.resw b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-Hant/Resources.resw
index 12f9fa5..2286718 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-Hant/Resources.resw
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-Hant/Resources.resw
@@ -59,46 +59,46 @@
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
-  <xsd:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">
       <xsd:complexType>
         <xsd:choice maxOccurs="unbounded">
           <xsd:element name="metadata">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0"/>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
               </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string"/>
-              <xsd:attribute name="type" type="xsd:string"/>
-              <xsd:attribute name="mimetype" type="xsd:string"/>
-              <xsd:attribute ref="xml:space"/>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="assembly">
             <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string"/>
-              <xsd:attribute name="name" type="xsd:string"/>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="data">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2"/>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1"/>
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3"/>
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4"/>
-              <xsd:attribute ref="xml:space"/>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="resheader">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required"/>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
             </xsd:complexType>
           </xsd:element>
         </xsd:choice>
@@ -303,9 +303,6 @@
   <data name="LyricsSearchControlSongInfoMapping.Text" xml:space="preserve">
     <value>歌曲資訊對應</value>
   </data>
-  <data name="LyricsSearchControlTargetSearchProvider.Header" xml:space="preserve">
-    <value>目標歌詞搜尋提供者</value>
-  </data>
   <data name="LyricsSearchControlTitle.Header" xml:space="preserve">
     <value>標題</value>
   </data>
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/MusicGalleryPageViewModel.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/MusicGalleryPageViewModel.cs
index 6a0d390..06d723e 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/MusicGalleryPageViewModel.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/MusicGalleryPageViewModel.cs
@@ -5,6 +5,7 @@ using BetterLyrics.WinUI3.Extensions;
 using BetterLyrics.WinUI3.Helper;
 using BetterLyrics.WinUI3.Models;
 using BetterLyrics.WinUI3.Models.Settings;
+using BetterLyrics.WinUI3.Services.FileSystemService;
 using BetterLyrics.WinUI3.Services.LibWatcherService;
 using BetterLyrics.WinUI3.Services.LocalizationService;
 using BetterLyrics.WinUI3.Services.SettingsService;
@@ -289,11 +290,18 @@ namespace BetterLyrics.WinUI3.ViewModels
 
                             try
                             {
-                                using var fs = folder.CreateFileSystem();
+                                // 1. 创建底层的驱动 (FTP/SMB/Local)
+                                // 注意：这里我们使用 using 确保用完销毁连接
+                                using var rawFs = folder.CreateFileSystem();
+                                if (rawFs == null) continue;
 
-                                if (fs == null) continue;
+                                // 2. 【关键】将驱动包装进 Service
+                                // 这样你就拥有了：缓存能力 + 后台静默更新能力
+                                // 建议：如果 DatabaseManager 是单例，最好将其注入进去，这里直接 new 为了演示方便
+                                var fileService = new FileSystemService(rawFs);
 
-                                if (!await fs.ConnectAsync()) continue;
+                                // 初始化数据库连接 (如果没有在构造函数里做)
+                                await fileService.InitializeAsync();
 
                                 // 递归扫描队列
                                 var foldersToScan = new Queue<string>();
@@ -302,13 +310,17 @@ namespace BetterLyrics.WinUI3.ViewModels
                                 while (foldersToScan.Count > 0)
                                 {
                                     var currentPath = foldersToScan.Dequeue();
-                                    var items = await fs.GetFilesAsync(currentPath);
+
+                                    // 3. 【提速】这里改用 Service 获取文件列表
+                                    // 第一次运行会走网络，第二次运行直接读本地 SQLite，毫秒级响应
+                                    var items = await fileService.GetFilesAsync(currentPath);
 
                                     foreach (var item in items)
                                     {
                                         if (item.IsFolder)
                                         {
-                                            foldersToScan.Enqueue(Path.Combine(currentPath, item.Name));
+                                            // 文件夹：加入队列继续递归
+                                            foldersToScan.Enqueue(item.FullPath);
                                             continue;
                                         }
 
@@ -317,16 +329,18 @@ namespace BetterLyrics.WinUI3.ViewModels
                                         {
                                             try
                                             {
-                                                using (var stream = await fs.OpenReadAsync(item.FullPath))
+                                                // 4. 读取文件流 (解析 ID3 信息)
+                                                // 注意：这里目前还是瓶颈，因为每次都要读文件头
+                                                // 优化方向：将 Title/Artist 也存入 SQLite，跳过这一步
+                                                using (var stream = await fileService.OpenFileAsync(item))
                                                 {
+                                                    // 这里的 item 是 UnifiedFileItem (Model)，正是 Service 返回的类型
                                                     ExtendedTrack track = new ExtendedTrack(item.FullPath, stream);
 
                                                     if (track.Duration > 0)
                                                     {
-                                                        // 读取专辑图写入内存
-                                                        // 因为此后该流将关闭无法再次访问
+                                                        // 读取专辑图到内存 (因为流马上要关闭)
                                                         _ = track.EmbeddedPictures;
-
                                                         _tracks.Add(track);
                                                     }
                                                 }
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/NowPlayingBarViewModel.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/NowPlayingBarViewModel.cs
index 9ad6405..aec9dbd 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/NowPlayingBarViewModel.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/NowPlayingBarViewModel.cs
@@ -1,4 +1,5 @@
-using BetterLyrics.WinUI3.Hooks;
+using BetterLyrics.WinUI3.Extensions;
+using BetterLyrics.WinUI3.Hooks;
 using BetterLyrics.WinUI3.Models;
 using BetterLyrics.WinUI3.Services.MediaSessionsService;
 using BetterLyrics.WinUI3.Views;
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/NowPlayingWindow.xaml.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/NowPlayingWindow.xaml.cs
index 055a24d..3953bcd 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/NowPlayingWindow.xaml.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/NowPlayingWindow.xaml.cs
@@ -548,6 +548,10 @@ namespace BetterLyrics.WinUI3.Views
                 {
                     OnWorkAreaChanged();
                 }
+                else if (message.PropertyName == nameof(LyricsWindowStatus.Name))
+                {
+                    this.Title = $"{LyricsWindowStatus.Name} - {Constants.App.AppName}";
+                }
             }
         }