100 files changed, 72 insertions, 72 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f7ff6178..546ce813 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -292,55 +292,55 @@ set(LVGL_SRC
         )
 
 list(APPEND IMAGE_FILES
-        DisplayApp/Icons/battery/os_battery_error.c
-        DisplayApp/Icons/battery/os_battery_100.c
-        DisplayApp/Icons/battery/os_battery_090.c
-        DisplayApp/Icons/battery/os_battery_080.c
-        DisplayApp/Icons/battery/os_battery_070.c
-        DisplayApp/Icons/battery/os_battery_060.c
-        DisplayApp/Icons/battery/os_battery_050.c
-        DisplayApp/Icons/battery/os_battery_040.c
-        DisplayApp/Icons/battery/os_battery_030.c
-        DisplayApp/Icons/battery/os_battery_020.c
-        DisplayApp/Icons/battery/os_battery_010.c
-        DisplayApp/Icons/battery/os_battery_005.c
-
-        DisplayApp/Icons/battery/os_batterycharging_100.c
-        DisplayApp/Icons/battery/os_batterycharging_090.c
-        DisplayApp/Icons/battery/os_batterycharging_080.c
-        DisplayApp/Icons/battery/os_batterycharging_070.c
-        DisplayApp/Icons/battery/os_batterycharging_060.c
-        DisplayApp/Icons/battery/os_batterycharging_050.c
-        DisplayApp/Icons/battery/os_batterycharging_040.c
-        DisplayApp/Icons/battery/os_batterycharging_030.c
-        DisplayApp/Icons/battery/os_batterycharging_020.c
-        DisplayApp/Icons/battery/os_batterycharging_010.c
-        DisplayApp/Icons/battery/os_batterycharging_005.c
-
-        DisplayApp/Icons/bluetooth/os_bt_connected.c
-        DisplayApp/Icons/bluetooth/os_bt_disconnected.c
+        displayapp/Icons/battery/os_battery_error.c
+        displayapp/Icons/battery/os_battery_100.c
+        displayapp/Icons/battery/os_battery_090.c
+        displayapp/Icons/battery/os_battery_080.c
+        displayapp/Icons/battery/os_battery_070.c
+        displayapp/Icons/battery/os_battery_060.c
+        displayapp/Icons/battery/os_battery_050.c
+        displayapp/Icons/battery/os_battery_040.c
+        displayapp/Icons/battery/os_battery_030.c
+        displayapp/Icons/battery/os_battery_020.c
+        displayapp/Icons/battery/os_battery_010.c
+        displayapp/Icons/battery/os_battery_005.c
+
+        displayapp/Icons/battery/os_batterycharging_100.c
+        displayapp/Icons/battery/os_batterycharging_090.c
+        displayapp/Icons/battery/os_batterycharging_080.c
+        displayapp/Icons/battery/os_batterycharging_070.c
+        displayapp/Icons/battery/os_batterycharging_060.c
+        displayapp/Icons/battery/os_batterycharging_050.c
+        displayapp/Icons/battery/os_batterycharging_040.c
+        displayapp/Icons/battery/os_batterycharging_030.c
+        displayapp/Icons/battery/os_batterycharging_020.c
+        displayapp/Icons/battery/os_batterycharging_010.c
+        displayapp/Icons/battery/os_batterycharging_005.c
+
+        displayapp/Icons/bluetooth/os_bt_connected.c
+        displayapp/Icons/bluetooth/os_bt_disconnected.c
         )
 
 list(APPEND SOURCE_FILES
         logging/NrfLogger.cpp
-        DisplayApp/DisplayApp.cpp
-        DisplayApp/Screens/Screen.cpp
-        DisplayApp/Screens/Clock.cpp
-        DisplayApp/Screens/Tile.cpp
-        DisplayApp/Screens/Meter.cpp
-        DisplayApp/Screens/Gauge.cpp
-        DisplayApp/Screens/InfiniPaint.cpp
-        DisplayApp/Screens/DropDownDemo.cpp
-        DisplayApp/Screens/Modal.cpp
-        DisplayApp/Screens/BatteryIcon.cpp
-        DisplayApp/Screens/BleIcon.cpp
-        DisplayApp/Screens/Brightness.cpp
-        DisplayApp/Screens/SystemInfo.cpp
-        DisplayApp/Screens/Label.cpp
-        DisplayApp/Screens/FirmwareUpdate.cpp
-        DisplayApp/Screens/Music.cpp
-        DisplayApp/Screens/FirmwareValidation.cpp
-        DisplayApp/Screens/ApplicationList.cpp
+        displayapp/DisplayApp.cpp
+        displayapp/Screens/Screen.cpp
+        displayapp/Screens/Clock.cpp
+        displayapp/Screens/Tile.cpp
+        displayapp/Screens/Meter.cpp
+        displayapp/Screens/Gauge.cpp
+        displayapp/Screens/InfiniPaint.cpp
+        displayapp/Screens/DropDownDemo.cpp
+        displayapp/Screens/Modal.cpp
+        displayapp/Screens/BatteryIcon.cpp
+        displayapp/Screens/BleIcon.cpp
+        displayapp/Screens/Brightness.cpp
+        displayapp/Screens/SystemInfo.cpp
+        displayapp/Screens/Label.cpp
+        displayapp/Screens/FirmwareUpdate.cpp
+        displayapp/Screens/Music.cpp
+        displayapp/Screens/FirmwareValidation.cpp
+        displayapp/Screens/ApplicationList.cpp
         main.cpp
         drivers/St7789.cpp
         drivers/SpiNorFlash.cpp
@@ -370,9 +370,9 @@ list(APPEND SOURCE_FILES
         FreeRTOS/port_cmsis_systick.c
         FreeRTOS/port_cmsis.c
 
-        DisplayApp/LittleVgl.cpp
-        DisplayApp/Fonts/jetbrains_mono_extrabold_compressed.c
-        DisplayApp/Fonts/jetbrains_mono_bold_20.c
+        displayapp/LittleVgl.cpp
+        displayapp/Fonts/jetbrains_mono_extrabold_compressed.c
+        displayapp/Fonts/jetbrains_mono_bold_20.c
 
         systemtask/SystemTask.cpp
         drivers/TwiMaster.cpp
@@ -399,26 +399,26 @@ list(APPEND GRAPHICS_SOURCE_FILES
 set(INCLUDE_FILES
         logging/Logger.h
         logging/NrfLogger.h
-        DisplayApp/DisplayApp.h
-        DisplayApp/TouchEvents.h
-        DisplayApp/Screens/Screen.h
-        DisplayApp/Screens/Clock.h
-        DisplayApp/Screens/Tile.h
-        DisplayApp/Screens/Meter.h
-        DisplayApp/Screens/Gauge.h
-        DisplayApp/Screens/InfiniPaint.h
-        DisplayApp/Screens/DropDownDemo.h
-        DisplayApp/Screens/Modal.h
-        DisplayApp/Screens/BatteryIcon.h
-        DisplayApp/Screens/BleIcon.cpp
-        DisplayApp/Screens/Brightness.h
-        DisplayApp/Screens/SystemInfo.h
-        DisplayApp/Screens/ScreenList.h
-        DisplayApp/Screens/Label.h
-        DisplayApp/Screens/FirmwareUpdate.h
-        DisplayApp/Screens/FirmwareValidation.h
-        DisplayApp/Screens/ApplicationList.h
-        DisplayApp/Apps.h
+        displayapp/DisplayApp.h
+        displayapp/TouchEvents.h
+        displayapp/Screens/Screen.h
+        displayapp/Screens/Clock.h
+        displayapp/Screens/Tile.h
+        displayapp/Screens/Meter.h
+        displayapp/Screens/Gauge.h
+        displayapp/Screens/InfiniPaint.h
+        displayapp/Screens/DropDownDemo.h
+        displayapp/Screens/Modal.h
+        displayapp/Screens/BatteryIcon.h
+        displayapp/Screens/BleIcon.cpp
+        displayapp/Screens/Brightness.h
+        displayapp/Screens/SystemInfo.h
+        displayapp/Screens/ScreenList.h
+        displayapp/Screens/Label.h
+        displayapp/Screens/FirmwareUpdate.h
+        displayapp/Screens/FirmwareValidation.h
+        displayapp/Screens/ApplicationList.h
+        displayapp/Apps.h
         drivers/St7789.h
         drivers/SpiNorFlash.h
         drivers/SpiMaster.h
@@ -450,10 +450,10 @@ set(INCLUDE_FILES
         libs/date/includes/date/julian.h
         libs/date/includes/date/ptz.h
         libs/date/includes/date/tz_private.h
-        DisplayApp/LittleVgl.h
+        displayapp/LittleVgl.h
         systemtask/SystemTask.h
         systemtask/SystemMonitor.h
-        DisplayApp/Screens/Symbols.h
+        displayapp/Screens/Symbols.h
         drivers/TwiMaster.h
         )
 
diff --git a/src/DisplayApp/Apps.h b/src/displayapp/Apps.h
index 3842e4e5..3842e4e5 100644
--- a/src/DisplayApp/Apps.h
+++ b/src/displayapp/Apps.h
diff --git a/src/DisplayApp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp
index f6138ec7..46e81f1d 100644
--- a/src/DisplayApp/DisplayApp.cpp
+++ b/src/displayapp/DisplayApp.cpp
@@ -43,13 +43,13 @@ DisplayApp::DisplayApp(Drivers::St7789 &lcd, Components::LittleVgl &lvgl, Driver
 }
 
 void DisplayApp::Start() {
-  if (pdPASS != xTaskCreate(DisplayApp::Process, "DisplayApp", 512, this, 0, &taskHandle))
+  if (pdPASS != xTaskCreate(DisplayApp::Process, "displayapp", 512, this, 0, &taskHandle))
     APP_ERROR_HANDLER(NRF_ERROR_NO_MEM);
 }
 
 void DisplayApp::Process(void *instance) {
   auto *app = static_cast<DisplayApp *>(instance);
-  NRF_LOG_INFO("DisplayApp task started!");
+  NRF_LOG_INFO("displayapp task started!");
   app->InitHw();
 
   // Send a dummy notification to unlock the lvgl display driver for the first iteration
diff --git a/src/DisplayApp/DisplayApp.h b/src/displayapp/DisplayApp.h
index 345e06d4..345e06d4 100644
--- a/src/DisplayApp/DisplayApp.h
+++ b/src/displayapp/DisplayApp.h
diff --git a/src/DisplayApp/Fonts/Readme.md b/src/displayapp/Fonts/Readme.md
index 7ebf2e23..7ebf2e23 100644
--- a/src/DisplayApp/Fonts/Readme.md
+++ b/src/displayapp/Fonts/Readme.md
diff --git a/src/DisplayApp/Fonts/jetbrains_mono_bold_20.c b/src/displayapp/Fonts/jetbrains_mono_bold_20.c
index 27ad0055..27ad0055 100644
--- a/src/DisplayApp/Fonts/jetbrains_mono_bold_20.c
+++ b/src/displayapp/Fonts/jetbrains_mono_bold_20.c
diff --git a/src/DisplayApp/Fonts/jetbrains_mono_extrabold_compressed.c b/src/displayapp/Fonts/jetbrains_mono_extrabold_compressed.c
index c9917e40..c9917e40 100644
--- a/src/DisplayApp/Fonts/jetbrains_mono_extrabold_compressed.c
+++ b/src/displayapp/Fonts/jetbrains_mono_extrabold_compressed.c
diff --git a/src/DisplayApp/Icons/battery/os_battery_005.c b/src/displayapp/Icons/battery/os_battery_005.c
index 64832b5c..64832b5c 100644
--- a/src/DisplayApp/Icons/battery/os_battery_005.c
+++ b/src/displayapp/Icons/battery/os_battery_005.c
diff --git a/src/DisplayApp/Icons/battery/os_battery_005.png b/src/displayapp/Icons/battery/os_battery_005.png
index 963767be..963767be 100644
--- a/src/DisplayApp/Icons/battery/os_battery_005.png
+++ b/src/displayapp/Icons/battery/os_battery_005.png
diff --git a/src/DisplayApp/Icons/battery/os_battery_010.c b/src/displayapp/Icons/battery/os_battery_010.c
index f36b684b..f36b684b 100644
--- a/src/DisplayApp/Icons/battery/os_battery_010.c
+++ b/src/displayapp/Icons/battery/os_battery_010.c
diff --git a/src/DisplayApp/Icons/battery/os_battery_010.png b/src/displayapp/Icons/battery/os_battery_010.png
index 68a9f406..68a9f406 100644
--- a/src/DisplayApp/Icons/battery/os_battery_010.png
+++ b/src/displayapp/Icons/battery/os_battery_010.png
diff --git a/src/DisplayApp/Icons/battery/os_battery_020.c b/src/displayapp/Icons/battery/os_battery_020.c
index 3f648fb9..3f648fb9 100644
--- a/src/DisplayApp/Icons/battery/os_battery_020.c
+++ b/src/displayapp/Icons/battery/os_battery_020.c
diff --git a/src/DisplayApp/Icons/battery/os_battery_020.png b/src/displayapp/Icons/battery/os_battery_020.png
index 32eca651..32eca651 100644
--- a/src/DisplayApp/Icons/battery/os_battery_020.png
+++ b/src/displayapp/Icons/battery/os_battery_020.png
diff --git a/src/DisplayApp/Icons/battery/os_battery_030.c b/src/displayapp/Icons/battery/os_battery_030.c
index 4d5719b7..4d5719b7 100644
--- a/src/DisplayApp/Icons/battery/os_battery_030.c
+++ b/src/displayapp/Icons/battery/os_battery_030.c
diff --git a/src/DisplayApp/Icons/battery/os_battery_030.png b/src/displayapp/Icons/battery/os_battery_030.png
index aeb5eb1f..aeb5eb1f 100644
--- a/src/DisplayApp/Icons/battery/os_battery_030.png
+++ b/src/displayapp/Icons/battery/os_battery_030.png
diff --git a/src/DisplayApp/Icons/battery/os_battery_040.c b/src/displayapp/Icons/battery/os_battery_040.c
index 0606fc35..0606fc35 100644
--- a/src/DisplayApp/Icons/battery/os_battery_040.c
+++ b/src/displayapp/Icons/battery/os_battery_040.c
diff --git a/src/DisplayApp/Icons/battery/os_battery_040.png b/src/displayapp/Icons/battery/os_battery_040.png
index d84fda40..d84fda40 100644
--- a/src/DisplayApp/Icons/battery/os_battery_040.png
+++ b/src/displayapp/Icons/battery/os_battery_040.png
diff --git a/src/DisplayApp/Icons/battery/os_battery_050.c b/src/displayapp/Icons/battery/os_battery_050.c
index 8732dc7a..8732dc7a 100644
--- a/src/DisplayApp/Icons/battery/os_battery_050.c
+++ b/src/displayapp/Icons/battery/os_battery_050.c
diff --git a/src/DisplayApp/Icons/battery/os_battery_050.png b/src/displayapp/Icons/battery/os_battery_050.png
index 224d38d6..224d38d6 100644
--- a/src/DisplayApp/Icons/battery/os_battery_050.png
+++ b/src/displayapp/Icons/battery/os_battery_050.png
diff --git a/src/DisplayApp/Icons/battery/os_battery_060.c b/src/displayapp/Icons/battery/os_battery_060.c
index a65936bf..a65936bf 100644
--- a/src/DisplayApp/Icons/battery/os_battery_060.c
+++ b/src/displayapp/Icons/battery/os_battery_060.c
diff --git a/src/DisplayApp/Icons/battery/os_battery_060.png b/src/displayapp/Icons/battery/os_battery_060.png
index e5e00eda..e5e00eda 100644
--- a/src/DisplayApp/Icons/battery/os_battery_060.png
+++ b/src/displayapp/Icons/battery/os_battery_060.png
diff --git a/src/DisplayApp/Icons/battery/os_battery_070.c b/src/displayapp/Icons/battery/os_battery_070.c
index 949c0b8b..949c0b8b 100644
--- a/src/DisplayApp/Icons/battery/os_battery_070.c
+++ b/src/displayapp/Icons/battery/os_battery_070.c
diff --git a/src/DisplayApp/Icons/battery/os_battery_070.png b/src/displayapp/Icons/battery/os_battery_070.png
index dee969b8..dee969b8 100644
--- a/src/DisplayApp/Icons/battery/os_battery_070.png
+++ b/src/displayapp/Icons/battery/os_battery_070.png
diff --git a/src/DisplayApp/Icons/battery/os_battery_080.c b/src/displayapp/Icons/battery/os_battery_080.c
index f447370e..f447370e 100644
--- a/src/DisplayApp/Icons/battery/os_battery_080.c
+++ b/src/displayapp/Icons/battery/os_battery_080.c
diff --git a/src/DisplayApp/Icons/battery/os_battery_080.png b/src/displayapp/Icons/battery/os_battery_080.png
index 3b13fbb2..3b13fbb2 100644
--- a/src/DisplayApp/Icons/battery/os_battery_080.png
+++ b/src/displayapp/Icons/battery/os_battery_080.png
diff --git a/src/DisplayApp/Icons/battery/os_battery_090.c b/src/displayapp/Icons/battery/os_battery_090.c
index 6fa41b20..6fa41b20 100644
--- a/src/DisplayApp/Icons/battery/os_battery_090.c
+++ b/src/displayapp/Icons/battery/os_battery_090.c
diff --git a/src/DisplayApp/Icons/battery/os_battery_090.png b/src/displayapp/Icons/battery/os_battery_090.png
index d79f396b..d79f396b 100644
--- a/src/DisplayApp/Icons/battery/os_battery_090.png
+++ b/src/displayapp/Icons/battery/os_battery_090.png
diff --git a/src/DisplayApp/Icons/battery/os_battery_100.c b/src/displayapp/Icons/battery/os_battery_100.c
index 92cf9a41..92cf9a41 100644
--- a/src/DisplayApp/Icons/battery/os_battery_100.c
+++ b/src/displayapp/Icons/battery/os_battery_100.c
diff --git a/src/DisplayApp/Icons/battery/os_battery_100.png b/src/displayapp/Icons/battery/os_battery_100.png
index dd0d306f..dd0d306f 100644
--- a/src/DisplayApp/Icons/battery/os_battery_100.png
+++ b/src/displayapp/Icons/battery/os_battery_100.png
diff --git a/src/DisplayApp/Icons/battery/os_battery_error.c b/src/displayapp/Icons/battery/os_battery_error.c
index af6aba5d..af6aba5d 100644
--- a/src/DisplayApp/Icons/battery/os_battery_error.c
+++ b/src/displayapp/Icons/battery/os_battery_error.c
diff --git a/src/DisplayApp/Icons/battery/os_battery_error.png b/src/displayapp/Icons/battery/os_battery_error.png
index 4c7632fe..4c7632fe 100644
--- a/src/DisplayApp/Icons/battery/os_battery_error.png
+++ b/src/displayapp/Icons/battery/os_battery_error.png
diff --git a/src/DisplayApp/Icons/battery/os_batterycharging_005.c b/src/displayapp/Icons/battery/os_batterycharging_005.c
index 1b0c71df..1b0c71df 100644
--- a/src/DisplayApp/Icons/battery/os_batterycharging_005.c
+++ b/src/displayapp/Icons/battery/os_batterycharging_005.c
diff --git a/src/DisplayApp/Icons/battery/os_batterycharging_005.png b/src/displayapp/Icons/battery/os_batterycharging_005.png
index f9545bc1..f9545bc1 100644
--- a/src/DisplayApp/Icons/battery/os_batterycharging_005.png
+++ b/src/displayapp/Icons/battery/os_batterycharging_005.png
diff --git a/src/DisplayApp/Icons/battery/os_batterycharging_010.c b/src/displayapp/Icons/battery/os_batterycharging_010.c
index 304c0184..304c0184 100644
--- a/src/DisplayApp/Icons/battery/os_batterycharging_010.c
+++ b/src/displayapp/Icons/battery/os_batterycharging_010.c
diff --git a/src/DisplayApp/Icons/battery/os_batterycharging_010.png b/src/displayapp/Icons/battery/os_batterycharging_010.png
index 04d5f820..04d5f820 100644
--- a/src/DisplayApp/Icons/battery/os_batterycharging_010.png
+++ b/src/displayapp/Icons/battery/os_batterycharging_010.png
diff --git a/src/DisplayApp/Icons/battery/os_batterycharging_020.c b/src/displayapp/Icons/battery/os_batterycharging_020.c
index 1721be15..1721be15 100644
--- a/src/DisplayApp/Icons/battery/os_batterycharging_020.c
+++ b/src/displayapp/Icons/battery/os_batterycharging_020.c
diff --git a/src/DisplayApp/Icons/battery/os_batterycharging_020.png b/src/displayapp/Icons/battery/os_batterycharging_020.png
index 6416e1e6..6416e1e6 100644
--- a/src/DisplayApp/Icons/battery/os_batterycharging_020.png
+++ b/src/displayapp/Icons/battery/os_batterycharging_020.png
diff --git a/src/DisplayApp/Icons/battery/os_batterycharging_030.c b/src/displayapp/Icons/battery/os_batterycharging_030.c
index 83101fd9..83101fd9 100644
--- a/src/DisplayApp/Icons/battery/os_batterycharging_030.c
+++ b/src/displayapp/Icons/battery/os_batterycharging_030.c
diff --git a/src/DisplayApp/Icons/battery/os_batterycharging_030.png b/src/displayapp/Icons/battery/os_batterycharging_030.png
index 96b44d2e..96b44d2e 100644
--- a/src/DisplayApp/Icons/battery/os_batterycharging_030.png
+++ b/src/displayapp/Icons/battery/os_batterycharging_030.png
diff --git a/src/DisplayApp/Icons/battery/os_batterycharging_040.c b/src/displayapp/Icons/battery/os_batterycharging_040.c
index 02af00e5..02af00e5 100644
--- a/src/DisplayApp/Icons/battery/os_batterycharging_040.c
+++ b/src/displayapp/Icons/battery/os_batterycharging_040.c
diff --git a/src/DisplayApp/Icons/battery/os_batterycharging_040.png b/src/displayapp/Icons/battery/os_batterycharging_040.png
index 5a42caf2..5a42caf2 100644
--- a/src/DisplayApp/Icons/battery/os_batterycharging_040.png
+++ b/src/displayapp/Icons/battery/os_batterycharging_040.png
diff --git a/src/DisplayApp/Icons/battery/os_batterycharging_050.c b/src/displayapp/Icons/battery/os_batterycharging_050.c
index d2eea829..d2eea829 100644
--- a/src/DisplayApp/Icons/battery/os_batterycharging_050.c
+++ b/src/displayapp/Icons/battery/os_batterycharging_050.c
diff --git a/src/DisplayApp/Icons/battery/os_batterycharging_050.png b/src/displayapp/Icons/battery/os_batterycharging_050.png
index ca0e04dd..ca0e04dd 100644
--- a/src/DisplayApp/Icons/battery/os_batterycharging_050.png
+++ b/src/displayapp/Icons/battery/os_batterycharging_050.png
diff --git a/src/DisplayApp/Icons/battery/os_batterycharging_060.c b/src/displayapp/Icons/battery/os_batterycharging_060.c
index 05f8b975..05f8b975 100644
--- a/src/DisplayApp/Icons/battery/os_batterycharging_060.c
+++ b/src/displayapp/Icons/battery/os_batterycharging_060.c
diff --git a/src/DisplayApp/Icons/battery/os_batterycharging_060.png b/src/displayapp/Icons/battery/os_batterycharging_060.png
index 2930068a..2930068a 100644
--- a/src/DisplayApp/Icons/battery/os_batterycharging_060.png
+++ b/src/displayapp/Icons/battery/os_batterycharging_060.png
diff --git a/src/DisplayApp/Icons/battery/os_batterycharging_070.c b/src/displayapp/Icons/battery/os_batterycharging_070.c
index ac3e319c..ac3e319c 100644
--- a/src/DisplayApp/Icons/battery/os_batterycharging_070.c
+++ b/src/displayapp/Icons/battery/os_batterycharging_070.c
diff --git a/src/DisplayApp/Icons/battery/os_batterycharging_070.png b/src/displayapp/Icons/battery/os_batterycharging_070.png
index 7d5f55d7..7d5f55d7 100644
--- a/src/DisplayApp/Icons/battery/os_batterycharging_070.png
+++ b/src/displayapp/Icons/battery/os_batterycharging_070.png
diff --git a/src/DisplayApp/Icons/battery/os_batterycharging_080.c b/src/displayapp/Icons/battery/os_batterycharging_080.c
index cc1c1d23..cc1c1d23 100644
--- a/src/DisplayApp/Icons/battery/os_batterycharging_080.c
+++ b/src/displayapp/Icons/battery/os_batterycharging_080.c
diff --git a/src/DisplayApp/Icons/battery/os_batterycharging_080.png b/src/displayapp/Icons/battery/os_batterycharging_080.png
index cce5052f..cce5052f 100644
--- a/src/DisplayApp/Icons/battery/os_batterycharging_080.png
+++ b/src/displayapp/Icons/battery/os_batterycharging_080.png
diff --git a/src/DisplayApp/Icons/battery/os_batterycharging_090.c b/src/displayapp/Icons/battery/os_batterycharging_090.c
index 85e1c260..85e1c260 100644
--- a/src/DisplayApp/Icons/battery/os_batterycharging_090.c
+++ b/src/displayapp/Icons/battery/os_batterycharging_090.c
diff --git a/src/DisplayApp/Icons/battery/os_batterycharging_090.png b/src/displayapp/Icons/battery/os_batterycharging_090.png
index fc7b443d..fc7b443d 100644
--- a/src/DisplayApp/Icons/battery/os_batterycharging_090.png
+++ b/src/displayapp/Icons/battery/os_batterycharging_090.png
diff --git a/src/DisplayApp/Icons/battery/os_batterycharging_100.c b/src/displayapp/Icons/battery/os_batterycharging_100.c
index 8dec0cb5..8dec0cb5 100644
--- a/src/DisplayApp/Icons/battery/os_batterycharging_100.c
+++ b/src/displayapp/Icons/battery/os_batterycharging_100.c
diff --git a/src/DisplayApp/Icons/battery/os_batterycharging_100.png b/src/displayapp/Icons/battery/os_batterycharging_100.png
index 7c8ce0c4..7c8ce0c4 100644
--- a/src/DisplayApp/Icons/battery/os_batterycharging_100.png
+++ b/src/displayapp/Icons/battery/os_batterycharging_100.png
diff --git a/src/DisplayApp/Icons/bluetooth/ck_os_bt_connected.png b/src/displayapp/Icons/bluetooth/ck_os_bt_connected.png
index 53716115..53716115 100644
--- a/src/DisplayApp/Icons/bluetooth/ck_os_bt_connected.png
+++ b/src/displayapp/Icons/bluetooth/ck_os_bt_connected.png
diff --git a/src/DisplayApp/Icons/bluetooth/ck_os_bt_disconnected.png b/src/displayapp/Icons/bluetooth/ck_os_bt_disconnected.png
index 3275895d..3275895d 100644
--- a/src/DisplayApp/Icons/bluetooth/ck_os_bt_disconnected.png
+++ b/src/displayapp/Icons/bluetooth/ck_os_bt_disconnected.png
diff --git a/src/DisplayApp/Icons/bluetooth/os_bt_connected.c b/src/displayapp/Icons/bluetooth/os_bt_connected.c
index d30dc9d0..d30dc9d0 100644
--- a/src/DisplayApp/Icons/bluetooth/os_bt_connected.c
+++ b/src/displayapp/Icons/bluetooth/os_bt_connected.c
diff --git a/src/DisplayApp/Icons/bluetooth/os_bt_connected.png b/src/displayapp/Icons/bluetooth/os_bt_connected.png
index 53716115..53716115 100644
--- a/src/DisplayApp/Icons/bluetooth/os_bt_connected.png
+++ b/src/displayapp/Icons/bluetooth/os_bt_connected.png
diff --git a/src/DisplayApp/Icons/bluetooth/os_bt_disconnected.c b/src/displayapp/Icons/bluetooth/os_bt_disconnected.c
index 930179b6..930179b6 100644
--- a/src/DisplayApp/Icons/bluetooth/os_bt_disconnected.c
+++ b/src/displayapp/Icons/bluetooth/os_bt_disconnected.c
diff --git a/src/DisplayApp/Icons/bluetooth/os_bt_disconnected.png b/src/displayapp/Icons/bluetooth/os_bt_disconnected.png
index 3275895d..3275895d 100644
--- a/src/DisplayApp/Icons/bluetooth/os_bt_disconnected.png
+++ b/src/displayapp/Icons/bluetooth/os_bt_disconnected.png
diff --git a/src/DisplayApp/LittleVgl.cpp b/src/displayapp/LittleVgl.cpp
index 3483f8e8..3483f8e8 100644
--- a/src/DisplayApp/LittleVgl.cpp
+++ b/src/displayapp/LittleVgl.cpp
diff --git a/src/DisplayApp/LittleVgl.h b/src/displayapp/LittleVgl.h
index 5c1c4434..5c1c4434 100644
--- a/src/DisplayApp/LittleVgl.h
+++ b/src/displayapp/LittleVgl.h
diff --git a/src/DisplayApp/Screens/ApplicationList.cpp b/src/displayapp/Screens/ApplicationList.cpp
index eb85be4f..eb85be4f 100644
--- a/src/DisplayApp/Screens/ApplicationList.cpp
+++ b/src/displayapp/Screens/ApplicationList.cpp
diff --git a/src/DisplayApp/Screens/ApplicationList.h b/src/displayapp/Screens/ApplicationList.h
index a1e6811b..a1e6811b 100644
--- a/src/DisplayApp/Screens/ApplicationList.h
+++ b/src/displayapp/Screens/ApplicationList.h
diff --git a/src/DisplayApp/Screens/BatteryIcon.cpp b/src/displayapp/Screens/BatteryIcon.cpp
index 26939d18..26939d18 100644
--- a/src/DisplayApp/Screens/BatteryIcon.cpp
+++ b/src/displayapp/Screens/BatteryIcon.cpp
diff --git a/src/DisplayApp/Screens/BatteryIcon.h b/src/displayapp/Screens/BatteryIcon.h
index 58f04a87..58f04a87 100644
--- a/src/DisplayApp/Screens/BatteryIcon.h
+++ b/src/displayapp/Screens/BatteryIcon.h
diff --git a/src/DisplayApp/Screens/BleIcon.cpp b/src/displayapp/Screens/BleIcon.cpp
index 1bbbd053..1bbbd053 100644
--- a/src/DisplayApp/Screens/BleIcon.cpp
+++ b/src/displayapp/Screens/BleIcon.cpp
diff --git a/src/DisplayApp/Screens/BleIcon.h b/src/displayapp/Screens/BleIcon.h
index c1398d2a..c1398d2a 100644
--- a/src/DisplayApp/Screens/BleIcon.h
+++ b/src/displayapp/Screens/BleIcon.h
diff --git a/src/DisplayApp/Screens/Brightness.cpp b/src/displayapp/Screens/Brightness.cpp
index 9e3416c0..9e3416c0 100644
--- a/src/DisplayApp/Screens/Brightness.cpp
+++ b/src/displayapp/Screens/Brightness.cpp
diff --git a/src/DisplayApp/Screens/Brightness.h b/src/displayapp/Screens/Brightness.h
index 37cbcd7e..37cbcd7e 100644
--- a/src/DisplayApp/Screens/Brightness.h
+++ b/src/displayapp/Screens/Brightness.h
diff --git a/src/DisplayApp/Screens/Clock.cpp b/src/displayapp/Screens/Clock.cpp
index 06fab9aa..06fab9aa 100644
--- a/src/DisplayApp/Screens/Clock.cpp
+++ b/src/displayapp/Screens/Clock.cpp
diff --git a/src/DisplayApp/Screens/Clock.h b/src/displayapp/Screens/Clock.h
index 7363fdaf..7363fdaf 100644
--- a/src/DisplayApp/Screens/Clock.h
+++ b/src/displayapp/Screens/Clock.h
diff --git a/src/DisplayApp/Screens/DropDownDemo.cpp b/src/displayapp/Screens/DropDownDemo.cpp
index 735a0cce..735a0cce 100644
--- a/src/DisplayApp/Screens/DropDownDemo.cpp
+++ b/src/displayapp/Screens/DropDownDemo.cpp
diff --git a/src/DisplayApp/Screens/DropDownDemo.h b/src/displayapp/Screens/DropDownDemo.h
index 7c75efc0..7c75efc0 100644
--- a/src/DisplayApp/Screens/DropDownDemo.h
+++ b/src/displayapp/Screens/DropDownDemo.h
diff --git a/src/DisplayApp/Screens/FirmwareUpdate.cpp b/src/displayapp/Screens/FirmwareUpdate.cpp
index e831114d..e831114d 100644
--- a/src/DisplayApp/Screens/FirmwareUpdate.cpp
+++ b/src/displayapp/Screens/FirmwareUpdate.cpp
diff --git a/src/DisplayApp/Screens/FirmwareUpdate.h b/src/displayapp/Screens/FirmwareUpdate.h
index faaf3953..faaf3953 100644
--- a/src/DisplayApp/Screens/FirmwareUpdate.h
+++ b/src/displayapp/Screens/FirmwareUpdate.h
diff --git a/src/DisplayApp/Screens/FirmwareValidation.cpp b/src/displayapp/Screens/FirmwareValidation.cpp
index fb2dd956..fb2dd956 100644
--- a/src/DisplayApp/Screens/FirmwareValidation.cpp
+++ b/src/displayapp/Screens/FirmwareValidation.cpp
diff --git a/src/DisplayApp/Screens/FirmwareValidation.h b/src/displayapp/Screens/FirmwareValidation.h
index 947f5575..947f5575 100644
--- a/src/DisplayApp/Screens/FirmwareValidation.h
+++ b/src/displayapp/Screens/FirmwareValidation.h
diff --git a/src/DisplayApp/Screens/Gauge.cpp b/src/displayapp/Screens/Gauge.cpp
index fd905231..fd905231 100644
--- a/src/DisplayApp/Screens/Gauge.cpp
+++ b/src/displayapp/Screens/Gauge.cpp
diff --git a/src/DisplayApp/Screens/Gauge.h b/src/displayapp/Screens/Gauge.h
index 03c06bed..03c06bed 100644
--- a/src/DisplayApp/Screens/Gauge.h
+++ b/src/displayapp/Screens/Gauge.h
diff --git a/src/DisplayApp/Screens/InfiniPaint.cpp b/src/displayapp/Screens/InfiniPaint.cpp
index b340f5d8..b340f5d8 100644
--- a/src/DisplayApp/Screens/InfiniPaint.cpp
+++ b/src/displayapp/Screens/InfiniPaint.cpp
diff --git a/src/DisplayApp/Screens/InfiniPaint.h b/src/displayapp/Screens/InfiniPaint.h
index a1592f97..a1592f97 100644
--- a/src/DisplayApp/Screens/InfiniPaint.h
+++ b/src/displayapp/Screens/InfiniPaint.h
diff --git a/src/DisplayApp/Screens/Label.cpp b/src/displayapp/Screens/Label.cpp
index 780ee88e..780ee88e 100644
--- a/src/DisplayApp/Screens/Label.cpp
+++ b/src/displayapp/Screens/Label.cpp
diff --git a/src/DisplayApp/Screens/Label.h b/src/displayapp/Screens/Label.h
index 3e7b3797..3e7b3797 100644
--- a/src/DisplayApp/Screens/Label.h
+++ b/src/displayapp/Screens/Label.h
diff --git a/src/DisplayApp/Screens/Meter.cpp b/src/displayapp/Screens/Meter.cpp
index c74b8bdf..c74b8bdf 100644
--- a/src/DisplayApp/Screens/Meter.cpp
+++ b/src/displayapp/Screens/Meter.cpp
diff --git a/src/DisplayApp/Screens/Meter.h b/src/displayapp/Screens/Meter.h
index ddf8be8d..ddf8be8d 100644
--- a/src/DisplayApp/Screens/Meter.h
+++ b/src/displayapp/Screens/Meter.h
diff --git a/src/DisplayApp/Screens/Modal.cpp b/src/displayapp/Screens/Modal.cpp
index 63ae70c0..63ae70c0 100644
--- a/src/DisplayApp/Screens/Modal.cpp
+++ b/src/displayapp/Screens/Modal.cpp
diff --git a/src/DisplayApp/Screens/Modal.h b/src/displayapp/Screens/Modal.h
index c616c294..c616c294 100644
--- a/src/DisplayApp/Screens/Modal.h
+++ b/src/displayapp/Screens/Modal.h
diff --git a/src/DisplayApp/Screens/Music.cpp b/src/displayapp/Screens/Music.cpp
index 9b7d198b..9b7d198b 100644
--- a/src/DisplayApp/Screens/Music.cpp
+++ b/src/displayapp/Screens/Music.cpp
diff --git a/src/DisplayApp/Screens/Music.h b/src/displayapp/Screens/Music.h
index 95cac0f0..95cac0f0 100644
--- a/src/DisplayApp/Screens/Music.h
+++ b/src/displayapp/Screens/Music.h
diff --git a/src/DisplayApp/Screens/Screen.cpp b/src/displayapp/Screens/Screen.cpp
index 1467df33..1467df33 100644
--- a/src/DisplayApp/Screens/Screen.cpp
+++ b/src/displayapp/Screens/Screen.cpp
diff --git a/src/DisplayApp/Screens/Screen.h b/src/displayapp/Screens/Screen.h
index dbf81a44..dbf81a44 100644
--- a/src/DisplayApp/Screens/Screen.h
+++ b/src/displayapp/Screens/Screen.h
diff --git a/src/DisplayApp/Screens/ScreenList.h b/src/displayapp/Screens/ScreenList.h
index d873336d..d873336d 100644
--- a/src/DisplayApp/Screens/ScreenList.h
+++ b/src/displayapp/Screens/ScreenList.h
diff --git a/src/DisplayApp/Screens/Symbols.h b/src/displayapp/Screens/Symbols.h
index aeea3243..aeea3243 100644
--- a/src/DisplayApp/Screens/Symbols.h
+++ b/src/displayapp/Screens/Symbols.h
diff --git a/src/DisplayApp/Screens/SystemInfo.cpp b/src/displayapp/Screens/SystemInfo.cpp
index fcafcf7d..fcafcf7d 100644
--- a/src/DisplayApp/Screens/SystemInfo.cpp
+++ b/src/displayapp/Screens/SystemInfo.cpp
diff --git a/src/DisplayApp/Screens/SystemInfo.h b/src/displayapp/Screens/SystemInfo.h
index ac8abae5..ac8abae5 100644
--- a/src/DisplayApp/Screens/SystemInfo.h
+++ b/src/displayapp/Screens/SystemInfo.h
diff --git a/src/DisplayApp/Screens/Tab.cpp b/src/displayapp/Screens/Tab.cpp
index adc32578..adc32578 100644
--- a/src/DisplayApp/Screens/Tab.cpp
+++ b/src/displayapp/Screens/Tab.cpp
diff --git a/src/DisplayApp/Screens/Tab.h b/src/displayapp/Screens/Tab.h
index e16dbb96..e16dbb96 100644
--- a/src/DisplayApp/Screens/Tab.h
+++ b/src/displayapp/Screens/Tab.h
diff --git a/src/DisplayApp/Screens/Tile.cpp b/src/displayapp/Screens/Tile.cpp
index 1447d789..1447d789 100644
--- a/src/DisplayApp/Screens/Tile.cpp
+++ b/src/displayapp/Screens/Tile.cpp
diff --git a/src/DisplayApp/Screens/Tile.h b/src/displayapp/Screens/Tile.h
index 3136d892..3136d892 100644
--- a/src/DisplayApp/Screens/Tile.h
+++ b/src/displayapp/Screens/Tile.h
diff --git a/src/DisplayApp/TouchEvents.h b/src/displayapp/TouchEvents.h
index cf2f88dd..cf2f88dd 100644
--- a/src/DisplayApp/TouchEvents.h
+++ b/src/displayapp/TouchEvents.h