Index: shared/scripts/names.py
===================================================================
diff -u -rfbe10e2085cf30d05d4ed250204abfd78848e0e5 -r5b907030e35f41301043a4d2bfaf3f24f91e8e8e
--- shared/scripts/names.py	(.../names.py)	(revision fbe10e2085cf30d05d4ed250204abfd78848e0e5)
+++ shared/scripts/names.py	(.../names.py)	(revision 5b907030e35f41301043a4d2bfaf3f24f91e8e8e)
@@ -229,10 +229,10 @@
 o_service_text = {"container": o_Gui_MainView, "text": "Service", "type": "Text", "unnamed": 1, "visible": True}
 o_SettingsHome_SettingsHome_2 = {"container": o_Gui_MainView, "objectName": "_SettingsHome", "type": "SettingsHome", "visible": True}
 o_service_home_text_obj = {"container": o_SettingsHome_SettingsHome_2, "type": "Text", "unnamed": 1, "visible": True}
-o_set_date_and_time_text = {"container": o_Gui_MainView, "text": "Set Date And Time", "type": "Text", "unnamed": 1, "visible": True}
 o_SettingsHome_SettingsHome = {"container": o_Gui_MainView, "objectName": "_SettingsBase", "type": "SettingsDateTime", "visible": True}
 o_set_date_and_time_text_obj = {"container": o_SettingsHome_SettingsHome, "type": "Text", "unnamed": 1, "visible": True}
-o_back_btn = {"container": o_SettingsHome_SettingsHome, "id": "_image", "source": "qrc:/images/iBack", "type": "Image", "unnamed": 1, "visible": True}
+o_SettingsBase_SettingsDateTime = {"container": o_Gui_MainView, "objectName": "_SettingsBase", "type": "SettingsDateTime", "visible": True}
+o_SettingsBase_mouseArea_MouseArea = {"container": o_SettingsBase_SettingsDateTime, "id": "_mouseArea", "type": "MouseArea", "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}
@@ -839,8 +839,7 @@
 #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}
-o_SettingsBase_SettingsDateTime = {"container": o_Gui_MainView, "objectName": "_SettingsBase", "type": "SettingsDateTime", "visible": True}
+o_keyboard_object =  {"container": o_Gui_MainView, "type": "Text", "unnamed": 1, "visible": True}
 o_settings_date_and_time_text = {"container": o_SettingsBase_SettingsDateTime, "type": "Text", "unnamed": 1, "visible": True}
 o_date_time_container = {"container": o_SettingsBase_SettingsDateTime, "id": "_container", "type": "Column", "unnamed": 1, "visible": True}
 o_shutdown_text = {"container": o_Gui_MainView, "text": "SHUTDOWN", "type": "Text", "unnamed": 1, "visible": True}
@@ -964,7 +963,8 @@
 o_minimize_button = {"container": o_Overlay, "id": "_image", "source": "qrc:/images/iChevronDown", "type": "Image", "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_SettingsDateTime_mouseArea_MouseArea_2 = {"container": o_SettingsBase_SettingsDateTime, "id": "_mouseArea", "type": "MouseArea", "unnamed": 1, "visible": True}
+o_SettingsHome_mouseArea_MouseArea_2 = {"container": o_SettingsHome_SettingsHome, "id": "_mouseArea", "occurrence": 7, "type": "MouseArea", "unnamed": 1, "visible": True}
 # service screen 
 o_SettingsBase_SettingsBase = {"container": o_Gui_MainView, "objectName": "_SettingsBase", "type": "SettingsBase", "visible": True}
 o_services_screen_text_obj = {"container": o_SettingsBase_SettingsBase, "type": "Text", "unnamed": 1, "visible": True}