Index: sources/gui/qml/main.qml
===================================================================
diff -u -r07121b02499a4c929c5b5e8bd804a67539574c1b -rc70815ad2b3beadf61832f2e4d12eb90d476e020
--- sources/gui/qml/main.qml	(.../main.qml)	(revision 07121b02499a4c929c5b5e8bd804a67539574c1b)
+++ sources/gui/qml/main.qml	(.../main.qml)	(revision c70815ad2b3beadf61832f2e4d12eb90d476e020)
@@ -35,7 +35,8 @@
 import VTDSwitches                                          0.1
 import VTDEjector                                           0.1
 import VTDTemperature                                       0.1
-import VListModel                                           0.1
+import VHeaderbarModel                                      0.1
+import VWaterSampleModel                                    0.1
 
 // POST
 import VHDPOSTData                                          0.1
@@ -65,6 +66,7 @@
 import VPreTreatmentStates                                  0.1
 import VTDTreatmentStates                                   0.1
 import VPostTreatmentStates                                 0.1
+import VWaterSample                                         0.1
 
 // Treatment - Common
 import VTreatmentVitals                                     0.1
@@ -103,7 +105,7 @@
 import VDGDrainPump                                         0.1
 import VDDHeaters                                           0.1
 import VDGLoadCellReadings                                  0.1
-import VDGOperationMode                                     0.1
+import VDDOperationMode                                     0.1
 import VDDPressures                                         0.1
 import VDGROPump                                            0.1
 import VDGReservoir                                         0.1
@@ -125,6 +127,7 @@
 import VFPConductivity                                      0.1
 import VFPTemperature                                       0.1
 import VFPBoostPump                                         0.1
+import VFPRORejectionPercentage                             0.1
 // In-Treatment - Adjustemnt
 import VTreatmentAdjustmentBloodPrime                       0.1
 import VTreatmentAdjustmentBolusVolume                      0.1
@@ -238,7 +241,9 @@
     VTDSwitches                                         { id: vTDSwitches                                           }
     VTDEjector                                          { id: vTDEjector                                            }
     VTDTemperature                                      { id: vTDTemperature                                        }
-    VListModel                                          { id: vListModel                                            }
+    VHeaderbarModel                                     { id: vHeaderbarModel                                       }
+    VWaterSampleModel                                   { id: vWaterSampleModel                                     }
+    VWaterSample                                        { id: vWaterSample                                          }
 
     VTreatmentDialysateFlow                             { id: vTreatmentDialysateFlow                               }
     VTreatmentIsolatedUF                                { id: vTreatmentIsolatedUF                                  }
@@ -257,7 +262,7 @@
     VDGDrainPump                                        { id: vDGDrainPump                                          }
     VDDHeaters                                          { id: vDDHeaters                                            }
     VDGLoadCellReadings                                 { id: vDGLoadCellReadings                                   }
-    VDGOperationMode                                    { id: vDGOperationMode                                      }
+    VDDOperationMode                                    { id: vDDOperationMode                                      }
     VDDPressures                                        { id: vDDPressures                                          }
     VDGROPump                                           { id: vDGROPump                                             }
     VDGReservoir                                        { id: vDGReservoir                                          }
@@ -278,6 +283,7 @@
     VFPConductivity                                     { id: vFPConductivity                                       }
     VFPTemperature                                      { id: vFPTemperature                                        }
     VFPBoostPump                                        { id: vFPBoostPump                                          }
+    VFPRORejectionPercentage                            { id: vFPRORejectionPercentage                              }
     // --- Pre-Treatment Progress Data
     VPreTreatmentAdjustmentInitTreatment                { id: vPreTreatmentAdjustmentInitTreatment                  }
     VDGFilterFlush                                      { id: vDGFilterFlush                                        }
@@ -332,6 +338,21 @@
     VDisinfectAdjustDisinfect                           { id: vDisinfectAdjustDisinfect                             }
     VAdjustDGCleaningUsage                              { id: vAdjustDGCleaningUsage                                }
 
+    QtObject { id: _colorMode
+        readonly property color modeBackgroundColor             : vSettings.darkMode ? Colors.panelBackground           : Colors.offWhite
+        readonly property color modeBackgroundDialogColor       : vSettings.darkMode ? Colors.darkModeBackground        : Colors.offWhite
+        readonly property color modeSelctedColor                : vSettings.darkMode ? Colors.darkModeSelect            : Colors.lightModeSelect
+        readonly property color modeAutoStepColor               : vSettings.darkMode ? Colors.statusTextPaused          : Colors.lightModeAutoStep
+        readonly property color modeAutoStepProgressColor       : vSettings.darkMode ? Colors.borderButton              : Colors.statusTextPaused
+        readonly property color modeTextColor                   : vSettings.darkMode ? Colors.offWhite                  : Colors.backgroundMainMenu
+        readonly property color modeButtonColor                 : vSettings.darkMode ? Colors.borderButton              : Colors.backgroundMainMenu
+        readonly property color modeAlarmButtonColor            : vSettings.darkMode ? Colors.darkModeBackground        : Colors.lightModeSelect
+        readonly property color modeAlarmStepButtonColor        : vSettings.darkMode ? Colors.darkModeBackground        : Colors.offWhite
+        readonly property color modeAlarmButtonPressedColor     : vSettings.darkMode ? Colors.offWhite                  : Colors.lightModeSelect
+        readonly property color modeAlarmListColor              : vSettings.darkMode ? Colors.offWhite                  : Colors.alarmDialogText
+        readonly property color modeAlarmStopStateColor         : vSettings.darkMode ? Colors.darkModeAlarmStopState    : Colors.lightModeAlarmStopState
+    }
+
     Background {}
 
     // ----- Follow the below Z order -----