Index: sources/view/settings/VSettings.h
===================================================================
diff -u -redb8ee3edc41b1d324cd8a53e8e27a2a58289563 -rcba8451ac737fb0b618173a4bea37411fdaaf824
--- sources/view/settings/VSettings.h	(.../VSettings.h)	(revision edb8ee3edc41b1d324cd8a53e8e27a2a58289563)
+++ sources/view/settings/VSettings.h	(.../VSettings.h)	(revision cba8451ac737fb0b618173a4bea37411fdaaf824)
@@ -30,11 +30,12 @@
 class VSettings : public QObject
 {
     Q_OBJECT
-
-    QString _location = QString(Storage::Settings_Category_InstructionsImagesLoc).arg(Storage::Settings_Path());
+    const QString _advancedPrefix   = "@";
+    const QString _hdfPrefix        = "$";
+    const QString _location = QString(Storage::Settings_Category_InstructionsImagesLoc).arg(Storage::Settings_Path());
     typedef QList<QStringList> TKeysList;
     typedef struct {
-        QString             location;
+        QString             title   ;
         TKeysList           keys    ;
         QVariantList        values  ;
     } TInstruction ;
@@ -58,17 +59,20 @@
 
     // TODO: This view needs modification and it needs to isolate the settings and have its own specific properties, not the complete settings exposed to QML and let QML access it.
     // Don't use QVariantHash, qml doesn't like it and won't show the values, *** and not even complains/errors ***.
-    CONSTANT(QString        , groupFormat   , "%1^%2"   )
+
     PROPERTY(bool           , initialized   , false     )
     PROPERTY(QStringList    , categorys     , {}        )
     PROPERTY(QVariantMap    , instructions  , {}        )
 
     PROPERTY(bool           , isDefaultServicePassword  , false     )
 
-    SETTINGS(QString        , servicePass   , ""    , Storage::Settings_Category_SettingsSystem , "Service"     , "Password"                        )
-    SETTINGS(quint8         , alarmVolume   , 5     , Storage::Settings_Category_SettingsSystem , "Alarm"       , "Volume"                          )
-    SETTINGS(bool           , roWaterMode   , false , Storage::Settings_Category_SettingsSystem , "RoWaterMode" , "RoWaterMode"                     )
-    SETTINGS(bool           , userMode      , false , Storage::Settings_Category_SettingsSystem , "UserMode"    , "UserMode"                        )
+    SETTINGS(QString        , servicePass           , ""    , Storage::Settings_Category_SettingsSystem , "Service"                 , "Password"                        )
+    SETTINGS(quint8         , alarmVolume           , 5     , Storage::Settings_Category_SettingsSystem , "Alarm"                   , "Volume"                          )
+    SETTINGS(bool           , roWaterMode           , false , Storage::Settings_Category_SettingsSystem , "Feature Configurations"  , "RoWaterMode"                     )
+    SETTINGS(bool           , integratedBPCuff      , false , Storage::Settings_Category_SettingsSystem , "Feature Configurations"  , "IntegratedBPCuff"                )
+    SETTINGS(bool           , heparinSyringePump    , false , Storage::Settings_Category_SettingsSystem , "Feature Configurations"  , "HeparinSyringePump"              )
+    SETTINGS(bool           , chemicalDisinfection  , false , Storage::Settings_Category_SettingsSystem , "Feature Configurations"  , "ChemicalDisinfection"            )
+    SETTINGS(bool           , advancedMode          , false , Storage::Settings_Category_SettingsSystem , "AdvancedMode"            , "AdvancedMode"                    )
 
     TRIGGER (bool           , encryptionPass, false )
 
@@ -77,8 +81,8 @@
 private:
     void      initConnectionsSettings();
 
-    TKeysList updateReplacements ( const QString &vGroup, const QStringList &vKeys                                  );
-    void      updateInstructions ( const QString &vGroup, const TKeysList   &vKeysList, const QVariantList &vValues );
+    TKeysList updateReplacements ( const QString &vGroup, const QStringList &vKeys                                                          );
+    void      updateInstructions ( const QString &vGroup, const TKeysList   &vKeysList, const QVariantList &vValues, const QString &vTitle  );
     void      updateInstructions ( const QString &vGroup );
 
     QString defaultPassword     ();
@@ -97,6 +101,12 @@
     void    updateServicePassword   (const QString &vPassword);
     void    checkServicePasswordSet ();
 
+    QString groupFormat (const QString &vFirst, const QString &vSecond = QString()) { return QString("%1%2").arg(_advancedMode ? _advancedPrefix : "")
+                                                                                                            .arg(vSecond.isEmpty() ?    QString("%1").arg(vFirst) :
+                                                                                                                                        QString("%1^%2").arg(vFirst, vSecond)); }
+
+    QString groupModalityFormat (const QString &vFirst, const bool &vHDF) { return QString("%1%2").arg(vHDF ? _hdfPrefix : "").arg(vFirst); }
+
 private slots:
     void onActionReceive (GuiActionType vAction, const QVariantList &vData);