diff --git a/Basic_Roleplaying/Basic_Roleplaying.html b/Basic_Roleplaying/Basic_Roleplaying.html
index 45d3fcec61..0100bcc6c7 100644
--- a/Basic_Roleplaying/Basic_Roleplaying.html
+++ b/Basic_Roleplaying/Basic_Roleplaying.html
@@ -83,9 +83,7 @@
 						<td class=".sheet-chkfiller"><td>
 						<td><p>STR</p></td>
 						<td><input type="number" name="attr_STR" /></td>	
-							<td >
-							<button class="sheet-characteristic-roll sheet-plain" style="width: 75px"  type="roll" value="/roll 1d100<[[ceil(@{STR}*?{Multiplier|Normal, 5|Easy, 10|Difficult, 5/2|x4, 4|x3, 3|x2, 2|x1, 1})]] Effort Roll" >Effort</button>	
-						</td>
+						<td><button class="sheet-characteristic-roll sheet-plain" style="width: 75px"  type="roll" value="&{template:characteristicRoll} {{name=@{Name}}} {{skillvalue=@{STR}}}  {{success=[[ceil(@{STR}*?{Multiplier|Normal, 5|Easy, 10|Difficult, 5/2|x4, 4|x3, 3|x2, 2|x1, 1})]]}} {{roll=[[1d100]]}} {{skillname=Strength}}">Effort</button></td>
 						<td><p>Dmg. Bonus</p></td>
 						<td colspan="3">	
 							<input type="text" name="attr_Damage_Bonus" value="0" style="margin-bottom: 0px;height: 24px ; width: 75px">
@@ -95,7 +93,7 @@
 						<td class=".sheet-chkfiller"><td>
 						<td><p>CON</p></td>
 						<td><input type="number" name="attr_CON" /></td>
-						<td ><button  class="sheet-characteristic-roll sheet-plain" style="width: 75px" type="roll" value="/roll 1d100<[[ceil(@{CON}*?{Multiplier|Normal, 5|Easy, 10|Difficult, 5/2|x4, 4|x3, 3|x2, 2|x1, 1})]] Stamina Roll" >Stamina</button></td>
+						<td><button class="sheet-characteristic-roll sheet-plain" style="width: 75px"  type="roll" value="&{template:characteristicRoll} {{name=@{Name}}} {{skillvalue=@{CON}}} {{success=[[ceil(@{CON}*?{Multiplier|Normal, 5|Easy, 10|Difficult, 5/2|x4, 4|x3, 3|x2, 2|x1, 1})]]}} {{roll=[[1d100]]}} {{skillname=Constitution}}">Stamina</button></td>						
 						<td>
 							<input type="checkbox" class="sheet-showstrike-rank" name="attr_showstrike-rank" checked="checked" style="display: none">
 							<div class="sheet-strike-rank"><p >Siz SR</p></div>
@@ -135,7 +133,7 @@
 						<td class=".sheet-chkfiller"><td>
 						<td><p>INT</p></td>
 						<td><input type="number" name="attr_INT" /></td>
-						<td ><button  class="sheet-characteristic-roll sheet-plain" style="width: 75px" type="roll" value="/roll 1d100<[[ceil(@{INT}*?{Multiplier|Normal, 5|Easy, 10|Difficult, 5/2|x4, 4|x3, 3|x2, 2|x1, 1})]] Idea Roll" >Idea</button></td>
+						<td><button class="sheet-characteristic-roll sheet-plain" style="width: 75px"  type="roll" value="&{template:characteristicRoll} {{name=@{Name}}} {{skillvalue=@{INT}}} {{success=[[ceil(@{INT}*?{Multiplier|Normal, 5|Easy, 10|Difficult, 5/2|x4, 4|x3, 3|x2, 2|x1, 1})]]}} {{roll=[[1d100]]}} {{skillname=Intelligence}}">Idea</button></td>
 						<td><p>MOV</p></td><td><input type="number" name="attr_mov" /></td>		
 						<td></td>
 						<td></td>						
@@ -145,7 +143,7 @@
 						<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 ><button class="sheet-characteristic-roll sheet-plain" style="width: 75px" type="roll" value="/roll 1d100<[[ceil(@{POW}*?{Multiplier|Normal, 5|Easy, 10|Difficult, 5/2|x4, 4|x3, 3|x2, 2|x1, 1})]] Luck Roll" >&nbsp;Luck</button></td>
+						<td><button class="sheet-characteristic-roll sheet-plain" style="width: 75px"  type="roll" value="&{template:characteristicRoll} {{name=@{Name}}} {{skillvalue=@{POW}}} {{success=[[ceil(@{POW}*?{Multiplier|Normal, 5|Easy, 10|Difficult, 5/2|x4, 4|x3, 3|x2, 2|x1, 1})]]}} {{roll=[[1d100]]}} {{skillname=Power}}">Luck</button></td>
 						<td><p>Hit Pts.</p></td>
 						<td><input type="number" name="attr_cur_hp" />
 						<td>/</td>
@@ -156,7 +154,7 @@
 						<td class=".sheet-chkfiller"><td>
 						<td><p>DEX</p></td>
 						<td><input type="number" name="attr_DEX" /></td>	
-						<td ><button  class="sheet-characteristic-roll sheet-plain" style="width: 75px" type="roll" value="/roll 1d100<[[ceil(@{DEX}*?{Multiplier|Normal, 5|Easy, 10|Difficult, 5/2|x4, 4|x3, 3|x2, 2|x1, 1})]] Agility Roll" >Agility</button></td>
+						<td><button class="sheet-characteristic-roll sheet-plain" style="width: 75px"  type="roll" value="&{template:characteristicRoll} {{name=@{Name}}} {{skillvalue=@{DEX}}} {{success=[[ceil(@{DEX}*?{Multiplier|Normal, 5|Easy, 10|Difficult, 5/2|x4, 4|x3, 3|x2, 2|x1, 1})]]}} {{roll=[[1d100]]}} {{skillname=Dexterity}}">Agility</button></td>
 						<td><p>Power Pts.</p></td>
 						<td><input type="number" name="attr_cur_mp" />
 						<td>/</td>
@@ -167,8 +165,8 @@
 						<td class=".sheet-chkfiller"><td>
 						<td><p>APP</p></td>
 						<td><input type="number" name="attr_APP" /></td>
-						<td ><button class="sheet-characteristic-roll sheet-plain" style="width: 75px" type="roll" value="/roll 1d100<[[ceil(@{APP}*?{Multiplier|Normal - x5, 5|Easy - x10, 10|x4, 4|x3, 3|Difficult - x3/2, 3/2|x2, 2|x1, 1})]] Charisma Roll" >Charisma</button></td>
-							
+						<td><button class="sheet-characteristic-roll sheet-plain" style="width: 75px; font-size:15px"  type="roll" value="&{template:characteristicRoll} {{name=@{Name}}} {{skillvalue=@{APP}}} {{success=[[ceil(@{APP}*?{Multiplier|Normal, 5|Easy, 10|Difficult, 5/2|x4, 4|x3, 3|x2, 2|x1, 1})]]}} {{roll=[[1d100]]}} {{skillname=Appearance}}">Charisma</button></td>
+						
 							<div class="sheet-hpbl">
 								<td>
 									<input type="checkbox" class="sheet-showhbpl" name="attr_showhpbl" checked="checked" style="display: none">
@@ -201,17 +199,32 @@
 						<td >
 							<input type="checkbox" class="sheet-showedufld" name="attr_showedufld" checked="checked" style="display: none">
 							<div class="sheet-edufld">
-							<button  class="sheet-characteristic-roll sheet-plain" style="width: 75px" type="roll" value="/roll 1d100<[[@{EDU}*?{Multiplier|Multiplier|Normal, 5|Easy, 10|Difficult, 5/2|x4, 4|x3, 3|x2, 2|x1, 1}]] Know Roll">Know</button>
+						    <button class="sheet-characteristic-roll sheet-plain" style="width: 75px"  type="roll" value="&{template:characteristicRoll} {{name=@{Name}}} {{skillvalue=@{EDU}}} {{success=[[ceil(@{EDU}*?{Multiplier|Normal, 5|Easy, 10|Difficult, 5/2|x4, 4|x3, 3|x2, 2|x1, 1})]]}} {{roll=[[1d100]]}} {{skillname=Education}}">Know</button>
+							
 							</div>
 						</td>
 						
 						<td>
-							<button  class="sheet-characteristic-roll sheet-plain" style="width: 75px" type="roll" value="/roll 1d100<@{cur_san}">SAN</button>
+							<button  class="sheet-characteristic-roll sheet-plain" style="width: 75px" type="roll" value="&{template:sanityRoll} {{name=@{Name}}} {{skillvalue=@{cur_san}}} {{success=[[@{cur_san}]]}} {{roll=[[1d100]]}} {{skillname=Sanity}}">SAN</button>
 						</td>
 						<td><input type="number" name="attr_cur_san" /></td>
 						<td>/</td>
 						<td><input type="number" name="attr_max_san" /></td>           
-					</tr>					
+					</tr>
+
+					<tr>
+						<td class=".sheet-chkfiller"><td>
+						<td></td>
+						<td></td>	
+						<td></td>
+						
+						<td>
+							<button  class="sheet-characteristic-roll sheet-plain" style="width: 75px; font-size:13px" type="roll" value="&{template:ResistanceRoll} {{name=@{Name}}} {{skillvalue1=@{Active_Characteristic}}} {{skillvalue2=@{Passive_Characteristic}}} {{success=[[50+((@{Active_Characteristic}-@{Passive_Characteristic})*5)]]}} {{roll=[[1d100]]}} ">Resistance <br> Table</button> 
+						</td>
+						<td><input type="number" value="0" name="attr_Active_Characteristic" /></td>
+						<td>vs</td>
+						<td><input type="number" value="0" name="attr_Passive_Characteristic" /></td>
+					</tr>    					
 				</tbody>
 			</table>
 		</div>
@@ -1404,7 +1417,7 @@
 		<tbody>
 		<input type="checkbox" class="sheet-check-melee-toggle" name="attr_showstrike-rank" style="display: none" />
 		<fieldset class="repeating_melee">
-			<table>
+			<table style="width: 100%;">
 				<tr>
 					<td><input type="checkbox" name="attr_Success"  /></td>
 					<td style="width: 122px;"><input style="width: 113px;" type="text" name="attr_Attack-Weapon" /></td>
@@ -1475,7 +1488,7 @@
 			</tbody>
 		</table>
 		<fieldset class="repeating_Firearms">
-			<table>
+			<table style="width: 100%;">
 				<tr>
 					<td><input type="text" name="attr_Firearm" style="width: 93px" /></td>
 					<td><input type="number" name="attr_Score" style="width: 50px" /></td>
@@ -2017,6 +2030,96 @@
 			</tr>
 		</table>
 	</rolltemplate>
+
+		<rolltemplate class="sheet-rolltemplate-characteristicRoll">
+		<table class="characteristicRoll" style="width: 100%; border: 1px solid black;">
+			<tr><th colspan="2">{{name}}</th></tr>
+			<tr><th colspan="2">Characteristic Roll</th></tr>
+			<tr>
+				<tr>
+					<td class="template_label"><b>Rolling:</b> {{skillname}} {{skillvalue}} </td> 
+					<td class="template_value"> ({{success}}%)</td>
+				</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>
+
+ 					{{#^rollGreater() roll success}}
+ 				    	<td class="template_value">Success</td>
+ 					{{/^rollGreater() roll success}}
+
+ 							{{#rollGreater() roll success}}
+ 								<td class="template_value">Failure</td>
+ 							{{/rollGreater() roll success}}
+
+			</tr>
+		</table>
+	</rolltemplate>
+
+		<rolltemplate class="sheet-rolltemplate-ResistanceRoll">
+		<table class="ResistanceRoll" style="width: 100%; border: 1px solid black;">
+			<tr><th colspan="2">{{name}}</th></tr>
+			<tr><th colspan="2">Resistance Roll</th></tr>
+			<tr>
+				<tr>
+					<td class="template_label"><b>Rolling:</b> {{skillvalue1}} vs {{skillvalue2}} </td> 
+					<td class="template_value"> ({{success}}%)</td>
+				</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>
+ 
+ 					{{#^rollGreater() roll success}}
+ 				    	<td class="template_value">Success</td>
+ 					{{/^rollGreater() roll success}}
+
+ 							{{#rollGreater() roll success}}
+ 								<td class="template_value">Failure</td>
+ 							{{/rollGreater() roll success}}
+
+			</tr>
+		</table>
+	</rolltemplate>
+
+	</rolltemplate>
+
+		<rolltemplate class="sheet-rolltemplate-sanityRoll">
+		<table class="characteristicRoll" style="width: 100%; border: 1px solid black;">
+			<tr><th colspan="2">{{name}}</th></tr>
+			<tr><th colspan="2">Sanity Roll</th></tr>
+			<tr>
+				<tr>
+					<td class="template_label"><b>Rolling:</b> {{skillname}} {{skillvalue}} </td> 
+					<td class="template_value"> ({{success}}%)</td>
+				</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>
+
+ 					{{#^rollGreater() roll success}}
+ 				    	<td class="template_value">Success</td>
+ 					{{/^rollGreater() roll success}}
+
+ 							{{#rollGreater() roll success}}
+ 								<td class="template_value">Failure</td>
+ 							{{/rollGreater() roll success}}
+
+			</tr>
+		</table>
+	</rolltemplate>
+
 	
 	<rolltemplate class="sheet-rolltemplate-Melee-Attack-Fumble">
 		<table style="background-color: #ffffff;" class="sheet-rolltemplate-skillRoll">