Index: sources/gui/qml/main.qml
===================================================================
diff -u -r9c0335bc7f5a2b591a9c6241b00ebb9510ea611a -rd82d6c9dbf4b10a90a1e5e742e9c31400c547358
--- sources/gui/qml/main.qml	(.../main.qml)	(revision 9c0335bc7f5a2b591a9c6241b00ebb9510ea611a)
+++ sources/gui/qml/main.qml	(.../main.qml)	(revision d82d6c9dbf4b10a90a1e5e742e9c31400c547358)
@@ -54,10 +54,12 @@
 import VDateTime                                            0.1
 import VAdjustmentAlarmVolume                               0.1
 import VBluetooth                                           0.1
-import VDuetRoWaterDG                                       0.1
+import VAdjustRoWaterMode                                   0.1
+import VRoWaterMode                                         0.1
 import VCloudSync                                           0.1
 import VHDUsageInfo                                         0.1
 import VInstitutionalRecord                                 0.1
+import VCalibrationSettings                                 0.1
 import VAdjustmentInstitutionalRecord                       0.1
 import VAdvancedInstitutionalRecord                         0.1
 import VAdjustmentAdvancedInstitutionalRecord               0.1
@@ -86,6 +88,7 @@
 import VTreatmentRanges                                     0.1
 import VTreatmentHeparin                                    0.1
 import VTreatmentTrends                                     0.1
+import VTreatmentHDF                                        0.1
 import VTreatmentDryBicartDisconnect                        0.1
 
 // Pre-Treatment
@@ -144,6 +147,7 @@
 import VTreatmentAdjustmentIsolatedUFVolumeEdit             0.1
 import VTreatmentAdjustmentIsolatedUFConfirm                0.1
 import VTreatmentAdjustmentUltrafiltrationState             0.1
+import VTreatmentAdjustmentIsolatedUFState                  0.1
 import VTreatmentAdjustmentUltrafiltrationEdit              0.1
 import VTreatmentAdjustmentUltrafiltrationConfirm           0.1
 import VTreatmentAdjustmentPressuresLimits                  0.1
@@ -154,6 +158,9 @@
 import VTreatmentAdjustmentRinseback                        0.1
 import VTreatmentAdjustmentRecirculate                      0.1
 import VTreatmentAdjustmentEnd                              0.1
+import VTreatmentAdjustmentAutoSub                          0.1
+import VTreatmentAdjustmentHDFState                         0.1
+import VTreatmentAdjustmentHDF                              0.1
 import VTreatmentAdjustmentDryBicartDisconnect              0.1
 // Post-Treatmnt
 import VPostTreatmentAdjustmentPatientDisconnectionConfirm  0.1
@@ -198,13 +205,16 @@
     VDateTime                                           { id: vDateTime                                             }
     VAdjustmentAlarmVolume                              { id: vAdjustmentAlarmVolume                                }
     VBluetooth                                          { id: vBluetooth                                            }
-    VDuetRoWaterDG                                      { id: vDuetRoWaterDG                                        }
+    VAdjustRoWaterMode                                  { id: vAdjustRoWaterMode                                    }
+    VRoWaterMode                                        { id: vRoWaterMode                                          }
     VCloudSync                                          { id: vCloudSync                                            }
     VHDUsageInfo                                        { id: vHDUsageInfo                                          }
     VAdjustmentInstitutionalRecord                      { id: vAdjustmentInstitutionalRecord                        }
     VInstitutionalRecord                                { id: vInstitutionalRecord                                  }
     VAdjustmentAdvancedInstitutionalRecord              { id: vAdjustmentAdvancedInstitutionalRecord                }
     VAdvancedInstitutionalRecord                        { id: vAdvancedInstitutionalRecord                          }
+    VCalibrationSettings                                { id: vCalibrationSettings                                  }
+
     //VAdjustIn
     // ---- States
     VTDOpMode                                    { id: vTDOpMode
@@ -260,6 +270,7 @@
     VTreatmentRecirculate                               { id: vTreatmentRecirculate                                 }
     VTreatmentStop                                      { id: vTreatmentStop                                        }
     VTreatmentHeparin                                   { id: vTreatmentHeparin                                     }
+    VTreatmentHDF                                       { id: vTreatmentHDF                                         }
     VTreatmentDryBicartDisconnect                       { id: vTreatmentDryBicartDisconnect                         }
 
     // ---- DD
@@ -322,6 +333,7 @@
     VTreatmentAdjustmentIsolatedUFDurationEdit          { id: vTreatmentAdjustmentIsolatedUFDurationEdit            }
     VTreatmentAdjustmentIsolatedUFVolumeEdit            { id: vTreatmentAdjustmentIsolatedUFVolumeEdit              }
     VTreatmentAdjustmentIsolatedUFConfirm               { id: vTreatmentAdjustmentIsolatedUFConfirm                 }
+    VTreatmentAdjustmentIsolatedUFState                 { id: vTreatmentAdjustmentIsolatedUFState                   }
     VTreatmentAdjustmentSaline                          { id: vTreatmentAdjustmentSaline                            }
     VTreatmentAdjustmentVitals                          { id: vTreatmentAdjustmentVitals                            }
     VTreatmentAdjustmentUltrafiltrationState            { id: vTreatmentAdjustmentUltrafiltrationState              }
@@ -333,6 +345,9 @@
     VTreatmentAdjustmentRinseback                       { id: vTreatmentAdjustmentRinseback                         }
     VTreatmentAdjustmentRecirculate                     { id: vTreatmentAdjustmentRecirculate                       }
     VTreatmentAdjustmentEnd                             { id: vTreatmentAdjustmentEnd                               }
+    VTreatmentAdjustmentAutoSub                         { id: vTreatmentAdjustmentAutoSub                           }
+    VTreatmentAdjustmentHDFState                        { id: vTreatmentAdjustmentHDFState                          }
+    VTreatmentAdjustmentHDF                             { id: vTreatmentAdjustmentHDF                               }
     VTreatmentAdjustmentDryBicartDisconnect             { id: vTreatmentAdjustmentDryBicartDisconnect               }
 
     // --- Post Treatment