Index: sources/gui/GuiGlobals.h
===================================================================
diff -u -raf9b5ee3e759ca45c4e55488f46601f30143edae -r8a8e17d51f3dc3f83ab7b284a4da1c9cabce59d2
--- sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision af9b5ee3e759ca45c4e55488f46601f30143edae)
+++ sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision 8a8e17d51f3dc3f83ab7b284a4da1c9cabce59d2)
@@ -95,13 +95,13 @@
             ID_AdjustServiceModeRsp                    = 0xB100, // 177
 
             // Version
-            ID_AdjustVersionsUIReq                      = 0x0D00, // 13    //// ----- @LEAHIZED
-            ID_AdjustVersionsUIRsp                      = 0x1600, // 22 // ID_UIVersionsTxr - UI Version response transmit    //// ----- @LEAHIZED
-            ID_AdjustVersionsTDReq                      = 0x1500, // 21 // ID_HDVersionsRxq - HD Version request  received    //// ----- @LEAHIZED
-            ID_AdjustVersionsTDRsp                      = 0x0E00, // 14    //// ----- @LEAHIZED
-            ID_AdjustVersionsDDRsp                      = 0x0F00, // 15
-            ID_AdjustSerialTDRsp                        = 0x9900, // 153
-            ID_AdjustSerialDGRsp                        = 0x8800, // 136
+            ID_AdjustVersionsUIReq                      = 0x0D00, // 13     //// ----- @LEAHIZED
+            ID_AdjustVersionsUIRsp                      = 0x1600, // 22     // ID_UIVersionsTxr - UI Version response transmit    //// ----- @LEAHIZED
+            ID_AdjustVersionsTDReq                      = 0x1500, // 21     // ID_HDVersionsRxq - HD Version request  received    //// ----- @LEAHIZED
+            ID_AdjustVersionsTDRsp                      = 0x0E00, // 14     //// ----- @LEAHIZED
+            ID_AdjustVersionsDGRsp                      = 0x0F00, // 15
+            ID_AdjustSerialTDRsp                        = 0x9900, // 153    //// ----- TODO: Update message ID and payload once defined in FW
+            ID_AdjustSerialDDRsp                        = 0x8800, // 136    //// ----- TODO: Update message ID and payload once defined in FW
 
             // Service Information
             ID_AdjustServiceDatesReq                    = 0x8900, // 137
@@ -122,13 +122,13 @@
             // State Messages
             ID_HDOperationModeData                      = 0x1200, // 18     //// ----- @LEAHIZED
             ID_PreTreatmentStates                       = 0x5C00, // 92
-            ID_TreatmentStates                          = 0x0F0F, // 15    //// ----- @LEAHIZED
+            ID_TreatmentStates                          = 0x0F0F, // 15    //// ----- @CRAPIZED: had to change to avoid duplication
             ID_PostTreatmentStates                      = 0x7700, // 119
 
             // -----
             ID_PowerOff                                 = 0x0100,
-            ID_ShuttingDown                             = 0x2300, // 35    //// ----- @LEAHIZED
-            ID_TreatmentTime                            = 0x0D0F, // //// ----- @CRAPIZED: had to change to avoid duplication
+            ID_ShuttingDown                             = 0x0E0F, // 35  //// ----- @CRAPIZED: had to change to avoid duplication
+            ID_TreatmentTime                            = 0x0D0F, //     //// ----- @CRAPIZED: had to change to avoid duplication
             ID_BloodFlow                                = 0x0500,
             ID_DialysateInletFlow                       = 0x0800,
             ID_DialysateOutletFlow                      = 0x0B00,
@@ -213,10 +213,10 @@
             ID_TDVoltageData                            = 0x1D00, // 29   //// ----- @LEAHIZED
             ID_TDBloodPumpData                          = 0x1100, // 17   //// ----- @LEAHIZED
             ID_TDValvesData                             = 0x2B00, // 43   //// ----- @LEAHIZED
-            ID_TDBatteryData                            = 0x9400, //149   //// ----- TODO: @LEAHIZED
+            ID_TDBatteryData                            = 0x9400, //149   //// ----- TODO: MsgID subject to change given FW implementation
             ID_TDSwitchesData                           = 0x2100, // 33   //// ----- @LEAHIZED
             ID_TDEjectorData                            = 0x4E00, // 78   //// ----- @LEAHIZED
-            ID_TDTemperatureData                        = 0x9100, //146   //// ----- TODO: @LEAHIZED
+            ID_TDTemperatureData                        = 0x9100, //146   //// ----- TODO: MsgID subject to change given FW implementation
 
             // In-Treatment Adjustables
             ID_AdjustDurationReq                        = 0x160F, // 22 //// ----- @CRAPIZED: had to change to avoid duplication