Index: shared/scripts/names.py
===================================================================
diff -u -ref981744e6899b22a40fef4a8d74db9a4e930575 -r06fda637e04ce27ea414ba8ad06af92c4b76d788
--- shared/scripts/names.py	(.../names.py)	(revision ef981744e6899b22a40fef4a8d74db9a4e930575)
+++ shared/scripts/names.py	(.../names.py)	(revision 06fda637e04ce27ea414ba8ad06af92c4b76d788)
@@ -759,6 +759,9 @@
 o_services_screen_text_obj = {"container": o_userConfirmation_UserConfirmation, "type": "Text", "unnamed": 1, "visible": True}
 o_password_text_field = {"container": o_userConfirmation_UserConfirmation, "echoMode": 2, "id": "_input", "passwordCharacter": "•", "type": "TextInput", "unnamed": 1, "visible": True}
 o_show_password = {"container": o_userConfirmation_UserConfirmation, "id": "_showPassword", "source": "qrc:/images/iEye", "type": "Image", "unnamed": 1, "visible": True}
+o_service_service_pw_confirmation = {"container": o_Gui_MainView, "objectName": "UserConfirmation", "type": "SettingsServicePassword", "visible": True}
+o_service_show_password = {"container": o_service_service_pw_confirmation, "source": "qrc:/images/iEye", "type": "Image", "unnamed": 1, "visible": True}
+
 # object on keyboard to switch to keypad
 o_switch_keyboard_to_keypad = {"container": o_Gui_MainView, "text": "&123", "type": "Text", "unnamed": 1, "visible": True}
 o_keyboard_object = {"container": o_Gui_MainView, "type": "Text", "unnamed": 1, "visible": True}
@@ -836,8 +839,10 @@
 # Recirculate Left arrow image button
 o_EndTreatmentBase_leftImage_Image = {"container": o_EndTreatmentRecirculateStack_EndTreatmentBase_EndTreatmentBase, "id": "_leftImage", "source": "qrc:/images/iArrowLeft", "type": "Image", "unnamed": 1, "visible": True}
 # Reconnect text
-o_EndTreatmentBase_RECONNECT_Text = {"container": o_EndTreatmentRecirculateStack_EndTreatmentBase_EndTreatmentBase, "text": "RECONNECT", "type": "Text", "unnamed": 1, "visible": True}
-o_EndTreatmentBase_Reconnect_Text = {"container": o_EndTreatmentRecirculateStack_EndTreatmentBase_EndTreatmentBase, "text": "Reconnect", "type": "Text", "unnamed": 1, "visible": True}
+o_EndTreatmentBase_RECONNECT_Text = {"container": o_EndTreatmentRecirculateStack_EndTreatmentBase_EndTreatmentBase, "text": "RESUME TREATMENT", "type": "Text", "unnamed": 1, "visible": True}
+o_EndTreatmentBase_Reconnect_Text = {"container": o_EndTreatmentRecirculateStack_EndTreatmentBase_EndTreatmentBase, "text": "RESUME TREATMENT", "type": "Text", "unnamed": 1, "visible": True}
+o_EndTreatmentBase_ReturnToRecirculate_Text = {"container": o_EndTreatmentRecirculateStack_EndTreatmentBase_EndTreatmentBase, "text":"BACK TO RECIRCULATE", "type": "Text", "unnamed": 1, "visible": True}
+
 # Reconnect button text
 # o_EndTreatmentBase_Reconnect_Text = {"container": o_EndTreatmentRecirculateStack_EndTreatmentBase_EndTreatmentBase, "text": "Reconnect", "type": "Text", "unnamed": 1, "visible": True}
 o_EndTreatmentBase_TouchRect = {"container": o_EndTreatmentRecirculateStack_EndTreatmentBase_EndTreatmentBase, "type": "TouchRect", "unnamed": 1, "visible": True}
@@ -984,7 +989,7 @@
 # Setting WiFi, Bluetooth cuff, DG cleaning
 device_settings_screen = {"container": o_Gui_MainView, "text": "Treatment", "type": "Text", "unnamed": 1, "visible": True}
 o_SettingsHome_mouseArea_MouseArea_2 = {"container": o_SettingsHome_SettingsHome_2, "id": "_mouseArea", "occurrence": 7, "type": "MouseArea", "unnamed": 1, "visible": True}
-o_SettingsHome_wifi_Text = {"container": o_SettingsHome_SettingsHome_2, "text": "Wi-Fi", "type": "Text", "unnamed": 1, "visible": True}
+o_SettingsHome_wifi_Text = {"container": o_SettingsHome_SettingsHome_settings, "text": "Wi-Fi", "type": "Text", "unnamed": 1, "visible": True}
 o_wifi_settings_main_button = {"container": o_SettingsHome_SettingsHome_2, "id": "_mouseArea", "occurrence": 3, "type": "MouseArea", "unnamed": 1, "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}
@@ -997,7 +1002,6 @@
 o_SettingsBase_mouseArea_MouseArea_2 = {"container": o_SettingsBase_SettingsBase, "id": "_mouseArea", "type": "MouseArea", "unnamed": 1, "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_DG_Cleaning_Text = {"container": o_SettingsBase_SettingsDG, "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_SettingsHome_DG_Cleaning_Text = {"container": o_SettingsHome_SettingsHome_2, "text": "DG Cleaning", "type": "Text", "unnamed": 1, "visible": True}
@@ -1073,4 +1077,12 @@
 o_SettingsBase_TextField = {"container": o_SettingsBase_SettingsExportLogs, "echoMode": 0, "type": "TextField", "unnamed": 1, "visible": True}
 o_preTreatmentDisposablesStack_preTreatmentDisposablesHeparinSyringe_PreTreatmentBase = {"container": o_PreTreatmentStack_preTreatmentDisposablesStack_PreTreatmentDisposablesStack, "objectName": "_preTreatmentDisposablesHeparinSyringe", "type": "PreTreatmentBase", "visible": True}
 o_preTreatmentDisposablesHeparinSyringe_instructionView_InstructionView = {"container": o_preTreatmentDisposablesStack_preTreatmentDisposablesHeparinSyringe_PreTreatmentBase, "id": "_instructionView", "type": "InstructionView", "unnamed": 1, "visible": True}
+o_SettingsHome_Volume_And_Brightness_Text = {"container": o_SettingsHome_SettingsHome_settings, "text": "Volume And Brightness", "type": "Text", "unnamed": 1, "visible": True}
+o_SettingsBase_SettingsDGCleaning = {"container": o_Gui_MainView, "objectName": "_SettingsBase", "type": "SettingsDGCleaning", "visible": True}
+o_SettingsBase_DG_Cleaning_Text = {"container": o_SettingsBase_SettingsDGCleaning, "text": "Information", "type": "Text", "unnamed": 1, "visible": True}
+userConfirmation_SettingsServicePassword = {"container": o_Gui_MainView, "objectName": "UserConfirmation", "type": "SettingsServicePassword", "visible": True}
+userConfirmation_confirmButton_ConfirmButton = {"container": userConfirmation_SettingsServicePassword, "objectName": "_confirmButton", "type": "ConfirmButton", "visible": True}
+userConfirmation_Incorrect_password_Text = {"container": userConfirmation_SettingsServicePassword, "text": "Incorrect password", "type": "Text", "unnamed": 1, "visible": True}
+userConfirmation_backButton_BackButton = {"container": userConfirmation_SettingsServicePassword, "objectName": "_backButton", "type": "BackButton", "visible": True}
+o_EndTreatmentBase_ButtonEndTreatment = {"container": o_EndTreatmentRecirculateStack_EndTreatmentBase_EndTreatmentBase, "type": "ButtonEndTreatment", "unnamed": 1, "visible": True}