Index: leahi.qrc
===================================================================
diff -u -rf2aa3ee850de1023cfc011b845ed0364d251b749 -rad78225384a974269b18c0fe3b55a7d64f77d813
--- leahi.qrc	(.../leahi.qrc)	(revision f2aa3ee850de1023cfc011b845ed0364d251b749)
+++ leahi.qrc	(.../leahi.qrc)	(revision ad78225384a974269b18c0fe3b55a7d64f77d813)
@@ -15,7 +15,6 @@
         <file alias="SettingsDGCleaning.qml">sources/gui/qml/pages/settings/SettingsDGCleaning.qml</file>
         <file alias="SettingsDGScheduling.qml">sources/gui/qml/pages/settings/SettingsDGScheduling.qml</file>
         <file alias="SettingsVolumeBrightness.qml">sources/gui/qml/pages/settings/SettingsVolumeBrightness.qml</file>
-        <file alias="SettingsBluetoothCuff.qml">sources/gui/qml/pages/settings/SettingsBluetoothCuff.qml</file>
         <file alias="SettingsExportLogs.qml">sources/gui/qml/pages/settings/SettingsExportLogs.qml</file>
         <file alias="SettingsDeviceRegistration.qml">sources/gui/qml/pages/settings/SettingsDeviceRegistration.qml</file>
         <file alias="SettingsInformation.qml">sources/gui/qml/pages/settings/SettingsInformation.qml</file>
@@ -27,6 +26,9 @@
         <file alias="SettingsDecommission.qml">sources/gui/qml/pages/settings/SettingsDecommission.qml</file>
         <file alias="SettingsInstitutionalRecord.qml">sources/gui/qml/pages/settings/SettingsInstitutionalRecord.qml</file>
         <file alias="SettingsLocalization.qml">sources/gui/qml/pages/settings/SettingsLocalization.qml</file>
+        <file alias="SettingsAdvancedMode.qml">sources/gui/qml/pages/settings/SettingsAdvancedMode.qml</file>
+        <file alias="SettingsFeatureConfigurations.qml">sources/gui/qml/pages/settings/SettingsFeatureConfigurations.qml</file>
+        <file alias="SettingsAdvancedInstitutional.qml">sources/gui/qml/pages/settings/SettingsAdvancedInstitutional.qml</file>
     </qresource>
     <qresource prefix="/dialogs">
         <file alias="ConfirmDialog.qml">sources/gui/qml/dialogs/ConfirmDialog.qml</file>
@@ -35,6 +37,7 @@
         <file alias="AlarmListDialog.qml">sources/gui/qml/dialogs/AlarmListDialog.qml</file>
         <file alias="LockDialog.qml">sources/gui/qml/dialogs/LockDialog.qml</file>
         <file alias="AcidConcentrateAdjustment.qml">sources/gui/qml/dialogs/AcidConcentrateAdjustment.qml</file>
+        <file alias="EndTreatmentDialog.qml">sources/gui/qml/dialogs/EndTreatmentDialog.qml</file>
     </qresource>
     <qresource prefix="/dialogs/diagnostics">
         <file alias="DiagnosticsDialog.qml">sources/gui/qml/dialogs/diagnostics/DiagnosticsDialog.qml</file>
@@ -46,7 +49,6 @@
     </qresource>
     <qresource prefix="/dialogs/headerbar">
         <file alias="HeaderbarWiFi.qml">sources/gui/qml/dialogs/headerbar/HeaderbarWiFi.qml</file>
-        <file alias="HeaderbarStorage.qml">sources/gui/qml/dialogs/headerbar/HeaderbarStorage.qml</file>
         <file alias="HeaderbarSettings.qml">sources/gui/qml/dialogs/headerbar/HeaderbarSettings.qml</file>
         <file alias="HeaderbarPrescription.qml">sources/gui/qml/dialogs/headerbar/HeaderbarPrescription.qml</file>
         <file alias="HeaderbarInformation.qml">sources/gui/qml/dialogs/headerbar/HeaderbarInformation.qml</file>
@@ -80,7 +82,6 @@
         <file alias="iEjectEnabled">resources/images/EjectEnabled.png</file>
         <file alias="iEjectDisabled">resources/images/EjectDisabled.png</file>
         <file alias="iEye">resources/images/eye.png</file>
-        <file alias="iCuff-Omron-BP7000">resources/images/Omron-bp7000.png</file>
         <file alias="iChevronLeft">resources/images/chevron-left.png</file>
         <file alias="iChevronRight">resources/images/chevron-right.png</file>
         <file alias="iDenaliDevice">resources/images/DenaliDevice.png</file>
@@ -96,14 +97,21 @@
         <file alias="iHomeBackground">resources/images/HomeBackground.png</file>
         <file alias="iCloudSync">resources/images/CloudSync.png</file>
         <file alias="iInformation">resources/images/Information.png</file>
-        <file alias="iStorage">resources/images/Storage.png</file>
         <file alias="iHelp">resources/images/help.png</file>
         <file alias="iMenuDot">resources/images/Menu_Dot.png</file>
         <file alias="iArrowLeftDisabled">resources/images/ArrowLeftDisabled.png</file>
         <file alias="iArrowRightDisabled">resources/images/ArrowRightDisabled.png</file>
         <file alias="iBackspace">resources/images/backspace.png</file>
         <file alias="iVitals">resources/images/Vitals.png</file>
         <file alias="iVitalsRed">resources/images/Vitals_Red.png</file>
+        <file alias="iCheckGreen">resources/images/check_green.png</file>
+        <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="iBrightness">resources/images/Brightness.png</file>
+        <file alias="iVolume">resources/images/Volume.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>
@@ -151,6 +159,7 @@
         <file alias="Footer.qml">sources/gui/qml/components/Footer.qml</file>
         <file alias="TextEntry.qml">sources/gui/qml/components/TextEntry.qml</file>
         <file alias="ScrollBar.qml">sources/gui/qml/components/ScrollBar.qml</file>
+        <file alias="ScrollBar2.qml">sources/gui/qml/components/ScrollBar2.qml</file>
         <file alias="FooterStatic.qml">sources/gui/qml/components/FooterStatic.qml</file>
         <file alias="TimeEntry.qml">sources/gui/qml/components/TimeEntry.qml</file>
         <file alias="Label.qml">sources/gui/qml/components/Label.qml</file>
@@ -164,6 +173,13 @@
         <file alias="AlarmButtonRow.qml">sources/gui/qml/components/AlarmButtonRow.qml</file>
         <file alias="BaseComboBox.qml">sources/gui/qml/components/BaseComboBox.qml</file>
         <file alias="VitalsButton.qml">sources/gui/qml/components/VitalsButton.qml</file>
+        <file alias="PasswordRequirements.qml">sources/gui/qml/components/PasswordRequirements.qml</file>
+        <file alias="BaseSwitch.qml">sources/gui/qml/components/BaseSwitch.qml</file>
+        <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>
+        <file alias="SDCInfo.qml">sources/gui/qml/components/SDCInfo.qml</file>
     </qresource>
     <qresource prefix="/compounds">
         <file alias="PressureRangeSlider.qml">sources/gui/qml/compounds/PressureRangeSlider.qml</file>
@@ -174,8 +190,13 @@
         <file alias="BPHREntry.qml">sources/gui/qml/compounds/BPHREntry.qml</file>
         <file alias="NumPad.qml">sources/gui/qml/compounds/NumPad.qml</file>
         <file alias="LabelUnitContainer.qml">sources/gui/qml/compounds/LabelUnitContainer.qml</file>
+        <file alias="LabelUnitText.qml">sources/gui/qml/compounds/LabelUnitText.qml</file>
         <file alias="ValueAdjuster.qml">sources/gui/qml/compounds/ValueAdjuster.qml</file>
         <file alias="TreatmentAdjustmentUltrafiltrationMetrics.qml">sources/gui/qml/compounds/TreatmentAdjustmentUltrafiltrationMetrics.qml</file>
+        <file alias="InstitutionalContainer.qml">sources/gui/qml/compounds/InstitutionalContainer.qml</file>
+        <file alias="ValueAdjusterCustom.qml">sources/gui/qml/compounds/ValueAdjusterCustom.qml</file>
+        <file alias="LabelUnitValueAdjuster.qml">sources/gui/qml/compounds/LabelUnitValueAdjuster.qml</file>
+        <file alias="SettingsSlider.qml">sources/gui/qml/compounds/SettingsSlider.qml</file>
     </qresource>
     <qresource prefix="/">
         <file>qtquickcontrols2.conf</file>
@@ -232,48 +253,50 @@
     <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="PreTreatmentDisposablesStack.qml">sources/gui/qml/pages/pretreatment/PreTreatmentDisposablesStack.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>
-        <file alias="PreTreatmentCreateStack.qml">sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateStack.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>
         <file alias="TreatmentBloodPrime.qml">sources/gui/qml/pages/treatment/TreatmentBloodPrime.qml</file>
         <file alias="TreatmentSection.qml">sources/gui/qml/pages/treatment/TreatmentSection.qml</file>
         <file alias="TreatmentSectionHeader.qml">sources/gui/qml/pages/treatment/TreatmentSectionHeader.qml</file>
+        <file alias="TreatmentHeparin.qml">sources/gui/qml/pages/treatment/TreatmentHeparin.qml</file>
+        <file alias="TreatmentTrends.qml">sources/gui/qml/pages/treatment/TreatmentTrends.qml</file>
     </qresource>
     <qresource prefix="/pages/treatment/sections">
         <file alias="TreatmentFlows.qml">sources/gui/qml/pages/treatment/sections/TreatmentFlows.qml</file>
         <file alias="TreatmentVitals.qml">sources/gui/qml/pages/treatment/sections/TreatmentVitals.qml</file>
         <file alias="TreatmentPressures.qml">sources/gui/qml/pages/treatment/sections/TreatmentPressures.qml</file>
         <file alias="TreatmentUltrafiltration.qml">sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml</file>
-        <file alias="TreatmentFluid.qml">sources/gui/qml/pages/treatment/sections/TreatmentFluid.qml</file>
         <file alias="TreatmentTime.qml">sources/gui/qml/pages/treatment/sections/TreatmentTime.qml</file>
         <file alias="TreatmentSaline.qml">sources/gui/qml/pages/treatment/sections/TreatmentSaline.qml</file>
-        <file alias="TreatmentHeparin.qml">sources/gui/qml/pages/treatment/sections/TreatmentHeparin.qml</file>
         <file alias="TreatmentPressureComponent.qml">sources/gui/qml/pages/treatment/sections/TreatmentPressureComponent.qml</file>
         <file alias="TreatmentFlowsComponent.qml">sources/gui/qml/pages/treatment/sections/TreatmentFlowsComponent.qml</file>
     </qresource>
     <qresource prefix="/pages/treatment/adjustments">
-        <file alias="TreatmentAdjustmentFlow.qml">sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentFlow.qml</file>
         <file alias="TreatmentAdjustmentBase.qml">sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml</file>
-        <file alias="TreatmentAdjustmentDuration.qml">sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDuration.qml</file>
-        <file alias="TreatmentAdjustmentUltrafiltration.qml">sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltration.qml</file>
+        <file alias="TreatmentAdjustmentBolusVolume.qml">sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBolusVolume.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="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="TreatmentAdjustmentPressuresLimits.qml">sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentPressuresLimits.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>