Index: sources/gui/GuiGlobals.h
===================================================================
diff -u -r5f69bb944ed9b2186528f726def2630544bd0de6 -rfd7a047d5520d16d4621aaddcb008467ad6ee5b5
--- sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision 5f69bb944ed9b2186528f726def2630544bd0de6)
+++ sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision fd7a047d5520d16d4621aaddcb008467ad6ee5b5)
@@ -117,22 +117,21 @@
             ID_AdjustHDDateTimeRsp                      = 0x6E00, // 110
             ID_AdjustDGDateTimeReq                      = 0x6F00, // 111
             ID_AdjustDGDateTimeRsp                      = 0x7000, // 112
-            ID_HDRTCEpochData                           = 0x0A00, // 10
+            ID_HDRTCEpochData                           = 0x0A0F, // 10     //// ----- @CRAPIZED
 
             // State Messages
-            ID_HDOperationModeData                      = 0x1200, // 18     //// ----- @LEAHIZED
+            ID_TDOpModeData                             = 0x1200, // 18     //// ----- @LEAHIZED
             ID_PreTreatmentStates                       = 0x5C00, // 92
             ID_TreatmentStates                          = 0x0F0F, // 15    //// ----- @CRAPIZED: had to change to avoid duplication
             ID_PostTreatmentStates                      = 0x7700, // 119
 
             // -----
-            ID_PowerOff                                 = 0x0100,
+            ID_PowerOff                                 = 0x010F, // 010F   //// ----- @CRAPIZED
             ID_ShuttingDown                             = 0x0E0F, // 35  //// ----- @CRAPIZED: had to change to avoid duplication
             ID_TreatmentTime                            = 0x0D0F, //     //// ----- @CRAPIZED: had to change to avoid duplication
             ID_BloodFlow                                = 0x0500,
             ID_DialysateInletFlow                       = 0x0800,
             ID_DialysateOutletFlow                      = 0x0B00,
-            ID_TreatmentRanges                          = 0x1A00, // 26
             ID_PressureOcclusion                        = 0x0900,
             ID_Saline                                   = 0x2F00, // 47
             ID_Heparin                                  = 0x4D00, // 77
@@ -142,24 +141,24 @@
             ID_TreatmentStop                            = 0x4900, // 73
 
             // Alarm Messages
-            ID_AlarmStatus                              = 0x0200,
-            ID_AlarmTriggered                           = 0x0300,
-            ID_AlarmCleared                             = 0x0400,
-            ID_AlarmSilenceReq                          = 0x3200, // 50
-            ID_AlarmUserActionReq                       = 0x4000, // 64 // there is no response since it is kind of the response to the ID_AlarmStatus from UI to HD
-            ID_AlarmActiveListReq                       = 0x9700, // 151
-            ID_AlarmActiveListRsp                       = 0x9800, // 152
-            ID_AlarmVolumeSetReq                        = 0x4E00, // 78
-            ID_AlarmVolumeSetRsp                        = 0x7C00, // 124
+            ID_AlarmStatus                              = 0x0100, // 01     //// ----- @LEAHIZED
+            ID_AlarmTriggered                           = 0x0200, // 02     //// ----- @LEAHIZED
+            ID_AlarmCleared                             = 0x0300, // 03     //// ----- @LEAHIZED
+            ID_AlarmSilenceReq                          = 0x0500, // 05     //// ----- @LEAHIZED
+            ID_AlarmUserActionReq                       = 0x0600, // 06     //// ----- @LEAHIZED
+            ID_AlarmActiveListReq                       = 0x0900, // 09     //// ----- @LEAHIZED
+            ID_AlarmActiveListRsp                       = 0x0A00, // 10     //// ----- @LEAHIZED
+            ID_AlarmVolumeSetReq                        = 0x0B00, // 11     //// ----- @LEAHIZED
+            ID_AlarmVolumeSetRsp                        = 0x0C00, // 12     //// ----- @LEAHIZED
 
-            // Pre-Treatment
-            // Pre-Treatment Initiate Treatment
-            ID_AdjustInitTreatmentReq                   = 0x3800, // 56
-            ID_AdjustInitTreatmentRsp                   = 0x3900, // 57
-            // Pre-Treatment Parameters Validation/Confirm
-            ID_AdjustParametersValidationReq            = 0x3500, // 53
-            ID_AdjustParametersValidationRsp            = 0x3600, // 54
-            ID_AdjustParametersConfirmReq               = 0x3B00, // 59
+            // Create Rx
+            ID_AdjustInitTreatmentReq                   = 0x4500, // 69     //// ----- @LEAHIZED
+            ID_AdjustInitTreatmentRsp                   = 0x4600, // 70     //// ----- @LEAHIZED
+            ID_AdjustParametersValidationReq            = 0x3F00, // 63     //// ----- @LEAHIZED
+            ID_AdjustParametersValidationRsp            = 0x4000, // 64     //// ----- @LEAHIZED
+            ID_AdjustParametersConfirmReq               = 0x4400, // 68     //// ----- @LEAHIZED
+            ID_TreatmentRanges                          = 0x4300, // 67     //// ----- @LEAHIZED
+
             // Pre-Treatment Water Sample
             ID_DGFilterFlushData                        = 0x6000, // 96
             ID_AdjustWaterSampleReq                     = 0x5D00, // 93
@@ -177,7 +176,7 @@
             // Pre-Treatment Disposable Priming
             ID_AdjustDisposablesPrimeReq                = 0x3C00, // 60
             ID_AdjustDisposablesPrimeRsp                = 0x3D00, // 61
-            ID_DisposablesPrimeData                     = 0x4300, // 67
+            ID_DisposablesPrimeData                     = 0x43FF, // ??     //// ----- @CRAPIZED - FFed
             // Pre-Treatment Patient Connection Begin
             ID_AdjustPatientConnectionBeginReq          = 0x6400, // 100
             ID_AdjustPatientConnectionBeginRsp          = 0x6500, // 101
@@ -260,7 +259,7 @@
             // 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        = 0x0600, //   6
+            ID_AdjustPatientDisconnectConfirmReq        = 0x060F, //  060f   //// ----- @CRAPIZED
             ID_AdjustPatientDisconnectConfirmRsp        = 0x7E00, // 126
 
             // Disposables Removal