Index: sources/gui/qml/pages/SettingsHome.qml
===================================================================
diff -u -r14c541d2b780b0a244bc84860aa565cf8dd7fe4b -r3d0a160e4e8c0348c688ed5efe4d86dc66121e6b
--- sources/gui/qml/pages/SettingsHome.qml	(.../SettingsHome.qml)	(revision 14c541d2b780b0a244bc84860aa565cf8dd7fe4b)
+++ sources/gui/qml/pages/SettingsHome.qml	(.../SettingsHome.qml)	(revision 3d0a160e4e8c0348c688ed5efe4d86dc66121e6b)
@@ -28,6 +28,7 @@
  * which is the default screen in the "Settings" stack
  */
 ScreenItem { id: _root
+    backgroundRect.color: Colors.backgroundMenu
     USBButton { id: _usbButton
         anchors {
             top         : parent.top
@@ -80,33 +81,56 @@
             vTreatmentEnd.doEndTreatmentRequest();
         }
     }
-}
 
-/*
+    TouchRect { id : _clearAlarmCondition
+        objectName: "_clearAlarmCondition"
+        width: 300
+        height: Variables.logoHeight
+        animated: true
+        anchors {
+            top         : parent.top
+            right       : _endTreatmentButton.left
+            topMargin   : (Variables.headerHeight - Variables.logoHeight) / 2
+            rightMargin : (Variables.headerHeight - Variables.logoHeight) / 2
+        }
+        text.text: qsTr("Clear Alarm Condition")
+        button.onPressed: {
+            vAlarmStatus.doClearCondition();
+        }
+    }
+
     TitleText { id: _titleText
         anchors.horizontalCenter: parent.horizontalCenter;
         anchors.top: parent.top
         anchors.topMargin: 150
 
         width: parent.width
         text: qsTr("Device Settings")
-
     }
 
+    /*
     Diagnostics {
         id: _diagnostics
         onBackClicked: pop()
     }
+    */
 
+    SettingsBluetooth {
+        id: _bluetooth
+        onClickedBack: pop()
+
+    }
+
     Column {
         anchors.centerIn: parent;
 
         // add each settings page here.
-        SettingsItem { id: _item_diagnostics
-            title   : qsTr("Diagnostics")
-            onClicked: push(_diagnostics);
+        SettingsItem { id: _item_bluetooth
+            title   : qsTr("Bluetooth")
+            onClicked: push(_bluetooth);
+
         }
     }
-*/
+}