Index: CMakeLists.txt
===================================================================
diff -u -r57ea732311e6f4c746974f5a52316f63dec23ca8 -rd2c46e9c9202beb56ef21ffb46bb6bd286cbea3a
--- CMakeLists.txt	(.../CMakeLists.txt)	(revision 57ea732311e6f4c746974f5a52316f63dec23ca8)
+++ CMakeLists.txt	(.../CMakeLists.txt)	(revision d2c46e9c9202beb56ef21ffb46bb6bd286cbea3a)
@@ -71,11 +71,12 @@
 # add_subdirectory(sources)
 add_subdirectory(resources)
 
-set(INCLUDES
+set(HEADERS
     # common
     common/AlarmDefs.h
     common/Compatible.h
     common/DDDefs.h
+    common/FPDefs.h
     common/TDDefs.h
     common/MsgDefs.h
     # Main
@@ -89,6 +90,7 @@
     # Controllers
     sources/ApplicationController.h
     sources/device/DeviceController.h
+    sources/model/confirm/MDuetConfirmTDi.h
     sources/model/dd/adjustment/settings/MAdjustDDSerialNumberResponse.h
     sources/model/dd/adjustment/settings/MAdjustDDVersionsResponse.h
     sources/model/dd/data/MDDBloodLeakData.h
@@ -101,9 +103,24 @@
     sources/model/dd/data/MDDPressuresData.h
     sources/model/dd/data/MDDTemperaturesData.h
     sources/model/dd/data/MDDValvesStatesData.h
+    sources/model/dd/data/MDDOperationModeData.h
+    sources/model/fp/adjustment/settings/MAdjustFPVersionsResponse.h
+    sources/model/fp/data/MFPBoostPumpData.h
+    sources/model/fp/data/MFPConductivityData.h
+    sources/model/fp/data/MFPFlowData.h
+    sources/model/fp/data/MFPLevelData.h
+    sources/model/fp/data/MFPPressuresData.h
+    sources/model/fp/data/MFPROPumpData.h
+    sources/model/fp/data/MFPRORejectionPercentageData.h
+    sources/model/fp/data/MFPTemperatureData.h
+    sources/model/td/adjustment/settings/MAdjustTDAdvancedInstitutionalRecordResponse.h
     sources/model/td/adjustment/settings/MAdjustTDSerialNumberResponse.h
     sources/model/td/adjustment/settings/MAdjustTDVersionsRequest.h
     sources/model/td/adjustment/settings/MAdjustTDVersionsResponse.h
+    sources/model/td/adjustment/settings/MTDAdvancedInstitutionalRecordResponse.h
+    sources/model/td/adjustment/treatment/MTreatmentAdjustPressuresWideningResponse.h
+    sources/model/td/adjustment/treatment/MTreatmentAdjustVitalsAlarmLimitsResponse.h
+    sources/model/td/adjustment/treatment/MTreatmentAdjustVitalsResponse.h
     sources/model/td/data/MTDAirBubbleData.h
     sources/model/td/data/MTDAirPumpData.h
     sources/model/td/data/MTDAirTrapData.h
@@ -113,13 +130,18 @@
     sources/model/td/data/MTDTemperatureData.h
     sources/model/td/data/MTDValvesData.h
     sources/model/td/data/MTDVoltageData.h
+    sources/model/td/data/MWaterSampleData.h
     sources/model/td/data/treatment/MTreatmentBloodFlowData.h
+    sources/model/td/data/treatment/MTreatmentBloodPrimeData.h
+    sources/model/td/data/treatment/MTreatmentIsolatedUFData.h
     sources/model/td/data/treatment/MTreatmentParametersSetPointData.h
     sources/model/td/data/treatment/MTreatmentPressureOcclusionData.h
     sources/model/td/data/treatment/MTreatmentSalineData.h
     sources/model/td/data/treatment/MTreatmentStatesData.h
     sources/model/td/data/treatment/MTreatmentTimeData.h
     sources/model/td/data/treatment/MTreatmentUltrafiltrationData.h
+    sources/model/td/data/treatment/MTreatmentVitalsData.h
+    sources/model/td/data/treatment/MTreatmentStopData.h
     sources/storage/Settings.h
     sources/storage/TreatmentLog.h
     sources/bluetooth/BluetoothInterface.h
@@ -132,7 +154,32 @@
     sources/device/DeviceModels.h
     # ---------- Models - TD - Data                                           //// ----- @LEAHIZED
     sources/model/td/data/MTDOpModeData.h
+    sources/model/td/data/MTDPowerOffWarning.h
+    # ---------- Models - TD - Data - Treatment Log
+    sources/model/td/data/treatmentlog/MTreatmentLogAlarmData.h
+    sources/model/td/data/treatmentlog/MTreatmentLogEventData.h
+    sources/model/td/data/treatmentlog/MTreatmentLogAvrgeData.h
+    # ---------- Models - TD - Adjustment - In-Treatment                      //// ----- @LEAHIZED
+    sources/model/td/adjustment/treatment/MTreatmentAdjustBloodPrimeResponse.h
+    sources/model/td/adjustment/treatment/MTreatmentAdjustBloodFlowRateResponse.h
+    sources/model/td/adjustment/treatment/MTreatmentAdjustBolusVolumeResponse.h
+    sources/model/td/adjustment/treatment/MTreatmentAdjustDialysateFlowRateResponse.h
+    sources/model/td/adjustment/treatment/MTreatmentAdjustDialysateTemperatureResponse.h
+    sources/model/td/adjustment/treatment/MTreatmentAdjustDurationConfirmResponse.h
+    sources/model/td/adjustment/treatment/MTreatmentAdjustDurationEditResponse.h
+    sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFDurationEditResponse.h
+    sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFVolumeEditResponse.h
+    sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFConfirmResponse.h
+    sources/model/td/adjustment/treatment/MTreatmentAdjustPressuresLimitsResponse.h
+    sources/model/td/adjustment/treatment/MTreatmentAdjustSalineResponse.h
+    sources/model/td/adjustment/treatment/MTreatmentAdjustSetPointsResponse.h
+    sources/model/td/adjustment/treatment/MTreatmentAdjustUltrafiltrationStateResponse.h
+    sources/model/td/adjustment/treatment/MTreatmentAdjustUltrafiltrationEditResponse.h
+    sources/model/td/adjustment/treatment/MTreatmentAdjustUltrafiltrationConfirmResponse.h
+    sources/model/td/adjustment/treatment/MTreatmentAdjustVitalsResponse.h
     # ---------- Views - TD - Data - States                                   //// ----- @LEAHIZED
+    sources/view/VHeaderbarModel.h
+    sources/view/VWaterSampleModel.h
     sources/view/dd/data/VDDBloodLeakData.h
     sources/view/dd/data/VDDConcentratePumpData.h
     sources/view/dd/data/VDDConductivityData.h
@@ -143,19 +190,92 @@
     sources/view/dd/data/VDDPressuresData.h
     sources/view/dd/data/VDDTemperaturesData.h
     sources/view/dd/data/VDDValvesStatesData.h
-    sources/view/hd/data/VTreatmentRanges.h
+    sources/view/dd/data/VDDOperationModeData.h
+    sources/view/fp/data/VFPBoostPumpData.h
+    sources/view/fp/data/VFPConductivityData.h
+    sources/view/fp/data/VFPFlowData.h
+    sources/view/fp/data/VFPLevelData.h
+    sources/view/fp/data/VFPPressuresData.h
+    sources/view/fp/data/VFPROPumpData.h
+    sources/view/fp/data/VFPRORejectionPercentageData.h
+    sources/view/fp/data/VFPTemperatureData.h
+    sources/view/settings/VAdjustmentAdvancedInstitutionalRecord.h
+    sources/view/settings/VAdvancedInstitutionalRecord.h
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresWidening.h
     sources/view/td/data/VTDAirBubbleData.h
     sources/view/td/data/VTDAirPumpData.h
     sources/view/td/data/VTDAirTrapData.h
     sources/view/td/data/VTDBatteryData.h
     sources/view/td/data/VTDEjectorData.h
     sources/view/td/data/VTDOpModeData.h
+    sources/view/td/data/VTDSwitchesData.h
+    sources/view/td/data/VTDTemperatureData.h
+    sources/view/td/data/VTDValvesData.h
+    sources/view/td/data/VTDVoltageData.h
+    sources/view/td/data/VTreatmentRanges.h
+    sources/view/td/data/VWaterSampleData.h
+    # ---------- Views - TD - Data - In-Treatment
+    sources/view/td/data/treatment/VTDTreatmentStatesData.h
+    sources/view/td/data/treatment/VTreatmentBloodFlow.h
+    sources/view/td/data/treatment/VTreatmentBloodPrimeData.h
+    sources/view/td/data/treatment/VTreatmentIsolatedUFData.h
+    sources/view/td/data/treatment/VTreatmentParametersSetPointData.h
+    sources/view/td/data/treatment/VTreatmentPressureOcclusion.h
+    sources/view/td/data/treatment/VTreatmentSalineData.h
+    sources/view/td/data/treatment/VTreatmentTime.h
+    sources/view/td/data/treatment/VTreatmentTrends.h
+    sources/view/td/data/treatment/VTreatmentUltrafiltrationData.h
+    sources/view/td/data/treatment/VTreatmentStopData.h
     # ---------- Views - TD - Adjustment - In-Treatment
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentBloodFlowRate.h
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentBloodPrime.h
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentBolusVolume.h
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentDialysateFlowRate.h
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentDialysateTemperature.h
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentDurationConfirm.h
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentDurationEdit.h
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentFlows.h
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFDurationEdit.h
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFVolumeEdit.h
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFConfirm.h
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresLimits.h
     sources/view/td/adjustment/treatment/VTreatmentAdjustmentSaline.h
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentSetPoints.h
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentVitalsAlarmLimits.h
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationConfirm.h
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationEdit.h
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationState.h
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentVitals.h
+    # ---------- Views - TD - Adjustment - Pre-Treatment
+    sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesConfirm.h
+    sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentStartTreatment.h
+    sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentWaterSample.h
+    # ---------- Views - TD - Adjustment - Post-Treatment
+    sources/view/td/adjustment/posttreatment/VPostTreatmentAdjustPatientDisconnectionConfirm.h
+    sources/view/td/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.h
+    sources/view/td/adjustment/posttreatment/VPostTreatmentAdjustDisposablesRemovalConfirm.h
     # ---------- Models - TD - Adjustment - In-Treatment
     sources/model/td/adjustment/treatment/MTreatmentAdjustSalineResponse.h
+    sources/model/td/adjustment/treatment/MTreatmentAdjustRecirculateResponse.h
+    # ---------- Models - TD - Adjustment - Settings
+    sources/model/td/adjustment/settings/MAdjustTDDateTimeResponse.h
+    sources/model/td/adjustment/settings/MTDInstitutionalRecordResponse.h
+    sources/model/td/adjustment/settings/MAdjustTDInstitutionalRecordResponse.h
+    # ---------- Models - DD - Adjustment - Settings
+    sources/model/dd/adjustment/settings/MAdjustDDDateTimeResponse.h
+    # ---------- Models - TD - Adjustment - End-Treatment
+    sources/model/td/adjustment/treatment/MTreatmentAdjustEndResponse.h
+    sources/model/td/adjustment/treatment/MTreatmentAdjustRinsebackResponse.h
+    # ---------- Models - TD - Adjustment - Pre-Treatment
+    sources/model/td/adjustment/pretreatment/MPreTreatmentAdjustDisposablesConfirmResponse.h
+    sources/model/td/adjustment/pretreatment/MPreTreatmentAdjustStartTreatmentResponse.h
+    sources/model/td/adjustment/pretreatment/MPreTreatmentAdjustWaterSampleResultResponse.h
+    # ---------- Models - TD - Adjustment - Post-Treatment
+    sources/model/td/adjustment/posttreatment/MPostTreatmentAdjustRequests.h
+    sources/model/td/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.h
+    sources/model/td/adjustment/posttreatment/MPostTreatmentAdjustDisposablesRemovalConfirmResponse.h
+    sources/model/td/adjustment/posttreatment/MPostTreatmentAdjustPatientDisconnectionConfirmResponse.h
     # ---------- Models - confirm
-    sources/model/confirm/MDuetConfirmHDi.h
     # ---------- Models - POST
     sources/model/dg/data/post/MDGPostFinalResultData.h
     sources/model/dg/data/post/MDGPostSingleResultData.h
@@ -170,7 +290,6 @@
     sources/model/hd/adjustment/settings/MAdjustHDServiceModeResponse.h
     sources/model/dg/adjustment/settings/MAdjustDGServiceDatesResponse.h
     sources/model/hd/adjustment/settings/MAdjustHDServiceDatesResponse.h
-    sources/model/hd/adjustment/settings/MAdjustHDInstitutionalRecordResponse.h
     sources/model/dg/adjustment/settings/MDuetRoWaterDG.h
     # ---------- Models - Alarm
     sources/model/hd/alarm/MAlarmStatusData.h
@@ -182,40 +301,21 @@
     sources/model/hd/data/posttreatment/MPostTreatmentStatesData.h
     # ---------- Models - HD - Adjustment
     sources/model/hd/adjustment/MAdjustRequestsBase.h
-    sources/model/hd/adjustment/MAdjustPowerOff.h
     sources/model/hd/adjustment/settings/MAdjustHDRequests.h
     # ---------- Models - HD - Adjustment - Settings
-    sources/model/hd/adjustment/settings/MAdjustHDDateTimeResponse.h
     sources/model/hd/adjustment/settings/MAdjustHDAlarmVolumeResponse.h
     # ---------- Models - HD - Adjustment - Pre-Treatment
     sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h
     sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustInitTreatmentResponse.h
     sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.h
-    sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustWaterSampleResponse.h
-    sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustDisposablesConfirmResponse.h
     sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustDisposablesPrimeResponse.h
     sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustPatientConnectionBeginResponse.h
     sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustUltrafiltrationInitResponse.h
     sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustPatientConnectionConfirmResponse.h
-    sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustStartTreatmentResponse.h
     # ---------- Models - HD - Adjustment - In-Treatment
     sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h
-    sources/model/hd/adjustment/treatment/MTreatmentAdjustDurationResponse.h
     sources/model/hd/adjustment/treatment/MTreatmentAdjustBloodDialysateResponse.h
-    sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationStateResponse.h
-    sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationEditResponse.h
-    sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationConfirmResponse.h
     sources/model/hd/adjustment/treatment/MTreatmentAdjustHeparinResponse.h
-    sources/model/hd/adjustment/treatment/MTreatmentAdjustPressuresLimitsResponse.h
-    # ---------- Models - HD - Adjustment - End-Treatment
-    sources/model/hd/adjustment/treatment/MTreatmentAdjustRinsebackResponse.h
-    sources/model/hd/adjustment/treatment/MTreatmentAdjustRecirculateResponse.h
-    sources/model/hd/adjustment/treatment/MTreatmentAdjustEndResponse.h
-    # ---------- Models - HD - Adjustment - Post-Treatment
-    sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustRequests.h
-    sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.h
-    sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustDisposablesRemovalConfirmResponse.h
-    sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustPatientDisconnectionConfirmResponse.h
     # ---------- Models - HD - Adjustment - Disinfeection
     sources/model/hd/adjustment/disinfect/MDisinfectAdjustModeRequests.h
     sources/model/hd/adjustment/disinfect/MDisinfectAdjustModeResponse.h
@@ -237,19 +337,11 @@
     sources/model/hd/data/treatment/MTreatmentHeparinData.h
     sources/model/hd/data/treatment/MTreatmentRinsebackData.h
     sources/model/hd/data/treatment/MTreatmentRecirculateData.h
-    sources/model/hd/data/treatment/MTreatmentBloodPrimeData.h
-    sources/model/hd/data/treatment/MTreatmentStopData.h
     sources/model/hd/data/post/MHDRTCEpochData.h
     sources/model/hd/data/MHDUsageInfoResponse.h
-    # ---------- Models - HD - Data - Treatment Log
-    sources/model/hd/data/treatmentlog/MTreatmentLogAlarmData.h
-    sources/model/hd/data/treatmentlog/MTreatmentLogAvrgeData.h
-    sources/model/hd/data/treatmentlog/MTreatmentLogEventData.h
     # ---------- Models - DG - Adjustment
     sources/model/dg/adjustment/settings/MAdjustDGRequests.h
     sources/model/dg/adjustment/settings/MAdjustDGCleaningUsageResponse.h
-    # ---------- Models - DG - Adjustment - Settings
-    sources/model/dg/adjustment/settings/MAdjustDGDateTimeResponse.h
     # ---------- Models - DG - Data - Pre-Treatment - Progress
     sources/model/dg/data/pretreatment/MDGFilterFlushData.h
     # ---------- Models - DG - Data - Disinfect - Progress
@@ -258,7 +350,6 @@
     sources/model/dg/data/MDGGeneralEvent.h
     sources/model/dg/data/MDGDrainPumpData.h
     sources/model/dg/data/MDGLoadCellReadingsData.h
-    sources/model/dg/data/MDGOperationModeData.h
     sources/model/dg/data/MDGReservoirData.h
     sources/model/dg/data/MDGROPumpData.h
     sources/model/dg/data/MDGAccelerometerData.h
@@ -299,6 +390,7 @@
     sources/view/settings/VCloudSync.h
     sources/view/settings/VHDUsageInfo.h
     sources/view/settings/VAdjustmentInstitutionalRecord.h
+    sources/view/settings/VInstitutionalRecord.h
     # ---------- Views - Alarm
     sources/view/hd/alarm/VAlarmStatus.h
     sources/view/hd/alarm/VAlarmActiveList.h
@@ -308,30 +400,17 @@
     sources/view/hd/adjustment/common/VCommonAdjustmentVitals.h
     # ---------- Views - HD - Adjustment - Pre-Treatment
     sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentInitTreatment.h
-    sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentWaterSample.h
     sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentConsumablesConfirm.h
-    sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesConfirm.h
     sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesPrime.h
     sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentPatientConnectionBegin.h
     sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentUltrafiltrationInit.h
     sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentPatientConnectionConfirm.h
-    sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentStartTreatment.h
     # ---------- Views - HD - Adjustment - In-Treatment
-    sources/view/hd/adjustment/treatment/VTreatmentAdjustmentDuration.h
-    sources/view/hd/adjustment/treatment/VTreatmentAdjustmentFlows.h
-    sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationState.h
-    sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationEdit.h
-    sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationConfirm.h
     sources/view/hd/adjustment/treatment/VTreatmentAdjustmentHeparin.h
-    sources/view/hd/adjustment/treatment/VTreatmentAdjustmentPressuresLimits.h
     # ---------- Views - HD - Adjustment - End-Treatment
     sources/view/hd/adjustment/treatment/VTreatmentAdjustmentRinseback.h
     sources/view/hd/adjustment/treatment/VTreatmentAdjustmentRecirculate.h
     sources/view/hd/adjustment/treatment/VTreatmentAdjustmentEnd.h
-    # ---------- Views - HD - Adjustment - Post-Treatment
-    sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustPatientDisconnectionConfirm.h
-    sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.h
-    sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustDisposablesRemovalConfirm.h
     # ---------- Views - HD - Adjustment - Disinfection
     sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.h
     # ---------- Views - HD - Data - States
@@ -350,14 +429,11 @@
     sources/view/hd/data/treatment/VTreatmentHeparinData.h
     sources/view/hd/data/treatment/VTreatmentRinsebackData.h
     sources/view/hd/data/treatment/VTreatmentRecirculateData.h
-    sources/view/hd/data/treatment/VTreatmentBloodPrimeData.h
-    sources/view/hd/data/treatment/VTreatmentStopData.h
     # ---------- Views - DG - Data - Pre-Treatment - Progress
     sources/view/dg/data/pretreatment/VDGFilterFlushData.h
     # ---------- Views - DG - Data - Disinfection - Progress
     # ---------- Views - DG - States
     # ---------- Views - DG - Data
-    sources/view/dg/data/VDGOperationModeData.h
     sources/view/dg/data/VDGDrainPumpData.h
     sources/view/dg/data/VDGLoadCellReadingsData.h
     sources/view/dg/data/VDGROPumpData.h
@@ -373,17 +449,6 @@
     sources/utility/types.h
     sources/utility/encryption.h
     sources/utility/qrcodegen.h
-    sources/view/td/data/VTDSwitchesData.h
-    sources/view/td/data/VTDTemperatureData.h
-    sources/view/td/data/VTDValvesData.h
-    sources/view/td/data/VTDVoltageData.h
-    sources/view/td/data/treatment/VTDTreatmentStatesData.h
-    sources/view/td/data/treatment/VTreatmentBloodFlow.h
-    sources/view/td/data/treatment/VTreatmentParametersSetPointData.h
-    sources/view/td/data/treatment/VTreatmentPressureOcclusion.h
-    sources/view/td/data/treatment/VTreatmentSalineData.h
-    sources/view/td/data/treatment/VTreatmentTime.h
-    sources/view/td/data/treatment/VTreatmentUltrafiltrationData.h
 )
 
 set(SRCS
@@ -398,6 +463,7 @@
     # Controllers
     sources/ApplicationController.cpp
     sources/device/DeviceController.cpp
+    sources/model/confirm/MDuetConfirmTDi.cpp
     sources/model/dd/adjustment/settings/MAdjustDDSerialNumberResponse.cpp
     sources/model/dd/adjustment/settings/MAdjustDDVersionsResponse.cpp
     sources/model/dd/data/MDDBloodLeakData.cpp
@@ -410,9 +476,23 @@
     sources/model/dd/data/MDDPressuresData.cpp
     sources/model/dd/data/MDDTemperaturesData.cpp
     sources/model/dd/data/MDDValvesStatesData.cpp
+    sources/model/dd/data/MDDOperationModeData.cpp
+    sources/model/fp/adjustment/settings/MAdjustFPVersionsResponse.cpp
+    sources/model/fp/data/MFPBoostPumpData.cpp
+    sources/model/fp/data/MFPConductivityData.cpp
+    sources/model/fp/data/MFPFlowData.cpp
+    sources/model/fp/data/MFPLevelData.cpp
+    sources/model/fp/data/MFPPressuresData.cpp
+    sources/model/fp/data/MFPROPumpData.cpp
+    sources/model/fp/data/MFPRORejectionPercentageData.cpp
+    sources/model/fp/data/MFPTemperatureData.cpp
+    sources/model/td/adjustment/settings/MAdjustTDAdvancedInstitutionalRecordResponse.cpp
     sources/model/td/adjustment/settings/MAdjustTDSerialNumberResponse.cpp
     sources/model/td/adjustment/settings/MAdjustTDVersionsRequest.cpp
     sources/model/td/adjustment/settings/MAdjustTDVersionsResponse.cpp
+    sources/model/td/adjustment/settings/MTDAdvancedInstitutionalRecordResponse.cpp
+    sources/model/td/adjustment/treatment/MTreatmentAdjustPressuresWideningResponse.cpp
+    sources/model/td/adjustment/treatment/MTreatmentAdjustVitalsAlarmLimitsResponse.cpp
     sources/model/td/data/MTDAirBubbleData.cpp
     sources/model/td/data/MTDAirPumpData.cpp
     sources/model/td/data/MTDAirTrapData.cpp
@@ -422,16 +502,23 @@
     sources/model/td/data/MTDTemperatureData.cpp
     sources/model/td/data/MTDValvesData.cpp
     sources/model/td/data/MTDVoltageData.cpp
+    sources/model/td/data/MWaterSampleData.cpp
     sources/model/td/data/treatment/MTreatmentBloodFlowData.cpp
+    sources/model/td/data/treatment/MTreatmentBloodPrimeData.cpp
+    sources/model/td/data/treatment/MTreatmentIsolatedUFData.cpp
     sources/model/td/data/treatment/MTreatmentParametersSetPointData.cpp
     sources/model/td/data/treatment/MTreatmentPressureOcclusionData.cpp
     sources/model/td/data/treatment/MTreatmentSalineData.cpp
     sources/model/td/data/treatment/MTreatmentStatesData.cpp
     sources/model/td/data/treatment/MTreatmentTimeData.cpp
     sources/model/td/data/treatment/MTreatmentUltrafiltrationData.cpp
+    sources/model/td/data/treatment/MTreatmentVitalsData.cpp
+    sources/model/td/data/treatment/MTreatmentStopData.cpp
     sources/model/ui/data/MUIBloodPressureData.cpp
     sources/storage/Settings.cpp
     sources/storage/TreatmentLog.cpp
+    sources/view/VHeaderbarModel.cpp
+    sources/view/VWaterSampleModel.cpp
     sources/view/dd/data/VDDBloodLeakData.cpp
     sources/view/dd/data/VDDConcentratePumpData.cpp
     sources/view/dd/data/VDDConductivityData.cpp
@@ -442,6 +529,15 @@
     sources/view/dd/data/VDDPressuresData.cpp
     sources/view/dd/data/VDDTemperaturesData.cpp
     sources/view/dd/data/VDDValvesStatesData.cpp
+    sources/view/dd/data/VDDOperationModeData.cpp
+    sources/view/fp/data/VFPBoostPumpData.cpp
+    sources/view/fp/data/VFPConductivityData.cpp
+    sources/view/fp/data/VFPFlowData.cpp
+    sources/view/fp/data/VFPLevelData.cpp
+    sources/view/fp/data/VFPPressuresData.cpp
+    sources/view/fp/data/VFPROPumpData.cpp
+    sources/view/fp/data/VFPRORejectionPercentageData.cpp
+    sources/view/fp/data/VFPTemperatureData.cpp
     sources/view/hd/data/post/VHDPOSTData.cpp
     sources/bluetooth/BluetoothInterface.cpp
     sources/cloudsync/CloudSyncController.cpp
@@ -450,10 +546,36 @@
     sources/model/MAbstractDynamic.cpp
     sources/model/MListModel.cpp
     sources/device/DeviceModels.cpp
+    # ---------- Models - TD - Data
+    sources/model/td/data/MTDPowerOffWarning.cpp
     # ---------- Models - TD - Data - States
     sources/model/td/data/MTDOpModeData.cpp
+    # ---------- Models - TD - Data - Treatment Log
+    sources/model/td/data/treatmentlog/MTreatmentLogAlarmData.cpp
+    sources/model/td/data/treatmentlog/MTreatmentLogEventData.cpp
+    sources/model/td/data/treatmentlog/MTreatmentLogAvrgeData.cpp
+    # ---------- Models - TD - Adjustment - In-Treatment
+    sources/model/td/adjustment/treatment/MTreatmentAdjustBloodPrimeResponse.cpp
+    sources/model/td/adjustment/treatment/MTreatmentAdjustBloodFlowRateResponse.cpp
+    sources/model/td/adjustment/treatment/MTreatmentAdjustBolusVolumeResponse.cpp
+    sources/model/td/adjustment/treatment/MTreatmentAdjustDialysateFlowRateResponse.cpp
+    sources/model/td/adjustment/treatment/MTreatmentAdjustDialysateTemperatureResponse.cpp
+    sources/model/td/adjustment/treatment/MTreatmentAdjustDurationConfirmResponse.cpp
+    sources/model/td/adjustment/treatment/MTreatmentAdjustDurationEditResponse.cpp
+    sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFDurationEditResponse.cpp
+    sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFVolumeEditResponse.cpp
+    sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFConfirmResponse.cpp
+    sources/model/td/adjustment/treatment/MTreatmentAdjustPressuresLimitsResponse.cpp
+    sources/model/td/adjustment/treatment/MTreatmentAdjustSalineResponse.cpp
+    sources/model/td/adjustment/treatment/MTreatmentAdjustSetPointsResponse.cpp
+    sources/model/td/adjustment/treatment/MTreatmentAdjustUltrafiltrationConfirmResponse.cpp
+    sources/model/td/adjustment/treatment/MTreatmentAdjustUltrafiltrationEditResponse.cpp
+    sources/model/td/adjustment/treatment/MTreatmentAdjustUltrafiltrationStateResponse.cpp
+    # ---------- Models - TD - Adjustment - End-Treatment
+    sources/model/td/adjustment/treatment/MTreatmentAdjustEndResponse.cpp
+    sources/model/td/adjustment/treatment/MTreatmentAdjustVitalsResponse.cpp
+    sources/model/td/adjustment/treatment/MTreatmentAdjustRinsebackResponse.cpp
     # ---------- Models - CONFIRM
-    sources/model/confirm/MDuetConfirmHDi.cpp
     # ---------- Models - POST
     sources/model/dg/data/post/MDGPostFinalResultData.cpp
     sources/model/dg/data/post/MDGPostSingleResultData.cpp
@@ -466,7 +588,6 @@
     sources/model/hd/adjustment/settings/MAdjustHDServiceModeResponse.cpp
     sources/model/dg/adjustment/settings/MAdjustDGServiceDatesResponse.cpp
     sources/model/hd/adjustment/settings/MAdjustHDServiceDatesResponse.cpp
-    sources/model/hd/adjustment/settings/MAdjustHDInstitutionalRecordResponse.cpp
     sources/model/dg/adjustment/settings/MDuetRoWaterDG.cpp
     # ---------- Models - Alarm
     sources/model/hd/alarm/MAlarmStatusData.cpp
@@ -477,39 +598,34 @@
     # ---------- Models - Data - States
     sources/model/hd/data/pretreatment/MPreTreatmentStatesData.cpp
     sources/model/hd/data/posttreatment/MPostTreatmentStatesData.cpp
+    # ---------- Models - TD - Adjustment - Settings
+    sources/model/td/adjustment/settings/MAdjustTDDateTimeResponse.cpp
+    sources/model/td/adjustment/settings/MTDInstitutionalRecordResponse.cpp
+    sources/model/td/adjustment/settings/MAdjustTDInstitutionalRecordResponse.cpp
+    # ---------- Models - TD - Adjustment - Pre-Treatment
+    sources/model/td/adjustment/pretreatment/MPreTreatmentAdjustDisposablesConfirmResponse.cpp
+    sources/model/td/adjustment/pretreatment/MPreTreatmentAdjustStartTreatmentResponse.cpp
+    sources/model/td/adjustment/pretreatment/MPreTreatmentAdjustWaterSampleResultResponse.cpp
+    # ---------- Models - TD - Adjustment - Post-Treatment
+    sources/model/td/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.cpp
+    sources/model/td/adjustment/posttreatment/MPostTreatmentAdjustDisposablesRemovalConfirmResponse.cpp
+    sources/model/td/adjustment/posttreatment/MPostTreatmentAdjustPatientDisconnectionConfirmResponse.cpp
     # ---------- Models - TD - Adjustment - In-Treatment
-    sources/model/td/adjustment/treatment/MTreatmentAdjustSalineResponse.cpp
-    # ---------- Models - HD - Adjustment
-    sources/model/hd/adjustment/MAdjustPowerOff.cpp
+    sources/model/td/adjustment/treatment/MTreatmentAdjustRecirculateResponse.cpp
+    # ---------- Models - DD - Adjustment - Settings
+    sources/model/dd/adjustment/settings/MAdjustDDDateTimeResponse.cpp
     # ---------- Models - HD - Adjustment - Settings
-    sources/model/hd/adjustment/settings/MAdjustHDDateTimeResponse.cpp
     sources/model/hd/adjustment/settings/MAdjustHDAlarmVolumeResponse.cpp
     # ---------- Models - HD - Adjustment - Pre-Treatment
     sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustInitTreatmentResponse.cpp
     sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.cpp
-    sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustWaterSampleResponse.cpp
-    sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustDisposablesConfirmResponse.cpp
     sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustDisposablesPrimeResponse.cpp
     sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustPatientConnectionBeginResponse.cpp
     sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustUltrafiltrationInitResponse.cpp
     sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustPatientConnectionConfirmResponse.cpp
-    sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustStartTreatmentResponse.cpp
     # ---------- Models - HD - Adjustment - In-Treatment
-    sources/model/hd/adjustment/treatment/MTreatmentAdjustDurationResponse.cpp
     sources/model/hd/adjustment/treatment/MTreatmentAdjustBloodDialysateResponse.cpp
-    sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationStateResponse.cpp
-    sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationEditResponse.cpp
-    sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationConfirmResponse.cpp
     sources/model/hd/adjustment/treatment/MTreatmentAdjustHeparinResponse.cpp
-    sources/model/hd/adjustment/treatment/MTreatmentAdjustPressuresLimitsResponse.cpp
-    # ---------- Models - HD - Adjustment - End-Treatment
-    sources/model/hd/adjustment/treatment/MTreatmentAdjustRinsebackResponse.cpp
-    sources/model/hd/adjustment/treatment/MTreatmentAdjustRecirculateResponse.cpp
-    sources/model/hd/adjustment/treatment/MTreatmentAdjustEndResponse.cpp
-    # ---------- Models - HD - Adjustment - Post-Treatment
-    sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.cpp
-    sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustDisposablesRemovalConfirmResponse.cpp
-    sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustPatientDisconnectionConfirmResponse.cpp
     # ---------- Models - HD - Adjustment - Disinfection
     sources/model/hd/adjustment/disinfect/MDisinfectAdjustModeResponse.cpp
     sources/model/hd/adjustment/disinfect/MDisinfectAdjustStartResponse.cpp
@@ -525,21 +641,13 @@
     sources/model/hd/data/treatment/MTreatmentHeparinData.cpp
     sources/model/hd/data/treatment/MTreatmentRinsebackData.cpp
     sources/model/hd/data/treatment/MTreatmentRecirculateData.cpp
-    sources/model/hd/data/treatment/MTreatmentBloodPrimeData.cpp
-    sources/model/hd/data/treatment/MTreatmentStopData.cpp
     sources/model/hd/data/post/MHDRTCEpochData.cpp
     sources/model/hd/data/MHDUsageInfoResponse.cpp
     # ---------- Models - HD - Data - Pre-Treatment
     sources/model/hd/data/pretreatment/MPreTreatmentDisposablesPrimeData.cpp
     sources/model/hd/data/pretreatment/MPreTreatmentSelfTestNoCartridgeData.cpp
     sources/model/hd/data/pretreatment/MPreTreatmentSelfTestDryData.cpp
-    # ---------- Models - HD - Data - Treatment Log
-    sources/model/hd/data/treatmentlog/MTreatmentLogAlarmData.cpp
-    sources/model/hd/data/treatmentlog/MTreatmentLogAvrgeData.cpp
-    sources/model/hd/data/treatmentlog/MTreatmentLogEventData.cpp
-    # ---------- Models - DG - Adjustment
     # ---------- Models - DG - Adjustment - Settings
-    sources/model/dg/adjustment/settings/MAdjustDGDateTimeResponse.cpp
     sources/model/dg/adjustment/settings/MAdjustDGCleaningUsageResponse.cpp
     # ---------- Models - DG - Data - Pre-Treatment - Progress
     sources/model/dg/data/pretreatment/MDGFilterFlushData.cpp
@@ -549,7 +657,6 @@
     sources/model/dg/data/MDGGeneralEvent.cpp
     sources/model/dg/data/MDGDrainPumpData.cpp
     sources/model/dg/data/MDGLoadCellReadingsData.cpp
-    sources/model/dg/data/MDGOperationModeData.cpp
     sources/model/dg/data/MDGReservoirData.cpp
     sources/model/dg/data/MDGROPumpData.cpp
     sources/model/dg/data/MDGAccelerometerData.cpp
@@ -571,14 +678,61 @@
     sources/view/VGeneralEvent.cpp
     sources/device/DeviceView.cpp
     # ---------- Views - TD - States Data
+    sources/view/settings/VAdjustmentAdvancedInstitutionalRecord.cpp
+    sources/view/settings/VAdvancedInstitutionalRecord.cpp
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresWidening.cpp
     sources/view/td/data/VTDAirBubbleData.cpp
     sources/view/td/data/VTDAirPumpData.cpp
     sources/view/td/data/VTDAirTrapData.cpp
     sources/view/td/data/VTDBatteryData.cpp
     sources/view/td/data/VTDEjectorData.cpp
     sources/view/td/data/VTDOpModeData.cpp
+    sources/view/td/data/VTDSwitchesData.cpp
+    sources/view/td/data/VTDTemperatureData.cpp
+    sources/view/td/data/VTDValvesData.cpp
+    sources/view/td/data/VTDVoltageData.cpp
+    sources/view/td/data/VTreatmentRanges.cpp
+    sources/view/td/data/VWaterSampleData.cpp
+    # ---------- Views - TD - Data - In-Treatment
+    sources/view/td/data/treatment/VTDTreatmentStatesData.cpp
+    sources/view/td/data/treatment/VTreatmentBloodFlow.cpp
+    sources/view/td/data/treatment/VTreatmentBloodPrimeData.cpp
+    sources/view/td/data/treatment/VTreatmentIsolatedUFData.cpp
+    sources/view/td/data/treatment/VTreatmentParametersSetPointData.cpp
+    sources/view/td/data/treatment/VTreatmentPressureOcclusion.cpp
+    sources/view/td/data/treatment/VTreatmentSalineData.cpp
+    sources/view/td/data/treatment/VTreatmentTime.cpp
+    sources/view/td/data/treatment/VTreatmentTrends.cpp
+    sources/view/td/data/treatment/VTreatmentUltrafiltrationData.cpp
+    sources/view/td/data/treatment/VTreatmentStopData.cpp
     # ---------- Views - TD - Adjustment - In-Treatment
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentBloodFlowRate.cpp
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentBloodPrime.cpp
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentBolusVolume.cpp
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentDialysateFlowRate.cpp
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentDialysateTemperature.cpp
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentDurationConfirm.cpp
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentDurationEdit.cpp
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentFlows.cpp
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFDurationEdit.cpp
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFVolumeEdit.cpp
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFConfirm.cpp
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresLimits.cpp
     sources/view/td/adjustment/treatment/VTreatmentAdjustmentSaline.cpp
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentSetPoints.cpp
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentVitalsAlarmLimits.cpp
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationState.cpp
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationEdit.cpp
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationConfirm.cpp
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentVitals.cpp
+    # ---------- Views - TD - Adjustment - Pre-Treatment
+    sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesConfirm.cpp
+    sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentStartTreatment.cpp
+    sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentWaterSample.cpp
+    # ---------- Views - TD - Adjustment - Post-Treatment
+    sources/view/td/adjustment/posttreatment/VPostTreatmentAdjustDisposablesRemovalConfirm.cpp
+    sources/view/td/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.cpp
+    sources/view/td/adjustment/posttreatment/VPostTreatmentAdjustPatientDisconnectionConfirm.cpp
     # ---------- Views - CONFIRM
     sources/view/confirm/VConfirm.cpp
     # ---------- Views - POST
@@ -600,36 +754,24 @@
     sources/view/settings/VAdjustmentDGCleaningUsage.cpp
     sources/view/settings/VHDUsageInfo.cpp
     sources/view/settings/VAdjustmentInstitutionalRecord.cpp
+    sources/view/settings/VInstitutionalRecord.cpp
     # ---------- Views - HD - Adjustment
     sources/view/VAdjustmentResponseBase.cpp
     # ---------- Views - HD - Adjustment - common
     sources/view/hd/adjustment/common/VCommonAdjustmentVitals.cpp
     # ---------- Views - HD - Adjustment - Pre-Treatment
     sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentInitTreatment.cpp
-    sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentWaterSample.cpp
     sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentConsumablesConfirm.cpp
-    sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesConfirm.cpp
     sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesPrime.cpp
     sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentPatientConnectionBegin.cpp
     sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentUltrafiltrationInit.cpp
     sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentPatientConnectionConfirm.cpp
-    sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentStartTreatment.cpp
     # ---------- Views - HD - Adjustment - In-Treatment
-    sources/view/hd/adjustment/treatment/VTreatmentAdjustmentDuration.cpp
-    sources/view/hd/adjustment/treatment/VTreatmentAdjustmentFlows.cpp
-    sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationState.cpp
-    sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationEdit.cpp
-    sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationConfirm.cpp
     sources/view/hd/adjustment/treatment/VTreatmentAdjustmentHeparin.cpp
-    sources/view/hd/adjustment/treatment/VTreatmentAdjustmentPressuresLimits.cpp
     # ---------- Views - HD - Adjustment - End-Treatment
     sources/view/hd/adjustment/treatment/VTreatmentAdjustmentRinseback.cpp
     sources/view/hd/adjustment/treatment/VTreatmentAdjustmentRecirculate.cpp
     sources/view/hd/adjustment/treatment/VTreatmentAdjustmentEnd.cpp
-    # ---------- Views - HD - Adjustment - Post-Treatment
-    sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustDisposablesRemovalConfirm.cpp
-    sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.cpp
-    sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustPatientDisconnectionConfirm.cpp
     # ---------- Views - HD - Adjustment - Disinfection
     sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp
     # ---------- Views - HD - States Data
@@ -644,22 +786,18 @@
     sources/view/hd/data/pretreatment/VPreTreatmentSelfTestDryData.cpp
     sources/view/hd/data/pretreatment/VPreTreatmentDisposablesPrimeData.cpp
     # ---------- Views - HD - Data - In-Treatment
-    sources/view/hd/data/VTreatmentRanges.cpp
     sources/view/hd/data/treatment/VTreatmentDialysateFlow.cpp
     sources/view/hd/data/treatment/VTreatmentHeparinData.cpp
     # ---------- Views - HD - Data - End-Treatment
-    sources/view/hd/data/treatment/VTreatmentBloodPrimeData.cpp
     sources/view/hd/data/treatment/VTreatmentRinsebackData.cpp
     sources/view/hd/data/treatment/VTreatmentRecirculateData.cpp
-    sources/view/hd/data/treatment/VTreatmentStopData.cpp
     # ---------- Views - DG - Data - Pre-Treatment - Progress
     sources/view/dg/data/pretreatment/VDGFilterFlushData.cpp
     # ---------- Views - DG - Data - Disinfect - Progress
     # ---------- Views - DG - States
     # ---------- Views - DG - Data
     sources/view/dg/data/VDGDrainPumpData.cpp
     sources/view/dg/data/VDGLoadCellReadingsData.cpp
-    sources/view/dg/data/VDGOperationModeData.cpp
     sources/view/dg/data/VDGROPumpData.cpp
     sources/view/dg/data/VDGReservoirData.cpp
     sources/view/dg/data/VDGAccelerometerData.cpp
@@ -673,18 +811,6 @@
     sources/utility/types.cpp
     sources/utility/encryption.cpp
     sources/utility/qrcodegen.cpp
-    sources/view/td/data/VTDSwitchesData.cpp
-    sources/view/td/data/VTDTemperatureData.cpp
-    sources/view/td/data/VTDValvesData.cpp
-    sources/view/td/data/VTDVoltageData.cpp
-    sources/view/td/data/treatment/VTDTreatmentStatesData.cpp
-    sources/view/td/data/treatment/VTreatmentBloodFlow.cpp
-    sources/view/td/data/treatment/VTreatmentParametersSetPointData.cpp
-    sources/view/td/data/treatment/VTreatmentPressureOcclusion.cpp
-    sources/view/td/data/treatment/VTreatmentSalineData.cpp
-    sources/view/td/data/treatment/VTreatmentTime.cpp
-    sources/view/td/data/treatment/VTreatmentUltrafiltrationData.cpp
-    main.cpp
 )
 
 set(QRCS
@@ -739,13 +865,13 @@
 
 qt_add_resources(RCCS ${QRCS})
 
-add_executable(${PROJECT_NAME} ${INCLUDES} ${SRCS} ${RCCS})
+add_executable(${PROJECT_NAME} ${HEADERS} ${SRCS} ${RCCS})
 
 if(BUILD_GENERATE_ALARM_MAPPING)
     add_dependencies(${PROJECT_NAME} ${PROJECT_NAME}-common)
 endif()
 
-target_sources(${PROJECT_NAME} PRIVATE ${INCLUDES} ${SRCS})
+target_sources(${PROJECT_NAME} PRIVATE ${HEADERS} ${SRCS})
 
 target_compile_definitions(
     ${PROJECT_NAME}
@@ -774,23 +900,34 @@
     sources/model/td
     sources/model/td/data
     sources/model/td/data/treatment
+    sources/model/td/data/treatmentlog
     sources/model/td/alarm
     sources/model/td/adjustment
     sources/model/td/adjustment/settings
     sources/model/td/adjustment/treatment
-    sources/model/dd
-    sources/model/dd/data
+    sources/model/td/adjustment/pretreatment
+    sources/model/td/adjustment/posttreatment
+    sources/model/dd   
+    sources/model/dd/data  
     sources/model/dd/adjustment
     sources/model/dd/adjustment/settings
+    sources/model/fp   
+    sources/model/fp/data  
+    sources/model/fp/adjustment
+    sources/model/fp/adjustment/settings
     sources/view
     sources/view/td
     sources/view/td/data
     sources/view/td/data/treatment
     sources/view/td/adjustment/treatment
+    sources/view/td/adjustment/pretreatment
+    sources/view/td/adjustment/posttreatment
     sources/view/dd
     sources/view/dd/data
     sources/view/confirm
     sources/view/settings
+    sources/view/fp
+    sources/view/fp/data
     #
     sources/gui
     sources/utility
@@ -806,14 +943,12 @@
     sources/model/hd/adjustment/settings
     sources/model/hd/adjustment/pretreatment
     sources/model/hd/adjustment/treatment
-    sources/model/hd/adjustment/posttreatment
     sources/model/hd/alarm
     sources/model/hd/data
     sources/model/hd/data/post
     sources/model/hd/data/pretreatment
     sources/model/hd/data/treatment
     sources/model/hd/data/posttreatment
-    sources/model/hd/data/treatmentlog
     sources/model/dg/data
     sources/model/dg/data/post
     sources/model/dg/data/pretreatment
@@ -826,7 +961,6 @@
     sources/view/hd/adjustment
     sources/view/hd/adjustment/pretreatment
     sources/view/hd/adjustment/treatment
-    sources/view/hd/adjustment/posttreatment
     sources/view/hd/adjustment/disinfect
     sources/view/hd/alarm
     sources/view/hd/data
Index: qml.qrc
===================================================================
diff -u -re21748fb21b8c964e51bb2f4be7faf699d30a057 -rd2c46e9c9202beb56ef21ffb46bb6bd286cbea3a
--- qml.qrc	(.../qml.qrc)	(revision e21748fb21b8c964e51bb2f4be7faf699d30a057)
+++ qml.qrc	(.../qml.qrc)	(revision d2c46e9c9202beb56ef21ffb46bb6bd286cbea3a)
@@ -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,78 +27,45 @@
         <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>
         <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="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="PatientIdEntry.qml">sources/gui/qml/dialogs/PatientIdEntry.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>
         <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>
-        <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>
-        <file alias="iClock-">resources/images/Clock-Minus.png</file>
-        <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="iCheck">resources/images/check.png</file>
-        <file alias="iChevronDown">resources/images/chevron-down.png</file>
-        <file alias="iChevronUp">resources/images/chevron-up.png</file>
-        <file alias="iList">resources/images/list.png</file>
-        <file alias="iRedCrossWCircle">resources/images/End.png</file>
-        <file alias="iAccelerate">resources/images/Accelerate.png</file>
-        <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="iBusyFail">resources/images/BusyFail.png</file>
-        <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>
-        <file alias="iEdit">resources/images/edit.png</file>
-        <file alias="iEditDisabled">resources/images/edit-disabled.png</file>
-        <file alias="iLock">resources/images/Lock.png</file>
-        <file alias="iPrescription">resources/images/Prescription.png</file>
-        <file alias="iSettings">resources/images/Settings.png</file>
-        <file alias="iUnlock">resources/images/Unlock.png</file>
-        <file alias="iWifi">resources/images/Wifi.png</file>
-        <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>
+    <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="/components">
         <file alias="MainMenu.qml">sources/gui/qml/components/MainMenu.qml</file>
@@ -127,11 +94,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="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>
@@ -141,8 +103,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="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>
@@ -152,10 +112,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>
@@ -164,6 +124,18 @@
         <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>
+        <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>
@@ -172,6 +144,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>
@@ -228,68 +213,74 @@
     <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="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="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>
     </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>