Index: sources/gui/GuiGlobals.h
===================================================================
diff -u -r8eee2f9b4de52348bdb7816bfefa9956f1042d94 -r4c32cadadd4c8abdee1eab4ef6425f356f863547
--- sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision 8eee2f9b4de52348bdb7816bfefa9956f1042d94)
+++ sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision 4c32cadadd4c8abdee1eab4ef6425f356f863547)
@@ -91,7 +91,7 @@
             // ----- Settings
             // Service Mode
             ID_AdjustServiceModeReq                     = 0xB000, // 176
-            ID_AdjustServiceModeRsp                     = 0xB100, // 177
+            ID_AdjustServiceModeRsp                     = 0xB10F, // 177  //// ----- @CRAPIZED: had to change to avoid duplication
 
             // Version
             ID_AdjustVersionsUIReq                      = 0x0D00, // 13     //// ----- @LEAHIZED
@@ -121,7 +121,7 @@
 
             // State Messages
             ID_TDOpModeData                             = 0x1200, // 18     //// ----- @LEAHIZED
-            ID_PreTreatmentStates                       = 0x5C00, // 92
+            ID_PreTreatmentStates                       = 0xB700, // 183    //// ----- @LEAHIZED
             ID_TreatmentStates                          = 0x3C00, // 60     //// ----- @LEAHIZED
             ID_PostTreatmentStates                      = 0x770F, // 119    //// ----- @CRAPIZED: had to change to avoid duplication
 
@@ -130,7 +130,7 @@
             ID_TreatmentTime                            = 0x3B00, // 59     //// ----- @LEAHIZED
             ID_BloodFlow                                = 0x1100, // 17     //// ----- @LEAHIZED
             ID_DialysateInletFlow                       = 0x0800,
-            ID_DialysateOutletFlow                      = 0x0B00,
+            ID_DialysateOutletFlow                      = 0x0B0F,           //// ----- @CRAPIZED
             ID_PressureOcclusion                        = 0x2400, // 36     //// ----- @LEAHIZED
             ID_Saline                                   = 0x3D00, // 61     //// ----- @LEAHIZED
             ID_Ultrafiltration                          = 0x3E00, // 62     //// ----- @LEAHIZED
@@ -198,7 +198,7 @@
             ID_DGDrainPumpData                          = 0x240F, // ??   //// ----- @CRAPIZED: had to change to avoid duplication
             ID_DDOperationModeData                      = 0x1300,
             ID_DGReservoirData                          = 0x280F, // ??   //// ----- @CRAPIZED: had to change to avoid duplication
-            ID_DGLoadCellReadingsData                   = 0x0C00, // 12
+            ID_DGLoadCellReadingsData                   = 0x0C0F, // 12
             ID_DGAccelerometerData                      = 0x340F, // 52   //// ----- @CRAPIZED: had to change to avoid duplication
             ID_DDValvesStatesData                       = 0x1B00, // 27     //// ----- @LEAHIZED
             ID_DDPressuresData                          = 0x1C00, // 28     //// ----- @LEAHIZED
@@ -224,7 +224,7 @@
 
             // HD Data Messages
             ID_HDAccelerometerData                      = 0x3300, // 51
-            ID_HDSyringePumpData                        = 0x6900, // 105
+            ID_TDSyringePumpData                        = 0xB100, // 177
             ID_HDBloodLeakData                          = 0x6C0F, // 108  //// ----- @CRAPIZED: had to change to avoid duplication
             ID_TDAirBubbleData                          = 0x1E00, // 30   //// ----- @LEAHIZED
             ID_TDAirPumpData                            = 0x2000, // 32   //// ----- @LEAHIZED
@@ -280,6 +280,10 @@
             ID_AdjustHeparinReq                         = 0x8A00, // 138
             ID_AdjustHeparinRsp                         = 0x8B00, // 139
 
+            ID_DryBicartDisconnectData                  = 0xC400, // 196
+            ID_AdjustDryBicartDisconnectReq             = 0xC500, // 197
+            ID_AdjustDryBicartDisconnectRsp             = 0xC600, // 198
+
             ID_AdjustPressuresWideningReq               = 0xA400, // 114  //// ----- @LEAHIZED
             ID_AdjustPressuresWideningRsp               = 0xA500, // 115  //// ----- @LEAHIZED
 
@@ -305,6 +309,18 @@
             ID_AdjustIsoUFStateReq                      = 0xBA00, // 186  //// ----- @LEAHIZED
             ID_AdjustIsoUFStateRsp                      = 0xBB00, // 187  //// ----- @LEAHIZED
 
+            // HDF
+            ID_HDF                                      = 0xBC00, // 188  //// ----- @LEAHIZED
+
+            ID_AdjustHDFStateReq                        = 0xBD00, // 189  //// ----- @LEAHIZED
+            ID_AdjsutHDFStateRsp                        = 0xBE00, // 190  //// ----- @LEAHIZED
+
+            ID_AdjustAutoSubReq                         = 0xBF00, // 191  //// ----- @LEAHIZED
+            ID_AdjustAutoSubRsp                         = 0xC000, // 192  //// ----- @LEAHIZED
+
+            ID_AdjustHDFReq                             = 0xC100, // 193  //// ----- @LEAHIZED
+            ID_AdjustHDFRsp                             = 0xC200, // 194  //// ----- @LEAHIZED
+
             // End-Treatment
             // Rinseback
             ID_AdjustRinsebackReq                       = 0x9000, // 144  //// ----- @LEAHIZED
@@ -347,10 +363,12 @@
             ID_AdjustDGCleaningUsageRsp                 = 0x8D0F, // 141    //// ----- @CRAPIZED: had to change to avoid duplication
 
             // RO Water Input Mode
-            ID_DuetRoWaterStatDGq                       = 0xC300, // 195 DG -> UI // DG initiates Status query
-            ID_DuetRoWaterModeUIi                       = 0xBC00, // 188 UI -> DG // UI initiates Mode Set || responses to status query
-            ID_DuetRoWaterModeDGr                       = 0xC400, // 196 UI <- DG // DG responses Mode Set
+            ID_RoWaterModeReq                           = 0xEB00, // 235
+            ID_RoWaterModeRsp                           = 0xEC00, // 236
+            ID_AdjustRoWaterModeReq                     = 0xED00, // 237
+            ID_AdjustRoWaterModeRsp                     = 0xEE00, // 238
 
+
             // Institutional record request and response
             ID_InstitutionalRecordReq                   = 0x8200, // 130 UI -> TD request institutional record
             ID_InstitutionalRecordRsp                   = 0x8300, // 131 TD -> UI response institutional record