Index: shared/scripts/names.py
===================================================================
diff -u -r80a01ddbab62d3b2609810f794e6ef8c77211572 -r7b1821e4eac91025e0363aaeae30677ca8afce41
--- shared/scripts/names.py	(.../names.py)	(revision 80a01ddbab62d3b2609810f794e6ef8c77211572)
+++ shared/scripts/names.py	(.../names.py)	(revision 7b1821e4eac91025e0363aaeae30677ca8afce41)
@@ -878,8 +878,6 @@
 o_SettingsBase_Volume_And_Brightness_Text = {"container": o_SettingsBase_SettingsVolumeBrightness, "type": "Text", "unnamed": 1, "visible": True}
 o_brightness_parent_obj = {"container": o_SettingsBase_SettingsVolumeBrightness, "gradient": 0, "id": "_brightness", "type": "Slider", "unnamed": 1, "visible": True}
 
-
-#End treatment state
 #Containers for End treatment
 o_EndTreatmentEndStack_EndTreatmentEndStack = {"container": o_Gui_MainView, "objectName": "_EndTreatmentEndStack", "type": "EndTreatmentEndStack", "visible": True}
 o_EndTreatmentRinsebackStack_EndTreatmentRinsebackStack = {"container": o_Gui_MainView, "objectName": "_EndTreatmentRinsebackStack", "type": "EndTreatmentRinsebackStack", "visible": True}
@@ -964,5 +962,35 @@
 o_PostTreatmentStack_treatmentReviewConfirm_PostTreatmentReview = {"container": o_PostTreatmentStack_PostTreatmentStack, "objectName": "_treatmentReviewConfirm", "type": "PostTreatmentReview", "visible": True}
 o_treatmentReviewConfirm_Code_Tx_code_Label = {"container": o_PostTreatmentStack_treatmentReviewConfirm_PostTreatmentReview, "text": "Code: Tx_code", "type": "Label", "unnamed": 1, "visible": True}
 
-#cloud_sync_hd_opmodes
+#Setting WiFi, Bluetooth cuff, DG cleaning
 device_settings_screen  = {"container": o_Gui_MainView, "text": "Treatment", "type": "Text", "unnamed": 1, "visible": True}
+o_SettingsHome_SettingsHome_2 = {"container": o_Gui_MainView, "objectName": "_SettingsHome", "type": "SettingsHome", "visible": True}
+o_SettingsHome_Wi_Fi_Text = {"container": o_SettingsHome_SettingsHome_2, "text": "Wi-Fi", "type": "Text", "unnamed": 1, "visible": True}
+o_Gui_MainView_2 = {"type": "Gui::MainView", "unnamed": 1, "visible": True}
+o_SettingsBase_SettingsWiFi = {"container": o_Gui_MainView_2, "objectName": "_SettingsBase", "type": "SettingsWiFi", "visible": True}
+o_SettingsBase_Wi_Fi_Text = {"container": o_SettingsBase_SettingsWiFi, "text": "Wi-Fi", "type": "Text", "unnamed": 1, "visible": True}
+o_SettingsBase_IP_Address_Text = {"container": o_SettingsBase_SettingsWiFi, "text": "IP Address", "type": "Text", "unnamed": 1, "visible": True}
+o_SettingsBase_Gateway_Text = {"container": o_SettingsBase_SettingsWiFi, "text": "Gateway", "type": "Text", "unnamed": 1, "visible": True}
+o_SettingsBase_Subnet_Mask_Text = {"container": o_SettingsBase_SettingsWiFi, "text": "Subnet Mask", "type": "Text", "unnamed": 1, "visible": True}
+o_SettingsBase_DNS_Text = {"container": o_SettingsBase_SettingsWiFi, "text": "DNS", "type": "Text", "unnamed": 1, "visible": True}
+o_SettingsBase_SSID_Text = {"container": o_SettingsBase_SettingsWiFi, "text": "SSID", "type": "Text", "unnamed": 1, "visible": True}
+o_SettingsBase_SCAN_Text = {"container": o_SettingsBase_SettingsWiFi, "text": "SCAN", "type": "Text", "unnamed": 1, "visible": True}
+o_SettingsHome_Bluetooth_Cuff_Text = {"container": o_SettingsHome_SettingsHome_2, "text": "Bluetooth Cuff", "type": "Text", "visible": True}
+o_SettingsBase_Devices_Label = {"container": o_SettingsBase_SettingsBase, "text": "Devices", "type": "Label", "unnamed": 1, "visible": True}
+o_SettingsBase_Bluetooth_Cuff_Text = {"container": o_SettingsBase_SettingsBase, "text": "Bluetooth Cuff", "type": "Text", "unnamed": 1, "visible": True}
+o_SettingsBase_SettingsDG = {"container": o_Gui_MainView_2, "objectName": "_SettingsBase", "type": "SettingsDG", "visible": True}
+o_SettingsBase_DG_Cleaning_Text = {"container": o_SettingsBase_SettingsDG, "text": "DG Cleaning", "type": "Text", "unnamed": 1, "visible": True}
+o_SettingsHome_DG_Cleaning_Text = {"container": o_SettingsHome_SettingsHome_2, "text": "DG Cleaning", "type": "Text", "unnamed": 1, "visible": True}
+o_SettingsBase_Water_Flush_Text = {"container": o_SettingsBase_SettingsDG, "text": "Water Flush", "type": "Text", "unnamed": 1, "visible": True}
+o_SettingsBase_Heat_Disinfection_Text = {"container": o_SettingsBase_SettingsDG, "text": "Heat Disinfection", "type": "Text", "unnamed": 1, "visible": True}
+o_SettingsBase_Chemical_Disinfection_Text = {"container": o_SettingsBase_SettingsDG, "text": "Chemical Disinfection", "type": "Text", "unnamed": 1, "visible": True}
+o_SettingsBase_backButton_BackButton = {"container": o_SettingsBase_SettingsWiFi, "gradient": 0, "objectName": "_backButton", "type": "BackButton", "visible": True}
+o_back_button = {"container": o_Gui_MainView_2, "text": "BACK", "type": "Text", "unnamed": 1, "visible": False}
+o_SettingsBase_SCAN_Text_2 = {"container": o_SettingsBase_SettingsBase, "text": "SCAN", "type": "Text", "unnamed": 1, "visible": True}
+o_SettingsBase_ssidText_Text = {"container": o_SettingsBase_SettingsWiFi, "id": "_ssidText", "type": "Text", "unnamed": 1, "visible": True}
+o_SettingsBase_input_TextInput = {"container": o_SettingsBase_SettingsWiFi, "echoMode": 0, "id": "_input", "type": "TextInput", "unnamed": 1, "visible": True}
+o_SettingsBase_input_TextInput_2 = {"container": o_SettingsBase_SettingsWiFi, "echoMode": 0, "id": "_input",  "type": "TextInput", "unnamed": 1, "visible": True}
+o_SettingsBase_input_TextInput_3 = {"container": o_SettingsBase_SettingsWiFi, "echoMode": 0, "id": "_input",  "type": "TextInput", "unnamed": 1, "visible": True}
+o_SettingsBase_input_TextInput_4 = {"container": o_SettingsBase_SettingsWiFi, "echoMode": 0, "id": "_input",  "type": "TextInput", "unnamed": 1, "visible": True}
+o_keyboard_object = {"container": o_Gui_MainView, "type": "Text", "unnamed": 1, "visible": True}
+