Index: sources/gui/qml/dialogs/AlarmDialog.qml
===================================================================
diff -u -r0bb5f08eb3570de6bff3ce67ca502db129b59096 -r8f6ecb60abf6d47d4554cfd3019ca496d79b6f69
--- sources/gui/qml/dialogs/AlarmDialog.qml	(.../AlarmDialog.qml)	(revision 0bb5f08eb3570de6bff3ce67ca502db129b59096)
+++ sources/gui/qml/dialogs/AlarmDialog.qml	(.../AlarmDialog.qml)	(revision 8f6ecb60abf6d47d4554cfd3019ca496d79b6f69)
@@ -33,7 +33,7 @@
     property int headerOverlap          : 30
 
     anchors.fill: parent
-    color   : Colors.modeBackgroundDialogColor
+    color   : _colorMode.modeBackgroundDialogColor
     radius  : Variables.alarmDialogRadius
 
 
@@ -94,7 +94,7 @@
     }
 
     Rectangle { id: _descriptionRect
-        color   : Colors.modeBackgroundDialogColor
+        color   : _colorMode.modeBackgroundDialogColor
         clip    : true
 
         anchors {
@@ -140,16 +140,16 @@
                     height  : 50
                     width   : height
                     radius  : height
-                    color   : _delegateControl.ListView.isCurrentItem  ?  Colors.modeButtonColor : Colors.modeAlarmStepButtonColor
+                    color   : _delegateControl.ListView.isCurrentItem  ?  _colorMode.modeButtonColor : _colorMode.modeAlarmStepButtonColor
                     border {
-                        color: Colors.modeButtonColor
+                        color: _colorMode.modeButtonColor
                         width: 2
                     }
 
                     Text { id: _stepNumberRect
                         anchors.centerIn: parent
                         text            : index + 1
-                        color           :  Colors.darkMode ? Colors.offWhite : _delegateControl.ListView.isCurrentItem ? Colors.modeBackgroundColor :  Colors.modeButtonColor
+                        color           :  vSettings.darkMode ? Colors.offWhite : _delegateControl.ListView.isCurrentItem ? _colorMode.modeBackgroundColor :  _colorMode.modeButtonColor
                         font.pixelSize  : 20
                         font.weight     : Font.Medium
                     }
@@ -176,7 +176,7 @@
                     width           : parent.width
                     font.pixelSize  : Fonts.fontPixelInstructionStep
                     font.weight     : _delegateControl.ListView.isCurrentItem ? Font.DemiBold           : Font.Normal
-                    color           : _delegateControl.ListView.isCurrentItem ? Colors.modeSelctedColor : Colors.modeTextColor
+                    color           : _delegateControl.ListView.isCurrentItem ? _colorMode.modeSelctedColor : _colorMode.modeTextColor
                     text            : model.instruction
                     wrapMode        : Text.WordWrap
                 }
@@ -212,7 +212,7 @@
             leftMargin      : Variables.defaultMargin * 4
         }
 
-        color   : Colors.modeAlarmStopStateColor
+        color   : _colorMode.modeAlarmStopStateColor
         radius  : height
 
         Text { id: _astrix
@@ -234,7 +234,7 @@
                 left: _astrix.right
             }
 
-            color   : Colors.modeTextColor
+            color   : _colorMode.modeTextColor
             text    :  qsTr("Return Blood will not be allowed in:")
             font.pixelSize  : 25
             font.weight     : Font.Medium
@@ -280,64 +280,64 @@
             onPressed   : resumeClicked()
             text.text   : qsTr("Resume")
             width       : _buttonGroup.buttonsWidth
-            isDefault   : Colors.darkMode
+            isDefault   : vSettings.darkMode
             backgroundColor: Colors.transparent
-            fgColor     : isPressed ? Colors.offWhite : Colors.modeAlarmButtonPressedColor
+            fgColor     : isPressed ? Colors.offWhite : _colorMode.modeAlarmButtonPressedColor
             selectColor : Qt.darker(borderColor, 1.15)
             pixelSize   : Fonts.fontPixelNotification
-            borderColor : Colors.modeAlarmButtonColor
+            borderColor : _colorMode.modeAlarmButtonColor
         }
 
         TouchRect { id  : _temporaryBreak
             visible     : temporaryBreakVisible
             onPressed   : temporaryBreakClicked()
             text.text   : qsTr("Temporary Break")
             width       : _buttonGroup.buttonsWidth
-            isDefault   : Colors.darkMode
+            isDefault   : vSettings.darkMode
             backgroundColor: Colors.transparent
-            fgColor     : isPressed ? Colors.offWhite : Colors.modeAlarmButtonPressedColor
+            fgColor     : isPressed ? Colors.offWhite : _colorMode.modeAlarmButtonPressedColor
             selectColor : Qt.darker(borderColor, 1.15)
             pixelSize   : Fonts.fontPixelNotification
-            borderColor : Colors.modeAlarmButtonColor
+            borderColor : _colorMode.modeAlarmButtonColor
         }
 
         TouchRect { id  : _rinsebackTouchRect
             visible     : rinsebackVisible
             onPressed   : rinsebackClicked()
             text.text   : qsTr("Return Blood & End Treatment")
             width       : _buttonGroup.buttonsWidth
-            isDefault   : Colors.darkMode
+            isDefault   : vSettings.darkMode
             backgroundColor: Colors.transparent
-            fgColor     : isPressed ? Colors.offWhite : Colors.modeAlarmButtonPressedColor
+            fgColor     : isPressed ? Colors.offWhite : _colorMode.modeAlarmButtonPressedColor
             selectColor : Qt.darker(borderColor, 1.15)
             pixelSize   : Fonts.fontPixelNotification
-            borderColor : Colors.modeAlarmButtonColor
+            borderColor : _colorMode.modeAlarmButtonColor
         }
 
         TouchRect { id  : _endTouchRect
             visible     : endVisible
             onPressed   : endClicked()
             text.text   : qsTr("End Treatment Only")
             width       : _buttonGroup.buttonsWidth
-            isDefault   : Colors.darkMode
+            isDefault   : vSettings.darkMode
             backgroundColor: Colors.transparent
-            fgColor     : isPressed ? Colors.offWhite : Colors.modeAlarmButtonPressedColor
+            fgColor     : isPressed ? Colors.offWhite : _colorMode.modeAlarmButtonPressedColor
             selectColor : Qt.darker(borderColor, 1.15)
             pixelSize   : Fonts.fontPixelNotification
-            borderColor : Colors.modeAlarmButtonColor
+            borderColor : _colorMode.modeAlarmButtonColor
         }
 
         TouchRect { id  : _okTouchRect
             visible     : okVisible
             onPressed   : okClicked()
             text.text   : qsTr("OK")
             width       : _buttonGroup.buttonsWidth
-            isDefault   : Colors.darkMode
+            isDefault   : vSettings.darkMode
             backgroundColor: Colors.transparent
-            fgColor     : isPressed ? Colors.offWhite : Colors.modeAlarmButtonPressedColor
+            fgColor     : isPressed ? Colors.offWhite : _colorMode.modeAlarmButtonPressedColor
             selectColor : Qt.darker(borderColor, 1.15)
             pixelSize   : Fonts.fontPixelNotification
-            borderColor : Colors.modeAlarmButtonColor
+            borderColor : _colorMode.modeAlarmButtonColor
         }
     }
 
@@ -350,7 +350,7 @@
             leftMargin  : Variables.defaultMargin * 3
             bottomMargin: Variables.defaultMargin
         }
-        color           : Colors.modeAlarmListColor
+        color           : _colorMode.modeAlarmListColor
         font.pixelSize  : Fonts.fontPixelAlarmID
     }