Index: sources/gui/qml/pages/SettingsHome.qml
===================================================================
diff -u -r01cdcd9647c07963bf4a1cf1e477755dddb84c6c -r62d4bbefa96100e5a01194c0b704fe32d9db56ec
--- sources/gui/qml/pages/SettingsHome.qml	(.../SettingsHome.qml)	(revision 01cdcd9647c07963bf4a1cf1e477755dddb84c6c)
+++ sources/gui/qml/pages/SettingsHome.qml	(.../SettingsHome.qml)	(revision 62d4bbefa96100e5a01194c0b704fe32d9db56ec)
@@ -28,6 +28,24 @@
  * which is the default screen in the "Settings" stack
  */
 ScreenItem { id: _root
+
+    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.onClicked: {
+            vAlarmStatus.doClearCondition();
+        }
+    }
+
     USBButton { id: _usbButton
         anchors {
             top         : parent.top
@@ -63,33 +81,137 @@
             _GuiView.doActionTransmit(GuiActions.ID_PowerOff, GuiActions.NoData)
         }
     }
-}
 
-/*
     TitleText { id: _titleText
-        anchors.horizontalCenter: parent.horizontalCenter;
-        anchors.top: parent.top
-        anchors.topMargin: 150
+        anchors {
+            horizontalCenter: parent.horizontalCenter;
+            top: parent.top
+            topMargin: 150
+        }
 
         width: parent.width
         text: qsTr("Device Settings")
+    }
 
+    TitleText {
+        anchors {
+            horizontalCenter: parent.horizontalCenter
+            top: _titleText.bottom
+            topMargin: 10
+        }
+        text: qsTr("Service Mode")
+        color: Colors.textMain
+        font.italic: true
+        font.pixelSize: Fonts.fontPixelDialogText
+        visible: vServiceMode.isServiceMode
     }
 
+    /*
     Diagnostics {
         id: _diagnostics
         onBackClicked: pop()
     }
+    */
 
+    SettingsBluetooth {
+        id: _bluetooth
+        onBackClicked: _settingsStack.pop()
+
+    }
+
+    SettingsWifi {
+        id: _wifi
+        onBackClicked: _settingsStack.pop()
+
+    }
+
+    SettingsDeviceInformation {
+        id: _deviceInformation
+        onBackClicked: _settingsStack.pop()
+    }
+
+    SettingsDateTimeSet {
+        id: _dateTimeSet
+        onBackClicked: _settingsStack.pop()
+    }
+
+    SettingsAlarmVolume {
+        id: _alarmVolume
+        onBackClicked: _settingsStack.pop()
+    }
+
+    SettingsBrightness {
+        id: _brightness
+        onBackClicked: _settingsStack.pop()
+    }
+
     Column {
-        anchors.centerIn: parent;
+        anchors.centerIn: parent
+        SettingsItem { id: _item_
+            title   : qsTr("Device Information")
+            onClicked: {
+                vDeviceInformation.doRequestHDDGVersions()
+                vDeviceInformation.doRequestServiceData()
+                _settingsStack.push(_deviceInformation)
+            }
+        }
 
-        // add each settings page here.
-        SettingsItem { id: _item_diagnostics
-            title   : qsTr("Diagnostics")
-            onClicked: push(_diagnostics);
+        SettingsItem { id: _item_bluetooth
+            title   : qsTr("Bluetooth")
+            onClicked: _settingsStack.push(_bluetooth);
+
         }
+        SettingsItem { id: _item_wifi
+            title   : qsTr("Wifi")
+            onClicked: {
+                _settingsStack.push(_wifi);
+                vNetworkModel.doScan()
+            }
+        }
+        SettingsItem { id: _item_serviceMode
+            title   : qsTr("Service Mode")
+            onClicked: {
+                _serviceLogin.visible = true
+            }
+            visible: !vServiceMode.isServiceMode
+        }
+        SettingsItem { id: _itemDateTimeSet
+            title   : qsTr("Set Date and Time")
+            onClicked: {
+                vDateTime.doGetCurrentTime()
+                push(_dateTimeSet)
+            }
+            visible: vServiceMode.isServiceMode
+        }
+        SettingsItem { id: _itemAlarmVolume
+            title   : qsTr("Alarm Volume")
+            onClicked: {
+                push(_alarmVolume)
+            }
+        }
+        SettingsItem { id: _itemBrightness
+            title   : qsTr("Brightness")
+            onClicked: {
+                vBrightness.doGetBrightness()
+                push(_brightness)
+            }
+        }
     }
-*/
 
-
+    TouchRect { id: _shutdown
+        anchors {
+            bottom: _root.bottom
+            bottomMargin: Variables.settingsMargin
+            horizontalCenter: _root.horizontalCenter
+        }
+        visible: vServiceMode.isServiceMode
+        backgroundColor: Colors.backgroundButtonNormal
+        textColor: Colors.textMain
+        height: Variables.settingsButtonHeight
+        width: Variables.settingsButtonWidth
+        text.text: qsTr("Shutdown")
+        onClicked: {
+            _powerOffDialog.open()
+        }
+    }
+}