Index: sources/gui/qml/pages/disinfect/DisinfectStack.qml
===================================================================
diff -u -rc71946746586d5a4061ad866ce7dbbaf74b9798a -re125bd5cf13750eaf241d518b9c846139afaa81c
--- sources/gui/qml/pages/disinfect/DisinfectStack.qml	(.../DisinfectStack.qml)	(revision c71946746586d5a4061ad866ce7dbbaf74b9798a)
+++ sources/gui/qml/pages/disinfect/DisinfectStack.qml	(.../DisinfectStack.qml)	(revision e125bd5cf13750eaf241d518b9c846139afaa81c)
@@ -73,12 +73,14 @@
         timeCircleTimeTextValue : vDisinfectDGData.heatTimeRemaining * 60
 
         hasCheckList            : true
+        isComplete              : vDisinfectStates.complete
+        completeText            : qsTr("Heat Disinfection Complete!")
         checkListStepNames      : [
-            qsTr("Running Pre-Disinfect Flush" ),
-            qsTr("Heating Up the Fluid"        ),
-            qsTr("Running Heat Disinfect"      ),
-            qsTr("Cooling Down"                ),
-            qsTr("Running Post-Disinfect Flush"),
+            qsTr("Pre-Disinfect Flush"  ),
+            qsTr("Heating Up the Fluid" ),
+            qsTr("Heat Disinfect"       ),
+            qsTr("Cooling Down"         ),
+            qsTr("Post-Disinfect Flush" ),
         ]
     }
 
@@ -123,25 +125,75 @@
         timeCircleTimeTextValue : vDisinfectDGData.flushTimeRemaining * 60
     }
 
+    // ----- 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                   : {}
+    }
+    // ----- Commands
+    onDisinfectSkip                         : { vDisinfectAdjustDisinfect      .doFlush            (            )}
+    onDisinfectHeatClicked                  : { vDisinfectAdjustDisinfect      .doDisinfectHeat    (            )}
+    onDisinfectChemicalClicked              : { vDisinfectAdjustDisinfect      .doDisinfectChemical(            )}
+    onDisinfectChemicalConfirm              : { vDisinfectAdjustChemicalConfirm.doConfirm          (            )}
+
+    // ------ Navigations
     Connections { target: vPostTreatmentStates
-        onPatientDisconnectionChanged       : { console.debug("patientDisconnection", vpatientDisconnection         )}
-        onDrainReservoirsChanged            : { console.debug("drainReservoirs     ", vdrainReservoirs              )}
-        onVerifyChanged                     : { console.debug("verify              ", vverify                       )}
+        onPatientDisconnectionChanged       : { console.debug("patientDisconnection", vpatientDisconnection     )}
+        onDrainReservoirsChanged            : { console.debug("drainReservoirs     ", vdrainReservoirs          )}
+        onVerifyChanged                     : { console.debug("verify              ", vverify                   )}
     }
 
     Connections { target: vHDOperationMode
-        onStandbyWaitDisinfectChanged       : { page( _disinfect                 , vstandbyWaitDisinfect         )} // initialItem
-        onStandbyDGFlushChanged             : { page( _flush                     , vstandbyDGFlush               )}
-        onStandbyDGDisinfectHeatChanged     : { page( _disinfectHeat             , vstandbyDGDisinfectHeat       )}
-        onStandbyDGDisinfectChemicalChanged : { page( _disinfectChemicalProgress , vstandbyDGDisinfectChemical   )}
+        onStandbyWaitDisinfectChanged       : { page( _disinfect                 , vstandbyWaitDisinfect        )} // initialItem
+        onStandbyDGFlushChanged             : { page( _flush                     , vstandbyDGFlush              )}
+        onStandbyDGDisinfectHeatChanged     : { page( _disinfectHeat             , vstandbyDGDisinfectHeat      )}
+        onStandbyDGDisinfectChemicalChanged : { page( _disinfectChemicalProgress , vstandbyDGDisinfectChemical  )}
     }
 
-    onDisinfectSkip                      : { vDisinfectAdjustDisinfect.doFlush                   (               )}
-    onDisinfectHeatClicked               : { vDisinfectAdjustDisinfect.doDisinfectHeat           (               )}
-    onDisinfectChemicalClicked           : { vDisinfectAdjustDisinfect.doDisinfectChemical       (               )
-                                                page( _disinfectChemicalInstruction                              )}
-    onDisinfectChemicalConfirm           : { vDisinfectAdjustDisinfect.doDisinfectChemicalConfirm(               )}
+    // ----- Responses
+    Connections { target:  vDisinfectAdjustDisinfect
+        onAdjustmentTriggered   : {
+            if ( vDisinfectAdjustDisinfect.adjustment_Accepted ) {
+                _disinfect.reasonText = ""
+                if ( vDisinfectAdjustDisinfect.chemical )
+                    page( _disinfectChemicalInstruction )
+            } else {
+                _disinfect.reasonText = vDisinfectAdjustDisinfect.text()
+            }
+        }
+    }
 
+    Connections { target: vDisinfectAdjustChemicalConfirm
+        onAdjustmentTriggered   : {
+            if ( vDisinfectAdjustChemicalConfirm.adjustment_Accepted ) {
+                _disinfectChemicalInstruction.reasonText = ""
+            } else {
+                _disinfectChemicalInstruction.reasonText = vDisinfectAdjustChemicalConfirm.text()
+            }
+        }
+    }
+
     onVisibleChanged: {
         if (visible) {
             _mainMenu.hidden = true