Index: sources/gui/qml/pages/disinfect/DisinfectStack.qml
===================================================================
diff -u -rf93fd4a2a09a2c6d4db43196b9005f324ae7fa82 -r98b945e7afb8a2c61b86bb11427fcae8c3e7e0bc
--- sources/gui/qml/pages/disinfect/DisinfectStack.qml	(.../DisinfectStack.qml)	(revision f93fd4a2a09a2c6d4db43196b9005f324ae7fa82)
+++ sources/gui/qml/pages/disinfect/DisinfectStack.qml	(.../DisinfectStack.qml)	(revision 98b945e7afb8a2c61b86bb11427fcae8c3e7e0bc)
@@ -83,6 +83,17 @@
         timeCircleMaximum       : vDisinfectDGData.flushTimeTotal
         timeCircleProgressValue : vDisinfectDGData.flushTimeElapsed
         timeCircleTimeTextValue : vDisinfectDGData.flushTimeRemaining * 60
+
+        hasCheckList            : true
+        isComplete              : vDisinfectStates.flushComplete
+        completeText            : qsTr("Water Flush Complete!")
+        checkListStepNames      : [
+            qsTr("Pre-Flush Drain"          ),
+            qsTr("Flush Reservoirs"         ),
+            qsTr("Drain Reservoirs"         ),
+            qsTr("Flush Recirculating Path" ),
+        ]
+
     }
 
     DisinfectBase { id          :  _disinfectHeat
@@ -96,7 +107,7 @@
         timeCircleTimeTextValue : vDisinfectDGData.heatTimeRemaining * 60
 
         hasCheckList            : true
-        isComplete              : vDisinfectStates.complete
+        isComplete              : vDisinfectStates.heatComplete
         completeText            : qsTr("Heat Disinfection Complete!")
         checkListStepNames      : [
             qsTr("Pre-Disinfect Flush"  ),
@@ -127,38 +138,44 @@
         timeCircleTimeTextValue : vDisinfectDGData.chemicalTimeRemaining * 60
 
         hasCheckList            : true
+        isComplete              : vDisinfectStates.chemicalComplete
+        completeText            : qsTr("Chemical Disinfection Complete!")
         checkListStepNames      : [
-            qsTr("Running Pre-Disinfect Flush"  ),
-            qsTr("Running Chemical Disinfect"   ),
-            qsTr("Running Post-Disinfect Flush" ),
+            qsTr("Pre-Disinfect Flush"  ),
+            qsTr("Mix Water And Acid"   ),
+            qsTr("Remove Acid"          ),
+            qsTr("Chemical Disinfect"   ),
+            qsTr("Post-Disinfect Flush" ),
         ]
     }
 
     // ----- Checkmarks
     Connections { target: vDisinfectStates
-        onStartEntered                      : {}
-        onDrainR1Entered                    : { _disinfectHeat .checkList.setItem(0, true                       )}
-        onDrainR2Entered                    : {}
-        onFlushDrainEntered                 : {}
-        onFlushCirculationEntered           : {}
-        onFlushR1R2Entered                  : {}
-        onFlushR2DrainR1Entered             : {}
-        onFlushDrainR2Entered               : {}
-        onFlushDrainR1Entered               : { _disinfectHeat .checkList.setItem(0, vflushDrainR1              )}
-        onFillWithWaterEntered              : { _disinfectHeat .checkList.setItem(1, true                       )}
-        onDisinfectR1R2Entered              : {}
-        onFillR2WithHotWaterEntered         : { _disinfectHeat .checkList.setItem(1, vfillR2WithHotWater        )}
-        onDisinfectR2R1Entered              : { _disinfectHeat .checkList.setItem(2, vdisinfectR2R1             )}
-        onCooldownHeatersEntered            : { _disinfectHeat .checkList.setItem(3, true                       )}
-        onCooldownRoFilterEntered           : { _disinfectHeat .checkList.setItem(3, vcooldownRoFilter          )}
-        onMixDrainR1Entered                 : { _disinfectHeat .checkList.setItem(4, true                       )}
-        onMixDrainR2Entered                 : {}
-        onRinseR1ToR2Entered                : {}
-        onRinseR2ToR1DrainR1Entered         : {}
-        onRinseCirculationEntered           : { _disinfectHeat .checkList.setItem(4, vrinseCirculation          )}
-        onCancelBasicPathEntered            : {}
-        onCancelWaterPathEntered            : {}
-        onCompleteEntered                   : {}
+        onFlushNotRunningEntered                : { }
+        onFlushDrainBeforeFlushEntered          : { _disinfectFlush             .checkList.setItem(0, vflushDrainBeforeFlush        )}
+        onFlushFlushReservoirsEntered           : { _disinfectFlush             .checkList.setItem(1, vflushFlushReservoirs         )}
+        onFlushDrainReservoirsEntered           : { _disinfectFlush             .checkList.setItem(2, vflushDrainReservoirs         )}
+        onFlushRecirculatePathEntered           : { _disinfectFlush             .checkList.setItem(3, vflushRecirculatePath         )}
+        onFlushCancelEntered                    : { }
+        onFlushCompleteEntered                  : { }
+
+        onHeatNotRunningEntered                 : { }
+        onHeatFlushBeforeDisinfectEntered       : { _disinfectHeat              .checkList.setItem(0, vheatFlushBeforeDisinfect     )}
+        onHeatWaterHeatUpEntered                : { _disinfectHeat              .checkList.setItem(1, vheatWaterHeatUp              )}
+        onHeatDisinfectEntered                  : { _disinfectHeat              .checkList.setItem(2, vheatDisinfect                )}
+        onHeatDeviceCoolDownEntered             : { _disinfectHeat              .checkList.setItem(3, vheatDeviceCoolDown           )}
+        onHeatFlushAfterDisinfectEntered        : { _disinfectHeat              .checkList.setItem(4, vheatFlushAfterDisinfect      )}
+        onHeatCancelEntered                     : { }
+        onHeatCompleteEntered                   : { }
+
+        onChemicalNotRunningEntered             : { }
+        onChemicalFlushBeforeDisinfectEntered   : { _disinfectChemicalProgress .checkList.setItem(0, vchemicalFlushBeforeDisinfect  )}
+        onChemicalMixWaterAndAcidEntered        : { _disinfectChemicalProgress .checkList.setItem(1, vchemicalMixWaterAndAcid       )}
+        onChemicalRemoveAcidEntered             : { _disinfectChemicalProgress .checkList.setItem(2, vchemicalRemoveAcid            )}
+        onChemicalDisinfectEntered              : { _disinfectChemicalProgress .checkList.setItem(3, vchemicalDisinfect             )}
+        onChemicalFlushAfterDisinfectEntered    : { _disinfectChemicalProgress .checkList.setItem(4, vchemicalFlushAfterDisinfect   )}
+        onChemicalCancelEntered                 : { }
+        onChemicalCompleteEntered               : { }
     }
     // ----- Commands
     onDisinfectSkip                         : { vDisinfectAdjustDisinfect      .doFlush            (            )}