Merge remote-tracking branch 'upstream/develop' into timer_battery_reading

src/CMakeLists.txt

@@ -418,6 +418,7 @@ list(APPEND SOURCE_FILES
         displayapp/screens/BatteryInfo.cpp
         displayapp/screens/Steps.cpp
         displayapp/screens/Timer.cpp
+        displayapp/Colors.cpp
 
         ## Settings
         displayapp/screens/settings/QuickSettings.cpp
@@ -427,6 +428,7 @@ list(APPEND SOURCE_FILES
         displayapp/screens/settings/SettingWakeUp.cpp
         displayapp/screens/settings/SettingDisplay.cpp
         displayapp/screens/settings/SettingSteps.cpp
+        displayapp/screens/settings/SettingPineTimeStyle.cpp
 
         ## Watch faces
         displayapp/icons/bg_clock.c
@@ -610,6 +612,7 @@ set(INCLUDE_FILES
         displayapp/screens/Metronome.h
         displayapp/screens/Motion.h
         displayapp/screens/Timer.h
+        displayapp/Colors.h
         drivers/St7789.h
         drivers/SpiNorFlash.h
         drivers/SpiMaster.h

src/components/settings/Settings.h

@@ -17,6 +17,14 @@ namespace Pinetime {
         DoubleTap = 1,
         RaiseWrist = 2,
       };
+      enum class Colors : uint8_t {
+        White, Silver, Gray, Black, Red, Maroon, Yellow, Olive, Lime, Green, Cyan, Teal, Blue, Navy, Magenta, Purple, Orange
+      };
+      struct PineTimeStyle {
+        Colors ColorTime = Colors::Teal;
+        Colors ColorBar = Colors::Teal;
+        Colors ColorBG = Colors::Black;
+      };
 
       Settings(Pinetime::Controllers::FS& fs);
 
@@ -33,10 +41,38 @@ namespace Pinetime {
         return settings.clockFace;
       };
 
+      void SetPTSColorTime(Colors colorTime) {
+        if (colorTime != settings.PTS.ColorTime)
+          settingsChanged = true;
+        settings.PTS.ColorTime = colorTime;
+      };
+      Colors GetPTSColorTime() const {
+        return settings.PTS.ColorTime;
+      };
+
+      void SetPTSColorBar(Colors colorBar) {
+        if (colorBar != settings.PTS.ColorBar)
+          settingsChanged = true;
+        settings.PTS.ColorBar = colorBar;
+      };
+      Colors GetPTSColorBar() const {
+        return settings.PTS.ColorBar;
+      };
+
+      void SetPTSColorBG(Colors colorBG) {
+        if (colorBG != settings.PTS.ColorBG)
+          settingsChanged = true;
+        settings.PTS.ColorBG = colorBG;
+      };
+      Colors GetPTSColorBG() const {
+        return settings.PTS.ColorBG;
+      };
+
       void SetAppMenu(uint8_t menu) {
         appMenu = menu;
       };
-      uint8_t GetAppMenu() {
+
+      uint8_t GetAppMenu() const {
         return appMenu;
       };
 
@@ -127,9 +163,8 @@ namespace Pinetime {
     private:
       Pinetime::Controllers::FS& fs;
 
-      static constexpr uint32_t settingsVersion = 0x0001;
+      static constexpr uint32_t settingsVersion = 0x0002;
       struct SettingsData {
-
         uint32_t version = settingsVersion;
         uint32_t stepsGoal = 10000;
         uint32_t screenTimeOut = 15000;
@@ -139,6 +174,8 @@ namespace Pinetime {
 
         uint8_t clockFace = 0;
 
+        PineTimeStyle PTS;
+
         std::bitset<3> wakeUpMode {0};
 
         Controllers::BrightnessController::Levels brightLevel = Controllers::BrightnessController::Levels::Medium;

src/displayapp/Apps.h

@@ -30,7 +30,8 @@ namespace Pinetime {
       SettingTimeFormat,
       SettingDisplay,
       SettingWakeUp,
-      SettingSteps
+      SettingSteps,
+      SettingPineTimeStyle
     };
   }
 }

src/displayapp/Colors.cpp

@@ -0,0 +1,27 @@
+#include "Colors.h"
+
+using namespace Pinetime::Applications;
+using namespace Pinetime::Controllers;
+
+lv_color_t Pinetime::Applications::Convert(Pinetime::Controllers::Settings::Colors color) {
+  switch (color) {
+    case Pinetime::Controllers::Settings::Colors::White: return LV_COLOR_WHITE;
+    case Pinetime::Controllers::Settings::Colors::Silver: return LV_COLOR_SILVER;
+    case Pinetime::Controllers::Settings::Colors::Gray: return LV_COLOR_GRAY;
+    case Pinetime::Controllers::Settings::Colors::Black: return LV_COLOR_BLACK;
+    case Pinetime::Controllers::Settings::Colors::Red: return LV_COLOR_RED;
+    case Pinetime::Controllers::Settings::Colors::Maroon: return LV_COLOR_MAROON;
+    case Pinetime::Controllers::Settings::Colors::Yellow: return LV_COLOR_YELLOW;
+    case Pinetime::Controllers::Settings::Colors::Olive: return LV_COLOR_OLIVE;
+    case Pinetime::Controllers::Settings::Colors::Lime: return LV_COLOR_LIME;
+    case Pinetime::Controllers::Settings::Colors::Green: return LV_COLOR_GREEN;
+    case Pinetime::Controllers::Settings::Colors::Cyan: return LV_COLOR_CYAN;
+    case Pinetime::Controllers::Settings::Colors::Teal: return LV_COLOR_TEAL;
+    case Pinetime::Controllers::Settings::Colors::Blue: return LV_COLOR_BLUE;
+    case Pinetime::Controllers::Settings::Colors::Navy: return LV_COLOR_NAVY;
+    case Pinetime::Controllers::Settings::Colors::Magenta: return LV_COLOR_MAGENTA;
+    case Pinetime::Controllers::Settings::Colors::Purple: return LV_COLOR_PURPLE;
+    case Pinetime::Controllers::Settings::Colors::Orange: return LV_COLOR_ORANGE;
+    default: return LV_COLOR_WHITE;
+  }
+}

src/displayapp/Colors.h

@@ -0,0 +1,10 @@
+#pragma once
+
+#include <lvgl/src/lv_misc/lv_color.h>
+#include <components/settings/Settings.h>
+
+namespace Pinetime {
+  namespace Applications {
+    lv_color_t Convert(Controllers::Settings::Colors color);
+  }
+}

src/displayapp/DisplayApp.cpp

@@ -42,6 +42,7 @@
 #include "displayapp/screens/settings/SettingWakeUp.h"
 #include "displayapp/screens/settings/SettingDisplay.h"
 #include "displayapp/screens/settings/SettingSteps.h"
+#include "displayapp/screens/settings/SettingPineTimeStyle.h"
 
 #include "libs/lv_conf.h"
 
@@ -272,7 +273,7 @@ void DisplayApp::Refresh() {
 }
 
 void DisplayApp::RunningState() {
-  if (!currentScreen->Refresh()) {
+  if (!currentScreen->IsRunning()) {
     LoadApp(returnToApp, returnDirection);
   }
   lv_task_handler();
@@ -367,6 +368,10 @@ void DisplayApp::LoadApp(Apps app, DisplayApp::FullRefreshDirections direction)
       currentScreen = std::make_unique<Screens::SettingSteps>(this, settingsController);
       ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
       break;
+    case Apps::SettingPineTimeStyle:
+      currentScreen = std::make_unique<Screens::SettingPineTimeStyle>(this, settingsController);
+      ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
+      break;
     case Apps::BatteryInfo:
       currentScreen = std::make_unique<Screens::BatteryInfo>(this, batteryController);
       ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);

src/displayapp/screens/ApplicationList.cpp

@@ -34,12 +34,6 @@ ApplicationList::~ApplicationList() {
   lv_obj_clean(lv_scr_act());
 }
 
-bool ApplicationList::Refresh() {
-  if (running)
-    running = screens.Refresh();
-  return running;
-}
-
 bool ApplicationList::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
   return screens.OnTouchEvent(event);
 }

src/displayapp/screens/ApplicationList.h

@@ -18,7 +18,6 @@ namespace Pinetime {
                                  Pinetime::Controllers::Battery& batteryController,
                                  Controllers::DateTime& dateTimeController);
         ~ApplicationList() override;
-        bool Refresh() override;
         bool OnTouchEvent(TouchEvents event) override;
 
       private:

src/displayapp/screens/BatteryInfo.cpp

@@ -4,11 +4,6 @@
 
 using namespace Pinetime::Applications::Screens;
 
-static void lv_update_task(struct _lv_task_t* task) {
-  auto user_data = static_cast<BatteryInfo*>(task->user_data);
-  user_data->UpdateScreen();
-}
-
 BatteryInfo::BatteryInfo(Pinetime::Applications::DisplayApp* app, Pinetime::Controllers::Battery& batteryController)
   : Screen(app), batteryController {batteryController} {
 
@@ -49,16 +44,17 @@ BatteryInfo::BatteryInfo(Pinetime::Applications::DisplayApp* app, Pinetime::Cont
   lv_obj_set_pos(backgroundLabel, 0, 0);
   lv_label_set_text_static(backgroundLabel, "");
 
-  taskUpdate = lv_task_create(lv_update_task, 5000, LV_TASK_PRIO_LOW, this);
+  taskRefresh = lv_task_create(RefreshTaskCallback, 5000, LV_TASK_PRIO_MID, this);
-  UpdateScreen();
+  Refresh();
 }
 
 BatteryInfo::~BatteryInfo() {
-  lv_task_del(taskUpdate);
+  lv_task_del(taskRefresh);
   lv_obj_clean(lv_scr_act());
 }
 
-void BatteryInfo::UpdateScreen() {
+void BatteryInfo::Refresh() {
+
   batteryPercent = batteryController.PercentRemaining();
   batteryVoltage = batteryController.Voltage();
 
@@ -82,7 +78,3 @@ void BatteryInfo::UpdateScreen() {
   lv_label_set_text_fmt(voltage, "%1i.%02i volts", batteryVoltage / 1000, batteryVoltage % 1000 / 10);
   lv_bar_set_value(charging_bar, batteryPercent, LV_ANIM_ON);
 }
-
-bool BatteryInfo::Refresh() {
-  return running;
-}

src/displayapp/screens/BatteryInfo.h

@@ -19,9 +19,7 @@ namespace Pinetime {
         BatteryInfo(DisplayApp* app, Pinetime::Controllers::Battery& batteryController);
         ~BatteryInfo() override;
 
-        bool Refresh() override;
+        void Refresh() override;
-
-        void UpdateScreen();
 
       private:
         Pinetime::Controllers::Battery& batteryController;
@@ -31,7 +29,7 @@ namespace Pinetime {
         lv_obj_t* charging_bar;
         lv_obj_t* status;
 
-        lv_task_t* taskUpdate;
+        lv_task_t* taskRefresh;
 
         uint8_t batteryPercent = 0;
         uint16_t batteryVoltage = 0;

src/displayapp/screens/Brightness.cpp

@@ -30,10 +30,6 @@ Brightness::~Brightness() {
   lv_obj_clean(lv_scr_act());
 }
 
-bool Brightness::Refresh() {
-  return running;
-}
-
 const char* Brightness::LevelToString(Pinetime::Controllers::BrightnessController::Levels level) {
   switch (level) {
     case Pinetime::Controllers::BrightnessController::Levels::Off:

src/displayapp/screens/Brightness.h

@@ -12,7 +12,6 @@ namespace Pinetime {
       public:
         Brightness(DisplayApp* app, Controllers::BrightnessController& brightness);
         ~Brightness() override;
-        bool Refresh() override;
 
         bool OnTouchEvent(TouchEvents event) override;
 

src/displayapp/screens/Clock.cpp

@@ -50,11 +50,6 @@ Clock::~Clock() {
   lv_obj_clean(lv_scr_act());
 }
 
-bool Clock::Refresh() {
-  screen->Refresh();
-  return running;
-}
-
 bool Clock::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
   return screen->OnTouchEvent(event);
 }

src/displayapp/screens/Clock.h

@@ -31,8 +31,6 @@ namespace Pinetime {
               Controllers::MotionController& motionController);
         ~Clock() override;
 
-        bool Refresh() override;
-
         bool OnTouchEvent(TouchEvents event) override;
 
       private:

src/displayapp/screens/FirmwareUpdate.cpp

@@ -30,14 +30,16 @@ FirmwareUpdate::FirmwareUpdate(Pinetime::Applications::DisplayApp* app, Pinetime
   lv_label_set_text(percentLabel, "Waiting...");
   lv_obj_set_auto_realign(percentLabel, true);
   lv_obj_align(percentLabel, bar1, LV_ALIGN_OUT_TOP_MID, 0, 60);
+  taskRefresh = lv_task_create(RefreshTaskCallback, LV_DISP_DEF_REFR_PERIOD, LV_TASK_PRIO_MID, this);
   startTime = xTaskGetTickCount();
 }
 
 FirmwareUpdate::~FirmwareUpdate() {
+  lv_task_del(taskRefresh);
   lv_obj_clean(lv_scr_act());
 }
 
-bool FirmwareUpdate::Refresh() {
+void FirmwareUpdate::Refresh() {
   switch (bleController.State()) {
     default:
     case Pinetime::Controllers::Ble::FirmwareUpdateStates::Idle:
@@ -73,7 +75,6 @@ bool FirmwareUpdate::Refresh() {
       }
       break;
   }
-  return running;
 }
 
 void FirmwareUpdate::DisplayProgression() const {

src/displayapp/screens/FirmwareUpdate.h

@@ -16,7 +16,7 @@ namespace Pinetime {
         FirmwareUpdate(DisplayApp* app, Pinetime::Controllers::Ble& bleController);
         ~FirmwareUpdate() override;
 
-        bool Refresh() override;
+        void Refresh() override;
 
       private:
         enum class States { Idle, Running, Validated, Error };
@@ -36,6 +36,7 @@ namespace Pinetime {
 
         void UpdateError();
 
+        lv_task_t* taskRefresh;
         TickType_t startTime;
       };
     }

src/displayapp/screens/FirmwareValidation.cpp

@@ -63,10 +63,6 @@ FirmwareValidation::~FirmwareValidation() {
   lv_obj_clean(lv_scr_act());
 }
 
-bool FirmwareValidation::Refresh() {
-  return running;
-}
-
 void FirmwareValidation::OnButtonEvent(lv_obj_t* object, lv_event_t event) {
   if (object == buttonValidate && event == LV_EVENT_CLICKED) {
     validator.Validate();

src/displayapp/screens/FirmwareValidation.h

@@ -16,8 +16,6 @@ namespace Pinetime {
         FirmwareValidation(DisplayApp* app, Pinetime::Controllers::FirmwareValidator& validator);
         ~FirmwareValidation() override;
 
-        bool Refresh() override;
-
         void OnButtonEvent(lv_obj_t* object, lv_event_t event);
 
       private:

src/displayapp/screens/FlashLight.cpp

@@ -65,10 +65,6 @@ void FlashLight::OnClickEvent(lv_obj_t* obj, lv_event_t event) {
   }
 }
 
-bool FlashLight::Refresh() {
-  return running;
-}
-
 bool FlashLight::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
   return false;
 }

src/displayapp/screens/FlashLight.h

@@ -16,8 +16,6 @@ namespace Pinetime {
         FlashLight(DisplayApp* app, System::SystemTask& systemTask, Controllers::BrightnessController& brightness);
         ~FlashLight() override;
 
-        bool Refresh() override;
-
         bool OnTouchEvent(Pinetime::Applications::TouchEvents event) override;
         void OnClickEvent(lv_obj_t* obj, lv_event_t event);
 

src/displayapp/screens/HeartRate.cpp

@@ -64,14 +64,17 @@ HeartRate::HeartRate(Pinetime::Applications::DisplayApp* app,
   UpdateStartStopButton(isHrRunning);
   if (isHrRunning)
     systemTask.PushMessage(Pinetime::System::Messages::DisableSleeping);
+
+  taskRefresh = lv_task_create(RefreshTaskCallback, 100, LV_TASK_PRIO_MID, this);
 }
 
 HeartRate::~HeartRate() {
+  lv_task_del(taskRefresh);
   lv_obj_clean(lv_scr_act());
   systemTask.PushMessage(Pinetime::System::Messages::EnableSleeping);
 }
 
-bool HeartRate::Refresh() {
+void HeartRate::Refresh() {
 
   auto state = heartRateController.State();
   switch (state) {
@@ -86,8 +89,6 @@ bool HeartRate::Refresh() {
 
   lv_label_set_text(label_status, ToString(state));
   lv_obj_align(label_status, label_hr, LV_ALIGN_OUT_BOTTOM_MID, 0, 10);
-
-  return running;
 }
 
 void HeartRate::OnStartStopEvent(lv_event_t event) {

src/displayapp/screens/HeartRate.h

@@ -20,7 +20,7 @@ namespace Pinetime {
         HeartRate(DisplayApp* app, Controllers::HeartRateController& HeartRateController, System::SystemTask& systemTask);
         ~HeartRate() override;
 
-        bool Refresh() override;
+        void Refresh() override;
 
         void OnStartStopEvent(lv_event_t event);
 
@@ -33,6 +33,8 @@ namespace Pinetime {
         lv_obj_t* label_status;
         lv_obj_t* btn_startStop;
         lv_obj_t* label_startStop;
+
+        lv_task_t* taskRefresh;
       };
     }
   }

src/displayapp/screens/InfiniPaint.cpp

@@ -12,10 +12,6 @@ InfiniPaint::~InfiniPaint() {
   lv_obj_clean(lv_scr_act());
 }
 
-bool InfiniPaint::Refresh() {
-  return running;
-}
-
 bool InfiniPaint::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
   switch (event) {
     case Pinetime::Applications::TouchEvents::LongTap:

src/displayapp/screens/InfiniPaint.h

@@ -17,8 +17,6 @@ namespace Pinetime {
 
         ~InfiniPaint() override;
 
-        bool Refresh() override;
-
         bool OnTouchEvent(TouchEvents event) override;
 
         bool OnTouchEvent(uint16_t x, uint16_t y) override;

src/displayapp/screens/Label.cpp

@@ -36,7 +36,3 @@ Label::Label(uint8_t screenID, uint8_t numScreens, Pinetime::Applications::Displ
 Label::~Label() {
   lv_obj_clean(lv_scr_act());
 }
-
-bool Label::Refresh() {
-  return running;
-}

src/displayapp/screens/Label.h

@@ -12,8 +12,6 @@ namespace Pinetime {
         Label(uint8_t screenID, uint8_t numScreens, DisplayApp* app, lv_obj_t* labelText);
         ~Label() override;
 
-        bool Refresh() override;
-
       private:
         lv_obj_t* labelText = nullptr;
         lv_point_t pageIndicatorBasePoints[2];

src/displayapp/screens/List.cpp

@@ -98,11 +98,6 @@ List::~List() {
   lv_obj_clean(lv_scr_act());
 }
 
-bool List::Refresh() {
-
-  return running;
-}
-
 void List::OnButtonEvent(lv_obj_t* object, lv_event_t event) {
   if (event == LV_EVENT_CLICKED) {
     for (int i = 0; i < MAXLISTITEMS; i++) {

src/displayapp/screens/List.h

@@ -27,8 +27,6 @@ namespace Pinetime {
                       std::array<Applications, MAXLISTITEMS>& applications);
         ~List() override;
 
-        bool Refresh() override;
-
         void OnButtonEvent(lv_obj_t* object, lv_event_t event);
 
       private:

src/displayapp/screens/Meter.cpp

@@ -20,17 +20,17 @@ Meter::Meter(Pinetime::Applications::DisplayApp* app) : Screen(app) {
 
   lv_obj_set_size(lmeter, 200, 200);
   lv_obj_align(lmeter, nullptr, LV_ALIGN_CENTER, 0, 0);
+
+  taskRefresh = lv_task_create(RefreshTaskCallback, LV_DISP_DEF_REFR_PERIOD, LV_TASK_PRIO_MID, this);
 }
 
 Meter::~Meter() {
-
+  lv_task_del(taskRefresh);
   lv_obj_clean(lv_scr_act());
 }
 
-bool Meter::Refresh() {
+void Meter::Refresh() {
   lv_linemeter_set_value(lmeter, value++); /*Set the current value*/
   if (value >= 60)
     value = 0;
-
-  return running;
 }

src/displayapp/screens/Meter.h

@@ -14,13 +14,15 @@ namespace Pinetime {
         Meter(DisplayApp* app);
         ~Meter() override;
 
-        bool Refresh() override;
+        void Refresh() override;
 
       private:
         lv_style_t style_lmeter;
         lv_obj_t* lmeter;
 
         uint32_t value = 0;
+
+        lv_task_t* taskRefresh;
       };
     }
   }

src/displayapp/screens/Metronome.cpp

@@ -66,14 +66,17 @@ Metronome::Metronome(DisplayApp* app, Controllers::MotorController& motorControl
   lv_obj_set_size(playPause, 115, 50);
   lv_obj_align(playPause, lv_scr_act(), LV_ALIGN_IN_BOTTOM_RIGHT, 0, 0);
   lv_obj_set_style_local_value_str(playPause, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, Symbols::play);
+
+  taskRefresh = lv_task_create(RefreshTaskCallback, LV_DISP_DEF_REFR_PERIOD, LV_TASK_PRIO_MID, this);
 }
 
 Metronome::~Metronome() {
+  lv_task_del(taskRefresh);
   systemTask.PushMessage(System::Messages::EnableSleeping);
   lv_obj_clean(lv_scr_act());
 }
 
-bool Metronome::Refresh() {
+void Metronome::Refresh() {
   if (metronomeStarted) {
     if (xTaskGetTickCount() - startTime > 60 * configTICK_RATE_HZ / bpm) {
       startTime += 60 * configTICK_RATE_HZ / bpm;
@@ -86,7 +89,6 @@ bool Metronome::Refresh() {
       }
     }
   }
-  return running;
 }
 
 void Metronome::OnEvent(lv_obj_t* obj, lv_event_t event) {

src/displayapp/screens/Metronome.h

@@ -11,7 +11,7 @@ namespace Pinetime {
       public:
         Metronome(DisplayApp* app, Controllers::MotorController& motorController, System::SystemTask& systemTask);
         ~Metronome() override;
-        bool Refresh() override;
+        void Refresh() override;
         void OnEvent(lv_obj_t* obj, lv_event_t event);
 
       private:
@@ -28,6 +28,8 @@ namespace Pinetime {
         lv_obj_t *bpmArc, *bpmTap, *bpmValue;
         lv_obj_t *bpbDropdown, *currentBpbText;
         lv_obj_t *playPause;
+
+        lv_task_t* taskRefresh;
       };
     }
   }

src/displayapp/screens/Motion.cpp

@@ -36,13 +36,16 @@ Motion::Motion(Pinetime::Applications::DisplayApp* app, Controllers::MotionContr
   labelStep = lv_label_create(lv_scr_act(), NULL);
   lv_obj_align(labelStep, chart, LV_ALIGN_IN_BOTTOM_LEFT, 0, 0);
   lv_label_set_text(labelStep, "Steps ---");
+
+  taskRefresh = lv_task_create(RefreshTaskCallback, LV_DISP_DEF_REFR_PERIOD, LV_TASK_PRIO_MID, this);
 }
 
 Motion::~Motion() {
+  lv_task_del(taskRefresh);
   lv_obj_clean(lv_scr_act());
 }
 
-bool Motion::Refresh() {
+void Motion::Refresh() {
   lv_chart_set_next(chart, ser1, motionController.X());
   lv_chart_set_next(chart, ser2, motionController.Y());
   lv_chart_set_next(chart, ser3, motionController.Z());
@@ -55,6 +58,4 @@ bool Motion::Refresh() {
                         motionController.Y() / 0x10,
                         motionController.Z() / 0x10);
   lv_obj_align(label, NULL, LV_ALIGN_IN_TOP_MID, 0, 10);
-
-  return running;
 }

src/displayapp/screens/Motion.h

@@ -17,7 +17,7 @@ namespace Pinetime {
         Motion(DisplayApp* app, Controllers::MotionController& motionController);
         ~Motion() override;
 
-        bool Refresh() override;
+        void Refresh() override;
 
       private:
         Controllers::MotionController& motionController;
@@ -28,6 +28,7 @@ namespace Pinetime {
         lv_obj_t* label;
 
         lv_obj_t* labelStep;
+        lv_task_t* taskRefresh;
       };
     }
   }

src/displayapp/screens/Music.cpp

@@ -139,14 +139,17 @@ Music::Music(Pinetime::Applications::DisplayApp* app, Pinetime::Controllers::Mus
   frameB = false;
 
   musicService.event(Controllers::MusicService::EVENT_MUSIC_OPEN);
+
+  taskRefresh = lv_task_create(RefreshTaskCallback, LV_DISP_DEF_REFR_PERIOD, LV_TASK_PRIO_MID, this);
 }
 
 Music::~Music() {
+  lv_task_del(taskRefresh);
   lv_style_reset(&btn_style);
   lv_obj_clean(lv_scr_act());
 }
 
-bool Music::Refresh() {
+void Music::Refresh() {
   if (artist != musicService.getArtist()) {
     artist = musicService.getArtist();
     currentLength = 0;
@@ -210,8 +213,6 @@ bool Music::Refresh() {
   } else {
     lv_label_set_text(txtPlayPause, Symbols::play);
   }
-
-  return running;
 }
 
 void Music::UpdateLength() {

src/displayapp/screens/Music.h

@@ -35,7 +35,7 @@ namespace Pinetime {
 
         ~Music() override;
 
-        bool Refresh() override;
+        void Refresh() override;
 
         void OnObjectEvent(lv_obj_t* obj, lv_event_t event);
 
@@ -79,6 +79,8 @@ namespace Pinetime {
 
         bool playing;
 
+        lv_task_t* taskRefresh;
+
         /** Watchapp */
       };
     }

src/displayapp/screens/Navigation.cpp

@@ -161,13 +161,16 @@ Navigation::Navigation(Pinetime::Applications::DisplayApp* app, Pinetime::Contro
   lv_bar_set_anim_time(barProgress, 500);
   lv_bar_set_range(barProgress, 0, 100);
   lv_bar_set_value(barProgress, 0, LV_ANIM_OFF);
+
+  taskRefresh = lv_task_create(RefreshTaskCallback, LV_DISP_DEF_REFR_PERIOD, LV_TASK_PRIO_MID, this);
 }
 
 Navigation::~Navigation() {
+  lv_task_del(taskRefresh);
   lv_obj_clean(lv_scr_act());
 }
 
-bool Navigation::Refresh() {
+void Navigation::Refresh() {
   if (flag != navService.getFlag()) {
     flag = navService.getFlag();
     lv_label_set_text(imgFlag, iconForName(flag));
@@ -192,8 +195,4 @@ bool Navigation::Refresh() {
       lv_obj_set_style_local_bg_color(barProgress, LV_BAR_PART_INDIC, LV_STATE_DEFAULT, LV_COLOR_ORANGE);
     }
   }
-
-  return running;
 }
-
-

src/displayapp/screens/Navigation.h

@@ -35,7 +35,7 @@ namespace Pinetime {
         Navigation(DisplayApp* app, Pinetime::Controllers::NavigationService& nav);
         ~Navigation() override;
 
-        bool Refresh() override;
+        void Refresh() override;
 
       private:
         lv_obj_t* imgFlag;
@@ -49,6 +49,8 @@ namespace Pinetime {
         std::string narrative;
         std::string manDist;
         int progress;
+
+        lv_task_t* taskRefresh;
       };
     }
   }

src/displayapp/screens/Notifications.cpp

@@ -52,15 +52,18 @@ Notifications::Notifications(DisplayApp* app,
       timeoutTickCountEnd = timeoutTickCountStart + (5 * 1024);
     }
   }
+
+  taskRefresh = lv_task_create(RefreshTaskCallback, LV_DISP_DEF_REFR_PERIOD, LV_TASK_PRIO_MID, this);
 }
 
 Notifications::~Notifications() {
+  lv_task_del(taskRefresh);
   // make sure we stop any vibrations before exiting
   Controllers::MotorController::StopRinging();
   lv_obj_clean(lv_scr_act());
 }
 
-bool Notifications::Refresh() {
+void Notifications::Refresh() {
   if (mode == Modes::Preview && timeoutLine != nullptr) {
     auto tick = xTaskGetTickCount();
     int32_t pos = 240 - ((tick - timeoutTickCountStart) / ((timeoutTickCountEnd - timeoutTickCountStart) / 240));
@@ -70,7 +73,7 @@ bool Notifications::Refresh() {
     timeoutLinePoints[1].x = pos;
     lv_line_set_points(timeoutLine, timeoutLinePoints, 2);
   }
-  return running && currentItem->IsRunning();
+  running = currentItem->IsRunning();
 }
 
 bool Notifications::OnTouchEvent(Pinetime::Applications::TouchEvents event) {

src/displayapp/screens/Notifications.h

@@ -24,7 +24,7 @@ namespace Pinetime {
                                Modes mode);
         ~Notifications() override;
 
-        bool Refresh() override;
+        void Refresh() override;
         bool OnTouchEvent(Pinetime::Applications::TouchEvents event) override;
 
         class NotificationItem {
@@ -79,6 +79,8 @@ namespace Pinetime {
         lv_obj_t* timeoutLine = nullptr;
         uint32_t timeoutTickCountStart;
         uint32_t timeoutTickCountEnd;
+
+        lv_task_t* taskRefresh;
       };
     }
   }

src/displayapp/screens/Paddle.cpp

@@ -27,13 +27,16 @@ Paddle::Paddle(Pinetime::Applications::DisplayApp* app, Pinetime::Components::Li
   lv_obj_set_style_local_bg_color(ball, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_WHITE);
   lv_obj_set_style_local_radius(ball, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_RADIUS_CIRCLE);
   lv_obj_set_size(ball, ballSize, ballSize);
+
+  taskRefresh = lv_task_create(RefreshTaskCallback, LV_DISP_DEF_REFR_PERIOD, LV_TASK_PRIO_MID, this);
 }
 
 Paddle::~Paddle() {
+  lv_task_del(taskRefresh);
   lv_obj_clean(lv_scr_act());
 }
 
-bool Paddle::Refresh() {
+void Paddle::Refresh() {
   ballX += dx;
   ballY += dy;
 
@@ -65,7 +68,6 @@ bool Paddle::Refresh() {
     }
   }
   lv_label_set_text_fmt(points, "%04d", score);
-  return running;
 }
 
 bool Paddle::OnTouchEvent(Pinetime::Applications::TouchEvents event) {

src/displayapp/screens/Paddle.h

@@ -16,7 +16,7 @@ namespace Pinetime {
         Paddle(DisplayApp* app, Pinetime::Components::LittleVgl& lvgl);
         ~Paddle() override;
 
-        bool Refresh() override;
+        void Refresh() override;
 
         bool OnTouchEvent(TouchEvents event) override;
         bool OnTouchEvent(uint16_t x, uint16_t y) override;
@@ -40,6 +40,8 @@ namespace Pinetime {
         lv_obj_t* paddle;
         lv_obj_t* ball;
         lv_obj_t* background;
+
+        lv_task_t* taskRefresh;
       };
     }
   }

src/displayapp/screens/PineTimeStyle.cpp

@@ -23,6 +23,7 @@
 #include <date/date.h>
 #include <lvgl/lvgl.h>
 #include <cstdio>
+#include <displayapp/Colors.h>
 #include "BatteryIcon.h"
 #include "BleIcon.h"
 #include "NotificationIcon.h"
@@ -51,7 +52,8 @@ PineTimeStyle::PineTimeStyle(DisplayApp* app,
     notificatioManager {notificatioManager},
     settingsController {settingsController},
     motionController {motionController} {
-  /* This sets the watchface number to return to after leaving the menu */
+
+  // This sets the watchface number to return to after leaving the menu
   settingsController.SetClockFace(2);
 
   displayedChar[0] = 0;
@@ -60,40 +62,40 @@ PineTimeStyle::PineTimeStyle(DisplayApp* app,
   displayedChar[3] = 0;
   displayedChar[4] = 0;
 
-  /* Create a 200px wide background rectangle */
+  //Create a 200px wide background rectangle
   timebar = lv_obj_create(lv_scr_act(), nullptr);
-  lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
+  lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, Convert(settingsController.GetPTSColorBG()));
   lv_obj_set_style_local_radius(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 0);
   lv_obj_set_size(timebar, 200, 240);
   lv_obj_align(timebar, lv_scr_act(), LV_ALIGN_IN_TOP_LEFT, 5, 0);
 
-  /* Display the time */
+  // Display the time
   timeDD1 = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_text_font(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &open_sans_light);
-  lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x008080));
+  lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, Convert(settingsController.GetPTSColorTime()));
   lv_label_set_text(timeDD1, "12");
   lv_obj_align(timeDD1, timebar, LV_ALIGN_IN_TOP_MID, 5, 5);
 
   timeDD2 = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_text_font(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &open_sans_light);
-  lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x008080));
+  lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, Convert(settingsController.GetPTSColorTime()));
   lv_label_set_text(timeDD2, "34");
   lv_obj_align(timeDD2, timebar, LV_ALIGN_IN_BOTTOM_MID, 5, -5);
 
   timeAMPM = lv_label_create(lv_scr_act(), nullptr);
-  lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x008080));
+  lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, Convert(settingsController.GetPTSColorTime()));
   lv_obj_set_style_local_text_line_space(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, -3);
   lv_label_set_text(timeAMPM, "");
   lv_obj_align(timeAMPM, timebar, LV_ALIGN_IN_BOTTOM_LEFT, 2, -20);
 
-  /* Create a 40px wide bar down the right side of the screen */
+  // Create a 40px wide bar down the right side of the screen
   sidebar = lv_obj_create(lv_scr_act(), nullptr);
-  lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x008080));
+  lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, Convert(settingsController.GetPTSColorBar()));
   lv_obj_set_style_local_radius(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 0);
   lv_obj_set_size(sidebar, 40, 240);
   lv_obj_align(sidebar, lv_scr_act(), LV_ALIGN_IN_TOP_RIGHT, 0, 0);
 
-  /* Display icons */
+  // Display icons
   batteryIcon = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_text_color(batteryIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
   lv_label_set_text(batteryIcon, Symbols::batteryFull);
@@ -111,7 +113,7 @@ PineTimeStyle::PineTimeStyle(DisplayApp* app,
   lv_obj_set_style_local_text_color(notificationIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
   lv_obj_align(notificationIcon, sidebar, LV_ALIGN_IN_TOP_MID, 0, 40);
 
-  /* Calendar icon */
+  // Calendar icon
   calendarOuter = lv_obj_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_bg_color(calendarOuter, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
   lv_obj_set_style_local_radius(calendarOuter, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 0);
@@ -148,7 +150,7 @@ PineTimeStyle::PineTimeStyle(DisplayApp* app,
   lv_obj_set_size(calendarCrossBar2, 8, 3);
   lv_obj_align(calendarCrossBar2, calendarBar2, LV_ALIGN_IN_BOTTOM_MID, 0, 0);
 
-  /* Display date */
+  // Display date
   dateDayOfWeek = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_text_color(dateDayOfWeek, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
   lv_label_set_text(dateDayOfWeek, "THU");
@@ -184,7 +186,7 @@ PineTimeStyle::PineTimeStyle(DisplayApp* app,
   lv_obj_set_style_local_line_width(stepGauge, LV_GAUGE_PART_MAIN, LV_STATE_DEFAULT, 4);
   lv_obj_set_style_local_line_color(stepGauge, LV_GAUGE_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_BLACK);
   lv_obj_set_style_local_line_opa(stepGauge, LV_GAUGE_PART_NEEDLE, LV_STATE_DEFAULT, LV_OPA_COVER);
-  lv_obj_set_style_local_line_width(stepGauge, LV_GAUGE_PART_NEEDLE, LV_STATE_DEFAULT, 4);
+  lv_obj_set_style_local_line_width(stepGauge, LV_GAUGE_PART_NEEDLE, LV_STATE_DEFAULT, 3);
   lv_obj_set_style_local_pad_inner(stepGauge, LV_GAUGE_PART_NEEDLE, LV_STATE_DEFAULT, 4);
 
   backgroundLabel = lv_label_create(lv_scr_act(), nullptr);
@@ -193,13 +195,17 @@ PineTimeStyle::PineTimeStyle(DisplayApp* app,
   lv_obj_set_size(backgroundLabel, 240, 240);
   lv_obj_set_pos(backgroundLabel, 0, 0);
   lv_label_set_text(backgroundLabel, "");
+
+  taskRefresh = lv_task_create(RefreshTaskCallback, LV_DISP_DEF_REFR_PERIOD, LV_TASK_PRIO_MID, this);
+  Refresh();
 }
 
 PineTimeStyle::~PineTimeStyle() {
+  lv_task_del(taskRefresh);
   lv_obj_clean(lv_scr_act());
 }
 
-bool PineTimeStyle::Refresh() {
+void PineTimeStyle::Refresh() {
   batteryPercentRemaining = batteryController.PercentRemaining();
   if (batteryPercentRemaining.IsUpdated()) {
     auto batteryPercent = batteryPercentRemaining.Get();
@@ -303,6 +309,4 @@ bool PineTimeStyle::Refresh() {
       lv_obj_set_style_local_scale_grad_color(stepGauge, LV_GAUGE_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_WHITE);
     }
   }
-
-  return running;
 }

src/displayapp/screens/PineTimeStyle.h

@@ -30,7 +30,7 @@ namespace Pinetime {
                       Controllers::MotionController& motionController);
         ~PineTimeStyle() override;
 
-        bool Refresh() override;
+        void Refresh() override;
 
       private:
         char displayedChar[5];
@@ -75,6 +75,8 @@ namespace Pinetime {
         Controllers::NotificationManager& notificatioManager;
         Controllers::Settings& settingsController;
         Controllers::MotionController& motionController;
+
+        lv_task_t* taskRefresh;
       };
     }
   }

src/displayapp/screens/Screen.cpp

@@ -1,2 +1,6 @@
 #include "Screen.h"
 using namespace Pinetime::Applications::Screens;
+
+void Screen::RefreshTaskCallback(lv_task_t* task) {
+  static_cast<Screen*>(task->user_data)->Refresh();
+}

src/displayapp/screens/Screen.h

@@ -2,6 +2,7 @@
 
 #include <cstdint>
 #include "../TouchEvents.h"
+#include <lvgl/lvgl.h>
 
 namespace Pinetime {
   namespace Applications {
@@ -38,25 +39,20 @@ namespace Pinetime {
       };
 
       class Screen {
+      private:
+        virtual void Refresh() {
+        }
+
       public:
         explicit Screen(DisplayApp* app) : app {app} {
         }
         virtual ~Screen() = default;
 
-        /**
+        static void RefreshTaskCallback(lv_task_t* task);
-         * Most of the time, apps only react to events (touch events, for example).
+
-         * In this case you don't need to do anything in this method.
+        bool IsRunning() const {
-         *
+          return running;
-         * For example, InfiniPaint does nothing in Refresh().
+        }
-         * But, if you want to update your display periodically, draw an animation...
-         * you cannot do it in a touch event handler because these handlers are not
-         * called if the user does not touch the screen.
-         *
-         * That's why Refresh() is there: update the display periodically.
-         *
-         * @return false if the app can be closed, true if it must continue to run
-         **/
-        virtual bool Refresh() = 0;
 
         /** @return false if the button hasn't been handled by the app, true if it has been handled */
         virtual bool OnButtonPushed() {

src/displayapp/screens/ScreenList.h

@@ -30,11 +30,6 @@ namespace Pinetime {
           lv_obj_clean(lv_scr_act());
         }
 
-        bool Refresh() override {
-          running = current->Refresh();
-          return running;
-        }
-
         bool OnTouchEvent(TouchEvents event) override {
 
           if (mode == ScreenListModes::UpDown) {

src/displayapp/screens/Steps.cpp

@@ -47,20 +47,20 @@ Steps::Steps(Pinetime::Applications::DisplayApp* app,
   lv_obj_set_size(backgroundLabel, 240, 240);
   lv_obj_set_pos(backgroundLabel, 0, 0);
   lv_label_set_text_static(backgroundLabel, "");
+
+  taskRefresh = lv_task_create(RefreshTaskCallback, 100, LV_TASK_PRIO_MID, this);
 }
 
 Steps::~Steps() {
+  lv_task_del(taskRefresh);
   lv_obj_clean(lv_scr_act());
 }
 
-bool Steps::Refresh() {
+void Steps::Refresh() {
-
   stepsCount = motionController.NbSteps();
 
   lv_label_set_text_fmt(lSteps, "%li", stepsCount);
   lv_obj_align(lSteps, nullptr, LV_ALIGN_CENTER, 0, -20);
 
   lv_arc_set_value(stepsArc, int16_t(500 * stepsCount / settingsController.GetStepsGoal()));
-
-  return running;
 }

src/displayapp/screens/Steps.h

@@ -15,24 +15,23 @@ namespace Pinetime {
     namespace Screens {
 
       class Steps : public Screen {
-        public:
+      public:
-          Steps(DisplayApp* app, Controllers::MotionController& motionController, Controllers::Settings &settingsController);
+        Steps(DisplayApp* app, Controllers::MotionController& motionController, Controllers::Settings& settingsController);
-          ~Steps() override;
+        ~Steps() override;
 
-          bool Refresh() override;
+        void Refresh() override;
 
+      private:
+        Controllers::MotionController& motionController;
+        Controllers::Settings& settingsController;
 
-        private:          
+        lv_obj_t* lSteps;
+        lv_obj_t* lStepsIcon;
+        lv_obj_t* stepsArc;
 
-          Controllers::MotionController& motionController;
+        uint32_t stepsCount;
-          Controllers::Settings& settingsController;
-
-          lv_obj_t * lSteps;
-          lv_obj_t * lStepsIcon;
-          lv_obj_t * stepsArc;
-
-          uint32_t stepsCount;
 
+        lv_task_t* taskRefresh;
       };
     }
   }

src/displayapp/screens/StopWatch.cpp

@@ -48,7 +48,6 @@ static void stop_lap_event_handler(lv_obj_t* obj, lv_event_t event) {
 StopWatch::StopWatch(DisplayApp* app, System::SystemTask& systemTask)
   : Screen(app),
     systemTask {systemTask},
-    running {true},
     currentState {States::Init},
     startTime {},
     oldTimeElapsed {},
@@ -101,9 +100,12 @@ StopWatch::StopWatch(DisplayApp* app, System::SystemTask& systemTask)
   lv_obj_set_style_local_text_color(lapTwoText, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_YELLOW);
   lv_obj_align(lapTwoText, lv_scr_act(), LV_ALIGN_IN_LEFT_MID, 50, 55);
   lv_label_set_text(lapTwoText, "");
+
+  taskRefresh = lv_task_create(RefreshTaskCallback, LV_DISP_DEF_REFR_PERIOD, LV_TASK_PRIO_MID, this);
 }
 
 StopWatch::~StopWatch() {
+  lv_task_del(taskRefresh);
   systemTask.PushMessage(Pinetime::System::Messages::EnableSleeping);
   lv_obj_clean(lv_scr_act());
 }
@@ -149,7 +151,7 @@ void StopWatch::pause() {
   systemTask.PushMessage(Pinetime::System::Messages::EnableSleeping);
 }
 
-bool StopWatch::Refresh() {
+void StopWatch::Refresh() {
   if (currentState == States::Running) {
     timeElapsed = calculateDelta(startTime, xTaskGetTickCount());
     currentTimeSeparated = convertTicksToTimeSegments((oldTimeElapsed + timeElapsed));
@@ -157,7 +159,6 @@ bool StopWatch::Refresh() {
     lv_label_set_text_fmt(time, "%02d:%02d", currentTimeSeparated.mins, currentTimeSeparated.secs);
     lv_label_set_text_fmt(msecTime, "%02d", currentTimeSeparated.hundredths);
   }
-  return running;
 }
 
 void StopWatch::playPauseBtnEventHandler(lv_event_t event) {
@@ -196,8 +197,7 @@ void StopWatch::stopLapBtnEventHandler(lv_event_t event) {
 bool StopWatch::OnButtonPushed() {
   if (currentState == States::Running) {
     pause();
-  } else {
+    return true;
-    running = false;
   }
-  return true;
+  return false;
 }

src/displayapp/screens/StopWatch.h

@@ -64,7 +64,7 @@ namespace Pinetime::Applications::Screens {
   public:
     StopWatch(DisplayApp* app, System::SystemTask& systemTask);
     ~StopWatch() override;
-    bool Refresh() override;
+    void Refresh() override;
 
     void playPauseBtnEventHandler(lv_event_t event);
     void stopLapBtnEventHandler(lv_event_t event);
@@ -77,7 +77,6 @@ namespace Pinetime::Applications::Screens {
   private:
     Pinetime::System::SystemTask& systemTask;
     TickType_t timeElapsed;
-    bool running;
     States currentState;
     TickType_t startTime;
     TickType_t oldTimeElapsed;
@@ -86,5 +85,7 @@ namespace Pinetime::Applications::Screens {
     int lapNr = 0;
     lv_obj_t *time, *msecTime, *btnPlayPause, *btnStopLap, *txtPlayPause, *txtStopLap;
     lv_obj_t *lapOneText, *lapTwoText;
+
+    lv_task_t* taskRefresh;
   };
 }

src/displayapp/screens/SystemInfo.cpp

@@ -65,13 +65,6 @@ SystemInfo::~SystemInfo() {
   lv_obj_clean(lv_scr_act());
 }
 
-bool SystemInfo::Refresh() {
-  if (running) {
-    screens.Refresh();
-  }
-  return running;
-}
-
 bool SystemInfo::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
   return screens.OnTouchEvent(event);
 }

src/displayapp/screens/SystemInfo.h

@@ -30,7 +30,6 @@ namespace Pinetime {
                             Pinetime::Drivers::WatchdogView& watchdog,
                             Pinetime::Controllers::MotionController& motionController);
         ~SystemInfo() override;
-        bool Refresh() override;
         bool OnTouchEvent(TouchEvents event) override;
 
       private:

src/displayapp/screens/Tile.cpp

@@ -123,10 +123,6 @@ void Tile::UpdateScreen() {
   lv_label_set_text(batteryIcon, BatteryIcon::GetBatteryIcon(batteryController.PercentRemaining()));
 }
 
-bool Tile::Refresh() {
-  return running;
-}
-
 void Tile::OnValueChangedEvent(lv_obj_t* obj, uint32_t buttonId) {
   if(obj != btnm1) return;
 

src/displayapp/screens/Tile.h

@@ -30,7 +30,6 @@ namespace Pinetime {
 
         ~Tile() override;
 
-        bool Refresh() override;
         void UpdateScreen();
         void OnValueChangedEvent(lv_obj_t* obj, uint32_t buttonId);
 

src/displayapp/screens/Timer.cpp

@@ -4,10 +4,8 @@
 #include "Symbols.h"
 #include "lvgl/lvgl.h"
 
-
 using namespace Pinetime::Applications::Screens;
 
-
 static void btnEventHandler(lv_obj_t* obj, lv_event_t event) {
   Timer* screen = static_cast<Timer*>(obj->user_data);
   screen->OnButtonEvent(obj, event);
@@ -49,14 +47,10 @@ void Timer::createButtons() {
   lv_obj_set_width(btnSecondsDown, 60);
   txtSDown = lv_label_create(btnSecondsDown, nullptr);
   lv_label_set_text(txtSDown, "-");
-  
 }
 
-
 Timer::Timer(DisplayApp* app, Controllers::TimerController& timerController)
-    : Screen(app),
+  : Screen(app), running {true}, timerController {timerController} {
-      running{true},
-      timerController{timerController} {
 
   time = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_text_font(time, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_76);
@@ -80,19 +74,19 @@ Timer::Timer(DisplayApp* app, Controllers::TimerController& timerController)
     createButtons();
   }
 
+  taskRefresh = lv_task_create(RefreshTaskCallback, LV_DISP_DEF_REFR_PERIOD, LV_TASK_PRIO_MID, this);
 }
 
 Timer::~Timer() {
+  lv_task_del(taskRefresh);
   lv_obj_clean(lv_scr_act());
-  
 }
 
-bool Timer::Refresh() {
+void Timer::Refresh() {
   if (timerController.IsRunning()) {
     uint32_t seconds = timerController.GetTimeRemaining() / 1000;
     lv_label_set_text_fmt(time, "%02lu:%02lu", seconds / 60, seconds % 60);
   }
-  return running;
 }
 
 void Timer::OnButtonEvent(lv_obj_t* obj, lv_event_t event) {
@@ -118,7 +112,6 @@ void Timer::OnButtonEvent(lv_obj_t* obj, lv_event_t event) {
         btnMinutesDown = nullptr;
         lv_obj_del(btnMinutesUp);
         btnMinutesUp = nullptr;
-        
       }
     } else {
       if (!timerController.IsRunning()) {
@@ -153,17 +146,12 @@ void Timer::OnButtonEvent(lv_obj_t* obj, lv_event_t event) {
             secondsToSet--;
           }
           lv_label_set_text_fmt(time, "%02d:%02d", minutesToSet, secondsToSet);
-          
         }
       }
-      
     }
-    
   }
-  
 }
 
-
 void Timer::setDone() {
   lv_label_set_text(time, "00:00");
   lv_label_set_text(txtPlayPause, Symbols::play);

src/displayapp/screens/Timer.h

@@ -9,26 +9,21 @@
 
 namespace Pinetime::Applications::Screens {
 
-  
   class Timer : public Screen {
   public:
-    
+    enum class Modes { Normal, Done };
-    enum class Modes {
-      Normal, Done
-    };
 
     Timer(DisplayApp* app, Controllers::TimerController& timerController);
 
     ~Timer() override;
 
-    bool Refresh() override;
+    void Refresh() override;
 
     void setDone();
 
     void OnButtonEvent(lv_obj_t* obj, lv_event_t event);
 
   private:
-    
     bool running;
     uint8_t secondsToSet = 0;
     uint8_t minutesToSet = 0;
@@ -36,7 +31,9 @@ namespace Pinetime::Applications::Screens {
 
     void createButtons();
 
-    lv_obj_t* time, * msecTime, * btnPlayPause, * txtPlayPause, * btnMinutesUp, * btnMinutesDown, * btnSecondsUp, * btnSecondsDown, * txtMUp,
+    lv_obj_t *time, *msecTime, *btnPlayPause, *txtPlayPause, *btnMinutesUp, *btnMinutesDown, *btnSecondsUp, *btnSecondsDown, *txtMUp,
-        * txtMDown, * txtSUp, * txtSDown;
+      *txtMDown, *txtSUp, *txtSDown;
+
+    lv_task_t* taskRefresh;
   };
 }

src/displayapp/screens/Twos.cpp

@@ -102,10 +102,6 @@ Twos::~Twos() {
   lv_obj_clean(lv_scr_act());
 }
 
-bool Twos::Refresh() {
-  return running;
-}
-
 bool Twos::placeNewTile() {
   std::vector<std::pair<int, int>> availableCells;
   for (int row = 0; row < 4; row++) {

src/displayapp/screens/Twos.h

@@ -14,7 +14,6 @@ namespace Pinetime {
       public:
         Twos(DisplayApp* app);
         ~Twos() override;
-        bool Refresh() override;
 
         bool OnTouchEvent(TouchEvents event) override;
 

src/displayapp/screens/WatchFaceAnalog.cpp

@@ -118,10 +118,13 @@ WatchFaceAnalog::WatchFaceAnalog(Pinetime::Applications::DisplayApp* app,
   lv_style_set_line_rounded(&hour_line_style_trace, LV_STATE_DEFAULT, false);
   lv_obj_add_style(hour_body_trace, LV_LINE_PART_MAIN, &hour_line_style_trace);
 
+  taskRefresh = lv_task_create(RefreshTaskCallback, LV_DISP_DEF_REFR_PERIOD, LV_TASK_PRIO_MID, this);
   UpdateClock();
 }
 
 WatchFaceAnalog::~WatchFaceAnalog() {
+  lv_task_del(taskRefresh);
+
   lv_style_reset(&hour_line_style);
   lv_style_reset(&hour_line_style_trace);
   lv_style_reset(&minute_line_style);
@@ -173,7 +176,7 @@ void WatchFaceAnalog::UpdateClock() {
   }
 }
 
-bool WatchFaceAnalog::Refresh() {
+void WatchFaceAnalog::Refresh() {
   batteryPercentRemaining = batteryController.PercentRemaining();
   if (batteryPercentRemaining.IsUpdated()) {
     auto batteryPercent = batteryPercentRemaining.Get();
@@ -203,6 +206,4 @@ bool WatchFaceAnalog::Refresh() {
       currentDay = day;
     }
   }
-
-  return true;
 }

src/displayapp/screens/WatchFaceAnalog.h

@@ -32,7 +32,7 @@ namespace Pinetime {
 
         ~WatchFaceAnalog() override;
 
-        bool Refresh() override;
+        void Refresh() override;
 
       private:
         uint8_t sHour, sMinute, sSecond;
@@ -81,6 +81,8 @@ namespace Pinetime {
         Controllers::Settings& settingsController;
 
         void UpdateClock();
+
+        lv_task_t* taskRefresh;
       };
     }
   }

src/displayapp/screens/WatchFaceDigital.cpp

@@ -91,13 +91,17 @@ WatchFaceDigital::WatchFaceDigital(DisplayApp* app,
   lv_obj_set_style_local_text_color(stepIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x00FFE7));
   lv_label_set_text(stepIcon, Symbols::shoe);
   lv_obj_align(stepIcon, stepValue, LV_ALIGN_OUT_LEFT_MID, -5, 0);
+
+  taskRefresh = lv_task_create(RefreshTaskCallback, LV_DISP_DEF_REFR_PERIOD, LV_TASK_PRIO_MID, this);
+  Refresh();
 }
 
 WatchFaceDigital::~WatchFaceDigital() {
+  lv_task_del(taskRefresh);
   lv_obj_clean(lv_scr_act());
 }
 
-bool WatchFaceDigital::Refresh() {
+void WatchFaceDigital::Refresh() {
   batteryPercentRemaining = batteryController.PercentRemaining();
   if (batteryPercentRemaining.IsUpdated()) {
     auto batteryPercent = batteryPercentRemaining.Get();
@@ -219,6 +223,4 @@ bool WatchFaceDigital::Refresh() {
     lv_obj_align(stepValue, lv_scr_act(), LV_ALIGN_IN_BOTTOM_RIGHT, 0, 0);
     lv_obj_align(stepIcon, stepValue, LV_ALIGN_OUT_LEFT_MID, -5, 0);
   }
-
-  return running;
 }

src/displayapp/screens/WatchFaceDigital.h

@@ -33,7 +33,7 @@ namespace Pinetime {
                          Controllers::MotionController& motionController);
         ~WatchFaceDigital() override;
 
-        bool Refresh() override;
+        void Refresh() override;
 
       private:
         char displayedChar[5] {};
@@ -72,6 +72,8 @@ namespace Pinetime {
         Controllers::Settings& settingsController;
         Controllers::HeartRateController& heartRateController;
         Controllers::MotionController& motionController;
+
+        lv_task_t* taskRefresh;
       };
     }
   }

src/displayapp/screens/settings/QuickSettings.cpp

@@ -156,7 +156,3 @@ void QuickSettings::OnButtonEvent(lv_obj_t* object, lv_event_t event) {
     app->StartApp(Apps::Settings, DisplayApp::FullRefreshDirections::Up);
   }
 }
-
-bool QuickSettings::Refresh() {
-  return running;
-}

src/displayapp/screens/settings/QuickSettings.h

@@ -27,8 +27,6 @@ namespace Pinetime {
 
         ~QuickSettings() override;
 
-        bool Refresh() override;
-
         void OnButtonEvent(lv_obj_t* object, lv_event_t event);
 
         void UpdateScreen();

src/displayapp/screens/settings/SettingDisplay.cpp

@@ -80,10 +80,6 @@ SettingDisplay::~SettingDisplay() {
   settingsController.SaveSettings();
 }
 
-bool SettingDisplay::Refresh() {
-  return running;
-}
-
 void SettingDisplay::UpdateSelected(lv_obj_t* object, lv_event_t event) {
   if (event == LV_EVENT_CLICKED) {
     for (int i = 0; i < optionsTotal; i++) {

src/displayapp/screens/settings/SettingDisplay.h

@@ -15,7 +15,6 @@ namespace Pinetime {
         SettingDisplay(DisplayApp* app, Pinetime::Controllers::Settings& settingsController);
         ~SettingDisplay() override;
 
-        bool Refresh() override;
         void UpdateSelected(lv_obj_t* object, lv_event_t event);
 
       private:

src/displayapp/screens/settings/SettingPineTimeStyle.cpp

@@ -0,0 +1,318 @@
+#include "SettingPineTimeStyle.h"
+#include <lvgl/lvgl.h>
+#include <displayapp/Colors.h>
+#include "displayapp/DisplayApp.h"
+#include "displayapp/screens/Symbols.h"
+
+using namespace Pinetime::Applications::Screens;
+
+namespace {
+  static void event_handler(lv_obj_t* obj, lv_event_t event) {
+    SettingPineTimeStyle* screen = static_cast<SettingPineTimeStyle*>(obj->user_data);
+    screen->UpdateSelected(obj, event);
+  }
+}
+
+SettingPineTimeStyle::SettingPineTimeStyle(Pinetime::Applications::DisplayApp* app, Pinetime::Controllers::Settings& settingsController)
+  : Screen(app), settingsController {settingsController} {
+  timebar = lv_obj_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, Convert(settingsController.GetPTSColorBG()));
+  lv_obj_set_style_local_radius(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 0);
+  lv_obj_set_size(timebar, 200, 240);
+  lv_obj_align(timebar, lv_scr_act(), LV_ALIGN_IN_TOP_LEFT, 5, 0);
+
+  // Display the time
+
+  timeDD1 = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_text_font(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &open_sans_light);
+  lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, Convert(settingsController.GetPTSColorTime()));
+  lv_label_set_text(timeDD1, "12");
+  lv_obj_align(timeDD1, timebar, LV_ALIGN_IN_TOP_MID, 5, 5);
+
+  timeDD2 = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_text_font(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &open_sans_light);
+  lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, Convert(settingsController.GetPTSColorTime()));
+  lv_label_set_text(timeDD2, "34");
+  lv_obj_align(timeDD2, timebar, LV_ALIGN_IN_BOTTOM_MID, 5, -5);
+
+  timeAMPM = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, Convert(settingsController.GetPTSColorTime()));
+  lv_obj_set_style_local_text_line_space(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, -3);
+  lv_label_set_text(timeAMPM, "A\nM");
+  lv_obj_align(timeAMPM, timebar, LV_ALIGN_IN_BOTTOM_LEFT, 2, -20);
+
+  // Create a 40px wide bar down the right side of the screen
+
+  sidebar = lv_obj_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, Convert(settingsController.GetPTSColorBar()));
+  lv_obj_set_style_local_radius(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 0);
+  lv_obj_set_size(sidebar, 40, 240);
+  lv_obj_align(sidebar, lv_scr_act(), LV_ALIGN_IN_TOP_RIGHT, 0, 0);
+
+  // Display icons
+
+  batteryIcon = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_text_color(batteryIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
+  lv_label_set_text(batteryIcon, Symbols::batteryFull);
+  lv_obj_align(batteryIcon, sidebar, LV_ALIGN_IN_TOP_MID, 0, 2);
+
+  bleIcon = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_text_color(bleIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
+  lv_label_set_text(bleIcon, Symbols::bluetooth);
+  lv_obj_align(bleIcon, sidebar, LV_ALIGN_IN_TOP_MID, 0, 25);
+
+  // Calendar icon
+
+  calendarOuter = lv_obj_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_bg_color(calendarOuter, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
+  lv_obj_set_style_local_radius(calendarOuter, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 0);
+  lv_obj_set_size(calendarOuter, 34, 34);
+  lv_obj_align(calendarOuter, sidebar, LV_ALIGN_CENTER, 0, 0);
+
+  calendarInner = lv_obj_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_bg_color(calendarInner, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0xffffff));
+  lv_obj_set_style_local_radius(calendarInner, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 0);
+  lv_obj_set_size(calendarInner, 27, 27);
+  lv_obj_align(calendarInner, calendarOuter, LV_ALIGN_CENTER, 0, 0);
+
+  calendarBar1 = lv_obj_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_bg_color(calendarBar1, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
+  lv_obj_set_style_local_radius(calendarBar1, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 0);
+  lv_obj_set_size(calendarBar1, 3, 12);
+  lv_obj_align(calendarBar1, calendarOuter, LV_ALIGN_IN_TOP_MID, -6, -3);
+
+  calendarBar2 = lv_obj_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_bg_color(calendarBar2, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
+  lv_obj_set_style_local_radius(calendarBar2, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 0);
+  lv_obj_set_size(calendarBar2, 3, 12);
+  lv_obj_align(calendarBar2, calendarOuter, LV_ALIGN_IN_TOP_MID, 6, -3);
+
+  calendarCrossBar1 = lv_obj_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_bg_color(calendarCrossBar1, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
+  lv_obj_set_style_local_radius(calendarCrossBar1, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 0);
+  lv_obj_set_size(calendarCrossBar1, 8, 3);
+  lv_obj_align(calendarCrossBar1, calendarBar1, LV_ALIGN_IN_BOTTOM_MID, 0, 0);
+
+  calendarCrossBar2 = lv_obj_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_bg_color(calendarCrossBar2, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
+  lv_obj_set_style_local_radius(calendarCrossBar2, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 0);
+  lv_obj_set_size(calendarCrossBar2, 8, 3);
+  lv_obj_align(calendarCrossBar2, calendarBar2, LV_ALIGN_IN_BOTTOM_MID, 0, 0);
+
+  // Display date
+
+  dateDayOfWeek = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_text_color(dateDayOfWeek, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
+  lv_label_set_text(dateDayOfWeek, "THU");
+  lv_obj_align(dateDayOfWeek, sidebar, LV_ALIGN_CENTER, 0, -34);
+
+  dateDay = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_text_color(dateDay, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
+  lv_label_set_text(dateDay, "25");
+  lv_obj_align(dateDay, sidebar, LV_ALIGN_CENTER, 0, 3);
+
+  dateMonth = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_text_color(dateMonth, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
+  lv_label_set_text(dateMonth, "MAR");
+  lv_obj_align(dateMonth, sidebar, LV_ALIGN_CENTER, 0, 32);
+
+  // Step count gauge
+  needle_colors[0] = LV_COLOR_WHITE;
+  stepGauge = lv_gauge_create(lv_scr_act(), nullptr);
+  lv_gauge_set_needle_count(stepGauge, 1, needle_colors);
+  lv_obj_set_size(stepGauge, 40, 40);
+  lv_obj_align(stepGauge, sidebar, LV_ALIGN_IN_BOTTOM_MID, 0, 0);
+  lv_gauge_set_scale(stepGauge, 360, 11, 0);
+  lv_gauge_set_angle_offset(stepGauge, 180);
+  lv_gauge_set_critical_value(stepGauge, (100));
+  lv_gauge_set_range(stepGauge, 0, (100));
+  lv_gauge_set_value(stepGauge, 0, 0);
+
+  lv_obj_set_style_local_pad_right(stepGauge, LV_GAUGE_PART_MAIN, LV_STATE_DEFAULT, 3);
+  lv_obj_set_style_local_pad_left(stepGauge, LV_GAUGE_PART_MAIN, LV_STATE_DEFAULT, 3);
+  lv_obj_set_style_local_pad_bottom(stepGauge, LV_GAUGE_PART_MAIN, LV_STATE_DEFAULT, 3);
+  lv_obj_set_style_local_line_opa(stepGauge, LV_GAUGE_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_COVER);
+  lv_obj_set_style_local_scale_width(stepGauge, LV_GAUGE_PART_MAIN, LV_STATE_DEFAULT, 4);
+  lv_obj_set_style_local_line_width(stepGauge, LV_GAUGE_PART_MAIN, LV_STATE_DEFAULT, 4);
+  lv_obj_set_style_local_line_color(stepGauge, LV_GAUGE_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_BLACK);
+  lv_obj_set_style_local_line_opa(stepGauge, LV_GAUGE_PART_NEEDLE, LV_STATE_DEFAULT, LV_OPA_COVER);
+  lv_obj_set_style_local_line_width(stepGauge, LV_GAUGE_PART_NEEDLE, LV_STATE_DEFAULT, 3);
+  lv_obj_set_style_local_pad_inner(stepGauge, LV_GAUGE_PART_NEEDLE, LV_STATE_DEFAULT, 4);
+
+  backgroundLabel = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_set_click(backgroundLabel, true);
+  lv_label_set_long_mode(backgroundLabel, LV_LABEL_LONG_CROP);
+  lv_obj_set_size(backgroundLabel, 240, 240);
+  lv_obj_set_pos(backgroundLabel, 0, 0);
+  lv_label_set_text(backgroundLabel, "");
+
+  btnNextTime = lv_btn_create(lv_scr_act(), nullptr);
+  btnNextTime->user_data = this;
+  lv_obj_set_size(btnNextTime, 60, 60);
+  lv_obj_align(btnNextTime, lv_scr_act(), LV_ALIGN_IN_RIGHT_MID, -15, -80);
+  lv_obj_set_style_local_bg_opa(btnNextTime, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_30);
+  lv_obj_set_style_local_value_str(btnNextTime, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, ">");
+  lv_obj_set_event_cb(btnNextTime, event_handler);
+
+  btnPrevTime = lv_btn_create(lv_scr_act(), nullptr);
+  btnPrevTime->user_data = this;
+  lv_obj_set_size(btnPrevTime, 60, 60);
+  lv_obj_align(btnPrevTime, lv_scr_act(), LV_ALIGN_IN_LEFT_MID, 15, -80);
+  lv_obj_set_style_local_bg_opa(btnPrevTime, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_30);
+  lv_obj_set_style_local_value_str(btnPrevTime, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, "<");
+  lv_obj_set_event_cb(btnPrevTime, event_handler);
+
+  btnNextBar = lv_btn_create(lv_scr_act(), nullptr);
+  btnNextBar->user_data = this;
+  lv_obj_set_size(btnNextBar, 60, 60);
+  lv_obj_align(btnNextBar, lv_scr_act(), LV_ALIGN_IN_RIGHT_MID, -15, 0);
+  lv_obj_set_style_local_bg_opa(btnNextBar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_30);
+  lv_obj_set_style_local_value_str(btnNextBar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, ">");
+  lv_obj_set_event_cb(btnNextBar, event_handler);
+
+  btnPrevBar = lv_btn_create(lv_scr_act(), nullptr);
+  btnPrevBar->user_data = this;
+  lv_obj_set_size(btnPrevBar, 60, 60);
+  lv_obj_align(btnPrevBar, lv_scr_act(), LV_ALIGN_IN_LEFT_MID, 15, 0);
+  lv_obj_set_style_local_bg_opa(btnPrevBar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_30);
+  lv_obj_set_style_local_value_str(btnPrevBar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, "<");
+  lv_obj_set_event_cb(btnPrevBar, event_handler);
+
+  btnNextBG = lv_btn_create(lv_scr_act(), nullptr);
+  btnNextBG->user_data = this;
+  lv_obj_set_size(btnNextBG, 60, 60);
+  lv_obj_align(btnNextBG, lv_scr_act(), LV_ALIGN_IN_RIGHT_MID, -15, 80);
+  lv_obj_set_style_local_bg_opa(btnNextBG, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_30);
+  lv_obj_set_style_local_value_str(btnNextBG, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, ">");
+  lv_obj_set_event_cb(btnNextBG, event_handler);
+
+  btnPrevBG = lv_btn_create(lv_scr_act(), nullptr);
+  btnPrevBG->user_data = this;
+  lv_obj_set_size(btnPrevBG, 60, 60);
+  lv_obj_align(btnPrevBG, lv_scr_act(), LV_ALIGN_IN_LEFT_MID, 15, 80);
+  lv_obj_set_style_local_bg_opa(btnPrevBG, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_30);
+  lv_obj_set_style_local_value_str(btnPrevBG, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, "<");
+  lv_obj_set_event_cb(btnPrevBG, event_handler);
+
+  btnReset = lv_btn_create(lv_scr_act(), nullptr);
+  btnReset->user_data = this;
+  lv_obj_set_size(btnReset, 60, 60);
+  lv_obj_align(btnReset, lv_scr_act(), LV_ALIGN_CENTER, 0, 80);
+  lv_obj_set_style_local_bg_opa(btnReset, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_30);
+  lv_obj_set_style_local_value_str(btnReset, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, "Rst");
+  lv_obj_set_event_cb(btnReset, event_handler);
+
+  btnRandom = lv_btn_create(lv_scr_act(), nullptr);
+  btnRandom->user_data = this;
+  lv_obj_set_size(btnRandom, 60, 60);
+  lv_obj_align(btnRandom, lv_scr_act(), LV_ALIGN_CENTER, 0, 0);
+  lv_obj_set_style_local_bg_opa(btnRandom, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_30);
+  lv_obj_set_style_local_value_str(btnRandom, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, "Rnd");
+  lv_obj_set_event_cb(btnRandom, event_handler);
+}
+
+SettingPineTimeStyle::~SettingPineTimeStyle() {
+  lv_obj_clean(lv_scr_act());
+  settingsController.SaveSettings();
+}
+
+void SettingPineTimeStyle::UpdateSelected(lv_obj_t* object, lv_event_t event) {
+  auto valueTime = settingsController.GetPTSColorTime();
+  auto valueBar = settingsController.GetPTSColorBar();
+  auto valueBG = settingsController.GetPTSColorBG();
+
+  if (event == LV_EVENT_CLICKED) {
+    if (object == btnNextTime) {
+      valueTime = GetNext(valueTime);
+
+      settingsController.SetPTSColorTime(valueTime);
+      lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, Convert(valueTime));
+      lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, Convert(valueTime));
+      lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, Convert(valueTime));
+    }
+    if (object == btnPrevTime) {
+      valueTime = GetPrevious(valueTime);
+      settingsController.SetPTSColorTime(valueTime);
+      lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, Convert(valueTime));
+      lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, Convert(valueTime));
+      lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, Convert(valueTime));
+    }
+    if (object == btnNextBar) {
+      valueBar = GetNext(valueBar);
+      if(valueBar == Controllers::Settings::Colors::Black)
+        valueBar = GetNext(valueBar);
+      settingsController.SetPTSColorBar(valueBar);
+      lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, Convert(valueBar));
+    }
+    if (object == btnPrevBar) {
+      valueBar = GetPrevious(valueBar);
+      if(valueBar == Controllers::Settings::Colors::Black)
+        valueBar = GetPrevious(valueBar);
+      settingsController.SetPTSColorBar(valueBar);
+      lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, Convert(valueBar));
+    }
+    if (object == btnNextBG) {
+      valueBG = GetNext(valueBG);
+      settingsController.SetPTSColorBG(valueBG);
+      lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, Convert(valueBG));
+    }
+    if (object == btnPrevBG) {
+      valueBG = GetPrevious(valueBG);
+      settingsController.SetPTSColorBG(valueBG);
+      lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, Convert(valueBG));
+    }
+    if (object == btnReset) {
+      settingsController.SetPTSColorTime(Controllers::Settings::Colors::Teal);
+      lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, Convert(Controllers::Settings::Colors::Teal));
+      lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, Convert(Controllers::Settings::Colors::Teal));
+      lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, Convert(Controllers::Settings::Colors::Teal));
+      settingsController.SetPTSColorBar(Controllers::Settings::Colors::Teal);
+      lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, Convert(Controllers::Settings::Colors::Teal));
+      settingsController.SetPTSColorBG(Controllers::Settings::Colors::Black);
+      lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, Convert(Controllers::Settings::Colors::Black));
+    }
+    if (object == btnRandom) {
+      uint8_t randTime = rand() % 17;
+      uint8_t randBar = rand() % 17;
+      uint8_t randBG = rand() % 17;
+      // Check if the time color is the same as its background, or if the sidebar is black. If so, change them to more useful values.
+      if (randTime == randBG) {
+        randBG += 1;
+      }
+      if (randBar == 3) {
+        randBar -= 1;
+      }
+      settingsController.SetPTSColorTime(static_cast<Controllers::Settings::Colors>(randTime));
+      lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, Convert(static_cast<Controllers::Settings::Colors>(randTime)));
+      lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT,  Convert(static_cast<Controllers::Settings::Colors>(randTime)));
+      lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT,  Convert(static_cast<Controllers::Settings::Colors>(randTime)));
+      settingsController.SetPTSColorBar(static_cast<Controllers::Settings::Colors>(randBar));
+      lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT,  Convert(static_cast<Controllers::Settings::Colors>(randBar)));
+      settingsController.SetPTSColorBG(static_cast<Controllers::Settings::Colors>(randBG));
+      lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT,  Convert(static_cast<Controllers::Settings::Colors>(randBG)));
+    }
+  }
+}
+
+Pinetime::Controllers::Settings::Colors SettingPineTimeStyle::GetNext(Pinetime::Controllers::Settings::Colors color) {
+  auto colorAsInt = static_cast<uint8_t>(color);
+  Pinetime::Controllers::Settings::Colors nextColor;
+  if (colorAsInt < 16) {
+    nextColor = static_cast<Controllers::Settings::Colors>(colorAsInt + 1);
+  } else {
+    nextColor = static_cast<Controllers::Settings::Colors>(0);
+  }
+  return nextColor;
+}
+
+Pinetime::Controllers::Settings::Colors SettingPineTimeStyle::GetPrevious(Pinetime::Controllers::Settings::Colors color) {
+  auto colorAsInt = static_cast<uint8_t>(color);
+  Pinetime::Controllers::Settings::Colors prevColor;
+
+  if (colorAsInt > 0) {
+    prevColor = static_cast<Controllers::Settings::Colors>(colorAsInt - 1);
+  } else {
+    prevColor = static_cast<Controllers::Settings::Colors>(16);
+  }
+  return prevColor;
+}

src/displayapp/screens/settings/SettingPineTimeStyle.h

@@ -0,0 +1,56 @@
+#pragma once
+
+#include <cstdint>
+#include <lvgl/lvgl.h>
+#include "components/settings/Settings.h"
+#include "displayapp/screens/Screen.h"
+
+namespace Pinetime {
+
+  namespace Applications {
+    namespace Screens {
+
+      class SettingPineTimeStyle : public Screen{
+        public:
+          SettingPineTimeStyle(DisplayApp* app, Pinetime::Controllers::Settings &settingsController);
+          ~SettingPineTimeStyle() override;
+
+          void UpdateSelected(lv_obj_t *object, lv_event_t event);
+         
+        private:          
+          Controllers::Settings& settingsController;
+
+          Pinetime::Controllers::Settings::Colors GetNext(Controllers::Settings::Colors color);
+          Pinetime::Controllers::Settings::Colors GetPrevious(Controllers::Settings::Colors color);
+
+          lv_obj_t * btnNextTime;
+          lv_obj_t * btnPrevTime;
+          lv_obj_t * btnNextBar;
+          lv_obj_t * btnPrevBar;
+          lv_obj_t * btnNextBG;
+          lv_obj_t * btnPrevBG;
+          lv_obj_t * btnReset;
+          lv_obj_t * btnRandom;
+          lv_obj_t * timebar;
+          lv_obj_t * sidebar;
+          lv_obj_t * timeDD1;
+          lv_obj_t * timeDD2;
+          lv_obj_t * timeAMPM;
+          lv_obj_t * dateDayOfWeek;
+          lv_obj_t * dateDay;
+          lv_obj_t * dateMonth;
+          lv_obj_t * backgroundLabel;
+          lv_obj_t * batteryIcon;
+          lv_obj_t * bleIcon;
+          lv_obj_t * calendarOuter;
+          lv_obj_t * calendarInner;
+          lv_obj_t * calendarBar1;
+          lv_obj_t * calendarBar2;
+          lv_obj_t * calendarCrossBar1;
+          lv_obj_t * calendarCrossBar2;
+          lv_obj_t * stepGauge;
+          lv_color_t needle_colors[1];
+      };
+    }
+  }
+}

src/displayapp/screens/settings/SettingSteps.cpp

@@ -70,11 +70,6 @@ SettingSteps::~SettingSteps() {
   settingsController.SaveSettings();
 }
 
-bool SettingSteps::Refresh() {
-  return running;
-}
-
-
 void SettingSteps::UpdateSelected(lv_obj_t *object, lv_event_t event) {
   uint32_t value = settingsController.GetStepsGoal();
   if(object == btnPlus && (event == LV_EVENT_PRESSED)) {

src/displayapp/screens/settings/SettingSteps.h

@@ -10,22 +10,19 @@ namespace Pinetime {
   namespace Applications {
     namespace Screens {
 
-      class SettingSteps : public Screen{
+      class SettingSteps : public Screen {
-        public:
+      public:
-          SettingSteps(DisplayApp* app, Pinetime::Controllers::Settings &settingsController);
+        SettingSteps(DisplayApp* app, Pinetime::Controllers::Settings& settingsController);
-          ~SettingSteps() override;
+        ~SettingSteps() override;
 
-          bool Refresh() override;
+        void UpdateSelected(lv_obj_t* object, lv_event_t event);
-          void UpdateSelected(lv_obj_t *object, lv_event_t event);
 
-        private:          
+      private:
-
+        Controllers::Settings& settingsController;
-          Controllers::Settings& settingsController;
-
-          lv_obj_t * stepValue;
-          lv_obj_t * btnPlus;
-          lv_obj_t * btnMinus;
 
+        lv_obj_t* stepValue;
+        lv_obj_t* btnPlus;
+        lv_obj_t* btnMinus;
       };
     }
   }

src/displayapp/screens/settings/SettingTimeFormat.cpp

@@ -64,10 +64,6 @@ SettingTimeFormat::~SettingTimeFormat() {
   settingsController.SaveSettings();
 }
 
-bool SettingTimeFormat::Refresh() {
-  return running;
-}
-
 void SettingTimeFormat::UpdateSelected(lv_obj_t* object, lv_event_t event) {
   if (event == LV_EVENT_VALUE_CHANGED) {
     for (int i = 0; i < optionsTotal; i++) {

src/displayapp/screens/settings/SettingTimeFormat.h

@@ -15,7 +15,6 @@ namespace Pinetime {
         SettingTimeFormat(DisplayApp* app, Pinetime::Controllers::Settings& settingsController);
         ~SettingTimeFormat() override;
 
-        bool Refresh() override;
         void UpdateSelected(lv_obj_t* object, lv_event_t event);
 
       private:

src/displayapp/screens/settings/SettingWakeUp.cpp

@@ -72,10 +72,6 @@ SettingWakeUp::~SettingWakeUp() {
   settingsController.SaveSettings();
 }
 
-bool SettingWakeUp::Refresh() {
-  return running;
-}
-
 void SettingWakeUp::UpdateSelected(lv_obj_t* object, lv_event_t event) {
   using WakeUpMode = Pinetime::Controllers::Settings::WakeUpMode;
   if (event == LV_EVENT_VALUE_CHANGED && !ignoringEvents) {

src/displayapp/screens/settings/SettingWakeUp.h

@@ -15,7 +15,6 @@ namespace Pinetime {
         SettingWakeUp(DisplayApp* app, Pinetime::Controllers::Settings& settingsController);
         ~SettingWakeUp() override;
 
-        bool Refresh() override;
         void UpdateSelected(lv_obj_t* object, lv_event_t event);
 
       private:

src/displayapp/screens/settings/SettingWatchFace.cpp

@@ -75,10 +75,6 @@ SettingWatchFace::~SettingWatchFace() {
   settingsController.SaveSettings();
 }
 
-bool SettingWatchFace::Refresh() {
-  return running;
-}
-
 void SettingWatchFace::UpdateSelected(lv_obj_t* object, lv_event_t event) {
   if (event == LV_EVENT_VALUE_CHANGED) {
     for (uint8_t i = 0; i < optionsTotal; i++) {

src/displayapp/screens/settings/SettingWatchFace.h

@@ -15,7 +15,6 @@ namespace Pinetime {
         SettingWatchFace(DisplayApp* app, Pinetime::Controllers::Settings& settingsController);
         ~SettingWatchFace() override;
 
-        bool Refresh() override;
         void UpdateSelected(lv_obj_t* object, lv_event_t event);
 
       private:

src/displayapp/screens/settings/Settings.cpp

@@ -18,6 +18,9 @@ Settings::Settings(Pinetime::Applications::DisplayApp* app, Pinetime::Controller
               },
               [this]() -> std::unique_ptr<Screen> {
                 return CreateScreen2();
+              },
+              [this]() -> std::unique_ptr<Screen> {
+                return CreateScreen3();
               }},
              Screens::ScreenListModes::UpDown} {
 }
@@ -26,13 +29,6 @@ Settings::~Settings() {
   lv_obj_clean(lv_scr_act());
 }
 
-bool Settings::Refresh() {
-
-  if (running)
-    running = screens.Refresh();
-  return running;
-}
-
 bool Settings::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
   return screens.OnTouchEvent(event);
 }
@@ -46,7 +42,7 @@ std::unique_ptr<Screen> Settings::CreateScreen1() {
     {Symbols::home, "Watch face", Apps::SettingWatchFace},
   }};
 
-  return std::make_unique<Screens::List>(0, 2, app, settingsController, applications);
+  return std::make_unique<Screens::List>(0, 3, app, settingsController, applications);
 }
 
 std::unique_ptr<Screen> Settings::CreateScreen2() {
@@ -58,5 +54,17 @@ std::unique_ptr<Screen> Settings::CreateScreen2() {
     {Symbols::list, "About", Apps::SysInfo},
   }};
 
-  return std::make_unique<Screens::List>(1, 2, app, settingsController, applications);
+  return std::make_unique<Screens::List>(1, 3, app, settingsController, applications);
+}
+
+std::unique_ptr<Screen> Settings::CreateScreen3() {
+
+  std::array<Screens::List::Applications, 4> applications {{
+    {Symbols::paintbrush, "PTS Colors", Apps::SettingPineTimeStyle},
+    {Symbols::none, "None", Apps::None},
+    {Symbols::none, "None", Apps::None},
+    {Symbols::none, "None", Apps::None},
+  }};
+
+  return std::make_unique<Screens::List>(2, 3, app, settingsController, applications);
 }

src/displayapp/screens/settings/Settings.h

@@ -14,17 +14,16 @@ namespace Pinetime {
         Settings(DisplayApp* app, Pinetime::Controllers::Settings& settingsController);
         ~Settings() override;
 
-        bool Refresh() override;
-
         bool OnTouchEvent(Pinetime::Applications::TouchEvents event) override;
 
       private:
         Controllers::Settings& settingsController;
 
-        ScreenList<2> screens;
+        ScreenList<3> screens;
 
         std::unique_ptr<Screen> CreateScreen1();
         std::unique_ptr<Screen> CreateScreen2();
+        std::unique_ptr<Screen> CreateScreen3();
       };
     }
   }

src/systemtask/SystemTask.cpp

@@ -240,12 +240,14 @@ void SystemTask::Work() {
           isDimmed = false;
           break;
         case Messages::TouchWakeUp: {
-          auto touchInfo = touchPanel.GetTouchInfo();
+          if(touchHandler.GetNewTouchInfo()) {
-          if (touchInfo.touching and ((touchInfo.gesture == Pinetime::Drivers::Cst816S::Gestures::DoubleTap and
+            auto gesture = touchHandler.GestureGet();
-                                      settingsController.isWakeUpModeOn(Pinetime::Controllers::Settings::WakeUpMode::DoubleTap)) or
+            if (gesture != Pinetime::Drivers::Cst816S::Gestures::None and ((gesture == Pinetime::Drivers::Cst816S::Gestures::DoubleTap and
-                                     (touchInfo.gesture == Pinetime::Drivers::Cst816S::Gestures::SingleTap and
+                                settingsController.isWakeUpModeOn(Pinetime::Controllers::Settings::WakeUpMode::DoubleTap)) or
-                                      settingsController.isWakeUpModeOn(Pinetime::Controllers::Settings::WakeUpMode::SingleTap)))) {
+                                (gesture == Pinetime::Drivers::Cst816S::Gestures::SingleTap and
-            GoToRunning();
+                                settingsController.isWakeUpModeOn(Pinetime::Controllers::Settings::WakeUpMode::SingleTap)))) {
+              GoToRunning();
+            }
           }
         } break;
         case Messages::GoToSleep: