diff --git a/Shadows of Esteren/ShadowsOfEsteren.css b/Shadows of Esteren/ShadowsOfEsteren.css
index 028a51c31f..ef0bd87c25 100644
--- a/Shadows of Esteren/ShadowsOfEsteren.css	
+++ b/Shadows of Esteren/ShadowsOfEsteren.css	
@@ -309,3 +309,29 @@ input[type="text"] {
     font-size: 0.8em;
     font-style: italic;
 }
+
+.sheet-rolltemplate-basic .sheet-rowsuccess {
+    color: #080;
+    font-size: 0.8em;
+    font-style: italic;
+}
+
+.sheet-rolltemplate-basic .sheet-rowfailure {
+    color: #A88;
+    font-size: 0.8em;
+}
+
+.sheet-rolltemplate-basic .sheet-rowsmaller {
+    color: black;
+    font-size: 0.8em;
+}
+
+.sheet-rolltemplate-basic .sheet-criticalfailure {
+    color: #822;
+    font-size: 1.1em;
+}
+
+.sheet-rolltemplate-basic .sheet-criticalsuccess {
+    color: #282;
+    font-size: 1.1em;
+}
diff --git a/Shadows of Esteren/ShadowsOfEsteren.html b/Shadows of Esteren/ShadowsOfEsteren.html
index d44349d244..46305ee89b 100644
--- a/Shadows of Esteren/ShadowsOfEsteren.html	
+++ b/Shadows of Esteren/ShadowsOfEsteren.html	
@@ -4,8 +4,8 @@
         <tr style="width: 100%">
             <td colspan="3">
                 <label>Name</label>
-        		<input type="text" name="attr_character_name" style="width: 100%"/>
-			</td>
+                <input type="text" name="attr_character_name" style="width: 100%"/>
+            </td>
 			<td>
 				<label>Player</label>
 				<input type="text" name="attr_Player" />
@@ -47,27 +47,27 @@
 		<tr>
 			<td>Combativeness: </td>
 			<td><input class="sheet-skill-on" type="number" name="attr_Combativeness" max="5" min="1" value="1"/>
-            <button type='roll' name='roll_Combativeness' value='&{template:basic} {{name=@{character_name} }} {{action=Combativeness}} {{attack=[[1d10+@{Combativeness}[Combativeness]+@{Penalty}[Penalty]]]}}'></button></td>
+            <button type='roll' name='roll_Combativeness' value='&{template:basic} {{name=@{character_name} }} {{action=Combativeness}} {{conf=[[1d10]]}} {{attack=[[1d10+@{Combativeness}[Combativeness]+@{Penalty}[Penalty]]]}}'></button></td>
     	</tr>
     	<tr>
     		<td>Creativity: </td>
 			<td><input class="sheet-skill-on" type="number" name="attr_Creativity" max="5" min="1" value="1"/>
-            <button type='roll' name='roll_Creativity' value='&{template:basic} {{name=@{character_name} }} {{action=Creativity}} {{attack=[[1d10+@{Creativity}[Creativity]+@{Penalty}[Penalty]]]}}'></button></td>
+            <button type='roll' name='roll_Creativity' value='&{template:basic} {{name=@{character_name} }} {{action=Creativity}} {{conf=[[1d10]]}} {{attack=[[1d10+@{Creativity}[Creativity]+@{Penalty}[Penalty]]]}}'></button></td>
     	</tr>
         <tr>
     		<td>Empathy: </td>
 			<td><input class="sheet-skill-on" type="number" name="attr_Empathy" max="5" min="1" value="1"/>
-            <button type='roll' name='roll_Empathy' value='&{template:basic} {{name=@{character_name} }} {{action=Empathy}} {{attack=[[1d10+@{Empathy}[Empathy]+@{Penalty}[Penalty]]]}}'></button></td>
+            <button type='roll' name='roll_Empathy' value='&{template:basic} {{name=@{character_name} }} {{action=Empathy}} {{conf=[[1d10]]}} {{attack=[[1d10+@{Empathy}[Empathy]+@{Penalty}[Penalty]]]}}'></button></td>
     	</tr>
         <tr>
     		<td>Reason: </td>
 			<td><input class="sheet-skill-on" type="number" name="attr_Reason" max="5" min="1" value="1"/>
-            <button type='roll' name='roll_Reason' value='&{template:basic} {{name=@{character_name} }} {{action=Reason}} {{attack=[[1d10+@{Reason}[Reason]+@{Penalty}[Penalty]]]}}'></button></td>
+            <button type='roll' name='roll_Reason' value='&{template:basic} {{name=@{character_name} }} {{action=Reason}} {{conf=[[1d10]]}} {{attack=[[1d10+@{Reason}[Reason]+@{Penalty}[Penalty]]]}}'></button></td>
     	</tr>
     	<tr>
     		<td>Conviction: </td>
 			<td><input class="sheet-skill-on" type="number" name="attr_Conviction" max="5" min="1" value="1"/>
-            <button type='roll' name='roll_Conviction' value='&{template:basic} {{name=@{character_name} }} {{action=Conviction}} {{attack=[[1d10+@{Conviction}[Conviction]+@{Penalty}[Penalty]]]}}'></button></td>
+            <button type='roll' name='roll_Conviction' value='&{template:basic} {{name=@{character_name} }} {{action=Conviction}} {{conf=[[1d10]]}} {{attack=[[1d10+@{Conviction}[Conviction]+@{Penalty}[Penalty]]]}}'></button></td>
 		</tr>
 	</table>
 </div> <!-- .section-skills -->
@@ -98,7 +98,7 @@
         <tr>
 			<td>Stamina: </td>
 			<td colspan="3"><input class="sheet-skill-on" type="number" name="attr_Stamina" value="10"/>
-	            <button type='roll' name='roll_Stamina' value='&{template:basic} {{name=@{character_name} }} {{action=Stamina}} {{attack=[[1d10+@{Stamina}[Stamina]+@{Penalty}[Penalty]]]}}'></button></td>
+	            <button type='roll' name='roll_Stamina' value='&{template:basic} {{name=@{character_name} }} {{action=Stamina}} {{conf=[[1d10]]}} {{attack=[[1d10+@{Stamina}[Stamina]+@{Penalty}[Penalty]]]}}'></button></td>
     	</tr>        
         <tr>
 			<td>Survival: </td>
@@ -111,7 +111,7 @@
 
 <div class="sheet-header">Domains & Disciplines</div>
 <div class="sheet-section-skills sheet-section sheet-fourth">
-    <div class="sheet-header">Close Combat<button type='roll' name='roll_Close_Combat' value='&{template:basic} {{name=@{character_name} }} {{action=Close Combat}} {{attack=[[1d10+@{CloseCombat}[Close Combat]+@{CloseCombatBonus}[Close Combat Bonus]+@{Combativeness}[Combativeness]+@{Penalty}[Condition Penalty]]]}}'></button></div>
+    <div class="sheet-header">Close Combat<button type='roll' name='roll_Close_Combat' value='&{template:basic} {{name=@{character_name} }} {{action=Close Combat}} {{conf=[[1d10]]}} {{attack=[[1d10+@{CloseCombat}[Close Combat]+@{CloseCombatBonus}[Close Combat Bonus]+@{Combativeness}[Combativeness]+@{Penalty}[Condition Penalty]]]}}'></button></div>
     <table>
 		<tr>
 			<td>Base: <input class="sheet-skill-on" type="number" name="attr_CloseCombat" max="5" min="0" value="0"/></td>
@@ -121,11 +121,11 @@
     <fieldset class="repeating_CloseCombatDisc">            
       <input class="sheet-skill-repeated-name" type="text" name="attr_DiscName" />
       <input class="sheet-skill-on" type="number" name="attr_Disc" min="6" max="15" value="6"/>
-      <button type='roll' name='roll_disc' value='&{template:basic} {{name=@{character_name} }} {{action=@{DiscName}}} {{attack=[[1d10+@{Disc}[@{DiscName}]+@{CloseCombatBonus}[Close Combat Bonus]+@{Combativeness}[Combativeness]+@{Penalty}[Condition Penalty]]]}}'></button>
+      <button type='roll' name='roll_disc' value='&{template:basic} {{name=@{character_name} }} {{action=@{DiscName}}} {{conf=[[1d10]]}} {{attack=[[1d10+@{Disc}[@{DiscName}]+@{CloseCombatBonus}[Close Combat Bonus]+@{Combativeness}[Combativeness]+@{Penalty}[Condition Penalty]]]}}'></button>
     </fieldset>
 </div>
 <div class="sheet-section-skills sheet-section sheet-fourth">
-    <div class="sheet-header">Feats<button type='roll' name='roll_Feats' value='&{template:basic} {{name=@{character_name} }} {{action=Feats}} {{attack=[[1d10+@{Feats}[Feats]+@{FeatsBonus}[Feats Bonus]+@{Combativeness}[Combativeness]+@{Penalty}[Condition Penalty]]]}}'></button></div>
+    <div class="sheet-header">Feats<button type='roll' name='roll_Feats' value='&{template:basic} {{name=@{character_name} }} {{action=Feats}} {{conf=[[1d10]]}} {{attack=[[1d10+@{Feats}[Feats]+@{FeatsBonus}[Feats Bonus]+@{Combativeness}[Combativeness]+@{Penalty}[Condition Penalty]]]}}'></button></div>
     <table>
     	<tr>
 			<td>Base: <input class="sheet-skill-on" type="number" name="attr_Feats" max="5" min="0" value="0"/></td>
@@ -135,12 +135,12 @@
     <fieldset class="repeating_FeatDisc">            
       <input class="sheet-skill-repeated-name" type="text" name="attr_DiscName" />
       <input class="sheet-skill-on" type="number" name="attr_Disc" min="6" max="15" value="6"/>
-      <button type='roll' name='roll_disc' value='&{template:basic} {{name=@{character_name} }} {{action=@{DiscName}}} {{attack=[[1d10+@{Disc}[@{DiscName}]+@{FeatsBonus}[Feats Bonus]+@{Combativeness}[Combativeness]+@{Penalty}[Condition Penalty]]]}}'></button>
+      <button type='roll' name='roll_disc' value='&{template:basic} {{name=@{character_name} }} {{action=@{DiscName}}} {{conf=[[1d10]]}} {{attack=[[1d10+@{Disc}[@{DiscName}]+@{FeatsBonus}[Feats Bonus]+@{Combativeness}[Combativeness]+@{Penalty}[Condition Penalty]]]}}'></button>
     </fieldset>
 </div>
 
 <div class="sheet-section-skills sheet-section sheet-fourth">
-    <div class="sheet-header">Perception<button type='roll' name='roll_Perception' value='&{template:basic} {{name=@{character_name} }} {{action=Perception}} {{attack=[[1d10+@{Perception}[Perception]+@{PerceptionBonus}[Perception Bonus]+@{Reason}[Reason]+@{Penalty}[Condition Penalty]]]}}'></button></div>
+    <div class="sheet-header">Perception<button type='roll' name='roll_Perception' value='&{template:basic} {{name=@{character_name} }} {{action=Perception}} {{conf=[[1d10]]}} {{attack=[[1d10+@{Perception}[Perception]+@{PerceptionBonus}[Perception Bonus]+@{Reason}[Reason]+@{Penalty}[Condition Penalty]]]}}'></button></div>
     <table>
     	<tr>
 			<td>Base: <input class="sheet-skill-on" type="number" name="attr_Perception" max="5" min="0" value="0"/></td>
@@ -150,74 +150,74 @@
     <fieldset class="repeating_PerceptionDisc">
       <input class="sheet-skill-repeated-name" type="text" name="attr_DiscName" />
       <input class="sheet-skill-on" type="number" name="attr_Disc" min="6" max="15" value="6"/>
-      <button type='roll' name='roll_disc' value='&{template:basic} {{name=@{character_name} }} {{action=@{DiscName}}} {{attack=[[1d10+@{Disc}[@{DiscName}]+@{PerceptionBonus}[Perception Bonus]+@{Reason}[Reason]+@{Penalty}[Condition Penalty]]]}}'></button>
+      <button type='roll' name='roll_disc' value='&{template:basic} {{name=@{character_name} }} {{action=@{DiscName}}} {{conf=[[1d10]]}} {{attack=[[1d10+@{Disc}[@{DiscName}]+@{PerceptionBonus}[Perception Bonus]+@{Reason}[Reason]+@{Penalty}[Condition Penalty]]]}}'></button>
     </fieldset>
 </div>
 
 <div class="sheet-section-skills sheet-section sheet-fourth">
-    <div class="sheet-header">Science<button type='roll' name='roll_Science' value='&{template:basic} {{name=@{character_name} }} {{action=Science}} {{attack=[[1d10+@{Science}[Science]+@{ScienceBonus}[Science Bonus]+@{Reason}[Reason]+@{Penalty}[Condition Penalty]]]}}'></button></div>
+    <div class="sheet-header">Science<button type='roll' name='roll_Science' value='&{template:basic} {{name=@{character_name} }} {{action=Science}} {{conf=[[1d10]]}} {{attack=[[1d10+@{Science}[Science]+@{ScienceBonus}[Science Bonus]+@{Reason}[Reason]+@{Penalty}[Condition Penalty]]]}}'></button></div>
     <table>
     	<tr>
-			<td>Base: <input class="sheet-skill-on" type="number" name="Science" max="5" min="0" value="0"/></td>
+			<td>Base: <input class="sheet-skill-on" type="number" name="attr_Science" max="5" min="0" value="0"/></td>
     		<td>Bonus: <input class="sheet-skill-on" type="number" name="attr_ScienceBonus" value="0"/></td>
     	</tr>
     </table>    
     <fieldset class="repeating_ScienceDisc">
       <input class="sheet-skill-repeated-name" type="text" name="attr_DiscName" />
       <input class="sheet-skill-on" type="number" name="attr_Disc" min="6" max="15" value="6"/>
-      <button type='roll' name='roll_disc' value='&{template:basic} {{name=@{character_name} }} {{action=@{DiscName}}} {{attack=[[1d10+@{Disc}[@{DiscName}]+@{ScienceBonus}[Science Bonus]+@{Reason}[Reason]+@{Penalty}[Condition Penalty]]]}}'></button>
+      <button type='roll' name='roll_disc' value='&{template:basic} {{name=@{character_name} }} {{action=@{DiscName}}} {{conf=[[1d10]]}} {{attack=[[1d10+@{Disc}[@{DiscName}]+@{ScienceBonus}[Science Bonus]+@{Reason}[Reason]+@{Penalty}[Condition Penalty]]]}}'></button>
     </fieldset>
 </div>
 
 <div class="sheet-break"></div>
 
 <div class="sheet-section-skills sheet-section sheet-fourth">
-    <div class="sheet-header">Craft<button type='roll' name='roll_Craft' value='&{template:basic} {{name=@{character_name} }} {{action=Craft}} {{attack=[[1d10+@{Craft}[Craft]+@{CraftBonus}[Craft Bonus]+@{Creativity}[Creativity]+@{Penalty}[Condition Penalty]]]}}'></button></div>
+    <div class="sheet-header">Craft<button type='roll' name='roll_Craft' value='&{template:basic} {{name=@{character_name} }} {{action=Craft}} {{conf=[[1d10]]}} {{attack=[[1d10+@{Craft}[Craft]+@{CraftBonus}[Craft Bonus]+@{Creativity}[Creativity]+@{Penalty}[Condition Penalty]]]}}'></button></div>
     <table>
     	<tr>
-			<td>Base: <input class="sheet-skill-on" type="number" name="Craft" max="5" min="0" value="0"/></td>
+			<td>Base: <input class="sheet-skill-on" type="number" name="attr_Craft" max="5" min="0" value="0"/></td>
     		<td>Bonus: <input class="sheet-skill-on" type="number" name="attr_CraftBonus" value="0"/></td>
     	</tr>
     </table>    
     <fieldset class="repeating_CraftDisc">
       <input class="sheet-skill-repeated-name" type="text" name="attr_DiscName" />
       <input class="sheet-skill-on" type="number" name="attr_Disc" min="6" max="15" value="6"/>
-      <button type='roll' name='roll_disc' value='&{template:basic} {{name=@{character_name} }} {{action=@{DiscName}}} {{attack=[[1d10+@{Disc}[@{DiscName}]+@{CraftBonus}[Craft Bonus]+@{Creativity}[Creativity]+@{Penalty}[Condition Penalty]]]}}'></button>
+      <button type='roll' name='roll_disc' value='&{template:basic} {{name=@{character_name} }} {{action=@{DiscName}}} {{conf=[[1d10]]}} {{attack=[[1d10+@{Disc}[@{DiscName}]+@{CraftBonus}[Craft Bonus]+@{Creativity}[Creativity]+@{Penalty}[Condition Penalty]]]}}'></button>
     </fieldset>
 </div>
 
 <div class="sheet-section-skills sheet-section sheet-fourth">
-    <div class="sheet-header">Magience<button type='roll' name='roll_Magience' value='&{template:basic} {{name=@{character_name} }} {{action=Magience}} {{attack=[[1d10+@{Magience}[Magience]+@{MagienceBonus}[Magience Bonus]+@{Reason}[Reason]+@{Penalty}[Condition Penalty]]]}}'></button></div>
+    <div class="sheet-header">Magience<button type='roll' name='roll_Magience' value='&{template:basic} {{name=@{character_name} }} {{action=Magience}} {{conf=[[1d10]]}} {{attack=[[1d10+@{Magience}[Magience]+@{MagienceBonus}[Magience Bonus]+@{Reason}[Reason]+@{Penalty}[Condition Penalty]]]}}'></button></div>
     <table>
     	<tr>
-			<td>Base: <input class="sheet-skill-on" type="number" name="Magience" max="5" min="0" value="0"/></td>
+			<td>Base: <input class="sheet-skill-on" type="number" name="attr_Magience" max="5" min="0" value="0"/></td>
     		<td>Bonus: <input class="sheet-skill-on" type="number" name="attr_MagienceBonus" value="0"/></td>
     	</tr>
     </table>    
     <fieldset class="repeating_MagienceDisc">
       <input class="sheet-skill-repeated-name" type="text" name="attr_DiscName" />
       <input class="sheet-skill-on" type="number" name="attr_Disc" min="6" max="15" value="6"/>
-      <button type='roll' name='roll_disc' value='&{template:basic} {{name=@{character_name} }} {{action=@{DiscName}}} {{attack=[[1d10+@{Disc}[@{DiscName}]+@{MagienceBonus}[Magience Bonus]+@{Reason}[Reason]+@{Penalty}[Condition Penalty]]]}}'></button>
+      <button type='roll' name='roll_disc' value='&{template:basic} {{name=@{character_name} }} {{action=@{DiscName}}} {{conf=[[1d10]]}} {{attack=[[1d10+@{Disc}[@{DiscName}]+@{MagienceBonus}[Magience Bonus]+@{Reason}[Reason]+@{Penalty}[Condition Penalty]]]}}'></button>
     </fieldset>
 </div>
 
 <div class="sheet-section-skills sheet-section sheet-fourth">
-    <div class="sheet-header">Performance<button type='roll' name='roll_Performance' value='&{template:basic} {{name=@{character_name} }} {{action=Performance}} {{attack=[[1d10+@{Performance}[Performance]+@{PerformanceBonus}[Performance Bonus]+@{Creativity}[Creativity]+@{Penalty}[Condition Penalty]]]}}'></button></div>
+    <div class="sheet-header">Performance<button type='roll' name='roll_Performance' value='&{template:basic} {{name=@{character_name} }} {{action=Performance}} {{conf=[[1d10]]}} {{attack=[[1d10+@{Performance}[Performance]+@{PerformanceBonus}[Performance Bonus]+@{Creativity}[Creativity]+@{Penalty}[Condition Penalty]]]}}'></button></div>
     <table>
     	<tr>
-			<td>Base: <input class="sheet-skill-on" type="number" name="Performance" max="5" min="0" value="0"/></td>
+			<td>Base: <input class="sheet-skill-on" type="number" name="attr_Performance" max="5" min="0" value="0"/></td>
     		<td>Bonus: <input class="sheet-skill-on" type="number" name="attr_PerformanceBonus" value="0"/></td>
     	</tr>
     </table>    
     <fieldset class="repeating_PerformanceDisc">
       <input class="sheet-skill-repeated-name" type="text" name="attr_DiscName" />
       <input class="sheet-skill-on" type="number" name="attr_Disc" min="6" max="15" value="6"/>
-      <button type='roll' name='roll_disc' value='&{template:basic} {{name=@{character_name} }} {{action=@{DiscName}}} {{attack=[[1d10+@{Disc}[@{DiscName}]+@{PerformanceBonus}[Performance Bonus]+@{Creativity}[Creativity]+@{Penalty}[Condition Penalty]]]}}'></button>
+      <button type='roll' name='roll_disc' value='&{template:basic} {{name=@{character_name} }} {{action=@{DiscName}}} {{conf=[[1d10]]}} {{attack=[[1d10+@{Disc}[@{DiscName}]+@{PerformanceBonus}[Performance Bonus]+@{Creativity}[Creativity]+@{Penalty}[Condition Penalty]]]}}'></button>
     </fieldset>
 </div>
 
 <div class="sheet-section-skills sheet-section sheet-fourth">
-    <div class="sheet-header">Shooting&Throw<button type='roll' name='roll_Shooting_Throw' value='&{template:basic} {{name=@{character_name} }} {{action=Shooting&Throw}} {{attack=[[1d10+@{Shooting}[Shooting&Throw]+@{ShootingBonus}[Shooting&Throw Bonus]+@{Combativeness}[Combativeness]+@{Penalty}[Condition Penalty]]]}}'></button></div>
+    <div class="sheet-header">Shooting&Throw<button type='roll' name='roll_Shooting_Throw' value='&{template:basic} {{name=@{character_name} }} {{action=Shooting&Throw}} {{conf=[[1d10]]}} {{attack=[[1d10+@{Shooting}[Shooting&Throw]+@{ShootingBonus}[Shooting&Throw Bonus]+@{Combativeness}[Combativeness]+@{Penalty}[Condition Penalty]]]}}'></button></div>
     <table>
     	<tr>
 			<td>Base: <input class="sheet-skill-on" type="number" name="attr_Shooting" max="5" min="0" value="0"/></td>
@@ -227,14 +227,14 @@
     <fieldset class="repeating_ShootingDisc">
       <input class="sheet-skill-repeated-name" type="text" name="attr_DiscName" />
       <input class="sheet-skill-on" type="number" name="attr_Disc" min="6" max="15" value="6"/>
-      <button type='roll' name='roll_disc' value='&{template:basic} {{name=@{character_name} }} {{action=@{DiscName}}} {{attack=[[1d10+@{Disc}[@{DiscName}]+@{ShootingBonus}[Shooting&Throw Bonus]+@{Combativeness}[Combativeness]+@{Penalty}[Condition Penalty]]]}}'></button>
+      <button type='roll' name='roll_disc' value='&{template:basic} {{name=@{character_name} }} {{action=@{DiscName}}} {{conf=[[1d10]]}} {{attack=[[1d10+@{Disc}[@{DiscName}]+@{ShootingBonus}[Shooting&Throw Bonus]+@{Combativeness}[Combativeness]+@{Penalty}[Condition Penalty]]]}}'></button>
     </fieldset>
 </div>
 
 <div class="sheet-break"></div>
 
 <div class="sheet-section-skills sheet-section sheet-fourth">
-    <div class="sheet-header">Demorthèn Mysteries<button type='roll' name='roll_Demorthen_Mysteries' value='&{template:basic} {{name=@{character_name} }} {{action=Demorthèn mysteries}} {{attack=[[1d10+@{DemorthenMysteries}[Demorthèn mysteries]+@{DemorthenMysteriesBonus}[Demorthèn mysteries Bonus]+@{Empathy}[Empathy]+@{Penalty}[Condition Penalty]]]}}'></button></div>
+    <div class="sheet-header">Demorthèn Mysteries<button type='roll' name='roll_Demorthen_Mysteries' value='&{template:basic} {{name=@{character_name} }} {{action=Demorthèn mysteries}} {{conf=[[1d10]]}} {{attack=[[1d10+@{DemorthenMysteries}[Demorthèn mysteries]+@{DemorthenMysteriesBonus}[Demorthèn mysteries Bonus]+@{Empathy}[Empathy]+@{Penalty}[Condition Penalty]]]}}'></button></div>
     <table>
     	<tr>
 			<td>Base: <input class="sheet-skill-on" type="number" name="attr_DemorthenMysteries" max="5" min="0" value="0"/></td>
@@ -244,12 +244,12 @@
     <fieldset class="repeating_DemorthenMysteriesDisc">
       <input class="sheet-skill-repeated-name" type="text" name="attr_DiscName" />
       <input class="sheet-skill-on" type="number" name="attr_Disc" min="6" max="15" value="6"/>
-      <button type='roll' name='roll_disc' value='&{template:basic} {{name=@{character_name} }} {{action=@{DiscName}}} {{attack=[[1d10+@{Disc}[@{DiscName}]+@{DemorthenMysteriesBonus}[Demorthèn mysteries Bonus]+@{Empathy}[Empathy]+@{Penalty}[Condition Penalty]]]}}'></button>
+      <button type='roll' name='roll_disc' value='&{template:basic} {{name=@{character_name} }} {{action=@{DiscName}}} {{conf=[[1d10]]}} {{attack=[[1d10+@{Disc}[@{DiscName}]+@{DemorthenMysteriesBonus}[Demorthèn mysteries Bonus]+@{Empathy}[Empathy]+@{Penalty}[Condition Penalty]]]}}'></button>
     </fieldset>
 </div>
 
 <div class="sheet-section-skills sheet-section sheet-fourth">
-    <div class="sheet-header">Natural Environment<button type='roll' name='roll_Natural_Environment' value='&{template:basic} {{name=@{character_name} }} {{action=Natural Environment}} {{attack=[[1d10+@{NaturalEnvironment}[Natural Environment]+@{NaturalEnvironmentBonus}[Natural Environment Bonus]+@{Empathy}[Empathy]+@{Penalty}[Condition Penalty]]]}}'></button></div>
+    <div class="sheet-header">Natural Environment<button type='roll' name='roll_Natural_Environment' value='&{template:basic} {{name=@{character_name} }} {{action=Natural Environment}} {{conf=[[1d10]]}} {{attack=[[1d10+@{NaturalEnvironment}[Natural Environment]+@{NaturalEnvironmentBonus}[Natural Environment Bonus]+@{Empathy}[Empathy]+@{Penalty}[Condition Penalty]]]}}'></button></div>
     <table>
         <tr>
 			<td>Base: <input class="sheet-skill-on" type="number" name="attr_NaturalEnvironment" max="5" min="0" value="0"/></td>
@@ -259,12 +259,12 @@
     <fieldset class="repeating_NaturalEnvironmentDisc">
       <input class="sheet-skill-repeated-name" type="text" name="attr_DiscName" />
       <input class="sheet-skill-on" type="number" name="attr_Disc" min="6" max="15" value="6"/>
-      <button type='roll' name='roll_disc' value='&{template:basic} {{name=@{character_name} }} {{action=@{DiscName}}} {{attack=[[1d10+@{Disc}[@{DiscName}]+@{NaturalEnvironmentBonus}[Natural Environment Bonus]+@{Empathy}[Empathy]+@{Penalty}[Condition Penalty]]]}}'></button>
+      <button type='roll' name='roll_disc' value='&{template:basic} {{name=@{character_name} }} {{action=@{DiscName}}} {{conf=[[1d10]]}} {{attack=[[1d10+@{Disc}[@{DiscName}]+@{NaturalEnvironmentBonus}[Natural Environment Bonus]+@{Empathy}[Empathy]+@{Penalty}[Condition Penalty]]]}}'></button>
     </fieldset>
 </div>
 
 <div class="sheet-section-skills sheet-section sheet-fourth">
-    <div class="sheet-header">Prayer<button type='roll' name='roll_Prayer' value='&{template:basic} {{name=@{character_name} }} {{action=Prayer}} {{attack=[[1d10+@{Prayer}[Prayer]+@{PrayerBonus}[Prayer Bonus]+@{Conviction}[Conviction]+@{Penalty}[Condition Penalty]]]}}'></button></div>
+    <div class="sheet-header">Prayer<button type='roll' name='roll_Prayer' value='&{template:basic} {{name=@{character_name} }} {{action=Prayer}} {{conf=[[1d10]]}} {{attack=[[1d10+@{Prayer}[Prayer]+@{PrayerBonus}[Prayer Bonus]+@{Conviction}[Conviction]+@{Penalty}[Condition Penalty]]]}}'></button></div>
     <table>
         <tr>
 			<td>Base: <input class="sheet-skill-on" type="number" name="attr_Prayer" max="5" min="0" value="0"/></td>
@@ -274,12 +274,12 @@
     <fieldset class="repeating_PrayerDisc">
       <input class="sheet-skill-repeated-name" type="text" name="attr_DiscName" />
       <input class="sheet-skill-on" type="number" name="attr_Disc" min="6" max="15" value="6"/>
-      <button type='roll' name='roll_disc' value='&{template:basic} {{name=@{character_name} }} {{action=@{DiscName}}} {{attack=[[1d10+@{Disc}[@{DiscName}]+@{PrayerBonus}[Prayer Bonus]+@{Empathy}[Empathy]+@{Penalty}[Condition Penalty]]]}}'></button>
+      <button type='roll' name='roll_disc' value='&{template:basic} {{name=@{character_name} }} {{action=@{DiscName}}} {{conf=[[1d10]]}} {{attack=[[1d10+@{Disc}[@{DiscName}]+@{PrayerBonus}[Prayer Bonus]+@{Empathy}[Empathy]+@{Penalty}[Condition Penalty]]]}}'></button>
     </fieldset>
 </div>
 
 <div class="sheet-section-skills sheet-section sheet-fourth">
-    <div class="sheet-header">Stealth<button type='roll' name='roll_Stealth' value='&{template:basic} {{name=@{character_name} }} {{action=Stealth}} {{attack=[[1d10+@{Stealth}[Stealth]+@{StealthBonus}[Stealth Bonus]+@{Empathy}[Empathy]+@{Penalty}[Condition Penalty]]]}}'></button></div>
+    <div class="sheet-header">Stealth<button type='roll' name='roll_Stealth' value='&{template:basic} {{name=@{character_name} }} {{action=Stealth}} {{conf=[[1d10]]}} {{attack=[[1d10+@{Stealth}[Stealth]+@{StealthBonus}[Stealth Bonus]+@{Empathy}[Empathy]+@{Penalty}[Condition Penalty]]]}}'></button></div>
     <table>
         <tr>
 			<td>Base: <input class="sheet-skill-on" type="number" name="attr_Stealth" max="5" min="0" value="0"/></td>
@@ -289,44 +289,44 @@
     <fieldset class="repeating_StealthDisc">
       <input class="sheet-skill-repeated-name" type="text" name="attr_DiscName" />
       <input class="sheet-skill-on" type="number" name="attr_Disc" min="6" max="15" value="6"/>
-      <button type='roll' name='roll_disc' value='&{template:basic} {{name=@{character_name} }} {{action=@{DiscName}}} {{attack=[[1d10+@{Disc}[@{DiscName}]+@{StealthBonus}[Stealth Bonus]+@{Empathy}[Empathy]+@{Penalty}[Condition Penalty]]]}}'></button>
+      <button type='roll' name='roll_disc' value='&{template:basic} {{name=@{character_name} }} {{action=@{DiscName}}} {{conf=[[1d10]]}} {{attack=[[1d10+@{Disc}[@{DiscName}]+@{StealthBonus}[Stealth Bonus]+@{Empathy}[Empathy]+@{Penalty}[Condition Penalty]]]}}'></button>
     </fieldset>
 </div>
 
 <div class="sheet-break"></div>
 
 <div class="sheet-section-skills sheet-section sheet-fourth">
-    <div class="sheet-header">Erudition<button type='roll' name='roll_Erudition' value='&{template:basic} {{name=@{character_name} }} {{action=Erudition}} {{attack=[[1d10+@{Erudition}[Erudition]+@{EruditionBonus}[Erudition Bonus]+@{Reason}[Reason]+@{Penalty}[Condition Penalty]]]}}'></button></div>
+    <div class="sheet-header">Erudition<button type='roll' name='roll_Erudition' value='&{template:basic} {{name=@{character_name} }} {{action=Erudition}} {{conf=[[1d10]]}} {{attack=[[1d10+@{Erudition}[Erudition]+@{EruditionBonus}[Erudition Bonus]+@{Reason}[Reason]+@{Penalty}[Condition Penalty]]]}}'></button></div>
     <table>
     	<tr>
-			<td>Base: <input class="sheet-skill-on" type="number" name="Erudition" max="5" min="0" value="0"/></td>
+			<td>Base: <input class="sheet-skill-on" type="number" name="attr_Erudition" max="5" min="0" value="0"/></td>
     		<td>Bonus: <input class="sheet-skill-on" type="number" name="attr_EruditionBonus" value="0"/></td>
     	</tr>
     </table>    
     <fieldset class="repeating_EruditionDisc">
       <input class="sheet-skill-repeated-name" type="text" name="attr_DiscName" />
       <input class="sheet-skill-on" type="number" name="attr_Disc" min="6" max="15" value="6"/>
-      <button type='roll' name='roll_disc' value='&{template:basic} {{name=@{character_name} }} {{action=@{DiscName}}} {{attack=[[1d10+@{Disc}[@{DiscName}]+@{EruditionBonus}[Erudition Bonus]+@{Reason}[Reason]+@{Penalty}[Condition Penalty]]]}}'></button>
+      <button type='roll' name='roll_disc' value='&{template:basic} {{name=@{character_name} }} {{action=@{DiscName}}} {{conf=[[1d10]]}} {{attack=[[1d10+@{Disc}[@{DiscName}]+@{EruditionBonus}[Erudition Bonus]+@{Reason}[Reason]+@{Penalty}[Condition Penalty]]]}}'></button>
     </fieldset>
 </div>
 
 <div class="sheet-section-skills sheet-section sheet-fourth">
-    <div class="sheet-header">Occultism<button type='roll' name='roll_Occultism' value='&{template:basic} {{name=@{character_name} }} {{action=Occultism}} {{attack=[[1d10+@{Occultism}[Occultism]+@{OccultismBonus}[Occultism Bonus]+@{Reason}[Reason]+@{Penalty}[Condition Penalty]]]}}'></button></div>
+    <div class="sheet-header">Occultism<button type='roll' name='roll_Occultism' value='&{template:basic} {{name=@{character_name} }} {{action=Occultism}} {{conf=[[1d10]]}} {{attack=[[1d10+@{Occultism}[Occultism]+@{OccultismBonus}[Occultism Bonus]+@{Reason}[Reason]+@{Penalty}[Condition Penalty]]]}}'></button></div>
     <table>
     	<tr>
-			<td>Base: <input class="sheet-skill-on" type="number" name="Occultism" max="5" min="0" value="0"/></td>
+			<td>Base: <input class="sheet-skill-on" type="number" name="attr_Occultism" max="5" min="0" value="0"/></td>
     		<td>Bonus: <input class="sheet-skill-on" type="number" name="attr_OccultismBonus" value="0"/></td>
     	</tr>
     </table>    
     <fieldset class="repeating_OccultismDisc">
       <input class="sheet-skill-repeated-name" type="text" name="attr_DiscName" />
       <input class="sheet-skill-on" type="number" name="attr_Disc" min="6" max="15" value="6"/>
-      <button type='roll' name='roll_disc' value='&{template:basic} {{name=@{character_name} }} {{action=@{DiscName}}} {{attack=[[1d10+@{Disc}[@{DiscName}]+@{OccultismBonus}[Occultism Bonus]+@{Reason}[Reason]+@{Penalty}[Condition Penalty]]]}}'></button>
+      <button type='roll' name='roll_disc' value='&{template:basic} {{name=@{character_name} }} {{action=@{DiscName}}} {{conf=[[1d10]]}} {{attack=[[1d10+@{Disc}[@{DiscName}]+@{OccultismBonus}[Occultism Bonus]+@{Reason}[Reason]+@{Penalty}[Condition Penalty]]]}}'></button>
     </fieldset>
 </div>
 
 <div class="sheet-section-skills sheet-section sheet-fourth">
-    <div class="sheet-header">Relation<button type='roll' name='roll_Relation' value='&{template:basic} {{name=@{character_name} }} {{action=Relation}} {{attack=[[1d10+@{Relation}[Relation]+@{RelationBonus}[Relation Bonus]+@{Empathy}[Empathy]+@{Penalty}[Condition Penalty]]]}}'></button></div>
+    <div class="sheet-header">Relation<button type='roll' name='roll_Relation' value='&{template:basic} {{name=@{character_name} }} {{action=Relation}} {{conf=[[1d10]]}} {{attack=[[1d10+@{Relation}[Relation]+@{RelationBonus}[Relation Bonus]+@{Empathy}[Empathy]+@{Penalty}[Condition Penalty]]]}}'></button></div>
     <table>
         <tr>
 			<td>Base: <input class="sheet-skill-on" type="number" name="attr_Relation" max="5" min="0" value="0"/></td>
@@ -336,12 +336,12 @@
     <fieldset class="repeating_RelationDisc">
       <input class="sheet-skill-repeated-name" type="text" name="attr_DiscName" />
       <input class="sheet-skill-on" type="number" name="attr_Disc" min="6" max="15" value="6"/>
-      <button type='roll' name='roll_disc' value='&{template:basic} {{name=@{character_name} }} {{action=@{DiscName}}} {{attack=[[1d10+@{Disc}[@{DiscName}]+@{RelationBonus}[Relation Bonus]+@{Empathy}[Empathy]+@{Penalty}[Condition Penalty]]]}}'></button>
+      <button type='roll' name='roll_disc' value='&{template:basic} {{name=@{character_name} }} {{action=@{DiscName}}} {{conf=[[1d10]]}} {{attack=[[1d10+@{Disc}[@{DiscName}]+@{RelationBonus}[Relation Bonus]+@{Empathy}[Empathy]+@{Penalty}[Condition Penalty]]]}}'></button>
     </fieldset>
 </div>
 
 <div class="sheet-section-skills sheet-section sheet-fourth">
-    <div class="sheet-header">Travel<button type='roll' name='roll_Travel' value='&{template:basic} {{name=@{character_name} }} {{action=Travel}} {{attack=[[1d10+@{Travel}[Travel]+@{TravelBonus}[Travel Bonus]+@{Empathy}[Empathy]+@{Penalty}[Condition Penalty]]]}}'></button></div>
+    <div class="sheet-header">Travel<button type='roll' name='roll_Travel' value='&{template:basic} {{name=@{character_name} }} {{action=Travel}} {{conf=[[1d10]]}} {{attack=[[1d10+@{Travel}[Travel]+@{TravelBonus}[Travel Bonus]+@{Empathy}[Empathy]+@{Penalty}[Condition Penalty]]]}}'></button></div>
     <table>
         <tr>
 			<td>Base: <input class="sheet-skill-on" type="number" name="attr_Travel" max="5" min="0" value="0"/></td>
@@ -351,7 +351,7 @@
     <fieldset class="repeating_TravelDisc">
       <input class="sheet-skill-repeated-name" type="text" name="attr_DiscName" />
       <input class="sheet-skill-on" type="number" name="attr_Disc" min="6" max="15" value="6"/>
-      <button type='roll' name='roll_disc' value='&{template:basic} {{name=@{character_name} }} {{action=@{DiscName}}} {{attack=[[1d10+@{Disc}[@{DiscName}]+@{TravelBonus}[Travel Bonus]+@{Empathy}[Empathy]+@{Penalty}[Condition Penalty]]]}}'></button>
+      <button type='roll' name='roll_disc' value='&{template:basic} {{name=@{character_name} }} {{action=@{DiscName}}} {{conf=[[1d10]]}} {{attack=[[1d10+@{Disc}[@{DiscName}]+@{TravelBonus}[Travel Bonus]+@{Empathy}[Empathy]+@{Penalty}[Condition Penalty]]]}}'></button>
     </fieldset>
 </div>
 
@@ -368,36 +368,39 @@
 		<input class="sheet-skill-on" style="width: 200px;" type="text" name="attr_WeaponName" />
 		<input class="sheet-skill-on" style="width: 50px;" type="number" name="attr_Damage" min="1" value="1"/>
 	</fieldset>	
+	<div class="sheet-header-sub">Combat Arts</div>
+    <textarea class="sheet-advantages" type="textarea" name="attr_CombatArts"></textarea>
+	</div>
 </div>
 
 <div class="sheet-section-skills sheet-section sheet-third sheet-weapon">
 	<div class="sheet-header">Attitudes</div>
     
-	<div class="sheet-header-sub"><input type="radio" name="attr_Attitude" value="Standard" checked="true" />Standard - Initiative: <button type='roll' name='roll_Standard_Initiative' value='&{template:basic} {{name=@{character_name} }} {{subtags=Standard Attitude}} {{action=Initiative}} {{attack=[[1d10+@{StandardSpeed}[Speed] &{tracker}]]}}'></button></div>    
+	<div class="sheet-header-sub"><input type="radio" name="attr_Attitude" value="Standard" checked="true" />Standard - Initiative: <button type='roll' name='roll_Standard_Initiative' value='&{template:basic} {{name=@{character_name} }} {{subtags=Standard Attitude}} {{action=Initiative}} {{conf=[[1d10]]}} {{attack=[[1d10+@{StandardSpeed}[Speed] &{tracker}]]}}'></button></div>    
         Atk: <input class="sheet-skill-on" type="number" name="attr_StandardAttack"/>
-        <button type='roll' name='roll_Standard_Attack' value='&{template:basic} {{name=@{character_name} }} {{action=Standard Attack}} {{attack=[[1d10+@{StandardAttack}[Attack]+@{Penalty}[Condition Penalty]]]}}'></button>
+        <button type='roll' name='roll_Standard_Attack' value='&{template:basic} {{name=@{character_name} }} {{action=Standard Attack}} {{conf=[[1d10]]}} {{attack=[[1d10+@{StandardAttack}[Attack]+@{Penalty}[Condition Penalty]]]}}'></button>
         Def: <input class="sheet-skill-off" type="number" name="attr_StandardDefense" value="@{DefenseSum}" disabled="true"/>
         Spd: <input class="sheet-skill-off" type="number" name="attr_StandardSpeed" value="@{SpeedSum}" disabled="true"/>    
         
-	<div class="sheet-header-sub"><input type="radio" name="attr_Attitude" value="Offensive"/>Offensive - Initiative: <button type='roll' name='roll_Offensive_Initiative' value='&{template:basic} {{name=@{character_name} }} {{subtags=Offensive Attitude}} {{action=Initiative}} {{attack=[[1d10+@{OffensiveSpeed}[Speed] &{tracker}]]}}'></button></div>
+	<div class="sheet-header-sub"><input type="radio" name="attr_Attitude" value="Offensive"/>Offensive - Initiative: <button type='roll' name='roll_Offensive_Initiative' value='&{template:basic} {{name=@{character_name} }} {{subtags=Offensive Attitude}} {{action=Initiative}} {{conf=[[1d10]]}} {{attack=[[1d10+@{OffensiveSpeed}[Speed] &{tracker}]]}}'></button></div>
         Atk: <input class="sheet-skill-off" type="number" name="attr_OffensiveAttack" value="@{StandardAttack}+@{PotentialSum}" disabled="true"/>
-        <button type='roll' name='roll_Offensive_Attack' value='&{template:basic} {{name=@{character_name} }} {{action=Offensive Attack}} {{attack=[[1d10+@{OffensiveAttack}[Attack]+@{Penalty}[Condition Penalty]]]}}'></button>
+        <button type='roll' name='roll_Offensive_Attack' value='&{template:basic} {{name=@{character_name} }} {{action=Offensive Attack}} {{conf=[[1d10]]}} {{attack=[[1d10+@{OffensiveAttack}[Attack]+@{Penalty}[Condition Penalty]]]}}'></button>
         Def: <input class="sheet-skill-off" type="number" name="attr_OffensiveDefense" value="@{DefenseSum}-(@{PotentialSum})" disabled="true"/>
         Spd: <input class="sheet-skill-off" type="number" name="attr_OffensiveSpeed" value="@{SpeedSum}" disabled="true"/>	
         
-    <div class="sheet-header-sub"><input type="radio" name="attr_Attitude" value="Defensive"/>Defensive - Initiative: <button type='roll' name='roll_Defensive_Initiative' value='&{template:basic} {{name=@{character_name} }} {{subtags=Defensive Attitude}} {{action=Initiative}} {{attack=[[1d10+@{DefensiveSpeed}[Speed] &{tracker}]]}}'></button></div>
+    <div class="sheet-header-sub"><input type="radio" name="attr_Attitude" value="Defensive"/>Defensive - Initiative: <button type='roll' name='roll_Defensive_Initiative' value='&{template:basic} {{name=@{character_name} }} {{subtags=Defensive Attitude}} {{action=Initiative}} {{conf=[[1d10]]}} {{attack=[[1d10+@{DefensiveSpeed}[Speed] &{tracker}]]}}'></button></div>
         Atk: <input class="sheet-skill-off" type="number" name="attr_DefensiveAttack" value="@{StandardAttack}-@{PotentialSum}" disabled="true"/>
-        <button type='roll' name='roll_Defensive_Attack' value='&{template:basic} {{name=@{character_name} }} {{action=Defensive Attack}} {{attack=[[1d10+@{DefensiveAttack}[Attack]+@{Penalty}[Condition Penalty]]]}}'></button>
+        <button type='roll' name='roll_Defensive_Attack' value='&{template:basic} {{name=@{character_name} }} {{action=Defensive Attack}} {{conf=[[1d10]]}} {{attack=[[1d10+@{DefensiveAttack}[Attack]+@{Penalty}[Condition Penalty]]]}}'></button>
         Def: <input class="sheet-skill-off" type="number" name="attr_DefensiveDefense" value="@{DefenseSum}+(@{PotentialSum})" disabled="true"/>
         Spd: <input class="sheet-skill-off" type="number" name="attr_DefensiveSpeed" value="@{SpeedSum}" disabled="true"/>	
         
-	<div class="sheet-header-sub"><input type="radio" name="attr_Attitude" value="Quick"/>Quick - Initiative: <button type='roll' name='roll_Quick_Initiative' value='&{template:basic} {{name=@{character_name} }} {{subtags=Quick Attitude}} {{action=Initiative}} {{attack=[[1d10+@{QuickSpeed}[Speed] &{tracker}]]}}'></button></div>
+	<div class="sheet-header-sub"><input type="radio" name="attr_Attitude" value="Quick"/>Quick - Initiative: <button type='roll' name='roll_Quick_Initiative' value='&{template:basic} {{name=@{character_name} }} {{subtags=Quick Attitude}} {{action=Initiative}} {{conf=[[1d10]]}} {{attack=[[1d10+@{QuickSpeed}[Speed] &{tracker}]]}}'></button></div>
         Atk: <input class="sheet-skill-off" type="number" name="attr_QuickAttack" value="@{StandardAttack}" disabled="true"/>
-        <button type='roll' name='roll_Quick_Attack' value='&{template:basic} {{name=@{character_name} }} {{action=Quick Attack}} {{attack=[[1d10+@{QuickAttack}[Attack]+@{Penalty}[Condition Penalty]]]}}'></button>
+        <button type='roll' name='roll_Quick_Attack' value='&{template:basic} {{name=@{character_name} }} {{action=Quick Attack}} {{conf=[[1d10]]}} {{attack=[[1d10+@{QuickAttack}[Attack]+@{Penalty}[Condition Penalty]]]}}'></button>
         Def: <input class="sheet-skill-off" type="number" name="attr_QuickDefense" value="@{DefenseSum}-(@{PotentialSum})" disabled="true"/>
         Spd: <input class="sheet-skill-off" type="number" name="attr_QuickSpeed" value="@{SpeedSum}+(@{PotentialSum})" disabled="true"/>	
         
-	<div class="sheet-header-sub"><input type="radio" name="attr_Attitude" value="Movement"/>Movement - Initiative: <button type='roll' name='roll_Movement_Initiative' value='&{template:basic} {{name=@{character_name} }} {{subtags=Movement Attitude}} {{action=Initiative}} {{attack=[[1d10+@{MovementSpeed}[Speed] &{tracker}]]}}'></button></div>
+	<div class="sheet-header-sub"><input type="radio" name="attr_Attitude" value="Movement"/>Movement - Initiative: <button type='roll' name='roll_Movement_Initiative' value='&{template:basic} {{name=@{character_name} }} {{subtags=Movement Attitude}} {{action=Initiative}} {{conf=[[1d10]]}} {{attack=[[1d10+@{MovementSpeed}[Speed] &{tracker}]]}}'></button></div>
         Atk: <input class="sheet-skill-off" type="number" name="attr_MovementAttack" value="0" disabled="true"/>
         Def: <input class="sheet-skill-off" type="number" name="attr_MovementDefense" value="@{DefenseSum}+(@{PotentialSum})" disabled="true"/>
         Spd: <input class="sheet-skill-off" type="number" name="attr_MovementSpeed" value="@{SpeedSum}" disabled="true"/>	
@@ -460,7 +463,7 @@
       <input class="sheet-skill-on" style="width: 40px;" type="number" name="attr_Tank_max" min="0"/>
       <input class="sheet-skill-on" style="width: 40px;" type="number" name="attr_Resistance" min="1" value="1"/>/
       <input class="sheet-skill-on" style="width: 40px;" type="number" name="attr_Resistance_max" min="1" value="1"/>
-      <button type='roll' name='roll_disc' value='&{template:basic} {{name=@{character_name} }} {{action=Resistance Roll}} {{subtags=@{ArtifactName}}} {{attack=[[1d10+@{Resistance}[Resistance]]]}}'></button>
+      <button type='roll' name='roll_disc' value='&{template:basic} {{name=@{character_name} }} {{action=Resistance Roll}} {{subtags=@{ArtifactName}}} {{conf=[[1d10]]}} {{attack=[[1d10+@{Resistance}[Resistance]]]}}'></button>
       <input class="sheet-repeated-artifact" style="width: 125px;" type="text" name="attr_Vulnerability" />
       <input class="sheet-skill-on" style="width: 40px;" type="number" name="attr_Handling"/>
       <input class="sheet-skill-on" style="width: 40px;" type="number" name="attr_Damage"/>
@@ -471,14 +474,14 @@
 <div class="sheet-break"></div>
 <div class="sheet-section-skills sheet-section sheet-third">
 	<div class="sheet-header">Rindath</div>
-    Rating: <input class="sheet-skill-on" type="number" name="attr_Rindath" value="0" min="0"/>
+    Rating: <input class="sheet-skill-on" type="number" name="attr_Rindath" value="0" min="0"/>/<input class="sheet-skill-on" type="number" name="attr_Rindath_max" value="0" min="0"/>
 	<div class="sheet-header-sub">Ogham</div>    
 	<textarea name="attr_Ogham"></textarea>
 </div>
 
 <div class="sheet-section-skills sheet-section sheet-third sheet-exaltation">
 	<div class="sheet-header">Exaltation</div>
-    Rating: <input class="sheet-skill-on" type="number" name="attr_Exaltation" value="0" min="0"/>
+    Rating: <input class="sheet-skill-on" type="number" name="attr_Exaltation" value="0" min="0"/>/<input class="sheet-skill-on" type="number" name="attr_Exaltation_max" value="0" min="0"/>
 	<div class="sheet-header-sub">Major Miracles</div>    
 	<textarea name="attr_MajorMiracles"></textarea>
 	<div class="sheet-header-sub">Minor Miracles</div>    
@@ -498,7 +501,7 @@
 <div class="sheet-section-skills sheet-section sheet-twothirds">
     <div class="sheet-header">Sanity</div>
     Mental Resistance: <input class="sheet-skill-on" type="number" name="attr_MentalResistance" value="@{Conviction}+5"/>
-    <button type='roll' name='roll_Mental_Resistance' value='&{template:basic} {{name=@{character_name} }} {{action=Mental Resistance}} {{attack=[[1d10+@{MentalResistance}[MentalResistance]+floor((@{Hardening}-1)/5)*3+@{Penalty}[Penalty]]]}}'></button>
+    <button type='roll' name='roll_Mental_Resistance' value='&{template:basic} {{name=@{character_name} }} {{action=Mental Resistance}} {{conf=[[1d10]]}} {{attack=[[1d10+@{MentalResistance}[MentalResistance]+floor((@{Hardening}-1)/5)*3+@{Penalty}[Penalty]]]}}'></button>
 
     <table class="sheet-table-mentalresistance">
         <th></th>
@@ -710,10 +713,115 @@ on("change:creativity change:potential", function() {
         <tr class="rowcolor">
             <td>{{attack}} - <span class="tcat">{{action}}</span></td>
         </tr>
-        {{#allprops() attack subtags action}}
+        {{#allprops() attack subtags action conf}}
         <tr class="rowcolor">
             <td><strong>{{value}}</strong> - {{key}}</span></td>
         </tr>
-        {{/allprops() attack subtags action}}        
+        {{/allprops() attack subtags action conf}}        
+
+{{#rollWasCrit() attack}}
+        <tr>
+            <td class="rowsmaller">{{conf}} - <span class="tcat">Critical Success Confirmation</span></td>
+        </tr>
+{{#rollWasCrit() conf}}
+<tr><td class="criticalsuccess"><b>Critical Success</b></td></tr>
+{{/rollWasCrit() conf}}
+{{/rollWasCrit() attack}}
+
+{{#rollWasFumble() attack}}
+        <tr>
+            <td class="rowsmaller">{{conf}} - <span class="tcat">Critical Fumble Confirmation</span></td>
+        </tr>
+{{#rollWasFumble() conf}}
+<tr><td class="criticalfailure"><b>Critical Failure</b></td></tr>
+{{/rollWasFumble() conf}}
+{{/rollWasFumble() attack}}
+
+        {{#rollGreater() attack 6}}
+        <tr>
+            <td class="rowsuccess">7 - Easy</td>
+        </tr>
+        {{/rollGreater() attack 6}}
+        {{#rollGreater() attack 10}}
+        <tr>
+            <td class="rowsuccess">11 - Standard</td>
+        </tr>
+        {{/rollGreater() attack 10}}
+
+        {{#rollGreater() attack 13}}
+        <tr>
+            <td class="rowsuccess">14 - Complicated</td>
+        </tr>
+        {{/rollGreater() attack 13}}
+
+        {{#rollGreater() attack 16}}
+        <tr>
+            <td class="rowsuccess">17 - Difficult</td>
+        </tr>
+        {{/rollGreater() attack 16}}
+        {{#rollGreater() attack 19}}
+        <tr>
+            <td class="rowsuccess">20 - Very Difficult</td>
+        </tr>
+        {{/rollGreater() attack 19}}
+        {{#rollGreater() attack 24}}
+        <tr>
+            <td class="rowsuccess">25 - Exceptional</td>
+        </tr>
+        {{/rollGreater() attack 24}}
+        {{#rollGreater() attack 29}}
+        <tr>
+            <td class="rowsuccess">30 - Heroic</td>
+        </tr>
+        {{/rollGreater() attack 29}}
+        {{#rollGreater() attack 34}}
+        <tr>
+            <td class="rowsuccess">35 - Superhuman</td>
+        </tr>
+        {{/rollGreater() attack 34}}
+		
+        {{#rollLess() attack 7}}
+        <tr>
+            <td class="rowfailure">7 - Easy</td>
+        </tr>
+        {{/rollLess() attack 7}}
+        {{#rollLess() attack 11}}
+        <tr>
+            <td class="rowfailure">11 - Standard</td>
+        </tr>
+        {{/rollLess() attack 11}}
+
+        {{#rollLess() attack 14}}
+        <tr>
+            <td class="rowfailure">14 - Complicated</td>
+        </tr>
+        {{/rollLess() attack 14}}
+
+        {{#rollLess() attack 17}}
+        <tr>
+            <td class="rowfailure">17 - Difficult</td>
+        </tr>
+        {{/rollLess() attack 17}}
+        {{#rollLess() attack 20}}
+        <tr>
+            <td class="rowfailure">20 - Very Difficult</td>
+        </tr>
+        {{/rollLess() attack 20}}
+        {{#rollLess() attack 25}}
+        <tr>
+            <td class="rowfailure">25 - Exceptional</td>
+        </tr>
+        {{/rollLess() attack 25}}
+        {{#rollLess() attack 30}}
+        <tr>
+            <td class="rowfailure">30 - Heroic</td>
+        </tr>
+        {{/rollLess() attack 30}}
+        {{#rollLess() attack 35}}
+        <tr>
+            <td class="rowfailure">35 - Superhuman</td>
+        </tr>
+        {{/rollLess() attack 35}}
+        		
     </table>
 </rolltemplate>
\ No newline at end of file
diff --git a/Shadows of Esteren/sheet.json b/Shadows of Esteren/sheet.json
index 9ad92df97f..cef610289d 100644
--- a/Shadows of Esteren/sheet.json	
+++ b/Shadows of Esteren/sheet.json	
@@ -1,8 +1,8 @@
 {
 	"html": "ShadowsOfEsteren.html",
 	"css": "ShadowsOfEsteren.css",
-	"authors": "Radek G. (Based on Achtung Cthulhu character sheet by Rob heath)",
+	"authors": "Radek G.",
 	"roll20userid": "27450",
 	"preview": "ShadowsOfEsteren.jpg",
-	"instructions": "# Shadows Of Esteren Character Sheet.\r## Very rudementary but with some basic automation\r## Set Player's Health Condition like it would be a NPC with X(G)\Y(O)\Z(B)\V(C) system.\r## Potential base value is automatically calculated whenever you change Creativity.\r## Condition Penalty is automatically calculated whenever Player's Health Condition changes or any of G\O\B\V values and is added to rolls."
+	"instructions": "# Shadows Of Esteren Character Sheet.\r## Very rudementary but with some basic automation\r## Fill out Player's Health Condition like it would be a NPC with X(G)\Y(O)\Z(B)\V(C) system.\r## Potential base value is automatically calculated whenever you change Creativity.\r## Condition Penalty is automatically calculated whenever Player's Health Condition changes and is automatically added to the rolls ((make sure character sheets are open for automatic penalty calculation)."
 }
\ No newline at end of file