Index: sources/gui/qml/pages/settings/SettingsStack.qml
===================================================================
diff -u -r69b3aa965cd8187c66114a9753c162cc526d9678 -r5e1966a8b22d556e9c0c08533f84c6894127b248
--- sources/gui/qml/pages/settings/SettingsStack.qml	(.../SettingsStack.qml)	(revision 69b3aa965cd8187c66114a9753c162cc526d9678)
+++ sources/gui/qml/pages/settings/SettingsStack.qml	(.../SettingsStack.qml)	(revision 5e1966a8b22d556e9c0c08533f84c6894127b248)
@@ -45,64 +45,68 @@
         VolumeBrightness    ,
         WiFi                ,
         Bluetooth           ,
-        DGSettings          ,
-        Services            ,
-        SetDateTime         ,
         ExportLogs          ,
-        RoInput             ,
+        SetDateTime         ,
         Language            ,
+        Services            ,
+        DGCleaning          ,
+        DGScheduling        ,
+        RoInput             ,
         Calibration         ,
         DeviceRegistration  ,
         SWUpdate            ,
         FactoryReset
     }
     property var itemsText  : [
-        qsTr("Information"                  ), // Information
-        qsTr("Volume And Brightness"        ), // VolumeBrightness
-        qsTr("Wi-Fi"                        ), // WiFi
-        qsTr("Bluetooth Cuff"               ), // Bluetooth
-        qsTr("DG Cleaning"                  ), // DGSettings
-        qsTr("Service"                      ), // Service
-        qsTr("Set Date And Time"            ), // SetDateTime
-        qsTr("Export Logs"                  ), // ExportLogs
-        qsTr("Water Input Mode"             ), // RoInput
-        qsTr("Set Language"                 ), // Language
-        qsTr("Calibration "                 ), // Calibration
-        qsTr("Device Registration"          ), // DeviceRegistration
-        qsTr("Software Update"              ), // SWUpdate
-        qsTr("Factory Reset"                ), // FactoryReset
+        qsTr("Information"                 ), // Information
+        qsTr("Volume And Brightness"       ), // VolumeBrightness
+        qsTr("Wi-Fi"                       ), // WiFi
+        qsTr("Bluetooth Cuff"              ), // Bluetooth
+        qsTr("Export Logs"                 ), // ExportLogs
+        qsTr("Set Date And Time"           ), // SetDateTime
+        qsTr("Set Language"                ), // Language
+        qsTr("Service"                     ), // Service
+        qsTr("DG Cleaning"                 ), // DGCleaning
+        qsTr("DG Scheduling"               ), // DGScheduling
+        qsTr("Water Input Mode"            ), // RoInput
+        qsTr("Calibration "                ), // Calibration
+        qsTr("Device Registration"         ), // DeviceRegistration
+        qsTr("Software Update"             ), // SWUpdate
+        qsTr("Factory Reset"               ), // FactoryReset
     ]
     property var itemsEnabled  : [
-        true                                 , // Information
-        true                                 , // VolumeBrightness
-        true                                 , // WiFi
-        true                                 , // Bluetooth
-        true                                 , // DGSettings
-        true                                 , // Services
-        true                                 , // SetDateTime
-        true                                 , // ExportLogs
-        true                                 , // RoInput
-        false                                , // Language
-        false                                , // Calibration
-        true                                 , // DeviceRegistration
-        false                                , // SWUpdate
-        false                                , // FactoryReset
+        true                                , // Information
+        true                                , // VolumeBrightness
+        true                                , // WiFi
+        true                                , // Bluetooth
+        true                                , // ExportLogs
+        true                                , // SetDateTime
+        false                               , // Language
+        true                                , // Service
+        true                                , // DGCleaning
+        true                                , // DGScheduling
+        true                                , // RoInput
+        false                               , // Calibration
+        true                                , // DeviceRegistration
+        false                               , // SWUpdate
+        false                               , // FactoryReset
     ]
     property var itemsVisible  : [
-        true                                 , // Information
-        true                                 , // VolumeBrightness
-        true                                 , // WiFi
-        true                                 , // Bluetooth
-        true                                 , // DGSettings
-      ! serviceMode                          , // Services
-        serviceMode                          , // SetDateTime
-        true                                 , // ExportLogs
-        true                                 , // RoInput
-        false /* serviceMode phase 1 */      , // Language
-        false /* serviceMode phase 1 */      , // Calibration
-        true  /* serviceMode         */      , // DeviceRegistration // FIXME: On the normal setting menu for now for development.
-        false /* serviceMode phase 1 */      , // SWUpdate
-        false /* serviceMode phase 1 */      , // FactoryReset
+        true                                , // Information
+        true                                , // VolumeBrightness
+        true                                , // WiFi
+        true                                , // Bluetooth
+        true                                , // ExportLogs
+        serviceMode                         , // SetDateTime
+        false /* serviceMode phase 1B */    , // Language
+      ! serviceMode                         , // Service
+        true                                , // DGCleaning
+        false /* serviceMode phase 1B */    , // DGScheduling
+        true                                , // RoInput
+        false /* serviceMode phase 1B */    , // Calibration
+        true                                , // DeviceRegistration // FIXME: On the normal setting menu for now for development.
+        false /* serviceMode phase 1B */    , // SWUpdate
+        false /* serviceMode phase 1B */    , // FactoryReset
     ]
 
     SettingsHome { id   : _settingsHome
@@ -135,10 +139,14 @@
                 push( _settingsBluetooth )
                 break
 
-            case SettingsStack.DGSettings:
-                push( _settingsDGSettings )
+            case SettingsStack.DGCleaning:
+                push( _settingsDGCleaning )
                 break
 
+            case SettingsStack.DGScheduling:
+                push( _settingsDGScheduling )
+                break
+
             case SettingsStack.Services:
                 push(_servicePassword)
                 _servicePassword.setFocus()
@@ -245,10 +253,14 @@
     SettingsBluetoothCuff       { id: _settingsBluetooth
     }
 
-    SettingsDG                  { id: _settingsDGSettings
-        itemIndex               : SettingsStack.DGSettings
+    SettingsDGCleaning          { id: _settingsDGCleaning
+        itemIndex               : SettingsStack.DGCleaning
     }
 
+    SettingsDGScheduling        { id: _settingsDGScheduling
+        itemIndex               : SettingsStack.DGScheduling
+    }
+
     SettingsExportLogs          { id: _settingsExportLogs
         itemIndex               : SettingsStack.ExportLogs
     }