diff --git a/templates/chat/rolls/attack-heroic-card.hbs b/templates/chat/rolls/attack-heroic-card.hbs
index 27f4c92..a950afc 100644
--- a/templates/chat/rolls/attack-heroic-card.hbs
+++ b/templates/chat/rolls/attack-heroic-card.hbs
@@ -1,6 +1,6 @@
-<img class="chat-icon" src="{{attacker.img}}" alt="{{attacker.name}}"/>
+<img class="chat-icon" src="{{actor.img}}" alt="{{actor.name}}"/>
 Jet Héroïque !
-<button class="damage-increase" data-damage-mode="damage-plus-6" data-attack-id="{{attackId}}">Augmenter les dommages de 6</button>
-<button class="damage-increase" data-damage-mode="damage-plus-12" data-attack-id="{{attackId}}">Augmenter les dommages de 12 (1 point d'Heroisme)</button>
-<button class="damage-increase" data-damage-mode="damage-normal" data-attack-id="{{attackId}}">Laisser les dommages inchangés</button>
+<button class="damage-increase" data-damage-mode="damage-plus-6" data-attack-id="{{id}}">Augmenter les dommages de 6</button>
+<button class="damage-increase" data-damage-mode="damage-plus-12" data-attack-id="{{id}}">Augmenter les dommages de 12 (1 point d'Heroisme)</button>
+<button class="damage-increase" data-damage-mode="damage-normal" data-attack-id="{{id}}">Laisser les dommages inchangés</button>
 
diff --git a/templates/chat/rolls/default-roll-card.hbs b/templates/chat/rolls/default-roll-card.hbs
index 2cee17f..88d98e7 100644
--- a/templates/chat/rolls/default-roll-card.hbs
+++ b/templates/chat/rolls/default-roll-card.hbs
@@ -13,9 +13,11 @@
         <h2 class="failure"><i class="fas fa-times"></i>&nbsp;{{localize "BOL.ui.failure"}}...</h2>
     {{/if}}
 {{/if}}
+
 <h3><strong>{{description}}</strong></h3> 
+
 {{#if reroll}}
-<a class="button hero-reroll" data-actor-id="{{actor.id}}">Relancer!</a>
+<a class="button hero-reroll" data-roll-id=="{{rollId}}"" data-actor-id="{{actor.id}}">Relancer!</a>
 {{/if}}
 {{!#if hasDescription}}
 <!--<h4>-->
diff --git a/templates/dialogs/adv-roll-part.hbs b/templates/dialogs/adv-roll-part.hbs
new file mode 100644
index 0000000..cb22557
--- /dev/null
+++ b/templates/dialogs/adv-roll-part.hbs
@@ -0,0 +1,12 @@
+    <div class="flexrow" style="margin-bottom: 1px;">
+        <div class="flex1 center bg-darkred">
+            <label for="adv">{{localize 'BOL.ui.advantages'}}</label>
+        </div>
+        <div class="flex1 center cell">
+            <input type="radio" name="adv" value="1B" {{#if (eq adv "1B")}}checked{{/if}}/>2d6B<br />
+            <input type="radio" name="adv" value="2B" {{#if (eq adv "2B")}}checked{{/if}}/>2d6BB<br />
+            <input type="radio" name="adv" value="2" {{#if (eq adv "2")}}checked{{/if}}/>2d6<br />
+            <input type="radio" name="adv" value="1M" {{#if (eq adv "1M")}}checked{{/if}}/>2d6M<br />
+            <input type="radio" name="adv" value="2M" {{#if (eq adv "2M")}}checked{{/if}}/>2d6MM<br />
+        </div>
+    </div>
diff --git a/templates/dialogs/aptitude-roll-dialog.hbs b/templates/dialogs/aptitude-roll-dialog.hbs
index b2b8762..5b207a9 100644
--- a/templates/dialogs/aptitude-roll-dialog.hbs
+++ b/templates/dialogs/aptitude-roll-dialog.hbs
@@ -7,47 +7,13 @@
             </div>
         </div>
     </header>
-    <div class="flexrow" style="margin-bottom: 1px;">
-        <div class="flex1 center bg-darkred">
-            <label for="apt">{{localize 'BOL.ui.aptitude'}}</label>
-        </div>
-        <div class="flex1 center cell">
-            <select class="flex1" name="apt" id="apt" data-type="String">
-                <option value="init" {{#if (equals apt.key "init")}}selected{{/if}}>{{localize 'BOL.aptitudes.init'}}</option>
-                <option value="melee" {{#if (equals apt.key "melee")}}selected{{/if}}>{{localize 'BOL.aptitudes.melee'}}</option>
-                <option value="ranged" {{#if (equals apt.key "ranged")}}selected{{/if}}>{{localize 'BOL.aptitudes.ranged'}}</option>
-                <option value="def" {{#if (equals apt.key "def")}}selected{{/if}}>{{localize 'BOL.aptitudes.def'}}</option>
-            </select>
-        </div>
-    </div>
-    <div class="flexrow" style="margin-bottom: 1px;">
-        <div class="flex1 center bg-darkred">
-            <label for="adv">{{localize 'BOL.ui.advantages'}}</label>
-        </div>
-        <div class="flex1 center cell">
-            <input type="text" class="field-value" name="adv" id="adv" value="{{adv}}" data-type="Number">
-        </div>
-    </div>
-    <div class="flexrow" style="margin-bottom: 1px;">
-        <div class="flex1 center bg-darkred">
-            <label for="mod">{{localize 'BOL.ui.modifiers'}}</label>
-        </div>
-        <div class="flex1 center cell">
-            <input type="text" class="field-value" name="mod" id="mod" value="{{mod}}" data-type="Number">
-        </div>
-    </div>
-    {{#if careers.items}}
-    <div class="flexrow" style="margin-bottom: 1px;">
-        <div class="flex1 center bg-darkred">
-            <label for="mod">{{localize 'BOL.ui.careers'}}</label>
-        </div>
-        <div class="flex1 center cell">
-            <select class="flex1" name="career" id="career" data-type="String" multiple>
-                {{#each careers.items as | career id|}}
-                    <option value="{{career.data.rank}}">{{career.name}} ({{numberFormat career.data.rank decimals=0 sign=true}})</option>
-                {{/each}}
-            </select>
-        </div>
-    </div>
-    {{/if}}
+    
+    {{> "systems/bol/templates/dialogs/aptitude-roll-part.hbs"}}
+
+    {{> "systems/bol/templates/dialogs/adv-roll-part.hbs"}}
+
+    {{> "systems/bol/templates/dialogs/mod-roll-part.hbs"}}
+
+    {{> "systems/bol/templates/dialogs/career-roll-part.hbs"}}
+
 </form>
\ No newline at end of file
diff --git a/templates/dialogs/aptitude-roll-part.hbs b/templates/dialogs/aptitude-roll-part.hbs
new file mode 100644
index 0000000..83e4aac
--- /dev/null
+++ b/templates/dialogs/aptitude-roll-part.hbs
@@ -0,0 +1,16 @@
+<div class="flexrow" style="margin-bottom: 1px;">
+  <div class="flex1 center bg-darkred">
+    <label for="apt">{{localize 'BOL.ui.aptitude'}}</label>
+  </div>
+  <div class="flex1 center cell">
+    <select class="flex1" name="apt" id="apt" data-type="String">
+      <option value="init" {{#if (equals aptitude.key "init" )}}selected{{/if}}>{{localize 'BOL.aptitudes.init'}}
+      </option>
+      <option value="melee" {{#if (equals aptitude.key "melee" )}}selected{{/if}}>{{localize 'BOL.aptitudes.melee'}}
+      </option>
+      <option value="ranged" {{#if (equals aptitude.key "ranged" )}}selected{{/if}}>{{localize 'BOL.aptitudes.ranged'}}
+      </option>
+      <option value="def" {{#if (equals aptitude.key "def" )}}selected{{/if}}>{{localize 'BOL.aptitudes.def'}}</option>
+    </select>
+  </div>
+</div>
\ No newline at end of file
diff --git a/templates/dialogs/attribute-roll-dialog.hbs b/templates/dialogs/attribute-roll-dialog.hbs
index 5413f11..4d6600d 100644
--- a/templates/dialogs/attribute-roll-dialog.hbs
+++ b/templates/dialogs/attribute-roll-dialog.hbs
@@ -7,49 +7,15 @@
             </div>
         </div>
     </header>
-    <div class="flexrow" style="margin-bottom: 1px;">
-        <div class="flex1 center bg-darkred">
-            <label for="attr">{{localize 'BOL.ui.attribute'}}</label>
-        </div>
-        <div class="flex1 center cell">
-            <select class="flex1" name="attr" id="attr" data-type="String">
-                <option value="vigor" {{#if (equals attr.key "vigor")}}selected{{/if}}>{{localize 'BOL.attributes.vigor'}}</option>
-                <option value="agility" {{#if (equals attr.key "agility")}}selected{{/if}}>{{localize 'BOL.attributes.agility'}}</option>
-                <option value="mind" {{#if (equals attr.key "mind")}}selected{{/if}}>{{localize 'BOL.attributes.mind'}}</option>
-                <option value="appeal" {{#if (equals attr.key "appeal")}}selected{{/if}}>{{localize 'BOL.attributes.appeal'}}</option>
-            </select>
-        </div>
-    </div>
-    <div class="flexrow" style="margin-bottom: 1px;">
-        <div class="flex1 center bg-darkred">
-            <label for="adv">{{localize 'BOL.ui.advantages'}}</label>
-        </div>
-        <div class="flex1 center cell">
-            <input type="text" class="field-value" name="adv" id="adv" value="{{adv}}" data-type="Number">
-        </div>
-    </div>
-    <div class="flexrow" style="margin-bottom: 1px;">
-        <div class="flex1 center bg-darkred">
-            <label for="mod">{{localize 'BOL.ui.modifiers'}}</label>
-        </div>
-        <div class="flex1 center cell">
-            <input type="text" class="field-value" name="mod" id="mod" value="{{mod}}" data-type="Number">
-        </div>
-    </div>
-    {{#if careers.items}}
-    <div class="flexrow" style="margin-bottom: 1px;">
-        <div class="flex1 center bg-darkred">
-            <label for="mod">{{localize 'BOL.ui.careers'}}</label>
-        </div>
-        <div class="flex1 center cell">
-            <select class="flex1" name="career" id="career" data-type="String" multiple>
-                {{#each careers.items as | career id|}}
-                    <option value="{{career.data.rank}}">{{career.name}} ({{numberFormat career.data.rank decimals=0 sign=true}})</option>
-                {{/each}}
-            </select>
-        </div>
-    </div>
-    {{/if}}
+
+    {{> "systems/bol/templates/dialogs/attribute-roll-part.hbs"}}
+
+    {{> "systems/bol/templates/dialogs/adv-roll-part.hbs"}}
+
+    {{> "systems/bol/templates/dialogs/mod-roll-part.hbs"}}
+
+    {{> "systems/bol/templates/dialogs/career-roll-part.hbs"}}
+
     <!--<div class="flexrow" style="margin-bottom: 1px;">-->
     <!--    <div class="flex1 center bg-darkred">-->
     <!--        <label for="mod">{{!localize 'BOL.ui.boons'}}</label>-->
diff --git a/templates/dialogs/attribute-roll-part.hbs b/templates/dialogs/attribute-roll-part.hbs
new file mode 100644
index 0000000..96637a7
--- /dev/null
+++ b/templates/dialogs/attribute-roll-part.hbs
@@ -0,0 +1,13 @@
+    <div class="flexrow" style="margin-bottom: 1px;">
+        <div class="flex1 center bg-darkred">
+            <label for="attr">{{localize 'BOL.ui.attribute'}}</label>
+        </div>
+        <div class="flex1 center cell">
+            <select class="flex1" name="attr" id="attr" data-type="String">
+                <option value="vigor" {{#if (equals attribute.key "vigor")}}selected{{/if}}>{{localize 'BOL.attributes.vigor'}}</option>
+                <option value="agility" {{#if (equals attribute.key "agility")}}selected{{/if}}>{{localize 'BOL.attributes.agility'}}</option>
+                <option value="mind" {{#if (equals attribute.key "mind")}}selected{{/if}}>{{localize 'BOL.attributes.mind'}}</option>
+                <option value="appeal" {{#if (equals attribute.key "appeal")}}selected{{/if}}>{{localize 'BOL.attributes.appeal'}}</option>
+            </select>
+        </div>
+    </div>
diff --git a/templates/dialogs/career-roll-part.hbs b/templates/dialogs/career-roll-part.hbs
new file mode 100644
index 0000000..057d269
--- /dev/null
+++ b/templates/dialogs/career-roll-part.hbs
@@ -0,0 +1,14 @@
+    {{#if careers.items}}
+    <div class="flexrow" style="margin-bottom: 1px;">
+        <div class="flex1 center bg-darkred">
+            <label for="mod">{{localize 'BOL.ui.careers'}}</label>
+        </div>
+        <div class="flex1 center cell">
+            <select class="flex1" name="career" id="career" data-type="String" multiple>
+                {{#each careers.items as | career id|}}
+                    <option value="{{career.data.rank}}">{{career.name}} ({{numberFormat career.data.rank decimals=0 sign=true}})</option>
+                {{/each}}
+            </select>
+        </div>
+    </div>
+    {{/if}}
diff --git a/templates/dialogs/mod-roll-part.hbs b/templates/dialogs/mod-roll-part.hbs
new file mode 100644
index 0000000..1e70e41
--- /dev/null
+++ b/templates/dialogs/mod-roll-part.hbs
@@ -0,0 +1,19 @@
+    <div class="flexrow" style="margin-bottom: 1px;">
+        <div class="flex1 center bg-darkred">
+            <label for="mod">{{localize 'BOL.ui.modifiers'}}</label>
+        </div>
+        <div class="flex1 center cell">
+          <select name="mod" id="mod"  value="{{mod}}">
+            {{#select mod}}
+            <option value="2">Trés Facile (+2)</option>
+            <option value="1">Facile (+1)</option>
+            <option value="0">Moyenne (0)</option>
+            <option value="-1">Ardue (-1)</option>
+            <option value="-2">Difficile (-2)</option>
+            <option value="-4">Très Difficile (-4)</option>
+            <option value="-6">Impossible (-6)</option>
+            <option value="-8">Héroïque (-8)</option>
+            {{/select}}
+          </select>
+        </div>
+    </div>
diff --git a/templates/dialogs/weapon-roll-dialog.hbs b/templates/dialogs/weapon-roll-dialog.hbs
index 036168e..4f77f76 100644
--- a/templates/dialogs/weapon-roll-dialog.hbs
+++ b/templates/dialogs/weapon-roll-dialog.hbs
@@ -7,48 +7,15 @@
             </div>
         </div>
     </header>
-    <div class="flexrow" style="margin-bottom: 1px;">
-        <div class="flex1 center bg-darkred">
-            <label for="attr">{{localize 'BOL.ui.attribute'}}</label>
-        </div>
-        <div class="flex1 center cell">
-            <select class="flex1" name="attr" id="attr" data-type="String">
-                <option value="vigor" {{#if (equals attr.key "vigor")}}selected{{/if}}>{{localize 'BOL.attributes.vigor'}}</option>
-                <option value="agility" {{#if (equals attr.key "agility")}}selected{{/if}}>{{localize 'BOL.attributes.agility'}}</option>
-                <option value="mind" {{#if (equals attr.key "mind")}}selected{{/if}}>{{localize 'BOL.attributes.mind'}}</option>
-                <option value="appeal" {{#if (equals attr.key "appeal")}}selected{{/if}}>{{localize 'BOL.attributes.appeal'}}</option>
-            </select>
-        </div>
-    </div>
-    <div class="flexrow" style="margin-bottom: 1px;">
-        <div class="flex1 center bg-darkred">
-            <label for="apt">{{localize 'BOL.ui.aptitude'}}</label>
-        </div>
-        <div class="flex1 center cell">
-            <select class="flex1" name="apt" id="apt" data-type="String">
-                <option value="init" {{#if (equals apt.key "init")}}selected{{/if}}>{{localize 'BOL.aptitudes.init'}}</option>
-                <option value="melee" {{#if (equals apt.key "melee")}}selected{{/if}}>{{localize 'BOL.aptitudes.melee'}}</option>
-                <option value="ranged" {{#if (equals apt.key "ranged")}}selected{{/if}}>{{localize 'BOL.aptitudes.ranged'}}</option>
-                <option value="def" {{#if (equals apt.key "def")}}selected{{/if}}>{{localize 'BOL.aptitudes.def'}}</option>
-            </select>
-        </div>
-    </div>
-    <div class="flexrow" style="margin-bottom: 1px;">
-        <div class="flex1 center bg-darkred">
-            <label for="adv">{{localize 'BOL.ui.advantages'}}</label>
-        </div>
-        <div class="flex1 center cell">
-            <input type="text" class="field-value" name="adv" id="adv" value="{{adv}}" data-type="Number">
-        </div>
-    </div>
-    <div class="flexrow" style="margin-bottom: 1px;">
-        <div class="flex1 center bg-darkred">
-            <label for="mod">{{localize 'BOL.ui.modifiers'}}</label>
-        </div>
-        <div class="flex1 center cell">
-            <input type="text" class="field-value" name="mod" id="mod" value="{{mod}}" data-type="Number">
-        </div>
-    </div>
+
+    {{> "systems/bol/templates/dialogs/attribute-roll-part.hbs"}}
+
+    {{> "systems/bol/templates/dialogs/aptitude-roll-part.hbs"}}
+
+    {{> "systems/bol/templates/dialogs/adv-roll-part.hbs"}}
+
+    {{> "systems/bol/templates/dialogs/mod-roll-part.hbs"}}
+
     <div class="flexrow" style="margin-bottom: 1px;">
         <div class="flex1 center bg-darkred">
             <label for="mod">{{localize 'BOL.ui.targetDefence'}}</label>
@@ -75,18 +42,7 @@
           </div>
       </div>
       {{/if}}
-    {{#if careers.items}}
-    <div class="flexrow" style="margin-bottom: 1px;">
-        <div class="flex1 center bg-darkred">
-            <label for="mod">{{localize 'BOL.ui.careers'}}</label>
-        </div>
-        <div class="flex1 center cell">
-            <select class="flex1" name="career" id="career" data-type="String" multiple>
-                {{#each careers.items as | career id|}}
-                    <option value="{{career.data.rank}}">{{career.name}} ({{numberFormat career.data.rank decimals=0 sign=true}})</option>
-                {{/each}}
-            </select>
-        </div>
-    </div>
-    {{/if}}
+
+    {{> "systems/bol/templates/dialogs/career-roll-part.hbs"}}
+
 </form>
\ No newline at end of file