From 5de4026e6dd0131e73e919509b4496485fc6ceef Mon Sep 17 00:00:00 2001
From: Lefucjusz <marcin.lyda@mudita.com>
Date: Fri, 12 Jul 2024 10:42:23 +0200
Subject: [PATCH] [BH-2038] Remove redundant frames around screen

* Removed frames that were drawn around the
entire screen, as they're not present in
the design and are not even visible,
as the very edge of the display is
covered by the casing.
* Cleanups.
---
 .../windows/FocusMainWindow.cpp               | 12 +--
 .../windows/FocusSettingsWindow.cpp           |  7 +-
 .../windows/FocusSettingsWindow.hpp           |  2 +-
 .../windows/FocusTimerWindow.cpp              | 88 ++++++++++---------
 .../windows/FocusTimerWindow.hpp              | 37 ++++----
 .../windows/MeditationCountdownWindow.cpp     |  9 +-
 .../windows/MeditationCountdownWindow.hpp     |  8 +-
 .../windows/MeditationMainWindow.cpp          | 15 ++--
 .../windows/MeditationMainWindow.hpp          |  4 +-
 .../windows/MeditationRunningWindow.cpp       | 40 ++++-----
 .../windows/MeditationRunningWindow.hpp       | 11 ++-
 .../windows/MeditationTimerWindow.cpp         | 13 +--
 .../windows/MeditationTimerWindow.hpp         | 28 +++---
 .../windows/SettingsWindow.cpp                | 11 +--
 .../windows/SettingsWindow.hpp                | 13 +--
 .../windows/StatisticsWindow.cpp              | 16 ++--
 .../windows/StatisticsWindow.hpp              | 13 +--
 .../windows/PowerNapMainWindow.cpp            |  9 +-
 .../windows/PowerNapProgressWindow.cpp        |  1 +
 .../windows/PowerNapSessionEndedWindow.cpp    |  4 +-
 .../windows/RelaxationPausedWindow.cpp        |  2 +-
 .../common/windows/ShortcutsWindow.hpp        | 22 +++--
 .../src/layouts/ShortcutsLayoutClassic.cpp    |  4 +-
 .../common/src/windows/ShortcutsWindow.cpp    | 10 +--
 24 files changed, 203 insertions(+), 176 deletions(-)

diff --git a/products/BellHybrid/apps/application-bell-focus-timer/windows/FocusMainWindow.cpp b/products/BellHybrid/apps/application-bell-focus-timer/windows/FocusMainWindow.cpp
index beab58a41979577015359cffd53691aaac42f693..48c84f589e85c7a58baebf026d5ab918b52a0d47 100644
--- a/products/BellHybrid/apps/application-bell-focus-timer/windows/FocusMainWindow.cpp
+++ b/products/BellHybrid/apps/application-bell-focus-timer/windows/FocusMainWindow.cpp
@@ -30,11 +30,11 @@ namespace app::focus
 
     std::list<Option> FocusMainWindow::settingsOptionsList()
     {
-        using ActivatedCallback = std::function<bool(gui::Item &)>;
+        using ActivatedCallback = std::function<bool(Item &)>;
         using Callback          = std::function<ActivatedCallback(const std::string &window)>;
 
         auto defaultCallback = [this](const std::string &window) {
-            return [window, this](gui::Item &) {
+            return [window, this](Item &) {
                 if (window.empty()) {
                     return false;
                 }
@@ -50,7 +50,7 @@ namespace app::focus
                 }
                 application->switchWindow(window);
             };
-            return [window, this](gui::Item &) {
+            return [window, this](Item &) {
                 const auto batteryState = presenter->getBatteryState();
                 const auto soc          = batteryState.level;
                 const auto isCharging   = presenter->isBatteryCharging(batteryState.state);
@@ -69,12 +69,12 @@ namespace app::focus
             };
         };
 
-        std::list<gui::Option> settingsOptionList;
+        std::list<Option> settingsOptionList;
         auto addWinSettings = [&](const UTF8 &name, const std::string &window, Callback &&callback) {
-            settingsOptionList.emplace_back(std::make_unique<gui::option::OptionBellMenu>(
+            settingsOptionList.emplace_back(std::make_unique<option::OptionBellMenu>(
                 name,
                 callback(window),
-                [=](gui::Item &item) {
+                [=](Item &item) {
                     // put focus change callback here
                     return true;
                 },
diff --git a/products/BellHybrid/apps/application-bell-focus-timer/windows/FocusSettingsWindow.cpp b/products/BellHybrid/apps/application-bell-focus-timer/windows/FocusSettingsWindow.cpp
index 92865b23986c3e43d6c04aa7af5b30a40ce0d249..73be30fefb686a924a2a2857b72e49c6bfee38c8 100644
--- a/products/BellHybrid/apps/application-bell-focus-timer/windows/FocusSettingsWindow.cpp
+++ b/products/BellHybrid/apps/application-bell-focus-timer/windows/FocusSettingsWindow.cpp
@@ -12,6 +12,7 @@
 namespace app::focus
 {
     using namespace gui;
+
     SettingsWindow::SettingsWindow(app::ApplicationCommon *app,
                                    std::unique_ptr<SettingsContract::Presenter> presenter,
                                    const std::string &name)
@@ -35,7 +36,7 @@ namespace app::focus
         header->setTitleVisibility(false);
         navBar->setVisible(false);
 
-        sideListView = new gui::SideListView(
+        sideListView = new SideListView(
             this, 0U, 0U, this->getWidth(), this->getHeight(), presenter->getPagesProvider(), PageBarType::None);
         sideListView->setEdges(RectangleEdge::None);
 
@@ -44,13 +45,13 @@ namespace app::focus
         presenter->loadData();
     }
 
-    void SettingsWindow::onBeforeShow(gui::ShowMode mode, gui::SwitchData *data)
+    void SettingsWindow::onBeforeShow(ShowMode mode, SwitchData *data)
     {
         AppWindow::onBeforeShow(mode, data);
         setFocusItem(sideListView);
     }
 
-    bool SettingsWindow::onInput(const gui::InputEvent &inputEvent)
+    bool SettingsWindow::onInput(const InputEvent &inputEvent)
     {
         if (sideListView->onInput(inputEvent)) {
             return true;
diff --git a/products/BellHybrid/apps/application-bell-focus-timer/windows/FocusSettingsWindow.hpp b/products/BellHybrid/apps/application-bell-focus-timer/windows/FocusSettingsWindow.hpp
index 65df8aa5e64f81937f1967dfd80612dbffd15655..c9d1f1f22b0c774efd95e0602b9918697225cfaf 100644
--- a/products/BellHybrid/apps/application-bell-focus-timer/windows/FocusSettingsWindow.hpp
+++ b/products/BellHybrid/apps/application-bell-focus-timer/windows/FocusSettingsWindow.hpp
@@ -32,7 +32,7 @@ namespace app::focus
       private:
         void switchToExitWindow();
 
-        gui::SideListView *sideListView{};
+        gui::SideListView *sideListView{nullptr};
         std::unique_ptr<SettingsContract::Presenter> presenter;
         bool isSaveNeeded{false};
     };
diff --git a/products/BellHybrid/apps/application-bell-focus-timer/windows/FocusTimerWindow.cpp b/products/BellHybrid/apps/application-bell-focus-timer/windows/FocusTimerWindow.cpp
index 44dbcd2a29583c05e20cc3ae097d5cf2429e5232..ee9e90efe022c9fd9b0ba7423072a3f30b6d63be 100644
--- a/products/BellHybrid/apps/application-bell-focus-timer/windows/FocusTimerWindow.cpp
+++ b/products/BellHybrid/apps/application-bell-focus-timer/windows/FocusTimerWindow.cpp
@@ -5,10 +5,12 @@
 #include <data/FocusTimerStyle.hpp>
 
 #include <Application.hpp>
-#include <apps-common/widgets/BellBaseLayout.hpp>
-#include <apps-common/ApplicationCommon.hpp>
+
+#include <gui/widgets/Icon.hpp>
+#include <common/widgets/BellStatusClock.hpp>
+#include <apps-common/widgets/BarGraph.hpp>
+#include <apps-common/widgets/TimeMinuteSecondWidget.hpp>
 #include <apps-common/widgets/ProgressTimerWithBarGraphAndCounter.hpp>
-#include <module-gui/gui/input/InputEvent.hpp>
 
 namespace
 {
@@ -19,6 +21,8 @@ namespace
 
 namespace app::focus
 {
+    using namespace gui;
+
     FocusTimerWindow::FocusTimerWindow(app::ApplicationCommon *app,
                                        std::unique_ptr<FocusTimerContract::Presenter> &&windowPresenter,
                                        const std::string &name)
@@ -50,60 +54,60 @@ namespace app::focus
         const auto arcSweepAngle    = 360 - (2 * runningStyle::progress::verticalDeviationDegrees);
         const auto arcProgressSteps = 1000;
 
-        gui::Arc::ShapeParams arcParams;
-        arcParams.setCenterPoint(gui::Point(getWidth() / 2, getHeight() / 2))
+        Arc::ShapeParams arcParams;
+        arcParams.setCenterPoint(Point(getWidth() / 2, getHeight() / 2))
             .setRadius(progressArcRadius)
             .setStartAngle(arcStartAngle)
             .setSweepAngle(arcSweepAngle)
             .setPenWidth(progressArcWidth)
-            .setBorderColor(gui::ColorFullBlack);
+            .setBorderColor(ColorFullBlack);
 
-        progress = new gui::ArcProgressBar(this,
-                                           arcParams,
-                                           gui::ArcProgressBar::ProgressDirection::CounterClockwise,
-                                           gui::ArcProgressBar::ProgressChange::DecrementFromFull);
+        progress = new ArcProgressBar(this,
+                                      arcParams,
+                                      ArcProgressBar::ProgressDirection::CounterClockwise,
+                                      ArcProgressBar::ProgressChange::DecrementFromFull);
         progress->setMaximum(arcProgressSteps);
 
-        mainVBox = new gui::VBox(this, 0, 0, style::window_width, style::window_height);
+        mainVBox = new VBox(this, 0, 0, style::window_width, style::window_height);
+        mainVBox->setEdges(RectangleEdge::None);
 
-        clock = new gui::BellStatusClock(mainVBox);
+        clock = new BellStatusClock(mainVBox);
         clock->setMaximumSize(runningStyle::clock::maxSizeX, runningStyle::clock::maxSizeY);
-        clock->setAlignment(gui::Alignment(gui::Alignment::Horizontal::Center, gui::Alignment::Vertical::Center));
-        clock->setMargins(gui::Margins(0, runningStyle::clock::marginTop, 0, 0));
-
-        timer = new gui::TimeMinuteSecondWidget(mainVBox,
-                                                0,
-                                                0,
-                                                runningStyle::timer::maxSizeX,
-                                                runningStyle::timer::maxSizeY,
-                                                gui::TimeMinuteSecondWidget::DisplayType::MinutesThenSeconds);
+        clock->setAlignment(Alignment(Alignment::Horizontal::Center, Alignment::Vertical::Center));
+        clock->setMargins(Margins(0, runningStyle::clock::marginTop, 0, 0));
+
+        timer = new TimeMinuteSecondWidget(mainVBox,
+                                           0,
+                                           0,
+                                           runningStyle::timer::maxSizeX,
+                                           runningStyle::timer::maxSizeY,
+                                           TimeMinuteSecondWidget::DisplayType::MinutesThenSeconds);
         timer->setMinimumSize(runningStyle::timer::maxSizeX, runningStyle::timer::maxSizeY);
-        timer->setMargins(gui::Margins(0, runningStyle::timer::marginTop, 0, 0));
-        timer->setAlignment(gui::Alignment(gui::Alignment::Horizontal::Center, gui::Alignment::Vertical::Center));
+        timer->setMargins(Margins(0, runningStyle::timer::marginTop, 0, 0));
+        timer->setAlignment(Alignment(Alignment::Horizontal::Center, Alignment::Vertical::Center));
 
-        iconPause = new gui::Icon(mainVBox, 0, 0, 0, 0, {}, {});
+        iconPause = new Icon(mainVBox, 0, 0, 0, 0, {}, {});
         iconPause->setMinimumSize(runningStyle::pauseIcon::maxSizeX, runningStyle::pauseIcon::maxSizeY);
-        iconPause->setMargins(gui::Margins(0, runningStyle::pauseIcon::marginTop, 0, 0));
-        iconPause->setAlignment(gui::Alignment(gui::Alignment::Horizontal::Center, gui::Alignment::Vertical::Top));
-        iconPause->image->set(runningStyle::pauseIcon::image, gui::ImageTypeSpecifier::W_G);
+        iconPause->setMargins(Margins(0, runningStyle::pauseIcon::marginTop, 0, 0));
+        iconPause->setAlignment(Alignment(Alignment::Horizontal::Center, Alignment::Vertical::Top));
+        iconPause->image->set(runningStyle::pauseIcon::image, ImageTypeSpecifier::W_G);
         iconPause->setVisible(false);
 
-        iconRing = new gui::Icon(mainVBox, 0, 0, 0, 0, {}, {});
+        iconRing = new Icon(mainVBox, 0, 0, 0, 0, {}, {});
         iconRing->setMinimumSize(runningStyle::ringIcon::maxSizeX, runningStyle::ringIcon::maxSizeY);
-        iconRing->setMargins(gui::Margins(0, runningStyle::ringIcon::marginTop, 0, 0));
-        iconRing->setAlignment(gui::Alignment(gui::Alignment::Horizontal::Center, gui::Alignment::Vertical::Top));
-        iconRing->image->set(runningStyle::ringIcon::image, gui::ImageTypeSpecifier::W_G);
+        iconRing->setMargins(Margins(0, runningStyle::ringIcon::marginTop, 0, 0));
+        iconRing->setAlignment(Alignment(Alignment::Horizontal::Center, Alignment::Vertical::Top));
+        iconRing->image->set(runningStyle::ringIcon::image, ImageTypeSpecifier::W_G);
         iconRing->setVisible(false);
 
-        bottomDescription = new gui::TextFixedSize(
+        bottomDescription = new TextFixedSize(
             mainVBox, 0, 0, runningStyle::bottomDescription::maxSizeX, runningStyle::bottomDescription::maxSizeY);
         bottomDescription->setMaximumSize(runningStyle::bottomDescription::maxSizeX,
                                           runningStyle::bottomDescription::maxSizeY);
         bottomDescription->setFont(runningStyle::bottomDescription::font);
-        bottomDescription->setMargins(gui::Margins(0, 0, 0, 0));
+        bottomDescription->setMargins(Margins(0, 0, 0, 0));
         bottomDescription->activeItem = false;
-        bottomDescription->setAlignment(
-            gui::Alignment(gui::Alignment::Horizontal::Center, gui::Alignment::Vertical::Top));
+        bottomDescription->setAlignment(Alignment(Alignment::Horizontal::Center, Alignment::Vertical::Top));
         bottomDescription->setRichText(utils::translate("app_bell_focus_time"));
         bottomDescription->drawUnderline(false);
         bottomDescription->setVisible(true);
@@ -111,20 +115,20 @@ namespace app::focus
         mainVBox->resizeItems();
     }
 
-    void FocusTimerWindow::onBeforeShow(gui::ShowMode mode, gui::SwitchData *data)
+    void FocusTimerWindow::onBeforeShow(ShowMode mode, SwitchData *data)
     {
         AppWindow::onBeforeShow(mode, data);
         presenter->onBeforeShow();
         updateTime();
-        if (mode == gui::ShowMode::GUI_SHOW_INIT) {
+        if (mode == ShowMode::GUI_SHOW_INIT) {
             presenter->playGong();
             presenter->start();
         }
     }
 
-    bool FocusTimerWindow::onInput(const gui::InputEvent &inputEvent)
+    bool FocusTimerWindow::onInput(const InputEvent &inputEvent)
     {
-        if (inputEvent.isShortRelease(gui::KeyCode::KEY_ENTER)) {
+        if (inputEvent.isShortRelease(KeyCode::KEY_ENTER)) {
             if (presenter->isAllSessionsFinished()) {
                 presenter->finish();
             }
@@ -136,7 +140,7 @@ namespace app::focus
             }
             return true;
         }
-        if (inputEvent.isShortRelease(gui::KeyCode::KEY_RF)) {
+        if (inputEvent.isShortRelease(KeyCode::KEY_RF)) {
             static_cast<app::Application *>(application)->resumeIdleTimer();
             presenter->abandon();
             return true;
@@ -244,11 +248,11 @@ namespace app::focus
         clock->setTimeFormat(fmt);
     }
 
-    gui::RefreshModes FocusTimerWindow::updateTime()
+    RefreshModes FocusTimerWindow::updateTime()
     {
         if (presenter != nullptr) {
             presenter->handleUpdateTimeEvent();
         }
-        return gui::RefreshModes::GUI_REFRESH_FAST;
+        return RefreshModes::GUI_REFRESH_FAST;
     }
 } // namespace app::focus
diff --git a/products/BellHybrid/apps/application-bell-focus-timer/windows/FocusTimerWindow.hpp b/products/BellHybrid/apps/application-bell-focus-timer/windows/FocusTimerWindow.hpp
index 28282203d6690f147367cbac2d39b1a308ed6fd1..0578bef2c522971cd50cce8ff91b00e67d68a0d8 100644
--- a/products/BellHybrid/apps/application-bell-focus-timer/windows/FocusTimerWindow.hpp
+++ b/products/BellHybrid/apps/application-bell-focus-timer/windows/FocusTimerWindow.hpp
@@ -6,25 +6,30 @@
 #include "data/FocusCommon.hpp"
 #include "presenter/FocusTimerPresenter.hpp"
 
-#include <Text.hpp>
-#include <apps-common/widgets/BarGraph.hpp>
-#include <apps-common/widgets/TimeMinuteSecondWidget.hpp>
-#include <common/widgets/BellStatusClock.hpp>
-#include <gui/widgets/Icon.hpp>
 #include <apps-common/windows/AppWindow.hpp>
 
+namespace gui
+{
+    class ArcProgressBar;
+    class TimeMinuteSecondWidget;
+    class Icon;
+    class BellStatusClock;
+} // namespace gui
+
 namespace app::focus
 {
-    class FocusTimerWindow : public gui::AppWindow, public FocusTimerContract::View
+    using namespace gui;
+
+    class FocusTimerWindow : public AppWindow, public FocusTimerContract::View
     {
       public:
         FocusTimerWindow(app::ApplicationCommon *app,
                          std::unique_ptr<FocusTimerContract::Presenter> &&windowPresenter,
                          const std::string &name = window::name::timer);
 
-        void onBeforeShow(gui::ShowMode mode, gui::SwitchData *data) override;
+        void onBeforeShow(ShowMode mode, SwitchData *data) override;
         void buildInterface() override;
-        bool onInput(const gui::InputEvent &inputEvent) override;
+        bool onInput(const InputEvent &inputEvent) override;
         void showFocusSessionCountdown() override;
         void showShortBreakCountdown() override;
         void showLongBreakCountdown() override;
@@ -36,17 +41,17 @@ namespace app::focus
 
       private:
         std::unique_ptr<FocusTimerContract::Presenter> presenter;
-        gui::VBox *mainVBox{nullptr};
-        gui::ArcProgressBar *progress{nullptr};
-        gui::TimeMinuteSecondWidget *timer{nullptr};
-        gui::TextFixedSize *bottomDescription{nullptr};
-        gui::Icon *iconPause{nullptr};
-        gui::Icon *iconRing{nullptr};
-        gui::BellStatusClock *clock{nullptr};
+        VBox *mainVBox{nullptr};
+        ArcProgressBar *progress{nullptr};
+        TimeMinuteSecondWidget *timer{nullptr};
+        TextFixedSize *bottomDescription{nullptr};
+        Icon *iconPause{nullptr};
+        Icon *iconRing{nullptr};
+        BellStatusClock *clock{nullptr};
 
         void setTime(std::time_t newTime) override;
         void setTimeFormat(utils::time::Locale::TimeFormat fmt) override;
-        gui::RefreshModes updateTime() override;
+        RefreshModes updateTime() override;
 
         void buildLayout();
         void configureTimer();
diff --git a/products/BellHybrid/apps/application-bell-meditation-timer/windows/MeditationCountdownWindow.cpp b/products/BellHybrid/apps/application-bell-meditation-timer/windows/MeditationCountdownWindow.cpp
index a4031d4ce34463df45ebd04758ca48d9d72d26b0..b19e1aa367369030db69acd07620eade4a76b667 100644
--- a/products/BellHybrid/apps/application-bell-meditation-timer/windows/MeditationCountdownWindow.cpp
+++ b/products/BellHybrid/apps/application-bell-meditation-timer/windows/MeditationCountdownWindow.cpp
@@ -1,16 +1,18 @@
 // Copyright (c) 2017-2024, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include <Arc.hpp>
-
 #include "MeditationTimer.hpp"
 #include "MeditationCommon.hpp"
 #include "MeditationCountdownWindow.hpp"
 #include "MeditationStyle.hpp"
 
-#include <keymap/KeyMap.hpp>
+#include <Arc.hpp>
+#include <Text.hpp>
+#include <apps-common/widgets/TimeMinuteSecondWidget.hpp>
 #include <apps-common/widgets/ProgressTimerWithBarGraphAndCounter.hpp>
 
+#include <keymap/KeyMap.hpp>
+
 namespace
 {
     constexpr auto meditationCountdownTimerName{"MeditationCountdownTimer"};
@@ -61,6 +63,7 @@ namespace gui
         progress = new Arc(this, arcParams);
 
         mainVBox = new VBox(this, 0, 0, style::window_width, style::window_height);
+        mainVBox->setEdges(RectangleEdge::None);
 
         description = new Text(mainVBox, 0, 0, 0, 0);
         description->setText(utils::translate("app_meditation_countdown_desc"));
diff --git a/products/BellHybrid/apps/application-bell-meditation-timer/windows/MeditationCountdownWindow.hpp b/products/BellHybrid/apps/application-bell-meditation-timer/windows/MeditationCountdownWindow.hpp
index 96b95ce815583b52e86c6fd16db31769b63b1f89..0e25c8d1b6e885a3013eeabbfac0c2fb2372314c 100644
--- a/products/BellHybrid/apps/application-bell-meditation-timer/windows/MeditationCountdownWindow.hpp
+++ b/products/BellHybrid/apps/application-bell-meditation-timer/windows/MeditationCountdownWindow.hpp
@@ -3,17 +3,16 @@
 
 #pragma once
 
+#include "MeditationCountdownPresenter.hpp"
+
 #include <Application.hpp>
 #include <AppWindow.hpp>
 #include <InputEvent.hpp>
-#include <Text.hpp>
-#include <apps-common/widgets/TimeMinuteSecondWidget.hpp>
-
-#include "MeditationCountdownPresenter.hpp"
 
 namespace gui
 {
     class Arc;
+    class TimeMinuteSecondWidget;
 
     class MeditationCountdownWindow : public AppWindow, public app::meditation::MeditationCountdownContract::View
     {
@@ -22,7 +21,6 @@ namespace gui
             app::ApplicationCommon *app,
             std::unique_ptr<app::meditation::MeditationCountdownContract::Presenter> &&windowPresenter);
 
-        // virtual methods
         void onBeforeShow(ShowMode mode, SwitchData *data) override;
         bool onInput(const InputEvent &inputEvent) override;
         void buildInterface() override;
diff --git a/products/BellHybrid/apps/application-bell-meditation-timer/windows/MeditationMainWindow.cpp b/products/BellHybrid/apps/application-bell-meditation-timer/windows/MeditationMainWindow.cpp
index e95571cf73acad7907567ae296e083db72993e24..63d5f892600d50b6ab4c7f1e6a60e2cfb8a8282e 100644
--- a/products/BellHybrid/apps/application-bell-meditation-timer/windows/MeditationMainWindow.cpp
+++ b/products/BellHybrid/apps/application-bell-meditation-timer/windows/MeditationMainWindow.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2023, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2024, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "MeditationMainWindow.hpp"
@@ -14,8 +14,9 @@
 namespace app::meditation
 {
     using namespace gui;
+
     MeditationMainWindow::MeditationMainWindow(app::ApplicationCommon *app)
-        : BellOptionWindow(app, gui::name::window::main_window)
+        : BellOptionWindow(app, name::window::main_window)
     {
         addOptions(settingsOptionsList());
         setListTitle(utils::translate("app_bell_meditation_timer"));
@@ -23,11 +24,11 @@ namespace app::meditation
 
     std::list<Option> MeditationMainWindow::settingsOptionsList()
     {
-        using ActivatedCallback = std::function<bool(gui::Item &)>;
+        using ActivatedCallback = std::function<bool(Item &)>;
         using Callback          = std::function<ActivatedCallback(const std::string &window)>;
 
         auto defaultCallback = [this](const std::string &window) {
-            return [window, this](gui::Item &) {
+            return [window, this](Item &) {
                 if (window.empty()) {
                     return false;
                 }
@@ -36,12 +37,12 @@ namespace app::meditation
             };
         };
 
-        std::list<gui::Option> settingsOptionList;
+        std::list<Option> settingsOptionList;
         auto addWinSettings = [&](const UTF8 &name, const std::string &window, Callback &&callback) {
-            settingsOptionList.emplace_back(std::make_unique<gui::option::OptionBellMenu>(
+            settingsOptionList.emplace_back(std::make_unique<option::OptionBellMenu>(
                 name,
                 callback(window),
-                [=](gui::Item &item) {
+                [=](Item &item) {
                     // put focus change callback here
                     return true;
                 },
diff --git a/products/BellHybrid/apps/application-bell-meditation-timer/windows/MeditationMainWindow.hpp b/products/BellHybrid/apps/application-bell-meditation-timer/windows/MeditationMainWindow.hpp
index 2830ed786a5a5bdf6c85866a6f5083dfc90d29bb..313dae68a9552b5daf369d6ca7f03e1bee697280 100644
--- a/products/BellHybrid/apps/application-bell-meditation-timer/windows/MeditationMainWindow.hpp
+++ b/products/BellHybrid/apps/application-bell-meditation-timer/windows/MeditationMainWindow.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2024, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #pragma once
@@ -11,10 +11,10 @@ namespace app::meditation
     {
       public:
         static constexpr auto defaultName = gui::name::window::main_window;
+
         explicit MeditationMainWindow(app::ApplicationCommon *app);
 
       private:
         std::list<gui::Option> settingsOptionsList();
     };
-
 } // namespace app::meditation
diff --git a/products/BellHybrid/apps/application-bell-meditation-timer/windows/MeditationRunningWindow.cpp b/products/BellHybrid/apps/application-bell-meditation-timer/windows/MeditationRunningWindow.cpp
index 4c257abd788700fb2c5c16348debac5e084b5f54..92862de34b0a761981d895dbdec15f808452936a 100644
--- a/products/BellHybrid/apps/application-bell-meditation-timer/windows/MeditationRunningWindow.cpp
+++ b/products/BellHybrid/apps/application-bell-meditation-timer/windows/MeditationRunningWindow.cpp
@@ -6,11 +6,11 @@
 #include "MeditationRunningWindow.hpp"
 #include "MeditationStyle.hpp"
 
-#include <apps-common/widgets/BellBaseLayout.hpp>
-#include <apps-common/widgets/ProgressTimerWithBarGraphAndCounter.hpp>
-#include <apps-common/widgets/BarGraph.hpp>
-#include <common/widgets/BellStatusClock.hpp>
 #include <gui/widgets/Icon.hpp>
+#include <common/widgets/BellStatusClock.hpp>
+#include <apps-common/widgets/BarGraph.hpp>
+#include <apps-common/widgets/TimeMinuteSecondWidget.hpp>
+#include <apps-common/widgets/ProgressTimerWithBarGraphAndCounter.hpp>
 
 namespace
 {
@@ -67,38 +67,38 @@ namespace gui
         progress->setMaximum(arcProgressSteps);
 
         mainVBox = new VBox(this, 0, 0, style::window_width, style::window_height);
+        mainVBox->setEdges(RectangleEdge::None);
 
         clock = new BellStatusClock(mainVBox);
         clock->setMaximumSize(runningStyle::clock::maxSizeX, runningStyle::clock::maxSizeY);
         clock->setAlignment(Alignment(Alignment::Horizontal::Center, Alignment::Vertical::Center));
-        clock->setMargins(gui::Margins(0, runningStyle::clock::marginTop, 0, 0));
-
-        timer = new gui::TimeMinuteSecondWidget(mainVBox,
-                                                0,
-                                                0,
-                                                runningStyle::timer::maxSizeX,
-                                                runningStyle::timer::maxSizeY,
-                                                gui::TimeMinuteSecondWidget::DisplayType::OnlyMinutes);
+        clock->setMargins(Margins(0, runningStyle::clock::marginTop, 0, 0));
+
+        timer = new TimeMinuteSecondWidget(mainVBox,
+                                           0,
+                                           0,
+                                           runningStyle::timer::maxSizeX,
+                                           runningStyle::timer::maxSizeY,
+                                           TimeMinuteSecondWidget::DisplayType::OnlyMinutes);
         timer->setMinimumSize(runningStyle::timer::maxSizeX, runningStyle::timer::maxSizeY);
-        timer->setMargins(gui::Margins(0, runningStyle::timer::marginTop, 0, 0));
+        timer->setMargins(Margins(0, runningStyle::timer::marginTop, 0, 0));
         timer->setAlignment(Alignment(Alignment::Horizontal::Center, Alignment::Vertical::Center));
 
         icon = new Icon(mainVBox, 0, 0, 0, 0, {}, {});
         icon->setMinimumSize(runningStyle::pauseIcon::maxSizeX, runningStyle::pauseIcon::maxSizeY);
-        icon->setMargins(gui::Margins(0, runningStyle::pauseIcon::marginTop, 0, 0));
+        icon->setMargins(Margins(0, runningStyle::pauseIcon::marginTop, 0, 0));
         icon->setAlignment(Alignment(Alignment::Horizontal::Center, Alignment::Vertical::Center));
         icon->image->set(runningStyle::pauseIcon::image, ImageTypeSpecifier::W_G);
         icon->setVisible(false);
 
-        bottomDescription = new gui::TextFixedSize(
+        bottomDescription = new TextFixedSize(
             mainVBox, 0, 0, runningStyle::bottomDescription::maxSizeX, runningStyle::bottomDescription::maxSizeY);
         bottomDescription->setMaximumSize(runningStyle::bottomDescription::maxSizeX,
                                           runningStyle::bottomDescription::maxSizeY);
         bottomDescription->setFont(runningStyle::bottomDescription::font);
-        bottomDescription->setMargins(gui::Margins(0, 0, 0, 0));
+        bottomDescription->setMargins(Margins(0, 0, 0, 0));
         bottomDescription->activeItem = false;
-        bottomDescription->setAlignment(
-            gui::Alignment(gui::Alignment::Horizontal::Center, gui::Alignment::Vertical::Top));
+        bottomDescription->setAlignment(Alignment(Alignment::Horizontal::Center, Alignment::Vertical::Top));
         bottomDescription->setRichText(utils::translate("app_bellmain_meditation_timer"));
         bottomDescription->drawUnderline(false);
         bottomDescription->setVisible(true);
@@ -120,7 +120,7 @@ namespace gui
 
     bool MeditationRunningWindow::onInput(const InputEvent &inputEvent)
     {
-        if (inputEvent.isShortRelease(gui::KeyCode::KEY_ENTER)) {
+        if (inputEvent.isShortRelease(KeyCode::KEY_ENTER)) {
             if (presenter->isTimerStopped()) {
                 presenter->resume();
             }
@@ -129,7 +129,7 @@ namespace gui
             }
             return true;
         }
-        if (inputEvent.isShortRelease(gui::KeyCode::KEY_RF)) {
+        if (inputEvent.isShortRelease(KeyCode::KEY_RF)) {
             static_cast<app::Application *>(application)->resumeIdleTimer();
             presenter->abandon();
             return true;
diff --git a/products/BellHybrid/apps/application-bell-meditation-timer/windows/MeditationRunningWindow.hpp b/products/BellHybrid/apps/application-bell-meditation-timer/windows/MeditationRunningWindow.hpp
index c11f63d7d2facf3d56e20dacd66fab0db8792aa8..71cdf21ae06d3c567dbe53daada58625c3b2614f 100644
--- a/products/BellHybrid/apps/application-bell-meditation-timer/windows/MeditationRunningWindow.hpp
+++ b/products/BellHybrid/apps/application-bell-meditation-timer/windows/MeditationRunningWindow.hpp
@@ -3,18 +3,17 @@
 
 #pragma once
 
+#include "MeditationProgressPresenter.hpp"
+
 #include <Application.hpp>
 #include <AppWindow.hpp>
-#include <apps-common/widgets/TimeMinuteSecondWidget.hpp>
-
-#include "MeditationProgressPresenter.hpp"
 
 namespace gui
 {
     class ArcProgressBar;
     class BellStatusClock;
     class Icon;
-    class TimeFixedWidget;
+    class TimeMinuteSecondWidget;
 
     class MeditationRunningWindow : public AppWindow, public app::meditation::MeditationProgressContract::View
     {
@@ -36,9 +35,9 @@ namespace gui
         VBox *mainVBox{nullptr};
         ArcProgressBar *progress{nullptr};
         TimeMinuteSecondWidget *timer{nullptr};
-        gui::TextFixedSize *bottomDescription{nullptr};
+        TextFixedSize *bottomDescription{nullptr};
         Icon *icon{nullptr};
-        gui::BellStatusClock *clock{nullptr};
+        BellStatusClock *clock{nullptr};
 
         void setTime(std::time_t newTime) override;
         void setTimeFormat(utils::time::Locale::TimeFormat fmt) override;
diff --git a/products/BellHybrid/apps/application-bell-meditation-timer/windows/MeditationTimerWindow.cpp b/products/BellHybrid/apps/application-bell-meditation-timer/windows/MeditationTimerWindow.cpp
index c5961fe94030322ed917b956c3611e3883ac56b3..5bb899be54567e6d42cf957921b15322c2ebca1e 100644
--- a/products/BellHybrid/apps/application-bell-meditation-timer/windows/MeditationTimerWindow.cpp
+++ b/products/BellHybrid/apps/application-bell-meditation-timer/windows/MeditationTimerWindow.cpp
@@ -6,9 +6,12 @@
 #include "MeditationStyle.hpp"
 #include "MeditationTimerWindow.hpp"
 
+#include <widgets/BellBaseLayout.hpp>
+
 namespace app::meditation
 {
     using namespace gui;
+
     MeditationTimerWindow::MeditationTimerWindow(
         app::ApplicationCommon *app,
         std::unique_ptr<app::meditation::MeditationTimerContract::Presenter> &&windowPresenter)
@@ -33,15 +36,15 @@ namespace app::meditation
         auto topMessage = new TextFixedSize(body->firstBox);
         topMessage->setMaximumSize(style::bell_base_layout::w, style::bell_base_layout::outer_layouts_h);
         topMessage->setFont(style::window::font::largelight);
-        topMessage->setEdges(gui::RectangleEdge::None);
+        topMessage->setEdges(RectangleEdge::None);
         topMessage->activeItem = false;
-        topMessage->setAlignment(Alignment(gui::Alignment::Horizontal::Center, gui::Alignment::Vertical::Center));
+        topMessage->setAlignment(Alignment(Alignment::Horizontal::Center, Alignment::Vertical::Center));
         topMessage->setText(utils::translate("app_bell_meditation_timer"));
         topMessage->drawUnderline(false);
 
         spinner = new U8IntegerSpinner(
             U8IntegerSpinner::range{presenter->getMinValue(), presenter->getMaxValue(), presenter->getStepValue()},
-            gui::Boundaries::Fixed);
+            Boundaries::Fixed);
         spinner->onValueChanged = [this](const auto val) { this->onValueChanged(val); };
         spinner->setMaximumSize(style::bell_base_layout::w, style::bell_base_layout::h);
         spinner->setFont(timerStyle::text::font);
@@ -67,13 +70,13 @@ namespace app::meditation
         body->resize();
     }
 
-    bool MeditationTimerWindow::onInput(const gui::InputEvent &inputEvent)
+    bool MeditationTimerWindow::onInput(const InputEvent &inputEvent)
     {
         if (spinner->onInput(inputEvent)) {
             return true;
         }
 
-        if (inputEvent.isShortRelease(gui::KeyCode::KEY_ENTER)) {
+        if (inputEvent.isShortRelease(KeyCode::KEY_ENTER)) {
             presenter->activate(spinner->value());
             return true;
         }
diff --git a/products/BellHybrid/apps/application-bell-meditation-timer/windows/MeditationTimerWindow.hpp b/products/BellHybrid/apps/application-bell-meditation-timer/windows/MeditationTimerWindow.hpp
index 0e68c51843d8c79321d0b83b7412fb04e838ff2c..582df8c060b3f50e3591ccc8c36a87b2725bda17 100644
--- a/products/BellHybrid/apps/application-bell-meditation-timer/windows/MeditationTimerWindow.hpp
+++ b/products/BellHybrid/apps/application-bell-meditation-timer/windows/MeditationTimerWindow.hpp
@@ -1,37 +1,43 @@
-// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2024, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #pragma once
 
-#include <apps-common/widgets/spinners/Spinners.hpp>
-#include <widgets/BellBaseLayout.hpp>
+#include "MeditationTimerPresenter.hpp"
 
 #include <Application.hpp>
 #include <AppWindow.hpp>
 #include <InputEvent.hpp>
 
-#include "MeditationTimerPresenter.hpp"
+#include <apps-common/widgets/spinners/Spinners.hpp>
+
+namespace gui
+{
+    class BellBaseLayout;
+}
 
 namespace app::meditation
 {
-    class MeditationTimerWindow : public gui::AppWindow, public app::meditation::MeditationTimerContract::View
+    using namespace gui;
+
+    class MeditationTimerWindow : public AppWindow, public app::meditation::MeditationTimerContract::View
     {
       public:
         static constexpr auto name = "MeditationTimerWindow";
+
         explicit MeditationTimerWindow(
             app::ApplicationCommon *app,
             std::unique_ptr<app::meditation::MeditationTimerContract::Presenter> &&windowPresenter);
 
-        // virtual methods
         void buildInterface() override;
-        bool onInput(const gui::InputEvent &inputEvent) override;
+        bool onInput(const InputEvent &inputEvent) override;
 
-        void onValueChanged(const std::uint32_t currentValue);
+        void onValueChanged(std::uint32_t currentValue);
 
       private:
         std::unique_ptr<app::meditation::MeditationTimerContract::Presenter> presenter;
-        gui::BellBaseLayout *body{};
-        gui::U8IntegerSpinner *spinner{};
-        gui::Label *bottomDescription{};
+        BellBaseLayout *body{nullptr};
+        U8IntegerSpinner *spinner{nullptr};
+        Label *bottomDescription{nullptr};
     };
 } // namespace app::meditation
diff --git a/products/BellHybrid/apps/application-bell-meditation-timer/windows/SettingsWindow.cpp b/products/BellHybrid/apps/application-bell-meditation-timer/windows/SettingsWindow.cpp
index 9147c6411147abbad72c4f1df68977fadc345e44..87b4b606f4e62c38689da061ca9d7a0a0c38bff1 100644
--- a/products/BellHybrid/apps/application-bell-meditation-timer/windows/SettingsWindow.cpp
+++ b/products/BellHybrid/apps/application-bell-meditation-timer/windows/SettingsWindow.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2022, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2024, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "MeditationMainWindow.hpp"
@@ -13,6 +13,7 @@
 namespace app::meditation
 {
     using namespace gui;
+
     SettingsWindow::SettingsWindow(app::ApplicationCommon *app,
                                    std::unique_ptr<app::meditation::contract::Presenter> presenter)
         : AppWindow(app, name), presenter{std::move(presenter)}
@@ -35,8 +36,8 @@ namespace app::meditation
         header->setTitleVisibility(false);
         navBar->setVisible(false);
 
-        sideListView = new gui::SideListView(
-            this, 0U, 0U, this->getWidth(), this->getHeight(), presenter->getPagesProvider(), PageBarType::None);
+        sideListView =
+            new SideListView(this, 0U, 0U, getWidth(), getHeight(), presenter->getPagesProvider(), PageBarType::None);
         sideListView->setEdges(RectangleEdge::None);
 
         sideListView->rebuildList(listview::RebuildType::Full);
@@ -44,13 +45,13 @@ namespace app::meditation
         presenter->loadData();
     }
 
-    void SettingsWindow::onBeforeShow(gui::ShowMode mode, gui::SwitchData *data)
+    void SettingsWindow::onBeforeShow(ShowMode mode, SwitchData *data)
     {
         AppWindow::onBeforeShow(mode, data);
         setFocusItem(sideListView);
     }
 
-    bool SettingsWindow::onInput(const gui::InputEvent &inputEvent)
+    bool SettingsWindow::onInput(const InputEvent &inputEvent)
     {
         if (sideListView->onInput(inputEvent)) {
             return true;
diff --git a/products/BellHybrid/apps/application-bell-meditation-timer/windows/SettingsWindow.hpp b/products/BellHybrid/apps/application-bell-meditation-timer/windows/SettingsWindow.hpp
index 65b1c746611e4aaf799238bf1df324fc39cb88e5..6bed4f72c751c73205b15cbaf6c438150c7f0069 100644
--- a/products/BellHybrid/apps/application-bell-meditation-timer/windows/SettingsWindow.hpp
+++ b/products/BellHybrid/apps/application-bell-meditation-timer/windows/SettingsWindow.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2022, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2024, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #pragma once
@@ -14,22 +14,25 @@ namespace gui
 
 namespace app::meditation
 {
-    class SettingsWindow : public gui::AppWindow, public app::meditation::contract::View
+    using namespace gui;
+
+    class SettingsWindow : public AppWindow, public app::meditation::contract::View
     {
       public:
         static constexpr auto name = "MeditationSettingsWindow";
+
         SettingsWindow(app::ApplicationCommon *app, std::unique_ptr<app::meditation::contract::Presenter> presenter);
 
         void buildInterface() override;
-        void onBeforeShow(gui::ShowMode mode, gui::SwitchData *data) override;
+        void onBeforeShow(ShowMode mode, SwitchData *data) override;
         void onClose(CloseReason reason) override;
-        bool onInput(const gui::InputEvent &inputEvent) override;
+        bool onInput(const InputEvent &inputEvent) override;
         void rebuild() override;
 
       private:
         void switchToExitWindow();
 
-        gui::SideListView *sideListView{};
+        SideListView *sideListView{nullptr};
         std::unique_ptr<app::meditation::contract::Presenter> presenter;
         bool isSaveNeeded{false};
     };
diff --git a/products/BellHybrid/apps/application-bell-meditation-timer/windows/StatisticsWindow.cpp b/products/BellHybrid/apps/application-bell-meditation-timer/windows/StatisticsWindow.cpp
index baf3b652fad6234a0d8c94233aab862cbb5ae8ff..a6946af588df3b3857c43f6da2f747eadd57471e 100644
--- a/products/BellHybrid/apps/application-bell-meditation-timer/windows/StatisticsWindow.cpp
+++ b/products/BellHybrid/apps/application-bell-meditation-timer/windows/StatisticsWindow.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2022, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2024, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "StatisticsWindow.hpp"
@@ -17,7 +17,7 @@ namespace app::meditation
         InputEvent newEvent{inputEvent};
 
         if (inputEvent.is(KeyCode::KEY_UP)) {
-            newEvent.setKeyCode(gui::KeyCode::KEY_ENTER);
+            newEvent.setKeyCode(KeyCode::KEY_ENTER);
         }
 
         if (inputEvent.is(KeyCode::KEY_DOWN)) {
@@ -27,7 +27,7 @@ namespace app::meditation
         return newEvent;
     }
 
-    bool filterInputEvents(const gui::InputEvent &inputEvent)
+    bool filterInputEvents(const InputEvent &inputEvent)
     {
         return inputEvent.isShortRelease(KeyCode::KEY_ENTER);
     }
@@ -53,22 +53,22 @@ namespace app::meditation
         header->setTitleVisibility(false);
         navBar->setVisible(false);
 
-        sideListView = new gui::SideListView(
-            this, 0U, 0U, this->getWidth(), this->getHeight(), presenter->getPagesProvider(), PageBarType::None);
+        sideListView =
+            new SideListView(this, 0U, 0U, getWidth(), getHeight(), presenter->getPagesProvider(), PageBarType::None);
         sideListView->setEdges(RectangleEdge::None);
-        sideListView->setBoundaries(gui::Boundaries::Continuous);
+        sideListView->setBoundaries(Boundaries::Continuous);
 
         sideListView->rebuildList(listview::RebuildType::Full);
 
         setFocusItem(sideListView);
     }
 
-    void StatisticsWindow::onBeforeShow(gui::ShowMode mode, gui::SwitchData *data)
+    void StatisticsWindow::onBeforeShow(ShowMode mode, SwitchData *data)
     {
         setFocusItem(sideListView);
     }
 
-    bool StatisticsWindow::onInput(const gui::InputEvent &inputEvent)
+    bool StatisticsWindow::onInput(const InputEvent &inputEvent)
     {
         if (filterInputEvents(inputEvent)) {
             return true;
diff --git a/products/BellHybrid/apps/application-bell-meditation-timer/windows/StatisticsWindow.hpp b/products/BellHybrid/apps/application-bell-meditation-timer/windows/StatisticsWindow.hpp
index 1263ab4f7b27ab22623b995d1fa6845c126f1b33..09dcd4c58ca9a744895a4192a480f2161c785b67 100644
--- a/products/BellHybrid/apps/application-bell-meditation-timer/windows/StatisticsWindow.hpp
+++ b/products/BellHybrid/apps/application-bell-meditation-timer/windows/StatisticsWindow.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2022, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2024, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #pragma once
@@ -14,21 +14,24 @@ namespace gui
 
 namespace app::meditation
 {
-    class StatisticsWindow : public gui::AppWindow, public app::meditation::contract::View
+    using namespace gui;
+
+    class StatisticsWindow : public AppWindow, public app::meditation::contract::View
     {
       public:
         static constexpr auto name = "MeditationStatisticsWindow";
+
         StatisticsWindow(app::ApplicationCommon *app,
                          std::unique_ptr<app::meditation::contract::StatisticsPresenter> presenter);
 
         void buildInterface() override;
-        void onBeforeShow(gui::ShowMode mode, gui::SwitchData *data) override;
+        void onBeforeShow(ShowMode mode, SwitchData *data) override;
         void onClose(CloseReason reason) override;
-        bool onInput(const gui::InputEvent &inputEvent) override;
+        bool onInput(const InputEvent &inputEvent) override;
         void rebuild() override;
 
       private:
-        gui::SideListView *sideListView{};
+        SideListView *sideListView{nullptr};
         std::unique_ptr<app::meditation::contract::StatisticsPresenter> presenter;
     };
 } // namespace app::meditation
diff --git a/products/BellHybrid/apps/application-bell-powernap/windows/PowerNapMainWindow.cpp b/products/BellHybrid/apps/application-bell-powernap/windows/PowerNapMainWindow.cpp
index b3b8c4bf0223944ccec2f633ba4f15953058007b..07998dedc9b326d43bc8049585cefc7092fa9bbb 100644
--- a/products/BellHybrid/apps/application-bell-powernap/windows/PowerNapMainWindow.cpp
+++ b/products/BellHybrid/apps/application-bell-powernap/windows/PowerNapMainWindow.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2023, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2024, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "PowerNapMainWindow.hpp"
@@ -11,7 +11,7 @@ namespace gui
     PowerNapMainWindow::PowerNapMainWindow(
         app::ApplicationCommon *app,
         std::unique_ptr<app::powernap::PowerNapMainWindowContract::Presenter> &&windowPresenter)
-        : AppWindow(app, gui::name::window::main_window), windowPresenter{std::move(windowPresenter)}
+        : AppWindow(app, name::window::main_window), windowPresenter{std::move(windowPresenter)}
     {
         this->windowPresenter->attach(this);
         buildInterface();
@@ -22,14 +22,15 @@ namespace gui
         AppWindow::buildInterface();
         statusBar->setVisible(false);
 
-        sideListView = new gui::SideListView(
+        sideListView = new SideListView(
             this, 0, 0, style::window_width, style::window_height, windowPresenter->getNapTimeProvider());
+        sideListView->setEdges(rectangle_enums::RectangleEdge::None);
         windowPresenter->loadNapTimeList();
         sideListView->rebuildList(listview::RebuildType::Full);
         setFocusItem(sideListView);
     }
 
-    bool PowerNapMainWindow::onInput(const gui::InputEvent &inputEvent)
+    bool PowerNapMainWindow::onInput(const InputEvent &inputEvent)
     {
         if (sideListView->onInput(inputEvent)) {
             return true;
diff --git a/products/BellHybrid/apps/application-bell-powernap/windows/PowerNapProgressWindow.cpp b/products/BellHybrid/apps/application-bell-powernap/windows/PowerNapProgressWindow.cpp
index e0eece6a9d1ac07fd0c2c1e0cd6ffd119f27564c..08621489c47770a182335e0a823c4a7c7ad576ab 100644
--- a/products/BellHybrid/apps/application-bell-powernap/windows/PowerNapProgressWindow.cpp
+++ b/products/BellHybrid/apps/application-bell-powernap/windows/PowerNapProgressWindow.cpp
@@ -61,6 +61,7 @@ namespace gui
         progress->setMaximum(arcProgressSteps);
 
         mainVBox = new VBox(this, 0, 0, style::window_width, style::window_height);
+        mainVBox->setEdges(RectangleEdge::None);
 
         clock = new BellStatusClock(mainVBox);
         clock->setMaximumSize(progressStyle::clock::maxSizeX, progressStyle::clock::maxSizeY);
diff --git a/products/BellHybrid/apps/application-bell-powernap/windows/PowerNapSessionEndedWindow.cpp b/products/BellHybrid/apps/application-bell-powernap/windows/PowerNapSessionEndedWindow.cpp
index 39ecb8fd33b319f8a5da64bc5e295f22bb61335a..33a062ac446f296e68e1e9bf49fe93249f8cc450 100644
--- a/products/BellHybrid/apps/application-bell-powernap/windows/PowerNapSessionEndedWindow.cpp
+++ b/products/BellHybrid/apps/application-bell-powernap/windows/PowerNapSessionEndedWindow.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2023, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2024, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "PowerNapSessionEndedWindow.hpp"
@@ -24,7 +24,9 @@ namespace gui
     void PowerNapSessionEndedWindow::buildLayout()
     {
         statusBar->setVisible(false);
+
         auto body = new VBox(this, 0, 0, style::window_width, style::window_height);
+        body->setEdges(RectangleEdge::None);
         body->setAlignment(Alignment(Alignment::Horizontal::Center, Alignment::Vertical::Center));
 
         auto icon =
diff --git a/products/BellHybrid/apps/application-bell-relaxation/windows/RelaxationPausedWindow.cpp b/products/BellHybrid/apps/application-bell-relaxation/windows/RelaxationPausedWindow.cpp
index 6c0d6c85863f393a9e2f26ae726c0651331fd129..d2d36af29c0645e1b6a8a73d3d4add824672ef10 100644
--- a/products/BellHybrid/apps/application-bell-relaxation/windows/RelaxationPausedWindow.cpp
+++ b/products/BellHybrid/apps/application-bell-relaxation/windows/RelaxationPausedWindow.cpp
@@ -32,7 +32,7 @@ namespace gui
         statusBar->setVisible(false);
 
         auto mainVBox = new VBox(this, 0, 0, style::window_width, style::window_height);
-        mainVBox->setEdges(rectangle_enums::RectangleEdge::None);
+        mainVBox->setEdges(RectangleEdge::None);
 
         clock = new BellStatusClock(mainVBox);
         clock->setMaximumSize(relStyle::clock::maxSizeX, relStyle::clock::maxSizeY);
diff --git a/products/BellHybrid/apps/common/include/common/windows/ShortcutsWindow.hpp b/products/BellHybrid/apps/common/include/common/windows/ShortcutsWindow.hpp
index f4c612900e1802ab6482f94cd05698b9f55a1796..7072bcc8cea54440d4fd718f6b0dee5260f61cf5 100644
--- a/products/BellHybrid/apps/common/include/common/windows/ShortcutsWindow.hpp
+++ b/products/BellHybrid/apps/common/include/common/windows/ShortcutsWindow.hpp
@@ -1,32 +1,30 @@
-// Copyright (c) 2017-2023, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2024, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #pragma once
 
 #include "ShortcutsWindowContract.hpp"
-#include <ApplicationCommon.hpp>
 #include <AppWindow.hpp>
 #include <apps-common/widgets/spinners/Spinners.hpp>
 
 namespace gui
 {
     class SideListView;
+
     class ShortcutsWindow : public AppWindow, public ShortcutsWindowContract::View
     {
-        std::unique_ptr<ShortcutsWindowContract::Presenter> presenter;
-        SideListView *sideListView = nullptr;
-        WidgetSpinner *spinner     = nullptr;
-
-        bool onInput(const gui::InputEvent &inputEvent) override;
-        void buildInterface() override;
-
-        void onValueChanged(const std::uint32_t currentValue);
-
       public:
         ShortcutsWindow(app::ApplicationCommon *app,
                         std::unique_ptr<ShortcutsWindowContract::Presenter> &&presenter,
                         const std::string &name);
 
-        bool isOneOfTwoLastShortcuts() const;
+        [[nodiscard]] bool isOneOfTwoLastShortcuts() const;
+
+      private:
+        std::unique_ptr<ShortcutsWindowContract::Presenter> presenter;
+        WidgetSpinner *spinner{nullptr};
+
+        bool onInput(const InputEvent &inputEvent) override;
+        void buildInterface() override;
     };
 } // namespace gui
diff --git a/products/BellHybrid/apps/common/src/layouts/ShortcutsLayoutClassic.cpp b/products/BellHybrid/apps/common/src/layouts/ShortcutsLayoutClassic.cpp
index f29c2008e97f80f9f41769190a462a134f7e47d2..bf58801b015fb2da1685da64d43b05befb24c475 100644
--- a/products/BellHybrid/apps/common/src/layouts/ShortcutsLayoutClassic.cpp
+++ b/products/BellHybrid/apps/common/src/layouts/ShortcutsLayoutClassic.cpp
@@ -32,7 +32,6 @@ namespace
             constexpr auto height = 146U;
             constexpr auto width  = 448U;
         } // namespace text
-
     } // namespace container
 } // namespace
 
@@ -52,6 +51,7 @@ namespace gui
     void ShortcutsLayoutClassic::buildInterface()
     {
         setAlignment(Alignment::Horizontal::Center);
+        setEdges(RectangleEdge::None);
 
         auto containerThreeBox = new HThreeBox<HBox, HBox, HBox>(this);
         containerThreeBox->setMinimumSize(container::width, container::image::height);
@@ -121,4 +121,4 @@ namespace gui
     {
         return this;
     }
-}; // namespace gui
+} // namespace gui
diff --git a/products/BellHybrid/apps/common/src/windows/ShortcutsWindow.cpp b/products/BellHybrid/apps/common/src/windows/ShortcutsWindow.cpp
index fd12167871b211665651591eb762fce77ee0a9e9..14a83d228fe4ab33eec2156f94b0a5b902784a3f 100644
--- a/products/BellHybrid/apps/common/src/windows/ShortcutsWindow.cpp
+++ b/products/BellHybrid/apps/common/src/windows/ShortcutsWindow.cpp
@@ -1,8 +1,9 @@
-// Copyright (c) 2017-2023, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2024, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "windows/ShortcutsWindow.hpp"
 
+#include <ApplicationCommon.hpp>
 #include <Style.hpp>
 #include <SideListView.hpp>
 #include <gui/input/InputEvent.hpp>
@@ -34,9 +35,7 @@ namespace gui
         auto selectedLayout = presenter->getFirstLayout();
         spinner->setCurrentValue(selectedLayout);
 
-        spinner->onValueChanged = [this](const auto &) {
-            getApplication()->render(gui::RefreshModes::GUI_REFRESH_DEEP);
-        };
+        spinner->onValueChanged = [this](const auto &) { getApplication()->render(RefreshModes::GUI_REFRESH_DEEP); };
 
         setFocusItem(spinner);
     }
@@ -47,7 +46,7 @@ namespace gui
         return presenter->isOneOfTwoLastLayouts(currentLayout);
     }
 
-    bool ShortcutsWindow::onInput(const gui::InputEvent &inputEvent)
+    bool ShortcutsWindow::onInput(const InputEvent &inputEvent)
     {
         if (spinner->onInput(inputEvent)) {
             return true;
@@ -59,5 +58,4 @@ namespace gui
 
         return AppWindow::onInput(inputEvent);
     }
-
 } // namespace gui