Index: sources/gui/GuiGlobals.h
===================================================================
diff -u -rbc3fd305cbcfa47b0f535b68a9b022906d9a3797 -r4fd94e57fbbdb54c779f28ef50f0997e8eefee5f
--- sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision bc3fd305cbcfa47b0f535b68a9b022906d9a3797)
+++ sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision 4fd94e57fbbdb54c779f28ef50f0997e8eefee5f)
@@ -160,7 +160,7 @@
             ID_AdjustInitTreatmentRsp                   = 0x4600, // 70     //// ----- @LEAHIZED
             ID_AdjustParametersValidationReq            = 0x3F00, // 63     //// ----- @LEAHIZED
             ID_AdjustParametersValidationRsp            = 0x4000, // 64     //// ----- @LEAHIZED
-            ID_AdjustParametersConfirmReq               = 0x4400, // 68     //// ----- @LEAHIZED
+            ID_AdjustParametersConfirmReq               = 0x440F, // 68     //// ----- @LEAHIZED -> CRAPIZED OBSOLETE
             ID_TreatmentRanges                          = 0x4300, // 67     //// ----- @LEAHIZED
 
             // Pre-Treatment Water Sample
Index: sources/gui/qml/pages/MainStack.qml
===================================================================
diff -u -r07121b02499a4c929c5b5e8bd804a67539574c1b -r4fd94e57fbbdb54c779f28ef50f0997e8eefee5f
--- sources/gui/qml/pages/MainStack.qml	(.../MainStack.qml)	(revision 07121b02499a4c929c5b5e8bd804a67539574c1b)
+++ sources/gui/qml/pages/MainStack.qml	(.../MainStack.qml)	(revision 4fd94e57fbbdb54c779f28ef50f0997e8eefee5f)
@@ -61,7 +61,10 @@
     MainInitialization              { id: _postModeScreen                   }
 
     MainHome                        { id: _mainHome
-        onCreateTreatment               : { vPreTreatmentAdjustmentInitTreatment.doInitiate( )}
+        onCreateTreatment: function (vValue) {
+            vTreatmentCreate.treatmentModality = vValue
+            vPreTreatmentAdjustmentInitTreatment.doInitiate(                    )
+        }
     }
 
     Connections { target: vTDOpMode
Index: sources/gui/qml/pages/pretreatment/PreTreatmentBase.qml
===================================================================
diff -u -r07121b02499a4c929c5b5e8bd804a67539574c1b -r4fd94e57fbbdb54c779f28ef50f0997e8eefee5f
--- sources/gui/qml/pages/pretreatment/PreTreatmentBase.qml	(.../PreTreatmentBase.qml)	(revision 07121b02499a4c929c5b5e8bd804a67539574c1b)
+++ sources/gui/qml/pages/pretreatment/PreTreatmentBase.qml	(.../PreTreatmentBase.qml)	(revision 4fd94e57fbbdb54c779f28ef50f0997e8eefee5f)
@@ -34,11 +34,9 @@
 
     // update model for instruction based steps
     function updateModel () {
-        let  stepName = stepNames[stackStepIndex]
-        if ( stepName === undefined ) stepName = ""
+        let stepName = stepNames[stackStepIndex] ?? ""
+        let group    = vSettings.groupFormat(stepName, vSettings.advancedMode || _root.subStepName.length === 0 ? "" : _root.subStepName )
 
-        let group = vSettings.groupFormat(stepName, vSettings.advancedMode || _root.subStepName.length === 0 ? "" : _root.subStepName )
-
         let instructionsGroup    = vSettings.instructions[group]
 
         if ( instructionsGroup !== undefined ) {
Index: sources/gui/qml/pages/treatment/TreatmentTrends.qml
===================================================================
diff -u -r07121b02499a4c929c5b5e8bd804a67539574c1b -r4fd94e57fbbdb54c779f28ef50f0997e8eefee5f
--- sources/gui/qml/pages/treatment/TreatmentTrends.qml	(.../TreatmentTrends.qml)	(revision 07121b02499a4c929c5b5e8bd804a67539574c1b)
+++ sources/gui/qml/pages/treatment/TreatmentTrends.qml	(.../TreatmentTrends.qml)	(revision 4fd94e57fbbdb54c779f28ef50f0997e8eefee5f)
@@ -442,7 +442,7 @@
                 }
             }
 
-            ScrollBar2 { id: _scrollbar
+            ScrollBarVH { id: _scrollbar
                 objectName: "_scrollbar"
                 anchors {
                     bottom          : parent.bottom
@@ -453,7 +453,7 @@
                     rightMargin     : Variables.defaultMargin
                 }
                 height      : 5
-                direction   : ScrollBar2.Horizontal
+                direction   : ScrollBarVH.Horizontal
                 scrollColor : "#606060"
                 flickable   : _paramList
                 opacity     : _paramList.count > _paramList.visibleParamCount
@@ -676,7 +676,7 @@
                 onModelCountChanged: { positionViewAtBeginning() }
             }
 
-            ScrollBar2 { id: _historyScrollbar
+            ScrollBarVH { id: _historyScrollbar
                 objectName: "_historyScrollbar"
                 anchors {
                     top         : _historyList.top
@@ -686,7 +686,7 @@
                 }
                 width       : 5
                 scrollColor : "#606060"
-                direction   : ScrollBar2.Vertical
+                direction   : ScrollBarVH.Vertical
                 flickable   : _historyList
                 opacity     : _historyList.contentHeight > _historyList.height
                                 || _historyList.flicking || _historyList.dragging ? 1 : 0