Index: sources/gui/qml/main.qml
===================================================================
diff -u -r5e5c936f26d0dd06c89e9fd32de5775a37b52493 -rdbe55daa5838b4b8ee07037e78b393c296423cb3
--- sources/gui/qml/main.qml	(.../main.qml)	(revision 5e5c936f26d0dd06c89e9fd32de5775a37b52493)
+++ sources/gui/qml/main.qml	(.../main.qml)	(revision dbe55daa5838b4b8ee07037e78b393c296423cb3)
@@ -15,6 +15,8 @@
 
 // Qt
 import QtQuick              2.12
+import QtQml                2.15
+import QtQml.Models         2.15
 
 // Project
 //  C++ imports
@@ -54,7 +56,7 @@
 import VDateTime                                            0.1
 import VAdjustmentAlarmVolume                               0.1
 import VBluetooth                                           0.1
-import VDuetRoWaterDG                                       0.1
+import VRoWaterMode                                         0.1
 import VCloudSync                                           0.1
 import VHDUsageInfo                                         0.1
 import VInstitutionalRecord                                 0.1
@@ -204,7 +206,7 @@
     VDateTime                                           { id: vDateTime                                             }
     VAdjustmentAlarmVolume                              { id: vAdjustmentAlarmVolume                                }
     VBluetooth                                          { id: vBluetooth                                            }
-    VDuetRoWaterDG                                      { id: vDuetRoWaterDG                                        }
+    VRoWaterMode                                        { id: vRoWaterMode                                          }
     VCloudSync                                          { id: vCloudSync                                            }
     VHDUsageInfo                                        { id: vHDUsageInfo                                          }
     VAdjustmentInstitutionalRecord                      { id: vAdjustmentInstitutionalRecord                        }
@@ -365,9 +367,9 @@
         readonly property color modeAutoStepProgressColor       : vSettings.darkMode ? Colors.borderButton              : Colors.statusTextPaused
         readonly property color modeTextColor                   : vSettings.darkMode ? Colors.offWhite                  : Colors.backgroundMainMenu
         readonly property color modeButtonColor                 : vSettings.darkMode ? Colors.borderButton              : Colors.backgroundMainMenu
-        readonly property color modeAlarmButtonColor            : vSettings.darkMode ? Colors.darkModeBackground        : Colors.lightModeSelect
-        readonly property color modeAlarmStepButtonColor        : vSettings.darkMode ? Colors.panelBackground           : Colors.offWhite
-        readonly property color modeAlarmButtonPressedColor     : vSettings.darkMode ? Colors.offWhite                  : Colors.lightModeSelect
+        readonly property color modeAlarmButtonColor            : vSettings.darkMode ? Colors.darkModeBackground        : Colors.offWhite
+        readonly property color modeAlarmStepButtonColor        : vSettings.darkMode ? Colors.darkModeBackground        : Colors.offWhite
+        readonly property color modeAlarmButtonPressedColor     : vSettings.darkMode ? Colors.offWhite                  : Colors.offWhite
         readonly property color modeAlarmListColor              : vSettings.darkMode ? Colors.offWhite                  : Colors.alarmDialogText
         readonly property color modeAlarmStopStateColor         : vSettings.darkMode ? Colors.darkModeAlarmStopState    : Colors.lightModeAlarmStopState
     }
@@ -456,7 +458,7 @@
     PowerItem                       { id: _powerItem        ;   z: 997      }
     ConfirmDialog                   { id: _confirmDialog    ;   z: 998      }
     DryDemoDialog                   { id: _dryDemoDialog    ;   z: 999      }
-    DiagnosticsDialog               { id: _diagnosticsDialog;   z: 999      }
+    //DiagnosticsDialog               { id: _diagnosticsDialog;   z: 999      }
 
     // Note: NotificationBar has to be anchored to the main menu and if it is moved into the AlarmItem
     //       then cannot be anchored.