diff --git a/Data/data/settings.properties b/Data/data/settings.properties
new file mode 100644
index 00000000..0b905db8
--- /dev/null
+++ b/Data/data/settings.properties
@@ -0,0 +1,2 @@
+language=en-US
+timeFormat24h=true
\ No newline at end of file
diff --git a/Data/system/app/LocaleSettings/i18n/en-GB.i18n b/Data/system/app/LocaleSettings/i18n/en-GB.i18n
new file mode 100644
index 00000000..ab750d45
--- /dev/null
+++ b/Data/system/app/LocaleSettings/i18n/en-GB.i18n
@@ -0,0 +1,7 @@
+Dutch (Netherlands)
+Dutch (Belgium)
+English (United States)
+English (United Kingdom)
+French (France)
+Region
+Language
diff --git a/Data/system/app/LocaleSettings/i18n/en-US.i18n b/Data/system/app/LocaleSettings/i18n/en-US.i18n
new file mode 100644
index 00000000..ab750d45
--- /dev/null
+++ b/Data/system/app/LocaleSettings/i18n/en-US.i18n
@@ -0,0 +1,7 @@
+Dutch (Netherlands)
+Dutch (Belgium)
+English (United States)
+English (United Kingdom)
+French (France)
+Region
+Language
diff --git a/Data/system/app/LocaleSettings/i18n/fr-FR.i18n b/Data/system/app/LocaleSettings/i18n/fr-FR.i18n
new file mode 100644
index 00000000..209b263a
--- /dev/null
+++ b/Data/system/app/LocaleSettings/i18n/fr-FR.i18n
@@ -0,0 +1,7 @@
+Néerlandais (Pays-Bas)
+Néerlandais (Belgique)
+Anglais (États-Unis)
+Anglais (Royaume-Uni)
+Français (France)
+Région
+Langue
diff --git a/Data/system/app/LocaleSettings/i18n/nl-BE.i18n b/Data/system/app/LocaleSettings/i18n/nl-BE.i18n
new file mode 100644
index 00000000..39900b4b
--- /dev/null
+++ b/Data/system/app/LocaleSettings/i18n/nl-BE.i18n
@@ -0,0 +1,7 @@
+Nederlands (Nederland)
+Nederlands (België)
+Engels (Verenigde Staten)
+Engels (Verenigd Koninkrijk)
+Frans (Frankrijk)
+Regio
+Taal
diff --git a/Data/system/app/LocaleSettings/i18n/nl-NL.i18n b/Data/system/app/LocaleSettings/i18n/nl-NL.i18n
new file mode 100644
index 00000000..39900b4b
--- /dev/null
+++ b/Data/system/app/LocaleSettings/i18n/nl-NL.i18n
@@ -0,0 +1,7 @@
+Nederlands (Nederland)
+Nederlands (België)
+Engels (Verenigde Staten)
+Engels (Verenigd Koninkrijk)
+Frans (Frankrijk)
+Regio
+Taal
diff --git a/Tactility/Include/Tactility/i18n/Core.h b/Tactility/Include/Tactility/i18n/Core.h
deleted file mode 100644
index 591664cb..00000000
--- a/Tactility/Include/Tactility/i18n/Core.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#pragma once
-
-// WARNING: This file is auto-generated. Do not edit manually.
-
-namespace tt::i18n::core {
-
-enum class Text {
-    OK = 0,
-    YES = 1,
-    NO = 2,
-    CANCEL = 3,
-    RETRY = 4,
-    CLOSE = 5,
-    OPEN = 6,
-};
-
-}
diff --git a/Tactility/Include/Tactility/i18n/CoreTextResources.h b/Tactility/Include/Tactility/i18n/CoreTextResources.h
index 591664cb..ad389b83 100644
--- a/Tactility/Include/Tactility/i18n/CoreTextResources.h
+++ b/Tactility/Include/Tactility/i18n/CoreTextResources.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "Tactility/i18n/TextResources.h"
+
 // WARNING: This file is auto-generated. Do not edit manually.
 
 namespace tt::i18n::core {
diff --git a/Tactility/Include/Tactility/i18n/I18n.h b/Tactility/Include/Tactility/i18n/I18n.h
deleted file mode 100644
index 9e091045..00000000
--- a/Tactility/Include/Tactility/i18n/I18n.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#pragma once
-
-#include <string>
-#include <memory>
-
-namespace tt::i18n {
-
-class IndexedText {
-
-public:
-
-    virtual ~IndexedText() = default;
-
-    virtual const std::string& get(int index) const = 0;
-
-    template <typename EnumType>
-    const std::string& get(EnumType value) const { return get(static_cast<int>(value)); }
-
-    const std::string& operator[](const int index) const { return get(index); }
-};
-
-std::shared_ptr<IndexedText> loadIndexedText(const std::string& path);
-
-}
\ No newline at end of file
diff --git a/Tactility/Include/Tactility/i18n/Launcher.h b/Tactility/Include/Tactility/i18n/Launcher.h
deleted file mode 100644
index 2a316726..00000000
--- a/Tactility/Include/Tactility/i18n/Launcher.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-// WARNING: This file is auto-generated. Do not edit manually.
-
-namespace tt::i18n::launcher {
-
-enum class Text {
-    APPS = 0,
-    FILES = 1,
-    SETTINGS = 2,
-};
-
-}
diff --git a/Tactility/Include/Tactility/i18n/TextResources.h b/Tactility/Include/Tactility/i18n/TextResources.h
new file mode 100644
index 00000000..4e016443
--- /dev/null
+++ b/Tactility/Include/Tactility/i18n/TextResources.h
@@ -0,0 +1,49 @@
+#pragma once
+
+#include <string>
+#include <vector>
+
+namespace tt::i18n {
+
+/**
+ * Holds localized text data.
+ *
+ * It is used with data generated from Translations/ with the python generation scripts.
+ * It's used with a header file that specifies the indexes, and generated text files (.i18n)
+ */
+class TextResources {
+
+    std::vector<std::string> data;
+    std::string path;
+    static std::string ERROR_RESULT;
+
+public:
+    /**
+     * @param[in] path
+     */
+    TextResources(const std::string& path) : path(path) {}
+
+    const std::string& get(const int index) const {
+        if (index < data.size()) {
+            return data[index];
+        } else {
+            return ERROR_RESULT;
+        }
+    }
+
+    template <typename EnumType>
+    const std::string& get(EnumType value) const { return get(static_cast<int>(value)); }
+
+    const std::string& operator[](const int index) const { return get(index); }
+
+    template <typename EnumType>
+    const std::string& operator[](const EnumType index) const { return get(index); }
+
+    /**
+     * Load or reload an i18n file with the system's current locale settings.
+     * @return true on success
+     */
+    bool load();
+};
+
+}
\ No newline at end of file
diff --git a/Tactility/Include/Tactility/settings/Language.h b/Tactility/Include/Tactility/settings/Language.h
new file mode 100644
index 00000000..953cb281
--- /dev/null
+++ b/Tactility/Include/Tactility/settings/Language.h
@@ -0,0 +1,24 @@
+#pragma once
+
+#include <string>
+
+namespace tt::settings {
+
+enum class Language {
+    en_GB,
+    en_US,
+    fr_FR,
+    nl_BE,
+    nl_NL,
+    count
+};
+
+void setLanguage(Language language);
+
+Language getLanguage();
+
+std::string toString(Language language);
+
+bool fromString(const std::string& text, Language& language);
+
+}
diff --git a/Tactility/Include/Tactility/settings/SettingsProperties.h b/Tactility/Include/Tactility/settings/SettingsProperties.h
new file mode 100644
index 00000000..3161c81d
--- /dev/null
+++ b/Tactility/Include/Tactility/settings/SettingsProperties.h
@@ -0,0 +1,16 @@
+#pragma once
+
+#include "Language.h"
+
+namespace tt::settings {
+
+struct SettingsProperties {
+    Language language;
+    bool timeFormat24h;
+};
+
+bool loadSettingsProperties(SettingsProperties& properties);
+
+bool saveSettingsProperties(const SettingsProperties& properties);
+
+}
diff --git a/Tactility/Include/Tactility/time/Time.h b/Tactility/Include/Tactility/settings/Time.h
similarity index 96%
rename from Tactility/Include/Tactility/time/Time.h
rename to Tactility/Include/Tactility/settings/Time.h
index 88448e4f..40ff450f 100644
--- a/Tactility/Include/Tactility/time/Time.h
+++ b/Tactility/Include/Tactility/settings/Time.h
@@ -2,7 +2,7 @@
 
 #include <string>
 
-namespace tt::time {
+namespace tt::settings {
 
 /**
  * Set the timezone
diff --git a/Tactility/Private/Tactility/app/launcher/TextResources.h b/Tactility/Private/Tactility/app/launcher/TextResources.h
index 6bfdf684..efb5acd9 100644
--- a/Tactility/Private/Tactility/app/launcher/TextResources.h
+++ b/Tactility/Private/Tactility/app/launcher/TextResources.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "Tactility/i18n/TextResources.h"
+
 // WARNING: This file is auto-generated. Do not edit manually.
 
 namespace tt::app::launcher::i18n {
diff --git a/Tactility/Private/Tactility/app/localesettings/LocaleSettings.h b/Tactility/Private/Tactility/app/localesettings/LocaleSettings.h
new file mode 100644
index 00000000..5fd746c0
--- /dev/null
+++ b/Tactility/Private/Tactility/app/localesettings/LocaleSettings.h
@@ -0,0 +1,7 @@
+#pragma once
+
+namespace tt::app::localesettings {
+
+void start();
+
+}
\ No newline at end of file
diff --git a/Tactility/Private/Tactility/app/localesettings/TextResources.h b/Tactility/Private/Tactility/app/localesettings/TextResources.h
new file mode 100644
index 00000000..08728900
--- /dev/null
+++ b/Tactility/Private/Tactility/app/localesettings/TextResources.h
@@ -0,0 +1,19 @@
+#pragma once
+
+#include "Tactility/i18n/TextResources.h"
+
+// WARNING: This file is auto-generated. Do not edit manually.
+
+namespace tt::app::localesettings::i18n {
+
+enum class Text {
+    NL_NL = 0,
+    NL_BE = 1,
+    EN_US = 2,
+    EN_GB = 3,
+    FR_FR = 4,
+    REGION = 5,
+    LANGUAGE = 6,
+};
+
+}
diff --git a/Tactility/Private/Tactility/settings/TimePrivate.h b/Tactility/Private/Tactility/settings/TimePrivate.h
new file mode 100644
index 00000000..1968e5e2
--- /dev/null
+++ b/Tactility/Private/Tactility/settings/TimePrivate.h
@@ -0,0 +1,7 @@
+#pragma once
+
+namespace tt::settings {
+
+void initTimeZone();
+
+}
diff --git a/Tactility/Private/Tactility/time/TimePrivate.h b/Tactility/Private/Tactility/time/TimePrivate.h
deleted file mode 100644
index 92b13222..00000000
--- a/Tactility/Private/Tactility/time/TimePrivate.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-namespace tt::time {
-
-void init();
-
-}
diff --git a/Tactility/Source/PartitionsEsp.cpp b/Tactility/Source/PartitionsEsp.cpp
index cf9f7bbf..3381182f 100644
--- a/Tactility/Source/PartitionsEsp.cpp
+++ b/Tactility/Source/PartitionsEsp.cpp
@@ -22,13 +22,27 @@ static esp_err_t initNvsFlashSafely() {
 
 static wl_handle_t data_wl_handle = WL_INVALID_HANDLE;
 
+size_t getSectorSize() {
+#if defined(CONFIG_FATFS_SECTOR_512)
+    return 512;
+#elif defined(CONFIG_FATFS_SECTOR_1024)
+    return 1024;
+#elif defined(CONFIG_FATFS_SECTOR_2048)
+    return 2048;
+#elif defined(CONFIG_FATFS_SECTOR_4096)
+    return 4096;
+#else
+#error Not implemented
+#endif
+}
+
 esp_err_t initPartitionsEsp() {
     ESP_ERROR_CHECK(initNvsFlashSafely());
 
     const esp_vfs_fat_mount_config_t mount_config = {
         .format_if_mount_failed = false,
         .max_files = 4,
-        .allocation_unit_size = CONFIG_WL_SECTOR_SIZE,
+        .allocation_unit_size = getSectorSize(),
         .disk_status_check_enable = false,
         .use_one_fat = true,
     };
diff --git a/Tactility/Source/Tactility.cpp b/Tactility/Source/Tactility.cpp
index 8cb64c69..5250348c 100644
--- a/Tactility/Source/Tactility.cpp
+++ b/Tactility/Source/Tactility.cpp
@@ -47,6 +47,7 @@ namespace app {
     namespace imageviewer { extern const AppManifest manifest; }
     namespace inputdialog { extern const AppManifest manifest; }
     namespace launcher { extern const AppManifest manifest; }
+    namespace localesettings { extern const AppManifest manifest; }
     namespace log { extern const AppManifest manifest; }
     namespace notes { extern const AppManifest manifest; }
     namespace power { extern const AppManifest manifest; }
@@ -89,6 +90,7 @@ static void registerSystemApps() {
     addApp(app::imageviewer::manifest);
     addApp(app::inputdialog::manifest);
     addApp(app::launcher::manifest);
+    addApp(app::localesettings::manifest);
     addApp(app::log::manifest);
     addApp(app::notes::manifest);
     addApp(app::serialconsole::manifest);
diff --git a/Tactility/Source/TactilityHeadless.cpp b/Tactility/Source/TactilityHeadless.cpp
index 97570836..a827e5ab 100644
--- a/Tactility/Source/TactilityHeadless.cpp
+++ b/Tactility/Source/TactilityHeadless.cpp
@@ -6,7 +6,7 @@
 #include "Tactility/service/ServiceRegistration.h"
 
 #include <Tactility/Dispatcher.h>
-#include <Tactility/time/TimePrivate.h>
+#include <Tactility/settings/TimePrivate.h>
 
 #ifdef ESP_PLATFORM
 #include "Tactility/InitEsp.h"
@@ -45,7 +45,7 @@ void initHeadless(const hal::Configuration& config) {
     initEsp();
 #endif
     hardwareConfig = &config;
-    time::init();
+    settings::initTimeZone();
     hal::init(config);
     network::ntp::init();
     registerAndStartSystemServices();
diff --git a/Tactility/Source/app/launcher/Launcher.cpp b/Tactility/Source/app/launcher/Launcher.cpp
index 82ec55af..1c994cc7 100644
--- a/Tactility/Source/app/launcher/Launcher.cpp
+++ b/Tactility/Source/app/launcher/Launcher.cpp
@@ -1,14 +1,12 @@
 #include "Tactility/app/AppContext.h"
+#include "Tactility/app/launcher/TextResources.h"
 #include "Tactility/app/AppRegistration.h"
 #include "Tactility/service/loader/Loader.h"
 
-#include "Tactility/i18n/Launcher.h"
-
 #include <Tactility/Tactility.h>
 
 #include <lvgl.h>
 #include <Tactility/BootProperties.h>
-#include <Tactility/i18n/I18n.h>
 
 namespace tt::app::launcher {
 
@@ -55,11 +53,9 @@ static lv_obj_t* createAppButton(lv_obj_t* parent, const char* title, const char
 }
 
 class LauncherApp : public App {
-    std::shared_ptr<i18n::IndexedText> launcherText = i18n::loadIndexedText("/data/i18n/launcher");
+    tt::i18n::TextResources textResources = tt::i18n::TextResources("/system/app/Launcher/i18n");
 
     void onCreate(TT_UNUSED AppContext& app) override {
-        assert(launcherText != nullptr);
-
         BootProperties boot_properties;
         if (loadBootProperties(boot_properties) && !boot_properties.autoStartAppId.empty()) {
             TT_LOG_I(TAG, "Starting %s", boot_properties.autoStartAppId.c_str());
@@ -68,6 +64,8 @@ class LauncherApp : public App {
     }
 
     void onShow(TT_UNUSED AppContext& app, lv_obj_t* parent) override {
+        textResources.load();
+
         auto* wrapper = lv_obj_create(parent);
 
         lv_obj_align(wrapper, LV_ALIGN_CENTER, 0, 0);
@@ -94,9 +92,9 @@ class LauncherApp : public App {
         auto files_icon_path = paths->getSystemPathLvgl("icon_files.png");
         auto settings_icon_path = paths->getSystemPathLvgl("icon_settings.png");
 
-        const auto& apps_title = launcherText->get(i18n::launcher::Text::APPS);
-        const auto& files_title = launcherText->get(i18n::launcher::Text::FILES);
-        const auto& settings_title = launcherText->get(i18n::launcher::Text::SETTINGS);
+        const auto& apps_title = textResources[i18n::Text::APPS];
+        const auto& files_title = textResources[i18n::Text::FILES];
+        const auto& settings_title = textResources[i18n::Text::SETTINGS];
 
         createAppButton(wrapper, apps_title.c_str(), apps_icon_path.c_str(), "AppList", 0);
         createAppButton(wrapper, files_title.c_str(), files_icon_path.c_str(), "Files", padding);
diff --git a/Tactility/Source/app/localesettings/LocaleSettings.cpp b/Tactility/Source/app/localesettings/LocaleSettings.cpp
new file mode 100644
index 00000000..cb4bb560
--- /dev/null
+++ b/Tactility/Source/app/localesettings/LocaleSettings.cpp
@@ -0,0 +1,168 @@
+#include <Tactility/Assets.h>
+#include <Tactility/app/timezone/TimeZone.h>
+#include <Tactility/app/localesettings/TextResources.h>
+#include <Tactility/lvgl/Toolbar.h>
+#include <Tactility/lvgl/LvglSync.h>
+#include <Tactility/service/loader/Loader.h>
+#include <Tactility/settings/Time.h>
+
+#include <lvgl.h>
+#include <map>
+#include <sstream>
+#include <Tactility/StringUtils.h>
+#include <Tactility/settings/Language.h>
+
+namespace tt::app::localesettings {
+
+constexpr auto* TAG = "LocaleSettings";
+
+extern const AppManifest manifest;
+
+class LocaleSettingsApp : public App {
+    tt::i18n::TextResources textResources = tt::i18n::TextResources("/system/app/LocaleSettings/i18n");
+    Mutex mutex = Mutex(Mutex::Type::Recursive);
+    lv_obj_t* timeZoneLabel = nullptr;
+    lv_obj_t* regionLabel = nullptr;
+    lv_obj_t* languageDropdown = nullptr;
+    lv_obj_t* languageLabel = nullptr;
+
+    static void onConfigureTimeZonePressed(TT_UNUSED lv_event_t* event) {
+        timezone::start();
+    }
+
+    std::map<settings::Language, std::string> languageMap;
+
+    std::string getLanguageOptions() const {
+        std::vector<std::string> items;
+        for (int i = 0; i < static_cast<int>(settings::Language::count); i++) {
+            switch (static_cast<settings::Language>(i)) {
+                case settings::Language::en_GB:
+                    items.push_back(textResources[i18n::Text::EN_GB]);
+                    break;
+                case settings::Language::en_US:
+                    items.push_back(textResources[i18n::Text::EN_US]);
+                    break;
+                case settings::Language::fr_FR:
+                    items.push_back(textResources[i18n::Text::FR_FR]);
+                    break;
+                case settings::Language::nl_BE:
+                    items.push_back(textResources[i18n::Text::NL_BE]);
+                    break;
+                case settings::Language::nl_NL:
+                    items.push_back(textResources[i18n::Text::NL_NL]);
+                    break;
+                case settings::Language::count:
+                    break;
+            }
+        }
+        return string::join(items, "\n");
+    }
+
+    void updateViews() {
+        textResources.load();
+
+        lv_label_set_text(regionLabel , textResources[i18n::Text::REGION].c_str());
+        lv_label_set_text(languageLabel, textResources[i18n::Text::LANGUAGE].c_str());
+
+        std::string language_options = getLanguageOptions();
+        lv_dropdown_set_options(languageDropdown, language_options.c_str());
+        lv_dropdown_set_selected(languageDropdown, static_cast<uint32_t>(settings::getLanguage()));
+    }
+
+    static void onLanguageSet(lv_event_t* event) {
+        auto* dropdown = static_cast<lv_obj_t*>(lv_event_get_target(event));
+        auto index = lv_dropdown_get_selected(dropdown);
+        auto language = static_cast<settings::Language>(index);
+        settings::setLanguage(language);
+
+        auto* self = static_cast<LocaleSettingsApp*>(lv_event_get_user_data(event));
+        self->updateViews();
+    }
+
+public:
+
+    void onShow(AppContext& app, lv_obj_t* parent) override {
+        textResources.load();
+
+        lv_obj_set_flex_flow(parent, LV_FLEX_FLOW_COLUMN);
+
+        lvgl::toolbar_create(parent, app);
+
+        auto* main_wrapper = lv_obj_create(parent);
+        lv_obj_set_flex_flow(main_wrapper, LV_FLEX_FLOW_COLUMN);
+        lv_obj_set_width(main_wrapper, LV_PCT(100));
+        lv_obj_set_flex_grow(main_wrapper, 1);
+
+        auto* region_wrapper = lv_obj_create(main_wrapper);
+        lv_obj_set_width(region_wrapper, LV_PCT(100));
+        lv_obj_set_height(region_wrapper, LV_SIZE_CONTENT);
+        lv_obj_set_style_pad_all(region_wrapper, 0, 0);
+        lv_obj_set_style_border_width(region_wrapper, 0, 0);
+
+        regionLabel = lv_label_create(region_wrapper);
+        lv_label_set_text(regionLabel , textResources[i18n::Text::REGION].c_str());
+        lv_obj_align(regionLabel , LV_ALIGN_LEFT_MID, 0, 0);
+
+        timeZoneLabel = lv_label_create(region_wrapper);
+        std::string timeZoneName = settings::getTimeZoneName();
+        if (timeZoneName.empty()) {
+            timeZoneName = "not set";
+        }
+        lv_label_set_text(timeZoneLabel, timeZoneName.c_str());
+        // TODO: Find out why Y offset is needed
+        lv_obj_align_to(timeZoneLabel, regionLabel, LV_ALIGN_OUT_RIGHT_MID, 10, 8);
+
+        auto* region_button = lv_button_create(region_wrapper);
+        lv_obj_align(region_button, LV_ALIGN_TOP_RIGHT, 0, 0);
+        auto* region_button_image = lv_image_create(region_button);
+        lv_obj_add_event_cb(region_button, onConfigureTimeZonePressed, LV_EVENT_SHORT_CLICKED, nullptr);
+        lv_image_set_src(region_button_image, LV_SYMBOL_SETTINGS);
+
+        auto* language_wrapper = lv_obj_create(main_wrapper);
+        lv_obj_set_width(language_wrapper, LV_PCT(100));
+        lv_obj_set_height(language_wrapper, LV_SIZE_CONTENT);
+        lv_obj_set_style_pad_all(language_wrapper, 0, 0);
+        lv_obj_set_style_border_width(language_wrapper, 0, 0);
+
+        languageLabel = lv_label_create(language_wrapper);
+        lv_label_set_text(languageLabel, textResources[i18n::Text::LANGUAGE].c_str());
+        lv_obj_align(languageLabel, LV_ALIGN_LEFT_MID, 0, 0);
+
+        languageDropdown = lv_dropdown_create(language_wrapper);
+        lv_obj_align(languageDropdown, LV_ALIGN_RIGHT_MID, 0, 0);
+        std::string language_options = getLanguageOptions();
+        lv_dropdown_set_options(languageDropdown, language_options.c_str());
+        lv_dropdown_set_selected(languageDropdown, static_cast<uint32_t>(settings::getLanguage()));
+        lv_obj_add_event_cb(languageDropdown, onLanguageSet, LV_EVENT_VALUE_CHANGED, this);
+    }
+
+    void onResult(AppContext& app, TT_UNUSED LaunchId launchId, Result result, std::unique_ptr<Bundle> bundle) override {
+        if (result == Result::Ok && bundle != nullptr) {
+            const auto name = timezone::getResultName(*bundle);
+            const auto code = timezone::getResultCode(*bundle);
+            TT_LOG_I(TAG, "Result name=%s code=%s", name.c_str(), code.c_str());
+            settings::setTimeZone(name, code);
+
+            if (!name.empty()) {
+                if (lvgl::lock(100 / portTICK_PERIOD_MS)) {
+                    lv_label_set_text(timeZoneLabel, name.c_str());
+                    lvgl::unlock();
+                }
+            }
+        }
+    }
+};
+
+extern const AppManifest manifest = {
+    .id = "LocaleSettings",
+    .name = "Region & Language",
+    .icon = TT_ASSETS_APP_ICON_TIME_DATE_SETTINGS,
+    .type = Type::Settings,
+    .createApp = create<LocaleSettingsApp>
+};
+
+void start() {
+    service::loader::startApp(manifest.id);
+}
+
+} // namespace
diff --git a/Tactility/Source/app/timedatesettings/TimeDateSettings.cpp b/Tactility/Source/app/timedatesettings/TimeDateSettings.cpp
index f9290374..95e4eb57 100644
--- a/Tactility/Source/app/timedatesettings/TimeDateSettings.cpp
+++ b/Tactility/Source/app/timedatesettings/TimeDateSettings.cpp
@@ -1,33 +1,25 @@
-#include "Tactility/app/timezone/TimeZone.h"
-#include "Tactility/lvgl/Toolbar.h"
-#include "Tactility/service/loader/Loader.h"
-#include "Tactility/lvgl/LvglSync.h"
-
 #include <Tactility/Assets.h>
-#include <Tactility/time/Time.h>
+#include <Tactility/app/AppManifest.h>
+#include <Tactility/lvgl/Toolbar.h>
+#include <Tactility/service/loader/Loader.h>
+#include <Tactility/settings/Time.h>
+
 #include <lvgl.h>
 
-#define TAG "text_viewer"
-
 namespace tt::app::timedatesettings {
 
+constexpr auto* TAG = "TimeDate";
+
 extern const AppManifest manifest;
 
 class TimeDateSettingsApp : public App {
 
-private:
-
     Mutex mutex = Mutex(Mutex::Type::Recursive);
-    lv_obj_t* regionLabelWidget = nullptr;
-
-    static void onConfigureTimeZonePressed(TT_UNUSED lv_event_t* event) {
-        timezone::start();
-    }
 
     static void onTimeFormatChanged(lv_event_t* event) {
         auto* widget = lv_event_get_target_obj(event);
         bool show_24 = lv_obj_has_state(widget, LV_STATE_CHECKED);
-        time::setTimeFormat24Hour(show_24);
+        settings::setTimeFormat24Hour(show_24);
     }
 
 public:
@@ -42,32 +34,6 @@ public:
         lv_obj_set_width(main_wrapper, LV_PCT(100));
         lv_obj_set_flex_grow(main_wrapper, 1);
 
-        auto* region_wrapper = lv_obj_create(main_wrapper);
-        lv_obj_set_width(region_wrapper, LV_PCT(100));
-        lv_obj_set_height(region_wrapper, LV_SIZE_CONTENT);
-        lv_obj_set_style_pad_all(region_wrapper, 0, 0);
-        lv_obj_set_style_border_width(region_wrapper, 0, 0);
-
-        auto* region_prefix_label = lv_label_create(region_wrapper);
-        lv_label_set_text(region_prefix_label, "Region: ");
-        lv_obj_align(region_prefix_label, LV_ALIGN_LEFT_MID, 0, 0);
-
-        auto* region_label = lv_label_create(region_wrapper);
-        std::string timeZoneName = time::getTimeZoneName();
-        if (timeZoneName.empty()) {
-            timeZoneName = "not set";
-        }
-        regionLabelWidget = region_label;
-        lv_label_set_text(region_label, timeZoneName.c_str());
-        // TODO: Find out why Y offset is needed
-        lv_obj_align_to(region_label, region_prefix_label, LV_ALIGN_OUT_RIGHT_MID, 0, 8);
-
-        auto* region_button = lv_button_create(region_wrapper);
-        lv_obj_align(region_button, LV_ALIGN_TOP_RIGHT, 0, 0);
-        auto* region_button_image = lv_image_create(region_button);
-        lv_obj_add_event_cb(region_button, onConfigureTimeZonePressed, LV_EVENT_SHORT_CLICKED, nullptr);
-        lv_image_set_src(region_button_image, LV_SYMBOL_SETTINGS);
-
         auto* time_format_wrapper = lv_obj_create(main_wrapper);
         lv_obj_set_width(time_format_wrapper, LV_PCT(100));
         lv_obj_set_height(time_format_wrapper, LV_SIZE_CONTENT);
@@ -81,28 +47,12 @@ public:
         auto* time_24h_switch = lv_switch_create(time_format_wrapper);
         lv_obj_align(time_24h_switch, LV_ALIGN_RIGHT_MID, 0, 0);
         lv_obj_add_event_cb(time_24h_switch, onTimeFormatChanged, LV_EVENT_VALUE_CHANGED, nullptr);
-        if (time::isTimeFormat24Hour()) {
+        if (settings::isTimeFormat24Hour()) {
             lv_obj_add_state(time_24h_switch, LV_STATE_CHECKED);
         } else {
             lv_obj_remove_state(time_24h_switch, LV_STATE_CHECKED);
         }
     }
-
-    void onResult(AppContext& app, TT_UNUSED LaunchId launchId, Result result, std::unique_ptr<Bundle> bundle) override {
-        if (result == Result::Ok && bundle != nullptr) {
-            auto name = timezone::getResultName(*bundle);
-            auto code = timezone::getResultCode(*bundle);
-            TT_LOG_I(TAG, "Result name=%s code=%s", name.c_str(), code.c_str());
-            time::setTimeZone(name, code);
-
-            if (!name.empty()) {
-                if (lvgl::lock(100 / portTICK_PERIOD_MS)) {
-                    lv_label_set_text(regionLabelWidget, name.c_str());
-                    lvgl::unlock();
-                }
-            }
-        }
-    }
 };
 
 extern const AppManifest manifest = {
diff --git a/Tactility/Source/i18n/I18n.cpp b/Tactility/Source/i18n/I18n.cpp
deleted file mode 100644
index 6458104a..00000000
--- a/Tactility/Source/i18n/I18n.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-#include "Tactility/i18n/I18n.h"
-#include "Tactility/file/FileLock.h"
-
-#include <cstring>
-#include <vector>
-#include <Tactility/file/File.h>
-
-namespace tt::i18n {
-
-constexpr auto* TAG = "I18n";
-static std::string ERROR_RESULT = "TRANSLATION_ERROR";
-
-class IndexedTextImplementation : IndexedText {
-
-    std::vector<std::string> data;
-
-public:
-
-    explicit IndexedTextImplementation(std::vector<std::string> data) : data(std::move(data)) {}
-
-    const std::string& get(const int index) const override {
-        if (index < data.size()) {
-            return data[index];
-        } else {
-            return ERROR_RESULT;
-        }
-    }
-};
-
-static std::string getDesiredLocale() {
-    // TODO: Implement locale settings
-    return "en-GB";
-}
-
-static std::string getFallbackLocale() {
-    // TODO: Implement locale settings
-    return "en-GB";
-}
-
-static std::string getI18nDataFilePath(const std::string& path) {
-    auto locale = getDesiredLocale();
-    auto desired_file_path = std::format("{}/{}.i18n", path, locale);
-    if (file::isFile(desired_file_path)) {
-        return desired_file_path;
-    } else {
-        TT_LOG_W(TAG, "Translations not found for %s at %s", locale.c_str(), desired_file_path.c_str());
-    }
-
-    auto fallback_locale = getFallbackLocale();
-    auto fallback_file_path = std::format("{}/{}.i18n", path, getFallbackLocale());
-    if (file::isFile(fallback_file_path)) {
-        return fallback_file_path;
-    } else {
-        TT_LOG_W(TAG, "Fallback translations not found for %s at %s", fallback_locale.c_str(), fallback_file_path.c_str());
-        return "";
-    }
-}
-
-std::shared_ptr<IndexedText> loadIndexedText(const std::string& path) {
-    std::vector<std::string> data;
-    auto file_path = getI18nDataFilePath(path);
-    if (file_path.empty()) {
-        return nullptr;
-    }
-
-    // We lock on folder level, because file is TBD
-    file::withLock<void>(path, [&file_path, &data] {
-        file::readLines(file_path, true, [&data](const char* line) {
-            data.push_back(line);
-        });
-    });
-
-    if (data.empty()) {
-        return nullptr;
-    }
-
-    auto result = std::make_shared<IndexedTextImplementation>(data);
-    return std::reinterpret_pointer_cast<IndexedText>(result);
-}
-
-}
diff --git a/Tactility/Source/i18n/TextResources.cpp b/Tactility/Source/i18n/TextResources.cpp
new file mode 100644
index 00000000..07b94a55
--- /dev/null
+++ b/Tactility/Source/i18n/TextResources.cpp
@@ -0,0 +1,81 @@
+#include "Tactility/i18n/TextResources.h"
+#include "Tactility/file/FileLock.h"
+
+#include <Tactility/file/File.h>
+
+#include <cstring>
+#include <utility>
+#include <Tactility/settings/Language.h>
+
+namespace tt::i18n {
+
+constexpr auto* TAG = "I18n";
+
+static std::string getFallbackLocale() {
+    return "en-US";
+}
+
+static std::string getDesiredLocale() {
+    switch (settings::getLanguage()) {
+        case settings::Language::en_GB:
+            return "en-GB";
+        case settings::Language::en_US:
+            return "en-US";
+        case settings::Language::fr_FR:
+            return "fr-FR";
+        case settings::Language::nl_BE:
+            return "nl-BE";
+        case settings::Language::nl_NL:
+            return "nl-NL";
+        default:
+            return getFallbackLocale();
+    }
+}
+
+static std::string getI18nDataFilePath(const std::string& path) {
+    auto locale = getDesiredLocale();
+    auto desired_file_path = std::format("{}/{}.i18n", path, locale);
+    if (file::isFile(desired_file_path)) {
+        return desired_file_path;
+    } else {
+        TT_LOG_W(TAG, "Translations not found for %s at %s", locale.c_str(), desired_file_path.c_str());
+    }
+
+    auto fallback_locale = getFallbackLocale();
+    auto fallback_file_path = std::format("{}/{}.i18n", path, getFallbackLocale());
+    if (file::isFile(fallback_file_path)) {
+        return fallback_file_path;
+    } else {
+        TT_LOG_W(TAG, "Fallback translations not found for %s at %s", fallback_locale.c_str(), fallback_file_path.c_str());
+        return "";
+    }
+}
+
+std::string TextResources::ERROR_RESULT = "TXT_RES_ERROR";
+
+bool TextResources::load() {
+    std::vector<std::string> new_data;
+
+    // Resolve the language file that we need (depends on system language selection)
+    auto file_path = getI18nDataFilePath(path);
+    if (file_path.empty()) {
+        TT_LOG_E(TAG, "Couldn't find i18n data for %s", path.c_str());
+        return false;
+    }
+
+    file::withLock<void>(file_path, [&file_path, &new_data] {
+        file::readLines(file_path, true, [&new_data](const char* line) {
+            new_data.push_back(line);
+        });
+    });
+
+    if (new_data.empty()) {
+        TT_LOG_E(TAG, "Couldn't find i18n data for %s", path.c_str());
+        return false;
+    }
+
+    data = std::move(new_data);
+    return true;
+}
+
+}
diff --git a/Tactility/Source/lvgl/Statusbar.cpp b/Tactility/Source/lvgl/Statusbar.cpp
index 7e9e39b1..68ca0deb 100644
--- a/Tactility/Source/lvgl/Statusbar.cpp
+++ b/Tactility/Source/lvgl/Statusbar.cpp
@@ -10,7 +10,7 @@
 #include <Tactility/PubSub.h>
 #include <Tactility/TactilityCore.h>
 #include <Tactility/Timer.h>
-#include <Tactility/time/Time.h>
+#include <Tactility/settings/Time.h>
 
 #include <lvgl.h>
 
@@ -199,7 +199,7 @@ lv_obj_t* statusbar_create(lv_obj_t* parent) {
 
 static void update_time(Statusbar* statusbar) {
     if (statusbar_data.time_set) {
-        bool format24 = time::isTimeFormat24Hour();
+        bool format24 = settings::isTimeFormat24Hour();
         int hours = format24 ? statusbar_data.time_hours : statusbar_data.time_hours % 12;
         lv_label_set_text_fmt(statusbar->time, "%d:%02d", hours, statusbar_data.time_minutes);
     } else {
diff --git a/Tactility/Source/settings/Language.cpp b/Tactility/Source/settings/Language.cpp
new file mode 100644
index 00000000..2e4094eb
--- /dev/null
+++ b/Tactility/Source/settings/Language.cpp
@@ -0,0 +1,65 @@
+#include <Tactility/LogEsp.h>
+#include <Tactility/settings/Language.h>
+#include <utility>
+#include <Tactility/settings/SettingsProperties.h>
+
+namespace tt::settings {
+
+constexpr auto* TAG = "Language";
+
+void setLanguage(Language newLanguage) {
+    SettingsProperties properties;
+    if (!loadSettingsProperties(properties)) {
+        return;
+    }
+
+    properties.language = newLanguage;
+    saveSettingsProperties(properties);
+}
+
+Language getLanguage() {
+    SettingsProperties properties;
+    if (!loadSettingsProperties(properties)) {
+        return Language::en_US;
+    } else {
+        return properties.language;
+    }
+}
+
+std::string toString(Language language) {
+    switch (language) {
+        case Language::en_GB:
+            return "en-GB";
+        case Language::en_US:
+            return "en-US";
+        case Language::fr_FR:
+            return "fr-FR";
+        case Language::nl_BE:
+            return "nl-BE";
+        case Language::nl_NL:
+            return "nl-NL";
+        default:
+            TT_LOG_E(TAG, "Missing serialization for language %d", static_cast<int>(language));
+            std::unreachable();
+    }
+}
+
+bool fromString(const std::string& text, Language& language) {
+    if (text == "en-GB") {
+        language = Language::en_GB;
+    } else if (text == "en-US") {
+        language = Language::en_US;
+    } else if (text == "fr-FR") {
+        language = Language::fr_FR;
+    } else if (text == "nl-BE") {
+        language = Language::nl_BE;
+    } else if (text == "nl-NL") {
+        language = Language::nl_NL;
+    } else {
+        return false;
+    }
+
+    return true;
+}
+
+}
diff --git a/Tactility/Source/settings/SettingsProperties.cpp b/Tactility/Source/settings/SettingsProperties.cpp
new file mode 100644
index 00000000..05e56624
--- /dev/null
+++ b/Tactility/Source/settings/SettingsProperties.cpp
@@ -0,0 +1,77 @@
+#include <Tactility/Mutex.h>
+#include <Tactility/file/FileLock.h>
+#include <Tactility/file/PropertiesFile.h>
+#include <Tactility/settings/Language.h>
+#include <Tactility/settings/SettingsProperties.h>
+
+namespace tt::settings {
+
+constexpr auto* TAG = "SettingsProperties";
+constexpr auto* FILE_PATH = "/data/settings.properties";
+
+static Mutex mutex = Mutex();
+static bool cached = false;
+static SettingsProperties cachedProperties;
+
+static bool loadSettingsPropertiesFromFile(SettingsProperties& properties) {
+    std::map<std::string, std::string> map;
+    if (!file::withLock<bool>(FILE_PATH, [&map] {
+        return file::loadPropertiesFile(FILE_PATH, map);
+    })) {
+        TT_LOG_E(TAG, "Failed to load %s", FILE_PATH);
+        return false;
+    }
+
+    auto language_entry = map.find("language");
+    if (language_entry != map.end()) {
+        if (!fromString(language_entry->second, properties.language)) {
+            TT_LOG_W(TAG, "Unknown language \"%s\" in %s", language_entry->second.c_str(), FILE_PATH);
+            properties.language = Language::en_US;
+        }
+    } else {
+        properties.language = Language::en_US;
+    }
+
+    auto time_format_entry = map.find("timeFormat24h");
+    bool time_format_24h = time_format_entry == map.end() ? true : (time_format_entry->second == "true");
+    properties.timeFormat24h = time_format_24h;
+
+    return true;
+}
+
+bool loadSettingsProperties(SettingsProperties& properties) {
+    auto scoped_lock = mutex.asScopedLock();
+    scoped_lock.lock();
+
+    if (!cached) {
+        if (!loadSettingsPropertiesFromFile(cachedProperties)) {
+            return false;
+        }
+        cached = true;
+    }
+
+    properties = cachedProperties;
+    return true;
+}
+
+bool saveSettingsProperties(const SettingsProperties& properties) {
+    auto scoped_lock = mutex.asScopedLock();
+    scoped_lock.lock();
+
+    return file::withLock<bool>(FILE_PATH, [&properties] {
+        std::map<std::string, std::string> map;
+        map["language"] = toString(properties.language);
+        map["timeFormat24h"] = properties.timeFormat24h ? "true" : "false";
+
+        if (!file::savePropertiesFile(FILE_PATH, map)) {
+            TT_LOG_E(TAG, "Failed to save %s", FILE_PATH);
+            return false;
+        }
+
+        cachedProperties = properties;
+        cached = true;
+        return true;
+    });
+}
+
+}
\ No newline at end of file
diff --git a/Tactility/Source/time/Time.cpp b/Tactility/Source/settings/Time.cpp
similarity index 75%
rename from Tactility/Source/time/Time.cpp
rename to Tactility/Source/settings/Time.cpp
index 99d97f12..50cd855a 100644
--- a/Tactility/Source/time/Time.cpp
+++ b/Tactility/Source/settings/Time.cpp
@@ -1,12 +1,14 @@
-#include "Tactility/time/Time.h"
+#include "Tactility/settings/Time.h"
 #include "Tactility/kernel/SystemEvents.h"
 
+#include <Tactility/settings/SettingsProperties.h>
+
 #ifdef ESP_PLATFORM
 #include <ctime>
 #include "Tactility/Preferences.h"
 #endif
 
-namespace tt::time {
+namespace tt::settings {
 
 #ifdef ESP_PLATFORM
 
@@ -16,7 +18,7 @@ namespace tt::time {
 #define TIMEZONE_PREFERENCES_KEY_CODE "tz_code"
 #define TIMEZONE_PREFERENCES_KEY_TIME24 "tz_time24"
 
-void init() {
+void initTimeZone() {
     auto code= getTimeZoneCode();
     if (!code.empty()) {
         setenv("TZ", code.c_str(), 1);
@@ -55,19 +57,6 @@ std::string getTimeZoneCode() {
     }
 }
 
-bool isTimeFormat24Hour() {
-    Preferences preferences(TIME_SETTINGS_NAMESPACE);
-    bool show24Hour = true;
-    preferences.optBool(TIMEZONE_PREFERENCES_KEY_TIME24, show24Hour);
-    return show24Hour;
-}
-
-void setTimeFormat24Hour(bool show24Hour) {
-    Preferences preferences(TIME_SETTINGS_NAMESPACE);
-    preferences.putBool(TIMEZONE_PREFERENCES_KEY_TIME24, show24Hour);
-    kernel::publishSystemEvent(kernel::SystemEvent::Time);
-}
-
 #else
 
 static std::string timeZoneName;
@@ -90,15 +79,25 @@ std::string getTimeZoneCode() {
     return timeZoneCode;
 }
 
-bool isTimeFormat24Hour() {
-    return show24Hour;
-}
-
-void setTimeFormat24Hour(bool enabled) {
-    show24Hour = enabled;
-    kernel::publishSystemEvent(kernel::SystemEvent::Time);
-}
-
 #endif
 
+bool isTimeFormat24Hour() {
+    SettingsProperties properties;
+    if (!loadSettingsProperties(properties)) {
+        return true;
+    } else {
+        return properties.timeFormat24h;
+    }
+}
+
+void setTimeFormat24Hour(bool show24Hour) {
+    SettingsProperties properties;
+    if (!loadSettingsProperties(properties)) {
+        return;
+    }
+
+    properties.timeFormat24h = show24Hour;
+    saveSettingsProperties(properties);
+}
+
 }
diff --git a/TactilityC/Source/tt_time.cpp b/TactilityC/Source/tt_time.cpp
index 9a255e8f..ee97242b 100644
--- a/TactilityC/Source/tt_time.cpp
+++ b/TactilityC/Source/tt_time.cpp
@@ -1,6 +1,6 @@
 #include "tt_time.h"
 
-#include <Tactility/time/Time.h>
+#include <Tactility/settings/Time.h>
 #include <cstring>
 
 using namespace tt;
@@ -8,11 +8,11 @@ using namespace tt;
 extern "C" {
 
 void tt_timezone_set(const char* name, const char* code) {
-    time::setTimeZone(name, code);
+    settings::setTimeZone(name, code);
 }
 
 bool tt_timezone_get_name(char* buffer, size_t bufferSize) {
-    auto name = time::getTimeZoneName();
+    auto name = settings::getTimeZoneName();
     if (bufferSize < (name.length() + 1)) {
         return false;
     } else {
@@ -22,7 +22,7 @@ bool tt_timezone_get_name(char* buffer, size_t bufferSize) {
 }
 
 bool tt_timezone_get_code(char* buffer, size_t bufferSize) {
-    auto code = time::getTimeZoneCode();
+    auto code = settings::getTimeZoneCode();
     if (bufferSize < (code.length() + 1)) {
         return false;
     } else {
@@ -32,11 +32,11 @@ bool tt_timezone_get_code(char* buffer, size_t bufferSize) {
 }
 
 bool tt_timezone_is_format_24_hour() {
-    return time::isTimeFormat24Hour();
+    return settings::isTimeFormat24Hour();
 }
 
 void tt_timezone_set_format_24_hour(bool show24Hour) {
-    return time::setTimeFormat24Hour(show24Hour);
+    return settings::setTimeFormat24Hour(show24Hour);
 }
 
 }
diff --git a/Translations/Translations.ods b/Translations/Translations.ods
index 4728ca6d..3ce333cd 100644
Binary files a/Translations/Translations.ods and b/Translations/Translations.ods differ
diff --git a/Translations/generate-all.py b/Translations/generate-all.py
index 6963ff29..477cc00e 100644
--- a/Translations/generate-all.py
+++ b/Translations/generate-all.py
@@ -16,15 +16,22 @@ def generate(csv_file, header_file, header_namespace, data_path):
 if __name__ == "__main__":
     # Core translations
     generate(
-        "system.csv",
+        "Core.csv",
         "Tactility/Include/Tactility/i18n/CoreTextResources.h",
         "tt::i18n::core",
         "Data/system/i18n/core"
     )
     # Launcher app
     generate(
-        "launcher.csv",
+        "Launcher.csv",
         "Tactility/Private/Tactility/app/launcher/TextResources.h",
         "tt::app::launcher::i18n",
         "Data/system/app/Launcher/i18n"
     )
+    # LocaleSettings app
+    generate(
+        "LocaleSettings.csv",
+        "Tactility/Private/Tactility/app/localesettings/TextResources.h",
+        "tt::app::localesettings::i18n",
+        "Data/system/app/LocaleSettings/i18n"
+    )
diff --git a/Translations/generate.py b/Translations/generate.py
index 7b0fe210..175bbbb0 100644
--- a/Translations/generate.py
+++ b/Translations/generate.py
@@ -52,6 +52,7 @@ def close_i18n_files(files):
 def generate_header(filepath, namespace, rows):
     file = open(filepath, "w")
     file.write("#pragma once\n\n")
+    file.write("#include \"Tactility/i18n/TextResources.h\"\n\n")
     file.write("// WARNING: This file is auto-generated. Do not edit manually.\n\n")
     file.write(f"namespace {namespace}")
     file.write(" {\n\n")
diff --git a/sdkconfig.board.cyd-2432s024c b/sdkconfig.board.cyd-2432s024c
index ae8656dc..9323e8c0 100644
--- a/sdkconfig.board.cyd-2432s024c
+++ b/sdkconfig.board.cyd-2432s024c
@@ -27,6 +27,10 @@ CONFIG_PARTITION_TABLE_FILENAME="partitions.csv"
 CONFIG_FATFS_LFN_HEAP=y
 CONFIG_FATFS_VOLUME_COUNT=3
 CONFIG_FATFS_SECTOR_512=y
+CONFIG_WL_SECTOR_SIZE_512=y
+CONFIG_WL_SECTOR_SIZE=512
+CONFIG_WL_SECTOR_MODE_SAFE=y
+CONFIG_WL_SECTOR_MODE=1
 
 # Hardware: Main
 CONFIG_TT_BOARD_CYD_2432S024C=y
diff --git a/sdkconfig.board.cyd-2432s032c b/sdkconfig.board.cyd-2432s032c
index 1a166fd4..2a32068c 100644
--- a/sdkconfig.board.cyd-2432s032c
+++ b/sdkconfig.board.cyd-2432s032c
@@ -27,6 +27,10 @@ CONFIG_PARTITION_TABLE_FILENAME="partitions.csv"
 CONFIG_FATFS_LFN_HEAP=y
 CONFIG_FATFS_VOLUME_COUNT=3
 CONFIG_FATFS_SECTOR_512=y
+CONFIG_WL_SECTOR_SIZE_512=y
+CONFIG_WL_SECTOR_SIZE=512
+CONFIG_WL_SECTOR_MODE_SAFE=y
+CONFIG_WL_SECTOR_MODE=1
 
 # Hardware: Main
 CONFIG_TT_BOARD_CYD_2432S032C=y
diff --git a/sdkconfig.board.cyd-4848s040c b/sdkconfig.board.cyd-4848s040c
index e2dc39fa..85d0a54a 100644
--- a/sdkconfig.board.cyd-4848s040c
+++ b/sdkconfig.board.cyd-4848s040c
@@ -27,6 +27,10 @@ CONFIG_PARTITION_TABLE_FILENAME="partitions.csv"
 CONFIG_FATFS_LFN_HEAP=y
 CONFIG_FATFS_VOLUME_COUNT=3
 CONFIG_FATFS_SECTOR_512=y
+CONFIG_WL_SECTOR_SIZE_512=y
+CONFIG_WL_SECTOR_SIZE=512
+CONFIG_WL_SECTOR_MODE_SAFE=y
+CONFIG_WL_SECTOR_MODE=1
 
 # Hardware: Main
 CONFIG_COMPILER_OPTIMIZATION_PERF=y
diff --git a/sdkconfig.board.cyd-8048s043c b/sdkconfig.board.cyd-8048s043c
index 21a29dff..be9659c4 100644
--- a/sdkconfig.board.cyd-8048s043c
+++ b/sdkconfig.board.cyd-8048s043c
@@ -27,6 +27,10 @@ CONFIG_PARTITION_TABLE_FILENAME="partitions.csv"
 CONFIG_FATFS_LFN_HEAP=y
 CONFIG_FATFS_VOLUME_COUNT=3
 CONFIG_FATFS_SECTOR_512=y
+CONFIG_WL_SECTOR_SIZE_512=y
+CONFIG_WL_SECTOR_SIZE=512
+CONFIG_WL_SECTOR_MODE_SAFE=y
+CONFIG_WL_SECTOR_MODE=1
 
 # Hardware: Main
 CONFIG_COMPILER_OPTIMIZATION_PERF=y
diff --git a/sdkconfig.board.cyd-jc2432w328c b/sdkconfig.board.cyd-jc2432w328c
index 73745e78..45ba3c90 100644
--- a/sdkconfig.board.cyd-jc2432w328c
+++ b/sdkconfig.board.cyd-jc2432w328c
@@ -27,6 +27,10 @@ CONFIG_PARTITION_TABLE_FILENAME="partitions.csv"
 CONFIG_FATFS_LFN_HEAP=y
 CONFIG_FATFS_VOLUME_COUNT=3
 CONFIG_FATFS_SECTOR_512=y
+CONFIG_WL_SECTOR_SIZE_512=y
+CONFIG_WL_SECTOR_SIZE=512
+CONFIG_WL_SECTOR_MODE_SAFE=y
+CONFIG_WL_SECTOR_MODE=1
 
 # Hardware: Main
 CONFIG_TT_BOARD_CYD_JC2432W328C=y
diff --git a/sdkconfig.board.cyd-jc8048w550c b/sdkconfig.board.cyd-jc8048w550c
index e95877ce..fcb52cd5 100644
--- a/sdkconfig.board.cyd-jc8048w550c
+++ b/sdkconfig.board.cyd-jc8048w550c
@@ -27,6 +27,10 @@ CONFIG_PARTITION_TABLE_FILENAME="partitions.csv"
 CONFIG_FATFS_LFN_HEAP=y
 CONFIG_FATFS_VOLUME_COUNT=3
 CONFIG_FATFS_SECTOR_512=y
+CONFIG_WL_SECTOR_SIZE_512=y
+CONFIG_WL_SECTOR_SIZE=512
+CONFIG_WL_SECTOR_MODE_SAFE=y
+CONFIG_WL_SECTOR_MODE=1
 
 # Hardware: Main
 CONFIG_COMPILER_OPTIMIZATION_PERF=y
diff --git a/sdkconfig.board.elecrow-crowpanel-advance-28 b/sdkconfig.board.elecrow-crowpanel-advance-28
index 88f60ad7..a8a2eea1 100644
--- a/sdkconfig.board.elecrow-crowpanel-advance-28
+++ b/sdkconfig.board.elecrow-crowpanel-advance-28
@@ -27,6 +27,10 @@ CONFIG_PARTITION_TABLE_FILENAME="partitions.csv"
 CONFIG_FATFS_LFN_HEAP=y
 CONFIG_FATFS_VOLUME_COUNT=3
 CONFIG_FATFS_SECTOR_512=y
+CONFIG_WL_SECTOR_SIZE_512=y
+CONFIG_WL_SECTOR_SIZE=512
+CONFIG_WL_SECTOR_MODE_SAFE=y
+CONFIG_WL_SECTOR_MODE=1
 
 # Hardware: Main
 CONFIG_TT_BOARD_ELECROW_CROWPANEL_ADVANCE_28=y
diff --git a/sdkconfig.board.elecrow-crowpanel-advance-35 b/sdkconfig.board.elecrow-crowpanel-advance-35
index 601ee603..ee6d6403 100644
--- a/sdkconfig.board.elecrow-crowpanel-advance-35
+++ b/sdkconfig.board.elecrow-crowpanel-advance-35
@@ -27,6 +27,10 @@ CONFIG_PARTITION_TABLE_FILENAME="partitions.csv"
 CONFIG_FATFS_LFN_HEAP=y
 CONFIG_FATFS_VOLUME_COUNT=3
 CONFIG_FATFS_SECTOR_512=y
+CONFIG_WL_SECTOR_SIZE_512=y
+CONFIG_WL_SECTOR_SIZE=512
+CONFIG_WL_SECTOR_MODE_SAFE=y
+CONFIG_WL_SECTOR_MODE=1
 
 # Hardware: Main
 CONFIG_TT_BOARD_ELECROW_CROWPANEL_ADVANCE_35=y
diff --git a/sdkconfig.board.elecrow-crowpanel-advance-50 b/sdkconfig.board.elecrow-crowpanel-advance-50
index e15e74c6..73c1d1a8 100644
--- a/sdkconfig.board.elecrow-crowpanel-advance-50
+++ b/sdkconfig.board.elecrow-crowpanel-advance-50
@@ -27,6 +27,10 @@ CONFIG_PARTITION_TABLE_FILENAME="partitions.csv"
 CONFIG_FATFS_LFN_HEAP=y
 CONFIG_FATFS_VOLUME_COUNT=3
 CONFIG_FATFS_SECTOR_512=y
+CONFIG_WL_SECTOR_SIZE_512=y
+CONFIG_WL_SECTOR_SIZE=512
+CONFIG_WL_SECTOR_MODE_SAFE=y
+CONFIG_WL_SECTOR_MODE=1
 
 # Hardware: Main
 CONFIG_TT_BOARD_ELECROW_CROWPANEL_ADVANCE_50=y
diff --git a/sdkconfig.board.elecrow-crowpanel-basic-28 b/sdkconfig.board.elecrow-crowpanel-basic-28
index 769c338b..b9e5395e 100644
--- a/sdkconfig.board.elecrow-crowpanel-basic-28
+++ b/sdkconfig.board.elecrow-crowpanel-basic-28
@@ -27,6 +27,10 @@ CONFIG_PARTITION_TABLE_FILENAME="partitions.csv"
 CONFIG_FATFS_LFN_HEAP=y
 CONFIG_FATFS_VOLUME_COUNT=3
 CONFIG_FATFS_SECTOR_512=y
+CONFIG_WL_SECTOR_SIZE_512=y
+CONFIG_WL_SECTOR_SIZE=512
+CONFIG_WL_SECTOR_MODE_SAFE=y
+CONFIG_WL_SECTOR_MODE=1
 
 # Hardware: Main
 CONFIG_TT_BOARD_ELECROW_CROWPANEL_BASIC_28=y
diff --git a/sdkconfig.board.elecrow-crowpanel-basic-35 b/sdkconfig.board.elecrow-crowpanel-basic-35
index c21d6776..3907565d 100644
--- a/sdkconfig.board.elecrow-crowpanel-basic-35
+++ b/sdkconfig.board.elecrow-crowpanel-basic-35
@@ -27,6 +27,10 @@ CONFIG_PARTITION_TABLE_FILENAME="partitions.csv"
 CONFIG_FATFS_LFN_HEAP=y
 CONFIG_FATFS_VOLUME_COUNT=3
 CONFIG_FATFS_SECTOR_512=y
+CONFIG_WL_SECTOR_SIZE_512=y
+CONFIG_WL_SECTOR_SIZE=512
+CONFIG_WL_SECTOR_MODE_SAFE=y
+CONFIG_WL_SECTOR_MODE=1
 
 # Hardware: Main
 CONFIG_TT_BOARD_ELECROW_CROWPANEL_BASIC_35=y
diff --git a/sdkconfig.board.elecrow-crowpanel-basic-50 b/sdkconfig.board.elecrow-crowpanel-basic-50
index 675f0536..8ea89fcd 100644
--- a/sdkconfig.board.elecrow-crowpanel-basic-50
+++ b/sdkconfig.board.elecrow-crowpanel-basic-50
@@ -27,6 +27,10 @@ CONFIG_PARTITION_TABLE_FILENAME="partitions.csv"
 CONFIG_FATFS_LFN_HEAP=y
 CONFIG_FATFS_VOLUME_COUNT=3
 CONFIG_FATFS_SECTOR_512=y
+CONFIG_WL_SECTOR_SIZE_512=y
+CONFIG_WL_SECTOR_SIZE=512
+CONFIG_WL_SECTOR_MODE_SAFE=y
+CONFIG_WL_SECTOR_MODE=1
 
 # Hardware: Main
 CONFIG_TT_BOARD_ELECROW_CROWPANEL_BASIC_50=y
diff --git a/sdkconfig.board.lilygo-tdeck b/sdkconfig.board.lilygo-tdeck
index 2844b749..aa73175e 100644
--- a/sdkconfig.board.lilygo-tdeck
+++ b/sdkconfig.board.lilygo-tdeck
@@ -27,6 +27,10 @@ CONFIG_PARTITION_TABLE_FILENAME="partitions.csv"
 CONFIG_FATFS_LFN_HEAP=y
 CONFIG_FATFS_VOLUME_COUNT=3
 CONFIG_FATFS_SECTOR_512=y
+CONFIG_WL_SECTOR_SIZE_512=y
+CONFIG_WL_SECTOR_SIZE=512
+CONFIG_WL_SECTOR_MODE_SAFE=y
+CONFIG_WL_SECTOR_MODE=1
 
 # Hardware: Main
 CONFIG_TT_BOARD_LILYGO_TDECK=y
diff --git a/sdkconfig.board.lilygo-tlora-pager b/sdkconfig.board.lilygo-tlora-pager
index cd0c9383..f68156ed 100644
--- a/sdkconfig.board.lilygo-tlora-pager
+++ b/sdkconfig.board.lilygo-tlora-pager
@@ -27,6 +27,10 @@ CONFIG_PARTITION_TABLE_FILENAME="partitions.csv"
 CONFIG_FATFS_LFN_HEAP=y
 CONFIG_FATFS_VOLUME_COUNT=3
 CONFIG_FATFS_SECTOR_512=y
+CONFIG_WL_SECTOR_SIZE_512=y
+CONFIG_WL_SECTOR_SIZE=512
+CONFIG_WL_SECTOR_MODE_SAFE=y
+CONFIG_WL_SECTOR_MODE=1
 
 # Hardware: Main
 CONFIG_TT_BOARD_LILYGO_TLORA_PAGER=y
diff --git a/sdkconfig.board.m5stack-core2 b/sdkconfig.board.m5stack-core2
index 4f437bbe..3ad7fb7f 100644
--- a/sdkconfig.board.m5stack-core2
+++ b/sdkconfig.board.m5stack-core2
@@ -27,6 +27,10 @@ CONFIG_PARTITION_TABLE_FILENAME="partitions.csv"
 CONFIG_FATFS_LFN_HEAP=y
 CONFIG_FATFS_VOLUME_COUNT=3
 CONFIG_FATFS_SECTOR_512=y
+CONFIG_WL_SECTOR_SIZE_512=y
+CONFIG_WL_SECTOR_SIZE=512
+CONFIG_WL_SECTOR_MODE_SAFE=y
+CONFIG_WL_SECTOR_MODE=1
 
 # Hardware: Main
 CONFIG_TT_BOARD_M5STACK_CORE2=y
diff --git a/sdkconfig.board.m5stack-cores3 b/sdkconfig.board.m5stack-cores3
index 9df2514e..27b2e87e 100644
--- a/sdkconfig.board.m5stack-cores3
+++ b/sdkconfig.board.m5stack-cores3
@@ -27,6 +27,10 @@ CONFIG_PARTITION_TABLE_FILENAME="partitions.csv"
 CONFIG_FATFS_LFN_HEAP=y
 CONFIG_FATFS_VOLUME_COUNT=3
 CONFIG_FATFS_SECTOR_512=y
+CONFIG_WL_SECTOR_SIZE_512=y
+CONFIG_WL_SECTOR_SIZE=512
+CONFIG_WL_SECTOR_MODE_SAFE=y
+CONFIG_WL_SECTOR_MODE=1
 
 # Hardware: Main
 CONFIG_TT_BOARD_M5STACK_CORES3=y
diff --git a/sdkconfig.board.unphone b/sdkconfig.board.unphone
index f89e98f5..82359473 100644
--- a/sdkconfig.board.unphone
+++ b/sdkconfig.board.unphone
@@ -27,6 +27,10 @@ CONFIG_PARTITION_TABLE_FILENAME="partitions.csv"
 CONFIG_FATFS_LFN_HEAP=y
 CONFIG_FATFS_VOLUME_COUNT=3
 CONFIG_FATFS_SECTOR_512=y
+CONFIG_WL_SECTOR_SIZE_512=y
+CONFIG_WL_SECTOR_SIZE=512
+CONFIG_WL_SECTOR_MODE_SAFE=y
+CONFIG_WL_SECTOR_MODE=1
 
 # Hardware: Main
 CONFIG_TT_BOARD_UNPHONE=y
diff --git a/sdkconfig.board.waveshare-s3-touch-43 b/sdkconfig.board.waveshare-s3-touch-43
index 4c77dcc9..c89e2b2c 100644
--- a/sdkconfig.board.waveshare-s3-touch-43
+++ b/sdkconfig.board.waveshare-s3-touch-43
@@ -27,6 +27,10 @@ CONFIG_PARTITION_TABLE_FILENAME="partitions.csv"
 CONFIG_FATFS_LFN_HEAP=y
 CONFIG_FATFS_VOLUME_COUNT=3
 CONFIG_FATFS_SECTOR_512=y
+CONFIG_WL_SECTOR_SIZE_512=y
+CONFIG_WL_SECTOR_SIZE=512
+CONFIG_WL_SECTOR_MODE_SAFE=y
+CONFIG_WL_SECTOR_MODE=1
 
 # Hardware: Main
 CONFIG_TT_BOARD_WAVESHARE_S3_TOUCH_43=y
diff --git a/sdkconfig.defaults b/sdkconfig.defaults
index e6e1e35e..97d27e96 100644
--- a/sdkconfig.defaults
+++ b/sdkconfig.defaults
@@ -27,6 +27,10 @@ CONFIG_PARTITION_TABLE_FILENAME="partitions.csv"
 CONFIG_FATFS_LFN_HEAP=y
 CONFIG_FATFS_VOLUME_COUNT=3
 CONFIG_FATFS_SECTOR_512=y
+CONFIG_WL_SECTOR_SIZE_512=y
+CONFIG_WL_SECTOR_SIZE=512
+CONFIG_WL_SECTOR_MODE_SAFE=y
+CONFIG_WL_SECTOR_MODE=1
 
 # Hardware defaults
 CONFIG_TT_BOARD_CUSTOM=y