diff --git a/RunequestGQS/RunequestGQS.css b/RunequestGQS/RunequestGQS.css
index 7db64b087b..923d91b707 100644
--- a/RunequestGQS/RunequestGQS.css
+++ b/RunequestGQS/RunequestGQS.css
@@ -6,7 +6,9 @@
 .sheet-exp-toggle1 { display: none; }
 .sheet-check-toggle1:checked ~ .sheet-exp-toggle1 { display: inline-block; }
 
-
+.charsheet button[type=roll]{
+    margin: 0 1px 0 1px!important;
+}
 
 .sheet-wrapper1 {
 	display: grid;
@@ -2601,4 +2603,4 @@ div.sheet-tab-contenta
     border-top-color: #000;
     margin: 2px 0 0 5px;
     padding: 5px;
-}
+}
\ No newline at end of file
diff --git a/RunequestGQS/RunequestGQS.html b/RunequestGQS/RunequestGQS.html
index 7457f72958..e21d02683b 100644
--- a/RunequestGQS/RunequestGQS.html
+++ b/RunequestGQS/RunequestGQS.html
@@ -52,7 +52,7 @@
 						
 					</div>
 					<div class="sheet-info">
-						<div class="sheet-input_label" data-i18n="Reputation">Reputation</div><input name="attr_reputation" class="sheet-text_input sheet-percentiles" type="text" value="0"><button class="sheet-d100_roll" type="roll" value="&amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[@{reputation}]]}} {{fumble=[[{(101-(round((100-(@{reputation}))/20))),100}kl1]]}} {{crit=[[round(([[(@{reputation})]])/20)+1]]}}  {{special=[[round(([[(@{reputation})]])/5)+1]]}}    {{success=[[(@{reputation})]]}} {{roll=[[1d100]]}} {{skillname=Reputation}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button><button class="sheet-d100_roll" type="roll" value="&amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[@{reputation}]]}} {{fumble=[[{(101-(round((100-(@{reputation}+?{Mods|0}))/20))),100}kl1]]}} {{crit=[[round((@{reputation}+?{Mods|0})/20)+1]]}}  {{special=[[round((@{reputation}+?{Mods|0})/5)+1]]}}    {{success=[[@{reputation}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Reputation}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button>
+						<div class="sheet-input_label" data-i18n="Reputation">Reputation</div><input name="attr_reputation" class="sheet-text_input sheet-percentiles" type="text" value="0"><button   title="No Modifier"   type="roll" value="&amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[@{reputation}]]}} {{fumble=[[{(101-(round((100-(@{reputation}))/20))),100}kl1]]}} {{crit=[[round(([[(@{reputation})]])/20)+1]]}}  {{special=[[round(([[(@{reputation})]])/5)+1]]}}    {{success=[[(@{reputation})]]}} {{roll=[[1d100]]}} {{skillname=Reputation}}"></button><button  class="new_roll" title="With Modifier"   type="roll" value="&amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[@{reputation}]]}} {{fumble=[[{(101-(round((100-(@{reputation}+?{Mods|0}))/20))),100}kl1]]}} {{crit=[[round((@{reputation}+?{Mods|0})/20)+1]]}}  {{special=[[round((@{reputation}+?{Mods|0})/5)+1]]}}    {{success=[[@{reputation}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Reputation}}"></button>
 						<div class="sheet-input_label" data-i18n="Standard-of-Living">Standard of Living</div><input name="attr_living_standard" class="sheet-text_input" style="width: 75px;" type="text">
 					
 					</div>				
@@ -371,6 +371,8 @@
 								<label style="font-size: 0.6em; margin-left: 56px; display: inline;" data-i18n="Orig-">Orig.</label>
 								<label style="font-size: 0.6em; margin-left: 5px; display: inline;" data-i18n="Mod-">Mod.</label>
 								<label style="font-size: 0.6em; margin-left: 5px; display: inline;" data-i18n="Cur-">Cur.</label>							
+								<label style="font-size: 0.6em; margin-left: 5px; display: inline;">x5</label>
+								<label style="font-size: 0.6em; margin-left: -3px; display: inline;">x?</label>
 							</div>						
 						<div class="sheet-col" style="width: 64%; margin-right: 1px;">
 							<div>
@@ -378,7 +380,7 @@
 								<input name="attr_basestr" class="sheet-char_values" type="text" value="0">
 								<input name="attr_modstr" class="sheet-char_values" type="text" value="0">
 								<input name="attr_curstr" class="sheet-char_values" type="text" readonly="" value="0">
-								<button class="sheet-d100_roll" type="roll" value="&amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[((@{curstr}+@{strBuff})*5)]]}} {{fumble=[[{(101-(round((100-((@{curstr}+@{strBuff})*5))/20))),100}kl1]]}} {{crit=[[round(([[((@{curstr}+@{strBuff})*5)]])/20)+1]]}} {{special=[[round(([[((@{curstr}+@{strBuff})*5)]])/5)+1]]}}         {{success=[[((@{curstr}+@{strBuff})*5)]]}} {{roll=[[1d100]]}} {{skillname=STR}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button><button class="sheet-d100_roll" type="roll" value="&amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[((@{curstr}+@{strBuff})*?{multiplier|5})]]}} {{fumble=[[{(101-(round((100-((@{curstr}+@{strBuff})*?{multiplier|5}))/20))),100}kl1]]}} {{crit=[[round(([[((@{curstr}+@{strBuff})*?{multiplier|5})]])/20)+1]]}} {{special=[[round(([[((@{curstr}+@{strBuff})*?{multiplier|5})]])/5)+1]]}}         {{success=[[((@{curstr}+@{strBuff})*?{multiplier|5})]]}} {{roll=[[1d100]]}} {{skillname=STR}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button>
+								<button title="x5"   type="roll" value="&amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[((@{curstr}+@{strBuff})*5)]]}} {{fumble=[[{(101-(round((100-((@{curstr}+@{strBuff})*5))/20))),100}kl1]]}} {{crit=[[round(([[((@{curstr}+@{strBuff})*5)]])/20)+1]]}} {{special=[[round(([[((@{curstr}+@{strBuff})*5)]])/5)+1]]}}         {{success=[[((@{curstr}+@{strBuff})*5)]]}} {{roll=[[1d100]]}} {{skillname=STR}}"></button><button  title="x?"  class="new_roll2"  type="roll" value="&amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[((@{curstr}+@{strBuff})*?{multiplier|5})]]}} {{fumble=[[{(101-(round((100-((@{curstr}+@{strBuff})*?{multiplier|5}))/20))),100}kl1]]}} {{crit=[[round(([[((@{curstr}+@{strBuff})*?{multiplier|5})]])/20)+1]]}} {{special=[[round(([[((@{curstr}+@{strBuff})*?{multiplier|5})]])/5)+1]]}}         {{success=[[((@{curstr}+@{strBuff})*?{multiplier|5})]]}} {{roll=[[1d100]]}} {{skillname=STR}}"></button>
 								<input name="attr_strBuff" style="display: none;" value="0">
 								<!--<input type="checkbox"  title="Strength Cast"  name="attr_strengthCast"  />-->
 								
@@ -390,8 +392,8 @@
 								<input name="attr_basecon" class="sheet-char_values" type="text" value="0">
 								<input name="attr_modcon" class="sheet-char_values" type="text" value="0">
 								<input name="attr_curcon" class="sheet-char_values" type="text" readonly="" value="0">
-								<button class="sheet-d100_roll" type="roll" value="&amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[((@{curcon}+@{conBuff})*5)]]}} {{fumble=[[{(101-(round((100-((@{curcon}+@{conBuff})*5))/20))),100}kl1]]}} {{crit=[[round(([[((@{curcon}+@{conBuff})*5)]])/20)+1]]}} {{special=[[round(([[((@{curcon}+@{conBuff})*5)]])/5)+1]]}}         {{success=[[((@{curcon}+@{conBuff})*5)]]}} {{roll=[[1d100]]}} {{skillname=CON}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png">
-								</button><button class="sheet-d100_roll" type="roll" value="&amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[((@{curcon}+@{conBuff})*?{multiplier|5})]]}} {{fumble=[[{(101-(round((100-((@{curcon}+@{conBuff})*?{multiplier|5}))/20))),100}kl1]]}} {{crit=[[round(([[((@{curcon}+@{conBuff})*?{multiplier|5})]])/20)+1]]}} {{special=[[round(([[((@{curcon}+@{conBuff})*?{multiplier|5})]])/5)+1]]}}         {{success=[[((@{curcon}+@{conBuff})*?{multiplier|5})]]}} {{roll=[[1d100]]}} {{skillname=CON}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button>
+								<button  title="x5"   type="roll" value="&amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[((@{curcon}+@{conBuff})*5)]]}} {{fumble=[[{(101-(round((100-((@{curcon}+@{conBuff})*5))/20))),100}kl1]]}} {{crit=[[round(([[((@{curcon}+@{conBuff})*5)]])/20)+1]]}} {{special=[[round(([[((@{curcon}+@{conBuff})*5)]])/5)+1]]}}         {{success=[[((@{curcon}+@{conBuff})*5)]]}} {{roll=[[1d100]]}} {{skillname=CON}}">
+								</button><button  title="x?"  class="new_roll2"    type="roll" value="&amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[((@{curcon}+@{conBuff})*?{multiplier|5})]]}} {{fumble=[[{(101-(round((100-((@{curcon}+@{conBuff})*?{multiplier|5}))/20))),100}kl1]]}} {{crit=[[round(([[((@{curcon}+@{conBuff})*?{multiplier|5})]])/20)+1]]}} {{special=[[round(([[((@{curcon}+@{conBuff})*?{multiplier|5})]])/5)+1]]}}         {{success=[[((@{curcon}+@{conBuff})*?{multiplier|5})]]}} {{roll=[[1d100]]}} {{skillname=CON}}"></button>
                                                   
 								<input name="attr_conBuff" style="display: none;" value="0">
 								<!--<input type="checkbox"  title="Vigor Cast"  name="attr_vigorCast"  />-->
@@ -403,7 +405,7 @@
 								<input name="attr_basesiz" class="sheet-char_values" type="text" value="0">
 								<input name="attr_modsiz" class="sheet-char_values" type="text" value="0">									
 								<input name="attr_cursiz" class="sheet-char_values" type="text" readonly="" value="0">
-								<button class="sheet-d100_roll" type="roll" value="&amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{cursiz}*5)]]}} {{fumble=[[{(101-(round((100-(@{cursiz}*5))/20))),100}kl1]]}} {{crit=[[round(([[(@{cursiz}*5)]])/20)+1]]}} {{special=[[round(([[(@{cursiz}*5)]])/5)+1]]}}         {{success=[[(@{cursiz}*5)]]}} {{roll=[[1d100]]}} {{skillname=SIZ}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button><button class="sheet-d100_roll" type="roll" value="&amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{cursiz}*?{multiplier|5})]]}} {{fumble=[[{(101-(round((100-(@{cursiz}*?{multiplier|5}))/20))),100}kl1]]}}  {{crit=[[round(([[(@{cursiz}*?{multiplier|5})]])/20)+1]]}} {{special=[[round(([[(@{cursiz}*?{multiplier|5})]])/5)+1]]}}         {{success=[[(@{cursiz}*?{multiplier|5})]]}} {{roll=[[1d100]]}} {{skillname=SIZ}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button>	
+								<button  title="x5"   type="roll" value="&amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{cursiz}*5)]]}} {{fumble=[[{(101-(round((100-(@{cursiz}*5))/20))),100}kl1]]}} {{crit=[[round(([[(@{cursiz}*5)]])/20)+1]]}} {{special=[[round(([[(@{cursiz}*5)]])/5)+1]]}}         {{success=[[(@{cursiz}*5)]]}} {{roll=[[1d100]]}} {{skillname=SIZ}}"></button><button  title="x?"  class="new_roll2"    type="roll" value="&amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{cursiz}*?{multiplier|5})]]}} {{fumble=[[{(101-(round((100-(@{cursiz}*?{multiplier|5}))/20))),100}kl1]]}}  {{crit=[[round(([[(@{cursiz}*?{multiplier|5})]])/20)+1]]}} {{special=[[round(([[(@{cursiz}*?{multiplier|5})]])/5)+1]]}}         {{success=[[(@{cursiz}*?{multiplier|5})]]}} {{roll=[[1d100]]}} {{skillname=SIZ}}"></button>	
 							</div>	
 							
 							<div>
@@ -412,7 +414,7 @@
 								<input name="attr_baseint" class="sheet-char_values" type="text" value="0">	
 								<input name="attr_modint" class="sheet-char_values" type="text" value="0">									
 								<input name="attr_curint" class="sheet-char_values" type="text" readonly="" value="0">
-								<button class="sheet-d100_roll" type="roll" value="&amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{curint}*5)]]}} {{fumble=[[{(101-(round((100-(@{curint}*5))/20))),100}kl1]]}} {{crit=[[round(([[(@{curint}*5)]])/20)+1]]}} {{special=[[round(([[(@{curint}*5)]])/5)+1]]}}         {{success=[[(@{curint}*5)]]}} {{roll=[[1d100]]}} {{skillname=INT}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button><button class="sheet-d100_roll" type="roll" value="&amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{curint}*?{multiplier|5})]]}} {{fumble=[[{(101-(round((100-(@{curint}*?{multiplier|5}))/20))),100}kl1]]}} {{crit=[[round(([[(@{curint}*?{multiplier|5})]])/20)+1]]}} {{special=[[round(([[(@{curint}*?{multiplier|5})]])/5)+1]]}}         {{success=[[(@{curint}*?{multiplier|5})]]}} {{roll=[[1d100]]}} {{skillname=INT}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button>	
+								<button  title="x5"    type="roll" value="&amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{curint}*5)]]}} {{fumble=[[{(101-(round((100-(@{curint}*5))/20))),100}kl1]]}} {{crit=[[round(([[(@{curint}*5)]])/20)+1]]}} {{special=[[round(([[(@{curint}*5)]])/5)+1]]}}         {{success=[[(@{curint}*5)]]}} {{roll=[[1d100]]}} {{skillname=INT}}"></button><button  title="x?"  class="new_roll2"    type="roll" value="&amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{curint}*?{multiplier|5})]]}} {{fumble=[[{(101-(round((100-(@{curint}*?{multiplier|5}))/20))),100}kl1]]}} {{crit=[[round(([[(@{curint}*?{multiplier|5})]])/20)+1]]}} {{special=[[round(([[(@{curint}*?{multiplier|5})]])/5)+1]]}}         {{success=[[(@{curint}*?{multiplier|5})]]}} {{roll=[[1d100]]}} {{skillname=INT}}"></button>	
 							</div>
 							
 							<div>
@@ -421,7 +423,7 @@
 								<input name="attr_basepow" class="sheet-char_values" type="text" value="0">
 								<input name="attr_modpow" class="sheet-char_values" type="text" value="0">									
 								<input name="attr_curpow" class="sheet-char_values" type="text" readonly="" value="0">
-								<button class="sheet-d100_roll" type="roll" value="&amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{curpow}*5)]]}} {{fumble=[[{(101-(round((100-(@{curpow}*5))/20))),100}kl1]]}} {{crit=[[round(([[(@{curpow}*5)]])/20)+1]]}} {{special=[[round(([[(@{curpow}*5)]])/5)+1]]}}         {{success=[[(@{curpow}*5)]]}} {{roll=[[1d100]]}} {{skillname=POW}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button><button class="sheet-d100_roll" type="roll" value="&amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{curpow}*?{multiplier|5})]]}} {{fumble=[[{(101-(round((100-(@{curpow}*?{multiplier|5}))/20))),100}kl1]]}} {{crit=[[round(([[(@{curpow}*?{multiplier|5})]])/20)+1]]}} {{special=[[round(([[(@{curpow}*?{multiplier|5})]])/5)+1]]}}         {{success=[[(@{curpow}*?{multiplier|5})]]}} {{roll=[[1d100]]}} {{skillname=POW}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button>
+								<button  title="x5"   type="roll" value="&amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{curpow}*5)]]}} {{fumble=[[{(101-(round((100-(@{curpow}*5))/20))),100}kl1]]}} {{crit=[[round(([[(@{curpow}*5)]])/20)+1]]}} {{special=[[round(([[(@{curpow}*5)]])/5)+1]]}}         {{success=[[(@{curpow}*5)]]}} {{roll=[[1d100]]}} {{skillname=POW}}"></button><button  title="x?"  class="new_roll2"    type="roll" value="&amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{curpow}*?{multiplier|5})]]}} {{fumble=[[{(101-(round((100-(@{curpow}*?{multiplier|5}))/20))),100}kl1]]}} {{crit=[[round(([[(@{curpow}*?{multiplier|5})]])/20)+1]]}} {{special=[[round(([[(@{curpow}*?{multiplier|5})]])/5)+1]]}}         {{success=[[(@{curpow}*?{multiplier|5})]]}} {{roll=[[1d100]]}} {{skillname=POW}}"></button>
 								<input name="attr_pow_check" title="POW check" type="checkbox">								
 							</div>
 
@@ -431,7 +433,7 @@
 								<input name="attr_basedex" class="sheet-char_values" type="text" value="0">	
 								<input name="attr_moddex" class="sheet-char_values" type="text" value="0">									
 								<input name="attr_curdex" class="sheet-char_values" type="text" readonly="" value="0">
-								<button class="sheet-d100_roll" type="roll" value="&amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[((@{curdex}+@{dexBuff})*5)]]}} {{fumble=[[{(101-(round((100-((@{curdex}+@{dexBuff})*5))/20))),100}kl1]]}} {{crit=[[round(([[((@{curdex}+@{dexBuff})*5)]])/20)+1]]}} {{special=[[round(([[((@{curdex}+@{dexBuff})*5)]])/5)+1]]}}         {{success=[[((@{curdex}+@{dexBuff})*5)]]}} {{roll=[[1d100]]}} {{skillname=DEX}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button><button class="sheet-d100_roll" type="roll" value="&amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[((@{curdex}+@{dexBuff})*?{multiplier|5})]]}} {{fumble=[[{(101-(round((100-((@{curdex}+@{dexBuff})*?{multiplier|5}))/20))),100}kl1]]}} {{crit=[[round(([[((@{curdex}+@{dexBuff})*?{multiplier|5})]])/20)+1]]}} {{special=[[round(([[((@{curdex}+@{dexBuff})*?{multiplier|5})]])/5)+1]]}}         {{success=[[((@{curdex}+@{dexBuff})*?{multiplier|5})]]}} {{roll=[[1d100]]}} {{skillname=DEX}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button>
+								<button  title="x5"   type="roll" value="&amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[((@{curdex}+@{dexBuff})*5)]]}} {{fumble=[[{(101-(round((100-((@{curdex}+@{dexBuff})*5))/20))),100}kl1]]}} {{crit=[[round(([[((@{curdex}+@{dexBuff})*5)]])/20)+1]]}} {{special=[[round(([[((@{curdex}+@{dexBuff})*5)]])/5)+1]]}}         {{success=[[((@{curdex}+@{dexBuff})*5)]]}} {{roll=[[1d100]]}} {{skillname=DEX}}"></button><button  title="x?"  class="new_roll2"    type="roll" value="&amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[((@{curdex}+@{dexBuff})*?{multiplier|5})]]}} {{fumble=[[{(101-(round((100-((@{curdex}+@{dexBuff})*?{multiplier|5}))/20))),100}kl1]]}} {{crit=[[round(([[((@{curdex}+@{dexBuff})*?{multiplier|5})]])/20)+1]]}} {{special=[[round(([[((@{curdex}+@{dexBuff})*?{multiplier|5})]])/5)+1]]}}         {{success=[[((@{curdex}+@{dexBuff})*?{multiplier|5})]]}} {{roll=[[1d100]]}} {{skillname=DEX}}"></button>
 								
 								<input name="attr_dexBuff" style="display: none;" value="0">
 								<input name="attr_srBuff" style="display: none;" value="0">
@@ -443,7 +445,7 @@
 								<input name="attr_basechr" class="sheet-char_values" type="text" value="0">	
 								<input name="attr_modchr" class="sheet-char_values" type="text" value="0">									
 								<input name="attr_curchr" class="sheet-char_values" type="text" readonly="" value="0">
-								<button class="sheet-d100_roll" type="roll" value="&amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[((@{curchr}+@{chrBuff})*5)]]}} {{fumble=[[{(101-(round((100-((@{curchr}+@{chrBuff})*5))/20))),100}kl1]]}} {{crit=[[round(([[((@{curchr}+@{chrBuff})*5)]])/20)+1]]}} {{special=[[round(([[((@{curchr}+@{chrBuff})*5)]])/5)+1]]}}         {{success=[[((@{curchr}+@{chrBuff})*5)]]}} {{roll=[[1d100]]}} {{skillname=CHR}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button><button class="sheet-d100_roll" type="roll" value="&amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[((@{curchr}+@{chrBuff})*?{multiplier|5})]]}} {{fumble=[[{(101-(round((100-((@{curchr}+@{chrBuff})*?{multiplier|5}))/20))),100}kl1]]}} {{crit=[[round(([[((@{curchr}+@{chrBuff})*?{multiplier|5})]])/20)+1]]}} {{special=[[round(([[((@{curchr}+@{chrBuff})*?{multiplier|5})]])/5)+1]]}}         {{success=[[((@{curchr}+@{chrBuff})*?{multiplier|5})]]}} {{roll=[[1d100]]}} {{skillname=CHR}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button>
+								<button  title="x5"   type="roll" value="&amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[((@{curchr}+@{chrBuff})*5)]]}} {{fumble=[[{(101-(round((100-((@{curchr}+@{chrBuff})*5))/20))),100}kl1]]}} {{crit=[[round(([[((@{curchr}+@{chrBuff})*5)]])/20)+1]]}} {{special=[[round(([[((@{curchr}+@{chrBuff})*5)]])/5)+1]]}}         {{success=[[((@{curchr}+@{chrBuff})*5)]]}} {{roll=[[1d100]]}} {{skillname=CHR}}"></button><button  title="x?"  class="new_roll2"    type="roll" value="&amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[((@{curchr}+@{chrBuff})*?{multiplier|5})]]}} {{fumble=[[{(101-(round((100-((@{curchr}+@{chrBuff})*?{multiplier|5}))/20))),100}kl1]]}} {{crit=[[round(([[((@{curchr}+@{chrBuff})*?{multiplier|5})]])/20)+1]]}} {{special=[[round(([[((@{curchr}+@{chrBuff})*?{multiplier|5})]])/5)+1]]}}         {{success=[[((@{curchr}+@{chrBuff})*?{multiplier|5})]]}} {{roll=[[1d100]]}} {{skillname=CHR}}"></button>
 								<!--<input type="checkbox"  title="Glamour Cast"  name="attr_glamourCast"  />-->
 								<input name="attr_chrBuff" style="display: none;" value="0">
 							</div>
@@ -486,14 +488,14 @@
 						<br>
 						<div class="sheet-header" data-i18n="Passions">Passions</div>
 						<div>
-							<div class="sheet-input_label" data-i18n="Honor">Honor</div><input name="attr_honor" class="sheet-text_input sheet-percentiles" style="margin-right: 5px;" type="text" value="0"><input name="attr_honor_check" style="margin-right: 5px;" type="checkbox"><button class="sheet-d100_roll" type="roll" value="&amp;{template:skillRoll} {{name=@{character_name}}} {{type=P}} {{skillvalue=[[(@{honor})]]}} {{fumble=[[ceil(95+([[(@{honor})]])/20))]]}} {{crit=[[round(([[(@{honor})]])/20)+1]]}}  {{special=[[round(([[(@{honor})]])/5)+1]]}}    {{success=[[(@{honor})]]}} {{roll=[[1d100]]}} {{skillname=Honor}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button><button class="sheet-d100_roll" type="roll" value="&amp;{template:skillRoll} {{type=P}} {{name=@{character_name}}} {{skillvalue=[[@{honor}]]}} {{fumble=[[ceil(95+(@{honor}+?{Mods|0})/20)]]}} {{crit=[[round((@{honor}+?{Mods|0})/20)+1]]}}  {{special=[[round((@{honor}+?{Mods|0})/5)+1]]}}    {{success=[[@{honor}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Honor}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button>						
+							<div class="sheet-input_label" data-i18n="Honor">Honor</div><input name="attr_honor" class="sheet-text_input sheet-percentiles" style="margin-right: 5px;" type="text" value="0"><input name="attr_honor_check" style="margin-right: 5px;" type="checkbox"><button   title="No Modifier"   type="roll" value="&amp;{template:skillRoll} {{name=@{character_name}}} {{type=P}} {{skillvalue=[[(@{honor})]]}} {{fumble=[[ceil(95+([[(@{honor})]])/20))]]}} {{crit=[[round(([[(@{honor})]])/20)+1]]}}  {{special=[[round(([[(@{honor})]])/5)+1]]}}    {{success=[[(@{honor})]]}} {{roll=[[1d100]]}} {{skillname=Honor}}"></button><button  title="With Modifier"   class="new_roll"    type="roll" value="&amp;{template:skillRoll} {{type=P}} {{name=@{character_name}}} {{skillvalue=[[@{honor}]]}} {{fumble=[[ceil(95+(@{honor}+?{Mods|0})/20)]]}} {{crit=[[round((@{honor}+?{Mods|0})/20)+1]]}}  {{special=[[round((@{honor}+?{Mods|0})/5)+1]]}}    {{success=[[@{honor}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Honor}}"></button>						
 						</div>
 						<br>
 						<div>
 							<fieldset class="repeating_passions">
 								<input name="attr_passion" class="sheet-text_input" style="width: 293px;" type="text" placeholder="Passion(.............)">
 								<input name="attr_value" class="sheet-text_input sheet-percentiles" type="text" value="0">
-								<button class="sheet-d100_roll" type="roll" value="&amp;{template:skillRoll} {{type=P}} {{name=@{character_name}}} {{skillvalue=[[(@{value})]]}} {{fumble=[[ceil(95+([[(@{value})]])/20))]]}} {{crit=[[round(([[(@{value})]])/20)+1]]}}  {{special=[[round(([[(@{value})]])/5)+1]]}}    {{success=[[(@{value})]]}} {{roll=[[1d100]]}} {{skillname=@{Passion}}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button><button class="sheet-d100_roll" type="roll" value="&amp;{template:skillRoll} {{type=P}} {{name=@{character_name}}} {{skillvalue=[[@{value}]]}} {{fumble=[[ceil(95+(@{value}+?{Mods|0})/20)]]}} {{crit=[[round((@{value}+?{Mods|0})/20)+1]]}}  {{special=[[round((@{value}+?{Mods|0})/5)+1]]}}    {{success=[[@{value}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{Passion}}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button>
+								<button title="No Modifier"    type="roll" value="&amp;{template:skillRoll} {{type=P}} {{name=@{character_name}}} {{skillvalue=[[(@{value})]]}} {{fumble=[[ceil(95+([[(@{value})]])/20))]]}} {{crit=[[round(([[(@{value})]])/20)+1]]}}  {{special=[[round(([[(@{value})]])/5)+1]]}}    {{success=[[(@{value})]]}} {{roll=[[1d100]]}} {{skillname=@{Passion}}}"></button><button  title="With Modifier"   class="new_roll"    type="roll" value="&amp;{template:skillRoll} {{type=P}} {{name=@{character_name}}} {{skillvalue=[[@{value}]]}} {{fumble=[[ceil(95+(@{value}+?{Mods|0})/20)]]}} {{crit=[[round((@{value}+?{Mods|0})/20)+1]]}}  {{special=[[round((@{value}+?{Mods|0})/5)+1]]}}    {{success=[[@{value}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{Passion}}}"></button>
 								<input name="attr_passionExp" type="checkbox">
 							</fieldset>
 						</div>
@@ -534,11 +536,11 @@
 								  <div style="margin-left: 5px; display: inline;">
 									<div class="sheet-input_label" data-i18n="Dodge">Dodge</div>
 									 <input name="attr_dodge" class="sheet-section-header sheet-percentiles" type="text" readonly="">
-									 <button class="sheet-d100_roll" type="roll" value="&amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{dodge})]]}} {{fumble=[[ceil(95+([[(@{dodge})]])/20))]]}} {{crit=[[round(([[(@{dodge})]])/20)+1]]}}  {{special=[[round(([[(@{dodge})]])/5)+1]]}}    {{success=[[(@{dodge})]]}} {{roll=[[1d100]]}} {{skillname=Dodge}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button><button class="sheet-d100_roll" type="roll" value="&amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[@{dodge}]]}} {{fumble=[[ceil(95+(@{dodge}+?{Mods|0})/20)]]}} {{crit=[[round((@{dodge}+?{Mods|0})/20)+1]]}}  {{special=[[round((@{dodge}+?{Mods|0})/5)+1]]}}    {{success=[[@{dodge}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Dodge}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button>
+									 <button  title="No Modifier"   type="roll" value="&amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{dodge})]]}} {{fumble=[[ceil(95+([[(@{dodge})]])/20))]]}} {{crit=[[round(([[(@{dodge})]])/20)+1]]}}  {{special=[[round(([[(@{dodge})]])/5)+1]]}}    {{success=[[(@{dodge})]]}} {{roll=[[1d100]]}} {{skillname=Dodge}}"></button><button   title="With Modifier"   class="new_roll"   type="roll" value="&amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[@{dodge}]]}} {{fumble=[[ceil(95+(@{dodge}+?{Mods|0})/20)]]}} {{crit=[[round((@{dodge}+?{Mods|0})/20)+1]]}}  {{special=[[round((@{dodge}+?{Mods|0})/5)+1]]}}    {{success=[[@{dodge}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Dodge}}"></button>
 								  </div>
 								  <div style="margin-left: 5px; display: inline;">
 									 <div class="sheet-input_label" data-i18n="Fumble">Fumble</div>
-									 <button class="sheet-d100_roll" type="roll" value="&amp;{template:RQG-Fumble} {{roll=[[1d100]]}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button>
+									 <button   type="roll" value="&amp;{template:RQG-Fumble} {{roll=[[1d100]]}}"></button>
 								  </div>
 								</div>
 								<div>
@@ -579,7 +581,7 @@
 										   <option value="1d10">1d10</option>
 										   <option value="1d8">1d8</option>			   			   
 										</select>
-										<button class="sheet-d100_roll" style="margin-top: -7px;" type="roll" value="&amp;{template:@{creature_hit_location}@{selected_wpn_type}} {{roll=[[@{selected_die_roll}]]}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button>
+										<button   style="margin-top: -7px;" type="roll" value="&amp;{template:@{creature_hit_location}@{selected_wpn_type}} {{roll=[[@{selected_die_roll}]]}}"></button>
 									</div>
 								</div>
 							</div>
@@ -621,15 +623,15 @@
 						<div class="sheet-header" data-i18n="Spirit-Combat">Spirit Combat</div>
 						<div>
 							<div class="sheet-input_label" data-i18n="Spirit-Combat">Spirit Combat</div>
-							<input name="attr_spirit_combat" class="sheet-text_input" style="width: 24px; margin-right: 5px;" type="text" readonly="" value="0"><button class="sheet-d100_roll" type="roll" value="&amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{spirit_combat})]]}} {{fumble=[[ceil(95+([[(@{spirit_combat})]])/20))]]}} {{crit=[[round(([[(@{spirit_combat})]])/20)+1]]}}  {{special=[[round(([[(@{spirit_combat})]])/5)+1]]}}    {{success=[[(@{spirit_combat})]]}} {{roll=[[1d100]]}} {{skillname=Spirit Combat}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png">
-							</button><button class="sheet-d100_roll" style="margin-right: 5px;" type="roll" value="&amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[@{spirit_combat}]]}} {{fumble=[[ceil(95+(@{spirit_combat}+?{Mods|0})/20)]]}} {{crit=[[round((@{spirit_combat}+?{Mods|0})/20)+1]]}}  {{special=[[round((@{spirit_combat}+?{Mods|0})/5)+1]]}}    {{success=[[@{spirit_combat}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Spirit Combat}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button><div class="sheet-input_label" data-i18n="Damage">Damage</div><input name="attr_sprt_cmbt_damage" class="sheet-text_input" style="width: 70px;" type="text" readonly="" value=""><button class="sheet-d100_roll" type="roll" value="[[@{sprt_cmbt_damage}]]"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button>
+							<input name="attr_spirit_combat" class="sheet-text_input" style="width: 24px; margin-right: 5px;" type="text" readonly="" value="0"><button   title="No Modifier"    type="roll" value="&amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{spirit_combat})]]}} {{fumble=[[ceil(95+([[(@{spirit_combat})]])/20))]]}} {{crit=[[round(([[(@{spirit_combat})]])/20)+1]]}}  {{special=[[round(([[(@{spirit_combat})]])/5)+1]]}}    {{success=[[(@{spirit_combat})]]}} {{roll=[[1d100]]}} {{skillname=Spirit Combat}}">
+							</button><button   title="With Modifier"   class="new_roll"    style="margin-right: 5px;" type="roll" value="&amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[@{spirit_combat}]]}} {{fumble=[[ceil(95+(@{spirit_combat}+?{Mods|0})/20)]]}} {{crit=[[round((@{spirit_combat}+?{Mods|0})/20)+1]]}}  {{special=[[round((@{spirit_combat}+?{Mods|0})/5)+1]]}}    {{success=[[@{spirit_combat}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Spirit Combat}}"></button><div class="sheet-input_label" data-i18n="Damage">Damage</div><input name="attr_sprt_cmbt_damage" class="sheet-text_input" style="width: 70px;" type="text" readonly="" value=""><button   type="roll" value="[[@{sprt_cmbt_damage}]]"></button>
 						</div>
 						<br>
 						<div class="sheet-header" data-i18n="Spirit-Magic">Spirit Magic</div>
 						<div style="margin-left: 210px; display: inline-block;">
 							<div class="sheet-input_label" data-i18n="CHA Limit">CHA Limit</div>
 							<input name="attr_curchr" class="sheet-text_input sheet-percentiles" style="width: 24px;" type="text" readonly="" value="0">
-							 <button class="sheet-d100_roll" type="roll" value="&amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{curpow}*5)]]}} {{fumble=[[ceil(95+([[(@{curpow}*5)]])/20))]]}} {{crit=[[round(([[(@{curpow}*5)]])/20)+1]]}} {{special=[[round(([[(@{curpow}*5)]])/5)+1]]}}         {{success=[[(@{curpow}*5)]]}} {{roll=[[1d100]]}} {{skillname=Spirit Magic}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button><button class="sheet-d100_roll" type="roll" value="&amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{curpow}*5)]]}} {{fumble=[[ceil(95+([[(@{curpow}*5)+?{Mods|0}]])/20))]]}} {{crit=[[round(([[(@{curpow}*5)+?{Mods|0}]])/20)+1]]}} {{special=[[round(([[(@{curpow}*5)+?{Mods|0}]])/5)+1]]}}         {{success=[[(@{curpow}*5)+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Spirit Magic}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button> 
+							 <button title="x5"   type="roll" value="&amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{curpow}*5)]]}} {{fumble=[[ceil(95+([[(@{curpow}*5)]])/20))]]}} {{crit=[[round(([[(@{curpow}*5)]])/20)+1]]}} {{special=[[round(([[(@{curpow}*5)]])/5)+1]]}}         {{success=[[(@{curpow}*5)]]}} {{roll=[[1d100]]}} {{skillname=Spirit Magic}}"></button><button   title="x?"  class="new_roll2"     type="roll" value="&amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{curpow}*5)]]}} {{fumble=[[ceil(95+([[(@{curpow}*5)+?{Mods|0}]])/20))]]}} {{crit=[[round(([[(@{curpow}*5)+?{Mods|0}]])/20)+1]]}} {{special=[[round(([[(@{curpow}*5)+?{Mods|0}]])/5)+1]]}}         {{success=[[(@{curpow}*5)+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Spirit Magic}}"></button> 
 						</div>	
 						<textarea name="attr_spirit_magic" class="sheet-magic_notes"></textarea> 
 						<div>
@@ -653,7 +655,7 @@
 								<div class="sheet-input_label" data-i18n="Free-INT">Free INT</div>
 								<input name="attr_freeint" class="sheet-text_input sheet-percentiles" style="width: 24px;" type="text" value="0">
 								<!--
-								 <button type="roll"  class="sheet-d100_roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{curpow}*5)]]}} {{fumble=[[ceil(95+([[(@{curpow}*5)]])/20))]]}} {{crit=[[round(([[(@{curpow}*5)]])/20)+1]]}} {{special=[[round(([[(@{curpow}*5)]])/5)+1]]}}         {{success=[[(@{curpow}*5)]]}} {{roll=[[1d100]]}} {{skillname=POW Roll}}" ><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png" /></button><button class="sheet-d100_roll" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{curpow}*?{multiplier|5})]]}} {{fumble=[[ceil(95+([[(@{curpow}*?{multiplier|5})]])/20))]]}} {{crit=[[round(([[(@{curpow}*?{multiplier|5})]])/20)+1]]}} {{special=[[round(([[(@{curpow}*?{multiplier|5})]])/5)+1]]}}         {{success=[[(@{curpow}*?{multiplier|5})]]}} {{roll=[[1d100]]}} {{skillname=POW Roll}}"  ><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png" /></button>--> 
+								 <button type="roll"    value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{curpow}*5)]]}} {{fumble=[[ceil(95+([[(@{curpow}*5)]])/20))]]}} {{crit=[[round(([[(@{curpow}*5)]])/20)+1]]}} {{special=[[round(([[(@{curpow}*5)]])/5)+1]]}}         {{success=[[(@{curpow}*5)]]}} {{roll=[[1d100]]}} {{skillname=POW Roll}}" ><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png" /></button><button   type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{curpow}*?{multiplier|5})]]}} {{fumble=[[ceil(95+([[(@{curpow}*?{multiplier|5})]])/20))]]}} {{crit=[[round(([[(@{curpow}*?{multiplier|5})]])/20)+1]]}} {{special=[[round(([[(@{curpow}*?{multiplier|5})]])/5)+1]]}}         {{success=[[(@{curpow}*?{multiplier|5})]]}} {{roll=[[1d100]]}} {{skillname=POW Roll}}"  ><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png" /></button>--> 
 							</div>	
 							<textarea name="attr_sorcery_magic" class="sheet-magic_notes"></textarea> 
 							<br>
@@ -755,7 +757,7 @@
 							  <input type="text"  class="sheet-text_input sheet-percentiles"  name="attr_wpn_attk_value" />
 							  <input type="text"  class="sheet-text_input sheet-percentiles" disabled name="attr_wpn_attk_total" value="@{wpn_attk_value}+@{manipulation_mod}+@{enc_mod}+@{minmod}+@{gen_mod}" />-->
 							  
-											<button class="sheet-d100_roll" style="margin-right: 0px; margin-left: 0px;" type="roll" value="@{melee_value}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button>
+											<button   style="margin-right: 0px; margin-left: 0px;" type="roll" value="@{melee_value}"></button>
 											
 											
 											<textarea name="attr_melee_value" style="display: none;">&amp;{template:melee-roll2} {{name=@{character_name}}} {{tot=[[@{wpn_damage}+@{damagebonus}]]}}{{skillvalue=(@{skillTotal})}} {{fumble=[[{(101-(round((100-((@{skillTotal}*@{skillReduct})+@{skillWpnMod}+@{skillMods}))/20))),100}kl1]]}}  {{crit=[[round([[ceil((@{skillTotal}*@{skillReduct}))+@{skillWpnMod}+@{skillMods}]]/20)+1]]}} {{special=[[round(([[ceil((@{skillTotal}*@{skillReduct}))+@{skillWpnMod}+@{skillMods}]])/5)+1]]}}   {{spclDam=[[@{spcldamage}+@{damagebonus}]]}}   {{crshDam=[[@{wpn_damage}+@{maxDb}+@{damagebonus}]]}}  {{critCrsh=[[@{critdamage}+@{maxDb}+@{damagebonus}]]}} {{critSI=[[@{critdamage}+@{damagebonus}]]}} {{type="[[@{wpn_spl}"]]}}  {{success=[[ceil(ceil((@{skillTotal}*@{skillReduct})))+@{skillWpnMod}+@{skillMods}]]}} {{roll=[[1d100]]}} {{skillname=@{weapon_type}}} {{mntTogVal=[[@{mntTogVal}]]}} {{mntTot=[[@{wpn_damage}+@{mountDB}]]}} {{mntSpcl=[[@{spcldamage}+@{mountDB}]]}} {{mntCrit=[[@{critdamage}+@{mountDB}]]}}
@@ -855,7 +857,7 @@
 							  
 
 							  
-											<button class="sheet-d100_roll" style="margin-right: 0px; margin-left: 0px;" type="roll" value="@{melee_value}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button><textarea name="attr_melee_value" style="display: none;">&amp;{template:melee-roll2} {{name=@{character_name}}} {{tot=[[@{wpn_damage}+@{wpnmdb}]]}}{{skillvalue=(@{skillTotal})}} {{fumble=[[{(101-(round((100-((@{skillTotal}*@{skillReduct})+@{skillWpnMod}+@{skillMods}))/20))),100}kl1]]}} {{crit=[[round([[ceil((@{skillTotal}*@{skillReduct}))+@{skillWpnMod}+@{skillMods}]]/20)+1]]}} {{special=[[round(([[ceil((@{skillTotal}*@{skillReduct}))+@{skillWpnMod}+@{skillMods}]])/5)+1]]}}   {{spclDam=[[@{spcldamage}+@{wpnmdb}]]}}   {{crshDam=[[@{wpn_damage}+@{maxwpnmdb}+@{wpnmdb}]]}}  {{critCrsh=[[@{critdamage}+@{maxwpnmdb}+@{wpnmdb}]]}} {{critSI=[[@{critdamage}+@{wpnmdb}]]}} {{type="[[@{wpn_spl}"]]}}  {{success=[[ceil((@{skillTotal}*@{skillReduct}))+@{skillWpnMod}+@{skillMods}]]}} {{roll=[[1d100]]}} {{mntTogVal=[[0]]}}  {{skillname=@{weapon_type}}} 
+											<button   style="margin-right: 0px; margin-left: 0px;" type="roll" value="@{melee_value}"></button><textarea name="attr_melee_value" style="display: none;">&amp;{template:melee-roll2} {{name=@{character_name}}} {{tot=[[@{wpn_damage}+@{wpnmdb}]]}}{{skillvalue=(@{skillTotal})}} {{fumble=[[{(101-(round((100-((@{skillTotal}*@{skillReduct})+@{skillWpnMod}+@{skillMods}))/20))),100}kl1]]}} {{crit=[[round([[ceil((@{skillTotal}*@{skillReduct}))+@{skillWpnMod}+@{skillMods}]]/20)+1]]}} {{special=[[round(([[ceil((@{skillTotal}*@{skillReduct}))+@{skillWpnMod}+@{skillMods}]])/5)+1]]}}   {{spclDam=[[@{spcldamage}+@{wpnmdb}]]}}   {{crshDam=[[@{wpn_damage}+@{maxwpnmdb}+@{wpnmdb}]]}}  {{critCrsh=[[@{critdamage}+@{maxwpnmdb}+@{wpnmdb}]]}} {{critSI=[[@{critdamage}+@{wpnmdb}]]}} {{type="[[@{wpn_spl}"]]}}  {{success=[[ceil((@{skillTotal}*@{skillReduct}))+@{skillWpnMod}+@{skillMods}]]}} {{roll=[[1d100]]}} {{mntTogVal=[[0]]}}  {{skillname=@{weapon_type}}} 
 
 											&amp;{template:@{creature_hit_location}Melee}} {{roll=[[@{selected_die_roll}]]}}</textarea>
 											
@@ -914,14 +916,14 @@
 						<div class="sheet-skill_category" data-i18n="Agility">Agility</div>
 						<div style="margin-left: 69px; display: inline-block;">
 							<span data-i18n="Modifier"><b>Modifier</b></span>
-							<input name="attr_agility_mod" class="sheet-text_input sheet-skill_values2" type="text" readonly="" value="0"><button class="sheet-d100_roll" type="roll" value="&amp;{template:expRoll} {{skill=Agility Skill }} {{value=[[(?{Skill Value|0})+1]]}} {{name=@{character_name}}}  {{roll=[[1d100+@{agility_mod}]]}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button>
+							<input name="attr_agility_mod" class="sheet-text_input sheet-skill_values2" type="text" readonly="" value="0"><button   type="roll" value="&amp;{template:expRoll} {{skill=Agility Skill }} {{value=[[(?{Skill Value|0})+1]]}} {{name=@{character_name}}}  {{roll=[[1d100+@{agility_mod}]]}}"></button>
 						</div>
 						
 						<fieldset class="repeating_agilitySkills">
 							<input name="attr_skill" class="sheet-text_input sheet-skillName" type="text">
 							<input name="attr_base" class="sheet-text_input sheet-skill_values2" type="text" value="0">
 							<input name="attr_base2" class="sheet-text_input sheet-skill_values2" style="display: none;" type="text" value="0">
-							<input name="attr_skillValue" class="sheet-text_input sheet-skill_values2" type="text" value="0"><input name="attr_skillTotal" class="sheet-text_input sheet-skill_values2" type="text" readonly="" value="0"><button class="sheet-d100_roll" type="roll" value="&amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{skillTotal})]]}} {{fumble=[[{(101-(round((100-(@{skillTotal}+@{skill_mod}))/20))),100}kl1]]}} {{crit=[[round(([[(@{skillTotal}+@{skill_mod})]])/20)+1]]}}  {{special=[[round(([[(@{skillTotal}+@{skill_mod})]])/5)+1]]}}    {{success=[[(@{skillTotal}+@{skill_mod})]]}} {{roll=[[1d100]]}} {{skillname=@{skill}}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button>
+							<input name="attr_skillValue" class="sheet-text_input sheet-skill_values2" type="text" value="0"><input name="attr_skillTotal" class="sheet-text_input sheet-skill_values2" type="text" readonly="" value="0"><button   type="roll" value="&amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{skillTotal})]]}} {{fumble=[[{(101-(round((100-(@{skillTotal}+@{skill_mod}))/20))),100}kl1]]}} {{crit=[[round(([[(@{skillTotal}+@{skill_mod})]])/20)+1]]}}  {{special=[[round(([[(@{skillTotal}+@{skill_mod})]])/5)+1]]}}    {{success=[[(@{skillTotal}+@{skill_mod})]]}} {{roll=[[1d100]]}} {{skillname=@{skill}}}"></button>
 							<input name="attr_sp_toggle1" class="sheet-check-toggle1" style="display: none;" type="checkbox" checked="">							
 							<div class="sheet-exp-toggle1">
 								<input name="attr_expCheck" type="checkbox">
@@ -933,14 +935,14 @@
 						<div class="sheet-skill_category" data-i18n="Communication">Communication</div>
 						<div style="margin-left: 9px; display: inline-block;">
 							<span data-i18n="Modifier"><b>Modifier</b></span>
-							<input name="attr_communication_mod" class="sheet-text_input sheet-skill_values2" type="text" readonly="" value="0"><button class="sheet-d100_roll" type="roll" value="&amp;{template:expRoll} {{skill=Communication Skill }} {{value=[[(?{Skill Value|0})+1]]}} {{name=@{character_name}}}  {{roll=[[1d100+@{communication_mod}]]}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button>
+							<input name="attr_communication_mod" class="sheet-text_input sheet-skill_values2" type="text" readonly="" value="0"><button   type="roll" value="&amp;{template:expRoll} {{skill=Communication Skill }} {{value=[[(?{Skill Value|0})+1]]}} {{name=@{character_name}}}  {{roll=[[1d100+@{communication_mod}]]}}"></button>
 						</div>
 						
 						<fieldset class="repeating_communicationSkills">
 							<input name="attr_skill" class="sheet-text_input sheet-skillName" type="text">
 							<input name="attr_base" class="sheet-text_input sheet-skill_values2" type="text" value="0">
 							<input name="attr_base2" class="sheet-text_input sheet-skill_values2" style="display: none;" type="text" value="0">
-							<input name="attr_skillValue" class="sheet-text_input sheet-skill_values2" type="text" value="0"><input name="attr_skillTotal" class="sheet-text_input sheet-skill_values2" type="text" readonly="" value="0"><button class="sheet-d100_roll" type="roll" value="&amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{skillTotal})]]}} {{fumble=[[{(101-(round((100-(@{skillTotal}+@{skill_mod}))/20))),100}kl1]]}} {{crit=[[round(([[(@{skillTotal}+@{skill_mod})]])/20)+1]]}}  {{special=[[round(([[(@{skillTotal}+@{skill_mod})]])/5)+1]]}}    {{success=[[(@{skillTotal}+@{skill_mod})]]}} {{roll=[[1d100]]}} {{skillname=@{skill}}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button>
+							<input name="attr_skillValue" class="sheet-text_input sheet-skill_values2" type="text" value="0"><input name="attr_skillTotal" class="sheet-text_input sheet-skill_values2" type="text" readonly="" value="0"><button   type="roll" value="&amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{skillTotal})]]}} {{fumble=[[{(101-(round((100-(@{skillTotal}+@{skill_mod}))/20))),100}kl1]]}} {{crit=[[round(([[(@{skillTotal}+@{skill_mod})]])/20)+1]]}}  {{special=[[round(([[(@{skillTotal}+@{skill_mod})]])/5)+1]]}}    {{success=[[(@{skillTotal}+@{skill_mod})]]}} {{roll=[[1d100]]}} {{skillname=@{skill}}}"></button>
 							<input name="attr_sp_toggle1" class="sheet-check-toggle1" style="display: none;" type="checkbox" checked="">
 							<div class="sheet-exp-toggle1">
 								<input name="attr_expCheck" type="checkbox">
@@ -950,14 +952,14 @@
 						<div class="sheet-skill_category" data-i18n="Knowledge">Knowledge</div>
 						<div style="margin-left: 40px; display: inline-block;">
 							<span data-i18n="Modifier"><b>Modifier</b></span>
-							<input name="attr_knowledge_mod" class="sheet-text_input sheet-skill_values2" type="text" readonly="" value="0"><button class="sheet-d100_roll" type="roll" value="&amp;{template:expRoll} {{skill=Knowledge Skill }} {{value=[[(?{Skill Value|0})+1]]}} {{name=@{character_name}}}  {{roll=[[1d100+@{knowledge_mod}]]}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button>
+							<input name="attr_knowledge_mod" class="sheet-text_input sheet-skill_values2" type="text" readonly="" value="0"><button   type="roll" value="&amp;{template:expRoll} {{skill=Knowledge Skill }} {{value=[[(?{Skill Value|0})+1]]}} {{name=@{character_name}}}  {{roll=[[1d100+@{knowledge_mod}]]}}"></button>
 						</div>
 						
 						<fieldset class="repeating_knowledgeSkills">
 							<input name="attr_skill" class="sheet-text_input sheet-skillName" type="text">
 							<input name="attr_base" class="sheet-text_input sheet-skill_values2" type="text" value="0">
 							<input name="attr_base2" class="sheet-text_input sheet-skill_values2" style="display: none;" type="text" value="0">
-							<input name="attr_skillValue" class="sheet-text_input sheet-skill_values2" type="text" value="0"><input name="attr_skillTotal" class="sheet-text_input sheet-skill_values2" type="text" readonly="" value="0"><button class="sheet-d100_roll" type="roll" value="&amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{skillTotal})]]}} {{fumble=[[{(101-(round((100-(@{skillTotal}+@{skill_mod}))/20))),100}kl1]]}} {{crit=[[round(([[(@{skillTotal}+@{skill_mod})]])/20)+1]]}}  {{special=[[round(([[(@{skillTotal}+@{skill_mod})]])/5)+1]]}}    {{success=[[(@{skillTotal}+@{skill_mod})]]}} {{roll=[[1d100]]}} {{skillname=@{skill}}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button>
+							<input name="attr_skillValue" class="sheet-text_input sheet-skill_values2" type="text" value="0"><input name="attr_skillTotal" class="sheet-text_input sheet-skill_values2" type="text" readonly="" value="0"><button   type="roll" value="&amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{skillTotal})]]}} {{fumble=[[{(101-(round((100-(@{skillTotal}+@{skill_mod}))/20))),100}kl1]]}} {{crit=[[round(([[(@{skillTotal}+@{skill_mod})]])/20)+1]]}}  {{special=[[round(([[(@{skillTotal}+@{skill_mod})]])/5)+1]]}}    {{success=[[(@{skillTotal}+@{skill_mod})]]}} {{roll=[[1d100]]}} {{skillname=@{skill}}}"></button>
 							<input name="attr_sp_toggle1" class="sheet-check-toggle1" style="display: none;" type="checkbox" checked="">
 							<div class="sheet-exp-toggle1">
 								<input name="attr_expCheck" type="checkbox">
@@ -977,14 +979,14 @@
 								<div class="sheet-skill_category" data-i18n="Magic">Magic</div>
 								<div style="margin-left: 75px; display: inline-block;">
 									<span data-i18n="Modifier"><b>Modifier</b></span>
-									<input name="attr_magic_mod" class="sheet-text_input sheet-skill_values2" type="text" readonly="" value="0"><button class="sheet-d100_roll" type="roll" value="&amp;{template:expRoll} {{skill=Magic Skill }} {{value=[[(?{Skill Value|0})+1]]}} {{name=@{character_name}}}  {{roll=[[1d100+@{magic_mod}]]}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button>
+									<input name="attr_magic_mod" class="sheet-text_input sheet-skill_values2" type="text" readonly="" value="0"><button   type="roll" value="&amp;{template:expRoll} {{skill=Magic Skill }} {{value=[[(?{Skill Value|0})+1]]}} {{name=@{character_name}}}  {{roll=[[1d100+@{magic_mod}]]}}"></button>
 								</div>
 								
 								<fieldset class="repeating_magicSkills">
 									<input name="attr_skill" class="sheet-text_input sheet-skillName" type="text">
 									<input name="attr_base" class="sheet-text_input sheet-skill_values2" type="text" value="0">
 									<input name="attr_base2" class="sheet-text_input sheet-skill_values2" style="display: none;" type="text" value="0">
-									<input name="attr_skillValue" class="sheet-text_input sheet-skill_values2" type="text" value="0"><input name="attr_skillTotal" class="sheet-text_input sheet-skill_values2" type="text" readonly="" value="0"><button class="sheet-d100_roll" type="roll" value="&amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{skillTotal})]]}} {{fumble=[[{(101-(round((100-(@{skillTotal}+@{skill_mod}))/20))),100}kl1]]}} {{crit=[[round(([[(@{skillTotal}+@{skill_mod})]])/20)+1]]}}  {{special=[[round(([[(@{skillTotal}+@{skill_mod})]])/5)+1]]}}    {{success=[[(@{skillTotal}+@{skill_mod})]]}} {{roll=[[1d100]]}} {{skillname=@{skill}}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button>
+									<input name="attr_skillValue" class="sheet-text_input sheet-skill_values2" type="text" value="0"><input name="attr_skillTotal" class="sheet-text_input sheet-skill_values2" type="text" readonly="" value="0"><button   type="roll" value="&amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{skillTotal})]]}} {{fumble=[[{(101-(round((100-(@{skillTotal}+@{skill_mod}))/20))),100}kl1]]}} {{crit=[[round(([[(@{skillTotal}+@{skill_mod})]])/20)+1]]}}  {{special=[[round(([[(@{skillTotal}+@{skill_mod})]])/5)+1]]}}    {{success=[[(@{skillTotal}+@{skill_mod})]]}} {{roll=[[1d100]]}} {{skillname=@{skill}}}"></button>
 									<input name="attr_sp_toggle1" class="sheet-check-toggle1" style="display: none;" type="checkbox" checked="">
 									<div class="sheet-exp-toggle1">									
 										<input name="attr_expCheck" type="checkbox">							
@@ -994,14 +996,14 @@
 								<div class="sheet-skill_category" data-i18n="Manipulation">Manipulation</div>
 								<div style="margin-left: 29px; display: inline-block;">
 									<span data-i18n="Modifier"><b>Modifier</b></span>
-									<input name="attr_manipulation_mod" class="sheet-text_input sheet-skill_values2" type="text" readonly="" value="0"><button class="sheet-d100_roll" type="roll" value="&amp;{template:expRoll} {{skill=Manipulation Skill }} {{value=[[(?{Skill Value|0})+1]]}} {{name=@{character_name}}}  {{roll=[[1d100+@{manipulation_mod}]]}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button>
+									<input name="attr_manipulation_mod" class="sheet-text_input sheet-skill_values2" type="text" readonly="" value="0"><button   type="roll" value="&amp;{template:expRoll} {{skill=Manipulation Skill }} {{value=[[(?{Skill Value|0})+1]]}} {{name=@{character_name}}}  {{roll=[[1d100+@{manipulation_mod}]]}}"></button>
 								</div>
 								
 								<fieldset class="repeating_manipulationSkills">
 									<input name="attr_skill" class="sheet-text_input sheet-skillName" type="text">
 									<input name="attr_base" class="sheet-text_input sheet-skill_values2" type="text" value="0">
 									<input name="attr_base2" class="sheet-text_input sheet-skill_values2" style="display: none;" type="text" value="0">
-									<input name="attr_skillValue" class="sheet-text_input sheet-skill_values2" type="text" value="0"><input name="attr_skillTotal" class="sheet-text_input sheet-skill_values2" type="text" readonly="" value="0"><button class="sheet-d100_roll" type="roll" value="&amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{skillTotal})]]}} {{fumble=[[{(101-(round((100-(@{skillTotal}+@{skill_mod}))/20))),100}kl1]]}} {{crit=[[round(([[(@{skillTotal}+@{skill_mod})]])/20)+1]]}}  {{special=[[round(([[(@{skillTotal}+@{skill_mod})]])/5)+1]]}}    {{success=[[(@{skillTotal}+@{skill_mod})]]}} {{roll=[[1d100]]}} {{skillname=@{skill}}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button>
+									<input name="attr_skillValue" class="sheet-text_input sheet-skill_values2" type="text" value="0"><input name="attr_skillTotal" class="sheet-text_input sheet-skill_values2" type="text" readonly="" value="0"><button   type="roll" value="&amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{skillTotal})]]}} {{fumble=[[{(101-(round((100-(@{skillTotal}+@{skill_mod}))/20))),100}kl1]]}} {{crit=[[round(([[(@{skillTotal}+@{skill_mod})]])/20)+1]]}}  {{special=[[round(([[(@{skillTotal}+@{skill_mod})]])/5)+1]]}}    {{success=[[(@{skillTotal}+@{skill_mod})]]}} {{roll=[[1d100]]}} {{skillname=@{skill}}}"></button>
 									<input name="attr_sp_toggle1" class="sheet-check-toggle1" style="display: none;" type="checkbox" checked="">
 									<div class="sheet-exp-toggle1">
 										<input name="attr_expCheck" type="checkbox">							
@@ -1012,14 +1014,14 @@
 								<div class="sheet-skill_category" data-i18n="Perception">Perception</div>
 								<div style="margin-left: 43px; display: inline-block;">
 									<span data-i18n="Modifier"><b>Modifier</b></span>
-									<input name="attr_perception_mod" class="sheet-text_input sheet-skill_values2" type="text" readonly="" value="0"><button class="sheet-d100_roll" type="roll" value="&amp;{template:expRoll} {{skill=Perception Skill }} {{value=[[(?{Skill Value|0})+1]]}} {{name=@{character_name}}}  {{roll=[[1d100+@{perception_mod}]]}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button>
+									<input name="attr_perception_mod" class="sheet-text_input sheet-skill_values2" type="text" readonly="" value="0"><button   type="roll" value="&amp;{template:expRoll} {{skill=Perception Skill }} {{value=[[(?{Skill Value|0})+1]]}} {{name=@{character_name}}}  {{roll=[[1d100+@{perception_mod}]]}}"></button>
 								</div>
 								
 								<fieldset class="repeating_perceptionSkills">
 									<input name="attr_skill" class="sheet-text_input sheet-skillName" type="text">
 									<input name="attr_base" class="sheet-text_input sheet-skill_values2" type="text" value="0">
 									<input name="attr_base2" class="sheet-text_input sheet-skill_values2" style="display: none;" type="text" value="0">
-									<input name="attr_skillValue" class="sheet-text_input sheet-skill_values2" type="text" value="0"><input name="attr_skillTotal" class="sheet-text_input sheet-skill_values2" type="text" readonly="" value="0"><button class="sheet-d100_roll" type="roll" value="&amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{skillTotal})]]}} {{fumble=[[{(101-(round((100-(@{skillTotal}+@{skill_mod}))/20))),100}kl1]]}}  {{crit=[[round(([[(@{skillTotal}+@{skill_mod})]])/20)+1]]}}  {{special=[[round(([[(@{skillTotal}+@{skill_mod})]])/5)+1]]}}    {{success=[[(@{skillTotal}+@{skill_mod})]]}} {{roll=[[1d100]]}} {{skillname=@{skill}}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button>
+									<input name="attr_skillValue" class="sheet-text_input sheet-skill_values2" type="text" value="0"><input name="attr_skillTotal" class="sheet-text_input sheet-skill_values2" type="text" readonly="" value="0"><button   type="roll" value="&amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{skillTotal})]]}} {{fumble=[[{(101-(round((100-(@{skillTotal}+@{skill_mod}))/20))),100}kl1]]}}  {{crit=[[round(([[(@{skillTotal}+@{skill_mod})]])/20)+1]]}}  {{special=[[round(([[(@{skillTotal}+@{skill_mod})]])/5)+1]]}}    {{success=[[(@{skillTotal}+@{skill_mod})]]}} {{roll=[[1d100]]}} {{skillname=@{skill}}}"></button>
 									<input name="attr_sp_toggle1" class="sheet-check-toggle1" style="display: none;" type="checkbox" checked="">
 									<div class="sheet-exp-toggle1">									
 										<input name="attr_expCheck" type="checkbox">
@@ -1029,14 +1031,14 @@
 								<div class="sheet-skill_category" data-i18n="Stealth">Stealth</div>
 								<div style="margin-left: 66px; display: inline-block;">
 									<span data-i18n="Modifier"><b>Modifier</b></span>
-									<input name="attr_stealth_mod" class="sheet-text_input sheet-skill_values2" type="text" readonly="" value="0"><button class="sheet-d100_roll" type="roll" value="&amp;{template:expRoll} {{skill=Stealth Skill }} {{value=[[(?{Skill Value|0})+1]]}} {{name=@{character_name}}}  {{roll=[[1d100+@{stealth_mod}]]}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button>
+									<input name="attr_stealth_mod" class="sheet-text_input sheet-skill_values2" type="text" readonly="" value="0"><button   type="roll" value="&amp;{template:expRoll} {{skill=Stealth Skill }} {{value=[[(?{Skill Value|0})+1]]}} {{name=@{character_name}}}  {{roll=[[1d100+@{stealth_mod}]]}}"></button>
 								</div>
 								
 								<fieldset class="repeating_stealthSkills">
 									<input name="attr_skill" class="sheet-text_input sheet-skillName" type="text">
 									<input name="attr_base" class="sheet-text_input sheet-skill_values2" type="text" value="0">
 									<input name="attr_base2" class="sheet-text_input sheet-skill_values2" style="display: none;" type="text" value="0">
-									<input name="attr_skillValue" class="sheet-text_input sheet-skill_values2" type="text" value="0"><input name="attr_skillTotal" class="sheet-text_input sheet-skill_values2" type="text" readonly="" value="0"><button class="sheet-d100_roll" type="roll" value="&amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{skillTotal})]]}} {{fumble=[[{(101-(round((100-(@{skillTotal}+@{skill_mod}))/20))),100}kl1]]}} {{crit=[[round(([[(@{skillTotal}+@{skill_mod})]])/20)+1]]}}  {{special=[[round(([[(@{skillTotal}+@{skill_mod})]])/5)+1]]}}    {{success=[[(@{skillTotal}+@{skill_mod})]]}} {{roll=[[1d100]]}} {{skillname=@{skill}}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button>
+									<input name="attr_skillValue" class="sheet-text_input sheet-skill_values2" type="text" value="0"><input name="attr_skillTotal" class="sheet-text_input sheet-skill_values2" type="text" readonly="" value="0"><button   type="roll" value="&amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{skillTotal})]]}} {{fumble=[[{(101-(round((100-(@{skillTotal}+@{skill_mod}))/20))),100}kl1]]}} {{crit=[[round(([[(@{skillTotal}+@{skill_mod})]])/20)+1]]}}  {{special=[[round(([[(@{skillTotal}+@{skill_mod})]])/5)+1]]}}    {{success=[[(@{skillTotal}+@{skill_mod})]]}} {{roll=[[1d100]]}} {{skillname=@{skill}}}"></button>
 									<input name="attr_sp_toggle1" class="sheet-check-toggle1" style="display: none;" type="checkbox" checked="">									
 									<div class="sheet-exp-toggle1">																		
 										<input name="attr_expCheck" type="checkbox">
@@ -1049,42 +1051,42 @@
 									<div class="sheet-skill_category" data-i18n="Melee-Weapons">Melee Weapons</div>
 									<div style="margin-left: 9px; display: inline-block;">
 										<span data-i18n="Modifier"><b>Modifier</b></span>
-										<input name="attr_manipulation_mod" class="sheet-text_input sheet-skill_values2" type="text" readonly="" value="0"><button class="sheet-d100_roll" type="roll" value="&amp;{template:expRoll} {{skill=Melee Weapon Skill }} {{value=[[(?{Skill Value|0})+1]]}} {{name=@{character_name}}}  {{roll=[[1d100+@{manipulation_mod}]]}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button>
+										<input name="attr_manipulation_mod" class="sheet-text_input sheet-skill_values2" type="text" readonly="" value="0"><button   type="roll" value="&amp;{template:expRoll} {{skill=Melee Weapon Skill }} {{value=[[(?{Skill Value|0})+1]]}} {{name=@{character_name}}}  {{roll=[[1d100+@{manipulation_mod}]]}}"></button>
 									</div>
 									
 									<fieldset class="repeating_meleeSkills">
 										<input name="attr_skill" class="sheet-text_input sheet-skillName" type="text">
 										<input name="attr_base" class="sheet-text_input sheet-skill_values2" type="text" value="0">
 										<input name="attr_base2" class="sheet-text_input sheet-skill_values2" style="display: none;" type="text" value="0">
-										<input name="attr_skillValue" class="sheet-text_input sheet-skill_values2" type="text" value="0"><input name="attr_skillTotal" class="sheet-text_input sheet-skill_values2" type="text" readonly="" value="0"><button class="sheet-d100_roll" type="roll" value="&amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{skillTotal})]]}} {{fumble=[[{(101-(round((100-(@{skillTotal}+@{skill_mod}))/20))),100}kl1]]}} {{crit=[[round(([[(@{skillTotal}+@{skill_mod})]])/20)+1]]}}  {{special=[[round(([[(@{skillTotal}+@{skill_mod})]])/5)+1]]}}    {{success=[[(@{skillTotal}+@{skill_mod})]]}} {{roll=[[1d100]]}} {{skillname=@{skill}}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button>
+										<input name="attr_skillValue" class="sheet-text_input sheet-skill_values2" type="text" value="0"><input name="attr_skillTotal" class="sheet-text_input sheet-skill_values2" type="text" readonly="" value="0"><button   type="roll" value="&amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{skillTotal})]]}} {{fumble=[[{(101-(round((100-(@{skillTotal}+@{skill_mod}))/20))),100}kl1]]}} {{crit=[[round(([[(@{skillTotal}+@{skill_mod})]])/20)+1]]}}  {{special=[[round(([[(@{skillTotal}+@{skill_mod})]])/5)+1]]}}    {{success=[[(@{skillTotal}+@{skill_mod})]]}} {{roll=[[1d100]]}} {{skillname=@{skill}}}"></button>
 										<input name="attr_expCheck" type="checkbox">							
 									</fieldset>
 									<br>
 									<div class="sheet-skill_category" data-i18n="Missile-Weapons">Missile Weapons</div>
 									<div style="margin-left: 4px; display: inline-block;">
 										<span data-i18n="Modifier"><b>Modifier</b></span>
-										<input name="attr_manipulation_mod" class="sheet-text_input sheet-skill_values2" type="text" readonly="" value="0"><button class="sheet-d100_roll" type="roll" value="&amp;{template:expRoll} {{skill=Missle Weapon Skill }} {{value=[[(?{Skill Value|0})+1]]}} {{name=@{character_name}}}  {{roll=[[1d100+@{manipulation_mod}]]}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button>
+										<input name="attr_manipulation_mod" class="sheet-text_input sheet-skill_values2" type="text" readonly="" value="0"><button   type="roll" value="&amp;{template:expRoll} {{skill=Missle Weapon Skill }} {{value=[[(?{Skill Value|0})+1]]}} {{name=@{character_name}}}  {{roll=[[1d100+@{manipulation_mod}]]}}"></button>
 									</div>
 									
 									<fieldset class="repeating_missileSkills">
 										<input name="attr_skill" class="sheet-text_input sheet-skillName" type="text">
 										<input name="attr_base" class="sheet-text_input sheet-skill_values2" type="text" value="0">
 										<input name="attr_base2" class="sheet-text_input sheet-skill_values2" style="display: none;" type="text" value="0">
-										<input name="attr_skillValue" class="sheet-text_input sheet-skill_values2" type="text" value="0"><input name="attr_skillTotal" class="sheet-text_input sheet-skill_values2" type="text" readonly="" value="0"><button class="sheet-d100_roll" type="roll" value="&amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{skillTotal})]]}} {{fumble=[[{(101-(round((100-(@{skillTotal}+@{skill_mod}))/20))),100}kl1]]}} {{crit=[[round(([[(@{skillTotal}+@{skill_mod})]])/20)+1]]}}  {{special=[[round(([[(@{skillTotal})]])/5)+1]]}}    {{success=[[(@{skillTotal}+@{skill_mod})]]}} {{roll=[[1d100]]}} {{skillname=@{skill}}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button>
+										<input name="attr_skillValue" class="sheet-text_input sheet-skill_values2" type="text" value="0"><input name="attr_skillTotal" class="sheet-text_input sheet-skill_values2" type="text" readonly="" value="0"><button   type="roll" value="&amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{skillTotal})]]}} {{fumble=[[{(101-(round((100-(@{skillTotal}+@{skill_mod}))/20))),100}kl1]]}} {{crit=[[round(([[(@{skillTotal}+@{skill_mod})]])/20)+1]]}}  {{special=[[round(([[(@{skillTotal})]])/5)+1]]}}    {{success=[[(@{skillTotal}+@{skill_mod})]]}} {{roll=[[1d100]]}} {{skillname=@{skill}}}"></button>
 										<input name="attr_expCheck" type="checkbox">
 									</fieldset>
 									<br>
 									<div class="sheet-skill_category" data-i18n="Shields">Shields</div>
 									<div style="margin-left: 63px; display: inline-block;">
 										<span data-i18n="Modifier"><b>Modifier</b></span>
-										<input name="attr_manipulation_mod" class="sheet-text_input sheet-skill_values2" type="text" readonly="" value="0"><button class="sheet-d100_roll" type="roll" value="&amp;{template:expRoll} {{skill=Shield Skill }} {{value=[[(?{Skill Value|0})+1]]}} {{name=@{character_name}}}  {{roll=[[1d100+@{manipulation_mod}]]}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button>
+										<input name="attr_manipulation_mod" class="sheet-text_input sheet-skill_values2" type="text" readonly="" value="0"><button   type="roll" value="&amp;{template:expRoll} {{skill=Shield Skill }} {{value=[[(?{Skill Value|0})+1]]}} {{name=@{character_name}}}  {{roll=[[1d100+@{manipulation_mod}]]}}"></button>
 									</div>
 									
 									<fieldset class="repeating_shieldSkills">
 										<input name="attr_skill" class="sheet-text_input sheet-skillName" type="text">
 										<input name="attr_base" class="sheet-text_input sheet-skill_values2" type="text" value="0">
 										<input name="attr_base2" class="sheet-text_input sheet-skill_values2" style="display: none;" type="text" value="0">
-										<input name="attr_skillValue" class="sheet-text_input sheet-skill_values2" type="text" value="0"><input name="attr_skillTotal" class="sheet-text_input sheet-skill_values2" type="text" readonly="" value="0"><button class="sheet-d100_roll" type="roll" value="&amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{skillTotal})]]}} {{fumble=[[{(101-(round((100-(@{skillTotal}+@{skill_mod}))/20))),100}kl1]]}} {{crit=[[round(([[(@{skillTotal})]])/20)+1]]}}  {{special=[[round(([[(@{skillTotal}+@{skill_mod})]])/5)+1]]}}    {{success=[[(@{skillTotal}+@{skill_mod})]]}} {{roll=[[1d100]]}} {{skillname=@{skill}}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button>
+										<input name="attr_skillValue" class="sheet-text_input sheet-skill_values2" type="text" value="0"><input name="attr_skillTotal" class="sheet-text_input sheet-skill_values2" type="text" readonly="" value="0"><button   type="roll" value="&amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{skillTotal})]]}} {{fumble=[[{(101-(round((100-(@{skillTotal}+@{skill_mod}))/20))),100}kl1]]}} {{crit=[[round(([[(@{skillTotal})]])/20)+1]]}}  {{special=[[round(([[(@{skillTotal}+@{skill_mod})]])/5)+1]]}}    {{success=[[(@{skillTotal}+@{skill_mod})]]}} {{roll=[[1d100]]}} {{skillname=@{skill}}}"></button>
 										<input name="attr_expCheck" type="checkbox">
 
 									</fieldset>
@@ -1092,7 +1094,7 @@
 									<div class="sheet-skill_category" data-i18n="Natural-Weapons">Natural Weapons</div>
 									<div style="margin-left: -1px; display: inline-block;">
 										<span data-i18n="Modifier"><b>Modifier</b></span>
-										<input name="attr_manipulation_mod" class="sheet-text_input sheet-skill_values2" type="text" readonly="" value="0"><button class="sheet-d100_roll" type="roll" value="&amp;{template:expRoll} {{skill=Natural Weapon Skill }} {{value=[[(?{Skill Value|0})+1]]}} {{name=@{character_name}}}  {{roll=[[1d100+@{manipulation_mod}]]}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button>
+										<input name="attr_manipulation_mod" class="sheet-text_input sheet-skill_values2" type="text" readonly="" value="0"><button   type="roll" value="&amp;{template:expRoll} {{skill=Natural Weapon Skill }} {{value=[[(?{Skill Value|0})+1]]}} {{name=@{character_name}}}  {{roll=[[1d100+@{manipulation_mod}]]}}"></button>
 										<input name="attr_expCheck" type="checkbox">
 
 									</div>
@@ -1101,7 +1103,7 @@
 										<input name="attr_skill" class="sheet-text_input sheet-skillName" type="text">
 										<input name="attr_base" class="sheet-text_input sheet-skill_values2" type="text" value="0">
 										<input name="attr_base2" class="sheet-text_input sheet-skill_values2" style="display: none;" type="text" value="0">
-										<input name="attr_skillValue" class="sheet-text_input sheet-skill_values2" type="text" value="0"><input name="attr_skillTotal" class="sheet-text_input sheet-skill_values2" type="text" readonly="" value="0"><button class="sheet-d100_roll" type="roll" value="&amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{skillTotal})]]}} {{fumble=[[{(101-(round((100-(@{skillTotal}+@{skill_mod}))/20))),100}kl1]]}} {{crit=[[round(([[(@{skillTotal}+@{skill_mod})]])/20)+1]]}}  {{special=[[round(([[(@{skillTotal})]])/5)+1]]}}    {{success=[[(@{skillTotal}+@{skill_mod})]]}} {{roll=[[1d100]]}} {{skillname=@{skill}}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button>
+										<input name="attr_skillValue" class="sheet-text_input sheet-skill_values2" type="text" value="0"><input name="attr_skillTotal" class="sheet-text_input sheet-skill_values2" type="text" readonly="" value="0"><button   type="roll" value="&amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{skillTotal})]]}} {{fumble=[[{(101-(round((100-(@{skillTotal}+@{skill_mod}))/20))),100}kl1]]}} {{crit=[[round(([[(@{skillTotal}+@{skill_mod})]])/20)+1]]}}  {{special=[[round(([[(@{skillTotal})]])/5)+1]]}}    {{success=[[(@{skillTotal}+@{skill_mod})]]}} {{roll=[[1d100]]}} {{skillname=@{skill}}}"></button>
 										<input name="attr_expCheck" type="checkbox">
 									</fieldset>
 									<br>
@@ -1225,7 +1227,7 @@
 								<input name="attr_wpn_sr1a1" class="sheet-value_display2" type="text" value="0">
 								<input name="attr_wpn_attk1a1" class="sheet-value_display2" type="text" value="0">
 								<input name="attr_wpn_damage1a1" class="sheet-value_display2" style="width: 80px;" type="text" value="0">
-								<button class="sheet-d100_roll" type="roll" value="&amp;{template:melee-roll} {{name=@{animal1_name}}} {{tot=[[@{wpn_damage1a1}]]}}  {{skillvalue=[[@{wpn_attk1a1}]]}} {{fumble=[[{(101-(round((100-(@{wpn_attk1a1}))/20))),100}kl1]]}} {{crit=[[ceil(([[@{wpn_attk1a1}]])/20)+1]]}} {{special=[[ceil(([[@{wpn_attk1a1}]])/5)+1]]}}         {{success=[[@{wpn_attk1a1}]]}} {{roll=[[1d100]]}} {{skillname=@{wpn_name1a1}}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button><button class="sheet-d100_roll" style="margin: 0px;" type="roll" value="&amp;{template:melee-roll} {{name=@{animal1_name}}} {{tot=[[@{wpn_damage1a1}]]}}  {{skillvalue=[[@{wpn_attk1a1}+?{mods|0}]]}} {{fumble=[[{(101-(round((100-(@{wpn_attk1a1}+?{mods|0}))/20))),100}kl1]]}} {{crit=[[ceil(([[@{wpn_attk1a1}+?{mods|0}]])/20)+1]]}} {{special=[[ceil(([[@{wpn_attk1a1}+?{mods|0}]])/5)+1]]}}         {{success=[[@{wpn_attk1a1}+?{mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{wpn_name1a1}}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button>
+								<button   type="roll" value="&amp;{template:melee-roll} {{name=@{animal1_name}}} {{tot=[[@{wpn_damage1a1}]]}}  {{skillvalue=[[@{wpn_attk1a1}]]}} {{fumble=[[{(101-(round((100-(@{wpn_attk1a1}))/20))),100}kl1]]}} {{crit=[[ceil(([[@{wpn_attk1a1}]])/20)+1]]}} {{special=[[ceil(([[@{wpn_attk1a1}]])/5)+1]]}}         {{success=[[@{wpn_attk1a1}]]}} {{roll=[[1d100]]}} {{skillname=@{wpn_name1a1}}}"></button><button title="With Modifier" class="new_roll"  style="margin: 0px;" type="roll" value="&amp;{template:melee-roll} {{name=@{animal1_name}}} {{tot=[[@{wpn_damage1a1}]]}}  {{skillvalue=[[@{wpn_attk1a1}+?{mods|0}]]}} {{fumble=[[{(101-(round((100-(@{wpn_attk1a1}+?{mods|0}))/20))),100}kl1]]}} {{crit=[[ceil(([[@{wpn_attk1a1}+?{mods|0}]])/20)+1]]}} {{special=[[ceil(([[@{wpn_attk1a1}+?{mods|0}]])/5)+1]]}}         {{success=[[@{wpn_attk1a1}+?{mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{wpn_name1a1}}}"></button>
 			
 							</div>
 
@@ -1234,7 +1236,7 @@
 								<input name="attr_wpn_sr1a2" class="sheet-value_display2" type="text" value="0">
 								<input name="attr_wpn_attk1a2" class="sheet-value_display2" type="text" value="0">
 								<input name="attr_wpn_damage1a2" class="sheet-value_display2" style="width: 80px;" type="text" value="0">
-								<button class="sheet-d100_roll" type="roll" value="&amp;{template:melee-roll} {{name=@{animal1_name}}} {{tot=[[@{wpn_damage1a2}]]}}  {{skillvalue=[[@{wpn_attk1a2}]]}} {{fumble=[[{(101-(round((100-(@{wpn_attk1a2}))/20))),100}kl1]]}} {{crit=[[ceil(([[@{wpn_attk1a2}]])/20)+1]]}} {{special=[[ceil(([[@{wpn_attk1a2}]])/5)+1]]}}         {{success=[[@{wpn_attk1a2}]]}} {{roll=[[1d100]]}} {{skillname=@{wpn_name1a2}}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button><button class="sheet-d100_roll" style="margin: 0px;" type="roll" value="&amp;{template:melee-roll} {{name=@{animal1_name}}} {{tot=[[@{wpn_damage1a2}]]}}  {{skillvalue=[[@{wpn_attk1a2}+?{mods|0}]]}} {{fumble=[[{(101-(round((100-(@{wpn_attk1a2}+?{mods|0}))/20))),100}kl1]]}} {{crit=[[ceil(([[@{wpn_attk1a2}+?{mods|0}]])/20)+1]]}} {{special=[[ceil(([[@{wpn_attk1a2}+?{mods|0}]])/5)+1]]}}         {{success=[[@{wpn_attk1a2}+?{mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{wpn_name1a2}}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button>
+								<button   type="roll" value="&amp;{template:melee-roll} {{name=@{animal1_name}}} {{tot=[[@{wpn_damage1a2}]]}}  {{skillvalue=[[@{wpn_attk1a2}]]}} {{fumble=[[{(101-(round((100-(@{wpn_attk1a2}))/20))),100}kl1]]}} {{crit=[[ceil(([[@{wpn_attk1a2}]])/20)+1]]}} {{special=[[ceil(([[@{wpn_attk1a2}]])/5)+1]]}}         {{success=[[@{wpn_attk1a2}]]}} {{roll=[[1d100]]}} {{skillname=@{wpn_name1a2}}}"></button><button   title="With Modifier" class="new_roll"   style="margin: 0px;" type="roll" value="&amp;{template:melee-roll} {{name=@{animal1_name}}} {{tot=[[@{wpn_damage1a2}]]}}  {{skillvalue=[[@{wpn_attk1a2}+?{mods|0}]]}} {{fumble=[[{(101-(round((100-(@{wpn_attk1a2}+?{mods|0}))/20))),100}kl1]]}} {{crit=[[ceil(([[@{wpn_attk1a2}+?{mods|0}]])/20)+1]]}} {{special=[[ceil(([[@{wpn_attk1a2}+?{mods|0}]])/5)+1]]}}         {{success=[[@{wpn_attk1a2}+?{mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{wpn_name1a2}}}"></button>
 			
 							</div>	
 							
@@ -1243,7 +1245,7 @@
 								<input name="attr_wpn_sr1a3" class="sheet-value_display2" type="text" value="0">
 								<input name="attr_wpn_attk1a3" class="sheet-value_display2" type="text" value="0">
 								<input name="attr_wpn_damage1a3" class="sheet-value_display2" style="width: 80px;" type="text" value="0">
-								<button class="sheet-d100_roll" type="roll" value="&amp;{template:melee-roll} {{name=@{animal1_name}}} {{tot=[[@{wpn_damage1a3}]]}}  {{skillvalue=[[@{wpn_attk1a3}]]}} {{fumble=[[{(101-(round((100-(@{wpn_attk1a2}))/20))),100}kl1]]}} {{crit=[[ceil(([[@{wpn_attk1a3}]])/20)+1]]}} {{crit=[[ceil(([[@{wpn_attk1a3}]])/20)+1]]}} {{special=[[ceil(([[@{wpn_attk1a3}]])/5)+1]]}}         {{success=[[@{wpn_attk1a3}]]}} {{roll=[[1d100]]}} {{skillname=@{wpn_name1a3}}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button><button class="sheet-d100_roll" style="margin: 0px;" type="roll" value="&amp;{template:melee-roll} {{name=@{animal1_name}}} {{tot=[[@{wpn_damage1a3}]]}}  {{skillvalue=[[@{wpn_attk1a3}+?{mods|0}]]}} {{fumble=[[{(101-(round((100-(@{wpn_attk1a3}+?{mods|0}))/20))),100}kl1]]}} {{crit=[[ceil(([[@{wpn_attk1a3}+?{mods|0}]])/20)+1]]}} {{special=[[ceil(([[@{wpn_attk1a3}+?{mods|0}]])/5)+1]]}}         {{success=[[@{wpn_attk1a3}+?{mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{wpn_name1a3}}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button>
+								<button   type="roll" value="&amp;{template:melee-roll} {{name=@{animal1_name}}} {{tot=[[@{wpn_damage1a3}]]}}  {{skillvalue=[[@{wpn_attk1a3}]]}} {{fumble=[[{(101-(round((100-(@{wpn_attk1a2}))/20))),100}kl1]]}} {{crit=[[ceil(([[@{wpn_attk1a3}]])/20)+1]]}} {{crit=[[ceil(([[@{wpn_attk1a3}]])/20)+1]]}} {{special=[[ceil(([[@{wpn_attk1a3}]])/5)+1]]}}         {{success=[[@{wpn_attk1a3}]]}} {{roll=[[1d100]]}} {{skillname=@{wpn_name1a3}}}"></button><button   title="With Modifier" class="new_roll"   style="margin: 0px;" type="roll" value="&amp;{template:melee-roll} {{name=@{animal1_name}}} {{tot=[[@{wpn_damage1a3}]]}}  {{skillvalue=[[@{wpn_attk1a3}+?{mods|0}]]}} {{fumble=[[{(101-(round((100-(@{wpn_attk1a3}+?{mods|0}))/20))),100}kl1]]}} {{crit=[[ceil(([[@{wpn_attk1a3}+?{mods|0}]])/20)+1]]}} {{special=[[ceil(([[@{wpn_attk1a3}+?{mods|0}]])/5)+1]]}}         {{success=[[@{wpn_attk1a3}+?{mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{wpn_name1a3}}}"></button>
 			
 							</div>								
 							<br>
@@ -1259,7 +1261,7 @@
 									<div>
 										<input name="attr_skill_name1a1" class="sheet-value_display sheet-ally_skill" style="width: 232px; text-align: left; font-size: x-small;" type="text" value="skill">
 										<input name="attr_skill_value1a1" class="sheet-value_display2" type="text" value="0">
-										<!--<button type="roll" class="sheet-d100_roll" value="&{template:skillRoll} {{name=@{animal1_name}}}  {{skillvalue=[[@{skill_value1}]]}} {{fumble=[[ceil(95+([[@{skill_value1}]])/20))]]}} {{crit=[[ceil(([[@{skill_value1}]])/20)+1]]}} {{special=[[ceil(([[@{skill_value1}]])/5)+1]]}}         {{success=[[@{skill_value1}]]}} {{roll=[[1d100]]}} {{skillname=@{skill_name1}}}" ><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png" /></button>--><button class="sheet-d100_roll" style="margin: 0px;" type="roll" value="&amp;{template:skillRoll} {{name=@{animal1_name}}}  {{skillvalue=[[@{skill_value1a1}]]}} {{success=[[@{skill_value1a1}+?{mods|0}]]}}  {{fumble=[[{(101-(round((100-(@{skill_value1a1}+?{mods|0}))/20))),100}kl1]]}} {{crit=[[ceil(([[@{skill_value1a1}+?{mods|0}]])/20)+1]]}} {{special=[[ceil(([[@{skill_value1a1}+?{mods|0}]])/5)+1]]}}         {{roll=[[1d100]]}} {{skillname=@{skill_name1a1}}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button>
+										<!--<button type="roll"   value="&{template:skillRoll} {{name=@{animal1_name}}}  {{skillvalue=[[@{skill_value1}]]}} {{fumble=[[ceil(95+([[@{skill_value1}]])/20))]]}} {{crit=[[ceil(([[@{skill_value1}]])/20)+1]]}} {{special=[[ceil(([[@{skill_value1}]])/5)+1]]}}         {{success=[[@{skill_value1}]]}} {{roll=[[1d100]]}} {{skillname=@{skill_name1}}}" ><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png" /></button>--><button   style="margin: 0px;" type="roll" value="&amp;{template:skillRoll} {{name=@{animal1_name}}}  {{skillvalue=[[@{skill_value1a1}]]}} {{success=[[@{skill_value1a1}+?{mods|0}]]}}  {{fumble=[[{(101-(round((100-(@{skill_value1a1}+?{mods|0}))/20))),100}kl1]]}} {{crit=[[ceil(([[@{skill_value1a1}+?{mods|0}]])/20)+1]]}} {{special=[[ceil(([[@{skill_value1a1}+?{mods|0}]])/5)+1]]}}         {{roll=[[1d100]]}} {{skillname=@{skill_name1a1}}}"></button>
 									</div>
 								</span>
 								<span style="display: inline-block;">
@@ -1271,7 +1273,7 @@
 									<div>
 										<input name="attr_skill_name1a2" class="sheet-value_display sheet-ally_skill" style="width: 232px; text-align: left; font-size: x-small;" type="text" value="skill">
 										<input name="attr_skill_value1a2" class="sheet-value_display2" type="text" value="0">
-										<!--<button type="roll" class="sheet-d100_roll" value="&{template:skillRoll} {{name=@{animal1_name}}}  {{skillvalue=[[@{skill_value2}]]}} {{fumble=[[ceil(95+([[@{skill_value2}]])/20))]]}} {{crit=[[ceil(([[@{skill_value2}]])/20)+1]]}} {{special=[[ceil(([[@{skill_value2}]])/5)+1]]}}         {{success=[[@{skill_value2}]]}} {{roll=[[1d100]]}} {{skillname=@{skill_name2}}}" ><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png" /></button>--><button class="sheet-d100_roll" style="margin: 0px;" type="roll" value="&amp;{template:skillRoll} {{name=@{animal1_name}}}  {{skillvalue=[[@{skill_value1a2}]]}} {{success=[[@{skill_value1a2}+?{mods|0}]]}}  {{fumble=[[{(101-(round((100-(@{skill_value1a2}+?{mods|0}))/20))),100}kl1]]}} {{crit=[[ceil(([[@{skill_value1a2}+?{mods|0}]])/20)+1]]}} {{special=[[ceil(([[@{skill_value1a2}+?{mods|0}]])/5)+1]]}}         {{roll=[[1d100]]}} {{skillname=@{skill_name1a2}}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button>
+										<!--<button type="roll"   value="&{template:skillRoll} {{name=@{animal1_name}}}  {{skillvalue=[[@{skill_value2}]]}} {{fumble=[[ceil(95+([[@{skill_value2}]])/20))]]}} {{crit=[[ceil(([[@{skill_value2}]])/20)+1]]}} {{special=[[ceil(([[@{skill_value2}]])/5)+1]]}}         {{success=[[@{skill_value2}]]}} {{roll=[[1d100]]}} {{skillname=@{skill_name2}}}" ><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png" /></button>--><button   style="margin: 0px;" type="roll" value="&amp;{template:skillRoll} {{name=@{animal1_name}}}  {{skillvalue=[[@{skill_value1a2}]]}} {{success=[[@{skill_value1a2}+?{mods|0}]]}}  {{fumble=[[{(101-(round((100-(@{skill_value1a2}+?{mods|0}))/20))),100}kl1]]}} {{crit=[[ceil(([[@{skill_value1a2}+?{mods|0}]])/20)+1]]}} {{special=[[ceil(([[@{skill_value1a2}+?{mods|0}]])/5)+1]]}}         {{roll=[[1d100]]}} {{skillname=@{skill_name1a2}}}"></button>
 									</div>
 								</span>
 								<span style="display: inline-block;">
@@ -1283,7 +1285,7 @@
 									<div>
 										<input name="attr_skill_name1a3" class="sheet-value_display sheet-ally_skill" style="width: 232px; text-align: left;" type="text" value="skill">
 										<input name="attr_skill_value1a3" class="sheet-value_display2" type="text" value="0">
-										<!--<button type="roll" class="sheet-d100_roll" value="&{template:skillRoll} {{name=@{animal1_name}}}  {{skillvalue=[[@{skill_value2}]]}} {{fumble=[[ceil(95+([[@{skill_value2}]])/20))]]}} {{crit=[[ceil(([[@{skill_value2}]])/20)+1]]}} {{special=[[ceil(([[@{skill_value2}]])/5)+1]]}}         {{success=[[@{skill_value2}]]}} {{roll=[[1d100]]}} {{skillname=@{skill_name2}}}" ><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png" /></button>--><button class="sheet-d100_roll" style="margin: 0px;" type="roll" value="&amp;{template:skillRoll} {{name=@{animal1_name}}}  {{skillvalue=[[@{skill_value1a3}]]}} {{success=[[@{skill_value1a3}+?{mods|0}]]}}  {{fumble=[[{(101-(round((100-(@{skill_value1a3}+?{mods|0}))/20))),100}kl1]]}} {{crit=[[ceil(([[@{skill_value1a3}+?{mods|0}]])/20)+1]]}} {{special=[[ceil(([[@{skill_value1a3}+?{mods|0}]])/5)+1]]}}         {{roll=[[1d100]]}} {{skillname=@{skill_name1a3}}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button>
+										<!--<button type="roll"   value="&{template:skillRoll} {{name=@{animal1_name}}}  {{skillvalue=[[@{skill_value2}]]}} {{fumble=[[ceil(95+([[@{skill_value2}]])/20))]]}} {{crit=[[ceil(([[@{skill_value2}]])/20)+1]]}} {{special=[[ceil(([[@{skill_value2}]])/5)+1]]}}         {{success=[[@{skill_value2}]]}} {{roll=[[1d100]]}} {{skillname=@{skill_name2}}}" ><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png" /></button>--><button   style="margin: 0px;" type="roll" value="&amp;{template:skillRoll} {{name=@{animal1_name}}}  {{skillvalue=[[@{skill_value1a3}]]}} {{success=[[@{skill_value1a3}+?{mods|0}]]}}  {{fumble=[[{(101-(round((100-(@{skill_value1a3}+?{mods|0}))/20))),100}kl1]]}} {{crit=[[ceil(([[@{skill_value1a3}+?{mods|0}]])/20)+1]]}} {{special=[[ceil(([[@{skill_value1a3}+?{mods|0}]])/5)+1]]}}         {{roll=[[1d100]]}} {{skillname=@{skill_name1a3}}}"></button>
 									</div>
 								</span>									
 							</div>
@@ -1297,7 +1299,7 @@
 									<div>
 										<input name="attr_skill_name1a4" class="sheet-value_display sheet-ally_skill" style="width: 232px; text-align: left;" type="text" value="skill">
 										<input name="attr_skill_value1a4" class="sheet-value_display2" type="text" value="0">
-										<!--<button type="roll" class="sheet-d100_roll" value="&{template:skillRoll} {{name=@{animal1_name}}}  {{skillvalue=[[@{skill_value1}]]}} {{fumble=[[ceil(95+([[@{skill_value1}]])/20))]]}} {{crit=[[ceil(([[@{skill_value1}]])/20)+1]]}} {{special=[[ceil(([[@{skill_value1}]])/5)+1]]}}         {{success=[[@{skill_value1}]]}} {{roll=[[1d100]]}} {{skillname=@{skill_name1}}}" ><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png" /></button>--><button class="sheet-d100_roll" style="margin: 0px;" type="roll" value="&amp;{template:skillRoll} {{name=@{animal1_name}}}  {{skillvalue=[[@{skill_value1a4}]]}} {{success=[[@{skill_value1a4}+?{mods|0}]]}}  {{fumble=[[{(101-(round((100-(@{skill_value1a4}+?{mods|0}))/20))),100}kl1]]}} {{crit=[[ceil(([[@{skill_value1a4}+?{mods|0}]])/20)+1]]}} {{special=[[ceil(([[@{skill_value1a4}+?{mods|0}]])/5)+1]]}}         {{roll=[[1d100]]}} {{skillname=@{skill_name1a4}}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button>
+										<!--<button type="roll"   value="&{template:skillRoll} {{name=@{animal1_name}}}  {{skillvalue=[[@{skill_value1}]]}} {{fumble=[[ceil(95+([[@{skill_value1}]])/20))]]}} {{crit=[[ceil(([[@{skill_value1}]])/20)+1]]}} {{special=[[ceil(([[@{skill_value1}]])/5)+1]]}}         {{success=[[@{skill_value1}]]}} {{roll=[[1d100]]}} {{skillname=@{skill_name1}}}" ><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png" /></button>--><button   style="margin: 0px;" type="roll" value="&amp;{template:skillRoll} {{name=@{animal1_name}}}  {{skillvalue=[[@{skill_value1a4}]]}} {{success=[[@{skill_value1a4}+?{mods|0}]]}}  {{fumble=[[{(101-(round((100-(@{skill_value1a4}+?{mods|0}))/20))),100}kl1]]}} {{crit=[[ceil(([[@{skill_value1a4}+?{mods|0}]])/20)+1]]}} {{special=[[ceil(([[@{skill_value1a4}+?{mods|0}]])/5)+1]]}}         {{roll=[[1d100]]}} {{skillname=@{skill_name1a4}}}"></button>
 									</div>
 								</span>
 								<span style="display: inline-block;">
@@ -1309,7 +1311,7 @@
 									<div>
 										<input name="attr_skill_name1a5" class="sheet-value_display sheet-ally_skill" style="width: 232px; text-align: left;" type="text" value="skill">
 										<input name="attr_skill_value1a5" class="sheet-value_display2" type="text" value="0">
-										<!--<button type="roll" class="sheet-d100_roll" value="&{template:skillRoll} {{name=@{animal1_name}}}  {{skillvalue=[[@{skill_value2}]]}} {{fumble=[[ceil(95+([[@{skill_value2}]])/20))]]}} {{crit=[[ceil(([[@{skill_value2}]])/20)+1]]}} {{special=[[ceil(([[@{skill_value2}]])/5)+1]]}}         {{success=[[@{skill_value2}]]}} {{roll=[[1d100]]}} {{skillname=@{skill_name2}}}" ><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png" /></button>--><button class="sheet-d100_roll" style="margin: 0px;" type="roll" value="&amp;{template:skillRoll} {{name=@{animal1_name}}}  {{skillvalue=[[@{skill_value1a5}]]}} {{success=[[@{skill_value1a5}+?{mods|0}]]}}  {{fumble=[[{(101-(round((100-(@{skill_value1a5}+?{mods|0}))/20))),100}kl1]]}} {{crit=[[ceil(([[@{skill_value1a5}+?{mods|0}]])/20)+1]]}} {{special=[[ceil(([[@{skill_value1a5}+?{mods|0}]])/5)+1]]}}         {{roll=[[1d100]]}} {{skillname=@{skill_name1a5}}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button>
+										<!--<button type="roll"   value="&{template:skillRoll} {{name=@{animal1_name}}}  {{skillvalue=[[@{skill_value2}]]}} {{fumble=[[ceil(95+([[@{skill_value2}]])/20))]]}} {{crit=[[ceil(([[@{skill_value2}]])/20)+1]]}} {{special=[[ceil(([[@{skill_value2}]])/5)+1]]}}         {{success=[[@{skill_value2}]]}} {{roll=[[1d100]]}} {{skillname=@{skill_name2}}}" ><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png" /></button>--><button   style="margin: 0px;" type="roll" value="&amp;{template:skillRoll} {{name=@{animal1_name}}}  {{skillvalue=[[@{skill_value1a5}]]}} {{success=[[@{skill_value1a5}+?{mods|0}]]}}  {{fumble=[[{(101-(round((100-(@{skill_value1a5}+?{mods|0}))/20))),100}kl1]]}} {{crit=[[ceil(([[@{skill_value1a5}+?{mods|0}]])/20)+1]]}} {{special=[[ceil(([[@{skill_value1a5}+?{mods|0}]])/5)+1]]}}         {{roll=[[1d100]]}} {{skillname=@{skill_name1a5}}}"></button>
 									</div>
 								</span>
 								<span style="display: inline-block;">
@@ -1321,7 +1323,7 @@
 									<div>
 										<input name="attr_skill_name1a6" class="sheet-value_display sheet-ally_skill" style="width: 232px; text-align: left;" type="text" value="skill">
 										<input name="attr_skill_value1a6" class="sheet-value_display2" type="text" value="0">
-										<!--<button type="roll" class="sheet-d100_roll" value="&{template:skillRoll} {{name=@{animal1_name}}}  {{skillvalue=[[@{skill_value2}]]}} {{fumble=[[ceil(95+([[@{skill_value2}]])/20))]]}} {{crit=[[ceil(([[@{skill_value2}]])/20)+1]]}} {{special=[[ceil(([[@{skill_value2}]])/5)+1]]}}         {{success=[[@{skill_value2}]]}} {{roll=[[1d100]]}} {{skillname=@{skill_name2}}}" ><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png" /></button>--><button class="sheet-d100_roll" style="margin: 0px;" type="roll" value="&amp;{template:skillRoll} {{name=@{animal1_name}}}  {{skillvalue=[[@{skill_value1a6}]]}} {{success=[[@{skill_value1a6}+?{mods|0}]]}}  {{fumble=[[{(101-(round((100-(@{skill_value1a6}+?{mods|0}))/20))),100}kl1]]}} {{crit=[[ceil(([[@{skill_value1a6}+?{mods|0}]])/20)+1]]}} {{special=[[ceil(([[@{skill_value1a6}+?{mods|0}]])/5)+1]]}}         {{roll=[[1d100]]}} {{skillname=@{skill_name1a6}}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button>
+										<!--<button type="roll"   value="&{template:skillRoll} {{name=@{animal1_name}}}  {{skillvalue=[[@{skill_value2}]]}} {{fumble=[[ceil(95+([[@{skill_value2}]])/20))]]}} {{crit=[[ceil(([[@{skill_value2}]])/20)+1]]}} {{special=[[ceil(([[@{skill_value2}]])/5)+1]]}}         {{success=[[@{skill_value2}]]}} {{roll=[[1d100]]}} {{skillname=@{skill_name2}}}" ><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png" /></button>--><button   style="margin: 0px;" type="roll" value="&amp;{template:skillRoll} {{name=@{animal1_name}}}  {{skillvalue=[[@{skill_value1a6}]]}} {{success=[[@{skill_value1a6}+?{mods|0}]]}}  {{fumble=[[{(101-(round((100-(@{skill_value1a6}+?{mods|0}))/20))),100}kl1]]}} {{crit=[[ceil(([[@{skill_value1a6}+?{mods|0}]])/20)+1]]}} {{special=[[ceil(([[@{skill_value1a6}+?{mods|0}]])/5)+1]]}}         {{roll=[[1d100]]}} {{skillname=@{skill_name1a6}}}"></button>
 									</div>
 								</span>									
 							</div>							
@@ -1416,7 +1418,7 @@ THP 0/0
 								<input name="attr_wpn_sr2a1" class="sheet-value_display2" type="text" value="0">
 								<input name="attr_wpn_attk2a1" class="sheet-value_display2" type="text" value="0">
 								<input name="attr_wpn_damage2a1" class="sheet-value_display2" style="width: 80px;" type="text" value="0">
-								<button class="sheet-d100_roll" type="roll" value="&amp;{template:melee-roll} {{name=@{animal2_name}}} {{tot=[[@{wpn_damage2a1}]]}}  {{skillvalue=[[@{wpn_attk2a1}]]}} {{fumble=[[ceil(95+([[@{wpn_attk2a1}]])/20))]]}} {{crit=[[ceil(([[@{wpn_attk2a1}]])/20)+1]]}} {{special=[[ceil(([[@{wpn_attk2a1}]])/5)+1]]}}         {{success=[[@{wpn_attk2a1}]]}} {{roll=[[1d100]]}} {{skillname=@{wpn_name2a1}}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button><button class="sheet-d100_roll" style="margin: 0px;" type="roll" value="&amp;{template:melee-roll} {{name=@{animal2_name}}} {{tot=[[@{wpn_damage2a1}]]}}  {{skillvalue=[[@{wpn_attk2a1}+?{mods|0}]]}} {{fumble=[[{(101-(round((100-(@{wpn_attk2a1}+?{mods|0}))/20))),100}kl1]]}} &#9;{{crit=[[ceil(([[@{wpn_attk2a1}+?{mods|0}]])/20)+1]]}} {{special=[[ceil(([[@{wpn_attk2a1}+?{mods|0}]])/5)+1]]}}         {{success=[[@{wpn_attk2a1}+?{mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{wpn_name2a1}}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button>
+								<button   type="roll" value="&amp;{template:melee-roll} {{name=@{animal2_name}}} {{tot=[[@{wpn_damage2a1}]]}}  {{skillvalue=[[@{wpn_attk2a1}]]}} {{fumble=[[ceil(95+([[@{wpn_attk2a1}]])/20))]]}} {{crit=[[ceil(([[@{wpn_attk2a1}]])/20)+1]]}} {{special=[[ceil(([[@{wpn_attk2a1}]])/5)+1]]}}         {{success=[[@{wpn_attk2a1}]]}} {{roll=[[1d100]]}} {{skillname=@{wpn_name2a1}}}"></button><button  title="With Modifier" class="new_roll"    style="margin: 0px;" type="roll" value="&amp;{template:melee-roll} {{name=@{animal2_name}}} {{tot=[[@{wpn_damage2a1}]]}}  {{skillvalue=[[@{wpn_attk2a1}+?{mods|0}]]}} {{fumble=[[{(101-(round((100-(@{wpn_attk2a1}+?{mods|0}))/20))),100}kl1]]}} &#9;{{crit=[[ceil(([[@{wpn_attk2a1}+?{mods|0}]])/20)+1]]}} {{special=[[ceil(([[@{wpn_attk2a1}+?{mods|0}]])/5)+1]]}}         {{success=[[@{wpn_attk2a1}+?{mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{wpn_name2a1}}}"></button>
 			
 							</div>	
 							<div>
@@ -1424,7 +1426,7 @@ THP 0/0
 								<input name="attr_wpn_sr2a2" class="sheet-value_display2" type="text" value="0">
 								<input name="attr_wpn_attk2a2" class="sheet-value_display2" type="text" value="0">
 								<input name="attr_wpn_damage2a2" class="sheet-value_display2" style="width: 80px;" type="text" value="0">
-								<button class="sheet-d100_roll" type="roll" value="&amp;{template:melee-roll} {{name=@{animal2_name}}} {{tot=[[@{wpn_damage2a2}]]}}  {{skillvalue=[[@{wpn_attk2a2}]]}} {{fumble=[[ceil(95+([[@{wpn_attk2a2}]])/20))]]}} {{crit=[[ceil(([[@{wpn_attk2a2}]])/20)+1]]}} {{special=[[ceil(([[@{wpn_attk2a2}]])/5)+1]]}}         {{success=[[@{wpn_attk2a2}]]}} {{roll=[[1d100]]}} {{skillname=@{wpn_name2a2}}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button><button class="sheet-d100_roll" style="margin: 0px;" type="roll" value="&amp;{template:melee-roll} {{name=@{animal2_name}}} {{tot=[[@{wpn_damage2a2}]]}}  {{skillvalue=[[@{wpn_attk2a2}+?{mods|0}]]}} {{fumble=[[{(101-(round((100-(@{wpn_attk2a2}+?{mods|0}))/20))),100}kl1]]}} &#9;{{crit=[[ceil(([[@{wpn_attk2a2}+?{mods|0}]])/20)+1]]}} {{special=[[ceil(([[@{wpn_attk2a2}+?{mods|0}]])/5)+1]]}}         {{success=[[@{wpn_attk2a2}+?{mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{wpn_name2a2}}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button>
+								<button  type="roll" value="&amp;{template:melee-roll} {{name=@{animal2_name}}} {{tot=[[@{wpn_damage2a2}]]}}  {{skillvalue=[[@{wpn_attk2a2}]]}} {{fumble=[[ceil(95+([[@{wpn_attk2a2}]])/20))]]}} {{crit=[[ceil(([[@{wpn_attk2a2}]])/20)+1]]}} {{special=[[ceil(([[@{wpn_attk2a2}]])/5)+1]]}}         {{success=[[@{wpn_attk2a2}]]}} {{roll=[[1d100]]}} {{skillname=@{wpn_name2a2}}}"></button><button   title="With Modifier" class="new_roll"    style="margin: 0px;" type="roll" value="&amp;{template:melee-roll} {{name=@{animal2_name}}} {{tot=[[@{wpn_damage2a2}]]}}  {{skillvalue=[[@{wpn_attk2a2}+?{mods|0}]]}} {{fumble=[[{(101-(round((100-(@{wpn_attk2a2}+?{mods|0}))/20))),100}kl1]]}} &#9;{{crit=[[ceil(([[@{wpn_attk2a2}+?{mods|0}]])/20)+1]]}} {{special=[[ceil(([[@{wpn_attk2a2}+?{mods|0}]])/5)+1]]}}         {{success=[[@{wpn_attk2a2}+?{mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{wpn_name2a2}}}"></button>
 			
 							</div>	
 							
@@ -1433,7 +1435,7 @@ THP 0/0
 								<input name="attr_wpn_sr2a3" class="sheet-value_display2" type="text" value="0">
 								<input name="attr_wpn_attk2a3" class="sheet-value_display2" type="text" value="0">
 								<input name="attr_wpn_damage2a3" class="sheet-value_display2" style="width: 80px;" type="text" value="0">
-								<button class="sheet-d100_roll" type="roll" value="&amp;{template:melee-roll} {{name=@{animal2_name}}} {{tot=[[@{wpn_damage2a3}]]}}  {{skillvalue=[[@{wpn_attk2a3}]]}} {{fumble=[[ceil(95+([[@{wpn_attk2a3}]])/20))]]}} {{crit=[[ceil(([[@{wpn_attk2a3}]])/20)+1]]}} {{special=[[ceil(([[@{wpn_attk2a3}]])/5)+1]]}}         {{success=[[@{wpn_attk2a3}]]}} {{roll=[[1d100]]}} {{skillname=@{wpn_name2a3}}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button><button class="sheet-d100_roll" style="margin: 0px;" type="roll" value="&amp;{template:melee-roll} {{name=@{animal2_name}}} {{tot=[[@{wpn_damage2a3}]]}}  {{skillvalue=[[@{wpn_attk2a3}+?{mods|0}]]}} {{fumble=[[{(101-(round((100-(@{wpn_attk2a3}+?{mods|0}))/20))),100}kl1]]}} &#9;{{crit=[[ceil(([[@{wpn_attk2a3}+?{mods|0}]])/20)+1]]}} {{special=[[ceil(([[@{wpn_attk2a3}+?{mods|0}]])/5)+1]]}}         {{success=[[@{wpn_attk2a3}+?{mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{wpn_name2a3}}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button>
+								<button   type="roll" value="&amp;{template:melee-roll} {{name=@{animal2_name}}} {{tot=[[@{wpn_damage2a3}]]}}  {{skillvalue=[[@{wpn_attk2a3}]]}} {{fumble=[[ceil(95+([[@{wpn_attk2a3}]])/20))]]}} {{crit=[[ceil(([[@{wpn_attk2a3}]])/20)+1]]}} {{special=[[ceil(([[@{wpn_attk2a3}]])/5)+1]]}}         {{success=[[@{wpn_attk2a3}]]}} {{roll=[[1d100]]}} {{skillname=@{wpn_name2a3}}}"></button><button  title="With Modifier" class="new_roll"    style="margin: 0px;" type="roll" value="&amp;{template:melee-roll} {{name=@{animal2_name}}} {{tot=[[@{wpn_damage2a3}]]}}  {{skillvalue=[[@{wpn_attk2a3}+?{mods|0}]]}} {{fumble=[[{(101-(round((100-(@{wpn_attk2a3}+?{mods|0}))/20))),100}kl1]]}} &#9;{{crit=[[ceil(([[@{wpn_attk2a3}+?{mods|0}]])/20)+1]]}} {{special=[[ceil(([[@{wpn_attk2a3}+?{mods|0}]])/5)+1]]}}         {{success=[[@{wpn_attk2a3}+?{mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{wpn_name2a3}}}"></button>
 			
 							</div>							
 							
@@ -1452,7 +1454,7 @@ THP 0/0
 									<div>
 										<input name="attr_skill_name2a1" class="sheet-value_display sheet-ally_skill" style="width: 232px; text-align: left;" type="text" value="skill">
 										<input name="attr_skill_value2a1" class="sheet-value_display2" type="text" value="0">
-										<!--<button type="roll" class="sheet-d100_roll" value="&{template:skillRoll} {{name=@{animal1_name}}}  {{skillvalue=[[@{skill_value1}]]}} {{fumble=[[ceil(95+([[@{skill_value1}]])/20))]]}} {{crit=[[ceil(([[@{skill_value1}]])/20)+1]]}} {{special=[[ceil(([[@{skill_value1}]])/5)+1]]}}         {{success=[[@{skill_value1}]]}} {{roll=[[1d100]]}} {{skillname=@{skill_name1}}}" ><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png" /></button>--><button class="sheet-d100_roll" style="margin: 0px;" type="roll" value="&amp;{template:skillRoll} {{name=@{animal2_name}}}  {{skillvalue=[[@{skill_value2a1}]]}} {{success=[[@{skill_value2a1}+?{mods|0}]]}}  {{fumble=[[{(101-(round((100-(@{skill_value2a1}+?{mods|0}))/20))),100}kl1]]}}  {{crit=[[ceil(([[@{skill_value2a1}+?{mods|0}]])/20)+1]]}} {{special=[[ceil(([[@{skill_value2a1}+?{mods|0}]])/5)+1]]}} {{roll=[[1d100]]}} {{skillname=@{skill_name2a1}}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button>
+										<!--<button type="roll"   value="&{template:skillRoll} {{name=@{animal1_name}}}  {{skillvalue=[[@{skill_value1}]]}} {{fumble=[[ceil(95+([[@{skill_value1}]])/20))]]}} {{crit=[[ceil(([[@{skill_value1}]])/20)+1]]}} {{special=[[ceil(([[@{skill_value1}]])/5)+1]]}}         {{success=[[@{skill_value1}]]}} {{roll=[[1d100]]}} {{skillname=@{skill_name1}}}" ><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png" /></button>--><button   style="margin: 0px;" type="roll" value="&amp;{template:skillRoll} {{name=@{animal2_name}}}  {{skillvalue=[[@{skill_value2a1}]]}} {{success=[[@{skill_value2a1}+?{mods|0}]]}}  {{fumble=[[{(101-(round((100-(@{skill_value2a1}+?{mods|0}))/20))),100}kl1]]}}  {{crit=[[ceil(([[@{skill_value2a1}+?{mods|0}]])/20)+1]]}} {{special=[[ceil(([[@{skill_value2a1}+?{mods|0}]])/5)+1]]}} {{roll=[[1d100]]}} {{skillname=@{skill_name2a1}}}"></button>
 									</div>
 								</span>
 								<span style="display: inline-block;">
@@ -1464,7 +1466,7 @@ THP 0/0
 									<div>
 										<input name="attr_skill_name2a2" class="sheet-value_display sheet-ally_skill" style="width: 232px; text-align: left;" type="text" value="skill">
 										<input name="attr_skill_value2a2" class="sheet-value_display2" type="text" value="0">
-										<!--<button type="roll" class="sheet-d100_roll" value="&{template:skillRoll} {{name=@{animal1_name}}}  {{skillvalue=[[@{skill_value2}]]}} {{fumble=[[ceil(95+([[@{skill_value2}]])/20))]]}} {{crit=[[ceil(([[@{skill_value2}]])/20)+1]]}} {{special=[[ceil(([[@{skill_value2}]])/5)+1]]}}         {{success=[[@{skill_value2}]]}} {{roll=[[1d100]]}} {{skillname=@{skill_name2}}}" ><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png" /></button>--><button class="sheet-d100_roll" style="margin: 0px;" type="roll" value="&amp;{template:skillRoll} {{name=@{animal2_name}}}  {{skillvalue=[[@{skill_value2a2}]]}} {{success=[[@{skill_value2a2}+?{mods|0}]]}}  {{fumble=[[{(101-(round((100-(@{skill_value2a2}+?{mods|0}))/20))),100}kl1]]}} {{crit=[[ceil(([[@{skill_value2a2}+?{mods|0}]])/20)+1]]}} {{special=[[ceil(([[@{skill_value2a2}+?{mods|0}]])/5)+1]]}}         {{roll=[[1d100]]}} {{skillname=@{skill_name2a2}}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button>
+										<!--<button type="roll"   value="&{template:skillRoll} {{name=@{animal1_name}}}  {{skillvalue=[[@{skill_value2}]]}} {{fumble=[[ceil(95+([[@{skill_value2}]])/20))]]}} {{crit=[[ceil(([[@{skill_value2}]])/20)+1]]}} {{special=[[ceil(([[@{skill_value2}]])/5)+1]]}}         {{success=[[@{skill_value2}]]}} {{roll=[[1d100]]}} {{skillname=@{skill_name2}}}" ><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png" /></button>--><button   style="margin: 0px;" type="roll" value="&amp;{template:skillRoll} {{name=@{animal2_name}}}  {{skillvalue=[[@{skill_value2a2}]]}} {{success=[[@{skill_value2a2}+?{mods|0}]]}}  {{fumble=[[{(101-(round((100-(@{skill_value2a2}+?{mods|0}))/20))),100}kl1]]}} {{crit=[[ceil(([[@{skill_value2a2}+?{mods|0}]])/20)+1]]}} {{special=[[ceil(([[@{skill_value2a2}+?{mods|0}]])/5)+1]]}}         {{roll=[[1d100]]}} {{skillname=@{skill_name2a2}}}"></button>
 									</div>
 								</span>
 								<span style="display: inline-block;">
@@ -1476,7 +1478,7 @@ THP 0/0
 									<div>
 										<input name="attr_skill_name2a3" class="sheet-value_display sheet-ally_skill" style="width: 232px; text-align: left;" type="text" value="skill">
 										<input name="attr_skill_value2a3" class="sheet-value_display2" type="text" value="0">
-										<!--<button type="roll" class="sheet-d100_roll" value="&{template:skillRoll} {{name=@{animal1_name}}}  {{skillvalue=[[@{skill_value2}]]}} {{fumble=[[ceil(95+([[@{skill_value2}]])/20))]]}} {{crit=[[ceil(([[@{skill_value2}]])/20)+1]]}} {{special=[[ceil(([[@{skill_value2}]])/5)+1]]}}         {{success=[[@{skill_value2}]]}} {{roll=[[1d100]]}} {{skillname=@{skill_name2}}}" ><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png" /></button>--><button class="sheet-d100_roll" style="margin: 0px;" type="roll" value="&amp;{template:skillRoll} {{name=@{animal2_name}}}  {{skillvalue=[[@{skill_value2a3}]]}} {{success=[[@{skill_value2a3}+?{mods|0}]]}}  {{fumble=[[{(101-(round((100-(@{skill_value2a3}+?{mods|0}))/20))),100}kl1]]}}  {{crit=[[ceil(([[@{skill_value2a3}+?{mods|0}]])/20)+1]]}} {{special=[[ceil(([[@{skill_value2a3}+?{mods|0}]])/5)+1]]}}         {{roll=[[1d100]]}} {{skillname=@{skill_name2a3}}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button>
+										<!--<button type="roll"   value="&{template:skillRoll} {{name=@{animal1_name}}}  {{skillvalue=[[@{skill_value2}]]}} {{fumble=[[ceil(95+([[@{skill_value2}]])/20))]]}} {{crit=[[ceil(([[@{skill_value2}]])/20)+1]]}} {{special=[[ceil(([[@{skill_value2}]])/5)+1]]}}         {{success=[[@{skill_value2}]]}} {{roll=[[1d100]]}} {{skillname=@{skill_name2}}}" ><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png" /></button>--><button   style="margin: 0px;" type="roll" value="&amp;{template:skillRoll} {{name=@{animal2_name}}}  {{skillvalue=[[@{skill_value2a3}]]}} {{success=[[@{skill_value2a3}+?{mods|0}]]}}  {{fumble=[[{(101-(round((100-(@{skill_value2a3}+?{mods|0}))/20))),100}kl1]]}}  {{crit=[[ceil(([[@{skill_value2a3}+?{mods|0}]])/20)+1]]}} {{special=[[ceil(([[@{skill_value2a3}+?{mods|0}]])/5)+1]]}}         {{roll=[[1d100]]}} {{skillname=@{skill_name2a3}}}"></button>
 									</div>
 								</span>									
 							</div>
@@ -1490,7 +1492,7 @@ THP 0/0
 									<div>
 										<input name="attr_skill_name2a4" class="sheet-value_display sheet-ally_skill" style="width: 232px; text-align: left;" type="text" value="skill">
 										<input name="attr_skill_value2a4" class="sheet-value_display2" type="text" value="0">
-										<!--<button type="roll" class="sheet-d100_roll" value="&{template:skillRoll} {{name=@{animal1_name}}}  {{skillvalue=[[@{skill_value1}]]}} {{fumble=[[ceil(95+([[@{skill_value1}]])/20))]]}} {{crit=[[ceil(([[@{skill_value1}]])/20)+1]]}} {{special=[[ceil(([[@{skill_value1}]])/5)+1]]}}         {{success=[[@{skill_value1}]]}} {{roll=[[1d100]]}} {{skillname=@{skill_name1}}}" ><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png" /></button>--><button class="sheet-d100_roll" style="margin: 0px;" type="roll" value="&amp;{template:skillRoll} {{name=@{animal2_name}}}  {{skillvalue=[[@{skill_value2a4}]]}} {{success=[[@{skill_value2a4}+?{mods|0}]]}}  {{fumble=[[{(101-(round((100-(@{skill_value2a4}+?{mods|0}))/20))),100}kl1]]}} {{crit=[[ceil(([[@{skill_value2a4}+?{mods|0}]])/20)+1]]}} {{special=[[ceil(([[@{skill_value2a4}+?{mods|0}]])/5)+1]]}}         {{roll=[[1d100]]}} {{skillname=@{skill_name2a4}}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button>
+										<!--<button type="roll"   value="&{template:skillRoll} {{name=@{animal1_name}}}  {{skillvalue=[[@{skill_value1}]]}} {{fumble=[[ceil(95+([[@{skill_value1}]])/20))]]}} {{crit=[[ceil(([[@{skill_value1}]])/20)+1]]}} {{special=[[ceil(([[@{skill_value1}]])/5)+1]]}}         {{success=[[@{skill_value1}]]}} {{roll=[[1d100]]}} {{skillname=@{skill_name1}}}" ><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png" /></button>--><button   style="margin: 0px;" type="roll" value="&amp;{template:skillRoll} {{name=@{animal2_name}}}  {{skillvalue=[[@{skill_value2a4}]]}} {{success=[[@{skill_value2a4}+?{mods|0}]]}}  {{fumble=[[{(101-(round((100-(@{skill_value2a4}+?{mods|0}))/20))),100}kl1]]}} {{crit=[[ceil(([[@{skill_value2a4}+?{mods|0}]])/20)+1]]}} {{special=[[ceil(([[@{skill_value2a4}+?{mods|0}]])/5)+1]]}}         {{roll=[[1d100]]}} {{skillname=@{skill_name2a4}}}"></button>
 									</div>
 								</span>
 								<span style="display: inline-block;">
@@ -1502,7 +1504,7 @@ THP 0/0
 									<div>
 										<input name="attr_skill_name2a5" class="sheet-value_display sheet-ally_skill" style="width: 232px; text-align: left;" type="text" value="skill">
 										<input name="attr_skill_value2a5" class="sheet-value_display2" type="text" value="0">
-										<!--<button type="roll" class="sheet-d100_roll" value="&{template:skillRoll} {{name=@{animal1_name}}}  {{skillvalue=[[@{skill_value2}]]}} {{fumble=[[ceil(95+([[@{skill_value2}]])/20))]]}} {{crit=[[ceil(([[@{skill_value2}]])/20)+1]]}} {{special=[[ceil(([[@{skill_value2}]])/5)+1]]}}         {{success=[[@{skill_value2}]]}} {{roll=[[1d100]]}} {{skillname=@{skill_name2}}}" ><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png" /></button>--><button class="sheet-d100_roll" style="margin: 0px;" type="roll" value="&amp;{template:skillRoll} {{name=@{animal2_name}}}  {{skillvalue=[[@{skill_value2a5}]]}} {{success=[[@{skill_value2a5}+?{mods|0}]]}}  {{fumble=[[{(101-(round((100-(@{skill_value2a5}+?{mods|0}))/20))),100}kl1]]}} {{crit=[[ceil(([[@{skill_value2a5}+?{mods|0}]])/20)+1]]}} {{special=[[ceil(([[@{skill_value2a5}+?{mods|0}]])/5)+1]]}}         {{roll=[[1d100]]}} {{skillname=@{skill_name2a5}}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button>
+										<!--<button type="roll"   value="&{template:skillRoll} {{name=@{animal1_name}}}  {{skillvalue=[[@{skill_value2}]]}} {{fumble=[[ceil(95+([[@{skill_value2}]])/20))]]}} {{crit=[[ceil(([[@{skill_value2}]])/20)+1]]}} {{special=[[ceil(([[@{skill_value2}]])/5)+1]]}}         {{success=[[@{skill_value2}]]}} {{roll=[[1d100]]}} {{skillname=@{skill_name2}}}" ><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png" /></button>--><button   style="margin: 0px;" type="roll" value="&amp;{template:skillRoll} {{name=@{animal2_name}}}  {{skillvalue=[[@{skill_value2a5}]]}} {{success=[[@{skill_value2a5}+?{mods|0}]]}}  {{fumble=[[{(101-(round((100-(@{skill_value2a5}+?{mods|0}))/20))),100}kl1]]}} {{crit=[[ceil(([[@{skill_value2a5}+?{mods|0}]])/20)+1]]}} {{special=[[ceil(([[@{skill_value2a5}+?{mods|0}]])/5)+1]]}}         {{roll=[[1d100]]}} {{skillname=@{skill_name2a5}}}"></button>
 									</div>
 								</span>
 								<span style="display: inline-block;">
@@ -1514,11 +1516,11 @@ THP 0/0
 									<div>
 										<input name="attr_skill_name2a6" class="sheet-value_display sheet-ally_skill" style="width: 232px; text-align: left;" type="text" value="skill">
 										<input name="attr_skill_value2a6" class="sheet-value_display2" type="text" value="0">
-										<!--<button type="roll" class="sheet-d100_roll" value="&{template:skillRoll} {{name=@{animal1_name}}}  {{skillvalue=[[@{skill_value2}]]}} {{fumble=[[ceil(95+([[@{skill_value2}]])/20))]]}} {{crit=[[ceil(([[@{skill_value2}]])/20)+1]]}} {{special=[[ceil(([[@{skill_value2}]])/5)+1]]}}         {{success=[[@{skill_value2}]]}} {{roll=[[1d100]]}} {{skillname=@{skill_name2}}}" ><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png" /></button>--><button class="sheet-d100_roll" style="margin: 0px;" type="roll" value="&amp;{template:skillRoll} {{name=@{animal2_name}}}  {{skillvalue=[[@{skill_value2a6}]]}} {{success=[[@{skill_value2a6}+?{mods|0}]]}}  {{fumble=[[{(101-(round((100-(@{skill_value2a6}+?{mods|0}))/20))),100}kl1]]}} {{crit=[[ceil(([[@{skill_value2a6}+?{mods|0}]])/20)+1]]}} {{special=[[ceil(([[@{skill_value2a6}+?{mods|0}]])/5)+1]]}}         {{roll=[[1d100]]}} {{skillname=@{skill_name2a6}}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button>
+										<!--<button type="roll"   value="&{template:skillRoll} {{name=@{animal1_name}}}  {{skillvalue=[[@{skill_value2}]]}} {{fumble=[[ceil(95+([[@{skill_value2}]])/20))]]}} {{crit=[[ceil(([[@{skill_value2}]])/20)+1]]}} {{special=[[ceil(([[@{skill_value2}]])/5)+1]]}}         {{success=[[@{skill_value2}]]}} {{roll=[[1d100]]}} {{skillname=@{skill_name2}}}" ><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png" /></button>--><button   style="margin: 0px;" type="roll" value="&amp;{template:skillRoll} {{name=@{animal2_name}}}  {{skillvalue=[[@{skill_value2a6}]]}} {{success=[[@{skill_value2a6}+?{mods|0}]]}}  {{fumble=[[{(101-(round((100-(@{skill_value2a6}+?{mods|0}))/20))),100}kl1]]}} {{crit=[[ceil(([[@{skill_value2a6}+?{mods|0}]])/20)+1]]}} {{special=[[ceil(([[@{skill_value2a6}+?{mods|0}]])/5)+1]]}}         {{roll=[[1d100]]}} {{skillname=@{skill_name2a6}}}"></button>
 									</div>
 								</span>									
 							</div>	
-							
+							<br>
 							<p>Hit Locations</p>
 							<textarea name="attr_animal1_hit2oc" style="margin: 0px; font-family: courier;">D20	Result         AP/HP
 1-2	Right hind-leg	0/0
@@ -1556,7 +1558,7 @@ THP 0/0
 							<div>
 								<p class="sheet-spirit_stat">CHR</p> <input name="attr_otherworld1a_chr" class="sheet-value_display2" type="text" value="0"> 
 								<p class="sheet-spirit_stat">POW</p><input name="attr_otherworld1a_pow" class="sheet-value_display2" type="text" value="0">
-								<button class="sheet-d100_roll" type="roll" value="&amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{otherworld1a_pow}*5)]]}} {{fumble=[[ceil(95+([[(@{otherworld1a_pow}*5)]])/20))]]}} {{crit=[[round(([[(@{otherworld1a_pow}*5)]])/20)+1]]}} {{special=[[round(([[(@{otherworld1a_pow}*5)]])/5)+1]]}}         {{success=[[(@{otherworld1a_pow}*5)]]}} {{roll=[[1d100]]}} {{skillname=POW Roll}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button><button class="sheet-d100_roll" type="roll" value="&amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{otherworld1a_pow}*?{multiplier|5})]]}} {{fumble=[[ceil(95+([[(@{otherworld1a_pow}*?{multiplier|5})]])/20))]]}} {{crit=[[round(([[(@{otherworld1a_pow}*?{multiplier|5})]])/20)+1]]}} {{special=[[round(([[(@{otherworld1a_pow}*?{multiplier|5})]])/5)+1]]}}         {{success=[[(@{otherworld1a_pow}*?{multiplier|5})]]}} {{roll=[[1d100]]}} {{skillname=POW Roll}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button>
+								<button   type="roll" value="&amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{otherworld1a_pow}*5)]]}} {{fumble=[[ceil(95+([[(@{otherworld1a_pow}*5)]])/20))]]}} {{crit=[[round(([[(@{otherworld1a_pow}*5)]])/20)+1]]}} {{special=[[round(([[(@{otherworld1a_pow}*5)]])/5)+1]]}}         {{success=[[(@{otherworld1a_pow}*5)]]}} {{roll=[[1d100]]}} {{skillname=POW Roll}}"></button><button  class="new_roll2"  title="With Modifier" class="new_roll"   type="roll" value="&amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{otherworld1a_pow}*?{multiplier|5})]]}} {{fumble=[[ceil(95+([[(@{otherworld1a_pow}*?{multiplier|5})]])/20))]]}} {{crit=[[round(([[(@{otherworld1a_pow}*?{multiplier|5})]])/20)+1]]}} {{special=[[round(([[(@{otherworld1a_pow}*?{multiplier|5})]])/5)+1]]}}         {{success=[[(@{otherworld1a_pow}*?{multiplier|5})]]}} {{roll=[[1d100]]}} {{skillname=POW Roll}}"></button>
 								<input name="attr_o1pow_check" type="checkbox">									
 								
 							</div>
@@ -1594,9 +1596,9 @@ THP 0/0
 							<br>
 							<div>
 								<div style="margin-top: 10px;">
-									<div class="sheet-input_label" data-i18n="Spirit Combat">Spirit Combat</div>
-									<input name="attr_spirit_combat1" class="sheet-text_input" style="width: 24px; margin-right: 5px;" type="text" value="0"><button class="sheet-d100_roll" type="roll" value="&amp;{template:skillRoll} {{name=@{otherworld1_name}}} {{skillvalue=[[(@{spirit_combat1})]]}} {{fumble=[[ceil(95+([[(@{spirit_combat1})]])/20))]]}} {{crit=[[round(([[(@{spirit_combat1})]])/20)+1]]}}  {{special=[[round(([[(@{spirit_combat1})]])/5)+1]]}}    {{success=[[(@{spirit_combat1})]]}} {{roll=[[1d100]]}} {{skillname=Spirit Combat}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png">
-									</button><button class="sheet-d100_roll" style="margin-right: 5px;" type="roll" value="&amp;{template:skillRoll} {{name=@{otherworld1_name}}} {{skillvalue=[[@{spirit_combat1}]]}} {{fumble=[[ceil(95+(@{spirit_combat1}+?{Mods|0})/20)]]}} {{crit=[[round((@{spirit_combat1}+?{Mods|0})/20)+1]]}}  {{special=[[round((@{spirit_combat1}+?{Mods|0})/5)+1]]}}    {{success=[[@{spirit_combat1}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Spirit Combat}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button><div class="sheet-input_label" data-i18n="Damage">Damage</div><input name="attr_sprt_cmbt_damage" class="sheet-text_input" style="width: 50px;" type="text" value=""><button class="sheet-d100_roll" type="roll" value="[[@{sprt_cmbt_damage1}]]"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button>
+									<div class="sheet-input_label" data-i18n="Spirit-Combat">Spirit Combat</div>
+									<input name="attr_spirit_combat1" class="sheet-text_input" style="width: 24px; margin-right: 5px;" type="text" value="0"><button   type="roll" value="&amp;{template:skillRoll} {{name=@{otherworld1_name}}} {{skillvalue=[[(@{spirit_combat1})]]}} {{fumble=[[ceil(95+([[(@{spirit_combat1})]])/20))]]}} {{crit=[[round(([[(@{spirit_combat1})]])/20)+1]]}}  {{special=[[round(([[(@{spirit_combat1})]])/5)+1]]}}    {{success=[[(@{spirit_combat1})]]}} {{roll=[[1d100]]}} {{skillname=Spirit Combat}}">
+									</button><button   title="With Modifier" class="new_roll"   style="margin-right: 5px;" type="roll" value="&amp;{template:skillRoll} {{name=@{otherworld1_name}}} {{skillvalue=[[@{spirit_combat1}]]}} {{fumble=[[ceil(95+(@{spirit_combat1}+?{Mods|0})/20)]]}} {{crit=[[round((@{spirit_combat1}+?{Mods|0})/20)+1]]}}  {{special=[[round((@{spirit_combat1}+?{Mods|0})/5)+1]]}}    {{success=[[@{spirit_combat1}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Spirit Combat}}"></button><div class="sheet-input_label" data-i18n="Damage">Damage</div><input name="attr_sprt_cmbt_damage" class="sheet-text_input" style="width: 50px;" type="text" value=""><button   type="roll" value="[[@{sprt_cmbt_damage1}]]"></button>
 								</div>							
 							</div>
 							<br>
@@ -1610,7 +1612,7 @@ THP 0/0
 									<div>
 										<input name="attr_damage_name1" class="sheet-value_display " style="width: 150px !important; text-align: left;" type="text" placeholder="Attack" value="">
 										<input name="attr_damage1" class="sheet-value_display2" type="text" value="0">
-										<!--<button type="roll" class="sheet-d100_roll" value="&{template:skillRoll} {{name=@{animal1_name}}}  {{skillvalue=[[@{skill_value1}]]}} {{fumble=[[ceil(95+([[@{skill_value1}]])/20))]]}} {{crit=[[ceil(([[@{skill_value1}]])/20)+1]]}} {{special=[[ceil(([[@{skill_value1}]])/5)+1]]}}         {{success=[[@{skill_value1}]]}} {{roll=[[1d100]]}} {{skillname=@{skill_name1}}}" ><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png" /></button>--><button class="sheet-d100_roll" style="margin: 0px;" type="roll" value="&amp;{template:skillRoll} {{name=@{otherworld1_name}}} {{roll=[[@{damage1}]]}} {{skillname=@{damage_name1}}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button>
+										<!--<button type="roll"   value="&{template:skillRoll} {{name=@{animal1_name}}}  {{skillvalue=[[@{skill_value1}]]}} {{fumble=[[ceil(95+([[@{skill_value1}]])/20))]]}} {{crit=[[ceil(([[@{skill_value1}]])/20)+1]]}} {{special=[[ceil(([[@{skill_value1}]])/5)+1]]}}         {{success=[[@{skill_value1}]]}} {{roll=[[1d100]]}} {{skillname=@{skill_name1}}}" ><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png" /></button>--><button   style="margin: 0px;" type="roll" value="&amp;{template:skillRoll} {{name=@{otherworld1_name}}} {{roll=[[@{damage1}]]}} {{skillname=@{damage_name1}}}"></button>
 									</div>
 								</span>								
 								
@@ -1647,7 +1649,7 @@ THP 0/0
 							<div>
 								<p class="sheet-spirit_stat">CHR</p> <input name="attr_otherworld2a_chr" class="sheet-value_display2" type="text" value="0"> 
 								<p class="sheet-spirit_stat">POW</p><input name="attr_otherworld2a_pow" class="sheet-value_display2" type="text" value="0">
-								<button class="sheet-d100_roll" type="roll" value="&amp;{template:skillRoll} {{name=@{otherworld2_name}}} {{skillvalue=[[(@{otherworld2a_pow}*5)]]}} {{fumble=[[ceil(95+([[(@{otherworld2a_pow}*5)]])/20))]]}} {{crit=[[round(([[(@{otherworld2a_pow}*5)]])/20)+1]]}} {{special=[[round(([[(@{otherworld2a_pow}*5)]])/5)+1]]}}         {{success=[[(@{otherworld2a_pow}*5)]]}} {{roll=[[1d100]]}} {{skillname=POW Roll}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button><button class="sheet-d100_roll" type="roll" value="&amp;{template:skillRoll} {{name=@{otherworld2_name}}} {{skillvalue=[[(@{otherworld2a_pow}*?{multiplier|5})]]}} {{fumble=[[ceil(95+([[(@{otherworld2a_pow}*?{multiplier|5})]])/20))]]}} {{crit=[[round(([[(@{otherworld2a_pow}*?{multiplier|5})]])/20)+1]]}} {{special=[[round(([[(@{otherworld2a_pow}*?{multiplier|5})]])/5)+1]]}}         {{success=[[(@{otherworld2a_pow}*?{multiplier|5})]]}} {{roll=[[1d100]]}} {{skillname=POW Roll}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button>
+								<button   type="roll" value="&amp;{template:skillRoll} {{name=@{otherworld2_name}}} {{skillvalue=[[(@{otherworld2a_pow}*5)]]}} {{fumble=[[ceil(95+([[(@{otherworld2a_pow}*5)]])/20))]]}} {{crit=[[round(([[(@{otherworld2a_pow}*5)]])/20)+1]]}} {{special=[[round(([[(@{otherworld2a_pow}*5)]])/5)+1]]}}         {{success=[[(@{otherworld2a_pow}*5)]]}} {{roll=[[1d100]]}} {{skillname=POW Roll}}"></button><button  class="new_roll2"   type="roll" value="&amp;{template:skillRoll} {{name=@{otherworld2_name}}} {{skillvalue=[[(@{otherworld2a_pow}*?{multiplier|5})]]}} {{fumble=[[ceil(95+([[(@{otherworld2a_pow}*?{multiplier|5})]])/20))]]}} {{crit=[[round(([[(@{otherworld2a_pow}*?{multiplier|5})]])/20)+1]]}} {{special=[[round(([[(@{otherworld2a_pow}*?{multiplier|5})]])/5)+1]]}}         {{success=[[(@{otherworld2a_pow}*?{multiplier|5})]]}} {{roll=[[1d100]]}} {{skillname=POW Roll}}"></button>
 								<input name="attr_o1pow_check" type="checkbox">									
 								
 							</div>
@@ -1685,9 +1687,9 @@ THP 0/0
 							<br>
 							<div>
 								<div style="margin-top: 10px;">
-									<div class="sheet-input_label" data-i18n="Spirit Combat">Spirit Combat</div>
-									<input name="attr_spirit_combat2" class="sheet-text_input" style="width: 24px; margin-right: 5px;" type="text" value="0"><button class="sheet-d100_roll" type="roll" value="&amp;{template:skillRoll} {{name=@{otherworld2_name}}} {{skillvalue=[[(@{spirit_combat2})]]}} {{fumble=[[ceil(95+([[(@{spirit_combat2})]])/20))]]}} {{crit=[[round(([[(@{spirit_combat2})]])/20)+1]]}}  {{special=[[round(([[(@{spirit_combat2})]])/5)+1]]}}    {{success=[[(@{spirit_combat2})]]}} {{roll=[[1d100]]}} {{skillname=Spirit Combat}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png">
-									</button><button class="sheet-d100_roll" style="margin-right: 5px;" type="roll" value="&amp;{template:skillRoll} {{name=@{otherworld2_name}}} {{skillvalue=[[@{spirit_combat2}]]}} {{fumble=[[ceil(95+(@{spirit_combat2}+?{Mods|0})/20)]]}} {{crit=[[round((@{spirit_combat2}+?{Mods|0})/20)+1]]}}  {{special=[[round((@{spirit_combat2}+?{Mods|0})/5)+1]]}}    {{success=[[@{spirit_combat2}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Spirit Combat}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button><div class="sheet-input_label" data-i18n="Damage">Damage</div><input name="attr_sprt_cmbt_damage2" class="sheet-text_input" style="width: 50px;" type="text" value=""><button class="sheet-d100_roll" type="roll" value="[[@{sprt_cmbt_damage2}]]"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button>
+									<div class="sheet-input_label" data-i18n="Spirit-Combat">Spirit Combat</div>
+									<input name="attr_spirit_combat2" class="sheet-text_input" style="width: 24px; margin-right: 5px;" type="text" value="0"><button   type="roll" value="&amp;{template:skillRoll} {{name=@{otherworld2_name}}} {{skillvalue=[[(@{spirit_combat2})]]}} {{fumble=[[ceil(95+([[(@{spirit_combat2})]])/20))]]}} {{crit=[[round(([[(@{spirit_combat2})]])/20)+1]]}}  {{special=[[round(([[(@{spirit_combat2})]])/5)+1]]}}    {{success=[[(@{spirit_combat2})]]}} {{roll=[[1d100]]}} {{skillname=Spirit Combat}}">
+									</button><button   title="With Modifier" class="new_roll"   style="margin-right: 5px;" type="roll" value="&amp;{template:skillRoll} {{name=@{otherworld2_name}}} {{skillvalue=[[@{spirit_combat2}]]}} {{fumble=[[ceil(95+(@{spirit_combat2}+?{Mods|0})/20)]]}} {{crit=[[round((@{spirit_combat2}+?{Mods|0})/20)+1]]}}  {{special=[[round((@{spirit_combat2}+?{Mods|0})/5)+1]]}}    {{success=[[@{spirit_combat2}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Spirit Combat}}"></button><div class="sheet-input_label" data-i18n="Damage">Damage</div><input name="attr_sprt_cmbt_damage2" class="sheet-text_input" style="width: 50px;" type="text" value=""><button   type="roll" value="[[@{sprt_cmbt_damage2}]]"></button>
 								</div>							
 							</div>
 							<br>
@@ -1701,7 +1703,7 @@ THP 0/0
 									<div>
 										<input name="attr_damage_name2" class="sheet-value_display " style="width: 150px !important; text-align: left;" type="text" placeholder="Attack" value="">
 										<input name="attr_damage2" class="sheet-value_display2" type="text" value="0">
-										<!--<button type="roll" class="sheet-d100_roll" value="&{template:skillRoll} {{name=@{animal1_name}}}  {{skillvalue=[[@{skill_value1}]]}} {{fumble=[[ceil(95+([[@{skill_value1}]])/20))]]}} {{crit=[[ceil(([[@{skill_value1}]])/20)+1]]}} {{special=[[ceil(([[@{skill_value1}]])/5)+1]]}}         {{success=[[@{skill_value1}]]}} {{roll=[[1d100]]}} {{skillname=@{skill_name1}}}" ><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png" /></button>--><button class="sheet-d100_roll" style="margin: 0px;" type="roll" value="&amp;{template:skillRoll} {{name=@{otherworld2_name}}} {{roll=[[@{damage2}]]}} {{skillname=@{damage_name2}}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button>
+										<!--<button type="roll"   value="&{template:skillRoll} {{name=@{animal1_name}}}  {{skillvalue=[[@{skill_value1}]]}} {{fumble=[[ceil(95+([[@{skill_value1}]])/20))]]}} {{crit=[[ceil(([[@{skill_value1}]])/20)+1]]}} {{special=[[ceil(([[@{skill_value1}]])/5)+1]]}}         {{success=[[@{skill_value1}]]}} {{roll=[[1d100]]}} {{skillname=@{skill_name1}}}" ><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png" /></button>--><button   style="margin: 0px;" type="roll" value="&amp;{template:skillRoll} {{name=@{otherworld2_name}}} {{roll=[[@{damage2}]]}} {{skillname=@{damage_name2}}}"></button>
 									</div>
 								</span>								
 								
@@ -4144,16 +4146,16 @@ THP 0/0
 		<div class="wrapper1-col1">
 
 
-			<input name="attr_whisper" type="checkbox"><span style="margin-right: 5px;" data-i18n="Whisper rolls">Whisper rolls</span> <input name="attr_whispSet" style="display: none;" type="text" value="">
+			<input name="attr_whisper" type="checkbox"><span style="margin-right: 5px;" data-i18n="Whisper-rolls">Whisper rolls</span> <input name="attr_whispSet" style="display: none;" type="text" value="">
 			<div>
 				<input name="attr_character_name" class="sheet-value_display" style="width: 375px;" type="text" placeholder="name"> 
 				<textarea name="attr_npc1_desc" style="width: 368px; height: 70px; text-align: left; font-size: xx-small; margin-top: 5px; display: block;"></textarea>
 			</div><br>
 			<div>
-				<span class="sheet-npc1_statLabel" data-i18n="STR">STR</span> <input name="attr_npc1a_str" class="sheet-npc1_stat" type="text" value="0"><button class="sheet-d100_roll" type="roll" value="@{whispSet} &amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{npc1a_str}*?{multiplier|5})]]}} {{fumble=[[{(101-(round((100-(@{npc1a_str}*?{multiplier|5}))/20))),100}kl1]]}} {{crit=[[round(([[(@{npc1a_str}*?{multiplier|5})]])/20)+1]]}} {{special=[[round(([[(@{npc1a_str}*?{multiplier|5})]])/5)+1]]}} {{success=[[(@{npc1a_str}*?{multiplier|5})]]}} {{roll=[[1d100]]}} {{skillname=STR}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button> <span class="sheet-npc1_statLabel" data-i18n="CON">CON</span><input name="attr_npc1a_con" class="sheet-npc1_stat" type="text" value="0"><button class="sheet-d100_roll" type="roll" value="@{whispSet} &amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{npc1a_con}*?{multiplier|5})]]}} {{fumble=[[{(101-(round((100-(@{npc1a_con}*?{multiplier|5}))/20))),100}kl1]]}} {{crit=[[round(([[(@{npc1a_con}*?{multiplier|5})]])/20)+1]]}} {{special=[[round(([[(@{npc1a_con}*?{multiplier|5})]])/5)+1]]}} {{success=[[(@{npc1a_con}*?{multiplier|5})]]}} {{roll=[[1d100]]}} {{skillname=CON}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button> <span class="sheet-npc1_statLabel" data-i18n="SIZ">SIZ</span><input name="attr_npc1a_siz" class="sheet-npc1_stat" type="text" value="0"><button class="sheet-d100_roll" type="roll" value="@{whispSet} &amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{npc1a_siz}*?{multiplier|5})]]}} {{fumble=[[{(101-(round((100-(@{npc1a_siz}*?{multiplier|5}))/20))),100}kl1]]}} {{crit=[[round(([[(@{npc1a_siz}*?{multiplier|5})]])/20)+1]]}} {{special=[[round(([[(@{npc1a_siz}*?{multiplier|5})]])/5)+1]]}} {{success=[[(@{npc1a_siz}*?{multiplier|5})]]}} {{roll=[[1d100]]}} {{skillname=SIZ}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button>
+				<span class="sheet-npc1_statLabel" data-i18n="STR">STR</span> <input name="attr_npc1a_str" class="sheet-npc1_stat" type="text" value="0"><button   type="roll" value="@{whispSet} &amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{npc1a_str}*?{multiplier|5})]]}} {{fumble=[[{(101-(round((100-(@{npc1a_str}*?{multiplier|5}))/20))),100}kl1]]}} {{crit=[[round(([[(@{npc1a_str}*?{multiplier|5})]])/20)+1]]}} {{special=[[round(([[(@{npc1a_str}*?{multiplier|5})]])/5)+1]]}} {{success=[[(@{npc1a_str}*?{multiplier|5})]]}} {{roll=[[1d100]]}} {{skillname=STR}}"></button> <span class="sheet-npc1_statLabel" data-i18n="CON">CON</span><input name="attr_npc1a_con" class="sheet-npc1_stat" type="text" value="0"><button   type="roll" value="@{whispSet} &amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{npc1a_con}*?{multiplier|5})]]}} {{fumble=[[{(101-(round((100-(@{npc1a_con}*?{multiplier|5}))/20))),100}kl1]]}} {{crit=[[round(([[(@{npc1a_con}*?{multiplier|5})]])/20)+1]]}} {{special=[[round(([[(@{npc1a_con}*?{multiplier|5})]])/5)+1]]}} {{success=[[(@{npc1a_con}*?{multiplier|5})]]}} {{roll=[[1d100]]}} {{skillname=CON}}"></button> <span class="sheet-npc1_statLabel" data-i18n="SIZ">SIZ</span><input name="attr_npc1a_siz" class="sheet-npc1_stat" type="text" value="0"><button   type="roll" value="@{whispSet} &amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{npc1a_siz}*?{multiplier|5})]]}} {{fumble=[[{(101-(round((100-(@{npc1a_siz}*?{multiplier|5}))/20))),100}kl1]]}} {{crit=[[round(([[(@{npc1a_siz}*?{multiplier|5})]])/20)+1]]}} {{special=[[round(([[(@{npc1a_siz}*?{multiplier|5})]])/5)+1]]}} {{success=[[(@{npc1a_siz}*?{multiplier|5})]]}} {{roll=[[1d100]]}} {{skillname=SIZ}}"></button>
 			</div>
 			<div>
-				<span class="sheet-npc1_statLabel" data-i18n="INT">INT</span> <input name="attr_npc1a_int" class="sheet-npc1_stat" type="text" value="0"><button class="sheet-d100_roll" type="roll" value="@{whispSet} &amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{npc1a_int}*?{multiplier|5})]]}} {{fumble=[[{(101-(round((100-(@{npc1a_int}*?{multiplier|5}))/20))),100}kl1]]}} {{crit=[[round(([[(@{npc1a_int}*?{multiplier|5})]])/20)+1]]}} {{special=[[round(([[(@{npc1a_int}*?{multiplier|5})]])/5)+1]]}} {{success=[[(@{npc1a_int}*?{multiplier|5})]]}} {{roll=[[1d100]]}} {{skillname=INT}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button> <span class="sheet-npc1_statLabel" data-i18n="POW">POW</span><input name="attr_npc1a_pow" class="sheet-npc1_stat" type="text" value="0"><button class="sheet-d100_roll" type="roll" value="@{whispSet} &amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{npc1a_pow}*?{multiplier|5})]]}} {{fumble=[[{(101-(round((100-(@{npc1a_pow}*?{multiplier|5}))/20))),100}kl1]]}} {{crit=[[round(([[(@{npc1a_pow}*?{multiplier|5})]])/20)+1]]}} {{special=[[round(([[(@{npc1a_pow}*?{multiplier|5})]])/5)+1]]}} {{success=[[(@{npc1a_pow}*?{multiplier|5})]]}} {{roll=[[1d100]]}} {{skillname=POW}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button> <span class="sheet-npc1_statLabel" data-i18n="DEX">DEX</span><input name="attr_npc1a_dex" class="sheet-npc1_stat" type="text" value="0"><button class="sheet-d100_roll" type="roll" value="@{whispSet} &amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{npc1a_dex}*?{multiplier|5})]]}} {{fumble=[[{(101-(round((100-(@{npc1a_dex}*?{multiplier|5}))/20))),100}kl1]]}} {{crit=[[round(([[(@{npc1a_dex}*?{multiplier|5})]])/20)+1]]}} {{special=[[round(([[(@{npc1a_dex}*?{multiplier|5})]])/5)+1]]}} {{success=[[(@{npc1a_dex}*?{multiplier|5})]]}} {{roll=[[1d100]]}} {{skillname=DEX}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button> <span class="sheet-npc1_statLabel" data-i18n="CHA">CHA</span><input name="attr_npc1a_cha" class="sheet-npc1_stat" type="text" value="0"><button class="sheet-d100_roll" type="roll" value="@{whispSet} &amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{npc1a_cha}*?{multiplier|5})]]}} {{fumble=[[{(101-(round((100-(@{npc1a_cha}*?{multiplier|5}))/20))),100}kl1]]}} {{crit=[[round(([[(@{npc1a_cha}*?{multiplier|5})]])/20)+1]]}} {{special=[[round(([[(@{npc1a_cha}*?{multiplier|5})]])/5)+1]]}} {{success=[[(@{npc1a_cha}*?{multiplier|5})]]}} {{roll=[[1d100]]}} {{skillname=CHA}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button>
+				<span class="sheet-npc1_statLabel" data-i18n="INT">INT</span> <input name="attr_npc1a_int" class="sheet-npc1_stat" type="text" value="0"><button   type="roll" value="@{whispSet} &amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{npc1a_int}*?{multiplier|5})]]}} {{fumble=[[{(101-(round((100-(@{npc1a_int}*?{multiplier|5}))/20))),100}kl1]]}} {{crit=[[round(([[(@{npc1a_int}*?{multiplier|5})]])/20)+1]]}} {{special=[[round(([[(@{npc1a_int}*?{multiplier|5})]])/5)+1]]}} {{success=[[(@{npc1a_int}*?{multiplier|5})]]}} {{roll=[[1d100]]}} {{skillname=INT}}"></button> <span class="sheet-npc1_statLabel" data-i18n="POW">POW</span><input name="attr_npc1a_pow" class="sheet-npc1_stat" type="text" value="0"><button   type="roll" value="@{whispSet} &amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{npc1a_pow}*?{multiplier|5})]]}} {{fumble=[[{(101-(round((100-(@{npc1a_pow}*?{multiplier|5}))/20))),100}kl1]]}} {{crit=[[round(([[(@{npc1a_pow}*?{multiplier|5})]])/20)+1]]}} {{special=[[round(([[(@{npc1a_pow}*?{multiplier|5})]])/5)+1]]}} {{success=[[(@{npc1a_pow}*?{multiplier|5})]]}} {{roll=[[1d100]]}} {{skillname=POW}}"></button> <span class="sheet-npc1_statLabel" data-i18n="DEX">DEX</span><input name="attr_npc1a_dex" class="sheet-npc1_stat" type="text" value="0"><button   type="roll" value="@{whispSet} &amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{npc1a_dex}*?{multiplier|5})]]}} {{fumble=[[{(101-(round((100-(@{npc1a_dex}*?{multiplier|5}))/20))),100}kl1]]}} {{crit=[[round(([[(@{npc1a_dex}*?{multiplier|5})]])/20)+1]]}} {{special=[[round(([[(@{npc1a_dex}*?{multiplier|5})]])/5)+1]]}} {{success=[[(@{npc1a_dex}*?{multiplier|5})]]}} {{roll=[[1d100]]}} {{skillname=DEX}}"></button> <span class="sheet-npc1_statLabel" data-i18n="CHA">CHA</span><input name="attr_npc1a_cha" class="sheet-npc1_stat" type="text" value="0"><button   type="roll" value="@{whispSet} &amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{npc1a_cha}*?{multiplier|5})]]}} {{fumble=[[{(101-(round((100-(@{npc1a_cha}*?{multiplier|5}))/20))),100}kl1]]}} {{crit=[[round(([[(@{npc1a_cha}*?{multiplier|5})]])/20)+1]]}} {{special=[[round(([[(@{npc1a_cha}*?{multiplier|5})]])/5)+1]]}} {{success=[[(@{npc1a_cha}*?{multiplier|5})]]}} {{roll=[[1d100]]}} {{skillname=CHA}}"></button>
 			</div><br>
 			<table>
 				<tbody><tr>
@@ -4173,16 +4175,16 @@ THP 0/0
 				<label style="width: 98px;" data-i18n="Weapon">Weapon</label> <label style="width: 42px;" data-i18n="SR">SR</label> <label style="width: 20px;" data-i18n="Attk">Attk</label> <label style="width: 36px;" data-i18n="Mod">Mod</label> <label style="width: 59px;" data-i18n="Damage">Damage</label> <label style="width: 59px;" data-i18n="HP">HP</label>
 			</div>
 			<div>
-				<input name="attr_wpn_name1a1" class="sheet-value_display2" style="width: 100px; text-align: left;" type="text" placeholder="weapon"> <input name="attr_wpn_sr1a1" class="sheet-value_display2" type="text" value="0"> <button title="Add to turn order" class="sheet-turn_order" type="roll" value="/em -- @{character_name} added to turn order SR [[@{wpn_sr1a1} &amp;{tracker}]]"></button> <input name="attr_wpn_attk1a1" class="sheet-value_display2" type="text" value="0"> <input name="attr_mod1a1" class="sheet-value_display2" type="text" value="0"> <input name="attr_wpn_damage1a1" class="sheet-value_display2" style="width: 80px;" type="text" value="0"> <input name="attr_wpn_hp1a1" class="sheet-value_display2" type="text" value="0"> <button class="sheet-d100_roll" type="roll" value="&amp;{template:melee-roll} {{name=@{character_name}}} {{tot=[[@{wpn_damage1a1}]]}} {{skillvalue=[[@{wpn_attk1a1}+@{mod1a1}]]}} {{fumble=[[{(101-(round((100-(@{wpn_attk1a1}+@{mod1a1}))/20))),100}kl1]]}} {{crit=[[ceil(([[@{wpn_attk1a1}+@{mod1a1}]])/20)+1]]}} {{special=[[ceil(([[@{wpn_attk1a1}+@{mod1a1}]])/5)+1]]}} {{success=[[@{wpn_attk1a1}+@{mod1a1}]]}} {{roll=[[1d100]]}} {{skillname=@{wpn_name1a1}}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button><button class="sheet-d100_roll" style="margin: 0px;" type="roll" value="&amp;{template:melee-roll} {{name=@{character_name}}} {{tot=[[@{wpn_damage1a1}]]}} {{skillvalue=[[@{wpn_attk1a1}+?{mods|0}]]}} {{fumble=[[{(101-(round((100-(@{wpn_attk1a1}+?{mods|0}))/20))),100}kl1]]}} {{crit=[[ceil(([[@{wpn_attk1a1}+?{mods|0}]])/20)+1]]}} {{special=[[ceil(([[@{wpn_attk1a1}+?{mods|0}]])/5)+1]]}} {{success=[[@{wpn_attk1a1}+?{mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{wpn_name1a1}}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button>
+				<input name="attr_wpn_name1a1" class="sheet-value_display2" style="width: 100px; text-align: left;" type="text" placeholder="weapon"> <input name="attr_wpn_sr1a1" class="sheet-value_display2" type="text" value="0"> <button title="Add to turn order" class="sheet-turn_order" type="roll" value="/em -- @{character_name} added to turn order SR [[@{wpn_sr1a1} &amp;{tracker}]]"></button> <input name="attr_wpn_attk1a1" class="sheet-value_display2" type="text" value="0"> <input name="attr_mod1a1" class="sheet-value_display2" type="text" value="0"> <input name="attr_wpn_damage1a1" class="sheet-value_display2" style="width: 80px;" type="text" value="0"> <input name="attr_wpn_hp1a1" class="sheet-value_display2" type="text" value="0"> <button type="roll" value="@{whispSet}  &amp;{template:melee-roll} {{name=@{character_name}}} {{tot=[[@{wpn_damage1a1}]]}} {{skillvalue=[[@{wpn_attk1a1}+@{mod1a1}]]}} {{fumble=[[{(101-(round((100-(@{wpn_attk1a1}+@{mod1a1}))/20))),100}kl1]]}} {{crit=[[ceil(([[@{wpn_attk1a1}+@{mod1a1}]])/20)+1]]}} {{special=[[ceil(([[@{wpn_attk1a1}+@{mod1a1}]])/5)+1]]}} {{success=[[@{wpn_attk1a1}+@{mod1a1}]]}} {{roll=[[1d100]]}} {{skillname=@{wpn_name1a1}}}"></button><button  title="With Modifier" class="new_roll"      style="margin: 0px;" type="roll" value="@{whispSet}  &amp;{template:melee-roll} {{name=@{character_name}}} {{tot=[[@{wpn_damage1a1}]]}} {{skillvalue=[[@{wpn_attk1a1}+?{mods|0}]]}} {{fumble=[[{(101-(round((100-(@{wpn_attk1a1}+?{mods|0}))/20))),100}kl1]]}} {{crit=[[ceil(([[@{wpn_attk1a1}+?{mods|0}]])/20)+1]]}} {{special=[[ceil(([[@{wpn_attk1a1}+?{mods|0}]])/5)+1]]}} {{success=[[@{wpn_attk1a1}+?{mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{wpn_name1a1}}}"></button>
 			</div>
 			<div>
-				<input name="attr_wpn_name1a2" class="sheet-value_display2" style="width: 100px; text-align: left;" type="text" placeholder="weapon"> <input name="attr_wpn_sr1a2" class="sheet-value_display2" type="text" value="0"> <button title="Add to turn order" class="sheet-turn_order" type="roll" value="/em -- @{character_name} added to turn order SR [[@{wpn_sr1a2} &amp;{tracker}]]"></button> <input name="attr_wpn_attk1a2" class="sheet-value_display2" type="text" value="0"> <input name="attr_mod1a2" class="sheet-value_display2" type="text" value="0"> <input name="attr_wpn_damage1a2" class="sheet-value_display2" style="width: 80px;" type="text" value="0"> <input name="attr_wpn_hp1a2" class="sheet-value_display2" type="text" value="0"> <button class="sheet-d100_roll" type="roll" value="&amp;{template:melee-roll} {{name=@{character_name}}} {{tot=[[@{wpn_damage1a2}]]}} {{skillvalue=[[@{wpn_attk1a2}]]}} {{fumble=[[{(101-(round((100-(@{wpn_attk1a2}))/20))),100}kl1]]}} {{crit=[[ceil(([[@{wpn_attk1a2}]])/20)+1]]}} {{special=[[ceil(([[@{wpn_attk1a2}]])/5)+1]]}} {{success=[[@{wpn_attk1a2}]]}} {{roll=[[1d100]]}} {{skillname=@{wpn_name1a2}}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button><button class="sheet-d100_roll" style="margin: 0px;" type="roll" value="&amp;{template:melee-roll} {{name=@{character_name}}} {{tot=[[@{wpn_damage1a2}]]}} {{skillvalue=[[@{wpn_attk1a2}+?{mods|0}]]}} {{fumble=[[{(101-(round((100-(@{wpn_attk1a2}+?{mods|0}))/20))),100}kl1]]}} {{crit=[[ceil(([[@{wpn_attk1a2}+?{mods|0}]])/20)+1]]}} {{special=[[ceil(([[@{wpn_attk1a2}+?{mods|0}]])/5)+1]]}} {{success=[[@{wpn_attk1a2}+?{mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{wpn_name1a2}}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button>
+				<input name="attr_wpn_name1a2" class="sheet-value_display2" style="width: 100px; text-align: left;" type="text" placeholder="weapon"> <input name="attr_wpn_sr1a2" class="sheet-value_display2" type="text" value="0"> <button title="Add to turn order" class="sheet-turn_order" type="roll" value="/em -- @{character_name} added to turn order SR [[@{wpn_sr1a2} &amp;{tracker}]]"></button> <input name="attr_wpn_attk1a2" class="sheet-value_display2" type="text" value="0"> <input name="attr_mod1a2" class="sheet-value_display2" type="text" value="0"> <input name="attr_wpn_damage1a2" class="sheet-value_display2" style="width: 80px;" type="text" value="0"> <input name="attr_wpn_hp1a2" class="sheet-value_display2" type="text" value="0"> <button   type="roll" value="@{whispSet}  &amp;{template:melee-roll} {{name=@{character_name}}} {{tot=[[@{wpn_damage1a2}]]}} {{skillvalue=[[@{wpn_attk1a2}]]}} {{fumble=[[{(101-(round((100-(@{wpn_attk1a2}))/20))),100}kl1]]}} {{crit=[[ceil(([[@{wpn_attk1a2}]])/20)+1]]}} {{special=[[ceil(([[@{wpn_attk1a2}]])/5)+1]]}} {{success=[[@{wpn_attk1a2}]]}} {{roll=[[1d100]]}} {{skillname=@{wpn_name1a2}}}"></button><button title="With Modifier" class="new_roll"    style="margin: 0px;" type="roll" value="@{whispSet} &amp;{template:melee-roll} {{name=@{character_name}}} {{tot=[[@{wpn_damage1a2}]]}} {{skillvalue=[[@{wpn_attk1a2}+?{mods|0}]]}} {{fumble=[[{(101-(round((100-(@{wpn_attk1a2}+?{mods|0}))/20))),100}kl1]]}} {{crit=[[ceil(([[@{wpn_attk1a2}+?{mods|0}]])/20)+1]]}} {{special=[[ceil(([[@{wpn_attk1a2}+?{mods|0}]])/5)+1]]}} {{success=[[@{wpn_attk1a2}+?{mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{wpn_name1a2}}}"></button>
 			</div>
 			<div>
-				<input name="attr_wpn_name1a3" class="sheet-value_display2" style="width: 100px; text-align: left;" type="text" placeholder="weapon"> <input name="attr_wpn_sr1a3" class="sheet-value_display2" type="text" value="0"> <button title="Add to turn order" class="sheet-turn_order" type="roll" value="/em -- @{character_name} added to turn order SR [[@{wpn_sr1a3} &amp;{tracker}]]"></button> <input name="attr_wpn_attk1a3" class="sheet-value_display2" type="text" value="0"> <input name="attr_mod1a3" class="sheet-value_display2" type="text" value="0"> <input name="attr_wpn_damage1a3" class="sheet-value_display2" style="width: 80px;" type="text" value="0"> <input name="attr_wpn_hp1a3" class="sheet-value_display2" type="text" value="0"> <button class="sheet-d100_roll" type="roll" value="&amp;{template:melee-roll} {{name=@{character_name}}} {{tot=[[@{wpn_damage1a3}]]}} {{skillvalue=[[@{wpn_attk1a3}]]}} {{fumble=[[{(101-(round((100-(@{wpn_attk1a2}))/20))),100}kl1]]}} {{crit=[[ceil(([[@{wpn_attk1a3}]])/20)+1]]}} {{crit=[[ceil(([[@{wpn_attk1a3}]])/20)+1]]}} {{special=[[ceil(([[@{wpn_attk1a3}]])/5)+1]]}} {{success=[[@{wpn_attk1a3}]]}} {{roll=[[1d100]]}} {{skillname=@{wpn_name1a3}}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button><button class="sheet-d100_roll" style="margin: 0px;" type="roll" value="&amp;{template:melee-roll} {{name=@{character_name}}} {{tot=[[@{wpn_damage1a3}]]}} {{skillvalue=[[@{wpn_attk1a3}+?{mods|0}]]}} {{fumble=[[{(101-(round((100-(@{wpn_attk1a3}+?{mods|0}))/20))),100}kl1]]}} {{crit=[[ceil(([[@{wpn_attk1a3}+?{mods|0}]])/20)+1]]}} {{special=[[ceil(([[@{wpn_attk1a3}+?{mods|0}]])/5)+1]]}} {{success=[[@{wpn_attk1a3}+?{mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{wpn_name1a3}}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button>
+				<input name="attr_wpn_name1a3" class="sheet-value_display2" style="width: 100px; text-align: left;" type="text" placeholder="weapon"> <input name="attr_wpn_sr1a3" class="sheet-value_display2" type="text" value="0"> <button title="Add to turn order" class="sheet-turn_order" type="roll" value="/em -- @{character_name} added to turn order SR [[@{wpn_sr1a3} &amp;{tracker}]]"></button> <input name="attr_wpn_attk1a3" class="sheet-value_display2" type="text" value="0"> <input name="attr_mod1a3" class="sheet-value_display2" type="text" value="0"> <input name="attr_wpn_damage1a3" class="sheet-value_display2" style="width: 80px;" type="text" value="0"> <input name="attr_wpn_hp1a3" class="sheet-value_display2" type="text" value="0"> <button  type="roll" value="@{whispSet}  &amp;{template:melee-roll} {{name=@{character_name}}} {{tot=[[@{wpn_damage1a3}]]}} {{skillvalue=[[@{wpn_attk1a3}]]}} {{fumble=[[{(101-(round((100-(@{wpn_attk1a2}))/20))),100}kl1]]}} {{crit=[[ceil(([[@{wpn_attk1a3}]])/20)+1]]}} {{crit=[[ceil(([[@{wpn_attk1a3}]])/20)+1]]}} {{special=[[ceil(([[@{wpn_attk1a3}]])/5)+1]]}} {{success=[[@{wpn_attk1a3}]]}} {{roll=[[1d100]]}} {{skillname=@{wpn_name1a3}}}"></button><button  title="With Modifier" class="new_roll"    style="margin: 0px;" type="roll" value="@{whispSet} &amp;{template:melee-roll} {{name=@{character_name}}} {{tot=[[@{wpn_damage1a3}]]}} {{skillvalue=[[@{wpn_attk1a3}+?{mods|0}]]}} {{fumble=[[{(101-(round((100-(@{wpn_attk1a3}+?{mods|0}))/20))),100}kl1]]}} {{crit=[[ceil(([[@{wpn_attk1a3}+?{mods|0}]])/20)+1]]}} {{special=[[ceil(([[@{wpn_attk1a3}+?{mods|0}]])/5)+1]]}} {{success=[[@{wpn_attk1a3}+?{mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{wpn_name1a3}}}"></button>
 			</div>
 			<fieldset class="repeating_npcwpns" style="display: inline;">
-				<input name="attr_wpn_name" class="sheet-value_display2" style="width: 100px; text-align: left;" type="text" placeholder="weapon"> <input name="attr_wpn_sr" class="sheet-value_display2" type="text" value="0"> <button title="Add to turn order" class="sheet-turn_order" type="roll" value="/em -- @{character_name} added to turn order SR [[@{wpn_sr} &amp;{tracker}]]"></button> <input name="attr_wpn_attk" class="sheet-value_display2" type="text" value="0"> <input name="attr_mod" class="sheet-value_display2" type="text" value="0"> <input name="attr_wpn_damage" class="sheet-value_display2" style="width: 80px;" type="text" value="0"> <input name="attr_wpn_hp" class="sheet-value_display2" type="text" value="0"> <button class="sheet-d100_roll" type="roll" value="&amp;{template:melee-roll} {{name=@{character_name}}} {{tot=[[@{wpn_damage}]]}} {{skillvalue=[[@{wpn_attk}]]}} {{fumble=[[{(101-(round((100-(@{wpn_attk1a2}))/20))),100}kl1]]}} {{crit=[[ceil(([[@{wpn_attk}]])/20)+1]]}} {{crit=[[ceil(([[@{wpn_attk}]])/20)+1]]}} {{special=[[ceil(([[@{wpn_attk}]])/5)+1]]}} {{success=[[@{wpn_attk}]]}} {{roll=[[1d100]]}} {{skillname=@{wpn_name}}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button><button class="sheet-d100_roll" style="margin: 0px;" type="roll" value="&amp;{template:melee-roll} {{name=@{character_name}}} {{tot=[[@{wpn_damage}]]}} {{skillvalue=[[@{wpn_attk}+?{mods|0}]]}} {{fumble=[[{(101-(round((100-(@{wpn_attk}+?{mods|0}))/20))),100}kl1]]}} {{crit=[[ceil(([[@{wpn_attk}+?{mods|0}]])/20)+1]]}} {{special=[[ceil(([[@{wpn_attk}+?{mods|0}]])/5)+1]]}} {{success=[[@{wpn_attk}+?{mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{wpn_name}}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button>
+				<input name="attr_wpn_name" class="sheet-value_display2" style="width: 100px; text-align: left;" type="text" placeholder="weapon"> <input name="attr_wpn_sr" class="sheet-value_display2" type="text" value="0"> <button title="Add to turn order" class="sheet-turn_order" type="roll" value="/em -- @{character_name} added to turn order SR [[@{wpn_sr} &amp;{tracker}]]"></button> <input name="attr_wpn_attk" class="sheet-value_display2" type="text" value="0"> <input name="attr_mod" class="sheet-value_display2" type="text" value="0"> <input name="attr_wpn_damage" class="sheet-value_display2" style="width: 80px;" type="text" value="0"> <input name="attr_wpn_hp" class="sheet-value_display2" type="text" value="0"> <button   type="roll" value="@{whispSet}  &amp;{template:melee-roll} {{name=@{character_name}}} {{tot=[[@{wpn_damage}]]}} {{skillvalue=[[@{wpn_attk}]]}} {{fumble=[[{(101-(round((100-(@{wpn_attk1a2}))/20))),100}kl1]]}} {{crit=[[ceil(([[@{wpn_attk}]])/20)+1]]}} {{crit=[[ceil(([[@{wpn_attk}]])/20)+1]]}} {{special=[[ceil(([[@{wpn_attk}]])/5)+1]]}} {{success=[[@{wpn_attk}]]}} {{roll=[[1d100]]}} {{skillname=@{wpn_name}}}"></button><button title="With Modifier" class="new_roll"     style="margin: 0px;" type="roll" value="@{whispSet} &amp;{template:melee-roll} {{name=@{character_name}}} {{tot=[[@{wpn_damage}]]}} {{skillvalue=[[@{wpn_attk}+?{mods|0}]]}} {{fumble=[[{(101-(round((100-(@{wpn_attk}+?{mods|0}))/20))),100}kl1]]}} {{crit=[[ceil(([[@{wpn_attk}+?{mods|0}]])/20)+1]]}} {{special=[[ceil(([[@{wpn_attk}+?{mods|0}]])/5)+1]]}} {{success=[[@{wpn_attk}+?{mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{wpn_name}}}"></button>
 			</fieldset><br>
 			<!-- Start of hit locations and fumbles -->
 			<div style="padding: 5px; border-radius: 5px; border: 1px solid black; border-image: none; width: 381px;">
@@ -4190,17 +4192,17 @@ THP 0/0
 					<div style="margin-left: 5px; display: inline;">
 						<div class="sheet-input_label" data-i18n="Dodge">
 							Dodge
-						</div><input name="attr_dodge" class="sheet-section-header sheet-percentiles" type="text"> <button class="sheet-d100_roll" type="roll" value="&amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{dodge})]]}} {{fumble=[[ceil(95+([[(@{dodge})]])/20))]]}} {{crit=[[round(([[(@{dodge})]])/20)+1]]}} {{special=[[round(([[(@{dodge})]])/5)+1]]}} {{success=[[(@{dodge})]]}} {{roll=[[1d100]]}} {{skillname=Dodge}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button><button class="sheet-d100_roll" type="roll" value="&amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[@{dodge}]]}} {{fumble=[[ceil(95+(@{dodge}+?{Mods|0})/20)]]}} {{crit=[[round((@{dodge}+?{Mods|0})/20)+1]]}} {{special=[[round((@{dodge}+?{Mods|0})/5)+1]]}} {{success=[[@{dodge}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Dodge}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button>
+						</div><input name="attr_dodge" class="sheet-section-header sheet-percentiles" type="text"> <button   type="roll" value="@{whispSet} &amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{dodge})]]}} {{fumble=[[ceil(95+([[(@{dodge})]])/20))]]}} {{crit=[[round(([[(@{dodge})]])/20)+1]]}} {{special=[[round(([[(@{dodge})]])/5)+1]]}} {{success=[[(@{dodge})]]}} {{roll=[[1d100]]}} {{skillname=Dodge}}"></button><button title="With Modifier" class="new_roll"    type="roll" value="@{whispSet} &amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[@{dodge}]]}} {{fumble=[[ceil(95+(@{dodge}+?{Mods|0})/20)]]}} {{crit=[[round((@{dodge}+?{Mods|0})/20)+1]]}} {{special=[[round((@{dodge}+?{Mods|0})/5)+1]]}} {{success=[[@{dodge}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Dodge}}"></button>
 					</div>
 					<div style="margin-left: 5px; display: inline;">
 						<div class="sheet-input_label" data-i18n="Fumble">
 							Fumble
-						</div><button class="sheet-d100_roll" type="roll" value="&amp;{template:RQG-Fumble} {{roll=[[1d100]]}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button>
+						</div><button   type="roll" value="@{whispSet} &amp;{template:RQG-Fumble} {{roll=[[1d100]]}}"></button>
 					</div>
 				</div>
 				<div>
 					<div style="margin-left: 21px; display: inline;">
-						<div class="sheet-input_label" data-i18n="Hit Location">
+						<div class="sheet-input_label" data-i18n="Hit-Location">
 							Hit Location
 						</div><select name="attr_creature_hit_location" style="width: 106px; height: 24px; margin-top: 7px;">
 							<option value="HL-">
@@ -4245,7 +4247,7 @@ THP 0/0
 							<option value="1d8">
 								1d8
 							</option>
-						</select> <button class="sheet-d100_roll" type="roll" value="&amp;{template:@{creature_hit_location}@{selected_wpn_type}} {{roll=[[@{selected_die_roll}]]}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button>
+						</select> <button   type="roll" value="@{whispSet}  &amp;{template:@{creature_hit_location}@{selected_wpn_type}} {{roll=[[@{selected_die_roll}]]}}"></button>
 					</div>
 				</div>
 			</div><!-- Start of hit locations and fumbles --><br>
@@ -4283,14 +4285,14 @@ wpn 3 HP 12</textarea>
 				<!--- runes -->
 							<span class="sheet-input_label" style="margin-top: 10px;" data-i18n="Runes:">Runes:</span>
 								<span style="margin-left: 309px; display: inline-block;">
-								<button class="sheet-d100_roll" style="margin: 0px;" type="roll" value="@{whispSet} &amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[?{Skill+Mods.|0}]]}} {{success=[[?{Skill+Mods.|0}]]}} {{fumble=[[{(101-(round((100-(?{Skill+Mods.|0}))/20))),100}kl1]]}} {{crit=[[ceil(([[?{Skill+Mods.|0}]])/20)+1]]}} {{special=[[ceil(([[?{Skill+Mods.|0}]])/5)+1]]}} {{roll=[[1d100]]}} {{skillname=Rune}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button>
+								<button   style="margin: 0px;" type="roll" value="@{whispSet} &amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[?{Skill+Mods.|0}]]}} {{success=[[?{Skill+Mods.|0}]]}} {{fumble=[[{(101-(round((100-(?{Skill+Mods.|0}))/20))),100}kl1]]}} {{crit=[[ceil(([[?{Skill+Mods.|0}]])/20)+1]]}} {{special=[[ceil(([[?{Skill+Mods.|0}]])/5)+1]]}} {{roll=[[1d100]]}} {{skillname=Rune}}"></button>
 								</span>
 							
 	
 				<textarea name="attr_npc1_runes" style="width: 368px; height: 75px; text-align: left; font-size: xx-small; display: block; min-height: 35px;"></textarea>
 			</div><!--- end of runes -->
 			<div>
-				<span class="sheet-input_label" data-i18n="Rune Points:">Rune Points:</span><input name="attr runePts_cur" class="sheet-npc1_stat" type="text">/<input name="attr runePts_max" class="sheet-npc1_stat" type="text">
+				<span class="sheet-input_label" data-i18n="Rune-Points:">Rune Points</span>:<input name="attr runePts_cur" class="sheet-npc1_stat" type="text">/<input name="attr runePts_max" class="sheet-npc1_stat" type="text">
 			</div>
 			<br>
 			<span class="sheet-input_label" data-i18n="Spells:">Spells:</span> 
@@ -4299,16 +4301,16 @@ wpn 3 HP 12</textarea>
 						
 							<input name="attr_magic_mod" title="Modifier" class="sheet-value_display2" type="text" value="0"> 
 								
-								<button class="sheet-d100_roll" style="margin: 0px;" type="roll" value="@{whispSet} &amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{npc1a_pow}*5)+@{magic_mod}]]}} {{success=[[(@{npc1a_pow}*5)+@{magic_mod}]]}} {{fumble=[[{(101-(round((100-((@{npc1a_pow}*5)+@{magic_mod}))/20))),100}kl1]]}} {{crit=[[ceil(([[(@{npc1a_pow}*5)+@{magic_mod}]])/20)+1]]}} {{special=[[ceil(([[(@{npc1a_pow}*5)+@{magic_mod}]])/5)+1]]}} {{roll=[[1d100]]}} {{skillname=Spirit Magic}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button>
+								<button   style="margin: 0px;" type="roll" value="@{whispSet} &amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{npc1a_pow}*5)+@{magic_mod}]]}} {{success=[[(@{npc1a_pow}*5)+@{magic_mod}]]}} {{fumble=[[{(101-(round((100-((@{npc1a_pow}*5)+@{magic_mod}))/20))),100}kl1]]}} {{crit=[[ceil(([[(@{npc1a_pow}*5)+@{magic_mod}]])/20)+1]]}} {{special=[[ceil(([[(@{npc1a_pow}*5)+@{magic_mod}]])/5)+1]]}} {{roll=[[1d100]]}} {{skillname=Spirit Magic}}"></button>
 					</span> 
 					
 			<textarea name="attr_npc1_spells" style="width: 368px; height: 75px; text-align: left; font-size: xx-small; display: block; min-height: 45px;"></textarea>
 			
 			<br>
 			
-			<span class="sheet-input_label" data-i18n="Passions:">Passions:</span> 
+			<span class="sheet-input_label" data-i18n="Passions">Passions</span>: 
 			<span style="margin-left: 292px; display: inline-block;">
-				<button class="sheet-d100_roll" style="margin: 0px;" type="roll" value="@{whispSet} &amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[?{Skill+Mods.|0}]]}} {{success=[[?{Skill+Mods.|0}]]}} {{fumble=[[{(101-(round((100-(?{Skill+Mods.|0}))/20))),100}kl1]]}} {{crit=[[ceil(([[?{Skill+Mods.|0}]])/20)+1]]}} {{special=[[ceil(([[?{Skill+Mods.|0}]])/5)+1]]}} {{roll=[[1d100]]}} {{skillname=Passion}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button>
+				<button   style="margin: 0px;" type="roll" value="@{whispSet} &amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[?{Skill+Mods.|0}]]}} {{success=[[?{Skill+Mods.|0}]]}} {{fumble=[[{(101-(round((100-(?{Skill+Mods.|0}))/20))),100}kl1]]}} {{crit=[[ceil(([[?{Skill+Mods.|0}]])/20)+1]]}} {{special=[[ceil(([[?{Skill+Mods.|0}]])/5)+1]]}} {{roll=[[1d100]]}} {{skillname=Passion}}"></button>
 			</span> 
 			<textarea name="attr_npc1_passions" style="width: 368px; height: 75px; text-align: left; font-size: xx-small; display: block; min-height: 35px;"></textarea>
 			
@@ -4316,7 +4318,7 @@ wpn 3 HP 12</textarea>
 			
 			<span class="sheet-input_label" data-i18n="Skills:">Skills:</span> 
 			<span style="margin-left: 315px; display: inline-block;">
-				<button class="sheet-d100_roll" style="margin: 0px;" type="roll" value="@{whispSet} &amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[?{Skill+Mods.|0}]]}} {{success=[[?{Skill+Mods.|0}]]}} {{fumble=[[{(101-(round((100-(?{Skill+Mods.|0}))/20))),100}kl1]]}} {{crit=[[ceil(([[?{Skill+Mods.|0}]])/20)+1]]}} {{special=[[ceil(([[?{Skill+Mods.|0}]])/5)+1]]}} {{roll=[[1d100]]}} {{skillname=Skill}}"><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png"></button>
+				<button   style="margin: 0px;" type="roll" value="@{whispSet} &amp;{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[?{Skill+Mods.|0}]]}} {{success=[[?{Skill+Mods.|0}]]}} {{fumble=[[{(101-(round((100-(?{Skill+Mods.|0}))/20))),100}kl1]]}} {{crit=[[ceil(([[?{Skill+Mods.|0}]])/20)+1]]}} {{special=[[ceil(([[?{Skill+Mods.|0}]])/5)+1]]}} {{roll=[[1d100]]}} {{skillname=Skill}}"></button>
 			</span> 
 			
 			<textarea name="attr_npc1_skills" style="width: 368px; height: 75px; text-align: left; font-size: xx-small; display: block; min-height: 45px;"></textarea><br>
diff --git a/RunequestGQS/sheet.json b/RunequestGQS/sheet.json
index abc95b8224..5e24669f18 100644
--- a/RunequestGQS/sheet.json
+++ b/RunequestGQS/sheet.json
@@ -4,7 +4,7 @@
 	"authors": "David",
 	"roll20userid": "720651",
 	"preview": "RunequestGQS.png",
-	"instructions": "Character Sheet for Runequest Glorantha Quick Start and Full release. [Sheet & version Guide](https://github.com/Roll20/roll20-character-sheets/blob/master/RunequestGQS/ReadMe.md)",
+	"instructions": "Character Sheet for Runequest Glorantha Quick Start and Full release.\\n [Sheet & version Guide](https://github.com/Roll20/roll20-character-sheets/blob/master/RunequestGQS/ReadMe.md)\\n [Sheet Walkthrough by Marc](https://drive.google.com/file/d/10xGE1V_Mkd_WCUrW5LumAm0tJS6evfgC/view)",
 	"useroptions": [{
 		"attribute": "version",
 		"displayname": "Quick Start/Full",