diff --git a/MiniScanner/Core/Extensions/String+StringKeys.swift b/MiniScanner/Core/Extensions/String+StringKeys.swift
index 01c4766e5e24ffd9924600abff6c6e582e00505f..c6dcadf601bdfc6a9d602ac2a5eb2fd918dd3ac9 100644
--- a/MiniScanner/Core/Extensions/String+StringKeys.swift
+++ b/MiniScanner/Core/Extensions/String+StringKeys.swift
@@ -66,7 +66,7 @@ extension String {
     
     static let change = "change"
     static let appLanguage = "app_language"
-    static let appTheme = "app_theme"
+    static let appAppearence = "app_appearence"
     
     static let defaultFileTypeForInstalling = "default_file_type_for_installing"
     
@@ -75,8 +75,8 @@ extension String {
     
     static let basedOnDevice = "based_on_device"
     
-    static let darkMode = "dark_mode"
-    static let lightMode = "light_mode"
+    static let dark = "dark"
+    static let light = "light"
     
     static let Continue = "continue"
     static let back = "back"
diff --git a/MiniScanner/Core/Presentation/Localization/Localizable.xcstrings b/MiniScanner/Core/Presentation/Localization/Localizable.xcstrings
index bb821d951b105c6ed203c8e207affd9b93d9b762..5d9f32d20e01991524b2b9d5f684cbd49542fad8 100644
--- a/MiniScanner/Core/Presentation/Localization/Localizable.xcstrings
+++ b/MiniScanner/Core/Presentation/Localization/Localizable.xcstrings
@@ -191,53 +191,36 @@
         }
       }
     },
-    "app_language" : {
+    "app_appearence" : {
       "extractionState" : "manual",
       "localizations" : {
         "ar" : {
           "stringUnit" : {
-            "state" : "translated",
-            "value" : "لغة التطبيق"
-          }
-        },
-        "en" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "App Language"
-          }
-        }
-      }
-    },
-    "app_theme" : {
-      "extractionState" : "manual",
-      "localizations" : {
-        "ar" : {
-          "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "مظهر التطبيق"
           }
         },
         "en" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "App theme"
+            "value" : "App appearence"
           }
         }
       }
     },
-    "appearence" : {
+    "app_language" : {
       "extractionState" : "manual",
       "localizations" : {
         "ar" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "مظهر التطبيق"
+            "value" : "لغة التطبيق"
           }
         },
         "en" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Appearence"
+            "value" : "App Language"
           }
         }
       }
@@ -502,19 +485,19 @@
         }
       }
     },
-    "dark_mode" : {
+    "dark" : {
       "extractionState" : "manual",
       "localizations" : {
         "ar" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "الوضع الليلي"
+            "value" : "داكن"
           }
         },
         "en" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Dark mode"
+            "value" : "Dark"
           }
         }
       }
@@ -1062,19 +1045,19 @@
         }
       }
     },
-    "light_mode" : {
+    "light" : {
       "extractionState" : "manual",
       "localizations" : {
         "ar" : {
           "stringUnit" : {
-            "state" : "translated",
-            "value" : "الوضع النهاري"
+            "state" : "needs_review",
+            "value" : "فاتح"
           }
         },
         "en" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Light mode"
+            "value" : "Ligh"
           }
         }
       }
diff --git a/MiniScanner/Features/Common/Data/Model/SupportedColorScheme.swift b/MiniScanner/Features/Common/Data/Model/SupportedColorScheme.swift
index 64a97f64af8671d0f0eb237e726838335605b17f..c00c11c6535dfa2201c782823ca0935e664d4d8a 100644
--- a/MiniScanner/Features/Common/Data/Model/SupportedColorScheme.swift
+++ b/MiniScanner/Features/Common/Data/Model/SupportedColorScheme.swift
@@ -21,9 +21,9 @@ enum SupportedColorScheme: String, CaseIterable, CustomMenuPickerItem {
         case .device:
                 .basedOnDevice.localized
         case .light:
-                .lightMode.localized
+                .light.localized
         case .dark:
-                .darkMode.localized
+                .dark.localized
         }
     }
 }
diff --git a/MiniScanner/Features/Settings/Presentation/Settings/SettingsView.swift b/MiniScanner/Features/Settings/Presentation/Settings/SettingsView.swift
index 3b9e382992223b6612d51d044775c91ae62c6efb..c3af43995af9991e1e71c155da62a9124aedf74f 100644
--- a/MiniScanner/Features/Settings/Presentation/Settings/SettingsView.swift
+++ b/MiniScanner/Features/Settings/Presentation/Settings/SettingsView.swift
@@ -109,7 +109,7 @@ extension SettingsView {
     
     private var colorScheme: some View {
         SettingButton(icon: .brush,
-                      title: .appTheme.localized,
+                      title: .appAppearence.localized,
                       value: viewModel.selectedColorScheme.displayedName,
                       action: viewModel.onColorSchemeClick)
     }
@@ -136,7 +136,7 @@ extension SettingsView {
     }
     
     private var colorSchemeSheet: some View {
-        SettingSheetView(title: .appTheme.localized,
+        SettingSheetView(title: .appAppearence.localized,
                          selectedItem: $viewModel.selectedColorSchemeForSheet,
                          items: viewModel.colorSchemes,
                          saveAction: viewModel.onColorSchemeSaveClick)