Index: sources/gui/GuiGlobals.h
===================================================================
diff -u -rca67f7413160dfba507856222bd9aa95c5fa6200 -r9403146058e7c4cef17bd542bbd39bbf032be9f3
--- sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision ca67f7413160dfba507856222bd9aa95c5fa6200)
+++ sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision 9403146058e7c4cef17bd542bbd39bbf032be9f3)
@@ -165,11 +165,9 @@
 
             // Pre-Treatment Water Sample
             ID_DGFilterFlushData                        = 0x600F, // ??     //// ----- @CRAPIZED: had to change to avoid duplication
-            ID_AdjustWaterSampleReq                     = 0x5D00, // 93
-            ID_AdjustWaterSampleRsp                     = 0x5E00, // 94
             ID_AdjustWaterSampleResultReq               = 0XA300, // 163
-            ID_AdjustWaterSampleData                    = 0xAB00, //
-            ID_AdjustWaterSampleTimeout                 = 0xAc00, //
+            ID_AdjustWaterSampleResultRsp               = 0xAB00, //
+            ID_AdjustWaterSampleData                    = 0xAC00, //
 
             // Pre-Treatment Consumables Installation Confirm
             ID_AdjustConsumablesConfirmReq              = 0x6800, // 104 // there is no specific response message for this request and changing of the state in Pre_Treatment_States is used as the response
@@ -318,16 +316,17 @@
             // Post-Treatment
             // Patient Disconnect
             ID_AdjustPatientDisconnectNotifyReq         = 0x4A00, //  74 // there is no specific response message for this request and changing of the state in Pre_Treatment_States is used as the response
-            ID_AdjustPatientDisconnectConfirmReq        = 0x060F, //  060f   //// ----- @CRAPIZED
-            ID_AdjustPatientDisconnectConfirmRsp        = 0x7E0F, // 126    //// ----- @CRAPIZED: had to change to avoid duplication
+            ID_AdjustPatientDisconnectConfirmReq        = 0x5500, // 85
+            ID_AdjustPatientDisconnectConfirmRsp        = 0x5600, // 86
 
             // Disposables Removal
             ID_AdjustDisposablesRemovalConfirmReq       = 0x9400, // 148
             ID_AdjustDisposablesRemovalConfirmRsp       = 0x9500, // 149
 
             // Treatment Log Adjs
-            ID_AdjustTreatmentLogReq                    = 0x750F, // 117 //// ----- @CRAPIZED: had to change to avoid duplication
-            ID_AdjustTreatmentLogRsp                    = 0x760F, // 118 //// ----- @CRAPIZED: had to change to avoid duplication
+            ID_AdjustTreatmentLogReq                    = 0xA900, // 166
+            ID_AdjustTreatmentLogRsp                    = 0xAA00, // 167
+
             // Treatment Log Data
             ID_TreatmentLogAvrgeData                    = 0x940F, // 148 //// ----- @CRAPIZED: had to change to avoid duplication
             ID_TreatmentLogAlarmData                    = 0x6A00, // 106  //// ----- @LEAHIZED