Index: sources/gui/qml/main.qml
===================================================================
diff -u -rdc4a0cbb5eb3a967755f4ba40d8407032723c957 -r4c32cadadd4c8abdee1eab4ef6425f356f863547
--- sources/gui/qml/main.qml	(.../main.qml)	(revision dc4a0cbb5eb3a967755f4ba40d8407032723c957)
+++ sources/gui/qml/main.qml	(.../main.qml)	(revision 4c32cadadd4c8abdee1eab4ef6425f356f863547)
@@ -24,7 +24,7 @@
 // View classes
 import VGeneralEvent                                        0.1
 import VHDAccelerometer                                     0.1
-import VHDSyringePump                                       0.1
+import VTDSyringePump                                       0.1
 import VHDBloodLeak                                         0.1
 import VTDAirBubble                                         0.1
 import VTDAirPump                                           0.1
@@ -54,7 +54,8 @@
 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
@@ -87,6 +88,8 @@
 import VTreatmentRanges                                     0.1
 import VTreatmentHeparin                                    0.1
 import VTreatmentTrends                                     0.1
+import VTreatmentHDF                                        0.1
+import VTreatmentDryBicartDisconnect                        0.1
 
 // Pre-Treatment
 import VPreTreatmentAdjustmentInitTreatment                 0.1
@@ -155,6 +158,10 @@
 import VTreatmentAdjustmentRinseback                        0.1
 import VTreatmentAdjustmentRecirculate                      0.1
 import VTreatmentAdjustmentEnd                              0.1
+import VTreatmentAdjustmentDryBicartDisconnect              0.1
+import VTreatmentAdjustmentAutoSub                          0.1
+import VTreatmentAdjustmentHDFState                         0.1
+import VTreatmentAdjustmentHDF                              0.1
 // Post-Treatmnt
 import VPostTreatmentAdjustmentPatientDisconnectionConfirm  0.1
 import VPostTreatmentAdjustmentDisposablesRemovalConfirm    0.1
@@ -198,7 +205,8 @@
     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                        }
@@ -235,7 +243,7 @@
 
     VGeneralEvent                                       { id: vGeneralEvent                                         }
     VHDAccelerometer                                    { id: vHDAccelerometer                                      }
-    VHDSyringePump                                      { id: vHDSyringePump                                        }
+    VTDSyringePump                                      { id: vTDSyringePump                                        }
     VTDAirBubble                                        { id: vTDAirBubble                                          }
     VTDAirPump                                          { id: vTDAirPump                                            }
     VHDBloodLeak                                        { id: vHDBloodLeak                                          }
@@ -262,6 +270,8 @@
     VTreatmentRecirculate                               { id: vTreatmentRecirculate                                 }
     VTreatmentStop                                      { id: vTreatmentStop                                        }
     VTreatmentHeparin                                   { id: vTreatmentHeparin                                     }
+    VTreatmentDryBicartDisconnect                       { id: vTreatmentDryBicartDisconnect                         }
+    VTreatmentHDF                                       { id: vTreatmentHDF                                         }
 
     // ---- DD
     VDGDrainPump                                        { id: vDGDrainPump                                          }
@@ -335,6 +345,10 @@
     VTreatmentAdjustmentRinseback                       { id: vTreatmentAdjustmentRinseback                         }
     VTreatmentAdjustmentRecirculate                     { id: vTreatmentAdjustmentRecirculate                       }
     VTreatmentAdjustmentEnd                             { id: vTreatmentAdjustmentEnd                               }
+    VTreatmentAdjustmentDryBicartDisconnect             { id: vTreatmentAdjustmentDryBicartDisconnect               }
+    VTreatmentAdjustmentAutoSub                         { id: vTreatmentAdjustmentAutoSub                           }
+    VTreatmentAdjustmentHDFState                        { id: vTreatmentAdjustmentHDFState                          }
+    VTreatmentAdjustmentHDF                             { id: vTreatmentAdjustmentHDF                               }
 
     // --- Post Treatment
     VPostTreatmentAdjustmentPatientDisconnectionConfirm { id: vPostTreatmentAdjustmentPatientDisconnectionConfirm   }
@@ -433,6 +447,7 @@
     HeaderbarSettings               { id: _headerbarSettings                }
     HeaderbarInformation            { id: _headerbarInformation             }
     WaterSampleDialog               { id: _headerbarWaterSampleDialysate    }
+    DryBicartDisconnectDialog       { id: _dryBicartDisconnectDialog        }
     TreatmentAdjustmentVitals       { id: _treatmentAdjustmentVitals        }
     EndTreatmentDialog              { id: _endTreatmentDialog               }
     RinsebackCompleteDialog         { id: _rinsebackCompleteDialog          }