Index: sources/gui/qml/pages/disinfect/DisinfectStack.qml
===================================================================
diff -u -r2c3846821eda0903c34bb5fcf2aebcbde2d0343a -rc71946746586d5a4061ad866ce7dbbaf74b9798a
--- sources/gui/qml/pages/disinfect/DisinfectStack.qml	(.../DisinfectStack.qml)	(revision 2c3846821eda0903c34bb5fcf2aebcbde2d0343a)
+++ sources/gui/qml/pages/disinfect/DisinfectStack.qml	(.../DisinfectStack.qml)	(revision c71946746586d5a4061ad866ce7dbbaf74b9798a)
@@ -29,64 +29,98 @@
 
     stackView.initialItem   : null
 
-    signal disinfectionSkip             ()
-    signal disinfectionHeatClicked      ()
-    signal disinfectionChemicalClicked  ()
-    signal disinfectionChemicalConfirm  ()
+    signal disinfectSkip             ()
+    signal disinfectHeatClicked      ()
+    signal disinfectChemicalClicked  ()
+    signal disinfectChemicalConfirm  ()
 
-    DisinfectBase { id: _disinfection
-        objectName: "_disinfection"
+    readonly property string disinfectTitle : qsTr("Disinfection")
+    readonly property string flushTitle     : qsTr("Flush")
+    readonly property string heatTitle      : qsTr("Heat Disinfect")
+    readonly property string chemicalTitle  : qsTr("Chemical Disinfect")
+
+    DisinfectBase { id          :  _disinfect
+        objectName              : "_disinfect"
         property int stackStepIndex : 0
-        header.stepNames: [ qsTr("Disinfection") ]
+        header.stepNames        : [ _root.disinfectTitle ]
         header.confirmVisible   : true
         header.confirmText.text : qsTr("SKIP")
-        title.text              : qsTr("Disinfection")
+        title.text              : _root.disinfectTitle
         footer.childrenWidth    : 350
         footer.children: [
             TouchRect {
-                text.text: qsTr("Heat Disinfection")
-                onClicked: _root.disinfectionHeatClicked()
+                text.text: _root.heatTitle
+                onClicked: _root.disinfectHeatClicked()
             },
             TouchRect {
-                text.text: qsTr("Chemical Disinfection")
-                onClicked: _root.disinfectionChemicalClicked()
+                text.text: _root.chemicalTitle
+                onClicked: _root.disinfectChemicalClicked()
             }
         ]
-        onConfirmClicked        : _root.disinfectionSkip()
+        onConfirmClicked        : _root.disinfectSkip()
+        instructionBased        : true
     }
 
-    DisinfectBase { id: _disinfectionHeat
-        objectName: "_disinfectionHeat"
+    DisinfectBase { id          :  _disinfectHeat
+        objectName              : "_disinfectHeat"
         property int stackStepIndex : 1
-        header.stepNames: [ qsTr("Disinfection") , qsTr("Heat Disinfect")]
-        title.text              : qsTr("Heat Disinfection")
+        header.stepNames        : [ _root.disinfectTitle ,  _root.heatTitle ]
+        title.text              :                           _root.heatTitle
         hasTimeCircle           : true
+        timeCircleMinimum       : 0
+        timeCircleMaximum       : vDisinfectDGData.heatTimeTotal
+        timeCircleProgressValue : vDisinfectDGData.heatTimeElapsed
+        timeCircleTimeTextValue : vDisinfectDGData.heatTimeRemaining * 60
+
+        hasCheckList            : true
+        checkListStepNames      : [
+            qsTr("Running Pre-Disinfect Flush" ),
+            qsTr("Heating Up the Fluid"        ),
+            qsTr("Running Heat Disinfect"      ),
+            qsTr("Cooling Down"                ),
+            qsTr("Running Post-Disinfect Flush"),
+        ]
     }
 
-    DisinfectBase { id: _disinfectionChemicalInstruction
-        objectName: "_disinfectionChemicalInstruction"
+    DisinfectBase { id          :  _disinfectChemicalInstruction
+        objectName              : "_disinfectChemicalInstruction"
         property int stackStepIndex : 1
-        header.stepNames: [ qsTr("Disinfection") , qsTr("Chemical Disinfect")]
+        header.stepNames        : [ _root.disinfectTitle ,  _root.chemicalTitle ]
+        title.text              :                           _root.chemicalTitle
         header.confirmVisible   : true
-        title.text              : qsTr("Chemical Disinfection")
         instructionBased        : true
-        onConfirmClicked        : _root.disinfectionChemicalConfirm()
+        onConfirmClicked        : _root.disinfectChemicalConfirm()
     }
 
-    DisinfectBase { id: _disinfectionChemicalProgress
-        objectName: "_disinfectionChemicalProgress"
+    DisinfectBase { id          :  _disinfectChemicalProgress
+        objectName              : "_disinfectChemicalProgress"
         property int stackStepIndex : 1
-        header.stepNames: [ qsTr("Disinfection") , qsTr("Chemical Disinfect")]
-        title.text              : qsTr("Chemical Disinfection")
+        header.stepNames        : [ _root.disinfectTitle ,  _root.chemicalTitle ]
+        title.text              :                           _root.chemicalTitle
         hasTimeCircle           : true
+        timeCircleMinimum       : 0
+        timeCircleMaximum       : vDisinfectDGData.chemicalTimeTotal
+        timeCircleProgressValue : vDisinfectDGData.chemicalTimeElapsed
+        timeCircleTimeTextValue : vDisinfectDGData.chemicalTimeRemaining * 60
+
+        hasCheckList            : true
+        checkListStepNames      : [
+            qsTr("Running Pre-Disinfect Flush"  ),
+            qsTr("Running Chemical Disinfect"   ),
+            qsTr("Running Post-Disinfect Flush" ),
+        ]
     }
 
-    DisinfectBase { id: _flush
-        objectName: "_flush"
+    DisinfectBase { id  :  _flush
+        objectName      : "_flush"
         property int stackStepIndex : 1
-        header.stepNames: [ qsTr("Disinfection") , qsTr("Flush")]
-        title.text              : qsTr("Flush")
+        header.stepNames        : [ _root.disinfectTitle ,  _root.flushTitle ]
+        title.text              :                           _root.flushTitle
         hasTimeCircle           : true
+        timeCircleMinimum       : 0
+        timeCircleMaximum       : vDisinfectDGData.flushTimeTotal
+        timeCircleProgressValue : vDisinfectDGData.flushTimeElapsed
+        timeCircleTimeTextValue : vDisinfectDGData.flushTimeRemaining * 60
     }
 
     Connections { target: vPostTreatmentStates
@@ -96,17 +130,17 @@
     }
 
     Connections { target: vHDOperationMode
-        onStandbyWaitDisinfectChanged       : { page( _disinfection                 , vstandbyWaitDisinfect         )} // initialItem
-        onStandbyDGFlushChanged             : { page( _flush                        , vstandbyDGFlush               )}
-        onStandbyDGDisinfectHeatChanged     : { page( _disinfectionHeat             , vstandbyDGDisinfectHeat       )}
-        onStandbyDGDisinfectChemicalChanged : { page( _disinfectionChemicalProgress , vstandbyDGDisinfectChemical   )}
+        onStandbyWaitDisinfectChanged       : { page( _disinfect                 , vstandbyWaitDisinfect         )} // initialItem
+        onStandbyDGFlushChanged             : { page( _flush                     , vstandbyDGFlush               )}
+        onStandbyDGDisinfectHeatChanged     : { page( _disinfectHeat             , vstandbyDGDisinfectHeat       )}
+        onStandbyDGDisinfectChemicalChanged : { page( _disinfectChemicalProgress , vstandbyDGDisinfectChemical   )}
     }
 
-    onDisinfectionSkip                      : { vDisinfectAdjustDisinfect.doFlush                   (               )}
-    onDisinfectionHeatClicked               : { vDisinfectAdjustDisinfect.doDisinfectHeat           (               )}
-    onDisinfectionChemicalClicked           : { vDisinfectAdjustDisinfect.doDisinfectChemical       (               )
-                                                page( _disinfectionChemicalInstruction                              )}
-    onDisinfectionChemicalConfirm           : { vDisinfectAdjustDisinfect.doDisinfectChemicalConfirm(               )}
+    onDisinfectSkip                      : { vDisinfectAdjustDisinfect.doFlush                   (               )}
+    onDisinfectHeatClicked               : { vDisinfectAdjustDisinfect.doDisinfectHeat           (               )}
+    onDisinfectChemicalClicked           : { vDisinfectAdjustDisinfect.doDisinfectChemical       (               )
+                                                page( _disinfectChemicalInstruction                              )}
+    onDisinfectChemicalConfirm           : { vDisinfectAdjustDisinfect.doDisinfectChemicalConfirm(               )}
 
     onVisibleChanged: {
         if (visible) {