Index: sources/gui/qml/main.qml
===================================================================
diff -u -r0fc32e1796c9fe40ff0e83b4fe039be67ce6dd39 -ra796bf6ecbf985b00412db76fa81ad4f7a8b2dd2
--- sources/gui/qml/main.qml	(.../main.qml)	(revision 0fc32e1796c9fe40ff0e83b4fe039be67ce6dd39)
+++ sources/gui/qml/main.qml	(.../main.qml)	(revision a796bf6ecbf985b00412db76fa81ad4f7a8b2dd2)
@@ -54,7 +54,6 @@
 import VDateTime                                            0.1
 import VAdjustmentAlarmVolume                               0.1
 import VBluetooth                                           0.1
-import VAdjustRoWaterMode                                   0.1
 import VRoWaterMode                                         0.1
 import VCloudSync                                           0.1
 import VHDUsageInfo                                         0.1
@@ -158,10 +157,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
+import VTreatmentAdjustmentDryBicartDisconnect              0.1
 // Post-Treatmnt
 import VPostTreatmentAdjustmentPatientDisconnectionConfirm  0.1
 import VPostTreatmentAdjustmentDisposablesRemovalConfirm    0.1
@@ -205,7 +204,6 @@
     VDateTime                                           { id: vDateTime                                             }
     VAdjustmentAlarmVolume                              { id: vAdjustmentAlarmVolume                                }
     VBluetooth                                          { id: vBluetooth                                            }
-    VAdjustRoWaterMode                                  { id: vAdjustRoWaterMode                                    }
     VRoWaterMode                                        { id: vRoWaterMode                                          }
     VCloudSync                                          { id: vCloudSync                                            }
     VHDUsageInfo                                        { id: vHDUsageInfo                                          }
@@ -270,8 +268,8 @@
     VTreatmentRecirculate                               { id: vTreatmentRecirculate                                 }
     VTreatmentStop                                      { id: vTreatmentStop                                        }
     VTreatmentHeparin                                   { id: vTreatmentHeparin                                     }
-    VTreatmentDryBicartDisconnect                       { id: vTreatmentDryBicartDisconnect                         }
     VTreatmentHDF                                       { id: vTreatmentHDF                                         }
+    VTreatmentDryBicartDisconnect                       { id: vTreatmentDryBicartDisconnect                         }
 
     // ---- DD
     VDGDrainPump                                        { id: vDGDrainPump                                          }
@@ -345,10 +343,10 @@
     VTreatmentAdjustmentRinseback                       { id: vTreatmentAdjustmentRinseback                         }
     VTreatmentAdjustmentRecirculate                     { id: vTreatmentAdjustmentRecirculate                       }
     VTreatmentAdjustmentEnd                             { id: vTreatmentAdjustmentEnd                               }
-    VTreatmentAdjustmentDryBicartDisconnect             { id: vTreatmentAdjustmentDryBicartDisconnect               }
     VTreatmentAdjustmentAutoSub                         { id: vTreatmentAdjustmentAutoSub                           }
     VTreatmentAdjustmentHDFState                        { id: vTreatmentAdjustmentHDFState                          }
     VTreatmentAdjustmentHDF                             { id: vTreatmentAdjustmentHDF                               }
+    VTreatmentAdjustmentDryBicartDisconnect             { id: vTreatmentAdjustmentDryBicartDisconnect               }
 
     // --- Post Treatment
     VPostTreatmentAdjustmentPatientDisconnectionConfirm { id: vPostTreatmentAdjustmentPatientDisconnectionConfirm   }