Index: denali.qrc
===================================================================
diff -u -r4f87126626b76aa04ddcf2ae92e04e118cdcbe01 -r5e3b27057e9c7dedf9c46e3881609b7e96c3fb71
--- denali.qrc	(.../denali.qrc)	(revision 4f87126626b76aa04ddcf2ae92e04e118cdcbe01)
+++ denali.qrc	(.../denali.qrc)	(revision 5e3b27057e9c7dedf9c46e3881609b7e96c3fb71)
@@ -4,9 +4,13 @@
         <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="SettingsStack.qml">sources/gui/qml/pages/SettingsStack.qml</file>
-        <file alias="SettingsHome.qml">sources/gui/qml/pages/SettingsHome.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>
+    </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>
@@ -35,7 +39,6 @@
         <file alias="iClock+">resources/images/Clock-Plus.png</file>
         <file alias="iWave-">resources/images/Wave-Minus.png</file>
         <file alias="iWave+">resources/images/Wave-Plus.png</file>
-        <file alias="iMicroSD">resources/images/microsd.png</file>
         <file alias="iCheck">resources/images/check.png</file>
         <file alias="iCheckCircle">resources/images/checkCircle.png</file>
         <file alias="iOffGray">resources/images/OffGray.png</file>
@@ -102,18 +105,22 @@
         <file alias="WaitDone.qml">sources/gui/qml/components/WaitDone.qml</file>
         <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>
     </qresource>
     <qresource prefix="/compounds">
         <file alias="PressureRangeSlider.qml">sources/gui/qml/compounds/PressureRangeSlider.qml</file>
         <file alias="StepNavigationTitleBar.qml">sources/gui/qml/compounds/StepNavigationTitleBar.qml</file>
         <file alias="InstructionView.qml">sources/gui/qml/compounds/InstructionView.qml</file>
         <file alias="CheckListView.qml">sources/gui/qml/compounds/CheckListView.qml</file>
+        <file alias="TouchGrid.qml">sources/gui/qml/compounds/TouchGrid.qml</file>
     </qresource>
     <qresource prefix="/">
         <file>qtquickcontrols2.conf</file>
         <file alias="main.qml">sources/gui/qml/main.qml</file>
         <file alias="AlarmItem.qml">sources/gui/qml/AlarmItem.qml</file>
         <file alias="PowerItem.qml">sources/gui/qml/PowerItem.qml</file>
+        <file alias="Keyboard.qml">sources/gui/qml/Keyboard.qml</file>
+        <file alias="SDItem.qml">sources/gui/qml/SDItem.qml</file>
     </qresource>
     <qresource prefix="/translation"/>
     <qresource prefix="/globals">
@@ -122,10 +129,9 @@
         <file alias="qmldir">sources/gui/qml/globals/qmldir</file>
         <file alias="Fonts.qml">sources/gui/qml/globals/Fonts.qml</file>
     </qresource>
-    <qresource prefix="/pages/treatment">
-        <file alias="TreatmentStack.qml">sources/gui/qml/pages/treatment/TreatmentStack.qml</file>
-        <file alias="TreatmentStart.qml">sources/gui/qml/pages/treatment/TreatmentStart.qml</file>
-        <file alias="TreatmentUltrafiltrationItem.qml">sources/gui/qml/pages/treatment/TreatmentUltrafiltrationItem.qml</file>
+    <qresource prefix="/pages/disinfect">
+        <file alias="DisinfectBase.qml">sources/gui/qml/pages/disinfect/DisinfectBase.qml</file>
+        <file alias="DisinfectStack.qml">sources/gui/qml/pages/disinfect/DisinfectStack.qml</file>
     </qresource>
     <qresource prefix="/pages/pretreatment">
         <file alias="PreTreatmentBase.qml">sources/gui/qml/pages/pretreatment/PreTreatmentBase.qml</file>
@@ -144,6 +150,12 @@
         <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>
+    </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>
@@ -164,24 +176,28 @@
         <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>
     </qresource>
-    <qresource prefix="/pages/posttreatment">
-        <file alias="PostTreatmentBloodPrime.qml">sources/gui/qml/pages/postTreatment/PostTreatmentBloodPrime.qml</file>
-        <file alias="PostTreatmentRinsebackStack.qml">sources/gui/qml/pages/postTreatment/PostTreatmentRinsebackStack.qml</file>
-        <file alias="PostTreatmentRecirculateStack.qml">sources/gui/qml/pages/postTreatment/PostTreatmentRecirculateStack.qml</file>
-        <file alias="PostTreatmentEndStack.qml">sources/gui/qml/pages/postTreatment/PostTreatmentEndStack.qml</file>
+    <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>
     </qresource>
-    <qresource prefix="/pages/posttreatment/rinseback">
-        <file alias="PostTreatmentRinsebackInit.qml">sources/gui/qml/pages/postTreatment/rinseback/PostTreatmentRinsebackInit.qml</file>
-        <file alias="PostTreatmentRinseback.qml">sources/gui/qml/pages/postTreatment/rinseback/PostTreatmentRinseback.qml</file>
-        <file alias="PostTreatmentRinsebackComplete.qml">sources/gui/qml/pages/postTreatment/rinseback/PostTreatmentRinsebackComplete.qml</file>
-        <file alias="PostTreatmentAdditional.qml">sources/gui/qml/pages/postTreatment/rinseback/PostTreatmentAdditional.qml</file>
+    <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/posttreatment/recirculate">
-        <file alias="PostTreatmentRecirculate.qml">sources/gui/qml/pages/postTreatment/recirculate/PostTreatmentRecirculate.qml</file>
-        <file alias="PostTreatmentReconnect.qml">sources/gui/qml/pages/postTreatment/recirculate/PostTreatmentReconnect.qml</file>
+    <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/posttreatment/end">
-        <file alias="PostTreatmentEnd.qml">sources/gui/qml/pages/postTreatment/end/PostTreatmentEnd.qml</file>
-        <file alias="PostTreatmentEndPaused.qml">sources/gui/qml/pages/postTreatment/end/PostTreatmentEndPause.qml</file>
+    <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/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>
+    </qresource>
 </RCC>