diff --git a/templates/actor-creature-sheet.html b/templates/actor-creature-sheet.html
index d1e16dae..46aa3029 100644
--- a/templates/actor-creature-sheet.html
+++ b/templates/actor-creature-sheet.html
@@ -101,12 +101,12 @@
             {{#each data.competencecreature  as |comp key|}}
             <li class="item flexrow list-item" data-item-id="{{comp._id}}">
               <img class="sheet-competence-img" src="{{comp.img}}" />
-              <span class="competence-label" name="data.competencecreature[{{key}}].name"><a>{{comp.name}}</a></span>
+              <span class="competence-label"><a>{{comp.name}}</a></span>
               <input class="competence-value creature-carac" type="text" 
                 name="data.competencecreature[{{key}}].data.carac_value" compname="{{comp.name}}"
                 value="{{comp.data.carac_value}}" data-dtype="number" />
               <input class="competence-value creature-niveau" type="text"
-                name="data.competencecreature[{{key}}].data.niveau" compname="{{comp.name}}"
+                compname="{{comp.name}}"
                 value="{{numberFormat comp.data.niveau decimals=0 sign=true}}" data-dtype="number" />
               <input class="competence-value creature-dommages" type="text"
                 name="data.competencecreature[{{key}}]].data.dommages" compname="{{comp.name}}"
diff --git a/templates/actor-entite-sheet.html b/templates/actor-entite-sheet.html
index 39ddea84..16bc64f3 100644
--- a/templates/actor-entite-sheet.html
+++ b/templates/actor-entite-sheet.html
@@ -74,12 +74,12 @@
             {{#each data.competencecreature  as |comp key|}}
             <li class="item flexrow list-item" data-item-id="{{comp._id}}">
               <img class="sheet-competence-img" src="{{comp.img}}" />
-              <span class="competence-label" name="data.competencecreature[{{key}}].name"><a>{{comp.name}}</a></span>
+              <span class="competence-label"><a>{{comp.name}}</a></span>
               <input class="competence-value creature-carac" type="text" 
                 name="data.competencecreature[{{key}}].data.carac_value" compname="{{comp.name}}"
                 value="{{comp.data.carac_value}}" data-dtype="number" />
               <input class="competence-value creature-niveau" type="text"
-                name="data.competencecreature[{{key}}].data.niveau" compname="{{comp.name}}"
+                compname="{{comp.name}}"
                 value="{{numberFormat comp.data.niveau decimals=0 sign=true}}" data-dtype="number" />
               <input class="competence-value creature-dommages" type="text"
                 name="data.competencecreature[{{key}}].data.dommages" compname="{{comp.name}}"
diff --git a/templates/actor-humanoide-sheet.html b/templates/actor-humanoide-sheet.html
index 40e946cc..5955ac19 100644
--- a/templates/actor-humanoide-sheet.html
+++ b/templates/actor-humanoide-sheet.html
@@ -101,12 +101,12 @@
             {{#each data.competencecreature  as |comp key|}}
             <li class="item flexrow list-item" data-item-id="{{comp._id}}">
               <img class="sheet-competence-img" src="{{comp.img}}" />
-              <span class="competence-label" name="data.competencecreature[{{key}}].name"><a>{{comp.name}}</a></span>
+              <span class="competence-label"><a>{{comp.name}}</a></span>
               <input class="competence-value creature-carac" type="text" 
                 name="data.competencecreature[{{key}}].data.carac_value" compname="{{comp.name}}"
                 value="{{comp.data.carac_value}}" data-dtype="number" />
               <input class="competence-value creature-niveau" type="text"
-                name="data.competencecreature[{{key}}].data.niveau" compname="{{comp.name}}"
+                compname="{{comp.name}}"
                 value="{{numberFormat comp.data.niveau decimals=0 sign=true}}" data-dtype="number" />
               <input class="competence-value creature-dommages" type="text"
                 name="data.competencecreature[{{key}}].data.dommages" compname="{{comp.name}}"
diff --git a/templates/actor-sheet.html b/templates/actor-sheet.html
index 31d24de7..3d025293 100644
--- a/templates/actor-sheet.html
+++ b/templates/actor-sheet.html
@@ -206,9 +206,9 @@
                   {{#if data.afficherCompetence}}
                   <li class="item flexrow list-item" data-item-id="{{comp._id}}">
                       <img class="sheet-competence-img" src="{{comp.img}}"/>
-                      <span class="competence-label" name="data.competenceByCategory.generale[{{key}}].name"><a>{{comp.name}}</a></span>
-                      <input class="competence-value" type="text" name="data.competenceByCategory.generale[{{key}}].data.value" compname="{{comp.name}}" value="{{numberFormat comp.data.niveau decimals=0 sign=true}}" data-dtype="number" {{#unless @root.data.editCaracComp}}disabled{{/unless}}/>
-                      <input class="competence-xp" type="text" name="data.competenceByCategory.generale[{{key}}]].data.xp" compname="{{comp.name}}" value="{{comp.data.xp}}" data-dtype="number" {{#unless @root.data.editCaracComp}}disabled{{/unless}}/>
+                      <span class="competence-label"><a>{{comp.name}}</a></span>
+                      <input class="competence-value" type="text" compname="{{comp.name}}" value="{{numberFormat comp.data.niveau decimals=0 sign=true}}" data-dtype="number" {{#unless @root.data.editCaracComp}}disabled{{/unless}}/>
+                      <input class="competence-xp" type="text" compname="{{comp.name}}" value="{{comp.data.xp}}" data-dtype="number" {{#unless @root.data.editCaracComp}}disabled{{/unless}}/>
                       <div class="item-controls">
                         <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
                         <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
@@ -229,9 +229,9 @@
                   {{#if data.afficherCompetence}}
                   <li class="item flexrow list-item" data-item-id="{{comp._id}}">
                       <img class="sheet-competence-img" src="{{comp.img}}"/>
-                      <span class="competence-label" name="data.competenceByCategory.particuliere[{{key}}].name"><a>{{comp.name}}</a></span>
-                      <input class="competence-value" type="text" name="data.competenceByCategory.particuliere[{{key}}].data.niveau" compname="{{comp.name}}" value="{{numberFormat comp.data.niveau decimals=0 sign=true}}" data-dtype="number" {{#unless @root.data.editCaracComp}}disabled{{/unless}}/>
-                      <input class="competence-xp" type="text" name="data.competenceByCategory.particuliere[{{key}}].data.xp" compname="{{comp.name}}" value="{{comp.data.xp}}" data-dtype="number" {{#unless @root.data.editCaracComp}}disabled{{/unless}}/>
+                      <span class="competence-label"><a>{{comp.name}}</a></span>
+                      <input class="competence-value" type="text" compname="{{comp.name}}" value="{{numberFormat comp.data.niveau decimals=0 sign=true}}" data-dtype="number" {{#unless @root.data.editCaracComp}}disabled{{/unless}}/>
+                      <input class="competence-xp" type="text" compname="{{comp.name}}" value="{{comp.data.xp}}" data-dtype="number" {{#unless @root.data.editCaracComp}}disabled{{/unless}}/>
                       <div class="item-controls">
                           <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
                           <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
@@ -251,9 +251,9 @@
                 {{#if data.afficherCompetence}}
                 <li class="item flexrow list-item" data-item-id="{{comp._id}}">
                     <img class="sheet-competence-img" src="{{comp.img}}"/>
-                    <span class="competence-label" name="data.competenceByCategory.specialisee[{{key}}].name"><a>{{comp.name}}</a></span>
-                    <input class="competence-value" type="text" name="data.competenceByCategory.specialisee[{{key}}].data.niveau" compname="{{comp.name}}" value="{{numberFormat comp.data.niveau decimals=0 sign=true}}" data-dtype="number" {{#unless @root.data.editCaracComp}}disabled{{/unless}}/>
-                    <input class="competence-xp" type="text" name="data.competenceByCategory.specialisee[{{key}}].data.xp" compname="{{comp.name}}" value="{{comp.data.xp}}" data-dtype="number" {{#unless @root.data.editCaracComp}}disabled{{/unless}}/>
+                    <span class="competence-label"><a>{{comp.name}}</a></span>
+                    <input class="competence-value" type="text" compname="{{comp.name}}" value="{{numberFormat comp.data.niveau decimals=0 sign=true}}" data-dtype="number" {{#unless @root.data.editCaracComp}}disabled{{/unless}}/>
+                    <input class="competence-xp" type="text" compname="{{comp.name}}" value="{{comp.data.xp}}" data-dtype="number" {{#unless @root.data.editCaracComp}}disabled{{/unless}}/>
                     <div class="item-controls">
                         <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
                         <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
@@ -276,8 +276,8 @@
                   {{#if data.afficherCompetence}}
                   <li class="item flexrow list-item" data-item-id="{{comp._id}}">
                       <img class="sheet-competence-img" src="{{comp.img}}"/>
-                      <span class="competence-label" name="data.competenceByCategory.melee[{{key}}].name"><a>{{comp.name}}</a></span>
-                      <input class="competence-value" type="text" name="data.competenceByCategory.melee[{{key}}].data.niveau" compname="{{comp.name}}" value="{{numberFormat comp.data.niveau decimals=0 sign=true}}" data-dtype="number" {{#unless @root.data.editCaracComp}}disabled{{/unless}}/>
+                      <span class="competence-label"><a>{{comp.name}}</a></span>
+                      <input class="competence-value" type="text" compname="{{comp.name}}" value="{{numberFormat comp.data.niveau decimals=0 sign=true}}" data-dtype="number" {{#unless @root.data.editCaracComp}}disabled{{/unless}}/>
                       <input class="competence-xp" type="text" name="data.competenceByCategory.melee[{{key}}].data.xp" compname="{{comp.name}}" value="{{comp.data.xp}}" data-dtype="number" {{#unless @root.data.editCaracComp}}disabled{{/unless}}/>
                       <div class="item-controls">
                           <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
@@ -299,8 +299,8 @@
                   {{#if data.afficherCompetence}}
                   <li class="item flexrow list-item" data-item-id="{{comp._id}}">
                       <img class="sheet-competence-img" src="{{comp.img}}"/>
-                      <span class="competence-label" name="data.competenceByCategory.tir[{{key}}].name"><a>{{comp.name}}</a></span>
-                      <input class="competence-value" type="text" name="data.competenceByCategory.tir[{{key}}].data.niveau" compname="{{comp.name}}" value="{{numberFormat comp.data.niveau decimals=0 sign=true}}" data-dtype="number" {{#unless @root.data.editCaracComp}}disabled{{/unless}}/>
+                      <span class="competence-label"><a>{{comp.name}}</a></span>
+                      <input class="competence-value" type="text" compname="{{comp.name}}" value="{{numberFormat comp.data.niveau decimals=0 sign=true}}" data-dtype="number" {{#unless @root.data.editCaracComp}}disabled{{/unless}}/>
                       <input class="competence-xp" type="text" name="data.competenceByCategory.tir[{{key}}].data.xp" compname="{{comp.name}}" value="{{comp.data.xp}}" data-dtype="number" {{#unless @root.data.editCaracComp}}disabled{{/unless}}/>
                       <div class="item-controls">
                           <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
@@ -322,8 +322,8 @@
                   {{#if data.afficherCompetence}}
                   <li class="item flexrow list-item" data-item-id="{{comp._id}}">
                       <img class="sheet-competence-img" src="{{comp.img}}"/>
-                      <span class="competence-label" name="data.competenceByCategory.lancer[{{key}}].name"><a>{{comp.name}}</a></span>
-                      <input class="competence-value" type="text" name="data.competenceByCategory.lancer[{{key}}].data.niveau" compname="{{comp.name}}" value="{{numberFormat comp.data.niveau decimals=0 sign=true}}" data-dtype="number"{{#unless @root.data.editCaracComp}}disabled{{/unless}}/>
+                      <span class="competence-label"><a>{{comp.name}}</a></span>
+                      <input class="competence-value" type="text" compname="{{comp.name}}" value="{{numberFormat comp.data.niveau decimals=0 sign=true}}" data-dtype="number"{{#unless @root.data.editCaracComp}}disabled{{/unless}}/>
                       <input class="competence-xp" type="text" name="data.competenceByCategory.lancer[{{key}}].data.xp" compname="{{comp.name}}" value="{{comp.data.xp}}" data-dtype="number" {{#unless @root.data.editCaracComp}}disabled{{/unless}}/>
                       <div class="item-controls">
                           <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
@@ -345,8 +345,8 @@
                   {{#if data.afficherCompetence}}
                   <li class="item flexrow list-item" data-item-id="{{comp._id}}">
                       <img class="sheet-competence-img" src="{{comp.img}}"/>
-                      <span class="competence-label" name="data.competenceByCategory.connaissance[{{key}}].name"><a>{{comp.name}}</a></span>
-                      <input class="competence-value" type="text" name="data.competenceByCategory.connaissance[{{key}}].data.niveau" compname="{{comp.name}}" value="{{numberFormat comp.data.niveau decimals=0 sign=true}}" data-dtype="number" {{#unless @root.data.editCaracComp}}disabled{{/unless}}/>
+                      <span class="competence-label"><a>{{comp.name}}</a></span>
+                      <input class="competence-value" type="text" compname="{{comp.name}}" value="{{numberFormat comp.data.niveau decimals=0 sign=true}}" data-dtype="number" {{#unless @root.data.editCaracComp}}disabled{{/unless}}/>
                       <input class="competence-xp" type="text" name="data.competenceByCategory.connaissance[{{key}}].data.xp" compname="{{comp.name}}" value="{{comp.data.xp}}" data-dtype="number" {{#unless @root.data.editCaracComp}}disabled{{/unless}}/>
                       <div class="item-controls">
                         <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
@@ -368,9 +368,10 @@
                 {{#if data.afficherCompetence}}
                 <li class="item flexrow list-item" data-item-id="{{comp._id}}">
                   <img class="sheet-competence-img" src="{{comp.img}}"/>
-                  <span class="competence-label" name="data.competenceByCategory.draconic[{{key}}].name"><a>{{comp.name}}</a></span>
-                  <input class="competence-value" type="text" name="data.competenceByCategory.draconic[{{key}}].data.niveau" compname="{{comp.name}}" value="{{numberFormat comp.data.niveau decimals=0 sign=true}}" data-dtype="number" {{#unless @root.data.editCaracComp}}disabled{{/unless}}/>
+                  <span class="competence-label"><a>{{comp.name}}</a></span>
+                  <input class="competence-value" type="text" compname="{{comp.name}}" value="{{numberFormat comp.data.niveau decimals=0 sign=true}}" data-dtype="number" {{#unless @root.data.editCaracComp}}disabled{{/unless}}/>
                   <input class="competence-xp" type="text" name="data.competenceByCategory.draconic[{{key}}].data.xp" compname="{{comp.name}}" value="{{comp.data.xp}}" data-dtype="number" {{#unless @root.data.editCaracComp}}disabled{{/unless}}/>
+                  <input class="competence-xp-sort" type="text" name="data.competenceByCategory.draconic[{{key}}].data.xp_sort" compname="{{comp.name}}" value="{{comp.data.xp}}" data-dtype="number" {{#unless @root.data.editCaracComp}}disabled{{/unless}}/>
                   <div class="item-controls">
                     <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
                     <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
@@ -408,7 +409,7 @@
               <li class="item flexrow list-item" data-item-id="{{arme._id}}">
                   <span class="arme-label" name="data.armes[{{key}}].name"><a data-competence-name="{{arme.data.competence}}">{{arme.name}}</a></span>
                   <span class="arme-initiative" ><a data-arme-name="{{arme.name}}" data-competence-name="{{arme.data.competence}}">{{arme.data.initiative}}</a></span>
-                  <span class="competence-label" name="data.armes[{{key}}].data.competence">{{arme.data.competence}}</span>
+                  <span class="competence-label">{{arme.data.competence}}</span>
                   <span class="competence-value" name="data.armes[{{key}}].data.niveau">{{numberFormat arme.data.niveau decimals=0 sign=true}}</span>
                   <span class="competence-value" name="data.armes[{{key}}].data.dommages">{{numberFormat arme.data.dommages decimals=0 sign=true}}</span>
               </li>
@@ -434,19 +435,19 @@
                   </li>
                   <li>
                     Premiers soins
-                    <input class="blessures-soins" type="text" name="premiers_soins" data-dtype="number" value="{{bless.premiers_soins}}"/>
+                    <input class="blessures-soins" type="text" data-dtype="number" value="{{bless.premiers_soins}}"/>
                   </li>
                   <li>
                     Soins complets
-                    <input class="blessures-soins" type="text" name="soins_complets" data-dtype="number" value="{{bless.soins_complets}}"/>
+                    <input class="blessures-soins" type="text" data-dtype="number" value="{{bless.soins_complets}}"/>
                   </li>
                   <li>
                     Jours
-                    <input class="blessures-soins" type="text" name="jours" data-dtype="number" value="{{bless.jours}}"/>
+                    <input class="blessures-soins" type="text" data-dtype="number" value="{{bless.jours}}"/>
                   </li>
                   <li>
                     Loc.
-                    <input class="blessures-soins" type="text" name="localisation" data-dtype="String" value="{{bless.loc}}"/>
+                    <input class="blessures-soins" type="text" data-dtype="String" value="{{bless.loc}}"/>
                   </li>
                 </ul>
               </li>
@@ -466,19 +467,19 @@
                   </li>
                   <li>
                     Premiers soins
-                    <input class="blessures-soins" type="text" name="premiers_soins" data-dtype="number" value="{{bless.premiers_soins}}"/>
+                    <input class="blessures-soins" type="text" data-dtype="number" value="{{bless.premiers_soins}}"/>
                   </li>
                   <li>
                     Soins complets
-                    <input class="blessures-soins" type="text" name="soins_complets" data-dtype="number" value="{{bless.soins_complets}}"/>
+                    <input class="blessures-soins" type="text" data-dtype="number" value="{{bless.soins_complets}}"/>
                   </li>
                   <li>
                     Jours
-                    <input class="blessures-soins" type="text" name="jours" data-dtype="number" value="{{bless.jours}}"/>
+                    <input class="blessures-soins" type="text" data-dtype="number" value="{{bless.jours}}"/>
                   </li>
                   <li>
                     Loc.
-                    <input class="blessures-soins" type="text" name="localisation" data-dtype="String" value="{{bless.loc}}"/>
+                    <input class="blessures-soins" type="text" data-dtype="String" value="{{bless.loc}}"/>
                   </li>
                 </ul>
               </li>
@@ -498,19 +499,19 @@
                   </li>
                   <li>
                     Premiers soins
-                    <input class="blessures-soins" type="text" name="premiers_soins" data-dtype="number" value="{{bless.premiers_soins}}"/>
+                    <input class="blessures-soins" type="text" data-dtype="number" value="{{bless.premiers_soins}}"/>
                   </li>
                   <li>
                     Soins complets
-                    <input class="blessures-soins" type="text" name="soins_complets" data-dtype="number" value="{{bless.soins_complets}}"/>
+                    <input class="blessures-soins" type="text" data-dtype="number" value="{{bless.soins_complets}}"/>
                   </li>
                   <li>
                     Jours
-                    <input class="blessures-soins" type="text" name="jours" data-dtype="number" value="{{bless.jours}}"/>
+                    <input class="blessures-soins" type="text" data-dtype="number" value="{{bless.jours}}"/>
                   </li>
                   <li>
                     Loc.
-                    <input class="blessures-soins" type="text" name="localisation" data-dtype="String" value="{{bless.loc}}"/>
+                    <input class="blessures-soins" type="text" data-dtype="String" value="{{bless.loc}}"/>
                   </li>
                 </ul>
               </li>