Index: sources/gui/GuiGlobals.h
===================================================================
diff -u -re88cc4de6dae78dd9412e4935f77af478125f407 -r7b7d5478285cfb78793a96d327e9f0a064d9d0d7
--- sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision e88cc4de6dae78dd9412e4935f77af478125f407)
+++ sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision 7b7d5478285cfb78793a96d327e9f0a064d9d0d7)
@@ -100,8 +100,8 @@
             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
+            ID_AdjustSerialTDRsp                        = 0x5100, // 81     //// ----- @LEAHIZED
+            ID_AdjustSerialDDRsp                        = 0x5200, // 82     //// ----- @LEAHIZED
 
             // Service Information
             ID_AdjustServiceDatesReq                    = 0x8900, // 137
@@ -213,11 +213,11 @@
             ID_TDAirTrapData                            = 0x2A00, // 42   //// ----- @LEAHIZED
             ID_TDVoltageData                            = 0x1D00, // 29   //// ----- @LEAHIZED
             ID_TDValvesData                             = 0x2B00, // 43   //// ----- @LEAHIZED
-            ID_TDBatteryData                            = 0x9400, //149   //// ----- TODO: MsgID subject to change given FW implementation
+            ID_TDBatteryData                            = 0x5400, // 84   //// ----- TODO: Payload 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
-            ID_TreatmentSetPointData                    = 0x4F00, // 79     //// ----- @LEAHIZED
+            ID_TDTemperatureData                        = 0x5300, // 83   //// ----- TODO: Payload subject to change given FW implementation
+            ID_TreatmentSetPointData                    = 0x4F00, // 79   //// ----- @LEAHIZED
 
             // In-Treatment Adjustables
             ID_AdjustDurationReq                        = 0x160F, // 22 //// ----- @CRAPIZED: had to change to avoid duplication
@@ -247,11 +247,11 @@
 
             // End-Treatment
             // Rinseback
-            ID_AdjustRinsebackReq                       = 0x5200, // 82
-            ID_AdjustRinsebackRsp                       = 0x5300, // 83
+            ID_AdjustRinsebackReq                       = 0x520F, // 82 //// ----- @CRAPIZED: had to change to avoid duplication
+            ID_AdjustRinsebackRsp                       = 0x530F, // 83 //// ----- @CRAPIZED: had to change to avoid duplication
 
             // Recirculate
-            ID_AdjustRecirculateReq                     = 0x5400, // 84
+            ID_AdjustRecirculateReq                     = 0x540F, // 84 //// ----- @CRAPIZED: had to change to avoid duplication
             ID_AdjustRecirculateRsp                     = 0x5500, // 85
 
             // Treatment End