diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3 (Package)/BetterLyrics.WinUI3 (Package).wapproj b/BetterLyrics.WinUI3/BetterLyrics.WinUI3 (Package)/BetterLyrics.WinUI3 (Package).wapproj
index a09f60b..bff3eaf 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3 (Package)/BetterLyrics.WinUI3 (Package).wapproj	
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3 (Package)/BetterLyrics.WinUI3 (Package).wapproj	
@@ -53,27 +53,27 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <AppxBundle>Always</AppxBundle>
-    <DefaultLanguage>en-US</DefaultLanguage>
+    <DefaultLanguage>en</DefaultLanguage>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
     <AppxBundle>Always</AppxBundle>
-    <DefaultLanguage>en-US</DefaultLanguage>
+    <DefaultLanguage>en</DefaultLanguage>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
     <AppxBundle>Always</AppxBundle>
-    <DefaultLanguage>en-US</DefaultLanguage>
+    <DefaultLanguage>en</DefaultLanguage>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <AppxBundle>Always</AppxBundle>
-    <DefaultLanguage>en-US</DefaultLanguage>
+    <DefaultLanguage>en</DefaultLanguage>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
     <AppxBundle>Always</AppxBundle>
-    <DefaultLanguage>en-US</DefaultLanguage>
+    <DefaultLanguage>en</DefaultLanguage>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
     <AppxBundle>Always</AppxBundle>
-    <DefaultLanguage>en-US</DefaultLanguage>
+    <DefaultLanguage>en</DefaultLanguage>
   </PropertyGroup>
   <ItemGroup>
     <AppxManifest Include="Package.appxmanifest">
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3 (Package)/Package.appxmanifest b/BetterLyrics.WinUI3/BetterLyrics.WinUI3 (Package)/Package.appxmanifest
index e5a0ed7..c50242c 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3 (Package)/Package.appxmanifest	
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3 (Package)/Package.appxmanifest	
@@ -12,7 +12,7 @@
 	<Identity
 	  Name="37412.BetterLyrics"
 	  Publisher="CN=E1428B0E-DC1D-4EA4-ACB1-4556569D5BA9"
-	  Version="1.1.214.0" />
+	  Version="1.1.217.0" />
 
 	<mp:PhoneIdentity PhoneProductId="ca4a4830-fc19-40d9-b823-53e2bff3d816" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
 
@@ -28,7 +28,15 @@
 	</Dependencies>
 
 	<Resources>
-		<Resource Language="x-generate"/>
+		<Resource Language="de"/>
+		<Resource Language="en"/>
+		<Resource Language="es"/>
+		<Resource Language="fr"/>
+		<Resource Language="ja"/>
+		<Resource Language="ko"/>
+		<Resource Language="ru"/>
+		<Resource Language="zh-Hans"/>
+		<Resource Language="zh-Hant"/>
 	</Resources>
 
 	<Applications>
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/BetterLyrics.WinUI3.csproj b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/BetterLyrics.WinUI3.csproj
index a4d078b..8bad302 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/BetterLyrics.WinUI3.csproj
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/BetterLyrics.WinUI3.csproj
@@ -10,6 +10,7 @@
 		<Nullable>enable</Nullable>
 		<LangVersion>preview</LangVersion>
 		<BuiltInComInteropSupport>true</BuiltInComInteropSupport>
+		<AppxDefaultResourceQualifiers>Language=de;en;es;fr;ja;ko;ru;zh-Hans;zh-Hant;</AppxDefaultResourceQualifiers>
 	</PropertyGroup>
 	<ItemGroup>
 		<Compile Remove="TemplateSelector\**" />
@@ -387,25 +388,25 @@
 	  </Page>
 	</ItemGroup>
 	<ItemGroup>
-	  <PRIResource Update="Strings\de-DE\Resources.resw">
+	  <PRIResource Update="Strings\de\Resources.resw">
 		  <Generator></Generator>
 	  </PRIResource>
-	  <PRIResource Update="Strings\en-US\Resources.resw">
+	  <PRIResource Update="Strings\en\Resources.resw">
 		  <Generator></Generator>
 	  </PRIResource>
-	  <PRIResource Update="Strings\es-ES\Resources.resw">
+	  <PRIResource Update="Strings\es\Resources.resw">
 		  <Generator></Generator>
 	  </PRIResource>
-	  <PRIResource Update="Strings\fr-FR\Resources.resw">
+	  <PRIResource Update="Strings\fr\Resources.resw">
 		  <Generator></Generator>
 	  </PRIResource>
-	  <PRIResource Update="Strings\ja-JP\Resources.resw">
+	  <PRIResource Update="Strings\ja\Resources.resw">
 		  <Generator></Generator>
 	  </PRIResource>
-	  <PRIResource Update="Strings\ko-KR\Resources.resw">
+	  <PRIResource Update="Strings\ko\Resources.resw">
 		  <Generator></Generator>
 	  </PRIResource>
-	  <PRIResource Update="Strings\ru-RU\Resources.resw">
+	  <PRIResource Update="Strings\ru\Resources.resw">
 		  <Generator></Generator>
 	  </PRIResource>
 	  <PRIResource Update="Strings\zh-Hans\Resources.resw">
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/LanguageHelper.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/LanguageHelper.cs
index 7fbf1a4..9244d7a 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/LanguageHelper.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/LanguageHelper.cs
@@ -95,13 +95,13 @@ namespace BetterLyrics.WinUI3.Helper
         public static List<ExtendedLanguage> SupportedDisplayLanguages { get; set; } =
         [
             new ExtendedLanguage(CultureInfo.CurrentUICulture.Name, _localizationService.GetLocalizedString("SettingsPageSystemLanguage")),
-            new ExtendedLanguage("de-DE"),
-            new ExtendedLanguage("en-US"),
-            new ExtendedLanguage("es-ES"),
-            new ExtendedLanguage("fr-FR"),
-            new ExtendedLanguage("ja-JP"),
-            new ExtendedLanguage("ko-KR"),
-            new ExtendedLanguage("ru-RU"),
+            new ExtendedLanguage("de"),
+            new ExtendedLanguage("en"),
+            new ExtendedLanguage("es"),
+            new ExtendedLanguage("fr"),
+            new ExtendedLanguage("ja"),
+            new ExtendedLanguage("ko"),
+            new ExtendedLanguage("ru"),
             new ExtendedLanguage("zh-Hans"),
             new ExtendedLanguage("zh-Hant"),
         ];
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/de-DE/Resources.resw b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/de/Resources.resw
similarity index 100%
rename from BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/de-DE/Resources.resw
rename to BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/de/Resources.resw
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/en-US/Resources.resw b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/en/Resources.resw
similarity index 100%
rename from BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/en-US/Resources.resw
rename to BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/en/Resources.resw
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/es-ES/Resources.resw b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/es/Resources.resw
similarity index 100%
rename from BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/es-ES/Resources.resw
rename to BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/es/Resources.resw
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/fr-FR/Resources.resw b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/fr/Resources.resw
similarity index 100%
rename from BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/fr-FR/Resources.resw
rename to BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/fr/Resources.resw
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ja-JP/Resources.resw b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ja/Resources.resw
similarity index 100%
rename from BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ja-JP/Resources.resw
rename to BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ja/Resources.resw
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ko-KR/Resources.resw b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ko/Resources.resw
similarity index 100%
rename from BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ko-KR/Resources.resw
rename to BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ko/Resources.resw
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ru-RU/Resources.resw b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ru/Resources.resw
similarity index 100%
rename from BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ru-RU/Resources.resw
rename to BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ru/Resources.resw