Index: sources/gui/qml/globals/Colors.qml
===================================================================
diff -u -rcc1e9d6d55c816f3fcd626dc6948cca24da283b3 -r1bc9f3dde03bfdc0ca6092b379db7efc9bb22884
--- sources/gui/qml/globals/Colors.qml	(.../Colors.qml)	(revision cc1e9d6d55c816f3fcd626dc6948cca24da283b3)
+++ sources/gui/qml/globals/Colors.qml	(.../Colors.qml)	(revision 1bc9f3dde03bfdc0ca6092b379db7efc9bb22884)
@@ -23,87 +23,87 @@
  * whcih is going to be used in the project
  */
 QtObject {
-    readonly property color red                     : "#c53b33"         // red
-    readonly property color white                   : "white"           // white
-    readonly property color transparent             : "Transparent"     // No Color
+    readonly property color red                             : "#c53b33"         // red
+    readonly property color white                           : "white"           // white
+    readonly property color transparent                     : "Transparent"     // No Color
 
-    readonly property color separatorLine           : "#5f809d"
-    readonly property color backgroundMain                   : "#1A344D"
-    readonly property color backgroundButtonNormal  : transparent
-    readonly property color backgroundButtonSelect           : "#438FEB"
-    readonly property color backgroundButtonSelectDark       : "#214773"
-    readonly property color backgroundDialog                 : "#254670"
-    readonly property color backgroundMenu                   : "#14314C"
-    readonly property color backgroundMainMenu               : "#0D2639"
-    readonly property color backgroundDottedMenu             : "#64809D"
-    readonly property color backgroundSlider                 : "#195187"
+    readonly property color separatorLine                   : "#5f809d"
+    readonly property color backgroundMain                  : "#1A344D"
+    readonly property color backgroundButtonNormal          : transparent
+    readonly property color backgroundButtonSelect          : "#438FEB"
+    readonly property color backgroundButtonSelectDark      : "#214773"
+    readonly property color backgroundDialog                : "#254670"
+    readonly property color backgroundMenu                  : "#14314C"
+    readonly property color backgroundMainMenu              : "#0D2639"
+    readonly property color backgroundDottedMenu            : "#64809D"
+    readonly property color backgroundSlider                : "#195187"
 
-    readonly property color backgroundUltrafiltrationButton  : "#31568F"
-    readonly property color textValueUltrafiltrationButtonFg : "#98aec2"
+    readonly property color backgroundUltrafiltrationButton : "#31568F"
+    readonly property color textValueUltrafiltrationButtonFg: "#98aec2"
 
-    readonly property color backgroundRangeRect              : "#3e546e"
-    readonly property color highlightProgressBar             : "#3d8eef"
-    readonly property color highlightMedProgressBar          : "#1b2b3e"
-    readonly property color textProgressBar                  : "#88a3c5"
+    readonly property color backgroundRangeRect             : "#3e546e"
+    readonly property color highlightProgressBar            : "#3d8eef"
+    readonly property color highlightMedProgressBar         : "#1b2b3e"
+    readonly property color textProgressBar                 : "#88a3c5"
 
-    readonly property color textRangeMarker         : white
-    readonly property color rangeMarker             : white
-    readonly property color rangeMarkerShort                 : "#9fb6d1"
+    readonly property color textRangeMarker                 : white
+    readonly property color rangeMarker                     : white
+    readonly property color rangeMarkerShort                : "#9fb6d1"
 
-    readonly property color textMain                         : "#FCFCFC"
-    readonly property color textButton                       : "#FCFCFC" //"#E8E8E8"
-    readonly property color textDisableButton                : "#607A91"
-    readonly property color textTickMark                     : "#438FEB"
+    readonly property color textMain                        : "#FCFCFC"
+    readonly property color textButton                      : "#FCFCFC"     //"#E8E8E8"
+    readonly property color textDisableButton               : "#607A91"
+    readonly property color textTickMark                    : "#438FEB"
 
-    readonly property color borderButton                     : "#4290EC"     //K:D //"#438FEB"
-    readonly property color borderDisableButton              : "#607A91"
-    readonly property color boderSeparatorLine               : "#476982"
-    readonly property color borderDialog                     : transparent // different colors for different displays // "#D01A344D" // "#D00F0F0F" //"#F51A344D"
+    readonly property color borderButton                    : "#4290EC"     //K:D //"#438FEB"
+    readonly property color borderDisableButton             : "#607A91"
+    readonly property color boderSeparatorLine              : "#476982"
+    readonly property color borderDialog                    : transparent   // different colors for different displays // "#D01A344D" // "#D00F0F0F" //"#F51A344D"
 
-    readonly property color touchTextAreaTitle               : "#a0b6d0"
+    readonly property color touchTextAreaTitle              : "#a0b6d0"
 
-    readonly property color textTextRectTitle       : white
-    readonly property color textTextRectLabel                : "#e8e8e8"
-    readonly property color textTextRectExtra                : "#708795"
+    readonly property color textTextRectTitle               : white
+    readonly property color textTextRectLabel               : "#e8e8e8"
+    readonly property color textTextRectExtra               : "#708795"
 
-    readonly property color line                             : "#094266"
+    readonly property color line                            : "#094266"
 
-    readonly property color pressuresText           : white
-    readonly property color pressuresArterialBar             : "#31bcdb"
-    readonly property color pressuresVenousBar               : "#c568ed"
-    readonly property color pressuresOutOfRaneBg    : red
+    readonly property color pressuresText                   : white
+    readonly property color pressuresArterialBar            : "#31bcdb"
+    readonly property color pressuresVenousBar              : "#c568ed"
+    readonly property color pressuresOutOfRaneBg            : red
 
-    readonly property color fluidText               : white
-    readonly property color fluidValue              : white
-    readonly property color fluidUnit                        : "#708795"
+    readonly property color fluidText                       : white
+    readonly property color fluidValue                      : white
+    readonly property color fluidUnit                       : "#708795"
 
-    readonly property color textNotificationNoneBg  : white
-    readonly property color textNotificationNoneFg           : "#1b2b3e"
+    readonly property color textNotificationNoneBg          : white
+    readonly property color textNotificationNoneFg          : "#1b2b3e"
 
-    readonly property color textNotificationLowBg            : "#f5a623"   // ?
-    readonly property color textNotificationLowFg   : white    // ?
+    readonly property color textNotificationLowBg           : "#f5a623"     // ?
+    readonly property color textNotificationLowFg           : white         // ?
 
-    readonly property color textNotificationMedBg            : "#f5a623"  // ?
-    readonly property color textNotificationMedFg   : white    // ?
+    readonly property color textNotificationMedBg           : "#f5a623"     // ?
+    readonly property color textNotificationMedFg           : white         // ?
 
-    readonly property color textNotificationHighBg  : red
-    readonly property color textNotificationHighFg  : white
+    readonly property color textNotificationHighBg          : red
+    readonly property color textNotificationHighFg          : white
 
-    readonly property color alarmTopBarHighBg                : "#831913"
-    readonly property color alarmTopBarHighFg       : white
+    readonly property color alarmTopBarHighBg               : "#831913"
+    readonly property color alarmTopBarHighFg               : white
 
-    readonly property color alarmTopBarMedBg                 : "#db8f00"
-    readonly property color alarmTopBarMedFg        : white
+    readonly property color alarmTopBarMedBg                : "#db8f00"
+    readonly property color alarmTopBarMedFg                : white
 
-    readonly property color alarmTopBarLowBg                 : "#db8f00"
-    readonly property color alarmTopBarLowFg        : white
+    readonly property color alarmTopBarLowBg                : "#db8f00"
+    readonly property color alarmTopBarLowFg                : white
 
-    readonly property color createTreatmentActive            : "#3d8eef"
-    readonly property color createTreatmentInactive          : "#3e546e"
-    readonly property color createTreatmentNotReady          : "#1f4974"
-    readonly property color createTreatmentReady             : "#438FEB"
-    readonly property color createTreatmentTextNotReady      : "#507090"
-    readonly property color createTreatmentTextReady         : "white"
-    readonly property color createTreatmentInvalidParam      : "red"
+    readonly property color createTreatmentActive           : "#3d8eef"
+    readonly property color createTreatmentInactive         : "#3e546e"
+    readonly property color createTreatmentNotReady         : "#1f4974"
+    readonly property color createTreatmentReady            : "#438FEB"
+    readonly property color createTreatmentTextNotReady     : "#507090"
+    readonly property color createTreatmentTextReady        : white
+    readonly property color createTreatmentInvalidParam     : red
 
 }
Index: unittests/tst_views.cpp
===================================================================
diff -u -rcc1e9d6d55c816f3fcd626dc6948cca24da283b3 -r1bc9f3dde03bfdc0ca6092b379db7efc9bb22884
--- unittests/tst_views.cpp	(.../tst_views.cpp)	(revision cc1e9d6d55c816f3fcd626dc6948cca24da283b3)
+++ unittests/tst_views.cpp	(.../tst_views.cpp)	(revision 1bc9f3dde03bfdc0ca6092b379db7efc9bb22884)
@@ -49,11 +49,6 @@
     // try rejected
     v.adjustment_Accepted(false);
 
-    // SALINE_BOLUS_STATE_IDLE = 0,
-    // SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP
-    // SALINE_BOLUS_STATE_IN_PROGRESS,
-    // SALINE_BOLUS_STATE_MAX_DELIVERED,
-
     // if not accepted and a reason passed then the parent should translate it and return
     v.adjustment_Reason(GuiRequestReasons::REQUEST_REJECT_REASON_INVALID_TREATMENT_STATE);
     QCOMPARE(v.text(), tr("REQUEST_REJECT_REASON_INVALID_TREATMENT_STATE"));