diff --git a/Runequest3/Runequest3.css b/Runequest3/Runequest3.css
index 869b8733e1..9a385382ba 100644
--- a/Runequest3/Runequest3.css
+++ b/Runequest3/Runequest3.css
@@ -1,11 +1,34 @@
-    /*==== Button Reset ====*/
-button[type="roll"]:before {
-    content: ""!important;
-	font-size:0.75em;
-    display: none;
+button[type=roll].sheet-new_roll::before { 
+    background-image: none;
+    font-size: 13px;
+    font-family: sans-serif;
+    content: "-?";
+	margin: 0 0px 0 0;
 }
 
 
+button[type=roll].sheet-new_roll {
+    /*background-image: none;
+    background-color: #f2f5d3;*/
+	margin:0px;
+}
+
+
+button[type=roll].sheet-new_roll2::before { 
+    background-image: none;
+    font-size: 13px;
+    font-family: sans-serif;
+    content: "x?";
+	margin: 0 0px 0 0;
+}
+
+
+button[type=roll].sheet-new_roll2 {
+    /*background-image: none;
+    background-color: #f2f5d3;*/
+	margin:0px;
+}
+
 div.sheet-tab-content { display: none; }
 
 input.sheet-tab1:checked ~ div.sheet-tab1,
@@ -358,6 +381,29 @@ button[type="roll"] label, button[type="roll"] input {
 }
 
 
+.sheet-rolltemplate-NewtL-Missle th {
+	text-align: centre;
+	color: #ffffff;
+    background-color: #000000;
+}
+.sheet-rolltemplate-NewtL-Missle table {
+    width: 230px;
+    padding: 2px;
+	border: 1px solid;
+    background-color: #ffffff;
+}
+
+.sheet-rolltemplate-NewtL-Melee th {
+	text-align: centre;
+	color: #ffffff;
+    background-color: #000000;
+}
+.sheet-rolltemplate-NewtL-Melee table {
+    width: 230px;
+    padding: 2px;
+	border: 1px solid;
+    background-color: #ffffff;
+}
 
 
 
diff --git a/Runequest3/Runequest3.html b/Runequest3/Runequest3.html
index 723dbd149a..821fc8aed7 100644
--- a/Runequest3/Runequest3.html
+++ b/Runequest3/Runequest3.html
@@ -8,7 +8,7 @@
 		<div class='sheet-2colrow'>
 			<div class='sheet-col'>
 			  <div class='sheet-2colrow'>
-				<div style="background-color:white;border-radius:6px;padding:1px;padding-bottom:8px;" class="sheet-col">
+				<div style="width:47%;margin-right:5px;background-color:white;border-radius:6px;padding:1px;padding-bottom:8px;" class="sheet-col">
 					<label>Characteristics</label>
 
 
@@ -19,52 +19,59 @@
 								<label style="margin-left:5px;display:inline;font-size:0.6em">Cur.</label>
 						</div>
 						<div>
-							<button type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{curstr}*5)@{fatigue_mod}]]}} {{fumble=[[ceil(95+([[(@{curstr}*5)@{fatigue_mod}]])/20))]]}} {{crit=[[ceil(([[(@{curstr}*5)@{fatigue_mod}]])/20)+1]]}} {{special=[[ceil(([[(@{curstr}*5)@{fatigue_mod}]])/5)+1]]}}         {{success=[[(@{curstr}*5)@{fatigue_mod}]]}} {{roll=[[1d100]]}} {{skillname=STR Roll}}"  ><div class="sheet-char_button">STR</div></button>
+							<div class="sheet-char_button">STR</div>
 							<input type="text" class="sheet-skill_values" name="attr_origstr" value="0"/>
 							<input type="text" class="sheet-skill_values" name="attr_curstr" value="0"/>
-							<button type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{curstr}*?{multiplier|5})@{fatigue_mod}]]}} {{fumble=[[ceil(95+([[(@{curstr}*?{multiplier|5})@{fatigue_mod}]])/20))]]}} {{crit=[[ceil(([[(@{curstr}*?{multiplier|5})@{fatigue_mod}]])/20)+1]]}} {{special=[[ceil(([[(@{curstr}*?{multiplier|5})@{fatigue_mod}]])/5)+1]]}}         {{success=[[(@{curstr}*?{multiplier|5})@{fatigue_mod}]]}} {{roll=[[1d100]]}} {{skillname=STR Roll}}"  ><div class="skill_mod_button"  >-?</div></button>	
+							
+							<button type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{curstr}*5)@{fatigue_mod}]]}} {{fumble=[[ceil(95+([[(@{curstr}*5)@{fatigue_mod}]])/20))]]}} {{crit=[[ceil(([[(@{curstr}*5)@{fatigue_mod}]])/20)+1]]}} {{special=[[ceil(([[(@{curstr}*5)@{fatigue_mod}]])/5)+1]]}}         {{success=[[(@{curstr}*5)@{fatigue_mod}]]}} {{roll=[[1d100]]}} {{skillname=STR Roll}}"  ></button><button class="new_roll2" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{curstr}*?{multiplier|5})@{fatigue_mod}]]}} {{fumble=[[ceil(95+([[(@{curstr}*?{multiplier|5})@{fatigue_mod}]])/20))]]}} {{crit=[[ceil(([[(@{curstr}*?{multiplier|5})@{fatigue_mod}]])/20)+1]]}} {{special=[[ceil(([[(@{curstr}*?{multiplier|5})@{fatigue_mod}]])/5)+1]]}}         {{success=[[(@{curstr}*?{multiplier|5})@{fatigue_mod}]]}} {{roll=[[1d100]]}} {{skillname=STR Roll}}"  ></button>	
 						</div>	
 						
 						<div>
-							<button type="roll"  value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{curcon}*5)@{fatigue_mod}]]}} {{fumble=[[ceil(95+([[(@{curcon}*5)@{fatigue_mod}]])/20))]]}} {{crit=[[ceil(([[(@{curcon}*5)@{fatigue_mod}]])/20)+1]]}} {{special=[[ceil(([[(@{curcon}*5)@{fatigue_mod}]])/5)+1]]}}         {{success=[[(@{curcon}*5)@{fatigue_mod}]]}} {{roll=[[1d100]]}} {{skillname=CON Roll}}"  ><div class="sheet-char_button">CON</div></button>
+							<div class="sheet-char_button">CON</div>
+
 							<input type="text" class="sheet-skill_values" name="attr_origcon" value="0"/>
 							<input type="text" class="sheet-skill_values" name="attr_curcon" value="0"/>
-							<button type="roll"><div class="skill_mod_button">-?</div></button>	
+							<button type="roll"  value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{curcon}*5)@{fatigue_mod}]]}} {{fumble=[[ceil(95+([[(@{curcon}*5)@{fatigue_mod}]])/20))]]}} {{crit=[[ceil(([[(@{curcon}*5)@{fatigue_mod}]])/20)+1]]}} {{special=[[ceil(([[(@{curcon}*5)@{fatigue_mod}]])/5)+1]]}}         {{success=[[(@{curcon}*5)@{fatigue_mod}]]}} {{roll=[[1d100]]}} {{skillname=CON Roll}}"  ></button><button class="new_roll2" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{curcon}*?{multiplier|5})@{fatigue_mod}]]}} {{fumble=[[ceil(95+([[(@{curcon}*?{multiplier|5})@{fatigue_mod}]])/20))]]}} {{crit=[[ceil(([[(@{curcon}*?{multiplier|5})@{fatigue_mod}]])/20)+1]]}} {{special=[[ceil(([[(@{curcon}*?{multiplier|5})@{fatigue_mod}]])/5)+1]]}}         {{success=[[(@{curcon}*?{multiplier|5})@{fatigue_mod}]]}} {{roll=[[1d100]]}} {{skillname=CON Roll}}"  ></button>	
 						</div>	
 
 						<div>
-							<button type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{cursiz}*5)@{fatigue_mod}]]}} {{fumble=[[ceil(95+([[(@{cursiz}*5)@{fatigue_mod}]])/20))]]}} {{crit=[[ceil(([[(@{cursiz}*5)@{fatigue_mod}]])/20)+1]]}} {{special=[[ceil(([[(@{cursiz}*5)@{fatigue_mod}]])/5)+1]]}}         {{success=[[(@{cursiz}*5)@{fatigue_mod}]]}} {{roll=[[1d100]]}} {{skillname=SIZ Roll}}"  ><div class="sheet-char_button">SIZ</div></button>
+							<div class="sheet-char_button">SIZ</div>
 							<input type="text" class="sheet-skill_values" name="attr_origsiz" value="0" />
 							<input type="text" class="sheet-skill_values" name="attr_cursiz" value="0"/>
-							<button type="roll"><div class="skill_mod_button">-?</div></button>	
+							<button type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{cursiz}*5)@{fatigue_mod}]]}} {{fumble=[[ceil(95+([[(@{cursiz}*5)@{fatigue_mod}]])/20))]]}} {{crit=[[ceil(([[(@{cursiz}*5)@{fatigue_mod}]])/20)+1]]}} {{special=[[ceil(([[(@{cursiz}*5)@{fatigue_mod}]])/5)+1]]}}         {{success=[[(@{cursiz}*5)@{fatigue_mod}]]}} {{roll=[[1d100]]}} {{skillname=SIZ Roll}}"  ></button><button class="new_roll2" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{cursiz}*?{multiplier|5})@{fatigue_mod}]]}} {{fumble=[[ceil(95+([[(@{cursiz}*?{multiplier|5})@{fatigue_mod}]])/20))]]}} {{crit=[[ceil(([[(@{cursiz}*?{multiplier|5})@{fatigue_mod}]])/20)+1]]}} {{special=[[ceil(([[(@{cursiz}*?{multiplier|5})@{fatigue_mod}]])/5)+1]]}}         {{success=[[(@{cursiz}*?{multiplier|5})@{fatigue_mod}]]}} {{roll=[[1d100]]}} {{skillname=SIZ Roll}}"  ></button>	
 						</div>	
 						
 						<div>
-							<button type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{curint}*5)@{fatigue_mod}]]}} {{fumble=[[ceil(95+([[(@{curint}*5)@{fatigue_mod}]])/20))]]}} {{crit=[[ceil(([[(@{curint}*5)@{fatigue_mod}]])/20)+1]]}} {{special=[[ceil(([[(@{curint}*5)@{fatigue_mod}]])/5)+1]]}}         {{success=[[(@{curint}*5)@{fatigue_mod}]]}} {{roll=[[1d100]]}} {{skillname=INT Roll}}"  ><div class="sheet-char_button">INT</div></button>
+							<div class="sheet-char_button">INT</div>
+
 							<input type="text" class="sheet-skill_values" name="attr_origint" value="0"/>	
 							<input type="text" class="sheet-skill_values" name="attr_curint" value="0"/>
-							<button type="roll"><div class="sheet-skill_mod_button">-?</div></button>	
+							<button type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{curint}*5)@{fatigue_mod}]]}} {{fumble=[[ceil(95+([[(@{curint}*5)@{fatigue_mod}]])/20))]]}} {{crit=[[ceil(([[(@{curint}*5)@{fatigue_mod}]])/20)+1]]}} {{special=[[ceil(([[(@{curint}*5)@{fatigue_mod}]])/5)+1]]}}         {{success=[[(@{curint}*5)@{fatigue_mod}]]}} {{roll=[[1d100]]}} {{skillname=INT Roll}}"  ></button><button class="new_roll2" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{curint}*?{multiplier|5})@{fatigue_mod}]]}} {{fumble=[[ceil(95+([[(@{curint}*?{multiplier|5})@{fatigue_mod}]])/20))]]}} {{crit=[[ceil(([[(@{curint}*?{multiplier|5})@{fatigue_mod}]])/20)+1]]}} {{special=[[ceil(([[(@{curint}*?{multiplier|5})@{fatigue_mod}]])/5)+1]]}}         {{success=[[(@{curint}*?{multiplier|5})@{fatigue_mod}]]}} {{roll=[[1d100]]}} {{skillname=INT Roll}}"  ></button>	
 						</div>
 						
 						<div>
-							<button type="roll"  value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{curpow}*5)@{fatigue_mod}]]}} {{fumble=[[ceil(95+([[(@{curpow}*5)@{fatigue_mod}]])/20))]]}} {{crit=[[ceil(([[(@{curpow}*5)@{fatigue_mod}]])/20)+1]]}} {{special=[[ceil(([[(@{curpow}*5)@{fatigue_mod}]])/5)+1]]}}         {{success=[[(@{curpow}*5)@{fatigue_mod}]]}} {{roll=[[1d100]]}} {{skillname=POW Roll}}" ><div class="sheet-char_button">POW</div></button>
+							<div class="sheet-char_button">POW</div>						
+
 							<input type="text" class="sheet-skill_values" name="attr_origpow" value="0"/>
 							<input type="text" class="sheet-skill_values" name="attr_curpow" value="0"/>
-							<button type="roll"><div class="skill_mod_button">-?</div></button>	
+							<button type="roll"  value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{curpow}*5)@{fatigue_mod}]]}} {{fumble=[[ceil(95+([[(@{curpow}*5)@{fatigue_mod}]])/20))]]}} {{crit=[[ceil(([[(@{curpow}*5)@{fatigue_mod}]])/20)+1]]}} {{special=[[ceil(([[(@{curpow}*5)@{fatigue_mod}]])/5)+1]]}}         {{success=[[(@{curpow}*5)@{fatigue_mod}]]}} {{roll=[[1d100]]}} {{skillname=POW Roll}}" ></button><button class="new_roll2" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{curpow}*?{multiplier|5})@{fatigue_mod}]]}} {{fumble=[[ceil(95+([[(@{curpow}*?{multiplier|5})@{fatigue_mod}]])/20))]]}} {{crit=[[ceil(([[(@{curpow}*?{multiplier|5})@{fatigue_mod}]])/20)+1]]}} {{special=[[ceil(([[(@{curpow}*?{multiplier|5})@{fatigue_mod}]])/5)+1]]}}         {{success=[[(@{curpow}*?{multiplier|5})@{fatigue_mod}]]}} {{roll=[[1d100]]}} {{skillname=POW Roll}}"  ></button>
+							<input type="checkbox"  name="attr_pow_check"/>								
 						</div>
 
 						<div>
-							<button type="roll"  value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{curdex}*5)@{fatigue_mod}]]}} {{fumble=[[ceil(95+([[(@{curdex}*5)@{fatigue_mod}]])/20))]]}} {{crit=[[ceil(([[(@{curdex}*5)@{fatigue_mod}]])/20)+1]]}} {{special=[[ceil(([[(@{curdex}*5)@{fatigue_mod}]])/5)+1]]}}         {{success=[[(@{curdex}*5)@{fatigue_mod}]]}} {{roll=[[1d100]]}} {{skillname=DEX Roll}}" ><div class="sheet-char_button">DEX</div></button>
+							<div class="sheet-char_button">DEX</div>						
+
 							<input type="text" class="sheet-skill_values" name="attr_origdex" value="0"/>	
 							<input type="text" class="sheet-skill_values" name="attr_curdex" value="0"/>
-							<button type="roll"><div class="skill_mod_button">-?</div></button>	
+							<button type="roll"  value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{curdex}*5)@{fatigue_mod}]]}} {{fumble=[[ceil(95+([[(@{curdex}*5)@{fatigue_mod}]])/20))]]}} {{crit=[[ceil(([[(@{curdex}*5)@{fatigue_mod}]])/20)+1]]}} {{special=[[ceil(([[(@{curdex}*5)@{fatigue_mod}]])/5)+1]]}}         {{success=[[(@{curdex}*5)@{fatigue_mod}]]}} {{roll=[[1d100]]}} {{skillname=DEX Roll}}" ></button><button class="new_roll2" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{curdex}*?{multiplier|5})@{fatigue_mod}]]}} {{fumble=[[ceil(95+([[(@{curdex}*?{multiplier|5})@{fatigue_mod}]])/20))]]}} {{crit=[[ceil(([[(@{curdex}*?{multiplier|5})@{fatigue_mod}]])/20)+1]]}} {{special=[[ceil(([[(@{curdex}*?{multiplier|5})@{fatigue_mod}]])/5)+1]]}}         {{success=[[(@{curdex}*?{multiplier|5})@{fatigue_mod}]]}} {{roll=[[1d100]]}} {{skillname=DEX Roll}}"  ></button>	
 						</div>
 
 						<div>	
-							<button type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{curapp}*5)@{fatigue_mod}]]}} {{fumble=[[ceil(95+([[(@{curapp}*5)@{fatigue_mod}]])/20))]]}} {{crit=[[ceil(([[(@{curapp}*5)@{fatigue_mod}]])/20)+1]]}} {{special=[[ceil(([[(@{curapp}*5)@{fatigue_mod}]])/5)+1]]}}         {{success=[[(@{curapp}*5)@{fatigue_mod}]]}} {{roll=[[1d100]]}} {{skillname=APP Roll}}"  ><div class="sheet-char_button">APP</div></button>
+						    <div class="sheet-char_button">APP</div>
 							<input type="text" class="sheet-skill_values" name="attr_origapp" value="0"/>	
 							<input type="text" class="sheet-skill_values" name="attr_curapp" value="0"/>
-							<button type="roll"><div class="skill_mod_button">-?</div></button>	
+
+							<button type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{curapp}*5)@{fatigue_mod}]]}} {{fumble=[[ceil(95+([[(@{curapp}*5)@{fatigue_mod}]])/20))]]}} {{crit=[[ceil(([[(@{curapp}*5)@{fatigue_mod}]])/20)+1]]}} {{special=[[ceil(([[(@{curapp}*5)@{fatigue_mod}]])/5)+1]]}}         {{success=[[(@{curapp}*5)@{fatigue_mod}]]}} {{roll=[[1d100]]}} {{skillname=APP Roll}}"  ></button><button class="new_roll2" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{curapp}*?{multiplier|5})@{fatigue_mod}]]}} {{fumble=[[ceil(95+([[(@{curapp}*?{multiplier|5})@{fatigue_mod}]])/20))]]}} {{crit=[[ceil(([[(@{curapp}*?{multiplier|5})@{fatigue_mod}]])/20)+1]]}} {{special=[[ceil(([[(@{curapp}*?{multiplier|5})@{fatigue_mod}]])/5)+1]]}}         {{success=[[(@{curapp}*?{multiplier|5})@{fatigue_mod}]]}} {{roll=[[1d100]]}} {{skillname=APP Roll}}"  ></button>	
 						</div>	
 						
 					</div>
@@ -204,16 +211,16 @@
 				<div style="margin-bottom:2px">	
 					<input  style="display:inline-block" type="checkbox" name="attr_boat_check" />
 					<div class="sheet-skill_button">Boat</div>
-					<button style="font-family:dicefontd20;margin:0px;" type="roll" value="&{template:skillRoll} {{name=@{character_aname}}} {{skillvalue=[@{boat_total}]}} {{fumble=[[ceil(95+([@{boat_total}])/20))]]}} {{crit=[[ceil(([@{boat_total}])/20)+1]]}} {{special=[[ceil(([@{boat_total}])/5)+1]]}}         {{success=[[[@{boat_total}]]]}} {{roll=[[1d100]]}} {{skillname=Boat}}" >t</button>			
-					<button  value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{boat_total}]}} {{fumble=[[ceil(95+([@{boat_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{boat_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{boat_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{boat_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Boat}}"   type="roll"><div  class="sheet-skill_mod_button">-?</div></button>		
+					<button  type="roll" value="&{template:skillRoll} {{name=@{character_aname}}} {{skillvalue=[@{boat_total}]}} {{fumble=[[ceil(95+([@{boat_total}])/20))]]}} {{crit=[[ceil(([@{boat_total}])/20)+1]]}} {{special=[[ceil(([@{boat_total}])/5)+1]]}}         {{success=[[[@{boat_total}]]]}} {{roll=[[1d100]]}} {{skillname=Boat}}" ></button>			
+					<button  class="sheet-new_roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{boat_total}]}} {{fumble=[[ceil(95+([@{boat_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{boat_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{boat_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{boat_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Boat}}"   type="roll"></button>		
 					<input class="sheet-skill_values" type="text" value="5" name="attr_boat_value" />
 					<input class="sheet-skill_values" type="text" disabled value="[@{agility_mod}+@{boat_value}+@{fatigue_mod}]" name="attr_boat_total" />
 				</div>
 				<div style="margin-bottom:2px">	
 					<input  style="display:inline-block" type="checkbox" name="attr_climb_check" />
 					<div class="sheet-skill_button">Climb</div>
-					<button style="font-family:dicefontd20;margin:0px;" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{climb_total}]}} {{fumble=[[ceil(95+([@{climb_total}])/20))]]}} {{crit=[[ceil(([@{climb_total}])/20)+1]]}} {{special=[[ceil(([@{climb_total}])/5)+1]]}}         {{success=[[[@{climb_total}]]]}} {{roll=[[1d100]]}} {{skillname=Climb}}"   >t</button>					
-					<button value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{climb_total}]}} {{fumble=[[ceil(95+([@{climb_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{climb_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{climb_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{climb_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Climb}}"  type="roll"><div class="sheet-skill_mod_button">-?</div></button>		
+					<button  type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{climb_total}]}} {{fumble=[[ceil(95+([@{climb_total}])/20))]]}} {{crit=[[ceil(([@{climb_total}])/20)+1]]}} {{special=[[ceil(([@{climb_total}])/5)+1]]}}         {{success=[[[@{climb_total}]]]}} {{roll=[[1d100]]}} {{skillname=Climb}}"   ></button>					
+					<button   class="sheet-new_roll"  value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{climb_total}]}} {{fumble=[[ceil(95+([@{climb_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{climb_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{climb_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{climb_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Climb}}"  type="roll"></button>		
 					<input class="sheet-skill_values" type="text" value="40" name="attr_climb_value" />
 					<input class="sheet-skill_values" type="text" disabled value="[@{agility_mod}+@{climb_value}+@{fatigue_mod}]" name="attr_climb_total" />
 				</div>		
@@ -222,8 +229,8 @@
 				<div style="margin-bottom:2px">	
 					<input  style="display:inline-block" type="checkbox" name="attr_dodge_check" />
 					<div class="sheet-skill_button">Dodge</div>
-					<button style="font-family:dicefontd20;margin:0px;" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{dodge_total}]}} {{fumble=[[ceil(95+([@{dodge_total}])/20))]]}} {{crit=[[ceil(([@{dodge_total}])/20)+1]]}} {{special=[[ceil(([@{dodge_total}])/5)+1]]}}         {{success=[[[@{dodge_total}]]]}} {{roll=[[1d100]]}} {{skillname=Dodge}}" >t</button>								
-					<button type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{dodge_total}]}} {{fumble=[[ceil(95+([@{dodge_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{dodge_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{dodge_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{dodge_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Dodge}}"   ><div class="sheet-skill_mod_button">-?</div></button>		
+					<button  type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{dodge_total}]}} {{fumble=[[ceil(95+([@{dodge_total}])/20))]]}} {{crit=[[ceil(([@{dodge_total}])/20)+1]]}} {{special=[[ceil(([@{dodge_total}])/5)+1]]}}         {{success=[[[@{dodge_total}]]]}} {{roll=[[1d100]]}} {{skillname=Dodge}}" ></button>								
+					<button  class="sheet-new_roll"  type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{dodge_total}]}} {{fumble=[[ceil(95+([@{dodge_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{dodge_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{dodge_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{dodge_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Dodge}}"   ></button>		
 					<input class="sheet-skill_values" type="text" value="5" name="attr_dodge_value" />
 					<input class="sheet-skill_values" type="text" disabled value="[@{agility_mod}+@{dodge_value}+@{fatigue_mod}-@{enc_total}]" name="attr_dodge_total" />
 				</div>	
@@ -231,8 +238,8 @@
 				<div style="margin-bottom:2px">	
 					<input  style="display:inline-block" type="checkbox" name="attr_jump_check" />
 					<div class="sheet-skill_button">Jump</div>
-					<button style="font-family:dicefontd20;margin:0px;" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{jump_total}]}} {{fumble=[[ceil(95+([@{jump_total}])/20))]]}} {{crit=[[ceil(([@{jump_total}])/20)+1]]}} {{special=[[ceil(([@{jump_total}])/5)+1]]}}         {{success=[[[@{jump_total}]]]}} {{roll=[[1d100]]}} {{skillname=Jump}}" >t</button>								
-					<button type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{jump_total}]}} {{fumble=[[ceil(95+([@{jump_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{jump_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{jump_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{jump_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Jump}}"  ><div class="sheet-skill_mod_button">-?</div></button>		
+					<button  type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{jump_total}]}} {{fumble=[[ceil(95+([@{jump_total}])/20))]]}} {{crit=[[ceil(([@{jump_total}])/20)+1]]}} {{special=[[ceil(([@{jump_total}])/5)+1]]}}         {{success=[[[@{jump_total}]]]}} {{roll=[[1d100]]}} {{skillname=Jump}}" ></button>								
+					<button   class="sheet-new_roll"  type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{jump_total}]}} {{fumble=[[ceil(95+([@{jump_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{jump_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{jump_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{jump_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Jump}}"  ></button>		
 					<input class="sheet-skill_values" type="text" value="40" name="attr_jump_value" />
 					<input class="sheet-skill_values" type="text" disabled value="[@{agility_mod}+@{jump_value}+@{fatigue_mod}]" name="attr_jump_total" />
 				</div>	
@@ -240,8 +247,8 @@
 				<div style="margin-bottom:2px" >	
 					<input  style="display:inline-block" type="checkbox" name="attr_ride_check" />
 					<div class="sheet-skill_button">Ride</div>
-					<button style="font-family:dicefontd20;margin:0px;" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{ride_total}]}} {{fumble=[[ceil(95+([@{ride_total}])/20))]]}} {{crit=[[ceil(([@{ride_total}])/20)+1]]}} {{special=[[ceil(([@{ride_total}])/5)+1]]}}         {{success=[[[@{ride_total}]]]}} {{roll=[[1d100]]}} {{skillname=Ride}}"  >t</button>								
-					<button type="roll"  value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{ride_total}]}} {{fumble=[[ceil(95+([@{ride_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{ride_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{ride_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{ride_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Ride}}"   ><div class="sheet-skill_mod_button">-?</div></button>		
+					<button  type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{ride_total}]}} {{fumble=[[ceil(95+([@{ride_total}])/20))]]}} {{crit=[[ceil(([@{ride_total}])/20)+1]]}} {{special=[[ceil(([@{ride_total}])/5)+1]]}}         {{success=[[[@{ride_total}]]]}} {{roll=[[1d100]]}} {{skillname=Ride}}"  ></button>								
+					<button   class="sheet-new_roll" type="roll"  value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{ride_total}]}} {{fumble=[[ceil(95+([@{ride_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{ride_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{ride_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{ride_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Ride}}"   ></button>		
 					<input class="sheet-skill_values" type="text" value="5" name="attr_ride_value" />
 					<input class="sheet-skill_values" type="text" disabled value="[@{agility_mod}+@{ride_value}+@{fatigue_mod}]" name="attr_ride_total" />
 				</div>			
@@ -249,8 +256,8 @@
 				<div style="margin-bottom:2px">	
 					<input  style="display:inline-block" type="checkbox" name="attr_swim_check" />
 					<div class="sheet-skill_button">Swim</div> 
-					<button style="font-family:dicefontd20;margin:0px;" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{swim_total}]}} {{fumble=[[ceil(95+([@{swim_total}])/20))]]}} {{crit=[[ceil(([@{swim_total}])/20)+1]]}} {{special=[[ceil(([@{swim_total}])/5)+1]]}}         {{success=[[[@{swim_total}]]]}} {{roll=[[1d100]]}} {{skillname=Swim}}" >t</button>								
-					<button type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{swim_total}]}} {{fumble=[[ceil(95+([@{swim_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{swim_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{swim_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{swim_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Swim}}"  ><div class="sheet-skill_mod_button">-?</div></button>		
+					<button  type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{swim_total}]}} {{fumble=[[ceil(95+([@{swim_total}])/20))]]}} {{crit=[[ceil(([@{swim_total}])/20)+1]]}} {{special=[[ceil(([@{swim_total}])/5)+1]]}}         {{success=[[[@{swim_total}]]]}} {{roll=[[1d100]]}} {{skillname=Swim}}" ></button>								
+					<button   class="sheet-new_roll" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{swim_total}]}} {{fumble=[[ceil(95+([@{swim_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{swim_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{swim_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{swim_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Swim}}"  ></button>		
 					<input class="sheet-skill_values" type="text" value="15" name="attr_swim_value" />
 					<input class="sheet-skill_values" type="text" disabled value="[@{agility_mod}+@{swim_value}+@{fatigue_mod}-(@{enc_total}*5)]" name="attr_swim_total" />
 				</div>			
@@ -258,8 +265,8 @@
 				<div style="margin-bottom:2px">	
 					<input  style="display:inline-block" type="checkbox" name="attr_throw_check" />
 					<div class="sheet-skill_button">Throw</div>
-					<button style="font-family:dicefontd20;margin:0px;" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{throw_total}]}} {{fumble=[[ceil(95+([@{throw_total}])/20))]]}} {{crit=[[ceil(([@{throw_total}])/20)+1]]}} {{special=[[ceil(([@{throw_total}])/5)+1]]}}         {{success=[[[@{throw_total}]]]}} {{roll=[[1d100]]}} {{skillname=Throw}}"  >t</button>								
-					<button type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{throw_total}]}} {{fumble=[[ceil(95+([@{throw_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{throw_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{throw_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{throw_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Throw}}"  ><div class="sheet-skill_mod_button">-?</div></button>		
+					<button  type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{throw_total}]}} {{fumble=[[ceil(95+([@{throw_total}])/20))]]}} {{crit=[[ceil(([@{throw_total}])/20)+1]]}} {{special=[[ceil(([@{throw_total}])/5)+1]]}}         {{success=[[[@{throw_total}]]]}} {{roll=[[1d100]]}} {{skillname=Throw}}"  ></button>								
+					<button   class="sheet-new_roll" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{throw_total}]}} {{fumble=[[ceil(95+([@{throw_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{throw_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{throw_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{throw_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Throw}}"  ></button>		
 					<input class="sheet-skill_values" type="text" value="25" name="attr_throw_value" />
 					<input class="sheet-skill_values" type="text" disabled value="[@{agility_mod}+@{throw_value}+@{fatigue_mod}]" name="attr_throw_total" />
 				</div>
@@ -269,8 +276,8 @@
 						<input  style="display:inline-block" type="checkbox" name="attr_askill_check" />
 						<input  class="sheet-blank_skill"  style="display:inline-block;" type="text" name="attr_askill_name" />
 						
-						<button style="font-family:dicefontd20;margin:0px;" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=@{askill_total}}} {{fumble=[[95+ceil((@{askill_total}/20))]]}} {{crit=[[round(@{askill_total}/20)+1]]}} {{special=[[round((@{askill_total})/5)+1]]}}         {{success=[[@{askill_total}]]}} {{roll=[[1d100]]}} {{skillname=@{askill_name}}}" >t</button>								
-						<button type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=@{askill_total}}} {{fumble=[[95+ceil(((@{askill_total}+?{mods|0})/20))]]}} {{crit=[[round((@{askill_total}+?{mods|0})/20)+1]]}} {{special=[[round(((@{askill_total}+?{mods|0}))/5)+1]]}}         {{success=[[@{askill_total}+?{mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{askill_name}}}"  ><div class="sheet-skill_mod_button">-?</div></button>
+						<button  type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=@{askill_total}}} {{fumble=[[95+ceil((@{askill_total}/20))]]}} {{crit=[[round(@{askill_total}/20)+1]]}} {{special=[[round((@{askill_total})/5)+1]]}}         {{success=[[@{askill_total}]]}} {{roll=[[1d100]]}} {{skillname=@{askill_name}}}" ></button>								
+						<button   class="sheet-new_roll" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=@{askill_total}}} {{fumble=[[95+ceil(((@{askill_total}+?{mods|0})/20))]]}} {{crit=[[round((@{askill_total}+?{mods|0})/20)+1]]}} {{special=[[round(((@{askill_total}+?{mods|0}))/5)+1]]}}         {{success=[[@{askill_total}+?{mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{askill_name}}}"  ></button>
 						<input type="text"  class="sheet-skill_values" value="0" name="attr_askill_value" />
 						<input type="text"  class="sheet-skill_values" disabled name="attr_askill_total" value="@{askill_value}+@{agility_mod}+@{fatigue_mod}" />
 						
@@ -293,8 +300,8 @@
 				<div style="margin-bottom:2px">	
 					<input  style="display:inline-block" type="checkbox" name="attr_fast_talk__check" />
 					<div class="sheet-skill_button">Fast Talk</div>
-					<button style="font-family:dicefontd20;margin:0px;" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{fast_talk_total}]}} {{fumble=[[ceil(95+([@{fast_talk_total}])/20))]]}} {{crit=[[ceil(([@{fast_talk_total}])/20)+1]]}} {{special=[[ceil(([@{fast_talk_total}])/5)+1]]}}         {{success=[[[@{fast_talk_total}]]]}} {{roll=[[1d100]]}} {{skillname=Fast Talk}}"  >t</button>								
-					<button type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{fast_talk_total}]}} {{fumble=[[ceil(95+([@{fast_talk_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{fast_talk_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{fast_talk_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{fast_talk_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Fast_talk}}"><div class="sheet-skill_mod_button">-?</div></button>		
+					<button  type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{fast_talk_total}]}} {{fumble=[[ceil(95+([@{fast_talk_total}])/20))]]}} {{crit=[[ceil(([@{fast_talk_total}])/20)+1]]}} {{special=[[ceil(([@{fast_talk_total}])/5)+1]]}}         {{success=[[[@{fast_talk_total}]]]}} {{roll=[[1d100]]}} {{skillname=Fast Talk}}"  ></button>								
+					<button   class="sheet-new_roll" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{fast_talk_total}]}} {{fumble=[[ceil(95+([@{fast_talk_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{fast_talk_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{fast_talk_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{fast_talk_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Fast_talk}}"></button>		
 					<input class="sheet-skill_values" type="text" value="5" name="attr_fast_talk_value" />
 					<input class="sheet-skill_values" type="text" disabled value="[@{Communications_mod}+@{fast_talk_value}+@{fatigue_mod}]" name="attr_fast_talk_total" />
 				</div>			
@@ -302,8 +309,8 @@
 				<div style="margin-bottom:2px">	
 					<input  style="display:inline-block" type="checkbox" name="attr_orate_check" />
 					<div class="sheet-skill_button">Orate</div>
-					<button style="font-family:dicefontd20;margin:0px;" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{orate_total}]}} {{fumble=[[ceil(95+([@{orate_total}])/20))]]}} {{crit=[[ceil(([@{orate_total}])/20)+1]]}} {{special=[[ceil(([@{orate_total}])/5)+1]]}}         {{success=[[[@{orate_total}]]]}} {{roll=[[1d100]]}} {{skillname=Orate}}" >t</button>								
-					<button type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{orate_total}]}} {{fumble=[[ceil(95+([@{orate_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{orate_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{orate_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{orate_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Orate}}"  ><div class="sheet-skill_mod_button">-?</div></button>		
+					<button  type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{orate_total}]}} {{fumble=[[ceil(95+([@{orate_total}])/20))]]}} {{crit=[[ceil(([@{orate_total}])/20)+1]]}} {{special=[[ceil(([@{orate_total}])/5)+1]]}}         {{success=[[[@{orate_total}]]]}} {{roll=[[1d100]]}} {{skillname=Orate}}" ></button>								
+					<button   class="sheet-new_roll" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{orate_total}]}} {{fumble=[[ceil(95+([@{orate_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{orate_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{orate_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{orate_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Orate}}"  ></button>		
 					<input class="sheet-skill_values" type="text" value="5" name="attr_orate_value" />
 					<input class="sheet-skill_values" type="text" disabled value="[@{Communications_mod}+@{orate_value}+@{fatigue_mod}]" name="attr_orate_total" />
 				</div>			
@@ -311,8 +318,8 @@
 				<div style="margin-bottom:2px">	
 					<input  style="display:inline-block" type="checkbox" name="attr_sing_check" />
 					<div class="sheet-skill_button">Sing</div>
-					<button style="font-family:dicefontd20;margin:0px;" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{sing_total}]}} {{fumble=[[ceil(95+([@{sing_total}])/20))]]}} {{crit=[[ceil(([@{sing_total}])/20)+1]]}} {{special=[[ceil(([@{sing_total}])/5)+1]]}}         {{success=[[[@{sing_total}]]]}} {{roll=[[1d100]]}} {{skillname=sing}}" >t</button>								
-					<button type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{sing_total}]}} {{fumble=[[ceil(95+([@{sing_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{sing_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{sing_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{sing_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Sing}}"  ><div class="sheet-skill_mod_button">-?</div></button>
+					<button  type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{sing_total}]}} {{fumble=[[ceil(95+([@{sing_total}])/20))]]}} {{crit=[[ceil(([@{sing_total}])/20)+1]]}} {{special=[[ceil(([@{sing_total}])/5)+1]]}}         {{success=[[[@{sing_total}]]]}} {{roll=[[1d100]]}} {{skillname=sing}}" ></button>								
+					<button   class="sheet-new_roll" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{sing_total}]}} {{fumble=[[ceil(95+([@{sing_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{sing_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{sing_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{sing_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Sing}}"  ></button>
 					<input class="sheet-skill_values" type="text" value="5" name="attr_sing_value" />
 					<input class="sheet-skill_values" type="text" disabled value="[@{Communications_mod}+@{sing_value}+@{fatigue_mod}]" name="attr_sing_total" />
 				</div>	
@@ -320,16 +327,17 @@
 				<div style="margin-bottom:2px">	
 					<input  style="display:inline-block" type="checkbox" name="attr_own_lang_check" />
 					<div class="sheet-skill_button">Own</div>
-					<button style="font-family:dicefontd20;margin:0px;" type="roll" >t</button>									
-					<button type="roll"><div class="sheet-skill_mod_button">-?</div></button>		
+					<button  type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{own_lang_total}]}} {{fumble=[[ceil(95+([@{own_lang_total}])/20))]]}} {{crit=[[ceil(([@{own_lang_total}])/20)+1]]}} {{special=[[ceil(([@{own_lang_total}])/5)+1]]}} {{success=[[[@{own_lang_total}]]]}} {{roll=[[1d100]]}} {{skillname=Own Lang.}}" ></button>								
+					<button   class="sheet-new_roll" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{own_lang_total}]}} {{fumble=[[ceil(95+([@{own_lang_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{own_lang_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{own_lang_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{own_lang_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Own Lang.}}"  ></button>
+		
 					<input class="sheet-skill_values" type="text" value="30" name="attr_own_lang_value" />
-					<input class="sheet-skill_values" type="text" disabled value="[@{Communications_mod}+@{own_lang_value}+@{fatigue_mod}]" name="attr_sing_total" />
+					<input class="sheet-skill_values" type="text" disabled value="[@{Communications_mod}+@{own_lang_value}+@{fatigue_mod}]" name="attr_own_lang_total" />
 				</div>			
 				<div style="margin-bottom:2px">	
 					<input  style="display:inline-block" type="checkbox" name="attr_own_lang1_check" />
 					<input  class="sheet-blank_skill"  style="display:inline-block;" type="text" name="attr_lang1_name" />
-					<button style="font-family:dicefontd20;margin:0px;" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{lang1_total}]}} {{fumble=[[ceil(95+([@{lang1_total}])/20))]]}} {{crit=[[ceil(([@{lang1_total}])/20)+1]]}} {{special=[[ceil(([@{lang1_total}])/5)+1]]}}         {{success=[[[@{lang1_total}]]]}} {{roll=[[1d100]]}} {{skillname=@{lang1_name}}}" >t</button>								
-					<button type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{lang1_total}]}} {{fumble=[[ceil(95+([@{lang1_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{lang1_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{lang1_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{lang1_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{lang1_name}}}"  ><div class="sheet-skill_mod_button">-?</div></button>
+					<button  type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{lang1_total}]}} {{fumble=[[ceil(95+([@{lang1_total}])/20))]]}} {{crit=[[ceil(([@{lang1_total}])/20)+1]]}} {{special=[[ceil(([@{lang1_total}])/5)+1]]}}         {{success=[[[@{lang1_total}]]]}} {{roll=[[1d100]]}} {{skillname=@{lang1_name}}}" ></button>								
+					<button   class="sheet-new_roll" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{lang1_total}]}} {{fumble=[[ceil(95+([@{lang1_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{lang1_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{lang1_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{lang1_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{lang1_name}}}"  ></button>
 								
 					<input class="sheet-skill_values" type="text" value="0" name="attr_lang1_value" />
 					<input class="sheet-skill_values" type="text" disabled value="[@{Communications_mod}+@{lang1_value}+@{fatigue_mod}]" name="attr_lang1_total" />
@@ -337,8 +345,8 @@
 				<div style="margin-bottom:2px">	
 					<input  style="display:inline-block" type="checkbox" name="attr_own_lang2_check" />
 					<input  class="sheet-blank_skill"  style="display:inline-block;" type="text" name="attr_lang2_name" />
-					<button style="font-family:dicefontd20;margin:0px;" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{lang2_total}]}} {{fumble=[[ceil(95+([@{lang2_total}])/20))]]}} {{crit=[[ceil(([@{lang2_total}])/20)+1]]}} {{special=[[ceil(([@{lang2_total}])/5)+1]]}}         {{success=[[[@{lang2_total}]]]}} {{roll=[[1d100]]}} {{skillname=@{lang2_name}}}" >t</button>								
-					<button type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{lang2_total}]}} {{fumble=[[ceil(95+([@{lang2_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{lang2_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{lang2_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{lang2_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{lang2_name}}}"  ><div class="sheet-skill_mod_button">-?</div></button>		
+					<button  type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{lang2_total}]}} {{fumble=[[ceil(95+([@{lang2_total}])/20))]]}} {{crit=[[ceil(([@{lang2_total}])/20)+1]]}} {{special=[[ceil(([@{lang2_total}])/5)+1]]}}         {{success=[[[@{lang2_total}]]]}} {{roll=[[1d100]]}} {{skillname=@{lang2_name}}}" ></button>								
+					<button   class="sheet-new_roll" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{lang2_total}]}} {{fumble=[[ceil(95+([@{lang2_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{lang2_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{lang2_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{lang2_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{lang2_name}}}"  ></button>		
 					<input class="sheet-skill_values" type="text" value="0" name="attr_lang2_value" />
 					<input class="sheet-skill_values" type="text" disabled value="[@{manipulation_mod}+@{lang2_value}+@{fatigue_mod}]" name="attr_lang2_total" />
 				</div>		
@@ -347,8 +355,8 @@
 						<input  style="display:inline-block" type="checkbox" name="attr_cskill_check" />
 						<input  class="sheet-blank_skill"  style="display:inline-block;" type="text" name="attr_cskill_name" />
 						
-						<button style="font-family:dicefontd20;margin:0px;" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=@{cskill_total}}} {{fumble=[[95+ceil((@{cskill_total}/20))]]}} {{crit=[[round(@{cskill_total}/20)+1]]}} {{special=[[round((@{cskill_total})/5)+1]]}}         {{success=[[@{cskill_total}]]}} {{roll=[[1d100]]}} {{skillname=@{cskill_name}}}" >t</button>								
-						<button type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=@{cskill_total}}} {{fumble=[[95+ceil(((@{cskill_total}+?{mods|0})/20))]]}} {{crit=[[round((@{cskill_total}+?{mods|0})/20)+1]]}} {{special=[[round(((@{cskill_total}+?{mods|0}))/5)+1]]}}         {{success=[[@{cskill_total}+?{mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{cskill_name}}}"  ><div class="sheet-skill_mod_button">-?</div></button>
+						<button  type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=@{cskill_total}}} {{fumble=[[95+ceil((@{cskill_total}/20))]]}} {{crit=[[round(@{cskill_total}/20)+1]]}} {{special=[[round((@{cskill_total})/5)+1]]}}         {{success=[[@{cskill_total}]]}} {{roll=[[1d100]]}} {{skillname=@{cskill_name}}}" ></button>								
+						<button   class="sheet-new_roll" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=@{cskill_total}}} {{fumble=[[95+ceil(((@{cskill_total}+?{mods|0})/20))]]}} {{crit=[[round((@{cskill_total}+?{mods|0})/20)+1]]}} {{special=[[round(((@{cskill_total}+?{mods|0}))/5)+1]]}}         {{success=[[@{cskill_total}+?{mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{cskill_name}}}"  ></button>
 						<input type="text"  class="sheet-skill_values" value="0" name="attr_cskill_value" />
 						<input type="text"  class="sheet-skill_values" disabled name="attr_cskill_total" value="@{cskill_value}+@{Communications_mod}+@{fatigue_mod}" />
 						
@@ -368,8 +376,8 @@
 				<div style="margin-bottom:2px">	
 					<input  style="display:inline-block" type="checkbox" name="attr_sing_check" />
 					<div class="sheet-skill_button">Animal Lore</div>
-					<button style="font-family:dicefontd20;margin:0px;" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{animal_lore_total}]}} {{fumble=[[ceil(95+([@{animal_lore_total}])/20))]]}} {{crit=[[ceil(([@{animal_lore_total}])/20)+1]]}} {{special=[[ceil(([@{animal_lore_total}])/5)+1]]}}         {{success=[[[@{animal_lore_total}]]]}} {{roll=[[1d100]]}} {{skillname=Animal Lore}}" >t</button>								
-					<button type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{animal_lore_total}]}} {{fumble=[[ceil(95+([@{animal_lore_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{animal_lore_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{animal_lore_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{animal_lore_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Animal Lore}}"  ><div class="sheet-skill_mod_button">-?</div></button>	
+					<button  type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{animal_lore_total}]}} {{fumble=[[ceil(95+([@{animal_lore_total}])/20))]]}} {{crit=[[ceil(([@{animal_lore_total}])/20)+1]]}} {{special=[[ceil(([@{animal_lore_total}])/5)+1]]}}         {{success=[[[@{animal_lore_total}]]]}} {{roll=[[1d100]]}} {{skillname=Animal Lore}}" ></button>								
+					<button   class="sheet-new_roll" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{animal_lore_total}]}} {{fumble=[[ceil(95+([@{animal_lore_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{animal_lore_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{animal_lore_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{animal_lore_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Animal Lore}}"  ></button>	
 					<input class="sheet-skill_values" type="text" value="5" name="attr_animal_lore_value" />
 					<input class="sheet-skill_values" type="text" disabled value="[@{knowledge_mod}+@{animal_lore_value}+@{fatigue_mod}]" name="attr_animal_lore_total" />
 				</div>			
@@ -377,24 +385,24 @@
 				<div style="margin-bottom:2px">	
 					<input  style="display:inline-block" type="checkbox" name="attr_own_craft1_check" />
 					<input class="sheet-blank_skill" style="display:inline-block;" type="text" name="attr_craft1_name" />
-					<button style="font-family:dicefontd20;margin:0px;" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{craft1_total}]}} {{fumble=[[ceil(95+([@{craft1_total}])/20))]]}} {{crit=[[ceil(([@{craft1_total}])/20)+1]]}} {{special=[[ceil(([@{craft1_total}])/5)+1]]}}         {{success=[[[@{craft1_total}]]]}} {{roll=[[1d100]]}} {{skillname=@{craft1_name}}}" >t</button>								
-					<button type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{craft1_total}]}} {{fumble=[[ceil(95+([@{craft1_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{craft1_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{craft1_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{craft1_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{craft1_name}}}"  ><div class="sheet-skill_mod_button">-?</div></button>	
+					<button  type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{craft1_total}]}} {{fumble=[[ceil(95+([@{craft1_total}])/20))]]}} {{crit=[[ceil(([@{craft1_total}])/20)+1]]}} {{special=[[ceil(([@{craft1_total}])/5)+1]]}}         {{success=[[[@{craft1_total}]]]}} {{roll=[[1d100]]}} {{skillname=@{craft1_name}}}" ></button>								
+					<button   class="sheet-new_roll" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{craft1_total}]}} {{fumble=[[ceil(95+([@{craft1_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{craft1_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{craft1_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{craft1_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{craft1_name}}}"  ></button>	
 					<input class="sheet-skill_values" type="text" value="10" name="attr_craft1_value" />
 					<input class="sheet-skill_values" type="text" disabled value="[@{knowledge_mod}+@{craft1_value}+@{fatigue_mod}]" name="attr_craft1_total" />
 				</div>			
 				<div style="margin-bottom:2px">	
 					<input  style="display:inline-block" type="checkbox" name="attr_craft2_check" />
 					<input  class="sheet-blank_skill"  style="display:inline-block;" type="text" name="attr_craft2_name" />
-					<button style="font-family:dicefontd20;margin:0px;" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{craft2_total}]}} {{fumble=[[ceil(95+([@{craft2_total}])/20))]]}} {{crit=[[ceil(([@{craft2_total}])/20)+1]]}} {{special=[[ceil(([@{craft2_total}])/5)+1]]}}         {{success=[[[@{craft2_total}]]]}} {{roll=[[1d100]]}} {{skillname=@{craft2_name}}}" >t</button>								
-					<button type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{craft2_total}]}} {{fumble=[[ceil(95+([@{craft2_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{craft2_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{craft2_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{craft2_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{craft2_name}}}"  ><div class="sheet-skill_mod_button">-?</div></button>		
+					<button  type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{craft2_total}]}} {{fumble=[[ceil(95+([@{craft2_total}])/20))]]}} {{crit=[[ceil(([@{craft2_total}])/20)+1]]}} {{special=[[ceil(([@{craft2_total}])/5)+1]]}}         {{success=[[[@{craft2_total}]]]}} {{roll=[[1d100]]}} {{skillname=@{craft2_name}}}" ></button>								
+					<button   class="sheet-new_roll" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{craft2_total}]}} {{fumble=[[ceil(95+([@{craft2_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{craft2_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{craft2_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{craft2_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{craft2_name}}}"  ></button>		
 					<input class="sheet-skill_values" type="text" value="10" name="attr_craft2_value" />
 					<input class="sheet-skill_values" type="text" disabled value="[@{knowledge_mod}+@{craft2_value}+@{fatigue_mod}]" name="attr_craft2_total" />
 				</div>		
 				<div style="margin-bottom:2px">	
 					<input  style="display:inline-block" type="checkbox" name="attr_evaluate_check" />
 					<div class="sheet-skill_button">Evaluate</div>
-					<button style="font-family:dicefontd20;margin:0px;" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{evaluate_total}]}} {{fumble=[[ceil(95+([@{evaluate_total}])/20))]]}} {{crit=[[ceil(([@{evaluate_total}])/20)+1]]}} {{special=[[ceil(([@{evaluate_total}])/5)+1]]}}         {{success=[[[@{evaluate_total}]]]}} {{roll=[[1d100]]}} {{skillname=Evaluate}}" >t</button>								
-					<button type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{evaluate_total}]}} {{fumble=[[ceil(95+([@{evaluate_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{evaluate_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{evaluate_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{evaluate_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Evaluate}}"  ><div class="sheet-skill_mod_button">-?</div></button>		
+					<button  type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{evaluate_total}]}} {{fumble=[[ceil(95+([@{evaluate_total}])/20))]]}} {{crit=[[ceil(([@{evaluate_total}])/20)+1]]}} {{special=[[ceil(([@{evaluate_total}])/5)+1]]}}         {{success=[[[@{evaluate_total}]]]}} {{roll=[[1d100]]}} {{skillname=Evaluate}}" ></button>								
+					<button   class="sheet-new_roll" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{evaluate_total}]}} {{fumble=[[ceil(95+([@{evaluate_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{evaluate_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{evaluate_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{evaluate_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Evaluate}}"  ></button>		
 					<input class="sheet-skill_values" type="text" value="5" name="attr_evaluate_value" />
 					<input class="sheet-skill_values" type="text" disabled value="[@{knowledge_mod}+@{evaluate_value}+@{fatigue_mod}]" name="attr_evaluate_total" />
 				</div>	
@@ -402,8 +410,8 @@
 				<div style="margin-bottom:2px">	
 					<input  style="display:inline-block" type="checkbox" name="attr_firstaid_check" />
 					<div class="sheet-skill_button">First Aid</div>
-					<button style="font-family:dicefontd20;margin:0px;" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{firstaid_total}]}} {{fumble=[[ceil(95+([@{firstaid_total}])/20))]]}} {{crit=[[ceil(([@{firstaid_total}])/20)+1]]}} {{special=[[ceil(([@{firstaid_total}])/5)+1]]}}         {{success=[[[@{firstaid_total}]]]}} {{roll=[[1d100]]}} {{skillname=First Aid}}" >t</button>								
-					<button type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{firstaid_total}]}} {{fumble=[[ceil(95+([@{firstaid_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{firstaid_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{firstaid_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{firstaid_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=First Aid}}"  ><div class="sheet-skill_mod_button">-?</div></button>		
+					<button  type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{firstaid_total}]}} {{fumble=[[ceil(95+([@{firstaid_total}])/20))]]}} {{crit=[[ceil(([@{firstaid_total}])/20)+1]]}} {{special=[[ceil(([@{firstaid_total}])/5)+1]]}}         {{success=[[[@{firstaid_total}]]]}} {{roll=[[1d100]]}} {{skillname=First Aid}}" ></button>								
+					<button   class="sheet-new_roll" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{firstaid_total}]}} {{fumble=[[ceil(95+([@{firstaid_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{firstaid_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{firstaid_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{firstaid_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=First Aid}}"  ></button>		
 					<input class="sheet-skill_values" type="text" value="10" name="attr_firstaid_value" />
 					<input class="sheet-skill_values" type="text" disabled value="[@{knowledge_mod}+@{firstaid_value}+@{fatigue_mod}]" name="attr_firstaid_total" />
 				</div>				
@@ -412,8 +420,8 @@
 				<div style="margin-bottom:2px">	
 					<input  style="display:inline-block" type="checkbox" name="attr_human_lore_check" />
 					<div class="sheet-skill_button">Human Lore</div>
-					<button style="font-family:dicefontd20;margin:0px;" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{human_lore_total}]}} {{fumble=[[ceil(95+([@{human_lore_total}])/20))]]}} {{crit=[[ceil(([@{human_lore_total}])/20)+1]]}} {{special=[[ceil(([@{human_lore_total}])/5)+1]]}}         {{success=[[[@{human_lore_total}]]]}} {{roll=[[1d100]]}} {{skillname=Human Lore}}" >t</button>								
-					<button type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{human_lore_total}]}} {{fumble=[[ceil(95+([@{human_lore_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{human_lore_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{human_lore_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{human_lore_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Human Lore}}"  ><div class="sheet-skill_mod_button">-?</div></button>		
+					<button  type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{human_lore_total}]}} {{fumble=[[ceil(95+([@{human_lore_total}])/20))]]}} {{crit=[[ceil(([@{human_lore_total}])/20)+1]]}} {{special=[[ceil(([@{human_lore_total}])/5)+1]]}}         {{success=[[[@{human_lore_total}]]]}} {{roll=[[1d100]]}} {{skillname=Human Lore}}" ></button>								
+					<button   class="sheet-new_roll" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{human_lore_total}]}} {{fumble=[[ceil(95+([@{human_lore_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{human_lore_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{human_lore_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{human_lore_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Human Lore}}"  ></button>		
 					<input class="sheet-skill_values" type="text" value="5" name="attr_human_lore_value" />
 					<input class="sheet-skill_values" type="text" disabled value="[@{knowledge_mod}+@{human_lore_value}+@{fatigue_mod}]" name="attr_human_lore_total" />
 				</div>	
@@ -421,16 +429,16 @@
 				<div style="margin-bottom:2px">	
 					<input  style="display:inline-block" type="checkbox" name="attr_martial_arts" />
 					<div class="sheet-skill_button">Martial Arts</div>
-					<button style="font-family:dicefontd20;margin:0px;" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{martial_arts_total}]}} {{fumble=[[ceil(95+([@{martial_arts_total}])/20))]]}} {{crit=[[ceil(([@{martial_arts_total}])/20)+1]]}} {{special=[[ceil(([@{martial_arts_total}])/5)+1]]}}         {{success=[[[@{martial_arts_total}]]]}} {{roll=[[1d100]]}} {{skillname=Martial Arts}}" >t</button>								
-					<button type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{martial_arts_total}]}} {{fumble=[[ceil(95+([@{martial_arts_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{martial_arts_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{martial_arts_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{martial_arts_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Martial Arts}}"  ><div class="sheet-skill_mod_button">-?</div></button>		
+					<button  type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{martial_arts_total}]}} {{fumble=[[ceil(95+([@{martial_arts_total}])/20))]]}} {{crit=[[ceil(([@{martial_arts_total}])/20)+1]]}} {{special=[[ceil(([@{martial_arts_total}])/5)+1]]}}         {{success=[[[@{martial_arts_total}]]]}} {{roll=[[1d100]]}} {{skillname=Martial Arts}}" ></button>								
+					<button   class="sheet-new_roll" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{martial_arts_total}]}} {{fumble=[[ceil(95+([@{martial_arts_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{martial_arts_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{martial_arts_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{martial_arts_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Martial Arts}}"  ></button>		
 					<input class="sheet-skill_values" type="text" value="0" name="attr_martial_arts_value" />
 					<input class="sheet-skill_values" type="text" disabled value="[@{knowledge_mod}+@{martial_arts_value}+@{fatigue_mod}]" name="attr_martial_arts_total" />
 				</div>	
 				<div style="margin-bottom:2px">	
 					<input  style="display:inline-block" type="checkbox" name="attr_mineral_lore_check" />
 					<div class="sheet-skill_button">Mineral Lore</div>
-					<button style="font-family:dicefontd20;margin:0px;" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{mineral_lore_total}]}} {{fumble=[[ceil(95+([@{mineral_lore_total}])/20))]]}} {{crit=[[ceil(([@{mineral_lore_total}])/20)+1]]}} {{special=[[ceil(([@{mineral_lore_total}])/5)+1]]}}         {{success=[[[@{mineral_lore_total}]]]}} {{roll=[[1d100]]}} {{skillname=Mineral Lore}}" >t</button>								
-					<button type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{mineral_lore_total}]}} {{fumble=[[ceil(95+([@{mineral_lore_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{mineral_lore_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{mineral_lore_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{mineral_lore_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Mineral Lore}}"  ><div class="sheet-skill_mod_button">-?</div></button>	
+					<button  type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{mineral_lore_total}]}} {{fumble=[[ceil(95+([@{mineral_lore_total}])/20))]]}} {{crit=[[ceil(([@{mineral_lore_total}])/20)+1]]}} {{special=[[ceil(([@{mineral_lore_total}])/5)+1]]}}         {{success=[[[@{mineral_lore_total}]]]}} {{roll=[[1d100]]}} {{skillname=Mineral Lore}}" ></button>								
+					<button   class="sheet-new_roll" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{mineral_lore_total}]}} {{fumble=[[ceil(95+([@{mineral_lore_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{mineral_lore_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{mineral_lore_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{mineral_lore_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Mineral Lore}}"  ></button>	
 					<input class="sheet-skill_values" type="text" value="5" name="attr_mineral_lore_value" />
 					<input class="sheet-skill_values" type="text" disabled value="[@{knowledge_mod}+@{mineral_lore_value}+@{fatigue_mod}]" name="attr_mineral_lore_total" />
 				</div>	
@@ -438,8 +446,8 @@
 				<div style="margin-bottom:2px">	
 					<input  style="display:inline-block" type="checkbox" name="attr_plant_lore_check" />
 					<div class="sheet-skill_button">Plant Lore</div>
-					<button style="font-family:dicefontd20;margin:0px;" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{plant_lore_total}]}} {{fumble=[[ceil(95+([@{plant_lore_total}])/20))]]}} {{crit=[[ceil(([@{plant_lore_total}])/20)+1]]}} {{special=[[ceil(([@{plant_lore_total}])/5)+1]]}}         {{success=[[[@{plant_lore_total}]]]}} {{roll=[[1d100]]}} {{skillname=Plant Lore}}" >t</button>								
-					<button type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{plant_lore_total}]}} {{fumble=[[ceil(95+([@{plant_lore_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{plant_lore_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{plant_lore_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{plant_lore_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Plant Lore}}"  ><div class="sheet-skill_mod_button">-?</div></button>		
+					<button  type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{plant_lore_total}]}} {{fumble=[[ceil(95+([@{plant_lore_total}])/20))]]}} {{crit=[[ceil(([@{plant_lore_total}])/20)+1]]}} {{special=[[ceil(([@{plant_lore_total}])/5)+1]]}}         {{success=[[[@{plant_lore_total}]]]}} {{roll=[[1d100]]}} {{skillname=Plant Lore}}" ></button>								
+					<button   class="sheet-new_roll" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{plant_lore_total}]}} {{fumble=[[ceil(95+([@{plant_lore_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{plant_lore_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{plant_lore_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{plant_lore_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Plant Lore}}"  ></button>		
 					<input class="sheet-skill_values" type="text" value="5" name="attr_plant_lore_value" />
 					<input class="sheet-skill_values" type="text" disabled value="[@{knowledge_mod}+@{plant_lore_value}+@{fatigue_mod}]" name="attr_plant_lore_total" />
 				</div>	
@@ -449,16 +457,16 @@
 				<div style="margin-bottom:2px">	
 					<input  style="display:inline-block" type="checkbox" name="attr_own_rw_lang1_check" />
 					<input  class="sheet-blank_skill" style="display:inline-block;" type="text" name="attr_rw_lang1_name" />
-					<button style="font-family:dicefontd20;margin:0px;" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{rw_lang1_total}]}} {{fumble=[[ceil(95+([@{rw_lang1_total}])/20))]]}} {{crit=[[ceil(([@{rw_lang1_total}])/20)+1]]}} {{special=[[ceil(([@{rw_lang1_total}])/5)+1]]}}         {{success=[[[@{rw_lang1_total}]]]}} {{roll=[[1d100]]}} {{skillname=@{rw_lang1_name}}}" >t</button>								
-					<button type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{rw_lang1_total}]}} {{fumble=[[ceil(95+([@{rw_lang1_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{rw_lang1_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{rw_lang1_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{rw_lang1_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{rw_lang1_name}}}"  ><div class="sheet-skill_mod_button">-?</div></button>	
+					<button  type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{rw_lang1_total}]}} {{fumble=[[ceil(95+([@{rw_lang1_total}])/20))]]}} {{crit=[[ceil(([@{rw_lang1_total}])/20)+1]]}} {{special=[[ceil(([@{rw_lang1_total}])/5)+1]]}}         {{success=[[[@{rw_lang1_total}]]]}} {{roll=[[1d100]]}} {{skillname=@{rw_lang1_name}}}" ></button>								
+					<button   class="sheet-new_roll" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{rw_lang1_total}]}} {{fumble=[[ceil(95+([@{rw_lang1_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{rw_lang1_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{rw_lang1_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{rw_lang1_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{rw_lang1_name}}}"  ></button>	
 					<input class="sheet-skill_values" type="text" value="0" name="attr_rw_lang1_value" />
 					<input class="sheet-skill_values" type="text" disabled value="[@{knowledge_mod}+@{rw_lang1_value}+@{fatigue_mod}]" name="attr_rw_lang1_total" />
 				</div>			
 				<div style="margin-bottom:2px">	
 					<input  style="display:inline-block" type="checkbox" name="attr_own_rw_lang2_check" />
 					<input  class="sheet-blank_skill" style="display:inline-block;" type="text" name="attr_rw_lang2_name" />
-					<button style="font-family:dicefontd20;margin:0px;" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{rw_lang2_total}]}} {{fumble=[[ceil(95+([@{rw_lang2_total}])/20))]]}} {{crit=[[ceil(([@{rw_lang2_total}])/20)+1]]}} {{special=[[ceil(([@{rw_lang2_total}])/5)+1]]}}         {{success=[[[@{rw_lang2_total}]]]}} {{roll=[[1d100]]}} {{skillname=@{rw_lang2_name}}}" >t</button>								
-					<button type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{rw_lang2_total}]}} {{fumble=[[ceil(95+([@{rw_lang2_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{rw_lang2_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{rw_lang2_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{rw_lang2_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{rw_lang2_name}}}"  ><div class="sheet-skill_mod_button">-?</div></button>		
+					<button  type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{rw_lang2_total}]}} {{fumble=[[ceil(95+([@{rw_lang2_total}])/20))]]}} {{crit=[[ceil(([@{rw_lang2_total}])/20)+1]]}} {{special=[[ceil(([@{rw_lang2_total}])/5)+1]]}}         {{success=[[[@{rw_lang2_total}]]]}} {{roll=[[1d100]]}} {{skillname=@{rw_lang2_name}}}" ></button>								
+					<button   class="sheet-new_roll" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{rw_lang2_total}]}} {{fumble=[[ceil(95+([@{rw_lang2_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{rw_lang2_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{rw_lang2_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{rw_lang2_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{rw_lang2_name}}}"  ></button>		
 					<input class="sheet-skill_values" type="text" value="0" name="attr_rw_lang2_value" />
 					<input class="sheet-skill_values" type="text" disabled value="[@{knowledge_mod}+@{rw_lang2_value}+@{fatigue_mod}]" name="attr_rw_lang2_total" />
 				</div>		
@@ -466,8 +474,8 @@
 				<div style="margin-bottom:2px">			
 					<input  style="display:inline-block" type="checkbox" name="attr_ship_handling_check" />
 					<div class="sheet-skill_button">Ship Handling</div>
-					<button style="font-family:dicefontd20;margin:0px;" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{ship_handling_total}]}} {{fumble=[[ceil(95+([@{ship_handling_total}])/20))]]}} {{crit=[[ceil(([@{ship_handling_total}])/20)+1]]}} {{special=[[ceil(([@{ship_handling_total}])/5)+1]]}}         {{success=[[[@{ship_handling_total}]]]}} {{roll=[[1d100]]}} {{skillname=Ship Handling}}" >t</button>								
-					<button type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{ship_handling_total}]}} {{fumble=[[ceil(95+([@{ship_handling_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{ship_handling_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{ship_handling_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{ship_handling_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Ship Handling}}"  ><div class="sheet-skill_mod_button">-?</div></button>		
+					<button  type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{ship_handling_total}]}} {{fumble=[[ceil(95+([@{ship_handling_total}])/20))]]}} {{crit=[[ceil(([@{ship_handling_total}])/20)+1]]}} {{special=[[ceil(([@{ship_handling_total}])/5)+1]]}}         {{success=[[[@{ship_handling_total}]]]}} {{roll=[[1d100]]}} {{skillname=Ship Handling}}" ></button>								
+					<button   class="sheet-new_roll" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{ship_handling_total}]}} {{fumble=[[ceil(95+([@{ship_handling_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{ship_handling_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{ship_handling_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{ship_handling_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Ship Handling}}"  ></button>		
 					<input class="sheet-skill_values" type="text" value="5" name="attr_ship_handling_value" />
 					<input class="sheet-skill_values" type="text" disabled value="[@{knowledge_mod}+@{ship_handling_value}+@{fatigue_mod}]" name="attr_ship_handling_total" />
 				</div>	
@@ -475,8 +483,8 @@
 				<div style="margin-bottom:2px">	
 					<input  style="display:inline-block" type="checkbox" name="attr_world_lore_check" />
 					<div class="sheet-skill_button">World Lore</div>
-					<button style="font-family:dicefontd20;margin:0px;" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{world_lore_total}]}} {{fumble=[[ceil(95+([@{world_lore_total}])/20))]]}} {{crit=[[ceil(([@{world_lore_total}])/20)+1]]}} {{special=[[ceil(([@{world_lore_total}])/5)+1]]}}         {{success=[[[@{world_lore_total}]]]}} {{roll=[[1d100]]}} {{skillname=World Lore}}" >t</button>								
-					<button type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{world_lore_total}]}} {{fumble=[[ceil(95+([@{world_lore_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{world_lore_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{world_lore_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{world_lore_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=World Lore}}"  ><div class="sheet-skill_mod_button">-?</div></button>		
+					<button  type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{world_lore_total}]}} {{fumble=[[ceil(95+([@{world_lore_total}])/20))]]}} {{crit=[[ceil(([@{world_lore_total}])/20)+1]]}} {{special=[[ceil(([@{world_lore_total}])/5)+1]]}}         {{success=[[[@{world_lore_total}]]]}} {{roll=[[1d100]]}} {{skillname=World Lore}}" ></button>								
+					<button   class="sheet-new_roll" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{world_lore_total}]}} {{fumble=[[ceil(95+([@{world_lore_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{world_lore_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{world_lore_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{world_lore_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=World Lore}}"  ></button>		
 					<input class="sheet-skill_values" type="text" value="5" name="attr_world_lore_value" />
 					<input class="sheet-skill_values" type="text" disabled value="[@{knowledge_mod}+@{world_lore_value}+@{fatigue_mod}]" name="attr_world_lore_total" />
 				</div>	
@@ -485,8 +493,8 @@
 						<input  style="display:inline-block" type="checkbox" name="attr_kskill_check" />
 						<input  class="sheet-blank_skill"  style="display:inline-block;" type="text" name="attr_kskill_name" />
 						
-						<button style="font-family:dicefontd20;margin:0px;" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=@{kskill_total}}} {{fumble=[[95+ceil((@{kskill_total}/20))]]}} {{crit=[[round(@{kskill_total}/20)+1]]}} {{special=[[round((@{kskill_total})/5)+1]]}}         {{success=[[@{kskill_total}]]}} {{roll=[[1d100]]}} {{skillname=@{kskill_name}}}" >t</button>								
-						<button type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=@{kskill_total}}} {{fumble=[[95+ceil(((@{kskill_total}+?{mods|0})/20))]]}} {{crit=[[round((@{kskill_total}+?{mods|0})/20)+1]]}} {{special=[[round(((@{kskill_total}+?{mods|0}))/5)+1]]}}         {{success=[[@{kskill_total}+?{mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{kskill_name}}}"  ><div class="sheet-skill_mod_button">-?</div></button>
+						<button  type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=@{kskill_total}}} {{fumble=[[95+ceil((@{kskill_total}/20))]]}} {{crit=[[round(@{kskill_total}/20)+1]]}} {{special=[[round((@{kskill_total})/5)+1]]}}         {{success=[[@{kskill_total}]]}} {{roll=[[1d100]]}} {{skillname=@{kskill_name}}}" ></button>								
+						<button   class="sheet-new_roll" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=@{kskill_total}}} {{fumble=[[95+ceil(((@{kskill_total}+?{mods|0})/20))]]}} {{crit=[[round((@{kskill_total}+?{mods|0})/20)+1]]}} {{special=[[round(((@{kskill_total}+?{mods|0}))/5)+1]]}}         {{success=[[@{kskill_total}+?{mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{kskill_name}}}"  ></button>
 						<input type="text"  class="sheet-skill_values" value="0" name="attr_kskill_value" />
 						<input type="text"  class="sheet-skill_values" disabled name="attr_kskill_total" value="@{kskill_value}+@{knowledge_mod}+@{fatigue_mod}" />
 						
@@ -509,24 +517,24 @@
 				<div style="margin-bottom:2px">	
 					<input  style="display:inline-block" type="checkbox" name="attr_conceal_check" />
 					<div class="sheet-skill_button">Conceal</div>
-					<button style="font-family:dicefontd20;margin:0px;" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{conceal_total}]}} {{fumble=[[ceil(95+([@{conceal_total}])/20))]]}} {{crit=[[ceil(([@{conceal_total}])/20)+1]]}} {{special=[[ceil(([@{conceal_total}])/5)+1]]}}         {{success=[[[@{conceal_total}]]]}} {{roll=[[1d100]]}} {{skillname=Conceal}}" >t</button>								
-					<button type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{conceal_total}]}} {{fumble=[[ceil(95+([@{conceal_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{conceal_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{conceal_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{conceal_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Conceal}}"  ><div class="sheet-skill_mod_button">-?</div></button>			
+					<button  type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{conceal_total}]}} {{fumble=[[ceil(95+([@{conceal_total}])/20))]]}} {{crit=[[ceil(([@{conceal_total}])/20)+1]]}} {{special=[[ceil(([@{conceal_total}])/5)+1]]}}         {{success=[[[@{conceal_total}]]]}} {{roll=[[1d100]]}} {{skillname=Conceal}}" ></button>								
+					<button   class="sheet-new_roll" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{conceal_total}]}} {{fumble=[[ceil(95+([@{conceal_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{conceal_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{conceal_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{conceal_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Conceal}}"  ></button>			
 					<input class="sheet-skill_values" type="text" value="5" name="attr_conceal_value" />
 					<input class="sheet-skill_values" type="text" disabled value="[@{manipulation_mod}+@{conceal_value}+@{fatigue_mod}]" name="attr_conceal_total" />
 				</div>	
 				<div style="margin-bottom:2px">	
 					<input  style="display:inline-block" type="checkbox" name="attr_devise_check" />
 					<div class="sheet-skill_button">Devise</div>
-					<button style="font-family:dicefontd20;margin:0px;" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{devise_total}]}} {{fumble=[[ceil(95+([@{devise_total}])/20))]]}} {{crit=[[ceil(([@{devise_total}])/20)+1]]}} {{special=[[ceil(([@{devise_total}])/5)+1]]}}         {{success=[[[@{devise_total}]]]}} {{roll=[[1d100]]}} {{skillname=Devise}}" >t</button>								
-					<button type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{devise_total}]}} {{fumble=[[ceil(95+([@{devise_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{devise_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{devise_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{devise_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Devise}}"  ><div class="sheet-skill_mod_button">-?</div></button>			
+					<button  type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{devise_total}]}} {{fumble=[[ceil(95+([@{devise_total}])/20))]]}} {{crit=[[ceil(([@{devise_total}])/20)+1]]}} {{special=[[ceil(([@{devise_total}])/5)+1]]}}         {{success=[[[@{devise_total}]]]}} {{roll=[[1d100]]}} {{skillname=Devise}}" ></button>								
+					<button   class="sheet-new_roll" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{devise_total}]}} {{fumble=[[ceil(95+([@{devise_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{devise_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{devise_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{devise_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Devise}}"  ></button>			
 					<input class="sheet-skill_values" type="text" value="5" name="attr_devise_value" />
 					<input class="sheet-skill_values" type="text" disabled value="[@{manipulation_mod}+@{devise_value}+@{fatigue_mod}]" name="attr_devise_total" />
 				</div>
 				<div style="margin-bottom:2px">	
 					<input  style="display:inline-block" type="checkbox" name="attr_sleighte_check" />
 					<div class="sheet-skill_button">Sleight</div>
-					<button style="font-family:dicefontd20;margin:0px;" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{sleight_total}]}} {{fumble=[[ceil(95+([@{sleight_total}])/20))]]}} {{crit=[[ceil(([@{sleight_total}])/20)+1]]}} {{special=[[ceil(([@{sleight_total}])/5)+1]]}}         {{success=[[[@{sleight_total}]]]}} {{roll=[[1d100]]}} {{skillname=Sleight}}" >t</button>								
-					<button type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{sleight_total}]}} {{fumble=[[ceil(95+([@{sleight_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{sleight_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{sleight_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{sleight_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Sleight}}"  ><div class="sheet-skill_mod_button">-?</div></button>		
+					<button  type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{sleight_total}]}} {{fumble=[[ceil(95+([@{sleight_total}])/20))]]}} {{crit=[[ceil(([@{sleight_total}])/20)+1]]}} {{special=[[ceil(([@{sleight_total}])/5)+1]]}}         {{success=[[[@{sleight_total}]]]}} {{roll=[[1d100]]}} {{skillname=Sleight}}" ></button>								
+					<button   class="sheet-new_roll" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{sleight_total}]}} {{fumble=[[ceil(95+([@{sleight_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{sleight_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{sleight_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{sleight_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Sleight}}"  ></button>		
 					<input class="sheet-skill_values" type="text" value="5" name="attr_sleight_value" />
 					<input class="sheet-skill_values" type="text" disabled value="[@{manipulation_mod}+@{sleight_value}+@{fatigue_mod}]" name="attr_sleight_total" />
 				</div>		
@@ -535,16 +543,16 @@
 				<div style="margin-bottom:2px">	
 					<input  style="display:inline-block" type="checkbox" name="attr_own_play1_check" />
 					<input class="sheet-blank_skill" style="display:inline-block;" type="text" name="attr_play1_name" />
-					<button style="font-family:dicefontd20;margin:0px;" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{play1_total}]}} {{fumble=[[ceil(95+([@{play1_total}])/20))]]}} {{crit=[[ceil(([@{play1_total}])/20)+1]]}} {{special=[[ceil(([@{play1_total}])/5)+1]]}}         {{success=[[[@{play1_total}]]]}} {{roll=[[1d100]]}} {{skillname=@{play1_name}}}" >t</button>								
-					<button type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{play1_total}]}} {{fumble=[[ceil(95+([@{play1_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{play1_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{play1_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{play1_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{play1_name}}}"  ><div class="sheet-skill_mod_button">-?</div></button>			
+					<button  type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{play1_total}]}} {{fumble=[[ceil(95+([@{play1_total}])/20))]]}} {{crit=[[ceil(([@{play1_total}])/20)+1]]}} {{special=[[ceil(([@{play1_total}])/5)+1]]}}         {{success=[[[@{play1_total}]]]}} {{roll=[[1d100]]}} {{skillname=@{play1_name}}}" ></button>								
+					<button   class="sheet-new_roll" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{play1_total}]}} {{fumble=[[ceil(95+([@{play1_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{play1_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{play1_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{play1_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{play1_name}}}"  ></button>			
 					<input class="sheet-skill_values" type="text" value="0" name="attr_play1_value" />
 					<input class="sheet-skill_values" type="text" disabled value="[@{manipulation_mod}+@{play1_value}+@{fatigue_mod}]" name="attr_play1_total" />
 				</div>			
 				<div style="margin-bottom:2px">	
 					<input  style="display:inline-block" type="checkbox" name="attr_own_play2_check" />
 					<input class="sheet-blank_skill" style="display:inline-block;" type="text" name="attr_play2_name" />
-					<button style="font-family:dicefontd20;margin:0px;" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{play2_total}]}} {{fumble=[[ceil(95+([@{play2_total}])/20))]]}} {{crit=[[ceil(([@{play2_total}])/20)+1]]}} {{special=[[ceil(([@{play2_total}])/5)+1]]}}         {{success=[[[@{play2_total}]]]}} {{roll=[[1d100]]}} {{skillname=@{play2_name}}}" >t</button>								
-					<button type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{play2_total}]}} {{fumble=[[ceil(95+([@{play2_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{play2_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{play2_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{play2_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{play2_name}}}"  ><div class="sheet-skill_mod_button">-?</div></button>			
+					<button  type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{play2_total}]}} {{fumble=[[ceil(95+([@{play2_total}])/20))]]}} {{crit=[[ceil(([@{play2_total}])/20)+1]]}} {{special=[[ceil(([@{play2_total}])/5)+1]]}}         {{success=[[[@{play2_total}]]]}} {{roll=[[1d100]]}} {{skillname=@{play2_name}}}" ></button>								
+					<button   class="sheet-new_roll" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{play2_total}]}} {{fumble=[[ceil(95+([@{play2_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{play2_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{play2_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{play2_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{play2_name}}}"  ></button>			
 					<input class="sheet-skill_values" type="text" value="0" name="attr_play2_value" />
 					<input class="sheet-skill_values" type="text" disabled value="[@{manipulation_mod}+@{play2_value}+@{fatigue_mod}]" name="attr_play2_total" />
 				</div>
@@ -553,8 +561,8 @@
 						<input  style="display:inline-block" type="checkbox" name="attr_mskill_check" />
 						<input  class="sheet-blank_skill"  style="display:inline-block;" type="text" name="attr_mskill_name" />
 						
-						<button style="font-family:dicefontd20;margin:0px;" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=@{mskill_total}}} {{fumble=[[95+ceil((@{mskill_total}/20))]]}} {{crit=[[round(@{mskill_total}/20)+1]]}} {{special=[[round((@{mskill_total})/5)+1]]}}         {{success=[[@{mskill_total}]]}} {{roll=[[1d100]]}} {{skillname=@{mskill_name}}}" >t</button>								
-						<button type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=@{mskill_total}}} {{fumble=[[95+ceil(((@{mskill_total}+?{mods|0})/20))]]}} {{crit=[[round((@{mskill_total}+?{mods|0})/20)+1]]}} {{special=[[round(((@{mskill_total}+?{mods|0}))/5)+1]]}}         {{success=[[@{mskill_total}+?{mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{mskill_name}}}"  ><div class="sheet-skill_mod_button">-?</div></button>
+						<button  type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=@{mskill_total}}} {{fumble=[[95+ceil((@{mskill_total}/20))]]}} {{crit=[[round(@{mskill_total}/20)+1]]}} {{special=[[round((@{mskill_total})/5)+1]]}}         {{success=[[@{mskill_total}]]}} {{roll=[[1d100]]}} {{skillname=@{mskill_name}}}" ></button>								
+						<button class="sheet-new_roll" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=@{mskill_total}}} {{fumble=[[95+ceil(((@{mskill_total}+?{mods|0})/20))]]}} {{crit=[[round((@{mskill_total}+?{mods|0})/20)+1]]}} {{special=[[round(((@{mskill_total}+?{mods|0}))/5)+1]]}}         {{success=[[@{mskill_total}+?{mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{mskill_name}}}"  ></button>
 						<input type="text"  class="sheet-skill_values" value="0" name="attr_mskill_value" />
 						<input type="text"  class="sheet-skill_values" disabled name="attr_mskill_total" value="@{mskill_value}+@{manipulation_mod}+@{fatigue_mod}" />
 						
@@ -575,8 +583,8 @@
 				<div style="margin-bottom:2px">	
 					<input  style="display:inline-block" type="checkbox" name="attr_listen_check" />
 					<div class="sheet-skill_button">Listen</div>
-					<button style="font-family:dicefontd20;margin:0px;" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{listen_total}]}} {{fumble=[[ceil(95+([@{listen_total}])/20))]]}} {{crit=[[ceil(([@{listen_total}])/20)+1]]}} {{special=[[ceil(([@{listen_total}])/5)+1]]}}         {{success=[[[@{listen_total}]]]}} {{roll=[[1d100]]}} {{skillname=Listen}}" >t</button>								
-					<button type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{listen_total}]}} {{fumble=[[ceil(95+([@{listen_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{listen_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{listen_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{listen_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Listen}}"  ><div class="sheet-skill_mod_button">-?</div></button>		
+					<button  type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{listen_total}]}} {{fumble=[[ceil(95+([@{listen_total}])/20))]]}} {{crit=[[ceil(([@{listen_total}])/20)+1]]}} {{special=[[ceil(([@{listen_total}])/5)+1]]}}         {{success=[[[@{listen_total}]]]}} {{roll=[[1d100]]}} {{skillname=Listen}}" ></button>								
+					<button  class="sheet-new_roll" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{listen_total}]}} {{fumble=[[ceil(95+([@{listen_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{listen_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{listen_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{listen_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Listen}}"  ></button>		
 
 					<input class="sheet-skill_values" type="text" value="25" name="attr_listen_value" />
 					<input class="sheet-skill_values" type="text" disabled value="[@{perception_mod}+@{listen_value}+@{fatigue_mod}]" name="attr_listen_total" />
@@ -584,8 +592,8 @@
 				<div style="margin-bottom:2px">	
 					<input  style="display:inline-block" type="checkbox" name="attr_scan_check" />
 					<div class="sheet-skill_button">Scan</div>
-					<button style="font-family:dicefontd20;margin:0px;" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{scan_total}]}} {{fumble=[[ceil(95+([@{scan_total}])/20))]]}} {{crit=[[ceil(([@{scan_total}])/20)+1]]}} {{special=[[ceil(([@{scan_total}])/5)+1]]}}         {{success=[[[@{scan_total}]]]}} {{roll=[[1d100]]}} {{skillname=Scan}}" >t</button>								
-					<button type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{scan_total}]}} {{fumble=[[ceil(95+([@{scan_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{scan_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{scan_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{scan_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Scan}}"  ><div class="sheet-skill_mod_button">-?</div></button>		
+					<button  type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{scan_total}]}} {{fumble=[[ceil(95+([@{scan_total}])/20))]]}} {{crit=[[ceil(([@{scan_total}])/20)+1]]}} {{special=[[ceil(([@{scan_total}])/5)+1]]}}         {{success=[[[@{scan_total}]]]}} {{roll=[[1d100]]}} {{skillname=Scan}}" ></button>								
+					<button  class="sheet-new_roll" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{scan_total}]}} {{fumble=[[ceil(95+([@{scan_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{scan_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{scan_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{scan_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Scan}}"  ></button>		
 		
 					<input class="sheet-skill_values" type="text" value="25" name="attr_scan_value" />
 					<input class="sheet-skill_values" type="text" disabled value="[@{perception_mod}+@{scan_value}+@{fatigue_mod}]" name="attr_scan_total" />
@@ -593,18 +601,18 @@
 				<div style="margin-bottom:2px">	
 					<input  style="display:inline-block" type="checkbox" name="attr_search_check" />
 					<div class="sheet-skill_button">Search</div>
-					<button style="font-family:dicefontd20;margin:0px;" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{search_total}]}} {{fumble=[[ceil(95+([@{search_total}])/20))]]}} {{crit=[[ceil(([@{search_total}])/20)+1]]}} {{special=[[ceil(([@{search_total}])/5)+1]]}}         {{success=[[[@{search_total}]]]}} {{roll=[[1d100]]}} {{skillname=Search}}" >t</button>								
-					<button type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{search_total}]}} {{fumble=[[ceil(95+([@{search_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{search_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{search_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{search_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Search}}"  ><div class="sheet-skill_mod_button">-?</div></button>		
+					<button  type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{search_total}]}} {{fumble=[[ceil(95+([@{search_total}])/20))]]}} {{crit=[[ceil(([@{search_total}])/20)+1]]}} {{special=[[ceil(([@{search_total}])/5)+1]]}}         {{success=[[[@{search_total}]]]}} {{roll=[[1d100]]}} {{skillname=Search}}" ></button>								
+					<button class="sheet-new_roll"  type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{search_total}]}} {{fumble=[[ceil(95+([@{search_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{search_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{search_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{search_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Search}}"  ></button>		
 	
 
 					<input class="sheet-skill_values" type="text" value="25" name="attr_search_value" />
 					<input class="sheet-skill_values" type="text" disabled value="[@{perception_mod}+@{search_value}+@{fatigue_mod}]" name="attr_search_total" />
 				</div>
 				<div style="margin-bottom:2px">	
-					<input  style="display:inline-block" type="checkbox" name="attr_search_check" />
+					<input  style="display:inline-block" type="checkbox" name="attr_track_check" />
 					<div class="sheet-skill_button">Track</div>
-					<button style="font-family:dicefontd20;margin:0px;" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{track_total}]}} {{fumble=[[ceil(95+([@{track_total}])/20))]]}} {{crit=[[ceil(([@{track_total}])/20)+1]]}} {{special=[[ceil(([@{track_total}])/5)+1]]}}         {{success=[[[@{track_total}]]]}} {{roll=[[1d100]]}} {{skillname=Track}}" >t</button>								
-					<button type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{track_total}]}} {{fumble=[[ceil(95+([@{track_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{track_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{search_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{track_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Track}}"  ><div class="sheet-skill_mod_button">-?</div></button>		
+					<button  type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{track_total}]}} {{fumble=[[ceil(95+([@{track_total}])/20))]]}} {{crit=[[ceil(([@{track_total}])/20)+1]]}} {{special=[[ceil(([@{track_total}])/5)+1]]}}         {{success=[[[@{track_total}]]]}} {{roll=[[1d100]]}} {{skillname=Track}}" ></button>								
+					<button  class="sheet-new_roll" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{track_total}]}} {{fumble=[[ceil(95+([@{track_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{track_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{search_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{track_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Track}}"  ></button>		
 	
 
 					<input class="sheet-skill_values" type="text" value="5" name="attr_track_value" />
@@ -615,8 +623,8 @@
 						<input  style="display:inline-block" type="checkbox" name="attr_pskill_check" />
 						<input  class="sheet-blank_skill"  style="display:inline-block;" type="text" name="attr_pskill_name" />
 						
-						<button style="font-family:dicefontd20;margin:0px;" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=@{pskill_total}}} {{fumble=[[95+ceil((@{pskill_total}/20))]]}} {{crit=[[round(@{pskill_total}/20)+1]]}} {{special=[[round((@{pskill_total})/5)+1]]}}         {{success=[[@{pskill_total}]]}} {{roll=[[1d100]]}} {{skillname=@{pskill_name}}}" >t</button>								
-						<button type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=@{pskill_total}}} {{fumble=[[95+ceil(((@{pskill_total}+?{mods|0})/20))]]}} {{crit=[[round((@{pskill_total}+?{mods|0})/20)+1]]}} {{special=[[round(((@{pskill_total}+?{mods|0}))/5)+1]]}}         {{success=[[@{pskill_total}+?{mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{pskill_name}}}"  ><div class="sheet-skill_mod_button">-?</div></button>
+						<button  type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=@{pskill_total}}} {{fumble=[[95+ceil((@{pskill_total}/20))]]}} {{crit=[[round(@{pskill_total}/20)+1]]}} {{special=[[round((@{pskill_total})/5)+1]]}}         {{success=[[@{pskill_total}]]}} {{roll=[[1d100]]}} {{skillname=@{pskill_name}}}" ></button>								
+						<button  class="sheet-new_roll" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=@{pskill_total}}} {{fumble=[[95+ceil(((@{pskill_total}+?{mods|0})/20))]]}} {{crit=[[round((@{pskill_total}+?{mods|0})/20)+1]]}} {{special=[[round(((@{pskill_total}+?{mods|0}))/5)+1]]}}         {{success=[[@{pskill_total}+?{mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{pskill_name}}}"  ></button>
 						<input type="text"  class="sheet-skill_values" value="0" name="attr_pskill_value" />
 						<input type="text"  class="sheet-skill_values" disabled name="attr_pskill_total" value="@{pskill_value}+@{manipulation_mod}+@{fatigue_mod}" />
 						
@@ -636,16 +644,16 @@
 				<div>	
 					<input  style="display:inline-block" type="checkbox" name="attr_hide_check" />
 					<div class="sheet-skill_button">Hide</div>
-					<button style="font-family:dicefontd20;margin:0px;" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{hide_total}]}} {{fumble=[[ceil(95+([@{hide_total}])/20))]]}} {{crit=[[ceil(([@{hide_total}])/20)+1]]}} {{special=[[ceil(([@{hide_total}])/5)+1]]}}         {{success=[[[@{hide_total}]]]}} {{roll=[[1d100]]}} {{skillname=Hide}}" >t</button>								
-					<button type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{hide_total}]}} {{fumble=[[ceil(95+([@{hide_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{hide_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{hide_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{hide_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Hide}}"  ><div class="sheet-skill_mod_button">-?</div></button>		
+					<button  type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{hide_total}]}} {{fumble=[[ceil(95+([@{hide_total}])/20))]]}} {{crit=[[ceil(([@{hide_total}])/20)+1]]}} {{special=[[ceil(([@{hide_total}])/5)+1]]}}         {{success=[[[@{hide_total}]]]}} {{roll=[[1d100]]}} {{skillname=Hide}}" ></button>								
+					<button  class="sheet-new_roll" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{hide_total}]}} {{fumble=[[ceil(95+([@{hide_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{hide_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{hide_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{hide_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Hide}}"  ></button>		
 					<input class="sheet-skill_values" type="text" value="10" name="attr_hide_value" />
 					<input class="sheet-skill_values" type="text" disabled value="[@{stealth_mod}+@{hide_value}+@{fatigue_mod}]" name="attr_hide_total" />
 				</div>		
 				<div>	
 					<input  style="display:inline-block" type="checkbox" name="attr_sneak_check" />
 					<div class="sheet-skill_button">Sneak</div>
-					<button style="font-family:dicefontd20;margin:0px;" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{sneak_total}]}} {{fumble=[[ceil(95+([@{sneak_total}])/20))]]}} {{crit=[[ceil(([@{sneak_total}])/20)+1]]}} {{special=[[ceil(([@{sneak_total}])/5)+1]]}}         {{success=[[[@{sneak_total}]]]}} {{roll=[[1d100]]}} {{skillname=Sneak}}" >t</button>								
-					<button type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{sneak_total}]}} {{fumble=[[ceil(95+([@{sneak_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{sneak_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{sneak_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{sneak_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Sneak}}"  ><div class="sheet-skill_mod_button">-?</div></button>		
+					<button  type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{sneak_total}]}} {{fumble=[[ceil(95+([@{sneak_total}])/20))]]}} {{crit=[[ceil(([@{sneak_total}])/20)+1]]}} {{special=[[ceil(([@{sneak_total}])/5)+1]]}}         {{success=[[[@{sneak_total}]]]}} {{roll=[[1d100]]}} {{skillname=Sneak}}" ></button>								
+					<button  class="sheet-new_roll" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{sneak_total}]}} {{fumble=[[ceil(95+([@{sneak_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{sneak_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{sneak_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{sneak_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Sneak}}"  ></button>		
 	
 					<input class="sheet-skill_values" type="text" value="10" name="attr_sneak_value" />
 					<input class="sheet-skill_values" type="text" disabled value="[@{stealth_mod}+@{sneak_value}+@{fatigue_mod}]" name="attr_sneak_total" />
@@ -655,8 +663,8 @@
 						<input  style="display:inline-block" type="checkbox" name="attr_sskill_check" />
 						<input  class="sheet-blank_skill"  style="display:inline-block;" type="text" name="attr_sskill_name" />
 						
-						<button style="font-family:dicefontd20;margin:0px;" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=@{sskill_total}}} {{fumble=[[95+ceil((@{sskill_total}/20))]]}} {{crit=[[round(@{sskill_total}/20)+1]]}} {{special=[[round((@{sskill_total})/5)+1]]}}         {{success=[[@{sskill_total}]]}} {{roll=[[1d100]]}} {{skillname=@{sskill_name}}}" >t</button>								
-						<button type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=@{sskill_total}}} {{fumble=[[95+ceil(((@{sskill_total}+?{mods|0})/20))]]}} {{crit=[[round((@{sskill_total}+?{mods|0})/20)+1]]}} {{special=[[round(((@{sskill_total}+?{mods|0}))/5)+1]]}}         {{success=[[@{sskill_total}+?{mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{sskill_name}}}"  ><div class="sheet-skill_mod_button">-?</div></button>
+						<button  type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=@{sskill_total}}} {{fumble=[[95+ceil((@{sskill_total}/20))]]}} {{crit=[[round(@{sskill_total}/20)+1]]}} {{special=[[round((@{sskill_total})/5)+1]]}}         {{success=[[@{sskill_total}]]}} {{roll=[[1d100]]}} {{skillname=@{sskill_name}}}" ></button>								
+						<button type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=@{sskill_total}}} {{fumble=[[95+ceil(((@{sskill_total}+?{mods|0})/20))]]}} {{crit=[[round((@{sskill_total}+?{mods|0})/20)+1]]}} {{special=[[round(((@{sskill_total}+?{mods|0}))/5)+1]]}}         {{success=[[@{sskill_total}+?{mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{sskill_name}}}"  ></button>
 						<input type="text"  class="sheet-skill_values" value="0" name="attr_sskill_value" />
 						<input type="text"  class="sheet-skill_values" disabled name="attr_sskill_total" value="@{sskill_value}+@{manipulation_mod}+@{fatigue_mod}" />
 						
@@ -683,7 +691,7 @@
    <div style="background-color:white;padding-bottom:13px;border-radius:6px">
 	<label>Melee Weapons</label>				   
 		<div class="sheet-melee_wpns_labels">
-		   <label style="margin-left:18px;width:95px">Weapon</label>
+		   <label style="margin-left:35px;width:95px">Weapon</label>
 		   <label style="width:122px">STR/DEX</label>   
 		   <label style="width:42px">WSR</label>
 		   <label style="width:30px">SR</label>
@@ -691,7 +699,7 @@
 		   <label style="width:11px"></label>
 		   <label style="width:0px"></label>   
 		   <label style="width:66px">Damage</label>		
-		   <label style="width:132px">Parry Skill</label>		
+		   <label style="width:105px">Parry Skill</label>		
 		   <label style="width:0px"></label>
 		   <label style="width:0px"></label>   
 		   <label style="width:2.0em" >AP</label>		
@@ -700,6 +708,7 @@
 		   <div class="sheet-melee_wpns">
 
 			  <input type="checkbox" name="attr_skillcheck" />	
+			  <input type="checkbox" name="attr_parrycheck" />	
 			  <input type="text" name="attr_weapon_type" style="width:100px" />
 			  <input type="number" value="9" name="attr_wpnstr" />
 			  <input type="number" value="9" name="attr_wpndex" />
@@ -709,30 +718,14 @@
 			  <input type="number" name="attr_wpn_attk_value" />
 			  <input type="number" disabled name="attr_wpn_attk_total" value="@{wpn_attk_value}+@{manipulation_mod}+@{fatigue_mod}+@{minmod}+@{gen_mod}" />
 			  
-							<button style="font-family:dicefontd20;margin:0px;" type="roll" value="@{melee_value}" >t</button>
-							<textarea name="attr_melee_value" style="display:none">&{template:melee-roll} {{name=@{character_name}}} {{tot=[[@{wpn_damage}+@{damagebonus}]]}}{{skillvalue=@{wpn_attk_total}}} {{fumble=[[95+ceil((@{wpn_attk_total}/20))]]}} {{crit=[[round(@{wpn_attk_total}/20)+1]]}} {{special=[[round((@{wpn_attk_total})/5)+1]]}}         {{success=[[@{wpn_attk_total}]]}} {{roll=[[1d100]]}} {{skillname=@{weapon_type} attack}} 
+							<button  type="roll" style="margin-right:0px;margin-left:0px;" value="@{melee_value}" ></button><textarea name="attr_melee_value" style="display:none">&{template:melee-roll} {{name=@{character_name}}} {{tot=[[@{wpn_damage}+@{damagebonus}]]}}{{skillvalue=@{wpn_attk_total}}} {{fumble=[[95+ceil((@{wpn_attk_total}/20))]]}} {{crit=[[round(@{wpn_attk_total}/20)+1]]}} {{special=[[round((@{wpn_attk_total})/5)+1]]}}         {{success=[[@{wpn_attk_total}]]}} {{roll=[[1d100]]}} {{skillname=@{weapon_type} attack}} 
 
-							&{template:@{creature_hit_location}Melee}} {{roll=[[@{selected_die_roll}]]}}</textarea>
-							
-							<button type="roll" value="@{meleemod_value}"  ><div class="sheet-skill_mod_button">-?</div></button>
-
-							<textarea name="attr_meleemod_value" style="display:none">&{template:melee-roll} {{name=@{character_name}}} {{tot=[[@{wpn_damage}+@{damagebonus}]]}}{{skillvalue=@{wpn_attk_total}}} {{fumble=[[95+ceil(((@{wpn_attk_total}+?{mods|0})/20))]]}} {{crit=[[round((@{wpn_attk_total}+?{mods|0})/20)+1]]}} {{special=[[round(((@{wpn_attk_total}+?{mods|0}))/5)+1]]}}         {{success=[[@{wpn_attk_total}+?{mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{weapon_type} attack}} 
+							&{template:@{creature_hit_location}Melee}} {{roll=[[@{selected_die_roll}]]}}</textarea><button class="sheet-new_roll" style="margin-right:0px;margin-left:0px;" type="roll" value="@{meleemod_value}"  ></button><textarea name="attr_meleemod_value" style="display:none">&{template:melee-roll} {{name=@{character_name}}} {{tot=[[@{wpn_damage}+@{damagebonus}]]}}{{skillvalue=@{wpn_attk_total}}} {{fumble=[[95+ceil(((@{wpn_attk_total}+?{mods|0})/20))]]}} {{crit=[[round((@{wpn_attk_total}+?{mods|0})/20)+1]]}} {{special=[[round(((@{wpn_attk_total}+?{mods|0}))/5)+1]]}}         {{success=[[@{wpn_attk_total}+?{mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{weapon_type} attack}} 
 							
 							&{template:@{creature_hit_location}Melee}} {{roll=[[@{selected_die_roll}]]}}</textarea>							
-
-
-
-							
 			  <input type="text" style="width:79px" name="attr_wpn_damage" />    
 			  <input type="number" name="attr_wpn_parry_value" />
-			  <input type="number" disabled name="attr_parry_total" value="@{wpn_parry_value}+@{agility_mod}+@{fatigue_mod}" />
-			<button style="font-family:dicefontd20;margin:0px;" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{tot=[[@{wpn_damage}+@{damagebonus}]]}}{{skillvalue=@{parry_total}}} {{fumble=[[95+ceil((@{parry_total}/20))]]}} {{crit=[[round(@{parry_total}/20)+1]]}} {{special=[[round((@{parry_total})/5)+1]]}}         {{success=[[@{parry_total}]]}} {{roll=[[1d100]]}} {{skillname=@{weapon_type} parry}}" >t</button>	
-		
-			<button type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=@{parry_total}}} {{fumble=[[95+ceil(((@{parry_total}+?{mods|0})/20))]]}} {{crit=[[round((@{parry_total}+?{mods|0})/20)+1]]}} {{special=[[round(((@{parry_total}+?{mods|0}))/5)+1]]}}         {{success=[[@{parry_total}+?{mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{weapon_type} parry}} "  ><div class="sheet-skill_mod_button">-?</div></button>
-			  <!--<input type="number" name="attr_wpn_ap_max" />/-->
-			  <input type="number" name="attr_wpn_ap" />
-
-			  
+			  <input type="number" disabled name="attr_parry_total" value="@{wpn_parry_value}+@{agility_mod}+@{fatigue_mod}" /><button  type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{tot=[[@{wpn_damage}+@{damagebonus}]]}}{{skillvalue=@{parry_total}}} {{fumble=[[95+ceil((@{parry_total}/20))]]}} {{crit=[[round(@{parry_total}/20)+1]]}} {{special=[[round((@{parry_total})/5)+1]]}}         {{success=[[@{parry_total}]]}} {{roll=[[1d100]]}} {{skillname=@{weapon_type} parry}}" ></button><button class="sheet-new_roll" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=@{parry_total}}} {{fumble=[[95+ceil(((@{parry_total}+?{mods|0})/20))]]}} {{crit=[[round((@{parry_total}+?{mods|0})/20)+1]]}} {{special=[[round(((@{parry_total}+?{mods|0}))/5)+1]]}}         {{success=[[@{parry_total}+?{mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{weapon_type} parry}} "  ></button><input type="number" name="attr_wpn_ap" />
 		   </div>
 		</fieldset>
 </div>
@@ -761,12 +754,12 @@
       <input type="number" disabled name="attr_total_wpn_sr" value="[@{dex_srm}]" />
       <input type="number" value="0" name="attr_wpn_attk_value" />
       <input type="number" disabled name="attr_wpn_attk_total" value="[@{wpn_attk_value}+@{manipulation_mod}+@{fatigue_mod}+@{minmod}+@{gen_mod}}]" />
-					<button style="font-family:dicefontd20;margin:0px;" type="roll" value="@{missle_value}" >t</button>	
+					<button  type="roll" value="@{missle_value}" ></button>	
 					<textarea name="attr_missle_value" style="display:none">&{template:melee-roll} {{name=@{character_name}}} {{tot=[[@{wpn_damage}+@{wpnmdb}]]}}{{skillvalue=@{wpn_attk_total}}} {{fumble=[[95+ceil((@{wpn_attk_total}/20))]]}} {{crit=[[round(@{wpn_attk_total}/20)+1]]}} {{special=[[round((@{wpn_attk_total})/5)+1]]}}         {{success=[[@{wpn_attk_total}]]}} {{roll=[[1d100]]}} {{skillname=@{weapon_type}}}
 					
 					&{template:@{creature_hit_location}Missle}} {{roll=[[@{selected_die_roll}]]}}</textarea>
 					
-					<button type="roll" value="@{misslemod_value}"  ><div class="sheet-skill_mod_button">-?</div></button>		      <input type="text" style="width:69px" name="attr_wpn_damage" />
+					<button class="sheet-new_roll" type="roll" value="@{misslemod_value}"  ></button>		      <input type="text" style="width:69px" name="attr_wpn_damage" />
 					<textarea name="attr_misslemod_value" style="display:none">&{template:melee-roll} {{name=@{character_name}}} {{tot=[[@{wpn_damage}+@{wpnmdb}]]}}{{skillvalue=@{wpn_attk_total}}} {{fumble=[[95+ceil(((@{wpn_attk_total}+?{mods|0})/20))]]}} {{crit=[[round((@{wpn_attk_total}+?{mods|0})/20)+1]]}} {{special=[[round(((@{wpn_attk_total}+?{mods|0}))/5)+1]]}}         {{success=[[@{wpn_attk_total}+?{mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{weapon_type}}}
 					
 					&{template:@{creature_hit_location}Missle}} {{roll=[[@{selected_die_roll}]]}}</textarea>					
@@ -954,9 +947,9 @@
       <div style="margin-left: 5px ; display: inline">
          Dodge
          <input style="width:47px" class="sheet-section-header" disabled="true" value="@{dodge_total}" type="number" name="attr_Dodge_display" />
-         <button style="font-family:dicefontd20;margin:0px;" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{dodge_total}]}} {{fumble=[[ceil(96+([@{dodge_total}])/20))]]}} {{crit=[[ceil(([@{dodge_total}])/20)+1]]}} {{special=[[ceil(([@{dodge_total}])/5)+1]]}}         {{success=[[[@{dodge_total}]]]}} {{roll=[[1d100]]}} {{skillname=Dodge}}" >t</button>								
-         <button type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{dodge_total}]}} {{fumble=[[ceil(96+([@{dodge_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{dodge_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{dodge_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{dodge_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Dodge}}"   >
-            <div class="sheet-skill_mod_button">-?</div>
+         <button  type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{dodge_total}]}} {{fumble=[[ceil(96+([@{dodge_total}])/20))]]}} {{crit=[[ceil(([@{dodge_total}])/20)+1]]}} {{special=[[ceil(([@{dodge_total}])/5)+1]]}}         {{success=[[[@{dodge_total}]]]}} {{roll=[[1d100]]}} {{skillname=Dodge}}" ></button>								
+         <button  class="sheet-new_roll" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{dodge_total}]}} {{fumble=[[ceil(96+([@{dodge_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{dodge_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{dodge_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{dodge_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Dodge}}"   >
+            
          </button>
       </div>
       <div style="display: inline">
@@ -967,12 +960,13 @@
             <option value="2">Missle Attack</option>
             <option value="3">Natural Weapon</option>
          </select>
-         <button style="font-family:dicefontd20;margin:0px;" type="roll" value="&{template:Melee-Attack-Fumble} {{table=[[@{selected_fumble_table}]]}} {{roll=[[1d100]]}}">t</button>
+         <button  type="roll" value="&{template:Melee-Attack-Fumble} {{table=[[@{selected_fumble_table}]]}} {{roll=[[1d100]]}}"></button>
          <div style="display:inline">
             Roll
             <select name="attr_creature_hit_location" style="margin-top: 7px; height: 24px ; width: 106px">
                <option value="HL-">Human</option>
                <option value="FLL-">Four-Legged</option>
+			   <option value="NewtL-">Newtling</option>			   
 			   <option value="WalkL-">Walktapus</option>			   
             </select>
             <select name="attr_selected_wpn_type" style="margin-top: 7px; height: 24px ; width: 106px">
@@ -987,7 +981,7 @@
                <option value="1d10">1d10</option>
                <option value="1d8">1d8</option>			   			   
             </select>
-			<button type="roll" value="&{template:@{creature_hit_location}@{selected_wpn_type}} {{roll=[[@{selected_die_roll}]]}}" ><div style="font-family:dicefontd20;margin:0px;">t</div></button>
+			<button type="roll" value="&{template:@{creature_hit_location}@{selected_wpn_type}} {{roll=[[@{selected_die_roll}]]}}" ></button>
 			<!--	
             Hit Location
             <button style="background-color: white;font-size:0;height:32px" name="roll_melee-location"  type="roll" value="&{template:HL-Melee} {{roll=[[@{selected_die_roll}]]}}"   class="btn ui-draggable">						  
@@ -1116,8 +1110,7 @@
 								<input   class="sheet-value_display" type="number" name="attr_wpn_sr" value="0" />
 								<input  class="sheet-value_display" type="number" name="attr_wpn_attk" value="0" />
 								<input  class="sheet-value_display"  type="text" style="width:80px" name="attr_wpn_damage" value="0" />
-								<button type="roll" style="font-family:dicefontd20;margin:0px;" value="&{template:melee-roll} {{name=@{animal1_name}}} {{tot=[[@{wpn_damage}]]}}  {{skillvalue=[[@{wpn_attk}]]}} {{fumble=[[ceil(95+([[@{wpn_attk}]])/20))]]}} {{crit=[[ceil(([[@{wpn_attk}]])/20)+1]]}} {{special=[[ceil(([[@{wpn_attk}]])/5)+1]]}}         {{success=[[@{wpn_attk}]]}} {{roll=[[1d100]]}} {{skillname=@{wpn_name}}}" >t</button>
-								<button type="roll" style="margin:0px;" value="&{template:melee-roll} {{name=@{animal1_name}}} {{tot=[[@{wpn_damage}]]}}  {{skillvalue=[[@{wpn_attk}+?{mods|0}]]}} {{fumble=[[ceil(95+([[@{wpn_attk}+?{mods|0}]])/20))]]}} {{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>								
+								<button type="roll"  value="&{template:melee-roll} {{name=@{animal1_name}}} {{tot=[[@{wpn_damage}]]}}  {{skillvalue=[[@{wpn_attk}]]}} {{fumble=[[ceil(95+([[@{wpn_attk}]])/20))]]}} {{crit=[[ceil(([[@{wpn_attk}]])/20)+1]]}} {{special=[[ceil(([[@{wpn_attk}]])/5)+1]]}}         {{success=[[@{wpn_attk}]]}} {{roll=[[1d100]]}} {{skillname=@{wpn_name}}}" ></button>							<button class="sheet-new_roll" type="roll" style="margin:0px;" value="&{template:melee-roll} {{name=@{animal1_name}}} {{tot=[[@{wpn_damage}]]}}  {{skillvalue=[[@{wpn_attk}+?{mods|0}]]}} {{fumble=[[ceil(95+([[@{wpn_attk}+?{mods|0}]])/20))]]}} {{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 />
@@ -1131,8 +1124,8 @@
 							<fieldset class="repeating_animal1skills" >
 								<input   class="sheet-value_display"  type="text" name="attr_skill_name" style="text-align:left;width:232px;" value="skill" />
 								<input  class="sheet-value_display" type="number" name="attr_skill_value" value="0" />
-								<button type="roll" style="font-family:dicefontd20;margin:0px;" value="&{template:skillRoll} {{name=@{animal1_name}}}  {{skillvalue=[[@{skill_value}]]}} {{fumble=[[ceil(95+([[@{skill_value}]])/20))]]}} {{crit=[[ceil(([[@{skill_value}]])/20)+1]]}} {{special=[[ceil(([[@{skill_value}]])/5)+1]]}}         {{success=[[@{skill_value}]]}} {{roll=[[1d100]]}} {{skillname=@{skill_name}}}" >t</button>									
-								<button type="roll" style="margin:0px;" value="&{template:skillRoll} {{name=@{animal1_name}}}  {{skillvalue=[[@{skill_value}]]}} {{success=[[@{skill_value}+?{mods|0}]]}}  {{fumble=[[ceil(95+([[@{skill_value}+?{mods|0}]])/20))]]}} {{crit=[[ceil(([[@{skill_value}+?{mods|0}]])/20)+1]]}} {{special=[[ceil(([[@{skill_value}+?{mods|0}]])/5)+1]]}}         {{roll=[[1d100]]}} {{skillname=@{skill_name}}}" >-?</button>									
+								<button type="roll"  value="&{template:skillRoll} {{name=@{animal1_name}}}  {{skillvalue=[[@{skill_value}]]}} {{fumble=[[ceil(95+([[@{skill_value}]])/20))]]}} {{crit=[[ceil(([[@{skill_value}]])/20)+1]]}} {{special=[[ceil(([[@{skill_value}]])/5)+1]]}}         {{success=[[@{skill_value}]]}} {{roll=[[1d100]]}} {{skillname=@{skill_name}}}" ></button>									
+								<button  class="sheet-new_roll"  type="roll" style="margin:0px;" value="&{template:skillRoll} {{name=@{animal1_name}}}  {{skillvalue=[[@{skill_value}]]}} {{success=[[@{skill_value}+?{mods|0}]]}}  {{fumble=[[ceil(95+([[@{skill_value}+?{mods|0}]])/20))]]}} {{crit=[[ceil(([[@{skill_value}+?{mods|0}]])/20)+1]]}} {{special=[[ceil(([[@{skill_value}+?{mods|0}]])/5)+1]]}}         {{roll=[[1d100]]}} {{skillname=@{skill_name}}}" ></button>									
 
 
 								
@@ -1229,8 +1222,8 @@ D20	    Result	       AP/HP
 								<input   class="sheet-value_display" type="number" name="attr_wpn_sr" value="0" />
 								<input  class="sheet-value_display" type="number" name="attr_wpn_attk" value="0" />
 								<input  class="sheet-value_display"  type="text" style="width:80px" name="attr_wpn_damage" value="0" />
-								<button type="roll" style="font-family:dicefontd20;margin:0px;" value="&{template:melee-roll} {{name=@{animal1_name}}} {{tot=[[@{wpn_damage}]]}}  {{skillvalue=[[@{wpn_attk}]]}} {{fumble=[[ceil(95+([[@{wpn_attk}]])/20))]]}} {{crit=[[ceil(([[@{wpn_attk}]])/20)+1]]}} {{special=[[ceil(([[@{wpn_attk}]])/5)+1]]}}         {{success=[[@{wpn_attk}]]}} {{roll=[[1d100]]}} {{skillname=@{wpn_name}}}" >t</button>
-								<button type="roll" style="margin:0px;" value="&{template:melee-roll} {{name=@{animal1_name}}} {{tot=[[@{wpn_damage}]]}}  {{skillvalue=[[@{wpn_attk}]]}} {{success=[[@{wpn_attk}+?{mods|0}]]}} {{fumble=[[ceil(95+([[@{wpn_attk}+?{mods|0}]])/20))]]}} {{crit=[[ceil(([[@{wpn_attk}+?{mods|0}]])/20)+1]]}} {{special=[[ceil(([[@{wpn_attk}+?{mods|0}]])/5)+1]]}}          {{roll=[[1d100]]}} {{skillname=@{wpn_name}}}" >-?</button>									
+								<button type="roll"  value="&{template:melee-roll} {{name=@{animal1_name}}} {{tot=[[@{wpn_damage}]]}}  {{skillvalue=[[@{wpn_attk}]]}} {{fumble=[[ceil(95+([[@{wpn_attk}]])/20))]]}} {{crit=[[ceil(([[@{wpn_attk}]])/20)+1]]}} {{special=[[ceil(([[@{wpn_attk}]])/5)+1]]}}         {{success=[[@{wpn_attk}]]}} {{roll=[[1d100]]}} {{skillname=@{wpn_name}}}" ></button>
+								<button  class="sheet-new_roll" type="roll" style="margin:0px;" value="&{template:melee-roll} {{name=@{animal1_name}}} {{tot=[[@{wpn_damage}]]}}  {{skillvalue=[[@{wpn_attk}]]}} {{success=[[@{wpn_attk}+?{mods|0}]]}} {{fumble=[[ceil(95+([[@{wpn_attk}+?{mods|0}]])/20))]]}} {{crit=[[ceil(([[@{wpn_attk}+?{mods|0}]])/20)+1]]}} {{special=[[ceil(([[@{wpn_attk}+?{mods|0}]])/5)+1]]}}          {{roll=[[1d100]]}} {{skillname=@{wpn_name}}}" ></button>									
 								
 								
 							</fieldset>
@@ -1245,8 +1238,8 @@ D20	    Result	       AP/HP
 							<fieldset class="repeating_animal2skills" >
 								<input   class="sheet-value_display"  type="text" name="attr_skill_name" style="text-align:left;width:232px;" value="skill" />
 								<input  class="sheet-value_display" type="number" name="attr_skill_value" value="0" />
-								<button type="roll" style="font-family:dicefontd20;margin:0px;" value="&{template:skillRoll} {{name=@{animal2_name}}} {{skillvalue=[[@{skill_value}]]}} {{fumble=[[ceil(95+([[@{skill_value}]])/20))]]}} {{crit=[[ceil(([[@{skill_value}]])/20)+1]]}} {{special=[[ceil(([[@{skill_value}]])/5)+1]]}}         {{success=[[@{skill_value}]]}} {{roll=[[1d100]]}} {{skillname=@{skill_name}}}" >t</button>									
-							<button type="roll" style="margin:0px;" value="&{template:skillRoll} {{name=@{animal2_name}}} {{success=[[@{skill_value}+?{mods|0}]]}} {{skillvalue=[[@{skill_value}]]}} {{fumble=[[ceil(95+([[@{skill_value}+?{mods|0}]])/20))]]}} {{crit=[[ceil(([[@{skill_value}+?{mods|0}]])/20)+1]]}} {{special=[[ceil(([[@{skill_value}+?{mods|0}]])/5)+1]]}} {{roll=[[1d100]]}} {{skillname=@{skill_name}}}" >-?</button>									
+								<button type="roll"  value="&{template:skillRoll} {{name=@{animal2_name}}} {{skillvalue=[[@{skill_value}]]}} {{fumble=[[ceil(95+([[@{skill_value}]])/20))]]}} {{crit=[[ceil(([[@{skill_value}]])/20)+1]]}} {{special=[[ceil(([[@{skill_value}]])/5)+1]]}}         {{success=[[@{skill_value}]]}} {{roll=[[1d100]]}} {{skillname=@{skill_name}}}" ></button>									
+							<button  class="sheet-new_roll" type="roll" style="margin:0px;" value="&{template:skillRoll} {{name=@{animal2_name}}} {{success=[[@{skill_value}+?{mods|0}]]}} {{skillvalue=[[@{skill_value}]]}} {{fumble=[[ceil(95+([[@{skill_value}+?{mods|0}]])/20))]]}} {{crit=[[ceil(([[@{skill_value}+?{mods|0}]])/20)+1]]}} {{special=[[ceil(([[@{skill_value}+?{mods|0}]])/5)+1]]}} {{roll=[[1d100]]}} {{skillname=@{skill_name}}}" ></button>									
 								
 							</fieldset>
 							
@@ -1297,10 +1290,7 @@ D20	    Result	       AP/HP
 					<input class="sheet-skill_values" type="text" value="5" name="attr_ceremony_value" />
 					<input class="sheet-skill_values" type="text" disabled value="[@{magic_mod}+@{ceremony_value}+@{fatigue_mod}]" name="attr_ceremony_total" />
 
-					<button style="font-family:dicefontd20;margin:0px;" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{ceremony_total}]}} {{fumble=[[ceil(95+([@{ceremony_total}])/20))]]}} {{crit=[[ceil(([@{ceremony_total}])/20)+1]]}} {{special=[[ceil(([@{ceremony_total}])/5)+1]]}}         {{success=[[[@{ceremony_total}]]]}} {{roll=[[1d100]]}} {{skillname=Ceremony}}" >t</button>
-
-					
-					<button type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{ceremony_total}]}} {{fumble=[[ceil(95+([@{ceremony_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{ceremony_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{ceremony_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{ceremony_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Ceremony}}"   ><div class="sheet-skill_mod_button">-?</div></button>	
+					<button  type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{ceremony_total}]}} {{fumble=[[ceil(95+([@{ceremony_total}])/20))]]}} {{crit=[[ceil(([@{ceremony_total}])/20)+1]]}} {{special=[[ceil(([@{ceremony_total}])/5)+1]]}}         {{success=[[[@{ceremony_total}]]]}} {{roll=[[1d100]]}} {{skillname=Ceremony}}" ></button><button class="sheet-new_roll" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{ceremony_total}]}} {{fumble=[[ceil(95+([@{ceremony_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{ceremony_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{ceremony_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{ceremony_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Ceremony}}"   ></button>	
 					
 					
 				</div>	
@@ -1310,10 +1300,7 @@ D20	    Result	       AP/HP
 					
 					<input class="sheet-skill_values" type="text" value="0" name="attr_summon_value" />
 					<input class="sheet-skill_values" type="text" disabled value="[@{magic_mod}+@{summon_value}+@{fatigue_mod}]" name="attr_summon_total" />
-					<button style="font-family:dicefontd20;margin:0px;" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{summon_total}]}} {{fumble=[[ceil(95+([@{summon_total}])/20))]]}} {{crit=[[ceil(([@{summon_total}])/20)+1]]}} {{special=[[ceil(([@{summon_total}])/5)+1]]}}         {{success=[[[@{summon_total}]]]}} {{roll=[[1d100]]}} {{skillname=Summon}}" >t</button>
-
-					
-					<button type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{summon_total}]}} {{fumble=[[ceil(95+([@{summon_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{summon_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{summon_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{summon_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Summon}}"   ><div class="sheet-skill_mod_button">-?</div></button>	
+					<button   type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{summon_total}]}} {{fumble=[[ceil(95+([@{summon_total}])/20))]]}} {{crit=[[ceil(([@{summon_total}])/20)+1]]}} {{special=[[ceil(([@{summon_total}])/5)+1]]}}         {{success=[[[@{summon_total}]]]}} {{roll=[[1d100]]}} {{skillname=Summon}}" ></button><button  class="sheet-new_roll" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{summon_total}]}} {{fumble=[[ceil(95+([@{summon_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{summon_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{summon_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{summon_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Summon}}"   ></button>	
 					
 					
 				</div>
@@ -1322,12 +1309,7 @@ D20	    Result	       AP/HP
 					<div class="sheet-skill_button" style="display:inline;">Enchant</div>
 					
 					<input class="sheet-skill_values" type="text" value="0" name="attr_enchant_value" />
-					<input class="sheet-skill_values" type="text" disabled value="[@{magic_mod}+@{enchant_value}+@{fatigue_mod}]" name="attr_enchant_total" />
-					
-					<button style="font-family:dicefontd20;margin:0px;" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{enchant_total}]}} {{fumble=[[ceil(95+([@{enchant_total}])/20))]]}} {{crit=[[ceil(([@{enchant_total}])/20)+1]]}} {{special=[[ceil(([@{enchant_total}])/5)+1]]}}         {{success=[[[@{enchant_total}]]]}} {{roll=[[1d100]]}} {{skillname=Enchant}}" >t</button>
-
-					
-					<button type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{enchant_total}]}} {{fumble=[[ceil(95+([@{enchant_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{enchant_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{enchant_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{enchant_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Enchant}}"   ><div class="sheet-skill_mod_button">-?</div></button>	
+					<input class="sheet-skill_values" type="text" disabled value="[@{magic_mod}+@{enchant_value}+@{fatigue_mod}]" name="attr_enchant_total" /><button    type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{enchant_total}]}} {{fumble=[[ceil(95+([@{enchant_total}])/20))]]}} {{crit=[[ceil(([@{enchant_total}])/20)+1]]}} {{special=[[ceil(([@{enchant_total}])/5)+1]]}}         {{success=[[[@{enchant_total}]]]}} {{roll=[[1d100]]}} {{skillname=Enchant}}" ></button><button  class="sheet-new_roll" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{enchant_total}]}} {{fumble=[[ceil(95+([@{enchant_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{enchant_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{enchant_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{enchant_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Enchant}}"   ></button>	
 					
 					
 				</div>
@@ -1376,8 +1358,7 @@ D20	    Result	       AP/HP
 
 					
 					<input  class="sheet-value_display"  type="text" style="text-align:left;width:220px;display:inline-block;" name="attr_spellnotes" />
-						<button type="roll" style="font-family:dicefontd20;margin:0px;" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{curpow}*5)+@{fatigue_mod}+@{magic_mod}-@{enc_total}]]}} {{fumble=[[ceil(95+([[(@{curpow}*5)+@{fatigue_mod}+@{magic_mod}-@{enc_total}}]])/20))]]}} {{crit=[[ceil(([[(@{curpow}*5)+@{fatigue_mod}+@{magic_mod}-@{enc_total}]])/20)+1]]}} {{special=[[ceil(([[(@{curpow}*5)+@{fatigue_mod}+@{magic_mod}-@{enc_total}]])/5)+1]]}}         {{success=[[(@{curpow}*5)+@{fatigue_mod}+@{magic_mod}-@{enc_total}]]}} {{roll=[[1d100]]}} {{skillname=@{spellname}}}" >t</button>
-						<button type="roll" style="font-family:dicefontd20;margin:0px;" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{curpow}*5)+@{fatigue_mod}+@{magic_mod}-@{enc_total}+?{mods|0}]]}} {{fumble=[[ceil(95+([[(@{curpow}*5)+@{fatigue_mod}+@{magic_mod}-@{enc_total}+?{mods|0}}]])/20))]]}} {{crit=[[ceil(([[(@{curpow}*5)+@{fatigue_mod}+@{magic_mod}-@{enc_total}+?{mods|0}]])/20)+1]]}} {{special=[[ceil(([[(@{curpow}*5)+@{fatigue_mod}+@{magic_mod}-@{enc_total}+?{mods|0}]])/5)+1]]}}         {{success=[[(@{curpow}*5)+@{fatigue_mod}+@{magic_mod}-@{enc_total}+?{mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{spellname}}}" >-?</button>
+						<button type="roll"  value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{curpow}*5)+@{fatigue_mod}+@{magic_mod}-@{enc_total}]]}} {{fumble=[[ceil(95+([[(@{curpow}*5)+@{fatigue_mod}+@{magic_mod}-@{enc_total}}]])/20))]]}} {{crit=[[ceil(([[(@{curpow}*5)+@{fatigue_mod}+@{magic_mod}-@{enc_total}]])/20)+1]]}} {{special=[[ceil(([[(@{curpow}*5)+@{fatigue_mod}+@{magic_mod}-@{enc_total}]])/5)+1]]}}         {{success=[[(@{curpow}*5)+@{fatigue_mod}+@{magic_mod}-@{enc_total}]]}} {{roll=[[1d100]]}} {{skillname=@{spellname}}}" ></button><button  class="sheet-new_roll" type="roll"  value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{curpow}*5)+@{fatigue_mod}+@{magic_mod}-@{enc_total}+?{mods|0}]]}} {{fumble=[[ceil(95+([[(@{curpow}*5)+@{fatigue_mod}+@{magic_mod}-@{enc_total}+?{mods|0}}]])/20))]]}} {{crit=[[ceil(([[(@{curpow}*5)+@{fatigue_mod}+@{magic_mod}-@{enc_total}+?{mods|0}]])/20)+1]]}} {{special=[[ceil(([[(@{curpow}*5)+@{fatigue_mod}+@{magic_mod}-@{enc_total}+?{mods|0}]])/5)+1]]}}         {{success=[[(@{curpow}*5)+@{fatigue_mod}+@{magic_mod}-@{enc_total}+?{mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{spellname}}}" ></button>
 				</fieldset>
 				
 				<br />
@@ -1415,8 +1396,7 @@ D20	    Result	       AP/HP
 
 					
 					<input  class="sheet-value_display"  type="text" style="text-align:left;width:220px;display:inline-block;" name="attr_spellnotes" />
-						<button type="roll" style="font-family:dicefontd20;margin:0px;" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{curpow}*5)+@{fatigue_mod}+@{magic_mod}-@{enc_total}]]}} {{fumble=[[ceil(95+([[(@{curpow}*5)+@{fatigue_mod}+@{magic_mod}-@{enc_total}}]])/20))]]}} {{crit=[[ceil(([[(@{curpow}*5)+@{fatigue_mod}+@{magic_mod}-@{enc_total}]])/20)+1]]}} {{special=[[ceil(([[(@{curpow}*5)+@{fatigue_mod}+@{magic_mod}-@{enc_total}]])/5)+1]]}}         {{success=[[(@{curpow}*5)+@{fatigue_mod}+@{magic_mod}-@{enc_total}]]}} {{roll=[[1d100]]}} {{skillname=@{spellname}}}" >t</button>
-						<button type="roll" style="font-family:dicefontd20;margin:0px;" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{curpow}*5)+@{fatigue_mod}+@{magic_mod}-@{enc_total}+?{mods|0}]]}} {{fumble=[[ceil(95+([[(@{curpow}*5)+@{fatigue_mod}+@{magic_mod}-@{enc_total}+?{mods|0}}]])/20))]]}} {{crit=[[ceil(([[(@{curpow}*5)+@{fatigue_mod}+@{magic_mod}-@{enc_total}+?{mods|0}]])/20)+1]]}} {{special=[[ceil(([[(@{curpow}*5)+@{fatigue_mod}+@{magic_mod}-@{enc_total}+?{mods|0}]])/5)+1]]}}         {{success=[[(@{curpow}*5)+@{fatigue_mod}+@{magic_mod}-@{enc_total}+?{mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{spellname}}}" >-?</button>
+						<button type="roll"  value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{curpow}*5)+@{fatigue_mod}+@{magic_mod}-@{enc_total}]]}} {{fumble=[[ceil(95+([[(@{curpow}*5)+@{fatigue_mod}+@{magic_mod}-@{enc_total}}]])/20))]]}} {{crit=[[ceil(([[(@{curpow}*5)+@{fatigue_mod}+@{magic_mod}-@{enc_total}]])/20)+1]]}} {{special=[[ceil(([[(@{curpow}*5)+@{fatigue_mod}+@{magic_mod}-@{enc_total}]])/5)+1]]}}         {{success=[[(@{curpow}*5)+@{fatigue_mod}+@{magic_mod}-@{enc_total}]]}} {{roll=[[1d100]]}} {{skillname=@{spellname}}}" ></button><button  class="sheet-new_roll" type="roll"  value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[(@{curpow}*5)+@{fatigue_mod}+@{magic_mod}-@{enc_total}+?{mods|0}]]}} {{fumble=[[ceil(95+([[(@{curpow}*5)+@{fatigue_mod}+@{magic_mod}-@{enc_total}+?{mods|0}}]])/20))]]}} {{crit=[[ceil(([[(@{curpow}*5)+@{fatigue_mod}+@{magic_mod}-@{enc_total}+?{mods|0}]])/20)+1]]}} {{special=[[ceil(([[(@{curpow}*5)+@{fatigue_mod}+@{magic_mod}-@{enc_total}+?{mods|0}]])/5)+1]]}}         {{success=[[(@{curpow}*5)+@{fatigue_mod}+@{magic_mod}-@{enc_total}+?{mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{spellname}}}" ></button>
 				</fieldset>				
 				</div>
 				
@@ -1468,8 +1448,7 @@ D20	    Result	       AP/HP
 								
 								<!--<input type="number" style="display:inline-block;" name="attr_spellsr" />-->
 								<input  class="sheet-value_display"  type="text" style="text-align:left;width:220px;display:inline-block;" name="attr_spellnotes" />
-									<button type="roll" style="font-family:dicefontd20;margin:0px;" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[100+@{fatigue_mod}-@{enc_total}]]}} {{fumble=[[ceil(95+([[100+@{fatigue_mod}-@{enc_total}}]])/20))]]}} {{crit=[[ceil(([[100+@{fatigue_mod}-@{enc_total}]])/20)+1]]}} {{special=[[ceil(([[100+@{fatigue_mod}-@{enc_total}]])/5)+1]]}}         {{success=[[100+@{fatigue_mod}-@{enc_total}]]}} {{roll=[[1d100]]}} {{skillname=Casting @{spellname}}}" >t</button>
-									<button type="roll" style="font-family:dicefontd20;margin:0px;" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[100+@{fatigue_mod}-@{enc_total}+?{mods|0}]]}} {{fumble=[[ceil(95+([[100+@{fatigue_mod}-@{enc_total}+?{mods|0}}]])/20))]]}} {{crit=[[ceil(([[100+@{fatigue_mod}-@{enc_total}+?{mods|0}]])/20)+1]]}} {{special=[[ceil(([[100+@{fatigue_mod}-@{enc_total}+?{mods|0}]])/5)+1]]}}         {{success=[[100+@{fatigue_mod}-@{enc_total}+?{mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Casting @{spellname}}}" >-?</button>
+									<button type="roll"  value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[100+@{fatigue_mod}-@{enc_total}]]}} {{fumble=[[ceil(95+([[100+@{fatigue_mod}-@{enc_total}}]])/20))]]}} {{crit=[[ceil(([[100+@{fatigue_mod}-@{enc_total}]])/20)+1]]}} {{special=[[ceil(([[100+@{fatigue_mod}-@{enc_total}]])/5)+1]]}}         {{success=[[100+@{fatigue_mod}-@{enc_total}]]}} {{roll=[[1d100]]}} {{skillname=Casting @{spellname}}}" ></button><button  class="sheet-new_roll" type="roll"  value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[100+@{fatigue_mod}-@{enc_total}+?{mods|0}]]}} {{fumble=[[ceil(95+([[100+@{fatigue_mod}-@{enc_total}+?{mods|0}}]])/20))]]}} {{crit=[[ceil(([[100+@{fatigue_mod}-@{enc_total}+?{mods|0}]])/20)+1]]}} {{special=[[ceil(([[100+@{fatigue_mod}-@{enc_total}+?{mods|0}]])/5)+1]]}}         {{success=[[100+@{fatigue_mod}-@{enc_total}+?{mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Casting @{spellname}}}" ></button>
 						</fieldset>
 					</div>
 				</div>
@@ -1491,10 +1470,7 @@ D20	    Result	       AP/HP
 						<input class="sheet-skill_values" type="text" value="0" name="attr_intensity_value" />
 						<input class="sheet-skill_values" type="text" disabled value="[@{magic_mod}+@{intensity_value}+@{fatigue_mod}]" name="attr_intensity_total" />
 
-						<button style="font-family:dicefontd20;margin:0px;" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{intensity_total}]}} {{fumble=[[ceil(95+([@{intensity_total}])/20))]]}} {{crit=[[ceil(([@{intensity_total}])/20)+1]]}} {{special=[[ceil(([@{intensity_total}])/5)+1]]}}         {{success=[[[@{intensity_total}]]]}} {{roll=[[1d100]]}} {{skillname=Intensity}}" >t</button>
-
-						
-						<button type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{intensity_total}]}} {{fumble=[[ceil(95+([@{intensity_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{intensity_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{intensity_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{intensity_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Intensity}}"   ><div class="sheet-skill_mod_button">-?</div></button>	
+						<button  type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{intensity_total}]}} {{fumble=[[ceil(95+([@{intensity_total}])/20))]]}} {{crit=[[ceil(([@{intensity_total}])/20)+1]]}} {{special=[[ceil(([@{intensity_total}])/5)+1]]}}         {{success=[[[@{intensity_total}]]]}} {{roll=[[1d100]]}} {{skillname=Intensity}}" ></button><button  class="sheet-new_roll" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{intensity_total}]}} {{fumble=[[ceil(95+([@{intensity_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{intensity_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{intensity_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{intensity_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Intensity}}"   ></button>	
 						
 						
 					</div>	
@@ -1504,10 +1480,7 @@ D20	    Result	       AP/HP
 						
 						<input class="sheet-skill_values" type="text" value="0" name="attr_duration_value" />
 						<input class="sheet-skill_values" type="text" disabled value="[@{magic_mod}+@{duration_value}+@{fatigue_mod}]" name="attr_duration_total" />
-						<button style="font-family:dicefontd20;margin:0px;" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{duration_total}]}} {{fumble=[[ceil(95+([@{duration_total}])/20))]]}} {{crit=[[ceil(([@{duration_total}])/20)+1]]}} {{special=[[ceil(([@{duration_total}])/5)+1]]}}         {{success=[[[@{duration_total}]]]}} {{roll=[[1d100]]}} {{skillname=Duration}}" >t</button>
-
-						
-						<button type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{duration_total}]}} {{fumble=[[ceil(95+([@{intensity_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{duration_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{duration_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{duration_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Duration}}"   ><div class="sheet-skill_mod_button">-?</div></button>	
+						<button  type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{duration_total}]}} {{fumble=[[ceil(95+([@{duration_total}])/20))]]}} {{crit=[[ceil(([@{duration_total}])/20)+1]]}} {{special=[[ceil(([@{duration_total}])/5)+1]]}}         {{success=[[[@{duration_total}]]]}} {{roll=[[1d100]]}} {{skillname=Duration}}" ></button><button  class="sheet-new_roll" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{duration_total}]}} {{fumble=[[ceil(95+([@{intensity_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{duration_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{duration_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{duration_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Duration}}"   ></button>	
 						
 						
 					</div>
@@ -1521,10 +1494,7 @@ D20	    Result	       AP/HP
 						<input class="sheet-skill_values" type="text" value="0" name="attr_range_value" />
 						<input class="sheet-skill_values" type="text" disabled value="[@{magic_mod}+@{enchant_value}+@{fatigue_mod}]" name="attr_range_total" />
 						
-						<button style="font-family:dicefontd20;margin:0px;" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{range_total}]}} {{fumble=[[ceil(95+([@{range_total}])/20))]]}} {{crit=[[ceil(([@{range_total}])/20)+1]]}} {{special=[[ceil(([@{range_total}])/5)+1]]}}         {{success=[[[@{range_total}]]]}} {{roll=[[1d100]]}} {{skillname=Range}}" >t</button>
-
-						
-						<button type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{range_total}]}} {{fumble=[[ceil(95+([@{range_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{range_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{range_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{range_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Range}}"   ><div class="sheet-skill_mod_button">-?</div></button>	
+						<button  type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{range_total}]}} {{fumble=[[ceil(95+([@{range_total}])/20))]]}} {{crit=[[ceil(([@{range_total}])/20)+1]]}} {{special=[[ceil(([@{range_total}])/5)+1]]}}         {{success=[[[@{range_total}]]]}} {{roll=[[1d100]]}} {{skillname=Range}}" ></button><button  class="sheet-new_roll" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{range_total}]}} {{fumble=[[ceil(95+([@{range_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{range_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{range_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{range_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Range}}"   ></button>	
 						
 						
 					</div>
@@ -1535,10 +1505,7 @@ D20	    Result	       AP/HP
 						<input class="sheet-skill_values" type="text" value="0" name="attr_multispell_value" />
 						<input class="sheet-skill_values" type="text" disabled value="[@{magic_mod}+@{multispell_value}+@{fatigue_mod}]" name="attr_multispell_total" />
 						
-						<button style="font-family:dicefontd20;margin:0px;" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{multispell_total}]}} {{fumble=[[ceil(95+([@{multispell_total}])/20))]]}} {{crit=[[ceil(([@{multispell_total}])/20)+1]]}} {{special=[[ceil(([@{multispell_total}])/5)+1]]}}         {{success=[[[@{multispell_total}]]]}} {{roll=[[1d100]]}} {{skillname=Multispell}}" >t</button>
-
-						
-						<button type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{multispell_total}]}} {{fumble=[[ceil(95+([@{multispell_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{multispell_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{multispell_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{multispell_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Multispell}}"   ><div class="sheet-skill_mod_button">-?</div></button>	
+						<button  type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{multispell_total}]}} {{fumble=[[ceil(95+([@{multispell_total}])/20))]]}} {{crit=[[ceil(([@{multispell_total}])/20)+1]]}} {{special=[[ceil(([@{multispell_total}])/5)+1]]}}         {{success=[[[@{multispell_total}]]]}} {{roll=[[1d100]]}} {{skillname=Multispell}}" ></button><button  class="sheet-new_roll" type="roll" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[@{multispell_total}]}} {{fumble=[[ceil(95+([@{multispell_total}]+?{Mods|0})/20))]]}} {{crit=[[ceil(([@{multispell_total}]+?{Mods|0})/20)+1]]}} {{special=[[ceil(([@{multispell_total}]+?{Mods|0})/5)+1]]}}         {{success=[[[@{multispell_total}]+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Multispell}}"   ></button>	
 						
 						
 					</div>				
@@ -1583,8 +1550,7 @@ D20	    Result	       AP/HP
 					<input class="sheet-skill_values" type="number" disabled="true" value="[@{magic_mod}+@{spell_value}-@{enc_total}+@{fatigue_mod}]" name="attr_spell_total" />
 					<input name="attr_spell_modtotal" style="display:none" disabled value="@{spell_total}" type="number"  />
 					<input  class="sheet-value_display"  type="text" style="text-align:left;width:157px;display:inline-block;" name="attr_spellnotes" />
-						<button type="roll" style="font-family:dicefontd20;margin:0px;" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[@{spell_modtotal}]]}} {{fumble=[[ceil(95+([[@{spell_modtotal}]])/20))]]}} {{crit=[[ceil(([[@{spell_modtotal}]])/20)+1]]}} {{special=[[ceil(([[@{spell_modtotal}]])/5)+1]]}}         {{success=[[@{spell_modtotal}]]}} {{roll=[[1d100]]}} {{skillname=@{spellname}}}" >t</button>
-						<button type="roll" style="font-family:dicefontd20;margin:0px;" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[@{spell_modtotal}+?{mods|0}]]}} {{fumble=[[ceil(95+([[@{spell_modtotal}+?{mods|0}}]])/20))]]}} {{crit=[[ceil(([[@{spell_modtotal}+?{mods|0}]])/20)+1]]}} {{special=[[ceil(([[@{spell_modtotal}+?{mods|0}]])/5)+1]]}}         {{success=[[@{spell_modtotal}+?{mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{spellname}}}" >-?</button>
+						<button type="roll"  value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[@{spell_modtotal}]]}} {{fumble=[[ceil(95+([[@{spell_modtotal}]])/20))]]}} {{crit=[[ceil(([[@{spell_modtotal}]])/20)+1]]}} {{special=[[ceil(([[@{spell_modtotal}]])/5)+1]]}}         {{success=[[@{spell_modtotal}]]}} {{roll=[[1d100]]}} {{skillname=@{spellname}}}" ></button><button  class="sheet-new_roll" type="roll"  value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[@{spell_modtotal}+?{mods|0}]]}} {{fumble=[[ceil(95+([[@{spell_modtotal}+?{mods|0}}]])/20))]]}} {{crit=[[ceil(([[@{spell_modtotal}+?{mods|0}]])/20)+1]]}} {{special=[[ceil(([[@{spell_modtotal}+?{mods|0}]])/5)+1]]}}         {{success=[[@{spell_modtotal}+?{mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{spellname}}}" ></button>
 				</fieldset>
 				
 				<br />
@@ -1624,8 +1590,7 @@ D20	    Result	       AP/HP
 					<input class="sheet-skill_values" type="number" disabled="true" value="[@{magic_mod}+@{spell_value}-@{enc_total}+@{fatigue_mod}]" name="attr_spell_total" />
 					<input name="attr_spell_modtotal" style="display:none" disabled value="@{spell_total}" type="number"  />
 					<input  class="sheet-value_display"  type="text" style="text-align:left;width:157px;display:inline-block;" name="attr_spellnotes" />
-						<button type="roll" style="font-family:dicefontd20;margin:0px;" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[@{spell_modtotal}]]}} {{fumble=[[ceil(95+([[@{spell_modtotal}]])/20))]]}} {{crit=[[ceil(([[@{spell_modtotal}]])/20)+1]]}} {{special=[[ceil(([[@{spell_modtotal}]])/5)+1]]}}         {{success=[[@{spell_modtotal}]]}} {{roll=[[1d100]]}} {{skillname=@{spellname}}}" >t</button>
-						<button type="roll" style="font-family:dicefontd20;margin:0px;" value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[@{spell_modtotal}+?{mods|0}]]}} {{fumble=[[ceil(95+([[@{spell_modtotal}+?{mods|0}}]])/20))]]}} {{crit=[[ceil(([[@{spell_modtotal}+?{mods|0}]])/20)+1]]}} {{special=[[ceil(([[@{spell_modtotal}+?{mods|0}]])/5)+1]]}}         {{success=[[@{spell_modtotal}+?{mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{spellname}}}" >-?</button>
+						<button type="roll"  value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[@{spell_modtotal}]]}} {{fumble=[[ceil(95+([[@{spell_modtotal}]])/20))]]}} {{crit=[[ceil(([[@{spell_modtotal}]])/20)+1]]}} {{special=[[ceil(([[@{spell_modtotal}]])/5)+1]]}}         {{success=[[@{spell_modtotal}]]}} {{roll=[[1d100]]}} {{skillname=@{spellname}}}" ></button><button  class="sheet-new_roll" type="roll"  value="&{template:skillRoll} {{name=@{character_name}}} {{skillvalue=[[@{spell_modtotal}+?{mods|0}]]}} {{fumble=[[ceil(95+([[@{spell_modtotal}+?{mods|0}}]])/20))]]}} {{crit=[[ceil(([[@{spell_modtotal}+?{mods|0}]])/20)+1]]}} {{special=[[ceil(([[@{spell_modtotal}+?{mods|0}]])/5)+1]]}}         {{success=[[@{spell_modtotal}+?{mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{spellname}}}" ></button>
 				</fieldset>				
 			  </div>		
 				
@@ -1663,7 +1628,7 @@ D20	    Result	       AP/HP
 								<option value="@{spiritskill}+(@{spirit1_pow}-10)+(@{spirit1_int}-10)">Sorcery</option>
 								<option value="(@{spirit1_pow}*5)+(@{spirit1_pow}-10)+(@{spirit1_int}-10)">Spirit</option>								
 							</select>
-							<button type="roll" style="font-family:dicefontd20;margin:0px;" value="&{template:skillRoll} {{name=@{spirit1_name}}} {{skillvalue=[[@{magictype1}]]}} {{fumble=[[ceil(95+([[@{magictype1}]])/20))]]}} {{crit=[[ceil(([[@{magictype1}]])/20)+1]]}} {{special=[[ceil(([[@{magictype1}]])/5)+1]]}}         {{success=[[@{magictype1}]]}} {{roll=[[1d100]]}} {{skillname=@{spiritspell}}}" >t</button>	
+							<button type="roll"  value="&{template:skillRoll} {{name=@{spirit1_name}}} {{skillvalue=[[@{magictype1}]]}} {{fumble=[[ceil(95+([[@{magictype1}]])/20))]]}} {{crit=[[ceil(([[@{magictype1}]])/20)+1]]}} {{special=[[ceil(([[@{magictype1}]])/5)+1]]}}         {{success=[[@{magictype1}]]}} {{roll=[[1d100]]}} {{skillname=@{spiritspell}}}" ></button>	
 
 						</fieldset>
 						
@@ -1696,7 +1661,7 @@ D20	    Result	       AP/HP
 								<option value="@{spiritskill}+(@{spirit2_pow}-10)+(@{spirit2_int}-10)">Sorcery</option>
 								<option value="(@{spirit2_pow}*5)+(@{spirit2_pow}-10)+(@{spirit2_int}-10)">Spirit</option>								
 							</select>
-							<button type="roll" style="font-family:dicefontd20;margin:0px;" value="&{template:skillRoll} {{name=@{spirit2_name}}} {{skillvalue=[[@{magictype2}]]}} {{fumble=[[ceil(95+([[@{magictype2}]])/20))]]}} {{crit=[[ceil(([[@{magictype2}]])/20)+1]]}} {{special=[[ceil(([[@{magictype2}]])/5)+1]]}}         {{success=[[@{magictype2}]]}} {{roll=[[1d100]]}} {{skillname=@{spiritspell}}}" >t</button>	
+							<button type="roll"  value="&{template:skillRoll} {{name=@{spirit2_name}}} {{skillvalue=[[@{magictype2}]]}} {{fumble=[[ceil(95+([[@{magictype2}]])/20))]]}} {{crit=[[ceil(([[@{magictype2}]])/20)+1]]}} {{special=[[ceil(([[@{magictype2}]])/5)+1]]}}         {{success=[[@{magictype2}]]}} {{roll=[[1d100]]}} {{skillname=@{spiritspell}}}" ></button>	
 
 						</fieldset>
 						
@@ -1735,7 +1700,7 @@ D20	    Result	       AP/HP
 								<option value="@{spiritskill}+(@{spirit1_pow}-10)+(@{spirit1_int}-10)">Sorcery</option>
 								<option value="(@{spirit3_pow}*5)+(@{spirit3_pow}-10)+(@{spirit3_int}-10)">Spirit</option>								
 							</select>
-							<button type="roll" style="font-family:dicefontd20;margin:0px;" value="&{template:skillRoll} {{name=@{spirit3_name}}} {{skillvalue=[[@{magictype3}]]}} {{fumble=[[ceil(95+([[@{magictype3}]])/20))]]}} {{crit=[[ceil(([[@{magictype3}]])/20)+1]]}} {{special=[[ceil(([[@{magictype3}]])/5)+1]]}}         {{success=[[@{magictype3}]]}} {{roll=[[1d100]]}} {{skillname=@{spiritspell}}}" >t</button>	
+							<button type="roll"  value="&{template:skillRoll} {{name=@{spirit3_name}}} {{skillvalue=[[@{magictype3}]]}} {{fumble=[[ceil(95+([[@{magictype3}]])/20))]]}} {{crit=[[ceil(([[@{magictype3}]])/20)+1]]}} {{special=[[ceil(([[@{magictype3}]])/5)+1]]}}         {{success=[[@{magictype3}]]}} {{roll=[[1d100]]}} {{skillname=@{spiritspell}}}" ></button>	
 
 						</fieldset>
 						
@@ -1768,7 +1733,7 @@ D20	    Result	       AP/HP
 								<option value="@{spiritskill}+(@{spirit4_pow}-10)+(@{spirit4_int}-10)">Sorcery</option>
 								<option value="(@{spirit4_pow}*5)+(@{spirit4_pow}-10)+(@{spirit4_int}-10)">Spirit</option>								
 							</select>
-							<button type="roll" style="font-family:dicefontd20;margin:0px;" value="&{template:skillRoll} {{name=@{spirit4_name}}} {{skillvalue=[[@{magictype}]]}} {{fumble=[[ceil(95+([[@{magictype}]])/20))]]}} {{crit=[[ceil(([[@{magictype}]])/20)+1]]}} {{special=[[ceil(([[@{magictype}]])/5)+1]]}}         {{success=[[@{magictype}]]}} {{roll=[[1d100]]}} {{skillname=@{spiritspell}}}" >t</button>	
+							<button type="roll"  value="&{template:skillRoll} {{name=@{spirit4_name}}} {{skillvalue=[[@{magictype}]]}} {{fumble=[[ceil(95+([[@{magictype}]])/20))]]}} {{crit=[[ceil(([[@{magictype}]])/20)+1]]}} {{special=[[ceil(([[@{magictype}]])/5)+1]]}}         {{success=[[@{magictype}]]}} {{roll=[[1d100]]}} {{skillname=@{spiritspell}}}" ></button>	
 
 						</fieldset>
 						
@@ -1808,7 +1773,7 @@ D20	    Result	       AP/HP
 								<option value="@{spiritskill}+(@{spirit5_pow}-10)+(@{spirit5_int}-10)">Sorcery</option>
 								<option value="(@{spirit1_pow}*5)+(@{spirit5_pow}-10)+(@{spirit5_int}-10)">Spirit</option>								
 							</select>
-							<button type="roll" style="font-family:dicefontd20;margin:0px;" value="&{template:skillRoll} {{name=@{spirit5_name}}} {{skillvalue=[[@{magictype}]]}} {{fumble=[[ceil(95+([[@{magictype}]])/20))]]}} {{crit=[[ceil(([[@{magictype}]])/20)+1]]}} {{special=[[ceil(([[@{magictype}]])/5)+1]]}}         {{success=[[@{magictype}]]}} {{roll=[[1d100]]}} {{skillname=@{spiritspell}}}" >t</button>	
+							<button type="roll"  value="&{template:skillRoll} {{name=@{spirit5_name}}} {{skillvalue=[[@{magictype}]]}} {{fumble=[[ceil(95+([[@{magictype}]])/20))]]}} {{crit=[[ceil(([[@{magictype}]])/20)+1]]}} {{special=[[ceil(([[@{magictype}]])/5)+1]]}}         {{success=[[@{magictype}]]}} {{roll=[[1d100]]}} {{skillname=@{spiritspell}}}" ></button>	
 
 						</fieldset>
 						
@@ -1841,7 +1806,7 @@ D20	    Result	       AP/HP
 								<option value="@{spiritskill}+(@{spirit1_pow}-10)+(@{spirit1_int}-10)">Sorcery</option>
 								<option value="(@{spirit1_pow}*5)+(@{spirit1_pow}-10)+(@{spirit1_int}-10)">Spirit</option>								
 							</select>
-							<button type="roll" style="font-family:dicefontd20;margin:0px;" value="&{template:skillRoll} {{name=@{spirit6_name}}} {{skillvalue=[[@{magictype}]]}} {{fumble=[[ceil(95+([[@{magictype}]])/20))]]}} {{crit=[[ceil(([[@{magictype}]])/20)+1]]}} {{special=[[ceil(([[@{magictype}]])/5)+1]]}}         {{success=[[@{magictype}]]}} {{roll=[[1d100]]}} {{skillname=@{spiritspell}}}" >t</button>	
+							<button type="roll"  value="&{template:skillRoll} {{name=@{spirit6_name}}} {{skillvalue=[[@{magictype}]]}} {{fumble=[[ceil(95+([[@{magictype}]])/20))]]}} {{crit=[[ceil(([[@{magictype}]])/20)+1]]}} {{special=[[ceil(([[@{magictype}]])/5)+1]]}}         {{success=[[@{magictype}]]}} {{roll=[[1d100]]}} {{skillname=@{spiritspell}}}" ></button>	
 
 						</fieldset>
 						
@@ -3740,11 +3705,11 @@ D20	    Result	       AP/HP
 		<tr>
 		{{#rollBetween() roll 1 2}}<td class="template_label">Hit on the RH Leg</td>{{/rollBetween() roll 1 2}}
 		{{#rollBetween() roll 3 4}}<td class="template_label">Hit on the LH Leg</td>{{/rollBetween() roll 3 4}}
-		{{#rollBetween() roll 5 7}}<td class="template_label">Hit on the  Hind Q</td>{{/rollBetween() roll 5 7}}
-		{{#rollBetween() roll 8 10}}<td class="template_label">Hit on the Fore Q</td>{{/rollBetween() roll 8 10}}
-		{{#rollBetween() roll 11 13}}<td class="template_label">Hit on the RF Leg</td>{{/rollBetween() roll 11 13}}
-		{{#rollBetween() roll 14 16}}<td class="template_label">Hit on the LF Leg</td>{{/rollBetween() roll 14 16}}
-		{{#rollBetween() roll 17 20}}<td class="template_label">Hit on the Head</td>{{/rollBetween() roll 17 20}}		
+		{{#rollBetween() roll 5 9}}<td class="template_label">Hit on the  Hind Q</td>{{/rollBetween() roll 5 9}}
+		{{#rollBetween() roll 10 14}}<td class="template_label">Hit on the Fore Q</td>{{/rollBetween() roll 10 14}}
+		{{#rollBetween() roll 15 16}}<td class="template_label">Hit on the RF Leg</td>{{/rollBetween() roll 15 16}}
+		{{#rollBetween() roll 17 18}}<td class="template_label">Hit on the LF Leg</td>{{/rollBetween() roll 17 18}}
+		{{#rollBetween() roll 19 20}}<td class="template_label">Hit on the Head</td>{{/rollBetween() roll 19 20}}		
 		</tr>
 	</table>
 </rolltemplate>
@@ -3764,6 +3729,41 @@ D20	    Result	       AP/HP
 	</table>
 </rolltemplate>
 
+
+<rolltemplate class="sheet-rolltemplate-NewtL-Missle">
+	<table class="skillRoll" style="border 1px black">
+		<tr><th colspan="1">Newtling Missle Hit location roll</th></tr>
+		<tr>
+		{{#rollTotal() roll 1}}<td class="template_label">Hit on the Tail</td>{{/rollTotal() roll 1}}		
+		{{#rollBetween() roll 2 4}}<td class="template_label">Hit on the R Leg</td>{{/rollBetween() roll 2 4}}
+		{{#rollBetween() roll 5 7}}<td class="template_label">Hit on the L Leg</td>{{/rollBetween() roll 5 7}}
+		{{#rollBetween() roll 8 11}}<td class="template_label">Hit on the  Abdomen</td>{{/rollBetween() roll 8 11}}
+		{{#rollBetween() roll 12 15}}<td class="template_label">Hit on the Chest</td>{{/rollBetween() roll 12 15}}
+		{{#rollBetween() roll 16 17}}<td class="template_label">Hit on the R Arm</td>{{/rollBetween() roll 16 17}}
+		{{#rollBetween() roll 18 19}}<td class="template_label">Hit on the L Arm</td>{{/rollBetween() roll 18 19}}
+		{{#rollTotal() roll 20}}<td class="template_label">Hit on the Head</td>{{/rollTotal() roll 20}}		
+		</tr>
+	</table>
+</rolltemplate>
+
+<rolltemplate class="sheet-rolltemplate-NewtL-Melee">
+	<table class="skillRoll" style="border 1px black">
+		<tr><th colspan="1">Newtling Melee Hit location roll</th></tr>
+		<tr>
+		{{#rollBetween() roll 1 2}}<td class="template_label">Hit on the Tail</td>{{/rollBetween() roll 1 2}}		
+		{{#rollBetween() roll 3 5}}<td class="template_label">Hit on the R Leg</td>{{/rollBetween() roll 3 5}}
+		{{#rollBetween() roll 6 8}}<td class="template_label">Hit on the L Leg</td>{{/rollBetween() roll 6 8}}
+		{{#rollBetween() roll 9 11}}<td class="template_label">Hit on the  Abdomen</td>{{/rollBetween() roll 9 11}}
+		{{#rollTotal() roll 12}}<td class="template_label">Hit on the Chest</td>{{/rollTotal() roll 12}}
+		{{#rollBetween() roll 13 15}}<td class="template_label">Hit on the R Arm</td>{{/rollBetween() roll 13 15}}
+		{{#rollBetween() roll 16 18}}<td class="template_label">Hit on the L Arm</td>{{/rollBetween() roll 16 18}}
+		{{#rollBetween() roll 19 20}}<td class="template_label">Hit on the Head</td>{{/rollBetween() roll 19 20}}		
+		</tr>
+	</table>
+</rolltemplate>
+
+
+
 <rolltemplate class="sheet-rolltemplate-WalkL-Melee">
 	<table class="skillRoll" style="border 1px black">
 		<tr><th colspan="1">Walktapus Melee Hit location roll</th></tr>