Index: sources/gui/qml/pages/disinfect/DisinfectStack.qml
===================================================================
diff -u -r4afc91856c00e01dfb5d84bc54d2d92faefec0db -r2c3846821eda0903c34bb5fcf2aebcbde2d0343a
--- sources/gui/qml/pages/disinfect/DisinfectStack.qml	(.../DisinfectStack.qml)	(revision 4afc91856c00e01dfb5d84bc54d2d92faefec0db)
+++ sources/gui/qml/pages/disinfect/DisinfectStack.qml	(.../DisinfectStack.qml)	(revision 2c3846821eda0903c34bb5fcf2aebcbde2d0343a)
@@ -32,11 +32,12 @@
     signal disinfectionSkip             ()
     signal disinfectionHeatClicked      ()
     signal disinfectionChemicalClicked  ()
-    signal disinfectionChemicalTest     ()
+    signal disinfectionChemicalConfirm  ()
 
     DisinfectBase { id: _disinfection
         objectName: "_disinfection"
-        property int stackStepIndex : 3
+        property int stackStepIndex : 0
+        header.stepNames: [ qsTr("Disinfection") ]
         header.confirmVisible   : true
         header.confirmText.text : qsTr("SKIP")
         title.text              : qsTr("Disinfection")
@@ -56,30 +57,34 @@
 
     DisinfectBase { id: _disinfectionHeat
         objectName: "_disinfectionHeat"
-        property int stackStepIndex : 3
+        property int stackStepIndex : 1
+        header.stepNames: [ qsTr("Disinfection") , qsTr("Heat Disinfect")]
         title.text              : qsTr("Heat Disinfection")
         hasTimeCircle           : true
     }
 
     DisinfectBase { id: _disinfectionChemicalInstruction
         objectName: "_disinfectionChemicalInstruction"
-        property int stackStepIndex : 3
+        property int stackStepIndex : 1
+        header.stepNames: [ qsTr("Disinfection") , qsTr("Chemical Disinfect")]
         header.confirmVisible   : true
         title.text              : qsTr("Chemical Disinfection")
         instructionBased        : true
-        onConfirmClicked        : _root.disinfectionChemicalTest()
+        onConfirmClicked        : _root.disinfectionChemicalConfirm()
     }
 
     DisinfectBase { id: _disinfectionChemicalProgress
         objectName: "_disinfectionChemicalProgress"
-        property int stackStepIndex : 3
+        property int stackStepIndex : 1
+        header.stepNames: [ qsTr("Disinfection") , qsTr("Chemical Disinfect")]
         title.text              : qsTr("Chemical Disinfection")
         hasTimeCircle           : true
     }
 
     DisinfectBase { id: _flush
         objectName: "_flush"
-        property int stackStepIndex : 3
+        property int stackStepIndex : 1
+        header.stepNames: [ qsTr("Disinfection") , qsTr("Flush")]
         title.text              : qsTr("Flush")
         hasTimeCircle           : true
     }
@@ -91,17 +96,17 @@
     }
 
     Connections { target: vHDOperationMode
-        onStandbyWaitDisinfectChanged       : { console.debug("A"); page( _disinfection                 , vstandbyWaitDisinfect         )} // initialItem
+        onStandbyWaitDisinfectChanged       : { page( _disinfection                 , vstandbyWaitDisinfect         )} // initialItem
         onStandbyDGFlushChanged             : { page( _flush                        , vstandbyDGFlush               )}
         onStandbyDGDisinfectHeatChanged     : { page( _disinfectionHeat             , vstandbyDGDisinfectHeat       )}
         onStandbyDGDisinfectChemicalChanged : { page( _disinfectionChemicalProgress , vstandbyDGDisinfectChemical   )}
     }
 
-    onDisinfectionHeatClicked               : { /* shall send a command and wait for the state change */             }
-    onDisinfectionChemicalClicked           : { /* shall send a command and wait for the state change */
-    /* TODO-TEST: Needs an accepted response */ page( _disinfectionChemicalInstruction                              )}
-    onDisinfectionChemicalTest              : { /* shall send a command and wait for the state change */             }
-    onDisinfectionSkip                      : { /* shall send a command and wait for the state change */             }
+    onDisinfectionSkip                      : { vDisinfectAdjustDisinfect.doFlush                   (               )}
+    onDisinfectionHeatClicked               : { vDisinfectAdjustDisinfect.doDisinfectHeat           (               )}
+    onDisinfectionChemicalClicked           : { vDisinfectAdjustDisinfect.doDisinfectChemical       (               )
+                                                page( _disinfectionChemicalInstruction                              )}
+    onDisinfectionChemicalConfirm           : { vDisinfectAdjustDisinfect.doDisinfectChemicalConfirm(               )}
 
     onVisibleChanged: {
         if (visible) {