diff --git a/Basic_Roleplaying/Basic_Roleplaying.html b/Basic_Roleplaying/Basic_Roleplaying.html
index 4702df458cd..85d31fca69f 100644
--- a/Basic_Roleplaying/Basic_Roleplaying.html
+++ b/Basic_Roleplaying/Basic_Roleplaying.html
@@ -5,7 +5,7 @@
         <div class="sheet-cdiv">
             <input class="sheet-HideConfig" type="checkbox" checked="checked" name="attr_is_config"><span class="sheet-is-config"><span style="font-family: &quot;pictos&quot;">y</span></span>
             <div class="sheet-config" style="border-style: dotted ; border-color: gray ; padding: 5px ; background-color: white ; background-image: none">
-				finderski sheet version: 01 August 2015
+    			finderski sheet version: 01 August 2015
 				
 				<div class="sheet-row"><h2 class="sheet-sectionHeader">CONFIGURATION</h2></div>
 					<div class='sheet-2colrow'>
@@ -27,7 +27,9 @@
 	</div>
 
     <div class='sheet-2colrow'>
+		<div style="width:100%">
 	     <img src="https://i.imgur.com/HhFlHyf.png" />
+		 </div>
         <div class='sheet-col'>
 
             <table style="width: 100%;">
@@ -610,7 +612,7 @@ <h3 class="sheet-skills-header">Skills</h3>
 						<td><input type="checkbox" name="attr_Success-Appraise"  /></td>
 						<td class="sheet-skillname">Appraise (15%)</td>
 						<td><input type="number" name="attr_Appraise"  /></td>
-						<td><button type="roll" value="&{template:skillRoll} {{skillvalue=@{Appraise}}} {{fumble=[[ceil(95+(@{Appraise}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Appraise}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Appraise}+?{Mods|0})/5)+1]]}}         {{success=[[@{Appraise}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Appraise}}"/></td>																																								
+						<td><button type="roll" value="&{template:skillRoll} {{name=@{Name}}} {{skillvalue=@{Appraise}}} {{fumble=[[ceil(95+(@{Appraise}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Appraise}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Appraise}+?{Mods|0})/5)+1]]}}         {{success=[[@{Appraise}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Appraise}}"/></td>																																								
 						<!--<td><button type="roll" value="/roll 1d100<@{Appraise}" /></td>-->
 					</tr>
 					<tr>
@@ -625,7 +627,7 @@ <h3 class="sheet-skills-header">Skills</h3>
 						<!--<input  type="text" name="attr_artSkillname" class="sheet-skillname" />-->
 						<td><input  type="text" name="attr_artSkillname" class="sheet-skillname" /></td>
 						<td><input type="number" name="attr_artScore" /></td>
-					   <td><button type="roll" value="&{template:skillRoll} {{skillvalue=@{artScore}}} {{fumble=[[ceil(95+(@{artScore}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{artScore}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{artScore}+?{Mods|0})/5)+1]]}}          {{success=[[@{artScore}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{artSkillname}}}"/></td>
+					   <td><button type="roll" value="&{template:skillRoll} {{name=@{Name}}} {{skillvalue=@{artScore}}} {{fumble=[[ceil(95+(@{artScore}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{artScore}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{artScore}+?{Mods|0})/5)+1]]}}          {{success=[[@{artScore}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{artSkillname}}}"/></td>
 					   </tr>
 					</table>
 				</fieldset>	
@@ -634,20 +636,20 @@ <h3 class="sheet-skills-header">Skills</h3>
 						<td><input type="checkbox" name="attr_Success-Bargain"  /></td>
 						<td class="sheet-skillname">Bargain (05%)</td>
 						<td><input type="number" name="attr_Bargain"  /></td>
-						<td><button type="roll" value="&{template:skillRoll} {{success=[[@{Bargain}+?{Mods|0}]]}} {{fumble=[[ceil(95+(@{Bargain}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Bargain}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Bargain}+?{Mods|0})/5)+1]]}}  {{skillvalue=@{Bargain}}}  {{roll=[[1d100]]}} {{skillname=Bargain}}"/></td> 
+						<td><button type="roll" value="&{template:skillRoll} {{name=@{Name}}} {{success=[[@{Bargain}+?{Mods|0}]]}} {{fumble=[[ceil(95+(@{Bargain}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Bargain}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Bargain}+?{Mods|0})/5)+1]]}}  {{skillvalue=@{Bargain}}}  {{roll=[[1d100]]}} {{skillname=Bargain}}"/></td> 
 					</tr>
 					<tr>
 						<td><input type="checkbox" name="attr_Success-Climb"  /></td>
 						<td class="sheet-skillname">Climb (40%)</td>
 						<td><input type="number" name="attr_Climb"  /></td>
-						<td><button type="roll" value="&{template:skillRoll} {{skillvalue=@{Climb}}} {{fumble=[[ceil(95+(@{Climb}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Climb}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Climb}+?{Mods|0})/5)+1]]}}       {{success=[[@{Climb}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Climb}}"/></td>
+						<td><button type="roll" value="&{template:skillRoll}    {{name=@{Name}}} {{skillvalue=@{Climb}}} {{fumble=[[ceil(95+(@{Climb}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Climb}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Climb}+?{Mods|0})/5)+1]]}}       {{success=[[@{Climb}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Climb}}"/></td>
 					</tr>
 					<tr>
 						<td><input type="checkbox" name="attr_Success-Command"  /></td>
 						<td class="sheet-skillname">Command (05)</td>
 						<td><input type="number" name="attr_Command"  /></td>
 						<!--<td><button type="roll" value="/roll 1d100<@{Command}" /></td>-->
-						<td><button type="roll" value="&{template:skillRoll} {{skillvalue=@{Command}}} {{fumble=[[ceil(95+(@{Command}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Command}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Command}+?{Mods|0})/5)+1]]}}  {{success=[[@{Command}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Command}}"/></td>											
+						<td><button type="roll" value="&{template:skillRoll} {{name=@{Name}}} {{skillvalue=@{Command}}} {{fumble=[[ceil(95+(@{Command}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Command}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Command}+?{Mods|0})/5)+1]]}}  {{success=[[@{Command}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Command}}"/></td>											
 					</tr>
 					<tr>
 						<td class="sheet-chkfiller"></td>
@@ -659,7 +661,7 @@ <h3 class="sheet-skills-header">Skills</h3>
 						<td><input type="checkbox" name="attr_craftSuccess"  /></td>
 						<td><input type="text" name="attr_craftSkillname" class="sheet-skillname"/></td>
 						<td><input type="number" name="attr_craftScore" /></td>
-						<td><button type="roll" value="&{template:skillRoll} {{skillvalue=@{craftScore}}} {{fumble=[[ceil(95+(@{craftScore}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{craftScore}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{craftScore}+?{Mods|0})/5)+1]]}}        {{success=[[@{craftScore}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{craftSkillname}}}"/></td>																																																	 				 
+						<td><button type="roll" value="&{template:skillRoll} {{name=@{Name}}} {{skillvalue=@{craftScore}}} {{fumble=[[ceil(95+(@{craftScore}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{craftScore}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{craftScore}+?{Mods|0})/5)+1]]}}        {{success=[[@{craftScore}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{craftSkillname}}}"/></td>																																																	 				 
 					</table>	
 				</fieldset>
 				<table style="width: 100%">
@@ -667,7 +669,7 @@ <h3 class="sheet-skills-header">Skills</h3>
 						<td><input type="checkbox" name="attr_Success-Demolition"  /></td>
 						<td class="sheet-skillname">Demolition (01%)</td>
 						<td><input type="number" name="attr_Demolition"  /></td>
-						<td><button type="roll" value="&{template:skillRoll} {{skillvalue=@{Demolition}}} {{fumble=[[ceil(95+(@{Demolition}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Demolition}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Demolition}+?{Mods|0})/5)+1]]}}         {{success=[[@{Demolition}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Demolition}}"/></td>																																			
+						<td><button type="roll" value="&{template:skillRoll} {{name=@{Name}}} {{skillvalue=@{Demolition}}} {{fumble=[[ceil(95+(@{Demolition}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Demolition}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Demolition}+?{Mods|0})/5)+1]]}}         {{success=[[@{Demolition}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Demolition}}"/></td>																																			
 						<!--<td><button type="roll" value="/roll 1d100<@{Demolition}" /></td>-->					
 					</tr>
 					<tr>
@@ -675,13 +677,13 @@ <h3 class="sheet-skills-header">Skills</h3>
 						<td class="sheet-skillname">Disguise (01)</td>
 						<td><input type="number" name="attr_Disguise"  /></td>
 						<!--<td><button type="roll" value="/roll 1d100<@{Disguise}" /></td>-->
-						<td><button type="roll" value="&{template:skillRoll} {{skillvalue=@{Disguise}}} {{fumble=[[ceil(95+(@{Disguise}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Disguise}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Disguise}+?{Mods|0})/5)+1]]}}    {{success=[[@{Disguise}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Disguise}}"/></td>										
+						<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{Disguise}}} {{fumble=[[ceil(95+(@{Disguise}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Disguise}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Disguise}+?{Mods|0})/5)+1]]}}    {{success=[[@{Disguise}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Disguise}}"/></td>										
 					</tr>
 					<tr>
 						<td><input type="checkbox" name="attr_Success-Dodge"  /></td>
 						<td class="sheet-skillname">Dodge (DEX x02%)</td>
 						<td><input type="number" name="attr_Dodge"  /></td>
-						<td><button type="roll" value="&{template:skillRoll} {{skillvalue=@{Dodge}}} {{fumble=[[ceil(95+(@{Dodge}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Dodge}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Dodge}+?{Mods|0})/5)+1]]}}        {{success=[[@{Dodge}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Dodge}}"/></td>																																																																																																				
+						<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{Dodge}}} {{fumble=[[ceil(95+(@{Dodge}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Dodge}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Dodge}+?{Mods|0})/5)+1]]}}        {{success=[[@{Dodge}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Dodge}}"/></td>																																																																																																				
 						<!--<td><button type="roll" value="/roll 1d100<@{Dodge}" /></td>-->
 					</tr>				
 					<tr>
@@ -693,7 +695,7 @@ <h3 class="sheet-skills-header">Skills</h3>
 					 <input type="checkbox" name="attr_DriveSucess"  />
 					 <input type="text" name="attr_DriveSkill" class="sheet-skillname"/>
 					 <input type="number" name="attr_DriveScore" />
-					 <button type="roll" value="&{template:skillRoll} {{skillvalue=@{DriveScore}}} {{fumble=[[ceil(95+(@{DriveScore}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{DriveScore}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{DriveScore}+?{Mods|0})/5)+1]]}}        {{success=[[@{DriveScore}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{DriveSkill}}}"/></td>																																																	 				 				 				 					 					 					 					 					 					
+					 <button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{DriveScore}}} {{fumble=[[ceil(95+(@{DriveScore}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{DriveScore}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{DriveScore}+?{Mods|0})/5)+1]]}}        {{success=[[@{DriveScore}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{DriveSkill}}}"/></td>																																																	 				 				 				 					 					 					 					 					 					
 				</fieldset>	
 				<table style="width: 100%">	
 					<tr>
@@ -701,13 +703,13 @@ <h3 class="sheet-skills-header">Skills</h3>
 						<td class="sheet-skillname">Etiquette (05)</td>
 						<td><input type="number" name="attr_Etiquette"  /></td>
 						<!--<td><button type="roll" value="/roll 1d100<@{Etiquette}" /></td>-->
-						<td><button type="roll" value="&{template:skillRoll} {{skillvalue=@{Etiquette}}}  {{fumble=[[ceil(95+(@{Etiquette}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Etiquette}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Etiquette}+?{Mods|0})/5)+1]]}}         {{success=[[@{Etiquette}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Etiquette}}"/></td>															
+						<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{Etiquette}}}  {{fumble=[[ceil(95+(@{Etiquette}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Etiquette}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Etiquette}+?{Mods|0})/5)+1]]}}         {{success=[[@{Etiquette}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Etiquette}}"/></td>															
 					</tr>
 					<tr>
 						<td><input type="checkbox" name="attr_Success-FineManipulation" /></td>
 						<td class="sheet-skillname">Fine Manipulation (05%)</td>
 						<td><input type="number" name="attr_FineManipulation" /></td>
-						<td><button type="roll" value="&{template:skillRoll} {{skillvalue=@{FineManipulation}}}  {{fumble=[[ceil(95+(@{FineManipulation}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{FineManipulation}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{FineManipulation}+?{Mods|0})/5)+1]]}}        {{success=[[@{FineManipulation}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Fine Manip.}}"/></td>
+						<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{FineManipulation}}}  {{fumble=[[ceil(95+(@{FineManipulation}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{FineManipulation}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{FineManipulation}+?{Mods|0})/5)+1]]}}        {{success=[[@{FineManipulation}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Fine Manip.}}"/></td>
 						<!--<td><button type="roll" value="/roll 1d100<@{FineManipulation}" /></td>-->
 					</tr>
 
@@ -715,14 +717,14 @@ <h3 class="sheet-skills-header">Skills</h3>
                     <td><input type="checkbox" name="attr_Success-FirstAid"  /></td>
                     <td class="sheet-skillname">First Aid (30%) or INT x1</td>
                     <td><input type="number" name="attr_FirstAid"  /></td>
-					<td><button type="roll" value="&{template:skillRoll} {{skillvalue=@{FirstAid}}} {{fumble=[[ceil(95+(@{FirstAid}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{FirstAid}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{FirstAid}+?{Mods|0})/5)+1]]}}       {{success=[[@{FirstAid}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=First Aid}}"/></td>																																													
+					<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{FirstAid}}} {{fumble=[[ceil(95+(@{FirstAid}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{FirstAid}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{FirstAid}+?{Mods|0})/5)+1]]}}       {{success=[[@{FirstAid}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=First Aid}}"/></td>																																													
                     <!--<td><button type="roll" value="/roll 1d100<@{FirstAid}" /></td>-->
                 </tr>
                 <tr>
                     <td><input type="checkbox" name="attr_Success-Gaming"  /></td>
                     <td class="sheet-skillname">Gaming (INT+POW)</td>
                     <td><input type="number" name="attr_Gaming"  /></td>
-					<td><button type="roll" value="&{template:skillRoll} {{skillvalue=@{Gaming}}} {{fumble=[[ceil(95+(@{Gaming}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Gaming}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Gaming}+?{Mods|0})/5)+1]]}}        {{success=[[@{Gaming}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Gaming}}"/></td>																																																		
+					<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{Gaming}}} {{fumble=[[ceil(95+(@{Gaming}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Gaming}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Gaming}+?{Mods|0})/5)+1]]}}        {{success=[[@{Gaming}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Gaming}}"/></td>																																																		
                 </tr>		
 
 				<tr>
@@ -735,21 +737,21 @@ <h3 class="sheet-skills-header">Skills</h3>
 						 <input type="checkbox" name="attr_hMachineSuccess"  />
 						 <input type="text" name="attr_hMachineSkills" class="sheet-skillname"/>
 						 <input type="number" name="attr_hMachineScore" />
-						 <td><button type="roll" value="&{template:skillRoll} {{skillvalue=@{hMachineScore}}} {{fumble=[[ceil(95+(@{hMachineScore}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{hMachineScore}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{hMachineScore}+?{Mods|0})/5)+1]]}}         {{success=[[@{hMachineScore}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{hMachineSkills}}}"/></td>																																																	 				 				 
+						 <td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{hMachineScore}}} {{fumble=[[ceil(95+(@{hMachineScore}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{hMachineScore}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{hMachineScore}+?{Mods|0})/5)+1]]}}         {{success=[[@{hMachineScore}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{hMachineSkills}}}"/></td>																																																	 				 				 
 				</fieldset>					
 				<table style="width: 100%">		
 					<tr>
 						<td><input type="checkbox" name="attr_Success-Hide"  /></td>
 						<td class="sheet-skillname">Hide (10%)</td>
 						<td><input type="number" name="attr_Hide"  /></td>
-						<td><button type="roll" value="&{template:skillRoll} {{skillvalue=@{Hide}}} {{fumble=[[ceil(95+(@{Hide}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Hide}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Hide}+?{Mods|0})/5)+1]]}}          {{success=[[@{Hide}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Hide}}"/></td>																																																																																																														
+						<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{Hide}}} {{fumble=[[ceil(95+(@{Hide}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Hide}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Hide}+?{Mods|0})/5)+1]]}}          {{success=[[@{Hide}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Hide}}"/></td>																																																																																																														
 						<!--<td><button type="roll" value="/roll 1d100<@{Spot-Hide}" /></td>-->
 					</tr>
 					<tr>
 						<td><input type="checkbox" name="attr_Success-Insight"  /></td>
 						<td class="sheet-skillname">Insight (05%)</td>
 						<td><input type="number" name="attr_Insight"  /></td>
-						<td><button type="roll" value="&{template:skillRoll} {{skillvalue=@{Insight}}} {{fumble=[[ceil(95+(@{Insight}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Insight}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Insight}+?{Mods|0})/5)+1]]}}        {{success=[[@{Insight}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Insight}}"/></td>																																																																						
+						<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{Insight}}} {{fumble=[[ceil(95+(@{Insight}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Insight}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Insight}+?{Mods|0})/5)+1]]}}        {{success=[[@{Insight}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Insight}}"/></td>																																																																						
 						<!--<td><button type="roll" value="/roll 1d100<@{Insight}" /></td>-->
 					</tr>
 				</table>
@@ -764,7 +766,7 @@ <h3 class="sheet-skills-header">Skills</h3>
 				<td><input type="checkbox" name="attr_Success-Jump"  /></td>
 				<td class="sheet-skillname">Jump (25%)</td>
 				<td><input type="number" name="attr_Jump"  /></td>
-				<td><button type="roll" value="&{template:skillRoll} {{skillvalue=@{Jump}}} {{fumble=[[ceil(95+(@{Jump}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Jump}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Jump}+?{Mods|0})/5)+1]]}}        {{success=[[@{Jump}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Jump}}"/></td>																																																																																																																			
+				<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{Jump}}} {{fumble=[[ceil(95+(@{Jump}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Jump}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Jump}+?{Mods|0})/5)+1]]}}        {{success=[[@{Jump}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Jump}}"/></td>																																																																																																																			
 				<!--<td><button type="roll" value="/roll 1d100<@{Jump}" /></td>-->
 			</tr>
 
@@ -777,7 +779,7 @@ <h3 class="sheet-skills-header">Skills</h3>
 					 <input type="checkbox" name="attr_KnowSucess"  />
 					 <input type="text" name="attr_KnowSkills" class="sheet-skillname"/>
 					 <input type="number" name="attr_KnowScore" />
-					 <button type="roll" value="&{template:skillRoll} {{skillvalue=@{KnowScore}}} {{fumble=[[ceil(95+(@{KnowScore}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{KnowScore}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{KnowScore}+?{Mods|0})/5)+1]]}}         {{success=[[@{KnowScore}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{KnowSkills}}}"/></td>																																																	 				 				 				 					 
+					 <button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{KnowScore}}} {{fumble=[[ceil(95+(@{KnowScore}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{KnowScore}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{KnowScore}+?{Mods|0})/5)+1]]}}         {{success=[[@{KnowScore}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{KnowSkills}}}"/></td>																																																	 				 				 				 					 
 
 			</fieldset>	
 			<table style="width: 100%">					
@@ -786,7 +788,7 @@ <h3 class="sheet-skills-header">Skills</h3>
 					<td class="sheet-skillname">Language, Own (INT/EDUx5%)</td>
 					<td><input type="number" name="attr_ownLang"  /></td>
 					<!--<td><button type="roll" value="/roll 1d100<@{ownLang}" /></td>-->
-					<td><button type="roll" value="&{template:skillRoll} {{skillvalue=@{ownLang}}}  {{fumble=[[ceil(95+(@{ownLang}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{ownLang}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{ownLang}+?{Mods|0})/5)+1]]}}        {{success=[[@{ownLang}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Own Language}}"/></td>																				
+					<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{ownLang}}}  {{fumble=[[ceil(95+(@{ownLang}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{ownLang}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{ownLang}+?{Mods|0})/5)+1]]}}        {{success=[[@{ownLang}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Own Language}}"/></td>																				
 				</tr>			
 			</table>
 			<fieldset class='repeating_Langskills'>
@@ -794,7 +796,7 @@ <h3 class="sheet-skills-header">Skills</h3>
 					 <input type="checkbox" name="attr_LangSuccess"  />
 					 <input type="text" name="attr_LangSkillname" class="sheet-skillname" />
 					 <input type="number" name="attr_LangScore" />
-					<button type="roll" value="&{template:skillRoll} {{skillvalue=@{LangScore}}} {{fumble=[[ceil(95+(@{LangScore}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{LangScore}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{LangScore}+?{Mods|0})/5)+1]]}}         {{success=[[@{LangScore}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{LangSkillname}}}"/>
+					<button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{LangScore}}} {{fumble=[[ceil(95+(@{LangScore}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{LangScore}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{LangScore}+?{Mods|0})/5)+1]]}}         {{success=[[@{LangScore}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{LangSkillname}}}"/>
 				</tr>		
 			</fieldset>
 			<table style="width: 100%">								
@@ -802,7 +804,7 @@ <h3 class="sheet-skills-header">Skills</h3>
 					<td><input type="checkbox" name="attr_Success-Listen"  /></td>
 					<td class="sheet-skillname">Listen (25%)</td>
 					<td><input type="number" name="attr_Listen"  /></td>
-					<td><button type="roll" value="&{template:skillRoll} {{skillvalue=@{Listen}}} {{fumble=[[ceil(95+(@{Listen}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Listen}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Listen}+?{Mods|0})/5)+1]]}}   {{success=[[@{Listen}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Listen}}"/></td>																																																																											
+					<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{Listen}}} {{fumble=[[ceil(95+(@{Listen}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Listen}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Listen}+?{Mods|0})/5)+1]]}}   {{success=[[@{Listen}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Listen}}"/></td>																																																																											
 				 </tr>			
 				<tr>
 					<td class="sheet-chkfiller"></td>
@@ -813,7 +815,7 @@ <h3 class="sheet-skills-header">Skills</h3>
 					 <input type="checkbox" name="attr_LitSucess"  />
 					 <input type="text" name="attr_LitSkill" class="sheet-skillname"/>
 					 <input type="number" name="attr_LitScore" />
-					 <button type="roll" value="&{template:skillRoll} {{skillvalue=@{LitScore}}} {{fumble=[[ceil(95+(@{LitScore}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{LitScore}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{LitScore}+?{Mods|0})/5)+1]]}}        {{success=[[@{LitScore}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{LitSkill}}}"/></td>																																																	 				 				 				 					 					 
+					 <button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{LitScore}}} {{fumble=[[ceil(95+(@{LitScore}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{LitScore}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{LitScore}+?{Mods|0})/5)+1]]}}        {{success=[[@{LitScore}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{LitSkill}}}"/></td>																																																	 				 				 				 					 					 
 					 <!--<button type="roll" value="/roll 1d100<@{LitScore}" />-->
 			</fieldset>				
 			<table style="width: 100%;">	
@@ -821,14 +823,14 @@ <h3 class="sheet-skills-header">Skills</h3>
 						<td><input type="checkbox" name="attr_Success-Medicine"  /></td>
 						<td class="sheet-skillname">Medicine (05%)</td>
 						<td><input type="number" name="attr_Medicine"  /></td>
-						<td><button type="roll" value="&{template:skillRoll} {{skillvalue=@{Medicine}}} {{fumble=[[ceil(95+(@{Medicine}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Medicine}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Medicine}+?{Mods|0})/5)+1]]}}        {{success=[[@{Medicine}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Medicine}}"/></td>																																																							
+						<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{Medicine}}} {{fumble=[[ceil(95+(@{Medicine}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Medicine}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Medicine}+?{Mods|0})/5)+1]]}}        {{success=[[@{Medicine}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Medicine}}"/></td>																																																							
 						<!--<td><button type="roll" value="/roll 1d100<@{Medicine}" /></td>-->
 					</tr>
 				<tr>
 					<td><input type="checkbox" name="attr_Success-Navigate"  /></td>
 					<td class="sheet-skillname">Navigate (10%)</td>
 					<td><input type="number" name="attr_Navigate"  /></td>
-					<td><button type="roll" value="&{template:skillRoll} {{skillvalue=@{Navigate}}} {{fumble=[[ceil(95+(@{Navigate}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Navigate}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Navigate}+?{Mods|0})/5)+1]]}}        {{success=[[@{Navigate}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Navigate}}"/></td>																																																																																
+					<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{Navigate}}} {{fumble=[[ceil(95+(@{Navigate}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Navigate}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Navigate}+?{Mods|0})/5)+1]]}}        {{success=[[@{Navigate}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Navigate}}"/></td>																																																																																
 					<!--<td><button type="roll" value="/roll 1d100<@{Navigate}" /></td>-->
 				</tr>			
 				<tr>
@@ -836,14 +838,14 @@ <h3 class="sheet-skills-header">Skills</h3>
 					<td class="sheet-skillname">Perform (05%)</td>
 					<td><input type="number" name="attr_Perform"  /></td>
 					<!--<td><button type="roll" value="/roll 1d100<@{Perform}" /></td>-->
-					<td><button type="roll" value="&{template:skillRoll} {{skillvalue=@{Perform}}} {{fumble=[[ceil(95+(@{Perform}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Perform}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Perform}+?{Mods|0})/5)+1]]}}        {{success=[[@{Perform}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Perform}}"/></td>																									
+					<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{Perform}}} {{fumble=[[ceil(95+(@{Perform}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Perform}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Perform}+?{Mods|0})/5)+1]]}}        {{success=[[@{Perform}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Perform}}"/></td>																									
 				</tr>				
 				<tr>
 					<td><input type="checkbox" name="attr_Success-Persuade"  /></td>
 					<td class="sheet-skillname">Persuade (15%)</td>
 					<td><input type="number" name="attr_Persuade"  /></td>
 					<!--<td><button type="roll" value="/roll 1d100<@{Persuade}" /></td>-->
-					<td><button type="roll" value="&{template:skillRoll} {{skillvalue=@{Persuade}}} {{fumble=[[ceil(95+(@{Persuade}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Persuade}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Etiquette}+?{Mods|0})/5)+1]]}}       {{success=[[@{Persuade}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Persuade}}"/></td>																														
+					<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{Persuade}}} {{fumble=[[ceil(95+(@{Persuade}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Persuade}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Etiquette}+?{Mods|0})/5)+1]]}}       {{success=[[@{Persuade}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Persuade}}"/></td>																														
 				</tr>			
 				<tr>
 					<td class="sheet-chkfiller"></td>
@@ -854,7 +856,7 @@ <h3 class="sheet-skills-header">Skills</h3>
 					 <input type="checkbox" name="attr_PilotSucess"  />
 					 <input type="text" name="attr_PilotSkill" class="sheet-skillname"/>
 					 <input type="number" name="attr_PilotScore" />
-					 <button type="roll" value="&{template:skillRoll} {{skillvalue=@{PilotScore}}} {{fumble=[[ceil(95+(@{PilotScore}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{PilotScore}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{PilotScore}+?{Mods|0})/5)+1]]}}         {{success=[[@{PilotScore}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{PilotSkill}}}"/></td>																																																	 				 				 				 					 					 					 					 					 					 
+					 <button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{PilotScore}}} {{fumble=[[ceil(95+(@{PilotScore}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{PilotScore}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{PilotScore}+?{Mods|0})/5)+1]]}}         {{success=[[@{PilotScore}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{PilotSkill}}}"/></td>																																																	 				 				 				 					 					 					 					 					 					 
 			</fieldset>	
 				<table style="width: 100%;">				
 						<tr>
@@ -869,7 +871,7 @@ <h3 class="sheet-skills-header">Skills</h3>
 						 <input type="checkbox" name="attr_repairSuccess"  />
 						 <input type="text" name="attr_repairSkills" class="sheet-skillname"/>
 						 <input type="number" name="attr_repairScore" />
-						 <td><button type="roll" value="&{template:skillRoll} {{skillvalue=@{repairScore}}} {{fumble=[[ceil(95+(@{repairScore}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{repairScore}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{repairScore}+?{Mods|0})/5)+1]]}}        {{success=[[@{repairScore}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{repairSkills}}}"/></td>																																																	 				 				 				 
+						 <td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{repairScore}}} {{fumble=[[ceil(95+(@{repairScore}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{repairScore}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{repairScore}+?{Mods|0})/5)+1]]}}        {{success=[[@{repairScore}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{repairSkills}}}"/></td>																																																	 				 				 				 
 						 <!--<button type="roll" value="/roll 1d100<@{repairScore" />-->
 
 				</fieldset>				
@@ -886,7 +888,7 @@ <h3 class="sheet-skills-header">Skills</h3>
 							 <input type="checkbox" name="attr_RideSucess"  />
 							 <input type="text" name="attr_RideSkill" class="sheet-skillname"/>
 							 <input type="number" name="attr_RideScore" />
-							 <button type="roll" value="&{template:skillRoll} {{skillvalue=@{RideScore}}} {{fumble=[[ceil(95+(@{RideScore}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{RideScore}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{RideScore}+?{Mods|0})/5)+1]]}}        {{success=[[@{RideScore}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{RideSkill}}}"/></td>																																																	 				 				 				 					 					 					 					 					 					 					 
+							 <button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{RideScore}}} {{fumble=[[ceil(95+(@{RideScore}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{RideScore}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{RideScore}+?{Mods|0})/5)+1]]}}        {{success=[[@{RideScore}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{RideSkill}}}"/></td>																																																	 				 				 				 					 					 					 					 					 					 					 
 							 <!--<button type="roll" value="/roll 1d100<@{RideScore}" />-->
 
 				</fieldset>				 
@@ -900,7 +902,7 @@ <h3 class="sheet-skills-header">Skills</h3>
 						 <input type="checkbox" name="attr_ScienceSucess"  />
 						 <input type="text" name="attr_ScienceSkill" class="sheet-skillname"/>
 						 <input type="number" name="attr_ScienceScore" />
-					 <button type="roll" value="&{template:skillRoll} {{skillvalue=@{ScienceScore}}} {{fumble=[[ceil(95+(@{ScienceScore}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{ScienceScore}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{ScienceScore}+?{Mods|0})/5)+1]]}}         {{success=[[@{ScienceScore}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{ScienceSkill}}}"/></td>																																																	 				 				 				 					 					 					 
+					 <button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{ScienceScore}}} {{fumble=[[ceil(95+(@{ScienceScore}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{ScienceScore}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{ScienceScore}+?{Mods|0})/5)+1]]}}         {{success=[[@{ScienceScore}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{ScienceSkill}}}"/></td>																																																	 				 				 				 					 					 					 
 				</fieldset>	
 			
         </div><!-- col 2 close --> 
@@ -912,21 +914,21 @@ <h3 class="sheet-skills-header">Skills</h3>
 				<td><input type="checkbox" name="attr_Success-Sense"  /></td>
 				<td class="sheet-skillname">Sense (10%)</td>
 				<td><input type="number" name="attr_Sense"  /></td>
-				<td><button type="roll" value="&{template:skillRoll} {{skillvalue=@{Sense}}} {{fumble=[[ceil(95+(@{Sense}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Sense}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Sense}+?{Mods|0})/5)+1]]}}        {{success=[[@{Sense}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Sense}}"/></td>																																																																																					
+				<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{Sense}}} {{fumble=[[ceil(95+(@{Sense}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Sense}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Sense}+?{Mods|0})/5)+1]]}}        {{success=[[@{Sense}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Sense}}"/></td>																																																																																					
 				<!--<td><button type="roll" value="/roll 1d100<@{Sense}" /></td>-->
 			</tr>
 			<tr>
 				<td><input type="checkbox" name="attr_SleightofHandSuccess"  /></td>
 				<td class="sheet-skillname">Sleight of Hand (05%)</td>
 				<td><input type="number" name="attr_SleightofHandScore"  /></td>
-				<td><button type="roll" value="&{template:skillRoll} {{skillvalue=@{SleightofHandScore}}} {{fumble=[[ceil(95+(@{SleightofHandScore}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{SleightofHandScore}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{SleightofHandScore}+?{Mods|0})/5)+1]]}}        {{success=[[@{SleightofHandScore}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Sleight of Hand}}"/></td>																																								
+				<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{SleightofHandScore}}} {{fumble=[[ceil(95+(@{SleightofHandScore}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{SleightofHandScore}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{SleightofHandScore}+?{Mods|0})/5)+1]]}}        {{success=[[@{SleightofHandScore}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Sleight of Hand}}"/></td>																																								
 
 			</tr>
 			<tr>
 				<td><input type="checkbox" name="attr_Success-Spot"  /></td>
 				<td class="sheet-skillname">Spot (25%)</td>
 				<td><input type="number" name="attr_Spot"  /></td>
-				<td><button type="roll" value="&{template:skillRoll} {{skillvalue=@{Spot}}} {{fumble=[[ceil(95+(@{Spot}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Spot}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Spot}+?{Mods|0})/5)+1]]}}        {{success=[[@{Spot}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Spot}}"/></td>																																																																																										
+				<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{Spot}}} {{fumble=[[ceil(95+(@{Spot}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Spot}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Spot}+?{Mods|0})/5)+1]]}}        {{success=[[@{Spot}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Spot}}"/></td>																																																																																										
 				<!--<td><button type="roll" value="/roll 1d100<@{Spot}" /></td>-->
 			</tr>				
 			<tr>
@@ -934,27 +936,27 @@ <h3 class="sheet-skills-header">Skills</h3>
 				<td class="sheet-skillname">Status (05%)</td>
 				<td><input type="number" name="attr_Status"  /></td>
 				<!--<td><button type="roll" value="/roll 1d100<@{Status}" /></td>-->
-				<td><button type="roll" value="&{template:skillRoll} {{skillvalue=@{Status}}} {{fumble=[[ceil(95+(@{Status}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Status}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Status}+?{Mods|0})/5)+1]]}}        {{success=[[@{Status}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Status}}"/></td>																																			
+				<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{Status}}} {{fumble=[[ceil(95+(@{Status}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Status}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Status}+?{Mods|0})/5)+1]]}}        {{success=[[@{Status}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Status}}"/></td>																																			
 			</tr>
 			<tr>
 				<td><input type="checkbox" name="attr_Success-Stealth"  /></td>
 				<td class="sheet-skillname">Stealth (10%)</td>
 				<td><input type="number" name="attr_Stealth"  /></td>
-				<td><button type="roll" value="&{template:skillRoll} {{skillvalue=@{Stealth}}} {{fumble=[[ceil(95+(@{Stealth}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Stealth}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Stealth}+?{Mods|0})/5)+1]]}}     {{success=[[@{Stealth}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Stealth}}"/></td>																																																																																																																													
+				<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{Stealth}}} {{fumble=[[ceil(95+(@{Stealth}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Stealth}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Stealth}+?{Mods|0})/5)+1]]}}     {{success=[[@{Stealth}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Stealth}}"/></td>																																																																																																																													
 				<!--<td><button type="roll" value="/roll 1d100<@{Stealth}" /></td>-->
 			</tr>
 			<tr>
 				<td><input type="checkbox" name="attr_Success-Strategy"  /></td>
 				<td class="sheet-skillname">Strategy (01%)</td>
 				<td><input type="number" name="attr_Strategy"  /></td>
-				<td><button type="roll" value="&{template:skillRoll} {{skillvalue=@{Strategy}}} {{fumble=[[ceil(95+(@{Strategy}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Strategy}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Strategy}+?{Mods|0})/5)+1]]}}        {{success=[[@{Strategy}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Strategy}}"/></td>																																																												
+				<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{Strategy}}} {{fumble=[[ceil(95+(@{Strategy}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Strategy}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Strategy}+?{Mods|0})/5)+1]]}}        {{success=[[@{Strategy}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Strategy}}"/></td>																																																												
 				<!--<td><button type="roll" value="/roll 1d100<@{Strategy}" /></td>-->
 			</tr>		
 			<tr>
 				<td><input type="checkbox" name="attr_Success-Swim"  /></td>
 				<td class="sheet-skillname">Swim (25%)</td>
 				<td><input type="number" name="attr_Swim"  /></td>
-				<td><button type="roll" value="&{template:skillRoll} {{skillvalue=@{Swim}}} {{fumble=[[ceil(95+(@{Swim}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Swim}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Swim}+?{Mods|0})/5)+1]]}}        {{success=[[@{Swim}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Swim}}"/></td>																																																																																																																																		
+				<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{Swim}}} {{fumble=[[ceil(95+(@{Swim}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Swim}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Swim}+?{Mods|0})/5)+1]]}}        {{success=[[@{Swim}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Swim}}"/></td>																																																																																																																																		
 				<!--<td><button type="roll" value="/roll 1d100<@{Swim}" /></td>-->
 			</tr>	
 			<tr>
@@ -962,7 +964,7 @@ <h3 class="sheet-skills-header">Skills</h3>
 				<td class="sheet-skillname">Teach (10%)</td>
 				<td><input type="number" name="attr_Teach"  /></td>
 				<!--<td><button type="roll" value="/roll 1d100<@{Teach}" /></td>-->
-				<td><button type="roll" value="&{template:skillRoll} {{skillvalue=@{Teach}}} {{fumble=[[ceil(95+(@{Teach}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Teach}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Teach}+?{Mods|0})/5)+1]]}}          {{success=[[@{Teach}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Teach}}"/></td>																																								
+				<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{Teach}}} {{fumble=[[ceil(95+(@{Teach}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Teach}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Teach}+?{Mods|0})/5)+1]]}}          {{success=[[@{Teach}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Teach}}"/></td>																																								
 			</tr>	
 
 					<tr>
@@ -974,21 +976,21 @@ <h3 class="sheet-skills-header">Skills</h3>
 					 <input type="checkbox" name="attr_TechSucess"  />
 					 <input type="text" name="attr_TechSkill" class="sheet-skillname"/>
 					 <input type="number" name="attr_TechScore" />
-					 <button type="roll" value="&{template:skillRoll} {{skillvalue=@{TechScore}}} {{fumble=[[ceil(95+(@{TechScore}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{TechScore}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{TechScore}+?{Mods|0})/5)+1]]}}        {{success=[[@{TechScore}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{TechSkill}}}"/></td>																																																	 				 				 				 					 					 					 					 
+					 <button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{TechScore}}} {{fumble=[[ceil(95+(@{TechScore}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{TechScore}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{TechScore}+?{Mods|0})/5)+1]]}}        {{success=[[@{TechScore}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{TechSkill}}}"/></td>																																																	 				 				 				 					 					 					 					 
 			</fieldset>	
 			<table style="width: 100%;">		
 			<tr>
 				<td><input type="checkbox" name="attr_Success-Throw"  /></td>
 				<td class="sheet-skillname">Throw (25%)</td>
 				<td><input type="number" name="attr_throw"  /></td>
-				<td><button type="roll" value="&{template:skillRoll} {{skillvalue=@{throw}}} {{fumble=[[ceil(95+(@{throw}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{throw}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{throw}+?{Mods|0})/5)+1]]}}        {{success=[[@{throw}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Throw}}"/></td>																																																																																																																																							
+				<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{throw}}} {{fumble=[[ceil(95+(@{throw}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{throw}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{throw}+?{Mods|0})/5)+1]]}}        {{success=[[@{throw}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Throw}}"/></td>																																																																																																																																							
 				<!--<td><button type="roll" value="/roll 1d100<@{Throw}" /></td>-->
 			</tr>			
 			<tr>
 				<td><input type="checkbox" name="attr_Success-Track "  /></td>
 				<td class="sheet-skillname">Track (10%)</td>
 				<td><input type="number" name="attr_Track"  /></td>
-				<td><button type="roll" value="&{template:skillRoll} {{skillvalue=@{Track}}} {{fumble=[[ceil(95+(@{Track}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Track}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Track}+?{Mods|0})/5)+1]]}}        {{success=[[@{Track}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Track}}"/></td>																																																																																															
+				<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{Track}}} {{fumble=[[ceil(95+(@{Track}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Track}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Track}+?{Mods|0})/5)+1]]}}        {{success=[[@{Track}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Track}}"/></td>																																																																																															
 				<!--<td><button type="roll" value="/roll 1d100<@{Track}" /></td>-->
 			</tr>					
 			</table>		
@@ -1003,7 +1005,7 @@ <h3 class="sheet-skills-header">Skills</h3>
 					 <input type="checkbox" name="attr_OtherSucess"  />
 					 <input type="text" name="attr_OtherSkill" class="sheet-skillname"/>
 					 <input type="number" name="attr_OtherScore" />
-					 <button type="roll" value="&{template:skillRoll} {{skillvalue=@{OtherScore}}} {{fumble=[[ceil(95+(@{OtherScore}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{OtherScore}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{OtherScore}+?{Mods|0})/5)+1]]}}        {{success=[[@{OtherScore}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{OtherSkill}}}"/></td>
+					 <button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{OtherScore}}} {{fumble=[[ceil(95+(@{OtherScore}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{OtherScore}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{OtherScore}+?{Mods|0})/5)+1]]}}        {{success=[[@{OtherScore}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{OtherSkill}}}"/></td>
 			</fieldset>	
 			<br />
 				<table style="width: 100%;">					
@@ -1026,7 +1028,7 @@ <h3 class="sheet-skills-header">Skills</h3>
 							 <input type="checkbox" name="attr_meleeSucess"  />
 							 <input type="text" name="attr_meleeSkill" class="sheet-skillname"/>
 							 <input type="number" name="attr_meleeScore" />
-							 <button type="roll" value="&{template:skillRoll} {{skillvalue=@{meleeScore}}} {{fumble=[[ceil(95+(@{meleeScore}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{meleeScore}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{meleeScore}+?{Mods|0})/5)+1]]}}        {{success=[[@{meleeScore}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{meleeSkill}}}"/></td>
+							 <button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{meleeScore}}} {{fumble=[[ceil(95+(@{meleeScore}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{meleeScore}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{meleeScore}+?{Mods|0})/5)+1]]}}        {{success=[[@{meleeScore}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{meleeSkill}}}"/></td>
 				</fieldset>				
 
 				<table style="width: 100%;">
@@ -1042,7 +1044,7 @@ <h3 class="sheet-skills-header">Skills</h3>
 							 <input type="checkbox" name="attr_rangedSucess"  />
 							 <input type="text" name="attr_rangedSkill" class="sheet-skillname"/>
 							 <input type="number" name="attr_rangedScore" />
-							 <button type="roll" value="&{template:skillRoll} {{skillvalue=@{rangedScore}}} {{fumble=[[ceil(95+(@{rangedScore}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{rangedScore}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{rangedScore}+?{Mods|0})/5)+1]]}}         {{success=[[@{rangedScore}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{rangedSkill}}}"/></td>																																																	 				 				 				 					 					 					 					 					 					 					 
+							 <button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{rangedScore}}} {{fumble=[[ceil(95+(@{rangedScore}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{rangedScore}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{rangedScore}+?{Mods|0})/5)+1]]}}         {{success=[[@{rangedScore}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{rangedSkill}}}"/></td>																																																	 				 				 				 					 					 					 					 					 					 					 
 							 <!--<button type="roll" value="/roll 1d100<@{RideScore}" />-->
 
 				</fieldset>				
@@ -1074,9 +1076,9 @@ <h3 class="sheet-skills-header">Skills</h3>
                     <td class="sheet-skillname">Bargain (05%)</td>
                     <td><input type="number" name="attr_Bargain"  /></td>
                     <!-- <td><button type="roll" value="/roll 1d100<@{Bargain}" /></td> -->
-					<!--<td><button type="roll" value="&{template:skillRoll} {{skillvalue=@{Bargain}}}{{success=[[@{Bargain}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Bargain}}"/></td>-->
-					<!-- <td><button type="roll" value="&{template:skillRoll} {{special=[[ floor((@{Bargain}+@{Communication})/5)]]}}  {{crit=[[ floor((@{Bargain}+@{Communication})/20)]]}} {{success=[[@{Bargain}+@{Communication}]]}} {{skillvalue=@{Bargain}}}  {{roll=[[1d100]]}} {{skillname=Bargain}}"/></td> -->	 
-					<td><button type="roll" value="&{template:skillRoll} {{success=[[@{Bargain}+?{Mods|0}]]}} {{fumble=[[ceil(95+(@{Bargain}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Bargain}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Bargain}+?{Mods|0})/5)+1]]}}  {{skillvalue=@{Bargain}}}  {{roll=[[1d100]]}} {{skillname=Bargain}}"/></td> 
+					<!--<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{Bargain}}}{{success=[[@{Bargain}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Bargain}}"/></td>-->
+					<!-- <td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{special=[[ floor((@{Bargain}+@{Communication})/5)]]}}  {{crit=[[ floor((@{Bargain}+@{Communication})/20)]]}} {{success=[[@{Bargain}+@{Communication}]]}} {{skillvalue=@{Bargain}}}  {{roll=[[1d100]]}} {{skillname=Bargain}}"/></td> -->	 
+					<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{success=[[@{Bargain}+?{Mods|0}]]}} {{fumble=[[ceil(95+(@{Bargain}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Bargain}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Bargain}+?{Mods|0})/5)+1]]}}  {{skillvalue=@{Bargain}}}  {{roll=[[1d100]]}} {{skillname=Bargain}}"/></td> 
 					<!-- {{crit=[[ floor((@{Bargain}+@{Communication})/20)]]}}  -->
 					
 					
@@ -1086,28 +1088,28 @@ <h3 class="sheet-skills-header">Skills</h3>
                     <td class="sheet-skillname">Command (05)</td>
                     <td><input type="number" name="attr_Command"  /></td>
                     <!--<td><button type="roll" value="/roll 1d100<@{Command}" /></td>-->
-					<td><button type="roll" value="&{template:skillRoll} {{skillvalue=@{Command}}} {{fumble=[[ceil(95+(@{Command}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Command}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Command}+?{Mods|0})/5)+1]]}}  {{success=[[@{Command}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Command}}"/></td>											
+					<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{Command}}} {{fumble=[[ceil(95+(@{Command}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Command}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Command}+?{Mods|0})/5)+1]]}}  {{success=[[@{Command}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Command}}"/></td>											
                 </tr>
                 <tr>
                     <td><input type="checkbox" name="attr_Success-Disguise"  /></td>
                     <td class="sheet-skillname">Disguise (01)</td>
                     <td><input type="number" name="attr_Disguise"  /></td>
                     <!--<td><button type="roll" value="/roll 1d100<@{Disguise}" /></td>-->
-					<td><button type="roll" value="&{template:skillRoll} {{skillvalue=@{Disguise}}} {{fumble=[[ceil(95+(@{Disguise}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Disguise}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Disguise}+?{Mods|0})/5)+1]]}}    {{success=[[@{Disguise}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Disguise}}"/></td>										
+					<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{Disguise}}} {{fumble=[[ceil(95+(@{Disguise}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Disguise}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Disguise}+?{Mods|0})/5)+1]]}}    {{success=[[@{Disguise}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Disguise}}"/></td>										
                 </tr>
                 <tr>
                     <td><input type="checkbox" name="attr_Success-Etiquette"  /></td>
                     <td class="sheet-skillname">Etiquette (05)</td>
                     <td><input type="number" name="attr_Etiquette"  /></td>
                     <!--<td><button type="roll" value="/roll 1d100<@{Etiquette}" /></td>-->
-					<td><button type="roll" value="&{template:skillRoll} {{skillvalue=@{Etiquette}}}  {{fumble=[[ceil(95+(@{Etiquette}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Etiquette}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Etiquette}+?{Mods|0})/5)+1]]}}         {{success=[[@{Etiquette}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Etiquette}}"/></td>															
+					<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{Etiquette}}}  {{fumble=[[ceil(95+(@{Etiquette}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Etiquette}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Etiquette}+?{Mods|0})/5)+1]]}}         {{success=[[@{Etiquette}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Etiquette}}"/></td>															
                 </tr>
                 <tr>
                     <td><input type="checkbox" name="attr_Success-ownLang"  /></td>
                     <td class="sheet-skillname">Language, Own (INT/EDUx5%)</td>
                     <td><input type="number" name="attr_ownLang"  /></td>
                     <!--<td><button type="roll" value="/roll 1d100<@{ownLang}" /></td>-->
-					<td><button type="roll" value="&{template:skillRoll} {{skillvalue=@{ownLang}}}  {{fumble=[[ceil(95+(@{ownLang}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{ownLang}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{ownLang}+?{Mods|0})/5)+1]]}}        {{success=[[@{ownLang}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Own Language}}"/></td>																				
+					<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{ownLang}}}  {{fumble=[[ceil(95+(@{ownLang}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{ownLang}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{ownLang}+?{Mods|0})/5)+1]]}}        {{success=[[@{ownLang}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Own Language}}"/></td>																				
                 </tr>
 		    </table>
 			
@@ -1115,7 +1117,7 @@ <h3 class="sheet-skills-header">Skills</h3>
 					 <input type="checkbox" name="attr_LangSuccess"  />
 					 <input type="text" name="attr_LangSkillname" class="sheet-repeat-skillname" />
 					 <input type="number" name="attr_LangScore" /></td>
-				 	 <button type="roll" value="&{template:skillRoll} {{skillvalue=@{LangScore}}} {{fumble=[[ceil(95+(@{LangScore}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{LangScore}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{LangScore}+?{Mods|0})/5)+1]]}}         {{success=[[@{LangScore}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{LangSkillname}}}"/>
+				 	 <button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{LangScore}}} {{fumble=[[ceil(95+(@{LangScore}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{LangScore}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{LangScore}+?{Mods|0})/5)+1]]}}         {{success=[[@{LangScore}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{LangSkillname}}}"/>
 			</fieldset>
 			</table>			
 			<table style="width:100%;">	
@@ -1124,28 +1126,28 @@ <h3 class="sheet-skills-header">Skills</h3>
                     <td class="sheet-skillname">Perform (05%)</td>
                     <td><input type="number" name="attr_Perform"  /></td>
                     <!--<td><button type="roll" value="/roll 1d100<@{Perform}" /></td>-->
-					<td><button type="roll" value="&{template:skillRoll} {{skillvalue=@{Perform}}} {{fumble=[[ceil(95+(@{Perform}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Perform}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Perform}+?{Mods|0})/5)+1]]}}        {{success=[[@{Perform}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Perform}}"/></td>																									
+					<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{Perform}}} {{fumble=[[ceil(95+(@{Perform}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Perform}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Perform}+?{Mods|0})/5)+1]]}}        {{success=[[@{Perform}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Perform}}"/></td>																									
                 </tr>				
                 <tr>
                     <td><input type="checkbox" name="attr_Success-Persuade"  /></td>
                     <td class="sheet-skillname">Persuade (15%)</td>
                     <td><input type="number" name="attr_Persuade"  /></td>
                     <!--<td><button type="roll" value="/roll 1d100<@{Persuade}" /></td>-->
-					<td><button type="roll" value="&{template:skillRoll} {{skillvalue=@{Persuade}}} {{fumble=[[ceil(95+(@{Persuade}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Persuade}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Etiquette}+?{Mods|0})/5)+1]]}}       {{success=[[@{Persuade}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Persuade}}"/></td>																														
+					<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{Persuade}}} {{fumble=[[ceil(95+(@{Persuade}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Persuade}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Etiquette}+?{Mods|0})/5)+1]]}}       {{success=[[@{Persuade}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Persuade}}"/></td>																														
                 </tr>
                 <tr>
                     <td><input type="checkbox" name="attr_Success-Status"  /></td>
                     <td class="sheet-skillname">Status (05%)</td>
                     <td><input type="number" name="attr_Status"  /></td>
                     <!--<td><button type="roll" value="/roll 1d100<@{Status}" /></td>-->
-					<td><button type="roll" value="&{template:skillRoll} {{skillvalue=@{Status}}} {{fumble=[[ceil(95+(@{Status}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Status}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Status}+?{Mods|0})/5)+1]]}}        {{success=[[@{Status}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Status}}"/></td>																																			
+					<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{Status}}} {{fumble=[[ceil(95+(@{Status}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Status}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Status}+?{Mods|0})/5)+1]]}}        {{success=[[@{Status}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Status}}"/></td>																																			
                 </tr>
                 <tr>
                     <td><input type="checkbox" name="attr_Success-Teach"  /></td>
                     <td class="sheet-skillname">Teach (10%)</td>
                     <td><input type="number" name="attr_Teach"  /></td>
                     <!--<td><button type="roll" value="/roll 1d100<@{Teach}" /></td>-->
-					<td><button type="roll" value="&{template:skillRoll} {{skillvalue=@{Teach}}} {{fumble=[[ceil(95+(@{Teach}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Teach}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Teach}+?{Mods|0})/5)+1]]}}          {{success=[[@{Teach}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Teach}}"/></td>																																								
+					<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{Teach}}} {{fumble=[[ceil(95+(@{Teach}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Teach}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Teach}+?{Mods|0})/5)+1]]}}          {{success=[[@{Teach}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Teach}}"/></td>																																								
                 </tr>				
 				
 				
@@ -1162,7 +1164,7 @@ <h3 class="sheet-skills-header">Skills</h3>
 				 <td><input type="text" name="attr_ComSkillname" class="sheet-skillname" /></td> 
 				 <td><input type="number" name="attr_ComScore" /></td>
 				 <!--<button type="roll" value="/roll 1d100<@{ComScore}" />-->
-				<td><button type="roll" value="&{template:skillRoll} {{skillvalue=@{ComScore}}} {{fumble=[[ceil(95+(@{ComScore}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{ComScore}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{ComScore}+?{Mods|0})/5)+1]]}}         {{success=[[@{ComScore}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{ComSkillname}}}"/></td>
+				<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{ComScore}}} {{fumble=[[ceil(95+(@{ComScore}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{ComScore}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{ComScore}+?{Mods|0})/5)+1]]}}         {{success=[[@{ComScore}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{ComSkillname}}}"/></td>
 			</tr>		
 			</table>			
 		</fieldset>
@@ -1191,7 +1193,7 @@ <h3 class="sheet-skills-header">Skills</h3>
 				<!--<input  type="text" name="attr_artSkillname" class="sheet-skillname" />-->
 				<td><input  type="text" name="attr_artSkillname" class="sheet-skillname" /></td>
 				<td><input type="number" name="attr_artScore" /></td>
-			   <td><button type="roll" value="&{template:skillRoll} {{skillvalue=@{artScore}}} {{fumble=[[ceil(95+(@{artScore}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{artScore}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{artScore}+?{Mods|0})/5)+1]]}}          {{success=[[@{artScore}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{artSkillname}}}"/></td>
+			   <td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{artScore}}} {{fumble=[[ceil(95+(@{artScore}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{artScore}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{artScore}+?{Mods|0})/5)+1]]}}          {{success=[[@{artScore}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{artSkillname}}}"/></td>
 			   </tr>
 			</table>
 		</fieldset>			
@@ -1210,7 +1212,7 @@ <h3 class="sheet-skills-header">Skills</h3>
 				 <input type="checkbox" name="attr_craftSuccess"  />
 				 <input type="text" name="attr_craftSkillname" class="sheet-skillname"/>
 				 <input type="number" name="attr_craftScore" />
-				 <td><button type="roll" value="&{template:skillRoll} {{skillvalue=@{craftScore}}} {{fumble=[[ceil(95+(@{craftScore}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{craftScore}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{craftScore}+?{Mods|0})/5)+1]]}}        {{success=[[@{craftScore}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{craftSkillname}}}"/></td>																																																	 				 
+				 <td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{craftScore}}} {{fumble=[[ceil(95+(@{craftScore}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{craftScore}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{craftScore}+?{Mods|0})/5)+1]]}}        {{success=[[@{craftScore}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{craftSkillname}}}"/></td>																																																	 				 
 				 <!--<button type="roll" value="/roll 1d100<@{craftScore}" />-->
 
 		</fieldset>				
@@ -1221,14 +1223,14 @@ <h3 class="sheet-skills-header">Skills</h3>
                     <td><input type="checkbox" name="attr_Success-Demolition"  /></td>
                     <td class="sheet-skillname">Demolition (01%)</td>
                     <td><input type="number" name="attr_Demolition"  /></td>
-					<td><button type="roll" value="&{template:skillRoll} {{skillvalue=@{Demolition}}} {{fumble=[[ceil(95+(@{Demolition}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Demolition}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Demolition}+?{Mods|0})/5)+1]]}}         {{success=[[@{Demolition}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Demolition}}"/></td>																																			
+					<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{Demolition}}} {{fumble=[[ceil(95+(@{Demolition}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Demolition}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Demolition}+?{Mods|0})/5)+1]]}}         {{success=[[@{Demolition}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Demolition}}"/></td>																																			
                     <!--<td><button type="roll" value="/roll 1d100<@{Demolition}" /></td>-->					
                 </tr>
                 <tr>
                     <td><input type="checkbox" name="attr_Success-FineManipulation" /></td>
                     <td class="sheet-skillname">Fine Manipulation (05%)</td>
                     <td><input type="number" name="attr_FineManipulation" /></td>
-					<td><button type="roll" value="&{template:skillRoll} {{skillvalue=@{FineManipulation}}}  {{fumble=[[ceil(95+(@{FineManipulation}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{FineManipulation}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{FineManipulation}+?{Mods|0})/5)+1]]}}        {{success=[[@{FineManipulation}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Fine Manip.}}"/></td>
+					<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{FineManipulation}}}  {{fumble=[[ceil(95+(@{FineManipulation}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{FineManipulation}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{FineManipulation}+?{Mods|0})/5)+1]]}}        {{success=[[@{FineManipulation}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Fine Manip.}}"/></td>
                     <!--<td><button type="roll" value="/roll 1d100<@{FineManipulation}" /></td>-->
                 </tr>
 			</table>
@@ -1247,7 +1249,7 @@ <h3 class="sheet-skills-header">Skills</h3>
 				 <input type="checkbox" name="attr_hMachineSuccess"  />
 				 <input type="text" name="attr_hMachineSkills" class="sheet-skillname"/>
 				 <input type="number" name="attr_hMachineScore" />
-				 <td><button type="roll" value="&{template:skillRoll} {{skillvalue=@{hMachineScore}}} {{fumble=[[ceil(95+(@{hMachineScore}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{hMachineScore}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{hMachineScore}+?{Mods|0})/5)+1]]}}         {{success=[[@{hMachineScore}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{hMachineSkills}}}"/></td>																																																	 				 				 
+				 <td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{hMachineScore}}} {{fumble=[[ceil(95+(@{hMachineScore}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{hMachineScore}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{hMachineScore}+?{Mods|0})/5)+1]]}}         {{success=[[@{hMachineScore}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{hMachineSkills}}}"/></td>																																																	 				 				 
 				 <!--<button type="roll" value="/roll 1d100<@{hMachineScore}" />-->
 
 		</fieldset>				
@@ -1266,7 +1268,7 @@ <h3 class="sheet-skills-header">Skills</h3>
 				 <input type="checkbox" name="attr_repairSuccess"  />
 				 <input type="text" name="attr_repairSkills" class="sheet-skillname"/>
 				 <input type="number" name="attr_repairScore" />
-				 <td><button type="roll" value="&{template:skillRoll} {{skillvalue=@{repairScore}}} {{fumble=[[ceil(95+(@{repairScore}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{repairScore}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{repairScore}+?{Mods|0})/5)+1]]}}        {{success=[[@{repairScore}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{repairSkills}}}"/></td>																																																	 				 				 				 
+				 <td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{repairScore}}} {{fumble=[[ceil(95+(@{repairScore}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{repairScore}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{repairScore}+?{Mods|0})/5)+1]]}}        {{success=[[@{repairScore}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{repairSkills}}}"/></td>																																																	 				 				 				 
 				 <!--<button type="roll" value="/roll 1d100<@{repairScore" />-->
 
 		</fieldset>				
@@ -1278,8 +1280,8 @@ <h3 class="sheet-skills-header">Skills</h3>
                     <td><input type="checkbox" name="attr_SleightofHandSuccess"  /></td>
                     <td class="sheet-skillname">Sleight of Hand (05%)</td>
                     <td><input type="number" name="attr_SleightofHandScore"  /></td>
-					<td><button type="roll" value="&{template:skillRoll} {{skillvalue=@{SleightofHandScore}}} {{fumble=[[ceil(95+(@{SleightofHandScore}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{SleightofHandScore}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{SleightofHandScore}+?{Mods|0})/5)+1]]}}        {{success=[[@{SleightofHandScore}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Sleight of Hand}}"/></td>																																								
-					<!--<td><button type="roll" value="&{template:skillRoll} {{skillvalue=@{Demolition}}}{{success=[[@{Demolition}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Demolition}}"/></td>																																								-->
+					<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{SleightofHandScore}}} {{fumble=[[ceil(95+(@{SleightofHandScore}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{SleightofHandScore}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{SleightofHandScore}+?{Mods|0})/5)+1]]}}        {{success=[[@{SleightofHandScore}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Sleight of Hand}}"/></td>																																								
+					<!--<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{Demolition}}}{{success=[[@{Demolition}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Demolition}}"/></td>																																								-->
                     <!--<td><button type="roll" value="/roll 1d100<@{SleightofHandScore}" /></td>-->
                 </tr>
 			
@@ -1296,7 +1298,7 @@ <h3 class="sheet-skills-header">Skills</h3>
 				 <td><input type="text" name="attr_manipSkillname" class="sheet-skillname" /></td> 
 				 <td><input type="number" name="attr_manipScore" /></td>
 				 <!--<button type="roll" value="/roll 1d100<@{ComScore}" />-->
-				<td><button type="roll" value="&{template:skillRoll} {{skillvalue=@{manipScore}}} {{fumble=[[ceil(95+(@{manipScore}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{manipScore}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{manipScore}+?{Mods|0})/5)+1]]}}         {{success=[[@{manipScore}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{manipSkillname}}}"/></td>
+				<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{manipScore}}} {{fumble=[[ceil(95+(@{manipScore}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{manipScore}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{manipScore}+?{Mods|0})/5)+1]]}}         {{success=[[@{manipScore}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{manipSkillname}}}"/></td>
 			</tr>		
 			</table>			
 		</fieldset>			
@@ -1314,21 +1316,21 @@ <h3 class="sheet-skills-header">Skills</h3>
                     <td><input type="checkbox" name="attr_Success-Appraise"  /></td>
                     <td class="sheet-skillname">Appraise (15%)</td>
                     <td><input type="number" name="attr_Appraise"  /></td>
-					<td><button type="roll" value="&{template:skillRoll} {{skillvalue=@{Appraise}}} {{fumble=[[ceil(95+(@{Appraise}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Appraise}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Appraise}+?{Mods|0})/5)+1]]}}         {{success=[[@{Appraise}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Appraise}}"/></td>																																								
+					<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{Appraise}}} {{fumble=[[ceil(95+(@{Appraise}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Appraise}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Appraise}+?{Mods|0})/5)+1]]}}         {{success=[[@{Appraise}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Appraise}}"/></td>																																								
                     <!--<td><button type="roll" value="/roll 1d100<@{Appraise}" /></td>-->
                 </tr>
                 <tr>
                     <td><input type="checkbox" name="attr_Success-FirstAid"  /></td>
                     <td class="sheet-skillname">First Aid (30%) or INT x1</td>
                     <td><input type="number" name="attr_FirstAid"  /></td>
-					<td><button type="roll" value="&{template:skillRoll} {{skillvalue=@{FirstAid}}} {{fumble=[[ceil(95+(@{FirstAid}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{FirstAid}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{FirstAid}+?{Mods|0})/5)+1]]}}       {{success=[[@{FirstAid}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=First Aid}}"/></td>																																													
+					<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{FirstAid}}} {{fumble=[[ceil(95+(@{FirstAid}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{FirstAid}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{FirstAid}+?{Mods|0})/5)+1]]}}       {{success=[[@{FirstAid}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=First Aid}}"/></td>																																													
                     <!--<td><button type="roll" value="/roll 1d100<@{FirstAid}" /></td>-->
                 </tr>
                 <tr>
                     <td><input type="checkbox" name="attr_Success-Gaming"  /></td>
                     <td class="sheet-skillname">Gaming (INT+POW)</td>
                     <td><input type="number" name="attr_Gaming"  /></td>
-					<td><button type="roll" value="&{template:skillRoll} {{skillvalue=@{Gaming}}} {{fumble=[[ceil(95+(@{Gaming}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Gaming}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Gaming}+?{Mods|0})/5)+1]]}}        {{success=[[@{Gaming}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Gaming}}"/></td>																																																		
+					<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{Gaming}}} {{fumble=[[ceil(95+(@{Gaming}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Gaming}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Gaming}+?{Mods|0})/5)+1]]}}        {{success=[[@{Gaming}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Gaming}}"/></td>																																																		
                     <!--<td><button type="roll" value="/roll 1d100<@{Gaming}" /></td>-->
                 </tr>
 				
@@ -1347,7 +1349,7 @@ <h3 class="sheet-skills-header">Skills</h3>
 					 <input type="checkbox" name="attr_KnowSucess"  />
 					 <input type="text" name="attr_KnowSkills" class="sheet-skillname"/>
 					 <input type="number" name="attr_KnowScore" />
-					 <button type="roll" value="&{template:skillRoll} {{skillvalue=@{KnowScore}}} {{fumble=[[ceil(95+(@{KnowScore}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{KnowScore}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{KnowScore}+?{Mods|0})/5)+1]]}}         {{success=[[@{KnowScore}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{KnowSkills}}}"/></td>																																																	 				 				 				 					 
+					 <button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{KnowScore}}} {{fumble=[[ceil(95+(@{KnowScore}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{KnowScore}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{KnowScore}+?{Mods|0})/5)+1]]}}         {{success=[[@{KnowScore}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{KnowSkills}}}"/></td>																																																	 				 				 				 					 
 					 <!--<button type="roll" value="/roll 1d100<@{KnowScore}" />-->
 
 			</fieldset>				
@@ -1366,7 +1368,7 @@ <h3 class="sheet-skills-header">Skills</h3>
 					 <input type="checkbox" name="attr_LitSucess"  />
 					 <input type="text" name="attr_LitSkill" class="sheet-skillname"/>
 					 <input type="number" name="attr_LitScore" />
-					 <button type="roll" value="&{template:skillRoll} {{skillvalue=@{LitScore}}} {{fumble=[[ceil(95+(@{LitScore}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{LitScore}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{LitScore}+?{Mods|0})/5)+1]]}}        {{success=[[@{LitScore}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{LitSkill}}}"/></td>																																																	 				 				 				 					 					 
+					 <button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{LitScore}}} {{fumble=[[ceil(95+(@{LitScore}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{LitScore}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{LitScore}+?{Mods|0})/5)+1]]}}        {{success=[[@{LitScore}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{LitSkill}}}"/></td>																																																	 				 				 				 					 					 
 					 <!--<button type="roll" value="/roll 1d100<@{LitScore}" />-->
 
 			</fieldset>				
@@ -1379,7 +1381,7 @@ <h3 class="sheet-skills-header">Skills</h3>
                     <td><input type="checkbox" name="attr_Success-Medicine"  /></td>
                     <td class="sheet-skillname">Medicine (05%)</td>
                     <td><input type="number" name="attr_Medicine"  /></td>
-					<td><button type="roll" value="&{template:skillRoll} {{skillvalue=@{Medicine}}} {{fumble=[[ceil(95+(@{Medicine}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Medicine}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Medicine}+?{Mods|0})/5)+1]]}}        {{success=[[@{Medicine}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Medicine}}"/></td>																																																							
+					<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{Medicine}}} {{fumble=[[ceil(95+(@{Medicine}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Medicine}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Medicine}+?{Mods|0})/5)+1]]}}        {{success=[[@{Medicine}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Medicine}}"/></td>																																																							
                     <!--<td><button type="roll" value="/roll 1d100<@{Medicine}" /></td>-->
                 </tr>
 			</table>
@@ -1397,7 +1399,7 @@ <h3 class="sheet-skills-header">Skills</h3>
 					 <input type="checkbox" name="attr_ScienceSucess"  />
 					 <input type="text" name="attr_ScienceSkill" class="sheet-skillname"/>
 					 <input type="number" name="attr_ScienceScore" />
-					 <button type="roll" value="&{template:skillRoll} {{skillvalue=@{ScienceScore}}} {{fumble=[[ceil(95+(@{ScienceScore}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{ScienceScore}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{ScienceScore}+?{Mods|0})/5)+1]]}}         {{success=[[@{ScienceScore}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{ScienceSkill}}}"/></td>																																																	 				 				 				 					 					 					 
+					 <button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{ScienceScore}}} {{fumble=[[ceil(95+(@{ScienceScore}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{ScienceScore}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{ScienceScore}+?{Mods|0})/5)+1]]}}         {{success=[[@{ScienceScore}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{ScienceSkill}}}"/></td>																																																	 				 				 				 					 					 					 
 					 <!--<button type="roll" value="/roll 1d100<@{ScienceScore}" />-->
 
 			</fieldset>				
@@ -1408,7 +1410,7 @@ <h3 class="sheet-skills-header">Skills</h3>
                     <td><input type="checkbox" name="attr_Success-Strategy"  /></td>
                     <td class="sheet-skillname">Strategy (01%)</td>
                     <td><input type="number" name="attr_Strategy"  /></td>
-					<td><button type="roll" value="&{template:skillRoll} {{skillvalue=@{Strategy}}} {{fumble=[[ceil(95+(@{Strategy}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Strategy}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Strategy}+?{Mods|0})/5)+1]]}}        {{success=[[@{Strategy}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Strategy}}"/></td>																																																												
+					<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{Strategy}}} {{fumble=[[ceil(95+(@{Strategy}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Strategy}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Strategy}+?{Mods|0})/5)+1]]}}        {{success=[[@{Strategy}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Strategy}}"/></td>																																																												
                     <!--<td><button type="roll" value="/roll 1d100<@{Strategy}" /></td>-->
                 </tr>
 			</table>	
@@ -1426,7 +1428,7 @@ <h3 class="sheet-skills-header">Skills</h3>
 					 <input type="checkbox" name="attr_TechSucess"  />
 					 <input type="text" name="attr_TechSkill" class="sheet-skillname"/>
 					 <input type="number" name="attr_TechScore" />
-					 <button type="roll" value="&{template:skillRoll} {{skillvalue=@{TechScore}}} {{fumble=[[ceil(95+(@{TechScore}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{TechScore}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{TechScore}+?{Mods|0})/5)+1]]}}        {{success=[[@{TechScore}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{TechSkill}}}"/></td>																																																	 				 				 				 					 					 					 					 
+					 <button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{TechScore}}} {{fumble=[[ceil(95+(@{TechScore}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{TechScore}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{TechScore}+?{Mods|0})/5)+1]]}}        {{success=[[@{TechScore}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{TechSkill}}}"/></td>																																																	 				 				 				 					 					 					 					 
 					 <!--<button type="roll" value="/roll 1d100<@{TechScore}" />-->
 
 			</fieldset>	
@@ -1445,42 +1447,42 @@ <h3 class="sheet-skills-header">Skills</h3>
                     <td><input type="checkbox" name="attr_Success-Insight"  /></td>
                     <td class="sheet-skillname">Insight (05%)</td>
                     <td><input type="number" name="attr_Insight"  /></td>
-					<td><button type="roll" value="&{template:skillRoll} {{skillvalue=@{Insight}}} {{fumble=[[ceil(95+(@{Insight}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Insight}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Insight}+?{Mods|0})/5)+1]]}}        {{success=[[@{Insight}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Insight}}"/></td>																																																																						
+					<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{Insight}}} {{fumble=[[ceil(95+(@{Insight}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Insight}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Insight}+?{Mods|0})/5)+1]]}}        {{success=[[@{Insight}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Insight}}"/></td>																																																																						
                     <!--<td><button type="roll" value="/roll 1d100<@{Insight}" /></td>-->
                 </tr>
                 <tr>
                     <td><input type="checkbox" name="attr_Success-Listen"  /></td>
                     <td class="sheet-skillname">Listen (25%)</td>
                     <td><input type="number" name="attr_Listen"  /></td>
-					<td><button type="roll" value="&{template:skillRoll} {{skillvalue=@{Listen}}} {{fumble=[[ceil(95+(@{Listen}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Listen}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Listen}+?{Mods|0})/5)+1]]}}   {{success=[[@{Listen}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Listen}}"/></td>																																																																											
+					<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{Listen}}} {{fumble=[[ceil(95+(@{Listen}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Listen}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Listen}+?{Mods|0})/5)+1]]}}   {{success=[[@{Listen}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Listen}}"/></td>																																																																											
                     <!--<td><button type="roll" value="/roll 1d100<@{Listen}" /></td>-->
                 </tr>
                 <tr>
                     <td><input type="checkbox" name="attr_Success-Navigate"  /></td>
                     <td class="sheet-skillname">Navigate (10%)</td>
                     <td><input type="number" name="attr_Navigate"  /></td>
-					<td><button type="roll" value="&{template:skillRoll} {{skillvalue=@{Navigate}}} {{fumble=[[ceil(95+(@{Navigate}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Navigate}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Navigate}+?{Mods|0})/5)+1]]}}        {{success=[[@{Navigate}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Navigate}}"/></td>																																																																																
+					<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{Navigate}}} {{fumble=[[ceil(95+(@{Navigate}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Navigate}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Navigate}+?{Mods|0})/5)+1]]}}        {{success=[[@{Navigate}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Navigate}}"/></td>																																																																																
                     <!--<td><button type="roll" value="/roll 1d100<@{Navigate}" /></td>-->
                 </tr>
                 <tr>
                     <td><input type="checkbox" name="attr_Success-Sense"  /></td>
                     <td class="sheet-skillname">Sense (10%)</td>
                     <td><input type="number" name="attr_Sense"  /></td>
-					<td><button type="roll" value="&{template:skillRoll} {{skillvalue=@{Sense}}} {{fumble=[[ceil(95+(@{Sense}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Sense}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Sense}+?{Mods|0})/5)+1]]}}        {{success=[[@{Sense}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Sense}}"/></td>																																																																																					
+					<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{Sense}}} {{fumble=[[ceil(95+(@{Sense}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Sense}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Sense}+?{Mods|0})/5)+1]]}}        {{success=[[@{Sense}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Sense}}"/></td>																																																																																					
                     <!--<td><button type="roll" value="/roll 1d100<@{Sense}" /></td>-->
                 </tr>
                 <tr>
                     <td><input type="checkbox" name="attr_Success-Spot"  /></td>
                     <td class="sheet-skillname">Spot (25%)</td>
                     <td><input type="number" name="attr_Spot"  /></td>
-					<td><button type="roll" value="&{template:skillRoll} {{skillvalue=@{Spot}}} {{fumble=[[ceil(95+(@{Spot}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Spot}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Spot}+?{Mods|0})/5)+1]]}}        {{success=[[@{Spot}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Spot}}"/></td>																																																																																										
+					<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{Spot}}} {{fumble=[[ceil(95+(@{Spot}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Spot}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Spot}+?{Mods|0})/5)+1]]}}        {{success=[[@{Spot}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Spot}}"/></td>																																																																																										
                     <!--<td><button type="roll" value="/roll 1d100<@{Spot}" /></td>-->
                 </tr>				
                 <tr>
                     <td><input type="checkbox" name="attr_Success-Track "  /></td>
                     <td class="sheet-skillname">Track (10%)</td>
                     <td><input type="number" name="attr_Track"  /></td>
-					<td><button type="roll" value="&{template:skillRoll} {{skillvalue=@{Track}}} {{fumble=[[ceil(95+(@{Track}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Track}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Track}+?{Mods|0})/5)+1]]}}        {{success=[[@{Track}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Track}}"/></td>																																																																																															
+					<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{Track}}} {{fumble=[[ceil(95+(@{Track}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Track}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Track}+?{Mods|0})/5)+1]]}}        {{success=[[@{Track}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Track}}"/></td>																																																																																															
                     <!--<td><button type="roll" value="/roll 1d100<@{Track}" /></td>-->
                 </tr>					
 				
@@ -1493,7 +1495,7 @@ <h3 class="sheet-skills-header">Skills</h3>
 					 <input type="checkbox" name="attr_PercepSucess"  />
 					 <input type="text" name="attr_PercepSkill" class="sheet-skillname"/>
 					 <input type="number" name="attr_PercepScore" />
-					 <button type="roll" value="&{template:skillRoll} {{skillvalue=@{PercepScore}}} {{fumble=[[ceil(95+(@{PercepScore}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{PercepScore}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{PercepScore}+?{Mods|0})/5)+1]]}}        {{success=[[@{PercepScore}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{PercepSkill}}}"/></td>																																																	 				 				 				 					 					 					 					 
+					 <button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{PercepScore}}} {{fumble=[[ceil(95+(@{PercepScore}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{PercepScore}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{PercepScore}+?{Mods|0})/5)+1]]}}        {{success=[[@{PercepScore}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{PercepSkill}}}"/></td>																																																	 				 				 				 					 					 					 					 
 					 <!--<button type="roll" value="/roll 1d100<@{TechScore}" />-->
 
 			</fieldset>	
@@ -1509,7 +1511,7 @@ <h3 class="sheet-skills-header">Skills</h3>
                     <td><input type="checkbox" name="attr_Success-Climb"  /></td>
                     <td class="sheet-skillname">Climb (40%)</td>
                     <td><input type="number" name="attr_Climb"  /></td>
-					<td><button type="roll" value="&{template:skillRoll} {{skillvalue=@{Climb}}} {{fumble=[[ceil(95+(@{Climb}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Climb}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Climb}+?{Mods|0})/5)+1]]}}       {{success=[[@{Climb}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Climb}}"/></td>
+					<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{Climb}}} {{fumble=[[ceil(95+(@{Climb}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Climb}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Climb}+?{Mods|0})/5)+1]]}}       {{success=[[@{Climb}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Climb}}"/></td>
 
 
                     <!--<td><button type="roll" value="/roll 1d100<@{Climb}" /></td>-->
@@ -1520,7 +1522,7 @@ <h3 class="sheet-skills-header">Skills</h3>
                     <td><input type="checkbox" name="attr_Success-Dodge"  /></td>
                     <td class="sheet-skillname">Dodge (DEX x02%)</td>
                     <td><input type="number" name="attr_Dodge"  /></td>
-					<td><button type="roll" value="&{template:skillRoll} {{skillvalue=@{Dodge}}} {{fumble=[[ceil(95+(@{Dodge}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Dodge}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Dodge}+?{Mods|0})/5)+1]]}}        {{success=[[@{Dodge}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Dodge}}"/></td>																																																																																																				
+					<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{Dodge}}} {{fumble=[[ceil(95+(@{Dodge}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Dodge}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Dodge}+?{Mods|0})/5)+1]]}}        {{success=[[@{Dodge}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Dodge}}"/></td>																																																																																																				
                     <!--<td><button type="roll" value="/roll 1d100<@{Dodge}" /></td>-->
                 </tr>
 		</table>		
@@ -1538,7 +1540,7 @@ <h3 class="sheet-skills-header">Skills</h3>
 					 <input type="checkbox" name="attr_DriveSucess"  />
 					 <input type="text" name="attr_DriveSkill" class="sheet-skillname"/>
 					 <input type="number" name="attr_DriveScore" />
-					 <button type="roll" value="&{template:skillRoll} {{skillvalue=@{DriveScore}}} {{fumble=[[ceil(95+(@{DriveScore}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{DriveScore}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{DriveScore}+?{Mods|0})/5)+1]]}}        {{success=[[@{DriveScore}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{DriveSkill}}}"/></td>																																																	 				 				 				 					 					 					 					 					 
+					 <button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{DriveScore}}} {{fumble=[[ceil(95+(@{DriveScore}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{DriveScore}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{DriveScore}+?{Mods|0})/5)+1]]}}        {{success=[[@{DriveScore}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{DriveSkill}}}"/></td>																																																	 				 				 				 					 					 					 					 					 
 					 <!--<button type="roll" value="/roll 1d100<@{DriveScore}" />-->
 
 			</fieldset>				
@@ -1552,21 +1554,21 @@ <h3 class="sheet-skills-header">Skills</h3>
                     <td><input type="checkbox" name="attr_Success-Fly"  /></td>
                     <td class="sheet-skillname">Fly (Varies)</td>
                     <td><input type="number" name="attr_Fly"  /></td>
-					<td><button type="roll" value="&{template:skillRoll} {{skillvalue=@{Fly}}}{{success=[[@{Fly}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Fly}}"/></td>																																																																																																									
+					<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{Fly}}}{{success=[[@{Fly}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Fly}}"/></td>																																																																																																									
                     
                 </tr>-->
                 <tr>
                     <td><input type="checkbox" name="attr_Success-Hide"  /></td>
                     <td class="sheet-skillname">Hide (10%)</td>
                     <td><input type="number" name="attr_Hide"  /></td>
-					<td><button type="roll" value="&{template:skillRoll} {{skillvalue=@{Hide}}} {{fumble=[[ceil(95+(@{Hide}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Hide}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Hide}+?{Mods|0})/5)+1]]}}          {{success=[[@{Hide}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Hide}}"/></td>																																																																																																														
+					<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{Hide}}} {{fumble=[[ceil(95+(@{Hide}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Hide}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Hide}+?{Mods|0})/5)+1]]}}          {{success=[[@{Hide}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Hide}}"/></td>																																																																																																														
                     <!--<td><button type="roll" value="/roll 1d100<@{Spot-Hide}" /></td>-->
                 </tr>
                 <tr>
                     <td><input type="checkbox" name="attr_Success-Jump"  /></td>
                     <td class="sheet-skillname">Jump (25%)</td>
                     <td><input type="number" name="attr_Jump"  /></td>
-					<td><button type="roll" value="&{template:skillRoll} {{skillvalue=@{Jump}}} {{fumble=[[ceil(95+(@{Jump}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Jump}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Jump}+?{Mods|0})/5)+1]]}}        {{success=[[@{Jump}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Jump}}"/></td>																																																																																																																			
+					<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{Jump}}} {{fumble=[[ceil(95+(@{Jump}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Jump}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Jump}+?{Mods|0})/5)+1]]}}        {{success=[[@{Jump}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Jump}}"/></td>																																																																																																																			
                     <!--<td><button type="roll" value="/roll 1d100<@{Jump}" /></td>-->
                 </tr>
 				
@@ -1585,7 +1587,7 @@ <h3 class="sheet-skills-header">Skills</h3>
 					 <input type="checkbox" name="attr_PilotSucess"  />
 					 <input type="text" name="attr_PilotSkill" class="sheet-skillname"/>
 					 <input type="number" name="attr_PilotScore" />
-					 <button type="roll" value="&{template:skillRoll} {{skillvalue=@{PilotScore}}} {{fumble=[[ceil(95+(@{PilotScore}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{PilotScore}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{PilotScore}+?{Mods|0})/5)+1]]}}         {{success=[[@{PilotScore}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{PilotSkill}}}"/></td>																																																	 				 				 				 					 					 					 					 					 					 
+					 <button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{PilotScore}}} {{fumble=[[ceil(95+(@{PilotScore}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{PilotScore}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{PilotScore}+?{Mods|0})/5)+1]]}}         {{success=[[@{PilotScore}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{PilotSkill}}}"/></td>																																																	 				 				 				 					 					 					 					 					 					 
 					 <!--<button type="roll" value="/roll 1d100<@{PilotScore}" />-->
 
 			</fieldset>				
@@ -1607,7 +1609,7 @@ <h3 class="sheet-skills-header">Skills</h3>
 					 <input type="checkbox" name="attr_RideSucess"  />
 					 <input type="text" name="attr_RideSkill" class="sheet-skillname"/>
 					 <input type="number" name="attr_RideScore" />
-					 <button type="roll" value="&{template:skillRoll} {{skillvalue=@{RideScore}}} {{fumble=[[ceil(95+(@{RideScore}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{RideScore}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{RideScore}+?{Mods|0})/5)+1]]}}        {{success=[[@{RideScore}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{RideSkill}}}"/></td>																																																	 				 				 				 					 					 					 					 					 					 					 
+					 <button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{RideScore}}} {{fumble=[[ceil(95+(@{RideScore}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{RideScore}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{RideScore}+?{Mods|0})/5)+1]]}}        {{success=[[@{RideScore}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{RideSkill}}}"/></td>																																																	 				 				 				 					 					 					 					 					 					 					 
 					 <!--<button type="roll" value="/roll 1d100<@{RideScore}" />-->
 
 		</fieldset>				
@@ -1617,21 +1619,21 @@ <h3 class="sheet-skills-header">Skills</h3>
                     <td><input type="checkbox" name="attr_Success-Stealth"  /></td>
                     <td class="sheet-skillname">Stealth (10%)</td>
                     <td><input type="number" name="attr_Stealth"  /></td>
-					<td><button type="roll" value="&{template:skillRoll} {{skillvalue=@{Stealth}}} {{fumble=[[ceil(95+(@{Stealth}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Stealth}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Stealth}+?{Mods|0})/5)+1]]}}     {{success=[[@{Stealth}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Stealth}}"/></td>																																																																																																																													
+					<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{Stealth}}} {{fumble=[[ceil(95+(@{Stealth}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Stealth}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Stealth}+?{Mods|0})/5)+1]]}}     {{success=[[@{Stealth}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Stealth}}"/></td>																																																																																																																													
                     <!--<td><button type="roll" value="/roll 1d100<@{Stealth}" /></td>-->
                 </tr>
                 <tr>
                     <td><input type="checkbox" name="attr_Success-Swim"  /></td>
                     <td class="sheet-skillname">Swim (25%)</td>
                     <td><input type="number" name="attr_Swim"  /></td>
-					<td><button type="roll" value="&{template:skillRoll} {{skillvalue=@{Swim}}} {{fumble=[[ceil(95+(@{Swim}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Swim}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Swim}+?{Mods|0})/5)+1]]}}        {{success=[[@{Swim}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Swim}}"/></td>																																																																																																																																		
+					<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{Swim}}} {{fumble=[[ceil(95+(@{Swim}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Swim}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Swim}+?{Mods|0})/5)+1]]}}        {{success=[[@{Swim}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Swim}}"/></td>																																																																																																																																		
                     <!--<td><button type="roll" value="/roll 1d100<@{Swim}" /></td>-->
                 </tr>	
                 <tr>
                     <td><input type="checkbox" name="attr_Success-Throw"  /></td>
                     <td class="sheet-skillname">Throw (25%)</td>
                     <td><input type="number" name="attr_throw"  /></td>
-					<td><button type="roll" value="&{template:skillRoll} {{skillvalue=@{throw}}} {{fumble=[[ceil(95+(@{throw}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{throw}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{throw}+?{Mods|0})/5)+1]]}}        {{success=[[@{throw}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Throw}}"/></td>																																																																																																																																							
+					<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{throw}}} {{fumble=[[ceil(95+(@{throw}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{throw}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{throw}+?{Mods|0})/5)+1]]}}        {{success=[[@{throw}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Throw}}"/></td>																																																																																																																																							
                     <!--<td><button type="roll" value="/roll 1d100<@{Throw}" /></td>-->
                 </tr>	
 								
@@ -1645,7 +1647,7 @@ <h3 class="sheet-skills-header">Skills</h3>
 					 <input type="checkbox" name="attr_PhysicalSucess"  />
 					 <input type="text" name="attr_PhysicalSkill" class="sheet-skillname"/>
 					 <input type="number" name="attr_PhysicalScore" />
-					 <button type="roll" value="&{template:skillRoll} {{skillvalue=@{PhysicalScore}}} {{fumble=[[ceil(95+(@{PhysicalScore}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{PhysicalScore}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{PhysicalScore}+?{Mods|0})/5)+1]]}}        {{success=[[@{PhysicalScore}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{PhysicalSkill}}}"/></td>																																																	 				 				 				 					 					 					 					 
+					 <button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{PhysicalScore}}} {{fumble=[[ceil(95+(@{PhysicalScore}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{PhysicalScore}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{PhysicalScore}+?{Mods|0})/5)+1]]}}        {{success=[[@{PhysicalScore}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{PhysicalSkill}}}"/></td>																																																	 				 				 				 					 					 					 					 
 					 <!--<button type="roll" value="/roll 1d100<@{TechScore}" />-->
 
 		</fieldset>	
@@ -1671,7 +1673,7 @@ <h3 class="sheet-skills-header">Skills</h3>
 							 <input type="checkbox" name="attr_meleeSucess"  />
 							 <input type="text" name="attr_meleeSkill" class="sheet-skillname"/>
 							 <input type="number" name="attr_meleeScore" />
-							 <button type="roll" value="&{template:skillRoll} {{skillvalue=@{meleeScore}}} {{fumble=[[ceil(95+(@{meleeScore}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{meleeScore}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{meleeScore}+?{Mods|0})/5)+1]]}}        {{success=[[@{meleeScore}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{meleeSkill}}}"/></td>
+							 <button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{meleeScore}}} {{fumble=[[ceil(95+(@{meleeScore}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{meleeScore}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{meleeScore}+?{Mods|0})/5)+1]]}}        {{success=[[@{meleeScore}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{meleeSkill}}}"/></td>
 				</fieldset>				
 
 				
@@ -1687,7 +1689,7 @@ <h3 class="sheet-skills-header">Skills</h3>
 							 <input type="checkbox" name="attr_rangedSucess"  />
 							 <input type="text" name="attr_rangedSkill" class="sheet-skillname"/>
 							 <input type="number" name="attr_rangedScore" />
-							 <button type="roll" value="&{template:skillRoll} {{skillvalue=@{rangedScore}}} {{fumble=[[ceil(95+(@{rangedScore}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{rangedScore}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{rangedScore}+?{Mods|0})/5)+1]]}}         {{success=[[@{rangedScore}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{rangedSkill}}}"/></td>																																																	 				 				 				 					 					 					 					 					 					 					 
+							 <button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{rangedScore}}} {{fumble=[[ceil(95+(@{rangedScore}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{rangedScore}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{rangedScore}+?{Mods|0})/5)+1]]}}         {{success=[[@{rangedScore}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{rangedSkill}}}"/></td>																																																	 				 				 				 					 					 					 					 					 					 					 
 							 <!--<button type="roll" value="/roll 1d100<@{RideScore}" />-->
 
 				</fieldset>				
@@ -1718,6 +1720,7 @@ <h3 class="sheet-skills-header">Skills</h3>
 	    <div class='sheet-col sheet-big-col'>
 			
 			<h3 style="text-align: center; color: #FFF; background-color: #000;">Hand-To-Hand Weapons</h3>
+			<div style="font-align: center; width:100%; font-size:0.8em"><b>*For the button to work correctly fill in skill and damage and select a damage bonus*</b></div>
 			
 			<table style="width: 100%;">
 					<thead class="sheet-header-text">
@@ -1731,16 +1734,17 @@ <h3 style="text-align: center; color: #FFF; background-color: #000;">Hand-To-Han
 						</td>
 						<th>Range</th>
 						<th>Skill %</th>
-						<th>Spcl</th>
+						<th>Special</th>
 						<th>Damage</th>
 						<th>Attacks</th>
 						<th>HP</th>
 						<th></th>
 					</thead>
 					<tbody>
+
 					<tr>
 						<td><input type="checkbox" name="attr_Success-Fist-Punch" /></td>
-						<td style="width: 122;"><p style="width: 111px; margin-bottom: 0px">Brawl (50%)</p></td>
+						<td style="width: 122px;"><p style="width: 111px; margin-bottom: 0px">Brawl (50%)</p></td>
 						
 
 						<td >
@@ -1775,16 +1779,17 @@ <h3 style="text-align: center; color: #FFF; background-color: #000;">Hand-To-Han
 						<!--//<td><button type="roll" value="/roll 1d100<@{Fist-Punch}" /></td>-->
 						 <td><button type="roll" value="&{template:melee-roll} {{tot=[[@{Brawl-Damage}+@{Damage_Bonus}]]}} {{success=[[@{Brawl}+?{Mods|0}]]}} {{fumble=[[ceil(95+(@{Brawl}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Brawl}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Brawl}+?{Mods|0})/5)+1]]}}  {{skillvalue=@{Brawl}}}  {{roll=[[1d100]]}} {{skillname=Brawl}}" /></td>
 					</tr>
+					
 					<tr>
 						<td><input type="checkbox" name="attr_Success-Grapple"  /></td>
-						<td style="width: 122px">Grapple (25%)</td>						
+						<td style="width: 122px"><p style="width: 111px; margin-bottom: 0px">Grapple (25%)</p></td>						
 							<td>
 								<input type="checkbox" class="sheet-showstrike-rank" name="attr_showstrike-rank" checked="checked" style="display: none">
 								<div class="sheet-strike-rank">					
 									<input style="width:35px" type="number" name="attr_Grapple_sr" />
 								</div>
 							</td>
-						<!--<td><input style="width:35px" type="number" name="attr_Grapple_length" /></td>-->
+
 						<td>
 							<select style="font-size: 9px; margin-bottom: 0px; width:49px" name="attr_Grapple_length">
 								<option value="">S</option>
@@ -1809,8 +1814,8 @@ <h3 style="text-align: center; color: #FFF; background-color: #000;">Hand-To-Han
 						<td><input style="width:35px" type="number" name="attr_Grapple-ApR" /></td>
 						<td><input style="width:40px" type="text" name="attr_Grapple-HP" style="width: 40px" /></td>
 						 <td><button type="roll" value="&{template:melee-roll} {{tot=[[@{Grapple-Damage}+@{Damage_Bonus}]]}} {{success=[[@{Brawl}+?{Mods|0}]]}} {{fumble=[[ceil(95+(@{Grapple}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Grapple}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Grapple}+?{Mods|0})/5)+1]]}}  {{skillvalue=@{Grapple}}}  {{roll=[[1d100]]}} {{skillname=Grapple}}" /></td>						
-						<!--<td><button type="roll" value="/roll 1d100<@{Grapple}" /></td>-->
 					</tr>
+					
 				</tbody>
 			</table>
 			                               
@@ -1821,7 +1826,7 @@ <h3 style="text-align: center; color: #FFF; background-color: #000;">Hand-To-Han
 			<table>
 				<tr>
 					<td><input type="checkbox" name="attr_Success"  /></td>
-					<td style="width: 122px;"><input style="width: 111px;" type="text" name="attr_Attack-Weapon" /></td>	
+					<td style="width: 122px;"><input style="width: 113px;" type="text" name="attr_Attack-Weapon" /></td>	
 					<td><div class="sheet-melee-toggle"><input style="width:35px" type="number" name="attr_melee_sr" /></div></td>
 					<td>
 						<select style="font-size: 9px; margin-bottom: 0px; width:49px" name="attr_length">
@@ -1832,7 +1837,7 @@ <h3 style="text-align: center; color: #FFF; background-color: #000;">Hand-To-Han
 							<option value="">ALL</option>								
 						</select>
 					</td>						   
-					<td><input style="width:50px" type="number" name="attr_Score" /></td>
+					<td><input style="width:52px" type="number" name="attr_Score" /></td>
 					<td>		
 						<select style="font-size: 9px; margin-bottom: 0px; width:49px" name="attr_spcl">
 							<option value="Bl">Bl</option>
@@ -1841,10 +1846,10 @@ <h3 style="text-align: center; color: #FFF; background-color: #000;">Hand-To-Han
 							<option value="En">En</option>								
 						</select>
 					</td>	
-					<td><input style="width:60px" type="text" name="attr_Damagex"  /></td>
-					<td><input style="width:35px" type="number" name="attr_Attacks-Round" /></td>
+					<td><input style="width:62px" type="text" name="attr_Damagex"  /></td>
+					<td><input style="width:36px; margin-right:3px" type="number" name="attr_Attacks-Round" /></td>
 					<td><input  style="width:40px" type="text" name="attr_HP" /></td>
-					<td><button type="roll" value="&{template:melee-roll} {{tot=[[@{Damagex}+@{Damage_Bonus}]]}} {{success=[[@{Score}+?{Mods|0}]]}} {{fumble=[[ceil(95+(@{Score}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Score}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Score}+?{Mods|0})/5)+1]]}}  {{skillvalue=@{Score}}}  {{roll=[[1d100]]}} {{skillname=@{Attack-Weapon}}}" /></td>					   				
+					<td><button type="roll" value="&{template:melee-roll} {{name=@{Name}}}{{tot=[[@{Damagex}+@{Damage_Bonus}]]}} {{success=[[@{Score}+?{Mods|0}]]}} {{fumble=[[ceil(95+(@{Score}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Score}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Score}+?{Mods|0})/5)+1]]}}  {{skillvalue=@{Score}}}  {{roll=[[1d100]]}} {{skillname=@{Attack-Weapon}}}" /></td>					   				
 				</tr>
 			</table>
 		</fieldset>
@@ -2105,7 +2110,7 @@ <h3 style="text-align: center; color: #FFF; background-color: #000;">Armor, Shie
 			<div style="margin-left: 5px ; display: inline">
 				Dodge
 				<input style="width:47px" class="sheet-section-header" disabled="true" value="@{Dodge}" type="number" name="attr_Dodge_display" />
-				<td><button type="roll" value="&{template:skillRoll} {{skillvalue=@{Dodge}}} {{fumble=[[ceil(95+(@{Dodge}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Dodge}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Dodge}+?{Mods|0})/5)+1]]}}        {{success=[[@{Dodge}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Dodge}}"/></td>																																																																																																				
+				<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{Dodge}}} {{fumble=[[ceil(95+(@{Dodge}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Dodge}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Dodge}+?{Mods|0})/5)+1]]}}        {{success=[[@{Dodge}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Dodge}}"/></td>																																																																																																				
 			</div>
 			<div style="display: inline">
 				Fumble 
@@ -2341,7 +2346,7 @@ <h3 style="text-align: center; color: #FFF; background-color: #000;">Entities En
 
 <rolltemplate class="sheet-rolltemplate-melee-roll">
     <table class="skillRoll" style="border 1px black">
-        <!--<tr><th>{{name}}</th></tr>-->
+        <tr><th colspan="2">{{name}}</th></tr>
 		
 		<tr><th colspan="2">Weapon Roll</th></tr>
 		 <!--<tr><td>{{crit}}/{{special}}/{{fumble}}</td></tr>-->
@@ -2444,9 +2449,9 @@ <h3 style="text-align: center; color: #FFF; background-color: #000;">Entities En
 
 
 <rolltemplate class="sheet-rolltemplate-skillRoll">
-    <table class="skillRoll" style="border 1px black">
+    <table class="skillRoll" style="width: 100%; border 1px black">
         <!--<tr><th>{{name}}</th></tr>-->
-		
+		<tr><th colspan="2">{{name}}</th></tr>
 		<tr><th colspan="2">Skill Roll</th></tr>
 		 <!--<tr><td>{{crit}}/{{special}}/{{fumble}}</td></tr>-->
         <tr>
@@ -2494,9 +2499,6 @@ <h3 style="text-align: center; color: #FFF; background-color: #000;">Entities En
 						{{/^rollBetween() roll special success}}						
 					
 					{{/^rollLess() roll special}}
-				
-				
-				
 				{{/^rollLess() roll crit}}
 			
 			
diff --git a/Basic_Roleplaying/Basic_Roleplaying.png b/Basic_Roleplaying/Basic_Roleplaying.png
index 91c504f10ae..e5f484800e4 100644
Binary files a/Basic_Roleplaying/Basic_Roleplaying.png and b/Basic_Roleplaying/Basic_Roleplaying.png differ