Index: sources/gui/qml/pages/MainStack.qml
===================================================================
diff -u -r98581b325c24eb5ef0ce0ce475ad15320d659140 -r4afc91856c00e01dfb5d84bc54d2d92faefec0db
--- sources/gui/qml/pages/MainStack.qml	(.../MainStack.qml)	(revision 98581b325c24eb5ef0ce0ce475ad15320d659140)
+++ sources/gui/qml/pages/MainStack.qml	(.../MainStack.qml)	(revision 4afc91856c00e01dfb5d84bc54d2d92faefec0db)
@@ -20,6 +20,7 @@
 //  Qml imports
 import "qrc:/globals"
 import "qrc:/components"
+import "qrc:/pages/disinfect"
 import "qrc:/pages/pretreatment"
 import "qrc:/pages/pretreatment/create"
 import "qrc:/pages/treatment"
@@ -36,6 +37,8 @@
     stackView.initialItem   : _mainHome
 
 
+    // Standby / Disinfection
+    DisinfectStack                  { id: _disinfectStack                   }
     // Pre Treatment
     PreTreatmentCreateStack         { id: _preTreatmentCreateStack          }
     PreTreatmentMainStack           { id: _preTreatmentMainStack            }
@@ -70,21 +73,26 @@
         onVisibleChanged: if (visible) _mainMenu.hidden = true
     }
 
-    MainHome                        { id: _mainHome
-        onStartTreatment            : { page( _treatmentStack                                               )}
-        onCreateTreatment           : { vPreTreatmentAdjustmentInitTreatment.doInitiate()                    }
+    MainHome                            { id: _mainHome
+        onStartTreatment                : { page( _treatmentStack                                               )}
+        onCreateTreatment               : { vPreTreatmentAdjustmentInitTreatment.doInitiate()                    }
     }
 
     Connections { target: vHDOperationMode
-        onFaultChanged              : { page( _faultModeScreen                  , vfault                    )}
-        onServiceChanged            : { page( _serviceModeScreen                , vservice                  )}
-        onInitChanged               : { page( _initialModeScreen                , vinit                     )}
-        onStandbyChanged            : { page( _mainHome                         , vstandby                  )}
-        onValidateParametersChanged : { page( _preTreatmentCreateStack          , vvalidateParameters       )}
-        onPreTreatmentChanged       : { page( _preTreatmentMainStack            , vpreTreatment             )}
-        onInTreatmentChanged        : { page( _treatmentStack                   , vinTreatment              )}
-        onPostTreatmentChanged      : { page( _postTreatmentStack               , vpostTreatment            )}
-        onInvalidModeChanged        : { page( null                              , vinvalidMode              )}
+        onFaultChanged                  : { page( _faultModeScreen                  , vfault                    )}
+        onServiceChanged                : { page( _serviceModeScreen                , vservice                  )}
+        onInitChanged                   : { page( _initialModeScreen                , vinit                     )}
+
+        onStandbyChanged                : { /* It depends on the subModes of the standBy. Nothing to be done */  }
+        onStandbyStartChanged           : { page( _mainHome                         , vstandbyStart             )}
+        onStandbyWaitTreatmentChanged   : { page( _mainHome                         , vstandbyWaitTreatment     )}
+        onStandbyWaitDisinfectChanged   : { page( _disinfectStack                   , vstandbyWaitDisinfect     )}
+
+        onValidateParametersChanged     : { page( _preTreatmentCreateStack          , vvalidateParameters       )}
+        onPreTreatmentChanged           : { page( _preTreatmentMainStack            , vpreTreatment             )}
+        onInTreatmentChanged            : { page( _treatmentStack                   , vinTreatment              )}
+        onPostTreatmentChanged          : { page( _postTreatmentStack               , vpostTreatment            )}
+        onInvalidModeChanged            : { page( null                              , vinvalidMode              )}
     }
 
     // the page function is more flixible regarding our current design