Index: shared/scripts/configuration/config.py
===================================================================
diff -u -rcbe0fa20b2bd19124b67553d80130392d6035c74 -r047ceb6dfaaa7fafd5580d141dbf32b68c0c4147
--- shared/scripts/configuration/config.py	(.../config.py)	(revision cbe0fa20b2bd19124b67553d80130392d6035c74)
+++ shared/scripts/configuration/config.py	(.../config.py)	(revision 047ceb6dfaaa7fafd5580d141dbf32b68c0c4147)
@@ -680,3 +680,23 @@
 SET_BINARY = "1<B>"                       #Message binaries appending with <B> for easy identification
 ACK_REQ_STATUS = 'Ack Req'
 ACK_BAK_STATUS = 'Ack Bak'
+
+#Setting 
+CLEAR_ALARM_CONDITION_TEXT = "Clear Alarm Condition"
+EXPORT_TEXT ="Export"
+DEVICE_SETTINGS_TEXT = "Device Settings"
+DEVICE_SETTINGS_SCREEN_PARAMETER = ["Information", "Volume And Brightness", "Wi-Fi", "Bluetooth Cuff", "Dialysate Generator Settings", "Services"]
+SettingsHome_Treatment_Text = "Treatment"
+SettingsHome_Manager_Text = "Manager"
+SettingsHome_Settings_Text = "Settings"
+
+#Information
+
+INFORMATION_TITLES = ["Information", "Versions"]
+INFORMATION_PARAMETERS = ["Information", "UI Version", "HD Version", "HD FPGA Version", "HD Serial Number", "DG Version", "DG FPGA Version", "DG Serial Number"]
+SERIVCES_TITLE = "Services"
+SERVICES_PARAMETERS = ["HD Last Service Date", "HD Next Service Date", "DG Last Service Date", "DG Next Service Date"]
+
+ENABLED = True
+DISABLED = False
+
Index: shared/scripts/configuration/utility.py
===================================================================
diff -u -re4378bd07ad6b5f2a71973728d6be2ffc9bc6054 -r047ceb6dfaaa7fafd5580d141dbf32b68c0c4147
--- shared/scripts/configuration/utility.py	(.../utility.py)	(revision e4378bd07ad6b5f2a71973728d6be2ffc9bc6054)
+++ shared/scripts/configuration/utility.py	(.../utility.py)	(revision 047ceb6dfaaa7fafd5580d141dbf32b68c0c4147)
@@ -1214,7 +1214,6 @@
     except:
         return False
         
-        
 def get_message_from_log(file_name, message_text):
     
     """
@@ -1360,3 +1359,8 @@
         content_record.append(ack_bak_status)
     return content_record
 
+=======
+    raise LookupError("zone object is not in view to the user after " + \
+             "trying 100 times")
+    
+>>>>>>> settings
Index: shared/scripts/names.py
===================================================================
diff -u -r8f706c76141d0919b8e7961f69ba006d3d6eef7b -r047ceb6dfaaa7fafd5580d141dbf32b68c0c4147
--- shared/scripts/names.py	(.../names.py)	(revision 8f706c76141d0919b8e7961f69ba006d3d6eef7b)
+++ shared/scripts/names.py	(.../names.py)	(revision 047ceb6dfaaa7fafd5580d141dbf32b68c0c4147)
@@ -1,6 +1,8 @@
 # encoding: UTF-8
 
+# encoding: UTF-8
 
+
 # Top Parents
 o_QQuickView = {                           "type": "QQuickView"}
 o_Overlay    = {"container": o_QQuickView, "type": "Overlay"}
@@ -619,3 +621,12 @@
 o_patient_connection_start_btn = {"container": o_PreTreatmentConnectionStack_PreTreatmentBase_TreatmentFlowBase_2, "text": "START", "type": "Text", "unnamed": 1, "visible": True}
 o_ultrafilteration_next_btn = {"container": o_Overlay, "text": "NEXT", "type": "Text", "unnamed": 1, "visible": True}
 
+#settings_Home
+o_settings_Text = {"container": o_Gui_MainView, "text": "Settings", "type": "Text", "unnamed": 1, "visible": True}
+o_SettingsHome_SettingsHome = {"container": o_Gui_MainView, "objectName": "_SettingsHome", "type": "SettingsHome", "visible": True}
+o_settings_home_text_obj = {"container": o_SettingsHome_SettingsHome, "type": "Text", "unnamed": 1, "visible": True}
+o_eject_btn = {"container": o_SettingsHome_SettingsHome, "id": "_image", "source": "qrc:/images/iEject", "type": "Image", "unnamed": 1, "visible": True}
+o_arrow_btn = {"container": o_SettingsHome_SettingsHome, "id": "_image", "source": "qrc:/images/iArrowRight", "type": "Image", "unnamed": 1, "visible": True}
+o_SettingsBase_SettingsBase = {"container": o_Gui_MainView, "objectName": "_SettingsBase", "type": "SettingsBase", "visible": True}
+o_settings_base_text_obj = {"container": o_SettingsBase_SettingsBase, "type": "Text", "unnamed": 1, "visible": True}
+