Index: sources/view/settings/VSettings.h
===================================================================
diff -u -r627b97843f87f5ca8fbd731c6c4a6d9fae4352ce -r6f2622be80fcaee8d71baf78404627381157970c
--- sources/view/settings/VSettings.h	(.../VSettings.h)	(revision 627b97843f87f5ca8fbd731c6c4a6d9fae4352ce)
+++ sources/view/settings/VSettings.h	(.../VSettings.h)	(revision 6f2622be80fcaee8d71baf78404627381157970c)
@@ -22,6 +22,7 @@
 #include "main.h"
 #include "MSettings.h"
 #include "VView.h"
+#include "StorageGlobals.h"
 
 namespace View {
 
@@ -36,12 +37,11 @@
     CONSTANT(QString        , groupFormat   , "%1^%2"   )
     PROPERTY(bool           , initialized   , false     )
     PROPERTY(QStringList    , categorys     , {}        )
-    PROPERTY(QVariantMap    , settings      , {}        )
-    PROPERTY(QVariantMap    , data          , {}        )
+    PROPERTY(QVariantMap    , instructions  , {}        )
 
-    SETTINGS(QString        , servicePass   ,"123"  , "Settings/System"     , "Service"     , "Password"                        )
-    SETTINGS(quint8         , alarmVolume   , 100   , "Settings/System"     , "Alarm"       , "Volume"                          )
-    SETTINGS(bool           , noCANBus      , false , "Development/NoCANBus", "Navigation"  , "Create Treatment To Patient ID"  )
+    SETTINGS(QString        , servicePass   ,"123"  , Storage::Settings_Category_SettingsSystem , "Service"     , "Password"                        )
+    SETTINGS(quint8         , alarmVolume   , 100   , Storage::Settings_Category_SettingsSystem , "Alarm"       , "Volume"                          )
+    SETTINGS(bool           , noCANBus      , false , Storage::Settings_Category_NoCANBus       , "Navigation"  , "Create Treatment To Patient ID"  )
 
     VIEW_DEC(VSettings, SettingsData)