Index: leahi.qrc
===================================================================
diff -u -reaa02e45b2d5f0910309bea7165963a539f9db97 -rcb9c48c7c307690dcafcfd16ef412fe660291692
--- leahi.qrc	(.../leahi.qrc)	(revision eaa02e45b2d5f0910309bea7165963a539f9db97)
+++ leahi.qrc	(.../leahi.qrc)	(revision cb9c48c7c307690dcafcfd16ef412fe660291692)
@@ -34,21 +34,29 @@
         <file alias="NotificationDialog.qml">sources/gui/qml/dialogs/NotificationDialog.qml</file>
         <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>
     </qresource>
     <qresource prefix="/dialogs/diagnostics">
         <file alias="DiagnosticsDialog.qml">sources/gui/qml/dialogs/diagnostics/DiagnosticsDialog.qml</file>
         <file alias="DiagnosticsBase.qml">sources/gui/qml/dialogs/diagnostics/DiagnosticsBase.qml</file>
         <file alias="DiagnosticsSwipe.qml">sources/gui/qml/dialogs/diagnostics/DiagnosticsSwipe.qml</file>
         <file alias="DiagnosticsTD.qml">sources/gui/qml/dialogs/diagnostics/DiagnosticsTD.qml</file>
         <file alias="DiagnosticsDD.qml">sources/gui/qml/dialogs/diagnostics/DiagnosticsDD.qml</file>
+        <file alias="DiagnosticsFP.qml">sources/gui/qml/dialogs/diagnostics/DiagnosticsFP.qml</file>
     </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="/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>
@@ -86,10 +94,16 @@
         <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>
     </qresource>
     <qresource prefix="/components">
         <file alias="MainMenu.qml">sources/gui/qml/components/MainMenu.qml</file>
@@ -119,10 +133,6 @@
         <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="SliderCreateTreatment.qml">sources/gui/qml/components/SliderCreateTreatment.qml</file>
-        <file alias="ConfirmTreatmentTable.qml">sources/gui/qml/components/ConfirmTreatmentTable.qml</file>
-        <file alias="ConfirmTreatmentSubTable.qml">sources/gui/qml/components/ConfirmTreatmentSubTable.qml</file>
-        <file alias="GridSelection.qml">sources/gui/qml/components/GridSelection.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>
@@ -132,29 +142,28 @@
         <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="ConfirmTreatmentTableEntry.qml">sources/gui/qml/components/ConfirmTreatmentTableEntry.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>
-        <file alias="UpDownButton.qml">sources/gui/qml/components/UpDownButton.qml</file>
         <file alias="ImageText.qml">sources/gui/qml/components/ImageText.qml</file>
         <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>
         <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>
         <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>
         <file alias="LabelValue.qml">sources/gui/qml/components/LabelValue.qml</file>
         <file alias="ArrowButton.qml">sources/gui/qml/components/ArrowButton.qml</file>
         <file alias="HeaderBar.qml">sources/gui/qml/components/HeaderBar.qml</file>
+        <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>
     </qresource>
     <qresource prefix="/compounds">
         <file alias="PressureRangeSlider.qml">sources/gui/qml/compounds/PressureRangeSlider.qml</file>
@@ -163,6 +172,9 @@
         <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="ValueAdjuster.qml">sources/gui/qml/compounds/ValueAdjuster.qml</file>
         <file alias="StoppedSlider.qml">sources/gui/qml/compounds/StoppedSlider.qml</file>
         <file alias="TreatmentAdjustmentUltrafiltrationMetrics.qml">sources/gui/qml/compounds/TreatmentAdjustmentUltrafiltrationMetrics.qml</file>
     </qresource>
@@ -227,9 +239,9 @@
         <file alias="PreTreatmentPrimeStack.qml">sources/gui/qml/pages/pretreatment/PreTreatmentPrimeStack.qml</file>
     </qresource>
     <qresource prefix="/pages/pretreatment/create">
-        <file alias="PreTreatmentCreateStack.qml">sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateStack.qml</file>
         <file alias="PreTreatmentCreate.qml">sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml</file>
-        <file alias="PreTreatmentConfirm.qml">sources/gui/qml/pages/pretreatment/create/PreTreatmentConfirm.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>
@@ -263,6 +275,8 @@
         <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="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>
     <qresource prefix="/pages/endtreatment">
         <file alias="EndTreatmentRinsebackStack.qml">sources/gui/qml/pages/endtreatment/EndTreatmentRinsebackStack.qml</file>