diff --git a/README.md b/README.md
index 488d4be..5e17eac 100644
--- a/README.md
+++ b/README.md
@@ -63,49 +63,51 @@ A pipeline to integrate “legacy” datasets into a Human Connectome Project (H
             - channel_layout_name  -->
 
 ## Compute Headmodel process [[File]](https://github.com/CCC-members/CiftiStorm/blob/master/cfs_properties/process_comp_headmodel.json)
-### Default parameter configuration
-    - radii          --> Default: [0.88,0.93,1]
-    - conductivity   --> Default: [0.33,0.0042,0.33]
-    - BemNames       --> Default: ["Scalp","Skull","Brain"]
-    - BemCond        --> Default: [1,0.0125,1]
-    - BemSelect      --> Default: [true,true,true]
+### Default parameter configuration    
     - Method      --> Recommended options EEG=<<openmeeg>> MEG=<<os_meg>>. Others options <<meg_sphere>> <<eeg_3sphereberg>> <<duneuro>> 
         - value   --> 
-    - method_type        -->
-        - openmeeg
-            - EEGMethod        -->
-            - isAdjoint        -->
-            - isAdaptative     -->
-            - isSplit          -->
-            - SplitLength      -->
-        - os_meg
-            - MEGMethod        -->
-        - duneuro
-            - FemCond          --> Default: [1.79,0.0080,0.43]
-            - FemSelect        --> Default: [1,1,1]
-            - Isotropic        --> Default: 1
-            - UseTensor        --> Default: 0
-            - FemMesh          -->
-                - Method       --> <<iso2mesh>> <<brain2mesh>> <<simnibs>> <<roast>> <<fieldtrip>>
-                    - value    --> Default:iso2mesh
-                - MeshType     --> iso2mesh=<<tetrahedral>>.  simnibs=<<tetrahedral>>. roast=<<hexahedral>>|<<tetrahedral>>.  fieldtrip=<<hexahedral>>|<<tetrahedral>>
-                    - value    --> Default: tetrahedral
-                - MaxVol       --> iso2mesh Max tetrahedral volume (10=coarse, 0.0001=fine)
-                    - value    --> Default: 0.1
-                - KeepRatio    --> iso2mesh Percentage of elements kept (1-100%)
-                    - value    --> Default: 100
-                - MergeMethod  --> iso2mesh <<mergemesh>>|<<mergesurf>> Function used to merge the meshes
-                    - value    --> Default: mergesurf
-                - VertexDensity--> SimNIBS <<0.1 - X>> setting the vertex density (nodes per mm2)  of the surface meshes
-                    - value    --> Default: 0.5
-                - NbVertices   --> SimNIBS Number of vertices for the cortex surface imported from CAT12
-                    - value    --> Default: 15000
-                - NodeShift    --> FieldTrip <<0 - 0.49>> Improves the geometrical properties of the mesh
-                    - value    --> Default: 0.3
-                - Downsample   --> FieldTrip Integer, Downsampling factor to apply to the volumes before meshing
-                    - value    --> Default: 3
-                - Zneck        --> Input T1/T2: Cut volumes below neck (MNI Z-coordinate)
-                    - value    --> Default: -115
+        - methods        -->
+            - meg_sphere
+                - MEGMethod        -->
+            - os_meg
+                - MEGMethod        -->
+            - eeg_3sphereberg
+                - EEGMethod        -->
+            - openmeeg
+                - BemNames         --> Default: ["Scalp","Skull","Brain"]
+                - BemCond          --> Default: [1,0.0125,1]
+                - BemSelect        --> Default: [true,true,true]
+                - EEGMethod        -->
+                - isAdjoint        -->
+                - isAdaptative     -->
+                - isSplit          -->
+                - SplitLength      -->
+            - duneuro
+                - FemCond          --> Default: [1.79,0.0080,0.43]
+                - FemSelect        --> Default: [1,1,1]
+                - Isotropic        --> Default: 1
+                - UseTensor        --> Default: 0
+                - FemMesh          -->
+                    - Method       --> <<iso2mesh>> <<brain2mesh>> <<simnibs>> <<roast>> <<fieldtrip>>
+                        - value    --> Default:iso2mesh
+                    - MeshType     --> iso2mesh=<<tetrahedral>>.  simnibs=<<tetrahedral>>. roast=<<hexahedral>>|<<tetrahedral>>.  fieldtrip=<<hexahedral>>|<<tetrahedral>>
+                        - value    --> Default: tetrahedral
+                    - MaxVol       --> iso2mesh Max tetrahedral volume (10=coarse, 0.0001=fine)
+                        - value    --> Default: 0.1
+                    - KeepRatio    --> iso2mesh Percentage of elements kept (1-100%)
+                        - value    --> Default: 100
+                    - MergeMethod  --> iso2mesh <<mergemesh>>|<<mergesurf>> Function used to merge the meshes
+                        - value    --> Default: mergesurf
+                    - VertexDensity--> SimNIBS <<0.1 - X>> setting the vertex density (nodes per mm2)  of the surface meshes
+                        - value    --> Default: 0.5
+                    - NbVertices   --> SimNIBS Number of vertices for the cortex surface imported from CAT12
+                        - value    --> Default: 15000
+                    - NodeShift    --> FieldTrip <<0 - 0.49>> Improves the geometrical properties of the mesh
+                        - value    --> Default: 0.3
+                    - Downsample   --> FieldTrip Integer, Downsampling factor to apply to the volumes before meshing
+                        - value    --> Default: 3
+                    - Zneck        --> Input T1/T2: Cut volumes below neck (MNI Z-coordinate)
+                        - value    --> Default: -115
 
 ## Run CiftiStorm
 * Open CiftiStorm pipeline on Matlab
diff --git a/cfs_properties/defaults/process_comp_headmodel.json b/cfs_properties/defaults/process_comp_headmodel.json
index 6301245..bbb4997 100644
--- a/cfs_properties/defaults/process_comp_headmodel.json
+++ b/cfs_properties/defaults/process_comp_headmodel.json
@@ -2,114 +2,114 @@
     "description":"",
     "Method":{
         "description":"Recommended options EEG=<<openmeeg>> MEG=<<os_meg>>. Others options <<meg_sphere>> <<eeg_3sphereberg>> <<duneuro>> ",
-        "value":"openmeeg"
-    },
-    "method_type":[
-        {
-            "name":"meg_sphere",
-            "description":"",
-            "MEGMethod":"meg_sphere"
-        },
-        {
-            "name":"os_meg",
-            "description":"",
-            "MEGMethod":"os_meg"
-        },
-        {
-            "name":"eeg_3sphereberg",
-            "description":"",
-            "EEGMethod":"eeg_3sphereberg"
-        },
-        {
-            "name":"openmeeg",
-            "description":"",
-            "EEGMethod":"openmeeg",
-            "BemNames":["Scalp","Skull","Brain"],
-            "BemCond":[1,0.0125,1],
-            "BemSelect":[true,true,true],
-            "isAdjoint":false,
-            "isAdaptative":true,
-            "isSplit":false,
-            "SplitLength":4000
-        },
-        {
-            "name":"duneuro",
-            "description":"",
-            "EEGMethod":"duneuro",
-            "FemCond":[1.79,0.008,0.43],
-            "FemSelect":[true,true,true],
-            "Isotropic":true,
-            "UseTensor":false,
-            "FemMesh":{
-                "Method":{
-                    "description":"<<iso2mesh-2021>> <<iso2mesh>> <<brain2mesh>> <<simnibs3>> <<simnibs4>> <<fieldtrip>>",
-                    "value":"iso2mesh-2021"
-                },
-                "Methods":[
-                    {
-                        "name":"iso2mesh-2021",
-                        "MergeMethod":{
-                            "description":"iso2mesh <<mergemesh>>|<<mergesurf>> Function used to merge the meshes",
-                            "value":"mergesurf"
-                        },
-                        "MaxVol":{
-                            "description":"Default <<0.1>>. iso2mesh Max tetrahedral volume (10=coarse - 0.0001=fine)",
-                            "value":0.1
-                        },
-                        "KeepRatio":{
-                            "description":"Default <<100>>. iso2mesh Percentage of elements kept (1-100%)",
-                            "value":100
-                        }
+        "value":"openmeeg",
+        "methods":[
+            {
+                "name":"meg_sphere",
+                "description":"",
+                "MEGMethod":"meg_sphere"
+            },
+            {
+                "name":"os_meg",
+                "description":"",
+                "MEGMethod":"os_meg"
+            },
+            {
+                "name":"eeg_3sphereberg",
+                "description":"",
+                "EEGMethod":"eeg_3sphereberg"
+            },
+            {
+                "name":"openmeeg",
+                "description":"",
+                "EEGMethod":"openmeeg",
+                "BemNames":["Scalp","Skull","Brain"],
+                "BemCond":[1,0.0125,1],
+                "BemSelect":[true,true,true],
+                "isAdjoint":false,
+                "isAdaptative":true,
+                "isSplit":false,
+                "SplitLength":4000
+            },
+            {
+                "name":"duneuro",
+                "description":"",
+                "EEGMethod":"duneuro",
+                "FemCond":[1.79,0.008,0.43],
+                "FemSelect":[true,true,true],
+                "Isotropic":true,
+                "UseTensor":false,
+                "FemMesh":{
+                    "Method":{
+                        "description":"<<iso2mesh-2021>> <<iso2mesh>> <<brain2mesh>> <<simnibs3>> <<simnibs4>> <<fieldtrip>>",
+                        "value":"iso2mesh-2021"
                     },
-                    {
-                        "name":"iso2mesh",
-                        "MergeMethod":{
-                            "description":"iso2mesh <<mergemesh>>|<<mergesurf>> Function used to merge the meshes",
-                            "value":"mergesurf"
+                    "Methods":[
+                        {
+                            "name":"iso2mesh-2021",
+                            "MergeMethod":{
+                                "description":"iso2mesh <<mergemesh>>|<<mergesurf>> Function used to merge the meshes",
+                                "value":"mergesurf"
+                            },
+                            "MaxVol":{
+                                "description":"Default <<0.1>>. iso2mesh Max tetrahedral volume (10=coarse - 0.0001=fine)",
+                                "value":0.1
+                            },
+                            "KeepRatio":{
+                                "description":"Default <<100>>. iso2mesh Percentage of elements kept (1-100%)",
+                                "value":100
+                            }
                         },
-                        "MaxVol":{
-                            "description":"Default <<0.1>>. iso2mesh Max tetrahedral volume (10=coarse - 0.0001=fine)",
-                            "value":0.1
+                        {
+                            "name":"iso2mesh",
+                            "MergeMethod":{
+                                "description":"iso2mesh <<mergemesh>>|<<mergesurf>> Function used to merge the meshes",
+                                "value":"mergesurf"
+                            },
+                            "MaxVol":{
+                                "description":"Default <<0.1>>. iso2mesh Max tetrahedral volume (10=coarse - 0.0001=fine)",
+                                "value":0.1
+                            },
+                            "KeepRatio":{
+                                "description":"Default <<100>>. iso2mesh Percentage of elements kept (1-100%)",
+                                "value":100
+                            }
                         },
-                        "KeepRatio":{
-                            "description":"Default <<100>>. iso2mesh Percentage of elements kept (1-100%)",
-                            "value":100
-                        }
-                    },
-                    {
-                        "name":"brain2mesh"
-                    },
-                    {
-                        "name":"simnibs3",
-                        "VertexDensity":{
-                            "description":"SimNIBS <<0.1 - X>> setting the vertex density (nodes per mm2)  of the surface meshes",
-                            "value":0.5
+                        {
+                            "name":"brain2mesh"
                         },
-                        "NbVertices":{
-                            "description":"SimNIBS Number of vertices for the cortex surface imported from CAT12",
-                            "value":15000
-                        }
-                    },
-                    {
-                        "name":"simnibs4",
-                        "NbVertices":{
-                            "description":"SimNIBS Number of vertices for the cortex surface imported from CAT12",
-                            "value":15000
-                        }
-                    },
-                    {
-                        "name":"fieldtrip",
-                        "Downsample":{
-                            "description":"FieldTrip Integer, Downsampling factor to apply to the volumes before meshing",
-                            "value":3
+                        {
+                            "name":"simnibs3",
+                            "VertexDensity":{
+                                "description":"SimNIBS <<0.1 - X>> setting the vertex density (nodes per mm2)  of the surface meshes",
+                                "value":0.5
+                            },
+                            "NbVertices":{
+                                "description":"SimNIBS Number of vertices for the cortex surface imported from CAT12",
+                                "value":15000
+                            }
+                        },
+                        {
+                            "name":"simnibs4",
+                            "NbVertices":{
+                                "description":"SimNIBS Number of vertices for the cortex surface imported from CAT12",
+                                "value":15000
+                            }
                         },
-                        "NodeShift":{
-                            "description":"FieldTrip <<0 - 0.49>> Improves the geometrical properties of the mesh",
-                            "value":0.3
+                        {
+                            "name":"fieldtrip",
+                            "Downsample":{
+                                "description":"FieldTrip Integer, Downsampling factor to apply to the volumes before meshing",
+                                "value":3
+                            },
+                            "NodeShift":{
+                                "description":"FieldTrip <<0 - 0.49>> Improves the geometrical properties of the mesh",
+                                "value":0.3
+                            }
                         }
-                    }
-                ]
+                    ]
+                }
             }
-        }
-    ]
+        ]
+    }
 }
\ No newline at end of file
diff --git a/cfs_properties/defaults/process_import_anat.json b/cfs_properties/defaults/process_import_anat.json
index affd7cd..dc989e8 100644
--- a/cfs_properties/defaults/process_import_anat.json
+++ b/cfs_properties/defaults/process_import_anat.json
@@ -1,18 +1,18 @@
 {
     "description":"",
     "anatomy_type":{
-        "description":"Select the type of anatomy to use. <<1>> Brainstorm default anatomy. <<2>> HCP anatomy as Template <<3>> HCP individual anatomy",
-        "type":2,
+        "description":"Select the type of anatomy to use. <<template>> Brainstorm default anatomy. <<individual>> HCP individual anatomy",
+        "type":"individual",
         "type_list":[
             {
-                "id":1,
+                "id":"default",
                 "name":"default_anatomy",
                 "description":"Select the group and name of the sensor layout. See app/bst_default_anatomy.json file and select all params from there",
-                "template_name":"ICBM152_2023",
+                "template_name":"ICBM152_2023b",
                 "default_atlas":"Desikan-Killiany"
             },
             {
-                "id":2,
+                "id":"individual",
                 "name":"hcp_anat_individual",
                 "description":"",
                 "base_path":"/mnt/Store/Data/CHBM/Test/Ciftify",
@@ -33,11 +33,11 @@
         },
         "layer_desc":{
             "description":"Layer descriptor. Options <<white>> OR <<midthickness>> OR <<pial>> OR <<bigbrain>> multilayer like bigbrain OR <<fs_LR>> like HCP FSAve (three layers).",
-            "desc":"midthickness"
+            "desc":"Midthickness"
         },
         "surfaces_resolution":{
             "description":"Numbers of vertices for downsample the surfaces: default <<8000>>",
             "nvertices":8000
         }
     }
-}
+}
\ No newline at end of file
diff --git a/cfs_properties/defaults/process_import_channel.json b/cfs_properties/defaults/process_import_channel.json
index 21d97e9..dc2bb6d 100644
--- a/cfs_properties/defaults/process_import_channel.json
+++ b/cfs_properties/defaults/process_import_channel.json
@@ -1,22 +1,22 @@
 {
     "description":"",
     "channel_type":{
-        "description":"Select the type of import channel process to be used. <<1>> Use raw data. <<2>> Use BST default template ",
-        "type":2,
+        "description":"Select the type of import channel process to be used. <<raw>> Use raw data. <<default>> Use BST default template ",
+        "type":"default",
         "type_list":[
             {
-                "id":1,
+                "id":"raw",
                 "name":"raw_data",
                 "description":"",
                 "subID_prefix":"",
-                "base_path":"/mnt/Store/Data/Conectome/Sample/SubID",
+                "base_path":"/mnt/Store/Data/Conectome/Sample",
                 "file_location":"meg/SubID/unprocessed/MEG/5-Restin/4D/c,rfDC",
                 "data_format":"4D",
                 "group_layout_name":"",
                 "channel_layout_name":""
             },
             {
-                "id":2,
+                "id":"default",
                 "name":"import_channel",
                 "description":"Select the group and name of the sensor layout. See bst_defaults/bst_eeg_layouts.json file and select all params from there",
                 "group_layout_name":"ICBM152",
@@ -24,5 +24,5 @@
             }
         ]
     },
-    "channel_label_file":""
+    "channel_label_file":""  
 }
\ No newline at end of file
diff --git a/cfs_properties/functions/cfs_create_db.m b/cfs_properties/functions/cfs_create_db.m
new file mode 100644
index 0000000..32a1dc8
--- /dev/null
+++ b/cfs_properties/functions/cfs_create_db.m
@@ -0,0 +1,31 @@
+function cfs_create_db()
+app.ciftistormDir = fullfile(getUserDir(),'.CiftiStorm');
+if(~isfolder(app.ciftistormDir))
+    mkdir(app.ciftistormDir);
+end
+%% Defaults
+if(~isfolder(fullfile(app.ciftistormDir,'defaults')))
+    mkdir(fullfile(app.ciftistormDir,'defaults'));
+end
+if(~isfolder(fullfile(app.ciftistormDir,'defaults','anatomy')))
+    mkdir(fullfile(app.ciftistormDir,'defaults','anatomy'));
+end
+if(~isfolder(fullfile(app.ciftistormDir,'defaults','eeg')))
+    mkdir(fullfile(app.ciftistormDir,'defaults','eeg'));
+    mkdir(fullfile(app.ciftistormDir,'defaults','eeg','Colin27'));
+    mkdir(fullfile(app.ciftistormDir,'defaults','eeg','ICBM152'));
+    mkdir(fullfile(app.ciftistormDir,'defaults','eeg','NotAligned'));
+end
+if(~isfolder(fullfile(app.ciftistormDir,'defaults','meg')))
+    mkdir(fullfile(app.ciftistormDir,'defaults','meg'));
+end
+
+%% Datasets
+if(~isfolder(fullfile(app.ciftistormDir,'Datasets')))
+    mkdir(fullfile(app.ciftistormDir,'Datasets'));
+end
+if(~isfile(fullfile(app.ciftistormDir,'Datasets','Datasets.json')))
+    saveJSON([],fullfile(app.ciftistormDir,'Datasets','Datasets.json'));
+end
+end
+
diff --git a/cfs_properties/functions/cfs_get.m b/cfs_properties/functions/cfs_get.m
index 961c0e0..9a200eb 100644
--- a/cfs_properties/functions/cfs_get.m
+++ b/cfs_properties/functions/cfs_get.m
@@ -9,13 +9,16 @@
 % Get required context structure
 switch contextName
     case 'cfs_dir'
-        output1 = fullfile(getUserDir(),'.ciftistorm');
+        output1 = fullfile(getUserDir(),'.CiftiStorm');
     case 'defaults_dir'
-        cfs_db_dir = fullfile(getUserDir(),'.ciftistorm');
+        cfs_db_dir = fullfile(getUserDir(),'.CiftiStorm');
         output1 =  fullfile(cfs_db_dir,'defaults','anatomy');
         output2 =  fullfile(cfs_db_dir,'defaults','eeg');
         output3 =  fullfile(cfs_db_dir,'defaults','meg');
-    case 'dataset'
+    case 'datasets'
+        cfs_db_dir = fullfile(getUserDir(),'.CiftiStorm');
+        datasets_file =  fullfile(cfs_db_dir,'Datasets','Datasets.json');
+        output1 = jsondecode(fileread(datasets_file));
 
     case 'bst_default_eeg'
         output1 = 'https://github.com/brainstorm-tools/brainstorm3/raw/master/defaults/eeg';
diff --git a/cfs_properties/functions/check_properties.m b/cfs_properties/functions/check_properties.m
index a9736da..2499cb8 100644
--- a/cfs_properties/functions/check_properties.m
+++ b/cfs_properties/functions/check_properties.m
@@ -25,13 +25,6 @@
     disp('-->> Process stopped!!!');
     return;
 end
-if(~isempty(general_params.colormap) && ~isequal(general_params.colormap,'none') && ~isfile(general_params.colormap))
-    status = false;
-    fprintf(2,'\n-->> Error: Do not exist the colormap file defined in selected dataset configuration file.\n');
-    disp(general_params.colormap);
-    disp('-->> Process stopped!!!');
-    return;
-end
 if(~isfolder(general_params.bst_config.bst_path)...
         || ~isfile(fullfile(general_params.bst_config.bst_path,'brainstorm.m')))
     fprintf(2,"\n ->> Error: The selected Brainstorm path is wrong. \n");
@@ -95,26 +88,15 @@
     disp("--------------------------------------------------------------------------");
     disp('-->> Checking anatomy params');
     anat_params = properties.anatomy_params;
-    if(isempty(anat_params.anatomy_type.type)...
-            && ~isequal(anat_params.anatomy_type.type,1)...
-            && ~isequal(anat_params.anatomy_type.type,2)...
-            && ~isequal(anat_params.anatomy_type.type,3))
-        fprintf(2,"\n ->> Error: The anatomy type have to be <<1>>, <<2>>, or <<3>>. \n");
-        disp('1: For use default anatomy type.');
-        disp('2: For use HCP anatomy as template.');
-        disp('3: For use HCP individual anatomy.');
-        status = false;
-        disp('-->> Process stopped!!!');
-        return;
-    end
+    
     % Check default template configuration
-    if(isequal(anat_params.anatomy_type.type,1))
+    if(isequal(lower(anat_params.anatomy_type.id),'template'))
         disp("--------------------------------------------------------------------------");
         disp('-->> Checking template configuration');
-        selected_anatomy = anat_params.anatomy_type.type_list{1};
+        selected_anatomy = anat_params.anatomy_type;
         template_name = selected_anatomy.template_name;
         defaults = jsondecode(fileread(fullfile('bst_defaults','bst_default_anatomy.json')));
-        if(~contains(template_name, {defaults.name}))
+        if(~contains(template_name, {defaults.Name}))
             fprintf(2,strcat('\nBC-V-->> Error: The selected template name in process_import_anat.json is wrong \n'));
             disp(strcat("Name: ",template_name));
             disp(strcat("Please check the available anatomy templates in bst_template/bst_default_anatomy.json file"));
@@ -123,69 +105,12 @@
             return;
         end
     end
-    % Check HCP template configuration
-    if(isequal(anat_params.anatomy_type.type,2))
-        disp("--------------------------------------------------------------------------");
-        disp('-->> Checking template configuration');
-        selected_anatomy = anat_params.anatomy_type.type_list{2};
-        template_name = selected_anatomy.template_name;
-        if(isempty(template_name))
-            fprintf(2,'The HCP template name can not be empty.\n');
-            disp('Please type a HCP Template name.');
-            status = false;
-            disp('-->> Process stopped!!!');
-            return;
-        end
-        base_path = selected_anatomy.base_path;
-        if(~isfolder(fullfile(base_path)))
-            fprintf(2,'The HCP template base_path is not a folder.\n');
-            disp('Please select a correct HCP Template folder in the process_import_anat.json configuration file.');
-            status = false;
-            disp('-->> Process stopped!!!');
-            return;
-        end
-        if(~isfolder(fullfile(base_path,template_name)))
-            fprintf(2,strcat("There is no folder with <<",template_name,">> in the selected HCP Template folder.\n"));
-            disp('Please select a correct HCP Template folder or check the Template name filed.');
-            status = false;
-            disp('-->> Process stopped!!!');
-            return;
-        end
-        anat_path = fullfile(base_path,template_name,strrep(selected_anatomy.HCP_anat_path,'SubID',template_name), 'T1w');
-        checked = check_HCP_anat_structure(anat_path, template_name, selected_anatomy);
-        if(~checked)
-            fprintf(2,strcat("The folder <<",template_name,">> is not an HCP Template folder.\n"));
-            disp('Please select a correct HCP Template folder or check the Template name filed.');
-            status = false;
-            disp('-->> Process stopped!!!');
-            return;
-        end
-        % Check non brain surfaces configuration
-        disp("--------------------------------------------------------------------------");
-        disp('-->> Checking non brain surfaces configuration');
-        non_brain = anat_params.non_brain_surfaces;
-        base_path = non_brain.base_path;
-        if(~isfolder(fullfile(base_path)))
-            fprintf(2,'The Non-brain surfaces base_path is not a folder.\n');
-            disp('Please select a Non-brain surfaces folder in the process_import_anat.json configuration file.');
-            status = false;
-            disp('-->> Process stopped!!!');
-            return;
-        end
-        checked = check_non_brain_surfaces(base_path,template_name);
-        if(~checked)
-            fprintf(2,'The Non-brain selected folder is not a FSL Bet command output.\n');
-            disp('Please correct the Non-brain surfaces folder in the process_import_anat.json configuration file.');
-            status = false;
-            disp('-->> Process stopped!!!');
-            return;
-        end
-    end
+   
     % Check HCP individual configuration
-    if(isequal(anat_params.anatomy_type.type,3))
+    if(isequal(lower(anat_params.anatomy_type.id),'individual'))
         disp("--------------------------------------------------------------------------");
         disp('-->> Checking HCP anatomy configuration');
-        selected_anatomy = anat_params.anatomy_type.type_list{3};        
+        selected_anatomy = anat_params.anatomy_type;        
         SubID = 'SubID';
         base_path = strrep(selected_anatomy.base_path,SubID,'');
         if(~isfolder(fullfile(base_path)))
@@ -310,8 +235,8 @@
     disp("--------------------------------------------------------------------------");
     disp('-->> Checking surface resolution');
     surf_resol = anat_params.common_params.surfaces_resolution;
-    if(isempty(surf_resol.nvertices) || surf_resol.nvertices > 15000)
-        fprintf(2,'The surfaces resolution have be between 2000 and 15000 vertices.\n');
+    if(isempty(surf_resol.nvertices) || surf_resol.nvertices > 100000)
+        fprintf(2,'The surfaces resolution have be between 2000 and 100000 vertices.\n');
         disp('Please check the nvertices configuration in the process_import_anat.json file.');
         status = false;
         disp('-->> Process stopped!!!');
@@ -324,18 +249,9 @@
     disp("--------------------------------------------------------------------------");
     disp('-->> Checking channel params');
     channel_params = properties.channel_params;
-    if(isempty(channel_params.channel_type.type)...
-            && ~isequal(channel_params.channel_type.type,1)...
-            && ~isequal(channel_params.channel_type.type,2))
-        fprintf(2,"\n ->> Error: The channel type have to be <<1>> or <<2>>. \n");
-        disp('1: Use raw data channel.');
-        disp('2: Use BST default channel.');
-        status = false;
-        disp('-->> Process stopped!!!');
-        return;
-    end
-    if(isequal(channel_params.channel_type.type,1))
-        raw_data = channel_params.channel_type.type_list{1};
+   
+    if(isequal(lower(channel_params.channel_type.id),'raw'))
+        raw_data = channel_params.channel_type;
         base_path = strrep(raw_data.base_path,'SubID','');
         if(~isfolder(fullfile(base_path)))
             fprintf(2,'The raw_data base path is not a folder.\n');
@@ -357,17 +273,10 @@
         for i=1:length(structures)
             structure = structures(i);
             raw_file = fullfile(base_path,structure.name,strrep(raw_data.file_location,'SubID',structure.name));
-            if(raw_data.isfile)
-                if(~isfile(raw_file))
-                    count_raw = count_raw + 1;
-                    reject_subjects{length(reject_subjects)+1} = structure.name;
-                end
-            else
-                if(~isfolder(raw_file))
-                    count_raw = count_raw + 1;
-                    reject_subjects{length(reject_subjects)+1} = structure.name;
-                end
-            end
+            if(~isfile(raw_file))
+                count_raw = count_raw + 1;
+                reject_subjects{length(reject_subjects)+1} = structure.name;
+            end            
         end
         if(~isequal(count_raw,0))
             if(isequal(count_raw,length(structures)))
@@ -386,8 +295,8 @@
             end
         end
     end
-    if(isequal(channel_params.channel_type.type,2))
-        channel = channel_params.channel_type.type_list{2};
+    if(isequal(lower(channel_params.channel_type.id),'default'))
+        channel = channel_params.channel_type;
         group_name = channel.group_layout_name;
         layout_name = channel.channel_layout_name;
         defaults = jsondecode(fileread(fullfile('bst_defaults','bst_eeg_layouts.json')));
@@ -415,7 +324,7 @@
     %% Checking subject number in each folder
     %%
     anat_params = properties.anatomy_params;
-    if(isequal(anat_params.anatomy_type.type,3))
+    if(isequal(lower(anat_params.anatomy_type.id),'individual'))
         hcp_base_path = selected_anatomy.base_path;
         hcp_subjects = dir(hcp_base_path);
         hcp_subjects(ismember( {hcp_subjects.name}, {'.', '..'})) = [];  %remove . and ..
diff --git a/cfs_properties/functions/get_properties.m b/cfs_properties/functions/get_properties.m
index c79fe26..b601925 100644
--- a/cfs_properties/functions/get_properties.m
+++ b/cfs_properties/functions/get_properties.m
@@ -1,4 +1,5 @@
-function [properties] = get_properties()
+function [properties,status] = get_properties(varargin)
+
 try
     properties = jsondecode(fileread(strcat('app/properties.json')));
 catch ME
@@ -11,9 +12,9 @@
 end
 defaults_param_files = properties.default_param_files;
 for i=1:length(defaults_param_files)
-    try        
+    try
         module_params                                               = jsondecode(fileread(defaults_param_files(i).file_path));
-        properties.defaults.(defaults_param_files(i).module_id)     = module_params;        
+        properties.defaults.(defaults_param_files(i).module_id)     = module_params;
     catch ME
         fprintf(2,strcat('\nBC-V-->> Error: Loading the property files: \n'));
         fprintf(2,strcat(ME.message,'\n'));
@@ -25,9 +26,9 @@
 end
 process_files = properties.process_files;
 for i=1:length(process_files)
-    try        
+    try
         module_params                            = jsondecode(fileread(process_files(i).file_path));
-        properties.(process_files(i).module_id)  = module_params;        
+        properties.(process_files(i).module_id)  = module_params;
     catch ME
         fprintf(2,strcat('\nBC-V-->> Error: Loading the property files: \n'));
         fprintf(2,strcat(ME.message,'\n'));
@@ -37,10 +38,65 @@
         return;
     end
 end
-anat_type = properties.anatomy_params.anatomy_type.type;
-properties.anatomy_params.anat_config = properties.anatomy_params.anatomy_type.type_list{anat_type};
-channel_type = properties.channel_params.channel_type.type;
-properties.channel_params.chann_config = properties.channel_params.channel_type.type_list{channel_type};
+if(~isempty(varargin{1}))
+    if(~isequal(lower(properties.anatomy_params.anatomy_type.type),'template') ...
+            && ~isequal(lower(properties.anatomy_params.anatomy_type.type),'individual'))
+        fprintf(2,"\n ->> Error: The anatomy type have to be <<template>>, or <<individual>>. \n");
+        disp('template: For use default anatomy type.');
+        disp('individual: For use HCP individual anatomy.');
+        properties = 'canceled';
+        disp('-->> Process stopped!!!');
+        return;
+    end
+    if(isequal(lower(properties.anatomy_params.anatomy_type.type),'template'))
+        properties.anatomy_params.anatomy_type = properties.anatomy_params.anatomy_type.type_list{1};
+    else
+        properties.anatomy_params.anatomy_type = properties.anatomy_params.anatomy_type.type_list{2};
+    end
+    if(~isequal(lower(properties.channel_params.channel_type.type),'default') ...
+            && ~isequal(lower(properties.channel_params.channel_type.type),'raw'))
+        fprintf(2,"\n ->> Error: The channel type have to be <<raw>> or <<default>>. \n");
+        disp('raw: Use raw data channel.');
+        disp('default: Use BST default channel.');
+        properties = 'canceled';
+        disp('-->> Process stopped!!!');
+        return;
+    end
+    if(isequal(lower(properties.channel_params.channel_type.type),'default'))
+        properties.channel_params.channel_type = properties.channel_params.channel_type.type_list{2};
+    else
+        properties.channel_params.channel_type = properties.channel_params.channel_type.type_list{1};
+    end
+
+    if(~isequal(lower(properties.headmodel_params.Method.value),'meg_sphere') ...
+            && ~isequal(lower(properties.headmodel_params.Method.value),'os_meg') ...
+            && ~isequal(lower(properties.headmodel_params.Method.value),'eeg_3sphereberg') ...
+            && ~isequal(lower(properties.headmodel_params.Method.value),'openmeeg') ...
+            && ~isequal(lower(properties.headmodel_params.Method.value),'duneuro'))
+        fprintf(2,"\n ->> Error: The channel type have to be <<meg_sphere>> or <<os_meg>>" + ...
+            " or <<eeg_3sphereberg>> or <<openmeeg>> or <<duneuro>> . \n");
+        disp('meg_sphere: Use MEG Spheres.');
+        disp('os_meg: Use Overlapping spheres.');
+        disp('eeg_3sphereberg: Use EEG three Spheres.');
+        disp('openmeeg: Use OpenMEEG.');
+        disp('duneuro: Use DUNeruro FEM.');
+        properties = 'canceled';
+        disp('-->> Process stopped!!!');
+        return;
+    end
+    switch lower(properties.headmodel_params.Method.value)
+        case 'meg_sphere'
+            properties.headmodel_params.Method = properties.headmodel_params.Method.methods{1};
+        case 'os_meg'
+            properties.headmodel_params.Method = properties.headmodel_params.Method.methods{2};
+        case 'eeg_3sphereberg'
+            properties.headmodel_params.Method = properties.headmodel_params.Method.methods{3};
+        case 'openmeeg'
+            properties.headmodel_params.Method = properties.headmodel_params.Method.methods{4};
+        case 'duneuro'
+            properties.headmodel_params.Method = properties.headmodel_params.Method.methods{5};
+    end
+end
 
 end
 
diff --git a/cfs_properties/process_comp_headmodel.json b/cfs_properties/process_comp_headmodel.json
index ac86d3e..3146bc1 100644
--- a/cfs_properties/process_comp_headmodel.json
+++ b/cfs_properties/process_comp_headmodel.json
@@ -1 +1 @@
-{
    "description":"",
    "Method":{
        "description":"Recommended options EEG=<<openmeeg>> MEG=<<os_meg>>. Others options <<meg_sphere>> <<eeg_3sphereberg>> <<duneuro>> ",
        "value":"openmeeg"
    },
    "method_type":[
        {
            "name":"meg_sphere",
            "description":"",
            "MEGMethod":"meg_sphere"
        },
        {
            "name":"os_meg",
            "description":"",
            "MEGMethod":"os_meg"
        },
        {
            "name":"eeg_3sphereberg",
            "description":"",
            "EEGMethod":"eeg_3sphereberg"
        },
        {
            "name":"openmeeg",
            "description":"",
            "EEGMethod":"openmeeg",
            "BemNames":[
                "Scalp",
                "Skull",
                "Brain"
            ],
            "BemCond":[
                1,
                0.0125,
                1
            ],
            "BemSelect":[
                true,
                true,
                true
            ],
            "isAdjoint":false,
            "isAdaptative":true,
            "isSplit":false,
            "SplitLength":4000
        },
        {
            "name":"duneuro",
            "description":"",
            "EEGMethod":"duneuro",
            "FemCond":[
                1.79,
                0.008,
                0.43
            ],
            "FemSelect":[
                true,
                true,
                true
            ],
            "Isotropic":true,
            "UseTensor":false,
            "FemMesh":{
                "Method":{
                    "description":"<<iso2mesh-2021>> <<iso2mesh>> <<brain2mesh>> <<simnibs3>> <<simnibs4>> <<fieldtrip>>",
                    "value":"iso2mesh-2021"
                },
                "Methods":[
                    {
                        "name":"iso2mesh-2021",
                        "MergeMethod":{
                            "description":"iso2mesh <<mergemesh>>|<<mergesurf>> Function used to merge the meshes",
                            "value":"mergesurf"
                        },
                        "MaxVol":{
                            "description":"Default <<0.1>>. iso2mesh Max tetrahedral volume (10=coarse - 0.0001=fine)",
                            "value":0.1
                        },
                        "KeepRatio":{
                            "description":"Default <<100>>. iso2mesh Percentage of elements kept (1-100%)",
                            "value":100
                        }
                    },
                    {
                        "name":"iso2mesh",
                        "MergeMethod":{
                            "description":"iso2mesh <<mergemesh>>|<<mergesurf>> Function used to merge the meshes",
                            "value":"mergesurf"
                        },
                        "MaxVol":{
                            "description":"Default <<0.1>>. iso2mesh Max tetrahedral volume (10=coarse - 0.0001=fine)",
                            "value":0.1
                        },
                        "KeepRatio":{
                            "description":"Default <<100>>. iso2mesh Percentage of elements kept (1-100%)",
                            "value":100
                        }
                    },
                    {
                        "name":"brain2mesh"
                    },
                    {
                        "name":"simnibs3",
                        "VertexDensity":{
                            "description":"SimNIBS <<0.1 - X>> setting the vertex density (nodes per mm2)  of the surface meshes",
                            "value":0.5
                        },
                        "NbVertices":{
                            "description":"SimNIBS Number of vertices for the cortex surface imported from CAT12",
                            "value":15000
                        }
                    },
                    {
                        "name":"simnibs4",
                        "NbVertices":{
                            "description":"SimNIBS Number of vertices for the cortex surface imported from CAT12",
                            "value":15000
                        }
                    },
                    {
                        "name":"fieldtrip",
                        "Downsample":{
                            "description":"FieldTrip Integer,
                            Downsampling factor to apply to the volumes before meshing",
                            "value":3
                        },
                        "NodeShift":{
                            "description":"FieldTrip <<0 - 0.49>> Improves the geometrical properties of the mesh",
                            "value":0.3
                        }
                    }
                ]
            }
        }
    ]
}
\ No newline at end of file
+{
    "description":"",
    "Method":{
        "description":"Recommended options EEG=<<openmeeg>> MEG=<<os_meg>>. Others options <<meg_sphere>> <<eeg_3sphereberg>> <<duneuro>> ",
        "value":"openmeeg",
        "methods":[
            {
                "name":"meg_sphere",
                "description":"",
                "MEGMethod":"meg_sphere"
            },
            {
                "name":"os_meg",
                "description":"",
                "MEGMethod":"os_meg"
            },
            {
                "name":"eeg_3sphereberg",
                "description":"",
                "EEGMethod":"eeg_3sphereberg"
            },
            {
                "name":"openmeeg",
                "description":"",
                "EEGMethod":"openmeeg",
                "BemNames":[
                    "Scalp",
                    "Skull",
                    "Brain"
                ],
                "BemCond":[
                    1,
                    0.0125,
                    1
                ],
                "BemSelect":[
                    true,
                    true,
                    true
                ],
                "isAdjoint":false,
                "isAdaptative":true,
                "isSplit":false,
                "SplitLength":4000
            },
            {
                "name":"duneuro",
                "description":"",
                "EEGMethod":"duneuro",
                "FemCond":[
                    1.79,
                    0.008,
                    0.43
                ],
                "FemSelect":[
                    true,
                    true,
                    true
                ],
                "Isotropic":true,
                "UseTensor":false,
                "FemMesh":{
                    "Method":{
                        "description":"<<iso2mesh-2021>> <<iso2mesh>> <<brain2mesh>> <<simnibs3>> <<simnibs4>> <<fieldtrip>>",
                        "value":"iso2mesh-2021"
                    },
                    "Methods":[
                        {
                            "name":"iso2mesh-2021",
                            "MergeMethod":{
                                "description":"iso2mesh <<mergemesh>>|<<mergesurf>> Function used to merge the meshes",
                                "value":"mergesurf"
                            },
                            "MaxVol":{
                                "description":"Default <<0.1>>. iso2mesh Max tetrahedral volume (10=coarse - 0.0001=fine)",
                                "value":0.1
                            },
                            "KeepRatio":{
                                "description":"Default <<100>>. iso2mesh Percentage of elements kept (1-100%)",
                                "value":100
                            }
                        },
                        {
                            "name":"iso2mesh",
                            "MergeMethod":{
                                "description":"iso2mesh <<mergemesh>>|<<mergesurf>> Function used to merge the meshes",
                                "value":"mergesurf"
                            },
                            "MaxVol":{
                                "description":"Default <<0.1>>. iso2mesh Max tetrahedral volume (10=coarse - 0.0001=fine)",
                                "value":0.1
                            },
                            "KeepRatio":{
                                "description":"Default <<100>>. iso2mesh Percentage of elements kept (1-100%)",
                                "value":100
                            }
                        },
                        {
                            "name":"brain2mesh"
                        },
                        {
                            "name":"simnibs3",
                            "VertexDensity":{
                                "description":"SimNIBS <<0.1 - X>> setting the vertex density (nodes per mm2)  of the surface meshes",
                                "value":0.5
                            },
                            "NbVertices":{
                                "description":"SimNIBS Number of vertices for the cortex surface imported from CAT12",
                                "value":15000
                            }
                        },
                        {
                            "name":"simnibs4",
                            "NbVertices":{
                                "description":"SimNIBS Number of vertices for the cortex surface imported from CAT12",
                                "value":15000
                            }
                        },
                        {
                            "name":"fieldtrip",
                            "Downsample":{
                                "description":"FieldTrip Integer,
                                Downsampling factor to apply to the volumes before meshing",
                                "value":3
                            },
                            "NodeShift":{
                                "description":"FieldTrip <<0 - 0.49>> Improves the geometrical properties of the mesh",
                                "value":0.3
                            }
                        }
                    ]
                }
            }
        ]
    }
}
\ No newline at end of file
diff --git a/cfs_properties/process_import_anat.json b/cfs_properties/process_import_anat.json
index 47b3497..1378272 100644
--- a/cfs_properties/process_import_anat.json
+++ b/cfs_properties/process_import_anat.json
@@ -1 +1 @@
-{
    "description":"",
    "anatomy_type":{
        "description":"Select the type of anatomy to use. <<1>> Brainstorm default anatomy. <<2>> HCP anatomy as Template <<3>> HCP individual anatomy",
        "type":1,
        "type_list":[
            {
                "id":1,
                "name":"default_anatomy",
                "description":"Select the group and name of the sensor layout. See app/bst_default_anatomy.json file and select all params from there",
                "template_name":"ICBM152_2023b",
                "default_atlas":"Desikan-Killiany"
            },
            {
                "id":2,
                "name":"hcp_anat_individual",
                "description":"",
                "base_path":"/mnt/Store/Data/CHBM/Test/Ciftify",
                "T1w_file_name":"T1w.nii.gz",
                "Atlas_file_name":"aparc+aseg.nii.gz"
            }
        ]
    },
    "common_params":{
        "mri_transformation":{
            "use_transformation":false,
            "base_path":"/mnt/Store/Data/Conectome/Sample",
            "file_name":"meg/SubID/MEG/anatomy/SubID_MEG_anatomy_transform.txt"
        },
        "non_brain_surfaces":{
            "description":"FSL Bet command output",
            "base_path":"/mnt/Store/Data/CHBM/Processing/Non-brain"
        },
        "layer_desc":{
            "description":"Layer descriptor. Options <<white>> OR <<midthickness>> OR <<pial>> OR <<bigbrain>> multilayer like bigbrain OR <<fs_LR>> like HCP FSAve (three layers).",
            "desc":"Midthickness"
        },
        "surfaces_resolution":{
            "description":"Numbers of vertices for downsample the surfaces: default <<8000>>",
            "nvertices":8000
        }
    }
}
\ No newline at end of file
+{
    "description":"",
    "anatomy_type":{
        "description":"Select the type of anatomy to use. <<template>> Brainstorm default anatomy. <<individual>> HCP individual anatomy",
        "type":"individual",
        "type_list":[
            {
                "id":"default",
                "name":"default_anatomy",
                "description":"Select the group and name of the sensor layout. See app/bst_default_anatomy.json file and select all params from there",
                "template_name":"ICBM152_2023b",
                "default_atlas":"Desikan-Killiany"
            },
            {
                "id":"individual",
                "name":"hcp_anat_individual",
                "description":"",
                "base_path":"/mnt/Store/Data/CHBM/Test/Ciftify",
                "T1w_file_name":"T1w.nii.gz",
                "Atlas_file_name":"aparc+aseg.nii.gz"
            }
        ]
    },
    "common_params":{
        "mri_transformation":{
            "use_transformation":false,
            "base_path":"/mnt/Store/Data/Conectome/Sample",
            "file_name":"meg/SubID/MEG/anatomy/SubID_MEG_anatomy_transform.txt"
        },
        "non_brain_surfaces":{
            "description":"FSL Bet command output",
            "base_path":"/mnt/Store/Data/CHBM/Processing/Non-brain"
        },
        "layer_desc":{
            "description":"Layer descriptor. Options <<white>> OR <<midthickness>> OR <<pial>> OR <<bigbrain>> multilayer like bigbrain OR <<fs_LR>> like HCP FSAve (three layers).",
            "desc":"Midthickness"
        },
        "surfaces_resolution":{
            "description":"Numbers of vertices for downsample the surfaces: default <<8000>>",
            "nvertices":8000
        }
    }
}
\ No newline at end of file
diff --git a/cfs_properties/process_import_channel.json b/cfs_properties/process_import_channel.json
index 4ef7458..1aa3755 100644
--- a/cfs_properties/process_import_channel.json
+++ b/cfs_properties/process_import_channel.json
@@ -1 +1 @@
-{
    "description":"",
    "channel_type":{
        "description":"Select the type of import channel process to be used. <<1>> Use raw data. <<2>> Use BST default template ",
        "type":2,
        "type_list":[
            {
                "id":1,
                "name":"raw_data",
                "description":"",
                "subID_prefix":"",
                "base_path":"/mnt/Store/Data/Conectome/Sample",
                "file_location":"meg/SubID/unprocessed/MEG/5-Restin/4D/c,
                \r\trfDC",
                "data_format":"4D",
                "group_layout_name":"",
                "channel_layout_name":""
            },
            {
                "id":2,
                "name":"import_channel",
                "description":"Select the group and name of the sensor layout. See bst_defaults/bst_eeg_layouts.json file and select all params from there",
                "group_layout_name":"ICBM152",
                "channel_layout_name":"ASA 10-05 343"
            }
        ]
    },
    "channel_label_file":"",
    "chann_config":{
        "id":2,
        "name":"import_channel",
        "description":"Select the group and name of the sensor layout. See bst_defaults/bst_eeg_layouts.json file and select all params from there",
        "group_layout_name":"ICBM152",
        "channel_layout_name":"ASA 10-05 343"
    }
}
\ No newline at end of file
+{
    "description":"",
    "channel_type":{
        "description":"Select the type of import channel process to be used. <<raw>> Use raw data. <<default>> Use BST default template ",
        "type":"default",
        "type_list":[
            {
                "id":"raw",
                "name":"raw_data",
                "description":"",
                "subID_prefix":"",
                "base_path":"/mnt/Store/Data/Conectome/Sample",
                "file_location":"meg/SubID/unprocessed/MEG/5-Restin/4D/c,rfDC",
                "data_format":"4D",
                "group_layout_name":"",
                "channel_layout_name":""
            },
            {
                "id":"default",
                "name":"import_channel",
                "description":"Select the group and name of the sensor layout. See bst_defaults/bst_eeg_layouts.json file and select all params from there",
                "group_layout_name":"ICBM152",
                "channel_layout_name":"ASA 10-05 343"
            }
        ]
    },
    "channel_label_file":""  
}
\ No newline at end of file
diff --git a/ciftistorm.m b/ciftistorm.m
index a26bc84..7a2ac46 100644
--- a/ciftistorm.m
+++ b/ciftistorm.m
@@ -53,7 +53,7 @@ function ciftistorm(varargin)
     CiftiStorm
 else    
     %% Checking app properties
-    properties  = get_properties();
+    properties  = get_properties('run');
     if(isequal(properties,'canceled'))
         return;
     end
diff --git a/external/script_panel_headmodel.m b/external/script_panel_headmodel.m
index bd24902..aacf94c 100644
--- a/external/script_panel_headmodel.m
+++ b/external/script_panel_headmodel.m
@@ -284,8 +284,8 @@
             end
             
             % Let user edit OpenMEEG options
-            properties = get_properties();
-            openMEEGProperties = properties.headmodel_params.method_type{1};
+            properties = get_properties('run');
+            openMEEGProperties = properties.headmodel_params.Method;
             OpenmeegOptions.BemSelect = OPTIONS.BemSelect;
             OpenmeegOptions.BemCond = OPTIONS.BemCond;
             OpenmeegOptions.BemNames = OPTIONS.BemNames;
@@ -350,8 +350,8 @@
             % Interactive interface to set the OpenMEEG options
             defOPTIONS = duneuro_defaults();
 
-            properties = get_properties();
-            DUNeuroProperties = properties.headmodel_params.method_type{5};
+            properties = get_properties('run');
+            DUNeuroProperties = headmodel_params.Method;
 
             % Fill defOPTIONS with UserOptions
             
diff --git a/functions/cfs_process_interface.m b/functions/cfs_process_interface.m
index 01f815b..bf4b896 100644
--- a/functions/cfs_process_interface.m
+++ b/functions/cfs_process_interface.m
@@ -18,8 +18,7 @@
 anatomy_params                  = properties.anatomy_params;
 ProtocolName                    = general_params.bst_config.protocol_name;
 output_path                     = general_params.output_path;
-anatomy_type                    = anatomy_params.anatomy_type.type;
-anatomy_config                  = anatomy_params.anatomy_type.type_list{anatomy_type};
+anatomy_type                    = anatomy_params.anatomy_type;
 mq_control                      = general_params.bst_config.after_MaQC.run;
 
 switch mq_control
@@ -36,8 +35,8 @@
         subjects                = bst_get('ProtocolSubjects');
         subjects                = subjects.Subject;
     case false
-        if(isequal(anatomy_type,1))
-            subjects.name       = anatomy_config.template_name;
+        if(isequal(lower(anatomy_type.id),'template'))
+            subjects.name       = anatomy_type.template_name;
             sTemplates          = bst_get('AnatomyDefaults');
             sTemplate           = sTemplates(find(strcmpi(subjects.name, {sTemplates.Name}),1));
             if(isempty(sTemplate))
@@ -46,18 +45,15 @@
                 disp(strcat("Please check the aviable anatomy templates in bst_template/bst_default_anatomy.json file"));
                 disp('-->> Process stopped!!!');
                 return;
-            end
-        elseif(isequal(anatomy_type,2))
-            subjects.name       = anatomy_config.template_name;
-            subjects.folder     = anatomy_config.base_path;
+            end        
         else
-            base_path           = anatomy_config.base_path;
+            base_path           = anatomy_type.base_path;
             subjects            = dir(base_path);
             subjects(ismember({subjects.name},{'.','..'}))           = [];  %remove . and ..
             if(~isempty(reject_subjects))
                 subjects(ismember({subjects.name},reject_subjects))  = [];
             end
-            disp(strcat('-->> Data Source:  ', anatomy_config.base_path ));
+            disp(strcat('-->> Data Source:  ', anatomy_type.base_path ));
         end
 end
 % for j=18:18
diff --git a/functions/processes/process_canonical_surfaces.m b/functions/processes/process_canonical_surfaces.m
index d8b2f9a..0c0c52c 100644
--- a/functions/processes/process_canonical_surfaces.m
+++ b/functions/processes/process_canonical_surfaces.m
@@ -15,6 +15,7 @@
         'subjectname', subID, ...
         'resolution',  2);  % 8196
 end
+
 %%
 %% Quality control
 %%
diff --git a/functions/processes/process_comp_headmodel.m b/functions/processes/process_comp_headmodel.m
index 7050586..391d984 100755
--- a/functions/processes/process_comp_headmodel.m
+++ b/functions/processes/process_comp_headmodel.m
@@ -5,19 +5,16 @@
 %%
 
 % Get Protocol information
-modality                    = properties.general_params.modality;
-Method                      = properties.headmodel_params.Method.value;
-mq_control                  = properties.general_params.bst_config.after_MaQC.run;
+headmodel_params            = properties.headmodel_params.Method;
+Method                      = headmodel_params.name;
 ProtocolInfo                = bst_get('ProtocolInfo');
 % Get subject directory
 [sSubject, iSubject]        = bst_get('Subject', subID);
-if(isequal(properties.channel_params.channel_type.type,1))
+if(isequal(properties.channel_params.channel_type.id,'raw'))
     [~, iStudy]             = bst_get('StudyWithSubject', sSubject.FileName);
 else
     [~, iStudy]             = bst_get('StudyWithSubject', sSubject.FileName, 'intra_subject');
 end
-sStudy                      = bst_get('Study', iStudy);
-HeadModelPath               = bst_fullfile(ProtocolInfo.STUDIES,sSubject.Name,sStudy.Name); 
 for i=1:length(CSurfaces)
     CSurface = CSurfaces(i);
     if(~isempty(CSurface.name) && isequal(CSurface.type,'cortex'))  
@@ -67,7 +64,7 @@
                 sMethod.SEEGMethod = '';
                 sMethod.SaveFile = 1;
                 
-                fem_params                  = properties.headmodel_params.method_type{5};
+                fem_params                  = properties.headmodel_params.Method.methods;
                 fem_mesh_params             = fem_params.FemMesh;
                 mesh_opt                    = process_fem_mesh( 'GetDefaultOptions' );
                 mesh_opt.Method             = fem_mesh_params.Method.value;
diff --git a/functions/processes/process_comp_headmodel_backup.m b/functions/processes/process_comp_headmodel_backup.m
index e04ff1a..c19faea 100644
--- a/functions/processes/process_comp_headmodel_backup.m
+++ b/functions/processes/process_comp_headmodel_backup.m
@@ -141,7 +141,7 @@
             case 'duneuro'
                 options.HeadModelFile       = fullfile(HeadModelPath, strcat('headmodel_surf_',CSurface.name,'_duneuro.mat'));
                 options.Comment             = strcat('headmodel_surf_',CSurface.name,'_duneuro');
-                fem_params                  = properties.headmodel_params.method_type{3};
+                fem_params                  = properties.headmodel_params.Method.methods;
                 fem_mesh_params             = fem_params.FemMesh;
                 mesh_opt                    = process_fem_mesh( 'GetDefaultOptions' );
                 mesh_opt.Method             = fem_mesh_params.Method.value;
diff --git a/functions/processes/process_compute_surfaces.m b/functions/processes/process_compute_surfaces.m
index 34b4a7e..fae9c26 100644
--- a/functions/processes/process_compute_surfaces.m
+++ b/functions/processes/process_compute_surfaces.m
@@ -6,7 +6,7 @@
 %% Getting params
 %%
 ProtocolInfo    = bst_get('ProtocolInfo');
-anatomy_type    = properties.anatomy_params.anatomy_type.type_list{properties.anatomy_params.anatomy_type.type};
+anatomy_type    = properties.anatomy_params.anatomy_type;
 layer_desc      = properties.anatomy_params.common_params.layer_desc.desc;
 mq_control      = properties.general_params.bst_config.after_MaQC.run;
 nvertices     = properties.anatomy_params.common_params.surfaces_resolution.nvertices;
diff --git a/functions/processes/process_import_anat.m b/functions/processes/process_import_anat.m
index 726ba8b..818a217 100644
--- a/functions/processes/process_import_anat.m
+++ b/functions/processes/process_import_anat.m
@@ -5,10 +5,8 @@
 %%
 %% Getting params
 %%
-anatomy_type    = properties.anatomy_params.anatomy_type.type_list{properties.anatomy_params.anatomy_type.type};
-if(isequal(anatomy_type.id,1)); type = 'default';end
-if(isequal(anatomy_type.id,2)); type = 'template';end
-if(isequal(anatomy_type.id,3)); type = 'individual';end
+anatomy_type    = properties.anatomy_params.anatomy_type;
+type            = anatomy_type.id;
 mq_control      = properties.general_params.bst_config.after_MaQC.run;
 
 % Get subject definition
@@ -22,7 +20,6 @@
     sub_to_FSAve        = get_FSAve_Surfaces_interpolation(properties,subID);
 else    
     if isequal(type, 'default')
-        anatomy_type    = properties.anatomy_params.anatomy_type.type_list{1};
         sTemplates      = bst_get('AnatomyDefaults');
         Name            = anatomy_type.template_name;
         sTemplate       = sTemplates(find(strcmpi(Name, {sTemplates.Name}),1));
@@ -124,7 +121,7 @@
 end
 close(hFigMri3);
 
-if(isequal(type,'template') || isequal(type,'individual'))
+if(isequal(type,'individual'))
     %%
     %% Quality control
     %%
diff --git a/functions/processes/process_import_atlas.m b/functions/processes/process_import_atlas.m
index 33b6c87..7c51b34 100644
--- a/functions/processes/process_import_atlas.m
+++ b/functions/processes/process_import_atlas.m
@@ -5,10 +5,9 @@
 %%
 report_path     = get_report_path(properties, subID);
 atlas_error     = [];
-anatomy_type    = properties.anatomy_params.anatomy_type.type_list{properties.anatomy_params.anatomy_type.type};
-if(isequal(anatomy_type.id,1)); type = 'default';end
-if(isequal(anatomy_type.id,2)); type = 'template';end
-if(isequal(anatomy_type.id,3)); type = 'individual';end
+anatomy_type    = properties.anatomy_params.anatomy_type;
+type            = anatomy_type.id;
+
 mq_control      = properties.general_params.bst_config.after_MaQC.run;
 ProtocolInfo    = bst_get('ProtocolInfo');
 [sSubject, ~]   = bst_get('Subject', subID);
diff --git a/functions/processes/process_import_chann.m b/functions/processes/process_import_chann.m
index 95781d9..c375443 100755
--- a/functions/processes/process_import_chann.m
+++ b/functions/processes/process_import_chann.m
@@ -4,19 +4,10 @@
 %% Getting params
 %%
 channel_error   = [];
-channel_params  = properties.channel_params.chann_config;
+channel_params  = properties.channel_params.channel_type;
 mq_control      = properties.general_params.bst_config.after_MaQC.run;
 sSubject        = bst_get('Subject', subID);
-%%
-%% Getting channel type
-%%
-if(isequal(properties.channel_params.channel_type.type,3))
-    channel_type = 'template';
-elseif(isequal(properties.channel_params.channel_type.type,1))
-    channel_type = 'individual';
-else
-    channel_type = 'default';    
-end
+type            = properties.channel_params.channel_type.id;
 
 
 %%
@@ -28,7 +19,7 @@
     %%
     %% ===== IMPORT CHANNEL =====
     %%    
-    switch channel_type
+    switch lower(type)
         case 'default'
             % ===== GET DEFAULT =====
             % Get registered Brainstorm EEG defaults
@@ -63,12 +54,12 @@
             if(isequal(properties.general_params.modality,'EEG'))
             else
                 % Process: Create link to raw file
-                channel_type        = properties.channel_params.channel_type.type_list{3};
-                temp_sub_ID         = channel_type.template_name;
+                type        = properties.channel_params.channel_type.type_list{3};
+                temp_sub_ID         = type.template_name;
                 % MRI File
-                base_path           = strrep(channel_type.base_path, 'SubID', '');
-                base_path           = strrep(base_path, channel_type.template_name, '');
-                filepath            = strrep(channel_type.file_location, 'SubID', temp_sub_ID);
+                base_path           = strrep(type.base_path, 'SubID', '');
+                base_path           = strrep(base_path, type.template_name, '');
+                filepath            = strrep(type.file_location, 'SubID', temp_sub_ID);
                 raw_file            = fullfile(base_path, temp_sub_ID, filepath);
                 format = channel_params.data_format;
                 bst_process('CallProcess', 'process_import_data_raw', [], [], ...
@@ -146,7 +137,7 @@
 %%
 % View sources on MRI (3D orthogonal slices)
 
-if(isequal( channel_type, 'individual'))
+if(isequal( type, 'individual'))
      [~, iStudy]  = bst_get('StudyWithSubject', sSubject.FileName);
 else    
     [~, iStudy]  = bst_get('StudyWithSubject', sSubject.FileName, 'intra_subject');
diff --git a/functions/processes/utilities/get_CSurfaces_from_sSubject.m b/functions/processes/utilities/get_CSurfaces_from_sSubject.m
index c15a178..534c2dc 100644
--- a/functions/processes/utilities/get_CSurfaces_from_sSubject.m
+++ b/functions/processes/utilities/get_CSurfaces_from_sSubject.m
@@ -33,14 +33,14 @@
             resol       = comment{3};
             fix         = comment{end};
             if(isequal(resol,'low'))
-                switch desc
+                switch lower(desc)
                     case 'pial'
                         if(isequal(fix,'fix') || isempty(CSurfaces(1).name))
                             CSurfaces(1).name       = 'Pial';
                             CSurfaces(1).comment    = 'Cortex_pial_low';
                             CSurfaces(1).iCSurface  = true;
                             CSurfaces(1).iSurface   = i;
-                            if(isequal(layer_desc,'pial') || isequal(layer_desc,'fs_LR') || isequal(layer_desc,'bigbrain')) 
+                            if(isequal(lower(layer_desc),'pial') || isequal(lower(layer_desc),'fs_LR') || isequal(lower(layer_desc),'bigbrain')) 
                                 CSurfaces(1).iCSurface  = true; 
                             else
                                 CSurfaces(1).iCSurface  = false; 
@@ -54,7 +54,7 @@
                             CSurfaces(4).name       = 'Midthickness';
                             CSurfaces(4).comment    = 'Cortex_midthickness_low';
                             CSurfaces(4).iSurface   = i;
-                            if(isequal(layer_desc,'midthickness')) CSurfaces(4).iCSurface  = true; else CSurfaces(4).iCSurface  = false; end
+                            if(isequal(lower(layer_desc),'midthickness')) CSurfaces(4).iCSurface  = true; else CSurfaces(4).iCSurface  = false; end
                             CSurfaces(4).type       = 'cortex';
                             CSurfaces(4).filename   = surface.FileName;
                         end
@@ -63,7 +63,7 @@
                             CSurfaces(7).name       = 'White';                            
                             CSurfaces(7).comment    = 'Cortex_white_low';
                             CSurfaces(7).iSurface   = i;
-                            if(isequal(layer_desc,'white')) CSurfaces(7).iCSurface  = true; else CSurfaces(7).iCSurface  = false; end
+                            if(isequal(lower(layer_desc),'white')) CSurfaces(7).iCSurface  = true; else CSurfaces(7).iCSurface  = false; end
                             CSurfaces(7).type       = 'cortex';                            
                             CSurfaces(7).filename   = surface.FileName;
                         end
diff --git a/functions/processes/utilities/import_HCP_surfaces.m b/functions/processes/utilities/import_HCP_surfaces.m
index 0691e41..ee405c0 100644
--- a/functions/processes/utilities/import_HCP_surfaces.m
+++ b/functions/processes/utilities/import_HCP_surfaces.m
@@ -2,11 +2,11 @@
 %%
 %% Getting params
 %%
-anatomy_type            = properties.anatomy_params.anatomy_type.type_list{properties.anatomy_params.anatomy_type.type};
+anatomy_type            = properties.anatomy_params.anatomy_type;
 layer_desc              = properties.anatomy_params.common_params.layer_desc.desc;
 surfaces_resolution     = properties.anatomy_params.common_params.surfaces_resolution;
 
-if(~isequal(anatomy_type.id,1))
+if(~isequal(anatomy_type.id,'default'))
     %%
     %% Process: Import surfaces
     %%
@@ -41,7 +41,7 @@
     switch type
         case 'single'
             %% ===== IMPORT SURFACES 32K =====
-            switch layer_desc
+            switch lower(layer_desc)
                 case 'pial'
                     L_surface_file  = pial_L;
                     R_surface_file  = pial_R;
@@ -58,11 +58,11 @@
             BstTessLhFile           = BstTessLhFile{1};
             [~,BstTessRhFile,~]     = import_surfaces(iSubject, R_surface_file, 'GII-MNI', 0);
             BstTessRhFile           = BstTessRhFile{1};
-            [TessFile32K,iSurface]  = tess_concatenate({BstTessLhFile, BstTessRhFile}, strcat('Cortex_',layer_desc,'_high'));
+            [TessFile32K,iSurface]  = tess_concatenate({BstTessLhFile, BstTessRhFile}, strcat('Cortex_',lower(layer_desc),'_high'));
             file_delete(file_fullpath({BstTessLhFile, BstTessRhFile}), 1);
             [~, TessFile32K]        = in_tess_bst(TessFile32K,1);
             TessFile32K             = db_surface_type(TessFile32K,'Cortex');            
-            switch layer_desc
+            switch lower(layer_desc)
                 case 'pial'
                     CSurfaces(1).name               = 'Pial';
                     CSurfaces(1).comment            = 'Cortex_pial_high';
diff --git a/functions/processes/utilities/qc_headmodel.m b/functions/processes/utilities/qc_headmodel.m
index acce5b7..06e7b0e 100644
--- a/functions/processes/utilities/qc_headmodel.m
+++ b/functions/processes/utilities/qc_headmodel.m
@@ -148,7 +148,7 @@ function qc_headmodel(headmodel_options,properties, subID)
     close(hFig29);
     
     %%
-    %% Finding points of low corelation
+    %% Finding points of low correlation
     %%
     low_cor_inds            = find(corelv < .3);
     BSTCortexFile           = bst_fullfile(ProtocolInfo.SUBJECTS, headmodel_options.CortexFile);
diff --git a/functions/processes/utilities/set_Surfaces_Comment.m b/functions/processes/utilities/set_Surfaces_Comment.m
index 6bf53c9..b80e1a3 100644
--- a/functions/processes/utilities/set_Surfaces_Comment.m
+++ b/functions/processes/utilities/set_Surfaces_Comment.m
@@ -32,7 +32,7 @@ function set_Surfaces_Comment(properties,iSubject)
 %%
 %% Removing uneeded surfaces in case single surface processing
 %%
-if(isequal(layer_desc,'white') || isequal(layer_desc,'midthickness') || isequal(layer_desc,'pial'))
+if(isequal(lower(layer_desc),'white') || isequal(lower(layer_desc),'midthickness') || isequal(lower(layer_desc),'pial'))
     [sSubject,~]        = bst_get('Subject', iSubject);
     Surfaces            = sSubject.Surface;
     for i=1:length(Surfaces)
@@ -41,7 +41,7 @@ function set_Surfaces_Comment(properties,iSubject)
             [~,name,~]  = fileparts(surface.Comment);
             comment     = split(name,'_');
             desc        = comment{end-1};
-            if(~isequal(layer_desc,desc))
+            if(~isequal(lower(layer_desc),desc))
                 file_delete(file_fullpath({surface.FileName}), 1);
             end
         end
diff --git a/functions/starting_brainstorm.m b/functions/starting_brainstorm.m
index 3939e33..6468600 100644
--- a/functions/starting_brainstorm.m
+++ b/functions/starting_brainstorm.m
@@ -62,8 +62,8 @@
 %%
 %% Checking templates
 %%
-if(isequal(properties.anatomy_params.anatomy_type.type,1))
-    anatomy_type    = properties.anatomy_params.anatomy_type.type_list{1};
+if(isequal(lower(properties.anatomy_params.anatomy_type.id),'template'))
+    anatomy_type    = properties.anatomy_params.anatomy_type;
     sTemplates      = bst_get('AnatomyDefaults');
     Name            = anatomy_type.template_name;
     sTemplate       = sTemplates(find(strcmpi(Name, {sTemplates.Name}),1));
@@ -76,10 +76,10 @@
         return;
     end
 end
-if(isequal(properties.channel_params.channel_type.type,2))
+if(isequal(lower(properties.channel_params.channel_type.id),'default'))
     % ===== GET DEFAULT =====
     % Get registered Brainstorm EEG defaults
-    channel_params          = properties.channel_params.chann_config;
+    channel_params          = properties.channel_params.channel_type;
     bstDefaults             = bst_get('EegDefaults');
     nameGroup               = channel_params.group_layout_name;
     nameLayout              = channel_params.channel_layout_name;
diff --git a/guide/CiftiStorm.mlapp b/guide/CiftiStorm.mlapp
index 5e52a19..45eb1bd 100755
Binary files a/guide/CiftiStorm.mlapp and b/guide/CiftiStorm.mlapp differ
diff --git a/guide/Params_configuration.mlapp b/guide/Params_configuration.mlapp
index 2038708..f3b3bf8 100755
Binary files a/guide/Params_configuration.mlapp and b/guide/Params_configuration.mlapp differ
diff --git a/guide/images/apply.png b/guide/images/apply.png
new file mode 100644
index 0000000..abfa6dd
Binary files /dev/null and b/guide/images/apply.png differ
diff --git a/meegprep.m b/meegprep.m
index 975f2c4..364177b 100644
--- a/meegprep.m
+++ b/meegprep.m
@@ -20,7 +20,7 @@
 close all;
 clear all;
 disp('-->> Starting process');
-restoredefaultpath;
+% restoredefaultpath;
 
 %%
 %------------ Preparing properties --------------------
diff --git a/tools/Common/distance_correlation.m b/tools/Common/distance_correlation.m
index bce92b2..e8e141f 100644
--- a/tools/Common/distance_correlation.m
+++ b/tools/Common/distance_correlation.m
@@ -1,6 +1,6 @@
 
  %%
-            %% Voxel corelation vs Cortex and InnerSkull Minimal Distance
+            %% Voxel correlation vs Cortex and InnerSkull Minimal Distance
             %%
             iSkull = load(BSTInnerSkullFile);
             [vert_inds,distances,min_distances] = get_points_within_limit(head.Vertices,outer.Vertices,0.003);
@@ -10,7 +10,7 @@
             plot(min_distances,corelv,'.');
             xlabel('Cortex-InnerSkull distance');
             ylabel('Correlation');
-            title('Voxel corelation vs Cortex and InnerSkull Minimal Distance');
+            title('Voxel correlation vs Cortex and InnerSkull Minimal Distance');
             hold on;
             corela_low = corelv(vert_inds);
             low_distance = min_distances(vert_inds);
@@ -21,7 +21,7 @@
             close(hFig30);
             
             %%
-            %% Finding points of low corelation
+            %% Finding points of low correlation
             %%           
             low_cor_inds = find(corelv < .3);            
             save(fullfile(subject_report_path,'voxel_cor.fig'),'corelv','low_cor_inds');
diff --git a/tools/MEEGprep/functions/clean_data/eeglab_preproc.m b/tools/MEEGprep/functions/clean_data/eeglab_preproc.m
index c750358..0888e05 100644
--- a/tools/MEEGprep/functions/clean_data/eeglab_preproc.m
+++ b/tools/MEEGprep/functions/clean_data/eeglab_preproc.m
@@ -13,7 +13,7 @@
 %
 % Optional inputs:
 %
-%   verbosity       - Logical value for debbuging (key='debug',value=true OR false)
+%   verbosity       - Logical value for debugging (key='debug',value=true OR false)
 %   max_freq        - Integer maximum frequency to filtering the data (key='max_freq', value=from 1 to 92)
 %   save_path       - full path to save the cleaned EEG (key='save_path', value="fullpath")
 %   freq_list       - vector of frequencies point to show in plots (key='freq_list', value=[1 6 10 18])