diff --git a/lang/en.json b/lang/en.json
index 955638d..3493e62 100644
--- a/lang/en.json
+++ b/lang/en.json
@@ -140,6 +140,9 @@
     "level": "Level",
     "experience": "Experience",
     "reputation": "Reputation",
+    "sheet": {
+      "description": "Description"
+    },
     "pool": "Reserve",
     "pools": "Reserves",
     "self_control": "Self-control",
diff --git a/lang/fr.json b/lang/fr.json
index e88258b..bc7fe65 100644
--- a/lang/fr.json
+++ b/lang/fr.json
@@ -146,6 +146,9 @@
     "level": "Niveau",
     "experience": "Expérience",
     "reputation": "Réputation",
+    "sheet": {
+      "description": "Description"
+    },
     "pool": "Réserve",
     "pools": "Réserves",
     "reserves": "Réserves",
diff --git a/less/actor/actor.less b/less/actor/actor.less
index e31f8aa..fdaa3d0 100644
--- a/less/actor/actor.less
+++ b/less/actor/actor.less
@@ -207,16 +207,20 @@
       .hexa-style();
       .transition();
       margin: 0.2rem;
+      position: relative;
 
       &:hover {
         .hexa-style(rgba(255, 255, 255, 0.425), rgba(0, 0, 0, 0.288));
       }
 
       input {
-        opacity: 1;
-        min-width: 100%;
-        min-height: 100%;
+        position: absolute;
+        width: 100%;
+        height: 100%;
         opacity: 0;
+        z-index: 1;
+        margin: 0;
+        cursor: pointer;
       }
 
       &.checked {
diff --git a/less/actor/npc.less b/less/actor/npc.less
index 29d9d87..f3d61cc 100644
--- a/less/actor/npc.less
+++ b/less/actor/npc.less
@@ -5,7 +5,7 @@
   .sheet-header {
     .background-image(url("@{ui-path}/barre_haut.webp"), no-repeat, 100% 100%, right top);
     padding: 0.5rem;
-    max-height: 110px;
+    max-height: 150px;
   }
 
   .ability-value,
@@ -179,7 +179,12 @@
     flex: 1;
     display: flex;
     flex-direction: column;
-    gap: 10px;
+    gap: 4px;
+  }
+
+  .sheet-header .resource {
+    padding: 4px 8px;
+    margin-bottom: 0;
   }
 
   .resources {
diff --git a/less/actor/totem.less b/less/actor/totem.less
index 0594a5f..ebe773d 100644
--- a/less/actor/totem.less
+++ b/less/actor/totem.less
@@ -64,6 +64,9 @@
       .adapted-dice i {
         padding-top: 0.5rem;
         color: @totem-human-color;
+        position: relative;
+        z-index: 0;
+        pointer-events: none;
       }
 
       .adapted-dice {
diff --git a/less/items.less b/less/items.less
index bb24167..608468c 100644
--- a/less/items.less
+++ b/less/items.less
@@ -71,11 +71,11 @@
     font-size: 0.875rem;
     text-align: center;
     text-shadow: 0 0 3px rgba(0, 0, 0, 0.9);
-  }
 
-  option {
-    background: #1a1a1a;
-    color: @color-text-light-1;
+    option {
+      background: @color-bg-option;
+      color: @color-text-dark-primary;
+    }
   }
 
   .traits {
@@ -83,6 +83,15 @@
 
     h3, h4 { margin: 0; }
   }
+
+  .editor,
+  .editor-content {
+    color: @color-text-dark-primary;
+    background: rgba(255, 255, 255, 0.3);
+    min-height: 6rem;
+
+    p { margin: 0.25rem 0; }
+  }
 }
 
 ol#chat-log div.item-card header img,
diff --git a/module/applications/sheets/base-actor-sheet.mjs b/module/applications/sheets/base-actor-sheet.mjs
index 651e4ba..d0eb1e5 100644
--- a/module/applications/sheets/base-actor-sheet.mjs
+++ b/module/applications/sheets/base-actor-sheet.mjs
@@ -96,6 +96,10 @@ export default class VermineBaseActorSheet extends HandlebarsApplicationMixin(fo
   // ── Contexte commun ─────────────────────────────────────────────────
 
   async _prepareContext() {
+    const enrich = async (path) => {
+      const val = foundry.utils.getProperty(this.document.system, path);
+      return val ? await foundry.applications.ux.TextEditor.implementation.enrichHTML(val, { async: true }) : "";
+    };
     return {
       fields: this.document.schema.fields,
       systemFields: this.document.system.schema.fields,
@@ -107,7 +111,10 @@ export default class VermineBaseActorSheet extends HandlebarsApplicationMixin(fo
       isGM: game.user.isGM,
       isEditMode: this.isEditMode,
       isPlayMode: this.isPlayMode,
-      isEditable: this.isEditable
+      isEditable: this.isEditable,
+      enrichedNotes: await enrich("identity.notes"),
+      enrichedBiography: await enrich("identity.biography"),
+      enrichedRelations: await enrich("identity.relations")
     }
   }
 
@@ -138,6 +145,19 @@ export default class VermineBaseActorSheet extends HandlebarsApplicationMixin(fo
     for (const [group, tab] of Object.entries(this.tabGroups ?? {})) {
       this.changeTab(tab, group, {force: true})
     }
+    // Move toggle from hidden main tab to visible position (only for sheets where
+    // .tab.main is not already displayed as a permanent sidebar via !important)
+    const mainTab = this.element.querySelector(".tab.main")
+    const tabs = this.element.querySelector('nav.tabs[data-application-part="tabs"]')
+    if ( mainTab && tabs && getComputedStyle(mainTab).display === "none" ) {
+      const existing = tabs.parentNode.querySelector('.sheet-header-toggle[data-moved]')
+      if (existing) existing.remove()
+      const toggle = mainTab.querySelector(".sheet-header-toggle")
+      if (toggle) {
+        toggle.dataset.moved = "true"
+        tabs.parentNode.insertBefore(toggle, tabs)
+      }
+    }
     this.#dragDrop.forEach(d => d.bind(this.element))
     this.element.querySelectorAll(".rollable").forEach(el => {
       el.addEventListener("click", this._onRoll.bind(this))
diff --git a/module/applications/sheets/creature-sheet.mjs b/module/applications/sheets/creature-sheet.mjs
index 41eadcc..e5978c7 100644
--- a/module/applications/sheets/creature-sheet.mjs
+++ b/module/applications/sheets/creature-sheet.mjs
@@ -50,7 +50,12 @@ export default class VermineCreatureSheetV2 extends VermineBaseActorSheet {
   async _preparePartContext(partId, context) {
     const doc = this.document
     switch (partId) {
-      case "main": break
+      case "main":
+        context.patternOptions = CONFIG.VERMINE.creaturePatternLevels
+        context.roleOptions = CONFIG.VERMINE.creatureRoleLevels
+        context.sizeOptions = CONFIG.VERMINE.creatureSizeLevels
+        context.packOptions = CONFIG.VERMINE.creaturePackLevels
+        break
       case "info":
         context.tab = context.tabs.info
         break
diff --git a/module/applications/sheets/npc-sheet.mjs b/module/applications/sheets/npc-sheet.mjs
index 8f8b0c6..8c9a633 100644
--- a/module/applications/sheets/npc-sheet.mjs
+++ b/module/applications/sheets/npc-sheet.mjs
@@ -44,7 +44,13 @@ export default class VermineNpcSheetV2 extends VermineBaseActorSheet {
   async _preparePartContext(partId, context) {
     const doc = this.document
     switch (partId) {
-      case "main": break
+      case "main":
+        context.npcThreatOptions = CONFIG.VERMINE.npcThreatLevels
+        context.npcExperienceOptions = CONFIG.VERMINE.npcExperienceLevels
+        context.npcRoleOptions = CONFIG.VERMINE.npcRoleLevels
+        context.totemOptions = CONFIG.VERMINE.totems
+        context.originOptions = CONFIG.VERMINE.origins
+        break
       case "characteristics":
         context.tab = context.tabs.characteristics
         break
diff --git a/module/documents/item.mjs b/module/documents/item.mjs
index 54a3b1a..650a15b 100644
--- a/module/documents/item.mjs
+++ b/module/documents/item.mjs
@@ -80,7 +80,7 @@ export default class VermineItem extends Item {
       rollMode: rollMode,
       flavor: label,
     };
-    mess.content = await foundry.applications.handlebars.renderTemplate(`systems/vermine2047/templates/item/chatCards/${this.type}.hbs`, { item: this, message: mess }) ?? null;
+    mess.content = await foundry.applications.handlebars.renderTemplate(`systems/vermine2047/templates/item/chatCards/${this.type}.hbs`, { item: this, message: mess, config: CONFIG.VERMINE }) ?? null;
     ChatMessage.create(mess)
   }
 
diff --git a/module/models/character.mjs b/module/models/character.mjs
index ddfa705..f08c470 100644
--- a/module/models/character.mjs
+++ b/module/models/character.mjs
@@ -61,8 +61,8 @@ export default class VermineCharacterData extends foundry.abstract.TypeDataModel
         instincts: new fields.StringField({ required: true, nullable: false, initial: "" }),
         prohibits: new fields.StringField({ required: true, nullable: false, initial: "" }),
         objectives: new fields.StringField({ required: true, nullable: false, initial: "" }),
-        relations: new fields.StringField({ required: true, nullable: false, initial: "" }),
-        biography: new fields.StringField({ required: true, nullable: false, initial: "" })
+        relations: new fields.HTMLField({ required: true, initial: "" }),
+        biography: new fields.HTMLField({ required: true, initial: "" })
       }),
 
       // Équipement
diff --git a/module/models/creature.mjs b/module/models/creature.mjs
index b05e085..6f5a13b 100644
--- a/module/models/creature.mjs
+++ b/module/models/creature.mjs
@@ -32,8 +32,8 @@ export default class VermineCreatureData extends foundry.abstract.TypeDataModel
         profile: new fields.StringField({ required: true, nullable: false, initial: "" }),
         origin: new fields.StringField({ required: true, nullable: false, initial: "" }),
         theme: new fields.StringField({ required: true, nullable: false, initial: "" }),
-        notes: new fields.StringField({ required: true, nullable: false, initial: "" }),
-        biography: new fields.StringField({ required: true, nullable: false, initial: "" })
+        notes: new fields.HTMLField({ required: true, initial: "" }),
+        biography: new fields.HTMLField({ required: true, initial: "" })
       }),
 
       // Compétences (description libre)
diff --git a/module/models/group.mjs b/module/models/group.mjs
index 774b60f..1ecb4db 100644
--- a/module/models/group.mjs
+++ b/module/models/group.mjs
@@ -36,7 +36,7 @@ export default class VermineGroupData extends foundry.abstract.TypeDataModel {
         theme: new fields.StringField({ required: true, nullable: false, initial: "" }),
         instincts: new fields.StringField({ required: true, nullable: false, initial: "" }),
         prohibits: new fields.StringField({ required: true, nullable: false, initial: "" }),
-        notes: new fields.StringField({ required: true, nullable: false, initial: "" })
+        notes: new fields.HTMLField({ required: true, initial: "" })
       }),
 
       // Équipement
diff --git a/module/models/npc.mjs b/module/models/npc.mjs
index eff05ae..8279138 100644
--- a/module/models/npc.mjs
+++ b/module/models/npc.mjs
@@ -55,7 +55,7 @@ export default class VermineNpcData extends foundry.abstract.TypeDataModel {
         origin: new fields.StringField({ required: true, nullable: false, initial: "" }),
         totem: new fields.StringField({ required: true, nullable: false, initial: "" }),
         theme: new fields.StringField({ required: true, nullable: false, initial: "" }),
-        notes: new fields.StringField({ required: true, nullable: false, initial: "" })
+        notes: new fields.HTMLField({ required: true, initial: "" })
       }),
 
       // Attributs (XP, réputation, sang-froid, effort)
diff --git a/module/system/handlebars-manager.mjs b/module/system/handlebars-manager.mjs
index 4c4b7fd..06abb83 100644
--- a/module/system/handlebars-manager.mjs
+++ b/module/system/handlebars-manager.mjs
@@ -90,22 +90,9 @@ export const registerHandlebarsHelpers = function () {
     return str.toLowerCase();
   });
   Handlebars.registerHelper('romanNumber', function (numb) {
-    switch (numb) {
-      case 0:
-        return '';
-      case 1:
-        return 'I';
-      case 2:
-        return 'II';
-      case 3:
-        return 'III';
-      case 4:
-        return 'IV';
-      case 5:
-        return 'V';
-      default:
-        throw new Error('Le handicap rareté doit être comprise entre 0 et 5');
-    }
+    const n = Number(numb);
+    if ( !Number.isFinite(n) || n < 0 ) return '';
+    return ['', 'I', 'II', 'III', 'IV', 'V', 'VI', 'VII', 'VIII', 'IX', 'X'][n] ?? '';
   });
 
   // search translation with variables
@@ -386,7 +373,9 @@ export const registerHandlebarsHelpers = function () {
   Handlebars.registerHelper('repeat', function (times, start, indexLabel, block) {
     var accum = '';
     if (!indexLabel) { indexLabel = "index" }
-    if (!start) { start = 0; }
+    times = Number(times);
+    start = Number(start ?? 0);
+    if ( !Number.isFinite(times) || !Number.isFinite(start) || times < 0 ) return '';
     for (var i = start; i < times + start; ++i) {
       block.data[indexLabel] = i;
       block.data.first = i === start;
diff --git a/templates/actor/appv2/character-stories.hbs b/templates/actor/appv2/character-stories.hbs
index fb0a2ed..707df2c 100644
--- a/templates/actor/appv2/character-stories.hbs
+++ b/templates/actor/appv2/character-stories.hbs
@@ -35,14 +35,16 @@
   </section>
   <section class="flexcol ">
     <div>
-      <h4>{{ localize 'IDENTITY.notes'}}</h4>
-      {{editor system.identity.biography target="system.identity.biography"
-      button=true owner=owner editable=editable}}
+      <fieldset>
+        <legend><h4>{{ localize 'IDENTITY.notes'}}</h4></legend>
+        {{formInput systemFields.identity.fields.biography enriched=enrichedBiography value=system.identity.biography name="system.identity.biography" toggled=true}}
+      </fieldset>
     </div>
     <div>
-      <h4>{{ localize 'IDENTITY.relations'}}</h4>
-      {{editor system.identity.relations target="system.identity.relations"
-      button=true owner=owner editable=editable}}
+      <fieldset>
+        <legend><h4>{{ localize 'IDENTITY.relations'}}</h4></legend>
+        {{formInput systemFields.identity.fields.relations enriched=enrichedRelations value=system.identity.relations name="system.identity.relations" toggled=true}}
+      </fieldset>
     </div>
   </section>
 </div>
diff --git a/templates/actor/appv2/creature-info.hbs b/templates/actor/appv2/creature-info.hbs
index 1ea02e7..8a34d6e 100644
--- a/templates/actor/appv2/creature-info.hbs
+++ b/templates/actor/appv2/creature-info.hbs
@@ -39,8 +39,10 @@
   </div>
 
   <div class="grid-span-2">
-    <h4>{{ localize 'IDENTITY.notes' }}</h4>
-    {{editor system.identity.notes target="system.identity.notes" button=true owner=owner editable=editable}}
+    <fieldset>
+      <legend><h4>{{ localize 'IDENTITY.notes' }}</h4></legend>
+      {{formInput systemFields.identity.fields.notes enriched=enrichedNotes value=system.identity.notes name="system.identity.notes" toggled=true}}
+    </fieldset>
   </div>
 
   {{!-- Modes --}}
diff --git a/templates/actor/appv2/creature-main.hbs b/templates/actor/appv2/creature-main.hbs
index 6fc8e9b..28b5db5 100644
--- a/templates/actor/appv2/creature-main.hbs
+++ b/templates/actor/appv2/creature-main.hbs
@@ -25,9 +25,9 @@
           <div class="resource-content">
             {{#if isEditMode}}
             <select name="system.pattern.value" id="system.pattern.value" data-dtype="Number">
-              {{#each ../config.creaturePatternLevels}}
-                <option value="{{@key}}" {{#ife @key ../system.pattern.value}}selected{{/ife}}>
-                  {{localize this.label}} ({{@key}})
+              {{#each patternOptions}}
+                <option value="{{@key}}" {{#ife @key @root.system.pattern.value}}selected{{/ife}}>
+                  {{localize label}} ({{@key}})
                 </option>
               {{/each}}
             </select>
@@ -41,9 +41,9 @@
           <div class="resource-content">
             {{#if isEditMode}}
             <select name="system.role.value" id="system.role.value" data-dtype="Number">
-              {{#each ../config.creatureRoleLevels}}
-                <option value="{{@key}}" {{#ife @key ../system.role.value}}selected{{/ife}}>
-                  {{localize this.label}} ({{@key}})
+              {{#each roleOptions}}
+                <option value="{{@key}}" {{#ife @key @root.system.role.value}}selected{{/ife}}>
+                  {{localize label}} ({{@key}})
                 </option>
               {{/each}}
             </select>
@@ -59,8 +59,8 @@
           <div class="resource-content">
             {{#if isEditMode}}
             <select name="system.size.value" id="system.size.value" data-dtype="Number">
-              {{#each ../config.creatureSizeLevels}}
-                <option value="{{@key}}" {{#ife @key ../system.size.value}}selected{{/ife}}>
+              {{#each sizeOptions}}
+                <option value="{{@key}}" {{#ife @key @root.system.size.value}}selected{{/ife}}>
                   {{@key}}
                 </option>
               {{/each}}
@@ -76,9 +76,9 @@
             {{#if isEditMode}}
             <select name="system.pack.value" id="system.pack.value" data-dtype="Number">
               <option value="0">{{localize 'VERMINE.none'}}</option>
-              {{#each ../config.creaturePackLevels}}
+              {{#each packOptions}}
                 {{#if @key}}
-                  <option value="{{@key}}" {{#ife @key ../system.pack.value}}selected{{/ife}}>
+                  <option value="{{@key}}" {{#ife @key @root.system.pack.value}}selected{{/ife}}>
                     {{@key}}
                   </option>
                 {{/if}}
diff --git a/templates/actor/appv2/group-info.hbs b/templates/actor/appv2/group-info.hbs
index 24e04ea..259a9e9 100644
--- a/templates/actor/appv2/group-info.hbs
+++ b/templates/actor/appv2/group-info.hbs
@@ -28,8 +28,10 @@
 
     {{!-- Group Notes --}}
     <div class="grid-span-2">
-      <h4>{{ localize 'IDENTITY.notes' }}</h4>
-      {{editor system.identity.notes target="system.identity.notes" button=true owner=owner editable=editable}}
+      <fieldset>
+        <legend><h4>{{ localize 'IDENTITY.notes' }}</h4></legend>
+        {{formInput systemFields.identity.fields.notes enriched=enrichedNotes value=system.identity.notes name="system.identity.notes" toggled=true}}
+      </fieldset>
     </div>
 
     {{!-- Group Abilities (from items) --}}
diff --git a/templates/actor/appv2/npc-main.hbs b/templates/actor/appv2/npc-main.hbs
index eb917e3..0f7ecc3 100644
--- a/templates/actor/appv2/npc-main.hbs
+++ b/templates/actor/appv2/npc-main.hbs
@@ -27,9 +27,9 @@
           <div class="resource-content">
             {{#if isEditMode}}
             <select name="system.threat.value" id="system.threat.value" data-dtype="Number">
-              {{#each ../config.npcThreatLevels}}
-                <option value="{{@key}}" {{#ife @key ../system.threat.value}}selected{{/ife}}>
-                  {{localize this.label}} ({{@key}})
+              {{#each npcThreatOptions}}
+                <option value="{{@key}}" {{#ife @key @root.system.threat.value}}selected{{/ife}}>
+                  {{localize label}} ({{@key}})
                 </option>
               {{/each}}
             </select>
@@ -44,9 +44,9 @@
           <div class="resource-content">
             {{#if isEditMode}}
             <select name="system.experience.value" id="system.experience.value" data-dtype="Number">
-              {{#each ../config.npcExperienceLevels}}
-                <option value="{{@key}}" {{#ife @key ../system.experience.value}}selected{{/ife}}>
-                  {{localize this.label}} ({{@key}})
+              {{#each npcExperienceOptions}}
+                <option value="{{@key}}" {{#ife @key @root.system.experience.value}}selected{{/ife}}>
+                  {{localize label}} ({{@key}})
                 </option>
               {{/each}}
             </select>
@@ -61,9 +61,9 @@
           <div class="resource-content">
             {{#if isEditMode}}
             <select name="system.role.value" id="system.role.value" data-dtype="Number">
-              {{#each ../config.npcRoleLevels}}
-                <option value="{{@key}}" {{#ife @key ../system.role.value}}selected{{/ife}}>
-                  {{localize this.label}} ({{@key}})
+              {{#each npcRoleOptions}}
+                <option value="{{@key}}" {{#ife @key @root.system.role.value}}selected{{/ife}}>
+                  {{localize label}} ({{@key}})
                 </option>
               {{/each}}
             </select>
@@ -82,8 +82,8 @@
             {{#if isEditMode}}
             <select name="system.identity.totem" id="system.identity.totem" data-dtype="String">
               <option value="">{{ localize 'NONE' }}</option>
-              {{#each ../config.totems}}
-                <option value="{{@key}}" {{#ife @key ../system.identity.totem}}selected{{/ife}}>
+              {{#each totemOptions}}
+                <option value="{{@key}}" {{#ife @key @root.system.identity.totem}}selected{{/ife}}>
                   {{localize this}}
                 </option>
               {{/each}}
@@ -99,8 +99,8 @@
             {{#if isEditMode}}
             <select name="system.identity.origin" id="system.identity.origin" data-dtype="String">
               <option value="">{{ localize 'NONE' }}</option>
-              {{#each ../config.origins}}
-                <option value="{{@key}}" {{#ife @key ../system.identity.origin}}selected{{/ife}}>
+              {{#each originOptions}}
+                <option value="{{@key}}" {{#ife @key @root.system.identity.origin}}selected{{/ife}}>
                   {{this}}
                 </option>
               {{/each}}
diff --git a/templates/actor/appv2/npc-notes.hbs b/templates/actor/appv2/npc-notes.hbs
index 81f1ff9..b0fbe82 100644
--- a/templates/actor/appv2/npc-notes.hbs
+++ b/templates/actor/appv2/npc-notes.hbs
@@ -18,5 +18,8 @@
       {{/if}}
     </div>
   </div>
-  {{editor system.identity.notes target="system.identity.notes" button=true owner=owner editable=editable}}
+  <fieldset>
+    <legend>{{ localize 'IDENTITY.notes' }}</legend>
+    {{formInput systemFields.identity.fields.notes enriched=enrichedNotes value=system.identity.notes name="system.identity.notes" toggled=true}}
+  </fieldset>
 </div>
diff --git a/templates/actor/group/group-vehicles.hbs b/templates/actor/group/group-vehicles.hbs
index e642b24..e3db0e6 100644
--- a/templates/actor/group/group-vehicles.hbs
+++ b/templates/actor/group/group-vehicles.hbs
@@ -6,24 +6,24 @@
     <div class="item-reliability">{{ localize 'VERMINE.reliability'}}</div>
     <div class="item-controls">
       <a class="item-control item-create" title="Create item"
-        data-type="vehicle"><i class="fas fa-plus"></i></a>
+        data-type="vehicle" data-action="create"><i class="fas fa-plus"></i></a>
     </div>
   </li>
   {{#each vehicles as |item id|}}
   <li class="item flexrow flex-group-center" data-item-id="{{item._id}}">
     <div class="item-name" style="flex:4;">
       <div class="item-image">
-        <a class="item-control item-edit" data-roll-type="item"><img
+        <a data-action="edit"><img
             src="{{item.img}}" title="{{item.name}}" width="24"
             height="24" /></a>
       </div>
-      <a class="item-control item-edit" title="Edit Item">{{item.name}}</a>
+      <a data-action="edit" title="Edit Item">{{item.name}}</a>
     </div>
-    <div><a class="item-control item-edit" title="Edit Item">{{item.system.mobility}}</a></div>
-    <div><a class="item-control item-edit" title="Edit Item">{{item.system.rarity.value}}</a></div>
-    <div><a class="item-control item-edit" title="Edit Item">{{item.system.reliability}}</a></div>
+    <div><a data-action="edit" title="Edit Item">{{item.system.mobility}}</a></div>
+    <div><a data-action="edit" title="Edit Item">{{item.system.rarity.value}}</a></div>
+    <div><a data-action="edit" title="Edit Item">{{item.system.reliability}}</a></div>
     <div class="item-controls">
-      <a class="item-control item-delete" title="Delete Item"><i
+      <a data-action="delete" title="Delete Item"><i
           class="fas fa-trash"></i></a>
     </div>
   </li>
diff --git a/templates/actor/parts/actor-defenses.hbs b/templates/actor/parts/actor-defenses.hbs
index 91d8bd9..21018d8 100644
--- a/templates/actor/parts/actor-defenses.hbs
+++ b/templates/actor/parts/actor-defenses.hbs
@@ -13,6 +13,7 @@
         class="item-control item-create"
         title="Create item"
         data-type="defense"
+        data-action="create"
       ><i class="fas fa-plus"></i></a>
     </div>
   </li>
@@ -25,28 +26,28 @@
         class="item-name"
         style="flex:4;"
       >
-        <div class="item-image item-control item-roll">
-          <a data-roll-type="item"><img
+        <div class="item-image">
+          <a data-action="roll"><img
               src="{{item.img}}"
               title="{{item.name}}"
               width="24"
               height="24"
             /></a>
         </div>
-        <a title="Edit Item">{{item.name}}</a>
+        <a data-action="edit" title="Edit Item">{{item.name}}</a>
       </div>
-      <div><a class="item-control item-edit" title="Edit Item">{{item.system.level}}</a></div>
-      <div><a class="item-control item-edit" title="Edit Item">{{item.system.mobility}}</a></div>
-      <div><a class="item-control item-edit" title="Edit Item">{{item.system.rarity.value}}</a></div>
-      <div><a class="item-control item-edit" title="Edit Item">{{item.system.reliability}}</a></div>
+      <div><a data-action="edit" title="Edit Item">{{item.system.level}}</a></div>
+      <div><a data-action="edit" title="Edit Item">{{item.system.mobility}}</a></div>
+      <div><a data-action="edit" title="Edit Item">{{item.system.rarity.value}}</a></div>
+      <div><a data-action="edit" title="Edit Item">{{item.system.reliability}}</a></div>
       <div class="item-controls">
         <a
-          class="item-control item-delete"
+          data-action="delete"
           title="Delete Item"
         ><i class="fas fa-trash"></i></a>
         <a
-          class="item-control item-edit"
-          title="Delete Item"
+          data-action="edit"
+          title="Edit Item"
         ><i class="fas fa-edit"></i></a>
       </div>
     </li>
diff --git a/templates/actor/parts/actor-weapons.hbs b/templates/actor/parts/actor-weapons.hbs
index 4973ba6..41d0a12 100644
--- a/templates/actor/parts/actor-weapons.hbs
+++ b/templates/actor/parts/actor-weapons.hbs
@@ -8,7 +8,7 @@
     <div class="item-reliability">{{ localize 'VERMINE.reliability_sm'}}</div>
     <div class="item-controls">
       <a class="item-control item-create" title="Create item"
-        data-type="weapon"><i class="fas fa-plus"></i></a>
+        data-type="weapon" data-action="create"><i class="fas fa-plus"></i></a>
     </div>
   </li>
   {{#each weapons as |item id|}}
@@ -16,32 +16,31 @@
     data-item-id="{{item._id}}">
     <div class="item-name flexrow" style="flex:4;">
       <div class="item-image">
-        <a class="item-control" data-roll-type="item"><img
+        <a data-action="roll"><img
             src="{{item.img}}" title="{{item.name}}" width="24"
             height="24" /></a>
       </div>
-      <a class="item-control item-roll">{{item.name}}</a>
+      <a data-action="roll">{{item.name}}</a>
     </div>
-    <div><a class="item-control item-edit" title="Edit Item">{{item.system.min_range}} /
+    <div><a data-action="edit" title="Edit Item">{{item.system.min_range}} /
         {{item.system.max_range}}</a></div>
-    <div><a class="item-control item-edit" title="Edit Item">
+    <div><a data-action="edit" title="Edit Item">
         {{#if item.system.damage.addVigor}}
         vigueur+
         {{/if}}
         {{item.system.damage.value}}
         ({{item.system.damage.type}})
       </a></div>
-    <div><a class="item-control item-edit" title="Edit Item">{{item.system.ammo}}</a></div>
-    <div><a class="item-control item-edit" title="Edit Item">{{item.system.rarity}}</a></div>
-    <div><a class="item-control item-edit" title="Edit Item">{{item.system.reliability}}</a></div>
+    <div><a data-action="edit" title="Edit Item">{{item.system.ammo}}</a></div>
+    <div><a data-action="edit" title="Edit Item">{{item.system.rarity.value}}</a></div>
+    <div><a data-action="edit" title="Edit Item">{{item.system.reliability}}</a></div>
     <div class="item-controls">
-      <a class="item-control item-delete" title="Delete Item"><i
+      <a data-action="delete" title="Delete Item"><i
           class="fas fa-trash"></i></a>
-      <a class="item-control item-edit" title="Edit Item"><i
+      <a data-action="edit" title="Edit Item"><i
           class="fas fa-edit"></i></a>
-      <a class="item-control item-roll" title="Roll Item"><i
+      <a data-action="roll" title="Roll Item"><i
           class="fas fa-dice"></i></a>
-
     </div>
   </li>
   {{/each}}
diff --git a/templates/item/chatCards/defense.hbs b/templates/item/chatCards/defense.hbs
index 844bea0..0400196 100644
--- a/templates/item/chatCards/defense.hbs
+++ b/templates/item/chatCards/defense.hbs
@@ -70,8 +70,8 @@
 				{{#each item.system.traits as |trait key|}}
 					{{#if trait}}
 					<li>
-						<strong>{{localize (lookup ../config.traits key).name}}</strong>:
-						{{localize (lookup ../config.traits key).description}}
+						<strong>{{localize (lookup (lookup ../config.traits key) "name")}}</strong>:
+						{{localize (lookup (lookup ../config.traits key) "description")}}
 					</li>
 					{{/if}}
 				{{/each}}
diff --git a/templates/item/chatCards/item.hbs b/templates/item/chatCards/item.hbs
index 44d884c..ab0e098 100644
--- a/templates/item/chatCards/item.hbs
+++ b/templates/item/chatCards/item.hbs
@@ -17,8 +17,8 @@
 			{{#each item.system.traits as |trait key|}}
 				{{#if trait}}
 				<li>
-					<strong>{{localize (lookup ../config.traits key).name}}</strong>:
-					{{localize (lookup ../config.traits key).description}}
+					<strong>{{localize (lookup (lookup ../config.traits key) "name")}}</strong>:
+					{{localize (lookup (lookup ../config.traits key) "description")}}
 				</li>
 				{{/if}}
 			{{/each}}
diff --git a/templates/item/chatCards/vehicle.hbs b/templates/item/chatCards/vehicle.hbs
index 670a4ec..9e98df0 100644
--- a/templates/item/chatCards/vehicle.hbs
+++ b/templates/item/chatCards/vehicle.hbs
@@ -64,8 +64,8 @@
 				{{#each item.system.traits as |trait key|}}
 					{{#if trait}}
 					<li>
-						<strong>{{localize (lookup ../config.traits key).name}}</strong>:
-						{{localize (lookup ../config.traits key).description}}
+						<strong>{{localize (lookup (lookup ../config.traits key) "name")}}</strong>:
+						{{localize (lookup (lookup ../config.traits key) "description")}}
 					</li>
 					{{/if}}
 				{{/each}}
diff --git a/templates/item/chatCards/weapon.hbs b/templates/item/chatCards/weapon.hbs
index 2b90d3f..a3ee88d 100644
--- a/templates/item/chatCards/weapon.hbs
+++ b/templates/item/chatCards/weapon.hbs
@@ -72,8 +72,8 @@
 				{{#each item.system.traits as |trait key|}}
 					{{#if trait}}
 					<li>
-						<strong>{{localize (lookup ../config.traits key).name}}</strong>:
-						{{localize (lookup ../config.traits key).description}}
+						<strong>{{localize (lookup (lookup ../config.traits key) "name")}}</strong>:
+						{{localize (lookup (lookup ../config.traits key) "description")}}
 					</li>
 					{{/if}}
 				{{/each}}
diff --git a/templates/item/item-ability-sheet.hbs b/templates/item/item-ability-sheet.hbs
index 0d2944c..2a7d69b 100644
--- a/templates/item/item-ability-sheet.hbs
+++ b/templates/item/item-ability-sheet.hbs
@@ -38,6 +38,9 @@
 			</span>
 		</h4>
 		<h4>description</h4>
-		{{editor system.description target="system.description" rollData=rollData button=true owner=owner editable=editable}}
+		<fieldset>
+			<legend>{{localize "VERMINE.sheet.description"}}</legend>
+			{{formInput systemFields.description enriched=enrichedDescription value=system.description name="system.description" toggled=true}}
+		</fieldset>
 	</section>
 </div>
diff --git a/templates/item/item-background-sheet.hbs b/templates/item/item-background-sheet.hbs
index a2ae6c1..4fa0a4f 100644
--- a/templates/item/item-background-sheet.hbs
+++ b/templates/item/item-background-sheet.hbs
@@ -31,7 +31,10 @@
       </span>
     </h4>
     <h4>description</h4>
-    {{editor system.description target="system.description" rollData=rollData button=true owner=owner editable=editable}}
+    <fieldset>
+      <legend>{{localize "VERMINE.sheet.description"}}</legend>
+      {{formInput systemFields.description enriched=enrichedDescription value=system.description name="system.description" toggled=true}}
+    </fieldset>
 
   </section>
 </div>
\ No newline at end of file
diff --git a/templates/item/item-evolution-sheet.hbs b/templates/item/item-evolution-sheet.hbs
index 04129c0..ef03998 100644
--- a/templates/item/item-evolution-sheet.hbs
+++ b/templates/item/item-evolution-sheet.hbs
@@ -15,6 +15,9 @@
 		</h4>
 		<h2>description</h2>
 
-		{{editor system.description target="system.description" rollData=rollData button=true owner=owner editable=editable}}
+		<fieldset>
+			<legend>{{localize "VERMINE.sheet.description"}}</legend>
+			{{formInput systemFields.description enriched=enrichedDescription value=system.description name="system.description" toggled=true}}
+		</fieldset>
 	</section>
 </div>
diff --git a/templates/item/item-rite-sheet.hbs b/templates/item/item-rite-sheet.hbs
index 529e5a6..d717aef 100644
--- a/templates/item/item-rite-sheet.hbs
+++ b/templates/item/item-rite-sheet.hbs
@@ -20,7 +20,10 @@
 		</aside>
 		<main style="flex:10">
 			<div class="editor-wrapper">
-				{{editor system.description target="system.description" button=true owner=owner editable=editable}}
+				<fieldset>
+					<legend>{{localize "VERMINE.sheet.description"}}</legend>
+					{{formInput systemFields.description enriched=enrichedDescription value=system.description name="system.description" toggled=true}}
+				</fieldset>
 			</div>
 		</main>
 		<div class="grid">
diff --git a/templates/item/item-rumor-sheet.hbs b/templates/item/item-rumor-sheet.hbs
index 66f2c5d..edb3f34 100644
--- a/templates/item/item-rumor-sheet.hbs
+++ b/templates/item/item-rumor-sheet.hbs
@@ -5,7 +5,10 @@
 	{{!-- Sheet Body --}}
 	<section class="sheet-body">
 
-		{{editor system.description target="system.description" rollData=rollData button=true owner=owner editable=editable}}
+		<fieldset>
+			<legend>{{localize "VERMINE.sheet.description"}}</legend>
+			{{formInput systemFields.description enriched=enrichedDescription value=system.description name="system.description" toggled=true}}
+		</fieldset>
 
 	</section>
 </div>
diff --git a/templates/item/item-sheet.hbs b/templates/item/item-sheet.hbs
index 3f46767..8dcf7ce 100644
--- a/templates/item/item-sheet.hbs
+++ b/templates/item/item-sheet.hbs
@@ -19,7 +19,10 @@
 
     {{!-- Description Tab --}}
     <div class="tab" data-group="primary" data-tab="description">
-      {{editor system.description target="system.description" rollData=rollData button=true owner=owner editable=editable}}
+      <fieldset>
+        <legend>{{localize "VERMINE.sheet.description"}}</legend>
+        {{formInput systemFields.description enriched=enrichedDescription value=system.description name="system.description" toggled=true}}
+      </fieldset>
     </div>
 
     {{!-- Attributes Tab --}}
diff --git a/templates/item/item-target-sheet.hbs b/templates/item/item-target-sheet.hbs
index 66f2c5d..edb3f34 100644
--- a/templates/item/item-target-sheet.hbs
+++ b/templates/item/item-target-sheet.hbs
@@ -5,7 +5,10 @@
 	{{!-- Sheet Body --}}
 	<section class="sheet-body">
 
-		{{editor system.description target="system.description" rollData=rollData button=true owner=owner editable=editable}}
+		<fieldset>
+			<legend>{{localize "VERMINE.sheet.description"}}</legend>
+			{{formInput systemFields.description enriched=enrichedDescription value=system.description name="system.description" toggled=true}}
+		</fieldset>
 
 	</section>
 </div>
diff --git a/templates/item/item-trauma-sheet.hbs b/templates/item/item-trauma-sheet.hbs
index d85073a..0d0a3f7 100644
--- a/templates/item/item-trauma-sheet.hbs
+++ b/templates/item/item-trauma-sheet.hbs
@@ -15,8 +15,10 @@
 				</select>
 			</h4>
 			<h2>description</h2>
-			{{editor system.description target="system.description" rollData=rollData
-button=true owner=owner editable=editable}}
+			<fieldset>
+				<legend>{{localize "VERMINE.sheet.description"}}</legend>
+				{{formInput systemFields.description enriched=enrichedDescription value=system.description name="system.description" toggled=true}}
+			</fieldset>
 
 		</div>
 	</section>
diff --git a/templates/item/partials/physicalItems.hbs b/templates/item/partials/physicalItems.hbs
index e3b4eaf..96ba7dc 100644
--- a/templates/item/partials/physicalItems.hbs
+++ b/templates/item/partials/physicalItems.hbs
@@ -39,6 +39,8 @@
 
 </h4>
 <h2>description</h2>
-{{editor system.description target="system.description" rollData=rollData
-button=true owner=owner editable=editable}}
+<fieldset>
+	<legend>{{localize "VERMINE.sheet.description"}}</legend>
+	{{formInput systemFields.description enriched=enrichedDescription value=system.description name="system.description" toggled=true}}
+</fieldset>
 {{> "systems/vermine2047/templates/item/partials/damages.hbs"}}