190 files changed, 317 insertions(+), 321 deletions(-)

M module-apps/CMakeLists.txt
M module-apps/application-desktop/windows/MenuWindow.cpp
M module-apps/application-onboarding/ApplicationOnBoarding.cpp
M module-apps/application-onboarding/windows/OnBoardingChangeDateAndTimeWindow.hpp
M module-apps/application-onboarding/windows/OnBoardingDateAndTimeWindow.hpp
M module-apps/application-onboarding/windows/OnBoardingLanguagesWindow.hpp
M module-apps/application-onboarding/windows/OnBoardingSimSelectWindow.hpp
R module-apps/{application-settings-new => application-settings}/ApplicationSettings.cpp
R module-apps/{application-settings-new => application-settings}/ApplicationSettings.hpp
R module-apps/{application-settings-new => application-settings}/CMakeLists.txt
R module-apps/{application-settings-new => application-settings}/data/ApnListData.hpp
R module-apps/{application-settings-new => application-settings}/data/AutoLockData.hpp
R module-apps/{application-settings-new => application-settings}/data/BluetoothStatusData.hpp
R module-apps/{application-settings-new => application-settings}/data/BondedDevicesData.hpp
R module-apps/{application-settings-new => application-settings}/data/ChangePasscodeData.hpp
R module-apps/{application-settings-new => application-settings}/data/DeviceData.hpp
R module-apps/{application-settings-new => application-settings}/data/LanguagesData.hpp
R module-apps/{application-settings-new => application-settings}/data/PINSettingsLockStateData.hpp
R module-apps/{application-settings-new => application-settings}/data/PINSettingsSimData.hpp
R module-apps/{application-settings-new => application-settings}/data/PairingDeviceData.hpp
R module-apps/{application-settings-new => application-settings}/data/PhoneNameData.hpp
R module-apps/{application-settings-new => application-settings}/data/QuoteSwitchData.hpp
R module-apps/{application-settings-new => application-settings}/data/SettingsInternals.hpp
R module-apps/{application-settings-new => application-settings}/data/SettingsItemData.hpp
R module-apps/{application-settings-new => application-settings}/data/SoundSelectData.hpp
R module-apps/{application-settings-new => application-settings}/models/AbstractSoundsModel.hpp
R module-apps/{application-settings-new => application-settings}/models/ApnSettingsModel.cpp
R module-apps/{application-settings-new => application-settings}/models/ApnSettingsModel.hpp
R module-apps/{application-settings-new => application-settings}/models/AudioSettingsModel.cpp
R module-apps/{application-settings-new => application-settings}/models/AudioSettingsModel.hpp
R module-apps/{application-settings-new => application-settings}/models/BluetoothSettingsModel.cpp
R module-apps/{application-settings-new => application-settings}/models/BluetoothSettingsModel.hpp
R module-apps/{application-settings-new => application-settings}/models/CategoriesModel.cpp
R module-apps/{application-settings-new => application-settings}/models/CategoriesModel.hpp
R module-apps/{application-settings-new => application-settings}/models/DateAndTimeModel.cpp
R module-apps/{application-settings-new => application-settings}/models/DateAndTimeModel.hpp
R module-apps/{application-settings-new => application-settings}/models/FactoryData.cpp
R module-apps/{application-settings-new => application-settings}/models/FactoryData.hpp
R module-apps/{application-settings-new => application-settings}/models/FromTimeToTimeModel.cpp
R module-apps/{application-settings-new => application-settings}/models/FromTimeToTimeModel.hpp
R module-apps/{application-settings-new => application-settings}/models/NewApnModel.cpp
R module-apps/{application-settings-new => application-settings}/models/NewApnModel.hpp
R module-apps/{application-settings-new => application-settings}/models/QuotesModel.cpp
R module-apps/{application-settings-new => application-settings}/models/QuotesModel.hpp
R module-apps/{application-settings-new => application-settings}/models/SARInfoRepository.cpp
R module-apps/{application-settings-new => application-settings}/models/SARInfoRepository.hpp
R module-apps/{application-settings-new => application-settings}/models/SoundsModel.cpp
R module-apps/{application-settings-new => application-settings}/models/SoundsModel.hpp
R module-apps/{application-settings-new => application-settings}/models/advanced/ColorTestModel.cpp
R module-apps/{application-settings-new => application-settings}/models/advanced/ColorTestModel.hpp
R module-apps/{application-settings-new => application-settings}/presenter/SARInfoWindowPresenter.cpp
R module-apps/{application-settings-new => application-settings}/presenter/SARInfoWindowPresenter.hpp
R module-apps/{application-settings-new => application-settings}/presenter/TechnicalWindowPresenter.cpp
R module-apps/{application-settings-new => application-settings}/presenter/TechnicalWindowPresenter.hpp
R module-apps/{application-settings-new => application-settings}/widgets/ApnInputWidget.cpp
R module-apps/{application-settings-new => application-settings}/widgets/ApnInputWidget.hpp
R module-apps/{application-settings-new => application-settings}/widgets/ApnListItem.hpp
R module-apps/{application-settings-new => application-settings}/widgets/CategoryWidget.cpp
R module-apps/{application-settings-new => application-settings}/widgets/CategoryWidget.hpp
R module-apps/{application-settings-new => application-settings}/widgets/QuoteWidget.cpp
R module-apps/{application-settings-new => application-settings}/widgets/QuoteWidget.hpp
R module-apps/{application-settings-new => application-settings}/widgets/SettingsDateItem.cpp
R module-apps/{application-settings-new => application-settings}/widgets/SettingsDateItem.hpp
R module-apps/{application-settings-new => application-settings}/widgets/SettingsSoundItem.cpp
R module-apps/{application-settings-new => application-settings}/widgets/SettingsSoundItem.hpp
R module-apps/{application-settings-new => application-settings}/widgets/SettingsStyle.hpp
R module-apps/{application-settings-new => application-settings}/widgets/SettingsTimeItem.cpp
R module-apps/{application-settings-new => application-settings}/widgets/SettingsTimeItem.hpp
R module-apps/{application-settings-new => application-settings}/widgets/SpinBox.cpp
R module-apps/{application-settings-new => application-settings}/widgets/SpinBox.hpp
R module-apps/{application-settings-new => application-settings}/widgets/SpinBoxOptionSettings.cpp
R module-apps/{application-settings-new => application-settings}/widgets/SpinBoxOptionSettings.hpp
R module-apps/{application-settings-new => application-settings}/widgets/advanced/ColorTestListItem.cpp
R module-apps/{application-settings-new => application-settings}/widgets/advanced/ColorTestListItem.hpp
R module-apps/{application-settings-new => application-settings}/widgets/advanced/ColorTestListStyle.hpp
R module-apps/{application-settings-new => application-settings}/widgets/advanced/ColorTestListView.cpp
R module-apps/{application-settings-new => application-settings}/widgets/advanced/ColorTestListView.hpp
R module-apps/{application-settings-new => application-settings}/windows/AboutYourPureWindow.cpp
R module-apps/{application-settings-new => application-settings}/windows/AboutYourPureWindow.hpp
R module-apps/{application-settings-new => application-settings}/windows/AddDeviceWindow.cpp
R module-apps/{application-settings-new => application-settings}/windows/AddDeviceWindow.hpp
R module-apps/{application-settings-new => application-settings}/windows/AlarmClockWindow.cpp
R module-apps/{application-settings-new => application-settings}/windows/AlarmClockWindow.hpp
R module-apps/{application-settings-new => application-settings}/windows/AllDevicesWindow.cpp
R module-apps/{application-settings-new => application-settings}/windows/AllDevicesWindow.hpp
R module-apps/{application-settings-new => application-settings}/windows/ApnOptionsWindow.cpp
R module-apps/{application-settings-new => application-settings}/windows/ApnOptionsWindow.hpp
R module-apps/{application-settings-new => application-settings}/windows/ApnSettingsWindow.cpp
R module-apps/{application-settings-new => application-settings}/windows/ApnSettingsWindow.hpp
R module-apps/{application-settings-new => application-settings}/windows/AppsAndToolsWindow.cpp
R module-apps/{application-settings-new => application-settings}/windows/AppsAndToolsWindow.hpp
R module-apps/{application-settings-new => application-settings}/windows/AutolockWindow.cpp
R module-apps/{application-settings-new => application-settings}/windows/AutolockWindow.hpp
R module-apps/{application-settings-new => application-settings}/windows/BaseSettingsWindow.cpp
R module-apps/{application-settings-new => application-settings}/windows/BaseSettingsWindow.hpp
R module-apps/{application-settings-new => application-settings}/windows/BluetoothCheckPasskeyWindow.cpp
R module-apps/{application-settings-new => application-settings}/windows/BluetoothCheckPasskeyWindow.hpp
R module-apps/{application-settings-new => application-settings}/windows/BluetoothWindow.cpp
R module-apps/{application-settings-new => application-settings}/windows/BluetoothWindow.hpp
R module-apps/{application-settings-new => application-settings}/windows/CallRingtoneWindow.cpp
R module-apps/{application-settings-new => application-settings}/windows/CertificationWindow.cpp
R module-apps/{application-settings-new => application-settings}/windows/CertificationWindow.hpp
R module-apps/{application-settings-new => application-settings}/windows/ChangeDateAndTimeWindow.cpp
R module-apps/{application-settings-new => application-settings}/windows/ChangeDateAndTimeWindow.hpp
R module-apps/{application-settings-new => application-settings}/windows/ChangeTimeZone.cpp
R module-apps/{application-settings-new => application-settings}/windows/ChangeTimeZone.hpp
R module-apps/{application-settings-new => application-settings}/windows/ConnectionFrequencyWindow.cpp
R module-apps/{application-settings-new => application-settings}/windows/ConnectionFrequencyWindow.hpp
R module-apps/{application-settings-new => application-settings}/windows/DateAndTimeMainWindow.cpp
R module-apps/{application-settings-new => application-settings}/windows/DateAndTimeMainWindow.hpp
R module-apps/{application-settings-new => application-settings}/windows/DisplayAndKeypadWindow.cpp
R module-apps/{application-settings-new => application-settings}/windows/DisplayAndKeypadWindow.hpp
R module-apps/{application-settings-new => application-settings}/windows/DisplayLightWindow.cpp
R module-apps/{application-settings-new => application-settings}/windows/DisplayLightWindow.hpp
R module-apps/{application-settings-new => application-settings}/windows/DoNotDisturbWindow.cpp
R module-apps/{application-settings-new => application-settings}/windows/DoNotDisturbWindow.hpp
R module-apps/{application-settings-new => application-settings}/windows/EditQuotesWindow.cpp
R module-apps/{application-settings-new => application-settings}/windows/EditQuotesWindow.hpp
R module-apps/{application-settings-new => application-settings}/windows/FontSizeWindow.cpp
R module-apps/{application-settings-new => application-settings}/windows/FontSizeWindow.hpp
R module-apps/{application-settings-new => application-settings}/windows/InputLanguageWindow.cpp
R module-apps/{application-settings-new => application-settings}/windows/InputLanguageWindow.hpp
R module-apps/{application-settings-new => application-settings}/windows/KeypadLightWindow.cpp
R module-apps/{application-settings-new => application-settings}/windows/KeypadLightWindow.hpp
R module-apps/{application-settings-new => application-settings}/windows/LanguagesWindow.cpp
R module-apps/{application-settings-new => application-settings}/windows/LanguagesWindow.hpp
R module-apps/{application-settings-new => application-settings}/windows/LockedScreenWindow.cpp
R module-apps/{application-settings-new => application-settings}/windows/LockedScreenWindow.hpp
R module-apps/{application-settings-new => application-settings}/windows/MessageSoundWindow.cpp
R module-apps/{application-settings-new => application-settings}/windows/MessagesWindow.cpp
R module-apps/{application-settings-new => application-settings}/windows/MessagesWindow.hpp
R module-apps/{application-settings-new => application-settings}/windows/NetworkWindow.cpp
R module-apps/{application-settings-new => application-settings}/windows/NetworkWindow.hpp
R module-apps/{application-settings-new => application-settings}/windows/NewApnWindow.cpp
R module-apps/{application-settings-new => application-settings}/windows/NewApnWindow.hpp
R module-apps/{application-settings-new => application-settings}/windows/NightshiftWindow.cpp
R module-apps/{application-settings-new => application-settings}/windows/NightshiftWindow.hpp
R module-apps/{application-settings-new => application-settings}/windows/NotificationSoundWindow.cpp
R module-apps/{application-settings-new => application-settings}/windows/OfflineWindow.cpp
R module-apps/{application-settings-new => application-settings}/windows/OfflineWindow.hpp
R module-apps/{application-settings-new => application-settings}/windows/OptionsWidgetMaker.cpp
R module-apps/{application-settings-new => application-settings}/windows/OptionsWidgetMaker.hpp
R module-apps/{application-settings-new => application-settings}/windows/PINSettingsWindow.cpp
R module-apps/{application-settings-new => application-settings}/windows/PINSettingsWindow.hpp
R module-apps/{application-settings-new => application-settings}/windows/PhoneModesWindow.cpp
R module-apps/{application-settings-new => application-settings}/windows/PhoneModesWindow.hpp
R module-apps/{application-settings-new => application-settings}/windows/PhoneNameWindow.cpp
R module-apps/{application-settings-new => application-settings}/windows/PhoneNameWindow.hpp
R module-apps/{application-settings-new => application-settings}/windows/PhoneWindow.cpp
R module-apps/{application-settings-new => application-settings}/windows/PhoneWindow.hpp
R module-apps/{application-settings-new => application-settings}/windows/QuoteCategoriesWindow.cpp
R module-apps/{application-settings-new => application-settings}/windows/QuoteCategoriesWindow.hpp
R module-apps/{application-settings-new => application-settings}/windows/QuotesAddWindow.cpp
R module-apps/{application-settings-new => application-settings}/windows/QuotesAddWindow.hpp
R module-apps/{application-settings-new => application-settings}/windows/QuotesMainWindow.cpp
R module-apps/{application-settings-new => application-settings}/windows/QuotesMainWindow.hpp
R module-apps/{application-settings-new => application-settings}/windows/QuotesOptionsWindow.cpp
R module-apps/{application-settings-new => application-settings}/windows/QuotesOptionsWindow.hpp
R module-apps/{application-settings-new => application-settings}/windows/SARInfoWindow.cpp
R module-apps/{application-settings-new => application-settings}/windows/SARInfoWindow.hpp
R module-apps/{application-settings-new => application-settings}/windows/SecurityMainWindow.cpp
R module-apps/{application-settings-new => application-settings}/windows/SecurityMainWindow.hpp
R module-apps/{application-settings-new => application-settings}/windows/SettingsMainWindow.cpp
R module-apps/{application-settings-new => application-settings}/windows/SettingsMainWindow.hpp
R module-apps/{application-settings-new => application-settings}/windows/SoundSelectWindow.cpp
R module-apps/{application-settings-new => application-settings}/windows/SoundSelectWindow.hpp
R module-apps/{application-settings-new => application-settings}/windows/SystemMainWindow.cpp
R module-apps/{application-settings-new => application-settings}/windows/SystemMainWindow.hpp
R module-apps/{application-settings-new => application-settings}/windows/TechnicalInformationWindow.cpp
R module-apps/{application-settings-new => application-settings}/windows/TechnicalInformationWindow.hpp
R module-apps/{application-settings-new => application-settings}/windows/TorchWindow.cpp
R module-apps/{application-settings-new => application-settings}/windows/TorchWindow.hpp
R module-apps/{application-settings-new => application-settings}/windows/WallpaperWindow.cpp
R module-apps/{application-settings-new => application-settings}/windows/WallpaperWindow.hpp
R module-apps/{application-settings-new => application-settings}/windows/advanced/AdvancedOptionsWindow.cpp
R module-apps/{application-settings-new => application-settings}/windows/advanced/AdvancedOptionsWindow.hpp
R module-apps/{application-settings-new => application-settings}/windows/advanced/ColorTestWindow.cpp
R module-apps/{application-settings-new => application-settings}/windows/advanced/ColorTestWindow.hpp
R module-apps/{application-settings-new => application-settings}/windows/advanced/EinkModeWindow.cpp
R module-apps/{application-settings-new => application-settings}/windows/advanced/EinkModeWindow.hpp
R module-apps/{application-settings-new => application-settings}/windows/advanced/InformationWindow.cpp
R module-apps/{application-settings-new => application-settings}/windows/advanced/InformationWindow.hpp
R module-apps/{application-settings-new => application-settings}/windows/advanced/UITestWindow.cpp
R module-apps/{application-settings-new => application-settings}/windows/advanced/UITestWindow.hpp
M module-bluetooth/Bluetooth/interface/profiles/GAP/GAP.cpp
M module-services/service-bluetooth/ServiceBluetooth.cpp
M products/BellHybrid/BellHybridMain.cpp
M products/PurePhone/PurePhoneMain.cpp
M test/pytest/service-bluetooth/bt_fixtures.py
M test/pytest/test_auto_lock.py

@@ 20,7 20,7 @@ set(APPLICATIONS
     clock
     calendar
     desktop
-    settings-new
+    settings
     call
     notes
     onboarding

@@ 43,7 43,6 @@ namespace
 
 namespace gui
 {
-    inline const auto APP_SETTINGS_NEW = "ApplicationSettingsNew";
     Tile::Tile(UTF8 icon,
                std::string title,
                std::function<bool(Item &)> activatedCallback,


@@ 238,7 237,7 @@ namespace gui
                                   return app::manager::Controller::sendAction(
                                       application,
                                       app::manager::actions::Launch,
-                                      std::make_unique<app::ApplicationLaunchData>(APP_SETTINGS_NEW));
+                                      std::make_unique<app::ApplicationLaunchData>("ApplicationSettings"));
                               }}});
 
         toolsMenu = new MenuPage(

@@ 19,9 19,9 @@
 #include "windows/OnBoardingChangeDateAndTimeWindow.hpp"
 
 #include <module-services/service-appmgr/service-appmgr/messages/GetCurrentDisplayLanguageResponse.hpp>
-#include <module-apps/application-settings-new/data/LanguagesData.hpp>
+#include <module-apps/application-settings/data/LanguagesData.hpp>
 #include <module-services/service-db/agents/settings/SystemSettings.hpp>
-#include <module-apps/application-settings-new/windows/ChangeTimeZone.hpp>
+#include <module-apps/application-settings/windows/ChangeTimeZone.hpp>
 #include <apps-common/locks/data/PhoneLockMessages.hpp>
 #include <apps-common/locks/data/SimLockMessages.hpp>
 #include <service-appmgr/service-appmgr/model/ApplicationManager.hpp>

@@ 3,8 3,8 @@
 
 #pragma once
 
-#include <application-settings-new/windows/ChangeDateAndTimeWindow.hpp>
-#include <application-settings-new/models/DateAndTimeModel.hpp>
+#include <application-settings/windows/ChangeDateAndTimeWindow.hpp>
+#include <application-settings/models/DateAndTimeModel.hpp>
 
 namespace app::onBoarding
 {

@@ 3,7 3,7 @@
 
 #pragma once
 
-#include <module-apps/application-settings-new/windows/DateAndTimeMainWindow.hpp>
+#include <module-apps/application-settings/windows/DateAndTimeMainWindow.hpp>
 
 namespace app::onBoarding
 {

@@ 3,7 3,7 @@
 
 #pragma once
 
-#include <module-apps/application-settings-new/windows/LanguagesWindow.hpp>
+#include <module-apps/application-settings/windows/LanguagesWindow.hpp>
 
 namespace app::onBoarding
 {

@@ 3,7 3,7 @@
 
 #pragma once
 
-#include <application-settings-new/windows/BaseSettingsWindow.hpp>
+#include <application-settings/windows/BaseSettingsWindow.hpp>
 #include <Text.hpp>
 
 namespace app::onBoarding

@@ 3,64 3,64 @@
 
 #include "ApplicationSettings.hpp"
 
-#include <application-settings-new/windows/SettingsMainWindow.hpp>
-#include <application-settings-new/windows/advanced/AdvancedOptionsWindow.hpp>
-#include <application-settings-new/windows/advanced/InformationWindow.hpp>
-#include <application-settings-new/windows/advanced/UITestWindow.hpp>
-#include <application-settings-new/windows/advanced/EinkModeWindow.hpp>
-#include <application-settings-new/windows/advanced/ColorTestWindow.hpp>
-#include <application-settings-new/windows/AddDeviceWindow.hpp>
-#include <application-settings-new/windows/AllDevicesWindow.hpp>
-#include <application-settings-new/windows/ApnSettingsWindow.hpp>
-#include <application-settings-new/windows/ApnOptionsWindow.hpp>
-#include <application-settings-new/windows/BluetoothWindow.hpp>
-#include <application-settings-new/windows/DisplayAndKeypadWindow.hpp>
-#include <application-settings-new/windows/InputLanguageWindow.hpp>
-#include <application-settings-new/windows/LockedScreenWindow.hpp>
-#include <application-settings-new/windows/FontSizeWindow.hpp>
-#include <application-settings-new/windows/DisplayLightWindow.hpp>
-#include <application-settings-new/windows/KeypadLightWindow.hpp>
-#include <application-settings-new/windows/AppsAndToolsWindow.hpp>
-#include <application-settings-new/windows/NightshiftWindow.hpp>
-#include <application-settings-new/windows/NetworkWindow.hpp>
-#include <application-settings-new/windows/PhoneWindow.hpp>
-#include <application-settings-new/windows/MessagesWindow.hpp>
-#include <application-settings-new/windows/AlarmClockWindow.hpp>
-#include <application-settings-new/windows/SoundSelectWindow.hpp>
-#include <application-settings-new/windows/PhoneNameWindow.hpp>
-#include <application-settings-new/windows/AutolockWindow.hpp>
-#include <application-settings-new/windows/TorchWindow.hpp>
-#include <application-settings-new/windows/WallpaperWindow.hpp>
-#include <application-settings-new/windows/QuotesMainWindow.hpp>
-#include <application-settings-new/windows/QuotesAddWindow.hpp>
-#include <application-settings-new/windows/EditQuotesWindow.hpp>
-#include <application-settings-new/windows/QuoteCategoriesWindow.hpp>
-#include <application-settings-new/windows/SecurityMainWindow.hpp>
-#include <application-settings-new/windows/QuotesOptionsWindow.hpp>
-#include <application-settings-new/windows/SARInfoWindow.hpp>
-#include <application-settings-new/windows/SystemMainWindow.hpp>
-#include <application-settings-new/windows/NewApnWindow.hpp>
-#include <application-settings-new/windows/LanguagesWindow.hpp>
-#include <application-settings-new/windows/DateAndTimeMainWindow.hpp>
-#include <application-settings-new/windows/ChangeTimeZone.hpp>
-#include <application-settings-new/windows/ChangeDateAndTimeWindow.hpp>
-#include <application-settings-new/windows/PhoneModesWindow.hpp>
-#include <application-settings-new/windows/PINSettingsWindow.hpp>
-#include <application-settings-new/windows/DoNotDisturbWindow.hpp>
-#include <application-settings-new/windows/OfflineWindow.hpp>
-#include <application-settings-new/windows/ConnectionFrequencyWindow.hpp>
-#include <application-settings-new/windows/AboutYourPureWindow.hpp>
-#include <application-settings-new/windows/CertificationWindow.hpp>
-#include <application-settings-new/windows/TechnicalInformationWindow.hpp>
-#include <application-settings-new/data/ApnListData.hpp>
-#include <application-settings-new/data/BondedDevicesData.hpp>
-#include <application-settings-new/data/BluetoothStatusData.hpp>
-#include <application-settings-new/data/DeviceData.hpp>
-#include <application-settings-new/data/LanguagesData.hpp>
-#include <application-settings-new/data/PhoneNameData.hpp>
-#include <application-settings-new/data/PINSettingsLockStateData.hpp>
-#include <application-settings-new/windows/BluetoothCheckPasskeyWindow.hpp>
-#include <application-settings-new/data/AutoLockData.hpp>
+#include <application-settings/windows/SettingsMainWindow.hpp>
+#include <application-settings/windows/advanced/AdvancedOptionsWindow.hpp>
+#include <application-settings/windows/advanced/InformationWindow.hpp>
+#include <application-settings/windows/advanced/UITestWindow.hpp>
+#include <application-settings/windows/advanced/EinkModeWindow.hpp>
+#include <application-settings/windows/advanced/ColorTestWindow.hpp>
+#include <application-settings/windows/AddDeviceWindow.hpp>
+#include <application-settings/windows/AllDevicesWindow.hpp>
+#include <application-settings/windows/ApnSettingsWindow.hpp>
+#include <application-settings/windows/ApnOptionsWindow.hpp>
+#include <application-settings/windows/BluetoothWindow.hpp>
+#include <application-settings/windows/DisplayAndKeypadWindow.hpp>
+#include <application-settings/windows/InputLanguageWindow.hpp>
+#include <application-settings/windows/LockedScreenWindow.hpp>
+#include <application-settings/windows/FontSizeWindow.hpp>
+#include <application-settings/windows/DisplayLightWindow.hpp>
+#include <application-settings/windows/KeypadLightWindow.hpp>
+#include <application-settings/windows/AppsAndToolsWindow.hpp>
+#include <application-settings/windows/NightshiftWindow.hpp>
+#include <application-settings/windows/NetworkWindow.hpp>
+#include <application-settings/windows/PhoneWindow.hpp>
+#include <application-settings/windows/MessagesWindow.hpp>
+#include <application-settings/windows/AlarmClockWindow.hpp>
+#include <application-settings/windows/SoundSelectWindow.hpp>
+#include <application-settings/windows/PhoneNameWindow.hpp>
+#include <application-settings/windows/AutolockWindow.hpp>
+#include <application-settings/windows/TorchWindow.hpp>
+#include <application-settings/windows/WallpaperWindow.hpp>
+#include <application-settings/windows/QuotesMainWindow.hpp>
+#include <application-settings/windows/QuotesAddWindow.hpp>
+#include <application-settings/windows/EditQuotesWindow.hpp>
+#include <application-settings/windows/QuoteCategoriesWindow.hpp>
+#include <application-settings/windows/SecurityMainWindow.hpp>
+#include <application-settings/windows/QuotesOptionsWindow.hpp>
+#include <application-settings/windows/SARInfoWindow.hpp>
+#include <application-settings/windows/SystemMainWindow.hpp>
+#include <application-settings/windows/NewApnWindow.hpp>
+#include <application-settings/windows/LanguagesWindow.hpp>
+#include <application-settings/windows/DateAndTimeMainWindow.hpp>
+#include <application-settings/windows/ChangeTimeZone.hpp>
+#include <application-settings/windows/ChangeDateAndTimeWindow.hpp>
+#include <application-settings/windows/PhoneModesWindow.hpp>
+#include <application-settings/windows/PINSettingsWindow.hpp>
+#include <application-settings/windows/DoNotDisturbWindow.hpp>
+#include <application-settings/windows/OfflineWindow.hpp>
+#include <application-settings/windows/ConnectionFrequencyWindow.hpp>
+#include <application-settings/windows/AboutYourPureWindow.hpp>
+#include <application-settings/windows/CertificationWindow.hpp>
+#include <application-settings/windows/TechnicalInformationWindow.hpp>
+#include <application-settings/data/ApnListData.hpp>
+#include <application-settings/data/BondedDevicesData.hpp>
+#include <application-settings/data/BluetoothStatusData.hpp>
+#include <application-settings/data/DeviceData.hpp>
+#include <application-settings/data/LanguagesData.hpp>
+#include <application-settings/data/PhoneNameData.hpp>
+#include <application-settings/data/PINSettingsLockStateData.hpp>
+#include <application-settings/windows/BluetoothCheckPasskeyWindow.hpp>
+#include <application-settings/data/AutoLockData.hpp>
 
 #include <service-evtmgr/EventManagerServiceAPI.hpp>
 #include <service-bluetooth/BluetoothMessage.hpp>


@@ 94,10 94,10 @@ namespace app
         constexpr inline auto operators_on = "operators_on";
     } // namespace settings
 
-    ApplicationSettingsNew::ApplicationSettingsNew(std::string name,
-                                                   std::string parent,
-                                                   sys::phone_modes::PhoneMode mode,
-                                                   StartInBackground startInBackground)
+    ApplicationSettings::ApplicationSettings(std::string name,
+                                             std::string parent,
+                                             sys::phone_modes::PhoneMode mode,
+                                             StartInBackground startInBackground)
         : Application(std::move(name), std::move(parent), mode, startInBackground), AsyncCallbackReceiver{this}
     {
         CellularServiceAPI::SubscribeForOwnNumber(this, [&](const std::string &number) {


@@ 110,12 110,12 @@ namespace app
         }
     }
 
-    ApplicationSettingsNew::~ApplicationSettingsNew()
+    ApplicationSettings::~ApplicationSettings()
     {}
 
     // Invoked upon receiving data message
-    auto ApplicationSettingsNew::DataReceivedHandler(sys::DataMessage *msgl,
-                                                     [[maybe_unused]] sys::ResponseMessage *resp) -> sys::MessagePointer
+    auto ApplicationSettings::DataReceivedHandler(sys::DataMessage *msgl, [[maybe_unused]] sys::ResponseMessage *resp)
+        -> sys::MessagePointer
     {
         auto retMsg = Application::DataReceivedHandler(msgl);
         // if message was handled by application's template there is no need to process further.


@@ 142,7 142,7 @@ namespace app
     }
 
     // Invoked during initialization
-    auto ApplicationSettingsNew::InitHandler() -> sys::ReturnCodes
+    auto ApplicationSettings::InitHandler() -> sys::ReturnCodes
     {
         board = EventManagerServiceAPI::GetBoard(this);
 


@@ 331,7 331,7 @@ namespace app
         return ret;
     }
 
-    void ApplicationSettingsNew::createUserInterface()
+    void ApplicationSettings::createUserInterface()
     {
         windowsFactory.attach(gui::name::window::main_window, [](Application *app, const std::string &name) {
             return std::make_unique<gui::OptionWindow>(


@@ 375,13 375,13 @@ namespace app
             return std::make_unique<gui::LockedScreenWindow>(app);
         });
         windowsFactory.attach(gui::window::name::keypad_light, [](Application *app, const std::string &name) {
-            return std::make_unique<gui::KeypadLightWindow>(app, static_cast<ApplicationSettingsNew *>(app));
+            return std::make_unique<gui::KeypadLightWindow>(app, static_cast<ApplicationSettings *>(app));
         });
         windowsFactory.attach(gui::window::name::font_size, [](Application *app, const std::string &name) {
             return std::make_unique<gui::FontSizeWindow>(app);
         });
         windowsFactory.attach(gui::window::name::display_light, [](Application *app, const std::string &name) {
-            return std::make_unique<gui::DisplayLightWindow>(app, static_cast<ApplicationSettingsNew *>(app));
+            return std::make_unique<gui::DisplayLightWindow>(app, static_cast<ApplicationSettings *>(app));
         });
         windowsFactory.attach(gui::window::name::apps_and_tools, [](Application *app, const std::string &name) {
             return std::make_unique<gui::AppsAndToolsWindow>(app);


@@ 391,7 391,7 @@ namespace app
         });
         windowsFactory.attach(gui::window::name::network, [](Application *app, const std::string &name) {
             return std::make_unique<gui::NetworkWindow>(
-                app, static_cast<ApplicationSettingsNew *>(app), static_cast<ApplicationSettingsNew *>(app));
+                app, static_cast<ApplicationSettings *>(app), static_cast<ApplicationSettings *>(app));
         });
         windowsFactory.attach(gui::window::name::apn_settings, [](Application *app, const std::string &name) {
             return std::make_unique<gui::ApnSettingsWindow>(app);


@@ 421,7 421,7 @@ namespace app
             return std::make_unique<gui::PhoneNameWindow>(app);
         });
         windowsFactory.attach(gui::window::name::autolock, [](Application *app, const std::string &name) {
-            return std::make_unique<gui::AutolockWindow>(app, static_cast<ApplicationSettingsNew *>(app));
+            return std::make_unique<gui::AutolockWindow>(app, static_cast<ApplicationSettings *>(app));
         });
         windowsFactory.attach(gui::window::name::torch, [](Application *app, const std::string &name) {
             return std::make_unique<gui::TorchWindow>(app);


@@ 498,16 498,16 @@ namespace app
         });
         windowsFactory.attach(gui::window::name::phone_modes, [](Application *app, const std::string &name) {
             return std::make_unique<gui::PhoneModesWindow>(
-                app, static_cast<ApplicationSettingsNew *>(app), static_cast<ApplicationSettingsNew *>(app));
+                app, static_cast<ApplicationSettings *>(app), static_cast<ApplicationSettings *>(app));
         });
         windowsFactory.attach(gui::window::name::do_not_disturb, [](Application *app, const std::string &name) {
-            return std::make_unique<gui::DoNotDisturbWindow>(app, static_cast<ApplicationSettingsNew *>(app));
+            return std::make_unique<gui::DoNotDisturbWindow>(app, static_cast<ApplicationSettings *>(app));
         });
         windowsFactory.attach(gui::window::name::offline, [](Application *app, const std::string &name) {
-            return std::make_unique<gui::OfflineWindow>(app, static_cast<ApplicationSettingsNew *>(app));
+            return std::make_unique<gui::OfflineWindow>(app, static_cast<ApplicationSettings *>(app));
         });
         windowsFactory.attach(gui::window::name::connection_frequency, [](Application *app, const std::string &name) {
-            return std::make_unique<gui::ConnectionFrequencyWindow>(app, static_cast<ApplicationSettingsNew *>(app));
+            return std::make_unique<gui::ConnectionFrequencyWindow>(app, static_cast<ApplicationSettings *>(app));
         });
         windowsFactory.attach(gui::window::name::bluetooth_check_passkey,
                               [](Application *app, const std::string &name) {


@@ 521,74 521,74 @@ namespace app
                       gui::popup::ID::SimLock});
     }
 
-    void ApplicationSettingsNew::destroyUserInterface()
+    void ApplicationSettings::destroyUserInterface()
     {}
 
-    std::string ApplicationSettingsNew::getNumber()
+    std::string ApplicationSettings::getNumber()
     {
         return selectedSimNumber;
     }
 
-    void ApplicationSettingsNew::setSim(Store::GSM::SIM sim)
+    void ApplicationSettings::setSim(Store::GSM::SIM sim)
     {
         auto arg = (sim == Store::GSM::SIM::SIM2) ? cellular::api::SimSlot::SIM2 : cellular::api::SimSlot::SIM1;
         getSimLockSubject().setSim(arg);
     }
 
-    void ApplicationSettingsNew::updateSim()
+    void ApplicationSettings::updateSim()
     {
         selectedSim = Store::GSM::get()->selected;
     }
 
-    Store::GSM::SIM ApplicationSettingsNew::getSim()
+    Store::GSM::SIM ApplicationSettings::getSim()
     {
         return selectedSim;
     }
 
-    void ApplicationSettingsNew::operatorOnChanged(const std::string &value)
+    void ApplicationSettings::operatorOnChanged(const std::string &value)
     {
-        LOG_DEBUG("[ApplicationSettingsNew::operatorOnChanged] value=%s", value.c_str());
+        LOG_DEBUG("[ApplicationSettings::operatorOnChanged] value=%s", value.c_str());
         if (!value.empty()) {
             operatorsOn = utils::getNumericValue<bool>(value);
         }
     }
-    bool ApplicationSettingsNew::getOperatorsOn() const noexcept
+    bool ApplicationSettings::getOperatorsOn() const noexcept
     {
-        LOG_DEBUG("[ApplicationSettingsNew::getOperatorsOn] %d", operatorsOn);
+        LOG_DEBUG("[ApplicationSettings::getOperatorsOn] %d", operatorsOn);
         return operatorsOn;
     }
-    void ApplicationSettingsNew::setOperatorsOn(bool value)
+    void ApplicationSettings::setOperatorsOn(bool value)
     {
         operatorsOn = value;
-        LOG_DEBUG("[ApplicationSettingsNew::setOperatorsOn] to %d", operatorsOn);
+        LOG_DEBUG("[ApplicationSettings::setOperatorsOn] to %d", operatorsOn);
         settings->setValue(settings::operators_on, std::to_string(static_cast<int>(value)));
     }
 
-    void ApplicationSettingsNew::setVoLTEOn(bool value)
+    void ApplicationSettings::setVoLTEOn(bool value)
     {
         voLteStateOn = value;
         CellularServiceAPI::SetVoLTE(this, voLteStateOn);
     };
 
-    bool ApplicationSettingsNew::getVoLTEOn() const noexcept
+    bool ApplicationSettings::getVoLTEOn() const noexcept
     {
         return voLteStateOn;
     }
 
-    void ApplicationSettingsNew::volteChanged(const std::string &value)
+    void ApplicationSettings::volteChanged(const std::string &value)
     {
         if (!value.empty()) {
             voLteStateOn = utils::getNumericValue<bool>(value);
         }
     }
 
-    void ApplicationSettingsNew::setOsUpdateVersion(const std::string &value)
+    void ApplicationSettings::setOsUpdateVersion(const std::string &value)
     {
-        LOG_DEBUG("[ApplicationSettingsNew::setOsUpdateVersion] to value=%s", value.c_str());
+        LOG_DEBUG("[ApplicationSettings::setOsUpdateVersion] to value=%s", value.c_str());
         settings->setValue(::settings::SystemProperties::osUpdateVersion, value, ::settings::SettingsScope::Global);
     }
 
-    auto ApplicationSettingsNew::getCurrentValues() -> settingsInterface::ScreenLightSettings::Values
+    auto ApplicationSettings::getCurrentValues() -> settingsInterface::ScreenLightSettings::Values
     {
         constexpr int timeout = pdMS_TO_TICKS(1500);
 


@@ 607,13 607,13 @@ namespace app
         return {};
     }
 
-    void ApplicationSettingsNew::setBrightness(bsp::eink_frontlight::BrightnessPercentage value)
+    void ApplicationSettings::setBrightness(bsp::eink_frontlight::BrightnessPercentage value)
     {
         screen_light_control::ManualModeParameters parameters{value};
         bus.sendUnicast(std::make_shared<sevm::ScreenLightSetManualModeParams>(parameters), service::name::evt_manager);
     }
 
-    void ApplicationSettingsNew::setMode(bool isAutoLightSwitchOn)
+    void ApplicationSettings::setMode(bool isAutoLightSwitchOn)
     {
         bus.sendUnicast(std::make_shared<sevm::ScreenLightControlMessage>(
                             isAutoLightSwitchOn ? screen_light_control::Action::enableAutomaticMode


@@ 621,7 621,7 @@ namespace app
                         service::name::evt_manager);
     }
 
-    void ApplicationSettingsNew::setStatus(bool isDisplayLightSwitchOn)
+    void ApplicationSettings::setStatus(bool isDisplayLightSwitchOn)
     {
         bus.sendUnicast(std::make_shared<sevm::ScreenLightControlMessage>(isDisplayLightSwitchOn
                                                                               ? screen_light_control::Action::turnOn


@@ 629,77 629,77 @@ namespace app
                         service::name::evt_manager);
     }
 
-    auto ApplicationSettingsNew::getKeypadBacklightState() -> bsp::keypad_backlight::State
+    auto ApplicationSettings::getKeypadBacklightState() -> bsp::keypad_backlight::State
     {
         return static_cast<bsp::keypad_backlight::State>(utils::getNumericValue<int>(
             settings->getValue(::settings::KeypadLight::state, ::settings::SettingsScope::Global)));
     }
 
-    void ApplicationSettingsNew::setKeypadBacklightState(bsp::keypad_backlight::State keypadLightState)
+    void ApplicationSettings::setKeypadBacklightState(bsp::keypad_backlight::State keypadLightState)
     {
         settings->setValue(::settings::KeypadLight::state,
                            std::to_string(static_cast<int>(keypadLightState)),
                            ::settings::SettingsScope::Global);
     }
 
-    auto ApplicationSettingsNew::getNotificationsWhenLocked() const noexcept -> bool
+    auto ApplicationSettings::getNotificationsWhenLocked() const noexcept -> bool
     {
         return notificationsWhenLocked;
     }
-    void ApplicationSettingsNew::setNotificationsWhenLocked(bool on) noexcept
+    void ApplicationSettings::setNotificationsWhenLocked(bool on) noexcept
     {
         notificationsWhenLocked = on;
         settings->setValue(
             ::settings::Offline::notificationsWhenLocked, std::to_string(on), ::settings::SettingsScope::Global);
     }
 
-    auto ApplicationSettingsNew::getCallsFromFavourite() const noexcept -> bool
+    auto ApplicationSettings::getCallsFromFavourite() const noexcept -> bool
     {
         return callsFromFavorites;
     }
-    void ApplicationSettingsNew::setCallsFromFavourite(bool on) noexcept
+    void ApplicationSettings::setCallsFromFavourite(bool on) noexcept
     {
         callsFromFavorites = on;
         settings->setValue(
             ::settings::Offline::callsFromFavorites, std::to_string(on), ::settings::SettingsScope::Global);
     }
 
-    auto ApplicationSettingsNew::isFlightMode() const noexcept -> bool
+    auto ApplicationSettings::isFlightMode() const noexcept -> bool
     {
         return flightModeOn;
     }
 
-    void ApplicationSettingsNew::setFlightMode(bool flightModeOn) noexcept
+    void ApplicationSettings::setFlightMode(bool flightModeOn) noexcept
     {
         this->flightModeOn = flightModeOn;
         CellularServiceAPI::SetFlightMode(this, flightModeOn);
     }
 
-    auto ApplicationSettingsNew::getConnectionFrequency() const noexcept -> uint8_t
+    auto ApplicationSettings::getConnectionFrequency() const noexcept -> uint8_t
     {
         return connectionFrequency;
     }
 
-    void ApplicationSettingsNew::setConnectionFrequency(uint8_t val) noexcept
+    void ApplicationSettings::setConnectionFrequency(uint8_t val) noexcept
     {
         connectionFrequency = val;
         CellularServiceAPI::SetConnectionFrequency(this, val);
     }
 
-    void ApplicationSettingsNew::getAutoLockTime()
+    void ApplicationSettings::getAutoLockTime()
     {
         bus.sendUnicast(std::make_shared<app::manager::GetAutoLockTimeoutRequest>(),
                         app::manager::ApplicationManager::ServiceName);
     }
 
-    void ApplicationSettingsNew::setAutoLockTime(std::chrono::seconds lockTime)
+    void ApplicationSettings::setAutoLockTime(std::chrono::seconds lockTime)
     {
         bus.sendUnicast(std::make_shared<app::manager::SetAutoLockTimeoutRequest>(lockTime),
                         app::manager::ApplicationManager::ServiceName);
     }
 
-    void ApplicationSettingsNew::switchToAllDevicesViaBtErrorPrompt(std::shared_ptr<sys::DataMessage> msg,
-                                                                    const std::string &errorMsg)
+    void ApplicationSettings::switchToAllDevicesViaBtErrorPrompt(std::shared_ptr<sys::DataMessage> msg,
+                                                                 const std::string &errorMsg)
     {
         switchWindow(gui::window::name::dialog_retry,
                      gui::ShowMode::GUI_SHOW_INIT,

@@ 86,7 86,7 @@ namespace gui::window::name
 
 namespace app
 {
-    inline constexpr auto name_settings_new = "ApplicationSettingsNew";
+    inline constexpr auto name_settings = "ApplicationSettings";
 
     namespace settingsInterface
     {


@@ 169,23 169,23 @@ namespace app
 
     }; // namespace settingsInterface
 
-    class ApplicationSettingsNew : public app::Application,
-                                   public settingsInterface::SimParams,
-                                   public settingsInterface::OperatorsSettings,
-                                   public settingsInterface::ScreenLightSettings,
-                                   public settingsInterface::KeypdBacklightSettings,
-                                   public settingsInterface::DndSettings,
-                                   public settingsInterface::OfflineSettings,
-                                   public settingsInterface::ConnectionSettings,
-                                   public settingsInterface::AutoLockSettings,
-                                   public AsyncCallbackReceiver
+    class ApplicationSettings : public app::Application,
+                                public settingsInterface::SimParams,
+                                public settingsInterface::OperatorsSettings,
+                                public settingsInterface::ScreenLightSettings,
+                                public settingsInterface::KeypdBacklightSettings,
+                                public settingsInterface::DndSettings,
+                                public settingsInterface::OfflineSettings,
+                                public settingsInterface::ConnectionSettings,
+                                public settingsInterface::AutoLockSettings,
+                                public AsyncCallbackReceiver
     {
       public:
-        explicit ApplicationSettingsNew(std::string name                    = name_settings_new,
-                                        std::string parent                  = {},
-                                        sys::phone_modes::PhoneMode mode    = sys::phone_modes::PhoneMode::Connected,
-                                        StartInBackground startInBackground = {false});
-        ~ApplicationSettingsNew() override;
+        explicit ApplicationSettings(std::string name                    = name_settings,
+                                     std::string parent                  = {},
+                                     sys::phone_modes::PhoneMode mode    = sys::phone_modes::PhoneMode::Connected,
+                                     StartInBackground startInBackground = {false});
+        ~ApplicationSettings() override;
         auto DataReceivedHandler(sys::DataMessage *msgl, sys::ResponseMessage *resp) -> sys::MessagePointer override;
         auto InitHandler() -> sys::ReturnCodes override;
 


@@ 246,7 246,7 @@ namespace app
         bool flightModeOn             = true;
     };
 
-    template <> struct ManifestTraits<ApplicationSettingsNew>
+    template <> struct ManifestTraits<ApplicationSettings>
     {
         static auto GetManifest() -> manager::ApplicationManifest
         {

@@ 3,7 3,7 @@
 
 #pragma once
 
-#include "application-settings-new/models/QuotesModel.hpp"
+#include "application-settings/models/QuotesModel.hpp"
 
 #include <SwitchData.hpp>
 #include <json11.hpp>

@@ 3,7 3,7 @@
 
 #pragma once
 
-#include <application-settings-new/models/AbstractSoundsModel.hpp>
+#include <application-settings/models/AbstractSoundsModel.hpp>
 
 ///  @brief Switch data for SoundSelectWindow which allows
 ///  to specify its behaviour

@@ 4,7 4,7 @@
 #pragma once
 
 #include <ListItemProvider.hpp>
-#include <application-settings-new/models/AudioSettingsModel.hpp>
+#include <application-settings/models/AudioSettingsModel.hpp>
 
 namespace app
 {

@@ 36,9 36,9 @@ namespace audio_settings
         /// @return sound file path, returns empty string if not found
         [[nodiscard]] virtual std::string getSound() = 0;
         /// @param sound file path
-        virtual void setSound(std::string filePath)     = 0;
-        [[nodiscard]] virtual audio::Volume getVolume() = 0;
-        virtual void setVolume(audio::Volume vol)       = 0;
+        virtual void setSound(std::string filePath)                 = 0;
+        [[nodiscard]] virtual audio::Volume getVolume()             = 0;
+        virtual void setVolume(audio::Volume vol)                   = 0;
         [[nodiscard]] virtual audio::PlaybackType getPlaybackType() = 0;
     };
 

@@ 1,7 1,7 @@
 // Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include "application-settings-new/windows/QuoteCategoriesWindow.hpp"
+#include "application-settings/windows/QuoteCategoriesWindow.hpp"
 #include "CategoriesModel.hpp"
 
 namespace style::quotes::list

@@ 1,8 1,8 @@
 // Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include <application-settings-new/widgets/SettingsDateItem.hpp>
-#include <application-settings-new/widgets/SettingsTimeItem.hpp>
+#include <application-settings/widgets/SettingsDateItem.hpp>
+#include <application-settings/widgets/SettingsTimeItem.hpp>
 #include "DateAndTimeModel.hpp"
 #include <ListView.hpp>
 #include <apps-common/widgets/DateAndTimeStyle.hpp>

@@ 2,8 2,8 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "FromTimeToTimeModel.hpp"
-#include <application-settings-new/widgets/SettingsDateItem.hpp>
-#include <application-settings-new/widgets/SettingsTimeItem.hpp>
+#include <application-settings/widgets/SettingsDateItem.hpp>
+#include <application-settings/widgets/SettingsTimeItem.hpp>
 #include <ListView.hpp>
 #include <widgets/DateAndTimeStyle.hpp>
 

@@ 3,7 3,7 @@
 
 #include "NewApnModel.hpp"
 
-#include "application-settings-new/widgets/ApnInputWidget.hpp"
+#include "application-settings/widgets/ApnInputWidget.hpp"
 
 #include <ListView.hpp>
 #include <time/ScopedTime.hpp>

@@ 3,9 3,9 @@
 
 #pragma once
 
-#include "application-settings-new/data/SettingsItemData.hpp"
-#include "application-settings-new/widgets/ApnListItem.hpp"
-#include "application-settings-new/widgets/SettingsStyle.hpp"
+#include "application-settings/data/SettingsItemData.hpp"
+#include "application-settings/widgets/ApnListItem.hpp"
+#include "application-settings/widgets/SettingsStyle.hpp"
 #include "InternalModel.hpp"
 #include "Application.hpp"
 

@@ 1,8 1,8 @@
 // Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include "application-settings-new/windows/QuotesMainWindow.hpp"
-#include "application-settings-new/ApplicationSettings.hpp"
+#include "application-settings/windows/QuotesMainWindow.hpp"
+#include "application-settings/ApplicationSettings.hpp"
 #include "QuotesModel.hpp"
 
 #include <InputEvent.hpp>

@@ 39,4 39,4 @@ namespace Quotes
         app::Application *app = nullptr;
     };
 
-} // namespace app
+} // namespace Quotes

@@ 15,7 15,7 @@ SARInfoRepository::SARInfoRepository(std::filesystem::path certificationInfoPath
 std::string SARInfoRepository::getSarInfoText()
 {
     const auto &displayLanguageName = utils::getDisplayLanguage();
-    auto sarInfoFile         = std::ifstream(certificationInfoPath / displayLanguageName / fileName);
+    auto sarInfoFile                = std::ifstream(certificationInfoPath / displayLanguageName / fileName);
 
     if (!sarInfoFile.is_open()) {
         sarInfoFile.open(certificationInfoPath / utils::getDefaultLanguage() / fileName);

@@ 4,7 4,7 @@
 #pragma once
 
 #include "AbstractSoundsModel.hpp"
-#include "application-settings-new/widgets/SettingsSoundItem.hpp"
+#include "application-settings/widgets/SettingsSoundItem.hpp"
 
 #include "InternalModel.hpp"
 #include "Application.hpp"

@@ 2,7 2,7 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "ColorTestModel.hpp"
-#include <application-settings-new/widgets/advanced/ColorTestListStyle.hpp>
+#include <application-settings/widgets/advanced/ColorTestListStyle.hpp>
 
 namespace gui
 {

@@ 3,7 3,7 @@
 
 #pragma once
 
-#include "application-settings-new/widgets/advanced/ColorTestListItem.hpp"
+#include "application-settings/widgets/advanced/ColorTestListItem.hpp"
 
 #include <Application.hpp>
 #include <InternalModel.hpp>

@@ 3,7 3,7 @@
 
 #pragma once
 
-#include "application-settings-new/models/SARInfoRepository.hpp"
+#include "application-settings/models/SARInfoRepository.hpp"
 #include "BasePresenter.hpp"
 
 class SARInfoWindowContract

@@ 3,7 3,7 @@
 
 #pragma once
 
-#include "application-settings-new/models/FactoryData.hpp"
+#include "application-settings/models/FactoryData.hpp"
 #include "BasePresenter.hpp"
 
 class TechnicalWindowContract

@@ 3,7 3,7 @@
 
 #include "ApnInputWidget.hpp"
 #include <Span.hpp>
-#include "application-settings-new/widgets/SettingsStyle.hpp"
+#include "application-settings/widgets/SettingsStyle.hpp"
 #include <i18n/i18n.hpp>
 #include <utility>
 

@@ 3,8 3,8 @@
 
 #pragma once
 
-#include "application-settings-new/data/SettingsInternals.hpp"
-#include "application-settings-new//widgets/ApnListItem.hpp"
+#include "application-settings/data/SettingsInternals.hpp"
+#include "application-settings//widgets/ApnListItem.hpp"
 
 #include <ListItem.hpp>
 #include <Text.hpp>

@@ 3,7 3,7 @@
 
 #pragma once
 
-#include "application-settings-new/data/SettingsItemData.hpp"
+#include "application-settings/data/SettingsItemData.hpp"
 
 namespace gui
 {

@@ 3,7 3,7 @@
 
 #pragma once
 
-#include "application-settings-new/data/QuoteSwitchData.hpp"
+#include "application-settings/data/QuoteSwitchData.hpp"
 
 #include <BoxLayout.hpp>
 #include <Image.hpp>


@@ 31,7 31,6 @@ namespace gui
         std::function<void(bool)> enableCategory                     = nullptr;
         std::function<void(const UTF8 &text)> bottomBarTemporaryMode = nullptr;
         std::function<void()> bottomBarRestoreFromTemporaryMode      = nullptr;
-
     };
 
 } /* namespace gui */

@@ 3,7 3,7 @@
 
 #pragma once
 
-#include "application-settings-new/data/QuoteSwitchData.hpp"
+#include "application-settings/data/QuoteSwitchData.hpp"
 
 #include <BoxLayout.hpp>
 #include <ImageBox.hpp>


@@ 35,7 35,6 @@ namespace gui
         std::function<void(bool)> enableQuote                        = nullptr;
         std::function<void(const UTF8 &text)> bottomBarTemporaryMode = nullptr;
         std::function<void()> bottomBarRestoreFromTemporaryMode      = nullptr;
-
     };
 
 } /* namespace gui */

@@ 2,7 2,7 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "SettingsSoundItem.hpp"
-#include "application-settings-new/data/SettingsInternals.hpp"
+#include "application-settings/data/SettingsInternals.hpp"
 
 namespace gui
 {

@@ 118,8 118,8 @@ namespace style
                 inline constexpr auto LeftMargin = ::style::window::default_left_margin;
                 inline constexpr auto TopMargin =
                     ::style::window::default_vertical_pos + ::style::margins::very_big - 1;
-                inline constexpr auto Width      = ::style::window::default_body_width;
-                inline constexpr auto Height     = ::style::window::default_body_height - ::style::margins::very_big;
+                inline constexpr auto Width  = ::style::window::default_body_width;
+                inline constexpr auto Height = ::style::window::default_body_height - ::style::margins::very_big;
 
                 namespace date
                 {

@@ 1,7 1,7 @@
 // Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include "application-settings-new/ApplicationSettings.hpp"
+#include "application-settings/ApplicationSettings.hpp"
 #include "OptionSetting.hpp"
 #include "AboutYourPureWindow.hpp"
 

@@ 2,9 2,9 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "AddDeviceWindow.hpp"
-#include <application-settings-new/ApplicationSettings.hpp>
-#include <application-settings-new/data/DeviceData.hpp>
-#include <application-settings-new/data/PairingDeviceData.hpp>
+#include <application-settings/ApplicationSettings.hpp>
+#include <application-settings/data/DeviceData.hpp>
+#include <application-settings/data/PairingDeviceData.hpp>
 
 #include "OptionSetting.hpp"
 

@@ 4,7 4,7 @@
 #pragma once
 
 #include "BaseSettingsWindow.hpp"
-#include "application-settings-new/models/BluetoothSettingsModel.hpp"
+#include "application-settings/models/BluetoothSettingsModel.hpp"
 
 #include <Device.hpp>
 

@@ 2,8 2,8 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "AlarmClockWindow.hpp"
-#include "application-settings-new/ApplicationSettings.hpp"
-#include "application-settings-new/widgets/SpinBoxOptionSettings.hpp"
+#include "application-settings/ApplicationSettings.hpp"
+#include "application-settings/widgets/SpinBoxOptionSettings.hpp"
 #include "BaseSettingsWindow.hpp"
 
 #include <i18n/i18n.hpp>

@@ 5,7 5,7 @@
 
 #include "BaseSettingsWindow.hpp"
 #include "OptionsWidgetMaker.hpp"
-#include <application-settings-new/models/AudioSettingsModel.hpp>
+#include <application-settings/models/AudioSettingsModel.hpp>
 
 namespace gui
 {

@@ 2,10 2,10 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "AllDevicesWindow.hpp"
-#include <application-settings-new/ApplicationSettings.hpp>
-#include <application-settings-new/data/BondedDevicesData.hpp>
-#include <application-settings-new/data/PairingDeviceData.hpp>
-#include <application-settings-new/widgets/SettingsStyle.hpp>
+#include <application-settings/ApplicationSettings.hpp>
+#include <application-settings/data/BondedDevicesData.hpp>
+#include <application-settings/data/PairingDeviceData.hpp>
+#include <application-settings/widgets/SettingsStyle.hpp>
 
 #include <DialogMetadataMessage.hpp>
 #include <OptionSetting.hpp>

@@ 2,7 2,7 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 #pragma once
 
-#include "application-settings-new/models/BluetoothSettingsModel.hpp"
+#include "application-settings/models/BluetoothSettingsModel.hpp"
 #include "BaseSettingsWindow.hpp"
 
 #include <Device.hpp>

@@ 3,9 3,9 @@
 
 #include "ApnOptionsWindow.hpp"
 
-#include "application-settings-new/ApplicationSettings.hpp"
-#include "application-settings-new/data/SettingsItemData.hpp"
-#include "application-settings-new/models/ApnSettingsModel.hpp"
+#include "application-settings/ApplicationSettings.hpp"
+#include "application-settings/data/SettingsItemData.hpp"
+#include "application-settings/models/ApnSettingsModel.hpp"
 #include "OptionSetting.hpp"
 
 namespace gui

@@ 3,7 3,7 @@
 
 #pragma once
 
-#include "application-settings-new/models/ApnSettingsModel.hpp"
+#include "application-settings/models/ApnSettingsModel.hpp"
 #include "BaseSettingsWindow.hpp"
 
 #include <service-cellular/PacketDataTypes.hpp>

@@ 2,10 2,10 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "ApnSettingsWindow.hpp"
-#include "application-settings-new/ApplicationSettings.hpp"
-#include "application-settings-new/data/ApnListData.hpp"
-#include "application-settings-new/widgets/SettingsStyle.hpp"
-#include "application-settings-new/data/SettingsItemData.hpp"
+#include "application-settings/ApplicationSettings.hpp"
+#include "application-settings/data/ApnListData.hpp"
+#include "application-settings/widgets/SettingsStyle.hpp"
+#include "application-settings/data/SettingsItemData.hpp"
 #include "OptionSetting.hpp"
 
 #include <header/AddElementAction.hpp>

@@ 4,7 4,7 @@
 #pragma once
 
 #include "OptionWindow.hpp"
-#include "application-settings-new/models/ApnSettingsModel.hpp"
+#include "application-settings/models/ApnSettingsModel.hpp"
 
 #include <Icon.hpp>
 #include <service-cellular/PacketDataTypes.hpp>


@@ 23,7 23,7 @@ namespace gui
         auto onInput(const InputEvent &inputEvent) -> bool override;
         auto optionsList(std::vector<std::shared_ptr<packet_data::APN::Config>> vector) -> std::list<Option>;
 
-        Icon *emptyListIcon   = nullptr;
+        Icon *emptyListIcon = nullptr;
         std::vector<std::shared_ptr<packet_data::APN::Config>> apns;
         std::shared_ptr<packet_data::APN::Config> activeApn;
         std::shared_ptr<ApnSettingsModel> apnSettingsModel;

@@ 3,7 3,7 @@
 
 #include "AppsAndToolsWindow.hpp"
 
-#include <application-settings-new/ApplicationSettings.hpp>
+#include <application-settings/ApplicationSettings.hpp>
 #include <i18n/i18n.hpp>
 #include <OptionWindow.hpp>
 

@@ 2,7 2,7 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "AutolockWindow.hpp"
-#include <application-settings-new/data/AutoLockData.hpp>
+#include <application-settings/data/AutoLockData.hpp>
 #include <OptionSetting.hpp>
 #include <i18n/i18n.hpp>
 

@@ 4,7 4,7 @@
 #pragma once
 
 #include "BaseSettingsWindow.hpp"
-#include <module-apps/application-settings-new/ApplicationSettings.hpp>
+#include <module-apps/application-settings/ApplicationSettings.hpp>
 
 namespace gui
 {

@@ 2,8 2,8 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "BluetoothCheckPasskeyWindow.hpp"
-#include "application-settings-new/ApplicationSettings.hpp"
-#include "application-settings-new/widgets/SettingsStyle.hpp"
+#include "application-settings/ApplicationSettings.hpp"
+#include "application-settings/widgets/SettingsStyle.hpp"
 #include <widgets/Text.hpp>
 #include <Image.hpp>
 

@@ 3,7 3,7 @@
 
 #pragma once
 
-#include "application-settings-new/models/BluetoothSettingsModel.hpp"
+#include "application-settings/models/BluetoothSettingsModel.hpp"
 #include <AppWindow.hpp>
 
 namespace gui

@@ 2,8 2,8 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "BluetoothWindow.hpp"
-#include "application-settings-new/ApplicationSettings.hpp"
-#include "application-settings-new/data/BluetoothStatusData.hpp"
+#include "application-settings/ApplicationSettings.hpp"
+#include "application-settings/data/BluetoothStatusData.hpp"
 
 #include "OptionSetting.hpp"
 

@@ 3,7 3,7 @@
 
 #pragma once
 
-#include "application-settings-new/models/BluetoothSettingsModel.hpp"
+#include "application-settings/models/BluetoothSettingsModel.hpp"
 #include "BaseSettingsWindow.hpp"
 
 namespace gui

@@ 2,7 2,7 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "CallRingtoneWindow.hpp"
-#include "application-settings-new/ApplicationSettings.hpp"
+#include "application-settings/ApplicationSettings.hpp"
 #include <i18n/i18n.hpp>
 
 namespace gui

@@ 2,10 2,10 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "CertificationWindow.hpp"
-#include <application-settings-new/ApplicationSettings.hpp>
+#include <application-settings/ApplicationSettings.hpp>
 #include <widgets/Text.hpp>
 #include <widgets/Image.hpp>
-#include <application-settings-new/widgets/SettingsStyle.hpp>
+#include <application-settings/widgets/SettingsStyle.hpp>
 
 inline constexpr auto certno = "XXXXXXXXXXXXXXXXXXX";
 

@@ 2,7 2,7 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "ChangeDateAndTimeWindow.hpp"
-#include <application-settings-new/ApplicationSettings.hpp>
+#include <application-settings/ApplicationSettings.hpp>
 #include <gui/input/InputEvent.hpp>
 #include <ListView.hpp>
 #include <service-time/Constants.hpp>

@@ 4,8 4,8 @@
 #pragma once
 
 #include <AppWindow.hpp>
-#include <application-settings-new/ApplicationSettings.hpp>
-#include "application-settings-new/models/DateAndTimeModel.hpp"
+#include <application-settings/ApplicationSettings.hpp>
+#include "application-settings/models/DateAndTimeModel.hpp"
 
 namespace gui
 {

@@ 4,7 4,7 @@
 #pragma once
 
 #include "BaseSettingsWindow.hpp"
-#include <application-settings-new/ApplicationSettings.hpp>
+#include <application-settings/ApplicationSettings.hpp>
 #include <Option.hpp>
 
 namespace gui

@@ 2,7 2,7 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "ConnectionFrequencyWindow.hpp"
-#include "application-settings-new/ApplicationSettings.hpp"
+#include "application-settings/ApplicationSettings.hpp"
 #include "OptionSetting.hpp"
 #include <i18n/i18n.hpp>
 

@@ 1,7 1,7 @@
 // Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include "application-settings-new/ApplicationSettings.hpp"
+#include "application-settings/ApplicationSettings.hpp"
 #include "DateAndTimeMainWindow.hpp"
 #include "module-apps/application-desktop/windows/Names.hpp"
 #include "OptionSetting.hpp"

@@ 3,7 3,7 @@
 
 #include "DisplayAndKeypadWindow.hpp"
 
-#include "application-settings-new/ApplicationSettings.hpp"
+#include "application-settings/ApplicationSettings.hpp"
 #include "windows/OptionWindow.hpp"
 #include "OptionSetting.hpp"
 

@@ 2,9 2,9 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "DisplayLightWindow.hpp"
-#include "application-settings-new/widgets/SpinBoxOptionSettings.hpp"
+#include "application-settings/widgets/SpinBoxOptionSettings.hpp"
 #include "OptionSetting.hpp"
-#include "application-settings-new/ApplicationSettings.hpp"
+#include "application-settings/ApplicationSettings.hpp"
 #include "OptionSetting.hpp"
 
 #include <service-evtmgr/screen-light-control/ScreenLightControl.hpp>


@@ 38,7 38,7 @@ namespace gui
 
     auto DisplayLightWindow::onTimerTimeout(Item &self, sys::Timer &task) -> bool
     {
-        ambientLight = bsp::light_sensor::readout();
+        ambientLight    = bsp::light_sensor::readout();
         auto values     = screenLightSettings->getCurrentValues();
         brightnessValue = values.parameters.manualModeBrightness;
         refreshOptionsList();

@@ 5,9 5,9 @@
 
 #include <apps-common/GuiTimer.hpp>
 #include <module-services/service-evtmgr/screen-light-control/ScreenLightControl.hpp>
-#include <module-apps/application-settings-new/widgets/SpinBox.hpp>
-#include <module-apps/application-settings-new/ApplicationSettings.hpp>
-#include <module-apps/application-settings-new/widgets/SpinBoxOptionSettings.hpp>
+#include <module-apps/application-settings/widgets/SpinBox.hpp>
+#include <module-apps/application-settings/ApplicationSettings.hpp>
+#include <module-apps/application-settings/widgets/SpinBoxOptionSettings.hpp>
 #include "BaseSettingsWindow.hpp"
 
 namespace gui


@@ 16,7 16,7 @@ namespace gui
     {
         constexpr inline auto AMBIENT_LIGHT_TIMER_MS = 2000;
         constexpr inline auto LIGHT_CONTROL_STEP     = 10;
-    }
+    } // namespace lighting
 
     class DisplayLightWindow : public BaseSettingsWindow
     {


@@ 30,9 30,9 @@ namespace gui
 
         void addBrightnessOption(std::list<Option> &);
         auto createBrightnessOption(int step) -> std::unique_ptr<SpinBoxOptionSettings>;
-        bool isDisplayLightSwitchOn                                      = false;
-        bool isAutoLightSwitchOn                                         = false;
-        bsp::eink_frontlight::BrightnessPercentage brightnessValue       = 0.0;
+        bool isDisplayLightSwitchOn                                = false;
+        bool isAutoLightSwitchOn                                   = false;
+        bsp::eink_frontlight::BrightnessPercentage brightnessValue = 0.0;
 
         app::settingsInterface::ScreenLightSettings *screenLightSettings = nullptr;
         float ambientLight                                               = 0.0;

@@ 2,8 2,8 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "DoNotDisturbWindow.hpp"
-#include "application-settings-new/ApplicationSettings.hpp"
-#include "application-settings-new/widgets/SettingsStyle.hpp"
+#include "application-settings/ApplicationSettings.hpp"
+#include "application-settings/widgets/SettingsStyle.hpp"
 
 #include "OptionSetting.hpp"
 

@@ 3,7 3,7 @@
 
 #include "EditQuotesWindow.hpp"
 
-#include <module-apps/application-settings-new/ApplicationSettings.hpp>
+#include <module-apps/application-settings/ApplicationSettings.hpp>
 #include <apps-common/options/type/OptionSetting.hpp>
 
 #include <i18n/i18n.hpp>

@@ 3,7 3,7 @@
 
 #include "FontSizeWindow.hpp"
 
-#include "application-settings-new/ApplicationSettings.hpp"
+#include "application-settings/ApplicationSettings.hpp"
 
 #include <i18n/i18n.hpp>
 

@@ 3,7 3,7 @@
 
 #include "InputLanguageWindow.hpp"
 
-#include "application-settings-new/ApplicationSettings.hpp"
+#include "application-settings/ApplicationSettings.hpp"
 #include "OptionSetting.hpp"
 
 #include <i18n/i18n.hpp>

@@ 3,7 3,7 @@
 
 #include "KeypadLightWindow.hpp"
 
-#include <application-settings-new/ApplicationSettings.hpp>
+#include <application-settings/ApplicationSettings.hpp>
 #include <OptionSetting.hpp>
 
 #include <bsp/keypad_backlight/keypad_backlight.hpp>


@@ 37,7 37,7 @@ namespace gui
         isActiveSwitchOn   = false;
         isOffSwitchOn      = false;
         isAlwaysOnSwitchOn = false;
-        toggleSwitch = !toggleSwitch;
+        toggleSwitch       = !toggleSwitch;
         refreshOptionsList();
         if (isAlwaysOnSwitchOn) {
             keypadLightSettings->setKeypadBacklightState(bsp::keypad_backlight::State::on);

@@ 4,7 4,7 @@
 #pragma once
 
 #include "BaseSettingsWindow.hpp"
-#include <module-apps/application-settings-new/ApplicationSettings.hpp>
+#include <module-apps/application-settings/ApplicationSettings.hpp>
 
 namespace gui
 {

@@ 1,8 1,8 @@
 // Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include "application-settings-new/ApplicationSettings.hpp"
-#include "application-settings-new/data/LanguagesData.hpp"
+#include "application-settings/ApplicationSettings.hpp"
+#include "application-settings/data/LanguagesData.hpp"
 #include "LanguagesWindow.hpp"
 
 #include <utility>

@@ 3,7 3,7 @@
 
 #pragma once
 
-#include "application-settings-new/ApplicationSettings.hpp"
+#include "application-settings/ApplicationSettings.hpp"
 #include "BaseSettingsWindow.hpp"
 #include <i18n/i18n.hpp>
 

@@ 2,7 2,7 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "LockedScreenWindow.hpp"
-#include "application-settings-new/ApplicationSettings.hpp"
+#include "application-settings/ApplicationSettings.hpp"
 #include "OptionSetting.hpp"
 
 #include <i18n/i18n.hpp>

@@ 2,7 2,7 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "MessageSoundWindow.hpp"
-#include "application-settings-new/ApplicationSettings.hpp"
+#include "application-settings/ApplicationSettings.hpp"
 #include <i18n/i18n.hpp>
 
 namespace gui

@@ 3,8 3,8 @@
 
 #include "MessagesWindow.hpp"
 
-#include <application-settings-new/data/SoundSelectData.hpp>
-#include <application-settings-new/ApplicationSettings.hpp>
+#include <application-settings/data/SoundSelectData.hpp>
+#include <application-settings/ApplicationSettings.hpp>
 
 #include <i18n/i18n.hpp>
 #include <OptionWindow.hpp>

@@ 5,7 5,7 @@
 
 #include "BaseSettingsWindow.hpp"
 #include "OptionsWidgetMaker.hpp"
-#include <application-settings-new/models/AudioSettingsModel.hpp>
+#include <application-settings/models/AudioSettingsModel.hpp>
 
 namespace gui
 {

@@ 2,8 2,8 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "NetworkWindow.hpp"
-#include "application-settings-new/ApplicationSettings.hpp"
-#include "application-settings-new/data/PINSettingsSimData.hpp"
+#include "application-settings/ApplicationSettings.hpp"
+#include "application-settings/data/PINSettingsSimData.hpp"
 
 #include "OptionSetting.hpp"
 

@@ 2,7 2,7 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "NewApnWindow.hpp"
-#include "application-settings-new/ApplicationSettings.hpp"
+#include "application-settings/ApplicationSettings.hpp"
 
 #include <Dialog.hpp>
 #include <messages/DialogMetadataMessage.hpp>

@@ 3,8 3,8 @@
 
 #pragma once
 
-#include "application-settings-new/models/ApnSettingsModel.hpp"
-#include "application-settings-new/models/NewApnModel.hpp"
+#include "application-settings/models/ApnSettingsModel.hpp"
+#include "application-settings/models/NewApnModel.hpp"
 
 #include <AppWindow.hpp>
 #include <ListView.hpp>

@@ 2,8 2,8 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "NightshiftWindow.hpp"
-#include <application-settings-new/ApplicationSettings.hpp>
-#include <application-settings-new/widgets/SettingsStyle.hpp>
+#include <application-settings/ApplicationSettings.hpp>
+#include <application-settings/widgets/SettingsStyle.hpp>
 #include <gui/input/InputEvent.hpp>
 #include <ListView.hpp>
 #include <widgets/DateAndTimeStyle.hpp>

@@ 4,7 4,7 @@
 #pragma once
 
 #include "AppWindow.hpp"
-#include <application-settings-new/models/FromTimeToTimeModel.hpp>
+#include <application-settings/models/FromTimeToTimeModel.hpp>
 
 namespace gui
 {

@@ 2,7 2,7 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "NotificationSoundWindow.hpp"
-#include "application-settings-new/ApplicationSettings.hpp"
+#include "application-settings/ApplicationSettings.hpp"
 #include <i18n/i18n.hpp>
 
 namespace gui

@@ 2,8 2,8 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "OfflineWindow.hpp"
-#include "application-settings-new/ApplicationSettings.hpp"
-#include "application-settings-new/widgets/SettingsStyle.hpp"
+#include "application-settings/ApplicationSettings.hpp"
+#include "application-settings/widgets/SettingsStyle.hpp"
 
 #include "OptionSetting.hpp"
 

@@ 2,9 2,9 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "PINSettingsWindow.hpp"
-#include "application-settings-new/ApplicationSettings.hpp"
-#include "application-settings-new/data/PINSettingsLockStateData.hpp"
-#include "application-settings-new/data/PINSettingsSimData.hpp"
+#include "application-settings/ApplicationSettings.hpp"
+#include "application-settings/data/PINSettingsLockStateData.hpp"
+#include "application-settings/data/PINSettingsSimData.hpp"
 #include "OptionSetting.hpp"
 
 #include <service-appmgr/Controller.hpp>

@@ 2,7 2,7 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "PhoneModesWindow.hpp"
-#include "application-settings-new/ApplicationSettings.hpp"
+#include "application-settings/ApplicationSettings.hpp"
 
 #include "OptionSetting.hpp"
 

@@ 2,8 2,8 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "PhoneNameWindow.hpp"
-#include "application-settings-new/ApplicationSettings.hpp"
-#include "application-settings-new/data/PhoneNameData.hpp"
+#include "application-settings/ApplicationSettings.hpp"
+#include "application-settings/data/PhoneNameData.hpp"
 #include "widgets/InputBox.hpp"
 
 #include <Utils.hpp>

@@ 2,7 2,7 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 #pragma once
 
-#include "application-settings-new/models/BluetoothSettingsModel.hpp"
+#include "application-settings/models/BluetoothSettingsModel.hpp"
 #include "AppWindow.hpp"
 #include <Text.hpp>
 

@@ 2,8 2,8 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "PhoneWindow.hpp"
-#include <application-settings-new/data/SoundSelectData.hpp>
-#include <application-settings-new/ApplicationSettings.hpp>
+#include <application-settings/data/SoundSelectData.hpp>
+#include <application-settings/ApplicationSettings.hpp>
 
 #include <i18n/i18n.hpp>
 #include <OptionWindow.hpp>

@@ 5,7 5,7 @@
 
 #include "BaseSettingsWindow.hpp"
 #include "OptionsWidgetMaker.hpp"
-#include <application-settings-new/models/AudioSettingsModel.hpp>
+#include <application-settings/models/AudioSettingsModel.hpp>
 
 namespace gui
 {

@@ 2,9 2,9 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "QuoteCategoriesWindow.hpp"
-#include <application-settings-new/models/CategoriesModel.hpp>
-#include <application-settings-new/ApplicationSettings.hpp>
-#include <application-settings-new/widgets/SettingsStyle.hpp>
+#include <application-settings/models/CategoriesModel.hpp>
+#include <application-settings/ApplicationSettings.hpp>
+#include <application-settings/widgets/SettingsStyle.hpp>
 
 namespace gui
 {

@@ 4,8 4,8 @@
 #pragma once
 
 #include "BaseSettingsWindow.hpp"
-#include <application-settings-new/widgets/CategoryWidget.hpp>
-#include <application-settings-new/models/CategoriesModel.hpp>
+#include <application-settings/widgets/CategoryWidget.hpp>
+#include <application-settings/models/CategoriesModel.hpp>
 #include <module-gui/gui/widgets/ListView.hpp>
 #include <apps-common/InternalModel.hpp>
 

@@ 4,8 4,8 @@
 #include "QuotesAddWindow.hpp"
 #include "QuotesMainWindow.hpp"
 
-#include "application-settings-new/ApplicationSettings.hpp"
-#include "application-settings-new/data/QuoteSwitchData.hpp"
+#include "application-settings/ApplicationSettings.hpp"
+#include "application-settings/data/QuoteSwitchData.hpp"
 
 #include <i18n/i18n.hpp>
 #include <widgets/Text.hpp>

@@ 5,7 5,7 @@
 
 #include "BaseSettingsWindow.hpp"
 #include "QuotesMainWindow.hpp"
-#include "application-settings-new/models/QuotesModel.hpp"
+#include "application-settings/models/QuotesModel.hpp"
 
 namespace gui
 {

@@ 2,9 2,9 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "QuotesMainWindow.hpp"
-#include "application-settings-new/models/QuotesModel.hpp"
-#include "application-settings-new/ApplicationSettings.hpp"
-#include "application-settings-new/widgets/SettingsStyle.hpp"
+#include "application-settings/models/QuotesModel.hpp"
+#include "application-settings/ApplicationSettings.hpp"
+#include "application-settings/widgets/SettingsStyle.hpp"
 #include "OptionSetting.hpp"
 
 #include <header/AddElementAction.hpp>

@@ 4,8 4,8 @@
 #pragma once
 
 #include "BaseSettingsWindow.hpp"
-#include "application-settings-new/widgets/QuoteWidget.hpp"
-#include "application-settings-new/models/QuotesModel.hpp"
+#include "application-settings/widgets/QuoteWidget.hpp"
+#include "application-settings/models/QuotesModel.hpp"
 
 #include <purefs/filesystem_paths.hpp>
 #include <module-gui/gui/widgets/ListView.hpp>


@@ 25,7 25,7 @@ namespace gui
         auto onInput(const InputEvent &inputEvent) -> bool override;
 
         std::shared_ptr<Quotes::QuotesModel> quotesModel = nullptr;
-        gui::ListView *list                           = nullptr;
+        gui::ListView *list                              = nullptr;
     };
 
 } // namespace gui

@@ 3,11 3,11 @@
 
 #include "QuotesOptionsWindow.hpp"
 #include "OptionSetting.hpp"
-#include "application-settings-new/ApplicationSettings.hpp"
+#include "application-settings/ApplicationSettings.hpp"
 #include "DialogMetadataMessage.hpp"
 #include "QuotesMainWindow.hpp"
-#include "application-settings-new/ApplicationSettings.hpp"
-#include "application-settings-new/widgets/QuoteWidget.hpp"
+#include "application-settings/ApplicationSettings.hpp"
+#include "application-settings/widgets/QuoteWidget.hpp"
 
 #include <i18n/i18n.hpp>
 #include <widgets/Text.hpp>

@@ 5,7 5,7 @@
 
 #include "BaseSettingsWindow.hpp"
 #include "QuotesMainWindow.hpp"
-#include "application-settings-new/widgets/QuoteWidget.hpp"
+#include "application-settings/widgets/QuoteWidget.hpp"
 
 namespace gui
 {

@@ 2,8 2,8 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "SARInfoWindow.hpp"
-#include "application-settings-new/ApplicationSettings.hpp"
-#include "application-settings-new/widgets/SettingsStyle.hpp"
+#include "application-settings/ApplicationSettings.hpp"
+#include "application-settings/widgets/SettingsStyle.hpp"
 
 namespace gui
 {

@@ 5,7 5,7 @@
 
 #include "AppWindow.hpp"
 
-#include "application-settings-new/presenter/SARInfoWindowPresenter.hpp"
+#include "application-settings/presenter/SARInfoWindowPresenter.hpp"
 
 #include <module-gui/gui/widgets/Label.hpp>
 #include <module-gui/gui/widgets/Text.hpp>

@@ 3,8 3,8 @@
 
 #include <locks/widgets/Lock.hpp>
 #include <locks/data/LockData.hpp>
-#include "application-settings-new/ApplicationSettings.hpp"
-#include "application-settings-new/data/ChangePasscodeData.hpp"
+#include "application-settings/ApplicationSettings.hpp"
+#include "application-settings/data/ChangePasscodeData.hpp"
 #include "module-apps/application-desktop/windows/Names.hpp"
 #include "OptionSetting.hpp"
 #include "SecurityMainWindow.hpp"

@@ 2,7 2,7 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "SettingsMainWindow.hpp"
-#include "application-settings-new/ApplicationSettings.hpp"
+#include "application-settings/ApplicationSettings.hpp"
 
 #include <i18n/i18n.hpp>
 #include <log.hpp>

@@ 2,10 2,10 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "SoundSelectWindow.hpp"
-#include "application-settings-new/ApplicationSettings.hpp"
-#include "application-settings-new/models/SoundsModel.hpp"
-#include "application-settings-new/widgets/SettingsSoundItem.hpp"
-#include "application-settings-new/data/SoundSelectData.hpp"
+#include "application-settings/ApplicationSettings.hpp"
+#include "application-settings/models/SoundsModel.hpp"
+#include "application-settings/widgets/SettingsSoundItem.hpp"
+#include "application-settings/data/SoundSelectData.hpp"
 #include <gui/widgets/ListView.hpp>
 #include <i18n/i18n.hpp>
 

@@ 3,7 3,7 @@
 
 #pragma once
 
-#include "application-settings-new/models/AbstractSoundsModel.hpp"
+#include "application-settings/models/AbstractSoundsModel.hpp"
 #include "AppWindow.hpp"
 
 namespace gui

@@ 1,7 1,7 @@
 // Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include "application-settings-new/ApplicationSettings.hpp"
+#include "application-settings/ApplicationSettings.hpp"
 #include "OptionSetting.hpp"
 #include "SystemMainWindow.hpp"
 #include "DialogMetadataMessage.hpp"

@@ 2,9 2,9 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "TechnicalInformationWindow.hpp"
-#include <application-settings-new/ApplicationSettings.hpp>
+#include <application-settings/ApplicationSettings.hpp>
 #include <widgets/Text.hpp>
-#include <application-settings-new/widgets/SettingsStyle.hpp>
+#include <application-settings/widgets/SettingsStyle.hpp>
 #include <source/version.hpp>
 
 namespace gui

@@ 4,8 4,8 @@
 #pragma once
 
 #include "BaseSettingsWindow.hpp"
-#include <module-apps/application-settings-new/ApplicationSettings.hpp>
-#include <module-apps/application-settings-new/presenter/TechnicalWindowPresenter.hpp>
+#include <module-apps/application-settings/ApplicationSettings.hpp>
+#include <module-apps/application-settings/presenter/TechnicalWindowPresenter.hpp>
 
 namespace gui
 {

@@ 2,8 2,8 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "TorchWindow.hpp"
-#include "application-settings-new/ApplicationSettings.hpp"
-#include "application-settings-new/widgets/SettingsStyle.hpp"
+#include "application-settings/ApplicationSettings.hpp"
+#include "application-settings/widgets/SettingsStyle.hpp"
 
 #include "OptionSetting.hpp"
 

@@ 3,7 3,7 @@
 
 #include "WallpaperWindow.hpp"
 
-#include "application-settings-new/ApplicationSettings.hpp"
+#include "application-settings/ApplicationSettings.hpp"
 #include "OptionSetting.hpp"
 
 #include <i18n/i18n.hpp>

@@ 3,7 3,7 @@
 
 #include "AdvancedOptionsWindow.hpp"
 
-#include <application-settings-new/ApplicationSettings.hpp>
+#include <application-settings/ApplicationSettings.hpp>
 
 std::list<gui::Option> advancedOptions(app::Application *app)
 {

@@ 3,8 3,8 @@
 
 #include "ColorTestWindow.hpp"
 
-#include <application-settings-new/ApplicationSettings.hpp>
-#include <application-settings-new/widgets/advanced/ColorTestListStyle.hpp>
+#include <application-settings/ApplicationSettings.hpp>
+#include <application-settings/widgets/advanced/ColorTestListStyle.hpp>
 
 #include <service-gui/Common.hpp>
 #include <service-gui/messages/ChangeColorScheme.hpp>

@@ 5,8 5,8 @@
 
 #include "AppWindow.hpp"
 
-#include "application-settings-new/models/advanced/ColorTestModel.hpp"
-#include "application-settings-new/widgets/advanced/ColorTestListView.hpp"
+#include "application-settings/models/advanced/ColorTestModel.hpp"
+#include "application-settings/widgets/advanced/ColorTestListView.hpp"
 
 namespace gui
 {

@@ 3,7 3,7 @@
 
 #include "EinkModeWindow.hpp"
 
-#include <application-settings-new/ApplicationSettings.hpp>
+#include <application-settings/ApplicationSettings.hpp>
 #include <messages/EinkModeMessage.hpp>
 
 namespace gui

@@ 3,7 3,7 @@
 
 #include "InformationWindow.hpp"
 
-#include <application-settings-new/ApplicationSettings.hpp>
+#include <application-settings/ApplicationSettings.hpp>
 #include <service-cellular/CellularServiceAPI.hpp>
 
 #include <source/version.hpp>

@@ 3,7 3,7 @@
 
 #include "UITestWindow.hpp"
 
-#include <application-settings-new/ApplicationSettings.hpp>
+#include <application-settings/ApplicationSettings.hpp>
 #include <Font.hpp>
 
 namespace gui

@@ 8,7 8,7 @@
 #include <service-bluetooth/messages/ResponseVisibleDevices.hpp>
 #include <service-bluetooth/messages/Unpair.hpp>
 #include <service-bluetooth/messages/Passkey.hpp>
-#include <application-settings-new/ApplicationSettings.hpp>
+#include <application-settings/ApplicationSettings.hpp>
 extern "C"
 {
 #include "btstack.h"


@@ 85,7 85,7 @@ namespace bluetooth
     {
         auto msg = std::make_shared<message::bluetooth::ResponseVisibleDevices>(devices);
         ownerService->bus.sendUnicast(msg, "ApplicationSettings");
-        ownerService->bus.sendUnicast(std::move(msg), app::name_settings_new);
+        ownerService->bus.sendUnicast(std::move(msg), app::name_settings);
     }
 
     auto GAP::startScan() -> int


@@ 208,7 208,7 @@ namespace bluetooth
 
         auto msg = std::make_shared<BluetoothPairResultMessage>(currentlyProcessedDeviceAddr, result == 0u);
         currentlyProcessedDeviceAddr.clear();
-        ownerService->bus.sendUnicast(std::move(msg), app::name_settings_new);
+        ownerService->bus.sendUnicast(std::move(msg), app::name_settings);
     }
     /* @text In ACTIVE, the following events are processed:
      *  - GAP Inquiry result event: BTstack provides a unified inquiry result that contain


@@ 261,7 261,7 @@ namespace bluetooth
             LOG_DEBUG("PIN code request!");
             hci_event_pin_code_request_get_bd_addr(packet, address);
             auto msg = std::make_shared<::message::bluetooth::RequestPasskey>();
-            ownerService->bus.sendUnicast(std::move(msg), app::name_settings_new);
+            ownerService->bus.sendUnicast(std::move(msg), app::name_settings);
         }
         const auto eventType = hci_event_packet_get_type(packet);
         switch (state) {


@@ 292,8 292,7 @@ namespace bluetooth
         LOG_INFO("Device unpaired");
         std::string unpairedDevAddr{bd_addr_to_str(addr)};
         ownerService->bus.sendUnicast(
-            std::make_shared<message::bluetooth::UnpairResult>(std::move(unpairedDevAddr), true),
-            app::name_settings_new);
+            std::make_shared<message::bluetooth::UnpairResult>(std::move(unpairedDevAddr), true), app::name_settings);
         return true;
     }
     auto GAP::isServiceSupportedByRemote(bd_addr_t addr, uint32_t typeOfService) -> bool

@@ 41,7 41,7 @@
 namespace
 {
     constexpr auto BluetoothServiceStackDepth = 2560U;
-    inline constexpr auto nameSettingsNew     = "ApplicationSettingsNew";
+    inline constexpr auto nameSettings        = "ApplicationSettings";
     inline constexpr auto connectionTimeout   = std::chrono::minutes{30};
 } // namespace
 


@@ 240,7 240,7 @@ auto ServiceBluetooth::handle(message::bluetooth::ConnectResult *msg) -> std::sh
         settingsHolder->setValue(bluetooth::Settings::ConnectedDevice, msg->getAddr());
         startTimeoutTimer();
     }
-    bus.sendUnicast(std::make_shared<message::bluetooth::ConnectResult>(*msg), nameSettingsNew);
+    bus.sendUnicast(std::make_shared<message::bluetooth::ConnectResult>(*msg), nameSettings);
     return sys::MessageNone{};
 }
 


@@ 257,7 257,7 @@ auto ServiceBluetooth::handle(message::bluetooth::DisconnectResult *msg) -> std:
         std::visit(bluetooth::StringVisitor(), this->settingsHolder->getValue(bluetooth::Settings::BondedDevices));
     bus.sendUnicast(std::make_shared<message::bluetooth::ResponseBondedDevices>(
                         SettingsSerializer::fromString(bondedDevicesStr), std::string()),
-                    nameSettingsNew);
+                    nameSettings);
     stopTimeoutTimer();
 
     return sys::MessageNone{};

@@ 7,7 7,7 @@
 #include <application-call/ApplicationCall.hpp>
 #include <application-calllog/ApplicationCallLog.hpp>
 #include <application-desktop/ApplicationDesktop.hpp>
-#include <application-settings-new/ApplicationSettings.hpp>
+#include <application-settings/ApplicationSettings.hpp>
 #include <application-special-input/ApplicationSpecialInput.hpp>
 #include <application-calendar/ApplicationCalendar.hpp>
 #include <application-music-player/ApplicationMusicPlayer.hpp>

@@ 11,7 11,7 @@
 #include <application-messages/ApplicationMessages.hpp>
 #include <application-notes/ApplicationNotes.hpp>
 #include <application-phonebook/ApplicationPhonebook.hpp>
-#include <application-settings-new/ApplicationSettings.hpp>
+#include <application-settings/ApplicationSettings.hpp>
 #include <application-special-input/ApplicationSpecialInput.hpp>
 #include <application-calendar/ApplicationCalendar.hpp>
 #include <application-music-player/ApplicationMusicPlayer.hpp>


@@ 126,8 126,8 @@ int main()
 #ifdef ENABLE_APP_CALL
             applications.push_back(app::CreateLauncher<app::ApplicationCall>(app::name_call));
 #endif
-#ifdef ENABLE_APP_SETTINGS_NEW
-            applications.push_back(app::CreateLauncher<app::ApplicationSettingsNew>(app::name_settings_new));
+#ifdef ENABLE_APP_SETTINGS
+            applications.push_back(app::CreateLauncher<app::ApplicationSettings>(app::name_settings));
 #endif
 #ifdef ENABLE_APP_NOTES
             applications.push_back(app::CreateLauncher<app::ApplicationNotes>(app::name_notes));

@@ 16,9 16,9 @@ def bt_main_window(harness):
 
     log.info("Navigating to ApplicationSettings")
     harness.open_application("settings")
-    if harness.connection.get_application_name() != "ApplicationSettingsNew":
+    if harness.connection.get_application_name() != "ApplicationSettings":
         time.sleep(5)
-        assert harness.connection.get_application_name() == "ApplicationSettingsNew"
+        assert harness.connection.get_application_name() == "ApplicationSettings"
 
     log.info("Opening Bluetooth")
     harness.connection.send_key_code(key_codes["down"])

@@ 27,7 27,7 @@ app_navigation_to_name_mapping = {
     "contacts": "ApplicationPhonebook",
     "music": "ApplicationMusicPlayer",
     #    "meditation": "ApplicationMeditation",
-    #    "settings": "ApplicationSettingsNew",
+    #    "settings": "ApplicationSettings",
     "tools": "ApplicationDesktop",  # other MenuPage
     "alarm": "ApplicationAlarmClock",
     "calendar": "ApplicationCalendar"