Index: leahi.qrc
===================================================================
diff -u -rc1e50347c78096b626b2cd1ef32a33b439e88bdd -r2283d645185c14bf358aff5ea59bed5087692146
--- leahi.qrc	(.../leahi.qrc)	(revision c1e50347c78096b626b2cd1ef32a33b439e88bdd)
+++ leahi.qrc	(.../leahi.qrc)	(revision 2283d645185c14bf358aff5ea59bed5087692146)
@@ -110,6 +110,8 @@
         <file alias="iEyeClosed">resources/images/eye_closed.png</file>
         <file alias="iStepCheck">resources/images/stepCheck.png</file>
         <file alias="iCompleteCheck">resources/images/complete_check.png</file>
+        <file alias="iWaterSampleFail">resources/images/water_sample_fail.png</file>
+        <file alias="iWaterSamplePass">resources/images/water_sample_pass.png</file>
     </qresource>
     <qresource prefix="/components">
         <file alias="MainMenu.qml">sources/gui/qml/components/MainMenu.qml</file>
@@ -176,6 +178,7 @@
         <file alias="IdleTimer.qml">sources/gui/qml/components/IdleTimer.qml</file>
         <file alias="TreatmentCompleteButton.qml">sources/gui/qml/components/TreatmentCompleteButton.qml</file>
         <file alias="RangedValue.qml">sources/gui/qml/components/RangedValue.qml</file>
+        <file alias="SubStepIndicator.qml">sources/gui/qml/components/SubStepIndicator.qml</file>
     </qresource>
     <qresource prefix="/compounds">
         <file alias="PressureRangeSlider.qml">sources/gui/qml/compounds/PressureRangeSlider.qml</file>
@@ -248,18 +251,16 @@
     <qresource prefix="/pages/pretreatment">
         <file alias="PreTreatmentBase.qml">sources/gui/qml/pages/pretreatment/PreTreatmentBase.qml</file>
         <file alias="PreTreatmentStack.qml">sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml</file>
-        <file alias="PreTreatmentWaterSampleStack.qml">sources/gui/qml/pages/pretreatment/PreTreatmentWaterSampleStack.qml</file>
-        <file alias="PreTreatmentConsumablesStack.qml">sources/gui/qml/pages/pretreatment/PreTreatmentConsumablesStack.qml</file>
-        <file alias="PreTreatmentPrimeStack.qml">sources/gui/qml/pages/pretreatment/PreTreatmentPrimeStack.qml</file>
+        <file alias="PreTreatmentWaterSample.qml">sources/gui/qml/pages/pretreatment/PreTreatmentWaterSample.qml</file>
+        <file alias="PreTreatmentSelfTests.qml">sources/gui/qml/pages/pretreatment/PreTreatmentSelfTests.qml</file>
+        <file alias="PreTreatmentPrime.qml">sources/gui/qml/pages/pretreatment/PreTreatmentPrime.qml</file>
+        <file alias="PreTreatmentInstallStack.qml">sources/gui/qml/pages/pretreatment/PreTreatmentInstallStack.qml</file>
+        <file alias="PreTreatmentUltrafiltration.qml">sources/gui/qml/pages/pretreatment/PreTreatmentUltrafiltration.qml</file>
     </qresource>
     <qresource prefix="/pages/pretreatment/create">
         <file alias="PreTreatmentCreate.qml">sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml</file>
         <file alias="PreTreatmentCreateContent.qml">sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml</file>
     </qresource>
-    <qresource prefix="/pages/pretreatment/connection">
-        <file alias="PreTreatmentUltrafiltration.qml">sources/gui/qml/pages/pretreatment/connection/PreTreatmentUltrafiltration.qml</file>
-        <file alias="PreTreatmentConnectionStack.qml">sources/gui/qml/pages/pretreatment/connection/PreTreatmentConnectionStack.qml</file>
-    </qresource>
     <qresource prefix="/pages/treatment">
         <file alias="TreatmentStack.qml">sources/gui/qml/pages/treatment/TreatmentStack.qml</file>
         <file alias="TreatmentHome.qml">sources/gui/qml/pages/treatment/TreatmentHome.qml</file>
@@ -282,15 +283,18 @@
     <qresource prefix="/pages/treatment/adjustments">
         <file alias="TreatmentAdjustmentBase.qml">sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml</file>
         <file alias="TreatmentAdjustmentBolusVolume.qml">sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBolusVolume.qml</file>
-        <file alias="TreatmentAdjustmentDuration.qml">sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDuration.qml</file>
+        <file alias="TreatmentAdjustmentDurationStack.qml">sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDurationStack.qml</file>
         <file alias="TreatmentAdjustmentDurationEdit.qml">sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDurationEdit.qml</file>
         <file alias="TreatmentAdjustmentDurationConfirm.qml">sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDurationConfirm.qml</file>
         <file alias="TreatmentAdjustmentPressuresLimits.qml">sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentPressuresLimits.qml</file>
         <file alias="TreatmentAdjustmentSetPoints.qml">sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentSetPoints.qml</file>
-        <file alias="TreatmentAdjustmentUltrafiltration.qml">sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltration.qml</file>
+        <file alias="TreatmentAdjustmentUltrafiltrationStack.qml">sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStack.qml</file>
         <file alias="TreatmentAdjustmentUltrafiltrationStart.qml">sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml</file>
         <file alias="TreatmentAdjustmentUltrafiltrationEdit.qml">sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml</file>
         <file alias="TreatmentAdjustmentUltrafiltrationConfirm.qml">sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml</file>
+        <file alias="TreatmentAdjustmentIsolatedUFDurationEdit.qml">sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentIsolatedUFDurationEdit.qml</file>
+        <file alias="TreatmentAdjustmentIsolatedUFVolumeEdit.qml">sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentIsolatedUFVolumeEdit.qml</file>
+        <file alias="TreatmentAdjustmentIsolatedUFConfirm.qml">sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentIsolatedUFConfirm.qml</file>
         <file alias="TreatmentAdjustmentVitals.qml">sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml</file>
         <file alias="TreatmentAdjustmentVitalsInterval.qml">sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitalsInterval.qml</file>
     </qresource>