diff --git a/sites/all/modules/features/materio_personal_notes/materio_personal_notes.features.field_base.inc b/sites/all/modules/features/materio_personal_notes/materio_personal_notes.features.field_base.inc
index 93e34d93..a6eff263 100644
--- a/sites/all/modules/features/materio_personal_notes/materio_personal_notes.features.field_base.inc
+++ b/sites/all/modules/features/materio_personal_notes/materio_personal_notes.features.field_base.inc
@@ -18,7 +18,7 @@ function materio_personal_notes_field_default_field_bases() {
     'entity_types' => array(),
     'field_name' => 'field_personal_note',
     'field_permissions' => array(
-      'type' => 1,
+      'type' => 0,
     ),
     'indexes' => array(
       'format' => array(
@@ -43,7 +43,7 @@ function materio_personal_notes_field_default_field_bases() {
     'entity_types' => array(),
     'field_name' => 'field_target_content_nid',
     'field_permissions' => array(
-      'type' => 1,
+      'type' => 2,
     ),
     'indexes' => array(),
     'locked' => 0,
diff --git a/sites/all/modules/features/materio_personal_notes/materio_personal_notes.features.field_instance.inc b/sites/all/modules/features/materio_personal_notes/materio_personal_notes.features.field_instance.inc
index 14f8fc28..112f6db0 100644
--- a/sites/all/modules/features/materio_personal_notes/materio_personal_notes.features.field_instance.inc
+++ b/sites/all/modules/features/materio_personal_notes/materio_personal_notes.features.field_instance.inc
@@ -69,7 +69,7 @@ function materio_personal_notes_field_default_field_instances() {
     ),
     'entity_type' => 'node',
     'field_name' => 'field_personal_note',
-    'label' => 'Note',
+    'label' => 'Personal Note',
     'required' => 0,
     'settings' => array(
       'entity_translation_sync' => FALSE,
@@ -166,7 +166,7 @@ function materio_personal_notes_field_default_field_instances() {
 
   // Translatables
   // Included for use with string extractors like potx.
-  t('Note');
+  t('Personal Note');
   t('Target content nid');
 
   return $field_instances;
diff --git a/sites/all/modules/features/materio_personal_notes/materio_personal_notes.features.filter.inc b/sites/all/modules/features/materio_personal_notes/materio_personal_notes.features.filter.inc
new file mode 100644
index 00000000..6a163e57
--- /dev/null
+++ b/sites/all/modules/features/materio_personal_notes/materio_personal_notes.features.filter.inc
@@ -0,0 +1,30 @@
+<?php
+/**
+ * @file
+ * materio_personal_notes.features.filter.inc
+ */
+
+/**
+ * Implements hook_filter_default_formats().
+ */
+function materio_personal_notes_filter_default_formats() {
+  $formats = array();
+
+  // Exported format: Note Format.
+  $formats['note_format'] = array(
+    'format' => 'note_format',
+    'name' => 'Note Format',
+    'cache' => 1,
+    'status' => 1,
+    'weight' => -8,
+    'filters' => array(
+      'filter_html_escape' => array(
+        'weight' => -10,
+        'status' => 1,
+        'settings' => array(),
+      ),
+    ),
+  );
+
+  return $formats;
+}
diff --git a/sites/all/modules/features/materio_personal_notes/materio_personal_notes.features.user_permission.inc b/sites/all/modules/features/materio_personal_notes/materio_personal_notes.features.user_permission.inc
index b84eff26..1cc3387e 100644
--- a/sites/all/modules/features/materio_personal_notes/materio_personal_notes.features.user_permission.inc
+++ b/sites/all/modules/features/materio_personal_notes/materio_personal_notes.features.user_permission.inc
@@ -10,11 +10,22 @@
 function materio_personal_notes_user_default_permissions() {
   $permissions = array();
 
+  // Exported permission: 'create field_target_content_nid'.
+  $permissions['create field_target_content_nid'] = array(
+    'name' => 'create field_target_content_nid',
+    'roles' => array(
+      'Adhérent' => 'Adhérent',
+      'root' => 'root',
+    ),
+    'module' => 'field_permissions',
+  );
+
   // Exported permission: 'create note content'.
   $permissions['create note content'] = array(
     'name' => 'create note content',
     'roles' => array(
       'Adhérent' => 'Adhérent',
+      'root' => 'root',
     ),
     'module' => 'node',
   );
@@ -32,29 +43,56 @@ function materio_personal_notes_user_default_permissions() {
   // Exported permission: 'delete any note content'.
   $permissions['delete any note content'] = array(
     'name' => 'delete any note content',
-    'roles' => array(),
+    'roles' => array(
+      'root' => 'root',
+    ),
     'module' => 'node',
   );
 
   // Exported permission: 'delete own note content'.
   $permissions['delete own note content'] = array(
     'name' => 'delete own note content',
-    'roles' => array(),
+    'roles' => array(
+      'Adhérent' => 'Adhérent',
+      'root' => 'root',
+    ),
     'module' => 'node',
   );
 
   // Exported permission: 'edit any note content'.
   $permissions['edit any note content'] = array(
     'name' => 'edit any note content',
-    'roles' => array(),
+    'roles' => array(
+      'Adhérent' => 'Adhérent',
+      'root' => 'root',
+    ),
     'module' => 'node',
   );
 
+  // Exported permission: 'edit field_target_content_nid'.
+  $permissions['edit field_target_content_nid'] = array(
+    'name' => 'edit field_target_content_nid',
+    'roles' => array(
+      'root' => 'root',
+    ),
+    'module' => 'field_permissions',
+  );
+
+  // Exported permission: 'edit own field_target_content_nid'.
+  $permissions['edit own field_target_content_nid'] = array(
+    'name' => 'edit own field_target_content_nid',
+    'roles' => array(
+      'root' => 'root',
+    ),
+    'module' => 'field_permissions',
+  );
+
   // Exported permission: 'edit own note content'.
   $permissions['edit own note content'] = array(
     'name' => 'edit own note content',
     'roles' => array(
       'Adhérent' => 'Adhérent',
+      'root' => 'root',
     ),
     'module' => 'node',
   );
@@ -111,9 +149,44 @@ function materio_personal_notes_user_default_permissions() {
   // Exported permission: 'show note title'.
   $permissions['show note title'] = array(
     'name' => 'show note title',
-    'roles' => array(),
+    'roles' => array(
+      'Adhérent' => 'Adhérent',
+      'root' => 'root',
+    ),
     'module' => 'materio_page_title',
   );
 
+  // Exported permission: 'use text format note_format'.
+  $permissions['use text format note_format'] = array(
+    'name' => 'use text format note_format',
+    'roles' => array(
+      'Adhérent' => 'Adhérent',
+      'Student' => 'Student',
+      'Utilisateur Alpha Tester' => 'Utilisateur Alpha Tester',
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
+    'module' => 'filter',
+  );
+
+  // Exported permission: 'view field_target_content_nid'.
+  $permissions['view field_target_content_nid'] = array(
+    'name' => 'view field_target_content_nid',
+    'roles' => array(
+      'root' => 'root',
+    ),
+    'module' => 'field_permissions',
+  );
+
+  // Exported permission: 'view own field_target_content_nid'.
+  $permissions['view own field_target_content_nid'] = array(
+    'name' => 'view own field_target_content_nid',
+    'roles' => array(
+      'Adhérent' => 'Adhérent',
+      'root' => 'root',
+    ),
+    'module' => 'field_permissions',
+  );
+
   return $permissions;
 }
diff --git a/sites/all/modules/features/materio_personal_notes/materio_personal_notes.info b/sites/all/modules/features/materio_personal_notes/materio_personal_notes.info
index 8a77a723..e34c00b3 100644
--- a/sites/all/modules/features/materio_personal_notes/materio_personal_notes.info
+++ b/sites/all/modules/features/materio_personal_notes/materio_personal_notes.info
@@ -5,6 +5,8 @@ dependencies[] = ctools
 dependencies[] = entityreference
 dependencies[] = features
 dependencies[] = field_extrawidgets
+dependencies[] = field_permissions
+dependencies[] = filter
 dependencies[] = materio_page_title
 dependencies[] = materio_personalnotes
 dependencies[] = metatag
@@ -19,12 +21,16 @@ features[field_base][] = field_personal_note
 features[field_base][] = field_target_content_nid
 features[field_instance][] = node-note-field_personal_note
 features[field_instance][] = node-note-field_target_content_nid
+features[filter][] = note_format
 features[node][] = note
+features[user_permission][] = create field_target_content_nid
 features[user_permission][] = create note content
 features[user_permission][] = create own personal notes
 features[user_permission][] = delete any note content
 features[user_permission][] = delete own note content
 features[user_permission][] = edit any note content
+features[user_permission][] = edit field_target_content_nid
+features[user_permission][] = edit own field_target_content_nid
 features[user_permission][] = edit own note content
 features[user_permission][] = enter note revision log entry
 features[user_permission][] = override note authored by option
@@ -34,6 +40,9 @@ features[user_permission][] = override note published option
 features[user_permission][] = override note revision option
 features[user_permission][] = override note sticky option
 features[user_permission][] = show note title
+features[user_permission][] = use text format note_format
+features[user_permission][] = view field_target_content_nid
+features[user_permission][] = view own field_target_content_nid
 features[variable][] = additional_settings__active_tab_note
 features[variable][] = ant_note
 features[variable][] = ant_pattern_note
@@ -47,6 +56,8 @@ features[variable][] = diff_view_mode_preview_node_note
 features[variable][] = entity_translation_hide_translation_links_note
 features[variable][] = entity_translation_node_metadata_note
 features[variable][] = field_bundle_settings_node__note
+features[variable][] = i18n_node_extended_note
+features[variable][] = i18n_node_options_note
 features[variable][] = language_content_type_note
 features[variable][] = menu_options_note
 features[variable][] = menu_parent_note
diff --git a/sites/all/modules/features/materio_personal_notes/materio_personal_notes.strongarm.inc b/sites/all/modules/features/materio_personal_notes/materio_personal_notes.strongarm.inc
index cd967528..5a881198 100644
--- a/sites/all/modules/features/materio_personal_notes/materio_personal_notes.strongarm.inc
+++ b/sites/all/modules/features/materio_personal_notes/materio_personal_notes.strongarm.inc
@@ -14,7 +14,7 @@ function materio_personal_notes_strongarm() {
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'additional_settings__active_tab_note';
-  $strongarm->value = 'edit-unique-field';
+  $strongarm->value = 'edit-workflow';
   $export['additional_settings__active_tab_note'] = $strongarm;
 
   $strongarm = new stdClass();
@@ -166,6 +166,20 @@ function materio_personal_notes_strongarm() {
   );
   $export['field_bundle_settings_node__note'] = $strongarm;
 
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'i18n_node_extended_note';
+  $strongarm->value = 1;
+  $export['i18n_node_extended_note'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'i18n_node_options_note';
+  $strongarm->value = array();
+  $export['i18n_node_options_note'] = $strongarm;
+
   $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
@@ -240,9 +254,7 @@ function materio_personal_notes_strongarm() {
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'node_options_note';
-  $strongarm->value = array(
-    0 => 'status',
-  );
+  $strongarm->value = array();
   $export['node_options_note'] = $strongarm;
 
   $strongarm = new stdClass();