Index: sources/gui/GuiGlobals.h
===================================================================
diff -u -r9eb583ef8480f80fe55be7b88b3ed1a27109492a -rd82d6c9dbf4b10a90a1e5e742e9c31400c547358
--- sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision 9eb583ef8480f80fe55be7b88b3ed1a27109492a)
+++ sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision d82d6c9dbf4b10a90a1e5e742e9c31400c547358)
@@ -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
@@ -306,6 +306,21 @@
             ID_AdjustIsolatedUFConfirmReq               = 0x9F00, // 159  //// ----- @LEAHIZED
             ID_AdjustIsolatedUFConfirmRsp               = 0xA000, // 160  //// ----- @LEAHIZED
 
+            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
@@ -348,9 +363,10 @@
             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                       = 0xC40F, // 196    //// ----- @CRAPIZED: had to change to avoid duplication
+            ID_RoWaterModeReq                           = 0xEB00, // 235
+            ID_RoWaterModeRsp                           = 0xEC00, // 236
+            ID_AdjustRoWaterModeReq                     = 0xED00, // 237
+            ID_AdjustRoWaterModeRsp                     = 0xEE00, // 238
 
 
             // Institutional record request and response