Index: sources/gui/GuiGlobals.h
===================================================================
diff -u -r5e5c936f26d0dd06c89e9fd32de5775a37b52493 -rdbe55daa5838b4b8ee07037e78b393c296423cb3
--- sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision 5e5c936f26d0dd06c89e9fd32de5775a37b52493)
+++ sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision dbe55daa5838b4b8ee07037e78b393c296423cb3)
@@ -90,8 +90,8 @@
 
             // ----- Settings
             // Service Mode
-            ID_AdjustServiceModeReq                     = 0xB000, // 176
-            ID_AdjustServiceModeRsp                     = 0xB10F, // 177  //// ----- @CRAPIZED: had to change to avoid duplication
+            ID_AdjustServiceModeReq                     = 0xD000, // 208
+            ID_AdjustServiceModeRsp                     = 0xD100, // 209
 
             // 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
@@ -179,7 +179,7 @@
             // Pre-Treatment Disposable Priming
             ID_AdjustDisposablesPrimeReq                = 0x3C0F, // 60     //// ----- @CRAPIZED: had to change to avoid duplication
             ID_AdjustDisposablesPrimeRsp                = 0x3D0F, // 61     //// ----- @CRAPIZED: had to change to avoid duplication
-            ID_DisposablesPrimeData                     = 0x43FF, // ??     //// ----- @CRAPIZED - FFed
+            ID_DisposablesPrimeData                     = 0xC700, // 199    //// ----- @LEAHIZED
             // Pre-Treatment Patient Connection Begin
             ID_AdjustPatientConnectionBeginReq          = 0x640F, // 100    //// ----- @CRAPIZED: had to change to avoid duplication
             ID_AdjustPatientConnectionBeginRsp          = 0x650F, // 101   //// ----- @CRAPIZED: had to change to avoid duplication
@@ -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
@@ -363,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                       = 0xBC0F, // 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
@@ -509,7 +510,7 @@
         // Pre-Treatment Self Test Dry
         Q_ENUM(TD_Pre_Treatment_Dry_Self_Tests_States)
         // Pre-Treatment Prime
-        Q_ENUM(TD_Pre_Treatment_Prime_States)
+        Q_ENUM(TD_Prime_States)
         // Pre-Treatment Recirculate
         Q_ENUM(TD_Pre_Treatment_Recirc_States)
         // Post-Treatment SubMode
@@ -595,7 +596,7 @@
     // Pre-Treatment Self Test Dry
     typedef GuiActions::TD_Pre_Treatment_Dry_Self_Tests_States          GuiPreTreatmentSelfTestDryStates;
     // Pre-Treatment Prime
-    typedef GuiActions::TD_Pre_Treatment_Prime_States                   GuiPreTreatmentPrimeStates;
+    typedef GuiActions::TD_Prime_States                                 GuiPreTreatmentPrimeStates;
     // Pre-Treatment Recirculate
     typedef GuiActions::TD_Pre_Treatment_Recirc_States                  GuiPreTreatmentRecirculateStates;