diff --git a/module/actor.js b/module/actor.js
index 09bf3f22..cb4fadf2 100644
--- a/module/actor.js
+++ b/module/actor.js
@@ -744,8 +744,8 @@ export class RdDActor extends Actor {
           content: message
         });
       }
-      const update = { _id: comp._id, 'data.niveau': maxNiveau };
-      const updated = await this.updateEmbeddedEntity("OwnedItem", update); // Updates one EmbeddedEntity
+      const update = [ { _id: comp.id, 'data.niveau': maxNiveau } ];
+      await this.updateEmbeddedDocuments("Item", update); // Updates one EmbeddedEntity
     } else {
       console.log("Competence not found", compName);
     }
@@ -756,8 +756,8 @@ export class RdDActor extends Actor {
     let comp = this.getCompetence(compName);
     if (comp) {
       this.checkCompetenceXP(compName, compValue);
-      const update = { _id: comp._id, 'data.xp': compValue };
-      const updated = await this.updateEmbeddedEntity("OwnedItem", update); // Updates one EmbeddedEntity
+      const update = [ { _id: comp.id, 'data.xp': compValue } ];
+      await this.updateEmbeddedDocuments("Item", update); // Updates one EmbeddedEntity
     } else {
       console.log("Competence not found", compName);
     }
@@ -768,8 +768,8 @@ export class RdDActor extends Actor {
   async updateCompetenceXPSort(compName, compValue) {
     let comp = this.getCompetence(compName);
     if (comp) {
-      const update = { _id: comp._id, 'data.xp_sort': compValue };
-      const updated = await this.updateEmbeddedEntity("OwnedItem", update); // Updates one EmbeddedEntity
+      const update = [ { _id: comp.id, 'data.xp_sort': compValue } ];
+      await this.updateEmbeddedDocuments("Item", update); // Updates one EmbeddedEntity
     } else {
       console.log("Competence not found", compName);
     }
@@ -779,8 +779,8 @@ export class RdDActor extends Actor {
   async updateCompetenceArchetype(compName, compValue) {
     let comp = this.getCompetence(compName);
     if (comp) {
-      const update = { _id: comp._id, 'data.niveau_archetype': compValue };
-      const updated = await this.updateEmbeddedEntity("OwnedItem", update); // Updates one EmbeddedEntity
+      const update = [ { _id: comp.id, 'data.niveau_archetype': compValue } ];
+      await this.updateEmbeddedDocuments("Item", update); // Updates one EmbeddedEntity
     } else {
       console.log("Competence not found", compName);
     }
@@ -885,7 +885,7 @@ export class RdDActor extends Actor {
     this.buildSubConteneurObjetList(itemId, list);
     //console.log("List to delete", list);
     for (let item of list) {
-      await this.deleteOwnedItem(item.id);
+      await this.deleteEmbeddedDocuments("Item", [item.id] );
     }
   }
 
@@ -904,7 +904,7 @@ export class RdDActor extends Actor {
         contenu.splice(index, 1);
         index = contenu.indexOf(itemId);
       }
-      await this.updateEmbeddedEntity("OwnedItem", data2use);
+      await this.updateEmbeddedDocuments("Item", data2use);
     }
   }
 
@@ -917,7 +917,7 @@ export class RdDActor extends Actor {
     if (conteneur && conteneur.type == 'conteneur') {
       let data2use = duplicate(conteneur.data);
       data2use.data.contenu.push(itemId);
-      await this.updateEmbeddedEntity("OwnedItem", data2use);
+      await this.updateEmbeddedDocuments("Item", [data2use]);
     }
   }
 
@@ -932,7 +932,7 @@ export class RdDActor extends Actor {
       }
     }
     if (conteneurFixedList.length > 0)
-      await this.updateOwnedItem(conteneurFixedList);
+      await this.updateEmbeddedDocuments('Item', conteneurFixedList);
   }
 
   /* -------------------------------------------- */
@@ -945,7 +945,7 @@ export class RdDActor extends Actor {
     let itemMap = {};
     for (let item of itemsList) {
       let srcItem = sourceActor.data.items.find(subItem => subItem._id == item.id);
-      let newItem = await this.createOwnedItem(duplicate(srcItem));
+      let newItem = await this.createEmbeddedDocuments("Item", [ duplicate(srcItem) ] );
       console.log('New object', newItem, srcItem);
       itemMap[srcItem._id] = newItem._id; // Pour garder le lien ancien / nouveau
     }
@@ -960,11 +960,11 @@ export class RdDActor extends Actor {
         console.log('New conteneur filling!', newConteneur, newItemId, item);
         let contenu = duplicate(newConteneur.data.contenu);
         contenu.push(newItemId);
-        await this.updateOwnedItem({ _id: newConteneurId, 'data.contenu': contenu });
+        await this.updateEmbeddedDocuments( "Item", [{ _id: newConteneurId, 'data.contenu': contenu } ]);
       }
     }
     for (let item of itemsList) {
-      await sourceActor.deleteOwnedItem(item.id);
+      await sourceActor.deleteEmbeddedDocuments("Item", [ item.id] );
     }
   }
 
@@ -3139,7 +3139,7 @@ export class RdDActor extends Actor {
 
   /* -------------------------------------------- */
   _deleteStatusEffectsByIds(effectIds, options) {
-    this.deleteEmbeddedEntity('ActiveEffect', effectIds, options);
+    this.deleteEmbeddedDocuments('ActiveEffect', effectIds, options);
     this.applyActiveEffects();
   }
 
@@ -3154,7 +3154,7 @@ export class RdDActor extends Actor {
     this.deleteStatusEffectById(statusEffect.id, options);
     const effet = duplicate(statusEffect);
     effet["flags.core.statusId"] = effet.id;
-    await this.createEmbeddedEntity('ActiveEffect', effet, options);
+    await this.createEmbeddedDocuments('ActiveEffect', effet, options);
     this.applyActiveEffects();
   }
 
diff --git a/module/item-sheet.js b/module/item-sheet.js
index dcb0d42a..093ce575 100644
--- a/module/item-sheet.js
+++ b/module/item-sheet.js
@@ -48,6 +48,7 @@ export class RdDItemSheet extends ItemSheet {
   /* -------------------------------------------- */
   async getData() {
     let data = super.getData();
+
     data.categorieCompetences = RdDUtility.getCategorieCompetences();
     if ( data.item.type == 'tache' || data.item.type == 'livre' || data.item.type == 'meditation' || data.item.type == 'oeuvre') {
       data.caracList = duplicate(game.system.model.Actor.personnage.carac);
@@ -129,7 +130,7 @@ export class RdDItemSheet extends ItemSheet {
   _updateObject(event, formData) {
     // Données de bonus de cases ?
     formData = RdDItemSort.buildBonusCaseStringFromFormData( formData );
-    
+    //console.log("HERE", this, formData, this.object.data );
     return this.object.update(formData);
   }
 }
diff --git a/module/rdd-tmr-dialog.js b/module/rdd-tmr-dialog.js
index a3bcff7e..6677aad8 100644
--- a/module/rdd-tmr-dialog.js
+++ b/module/rdd-tmr-dialog.js
@@ -176,7 +176,7 @@ export class RdDTMRDialog extends Dialog {
   updateValuesDisplay() {
     let ptsreve = document.getElementById("tmr-pointsreve-value");
     ptsreve.innerHTML = this.actor.data.data.reve.reve.value;
-
+    console.log( this.actor.data.data );
     let tmrpos = document.getElementById("tmr-pos");
     let tmr = TMRUtility.getTMR(this.actor.data.data.reve.tmrpos.coord);
     tmrpos.innerHTML = this.actor.data.data.reve.tmrpos.coord + " (" + tmr.label + ")";
diff --git a/templates/item-arme-sheet.html b/templates/item-arme-sheet.html
index 3d5f9a69..43179e10 100644
--- a/templates/item-arme-sheet.html
+++ b/templates/item-arme-sheet.html
@@ -11,83 +11,83 @@
       <div class="form-group">
         <label for="categorie">Compétence associée</label>
         <select name="data.competence" id="competence" data-dtype="String">
-          {{#select item.data.competence}}
+          {{#select item.data.data.competence}}
           {{>"systems/foundryvtt-reve-de-dragon/templates/enum-competence.html"}}
           {{/select}}
         </select>
       </div>
       <div class="form-group">
         <label for="niveau">Dommmages </label>
-        <input class="attribute-value" type="text" name="data.dommages" value="{{data.dommages}}" data-dtype="String"/>
+        <input class="attribute-value" type="text" name="data.dommages" value="{{data.data.dommages}}" data-dtype="String"/>
       </div>
       <div class="form-group">
         <label for="xp">Résistance </label>
-        <input class="attribute-value" type="text" name="data.resistance" value="{{data.resistance}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="data.resistance" value="{{data.data.resistance}}" data-dtype="Number"/>
       </div>
       <div class="form-group">
         <label>Catégorie parade </label>
         <select name="data.categorie_parade" id="categorie_parade" data-dtype="String">
-          {{#select data.categorie_parade}}
+          {{#select data.data.categorie_parade}}
           {{>"systems/foundryvtt-reve-de-dragon/templates/enum-categorie-parade.html"}}
           {{/select}}
         </select>
       </div>
       <div class="form-group">
         <label for="xp">Encombrement </label>
-        <input class="attribute-value" type="text" name="data.encombrement" value="{{data.encombrement}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="data.encombrement" value="{{data.data.encombrement}}" data-dtype="Number"/>
       </div>
       <div class="form-group">
         <label for="xp">Force min. </label>
-        <input class="attribute-value" type="text" name="data.force" value="{{data.force}}" data-dtype="String"/>
+        <input class="attribute-value" type="text" name="data.force" value="{{data.data.force}}" data-dtype="String"/>
       </div>
       <div class="form-group">
         <label for="xp">Arme rapide ? </label>
-        <input class="attribute-value" type="checkbox" name="data.rapide"  {{#if data.rapide}}checked{{/if}}/>
+        <input class="attribute-value" type="checkbox" name="data.rapide"  {{#if data.data.rapide}}checked{{/if}}/>
       </div>
       <div class="form-group">
         <label for="xp">A Une main ? </label>
-        <input class="attribute-value" type="checkbox" name="data.unemain"  {{#if data.unemain}}checked{{/if}}/>
+        <input class="attribute-value" type="checkbox" name="data.unemain"  {{#if data.data.unemain}}checked{{/if}}/>
       </div>
       <div class="form-group">
         <label for="xp">A Deux mains ? </label>
-        <input class="attribute-value" type="checkbox" name="data.deuxmains"  {{#if data.deuxmains}}checked{{/if}}/>
+        <input class="attribute-value" type="checkbox" name="data.deuxmains"  {{#if data.data.deuxmains}}checked{{/if}}/>
       </div>
       <div class="form-group">
         <label for="xp">Portée courte </label>
-        <input class="attribute-value" type="text" name="data.portee_courte" value="{{data.portee_courte}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="data.portee_courte" value="{{data.data.portee_courte}}" data-dtype="Number"/>
       </div>
       <div class="form-group">
         <label for="xp">Portée moyenne </label>
-        <input class="attribute-value" type="text" name="data.portee_moyenne" value="{{data.portee_moyenne}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="data.portee_moyenne" value="{{data.data.portee_moyenne}}" data-dtype="Number"/>
       </div>
       <div class="form-group">
         <label for="xp">Portée extrême </label>
-        <input class="attribute-value" type="text" name="data.portee_extreme" value="{{data.portee_extreme}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="data.portee_extreme" value="{{data.data.portee_extreme}}" data-dtype="Number"/>
       </div>
       <div class="form-group">
         <label for="penetration">Pénétration </label>
-        <input class="attribute-value" type="text" name="data.penetration" value="{{data.penetration}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="data.penetration" value="{{data.data.penetration}}" data-dtype="Number"/>
       </div>
       <div class="form-group">
         <label for="xp">Prix (sols) </label>
-        <input class="attribute-value" type="text" name="data.cout" value="{{data.cout}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="data.cout" value="{{data.data.cout}}" data-dtype="Number"/>
       </div>
       <div class="form-group">
         <label for="xp">Magique ? </label>
-        <input class="attribute-value" type="checkbox" name="data.magique"  {{#if data.magique}}checked{{/if}}/>
+        <input class="attribute-value" type="checkbox" name="data.magique"  {{#if data.data.magique}}checked{{/if}}/>
       </div>
       <div class="form-group">
         <label for="penetration">Résistance magique </label>
-        <input class="attribute-value" type="text" name="data.resistance_magique" value="{{data.resistance_magique}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="data.resistance_magique" value="{{data.data.resistance_magique}}" data-dtype="Number"/>
       </div>
       <div class="form-group">
         <label for="penetration">Nombre d'Ecailles d'Efficacité </label>
-        <input class="attribute-value" type="text" name="data.ecaille_efficacite" value="{{data.ecaille_efficacite}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="data.ecaille_efficacite" value="{{data.data.ecaille_efficacite}}" data-dtype="Number"/>
       </div>
       <div class="form-group">
         <label for="penetration">Classe d'initiative au premier round (mêlée seulement) </label>
         <select name="data.initpremierround" id="initpremierround" data-dtype="String">
-          {{#select data.initpremierround}}
+          {{#select data.data.initpremierround}}
           {{>"systems/foundryvtt-reve-de-dragon/templates/enum-initpremierround.html"}}
           {{/select}}
         </select>
@@ -95,7 +95,7 @@
       <div class="flexcol">
         <span><label>Description : </label></span>
         <div class="form-group editor">
-          {{editor content=data.description target="data.description" button=true owner=owner editable=editable}}
+          {{editor content=data.data.description target="data.description" button=true owner=owner editable=editable}}
         </div>
       </div>
     </section>
diff --git a/templates/item-armure-sheet.html b/templates/item-armure-sheet.html
index e2bcb8af..906f4dc2 100644
--- a/templates/item-armure-sheet.html
+++ b/templates/item-armure-sheet.html
@@ -10,28 +10,28 @@
     <section class="sheet-body">
       <div class="form-group">
         <label for="xp">Protection</label>
-        <input class="attribute-value" type="text" name="data.protection" value="{{data.protection}}" data-dtype="String"/>
+        <input class="attribute-value" type="text" name="data.protection" value="{{data.data.protection}}" data-dtype="String"/>
       </div>
       <div class="form-group">
         <label for="xp">Encombrement </label>
-        <input class="attribute-value" type="text" name="data.encombrement" value="{{data.encombrement}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="data.encombrement" value="{{data.data.encombrement}}" data-dtype="Number"/>
       </div>
       <div class="form-group">
         <label for="xp">Détérioration</label>
-        <input class="attribute-value" type="text" name="data.deterioration" value="{{data.deterioration}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="data.deterioration" value="{{data.data.deterioration}}" data-dtype="Number"/>
       </div>
       <div class="form-group">
         <label for="xp">Malus Armure </label>
-        <input class="attribute-value" type="text" name="data.malus" value="{{data.malus}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="data.malus" value="{{data.data.malus}}" data-dtype="Number"/>
       </div>
       <div class="form-group">
         <label for="xp">Prix (sols) </label>
-        <input class="attribute-value" type="text" name="data.cout" value="{{data.cout}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="data.cout" value="{{data.data.cout}}" data-dtype="Number"/>
       </div>
       <div class="flexcol">
         <span><label>Description : </label></span>
         <div class="form-group editor">
-          {{editor content=data.description target="data.description" button=true owner=owner editable=editable}}
+          {{editor content=data.data.description target="data.description" button=true owner=owner editable=editable}}
         </div>
       </div>
     </section>
diff --git a/templates/item-casetmr-sheet.html b/templates/item-casetmr-sheet.html
index c6fc3ea9..d1ecf329 100644
--- a/templates/item-casetmr-sheet.html
+++ b/templates/item-casetmr-sheet.html
@@ -10,12 +10,12 @@
     <section class="sheet-body">
       <div class="form-group">
         <label for="niveau">Coordonnées TMR </label>
-        <input class="attribute-value" type="text" name="data.coord" value="{{data.coord}}" data-dtype="String"/>
+        <input class="attribute-value" type="text" name="data.coord" value="{{data.data.coord}}" data-dtype="String"/>
       </div>
       <div class="form-group">
         <label for="niveau">Mode spécifique</label>
         <select name="data.specific" id="specific" data-dtype="String">
-          {{#select item.data.specific}}
+          {{#select item.data.data.specific}}
           {{>"systems/foundryvtt-reve-de-dragon/templates/casetmr-specific-list.html"}}
           {{/select}}
       </select>
@@ -23,7 +23,7 @@
       <div class="flexcol">
         <span><label>Description : </label></span>
         <div class="form-group editor">
-          {{editor content=data.description target="data.description" button=true owner=owner editable=editable}}
+          {{editor content=data.data.description target="data.description" button=true owner=owner editable=editable}}
         </div>
       </div>
     </section>
diff --git a/templates/item-chant-sheet.html b/templates/item-chant-sheet.html
index 1d9af9ff..86c909bc 100644
--- a/templates/item-chant-sheet.html
+++ b/templates/item-chant-sheet.html
@@ -10,16 +10,16 @@
     <section class="sheet-body">
       <div class="form-group">
         <label class="alchimie-title" for="xp">Niveau</label>
-        <input class="attribute-value" type="text" name="data.niveau" value="{{data.niveau}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="data.niveau" value="{{data.data.niveau}}" data-dtype="Number"/>
       </div>
       <div class="form-group">
         <label>Référence / Auteur</label>
-        <input class="attribute-value" type="text" name="data.reference" value="{{data.reference}}" data-dtype="String"/>
+        <input class="attribute-value" type="text" name="data.reference" value="{{data.data.reference}}" data-dtype="String"/>
       </div>
       <div class="flexcol">
         <span><label class="alchimie-title">Description : </label></span>
         <div class="form-group editor">
-          {{editor content=data.description target="data.description" button=true owner=owner editable=editable}}
+          {{editor content=data.data.description target="data.description" button=true owner=owner editable=editable}}
         </div>
       </div>
     </section>
diff --git a/templates/item-competence-sheet.html b/templates/item-competence-sheet.html
index f1b01bb2..da5065a3 100644
--- a/templates/item-competence-sheet.html
+++ b/templates/item-competence-sheet.html
@@ -16,7 +16,7 @@
     <section class="sheet-body">
       <div class="form-group">
         <label for="categorie">Catégorie </label>
-        <select name="data.data.categorie" id="categorie" data-dtype="String">
+        <select name="data.categorie" id="categorie" data-dtype="String">
               {{#select item.data.data.categorie}}
               {{>"systems/foundryvtt-reve-de-dragon/templates/enum-categorie-competence.html"}}
               {{/select}}
@@ -24,15 +24,15 @@
       </div>
       <div class="form-group">
         <label for="niveau">Niveau </label>
-        <input class="attribute-value" type="text" name="data.data.niveau" value="{{data.data.niveau}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="data.niveau" value="{{data.data.niveau}}" data-dtype="Number"/>
       </div>
       <div class="form-group">
         <label for="xp">XP </label>
-        <input class="attribute-value" id="sheet-competence-xp" type="text" name="data.data.xp" value="{{data.data.xp}}" data-dtype="Number"/>
+        <input class="attribute-value" id="sheet-competence-xp" type="text" name="data.xp" value="{{data.data.xp}}" data-dtype="Number"/>
       </div>
       <div class="form-group">
         <label for="base">Niveau de base </label>
-        <select name="data.data.base" id="base" data-dtype="Number">
+        <select name="data.base" id="base" data-dtype="Number">
                 {{#select item.data.data.base}}
                 {{>"systems/foundryvtt-reve-de-dragon/templates/competence-base.html"}}
                 {{/select}}
@@ -40,7 +40,7 @@
       </div>
       <div class="form-group">
         <label for="defaut_carac">Caractéristique par défaut </label>
-        <select name="data.data.defaut_carac" id="defaut_carac" data-dtype="String">
+        <select name="data.defaut_carac" id="defaut_carac" data-dtype="String">
           {{#select item.data.data.defaut_carac}}
           {{>"systems/foundryvtt-reve-de-dragon/templates/competence-carac-defaut.html"}}
           {{/select}}
@@ -48,22 +48,22 @@
       </div>
       <div class="form-group">
         <label for="default_diffLibre">Difficulté libre par défaut</label>
-        <input class="attribute-value" type="text" name="data.data.default_diffLibre" value="{{data.data.default_diffLibre}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="data.default_diffLibre" value="{{data.data.default_diffLibre}}" data-dtype="Number"/>
       </div>
       {{#if (eq data.data.categorie 'draconic')}}
       <div class="form-group">
         <label for="xp">XP Sort </label>
-        <input class="attribute-value" type="text" name="data.data.xp_sort" value="{{data.data.xp_sort}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="data.xp_sort" value="{{data.data.xp_sort}}" data-dtype="Number"/>
       </div>
       {{/if}}
       <div class="form-group">
         <label for="niveau_archetype">Niveau d'Archetype</label>
-        <input class="attribute-value" type="text" name="data.data.niveau_archetype" value="{{data.data.niveau_archetype}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="data.niveau_archetype" value="{{data.data.niveau_archetype}}" data-dtype="Number"/>
       </div>
       <div class="flexcol">
         <span><label>Description : </label></span>
         <div class="form-group editor">
-          {{editor content=data.data.description target="data.data.description" button=true owner=owner editable=editable}}
+          {{editor content=data.data.description target="data.description" button=true owner=owner editable=editable}}
         </div>
       </div>
     </section>
diff --git a/templates/item-competencecreature-sheet.html b/templates/item-competencecreature-sheet.html
index 11760d4f..749298f6 100644
--- a/templates/item-competencecreature-sheet.html
+++ b/templates/item-competencecreature-sheet.html
@@ -10,39 +10,39 @@
     <section class="sheet-body">
       <div class="form-group">
         <label for="niveau">Niveau </label>
-        <input class="attribute-value" type="text" name="data.niveau" value="{{data.niveau}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="data.niveau" value="{{data.data.niveau}}" data-dtype="Number"/>
       </div>
       <div class="form-group">
         <label for="niveau">Valeur de Caractéristique </label>
-        <input class="attribute-value" type="text" name="data.carac_value" value="{{data.carac_value}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="data.carac_value" value="{{data.data.carac_value}}" data-dtype="Number"/>
       </div>
       <div class="form-group">
         <label for="default_diffLibre">Difficulté libre par défaut</label>
-        <input class="attribute-value" type="text" name="data.default_diffLibre" value="{{data.default_diffLibre}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="data.default_diffLibre" value="{{data.data.default_diffLibre}}" data-dtype="Number"/>
       </div>
       <div class="form-group">
         <label for="xp">Arme ? </label>
-        <input class="attribute-value" type="checkbox" name="data.iscombat"  {{#if data.iscombat}}checked{{/if}}/>
+        <input class="attribute-value" type="checkbox" name="data.data.iscombat"  {{#if data.iscombat}}checked{{/if}}/>
       </div>
       <div class="form-group">
         <label for="xp">Parade ? </label>
-        <input class="attribute-value" type="checkbox" name="data.isparade"  {{#if data.isparade}}checked{{/if}}/>
+        <input class="attribute-value" type="checkbox" name="data.data.isparade"  {{#if data.isparade}}checked{{/if}}/>
       </div>
       <div class="form-group">
         <label>Catégorie parade </label>
         <select name="data.categorie_parade" id="categorie_parade" data-dtype="String">
-          {{#select data.categorie_parade}}
+          {{#select data.data.categorie_parade}}
           {{>"systems/foundryvtt-reve-de-dragon/templates/enum-categorie-parade.html"}}
           {{/select}}
         </select>
       </div>
       <div class="form-group">
         <label for="niveau">Dommages (+dom), si applicable </label>
-        <input class="attribute-value" type="text" name="data.dommages" value="{{data.dommages}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="data.dommages" value="{{data.data.dommages}}" data-dtype="Number"/>
       </div>
       <span><label>Description : </label></span>
       <div class="form-group editor" style="min-height: 400px !important;">
-        {{editor content=data.description target="data.description" button=true owner=owner editable=editable}}
+        {{editor content=data.data.description target="data.description" button=true owner=owner editable=editable}}
       </div>
      </section>
     
diff --git a/templates/item-conteneur-sheet.html b/templates/item-conteneur-sheet.html
index 6f291219..a7569dd7 100644
--- a/templates/item-conteneur-sheet.html
+++ b/templates/item-conteneur-sheet.html
@@ -10,24 +10,24 @@
     <section class="sheet-body">
       <div class="form-group">
         <label for="xp">Encombrement </label>
-        <input class="attribute-value" type="text" name="data.encombrement" value="{{data.encombrement}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="data.encombrement" value="{{data.data.encombrement}}" data-dtype="Number"/>
       </div>
       <div class="form-group">
         <label for="xp">Capacite (points d'Encombrement portable)</label>
-        <input class="attribute-value" type="text" name="data.capacite" value="{{data.capacite}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="data.capacite" value="{{data.data.capacite}}" data-dtype="Number"/>
       </div>
       <div class="form-group">
         <label for="xp">Qualité</label>
-        <input class="attribute-value" type="text" name="data.qualite" value="{{data.qualite}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="data.qualite" value="{{data.data.qualite}}" data-dtype="Number"/>
       </div>
       <div class="form-group">
         <label for="xp">Prix (sols) </label>
-        <input class="attribute-value" type="text" name="data.cout" value="{{data.cout}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="data.cout" value="{{data.data.cout}}" data-dtype="Number"/>
       </div>
       <div class="flexcol">
         <span><label>Description : </label></span>
         <div class="form-group editor">
-          {{editor content=data.description target="data.description" button=true owner=owner editable=editable}}
+          {{editor content=data.data.description target="data.description" button=true owner=owner editable=editable}}
         </div>
       </div>
     </section>
diff --git a/templates/item-danse-sheet.html b/templates/item-danse-sheet.html
index ea410cf4..a9d07a85 100644
--- a/templates/item-danse-sheet.html
+++ b/templates/item-danse-sheet.html
@@ -11,7 +11,7 @@
       <div class="form-group">
         <label class="alchimie-title" for="xp">Type</label>
         <select name="data.type" data-dtype="String">
-          {{#select item.data.type}}
+          {{#select item.data.data.type}}
           <option value="recreative">Récréative</option>
           <option value="soliste">Soliste</option>
           {{/select}}    
@@ -19,24 +19,24 @@
       </div>
       <div class="form-group">
         <label class="alchimie-title" for="xp">Agilité ?</label>
-        <input class="attribute-value" type="checkbox" name="data.agilite" {{#if data.agilite}}checked{{/if}}/>    
+        <input class="attribute-value" type="checkbox" name="data.agilite" {{#if data.data.agilite}}checked{{/if}}/>    
       </div>
       <div class="form-group">
           <label class="alchimie-title" for="xp">Apparence ?</label>
-        <input class="attribute-value" type="checkbox" name="data.apparence"  {{#if data.apparence}}checked{{/if}}/>    
+        <input class="attribute-value" type="checkbox" name="data.apparence"  {{#if data.data.apparence}}checked{{/if}}/>    
       </div>
       <div class="form-group">
         <label class="alchimie-title" for="xp">Niveau</label>
-        <input class="attribute-value" type="text" name="data.niveau" value="{{data.niveau}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="data.niveau" value="{{data.data.niveau}}" data-dtype="Number"/>
       </div>
       <div class="form-group">
         <label>Référence / Auteur</label>
-        <input class="attribute-value" type="text" name="data.reference" value="{{data.reference}}" data-dtype="String"/>
+        <input class="attribute-value" type="text" name="data.reference" value="{{data.data.reference}}" data-dtype="String"/>
       </div>
       <div class="flexcol">
         <span><label class="alchimie-title">Description : </label></span>
         <div class="form-group editor">
-          {{editor content=data.description target="data.description" button=true owner=owner editable=editable}}
+          {{editor content=data.data.description target="data.description" button=true owner=owner editable=editable}}
         </div>
       </div>
     </section>
diff --git a/templates/item-herbe-sheet.html b/templates/item-herbe-sheet.html
index baec3279..f1b55dd0 100644
--- a/templates/item-herbe-sheet.html
+++ b/templates/item-herbe-sheet.html
@@ -11,24 +11,24 @@
     <div class="flexcol">
       <div class="form-group">
         <label>Niveau (si applicable)</label>
-        <input class="attribute-value" type="text" name="data.niveau" value="{{data.niveau}}" data-dtype="Number" />
+        <input class="attribute-value" type="text" name="data.niveau" value="{{data.data.niveau}}" data-dtype="Number" />
       </div>
       <div class="form-group">
         <label>Quantité (Pépins)</label>
-        <input class="attribute-value" type="text" name="data.quantite" value="{{data.quantite}}" data-dtype="Number" />
+        <input class="attribute-value" type="text" name="data.quantite" value="{{data.data.quantite}}" data-dtype="Number" />
       </div>
       <div class="form-group">
         <label>Prix (sols)</label>
-        <input class="attribute-value" type="text" name="data.cout" value="{{data.cout}}" data-dtype="Number" />
+        <input class="attribute-value" type="text" name="data.cout" value="{{data.data.cout}}" data-dtype="Number" />
       </div>
       <div class="form-group">
         <label>Milieu</label>
-        <input class="attribute-value" type="text" name="data.milieu" value="{{data.milieu}}" data-dtype="String" />
+        <input class="attribute-value" type="text" name="data.milieu" value="{{data.data.milieu}}" data-dtype="String" />
       </div>
       <div class="form-group">
         <label>Fréquence</label>
         <select name="data.rarete" id="rarete" data-dtype="String">
-          {{#select data.rarete}}
+          {{#select data.data.rarete}}
           {{>"systems/foundryvtt-reve-de-dragon/templates/enum-rarete.html"}}
           {{/select}}
         </select>
@@ -36,7 +36,7 @@
       <div class="form-group">
         <label>Catégorie</label>
         <select name="data.categorie" id="categorie" data-dtype="String">
-          {{#select data.categorie}}
+          {{#select data.data.categorie}}
           {{>"systems/foundryvtt-reve-de-dragon/templates/enum-categorie-ingredient.html"}}
           {{/select}}
         </select>
@@ -44,7 +44,7 @@
       <div class="flexcol">
         <span><label>Description :</label></span>
         <div class="form-group editor">
-          {{editor content=data.description target="data.description" button=true owner=owner editable=editable}}
+          {{editor content=data.data.description target="data.description" button=true owner=owner editable=editable}}
         </div>
       </div>
     </div>
diff --git a/templates/item-ingredient-sheet.html b/templates/item-ingredient-sheet.html
index 96d9e54b..680ed754 100644
--- a/templates/item-ingredient-sheet.html
+++ b/templates/item-ingredient-sheet.html
@@ -11,29 +11,29 @@
     <div class="flexcol">
       <div class="form-group">
         <label>Niveau (si applicable) </label>
-        <input class="attribute-value" type="text" name="data.niveau" value="{{data.niveau}}" data-dtype="Number" />
+        <input class="attribute-value" type="text" name="data.niveau" value="{{data.data.niveau}}" data-dtype="Number" />
       </div>
       <div class="form-group">
         <label>Quantité (Pépins)</label>
-        <input class="attribute-value" type="text" name="data.quantite" value="{{data.quantite}}" data-dtype="Number" />
+        <input class="attribute-value" type="text" name="data.quantite" value="{{data.data.quantite}}" data-dtype="Number" />
       </div>
       <div class="form-group">
         <label>Encombrement</label>
-        <input class="attribute-value" type="text" name="data.encombrement" value="{{data.encombrement}}" data-dtype="Number" />
+        <input class="attribute-value" type="text" name="data.encombrement" value="{{data.data.encombrement}}" data-dtype="Number" />
       </div>
       <div class="form-group">
         <label>Prix (sols)</label>
-        <input class="attribute-value" type="text" name="data.cout" value="{{data.cout}}" data-dtype="Number" />
+        <input class="attribute-value" type="text" name="data.cout" value="{{data.data.cout}}" data-dtype="Number" />
       </div>
     </div>
     <div class="form-group">
       <label>Milieu</label>
-      <input class="attribute-value" type="text" name="data.milieu" value="{{data.milieu}}" data-dtype="String" />
+      <input class="attribute-value" type="text" name="data.milieu" value="{{data.data.milieu}}" data-dtype="String" />
     </div>
     <div class="form-group">
       <label>Fréquence</label>
       <select name="data.rarete" id="rarete" data-dtype="String">
-        {{#select data.rarete}}
+        {{#select data.data.rarete}}
         {{>"systems/foundryvtt-reve-de-dragon/templates/enum-rarete.html"}}
         {{/select}}
       </select>
@@ -41,7 +41,7 @@
     <div class="form-group">
       <label>Catégorie</label>
       <select name="data.categorie" id="categorie" data-dtype="String">
-        {{#select data.categorie}}
+        {{#select data.data.categorie}}
         {{>"systems/foundryvtt-reve-de-dragon/templates/enum-categorie-ingredient.html"}}
         {{/select}}
       </select>
@@ -49,7 +49,7 @@
     <div class="flexcol">
       <span><label>Description : </label></span>
       <div class="form-group editor">
-        {{editor content=data.description target="data.description" button=true owner=owner editable=editable}}
+        {{editor content=data.data.description target="data.description" button=true owner=owner editable=editable}}
       </div>
     </div>
   </section>
diff --git a/templates/item-jeu-sheet.html b/templates/item-jeu-sheet.html
index 11649435..c5c7a4a5 100644
--- a/templates/item-jeu-sheet.html
+++ b/templates/item-jeu-sheet.html
@@ -11,7 +11,7 @@
       <div class="form-group">
         <label class="alchimie-title" for="xp">Type</label>
         <select name="data.type" data-dtype="String">
-          {{#select item.data.type}}
+          {{#select item.data.data.type}}
           <option value="adressehasard">Adresse/Hasard</option>
           <option value="de">Dés</option>
           <option value="carte">Cartes</option>
@@ -21,20 +21,20 @@
       </div>
       <div class="form-group">
         <label class="alchimie-title" for="xp">Base</label>
-        <input class="attribute-value" type="text" name="data.base" value="{{data.base}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="data.base" value="{{data.data.base}}" data-dtype="Number"/>
       </div>
       <div class="form-group">
         <label class="alchimie-title" for="xp">Caractéristique/Compétence</label>
-        <input class="attribute-value" type="text" name="data.caraccomp" value="{{data.caraccomp}}" data-dtype="String"/>
+        <input class="attribute-value" type="text" name="data.caraccomp" value="{{data.data.caraccomp}}" data-dtype="String"/>
       </div>
       <div class="form-group">
         <label>Référence / Auteur</label>
-        <input class="attribute-value" type="text" name="data.reference" value="{{data.reference}}" data-dtype="String"/>
+        <input class="attribute-value" type="text" name="data.reference" value="{{data.data.reference}}" data-dtype="String"/>
       </div>
       <div class="flexcol">
         <span><label class="alchimie-title">Description : </label></span>
         <div class="form-group editor">
-          {{editor content=data.description target="data.description" button=true owner=owner editable=editable}}
+          {{editor content=data.data.description target="data.description" button=true owner=owner editable=editable}}
         </div>
       </div>
     </section>
diff --git a/templates/item-livre-sheet.html b/templates/item-livre-sheet.html
index 88d60e54..4dabd130 100644
--- a/templates/item-livre-sheet.html
+++ b/templates/item-livre-sheet.html
@@ -10,12 +10,12 @@
     <section class="sheet-body">
       <div class="form-group">
         <label for="xp">Auteur</label>
-        <input class="attribute-value" type="text" name="data.auteur" value="{{data.auteur}}" data-dtype="String"/>
+        <input class="attribute-value" type="text" name="data.auteur" value="{{data.data.auteur}}" data-dtype="String"/>
       </div>
       <div class="form-group">
         <label for="xp">Compétence</label>
         <select name="data.competence" id="competenceselect" data-dtype="String">
-          {{#select item.data.competence}}
+          {{#select item.data.data.competence}}
           {{#each competences as |competence key|}}
           <option value="{{competence.name}}">{{competence.name}}</option>
           {{/each}}
@@ -24,35 +24,35 @@
       </div>
       <div class="form-group">
         <label for="xp">Difficulté</label>
-        <input class="attribute-value" type="text" name="data.difficulte" value="{{data.difficulte}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="data.difficulte" value="{{data.data.difficulte}}" data-dtype="Number"/>
       </div>
       <div class="form-group">
         <label for="xp">Points de tâches</label>
-        <input class="attribute-value" type="text" name="data.points_de_tache" value="{{data.points_de_tache}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="data.points_de_tache" value="{{data.data.points_de_tache}}" data-dtype="Number"/>
       </div>
       <div class="form-group">
         <label for="xp">Expérience</label>
-        <input class="attribute-value" type="text" name="data.xp" value="{{data.xp}}" data-dtype="String"/>
+        <input class="attribute-value" type="text" name="data.xp" value="{{data.data.xp}}" data-dtype="String"/>
       </div>
       <div class="form-group">
         <label for="xp">Niveau minimum</label>
-        <input class="attribute-value" type="text" name="data.niveau_minimum" value="{{data.niveau_minimum}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="data.niveau_minimum" value="{{data.data.niveau_minimum}}" data-dtype="Number"/>
       </div>
       <div class="form-group">
         <label for="xp">Niveau maximum</label>
-        <input class="attribute-value" type="text" name="data.niveau_maximum" value="{{data.niveau_maximum}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="data.niveau_maximum" value="{{data.data.niveau_maximum}}" data-dtype="Number"/>
       </div>
       <div class="form-group">
         <label for="xp">Encombrement </label>
-        <input class="attribute-value" type="text" name="data.encombrement" value="{{data.encombrement}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="data.encombrement" value="{{data.data.encombrement}}" data-dtype="Number"/>
       </div>
       <div class="form-group">
         <label>Quantité </label>
-        <input class="attribute-value" type="text" name="data.quantite" value="{{data.quantite}}" data-dtype="Number" />
+        <input class="attribute-value" type="text" name="data.quantite" value="{{data.data.quantite}}" data-dtype="Number" />
       </div>
       <div class="form-group">
         <label for="xp">Prix (sols) </label>
-        <input class="attribute-value" type="text" name="data.cout" value="{{data.cout}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="data.cout" value="{{data.data.cout}}" data-dtype="Number"/>
       </div>
       {{#if isOwned}}
       <div class="form-group">
@@ -62,7 +62,7 @@
       <div class="flexcol">
         <span><label>Description : </label></span>
         <div class="form-group editor">
-          {{editor content=data.description target="data.description" button=true owner=owner editable=editable}}
+          {{editor content=data.data.description target="data.description" button=true owner=owner editable=editable}}
         </div>
       </div>
     </section>
diff --git a/templates/item-maladie-sheet.html b/templates/item-maladie-sheet.html
index 8c2601d9..b78c7ebc 100644
--- a/templates/item-maladie-sheet.html
+++ b/templates/item-maladie-sheet.html
@@ -10,24 +10,24 @@
     <section class="sheet-body">
       <div class="form-group">
         <label for="xp">Malignité </label>
-        <input class="attribute-value" type="text" name="data.malignite" value="{{data.malignite}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="data.malignite" value="{{data.data.malignite}}" data-dtype="Number"/>
       </div>
       <div class="form-group">
         <label for="xp">Périodicité</label>
-        <input class="attribute-value" type="text" name="data.periodicite" value="{{data.periodicite}}" data-dtype="String"/>
+        <input class="attribute-value" type="text" name="data.periodicite" value="{{data.data.periodicite}}" data-dtype="String"/>
       </div>
       <div class="form-group">
         <label for="xp">Dommages</label>
-        <input class="attribute-value" type="text" name="data.dommages" value="{{data.dommages}}" data-dtype="String"/>
+        <input class="attribute-value" type="text" name="data.dommages" value="{{data.data.dommages}}" data-dtype="String"/>
       </div>
       <div class="form-group">
         <label for="xp">Remèdes </label>
-        <input class="attribute-value" type="text" name="data.remedes" value="{{data.remedes}}" data-dtype="String"/>
+        <input class="attribute-value" type="text" name="data.remedes" value="{{data.data.remedes}}" data-dtype="String"/>
       </div>
       <div class="flexcol">
         <span><label>Description : </label></span>
         <div class="form-group editor">
-          {{editor content=data.description target="data.description" button=true owner=owner editable=editable}}
+          {{editor content=data.data.description target="data.description" button=true owner=owner editable=editable}}
         </div>
       </div>
     </section>
diff --git a/templates/item-meditation-sheet.html b/templates/item-meditation-sheet.html
index 0b484acb..e8807738 100644
--- a/templates/item-meditation-sheet.html
+++ b/templates/item-meditation-sheet.html
@@ -11,7 +11,7 @@
       <div class="form-group">
         <label for="xp">Compétence</label>
         <select name="data.competence" id="competenceselect" data-dtype="String">
-          {{#select item.data.competence}}
+          {{#select item.data.data.competence}}
           {{#each competences as |competence key|}}
           <option value="{{competence.name}}">{{competence.name}}</option>
           {{/each}}
@@ -20,36 +20,36 @@
       </div>
       <div class="form-group">
         <label for="xp">Thème</label>
-        <input class="attribute-value" type="text" name="data.theme" value="{{data.theme}}" data-dtype="String"/>
+        <input class="attribute-value" type="text" name="data.theme" value="{{data.data.theme}}" data-dtype="String"/>
       </div>
       <div class="form-group">
         <label for="xp">Support</label>
-        <input class="attribute-value" type="text" name="data.support" value="{{data.support}}" data-dtype="String"/>
+        <input class="attribute-value" type="text" name="data.support" value="{{data.data.support}}" data-dtype="String"/>
       </div>
       <div class="form-group">
         <label for="xp">Heure</label>
         <select name="data.heure" id="heure" data-dtype="String">
-          {{#select item.data.heure}}
+          {{#select item.data.data.heure}}
           {{>"systems/foundryvtt-reve-de-dragon/templates/heures-select-option.html"}}
           {{/select}}
         </select>        
       </div>
       <div class="form-group">
         <label for="xp">Purification</label>
-        <input class="attribute-value" type="text" name="data.purification" value="{{data.purification}}" data-dtype="String"/>
+        <input class="attribute-value" type="text" name="data.purification" value="{{data.data.purification}}" data-dtype="String"/>
       </div>
       <div class="form-group">
         <label for="xp">Vêture</label>
-        <input class="attribute-value" type="text" name="data.veture" value="{{data.veture}}" data-dtype="String"/>
+        <input class="attribute-value" type="text" name="data.veture" value="{{data.data.veture}}" data-dtype="String"/>
       </div>
       <div class="form-group">
         <label for="xp">Comportement</label>
-        <input class="attribute-value" type="text" name="data.comportement" value="{{data.comportement}}" data-dtype="String"/>
+        <input class="attribute-value" type="text" name="data.comportement" value="{{data.data.comportement}}" data-dtype="String"/>
       </div>
       <div class="form-group">
         <label for="xp">Case TMR</label>
         <select name="data.tmr" id="tmr" data-dtype="String">
-          {{#select item.data.tmr}}
+          {{#select item.data.data.tmr}}
           {{>"systems/foundryvtt-reve-de-dragon/templates/sort-tmr.html"}}
           {{/select}}
         </select>
@@ -58,7 +58,7 @@
         <label for="xp">Malus</label>
         {{#if isGM}}
         <select name="data.malus" id="malus" data-dtype="Number">
-          {{#select item.data.malus}}
+          {{#select item.data.data.malus}}
           <option value="0">0</option>
           <option value="-1">-1</option>
           <option value="-2">-2</option>
@@ -73,12 +73,12 @@
           {{/select}}
         </select>
         {{else}}
-        <label>>{{data.malus}}</label>
+        <label>>{{data.data.malus}}</label>
         {{/if}}
       </div>
       <span><label>Description : </label></span>
       <div class="form-group editor" style="min-height: 400px">
-        {{editor content=data.description target="data.description" button=true owner=owner editable=editable}}
+        {{editor content=data.data.description target="data.description" button=true owner=owner editable=editable}}
       </div>
     </section>
     
diff --git a/templates/item-monnaie-sheet.html b/templates/item-monnaie-sheet.html
index 3133a691..86f827b8 100644
--- a/templates/item-monnaie-sheet.html
+++ b/templates/item-monnaie-sheet.html
@@ -10,19 +10,19 @@
     <section class="sheet-body">
       <div class="form-group">
         <label for="xp">Quantité</label>
-        <input class="attribute-value" type="text" name="data.quantite" value="{{data.quantite}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="data.quantite" value="{{data.data.quantite}}" data-dtype="Number"/>
       </div>
       <div class="form-group">
         <label for="xp">Valeur en Deniers</label>
         {{#if isGM}}
-        <input class="attribute-value" type="text" name="data.valeur_deniers" value="{{data.valeur_deniers}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="data.valeur_deniers" value="{{data.data.valeur_deniers}}" data-dtype="Number"/>
         {{else}}
         <label for="xp">{{data.valeur_deniers}}</label>
         {{/if}}
       </div>
       <div class="form-group">
         <label for="xp">Encombrement</label>
-        <input class="attribute-value" type="text" name="data.encombrement" value="{{data.encombrement}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="data.encombrement" value="{{data.data.encombrement}}" data-dtype="Number"/>
       </div>
       <span><label>Description : </label></span>
       <div class="form-group editor" style="min-height: 400px !important;">
diff --git a/templates/item-munition-sheet.html b/templates/item-munition-sheet.html
index eed1dc1d..96c15e26 100644
--- a/templates/item-munition-sheet.html
+++ b/templates/item-munition-sheet.html
@@ -10,24 +10,24 @@
     <section class="sheet-body">
       <div class="form-group">
         <label for="xp">Encombrement </label>
-        <input class="attribute-value" type="text" name="data.encombrement" value="{{data.encombrement}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="data.encombrement" value="{{data.data.encombrement}}" data-dtype="Number"/>
       </div>
       <div class="form-group">
         <label>Quantité </label>
-        <input class="attribute-value" type="text" name="data.quantite" value="{{data.quantite}}" data-dtype="Number" />
+        <input class="attribute-value" type="text" name="data.quantite" value="{{data.data.quantite}}" data-dtype="Number" />
       </div>      
       <div class="form-group">
         <label for="xp">Qualité</label>
-        <input class="attribute-value" type="text" name="data.qualite" value="{{data.qualite}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="data.qualite" value="{{data.data.qualite}}" data-dtype="Number"/>
       </div>
       <div class="form-group">
         <label for="xp">Prix (sols) </label>
-        <input class="attribute-value" type="text" name="data.cout" value="{{data.cout}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="data.cout" value="{{data.data.cout}}" data-dtype="Number"/>
       </div>
       <div class="flexcol">
         <span><label>Description : </label></span>
         <div class="form-group editor">
-          {{editor content=data.description target="data.description" button=true owner=owner editable=editable}}
+          {{editor content=data.data.description target="data.description" button=true owner=owner editable=editable}}
         </div>
       </div>
     </section>
diff --git a/templates/item-musique-sheet.html b/templates/item-musique-sheet.html
index 1d9af9ff..86c909bc 100644
--- a/templates/item-musique-sheet.html
+++ b/templates/item-musique-sheet.html
@@ -10,16 +10,16 @@
     <section class="sheet-body">
       <div class="form-group">
         <label class="alchimie-title" for="xp">Niveau</label>
-        <input class="attribute-value" type="text" name="data.niveau" value="{{data.niveau}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="data.niveau" value="{{data.data.niveau}}" data-dtype="Number"/>
       </div>
       <div class="form-group">
         <label>Référence / Auteur</label>
-        <input class="attribute-value" type="text" name="data.reference" value="{{data.reference}}" data-dtype="String"/>
+        <input class="attribute-value" type="text" name="data.reference" value="{{data.data.reference}}" data-dtype="String"/>
       </div>
       <div class="flexcol">
         <span><label class="alchimie-title">Description : </label></span>
         <div class="form-group editor">
-          {{editor content=data.description target="data.description" button=true owner=owner editable=editable}}
+          {{editor content=data.data.description target="data.description" button=true owner=owner editable=editable}}
         </div>
       </div>
     </section>
diff --git a/templates/item-objet-sheet.html b/templates/item-objet-sheet.html
index 89a40b0f..81fca331 100644
--- a/templates/item-objet-sheet.html
+++ b/templates/item-objet-sheet.html
@@ -10,28 +10,28 @@
     <section class="sheet-body">
       <div class="form-group">
         <label for="xp">Encombrement </label>
-        <input class="attribute-value" type="text" name="data.encombrement" value="{{data.encombrement}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="data.encombrement" value="{{data.data.encombrement}}" data-dtype="Number"/>
       </div>
       <div class="form-group">
         <label>Quantité </label>
-        <input class="attribute-value" type="text" name="data.quantite" value="{{data.quantite}}" data-dtype="Number" />
+        <input class="attribute-value" type="text" name="data.quantite" value="{{data.data.quantite}}" data-dtype="Number" />
       </div>
       <div class="form-group">
         <label for="xp">Résistance</label>
-        <input class="attribute-value" type="text" name="data.resistance" value="{{data.resistance}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="data.resistance" value="{{data.data.resistance}}" data-dtype="Number"/>
       </div>
       <div class="form-group">
         <label for="xp">Qualité</label>
-        <input class="attribute-value" type="text" name="data.qualite" value="{{data.qualite}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="data.qualite" value="{{data.data.qualite}}" data-dtype="Number"/>
       </div>
       <div class="form-group">
         <label for="xp">Prix (sols) </label>
-        <input class="attribute-value" type="text" name="data.cout" value="{{data.cout}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="data.cout" value="{{data.data.cout}}" data-dtype="Number"/>
       </div>
       <div class="flexcol">
         <span><label>Description : </label></span>
         <div class="form-group editor">
-          {{editor content=data.description target="data.description" button=true owner=owner editable=editable}}
+          {{editor content=data.data.description target="data.description" button=true owner=owner editable=editable}}
         </div>
       </div>
      </section>
diff --git a/templates/item-oeuvre-sheet.html b/templates/item-oeuvre-sheet.html
index 82f2c2b0..b2a27c6a 100644
--- a/templates/item-oeuvre-sheet.html
+++ b/templates/item-oeuvre-sheet.html
@@ -11,7 +11,7 @@
       <div class="form-group">
         <label>Caractéristique</label>
         <select name="data.default_carac" id="default_carac" data-dtype="String">
-          {{#select item.data.default_carac}}
+          {{#select item.data.data.default_carac}}
           {{>"systems/foundryvtt-reve-de-dragon/templates/competence-carac-defaut.html"}}
           {{/select}}
         </select>
@@ -19,7 +19,7 @@
       <div class="form-group">
         <label>Compétence</label>
         <select name="data.competence" id="competenceselect" data-dtype="String">
-          {{#select item.data.competence}}
+          {{#select item.data.data.competence}}
           {{#each competences as |competence key|}}
           <option value="{{competence.name}}">{{competence.name}}</option>
           {{/each}}
@@ -28,16 +28,16 @@
       </div>
       <div class="form-group">
         <label>Référence / Auteur</label>
-        <input class="attribute-value" type="text" name="data.reference" value="{{data.reference}}" data-dtype="String"/>
+        <input class="attribute-value" type="text" name="data.reference" value="{{data.data.reference}}" data-dtype="String"/>
       </div>
       <div class="form-group">
         <label>Niveau</label>
-        <input class="attribute-value" type="text" name="data.niveau" value="{{data.niveau}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="data.niveau" value="{{data.data.niveau}}" data-dtype="Number"/>
       </div>
       <div class="flexcol">
         <span><label>Description : </label></span>
         <div class="form-group editor">
-          {{editor content=data.description target="data.description" button=true owner=owner editable=editable}}
+          {{editor content=data.data.description target="data.description" button=true owner=owner editable=editable}}
         </div>
       </div>
     </section>
diff --git a/templates/item-ombre-sheet.html b/templates/item-ombre-sheet.html
index 216e1638..885c6887 100644
--- a/templates/item-ombre-sheet.html
+++ b/templates/item-ombre-sheet.html
@@ -10,11 +10,11 @@
     <section class="sheet-body">
       <div class="form-group">
         <label for="xp">Refoulement</label>
-        <input class="attribute-value" type="text" name="data.refoulement" value="{{data.refoulement}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="data.refoulement" value="{{data.data.refoulement}}" data-dtype="Number"/>
       </div>
       <span><label>Description : </label></span>
       <div class="form-group editor" style="min-height: 400px !important;">
-        {{editor content=data.description target="data.description" button=true owner=owner editable=editable}}
+        {{editor content=data.data.description target="data.description" button=true owner=owner editable=editable}}
       </div>
     </section>
     
diff --git a/templates/item-poison-sheet.html b/templates/item-poison-sheet.html
index 8c2601d9..b78c7ebc 100644
--- a/templates/item-poison-sheet.html
+++ b/templates/item-poison-sheet.html
@@ -10,24 +10,24 @@
     <section class="sheet-body">
       <div class="form-group">
         <label for="xp">Malignité </label>
-        <input class="attribute-value" type="text" name="data.malignite" value="{{data.malignite}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="data.malignite" value="{{data.data.malignite}}" data-dtype="Number"/>
       </div>
       <div class="form-group">
         <label for="xp">Périodicité</label>
-        <input class="attribute-value" type="text" name="data.periodicite" value="{{data.periodicite}}" data-dtype="String"/>
+        <input class="attribute-value" type="text" name="data.periodicite" value="{{data.data.periodicite}}" data-dtype="String"/>
       </div>
       <div class="form-group">
         <label for="xp">Dommages</label>
-        <input class="attribute-value" type="text" name="data.dommages" value="{{data.dommages}}" data-dtype="String"/>
+        <input class="attribute-value" type="text" name="data.dommages" value="{{data.data.dommages}}" data-dtype="String"/>
       </div>
       <div class="form-group">
         <label for="xp">Remèdes </label>
-        <input class="attribute-value" type="text" name="data.remedes" value="{{data.remedes}}" data-dtype="String"/>
+        <input class="attribute-value" type="text" name="data.remedes" value="{{data.data.remedes}}" data-dtype="String"/>
       </div>
       <div class="flexcol">
         <span><label>Description : </label></span>
         <div class="form-group editor">
-          {{editor content=data.description target="data.description" button=true owner=owner editable=editable}}
+          {{editor content=data.data.description target="data.description" button=true owner=owner editable=editable}}
         </div>
       </div>
     </section>
diff --git a/templates/item-potion-sheet.html b/templates/item-potion-sheet.html
index a78d1e35..ec5bf99d 100644
--- a/templates/item-potion-sheet.html
+++ b/templates/item-potion-sheet.html
@@ -10,20 +10,20 @@
   <section class="sheet-body">
     <div class="form-group">
       <label>Encombrement</label>
-      <input class="attribute-value" type="text" name="data.encombrement" value="{{data.encombrement}}" data-dtype="Number" />
+      <input class="attribute-value" type="text" name="data.encombrement" value="{{data.data.encombrement}}" data-dtype="Number" />
     </div>
     <div class="form-group">
       <label>Quantité </label>
-      <input class="attribute-value" type="text" name="data.quantite" value="{{data.quantite}}" data-dtype="Number" />
+      <input class="attribute-value" type="text" name="data.quantite" value="{{data.data.quantite}}" data-dtype="Number" />
     </div>
     <div class="form-group">
       <label>Prix (sols)</label>
-      <input class="attribute-value" type="text" name="data.cout" value="{{data.cout}}" data-dtype="Number" />
+      <input class="attribute-value" type="text" name="data.cout" value="{{data.data.cout}}" data-dtype="Number" />
     </div>
     <div class="form-group">
       <label>Fréquence</label>
       <select name="data.rarete" id="rarete" data-dtype="String">
-        {{#select data.rarete}}
+        {{#select data.data.rarete}}
         {{>"systems/foundryvtt-reve-de-dragon/templates/enum-rarete.html"}}
         {{/select}}
       </select>
@@ -31,7 +31,7 @@
     <div class="form-group">
       <label>Catégorie</label>
       <select name="data.categorie" id="categorie" data-dtype="String">
-        {{#select data.categorie}}
+        {{#select data.data.categorie}}
         {{>"systems/foundryvtt-reve-de-dragon/templates/enum-categorie-ingredient.html"}}
         {{/select}}
       </select>
@@ -39,7 +39,7 @@
     <div class="flexcol">
       <span><label>Description :</label></span>
       <div class="form-group editor">
-        {{editor content=data.description target="data.description" button=true owner=owner editable=editable}}
+        {{editor content=data.data.description target="data.description" button=true owner=owner editable=editable}}
       </div>
     </div>
   </section>
diff --git a/templates/item-queue-sheet.html b/templates/item-queue-sheet.html
index 4ffbc24c..6440c0ed 100644
--- a/templates/item-queue-sheet.html
+++ b/templates/item-queue-sheet.html
@@ -10,12 +10,12 @@
     <section class="sheet-body">
       <div class="form-group">
         <label for="xp">Refoulement</label>
-        <input class="attribute-value" type="text" name="data.refoulement" value="{{data.refoulement}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="data.refoulement" value="{{data.data.refoulement}}" data-dtype="Number"/>
       </div>
       <div class="flexcol">
         <span><label>Description : </label></span>
         <div class="form-group editor">
-          {{editor content=data.description target="data.description" button=true owner=owner editable=editable}}
+          {{editor content=data.data.description target="data.description" button=true owner=owner editable=editable}}
         </div>
       </div>
     </section>
diff --git a/templates/item-recettealchimique-sheet.html b/templates/item-recettealchimique-sheet.html
index c8211a92..96852ada 100644
--- a/templates/item-recettealchimique-sheet.html
+++ b/templates/item-recettealchimique-sheet.html
@@ -10,36 +10,36 @@
     <section class="sheet-body">
       <div class="form-group">
         <label class="alchimie-title" for="xp">But</label>
-        <input class="attribute-value" type="text" name="data.but" value="{{data.but}}" data-dtype="String"/>
+        <input class="attribute-value" type="text" name="data.but" value="{{data.data.but}}" data-dtype="String"/>
       </div>
       <div class="flexcol">
         <span><label class="alchimie-title">Manipulation : </label></span>
         <div class="form-group medium-editor">
-          {{editor content=data.manipulation_update target="data.manipulation" button=true owner=owner editable=editable}}
+          {{editor content=data.data.manipulation_update target="data.manipulation" button=true owner=owner editable=editable}}
         </div>
       </div>
       <div class="flexcol">
         <span><label class="alchimie-title">Utilisation : </label></span>
         <div class="form-group small-editor">
-          {{editor content=data.utilisation target="data.utilisation" button=true owner=owner editable=editable}}
+          {{editor content=data.data.utilisation target="data.utilisation" button=true owner=owner editable=editable}}
         </div>
       </div>
       <div class="flexcol">
         <span><label class="alchimie-title">Enchantement : </label></span>
         <div class="form-group small-editor">
-          {{editor content=data.enchantement target="data.enchantement" button=true owner=owner editable=editable}}
+          {{editor content=data.data.enchantement target="data.enchantement" button=true owner=owner editable=editable}}
         </div>
       </div>
       <div class="flexcol">
         <span><label class="alchimie-title">Sur-effet : </label></span>
         <div class="form-group small-editor">
-          {{editor content=data.sureffet target="data.sureffet" button=true owner=owner editable=editable}}
+          {{editor content=data.data.sureffet target="data.sureffet" button=true owner=owner editable=editable}}
         </div>
       </div>
       <div class="flexcol">
         <span><label class="alchimie-title">Notes additionnelles : </label></span>
         <div class="form-group editor">
-          {{editor content=data.description target="data.description" button=true owner=owner editable=editable}}
+          {{editor content=data.data.description target="data.description" button=true owner=owner editable=editable}}
         </div>
       </div>
     </section>
diff --git a/templates/item-recettecuisine-sheet.html b/templates/item-recettecuisine-sheet.html
index 2d64730c..17c93c55 100644
--- a/templates/item-recettecuisine-sheet.html
+++ b/templates/item-recettecuisine-sheet.html
@@ -10,34 +10,34 @@
     <section class="sheet-body">
       <div class="form-group">
         <label>Niveau</label>
-        <input class="attribute-value" type="text" name="data.niveau" value="{{data.niveau}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="data.niveau" value="{{data.data.niveau}}" data-dtype="Number"/>
       </div>
       <div class="form-group">
         <label>Durée</label>
-        <input class="attribute-value" type="text" name="data.duree" value="{{data.duree}}" data-dtype="String"/>
+        <input class="attribute-value" type="text" name="data.duree" value="{{data.data.duree}}" data-dtype="String"/>
       </div>
       <div class="form-group">
         <label>Sust</label>
-        <input class="attribute-value" type="text" name="data.sust" value="{{data.sust}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="data.sust" value="{{data.data.sust}}" data-dtype="Number"/>
       </div>
       <div class="form-group">
         <label>Exotisme</label>
-        <input class="attribute-value" type="text" name="data.exotisme" value="{{data.exotisme}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="data.exotisme" value="{{data.data.exotisme}}" data-dtype="Number"/>
       </div>
       <div class="flexcol">
         <span><label>Ingrédients : </label></span>
         <div class="form-group editor">
-          {{editor content=data.ingredients target="data.ingredients" button=true owner=owner editable=editable}}
+          {{editor content=data.data.ingredients target="data.ingredients" button=true owner=owner editable=editable}}
         </div>
       </div>
       <div class="form-group">
         <label>Référence / Auteur</label>
-        <input class="attribute-value" type="text" name="data.reference" value="{{data.reference}}" data-dtype="String"/>
+        <input class="attribute-value" type="text" name="data.reference" value="{{data.data.reference}}" data-dtype="String"/>
       </div>
       <div class="flexcol">
         <span><label>Description : </label></span>
         <div class="form-group editor">
-          {{editor content=data.description target="data.description" button=true owner=owner editable=editable}}
+          {{editor content=data.data.description target="data.description" button=true owner=owner editable=editable}}
         </div>
       </div>
     </section>
diff --git a/templates/item-rencontresTMR-sheet.html b/templates/item-rencontresTMR-sheet.html
index 3f153150..d9add1e5 100644
--- a/templates/item-rencontresTMR-sheet.html
+++ b/templates/item-rencontresTMR-sheet.html
@@ -11,7 +11,7 @@
       <div class="flexcol">
         <span><label>Description : </label></span>
         <div class="form-group editor">
-          {{editor content=data.description target="data.description" button=true owner=owner editable=editable}}
+          {{editor content=data.data.description target="data.description" button=true owner=owner editable=editable}}
         </div>
       </div>
     </section>
diff --git a/templates/item-sheet.html b/templates/item-sheet.html
deleted file mode 100644
index c8acc8e5..00000000
--- a/templates/item-sheet.html
+++ /dev/null
@@ -1,64 +0,0 @@
-<form class="{{cssClass}}" autocomplete="off">
-    <header class="sheet-header">
-        <img class="profile-img" src="{{item.img}}" data-edit="img" title="{{item.name}}"/>
-        <div class="header-fields">
-            <h1 class="charname"><input name="name" type="text" value="{{item.name}}" placeholder="Name"/></h1>
-            <div class="resource">
-            	<label>Quantity</label>
-                <input type="text" name="data.quantity" value="{{data.quantity}}" data-dtype="Number"/>
-            </div>
-            <div class="resource">
-            	<label>Weight</label>
-                <input type="text" name="data.weight" value="{{data.weight}}" data-dtype="Number"/>
-            </div>
-        </div>
-    </header>
-
-    {{!-- Sheet Tab Navigation --}}
-    <nav class="sheet-tabs tabs" data-group="primary">
-        <a class="item" data-tab="description">Description</a>
-        <a class="item" data-tab="attributes">Attributes</a>
-    </nav>
-
-    {{!-- Sheet Body --}}
-    <section class="sheet-body">
-
-        {{!-- Description Tab --}}
-        <div class="tab" data-group="primary" data-tab="description">
-            {{editor content=data.description target="data.description" button=true owner=owner editable=editable}}
-        </div>
-
-        {{!-- Attributes Tab --}}
-        <div class="tab attributes" data-group="primary" data-tab="attributes">
-            <header class="attributes-header flexrow">
-                <span class="attribute-key">Attribute Key</span>
-                <span class="attribute-value">Value</span>
-                <span class="attribute-label">Label</span>
-                <span class="attribute-dtype">Data Type</span>
-                <a class="attribute-control" data-action="create"><i class="fas fa-plus"></i></a>
-            </header>
-
-            <ol class="attributes-list">
-            {{#each data.attributes as |attr key|}}
-                <li class="attribute flexrow" data-attribute="{{key}}">
-                    <input class="attribute-key" type="text" name="data.attributes.{{key}}.key" value="{{key}}"/>
-                    {{#if attr.isCheckbox}}
-                    <label class="attribute-value checkbox"><input type="checkbox" name="data.attributes.{{key}}.value" {{checked attr.value}}/></label>
-                    {{else}}
-                    <input class="attribute-value" type="text" name="data.attributes.{{key}}.value" value="{{attr.value}}" data-dtype="{{attr.dtype}}"/>
-                    {{/if}}
-                    <input class="attribute-label" type="text" name="data.attributes.{{key}}.label" value="{{attr.label}}"/>
-                    <select class="attribute-dtype" name="data.attributes.{{key}}.dtype">
-                        {{#select attr.dtype}}
-                        {{#each ../dtypes as |t|}}
-                        <option value="{{t}}">{{t}}</option>
-                        {{/each}}
-                        {{/select}}
-                    </select>
-                    <a class="attribute-control" data-action="delete"><i class="fas fa-trash"></i></a>
-                </li>
-            {{/each}}
-            </ol>
-        </div>
-    </section>
-</form>
diff --git a/templates/item-sort-sheet.html b/templates/item-sort-sheet.html
index a77801a0..78b5190a 100644
--- a/templates/item-sort-sheet.html
+++ b/templates/item-sort-sheet.html
@@ -11,7 +11,7 @@
       <div class="form-group">
         <label for="categorie">Draconic </label>
         <select name="data.draconic" id="draconic" data-dtype="String">
-          {{#select item.data.draconic}}
+          {{#select item.data.data.draconic}}
           {{>"systems/foundryvtt-reve-de-dragon/templates/sort-draconic.html"}}
           {{/select}}
         </select>
@@ -19,7 +19,7 @@
       <div class="form-group">
         <label for="xp">Case TMR </label>
         <select name="data.caseTMR" id="caseTMR" data-dtype="String">
-          {{#select item.data.caseTMR}}
+          {{#select item.data.data.caseTMR}}
           {{>"systems/foundryvtt-reve-de-dragon/templates/sort-tmr.html"}}
           <option value="special">Case spéciale TMR (saisie ci-dessous)</option>
           {{/select}}
@@ -27,43 +27,43 @@
       </div>
       <div class="form-group">
         <label for="xp">Case TMR Spéciale </label>
-        <input class="attribute-value" type="text" name="data.caseTMRspeciale" value="{{data.caseTMRspeciale}}" data-dtype="String"/>
+        <input class="attribute-value" type="text" name="data.caseTMRspeciale" value="{{data.data.caseTMRspeciale}}" data-dtype="String"/>
       </div>
       <div class="form-group">
         <label for="xp">Difficulté </label>
-        <input class="attribute-value" type="text" name="data.difficulte" value="{{data.difficulte}}" data-dtype="String"/>
+        <input class="attribute-value" type="text" name="data.difficulte" value="{{data.data.difficulte}}" data-dtype="String"/>
       </div>
       <div class="form-group">
         <label for="xp">Coût en Rêve </label>
-        <input class="attribute-value" type="text" name="data.ptreve" value="{{data.ptreve}}" data-dtype="String"/>
+        <input class="attribute-value" type="text" name="data.ptreve" value="{{data.data.ptreve}}" data-dtype="String"/>
       </div>
       <div class="form-group">
         <label for="xp">Coût en Seuil </label>
-        <input class="attribute-value" type="text" name="data.coutseuil" value="{{data.coutseuil}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="data.coutseuil" value="{{data.data.coutseuil}}" data-dtype="Number"/>
       </div>
       <div class="form-group">
         <label for="rituel">Rituel </label>
-        <input class="attribute-value" type="checkbox" name="data.isrituel"  {{#if data.isrituel}}checked{{/if}}/>
+        <input class="attribute-value" type="checkbox" name="data.isrituel"  {{#if data.data.isrituel}}checked{{/if}}/>
       </div>
       <div class="form-group">
         <label for="xp">Durée </label>
-        <input class="attribute-value" type="text" name="data.duree" value="{{data.duree}}" data-dtype="String"/>
+        <input class="attribute-value" type="text" name="data.duree" value="{{data.data.duree}}" data-dtype="String"/>
       </div>
       <div class="form-group">
         <label for="xp">Portée </label>
-        <input class="attribute-value" type="text" name="data.portee" value="{{data.portee}}" data-dtype="String"/>
+        <input class="attribute-value" type="text" name="data.portee" value="{{data.data.portee}}" data-dtype="String"/>
       </div>
       <div class="form-group">
         <label for="xp">Cible </label>
-        <input class="attribute-value" type="text" name="data.cible" value="{{data.cible}}" data-dtype="String"/>
+        <input class="attribute-value" type="text" name="data.cible" value="{{data.data.cible}}" data-dtype="String"/>
       </div>
       <div class="form-group">
         <label for="xp">Jet de Resistance</label>
-        <input class="attribute-value" type="text" name="data.JR" value="{{data.JR}}" data-dtype="String"/>
+        <input class="attribute-value" type="text" name="data.JR" value="{{data.data.JR}}" data-dtype="String"/>
       </div>
       <div class="form-group">
         <label for="xp">XP </label>
-        <input class="attribute-value" type="text" name="data.xp" value="{{data.xp}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="data.xp" value="{{data.data.xp}}" data-dtype="Number"/>
       </div>
       {{#if owner}}
       {{#each bonusCaseList as |bcData key|}}
@@ -77,7 +77,7 @@
       <div class="flexcol">
         <span><label>Description : </label></span>
         <div class="form-group editor">
-          {{editor content=data.description target="data.description" button=true owner=owner editable=editable}}
+          {{editor content=data.data.description target="data.description" button=true owner=owner editable=editable}}
         </div>
       </div>
     </section>
diff --git a/templates/item-souffle-sheet.html b/templates/item-souffle-sheet.html
index 3f153150..d9add1e5 100644
--- a/templates/item-souffle-sheet.html
+++ b/templates/item-souffle-sheet.html
@@ -11,7 +11,7 @@
       <div class="flexcol">
         <span><label>Description : </label></span>
         <div class="form-group editor">
-          {{editor content=data.description target="data.description" button=true owner=owner editable=editable}}
+          {{editor content=data.data.description target="data.description" button=true owner=owner editable=editable}}
         </div>
       </div>
     </section>
diff --git a/templates/item-tache-sheet.html b/templates/item-tache-sheet.html
index 1fccfcdf..0c5b361f 100644
--- a/templates/item-tache-sheet.html
+++ b/templates/item-tache-sheet.html
@@ -11,7 +11,7 @@
       <div class="form-group">
         <label for="xp">Caractéristique</label>
         <select name="data.carac" id="caracselect" data-dtype="String">
-        {{#select item.data.carac}}
+        {{#select item.data.data.carac}}
         {{#each caracList  as |carac key|}}
         <option value="{{key}}">{{carac.label}}</option>
         {{/each}}
@@ -21,7 +21,7 @@
       <div class="form-group">
         <label for="xp">Compétence</label>
         <select name="data.competence" id="competenceselect" data-dtype="String">
-        {{#select item.data.competence}}
+        {{#select item.data.data.competence}}
         {{#each competences as |competence key|}}
         <option value="{{competence.name}}">{{competence.name}}</option>
         {{/each}}
@@ -30,27 +30,27 @@
     </div>
       <div class="form-group">
         <label for="xp">Difficulté</label>
-        <input class="attribute-value" type="text" name="data.difficulte" value="{{data.difficulte}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="data.difficulte" value="{{data.data.difficulte}}" data-dtype="Number"/>
       </div>
       <div class="form-group">
         <label for="xp">Périodicité</label>
-        <input class="attribute-value" type="text" name="data.periodicite" value="{{data.periodicite}}" data-dtype="String"/>
+        <input class="attribute-value" type="text" name="data.periodicite" value="{{data.data.periodicite}}" data-dtype="String"/>
       </div>
       <div class="form-group">
         <label for="xp">Fatigue</label>
-        <input class="attribute-value" type="text" name="data.fatigue" value="{{data.fatigue}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="data.fatigue" value="{{data.data.fatigue}}" data-dtype="Number"/>
       </div>
       <div class="form-group">
         <label for="xp">Points de tâches nécessaires</label>
-        <input class="attribute-value" type="text" name="data.points_de_tache" value="{{data.points_de_tache}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="data.points_de_tache" value="{{data.data.points_de_tache}}" data-dtype="Number"/>
       </div>
       <div class="form-group">
         <label for="xp">Points de tâches obtenus</label>
-        <input class="attribute-value" type="text" name="data.points_de_tache_courant" value="{{data.points_de_tache_courant}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="data.points_de_tache_courant" value="{{data.data.points_de_tache_courant}}" data-dtype="Number"/>
       </div>
       <span><label>Description : </label></span>
       <div class="form-group editor">
-        {{editor content=data.description target="data.description" button=true owner=owner editable=editable}}
+        {{editor content=data.data.description target="data.description" button=true owner=owner editable=editable}}
       </div>
      </section>
     
diff --git a/templates/item-tarot-sheet.html b/templates/item-tarot-sheet.html
index 752b39ef..606722e1 100644
--- a/templates/item-tarot-sheet.html
+++ b/templates/item-tarot-sheet.html
@@ -11,12 +11,12 @@
       <div class="flexcol">
         <div class="form-group">
           <label>Aspect</label>
-          <input class="attribute-value" type="text" name="data.concept" value="{{data.concept}}" data-dtype="String" />
+          <input class="attribute-value" type="text" name="data.concept" value="{{data.data.concept}}" data-dtype="String" />
         </div>
         <div class="form-group">
           <label>Sens</label>
           <select name="data.aspect" id="aspect" data-dtype="String">
-            {{#select data.aspect}}
+            {{#select data.data.aspect}}
             {{>"systems/foundryvtt-reve-de-dragon/templates/enum-aspect-tarot.html"}}
             {{/select}}
           </select>
@@ -24,7 +24,7 @@
         <div class="flexcol">
         <span><label>Description :</label></span>
         <div class="form-group editor">
-          {{editor content=data.description target="data.description" button=true owner=owner editable=editable}}
+          {{editor content=data.data.description target="data.description" button=true owner=owner editable=editable}}
         </div>
       </div>
      </section>
diff --git a/templates/item-tete-sheet.html b/templates/item-tete-sheet.html
index 3f153150..d9add1e5 100644
--- a/templates/item-tete-sheet.html
+++ b/templates/item-tete-sheet.html
@@ -11,7 +11,7 @@
       <div class="flexcol">
         <span><label>Description : </label></span>
         <div class="form-group editor">
-          {{editor content=data.description target="data.description" button=true owner=owner editable=editable}}
+          {{editor content=data.data.description target="data.description" button=true owner=owner editable=editable}}
         </div>
       </div>
     </section>