40 files changed, 36 insertions, 36 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 546ce813..9d03e904 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -324,23 +324,23 @@ list(APPEND IMAGE_FILES
 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/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
@@ -401,23 +401,23 @@ set(INCLUDE_FILES
         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/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
@@ -453,7 +453,7 @@ set(INCLUDE_FILES
         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/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/libs/lvgl/src/lv_core/lv_obj.c b/src/libs/lvgl/src/lv_core/lv_obj.c
index 510a8706..511e72db 100644
--- a/src/libs/lvgl/src/lv_core/lv_obj.c
+++ b/src/libs/lvgl/src/lv_core/lv_obj.c
@@ -163,7 +163,7 @@ lv_obj_t * lv_obj_create(lv_obj_t * parent, const lv_obj_t * copy)
         LV_ASSERT_MEM(new_obj);
         if(new_obj == NULL) return NULL;
 
-        new_obj->par = NULL; /*Screens has no a parent*/
+        new_obj->par = NULL; /*screens has no a parent*/
         lv_ll_init(&(new_obj->child_ll), sizeof(lv_obj_t));
 
         /*Set the callbacks*/