Index: sources/gui/qml/AlarmItem.qml
===================================================================
diff -u -r43ae56f762e6f3e1416d39e3d16f9103fc597e41 -rf06b3645936db64dff09721cf625a6a8530e3f0a
--- sources/gui/qml/AlarmItem.qml	(.../AlarmItem.qml)	(revision 43ae56f762e6f3e1416d39e3d16f9103fc597e41)
+++ sources/gui/qml/AlarmItem.qml	(.../AlarmItem.qml)	(revision f06b3645936db64dff09721cf625a6a8530e3f0a)
@@ -39,10 +39,9 @@
     VAlarmStatus     { id: vAlarmStatus     }
     VAlarmActiveList { id: vAlarmActiveList }
 
-    readonly property alias  backgroundColor: _alarmDialog.backgroundColor
+    readonly property alias  backgroundColor: _alarmDialog.titleBarBackground
     readonly property alias  textColor      : _alarmDialog.textColor
     readonly property string title          : vAlarmStatus.title
-    readonly property string message        : vAlarmStatus.message
     readonly property alias  isSilenced     : vAlarmStatus.alarm_Flag_alarmsSilenced
     readonly property alias  timeout        : vAlarmStatus.alarm_MuteTimeout
     readonly property alias  alarm_AlarmID  : vAlarmStatus.alarm_AlarmID
@@ -93,12 +92,6 @@
         _alarmBar       .visible = false
     }
 
-    Connections { target: _alarmDialog
-        function onMinimizeClicked              (        ) { if ( vAlarmStatus.alarm_Flag_noMinimize ) alarmList    (); else alarmMinimize(); }
-    }
-    Connections { target: _alarmListDialog
-        function onMinimizeClicked              (        ) { if ( vAlarmStatus.alarm_Flag_noMinimize ) alarmMaximize(); else alarmMinimize(); }
-    }
     Connections { target: _alarmBar
         function onListClicked                  (        ) { alarmList     () }
         function onMaximizeClicked              (        ) { alarmMaximize () }
@@ -121,8 +114,7 @@
 
         titleText           :   vAlarmStatus.title
         titlePixelSize      :   Fonts.fontPixelAlarmTitle
-        description         :   vAlarmStatus.message
-        descriptionPixelSize:   Fonts.fontPixelAlarmMessage
+        instructionModel    :   vAlarmStatus.instructions
         alarmID             :   vAlarmStatus.alarm_AlarmID
         isSilenced          :   vAlarmStatus.alarm_Flag_alarmsSilenced
         timeout             :   vAlarmStatus.alarm_MuteTimeout
@@ -131,13 +123,12 @@
         rinsebackVisible    : ! vAlarmStatus.alarm_Flag_noRinseback
         endVisible          : ! vAlarmStatus.alarm_Flag_noEndTreatment
         minVisible          : ! vAlarmStatus.alarm_Flag_noMinimize
-        titleFading         :   vTDOpMode.fault
-        countDown           :   vTreatmentStop.countDown
-        countDownVisible    :   vTDOpMode.inTreatment
+        countDown           :  vTreatmentStop.countDown
+        countDownVisible    :  vTDOpMode.inTreatment
                                 && (
                                     vTDTreatmentStates.txStop
-                                ||  vTDTreatmentStates.txRinseback
-                                ||  vTDTreatmentStates.txEnd
+                                    ||  vTDTreatmentStates.txRinseback
+                                    ||  vTDTreatmentStates.txEnd
                                     )
                                 && vTreatmentStop.total
 
@@ -146,14 +137,17 @@
         onRinsebackClicked  : vAlarmStatus.doUserActionRinseback()
         onEndClicked        : vAlarmStatus.doUserActionEnd      ()
         onOkClicked         : vAlarmStatus.doUserActionOk       ()
+        onListClicked       : alarmList                         ()
+        onMinimizeClicked   : alarmMinimize                     ()
     }
 
     AlarmListDialog { id : _alarmListDialog
         isSilenced          :   vAlarmStatus.alarm_Flag_alarmsSilenced
         timeout             :   vAlarmStatus.alarm_MuteTimeout
         minVisible          : ! vAlarmStatus.alarm_Flag_noMinimize
-        onMuteClicked       :   vAlarmStatus.doSilence()
-        titleFading         :   vTDOpMode.fault
+        onMuteClicked       : vAlarmStatus.doSilence()
+        onMinimizeClicked   : alarmMinimize()
+        onListClicked       : alarmMaximize()
     }
 
     Connections { target: vAlarmStatus