diff --git a/Epyllion/Epyllion.html b/Epyllion/Epyllion.html
index d11a90a047..3aecfae3f6 100644
--- a/Epyllion/Epyllion.html
+++ b/Epyllion/Epyllion.html
@@ -27,9 +27,9 @@
             <hr class="stat">
             <div class="stat">
                 <p align="center">
-                    <button type="roll" value="/em - Charm roll \n\n/r 2d6 + [[@{Charm}+?{Modif. |0}]]" >Charm:</button> &nbsp;<input type="number" name="attr_Academic_Charm" min="-2" max="3" value="0" style="margin-right:50px;;">   
-                    <button type="roll" value="/em - Courage roll \n\n/r 2d6 + [[@{Courage}+?{Modif. |0}]]" >Courage:</button> &nbsp;<input type="number" name="attr_Academic_Courage" min="-2" max="3" value="-1" style="margin-right:50px;"> 
-                    <button type="roll" value="/em - Cunning roll \n\n/r 2d6 + [[@{Cunning}+?{Modif. |0}]]" >Cunning:</button> &nbsp;<input type="number" name="attr_Academic_Cunning" min="-2" max="3" value="1">
+                    <button type="roll" value="/em - Charm roll \n\n/r 2d6 + [[@{Academic_Charm}+?{Modif. |0}]]" >Charm:</button> &nbsp;<input type="number" name="attr_Academic_Charm" min="-2" max="3" value="0" style="margin-right:50px;;">   
+                    <button type="roll" value="/em - Courage roll \n\n/r 2d6 + [[@{Academic_Courage}+?{Modif. |0}]]" >Courage:</button> &nbsp;<input type="number" name="attr_Academic_Courage" min="-2" max="3" value="-1" style="margin-right:50px;"> 
+                    <button type="roll" value="/em - Cunning roll \n\n/r 2d6 + [[@{Academic_Cunning}+?{Modif. |0}]]" >Cunning:</button> &nbsp;<input type="number" name="attr_Academic_Cunning" min="-2" max="3" value="1">
                 </p>
             </div>
             <hr class="stat">
@@ -367,9 +367,9 @@
             <hr class="stat">
             <div class="stat">
                 <p align="center">
-                    <button type="roll" value="/em - Charm roll \n\n/r 2d6 + [[@{Charm}+?{Modif. |0}]]" >Charm:</button> &nbsp;<input type="number" name="attr_Crafter_Charm" min="-2" max="3" value="-1" style="margin-right:50px;;">   
-                    <button type="roll" value="/em - Courage roll \n\n/r 2d6 + [[@{Courage}+?{Modif. |0}]]" >Courage:</button> &nbsp;<input type="number" name="attr_Crafter_Courage" min="-2" max="3" value="0" style="margin-right:50px;"> 
-                    <button type="roll" value="/em - Cunning roll \n\n/r 2d6 + [[@{Cunning}+?{Modif. |0}]]" >Cunning:</button> &nbsp;<input type="number" name="attr_Crafter_Cunning" min="-2" max="3" value="1">
+                    <button type="roll" value="/em - Charm roll \n\n/r 2d6 + [[@{Crafter_Charm}+?{Modif. |0}]]" >Charm:</button> &nbsp;<input type="number" name="attr_Crafter_Charm" min="-2" max="3" value="-1" style="margin-right:50px;;">   
+                    <button type="roll" value="/em - Courage roll \n\n/r 2d6 + [[@{Crafter_Courage}+?{Modif. |0}]]" >Courage:</button> &nbsp;<input type="number" name="attr_Crafter_Courage" min="-2" max="3" value="0" style="margin-right:50px;"> 
+                    <button type="roll" value="/em - Cunning roll \n\n/r 2d6 + [[@{Crafter_Cunning}+?{Modif. |0}]]" >Cunning:</button> &nbsp;<input type="number" name="attr_Crafter_Cunning" min="-2" max="3" value="1">
                 </p>
             </div>
             <hr class="stat">
@@ -732,9 +732,9 @@
             <hr class="stat">
             <div class="stat">
                 <p align="center">
-                    <button type="roll" value="/em - Charm roll \n\n/r 2d6 + [[@{Charm}+?{Modif. |0}]]" >Charm:</button> &nbsp;<input type="number" name="attr_Daredevil_Charm" min="-2" max="3" value="-1" style="margin-right:50px;;">   
-                    <button type="roll" value="/em - Courage roll \n\n/r 2d6 + [[@{Courage}+?{Modif. |0}]]" >Courage:</button> &nbsp;<input type="number" name="attr_Daredevil_Courage" min="-2" max="3" value="1" style="margin-right:50px;"> 
-                    <button type="roll" value="/em - Cunning roll \n\n/r 2d6 + [[@{Cunning}+?{Modif. |0}]]" >Cunning:</button> &nbsp;<input type="number" name="attr_Daredevil_Cunning" min="-2" max="3" value="0">
+                    <button type="roll" value="/em - Charm roll \n\n/r 2d6 + [[@{Daredevil_Charm}+?{Modif. |0}]]" >Charm:</button> &nbsp;<input type="number" name="attr_Daredevil_Charm" min="-2" max="3" value="-1" style="margin-right:50px;;">   
+                    <button type="roll" value="/em - Courage roll \n\n/r 2d6 + [[@{Daredevil_Courage}+?{Modif. |0}]]" >Courage:</button> &nbsp;<input type="number" name="attr_Daredevil_Courage" min="-2" max="3" value="1" style="margin-right:50px;"> 
+                    <button type="roll" value="/em - Cunning roll \n\n/r 2d6 + [[@{Daredevil_Cunning}+?{Modif. |0}]]" >Cunning:</button> &nbsp;<input type="number" name="attr_Daredevil_Cunning" min="-2" max="3" value="0">
                 </p>
             </div>
             <hr class="stat">
@@ -1102,9 +1102,9 @@
             <hr class="stat">
             <div class="stat">
                 <p align="center">
-                    <button type="roll" value="/em - Charm roll \n\n/r 2d6 + [[@{Charm}+?{Modif. |0}]]" >Charm:</button> &nbsp;<input type="number" name="attr_NatureAdept_Charm" min="-2" max="3" value="1" style="margin-right:50px;;">   
-                    <button type="roll" value="/em - Courage roll \n\n/r 2d6 + [[@{Courage}+?{Modif. |0}]]" >Courage:</button> &nbsp;<input type="number" name="attr_NatureAdept_Courage" min="-2" max="3" value="-1" style="margin-right:50px;"> 
-                    <button type="roll" value="/em - Cunning roll \n\n/r 2d6 + [[@{Cunning}+?{Modif. |0}]]" >Cunning:</button> &nbsp;<input type="number" name="attr_NatureAdept_Cunning" min="-2" max="3" value="0">
+                    <button type="roll" value="/em - Charm roll \n\n/r 2d6 + [[@{NatureAdept_Charm}+?{Modif. |0}]]" >Charm:</button> &nbsp;<input type="number" name="attr_NatureAdept_Charm" min="-2" max="3" value="1" style="margin-right:50px;;">   
+                    <button type="roll" value="/em - Courage roll \n\n/r 2d6 + [[@{NatureAdept_Courage}+?{Modif. |0}]]" >Courage:</button> &nbsp;<input type="number" name="attr_NatureAdept_Courage" min="-2" max="3" value="-1" style="margin-right:50px;"> 
+                    <button type="roll" value="/em - Cunning roll \n\n/r 2d6 + [[@{NatureAdept_Cunning}+?{Modif. |0}]]" >Cunning:</button> &nbsp;<input type="number" name="attr_NatureAdept_Cunning" min="-2" max="3" value="0">
                 </p>
             </div>
             <hr class="stat">
@@ -1434,9 +1434,9 @@
             <hr class="stat">
             <div class="stat">
                 <p align="center">
-                    <button type="roll" value="/em - Charm roll \n\n/r 2d6 + [[@{Charm}+?{Modif. |0}]]" >Charm:</button> &nbsp;<input type="number" name="attr_Seer_Charm" min="-2" max="3" value="1" style="margin-right:50px;;">   
-                    <button type="roll" value="/em - Courage roll \n\n/r 2d6 + [[@{Courage}+?{Modif. |0}]]" >Courage:</button> &nbsp;<input type="number" name="attr_Seer_Courage" min="-2" max="3" value="0" style="margin-right:50px;"> 
-                    <button type="roll" value="/em - Cunning roll \n\n/r 2d6 + [[@{Cunning}+?{Modif. |0}]]" >Cunning:</button> &nbsp;<input type="number" name="attr_Seer_Cunning" min="-2" max="3" value="-1">
+                    <button type="roll" value="/em - Charm roll \n\n/r 2d6 + [[@{Seer_Charm}+?{Modif. |0}]]" >Charm:</button> &nbsp;<input type="number" name="attr_Seer_Charm" min="-2" max="3" value="1" style="margin-right:50px;;">   
+                    <button type="roll" value="/em - Courage roll \n\n/r 2d6 + [[@{Seer_Courage}+?{Modif. |0}]]" >Courage:</button> &nbsp;<input type="number" name="attr_Seer_Courage" min="-2" max="3" value="0" style="margin-right:50px;"> 
+                    <button type="roll" value="/em - Cunning roll \n\n/r 2d6 + [[@{Seer_Cunning}+?{Modif. |0}]]" >Cunning:</button> &nbsp;<input type="number" name="attr_Seer_Cunning" min="-2" max="3" value="-1">
                 </p>
             </div>
             <hr class="stat">
@@ -1781,9 +1781,9 @@
             <hr class="stat">
             <div class="stat">
                 <p align="center">
-                    <button type="roll" value="/em - Charm roll \n\n/r 2d6 + [[@{Charm}+?{Modif. |0}]]" >Charm:</button> &nbsp;<input type="number" name="attr_Warrior_Charm" min="-2" max="3" value="0" style="margin-right:50px;;">   
-                    <button type="roll" value="/em - Courage roll \n\n/r 2d6 + [[@{Courage}+?{Modif. |0}]]" >Courage:</button> &nbsp;<input type="number" name="attr_Warrior_Courage" min="-2" max="3" value="1" style="margin-right:50px;"> 
-                    <button type="roll" value="/em - Cunning roll \n\n/r 2d6 + [[@{Cunning}+?{Modif. |0}]]" >Cunning:</button> &nbsp;<input type="number" name="attr_Warrior_Cunning" min="-2" max="3" value="-1">
+                    <button type="roll" value="/em - Charm roll \n\n/r 2d6 + [[@{Warrior_Charm}+?{Modif. |0}]]" >Charm:</button> &nbsp;<input type="number" name="attr_Warrior_Charm" min="-2" max="3" value="0" style="margin-right:50px;;">   
+                    <button type="roll" value="/em - Courage roll \n\n/r 2d6 + [[@{Warrior_Courage}+?{Modif. |0}]]" >Courage:</button> &nbsp;<input type="number" name="attr_Warrior_Courage" min="-2" max="3" value="1" style="margin-right:50px;"> 
+                    <button type="roll" value="/em - Cunning roll \n\n/r 2d6 + [[@{Warrior_Cunning}+?{Modif. |0}]]" >Cunning:</button> &nbsp;<input type="number" name="attr_Warrior_Cunning" min="-2" max="3" value="-1">
                 </p>
             </div>
             <hr class="stat">