Index: sources/gui/qml/pages/SettingsHome.qml
===================================================================
diff -u -r01cdcd9647c07963bf4a1cf1e477755dddb84c6c -r5215e145a0f26a20c99e3f10af6ac8a9c3b67383
--- sources/gui/qml/pages/SettingsHome.qml	(.../SettingsHome.qml)	(revision 01cdcd9647c07963bf4a1cf1e477755dddb84c6c)
+++ sources/gui/qml/pages/SettingsHome.qml	(.../SettingsHome.qml)	(revision 5215e145a0f26a20c99e3f10af6ac8a9c3b67383)
@@ -28,6 +28,25 @@
  * which is the default screen in the "Settings" stack
  */
 ScreenItem { id: _root
+    backgroundRect.color: Colors.backgroundMenu
+
+    TouchRect { id : _clearAlarmCondition
+        objectName: "_clearAlarmCondition"
+        width: 300
+        height: Variables.logoHeight
+        animated: true
+        anchors {
+            top         : parent.top
+            right       : _usbButton.left
+            topMargin   : (Variables.headerHeight - Variables.logoHeight) / 2
+            rightMargin : (Variables.headerHeight - Variables.logoHeight) / 2
+        }
+        text.text: qsTr("Clear Alarm Condition")
+        button.onPressed: {
+            vAlarmStatus.doClearCondition();
+        }
+    }
+
     USBButton { id: _usbButton
         anchors {
             top         : parent.top
@@ -63,33 +82,39 @@
             _GuiView.doActionTransmit(GuiActions.ID_PowerOff, GuiActions.NoData)
         }
     }
-}
 
-/*
     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);
+
         }
     }
-*/
+}