diff --git a/.gdbinit-1051 b/.gdbinit-1051
index 682d58d73..66d12498b 100644
--- a/.gdbinit-1051
+++ b/.gdbinit-1051
@@ -1,4 +1,5 @@
 target remote localhost:2331
+source tools/gdb_crash_extend.py
 monitor reset 0
 monitor halt
 monitor memU32 0x401BC000 = 128;
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 660cfdaeb..ef0fc3a73 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -94,6 +94,7 @@ add_compile_options( ${TARGET_COMPILE_OPTIONS}
                      -MMD
                      -MP
                      -fno-builtin
+                     -fno-diagnostics-color
                      # warning flags
                      -Wall -Wextra -Werror -Wno-unused-parameter)
 
diff --git a/changelog.md b/changelog.md
index 00159a5d4..074313754 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,19 @@
 # MuditaOS changelog
 
+## [Current release]
+
+### Added
+
+* `[gui]` Added GUI timers capability
+
+### Changed
+* `[system]` Timer API - linked to timer, same for Services and Applications. Updated docs
+* `[system]` Removed `using std` and `using cpp_freertos` from commonly used headers
+
+### Fixed
+
+* `[system]` Timers race condition, Timers should be thread safe for Services/Applications
+
 ## [0.40.1 2020-10-02]
 
 ### Added
diff --git a/flash_eMMC.sh b/flash_eMMC.sh
index c7f98ada1..561b47e5c 100755
--- a/flash_eMMC.sh
+++ b/flash_eMMC.sh
@@ -44,7 +44,7 @@ mkdir -p $PURE_PATH_ROOT/$PURE_OS_FACTORY
 # sudo sync $PURE_DEV
 
 echo "PurePhone copy build files"
-cp -v $BUILD_PATH/boot.bin "$PURE_PATH_CURRENT"/  # | sed 's/'-\>'/'→'/g'
+# cp -v $BUILD_PATH/boot.bin "$PURE_PATH_CURRENT"/  # | sed 's/'-\>'/'→'/g'
 
 for file in $IMAGE_FILES; do
 	echo Copying $file
diff --git a/module-apps/Application.cpp b/module-apps/Application.cpp
index b5fe6a9df..9b559e41f 100644
--- a/module-apps/Application.cpp
+++ b/module-apps/Application.cpp
@@ -1,29 +1,37 @@
-#include <sstream>
-#include <iomanip>
-// module-utils
-#include "log/log.hpp"
-// module-services
-#include "service-gui/messages/DrawMessage.hpp"
-#include "service-appmgr/messages/APMMessage.hpp"
-#include "service-evtmgr/messages/EVMessages.hpp"
-#include "service-appmgr/ApplicationManager.hpp"
-#include "service-db/api/DBServiceAPI.hpp"
-#include "service-cellular/ServiceCellular.hpp"
-#include "service-cellular/api/CellularServiceAPI.hpp"
-// module-gui
-#include "gui/core/DrawCommand.hpp"
-#include "gui/input/InputEvent.hpp"
-// module-sys
-#include "SystemManager/SystemManager.hpp"
-
 #include "Application.hpp"
-#include "MessageType.hpp"
-#include "messages/AppMessage.hpp"
-#include "windows/AppWindow.hpp"
-#include <Text.hpp>
-#include <cassert>
+#include "BusChannelsCustom.hpp"                         // for BusChannels...
+#include "Common.hpp"                                    // for RefreshModes
+#include "GuiTimer.hpp"                                  // for GuiTimer
+#include "Item.hpp"                                      // for Item
+#include "MessageType.hpp"                               // for MessageType
+#include "Service/Timer.hpp"                             // for Timer
+#include "SettingsRecord.hpp"                            // for SettingsRecord
+#include "Timer.hpp"                                     // for Timer
+#include "Translator.hpp"                                // for KeyInputSim...
+#include "common_data/EventStore.hpp"                    // for Battery
+#include "common_data/RawKey.hpp"                        // for RawKey, key...
+#include "gui/input/InputEvent.hpp"                      // for InputEvent
+#include "log/debug.hpp"                                 // for DEBUG_APPLI...
+#include "log/log.hpp"                                   // for LOG_INFO
+#include "messages/AppMessage.hpp"                       // for AppSwitchMe...
+#include "service-appmgr/ApplicationManager.hpp"         // for Application...
+#include "service-cellular/messages/CellularMessage.hpp" // for CellularNot...
+#include "service-db/api/DBServiceAPI.hpp"               // for DBServiceAPI
+#include "service-evtmgr/messages/BatteryMessages.hpp"   // for BatteryLeve...
+#include "service-evtmgr/messages/EVMessages.hpp"        // for RtcMinuteAl...
+#include "service-evtmgr/messages/KbdMessage.hpp"        // for KbdMessage
+#include "service-gui/messages/DrawMessage.hpp"          // for DrawMessage
+#include "task.h"                                        // for xTaskGetTic...
+#include "windows/AppWindow.hpp"                         // for AppWindow
+#include <Text.hpp>                                      // for Text
+#include <algorithm>                                     // for find
+#include <iterator>                                      // for distance, next
+#include <type_traits>                                   // for add_const<>...
 
-#include "common_data/EventStore.hpp"
+namespace gui
+{
+    class DrawCommand;
+}
 
 namespace app::audioConsts
 {
@@ -60,8 +68,6 @@ namespace app
     Application::Application(
         std::string name, std::string parent, bool startBackground, uint32_t stackDepth, sys::ServicePriority priority)
         : Service(name, parent, stackDepth, priority),
-          longPressTimer(CreateAppTimer(
-              key_timer_ms, true, [&]() { longPressTimerCallback(); }, "longPressTimer")),
           startBackground{startBackground}
     {
         keyTranslator = std::make_unique<gui::KeyInputSimpleTranslation>();
@@ -69,7 +75,9 @@ namespace app
         if (startBackground) {
             setState(State::ACTIVE_BACKGROUND);
         }
-        longPressTimer.restart();
+
+        longPressTimer = std::make_unique<sys::Timer>("LongPress", this, key_timer_ms);
+        longPressTimer->connect([&](sys::Timer &) { longPressTimerCallback(); });
     }
 
     Application::~Application()
@@ -93,34 +101,6 @@ namespace app
         state = st;
     }
 
-    void Application::TickHandler(uint32_t id)
-    {
-        auto appTimer = std::find(appTimers.begin(), appTimers.end(), id);
-        if (appTimer != appTimers.end()) {
-            appTimer->runCallback();
-        }
-        else {
-            LOG_ERROR("Requested timer doesn't exist here (ID: %s)\n",
-                      std::to_string(id).c_str()); // either timer was deleted or this id should not arrive.
-        }
-    }
-
-    void Application::DeleteTimer(AppTimer &timer)
-    {
-        Service::DeleteTimer(timer.getID()); // remove the real FreeRTOS timer
-        auto timerOnTheList = std::find(appTimers.begin(), appTimers.end(), timer);
-        if (timerOnTheList != appTimers.end()) {
-            appTimers.erase(timerOnTheList);
-        }
-    }
-
-    [[deprecated("only for compatibility")]] void Application::DeleteTimer(uint32_t id)
-    {
-        auto found = std::find(appTimers.begin(), appTimers.end(), id);
-        if (found != appTimers.end()) {
-            DeleteTimer(*found);
-        }
-    }
 
     void Application::longPressTimerCallback()
     {
@@ -132,6 +112,7 @@ namespace app
             messageInputEventApplication(this, this->GetName(), iev);
             // clean previous key
             keyTranslator->prev_key_press = {};
+            longPressTimer->stop();
         }
     }
 
@@ -281,6 +262,12 @@ namespace app
     sys::Message_t Application::handleInputEvent(sys::DataMessage *msgl)
     {
         AppInputEventMessage *msg = reinterpret_cast<AppInputEventMessage *>(msgl);
+        if (msg->getEvent().state == gui::InputEvent::State::keyPressed) {
+            longPressTimer->start();
+        }
+        else if (msg->getEvent().state == gui::InputEvent::State::keyReleasedShort) {
+            longPressTimer->stop();
+        }
         if (getCurrentWindow() != nullptr && getCurrentWindow()->onInput(msg->getEvent())) {
             refreshWindow(gui::RefreshModes::GUI_REFRESH_FAST);
         }
@@ -341,7 +328,7 @@ namespace app
 
     sys::Message_t Application::handleApplicationSwitch(sys::DataMessage *msgl)
     {
-        AppSwitchMessage *msg = reinterpret_cast<AppSwitchMessage *>(msgl);
+        auto *msg             = static_cast<AppSwitchMessage *>(msgl);
         bool handled          = false;
         LOG_DEBUG("AppSwitch: %s", msg->getTargetApplicationName().c_str());
         // Application is starting or it is in the background. Upon switch command if name if correct it goes
@@ -647,65 +634,14 @@ namespace app
         return getWindow(window);
     }
 
-    AppTimer Application::CreateAppTimer(TickType_t interval,
-                                         bool isPeriodic,
-                                         std::function<void()> callback,
-                                         const std::string &name)
-    {
-        auto id    = CreateTimer(interval, isPeriodic, name);
-        auto timer = AppTimer(this, id, callback, name);
-        appTimers.push_back(timer);
-        return timer; // return ptr to the timer on the list
-    }
-
     void Application::attachWindow(gui::AppWindow *window)
     {
         windows.insert({window->getName(), window});
     }
 
-    AppTimer::AppTimer(Application *parent, uint32_t id, std::function<void()> callback, const std::string &name)
-        : parent(parent)
+    void Application::connect(std::unique_ptr<app::GuiTimer> &&timer, gui::Item *item)
     {
-        this->id = id;
-        registerCallback(callback);
-    }
-    AppTimer::AppTimer() = default;
-
-    AppTimer::~AppTimer()
-    {
-        callback = nullptr;
-    }
-
-    void AppTimer::registerCallback(std::function<void()> callback)
-    {
-        this->callback = callback;
-    }
-    void AppTimer::runCallback()
-    {
-        callback();
-    }
-    uint32_t AppTimer::getID()
-    {
-        return id;
-    }
-    void AppTimer::stop()
-    {
-        if (parent) {
-            parent->stopTimer(getID());
-        }
-    }
-    void AppTimer::restart()
-    {
-        if (parent) {
-            parent->ReloadTimer(getID());
-        }
-    }
-    bool AppTimer::operator==(const AppTimer &rhs) const
-    {
-        return this->id == rhs.id;
-    }
-    bool AppTimer::operator==(const uint32_t &rhs) const
-    {
-        return this->id == rhs;
+        timer->sysapi.connect(item);
+        item->attachTimer(std::move(timer));
     }
 } /* namespace app */
diff --git a/module-apps/Application.hpp b/module-apps/Application.hpp
index 565f9fdea..b01921581 100644
--- a/module-apps/Application.hpp
+++ b/module-apps/Application.hpp
@@ -1,67 +1,59 @@
-/*
- * @file Application.hpp
- * @author Robert Borzecki (robert.borzecki@mudita.com)
- * @date 1 cze 2019
- * @brief
- * @copyright Copyright (C) 2019 mudita.com
- * @details
- */
-#ifndef MODULE_APPS_APPLICATION_HPP_
-#define MODULE_APPS_APPLICATION_HPP_
+#pragma once
 
-#include <map>
-// module-gui
-#include "gui/Common.hpp"
-//#include "gui/widgets/Window.hpp"
-#include "gui/input/Translator.hpp"
-// module-sys
-#include "Service/Service.hpp"
-#include "Service/Message.hpp"
-#include "Service/Common.hpp"
-#include "SystemManager/SystemManager.hpp"
-// module-db
-#include "Interface/SettingsRecord.hpp"
-
-#include <module-bsp/bsp/torch/torch.hpp>
-#include <module-services/service-evtmgr/Constants.hpp>
-#include "service-evtmgr/messages/EVMessages.hpp"
-
-#include "SwitchData.hpp"
-#include "service-cellular/api/CellularServiceAPI.hpp"
-#include "windows/AppWindow.hpp"
+#include "Audio/AudioCommon.hpp"                        // for Volume, Play...
+#include "Audio/Profiles/Profile.hpp"                   // for Profile, Pro...
+#include "AudioServiceAPI.hpp"                          // for GetOutputVolume
+#include "Interface/SettingsRecord.hpp"                 // for SettingsRecord
+#include "Service/Bus.hpp"                              // for Bus
+#include "Service/Common.hpp"                           // for ReturnCodes
+#include "Service/Message.hpp"                          // for Message_t
+#include "Service/Service.hpp"                          // for Service
+#include "SwitchData.hpp"                               // for SwitchData
+#include "SystemManager/SystemManager.hpp"              // for SystemManager
+#include "bsp/keyboard/key_codes.hpp"                   // for bsp
+#include "gui/Common.hpp"                               // for ShowMode
+#include "projdefs.h"                                   // for pdMS_TO_TICKS
+#include "service-evtmgr/messages/EVMessages.hpp"       // for TorchStateMe...
+#include <list>                                         // for list
+#include <map>                                          // for allocator, map
+#include <memory>                                       // for make_shared
+#include <module-bsp/bsp/torch/torch.hpp>               // for State, State...
+#include <module-services/service-evtmgr/Constants.hpp> // for evt_manager
+#include <stdint.h>                                     // for uint32_t
+#include <string>                                       // for string
+#include <utility>                                      // for move, pair
+#include <vector>                                       // for vector
 
+namespace app
+{
+    class GuiTimer;
+} // namespace app
 namespace gui
 {
     class AppWindow;
-};
+} // namespace gui
+namespace gui
+{
+    class InputEvent;
+}
+namespace gui
+{
+    class Item;
+}
+namespace gui
+{
+    class KeyInputSimpleTranslation;
+}
+namespace sys
+{
+    class Timer;
+}
 
 namespace app
 {
 
     class Application;
-
-    class AppTimer // this should inherit from ServiceTimer, but *bodge*
-    {
-      private:
-        uint32_t id                    = 0; // let's say 0 indicates not initalized timer
-        std::function<void()> callback = nullptr;
-        Application *parent            = nullptr;
-
-        void registerCallback(std::function<void()>);
-        AppTimer();
-
-      public:
-        AppTimer(Application *parent, uint32_t id, std::function<void()> callback, const std::string &name);
-        ~AppTimer();
-        void runCallback();
-        uint32_t getID();
-        static uint32_t getNextUniqueID();
-        // timer controls:
-        void restart();
-        void stop();
-        bool operator==(const AppTimer &rhs) const;
-        bool operator==(const uint32_t &rhs) const;
-    };
+    class GuiTimer;
 
     inline auto msgHandled() -> sys::Message_t
     {
@@ -129,10 +121,10 @@ namespace app
         sys::Message_t handleAppRefresh(sys::DataMessage *msgl);
         sys::Message_t handleSIMMessage(sys::DataMessage *msgl);
 
+        std::list<std::unique_ptr<app::GuiTimer>> gui_timers;
+
       public:
-        std::list<uint32_t> timerIDs;
-        std::list<AppTimer> appTimers; // @TODO decide on type
-        AppTimer longPressTimer;
+        std::unique_ptr<sys::Timer> longPressTimer;
         Application(std::string name,
                     std::string parent            = "",
                     bool startBackground          = false,
@@ -143,22 +135,6 @@ namespace app
         Application::State getState();
         void setState(State st);
 
-        /// @defgroup AppTimers Application timers
-        /// @note Please mind that timers are from Service and implementation in service should be revritten to send
-        /// notify instead of calling callback
-        ///       Right now timers can create races.
-        /// @{
-        /// Method to register callback function to be run on timer.
-        AppTimer CreateAppTimer(TickType_t interval,
-                                bool isPeriodic,
-                                std::function<void()> callback,
-                                const std::string &name = "");
-        /// Remove previousy registered AppTimer by object
-        void DeleteTimer(AppTimer &timer);
-        /// Remove previousy registered AppTimer by id
-        void DeleteTimer(uint32_t id);
-        /// @}
-
         /// Method responsible for rendering currently active window.
         /// 1. queries for static data for all windows form Store (i.e. battery level, sim card level)
         /// 2. loads rendering commands and send them to GUI renderer (sgui::ServiceGUI)
@@ -194,6 +170,9 @@ namespace app
         /// Method refreshing active window
         void refreshWindow(gui::RefreshModes mode);
 
+        /// to not hide overload from parent
+        using Service::DataReceivedHandler;
+
         /// Mehtod to handle bus messages, all message types are defined in Message.hpp
         /// Message types are in MessageType
         sys::Message_t DataReceivedHandler(sys::DataMessage *msgl);
@@ -313,9 +292,6 @@ namespace app
         SettingsRecord settings;
 
         void longPressTimerCallback();
-        /// function executing functions registered by CreateAppTimer
-        /// @param id - timer identification number
-        virtual void TickHandler(uint32_t id) override final;
         /// Method used to register all windows and widgets in application
         virtual void createUserInterface() = 0;
         /// Method closing application's windows.
@@ -352,6 +328,10 @@ namespace app
         /// getter for current wisible window in application
         /// @ingrup AppWindowStack
         gui::AppWindow *getCurrentWindow();
+        /// to avoid conflicts with connect below
+        using Service::connect;
+        /// connects item with GuiTimer and stores it in app
+        void connect(std::unique_ptr<GuiTimer> &&timer, gui::Item *item);
 
       protected:
         /// Flag defines whether keyboard input should be processed
@@ -451,5 +431,3 @@ namespace app
     }
 
 } /* namespace app */
-
-#endif /* MODULE_APPS_APPLICATION_HPP_ */
diff --git a/module-apps/CMakeLists.txt b/module-apps/CMakeLists.txt
index 50cd6f4d9..6a21a8f2d 100644
--- a/module-apps/CMakeLists.txt
+++ b/module-apps/CMakeLists.txt
@@ -13,6 +13,7 @@ endif()
 
 set( SOURCES 
     "Application.cpp"
+    "GuiTimer.cpp"
     "UiCommonActions.cpp" 
     "windows/AppWindow.cpp" 
     "windows/OptionWindow.cpp"
diff --git a/module-apps/GuiTimer.cpp b/module-apps/GuiTimer.cpp
new file mode 100644
index 000000000..af9657d3c
--- /dev/null
+++ b/module-apps/GuiTimer.cpp
@@ -0,0 +1,46 @@
+#include "GuiTimer.hpp"
+#include "Item.hpp"                    // for Item
+#include "Service/Timer.hpp"           // for Timer, Timer::Type, Timer::Ty...
+#include "module-apps/Application.hpp" // for Application
+#include <memory>                      // for allocator
+
+namespace app
+{
+    void GuiTimer::start()
+    {
+        sys::Timer::start();
+    }
+
+    void GuiTimer::stop()
+    {
+        sys::Timer::stop();
+    }
+
+    void GuiTimer::reset()
+    {
+        sys::Timer::start();
+    }
+
+    void GuiTimer::setInterval(gui::ms time)
+    {
+        sys::Timer::setInterval(time);
+    }
+
+    GuiTimer::GuiTimer(Application *parent) : GuiTimer("GUI", parent)
+    {}
+
+    GuiTimer::GuiTimer(const std::string &name, Application *parent)
+        : GuiTimer(name, parent, sys::Timer::timeout_infinite)
+    {}
+
+    GuiTimer::GuiTimer(const std::string &name, Application *parent, gui::ms timeout)
+        : sys::Timer(name, parent, timeout, sys::Timer::Type::SingleShot), sysapi(*this)
+    {}
+
+    void GuiTimer::Sysapi::connect(gui::Item *item)
+    {
+        if (item != nullptr) {
+            parent.connect([item, this](sys::Timer &timer) { item->onTimer(parent); });
+        }
+    }
+} // namespace app
diff --git a/module-apps/GuiTimer.hpp b/module-apps/GuiTimer.hpp
new file mode 100644
index 000000000..8ab3ec03c
--- /dev/null
+++ b/module-apps/GuiTimer.hpp
@@ -0,0 +1,54 @@
+#pragma once
+
+#include "Service/Timer.hpp" // for Timer
+#include "Timer.hpp"         // for ms, Timer
+#include <string>            // for string
+namespace app
+{
+    class Application;
+} // namespace app
+namespace gui
+{
+    class Item;
+} // namespace gui
+
+namespace app
+{
+
+    class Application;
+
+    /// proxies system Timer capabilities to gui::Timer and disconnects dependencies
+    /// by default one time run
+    class GuiTimer : public gui::Timer, protected sys::Timer
+    {
+      public:
+        /// gui timer default named GUI, infinite timeout on start
+        GuiTimer(Application *parent);
+        /// gui timer with user name, infinite timeout on start
+        GuiTimer(const std::string &name, Application *parent);
+        /// gui timer with user name, variable timeout
+        GuiTimer(const std::string &name, Application *parent, gui::ms timeout);
+        /// there is no valid reason to create timer without app
+        GuiTimer() = delete;
+
+        /// @defgroup interface
+        /// @ {
+        void start() override;
+        void stop() override;
+        void reset() override;
+        void setInterval(gui::ms time) override;
+        /// @ }
+
+        /// interface to trigger timing callback
+        class Sysapi
+        {
+            friend Application;
+            GuiTimer &parent;
+            void connect(gui::Item *item);
+
+          public:
+            Sysapi(GuiTimer &parent) : parent(parent)
+            {}
+        } sysapi;
+    };
+}; // namespace app
diff --git a/module-apps/application-antenna/ApplicationAntenna.cpp b/module-apps/application-antenna/ApplicationAntenna.cpp
index e4b1e0c45..3efae5daf 100644
--- a/module-apps/application-antenna/ApplicationAntenna.cpp
+++ b/module-apps/application-antenna/ApplicationAntenna.cpp
@@ -6,8 +6,9 @@
  */
 
 #include "ApplicationAntenna.hpp"
-#include "service-cellular/api/CellularServiceAPI.hpp"
+#include "Service/Timer.hpp"
 #include "module-cellular/at/response.hpp"
+#include "service-cellular/api/CellularServiceAPI.hpp"
 
 #include "windows/AntennaMainWindow.hpp"
 #include "windows/ScanModesWindow.hpp"
@@ -31,13 +32,13 @@ namespace app
     }
 
     ApplicationAntenna::ApplicationAntenna(std::string name, std::string parent, bool startBackgound)
-        : Application(name, parent, startBackgound, 4096 * 2),
-          appTimer(CreateAppTimer(2000, true, [=]() { timerHandler(); }))
-
+        : Application(name, parent, startBackgound, 4096 * 2)
     {
         busChannels.push_back(sys::BusChannels::AntennaNotifications);
         busChannels.push_back(sys::BusChannels::AntennaNotifications);
-        appTimer.restart();
+        appTimer = std::make_unique<sys::Timer>("Antena", this, 2000);
+        appTimer->connect([=](sys::Timer &) { timerHandler(); });
+        appTimer->start();
     }
 
     ApplicationAntenna::~ApplicationAntenna()
diff --git a/module-apps/application-antenna/ApplicationAntenna.hpp b/module-apps/application-antenna/ApplicationAntenna.hpp
index de4012bc5..d4ed96c53 100644
--- a/module-apps/application-antenna/ApplicationAntenna.hpp
+++ b/module-apps/application-antenna/ApplicationAntenna.hpp
@@ -9,6 +9,7 @@
 #define MODULE_APPS_APPLICATION_ANTENNA_APPLICATIONANTENNA_HPP_
 
 #include "Application.hpp"
+#include "service-cellular/api/CellularServiceAPI.hpp"
 #include "windows/AppWindow.hpp"
 
 namespace app
@@ -29,7 +30,7 @@ namespace app
     class ApplicationAntenna : public app::Application
     {
       protected:
-        AppTimer appTimer;
+        std::unique_ptr<sys::Timer> appTimer;
         void timerHandler(void);
         bool cellularRequestInProgress = false;
         bsp::cellular::antenna antenna;
diff --git a/module-apps/application-calendar/ApplicationCalendar.cpp b/module-apps/application-calendar/ApplicationCalendar.cpp
index 8d398b76e..962942fe7 100644
--- a/module-apps/application-calendar/ApplicationCalendar.cpp
+++ b/module-apps/application-calendar/ApplicationCalendar.cpp
@@ -16,7 +16,7 @@
 
 namespace app
 {
-    const map<Reminder, const char *> ApplicationCalendar::reminderOptions = {
+    const std::map<Reminder, const char *> ApplicationCalendar::reminderOptions = {
         {Reminder::never, "app_calendar_reminder_never"},
         {Reminder::event_time, "app_calendar_reminder_event_time"},
         {Reminder::five_min_before, "app_calendar_reminder_5_min_before"},
@@ -28,7 +28,7 @@ namespace app
         {Reminder::two_days_before, "app_calendar_reminder_2_days_before"},
         {Reminder::one_week_before, "app_calendar_reminder_1_week_before"}};
 
-    const map<Repeat, const char *> ApplicationCalendar::repeatOptions = {
+    const std::map<Repeat, const char *> ApplicationCalendar::repeatOptions = {
         {Repeat::never, "app_calendar_repeat_never"},
         {Repeat::daily, "app_calendar_repeat_daily"},
         {Repeat::weekly, "app_calendar_repeat_weekly"},
diff --git a/module-apps/application-calendar/models/NewEditEventModel.cpp b/module-apps/application-calendar/models/NewEditEventModel.cpp
index 3bf700181..78c87c279 100644
--- a/module-apps/application-calendar/models/NewEditEventModel.cpp
+++ b/module-apps/application-calendar/models/NewEditEventModel.cpp
@@ -1,11 +1,12 @@
 #include "NewEditEventModel.hpp"
+#include "AppWindow.hpp"
 #include "application-calendar/widgets/NewEventCheckBoxWithLabel.hpp"
 #include "module-apps/application-calendar/data/CalendarData.hpp"
-#include <ListView.hpp>
 #include <BottomBar.hpp>
-#include <module-services/service-db/api/DBServiceAPI.hpp>
+#include <ListView.hpp>
 #include <module-db/queries/calendar/QueryEventsAdd.hpp>
 #include <module-db/queries/calendar/QueryEventsEdit.hpp>
+#include <module-services/service-db/api/DBServiceAPI.hpp>
 #include <time/time_conversion.hpp>
 
 NewEditEventModel::NewEditEventModel(app::Application *app, bool mode24H) : application(app), mode24H(mode24H)
diff --git a/module-apps/application-calendar/widgets/DayLabel.hpp b/module-apps/application-calendar/widgets/DayLabel.hpp
index 9ecddb220..5a111d2c6 100644
--- a/module-apps/application-calendar/widgets/DayLabel.hpp
+++ b/module-apps/application-calendar/widgets/DayLabel.hpp
@@ -4,6 +4,7 @@
 
 namespace gui
 {
+    class Image;
 
     class DayLabel : public Rect
     {
diff --git a/module-apps/application-calendar/widgets/NewEventCheckBoxWithLabel.cpp b/module-apps/application-calendar/widgets/NewEventCheckBoxWithLabel.cpp
index 2bfae7c24..be54fa053 100644
--- a/module-apps/application-calendar/widgets/NewEventCheckBoxWithLabel.cpp
+++ b/module-apps/application-calendar/widgets/NewEventCheckBoxWithLabel.cpp
@@ -1,4 +1,5 @@
 #include "NewEventCheckBoxWithLabel.hpp"
+#include "AppWindow.hpp"
 
 namespace gui
 {
diff --git a/module-apps/application-calendar/widgets/SeveralOptionsItem.cpp b/module-apps/application-calendar/widgets/SeveralOptionsItem.cpp
index 5e57e80d2..70b8bf35a 100644
--- a/module-apps/application-calendar/widgets/SeveralOptionsItem.cpp
+++ b/module-apps/application-calendar/widgets/SeveralOptionsItem.cpp
@@ -1,4 +1,5 @@
 #include "SeveralOptionsItem.hpp"
+#include "InputEvent.hpp"
 #include "application-calendar/widgets/CalendarStyle.hpp"
 #include "module-apps/application-calendar/ApplicationCalendar.hpp"
 #include "module-apps/application-calendar/data/CalendarData.hpp"
diff --git a/module-apps/application-calendar/windows/AllEventsWindow.cpp b/module-apps/application-calendar/windows/AllEventsWindow.cpp
index b5ff1389c..ac7eab6d8 100644
--- a/module-apps/application-calendar/windows/AllEventsWindow.cpp
+++ b/module-apps/application-calendar/windows/AllEventsWindow.cpp
@@ -1,8 +1,10 @@
 #include "AllEventsWindow.hpp"
+#include "InputEvent.hpp"
+#include "module-apps/application-calendar/ApplicationCalendar.hpp"
 #include "module-apps/application-calendar/data/CalendarData.hpp"
-#include <gui/widgets/Window.hpp>
 #include <gui/widgets/BottomBar.hpp>
 #include <gui/widgets/TopBar.hpp>
+#include <gui/widgets/Window.hpp>
 #include <service-appmgr/ApplicationManager.hpp>
 
 #include <module-services/service-db/messages/QueryMessage.hpp>
diff --git a/module-apps/application-calendar/windows/CalendarEventsOptionsWindow.cpp b/module-apps/application-calendar/windows/CalendarEventsOptionsWindow.cpp
index 4a405757a..80aa98b48 100644
--- a/module-apps/application-calendar/windows/CalendarEventsOptionsWindow.cpp
+++ b/module-apps/application-calendar/windows/CalendarEventsOptionsWindow.cpp
@@ -62,7 +62,7 @@ namespace gui
             LOG_INFO("Delete calendar event %d", static_cast<int>(eventRecord->ID));
             DBServiceAPI::GetQuery(
                 application, db::Interface::Name::Events, std::make_unique<db::query::events::Remove>(eventRecord->ID));
-            auto data = make_unique<PrevWindowData>();
+            auto data = std::make_unique<PrevWindowData>();
             data->setData(PrevWindowData::PrevWindow::Delete);
             application->switchWindow(goBackWindowName, std::move(data));
             return true;
diff --git a/module-apps/application-calendar/windows/CalendarMainWindow.cpp b/module-apps/application-calendar/windows/CalendarMainWindow.cpp
index 4a13f5daf..d2dff4160 100644
--- a/module-apps/application-calendar/windows/CalendarMainWindow.cpp
+++ b/module-apps/application-calendar/windows/CalendarMainWindow.cpp
@@ -20,7 +20,7 @@ namespace gui
         std::chrono::system_clock::time_point tp =
             std::chrono::system_clock::from_time_t(appCalendar->getCurrentTimeStamp());
         this->actualDate = date::year_month_day{date::floor<date::days>(tp)};
-        std::fill(begin(isDayEmpty), end(isDayEmpty), true);
+        std::fill(std::begin(isDayEmpty), std::end(isDayEmpty), true);
         buildInterface();
     }
 
@@ -202,7 +202,7 @@ namespace gui
 
     auto CalendarMainWindow::handleQueryResponse(db::QueryResult *queryResult) -> bool
     {
-        std::fill(begin(isDayEmpty), end(isDayEmpty), true);
+        std::fill(std::begin(isDayEmpty), std::end(isDayEmpty), true);
         if (auto response = dynamic_cast<db::query::events::GetFilteredResult *>(queryResult)) {
             const auto records = response->getResult();
             for (auto &rec : *records) {
diff --git a/module-apps/application-calendar/windows/CustomRepeatWindow.cpp b/module-apps/application-calendar/windows/CustomRepeatWindow.cpp
index 8a4d031ca..6584c9aec 100644
--- a/module-apps/application-calendar/windows/CustomRepeatWindow.cpp
+++ b/module-apps/application-calendar/windows/CustomRepeatWindow.cpp
@@ -1,8 +1,9 @@
 #include "CustomRepeatWindow.hpp"
-#include "module-apps/application-calendar/data/CalendarData.hpp"
+#include "InputEvent.hpp"
 #include "application-calendar/widgets/CheckBoxWithLabelItem.hpp"
-#include <gui/widgets/Window.hpp>
+#include "module-apps/application-calendar/data/CalendarData.hpp"
 #include <Utils.hpp>
+#include <gui/widgets/Window.hpp>
 
 namespace gui
 {
diff --git a/module-apps/application-calendar/windows/DayEventsWindow.cpp b/module-apps/application-calendar/windows/DayEventsWindow.cpp
index a86c9a96b..c115ea24e 100644
--- a/module-apps/application-calendar/windows/DayEventsWindow.cpp
+++ b/module-apps/application-calendar/windows/DayEventsWindow.cpp
@@ -119,7 +119,7 @@ namespace gui
     auto DayEventsWindow::handleQueryResponse(db::QueryResult *queryResult) -> bool
     {
         if (const auto response = dynamic_cast<db::query::events::GetFilteredResult *>(queryResult)) {
-            unique_ptr<vector<EventsRecord>> records = response->getResult();
+            std::unique_ptr<std::vector<EventsRecord>> records = response->getResult();
             if (checkEmpty) {
                 if (records->empty()) {
                     auto app = dynamic_cast<app::ApplicationCalendar *>(application);
diff --git a/module-apps/application-calendar/windows/EventDetailWindow.cpp b/module-apps/application-calendar/windows/EventDetailWindow.cpp
index 2ef35227c..ddb28b691 100644
--- a/module-apps/application-calendar/windows/EventDetailWindow.cpp
+++ b/module-apps/application-calendar/windows/EventDetailWindow.cpp
@@ -1,4 +1,5 @@
 #include "EventDetailWindow.hpp"
+#include "InputEvent.hpp"
 #include "application-calendar/widgets/CalendarStyle.hpp"
 #include "module-apps/application-calendar/data/CalendarData.hpp"
 #include <gui/widgets/Window.hpp>
diff --git a/module-apps/application-call/ApplicationCall.cpp b/module-apps/application-call/ApplicationCall.cpp
index 3e135c01c..7cb31563a 100644
--- a/module-apps/application-call/ApplicationCall.cpp
+++ b/module-apps/application-call/ApplicationCall.cpp
@@ -25,9 +25,11 @@ namespace app
 {
 
     ApplicationCall::ApplicationCall(std::string name, std::string parent, bool startBackground)
-        : Application(name, parent, startBackground, app::call_stack_size),
-          timerCall(CreateAppTimer(1000, true, [=]() { timerCallCallback(); }))
-    {}
+        : Application(name, parent, startBackground, app::call_stack_size)
+    {
+        timerCall = std::make_unique<sys::Timer>("Call", this, 1000);
+        timerCall->connect([this](sys::Timer &) { timerCallCallback(); });
+    }
 
     //  number of seconds after end call to switch back to previous application
     const inline utils::time::Duration delayToSwitchToPreviousApp = 3;
@@ -40,17 +42,12 @@ namespace app
         if (getCurrentWindow() == it->second) {
             auto callWindow = dynamic_cast<gui::CallWindow *>(getCurrentWindow());
 
-            if (callWindow && callWindow->getState() == gui::CallWindow::State::CALL_IN_PROGRESS) {
+            if (callWindow != nullptr && callWindow->getState() == gui::CallWindow::State::CALL_IN_PROGRESS) {
                 callWindow->updateDuration(callDuration);
                 refreshWindow(gui::RefreshModes::GUI_REFRESH_FAST);
             }
         }
 
-        // delayed switch to previous application
-        if (callDelayedStopTime != 0 && utils::time::Timestamp() >= callDelayedStopTime) {
-            stopCallTimer();
-            sapm::ApplicationManager::messageSwitchPreviousApplication(this);
-        }
     }
 
     void ApplicationCall::CallAbortHandler()
@@ -61,7 +58,6 @@ namespace app
         LOG_INFO("---------------------------------CallAborted");
         AudioServiceAPI::Stop(this, routingAudioHandle);
         AudioServiceAPI::Stop(this, callringAudioHandle);
-        callDelayedStopTime = utils::time::Timestamp() + delayToSwitchToPreviousApp;
         callWindow->setState(gui::CallWindow::State::CALL_ENDED);
         if (getState() == State::ACTIVE_FORGROUND && getCurrentWindow() != callWindow) {
             switchWindow(window::name_call);
@@ -249,16 +245,14 @@ namespace app
     {
         callStartTime       = utils::time::Timestamp();
         callDuration        = 0;
-        callDelayedStopTime = 0;
-        timerCall.restart();
+        timerCall->reload();
     }
 
     void ApplicationCall::stopCallTimer()
     {
         callStartTime       = 0;
         callDuration        = 0;
-        callDelayedStopTime = 0;
-        timerCall.stop();
+        timerCall->stop();
     }
 
     void ApplicationCall::destroyUserInterface()
diff --git a/module-apps/application-call/ApplicationCall.hpp b/module-apps/application-call/ApplicationCall.hpp
index 78fa19333..aba5d65a4 100644
--- a/module-apps/application-call/ApplicationCall.hpp
+++ b/module-apps/application-call/ApplicationCall.hpp
@@ -2,6 +2,7 @@
 
 #include "Application.hpp"
 #include "Service/Message.hpp"
+#include "Service/Timer.hpp"
 #include "SystemManager/SystemManager.hpp"
 #include <service-cellular/api/CellularServiceAPI.hpp>
 #include <time/time_conversion.hpp>
@@ -33,15 +34,14 @@ namespace app
       protected:
         audio::Handle routingAudioHandle;
         audio::Handle callringAudioHandle;
-        AppTimer timerCall;
+        std::unique_ptr<sys::Timer> timerCall;
         utils::time::Timestamp callStartTime = 0;
         utils::time::Duration callDuration;
-        utils::time::Timestamp callDelayedStopTime = 0;
+        sys::ms callDelayedStopTime = 3000;
         void timerCallCallback();
 
       public:
         ApplicationCall(std::string name = name_call, std::string parent = "", bool startBackgound = false);
-        ~ApplicationCall() override = default;
         sys::Message_t DataReceivedHandler(sys::DataMessage *msgl, sys::ResponseMessage *resp) override;
         sys::ReturnCodes InitHandler() override;
         sys::ReturnCodes DeinitHandler() override;
@@ -64,7 +64,10 @@ namespace app
         void handleAddContactEvent(const std::string &number);
 
         bool showNotification(std::function<bool()> action);
-
         void transmitDtmfTone(uint32_t digit);
+        auto getDelayedStopTime() const
+        {
+            return callDelayedStopTime;
+        }
     };
 } /* namespace app */
diff --git a/module-apps/application-call/windows/CallWindow.cpp b/module-apps/application-call/windows/CallWindow.cpp
index 7df9bdd59..c746db24c 100644
--- a/module-apps/application-call/windows/CallWindow.cpp
+++ b/module-apps/application-call/windows/CallWindow.cpp
@@ -8,6 +8,8 @@
  */
 #include "CallWindow.hpp"
 
+#include "GuiTimer.hpp"
+#include "InputEvent.hpp"
 #include "application-call/widgets/Icons.hpp"
 #include "service-appmgr/ApplicationManager.hpp"
 
@@ -192,6 +194,8 @@ namespace gui
             setFocusItem(nullptr);
             speakerIcon->set(SpeakerIconState::SPEAKER);
             microphoneIcon->set(MicrophoneIconState::MUTE);
+
+            connectTimerOnExit();
         } break;
         case State::CALL_IN_PROGRESS: {
             bottomBar->setActive(gui::BottomBar::Side::LEFT, false);
@@ -233,7 +237,9 @@ namespace gui
 
     void CallWindow::updateDuration(const utils::time::Duration &duration)
     {
-        durationLabel->setText(duration.str());
+        if (durationLabel != nullptr) {
+            durationLabel->setText(duration.str());
+        }
     }
 
     bool CallWindow::handleSwitchData(SwitchData *data)
@@ -367,4 +373,20 @@ namespace gui
         }
     }
 
+    void CallWindow::connectTimerOnExit()
+    {
+        auto app = dynamic_cast<app::ApplicationCall *>(application);
+        assert(app != nullptr);
+        auto timer = std::make_unique<app::GuiTimer>(app);
+        timer->setInterval(app->getDelayedStopTime());
+        timerCallback = [app, this](Item &, Timer &timer) {
+            app->stopCallTimer();
+            setState(State::IDLE);
+            detachTimer(timer);
+            sapm::ApplicationManager::messageSwitchPreviousApplication(app);
+            return true;
+        };
+        app->connect(std::move(timer), this);
+    }
+
 } /* namespace gui */
diff --git a/module-apps/application-call/windows/CallWindow.hpp b/module-apps/application-call/windows/CallWindow.hpp
index 0f4b1b444..70eadb906 100644
--- a/module-apps/application-call/windows/CallWindow.hpp
+++ b/module-apps/application-call/windows/CallWindow.hpp
@@ -64,8 +64,8 @@ namespace gui
         void rebuild() override;
         void buildInterface() override;
         void destroyInterface() override;
-
         bool handleDigit(const uint32_t digit);
+        void connectTimerOnExit();
     };
 
 } /* namespace gui */
diff --git a/module-apps/application-calllog/CalllogModel.cpp b/module-apps/application-calllog/CalllogModel.cpp
index 717c313f0..4742c1604 100644
--- a/module-apps/application-calllog/CalllogModel.cpp
+++ b/module-apps/application-calllog/CalllogModel.cpp
@@ -6,13 +6,14 @@
  * @copyright Copyright (C) 2019 mudita.com
  * @details
  */
-#include "service-db/api/DBServiceAPI.hpp"
-#include "widgets/CalllogItem.hpp"
-#include "data/CallLogSwitchData.hpp"
-#include "data/CallLogInternals.hpp"
 #include "CalllogModel.hpp"
+#include "InputEvent.hpp"
 #include "ListView.hpp"
 #include "UiCommonActions.hpp"
+#include "data/CallLogInternals.hpp"
+#include "data/CallLogSwitchData.hpp"
+#include "service-db/api/DBServiceAPI.hpp"
+#include "widgets/CalllogItem.hpp"
 
 using namespace calllog;
 
diff --git a/module-apps/application-clock/ApplicationClock.cpp b/module-apps/application-clock/ApplicationClock.cpp
index 47e320fb4..56c7e690f 100644
--- a/module-apps/application-clock/ApplicationClock.cpp
+++ b/module-apps/application-clock/ApplicationClock.cpp
@@ -8,6 +8,7 @@
  */
 
 // module-gui
+#include "Service/Timer.hpp"
 #include "gui/widgets/Window.hpp"
 
 // module-utils
@@ -29,10 +30,11 @@ namespace app
                                        std::string parent,
                                        uint32_t stackDepth,
                                        sys::ServicePriority priority)
-        : Application(name, parent, false, stackDepth, priority),
-          timerClock(CreateAppTimer(1000, true, [=]() { timerClockCallback(); }))
+        : Application(name, parent, false, stackDepth, priority)
     {
-        timerClock.restart();
+        timerClock = std::make_unique<sys::Timer>("Clock", this, 1000);
+        timerClock->connect([&](sys::Timer &) { timerClockCallback(); });
+        timerClock->start();
     }
 
     void ApplicationClock::timerClockCallback()
@@ -81,7 +83,7 @@ namespace app
 
     sys::ReturnCodes ApplicationClock::DeinitHandler()
     {
-        DeleteTimer(timerClock);
+        timerClock->stop();
         return sys::ReturnCodes::Success;
     }
 
diff --git a/module-apps/application-clock/ApplicationClock.hpp b/module-apps/application-clock/ApplicationClock.hpp
index d8f268abb..7e218eee9 100644
--- a/module-apps/application-clock/ApplicationClock.hpp
+++ b/module-apps/application-clock/ApplicationClock.hpp
@@ -10,7 +10,7 @@ namespace app
 
     class ApplicationClock : public Application
     {
-        AppTimer timerClock;
+        std::unique_ptr<sys::Timer> timerClock;
         void timerClockCallback();
 
       public:
diff --git a/module-apps/application-desktop/windows/DesktopMainWindow.cpp b/module-apps/application-desktop/windows/DesktopMainWindow.cpp
index 3309d52a9..0a8a5de9d 100644
--- a/module-apps/application-desktop/windows/DesktopMainWindow.cpp
+++ b/module-apps/application-desktop/windows/DesktopMainWindow.cpp
@@ -8,12 +8,13 @@
  */
 #include <memory>
 
+#include "Alignment.hpp"
+#include "BottomBar.hpp"
+#include "Common.hpp"
+#include "DesktopMainWindow.hpp"
+#include "GuiTimer.hpp"
 #include "application-desktop/ApplicationDesktop.hpp"
 #include "application-desktop/data/LockPhoneData.hpp"
-#include "Alignment.hpp"
-#include "Common.hpp"
-#include "BottomBar.hpp"
-#include "DesktopMainWindow.hpp"
 #include "application-messages/ApplicationMessages.hpp"
 #include "gui/widgets/Image.hpp"
 #include "service-appmgr/ApplicationManager.hpp"
diff --git a/module-apps/application-desktop/windows/MenuWindow.cpp b/module-apps/application-desktop/windows/MenuWindow.cpp
index 798e9ee17..4375f1747 100644
--- a/module-apps/application-desktop/windows/MenuWindow.cpp
+++ b/module-apps/application-desktop/windows/MenuWindow.cpp
@@ -1,5 +1,6 @@
 #include "MenuWindow.hpp"
 #include "../ApplicationDesktop.hpp"
+#include "InputEvent.hpp"
 #include "Item.hpp"
 #include "Navigation.hpp"
 #include "service-appmgr/ApplicationManager.hpp"
diff --git a/module-apps/application-desktop/windows/PinLockWindow.cpp b/module-apps/application-desktop/windows/PinLockWindow.cpp
index 1eddf39b0..d11ad90d1 100644
--- a/module-apps/application-desktop/windows/PinLockWindow.cpp
+++ b/module-apps/application-desktop/windows/PinLockWindow.cpp
@@ -7,6 +7,7 @@
  * @details
  */
 // application manager
+#include "InputEvent.hpp"
 #include "service-appmgr/ApplicationManager.hpp"
 
 // module-gui
diff --git a/module-apps/application-desktop/windows/PowerOffWindow.cpp b/module-apps/application-desktop/windows/PowerOffWindow.cpp
index b103ac0ed..89a002219 100644
--- a/module-apps/application-desktop/windows/PowerOffWindow.cpp
+++ b/module-apps/application-desktop/windows/PowerOffWindow.cpp
@@ -1,6 +1,7 @@
-#include "log/log.hpp"
+#include "InputEvent.hpp"
 #include "gui/widgets/BottomBar.hpp"
 #include "gui/widgets/TopBar.hpp"
+#include "log/log.hpp"
 
 // module-utils
 #include "i18/i18.hpp"
diff --git a/module-apps/application-messages/models/ThreadsModel.cpp b/module-apps/application-messages/models/ThreadsModel.cpp
index cfd78eb17..66b125789 100644
--- a/module-apps/application-messages/models/ThreadsModel.cpp
+++ b/module-apps/application-messages/models/ThreadsModel.cpp
@@ -1,10 +1,11 @@
-#include <module-services/service-db/messages/DBThreadMessage.hpp>
-#include <module-services/service-db/api/DBServiceAPI.hpp>
 #include "ThreadsModel.hpp"
+#include "InputEvent.hpp"
 #include "OptionWindow.hpp"
-#include "application-messages/windows/ThreadWindowOptions.hpp"
-#include "application-messages/widgets/ThreadItem.hpp"
 #include "application-messages/data/SMSdata.hpp"
+#include "application-messages/widgets/ThreadItem.hpp"
+#include "application-messages/windows/ThreadWindowOptions.hpp"
+#include <module-services/service-db/api/DBServiceAPI.hpp>
+#include <module-services/service-db/messages/DBThreadMessage.hpp>
 
 ThreadsModel::ThreadsModel(app::Application *app) : BaseThreadsRecordModel(app)
 {}
diff --git a/module-apps/application-messages/widgets/SMSInputWidget.cpp b/module-apps/application-messages/widgets/SMSInputWidget.cpp
index e03bc3f0c..a58c5ccc2 100644
--- a/module-apps/application-messages/widgets/SMSInputWidget.cpp
+++ b/module-apps/application-messages/widgets/SMSInputWidget.cpp
@@ -1,6 +1,7 @@
-#include <module-apps/application-messages/ApplicationMessages.hpp>
 #include "SMSInputWidget.hpp"
+#include "AppWindow.hpp"
 #include "application-messages/data/MessagesStyle.hpp"
+#include <module-apps/application-messages/ApplicationMessages.hpp>
 
 #include <Style.hpp>
 #include <i18/i18.hpp>
diff --git a/module-apps/application-music-player/windows/MusicPlayerAllSongsWindow.cpp b/module-apps/application-music-player/windows/MusicPlayerAllSongsWindow.cpp
index b3f81d6a9..f72d83842 100644
--- a/module-apps/application-music-player/windows/MusicPlayerAllSongsWindow.cpp
+++ b/module-apps/application-music-player/windows/MusicPlayerAllSongsWindow.cpp
@@ -2,6 +2,7 @@
 #include "application-music-player/ApplicationMusicPlayer.hpp"
 
 #include <Style.hpp>
+#include <cassert>
 #include <i18/i18.hpp>
 #include <log/log.hpp>
 #include <service-audio/api/AudioServiceAPI.hpp>
diff --git a/module-apps/application-notes/windows/NotesMainWindow.cpp b/module-apps/application-notes/windows/NotesMainWindow.cpp
index be5443d5e..62da91c81 100644
--- a/module-apps/application-notes/windows/NotesMainWindow.cpp
+++ b/module-apps/application-notes/windows/NotesMainWindow.cpp
@@ -9,6 +9,7 @@
 #include <memory>
 #include <functional>
 
+#include "InputEvent.hpp"
 #include "service-appmgr/ApplicationManager.hpp"
 
 #include "../ApplicationNotes.hpp"
diff --git a/module-apps/application-phonebook/models/NewContactModel.cpp b/module-apps/application-phonebook/models/NewContactModel.cpp
index c702c02b0..3d4c7e77b 100644
--- a/module-apps/application-phonebook/models/NewContactModel.cpp
+++ b/module-apps/application-phonebook/models/NewContactModel.cpp
@@ -1,5 +1,6 @@
 #include "NewContactModel.hpp"
 
+#include "AppWindow.hpp"
 #include "application-phonebook/widgets/ContactListItem.hpp"
 #include "application-phonebook/widgets/InputBoxWithLabelAndIconWidget.hpp"
 #include "application-phonebook/widgets/InputLinesWithLabelIWidget.hpp"
diff --git a/module-apps/application-phonebook/widgets/InformationWidget.cpp b/module-apps/application-phonebook/widgets/InformationWidget.cpp
index 7ae4f332a..4eac950df 100644
--- a/module-apps/application-phonebook/widgets/InformationWidget.cpp
+++ b/module-apps/application-phonebook/widgets/InformationWidget.cpp
@@ -1,5 +1,6 @@
 #include "InformationWidget.hpp"
 
+#include "AppWindow.hpp"
 #include "application-phonebook/data/PhonebookStyle.hpp"
 
 #include <ContactRecord.hpp>
diff --git a/module-apps/application-phonebook/widgets/NumberWithIconsWidget.hpp b/module-apps/application-phonebook/widgets/NumberWithIconsWidget.hpp
index 75e850cc4..8bbe3983f 100644
--- a/module-apps/application-phonebook/widgets/NumberWithIconsWidget.hpp
+++ b/module-apps/application-phonebook/widgets/NumberWithIconsWidget.hpp
@@ -6,6 +6,7 @@
 #include <Image.hpp>
 #include <ImageBox.hpp>
 #include <TextFixedSize.hpp>
+#include <module-utils/PhoneNumber.hpp>
 
 namespace gui
 {
diff --git a/module-apps/application-phonebook/windows/PhonebookContactDetails.hpp b/module-apps/application-phonebook/windows/PhonebookContactDetails.hpp
index 60ac34e27..34b15d368 100644
--- a/module-apps/application-phonebook/windows/PhonebookContactDetails.hpp
+++ b/module-apps/application-phonebook/windows/PhonebookContactDetails.hpp
@@ -3,8 +3,9 @@
 #include "application-phonebook/data/PhonebookItemData.hpp"
 #include "application-phonebook/models/ContactDetailsModel.hpp"
 
-#include <Text.hpp>
+#include <AppWindow.hpp>
 #include <ListView.hpp>
+#include <Text.hpp>
 
 namespace gui
 {
diff --git a/module-apps/application-phonebook/windows/PhonebookIceContacts.hpp b/module-apps/application-phonebook/windows/PhonebookIceContacts.hpp
index 99cc39b3f..52139b9dc 100644
--- a/module-apps/application-phonebook/windows/PhonebookIceContacts.hpp
+++ b/module-apps/application-phonebook/windows/PhonebookIceContacts.hpp
@@ -3,6 +3,7 @@
 #include "application-phonebook/models/PhonebookModel.hpp"
 #include "application-phonebook/widgets/PhonebookListView.hpp"
 
+#include <AppWindow.hpp>
 #include <gui/widgets/ListView.hpp>
 
 namespace gui
diff --git a/module-apps/application-phonebook/windows/PhonebookMainWindow.hpp b/module-apps/application-phonebook/windows/PhonebookMainWindow.hpp
index 0132dc0b4..876be28b2 100644
--- a/module-apps/application-phonebook/windows/PhonebookMainWindow.hpp
+++ b/module-apps/application-phonebook/windows/PhonebookMainWindow.hpp
@@ -4,6 +4,7 @@
 #include "application-phonebook/models/PhonebookModel.hpp"
 #include "application-phonebook/widgets/PhonebookListView.hpp"
 
+#include <AppWindow.hpp>
 #include <gui/widgets/ListView.hpp>
 
 #include <application-phonebook/data/ContactsMap.hpp>
diff --git a/module-apps/application-phonebook/windows/PhonebookNewContact.hpp b/module-apps/application-phonebook/windows/PhonebookNewContact.hpp
index eb67d1f61..319b87ead 100644
--- a/module-apps/application-phonebook/windows/PhonebookNewContact.hpp
+++ b/module-apps/application-phonebook/windows/PhonebookNewContact.hpp
@@ -3,8 +3,9 @@
 #include "application-phonebook/data/PhonebookItemData.hpp"
 #include "application-phonebook/models/NewContactModel.hpp"
 
-#include <Text.hpp>
+#include <AppWindow.hpp>
 #include <ListView.hpp>
+#include <Text.hpp>
 
 namespace gui
 {
diff --git a/module-apps/application-phonebook/windows/PhonebookSearch.hpp b/module-apps/application-phonebook/windows/PhonebookSearch.hpp
index 397151292..b8654cbc4 100644
--- a/module-apps/application-phonebook/windows/PhonebookSearch.hpp
+++ b/module-apps/application-phonebook/windows/PhonebookSearch.hpp
@@ -4,6 +4,7 @@
 #include "application-phonebook/models/PhonebookModel.hpp"
 #include "application-phonebook/widgets/PhonebookListView.hpp"
 
+#include <AppWindow.hpp>
 #include <Text.hpp>
 
 namespace gui
diff --git a/module-apps/application-phonebook/windows/PhonebookSearchResults.hpp b/module-apps/application-phonebook/windows/PhonebookSearchResults.hpp
index 0ce50372d..6c56fcb64 100644
--- a/module-apps/application-phonebook/windows/PhonebookSearchResults.hpp
+++ b/module-apps/application-phonebook/windows/PhonebookSearchResults.hpp
@@ -3,6 +3,7 @@
 #include "application-phonebook/data/PhonebookItemData.hpp"
 #include "application-phonebook/models/PhonebookModel.hpp"
 #include "application-phonebook/widgets/PhonebookListView.hpp"
+#include <AppWindow.hpp>
 
 namespace gui
 {
diff --git a/module-apps/application-settings/windows/CellularPassthroughWindow.hpp b/module-apps/application-settings/windows/CellularPassthroughWindow.hpp
index 2e08980e2..943ef00b6 100644
--- a/module-apps/application-settings/windows/CellularPassthroughWindow.hpp
+++ b/module-apps/application-settings/windows/CellularPassthroughWindow.hpp
@@ -1,8 +1,9 @@
 #pragma once
 
-#include <module-gui/gui/widgets/Text.hpp>
-#include <module-bsp/bsp/cellular/bsp_cellular.hpp>
+#include "AppWindow.hpp"
 #include "Application.hpp"
+#include <module-bsp/bsp/cellular/bsp_cellular.hpp>
+#include <module-gui/gui/widgets/Text.hpp>
 
 namespace gui
 {
diff --git a/module-apps/application-settings/windows/Fota.hpp b/module-apps/application-settings/windows/Fota.hpp
index 5405f9138..57d7cd7ef 100644
--- a/module-apps/application-settings/windows/Fota.hpp
+++ b/module-apps/application-settings/windows/Fota.hpp
@@ -53,7 +53,7 @@ class Fota
     void configureAPN();
     void connect();
     void downloadInfo();
-    void parseInfo(string data);
+    void parseInfo(std::string data);
     void checkIfUpdateRequired();
     void update();
     void reboot();
diff --git a/module-apps/application-settings/windows/Info.cpp b/module-apps/application-settings/windows/Info.cpp
index a349d3f9c..0d4e1bbce 100644
--- a/module-apps/application-settings/windows/Info.cpp
+++ b/module-apps/application-settings/windows/Info.cpp
@@ -68,7 +68,7 @@ namespace gui
         box = nullptr;
     }
 
-    void Info::addAlignedLabelWithValue(BoxLayout *layout, const string &labelText, const string &valueText)
+    void Info::addAlignedLabelWithValue(BoxLayout *layout, const std::string &labelText, const std::string &valueText)
     {
         auto lineBox = new gui::VBox(layout, 0, 0, style::window_width, style::window::label::small_h * 2);
         lineBox->setEdges(RectangleEdgeFlags::GUI_RECT_EDGE_BOTTOM);
diff --git a/module-apps/application-special-input/ApplicationSpecialInput.hpp b/module-apps/application-special-input/ApplicationSpecialInput.hpp
index 71178c4a8..08eb680ab 100644
--- a/module-apps/application-special-input/ApplicationSpecialInput.hpp
+++ b/module-apps/application-special-input/ApplicationSpecialInput.hpp
@@ -2,6 +2,7 @@
 
 #include "Application.hpp"
 #include "SwitchData.hpp"
+#include <AppWindow.hpp>
 
 namespace app
 {
diff --git a/module-apps/application-special-input/windows/SpecialInputMainWindow.cpp b/module-apps/application-special-input/windows/SpecialInputMainWindow.cpp
index 66e106644..f1a16fc75 100644
--- a/module-apps/application-special-input/windows/SpecialInputMainWindow.cpp
+++ b/module-apps/application-special-input/windows/SpecialInputMainWindow.cpp
@@ -3,6 +3,7 @@
 #include "Style.hpp"
 #include "messages/AppMessage.hpp"
 #include <i18/i18.hpp>
+#include <cassert>
 
 using namespace gui;
 
diff --git a/module-apps/windows/AppWindow.cpp b/module-apps/windows/AppWindow.cpp
index f399b60de..86453191e 100644
--- a/module-apps/windows/AppWindow.cpp
+++ b/module-apps/windows/AppWindow.cpp
@@ -1,9 +1,10 @@
 #include "AppWindow.hpp"
 #include "Application.hpp"
-#include <i18/i18.hpp>
-#include <service-appmgr/ApplicationManager.hpp>
+#include "InputEvent.hpp"
 #include <Style.hpp>
 #include <application-desktop/ApplicationDesktop.hpp>
+#include <i18/i18.hpp>
+#include <service-appmgr/ApplicationManager.hpp>
 #include <service-audio/api/AudioServiceAPI.hpp>
 
 using namespace style::header;
diff --git a/module-apps/windows/OptionWindow.cpp b/module-apps/windows/OptionWindow.cpp
index d6c02ade2..7ef24cbdf 100644
--- a/module-apps/windows/OptionWindow.cpp
+++ b/module-apps/windows/OptionWindow.cpp
@@ -4,6 +4,7 @@
 #include "i18/i18.hpp"
 #include "service-appmgr/ApplicationManager.hpp"
 #include <Style.hpp>
+#include <cassert>
 #include <functional>
 #include <memory>
 
diff --git a/module-audio/Audio/decoder/taglib b/module-audio/Audio/decoder/taglib
index fa37896f6..b2a6e50ae 160000
--- a/module-audio/Audio/decoder/taglib
+++ b/module-audio/Audio/decoder/taglib
@@ -1 +1 @@
-Subproject commit fa37896f615f3d347a41f0db711e23746774b15f
+Subproject commit b2a6e50aedf0cfe1f808eb23dc9f572a848ddffe
diff --git a/module-cellular/Modem/TS0710/TS0710.cpp b/module-cellular/Modem/TS0710/TS0710.cpp
index 39ab64e63..ac1dcacdc 100644
--- a/module-cellular/Modem/TS0710/TS0710.cpp
+++ b/module-cellular/Modem/TS0710/TS0710.cpp
@@ -4,11 +4,12 @@
 #include "service-cellular/ServiceCellular.hpp"
 #include "service-cellular/SignalStrength.hpp"
 #include "service-cellular/messages/CellularMessage.hpp"
+#include <Service/Bus.hpp>
 #include <at/URC_QIND.hpp>
-#include <module-os/RTOSWrapper/include/ticks.hpp>
 #include <cassert>
-#include <sstream>
 #include <memory>
+#include <module-os/RTOSWrapper/include/ticks.hpp>
+#include <sstream>
 
 std::map<TypeOfFrame_e, std::string> TypeOfFrame_text = {{TypeOfFrame_e::SABM, "SABM"},
                                                          {TypeOfFrame_e::UA, "UA"},
diff --git a/module-cellular/Modem/TS0710/TS0710_Frame.h b/module-cellular/Modem/TS0710/TS0710_Frame.h
index b1bfabac3..a85045f53 100644
--- a/module-cellular/Modem/TS0710/TS0710_Frame.h
+++ b/module-cellular/Modem/TS0710/TS0710_Frame.h
@@ -10,8 +10,6 @@
 #define TS0710_FLAG          0xF9
 #define TS0710_FRAME_HDR_LEN 6 // without extended address byte
 
-using namespace std;
-
 class TS0710_Frame
 {
   private:
diff --git a/module-gui/gui/core/Timer.hpp b/module-gui/gui/core/Timer.hpp
new file mode 100644
index 000000000..e0876299d
--- /dev/null
+++ b/module-gui/gui/core/Timer.hpp
@@ -0,0 +1,38 @@
+#pragma once
+
+namespace gui
+{
+    using ms = unsigned int;
+
+    /// gui::Timer helper class to be used as passed to gui::Item `onTimer` function
+    /// this interface should be connected to real timer build with system Timer
+    /// all gui timers should be `Coarse` timers
+    class Timer
+    {
+      public:
+        virtual ~Timer() = default;
+        enum Type
+        {
+            Single,   /// single run timer
+            Continous /// free running timers
+        };
+        virtual void start()              = 0;
+        virtual void stop()               = 0;
+        virtual void reset()              = 0;
+        virtual void setInterval(ms time) = 0;
+        [[nodiscard]] auto interval() const -> ms;
+
+      protected:
+        Type type = Single;
+
+      public:
+        [[nodiscard]] auto getType() const -> Type
+        {
+            return type;
+        }
+        virtual void setType(Type new_type)
+        {
+            type = new_type;
+        };
+    };
+}; // namespace gui
diff --git a/module-gui/gui/widgets/BoxLayout.cpp b/module-gui/gui/widgets/BoxLayout.cpp
index 208ac26d4..c10523858 100644
--- a/module-gui/gui/widgets/BoxLayout.cpp
+++ b/module-gui/gui/widgets/BoxLayout.cpp
@@ -1,7 +1,8 @@
 #include "BoxLayout.hpp"
-#include <log/log.hpp>
-#include <Label.hpp>
 #include "BoxLayoutSizeStore.hpp"
+#include <InputEvent.hpp>
+#include <Label.hpp>
+#include <log/log.hpp>
 
 namespace gui
 {
diff --git a/module-gui/gui/widgets/CheckBox.cpp b/module-gui/gui/widgets/CheckBox.cpp
index d64a6d81c..6dc2eec19 100644
--- a/module-gui/gui/widgets/CheckBox.cpp
+++ b/module-gui/gui/widgets/CheckBox.cpp
@@ -1,4 +1,5 @@
 #include "CheckBox.hpp"
+#include "InputEvent.hpp"
 #include "Style.hpp"
 #include "Utils.hpp"
 
diff --git a/module-gui/gui/widgets/GridLayout.cpp b/module-gui/gui/widgets/GridLayout.cpp
index 008f17184..25deb5704 100644
--- a/module-gui/gui/widgets/GridLayout.cpp
+++ b/module-gui/gui/widgets/GridLayout.cpp
@@ -1,4 +1,5 @@
 #include "GridLayout.hpp"
+#include "InputEvent.hpp"
 #include "Style.hpp"
 #include <log/log.hpp>
 
diff --git a/module-gui/gui/widgets/Item.cpp b/module-gui/gui/widgets/Item.cpp
index abd54b733..ece35f7f8 100644
--- a/module-gui/gui/widgets/Item.cpp
+++ b/module-gui/gui/widgets/Item.cpp
@@ -1,17 +1,17 @@
-/*
- * Item.cpp
- *
- *  Created on: 4 mar 2019
- *      Author: robert
- */
-
-#include <list>
-#include <algorithm>
-#include <cstring>
-#include "Navigation.hpp"
 #include "Item.hpp"
-#include "BoundingBox.hpp"
-#include "log/log.hpp"
+#include "BoundingBox.hpp" // for BoundingBox, BoundingBox::(anonymous)
+#include "InputEvent.hpp"  // for InputEvent, KeyCode, InputEvent::State
+#include "Navigation.hpp"  // for Navigation
+#include "Timer.hpp"       // for Timer
+#include <Timer.hpp>
+#include <algorithm> // for find
+#include <list>      // for list<>::iterator, list, operator!=, _List...
+#include <memory>
+
+namespace gui
+{
+    class DrawCommand;
+}
 
 namespace gui
 {
@@ -498,4 +498,24 @@ namespace gui
         }
         return false;
     }
+
+    bool Item::onContent()
+    {
+        return false;
+    }
+
+    auto Item::onTimer(Timer &timer) -> bool
+    {
+        if (timerCallback != nullptr) {
+            return timerCallback(*this, timer);
+        }
+        return false;
+    }
+
+    void Item::detachTimer(Timer &timer)
+    {
+        auto el = std::find_if(timers.begin(), timers.end(), [&](auto &el) -> bool { return el.get() == &timer; });
+        timers.erase(el);
+    }
+
 } /* namespace gui */
diff --git a/module-gui/gui/widgets/Item.hpp b/module-gui/gui/widgets/Item.hpp
index 5c90805f9..77e4745b2 100644
--- a/module-gui/gui/widgets/Item.hpp
+++ b/module-gui/gui/widgets/Item.hpp
@@ -1,24 +1,35 @@
 #pragma once
 
-#include <vector>
-#include <list>
-#include <functional>
-
-#include "KeyEvent.hpp"
-#include "Common.hpp"
-#include "core/DrawCommand.hpp"
-#include "core/BoundingBox.hpp"
-#include "input/InputEvent.hpp"
-#include "Layout.hpp"
-#include "Navigation.hpp"
-#include "Margins.hpp"
-#include "Alignment.hpp"
+#include "Alignment.hpp"        // for Alignment
+#include "Axes.hpp"             // for Axis
+#include "Common.hpp"           // for NavigationDirection, Size
+#include "Layout.hpp"           // for LayoutHorizontalPolicy, LayoutVertic...
+#include "Margins.hpp"          // for Padding, Margins
+#include "core/BoundingBox.hpp" // for BoundingBox, BoundingBox::(anonymous)
+#include <cstdint>              // for uint32_t, int32_t, uint16_t
+#include <functional>           // for function
+#include <list>                 // for list
+#include <memory>               // for unique_ptr
+#include <utility>              // for move
+namespace gui
+{
+    class DrawCommand;
+}
+namespace gui
+{
+    class InputEvent;
+}
+namespace gui
+{
+    class Navigation;
+} // namespace gui
+namespace gui
+{
+    class Timer;
+}
 
 namespace gui
 {
-
-    class Navigation;
-
     enum class ItemType
     {
         ITEM = 0,
@@ -38,6 +49,10 @@ namespace gui
 
     class Item
     {
+      private:
+        /// list of timers so that item could have it's timers in itself
+        std::list<std::unique_ptr<Timer>> timers;
+
       public:
         // flag that informs whether item has a focus
         bool focus;
@@ -124,6 +139,14 @@ namespace gui
         /// @param `this` item
         /// @param `InputEvent`
         std::function<bool(Item &, const InputEvent &inputEvent)> inputCallback;
+        /// callback when element insides are changed
+        /// @param `this` item
+        std::function<bool(Item &)> contentCallback;
+        /// callback when timer is called on Item and onTimer is executed
+        /// @param `this` item
+        /// @param `timer` which triggered this callback
+        std::function<bool(Item &, Timer &)> timerCallback = nullptr;
+
         /// callback on navigation, called when item passes navigation to handle by it's children
         /// @attention when child handles navigation it should return true, so that parent won't perform action for that
         std::function<bool(const InputEvent &)> itemNavigation = nullptr;
@@ -160,6 +183,13 @@ namespace gui
         /// calls: none, inconsistent api
         /// @note TODO should be fixed so that api would be consistent
         virtual bool onDimensionChanged(const BoundingBox &oldDim, const BoundingBox &newDim);
+        /// (should be) called each time content in item was changed, added for gui::Text widget
+        /// calls: none, inconsistent behaviour
+        /// @note TODO should be fixed so that api would be consistent
+        virtual bool onContent();
+        /// called on Timer event in application, triggeres timerCallback
+        /// @param timer timer element which triggered this action
+        virtual bool onTimer(Timer &timer);
 
         /// @}
 
@@ -303,6 +333,17 @@ namespace gui
             return this->widgetArea.size(axis) + this->widgetArea.pos(axis);
         };
         /// @}
+
+        /// adds timer to gui item
+        /// this is needed so that timer for element would live as long as element lives
+        void attachTimer(std::unique_ptr<Timer> &&timer)
+        {
+            timers.emplace_back(std::move(timer));
+        }
+
+        /// remove timer from item and as a result - destory it
+        void detachTimer(Timer &timer);
+
       protected:
         /// On change of position or size this method will recalculate visible part of the widget
         /// considering widgets hierarchy and calculate absolute position of drawing primitives.
diff --git a/module-gui/gui/widgets/ListView.cpp b/module-gui/gui/widgets/ListView.cpp
index cb14ea162..032b213a7 100644
--- a/module-gui/gui/widgets/ListView.cpp
+++ b/module-gui/gui/widgets/ListView.cpp
@@ -1,7 +1,8 @@
 #include "ListView.hpp"
-#include <log/log.hpp>
+#include "InputEvent.hpp"
 #include "cassert"
 #include <algorithm>
+#include <log/log.hpp>
 
 namespace gui
 {
diff --git a/module-gui/gui/widgets/PageLayout.cpp b/module-gui/gui/widgets/PageLayout.cpp
index bbd9a644d..09c58bf36 100644
--- a/module-gui/gui/widgets/PageLayout.cpp
+++ b/module-gui/gui/widgets/PageLayout.cpp
@@ -1,4 +1,5 @@
 #include "PageLayout.hpp"
+#include "InputEvent.hpp"
 #include "Style.hpp"
 #include <log/log.hpp>
 
diff --git a/module-gui/gui/widgets/Progress.cpp b/module-gui/gui/widgets/Progress.cpp
index 4fe9e43f4..6de0d2918 100644
--- a/module-gui/gui/widgets/Progress.cpp
+++ b/module-gui/gui/widgets/Progress.cpp
@@ -6,6 +6,7 @@
  */
 
 #include "Progress.hpp"
+#include "DrawCommand.hpp"
 
 namespace gui
 {
diff --git a/module-gui/gui/widgets/Window.cpp b/module-gui/gui/widgets/Window.cpp
index a99bd8f37..9484aad65 100644
--- a/module-gui/gui/widgets/Window.cpp
+++ b/module-gui/gui/widgets/Window.cpp
@@ -6,10 +6,11 @@
  */
 #include <algorithm>
 // gui
-#include "../core/BoundingBox.hpp"
 #include "../Common.hpp"
-#include "Window.hpp"
+#include "../core/BoundingBox.hpp"
 #include "../core/DrawCommand.hpp"
+#include "Window.hpp"
+#include <InputEvent.hpp>
 
 namespace gui
 {
diff --git a/module-gui/test/test-catch/test-gui-callbacks.cpp b/module-gui/test/test-catch/test-gui-callbacks.cpp
index 2835221cb..f251a3dad 100644
--- a/module-gui/test/test-catch/test-gui-callbacks.cpp
+++ b/module-gui/test/test-catch/test-gui-callbacks.cpp
@@ -1,6 +1,7 @@
 #include <catch2/catch.hpp>
 #include <module-gui/gui/widgets/Item.hpp>
 #include <mock/TestWindow.hpp>
+#include <gui/input/InputEvent.hpp>
 
 // there is strict order on which callbacks should be called
 TEST_CASE("gui::Item on input flow test")
diff --git a/module-gui/test/test-google/test-gui-boxlayout.cpp b/module-gui/test/test-google/test-gui-boxlayout.cpp
index 88a0cbea1..9e59a4683 100644
--- a/module-gui/test/test-google/test-gui-boxlayout.cpp
+++ b/module-gui/test/test-google/test-gui-boxlayout.cpp
@@ -2,6 +2,7 @@
 #include <module-utils/log/log.hpp>
 #include <module-gui/gui/widgets/BoxLayout.hpp>
 #include <module-gui/test/mock/TestListViewProvider.hpp>
+#include <gui/input/InputEvent.hpp>
 
 namespace testStyle
 {
diff --git a/module-gui/test/test-google/test-gui-listview.cpp b/module-gui/test/test-google/test-gui-listview.cpp
index eff00150f..be8ef17e4 100644
--- a/module-gui/test/test-google/test-gui-listview.cpp
+++ b/module-gui/test/test-google/test-gui-listview.cpp
@@ -2,6 +2,7 @@
 #include <module-gui/gui/widgets/ListView.hpp>
 #include <module-utils/log/log.hpp>
 #include <mock/TestListViewProvider.hpp>
+#include <gui/input/InputEvent.hpp>
 
 class TestListView : public gui::ListView
 {
diff --git a/module-os/RTOSWrapper/ctimer.cpp b/module-os/RTOSWrapper/ctimer.cpp
index 4013a75bc..32f72f844 100644
--- a/module-os/RTOSWrapper/ctimer.cpp
+++ b/module-os/RTOSWrapper/ctimer.cpp
@@ -46,29 +46,9 @@ using namespace cpp_freertos;
 Timer::Timer(   const char * const TimerName,
                 TickType_t PeriodInTicks,
                 bool Periodic
-                )
+                ) : name ( TimerName ) 
 {
-    handle = xTimerCreate(  TimerName,
-                            PeriodInTicks,
-                            Periodic ? pdTRUE : pdFALSE,
-                            this,
-                            TimerCallbackFunctionAdapter);
-
-    if (handle == NULL) {
-#ifndef CPP_FREERTOS_NO_EXCEPTIONS
-        throw TimerCreateException();
-#else
-        configASSERT(!"Timer Constructor Failed");
-#endif
-    }
-}
-
-
-Timer::Timer(   TickType_t PeriodInTicks,
-                bool Periodic
-                )
-{
-    handle = xTimerCreate(  "Default",
+    handle = xTimerCreate(  name.c_str(),
                             PeriodInTicks,
                             Periodic ? pdTRUE : pdFALSE,
                             this,
@@ -83,9 +63,13 @@ Timer::Timer(   TickType_t PeriodInTicks,
     }
 }
 
+Timer::Timer(TickType_t PeriodInTicks, bool Periodic) : Timer("Default", PeriodInTicks, Periodic)
+{}
 
 Timer::~Timer()
 {
+    // IMPORTANT pt1 - without it we have race condition with timer thread
+    vTimerSetTimerID(handle, nullptr);
     xTimerDelete(handle, portMAX_DELAY);
 }
 
@@ -164,6 +148,9 @@ TaskHandle_t Timer::GetTimerDaemonHandle()
 
 void Timer::TimerCallbackFunctionAdapter(TimerHandle_t xTimer)
 {
-    Timer *timer = static_cast<Timer *>(pvTimerGetTimerID(xTimer));
-    timer->Run();
+    auto *timer = static_cast<Timer *>(pvTimerGetTimerID(xTimer));
+    // IMPORTANT pt2 - without it we have race condition with timer thread
+    if (timer != nullptr && timer->handle != nullptr) {
+        timer->Run();
+    }
 }
diff --git a/module-os/RTOSWrapper/include/timer.hpp b/module-os/RTOSWrapper/include/timer.hpp
index 122300b32..ff8df7a62 100644
--- a/module-os/RTOSWrapper/include/timer.hpp
+++ b/module-os/RTOSWrapper/include/timer.hpp
@@ -48,9 +48,9 @@
  *  it's a fatal error. In the cases when you've defined this, the new 
  *  default behavior will be to issue a configASSERT() instead.
  */
+#include <string>
 #ifndef CPP_FREERTOS_NO_EXCEPTIONS
 #include <exception>
-#include <string>
 #include <cstdio>
 #ifdef CPP_FREERTOS_NO_CPP_STRINGS
 #error "FreeRTOS-Addons require C++ Strings if you are using exceptions"
@@ -106,6 +106,7 @@ class TimerCreateException  : public std::exception {
  */
 class Timer {
 
+    const std::string name = "Default";
     /////////////////////////////////////////////////////////////////////////
     //
     //  Public API
diff --git a/module-services/service-antenna/ServiceAntenna.cpp b/module-services/service-antenna/ServiceAntenna.cpp
index c12aabdbc..c04a6ad3a 100644
--- a/module-services/service-antenna/ServiceAntenna.cpp
+++ b/module-services/service-antenna/ServiceAntenna.cpp
@@ -1,13 +1,16 @@
 
 #include "ServiceAntenna.hpp"
-#include "messages/AntennaMessage.hpp"
+#include "Service/Timer.hpp"
 #include "api/AntennaServiceAPI.hpp"
 #include "log/log.hpp"
+#include "messages/AntennaMessage.hpp"
 #include "service-appmgr/ApplicationManager.hpp"
-#include <service-cellular/messages/CellularMessage.hpp>
-#include <module-utils/state/ServiceState.hpp>
 #include <at/response.hpp>
+#include <memory>
+#include <module-utils/state/ServiceState.hpp>
+#include <service-cellular/messages/CellularMessage.hpp>
 
+#include "service-cellular/api/CellularServiceAPI.hpp"
 #include "time/time_conversion.hpp"
 #include <ticks.hpp>
 
@@ -47,7 +50,18 @@ ServiceAntenna::ServiceAntenna() : sys::Service(serviceName)
 {
     LOG_INFO("[%s] Initializing", serviceName);
 
-    timerID = CreateTimer(5000, true);
+    timer = std::make_unique<sys::Timer>("Antena", this, 5000);
+    timer->connect([&](sys::Timer &) {
+        timer->stop();
+        auto stateToSet = state->get();
+        if (state->timeoutOccured(cpp_freertos::Ticks::GetTicks())) {
+            LOG_WARN("State [ %s ] timeout occured, setting [ %s ] state",
+                     c_str(state->get()),
+                     c_str(state->getTimeoutState()));
+            stateToSet = state->getTimeoutState();
+        }
+        state->set(stateToSet);
+    });
 
     state = new utils::state::State<antenna::State>(this);
 
@@ -124,7 +138,7 @@ sys::Message_t ServiceAntenna::DataReceivedHandler(sys::DataMessage *msgl, sys::
         }
     } break;
     case MessageType::AntennaGetLockState: {
-        auto responseMessage = make_shared<AntennaLockRequestResponse>(true, serviceLocked);
+        auto responseMessage = std::make_shared<AntennaLockRequestResponse>(true, serviceLocked);
         return responseMessage;
     } break;
     default:
@@ -166,18 +180,6 @@ sys::ReturnCodes ServiceAntenna::SwitchPowerModeHandler(const sys::ServicePowerM
     return sys::ReturnCodes::Success;
 }
 
-void ServiceAntenna::TickHandler(uint32_t id)
-{
-    stopTimer(timerID);
-    auto stateToSet = state->get();
-    if (state->timeoutOccured(cpp_freertos::Ticks::GetTicks())) {
-        LOG_WARN(
-            "State [ %s ] timeout occured, setting [ %s ] state", c_str(state->get()), c_str(state->getTimeoutState()));
-        stateToSet = state->getTimeoutState();
-    }
-    state->set(stateToSet);
-}
-
 void ServiceAntenna::handleLockRequest(antenna::lockState request)
 {
     auto currentState = state->get();
@@ -238,7 +240,7 @@ bool ServiceAntenna::HandleStateChange(antenna::State state)
     }
     if (!ret) {
         LOG_WARN("State [ %s ] not handled. Reloading timer.", c_str(state));
-        ReloadTimer(timerID);
+        timer->reload();
     }
     return ret;
 }
diff --git a/module-services/service-antenna/ServiceAntenna.hpp b/module-services/service-antenna/ServiceAntenna.hpp
index ced5299d5..5d38c24b2 100644
--- a/module-services/service-antenna/ServiceAntenna.hpp
+++ b/module-services/service-antenna/ServiceAntenna.hpp
@@ -46,7 +46,7 @@ class ServiceAntenna : public sys::Service
     utils::state::State<antenna::State> *state;
     bool HandleStateChange(antenna::State state);
 
-    uint32_t timerID = 0;
+    std::unique_ptr<sys::Timer> timer;
 
     bsp::cellular::antenna currentAntenna;
     uint32_t lastCsq    = 0;
@@ -75,8 +75,6 @@ class ServiceAntenna : public sys::Service
 
     sys::ReturnCodes SwitchPowerModeHandler(const sys::ServicePowerMode mode) override final;
 
-    void TickHandler(uint32_t id) override;
-
     void storeCurrentState(void);
 
     bool initStateHandler(void);
diff --git a/module-services/service-appmgr/ApplicationManager.cpp b/module-services/service-appmgr/ApplicationManager.cpp
index e728c88a7..069df53ac 100644
--- a/module-services/service-appmgr/ApplicationManager.cpp
+++ b/module-services/service-appmgr/ApplicationManager.cpp
@@ -25,6 +25,7 @@
 #include "service-eink/ServiceEink.hpp"
 #include "service-gui/ServiceGUI.hpp"
 
+#include "Service/Timer.hpp"
 #include "application-call/ApplicationCall.hpp"
 #include "application-desktop/ApplicationDesktop.hpp"
 #include "application-special-input/ApplicationSpecialInput.hpp"
@@ -163,7 +164,9 @@ namespace sapm
                                            std::vector<std::unique_ptr<app::ApplicationLauncher>> &launchers)
         : Service(name), VirtualAppManager(launchers), systemManager{sysmgr}
     {
-        blockingTimerID = CreateTimer(0xFFFFFFFF, false);
+        blockingTimer = std::make_unique<sys::Timer>(
+            "BlockTimer", this, std::numeric_limits<sys::ms>().max(), sys::Timer::Type::SingleShot);
+        blockingTimer->connect([&](sys::Timer &) { phoneLockCB(); });
     }
 
     ApplicationManager::~ApplicationManager()
@@ -235,8 +238,7 @@ namespace sapm
             handlePowerSavingModeInit();
         } break;
         case MessageType::APMPreventBlocking: {
-            //			LOG_INFO("Restarting screen locking timer");
-            ReloadTimer(blockingTimerID);
+            blockingTimer->reload();
         } break;
         case MessageType::APMSwitch: {
             sapm::APMSwitch *msg = reinterpret_cast<sapm::APMSwitch *>(msgl);
@@ -297,40 +299,38 @@ namespace sapm
 
         return std::make_shared<sys::ResponseMessage>();
     }
-    // Invoked when timer ticked
-    void ApplicationManager::TickHandler(uint32_t id)
+
+    void ApplicationManager::phoneLockCB()
     {
 #ifdef AUTO_PHONE_LOCK_ENABLED
-        if (id == blockingTimerID) {
-            LOG_INFO("screen Locking Timer Triggered");
-            stopTimer(blockingTimerID);
 
-            // check if application that has focus doesn't have a flag that prevents system from blocking and going to
-            // low power mode
-            ApplicationDescription *appDescription = applications.find(focusApplicationName)->second;
-            if (appDescription->preventLocking) {
-                // restart timer
-                ReloadTimer(blockingTimerID);
-                return;
-            }
+        LOG_INFO("screen Locking Timer Triggered");
+        blockingTimer->stop();
 
-            // if desktop has focus switch to main window and set it locked.
-            if (focusApplicationName == "ApplicationDesktop") {
-                // switch data must contain target window and information about blocking
+        // check if application that has focus doesn't have a flag that prevents system from blocking and going to
+        // low power mode
+        ApplicationDescription *appDescription = appGet(focusApplicationName);
+        if (appDescription->preventsLocking()) {
+            blockingTimer->reload();
+            return;
+        }
 
-                app::Application::messageSwitchApplication(
-                    this, "ApplicationDesktop", gui::name::window::main_window, std::make_unique<gui::LockPhoneData>());
-            }
-            else {
-                // get the application description for application that is on top and set blocking flag for it
-                appDescription->blockClosing = true;
+        // if desktop has focus switch to main window and set it locked.
+        if (focusApplicationName == app::name_desktop) {
+            // switch data must contain target window and information about blocking
 
-                std::unique_ptr<gui::LockPhoneData> data = std::make_unique<gui::LockPhoneData>();
-                data->setPrevApplication(focusApplicationName);
+            app::Application::messageSwitchApplication(
+                this, app::name_desktop, gui::name::window::main_window, std::make_unique<gui::LockPhoneData>());
+        }
+        else {
+            // get the application description for application that is on top and set blocking flag for it
+            appDescription->blockClosing = true;
 
-                // run normal flow of applications change
-                messageSwitchApplication(this, "ApplicationDesktop", gui::name::window::main_window, std::move(data));
-            }
+            std::unique_ptr<gui::LockPhoneData> data = std::make_unique<gui::LockPhoneData>();
+            data->setPrevApplication(focusApplicationName);
+
+            // run normal flow of applications change
+            messageSwitchApplication(this, app::name_desktop, gui::name::window::main_window, std::move(data));
         }
 #endif
     }
@@ -347,7 +347,7 @@ namespace sapm
         if (lockTime == 0) {
             lockTime = default_application_locktime;
         }
-        setTimerPeriod(blockingTimerID, lockTime);
+        blockingTimer->setInterval(lockTime);
 
         if (settings.language == SettingsLanguage::ENGLISH) {
             utils::localize.Switch(utils::Lang::En);
diff --git a/module-services/service-appmgr/ApplicationManager.hpp b/module-services/service-appmgr/ApplicationManager.hpp
index 9e01b0c7c..499e21e02 100644
--- a/module-services/service-appmgr/ApplicationManager.hpp
+++ b/module-services/service-appmgr/ApplicationManager.hpp
@@ -151,7 +151,7 @@ namespace sapm
         std::string launchApplicationName = "";
         // timer to count time from last user's activity. If it reaches time defined in settings database application
         // manager is sending signal to power manager and changing window to the desktop window in the blocked state.
-        uint32_t blockingTimerID = 0;
+        std::unique_ptr<sys::Timer> blockingTimer;
 
         // tries to switch the application
         bool handleSwitchApplication(APMSwitch *msg);
@@ -179,8 +179,6 @@ namespace sapm
         virtual ~ApplicationManager();
 
         sys::Message_t DataReceivedHandler(sys::DataMessage *msgl, sys::ResponseMessage *resp) override;
-        // Invoked when timer ticked
-        void TickHandler(uint32_t id) override;
 
         // Invoked during initialization
         sys::ReturnCodes InitHandler() override;
@@ -249,6 +247,9 @@ namespace sapm
          * \returns true if app manager running and app is registered == running, false othervise
          */
         static bool appRunning(sys::Service *sender, const std::string &name);
+
+      private:
+        void phoneLockCB();
     };
 
 } /* namespace sapm */
diff --git a/module-services/service-audio/ServiceAudio.cpp b/module-services/service-audio/ServiceAudio.cpp
index 8fce269cb..da4df9321 100644
--- a/module-services/service-audio/ServiceAudio.cpp
+++ b/module-services/service-audio/ServiceAudio.cpp
@@ -67,8 +67,6 @@ sys::ReturnCodes ServiceAudio::SwitchPowerModeHandler(const sys::ServicePowerMod
     return sys::ReturnCodes::Success;
 }
 
-void ServiceAudio::TickHandler(uint32_t id)
-{}
 
 constexpr bool ServiceAudio::IsResumable(const audio::PlaybackType &type) const
 {
diff --git a/module-services/service-audio/ServiceAudio.hpp b/module-services/service-audio/ServiceAudio.hpp
index 022da8fd8..fde7e3506 100644
--- a/module-services/service-audio/ServiceAudio.hpp
+++ b/module-services/service-audio/ServiceAudio.hpp
@@ -34,10 +34,6 @@ class ServiceAudio : public sys::Service
 
     sys::Message_t DataReceivedHandler(sys::DataMessage *msgl, sys::ResponseMessage *resp = nullptr) override;
 
-    // Invoked when timer ticked
-    void TickHandler(uint32_t id) override;
-
-    // Invoked during initialization
     sys::ReturnCodes InitHandler() override;
 
     sys::ReturnCodes DeinitHandler() override;
diff --git a/module-services/service-bluetooth/ServiceBluetooth.cpp b/module-services/service-bluetooth/ServiceBluetooth.cpp
index cb73b6d4b..100a937ec 100644
--- a/module-services/service-bluetooth/ServiceBluetooth.cpp
+++ b/module-services/service-bluetooth/ServiceBluetooth.cpp
@@ -11,8 +11,6 @@ const char *ServiceBluetooth::serviceName = "ServiceBluetooth";
 ServiceBluetooth::ServiceBluetooth() : sys::Service(serviceName)
 {
     LOG_INFO("[ServiceBluetooth] Initializing");
-    testTimerID = CreateTimer(3000, true);
-    ReloadTimer(testTimerID);
 }
 
 ServiceBluetooth::~ServiceBluetooth()
@@ -20,10 +18,6 @@ ServiceBluetooth::~ServiceBluetooth()
     LOG_INFO("[ServiceBluetooth] Cleaning resources");
 }
 
-// Invoked when timer ticked
-void ServiceBluetooth::TickHandler(uint32_t id)
-{}
-
 // This code is experimental:
 // this means it is an init point of bluetooth feature handling
 sys::ReturnCodes ServiceBluetooth::InitHandler()
diff --git a/module-services/service-bluetooth/ServiceBluetooth.hpp b/module-services/service-bluetooth/ServiceBluetooth.hpp
index 888fc948b..4f5cb7bef 100644
--- a/module-services/service-bluetooth/ServiceBluetooth.hpp
+++ b/module-services/service-bluetooth/ServiceBluetooth.hpp
@@ -12,13 +12,11 @@ class ServiceBluetooth : public sys::Service
     ~ServiceBluetooth();
 
     virtual sys::Message_t DataReceivedHandler(sys::DataMessage *msg, sys::ResponseMessage *resp) override;
-    void TickHandler(uint32_t id) override;
     sys::ReturnCodes InitHandler() override;
     sys::ReturnCodes DeinitHandler() override;
     virtual sys::ReturnCodes SwitchPowerModeHandler(const sys::ServicePowerMode mode) override;
 
   private:
     static const char *serviceName;
-    uint32_t testTimerID;
     std::unique_ptr<BluetoothWorker> worker;
 };
diff --git a/module-services/service-cellular/ServiceCellular.cpp b/module-services/service-cellular/ServiceCellular.cpp
index c81a08dc7..28a9a0c2d 100644
--- a/module-services/service-cellular/ServiceCellular.cpp
+++ b/module-services/service-cellular/ServiceCellular.cpp
@@ -21,9 +21,8 @@
 
 #include "Service/Message.hpp"
 #include "Service/Service.hpp"
+#include "Service/Timer.hpp"
 #include "ServiceCellular.hpp"
-#include "Service/Service.hpp"
-#include "Service/Message.hpp"
 
 #include "MessageType.hpp"
 
@@ -35,6 +34,7 @@
 #include "service-evtmgr/messages/EVMessages.hpp"
 #include "ucs2/UCS2.hpp"
 
+#include "api/CellularServiceAPI.hpp"
 #include "service-db/api/DBServiceAPI.hpp"
 #include "service-db/messages/DBNotificationMessage.hpp"
 #include "service-db/messages/QueryMessage.hpp"
@@ -137,9 +137,12 @@ ServiceCellular::ServiceCellular() : sys::Service(serviceName, "", cellularStack
     busChannels.push_back(sys::BusChannels::ServiceCellularNotifications);
     busChannels.push_back(sys::BusChannels::ServiceDBNotifications);
 
-    callStateTimerId = CreateTimer(Ticks::MsToTicks(1000), true);
-    stateTimerId     = CreateTimer(Ticks::MsToTicks(1000), true);
-    ussdTimerId      = CreateTimer(Ticks::MsToTicks(1000), true);
+    callStateTimer = std::make_unique<sys::Timer>("call_state", this, 1000);
+    callStateTimer->connect([&](sys::Timer &) { CallStateTimerHandler(); });
+    stateTimer = std::make_unique<sys::Timer>("state", this, 1000);
+    stateTimer->connect([&](sys::Timer &) { handleStateTimer(); });
+    ussdTimer = std::make_unique<sys::Timer>("ussd", this, 1000);
+    ussdTimer->connect([&](sys::Timer &) { handleUSSDTimer(); });
 
     ongoingCall.setStartCallAction([=](const CalllogRecord &rec) {
         auto call = DBServiceAPI::CalllogAdd(this, rec);
@@ -186,24 +189,6 @@ void ServiceCellular::CallStateTimerHandler()
     sys::Bus::SendUnicast(msg, ServiceCellular::serviceName, this);
 }
 
-// Invoked when timer ticked
-void ServiceCellular::TickHandler(uint32_t id)
-{
-    if (id == callStateTimerId) {
-        CallStateTimerHandler();
-    }
-    else if (id == stateTimerId) {
-        LOG_INFO("State timer tick");
-        handleStateTimer();
-    }
-    else if (id == ussdTimerId) {
-        handleUSSDTimer();
-    }
-    else {
-        LOG_ERROR("Unrecognized timer ID = %" PRIu32, id);
-    }
-}
-
 sys::ReturnCodes ServiceCellular::InitHandler()
 {
     board = EventManagerServiceAPI::GetBoard(this);
@@ -533,7 +518,7 @@ sys::Message_t ServiceCellular::DataReceivedHandler(sys::DataMessage *msgl, sys:
             break;
         }
         case CellularNotificationMessage::Type::CallAborted: {
-            stopTimer(callStateTimerId);
+            callStateTimer->stop();
             auto ret    = ongoingCall.endCall();
             responseMsg = std::make_shared<CellularResponseMessage>(ret);
             break;
@@ -618,7 +603,7 @@ sys::Message_t ServiceCellular::DataReceivedHandler(sys::DataMessage *msgl, sys:
                     auto msg =
                         std::make_shared<CellularNotificationMessage>(CellularNotificationMessage::Type::CallActive);
                     sys::Bus::SendMulticast(msg, sys::BusChannels::ServiceCellularNotifications, this);
-                    stopTimer(callStateTimerId);
+                    callStateTimer->stop();
                 }
             }
             catch (const std::exception &e) {
@@ -638,7 +623,7 @@ sys::Message_t ServiceCellular::DataReceivedHandler(sys::DataMessage *msgl, sys:
         if (channel) {
             if (channel->cmd(at::AT::ATH)) {
                 AntennaServiceAPI::LockRequest(this, antenna::lockState::unlocked);
-                stopTimer(callStateTimerId);
+                callStateTimer->stop();
                 if (!ongoingCall.endCall(CellularCall::Forced::True)) {
                     LOG_ERROR("Failed to end ongoing call");
                 }
@@ -681,7 +666,7 @@ sys::Message_t ServiceCellular::DataReceivedHandler(sys::DataMessage *msgl, sys:
             if (ret) {
                 responseMsg = std::make_shared<CellularResponseMessage>(true);
                 // activate call state timer
-                ReloadTimer(callStateTimerId);
+                callStateTimer->reload();
                 // Propagate "Ringing" notification into system
                 sys::Bus::SendMulticast(
                     std::make_shared<CellularCallMessage>(CellularCallMessage::Type::Ringing, msg->number),
@@ -917,15 +902,15 @@ namespace
     }
     namespace powerdown
     {
-        static const string powerDownNormal = "NORMAL POWER DOWN";
-        static const string poweredDown     = "POWERED DOWN";
+        static const std::string powerDownNormal = "NORMAL POWER DOWN";
+        static const std::string poweredDown     = "POWERED DOWN";
 
-        bool isNormalPowerDown(const string str)
+        bool isNormalPowerDown(const std::string str)
         {
             std::string stripped = utils::removeNewLines(str);
             return stripped.find(powerDownNormal) == 0;
         }
-        bool isPoweredDown(const string str)
+        bool isPoweredDown(const std::string str)
         {
             std::string stripped = utils::removeNewLines(str);
             return stripped.find(poweredDown) == 0;
@@ -1658,13 +1643,13 @@ bool ServiceCellular::handle_status_check(void)
 void ServiceCellular::startStateTimer(uint32_t timeout)
 {
     stateTimeout = timeout;
-    ReloadTimer(stateTimerId);
+    stateTimer->reload();
 }
 
 void ServiceCellular::stopStateTimer()
 {
     stateTimeout = 0;
-    stopTimer(stateTimerId);
+    stateTimer->stop();
 }
 
 void ServiceCellular::handleStateTimer(void)
@@ -1722,7 +1707,7 @@ void ServiceCellular::handleUSSDTimer(void)
     }
     else {
         LOG_WARN("USSD timeout occured, abotrig current session");
-        stopTimer(ussdTimerId);
+        ussdTimer->stop();
         CellularServiceAPI::USSDRequest(this, CellularUSSDMessage::RequestType::abortSesion);
     }
 }
@@ -1742,8 +1727,8 @@ void ServiceCellular::setUSSDTimer(void)
         break;
     }
     if (ussdTimeout == ussd::noTimeout) {
-        stopTimer(ussdTimerId);
+        ussdTimer->stop();
         return;
     }
-    ReloadTimer(ussdTimerId);
+    ussdTimer->reload();
 }
diff --git a/module-services/service-cellular/ServiceCellular.hpp b/module-services/service-cellular/ServiceCellular.hpp
index 399b797e3..1e8d3d07b 100644
--- a/module-services/service-cellular/ServiceCellular.hpp
+++ b/module-services/service-cellular/ServiceCellular.hpp
@@ -31,13 +31,10 @@ class ServiceCellular : public sys::Service
   public:
     ServiceCellular();
 
-    ~ServiceCellular();
+    ~ServiceCellular() override;
 
     sys::Message_t DataReceivedHandler(sys::DataMessage *msgl, sys::ResponseMessage *resp = nullptr) override;
 
-    // Invoked when timer ticked
-    void TickHandler(uint32_t id) override;
-
     // Invoked during initialization
     sys::ReturnCodes InitHandler() override;
     sys::ReturnCodes DeinitHandler() override;
@@ -71,9 +68,9 @@ class ServiceCellular : public sys::Service
   private:
     std::unique_ptr<TS0710> cmux = std::make_unique<TS0710>(PortSpeed_e::PS460800, this);
     // used for polling for call state
-    uint32_t callStateTimerId = 0;
-    uint32_t stateTimerId     = 0;
-    uint32_t ussdTimerId      = 0;
+    std::unique_ptr<sys::Timer> callStateTimer;
+    std::unique_ptr<sys::Timer> stateTimer;
+    std::unique_ptr<sys::Timer> ussdTimer;
     void CallStateTimerHandler();
     DLC_channel::Callback_t notificationCallback = nullptr;
 
diff --git a/module-services/service-db/ServiceDB.cpp b/module-services/service-db/ServiceDB.cpp
index 4862aa61e..1c3ce86a5 100644
--- a/module-services/service-db/ServiceDB.cpp
+++ b/module-services/service-db/ServiceDB.cpp
@@ -26,10 +26,11 @@
 
 #include "log/log.hpp"
 
-#include <cassert>
-#include <time/ScopedTime.hpp>
 #include "includes/DBServiceName.hpp"
 #include "messages/QueryMessage.hpp"
+#include <Service/Bus.hpp>
+#include <cassert>
+#include <time/ScopedTime.hpp>
 
 static const auto service_db_stack = 1024 * 24;
 
@@ -580,11 +581,6 @@ sys::Message_t ServiceDB::DataReceivedHandler(sys::DataMessage *msgl, sys::Respo
     return responseMsg;
 }
 
-// Invoked when timer ticked
-void ServiceDB::TickHandler(uint32_t id)
-{}
-
-// Invoked during initialization
 sys::ReturnCodes ServiceDB::InitHandler()
 {
     Database::initialize();
diff --git a/module-services/service-db/ServiceDB.hpp b/module-services/service-db/ServiceDB.hpp
index a1fde944a..6b3741b9d 100644
--- a/module-services/service-db/ServiceDB.hpp
+++ b/module-services/service-db/ServiceDB.hpp
@@ -50,10 +50,7 @@ class ServiceDB : public sys::Service
     ~ServiceDB() override;
 
     sys::Message_t DataReceivedHandler(sys::DataMessage *msgl, sys::ResponseMessage *resp) override;
-    // Invoked when timer ticked
-    void TickHandler(uint32_t id) override;
 
-    // Invoked during initialization
     sys::ReturnCodes InitHandler() override;
 
     sys::ReturnCodes DeinitHandler() override;
diff --git a/module-services/service-db/test/test-service-db-settings-messages.cpp b/module-services/service-db/test/test-service-db-settings-messages.cpp
index 5998a8cfe..d6482605c 100644
--- a/module-services/service-db/test/test-service-db-settings-messages.cpp
+++ b/module-services/service-db/test/test-service-db-settings-messages.cpp
@@ -5,6 +5,7 @@
 #include <Service/Message.hpp>
 
 #include <functional>
+#include <module-sys/Service/Bus.hpp>
 
 namespace Settings
 {
diff --git a/module-services/service-desktop/endpoints/backup/BackupEndpoint.cpp b/module-services/service-desktop/endpoints/backup/BackupEndpoint.cpp
index dd02b3247..d10e7a110 100644
--- a/module-services/service-desktop/endpoints/backup/BackupEndpoint.cpp
+++ b/module-services/service-desktop/endpoints/backup/BackupEndpoint.cpp
@@ -1,7 +1,8 @@
 #include "BackupEndpoint.hpp"
-#include "ParserUtils.hpp"
 #include "DesktopMessages.hpp"
+#include "ParserUtils.hpp"
 #include "ServiceDesktop.hpp"
+#include <Service/Bus.hpp>
 
 static bool backupReady = false;
 
diff --git a/module-services/service-desktop/endpoints/factoryReset/FactoryResetEndpoint.cpp b/module-services/service-desktop/endpoints/factoryReset/FactoryResetEndpoint.cpp
index f9f35d155..f788fa414 100644
--- a/module-services/service-desktop/endpoints/factoryReset/FactoryResetEndpoint.cpp
+++ b/module-services/service-desktop/endpoints/factoryReset/FactoryResetEndpoint.cpp
@@ -1,6 +1,7 @@
 #include "FactoryResetEndpoint.hpp"
 #include "DesktopMessages.hpp"
 #include "ServiceDesktop.hpp"
+#include <Service/Bus.hpp>
 
 auto FactoryResetEndpoint::handle(Context &context) -> void
 {
diff --git a/module-services/service-desktop/endpoints/restore/RestoreEndpoint.cpp b/module-services/service-desktop/endpoints/restore/RestoreEndpoint.cpp
index ad8c3a1ca..852887c63 100644
--- a/module-services/service-desktop/endpoints/restore/RestoreEndpoint.cpp
+++ b/module-services/service-desktop/endpoints/restore/RestoreEndpoint.cpp
@@ -1,7 +1,8 @@
-#include "ParserUtils.hpp"
-#include "DesktopMessages.hpp"
-#include "ServiceDesktop.hpp"
 #include "RestoreEndpoint.hpp"
+#include "DesktopMessages.hpp"
+#include "ParserUtils.hpp"
+#include "ServiceDesktop.hpp"
+#include <Service/Bus.hpp>
 
 auto RestoreEndpoint::handle(Context &context) -> void
 {
diff --git a/module-services/service-desktop/endpoints/update/UpdateEndpoint.cpp b/module-services/service-desktop/endpoints/update/UpdateEndpoint.cpp
index f7f62496d..01636f86f 100644
--- a/module-services/service-desktop/endpoints/update/UpdateEndpoint.cpp
+++ b/module-services/service-desktop/endpoints/update/UpdateEndpoint.cpp
@@ -1,7 +1,7 @@
-
 #include "UpdateEndpoint.hpp"
 #include "DesktopMessages.hpp"
 #include "ServiceDesktop.hpp"
+#include <Service/Bus.hpp>
 
 auto UpdateEndpoint::handle(Context &context) -> void
 {
diff --git a/module-services/service-eink/ServiceEink.cpp b/module-services/service-eink/ServiceEink.cpp
index 912daa98d..2354c877f 100644
--- a/module-services/service-eink/ServiceEink.cpp
+++ b/module-services/service-eink/ServiceEink.cpp
@@ -43,13 +43,13 @@ enum class EinkWorkerCommands
 
 ServiceEink::ServiceEink(const std::string &name, std::string parent)
     : sys::Service(name, parent, 4096 + 1024), timerID{0}, selfRefereshTriggerCount{0},
-      temperatureMeasurementTriggerCount{0}, powerOffTriggerCount{0}
+      temperatureMeasurementTriggerCount{0}, powerOffTriggerCount{0},
+      powerOffTimer("PwrOffTimer", this, 3000, sys::Timer::Type::SingleShot)
 {
     // initialize initial eink parameters
     memset(&waveformSettings, 0, sizeof(EinkWaveFormSettings_t));
     waveformSettings.mode        = EinkWaveformGC16;
     waveformSettings.temperature = -1000;
-    timerPowerOffID              = CreateTimer(3000, false);
 }
 
 ServiceEink::~ServiceEink()
@@ -72,7 +72,7 @@ sys::Message_t ServiceEink::DataReceivedHandler(sys::DataMessage *msgl, sys::Res
     switch (msg->messageType) {
 
     case MessageType::EinkImageData: {
-        stopTimer(timerPowerOffID);
+        powerOffTimer.stop();
         auto dmsg = static_cast<seink::ImageMessage *>(msgl);
         //			LOG_INFO("[%s] EinkImageData", GetName().c_str());
         memcpy(einkRenderBuffer, dmsg->getData(), dmsg->getSize());
@@ -134,7 +134,7 @@ sys::Message_t ServiceEink::DataReceivedHandler(sys::DataMessage *msgl, sys::Res
                 LOG_FATAL("Failed to refresh frame");
             //			uint32_t end_tick = xTaskGetTickCount();
 
-            ReloadTimer(timerPowerOffID);
+            powerOffTimer.reload();
 
             auto msg =
                 std::make_shared<sgui::GUIMessage>(MessageType::GUIDisplayReady, suspendInProgress, shutdownInProgress);
@@ -161,17 +161,6 @@ sys::Message_t ServiceEink::DataReceivedHandler(sys::DataMessage *msgl, sys::Res
     return std::make_shared<sys::ResponseMessage>();
 }
 
-// Invoked when timer ticked
-void ServiceEink::TickHandler(uint32_t id)
-{
-    auto findID =
-        std::find_if(timersList.begin(), timersList.end(), [id](auto &timer) { return (timer->GetId() == id); });
-    if (findID != timersList.end()) {
-        LOG_INFO("[ServiceEink] Power down eink after 3 seconds");
-        EinkPowerOff();
-    }
-}
-
 // Invoked during initialization
 sys::ReturnCodes ServiceEink::InitHandler()
 {
@@ -258,7 +247,7 @@ sys::ReturnCodes ServiceEink::SwitchPowerModeHandler(const sys::ServicePowerMode
     case sys::ServicePowerMode ::SuspendToRAM:
     case sys::ServicePowerMode ::SuspendToNVM:
         suspended = true;
-        stopTimer(timerPowerOffID);
+        powerOffTimer.stop();
         EinkPowerDown();
         break;
     }
diff --git a/module-services/service-eink/ServiceEink.hpp b/module-services/service-eink/ServiceEink.hpp
index 77c1ff97f..8b9d2dd07 100644
--- a/module-services/service-eink/ServiceEink.hpp
+++ b/module-services/service-eink/ServiceEink.hpp
@@ -14,6 +14,7 @@
 #include "Service/Message.hpp"
 // eink bsp
 #include "EinkIncludes.hpp"
+#include "Service/Timer.hpp"
 
 class ServiceEink : public sys::Service
 {
@@ -49,15 +50,15 @@ class ServiceEink : public sys::Service
 
     uint8_t einkRenderBuffer[600 * 480];
     bool deepRefresh         = false;
-    uint32_t timerPowerOffID = 0;
+
+    sys::ms powerOffTime = 3000;
+    sys::Timer powerOffTimer;
 
   public:
     ServiceEink(const std::string &name, std::string parent = "");
     ~ServiceEink();
 
     sys::Message_t DataReceivedHandler(sys::DataMessage *msgl, sys::ResponseMessage *resp) override;
-    // Invoked when timer ticked
-    void TickHandler(uint32_t id) override;
 
     // Invoked during initialization
     sys::ReturnCodes InitHandler() override;
diff --git a/module-services/service-evtmgr/WorkerEvent.cpp b/module-services/service-evtmgr/WorkerEvent.cpp
index b1e0c6c7d..0045941cd 100644
--- a/module-services/service-evtmgr/WorkerEvent.cpp
+++ b/module-services/service-evtmgr/WorkerEvent.cpp
@@ -32,9 +32,10 @@ extern "C"
 #include "bsp/magnetometer/magnetometer.hpp"
 #include "bsp/torch/torch.hpp"
 
+#include "Constants.hpp"
 #include "bsp/harness/bsp_harness.hpp"
 #include "harness/Parser.hpp"
-#include "Constants.hpp"
+#include <Service/Bus.hpp>
 
 bool WorkerEvent::handleMessage(uint32_t queueID)
 {
diff --git a/module-services/service-evtmgr/api/EventManagerServiceAPI.cpp b/module-services/service-evtmgr/api/EventManagerServiceAPI.cpp
index fb9e5c7af..f49a00981 100644
--- a/module-services/service-evtmgr/api/EventManagerServiceAPI.cpp
+++ b/module-services/service-evtmgr/api/EventManagerServiceAPI.cpp
@@ -5,6 +5,7 @@
 #include "../messages/EVMessages.hpp"
 
 #include "../Constants.hpp"
+#include <Service/Bus.hpp>
 
 bsp::Board EventManagerServiceAPI::GetBoard(sys::Service *serv)
 {
@@ -16,7 +17,7 @@ bsp::Board EventManagerServiceAPI::GetBoard(sys::Service *serv)
     sevm::EVMBoardResponseMessage *response = dynamic_cast<sevm::EVMBoardResponseMessage *>(ret.second.get());
 
     if (response != nullptr) {
-        if ((ret.first == sys::ReturnCodes::Success)) {
+        if (ret.first == sys::ReturnCodes::Success) {
             return response->board;
         }
     }
diff --git a/module-services/service-evtmgr/harness/actions/CellularCMD.cpp b/module-services/service-evtmgr/harness/actions/CellularCMD.cpp
index e7592bab6..7e48392df 100644
--- a/module-services/service-evtmgr/harness/actions/CellularCMD.cpp
+++ b/module-services/service-evtmgr/harness/actions/CellularCMD.cpp
@@ -1,4 +1,5 @@
 #include "CellularCMD.hpp"
+#include <Service/Bus.hpp>
 #include <service-cellular/ServiceCellular.hpp>
 #include <service-cellular/api/CellularServiceAPI.hpp>
 
diff --git a/module-services/service-fota/ServiceFota.cpp b/module-services/service-fota/ServiceFota.cpp
index 17b2b342c..80e09db7a 100644
--- a/module-services/service-fota/ServiceFota.cpp
+++ b/module-services/service-fota/ServiceFota.cpp
@@ -1,12 +1,14 @@
+#include "Service/Timer.hpp"
 #include "api/FotaServiceAPI.hpp"
 
 #include "ServiceFota.hpp"
 #include "Service/Service.hpp"
 #include "Service/Message.hpp"
 
+#include <Service/Bus.hpp>
+#include <module-cellular/Modem/TS0710/TS0710.h>
 #include <module-cellular/at/Result.hpp>
 #include <module-cellular/at/URC_QIND.hpp>
-#include <module-cellular/Modem/TS0710/TS0710.h>
 #include <service-cellular/api/CellularServiceAPI.hpp>
 
 #include "MessageType.hpp"
@@ -39,7 +41,12 @@ namespace FotaService
         busChannels.push_back(sys::BusChannels::ServiceFotaNotifications);
         busChannels.push_back(sys::BusChannels::ServiceCellularNotifications);
 
-        connectionTimer = CreateTimer(defaultTimer, true);
+        connectionTimer = std::make_unique<sys::Timer>("Fota", this, defaultTimer);
+        connectionTimer->connect([&](sys::Timer &) {
+            std::shared_ptr<InternetRequestMessage> msg =
+                std::make_shared<InternetRequestMessage>(MessageType::CellularListCurrentCalls);
+            sys::Bus::SendUnicast(msg, Service::serviceName, this);
+        });
         registerMessageHandlers();
     }
 
@@ -48,16 +55,6 @@ namespace FotaService
         LOG_INFO("[ServiceFota] Cleaning resources");
     }
 
-    // Invoked when timer ticked
-    void Service::TickHandler(uint32_t /*id*/)
-    {
-        std::shared_ptr<InternetRequestMessage> msg =
-            std::make_shared<InternetRequestMessage>(MessageType::CellularListCurrentCalls);
-
-        sys::Bus::SendUnicast(msg, Service::serviceName, this);
-    }
-
-    // Invoked during initialization
     sys::ReturnCodes Service::InitHandler()
     {
         return sys::ReturnCodes::Success;
@@ -312,7 +309,7 @@ namespace FotaService
                     const std::string QICSGP_prefix("+QICSGP:");
                     for (auto &line : data.response) {
                         if (line.find(QICSGP_prefix) != std::string::npos) {
-                            istringstream raw_data(line.substr(QICSGP_prefix.size()));
+                            std::istringstream raw_data(line.substr(QICSGP_prefix.size()));
                             std::vector<std::string> data;
                             std::string subitem;
                             while (std::getline(raw_data, subitem, ',')) {
@@ -377,7 +374,7 @@ namespace FotaService
             if (line.find(QIACT_prefix) != std::string::npos) {
                 APN::Config apnConfig;
                 std::vector<std::string> data;
-                istringstream raw_data(line.substr(QIACT_prefix.size()));
+                std::istringstream raw_data(line.substr(QIACT_prefix.size()));
                 std::string subItem;
                 while (std::getline(raw_data, subItem, ',')) {
                     LOG_DEBUG("QIACT-: %s", subItem.c_str());
@@ -417,36 +414,36 @@ namespace FotaService
         std::transform(url.begin(), url.end(), url.begin(), [](unsigned char chr) { return std::tolower(chr); });
     }
 
-    string Service::prepareQIACT(unsigned char contextId)
+    std::string Service::prepareQIACT(unsigned char contextId)
     {
-        ostringstream cmd;
+        std::ostringstream cmd;
         cmd << "AT+QIACT=" << static_cast<int>(contextId) << "\r";
         return cmd.str();
     }
 
     std::string Service::prepareQICSGPcmd(const APN::Config &apn)
     {
-        ostringstream cmd;
+        std::ostringstream cmd;
         cmd << "AT+QICSGP=" << static_cast<int>(apn.contextId) << "," << static_cast<int>(apn.type) << ",\"" << apn.apn
             << "\",\"" << apn.username << "\",\"" << apn.password << "\"," << static_cast<int>(apn.authMethod) << "\r";
         return cmd.str();
     }
 
-    string Service::prepareQICSGPquery(const APN::Config &apn)
+    std::string Service::prepareQICSGPquery(const APN::Config &apn)
     {
-        ostringstream cmd;
+        std::ostringstream cmd;
         cmd << "AT+QICSGP=" << static_cast<int>(apn.contextId) << "\r";
         return cmd.str();
     }
 
-    string Service::prepareQIDEACT(unsigned char contextId)
+    std::string Service::prepareQIDEACT(unsigned char contextId)
     {
-        ostringstream cmd;
+        std::ostringstream cmd;
         cmd << "AT+QIDEACT=" << static_cast<int>(contextId) << "\r";
         return cmd.str();
     }
 
-    string Service::prepareQFOTADLcmd(const string &url)
+    std::string Service::prepareQFOTADLcmd(const std::string &url)
     {
         std::string fotaCmd("AT+QFOTADL=\"");
         fotaCmd += url;
@@ -454,23 +451,23 @@ namespace FotaService
         return fotaCmd;
     }
 
-    string Service::prepareQHTTPGET(unsigned int timeout)
+    std::string Service::prepareQHTTPGET(unsigned int timeout)
     {
-        ostringstream cmd;
+        std::ostringstream cmd;
         cmd << "AT+QHTTPGET=" << timeout << "\r";
         return cmd.str();
     }
 
-    string Service::prepareQHTTPREAD(unsigned int timeout)
+    std::string Service::prepareQHTTPREAD(unsigned int timeout)
     {
-        ostringstream cmd;
+        std::ostringstream cmd;
         cmd << "AT+QHTTPREAD=" << timeout << "\r";
         return cmd.str();
     }
 
-    string Service::prepareQHTTPURL(const string &url)
+    std::string Service::prepareQHTTPURL(const std::string &url)
     {
-        ostringstream cmd;
+        std::ostringstream cmd;
         cmd << "AT+QHTTPURL=" << url.size() << "\r";
         return cmd.str();
     }
@@ -488,7 +485,7 @@ namespace FotaService
         }
     }
 
-    bool Service::openURL(const string &url)
+    bool Service::openURL(const std::string &url)
     {
         auto response = dataChannel->cmd(prepareQHTTPURL(url));
         if (response.response[0] == "CONNECT") {
@@ -511,7 +508,7 @@ namespace FotaService
         return result;
     }
 
-    at::Result Service::sendAndLogError(const string &msg, uint32_t timeout) const
+    at::Result Service::sendAndLogError(const std::string &msg, uint32_t timeout) const
     {
         at::Result result = dataChannel->cmd(msg, timeout);
         logIfError(result, msg);
@@ -538,7 +535,7 @@ namespace FotaService
             Body
         } part;
         part = HTTPResponsePart::URC;
-        std::vector<string> headers;
+        std::vector<std::string> headers;
         std::string body;
         std::string line;
         while (std::getline(input, line, '\n')) {
@@ -574,7 +571,7 @@ namespace FotaService
         sys::Bus::SendUnicast(msg, receiverServiceName, this);
     }
 
-    void Service::parseQIND(const string &message)
+    void Service::parseQIND(const std::string &message)
     {
         auto qind = at::urc::QIND(message);
         if (qind.is()) {
@@ -611,16 +608,16 @@ namespace FotaService
         }
     }
 
-    void Service::sendProgress(unsigned int progress, const string &receiver)
+    void Service::sendProgress(unsigned int progress, const std::string &receiver)
     {
         auto progressMsg      = std::make_shared<FOTAProgres>();
         progressMsg->progress = progress;
         sys::Bus::SendUnicast(progressMsg, receiver, this);
     }
 
-    void Service::sendFotaFinshed(const string &receiver)
+    void Service::sendFotaFinshed(const std::string &receiver)
     {
-        auto msg = make_shared<FOTAFinished>();
+        auto msg = std::make_shared<FOTAFinished>();
         sys::Bus::SendUnicast(std::move(msg), receiver, this);
     }
 
diff --git a/module-services/service-fota/ServiceFota.hpp b/module-services/service-fota/ServiceFota.hpp
index 101b6e051..775fe5bfa 100644
--- a/module-services/service-fota/ServiceFota.hpp
+++ b/module-services/service-fota/ServiceFota.hpp
@@ -35,10 +35,6 @@ namespace FotaService
 
         sys::Message_t DataReceivedHandler(sys::DataMessage *msgl, sys::ResponseMessage *resp = nullptr) override;
 
-        // Invoked when timer ticked
-        void TickHandler(uint32_t id) override;
-
-        // Invoked during initialization
         sys::ReturnCodes InitHandler() override;
 
         sys::ReturnCodes DeinitHandler() override;
@@ -72,7 +68,7 @@ namespace FotaService
          */
         sys::Message_t handleRawProgress(sys::DataMessage *req, sys::ResponseMessage *response);
 
-        uint32_t connectionTimer = 0;
+        std::unique_ptr<sys::Timer> connectionTimer;
         void getApnConfiguration();
         void getConfig();
         void getActiveCotext();
@@ -95,7 +91,7 @@ namespace FotaService
         void logIfError(const at::Result &result, const std::string &cmdString) const;
         void parseResponse();
         void parseQIACT(const at::Result &result);
-        void parseQIND(const string &message);
+        void parseQIND(const std::string &message);
         void sendProgress(unsigned int progress, const std::string &receiver);
         void sendFotaFinshed(const std::string &receiver);
 
diff --git a/module-services/service-fota/api/FotaServiceAPI.cpp b/module-services/service-fota/api/FotaServiceAPI.cpp
index 34af6061c..650776ff6 100644
--- a/module-services/service-fota/api/FotaServiceAPI.cpp
+++ b/module-services/service-fota/api/FotaServiceAPI.cpp
@@ -42,7 +42,7 @@ namespace FotaService
         sys::Bus::SendUnicast(std::move(msg), FotaService::Service::serviceName, serv);
     }
 
-    void API::FotaStart(sys::Service *serv, const string &url)
+    void API::FotaStart(sys::Service *serv, const std::string &url)
     {
         LOG_DEBUG("Fota Star: %s", url.c_str());
         std::shared_ptr<FotaService::FOTAStart> msg = std::make_shared<FotaService::FOTAStart>();
@@ -52,7 +52,7 @@ namespace FotaService
         sys::Bus::SendUnicast(std::move(msg), FotaService::Service::serviceName, serv);
     }
 
-    void API::sendRawProgress(sys::Service *serv, const string &rawQind)
+    void API::sendRawProgress(sys::Service *serv, const std::string &rawQind)
     {
         LOG_DEBUG("Fota sending Raw progress");
         std::shared_ptr<FotaService::FOTARawProgress> msg = std::make_shared<FotaService::FOTARawProgress>();
diff --git a/module-services/service-gui/ServiceGUI.cpp b/module-services/service-gui/ServiceGUI.cpp
index b4dcd4ea0..6c1d9bac6 100644
--- a/module-services/service-gui/ServiceGUI.cpp
+++ b/module-services/service-gui/ServiceGUI.cpp
@@ -221,11 +221,6 @@ namespace sgui
         return std::make_shared<sys::ResponseMessage>();
     }
 
-    // Invoked when timer ticked
-    void ServiceGUI::TickHandler(uint32_t id)
-    {}
-
-    // Invoked during initialization
     sys::ReturnCodes ServiceGUI::InitHandler()
     {
 
diff --git a/module-services/service-gui/ServiceGUI.hpp b/module-services/service-gui/ServiceGUI.hpp
index b304d27d6..597fa3a01 100644
--- a/module-services/service-gui/ServiceGUI.hpp
+++ b/module-services/service-gui/ServiceGUI.hpp
@@ -79,10 +79,7 @@ namespace sgui
         ~ServiceGUI();
 
         sys::Message_t DataReceivedHandler(sys::DataMessage *msgl, sys::ResponseMessage *resp) override;
-        // Invoked when timer ticked
-        void TickHandler(uint32_t id) override;
 
-        // Invoked during initialization
         sys::ReturnCodes InitHandler() override;
 
         sys::ReturnCodes DeinitHandler() override;
diff --git a/module-services/service-gui/WorkerGUI.cpp b/module-services/service-gui/WorkerGUI.cpp
index 3cb67a35a..dff639dcd 100644
--- a/module-services/service-gui/WorkerGUI.cpp
+++ b/module-services/service-gui/WorkerGUI.cpp
@@ -21,6 +21,7 @@ extern "C"
 #include "WorkerGUI.hpp"
 // module-utils
 #include "log/log.hpp"
+#include <Service/Bus.hpp>
 
 namespace sgui
 {
diff --git a/module-services/service-lwip/ServiceLwIP.cpp b/module-services/service-lwip/ServiceLwIP.cpp
index 045e545f4..a6d8d3d92 100644
--- a/module-services/service-lwip/ServiceLwIP.cpp
+++ b/module-services/service-lwip/ServiceLwIP.cpp
@@ -13,6 +13,8 @@ extern "C"
 #include "lwip/tcpip.h"
 };
 
+#include <Service/Bus.hpp>
+
 #define NUM_DHCP_ENTRY 3
 
 extern "C"
@@ -48,19 +50,12 @@ const char *ServiceLwIP::serviceName = "ServiceLwIP";
 ServiceLwIP::ServiceLwIP() : sys::Service(serviceName)
 {
     LOG_INFO("[ServiceLwIP] Initializing");
-    testTimerID = CreateTimer(3000, true);
-    ReloadTimer(testTimerID);
-
-    LOG_INFO("Start lwip!");
     tcpip_init(nullptr, nullptr);
     // lwip_init();
     dhserv_init(&dhcp_config);
     httpd_init();
 }
 
-void ServiceLwIP::TickHandler(uint32_t id)
-{}
-
 sys::ReturnCodes ServiceLwIP::InitHandler()
 {
     LOG_ERROR("LwIP experimental!");
diff --git a/module-services/service-lwip/ServiceLwIP.hpp b/module-services/service-lwip/ServiceLwIP.hpp
index a95da6128..88249a0ab 100644
--- a/module-services/service-lwip/ServiceLwIP.hpp
+++ b/module-services/service-lwip/ServiceLwIP.hpp
@@ -28,12 +28,10 @@ class ServiceLwIP : public sys::Service
     ~ServiceLwIP() = default;
 
     virtual sys::Message_t DataReceivedHandler(sys::DataMessage *msg, sys::ResponseMessage *resp) override;
-    void TickHandler(uint32_t id) override;
     sys::ReturnCodes InitHandler() override;
     sys::ReturnCodes DeinitHandler() override;
     virtual sys::ReturnCodes SwitchPowerModeHandler(const sys::ServicePowerMode mode) override;
 
   private:
     static const char *serviceName;
-    uint32_t testTimerID;
 };
diff --git a/module-sys/CMakeLists.txt b/module-sys/CMakeLists.txt
index 8e3aa6e0c..d91b489e3 100644
--- a/module-sys/CMakeLists.txt
+++ b/module-sys/CMakeLists.txt
@@ -9,6 +9,7 @@ set(SOURCES
         ${CMAKE_CURRENT_SOURCE_DIR}/Service/Worker.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/Service/Message.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/Service/Service.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/Service/Timer.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/SystemManager/SystemManager.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/SystemManager/PowerManager.cpp
 
diff --git a/module-sys/README.md b/module-sys/README.md
index 7e1831294..264353ed0 100644
--- a/module-sys/README.md
+++ b/module-sys/README.md
@@ -46,26 +46,23 @@ by inheriting from base `sys::ResponseMessage` class.
 
 Please check existing services for more examples of use    
 Please check "Caveats & good practices" chapter for more info   
-#### `void TickHandler(uint32_t id)`  
-This is optional timer handler. Only define it if you plan to use service timers functionality. It will be invoked upon specified timer expiration.
-`uint32_t id` is the unique number of timer which invoked this handler.
-
-Each service can be registered to any number of multicast channels. If you do so then service will receive messages from this channel. By default
-every service is registered to `System` and `SystemManager` channels which control the lifetime of the service. You don't have to explicitly 
-register new service to this channels as it is done internally.  
-
-Custom user channels should be placed into `BusChannelsCustom.hpp` which can be found in `PROJECT_DIR/sources` folder.  
-
-After defining channel registering service to it is as simple as invoking:
-`busChannels.push_back(sys::BusChannels::YOUR_CUSTOM_CHANNEl_NAME);`  
-preferably from `InitHandler` or service's constructor.
-
 
 ## Timers
-Each service can create unlimited number of timers which can trigger various actions. API for controlling timer functionality
-is self-explaining and very easy to use.  
-Please check `Service.hpp` header for info    
-Please check "Caveats & good practices" chapter for more info  
+
+Timers are system feature and is Service/Application thread safe. Timer callback life expectancy should be as short as possible for system to work smoothly (as with any other message call)
+
+### System Timers
+System have basic coarse sys::Timer capability. There are two ways to handle actions on timer:
+* assign callback to Timer with method: `void sys::Timer::connect(std::function<void(Timer &)> new_callback)`
+* overwrite `sys::Timer::onTimer()` function - overriding it means that callback wont be triggered if not requested manually!
+
+
+### GUI Timers
+
+* Build on top of `sys::Timer` is `GuiTimer` which is meant as a connector between System <=> GUI.
+* Each service can have any amount of timers.
+* For timer to work one have to first start it. Otherwise timer is created and not started.
+* After creating `GuiTimer` one can `connect` it to `gui::Item` related element with `Application::connect(GuiTimer &&, gui::Item*)` so that timer life-cycle would be same as Item referenced
 
 ## Bus
 Bus subsystem was developed in order for services to be able to communicate with each other. Bus consists of four main methods:
@@ -160,17 +157,6 @@ For more info please check RT1051 Reference Manual, Chapter 18 "DCDC Converter"
 
 # Caveats & good practices #
 
-#### It is not possible to use Bus blocking API within `TickHandler`. Only non-blocking variant of Bus API is available to use.
-This is due to `TickHandler` body being invoked from different context, specifically tick handlers are invoked in 
-FreeRTOS timer context. It is to be considered if current mechanism fulfills system requirements. If not, `TickHandler`
-should be invoked from service context and triggered by special sys message (mechanism similar to Ping/Pong system messages).
-
-#### Due to the point above `TickHandler` implementation should fast and efficient. In general it ought to be treated similar to
-interrupt routine except that in `TickHandler` body it is allowed to use dynamic memory allocations, stdlib functions, file system and so on.
-This requirement is due to specific implementation of FreeRTOS software timers which is the basis of tick handlers. For more detailed info please
-refer to [Software Timers](https://www.freertos.org/FreeRTOS-Software-Timer-API-Functions.html)
- 
-
 #### DataReceivedHandler should not block for long period of time.  
 It is okay to do some minor blocking tasks but blocking for longer periods will make whole system unpredictable or behave
 in very uncontrolled manner. It is perfectly fine to use `Bus::SendUnicast` blocking API in the handler.
diff --git a/module-sys/Service/Mailbox.hpp b/module-sys/Service/Mailbox.hpp
index fafd96352..ecf3cacb5 100644
--- a/module-sys/Service/Mailbox.hpp
+++ b/module-sys/Service/Mailbox.hpp
@@ -1,30 +1,20 @@
-/*
- * Mailbox.hpp
- *
- *  Created on: Mar 7, 2019
- *      Author: mati
- */
-
-#ifndef SYSTEMMANAGER_MAILBOX_HPP_
-#define SYSTEMMANAGER_MAILBOX_HPP_
+#pragma once
 
 #include <deque>
 #include "thread.hpp"
 #include <mutex.hpp>
 #include <condition_variable.hpp>
 
-using namespace cpp_freertos;
-
 template <typename T> class Mailbox
 {
   public:
-    Mailbox(Thread *thread) : thread_(thread)
+    Mailbox(cpp_freertos::Thread *thread) : thread_(thread)
     {}
 
     T peek()
     {
 
-        LockGuard mlock(mutex_);
+        cpp_freertos::LockGuard mlock(mutex_);
         while (queue_.empty()) {
             thread_->Wait(cond_, mutex_);
         }
@@ -35,7 +25,7 @@ template <typename T> class Mailbox
     T pop(uint32_t timeout = portMAX_DELAY)
     {
 
-        LockGuard mlock(mutex_);
+        cpp_freertos::LockGuard mlock(mutex_);
         while (queue_.empty()) {
             if (thread_->Wait(cond_, mutex_, timeout) == false) {
                 return nullptr;
@@ -48,7 +38,7 @@ template <typename T> class Mailbox
 
     void pop(T &item)
     {
-        LockGuard mlock(mutex_);
+        cpp_freertos::LockGuard mlock(mutex_);
         while (queue_.empty()) {
             thread_->Wait(cond_, mutex_);
         }
@@ -80,10 +70,8 @@ template <typename T> class Mailbox
     }
 
   private:
-    Thread *thread_;
+    cpp_freertos::Thread *thread_;
     std::deque<T> queue_;
-    MutexStandard mutex_;
-    ConditionVariable cond_;
+    cpp_freertos::MutexStandard mutex_;
+    cpp_freertos::ConditionVariable cond_;
 };
-
-#endif /* SYSTEMMANAGER_MAILBOX_HPP_ */
diff --git a/module-sys/Service/Message.cpp b/module-sys/Service/Message.cpp
index 3b65dd909..3a9c3dfc4 100644
--- a/module-sys/Service/Message.cpp
+++ b/module-sys/Service/Message.cpp
@@ -46,6 +46,10 @@ namespace sys
             service->CloseHandler();
             break;
 
+        case SystemMessageType::Timer:
+            ret = service->TimerHandle(*this);
+            break;
+
         case SystemMessageType::Start:
             ret = service->InitHandler();
             if (ret == ReturnCodes::Success) {
diff --git a/module-sys/Service/Message.hpp b/module-sys/Service/Message.hpp
index 8aac7c5be..dc1de3e9e 100644
--- a/module-sys/Service/Message.hpp
+++ b/module-sys/Service/Message.hpp
@@ -19,6 +19,7 @@ namespace sys
         Ping,
         SwitchPowerMode,
         Start,
+        Timer,
         Exit
     };
 
diff --git a/module-sys/Service/Service.cpp b/module-sys/Service/Service.cpp
index 65baae7bd..362947e43 100644
--- a/module-sys/Service/Service.cpp
+++ b/module-sys/Service/Service.cpp
@@ -1,10 +1,22 @@
-#include <algorithm>
 #include "Service.hpp"
-#include "Service/Message.hpp"
-#include "thread.hpp"
-#include "ticks.hpp"
-#include "timer.hpp"
-#include "Bus.hpp"
+#include "Bus.hpp"             // for Bus
+#include "FreeRTOSConfig.h"    // for configASSERT
+#include "MessageType.hpp"     // for MessageType, MessageType::MessageType...
+#include "Service/Common.hpp"  // for BusChannels, ReturnCodes, ReturnCodes...
+#include "Service/Mailbox.hpp" // for Mailbox
+#include "Service/Message.hpp" // for Message, Message_t, DataMessage, Resp...
+#include "Timer.hpp"           // for Timer
+#include "TimerMessage.hpp"    // for TimerMessage
+#include "log/debug.hpp"       // for DEBUG_SERVICE_MESSAGES
+#include "log/log.hpp"         // for LOG_ERROR, LOG_DEBUG, LOG_FATAL
+#include "mutex.hpp"           // for cpp_freertos
+#include "portmacro.h"         // for UBaseType_t
+#include "thread.hpp"          // for Thread
+#include "ticks.hpp"           // for Ticks
+#include <algorithm>           // for remove_if
+#include <cstdint>             // for uint32_t, uint64_t, UINT32_MAX
+#include <iosfwd>              // for std
+#include <typeinfo>            // for type_info
 
 // this could use Scoped() class from utils to print execution time too
 void debug_msg(sys::Service *srvc, sys::DataMessage *&ptr)
@@ -120,100 +132,34 @@ namespace sys
         return Service::connect(&msg, handler);
     }
 
-    // Create service timer
-    uint32_t Service::CreateTimer(uint32_t interval, bool isPeriodic, const std::string &name)
-    {
-        uint32_t unique     = ServiceTimer::GetNextUniqueID();
-        std::string nameNew = name;
-        if (name.empty()) {
-            nameNew = GetName() + "Timer" + std::to_string(unique);
-        }
-        // this is bad... timer should message service, not run code on it
-        timersList.push_back(
-            std::make_unique<ServiceTimer>(nameNew, Ticks::MsToTicks(interval), isPeriodic, unique, this));
-        LOG_DEBUG("%s", std::string(nameNew + "'s ID: " + std::to_string(unique)).c_str());
-        return unique;
-    }
-
-    // Reload service timer
-    void Service::ReloadTimer(uint32_t id)
-    {
-        auto it = std::find_if(timersList.begin(), timersList.end(), [&](std::unique_ptr<ServiceTimer> const &s) {
-            return s->GetId() == id;
-        });
-        if (it == timersList.end()) {
-            // not found, error
-        }
-        else {
-            (*it)->Start(0);
-        }
-    }
-    // Delete timer
-    void Service::DeleteTimer(uint32_t id)
-    {
-        auto it = std::find_if(timersList.begin(), timersList.end(), [&](std::unique_ptr<ServiceTimer> const &s) {
-            return s->GetId() == id;
-        });
-        if (it == timersList.end()) {
-            // not found, error
-        }
-        else {
-            (*it)->Stop(0);
-            timersList.erase(it);
-        }
-    }
-
-    // Set period
-    void Service::setTimerPeriod(uint32_t id, uint32_t period)
-    {
-        auto it = std::find_if(timersList.begin(), timersList.end(), [&](std::unique_ptr<ServiceTimer> const &s) {
-            return s->GetId() == id;
-        });
-        if (it == timersList.end()) {
-            // not found, error
-        }
-        else {
-            (*it)->SetPeriod(period, 0);
-        }
-    }
-
-    // Set period
-    void Service::stopTimer(uint32_t id)
-    {
-        auto it = std::find_if(timersList.begin(), timersList.end(), [&](std::unique_ptr<ServiceTimer> const &s) {
-            return s->GetId() == id;
-        });
-        if (it == timersList.end()) {
-            // not found, error
-        }
-        else {
-            (*it)->Stop(0);
-        }
-    }
-
     void Service::CloseHandler()
     {
-
-        // Stop currently active timers
-        for (auto &w : timersList) {
-            w->Stop(0);
-        }
-
+        timers.stop();
         enableRunLoop = false;
     };
 
-    ServiceTimer::ServiceTimer(
-        const std::string &name, TickType_t tick, bool isPeriodic, uint32_t idx, Service *service)
-        : Timer(name.c_str(), tick, isPeriodic), m_isPeriodic(isPeriodic), m_interval(tick), m_id(idx),
-          m_service(service)
-
-    {}
-
-    void ServiceTimer::Run()
+    auto Service::TimerHandle(SystemMessage &message) -> ReturnCodes
     {
-        m_service->TickHandler(m_id);
+        auto timer_message = dynamic_cast<sys::TimerMessage *>(&message);
+        if (timer_message == nullptr) {
+            LOG_ERROR("Wrong message in system message handler");
+            return ReturnCodes::Failure;
+        }
+
+        auto timer = timers.get(timer_message->getTimer());
+        if (timer == timers.noTimer()) {
+            LOG_ERROR("No such timer registered in Service");
+            return ReturnCodes::Failure;
+        }
+
+        (*timer)->onTimeout();
+        return ReturnCodes::Success;
     }
 
-    uint32_t ServiceTimer::m_timers_unique_idx = 0;
-
+    void Service::Timers::stop()
+    {
+        for (auto timer : list) {
+            timer->stop();
+        }
+    }
 } // namespace sys
diff --git a/module-sys/Service/Service.hpp b/module-sys/Service/Service.hpp
index e6da9d79f..20df54303 100644
--- a/module-sys/Service/Service.hpp
+++ b/module-sys/Service/Service.hpp
@@ -1,53 +1,33 @@
 #pragma once
 
-#include "Common.hpp"
-#include "Message.hpp"
-#include "Mailbox.hpp"
-#include "Bus.hpp"
-#include <memory>
-#include <queue>
-#include <vector>
-#include <string>
-#include <algorithm>
-#include "thread.hpp"
-#include "timer.hpp"
-#include <typeindex>
-#include <functional>
+#include "Common.hpp"  // for ReturnCodes, ServicePriority, BusChannels
+#include "Mailbox.hpp" // for Mailbox
+#include "Message.hpp" // for Message_t
+#include "thread.hpp"  // for Thread
+#include <algorithm>   // for find, max
+#include <cstdint>     // for uint32_t, uint64_t
+#include <functional>  // for function
+#include <iterator>    // for end
+#include <map>         // for map
+#include <memory>      // for allocator, shared_ptr, enable_shared_from_this
+#include <string>      // for string
+#include <typeindex>   // for type_index
+#include <utility>     // for pair
+#include <vector>      // for vector<>::iterator, vector
+
+namespace sys
+{
+    class Timer;
+} // namespace sys
+namespace sys
+{
+    struct Proxy;
+} // namespace sys
 
 namespace sys
 {
     using MessageHandler = std::function<Message_t(DataMessage *, ResponseMessage *)>;
 
-    class ServiceTimer : public Timer
-    {
-      public:
-        ServiceTimer(const std::string &name, TickType_t tick, bool isPeriodic, uint32_t idx, Service *service);
-
-        [[nodiscard]] uint32_t GetId() const
-        {
-            return m_id;
-        }
-        static uint32_t GetNextUniqueID()
-        {
-            return ++m_timers_unique_idx;
-        }
-
-        void Run() override;
-
-      private:
-        bool m_isPeriodic;
-        TickType_t m_interval;
-        uint32_t m_id;
-        Service *m_service;
-        static uint32_t m_timers_unique_idx;
-    };
-
-    /// proxy has one objective - be friend for Service, so that Message which is not a friend could access
-    /// one and only one entrypoint to messages entrypoint (MessageEntry)
-    /// MessageEntry calls overridable DataReceivedHandler for Service instance and all Calls that are 100% neccessary
-    /// for service
-    struct Proxy;
-
     class Service : public cpp_freertos::Thread, public std::enable_shared_from_this<Service>
     {
       public:
@@ -60,32 +40,14 @@ namespace sys
                 uint32_t stackDepth      = 4096,
                 ServicePriority priority = ServicePriority::Idle);
 
-        virtual ~Service();
+        ~Service() override;
 
         void StartService();
 
-        // Create service timer
-        uint32_t CreateTimer(TickType_t interval, bool isPeriodic, const std::string &name = "");
-        // Reload service timer
-        void ReloadTimer(uint32_t id);
-        // Delete timer
-        void DeleteTimer(uint32_t id);
-        void setTimerPeriod(uint32_t id, uint32_t period);
-        /**
-         * @brief Stops a timer with specified ID
-         * @param id ID of the timer;
-         */
-        void stopTimer(uint32_t id);
-
         // Invoked for not processed already messages
         // override should in in either callback, function or whatever...
         virtual Message_t DataReceivedHandler(DataMessage *msg, ResponseMessage *resp) = 0;
 
-        // TODO register message -> function handler ;) add map/-> :( no can do: array/variant ) <-/ whatever for it
-        // (with check if already registered sth Invoked when timer ticked
-        // TODO this is crap - it should be done via message, in DataReceivedHandler :/
-        virtual void TickHandler(uint32_t id){};
-
         // Invoked during initialization
         virtual ReturnCodes InitHandler() = 0;
 
@@ -117,10 +79,6 @@ namespace sys
 
         void Run() override;
 
-        std::vector<std::unique_ptr<ServiceTimer>> timersList;
-
-        friend class ServiceTimer;
-
         std::map<std::type_index, MessageHandler> message_handlers;
 
       private:
@@ -130,8 +88,51 @@ namespace sys
         virtual auto MessageEntry(DataMessage *message, ResponseMessage *response) -> Message_t final;
 
         friend Proxy;
+
+        class Timers
+        {
+
+            friend Timer;
+
+          private:
+            std::vector<Timer *> list;
+            auto attach(Timer *timer)
+            {
+                list.push_back(timer);
+            }
+
+            void detach(Timer *timer)
+            {
+                list.erase(std::find(list.begin(), list.end(), timer));
+            }
+
+          public:
+            void stop();
+
+            [[nodiscard]] auto get(Timer *timer) const
+            {
+                return std::find(list.begin(), list.end(), timer);
+            }
+
+            [[nodiscard]] auto noTimer() const
+            {
+                return std::end(list);
+            }
+        } timers;
+
+      public:
+        auto getTimers() -> auto &
+        {
+            return timers;
+        }
+
+        auto TimerHandle(SystemMessage &message) -> ReturnCodes;
     };
 
+    /// proxy has one objective - be friend for Service, so that Message which is not a friend could access
+    /// one and only one entrypoint to messages entrypoint (MessageEntry)
+    /// MessageEntry calls overridable DataReceivedHandler for Service instance and all Calls that are 100% neccessary
+    /// for service
     struct Proxy
     {
         static auto handle(Service *service, DataMessage *message, ResponseMessage *response) -> Message_t
@@ -139,5 +140,4 @@ namespace sys
             return service->MessageEntry(message, response);
         }
     };
-
 } // namespace sys
diff --git a/module-sys/Service/Timer.cpp b/module-sys/Service/Timer.cpp
new file mode 100644
index 000000000..144cadcdc
--- /dev/null
+++ b/module-sys/Service/Timer.cpp
@@ -0,0 +1,102 @@
+#include "Timer.hpp"
+#include "Service.hpp"              // for Service, Service::Timers
+#include "Service/TimerMessage.hpp" // for TimerMessage
+#include "log/log.hpp"              // for LOG_ERROR
+#include "projdefs.h"
+#include <Service/Bus.hpp> // for Bus
+#include <limits>          // for numeric_limits
+#include <memory>          // for make_shared
+#include <cstdint>         // for uint32_t
+
+#if DEBUG_TIMER == 1
+#define log_timers(...) LOG_DEBUG(__VA_ARGS__)
+#else
+#define log_timers(...)
+#endif
+
+namespace sys
+{
+
+    const ms Timer::timeout_infinite = std::numeric_limits<ms>().max();
+    static uint32_t timer_id;
+
+    auto toName(const std::string &val, uint32_t no) -> std::string
+    {
+        return val + "_" + std::to_string(no);
+    }
+
+    Timer::Timer(const std::string &name, Service *service, ms interval, Type type)
+        : cpp_freertos::Timer((toName(name, timer_id)).c_str(), pdMS_TO_TICKS(interval), type == Type::Periodic),
+          parent(service), type(type), interval(interval), name(toName(name, timer_id))
+    {
+        if (service != nullptr) {
+            service->getTimers().attach(this);
+        }
+        else {
+            LOG_ERROR("Bad timer creation!");
+        }
+        ++timer_id;
+        log_timers("Timer %s created %s", name.c_str(), type == Type::Periodic ? "periodic" : "singleshot");
+    }
+
+    Timer::Timer(Service *parent, ms interval, Type type) : Timer("Timer", parent, interval, type)
+    {}
+
+    Timer::~Timer()
+    {
+        stop();
+    }
+
+    void Timer::Run()
+    {
+        auto msg = std::make_shared<TimerMessage>(this);
+        if (parent == nullptr) {
+            LOG_ERROR("Timer %s error: no parent service", name.c_str());
+            return;
+        }
+        if (!Bus::SendUnicast(msg, parent->GetName(), parent)) {
+            LOG_ERROR("Timer %s error: bus error", name.c_str());
+            return;
+        }
+    }
+
+    void Timer::start()
+    {
+        log_timers("Timer %s start!", name.c_str());
+        Start(0);
+    }
+
+    void Timer::reload(ms from_time)
+    {
+        Stop(0); // to avoid retriggering timer
+        if (from_time != 0) {
+            interval = from_time;
+            SetPeriod(pdMS_TO_TICKS(interval));
+        }
+        log_timers("Timer %s reload!", name.c_str());
+        Start(0); // start with no waittime
+    }
+
+    void Timer::stop()
+    {
+        log_timers("Timer %s stop!", name.c_str());
+        callback = nullptr;
+        Stop(0);
+    }
+
+    void Timer::setInterval(ms new_interval)
+    {
+        log_timers("Timer %s set interval to: %d ms!", name.c_str(), static_cast<unsigned int>(interval));
+        interval = new_interval;
+        SetPeriod(pdMS_TO_TICKS(new_interval), 0);
+    }
+
+    void Timer::onTimeout()
+    {
+        log_timers("Timer %s tick", name.c_str());
+        if (callback != nullptr) {
+            log_timers("Timer %s callback run!", name.c_str());
+            callback(*this);
+        }
+    }
+} // namespace sys
diff --git a/module-sys/Service/Timer.hpp b/module-sys/Service/Timer.hpp
new file mode 100644
index 000000000..362938ccc
--- /dev/null
+++ b/module-sys/Service/Timer.hpp
@@ -0,0 +1,82 @@
+#pragma once
+
+#include "FreeRTOS.h"
+#include "portmacro.h" // for TickType_t
+#include "timer.hpp"   // for Timer
+#include <functional>  // for function
+#include <string>      // for string
+namespace sys
+{
+    class Service;
+} // namespace sys
+
+namespace sys
+{
+    using ms = unsigned int;
+
+    /// Base timer for all coarse timers in system
+    class Timer : public cpp_freertos::Timer
+    {
+      public:
+        static const ms timeout_infinite;
+
+        enum class Type
+        {
+            Periodic,
+            SingleShot
+        };
+
+        /// Create named timer and register it in parent
+        /// @param name this will be name of timer + postfix
+        /// @param parent service on which behalf timer events will be sent and received
+        /// @param interval time for next timer event in
+        Timer(const std::string &name, Service *parent, ms interval, Type type = Type::Periodic);
+
+        /// Create timer with default name `_<id_number>` and register it in parent
+        /// @param parent service on which behalf timer events will be sent and received
+        /// @param interval time for next timer event in
+        Timer(Service *parent, ms interval, Type type = Type::Periodic);
+
+        Timer()              = delete;
+        Timer(const Timer &) = delete;
+        Timer operator=(const Timer &) = delete;
+
+        /// just to stop timer
+        ~Timer() override;
+
+        /// This is final by design - to avoid missuse we send Timer notification to Service
+        /// and then handle it like any other event. Not by callback as this could cause unrestricted access (no mutex)
+        void Run() final;
+
+        /// executed when we receive timeout notification (from overriden Run()) on bus
+        void onTimeout();
+
+        /// @defgroup API
+        /// {
+        void start();
+        void reload(ms from_time = 0);
+        void stop();
+        void setInterval(ms new_interval);
+        /// }
+
+      protected:
+        Service *parent = nullptr;
+
+      private:
+        Type type;
+        ms interval;
+        std::function<void(Timer &)> callback = nullptr;
+        const std::string name;
+
+      public:
+        void connect(std::function<void(Timer &)> new_callback)
+        {
+            callback = new_callback;
+        }
+
+        [[nodiscard]] constexpr auto getName() const -> const std::string &
+        {
+            return name;
+        }
+    };
+}; // namespace sys
diff --git a/module-sys/Service/TimerMessage.cpp b/module-sys/Service/TimerMessage.cpp
new file mode 100644
index 000000000..e69de29bb
diff --git a/module-sys/Service/TimerMessage.hpp b/module-sys/Service/TimerMessage.hpp
new file mode 100644
index 000000000..b652e59c8
--- /dev/null
+++ b/module-sys/Service/TimerMessage.hpp
@@ -0,0 +1,25 @@
+#pragma once
+
+#include "Message.hpp"
+
+namespace sys
+{
+
+    class Timer;
+
+    class TimerMessage : public SystemMessage
+    {
+        Timer *timer = nullptr;
+
+      public:
+        TimerMessage(Timer *timer) : SystemMessage(SystemMessageType::Timer, ServicePowerMode::Active), timer(timer)
+        {
+            type = Type::System;
+        }
+
+        [[nodiscard]] auto getTimer() const -> Timer *
+        {
+            return timer;
+        }
+    };
+} // namespace sys
diff --git a/module-sys/SystemManager/SystemManager.cpp b/module-sys/SystemManager/SystemManager.cpp
index 540727ee2..6a176e26e 100644
--- a/module-sys/SystemManager/SystemManager.cpp
+++ b/module-sys/SystemManager/SystemManager.cpp
@@ -303,25 +303,6 @@ namespace sys
         return ReturnCodes::Success;
     }
 
-    void SystemManager::TickHandler(uint32_t id)
-    {
-        if (id == pingPongTimerID) {
-
-            for (auto &w : servicesList) {
-                if (w->pingTimestamp == 0) {
-                    // no reponse for ping messages, restart system
-                    LOG_FATAL("%s", (w->GetName() + " failed to response to ping message").c_str());
-                    exit(1);
-                }
-                else {
-                    w->pingTimestamp = 0;
-                }
-            }
-
-            Bus::SendBroadcast(std::make_shared<SystemMessage>(SystemMessageType::Ping), this);
-        }
-    }
-
     Message_t SystemManager::DataReceivedHandler(DataMessage * /*msg*/, ResponseMessage * /*resp*/)
     {
         return std::make_shared<ResponseMessage>();
@@ -331,8 +312,6 @@ namespace sys
     {
         LOG_DEBUG("Invoking closing procedure...");
 
-        DeleteTimer(pingPongTimerID);
-
         // We are going to remove services in reversed order of creation
         CriticalSection::Enter();
         std::reverse(servicesList.begin(), servicesList.end());
diff --git a/module-sys/SystemManager/SystemManager.hpp b/module-sys/SystemManager/SystemManager.hpp
index 07ada10d8..06cdf04af 100644
--- a/module-sys/SystemManager/SystemManager.hpp
+++ b/module-sys/SystemManager/SystemManager.hpp
@@ -10,7 +10,6 @@
 
 #include <functional>
 #include "thread.hpp"
-#include "timer.hpp"
 #include "condition_variable.hpp"
 #include "mutex.hpp"
 #include "Service/Mailbox.hpp"
@@ -89,7 +88,6 @@ namespace sys
         void kill(std::shared_ptr<Service> const &toKill);
 
       private:
-        void TickHandler(uint32_t id) override;
 
         Message_t DataReceivedHandler(DataMessage *msg, ResponseMessage *resp) override;
 
diff --git a/module-utils/board/cross/log.cpp b/module-utils/board/cross/log.cpp
index 80fba4ff8..20f942bf1 100644
--- a/module-utils/board/cross/log.cpp
+++ b/module-utils/board/cross/log.cpp
@@ -124,6 +124,12 @@ struct Logger
     std::map<std::string, logger_level> filtered = {
         // {"ServiceDB", logger_level::LOGFATAL},
         {"ApplicationManager", logger_level::LOGINFO},
+        {"TS0710Worker", logger_level::LOGINFO},
+        {"ServiceCellular", logger_level::LOGINFO},
+        {"ServiceFota", logger_level::LOGINFO},
+        {"ServiceEink", logger_level::LOGINFO},
+        {"ServiceDB", logger_level::LOGINFO},
+        // make sure that we got defined map entries for at least crit and irq
         // make sure that we got defined map entries for at least crit and irq
         {critStr, logger_level::LOGTRACE},
         {irqStr, logger_level::LOGTRACE}};
@@ -210,7 +216,14 @@ static void _log_Log(
                     file,
                     line);
 #else
-    ptr += snprintf(ptr, loggerBufferSizeLeft(ptr), "%-5s %s:%s:%d: ", level_names[level], file, function, line);
+    ptr += snprintf(ptr,
+                    loggerBufferSizeLeft(ptr),
+                    "%-5s [%s] %s:%s:%d: ",
+                    level_names[level],
+                    getTaskDesc(),
+                    file,
+                    function,
+                    line);
 #endif
     ptr += vsnprintf(ptr, loggerBufferSizeLeft(ptr), fmt, args);
     ptr += snprintf(ptr, loggerBufferSizeLeft(ptr), "\n");
diff --git a/module-utils/log/debug.hpp b/module-utils/log/debug.hpp
index cd15604f4..8616b4d92 100644
--- a/module-utils/log/debug.hpp
+++ b/module-utils/log/debug.hpp
@@ -1,12 +1,13 @@
 #pragma once
 
 #define DEBUG_APPLICATION_MANAGEMENT 0 /// show verbose logs in ApplicationManager
-#define DEBUG_SCOPED_TIMINGS         1 /// show timings in measured functions
+#define DEBUG_SCOPED_TIMINGS         0 /// show timings in measured functions
 #define _RT1051_UART_DEBUG           0 /// show full modem uart communication
-#define DEBUG_MODEM_OUTPUT_RESPONSE  1 /// show full modem output
+#define DEBUG_MODEM_OUTPUT_RESPONSE  0 /// show full modem output
 #define DEBUG_SERVICE_MESSAGES       0 /// show messages prior to handling in service
 #define DEBUG_DB_MODEL_DATA          0 /// show messages prior to handling in service
 #define DEBUG_FONT                   0 /// show Font debug messages
 #define DEBUG_GUI_TEXT               0 /// show basic debug messages for gui::Text - warning this can be hard on cpu
 #define DEBUG_GUI_TEXT_LINES         0 /// show extended debug messages for gui::Text - lines building
 #define DEBUG_GUI_TEXT_CURSOR        0 /// show extended debug messages for gui::Text - cursor handling
+#define DEBUG_TIMER                  0 /// debug timers system utility
diff --git a/module-utils/state/ServiceState.hpp b/module-utils/state/ServiceState.hpp
index a45946bd2..2ad9811f8 100644
--- a/module-utils/state/ServiceState.hpp
+++ b/module-utils/state/ServiceState.hpp
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <Service/Bus.hpp>
 #include <algorithm>
 #include <cassert>
 
diff --git a/test/phone_unlock.py b/test/phone_unlock.py
index 1d6c18b4d..729740b73 100644
--- a/test/phone_unlock.py
+++ b/test/phone_unlock.py
@@ -14,6 +14,3 @@ conn.key(3)
 conn.key(3)
 conn.key(3)
 conn.key(3)
-conn.key(ord('\n'))
-# enter menu
-conn.key(ord('\n'))
diff --git a/tools/gdb_crash_extend.py b/tools/gdb_crash_extend.py
new file mode 100644
index 000000000..3e07e1e1d
--- /dev/null
+++ b/tools/gdb_crash_extend.py
@@ -0,0 +1,71 @@
+from gdb.printing import PrettyPrinter, register_pretty_printer
+import gdb
+import uuid
+
+class MMFSR_bits:
+    IACCVIOL = 0
+    DACCVIOL = 1
+    MUNSTKERR = 3
+    MSTKERR = 4
+    MMARVALID = 7
+
+class CrashDump(gdb.Command):
+    """Prints the ListNode from our example in a nice format!"""
+
+    def __init__(self):
+        super(CrashDump, self).__init__(
+            "crash_dump", gdb.COMMAND_USER
+        )
+
+    def _crash_dump(self, val=None) -> str:
+        """
+        """
+        value=gdb.parse_and_eval("*0xE000ED28");
+        # print(type(value), gdb.parse_and_eval(value))
+        print(value)
+        if value & 1 << MMFSR_bits.MMARVALID:
+            print("MMAR holds proper address")
+        if value & 1 << MMFSR_bits.MSTKERR:
+            print("stacking for an exception entry has caused one or more access violations.")
+        if value & 1 << MMFSR_bits.MUNSTKERR:
+            print("unstack for an exception return has caused one or more access violations.")
+        if value & 1 << MMFSR_bits.DACCVIOL:
+            print("the processor attempted a load or store at a location that does not permit the operation.")
+        if value & 1 << MMFSR_bits.IACCVIOL:
+            print("the processor attempted an instruction fetch from a location that does not permit execution.")
+
+        # TODO check psp vs msp by lr young bits
+        psp=gdb.parse_and_eval("$psp")
+        frame=gdb.parse_and_eval("*(syslog_exception_stack_frame_t*)$psp")
+        print("Privileged Stack Pointer: {}".format(frame))
+
+        if frame["psr"] & (1<<9):
+            print("On exception entry CPU aligns new SP to 8 bytes so sometimes it needs to push additional 4 bytes to make it happen.")
+            psp+=4
+        else:
+            print("normal stack pointer")
+
+        gdb.execute("set $r0={}".format(frame["r0"]))
+        gdb.execute("set $r1={}".format(frame["r1"]))
+        gdb.execute("set $r2={}".format(frame["r2"]))
+        gdb.execute("set $r3={}".format(frame["r3"]))
+        gdb.execute("set $r12={}".format(frame["r12"]))
+        gdb.execute("set $lr={}".format(frame["lr"]))
+        gdb.execute("set $pc={}".format(frame["pc"]))
+        gdb.execute("set $psr={}".format(frame["psr"]))
+
+        gdb.execute("set $sp={}".format(psp))
+
+        gdb.execute("bt")
+        return val
+
+    def complete(self, text, word):
+        # We expect the argument passed to be a symbol so fallback to the
+        # internal tab-completion handler for symbols
+        return gdb.COMPLETE_SYMBOL
+
+    def invoke(self, args, from_tty):
+        print("Args Passed: %s" % args)
+        print(self._crash_dump())
+
+CrashDump()