diff --git a/src/components/alarm/AlarmController.h b/src/components/alarm/AlarmController.h
index 91f60f5a..8ac0de9a 100644
--- a/src/components/alarm/AlarmController.h
+++ b/src/components/alarm/AlarmController.h
@@ -26,6 +26,7 @@ namespace Pinetime {
   namespace System {
     class SystemTask;
   }
+
   namespace Controllers {
     class AlarmController {
     public:
@@ -40,18 +41,23 @@ namespace Pinetime {
       void StopAlerting();
       enum class AlarmState { Not_Set, Set, Alerting };
       enum class RecurType { None, Daily, Weekdays };
+
       uint8_t Hours() const {
         return hours;
       }
+
       uint8_t Minutes() const {
         return minutes;
       }
+
       AlarmState State() const {
         return state;
       }
+
       RecurType Recurrence() const {
         return recurrence;
       }
+
       void SetRecurrence(RecurType recurType) {
         recurrence = recurType;
       }
diff --git a/src/components/battery/BatteryController.h b/src/components/battery/BatteryController.h
index 627ca7d4..b47b77cc 100644
--- a/src/components/battery/BatteryController.h
+++ b/src/components/battery/BatteryController.h
@@ -17,6 +17,7 @@ namespace Pinetime {
       uint8_t PercentRemaining() const {
         return percentRemaining;
       }
+
       bool BatteryIsLow() const {
         return percentRemaining <= lowBatteryThreshold;
       }
diff --git a/src/components/ble/AlertNotificationService.h b/src/components/ble/AlertNotificationService.h
index 5c7d428c..7f5273ac 100644
--- a/src/components/ble/AlertNotificationService.h
+++ b/src/components/ble/AlertNotificationService.h
@@ -16,6 +16,7 @@ namespace Pinetime {
   namespace System {
     class SystemTask;
   }
+
   namespace Controllers {
     class NotificationManager;
 
diff --git a/src/components/ble/BatteryInformationService.h b/src/components/ble/BatteryInformationService.h
index c6fc52e4..cc4d2604 100644
--- a/src/components/ble/BatteryInformationService.h
+++ b/src/components/ble/BatteryInformationService.h
@@ -9,8 +9,10 @@ namespace Pinetime {
   namespace System {
     class SystemTask;
   }
+
   namespace Controllers {
     class Battery;
+
     class BatteryInformationService {
     public:
       BatteryInformationService(Controllers::Battery& batteryController);
diff --git a/src/components/ble/BleController.h b/src/components/ble/BleController.h
index 675ede2d..de0a1bc2 100644
--- a/src/components/ble/BleController.h
+++ b/src/components/ble/BleController.h
@@ -24,6 +24,7 @@ namespace Pinetime {
       void StopFirmwareUpdate();
       void FirmwareUpdateTotalBytes(uint32_t totalBytes);
       void FirmwareUpdateCurrentBytes(uint32_t currentBytes);
+
       void State(FirmwareUpdateStates state) {
         firmwareUpdateState = state;
       }
@@ -31,12 +32,15 @@ namespace Pinetime {
       bool IsFirmwareUpdating() const {
         return isFirmwareUpdating;
       }
+
       uint32_t FirmwareUpdateTotalBytes() const {
         return firmwareUpdateTotalBytes;
       }
+
       uint32_t FirmwareUpdateCurrentBytes() const {
         return firmwareUpdateCurrentBytes;
       }
+
       FirmwareUpdateStates State() const {
         return firmwareUpdateState;
       }
@@ -44,15 +48,19 @@ namespace Pinetime {
       void Address(BleAddress&& addr) {
         address = addr;
       }
+
       const BleAddress& Address() const {
         return address;
       }
+
       void AddressType(AddressTypes t) {
         addressType = t;
       }
+
       void SetPairingKey(uint32_t k) {
         pairingKey = k;
       }
+
       uint32_t GetPairingKey() const {
         return pairingKey;
       }
diff --git a/src/components/ble/CurrentTimeClient.h b/src/components/ble/CurrentTimeClient.h
index c718d2d9..0a3a8735 100644
--- a/src/components/ble/CurrentTimeClient.h
+++ b/src/components/ble/CurrentTimeClient.h
@@ -19,12 +19,15 @@ namespace Pinetime {
       bool OnDiscoveryEvent(uint16_t connectionHandle, const ble_gatt_error* error, const ble_gatt_svc* service);
       int OnCharacteristicDiscoveryEvent(uint16_t conn_handle, const ble_gatt_error* error, const ble_gatt_chr* characteristic);
       int OnCurrentTimeReadResult(uint16_t conn_handle, const ble_gatt_error* error, const ble_gatt_attr* attribute);
+
       static constexpr const ble_uuid16_t* Uuid() {
         return &CurrentTimeClient::ctsServiceUuid;
       }
+
       static constexpr const ble_uuid16_t* CurrentTimeCharacteristicUuid() {
         return &CurrentTimeClient::currentTimeCharacteristicUuid;
       }
+
       void Discover(uint16_t connectionHandle, std::function<void(uint16_t)> lambda) override;
 
     private:
diff --git a/src/components/ble/DfuService.h b/src/components/ble/DfuService.h
index 4708a4a6..b56911b9 100644
--- a/src/components/ble/DfuService.h
+++ b/src/components/ble/DfuService.h
@@ -13,9 +13,11 @@ namespace Pinetime {
   namespace System {
     class SystemTask;
   }
+
   namespace Drivers {
     class SpiNorFlash;
   }
+
   namespace Controllers {
     class Ble;
 
@@ -46,10 +48,12 @@ namespace Pinetime {
         void OnNotificationTimer();
         void Reset();
       };
+
       class DfuImage {
       public:
         DfuImage(Pinetime::Drivers::SpiNorFlash& spiNorFlash) : spiNorFlash {spiNorFlash} {
         }
+
         void Init(size_t chunkSize, size_t totalSize, uint16_t expectedCrc);
         void Erase();
         void Append(uint8_t* data, size_t size);
diff --git a/src/components/ble/FSService.h b/src/components/ble/FSService.h
index 828925a8..b2299623 100644
--- a/src/components/ble/FSService.h
+++ b/src/components/ble/FSService.h
@@ -11,8 +11,10 @@ namespace Pinetime {
   namespace System {
     class SystemTask;
   }
+
   namespace Controllers {
     class Ble;
+
     class FSService {
     public:
       FSService(Pinetime::System::SystemTask& systemTask, Pinetime::Controllers::FS& fs);
@@ -71,6 +73,7 @@ namespace Pinetime {
       FSState state;
       char filepath[maxpathlen]; // TODO ..ugh fixed filepath len
       int fileSize;
+
       using ReadHeader = struct __attribute__((packed)) {
         commands command;
         uint8_t padding;
@@ -89,6 +92,7 @@ namespace Pinetime {
         uint32_t chunklen;
         uint8_t chunk[];
       };
+
       using ReadPacing = struct __attribute__((packed)) {
         commands command;
         uint8_t status;
@@ -124,6 +128,7 @@ namespace Pinetime {
         uint32_t dataSize;
         uint8_t data[];
       };
+
       using ListDirHeader = struct __attribute__((packed)) {
         commands command;
         uint8_t padding;
@@ -171,6 +176,7 @@ namespace Pinetime {
         commands command;
         uint8_t status;
       };
+
       using MoveHeader = struct __attribute__((packed)) {
         commands command;
         uint8_t padding;
diff --git a/src/components/ble/HeartRateService.h b/src/components/ble/HeartRateService.h
index 4e4a5a42..a60c12f6 100644
--- a/src/components/ble/HeartRateService.h
+++ b/src/components/ble/HeartRateService.h
@@ -10,8 +10,10 @@ namespace Pinetime {
   namespace System {
     class SystemTask;
   }
+
   namespace Controllers {
     class HeartRateController;
+
     class HeartRateService {
     public:
       HeartRateService(Pinetime::System::SystemTask& system, Controllers::HeartRateController& heartRateController);
diff --git a/src/components/ble/ImmediateAlertService.h b/src/components/ble/ImmediateAlertService.h
index 1f778acd..c54b63ec 100644
--- a/src/components/ble/ImmediateAlertService.h
+++ b/src/components/ble/ImmediateAlertService.h
@@ -9,8 +9,10 @@ namespace Pinetime {
   namespace System {
     class SystemTask;
   }
+
   namespace Controllers {
     class NotificationManager;
+
     class ImmediateAlertService {
     public:
       enum class Levels : uint8_t { NoAlert = 0, MildAlert = 1, HighAlert = 2 };
diff --git a/src/components/ble/MotionService.h b/src/components/ble/MotionService.h
index 1b4ac0a3..c9483766 100644
--- a/src/components/ble/MotionService.h
+++ b/src/components/ble/MotionService.h
@@ -10,8 +10,10 @@ namespace Pinetime {
   namespace System {
     class SystemTask;
   }
+
   namespace Controllers {
     class MotionController;
+
     class MotionService {
     public:
       MotionService(Pinetime::System::SystemTask& system, Controllers::MotionController& motionController);
diff --git a/src/components/ble/MusicService.h b/src/components/ble/MusicService.h
index 047d0d26..9f1042cc 100644
--- a/src/components/ble/MusicService.h
+++ b/src/components/ble/MusicService.h
@@ -30,6 +30,7 @@ namespace Pinetime {
   namespace System {
     class SystemTask;
   }
+
   namespace Controllers {
     class MusicService {
     public:
diff --git a/src/components/ble/NavigationService.h b/src/components/ble/NavigationService.h
index c0c77f35..78e7b888 100644
--- a/src/components/ble/NavigationService.h
+++ b/src/components/ble/NavigationService.h
@@ -30,6 +30,7 @@ namespace Pinetime {
   namespace System {
     class SystemTask;
   }
+
   namespace Controllers {
 
     class NavigationService {
diff --git a/src/components/ble/NimbleController.h b/src/components/ble/NimbleController.h
index 000231fe..8f1dfed7 100644
--- a/src/components/ble/NimbleController.h
+++ b/src/components/ble/NimbleController.h
@@ -58,12 +58,15 @@ namespace Pinetime {
       Pinetime::Controllers::MusicService& music() {
         return musicService;
       };
+
       Pinetime::Controllers::NavigationService& navigation() {
         return navService;
       };
+
       Pinetime::Controllers::AlertNotificationService& alertService() {
         return anService;
       };
+
       Pinetime::Controllers::WeatherService& weather() {
         return weatherService;
       };
diff --git a/src/components/ble/NotificationManager.h b/src/components/ble/NotificationManager.h
index 4c199dbf..09b5a561 100644
--- a/src/components/ble/NotificationManager.h
+++ b/src/components/ble/NotificationManager.h
@@ -51,9 +51,11 @@ namespace Pinetime {
       static constexpr size_t MaximumMessageSize() {
         return MessageSize;
       };
+
       bool IsEmpty() const {
         return size == 0;
       }
+
       size_t NbNotifications() const;
 
     private:
diff --git a/src/components/ble/weather/WeatherService.h b/src/components/ble/weather/WeatherService.h
index e37417da..786cad89 100644
--- a/src/components/ble/weather/WeatherService.h
+++ b/src/components/ble/weather/WeatherService.h
@@ -39,6 +39,7 @@ namespace Pinetime {
   namespace System {
     class SystemTask;
   }
+
   namespace Controllers {
 
     class WeatherService {
diff --git a/src/components/datetime/DateTimeController.h b/src/components/datetime/DateTimeController.h
index 24a3ed40..57ee3510 100644
--- a/src/components/datetime/DateTimeController.h
+++ b/src/components/datetime/DateTimeController.h
@@ -9,6 +9,7 @@ namespace Pinetime {
   namespace System {
     class SystemTask;
   }
+
   namespace Controllers {
     class DateTime {
     public:
@@ -51,24 +52,31 @@ namespace Pinetime {
       void SetTimeZone(int8_t timezone, int8_t dst);
 
       void UpdateTime(uint32_t systickCounter);
+
       uint16_t Year() const {
         return year;
       }
+
       Months Month() const {
         return month;
       }
+
       uint8_t Day() const {
         return day;
       }
+
       Days DayOfWeek() const {
         return dayOfWeek;
       }
+
       uint8_t Hours() const {
         return hour;
       }
+
       uint8_t Minutes() const {
         return minute;
       }
+
       uint8_t Seconds() const {
         return second;
       }
@@ -117,9 +125,11 @@ namespace Pinetime {
       std::chrono::time_point<std::chrono::system_clock, std::chrono::nanoseconds> CurrentDateTime() const {
         return currentDateTime;
       }
+
       std::chrono::time_point<std::chrono::system_clock, std::chrono::nanoseconds> UTCDateTime() const {
         return currentDateTime - std::chrono::seconds((tzOffset + dstOffset) * 15 * 60);
       }
+
       std::chrono::seconds Uptime() const {
         return uptime;
       }
diff --git a/src/components/fs/FS.h b/src/components/fs/FS.h
index 87fcdc23..9730e474 100644
--- a/src/components/fs/FS.h
+++ b/src/components/fs/FS.h
@@ -35,6 +35,7 @@ namespace Pinetime {
       static size_t getSize() {
         return size;
       }
+
       static size_t getBlockSize() {
         return blockSize;
       }
diff --git a/src/components/gfx/Gfx.h b/src/components/gfx/Gfx.h
index 54c4a8b7..17c248f7 100644
--- a/src/components/gfx/Gfx.h
+++ b/src/components/gfx/Gfx.h
@@ -10,6 +10,7 @@ namespace Pinetime {
   namespace Drivers {
     class St7789;
   }
+
   namespace Components {
     class Gfx : public Pinetime::Drivers::BufferProvider {
     public:
@@ -33,9 +34,11 @@ namespace Pinetime {
       static constexpr uint8_t height = 240;
 
       enum class Action { None, FillRectangle, DrawChar };
+
       struct State {
         State() : busy {false}, action {Action::None}, remainingIterations {0}, currentIteration {0} {
         }
+
         volatile bool busy;
         volatile Action action;
         volatile uint16_t remainingIterations;
diff --git a/src/components/heartrate/HeartRateController.h b/src/components/heartrate/HeartRateController.h
index a63f1a70..f66c79f8 100644
--- a/src/components/heartrate/HeartRateController.h
+++ b/src/components/heartrate/HeartRateController.h
@@ -7,9 +7,11 @@ namespace Pinetime {
   namespace Applications {
     class HeartRateTask;
   }
+
   namespace System {
     class SystemTask;
   }
+
   namespace Controllers {
     class HeartRateController {
     public:
@@ -21,9 +23,11 @@ namespace Pinetime {
       void Update(States newState, uint8_t heartRate);
 
       void SetHeartRateTask(Applications::HeartRateTask* task);
+
       States State() const {
         return state;
       }
+
       uint8_t HeartRate() const {
         return heartRate;
       }
diff --git a/src/components/motion/MotionController.h b/src/components/motion/MotionController.h
index f80b11b9..857bd45a 100644
--- a/src/components/motion/MotionController.h
+++ b/src/components/motion/MotionController.h
@@ -19,12 +19,15 @@ namespace Pinetime {
       int16_t X() const {
         return x;
       }
+
       int16_t Y() const {
         return y;
       }
+
       int16_t Z() const {
         return z;
       }
+
       uint32_t NbSteps() const {
         return nbSteps;
       }
@@ -32,6 +35,7 @@ namespace Pinetime {
       void ResetTrip() {
         currentTripSteps = 0;
       }
+
       uint32_t GetTripSteps() const {
         return currentTripSteps;
       }
@@ -40,6 +44,7 @@ namespace Pinetime {
       bool Should_RaiseWake(bool isSleeping);
       int32_t currentShakeSpeed();
       void IsSensorOk(bool isOk);
+
       bool IsSensorOk() const {
         return isSensorOk;
       }
diff --git a/src/components/settings/Settings.h b/src/components/settings/Settings.h
index 93f861f3..d1e71656 100644
--- a/src/components/settings/Settings.h
+++ b/src/components/settings/Settings.h
@@ -45,6 +45,7 @@ namespace Pinetime {
         Colors ColorBG = Colors::Black;
         PTSGaugeStyle gaugeStyle = PTSGaugeStyle::Full;
       };
+
       struct WatchFaceInfineat {
         bool showSideCover = true;
         int colorIndex = 0;
@@ -66,6 +67,7 @@ namespace Pinetime {
         }
         settings.clockFace = face;
       };
+
       uint8_t GetClockFace() const {
         return settings.clockFace;
       };
@@ -76,6 +78,7 @@ namespace Pinetime {
         }
         settings.chimesOption = chimeOption;
       };
+
       ChimesOption GetChimeOption() const {
         return settings.chimesOption;
       };
@@ -85,6 +88,7 @@ namespace Pinetime {
           settingsChanged = true;
         settings.PTS.ColorTime = colorTime;
       };
+
       Colors GetPTSColorTime() const {
         return settings.PTS.ColorTime;
       };
@@ -94,6 +98,7 @@ namespace Pinetime {
           settingsChanged = true;
         settings.PTS.ColorBar = colorBar;
       };
+
       Colors GetPTSColorBar() const {
         return settings.PTS.ColorBar;
       };
@@ -103,6 +108,7 @@ namespace Pinetime {
           settingsChanged = true;
         settings.PTS.ColorBG = colorBG;
       };
+
       Colors GetPTSColorBG() const {
         return settings.PTS.ColorBG;
       };
@@ -113,6 +119,7 @@ namespace Pinetime {
           settingsChanged = true;
         }
       };
+
       bool GetInfineatShowSideCover() const {
         return settings.watchFaceInfineat.showSideCover;
       };
@@ -123,6 +130,7 @@ namespace Pinetime {
           settingsChanged = true;
         }
       };
+
       int GetInfineatColorIndex() const {
         return settings.watchFaceInfineat.colorIndex;
       };
@@ -132,6 +140,7 @@ namespace Pinetime {
           settingsChanged = true;
         settings.PTS.gaugeStyle = gaugeStyle;
       };
+
       PTSGaugeStyle GetPTSGaugeStyle() const {
         return settings.PTS.gaugeStyle;
       };
@@ -147,6 +156,7 @@ namespace Pinetime {
       void SetSettingsMenu(uint8_t menu) {
         settingsMenu = menu;
       };
+
       uint8_t GetSettingsMenu() const {
         return settingsMenu;
       };
@@ -157,6 +167,7 @@ namespace Pinetime {
         }
         settings.clockType = clocktype;
       };
+
       ClockType GetClockType() const {
         return settings.clockType;
       };
@@ -167,6 +178,7 @@ namespace Pinetime {
         }
         settings.notificationStatus = status;
       };
+
       Notification GetNotificationStatus() const {
         return settings.notificationStatus;
       };
@@ -255,6 +267,7 @@ namespace Pinetime {
       Pinetime::Controllers::FS& fs;
 
       static constexpr uint32_t settingsVersion = 0x0004;
+
       struct SettingsData {
         uint32_t version = settingsVersion;
         uint32_t stepsGoal = 10000;
diff --git a/src/components/timer/TimerController.h b/src/components/timer/TimerController.h
index 93d8afc6..20f07e82 100644
--- a/src/components/timer/TimerController.h
+++ b/src/components/timer/TimerController.h
@@ -7,6 +7,7 @@ namespace Pinetime {
   namespace System {
     class SystemTask;
   }
+
   namespace Controllers {
 
     class TimerController {
diff --git a/src/displayapp/DisplayApp.h b/src/displayapp/DisplayApp.h
index 3c1829d5..c1d04cc9 100644
--- a/src/displayapp/DisplayApp.h
+++ b/src/displayapp/DisplayApp.h
@@ -29,6 +29,7 @@ namespace Pinetime {
     class Cst816S;
     class WatchdogView;
   }
+
   namespace Controllers {
     class Settings;
     class Battery;
@@ -43,6 +44,7 @@ namespace Pinetime {
   namespace System {
     class SystemTask;
   };
+
   namespace Applications {
     class DisplayApp {
     public:
diff --git a/src/displayapp/DisplayAppRecovery.h b/src/displayapp/DisplayAppRecovery.h
index 7d4f0fd0..97aaca88 100644
--- a/src/displayapp/DisplayAppRecovery.h
+++ b/src/displayapp/DisplayAppRecovery.h
@@ -22,6 +22,7 @@ namespace Pinetime {
     class Cst816S;
     class WatchdogView;
   }
+
   namespace Controllers {
     class Settings;
     class Battery;
@@ -63,9 +64,11 @@ namespace Pinetime {
                  Pinetime::Controllers::TouchHandler& touchHandler,
                  Pinetime::Controllers::FS& filesystem);
       void Start();
+
       void Start(Pinetime::System::BootErrors) {
         Start();
       };
+
       void PushMessage(Pinetime::Applications::Display::Messages msg);
       void Register(Pinetime::System::SystemTask* systemTask);
 
diff --git a/src/displayapp/DummyLittleVgl.h b/src/displayapp/DummyLittleVgl.h
index 05355a97..7a8ae999 100644
--- a/src/displayapp/DummyLittleVgl.h
+++ b/src/displayapp/DummyLittleVgl.h
@@ -11,6 +11,7 @@ namespace Pinetime {
     class LittleVgl {
     public:
       enum class FullRefreshDirections { None, Up, Down };
+
       LittleVgl(Pinetime::Drivers::St7789& lcd, Pinetime::Drivers::Cst816S& touchPanel) {
       }
 
@@ -24,13 +25,17 @@ namespace Pinetime {
 
       void FlushDisplay(const lv_area_t* area, lv_color_t* color_p) {
       }
+
       bool GetTouchPadInfo(lv_indev_data_t* ptr) {
         return false;
       }
+
       void SetFullRefresh(FullRefreshDirections direction) {
       }
+
       void SetNewTapEvent(uint16_t x, uint16_t y) {
       }
+
       void SetNewTouchPoint(uint16_t x, uint16_t y, bool contact) {
       }
     };
diff --git a/src/displayapp/LittleVgl.h b/src/displayapp/LittleVgl.h
index 45826165..aedb69d8 100644
--- a/src/displayapp/LittleVgl.h
+++ b/src/displayapp/LittleVgl.h
@@ -52,9 +52,11 @@ namespace Pinetime {
       static constexpr uint8_t nbWriteLines = 4;
       static constexpr uint16_t totalNbLines = 320;
       static constexpr uint16_t visibleNbLines = 240;
+
       static constexpr uint8_t MaxScrollOffset() {
         return LV_VER_RES_MAX - nbWriteLines;
       }
+
       FullRefreshDirections scrollDirection = FullRefreshDirections::None;
       uint16_t writeOffset = 0;
       uint16_t scrollOffset = 0;
diff --git a/src/displayapp/Messages.h b/src/displayapp/Messages.h
index 58df4556..afa7709a 100644
--- a/src/displayapp/Messages.h
+++ b/src/displayapp/Messages.h
@@ -1,5 +1,6 @@
 #pragma once
 #include <cstdint>
+
 namespace Pinetime {
   namespace Applications {
     namespace Display {
diff --git a/src/displayapp/screens/CheckboxList.h b/src/displayapp/screens/CheckboxList.h
index 48125d4b..359b835e 100644
--- a/src/displayapp/screens/CheckboxList.h
+++ b/src/displayapp/screens/CheckboxList.h
@@ -15,6 +15,7 @@ namespace Pinetime {
       class CheckboxList : public Screen {
       public:
         static constexpr size_t MaxItems = 4;
+
         struct Item {
           const char* name;
           bool enabled;
diff --git a/src/displayapp/screens/FirmwareUpdate.h b/src/displayapp/screens/FirmwareUpdate.h
index 5156b7ea..cc3b09b2 100644
--- a/src/displayapp/screens/FirmwareUpdate.h
+++ b/src/displayapp/screens/FirmwareUpdate.h
@@ -8,6 +8,7 @@ namespace Pinetime {
   namespace Controllers {
     class Ble;
   }
+
   namespace Applications {
     namespace Screens {
 
diff --git a/src/displayapp/screens/HeartRate.h b/src/displayapp/screens/HeartRate.h
index 2ad00351..d68133ad 100644
--- a/src/displayapp/screens/HeartRate.h
+++ b/src/displayapp/screens/HeartRate.h
@@ -11,6 +11,7 @@ namespace Pinetime {
   namespace Controllers {
     class HeartRateController;
   }
+
   namespace Applications {
     namespace Screens {
 
diff --git a/src/displayapp/screens/InfiniPaint.h b/src/displayapp/screens/InfiniPaint.h
index 8c427402..a6b6eb18 100644
--- a/src/displayapp/screens/InfiniPaint.h
+++ b/src/displayapp/screens/InfiniPaint.h
@@ -10,6 +10,7 @@ namespace Pinetime {
   namespace Components {
     class LittleVgl;
   }
+
   namespace Applications {
     namespace Screens {
 
diff --git a/src/displayapp/screens/Notifications.h b/src/displayapp/screens/Notifications.h
index bdaac7bb..a4d2709b 100644
--- a/src/displayapp/screens/Notifications.h
+++ b/src/displayapp/screens/Notifications.h
@@ -13,6 +13,7 @@ namespace Pinetime {
   namespace Controllers {
     class AlertNotificationService;
   }
+
   namespace Applications {
     namespace Screens {
 
@@ -45,9 +46,11 @@ namespace Pinetime {
                            Pinetime::Controllers::AlertNotificationService& alertNotificationService,
                            Pinetime::Controllers::MotorController& motorController);
           ~NotificationItem();
+
           bool IsRunning() const {
             return running;
           }
+
           void OnCallButtonEvent(lv_obj_t*, lv_event_t event);
 
         private:
diff --git a/src/displayapp/screens/Paddle.h b/src/displayapp/screens/Paddle.h
index 3a30eee6..d62550c4 100644
--- a/src/displayapp/screens/Paddle.h
+++ b/src/displayapp/screens/Paddle.h
@@ -8,6 +8,7 @@ namespace Pinetime {
   namespace Components {
     class LittleVgl;
   }
+
   namespace Applications {
     namespace Screens {
 
diff --git a/src/displayapp/screens/Screen.h b/src/displayapp/screens/Screen.h
index e72a2368..a2452da5 100644
--- a/src/displayapp/screens/Screen.h
+++ b/src/displayapp/screens/Screen.h
@@ -7,13 +7,16 @@
 namespace Pinetime {
   namespace Applications {
     class DisplayApp;
+
     namespace Screens {
 
       template <class T> class DirtyValue {
       public:
         DirtyValue() = default; // Use NSDMI
+
         explicit DirtyValue(T const& v) : value {v} {
         } // Use MIL and const-lvalue-ref
+
         bool IsUpdated() {
           if (this->isUpdated) {
             this->isUpdated = false;
@@ -21,10 +24,12 @@ namespace Pinetime {
           }
           return false;
         }
+
         T const& Get() {
           this->isUpdated = false;
           return value;
         } // never expose a non-const lvalue-ref
+
         DirtyValue& operator=(const T& other) {
           if (this->value != other) {
             this->value = other;
@@ -46,6 +51,7 @@ namespace Pinetime {
       public:
         explicit Screen(DisplayApp* app) : app {app} {
         }
+
         virtual ~Screen() = default;
 
         static void RefreshTaskCallback(lv_task_t* task);
@@ -64,6 +70,7 @@ namespace Pinetime {
         virtual bool OnTouchEvent(TouchEvents event) {
           return false;
         }
+
         virtual bool OnTouchEvent(uint16_t x, uint16_t y) {
           return false;
         }
diff --git a/src/displayapp/screens/ScreenList.h b/src/displayapp/screens/ScreenList.h
index ad882948..6c9a2218 100644
--- a/src/displayapp/screens/ScreenList.h
+++ b/src/displayapp/screens/ScreenList.h
@@ -11,6 +11,7 @@ namespace Pinetime {
     namespace Screens {
 
       enum class ScreenListModes { UpDown, RightLeft, LongPress };
+
       template <size_t N> class ScreenList : public Screen {
       public:
         ScreenList(DisplayApp* app,
diff --git a/src/displayapp/screens/Twos.h b/src/displayapp/screens/Twos.h
index da935724..15017581 100644
--- a/src/displayapp/screens/Twos.h
+++ b/src/displayapp/screens/Twos.h
@@ -9,6 +9,7 @@ namespace Pinetime {
       bool merged = false;
       unsigned int value = 0;
     };
+
     namespace Screens {
       class Twos : public Screen {
       public:
diff --git a/src/displayapp/screens/WatchFaceAnalog.h b/src/displayapp/screens/WatchFaceAnalog.h
index 04d9e711..6e4e88a3 100644
--- a/src/displayapp/screens/WatchFaceAnalog.h
+++ b/src/displayapp/screens/WatchFaceAnalog.h
@@ -18,6 +18,7 @@ namespace Pinetime {
     class Ble;
     class NotificationManager;
   }
+
   namespace Applications {
     namespace Screens {
 
diff --git a/src/displayapp/screens/WatchFaceInfineat.h b/src/displayapp/screens/WatchFaceInfineat.h
index 6c3c30ba..2dbb0ab3 100644
--- a/src/displayapp/screens/WatchFaceInfineat.h
+++ b/src/displayapp/screens/WatchFaceInfineat.h
@@ -118,6 +118,7 @@ namespace Pinetime {
 
         static constexpr int nLines = 9;
         static constexpr int nColors = 7; // must match number of colors in InfineatColors
+
         struct InfineatColors {
           int orange[nLines] = {0xfd872b, 0xdb3316, 0x6f1000, 0xfd7a0a, 0xffffff, 0xffffff, 0xffffff, 0xe85102, 0xea1c00};
           int blue[nLines] = {0xe7f8ff, 0x2232d0, 0x182a8b, 0xe7f8ff, 0xffffff, 0xffffff, 0xffffff, 0x5991ff, 0x1636ff};
diff --git a/src/displayapp/screens/settings/SettingChimes.h b/src/displayapp/screens/settings/SettingChimes.h
index 3054d06b..3146503b 100644
--- a/src/displayapp/screens/settings/SettingChimes.h
+++ b/src/displayapp/screens/settings/SettingChimes.h
@@ -23,6 +23,7 @@ namespace Pinetime {
           Controllers::Settings::ChimesOption chimesOption;
           const char* name;
         };
+
         static constexpr std::array<Option, 3> options = {{{Controllers::Settings::ChimesOption::None, "Off"},
                                                            {Controllers::Settings::ChimesOption::Hours, "Every hour"},
                                                            {Controllers::Settings::ChimesOption::HalfHours, "Every 30 mins"}}};
diff --git a/src/displayapp/screens/settings/SettingShakeThreshold.h b/src/displayapp/screens/settings/SettingShakeThreshold.h
index 43319468..d0979fa6 100644
--- a/src/displayapp/screens/settings/SettingShakeThreshold.h
+++ b/src/displayapp/screens/settings/SettingShakeThreshold.h
@@ -6,6 +6,7 @@
 #include "displayapp/screens/Screen.h"
 #include <components/motion/MotionController.h>
 #include "systemtask/SystemTask.h"
+
 namespace Pinetime {
 
   namespace Applications {
diff --git a/src/displayapp/screens/settings/SettingTimeFormat.h b/src/displayapp/screens/settings/SettingTimeFormat.h
index dc0413ec..426dc197 100644
--- a/src/displayapp/screens/settings/SettingTimeFormat.h
+++ b/src/displayapp/screens/settings/SettingTimeFormat.h
@@ -24,6 +24,7 @@ namespace Pinetime {
           Controllers::Settings::ClockType clockType;
           const char* name;
         };
+
         static constexpr std::array<Option, 2> options = {{
           {Controllers::Settings::ClockType::H12, "12-hour"},
           {Controllers::Settings::ClockType::H24, "24-hour"},
diff --git a/src/displayapp/screens/settings/SettingWakeUp.h b/src/displayapp/screens/settings/SettingWakeUp.h
index 54282f5d..2a4e7509 100644
--- a/src/displayapp/screens/settings/SettingWakeUp.h
+++ b/src/displayapp/screens/settings/SettingWakeUp.h
@@ -23,6 +23,7 @@ namespace Pinetime {
           Controllers::Settings::WakeUpMode wakeUpMode;
           const char* name;
         };
+
         Controllers::Settings& settingsController;
         static constexpr std::array<Option, 4> options = {{
           {Controllers::Settings::WakeUpMode::SingleTap, "Single Tap"},
diff --git a/src/displayapp/widgets/StatusIcons.h b/src/displayapp/widgets/StatusIcons.h
index f4a30a80..7d9e3ae3 100644
--- a/src/displayapp/widgets/StatusIcons.h
+++ b/src/displayapp/widgets/StatusIcons.h
@@ -15,9 +15,11 @@ namespace Pinetime {
         StatusIcons(Controllers::Battery& batteryController, Controllers::Ble& bleController);
         void Align();
         void Create();
+
         lv_obj_t* GetObject() {
           return container;
         }
+
         void Update();
 
       private:
diff --git a/src/drivers/Bma421.h b/src/drivers/Bma421.h
index ac5c707f..fb832514 100644
--- a/src/drivers/Bma421.h
+++ b/src/drivers/Bma421.h
@@ -4,15 +4,18 @@
 namespace Pinetime {
   namespace Drivers {
     class TwiMaster;
+
     class Bma421 {
     public:
       enum class DeviceTypes : uint8_t { Unknown, BMA421, BMA425 };
+
       struct Values {
         uint32_t steps;
         int16_t x;
         int16_t y;
         int16_t z;
       };
+
       Bma421(TwiMaster& twiMaster, uint8_t twiAddress);
       Bma421(const Bma421&) = delete;
       Bma421& operator=(const Bma421&) = delete;
diff --git a/src/drivers/Cst816s.h b/src/drivers/Cst816s.h
index 9d426c9d..c50bb733 100644
--- a/src/drivers/Cst816s.h
+++ b/src/drivers/Cst816s.h
@@ -16,6 +16,7 @@ namespace Pinetime {
         DoubleTap = 0x0B,
         LongPress = 0x0C
       };
+
       struct TouchInfos {
         uint16_t x = 0;
         uint16_t y = 0;
@@ -38,9 +39,11 @@ namespace Pinetime {
       uint8_t GetChipId() const {
         return chipId;
       }
+
       uint8_t GetVendorId() const {
         return vendorId;
       }
+
       uint8_t GetFwVersion() const {
         return fwVersion;
       }
diff --git a/src/drivers/SpiMaster.h b/src/drivers/SpiMaster.h
index 5ea624f2..cba140a6 100644
--- a/src/drivers/SpiMaster.h
+++ b/src/drivers/SpiMaster.h
@@ -14,6 +14,7 @@ namespace Pinetime {
       enum class BitOrder : uint8_t { Msb_Lsb, Lsb_Msb };
       enum class Modes : uint8_t { Mode0, Mode1, Mode2, Mode3 };
       enum class Frequencies : uint8_t { Freq8Mhz };
+
       struct Parameters {
         BitOrder bitOrder;
         Modes mode;
diff --git a/src/drivers/SpiNorFlash.h b/src/drivers/SpiNorFlash.h
index ad4d0907..8a063fea 100644
--- a/src/drivers/SpiNorFlash.h
+++ b/src/drivers/SpiNorFlash.h
@@ -5,6 +5,7 @@
 namespace Pinetime {
   namespace Drivers {
     class Spi;
+
     class SpiNorFlash {
     public:
       explicit SpiNorFlash(Spi& spi);
diff --git a/src/drivers/St7789.h b/src/drivers/St7789.h
index 8c2ac093..8a1bdfca 100644
--- a/src/drivers/St7789.h
+++ b/src/drivers/St7789.h
@@ -5,6 +5,7 @@
 namespace Pinetime {
   namespace Drivers {
     class Spi;
+
     class St7789 {
     public:
       explicit St7789(Spi& spi, uint8_t pinDataCommand);
diff --git a/src/drivers/Watchdog.h b/src/drivers/Watchdog.h
index 03807d61..22aa9df6 100644
--- a/src/drivers/Watchdog.h
+++ b/src/drivers/Watchdog.h
@@ -9,9 +9,11 @@ namespace Pinetime {
       void Setup(uint8_t timeoutSeconds);
       void Start();
       void Kick();
+
       ResetReasons ResetReason() const {
         return resetReason;
       }
+
       static const char* ResetReasonToString(ResetReasons reason);
 
     private:
@@ -23,6 +25,7 @@ namespace Pinetime {
     public:
       WatchdogView(const Watchdog& watchdog) : watchdog {watchdog} {
       }
+
       Watchdog::ResetReasons ResetReason() const {
         return watchdog.ResetReason();
       }
diff --git a/src/heartratetask/HeartRateTask.h b/src/heartratetask/HeartRateTask.h
index 0796dc74..5bbfb9fb 100644
--- a/src/heartratetask/HeartRateTask.h
+++ b/src/heartratetask/HeartRateTask.h
@@ -8,9 +8,11 @@ namespace Pinetime {
   namespace Drivers {
     class Hrs3300;
   }
+
   namespace Controllers {
     class HeartRateController;
   }
+
   namespace Applications {
     class HeartRateTask {
     public:
diff --git a/src/logging/DummyLogger.h b/src/logging/DummyLogger.h
index 1b050b37..53590b6f 100644
--- a/src/logging/DummyLogger.h
+++ b/src/logging/DummyLogger.h
@@ -7,6 +7,7 @@ namespace Pinetime {
     public:
       void Init() override {
       }
+
       void Resume() override {
       }
     };
diff --git a/src/systemtask/Messages.h b/src/systemtask/Messages.h
index 1883c396..b7fee8a5 100644
--- a/src/systemtask/Messages.h
+++ b/src/systemtask/Messages.h
@@ -1,5 +1,6 @@
 #pragma once
 #include <cstdint>
+
 namespace Pinetime {
   namespace System {
     enum class Messages : uint8_t {
diff --git a/src/systemtask/SystemTask.h b/src/systemtask/SystemTask.h
index d1e4a004..9c43b9b2 100644
--- a/src/systemtask/SystemTask.h
+++ b/src/systemtask/SystemTask.h
@@ -36,6 +36,7 @@
 #include "systemtask/Messages.h"
 
 extern std::chrono::time_point<std::chrono::system_clock, std::chrono::nanoseconds> NoInit_BackUpTime;
+
 namespace Pinetime {
   namespace Drivers {
     class Cst816S;
@@ -45,11 +46,13 @@ namespace Pinetime {
     class TwiMaster;
     class Hrs3300;
   }
+
   namespace Controllers {
     class Battery;
     class TouchHandler;
     class ButtonHandler;
   }
+
   namespace System {
     class SystemTask {
     public:
diff --git a/src/touchhandler/TouchHandler.h b/src/touchhandler/TouchHandler.h
index 332041e5..afce2844 100644
--- a/src/touchhandler/TouchHandler.h
+++ b/src/touchhandler/TouchHandler.h
@@ -6,9 +6,11 @@ namespace Pinetime {
   namespace Components {
     class LittleVgl;
   }
+
   namespace Drivers {
     class Cst816S;
   }
+
   namespace Controllers {
     class TouchHandler {
     public:
@@ -20,12 +22,15 @@ namespace Pinetime {
       bool IsTouching() const {
         return info.touching;
       }
+
       uint8_t GetX() const {
         return info.x;
       }
+
       uint8_t GetY() const {
         return info.y;
       }
+
       Pinetime::Applications::TouchEvents GestureGet();
 
     private: