Index: sources/gui/GuiGlobals.h
===================================================================
diff -u -r5a3c8d31fb220eb82f4f1d5c1ea063f05cb43287 -r5f69bb944ed9b2186528f726def2630544bd0de6
--- sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision 5a3c8d31fb220eb82f4f1d5c1ea063f05cb43287)
+++ sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision 5f69bb944ed9b2186528f726def2630544bd0de6)
@@ -95,13 +95,13 @@
             ID_AdjustServiceModeRsp                    = 0xB100, // 177
 
             // Version
-            ID_AdjustVersionsUIReq                      = 0x1C00, // 28
-            ID_AdjustVersionsUIRsp                      = 0x9F00, // 159 // ID_UIVersionsTxr - UI Version response transmit
-            ID_AdjustVersionsHDReq                      = 0x9E00, // 158 // ID_HDVersionsRxq - HD Version request  received
-            ID_AdjustVersionsHDRsp                      = 0x1D00, // 29
-            ID_AdjustVersionsDGRsp                      = 0x1E00, // 30
-            ID_AdjustSerialHDRsp                        = 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_TDVersionsRxq - TD Version request  received    //// ----- @LEAHIZED
+            ID_AdjustVersionsTDRsp                      = 0x0E00, // 14     //// ----- @LEAHIZED
+            ID_AdjustVersionsDDRsp                      = 0x0F00, // 15     //// ----- @LEAHIZED
+            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                          = 0x0F00, // 15
+            ID_TreatmentStates                          = 0x0F0F, // 15    //// ----- @CRAPIZED: had to change to avoid duplication
             ID_PostTreatmentStates                      = 0x7700, // 119
 
             // -----
             ID_PowerOff                                 = 0x0100,
-            ID_ShuttingDown                             = 0x0E00,
-            ID_TreatmentTime                            = 0x0D00,
+            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,
@@ -209,10 +209,17 @@
             ID_HDSyringePumpData                        = 0x6900, // 105
             ID_HDBloodLeakData                          = 0x6C00, // 108
             ID_HDAirBubbleData                          = 0x9300, // 147
-            ID_HDAirTrapData                            = 0x3E00, // 62
+            ID_TDAirTrapData                            = 0x2A00, // 42   //// ----- @LEAHIZED
+            ID_TDVoltageData                            = 0x1D00, // 29   //// ----- @LEAHIZED
+            ID_TDBloodPumpData                          = 0x1100, // 17   //// ----- @LEAHIZED
+            ID_TDValvesData                             = 0x2B00, // 43   //// ----- @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: MsgID subject to change given FW implementation
 
             // In-Treatment Adjustables
-            ID_AdjustDurationReq                        = 0x1600, // 22
+            ID_AdjustDurationReq                        = 0x160F, // 22 //// ----- @CRAPIZED: had to change to avoid duplication
             ID_AdjustDurationRsp                        = 0x1B00, // 27
 
             ID_AdjustBloodDialysateReq                  = 0x1700, // 23
@@ -234,7 +241,7 @@
             ID_AdjustUltrafiltrationEditReq             = 0x1100, // 17
             ID_AdjustUltrafiltrationEditRsp             = 0x1300, // 19
 
-            ID_AdjustUltrafiltrationConfirmReq          = 0x1500, // 21
+            ID_AdjustUltrafiltrationConfirmReq          = 0x150F, // 21 //// ----- @CRAPIZED: had to change to avoid duplication
             ID_AdjustUltrafiltrationConfirmRsp          = 0x2E00, // 46
 
             // End-Treatment
@@ -264,9 +271,9 @@
             ID_AdjustTreatmentLogReq                    = 0x7500, // 117
             ID_AdjustTreatmentLogRsp                    = 0x7600, // 118
             // Treatment Log Data
-            ID_TreatmentLogAvrgeData                    = 0x9400, // 148
-            ID_TreatmentLogAlarmData                    = 0x9500, // 149
-            ID_TreatmentLogEventData                    = 0x9600, // 150
+            ID_TreatmentLogAvrgeData                    = 0x940F, // 148 //// ----- @CRAPIZED: had to change to avoid duplication
+            ID_TreatmentLogAlarmData                    = 0x950F, // 149 //// ----- @CRAPIZED: had to change to avoid duplication
+            ID_TreatmentLogEventData                    = 0x960F, // 150 //// ----- @CRAPIZED: had to change to avoid duplication
 
             // Disinfect
             ID_AdjustDisinfectModeReq                   = 0x9A00, // 154