diff --git a/TheWitcher/js/actionButton.js b/TheWitcher/js/actionButton.js
new file mode 100644
index 0000000000..0c18de4f94
--- /dev/null
+++ b/TheWitcher/js/actionButton.js
@@ -0,0 +1,54 @@
+on('clicked:roll', (event) => {
+  	startRoll(event.htmlAttributes.value + "{{fumble=[[1d10!]]}} {{fumble2=[[1d10!]]}}", (results) => {
+  	    	var rollComputed = results.results.roll.result;
+  	    	var roll2Computed = 0;
+
+  	      if(results.results.roll.dice[0] == 1) // We check if the first die is a fumble.
+  	      {
+  	        	rollComputed = results.results.roll.result - 1 - results.results.fumble.result;
+  	      }
+
+			if(results.results.roll2 != null) {
+				roll2Computed = results.results.roll2.result;
+			 	if( results.results.roll2.dice[0] == 1) // We check if the first die is a fumble.
+  	      	{
+  	        		roll2Computed = results.results.roll2.result - 1 - results.results.fumble2.result;
+  	      	}
+			 }
+
+  	      finishRoll(
+  	          results.rollId,
+  	          {
+  	              roll: rollComputed,
+  	              roll2: roll2Computed
+
+  	          }
+  	      );
+  	  });
+});
+
+on('clicked:repeating_finearts:roll clicked:repeating_npcskill:roll', (event) => {
+
+	// prefix gets an empty string for normal attributes, and repeating_section_ID_ for repeating attributes
+	var trigger = event.triggerName.slice(8); // this always starts with 'clicked:'
+	var prefix = trigger.split('_').slice(0,3).join('_') + '_';
+
+	let rollPart = event.htmlAttributes.value.replaceAll('prefix-', `${prefix}`);
+	console.log(rollPart);
+
+  	startRoll(rollPart + "{{fumble=[[1d10!]]}}", (results) => {
+        var rollComputed = results.results.roll.result;
+
+        if(results.results.roll.dice[0] == 1) // We check if the first die is a fumble.
+        {
+            rollComputed = results.results.roll.result - 1 - results.results.fumble.result;
+        }
+
+        finishRoll(
+        results.rollId,
+        {
+            roll: rollComputed,
+        }
+        );
+  	  });
+});
\ No newline at end of file
diff --git a/TheWitcher/sheet.json b/TheWitcher/sheet.json
index 8b5eb4d57f..822c3b8587 100644
--- a/TheWitcher/sheet.json
+++ b/TheWitcher/sheet.json
@@ -1,7 +1,7 @@
 {
   "html": "witchersheet.html",
   "css": "witchersheet.css",
-  "authors": "Leothedino",
+  "authors": "Leothedino currently maintained by Stexinator",
   "roll20userid": "2643470",
   "preview": "witcherpreview.png",
   "instructions": "A sheet to reflect the original for The Witcher TRPG created by R.Talsorian Games. It includes helpful navigation, quality of life additions such as an extended weapon rack, catologue spell list, NPC sheet and a host of auto-calculating stats and skills to string together a simple and straight-forward online experience.",
diff --git a/TheWitcher/witchersheet.css b/TheWitcher/witchersheet.css
index ca90332f90..532cca1d15 100644
--- a/TheWitcher/witchersheet.css
+++ b/TheWitcher/witchersheet.css
@@ -5772,11 +5772,11 @@ textarea.sheet-campaign-text {
 
 /* stats */
 
-.charsheet button[type=roll].sheet-stat-roller::before {
+.charsheet button[type=action].sheet-stat-roller::before {
     content: " ";
 }
 
-button[type=roll].sheet-stat-roller {
+button[type=action].sheet-stat-roller {
     background: none;
     margin-right: 5px;
     width: 92px;
@@ -5791,21 +5791,21 @@ button[type=roll].sheet-stat-roller {
     box-shadow: none;
 }
 
-button[type=roll].sheet-stat-roller:hover {
+button[type=action].sheet-stat-roller:hover {
     color: #5e0000;
     box-shadow: none;
 }
 
-button[type=roll].sheet-stat-roller:active {
+button[type=action].sheet-stat-roller:active {
     color: #bc0000;
     box-shadow: none;
 }
 
-.charsheet button[type=roll].sheet-stat-roller2::before {
+.charsheet button[type=action].sheet-stat-roller2::before {
     content: " ";
 }
 
-button[type=roll].sheet-stat-roller2 {
+button[type=action].sheet-stat-roller2 {
     background: none;
     margin-right: 5px;
     width: 50px;
@@ -5820,24 +5820,25 @@ button[type=roll].sheet-stat-roller2 {
     box-shadow: none;
 }
 
-button[type=roll].sheet-stat-roller2:hover {
+button[type=action].sheet-stat-roller2:hover {
     color: #5e0000;
     box-shadow: none;
 }
 
-button[type=roll].sheet-stat-roller2:active {
+button[type=action].sheet-stat-roller2:active {
     color: #bc0000;
     box-shadow: none;
 }
 
-.charsheet button[type=roll].sheet-skill-roller2::before,
-.charsheet button[type=roll].sheet-skill-roller::before {
+.charsheet button[type=action].sheet-skill-roller2::before,
+.charsheet button[type=action].sheet-skill-roller::before {
     content: " ";
 }
 
-button[type=roll].sheet-skill-roller {
+button[type=action].sheet-skill-roller {
     background: none;
     margin-right: 5px;
+    margin-left: 3px;
     width: 120px;
     text-shadow: none;
     text-align: right;
@@ -5850,19 +5851,19 @@ button[type=roll].sheet-skill-roller {
     box-shadow: none;
 }
 
-button[type=roll].sheet-skill-roller2:hover,
-button[type=roll].sheet-skill-roller:hover {
+button[type=action].sheet-skill-roller2:hover,
+button[type=action].sheet-skill-roller:hover {
     color: #5e0000;
     box-shadow: none;
 }
 
-button[type=roll].sheet-skill-roller2:active,
-button[type=roll].sheet-skill-roller:active {
+button[type=action].sheet-skill-roller2:active,
+button[type=action].sheet-skill-roller:active {
     color: #bc0000;
     box-shadow: none;
 }
 
-button[type=roll].sheet-skill-roller2 {
+button[type=action].sheet-skill-roller2 {
     background: none;
     margin-right: 5px;
     width: 90px;
@@ -5877,13 +5878,13 @@ button[type=roll].sheet-skill-roller2 {
     box-shadow: none;
 }
 
-.charsheet button[type=roll].repeating_skill_roller_emp::before,
-.charsheet button[type=roll].sheet-skill-roller-emp::before {
+.charsheet button[type=action].repeating_skill_roller_emp::before,
+.charsheet button[type=action].sheet-skill-roller-emp::before {
     content: " ";
 }
 
-button[type=roll].repeating_skill_roller_emp,
-button[type=roll].sheet-skill-roller-emp {
+button[type=action].repeating_skill_roller_emp,
+button[type=action].sheet-skill-roller-emp {
     background: none;
     margin-right: -1px;
     width: 100px;
@@ -5898,25 +5899,25 @@ button[type=roll].sheet-skill-roller-emp {
     box-shadow: none;
 }
 
-button[type=roll].repeating_skill_roller_emp:hover,
-button[type=roll].sheet-skill-roller-emp:hover {
+button[type=action].repeating_skill_roller_emp:hover,
+button[type=action].sheet-skill-roller-emp:hover {
     color: #5e0000;
     box-shadow: none;
 }
 
-button[type=roll].repeating_skill_roller_emp:active,
-button[type=roll].sheet-skill-roller-emp:active {
+button[type=action].repeating_skill_roller_emp:active,
+button[type=action].sheet-skill-roller-emp:active {
     color: #bc0000;
     box-shadow: none;
 }
 
-.charsheet button[type=roll].sheet-stat-roll::before {
+.charsheet button[type=action].sheet-stat-roll::before {
     font-family: "dicefontd10";
     content: "0";
     font-size: 16px;
 }
 
-button[type=roll].sheet-stat-roll {
+button[type=action].sheet-stat-roll {
     color: #000;
     background-color: #e8e8e8;
     text-align: center;
@@ -5929,26 +5930,26 @@ button[type=roll].sheet-stat-roll {
     box-shadow: inset 1px 1px 1px 1px rgba(0,0,0,0.30);
 }
 
-button[type=roll].sheet-stat-roll:hover {
+button[type=action].sheet-stat-roll:hover {
     color: #5e0000;
     border-color: #5e0000;
     border: 1px solid;
 }
 
-button[type=roll].sheet-stat-roll:active {
+button[type=action].sheet-stat-roll:active {
     color: #bc0000;
     border-color: #bc0000;
     border: 1px solid;
     box-shadow: inset 1px 1px 1px 1px #5e0000;
 }
 
-.charsheet button[type=roll].sheet-stat-roll2::before {
+.charsheet button[type=action].sheet-stat-roll2::before {
     font-family: "Pictos Custom";
     content: "t";
     font-size: 16px;
 }
 
-button[type=roll].sheet-stat-roll2 {
+button[type=action].sheet-stat-roll2 {
     color: #000;
     background-color: #e8e8e8;
     text-align: center;
@@ -5961,26 +5962,26 @@ button[type=roll].sheet-stat-roll2 {
     box-shadow: inset 1px 1px 1px 1px rgba(0,0,0,0.30);
 }
 
-button[type=roll].sheet-stat-roll2:hover {
+button[type=action].sheet-stat-roll2:hover {
     color: #5e0000;
     border-color: #5e0000;
     border: 1px solid;
 }
 
-button[type=roll].sheet-stat-roll2:active {
+button[type=action].sheet-stat-roll2:active {
     color: #bc0000;
     border-color: #bc0000;
     border: 1px solid;
     box-shadow: inset 1px 1px 1px 1px #5e0000;
 }
 
-.charsheet button[type=roll].sheet-stat-roll3::before {
+.charsheet button[type=action].sheet-stat-roll3::before {
     font-family: "Pictos Custom";
     content: "e";
     font-size: 16px;
 }
 
-button[type=roll].sheet-stat-roll3 {
+button[type=action].sheet-stat-roll3 {
     color: #000;
     background-color: #e8e8e8;
     text-align: center;
@@ -5993,13 +5994,13 @@ button[type=roll].sheet-stat-roll3 {
     box-shadow: inset 1px 1px 1px 1px rgba(0,0,0,0.30);
 }
 
-button[type=roll].sheet-stat-roll3:hover {
+button[type=action].sheet-stat-roll3:hover {
     color: #5e0000;
     border-color: #5e0000;
     border: 1px solid;
 }
 
-button[type=roll].sheet-stat-roll3:active {
+button[type=action].sheet-stat-roll3:active {
     color: #bc0000;
     border-color: #bc0000;
     border: 1px solid;
@@ -6189,14 +6190,14 @@ button[type=roll].sheet-target-roll:active {
 
 /* Profession Skill Button */
 
-.charsheet button[type=roll].sheet-prof-skill-roll::before {
+.charsheet button[type=action].sheet-prof-skill-roll::before {
     font-family: "Helvetica";
     content: "ROLL SKILL";
     font-size: 9px;
     display: block;
 }
 
-button[type=roll].sheet-prof-skill-roll {
+button[type=action].sheet-prof-skill-roll {
     color: #000;
     background-color: #e8e8e8;
     text-align: center;
@@ -6210,13 +6211,13 @@ button[type=roll].sheet-prof-skill-roll {
     box-shadow: inset 1px 1px 1px 1px rgba(0,0,0,0.30);
 }
 
-button[type=roll].sheet-prof-skill-roll:hover {
+button[type=action].sheet-prof-skill-roll:hover {
     color: #828282;
     border-color: #828282;
     border: 1px solid;
 }
 
-button[type=roll].sheet-prof-skill-roll:active {
+button[type=action].sheet-prof-skill-roll:active {
     color: #afafaf;
     border-color: #afafaf;
     border: 1px solid;
@@ -6447,13 +6448,13 @@ button[type=roll].repeating_hex_damage_roll:active {
 
 /* Reputation Roll */
 
-.charsheet button[type=roll].sheet-rep-roll::before {
+.charsheet button[type=action].sheet-rep-roll::before {
     font-family: "Pictos";
     content: "i";
     font-size: 18px;
 }
 
-button[type=roll].sheet-rep-roll {
+button[type=action].sheet-rep-roll {
     color: #000;
     background-color: #e8e8e8;
     text-align: center;
@@ -6466,13 +6467,13 @@ button[type=roll].sheet-rep-roll {
     box-shadow: inset 1px 1px 1px 1px rgba(0,0,0,0.30);
 }
 
-button[type=roll].sheet-rep-roll:hover {
+button[type=action].sheet-rep-roll:hover {
     color: #2a72a3;
     border-color: #2a72a3;
     border: 1px solid;
 }
 
-button[type=roll].sheet-rep-roll:active {
+button[type=action].sheet-rep-roll:active {
     color: #42b2ff;
     border-color: #42b2ff;
     border: 1px solid;
@@ -6481,13 +6482,13 @@ button[type=roll].sheet-rep-roll:active {
 
 /* NPC Skill */
 
-.charsheet button[type=roll].repeating_npc_skill_roll::before {
+.charsheet button[type=action].repeating_npc_skill_roll::before {
     font-family: "dicefontd10";
     content: "0";
     font-size: 17px;
 }
 
-button[type=roll].repeating_npc_skill_roll {
+button[type=action].repeating_npc_skill_roll {
     color: #000;
     display: inline-block;
     background-color: #e8e8e8;
@@ -6502,13 +6503,48 @@ button[type=roll].repeating_npc_skill_roll {
     box-shadow: inset 1px 1px 1px 1px rgba(0,0,0,0.30);
 }
 
-button[type=roll].repeating_npc_skill_roll:hover {
+button[type=action].repeating_npc_skill_roll:hover {
     color: #878787;
     border-color: #878787;
     border: 1px solid;
 }
 
-button[type=roll].repeating_npc_skill_roll:active {
+button[type=action].repeating_npc_skill_roll:active {
+    color: #d6d6d6;
+    border-color: #d6d6d6;
+    border: 1px solid;
+    box-shadow: inset 2px 1px 1px 1px #878787;
+
+}
+
+.charsheet button[type=roll].repeating_npc_weapon_roll::before {
+    font-family: "dicefontd10";
+    content: "0";
+    font-size: 17px;
+}
+
+button[type=roll].repeating_npc_weapon_roll {
+    color: #000;
+    display: inline-block;
+    background-color: #e8e8e8;
+    text-align: center;
+    font-weight: bold;
+    margin-top: 5px;
+    width:18px;
+    height:18px;
+    border-radius: 100px;
+    border-color: #000;
+    border: 1px solid;
+    box-shadow: inset 1px 1px 1px 1px rgba(0,0,0,0.30);
+}
+
+button[type=roll].repeating_npc_weapon_roll:hover {
+    color: #878787;
+    border-color: #878787;
+    border: 1px solid;
+}
+
+button[type=roll].repeating_npc_weapon_roll:active {
     color: #d6d6d6;
     border-color: #d6d6d6;
     border: 1px solid;
diff --git a/TheWitcher/witchersheet.html b/TheWitcher/witchersheet.html
index ea9dd836e2..8583a81330 100644
--- a/TheWitcher/witchersheet.html
+++ b/TheWitcher/witchersheet.html
@@ -11,7 +11,7 @@
         	<div class='sheet-top-grid'>
         		<div class='sheet-grid-item'>
         			<label class='sheet-legend-top' style='margin-left: 15px;' data-i18n="maximum-current">Maximum / Current</label><br />
-        			<button type='roll' data-i18n="int-u" class='sheet-stat-roller' value= '@{whisper}&{template:statistics} {{title=INT SAVE}} {{name=@{character_name}}} {{description=To succeed you need to roll below @{int}.}} {{roll=[[1d10]]}}'>INT</button>
+        			<button type='action' name='act_roll' data-i18n="int-u" class='sheet-stat-roller' value= '@{whisper}&{template:saveroll} {{title=INT SAVE}} {{name=@{character_name}}} {{description=To succeed you need to roll below @{int}.}} {{roll=[[1d10]]}}'>INT</button>
         			<input name='attr_total_int' title='@{total_int}' class='sheet-statbox' type='number' value='1'>
         			<input name='attr_int' title='@{int}' class='sheet-statbox' type='text' value='[[((floor((@{total_int}+@{intstatsum})@{wound_mod})+1)+abs((floor((@{total_int}+@{intstatsum})@{wound_mod}))-1))/2]]' disabled='true'>
         			<input type="checkbox" checked name='attr_int_unlock' class="sheet-int-unlock"><span></span>
@@ -25,7 +25,7 @@
                 			</fieldset>
         				</div><br />
         				<hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
-        			<button type='roll' data-i18n="ref-u" class='sheet-stat-roller' value= '@{whisper}&{template:statistics} {{title=REF SAVE}} {{name=@{character_name}}} {{description=To succeed you need to roll below @{ref}.}} {{roll=[[1d10]]}}'>REF</button>
+        			<button type='action' name='act_roll' data-i18n="ref-u" class='sheet-stat-roller' value= '@{whisper}&{template:saveroll} {{title=REF SAVE}} {{name=@{character_name}}} {{description=To succeed you need to roll below @{ref}.}} {{roll=[[1d10]]}}'>REF</button>
         			<input name='attr_total_ref' title='@{total_ref}' class='sheet-statbox' type='number' value='1'>
         			<input name='attr_ref' title='@{ref}' class='sheet-statbox' type='text' value='[[((floor((@{total_ref}+@{refstatsum}+@{totalev})@{wound_mod})+1)+abs((floor((@{total_ref}+@{refstatsum}+@{totalev})@{wound_mod}))-1))/2]]' disabled='true'>
         			<input type="checkbox" checked name='attr_ref_unlock' class="sheet-ref-unlock"><span></span>
@@ -41,7 +41,7 @@
                 			</fieldset>
         				</div><br />
         				<hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
-        			<button type='roll' data-i18n="dex-u" class='sheet-stat-roller' value= '@{whisper}&{template:statistics} {{title=DEX SAVE}} {{name=@{character_name}}} {{description=To succeed you need to roll below @{dex}.}} {{roll=[[1d10]]}}'>DEX</button>
+        			<button type='action' name='act_roll' data-i18n="dex-u" class='sheet-stat-roller' value= '@{whisper}&{template:saveroll} {{title=DEX SAVE}} {{name=@{character_name}}} {{description=To succeed you need to roll below @{dex}.}} {{roll=[[1d10]]}}'>DEX</button>
         			<input name='attr_total_dex' title='@{total_dex}' class='sheet-statbox' type='number' value='1'>
         			<input name='attr_dex' title='@{dex}' class='sheet-statbox' type='text' value='[[((floor((@{total_dex}+@{dexstatsum}+@{totalev})@{wound_mod})+1)+abs((floor((@{total_dex}+@{dexstatsum}+@{totalev})@{wound_mod}))-1))/2]]' disabled='true'>
         			<input type="checkbox" checked name='attr_dex_unlock' class="sheet-dex-unlock"><span></span>
@@ -57,7 +57,7 @@
                 			</fieldset>
         				</div><br />
         				<hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
-        			<button type='roll' data-i18n="body-u" class='sheet-stat-roller' value= '@{whisper}&{template:statistics} {{title=BODY SAVE}} {{name=@{character_name}}} {{description=To succeed you need to roll below @{body}.}} {{roll=[[1d10]]}}'>BODY</button>
+        			<button type='action' name='act_roll' data-i18n="body-u" class='sheet-stat-roller' value= '@{whisper}&{template:saveroll} {{title=BODY SAVE}} {{name=@{character_name}}} {{description=To succeed you need to roll below @{body}.}} {{roll=[[1d10]]}}'>BODY</button>
         			<input name='attr_total_body' title='@{total_body}' class='sheet-statbox' type='number' value='1'>
         			<input name='attr_body' title='@{body}' class='sheet-statbox' type='text' value='[[((floor((@{total_body}+@{bodystatsum})@{death_mod})+1)+abs((floor((@{total_body}+@{bodystatsum})@{death_mod}))-1))/2]]' disabled='true'>
         	        <input type="checkbox" checked name='attr_body_unlock' class="sheet-body-unlock"><span></span>
@@ -71,7 +71,7 @@
                 			</fieldset>
         				</div><br />
         				<hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
-        	        <button type='roll' data-i18n="spd-u" class='sheet-stat-roller' value= '@{whisper}&{template:statistics} {{title=SPD SAVE}} {{name=@{character_name}}} {{description=To succeed you need to roll below @{spd}.}} {{roll=[[1d10]]}}'>SPD</button>
+        	        <button type='action' name='act_roll' data-i18n="spd-u" class='sheet-stat-roller' value= '@{whisper}&{template:saveroll} {{title=SPD SAVE}} {{name=@{character_name}}} {{description=To succeed you need to roll below @{spd}.}} {{roll=[[1d10]]}}'>SPD</button>
         	        <input name='attr_total_spd' title='@{total_spd}' class='sheet-statbox' type='number' value='1'>
         	        <input name='attr_spd' title='@{spd}' class='sheet-statbox' type='text' value='[[((floor((@{total_spd}+@{spdstatsum})@{death_mod})+1)+abs((floor((@{total_spd}+@{spdstatsum})@{death_mod}))-1))/2]]' disabled='true'>
                 	<input type="checkbox" checked name='attr_spd_unlock' class="sheet-spd-unlock"><span></span>
@@ -85,7 +85,7 @@
                 			</fieldset>
         				</div><br />
         				<hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
-                	<button type='roll' data-i18n="emp-u" class='sheet-stat-roller' value= '@{whisper}&{template:statistics} {{title=EMP SAVE}} {{name=@{character_name}}} {{description=To succeed you need to roll below @{emp}.}} {{roll=[[1d10]]}}'>EMP</button>
+                	<button type='action' name='act_roll' data-i18n="emp-u" class='sheet-stat-roller' value= '@{whisper}&{template:saveroll} {{title=EMP SAVE}} {{name=@{character_name}}} {{description=To succeed you need to roll below @{emp}.}} {{roll=[[1d10]]}}'>EMP</button>
                 	<input name='attr_total_emp' title='@{total_emp}' class='sheet-statbox' type='number' value='1'>
                 	<input name='attr_emp' title='@{emp}' class='sheet-statbox' type='text' value='[[((floor((@{total_emp}+@{empstatsum})@{death_mod})+1)+abs((floor((@{total_emp}+@{empstatsum})@{death_mod}))-1))/2]]' disabled='true'>
                 	<input type="checkbox" checked name='attr_emp_unlock' class="sheet-emp-unlock"><span></span>
@@ -99,7 +99,7 @@
                 			</fieldset>
         				</div><br />
         				<hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
-                	<button type='roll' data-i18n="cra-u" class='sheet-stat-roller' value= '@{whisper}&{template:statistics} {{title=CRA SAVE}} {{name=@{character_name}}} {{description=To succeed you need to roll below @{cra}.}} {{roll=[[1d10]]}}'>CRA</button>
+                	<button type='action' name='act_roll' data-i18n="cra-u" class='sheet-stat-roller' value= '@{whisper}&{template:saveroll} {{title=CRA SAVE}} {{name=@{character_name}}} {{description=To succeed you need to roll below @{cra}.}} {{roll=[[1d10]]}}'>CRA</button>
                 	<input name='attr_total_cra' title='@{total_cra}' class='sheet-statbox' type='number' value='1'>
                 	<input name='attr_cra' title='@{cra}' class='sheet-statbox' type='text' value='[[((floor((@{total_cra}+@{crastatsum})@{death_mod})+1)+abs((floor((@{total_cra}+@{crastatsum})@{death_mod}))-1))/2]]' disabled='true'>
         			<input type="checkbox" checked name='attr_cra_unlock' class="sheet-cra-unlock"><span></span>
@@ -113,7 +113,7 @@
                 			</fieldset>
         				</div><br />
         				<hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
-        			<button type='roll' data-i18n="will-u" class='sheet-stat-roller' value= '@{whisper}&{template:statistics} {{title=WILL SAVE}} {{name=@{character_name}}} {{description=To succeed you need to roll below @{will}.}} {{roll=[[1d10]]}}'>WILL</button>
+        			<button type='action' name='act_roll' data-i18n="will-u" class='sheet-stat-roller' value= '@{whisper}&{template:saveroll} {{title=WILL SAVE}} {{name=@{character_name}}} {{description=To succeed you need to roll below @{will}.}} {{roll=[[1d10]]}}'>WILL</button>
         			<input name='attr_total_will' title='@{total_will}' class='sheet-statbox' type='number' value='1'>
         			<input name='attr_will' title='@{will}' class='sheet-statbox' type='text' value='[[((floor((@{total_will}+@{willstatsum})@{wound_mod})+1)+abs((floor((@{total_will}+@{willstatsum})@{wound_mod}))-1))/2]]' disabled='true'>
         			<input type="checkbox" checked name='attr_will_unlock' class="sheet-will-unlock"><span></span>
@@ -303,8 +303,8 @@
         					<label class='sheet-skilltitle-int' data-i18n="intelligence-u" >INTELLIGENCE</label><input type="checkbox" name='attr_int_toggle' class="sheet-int-toggle"><span></span>
         						<div class='sheet-int-container'>
 									<div>
-										<button type='roll' data-i18n="awarenes-u" class='sheet-skill-roller'
-												value='@{whisper}&{template:statistics2} {{title=AWARENESS}} {{name=@{character_name}}} {{roll=[[1d10!+@{int}[STAT]+@{awareness_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
+										<button type='action' name='act_roll' data-i18n="awarenes-u" class='sheet-skill-roller'
+												value='@{whisper}&{template:singleroll} {{title=AWARENESS}} {{name=@{character_name}}} {{roll=[[1d10!+@{int}[STAT]+@{awareness_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
 											AWARENESS
 										</button>
 										<input name='attr_awareness' title='@{awareness}' class='sheet-skillbox' type='number' value='0'>
@@ -327,8 +327,8 @@
 										<hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
 									</div>
 									<div>
-										<button type='roll' data-i18n="busines-u" class='sheet-skill-roller'
-												value='@{whisper}&{template:statistics2} {{title=BUSINESS}} {{name=@{character_name}}} {{roll=[[1d10!+@{int}[STAT]+@{business_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
+										<button type='action' name='act_roll' data-i18n="busines-u" class='sheet-skill-roller'
+												value='@{whisper}&{template:singleroll} {{title=BUSINESS}} {{name=@{character_name}}} {{roll=[[1d10!+@{int}[STAT]+@{business_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
 											BUSINESS
 										</button>
 										<input name='attr_business' title='@{business}' class='sheet-skillbox' type='number' value='0'>
@@ -351,8 +351,8 @@
 										<hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
 									</div>
 									<div>
-										<button type='roll' data-i18n="deductio-u" class='sheet-skill-roller'
-												value='@{whisper}&{template:statistics2} {{title=DEDUCTION}} {{name=@{character_name}}} {{roll=[[1d10!+@{int}[STAT]+@{deduction_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
+										<button type='action' name='act_roll' data-i18n="deductio-u" class='sheet-skill-roller'
+												value='@{whisper}&{template:singleroll} {{title=DEDUCTION}} {{name=@{character_name}}} {{roll=[[1d10!+@{int}[STAT]+@{deduction_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
 											DEDUCTION
 										</button>
 										<input name='attr_deduction' title='@{deduction}' class='sheet-skillbox' type='number' value='0'>
@@ -375,8 +375,8 @@
 										<hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
 									</div>
 									<div>
-										<button type='roll' data-i18n="educatio-u" class='sheet-skill-roller'
-												value='@{whisper}&{template:statistics2} {{title=EDUCATION}} {{name=@{character_name}}} {{roll=[[1d10!+@{int}[STAT]+@{education_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
+										<button type='action' name='act_roll' data-i18n="educatio-u" class='sheet-skill-roller'
+												value='@{whisper}&{template:singleroll} {{title=EDUCATION}} {{name=@{character_name}}} {{roll=[[1d10!+@{int}[STAT]+@{education_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
 											EDUCATION
 										</button>
 										<input name='attr_education' title='@{education}' class='sheet-skillbox' type='number' value='0'>
@@ -399,8 +399,8 @@
 										<hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
 									</div>
 									<div>
-										<button type='roll' data-i18n="nordling-u" class='sheet-skill-roller'
-												value='@{whisper}&{template:statistics2} {{title=NORDLING}} {{name=@{character_name}}} {{roll=[[1d10!+@{int}[STAT]+@{nordling_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
+										<button type='action' name='act_roll' data-i18n="nordling-u" class='sheet-skill-roller'
+												value='@{whisper}&{template:singleroll} {{title=NORDLING}} {{name=@{character_name}}} {{roll=[[1d10!+@{int}[STAT]+@{nordling_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
 											NORDLING*
 										</button>
 										<input name='attr_nordling' title='@{nordling}' class='sheet-skillbox' type='number' value='0'>
@@ -423,8 +423,8 @@
 										<hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
 									</div>
 									<div>
-										<button type='roll' data-i18n="elder-speech-u" class='sheet-skill-roller'
-												value='@{whisper}&{template:statistics2} {{title=ELDER SPEECH}} {{name=@{character_name}}} {{roll=[[1d10!+@{int}[STAT]+@{elder_speech_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
+										<button type='action' name='act_roll' data-i18n="elder-speech-u" class='sheet-skill-roller'
+												value='@{whisper}&{template:singleroll} {{title=ELDER SPEECH}} {{name=@{character_name}}} {{roll=[[1d10!+@{int}[STAT]+@{elder_speech_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
 											ELDER SPEECH*
 										</button>
 										<input name='attr_elder_speech' title='@{elder_speech}' class='sheet-skillbox' type='number' value='0'>
@@ -447,8 +447,8 @@
 										<hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
 									</div>
 									<div>
-										<button type='roll' data-i18n="dwarven-u" class='sheet-skill-roller'
-												value='@{whisper}&{template:statistics2} {{title=DWARVEN}} {{name=@{character_name}}} {{roll=[[1d10!+@{int}[STAT]+@{dwarven_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
+										<button type='action' name='act_roll' data-i18n="dwarven-u" class='sheet-skill-roller'
+												value='@{whisper}&{template:singleroll} {{title=DWARVEN}} {{name=@{character_name}}} {{roll=[[1d10!+@{int}[STAT]+@{dwarven_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
 											DWARVEN*
 										</button>
 										<input name='attr_dwarven' title='@{dwarven}' class='sheet-skillbox' type='number' value='0'>
@@ -471,8 +471,8 @@
 										<hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
 									</div>
 									<div>
-										<button type='roll' data-i18n="monster-lore-u" class='sheet-skill-roller'
-												value='@{whisper}&{template:statistics2} {{title=MONSTER LORE}} {{name=@{character_name}}} {{roll=[[1d10!+@{int}[STAT]+@{monster_lore_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
+										<button type='action' name='act_roll' data-i18n="monster-lore-u" class='sheet-skill-roller'
+												value='@{whisper}&{template:singleroll} {{title=MONSTER LORE}} {{name=@{character_name}}} {{roll=[[1d10!+@{int}[STAT]+@{monster_lore_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
 											MONSTER LORE*
 										</button>
 										<input name='attr_monster_lore' title='@{monster_lore}' class='sheet-skillbox' type='number' value='0'>
@@ -495,8 +495,8 @@
 										<hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
 									</div>
 									<div>
-										<button type='roll' data-i18n="social-etiquett-u" class='sheet-skill-roller'
-												value='@{whisper}&{template:statistics2} {{title=SOCIAL ETIQUETTE}} {{name=@{character_name}}} {{roll=[[1d10!+@{int}[STAT]+@{social_etiquette_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
+										<button type='action' name='act_roll' data-i18n="social-etiquett-u" class='sheet-skill-roller'
+												value='@{whisper}&{template:singleroll} {{title=SOCIAL ETIQUETTE}} {{name=@{character_name}}} {{roll=[[1d10!+@{int}[STAT]+@{social_etiquette_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
 											SOCIAL ETIQUETTE
 										</button>
 										<input name='attr_social_etiquette' title='@{social_etiquette}' class='sheet-skillbox' type='number' value='0'>
@@ -519,8 +519,8 @@
 										<hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
 									</div>
 									<div>
-										<button type='roll' data-i18n="streetwis-u" class='sheet-skill-roller'
-												value='@{whisper}&{template:statistics2} {{title=STREETWISE}} {{name=@{character_name}}} {{roll=[[1d10!+@{int}[STAT]+@{streetwise_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
+										<button type='action' name='act_roll' data-i18n="streetwis-u" class='sheet-skill-roller'
+												value='@{whisper}&{template:singleroll} {{title=STREETWISE}} {{name=@{character_name}}} {{roll=[[1d10!+@{int}[STAT]+@{streetwise_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
 											STREETWISE
 										</button>
 										<input name='attr_streetwise' title='@{streetwise}' class='sheet-skillbox' type='number' value='0'>
@@ -543,8 +543,8 @@
 										<hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
 									</div>
 									<div>
-										<button type='roll' data-i18n="tactics-u" class='sheet-skill-roller'
-												value='@{whisper}&{template:statistics2} {{title=TACTICS}} {{name=@{character_name}}} {{roll=[[1d10!+@{int}[STAT]+@{tactics_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
+										<button type='action' name='act_roll' data-i18n="tactics-u" class='sheet-skill-roller'
+												value='@{whisper}&{template:singleroll} {{title=TACTICS}} {{name=@{character_name}}} {{roll=[[1d10!+@{int}[STAT]+@{tactics_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
 											TACTICS*
 										</button>
 										<input name='attr_tactics' title='@{tactics}' class='sheet-skillbox' type='number' value='0'>
@@ -567,8 +567,8 @@
 										<hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
 									</div>
 									<div>
-										<button type='roll' data-i18n="teachin-u" class='sheet-skill-roller'
-												value='@{whisper}&{template:statistics2} {{title=TEACHING}} {{name=@{character_name}}} {{roll=[[1d10!+@{int}[STAT]+@{teaching_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
+										<button type='action' name='act_roll' data-i18n="teachin-u" class='sheet-skill-roller'
+												value='@{whisper}&{template:singleroll} {{title=TEACHING}} {{name=@{character_name}}} {{roll=[[1d10!+@{int}[STAT]+@{teaching_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
 											TEACHING*
 										</button>
 										<input name='attr_teaching' title='@{teaching}' class='sheet-skillbox' type='number' value='0'>
@@ -591,8 +591,8 @@
 										<hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
 									</div>
 									<div>
-										<button type='roll' data-i18n="wilderness-surviva-u" class='sheet-skill-roller'
-												value='@{whisper}&{template:statistics2} {{title=WILDERNESS SURVIVAL}} {{name=@{character_name}}} {{roll=[[1d10!+@{int}[STAT]+@{wilderness_survival_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
+										<button type='action' name='act_roll' data-i18n="wilderness-surviva-u" class='sheet-skill-roller'
+												value='@{whisper}&{template:singleroll} {{title=WILDERNESS SURVIVAL}} {{name=@{character_name}}} {{roll=[[1d10!+@{int}[STAT]+@{wilderness_survival_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
 											WILDERNESS SURVIVAL
 										</button>
 										<input name='attr_wilderness_survival' title='@{wilderness_survival}' class='sheet-skillbox' type='number' value='0'>
@@ -633,39 +633,39 @@
 											<label class='sheet-legend-skill' data-i18n="maximum-current">Maximum / Current</label><br/>
 										</div>
 										<div class='sheet-brawling-options'>
-											<button type='roll' data-i18n="fast-strikes-u" class='sheet-skill-roller2'
-													value='@{whisper}&{template:statistics3} {{title=BRAWLING}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{brawling_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]+0[FAST STRIKES]+?{WEAPON SELECTION|Unarmed,0|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{1ST ATTACK LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{1ST ATTACK MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}} {{roll2=[[1d10!+@{ref}[STAT]+@{brawling_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]+0[FAST STRIKES]+?{WEAPON SELECTION|Unarmed,0|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{2ND ATTACK LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{2ND ATTACK MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
+											<button type='action' name='act_roll' data-i18n="fast-strikes-u" class='sheet-skill-roller2'
+													value='@{whisper}&{template:doubleroll} {{title=BRAWLING}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{brawling_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]+0[FAST STRIKES]+?{WEAPON SELECTION|Unarmed,0|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{1ST ATTACK LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{1ST ATTACK MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}} {{roll2=[[1d10!+@{ref}[STAT]+@{brawling_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]+0[FAST STRIKES]+?{WEAPON SELECTION|Unarmed,0|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{2ND ATTACK LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{2ND ATTACK MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
 												FAST STRIKES
 											</button>
-											<button type='roll' data-i18n="disarm--take-u" class='sheet-skill-roller2'
-													value='@{whisper}&{template:statistics2} {{title=BRAWLING}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{brawling_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]-3[DISARM(TAKE)]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
+											<button type='action' name='act_roll' data-i18n="disarm--take-u" class='sheet-skill-roller2'
+													value='@{whisper}&{template:singleroll} {{title=BRAWLING}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{brawling_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]-3[DISARM(TAKE)]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
 												DISARM (TAKE)
 											</button>
 											<br/>
-											<button type='roll' data-i18n="strong-strik-u" class='sheet-skill-roller2'
-													value='@{whisper}&{template:statistics2} {{title=BRAWLING}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{brawling_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]-3[STRONG STRIKE]+?{WEAPON SELECTION|Unarmed,0|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
+											<button type='action' name='act_roll' data-i18n="strong-strik-u" class='sheet-skill-roller2'
+													value='@{whisper}&{template:singleroll} {{title=BRAWLING}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{brawling_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]-3[STRONG STRIKE]+?{WEAPON SELECTION|Unarmed,0|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
 												STRONG STRIKE
 											</button>
-											<button type='roll' data-i18n="special-mov-u" class='sheet-skill-roller2'
-													value='@{whisper}&{template:statistics2} {{title=BRAWLING}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{brawling_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]+0[SPECIAL]+?{WEAPON SELECTION|Unarmed,0|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{TARGET LOCATION|Random/None,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
+											<button type='action' name='act_roll' data-i18n="special-mov-u" class='sheet-skill-roller2'
+													value='@{whisper}&{template:singleroll} {{title=BRAWLING}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{brawling_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]+0[SPECIAL]+?{WEAPON SELECTION|Unarmed,0|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{TARGET LOCATION|Random/None,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
 												SPECIAL MOVE
 											</button>
 											<br/>
-											<button type='roll' data-i18n="charg-u" class='sheet-skill-roller2'
-													value='@{whisper}&{template:statistics2} {{title=BRAWLING}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{brawling_total}[SKILL]-3[CHARGE]+?{WEAPON SELECTION|Unarmed,0|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
+											<button type='action' name='act_roll' data-i18n="charg-u" class='sheet-skill-roller2'
+													value='@{whisper}&{template:singleroll} {{title=BRAWLING}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{brawling_total}[SKILL]-3[CHARGE]+?{WEAPON SELECTION|Unarmed,0|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
 												CHARGE
 											</button>
-											<button type='roll' data-i18n="bloc-u" class='sheet-skill-roller2'
-													value='@{whisper}&{template:statistics2} {{title=BRAWLING}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{brawling_total}[SKILL]+0[BLOCK]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
+											<button type='action' name='act_roll' data-i18n="bloc-u" class='sheet-skill-roller2'
+													value='@{whisper}&{template:singleroll} {{title=BRAWLING}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{brawling_total}[SKILL]+0[BLOCK]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
 												BLOCK
 											</button>
 											<br/>
-											<button type='roll' data-i18n="joint-attac-u" class='sheet-skill-roller2'
-													value='@{whisper}&{template:statistics3} {{title=BRAWLING}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{brawling_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]-3[JOINT]+?{WEAPON SELECTION|Unarmed,0|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}{{roll2=[[1d10!+@{ref}[STAT]+@{brawling_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]-3[JOINT]+?{SECOND WEAPON SELECTION|Unarmed,0|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{SECOND TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{SECOND ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
+											<button type='action' name='act_roll' data-i18n="joint-attac-u" class='sheet-skill-roller2'
+													value='@{whisper}&{template:doubleroll} {{title=BRAWLING}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{brawling_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]-3[JOINT]+?{WEAPON SELECTION|Unarmed,0|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}{{roll2=[[1d10!+@{ref}[STAT]+@{brawling_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]-3[JOINT]+?{SECOND WEAPON SELECTION|Unarmed,0|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{SECOND TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{SECOND ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
 												JOINT ATTACK
 											</button>
-											<button type='roll' data-i18n="parr-u" class='sheet-skill-roller2'
-													value='@{whisper}&{template:statistics2} {{title=BRAWLING}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{brawling_total}[SKILL]-3[PARRY]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
+											<button type='action' name='act_roll' data-i18n="parr-u" class='sheet-skill-roller2'
+													value='@{whisper}&{template:singleroll} {{title=BRAWLING}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{brawling_total}[SKILL]-3[PARRY]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
 												PARRY
 											</button>
 											<br/>
@@ -684,8 +684,8 @@
 										<hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
 									</div>
 									<div>
-										<button type='roll' data-i18n="dodge-escap-u" class='sheet-skill-roller'
-												value='@{whisper}&{template:statistics2} {{title=DODGE/ESCAPE}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{dodge_escape_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
+										<button type='action' name='act_roll' data-i18n="dodge-escap-u" class='sheet-skill-roller'
+												value='@{whisper}&{template:singleroll} {{title=DODGE/ESCAPE}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{dodge_escape_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
 											DODGE/ESCAPE
 										</button>
 										<input name='attr_dodge_escape' title='@{dodge_escape}' class='sheet-skillbox' type='number' value='0'>
@@ -720,35 +720,35 @@
 											<label class='sheet-legend-skill' data-i18n="maximum-current">Maximum / Current</label><br/>
 										</div>
 										<div class='sheet-melee-options'>
-											<button type='roll' data-i18n="fast-strikes-u" class='sheet-skill-roller2'
-													value='@{whisper}&{template:statistics3} {{title=MELEE}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{melee_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]+0[FAST STRIKES]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}|Shield, 0}[WEAP. ACC]?{1ST ATTACK LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{1ST ATTACK MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}} {{roll2=[[1d10!+@{ref}[STAT]+@{melee_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]+0[FAST STRIKES]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}|Shield, 0}[WEAP. ACC]?{2ND ATTACK LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{2ND ATTACK MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
+											<button type='action' name='act_roll' data-i18n="fast-strikes-u" class='sheet-skill-roller2'
+													value='@{whisper}&{template:doubleroll} {{title=MELEE}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{melee_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]+0[FAST STRIKES]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}|Shield, 0}[WEAP. ACC]?{1ST ATTACK LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{1ST ATTACK MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}} {{roll2=[[1d10!+@{ref}[STAT]+@{melee_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]+0[FAST STRIKES]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}|Shield, 0}[WEAP. ACC]?{2ND ATTACK LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{2ND ATTACK MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
 												FAST STRIKES
 											</button>
-											<button type='roll' data-i18n="special-mov-u" class='sheet-skill-roller2'
-													value='@{whisper}&{template:statistics2} {{title=MELEE}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{melee_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]+0[SPECIAL]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}|Shield, 0}[WEAP. ACC]?{TARGET LOCATION|Random/None,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
+											<button type='action' name='act_roll' data-i18n="special-mov-u" class='sheet-skill-roller2'
+													value='@{whisper}&{template:singleroll} {{title=MELEE}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{melee_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]+0[SPECIAL]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}|Shield, 0}[WEAP. ACC]?{TARGET LOCATION|Random/None,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
 												SPECIAL MOVE
 											</button>
 											<br/>
-											<button type='roll' data-i18n="strong-strik-u" class='sheet-skill-roller2'
-													value='@{whisper}&{template:statistics2} {{title=MELEE}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{melee_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]-3[STRONG STRIKE]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}|Shield, 0}[WEAP. ACC]?{TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
+											<button type='action' name='act_roll' data-i18n="strong-strik-u" class='sheet-skill-roller2'
+													value='@{whisper}&{template:singleroll} {{title=MELEE}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{melee_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]-3[STRONG STRIKE]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}|Shield, 0}[WEAP. ACC]?{TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
 												STRONG STRIKE
 											</button>
-											<button type='roll' data-i18n="bloc-u" class='sheet-skill-roller2'
-													value='@{whisper}&{template:statistics2} {{title=MELEE}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{melee_total}[SKILL]+0[BLOCK]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
+											<button type='action' name='act_roll' data-i18n="bloc-u" class='sheet-skill-roller2'
+													value='@{whisper}&{template:singleroll} {{title=MELEE}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{melee_total}[SKILL]+0[BLOCK]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
 												BLOCK
 											</button>
 											<br/>
-											<button type='roll' data-i18n="charg-u" class='sheet-skill-roller2'
-													value='@{whisper}&{template:statistics2} {{title=MELEE}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{melee_total}[SKILL]-3[CHARGE]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}|Shield, 0}[WEAP. ACC]?{TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
+											<button type='action' name='act_roll' data-i18n="charg-u" class='sheet-skill-roller2'
+													value='@{whisper}&{template:singleroll} {{title=MELEE}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{melee_total}[SKILL]-3[CHARGE]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}|Shield, 0}[WEAP. ACC]?{TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
 												CHARGE
 											</button>
-											<button type='roll' data-i18n="parr-u" class='sheet-skill-roller2'
-													value='@{whisper}&{template:statistics2} {{title=MELEE}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{melee_total}[SKILL]-3[PARRY]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
+											<button type='action' name='act_roll' data-i18n="parr-u" class='sheet-skill-roller2'
+													value='@{whisper}&{template:singleroll} {{title=MELEE}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{melee_total}[SKILL]-3[PARRY]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
 												PARRY
 											</button>
 											<br/>
-											<button type='roll' data-i18n="joint-attac-u" class='sheet-skill-roller2'
-													value='@{whisper}&{template:statistics3} {{title=MELEE}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{melee_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]-3[JOINT]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}|Shield, 0}[WEAP. ACC]?{TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}{{roll2=[[1d10!+@{ref}[STAT]+@{melee_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]-3[JOINT]+?{SECOND WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}|Shield, 0}[WEAP. ACC]?{SECOND TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{SECOND ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
+											<button type='action' name='act_roll' data-i18n="joint-attac-u" class='sheet-skill-roller2'
+													value='@{whisper}&{template:doubleroll} {{title=MELEE}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{melee_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]-3[JOINT]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}|Shield, 0}[WEAP. ACC]?{TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}{{roll2=[[1d10!+@{ref}[STAT]+@{melee_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]-3[JOINT]+?{SECOND WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}|Shield, 0}[WEAP. ACC]?{SECOND TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{SECOND ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
 												JOINT ATTACK
 											</button>
 										</div>
@@ -766,8 +766,8 @@
 										<hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
 									</div>
 									<div>
-										<button type='roll' data-i18n="ridin-u" class='sheet-skill-roller'
-												value='@{whisper}&{template:statistics2} {{title=RIDING}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{riding_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
+										<button type='action' name='act_roll' data-i18n="ridin-u" class='sheet-skill-roller'
+												value='@{whisper}&{template:singleroll} {{title=RIDING}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{riding_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
 											RIDING
 										</button>
 										<input name='attr_riding' title='@{riding}' class='sheet-skillbox' type='number' value='0'>
@@ -790,8 +790,8 @@
 										<hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
 									</div>
 									<div>
-										<button type='roll' data-i18n="sailin-u" class='sheet-skill-roller'
-												value='@{whisper}&{template:statistics2} {{title=SAILING}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{sailing_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
+										<button type='action' name='act_roll' data-i18n="sailin-u" class='sheet-skill-roller'
+												value='@{whisper}&{template:singleroll} {{title=SAILING}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{sailing_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
 											SAILING
 										</button>
 										<input name='attr_sailing' title='@{sailing}' class='sheet-skillbox' type='number' value='0'>
@@ -826,35 +826,35 @@
 											<label class='sheet-legend-skill' data-i18n="maximum-current">Maximum / Current</label><br/>
 										</div>
 										<div class='sheet-small_blades-options'>
-											<button type='roll' data-i18n="fast-strikes-u" class='sheet-skill-roller2'
-													value='@{whisper}&{template:statistics3} {{title=SMALL BLADES}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{small_blades_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]+0[FAST STRIKES]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{1ST ATTACK LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{1ST ATTACK MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}} {{roll2=[[1d10!+@{ref}[STAT]+@{small_blades_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]+0[FAST STRIKES]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{2ND ATTACK LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{2ND ATTACK MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
+											<button type='action' name='act_roll' data-i18n="fast-strikes-u" class='sheet-skill-roller2'
+													value='@{whisper}&{template:doubleroll} {{title=SMALL BLADES}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{small_blades_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]+0[FAST STRIKES]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{1ST ATTACK LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{1ST ATTACK MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}} {{roll2=[[1d10!+@{ref}[STAT]+@{small_blades_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]+0[FAST STRIKES]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{2ND ATTACK LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{2ND ATTACK MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
 												FAST STRIKES
 											</button>
-											<button type='roll' data-i18n="special-mov-u" class='sheet-skill-roller2'
-													value='@{whisper}&{template:statistics2} {{title=SMALL BLADES}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{small_blades_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]+0[SPECIAL]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{TARGET LOCATION|Random/None,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
+											<button type='action' name='act_roll' data-i18n="special-mov-u" class='sheet-skill-roller2'
+													value='@{whisper}&{template:singleroll} {{title=SMALL BLADES}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{small_blades_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]+0[SPECIAL]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{TARGET LOCATION|Random/None,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
 												SPECIAL MOVE
 											</button>
 											<br/>
-											<button type='roll' data-i18n="strong-strik-u" class='sheet-skill-roller2'
-													value='@{whisper}&{template:statistics2} {{title=SMALL BLADES}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{small_blades_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]-3[STRONG STRIKE]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
+											<button type='action' name='act_roll' data-i18n="strong-strik-u" class='sheet-skill-roller2'
+													value='@{whisper}&{template:singleroll} {{title=SMALL BLADES}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{small_blades_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]-3[STRONG STRIKE]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
 												STRONG STRIKE
 											</button>
-											<button type='roll' data-i18n="bloc-u" class='sheet-skill-roller2'
-													value='@{whisper}&{template:statistics2} {{title=SMALL BLADES}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{small_blades_total}[SKILL]+0[BLOCK]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
+											<button type='action' name='act_roll' data-i18n="bloc-u" class='sheet-skill-roller2'
+													value='@{whisper}&{template:singleroll} {{title=SMALL BLADES}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{small_blades_total}[SKILL]+0[BLOCK]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
 												BLOCK
 											</button>
 											<br/>
-											<button type='roll' data-i18n="charg-u" class='sheet-skill-roller2'
-													value='@{whisper}&{template:statistics2} {{title=SMALL BLADES}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{small_blades_total}[SKILL]-3[CHARGE]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
+											<button type='action' name='act_roll' data-i18n="charg-u" class='sheet-skill-roller2'
+													value='@{whisper}&{template:singleroll} {{title=SMALL BLADES}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{small_blades_total}[SKILL]-3[CHARGE]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
 												CHARGE
 											</button>
-											<button type='roll' data-i18n="parr-u" class='sheet-skill-roller2'
-													value='@{whisper}&{template:statistics2} {{title=SMALL BLADES}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{small_blades_total}[SKILL]-3[PARRY]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
+											<button type='action' name='act_roll' data-i18n="parr-u" class='sheet-skill-roller2'
+													value='@{whisper}&{template:singleroll} {{title=SMALL BLADES}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{small_blades_total}[SKILL]-3[PARRY]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
 												PARRY
 											</button>
 											<br/>
-											<button data-i18n="joint-attac-u" type='roll' class='sheet-skill-roller2'
-													value='@{whisper}&{template:statistics3} {{title=SMALL BLADES}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{small_blades_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]-3[JOINT]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}{{roll2=[[1d10!+@{ref}[STAT]+@{small_blades_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]-3[JOINT]+?{SECOND WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{SECOND TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{SECOND ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
+											<button data-i18n="joint-attac-u" type='action' name='act_roll' class='sheet-skill-roller2'
+													value='@{whisper}&{template:doubleroll} {{title=SMALL BLADES}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{small_blades_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]-3[JOINT]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}{{roll2=[[1d10!+@{ref}[STAT]+@{small_blades_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]-3[JOINT]+?{SECOND WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{SECOND TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{SECOND ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
 												JOINT ATTACK
 											</button>
 										</div>
@@ -884,30 +884,30 @@
 											<label class='sheet-legend-skill' data-i18n="maximum-current">Maximum / Current</label><br/>
 										</div>
 										<div class='sheet-staff_spear-options'>
-											<button type='roll' data-i18n="fast-strikes-u" class='sheet-skill-roller2'
-													value='@{whisper}&{template:statistics3} {{title=STAFF/SPEAR}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{staff_spear_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]+0[FAST STRIKE]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{1ST ATTACK LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{1ST ATTACK MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}} {{roll2=[[1d10!+@{ref}[STAT]+@{staff_spear_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]+0[FAST STRIKES]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{2ND ATTACK LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{2ND ATTACK MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
+											<button type='action' name='act_roll' data-i18n="fast-strikes-u" class='sheet-skill-roller2'
+													value='@{whisper}&{template:doubleroll} {{title=STAFF/SPEAR}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{staff_spear_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]+0[FAST STRIKE]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{1ST ATTACK LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{1ST ATTACK MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}} {{roll2=[[1d10!+@{ref}[STAT]+@{staff_spear_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]+0[FAST STRIKES]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{2ND ATTACK LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{2ND ATTACK MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
 												FAST STRIKES
 											</button>
-											<button type='roll' data-i18n="special-mov-u" class='sheet-skill-roller2'
-													value='@{whisper}&{template:statistics2} {{title=STAFF/SPEAR}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{staff_spear_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]+0[SPECIAL]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{TARGET LOCATION|Random/None,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
+											<button type='action' name='act_roll' data-i18n="special-mov-u" class='sheet-skill-roller2'
+													value='@{whisper}&{template:singleroll} {{title=STAFF/SPEAR}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{staff_spear_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]+0[SPECIAL]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{TARGET LOCATION|Random/None,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
 												SPECIAL MOVE
 											</button>
 											<br/>
-											<button type='roll' data-i18n="strong-strik-u" class='sheet-skill-roller2'
-													value='@{whisper}&{template:statistics2} {{title=STAFF/SPEAR}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{staff_spear_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]-3[STRONG STRIKE]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
+											<button type='action' name='act_roll' data-i18n="strong-strik-u" class='sheet-skill-roller2'
+													value='@{whisper}&{template:singleroll} {{title=STAFF/SPEAR}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{staff_spear_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]-3[STRONG STRIKE]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
 												STRONG STRIKE
 											</button>
-											<button type='roll' data-i18n="bloc-u" class='sheet-skill-roller2'
-													value='@{whisper}&{template:statistics2} {{title=STAFF/SPEAR}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{staff_spear_total}[SKILL]+0[BLOCK]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
+											<button type='action' name='act_roll' data-i18n="bloc-u" class='sheet-skill-roller2'
+													value='@{whisper}&{template:singleroll} {{title=STAFF/SPEAR}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{staff_spear_total}[SKILL]+0[BLOCK]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
 												BLOCK
 											</button>
 											<br/>
-											<button type='roll' data-i18n="charg-u" class='sheet-skill-roller2'
-													value='@{whisper}&{template:statistics2} {{title=STAFF/SPEAR}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{staff_spear_total}[SKILL]-3[CHARGE]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
+											<button type='action' name='act_roll' data-i18n="charg-u" class='sheet-skill-roller2'
+													value='@{whisper}&{template:singleroll} {{title=STAFF/SPEAR}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{staff_spear_total}[SKILL]-3[CHARGE]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
 												CHARGE
 											</button>
-											<button type='roll' data-i18n="parr-u" class='sheet-skill-roller2'
-													value='@{whisper}&{template:statistics2} {{title=STAFF/SPEAR}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{staff_spear_total}[SKILL]-3[PARRY]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
+											<button type='action' name='act_roll' data-i18n="parr-u" class='sheet-skill-roller2'
+													value='@{whisper}&{template:singleroll} {{title=STAFF/SPEAR}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{staff_spear_total}[SKILL]-3[PARRY]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
 												PARRY
 											</button>
 											<br/>
@@ -938,35 +938,35 @@
 											<label class='sheet-legend-skill' data-i18n="maximum-current">Maximum / Current</label><br/>
 										</div>
 										<div class='sheet-swordsmanship-options'>
-											<button type='roll' data-i18n="fast-strikes-u" class='sheet-skill-roller2'
-													value='@{whisper}&{template:statistics3} {{title=SWORDSMANSHIP}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{swordsmanship_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]+0[FAST STRIKES]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{1ST ATTACK LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{1ST ATTACK MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}} {{roll2=[[1d10!+@{ref}[STAT]+@{swordsmanship_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]+0[FAST STRIKES]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{2ND ATTACK LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{2ND ATTACK MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
+											<button type='action' name='act_roll' data-i18n="fast-strikes-u" class='sheet-skill-roller2'
+													value='@{whisper}&{template:doubleroll} {{title=SWORDSMANSHIP}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{swordsmanship_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]+0[FAST STRIKES]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{1ST ATTACK LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{1ST ATTACK MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}} {{roll2=[[1d10!+@{ref}[STAT]+@{swordsmanship_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]+0[FAST STRIKES]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{2ND ATTACK LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{2ND ATTACK MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
 												FAST STRIKES
 											</button>
-											<button type='roll' data-i18n="special-mov-u" class='sheet-skill-roller2'
-													value='@{whisper}&{template:statistics2} {{title=SWORDSMANSHIP}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{swordsmanship_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]+0[SPECIAL]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{TARGET LOCATION|Random/None,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
+											<button type='action' name='act_roll' data-i18n="special-mov-u" class='sheet-skill-roller2'
+													value='@{whisper}&{template:singleroll} {{title=SWORDSMANSHIP}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{swordsmanship_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]+0[SPECIAL]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{TARGET LOCATION|Random/None,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
 												SPECIAL MOVE
 											</button>
 											<br/>
-											<button type='roll' data-i18n="strong-strik-u" class='sheet-skill-roller2'
-													value='@{whisper}&{template:statistics2} {{title=SWORDSMANSHIP}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{swordsmanship_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]-3[STRONG STRIKE]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
+											<button type='action' name='act_roll' data-i18n="strong-strik-u" class='sheet-skill-roller2'
+													value='@{whisper}&{template:singleroll} {{title=SWORDSMANSHIP}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{swordsmanship_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]-3[STRONG STRIKE]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
 												STRONG STRIKE
 											</button>
-											<button type='roll' data-i18n="bloc-u" class='sheet-skill-roller2'
-													value='@{whisper}&{template:statistics2} {{title=SWORDSMANSHIP}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{swordsmanship_total}[SKILL]+0[BLOCK]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
+											<button type='action' name='act_roll' data-i18n="bloc-u" class='sheet-skill-roller2'
+													value='@{whisper}&{template:singleroll} {{title=SWORDSMANSHIP}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{swordsmanship_total}[SKILL]+0[BLOCK]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
 												BLOCK
 											</button>
 											<br/>
-											<button type='roll' data-i18n="charg-u" class='sheet-skill-roller2'
-													value='@{whisper}&{template:statistics2} {{title=SWORDSMANSHIP}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{swordsmanship_total}[SKILL]-3[CHARGE]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
+											<button type='action' name='act_roll' data-i18n="charg-u" class='sheet-skill-roller2'
+													value='@{whisper}&{template:singleroll} {{title=SWORDSMANSHIP}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{swordsmanship_total}[SKILL]-3[CHARGE]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
 												CHARGE
 											</button>
-											<button type='roll' data-i18n="parr-u" class='sheet-skill-roller2'
-													value='@{whisper}&{template:statistics2} {{title=SWORDSMANSHIP}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{swordsmanship_total}[SKILL]-3[PARRY]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
+											<button type='action' name='act_roll' data-i18n="parr-u" class='sheet-skill-roller2'
+													value='@{whisper}&{template:singleroll} {{title=SWORDSMANSHIP}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{swordsmanship_total}[SKILL]-3[PARRY]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
 												PARRY
 											</button>
 											<br/>
-											<button type='roll' data-i18n="joint-attac-u" class='sheet-skill-roller2'
-													value='@{whisper}&{template:statistics3} {{title=SWORDSMANSHIP}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{swordsmanship_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]-3[JOINT]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}{{roll2=[[1d10!+@{ref}[STAT]+@{swordsmanship_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]-3[JOINT]+?{SECOND WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{SECOND ATTACK LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{SECOND ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
+											<button type='action' name='act_roll' data-i18n="joint-attac-u" class='sheet-skill-roller2'
+													value='@{whisper}&{template:doubleroll} {{title=SWORDSMANSHIP}} {{name=@{character_name}}} {{roll=[[1d10!+@{ref}[STAT]+@{swordsmanship_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]-3[JOINT]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}{{roll2=[[1d10!+@{ref}[STAT]+@{swordsmanship_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]-3[JOINT]+?{SECOND WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{SECOND ATTACK LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{SECOND ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
 												JOINT ATTACk
 											</button>
 										</div>
@@ -1001,12 +1001,12 @@
 											<label class='sheet-legend-skill' data-i18n="maximum-current">Maximum / Current</label><br/>
 										</div>
 										<div class='sheet-archery-options'>
-											<button type='roll' data-i18n="single-strik-u" class='sheet-skill-roller2'
-													value='@{whisper}&{template:statistics2} {{title=ARCHERY}} {{name=@{character_name}}} {{roll=[[1d10!+@{dex}[STAT]+@{archery_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]+0[SINGLE STRIKE]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{FIRING RANGE|Point Blank (Touch Range),+5|Close (1/4 Listed Range),+0|Medium (1/2 Listed Range),-2|Long (Listed Range),-4|Extreme (2x Listed Range),-6}[RANGE]?{TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
+											<button type='action' name='act_roll' data-i18n="single-strik-u" class='sheet-skill-roller2'
+													value='@{whisper}&{template:singleroll} {{title=ARCHERY}} {{name=@{character_name}}} {{roll=[[1d10!+@{dex}[STAT]+@{archery_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]+0[SINGLE STRIKE]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{FIRING RANGE|Point Blank (Touch Range),+5|Close (1/4 Listed Range),+0|Medium (1/2 Listed Range),-2|Long (Listed Range),-4|Extreme (2x Listed Range),-6}[RANGE]?{TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
 												SINGLE STRIKE
 											</button>
-											<button type='roll' data-i18n="strong-strik-u" class='sheet-skill-roller2'
-													value='@{whisper}&{template:statistics2} {{title=ARCHERY}} {{name=@{character_name}}} {{roll=[[1d10!+@{dex}[STAT]+@{archery_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]-3[STRONG STRIKE]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{FIRING RANGE|Point Blank (Touch Range),+5|Close (1/4 Listed Range),+0|Medium (1/2 Listed Range),-2|Long (Listed Range),-4|Extreme (2x Listed Range),-6}[RANGE]?{TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
+											<button type='action' name='act_roll' data-i18n="strong-strik-u" class='sheet-skill-roller2'
+													value='@{whisper}&{template:singleroll} {{title=ARCHERY}} {{name=@{character_name}}} {{roll=[[1d10!+@{dex}[STAT]+@{archery_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]-3[STRONG STRIKE]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{FIRING RANGE|Point Blank (Touch Range),+5|Close (1/4 Listed Range),+0|Medium (1/2 Listed Range),-2|Long (Listed Range),-4|Extreme (2x Listed Range),-6}[RANGE]?{TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
 												STRONG STRIKE
 											</button>
 										</div>
@@ -1036,21 +1036,21 @@
 											<label class='sheet-legend-skill' data-i18n="maximum-current">Maximum / Current</label><br/>
 										</div>
 										<div class='sheet-athletics-options'>
-											<button type='roll' data-i18n="basic-rol-u" class='sheet-skill-roller2'
-													value='@{whisper}&{template:statistics2} {{title=ATHLETICS}} {{name=@{character_name}}} {{roll=[[1d10!+@{dex}[STAT]+@{athletics_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
+											<button type='action' name='act_roll' data-i18n="basic-rol-u" class='sheet-skill-roller2'
+													value='@{whisper}&{template:singleroll} {{title=ATHLETICS}} {{name=@{character_name}}} {{roll=[[1d10!+@{dex}[STAT]+@{athletics_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
 												BASIC ROLL
 											</button>
-											<button type='roll' data-i18n="joint-attac-u" class='sheet-skill-roller2'
-													value='@{whisper}&{template:statistics3} {{title=ATHLETICS}} {{name=@{character_name}}} {{roll=[[1d10!+@{dex}[STAT]+@{athletics_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]-3[JOINT]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{FIRING RANGE|Point Blank (Touch Range),+5|Close (1/4 Listed Range),+0|Medium (1/2 Listed Range),-2|Long (Listed Range),-4|Extreme (2x Listed Range),-6}[RANGE]?{TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}} {{roll2=[[1d10!+@{dex}[STAT]+@{athletics_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]-3[JOINT]+?{SECOND WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{SECOND FIRING RANGE|Point Blank (Touch Range),+5|Close (1/4 Listed Range),+0|Medium (1/2 Listed Range),-2|Long (Listed Range),-4|Extreme (2x Listed Range),-6}[RANGE]?{TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{SECOND ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
+											<button type='action' name='act_roll' data-i18n="joint-attac-u" class='sheet-skill-roller2'
+													value='@{whisper}&{template:doubleroll} {{title=ATHLETICS}} {{name=@{character_name}}} {{roll=[[1d10!+@{dex}[STAT]+@{athletics_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]-3[JOINT]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{FIRING RANGE|Point Blank (Touch Range),+5|Close (1/4 Listed Range),+0|Medium (1/2 Listed Range),-2|Long (Listed Range),-4|Extreme (2x Listed Range),-6}[RANGE]?{TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}} {{roll2=[[1d10!+@{dex}[STAT]+@{athletics_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]-3[JOINT]+?{SECOND WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{SECOND FIRING RANGE|Point Blank (Touch Range),+5|Close (1/4 Listed Range),+0|Medium (1/2 Listed Range),-2|Long (Listed Range),-4|Extreme (2x Listed Range),-6}[RANGE]?{TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{SECOND ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
 												JOINT ATTACK
 											</button>
 											<br/>
-											<button type='roll' data-i18n="single-strik-u" class='sheet-skill-roller2'
-													value='@{whisper}&{template:statistics2} {{title=ATHLETICS}} {{name=@{character_name}}} {{roll=[[1d10!+@{dex}[STAT]+@{athletics_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]+0[FAST STRIKE]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{FIRING RANGE|Point Blank (Touch Range),+5|Close (1/4 Listed Range),+0|Medium (1/2 Listed Range),-2|Long (Listed Range),-4|Extreme (2x Listed Range),-6}[RANGE]?{TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
+											<button type='action' name='act_roll' data-i18n="single-strik-u" class='sheet-skill-roller2'
+													value='@{whisper}&{template:singleroll} {{title=ATHLETICS}} {{name=@{character_name}}} {{roll=[[1d10!+@{dex}[STAT]+@{athletics_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]+0[FAST STRIKE]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{FIRING RANGE|Point Blank (Touch Range),+5|Close (1/4 Listed Range),+0|Medium (1/2 Listed Range),-2|Long (Listed Range),-4|Extreme (2x Listed Range),-6}[RANGE]?{TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
 												SINGLE STRIKE
 											</button>
-											<button type='roll' data-i18n="repositio-u" class='sheet-skill-roller2'
-													value='@{whisper}&{template:statistics2} {{title=ATHLETICS}} {{name=@{character_name}}} {{roll=[[1d10!+@{dex}[STAT]+@{athletics_total}[SKILL]+0[REPOSITION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
+											<button type='action' name='act_roll' data-i18n="repositio-u" class='sheet-skill-roller2'
+													value='@{whisper}&{template:singleroll} {{title=ATHLETICS}} {{name=@{character_name}}} {{roll=[[1d10!+@{dex}[STAT]+@{athletics_total}[SKILL]+0[REPOSITION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
 												REPOSITION
 											</button>
 											<br/>
@@ -1080,9 +1080,9 @@
 											<label class='sheet-legend-skill' data-i18n="maximum-current">Maximum / Current</label><br />
 										</div>
 										<div class='sheet-crossbow-options'>
-											<button type='roll' data-i18n="basic-rol-u" class='sheet-skill-roller2' value= '@{whisper}&{template:statistics2} {{title=CROSSBOWS}} {{name=@{character_name}}} {{roll=[[1d10!+@{dex}[STAT]+@{crossbow_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>BASIC ROLL</button>
-											<button type='roll' data-i18n="single-strik-u" class='sheet-skill-roller2' value= '@{whisper}&{template:statistics2} {{title=CROSSBOWS}} {{name=@{character_name}}} {{roll=[[1d10!+@{dex}[STAT]+@{crossbow_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]+0[FAST STRIKE]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{FIRING RANGE|Point Blank (Touch Range),+5|Close (1/4 Listed Range),+0|Medium (1/2 Listed Range),-2|Long (Listed Range),-4|Extreme (2x Listed Range),-6}[RANGE]?{TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>SINGLE STRIKE</button>
-											<button type='roll' data-i18n="joint-attac-u" class='sheet-skill-roller2' value= '@{whisper}&{template:statistics3} {{title=CROSSBOWS}} {{name=@{character_name}}} {{roll=[[1d10!+@{dex}[STAT]+@{crossbow_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]-3[JOINT]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{FIRING RANGE|Point Blank (Touch Range),+5|Close (1/4 Listed Range),+0|Medium (1/2 Listed Range),-2|Long (Listed Range),-4|Extreme (2x Listed Range),-6}[RANGE]?{TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}} {{roll2=[[1d10!+@{dex}[STAT]+@{crossbow_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]-3[JOINT]+?{SECOND WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{FIRING RANGE|Point Blank (Touch Range),+5|Close (1/4 Listed Range),+0|Medium (1/2 Listed Range),-2|Long (Listed Range),-4|Extreme (2x Listed Range),-6}[RANGE]?{SECOND TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{SECOND ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>JOINT ATTACK</button><br />
+											<button type='action' name='act_roll' data-i18n="basic-rol-u" class='sheet-skill-roller2' value= '@{whisper}&{template:singleroll} {{title=CROSSBOWS}} {{name=@{character_name}}} {{roll=[[1d10!+@{dex}[STAT]+@{crossbow_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>BASIC ROLL</button>
+											<button type='action' name='act_roll' data-i18n="single-strik-u" class='sheet-skill-roller2' value= '@{whisper}&{template:singleroll} {{title=CROSSBOWS}} {{name=@{character_name}}} {{roll=[[1d10!+@{dex}[STAT]+@{crossbow_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]+0[FAST STRIKE]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{FIRING RANGE|Point Blank (Touch Range),+5|Close (1/4 Listed Range),+0|Medium (1/2 Listed Range),-2|Long (Listed Range),-4|Extreme (2x Listed Range),-6}[RANGE]?{TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>SINGLE STRIKE</button>
+											<button type='action' name='act_roll' data-i18n="joint-attac-u" class='sheet-skill-roller2' value= '@{whisper}&{template:doubleroll} {{title=CROSSBOWS}} {{name=@{character_name}}} {{roll=[[1d10!+@{dex}[STAT]+@{crossbow_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]-3[JOINT]+?{WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{FIRING RANGE|Point Blank (Touch Range),+5|Close (1/4 Listed Range),+0|Medium (1/2 Listed Range),-2|Long (Listed Range),-4|Extreme (2x Listed Range),-6}[RANGE]?{TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}} {{roll2=[[1d10!+@{dex}[STAT]+@{crossbow_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]-3[JOINT]+?{SECOND WEAPON SELECTION|@{primary_weapon_name},@{primary_wa}|@{secondary_weapon_name},@{secondary_wa}|@{third_weapon_name},@{third_wa}|@{fourth_weapon_name},@{fourth_wa}|@{fifth_weapon_name},@{fifth_wa}|@{sixth_weapon_name},@{sixth_wa}}[WEAP. ACC]?{FIRING RANGE|Point Blank (Touch Range),+5|Close (1/4 Listed Range),+0|Medium (1/2 Listed Range),-2|Long (Listed Range),-4|Extreme (2x Listed Range),-6}[RANGE]?{SECOND TARGET LOCATION|Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{SECOND ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>JOINT ATTACK</button><br />
 										</div><br>
 										<div class='crossbow-container'>
 											<fieldset class="repeating_crossbow">
@@ -1096,8 +1096,8 @@
 										<hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
 									</div>
 									<div>
-										<button type='roll' data-i18n="sleight-of-han-u" class='sheet-skill-roller'
-												value='@{whisper}&{template:statistics2} {{title=SLEIGHT OF HAND}} {{name=@{character_name}}} {{roll=[[1d10!+@{dex}[STAT]+@{sleight_of_hand_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
+										<button type='action' name='act_roll' data-i18n="sleight-of-han-u" class='sheet-skill-roller'
+												value='@{whisper}&{template:singleroll} {{title=SLEIGHT OF HAND}} {{name=@{character_name}}} {{roll=[[1d10!+@{dex}[STAT]+@{sleight_of_hand_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
 											SLEIGHT OF HAND
 										</button>
 										<input name='attr_sleight_of_hand' title='@{sleight_of_hand}' class='sheet-skillbox' type='number' value='0'>
@@ -1120,8 +1120,8 @@
 										<hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
 									</div>
 									<div>
-										<button type='roll' data-i18n="stealt-u" class='sheet-skill-roller'
-												value='@{whisper}&{template:statistics2} {{title=STEALTH}} {{name=@{character_name}}} {{roll=[[1d10!+@{dex}[STAT]+@{stealth_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
+										<button type='action' name='act_roll' data-i18n="stealt-u" class='sheet-skill-roller'
+												value='@{whisper}&{template:singleroll} {{title=STEALTH}} {{name=@{character_name}}} {{roll=[[1d10!+@{dex}[STAT]+@{stealth_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
 											STEALTH
 										</button>
 										<input name='attr_stealth' title='@{stealth}' class='sheet-skillbox' type='number' value='0'>
@@ -1153,8 +1153,8 @@
         						<label class='sheet-skilltitle-body' data-i18n="body-u" >BODY</label><input type="checkbox" name='attr_body_toggle' class="sheet-body-toggle"><span></span>
         						<div class='sheet-body-container'>
 									<div>
-										<button type='roll' data-i18n="physiqu-u" class='sheet-skill-roller'
-												value='@{whisper}&{template:statistics2} {{title=PHYSIQUE}} {{name=@{character_name}}} {{roll=[[1d10!+@{body}[STAT]+@{physique_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
+										<button type='action' name='act_roll' data-i18n="physiqu-u" class='sheet-skill-roller'
+												value='@{whisper}&{template:singleroll} {{title=PHYSIQUE}} {{name=@{character_name}}} {{roll=[[1d10!+@{body}[STAT]+@{physique_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
 											PHYSIQUE
 										</button>
 										<input name='attr_physique' title='@{physique}' class='sheet-skillbox' type='number' value='0'>
@@ -1177,8 +1177,8 @@
 										<hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
 									</div>
 									<div>
-										<button type='roll' data-i18n="enduranc-u" class='sheet-skill-roller'
-												value='@{whisper}&{template:statistics2} {{title=ENDURANCE}} {{name=@{character_name}}} {{roll=[[1d10!+@{body}[STAT]+@{endurance_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
+										<button type='action' name='act_roll' data-i18n="enduranc-u" class='sheet-skill-roller'
+												value='@{whisper}&{template:singleroll} {{title=ENDURANCE}} {{name=@{character_name}}} {{roll=[[1d10!+@{body}[STAT]+@{endurance_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
 											ENDURANCE
 										</button>
 										<input name='attr_endurance' title='@{endurance}' class='sheet-skillbox' type='number' value='0'>
@@ -1206,8 +1206,8 @@
         						<label class='sheet-skilltitle-emp' data-i18n="empath-u" >EMPATHY</label><input type="checkbox" name='attr_emp_toggle' class="sheet-emp-toggle"><span></span>
         						<div class='sheet-emp-container'>
 									<div>
-										<button type='roll' data-i18n="charism-u" class='sheet-skill-roller'
-												value='@{whisper}&{template:statistics2} {{title=CHARISMA}} {{name=@{character_name}}} {{roll=[[1d10!+@{emp}[STAT]+@{charisma_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
+										<button type='action' name='act_roll' data-i18n="charism-u" class='sheet-skill-roller'
+												value='@{whisper}&{template:singleroll} {{title=CHARISMA}} {{name=@{character_name}}} {{roll=[[1d10!+@{emp}[STAT]+@{charisma_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
 											CHARISMA
 										</button>
 										<input name='attr_charisma' title='@{charisma}' class='sheet-skillbox' type='number' value='0'>
@@ -1230,8 +1230,8 @@
 										<hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
 									</div>
 									<div>
-										<button type='roll' data-i18n="decei-u" class='sheet-skill-roller'
-												value='@{whisper}&{template:statistics2} {{title=DECEIT}} {{name=@{character_name}}} {{roll=[[1d10!+@{emp}[STAT]+@{deceit_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
+										<button type='action' name='act_roll' data-i18n="decei-u" class='sheet-skill-roller'
+												value='@{whisper}&{template:singleroll} {{title=DECEIT}} {{name=@{character_name}}} {{roll=[[1d10!+@{emp}[STAT]+@{deceit_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
 											DECEIT
 										</button>
 										<input name='attr_deceit' title='@{deceit}' class='sheet-skillbox' type='number' value='0'>
@@ -1254,8 +1254,8 @@
 										<hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
 									</div>
 									<div>
-										<button type='roll' data-i18n="gamblin-u" class='sheet-skill-roller'
-												value='@{whisper}&{template:statistics2} {{title=GAMBLING}} {{name=@{character_name}}} {{roll=[[1d10!+@{emp}[STAT]+@{gambling_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
+										<button type='action' name='act_roll' data-i18n="gamblin-u" class='sheet-skill-roller'
+												value='@{whisper}&{template:singleroll} {{title=GAMBLING}} {{name=@{character_name}}} {{roll=[[1d10!+@{emp}[STAT]+@{gambling_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
 											GAMBLING
 										</button>
 										<input name='attr_gambling' title='@{gambling}' class='sheet-skillbox' type='number' value='0'>
@@ -1278,8 +1278,8 @@
 										<hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
 									</div>
 									<div>
-										<button type='roll' data-i18n="grooming-style-u" class='sheet-skill-roller'
-												value='@{whisper}&{template:statistics2} {{title=GROOMING & STYLE}} {{name=@{character_name}}} {{roll=[[1d10!+@{emp}[STAT]+@{grooming_and_style_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
+										<button type='action' name='act_roll' data-i18n="grooming-style-u" class='sheet-skill-roller'
+												value='@{whisper}&{template:singleroll} {{title=GROOMING & STYLE}} {{name=@{character_name}}} {{roll=[[1d10!+@{emp}[STAT]+@{grooming_and_style_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
 											GROOMING & STYLE
 										</button>
 										<input name='attr_grooming_and_style' title='@{grooming_and_style}' class='sheet-skillbox' type='number' value='0'>
@@ -1302,8 +1302,8 @@
 										<hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
 									</div>
 									<div>
-										<button type='roll' data-i18n="human-perceptio-u" class='sheet-skill-roller'
-												value='@{whisper}&{template:statistics2} {{title=HUMAN PERCEPTION}} {{name=@{character_name}}} {{roll=[[1d10!+@{emp}[STAT]+@{human_perception_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
+										<button type='action' name='act_roll' data-i18n="human-perceptio-u" class='sheet-skill-roller'
+												value='@{whisper}&{template:singleroll} {{title=HUMAN PERCEPTION}} {{name=@{character_name}}} {{roll=[[1d10!+@{emp}[STAT]+@{human_perception_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
 											HUMAN PERCEPTION
 										</button>
 										<input name='attr_human_perception' title='@{human_perception}' class='sheet-skillbox' type='number' value='0'>
@@ -1326,8 +1326,8 @@
 										<hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
 									</div>
 									<div>
-										<button type='roll' data-i18n="leadershi-u" class='sheet-skill-roller'
-												value='@{whisper}&{template:statistics2} {{title=LEADERSHIP}} {{name=@{character_name}}} {{roll=[[1d10!+@{emp}[STAT]+@{leadership_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
+										<button type='action' name='act_roll' data-i18n="leadershi-u" class='sheet-skill-roller'
+												value='@{whisper}&{template:singleroll} {{title=LEADERSHIP}} {{name=@{character_name}}} {{roll=[[1d10!+@{emp}[STAT]+@{leadership_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
 											LEADERSHIP
 										</button>
 										<input name='attr_leadership' title='@{leadership}' class='sheet-skillbox' type='number' value='0'>
@@ -1350,8 +1350,8 @@
 										<hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
 									</div>
 									<div>
-										<button type='roll' data-i18n="persuasio-u" class='sheet-skill-roller'
-												value='@{whisper}&{template:statistics2} {{title=PERSUASION}} {{name=@{character_name}}} {{roll=[[1d10!+@{emp}[STAT]+@{persuasion_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
+										<button type='action' name='act_roll' data-i18n="persuasio-u" class='sheet-skill-roller'
+												value='@{whisper}&{template:singleroll} {{title=PERSUASION}} {{name=@{character_name}}} {{roll=[[1d10!+@{emp}[STAT]+@{persuasion_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
 											PERSUASION
 										</button>
 										<input name='attr_persuasion' title='@{persuasion}' class='sheet-skillbox' type='number' value='0'>
@@ -1374,8 +1374,8 @@
 										<hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
 									</div>
 									<div>
-										<button type='roll' data-i18n="seductio-u" class='sheet-skill-roller'
-												value='@{whisper}&{template:statistics2} {{title=SEDUCTION}} {{name=@{character_name}}} {{roll=[[1d10!+@{emp}[STAT]+@{seduction_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
+										<button type='action' name='act_roll' data-i18n="seductio-u" class='sheet-skill-roller'
+												value='@{whisper}&{template:singleroll} {{title=SEDUCTION}} {{name=@{character_name}}} {{roll=[[1d10!+@{emp}[STAT]+@{seduction_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
 											SEDUCTION
 										</button>
 										<input name='attr_seduction' title='@{seduction}' class='sheet-skillbox' type='number' value='0'>
@@ -1398,8 +1398,8 @@
 										<hr style='border: 0.5px solid #5e0000; width: 180px; margin: 3px 0px 3px 70px;'>
 									</div>
 									<div class='sheet-expanding-emp-choices'>
-										<button type='roll' data-i18n="fine-art-u" class='sheet-skill-roller-emp'
-												value='@{whisper}&{template:statistics2} {{title=FINE ARTS: @{fa_name}}} {{name=@{character_name}}} {{roll=[[1d10!+@{emp}[STAT]+@{fine_arts}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
+										<button type='action' name='act_roll' data-i18n="fine-art-u" class='sheet-skill-roller-emp'
+												value='@{whisper}&{template:singleroll} {{title=FINE ARTS: @{fa_name}}} {{name=@{character_name}}} {{roll=[[1d10!+@{emp}[STAT]+@{fine_arts}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
 											FINE ARTS:
 										</button>
 										<input name='attr_fa_name' type='text' class='sheet-extraskill' placeholder='Type...'>
@@ -1407,8 +1407,8 @@
 										<input type="checkbox" checked name='attr_finearts_unlock' class="sheet-finearts-plus"><span></span>
 										<div class='finearts-container'>
 											<fieldset class="repeating_finearts">
-												<button type='roll' data-i18n="fine-art-u" class='repeating_skill_roller_emp'
-														value='@{whisper}&{template:statistics2} {{title=FINE ARTS: @{fa_name2}}} {{name=@{character_name}}} {{roll=[[1d10!+@{emp}[STAT]+@{fine_arts2}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
+												<button type='action' name='act_roll' data-i18n="fine-art-u" class='repeating_skill_roller_emp'
+														value='@{whisper}&{template:singleroll} {{title=FINE ARTS: @{prefix-fa_name2}}} {{name=@{character_name}}} {{roll=[[1d10!+@{emp}[STAT]+@{prefix-fine_arts2}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
 													FINE ARTS:
 												</button>
 												<input name='attr_fa_name2' type='text' class='repeating_extraskill' placeholder='Type...'>
@@ -1418,8 +1418,8 @@
 											<hr style='border: 0.5px; margin: 0px 0px -13px 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
 										</div>
 										<hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
-										<button type='roll' data-i18n="performanc-u" class='sheet-skill-roller-emp'
-												value='@{whisper}&{template:statistics2} {{title=PERFORMANCE: @{p_name}}} {{name=@{character_name}}} {{roll=[[1d10!+@{emp}[STAT]+@{performance}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
+										<button type='action' name='act_roll' data-i18n="performanc-u" class='sheet-skill-roller-emp'
+												value='@{whisper}&{template:singleroll} {{title=PERFORMANCE: @{p_name}}} {{name=@{character_name}}} {{roll=[[1d10!+@{emp}[STAT]+@{performance}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
 											PERFORMANCE:
 										</button>
 										<input name='attr_p_name' type='text' class='sheet-extraskill' placeholder='Type...'>
@@ -1427,8 +1427,8 @@
 										<input type="checkbox" checked name='attr_performance_plus' class="sheet-performance-plus"><span></span>
 										<div class='performance-container'>
 											<fieldset class="repeating_performance">
-												<button type='roll' data-i18n="performanc-u" class='repeating_skill_roller_emp'
-														value='@{whisper}&{template:statistics2} {{title=PERFORMANCE: @{p_name2}}} {{name=@{character_name}}} {{roll=[[1d10!+@{emp}[STAT]+@{performance2}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
+												<button type='action' name='act_roll' data-i18n="performanc-u" class='repeating_skill_roller_emp'
+														value='@{whisper}&{template:singleroll} {{title=PERFORMANCE: @{p_name2}}} {{name=@{character_name}}} {{roll=[[1d10!+@{emp}[STAT]+@{performance2}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
 													PERFORMANCE:
 												</button>
 												<input name='attr_p_name2' type='text' class='repeating_extraskill' placeholder='Type...'>
@@ -1444,8 +1444,8 @@
         						<label class='sheet-skilltitle-cra' data-i18n="craf-u" >CRAFT</label><input type="checkbox" name='attr_cra_toggle' class="sheet-cra-toggle"><span></span>
         						<div class='sheet-cra-container'>
 									<div>
-										<button type='roll' data-i18n="alchemy-u" class='sheet-skill-roller'
-												value='@{whisper}&{template:statistics2} {{title=ALCHEMY}} {{name=@{character_name}}} {{roll=[[1d10!+@{cra}[STAT]+@{alchemy_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
+										<button type='action' name='act_roll' data-i18n="alchemy-u" class='sheet-skill-roller'
+												value='@{whisper}&{template:singleroll} {{title=ALCHEMY}} {{name=@{character_name}}} {{roll=[[1d10!+@{cra}[STAT]+@{alchemy_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
 											ALCHEMY*
 										</button>
 										<input name='attr_alchemy' title='@{alchemy}' class='sheet-skillbox' type='number' value='0'>
@@ -1468,8 +1468,8 @@
 										<hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
 									</div>
 									<div>
-										<button type='roll' data-i18n="crafting-u" class='sheet-skill-roller'
-												value='@{whisper}&{template:statistics2} {{title=CRAFTING}} {{name=@{character_name}}} {{roll=[[1d10!+@{cra}[STAT]+@{crafting_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
+										<button type='action' name='act_roll' data-i18n="crafting-u" class='sheet-skill-roller'
+												value='@{whisper}&{template:singleroll} {{title=CRAFTING}} {{name=@{character_name}}} {{roll=[[1d10!+@{cra}[STAT]+@{crafting_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
 											CRAFTING*
 										</button>
 										<input name='attr_crafting' title='@{crafting}' class='sheet-skillbox' type='number' value='0'>
@@ -1492,8 +1492,8 @@
 										<hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
 									</div>
 									<div>
-										<button type='roll' data-i18n="disguis-u" class='sheet-skill-roller'
-												value='@{whisper}&{template:statistics2} {{title=DISGUISE}} {{name=@{character_name}}} {{roll=[[1d10!+@{cra}[STAT]+@{disguise_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
+										<button type='action' name='act_roll' data-i18n="disguis-u" class='sheet-skill-roller'
+												value='@{whisper}&{template:singleroll} {{title=DISGUISE}} {{name=@{character_name}}} {{roll=[[1d10!+@{cra}[STAT]+@{disguise_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
 											DISGUISE
 										</button>
 										<input name='attr_disguise' title='@{disguise}' class='sheet-skillbox' type='number' value='0'>
@@ -1516,8 +1516,8 @@
 										<hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
 									</div>
 									<div>
-										<button type='roll' data-i18n="first-ai-u" class='sheet-skill-roller'
-												value='@{whisper}&{template:statistics2} {{title=FIRST AID}} {{name=@{character_name}}} {{roll=[[1d10!+@{cra}[STAT]+@{first_aid_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
+										<button type='action' name='act_roll' data-i18n="first-ai-u" class='sheet-skill-roller'
+												value='@{whisper}&{template:singleroll} {{title=FIRST AID}} {{name=@{character_name}}} {{roll=[[1d10!+@{cra}[STAT]+@{first_aid_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
 											FIRST AID
 										</button>
 										<input name='attr_first_aid' title='@{first_aid}' class='sheet-skillbox' type='number' value='0'>
@@ -1540,8 +1540,8 @@
 										<hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
 									</div>
 									<div>
-										<button type='roll' data-i18n="forger-u" class='sheet-skill-roller'
-												value='@{whisper}&{template:statistics2} {{title=FORGERY}} {{name=@{character_name}}} {{roll=[[1d10!+@{cra}[STAT]+@{forgery_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
+										<button type='action' name='act_roll' data-i18n="forger-u" class='sheet-skill-roller'
+												value='@{whisper}&{template:singleroll} {{title=FORGERY}} {{name=@{character_name}}} {{roll=[[1d10!+@{cra}[STAT]+@{forgery_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
 											FORGERY
 										</button>
 										<input name='attr_forgery' title='@{forgery}' class='sheet-skillbox' type='number' value='0'>
@@ -1564,8 +1564,8 @@
 										<hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
 									</div>
 									<div>
-										<button type='roll' data-i18n="pick-loc-u" class='sheet-skill-roller'
-												value='@{whisper}&{template:statistics2} {{title=PICK LOCK}} {{name=@{character_name}}} {{roll=[[1d10!+@{cra}[STAT]+@{pick_lock_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
+										<button type='action' name='act_roll' data-i18n="pick-loc-u" class='sheet-skill-roller'
+												value='@{whisper}&{template:singleroll} {{title=PICK LOCK}} {{name=@{character_name}}} {{roll=[[1d10!+@{cra}[STAT]+@{pick_lock_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
 											PICK LOCK
 										</button>
 										<input name='attr_pick_lock' title='@{pick_lock}' class='sheet-skillbox' type='number' value='0'>
@@ -1588,8 +1588,8 @@
 										<hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
 									</div>
 									<div>
-										<button type='roll' data-i18n="trap-crafting-u" class='sheet-skill-roller'
-												value='@{whisper}&{template:statistics2} {{title=TRAP CRAFTING}} {{name=@{character_name}}} {{roll=[[1d10!+@{cra}[STAT]+@{trap_crafting_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
+										<button type='action' name='act_roll' data-i18n="trap-crafting-u" class='sheet-skill-roller'
+												value='@{whisper}&{template:singleroll} {{title=TRAP CRAFTING}} {{name=@{character_name}}} {{roll=[[1d10!+@{cra}[STAT]+@{trap_crafting_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
 											TRAP CRAFTING*
 										</button>
 										<input name='attr_trap_crafting' title='@{trap_crafting}' class='sheet-skillbox' type='number' value='0'>
@@ -1617,8 +1617,8 @@
         						<label class='sheet-skilltitle-will' data-i18n="will-u" >WILL</label><input type="checkbox" name='attr_will_toggle' class="sheet-will-toggle"><span></span>
 								<div class='sheet-will-container'>
 									<div>
-										<button type='roll' data-i18n="courag-u" class='sheet-skill-roller'
-												value='@{whisper}&{template:statistics2} {{title=COURAGE}} {{name=@{character_name}}} {{roll=[[1d10!+@{will}[STAT]+@{courage_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
+										<button type='action' name='act_roll' data-i18n="courag-u" class='sheet-skill-roller'
+												value='@{whisper}&{template:singleroll} {{title=COURAGE}} {{name=@{character_name}}} {{roll=[[1d10!+@{will}[STAT]+@{courage_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
 											COURAGE
 										</button>
 										<input name='attr_courage' title='@{courage}' class='sheet-skillbox' type='number' value='0'>
@@ -1641,8 +1641,8 @@
 										<hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
 									</div>
 									<div>
-										<button type='roll' data-i18n="hex-weaving-u" class='sheet-skill-roller'
-												value='@{whisper}&{template:statistics2} {{title=HEX WEAVING}} {{name=@{character_name}}} {{roll=[[1d10!+@{will}[STAT]+@{hex_weaving_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
+										<button type='action' name='act_roll' data-i18n="hex-weaving-u" class='sheet-skill-roller'
+												value='@{whisper}&{template:singleroll} {{title=HEX WEAVING}} {{name=@{character_name}}} {{roll=[[1d10!+@{will}[STAT]+@{hex_weaving_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
 											HEX WEAVING*
 										</button>
 										<input name='attr_hex_weaving' title='@{hex_weaving}' class='sheet-skillbox' type='number' value='0'>
@@ -1667,8 +1667,8 @@
 										<hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
 									</div>
 									<div>
-										<button type='roll' data-i18n="intimidatio-u" class='sheet-skill-roller'
-												value='@{whisper}&{template:statistics2} {{title=INTIMIDATION}} {{name=@{character_name}}} {{roll=[[1d10!+@{will}[STAT]+@{intimidation_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
+										<button type='action' name='act_roll' data-i18n="intimidatio-u" class='sheet-skill-roller'
+												value='@{whisper}&{template:singleroll} {{title=INTIMIDATION}} {{name=@{character_name}}} {{roll=[[1d10!+@{will}[STAT]+@{intimidation_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
 											INTIMIDATION
 										</button>
 										<input name='attr_intimidation' title='@{intimidation}' class='sheet-skillbox' type='number' value='0'>
@@ -1706,12 +1706,12 @@
 											<input type='number' name='attr_totalev' class='sheet-totalev' value='[[0@{headev}@{torsoev}@{legev}-@{held_toggle}]]' disabled='true'>
 										</div>
 										<div class='sheet-spell_casting-options'>
-											<button type='roll' data-i18n="basic-rol-u" class='sheet-skill-roller2'
-													value='@{whisper}&{template:statistics2} {{title=SPELL CASTING}} {{name=@{character_name}}} {{roll=[[1d10!+@{will}[STAT]+@{spell_casting_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
+											<button type='action' name='act_roll' data-i18n="basic-rol-u" class='sheet-skill-roller2'
+													value='@{whisper}&{template:singleroll} {{title=SPELL CASTING}} {{name=@{character_name}}} {{roll=[[1d10!+@{will}[STAT]+@{spell_casting_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
 												BASIC ROLL
 											</button>
-											<button type='roll' data-i18n="detailed-rol-u" class='sheet-skill-roller2'
-													value='@{whisper}&{template:statistics2} {{title=SPELL CASTING}} {{name=@{character_name}}} {{roll=[[1d10!+@{will}[STAT]+@{spell_casting_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]?{TARGET LOCATION |None/Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
+											<button type='action' name='act_roll' data-i18n="detailed-rol-u" class='sheet-skill-roller2'
+													value='@{whisper}&{template:singleroll} {{title=SPELL CASTING}} {{name=@{character_name}}} {{roll=[[1d10!+@{will}[STAT]+@{spell_casting_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]?{TARGET LOCATION |None/Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
 												DETAILED ROLL
 											</button>
 										</div>
@@ -1729,8 +1729,8 @@
 										<hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
 									</div>
 									<div>
-										<button type='roll' data-i18n="resist-magic-u" class='sheet-skill-roller'
-												value='@{whisper}&{template:statistics2} {{title=RESIST MAGIC}} {{name=@{character_name}}} {{roll=[[1d10!+@{will}[STAT]+@{resist_magic_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
+										<button type='action' name='act_roll' data-i18n="resist-magic-u" class='sheet-skill-roller'
+												value='@{whisper}&{template:singleroll} {{title=RESIST MAGIC}} {{name=@{character_name}}} {{roll=[[1d10!+@{will}[STAT]+@{resist_magic_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
 											RESIST MAGIC*
 										</button>
 										<input name='attr_resist_magic' title='@{resist_magic}' class='sheet-skillbox' type='number' value='0'>
@@ -1753,8 +1753,8 @@
 										<hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
 									</div>
 									<div>
-										<button type='roll' data-i18n="resist-coercio-u" class='sheet-skill-roller'
-												value='@{whisper}&{template:statistics2} {{title=RESIST COERCION}} {{name=@{character_name}}} {{roll=[[1d10!+@{will}[STAT]+@{resist_coercion_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
+										<button type='action' name='act_roll' data-i18n="resist-coercio-u" class='sheet-skill-roller'
+												value='@{whisper}&{template:singleroll} {{title=RESIST COERCION}} {{name=@{character_name}}} {{roll=[[1d10!+@{will}[STAT]+@{resist_coercion_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
 											RESIST COERCION
 										</button>
 										<input name='attr_resist_coercion' title='@{resist_coercion}' class='sheet-skillbox' type='number' value='0'>
@@ -1777,8 +1777,8 @@
 										<hr style='border: 0.5px; margin: 0px;'><!--- STOPS REPEATING SECTIONS BREAKING WHILST BEING EDITED --->
 									</div>
 									<div>
-										<button type='roll' data-i18n="ritual-crafting-u" class='sheet-skill-roller'
-												value='@{whisper}&{template:statistics2} {{title=RITUAL CRAFTING}} {{name=@{character_name}}} {{roll=[[1d10!+@{will}[STAT]+@{ritual_crafting_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
+										<button type='action' name='act_roll' data-i18n="ritual-crafting-u" class='sheet-skill-roller'
+												value='@{whisper}&{template:singleroll} {{title=RITUAL CRAFTING}} {{name=@{character_name}}} {{roll=[[1d10!+@{will}[STAT]+@{ritual_crafting_total}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'>
 											RITUAL CRAFTING*
 										</button>
 										<input name='attr_ritual_crafting' title='@{ritual_crafting}' class='sheet-skillbox' type='number' value='0'>
@@ -1887,7 +1887,7 @@
 				            <textarea class='sheet-prof-main-text' name='attr_prof_main_text'></textarea><br />
 				            <span class='sheet-main-skill-span2'><label style='margin-left: 200px;' class='sheet-skill-level' data-i18n="skill-leve-u" >SKILL LEVEL</label>
 				            <input class='sheet-prof-skill-stat' name='attr_prof_main_stat' title='@{prof_main_stat}' type='text' value='1'>
-				            <button type='roll' class='sheet-prof-skill-roll' value='@{whisper}&{template:mainskill} {{title=@{prof_main_name}}} {{name=@{character_name}}} {{description=@{prof_main_text}}} {{roll=[[1d10!+@{prof_main_choice}[STAT]+@{prof_main_stat}[PROF. SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'></button>
+				            <button type='action' name='act_roll' class='sheet-prof-skill-roll' value='@{whisper}&{template:mainskill} {{title=@{prof_main_name}}} {{name=@{character_name}}} {{description=@{prof_main_text}}} {{roll=[[1d10!+@{prof_main_choice}[STAT]+@{prof_main_stat}[PROF. SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'></button>
 				            </span>
 
 				    <div class='sheet-middle-skill-grid' style='margin-left: -10px; margin-right: 40px;'>
@@ -1907,7 +1907,7 @@
 				            <textarea class='sheet-prof-blue1-text' name='attr_prof_blue1_text'></textarea>
 				            <span class='sheet-blue1-skill-span2'><label class='sheet-skill-level' data-i18n="skill-leve-u" >SKILL LEVEL</label>
 				            <input class='sheet-prof-skill-stat' name='attr_prof_blue1_stat' title='@{prof_blue1_stat}' type='text' value='0'>
-				            <button type='roll' class='sheet-prof-skill-roll' value='@{whisper}&{template:blueskill} {{title=@{prof_blue1_name}}} {{name=@{character_name}}} {{description=@{prof_blue1_text}}} {{roll=[[1d10!+@{prof_blue1_choice}[STAT]+@{prof_blue1_stat}[PROF. SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'></button>
+				            <button type='action' name='act_roll' class='sheet-prof-skill-roll' value='@{whisper}&{template:blueskill} {{title=@{prof_blue1_name}}} {{name=@{character_name}}} {{description=@{prof_blue1_text}}} {{roll=[[1d10!+@{prof_blue1_choice}[STAT]+@{prof_blue1_stat}[PROF. SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'></button>
 				            </span>
 
 				            <span class='sheet-blue2-skill-span'><input class='sheet-prof-main-name' type='text' name='attr_prof_blue2_name' value='2nd Skill Name...'>
@@ -1925,7 +1925,7 @@
 				            <textarea class='sheet-prof-blue2-text' name='attr_prof_blue2_text'></textarea>
 				            <span class='sheet-blue2-skill-span2'><label class='sheet-skill-level' data-i18n="skill-leve-u" >SKILL LEVEL</label>
 				            <input class='sheet-prof-skill-stat' name='attr_prof_blue2_stat' title='@{prof_blue2_stat}' type='text' value='0'>
-				            <button type='roll' class='sheet-prof-skill-roll' value='@{whisper}&{template:blueskill} {{title=@{prof_blue2_name}}} {{name=@{character_name}}} {{description=@{prof_blue2_text}}} {{roll=[[1d10!+@{prof_blue2_choice}[STAT]+@{prof_blue2_stat}[PROF. SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'></button>
+				            <button type='action' name='act_roll' class='sheet-prof-skill-roll' value='@{whisper}&{template:blueskill} {{title=@{prof_blue2_name}}} {{name=@{character_name}}} {{description=@{prof_blue2_text}}} {{roll=[[1d10!+@{prof_blue2_choice}[STAT]+@{prof_blue2_stat}[PROF. SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'></button>
 				            </span>
 
 				            <span class='sheet-blue3-skill-span'><input class='sheet-prof-main-name' type='text' name='attr_prof_blue3_name' value='3rd Skill Name...'>
@@ -1943,7 +1943,7 @@
 				            <textarea class='sheet-prof-blue3-text' name='attr_prof_blue3_text'></textarea>
 				            <span class='sheet-blue3-skill-span2'><label class='sheet-skill-level' data-i18n="skill-leve-u" >SKILL LEVEL</label>
 				            <input class='sheet-prof-skill-stat' name='attr_prof_blue3_stat' title='@{prof_blue3_stat}' type='text' value='0'>
-				            <button type='roll' class='sheet-prof-skill-roll' value='@{whisper}&{template:blueskill} {{title=@{prof_blue3_name}}} {{name=@{character_name}}} {{description=@{prof_blue3_text}}} {{roll=[[1d10!+@{prof_blue3_choice}[STAT]+@{prof_blue3_stat}[PROF. SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'></button>
+				            <button type='action' name='act_roll' class='sheet-prof-skill-roll' value='@{whisper}&{template:blueskill} {{title=@{prof_blue3_name}}} {{name=@{character_name}}} {{description=@{prof_blue3_text}}} {{roll=[[1d10!+@{prof_blue3_choice}[STAT]+@{prof_blue3_stat}[PROF. SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'></button>
 				            </span>
 				        </div>
 
@@ -1963,7 +1963,7 @@
 				            <textarea class='sheet-prof-green1-text' name='attr_prof_green1_text'></textarea>
 				            <span class='sheet-green1-skill-span2'><label class='sheet-skill-level' data-i18n="skill-leve-u" >SKILL LEVEL</label>
 				            <input class='sheet-prof-skill-stat' name='attr_prof_green1_stat' title='@{prof_green1_stat}' type='text' value='0'>
-				            <button type='roll' class='sheet-prof-skill-roll' value='@{whisper}&{template:greenskill} {{title=@{prof_green1_name}}} {{name=@{character_name}}} {{description=@{prof_green1_text}}} {{roll=[[1d10!+@{prof_green1_choice}[STAT]+@{prof_green1_stat}[PROF. SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'></button>
+				            <button type='action' name='act_roll' class='sheet-prof-skill-roll' value='@{whisper}&{template:greenskill} {{title=@{prof_green1_name}}} {{name=@{character_name}}} {{description=@{prof_green1_text}}} {{roll=[[1d10!+@{prof_green1_choice}[STAT]+@{prof_green1_stat}[PROF. SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'></button>
 				            </span>
 
 				            <span class='sheet-green2-skill-span'><input class='sheet-prof-main-name' type='text' name='attr_prof_green2_name' value='2nd Skill Name...'>
@@ -1981,7 +1981,7 @@
 				            <textarea class='sheet-prof-green2-text' name='attr_prof_green2_text'></textarea>
 				            <span class='sheet-green2-skill-span2'><label class='sheet-skill-level' data-i18n="skill-leve-u" >SKILL LEVEL</label>
 				            <input class='sheet-prof-skill-stat' name='attr_prof_green2_stat' title='@{prof_green2_stat}' type='text' value='0'>
-				            <button type='roll' class='sheet-prof-skill-roll' value='@{whisper}&{template:greenskill} {{title=@{prof_green2_name}}} {{name=@{character_name}}} {{description=@{prof_green2_text}}} {{roll=[[1d10!+@{prof_green2_choice}[STAT]+@{prof_green2_stat}[PROF. SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'></button>
+				            <button type='action' name='act_roll' class='sheet-prof-skill-roll' value='@{whisper}&{template:greenskill} {{title=@{prof_green2_name}}} {{name=@{character_name}}} {{description=@{prof_green2_text}}} {{roll=[[1d10!+@{prof_green2_choice}[STAT]+@{prof_green2_stat}[PROF. SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'></button>
 				            </span>
 
 				            <span class='sheet-green3-skill-span'><input class='sheet-prof-main-name' type='text' name='attr_prof_green3_name' value='3rd Skill Name...'>
@@ -1999,7 +1999,7 @@
 				            <textarea class='sheet-prof-green3-text' name='attr_prof_green3_text'></textarea>
 				            <span class='sheet-green3-skill-span2'><label class='sheet-skill-level' data-i18n="skill-leve-u" >SKILL LEVEL</label>
 				            <input class='sheet-prof-skill-stat' name='attr_prof_green3_stat' title='@{prof_green3_stat}' type='text' value='0'>
-				            <button type='roll' class='sheet-prof-skill-roll' value='@{whisper}&{template:greenskill} {{title=@{prof_green3_name}}} {{name=@{character_name}}} {{description=@{prof_green3_text}}} {{roll=[[1d10!+@{prof_green3_choice}[STAT]+@{prof_green3_stat}[PROF. SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'></button>
+				            <button type='action' name='act_roll' class='sheet-prof-skill-roll' value='@{whisper}&{template:greenskill} {{title=@{prof_green3_name}}} {{name=@{character_name}}} {{description=@{prof_green3_text}}} {{roll=[[1d10!+@{prof_green3_choice}[STAT]+@{prof_green3_stat}[PROF. SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'></button>
 				            </span>
 				        </div>
 
@@ -2019,7 +2019,7 @@
 				            <textarea class='sheet-prof-red1-text' name='attr_prof_red1_text'></textarea>
 				            <span class='sheet-red1-skill-span2'><label class='sheet-skill-level' data-i18n="skill-leve-u" >SKILL LEVEL</label>
 				            <input class='sheet-prof-skill-stat' name='attr_prof_red1_stat' title='@{prof_red1_stat}' type='text' value='0'>
-				            <button type='roll' class='sheet-prof-skill-roll' value='@{whisper}&{template:redskill} {{title=@{prof_red1_name}}} {{name=@{character_name}}} {{description=@{prof_red1_text}}} {{roll=[[1d10!+@{prof_red1_choice}[STAT]+@{prof_red1_stat}[PROF. SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'></button>
+				            <button type='action' name='act_roll' class='sheet-prof-skill-roll' value='@{whisper}&{template:redskill} {{title=@{prof_red1_name}}} {{name=@{character_name}}} {{description=@{prof_red1_text}}} {{roll=[[1d10!+@{prof_red1_choice}[STAT]+@{prof_red1_stat}[PROF. SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'></button>
 				            </span>
 
 				            <span class='sheet-red2-skill-span'><input class='sheet-prof-main-name' type='text' name='attr_prof_red2_name' value='2nd Skill Name...'>
@@ -2037,7 +2037,7 @@
 				            <textarea class='sheet-prof-red2-text' name='attr_prof_red2_text'></textarea>
 				            <span class='sheet-red2-skill-span2'><label class='sheet-skill-level' data-i18n="skill-leve-u" >SKILL LEVEL</label>
 				            <input class='sheet-prof-skill-stat' name='attr_prof_red2_stat' title='@{prof_red2_stat}' type='text' value='0'>
-				            <button type='roll' class='sheet-prof-skill-roll' value='@{whisper}&{template:redskill} {{title=@{prof_red2_name}}} {{name=@{character_name}}} {{description=@{prof_red2_text}}} {{roll=[[1d10!+@{prof_red2_choice}[STAT]+@{prof_red2_stat}[PROF. SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'></button>
+				            <button type='action' name='act_roll' class='sheet-prof-skill-roll' value='@{whisper}&{template:redskill} {{title=@{prof_red2_name}}} {{name=@{character_name}}} {{description=@{prof_red2_text}}} {{roll=[[1d10!+@{prof_red2_choice}[STAT]+@{prof_red2_stat}[PROF. SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'></button>
 				            </span>
 
 				            <span class='sheet-red3-skill-span'><input class='sheet-prof-main-name' type='text' name='attr_prof_red3_name' value='3rd Skill Name...'>
@@ -2055,7 +2055,7 @@
 				            <textarea class='sheet-prof-red3-text' name='attr_prof_red3_text'></textarea>
 				            <span class='sheet-red3-skill-span2'><label class='sheet-skill-level' data-i18n="skill-leve-u" >SKILL LEVEL</label>
 				            <input class='sheet-prof-skill-stat' name='attr_prof_red3_stat' title='@{prof_red3_stat}' type='text' value='0'>
-				            <button type='roll' class='sheet-prof-skill-roll' value='@{whisper}&{template:redskill} {{title=@{prof_red3_name}}} {{name=@{character_name}}} {{description=@{prof_red3_text}}} {{roll=[[1d10!+@{prof_red3_choice}[STAT]+@{prof_red3_stat}[PROF. SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'></button>
+				            <button type='action' name='act_roll' class='sheet-prof-skill-roll' value='@{whisper}&{template:redskill} {{title=@{prof_red3_name}}} {{name=@{character_name}}} {{description=@{prof_red3_text}}} {{roll=[[1d10!+@{prof_red3_choice}[STAT]+@{prof_red3_stat}[PROF. SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'></button>
 				            </span>
 				        </div>
 				    </div>
@@ -2267,10 +2267,10 @@
 
         					<div class='sheet-unarmed-container'>
         					    <div>
-        					        <button type='roll' data-i18n="punch-u" class='sheet-stat-roller2' value= '@{whisper}&{template:punchkick} {{title=PUNCH}} {{name=@{character_name}}} {{roll=[[@{punch}@{bonus_mod}]]}}'>PUNCH</button>
+        					        <button type='action' name='act_roll' data-i18n="punch-u" class='sheet-stat-roller2' value= '@{whisper}&{template:punchkick} {{title=PUNCH}} {{name=@{character_name}}} {{roll=[[@{punch}@{bonus_mod}]]}}'>PUNCH</button>
         					        <input name='attr_punch' class='sheet-unarmed-dmg-element' type='text' value='1d6'>
         					        <input name='attr_p_mod' class='sheet-unarmed-element' type='text' value='@{bonus_mod}' disabled='true'><br style='margin-bottom:;'>
-        					        <button type='roll' data-i18n="kick-u" class='sheet-stat-roller2' value= '@{whisper}&{template:punchkick} {{title=KICK}} {{name=@{character_name}}} {{roll=[[@{kick}@{kick_mod}]]}}'>KICK</button>
+        					        <button type='action' name='act_roll' data-i18n="kick-u" class='sheet-stat-roller2' value= '@{whisper}&{template:punchkick} {{title=KICK}} {{name=@{character_name}}} {{roll=[[@{kick}@{kick_mod}]]}}'>KICK</button>
         					        <input name='attr_kick' class='sheet-unarmed-dmg-element' type='text' value='1d6'>
         					        <input name='attr_k_mod' class='sheet-unarmed-element' type='text' value='@{kick_mod}' disabled='true'>
         					    </div>
@@ -3157,7 +3157,7 @@
         					    <hr style='margin-bottom: 15px; margin-top: 15px;'>
         					    <label class='sheet-reputation-label' data-i18n="reputation-leve-u" >REPUTATION LEVEL</label>
         					    <input class='sheet-reputation-level' name='attr_rep_level' title='@{rep_level}' type='number' value='0'>
-        					    <button type='roll' class='sheet-rep-roll' value= '@{whisper}&{template:reputation} {{title=REPUTATION}} {{name=@{character_name}}} {{reputation=@{rep_notes}}} {{roll=[[1d10+@{will}+@{rep_level}]]}}'></button><br />
+        					    <button type='action' name='act_roll' class='sheet-rep-roll' value= '@{whisper}&{template:reputation} {{title=REPUTATION}} {{name=@{character_name}}} {{reputation=@{rep_notes}}} {{roll=[[1d10+@{will}+@{rep_level}]]}}'></button><br />
         					    <textarea class='sheet-rep-text' name='attr_rep_notes' data-i18n="reputation-notes-details" >Reputation notes & details...</textarea>
         					</div>
         					<div class='sheet-campaign-container'>
@@ -3175,14 +3175,14 @@
             <div class='sheet-top-grid'>
         		<div class='sheet-grid-item'>
         			<label class='sheet-legend-top' style='margin-left: 15px;' data-i18n="maximum-current" >Maximum / Current</label><br />
-        			<label class='sheet-stattitle' data-i18n="int-u" >INT</label><input name='attr_total_int_npc' title='@{total_int_npc}' class='sheet-smallbox' type='number' value='0'><input name='attr_int_npc' title='@{int_npc}' class='sheet-smallbox' type='text' value='[[floor((@{total_int_npc}+@{stat_mod_int_npc}))]]' disabled='true'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics} {{name=@{character_name}}} {{title=INT SAVE}} {{description=To succeed you need to roll below @{int_npc}.}} {{roll=[[1d10]]}}'></button><br />
-        			<label class='sheet-stattitle' data-i18n="ref-u" >REF</label><input name='attr_total_ref_npc' title='@{total_ref_npc}' class='sheet-smallbox' type='number' value='0'><input name='attr_ref_npc' title='@{ref_npc}' class='sheet-smallbox' type='text' value='[[floor((@{total_ref_npc}+@{stat_mod_ref_npc}))]]' disabled='true'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics} {{name=@{character_name}}} {{title=REF SAVE}} {{description=To succeed you need to roll below @{ref_npc}.}} {{roll=[[1d10]]}}'></button><br />
-        			<label class='sheet-stattitle' data-i18n="dex-u" >DEX</label><input name='attr_total_dex_npc' title='@{total_dex_npc}' class='sheet-smallbox' type='number' value='0'><input name='attr_dex_npc' title='@{dex_npc}' class='sheet-smallbox' type='text' value='[[floor((@{total_dex_npc}+@{stat_mod_dex_npc}))]]' disabled='true'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics} {{name=@{character_name}}} {{title=DEX SAVE}} {{description=To succeed you need to roll below @{dex_npc}.}} {{roll=[[1d10]]}}'></button><br />
-        			<label class='sheet-stattitle' data-i18n="body-u" >BODY</label><input name='attr_total_body_npc' title='@{total_body_npc}' class='sheet-smallbox' type='number' value='0'><input name='attr_body_npc' title='@{body_npc}' class='sheet-smallbox' type='text' value='[[floor((@{total_body_npc}+@{stat_mod_body_npc}))]]' disabled='true'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics} {{name=@{character_name}}} {{title=BODY SAVE}} {{description=To succeed you need to roll below @{body_npc}.}} {{roll=[[1d10]]}}'></button><br />
-        			<label class='sheet-stattitle' data-i18n="spd-u" >SPD</label><input name='attr_total_spd_npc' title='@{total_spd_npc}' class='sheet-smallbox' type='number' value='0'><input name='attr_spd_npc' title='@{spd_npc}' class='sheet-smallbox' type='text' value='[[floor((@{total_spd_npc}+@{stat_mod_spd_npc}))]]' disabled='true'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics} {{name=@{character_name}}} {{title=SPD SAVE}} {{description=To succeed you need to roll below @{spd_npc}.}} {{roll=[[1d10]]}}'></button><br />
-        			<label class='sheet-stattitle' data-i18n="emp-u" >EMP</label><input name='attr_total_emp_npc' title='@{total_emp_npc}' class='sheet-smallbox' type='number' value='0'><input name='attr_emp_npc' title='@{emp_npc}' class='sheet-smallbox' type='text' value='[[floor((@{total_emp_npc}+@{stat_mod_emp_npc}))]]' disabled='true'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics} {{name=@{character_name}}} {{title=EMP SAVE}} {{description=To succeed you need to roll below @{emp_npc}.}} {{roll=[[1d10]]}}'></button><br />
-        			<label class='sheet-stattitle' data-i18n="cra-u" >CRA</label><input name='attr_total_cra_npc' title='@{total_cra_npc}' class='sheet-smallbox' type='number' value='0'><input name='attr_cra_npc' title='@{cra_npc}' class='sheet-smallbox' type='text' value='[[floor((@{total_cra_npc}+@{stat_mod_cra_npc}))]]' disabled='true'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics} {{name=@{character_name}}} {{title=CRA SAVE}} {{description=To succeed you need to roll below @{cra_npc}.}} {{roll=[[1d10]]}}'></button><br />
-        			<label class='sheet-stattitle' data-i18n="will-u" >WILL</label><input name='attr_total_will_npc' title='@{total_will_npc}' class='sheet-smallbox' type='number' value='0'><input name='attr_will_npc' title='@{will_npc}' class='sheet-smallbox' type='text' value='[[floor((@{total_will_npc}+@{stat_mod_will_npc}))]]' disabled='true'><button type='roll' class='sheet-stat-roll' value= '@{whisper}&{template:statistics} {{name=@{character_name}}} {{title=WILL SAVE}} {{description=To succeed you need to roll below @{will_npc}.}} {{roll=[[1d10]]}}'></button><br />
+        			<label class='sheet-stattitle' data-i18n="int-u" >INT</label><input name='attr_total_int_npc' title='@{total_int_npc}' class='sheet-smallbox' type='number' value='0'><input name='attr_int_npc' title='@{int_npc}' class='sheet-smallbox' type='text' value='[[floor((@{total_int_npc}+@{stat_mod_int_npc}))]]' disabled='true'><button type='action' name='act_roll' class='sheet-stat-roll' value= '@{whisper}&{template:saveroll} {{name=@{character_name}}} {{title=INT SAVE}} {{description=To succeed you need to roll below @{int_npc}.}} {{roll=[[1d10]]}}'></button><br />
+        			<label class='sheet-stattitle' data-i18n="ref-u" >REF</label><input name='attr_total_ref_npc' title='@{total_ref_npc}' class='sheet-smallbox' type='number' value='0'><input name='attr_ref_npc' title='@{ref_npc}' class='sheet-smallbox' type='text' value='[[floor((@{total_ref_npc}+@{stat_mod_ref_npc}))]]' disabled='true'><button type='action' name='act_roll' class='sheet-stat-roll' value= '@{whisper}&{template:saveroll} {{name=@{character_name}}} {{title=REF SAVE}} {{description=To succeed you need to roll below @{ref_npc}.}} {{roll=[[1d10]]}}'></button><br />
+        			<label class='sheet-stattitle' data-i18n="dex-u" >DEX</label><input name='attr_total_dex_npc' title='@{total_dex_npc}' class='sheet-smallbox' type='number' value='0'><input name='attr_dex_npc' title='@{dex_npc}' class='sheet-smallbox' type='text' value='[[floor((@{total_dex_npc}+@{stat_mod_dex_npc}))]]' disabled='true'><button type='action' name='act_roll' class='sheet-stat-roll' value= '@{whisper}&{template:saveroll} {{name=@{character_name}}} {{title=DEX SAVE}} {{description=To succeed you need to roll below @{dex_npc}.}} {{roll=[[1d10]]}}'></button><br />
+        			<label class='sheet-stattitle' data-i18n="body-u" >BODY</label><input name='attr_total_body_npc' title='@{total_body_npc}' class='sheet-smallbox' type='number' value='0'><input name='attr_body_npc' title='@{body_npc}' class='sheet-smallbox' type='text' value='[[floor((@{total_body_npc}+@{stat_mod_body_npc}))]]' disabled='true'><button type='action' name='act_roll' class='sheet-stat-roll' value= '@{whisper}&{template:saveroll} {{name=@{character_name}}} {{title=BODY SAVE}} {{description=To succeed you need to roll below @{body_npc}.}} {{roll=[[1d10]]}}'></button><br />
+        			<label class='sheet-stattitle' data-i18n="spd-u" >SPD</label><input name='attr_total_spd_npc' title='@{total_spd_npc}' class='sheet-smallbox' type='number' value='0'><input name='attr_spd_npc' title='@{spd_npc}' class='sheet-smallbox' type='text' value='[[floor((@{total_spd_npc}+@{stat_mod_spd_npc}))]]' disabled='true'><button type='action' name='act_roll' class='sheet-stat-roll' value= '@{whisper}&{template:saveroll} {{name=@{character_name}}} {{title=SPD SAVE}} {{description=To succeed you need to roll below @{spd_npc}.}} {{roll=[[1d10]]}}'></button><br />
+        			<label class='sheet-stattitle' data-i18n="emp-u" >EMP</label><input name='attr_total_emp_npc' title='@{total_emp_npc}' class='sheet-smallbox' type='number' value='0'><input name='attr_emp_npc' title='@{emp_npc}' class='sheet-smallbox' type='text' value='[[floor((@{total_emp_npc}+@{stat_mod_emp_npc}))]]' disabled='true'><button type='action' name='act_roll' class='sheet-stat-roll' value= '@{whisper}&{template:saveroll} {{name=@{character_name}}} {{title=EMP SAVE}} {{description=To succeed you need to roll below @{emp_npc}.}} {{roll=[[1d10]]}}'></button><br />
+        			<label class='sheet-stattitle' data-i18n="cra-u" >CRA</label><input name='attr_total_cra_npc' title='@{total_cra_npc}' class='sheet-smallbox' type='number' value='0'><input name='attr_cra_npc' title='@{cra_npc}' class='sheet-smallbox' type='text' value='[[floor((@{total_cra_npc}+@{stat_mod_cra_npc}))]]' disabled='true'><button type='action' name='act_roll' class='sheet-stat-roll' value= '@{whisper}&{template:saveroll} {{name=@{character_name}}} {{title=CRA SAVE}} {{description=To succeed you need to roll below @{cra_npc}.}} {{roll=[[1d10]]}}'></button><br />
+        			<label class='sheet-stattitle' data-i18n="will-u" >WILL</label><input name='attr_total_will_npc' title='@{total_will_npc}' class='sheet-smallbox' type='number' value='0'><input name='attr_will_npc' title='@{will_npc}' class='sheet-smallbox' type='text' value='[[floor((@{total_will_npc}+@{stat_mod_will_npc}))]]' disabled='true'><button type='action' name='act_roll' class='sheet-stat-roll' value= '@{whisper}&{template:saveroll} {{name=@{character_name}}} {{title=WILL SAVE}} {{description=To succeed you need to roll below @{will_npc}.}} {{roll=[[1d10]]}}'></button><br />
         			<label class='sheet-stattitle' data-i18n="luck-u" >LUCK</label><input name='attr_total_luck_npc' title='@{total_luck_npc}' class='sheet-smallbox' type='number' value='0'><input name='attr_luck_npc' title='@{luck_npc}' class='sheet-smallbox' type='text' value='0'><br />
         			<label class='sheet-sizetitle' style='margin-top: 7px; margin-left: 28px;' data-i18n="threat-u" >THREAT</label><input name='attr_npc_threat' class='sheet-size-box2' type='text'>
 
@@ -3231,7 +3231,7 @@
     				                <option value='@{will_npc}' data-i18n="will-u" >WILL</option>
         					        </select>
         					        <input class='repeating_npcskill_score' name='attr_npcskill_score' type='text' value='0'>
-        					        <button type='roll' style='margin-top: -4px;' class='repeating_npc_skill_roll' value='@{whisper}&{template:statistics2} {{title=@{npcskill_name}}} {{name=@{character_name}}} {{roll=[[1d10!+@{npcskill_stat}[STAT]+@{npcskill_score}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'></button>
+        					        <button type='action' name='act_roll' style='margin-top: -4px;' class='repeating_npc_skill_roll' value='@{whisper}&{template:singleroll} {{title=@{prefix-npcskill_name}}} {{name=@{character_name}}} {{roll=[[1d10!+@{prefix-npcskill_stat}[STAT]+@{prefix-npcskill_score}[SKILL]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}'></button>
         					    </span>
         					</fieldset>
     					</div>
@@ -3255,7 +3255,7 @@
     					        <input class='repeating_npc_weapon_damage' name='attr_npc_weapon_damage' type='text' value='1d6'><span style='color: #000;'> |</span>
     					        <input class='repeating_npc_weapon_effect' name='attr_npc_weapon_effect' type='text' value='Weapon effects go here...'><span style='color: #000;'> |</span>
     					        <input class='repeating_npc_weapon_rof' name='attr_npc_weapon_rof' type='text' value='0'>
-    					        <button type='roll' style='margin-top: 0px;' class='repeating_npc_skill_roll' value='@{whisper}&{template:npcweapon} {{weapon-name=@{npc_weapon_name}}} {{name=@{character_name}}} {{effect=@{npc_weapon_effect}}} {{damage=[[@{npc_weapon_damage}]]}}'></button>
+    					        <button type='roll' style='margin-top: 0px;' class='repeating_npc_weapon_roll' value='@{whisper}&{template:npcweapon} {{weapon-name=@{npc_weapon_name}}} {{name=@{character_name}}} {{effect=@{npc_weapon_effect}}} {{damage=[[@{npc_weapon_damage}]]}}'></button>
     					    </span>
     				    </fieldset>
 					</div>
@@ -3980,11 +3980,65 @@ function repeatingSum (destination, section, fieldsum, fieldmult, totalmult){
         });
     });
 }
+
+on('clicked:roll', (event) => {
+  	startRoll(event.htmlAttributes.value + "{{fumble=[[1d10!]]}} {{fumble2=[[1d10!]]}}", (results) => {
+  	    	var rollComputed = results.results.roll.result;
+  	    	var roll2Computed = 0;
+
+  	      if(results.results.roll.dice[0] == 1) // We check if the first die is a fumble.
+  	      {
+  	        	rollComputed = results.results.roll.result - 1 - results.results.fumble.result;
+  	      }
+
+			if(results.results.roll2 != null) {
+				roll2Computed = results.results.roll2.result;
+			 	if( results.results.roll2.dice[0] == 1) // We check if the first die is a fumble.
+  	      	{
+  	        		roll2Computed = results.results.roll2.result - 1 - results.results.fumble2.result;
+  	      	}
+			 }
+
+  	      finishRoll(
+  	          results.rollId,
+  	          {
+  	              roll: rollComputed,
+  	              roll2: roll2Computed
+
+  	          }
+  	      );
+  	  });
+});
+
+on('clicked:repeating_finearts:roll clicked:repeating_npcskill:roll', (event) => {
+
+	// prefix gets an empty string for normal attributes, and repeating_section_ID_ for repeating attributes
+	var trigger = event.triggerName.slice(8); // this always starts with 'clicked:'
+	var prefix = trigger.split('_').slice(0,3).join('_') + '_'
+
+	let rollPart = event.htmlAttributes.value.replaceAll('prefix-', `${prefix}`);
+
+  	startRoll(rollPart + "{{fumble=[[1d10!]]}}", (results) => {
+        var rollComputed = results.results.roll.result;
+
+        if(results.results.roll.dice[0] == 1) // We check if the first die is a fumble.
+        {
+            rollComputed = results.results.roll.result - 1 - results.results.fumble.result;
+        }
+
+        finishRoll(
+        results.rollId,
+        {
+            roll: rollComputed,
+        }
+        );
+  	  });
+});
 </script>
 
 <!-- ---Stat/Skill Templates--- -->
 
-<rolltemplate class="sheet-rolltemplate-statistics">
+<rolltemplate class="sheet-rolltemplate-saveroll">
     <table>
         <tr><th style='text-transform: uppercase;'>{{title}}</th></tr>
         <tr><td><strong class="template-title">NAME: </strong> {{name}}</td></tr>
@@ -3993,17 +4047,17 @@ function repeatingSum (destination, section, fieldsum, fieldmult, totalmult){
     </table>
 </rolltemplate>
 
-<rolltemplate class="sheet-rolltemplate-statistics2">
+<rolltemplate class="sheet-rolltemplate-singleroll">
     <table>
         <tr><th  style='text-transform: uppercase;'>{{title}}</th></tr>
         <tr><td><strong class="template-title">NAME: </strong> {{name}}</td></tr>
-        <tr><td><strong class="template-title">SKILL ROLL: </strong> {{roll}}</td></tr>
+        <tr><td><strong class="template-title">SKILL ROLL: </strong> {{computed::roll}}</td></tr>
         {{#rollWasCrit() roll}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #66c600; text-shadow: 1px 1px #000;'>CRITICAL:</strong> Criticals are already calculated into the roll</td></tr>{{/rollWasCrit() roll}}
         {{#rollWasFumble() roll}}
 		{{#^rollWasCrit() roll}}
 		<tr style='text-align: justify; font-size: 12px;'>
 			<td>
-				<strong class="template-title" style='color: #c60000; text-shadow: 1px 1px #000;'>FUMBLE:</strong> Use the [FUMBLE](~{{name}}|fumble) button, **subtract** the result from your total score.
+				<strong class="template-title" style='color: #c60000; text-shadow: 1px 1px #000;'>FUMBLE:</strong> Fumbles are already calculated into the roll. Your fumble roll was {{fumble}}.
 			</td>
 		</tr>
 		{{/^rollWasCrit() roll}}
@@ -4011,34 +4065,34 @@ function repeatingSum (destination, section, fieldsum, fieldmult, totalmult){
     </table>
 </rolltemplate>
 
-<rolltemplate class="sheet-rolltemplate-statistics3">
-    <table>
-        <tr><th  style='text-transform: uppercase;'>{{title}}</th></tr>
-        <tr><td><strong class="template-title">NAME: </strong> {{name}}</td></tr>
-        <tr><td><strong class="template-title">1ST ATTACK: </strong> {{roll}}</td></tr>
-        {{#rollWasCrit() roll}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #66c600; text-shadow: 1px 1px #000;'>CRITICAL:</strong> Criticals are already calculated into the roll</td></tr>{{/rollWasCrit() roll}}
-        {{#rollWasFumble() roll}}
+<rolltemplate class="sheet-rolltemplate-doubleroll">
+	<table>
+		<tr><th  style='text-transform: uppercase;'>{{title}}</th></tr>
+		<tr><td><strong class="template-title">NAME: </strong> {{name}}</td></tr>
+		<tr><td><strong class="template-title">1ST ATTACK: </strong> {{computed::roll}}</td></tr>
+		{{#rollWasCrit() roll}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #66c600; text-shadow: 1px 1px #000;'>CRITICAL:</strong> Criticals are already calculated into the roll</td></tr>{{/rollWasCrit() roll}}
+		{{#rollWasFumble() roll}}
 		{{#^rollWasCrit() roll}}
 		<tr style='text-align: justify; font-size: 12px;'>
 			<td>
-				<strong class="template-title" style='color: #c60000; text-shadow: 1px 1px #000;'>FUMBLE:</strong> Use the [FUMBLE](~{{name}}|fumble) button, **subtract** the result from your first attack.
+				<strong class="template-title" style='color: #c60000; text-shadow: 1px 1px #000;'>FUMBLE:</strong> Fumbles are already calculated into the roll. Your fumble roll was {{fumble}}.
 			</td>
 		</tr>
 		{{/^rollWasCrit() roll}}
 		{{/rollWasFumble() roll}}
 
-		<tr><td><strong class="template-title">2ND ATTACK: </strong> {{roll2}}</td></tr>
-        {{#rollWasCrit() roll2}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #66c600; text-shadow: 1px 1px #000;'>CRITICAL:</strong> Criticals are already calculated into the roll</td></tr>{{/rollWasCrit() roll2}}
-        {{#rollWasFumble() roll2}}
+		<tr><td><strong class="template-title">2ND ATTACK: </strong> {{computed::roll2}}</td></tr>
+		{{#rollWasCrit() roll2}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #66c600; text-shadow: 1px 1px #000;'>CRITICAL:</strong> Criticals are already calculated into the roll</td></tr>{{/rollWasCrit() roll2}}
+		{{#rollWasFumble() roll2}}
 		{{#^rollWasCrit() roll2}}
 		<tr style='text-align: justify; font-size: 12px;'>
 			<td>
-				<strong class="template-title" style='color: #c60000; text-shadow: 1px 1px #000;'>FUMBLE:</strong> Use the [FUMBLE](~{{name}}|fumble) button, **subtract** the result from your second attack.
+				<strong class="template-title" style='color: #c60000; text-shadow: 1px 1px #000;'>FUMBLE:</strong> Fumbles are already calculated into the roll. Your fumble roll was {{fumble2}}.
 			</td>
 		</tr>
 		{{/^rollWasCrit() roll2}}
 		{{/rollWasFumble() roll2}}
-    </table>
+	</table>
 </rolltemplate>
 
 <!-- ---- Top Button Templates ---- -->
@@ -4109,11 +4163,11 @@ function repeatingSum (destination, section, fieldsum, fieldmult, totalmult){
         <tr><th style='text-transform: uppercase;'>{{title}}</th></tr>
         <tr><td><strong class="template-title">NAME: </strong> {{name}}</td></tr>
         <tr><td style='text-align: justify; font-size: 12px;'><strong class="template-title">DESCRIPTION: </strong>{{description}}</td></tr>
-        <tr><td><strong class="template-title">SKILL ROLL: </strong> {{roll}}</td></tr>
+        <tr><td><strong class="template-title">SKILL ROLL: </strong> {{computed::roll}}</td></tr>
         {{#rollWasCrit() roll}}<tr><td style='text-align: justify; font-size: 12px;'><strong class="template-title" style='color: #66c600; text-shadow: 1px 1px #000;'>CRITICAL:</strong> Criticals are already calculated into the roll</td></tr>{{/rollWasCrit() roll}}
         {{#rollWasFumble() roll}}
 		{{#^rollWasCrit() roll}}
-		<tr><td style='text-align: justify; font-size: 12px;'><strong class="template-title" style='color: #c60000; text-shadow: 1px 1px #000;'>FUMBLE:</strong> Use the [FUMBLE](~{{name}}|fumble) button, **subtract** the result from your total score.</td></tr>
+		<tr><td style='text-align: justify; font-size: 12px;'><strong class="template-title" style='color: #c60000; text-shadow: 1px 1px #000;'>FUMBLE:</strong> Fumbles are already calculated into the roll. Your fumble roll was {{fumble}}</td></tr>
 		{{/^rollWasCrit() roll}}
 		{{/rollWasFumble() roll}}
     </table>
@@ -4124,11 +4178,11 @@ function repeatingSum (destination, section, fieldsum, fieldmult, totalmult){
         <tr><th style='text-transform: uppercase;'>{{title}}</th></tr>
         <tr><td><strong class="template-title">NAME: </strong> {{name}}</td></tr>
         <tr><td style='text-align: justify; font-size: 12px;'><strong class="template-title">DESCRIPTION: </strong> {{description}}</td></tr>
-        <tr><td><strong class="template-title">SKILL ROLL: </strong> {{roll}}</td></tr>
+        <tr><td><strong class="template-title">SKILL ROLL: </strong> {{computed::roll}}</td></tr>
         {{#rollWasCrit() roll}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #66c600; text-shadow: 1px 1px #000;'>CRITICAL:</strong> Criticals are already calculated into the roll</td></tr>{{/rollWasCrit() roll}}
         {{#rollWasFumble() roll}}
 		{{#^rollWasCrit() roll}}
-		<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #c60000; text-shadow: 1px 1px #000;'>FUMBLE:</strong> Use the [FUMBLE](~{{name}}|fumble) button, **subtract** the result from your total score.</td></tr>
+		<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #c60000; text-shadow: 1px 1px #000;'>FUMBLE:</strong> Fumbles are already calculated into the roll. Your fumble roll was {{fumble}}</td></tr>
 		{{/^rollWasCrit() roll}}
 		{{/rollWasFumble() roll}}
     </table>
@@ -4139,11 +4193,11 @@ function repeatingSum (destination, section, fieldsum, fieldmult, totalmult){
         <tr><th style='text-transform: uppercase;'>{{title}}</th></tr>
         <tr><td><strong class="template-title">NAME: </strong> {{name}}</td></tr>
         <tr><td style='text-align: justify; font-size: 12px;'><strong class="template-title">DESCRIPTION: </strong> {{description}}</td></tr>
-        <tr><td><strong class="template-title">SKILL ROLL: </strong> {{roll}}</td></tr>
+        <tr><td><strong class="template-title">SKILL ROLL: </strong> {{computed::roll}}</td></tr>
         {{#rollWasCrit() roll}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #66c600; text-shadow: 1px 1px #000;'>CRITICAL:</strong> Criticals are already calculated into the roll</td></tr>{{/rollWasCrit() roll}}
         {{#rollWasFumble() roll}}
 		{{#^rollWasCrit() roll}}
-		<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #c60000; text-shadow: 1px 1px #000;'>FUMBLE:</strong> Use the [FUMBLE](~{{name}}|fumble) button, **subtract** the result from your total score.</td></tr>
+		<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #c60000; text-shadow: 1px 1px #000;'>FUMBLE:</strong> Fumbles are already calculated into the roll. Your fumble roll was {{fumble}}</td></tr>
 		{{/^rollWasCrit() roll}}
 		{{/rollWasFumble() roll}}
     </table>
@@ -4154,11 +4208,11 @@ function repeatingSum (destination, section, fieldsum, fieldmult, totalmult){
         <tr><th style='text-transform: uppercase;'>{{title}}</th></tr>
         <tr><td><strong class="template-title">NAME: </strong> {{name}}</td></tr>
         <tr><td style='text-align: justify; font-size: 12px;'><strong class="template-title">DESCRIPTION: </strong> {{description}}</td></tr>
-        <tr><td><strong class="template-title">SKILL ROLL: </strong> {{roll}}</td></tr>
+        <tr><td><strong class="template-title">SKILL ROLL: </strong> {{computed::roll}}</td></tr>
         {{#rollWasCrit() roll}}<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #66c600; text-shadow: 1px 1px #000;'>CRITICAL:</strong> Criticals are already calculated into the roll</td></tr>{{/rollWasCrit() roll}}
         {{#rollWasFumble() roll}}
 		{{#^rollWasCrit() roll}}
-		<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #c60000; text-shadow: 1px 1px #000;'>FUMBLE:</strong> Use the [FUMBLE](~{{name}}|fumble) button, **subtract** the result from your total score.</td></tr>
+		<tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title" style='color: #c60000; text-shadow: 1px 1px #000;'>FUMBLE:</strong> Fumbles are already calculated into the roll. Your fumble roll was {{fumble}}</td></tr>
 		{{/^rollWasCrit() roll}}
 		{{/rollWasFumble() roll}}
     </table>
@@ -4248,7 +4302,7 @@ function repeatingSum (destination, section, fieldsum, fieldmult, totalmult){
         <tr><td><strong class="template-title">NAME: </strong> {{name}}</td></tr>
         <tr style='text-align: justify; font-size: 12px;'><td><strong class="template-title">REPUTATION: </strong> {{reputation}}</td></tr>
         <tr>
-			<td><strong class="template-title">REP ROLL: </strong> {{roll}}</td>
+			<td><strong class="template-title">REP ROLL: </strong> {{computed::roll}}</td>
 		</tr>
         {{#rollWasCrit() roll}}
 		<tr style='text-align: justify; font-size: 12px;'>
@@ -4259,10 +4313,10 @@ function repeatingSum (destination, section, fieldsum, fieldmult, totalmult){
 		{{#^rollWasCrit() roll}}
 		<tr style='text-align: justify; font-size: 12px;'>
 			<td>
-				<strong class="template-title" style='color: #c60000; text-shadow: 1px 1px #000;'>FUMBLE:</strong> Use the [FUMBLE](~{{name}}|fumble) button, **subtract** the result from your total score.
+				<strong class="template-title" style='color: #c60000; text-shadow: 1px 1px #000;'>FUMBLE:</strong> Fumbles are already calculated into the roll. Your fumble roll was {{fumble}}.
 			</td>
 		</tr>
 		{{/^rollWasCrit() roll}}
 		{{/rollWasFumble() roll}}
     </table>
-</rolltemplate>
+</rolltemplate>
\ No newline at end of file