Index: sources/view/dg/data/disinfect/VDisinfectStatesData.h
===================================================================
diff -u -re125bd5cf13750eaf241d518b9c846139afaa81c -rf38edd22f7b63694c21b83d6f4b69ea618390126
--- sources/view/dg/data/disinfect/VDisinfectStatesData.h	(.../VDisinfectStatesData.h)	(revision e125bd5cf13750eaf241d518b9c846139afaa81c)
+++ sources/view/dg/data/disinfect/VDisinfectStatesData.h	(.../VDisinfectStatesData.h)	(revision f38edd22f7b63694c21b83d6f4b69ea618390126)
@@ -51,30 +51,24 @@
     PROPERTY( bool   , chemical             , false ) ///< /* No FW enumeration yet */
 
     // Heat disinfection state
-    STATE   ( bool   , start                , false ) ///< DG_HEAT_DISINFECT_STATE_START                       , Heat disinfect, start mode state
-    STATE   ( bool   , drainR1              , false ) ///< DG_HEAT_DISINFECT_STATE_DRAIN_R1                    , Heat disinfect, drain R1 state
-    STATE   ( bool   , drainR2              , false ) ///< DG_HEAT_DISINFECT_STATE_DRAIN_R2                    , Heat disinfect, drain R2 state
-    STATE   ( bool   , flushDrain           , false ) ///< DG_HEAT_DISINFECT_STATE_FLUSH_DRAIN                 , Heat disinfect, flush drain state
-    STATE   ( bool   , flushCirculation     , false ) ///< DG_HEAT_DISINFECT_STATE_FLUSH_CIRCULATION           , Heat disinfect, flush circulation state
-    STATE   ( bool   , flushR1R2            , false ) ///< DG_HEAT_DISINFECT_STATE_FLUSH_R1_AND_R2             , Heat disinfect, flush R1 and R2 state
-    STATE   ( bool   , flushR2DrainR1       , false ) ///< DG_HEAT_DISINFECT_STATE_FLUSH_R2_AND_DRAIN_R1       , Heat disinfect, flush R2 and drain R1 state
-    STATE   ( bool   , flushDrainR2         , false ) ///< DG_HEAT_DISINFECT_STATE_FLUSH_DRAIN_R2              , Heat disinfect, flush drain R2 state
-    STATE   ( bool   , flushDrainR1         , false ) ///< DG_HEAT_DISINFECT_STATE_FLUSH_DRAIN_R1              , Heat disinfect, flush drain R1 state
-    STATE   ( bool   , fillWithWater        , false ) ///< DG_HEAT_DISINFECT_STATE_FILL_WITH_WATER             , Heat disinfect, fill with water state
-    STATE   ( bool   , disinfectR1R2        , false ) ///< DG_HEAT_DISINFECT_STATE_DISINFECT_R1_TO_R2          , Heat disinfect, disinfect R1 to R2 state
-    STATE   ( bool   , fillR2WithHotWater   , false ) ///< DG_HEAT_DISINFECT_STATE_FILL_R2_WITH_HOT_WATER      , Heat disinfect, fill R2 with hot water state
-    STATE   ( bool   , disinfectR2R1        , false ) ///< DG_HEAT_DISINFECT_STATE_DISINFECT_R2_TO_R1          , Heat disinfect, disinfect R2 to R1 state
-    STATE   ( bool   , cooldownHeaters      , false ) ///< DG_HEAT_DISINFECT_STATE_COOL_DOWN_HEATERS           , Heat disinfect, cool down heaters state
-    STATE   ( bool   , cooldownRoFilter     , false ) ///< DG_HEAT_DISINFECT_STATE_COOL_DOWN_RO_FILTER         , Heat disinfect, cool down RO filter state
-    STATE   ( bool   , mixDrainR1           , false ) ///< DG_HEAT_DISINFECT_STATE_MIX_DRAIN_R1                , Heat disinfect, mix drain R1 state
-    STATE   ( bool   , mixDrainR2           , false ) ///< DG_HEAT_DISINFECT_STATE_MIX_DRAIN_R2                , Heat disinfect, mix drain R2 state
-    STATE   ( bool   , rinseR1ToR2          , false ) ///< DG_HEAT_DISINFECT_STATE_RINSE_R1_TO_R2              , Heat disinfect, rinse R1 to R2 state
-    STATE   ( bool   , rinseR2ToR1DrainR1   , false ) ///< DG_HEAT_DISINFECT_STATE_RINSE_R2_TO_R1_AND_DRAIN_R1 , Heat disinfect, rinse R2 to R1 and drain R1 state
-    STATE   ( bool   , rinseCirculation     , false ) ///< DG_HEAT_DISINFECT_STATE_RINSE_CIRCULATION           , Heat disinfect, rinse circulation state
-    STATE   ( bool   , cancelBasicPath      , false ) ///< DG_HEAT_DISINFECT_STATE_CANCEL_BASIC_PATH           , Heat disinfect, cancel mode basic path state
-    STATE   ( bool   , cancelWaterPath      , false ) ///< DG_HEAT_DISINFECT_STATE_CANCEL_WATER_PATH           , Heat disinfect, cancel mode water path state
-    STATE   ( bool   , complete             , false ) ///< DG_HEAT_DISINFECT_STATE_COMPLETE                    , Heat disinfect, complete state
+    STATE   ( bool   , heatNotRunning               , false ) ///< HEAT_DISINFECT_UI_STATE_NOT_RUNNING              , Heat disinfect UI, not running state
+    STATE   ( bool   , heatFlushBeforeDisinfect     , false ) ///< HEAT_DISINFECT_UI_STATE_FLUSH_BEFORE_DISINFECT   , Heat disinfect UI, flush before disinfect state
+    STATE   ( bool   , heatWaterHeatUp              , false ) ///< HEAT_DISINFECT_UI_STATE_HEAT_UP_WATER            , Heat disinfect UI, heat up water state
+    STATE   ( bool   , heatDisinfect                , false ) ///< HEAT_DISINFECT_UI_STATE_DISINFECT_DEVICE         , Heat disinfect UI, disinfect device state
+    STATE   ( bool   , heatDeviceCoolDown           , false ) ///< HEAT_DISINFECT_UI_STATE_COOL_DOWN_DEVICE         , Heat disinfect UI, cool down device state
+    STATE   ( bool   , heatFlushAfterDisinfect      , false ) ///< HEAT_DISINFECT_UI_STATE_FLUSH_AFTER_DISINFECT    , Heat disinfect UI, flush after disinfect state
+    STATE   ( bool   , heatCancel                   , false ) ///< HEAT_DISINFECT_UI_STATE_CANCEL_DISINFECT         , Heat disinfect UI, cancel disinfect state
+    STATE   ( bool   , heatComplete                 , false ) ///< HEAT_DISINFECT_UI_STATE_COMPLETE                 , Heat disinfect UI, complete state
 
+    STATE   ( bool   , chemicalNotRunning           , false ) ///< CHEM_DISINFECT_UI_STATE_NOT_RUNNING              , Chemical disinfect UI, not running state
+    STATE   ( bool   , chemicalFlushBeforeDisinfect , false ) ///< CHEM_DISINFECT_UI_STATE_FLUSH_BEFORE_DISINFECT   , Chemical disinfect UI, flush before disinfect state
+    STATE   ( bool   , chemicalMixWaterAndAcid      , false ) ///< CHEM_DISINFECT_UI_STATE_MIX_WATER_AND_ACID       , Chemical disinfect UI, mix water and acid state
+    STATE   ( bool   , chemicalRemoveAcid           , false ) ///< CHEM_DISINFECT_UI_STATE_REMOVE_ACID              , Chemical disinfect UI, remove acid state
+    STATE   ( bool   , chemicalDisinfect            , false ) ///< CHEM_DISINFECT_UI_STATE_DISINFECT_DEVICE         , Chemical disinfect UI, disinfect device state
+    STATE   ( bool   , chemicalFlushAfterDisinfect  , false ) ///< CHEM_DISINFECT_UI_STATE_FLUSH_AFTER_DISINFECT    , Chemical disinfect UI, flush after disinfect state
+    STATE   ( bool   , chemicalCancel               , false ) ///< CHEM_DISINFECT_UI_STATE_CANCEL_DISINFECT         , Chemical disinfect UI, cancel disinfect state
+    STATE   ( bool   , chemicalComplete             , false ) ///< CHEM_DISINFECT_UI_STATE_COMPLETE                 , Chemical disinfect UI, complete state
+
     VIEW_DEC(VDisinfectStates, DisinfectStatesData)
 };
 }