Index: sources/gui/GuiGlobals.h
===================================================================
diff -u -r7360f85ae13ee2a460ddfb11bc455203d6edf3ff -rb069b0422c4a2ce4e41acfa873deb38c11b429ba
--- sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision 7360f85ae13ee2a460ddfb11bc455203d6edf3ff)
+++ sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision b069b0422c4a2ce4e41acfa873deb38c11b429ba)
@@ -127,8 +127,7 @@
             ID_PostTreatmentStates                      = 0x770F, // 119    //// ----- @CRAPIZED: had to change to avoid duplication
 
             // -----
-            ID_PowerOff                                 = 0xB700, // 183    //// ----- @LEAHIZED
-            ID_ShuttingDown                             = 0x0E0F, // 35     //// ----- @CRAPIZED: had to change to avoid duplication
+            ID_PowerOffWarning                          = 0x2200, // 34     //// ----- @LEAHIZED
             ID_TreatmentTime                            = 0x3B00, // 59     //// ----- @LEAHIZED
             ID_BloodFlow                                = 0x1100, // 17     //// ----- @LEAHIZED
             ID_DialysateInletFlow                       = 0x0800,
@@ -201,7 +200,7 @@
             ID_DDOperationModeData                      = 0x1300,
             ID_DGReservoirData                          = 0x280F, // ??   //// ----- @CRAPIZED: had to change to avoid duplication
             ID_DGLoadCellReadingsData                   = 0x0C00, // 12
-            ID_DGAccelerometerData                      = 0x3400, // 52
+            ID_DGAccelerometerData                      = 0x340F, // 52   //// ----- @CRAPIZED: had to change to avoid duplication
             ID_DDValvesStatesData                       = 0x1B00, // 27     //// ----- @LEAHIZED
             ID_DDPressuresData                          = 0x1C00, // 28     //// ----- @LEAHIZED
             ID_DDConductivityData                       = 0x1F00, // 31     //// ----- @LEAHIZED
Index: sources/gui/qml/pages/settings/SettingsStack.qml
===================================================================
diff -u -r16028b057650dab9f5a2f27eaba5c9618c29dd9a -rb069b0422c4a2ce4e41acfa873deb38c11b429ba
--- sources/gui/qml/pages/settings/SettingsStack.qml	(.../SettingsStack.qml)	(revision 16028b057650dab9f5a2f27eaba5c9618c29dd9a)
+++ sources/gui/qml/pages/settings/SettingsStack.qml	(.../SettingsStack.qml)	(revision b069b0422c4a2ce4e41acfa873deb38c11b429ba)
@@ -104,7 +104,7 @@
     }
     property var itemsText  : [
         qsTr("Device Information"               ), // Device Information
-        qsTr("Volume And Brightness"            ), // VolumeBrightness
+        qsTr("Display and Volume"               ), // VolumeBrightness
         qsTr("Wi-Fi"                            ), // WiFi
         qsTr("Device Cleaning"                  ), // DGCleaning
         qsTr("DG Scheduling"                    ), // DGScheduling