diff --git a/app/src/main/java/com/drdisagree/iconify/ui/fragments/Home.java b/app/src/main/java/com/drdisagree/iconify/ui/fragments/Home.java
index 0364d3e97..3cd12fce8 100644
--- a/app/src/main/java/com/drdisagree/iconify/ui/fragments/Home.java
+++ b/app/src/main/java/com/drdisagree/iconify/ui/fragments/Home.java
@@ -283,7 +283,7 @@ protected void onPostExecute(String jsonStr) {
                                 Intent intent = new Intent(requireActivity(), AppUpdates.class);
                                 startActivity(intent);
                             });
-                            update_desc.setText(getResources().getString(R.string.update_dialog_desc).replace("{latestVersionName}", latestVersion.getString("versionName")));
+                            update_desc.setText(getResources().getString(R.string.update_dialog_desc, latestVersion.getString("versionName")));
                             check_update.setVisibility(View.VISIBLE);
                         }
                     }
diff --git a/app/src/main/java/com/drdisagree/iconify/ui/fragments/QsPanel.java b/app/src/main/java/com/drdisagree/iconify/ui/fragments/QsPanel.java
index a7c27a693..fb19d872d 100644
--- a/app/src/main/java/com/drdisagree/iconify/ui/fragments/QsPanel.java
+++ b/app/src/main/java/com/drdisagree/iconify/ui/fragments/QsPanel.java
@@ -54,8 +54,8 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
     private MenuAdapter initActivityItems() {
         ArrayList<MenuModel> qspanel_activity_list = new ArrayList<>();
 
-        qspanel_activity_list.add(new MenuModel(QsRowColumn.class, getResources().getString(R.string.row_and_column_title), getResources().getString(R.string.row_and_column_desc), R.drawable.ic_qs_row_column));
-        qspanel_activity_list.add(new MenuModel(QsIconLabel.class, getResources().getString(R.string.icon_and_label_title), getResources().getString(R.string.icon_and_label_desc), R.drawable.ic_qs_icon_and_label));
+        qspanel_activity_list.add(new MenuModel(QsRowColumn.class, getResources().getString(R.string.activity_title_qs_row_column), getResources().getString(R.string.activity_desc_qs_row_column), R.drawable.ic_qs_row_column));
+        qspanel_activity_list.add(new MenuModel(QsIconLabel.class, getResources().getString(R.string.activity_title_qs_icon_label), getResources().getString(R.string.activity_desc_qs_icon_label), R.drawable.ic_qs_icon_and_label));
         qspanel_activity_list.add(new MenuModel(QsTileSize.class, getResources().getString(R.string.activity_title_qs_tile_size), getResources().getString(R.string.activity_desc_qs_tile_size), R.drawable.ic_qs_tile_size));
         qspanel_activity_list.add(new MenuModel(QsPanelMargin.class, getResources().getString(R.string.activity_title_qs_panel_margin), getResources().getString(R.string.activity_desc_qs_panel_margin), R.drawable.ic_qs_top_margin));
 
diff --git a/app/src/main/java/com/drdisagree/iconify/ui/fragments/Settings.java b/app/src/main/java/com/drdisagree/iconify/ui/fragments/Settings.java
index a306a84d4..a1caecfa1 100644
--- a/app/src/main/java/com/drdisagree/iconify/ui/fragments/Settings.java
+++ b/app/src/main/java/com/drdisagree/iconify/ui/fragments/Settings.java
@@ -166,19 +166,19 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
         int current_language = Arrays.asList(getResources().getStringArray(R.array.locale_code)).indexOf(Prefs.getString(APP_LANGUAGE, getResources().getConfiguration().getLocales().get(0).getLanguage()));
         rd_app_language = new RadioDialog(requireActivity(), 0, current_language == -1 ? 0 : current_language);
         rd_app_language.setRadioDialogListener(this);
-        binding.settingsGeneral.appLanguage.setOnClickListener(v -> rd_app_language.show(R.string.app_language, R.array.locale_name, binding.settingsGeneral.selectedAppLanguage));
+        binding.settingsGeneral.appLanguage.setOnClickListener(v -> rd_app_language.show(R.string.settings_app_language, R.array.locale_name, binding.settingsGeneral.selectedAppLanguage));
         binding.settingsGeneral.selectedAppLanguage.setText(Arrays.asList(getResources().getStringArray(R.array.locale_name)).get(rd_app_language.getSelectedIndex()));
 
         // App Icon
         rd_app_icon = new RadioDialog(requireActivity(), 2, Prefs.getInt(APP_ICON, 0));
         rd_app_icon.setRadioDialogListener(this);
-        binding.settingsGeneral.appIcon.setOnClickListener(v -> rd_app_icon.show(R.string.app_icon, R.array.app_icon, binding.settingsGeneral.selectedAppIcon));
+        binding.settingsGeneral.appIcon.setOnClickListener(v -> rd_app_icon.show(R.string.settings_app_icon, R.array.app_icon, binding.settingsGeneral.selectedAppIcon));
         binding.settingsGeneral.selectedAppIcon.setText(Arrays.asList(getResources().getStringArray(R.array.app_icon)).get(rd_app_icon.getSelectedIndex()));
 
         // App Theme
         rd_app_theme = new RadioDialog(requireActivity(), 1, Prefs.getInt(APP_THEME, 2));
         rd_app_theme.setRadioDialogListener(this);
-        binding.settingsGeneral.appTheme.setOnClickListener(v -> rd_app_theme.show(R.string.app_theme, R.array.app_theme, binding.settingsGeneral.selectedAppTheme));
+        binding.settingsGeneral.appTheme.setOnClickListener(v -> rd_app_theme.show(R.string.settings_app_theme, R.array.app_theme, binding.settingsGeneral.selectedAppTheme));
         binding.settingsGeneral.selectedAppTheme.setText(Arrays.asList(getResources().getStringArray(R.array.app_theme)).get(rd_app_theme.getSelectedIndex()));
 
         // Check for update
@@ -200,16 +200,16 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
         binding.settingsXposed.restartSystemuiBehavior.setOnCheckedChangeListener((buttonView, isChecked) -> {
             Prefs.putBoolean(RESTART_SYSUI_BEHAVIOR, isChecked);
             if (isChecked) {
-                binding.settingsXposed.restartSystemuiBehaviorDesc.setText(getResources().getString(R.string.auto_restart_systemui));
+                binding.settingsXposed.restartSystemuiBehaviorDesc.setText(getResources().getString(R.string.settings_auto_restart_systemui));
             } else {
-                binding.settingsXposed.restartSystemuiBehaviorDesc.setText(getResources().getString(R.string.manual_restart_systemui));
+                binding.settingsXposed.restartSystemuiBehaviorDesc.setText(getResources().getString(R.string.settings_manual_restart_systemui));
             }
         });
         binding.settingsXposed.restartSystemuiBehaviorContainer.setOnClickListener(v -> binding.settingsXposed.restartSystemuiBehavior.toggle());
         if (binding.settingsXposed.restartSystemuiBehavior.isChecked()) {
-            binding.settingsXposed.restartSystemuiBehaviorDesc.setText(getResources().getString(R.string.auto_restart_systemui));
+            binding.settingsXposed.restartSystemuiBehaviorDesc.setText(getResources().getString(R.string.settings_auto_restart_systemui));
         } else {
-            binding.settingsXposed.restartSystemuiBehaviorDesc.setText(getResources().getString(R.string.manual_restart_systemui));
+            binding.settingsXposed.restartSystemuiBehaviorDesc.setText(getResources().getString(R.string.settings_manual_restart_systemui));
         }
 
         // Restart sysui after boot
diff --git a/app/src/main/java/com/drdisagree/iconify/ui/fragments/Tweaks.java b/app/src/main/java/com/drdisagree/iconify/ui/fragments/Tweaks.java
index 5804e0e88..361e899a0 100644
--- a/app/src/main/java/com/drdisagree/iconify/ui/fragments/Tweaks.java
+++ b/app/src/main/java/com/drdisagree/iconify/ui/fragments/Tweaks.java
@@ -71,8 +71,8 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
             }
         }, getResources().getString(R.string.activity_title_color_engine), getResources().getString(R.string.activity_desc_color_engine), R.drawable.ic_tweaks_color});
         tweaks_list.add(new Object[]{UiRoundness.class, getResources().getString(R.string.activity_title_ui_roundness), getResources().getString(R.string.activity_desc_ui_roundness), R.drawable.ic_tweaks_roundness});
-        tweaks_list.add(new Object[]{QsRowColumn.class, getResources().getString(R.string.row_and_column_title), getResources().getString(R.string.row_and_column_desc), R.drawable.ic_qs_row_column});
-        tweaks_list.add(new Object[]{QsIconLabel.class, getResources().getString(R.string.icon_and_label_title), getResources().getString(R.string.icon_and_label_desc), R.drawable.ic_qs_icon_and_label});
+        tweaks_list.add(new Object[]{QsRowColumn.class, getResources().getString(R.string.activity_title_qs_row_column), getResources().getString(R.string.activity_desc_qs_row_column), R.drawable.ic_qs_row_column});
+        tweaks_list.add(new Object[]{QsIconLabel.class, getResources().getString(R.string.activity_title_qs_icon_label), getResources().getString(R.string.activity_desc_qs_icon_label), R.drawable.ic_qs_icon_and_label});
         tweaks_list.add(new Object[]{QsTileSize.class, getResources().getString(R.string.activity_title_qs_tile_size), getResources().getString(R.string.activity_desc_qs_tile_size), R.drawable.ic_qs_tile_size});
         tweaks_list.add(new Object[]{QsPanelMargin.class, getResources().getString(R.string.activity_title_qs_panel_margin), getResources().getString(R.string.activity_desc_qs_panel_margin), R.drawable.ic_qs_top_margin});
         tweaks_list.add(new Object[]{Statusbar.class, getResources().getString(R.string.activity_title_statusbar), getResources().getString(R.string.activity_desc_statusbar), R.drawable.ic_tweaks_statusbar});
diff --git a/app/src/main/java/com/drdisagree/iconify/utils/SystemUtil.java b/app/src/main/java/com/drdisagree/iconify/utils/SystemUtil.java
index c5f55a6a7..eba3b6565 100644
--- a/app/src/main/java/com/drdisagree/iconify/utils/SystemUtil.java
+++ b/app/src/main/java/com/drdisagree/iconify/utils/SystemUtil.java
@@ -58,7 +58,7 @@ public static void handleSystemUIRestart() {
         if (Prefs.getBoolean(RESTART_SYSUI_BEHAVIOR, true)) {
             restartSystemUI();
         } else {
-            Toast.makeText(Iconify.getAppContext(), Objects.requireNonNull(Iconify.getAppContext()).getResources().getString(R.string.systemui_restart_required), Toast.LENGTH_SHORT).show();
+            Toast.makeText(Iconify.getAppContext(), Objects.requireNonNull(Iconify.getAppContext()).getResources().getString(R.string.settings_systemui_restart_required), Toast.LENGTH_SHORT).show();
         }
     }
 
diff --git a/app/src/main/res/layout/activity_app_updates.xml b/app/src/main/res/layout/activity_app_updates.xml
index 2254dd713..3a1eb0316 100644
--- a/app/src/main/res/layout/activity_app_updates.xml
+++ b/app/src/main/res/layout/activity_app_updates.xml
@@ -215,7 +215,7 @@
                 android:layout_marginHorizontal="24dp"
                 android:layout_marginTop="20dp"
                 android:layout_marginBottom="8dp"
-                android:text="@string/schedule"
+                android:text="@string/section_title_schedule"
                 android:textColor="?attr/colorPrimary" />
 
             <RelativeLayout
diff --git a/app/src/main/res/layout/activity_media_player.xml b/app/src/main/res/layout/activity_media_player.xml
index 1ca422a51..66aeca9c6 100644
--- a/app/src/main/res/layout/activity_media_player.xml
+++ b/app/src/main/res/layout/activity_media_player.xml
@@ -45,7 +45,7 @@
                 android:layout_marginHorizontal="24dp"
                 android:layout_marginTop="20dp"
                 android:layout_marginBottom="8dp"
-                android:text="@string/media_player_background_color"
+                android:text="@string/section_title_background_color"
                 android:textColor="?attr/colorPrimary" />
 
             <RelativeLayout
diff --git a/app/src/main/res/layout/activity_miscellaneous.xml b/app/src/main/res/layout/activity_miscellaneous.xml
index 46926b406..2a7ddac28 100644
--- a/app/src/main/res/layout/activity_miscellaneous.xml
+++ b/app/src/main/res/layout/activity_miscellaneous.xml
@@ -28,7 +28,7 @@
                 android:layout_marginHorizontal="24dp"
                 android:layout_marginTop="20dp"
                 android:layout_marginBottom="8dp"
-                android:text="@string/tablet_mode"
+                android:text="@string/section_title_tablet_mode"
                 android:textColor="?attr/colorPrimary" />
 
             <RelativeLayout
@@ -167,7 +167,7 @@
                 android:layout_marginHorizontal="24dp"
                 android:layout_marginTop="20dp"
                 android:layout_marginBottom="8dp"
-                android:text="@string/privacy_chip"
+                android:text="@string/section_title_privacy_chip"
                 android:textColor="?attr/colorPrimary" />
 
             <RelativeLayout
diff --git a/app/src/main/res/layout/activity_navigation_bar.xml b/app/src/main/res/layout/activity_navigation_bar.xml
index 635c89ca2..940bdf90a 100644
--- a/app/src/main/res/layout/activity_navigation_bar.xml
+++ b/app/src/main/res/layout/activity_navigation_bar.xml
@@ -28,7 +28,7 @@
                 android:layout_marginHorizontal="24dp"
                 android:layout_marginTop="20dp"
                 android:layout_marginBottom="8dp"
-                android:text="@string/display_mode"
+                android:text="@string/section_title_display_mode"
                 android:textColor="?attr/colorPrimary" />
 
             <RelativeLayout
@@ -210,7 +210,7 @@
                 android:layout_marginHorizontal="24dp"
                 android:layout_marginTop="20dp"
                 android:layout_marginBottom="8dp"
-                android:text="@string/buttons"
+                android:text="@string/section_title_buttons"
                 android:textColor="?attr/colorPrimary" />
 
             <RelativeLayout
@@ -263,7 +263,7 @@
                 android:layout_marginHorizontal="24dp"
                 android:layout_marginTop="20dp"
                 android:layout_marginBottom="8dp"
-                android:text="@string/gesture"
+                android:text="@string/section_title_gesture"
                 android:textColor="?attr/colorPrimary" />
 
             <RelativeLayout
@@ -402,7 +402,7 @@
                 android:layout_marginHorizontal="24dp"
                 android:layout_marginTop="20dp"
                 android:layout_marginBottom="8dp"
-                android:text="@string/pill_navigation"
+                android:text="@string/section_title_pill_navigation"
                 android:textColor="?attr/colorPrimary" />
 
             <RelativeLayout
diff --git a/app/src/main/res/layout/activity_qs_icon_label.xml b/app/src/main/res/layout/activity_qs_icon_label.xml
index 2e802be07..8d36c7c5a 100644
--- a/app/src/main/res/layout/activity_qs_icon_label.xml
+++ b/app/src/main/res/layout/activity_qs_icon_label.xml
@@ -28,7 +28,7 @@
                 android:layout_marginHorizontal="24dp"
                 android:layout_marginTop="20dp"
                 android:layout_marginBottom="8dp"
-                android:text="@string/size_and_position"
+                android:text="@string/section_title_size_and_position"
                 android:textColor="?attr/colorPrimary" />
 
             <RelativeLayout
diff --git a/app/src/main/res/layout/activity_qs_panel_margin.xml b/app/src/main/res/layout/activity_qs_panel_margin.xml
index ee34023e6..a9107cadd 100644
--- a/app/src/main/res/layout/activity_qs_panel_margin.xml
+++ b/app/src/main/res/layout/activity_qs_panel_margin.xml
@@ -27,7 +27,7 @@
                 android:layout_marginHorizontal="24dp"
                 android:layout_marginTop="20dp"
                 android:layout_marginBottom="8dp"
-                android:text="@string/portrait_mode"
+                android:text="@string/section_title_portrait"
                 android:textColor="?attr/colorPrimary" />
 
             <LinearLayout
@@ -111,7 +111,7 @@
                 android:layout_marginHorizontal="24dp"
                 android:layout_marginTop="20dp"
                 android:layout_marginBottom="8dp"
-                android:text="@string/landscape_mode"
+                android:text="@string/section_title_landscape"
                 android:textColor="?attr/colorPrimary" />
 
             <LinearLayout
diff --git a/app/src/main/res/layout/activity_qs_tile_size.xml b/app/src/main/res/layout/activity_qs_tile_size.xml
index 379d1d130..18df70a65 100644
--- a/app/src/main/res/layout/activity_qs_tile_size.xml
+++ b/app/src/main/res/layout/activity_qs_tile_size.xml
@@ -27,7 +27,7 @@
                 android:layout_marginHorizontal="24dp"
                 android:layout_marginTop="20dp"
                 android:layout_marginBottom="8dp"
-                android:text="@string/portrait_mode"
+                android:text="@string/section_title_portrait"
                 android:textColor="?attr/colorPrimary" />
 
             <LinearLayout
@@ -151,7 +151,7 @@
                 android:layout_marginHorizontal="24dp"
                 android:layout_marginTop="20dp"
                 android:layout_marginBottom="8dp"
-                android:text="@string/landscape_mode"
+                android:text="@string/section_title_landscape"
                 android:textColor="?attr/colorPrimary" />
 
             <LinearLayout
diff --git a/app/src/main/res/layout/activity_statusbar.xml b/app/src/main/res/layout/activity_statusbar.xml
index 6e51bdf8e..973bf8f8a 100644
--- a/app/src/main/res/layout/activity_statusbar.xml
+++ b/app/src/main/res/layout/activity_statusbar.xml
@@ -27,7 +27,7 @@
                 android:layout_marginHorizontal="24dp"
                 android:layout_marginTop="20dp"
                 android:layout_marginBottom="8dp"
-                android:text="@string/spacing"
+                android:text="@string/section_title_spacing"
                 android:textColor="?attr/colorPrimary" />
 
             <LinearLayout
@@ -208,7 +208,7 @@
                 android:layout_marginHorizontal="24dp"
                 android:layout_marginTop="20dp"
                 android:layout_marginBottom="8dp"
-                android:text="@string/color"
+                android:text="@string/section_title_color"
                 android:textColor="?attr/colorPrimary" />
 
             <LinearLayout
diff --git a/app/src/main/res/layout/activity_volume_panel.xml b/app/src/main/res/layout/activity_volume_panel.xml
index 1d573cac0..d0a6afcc5 100644
--- a/app/src/main/res/layout/activity_volume_panel.xml
+++ b/app/src/main/res/layout/activity_volume_panel.xml
@@ -70,7 +70,7 @@
                 android:layout_marginHorizontal="24dp"
                 android:layout_marginTop="20dp"
                 android:layout_marginBottom="8dp"
-                android:text="@string/volume_slider_track"
+                android:text="@string/section_title_volume_slider_track"
                 android:textColor="?attr/colorPrimary" />
 
             <RelativeLayout
diff --git a/app/src/main/res/layout/activity_xposed_background_chip.xml b/app/src/main/res/layout/activity_xposed_background_chip.xml
index 7904eb00b..498ce6c2b 100644
--- a/app/src/main/res/layout/activity_xposed_background_chip.xml
+++ b/app/src/main/res/layout/activity_xposed_background_chip.xml
@@ -28,7 +28,7 @@
                 android:layout_marginHorizontal="24dp"
                 android:layout_marginTop="20dp"
                 android:layout_marginBottom="8dp"
-                android:text="@string/status_bar"
+                android:text="@string/section_title_status_bar"
                 android:textColor="?attr/colorPrimary" />
 
             <RelativeLayout
@@ -194,7 +194,7 @@
                     android:layout_marginHorizontal="24dp"
                     android:layout_marginTop="20dp"
                     android:layout_marginBottom="8dp"
-                    android:text="@string/status_icons"
+                    android:text="@string/section_title_status_icons"
                     android:textColor="?attr/colorPrimary" />
 
                 <RelativeLayout
diff --git a/app/src/main/res/layout/activity_xposed_header_image.xml b/app/src/main/res/layout/activity_xposed_header_image.xml
index f763eccc4..2685bc89f 100644
--- a/app/src/main/res/layout/activity_xposed_header_image.xml
+++ b/app/src/main/res/layout/activity_xposed_header_image.xml
@@ -125,7 +125,7 @@
                     style="@style/TextAppearance.Material3.TitleMedium"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/image_alpha"
+                    android:text="@string/header_image_alpha"
                     android:textColor="@color/text_color_primary" />
 
                 <TextView
diff --git a/app/src/main/res/layout/activity_xposed_others.xml b/app/src/main/res/layout/activity_xposed_others.xml
index d1a82d673..ed23f11a0 100644
--- a/app/src/main/res/layout/activity_xposed_others.xml
+++ b/app/src/main/res/layout/activity_xposed_others.xml
@@ -226,7 +226,7 @@
                     android:layout_marginHorizontal="24dp"
                     android:layout_marginTop="20dp"
                     android:layout_marginBottom="8dp"
-                    android:text="@string/status_icons"
+                    android:text="@string/section_title_status_icons"
                     android:textColor="?attr/colorPrimary" />
 
                 <RelativeLayout
diff --git a/app/src/main/res/layout/activity_xposed_quick_settings.xml b/app/src/main/res/layout/activity_xposed_quick_settings.xml
index 1f107d6ee..cc9cc5f59 100644
--- a/app/src/main/res/layout/activity_xposed_quick_settings.xml
+++ b/app/src/main/res/layout/activity_xposed_quick_settings.xml
@@ -28,7 +28,7 @@
                 android:layout_marginHorizontal="24dp"
                 android:layout_marginTop="20dp"
                 android:layout_marginBottom="8dp"
-                android:text="@string/qs_tile"
+                android:text="@string/section_title_qs_tile"
                 android:textColor="?attr/colorPrimary" />
 
             <RelativeLayout
@@ -124,7 +124,7 @@
                 android:layout_marginHorizontal="24dp"
                 android:layout_marginTop="20dp"
                 android:layout_marginBottom="8dp"
-                android:text="@string/for_pixel_roms"
+                android:text="@string/section_title_for_pixel_roms"
                 android:textColor="?attr/colorPrimary" />
 
             <RelativeLayout
@@ -220,7 +220,7 @@
                 android:layout_marginHorizontal="24dp"
                 android:layout_marginTop="20dp"
                 android:layout_marginBottom="8dp"
-                android:text="@string/for_custom_roms"
+                android:text="@string/section_title_for_custom_roms"
                 android:textColor="?attr/colorPrimary" />
 
             <RelativeLayout
@@ -273,7 +273,7 @@
                 android:layout_marginHorizontal="24dp"
                 android:layout_marginTop="20dp"
                 android:layout_marginBottom="8dp"
-                android:text="@string/translucent_theme"
+                android:text="@string/section_title_translucent_theme"
                 android:textColor="?attr/colorPrimary" />
 
             <RelativeLayout
@@ -411,7 +411,7 @@
                 android:layout_marginHorizontal="24dp"
                 android:layout_marginTop="20dp"
                 android:layout_marginBottom="8dp"
-                android:text="@string/qs_margin"
+                android:text="@string/section_title_qs_margin"
                 android:textColor="?attr/colorPrimary" />
 
             <LinearLayout
diff --git a/app/src/main/res/layout/activity_xposed_transparency_blur.xml b/app/src/main/res/layout/activity_xposed_transparency_blur.xml
index 631fe8f84..e5d7f525d 100644
--- a/app/src/main/res/layout/activity_xposed_transparency_blur.xml
+++ b/app/src/main/res/layout/activity_xposed_transparency_blur.xml
@@ -28,7 +28,7 @@
                 android:layout_marginHorizontal="24dp"
                 android:layout_marginTop="20dp"
                 android:layout_marginBottom="8dp"
-                android:text="@string/transparency"
+                android:text="@string/section_title_transparency"
                 android:textColor="?attr/colorPrimary" />
 
             <RelativeLayout
@@ -161,7 +161,7 @@
                 android:layout_marginHorizontal="24dp"
                 android:layout_marginTop="20dp"
                 android:layout_marginBottom="8dp"
-                android:text="@string/blur"
+                android:text="@string/section_title_blur"
                 android:textColor="?attr/colorPrimary" />
 
             <RelativeLayout
diff --git a/app/src/main/res/layout/fragment_color_engine.xml b/app/src/main/res/layout/fragment_color_engine.xml
index 2102e1da6..a4b3d834e 100644
--- a/app/src/main/res/layout/fragment_color_engine.xml
+++ b/app/src/main/res/layout/fragment_color_engine.xml
@@ -145,7 +145,7 @@
                 android:layout_marginHorizontal="24dp"
                 android:layout_marginTop="20dp"
                 android:layout_marginBottom="8dp"
-                android:text="@string/stock_colors"
+                android:text="@string/section_title_stock_colors"
                 android:textColor="?attr/colorPrimary" />
 
             <RelativeLayout
@@ -241,7 +241,7 @@
                 android:layout_marginHorizontal="24dp"
                 android:layout_marginTop="20dp"
                 android:layout_marginBottom="8dp"
-                android:text="@string/dark_theme"
+                android:text="@string/section_title_dark_theme"
                 android:textColor="?attr/colorPrimary" />
 
             <RelativeLayout
@@ -337,7 +337,7 @@
                 android:layout_marginHorizontal="24dp"
                 android:layout_marginTop="20dp"
                 android:layout_marginBottom="8dp"
-                android:text="@string/misc"
+                android:text="@string/section_title_misc"
                 android:textColor="?attr/colorPrimary" />
 
             <RelativeLayout
diff --git a/app/src/main/res/layout/view_home_card.xml b/app/src/main/res/layout/view_home_card.xml
index 6bd38dec2..cb53d4fe5 100644
--- a/app/src/main/res/layout/view_home_card.xml
+++ b/app/src/main/res/layout/view_home_card.xml
@@ -64,7 +64,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="35dp"
-                android:text="@string/hide"
+                android:text="@string/home_card_hide"
                 app:icon="@drawable/ic_hide" />
 
         </LinearLayout>
diff --git a/app/src/main/res/layout/view_list_option_mediaplayer_icons.xml b/app/src/main/res/layout/view_list_option_mediaplayer_icons.xml
index 06c67823d..16d1a09b8 100644
--- a/app/src/main/res/layout/view_list_option_mediaplayer_icons.xml
+++ b/app/src/main/res/layout/view_list_option_mediaplayer_icons.xml
@@ -34,8 +34,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:layout_marginTop="3dp"
-            android:layout_marginBottom="3dp"
+            android:layout_marginTop="6dp"
             android:textColor="@color/text_color_primary" />
 
     </LinearLayout>
@@ -44,7 +43,7 @@
         android:id="@+id/toggleButtonGroup"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
+        android:layout_marginTop="6dp"
         android:gravity="center"
         app:singleSelection="true">
 
diff --git a/app/src/main/res/layout/view_pill_shape.xml b/app/src/main/res/layout/view_pill_shape.xml
index 3dd0580d7..46528adfe 100644
--- a/app/src/main/res/layout/view_pill_shape.xml
+++ b/app/src/main/res/layout/view_pill_shape.xml
@@ -12,7 +12,7 @@
         android:layout_marginHorizontal="24dp"
         android:layout_marginTop="20dp"
         android:layout_marginBottom="8dp"
-        android:text="@string/pill_appearance"
+        android:text="@string/section_title_pill_appearance"
         android:textColor="?attr/colorPrimary" />
 
     <LinearLayout
diff --git a/app/src/main/res/layout/view_settings_about.xml b/app/src/main/res/layout/view_settings_about.xml
index 6c6a4dc2e..9f7b3c6ca 100644
--- a/app/src/main/res/layout/view_settings_about.xml
+++ b/app/src/main/res/layout/view_settings_about.xml
@@ -12,7 +12,7 @@
         android:layout_marginHorizontal="60dp"
         android:layout_marginTop="20dp"
         android:layout_marginBottom="8dp"
-        android:text="@string/about"
+        android:text="@string/settings_section_title_about"
         android:textColor="?attr/colorPrimary" />
 
     <RelativeLayout
@@ -47,14 +47,14 @@
                 style="@style/TextAppearance.Material3.TitleMedium"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/github_repository_title"
+                android:text="@string/settings_github_repository_title"
                 android:textColor="@color/text_color_primary" />
 
             <TextView
                 style="@style/TextAppearance.Material3.BodyMedium"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/github_repository_desc"
+                android:text="@string/settings_github_repository_desc"
                 android:textColor="@color/text_color_secondary" />
 
         </LinearLayout>
@@ -92,14 +92,14 @@
                 style="@style/TextAppearance.Material3.TitleMedium"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/telegram_group_title"
+                android:text="@string/settings_telegram_group_title"
                 android:textColor="@color/text_color_primary" />
 
             <TextView
                 style="@style/TextAppearance.Material3.BodyMedium"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/telegram_group_desc"
+                android:text="@string/settings_telegram_group_desc"
                 android:textColor="@color/text_color_secondary" />
 
         </LinearLayout>
@@ -137,14 +137,14 @@
                 style="@style/TextAppearance.Material3.TitleMedium"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/credits_title"
+                android:text="@string/settings_credits_title"
                 android:textColor="@color/text_color_primary" />
 
             <TextView
                 style="@style/TextAppearance.Material3.BodyMedium"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/credits_desc"
+                android:text="@string/settings_credits_desc"
                 android:textColor="@color/text_color_secondary" />
 
         </LinearLayout>
diff --git a/app/src/main/res/layout/view_settings_general.xml b/app/src/main/res/layout/view_settings_general.xml
index b6772fa9f..320b2e8c3 100644
--- a/app/src/main/res/layout/view_settings_general.xml
+++ b/app/src/main/res/layout/view_settings_general.xml
@@ -12,7 +12,7 @@
         android:layout_marginHorizontal="60dp"
         android:layout_marginTop="20dp"
         android:layout_marginBottom="8dp"
-        android:text="@string/general"
+        android:text="@string/settings_section_title_general"
         android:textColor="?attr/colorPrimary" />
 
     <RelativeLayout
@@ -47,7 +47,7 @@
                 style="@style/TextAppearance.Material3.TitleMedium"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/app_language"
+                android:text="@string/settings_app_language"
                 android:textColor="@color/text_color_primary" />
 
             <TextView
@@ -92,7 +92,7 @@
                 style="@style/TextAppearance.Material3.TitleMedium"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/app_icon"
+                android:text="@string/settings_app_icon"
                 android:textColor="@color/text_color_primary" />
 
             <TextView
@@ -137,7 +137,7 @@
                 style="@style/TextAppearance.Material3.TitleMedium"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/app_theme"
+                android:text="@string/settings_app_theme"
                 android:textColor="@color/text_color_primary" />
 
             <TextView
diff --git a/app/src/main/res/layout/view_settings_misc.xml b/app/src/main/res/layout/view_settings_misc.xml
index 84417d5f5..b9e8726c8 100644
--- a/app/src/main/res/layout/view_settings_misc.xml
+++ b/app/src/main/res/layout/view_settings_misc.xml
@@ -13,7 +13,7 @@
         android:layout_marginHorizontal="60dp"
         android:layout_marginTop="20dp"
         android:layout_marginBottom="8dp"
-        android:text="@string/miscellaneous"
+        android:text="@string/settings_section_title_miscellaneous"
         android:textColor="?attr/colorPrimary" />
 
     <RelativeLayout
@@ -49,14 +49,14 @@
                 style="@style/TextAppearance.Material3.TitleMedium"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/restart_systemui_after_boot_title"
+                android:text="@string/settings_restart_systemui_after_boot_title"
                 android:textColor="@color/text_color_primary" />
 
             <TextView
                 style="@style/TextAppearance.Material3.BodyMedium"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/restart_systemui_after_boot_desc"
+                android:text="@string/settings_restart_systemui_after_boot_desc"
                 android:textColor="@color/text_color_secondary" />
 
         </LinearLayout>
@@ -104,14 +104,14 @@
                 style="@style/TextAppearance.Material3.TitleMedium"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/show_home_page_card_title"
+                android:text="@string/settings_show_home_page_card_title"
                 android:textColor="@color/text_color_primary" />
 
             <TextView
                 style="@style/TextAppearance.Material3.BodyMedium"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/show_home_page_card_desc"
+                android:text="@string/settings_show_home_page_card_desc"
                 android:textColor="@color/text_color_secondary" />
 
         </LinearLayout>
@@ -158,14 +158,14 @@
                 style="@style/TextAppearance.Material3.TitleMedium"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/clear_app_cache_title"
+                android:text="@string/settings_clear_app_cache_title"
                 android:textColor="@color/text_color_primary" />
 
             <TextView
                 style="@style/TextAppearance.Material3.BodyMedium"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/clear_app_cache_desc"
+                android:text="@string/settings_clear_app_cache_desc"
                 android:textColor="@color/text_color_secondary" />
 
         </LinearLayout>
@@ -211,7 +211,7 @@
                 style="@style/TextAppearance.Material3.BodyMedium"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/experimental_features_desc"
+                android:text="@string/activity_desc_experimental"
                 android:textColor="@color/text_color_secondary" />
 
         </LinearLayout>
@@ -249,14 +249,14 @@
                 style="@style/TextAppearance.Material3.TitleMedium"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/disable_everything_title"
+                android:text="@string/settings_disable_everything_title"
                 android:textColor="@color/text_color_primary" />
 
             <TextView
                 style="@style/TextAppearance.Material3.BodyMedium"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/disable_everything_desc"
+                android:text="@string/settings_disable_everything_desc"
                 android:textColor="@color/text_color_secondary" />
 
         </LinearLayout>
diff --git a/app/src/main/res/layout/view_settings_update.xml b/app/src/main/res/layout/view_settings_update.xml
index 9a72e27af..45d4c97ee 100644
--- a/app/src/main/res/layout/view_settings_update.xml
+++ b/app/src/main/res/layout/view_settings_update.xml
@@ -12,7 +12,7 @@
         android:layout_marginHorizontal="60dp"
         android:layout_marginTop="20dp"
         android:layout_marginBottom="8dp"
-        android:text="@string/update"
+        android:text="@string/settings_section_title_update"
         android:textColor="?attr/colorPrimary" />
 
     <RelativeLayout
@@ -47,7 +47,7 @@
                 style="@style/TextAppearance.Material3.TitleMedium"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/check_for_update"
+                android:text="@string/settings_check_for_update"
                 android:textColor="@color/text_color_primary" />
 
             <TextView
@@ -93,14 +93,14 @@
                 style="@style/TextAppearance.Material3.TitleMedium"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/auto_update_title"
+                android:text="@string/settings_auto_update_title"
                 android:textColor="@color/text_color_primary" />
 
             <TextView
                 style="@style/TextAppearance.Material3.BodyMedium"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/auto_update_desc"
+                android:text="@string/settings_auto_update_desc"
                 android:textColor="@color/text_color_secondary" />
 
         </LinearLayout>
diff --git a/app/src/main/res/layout/view_settings_xposed.xml b/app/src/main/res/layout/view_settings_xposed.xml
index 99649593f..2f1f7c12f 100644
--- a/app/src/main/res/layout/view_settings_xposed.xml
+++ b/app/src/main/res/layout/view_settings_xposed.xml
@@ -12,7 +12,7 @@
         android:layout_marginHorizontal="60dp"
         android:layout_marginTop="20dp"
         android:layout_marginBottom="8dp"
-        android:text="@string/xposed"
+        android:text="@string/settings_section_title_xposed"
         android:textColor="?attr/colorPrimary" />
 
     <RelativeLayout
@@ -48,14 +48,14 @@
                 style="@style/TextAppearance.Material3.TitleMedium"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/list_title_show_warning"
+                android:text="@string/settings_show_warning_title"
                 android:textColor="@color/text_color_primary" />
 
             <TextView
                 style="@style/TextAppearance.Material3.BodyMedium"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/list_desc_show_warning"
+                android:text="@string/settings_show_warning_desc"
                 android:textColor="@color/text_color_secondary" />
 
         </LinearLayout>
@@ -104,7 +104,7 @@
                 style="@style/TextAppearance.Material3.TitleMedium"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/restart_systemui_behavior"
+                android:text="@string/settings_restart_systemui_behavior"
                 android:textColor="@color/text_color_primary" />
 
             <TextView
diff --git a/app/src/main/res/layout/view_volume_style.xml b/app/src/main/res/layout/view_volume_style.xml
index 528e77da6..092337282 100644
--- a/app/src/main/res/layout/view_volume_style.xml
+++ b/app/src/main/res/layout/view_volume_style.xml
@@ -14,7 +14,7 @@
         android:layout_marginHorizontal="24dp"
         android:layout_marginTop="20dp"
         android:layout_marginBottom="8dp"
-        android:text="@string/custom_magisk_module"
+        android:text="@string/section_title_custom_magisk_module"
         android:textColor="?attr/colorPrimary" />
 
     <LinearLayout
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 8ff2035fe..de47a0453 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -141,10 +141,8 @@
     <string name="qspanel_row_title">صف لوحة QS</string>
     <string name="qspanel_column_title">عمود لوحة QS</string>
     <string name="btn_reset">إعادة ضبط</string>
-    <string name="row_and_column_title">الصف والعمود</string>
-    <string name="row_and_column_desc">تغيير صفوف وأعمدة بلاط QS</string>
-    <string name="icon_and_label_title">الرمز والتسمية</string>
-    <string name="icon_and_label_desc">تغيير خيارات الأيقونة والتسمية</string>
+    <string name="activity_desc_qs_row_column">تغيير صفوف وأعمدة بلاط QS</string>
+    <string name="activity_desc_qs_icon_label">تغيير خيارات الأيقونة والتسمية</string>
     <string name="vp_thin_background_title">خلفية رقيقة</string>
     <string name="vp_thick_background_title">خلفية سميكة</string>
     <string name="vp_no_background_title">بدون خلفية</string>
@@ -181,8 +179,8 @@
     <string name="installing">جارِِ</string>
     <string name="toast_error">هناك خطأ ما</string>
     <string name="reboot_needed">أعد تشغيل جهازك أولاً!</string>
-    <string name="disable_everything_title">تعطيل كل شيء</string>
-    <string name="disable_everything_desc">قم بتعطيل جميع التراكبات والألوان والتغييرات المتنوعة المطبقة بواسطة Iconify.</string>
+    <string name="settings_disable_everything_title">تعطيل كل شيء</string>
+    <string name="settings_disable_everything_desc">قم بتعطيل جميع التراكبات والألوان والتغييرات المتنوعة المطبقة بواسطة Iconify.</string>
     <string name="toast_disable_everything">اضغط لفترة طويلة لتعطيل كل شيء</string>
     <string name="toast_disabled_everything">كل شيء معطل</string>
     <string name="restart_sysui_title">إعادة تشغيل SystemUI</string>
@@ -239,8 +237,7 @@
     <string name="update_schedule3">كل يوم</string>
     <string name="update_schedule4">كل أسبوع</string>
     <string name="update_schedule5">مطلقاً</string>
-    <!-- do not change {latestVersionName} -->
-    <string name="update_dialog_desc">تحديث {latestVersionName} متاح للتنزيل.</string>
+    <string name="update_dialog_desc">تحديث %s متاح للتنزيل.</string>
     <string name="checking_for_update">جارِِ التحقق من وجود التحديث</string>
     <string name="toast_module_created">تم إنشاء Module بنجاح</string>
     <string name="volume_style">نمط الصوت</string>
@@ -263,7 +260,7 @@
     <string name="header_image_height_title">ارتفاع الصورة</string>
     <string name="hide_status_icons_title">إخفاء أيقونات الحالة</string>
     <string name="hide_status_icons_desc">قم بإزالة أيقونات الوقت والتاريخ والبطارية</string>
-    <string name="image_alpha">صورة ألفا</string>
+    <string name="header_image_alpha">صورة ألفا</string>
     <string name="toast_rename_file">أعد تسمية الملف إلى شيء أبسط</string>
     <string name="custom_lockscreen_clock_title">ساعة قفل الشاشة مخصصة</string>
     <string name="custom_lockscreen_clock_desc">تمكين ساعة شاشة القفل مخصصة</string>
@@ -433,17 +430,17 @@
     <string name="module_installation_step4">محاذاة ملفات APK المتراكبة</string>
     <string name="module_installation_step5">توقيع تراكب APKs</string>
     <string name="module_installation_step6">تنظيف المسارات</string>
-    <string name="portrait">(عمودي)</string>
+    <string name="section_title_portrait">عمودي</string>
     <string name="qs_tile_expanded_height">ارتفاع موسع</string>
-    <string name="landscape">(أفقي)</string>
+    <string name="section_title_landscape">أفقي</string>
     <string name="toast_storage_access">إطلاق صفحة \ "الوصول إلى كافة الملفات \"</string>
     <string name="qs_tile_non_expanded_height">ارتفاع غير موسع</string>
     <string name="method_toggle_dark_mode">مزدوج تبديل الوضع الداكن</string>
     <string name="method_restart_systemui">اعادة تشغيل الواجهه</string>
     <string name="method_do_nothing">لا تفعل شيئًا (سأفعل ذلك بنفسي)</string>
     <string name="list_title_xposed_settings">إعدادات XPosed</string>
-    <string name="list_title_show_warning">إظهار التحذير</string>
-    <string name="list_desc_show_warning">إظهار تحذير حول كيفية إعادة تحسين الوحدة النمطية في قائمة XPosed</string>
+    <string name="settings_show_warning_title">إظهار التحذير</string>
+    <string name="settings_show_warning_desc">إظهار تحذير حول كيفية إعادة تحسين الوحدة النمطية في قائمة XPosed</string>
     <string name="list_title_force_apply_method">فرض التطبيق</string>
     <string name="list_desc_force_apply_method">طريقة فرض التطبيقات في قائمة XPosed</string>
     <string name="list_title_miscellaneous_settings">إعدادات متنوعة</string>
@@ -457,8 +454,8 @@
     <string name="battery_width_title">عرض البطاريه</string>
     <string name="disable_animation_title">إلغاء تفعيل الرسوم المتحركه</string>
     <string name="disable_animation_desc">تعطيل تحريك الرسوم المتحركة لـ Iconify</string>
-    <string name="restart_systemui_after_boot_title">أعد تشغيل SystemUI بعد الأقلاع</string>
-    <string name="restart_systemui_after_boot_desc">لا تسري بعض الخيارات مثل كثافة التعتيم حتى يتم إعادة تشغيل SystemUI</string>
+    <string name="settings_restart_systemui_after_boot_title">أعد تشغيل SystemUI بعد الأقلاع</string>
+    <string name="settings_restart_systemui_after_boot_desc">لا تسري بعض الخيارات مثل كثافة التعتيم حتى يتم إعادة تشغيل SystemUI</string>
     <string name="btn_skip">تخطي</string>
     <string name="btn_next">التالي</string>
     <string name="btn_back">السابق</string>
@@ -512,11 +509,11 @@
     <string name="pill_width_title">عرض الحبة</string>
     <string name="pill_thickness_title">سمك الحبة</string>
     <string name="pill_bottom_space_title">الفضاء السفلي</string>
-    <string name="app_language">اللغه</string>
-    <string name="app_theme">سمة التطبيق</string>
-    <string name="app_theme_light">سمة فاتحه</string>
-    <string name="app_theme_dark">سمة داكنه</string>
-    <string name="app_theme_system">اتبع النظام</string>
+    <string name="settings_app_language">اللغه</string>
+    <string name="settings_app_theme">سمة التطبيق</string>
+    <string name="settings_app_theme_light">سمة فاتحه</string>
+    <string name="settings_app_theme_dark">سمة داكنه</string>
+    <string name="settings_app_theme_system">اتبع النظام</string>
     <string name="header_image_hide_in_landscape_title">إخفاء في الوضع الأفقي</string>
     <string name="header_image_hide_in_landscape_desc">إخفاء الصورة في الوضع الأفقي</string>
     <string name="black_theme_title">مظهر Pixel الأسود</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index e1bccb112..63c2d72fe 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -150,10 +150,8 @@
     <string name="qspanel_row_title">Filas del panel de Ajustes Rápidos</string>
     <string name="qspanel_column_title">Columnas del panel de Ajustes Rápidos</string>
     <string name="btn_reset">RESTABLECER</string>
-    <string name="row_and_column_title">Filas y Columnas</string>
-    <string name="row_and_column_desc">Cambia las filas y columnas del panel de Ajustes Rápidos</string>
-    <string name="icon_and_label_title">Icono y Etiqueta</string>
-    <string name="icon_and_label_desc">Cambia las opciones de icono y etiqueta</string>
+    <string name="activity_desc_qs_row_column">Cambia las filas y columnas del panel de Ajustes Rápidos</string>
+    <string name="activity_desc_qs_icon_label">Cambia las opciones de icono y etiqueta</string>
     <string name="vp_thin_background_title">Fondo delgado</string>
     <string name="vp_thick_background_title">Fondo grueso</string>
     <string name="vp_no_background_title">Sin fondo</string>
@@ -191,8 +189,8 @@
     <string name="installing">Instalando</string>
     <string name="toast_error">Algo salió mal</string>
     <string name="reboot_needed">¡Reinicia tu dispositivo primero!</string>
-    <string name="disable_everything_title">Deshabilitar todo</string>
-    <string name="disable_everything_desc">Deshabilita todas las superposiciones, colores y cambios variados de Iconify.</string>
+    <string name="settings_disable_everything_title">Deshabilitar todo</string>
+    <string name="settings_disable_everything_desc">Deshabilita todas las superposiciones, colores y cambios variados de Iconify.</string>
     <string name="toast_disable_everything">Mantén presionado para deshabilitar todo</string>
     <string name="toast_disabled_everything">Todo está deshabilitado</string>
     <string name="restart_sysui_title">Reiniciar SystemUI</string>
@@ -252,8 +250,7 @@
     <string name="update_schedule3">Cada día</string>
     <string name="update_schedule4">Cada semana</string>
     <string name="update_schedule5">Nunca</string>
-    <!-- do not change {latestVersionName} -->
-    <string name="update_dialog_desc">Hay una actualización de {latestVersionName} disponible para descargar.</string>
+    <string name="update_dialog_desc">Hay una actualización de %s disponible para descargar.</string>
     <string name="checking_for_update">Verificando actualización</string>
     <string name="toast_module_created">Módulo creado con éxito</string>
     <string name="volume_style">Estilo de volumen</string>
@@ -276,7 +273,7 @@
     <string name="header_image_height_title">Altura de la imagen</string>
     <string name="hide_status_icons_title">Ocultar iconos de estado</string>
     <string name="hide_status_icons_desc">Quitar la hora, la fecha y los iconos de la batería</string>
-    <string name="image_alpha">Alfa de la imagen</string>
+    <string name="header_image_alpha">Alfa de la imagen</string>
     <string name="toast_rename_file">Renombra el archivo a algo más simple</string>
     <string name="custom_lockscreen_clock_title">Reloj personalizado de la pantalla de bloqueo</string>
     <string name="custom_lockscreen_clock_desc">Habilitar el reloj personalizado de la pantalla de bloqueo</string>
@@ -451,17 +448,17 @@
     <string name="module_installation_step4">Alineando APKs de superposición</string>
     <string name="module_installation_step5">Firmando APKs de superposición</string>
     <string name="module_installation_step6">Limpiando directorios</string>
-    <string name="portrait">(Vertical)</string>
+    <string name="section_title_portrait">Vertical</string>
     <string name="qs_tile_expanded_height">Altura Expandida</string>
-    <string name="landscape">(Horizontal)</string>
+    <string name="section_title_landscape">Horizontal</string>
     <string name="toast_storage_access">Abriendo la página "Acceso a Todos los Archivos"</string>
     <string name="qs_tile_non_expanded_height">Altura Sin Expansión</string>
     <string name="method_toggle_dark_mode">Alternar Modo Oscuro Doble</string>
     <string name="method_restart_systemui">Reiniciar SystemUI</string>
     <string name="method_do_nothing">No Hacer Nada (Lo haré yo mismo)</string>
     <string name="list_title_xposed_settings">Configuración de Xposed</string>
-    <string name="list_title_show_warning">Mostrar Advertencia</string>
-    <string name="list_desc_show_warning">Mostrar advertencia sobre cómo reoptimizar el módulo en el menú de Xposed</string>
+    <string name="settings_show_warning_title">Mostrar Advertencia</string>
+    <string name="settings_show_warning_desc">Mostrar advertencia sobre cómo reoptimizar el módulo en el menú de Xposed</string>
     <string name="list_title_force_apply_method">Método de Aplicación Forzada</string>
     <string name="list_desc_force_apply_method">Método para forzar la aplicación de los cambios en el menú de Xposed</string>
     <string name="list_title_miscellaneous_settings">Configuración Variada</string>
@@ -476,8 +473,8 @@
     <string name="battery_height_title">Altura de Batería</string>
     <string name="disable_animation_title">Desactivar Animación</string>
     <string name="disable_animation_desc">Desactivar animación de desplazamiento de Iconify</string>
-    <string name="restart_systemui_after_boot_title">Reiniciar SystemUI después del Arranque</string>
-    <string name="restart_systemui_after_boot_desc">Algunas opciones como la intensidad del desenfoque no surtirán efecto hasta que se reinicie SystemUI</string>
+    <string name="settings_restart_systemui_after_boot_title">Reiniciar SystemUI después del Arranque</string>
+    <string name="settings_restart_systemui_after_boot_desc">Algunas opciones como la intensidad del desenfoque no surtirán efecto hasta que se reinicie SystemUI</string>
     <string name="btn_skip">Omitir</string>
     <string name="onboarding_title_1">¿Cansado de la IU de Stock?</string>
     <string name="onboarding_desc_1">Personalicemos todo según nuestros gustos.</string>
@@ -537,11 +534,11 @@
     <string name="pill_width_title">Ancho de la Píldora</string>
     <string name="pill_thickness_title">Grosor de la Píldora</string>
     <string name="pill_bottom_space_title">Espacio Inferior de la Píldora</string>
-    <string name="app_language">Idioma de la Aplicación</string>
-    <string name="app_theme">Tema de la Aplicación</string>
-    <string name="app_theme_light">Tema Claro</string>
-    <string name="app_theme_dark">Tema Oscuro</string>
-    <string name="app_theme_system">Seguir el Sistema</string>
+    <string name="settings_app_language">Idioma de la Aplicación</string>
+    <string name="settings_app_theme">Tema de la Aplicación</string>
+    <string name="settings_app_theme_light">Tema Claro</string>
+    <string name="settings_app_theme_dark">Tema Oscuro</string>
+    <string name="settings_app_theme_system">Seguir el Sistema</string>
     <string name="header_image_hide_in_landscape_title">Ocultar en Modo Horizontal</string>
     <string name="header_image_hide_in_landscape_desc">Ocultar la imagen en modo horizontal</string>
     <string name="black_theme_title">Tema Negro Pixel</string>
@@ -569,10 +566,10 @@
     <string name="settings_iconpack_bubble_v1">Paquete de iconos en línea multicolor</string>
     <string name="settings_iconpack_bubble_v2">Paquete de iconos con contorno multicolor</string>
     <string name="battery_margin_title">Margen de Batería</string>
-    <string name="app_icon">Icono de la Aplicación</string>
-    <string name="app_icon_default">Icono Predeterminado</string>
-    <string name="app_icon_themed">Icono Temático</string>
-    <string name="app_icon_retro">Icono Retro</string>
+    <string name="settings_app_icon">Icono de la Aplicación</string>
+    <string name="settings_app_icon_default">Icono Predeterminado</string>
+    <string name="settings_app_icon_themed">Icono Temático</string>
+    <string name="settings_app_icon_retro">Icono Retro</string>
     <string name="lockscreen_customization_title">Personalización de la Pantalla de Bloqueo</string>
     <string name="lockscreen_customization_desc">Habilitar personalizaciones de la pantalla de bloqueo</string>
     <string name="notification_transparency_title">Transparencia de Notificaciones</string>
@@ -596,8 +593,8 @@
     <string name="lockscreen_clock_auto_hide_clock_title">Ocultar Reloj Automáticamente</string>
     <string name="lockscreen_clock_auto_hide_clock_desc">Ocultar el reloj al recibir una notificación</string>
     <string name="toast_clear_cache">Caché de Iconify borrada</string>
-    <string name="clear_app_cache_title">Borrar Caché de Aplicación</string>
-    <string name="clear_app_cache_desc">Borrar las cachés generadas por el uso de fuentes, imágenes o GIFs personalizados.</string>
+    <string name="settings_clear_app_cache_title">Borrar Caché de Aplicación</string>
+    <string name="settings_clear_app_cache_desc">Borrar las cachés generadas por el uso de fuentes, imágenes o GIFs personalizados.</string>
     <string name="lsclock_custom_color_title">Color Personalizado del Reloj</string>
     <string name="lsclock_custom_color_desc">Color personalizado en lugar del color primario</string>
     <string name="lsclock_color_picker_title">Selector de Color del Reloj</string>
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index de1d437ec..a86eb6b09 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -121,10 +121,8 @@
     <string name="qspanel_row_title">تعداد ردیف‌های نوارابزار</string>
     <string name="qspanel_column_title">تعداد ستون‌های نوارابزار</string>
     <string name="btn_reset">بازنشانی به حالت اولیه</string>
-    <string name="row_and_column_title">تنظیمات ستون و ردیف</string>
-    <string name="row_and_column_desc">تغییر تعداد ردیف و ستون در نوارابزار</string>
-    <string name="icon_and_label_title">تنظیمات آیکون‌ها و متن</string>
-    <string name="icon_and_label_desc">تغییر تنظیمات مربوط به آیکون‌ها و متن</string>
+    <string name="activity_desc_qs_row_column">تغییر تعداد ردیف و ستون در نوارابزار</string>
+    <string name="activity_desc_qs_icon_label">تغییر تنظیمات مربوط به آیکون‌ها و متن</string>
     <string name="vp_thin_background_title">پیش‌زمینه لاغر</string>
     <string name="vp_thick_background_title">پیش‌زمینه ضخیم</string>
     <string name="vp_no_background_title">بدون پیش‌زمینه</string>
@@ -151,8 +149,8 @@
     <string name="reboot_needed">ابتدا دستگاه را ریستارت کنید!</string>
     <string name="magisk_not_found_desc">ابتدا با Magisk دستگاه خود را روت کنید!</string>
     <string name="root_not_found_desc">ظاهرا دستگاه شما روت نشده است!</string>
-    <string name="disable_everything_title">غیرفعال کردن همه چیز</string>
-    <string name="disable_everything_desc">تمام مواردی که توسط آیکونفای تغییر پیدا کرده به حالت اولیه باز می‌گردد.</string>
+    <string name="settings_disable_everything_title">غیرفعال کردن همه چیز</string>
+    <string name="settings_disable_everything_desc">تمام مواردی که توسط آیکونفای تغییر پیدا کرده به حالت اولیه باز می‌گردد.</string>
     <string name="toast_disable_everything">انگشت خود را روی گزینه نگه دارید</string>
     <string name="toast_disabled_everything">همه موارد غیرفعال شدند</string>
     <string name="restart_sysui_title">ریستارت کردن رابط کاربری</string>
@@ -210,8 +208,7 @@
     <string name="update_schedule3">هر روز</string>
     <string name="update_schedule4">هر هفته</string>
     <string name="update_schedule5">هرگز</string>
-    <!-- do not change {latestVersionName} -->
-    <string name="update_dialog_desc">آپدیت {latestVersionName} آماده دانلود است.</string>
+    <string name="update_dialog_desc">آپدیت %s آماده دانلود است.</string>
     <string name="checking_for_update">درحال بررسی وجود آپدیت</string>
     <string name="toast_module_created">ماژول با موفقیت ساخته شد</string>
     <string name="volume_style">ظاهر نوار تنظیم صدا</string>
@@ -234,7 +231,7 @@
     <string name="header_image_height_title">ارتفاع تصویر</string>
     <string name="hide_status_icons_title">مخفی کردن آیکون‌های نوار اعلان</string>
     <string name="hide_status_icons_desc">مخفی کردن آیکون ساعت و تارخ و باتری</string>
-    <string name="image_alpha">میزان شفافیت تصویر هدر</string>
+    <string name="header_image_alpha">میزان شفافیت تصویر هدر</string>
     <string name="toast_rename_file">نام ساده‌تری برای فایل انتخاب کنید</string>
     <string name="custom_lockscreen_clock_title">شخصی سازی ساعت صفحه قفل</string>
     <string name="custom_lockscreen_clock_desc">فعال کردن ساعت سفارشی برای صفحه قفل</string>
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index 91bda1b8a..933f7b6ca 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -91,10 +91,8 @@
     <string name="qspanel_row_title">Baris QS Panel</string>
     <string name="qspanel_column_title">Kolom QS Panel</string>
     <string name="btn_reset">ATUR ULANG</string>
-    <string name="row_and_column_title">Baris dan kolom</string>
-    <string name="row_and_column_desc">Ubah QS tile baris dan kolom</string>
-    <string name="icon_and_label_title">Ikon dan Label</string>
-    <string name="icon_and_label_desc">Ubah opsi ikon dan label</string>
+    <string name="activity_desc_qs_row_column">Ubah QS tile baris dan kolom</string>
+    <string name="activity_desc_qs_icon_label">Ubah opsi ikon dan label</string>
     <string name="iconify_updated_title">Iconify Diperbarui!</string>
     <string name="iconify_updated_desc">Nyalakan ulang ponsel Anda untuk menggunakan fitur dan opsi tambahan terbaru.</string>
     <string name="btn_reboot_now">Reboot Sekarang</string>
@@ -122,8 +120,8 @@
     <string name="installing">Menginstal</string>
     <string name="toast_error">Ada yang salah</string>
     <string name="reboot_needed">Nyalakan ulang perangkat Anda terlebih dahulu!</string>
-    <string name="disable_everything_title">Nonaktifkan Semua</string>
-    <string name="disable_everything_desc">Nonaktifkan semua overlay, warna, dan perubahan lain yang diterapkan yang dilakukan oleh Iconify.</string>
+    <string name="settings_disable_everything_title">Nonaktifkan Semua</string>
+    <string name="settings_disable_everything_desc">Nonaktifkan semua overlay, warna, dan perubahan lain yang diterapkan yang dilakukan oleh Iconify.</string>
     <string name="toast_disable_everything">Tekan lama untuk menonaktifkan semuanya</string>
     <string name="toast_disabled_everything">Semuanya dinonaktifkan</string>
     <string name="restart_sysui_title">Mulai Ulang SystemUI</string>
@@ -175,7 +173,7 @@
     <string name="update_schedule3">Setiap Hari</string>
     <string name="update_schedule4">Setiap Minggu</string>
     <string name="update_schedule5">Tidak Pernah</string>
-    <string name="update_dialog_desc">Update {latestVersionName} tersedia untuk didownload.</string>
+    <string name="update_dialog_desc">Update %s tersedia untuk didownload.</string>
     <string name="checking_for_update">Memeriksa Pembaruan</string>
     <string name="toast_module_created">Modul berhasil dibuat</string>
     <string name="volume_module_desc">Membuat modul magisk yang dapat di-flash untuk gaya ini</string>
@@ -197,7 +195,7 @@
     <string name="header_image_height_title">Tinggi Gambar</string>
     <string name="hide_status_icons_title">Sembunyikan Ikon Status</string>
     <string name="hide_status_icons_desc">Hapus ikon waktu, tanggal, dan baterai</string>
-    <string name="image_alpha">Gambar Alpha</string>
+    <string name="header_image_alpha">Gambar Alpha</string>
     <string name="toast_rename_file">Ganti nama file menjadi sesuatu yang lebih simpel</string>
     <string name="custom_lockscreen_clock_title">Kustom Jam Layar Kunci</string>
     <string name="custom_lockscreen_clock_desc">Aktifkan custom jam layar kunci</string>
@@ -255,8 +253,8 @@
     <string name="method_restart_systemui">Mulai Ulang SystemUI</string>
     <string name="method_do_nothing">Tidak melakukan apa-apa (saya akan melakukannya sendiri)</string>
     <string name="list_title_xposed_settings">Pengaturan XPosed</string>
-    <string name="list_title_show_warning">Tampilkan Peringatan</string>
-    <string name="list_desc_show_warning">Tampilkan peringatan tentang cara mengoptimalkan ulang modul di Menu XPosed</string>
+    <string name="settings_show_warning_title">Tampilkan Peringatan</string>
+    <string name="settings_show_warning_desc">Tampilkan peringatan tentang cara mengoptimalkan ulang modul di Menu XPosed</string>
     <string name="list_title_force_apply_method">Paksa Terapkan Metode</string>
     <string name="list_desc_force_apply_method">Metode untuk memaksa menerapkan perubahan pada menu xposed</string>
     <string name="list_title_miscellaneous_settings">Setelan Lainnya</string>
@@ -266,8 +264,8 @@
     <string name="custom_battery_desc">Aktifkan custom gaya baterai</string>
     <string name="disable_animation_title">Nonaktifkan Animasi</string>
     <string name="disable_animation_desc">Nonaktifkan animasi bergulir dari Iconify</string>
-    <string name="restart_systemui_after_boot_title">Restart SystemUI Setelah Boot</string>
-    <string name="restart_systemui_after_boot_desc">Beberapa opsi seperti intensitas buram tidak berpengaruh hingga systemui dimulai ulang</string>
+    <string name="settings_restart_systemui_after_boot_title">Restart SystemUI Setelah Boot</string>
+    <string name="settings_restart_systemui_after_boot_desc">Beberapa opsi seperti intensitas buram tidak berpengaruh hingga systemui dimulai ulang</string>
     <string name="onboarding_title_1">Bosan dengan Stock UI?</string>
     <string name="onboarding_desc_1">Mari sesuaikan semuanya dengan keinginan kita.</string>
     <string name="btn_next">Lanjut</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 5278b3242..59d868d91 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -50,8 +50,8 @@
     <string name="reboot_needed">Reinicie o dispositivo primeiro!</string>
     <string name="magisk_not_found_desc">Utilize o Magisk para dar <i>root</i> ao seu dispositivo!</string>
     <string name="root_not_found_desc">Parece que o seu dispositivo não tem <i>root</i>!</string>
-    <string name="disable_everything_title">Desativar tudo</string>
-    <string name="disable_everything_desc">Desativa todos os <i>overlays</i>, cores e outras alterações aplicadas pela Iconify.</string>
+    <string name="settings_disable_everything_title">Desativar tudo</string>
+    <string name="settings_disable_everything_desc">Desativa todos os <i>overlays</i>, cores e outras alterações aplicadas pela Iconify.</string>
     <string name="toast_disable_everything">Manter premido para desativar tudo</string>
     <string name="toast_disabled_everything">Está tudo desativao</string>
     <string name="restart_sysui_title">Reiniciar IU do sistema</string>
@@ -236,10 +236,8 @@
     <string name="qspanel_row_title">Linhas do painel das DR</string>
     <string name="qspanel_column_title">Colunas do painel das DR</string>
     <string name="btn_reset">RESET</string>
-    <string name="row_and_column_title">Linhas e Colunas</string>
-    <string name="row_and_column_desc">Personalizar o número de linhas e colunas</string>
-    <string name="icon_and_label_title">Ícones e Rótulos</string>
-    <string name="icon_and_label_desc">Personalizar ícones e rótulos dos atalhos</string>
+    <string name="activity_desc_qs_row_column">Personalizar o número de linhas e colunas</string>
+    <string name="activity_desc_qs_icon_label">Personalizar ícones e rótulos dos atalhos</string>
     <string name="vp_thin_background_title">Pano de fundo fino</string>
     <string name="vp_thick_background_title">Pano de fundo espesso</string>
     <string name="vp_no_background_title">Sem pano de fundo</string>
@@ -283,7 +281,7 @@
     <string name="update_schedule3">Diariamente</string>
     <string name="update_schedule4">Uma vez por semana</string>
     <string name="update_schedule5">Nunca</string>
-    <string name="update_dialog_desc">A atualização {latestVersionName} está disponível para descarregar.</string>
+    <string name="update_dialog_desc">A atualização %s está disponível para descarregar.</string>
     <string name="checking_for_update">A procurar atualizações</string>
     <string name="toast_module_created">Módulo criado com sucesso</string>
     <string name="volume_style">Estilo do volume</string>
@@ -306,7 +304,7 @@
     <string name="header_image_height_title">Altura da imagem</string>
     <string name="hide_status_icons_title">Escoder os ícones de estado</string>
     <string name="hide_status_icons_desc">Remove o relógio, a data e a bateria</string>
-    <string name="image_alpha">Opacidade da imagem</string>
+    <string name="header_image_alpha">Opacidade da imagem</string>
     <string name="toast_rename_file">Renomeie o ficheiro para algo mais simples</string>
     <string name="custom_lockscreen_clock_title">Relógio personalizado no ecrã de bloqueio</string>
     <string name="custom_lockscreen_clock_desc">Ativar um relógio personalizado no ecrã de bloqueio</string>
@@ -384,15 +382,15 @@
     <string name="module_installation_step6">A limpar diretorias temporárias</string>
     <string name="toast_storage_access">A carregar página \"Acesso a todos os ficheiros\"</string>
     <string name="qs_tile_non_expanded_height">Altura não expandida</string>
-    <string name="portrait">(Retrato)</string>
+    <string name="section_title_portrait">Retrato</string>
     <string name="qs_tile_expanded_height">Altura expandida</string>
-    <string name="landscape">(Paisagem)</string>
+    <string name="section_title_landscape">Paisagem</string>
     <string name="method_toggle_dark_mode">Ligar/desligar tema escuro</string>
     <string name="method_restart_systemui">Reiniciar a IU do Sistema</string>
     <string name="method_do_nothing">Nada (farei manualmente depois)</string>
     <string name="list_title_xposed_settings">Definições XPosed</string>
-    <string name="list_title_show_warning">Mostrar aviso</string>
-    <string name="list_desc_show_warning">Mostrar o aviso sobre como re-optimizar o módulo na app LSPosed</string>
+    <string name="settings_show_warning_title">Mostrar aviso</string>
+    <string name="settings_show_warning_desc">Mostrar o aviso sobre como re-optimizar o módulo na app LSPosed</string>
     <string name="list_title_force_apply_method">Método para forçar do aplicar</string>
     <string name="list_desc_force_apply_method">Método para forçar o aplicar das opções no menu XPosed</string>
     <string name="list_title_miscellaneous_settings">Definições diversas</string>
@@ -438,8 +436,8 @@
     <string name="icon_mask_style_rice_rohie_meow">Rohie Meow</string>
     <string name="disable_animation_title">Desativar animação</string>
     <string name="disable_animation_desc">Desativar a animação no final da navegação na app</string>
-    <string name="restart_systemui_after_boot_title">Reiniciar a IU do sistema no arranque</string>
-    <string name="restart_systemui_after_boot_desc">Algumas funcionalidades, como o nível de desfocagem, não funcionam até que a IU do sistema seja reiniciada</string>
+    <string name="settings_restart_systemui_after_boot_title">Reiniciar a IU do sistema no arranque</string>
+    <string name="settings_restart_systemui_after_boot_desc">Algumas funcionalidades, como o nível de desfocagem, não funcionam até que a IU do sistema seja reiniciada</string>
     <string name="activity_title_progress_bar">Barra de progresso</string>
     <string name="activity_desc_progress_bar">Aplicar um estilo diferente à barra de progresso</string>
     <string name="btn_skip">Saltar</string>
@@ -496,11 +494,11 @@
     <string name="pill_width_title">Largura da barra</string>
     <string name="pill_thickness_title">Espessura da barra</string>
     <string name="pill_bottom_space_title">Espaço inferior</string>
-    <string name="app_language">Idioma</string>
-    <string name="app_theme">Tema da app</string>
-    <string name="app_theme_light">Tema claro</string>
-    <string name="app_theme_dark">Tema escuro</string>
-    <string name="app_theme_system">Seguir o sistema</string>
+    <string name="settings_app_language">Idioma</string>
+    <string name="settings_app_theme">Tema da app</string>
+    <string name="settings_app_theme_light">Tema claro</string>
+    <string name="settings_app_theme_dark">Tema escuro</string>
+    <string name="settings_app_theme_system">Seguir o sistema</string>
     <string name="header_image_hide_in_landscape_title">Esconder em modo paisagem</string>
     <string name="header_image_hide_in_landscape_desc">Esconder a imagem em modo paisagem</string>
     <string name="black_theme_title">Tema Pixel Preto</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 622b1238b..273630ca6 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -106,8 +106,8 @@
     <string name="custom_lockscreen_clock_title">Кастомные часы на экране блокировки</string>
     <string name="custom_qs_margin_desc">Включить свои отступы для панели быстрых настроек</string>
     <string name="custom_qs_margin_title">Свои отступы панели быстрых настроек</string>
-    <string name="disable_everything_desc">Отключить все оверлеи, цвета и другие изменения сделанные Iconify.</string>
-    <string name="disable_everything_title">Отключить всё</string>
+    <string name="settings_disable_everything_desc">Отключить все оверлеи, цвета и другие изменения сделанные Iconify.</string>
+    <string name="settings_disable_everything_title">Отключить всё</string>
     <string name="enable_colored_battery_desc">Использовать свой цвет для иконки батареи</string>
     <string name="enable_colored_battery_title">Включить цветную батарею</string>
     <string name="pitch_black_dark_desc">Включить Pitch Black тему</string>
@@ -137,8 +137,7 @@
     <string name="hide_status_icons_desc">Скрыть значки времени, даты и батареи</string>
     <string name="hide_status_icons_title">Скрыть значки статусбара</string>
     <string name="icon">Иконка</string>
-    <string name="icon_and_label_desc">Изменить настройки иконок и подписей</string>
-    <string name="icon_and_label_title">Иконка и подпись</string>
+    <string name="activity_desc_qs_icon_label">Изменить настройки иконок и подписей</string>
     <string name="icon_size_title">Размер иконки</string>
     <string name="iconify_clipboard_label_version">Версия Iconify</string>
     <string name="iconify_clipboard_label_version_code">Код версии:</string>
@@ -149,7 +148,7 @@
     <string name="iconpack_aurora">Aurora</string>
     <string name="iconpack_gradicon">Gradicon</string>
     <string name="iconpack_plumpy">Plumpy</string>
-    <string name="image_alpha">Прозрачность изображения</string>
+    <string name="header_image_alpha">Прозрачность изображения</string>
     <string name="import_export">Импорт/Экспорт</string>
     <string name="import_settings">Импорт настроек</string>
     <string name="imported_settings">Настройки усиленно импортированы</string>
@@ -249,8 +248,7 @@
     <string name="restart_sysui_desc">Некоторые опции могут быть применены, но не отображаться, пока System UI не будет перезапущен. В таком случае используйте эту функцию для перезапуска System UI.</string>
     <string name="restart_sysui_title">Перезапустить System UI</string>
     <string name="root_not_found_desc">Похоже ваше устройство не имеет Root прав!</string>
-    <string name="row_and_column_desc">Изменить строки и столбцы в быстрых настройках</string>
-    <string name="row_and_column_title">Строка и столбец</string>
+    <string name="activity_desc_qs_row_column">Изменить строки и столбцы в быстрых настройках</string>
     <string name="sb_clock_background_chip_desc">Показывать фишку позади часов в статусбаре</string>
     <string name="sb_clock_background_chip_title">Фишка часов статусбара</string>
     <string name="sb_color_tint_desc">Оттенок иконок статусбара и текста</string>
@@ -284,7 +282,7 @@
     <string name="transparent_qs_panel_desc">Сделать фон панели быстрых настроек прозрачным</string>
     <string name="transparent_qs_panel_title">Прозрачность панели быстрых настроек</string>
     <string name="update_checking_failed">Ошибка проверки обновлений!</string>
-    <string name="update_dialog_desc">Обновление {latestVersionName} доступно для загрузки</string>
+    <string name="update_dialog_desc">Обновление %s доступно для загрузки</string>
     <string name="update_schedule1">Постоянно</string>
     <string name="update_schedule2">Каждый час</string>
     <string name="update_schedule3">Каждый день</string>
@@ -406,15 +404,15 @@
     <string name="module_installation_step6">Очистка временной папки</string>
     <string name="toast_storage_access">Запуск настройки  \"Доступ ко всем файлам\"</string>
     <string name="qs_tile_non_expanded_height">Высота в неразвёрнутом виде</string>
-    <string name="portrait">Вертикальный</string>
+    <string name="section_title_portrait">Вертикальный</string>
     <string name="qs_tile_expanded_height">Высота в развёрнутом виде</string>
-    <string name="landscape">Горизонтальный</string>
+    <string name="section_title_landscape">Горизонтальный</string>
     <string name="method_toggle_dark_mode">Двойное переключение тёмной темы</string>
     <string name="method_restart_systemui">Перезапуск SystemUI</string>
     <string name="method_do_nothing">Ничего не делать (Я сделаю всё сам)</string>
     <string name="list_title_xposed_settings">Настройки XPosed</string>
-    <string name="list_title_show_warning">Показывать предупреждение</string>
-    <string name="list_desc_show_warning">Показывать предупреждение о том, как оптимизировать модуль в меню XPosed</string>
+    <string name="settings_show_warning_title">Показывать предупреждение</string>
+    <string name="settings_show_warning_desc">Показывать предупреждение о том, как оптимизировать модуль в меню XPosed</string>
     <string name="list_title_force_apply_method">Метод применения изменений</string>
     <string name="list_desc_force_apply_method">Метод применения изменений в меню XPosed</string>
     <string name="list_title_miscellaneous_settings">Дополнительные настройки</string>
@@ -462,8 +460,8 @@
     <string name="installation_failed_title">Упс, это было неожиданно</string>
     <string name="activity_title_progress_bar">Прогресс-бар</string>
     <string name="activity_desc_progress_bar">Изменить стиль Прогресс-бара</string>
-    <string name="restart_systemui_after_boot_title">Перезапустить System UI после включения?</string>
-    <string name="restart_systemui_after_boot_desc">Некоторые настройки, такие как \"размытие\" не применяются, пока System UI не будет перезапущен</string>
+    <string name="settings_restart_systemui_after_boot_title">Перезапустить System UI после включения?</string>
+    <string name="settings_restart_systemui_after_boot_desc">Некоторые настройки, такие как \"размытие\" не применяются, пока System UI не будет перезапущен</string>
     <string name="btn_skip">Пропустить</string>
     <string name="onboarding_title_1">Наскучил стандартный UI ?</string>
     <string name="onboarding_desc_1">Давай настроим все по своему вкусу.</string>
@@ -499,11 +497,11 @@
     <string name="pill_width_title">Ширина капсулы</string>
     <string name="pill_thickness_title">Толщина капсулы</string>
     <string name="pill_bottom_space_title">Нижнее пространство</string>
-    <string name="app_language">Язык</string>
-    <string name="app_theme">Тема приложения</string>
-    <string name="app_theme_light">Светлая тема</string>
-    <string name="app_theme_dark">Тёмная тема</string>
-    <string name="app_theme_system">Системная тема</string>
+    <string name="settings_app_language">Язык</string>
+    <string name="settings_app_theme">Тема приложения</string>
+    <string name="settings_app_theme_light">Светлая тема</string>
+    <string name="settings_app_theme_dark">Тёмная тема</string>
+    <string name="settings_app_theme_system">Системная тема</string>
     <string name="header_image_hide_in_landscape_title">Скрыть в ландшафтном режиме</string>
     <string name="header_image_hide_in_landscape_desc">Скрыть изображение в ландшафтном режиме</string>
     <string name="black_theme_title">Чёрная тема Pixel</string>
@@ -531,10 +529,10 @@
     <string name="settings_iconpack_bubble_v1">Нелинейный многоцветный набор иконок</string>
     <string name="settings_iconpack_bubble_v2">Контурный многоцветный набор иконок</string>
     <string name="battery_margin_title">Отступы батареи</string>
-    <string name="app_icon">Иконка приложения</string>
-    <string name="app_icon_default">Стандартная иконка</string>
-    <string name="app_icon_themed">Основанная на теме иконка</string>
-    <string name="app_icon_retro">Старая иконка</string>
+    <string name="settings_app_icon">Иконка приложения</string>
+    <string name="settings_app_icon_default">Стандартная иконка</string>
+    <string name="settings_app_icon_themed">Основанная на теме иконка</string>
+    <string name="settings_app_icon_retro">Старая иконка</string>
     <string name="lockscreen_customization_title">Кастомизация экрана блокировки</string>
     <string name="lockscreen_customization_desc">Включить кастомизацию экрана блокировки</string>
     <string name="notification_transparency_title">Прозрачность уведомлений</string>
@@ -558,8 +556,8 @@
     <string name="lockscreen_clock_auto_hide_clock_title">Автоматически скрывать часы</string>
     <string name="lockscreen_clock_auto_hide_clock_desc">Скрывать часы при входящем уведомлении</string>
     <string name="toast_clear_cache">Кэш Iconify очищен</string>
-    <string name="clear_app_cache_title">Очистить кэш приложения</string>
-    <string name="clear_app_cache_desc">Очистить кэш, созданный в результате использования пользовательских шрифтов, изображений или gif-файлов.</string>
+    <string name="settings_clear_app_cache_title">Очистить кэш приложения</string>
+    <string name="settings_clear_app_cache_desc">Очистить кэш, созданный в результате использования пользовательских шрифтов, изображений или gif-файлов.</string>
     <string name="lsclock_custom_color_title">Кастомный цвет часов</string>
     <string name="lsclock_custom_color_desc">Кастомный цвет вместо основного цвета</string>
     <string name="lsclock_color_picker_title">Выбор цвета часов</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 05b8f2f34..c2daaf53d 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -127,10 +127,8 @@
     <string name="qspanel_row_title">Hızlı Ayarlar Paneli Satır</string>
     <string name="qspanel_column_title">Hızlı Ayarlar Paneli Sütun</string>
     <string name="btn_reset">YENİLE</string>
-    <string name="row_and_column_title">Satır ve Sütun</string>
-    <string name="row_and_column_desc">Hızlı ayarlar paneli satır ve sütunlarını değiştir</string>
-    <string name="icon_and_label_title">İkon ve Etiket</string>
-    <string name="icon_and_label_desc">İkon ve etiket ayarlarını değiştir</string>
+    <string name="activity_desc_qs_row_column">Hızlı ayarlar paneli satır ve sütunlarını değiştir</string>
+    <string name="activity_desc_qs_icon_label">İkon ve etiket ayarlarını değiştir</string>
     <string name="vp_thin_background_title">İnce Arka Plan</string>
     <string name="vp_thick_background_title">Yoğun Arka Plan</string>
     <string name="vp_no_background_title">Arka Plan Yok</string>
@@ -168,8 +166,8 @@
     <string name="reboot_needed">Önce cihazınızı yeniden başlatın!</string>
     <string name="magisk_not_found_desc">Cihazınızı rootlamak için Magisk kullanın!</string>
     <string name="root_not_found_desc">Cihazınız rootlanmamış!</string>
-    <string name="disable_everything_title">Her Şeyi Devre Dışı Bırak</string>
-    <string name="disable_everything_desc">Iconify tarafından yapılan bütün özelleştirmeleri, düzenlemeleri ve tasarım değişikliklerini devre dışı bırak.</string>
+    <string name="settings_disable_everything_title">Her Şeyi Devre Dışı Bırak</string>
+    <string name="settings_disable_everything_desc">Iconify tarafından yapılan bütün özelleştirmeleri, düzenlemeleri ve tasarım değişikliklerini devre dışı bırak.</string>
     <string name="toast_disable_everything">Her şeyi devre dışı bırakmak için basılı tutun</string>
     <string name="toast_disabled_everything">Her şey devre dışı bırakıldı</string>
     <string name="restart_sysui_title">Sistem Arayüzünü Yeniden Başlat</string>
@@ -229,8 +227,7 @@
     <string name="update_schedule3">Her Gün</string>
     <string name="update_schedule4">Her Hafta</string>
     <string name="update_schedule5">Asla</string>
-    <!-- do not change {latestVersionName} -->
-    <string name="update_dialog_desc">{latestVersionName} sürümü indirmeye hazır.</string>
+    <string name="update_dialog_desc">%s sürümü indirmeye hazır.</string>
     <string name="checking_for_update">Güncelleme Kontrolü Yapılıyor</string>
     <string name="toast_module_created">Modül başarıyla oluşturuldu</string>
     <string name="volume_style">Ses Tasarımı</string>
@@ -253,7 +250,7 @@
     <string name="header_image_height_title">Resim Yüksekliği</string>
     <string name="hide_status_icons_title">Durum İkonlarını Gizle</string>
     <string name="hide_status_icons_desc">Saat, tarih ve batarya ikonlarını kaldır</string>
-    <string name="image_alpha">Resim Şeffaflığı</string>
+    <string name="header_image_alpha">Resim Şeffaflığı</string>
     <string name="toast_rename_file">Dosyayı daha basit bir isimle tekrar isimlendirin</string>
     <string name="custom_lockscreen_clock_title">Özel Kilit Ekranı Saati</string>
     <string name="custom_lockscreen_clock_desc">Kilit ekranında özel saati etkinleştir</string>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 64d888859..a570a23c7 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -143,10 +143,8 @@
     <string name="qspanel_row_title">Hàng Bảng điều khiển QS</string>
     <string name="qspanel_column_title">Cột bảng QS</string>
     <string name="btn_reset">CÀI LẠI</string>
-    <string name="row_and_column_title">Hàng và cột</string>
-    <string name="row_and_column_desc">Thay đổi hàng và cột ô vuông Qs</string>
-    <string name="icon_and_label_title">Biểu tượng và Nhãn</string>
-    <string name="icon_and_label_desc">Thay đổi tùy chọn biểu tượng và nhãn</string>
+    <string name="activity_desc_qs_row_column">Thay đổi hàng và cột ô vuông Qs</string>
+    <string name="activity_desc_qs_icon_label">Thay đổi tùy chọn biểu tượng và nhãn</string>
     <string name="vp_thin_background_title">Nền mỏng</string>
     <string name="vp_thick_background_title">Nền dày</string>
     <string name="vp_no_background_title">Không có nền</string>
@@ -182,8 +180,8 @@
     <string name="installing">Đang cài đặt</string>
     <string name="toast_error">Đã xảy ra sự cố</string>
     <string name="reboot_needed">Khởi động lại thiết bị của bạn trước!</string>
-    <string name="disable_everything_title">Vô hiệu hóa mọi thứ</string>
-    <string name="disable_everything_desc">Vô hiệu hóa tất cả các lớp phủ, màu sắc và các thay đổi linh tinh được áp dụng do Iconify thực hiện.</string>
+    <string name="settings_disable_everything_title">Vô hiệu hóa mọi thứ</string>
+    <string name="settings_disable_everything_desc">Vô hiệu hóa tất cả các lớp phủ, màu sắc và các thay đổi linh tinh được áp dụng do Iconify thực hiện.</string>
     <string name="toast_disable_everything">Nhấn và giữ để tắt mọi thứ</string>
     <string name="toast_disabled_everything">Mọi thứ đều bị vô hiệu hóa</string>
     <string name="restart_sysui_title">Khởi động lại SystemUI</string>
@@ -242,8 +240,7 @@
     <string name="update_schedule3">Hằng ngày</string>
     <string name="update_schedule4">Mỗi tuần</string>
     <string name="update_schedule5">Không bao giờ</string>
-    <!-- do not change {latestVersionName} -->
-    <string name="update_dialog_desc">Đã có bản cập nhật {latestVersionName} để tải xuống.</string>
+    <string name="update_dialog_desc">Đã có bản cập nhật %s để tải xuống.</string>
     <string name="checking_for_update">Đang kiểm tra cập nhật</string>
     <string name="toast_module_created">Mô-đun được tạo thành công</string>
     <string name="volume_style">Kiểu âm lượng</string>
@@ -266,7 +263,7 @@
     <string name="header_image_height_title">Chiều cao hình ảnh</string>
     <string name="hide_status_icons_title">Ẩn biểu tượng trạng thái</string>
     <string name="hide_status_icons_desc">Xóa các biểu tượng thời gian, ngày tháng và pin</string>
-    <string name="image_alpha">Hình ảnh Alpha</string>
+    <string name="header_image_alpha">Hình ảnh Alpha</string>
     <string name="toast_rename_file">Đổi tên tệp thành một cái gì đó đơn giản hơn</string>
     <string name="custom_lockscreen_clock_title">Đồng hồ màn hình khóa tùy chỉnh</string>
     <string name="custom_lockscreen_clock_desc">Bật đồng hồ màn hình khóa tùy chỉnh</string>
@@ -418,17 +415,17 @@
     <string name="module_installation_step4">Căn chỉnh lớp phủ APKs</string>
     <string name="module_installation_step5">Ký lớp phủ APKs</string>
     <string name="module_installation_step6">Làm sạch thư mục</string>
-    <string name="portrait">(Chân dung)</string>
+    <string name="section_title_portrait">Chân dung</string>
     <string name="qs_tile_expanded_height">Chiều cao mở rộng</string>
-    <string name="landscape">(Phong cảnh)</string>
+    <string name="section_title_landscape">Phong cảnh</string>
     <string name="toast_storage_access">Khởi chạy trang \"Tất cả quyền truy cập tệp\"</string>
     <string name="qs_tile_non_expanded_height">Chiều cao không mở rộng</string>
     <string name="method_toggle_dark_mode">Double Toggle Dark Mode</string>
     <string name="method_restart_systemui">Khởi động lại SystemUI</string>
     <string name="method_do_nothing">Không Làm Gì (Tôi sẽ tự làm)</string>
     <string name="list_title_xposed_settings">Cài đặt Xposed</string>
-    <string name="list_title_show_warning">Hiển thị cảnh báo</string>
-    <string name="list_desc_show_warning">Hiển thị cảnh báo về cách tối ưu lại mô-đun trong Menu XPosed</string>
+    <string name="settings_show_warning_title">Hiển thị cảnh báo</string>
+    <string name="settings_show_warning_desc">Hiển thị cảnh báo về cách tối ưu lại mô-đun trong Menu XPosed</string>
     <string name="list_title_force_apply_method">Buộc áp dụng phương pháp</string>
     <string name="list_desc_force_apply_method">Phương pháp buộc áp dụng các thay đổi trong menu xposed</string>
     <string name="list_title_miscellaneous_settings">Cài đặt linh tinh</string>
@@ -441,8 +438,8 @@
     <string name="battery_height_title">Chiều cao pin</string>
     <string name="disable_animation_title">Tắt hoạt hình</string>
     <string name="disable_animation_desc">Tắt hoạt ảnh cuộn của Iconify</string>
-    <string name="restart_systemui_after_boot_title">Khởi động lại SystemUI sau khi khởi động</string>
-    <string name="restart_systemui_after_boot_desc">Một số tùy chọn như cường độ mờ không có hiệu lực cho đến khi khởi động lại systemui</string>
+    <string name="settings_restart_systemui_after_boot_title">Khởi động lại SystemUI sau khi khởi động</string>
+    <string name="settings_restart_systemui_after_boot_desc">Một số tùy chọn như cường độ mờ không có hiệu lực cho đến khi khởi động lại systemui</string>
     <string name="btn_skip">Bỏ qua</string>
     <string name="onboarding_title_1">Chán giao diện người dùng gốc?</string>
     <string name="onboarding_desc_1">Hãy tùy chỉnh mọi thứ theo ý thích của chúng ta.</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 13f06347f..9fed4f640 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -150,10 +150,8 @@
     <string name="qspanel_row_title">快速设置面板行</string>
     <string name="qspanel_column_title">快速设置面板列</string>
     <string name="btn_reset">重置</string>
-    <string name="row_and_column_title">行与列</string>
-    <string name="row_and_column_desc">更改快速设置图块的行与列</string>
-    <string name="icon_and_label_title">图标和标签</string>
-    <string name="icon_and_label_desc">改变图标和标签选项</string>
+    <string name="activity_desc_qs_row_column">更改快速设置图块的行与列</string>
+    <string name="activity_desc_qs_icon_label">改变图标和标签选项</string>
     <string name="vp_thin_background_title">薄背景</string>
     <string name="vp_thick_background_title">厚背景</string>
     <string name="vp_no_background_title">无背景</string>
@@ -191,8 +189,8 @@
     <string name="installing">安装中</string>
     <string name="toast_error">出了点问题</string>
     <string name="reboot_needed">请先重启你的设备！</string>
-    <string name="disable_everything_title">禁用所有功能</string>
-    <string name="disable_everything_desc">禁用 Iconify 的所有应用覆盖、颜色和杂项修改。</string>
+    <string name="settings_disable_everything_title">禁用所有功能</string>
+    <string name="settings_disable_everything_desc">禁用 Iconify 的所有应用覆盖、颜色和杂项修改。</string>
     <string name="toast_disable_everything">长按可禁用所有功能</string>
     <string name="toast_disabled_everything">所有功能已禁用</string>
     <string name="restart_sysui_title">重启 SystemUI</string>
@@ -252,8 +250,7 @@
     <string name="update_schedule3">每天</string>
     <string name="update_schedule4">每周</string>
     <string name="update_schedule5">从不</string>
-    <!-- do not change {latestVersionName} -->
-    <string name="update_dialog_desc">更新 {latestVersionName} 可供下载。</string>
+    <string name="update_dialog_desc">更新 %s 可供下载。</string>
     <string name="checking_for_update">检查更新</string>
     <string name="toast_module_created">模块创建成功</string>
     <string name="volume_style">音量样式</string>
@@ -276,7 +273,7 @@
     <string name="header_image_height_title">图片高度</string>
     <string name="hide_status_icons_title">隐藏状态图标</string>
     <string name="hide_status_icons_desc">移除时间、日期和电池图标</string>
-    <string name="image_alpha">图片透明度</string>
+    <string name="header_image_alpha">图片透明度</string>
     <string name="toast_rename_file">将文件重命名为更简单的东西</string>
     <string name="custom_lockscreen_clock_title">自定义锁屏时钟</string>
     <string name="custom_lockscreen_clock_desc">启用自定义锁屏时钟</string>
@@ -454,17 +451,17 @@
     <string name="module_installation_step4">对齐覆盖层APK</string>
     <string name="module_installation_step5">签名覆盖层APK</string>
     <string name="module_installation_step6">清理目录</string>
-    <string name="portrait">(Portrait)</string>
+    <string name="section_title_portrait">Portrait</string>
     <string name="qs_tile_expanded_height">拓展高度</string>
-    <string name="landscape">(Landscape)</string>
+    <string name="section_title_landscape">Landscape</string>
     <string name="toast_storage_access">启动“所有文件访问权限”页面</string>
     <string name="qs_tile_non_expanded_height">非扩展高度</string>
     <string name="method_toggle_dark_mode">双重切换深色模式</string>
     <string name="method_restart_systemui">重启 SystemUI</string>
     <string name="method_do_nothing">什么都不做（我会自己来做）</string>
     <string name="list_title_xposed_settings">Xposed 设置</string>
-    <string name="list_title_show_warning">显示警告</string>
-    <string name="list_desc_show_warning">在 Xposed 菜单中显示关于如何重新优化模块的警告</string>
+    <string name="settings_show_warning_title">显示警告</string>
+    <string name="settings_show_warning_desc">在 Xposed 菜单中显示关于如何重新优化模块的警告</string>
     <string name="list_title_force_apply_method">强制应用方法</string>
     <string name="list_desc_force_apply_method">强制应用 Xposed 菜单中的更改的方法</string>
     <string name="list_title_miscellaneous_settings">杂项设置</string>
@@ -479,8 +476,8 @@
     <string name="battery_height_title">电池高度</string>
     <string name="disable_animation_title">禁用动画</string>
     <string name="disable_animation_desc">禁用 Iconify 的滚动动画</string>
-    <string name="restart_systemui_after_boot_title">开机后重启 SystemUI</string>
-    <string name="restart_systemui_after_boot_desc">一些选项，如模糊强度，在重新启动 SystemUI 之前不会生效</string>
+    <string name="settings_restart_systemui_after_boot_title">开机后重启 SystemUI</string>
+    <string name="settings_restart_systemui_after_boot_desc">一些选项，如模糊强度，在重新启动 SystemUI 之前不会生效</string>
     <string name="btn_skip">跳过</string>
     <string name="onboarding_title_1">厌倦了原生用户界面？</string>
     <string name="onboarding_desc_1">让我们按照自己的喜好来自定义一切。</string>
@@ -540,11 +537,11 @@
     <string name="pill_width_title">药丸宽度</string>
     <string name="pill_thickness_title">药丸厚度</string>
     <string name="pill_bottom_space_title">底部间距</string>
-    <string name="app_language">语言</string>
-    <string name="app_theme">App 主题</string>
-    <string name="app_theme_light">浅色主题</string>
-    <string name="app_theme_dark">深色主题</string>
-    <string name="app_theme_system">跟随系统</string>
+    <string name="settings_app_language">语言</string>
+    <string name="settings_app_theme">App 主题</string>
+    <string name="settings_app_theme_light">浅色主题</string>
+    <string name="settings_app_theme_dark">深色主题</string>
+    <string name="settings_app_theme_system">跟随系统</string>
     <string name="header_image_hide_in_landscape_title">在 Landscape 中隐藏</string>
     <string name="header_image_hide_in_landscape_desc">在 Landscape 模式中隐藏图像</string>
     <string name="black_theme_title">Pixel 深色主题</string>
@@ -572,10 +569,10 @@
     <string name="settings_iconpack_bubble_v1">内嵌多色图标包</string>
     <string name="settings_iconpack_bubble_v2">轮廓多色图标包</string>
     <string name="battery_margin_title">电池余量</string>
-    <string name="app_icon">App 图标</string>
-    <string name="app_icon_default">默认图标</string>
-    <string name="app_icon_themed">带主题的图标</string>
-    <string name="app_icon_retro">怀旧图标</string>
+    <string name="settings_app_icon">App 图标</string>
+    <string name="settings_app_icon_default">默认图标</string>
+    <string name="settings_app_icon_themed">带主题的图标</string>
+    <string name="settings_app_icon_retro">怀旧图标</string>
     <string name="lockscreen_customization_title">锁屏自定义</string>
     <string name="lockscreen_customization_desc">启用锁屏自定义</string>
     <string name="notification_transparency_title">通知透明度</string>
@@ -599,8 +596,8 @@
     <string name="lockscreen_clock_auto_hide_clock_title">自动隐藏时钟</string>
     <string name="lockscreen_clock_auto_hide_clock_desc">在收到通知时隐藏时钟</string>
     <string name="toast_clear_cache">Iconify 缓存已清理</string>
-    <string name="clear_app_cache_title">清理应用程序缓存</string>
-    <string name="clear_app_cache_desc">清除因使用自定义字体、图像或 gif 而产生的缓存。</string>
+    <string name="settings_clear_app_cache_title">清理应用程序缓存</string>
+    <string name="settings_clear_app_cache_desc">清除因使用自定义字体、图像或 gif 而产生的缓存。</string>
     <string name="lsclock_custom_color_title">自定义时钟颜色</string>
     <string name="lsclock_custom_color_desc">自定义颜色代替原色</string>
     <string name="lsclock_color_picker_title">时钟颜色选取</string>
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 2bef17af0..c2d1d5c4d 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -32,9 +32,9 @@
         <item>vi</item>
     </string-array>
     <string-array name="app_icon">
-        <item>@string/app_icon_default</item>
-        <item>@string/app_icon_themed</item>
-        <item>@string/app_icon_retro</item>
+        <item>@string/settings_app_icon_default</item>
+        <item>@string/settings_app_icon_themed</item>
+        <item>@string/settings_app_icon_retro</item>
     </string-array>
     <string-array name="app_icon_identifier" translatable="false">
         <item>SplashActivity</item>
@@ -42,9 +42,9 @@
         <item>SplashActivityRetro</item>
     </string-array>
     <string-array name="app_theme">
-        <item>@string/app_theme_light</item>
-        <item>@string/app_theme_dark</item>
-        <item>@string/app_theme_system</item>
+        <item>@string/settings_app_theme_light</item>
+        <item>@string/settings_app_theme_dark</item>
+        <item>@string/settings_app_theme_system</item>
     </string-array>
     <string-array name="settings_icon_bg">
         <item>@string/settings_icons_minimal</item>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 92cbbf993..766870d74 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,116 +1,277 @@
 <resources>
     <string name="app_name" translatable="false">Iconify</string>
+    <string name="app_moto">Customize Boring Android UI</string>
 
-    <!-- Activities -->
-    <string name="activity_title_brightness_bar">Brightness Bar</string>
-    <string name="activity_desc_brightness_bar">Customize progress slider</string>
-    <string name="activity_title_color_engine">Color Engine</string>
-    <string name="activity_desc_color_engine">Have control over colors</string>
-    <string name="activity_title_extras">Extras</string>
-    <string name="activity_desc_extras">Additional tweaks and options</string>
+    <!-- Onboarding -->
+    <string name="init_module_installation">Initializing setup</string>
+    <string name="step">Step</string>
+    <string name="module_installation_step1">Creating module shell</string>
+    <string name="module_installation_step2">Extracting necessary files</string>
+    <string name="module_installation_step3">Creating overlay APKs</string>
+    <string name="module_installation_step4">Aligning overlay APKs</string>
+    <string name="module_installation_step5">Signing overlay APKs</string>
+    <string name="module_installation_step6">Cleaning directories</string>
+    <string name="disable_animation_title">Disable Animation</string>
+    <string name="disable_animation_desc">Disable scrolling animation of Iconify</string>
+    <string name="onboarding_title_1">Got Bored of Stock UI ?</string>
+    <string name="onboarding_desc_1">Let\'s customize everything to our likings.</string>
+    <string name="onboarding_title_2">Is My Device Supported ?</string>
+    <string name="onboarding_desc_2">Iconify supports all Pixel and AOSP based ROMs.</string>
+    <string name="onboarding_title_3">Shall We Begin Now ?</string>
+    <string name="onboarding_desc_3">It is time for iconify to do some internal work.</string>
+    <string name="need_storage_perm_title">Need Storage Permission</string>
+    <string name="need_storage_perm_desc">Storage permission is required to build the necessary files.</string>
+    <string name="magisk_not_found_title">Could Not Find Magisk</string>
+    <string name="magisk_not_found_desc">Use Magisk to root your device!</string>
+    <string name="root_not_found_title">Root Is Not Accessible</string>
+    <string name="root_not_found_desc">Looks like your device is not rooted!</string>
+    <string name="need_reboot_title">Need Device Reboot</string>
+    <string name="need_reboot_desc">Reboot your device to put all files in place.</string>
+    <string name="installation_failed_title">Oops Did Not Expect That</string>
+    <string name="installation_failed_desc">Logs have been saved in documents folder.</string>
+    <string name="logs">Logs</string>
+
+    <!-- Home -->
     <string name="activity_title_home_page">Iconify</string>
     <string name="activity_title_icon_pack">Icon Pack</string>
     <string name="activity_desc_icon_pack">Change system icon pack</string>
-    <string name="activity_title_info">About</string>
-    <string name="activity_desc_info">Information about this app</string>
-    <string name="activity_title_media_player">Media Player</string>
-    <string name="activity_desc_media_player">Change how media player looks</string>
+    <string name="activity_title_brightness_bar">Brightness Bar</string>
+    <string name="activity_desc_brightness_bar">Customize progress slider</string>
+    <string name="activity_title_qs_shape">QS Panel Tiles</string>
+    <string name="activity_desc_qs_shape">Customize QS panel tiles</string>
     <string name="activity_title_notification">Notification</string>
     <string name="activity_desc_notification">Customize notification style</string>
-    <string name="activity_title_qs_icon_label">Icon and Label</string>
+    <string name="activity_title_progress_bar">Progress Bar</string>
+    <string name="activity_desc_progress_bar">Use different progress style</string>
+    <string name="activity_title_switch">Switch</string>
+    <string name="activity_desc_switch">Customize switch appearance</string>
+    <string name="activity_title_toast_frame">Toast Frame</string>
+    <string name="activity_desc_toast_frame">Change toast notification style</string>
+    <string name="activity_title_icon_shape">Icon Shape</string>
+    <string name="activity_desc_icon_shape">Change system icon shapes</string>
+    <string name="iconify_updated_title">Iconify Just Got Updated!</string>
+    <string name="iconify_updated_desc">Reboot your phone to use the latest added features and options.</string>
+
+    <!-- Home Card View -->
+    <string name="home_card_title">Design It Your Way</string>
+    <string name="home_card_subtitle">Unleash Your Imagination, Make It Yours</string>
+    <string name="home_card_hide">Hide</string>
+
+    <!-- Tweaks -->
+    <string name="activity_title_color_engine">Color Engine</string>
+    <string name="activity_desc_color_engine">Have control over colors</string>
+    <string name="activity_title_ui_roundness">UI Roundness</string>
+    <string name="activity_desc_ui_roundness">Change corner radius of interface</string>
     <string name="activity_title_qs_row_column">Row and Column</string>
-    <string name="activity_title_qs_shape">QS Panel Tiles</string>
-    <string name="activity_desc_qs_shape">Customize QS panel tiles</string>
-    <string name="activity_title_settings">Settings</string>
-    <string name="activity_desc_settings">Miscellaneous settings</string>
+    <string name="activity_desc_qs_row_column">Change Qs tile rows and columns</string>
+    <string name="activity_title_qs_icon_label">Icon and Label</string>
+    <string name="activity_desc_qs_icon_label">Change icon and label options</string>
+    <string name="activity_title_qs_tile_size">QS Tile Size</string>
+    <string name="activity_desc_qs_tile_size">Change height of QS panel tile</string>
+    <string name="activity_title_qs_panel_margin">QS Panel Margin</string>
+    <string name="activity_desc_qs_panel_margin">Modify quick settings margins</string>
+    <string name="activity_title_statusbar">Statusbar</string>
+    <string name="activity_desc_statusbar">Modify statusbar interface</string>
+    <string name="activity_title_navigation_bar">Navigation Bar</string>
+    <string name="activity_desc_navigation_bar">Tweak navigation options</string>
     <string name="activity_title_volume_panel">Volume Panel</string>
     <string name="activity_desc_volume_panel">Customize volume panel design</string>
-    <string name="activity_title_monet_engine">Monet Engine</string>
-    <string name="activity_desc_monet_engine">Override monet color palette</string>
-    <string name="activity_title_experimental">Experimental</string>
-    <string name="activity_title_changelog">Changelog</string>
-    <string name="activity_title_xposed_menu">Xposed Menu</string>
-    <string name="activity_desc_xposed_menu">LSPosed required for these options</string>
+    <string name="activity_title_media_player">Media Player</string>
+    <string name="activity_desc_media_player">Change how media player looks</string>
     <string name="activity_title_miscellaneous">Miscellaneous</string>
     <string name="activity_desc_miscellaneous">Miscellaneous customization</string>
-    <string name="activity_title_transparency_blur">Transparency &amp; Blur</string>
-    <string name="activity_desc_transparency_blur">Enable QS blur and transparency</string>
-    <string name="activity_title_lockscreen_clock">Lockscreen Clock</string>
-    <string name="activity_desc_lockscreen_clock">Add custom clock on lockscreen</string>
-    <string name="activity_title_ui_roundness">UI Roundness</string>
-    <string name="activity_desc_ui_roundness">Change corner radius of interface</string>
-    <string name="activity_title_navigation_bar">Navigation Bar</string>
-    <string name="activity_desc_navigation_bar">Tweak navigation options</string>
-    <string name="activity_title_header_image">Header Image</string>
-    <string name="activity_desc_header_image">Add custom image on QS panel</string>
-    <string name="activity_title_header_clock">Header Clock</string>
-    <string name="activity_desc_header_clock">Add custom clock on QS panel</string>
-    <string name="activity_title_background_chip">Background Chip</string>
-    <string name="activity_desc_background_chip">Add colored chip behind clock</string>
-    <string name="activity_title_quick_settings">Quick Settings</string>
-    <string name="activity_desc_quick_settings">Tweaks related to QS panel</string>
+    <string name="activity_title_xposed_menu">Xposed Menu</string>
+    <string name="activity_desc_xposed_menu">LSPosed required for these options</string>
+    <string name="activity_title_extras">Extras</string>
+    <string name="activity_desc_extras">Additional tweaks and options</string>
+
+    <!-- Settings -->
+    <string name="settings_section_title_general">General</string>
+    <string name="settings_app_language">Language</string>
+    <string name="settings_app_icon">App Icon</string>
+    <string name="settings_app_icon_default">Default Icon</string>
+    <string name="settings_app_icon_themed">Themed Icon</string>
+    <string name="settings_app_icon_retro">Retro Icon</string>
+    <string name="settings_app_theme">App Theme</string>
+    <string name="settings_app_theme_light">Light Theme</string>
+    <string name="settings_app_theme_dark">Dark Theme</string>
+    <string name="settings_app_theme_system">Follow System</string>
+    <string name="settings_section_title_update">Update</string>
+    <string name="settings_check_for_update">Check For Update</string>
+    <string name="settings_current_version">Current version: %s</string>
+    <string name="settings_auto_update_title">Auto Update</string>
+    <string name="settings_auto_update_desc">Check for new versions when opening the app.</string>
+    <string name="settings_section_title_xposed">Xposed</string>
+    <string name="settings_show_warning_title">Show Warning</string>
+    <string name="settings_show_warning_desc">Show warning on how to re-optimize module in Xposed Menu.</string>
+    <string name="settings_restart_systemui_behavior">Restart SystemUI Behavior</string>
+    <string name="settings_auto_restart_systemui">Automatically restart SystemUI.</string>
+    <string name="settings_manual_restart_systemui">Notify for manual restart.</string>
+    <string name="settings_systemui_restart_required">SystemUI restart required</string>
+    <string name="settings_section_title_miscellaneous">Miscellaneous</string>
+    <string name="settings_restart_systemui_after_boot_title">Restart SystemUI After Boot</string>
+    <string name="settings_restart_systemui_after_boot_desc">Some options like blur intensity doesn\'t take effect until systemui is restarted</string>
+    <string name="settings_show_home_page_card_title">Show Home Page Card</string>
+    <string name="settings_show_home_page_card_desc">Show a beautiful card on the home page.</string>
+    <string name="settings_clear_app_cache_title">Clear App Cache</string>
+    <string name="settings_clear_app_cache_desc">Clear caches generated due to the usage of custom fonts, images, or gifs.</string>
+    <string name="activity_title_experimental">Experimental</string>
+    <string name="activity_desc_experimental">Try out experimental functionalities.</string>
+    <string name="settings_disable_everything_title">Disable Everything</string>
+    <string name="settings_disable_everything_desc">Disable all Iconify overlays, colors, and miscellaneous changes.</string>
+    <string name="settings_section_title_about">About</string>
+    <string name="settings_github_repository_title">Github Repository</string>
+    <string name="settings_github_repository_desc" translatable="false">Mahmud0808/Iconify</string>
+    <string name="settings_telegram_group_title">Telegram Group</string>
+    <string name="settings_telegram_group_desc" translatable="false">\@IconifyDiscussion</string>
+    <string name="settings_credits_title">Credits</string>
+    <string name="settings_credits_desc">Thanking those who made this possible.</string>
+
+    <!-- Icon Pack -->
     <string name="activity_title_colored_battery">Colored Battery</string>
     <string name="activity_desc_colored_battery">Change battery icon color</string>
-    <string name="activity_title_xposed_others">Others</string>
-    <string name="activity_desc_xposed_others">Miscellaneous xposed tweaks</string>
-    <string name="activity_title_statusbar">Statusbar</string>
-    <string name="activity_desc_statusbar">Modify statusbar interface</string>
-    <string name="activity_title_basic_colors">Basic Colors</string>
-    <string name="activity_desc_basic_colors">Change primary and secondary color</string>
+    <string name="activity_title_media_icons">Media Icons</string>
+    <string name="activity_desc_media_icons">Change media player icons</string>
     <string name="activity_title_settings_icons">Settings Icons</string>
     <string name="activity_desc_settings_icons">Change settings icon pack</string>
-    <string name="activity_title_icon_shape">Icon Shape</string>
-    <string name="activity_desc_icon_shape">Change system icon shapes</string>
+    <string name="icon_pack_styles">Icon Pack Styles</string>
+    <string name="iconpack_aurora_desc">Dual tone linear icon pack</string>
+    <string name="iconpack_gradicon_desc">Gradient shaded filled icon pack</string>
+    <string name="iconpack_lorn_desc">Thick linear icon pack</string>
+    <string name="iconpack_plumpy_desc">Dual tone filled icon pack</string>
+    <string name="iconpack_acherus_desc">Acherus sub icon pack</string>
+    <string name="iconpack_circular_desc">Thin line icon pack</string>
+    <string name="iconpack_filled_desc">Dual tone filled icon pack</string>
+    <string name="iconpack_kai_desc">Thin line icon pack</string>
+    <string name="iconpack_oos_desc">Oxygen OS icon pack</string>
+    <string name="iconpack_outline_desc">Thin outline icon pack</string>
+    <string name="iconpack_pui_desc">Thick dualtone icon pack</string>
+    <string name="iconpack_rounded_desc">Rounded corner icon pack</string>
+    <string name="iconpack_sam_desc">Filled icon pack</string>
+    <string name="iconpack_victor_desc">Edgy icon pack</string>
+
+    <!-- Colored Battery -->
+    <string name="enable_colored_battery_title">Enable colored battery</string>
+    <string name="enable_colored_battery_desc">Use custom color for battery icon</string>
+    <string name="battery_background_color_title">Background color</string>
+    <string name="battery_background_color_desc">Battery fill container color</string>
+    <string name="battery_filled_color_title">Filled color</string>
+    <string name="battery_filled_color_desc">Battery level indicator color</string>
+
+    <!-- Media Icons -->
+    <string name="no_supported_music_player">Supported Music Player Not Found</string>
+    <string name="a13_default_media_player">Android 13 Default Player</string>
+    <string name="app_not_found">Application not found!</string>
+    <string name="iconpack_aurora">Aurora</string>
+    <string name="iconpack_gradicon">Gradicon</string>
+    <string name="iconpack_plumpy">Plumpy</string>
+
+    <!-- Settings Icons -->
+    <string name="settings_icons_background">Background</string>
+    <string name="settings_icons_minimal">Minimal</string>
+    <string name="settings_icons_filled">Filled</string>
+    <string name="settings_icons_outline">Outline</string>
+    <string name="settings_icons_neumorph">Neumorph</string>
+    <string name="settings_icons_shape">Shape</string>
+    <string name="settings_icons_circle">Circle</string>
+    <string name="settings_icons_squircle">Squircle</string>
+    <string name="settings_icons_square">Square</string>
+    <string name="settings_icons_size">Icon Size</string>
+    <string name="settings_icons_size1">0.5x</string>
+    <string name="settings_icons_size2">0.65x</string>
+    <string name="settings_icons_size3">0.8x</string>
+    <string name="settings_icons_size4">1.0x</string>
+    <string name="settins_icons_icon_color">Icon Color</string>
+    <string name="settings_icons_follow_system">Follow System</string>
+    <string name="settings_icons_system_inverse">System Inverse</string>
+    <string name="settings_icons_monet_accent">Monet / Accent</string>
+    <string name="settings_iconpack_bubble_v1">Inline multicolored icon pack</string>
+    <string name="settings_iconpack_bubble_v2">Outline multicolored icon pack</string>
+
+    <!-- Pixel Variant -->
     <string name="activity_title_pixel_variant">Pixel Variant</string>
     <string name="activity_desc_pixel_variant">For roms with black QS panel</string>
-    <string name="activity_title_qs_tile_size">QS Tile Size</string>
-    <string name="activity_desc_qs_tile_size">Change height of QS panel tile</string>
-    <string name="activity_title_battery_style">Battery Style</string>
-    <string name="activity_desc_battery_style">Customize battery icon view</string>
-    <string name="activity_title_toast_frame">Toast Frame</string>
-    <string name="activity_desc_toast_frame">Change toast notification style</string>
-    <string name="activity_title_progress_bar">Progress Bar</string>
-    <string name="activity_desc_progress_bar">Use different progress style</string>
-    <string name="activity_title_switch">Switch</string>
-    <string name="activity_desc_switch">Customize switch appearance</string>
-    <string name="activity_title_media_icons">Media Icons</string>
-    <string name="activity_desc_media_icons">Change media player icons</string>
-    <string name="activity_title_qs_panel">QS Panel</string>
-    <string name="activity_desc_qs_panel">Modify quick settings panel</string>
-    <string name="activity_title_qs_panel_margin">QS Panel Margin</string>
-    <string name="activity_desc_qs_panel_margin">Modify quick settings margins</string>
 
+    <!-- Brightness Bar -->
+    <string name="brightness_bar_styles">Brightness Bar Styles</string>
+
+    <!-- QS Panel Tiles -->
+    <string name="qspanel_tile_styles">QS Panel Tile Styles</string>
+
+    <!-- Notification -->
+    <string name="notification_styles">Notification Styles</string>
+    <string name="notif_preview_desc">Notification Preview.\nClick to apply this style.</string>
+
+    <!-- Switch -->
+    <string name="click_to_enable_or_disable">Click to enable or disable</string>
+
+    <!-- Icon Shape -->
+    <string name="icon_mask_style_none">None</string>
+    <string name="icon_mask_style_pebble">Pebble</string>
+    <string name="icon_mask_style_hexagon">Hexagon</string>
+    <string name="icon_mask_style_samsung">Samsung</string>
+    <string name="icon_mask_style_scroll">Scroll</string>
+    <string name="icon_mask_style_square">Square</string>
+    <string name="icon_mask_style_teardrop">Teardrop</string>
+    <string name="icon_mask_style_rounded_rectangle">Rounded\nRectangle</string>
+    <string name="icon_mask_style_ios">iOS</string>
+    <string name="icon_mask_style_cloudy">Cloudy</string>
+    <string name="icon_mask_style_cylinder">Cylinder</string>
+    <string name="icon_mask_style_flower">Flower</string>
+    <string name="icon_mask_style_heart">Heart</string>
+    <string name="icon_mask_style_leaf">Leaf</string>
+    <string name="icon_mask_style_stretched">Streteched</string>
+    <string name="icon_mask_style_tapered_rectangle">Tapered\nRectangle</string>
+    <string name="icon_mask_style_vessel">Vessel</string>
+    <string name="icon_mask_style_rice_rohie_meow">Rohie Meow</string>
+
+    <!-- Color Engine -->
+    <string name="activity_title_basic_colors">Basic Colors</string>
+    <string name="activity_desc_basic_colors">Change primary and secondary color</string>
+    <string name="activity_title_monet_engine">Monet Engine</string>
+    <string name="activity_desc_monet_engine">Override monet color palette</string>
+    <string name="section_title_stock_colors">Stock Colors</string>
     <string name="apply_monet_accent_title">Monet Accent</string>
     <string name="apply_monet_accent_desc">Use system monet as accent</string>
     <string name="apply_monet_gradient_title">Monet Gradient</string>
     <string name="apply_monet_gradient_desc">Use system monet as gradient</string>
-    <string name="color_picker_preview">Color Picker Preview</string>
-    <string name="accurate_shades_title">Accurate Shades</string>
-    <string name="accurate_shades_desc">Disable this to get exact chosen colors</string>
-    <string name="primary_color">Primary Color</string>
-    <string name="color_picker_title">Color Picker</string>
-    <string name="secondary_color">Secondary Color</string>
-    <string name="minimal_qspanel">Minimal QS Panel</string>
-    <string name="remove_top_shade_of_qspanel">Remove top shade of QS panel</string>
+    <string name="section_title_dark_theme">Dark Theme</string>
     <string name="pitch_black_dark_title">Pitch Black (Dark)</string>
     <string name="pitch_black_dark_desc">Enable pitch black dark theme</string>
     <string name="pitch_black_amoled_title">Pitch Black (Amoled)</string>
     <string name="pitch_black_amoled_desc">Enable pitch black amoled theme</string>
-    <string name="tile_pitch_black">Pitch Black</string>
-    <string name="tile_pitch_black_dark">Dark</string>
-    <string name="tile_pitch_black_amoled">Amoled</string>
-    <string name="warning">Warning</string>
-    <string name="btn_continue">Continue</string>
-    <string name="iconify_logo">Iconify Logo</string>
-    <string name="hey_there">Hey There!</string>
-    <string name="btn_restart">Restart</string>
-    <string name="btn_disable">Disable</string>
-    <string name="btn_enable">Enable</string>
-    <string name="btn_apply">Apply</string>
+    <string name="section_title_misc">Misc</string>
+    <string name="minimal_qspanel">Minimal QS Panel</string>
+    <string name="remove_top_shade_of_qspanel">Remove top shade of QS panel</string>
+    <string name="disable_monet_title">Disable System Monet</string>
+    <string name="disable_monet_desc">Helps to retain custom colors\nSystemUI restart required</string>
+
+    <!-- Basic Colors -->
+    <string name="primary_color">Primary Color</string>
+    <string name="primary_color_desc">Pick primary accent color</string>
+    <string name="secondary_color">Secondary Color</string>
+    <string name="secondary_color_desc">Pick secondary accent color</string>
+
+    <!-- Monet Engine -->
+    <string name="accurate_shades_title">Accurate Shades</string>
+    <string name="accurate_shades_desc">Disable this to get exact chosen colors</string>
+    <string name="monet_style_title">Monet Style</string>
+    <string name="monet_neutral">Neutral</string>
+    <string name="monet_monochrome">Monochrome</string>
+    <string name="monet_tonalspot">Tonal Spot</string>
+    <string name="monet_vibrant">Vibrant</string>
+    <string name="monet_rainbow">Rainbow</string>
+    <string name="monet_expressive">Expressive</string>
+    <string name="monet_fidelity">Fidelity</string>
+    <string name="monet_fruitsalad">Fruit Salad</string>
+    <string name="monet_content">Content</string>
+    <string name="monet_primary_accent_saturation_title">Primary Accent Saturation</string>
+    <string name="monet_secondary_accent_saturation_title">Secondary Accent Saturation</string>
+    <string name="monet_background_saturation_title">Background Saturation</string>
+    <string name="monet_background_lightness_title">Background Lightness</string>
+
+    <!-- UI Roundness -->
     <string name="corner_radius_title">Corner Radius</string>
-    <string name="icon">Icon</string>
-    <string name="btn_disable_custom_colors">Disable Custom Colors</string>
-    <string name="btn_enable_custom_colors">Apply Colors</string>
     <string name="qstile_btn1_title">Internet</string>
     <string name="qstile_btn1_desc">RIP in Peace</string>
     <string name="qstile_btn2_title">Airplane</string>
@@ -119,23 +280,23 @@
     <string name="qstile_btn3_desc">Off</string>
     <string name="qstile_btn4_title">Bluetooth</string>
     <string name="qstile_btn4_desc">On</string>
-    <string name="app_moto">Customize Boring Android UI</string>
-    <string name="section_title_credits">Credits</string>
-    <string name="section_title_thanks">Special Thanks</string>
-    <string name="section_title_contributors">Contributors</string>
-    <string name="cont_desc_media_player">Media Player Preview</string>
-    <string name="mp_accent_background_title">Accent Background</string>
-    <string name="mp_system_background_title">System Background</string>
-    <string name="mp_pb_background_title">Pitch Black Background</string>
-    <string name="section_title_media_player_icons">Media Player Icons</string>
+
+    <!-- Row and Column -->
+    <string name="qs_row_column_warn_desc">Certain combinations may not be compatible with certain ROMs. In such instances, simply experiment with alternative combinations until you find the one that best suits your needs.</string>
+    <string name="quick_qspanel_row_title">Quick QS Panel Row</string>
+    <string name="qspanel_row_title">QS Panel Row</string>
+    <string name="qspanel_column_title">QS Panel Column</string>
+
+    <!-- Icon and Label -->
+    <string name="section_title_size_and_position">Size and Position</string>
     <string name="hide_label_title">Hide Label</string>
     <string name="hide_label_desc">Remove QS tile labels</string>
     <string name="text_size_title">Text Size</string>
-    <string name="opt_selected">Selected:</string>
-    <string name="opt_default">(Default)</string>
     <string name="icon_size_title">Icon Size</string>
     <string name="move_icon_title">Move Icon</string>
     <string name="section_title_qs_text_color">QS Text Color</string>
+    <string name="qs_text_color_normal">Normal</string>
+    <string name="qs_text_color_pixel">Pixel</string>
     <string name="label_always_white_title">Always White</string>
     <string name="label_always_white_desc">Title white, subtitle white</string>
     <string name="label_always_white_v2_title">Always White v2</string>
@@ -146,59 +307,31 @@
     <string name="label_follow_system_v2_desc">Title system, subtitle accent</string>
     <string name="label_fix_text_color_title">Fix Text Color</string>
     <string name="label_fix_text_color_desc">Use if above ones did not work</string>
-    <string name="qs_row_column_warn_desc">Certain combinations may not be compatible with certain ROMs. In such instances, simply experiment with alternative combinations until you find the one that best suits your needs.</string>
-    <string name="quick_qspanel_row_title">Quick QS Panel Row</string>
-    <string name="qspanel_row_title">QS Panel Row</string>
-    <string name="qspanel_column_title">QS Panel Column</string>
-    <string name="btn_reset">Reset</string>
-    <string name="row_and_column_title">Row and Column</string>
-    <string name="row_and_column_desc">Change Qs tile rows and columns</string>
-    <string name="icon_and_label_title">Icon and Label</string>
-    <string name="icon_and_label_desc">Change icon and label options</string>
-    <string name="vp_thin_background_title">Thin Background</string>
-    <string name="vp_thick_background_title">Thick Background</string>
-    <string name="vp_no_background_title">No Background</string>
-    <string name="iconify_updated_title">Iconify Just Got Updated!</string>
-    <string name="iconify_updated_desc">Reboot your phone to use the latest added features and options.</string>
-    <string name="btn_reboot_now">Reboot Now</string>
-    <string name="iconpack_aurora">Aurora</string>
-    <string name="iconpack_gradicon">Gradicon</string>
-    <string name="iconpack_plumpy">Plumpy</string>
-    <string name="notif_preview_desc">Notification Preview.\nClick to apply this style.</string>
-    <string name="loading_dialog_wait">Please Wait</string>
-    <string name="toast_applied">Applied</string>
-    <string name="toast_disabled">Disabled</string>
-    <string name="toast_reset">Reset</string>
-    <string name="toast_reboot">Reboot required</string>
-    <string name="rebooting_desc">Rebooting in 5 seconds</string>
-    <string name="iconify_clipboard_label_version">Iconify Version</string>
-    <string name="iconify_clipboard_label_version_name">Version Name:</string>
-    <string name="iconify_clipboard_label_version_code">Version Code:</string>
-    <string name="toast_copied">Copied to Clipboard</string>
-    <string name="info_version_title">Version</string>
-    <string name="info_github_title">GitHub</string>
-    <string name="info_github_desc">Check out github repository.</string>
-    <string name="info_telegram_title">Telegram</string>
-    <string name="info_telegram_desc">Follow to get latest news &amp; updates.</string>
-    <string name="info_icons8_desc">For Plumpy &amp; Fluency icons.</string>
-    <string name="info_iconsax_desc">For in-app icon set.</string>
-    <string name="info_shell_desc">For helping me with Shell Script.</string>
-    <string name="info_rro_desc">For helping me with RRO.</string>
-    <string name="info_tester_desc">For testing the app.</string>
-    <string name="info_betterqs_desc">For permission to use better QS.</string>
-    <string name="info_contributor_desc">For contributing on github.</string>
-    <string name="opt_applied">- Applied</string>
-    <string name="perm_storage_access">Grant storage access first!</string>
-    <string name="installing">Installing</string>
-    <string name="toast_error">Something went wrong</string>
-    <string name="reboot_needed">Reboot your device first!</string>
-    <string name="disable_everything_title">Disable Everything</string>
-    <string name="disable_everything_desc">Disable all Iconify overlays, colors, and miscellaneous changes.</string>
-    <string name="toast_disable_everything">Long press to disable everything</string>
-    <string name="toast_disabled_everything">Everything is disabled</string>
-    <string name="restart_sysui_title">Restart SystemUI</string>
-    <string name="restart_sysui_desc">Restart SystemUI if applied options are not immediately visible.</string>
-    <string name="toast_restart_sysui">Long press to restart SystemUI</string>
+
+    <!-- QS Tile Size -->
+    <string name="section_title_portrait">Portrait Mode</string>
+    <string name="section_title_landscape">Landscape Mode</string>
+    <string name="qs_tile_non_expanded_height">Non-Expanded Height</string>
+    <string name="qs_tile_expanded_height">Expanded Height</string>
+
+    <!-- QS Panel Margin -->
+    <string name="qqs_panel_top_margin_title">QQS Panel Top Margin</string>
+    <string name="qs_panel_top_margin_title">QS Panel Top Margin</string>
+
+    <!-- Statusbar -->
+    <string name="section_title_spacing">Spacing</string>
+    <string name="sb_left_padding">Left Padding</string>
+    <string name="sb_right_padding">Right Padding</string>
+    <string name="sb_height">Height</string>
+    <string name="section_title_color">Color</string>
+    <string name="sb_color_tint_title">Color Tint</string>
+    <string name="sb_color_tint_desc">Tint statusbar icons and texts</string>
+    <string name="sb_tint_system">Default System Tint</string>
+    <string name="sb_tint_monet">Monet/Accent Tint</string>
+    <string name="sb_tint_custom">Custom Tint (Color Picker)</string>
+
+    <!-- Navigation Bar -->
+    <string name="section_title_display_mode">Display Mode</string>
     <string name="navbar_fullscreen_title">Fullscreen</string>
     <string name="navbar_fullscreen_desc">Hide pill and keyboard spacing</string>
     <string name="navbar_immersive_title">Immersive</string>
@@ -207,154 +340,297 @@
     <string name="navbar_immersive_v2_desc">Smaller keyboard spacing</string>
     <string name="navbar_immersive_v3_title">Immersive v3</string>
     <string name="navbar_immersive_v3_desc">Smallest keyboard spacing</string>
-    <string name="navbar_hide_pill_title">Hide Pill</string>
-    <string name="navbar_hide_pill_desc">Hide navigation pill</string>
-    <string name="navbar_monet_pill_title">Monet Pill</string>
-    <string name="navbar_monet_pill_desc">Link accent color to pill</string>
+    <string name="section_title_buttons">Buttons</string>
+    <string name="navbar_hide_kb_buttons_title">Hide Keyboard Buttons</string>
+    <string name="navbar_hide_kb_buttons_desc">Hide keyboard back/switcher buttons</string>
+    <string name="section_title_gesture">Gesture</string>
+    <string name="navbar_lower_sensitivity_title">Lower Sensitivity</string>
+    <string name="navbar_lower_sensitivity_desc">Lower gesture sensitivity</string>
     <string name="navbar_disable_left_gesture_title">Disable Left Gesture</string>
     <string name="navbar_disable_left_gesture_desc">Disable back gesture of left side</string>
     <string name="navbar_disable_right_gesture_title">Disable Right Gesture</string>
     <string name="navbar_disable_right_gesture_desc">Disable back gesture of right side</string>
-    <string name="navbar_lower_sensitivity_title">Lower Sensitivity</string>
-    <string name="navbar_lower_sensitivity_desc">Lower gesture sensitivity</string>
-    <string name="navbar_hide_kb_buttons_title">Hide Keyboard Buttons</string>
-    <string name="navbar_hide_kb_buttons_desc">Hide keyboard back/switcher buttons</string>
-    <string name="checked">Checked</string>
-    <string name="secondary_color_desc">Pick secondary accent color</string>
-    <string name="primary_color_desc">Pick primary accent color</string>
-    <string name="app_updates">App Updates</string>
-    <string name="changelog">Changelog</string>
-    <string name="import_export">Import/Export</string>
-    <string name="export_settings">Export Settings</string>
-    <string name="import_settings">Import Settings</string>
-    <string name="reset_settings">Reset Settings</string>
-    <string name="experimental_features_title">Experimental</string>
-    <string name="no_internet_connection">Couldn\'t connect to server!\nThere might be an issue with your internet connection or the server might be down at this moment. Please try again later.</string>
-    <string name="changelog_not_found">Changelog not found!\nThis might be an issue with your internet connection or the server might be down at this moment. Please try again later.</string>
-    <string name="btn_download">Download</string>
-    <string name="update_schedule_title">Update Schedule</string>
-    <string name="update_schedule_des">When to check for update</string>
-    <string name="update_available">Update available!</string>
-    <string name="view_changelog">View Changelog</string>
-    <string name="hide_changelog">Hide Changelog</string>
-    <string name="already_up_to_date">You are already up to date.</string>
-    <string name="current_version">Current Version:</string>
-    <string name="latest_version">Latest Version:</string>
-    <string name="update_checking_failed">Failed to check for update!</string>
-    <string name="not_available">N/A</string>
-    <string name="import_settings_confirmation_title">Are you sure?</string>
-    <string name="import_settings_confirmation_desc">You will loose your current setup and settings.</string>
-    <string name="positive">Yes</string>
-    <string name="negative">No</string>
-    <string name="understood">Understood</string>
-    <string name="imported_settings">Imported settings successfully</string>
-    <string name="exported_settings">Saved settings successfully</string>
-    <string name="update_schedule1">Every Time</string>
-    <string name="update_schedule2">Every Hour</string>
-    <string name="update_schedule3">Every Day</string>
-    <string name="update_schedule4">Every Week</string>
-    <string name="update_schedule5">Never</string>
-    <!-- do not change {latestVersionName} -->
-    <string name="update_dialog_desc">Update {latestVersionName} is available to download.</string>
-    <string name="checking_for_update">Checking For Update</string>
-    <string name="toast_module_created">Module created successfully</string>
+    <string name="section_title_pill_navigation">Pill Navigation</string>
+    <string name="navbar_hide_pill_title">Hide Pill</string>
+    <string name="navbar_hide_pill_desc">Hide navigation pill</string>
+    <string name="navbar_monet_pill_title">Monet Pill</string>
+    <string name="navbar_monet_pill_desc">Link accent color to pill</string>
+    <string name="section_title_pill_appearance">Pill Appearance</string>
+    <string name="pill_width_title">Pill Width</string>
+    <string name="pill_thickness_title">Pill Thickness</string>
+    <string name="pill_bottom_space_title">Bottom Space</string>
+
+    <!-- Volume Panel -->
+    <string name="section_title_volume_slider_track">Volume Slider Track</string>
+    <string name="vp_thin_background_title">Thin Background</string>
+    <string name="vp_thin_background_desc">Make track of volume slider thin</string>
+    <string name="vp_thick_background_title">Thick Background</string>
+    <string name="vp_thick_background_desc">Make track of volume slider thick</string>
+    <string name="vp_no_background_title">No Background</string>
+    <string name="vp_no_background_desc">Remove track of volume slider</string>
+    <string name="section_title_custom_magisk_module">Custom Magisk Module</string>
     <string name="volume_style">Volume Style</string>
     <string name="volume_module_desc">Creates a magisk flashable module for this style</string>
+    <string name="volume_style_gradient">Gradient</string>
+    <string name="volume_style_doublelayer">Double Layer</string>
+    <string name="volume_style_shadedlayer">Shaded Layer</string>
+    <string name="volume_style_neumorph">Neumorph</string>
+    <string name="volume_style_outline">Outline</string>
+    <string name="volume_style_neumorphoutline">Neumorph Outline</string>
     <string name="btn_create_module">Create Module</string>
+    <string name="toast_module_created">Module created successfully</string>
     <string name="read_carefully">Read Carefully!</string>
     <string name="volume_module_installation_guide">This option will create a magisk module inside Download folder in your Internal Storage. Flash the module named IconifyCompanion.zip in Magisk. Always uninstall previous Iconify Companion module (if installed) and reboot before flashing new one.\n\n<b>Note:</b>\n• Uninstall the module before updating rom.\n• Recreate the module if you change or update rom.\n• Do not flash a module which wasn\'t created based on your rom.</string>
+
+    <!-- Media Player -->
+    <string name="cont_desc_media_player">Media Player Preview</string>
+    <string name="media_player_preview_music_title">Music Title</string>
+    <string name="media_player_preview_artist_name">Artist Name</string>
+    <string name="media_player_preview_playing_on">Phone speaker</string>
+    <string name="section_title_background_color">Background Color</string>
+    <string name="mp_accent_background_title">Accent Background</string>
+    <string name="mp_accent_background_desc">Make background follow accent</string>
+    <string name="mp_system_background_title">System Background</string>
+    <string name="mp_system_background_desc">Make background follow system</string>
+    <string name="mp_pb_background_title">Pitch Black Background</string>
+    <string name="mp_pb_background_desc">Make background pitch black</string>
+
+    <!-- Miscellaneous -->
+    <string name="section_title_tablet_mode">Tablet Mode</string>
+    <string name="tablet_landscape_title">Tablet Landscape</string>
+    <string name="tablet_landscape_desc">Also known as Better QS\nMust use Notch Bar Killer</string>
+    <string name="notch_bar_killer_title">Notch Bar Killer</string>
+    <string name="notch_bar_killer_desc">Kill empty space of notch bar</string>
+    <string name="tablet_header_title">Tablet Header</string>
+    <string name="tablet_header_desc">Enable large screen shade header</string>
+    <string name="section_title_privacy_chip">Privacy Chip</string>
+    <string name="accent_privacy_chip_title">Accent Privacy Chip</string>
+    <string name="accent_privacy_chip_desc">Make privacy chip accent colored</string>
+
+    <!-- Xposed Menu -->
+    <string name="lsposed_warn">Before enabling Iconify from LSPosed modules, long press on Iconify and click on Re-optimize. After that enable Iconify and restart your SystemUI. This is necessary for a smoother experience.</string>
+    <string name="xposed_only_desc">You are currently in Xposed Only mode. This requires iconify to be enabled in LSPosed app. Also make sure that Iconify module is shown in Magisk manager. To get access to all features, simply re-open the app and go through the installation process!</string>
+    <string name="xposed_module_disabled_title">Module Not Activated</string>
+    <string name="xposed_module_disabled_desc">System service not running</string>
+    <string name="activity_title_transparency_blur">Transparency &amp; Blur</string>
+    <string name="activity_desc_transparency_blur">Enable QS blur and transparency</string>
+    <string name="activity_title_themes">Themes</string>
+    <string name="activity_desc_themes">Theming related stuffs</string>
+    <string name="activity_title_quick_settings">Quick Settings</string>
+    <string name="activity_desc_quick_settings">Tweaks related to QS panel</string>
+    <string name="activity_title_battery_style">Battery Style</string>
+    <string name="activity_desc_battery_style">Customize battery icon view</string>
+    <string name="activity_title_header_image">Header Image</string>
+    <string name="activity_desc_header_image">Add custom image on QS panel</string>
+    <string name="activity_title_header_clock">Header Clock</string>
+    <string name="activity_desc_header_clock">Add custom clock on QS panel</string>
+    <string name="activity_title_lockscreen_clock">Lockscreen Clock</string>
+    <string name="activity_desc_lockscreen_clock">Add custom clock on lockscreen</string>
+    <string name="activity_title_background_chip">Background Chip</string>
+    <string name="activity_desc_background_chip">Add colored chip behind clock</string>
+    <string name="activity_title_xposed_others">Others</string>
+    <string name="activity_desc_xposed_others">Miscellaneous xposed tweaks</string>
+
+    <!-- Transparency & Blur -->
+    <string name="section_title_transparency">Transparency</string>
     <string name="transparent_qs_panel_title">Transparent QS Panel</string>
     <string name="transparent_qs_panel_desc">Make QS panel background transparent</string>
     <string name="transparency_alpha_title">Transparency Alpha</string>
+    <string name="transparent_notif_shade_title">Transparent Notif Shade Only</string>
+    <string name="transparent_notif_shade_desc">Make only notification shade transparent</string>
+    <string name="section_title_blur">Blur</string>
+    <string name="window_level_blur_title">Window Level Blur</string>
+    <string name="window_level_blur_desc">Requires reboot to work</string>
+    <string name="blur_intensity_title">Blur Intensity</string>
+
+    <!-- Themes -->
+    <string name="section_title_for_pixel_roms">For Pixel Roms</string>
+    <string name="light_theme_title">Light Theme</string>
+    <string name="light_theme_desc">Light QS theme in light mode\nMust use custom QS Shape</string>
+    <string name="dual_tone_title">Dual Tone</string>
+    <string name="dual_tone_desc">Use different color for header</string>
+    <string name="section_title_for_custom_roms">For Custom Roms</string>
+    <string name="black_theme_title">Pixel Black Theme</string>
+    <string name="black_theme_desc">Black QS theme in light mode\nMust use Pixel QS Shape\nSwitch dark theme to fix text color</string>
+    <string name="section_title_translucent_theme">Translucent Theme</string>
+    <string name="fluid_qs_theme_title">Fluid QS Theme</string>
+    <string name="fluid_qs_theme_desc">Two tone translucent QS theme\nSwitch theme to fix color\nDo not use custom shapes</string>
+    <string name="notification_transparency_title">Notification Transparency</string>
+    <string name="notification_transparency_desc">Notification transparency for Fluid QS\nDo not use custom notification style</string>
+    <string name="power_menu_transparency_title">Power Menu Transparency</string>
+    <string name="power_menu_transparency_desc">Power menu transparency for Fluid QS\nDo not use custom notification style</string>
+
+    <!-- Quick Settings -->
+    <string name="section_title_qs_tile">QS Tile</string>
     <string name="vertical_qs_tile_title">Vertical QS Tile</string>
     <string name="vertical_qs_tile_desc">Show label below QS icon</string>
     <string name="hide_qs_tile_label_title">Hide QS Tile Label</string>
     <string name="hide_qs_tile_label_desc">Use only with vertical tiles</string>
-    <string name="sb_clock_background_chip_title">Statusbar Clock Chip</string>
-    <string name="sb_clock_background_chip_desc">Display chip behind statusbar clock</string>
+    <string name="section_title_qs_margin">QS Margin</string>
+
+    <!-- Battery Style -->
+    <string name="battery_style_title">Battery Style</string>
+    <string name="battery_width_title">Battery Width</string>
+    <string name="battery_height_title">Battery Height</string>
+    <string name="battery_margin_title">Battery Margin</string>
+
+    <!-- Header Image -->
     <string name="header_image_title">Pick Header Image</string>
     <string name="header_image_desc">Add header image on QS panel\nDo not select file from Recent</string>
     <string name="btn_pick_image">Pick Image</string>
     <string name="header_image_height_title">Image Height</string>
-    <string name="hide_status_icons_title">Hide Status Icons</string>
-    <string name="hide_status_icons_desc">Remove time, date and battery icons</string>
-    <string name="image_alpha">Image Alpha</string>
-    <string name="toast_rename_file">Rename file to something simpler</string>
-    <string name="custom_lockscreen_clock_title">Custom Lockscreen Clock</string>
-    <string name="custom_lockscreen_clock_desc">Enable custom lockscreen clock</string>
-    <string name="custom_lockscreen_clock_style_title">Clock Style</string>
-    <string name="custom_toast_title">Custom Toast</string>
-    <string name="custom_toast_desc">Enable custom styled toast</string>
-    <string name="custom_progressbar_title">Custom Progressbar</string>
-    <string name="custom_progressbar_desc">Enable gradient progress bar</string>
-    <string name="custom_seekbar_title">Custom Seekbar</string>
-    <string name="custom_seekbar_desc">Enable custom styled seek bar</string>
-    <string name="needs_systemui_restart">Needs SystemUI restart</string>
-    <string name="toast_lorn_colored_battery">Lorn uses colored battery by default</string>
-    <string name="toast_plumpy_colored_battery">Plumpy uses colored battery by default</string>
-    <string name="qs_clock_chip_title">QS Clock Chip</string>
-    <string name="qs_clock_chip_desc">Display chip behind QS clock</string>
-    <string name="chip_style_title">Chip Style</string>
-    <string name="qs_clock_chip_style_desc"><![CDATA[Needs SystemUI Restart\nLock & Unlock to fix width]]></string>
-    <string name="qs_date_chip_title">QS Date Chip</string>
-    <string name="qs_date_chip_desc">Display chip behind QS date</string>
-    <string name="status_icons_chip_title">Status Icons Chip</string>
-    <string name="status_icons_chip_desc">Display chip behind status icons</string>
-    <string name="enable_colored_battery_title">Enable Colored Battery</string>
-    <string name="enable_colored_battery_desc">Use custom color for battery icon</string>
-    <string name="battery_background_color_title">Background Color</string>
-    <string name="battery_background_color_desc">Battery fill container color</string>
-    <string name="battery_filled_color_title">Filled Color</string>
-    <string name="battery_filled_color_desc">Battery level indicator color</string>
+    <string name="header_image_alpha">Image Alpha</string>
+    <string name="header_image_zoom_to_fit_title">Zoom To Fit</string>
+    <string name="header_image_zoom_to_fit_desc">Image is stretched to fit by default</string>
+    <string name="header_image_hide_in_landscape_title">Hide in Landscape</string>
+    <string name="header_image_hide_in_landscape_desc">Hide image in landscape mode</string>
+
+    <!-- Header Clock -->
     <string name="custom_header_clock_title">Custom Header Clock</string>
     <string name="custom_header_clock_desc">Add a custom clock on QS panel</string>
     <string name="header_clock_style_title">Clock Style</string>
+    <string name="header_clock_font_title">Clock Font</string>
+    <string name="header_clock_font_desc">Use custom font for header clock\nDo not select file from Recent</string>
+    <string name="custom_header_clock_color_title">Custom Clock Color</string>
+    <string name="custom_header_clock_color_desc">Custom color instead of primary color</string>
+    <string name="header_clock_color_picker_title">Clock Color Picker</string>
+    <string name="header_clock_color_picker_desc">Set color of header clock text</string>
+    <string name="header_clock_font_text_scaling_title">Text Scaling</string>
     <string name="header_clock_side_margin_title">Clock Side Margin</string>
     <string name="header_clock_top_margin_title">Clock Top Margin</string>
     <string name="header_clock_white_text_title">White Text</string>
     <string name="header_clock_white_text_desc">Force text colors to be white</string>
-    <string name="custom_qs_margin_title">Custom QS Margin</string>
-    <string name="custom_qs_margin_desc">Enable custom margin for QS panel</string>
-    <string name="qqs_panel_top_margin_title">QQS Panel Top Margin</string>
-    <string name="qs_panel_top_margin_title">QS Panel Top Margin</string>
-    <string name="btn_restart_systemui">Restart SystemUI</string>
-    <string name="header_image_zoom_to_fit_title">Zoom To Fit</string>
-    <string name="header_image_zoom_to_fit_desc">Image is stretched to fit by default</string>
+    <string name="header_clock_center_clock_title">Center Clock</string>
+    <string name="header_clock_center_clock_desc">Move clock to center of view</string>
+    <string name="header_clock_hide_landscape_title">Hide in Landscape</string>
+    <string name="header_clock_hide_landscape_desc">Hide clock in landscape mode</string>
+
+    <!-- Lockscreen Clock -->
+    <string name="custom_lockscreen_clock_title">Custom Lockscreen Clock</string>
+    <string name="custom_lockscreen_clock_desc">Enable custom lockscreen clock</string>
+    <string name="lockscreen_clock_auto_hide_clock_title">Auto Hide Clock</string>
+    <string name="lockscreen_clock_auto_hide_clock_desc">Hide clock on incoming notification</string>
+    <string name="custom_lockscreen_clock_style_title">Clock Style</string>
     <string name="lockscreen_clock_font_title">Clock Font</string>
     <string name="lockscreen_clock_font_desc">Use custom font for lockscreen clock\nDo not select file from Recent</string>
-    <string name="btn_pick_font">Pick Font</string>
+    <string name="lsclock_custom_color_title">Custom Clock Color</string>
+    <string name="lsclock_custom_color_desc">Custom color instead of primary color</string>
+    <string name="lsclock_color_picker_title">Clock Color Picker</string>
+    <string name="lsclock_color_picker_desc">Set color of lockscreen clock text</string>
+    <string name="lockscreen_font_text_scaling_title">Text Scaling</string>
     <string name="lockscreen_font_line_height_title">Line Height</string>
     <string name="lockscreen_clock_top_margin_title">Top Margin</string>
     <string name="lockscreen_clock_bottom_margin_title">Bottom Margin</string>
     <string name="lockscreen_clock_white_text_title">White Text</string>
     <string name="lockscreen_clock_white_text_desc">Force all colors to be white</string>
-    <string name="window_level_blur_title">Window Level Blur</string>
-    <string name="window_level_blur_desc">Requires reboot to work</string>
-    <string name="blur_intensity_title">Blur Intensity</string>
-    <string name="force_enable_blur_title">Force Enable Blur</string>
-    <string name="force_enable_blur_desc">Force enable blur for unsupported roms</string>
+
+    <!-- Background Chip -->
+    <string name="section_title_status_bar">Status Bar</string>
+    <string name="sb_clock_background_chip_title">Statusbar Clock Chip</string>
+    <string name="sb_clock_background_chip_desc">Display chip behind statusbar clock</string>
+    <string name="statusbar_clock_color_title">Statusbar Clock Color</string>
+    <string name="sbclock_color_follow_system">Follow System</string>
+    <string name="sbclock_color_transparent_text">Transparent Text</string>
+    <string name="sbclock_color_custom_color">Custom Color</string>
+    <string name="clock_color_picker_title">Clock Color Picker</string>
+    <string name="clock_color_picker_desc">Set color of statubsar clock text</string>
+    <string name="section_title_status_icons">Status Icons</string>
+    <string name="chip_style_title">Chip Style</string>
+    <string name="status_icons_chip_title">Status Icons Chip</string>
+    <string name="status_icons_chip_desc">Display chip behind status icons</string>
+    <string name="status_icons_chip_style_title">Chip Style</string>
+    <string name="fixed_status_icons_top_margin">Top Margin</string>
+    <string name="fixed_status_icons_side_margin">Side Margin</string>
+
+    <!-- Xposed Others -->
+    <string name="qs_header">QS Header</string>
     <string name="hide_carrier_group_title">Hide Carrier Group</string>
     <string name="hide_carrier_group_desc">Hide carrier group from QS panel</string>
-    <string name="sb_left_padding">Left Padding</string>
-    <string name="sb_right_padding">Right Padding</string>
-    <string name="sb_height">Height</string>
-    <string name="sb_color_tint_title">Color Tint</string>
-    <string name="sb_color_tint_desc">Tint statusbar icons and texts</string>
-    <string name="btn_reset_tint">Reset Tint</string>
-    <string name="toast_select_style">Select a style first</string>
-    <string name="volume_style_gradient">Gradient</string>
-    <string name="volume_style_doublelayer">Double Layer</string>
-    <string name="volume_style_shadedlayer">Shaded Layer</string>
-    <string name="volume_style_neumorph">Neumorph</string>
-    <string name="volume_style_outline">Outline</string>
-    <string name="volume_style_neumorphoutline">Neumorph Outline</string>
-    <string name="section_title_translators">Translators</string>
-    <string name="toast_reboot_required">Reboot required</string>
-    <string name="toast_lsposed_not_found">LSPosed not found!</string>
-    <string name="toast_easter_egg">How did you know that?</string>
-    <string name="toast_easter_egg_activated">Why are you still doing that?</string>
-    <string name="toast_try_again_later">You have restarted SystemUI too frequently. Please try again later.</string>
+    <string name="hide_status_icons_title">Hide Status Icons</string>
+    <string name="hide_status_icons_desc">Remove time, date and battery icons</string>
+    <string name="lock_screen">Lock Screen</string>
+    <string name="hide_ls_carrier_title">Hide LS Carrier</string>
+    <string name="hide_ls_carrier_desc">Hide carrier name on lockscreen</string>
+    <string name="hide_ls_statusbar_title">Hide LS Statusbar</string>
+    <string name="hide_ls_statusbar_desc">Hide statusbar on lockscreen</string>
+    <string name="fixed_status_icons_title">Fixed Status Icons</string>
+    <string name="fixed_status_icons_desc">Set status icons in fixed position\nMight be buggy on some rom</string>
+
+    <!-- Changelog -->
+    <string name="activity_title_changelog">Changelog</string>
+    <string name="no_internet_connection">Couldn\'t connect to server!\nThere might be an issue with your internet connection or the server might be down at this moment. Please try again later.</string>
+    <string name="changelog_not_found">Changelog not found!\nThis might be an issue with your internet connection or the server might be down at this moment. Please try again later.</string>
     <string name="individual_changelog_not_found">Something went wrong.\nThis changelog might not be available on the server.</string>
+
+    <!-- App Updates -->
+    <string name="checking_for_update">Checking For Update</string>
+    <string name="update_available">Update available!</string>
+    <string name="update_dialog_desc">Update %s is available to download.</string>
+    <string name="view_changelog">View Changelog</string>
+    <string name="hide_changelog">Hide Changelog</string>
+    <string name="already_up_to_date">You are already up to date.</string>
+    <string name="current_version">Current Version:</string>
+    <string name="latest_version">Latest Version:</string>
+    <string name="update_checking_failed">Failed to check for update!</string>
+    <string name="not_available">N/A</string>
+    <string name="section_title_schedule">Schedule</string>
+    <string name="update_schedule_title">Update Schedule</string>
+    <string name="update_schedule_des">When to check for update</string>
+    <string name="update_schedule1">Every Time</string>
+    <string name="update_schedule2">Every Hour</string>
+    <string name="update_schedule3">Every Day</string>
+    <string name="update_schedule4">Every Week</string>
+    <string name="update_schedule5">Never</string>
+
+    <!-- Credits -->
+    <string name="section_title_credits">Credits</string>
+    <string name="section_title_thanks">Special Thanks</string>
+    <string name="info_icons8_desc">For Plumpy &amp; Fluency icons.</string>
+    <string name="info_iconsax_desc">For in-app icon set.</string>
+    <string name="info_shell_desc">For helping me with Shell Script.</string>
+    <string name="info_rro_desc">For helping me with RRO.</string>
+    <string name="info_tester_desc">For testing the app.</string>
+    <string name="info_betterqs_desc">For permission to use better QS.</string>
+    <string name="section_title_contributors">Contributors</string>
+    <string name="info_contributor_desc">For contributing on github.</string>
+    <string name="info_contributor_desc_2">For assisting me on telegram.</string>
+    <string name="section_title_translators">Translators</string>
+    <string name="ar_translation">Arabic translation.</string>
+    <string name="fa_translation">Persian translation.</string>
+    <string name="fr_translation">French translation.</string>
+    <string name="id_translation">Indonesian translation.</string>
+    <string name="pt_translation">Portuguese translation.</string>
+    <string name="ru_translation">Russian translation.</string>
+    <string name="tr_translation">Turkish translation.</string>
+    <string name="vi_translation">Vietnamese translation.</string>
+    <string name="es_translation">Spanish translation.</string>
+    <string name="zh_cn_translation">Simplified Chinese translation.</string>
+
+    <!-- Experimental -->
+    <string name="experimental_features_title">Experimental</string>
+    <string name="hide_data_disabled_icon_title">Hide Data Disabled Icon</string>
+    <string name="hide_data_disabled_icon_desc">Hide data disabled indicator</string>
+
+    <!-- Bottom Navigation -->
+    <string name="navbar_home">Home</string>
+    <string name="navbar_tweaks">Tweaks</string>
+    <string name="navbar_settings">Settings</string>
+
+    <!-- Settings 3 dot menu -->
+    <string name="changelog">Changelog</string>
+    <string name="import_export">Import/Export</string>
+    <string name="export_settings">Export Settings</string>
+    <string name="import_settings">Import Settings</string>
+    <string name="restart_sysui_title">Restart SystemUI</string>
+    <string name="import_settings_confirmation_title">Are you sure?</string>
+    <string name="import_settings_confirmation_desc">You will loose your current setup and settings.</string>
+
+    <!-- Xposed 3 dot menu -->
+    <string name="reset_settings">Reset Settings</string>
+    <string name="imported_settings">Imported settings successfully</string>
+    <string name="exported_settings">Saved settings successfully</string>
+
+    <!-- Style List -->
     <string name="style_0">None</string>
     <string name="style_1">Style 1</string>
     <string name="style_2">Style 2</string>
@@ -381,322 +657,142 @@
     <string name="style_23">Style 23</string>
     <string name="style_24">Style 24</string>
     <string name="style_25">Style 25</string>
+
+    <!-- Buttons -->
+    <string name="btn_continue">Continue</string>
+    <string name="btn_restart">Restart</string>
+    <string name="btn_disable">Disable</string>
+    <string name="btn_enable">Enable</string>
+    <string name="btn_apply">Apply</string>
+    <string name="btn_disable_custom_colors">Disable Custom Colors</string>
+    <string name="btn_enable_custom_colors">Apply Colors</string>
+    <string name="btn_reset">Reset</string>
+    <string name="btn_reboot_now">Reboot Now</string>
+    <string name="btn_download">Download</string>
+    <string name="btn_restart_systemui">Restart SystemUI</string>
+    <string name="btn_pick_font">Pick Font</string>
+    <string name="btn_reset_tint">Reset Tint</string>
+    <string name="btn_reboot">Reboot</string>
+    <string name="btn_skip">Skip</string>
+    <string name="btn_next">Next</string>
+    <string name="btn_back">Back</string>
+    <string name="btn_lets_go">Let\'s Go</string>
+    <string name="btn_close">Close</string>
+    <string name="btn_positive">Yes</string>
+    <string name="btn_negative">No</string>
+
+    <!-- Toast -->
+    <string name="toast_applied">Applied</string>
+    <string name="toast_disabled">Disabled</string>
+    <string name="toast_reset">Reset</string>
+    <string name="toast_reboot">Reboot required</string>
+    <string name="toast_copied">Copied to Clipboard</string>
+    <string name="toast_error">Something went wrong</string>
+    <string name="toast_disable_everything">Long press to disable everything</string>
+    <string name="toast_disabled_everything">Everything is disabled</string>
+    <string name="toast_restart_sysui">Long press to restart SystemUI</string>
+    <string name="toast_rename_file">Rename file to something simpler</string>
+    <string name="toast_lorn_colored_battery">Lorn uses colored battery by default</string>
+    <string name="toast_plumpy_colored_battery">Plumpy uses colored battery by default</string>
+    <string name="toast_select_style">Select a style first</string>
+    <string name="toast_reboot_required">Reboot required</string>
+    <string name="toast_lsposed_not_found">LSPosed not found!</string>
+    <string name="toast_easter_egg">How did you know that?</string>
+    <string name="toast_easter_egg_activated">Why are you still doing that?</string>
+    <string name="toast_try_again_later">You have restarted SystemUI too frequently. Please try again later.</string>
+    <string name="toast_storage_access">Launching \"All Files Access\" page</string>
+    <string name="toast_clear_cache">Iconify cache cleared</string>
+    <string name="toast_skipped_installation">Installation skipped. Some features may not function properly.</string>
+    <string name="toast_import_settings_successfull">Imported settings successfully</string>
+    <string name="toast_export_settings_successfull">Exported settings successfully</string>
+
+    <!-- Push Notification -->
+    <string name="new_update_title">Update Available</string>
+    <string name="new_update_desc">A new version of Iconify is available.</string>
+    <string name="update_notification_channel_name">Updates</string>
+    <string name="update_notification_channel_desc">This channel shows notification about the latest updates.</string>
+
+    <!-- Other Activities -->
+    <string name="activity_title_info">About</string>
+    <string name="activity_desc_info">Information about this app</string>
+    <string name="activity_title_settings">Settings</string>
+    <string name="activity_desc_settings">Miscellaneous settings</string>
+    <string name="activity_title_qs_panel">QS Panel</string>
+    <string name="activity_desc_qs_panel">Modify quick settings panel</string>
+
+    <!-- Miscellaneous -->
+    <string name="color_picker_preview">Color Picker Preview</string>
+    <string name="color_picker_title">Color Picker</string>
+    <string name="tile_pitch_black">Pitch Black</string>
+    <string name="tile_pitch_black_dark">Dark</string>
+    <string name="tile_pitch_black_amoled">Amoled</string>
+    <string name="warning">Warning</string>
+    <string name="iconify_logo">Iconify Logo</string>
+    <string name="hey_there">Hey There!</string>
+    <string name="icon">Icon</string>
+    <string name="section_title_media_player_icons">Media Player Icons</string>
+    <string name="opt_selected">Selected:</string>
+    <string name="opt_default">(Default)</string>
+    <string name="loading_dialog_wait">Please Wait</string>
+    <string name="rebooting_desc">Rebooting in 5 seconds</string>
+    <string name="iconify_clipboard_label_version">Iconify Version</string>
+    <string name="iconify_clipboard_label_version_name">Version Name:</string>
+    <string name="iconify_clipboard_label_version_code">Version Code:</string>
+    <string name="info_version_title">Version</string>
+    <string name="info_github_title">GitHub</string>
+    <string name="info_github_desc">Check out github repository.</string>
+    <string name="info_telegram_title">Telegram</string>
+    <string name="info_telegram_desc">Follow to get latest news &amp; updates.</string>
+    <string name="opt_applied">- Applied</string>
+    <string name="perm_storage_access">Grant storage access first!</string>
+    <string name="installing">Installing</string>
+    <string name="reboot_needed">Reboot your device first!</string>
+    <string name="restart_sysui_desc">Restart SystemUI if applied options are not immediately visible.</string>
+    <string name="checked">Checked</string>
+    <string name="app_updates">App Updates</string>
+    <string name="positive">Yes</string>
+    <string name="negative">No</string>
+    <string name="understood">Understood</string>
+    <string name="custom_toast_title">Custom Toast</string>
+    <string name="custom_toast_desc">Enable custom styled toast</string>
+    <string name="custom_progressbar_title">Custom Progressbar</string>
+    <string name="custom_progressbar_desc">Enable gradient progress bar</string>
+    <string name="custom_seekbar_title">Custom Seekbar</string>
+    <string name="custom_seekbar_desc">Enable custom styled seek bar</string>
+    <string name="needs_systemui_restart">Needs SystemUI restart</string>
+    <string name="qs_clock_chip_title">QS Clock Chip</string>
+    <string name="qs_clock_chip_desc">Display chip behind QS clock</string>
+    <string name="qs_clock_chip_style_desc">Needs SystemUI Restart\nLock &amp; Unlock to fix width</string>
+    <string name="qs_date_chip_title">QS Date Chip</string>
+    <string name="qs_date_chip_desc">Display chip behind QS date</string>
+    <string name="custom_qs_margin_title">Custom QS Margin</string>
+    <string name="custom_qs_margin_desc">Enable custom margin for QS panel</string>
+    <string name="force_enable_blur_title">Force Enable Blur</string>
+    <string name="force_enable_blur_desc">Force enable blur for unsupported roms</string>
     <string name="choose_header_image">Choose Header Image</string>
     <string name="choose_clock_font">Choose Clock Font</string>
-    <string name="new_update_title">Update Available</string>
-    <string name="new_update_desc">A new version of Iconify is available.</string>
-    <string name="update_notification_channel_name">Updates</string>
-    <string name="update_notification_channel_desc">This channel shows notification about the latest updates.</string>
-    <string name="ar_translation">Arabic translation.</string>
-    <string name="fa_translation">Persian translation.</string>
-    <string name="fr_translation">French translation.</string>
-    <string name="id_translation">Indonesian translation.</string>
-    <string name="pt_translation">Portuguese translation.</string>
-    <string name="ru_translation">Russian translation.</string>
-    <string name="tr_translation">Turkish translation.</string>
-    <string name="vi_translation">Vietnamese translation.</string>
-    <string name="es_translation">Spanish translation.</string>
-    <string name="zh_cn_translation">Simplified Chinese translation.</string>
-    <string name="a13_default_media_player">Android 13 Default Player</string>
-    <string name="monet_neutral">Neutral</string>
-    <string name="monet_monochrome">Monochrome</string>
-    <string name="monet_tonalspot">Tonal Spot</string>
-    <string name="monet_vibrant">Vibrant</string>
-    <string name="monet_rainbow">Rainbow</string>
-    <string name="monet_expressive">Expressive</string>
-    <string name="monet_fidelity">Fidelity</string>
-    <string name="monet_fruitsalad">Fruit Salad</string>
-    <string name="monet_content">Content</string>
-    <string name="app_not_found">Application not found!</string>
-    <string name="monet_primary_accent_saturation_title">Primary Accent Saturation</string>
-    <string name="monet_secondary_accent_saturation_title">Secondary Accent Saturation</string>
-    <string name="monet_background_saturation_title">Background Saturation</string>
-    <string name="monet_background_lightness_title">Background Lightness</string>
-    <string name="media_player_preview_music_title">Music Title</string>
-    <string name="media_player_preview_artist_name">Artist Name</string>
-    <string name="media_player_preview_playing_on">Phone speaker</string>
-    <string name="lockscreen_font_text_scaling_title">Text Scaling</string>
-    <string name="header_clock_font_text_scaling_title">Text Scaling</string>
-    <string name="btn_reboot">Reboot</string>
-    <string name="status_icons_chip_style_title">Chip Style</string>
-    <string name="fixed_status_icons_title">Fixed Status Icons</string>
-    <string name="fixed_status_icons_desc">Set status icons in fixed position\nMight be buggy on some rom</string>
-    <string name="fixed_status_icons_top_margin">Top Margin</string>
-    <string name="fixed_status_icons_side_margin">Side Margin</string>
-    <string name="icon_mask_style_none">None</string>
-    <string name="icon_mask_style_pebble">Pebble</string>
-    <string name="icon_mask_style_hexagon">Hexagon</string>
-    <string name="icon_mask_style_samsung">Samsung</string>
-    <string name="icon_mask_style_scroll">Scroll</string>
-    <string name="icon_mask_style_square">Square</string>
-    <string name="icon_mask_style_teardrop">Teardrop</string>
-    <string name="icon_mask_style_rounded_rectangle">Rounded\nRectangle</string>
-    <string name="icon_mask_style_ios">iOS</string>
-    <string name="icon_mask_style_cloudy">Cloudy</string>
-    <string name="icon_mask_style_cylinder">Cylinder</string>
-    <string name="icon_mask_style_flower">Flower</string>
-    <string name="icon_mask_style_heart">Heart</string>
-    <string name="icon_mask_style_leaf">Leaf</string>
-    <string name="icon_mask_style_stretched">Streteched</string>
-    <string name="icon_mask_style_tapered_rectangle">Tapered\nRectangle</string>
-    <string name="icon_mask_style_vessel">Vessel</string>
-    <string name="icon_mask_style_rice_rohie_meow">Rohie Meow</string>
     <string name="pick_style">Pick a style of your choice</string>
-    <string name="info_contributor_desc_2">For assisting me on telegram.</string>
     <string name="attention">Attention!</string>
-    <string name="lsposed_warn">Before enabling Iconify from LSPosed modules, long press on Iconify and click on Re-optimize. After that enable Iconify and restart your SystemUI. This is necessary for a smoother experience.</string>
-    <string name="sb_tint_system">Default System Tint</string>
-    <string name="sb_tint_monet">Monet/Accent Tint</string>
-    <string name="sb_tint_custom">Custom Tint (Color Picker)</string>
-    <string name="init_module_installation">Initializing setup</string>
-    <string name="step">Step</string>
-    <string name="module_installation_step1">Creating module shell</string>
-    <string name="module_installation_step2">Extracting necessary files</string>
-    <string name="module_installation_step3">Creating overlay APKs</string>
-    <string name="module_installation_step4">Aligning overlay APKs</string>
-    <string name="module_installation_step5">Signing overlay APKs</string>
-    <string name="module_installation_step6">Cleaning directories</string>
-    <string name="portrait">(Portrait)</string>
-    <string name="qs_tile_expanded_height">Expanded Height</string>
-    <string name="landscape">(Landscape)</string>
-    <string name="toast_storage_access">Launching \"All Files Access\" page</string>
-    <string name="qs_tile_non_expanded_height">Non-Expanded Height</string>
     <string name="method_toggle_dark_mode">Double Toggle Dark Mode</string>
     <string name="method_restart_systemui">Restart SystemUI</string>
     <string name="method_do_nothing">Do Nothing (I will do it myself)</string>
     <string name="list_title_xposed_settings">Xposed Settings</string>
-    <string name="list_title_show_warning">Show Warning</string>
-    <string name="list_desc_show_warning">Show warning on how to re-optimize module in Xposed Menu.</string>
     <string name="list_title_force_apply_method">Force Apply Method</string>
     <string name="list_desc_force_apply_method">Method to force apply the changes in xposed menu</string>
     <string name="list_title_miscellaneous_settings">Miscellaneous Settings</string>
     <string name="list_title_general_settings">General Settings</string>
     <string name="list_title_use_light_accent">Use Light Accent</string>
     <string name="list_desc_use_light_accent">Use light accent color in light mode</string>
-    <string name="logs">Logs</string>
     <string name="custom_battery_title">Custom Battery</string>
     <string name="custom_battery_desc">Enable custom battery style</string>
-    <string name="battery_style_title">Battery Style</string>
-    <string name="battery_width_title">Battery Width</string>
-    <string name="battery_height_title">Battery Height</string>
-    <string name="disable_animation_title">Disable Animation</string>
-    <string name="disable_animation_desc">Disable scrolling animation of Iconify</string>
-    <string name="restart_systemui_after_boot_title">Restart SystemUI After Boot</string>
-    <string name="restart_systemui_after_boot_desc">Some options like blur intensity doesn\'t take effect until systemui is restarted</string>
-    <string name="btn_skip">Skip</string>
-    <string name="onboarding_title_1">Got Bored of Stock UI ?</string>
-    <string name="onboarding_desc_1">Let\'s customize everything to our likings.</string>
-    <string name="btn_next">Next</string>
-    <string name="btn_back">Back</string>
-    <string name="onboarding_title_2">Is My Device Supported ?</string>
-    <string name="onboarding_desc_2">Iconify supports all Pixel and AOSP based ROMs.</string>
-    <string name="onboarding_title_3">Shall We Begin Now ?</string>
-    <string name="onboarding_desc_3">It is time for iconify to do some internal work.</string>
-    <string name="btn_lets_go">Let\'s Go</string>
-    <string name="need_storage_perm_title">Need Storage Permission</string>
-    <string name="need_storage_perm_desc">Storage permission is required to build the necessary files.</string>
-    <string name="magisk_not_found_title">Could Not Find Magisk</string>
-    <string name="magisk_not_found_desc">Use Magisk to root your device!</string>
-    <string name="root_not_found_title">Root Is Not Accessible</string>
-    <string name="root_not_found_desc">Looks like your device is not rooted!</string>
-    <string name="need_reboot_title">Need Device Reboot</string>
-    <string name="need_reboot_desc">Reboot your device to put all files in place.</string>
-    <string name="installation_failed_title">Oops Did Not Expect That</string>
-    <string name="installation_failed_desc">Logs have been saved in documents folder.</string>
     <string name="toast_message">Toast Message</string>
-    <string name="settings_icons_background">Background</string>
-    <string name="settings_icons_minimal">Minimal</string>
-    <string name="settings_icons_filled">Filled</string>
-    <string name="settings_icons_outline">Outline</string>
-    <string name="settings_icons_neumorph">Neumorph</string>
-    <string name="settings_icons_shape">Shape</string>
-    <string name="settings_icons_circle">Circle</string>
-    <string name="settings_icons_squircle">Squircle</string>
-    <string name="settings_icons_square">Square</string>
-    <string name="settings_icons_size">Icon Size</string>
-    <string name="settings_icons_size1">0.5x</string>
-    <string name="settings_icons_size2">0.65x</string>
-    <string name="settings_icons_size3">0.8x</string>
-    <string name="settings_icons_size4">1.0x</string>
-    <string name="settins_icons_icon_color">Icon Color</string>
-    <string name="settings_icons_follow_system">Follow System</string>
-    <string name="settings_icons_system_inverse">System Inverse</string>
-    <string name="settings_icons_monet_accent">Monet / Accent</string>
-    <string name="navbar_home">Home</string>
-    <string name="navbar_tweaks">Tweaks</string>
-    <string name="navbar_settings">Settings</string>
-    <string name="btn_close">Close</string>
     <string name="created_by_drdisagree">Made with \u2764\uFE0E by DrDisagree</string>
-    <string name="no_supported_music_player">Supported Music Player Not Found</string>
     <string name="hello_blank_fragment">Hello blank fragment</string>
-    <string name="hide_ls_carrier_title">Hide LS Carrier</string>
-    <string name="hide_ls_carrier_desc">Hide carrier name on lockscreen</string>
-    <string name="hide_ls_statusbar_title">Hide LS Statusbar</string>
-    <string name="hide_ls_statusbar_desc">Hide statusbar on lockscreen</string>
-    <string name="notch_bar_killer_title">Notch Bar Killer</string>
-    <string name="notch_bar_killer_desc">Kill empty space of notch bar</string>
-    <string name="light_theme_title">Light Theme</string>
-    <string name="light_theme_desc">Light QS theme in light mode\nMust use custom QS Shape</string>
-    <string name="dual_tone_title">Dual Tone</string>
-    <string name="dual_tone_desc">Use different color for header</string>
-    <string name="pill_width_title">Pill Width</string>
-    <string name="pill_thickness_title">Pill Thickness</string>
-    <string name="pill_bottom_space_title">Bottom Space</string>
-    <string name="app_language">Language</string>
-    <string name="app_theme">App Theme</string>
-    <string name="app_theme_light">Light Theme</string>
-    <string name="app_theme_dark">Dark Theme</string>
-    <string name="app_theme_system">Follow System</string>
-    <string name="header_image_hide_in_landscape_title">Hide in Landscape</string>
-    <string name="header_image_hide_in_landscape_desc">Hide image in landscape mode</string>
-    <string name="black_theme_title">Pixel Black Theme</string>
-    <string name="black_theme_desc">Black QS theme in light mode\nMust use Pixel QS Shape\nSwitch dark theme to fix text color</string>
-    <string name="transparent_notif_shade_title">Transparent Notif Shade Only</string>
-    <string name="transparent_notif_shade_desc">Make only notification shade transparent</string>
-    <string name="fluid_qs_theme_title">Fluid QS Theme</string>
-    <string name="fluid_qs_theme_desc">Two tone translucent QS theme\nSwitch theme to fix color\nDo not use custom shapes</string>
-    <string name="disable_monet_title">Disable System Monet</string>
-    <string name="disable_monet_desc">Helps to retain custom colors\nSystemUI restart required</string>
-    <string name="iconpack_aurora_desc">Dual tone linear icon pack</string>
-    <string name="iconpack_gradicon_desc">Gradient shaded filled icon pack</string>
-    <string name="iconpack_lorn_desc">Thick linear icon pack</string>
-    <string name="iconpack_plumpy_desc">Dual tone filled icon pack</string>
-    <string name="iconpack_acherus_desc">Acherus sub icon pack</string>
-    <string name="iconpack_circular_desc">Thin line icon pack</string>
-    <string name="iconpack_filled_desc">Dual tone filled icon pack</string>
-    <string name="iconpack_kai_desc">Thin line icon pack</string>
-    <string name="iconpack_oos_desc">Oxygen OS icon pack</string>
-    <string name="iconpack_outline_desc">Thin outline icon pack</string>
-    <string name="iconpack_pui_desc">Thick dualtone icon pack</string>
-    <string name="iconpack_rounded_desc">Rounded corner icon pack</string>
-    <string name="iconpack_sam_desc">Filled icon pack</string>
-    <string name="iconpack_victor_desc">Edgy icon pack</string>
-    <string name="settings_iconpack_bubble_v1">Inline multicolored icon pack</string>
-    <string name="settings_iconpack_bubble_v2">Outline multicolored icon pack</string>
-    <string name="battery_margin_title">Battery Margin</string>
-    <string name="app_icon">App Icon</string>
-    <string name="app_icon_default">Default Icon</string>
-    <string name="app_icon_themed">Themed Icon</string>
-    <string name="app_icon_retro">Retro Icon</string>
     <string name="lockscreen_customization_title">Lockscreen Customization</string>
     <string name="lockscreen_customization_desc">Enable lockscreen customizations</string>
-    <string name="notification_transparency_title">Notification Transparency</string>
-    <string name="notification_transparency_desc">Notification transparency for Fluid QS\nDo not use custom notification style</string>
-    <string name="tablet_header_title">Tablet Header</string>
-    <string name="tablet_header_desc">Enable large screen shade header</string>
-    <string name="sbclock_color_follow_system">Follow System</string>
-    <string name="sbclock_color_transparent_text">Transparent Text</string>
-    <string name="sbclock_color_custom_color">Custom Color</string>
-    <string name="statusbar_clock_color_title">Statusbar Clock Color</string>
-    <string name="clock_color_picker_title">Clock Color Picker</string>
-    <string name="clock_color_picker_desc">Set color of statubsar clock text</string>
-    <string name="accent_privacy_chip_title">Accent Privacy Chip</string>
-    <string name="accent_privacy_chip_desc">Make privacy chip accent colored</string>
     <string name="general_on">On</string>
     <string name="general_off">Off</string>
-    <string name="header_clock_center_clock_title">Center Clock</string>
-    <string name="header_clock_center_clock_desc">Move clock to center of view</string>
-    <string name="header_clock_hide_landscape_title">Hide in Landscape</string>
-    <string name="header_clock_hide_landscape_desc">Hide clock in landscape mode</string>
-    <string name="lockscreen_clock_auto_hide_clock_title">Auto Hide Clock</string>
-    <string name="lockscreen_clock_auto_hide_clock_desc">Hide clock on incoming notification</string>
-    <string name="toast_clear_cache">Iconify cache cleared</string>
-    <string name="clear_app_cache_title">Clear App Cache</string>
-    <string name="clear_app_cache_desc">Clear caches generated due to the usage of custom fonts, images, or gifs.</string>
-    <string name="lsclock_custom_color_title">Custom Clock Color</string>
-    <string name="lsclock_custom_color_desc">Custom color instead of primary color</string>
-    <string name="lsclock_color_picker_title">Clock Color Picker</string>
-    <string name="lsclock_color_picker_desc">Set color of lockscreen clock text</string>
-    <string name="tablet_landscape_title">Tablet Landscape</string>
-    <string name="tablet_landscape_desc">Also known as Better QS\nMust use Notch Bar Killer</string>
-    <string name="toast_skipped_installation">Installation skipped. Some features may not function properly.</string>
     <string name="one_time_reboot_needed">Reboot your device!</string>
-    <string name="xposed_only_desc">You are currently in Xposed Only mode. This requires iconify to be enabled in LSPosed app. Also make sure that Iconify module is shown in Magisk manager. To get access to all features, simply re-open the app and go through the installation process!</string>
-    <string name="power_menu_transparency_title">Power Menu Transparency</string>
-    <string name="power_menu_transparency_desc">Power menu transparency for Fluid QS\nDo not use custom notification style</string>
-    <string name="header_clock_font_title">Clock Font</string>
-    <string name="header_clock_font_desc">Use custom font for header clock\nDo not select file from Recent</string>
-    <string name="custom_header_clock_color_title">Custom Clock Color</string>
-    <string name="custom_header_clock_color_desc">Custom color instead of primary color</string>
-    <string name="header_clock_color_picker_title">Clock Color Picker</string>
-    <string name="header_clock_color_picker_desc">Set color of header clock text</string>
-    <string name="hide_data_disabled_icon_title">Hide Data Disabled Icon</string>
-    <string name="hide_data_disabled_icon_desc">Hide data disabled indicator</string>
-    <string name="btn_positive">Yes</string>
-    <string name="btn_negative">No</string>
-    <string name="toast_import_settings_successfull">Imported settings successfully</string>
-    <string name="toast_export_settings_successfull">Exported settings successfully</string>
-    <string name="qs_text_color_normal">Normal</string>
-    <string name="qs_text_color_pixel">Pixel</string>
-    <string name="monet_style_title">Monet Style</string>
-    <string name="xposed_module_disabled_title">Module Not Activated</string>
-    <string name="xposed_module_disabled_desc">System service not running</string>
-    <string name="settings_current_version">Current version: %s</string>
     <string name="tap_to_select">Tap on preview to select</string>
     <string name="dont_show_again">Don\'t show again</string>
-    <string name="auto_restart_systemui">Automatically restart SystemUI.</string>
-    <string name="manual_restart_systemui">Notify for manual restart.</string>
-    <string name="systemui_restart_required">SystemUI restart required</string>
-    <string name="click_to_enable_or_disable">Click to enable or disable</string>
-    <string name="schedule">Schedule</string>
-    <string name="media_player_background_color">Background Color</string>
-    <string name="mp_accent_background_desc">Make background follow accent</string>
-    <string name="mp_system_background_desc">Make background follow system</string>
-    <string name="mp_pb_background_desc">Make background pitch black</string>
-    <string name="tablet_mode">Tablet Mode</string>
-    <string name="privacy_chip">Privacy Chip</string>
-    <string name="display_mode">Display Mode</string>
-    <string name="buttons">Buttons</string>
-    <string name="gesture">Gesture</string>
-    <string name="pill_navigation">Pill Navigation</string>
-    <string name="size_and_position">Size and Position</string>
-    <string name="portrait_mode">Portrait Mode</string>
-    <string name="landscape_mode">Landscape Mode</string>
-    <string name="spacing">Spacing</string>
-    <string name="color">Color</string>
-    <string name="volume_slider_track">Volume Slider Track</string>
-    <string name="vp_thin_background_desc">Make track of volume slider thin</string>
-    <string name="vp_thick_background_desc">Make track of volume slider thick</string>
-    <string name="vp_no_background_desc">Remove track of volume slider</string>
-    <string name="status_bar">Status Bar</string>
-    <string name="status_icons">Status Icons</string>
-    <string name="qs_header">QS Header</string>
-    <string name="lock_screen">Lock Screen</string>
-    <string name="qs_tile">QS Tile</string>
-    <string name="for_pixel_roms">For Pixel Roms</string>
-    <string name="for_custom_roms">For Custom Roms</string>
-    <string name="translucent_theme">Translucent Theme</string>
-    <string name="qs_margin">QS Margin</string>
-    <string name="transparency">Transparency</string>
-    <string name="blur">Blur</string>
-    <string name="stock_colors">Stock Colors</string>
-    <string name="dark_theme">Dark Theme</string>
-    <string name="misc">Misc</string>
-    <string name="home_card_title">Design It Your Way</string>
-    <string name="home_card_subtitle">Unleash Your Imagination, Make It Yours</string>
-    <string name="hide">Hide</string>
-    <string name="pill_appearance">Pill Appearance</string>
-    <string name="about">About</string>
-    <string name="github_repository_title">Github repository</string>
-    <string name="github_repository_desc" translatable="false">Mahmud0808/Iconify</string>
-    <string name="telegram_group_title">Telegram group</string>
-    <string name="telegram_group_desc" translatable="false">\@IconifyDiscussion</string>
-    <string name="credits_title">Credits</string>
-    <string name="credits_desc">Thanking those who made this possible.</string>
-    <string name="general">General</string>
-    <string name="miscellaneous">Miscellaneous</string>
-    <string name="update">Update</string>
-    <string name="show_home_page_card_title">Show Home Page Card</string>
-    <string name="show_home_page_card_desc">Show a beautiful card on the home page.</string>
-    <string name="experimental_features_desc">Try out experimental functionalities.</string>
-    <string name="check_for_update">Check For Update</string>
-    <string name="auto_update_title">Auto Update</string>
-    <string name="auto_update_desc">Check for new versions when opening the app.</string>
-    <string name="xposed">Xposed</string>
-    <string name="restart_systemui_behavior">Restart SystemUI Behavior</string>
-    <string name="custom_magisk_module">Custom Magisk Module</string>
-    <string name="icon_pack_styles">Icon Pack Styles</string>
-    <string name="brightness_bar_styles">Brightness Bar Styles</string>
-    <string name="qspanel_tile_styles">QS Panel Tile Styles</string>
-    <string name="notification_styles">Notification Styles</string>
 </resources>