Index: denali.qrc
===================================================================
diff -u -r5e3b27057e9c7dedf9c46e3881609b7e96c3fb71 -r8a5dbf556a66524fbe4b60ac1573182a0bd27617
--- denali.qrc	(.../denali.qrc)	(revision 5e3b27057e9c7dedf9c46e3881609b7e96c3fb71)
+++ denali.qrc	(.../denali.qrc)	(revision 8a5dbf556a66524fbe4b60ac1573182a0bd27617)
@@ -3,19 +3,22 @@
         <file alias="MainStack.qml">sources/gui/qml/pages/MainStack.qml</file>
         <file alias="MainHome.qml">sources/gui/qml/pages/MainHome.qml</file>
         <file alias="ManagerStack.qml">sources/gui/qml/pages/ManagerStack.qml</file>
-        <file alias="ManagerHome.qml">sources/gui/qml/pages/ManagerHome.qml</file>
+        <file alias="UserConfirmation.qml">sources/gui/qml/pages/UserConfirmation.qml</file>
+        <file alias="TreatmentFlowBase.qml">sources/gui/qml/pages/TreatmentFlowBase.qml</file>
     </qresource>
     <qresource prefix="/pages/settings">
         <file alias="SettingsBase.qml">sources/gui/qml/pages/settings/SettingsBase.qml</file>
         <file alias="SettingsStack.qml">sources/gui/qml/pages/settings/SettingsStack.qml</file>
         <file alias="SettingsHome.qml">sources/gui/qml/pages/settings/SettingsHome.qml</file>
         <file alias="SettingsDateTime.qml">sources/gui/qml/pages/settings/SettingsDateTime.qml</file>
+        <file alias="SettingsWiFi.qml">sources/gui/qml/pages/settings/SettingsWiFi.qml</file>
     </qresource>
     <qresource prefix="/dialogs">
         <file alias="PowerOff.qml">sources/gui/qml/dialogs/PowerOff.qml</file>
         <file alias="AutoHideInfo.qml">sources/gui/qml/dialogs/AutoHideInfo.qml</file>
         <file alias="NotificationDialog.qml">sources/gui/qml/dialogs/NotificationDialog.qml</file>
         <file alias="AlarmListDialog.qml">sources/gui/qml/dialogs/AlarmListDialog.qml</file>
+        <file alias="DiagnosticsDialog.qml">sources/gui/qml/dialogs/DiagnosticsDialog.qml</file>
     </qresource>
     <qresource prefix="/images">
         <file alias="iSettings">resources/images/Settings_gear_setting_tools-128.png</file>
@@ -53,6 +56,8 @@
         <file alias="iDecelerate">resources/images/Decelerate.png</file>
         <file alias="iBusy">resources/images/Busy.png</file>
         <file alias="iBusyDone">resources/images/BusyDone.png</file>
+        <file alias="iEject">resources/images/eject.png</file>
+        <file alias="iEye">resources/images/eye.png</file>
     </qresource>
     <qresource prefix="/components">
         <file alias="MainMenu.qml">sources/gui/qml/components/MainMenu.qml</file>
@@ -66,7 +71,6 @@
         <file alias="USBButton.qml">sources/gui/qml/components/USBButton.qml</file>
         <file alias="ExportButton.qml">sources/gui/qml/components/ExportButton.qml</file>
         <file alias="TouchArea.qml">sources/gui/qml/components/TouchArea.qml</file>
-        <file alias="SettingsItem.qml">sources/gui/qml/components/SettingsItem.qml</file>
         <file alias="TextRect.qml">sources/gui/qml/components/TextRect.qml</file>
         <file alias="Background.qml">sources/gui/qml/components/Background.qml</file>
         <file alias="Line.qml">sources/gui/qml/components/Line.qml</file>
@@ -106,6 +110,9 @@
         <file alias="TimeCircle.qml">sources/gui/qml/components/TimeCircle.qml</file>
         <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="Fader.qml">sources/gui/qml/compounds/Fader.qml</file>
+        <file alias="FooterStatic.qml">sources/gui/qml/components/FooterStatic.qml</file>
     </qresource>
     <qresource prefix="/compounds">
         <file alias="PressureRangeSlider.qml">sources/gui/qml/compounds/PressureRangeSlider.qml</file>
@@ -180,21 +187,16 @@
         <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>
     </qresource>
-    <qresource prefix="/pages/endtreatment/recirculate">
-        <file alias="EndTreatmentRecirculate.qml">sources/gui/qml/pages/endtreatment/recirculate/EndTreatmentRecirculate.qml</file>
-        <file alias="EndTreatmentReconnect.qml">sources/gui/qml/pages/endtreatment/recirculate/EndTreatmentReconnect.qml</file>
-    </qresource>
-    <qresource prefix="/pages/endtreatment/end">
-        <file alias="EndTreatmentEnd.qml">sources/gui/qml/pages/endtreatment/end/EndTreatmentEnd.qml</file>
-        <file alias="EndTreatmentEndPaused.qml">sources/gui/qml/pages/endtreatment/end/EndTreatmentEndPause.qml</file>
-    </qresource>
+    <qresource prefix="/pages/endtreatment/recirculate"/>
+    <qresource prefix="/pages/endtreatment/end"/>
     <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>