Index: shared/scripts/names.py
===================================================================
diff -u -r36a57fc3f2c136f17a1f75d40a69bf06f2532d27 -r310f51a5ed4921f184572f90d07b350ec41c0bae
--- shared/scripts/names.py	(.../names.py)	(revision 36a57fc3f2c136f17a1f75d40a69bf06f2532d27)
+++ shared/scripts/names.py	(.../names.py)	(revision 310f51a5ed4921f184572f90d07b350ec41c0bae)
@@ -167,6 +167,7 @@
 o_poweroff_notification = {"container": o_Overlay     , "id": "_titleText"     , "type": "TitleText"  , "unnamed": 1, "visible": True, "type": "Text", "text": "System is shutting down"}
 o_poweroff_rejection    = {"container": o_Overlay     , "id": "_titleText"     , "type": "TitleText"  , "unnamed": 1, "visible": True, "type": "Text"}
 o_settings_end_treatment  = {"container": o_QQuickView  , "objectName": "_endTreatmentButton", "type": "TouchRect"}
+o_settings_clear_alarm_condition  = {"container": o_QQuickView  , "objectName": "_clearAlarmCondition", "type": "TouchRect"}
 
 # Main Treatment Screen 
 o_treatmentStart_TreatmentStart = {"container": o_QQuickView, "id": "_treatmentStart", "type": "TreatmentStart", "unnamed": 1, "visible": True}
@@ -230,9 +231,19 @@
 o_alarm_bar_maximize     = {"container": o_alarm_bar            , "id"        : "_updownButton"       , "type": "UpDownButton"       }
 
 o_qquickview_alarm = {"type": "QQuickView", "unnamed": 1, "visible": True}
-o_okay_alarm = {"container": o_Overlay, "id": "_okay", "type": "TouchRect", "unnamed": 1, "visible": True}
+
+o_alarm_dialog = {"container": o_Overlay, "id": "_backgroundRect", "type": "Rectangle", "unnamed": 1, "visible": True}
+o_okay_alarm = {"container": o_Overlay, "objectName": "_alarmOK", "type": "TouchRect"}
+# o_okay_alarm = {"container": o_Overlay, "id": "_okay", "type": "TouchRect", "unnamed": 1, "visible": True}
+
+o_alarm_resume = {"container": o_Overlay, "objectName": "_alarmResume", "type": "TouchRect"}
+o_alarm_rinseback = {"container": o_Overlay, "objectName": "_alarmRinseback", "type": "TouchRect"}
+o_alarm_end = {"container": o_Overlay, "objectName": "_alarmEnd", "type": "TouchRect"}
+o_alarm_bar = {"container": o_qquickview_alarm, "objectName": "NotificationBar", "type": "NotificationBar"}
+o_alarm_mute_button = {"container": o_Overlay, "objectName": "_alarmMuteButton", "type": "MuteButton"}
+o_alarm_silence_expires = {"container": o_Overlay, "objectName": "_TimeText", "type": "TimeText"}
+
 o_treatmentStart_heparinTouchArea_TreatmentFluid = {"container": o_treatmentStart_TreatmentStart, "id": "_heparinTouchArea", "type": "TreatmentFluid", "unnamed": 1, "visible": True}
-o_dismiss_alarm = {"container": o_Overlay, "id": "_silence", "type": "TouchRect", "unnamed": 1, "visible": True}
 o_treatmentStart_TimeText_TimeText = {"container": o_treatmentStart_TreatmentStart, "objectName": "_TimeText", "type": "TimeText", "visible": True}
 o_treatmentStart_TimeText_hour_Text = {"container": o_treatmentStart_TreatmentStart, "objectName": "_TimeText_hour", "type": "Text", "visible": True}
 o_treatmentStart_TimeText_minute_Text = {"container": o_treatmentStart_TreatmentStart, "objectName": "_TimeText_minute", "type": "Text", "visible": True}
@@ -462,9 +473,14 @@
 # Alarm System
 o_NotificationDialog_OKAY             = {"container": o_Overlay, "text": "OKAY", "type": "Text"}
 
+# Alert System
+o_alert                               = {"container": o_Overlay, "id": "_backgroundRect", "type": "Rectangle"}
+o_alert_confirm                       = {"container": o_Overlay, "objectName": "AlertConfirmButton", "type": "TouchRect"}
+o_alert_cancel                        = {"container": o_Overlay, "objectName": "AlertCancelButton", "type": "TouchRect"}
+
 o_create_treatment_button = {"container": o_treatmentHome, "text": "CREATE TREATMENT", "type": "Text", "unnamed": 1 }
 o_create_treatment_container = {"container": o_qquickview_alarm, "objectName": "TreatmentCreate", "type": "TreatmentCreate" }
-o_create_treatment_flickable = {"container": o_create_treatment_container, "objectName": "TreatmentCreateFlickable", "type": "Flickable"}
+o_create_treatment_flickable = {"container": o_create_treatment_container, "objectName": "_treatmentCreateFlickable", "type": "Flickable"}
 o_create_treatment_saline_bolus_0 = {"container": o_create_treatment_container, "objectName": "_salineBolusRect0", "type": "TouchRect"}
 o_create_treatment_saline_bolus_1 = {"container": o_create_treatment_container, "objectName": "_salineBolusRect1", "type": "TouchRect"}
 o_create_treatment_saline_bolus_2 = {"container": o_create_treatment_container, "objectName": "_salineBolusRect2", "type": "TouchRect"}
@@ -484,6 +500,11 @@
 o_create_treatment_confirm = {"container": o_create_treatment_confirm_container, "objectName": "_continueRect", "type": "TouchRect"}
 o_create_treatment_confirm_back_button = {"container": o_create_treatment_confirm_container, "objectName": "_backButton", "type": "BackButton"}
 
+o_create_treatment_arterial_column = {"container": o_create_treatment_container, "objectName": "_arterialPressureLimitsColumn", "type": "Column" }
+o_create_treatment_arterial_slider = {"container": o_create_treatment_container, "objectName": "_arterialPressureLimitsSlider", "type": "RangeSlider" }
+o_create_treatment_venous_column = {"container": o_create_treatment_container, "objectName": "_venousPressureLimitsColumn", "type": "Column" }
+o_create_treatment_venous_slider = {"container": o_create_treatment_container, "objectName": "_venousPressureLimitsSlider", "type": "RangeSlider" }
+
 # Confirm + Priming + Begin Treatment
 o_confirm_treatment_flickable = {"container": o_create_treatment_confirm_container, "objectName": "_treatmentConfirmFlickable", "type": "Flickable"}
 o_priming_container = {"container": o_qquickview_alarm, "objectName": "_treatmentPrime", "type": "TreatmentPrime"}
@@ -492,6 +513,5 @@
 o_priming_continue_button = {"container": o_priming_container, "objectName": "_treatmentPrimeContinueButton", "type": "TouchRect"}
 o_treatment_begin_container = {"container": o_qquickview_alarm, "objectName": "_treatmentBegin", "type": "TreatmentBegin"}
 o_treatment_begin_flickable = {"container": o_treatment_begin_container, "objectName": "_treatmentBeginFlickable", "type": "TreatmentBegin"}
-o_treatment_begin_start_button = {"container": o_treatment_begin_container, "objectName": "_treatmentBeginStart", "type": "TouchRect"}
+o_treatment_begin_start_button = {"container": o_treatment_begin_container, "objectName": "_treatmentBeginStartButton", "type": "TouchRect"}
 o_treatment_begin_back_button = {"container": o_treatment_begin_container, "objectName": "_backButton", "type": "BackButton"}
-