diff --git a/DnD_3_5_Modern/generated/characteristics.html b/DnD_3_5_Modern/generated/characteristics.html
index f0b761f12b..e4592faff5 100644
--- a/DnD_3_5_Modern/generated/characteristics.html
+++ b/DnD_3_5_Modern/generated/characteristics.html
@@ -2,7 +2,7 @@
 <div class="attributes w-3">
   <div class="attribute">
     <button class="button-label" value="@{for_rollvalue}" type="roll"><span data-i18n="attribute.for">for</span></button><span class="mod" type="text" name="attr_for_mod"></span>
-    <input type="hidden" name="attr_for_rollvalue" value="&amp;{template:main} {{titre=Test de for}} {{subtitle=@{character_name} }} {{Jet=[[1d20+@{for_mod}]]}}"/>
+    <input type="hidden" name="attr_for_rollvalue" value="&amp;{template:main} {{titre=^{attribute.for.roll}}} {{subtitle=@{character_name} }} {{Jet=[[1d20+@{for_mod}]]}}"/>
     <div class="base">
       <input type="hidden" name="attr_for_modified" value="false"/>
       <input class="base" type="number" name="attr_for_base" value="10"/><span name="attr_for_total">10</span>
@@ -10,7 +10,7 @@
   </div>
   <div class="attribute">
     <button class="button-label" value="@{dex_rollvalue}" type="roll"><span data-i18n="attribute.dex">dex</span></button><span class="mod" type="text" name="attr_dex_mod"></span>
-    <input type="hidden" name="attr_dex_rollvalue" value="&amp;{template:main} {{titre=Test de dex}} {{subtitle=@{character_name} }} {{Jet=[[1d20+@{dex_mod}]]}}"/>
+    <input type="hidden" name="attr_dex_rollvalue" value="&amp;{template:main} {{titre=^{attribute.dex.roll}}} {{subtitle=@{character_name} }} {{Jet=[[1d20+@{dex_mod}]]}}"/>
     <div class="base">
       <input type="hidden" name="attr_dex_modified" value="false"/>
       <input class="base" type="number" name="attr_dex_base" value="10"/><span name="attr_dex_total">10</span>
@@ -18,7 +18,7 @@
   </div>
   <div class="attribute">
     <button class="button-label" value="@{int_rollvalue}" type="roll"><span data-i18n="attribute.int">int</span></button><span class="mod" type="text" name="attr_int_mod"></span>
-    <input type="hidden" name="attr_int_rollvalue" value="&amp;{template:main} {{titre=Test de int}} {{subtitle=@{character_name} }} {{Jet=[[1d20+@{int_mod}]]}}"/>
+    <input type="hidden" name="attr_int_rollvalue" value="&amp;{template:main} {{titre=^{attribute.int.roll}}} {{subtitle=@{character_name} }} {{Jet=[[1d20+@{int_mod}]]}}"/>
     <div class="base">
       <input type="hidden" name="attr_int_modified" value="false"/>
       <input class="base" type="number" name="attr_int_base" value="10"/><span name="attr_int_total">10</span>
@@ -26,7 +26,7 @@
   </div>
   <div class="attribute">
     <button class="button-label" value="@{con_rollvalue}" type="roll"><span data-i18n="attribute.con">con</span></button><span class="mod" type="text" name="attr_con_mod"></span>
-    <input type="hidden" name="attr_con_rollvalue" value="&amp;{template:main} {{titre=Test de con}} {{subtitle=@{character_name} }} {{Jet=[[1d20+@{con_mod}]]}}"/>
+    <input type="hidden" name="attr_con_rollvalue" value="&amp;{template:main} {{titre=^{attribute.con.roll}}} {{subtitle=@{character_name} }} {{Jet=[[1d20+@{con_mod}]]}}"/>
     <div class="base">
       <input type="hidden" name="attr_con_modified" value="false"/>
       <input class="base" type="number" name="attr_con_base" value="10"/><span name="attr_con_total">10</span>
@@ -34,7 +34,7 @@
   </div>
   <div class="attribute">
     <button class="button-label" value="@{sag_rollvalue}" type="roll"><span data-i18n="attribute.sag">sag</span></button><span class="mod" type="text" name="attr_sag_mod"></span>
-    <input type="hidden" name="attr_sag_rollvalue" value="&amp;{template:main} {{titre=Test de sag}} {{subtitle=@{character_name} }} {{Jet=[[1d20+@{sag_mod}]]}}"/>
+    <input type="hidden" name="attr_sag_rollvalue" value="&amp;{template:main} {{titre=^{attribute.sag.roll}}} {{subtitle=@{character_name} }} {{Jet=[[1d20+@{sag_mod}]]}}"/>
     <div class="base">
       <input type="hidden" name="attr_sag_modified" value="false"/>
       <input class="base" type="number" name="attr_sag_base" value="10"/><span name="attr_sag_total">10</span>
@@ -42,7 +42,7 @@
   </div>
   <div class="attribute">
     <button class="button-label" value="@{cha_rollvalue}" type="roll"><span data-i18n="attribute.cha">cha</span></button><span class="mod" type="text" name="attr_cha_mod"></span>
-    <input type="hidden" name="attr_cha_rollvalue" value="&amp;{template:main} {{titre=Test de cha}} {{subtitle=@{character_name} }} {{Jet=[[1d20+@{cha_mod}]]}}"/>
+    <input type="hidden" name="attr_cha_rollvalue" value="&amp;{template:main} {{titre=^{attribute.cha.roll}}} {{subtitle=@{character_name} }} {{Jet=[[1d20+@{cha_mod}]]}}"/>
     <div class="base">
       <input type="hidden" name="attr_cha_modified" value="false"/>
       <input class="base" type="number" name="attr_cha_base" value="10"/><span name="attr_cha_total">10</span>
diff --git a/DnD_3_5_Modern/generated/spells.html b/DnD_3_5_Modern/generated/spells.html
index ca4e986122..07b00d62c8 100644
--- a/DnD_3_5_Modern/generated/spells.html
+++ b/DnD_3_5_Modern/generated/spells.html
@@ -18,7 +18,7 @@
             <div class="flex-row align-center">
               <input type="checkbox" name="attr_prepared"/>
               <button class="spell-button" name="attr_roll" type="roll" value="@{rollvalue}"><span class="spell-name" name="attr_name"></span><span>&nbsp;</span><span class="spell-innate" name="attr_innate"></span></button>
-              <input type="hidden" name="attr_rollvalue" value="&{template:spell} {{name=Sort: @{name}}} {{school=@{school}}} {{casting-time=@{casting-time}}} {{range=@{range}}} {{duration=@{duration}}} {{innate=@{innate}}} {{subtitle=@{character_name}}} {{level=0}}  {{description=@{description}}}"/>
+              <input type="hidden" name="attr_rollvalue" value="&{template:spell} {{name=^{spells.spell}: @{name}}} {{school=@{school}}} {{casting-time=@{casting-time}}} {{range=@{range}}} {{duration=@{duration}}} {{innate=@{innate}}} {{subtitle=@{character_name}}} {{level=0}}  {{description=@{description}}}"/>
             </div>
             <div class="flex-column options-options">
               <div class="flex-row">
@@ -69,7 +69,7 @@
             <div class="flex-row align-center">
               <input type="checkbox" name="attr_prepared"/>
               <button class="spell-button" name="attr_roll" type="roll" value="@{rollvalue}"><span class="spell-name" name="attr_name"></span><span>&nbsp;</span><span class="spell-innate" name="attr_innate"></span></button>
-              <input type="hidden" name="attr_rollvalue" value="&{template:spell} {{name=Sort: @{name}}} {{school=@{school}}} {{casting-time=@{casting-time}}} {{range=@{range}}} {{duration=@{duration}}} {{innate=@{innate}}} {{subtitle=@{character_name}}} {{level=1}}  {{description=@{description}}}"/>
+              <input type="hidden" name="attr_rollvalue" value="&{template:spell} {{name=^{spells.spell}: @{name}}} {{school=@{school}}} {{casting-time=@{casting-time}}} {{range=@{range}}} {{duration=@{duration}}} {{innate=@{innate}}} {{subtitle=@{character_name}}} {{level=1}}  {{description=@{description}}}"/>
             </div>
             <div class="flex-column options-options">
               <div class="flex-row">
@@ -120,7 +120,7 @@
             <div class="flex-row align-center">
               <input type="checkbox" name="attr_prepared"/>
               <button class="spell-button" name="attr_roll" type="roll" value="@{rollvalue}"><span class="spell-name" name="attr_name"></span><span>&nbsp;</span><span class="spell-innate" name="attr_innate"></span></button>
-              <input type="hidden" name="attr_rollvalue" value="&{template:spell} {{name=Sort: @{name}}} {{school=@{school}}} {{casting-time=@{casting-time}}} {{range=@{range}}} {{duration=@{duration}}} {{innate=@{innate}}} {{subtitle=@{character_name}}} {{level=2}}  {{description=@{description}}}"/>
+              <input type="hidden" name="attr_rollvalue" value="&{template:spell} {{name=^{spells.spell}: @{name}}} {{school=@{school}}} {{casting-time=@{casting-time}}} {{range=@{range}}} {{duration=@{duration}}} {{innate=@{innate}}} {{subtitle=@{character_name}}} {{level=2}}  {{description=@{description}}}"/>
             </div>
             <div class="flex-column options-options">
               <div class="flex-row">
@@ -173,7 +173,7 @@
             <div class="flex-row align-center">
               <input type="checkbox" name="attr_prepared"/>
               <button class="spell-button" name="attr_roll" type="roll" value="@{rollvalue}"><span class="spell-name" name="attr_name"></span><span>&nbsp;</span><span class="spell-innate" name="attr_innate"></span></button>
-              <input type="hidden" name="attr_rollvalue" value="&{template:spell} {{name=Sort: @{name}}} {{school=@{school}}} {{casting-time=@{casting-time}}} {{range=@{range}}} {{duration=@{duration}}} {{innate=@{innate}}} {{subtitle=@{character_name}}} {{level=3}}  {{description=@{description}}}"/>
+              <input type="hidden" name="attr_rollvalue" value="&{template:spell} {{name=^{spells.spell}: @{name}}} {{school=@{school}}} {{casting-time=@{casting-time}}} {{range=@{range}}} {{duration=@{duration}}} {{innate=@{innate}}} {{subtitle=@{character_name}}} {{level=3}}  {{description=@{description}}}"/>
             </div>
             <div class="flex-column options-options">
               <div class="flex-row">
@@ -224,7 +224,7 @@
             <div class="flex-row align-center">
               <input type="checkbox" name="attr_prepared"/>
               <button class="spell-button" name="attr_roll" type="roll" value="@{rollvalue}"><span class="spell-name" name="attr_name"></span><span>&nbsp;</span><span class="spell-innate" name="attr_innate"></span></button>
-              <input type="hidden" name="attr_rollvalue" value="&{template:spell} {{name=Sort: @{name}}} {{school=@{school}}} {{casting-time=@{casting-time}}} {{range=@{range}}} {{duration=@{duration}}} {{innate=@{innate}}} {{subtitle=@{character_name}}} {{level=4}}  {{description=@{description}}}"/>
+              <input type="hidden" name="attr_rollvalue" value="&{template:spell} {{name=^{spells.spell}: @{name}}} {{school=@{school}}} {{casting-time=@{casting-time}}} {{range=@{range}}} {{duration=@{duration}}} {{innate=@{innate}}} {{subtitle=@{character_name}}} {{level=4}}  {{description=@{description}}}"/>
             </div>
             <div class="flex-column options-options">
               <div class="flex-row">
@@ -275,7 +275,7 @@
             <div class="flex-row align-center">
               <input type="checkbox" name="attr_prepared"/>
               <button class="spell-button" name="attr_roll" type="roll" value="@{rollvalue}"><span class="spell-name" name="attr_name"></span><span>&nbsp;</span><span class="spell-innate" name="attr_innate"></span></button>
-              <input type="hidden" name="attr_rollvalue" value="&{template:spell} {{name=Sort: @{name}}} {{school=@{school}}} {{casting-time=@{casting-time}}} {{range=@{range}}} {{duration=@{duration}}} {{innate=@{innate}}} {{subtitle=@{character_name}}} {{level=5}}  {{description=@{description}}}"/>
+              <input type="hidden" name="attr_rollvalue" value="&{template:spell} {{name=^{spells.spell}: @{name}}} {{school=@{school}}} {{casting-time=@{casting-time}}} {{range=@{range}}} {{duration=@{duration}}} {{innate=@{innate}}} {{subtitle=@{character_name}}} {{level=5}}  {{description=@{description}}}"/>
             </div>
             <div class="flex-column options-options">
               <div class="flex-row">
@@ -328,7 +328,7 @@
             <div class="flex-row align-center">
               <input type="checkbox" name="attr_prepared"/>
               <button class="spell-button" name="attr_roll" type="roll" value="@{rollvalue}"><span class="spell-name" name="attr_name"></span><span>&nbsp;</span><span class="spell-innate" name="attr_innate"></span></button>
-              <input type="hidden" name="attr_rollvalue" value="&{template:spell} {{name=Sort: @{name}}} {{school=@{school}}} {{casting-time=@{casting-time}}} {{range=@{range}}} {{duration=@{duration}}} {{innate=@{innate}}} {{subtitle=@{character_name}}} {{level=6}}  {{description=@{description}}}"/>
+              <input type="hidden" name="attr_rollvalue" value="&{template:spell} {{name=^{spells.spell}: @{name}}} {{school=@{school}}} {{casting-time=@{casting-time}}} {{range=@{range}}} {{duration=@{duration}}} {{innate=@{innate}}} {{subtitle=@{character_name}}} {{level=6}}  {{description=@{description}}}"/>
             </div>
             <div class="flex-column options-options">
               <div class="flex-row">
@@ -379,7 +379,7 @@
             <div class="flex-row align-center">
               <input type="checkbox" name="attr_prepared"/>
               <button class="spell-button" name="attr_roll" type="roll" value="@{rollvalue}"><span class="spell-name" name="attr_name"></span><span>&nbsp;</span><span class="spell-innate" name="attr_innate"></span></button>
-              <input type="hidden" name="attr_rollvalue" value="&{template:spell} {{name=Sort: @{name}}} {{school=@{school}}} {{casting-time=@{casting-time}}} {{range=@{range}}} {{duration=@{duration}}} {{innate=@{innate}}} {{subtitle=@{character_name}}} {{level=7}}  {{description=@{description}}}"/>
+              <input type="hidden" name="attr_rollvalue" value="&{template:spell} {{name=^{spells.spell}: @{name}}} {{school=@{school}}} {{casting-time=@{casting-time}}} {{range=@{range}}} {{duration=@{duration}}} {{innate=@{innate}}} {{subtitle=@{character_name}}} {{level=7}}  {{description=@{description}}}"/>
             </div>
             <div class="flex-column options-options">
               <div class="flex-row">
@@ -430,7 +430,7 @@
             <div class="flex-row align-center">
               <input type="checkbox" name="attr_prepared"/>
               <button class="spell-button" name="attr_roll" type="roll" value="@{rollvalue}"><span class="spell-name" name="attr_name"></span><span>&nbsp;</span><span class="spell-innate" name="attr_innate"></span></button>
-              <input type="hidden" name="attr_rollvalue" value="&{template:spell} {{name=Sort: @{name}}} {{school=@{school}}} {{casting-time=@{casting-time}}} {{range=@{range}}} {{duration=@{duration}}} {{innate=@{innate}}} {{subtitle=@{character_name}}} {{level=8}}  {{description=@{description}}}"/>
+              <input type="hidden" name="attr_rollvalue" value="&{template:spell} {{name=^{spells.spell}: @{name}}} {{school=@{school}}} {{casting-time=@{casting-time}}} {{range=@{range}}} {{duration=@{duration}}} {{innate=@{innate}}} {{subtitle=@{character_name}}} {{level=8}}  {{description=@{description}}}"/>
             </div>
             <div class="flex-column options-options">
               <div class="flex-row">
@@ -481,7 +481,7 @@
             <div class="flex-row align-center">
               <input type="checkbox" name="attr_prepared"/>
               <button class="spell-button" name="attr_roll" type="roll" value="@{rollvalue}"><span class="spell-name" name="attr_name"></span><span>&nbsp;</span><span class="spell-innate" name="attr_innate"></span></button>
-              <input type="hidden" name="attr_rollvalue" value="&{template:spell} {{name=Sort: @{name}}} {{school=@{school}}} {{casting-time=@{casting-time}}} {{range=@{range}}} {{duration=@{duration}}} {{innate=@{innate}}} {{subtitle=@{character_name}}} {{level=9}}  {{description=@{description}}}"/>
+              <input type="hidden" name="attr_rollvalue" value="&{template:spell} {{name=^{spells.spell}: @{name}}} {{school=@{school}}} {{casting-time=@{casting-time}}} {{range=@{range}}} {{duration=@{duration}}} {{innate=@{innate}}} {{subtitle=@{character_name}}} {{level=9}}  {{description=@{description}}}"/>
             </div>
             <div class="flex-column options-options">
               <div class="flex-row">
diff --git a/DnD_3_5_Modern/src/css/conditional-visibility.css b/DnD_3_5_Modern/src/css/conditional-visibility.css
index 87d43dfb01..9f3c3b0362 100644
--- a/DnD_3_5_Modern/src/css/conditional-visibility.css
+++ b/DnD_3_5_Modern/src/css/conditional-visibility.css
@@ -75,6 +75,8 @@
     z-index: 10;
 }
 
+.trait:hover > options-flag,
+.trait:hover > options-flag + span,
 .flex-row:hover > .options-flag + span,
 .flex-row:hover > .options-flag,
 .attq:hover > .options-flag + span,
diff --git a/DnD_3_5_Modern/src/css/npc.css b/DnD_3_5_Modern/src/css/npc.css
index 610c045235..c9e1e19c2f 100644
--- a/DnD_3_5_Modern/src/css/npc.css
+++ b/DnD_3_5_Modern/src/css/npc.css
@@ -32,4 +32,4 @@
         margin: 0;
 
     }
-}
+}
\ No newline at end of file
diff --git a/DnD_3_5_Modern/src/html/npc.html b/DnD_3_5_Modern/src/html/npc.html
index 2ab444a796..79b9389db6 100644
--- a/DnD_3_5_Modern/src/html/npc.html
+++ b/DnD_3_5_Modern/src/html/npc.html
@@ -4,37 +4,37 @@
             <h4 class="h4"><span data-i18n="attribute.title">Caractéristiques</span></h4>
             <div class="flex-row justify-center">
                 <div class="flex-column w-2">
-                    <button type="roll" value="&{template:main} {{titre=Test de Force}} {{subtitle=@{character_name} }} {{Jet=[[1d20+@{for_mod}]]}}"
+                    <button type="roll" value="&{template:main} {{titre=^{attribute.for.roll}}} {{subtitle=@{character_name} }} {{Jet=[[1d20+@{for_mod}]]}}"
                             class="button-label text-center"><span data-i18n="attribute.for">FOR</span>
                     </button>
                     <input type="number" class="w-12 visible-input" name="attr_for_base">
                 </div>
                 <div class="flex-column w-2">
-                    <button type="roll" value="&{template:main} {{titre=Test de Dextérité}} {{subtitle=@{character_name} }} {{Jet=[[1d20+@{dex_mod}]]}}"
+                    <button type="roll" value="&{template:main} {{titre=^{attribute.dex.roll}}} {{subtitle=@{character_name} }} {{Jet=[[1d20+@{dex_mod}]]}}"
                             class="button-label text-center"><span data-i18n="attribute.dex">DEX</span>
                     </button>
                     <input type="number" class="w-12 visible-input" name="attr_dex_base">
                 </div>
                 <div class="flex-column w-2">
-                    <button type="roll" value="&{template:main} {{titre=Test de Constitution}} {{subtitle=@{character_name} }} {{Jet=[[1d20+@{con_mod}]]}}"
+                    <button type="roll" value="&{template:main} {{titre=^{attribute.con.roll}}} {{subtitle=@{character_name} }} {{Jet=[[1d20+@{con_mod}]]}}"
                             class="button-label text-center"><span data-i18n="attribute.con">CON</span>
                     </button>
                     <input type="number" class="w-12 visible-input" name="attr_con_base">
                 </div>
                 <div class="flex-column w-2">
-                    <button type="roll" value="&{template:main} {{titre=Test d'Intelligence}} {{subtitle=@{character_name} }} {{Jet=[[1d20+@{int_mod}]]}}"
+                    <button type="roll" value="&{template:main} {{titre=^{attribute.int.roll}}} {{subtitle=@{character_name} }} {{Jet=[[1d20+@{int_mod}]]}}"
                             class="button-label text-center"><span data-i18n="attribute.int">INT</span>
                     </button>
                     <input type="number" class="w-12 visible-input" name="attr_int_base">
                 </div>
                 <div class="flex-column w-2">
-                    <button type="roll" value="&{template:main} {{titre=Test de Sagesse}} {{subtitle=@{character_name} }} {{Jet=[[1d20+@{sag_mod}]]}}"
+                    <button type="roll" value="&{template:main} {{titre=^{attribute.sag.roll}}} {{subtitle=@{character_name} }} {{Jet=[[1d20+@{sag_mod}]]}}"
                             class="button-label text-center"><span data-i18n="attribute.sag">SAG</span>
                     </button>
                     <input type="number" class="w-12 visible-input" name="attr_sag_base">
                 </div>
                 <div class="flex-column w-2">
-                    <button type="roll" value="&{template:main} {{titre=Test de Charisme}} {{subtitle=@{character_name} }} {{Jet=[[1d20+@{cha_mod}]]}}"
+                    <button type="roll" value="&{template:main} {{titre=^{attribute.cha.roll}}} {{subtitle=@{character_name} }} {{Jet=[[1d20+@{cha_mod}]]}}"
                             class="button-label text-center"><span data-i18n="attribute.cha">CHA</span>
                     </button>
                     <input type="number" class="w-12 visible-input" name="attr_cha_base">
@@ -56,7 +56,7 @@
             <h4 class="h4"><span data-i18n="defenses.ac">Classe d'armure</span></h4>
             <div class="flex-row align-center">
                 <button type="roll"
-                        value="&{template:main} {{titre=Classe d'armure}} {{subtitle=@{character_name} }} {{CA=@{npc_ca} }}{{description=@{npc_ca_text} }}"
+                        value="&{template:main} {{titre=^{defenses.ac}}} {{subtitle=@{character_name} }} {{CA=@{npc_ca} }}{{description=@{npc_ca_text} }}"
                         class="button-label w-3 text-right"><span data-i18n="defenses.ac.normal">Normal</span> :
                 </button>
                 <input type="number" class="w-2 visible-input" name="attr_npc_ca">
@@ -64,7 +64,7 @@
             </div>
             <div class="flex-row align-center">
                 <button type="roll"
-                        value="&{template:main} {{titre=Classe d'armure pris au dépourvu}} {{subtitle=@{character_name} }} {{CA=@{npc_caff} }}{{description=@{npc_caff_text} }}"
+                        value="&{template:main} {{titre=^{defenses.ac}(^{defenses.ac.flatfooted}) }} {{subtitle=@{character_name} }} {{CA=@{npc_caff} }}{{description=@{npc_caff_text} }}"
                         class="button-label w-3 text-right"><span data-i18n="defenses.ac.flatfooted">Au dépourvu</span> :
                 </button>
                 <input type="number" class="w-2 visible-input" name="attr_npc_caff">
@@ -72,7 +72,7 @@
             </div>
             <div class="flex-row align-center">
                 <button type="roll"
-                        value="&{template:main} {{titre=Classe d'armure de contact}} {{subtitle=@{character_name} }} {{CA=@{npc_cat} }}{{description=@{npc_cat_text} }}"
+                        value="&{template:main} {{titre=^{defenses.ac}(^{defenses.ac.touch})}} {{subtitle=@{character_name} }} {{CA=@{npc_cat} }}{{description=@{npc_cat_text} }}"
                         class="button-label w-3 text-right"><span data-i18n="defenses.ac.touch">De contact</span> :
                 </button>
                 <input type="number" class="w-2 visible-input" name="attr_npc_cat">
@@ -81,15 +81,15 @@
             <br>
             <h4 class="h4"><span data-i18n="saves.title">Jets de sauvegarde</span></h4>
             <div class="flex-row save">
-                <label class="label w-3 align-center"><span data-i18n="saves.base">Base</span></label>
-                <label class="label w-3 align-center"><span data-i18n="saves.mod">Mod.</span></label>
+                <label class="label w-3 text-center"><span data-i18n="saves.base">Base</span></label>
+                <label class="label w-3 text-center"><span data-i18n="saves.mod">Mod.</span></label>
                 <label class="label w-6"></label>
             </div>
             <div class="flex-row save">
                 <input type="number" class="input w-3" name="attr_ref_base">
                 <input type="number" class="input w-3" name="attr_ref_mod">
                 <input type="hidden" name="attr_ref_roll_value"
-                       value="&{template:main} {{titre=Test de Réflexes}} {{subtitle=@{character_name} }} {{Jet=[[1d20+@{dex_mod}+@{ref_base}+@{ref_mod}]]}}">
+                       value="&{template:main} {{titre=^{save.ref.roll}}} {{subtitle=@{character_name} }} {{Jet=[[1d20+@{dex_mod}+@{ref_base}+@{ref_mod}]]}}">
                 <button type="roll" name="attr_ref_roll" value="@{ref_roll_value}"
                         class="button-label bold w-6"><span data-i18n="saves.reflex">Réflexes</span>
                 </button>
@@ -98,7 +98,7 @@
                 <input type="number" class="input w-3" name="attr_vig_base">
                 <input type="number" class="input w-3" name="attr_vig_mod">
                 <input type="hidden" name="attr_vig_roll_value"
-                       value="&{template:main} {{titre=Test de Vigueur}} {{subtitle=@{character_name} }} {{Jet=[[1d20+@{con_mod}+@{vig_base}+@{vig_mod}]]}}">
+                       value="&{template:main} {{titre=^{save.vig.roll}}} {{subtitle=@{character_name} }} {{Jet=[[1d20+@{con_mod}+@{vig_base}+@{vig_mod}]]}}">
                 <button type="roll" name="attr_vig_roll" value="@{vig_roll_value}"
                         class="button-label bold w-6"><span data-i18n="saves.fortitude">Vigueur</span>
                 </button>
@@ -107,7 +107,7 @@
                 <input type="number" class="input w-3" name="attr_vol_base">
                 <input type="number" class="input w-3" name="attr_vol_mod">
                 <input type="hidden" name="attr_vol_roll_value"
-                       value="&{template:main} {{titre=Test de Volonté}} {{subtitle=@{character_name} }} {{Jet=[[1d20+@{sag_mod}+@{vol_base}+@{vol_mod}]]}}">
+                       value="&{template:main} {{titre=^{save.vol.roll}}} {{subtitle=@{character_name} }} {{Jet=[[1d20+@{sag_mod}+@{vol_base}+@{vol_mod}]]}}">
                 <button type="roll" name="attr_vol_roll" value="@{vol_roll_value}"
                         class="button-label bold w-6"><span data-i18n="saves.willpower">Volonté</span>
                 </button>
@@ -116,7 +116,7 @@
         <div class="flex-column frame-c npc-colu">
             <h4 class="h4"><span data-i18n="abilities.npc">Capacités spécifiques</span></h4>
             <fieldset class="repeating_npc-capacite">
-                <div class="trait">
+                <div class="skill">
                     <input class="options-flag" type="checkbox" name="attr_options-flag"
                            checked><span>y</span>
                     <div class="flex-row align-center">
diff --git a/DnD_3_5_Modern/src/html/pc.html b/DnD_3_5_Modern/src/html/pc.html
index d85ea56794..876e47a25f 100644
--- a/DnD_3_5_Modern/src/html/pc.html
+++ b/DnD_3_5_Modern/src/html/pc.html
@@ -64,7 +64,7 @@
                                name="attr_mastery-type">
                         <input type="text" class="visible-input w-7" name="attr_mastery-desc">
                         <input type="hidden" name="attr_masteryrollvalue"
-                               value="&{template:main} {{titre=Maitrise (@{mastery-type})}} {{subtitle=@{character_name} }} {{description=@{mastery-desc}}}">
+                               value="&{template:main} {{titre=^{rolltemplate.mastery} (@{mastery-type})}} {{subtitle=@{character_name} }} {{description=@{mastery-desc}}}">
                         <button name="attr_skillroll" type="roll" value="@{masteryrollvalue}"
                                 class="button-roll picto w-1">w
                         </button>
@@ -161,7 +161,7 @@
                     <input type="hidden" name="attr_init_modified" value="false">
                     <input type="number" class="input" name="attr_init_tot" step="0.01" readonly>
                     <input type="hidden" name="attr_init_rol_value"
-                           value="&{template:main} {{titre=Initiative}} {{subtitle=@{character_name}}} {{Jet=[[1D20+@{init_tot} &{tracker}]]}}">
+                           value="&{template:main} {{titre=^{stats.initiative} }} {{subtitle=@{character_name}}} {{Jet=[[1D20+@{init_tot} &{tracker}]]}}">
                     <button name="attr_init_roll" type="roll" value="@{init_rol_value}"
                             class="button-label bold text-center">
                         <span data-i18n="initiative">Initiative</span>
@@ -212,7 +212,7 @@
                         <input type="hidden" name="attr_btn-text"/>
                         <input type="hidden" name="attr_btn-bold-text" val="New item"/>
                         <input type="hidden" name="attr_rollvalue"
-                               value="&{template:main} {{titre=@{name}}} {{subtitle=@{character_name}}} {{Quantité=@{qte}}} {{Poids=@{poids}kg}} {{description=@{description}}}">
+                               value="&{template:main} {{titre=@{name}}} {{subtitle=@{character_name}}} {{^{inventory.quantity}=@{qte}}} {{^{inventory.weight}=@{poids}kg}} {{description=@{description}}}">
                     </div>
                     <div class="flex-column options-options border-bottom">
                         <div class="flex-row align-center">
@@ -248,7 +248,7 @@
                             <span name="attr_name"></span>&nbsp;
                         </button>
                         <input type="hidden" name="attr_rollvalue"
-                               value="&{template:main} {{titre=Trait Racial: @{name}}} {{subtitle=@{character_name}}} {{description=@{description}}}">
+                               value="&{template:main} {{titre=@{name}}} {{subtitle=@{character_name}}} {{description=@{description}}}">
                     </div>
                     <div class="flex-column options-options border-bottom">
                         <div class="flex-row">
@@ -274,7 +274,7 @@
                             <span name="attr_name"></span>&nbsp;
                         </button>
                         <input type="hidden" name="attr_rollvalue"
-                               value="&{template:main} {{titre=Capacité de classe: @{name}}} {{subtitle=@{character_name}}} {{description=@{description}}}">
+                               value="&{template:main} {{titre=@{name}}} {{subtitle=@{character_name}}} {{description=@{description}}}">
                     </div>
                     <div class="flex-column options-options border-bottom">
                         <div class="flex-row">
diff --git a/DnD_3_5_Modern/src/html/roll-templates.html b/DnD_3_5_Modern/src/html/roll-templates.html
index 49c3fe022e..54995be70e 100644
--- a/DnD_3_5_Modern/src/html/roll-templates.html
+++ b/DnD_3_5_Modern/src/html/roll-templates.html
@@ -9,21 +9,21 @@
             <div class="sheet-line sheet-border-bottom"></div>
             <div class="sheet-colu sheet-align-center">
                 <div class="sheet-roll sheet-w12 sheet-bold sheet-result sheet-text-center">{{Jet}}</div>
-                <label class="sheet-label sheet-bold sheet-w12 sheet-text-center">Résultat</label>
+                <label class="sheet-label sheet-bold sheet-w12 sheet-text-center"><span data-i18n="rolltemplate.result">Résultat</span></label>
             </div>
             {{/Jet}}
             {{#Attaque}}
             <div class="sheet-line sheet-border-bottom"></div>
             <div class="sheet-colu sheet-align-center">
                 <div class="sheet-roll sheet-w12 sheet-bold sheet-result sheet-text-center">{{Attaque}}</div>
-                <label class="sheet-label sheet-bold sheet-w12 sheet-text-center">Toucher</label>
+                <label class="sheet-label sheet-bold sheet-w12 sheet-text-center"><span data-i18n="rolltemplate.attack">Toucher</span></label>
             </div>
             {{/Attaque}}
             {{#Dégats}}
             <div class="sheet-line sheet-border-bottom"></div>
             <div class="sheet-colu sheet-align-center">
                 <div class="sheet-roll sheet-w12 sheet-bold sheet-result sheet-text-center">{{Dégats}}</div>
-                <label class="sheet-label sheet-bold sheet-w12 sheet-text-center">Dégats</label>
+                <label class="sheet-label sheet-bold sheet-w12 sheet-text-center"><span data-i18n="rolltemplate.damage">Dégats</span></label>
             </div>
             {{/Dégats}}
             {{#allprops() titre subtitle description Attaque Dégats Jet}}
@@ -54,14 +54,14 @@
             <div class="sheet-line sheet-border-bottom"></div>
             <div class="sheet-colu sheet-align-center">
                 <div class="sheet-roll sheet-w12 sheet-bold sheet-result sheet-text-center">{{attack}}</div>
-                <label class="sheet-label sheet-bold sheet-w12 sheet-text-center">Toucher</label>
+                <label class="sheet-label sheet-bold sheet-w12 sheet-text-center"><span data-i18n="rolltemplate.attack">Toucher</span></label>
             </div>
             {{/attack}}
             {{#damage}}
             <div class="sheet-line sheet-border-bottom"></div>
             <div class="sheet-colu sheet-align-center">
                 <div class="sheet-roll sheet-w12 sheet-bold sheet-result sheet-text-center">{{damage}}</div>
-                <label class="sheet-label sheet-bold sheet-w12 sheet-text-center">Dégats</label>
+                <label class="sheet-label sheet-bold sheet-w12 sheet-text-center"><span data-i18n="rolltemplate.damage">Dégats</span></label>
             </div>
             {{/damage}}
             {{#notes}}
@@ -80,19 +80,19 @@
             <h4 class="sheet-h4">{{name}} ({{level}})</h4>
             <label class="sheet-w12 sheet-label sheet-text-center">{{subtitle}}</label>
             {{#school}}
-            <label class="sheet-w-12"><span class="sheet-bold">École : </span>{{school}}</label>
+            <label class="sheet-w-12"><span class="sheet-bold"><span class="sheet-bold" data-i18n="spells.school">École</span> : </span>{{school}}</label>
             {{/school}}
             {{#casting-time}}
-            <label class="sheet-w-12"><span class="sheet-bold">Temps d'incantation : </span>{{casting-time}}</label>
+            <label class="sheet-w-12"><span class="sheet-bold"><span class="sheet-bold" data-i18n="spells.incantation">Temps d'incantation</span> : </span>{{casting-time}}</label>
             {{/casting-time}}
             {{#range}}
-            <label class="sheet-w-12"><span class="sheet-bold">Portée : </span>{{range}}</label>
+            <label class="sheet-w-12"><span class="sheet-bold"><span class="sheet-bold" data-i18n="spells.range">Portée</span> : </span>{{range}}</label>
             {{/range}}
             {{#duration}}
-            <label class="sheet-w-12"><span class="sheet-bold">Durée : </span>{{duration}}</label>
+            <label class="sheet-w-12"><span class="sheet-bold"><span class="sheet-bold" data-i18n="spells.duration">Durée</span> : </span>{{duration}}</label>
             {{/duration}}
             {{#innate}}
-            <label class="sheet-w-12"><span class="sheet-bold">Inné : </span>{{innate}}</label>
+            <label class="sheet-w-12"><span class="sheet-bold"><span class="sheet-bold" data-i18n="spells.innate">Inné</span> : </span>{{innate}}</label>
             {{/innate}}
             {{#allprops() name subtitle description school casting-time range duration innate level}}
             <div class="sheet-line sheet-border-bottom"></div>
diff --git a/DnD_3_5_Modern/src/js/attacks.js b/DnD_3_5_Modern/src/js/attacks.js
index 6786c200ed..849b60e580 100644
--- a/DnD_3_5_Modern/src/js/attacks.js
+++ b/DnD_3_5_Modern/src/js/attacks.js
@@ -125,7 +125,7 @@ let updateAttack = (attackId, modifiers) => {
 }
 
 let getRollFromModifiers = (modifiers) => {
-    let baseRoll = "&{template:attack} {{titre=Attaque avec @{name}}} {{subtitle=@{character_name}}}";
+    let baseRoll = `&{template:attack} {{titre=^{rolltemplate.attack.with} @{name}}} {{subtitle=@{character_name}}}`;
     let attackRoll = "1d20+@{bba}[BAB]+@{atq-carac-val}[Caracteristic]+@{atq-bonus}[Enhancement Bonus]+@{atq-bonus-2}[Misc Bonus]";
     let damageRoll = "@{dgt-base}[Base Damage]+@{dgt-carac-val}[Caracteristic]+@{dgt-bonus}[Enhancement Bonus]";
     for(let modifier of modifiers){
diff --git a/DnD_3_5_Modern/src/js/modifiers.js b/DnD_3_5_Modern/src/js/modifiers.js
index c6beae761d..4b76304eff 100644
--- a/DnD_3_5_Modern/src/js/modifiers.js
+++ b/DnD_3_5_Modern/src/js/modifiers.js
@@ -38,7 +38,6 @@ let updateModifierAndApplyChanges = (modifier_id) => {
 
 //Get all modifiers Id then call a recursive method to build a list of modifiers
 let getModifiersByTypeAndUpdateValues = (applicationType,callback,callback_id) => {
-    debugger;
     getSectionIDs("repeating_modifiers", (idArray) => {
         getNextModifierByTypeAndUpdateValues(idArray, [], applicationType,callback,callback_id);
     });
@@ -79,7 +78,6 @@ let getNextModifierByTypeAndUpdateValues = (modifierToGetList,modifierList,appli
 }
 
 let getLargestModifierOfEachTypeFor = (modifiersList,attr_name) =>{
-    debugger;
     let types = {};
     let _name = attr_name?.toLowerCase();
     let filteredModifierList = [];
diff --git a/DnD_3_5_Modern/src/js/saves.js b/DnD_3_5_Modern/src/js/saves.js
index 455dbc5900..a4147efbc9 100644
--- a/DnD_3_5_Modern/src/js/saves.js
+++ b/DnD_3_5_Modern/src/js/saves.js
@@ -44,7 +44,6 @@ let updateAllSaves = (modifierList) => {
     let saves = ["ref","vig","vol"];
     getAttrs(["dex_mod","con_mod","sag_mod","ref_base","ref_mod","vig_base","vig_mod","vol_base","vol_mod"], (values) => {
         for(let save of saves){
-            debugger;
             let carac = 0;
             let caracName = 0;
             switch (save){
@@ -63,6 +62,7 @@ let updateAllSaves = (modifierList) => {
             }
             let base = parseInt(values[`${save}_base`]) || 0;
             let mod = parseInt(values[`${save}_mod`]) || 0;
+            let save_name = `^{saves.${save}.roll}`
             let total = base+carac;
             let mods = mod;
             let roll = `${carac}[${caracName}] + ${base}[${save}_base] + ${mod}[${save}_mod]`
@@ -73,7 +73,7 @@ let updateAllSaves = (modifierList) => {
             }
             let toUpdate = {};
             toUpdate[`${save}_total`] = total + mods;
-            toUpdate[`${save}_roll_value`] = `&{template:main} {{titre=Test de ${save}}} {{subtitle=@{character_name} }} {{Jet=[[1d20+${roll}]]}}`;
+            toUpdate[`${save}_roll_value`] = `&{template:main} {{titre=${save_name}}} {{subtitle=@{character_name} }} {{Jet=[[1d20+${roll}]]}}`;
             toUpdate[`${save}_modified`] = !!mods;
             setAttrs(toUpdate);
         }
diff --git a/DnD_3_5_Modern/src/js/skills.js b/DnD_3_5_Modern/src/js/skills.js
index 330ec2407e..442e83c094 100644
--- a/DnD_3_5_Modern/src/js/skills.js
+++ b/DnD_3_5_Modern/src/js/skills.js
@@ -82,7 +82,7 @@ function updateSkillList(skillList,modifierList){
             }
             toUpdate[`${skillId}_modified`] = (!!mods);
             toUpdate[`${skillId}_total`] = total+mods;
-            toUpdate[`${skillId}_skillrollvalue`] = `&{template:main} {{titre=Test de '@{name}'}} {{subtitle=@{character_name} }} {{Jet=[[1d20+${roll}]]}}`;
+            toUpdate[`${skillId}_skillrollvalue`] = `&{template:main} {{titre=^{rolltemplate.rollof} '@{name}'}} {{subtitle=@{character_name} }} {{Jet=[[1d20+${roll}]]}}`;
             toUpdate[`${skillId}_caracname`] = caracname;
         }
         setAttrs(toUpdate, {silent: true});
diff --git a/DnD_3_5_Modern/src/js/spells.js b/DnD_3_5_Modern/src/js/spells.js
index a57df4f39f..163ed059f0 100644
--- a/DnD_3_5_Modern/src/js/spells.js
+++ b/DnD_3_5_Modern/src/js/spells.js
@@ -9,7 +9,7 @@ for(let i = 0 ; i < 10; i++) {
 }
 
 
-let baseSpell = "&{template:spell} {{name=Sort: @{name}}}";
+let baseSpell = "&{template:spell} {{name=^{spells.spell}: @{name}}}";
 let update_spell = (id,level) =>{
     let school = id+"_school";
     let casting = id+"_casting-time";
diff --git a/DnD_3_5_Modern/src/pug/characteristics.pug b/DnD_3_5_Modern/src/pug/characteristics.pug
index a90e03c85e..f01510f58d 100644
--- a/DnD_3_5_Modern/src/pug/characteristics.pug
+++ b/DnD_3_5_Modern/src/pug/characteristics.pug
@@ -7,7 +7,7 @@ div.attributes.w-3
                 span(data-i18n=`attribute.${attribute}`)= attribute
             span.mod(type="text" name=`attr_${attribute}_mod`)
             input(type="hidden" name=`attr_${attribute}_rollvalue`
-            value=`&{template:main} {{titre=Test de ${attribute}}} {{subtitle=@{character_name} }} {{Jet=[[1d20+@{${attribute}_mod}]]}}`)
+            value=`&{template:main} {{titre=^{attribute.${attribute}.roll}}} {{subtitle=@{character_name} }} {{Jet=[[1d20+@{${attribute}_mod}]]}}`)
             div.base
                 input(type="hidden" name=`attr_${attribute}_modified` value="false")
                 input.base(type="number" name=`attr_${attribute}_base` value="10")
diff --git a/DnD_3_5_Modern/src/pug/spells.pug b/DnD_3_5_Modern/src/pug/spells.pug
index 31ed654896..556c872204 100644
--- a/DnD_3_5_Modern/src/pug/spells.pug
+++ b/DnD_3_5_Modern/src/pug/spells.pug
@@ -22,7 +22,7 @@ div.spells.flex-row
                                         span!="&nbsp;"
                                         span.spell-innate(name="attr_innate")
                                     input(type="hidden" name="attr_rollvalue"
-                                        value!="&{template:spell} {{name=Sort: @{name}}}" +
+                                        value!="&{template:spell} {{name=^{spells.spell}: @{name}}}" +
                                             " {{school=@{school}}} {{casting-time=@{casting-time}}} {{range=@{range}}}" +
                                             " {{duration=@{duration}}} {{innate=@{innate}}}" +
                                         " {{subtitle=@{character_name}}} {{level="+spell_level+"}}  {{description=@{description}}}")
diff --git a/DnD_3_5_Modern/translation.json b/DnD_3_5_Modern/translation.json
index e2366962b7..81348a02f3 100644
--- a/DnD_3_5_Modern/translation.json
+++ b/DnD_3_5_Modern/translation.json
@@ -24,11 +24,17 @@
   "attribute.charisma.short": "CHA",
 
   "attribute.for": "STR",
+  "attribute.for.roll": "Roll of Strength",
   "attribute.dex": "DEX",
+  "attribute.dex.roll": "Roll of Dexterity",
   "attribute.con": "CON",
+  "attribute.con.roll": "Roll of Constitution",
   "attribute.int": "INT",
+  "attribute.int.roll": "Roll of Intelligence",
   "attribute.sag": "WIS",
+  "attribute.sag.roll": "Roll of Wisdom",
   "attribute.cha": "CHA",
+  "attribute.cha.roll": "Roll of Charisma",
 
   "attribute.title": "Ability Scores",
 
@@ -113,7 +119,7 @@
 
   "inventory.title": "Inventory",
   "inventory.name": "Name",
-  "inventory.quantity": "Qty.",
+  "inventory.quantity": "Quantity",
   "inventory.weight": "Weight",
   "inventory.description": "Description",
 
@@ -161,12 +167,22 @@
   "npc.cr": "CR",
   "npc.xp": "XP",
 
+  "rolltemplate.attack": "Attack",
+  "rolltemplate.damage": "Damage",
+  "rolltemplate.result": "Result",
+  "rolltemplate.rollof": "Roll of",
+  "rolltemplate.mastery": "Mastery ",
+  "rolltemplate.attack.with": "Attack with",
+
   "saves.title": "Saving Throws",
   "saves.base": "Base",
   "saves.mod": "Mod.",
   "saves.reflex": "Reflex",
+  "saves.ref.roll": "Roll of Reflex",
   "saves.willpower" : "Willpower",
+  "saves.vol.roll" : "Roll of Willpower",
   "saves.fortitude" : "Fortitude",
+  "saves.vig.roll" : "Roll of Fortitude",
 
   "skills.title": "Skills",
   "skills.total": "Tot.",
@@ -185,6 +201,7 @@
   "spells.innate": "Innate",
   "spells.left": "Left",
   "spells.max": "Maximum",
+  "spells.spell": "Spell",
 
   "stats.initiative": "Initiative",
   "stats.dr": "DR",