Index: sources/gui/GuiGlobals.h
===================================================================
diff -u -r2624ed8acc30847fb38816fb4ae6073518b091f9 -rb069b0422c4a2ce4e41acfa873deb38c11b429ba
--- sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision 2624ed8acc30847fb38816fb4ae6073518b091f9)
+++ 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,
@@ -172,7 +171,7 @@
             // Pre-Treatment Consumables Installation Confirm
             ID_AdjustConsumablesConfirmReq              = 0x6800, // 104 // there is no specific response message for this request and changing of the state in Pre_Treatment_States is used as the response
             // Pre-Treatment SelfTest NoCartridge Progress Data
-            ID_SelfTestNoCartridgeData                  = 0x6100, // 97  // there is no specific response message for this request and changing of the state in Pre_Treatment_States is used as the response
+            ID_SelfTestNoCartridgeData                  = 0x610F, // 97  // there is no specific response message for this request and changing of the state in Pre_Treatment_States is used as the response
             // Pre-Treatment Disposables Installation Confirm
             ID_AdjustDisposablesConfirmReq              = 0x9200, // 146  // there is no specific response message for this request and changing of the state in Pre_Treatment_States is used as the response
             ID_AdjustDisposablesConfirmRsp              = 0x9300, // 147 // there is no specific response message for this request and changing of the state in Pre_Treatment_States is used as the response
@@ -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
@@ -211,7 +210,7 @@
             ID_DDHeatersData                            = 0x2800, // 40     //// ----- @LEAHIZED
             ID_DDLevelData                              = 0x2900, // 41     //// ----- @LEAHIZED
             ID_DDGenDialysateData                       = 0x2F00, // 47     //// ----- @LEAHIZED
-            ID_DDBloodLeakData                          = 0x6000, // 96     //// ----- TODO: Payload subject to change given FW implementation
+            ID_DDBloodLeakData                          = 0x6100, // 96     //// ----- @LEAHIZED
 
             // FP Data Messages
             ID_FPValvesStatesData                       = 0x310F, // 49     //// ----- @OBSOLETE. REMOVE?