Index: shared/scripts/names.py
===================================================================
diff -u -r9002496389b9df6383fc0fcc47fa6754ca7e14a6 -r5e50c9793e8200292af43dec8657e659a16deca4
--- shared/scripts/names.py	(.../names.py)	(revision 9002496389b9df6383fc0fcc47fa6754ca7e14a6)
+++ shared/scripts/names.py	(.../names.py)	(revision 5e50c9793e8200292af43dec8657e659a16deca4)
@@ -1,15 +1,24 @@
 # encoding: UTF-8
 
-from objectmaphelper import *
-
 o_QQuickView = {"type": "QQuickView", "unnamed": 1, "visible": True}
-o_homeScreen_ui = {"container": o_QQuickView, "id": "_homeScreen", "type": "Home.ui", "unnamed": 1, "visible": True}
-o_homeScreen_Start_Treatment_Text = {"container": o_homeScreen_ui, "text": "Start Treatment", "type": "Text", "unnamed": 1, "visible": True}
-o_startTreatmentScreen_ui = {"container": o_QQuickView, "id": "_startTreatmentScreen", "type": "StartTreatment.ui", "unnamed": 1, "visible": True}
-o_startTreatmentScreen_label_MnemonicLabel = {"container": o_startTreatmentScreen_ui, "objectName": "label", "type": "MnemonicLabel", "visible": True}
-o_homeScreen_backgroundRect_Rectangle = {"container": o_homeScreen_ui, "id": "backgroundRect", "type": "Rectangle", "unnamed": 1, "visible": True}
-o_startTreatmentScreen_Back_Button = {"checkable": False, "container": o_startTreatmentScreen_ui, "id": "btnBack", "text": "Back", "type": "Button", "unnamed": 1, "visible": True}
-o_homeScreen_Treatment_Manager_Text = {"container": o_homeScreen_ui, "text": "Treatment Manager", "type": "Text", "unnamed": 1, "visible": True}
-o_treatmentMansagerScreen_ui = {"container": o_QQuickView, "id": "_treatmentMansagerScreen", "type": "TreatmentManager.ui", "unnamed": 1, "visible": True}
-o_treatmentMansagerScreen_label_MnemonicLabel = {"container": o_treatmentMansagerScreen_ui, "objectName": "label", "type": "MnemonicLabel", "visible": True}
-o_treatmentMansagerScreen_Back_Button = {"checkable": False, "container": o_treatmentMansagerScreen_ui, "id": "btnBack", "text": "Back", "type": "Button", "unnamed": 1, "visible": True}
+
+# Home Screen
+o_treatmentHome                 = {"container": o_QQuickView   , "id": "_treatmentHome"      , "type": "TreatmentHome", "unnamed": 1, "visible": True}
+o_treatmentHome_backgroung      = {"container": o_treatmentHome, "id": "_backgroundRect"     , "type": "Rectangle"    , "unnamed": 1, "visible": True}
+o_treatmentHome_startTreatment  = {"container": o_treatmentHome, "id": "_startTreatmentRect" , "type": "TouchRect"    , "unnamed": 1, "visible": True}
+o_treatmentHome_createTreatment = {"container": o_treatmentHome, "id": "_createTreatmentRect", "type": "TouchRect"    , "unnamed": 1, "visible": True}
+
+# Main Menu
+o_mainMenu           = {"container": o_QQuickView, "id": "_mainMenu" , "type": "MainMenu" ,    "unnamed": 1            , "visible": True}
+o_mainMenu_treatment = {"container": o_mainMenu  , "id": "_touchRect", "type": "TouchRect", "objectName": "_touchRect0", "visible": True}
+o_mainMenu_manager   = {"container": o_mainMenu  , "id": "_touchRect", "type": "TouchRect", "objectName": "_touchRect1", "visible": True}
+o_mainMenu_settings  = {"container": o_mainMenu  , "id": "_touchRect", "type": "TouchRect", "objectName": "_touchRect2", "visible": True}
+
+# manager menu item
+o_managerHome            = {"container": o_QQuickView , "id": "_managerHome"   , "type": "ScreenItem", "unnamed": 1, "visible": True}
+o_managerHome_background = {"container": o_managerHome, "id": "_backgroundRect", "type": "Rectangle" , "unnamed": 1, "visible": True}
+
+# settings menu item
+o_settingsHome            = {"container": o_QQuickView  , "id": "_settingsHome"  , "type": "ScreenItem", "unnamed": 1, "visible": True}
+o_settingsHome_background = {"container": o_settingsHome, "id": "_backgroundRect", "type": "Rectangle" , "unnamed": 1, "visible": True}
+