diff --git a/Basic_Roleplaying/Basic_Roleplaying.html b/Basic_Roleplaying/Basic_Roleplaying.html
index e62d57dd15..e73bdad04f 100644
--- a/Basic_Roleplaying/Basic_Roleplaying.html
+++ b/Basic_Roleplaying/Basic_Roleplaying.html
@@ -135,7 +135,6 @@
 						<td class=".sheet-chkfiller"><td>
 						<td><p>INT</p></td>
 						<td><input type="number" name="attr_INT" /></td>
-						<!--<td><input type="number" name="attr_Idea" value="[[5*@{INT}]]" disabled="true" /></td>-->
 						<td ><button  class="sheet-characteristic-roll sheet-plain" type="roll" value="/roll 1d100<[[@{INT}*?{Multiplier|5}]] Idea Roll" >Idea</button></td>
 						<td><p>MOV</p></td><td><input type="number" name="attr_mov" /></td>		
 						<td></td>
@@ -146,7 +145,6 @@
 						<td ><input type="checkbox" name="att_power-check" /><td>
 						<td><p>POW</p></td>
 						<td><input class="sheet-plain" type="number" name="attr_POW" /></td>
-						<!--<td><input type="number" name="attr_Luck" value="[[5*@{POW}]]" disabled="true" /></td>-->
 						<td ><button class="sheet-characteristic-roll sheet-plain" type="roll" value="/roll 1d100<[[@{POW}*?{Multiplier|5}]] Luck Roll" >&nbsp;Luck</button></td>
 						<td><p>Hit Pts.</p></td>
 						<td><input type="number" name="attr_cur_hp" />
@@ -234,8 +232,7 @@
 				<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} {{name=@{Name}}} {{skillvalue=@{Appraise}}} {{fumble=[[ceil(95+(@{Appraise}*?{Multipler|1}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Appraise}*?{Multipler|1}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Appraise}*?{Multipler|1}+?{Mods|0})/5)+1]]}}         {{success=[[ceil(@{Appraise}*?{Multipler|1}+?{Mods|0})]]}} {{roll=[[1d100]]}} {{skillname=Appraise}}"/></td>																																								
-				<!--<td><button type="roll" value="/roll 1d100<@{Appraise}" /></td>-->
+				<td><button type="roll" value="&{template:skillRoll} {{name=@{Name}}} {{skillvalue=@{Appraise}}} {{fumble=[[ceil(95+(@{Appraise}*?{Multipler|1}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Appraise}*?{Multipler|1}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Appraise}*?{Multipler|1}+?{Mods|0})/5)+1]]}}         {{success=[[ceil(@{Appraise}*?{Multipler|1}+?{Mods|0})]]}} {{roll=[[1d100]]}} {{skillname=Appraise}}"/></td>
 			</tr>
 			<tr>
 				<td class="sheet-chkfiller"></td>
@@ -246,7 +243,6 @@
 			<table style="width: 100%;">	
 				<tr>
 				<td><input type="checkbox" name="attr_artSuccess"  /></td>
-				<!--<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} {{name=@{Name}}} {{skillvalue=@{artScore}}} {{fumble=[[ceil(95+(@{artScore}*?{Multipler|1}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{artScore}*?{Multipler|1}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{artScore}*?{Multipler|1}+?{Mods|0})/5)+1]]}}          {{success=[[ceil(@{artScore}*?{Multipler|1}+?{Mods|0})]]}} {{roll=[[1d100]]}} {{skillname=@{artSkillname}}}"/></td>
@@ -271,8 +267,7 @@
 				<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} {{name=@{Name}}} {{skillvalue=@{Command}}} {{fumble=[[ceil(95+(@{Command}*?{Multipler|1}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Command}*?{Multipler|1}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Command}*?{Multipler|1}+?{Mods|0})/5)+1]]}}  {{success=[[ceil(@{Command}*?{Multipler|1}+?{Mods|0})]]}} {{roll=[[1d100]]}} {{skillname=Command}}"/></td>											
+				<td><button type="roll" value="&{template:skillRoll} {{name=@{Name}}} {{skillvalue=@{Command}}} {{fumble=[[ceil(95+(@{Command}*?{Multipler|1}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Command}*?{Multipler|1}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Command}*?{Multipler|1}+?{Mods|0})/5)+1]]}}  {{success=[[ceil(@{Command}*?{Multipler|1}+?{Mods|0})]]}} {{roll=[[1d100]]}} {{skillname=Command}}"/></td>
 			</tr>
 			<tr>
 				<td class="sheet-chkfiller"></td>
@@ -292,22 +287,19 @@
 				<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} {{name=@{Name}}} {{skillvalue=@{Demolition}}} {{fumble=[[ceil(95+(@{Demolition}*?{Multipler|1}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Demolition}*?{Multipler|1}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Demolition}*?{Multipler|1}+?{Mods|0})/5)+1]]}}         {{success=[[ceil(@{Demolition}*?{Multipler|1}+?{Mods|0})]]}} {{roll=[[1d100]]}} {{skillname=Demolition}}"/></td>																																			
-				<!--<td><button type="roll" value="/roll 1d100<@{Demolition}" /></td>-->					
+				<td><button type="roll" value="&{template:skillRoll} {{name=@{Name}}} {{skillvalue=@{Demolition}}} {{fumble=[[ceil(95+(@{Demolition}*?{Multipler|1}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Demolition}*?{Multipler|1}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Demolition}*?{Multipler|1}+?{Mods|0})/5)+1]]}}         {{success=[[ceil(@{Demolition}*?{Multipler|1}+?{Mods|0})]]}} {{roll=[[1d100]]}} {{skillname=Demolition}}"/></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}  {{name=@{Name}}} {{skillvalue=@{Disguise}}} {{fumble=[[ceil(95+(@{Disguise}*?{Multipler|1}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Disguise}*?{Multipler|1}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Disguise}*?{Multipler|1}+?{Mods|0})/5)+1]]}}    {{success=[[ceil(@{Disguise}*?{Multipler|1}+?{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}  {{name=@{Name}}} {{skillvalue=@{Dodge}}} {{fumble=[[ceil(95+(@{Dodge}*?{Multipler|1}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Dodge}*?{Multipler|1}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Dodge}*?{Multipler|1}+?{Mods|0})/5)+1]]}}        {{success=[[ceil(@{Dodge}*?{Multipler|1}+?{Mods|0})]]}} {{roll=[[1d100]]}} {{skillname=Dodge}}"/></td>																																																																																																				
-				<!--<td><button type="roll" value="/roll 1d100<@{Dodge}" /></td>-->
+				<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{Dodge}}} {{fumble=[[ceil(95+(@{Dodge}*?{Multipler|1}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Dodge}*?{Multipler|1}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Dodge}*?{Multipler|1}+?{Mods|0})/5)+1]]}}        {{success=[[ceil(@{Dodge}*?{Multipler|1}+?{Mods|0})]]}} {{roll=[[1d100]]}} {{skillname=Dodge}}"/></td>
 			</tr>				
 			<tr>
 				<td class="sheet-chkfiller"></td>
@@ -315,17 +307,16 @@
 			</tr>	
 		</table>
 		<fieldset class='repeating_DriveSkills'>
-				<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}  {{name=@{Name}}} {{skillvalue=@{DriveScore}}} {{fumble=[[ceil(95+(@{DriveScore}*?{Multipler|1}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{DriveScore}*?{Multipler|1}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{DriveScore}*?{Multipler|1}+?{Mods|0})/5)+1]]}}        {{success=[[ceil(@{DriveScore}*?{Multipler|1})+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{Drive Skill}}}"/></td>																																																	 				 				 				 					 					 					 					 					 					
+			<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}  {{name=@{Name}}} {{skillvalue=@{DriveScore}}} {{fumble=[[ceil(95+(@{DriveScore}*?{Multipler|1}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{DriveScore}*?{Multipler|1}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{DriveScore}*?{Multipler|1}+?{Mods|0})/5)+1]]}}        {{success=[[ceil(@{DriveScore}*?{Multipler|1})+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{Drive Skill}}}"/>
 		</fieldset>	
 		<table style="width: 100%">	
 			<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}  {{name=@{Name}}} {{skillvalue=@{Etiquette}}}  {{fumble=[[ceil(95+(@{Etiquette}*?{Multipler|1}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Etiquette}*?{Multipler|1}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Etiquette}*?{Multipler|1}+?{Mods|0})/5)+1]]}}         {{success=[[ceil(@{Etiquette}*?{Multipler|1}+?{Mods|0})]]}} {{roll=[[1d100]]}} {{skillname=Etiquette}}"/></td>															
 			</tr>
 			<tr>
@@ -333,34 +324,30 @@
 				<td class="sheet-skillname">Fast Talk (05%)</td>
 				<td><input type="number" name="attr_FastTalk" /></td>
 				<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{FastTalk}}}  {{fumble=[[ceil(95+(@{FastTalk}*?{Multipler|1}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{FastTalk}*?{Multipler|1}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{FastTalk}*?{Multipler|1}+?{Mods|0})/5)+1]]}}        {{success=[[ceil(@{FastTalk}*?{Multipler|1}+?{Mods|0})]]}} {{roll=[[1d100]]}} {{skillname=Fast Talk}}"/></td>
-				<!--<td><button type="roll" value="/roll 1d100<@{FastTalk}" /></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}  {{name=@{Name}}} {{skillvalue=@{FineManipulation}}}  {{fumble=[[ceil(95+(@{FineManipulation}*?{Multipler|1}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{FineManipulation}*?{Multipler|1}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{FineManipulation}*?{Multipler|1}+?{Mods|0})/5)+1]]}}        {{success=[[ceil(@{FineManipulation}*?{Multipler|1}+?{Mods|0})]]}} {{roll=[[1d100]]}} {{skillname=Fine Manip.}}"/></td>
-				<!--<td><button type="roll" value="/roll 1d100<@{FineManipulation}" /></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}  {{name=@{Name}}} {{skillvalue=@{FirstAid}}} {{fumble=[[ceil(95+(@{FirstAid}*?{Multipler|1}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{FirstAid}*?{Multipler|1}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{FirstAid}*?{Multipler|1}+?{Mods|0})/5)+1]]}}       {{success=[[ceil(@{FirstAid}*?{Multipler|1}+?{Mods|0})]]}} {{roll=[[1d100]]}} {{skillname=First Aid}}"/></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}  {{name=@{Name}}} {{skillvalue=@{Gaming}}} {{fumble=[[ceil(95+(@{Gaming}*?{Multipler|1}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Gaming}*?{Multipler|1}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Gaming}*?{Multipler|1}+?{Mods|0})/5)+1]]}}        {{success=[[ceil(@{Gaming}*?{Multipler|1}+?{Mods|0})]]}} {{roll=[[1d100]]}} {{skillname=Gaming}}"/></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}  {{name=@{Name}}} {{skillvalue=@{FirstAid}}} {{fumble=[[ceil(95+(@{FirstAid}*?{Multipler|1}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{FirstAid}*?{Multipler|1}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{FirstAid}*?{Multipler|1}+?{Mods|0})/5)+1]]}}       {{success=[[ceil(@{FirstAid}*?{Multipler|1}+?{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}  {{name=@{Name}}} {{skillvalue=@{Gaming}}} {{fumble=[[ceil(95+(@{Gaming}*?{Multipler|1}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Gaming}*?{Multipler|1}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Gaming}*?{Multipler|1}+?{Mods|0})/5)+1]]}}        {{success=[[ceil(@{Gaming}*?{Multipler|1}+?{Mods|0})]]}} {{roll=[[1d100]]}} {{skillname=Gaming}}"/></td>																																																		
-		</tr>		
-
-		<tr>
-			<td class="sheet-chkfiller"></td>
-			<td>Heavy Machine (01%):</td>
-		</tr>	
+			<tr>
+				<td class="sheet-chkfiller"></td>
+				<td>Heavy Machine (01%):</td>
+			</tr>	
 		</table>
 		
 		<fieldset class='repeating_hMachineSkills'>
@@ -386,87 +373,77 @@
 		<!-- End of Col 1 -->	
 	</div> <!-- col 1 close -->     
 	<div class='sheet-col'><!-- col 2 start --> 
-
-	<!-- Start of Col 2 -->					
-				
+	<!-- Start of Col 2 -->									
 		<table style="width: 100%">				
 			<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}  {{name=@{Name}}} {{skillvalue=@{Jump}}} {{fumble=[[ceil(95+(@{Jump}*?{Multipler|1}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Jump}*?{Multipler|1}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Jump}*?{Multipler|1}+?{Mods|0})/5)+1]]}}        {{success=[[ceil(@{Jump}*?{Multipler|1}+?{Mods|0})]]}} {{roll=[[1d100]]}} {{skillname=Jump}}"/></td>																																																																																																																			
-				<!--<td><button type="roll" value="/roll 1d100<@{Jump}" /></td>-->
+				<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{Jump}}} {{fumble=[[ceil(95+(@{Jump}*?{Multipler|1}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Jump}*?{Multipler|1}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Jump}*?{Multipler|1}+?{Mods|0})/5)+1]]}}        {{success=[[ceil(@{Jump}*?{Multipler|1}+?{Mods|0})]]}} {{roll=[[1d100]]}} {{skillname=Jump}}"/></td>
 			</tr>
-
-				<tr>
-					<td class="sheet-chkfiller"></td>
-					<td>Knowledge (Varies):</td>
-				</tr>	
+			<tr>
+				<td class="sheet-chkfiller"></td>
+				<td>Knowledge (Varies):</td>
+			</tr>	
 		</table>
 			<fieldset class='repeating_KnowSkills'>
-						<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}  {{name=@{Name}}} {{skillvalue=@{KnowScore}}} {{fumble=[[ceil(95+(@{KnowScore}*?{Multipler|1}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{KnowScore}*?{Multipler|1}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{KnowScore}*?{Multipler|1}+?{Mods|0})/5)+1]]}}         {{success=[[ceil(@{KnowScore}*?{Multipler|1}+?{Mods|0})]]}} {{roll=[[1d100]]}} {{skillname=@{KnowSkills}}}"/></td>																																																	 				 				 				 					 
-
+				<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}  {{name=@{Name}}} {{skillvalue=@{KnowScore}}} {{fumble=[[ceil(95+(@{KnowScore}*?{Multipler|1}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{KnowScore}*?{Multipler|1}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{KnowScore}*?{Multipler|1}+?{Mods|0})/5)+1]]}}         {{success=[[ceil(@{KnowScore}*?{Multipler|1}+?{Mods|0})]]}} {{roll=[[1d100]]}} {{skillname=@{KnowSkills}}}"/></td>
 			</fieldset>	
 			<table style="width: 100%">					
 				<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}  {{name=@{Name}}} {{skillvalue=@{ownLang}}}  {{fumble=[[ceil(95+(@{ownLang}*?{Multipler|1}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{ownLang}*?{Multipler|1}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{ownLang}*?{Multipler|1}+?{Mods|0})/5)+1]]}}        {{success=[[ceil(@{ownLang}*?{Multipler|1}+?{Mods|0})]]}} {{roll=[[1d100]]}} {{skillname=Own Language}}"/></td>																				
+					<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{ownLang}}}  {{fumble=[[ceil(95+(@{ownLang}*?{Multipler|1}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{ownLang}*?{Multipler|1}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{ownLang}*?{Multipler|1}+?{Mods|0})/5)+1]]}}        {{success=[[ceil(@{ownLang}*?{Multipler|1}+?{Mods|0})]]}} {{roll=[[1d100]]}} {{skillname=Own Language}}"/></td>
 				</tr>			
 			</table>
 			<fieldset class='repeating_Langskills'>
 				<tr>
-						<input type="checkbox" name="attr_LangSuccess"  />
-						<input type="text" name="attr_LangSkillname" class="sheet-skillname" />
-						<input type="number" name="attr_LangScore" />
+					<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}  {{name=@{Name}}} {{skillvalue=@{LangScore}}} {{fumble=[[ceil(95+(@{LangScore}*?{Multipler|1}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{LangScore}*?{Multipler|1}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{LangScore}*?{Multipler|1}+?{Mods|0})/5)+1]]}}         {{success=[[ceil(@{LangScore}*?{Multipler|1}+?{Mods|0})]}} {{roll=[[1d100]]}} {{skillname=@{LangSkillname}}}"/>
 				</tr>		
 			</fieldset>
 			<table style="width: 100%">								
-					<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}  {{name=@{Name}}} {{skillvalue=@{Listen}}} {{fumble=[[ceil(95+(@{Listen}*?{Multipler|1}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Listen}*?{Multipler|1}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Listen}*?{Multipler|1}+?{Mods|0})/5)+1]]}}   {{success=[[ceil(@{Listen}*?{Multipler|1}+?{Mods|0})]]}} {{roll=[[1d100]]}} {{skillname=Listen}}"/></td>																																																																											
-					</tr>			
+					<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{Listen}}} {{fumble=[[ceil(95+(@{Listen}*?{Multipler|1}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Listen}*?{Multipler|1}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Listen}*?{Multipler|1}+?{Mods|0})/5)+1]]}}   {{success=[[ceil(@{Listen}*?{Multipler|1}+?{Mods|0})]]}} {{roll=[[1d100]]}} {{skillname=Listen}}"/></td>
+				</tr>			
 				<tr>
 					<td class="sheet-chkfiller"></td>
 					<td>Literacy (Varies):</td>
 				</tr>	
 			</table>
 			<fieldset class='repeating_LitSkills'>
-						<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}  {{name=@{Name}}} {{skillvalue=@{LitScore}}} {{fumble=[[ceil(95+(@{LitScore}*?{Multipler|1}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{LitScore}*?{Multipler|1}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{LitScore}*?{Multipler|1}+?{Mods|0})/5)+1]]}}        {{success=[[ceil(@{LitScore}*?{Multipler|1}+?{Mods|0})]]}} {{roll=[[1d100]]}} {{skillname=@{LitSkill}}}"/></td>																																																	 				 				 				 					 					 
-						<!--<button type="roll" value="/roll 1d100<@{LitScore}" />-->
+				<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}  {{name=@{Name}}} {{skillvalue=@{LitScore}}} {{fumble=[[ceil(95+(@{LitScore}*?{Multipler|1}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{LitScore}*?{Multipler|1}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{LitScore}*?{Multipler|1}+?{Mods|0})/5)+1]]}}        {{success=[[ceil(@{LitScore}*?{Multipler|1}+?{Mods|0})]]}} {{roll=[[1d100]]}} {{skillname=@{LitSkill}}}"/></td>
 			</fieldset>				
 			<table style="width: 100%;">	
-					<tr>
-						<td><input type="checkbox" name="attr_Success-MartialArts"  /></td>
-						<td class="sheet-skillname">Martial Arts (01%)</td>
-						<td><input type="number" name="attr_MartialArts"  /></td>
-						<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{MartialArts}}} {{fumble=[[ceil(95+(@{MartialArts}*?{Multipler|1}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{MartialArts}*?{Multipler|1}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{MartialArts}*?{Multipler|1}+?{Mods|0})/5)+1]]}}        {{success=[[ceil(@{MartialArts}*?{Multipler|1}+?{Mods|0})]]}} {{roll=[[1d100]]}} {{skillname=Martial Arts}}"/></td>																																																							
-						<!--<td><button type="roll" value="/roll 1d100<@{MartialArts}" /></td>-->
-					</tr>
-					<tr>
-						<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}  {{name=@{Name}}} {{skillvalue=@{Medicine}}} {{fumble=[[ceil(95+(@{Medicine}*?{Multipler|1}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Medicine}*?{Multipler|1}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Medicine}*?{Multipler|1}+?{Mods|0})/5)+1]]}}        {{success=[[ceil(@{Medicine}*?{Multipler|1}+?{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-MartialArts"  /></td>
+					<td class="sheet-skillname">Martial Arts (01%)</td>
+					<td><input type="number" name="attr_MartialArts"  /></td>
+					<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{MartialArts}}} {{fumble=[[ceil(95+(@{MartialArts}*?{Multipler|1}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{MartialArts}*?{Multipler|1}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{MartialArts}*?{Multipler|1}+?{Mods|0})/5)+1]]}}        {{success=[[ceil(@{MartialArts}*?{Multipler|1}+?{Mods|0})]]}} {{roll=[[1d100]]}} {{skillname=Martial Arts}}"/></td>
+				</tr>
+				<tr>
+					<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}  {{name=@{Name}}} {{skillvalue=@{Medicine}}} {{fumble=[[ceil(95+(@{Medicine}*?{Multipler|1}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Medicine}*?{Multipler|1}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Medicine}*?{Multipler|1}+?{Mods|0})/5)+1]]}}        {{success=[[ceil(@{Medicine}*?{Multipler|1}+?{Mods|0})]]}} {{roll=[[1d100]]}} {{skillname=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}  {{name=@{Name}}} {{skillvalue=@{Navigate}}} {{fumble=[[ceil(95+(@{Navigate}*?{Multipler|1}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Navigate}*?{Multipler|1}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Navigate}*?{Multipler|1}+?{Mods|0})/5)+1]]}}        {{success=[[ceil(@{Navigate}*?{Multipler|1}+?{Mods|0})]]}} {{roll=[[1d100]]}} {{skillname=Navigate}}"/></td>																																																																																
-					<!--<td><button type="roll" value="/roll 1d100<@{Navigate}" /></td>-->
+					<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{Navigate}}} {{fumble=[[ceil(95+(@{Navigate}*?{Multipler|1}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Navigate}*?{Multipler|1}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Navigate}*?{Multipler|1}+?{Mods|0})/5)+1]]}}        {{success=[[ceil(@{Navigate}*?{Multipler|1}+?{Mods|0})]]}} {{roll=[[1d100]]}} {{skillname=Navigate}}"/></td>
 				</tr>			
 				<tr>
 					<td class="sheet-chkfiller"></td>
@@ -474,17 +451,16 @@
 				</tr>								
 			</table>
 			<fieldset class='repeating_PerformSkills'>
-						<input type="checkbox" name="attr_Success-Perform"  />
-						<input type="text" name="attr_PerformSkill" class="sheet-skillname"/>
-						<input type="number" name="attr_Perform" />
-						<button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{Perform}}} {{fumble=[[ceil(95+(@{Perform}*?{Multipler|1}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Perform}*?{Multipler|1}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Perform}*?{Multipler|1}+?{Mods|0})/5)+1]]}}         {{success=[[ceil(@{Perform}*?{Multipler|1}+?{Mods|0})]]}} {{roll=[[1d100]]}} {{skillname=@{PerformSkill}}}"/></td>																																																	 				 				 				 					 					 					 					 					 					 
+				<input type="checkbox" name="attr_Success-Perform"  />
+				<input type="text" name="attr_PerformSkill" class="sheet-skillname"/>
+				<input type="number" name="attr_Perform" />
+				<button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{Perform}}} {{fumble=[[ceil(95+(@{Perform}*?{Multipler|1}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Perform}*?{Multipler|1}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Perform}*?{Multipler|1}+?{Mods|0})/5)+1]]}}         {{success=[[ceil(@{Perform}*?{Multipler|1}+?{Mods|0})]]}} {{roll=[[1d100]]}} {{skillname=@{PerformSkill}}}"/>
 			</fieldset>	
-				<table style="width: 100%;">	
+			<table style="width: 100%;">
 				<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}  {{name=@{Name}}} {{skillvalue=@{Persuade}}} {{fumble=[[ceil(95+(@{Persuade}*?{Multipler|1}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Persuade}*?{Multipler|1}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Persuade}*?{Multipler|1}+?{Mods|0})/5)+1]]}}       {{success=[[ceil(@{Persuade}*?{Multipler|1}+?{Mods|0})]]}} {{roll=[[1d100]]}} {{skillname=Persuade}}"/></td>																														
 				</tr>			
 				<tr>
@@ -493,48 +469,40 @@
 				</tr>	
 			</table>
 			<fieldset class='repeating_PilotSkills'>
-						<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}  {{name=@{Name}}} {{skillvalue=@{PilotScore}}} {{fumble=[[ceil(95+(@{PilotScore}*?{Multipler|1}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{PilotScore}*?{Multipler|1}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{PilotScore}*?{Multipler|1}+?{Mods|0})/5)+1]]}}         {{success=[[ceil(@{PilotScore}*?{Multipler|1}+?{Mods|0})]]}} {{roll=[[1d100]]}} {{skillname=@{PilotSkill}}}"/></td>																																																	 				 				 				 					 					 					 					 					 					 
+				<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}  {{name=@{Name}}} {{skillvalue=@{PilotScore}}} {{fumble=[[ceil(95+(@{PilotScore}*?{Multipler|1}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{PilotScore}*?{Multipler|1}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{PilotScore}*?{Multipler|1}+?{Mods|0})/5)+1]]}}         {{success=[[ceil(@{PilotScore}*?{Multipler|1}+?{Mods|0})]]}} {{roll=[[1d100]]}} {{skillname=@{PilotSkill}}}"/></td>																																																	 				 				 				 					 					 					 					 					 					 
 			</fieldset>	
 				<table style="width: 100%;">				
-				<tr>
-					<td><input type="checkbox" name="attr_Success-Projection"  /></td>
-					<td class="sheet-skillname">Projection(DEX x02%)</td>
-					<td><input type="number" name="attr_Projection"  /></td>
-					<!--<td><button type="roll" value="/roll 1d100<@{Projection}" /></td>-->
-					<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{Projection}}} {{fumble=[[ceil(95+(@{Projection}*?{Multipler|1}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Projection}*?{Multipler|1}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Projection}*?{Multipler|1}+?{Mods|0})/5)+1]]}}       {{success=[[ceil(@{Projection}*?{Multipler|1}+?{Mods|0})]]}} {{roll=[[1d100]]}} {{skillname=Projection}}"/></td>																														
-				</tr>
-				<tr>
-					<td><input type="checkbox" name="attr_Success-Psychotherapy"  /></td>
-					<td class="sheet-skillname">Psychotherapy(00% or 01%)</td>
-					<td><input type="number" name="attr_Psychotherapy"  /></td>
-					<!--<td><button type="roll" value="/roll 1d100<@{Psychotherapy}" /></td>-->
-					<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{Psychotherapy}}} {{fumble=[[ceil(95+(@{Psychotherapy}*?{Multipler|1}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Psychotherapy}*?{Multipler|1}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Psychotherapy}*?{Multipler|1}+?{Mods|0})/5)+1]]}}       {{success=[[ceil(@{Psychotherapy}*?{Multipler|1}+?{Mods|0})]]}} {{roll=[[1d100]]}} {{skillname=Psychotherapy}}"/></td>																														
-				</tr>								
-						<tr>
-							<td class="sheet-chkfiller"></td>
-							<td class="sheet-skillname">Repair (15%)</td>
-						</tr>
+					<tr>
+						<td><input type="checkbox" name="attr_Success-Projection"  /></td>
+						<td class="sheet-skillname">Projection(DEX x02%)</td>
+						<td><input type="number" name="attr_Projection"  /></td>
+						<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{Projection}}} {{fumble=[[ceil(95+(@{Projection}*?{Multipler|1}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Projection}*?{Multipler|1}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Projection}*?{Multipler|1}+?{Mods|0})/5)+1]]}}       {{success=[[ceil(@{Projection}*?{Multipler|1}+?{Mods|0})]]}} {{roll=[[1d100]]}} {{skillname=Projection}}"/></td>
+					</tr>
+					<tr>
+						<td><input type="checkbox" name="attr_Success-Psychotherapy"  /></td>
+						<td class="sheet-skillname">Psychotherapy(00% or 01%)</td>
+						<td><input type="number" name="attr_Psychotherapy"  /></td>
+						<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{Psychotherapy}}} {{fumble=[[ceil(95+(@{Psychotherapy}*?{Multipler|1}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Psychotherapy}*?{Multipler|1}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Psychotherapy}*?{Multipler|1}+?{Mods|0})/5)+1]]}}       {{success=[[ceil(@{Psychotherapy}*?{Multipler|1}+?{Mods|0})]]}} {{roll=[[1d100]]}} {{skillname=Psychotherapy}}"/></td>
+					</tr>								
+					<tr>
+						<td class="sheet-chkfiller"></td>
+						<td class="sheet-skillname">Repair (15%)</td>
+					</tr>
 				</table>
 				<fieldset class='repeating_repairSkills'>
-						<!-- <div class='sheet-col' style='width: 69%; margin: 0px; padding: 0px;'></div> -->
-
-
-							<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}  {{name=@{Name}}} {{skillvalue=@{repairScore}}} {{fumble=[[ceil(95+(@{repairScore}*?{Multipler|1}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{repairScore}*?{Multipler|1}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{repairScore}*?{Multipler|1}+?{Mods|0})/5)+1]]}}        {{success=[[ceil(@{repairScore}*?{Multipler|1}+?{Mods|0})]]}} {{roll=[[1d100]]}} {{skillname=@{repairSkills}}}"/></td>																																																	 				 				 				 
-							<!--<button type="roll" value="/roll 1d100<@{repairScore" />-->
-
+					<input type="checkbox" name="attr_repairSuccess"  />
+					<input type="text" name="attr_repairSkills" class="sheet-skillname"/>
+					<input type="number" name="attr_repairScore" />
+					<button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{repairScore}}} {{fumble=[[ceil(95+(@{repairScore}*?{Multipler|1}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{repairScore}*?{Multipler|1}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{repairScore}*?{Multipler|1}+?{Mods|0})/5)+1]]}}        {{success=[[ceil(@{repairScore}*?{Multipler|1}+?{Mods|0})]]}} {{roll=[[1d100]]}} {{skillname=@{repairSkills}}}"/>
 				</fieldset>				
 				<table style="width: 100%;">				
 				<tr>
 					<td><input type="checkbox" name="attr_Success-Research"  /></td>
 					<td class="sheet-skillname">Research (25%)</td>
 					<td><input type="number" name="attr_Research"  /></td>
-					<!--<td><button type="roll" value="/roll 1d100<@{Research}" /></td>-->
 					<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{Research}}} {{fumble=[[ceil(95+(@{Research}*?{Multipler|1}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Research}*?{Multipler|1}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Research}*?{Multipler|1}+?{Mods|0})/5)+1]]}}       {{success=[[ceil(@{Research}*?{Multipler|1}+?{Mods|0})]]}} {{roll=[[1d100]]}} {{skillname=Research}}"/></td>																														
 				</tr>						
 					<tr>
@@ -543,153 +511,132 @@
 					</tr>	
 				</table>
 				<fieldset class='repeating_RideSkills'>
-							<!-- <div class='sheet-col' style='width: 69%; margin: 0px; padding: 0px;'></div> -->
-
-
-								<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}  {{name=@{Name}}} {{skillvalue=@{RideScore}}} {{fumble=[[ceil(95+(@{RideScore}*?{Multipler|1}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{RideScore}*?{Multipler|1}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{RideScore}*?{Multipler|1}+?{Mods|0})/5)+1]]}}        {{success=[[ceil(@{RideScore}*?{Multipler|1}+?{Mods|0})]]}} {{roll=[[1d100]]}} {{skillname=@{RideSkill}}}"/></td>																																																	 				 				 				 					 					 					 					 					 					 					 
-								<!--<button type="roll" value="/roll 1d100<@{RideScore}" />-->
-
+					<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}  {{name=@{Name}}} {{skillvalue=@{RideScore}}} {{fumble=[[ceil(95+(@{RideScore}*?{Multipler|1}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{RideScore}*?{Multipler|1}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{RideScore}*?{Multipler|1}+?{Mods|0})/5)+1]]}}        {{success=[[ceil(@{RideScore}*?{Multipler|1}+?{Mods|0})]]}} {{roll=[[1d100]]}} {{skillname=@{RideSkill}}}"/></td>
 				</fieldset>				 
 				<table style="width: 100%;">				
-						<tr>
-							<td class="sheet-chkfiller"></td>
-							<td>Science (01%)</td>
-						</tr>	
+					<tr>
+						<td class="sheet-chkfiller"></td>
+						<td>Science (01%)</td>
+					</tr>
 				</table>
 				<fieldset class='repeating_ScienceSkills'>
-							<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}  {{name=@{Name}}} {{skillvalue=@{ScienceScore}}} {{fumble=[[ceil(95+(@{ScienceScore}*?{Multipler|1}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{ScienceScore}*?{Multipler|1}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{ScienceScore}*?{Multipler|1}+?{Mods|0})/5)+1]]}}         {{success=[[ceil(@{ScienceScore}*?{Multipler|1}+?{Mods|0})]]}} {{roll=[[1d100]]}} {{skillname=@{ScienceSkill}}}"/></td>																																																	 				 				 				 					 					 					 
+					<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}  {{name=@{Name}}} {{skillvalue=@{ScienceScore}}} {{fumble=[[ceil(95+(@{ScienceScore}*?{Multipler|1}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{ScienceScore}*?{Multipler|1}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{ScienceScore}*?{Multipler|1}+?{Mods|0})/5)+1]]}}         {{success=[[ceil(@{ScienceScore}*?{Multipler|1}+?{Mods|0})]]}} {{roll=[[1d100]]}} {{skillname=@{ScienceSkill}}}"/>
 				</fieldset>	
 			
 		</div><!-- col 2 close --> 
-		<div class="sheet-col">
-
-			
+		<div class="sheet-col">			
 			<table style="width: 100%;">		
 			<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}  {{name=@{Name}}} {{skillvalue=@{Sense}}} {{fumble=[[ceil(95+(@{Sense}*?{Multipler|1}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Sense}*?{Multipler|1}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Sense}*?{Multipler|1}+?{Mods|0})/5)+1]]}}        {{success=[[ceil(@{Sense}*?{Multipler|1}+?{Mods|0})]]}} {{roll=[[1d100]]}} {{skillname=Sense}}"/></td>																																																																																					
-				<!--<td><button type="roll" value="/roll 1d100<@{Sense}" /></td>-->
+				<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{Sense}}} {{fumble=[[ceil(95+(@{Sense}*?{Multipler|1}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Sense}*?{Multipler|1}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Sense}*?{Multipler|1}+?{Mods|0})/5)+1]]}}        {{success=[[ceil(@{Sense}*?{Multipler|1}+?{Mods|0})]]}} {{roll=[[1d100]]}} {{skillname=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}  {{name=@{Name}}} {{skillvalue=@{SleightofHandScore}}} {{fumble=[[ceil(95+(@{SleightofHandScore}*?{Multipler|1}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{SleightofHandScore}*?{Multipler|1}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{SleightofHandScore}*?{Multipler|1}+?{Mods|0})/5)+1]]}}        {{success=[[ceil(@{SleightofHandScore}*?{Multipler|1}+?{Mods|0})]]}} {{roll=[[1d100]]}} {{skillname=Sleight of Hand}}"/></td>																																								
-
+				<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{SleightofHandScore}}} {{fumble=[[ceil(95+(@{SleightofHandScore}*?{Multipler|1}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{SleightofHandScore}*?{Multipler|1}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{SleightofHandScore}*?{Multipler|1}+?{Mods|0})/5)+1]]}}        {{success=[[ceil(@{SleightofHandScore}*?{Multipler|1}+?{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}  {{name=@{Name}}} {{skillvalue=@{Spot}}} {{fumble=[[ceil(95+(@{Spot}*?{Multipler|1}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Spot}*?{Multipler|1}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Spot}*?{Multipler|1}+?{Mods|0})/5)+1]]}}        {{success=[[ceil(@{Spot}*?{Multipler|1}+?{Mods|0})]]}} {{roll=[[1d100]]}} {{skillname=Spot}}"/></td>																																																																																										
-				<!--<td><button type="roll" value="/roll 1d100<@{Spot}" /></td>-->
+				<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{Spot}}} {{fumble=[[ceil(95+(@{Spot}*?{Multipler|1}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Spot}*?{Multipler|1}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Spot}*?{Multipler|1}+?{Mods|0})/5)+1]]}}        {{success=[[ceil(@{Spot}*?{Multipler|1}+?{Mods|0})]]}} {{roll=[[1d100]]}} {{skillname=Spot}}"/></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}  {{name=@{Name}}} {{skillvalue=@{Status}}} {{fumble=[[ceil(95+(@{Status}*?{Multipler|1}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Status}*?{Multipler|1}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Status}*?{Multipler|1}+?{Mods|0})/5)+1]]}}        {{success=[[ceil(@{Status}*?{Multipler|1}+?{Mods|0})]]}} {{roll=[[1d100]]}} {{skillname=Status}}"/></td>																																			
+				<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{Status}}} {{fumble=[[ceil(95+(@{Status}*?{Multipler|1}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Status}*?{Multipler|1}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Status}*?{Multipler|1}+?{Mods|0})/5)+1]]}}        {{success=[[ceil(@{Status}*?{Multipler|1}+?{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}  {{name=@{Name}}} {{skillvalue=@{Stealth}}} {{fumble=[[ceil(95+(@{Stealth}*?{Multipler|1}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Stealth}*?{Multipler|1}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Stealth}*?{Multipler|1}+?{Mods|0})/5)+1]]}}     {{success=[[ceil(@{Stealth}*?{Multipler|1}+?{Mods|0})]]}} {{roll=[[1d100]]}} {{skillname=Stealth}}"/></td>																																																																																																																													
-				<!--<td><button type="roll" value="/roll 1d100<@{Stealth}" /></td>-->
+				<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{Stealth}}} {{fumble=[[ceil(95+(@{Stealth}*?{Multipler|1}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Stealth}*?{Multipler|1}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Stealth}*?{Multipler|1}+?{Mods|0})/5)+1]]}}     {{success=[[ceil(@{Stealth}*?{Multipler|1}+?{Mods|0})]]}} {{roll=[[1d100]]}} {{skillname=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}  {{name=@{Name}}} {{skillvalue=@{Strategy}}} {{fumble=[[ceil(95+(@{Strategy}*?{Multipler|1}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Strategy}*?{Multipler|1}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Strategy}*?{Multipler|1}+?{Mods|0})/5)+1]]}}        {{success=[[ceil(@{Strategy}*?{Multipler|1}+?{Mods|0})]]}} {{roll=[[1d100]]}} {{skillname=Strategy}}"/></td>																																																												
-				<!--<td><button type="roll" value="/roll 1d100<@{Strategy}" /></td>-->
+				<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{Strategy}}} {{fumble=[[ceil(95+(@{Strategy}*?{Multipler|1}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Strategy}*?{Multipler|1}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Strategy}*?{Multipler|1}+?{Mods|0})/5)+1]]}}        {{success=[[ceil(@{Strategy}*?{Multipler|1}+?{Mods|0})]]}} {{roll=[[1d100]]}} {{skillname=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}  {{name=@{Name}}} {{skillvalue=@{Swim}}} {{fumble=[[ceil(95+(@{Swim}*?{Multipler|1}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Swim}*?{Multipler|1}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Swim}*?{Multipler|1}+?{Mods|0})/5)+1]]}}        {{success=[[ceil(@{Swim}*?{Multipler|1}+?{Mods|0})]]}} {{roll=[[1d100]]}} {{skillname=Swim}}"/></td>																																																																																																																																		
-				<!--<td><button type="roll" value="/roll 1d100<@{Swim}" /></td>-->
+				<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{Swim}}} {{fumble=[[ceil(95+(@{Swim}*?{Multipler|1}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Swim}*?{Multipler|1}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Swim}*?{Multipler|1}+?{Mods|0})/5)+1]]}}        {{success=[[ceil(@{Swim}*?{Multipler|1}+?{Mods|0})]]}} {{roll=[[1d100]]}} {{skillname=Swim}}"/></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}  {{name=@{Name}}} {{skillvalue=@{Teach}}} {{fumble=[[ceil(95+(@{Teach}*?{Multipler|1}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Teach}*?{Multipler|1}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Teach}*?{Multipler|1}+?{Mods|0})/5)+1]]}}          {{success=[[@{Teach}*?{Multipler|1}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Teach}}"/></td>																																								
+				<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{Teach}}} {{fumble=[[ceil(95+(@{Teach}*?{Multipler|1}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Teach}*?{Multipler|1}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Teach}*?{Multipler|1}+?{Mods|0})/5)+1]]}}          {{success=[[@{Teach}*?{Multipler|1}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Teach}}"/></td>
 			</tr>	
-
-					<tr>
-						<td class="sheet-chkfiller"></td>
-						<td>Technical Skill(Varies):</td>
-					</tr>	
+				<tr>
+					<td class="sheet-chkfiller"></td>
+					<td>Technical Skill(Varies):</td>
+				</tr>	
 			</table>
 			<fieldset class='repeating_TechSkills'>
-						<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}  {{name=@{Name}}} {{skillvalue=@{TechScore}}} {{fumble=[[ceil(95+(@{TechScore}*?{Multipler|1}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{TechScore}*?{Multipler|1}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{TechScore}*?{Multipler|1}+?{Mods|0})/5)+1]]}}        {{success=[[ceil(@{TechScore}*?{Multipler|1}+?{Mods|0})]]}} {{roll=[[1d100]]}} {{skillname=@{TechSkill}}}"/></td>																																																	 				 				 				 					 					 					 					 
+				<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}  {{name=@{Name}}} {{skillvalue=@{TechScore}}} {{fumble=[[ceil(95+(@{TechScore}*?{Multipler|1}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{TechScore}*?{Multipler|1}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{TechScore}*?{Multipler|1}+?{Mods|0})/5)+1]]}}        {{success=[[ceil(@{TechScore}*?{Multipler|1}+?{Mods|0})]]}} {{roll=[[1d100]]}} {{skillname=@{TechSkill}}}"/>
 			</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}  {{name=@{Name}}} {{skillvalue=@{throw}}} {{fumble=[[ceil(95+(@{throw}*?{Multipler|1}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{throw}*?{Multipler|1}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{throw}*?{Multipler|1}+?{Mods|0})/5)+1]]}}        {{success=[[ceil(@{throw}*?{Multipler|1}+?{Mods|0})]]}} {{roll=[[1d100]]}} {{skillname=Throw}}"/></td>																																																																																																																																							
-				<!--<td><button type="roll" value="/roll 1d100<@{Throw}" /></td>-->
+				<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{throw}}} {{fumble=[[ceil(95+(@{throw}*?{Multipler|1}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{throw}*?{Multipler|1}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{throw}*?{Multipler|1}+?{Mods|0})/5)+1]]}}        {{success=[[ceil(@{throw}*?{Multipler|1}+?{Mods|0})]]}} {{roll=[[1d100]]}} {{skillname=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}  {{name=@{Name}}} {{skillvalue=@{Track}}} {{fumble=[[ceil(95+(@{Track}*?{Multipler|1}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Track}*?{Multipler|1}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Track}*?{Multipler|1}+?{Mods|0})/5)+1]]}}        {{success=[[ceil(@{Track}*?{Multipler|1}+?{Mods|0})]]}} {{roll=[[1d100]]}} {{skillname=Track}}"/></td>																																																																																															
-				<!--<td><button type="roll" value="/roll 1d100<@{Track}" /></td>-->
+				<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{Track}}} {{fumble=[[ceil(95+(@{Track}*?{Multipler|1}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Track}*?{Multipler|1}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Track}*?{Multipler|1}+?{Mods|0})/5)+1]]}}        {{success=[[ceil(@{Track}*?{Multipler|1}+?{Mods|0})]]}} {{roll=[[1d100]]}} {{skillname=Track}}"/></td>
 			</tr>					
 			</table>		
 			<br />
 			<table style="width: 100%;">					
-					<tr>
-						<td class="sheet-chkfiller"></td>
-						<td><strong>Other Skills</strong></td>
-					</tr>					
+				<tr>
+					<td class="sheet-chkfiller"></td>
+					<td><strong>Other Skills</strong></td>
+				</tr>					
 			</table>
 			<fieldset class='repeating_OtherSkills'>
-						<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}  {{name=@{Name}}} {{skillvalue=@{OtherScore}}} {{fumble=[[ceil(95+(@{OtherScore}*?{Multipler|1}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{OtherScore}*?{Multipler|1}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{OtherScore}*?{Multipler|1}+?{Mods|0})/5)+1]]}}        {{success=[[ceil(@{OtherScore}*?{Multipler|1}+?{Mods|0})]]}} {{roll=[[1d100]]}} {{skillname=@{OtherSkill}}}"/></td>
+				<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}  {{name=@{Name}}} {{skillvalue=@{OtherScore}}} {{fumble=[[ceil(95+(@{OtherScore}*?{Multipler|1}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{OtherScore}*?{Multipler|1}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{OtherScore}*?{Multipler|1}+?{Mods|0})/5)+1]]}}        {{success=[[ceil(@{OtherScore}*?{Multipler|1}+?{Mods|0})]]}} {{roll=[[1d100]]}} {{skillname=@{OtherSkill}}}"/>
 			</fieldset>	
 			<br />
 				<table style="width: 100%;">					
-			
 					<tr>
 						<td class="sheet-chkfiller"></td>
 						<td><strong>Combat</strong></td>
 						<td></td>
 						<td></td>
 					</tr>
-					
 					<tr>
 						<td class="sheet-chkfiller"></td>
 						<td>Melee (Physical)</td>
 					</tr>	
-				
 				</table>	
 
 				<fieldset class='repeating_meleeSkills'>
-								<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}  {{name=@{Name}}} {{skillvalue=@{meleeScore}}} {{fumble=[[ceil(95+(@{meleeScore}*?{Multipler|1}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{meleeScore}*?{Multipler|1}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{meleeScore}*?{Multipler|1}+?{Mods|0})/5)+1]]}}        {{success=[[ceil(@{meleeScore}*?{Multipler|1}+?{Mods|0})]]}} {{roll=[[1d100]]}} {{skillname=@{meleeSkill}}}"/></td>
+					<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}  {{name=@{Name}}} {{skillvalue=@{meleeScore}}} {{fumble=[[ceil(95+(@{meleeScore}*?{Multipler|1}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{meleeScore}*?{Multipler|1}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{meleeScore}*?{Multipler|1}+?{Mods|0})/5)+1]]}}        {{success=[[ceil(@{meleeScore}*?{Multipler|1}+?{Mods|0})]]}} {{roll=[[1d100]]}} {{skillname=@{meleeSkill}}}"/>
 				</fieldset>				
 
 				<table style="width: 100%;">
@@ -699,14 +646,10 @@
 				</tr>	
 				</table>
 				<fieldset class='repeating_rangedSkills'>
-							<!-- <div class='sheet-col' style='width: 69%; margin: 0px; padding: 0px;'></div> -->
-
-
-								<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}  {{name=@{Name}}} {{skillvalue=@{rangedScore}}} {{fumble=[[ceil(95+(@{rangedScore}*?{Multipler|1}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{rangedScore}*?{Multipler|1}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{rangedScore}*?{Multipler|1}+?{Mods|0})/5)+1]]}}         {{success=[[ceil(@{rangedScore}*?{Multipler|1}+?{Mods|0})]]}} {{roll=[[1d100]]}} {{skillname=@{rangedSkill}}}"/></td>																																																	 				 				 				 					 					 					 					 					 					 					 
-								<!--<button type="roll" value="/roll 1d100<@{RideScore}" />-->
+					<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}  {{name=@{Name}}} {{skillvalue=@{rangedScore}}} {{fumble=[[ceil(95+(@{rangedScore}*?{Multipler|1}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{rangedScore}*?{Multipler|1}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{rangedScore}*?{Multipler|1}+?{Mods|0})/5)+1]]}}         {{success=[[ceil(@{rangedScore}*?{Multipler|1}+?{Mods|0})]]}} {{roll=[[1d100]]}} {{skillname=@{rangedSkill}}}"/>
 				</fieldset>
 				
 				<table style="width: 100%;">
@@ -716,14 +659,10 @@
 				</tr>	
 				</table>
 				<fieldset class='repeating_artillerySkills'>
-							<!-- <div class='sheet-col' style='width: 69%; margin: 0px; padding: 0px;'></div> -->
-
-
-								<input type="checkbox" name="attr_ArtillerySucess"  />
-								<input type="text" name="attr_ArtillerySkill" class="sheet-skillname"/>
-								<input type="number" name="attr_ArtilleryScore" />
-								<button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{ArtilleryScore}}} {{fumble=[[ceil(95+(@{ArtilleryScore}*?{Multipler|1}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{ArtilleryScore}*?{Multipler|1}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{ArtilleryScore}*?{Multipler|1}+?{Mods|0})/5)+1]]}}         {{success=[[ceil(@{ArtilleryScore}*?{Multipler|1}+?{Mods|0})]]}} {{roll=[[1d100]]}} {{skillname=@{ArtillerySkill}}}"/></td>																																																	 				 				 				 					 					 					 					 					 					 					 
-								<!--<button type="roll" value="/roll 1d100<@{RideScore}" />-->
+					<input type="checkbox" name="attr_ArtillerySucess"  />
+					<input type="text" name="attr_ArtillerySkill" class="sheet-skillname"/>
+					<input type="number" name="attr_ArtilleryScore" />
+					<button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{ArtilleryScore}}} {{fumble=[[ceil(95+(@{ArtilleryScore}*?{Multipler|1}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{ArtilleryScore}*?{Multipler|1}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{ArtilleryScore}*?{Multipler|1}+?{Mods|0})/5)+1]]}}         {{success=[[ceil(@{ArtilleryScore}*?{Multipler|1}+?{Mods|0})]]}} {{roll=[[1d100]]}} {{skillname=@{ArtillerySkill}}}"/>
 				</fieldset>				
 				<br />					
 			<br>
@@ -749,38 +688,30 @@
 					<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="/roll 1d100<@{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=[[ceil((@{Bargain}+@{Communication})*?{Multipler|1})+?{Mods|0}]]}} {{fumble=[[ceil((95+((@{Bargain}+@{Communication})*?{Multipler|1})+?{Mods|0})/20))]]}} {{crit=[[ceil(((@{Bargain}+@{Communication})*?{Multipler|1}+?{Mods|0})/20)+1]]}} {{special=[[ceil(((@{Bargain}+@{Communication})*?{Multipler|1}+?{Mods|0})/5)+1]]}}  {{skillvalue=@{Bargain}}}  {{roll=[[1d100]]}} {{skillname=Bargain}}"/></td> 
-					<!-- {{crit=[[ floor((@{Bargain}+@{Communication})/20)]]}}  -->
 				</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}  {{name=@{Name}}} {{skillvalue=@{Command}}} {{fumble=[[ceil(95+(@{Command}+@{Communication}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Command}+@{Communication}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Command}+@{Communication}+?{Mods|0})/5)+1]]}}  {{success=[[@{Command}+@{Communication}+?{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}  {{name=@{Name}}} {{skillvalue=@{Disguise}}} {{fumble=[[ceil(95+(@{Disguise}+@{Communication}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Disguise}+@{Communication}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Disguise}+@{Communication}+?{Mods|0})/5)+1]]}}    {{success=[[@{Disguise}+@{Communication}+?{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}  {{name=@{Name}}} {{skillvalue=@{Etiquette}}}  {{fumble=[[ceil(95+(@{Etiquette}+@{Communication}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Etiquette}+@{Communication}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Etiquette}+@{Communication}+?{Mods|0})/5)+1]]}}         {{success=[[@{Etiquette}+@{Communication}+?{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}  {{name=@{Name}}} {{skillvalue=@{ownLang}}}  {{fumble=[[ceil(95+(@{ownLang}+@{Communication}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{ownLang}+@{Communication}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{ownLang}+@{Communication}+?{Mods|0})/5)+1]]}}        {{success=[[@{ownLang}+@{Communication}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Own Language}}"/></td>																				
 				</tr>
 			</table>
@@ -795,28 +726,24 @@
 					<td><input type="checkbox" name="attr_Success-Perform"  /></td>
 					<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}  {{name=@{Name}}} {{skillvalue=@{Perform}}} {{fumble=[[ceil(95+(@{Perform}+@{Communication}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Perform}+@{Communication}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Perform}+@{Communication}+?{Mods|0})/5)+1]]}}        {{success=[[@{Perform}+@{Communication}+?{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}  {{name=@{Name}}} {{skillvalue=@{Persuade}}} {{fumble=[[ceil(95+(@{Persuade}+@{Communication}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Persuade}+@{Communication}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Etiquette}+@{Communication}+?{Mods|0})/5)+1]]}}       {{success=[[@{Persuade}+@{Communication}+?{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}  {{name=@{Name}}} {{skillvalue=@{Status}}} {{fumble=[[ceil(95+(@{Status}+@{Communication}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Status}+@{Communication}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Status}+@{Communication}+?{Mods|0})/5)+1]]}}        {{success=[[@{Status}+@{Communication}+?{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}  {{name=@{Name}}} {{skillvalue=@{Teach}}} {{fumble=[[ceil(95+(@{Teach}+@{Communication}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Teach}+@{Communication}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Teach}+@{Communication}+?{Mods|0})/5)+1]]}}          {{success=[[@{Teach}+@{Communication}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Teach}}"/></td>																																								
 				</tr>
 			</table>	
@@ -824,17 +751,14 @@
 				<table style="width: 100%;">	
 					<tr>
 						<td><input type="checkbox" name="attr_ComSuccess"  /></td>
-						<!-- <input type="text" name="attr_ComSkillname" style="width: 145px" /> -->
 						<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}  {{name=@{Name}}} {{skillvalue=@{ComScore}}} {{fumble=[[ceil(95+(@{ComScore}+@{Communication}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{ComScore}+@{Communication}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{ComScore}+@{Communication}+?{Mods|0})/5)+1]]}}         {{success=[[@{ComScore}+@{Communication}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{ComSkillname}}}"/></td>
 					</tr>
 				</table>
 			</fieldset>
 			<table style="width: 100%;">
 				<tr>
-					<!-- <td style="width="20px"></td> -->
 					<td class="sheet-chkfiller"></td>
 					<td><b class="sheet-cat_header">Manipulation</b></td>
 					<td><input type="number" name="attr_manipulation" value="0" /></td>
@@ -845,15 +769,13 @@
 				</tr>			
 			</table>
 			<fieldset class='repeating_artskills'>
-				<!-- <div class='sheet-col' style='width: 69%; margin: 0px; padding: 0px;'></div> -->
 				<table style="width: 100%;">	
 					<tr>
-					<td><input type="checkbox" name="attr_artSuccess"  /></td>
-					<!--<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}  {{name=@{Name}}} {{skillvalue=@{artScore}}} {{fumble=[[ceil(95+(@{artScore}+@{Manipulation}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{artScore}+@{Manipulation}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{artScore}+@{Manipulation}+?{Mods|0})/5)+1]]}}          {{success=[[@{artScore}+@{Manipulation}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{artSkillname}}}"/></td>
-				</tr>
+						<td><input type="checkbox" name="attr_artSuccess"  /></td>
+						<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}  {{name=@{Name}}} {{skillvalue=@{artScore}}} {{fumble=[[ceil(95+(@{artScore}+@{Manipulation}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{artScore}+@{Manipulation}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{artScore}+@{Manipulation}+?{Mods|0})/5)+1]]}}          {{success=[[@{artScore}+@{Manipulation}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{artSkillname}}}"/></td>
+					</tr>
 				</table>
 			</fieldset>
 			<table style="width: 100%;">				
@@ -873,73 +795,53 @@
 					<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}  {{name=@{Name}}} {{skillvalue=@{Demolition}}} {{fumble=[[ceil(95+(@{Demolition}+@{Manipulation}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Demolition}+@{Manipulation}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Demolition}+@{Manipulation}+?{Mods|0})/5)+1]]}}         {{success=[[@{Demolition}+@{Manipulation}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Demolition}}"/></td>																																			
-					<!--<td><button type="roll" value="/roll 1d100<@{Demolition}" /></td>-->					
+					<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{Demolition}}} {{fumble=[[ceil(95+(@{Demolition}+@{Manipulation}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Demolition}+@{Manipulation}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Demolition}+@{Manipulation}+?{Mods|0})/5)+1]]}}         {{success=[[@{Demolition}+@{Manipulation}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=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}  {{name=@{Name}}} {{skillvalue=@{FineManipulation}}}  {{fumble=[[ceil(95+(@{FineManipulation}+@{Manipulation}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{FineManipulation}+@{Manipulation}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{FineManipulation}+@{Manipulation}+?{Mods|0})/5)+1]]}}        {{success=[[@{FineManipulation}+@{Manipulation}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Fine Manip.}}"/></td>
-					<!--<td><button type="roll" value="/roll 1d100<@{FineManipulation}" /></td>-->
 				</tr>
 			</table>
 			<table style="width: 100%;">				
-					<tr>
-						<td class="sheet-chkfiller"></td>
-						<td>Heavy Machine (01%):</td>
-					</tr>	
+				<tr>
+					<td class="sheet-chkfiller"></td>
+					<td>Heavy Machine (01%):</td>
+				</tr>
 			</table>
 			<fieldset class='repeating_hMachineSkills'>
-				<!-- <div class='sheet-col' style='width: 69%; margin: 0px; padding: 0px;'></div> -->
-	
-	
-					<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}  {{name=@{Name}}} {{skillvalue=@{hMachineScore}}} {{fumble=[[ceil(95+(@{hMachineScore}+@{Manipulation}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{hMachineScore}+@{Manipulation}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{hMachineScore}+@{Manipulation}+?{Mods|0})/5)+1]]}}         {{success=[[@{hMachineScore}+@{Manipulation}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{hMachineSkills}}}"/></td>																																																	 				 				 
-					<!--<button type="roll" value="/roll 1d100<@{hMachineScore}" />-->
-	
+				<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}  {{name=@{Name}}} {{skillvalue=@{hMachineScore}}} {{fumble=[[ceil(95+(@{hMachineScore}+@{Manipulation}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{hMachineScore}+@{Manipulation}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{hMachineScore}+@{Manipulation}+?{Mods|0})/5)+1]]}}         {{success=[[@{hMachineScore}+@{Manipulation}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{hMachineSkills}}}"/></td>
 			</fieldset>				
 			<table style="width: 100%;">				
-					<tr>
-						<td class="sheet-chkfiller"></td>
-						<td class="sheet-skillname">Repair (15%)</td>
-					</tr>	
+				<tr>
+					<td class="sheet-chkfiller"></td>
+					<td class="sheet-skillname">Repair (15%)</td>
+				</tr>	
 			</table>
 			<fieldset class='repeating_repairSkills'>
-				<!-- <div class='sheet-col' style='width: 69%; margin: 0px; padding: 0px;'></div> -->
-	
-	
-					<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}  {{name=@{Name}}} {{skillvalue=@{repairScore}}} {{fumble=[[ceil(95+(@{repairScore}+@{Manipulation}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{repairScore}+@{Manipulation}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{repairScore}+@{Manipulation}+?{Mods|0})/5)+1]]}}        {{success=[[@{repairScore}+@{Manipulation}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{repairSkills}}}"/></td>																																																	 				 				 				 
-					<!--<button type="roll" value="/roll 1d100<@{repairScore" />-->
-	
+				<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}  {{name=@{Name}}} {{skillvalue=@{repairScore}}} {{fumble=[[ceil(95+(@{repairScore}+@{Manipulation}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{repairScore}+@{Manipulation}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{repairScore}+@{Manipulation}+?{Mods|0})/5)+1]]}}        {{success=[[@{repairScore}+@{Manipulation}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{repairSkills}}}"/></td>
 			</fieldset>				
 			<table style="width: 100%;">				
 				<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}  {{name=@{Name}}} {{skillvalue=@{SleightofHandScore}}} {{fumble=[[ceil(95+(@{SleightofHandScore}+@{Manipulation}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{SleightofHandScore}+@{Manipulation}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{SleightofHandScore}+@{Manipulation}+?{Mods|0})/5)+1]]}}        {{success=[[@{SleightofHandScore}+@{Manipulation}+?{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>-->
+					<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{SleightofHandScore}}} {{fumble=[[ceil(95+(@{SleightofHandScore}+@{Manipulation}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{SleightofHandScore}+@{Manipulation}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{SleightofHandScore}+@{Manipulation}+?{Mods|0})/5)+1]]}}        {{success=[[@{SleightofHandScore}+@{Manipulation}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Sleight of Hand}}"/></td>
 				</tr>
-			
-	
 			</table>
-			<fieldset class='repeating_manipkills'>
-				<!-- <div class='sheet-col' style='width: 69%; margin: 0px; padding: 0px;'></div> -->
-	
+			<fieldset class='repeating_manipkills'>	
 				<table style="width: 100%;">	
 				<tr>
 					<td><input type="checkbox" name="attr_manipSuccess"  /></td>
-					<!-- <input type="text" name="attr_ComSkillname" style="width: 145px" /> -->
 					<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}  {{name=@{Name}}} {{skillvalue=@{manipScore}}} {{fumble=[[ceil(95+(@{manipScore}+@{Manipulation}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{manipScore}+@{Manipulation}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{manipScore}+@{Manipulation}+?{Mods|0})/5)+1]]}}         {{success=[[@{manipScore}+@{Manipulation}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{manipSkillname}}}"/></td>
 				</tr>		
 				</table>			
@@ -956,108 +858,93 @@
 					<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}  {{name=@{Name}}} {{skillvalue=@{Appraise}}} {{fumble=[[ceil(95+(@{Appraise}+@{Mental}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Appraise}@{Mental}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Appraise}@{Mental}+?{Mods|0})/5)+1]]}}         {{success=[[@{Appraise}+@{Mental}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Appraise}}"/></td>																																								
-					<!--<td><button type="roll" value="/roll 1d100<@{Appraise}" /></td>-->
+					<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{Appraise}}} {{fumble=[[ceil(95+(@{Appraise}+@{Mental}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Appraise}@{Mental}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Appraise}@{Mental}+?{Mods|0})/5)+1]]}}         {{success=[[@{Appraise}+@{Mental}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=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}  {{name=@{Name}}} {{skillvalue=@{FirstAid}}} {{fumble=[[ceil(95+(@{FirstAid}+@{Mental}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{FirstAid}+@{Mental}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{FirstAid}+@{Mental}+?{Mods|0})/5)+1]]}}       {{success=[[@{FirstAid}+@{Mental}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=First Aid}}"/></td>																																													
-					<!--<td><button type="roll" value="/roll 1d100<@{FirstAid}" /></td>-->
+					<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{FirstAid}}} {{fumble=[[ceil(95+(@{FirstAid}+@{Mental}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{FirstAid}+@{Mental}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{FirstAid}+@{Mental}+?{Mods|0})/5)+1]]}}       {{success=[[@{FirstAid}+@{Mental}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=First Aid}}"/></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}  {{name=@{Name}}} {{skillvalue=@{Gaming}}} {{fumble=[[ceil(95+(@{Gaming}+@{Mental}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Gaming}+@{Manipulation}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Gaming}+@{Mental}+?{Mods|0})/5)+1]]}}        {{success=[[@{Gaming}+@{Mental}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Gaming}}"/></td>																																																		
-					<!--<td><button type="roll" value="/roll 1d100<@{Gaming}" /></td>-->
+					<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{Gaming}}} {{fumble=[[ceil(95+(@{Gaming}+@{Mental}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Gaming}+@{Manipulation}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Gaming}+@{Mental}+?{Mods|0})/5)+1]]}}        {{success=[[@{Gaming}+@{Mental}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Gaming}}"/></td>
 				</tr>
 				<tr>
 					<td><input type="checkbox" name="attr_Success-Psychotherapy"  /></td>
 					<td class="sheet-skillname">Psychotherapy (00 or 01)</td>
 					<td><input type="number" name="attr_Psychotherapy"  /></td>
-					<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{Psychotherapy}}} {{fumble=[[ceil(95+(@{Psychotherapy}+@{Mental}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Psychotherapy}+@{Mental}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Psychotherapy}+@{Mental}+?{Mods|0})/5)+1]]}}        {{success=[[@{Psychotherapy}+@{Mental}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Psychotherapy}}"/></td>																																																		
-					<!--<td><button type="roll" value="/roll 1d100<@{Psychotherapy}" /></td>-->
+					<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{Psychotherapy}}} {{fumble=[[ceil(95+(@{Psychotherapy}+@{Mental}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Psychotherapy}+@{Mental}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Psychotherapy}+@{Mental}+?{Mods|0})/5)+1]]}}        {{success=[[@{Psychotherapy}+@{Mental}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Psychotherapy}}"/></td>
 				</tr>                
-				
 			</table>
 			<table style="width: 100%;">				
-					<tr>
-						<td class="sheet-chkfiller"></td>
-						<td>Knowledge (Varies):</td>
-					</tr>	
+				<tr>
+					<td class="sheet-chkfiller"></td>
+					<td>Knowledge (Varies):</td>
+				</tr>	
 			</table>
 			<fieldset class='repeating_repairSkills'>
-					<!-- <div class='sheet-col' style='width: 69%; margin: 0px; padding: 0px;'></div> -->
-						<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}  {{name=@{Name}}} {{skillvalue=@{KnowScore}}} {{fumble=[[ceil(95+(@{KnowScore}+@{Mental}?{Mods|0})/20))]]}} {{crit=[[ceil((@{KnowScore}+@{Mental}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{KnowScore}+@{Mental}+?{Mods|0})/5)+1]]}}         {{success=[[@{KnowScore}+@{Mental}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{KnowSkills}}}"/></td>																																																	 				 				 				 					 
-						<!--<button type="roll" value="/roll 1d100<@{KnowScore}" />-->
+				<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}  {{name=@{Name}}} {{skillvalue=@{KnowScore}}} {{fumble=[[ceil(95+(@{KnowScore}+@{Mental}?{Mods|0})/20))]]}} {{crit=[[ceil((@{KnowScore}+@{Mental}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{KnowScore}+@{Mental}+?{Mods|0})/5)+1]]}}         {{success=[[@{KnowScore}+@{Mental}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{KnowSkills}}}"/></td>
 			</fieldset>				
 			<table style="width: 100%;">				
-					<tr>
-						<td class="sheet-chkfiller"></td>
-						<td>Literacy (Varies):</td>
-					</tr>	
+				<tr>
+					<td class="sheet-chkfiller"></td>
+					<td>Literacy (Varies):</td>
+				</tr>	
 			</table>
 			<fieldset class='repeating_LitSkills'>
-					<!-- <div class='sheet-col' style='width: 69%; margin: 0px; padding: 0px;'></div> -->
-						<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}  {{name=@{Name}}} {{skillvalue=@{LitScore}}} {{fumble=[[ceil(95+(@{LitScore}+@{Mental}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{LitScore}+@{Mental}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{LitScore}+@{Mental}+?{Mods|0})/5)+1]]}}        {{success=[[@{LitScore}+@{Mental}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{LitSkill}}}"/></td>																																																	 				 				 				 					 					 
-						<!--<button type="roll" value="/roll 1d100<@{LitScore}" />-->
+				<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}  {{name=@{Name}}} {{skillvalue=@{LitScore}}} {{fumble=[[ceil(95+(@{LitScore}+@{Mental}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{LitScore}+@{Mental}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{LitScore}+@{Mental}+?{Mods|0})/5)+1]]}}        {{success=[[@{LitScore}+@{Mental}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{LitSkill}}}"/>
 			</fieldset>					
 			<table style="width: 100%;">	
 				<tr>
 					<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}  {{name=@{Name}}} {{skillvalue=@{Medicine}}} {{fumble=[[ceil(95+(@{Medicine}+@{Mental}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Medicine}+@{Mental}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Medicine}+@{Mental}+?{Mods|0})/5)+1]]}}        {{success=[[@{Medicine}+@{Mental}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Medicine}}"/></td>																																																							
-					<!--<td><button type="roll" value="/roll 1d100<@{Medicine}" /></td>-->
+					<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{Medicine}}} {{fumble=[[ceil(95+(@{Medicine}+@{Mental}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Medicine}+@{Mental}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Medicine}+@{Mental}+?{Mods|0})/5)+1]]}}        {{success=[[@{Medicine}+@{Mental}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Medicine}}"/></td>
 				</tr>
 			</table>
 			<table style="width: 100%;">				
-					<tr>
-						<td class="sheet-chkfiller"></td>
-						<td>Science (01%)</td>
-					</tr>	
+				<tr>
+					<td class="sheet-chkfiller"></td>
+					<td>Science (01%)</td>
+				</tr>
 			</table>
 			<fieldset class='repeating_ScienceSkills'>
-					<!-- <div class='sheet-col' style='width: 69%; margin: 0px; padding: 0px;'></div> -->
-						<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}  {{name=@{Name}}} {{skillvalue=@{ScienceScore}}} {{fumble=[[ceil(95+(@{ScienceScore}+@{Mental}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{ScienceScore}+@{Mental}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{ScienceScore}+@{Mental}+?{Mods|0})/5)+1]]}}         {{success=[[@{ScienceScore}+@{Mental}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{ScienceSkill}}}"/></td>																																																	 				 				 				 					 					 					 
-						<!--<button type="roll" value="/roll 1d100<@{ScienceScore}" />-->
+				<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}  {{name=@{Name}}} {{skillvalue=@{ScienceScore}}} {{fumble=[[ceil(95+(@{ScienceScore}+@{Mental}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{ScienceScore}+@{Mental}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{ScienceScore}+@{Mental}+?{Mods|0})/5)+1]]}}         {{success=[[@{ScienceScore}+@{Mental}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{ScienceSkill}}}"/>
 			</fieldset>				
 			<table style="width: 100%;">				
 				<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}  {{name=@{Name}}} {{skillvalue=@{Strategy}}} {{fumble=[[ceil(95+(@{Strategy}+@{Mental}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Strategy}+@{Mental}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Strategy}+@{Mental}+?{Mods|0})/5)+1]]}}        {{success=[[@{Strategy}+@{Mental}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Strategy}}"/></td>																																																												
-					<!--<td><button type="roll" value="/roll 1d100<@{Strategy}" /></td>-->
+					<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{Strategy}}} {{fumble=[[ceil(95+(@{Strategy}+@{Mental}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Strategy}+@{Mental}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Strategy}+@{Mental}+?{Mods|0})/5)+1]]}}        {{success=[[@{Strategy}+@{Mental}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Strategy}}"/></td>
 				</tr>
 			</table>	
 			<table style="width: 100%;">				
-					<tr>
-						<td class="sheet-chkfiller"></td>
-						<td>Technical Skill(Varies):</td>
-					</tr>	
+				<tr>
+					<td class="sheet-chkfiller"></td>
+					<td>Technical Skill(Varies):</td>
+				</tr>
 			</table>
 			<fieldset class='repeating_TechSkills'>
-					<!-- <div class='sheet-col' style='width: 69%; margin: 0px; padding: 0px;'></div> -->
-						<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}  {{name=@{Name}}} {{skillvalue=@{TechScore}}} {{fumble=[[ceil(95+(@{TechScore}+@{Mental}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{TechScore}+@{Mental}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{TechScore}+@{Mental}+?{Mods|0})/5)+1]]}}        {{success=[[@{TechScore}+@{Mental}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{TechSkill}}}"/></td>																																																	 				 				 				 					 					 					 					 
-						<!--<button type="roll" value="/roll 1d100<@{TechScore}" />-->
+				<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}  {{name=@{Name}}} {{skillvalue=@{TechScore}}} {{fumble=[[ceil(95+(@{TechScore}+@{Mental}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{TechScore}+@{Mental}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{TechScore}+@{Mental}+?{Mods|0})/5)+1]]}}        {{success=[[@{TechScore}+@{Mental}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{TechSkill}}}"/>
 			</fieldset>					
 			<table style="width: 100%;">								
-					<tr>
+				<tr>
 					<td style="width:20px"></td>
 					<td class="sheet-skillname"><b class="sheet-cat_header">Perception</b></td>
 					<td><input type="number" name="attr_Perception" value="0" /></td>
@@ -1066,64 +953,52 @@
 					<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}  {{name=@{Name}}} {{skillvalue=@{Insight}}} {{fumble=[[ceil(95+(@{Insight}+@{Perception}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Insight}+@{Perception}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Insight}+@{Perception}+?{Mods|0})/5)+1]]}}        {{success=[[@{Insight}+@{Perception}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Insight}}"/></td>																																																																						
-					<!--<td><button type="roll" value="/roll 1d100<@{Insight}" /></td>-->
+					<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{Insight}}} {{fumble=[[ceil(95+(@{Insight}+@{Perception}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Insight}+@{Perception}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Insight}+@{Perception}+?{Mods|0})/5)+1]]}}        {{success=[[@{Insight}+@{Perception}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=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}  {{name=@{Name}}} {{skillvalue=@{Listen}}} {{fumble=[[ceil(95+(@{Listen}+@{Perception}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Listen}+@{Perception}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Listen}+@{Perception}+?{Mods|0})/5)+1]]}}   {{success=[[@{Listen}+@{Perception}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Listen}}"/></td>																																																																											
-					<!--<td><button type="roll" value="/roll 1d100<@{Listen}" /></td>-->
+					<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{Listen}}} {{fumble=[[ceil(95+(@{Listen}+@{Perception}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Listen}+@{Perception}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Listen}+@{Perception}+?{Mods|0})/5)+1]]}}   {{success=[[@{Listen}+@{Perception}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=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}  {{name=@{Name}}} {{skillvalue=@{Navigate}}} {{fumble=[[ceil(95+(@{Navigate}+@{Perception}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Navigate}+@{Perception}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Navigate}+@{Perception}+?{Mods|0})/5)+1]]}}        {{success=[[@{Navigate}+@{Perception}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Navigate}}"/></td>																																																																																
-					<!--<td><button type="roll" value="/roll 1d100<@{Navigate}" /></td>-->
+					<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{Navigate}}} {{fumble=[[ceil(95+(@{Navigate}+@{Perception}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Navigate}+@{Perception}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Navigate}+@{Perception}+?{Mods|0})/5)+1]]}}        {{success=[[@{Navigate}+@{Perception}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Navigate}}"/></td>
 				</tr>
 				<tr>
 					<td><input type="checkbox" name="attr_Success-Research"  /></td>
 					<td class="sheet-skillname">Research (25%)</td>
 					<td><input type="number" name="attr_Research"  /></td>
-					<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{Research}}} {{fumble=[[ceil(95+(@{Research}+@{Perception}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Research}+@{Perception}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Research}+@{Perception}+?{Mods|0})/5)+1]]}}        {{success=[[@{Research}+@{Perception}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Research}}"/></td>																																																																																
-					<!--<td><button type="roll" value="/roll 1d100<@{Research}" /></td>-->
+					<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{Research}}} {{fumble=[[ceil(95+(@{Research}+@{Perception}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Research}+@{Perception}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Research}+@{Perception}+?{Mods|0})/5)+1]]}}        {{success=[[@{Research}+@{Perception}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Research}}"/></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}  {{name=@{Name}}} {{skillvalue=@{Sense}}} {{fumble=[[ceil(95+(@{Sense}+@{Perception}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Sense}+@{Perception}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Sense}+@{Perception}+?{Mods|0})/5)+1]]}}        {{success=[[@{Sense}+@{Perception}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Sense}}"/></td>																																																																																					
-					<!--<td><button type="roll" value="/roll 1d100<@{Sense}" /></td>-->
+					<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{Sense}}} {{fumble=[[ceil(95+(@{Sense}+@{Perception}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Sense}+@{Perception}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Sense}+@{Perception}+?{Mods|0})/5)+1]]}}        {{success=[[@{Sense}+@{Perception}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=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}  {{name=@{Name}}} {{skillvalue=@{Spot}}} {{fumble=[[ceil(95+(@{Spot}+@{Perception}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Spot}+@{Perception}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Spot}+@{Perception}+?{Mods|0})/5)+1]]}}        {{success=[[@{Spot}+@{Perception}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Spot}}"/></td>																																																																																										
-					<!--<td><button type="roll" value="/roll 1d100<@{Spot}" /></td>-->
+					<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{Spot}}} {{fumble=[[ceil(95+(@{Spot}+@{Perception}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Spot}+@{Perception}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Spot}+@{Perception}+?{Mods|0})/5)+1]]}}        {{success=[[@{Spot}+@{Perception}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=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}  {{name=@{Name}}} {{skillvalue=@{Track}}} {{fumble=[[ceil(95+(@{Track}+@{Perception}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Track}+@{Perception}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Track}+@{Perception}+?{Mods|0})/5)+1]]}}        {{success=[[@{Track}+@{Perception}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Track}}"/></td>																																																																																															
-					<!--<td><button type="roll" value="/roll 1d100<@{Track}" /></td>-->
+					<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{Track}}} {{fumble=[[ceil(95+(@{Track}+@{Perception}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Track}+@{Perception}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Track}+@{Perception}+?{Mods|0})/5)+1]]}}        {{success=[[@{Track}+@{Perception}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Track}}"/></td>
 				</tr>					
 				
 
 			</table>
 			<fieldset class='repeating_PercepSkills'>
-					<!-- <div class='sheet-col' style='width: 69%; margin: 0px; padding: 0px;'></div> -->
-
-
-						<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}  {{name=@{Name}}} {{skillvalue=@{PercepScore}}} {{fumble=[[ceil(95+(@{PercepScore}+@{Perception}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{PercepScore}+@{Perception}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{PercepScore}+@{Perception}+?{Mods|0})/5)+1]]}}        {{success=[[@{PercepScore}+@{Perception}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{PercepSkill}}}"/></td>																																																	 				 				 				 					 					 					 					 
-						<!--<button type="roll" value="/roll 1d100<@{TechScore}" />-->
-
+				<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}  {{name=@{Name}}} {{skillvalue=@{PercepScore}}} {{fumble=[[ceil(95+(@{PercepScore}+@{Perception}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{PercepScore}+@{Perception}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{PercepScore}+@{Perception}+?{Mods|0})/5)+1]]}}        {{success=[[@{PercepScore}+@{Perception}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{PercepSkill}}}"/></td>
 			</fieldset>	
 		</div>
 		<div class="sheet-col">
@@ -1138,77 +1013,60 @@
 					<td class="sheet-skillname">Climb (40%)</td>
 					<td><input type="number" name="attr_Climb"  /></td>
 					<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{Climb}}} {{fumble=[[ceil(95+(@{Climb}+@{Physical}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Climb}+@{Physical}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Climb}+@{Physical}+?{Mods|0})/5)+1]]}}       {{success=[[@{Climb}+@{Physical}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Climb}}"/></td>
-					<!--<td><button type="roll" value="/roll 1d100<@{Climb}" /></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}  {{name=@{Name}}} {{skillvalue=@{Dodge}}} {{fumble=[[ceil(95+(@{Dodge}+@{Physical}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Dodge}+@{Physical}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Dodge}+@{Physical}+?{Mods|0})/5)+1]]}}        {{success=[[@{Dodge}+@{Physical}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Dodge}}"/></td>																																																																																																				
-					<!--<td><button type="roll" value="/roll 1d100<@{Dodge}" /></td>-->
+					<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{Dodge}}} {{fumble=[[ceil(95+(@{Dodge}+@{Physical}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Dodge}+@{Physical}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Dodge}+@{Physical}+?{Mods|0})/5)+1]]}}        {{success=[[@{Dodge}+@{Physical}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Dodge}}"/></td>
 				</tr>
 			</table>		
 			<table style="width: 100%;">				
-					<tr>
-						<td class="sheet-chkfiller"></td>
-						<td>Drive(Varies):</td>
-					</tr>	
+				<tr>
+					<td class="sheet-chkfiller"></td>
+					<td>Drive(Varies):</td>
+				</tr>	
 			</table>
 			<fieldset class='repeating_DriveSkills'>
-					<!-- <div class='sheet-col' style='width: 69%; margin: 0px; padding: 0px;'></div> -->
-						<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}  {{name=@{Name}}} {{skillvalue=@{DriveScore}}} {{fumble=[[ceil(95+(@{DriveScore}+@{Physical}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{DriveScore}+@{Physical}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{DriveScore}+@{Physical}+?{Mods|0})/5)+1]]}}        {{success=[[@{DriveScore}+@{Physical}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{DriveSkill}}}"/></td>																																																	 				 				 				 					 					 					 					 					 
-						<!--<button type="roll" value="/roll 1d100<@{DriveScore}" />-->
+				<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}  {{name=@{Name}}} {{skillvalue=@{DriveScore}}} {{fumble=[[ceil(95+(@{DriveScore}+@{Physical}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{DriveScore}+@{Physical}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{DriveScore}+@{Physical}+?{Mods|0})/5)+1]]}}        {{success=[[@{DriveScore}+@{Physical}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{DriveSkill}}}"/>
 			</fieldset>				
 
 			<table style="width: 100%;">
-					<!--
-					<tr>
-						<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}  {{name=@{Name}}} {{skillvalue=@{Fly}}} {{fumble=[[ceil(95+(@{Fly}+@{Physical}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Fly}+@{Physical}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Fly}+@{Physical}+?{Mods|0})/5)+1]]}}          {{success=[[@{Fly}+@{Physical}+?{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}  {{name=@{Name}}} {{skillvalue=@{Hide}}} {{fumble=[[ceil(95+(@{Hide}+@{Physical}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Hide}+@{Physical}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Hide}+@{Physical}+?{Mods|0})/5)+1]]}}          {{success=[[@{Hide}+@{Physical}+?{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}  {{name=@{Name}}} {{skillvalue=@{Jump}}} {{fumble=[[ceil(95+(@{Jump}+@{Physical}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Jump}+@{Physical}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Jump}+@{Physical}+?{Mods|0})/5)+1]]}}        {{success=[[@{Jump}+@{Physical}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Jump}}"/></td>																																																																																																																			
-						<!--<td><button type="roll" value="/roll 1d100<@{Jump}" /></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}  {{name=@{Name}}} {{skillvalue=@{Hide}}} {{fumble=[[ceil(95+(@{Hide}+@{Physical}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Hide}+@{Physical}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Hide}+@{Physical}+?{Mods|0})/5)+1]]}}          {{success=[[@{Hide}+@{Physical}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=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}  {{name=@{Name}}} {{skillvalue=@{Jump}}} {{fumble=[[ceil(95+(@{Jump}+@{Physical}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Jump}+@{Physical}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Jump}+@{Physical}+?{Mods|0})/5)+1]]}}        {{success=[[@{Jump}+@{Physical}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Jump}}"/></td>
+				</tr>
 			</table>		
 			<table style="width: 100%;">				
-					<tr>
-						<td class="sheet-chkfiller"></td>
-						<td>Pilot(Varies):</td>
-					</tr>	
+				<tr>
+					<td class="sheet-chkfiller"></td>
+					<td>Pilot(Varies):</td>
+				</tr>	
 			</table>
 			<fieldset class='repeating_PilotSkills'>
-					<!-- <div class='sheet-col' style='width: 69%; margin: 0px; padding: 0px;'></div> -->
-						<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}  {{name=@{Name}}} {{skillvalue=@{PilotScore}}} {{fumble=[[ceil(95+(@{PilotScore}+@{Physical}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{PilotScore}+@{Physical}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{PilotScore}+@{Physical}+?{Mods|0})/5)+1]]}}         {{success=[[@{PilotScore}+@{Physical}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{PilotSkill}}}"/></td>																																																	 				 				 				 					 					 					 					 					 					 
-						<!--<button type="roll" value="/roll 1d100<@{PilotScore}" />-->
+				<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}  {{name=@{Name}}} {{skillvalue=@{PilotScore}}} {{fumble=[[ceil(95+(@{PilotScore}+@{Physical}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{PilotScore}+@{Physical}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{PilotScore}+@{Physical}+?{Mods|0})/5)+1]]}}         {{success=[[@{PilotScore}+@{Physical}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{PilotSkill}}}"/>
 			</fieldset>				
 			<table style="width: 100%;">
-					<tr>
-						<td><input type="checkbox" name="attr_Success-Projection"  /></td>
-						<td class="sheet-skillname">Projection (DEX x02%)</td>
-						<td><input type="number" name="attr_Projection"  /></td>
-						<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{Projection}}} {{fumble=[[ceil(95+(@{Projection}+@{Physical}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Projection}+@{Physical}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Projection}+@{Physical}+?{Mods|0})/5)+1]]}}        {{success=[[@{Projection}+@{Physical}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Projection}}"/></td>																																																																																																																																							
-						<!--<td><button type="roll" value="/roll 1d100<@{Projection}" /></td>-->
-					</tr>			
+				<tr>
+					<td><input type="checkbox" name="attr_Success-Projection"  /></td>
+					<td class="sheet-skillname">Projection (DEX x02%)</td>
+					<td><input type="number" name="attr_Projection"  /></td>
+					<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{Projection}}} {{fumble=[[ceil(95+(@{Projection}+@{Physical}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Projection}+@{Physical}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Projection}+@{Physical}+?{Mods|0})/5)+1]]}}        {{success=[[@{Projection}+@{Physical}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Projection}}"/>
+				</tr>
 			</table>		
 
 			<table style="width: 100%;">				
@@ -1221,7 +1079,7 @@
 				<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}  {{name=@{Name}}} {{skillvalue=@{RideScore}}} {{fumble=[[ceil(95+(@{RideScore}+@{Physical}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{RideScore}+@{Physical}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{RideScore}+@{Physical}+?{Mods|0})/5)+1]]}}        {{success=[[@{RideScore}+@{Physical}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{RideSkill}}}"/></td>
+				<button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{RideScore}}} {{fumble=[[ceil(95+(@{RideScore}+@{Physical}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{RideScore}+@{Physical}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{RideScore}+@{Physical}+?{Mods|0})/5)+1]]}}        {{success=[[@{RideScore}+@{Physical}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=@{RideSkill}}}"/>
 			</fieldset>				
 
 			<table style="width: 100%;">		
@@ -1229,22 +1087,19 @@
 					<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}  {{name=@{Name}}} {{skillvalue=@{Stealth}}} {{fumble=[[ceil(95+(@{Stealth}+@{Physical}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Stealth}+@{Physical}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Stealth}+@{Physical}+?{Mods|0})/5)+1]]}}     {{success=[[@{Stealth}+@{Physical}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Stealth}}"/></td>																																																																																																																													
-					<!--<td><button type="roll" value="/roll 1d100<@{Stealth}" /></td>-->
+					<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{Stealth}}} {{fumble=[[ceil(95+(@{Stealth}+@{Physical}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Stealth}+@{Physical}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Stealth}+@{Physical}+?{Mods|0})/5)+1]]}}     {{success=[[@{Stealth}+@{Physical}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=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}  {{name=@{Name}}} {{skillvalue=@{Swim}}} {{fumble=[[ceil(95+(@{Swim}+@{Physical}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Swim}+@{Physical}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Swim}+@{Physical}+?{Mods|0})/5)+1]]}}        {{success=[[@{Swim}+@{Physical}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Swim}}"/></td>																																																																																																																																		
-					<!--<td><button type="roll" value="/roll 1d100<@{Swim}" /></td>-->
+					<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{Swim}}} {{fumble=[[ceil(95+(@{Swim}+@{Physical}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Swim}+@{Physical}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Swim}+@{Physical}+?{Mods|0})/5)+1]]}}        {{success=[[@{Swim}+@{Physical}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=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}  {{name=@{Name}}} {{skillvalue=@{throw}}} {{fumble=[[ceil(95+(@{throw}+@{Physical}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{throw}+@{Physical}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{throw}+@{Physical}+?{Mods|0})/5)+1]]}}        {{success=[[@{throw}+@{Physical}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Throw}}"/></td>																																																																																																																																							
-					<!--<td><button type="roll" value="/roll 1d100<@{Throw}" /></td>-->
+					<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{throw}}} {{fumble=[[ceil(95+(@{throw}+@{Physical}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{throw}+@{Physical}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{throw}+@{Physical}+?{Mods|0})/5)+1]]}}        {{success=[[@{throw}+@{Physical}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=Throw}}"/></td>
 				</tr>
 			</table>
 			<fieldset class='repeating_PhysicalSkills'>
@@ -1305,8 +1160,7 @@
 					<td><input type="checkbox" name="attr_Success-MartialArts"  /></td>
 					<td class="sheet-skillname">Martial Arts (1%)</td>
 					<td><input type="number" name="attr_MartialArts"  /></td>
-					<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{MartialArts}}} {{fumble=[[ceil(95+(@{MartialArts}+@{Combat}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{MartialArts}+@{Combat}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{MartialArts}+@{Combat}+?{Mods|0})/5)+1]]}}        {{success=[[@{MartialArts}+@{Combat}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=MartialArts}}"/></td>																																																																																																																																							
-					<!--<td><button type="roll" value="/roll 1d100<@{MartialArts}" /></td>-->
+					<td><button type="roll" value="&{template:skillRoll}  {{name=@{Name}}} {{skillvalue=@{MartialArts}}} {{fumble=[[ceil(95+(@{MartialArts}+@{Combat}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{MartialArts}+@{Combat}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{MartialArts}+@{Combat}+?{Mods|0})/5)+1]]}}        {{success=[[@{MartialArts}+@{Combat}+?{Mods|0}]]}} {{roll=[[1d100]]}} {{skillname=MartialArts}}"/></td>
 				</tr>					
 			</table>				
 			<br />					
@@ -1352,7 +1206,6 @@
 							<input  style="width:35px" type="number" name="attr_Brawl_sr" />
 						</div>
 					</td>
-					<!--<td ><input  style="width:35px" type="number" name="attr_Brawl_length" /></td>-->
 					<td>
 						<select style="font-size: 9px; margin-bottom: 0px; width:49px" name="attr_Brawl_length">
 							<option value="">S</option>
@@ -1375,8 +1228,7 @@
 					<td ><input type="text" name="attr_Brawl-Damage" style="width: 60px" /></td>
 					<td ><input style="width:35px" type="number" name="attr_Brawl-ApR" /></td>
 					<td ><input style="width: 40px" type="text" name="attr_Brawl-HP"/></td>
-					<!--//<td><button type="roll" value="/roll 1d100<@{Fist-Punch}" /></td>-->
-						<td><button type="roll" value="&{template:melee-roll} {{tot=[[@{Brawl-Damage}+@{Damage_Bonus}]]}} {{success=[[ceil(@{Brawl}*?{Multiplier|1}+?{Mods|0})]]}} {{fumble=[[ceil(95+(@{Brawl}*?{Multiplier|1}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Brawl}*?{Multiplier|1}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Brawl}*?{Multiplier|1}+?{Mods|0})/5)+1]]}}  {{skillvalue=@{Brawl}}}  {{roll=[[1d100]]}} {{skillname=Brawl}}" /></td>
+					<td><button type="roll" value="&{template:melee-roll} {{tot=[[@{Brawl-Damage}+@{Damage_Bonus}]]}} {{success=[[ceil(@{Brawl}*?{Multiplier|1}+?{Mods|0})]]}} {{fumble=[[ceil(95+(@{Brawl}*?{Multiplier|1}+?{Mods|0})/20))]]}} {{crit=[[ceil((@{Brawl}*?{Multiplier|1}+?{Mods|0})/20)+1]]}} {{special=[[ceil((@{Brawl}*?{Multiplier|1}+?{Mods|0})/5)+1]]}}  {{skillvalue=@{Brawl}}}  {{roll=[[1d100]]}} {{skillname=Brawl}}" /></td>
 				</tr>
 				
 				<tr>
@@ -1473,7 +1325,6 @@
 					<td><input type="number" name="attr_Shots-in-Gun1" style="width: 50px" /></td>
 					<td><input type="number" name="attr_Malfunc-Num1" style="width: 40px"/></td>
 					<td><input type="number" name="attr_HP" style="width: 40px" /></td>
-					<!--<td><button type="roll" value="/roll 1d100" /></td>-->
 					<td>
 					<select style="font-size: 9px; margin-bottom: 0px; width: 45px" name="attr_weapon_type1">
 						<option selected="selected" value="0">No</option>
@@ -1512,19 +1363,12 @@
 		<h3 style="text-align: center; color: #FFF; background-color: #000;">Hit Location & Armor</h3>
 		<table>
 			<thead class="sheet-header-text">
-				<tr><!-- <th>
-					<button name="roll_melee-location"  type="roll" value="/me rolls melee hit location [[1d20]]"   class="btn ui-draggable">
-							<div class="sheet-button_header">Melee</div>
-					</button>
-					</th>
-					<th>Missle</th>-->
-					
-					<th>Location</th><th>Armor</th><th>AP</th><th>Max <br />HP</th><th>Cur. <br /> HP</th></tr>
+				<tr>
+					<th>Location</th><th>Armor</th><th>AP</th><th>Max <br />HP</th><th>Cur. <br /> HP</th>
+				</tr>
 			</thead>
 			<tbody>
 				<tr>
-					<!--<td class="sheet-loc-text">01-04</td>
-					<td class="sheet-loc-text">01-03</td>-->
 					<td><input type="text" name="attr_armor-name" class="sheet-armor-name"/></td>
 					<td><input type="text" name="attr_r_leg_armor_name" class="sheet-armor-name"/></td>
 					<td><input type="number" name="attr_r_Leg_ap" /></td>
@@ -1532,8 +1376,6 @@
 					<td><input type="number" name="attr_r_leg_cur_hp" /></td>
 				</tr>
 				<tr>
-					<!--<td class="sheet-loc-text">05-08</td>
-					<td class="sheet-loc-text">04-06</td>-->
 					<td class="sheet-loc-text">Left Leg</td>
 					<td><input type="text" name="attr_l_leg_armor_name" class="sheet-armor-name"/></td>
 					<td><input type="number" name="attr_l_Leg_ap" /></td>
@@ -1541,8 +1383,6 @@
 					<td><input type="number" name="attr_l_leg_cur_hp" /></td>
 				</tr>				
 				<tr>
-					<!--<td class="sheet-loc-text">09-11</td>
-					<td class="sheet-loc-text">07-10</td>-->
 					<td class="sheet-loc-text">Abdomen</td>
 					<td ><input type="text" name="attr_abd_armor_name" class="sheet-armor-name"/></td>
 					<td ><input type="number" name="attr_abd_ap" /></td>
@@ -1550,8 +1390,6 @@
 					<td ><input type="number" name="attr_abd_cur_hp" /></td>
 				</tr>								
 				<tr>
-					<!--<td class="sheet-loc-text">12</td>
-					<td class="sheet-loc-text">11-15</td>-->
 					<td class="sheet-loc-text">Chest</td>
 					<td><input type="text" name="attr_chst_armor_name" class="sheet-armor-name"/></td>
 					<td><input type="number" name="attr_chst_ap" /></td>
@@ -1559,8 +1397,6 @@
 					<td><input type="number" name="attr_chst_cur_hp" /></td>
 				</tr>												
 				<tr>
-					<!--<td class="sheet-loc-text">13-15</td>
-					<td class="sheet-loc-text">16-17</td>-->
 					<td class="sheet-loc-text">Right Arm</td>
 					<td ><input type="text" name="attr_r_arm_armor_name" class="sheet-armor-name"/></td>
 					<td><input type="number" name="attr_r_arm_ap" /></td>
@@ -1569,8 +1405,6 @@
 				</tr>					
 				
 				<tr>
-					<!--<td class="sheet-loc-text">16-18</td>
-					<td class="sheet-loc-text">18-19</td>-->
 					<td class="sheet-loc-text">Left Arm</td>
 					<td><input type="text" name="attr_l_arm_armor_name" class="sheet-armor-name"/></td>
 					<td><input type="number" name="attr_l_arm_ap" /></td>
@@ -1578,8 +1412,6 @@
 					<td><input type="number" name="attr_l_arm_cur_hp" /></td>
 				</tr>									
 				<tr>
-					<!--<td class="sheet-loc-text">19-20</td>
-					<td class="sheet-loc-text">20</td>-->
 					<td class="sheet-loc-text">Head</td>
 					<td><input type="text" name="attr_hd_armor_name" class="sheet-armor-name"/></td>
 					<td><input type="number" name="attr_hd_ap" /></td>
@@ -1752,7 +1584,6 @@
 		<div> 
 		</h3>
 		<p>
-
 			<h3 class="sheet-section-header"><input  class="sheet-section-header" type="text" name="attr_magic_type-1" /> 
 			<input style="width: 4.5em" class="sheet-section-header" type="number" name="attr_magic_type-1_Score" />%</h3>
 	
@@ -1851,12 +1682,10 @@
 <h3 style="text-align: center; color: #FFF; background-color: #000;">Personal Data</h3>
 <div class='sheet-2colrow'>
 	<div class='sheet-col'>
-		<!--Residence <textarea name="attr_Residence"></textarea><br>-->
 		Personal Description <textarea name="attr_Personal-Description"></textarea><br>
 		Family & Friends <textarea name="attr_Family-Friends"></textarea>
 	</div>
 	<div class='sheet-col'>
-		<!--Episodes of Insanity <textarea name="attr_Episodes-of-Insanity"></textarea><br>-->
 		Wounds & Injuries <textarea name="attr_Wounds-Injuries"></textarea><br>
 		Marks & Scars <textarea name="attr_Marks-Scars"></textarea>
 	</div>
@@ -1891,23 +1720,21 @@
 			<tr><th colspan="2">{{name}}</th></tr>
 			
 			<tr><th colspan="2">Weapon Roll</th></tr>
-			 <!--<tr><td>{{crit}}/{{special}}/{{fumble}}</td></tr>-->
 			<tr>
 				<tr>
 					<td class="template_label"><b>Rolling:</b> {{skillname}} {{skillvalue}}% </td> 
 					<td class="template_value"> ({{success}}%)</td>
 				</tr>
-				
-		   </tr>
+		   	</tr>
 			<tr>
 				<td class="template_label"><b>Rolled:</b></td>
 				<td class="template_value">&nbsp;{{roll}}</td>
 			</tr>
 			<tr>
-			 <td class="template_label"><b>Result:</b></td>
+				<td class="template_label"><b>Result:</b></td>
 			 
 			{{#rollBetween() roll fumble 100}} 
-					<td class="template_value">Fumble</td>
+				<td class="template_value">Fumble</td>
 			{{/rollBetween() roll fumble 100}} 
 			
 			{{#^rollBetween() roll fumble 100}}
@@ -1986,17 +1813,14 @@
 	
 	<rolltemplate class="sheet-rolltemplate-skillRoll">
 		<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>
 				<tr>
 					<td class="template_label"><b>Rolling:</b> {{skillname}} {{skillvalue}}% </td> 
 					<td class="template_value"> ({{success}}%)</td>
 				</tr>
-				
-		   </tr>
+		   	</tr>
 			<tr>
 				<td class="template_label"><b>Rolled:</b></td>
 				<td class="template_value">&nbsp;{{roll}}</td>
@@ -2037,11 +1861,8 @@
 						{{/^rollLess() roll special}}
 					{{/^rollLess() roll crit}}
 				
-				
-				
 				{{/^rollGreater() success 99}}
 	
-				
 			{{/^rollBetween() roll fumble 100}}
 			</tr>
 		</table>
@@ -2062,8 +1883,6 @@
 		{{#rollTotal() table 3}}
 			<th>Natural Weapon Fumble </th>
 		{{/rollTotal() table 3}}
-		<!--<tr><td><b>Roll:</b>{{roll}}</td></tr>
-		<tr><td><b>Table:</b>{{table}}</td></tr>-->
 		<tr>
 		{{#rollTotal() table 0}}
 			{{#rollBetween() roll 1 15}}<td class="template_value">Lose the next combat round and are effectively helpless.</td>{{/rollBetween() roll 1 15}}
@@ -2122,8 +1941,6 @@
 			{{#rollTotal() roll 99}}<td class="template_value">Blow it; roll twice more on this table (cumulative if this result is rolled again)</td>{{/rollTotal() roll 99}}
 			{{#rollTotal() roll 100}}<td class="template_value">Blow it; roll twice more on this table (cumulative if this result is rolled again)</td>{{/rollTotal() roll 100}}
 		{{/rollTotal() table 3}}
-		
-	
 		</tr>
 		</table>
 	</rolltemplate>
@@ -2150,25 +1967,4 @@
 				{{#rollTotal() roll 99}} <td class="template_value"> Your character is mutilated with vicious wounds. Lose 1D3 points each from APP, DEX, and CON, and describe the results. Your character is unable to fight. {{/rollTotal() roll 99}} </td>
 				</tr>
 		</table>
-	</rolltemplate>
-		
-	<!-- workers -->
-	<script type="text/worker">
-	
-	
-	on('sheet:opened',function(){
-	sdfsfsdfsdfsdf	
-	// Do something the first time the sheet is opened by a player in a session
-	var x = document.getElementsByClassName("btn repcontrol_edit");
-	var i;
-	for (i = 0; i < x.length; i++) {
-		x[i].innerText = "";
-	}
-	
-	});
-	
-	on("change:is_config", function() {
-		
-	
-	});
-	</script>
\ No newline at end of file
+	</rolltemplate>
\ No newline at end of file