Index: sources/gui/qml/globals/Variables.qml
===================================================================
diff -u -rc6cfb5043fc9c29cc039e36915368bcd3a63baa6 -r5e3b27057e9c7dedf9c46e3881609b7e96c3fb71
--- sources/gui/qml/globals/Variables.qml	(.../Variables.qml)	(revision c6cfb5043fc9c29cc039e36915368bcd3a63baa6)
+++ sources/gui/qml/globals/Variables.qml	(.../Variables.qml)	(revision 5e3b27057e9c7dedf9c46e3881609b7e96c3fb71)
@@ -23,6 +23,8 @@
  * which is going to be used in the project.
  */
 QtObject {
+    readonly property int keybardAnimationDuration              : 200
+
     readonly property int applicationWidth                      : 1280
     readonly property int applicationHeight                     : 800
     readonly property int buttonSpacing                         : 150
@@ -95,7 +97,7 @@
 
     readonly property int pauseIconDiameter                     : 60
     readonly property int topBarMenuHeight                      : 100
-    readonly property int sliderCircleDiameter                  : 25
+    readonly property int sliderCircleDiameter                  : 30
 
     readonly property int pressuresProgressbarWidth             : 725
     
@@ -123,12 +125,46 @@
     readonly property int notificationBarIconHeight             : 30
     readonly property int notificationBarIconWidth              : 30
 
+    readonly property int rinsebackIconDiameterDefault          : 85
+    readonly property int rinsebackIconDiameterResumePause      : 110
+
+    readonly property int settingsArrowHeight                   : 30
+    readonly property int settingsArrowWidth                    : 24
+    readonly property int settingsButtonWidth                   : 300
+    readonly property int settingsButtonHeight                  : 85
+    readonly property int settingsMargin                        : 75
+    readonly property int settingsSpacing                       : 20
+    readonly property int settingsInputWidth                    : 225
+
+    readonly property int settingsNotificationMargin            : 10
+
+    readonly property int settingsBLEListViewWidth              : 360
+    readonly property int settingsBLEItemRightMargin            : 20
+    readonly property int settingsBLEButtonWidth                : settingsButtonWidth
+    readonly property int settingsBLEButtonHeight               : settingsButtonHeight
+    readonly property int settingsBLEMargin                     : settingsMargin
+    readonly property int settingsBLEListViewMargin             : 25
     readonly property int settingsOptionWidth                   : 550
     readonly property int settingsOptionHeight                  : 50
 
-    readonly property int rinsebackIconDiameterDefault          : 85
-    readonly property int rinsebackIconDiameterResumePause      : 110
+    readonly property int settingsWIFIButtonWidth               : settingsButtonWidth
+    readonly property int settingsWIFIButtonHeight              : settingsButtonHeight
+    readonly property int settingsWIFIMargin                    : settingsMargin
+    readonly property int settingsWIFIInputWidth                : settingsInputWidth
+    readonly property int settingsWIFISpacing                   : settingsSpacing
+    readonly property int settingsWIFINetworkHeight             : 85
+    readonly property int settingsWIFINetworkWidth              : 375
+    readonly property int settingsWIFINetworksWidth             : settingsWIFINetworkWidth + 50
+    readonly property int settingsWIFIBottomMargin              : 15
 
+    readonly property int textInputWidth                        : 350
+    readonly property int textInputHeight                       : 50
+    readonly property int textInputLineWidth                    : 100
+
+    readonly property int settingsDateTimeSetMargin             : settingsMargin
+    readonly property int settingsDateTimeSetSpacing            : settingsSpacing
+    readonly property int settingsDateTimeSetInputWidth         : settingsInputWidth
+
     // ---------- < PRS > Related Section ----------
     // Min/Max
     readonly property int     bloodFlowMin          : 100
@@ -181,18 +217,25 @@
 
     // Units
     // - Ultrafiltration
-    readonly property string unitTextUltrafiltrationRate    : qsTr("mL/min")
-    readonly property string unitTextUltrafiltrationVolume  : qsTr("(L)")
-    readonly property string unitTextTreatmentDuration      : qsTr("min")
+    readonly property string unitTextUltrafiltrationRate    : unitTextFlowRate
+    readonly property string unitTextUltrafiltrationVolume  : unitTextVolume
+    // - Duration/Interval
+    readonly property string unitTextDuration               : qsTr("min")
     // - Flows
     readonly property string unitTextFlowRate               : qsTr("mL/min")
+    readonly property string unitTextDispencingRate         : qsTr("mL/hr")
     // - Vitals
     readonly property string unitTextBloodPressure          : qsTr("mmHg")
     readonly property string unitTextHeartBeat              : qsTr("BPM" )
     // - Fluid
-    readonly property string unitTextFluid                      : qsTr("mL")
-    readonly property string unitTextSaline                     : unitTextFluid
-    readonly property string unitTextHeparin                    : unitTextFluid
-    // - Create Treatment
-    readonly property string unitTextBPMeasurementInterval      : qsTr("min")
+    readonly property string unitTextVolume                 : qsTr("(L)")
+    readonly property string unitTextFluid                  : qsTr("mL")
+    readonly property string unitTextSaline                 : unitTextFluid
+    readonly property string unitTextHeparin                : unitTextFluid
+    // - Temperature
+    readonly property string unitTextTemperature            : qsTr("°C")
+    // Concentration
+    readonly property string unitTextConcentration          : qsTr("mEg/L")
+    readonly property string unitTextHeparinConcentration   : qsTr("IU/mL")
+
 }