Index: leahi.qrc
===================================================================
diff -u -r2f76603ecaceffc19181bffbf811cae2966d7593 -rb33a0dc4ca14c3bf58831d49d1910c39a091e658
--- leahi.qrc	(.../leahi.qrc)	(revision 2f76603ecaceffc19181bffbf811cae2966d7593)
+++ leahi.qrc	(.../leahi.qrc)	(revision b33a0dc4ca14c3bf58831d49d1910c39a091e658)
@@ -5,6 +5,7 @@
         <file alias="ManagerStack.qml">sources/gui/qml/pages/ManagerStack.qml</file>
         <file alias="UserConfirmation.qml">sources/gui/qml/pages/UserConfirmation.qml</file>
         <file alias="TreatmentFlowBase.qml">sources/gui/qml/pages/TreatmentFlowBase.qml</file>
+        <file alias="MainInitialization.qml">sources/gui/qml/pages/MainInitialization.qml</file>
     </qresource>
     <qresource prefix="/pages/settings">
         <file alias="SettingsBase.qml">sources/gui/qml/pages/settings/SettingsBase.qml</file>
@@ -15,7 +16,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 +27,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 +38,13 @@
         <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>
+        <file alias="RinsebackCompleteDialog.qml">sources/gui/qml/dialogs/RinsebackCompleteDialog.qml</file>
+        <file alias="UfVolumeAdjustment.qml">sources/gui/qml/dialogs/UfVolumeAdjustment.qml</file>
+        <file alias="HeparinRxAdjustment.qml">sources/gui/qml/dialogs/HeparinRxAdjustment.qml</file>
+        <file alias="AlarmDialog.qml">sources/gui/qml/dialogs/AlarmDialog.qml</file>
+        <file alias="DryDemoDialog.qml">sources/gui/qml/dialogs/DryDemoDialog.qml</file>
+        <file alias="ConfirmPasswordDialog.qml">sources/gui/qml/dialogs/ConfirmPasswordDialog.qml</file>
     </qresource>
     <qresource prefix="/dialogs/diagnostics">
         <file alias="DiagnosticsDialog.qml">sources/gui/qml/dialogs/diagnostics/DiagnosticsDialog.qml</file>
@@ -46,22 +56,25 @@
     </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>
     </qresource>
+    <qresource prefix="/dialogs/watersample">
+        <file alias="WaterSampleDialog.qml">sources/gui/qml/dialogs/watersample/WaterSampleDialog.qml</file>
+        <file alias="WaterSampleBase.qml">sources/gui/qml/dialogs/watersample/WaterSampleBase.qml</file>
+        <file alias="WaterSamplePage.qml">sources/gui/qml/dialogs/watersample/WaterSamplePage.qml</file>
+        <file alias="WaterSampleDialysatePage.qml">sources/gui/qml/dialogs/watersample/WaterSampleDialysatePage.qml</file>
+    </qresource>
     <qresource prefix="/images">
         <file alias="iLogoD">resources/images/Logo d.png</file>
         <file alias="iLogoDiality">resources/images/Logo DialityT.png</file>
         <file alias="iSplash">resources/images/diality-splash.png</file>
         <file alias="iArrowRight">resources/images/ArrowRight.png</file>
         <file alias="iArrowLeft">resources/images/ArrowLeft.png</file>
-        <file alias="iLogoDDT">resources/images/logo d Dark Transparent.png</file>
         <file alias="iClose">resources/images/Close.png</file>
         <file alias="iBellOn">resources/images/bell-on.png</file>
         <file alias="iBellOff">resources/images/bell-off.png</file>
-        <file alias="iBack">resources/images/Back.png</file>
-        <file alias="iPauseDarkBlue">resources/images/PauseDarkBlue.png</file>
         <file alias="iPauseLightBlue">resources/images/PauseLightBlue.png</file>
         <file alias="iPauseGray">resources/images/PauseGray.png</file>
         <file alias="iResume">resources/images/Resume.png</file>
@@ -82,7 +95,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 +108,41 @@
         <file alias="iPauseOrange">resources/images/PauseOrange.png</file>
         <file alias="iArrowsExpanding">resources/images/arrowsExpanding.png</file>
         <file alias="iHomeBackground">resources/images/HomeBackground.png</file>
-        <file alias="iBluetooth">resources/images/Bluetooth.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>
+        <file alias="iWaterSample">resources/images/water_sample.png</file>
+        <file alias="iArrowDownDisabled">resources/images/ArrowDownDisabled.png</file>
+        <file alias="iArrowUpDisabled">resources/images/ArrowUpDisabled.png</file>
+        <file alias="iPause">resources/images/pause.png</file>
+        <file alias="iPlay">resources/images/play.png</file>
+        <file alias="iRecirculate">resources/images/recirculate_main.png</file>
+        <file alias="iBloodpump">resources/images/bloodpump.png</file>
+        <file alias="iEditYellow">resources/images/edit_yellow.png</file>
+        <file alias="iLeahiConsole">resources/images/leahi-console.png</file>
+        <file alias="iMoon">resources/images/moon.png</file>
+        <file alias="iSun">resources/images/sun.png</file>
+        <file alias="iCarbonFilter1">resources/images/carbon_filter_1.png</file>
+        <file alias="iCarbonFilter2">resources/images/carbon_filter_2.png</file>
+        <file alias="iRefresh">resources/images/refresh.png</file>
+        <file alias="iExport">resources/images/export.png</file>
+        <file alias="iRefreshDisabled">resources/images/refresh_disabled.png</file>
+        <file alias="iExportDisabled">resources/images/export_disabled.png</file>
+        <file alias="iWifiError">resources/images/WifiError.png</file>
     </qresource>
     <qresource prefix="/components">
         <file alias="MainMenu.qml">sources/gui/qml/components/MainMenu.qml</file>
@@ -132,7 +171,6 @@
         <file alias="StepIndicator.qml">sources/gui/qml/components/StepIndicator.qml</file>
         <file alias="TimeText.qml">sources/gui/qml/components/TimeText.qml</file>
         <file alias="ProgressCircle.qml">sources/gui/qml/components/ProgressCircle.qml</file>
-        <file alias="Slider.qml">sources/gui/qml/components/Slider.qml</file>
         <file alias="ProgressBarEx.qml">sources/gui/qml/components/ProgressBarEx.qml</file>
         <file alias="CloseButton.qml">sources/gui/qml/components/CloseButton.qml</file>
         <file alias="ConfirmButton.qml">sources/gui/qml/components/ConfirmButton.qml</file>
@@ -142,7 +180,6 @@
         <file alias="UltrafiltrationButton.qml">sources/gui/qml/components/UltrafiltrationButton.qml</file>
         <file alias="ImageWave.qml">sources/gui/qml/components/ImageWave.qml</file>
         <file alias="ImageClock.qml">sources/gui/qml/components/ImageClock.qml</file>
-        <file alias="ImageLogoDDarkTransparent.qml">sources/gui/qml/components/ImageLogoDDarkTransparent.qml</file>
         <file alias="DebugDataColumn.qml">sources/gui/qml/components/DebugDataColumn.qml</file>
         <file alias="RangeSlider.qml">sources/gui/qml/components/RangeSlider.qml</file>
         <file alias="MuteButton.qml">sources/gui/qml/components/MuteButton.qml</file>
@@ -152,10 +189,10 @@
         <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="ScrollBarVH.qml">sources/gui/qml/components/ScrollBarVH.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>
-        <file alias="EntryDialog.qml">sources/gui/qml/components/EntryDialog.qml</file>
         <file alias="SliderArrows.qml">sources/gui/qml/components/SliderArrows.qml</file>
         <file alias="QRCode.qml">sources/gui/qml/components/QRCode.qml</file>
         <file alias="ContentArea.qml">sources/gui/qml/components/ContentArea.qml</file>
@@ -165,6 +202,17 @@
         <file alias="HeaderBarPopup.qml">sources/gui/qml/components/HeaderBarPopup.qml</file>
         <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>
+        <file alias="BaseChart.qml">sources/gui/qml/components/BaseChart.qml</file>
+        <file alias="ReviewContainer.qml">sources/gui/qml/components/ReviewContainer.qml</file>
+        <file alias="LegendItem.qml">sources/gui/qml/components/LegendItem.qml</file>
     </qresource>
     <qresource prefix="/compounds">
         <file alias="PressureRangeSlider.qml">sources/gui/qml/compounds/PressureRangeSlider.qml</file>
@@ -173,8 +221,19 @@
         <file alias="CheckListView.qml">sources/gui/qml/compounds/CheckListView.qml</file>
         <file alias="TouchGrid.qml">sources/gui/qml/compounds/TouchGrid.qml</file>
         <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>
+        <file alias="AutoStepController.qml">sources/gui/qml/compounds/AutoStepController.qml</file>
+        <file alias="InteractiveImage.qml">sources/gui/qml/compounds/InteractiveImage.qml</file>
+        <file alias="ProcessStatusView.qml">sources/gui/qml/compounds/ProcessStatusView.qml</file>
+        <file alias="ExportLogsHeaderData.qml">sources/gui/qml/compounds/ExportLogsHeaderData.qml</file>
     </qresource>
     <qresource prefix="/">
         <file>qtquickcontrols2.conf</file>
@@ -231,68 +290,75 @@
     <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="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>
     </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>
+        <file alias="PreTreatmentCreatePatientPrescription.qml">sources/gui/qml/pages/pretreatment/create/PreTreatmentCreatePatientPrescription.qml</file>
+        <file alias="PreTreatmentCreateTreatmentSettings.qml">sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateTreatmentSettings.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="TreatmentUltrafiltrationItem.qml">sources/gui/qml/pages/treatment/TreatmentUltrafiltrationItem.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="TreatmentHDF.qml">sources/gui/qml/pages/treatment/TreatmentHDF.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>
+        <file alias="TreatmentHDFComponent.qml">sources/gui/qml/pages/treatment/sections/TreatmentHDFComponent.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="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="TreatmentAdjustmentUltrafiltrationPaused.qml">sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationPaused.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>
+        <file alias="TreatmentAdjustmentHDF.qml">sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentHDF.qml</file>
+        <file alias="TreatmentAdjustmentEndIsolatedUF.qml">sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentEndIsolatedUF.qml</file>
     </qresource>
     <qresource prefix="/pages/endtreatment">
         <file alias="EndTreatmentRinsebackStack.qml">sources/gui/qml/pages/endtreatment/EndTreatmentRinsebackStack.qml</file>
         <file alias="EndTreatmentRecirculateStack.qml">sources/gui/qml/pages/endtreatment/EndTreatmentRecirculateStack.qml</file>
-        <file alias="EndTreatmentEndStack.qml">sources/gui/qml/pages/endtreatment/EndTreatmentEndStack.qml</file>
         <file alias="EndTreatmentBase.qml">sources/gui/qml/pages/endtreatment/EndTreatmentBase.qml</file>
     </qresource>
     <qresource prefix="/pages/endtreatment/rinseback">
         <file alias="EndTreatmentRinsebackInit.qml">sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackInit.qml</file>
         <file alias="EndTreatmentRinseback.qml">sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinseback.qml</file>
-        <file alias="EndTreatmentRinsebackComplete.qml">sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackComplete.qml</file>
-        <file alias="EndTreatmentAdditional.qml">sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentAdditional.qml</file>
-        <file alias="EndTreatmentRinsebackReconnect.qml">sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackReconnect.qml</file>
     </qresource>
-    <qresource prefix="/pages/endtreatment/recirculate"/>
-    <qresource prefix="/pages/endtreatment/end"/>
+    <qresource prefix="/pages/endtreatment/recirculate">
+        <file alias="EndTreatmentRecirculateProgress.qml">sources/gui/qml/pages/endtreatment/recirculate/EndTreatmentRecirculateProgress.qml</file>
+    </qresource>
     <qresource prefix="/pages/posttreatment">
         <file alias="PostTreatmentBase.qml">sources/gui/qml/pages/posttreatment/PostTreatmentBase.qml</file>
         <file alias="PostTreatmentStack.qml">sources/gui/qml/pages/posttreatment/PostTreatmentStack.qml</file>
         <file alias="PostTreatmentReview.qml">sources/gui/qml/pages/posttreatment/PostTreatmentReview.qml</file>
+        <file alias="PostTreatmentDisconnectStack.qml">sources/gui/qml/pages/posttreatment/PostTreatmentDisconnectStack.qml</file>
+        <file alias="PostTreatmentDrainConsumables.qml">sources/gui/qml/pages/posttreatment/PostTreatmentDrainConsumables.qml</file>
+        <file alias="PostTreatmentDisinfection.qml">sources/gui/qml/pages/posttreatment/PostTreatmentDisinfection.qml</file>
     </qresource>
 </RCC>