diff --git a/templates/anomaly.hbs b/templates/anomaly.hbs
index 89d6915..969d06e 100644
--- a/templates/anomaly.hbs
+++ b/templates/anomaly.hbs
@@ -59,21 +59,21 @@
     <div class="anomaly-section">
       <div class="anomaly-section-title">{{localize "CELESTOPOL.Item.technique"}}</div>
       <div class="anomaly-editor-wrap">
-        {{editor system.technique target="system.technique" button=false editable=isEditable}}
+        {{formInput systemFields.technique enriched=enrichedTechnique value=system.technique name="system.technique" toggled=true}}
       </div>
     </div>
 
     <div class="anomaly-section">
       <div class="anomaly-section-title">{{localize "CELESTOPOL.Item.narratif"}}</div>
       <div class="anomaly-editor-wrap">
-        {{editor system.narratif target="system.narratif" button=false editable=isEditable}}
+        {{formInput systemFields.narratif enriched=enrichedNarratif value=system.narratif name="system.narratif" toggled=true}}
       </div>
     </div>
 
     <div class="anomaly-section">
       <div class="anomaly-section-title">{{localize "CELESTOPOL.Item.exemples"}}</div>
       <div class="anomaly-editor-wrap">
-        {{editor system.exemples target="system.exemples" button=false editable=isEditable}}
+        {{formInput systemFields.exemples enriched=enrichedExemples value=system.exemples name="system.exemples" toggled=true}}
       </div>
     </div>
 
diff --git a/templates/aspect.hbs b/templates/aspect.hbs
index 4ac4717..d228e0e 100644
--- a/templates/aspect.hbs
+++ b/templates/aspect.hbs
@@ -26,18 +26,18 @@
 
   <section class="tab active" data-group="item-tabs" data-tab="description">
     <div class="form-group">
-      {{editor system.description target="system.description" button=true editable=isEditable}}
+      {{formInput systemFields.description enriched=enrichedDescription value=system.description name="system.description" toggled=true}}
     </div>
   </section>
 
   <section class="tab" data-group="item-tabs" data-tab="technique">
     <div class="form-group">
       <label>{{localize "CELESTOPOL.Item.technique"}}</label>
-      {{editor system.technique target="system.technique" button=true editable=isEditable}}
+      {{formInput systemFields.technique enriched=enrichedTechnique value=system.technique name="system.technique" toggled=true}}
     </div>
     <div class="form-group">
       <label>{{localize "CELESTOPOL.Item.narratif"}}</label>
-      {{editor system.narratif target="system.narratif" button=true editable=isEditable}}
+      {{formInput systemFields.narratif enriched=enrichedNarratif value=system.narratif name="system.narratif" toggled=true}}
     </div>
   </section>
 
diff --git a/templates/attribute.hbs b/templates/attribute.hbs
index 6c0548c..318461c 100644
--- a/templates/attribute.hbs
+++ b/templates/attribute.hbs
@@ -26,18 +26,18 @@
 
   <section class="tab active" data-group="item-tabs" data-tab="description">
     <div class="form-group">
-      {{editor system.description target="system.description" button=true editable=isEditable}}
+      {{formInput systemFields.description enriched=enrichedDescription value=system.description name="system.description" toggled=true}}
     </div>
   </section>
 
   <section class="tab" data-group="item-tabs" data-tab="technique">
     <div class="form-group">
       <label>{{localize "CELESTOPOL.Item.technique"}}</label>
-      {{editor system.technique target="system.technique" button=true editable=isEditable}}
+      {{formInput systemFields.technique enriched=enrichedTechnique value=system.technique name="system.technique" toggled=true}}
     </div>
     <div class="form-group">
       <label>{{localize "CELESTOPOL.Item.narratif"}}</label>
-      {{editor system.narratif target="system.narratif" button=true editable=isEditable}}
+      {{formInput systemFields.narratif enriched=enrichedNarratif value=system.narratif name="system.narratif" toggled=true}}
     </div>
   </section>
 
diff --git a/templates/character-biography.hbs b/templates/character-biography.hbs
index ae2ee39..ea17b35 100644
--- a/templates/character-biography.hbs
+++ b/templates/character-biography.hbs
@@ -23,20 +23,12 @@
   {{!-- Description / Biographie --}}
   <div class="biography-section">
     <div class="section-header">{{localize "CELESTOPOL.Actor.description"}}</div>
-    {{#if isEditMode}}
-      {{editor system.description target="system.description" button=true editable=isEditable}}
-    {{else}}
-      <div class="enriched-html">{{{enrichedDescription}}}</div>
-    {{/if}}
+    {{formInput systemFields.description enriched=enrichedDescription value=system.description name="system.description" toggled=true}}
   </div>
 
   {{!-- Notes --}}
   <div class="notes-section">
     <div class="section-header">{{localize "CELESTOPOL.Actor.notes"}}</div>
-    {{#if isEditMode}}
-      {{editor system.notes target="system.notes" button=true editable=isEditable}}
-    {{else}}
-      <div class="enriched-html">{{{enrichedNotes}}}</div>
-    {{/if}}
+    {{formInput systemFields.notes enriched=enrichedNotes value=system.notes name="system.notes" toggled=true}}
   </div>
 </div>
diff --git a/templates/equipment.hbs b/templates/equipment.hbs
index 4c91cac..ae8db4a 100644
--- a/templates/equipment.hbs
+++ b/templates/equipment.hbs
@@ -49,6 +49,6 @@
   </div>
 
   <div class="form-group description-group">
-    {{editor system.description target="system.description" button=true editable=isEditable}}
+    {{formInput systemFields.description enriched=enrichedDescription value=system.description name="system.description" toggled=true}}
   </div>
 </div>
diff --git a/templates/npc-blessures.hbs b/templates/npc-blessures.hbs
index aad8ba4..bda5e32 100644
--- a/templates/npc-blessures.hbs
+++ b/templates/npc-blessures.hbs
@@ -25,10 +25,6 @@
 
   {{!-- Description --}}
   <div class="description-section">
-    {{#if isEditMode}}
-      {{editor system.description target="system.description" button=true editable=isEditable}}
-    {{else}}
-      <div class="enriched-html">{{{enrichedDescription}}}</div>
-    {{/if}}
+    {{formInput systemFields.description enriched=enrichedDescription value=system.description name="system.description" toggled=true}}
   </div>
 </div>