Index: sources/gui/qml/components/BaseComboBox.qml
===================================================================
diff -u -rec53ffe0a1528ace958cfe347875b7bcd25bed57 -r5c054a624e9b8523b530691aa07735f34e20e01b
--- sources/gui/qml/components/BaseComboBox.qml	(.../BaseComboBox.qml)	(revision ec53ffe0a1528ace958cfe347875b7bcd25bed57)
+++ sources/gui/qml/components/BaseComboBox.qml	(.../BaseComboBox.qml)	(revision 5c054a624e9b8523b530691aa07735f34e20e01b)
@@ -79,7 +79,6 @@
             visible         : _delegate.down || _delegate.highlighted || _delegate.visualFocus
             color           : _delegate.down ?  Colors.backgroundButtonSelect :
                                                 Colors.backgroundButtonSelectDark
-            radius          : Variables.dialogRadius
         }
     }
 
Index: sources/gui/qml/components/TouchRect.qml
===================================================================
diff -u -r7360f85ae13ee2a460ddfb11bc455203d6edf3ff -r5c054a624e9b8523b530691aa07735f34e20e01b
--- sources/gui/qml/components/TouchRect.qml	(.../TouchRect.qml)	(revision 7360f85ae13ee2a460ddfb11bc455203d6edf3ff)
+++ sources/gui/qml/components/TouchRect.qml	(.../TouchRect.qml)	(revision 5c054a624e9b8523b530691aa07735f34e20e01b)
@@ -31,6 +31,7 @@
     //TODO need to update code to use bgColor instead of backgroundColor property
 //  property alias bgColor          : _root.color
     property alias textString       : _text.text
+    property alias textFont         : _text.font
 
     property bool  touchable        : true
     property bool  animated         : true
Index: sources/gui/qml/compounds/DryBicartDisconnect.qml
===================================================================
diff -u -r6c4840c01de76cc3d804c796aecd06d37438fc9c -r5c054a624e9b8523b530691aa07735f34e20e01b
--- sources/gui/qml/compounds/DryBicartDisconnect.qml	(.../DryBicartDisconnect.qml)	(revision 6c4840c01de76cc3d804c796aecd06d37438fc9c)
+++ sources/gui/qml/compounds/DryBicartDisconnect.qml	(.../DryBicartDisconnect.qml)	(revision 5c054a624e9b8523b530691aa07735f34e20e01b)
@@ -8,15 +8,15 @@
 ProcessStatusView { id: _root
     property bool isDialog: false
 
-    title               : _root.isDialog ? qsTr("Disconnect Dry Bicarbonate Cartridge") : qsTr("Bicarb Cartridge Options")
+    title               : _root.isDialog ? qsTr("Drain/Depressurize Dry Bicarbonate Cartridge") : qsTr("Dry Bicarbonate Cartridge Options")
     leftButtonText      : vTreatmentDryBicartDisconnect.drainInProgress ? qsTr("Cancel") : qsTr("Drain")
     centerButtonText    : qsTr("Depressurize")
     rightButtonText     : isDialog ? qsTr("Done") : ""
     leftButtonEnabled   : ! vTreatmentDryBicartDisconnect.depressurizeInProgress
     centerButtonEnabled : ! vTreatmentDryBicartDisconnect.depressurizeInProgress && ! vTreatmentDryBicartDisconnect.drainInProgress
     rightButtonEnabled  : ! vTreatmentDryBicartDisconnect.depressurizeInProgress && ! vTreatmentDryBicartDisconnect.drainInProgress
 
-    progressText        :   vTreatmentDryBicartDisconnect.drainInProgress           ? qsTr("Draining Bicart...")    :
+    progressText        :   vTreatmentDryBicartDisconnect.drainInProgress           ? qsTr("Draining Cartridge...")    :
                             vTreatmentDryBicartDisconnect.depressurizeInProgress    ? qsTr("Depressurizing...")     :
                             vTreatmentDryBicartDisconnect.progress >= vTreatmentDryBicartDisconnect.total &&
                             vTreatmentDryBicartDisconnect.total > 0                 ? qsTr("Complete")              : ""
@@ -42,8 +42,6 @@
         color           : Colors.offWhite
         font.pixelSize  : Fonts.fontPixelTextRectExtra
         font.weight     : Font.Medium
-        text            : qsTr("Disconnect your consumables per your clinic's instructions")
+        text            : qsTr("Drain or depressurize dry bicarbonate cartridge per your clinic's instructions")
     }
-
-
 }
Index: sources/gui/qml/dialogs/AlarmDialog.qml
===================================================================
diff -u -r0fc32e1796c9fe40ff0e83b4fe039be67ce6dd39 -r5c054a624e9b8523b530691aa07735f34e20e01b
--- sources/gui/qml/dialogs/AlarmDialog.qml	(.../AlarmDialog.qml)	(revision 0fc32e1796c9fe40ff0e83b4fe039be67ce6dd39)
+++ sources/gui/qml/dialogs/AlarmDialog.qml	(.../AlarmDialog.qml)	(revision 5c054a624e9b8523b530691aa07735f34e20e01b)
@@ -285,64 +285,69 @@
             onPressed   : resumeClicked()
             text.text   : qsTr("Resume")
             width       : _buttonGroup.buttonsWidth
-            isDefault   : vSettings.darkMode
+            isDefault   : true
             backgroundColor: Colors.transparent
             fgColor     : isPressed ? Colors.offWhite : _colorMode.modeAlarmButtonPressedColor
             selectColor : Qt.darker(borderColor, 1.15)
             pixelSize   : Fonts.fontPixelNotification
             borderColor : _colorMode.modeAlarmButtonColor
+            textFont.weight: Font.Medium
         }
 
         TouchRect { id  : _temporaryBreak
             visible     : temporaryBreakVisible
             onPressed   : temporaryBreakClicked()
             text.text   : qsTr("Temporary Break")
             width       : _buttonGroup.buttonsWidth
-            isDefault   : vSettings.darkMode
+            isDefault   : true
             backgroundColor: Colors.transparent
             fgColor     : isPressed ? Colors.offWhite : _colorMode.modeAlarmButtonPressedColor
             selectColor : Qt.darker(borderColor, 1.15)
             pixelSize   : Fonts.fontPixelNotification
             borderColor : _colorMode.modeAlarmButtonColor
+            textFont.weight: Font.Medium
         }
 
         TouchRect { id  : _rinsebackTouchRect
             visible     : rinsebackVisible
             onPressed   : rinsebackClicked()
             text.text   : qsTr("Return Blood & End Treatment")
             width       : _buttonGroup.buttonsWidth
-            isDefault   : vSettings.darkMode
+            isDefault   : true
             backgroundColor: Colors.transparent
             fgColor     : isPressed ? Colors.offWhite : _colorMode.modeAlarmButtonPressedColor
             selectColor : Qt.darker(borderColor, 1.15)
             pixelSize   : Fonts.fontPixelNotification
             borderColor : _colorMode.modeAlarmButtonColor
+            textFont.weight: Font.Medium
         }
 
         TouchRect { id  : _endTouchRect
             visible     : endVisible
             onPressed   : endClicked()
             text.text   : qsTr("End Treatment Only")
             width       : _buttonGroup.buttonsWidth
-            isDefault   : vSettings.darkMode
+            isDefault   : true
             backgroundColor: Colors.transparent
             fgColor     : isPressed ? Colors.offWhite : _colorMode.modeAlarmButtonPressedColor
             selectColor : Qt.darker(borderColor, 1.15)
             pixelSize   : Fonts.fontPixelNotification
             borderColor : _colorMode.modeAlarmButtonColor
+            textFont.weight: Font.Medium
         }
 
         TouchRect { id  : _okTouchRect
             visible     : okVisible
             onPressed   : okClicked()
             text.text   : qsTr("OK")
             width       : _buttonGroup.buttonsWidth
-            isDefault   : vSettings.darkMode
+            isDefault   : true
             backgroundColor: Colors.transparent
             fgColor     : isPressed ? Colors.offWhite : _colorMode.modeAlarmButtonPressedColor
             selectColor : Qt.darker(borderColor, 1.15)
             pixelSize   : Fonts.fontPixelNotification
             borderColor : _colorMode.modeAlarmButtonColor
+            textFont.weight: Font.Medium
         }
     }
 
Index: sources/gui/qml/main.qml
===================================================================
diff -u -ra796bf6ecbf985b00412db76fa81ad4f7a8b2dd2 -r5c054a624e9b8523b530691aa07735f34e20e01b
--- sources/gui/qml/main.qml	(.../main.qml)	(revision a796bf6ecbf985b00412db76fa81ad4f7a8b2dd2)
+++ sources/gui/qml/main.qml	(.../main.qml)	(revision 5c054a624e9b8523b530691aa07735f34e20e01b)
@@ -365,9 +365,9 @@
         readonly property color modeAutoStepProgressColor       : vSettings.darkMode ? Colors.borderButton              : Colors.statusTextPaused
         readonly property color modeTextColor                   : vSettings.darkMode ? Colors.offWhite                  : Colors.backgroundMainMenu
         readonly property color modeButtonColor                 : vSettings.darkMode ? Colors.borderButton              : Colors.backgroundMainMenu
-        readonly property color modeAlarmButtonColor            : vSettings.darkMode ? Colors.darkModeBackground        : Colors.lightModeSelect
+        readonly property color modeAlarmButtonColor            : vSettings.darkMode ? Colors.darkModeBackground        : Colors.offWhite
         readonly property color modeAlarmStepButtonColor        : vSettings.darkMode ? Colors.darkModeBackground        : Colors.offWhite
-        readonly property color modeAlarmButtonPressedColor     : vSettings.darkMode ? Colors.offWhite                  : Colors.lightModeSelect
+        readonly property color modeAlarmButtonPressedColor     : vSettings.darkMode ? Colors.offWhite                  : Colors.offWhite
         readonly property color modeAlarmListColor              : vSettings.darkMode ? Colors.offWhite                  : Colors.alarmDialogText
         readonly property color modeAlarmStopStateColor         : vSettings.darkMode ? Colors.darkModeAlarmStopState    : Colors.lightModeAlarmStopState
     }
Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreatePatientPrescription.qml
===================================================================
diff -u -r9c15c403ee00b776def3aaf8bfb32a3f8c6f2792 -r5c054a624e9b8523b530691aa07735f34e20e01b
--- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreatePatientPrescription.qml	(.../PreTreatmentCreatePatientPrescription.qml)	(revision 9c15c403ee00b776def3aaf8bfb32a3f8c6f2792)
+++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreatePatientPrescription.qml	(.../PreTreatmentCreatePatientPrescription.qml)	(revision 5c054a624e9b8523b530691aa07735f34e20e01b)
@@ -43,6 +43,7 @@
         _heparinRx.reset()
         vTreatmentCreate.ufPreWeight                    = vTreatmentRanges.weightDef
         vTreatmentCreate.ufEstimatedTargetWeight        = vTreatmentRanges.weightDef
+        vTreatmentCreate.patientID          = ""
 
         if ( _GuiView.dryDemoMode ) {
             vTreatmentCreate.hdfTreatmentModeSet        = true