Index: sources/gui/qml/main.qml
===================================================================
diff -u -re255d4633b338f4f46c3a2fad5a62f982ebfcd18 -r16aaf5ab7e1c58199754a132d624a470295d3440
--- sources/gui/qml/main.qml	(.../main.qml)	(revision e255d4633b338f4f46c3a2fad5a62f982ebfcd18)
+++ sources/gui/qml/main.qml	(.../main.qml)	(revision 16aaf5ab7e1c58199754a132d624a470295d3440)
@@ -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,10 +54,11 @@
 import VDateTime                                            0.1
 import VAdjustmentAlarmVolume                               0.1
 import VBluetooth                                           0.1
-import VDuetRoWaterDG                                       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 +87,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
@@ -143,6 +146,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
@@ -153,6 +157,10 @@
 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
 import VPostTreatmentAdjustmentDisposablesRemovalConfirm    0.1
@@ -196,13 +204,15 @@
     VDateTime                                           { id: vDateTime                                             }
     VAdjustmentAlarmVolume                              { id: vAdjustmentAlarmVolume                                }
     VBluetooth                                          { id: vBluetooth                                            }
-    VDuetRoWaterDG                                      { id: vDuetRoWaterDG                                        }
+    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
@@ -231,7 +241,7 @@
 
     VGeneralEvent                                       { id: vGeneralEvent                                         }
     VHDAccelerometer                                    { id: vHDAccelerometer                                      }
-    VHDSyringePump                                      { id: vHDSyringePump                                        }
+    VTDSyringePump                                      { id: vTDSyringePump                                        }
     VTDAirBubble                                        { id: vTDAirBubble                                          }
     VTDAirPump                                          { id: vTDAirPump                                            }
     VHDBloodLeak                                        { id: vHDBloodLeak                                          }
@@ -258,6 +268,8 @@
     VTreatmentRecirculate                               { id: vTreatmentRecirculate                                 }
     VTreatmentStop                                      { id: vTreatmentStop                                        }
     VTreatmentHeparin                                   { id: vTreatmentHeparin                                     }
+    VTreatmentHDF                                       { id: vTreatmentHDF                                         }
+    VTreatmentDryBicartDisconnect                       { id: vTreatmentDryBicartDisconnect                         }
 
     // ---- DD
     VDGDrainPump                                        { id: vDGDrainPump                                          }
@@ -319,6 +331,7 @@
     VTreatmentAdjustmentIsolatedUFDurationEdit          { id: vTreatmentAdjustmentIsolatedUFDurationEdit            }
     VTreatmentAdjustmentIsolatedUFVolumeEdit            { id: vTreatmentAdjustmentIsolatedUFVolumeEdit              }
     VTreatmentAdjustmentIsolatedUFConfirm               { id: vTreatmentAdjustmentIsolatedUFConfirm                 }
+    VTreatmentAdjustmentIsolatedUFState                 { id: vTreatmentAdjustmentIsolatedUFState                   }
     VTreatmentAdjustmentSaline                          { id: vTreatmentAdjustmentSaline                            }
     VTreatmentAdjustmentVitals                          { id: vTreatmentAdjustmentVitals                            }
     VTreatmentAdjustmentUltrafiltrationState            { id: vTreatmentAdjustmentUltrafiltrationState              }
@@ -330,6 +343,10 @@
     VTreatmentAdjustmentRinseback                       { id: vTreatmentAdjustmentRinseback                         }
     VTreatmentAdjustmentRecirculate                     { id: vTreatmentAdjustmentRecirculate                       }
     VTreatmentAdjustmentEnd                             { id: vTreatmentAdjustmentEnd                               }
+    VTreatmentAdjustmentAutoSub                         { id: vTreatmentAdjustmentAutoSub                           }
+    VTreatmentAdjustmentHDFState                        { id: vTreatmentAdjustmentHDFState                          }
+    VTreatmentAdjustmentHDF                             { id: vTreatmentAdjustmentHDF                               }
+    VTreatmentAdjustmentDryBicartDisconnect             { id: vTreatmentAdjustmentDryBicartDisconnect               }
 
     // --- Post Treatment
     VPostTreatmentAdjustmentPatientDisconnectionConfirm { id: vPostTreatmentAdjustmentPatientDisconnectionConfirm   }
@@ -428,6 +445,7 @@
     HeaderbarSettings               { id: _headerbarSettings                }
     HeaderbarInformation            { id: _headerbarInformation             }
     WaterSampleDialog               { id: _headerbarWaterSampleDialysate    }
+    DryBicartDisconnectDialog       { id: _dryBicartDisconnectDialog        }
     TreatmentAdjustmentVitals       { id: _treatmentAdjustmentVitals        }
     EndTreatmentDialog              { id: _endTreatmentDialog               }
     RinsebackCompleteDialog         { id: _rinsebackCompleteDialog          }