From 14918dc4f968a6339aff07ff78ca2a56ccc2037a Mon Sep 17 00:00:00 2001
From: jimmorrisson <pyszczakjakub@gmail.com>
Date: Wed, 16 Dec 2020 15:23:11 +0100
Subject: [PATCH] [EGD-4925] Change new filesystem handling implementation in
 module-gui. (#1193)

Due to vfs deprecation there is need to remove all vfs calls from code. This PR covers module gui. There are some modifications in other modules included which are necessary because of build system issues.
---
 .../widgets/AlarmOptionsItem.cpp              |  5 +-
 .../windows/AlgoParamsWindow.cpp              |  2 +-
 .../windows/AntennaMainWindow.cpp             |  2 +-
 .../windows/ScanModesWindow.cpp               |  2 +-
 .../ApplicationCalculator.cpp                 |  2 +-
 .../data/CalculatorUtility.cpp                |  2 +-
 .../tests/CalculatorUtility_tests.cpp         |  3 +-
 .../windows/CalculatorMainWindow.cpp          |  2 +-
 .../application-call/widgets/StateIcon.hpp    |  2 +-
 .../application-call/windows/CallWindow.cpp   |  2 +-
 .../windows/EmergencyCallWindow.cpp           |  2 +-
 .../windows/EnterNumberWindow.cpp             |  2 +-
 .../ApplicationCallLog.cpp                    |  2 +-
 .../windows/CallLogDetailsWindow.cpp          |  2 +-
 .../windows/CallLogMainWindow.cpp             |  2 +-
 .../windows/CallLogOptionsWindow.cpp          |  2 +-
 .../windows/DesktopMainWindow.cpp             |  2 +-
 .../windows/LockedInfoWindow.cpp              |  2 +-
 .../windows/MenuWindow.cpp                    |  2 +-
 .../windows/PinLockBaseWindow.cpp             |  2 +-
 .../windows/PowerOffWindow.cpp                |  2 +-
 .../windows/PukLockBox.cpp                    |  2 +-
 .../application-desktop/windows/Reboot.cpp    |  2 +-
 .../windows/ScreenLockBox.cpp                 |  2 +-
 .../widgets/IntervalBox.cpp                   |  2 +-
 .../widgets/MeditationListItems.cpp           |  2 +-
 .../widgets/TimerProperty.cpp                 |  2 +-
 .../windows/MeditationListViewWindows.cpp     |  2 +-
 .../windows/MeditationTimerWindow.cpp         |  2 +-
 .../windows/MeditationWindow.cpp              |  2 +-
 .../ApplicationMessages.cpp                   |  2 +-
 .../widgets/SMSInputWidget.cpp                |  2 +-
 .../windows/MessagesMainWindow.cpp            |  2 +-
 .../windows/NewMessage.cpp                    |  2 +-
 .../windows/OptionsMessages.cpp               |  2 +-
 .../windows/SMSTemplatesWindow.cpp            |  2 +-
 .../windows/SearchResults.cpp                 |  2 +-
 .../windows/SearchStart.cpp                   |  2 +-
 .../windows/ThreadWindowOptions.cpp           |  2 +-
 .../ApplicationMusicPlayer.cpp                |  3 +-
 .../windows/MusicPlayerAllSongsWindow.cpp     |  2 +-
 .../windows/MusicPlayerEmptyWindow.cpp        |  2 +-
 .../windows/NoteEditWindow.cpp                |  2 +-
 .../windows/NoteMainWindow.cpp                |  2 +-
 .../windows/NotePreviewWindow.cpp             |  2 +-
 .../windows/NotesOptions.cpp                  |  2 +-
 .../windows/SearchEngineWindow.cpp            |  2 +-
 .../widgets/ContactFlagsWidget.cpp            |  2 +-
 .../widgets/InformationWidget.cpp             |  2 +-
 .../InputBoxWithLabelAndIconWidget.cpp        |  2 +-
 .../widgets/InputLinesWithLabelIWidget.cpp    |  2 +-
 .../OutputLinesTextWithLabelWidget.cpp        |  2 +-
 .../ApplicationSettings.cpp                   |  2 +-
 .../widgets/timeWidget.cpp                    |  2 +-
 .../widgets/timeWidget.hpp                    |  1 +
 .../windows/AddDeviceWindow.cpp               |  2 +-
 .../windows/AllDevicesWindow.cpp              |  2 +-
 .../windows/AppsAndToolsWindow.cpp            |  2 +-
 .../windows/AutolockWindow.cpp                |  2 +-
 .../windows/BaseSettingsWindow.cpp            |  2 +-
 .../windows/BluetoothWindow.cpp               |  2 +-
 .../windows/DisplayAndKeypadWindow.cpp        |  2 +-
 .../windows/DisplayLightWindow.cpp            |  2 +-
 .../windows/FontSizeWindow.cpp                |  2 +-
 .../windows/InputLanguageWindow.cpp           |  2 +-
 .../windows/KeypadLightWindow.cpp             |  2 +-
 .../windows/LockedScreenWindow.cpp            |  2 +-
 .../windows/MessagesWindow.cpp                |  2 +-
 .../windows/NetworkWindow.cpp                 |  2 +-
 .../windows/QuotesAddWindow.cpp               |  2 +-
 .../windows/QuotesMainWindow.cpp              |  2 +-
 .../windows/SettingsMainWindow.cpp            |  2 +-
 .../windows/TorchWindow.cpp                   |  2 +-
 .../windows/WallpaperWindow.cpp               |  2 +-
 .../ApplicationSettings.cpp                   |  2 +-
 .../windows/BtScanWindow.cpp                  |  2 +-
 .../application-settings/windows/BtWindow.cpp |  2 +-
 .../windows/CellularPassthroughWindow.cpp     |  2 +-
 .../windows/DateTimeWindow.cpp                |  2 +-
 .../windows/EinkModeWindow.cpp                |  2 +-
 .../windows/FotaWindow.cpp                    |  2 +-
 .../application-settings/windows/Info.cpp     |  3 +-
 .../windows/LanguageWindow.cpp                |  2 +-
 .../windows/SettingsChange.cpp                |  2 +-
 .../windows/SettingsMainWindow.cpp            |  2 +-
 .../windows/SimSelectWindow.cpp               |  2 +-
 .../windows/TestMessageWindow.cpp             |  2 +-
 .../windows/UITestWindow.cpp                  |  2 +-
 .../windows/SpecialInputMainWindow.cpp        |  2 +-
 module-apps/widgets/BrightnessBox.cpp         |  2 +-
 module-apps/widgets/ButtonOnOff.cpp           |  2 +-
 module-apps/widgets/ModesBox.cpp              |  2 +-
 module-apps/windows/AppWindow.cpp             |  2 +-
 module-apps/windows/Dialog.cpp                |  2 +-
 module-apps/windows/OptionWindow.cpp          |  2 +-
 module-apps/windows/Options.cpp               |  2 +-
 module-apps/windows/VolumeWindow.cpp          |  2 +-
 module-db/Database/sqlite3vfs.cpp             |  1 +
 module-db/Interface/ContactRecord.hpp         |  3 +-
 module-db/Interface/SettingsRecord.hpp        |  2 +-
 module-db/Tables/SettingsTable.hpp            |  2 +-
 module-db/tests/ContactsRecord_tests.cpp      |  2 +-
 module-gui/CMakeLists.txt                     |  3 +-
 module-gui/gui/core/FontManager.cpp           | 24 ++++---
 module-gui/gui/core/ImageManager.cpp          | 32 ++++-----
 module-gui/gui/input/Profile.cpp              | 39 ++++++-----
 module-gui/gui/input/Profile.hpp              | 27 +++-----
 module-gui/gui/input/Translator.cpp           | 59 +++++++++++++++-
 module-gui/gui/input/Translator.hpp           | 67 ++-----------------
 module-gui/gui/widgets/Icon.cpp               |  2 +-
 module-gui/gui/widgets/InputMode.cpp          |  3 +-
 module-gui/gui/widgets/Text.cpp               |  7 +-
 .../test/test-catch-text/CMakeLists.txt       |  1 -
 module-gui/test/test-catch-text/main.cpp      |  2 +-
 .../test/test-catch-text/test-gui-Text.cpp    |  2 +-
 module-gui/test/test-google/CMakeLists.txt    |  3 +-
 .../model/ApplicationManager.cpp              |  2 +-
 .../service-appmgr/Controller.hpp             |  2 +-
 .../messages/LanguageChangeRequest.hpp        |  2 +-
 .../test/test-service-db-settings-api.cpp     |  1 +
 .../endpoints/factoryReset/FactoryReset.cpp   | 21 ++++--
 module-services/service-gui/ServiceGUI.cpp    |  5 +-
 module-services/service-gui/ServiceGUI.hpp    |  2 -
 module-utils/Utils.cpp                        | 41 +++++++++++-
 module-utils/Utils.hpp                        |  8 +--
 module-utils/i18n/i18n.cpp                    | 26 +++----
 module-utils/i18n/i18n.hpp                    | 16 +----
 module-utils/test/test_time_conversion.cpp    |  2 +
 module-utils/test/unittest_duration.cpp       |  1 +
 module-utils/test/unittest_utils.cpp          |  1 +
 module-utils/time/time_conversion.cpp         |  2 +-
 module-utils/time/time_locale.hpp             |  2 +-
 132 files changed, 330 insertions(+), 284 deletions(-)

diff --git a/module-apps/application-alarm-clock/widgets/AlarmOptionsItem.cpp b/module-apps/application-alarm-clock/widgets/AlarmOptionsItem.cpp
index d0e03cb30..8504f8498 100644
--- a/module-apps/application-alarm-clock/widgets/AlarmOptionsItem.cpp
+++ b/module-apps/application-alarm-clock/widgets/AlarmOptionsItem.cpp
@@ -7,6 +7,7 @@
 #include <Style.hpp>
 #include <Utils.hpp>
 #include <module-services/service-audio/service-audio/AudioServiceAPI.hpp>
+#include <purefs/filesystem_paths.hpp>
 
 namespace gui
 {
@@ -240,9 +241,9 @@ namespace gui
 
     std::vector<audio::Tags> AlarmOptionsItem::getMusicFilesList()
     {
-        const char *musicFolder = USER_PATH("music");
+        const auto musicFolder = (purefs::dir::getUserDiskPath() / "music").string();
         std::vector<audio::Tags> musicFiles;
-        LOG_INFO("Scanning music folder: %s", musicFolder);
+        LOG_INFO("Scanning music folder: %s", musicFolder.c_str());
         for (const auto &ent : std::filesystem::directory_iterator(musicFolder)) {
             if (!ent.is_directory()) {
                 const auto filePath = std::string(musicFolder) + "/" + ent.path().filename().c_str();
diff --git a/module-apps/application-antenna/windows/AlgoParamsWindow.cpp b/module-apps/application-antenna/windows/AlgoParamsWindow.cpp
index 550b1b95d..c378e2b35 100644
--- a/module-apps/application-antenna/windows/AlgoParamsWindow.cpp
+++ b/module-apps/application-antenna/windows/AlgoParamsWindow.cpp
@@ -7,7 +7,7 @@
 #include "gui/widgets/Label.hpp"
 #include "gui/widgets/Window.hpp"
 
-#include "module-utils/i18n/i18n.hpp"
+#include <i18n/i18n.hpp>
 #include <Style.hpp>
 #include "gui/widgets/BoxLayout.hpp"
 #include "../AntennaAppStyle.hpp"
diff --git a/module-apps/application-antenna/windows/AntennaMainWindow.cpp b/module-apps/application-antenna/windows/AntennaMainWindow.cpp
index 6d32dcbf1..e41552155 100644
--- a/module-apps/application-antenna/windows/AntennaMainWindow.cpp
+++ b/module-apps/application-antenna/windows/AntennaMainWindow.cpp
@@ -13,7 +13,7 @@
 #include "gui/widgets/Label.hpp"
 #include "gui/widgets/Window.hpp"
 
-#include "module-utils/i18n/i18n.hpp"
+#include <i18n/i18n.hpp>
 #include <Style.hpp>
 
 #include "../AntennaAppStyle.hpp"
diff --git a/module-apps/application-antenna/windows/ScanModesWindow.cpp b/module-apps/application-antenna/windows/ScanModesWindow.cpp
index 22c0afe3c..1049be94b 100644
--- a/module-apps/application-antenna/windows/ScanModesWindow.cpp
+++ b/module-apps/application-antenna/windows/ScanModesWindow.cpp
@@ -7,7 +7,7 @@
 #include "gui/widgets/Label.hpp"
 #include "gui/widgets/Window.hpp"
 
-#include "module-utils/i18n/i18n.hpp"
+#include <i18n/i18n.hpp>
 #include <Style.hpp>
 
 #include "../AntennaAppStyle.hpp"
diff --git a/module-apps/application-calculator/ApplicationCalculator.cpp b/module-apps/application-calculator/ApplicationCalculator.cpp
index 3d7713b70..eab5a2457 100644
--- a/module-apps/application-calculator/ApplicationCalculator.cpp
+++ b/module-apps/application-calculator/ApplicationCalculator.cpp
@@ -3,7 +3,7 @@
 
 #include "ApplicationCalculator.hpp"
 #include "windows/CalculatorMainWindow.hpp"
-#include <module-utils/i18n/i18n.hpp>
+#include <i18n/i18n.hpp>
 
 namespace app
 {
diff --git a/module-apps/application-calculator/data/CalculatorUtility.cpp b/module-apps/application-calculator/data/CalculatorUtility.cpp
index aae21e749..332cadc35 100644
--- a/module-apps/application-calculator/data/CalculatorUtility.cpp
+++ b/module-apps/application-calculator/data/CalculatorUtility.cpp
@@ -4,7 +4,7 @@
 #include "CalculatorUtility.hpp"
 #include "application-calculator/widgets/CalculatorStyle.hpp"
 #include <module-utils/tinyexpr/tinyexpr.h>
-#include <module-utils/i18n/i18n.hpp>
+#include <i18n/i18n.hpp>
 #include <Utils.hpp>
 #include <cmath>
 
diff --git a/module-apps/application-calculator/tests/CalculatorUtility_tests.cpp b/module-apps/application-calculator/tests/CalculatorUtility_tests.cpp
index 486672899..0ff3e1f1c 100644
--- a/module-apps/application-calculator/tests/CalculatorUtility_tests.cpp
+++ b/module-apps/application-calculator/tests/CalculatorUtility_tests.cpp
@@ -4,8 +4,9 @@
 #define CATCH_CONFIG_MAIN
 #include <catch2/catch.hpp>
 #include "application-calculator/data/CalculatorUtility.hpp"
-#include <module-utils/i18n/i18n.hpp>
+#include <i18n/i18n.hpp>
 #include <cstring>
+#include <vfs.hpp>
 
 class vfs vfs;
 
diff --git a/module-apps/application-calculator/windows/CalculatorMainWindow.cpp b/module-apps/application-calculator/windows/CalculatorMainWindow.cpp
index 129230b24..7aa76e250 100644
--- a/module-apps/application-calculator/windows/CalculatorMainWindow.cpp
+++ b/module-apps/application-calculator/windows/CalculatorMainWindow.cpp
@@ -4,7 +4,7 @@
 #include "CalculatorMainWindow.hpp"
 #include "application-calculator/widgets/CalculatorStyle.hpp"
 #include "application-calculator/data/CalculatorUtility.hpp"
-#include <module-utils/i18n/i18n.hpp>
+#include <i18n/i18n.hpp>
 
 namespace gui
 {
diff --git a/module-apps/application-call/widgets/StateIcon.hpp b/module-apps/application-call/widgets/StateIcon.hpp
index 85ee07df2..cc2032516 100644
--- a/module-apps/application-call/widgets/StateIcon.hpp
+++ b/module-apps/application-call/widgets/StateIcon.hpp
@@ -7,7 +7,7 @@
 #include "Label.hpp"
 #include <Style.hpp>
 #include <log/log.hpp>
-#include <module-utils/i18n/i18n.hpp>
+#include <i18n/i18n.hpp>
 
 namespace gui
 {
diff --git a/module-apps/application-call/windows/CallWindow.cpp b/module-apps/application-call/windows/CallWindow.cpp
index 08aed2313..2c05f2658 100644
--- a/module-apps/application-call/windows/CallWindow.cpp
+++ b/module-apps/application-call/windows/CallWindow.cpp
@@ -13,7 +13,7 @@
 #include "application-call/ApplicationCall.hpp"
 #include "application-call/data/CallSwitchData.hpp"
 
-#include "module-utils/i18n/i18n.hpp"
+#include <i18n/i18n.hpp>
 
 #include <service-audio/AudioServiceAPI.hpp>
 #include <service-cellular/CellularServiceAPI.hpp>
diff --git a/module-apps/application-call/windows/EmergencyCallWindow.cpp b/module-apps/application-call/windows/EmergencyCallWindow.cpp
index 27250ded4..c273043a0 100644
--- a/module-apps/application-call/windows/EmergencyCallWindow.cpp
+++ b/module-apps/application-call/windows/EmergencyCallWindow.cpp
@@ -5,7 +5,7 @@
 #include "../ApplicationCall.hpp"
 #include <service-appmgr/model/ApplicationManager.hpp>
 
-#include "module-utils/i18n/i18n.hpp"
+#include <i18n/i18n.hpp>
 #include "EmergencyCallWindow.hpp"
 
 namespace gui
diff --git a/module-apps/application-call/windows/EnterNumberWindow.cpp b/module-apps/application-call/windows/EnterNumberWindow.cpp
index 8407ff101..5ad838259 100644
--- a/module-apps/application-call/windows/EnterNumberWindow.cpp
+++ b/module-apps/application-call/windows/EnterNumberWindow.cpp
@@ -9,7 +9,7 @@
 
 #include <ContactRecord.hpp>
 #include <country.hpp>
-#include <module-utils/i18n/i18n.hpp>
+#include <i18n/i18n.hpp>
 #include <InputMode.hpp>
 #include <service-appmgr/Controller.hpp>
 #include <service-cellular/CellularServiceAPI.hpp>
diff --git a/module-apps/application-calllog/ApplicationCallLog.cpp b/module-apps/application-calllog/ApplicationCallLog.cpp
index 83b175635..fd68d0abf 100644
--- a/module-apps/application-calllog/ApplicationCallLog.cpp
+++ b/module-apps/application-calllog/ApplicationCallLog.cpp
@@ -13,7 +13,7 @@
 #include <service-db/DBMessage.hpp>
 #include <Dialog.hpp>
 #include <OptionWindow.hpp>
-#include <module-utils/i18n/i18n.hpp>
+#include <i18n/i18n.hpp>
 #include <log/log.hpp>
 #include <MessageType.hpp>
 #include <module-db/queries/calllog/QueryCalllogSetAllRead.hpp>
diff --git a/module-apps/application-calllog/windows/CallLogDetailsWindow.cpp b/module-apps/application-calllog/windows/CallLogDetailsWindow.cpp
index 749c44f64..39f5cd594 100644
--- a/module-apps/application-calllog/windows/CallLogDetailsWindow.cpp
+++ b/module-apps/application-calllog/windows/CallLogDetailsWindow.cpp
@@ -14,7 +14,7 @@
 #include "../ApplicationCallLog.hpp"
 
 #include <service-db/DBMessage.hpp>
-#include "module-utils/i18n/i18n.hpp"
+#include <i18n/i18n.hpp>
 
 #include "../data/CallLogInternals.hpp" // TODO: alek: add easier paths
 #include "../data/CallLogSwitchData.hpp"
diff --git a/module-apps/application-calllog/windows/CallLogMainWindow.cpp b/module-apps/application-calllog/windows/CallLogMainWindow.cpp
index 6136c510a..214957108 100644
--- a/module-apps/application-calllog/windows/CallLogMainWindow.cpp
+++ b/module-apps/application-calllog/windows/CallLogMainWindow.cpp
@@ -9,7 +9,7 @@
 #include <application-call/ApplicationCall.hpp>
 #include <service-appmgr/model/ApplicationManager.hpp>
 #include <service-db/DBCalllogMessage.hpp>
-#include <module-utils/i18n/i18n.hpp>
+#include <i18n/i18n.hpp>
 #include <Label.hpp>
 #include <Margins.hpp>
 #include <Style.hpp>
diff --git a/module-apps/application-calllog/windows/CallLogOptionsWindow.cpp b/module-apps/application-calllog/windows/CallLogOptionsWindow.cpp
index 1a0d3a4b5..55becf9ef 100644
--- a/module-apps/application-calllog/windows/CallLogOptionsWindow.cpp
+++ b/module-apps/application-calllog/windows/CallLogOptionsWindow.cpp
@@ -2,7 +2,7 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "CallLogOptionsWindow.hpp"
-#include "module-utils/i18n/i18n.hpp"
+#include <i18n/i18n.hpp>
 #include "log/log.hpp"
 #include <Options.hpp>
 #include <module-services/service-db/service-db/DBServiceAPI.hpp>
diff --git a/module-apps/application-desktop/windows/DesktopMainWindow.cpp b/module-apps/application-desktop/windows/DesktopMainWindow.cpp
index a3ee1e80d..c75cca865 100644
--- a/module-apps/application-desktop/windows/DesktopMainWindow.cpp
+++ b/module-apps/application-desktop/windows/DesktopMainWindow.cpp
@@ -18,7 +18,7 @@
 #include <service-time/ServiceTime.hpp>
 #include <service-time/TimeMessage.hpp>
 
-#include "module-utils/i18n/i18n.hpp"
+#include <i18n/i18n.hpp>
 #include "log/log.hpp"
 
 #include <application-settings-new/ApplicationSettings.hpp>
diff --git a/module-apps/application-desktop/windows/LockedInfoWindow.cpp b/module-apps/application-desktop/windows/LockedInfoWindow.cpp
index 9ad0bf32b..b8e676a2d 100644
--- a/module-apps/application-desktop/windows/LockedInfoWindow.cpp
+++ b/module-apps/application-desktop/windows/LockedInfoWindow.cpp
@@ -13,7 +13,7 @@
 #include "Names.hpp"
 
 #include <application-phonebook/ApplicationPhonebook.hpp>
-#include <module-utils/i18n/i18n.hpp>
+#include <i18n/i18n.hpp>
 
 using namespace gui;
 
diff --git a/module-apps/application-desktop/windows/MenuWindow.cpp b/module-apps/application-desktop/windows/MenuWindow.cpp
index 47e833dcb..290ea1af7 100644
--- a/module-apps/application-desktop/windows/MenuWindow.cpp
+++ b/module-apps/application-desktop/windows/MenuWindow.cpp
@@ -11,7 +11,7 @@
 #include <tools/Common.hpp>
 #include <Style.hpp>
 #include <cassert>
-#include <module-utils/i18n/i18n.hpp>
+#include <i18n/i18n.hpp>
 
 namespace style::design
 {
diff --git a/module-apps/application-desktop/windows/PinLockBaseWindow.cpp b/module-apps/application-desktop/windows/PinLockBaseWindow.cpp
index bad5320e1..adef1c7ba 100644
--- a/module-apps/application-desktop/windows/PinLockBaseWindow.cpp
+++ b/module-apps/application-desktop/windows/PinLockBaseWindow.cpp
@@ -4,7 +4,7 @@
 #include "PinLockBaseWindow.hpp"
 #include "application-desktop/data/AppDesktopStyle.hpp"
 #include "application-desktop/widgets/PinLock.hpp"
-#include <module-utils/i18n/i18n.hpp>
+#include <i18n/i18n.hpp>
 
 #include "FontManager.hpp"
 
diff --git a/module-apps/application-desktop/windows/PowerOffWindow.cpp b/module-apps/application-desktop/windows/PowerOffWindow.cpp
index 60296f350..715a7b715 100644
--- a/module-apps/application-desktop/windows/PowerOffWindow.cpp
+++ b/module-apps/application-desktop/windows/PowerOffWindow.cpp
@@ -7,7 +7,7 @@
 #include "log/log.hpp"
 
 // module-utils
-#include "module-utils/i18n/i18n.hpp"
+#include <i18n/i18n.hpp>
 
 #include "PowerOffWindow.hpp"
 #include "../ApplicationDesktop.hpp"
diff --git a/module-apps/application-desktop/windows/PukLockBox.cpp b/module-apps/application-desktop/windows/PukLockBox.cpp
index 54c5af60c..0b86b116a 100644
--- a/module-apps/application-desktop/windows/PukLockBox.cpp
+++ b/module-apps/application-desktop/windows/PukLockBox.cpp
@@ -7,7 +7,7 @@
 #include "application-desktop/widgets/PinLock.hpp"
 #include "application-desktop/data/AppDesktopStyle.hpp"
 #include "gui/widgets/Image.hpp"
-#include <module-utils/i18n/i18n.hpp>
+#include <i18n/i18n.hpp>
 #include <Style.hpp>
 
 namespace label_style = style::window::pin_lock::pin_label;
diff --git a/module-apps/application-desktop/windows/Reboot.cpp b/module-apps/application-desktop/windows/Reboot.cpp
index 4dbc7a706..f3947a396 100644
--- a/module-apps/application-desktop/windows/Reboot.cpp
+++ b/module-apps/application-desktop/windows/Reboot.cpp
@@ -4,7 +4,7 @@
 #include "Reboot.hpp"
 #include "../ApplicationDesktop.hpp"
 #include <Style.hpp>
-#include <module-utils/i18n/i18n.hpp>
+#include <i18n/i18n.hpp>
 
 namespace gui
 {
diff --git a/module-apps/application-desktop/windows/ScreenLockBox.cpp b/module-apps/application-desktop/windows/ScreenLockBox.cpp
index e1590da4a..95cd7254f 100644
--- a/module-apps/application-desktop/windows/ScreenLockBox.cpp
+++ b/module-apps/application-desktop/windows/ScreenLockBox.cpp
@@ -8,7 +8,7 @@
 #include "application-desktop/data/AppDesktopStyle.hpp"
 #include "gui/widgets/Label.hpp"
 #include "gui/widgets/Image.hpp"
-#include <module-utils/i18n/i18n.hpp>
+#include <i18n/i18n.hpp>
 
 namespace label_style = style::window::pin_lock::pin_label;
 
diff --git a/module-apps/application-meditation/widgets/IntervalBox.cpp b/module-apps/application-meditation/widgets/IntervalBox.cpp
index 616efe64e..c9882fa60 100644
--- a/module-apps/application-meditation/widgets/IntervalBox.cpp
+++ b/module-apps/application-meditation/widgets/IntervalBox.cpp
@@ -8,7 +8,7 @@
 #include "TimerProperty.hpp"
 #include "InputEvent.hpp"
 
-#include <module-utils/i18n/i18n.hpp>
+#include <i18n/i18n.hpp>
 #include <cassert>
 
 using namespace gui;
diff --git a/module-apps/application-meditation/widgets/MeditationListItems.cpp b/module-apps/application-meditation/widgets/MeditationListItems.cpp
index 108a6bd01..9395b60b4 100644
--- a/module-apps/application-meditation/widgets/MeditationListItems.cpp
+++ b/module-apps/application-meditation/widgets/MeditationListItems.cpp
@@ -4,7 +4,7 @@
 #include "MeditationListItems.hpp"
 #include "application-meditation/data/Style.hpp"
 
-#include <module-utils/i18n/i18n.hpp>
+#include <i18n/i18n.hpp>
 
 using namespace gui;
 namespace listStyle = style::meditation::itemList;
diff --git a/module-apps/application-meditation/widgets/TimerProperty.cpp b/module-apps/application-meditation/widgets/TimerProperty.cpp
index 0870ab443..262d1345a 100644
--- a/module-apps/application-meditation/widgets/TimerProperty.cpp
+++ b/module-apps/application-meditation/widgets/TimerProperty.cpp
@@ -3,7 +3,7 @@
 
 #include "TimerProperty.hpp"
 #include <application-meditation/data/Style.hpp>
-#include <module-utils/i18n/i18n.hpp>
+#include <i18n/i18n.hpp>
 #include <module-utils/Utils.hpp>
 
 using namespace gui;
diff --git a/module-apps/application-meditation/windows/MeditationListViewWindows.cpp b/module-apps/application-meditation/windows/MeditationListViewWindows.cpp
index c11d4f3d6..6198ddd3e 100644
--- a/module-apps/application-meditation/windows/MeditationListViewWindows.cpp
+++ b/module-apps/application-meditation/windows/MeditationListViewWindows.cpp
@@ -9,7 +9,7 @@
 
 #include "ListView.hpp"
 #include "Label.hpp"
-#include <module-utils/i18n/i18n.hpp>
+#include <i18n/i18n.hpp>
 
 using namespace gui;
 namespace listViewWindow = style::meditation::listView::window;
diff --git a/module-apps/application-meditation/windows/MeditationTimerWindow.cpp b/module-apps/application-meditation/windows/MeditationTimerWindow.cpp
index e8f25edca..663e9cf62 100644
--- a/module-apps/application-meditation/windows/MeditationTimerWindow.cpp
+++ b/module-apps/application-meditation/windows/MeditationTimerWindow.cpp
@@ -9,7 +9,7 @@
 #include "Names.hpp"
 
 #include <cassert>
-#include <module-utils/i18n/i18n.hpp>
+#include <i18n/i18n.hpp>
 
 #include "RichTextParser.hpp"
 #include "FontManager.hpp"
diff --git a/module-apps/application-meditation/windows/MeditationWindow.cpp b/module-apps/application-meditation/windows/MeditationWindow.cpp
index 010120d2c..4636acf32 100644
--- a/module-apps/application-meditation/windows/MeditationWindow.cpp
+++ b/module-apps/application-meditation/windows/MeditationWindow.cpp
@@ -13,7 +13,7 @@
 #include "InputEvent.hpp"
 #include <cassert>
 
-#include <module-utils/i18n/i18n.hpp>
+#include <i18n/i18n.hpp>
 
 namespace gui
 {
diff --git a/module-apps/application-messages/ApplicationMessages.cpp b/module-apps/application-messages/ApplicationMessages.cpp
index 3c9d370f9..4787bd363 100644
--- a/module-apps/application-messages/ApplicationMessages.cpp
+++ b/module-apps/application-messages/ApplicationMessages.cpp
@@ -17,7 +17,7 @@
 
 #include <MessageType.hpp>
 #include <Dialog.hpp>
-#include <module-utils/i18n/i18n.hpp>
+#include <i18n/i18n.hpp>
 #include <memory>
 #include <service-db/DBServiceAPI.hpp>
 #include <service-db/DBNotificationMessage.hpp>
diff --git a/module-apps/application-messages/widgets/SMSInputWidget.cpp b/module-apps/application-messages/widgets/SMSInputWidget.cpp
index f7350f287..c3bcbcc1b 100644
--- a/module-apps/application-messages/widgets/SMSInputWidget.cpp
+++ b/module-apps/application-messages/widgets/SMSInputWidget.cpp
@@ -7,7 +7,7 @@
 #include <module-apps/application-messages/ApplicationMessages.hpp>
 
 #include <Style.hpp>
-#include <module-utils/i18n/i18n.hpp>
+#include <i18n/i18n.hpp>
 #include <Font.hpp>
 #include <utility>
 #include <algorithm>
diff --git a/module-apps/application-messages/windows/MessagesMainWindow.cpp b/module-apps/application-messages/windows/MessagesMainWindow.cpp
index b60318851..27065e8c1 100644
--- a/module-apps/application-messages/windows/MessagesMainWindow.cpp
+++ b/module-apps/application-messages/windows/MessagesMainWindow.cpp
@@ -13,7 +13,7 @@
 #include <service-db/DBNotificationMessage.hpp>
 
 #include <service-appmgr/model/ApplicationManager.hpp>
-#include <module-utils/i18n/i18n.hpp>
+#include <i18n/i18n.hpp>
 #include <application-phonebook/data/PhonebookItemData.hpp>
 #include <Style.hpp>
 #include <log/log.hpp>
diff --git a/module-apps/application-messages/windows/NewMessage.cpp b/module-apps/application-messages/windows/NewMessage.cpp
index 2d45aba39..2b4e341bf 100644
--- a/module-apps/application-messages/windows/NewMessage.cpp
+++ b/module-apps/application-messages/windows/NewMessage.cpp
@@ -11,7 +11,7 @@
 #include <application-phonebook/windows/PhonebookSearchResults.hpp>
 #include <service-appmgr/Controller.hpp>
 #include <service-db/DBServiceAPI.hpp>
-#include <module-utils/i18n/i18n.hpp>
+#include <i18n/i18n.hpp>
 #include <BoxLayout.hpp>
 #include <Text.hpp>
 
diff --git a/module-apps/application-messages/windows/OptionsMessages.cpp b/module-apps/application-messages/windows/OptionsMessages.cpp
index 013154129..bcfe77823 100644
--- a/module-apps/application-messages/windows/OptionsMessages.cpp
+++ b/module-apps/application-messages/windows/OptionsMessages.cpp
@@ -8,7 +8,7 @@
 #include <common_data/Clipboard.hpp>
 #include <Options.hpp>
 #include <OptionWindow.hpp>
-#include <module-utils/i18n/i18n.hpp>
+#include <i18n/i18n.hpp>
 #include <log/log.hpp>
 
 #include <Text.hpp>
diff --git a/module-apps/application-messages/windows/SMSTemplatesWindow.cpp b/module-apps/application-messages/windows/SMSTemplatesWindow.cpp
index d3d2bef32..b0f7eb1ab 100644
--- a/module-apps/application-messages/windows/SMSTemplatesWindow.cpp
+++ b/module-apps/application-messages/windows/SMSTemplatesWindow.cpp
@@ -9,7 +9,7 @@
 
 #include <service-appmgr/Controller.hpp>
 #include <service-db/DBSMSTemplateMessage.hpp>
-#include <module-utils/i18n/i18n.hpp>
+#include <i18n/i18n.hpp>
 #include <Style.hpp>
 #include <log/log.hpp>
 
diff --git a/module-apps/application-messages/windows/SearchResults.cpp b/module-apps/application-messages/windows/SearchResults.cpp
index 1907cdf71..a718e2bd7 100644
--- a/module-apps/application-messages/windows/SearchResults.cpp
+++ b/module-apps/application-messages/windows/SearchResults.cpp
@@ -12,7 +12,7 @@
 #include <service-db/QueryMessage.hpp>
 #include <service-db/DBMessage.hpp>
 
-#include <module-utils/i18n/i18n.hpp>
+#include <i18n/i18n.hpp>
 
 namespace gui
 {
diff --git a/module-apps/application-messages/windows/SearchStart.cpp b/module-apps/application-messages/windows/SearchStart.cpp
index 6cd6c96e9..ea9d0a5b4 100644
--- a/module-apps/application-messages/windows/SearchStart.cpp
+++ b/module-apps/application-messages/windows/SearchStart.cpp
@@ -3,7 +3,7 @@
 
 #include "SearchStart.hpp"
 #include "../ApplicationMessages.hpp"
-#include <module-utils/i18n/i18n.hpp>
+#include <i18n/i18n.hpp>
 #include <widgets/InputBox.hpp>
 #include <cassert>
 
diff --git a/module-apps/application-messages/windows/ThreadWindowOptions.cpp b/module-apps/application-messages/windows/ThreadWindowOptions.cpp
index 613ab768e..163f0e2ab 100644
--- a/module-apps/application-messages/windows/ThreadWindowOptions.cpp
+++ b/module-apps/application-messages/windows/ThreadWindowOptions.cpp
@@ -2,7 +2,7 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "ThreadWindowOptions.hpp"
-#include "module-utils/i18n/i18n.hpp"
+#include <i18n/i18n.hpp>
 #include "log/log.hpp"
 #include <Options.hpp>
 #include <OptionWindow.hpp>
diff --git a/module-apps/application-music-player/ApplicationMusicPlayer.cpp b/module-apps/application-music-player/ApplicationMusicPlayer.cpp
index 0abff798c..65b1a8e4c 100644
--- a/module-apps/application-music-player/ApplicationMusicPlayer.cpp
+++ b/module-apps/application-music-player/ApplicationMusicPlayer.cpp
@@ -6,9 +6,10 @@
 #include "windows/MusicPlayerEmptyWindow.hpp"
 
 #include <service-audio/AudioServiceAPI.hpp>
-#include <module-utils/i18n/i18n.hpp>
+#include <i18n/i18n.hpp>
 #include <log/log.hpp>
 #include <time/ScopedTime.hpp>
+#include <vfs.hpp>
 
 namespace app
 {
diff --git a/module-apps/application-music-player/windows/MusicPlayerAllSongsWindow.cpp b/module-apps/application-music-player/windows/MusicPlayerAllSongsWindow.cpp
index 4b702c244..7f5b841e8 100644
--- a/module-apps/application-music-player/windows/MusicPlayerAllSongsWindow.cpp
+++ b/module-apps/application-music-player/windows/MusicPlayerAllSongsWindow.cpp
@@ -6,7 +6,7 @@
 
 #include <Style.hpp>
 #include <cassert>
-#include <module-utils/i18n/i18n.hpp>
+#include <i18n/i18n.hpp>
 #include <log/log.hpp>
 #include <service-audio/AudioServiceAPI.hpp>
 
diff --git a/module-apps/application-music-player/windows/MusicPlayerEmptyWindow.cpp b/module-apps/application-music-player/windows/MusicPlayerEmptyWindow.cpp
index 7b254b366..ce24fc872 100644
--- a/module-apps/application-music-player/windows/MusicPlayerEmptyWindow.cpp
+++ b/module-apps/application-music-player/windows/MusicPlayerEmptyWindow.cpp
@@ -6,7 +6,7 @@
 #include "application-music-player/data/MusicPlayerStyle.hpp"
 
 #include <Style.hpp>
-#include <module-utils/i18n/i18n.hpp>
+#include <i18n/i18n.hpp>
 #include <log/log.hpp>
 #include <service-audio/AudioServiceAPI.hpp>
 
diff --git a/module-apps/application-notes/windows/NoteEditWindow.cpp b/module-apps/application-notes/windows/NoteEditWindow.cpp
index 4aeb118ee..a21d5224f 100644
--- a/module-apps/application-notes/windows/NoteEditWindow.cpp
+++ b/module-apps/application-notes/windows/NoteEditWindow.cpp
@@ -13,7 +13,7 @@
 #include <module-apps/application-notes/style/NoteEditStyle.hpp>
 #include <module-apps/messages/OptionsWindow.hpp>
 
-#include <module-utils/i18n/i18n.hpp>
+#include <i18n/i18n.hpp>
 #include <module-utils/time/time_conversion.hpp>
 
 #include <module-gui/gui/widgets/BottomBar.hpp>
diff --git a/module-apps/application-notes/windows/NoteMainWindow.cpp b/module-apps/application-notes/windows/NoteMainWindow.cpp
index 64e408a81..e615c938e 100644
--- a/module-apps/application-notes/windows/NoteMainWindow.cpp
+++ b/module-apps/application-notes/windows/NoteMainWindow.cpp
@@ -9,7 +9,7 @@
 #include <InputEvent.hpp>
 #include <service-db/DBNotesMessage.hpp>
 
-#include <module-utils/i18n/i18n.hpp>
+#include <i18n/i18n.hpp>
 
 #include <gui/widgets/Label.hpp>
 #include <gui/widgets/BottomBar.hpp>
diff --git a/module-apps/application-notes/windows/NotePreviewWindow.cpp b/module-apps/application-notes/windows/NotePreviewWindow.cpp
index b7c5d0029..2606c1b6f 100644
--- a/module-apps/application-notes/windows/NotePreviewWindow.cpp
+++ b/module-apps/application-notes/windows/NotePreviewWindow.cpp
@@ -9,7 +9,7 @@
 #include <module-apps/application-notes/windows/NotesOptions.hpp>
 #include <module-apps/messages/OptionsWindow.hpp>
 
-#include <module-utils/i18n/i18n.hpp>
+#include <i18n/i18n.hpp>
 #include <module-utils/time/time_conversion.hpp>
 
 #include <Style.hpp>
diff --git a/module-apps/application-notes/windows/NotesOptions.cpp b/module-apps/application-notes/windows/NotesOptions.cpp
index 6d3e639c2..c66090e7f 100644
--- a/module-apps/application-notes/windows/NotesOptions.cpp
+++ b/module-apps/application-notes/windows/NotesOptions.cpp
@@ -9,7 +9,7 @@
 #include <module-apps/windows/DialogMetadata.hpp>
 #include <module-apps/messages/DialogMetadataMessage.hpp>
 
-#include <module-utils/i18n/i18n.hpp>
+#include <i18n/i18n.hpp>
 
 #include <module-gui/gui/widgets/Text.hpp>
 
diff --git a/module-apps/application-notes/windows/SearchEngineWindow.cpp b/module-apps/application-notes/windows/SearchEngineWindow.cpp
index 561325710..f42ddd01c 100644
--- a/module-apps/application-notes/windows/SearchEngineWindow.cpp
+++ b/module-apps/application-notes/windows/SearchEngineWindow.cpp
@@ -7,7 +7,7 @@
 #include <module-apps/application-notes/data/NotesFoundData.hpp>
 #include <module-apps/widgets/InputBox.hpp>
 
-#include <module-utils/i18n/i18n.hpp>
+#include <i18n/i18n.hpp>
 
 namespace app::notes
 {
diff --git a/module-apps/application-phonebook/widgets/ContactFlagsWidget.cpp b/module-apps/application-phonebook/widgets/ContactFlagsWidget.cpp
index 2f5bdb109..4d1f035e2 100644
--- a/module-apps/application-phonebook/widgets/ContactFlagsWidget.cpp
+++ b/module-apps/application-phonebook/widgets/ContactFlagsWidget.cpp
@@ -8,7 +8,7 @@
 
 #include <Alignment.hpp>
 #include <BoxLayout.hpp>
-#include <module-utils/i18n/i18n.hpp>
+#include <i18n/i18n.hpp>
 #include <tools/Common.hpp>
 #include <Style.hpp>
 
diff --git a/module-apps/application-phonebook/widgets/InformationWidget.cpp b/module-apps/application-phonebook/widgets/InformationWidget.cpp
index 95ed03fd1..e5ff4e301 100644
--- a/module-apps/application-phonebook/widgets/InformationWidget.cpp
+++ b/module-apps/application-phonebook/widgets/InformationWidget.cpp
@@ -7,7 +7,7 @@
 #include "application-phonebook/data/PhonebookStyle.hpp"
 
 #include <ContactRecord.hpp>
-#include <module-utils/i18n/i18n.hpp>
+#include <i18n/i18n.hpp>
 
 namespace gui
 {
diff --git a/module-apps/application-phonebook/widgets/InputBoxWithLabelAndIconWidget.cpp b/module-apps/application-phonebook/widgets/InputBoxWithLabelAndIconWidget.cpp
index 73647ef0c..b46c79938 100644
--- a/module-apps/application-phonebook/widgets/InputBoxWithLabelAndIconWidget.cpp
+++ b/module-apps/application-phonebook/widgets/InputBoxWithLabelAndIconWidget.cpp
@@ -6,7 +6,7 @@
 #include "application-phonebook/data/PhonebookStyle.hpp"
 
 #include <BottomBar.hpp>
-#include <module-utils/i18n/i18n.hpp>
+#include <i18n/i18n.hpp>
 
 #include <utility>
 
diff --git a/module-apps/application-phonebook/widgets/InputLinesWithLabelIWidget.cpp b/module-apps/application-phonebook/widgets/InputLinesWithLabelIWidget.cpp
index 2e521df1a..cbd0415f0 100644
--- a/module-apps/application-phonebook/widgets/InputLinesWithLabelIWidget.cpp
+++ b/module-apps/application-phonebook/widgets/InputLinesWithLabelIWidget.cpp
@@ -7,7 +7,7 @@
 #include "application-phonebook/data/PhonebookStyle.hpp"
 
 #include <ContactRecord.hpp>
-#include <module-utils/i18n/i18n.hpp>
+#include <i18n/i18n.hpp>
 #include <utility>
 
 namespace gui
diff --git a/module-apps/application-phonebook/widgets/OutputLinesTextWithLabelWidget.cpp b/module-apps/application-phonebook/widgets/OutputLinesTextWithLabelWidget.cpp
index 7574c4220..586651b31 100644
--- a/module-apps/application-phonebook/widgets/OutputLinesTextWithLabelWidget.cpp
+++ b/module-apps/application-phonebook/widgets/OutputLinesTextWithLabelWidget.cpp
@@ -7,7 +7,7 @@
 #include "application-phonebook/data/PhonebookStyle.hpp"
 
 #include <ContactRecord.hpp>
-#include <module-utils/i18n/i18n.hpp>
+#include <i18n/i18n.hpp>
 
 namespace gui
 {
diff --git a/module-apps/application-settings-new/ApplicationSettings.cpp b/module-apps/application-settings-new/ApplicationSettings.cpp
index 34872c798..fc1903826 100644
--- a/module-apps/application-settings-new/ApplicationSettings.cpp
+++ b/module-apps/application-settings-new/ApplicationSettings.cpp
@@ -28,10 +28,10 @@
 
 #include <service-evtmgr/EventManagerServiceAPI.hpp>
 #include <service-bluetooth/BluetoothMessage.hpp>
-#include <module-utils/i18n/i18n.hpp>
 #include <service-cellular/CellularServiceAPI.hpp>
 #include <service-db/Settings.hpp>
 #include <module-services/service-db/agents/settings/SystemSettings.hpp>
+#include <i18n/i18n.hpp>
 
 namespace app
 {
diff --git a/module-apps/application-settings-new/widgets/timeWidget.cpp b/module-apps/application-settings-new/widgets/timeWidget.cpp
index fdfaf29cf..e99ce1ce1 100644
--- a/module-apps/application-settings-new/widgets/timeWidget.cpp
+++ b/module-apps/application-settings-new/widgets/timeWidget.cpp
@@ -5,7 +5,7 @@
 #include "SettingsStyle.hpp"
 
 #include <Style.hpp>
-#include <module-utils/i18n/i18n.hpp>
+#include <i18n/i18n.hpp>
 
 namespace gui
 {
diff --git a/module-apps/application-settings-new/widgets/timeWidget.hpp b/module-apps/application-settings-new/widgets/timeWidget.hpp
index 385b9f2bc..a1a35756a 100644
--- a/module-apps/application-settings-new/widgets/timeWidget.hpp
+++ b/module-apps/application-settings-new/widgets/timeWidget.hpp
@@ -5,6 +5,7 @@
 
 #include <Label.hpp>
 #include <Text.hpp>
+#include <chrono>
 
 namespace gui
 {
diff --git a/module-apps/application-settings-new/windows/AddDeviceWindow.cpp b/module-apps/application-settings-new/windows/AddDeviceWindow.cpp
index bf2d37036..7493f0fb9 100644
--- a/module-apps/application-settings-new/windows/AddDeviceWindow.cpp
+++ b/module-apps/application-settings-new/windows/AddDeviceWindow.cpp
@@ -6,7 +6,7 @@
 
 #include "OptionSetting.hpp"
 
-#include <module-utils/i18n/i18n.hpp>
+#include <i18n/i18n.hpp>
 #include <utility>
 
 namespace gui
diff --git a/module-apps/application-settings-new/windows/AllDevicesWindow.cpp b/module-apps/application-settings-new/windows/AllDevicesWindow.cpp
index 73f82c866..0e45bb6ff 100644
--- a/module-apps/application-settings-new/windows/AllDevicesWindow.cpp
+++ b/module-apps/application-settings-new/windows/AllDevicesWindow.cpp
@@ -10,7 +10,7 @@
 #include "DialogMetadataMessage.hpp"
 
 #include <InputEvent.hpp>
-#include <module-utils/i18n/i18n.hpp>
+#include <i18n/i18n.hpp>
 #include <service-bluetooth/BluetoothMessage.hpp>
 
 namespace gui
diff --git a/module-apps/application-settings-new/windows/AppsAndToolsWindow.cpp b/module-apps/application-settings-new/windows/AppsAndToolsWindow.cpp
index ed543b591..c20af3832 100644
--- a/module-apps/application-settings-new/windows/AppsAndToolsWindow.cpp
+++ b/module-apps/application-settings-new/windows/AppsAndToolsWindow.cpp
@@ -4,7 +4,7 @@
 #include "AppsAndToolsWindow.hpp"
 
 #include <application-settings-new/ApplicationSettings.hpp>
-#include <module-utils/i18n/i18n.hpp>
+#include <i18n/i18n.hpp>
 #include <OptionWindow.hpp>
 
 namespace gui
diff --git a/module-apps/application-settings-new/windows/AutolockWindow.cpp b/module-apps/application-settings-new/windows/AutolockWindow.cpp
index a31f9c1af..9b3833e53 100644
--- a/module-apps/application-settings-new/windows/AutolockWindow.cpp
+++ b/module-apps/application-settings-new/windows/AutolockWindow.cpp
@@ -5,7 +5,7 @@
 #include "application-settings-new/ApplicationSettings.hpp"
 #include "windows/OptionSetting.hpp"
 
-#include <module-utils/i18n/i18n.hpp>
+#include <i18n/i18n.hpp>
 
 namespace gui
 {
diff --git a/module-apps/application-settings-new/windows/BaseSettingsWindow.cpp b/module-apps/application-settings-new/windows/BaseSettingsWindow.cpp
index 182546633..28527afae 100644
--- a/module-apps/application-settings-new/windows/BaseSettingsWindow.cpp
+++ b/module-apps/application-settings-new/windows/BaseSettingsWindow.cpp
@@ -3,7 +3,7 @@
 
 #include "BaseSettingsWindow.hpp"
 
-#include <module-utils/i18n/i18n.hpp>
+#include <i18n/i18n.hpp>
 
 namespace gui
 {
diff --git a/module-apps/application-settings-new/windows/BluetoothWindow.cpp b/module-apps/application-settings-new/windows/BluetoothWindow.cpp
index 6c51e1088..7645e93a9 100644
--- a/module-apps/application-settings-new/windows/BluetoothWindow.cpp
+++ b/module-apps/application-settings-new/windows/BluetoothWindow.cpp
@@ -6,7 +6,7 @@
 
 #include "OptionSetting.hpp"
 
-#include <module-utils/i18n/i18n.hpp>
+#include <i18n/i18n.hpp>
 #include <service-bluetooth/BluetoothMessage.hpp>
 
 namespace gui
diff --git a/module-apps/application-settings-new/windows/DisplayAndKeypadWindow.cpp b/module-apps/application-settings-new/windows/DisplayAndKeypadWindow.cpp
index f46b036e6..0e87f5972 100644
--- a/module-apps/application-settings-new/windows/DisplayAndKeypadWindow.cpp
+++ b/module-apps/application-settings-new/windows/DisplayAndKeypadWindow.cpp
@@ -7,7 +7,7 @@
 #include "windows/OptionWindow.hpp"
 #include "windows/OptionSetting.hpp"
 
-#include <module-utils/i18n/i18n.hpp>
+#include <i18n/i18n.hpp>
 
 namespace gui
 {
diff --git a/module-apps/application-settings-new/windows/DisplayLightWindow.cpp b/module-apps/application-settings-new/windows/DisplayLightWindow.cpp
index 03d21e526..deffe4763 100644
--- a/module-apps/application-settings-new/windows/DisplayLightWindow.cpp
+++ b/module-apps/application-settings-new/windows/DisplayLightWindow.cpp
@@ -6,7 +6,7 @@
 #include "application-settings-new/ApplicationSettings.hpp"
 #include "windows/OptionSetting.hpp"
 
-#include <module-utils/i18n/i18n.hpp>
+#include <i18n/i18n.hpp>
 
 namespace gui
 {
diff --git a/module-apps/application-settings-new/windows/FontSizeWindow.cpp b/module-apps/application-settings-new/windows/FontSizeWindow.cpp
index 6dca2dac1..4d9a329f7 100644
--- a/module-apps/application-settings-new/windows/FontSizeWindow.cpp
+++ b/module-apps/application-settings-new/windows/FontSizeWindow.cpp
@@ -5,7 +5,7 @@
 
 #include "application-settings-new/ApplicationSettings.hpp"
 
-#include <module-utils/i18n/i18n.hpp>
+#include <i18n/i18n.hpp>
 
 namespace gui
 {
diff --git a/module-apps/application-settings-new/windows/InputLanguageWindow.cpp b/module-apps/application-settings-new/windows/InputLanguageWindow.cpp
index aa4cc42ad..3cc3da08e 100644
--- a/module-apps/application-settings-new/windows/InputLanguageWindow.cpp
+++ b/module-apps/application-settings-new/windows/InputLanguageWindow.cpp
@@ -6,7 +6,7 @@
 #include "application-settings-new/ApplicationSettings.hpp"
 #include "windows/OptionSetting.hpp"
 
-#include <module-utils/i18n/i18n.hpp>
+#include <i18n/i18n.hpp>
 #include <module-services/service-appmgr/service-appmgr/Controller.hpp>
 
 namespace gui
diff --git a/module-apps/application-settings-new/windows/KeypadLightWindow.cpp b/module-apps/application-settings-new/windows/KeypadLightWindow.cpp
index d1633a320..c2cd5d06f 100644
--- a/module-apps/application-settings-new/windows/KeypadLightWindow.cpp
+++ b/module-apps/application-settings-new/windows/KeypadLightWindow.cpp
@@ -6,7 +6,7 @@
 #include "application-settings-new/ApplicationSettings.hpp"
 #include "windows/OptionSetting.hpp"
 
-#include <module-utils/i18n/i18n.hpp>
+#include <i18n/i18n.hpp>
 
 namespace gui
 {
diff --git a/module-apps/application-settings-new/windows/LockedScreenWindow.cpp b/module-apps/application-settings-new/windows/LockedScreenWindow.cpp
index 3a90ea250..4807c664c 100644
--- a/module-apps/application-settings-new/windows/LockedScreenWindow.cpp
+++ b/module-apps/application-settings-new/windows/LockedScreenWindow.cpp
@@ -5,7 +5,7 @@
 #include "application-settings-new/ApplicationSettings.hpp"
 #include "windows/OptionSetting.hpp"
 
-#include <module-utils/i18n/i18n.hpp>
+#include <i18n/i18n.hpp>
 
 namespace gui
 {
diff --git a/module-apps/application-settings-new/windows/MessagesWindow.cpp b/module-apps/application-settings-new/windows/MessagesWindow.cpp
index 07a09762e..0ae43434d 100644
--- a/module-apps/application-settings-new/windows/MessagesWindow.cpp
+++ b/module-apps/application-settings-new/windows/MessagesWindow.cpp
@@ -4,7 +4,7 @@
 #include "MessagesWindow.hpp"
 
 #include <application-settings-new/ApplicationSettings.hpp>
-#include <module-utils/i18n/i18n.hpp>
+#include <i18n/i18n.hpp>
 #include <OptionWindow.hpp>
 #include <OptionSetting.hpp>
 
diff --git a/module-apps/application-settings-new/windows/NetworkWindow.cpp b/module-apps/application-settings-new/windows/NetworkWindow.cpp
index 63b02f254..7f0d28f64 100644
--- a/module-apps/application-settings-new/windows/NetworkWindow.cpp
+++ b/module-apps/application-settings-new/windows/NetworkWindow.cpp
@@ -6,7 +6,7 @@
 
 #include "OptionSetting.hpp"
 
-#include <module-utils/i18n/i18n.hpp>
+#include <i18n/i18n.hpp>
 
 namespace gui
 {
diff --git a/module-apps/application-settings-new/windows/QuotesAddWindow.cpp b/module-apps/application-settings-new/windows/QuotesAddWindow.cpp
index 6f2680c94..32c1dca78 100644
--- a/module-apps/application-settings-new/windows/QuotesAddWindow.cpp
+++ b/module-apps/application-settings-new/windows/QuotesAddWindow.cpp
@@ -5,7 +5,7 @@
 
 #include "application-settings-new/ApplicationSettings.hpp"
 
-#include <module-utils/i18n/i18n.hpp>
+#include <i18n/i18n.hpp>
 #include <widgets/Text.hpp>
 
 namespace gui
diff --git a/module-apps/application-settings-new/windows/QuotesMainWindow.cpp b/module-apps/application-settings-new/windows/QuotesMainWindow.cpp
index 9c0c09c7f..f035348f2 100644
--- a/module-apps/application-settings-new/windows/QuotesMainWindow.cpp
+++ b/module-apps/application-settings-new/windows/QuotesMainWindow.cpp
@@ -8,7 +8,7 @@
 #include "windows/OptionSetting.hpp"
 
 #include <InputEvent.hpp>
-#include <module-utils/i18n/i18n.hpp>
+#include <i18n/i18n.hpp>
 #include <json/json11.hpp>
 #include <vfs.hpp>
 
diff --git a/module-apps/application-settings-new/windows/SettingsMainWindow.cpp b/module-apps/application-settings-new/windows/SettingsMainWindow.cpp
index 7b2690067..284195d64 100644
--- a/module-apps/application-settings-new/windows/SettingsMainWindow.cpp
+++ b/module-apps/application-settings-new/windows/SettingsMainWindow.cpp
@@ -4,7 +4,7 @@
 #include "SettingsMainWindow.hpp"
 #include "application-settings-new/ApplicationSettings.hpp"
 
-#include <module-utils/i18n/i18n.hpp>
+#include <i18n/i18n.hpp>
 #include <log/log.hpp>
 #include <service-appmgr/Controller.hpp>
 
diff --git a/module-apps/application-settings-new/windows/TorchWindow.cpp b/module-apps/application-settings-new/windows/TorchWindow.cpp
index 7b14eb6f1..ef33f7b12 100644
--- a/module-apps/application-settings-new/windows/TorchWindow.cpp
+++ b/module-apps/application-settings-new/windows/TorchWindow.cpp
@@ -7,7 +7,7 @@
 
 #include "OptionSetting.hpp"
 
-#include <module-utils/i18n/i18n.hpp>
+#include <i18n/i18n.hpp>
 
 namespace gui
 {
diff --git a/module-apps/application-settings-new/windows/WallpaperWindow.cpp b/module-apps/application-settings-new/windows/WallpaperWindow.cpp
index e4fe10411..b24186ec3 100644
--- a/module-apps/application-settings-new/windows/WallpaperWindow.cpp
+++ b/module-apps/application-settings-new/windows/WallpaperWindow.cpp
@@ -6,7 +6,7 @@
 #include "application-settings-new/ApplicationSettings.hpp"
 #include "windows/OptionSetting.hpp"
 
-#include <module-utils/i18n/i18n.hpp>
+#include <i18n/i18n.hpp>
 
 namespace gui
 {
diff --git a/module-apps/application-settings/ApplicationSettings.cpp b/module-apps/application-settings/ApplicationSettings.cpp
index aba674b6d..de198525f 100644
--- a/module-apps/application-settings/ApplicationSettings.cpp
+++ b/module-apps/application-settings/ApplicationSettings.cpp
@@ -26,7 +26,7 @@
 #include "windows/CellularPassthroughWindow.hpp"
 #include "windows/SettingsChange.hpp"
 
-#include <module-utils/i18n/i18n.hpp>
+#include <i18n/i18n.hpp>
 #include <service-evtmgr/EventManagerServiceAPI.hpp>
 #include <service-bluetooth/BluetoothMessage.hpp>
 #include <service-db/Settings.hpp>
diff --git a/module-apps/application-settings/windows/BtScanWindow.cpp b/module-apps/application-settings/windows/BtScanWindow.cpp
index f715dccb9..fcf2c1713 100644
--- a/module-apps/application-settings/windows/BtScanWindow.cpp
+++ b/module-apps/application-settings/windows/BtScanWindow.cpp
@@ -8,7 +8,7 @@
 
 #include "../ApplicationSettings.hpp"
 
-#include "module-utils/i18n/i18n.hpp"
+#include <i18n/i18n.hpp>
 
 #include "BtScanWindow.hpp"
 #include "Label.hpp"
diff --git a/module-apps/application-settings/windows/BtWindow.cpp b/module-apps/application-settings/windows/BtWindow.cpp
index 836bb771f..e134f4075 100644
--- a/module-apps/application-settings/windows/BtWindow.cpp
+++ b/module-apps/application-settings/windows/BtWindow.cpp
@@ -9,7 +9,7 @@
 #include "../ApplicationSettings.hpp"
 #include "../windows/BtScanWindow.hpp"
 
-#include "module-utils/i18n/i18n.hpp"
+#include <i18n/i18n.hpp>
 
 #include "BtWindow.hpp"
 #include "Label.hpp"
diff --git a/module-apps/application-settings/windows/CellularPassthroughWindow.cpp b/module-apps/application-settings/windows/CellularPassthroughWindow.cpp
index f2e19b480..f6f02801f 100644
--- a/module-apps/application-settings/windows/CellularPassthroughWindow.cpp
+++ b/module-apps/application-settings/windows/CellularPassthroughWindow.cpp
@@ -2,7 +2,7 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "CellularPassthroughWindow.hpp"
-#include <module-utils/i18n/i18n.hpp>
+#include <i18n/i18n.hpp>
 #include <module-bsp/bsp/cellular/bsp_cellular.hpp>
 #include "Label.hpp"
 #include <cassert>
diff --git a/module-apps/application-settings/windows/DateTimeWindow.cpp b/module-apps/application-settings/windows/DateTimeWindow.cpp
index 5bf5b8ce6..8c806cc60 100644
--- a/module-apps/application-settings/windows/DateTimeWindow.cpp
+++ b/module-apps/application-settings/windows/DateTimeWindow.cpp
@@ -16,7 +16,7 @@
 #include "../ApplicationSettings.hpp"
 #include "DateTimeWindow.hpp"
 
-#include "module-utils/i18n/i18n.hpp"
+#include <i18n/i18n.hpp>
 #include "time/time_conversion.hpp"
 #include "time/time_date_validation.hpp"
 
diff --git a/module-apps/application-settings/windows/EinkModeWindow.cpp b/module-apps/application-settings/windows/EinkModeWindow.cpp
index 1c000691b..442f1f109 100644
--- a/module-apps/application-settings/windows/EinkModeWindow.cpp
+++ b/module-apps/application-settings/windows/EinkModeWindow.cpp
@@ -10,7 +10,7 @@
 #include "service-appmgr/Controller.hpp"
 #include "../ApplicationSettings.hpp"
 
-#include "module-utils/i18n/i18n.hpp"
+#include <i18n/i18n.hpp>
 
 #include "Label.hpp"
 #include "Margins.hpp"
diff --git a/module-apps/application-settings/windows/FotaWindow.cpp b/module-apps/application-settings/windows/FotaWindow.cpp
index 9b3864b45..95dd4b619 100644
--- a/module-apps/application-settings/windows/FotaWindow.cpp
+++ b/module-apps/application-settings/windows/FotaWindow.cpp
@@ -5,7 +5,7 @@
 
 #include "Fota.hpp"
 
-#include <module-utils/i18n/i18n.hpp>
+#include <i18n/i18n.hpp>
 
 namespace gui
 {
diff --git a/module-apps/application-settings/windows/Info.cpp b/module-apps/application-settings/windows/Info.cpp
index f0eeff5ca..1aadd4252 100644
--- a/module-apps/application-settings/windows/Info.cpp
+++ b/module-apps/application-settings/windows/Info.cpp
@@ -14,7 +14,8 @@
 #include <gui/widgets/Margins.hpp>
 #include <gui/widgets/Style.hpp>
 
-#include <module-utils/i18n/i18n.hpp>
+#include <i18n/i18n.hpp>
+#include <vfs.hpp>
 
 namespace gui
 {
diff --git a/module-apps/application-settings/windows/LanguageWindow.cpp b/module-apps/application-settings/windows/LanguageWindow.cpp
index 0cc82745c..cdc624de5 100644
--- a/module-apps/application-settings/windows/LanguageWindow.cpp
+++ b/module-apps/application-settings/windows/LanguageWindow.cpp
@@ -7,7 +7,7 @@
 
 #include "../ApplicationSettings.hpp"
 
-#include "module-utils/i18n/i18n.hpp"
+#include <i18n/i18n.hpp>
 
 #include "Label.hpp"
 #include "LanguageWindow.hpp"
diff --git a/module-apps/application-settings/windows/SettingsChange.cpp b/module-apps/application-settings/windows/SettingsChange.cpp
index e60ace1bc..73a48a0f3 100644
--- a/module-apps/application-settings/windows/SettingsChange.cpp
+++ b/module-apps/application-settings/windows/SettingsChange.cpp
@@ -3,7 +3,7 @@
 
 #include "SettingsChange.hpp"
 #include "../ApplicationSettings.hpp"
-#include "module-utils/i18n/i18n.hpp"
+#include <i18n/i18n.hpp>
 #include "tools/Common.hpp"
 #include <widgets/Text.hpp>
 #include <widgets/TextFixedSize.hpp>
diff --git a/module-apps/application-settings/windows/SettingsMainWindow.cpp b/module-apps/application-settings/windows/SettingsMainWindow.cpp
index 13de55180..ca95dc8df 100644
--- a/module-apps/application-settings/windows/SettingsMainWindow.cpp
+++ b/module-apps/application-settings/windows/SettingsMainWindow.cpp
@@ -4,7 +4,7 @@
 #include "SettingsMainWindow.hpp"
 #include "../ApplicationSettings.hpp"
 #include "Info.hpp"
-#include "module-utils/i18n/i18n.hpp"
+#include <i18n/i18n.hpp>
 #include "log/log.hpp"
 #include "CellularPassthroughWindow.hpp"
 #include "FotaWindow.hpp"
diff --git a/module-apps/application-settings/windows/SimSelectWindow.cpp b/module-apps/application-settings/windows/SimSelectWindow.cpp
index 7684ad689..5c41d6e93 100644
--- a/module-apps/application-settings/windows/SimSelectWindow.cpp
+++ b/module-apps/application-settings/windows/SimSelectWindow.cpp
@@ -4,7 +4,7 @@
 #include "SimSelectWindow.hpp"
 #include "Info.hpp"
 #include "SettingsMainWindow.hpp"
-#include "module-utils/i18n/i18n.hpp"
+#include <i18n/i18n.hpp>
 #include "log/log.hpp"
 #include <common_data/EventStore.hpp>
 #include <service-db/DBServiceAPI.hpp>
diff --git a/module-apps/application-settings/windows/TestMessageWindow.cpp b/module-apps/application-settings/windows/TestMessageWindow.cpp
index e1f47f51a..2e7b5b78a 100644
--- a/module-apps/application-settings/windows/TestMessageWindow.cpp
+++ b/module-apps/application-settings/windows/TestMessageWindow.cpp
@@ -15,7 +15,7 @@
 
 #include "../ApplicationSettings.hpp"
 
-#include "module-utils/i18n/i18n.hpp"
+#include <i18n/i18n.hpp>
 
 #include "Label.hpp"
 #include "Margins.hpp"
diff --git a/module-apps/application-settings/windows/UITestWindow.cpp b/module-apps/application-settings/windows/UITestWindow.cpp
index 871caa8a5..8eb06b83f 100644
--- a/module-apps/application-settings/windows/UITestWindow.cpp
+++ b/module-apps/application-settings/windows/UITestWindow.cpp
@@ -5,7 +5,7 @@
 #include "../ApplicationSettings.hpp"
 #include "Label.hpp"
 #include "Margins.hpp"
-#include "module-utils/i18n/i18n.hpp"
+#include <i18n/i18n.hpp>
 #include "log/log.hpp"
 #include "messages/AppMessage.hpp"
 #include <service-appmgr/model/ApplicationManager.hpp>
diff --git a/module-apps/application-special-input/windows/SpecialInputMainWindow.cpp b/module-apps/application-special-input/windows/SpecialInputMainWindow.cpp
index 8701bb5bb..11d40e3f7 100644
--- a/module-apps/application-special-input/windows/SpecialInputMainWindow.cpp
+++ b/module-apps/application-special-input/windows/SpecialInputMainWindow.cpp
@@ -5,7 +5,7 @@
 #include "../ApplicationSpecialInput.hpp"
 #include "Style.hpp"
 #include "messages/AppMessage.hpp"
-#include <module-utils/i18n/i18n.hpp>
+#include <i18n/i18n.hpp>
 #include <cassert>
 
 using namespace gui;
diff --git a/module-apps/widgets/BrightnessBox.cpp b/module-apps/widgets/BrightnessBox.cpp
index a46c5202e..059ce6d7e 100644
--- a/module-apps/widgets/BrightnessBox.cpp
+++ b/module-apps/widgets/BrightnessBox.cpp
@@ -1,7 +1,7 @@
 // Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include <module-utils/i18n/i18n.hpp>
+#include <i18n/i18n.hpp>
 #include "BightnessBox.hpp"
 
 namespace gui
diff --git a/module-apps/widgets/ButtonOnOff.cpp b/module-apps/widgets/ButtonOnOff.cpp
index 688c2db0b..9be17b9f2 100644
--- a/module-apps/widgets/ButtonOnOff.cpp
+++ b/module-apps/widgets/ButtonOnOff.cpp
@@ -4,7 +4,7 @@
 #include "ButtonOnOff.hpp"
 
 #include <Style.hpp>
-#include <module-utils/i18n/i18n.hpp>
+#include <i18n/i18n.hpp>
 
 namespace gui
 {
diff --git a/module-apps/widgets/ModesBox.cpp b/module-apps/widgets/ModesBox.cpp
index c729aa102..4fb8e45b9 100644
--- a/module-apps/widgets/ModesBox.cpp
+++ b/module-apps/widgets/ModesBox.cpp
@@ -1,7 +1,7 @@
 // Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include <module-utils/i18n/i18n.hpp>
+#include <i18n/i18n.hpp>
 #include "ModesBox.hpp"
 
 namespace gui
diff --git a/module-apps/windows/AppWindow.cpp b/module-apps/windows/AppWindow.cpp
index bb515cda5..2cd8fcfcc 100644
--- a/module-apps/windows/AppWindow.cpp
+++ b/module-apps/windows/AppWindow.cpp
@@ -6,7 +6,7 @@
 #include "InputEvent.hpp"
 #include <Style.hpp>
 #include <application-desktop/ApplicationDesktop.hpp>
-#include <module-utils/i18n/i18n.hpp>
+#include <i18n/i18n.hpp>
 #include <service-appmgr/Controller.hpp>
 #include <service-audio/AudioServiceAPI.hpp>
 
diff --git a/module-apps/windows/Dialog.cpp b/module-apps/windows/Dialog.cpp
index 7d88600bf..b2b4a4f14 100644
--- a/module-apps/windows/Dialog.cpp
+++ b/module-apps/windows/Dialog.cpp
@@ -4,7 +4,7 @@
 #include "Dialog.hpp"
 #include "DialogMetadataMessage.hpp"
 #include <service-appmgr/model/ApplicationManager.hpp>
-#include <module-utils/i18n/i18n.hpp>
+#include <i18n/i18n.hpp>
 
 using namespace gui;
 
diff --git a/module-apps/windows/OptionWindow.cpp b/module-apps/windows/OptionWindow.cpp
index 50811c753..70c7e3549 100644
--- a/module-apps/windows/OptionWindow.cpp
+++ b/module-apps/windows/OptionWindow.cpp
@@ -4,7 +4,7 @@
 #include "OptionWindow.hpp"
 #include "Label.hpp"
 #include "Margins.hpp"
-#include "module-utils/i18n/i18n.hpp"
+#include <i18n/i18n.hpp>
 #include "log/log.hpp"
 #include <service-appmgr/model/ApplicationManager.hpp>
 #include <Style.hpp>
diff --git a/module-apps/windows/Options.cpp b/module-apps/windows/Options.cpp
index d3c60fc2e..29473cb93 100644
--- a/module-apps/windows/Options.cpp
+++ b/module-apps/windows/Options.cpp
@@ -5,7 +5,7 @@
 #include "Text.hpp"
 #include "tools/Common.hpp"
 #include <cassert>
-#include <module-utils/i18n/i18n.hpp>
+#include <i18n/i18n.hpp>
 #include <utility>
 #include <FontManager.hpp>
 
diff --git a/module-apps/windows/VolumeWindow.cpp b/module-apps/windows/VolumeWindow.cpp
index 547eec7ba..3e045e0bf 100644
--- a/module-apps/windows/VolumeWindow.cpp
+++ b/module-apps/windows/VolumeWindow.cpp
@@ -2,7 +2,7 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include <module-gui/gui/input/InputEvent.hpp>
-#include <module-utils/i18n/i18n.hpp>
+#include <i18n/i18n.hpp>
 #include "VolumeWindow.hpp"
 
 namespace gui
diff --git a/module-db/Database/sqlite3vfs.cpp b/module-db/Database/sqlite3vfs.cpp
index ccbf35c3f..68419bd44 100644
--- a/module-db/Database/sqlite3vfs.cpp
+++ b/module-db/Database/sqlite3vfs.cpp
@@ -119,6 +119,7 @@
 #include <errno.h>
 #include <memory>
 #include <cstring>
+#include <filesystem>
 
 #include "FreeRTOS.h"
 #include "task.h"
diff --git a/module-db/Interface/ContactRecord.hpp b/module-db/Interface/ContactRecord.hpp
index a99367c23..31891fc93 100644
--- a/module-db/Interface/ContactRecord.hpp
+++ b/module-db/Interface/ContactRecord.hpp
@@ -7,7 +7,7 @@
 #include <Common/Query.hpp>
 #include <Tables/ContactsGroups.hpp>
 
-#include "module-utils/i18n/i18n.hpp"
+#include <i18n/i18n.hpp>
 #include "Record.hpp"
 #include "utf8/UTF8.hpp"
 
@@ -19,6 +19,7 @@
 #include <memory>
 #include <optional>
 #include <set>
+#include <sstream>
 
 struct ContactRecord : public Record
 {
diff --git a/module-db/Interface/SettingsRecord.hpp b/module-db/Interface/SettingsRecord.hpp
index 6a025d49b..5f0326598 100644
--- a/module-db/Interface/SettingsRecord.hpp
+++ b/module-db/Interface/SettingsRecord.hpp
@@ -7,7 +7,7 @@
 #include "utf8/UTF8.hpp"
 #include "../Common/Common.hpp"
 #include "../Databases/SettingsDB.hpp"
-#include "module-utils/i18n/i18n.hpp"
+#include <i18n/i18n.hpp>
 
 struct SettingsRecord
 {
diff --git a/module-db/Tables/SettingsTable.hpp b/module-db/Tables/SettingsTable.hpp
index 331a4b98c..738e1399b 100644
--- a/module-db/Tables/SettingsTable.hpp
+++ b/module-db/Tables/SettingsTable.hpp
@@ -7,7 +7,7 @@
 #include "Database/Database.hpp"
 #include "utf8/UTF8.hpp"
 #include "Common/Common.hpp"
-#include "module-utils/i18n/i18n.hpp"
+#include <i18n/i18n.hpp>
 
 struct SettingsTableRow
 {
diff --git a/module-db/tests/ContactsRecord_tests.cpp b/module-db/tests/ContactsRecord_tests.cpp
index 2efe98aee..3379fb659 100644
--- a/module-db/tests/ContactsRecord_tests.cpp
+++ b/module-db/tests/ContactsRecord_tests.cpp
@@ -4,7 +4,7 @@
 #include <catch2/catch.hpp>
 
 #include "Interface/ContactRecord.hpp"
-#include "module-utils/i18n/i18n.hpp"
+#include <i18n/i18n.hpp>
 #include "vfs.hpp"
 #include <purefs/filesystem_paths.hpp>
 
diff --git a/module-gui/CMakeLists.txt b/module-gui/CMakeLists.txt
index b5d64b4a2..ab493dcb0 100644
--- a/module-gui/CMakeLists.txt
+++ b/module-gui/CMakeLists.txt
@@ -19,10 +19,9 @@ include(gui/widgets/CMakeLists.txt)
 include(gui/input/CMakeLists.txt)
 include(gui/dom/CMakeLists.txt)
 
-include_directories( ../module-vfs )
 include_directories( ../module-utils )
 
-target_link_libraries(${PROJECT_NAME} PUBLIC module-utils module-vfs ${TARGET_LIBRARIES} )
+target_link_libraries(${PROJECT_NAME} PUBLIC module-utils ${TARGET_LIBRARIES} )
 
 # Board specific compilation definitions,options,include directories and features
 target_compile_definitions(${PROJECT_NAME} PUBLIC ${PROJECT_CONFIG_DEFINITIONS})
diff --git a/module-gui/gui/core/FontManager.cpp b/module-gui/gui/core/FontManager.cpp
index 4b7a8c60f..6907589cb 100644
--- a/module-gui/gui/core/FontManager.cpp
+++ b/module-gui/gui/core/FontManager.cpp
@@ -6,7 +6,9 @@
 #include "FontInfo.hpp" // for FontInfo
 #include "RawFont.hpp"  // for RawFont
 #include "log/log.hpp"  // for LOG_ERROR, LOG_INFO, LOG_WARN
-#include "vfs.hpp"      // for vfs, vfs::DirectoryEntry, vfs::FileAttributes
+#include <Utils.hpp>
+#include <filesystem>
+#include <cstdio>
 
 namespace style::window::font
 {
@@ -42,23 +44,24 @@ namespace gui
     RawFont *FontManager::loadFont(std::string filename)
     {
 
-        auto file = vfs.fopen(filename.c_str(), "rb");
+        auto file = std::fopen(filename.c_str(), "rb");
 
-        auto fileSize = vfs.filelength(file);
+        auto fileSize = utils::filesystem::filelength(file);
+        std::rewind(file);
 
         char *fontData = new char[fileSize];
         if (fontData == nullptr) {
-            vfs.fclose(file);
+            std::fclose(file);
             LOG_ERROR(" Failed to allocate temporary font buffer");
             return nullptr;
         }
 
         // read data to buffer
-        auto bytesRead = vfs.fread(fontData, 1, fileSize, file);
+        auto bytesRead = std::fread(fontData, 1, fileSize, file);
 
         // close file
-        vfs.fclose(file);
-        if (bytesRead != fileSize) {
+        std::fclose(file);
+        if (static_cast<long>(bytesRead) != fileSize) {
             LOG_ERROR("Failed to read all file");
             delete[] fontData;
             return nullptr;
@@ -96,11 +99,10 @@ namespace gui
         std::vector<std::string> fontFiles;
 
         LOG_INFO("Scanning fonts folder: %s", fontFolder.c_str());
-        auto dirList = vfs.listdir(fontFolder.c_str());
 
-        for (vfs::DirectoryEntry ent : dirList) {
-            if ((ent.attributes != vfs::FileAttributes::Directory) && hasEnding(ent.fileName, ".mpf")) {
-                fontFiles.push_back(fontFolder + "/" + ent.fileName);
+        for (const auto &entry : std::filesystem::directory_iterator(fontFolder)) {
+            if (!std::filesystem::is_directory(entry) && entry.path().extension() == ".mpf") {
+                fontFiles.push_back(entry.path().string());
             }
         }
 
diff --git a/module-gui/gui/core/ImageManager.cpp b/module-gui/gui/core/ImageManager.cpp
index 57d93bad6..9ad42b0dc 100644
--- a/module-gui/gui/core/ImageManager.cpp
+++ b/module-gui/gui/core/ImageManager.cpp
@@ -11,7 +11,9 @@
 #include <set>
 #include <string>
 
+#include <cstdio>
 #include <cstring>
+#include <filesystem>
 
 #include "ImageManager.hpp"
 #include "utf8/UTF8.hpp"
@@ -20,7 +22,7 @@
 #include "ImageMap.hpp"
 #include "VecMap.hpp"
 #include "PixMap.hpp"
-#include "vfs.hpp"
+#include <Utils.hpp>
 
 namespace gui
 {
@@ -82,22 +84,22 @@ namespace gui
     ImageMap *ImageManager::loadPixMap(std::string filename)
     {
 
-        auto file = vfs.fopen(filename.c_str(), "rb");
+        auto file = std::fopen(filename.c_str(), "rb");
 
-        auto fileSize = vfs.filelength(file);
+        auto fileSize = utils::filesystem::filelength(file);
 
         char *data = new char[fileSize];
         if (data == nullptr) {
-            vfs.fclose(file);
+            std::fclose(file);
             LOG_ERROR(" Failed to allocate temporary font buffer");
             return nullptr;
         }
 
         // read data to buffer
-        vfs.fread(data, 1, fileSize, file);
+        std::fread(data, 1, fileSize, file);
 
         // close file
-        vfs.fclose(file);
+        std::fclose(file);
 
         // allocate memory for new font
         PixMap *pixMap = new PixMap();
@@ -126,22 +128,22 @@ namespace gui
     ImageMap *ImageManager::loadVecMap(std::string filename)
     {
 
-        auto file = vfs.fopen(filename.c_str(), "rb");
+        auto file = std::fopen(filename.c_str(), "rb");
 
-        auto fileSize = vfs.filelength(file);
+        auto fileSize = utils::filesystem::filelength(file);
 
         char *data = new char[fileSize];
         if (data == nullptr) {
-            vfs.fclose(file);
+            std::fclose(file);
             LOG_ERROR(" Failed to allocate temporary font buffer");
             return nullptr;
         }
 
         // read data to buffer
-        vfs.fread(data, 1, fileSize, file);
+        std::fread(data, 1, fileSize, file);
 
         // close file
-        vfs.fclose(file);
+        std::fclose(file);
 
         VecMap *vecMap = new VecMap();
         if (vecMap->load(reinterpret_cast<uint8_t *>(data), fileSize) != gui::Status::GUI_SUCCESS) {
@@ -171,11 +173,11 @@ namespace gui
         std::vector<std::string> mapFiles;
 
         LOG_INFO("Scanning %s images folder: %s", ext.c_str(), mapFolder.c_str());
-        auto dirList = vfs.listdir(mapFolder.c_str(), ext);
 
-        for (vfs::DirectoryEntry ent : dirList) {
-            if (ent.attributes != vfs::FileAttributes::Directory)
-                mapFiles.push_back(mapFolder + "/" + ent.fileName);
+        for (const auto &entry : std::filesystem::directory_iterator(mapFolder)) {
+            if (!entry.is_directory() && entry.path().extension() == ext) {
+                mapFiles.push_back(entry.path().string());
+            }
         }
 
         LOG_INFO("Total number of images: %u", static_cast<unsigned int>(mapFiles.size()));
diff --git a/module-gui/gui/input/Profile.cpp b/module-gui/gui/input/Profile.cpp
index c2ecc3e6f..59610003a 100644
--- a/module-gui/gui/input/Profile.cpp
+++ b/module-gui/gui/input/Profile.cpp
@@ -7,19 +7,14 @@
 #include <sstream>
 #include "log/log.hpp"
 #include "utf8/UTF8.hpp"
-#include "vfs.hpp"
 #include "Profile.hpp"
+#include <Utils.hpp>
 
 namespace gui
 {
 
     const uint32_t KeyProfile::none_key = 0;
 
-    KeyProfile::KeyProfile()
-    {}
-    KeyProfile::~KeyProfile()
-    {}
-
     Profile::Profile(const std::string &name)
     {
         LOG_INFO("Create!");
@@ -67,9 +62,19 @@ namespace gui
         return elems;
     }
 
-    bool Profile::load(std::string filename)
+    void Profile::clear()
     {
-        auto file = vfs.fopen(filename.c_str(), "rb");
+        keys.clear();
+    }
+
+    std::string Profile::getName() const noexcept
+    {
+        return name;
+    }
+
+    bool Profile::load(const std::string &filename)
+    {
+        auto file = std::fopen(filename.c_str(), "rb");
 
         if (file == nullptr) {
             LOG_FATAL("no KeyProfile file: %s", filename.c_str());
@@ -89,9 +94,8 @@ namespace gui
 
         KeyProfile *pk = nullptr;
         KeyProfile tmp;
-        while (vfs.eof(file) != true) {
-
-            std::string line = trim(vfs.getline(file));
+        while (std::feof(file) != true) {
+            const auto line = trim(utils::filesystem::getline(file));
             if ((line[0] == '#') || (line.empty())) {
                 continue;
             }
@@ -141,7 +145,7 @@ namespace gui
             }
         }
 
-        vfs.fclose(file);
+        std::fclose(file);
 
         return true;
     }
@@ -177,7 +181,7 @@ namespace gui
         return elems;
     }
 
-    void Profile::addCharacters(KeyProfile *pk, const std::string &s)
+    void Profile::addCharacters(KeyProfile *pk, const std::string &s) const
     {
 
         uint32_t charKey;
@@ -203,7 +207,7 @@ namespace gui
             }
         }
     }
-    void Profile::addTimeouts(KeyProfile *pk, const std::string &s)
+    void Profile::addTimeouts(KeyProfile *pk, const std::string &s) const
     {
         uint32_t timeout;
         std::vector<std::string> vec = split(s, ',');
@@ -219,7 +223,12 @@ namespace gui
             keys.insert(std::pair<uint32_t, KeyProfile *>(pk->keyCode, pk));
     }
 
-    const KeyProfile *Profile::getKeyProfile(uint32_t keyCode)
+    void Profile::setName(const std::string &name)
+    {
+        this->name = name;
+    }
+
+    const KeyProfile *Profile::getKeyProfile(uint32_t keyCode) const
     {
         auto key = keys.find(keyCode);
         if (key != keys.end())
diff --git a/module-gui/gui/input/Profile.hpp b/module-gui/gui/input/Profile.hpp
index 777b5ddbd..43acde04d 100644
--- a/module-gui/gui/input/Profile.hpp
+++ b/module-gui/gui/input/Profile.hpp
@@ -15,12 +15,10 @@ namespace gui
         static const uint32_t none_key; /// defaults to 0
         uint32_t keyCode = none_key;
         bool cyclic      = false;
-        ;
         std::vector<uint32_t> chars;
         std::vector<uint32_t> timeouts;
 
-        KeyProfile();
-        virtual ~KeyProfile();
+        virtual ~KeyProfile() = default;
 
         void addCharacters(const std::string &s);
         void addTimeouts(const std::string &s);
@@ -31,30 +29,21 @@ namespace gui
         std::string name;
         std::map<uint32_t, KeyProfile *> keys = {};
 
-        void addCharacters(KeyProfile *pk, const std::string &s);
-        void addTimeouts(KeyProfile *pk, const std::string &s);
+        void addCharacters(KeyProfile *pk, const std::string &s) const;
+        void addTimeouts(KeyProfile *pk, const std::string &s) const;
         void addKeyProfile(KeyProfile *pk);
-        void setName(std::string name)
-        {
-            this->name = name;
-        };
-        const KeyProfile *getKeyProfile(uint32_t keyCode);
+        void setName(const std::string &name);
+        const KeyProfile *getKeyProfile(uint32_t keyCode) const;
 
       public:
-        void clear()
-        {
-            this->keys.clear();
-        };
+        void clear();
         Profile() = default;
         Profile(const std::string &name);
         Profile(Profile &&p);
         virtual ~Profile();
 
-        std::string getName()
-        {
-            return name;
-        };
-        bool load(std::string filename);
+        [[nodiscard]] std::string getName() const noexcept;
+        bool load(const std::string &filename);
 
         uint32_t get(bsp::KeyCodes code, uint32_t times);
     };
diff --git a/module-gui/gui/input/Translator.cpp b/module-gui/gui/input/Translator.cpp
index c5cf4db5c..022563fde 100644
--- a/module-gui/gui/input/Translator.cpp
+++ b/module-gui/gui/input/Translator.cpp
@@ -3,8 +3,9 @@
 
 #include "Translator.hpp"
 #include "log/log.hpp"
-#include "vfs.hpp"
 #include <algorithm>
+#include <log/log.hpp>
+#include <filesystem>
 
 namespace gui
 {
@@ -182,4 +183,60 @@ namespace gui
         return Profiles::get(keymap).get(key.key_code, times);
     }
 
+    void Profiles::loadProfile(const std::string &filepath)
+    {
+        LOG_INFO("Load profile: %s", filepath.c_str());
+        auto p = Profile(filepath);
+        if (p.getName() != std::string()) {
+            profiles.insert({p.getName(), std::move(p)});
+        }
+    }
+    std::vector<std::string> Profiles::getProfilesList(std::string ext)
+    {
+        std::vector<std::string> profileFiles;
+        LOG_INFO("Scanning %s profiles folder: %s", ext.c_str(), profilesFolder);
+
+        for (const auto &entry : std::filesystem::directory_iterator(profilesFolder)) {
+            if (!std::filesystem::is_directory(entry) && entry.path().extension().string() == ext) {
+                profileFiles.push_back(entry.path().string());
+            }
+        }
+
+        LOG_INFO("Total number of profiles: %u", static_cast<unsigned int>(profileFiles.size()));
+        return profileFiles;
+    }
+
+    void Profiles::init()
+    {
+        std::vector<std::string> profileFiles = getProfilesList(".kprof");
+        for (std::string mapName : profileFiles) {
+            if (std::size(mapName)) {
+                loadProfile(mapName);
+            }
+        }
+        if (std::size(profiles) == 0) {
+            LOG_ERROR("No keyboard profiles loaded");
+        }
+    }
+    Profiles &Profiles::get()
+    {
+        static Profiles *p;
+        if (p == nullptr) {
+            p = new Profiles();
+            p->init();
+        }
+        return *p;
+    }
+    Profile &Profiles::get(const std::string &name)
+    {
+        // if profile not in profile map -> load
+        if (std::size(name) == 0) {
+            LOG_ERROR("Request for non existend profile: %s", name.c_str());
+            return get().empty;
+        }
+        if (get().profiles.find(name) == get().profiles.end()) {
+            get().loadProfile(name);
+        }
+        return get().profiles[name];
+    }
 } /* namespace gui */
diff --git a/module-gui/gui/input/Translator.hpp b/module-gui/gui/input/Translator.hpp
index 595ea9e11..bd761fa0d 100644
--- a/module-gui/gui/input/Translator.hpp
+++ b/module-gui/gui/input/Translator.hpp
@@ -12,7 +12,6 @@
 #include <string>
 #include <vector>
 #include <common_data/RawKey.hpp>
-#include <vfs.hpp>
 
 namespace gui
 {
@@ -71,69 +70,15 @@ namespace gui
       private:
         const char *profilesFolder                   = "assets/profiles";
         std::map<std::string, gui::Profile> profiles = {};
-
-        void loadProfile(const std::string &filepath)
-        {
-            LOG_INFO("Load profile: %s", filepath.c_str());
-            auto p = Profile(filepath);
-            if (p.getName() != std::string()) {
-                profiles.insert({p.getName(), std::move(p)});
-            }
-        }
-
-        std::vector<std::string> getProfilesList(std::string ext)
-        {
-            std::vector<std::string> profileFiles;
-            LOG_INFO("Scanning %s profiles folder: %s", ext.c_str(), profilesFolder);
-            auto dirList = vfs.listdir(profilesFolder, ext);
-
-            for (vfs::DirectoryEntry ent : dirList) {
-                if (ent.attributes != vfs::FileAttributes::Directory) {
-                    profileFiles.push_back(std::string(profilesFolder) + "/" + ent.fileName);
-                }
-            }
-
-            LOG_INFO("Total number of profiles: %u", static_cast<unsigned int>(profileFiles.size()));
-            return profileFiles;
-        }
-
-        void init()
-        {
-            std::vector<std::string> profileFiles = getProfilesList(".kprof");
-            for (std::string mapName : profileFiles) {
-                if (std::size(mapName)) {
-                    loadProfile(mapName);
-                }
-            }
-            if (std::size(profiles) == 0) {
-                LOG_ERROR("No keyboard profiles loaded");
-            }
-        }
         Profile empty;
 
-      public:
-        static Profiles &get()
-        {
-            static Profiles *p;
-            if (p == nullptr) {
-                p = new Profiles();
-                p->init();
-            }
-            return *p;
-        }
+        void loadProfile(const std::string &filepath);
+        std::vector<std::string> getProfilesList(std::string ext);
+        void init();
 
-        static Profile &get(const std::string &name)
-        {
-            // if profile not in profile map -> load
-            if (std::size(name) == 0) {
-                LOG_ERROR("Request for non existend profile: %s", name.c_str());
-                return get().empty;
-            }
-            if (get().profiles.find(name) == get().profiles.end()) {
-                get().loadProfile(name);
-            }
-            return get().profiles[name];
-        }
+      public:
+        static Profiles &get();
+        static Profile &get(const std::string &name);
     };
 
 } /* namespace gui */
diff --git a/module-gui/gui/widgets/Icon.cpp b/module-gui/gui/widgets/Icon.cpp
index 266688a45..092e97655 100644
--- a/module-gui/gui/widgets/Icon.cpp
+++ b/module-gui/gui/widgets/Icon.cpp
@@ -3,7 +3,7 @@
 
 #include "Icon.hpp"
 #include "TextParse.hpp"
-#include <module-utils/i18n/i18n.hpp>
+#include <i18n/i18n.hpp>
 #include <Style.hpp>
 #include <Font.hpp>
 
diff --git a/module-gui/gui/widgets/InputMode.cpp b/module-gui/gui/widgets/InputMode.cpp
index 8dd7195b6..6c7b28244 100644
--- a/module-gui/gui/widgets/InputMode.cpp
+++ b/module-gui/gui/widgets/InputMode.cpp
@@ -2,8 +2,9 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include <InputMode.hpp>
-#include <module-utils/i18n/i18n.hpp>
+#include <i18n/i18n.hpp>
 #include <map>
+#include <log/log.hpp>
 
 /// input mode strings - as these are stored in json (in files...)
 const std::map<InputMode::Mode, std::string> input_mode = {
diff --git a/module-gui/gui/widgets/Text.cpp b/module-gui/gui/widgets/Text.cpp
index 77ff76206..2cc05a3d3 100644
--- a/module-gui/gui/widgets/Text.cpp
+++ b/module-gui/gui/widgets/Text.cpp
@@ -17,7 +17,6 @@
 #include "TextParse.hpp"
 #include "log/log.hpp"
 #include "utf8/UTF8.hpp"
-#include "vfs.hpp"
 #include <Style.hpp>
 #include <cassert>
 #include <FontManager.hpp>
@@ -192,10 +191,10 @@ namespace gui
 
     bool Text::saveText(UTF8 path)
     {
-        if (auto file = vfs.fopen(path.c_str(), "wb")) {
+        if (auto file = std::fopen(path.c_str(), "wb")) {
             auto text = getText();
-            vfs.fwrite(text.c_str(), text.length(), text.length(), file);
-            vfs.fclose(file);
+            std::fwrite(text.c_str(), text.length(), text.length(), file);
+            std::fclose(file);
             return true;
         }
         return false;
diff --git a/module-gui/test/test-catch-text/CMakeLists.txt b/module-gui/test/test-catch-text/CMakeLists.txt
index 185425796..bfeba15e9 100644
--- a/module-gui/test/test-catch-text/CMakeLists.txt
+++ b/module-gui/test/test-catch-text/CMakeLists.txt
@@ -20,7 +20,6 @@ add_catch2_executable(
                 ../mock/
         LIBS
                 module-gui
-                module-vfs
         DEPS
                 assets
 )
diff --git a/module-gui/test/test-catch-text/main.cpp b/module-gui/test/test-catch-text/main.cpp
index 074f23bb3..6e4116214 100644
--- a/module-gui/test/test-catch-text/main.cpp
+++ b/module-gui/test/test-catch-text/main.cpp
@@ -4,7 +4,7 @@
 #define CATCH_CONFIG_MAIN
 #include <catch2/catch.hpp>
 #include <vfs.hpp>
-#include <module-utils/i18n/i18n.hpp>
+#include <i18n/i18n.hpp>
 
 class vfs vfs;        // needed for compilation, our vfs is global
 utils::i18n localize; // needed to load any keymap - these are stored in i18
diff --git a/module-gui/test/test-catch-text/test-gui-Text.cpp b/module-gui/test/test-catch-text/test-gui-Text.cpp
index 2f8e04dd7..e5463b9f6 100644
--- a/module-gui/test/test-catch-text/test-gui-Text.cpp
+++ b/module-gui/test/test-catch-text/test-gui-Text.cpp
@@ -6,7 +6,7 @@
 #include "Common.hpp"
 #include "InitializedFontManager.hpp"
 #include "TextParse.hpp"
-#include "module-utils/i18n/i18n.hpp"
+#include <i18n/i18n.hpp>
 #include "mock/InitializedFontManager.hpp"
 #include <catch2/catch.hpp>
 #include <limits>
diff --git a/module-gui/test/test-google/CMakeLists.txt b/module-gui/test/test-google/CMakeLists.txt
index 87b52c739..622387689 100644
--- a/module-gui/test/test-google/CMakeLists.txt
+++ b/module-gui/test/test-google/CMakeLists.txt
@@ -12,13 +12,12 @@ target_include_directories(${PROJECT_NAME}
         PUBLIC
         "${CMAKE_CURRENT_LIST_DIR}"
         "${CMAKE_SOURCE_DIR}/module-utils"
-        "${CMAKE_SOURCE_DIR}/module-vfs"
         "${CMAKE_SOURCE_DIR}/module-gui/test/"
         )
 
 target_link_directories(${PROJECT_NAME} PUBLIC "${PROJECT_LIB_DIRECTORY}")
 
-target_link_libraries(${PROJECT_NAME} PUBLIC module-vfs module-utils module-gui)
+target_link_libraries(${PROJECT_NAME} PUBLIC module-utils module-gui)
 
 target_link_libraries(${PROJECT_NAME} PUBLIC gtest gtest_main)
 
diff --git a/module-services/service-appmgr/model/ApplicationManager.cpp b/module-services/service-appmgr/model/ApplicationManager.cpp
index 66547e704..358f85da5 100644
--- a/module-services/service-appmgr/model/ApplicationManager.cpp
+++ b/module-services/service-appmgr/model/ApplicationManager.cpp
@@ -13,7 +13,7 @@
 #include <SystemManager/SystemManager.hpp>
 #include <application-call/ApplicationCall.hpp>
 #include <application-special-input/ApplicationSpecialInput.hpp>
-#include <module-utils/i18n/i18n.hpp>
+#include <i18n/i18n.hpp>
 #include <log/log.hpp>
 #include <service-appmgr/messages/Message.hpp>
 #include <service-db/DBServiceAPI.hpp>
diff --git a/module-services/service-appmgr/service-appmgr/Controller.hpp b/module-services/service-appmgr/service-appmgr/Controller.hpp
index ac10e8ecd..82afb9b03 100644
--- a/module-services/service-appmgr/service-appmgr/Controller.hpp
+++ b/module-services/service-appmgr/service-appmgr/Controller.hpp
@@ -10,7 +10,7 @@
 #include <module-sys/Service/Service.hpp>
 #include <SwitchData.hpp>
 
-#include <module-utils/i18n/i18n.hpp>
+#include <i18n/i18n.hpp>
 
 #include <memory>
 #include <string>
diff --git a/module-services/service-appmgr/service-appmgr/messages/LanguageChangeRequest.hpp b/module-services/service-appmgr/service-appmgr/messages/LanguageChangeRequest.hpp
index 2855e5ad2..e75cd72f2 100644
--- a/module-services/service-appmgr/service-appmgr/messages/LanguageChangeRequest.hpp
+++ b/module-services/service-appmgr/service-appmgr/messages/LanguageChangeRequest.hpp
@@ -5,7 +5,7 @@
 
 #include "BaseMessage.hpp"
 
-#include <module-utils/i18n/i18n.hpp>
+#include <i18n/i18n.hpp>
 
 namespace app::manager
 {
diff --git a/module-services/service-db/test/test-service-db-settings-api.cpp b/module-services/service-db/test/test-service-db-settings-api.cpp
index 64df8e993..156a24f00 100644
--- a/module-services/service-db/test/test-service-db-settings-api.cpp
+++ b/module-services/service-db/test/test-service-db-settings-api.cpp
@@ -18,6 +18,7 @@
 #include "test-service-db-settings-testmsgs.hpp"
 #include "test-service-db-settings-testservices.hpp"
 #include "test-service-db-settings-testapps.hpp"
+#include <vfs.hpp>
 
 struct vfs_initializer
 {
diff --git a/module-services/service-desktop/endpoints/factoryReset/FactoryReset.cpp b/module-services/service-desktop/endpoints/factoryReset/FactoryReset.cpp
index 2b9c8d576..b8c2116a6 100644
--- a/module-services/service-desktop/endpoints/factoryReset/FactoryReset.cpp
+++ b/module-services/service-desktop/endpoints/factoryReset/FactoryReset.cpp
@@ -2,7 +2,9 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "FactoryReset.hpp"
-
+#ifndef TARGET_Linux
+#include <FreeRTOSFATConfig.h>
+#endif
 #include <SystemManager/SystemManager.hpp>
 #include <log/log.hpp>
 #include <purefs/filesystem_paths.hpp>
@@ -13,6 +15,8 @@
 #include <filesystem>
 #include <memory>
 #include <vector>
+#include <purefs/filesystem_paths.hpp>
+#include <purefs/fs/filesystem.hpp>
 
 namespace sys
 {
@@ -21,6 +25,11 @@ namespace sys
 
 namespace FactoryReset
 {
+    namespace
+    {
+        inline constexpr auto copy_buf = 8192 * 4;
+    } // namespace
+
     static bool CopyFile(std::string sourcefile, std::string targetfile);
 
     static int recurseDepth             = 0;
@@ -78,7 +87,7 @@ namespace FactoryReset
                 delpath += direntry.path().string().c_str();
 
                 if (std::filesystem::is_directory(direntry)) {
-                    if (direntry.path().string().compare(PATH_FACTORY) != 0) {
+                    if (direntry.path().string().compare(purefs::dir::getFactoryOSPath()) != 0) {
                         LOG_INFO("FactoryReset: recursively deleting dir %s...", delpath.c_str());
                         try {
                             std::filesystem::remove_all(delpath.c_str());
@@ -176,15 +185,15 @@ namespace FactoryReset
         std::unique_ptr<std::FILE, decltype(lamb)> tf(std::fopen(targetfile.c_str(), "w"), lamb);
 
         if ((sf.get() != nullptr) && (tf.get() != nullptr)) {
-            std::unique_ptr<unsigned char[]> buffer(new unsigned char[purefs::buffer::copy_buf]);
+            std::unique_ptr<unsigned char[]> buffer(new unsigned char[copy_buf]);
 
             if (buffer.get() != nullptr) {
-                uint32_t loopcount = (utils::filesystem::filelength(sf.get()) / purefs::buffer::copy_buf) + 1u;
-                uint32_t readsize  = purefs::buffer::copy_buf;
+                uint32_t loopcount = (utils::filesystem::filelength(sf.get()) / copy_buf) + 1u;
+                uint32_t readsize  = copy_buf;
 
                 for (uint32_t i = 0u; i < loopcount; i++) {
                     if (i + 1u == loopcount) {
-                        readsize = utils::filesystem::filelength(sf.get()) % purefs::buffer::copy_buf;
+                        readsize = utils::filesystem::filelength(sf.get()) % copy_buf;
                     }
 
                     if (std::fread(buffer.get(), 1, readsize, sf.get()) != readsize) {
diff --git a/module-services/service-gui/ServiceGUI.cpp b/module-services/service-gui/ServiceGUI.cpp
index c0beb943e..f6eaf379e 100644
--- a/module-services/service-gui/ServiceGUI.cpp
+++ b/module-services/service-gui/ServiceGUI.cpp
@@ -37,6 +37,7 @@ extern "C"
 #include <list>
 #include <memory>
 #include <utility>
+#include <purefs/filesystem_paths.hpp>
 
 namespace sgui
 {
@@ -52,10 +53,10 @@ namespace sgui
         transferContext = new gui::Context(screenWidth, screenHeight);
 
         gui::FontManager &fontManager = gui::FontManager::getInstance();
-        fontManager.init("assets");
+        fontManager.init(purefs::dir::getCurrentOSPath() / "assets");
 
         gui::ImageManager &imageManager = gui::ImageManager::getInstance();
-        imageManager.init("assets");
+        imageManager.init(purefs::dir::getCurrentOSPath() / "assets");
 
         connect(typeid(sgui::DrawMessage),
                 [&](sys::Message *request) -> sys::MessagePointer { return handleDrawMessage(request); });
diff --git a/module-services/service-gui/ServiceGUI.hpp b/module-services/service-gui/ServiceGUI.hpp
index c8696e8a1..26d1aaaca 100644
--- a/module-services/service-gui/ServiceGUI.hpp
+++ b/module-services/service-gui/ServiceGUI.hpp
@@ -9,8 +9,6 @@
 #include <gui/core/Context.hpp>
 #include <gui/core/Renderer.hpp>
 #include <gui/input/Translator.hpp>
-#include <queue.h>
-#include <semphr.h>
 #include <Service/Common.hpp>
 #include <Service/Message.hpp>
 #include <Service/Service.hpp>
diff --git a/module-utils/Utils.cpp b/module-utils/Utils.cpp
index 45951f85c..34b589297 100644
--- a/module-utils/Utils.cpp
+++ b/module-utils/Utils.cpp
@@ -2,16 +2,26 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "Utils.hpp"
+#include <purefs/fs/filesystem.hpp>
+#include <crc32/crc32.h>
 
 namespace utils::filesystem
 {
+    namespace
+    {
+        inline constexpr auto crc_buf = 1024;
+    } // namespace
+
     long int filelength(std::FILE *file) noexcept
     {
         if (file == nullptr) {
             return 0;
         }
+        const auto startPosition = std::ftell(file);
         std::fseek(file, 0, SEEK_END);
-        return std::ftell(file);
+        const auto endPosition = std::ftell(file);
+        std::fseek(file, startPosition, SEEK_SET);
+        return endPosition;
     }
 
     void computeCRC32(std::FILE *file, unsigned long *outCrc32) noexcept
@@ -19,13 +29,13 @@ namespace utils::filesystem
         if (outCrc32 == nullptr)
             return;
 
-        auto buf = std::make_unique<unsigned char[]>(purefs::buffer::crc_buf);
+        auto buf = std::make_unique<unsigned char[]>(crc_buf);
         size_t bufLen;
 
         *outCrc32 = 0;
 
         while (!std::feof(file)) {
-            bufLen = std::fread(buf.get(), 1, purefs::buffer::crc_buf, file);
+            bufLen = std::fread(buf.get(), 1, crc_buf, file);
             if (bufLen <= 0)
                 break;
 
@@ -50,4 +60,29 @@ namespace utils::filesystem
 
         return random_string;
     }
+
+    std::string getline(std::FILE *stream, uint32_t length) noexcept
+    {
+        std::uint32_t currentPosition = std::ftell(stream);
+
+        // allocate memory to read number of signs defined by length param. Size of buffer is increased by 1 to add
+        // string's null terminator.
+        auto buffer = std::make_unique<char[]>(length + 1);
+
+        std::uint32_t bytesRead = std::fread(buffer.get(), 1, length, stream);
+
+        // search buffer for /n sign
+        constexpr auto newLineSign = 0x0A;
+        for (std::uint32_t i = 0; i < bytesRead; ++i) {
+            if (buffer[i] == newLineSign) {
+                buffer[i] = 0;
+                std::fseek(stream, currentPosition + i + 1, SEEK_SET);
+                break;
+            }
+        }
+
+        std::string ret = std::string(buffer.get());
+
+        return ret;
+    }
 } // namespace utils::filesystem
diff --git a/module-utils/Utils.hpp b/module-utils/Utils.hpp
index 37b5e967e..55fe81daf 100644
--- a/module-utils/Utils.hpp
+++ b/module-utils/Utils.hpp
@@ -2,14 +2,15 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #pragma once
-#include "module-utils/i18n/i18n.hpp"
+#include "i18n/i18n.hpp"
 #include <algorithm> // std::find_if_not
 #include <log/log.hpp>
 #include <sstream>
 #include <iomanip>
 #include <cmath>
+#include <chrono>
 #include <random>
-#include "module-utils/time/time_conversion.hpp"
+#include "time/time_conversion.hpp"
 
 #define MAGIC_ENUM_RANGE_MAX 256
 #include <magic_enum.hpp>
@@ -245,9 +246,8 @@ namespace utils
     namespace filesystem
     {
         [[nodiscard]] long int filelength(std::FILE *file) noexcept;
-
         void computeCRC32(std::FILE *file, unsigned long *outCrc32) noexcept;
-
         [[nodiscard]] std::string generateRandomId(std::size_t length = 0) noexcept;
+        [[nodiscard]] std::string getline(std::FILE *stream, uint32_t length = 1024) noexcept;
     } // namespace filesystem
 } // namespace utils
diff --git a/module-utils/i18n/i18n.cpp b/module-utils/i18n/i18n.cpp
index 65e78e441..0d7076dd6 100644
--- a/module-utils/i18n/i18n.cpp
+++ b/module-utils/i18n/i18n.cpp
@@ -1,7 +1,12 @@
 // Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
+#include "log/log.hpp"
 #include "i18n.hpp"
+#include "Utils.hpp"
+#include <cstdio>
+#include <filesystem>
+#include <purefs/filesystem_paths.hpp>
 
 namespace utils
 {
@@ -19,26 +24,23 @@ namespace utils
     i18n localize;
     json11::Json LangLoader::createJson(const std::string &filename)
     {
-        const fs::path path = LanguageDirPath / (filename + extension);
-        auto fd             = vfs.fopen(path.c_str(), "r");
+        const auto path = LanguageDirPath / (filename + extension);
+        auto fd         = std::fopen(path.c_str(), "r");
         if (fd == nullptr) {
             LOG_FATAL("Error during opening file %s", path.c_str());
             return json11::Json();
         }
 
-        uint32_t fsize = vfs.filelength(fd);
+        uint32_t fsize = utils::filesystem::filelength(fd);
 
-        auto stream = new char[fsize + 1]; // +1 for NULL terminator
+        auto stream = std::make_unique<char[]>(fsize + 1); // +1 for NULL terminator
 
-        memset(stream, 0, fsize + 1);
-
-        vfs.fread(stream, 1, fsize, fd);
+        std::fread(stream.get(), 1, fsize, fd);
 
         std::string err;
-        json11::Json js = json11::Json::parse(stream, err);
+        json11::Json js = json11::Json::parse(stream.get(), err);
 
-        delete[] stream;
-        vfs.fclose(fd);
+        std::fclose(fd);
 
         // Error
         if (err.length() != 0) {
@@ -53,8 +55,8 @@ namespace utils
     std::vector<Language> LangLoader::getAvailableDisplayLanguages() const
     {
         std::vector<std::string> languageNames;
-        for (const auto &entry : fs::directory_iterator(LanguageDirPath)) {
-            languageNames.push_back(fs::path(entry.path()).stem());
+        for (const auto &entry : std::filesystem::directory_iterator(LanguageDirPath)) {
+            languageNames.push_back(std::filesystem::path(entry.path()).stem());
         }
         return languageNames;
     }
diff --git a/module-utils/i18n/i18n.hpp b/module-utils/i18n/i18n.hpp
index 4f1fdfcc2..f8525baae 100644
--- a/module-utils/i18n/i18n.hpp
+++ b/module-utils/i18n/i18n.hpp
@@ -5,9 +5,6 @@
 #include "json/json11.hpp"
 #include <string>
 #include <vfs.hpp>
-#include "log/log.hpp"
-
-#include "thread.hpp"
 
 using Language = std::string;
 
@@ -16,10 +13,7 @@ namespace utils
     class LangLoader
     {
       public:
-        LangLoader()
-        {}
-        virtual ~LangLoader()
-        {}
+        virtual ~LangLoader() = default;
         std::vector<Language> getAvailableDisplayLanguages() const;
         json11::Json createJson(const std::string &filename);
     };
@@ -38,14 +32,8 @@ namespace utils
 
       public:
         static constexpr auto DefaultLanguage = "English";
-        // Default constructor, left empty on purpose
-        i18n()
-        {}
 
-        // Explicit initialization point, default constructor is omitted. This is because LangLoader uses file system
-        // which is not available at program's startup.
-        virtual ~i18n()
-        {}
+        virtual ~i18n() = default;
         void setInputLanguage(const Language &lang);
         const std::string &getInputLanguage(const std::string &str);
         const std::string &get(const std::string &str);
diff --git a/module-utils/test/test_time_conversion.cpp b/module-utils/test/test_time_conversion.cpp
index 19ce7a555..347ac1cc6 100644
--- a/module-utils/test/test_time_conversion.cpp
+++ b/module-utils/test/test_time_conversion.cpp
@@ -5,6 +5,8 @@
 #include <time/time_conversion.hpp>
 #include <algorithm>
 #include <thread.hpp>
+#include <vfs.hpp>
+#include "i18n/i18n.hpp"
 
 namespace
 {
diff --git a/module-utils/test/unittest_duration.cpp b/module-utils/test/unittest_duration.cpp
index 721638fd4..f33393ed0 100644
--- a/module-utils/test/unittest_duration.cpp
+++ b/module-utils/test/unittest_duration.cpp
@@ -4,6 +4,7 @@
 #include <cstring>
 #include <iostream>
 #include <memory>
+#include <vfs.hpp>
 #include <unistd.h>
 
 #include "time/time_conversion.hpp"
diff --git a/module-utils/test/unittest_utils.cpp b/module-utils/test/unittest_utils.cpp
index 557825ccb..77b476c33 100644
--- a/module-utils/test/unittest_utils.cpp
+++ b/module-utils/test/unittest_utils.cpp
@@ -11,6 +11,7 @@
 #include <catch2/catch.hpp>
 
 #include "Utils.hpp"
+#include <vfs.hpp>
 
 class vfs vfs;
 
diff --git a/module-utils/time/time_conversion.cpp b/module-utils/time/time_conversion.cpp
index 283992e4f..8533fdcd9 100644
--- a/module-utils/time/time_conversion.cpp
+++ b/module-utils/time/time_conversion.cpp
@@ -14,7 +14,7 @@
 #include <ctime>
 #include <iomanip>
 #include <locale>
-#include <module-utils/i18n/i18n.hpp>
+#include "i18n/i18n.hpp"
 
 #include "time_locale.hpp"
 #include <Utils.hpp>
diff --git a/module-utils/time/time_locale.hpp b/module-utils/time/time_locale.hpp
index 0def99ceb..29b0a6e37 100644
--- a/module-utils/time/time_locale.hpp
+++ b/module-utils/time/time_locale.hpp
@@ -5,7 +5,7 @@
 
 #include <array>
 #include <utf8/UTF8.hpp>
-#include <module-utils/i18n/i18n.hpp>
+#include "i18n/i18n.hpp"
 #include <log/log.hpp>
 
 namespace utils