diff --git a/module/rdd-utility.js b/module/rdd-utility.js
index f3db889f..a4bbda5b 100644
--- a/module/rdd-utility.js
+++ b/module/rdd-utility.js
@@ -194,20 +194,21 @@ export class RdDUtility {
       'systems/foundryvtt-reve-de-dragon/templates/item-possession-sheet.html',
       'systems/foundryvtt-reve-de-dragon/templates/competence-carac-defaut.html',
       'systems/foundryvtt-reve-de-dragon/templates/competence-base.html',
+      // partial enums
       'systems/foundryvtt-reve-de-dragon/templates/enum-aspect-tarot.html',
       'systems/foundryvtt-reve-de-dragon/templates/enum-categorie-competence.html',
       'systems/foundryvtt-reve-de-dragon/templates/enum-categorie-ingredient.html',
       'systems/foundryvtt-reve-de-dragon/templates/enum-categorie-parade.html',
+      'systems/foundryvtt-reve-de-dragon/templates/enum-categorie-potion.html',
       'systems/foundryvtt-reve-de-dragon/templates/enum-categorie-vehicule.html',
       'systems/foundryvtt-reve-de-dragon/templates/enum-competence.html',
       'systems/foundryvtt-reve-de-dragon/templates/enum-herbesoin-ingredient.html',
-      'systems/foundryvtt-reve-de-dragon/templates/enum-categorie-potion.html',
       'systems/foundryvtt-reve-de-dragon/templates/enum-initpremierround.html',
+      'systems/foundryvtt-reve-de-dragon/templates/enum-niveau-ethylisme.html',
       'systems/foundryvtt-reve-de-dragon/templates/enum-rarete.html',
       'systems/foundryvtt-reve-de-dragon/templates/sort-draconic.html',
-      'systems/foundryvtt-reve-de-dragon/templates/sort-tmr.html',
-      'systems/foundryvtt-reve-de-dragon/templates/niveau-ethylisme.html',
-      'systems/foundryvtt-reve-de-dragon/templates/casetmr-specific-list.html',
+      'systems/foundryvtt-reve-de-dragon/templates/enum-tmr-type.html',
+      'systems/foundryvtt-reve-de-dragon/templates/enum-tmr-effet.html',
       // Dialogs
       'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-resolution.html',
       'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-competence.html',
diff --git a/templates/actor/carac-derivee.html b/templates/actor/carac-derivee.html
index 430a674d..2820153b 100644
--- a/templates/actor/carac-derivee.html
+++ b/templates/actor/carac-derivee.html
@@ -32,7 +32,7 @@
         {{#if (eq compteur.label 'Ethylisme')}}
         <select class="description-value" name="system.compteurs.ethylisme.value" id="ethylisme" data-dtype="Number">
           {{#select compteur.value}}
-          {{>"systems/foundryvtt-reve-de-dragon/templates/niveau-ethylisme.html"}}
+          {{>"systems/foundryvtt-reve-de-dragon/templates/enum-niveau-ethylisme.html"}}
           {{/select}}
         </select>
         {{else}}
diff --git a/templates/enum-competence.html b/templates/enum-competence.html
index 3ba10abc..c38d8863 100644
--- a/templates/enum-competence.html
+++ b/templates/enum-competence.html
@@ -1,3 +1,3 @@
-{{#each @root.competences as |competence key|}}
+{{#each (trier @root.competences) as |competence key|}}
 <option value="{{competence.name}}">{{competence.name}}</option>
 {{/each}}
diff --git a/templates/niveau-ethylisme.html b/templates/enum-niveau-ethylisme.html
similarity index 100%
rename from templates/niveau-ethylisme.html
rename to templates/enum-niveau-ethylisme.html
diff --git a/templates/casetmr-specific-list.html b/templates/enum-tmr-effet.html
similarity index 100%
rename from templates/casetmr-specific-list.html
rename to templates/enum-tmr-effet.html
diff --git a/templates/sort-tmr.html b/templates/enum-tmr-type.html
similarity index 100%
rename from templates/sort-tmr.html
rename to templates/enum-tmr-type.html
diff --git a/templates/item-casetmr-sheet.html b/templates/item-casetmr-sheet.html
index c5c8292b..e692e464 100644
--- a/templates/item-casetmr-sheet.html
+++ b/templates/item-casetmr-sheet.html
@@ -10,7 +10,7 @@
       <label for="niveau">Mode spécifique</label>
       <select name="system.specific" id="specific" data-dtype="String">
         {{#select system.specific}}
-        {{>"systems/foundryvtt-reve-de-dragon/templates/casetmr-specific-list.html"}}
+        {{>"systems/foundryvtt-reve-de-dragon/templates/enum-tmr-effet.html"}}
         {{/select}}
     </select>
     </div>
diff --git a/templates/item-livre-sheet.html b/templates/item-livre-sheet.html
index 952cac89..7eeeee33 100644
--- a/templates/item-livre-sheet.html
+++ b/templates/item-livre-sheet.html
@@ -21,9 +21,7 @@
         <label for="xp">Compétence</label>
         <select name="system.competence" id="competenceselect" data-dtype="String">
           {{#select system.competence}}
-          {{#each (trier competences) as |competence key|}}
-          <option value="{{competence.name}}">{{competence.name}}</option>
-          {{/each}}
+          {{>"systems/foundryvtt-reve-de-dragon/templates/enum-competence.html"}}
           {{/select}}    
         </select>
       </div>
diff --git a/templates/item-meditation-sheet.html b/templates/item-meditation-sheet.html
index 77aa8bb2..b8458404 100644
--- a/templates/item-meditation-sheet.html
+++ b/templates/item-meditation-sheet.html
@@ -6,9 +6,7 @@
       <label for="xp">Compétence</label>
       <select name="system.competence" id="competenceselect" data-dtype="String">
         {{#select system.competence}}
-        {{#each (trier competences) as |competence key|}}
-        <option value="{{competence.name}}">{{competence.name}}</option>
-        {{/each}}
+        {{>"systems/foundryvtt-reve-de-dragon/templates/enum-competence.html"}}
         {{/select}}    
       </select>
     </div>
@@ -44,7 +42,7 @@
       <label for="xp">Case TMR</label>
       <select name="system.tmr" id="tmr" data-dtype="String">
         {{#select system.tmr}}
-        {{>"systems/foundryvtt-reve-de-dragon/templates/sort-tmr.html"}}
+        {{>"systems/foundryvtt-reve-de-dragon/templates/enum-tmr-type.html"}}
         {{/select}}
       </select>
     </div>
diff --git a/templates/item-oeuvre-sheet.html b/templates/item-oeuvre-sheet.html
index 013c81f3..0505dd6a 100644
--- a/templates/item-oeuvre-sheet.html
+++ b/templates/item-oeuvre-sheet.html
@@ -20,9 +20,7 @@
         <label>Compétence</label>
         <select name="system.competence" id="competenceselect" data-dtype="String">
           {{#select system.competence}}
-          {{#each (trier competences) as |competence key|}}
-          <option value="{{competence.name}}">{{competence.name}}</option>
-          {{/each}}
+          {{>"systems/foundryvtt-reve-de-dragon/templates/enum-competence.html"}}
           {{/select}}    
         </select>
       </div>
diff --git a/templates/item-sort-sheet.html b/templates/item-sort-sheet.html
index a9c1d552..ad2915ee 100644
--- a/templates/item-sort-sheet.html
+++ b/templates/item-sort-sheet.html
@@ -14,7 +14,7 @@
       <label for="system.caseTMR">Case TMR</label>
       <select name="system.caseTMR" id="caseTMR" data-dtype="String">
         {{#select system.caseTMR}}
-        {{>"systems/foundryvtt-reve-de-dragon/templates/sort-tmr.html"}}
+        {{>"systems/foundryvtt-reve-de-dragon/templates/enum-tmr-type.html"}}
         <option value="special">Case spéciale TMR (saisie ci-dessous)</option>
         {{/select}}
       </select>
diff --git a/templates/item-tache-sheet.html b/templates/item-tache-sheet.html
index b0d4f532..eda91e85 100644
--- a/templates/item-tache-sheet.html
+++ b/templates/item-tache-sheet.html
@@ -17,9 +17,7 @@
       <select name="system.competence" id="competenceselect" data-dtype="String">
       {{#select system.competence}}
       <option value="">Sans compétence</option>
-      {{#each (trier competences) as |competence key|}}
-      <option value="{{competence.name}}">{{competence.name}}</option>
-      {{/each}}
+      {{>"systems/foundryvtt-reve-de-dragon/templates/enum-competence.html"}}
       {{/select}}    
     </select>
   </div>