diff --git a/Unisystem-Buffy or Angel/Buffy_or_Angel.html b/Unisystem-Buffy or Angel/Buffy_or_Angel.html
index 78c312b1f2..3e3b6aaa5c 100644
--- a/Unisystem-Buffy or Angel/Buffy_or_Angel.html	
+++ b/Unisystem-Buffy or Angel/Buffy_or_Angel.html	
@@ -54,40 +54,40 @@
                         <td>Modifier</td>
                     </tr>
                     <tr>
-                        <td><button type='roll' class="sheet-trait_roll" value="/e rolls Strength [[(@{base-Strength}*2) + @{mod-Strength} + 1d10 + ?{Modifiers|0}]]">Strength</button></td>
+			<td><button type='roll' class="sheet-trait_roll" value="&{template:default} {{name=@{character_name} rolls Strength }} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10+@{base-Strength}*2+@{mod-Strength}+ ?{Modifiers|0}]] ]] ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}}">Strength</button>
                         <td><input type="number" class="sheet-trait" name="attr_base-Strength" value="0" /></td>
                         <td><input type="number" class="sheet-trait" name="attr_mod-Strength" value="0" /></td>
-                        <td><button type='roll' class="sheet-trait_roll" value="/e rolls Strength [[@{base-Strength} + @{mod-Strength} + 1d10 + ?{Modifiers|0}]]">Difficult</button></td>
+                        <td><button type='roll' class="sheet-trait_roll" value="&{template:default} {{name=@{character_name} rolls difficult Strength }} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10+@{base-Strength}+@{mod-Strength}+ ?{Modifiers|0}]] ]] ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}}">Difficult</button>
                     </tr>
                     <tr>
-                        <td><button type='roll' class="sheet-trait_roll" value="/e rolls Dexterity [[(@{base-Dexterity}*2) + @{mod-Dexterity} + 1d10 + ?{Modifiers|0}]]">Dexterity</button></td>
+                        <td><button type='roll' class="sheet-trait_roll" value="&{template:default} {{name=@{character_name} rolls Dexterity}} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10+@{base-Dexterity}*2+@{mod-Dexterity}+ ?{Modifiers|0}]] ]] ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}}">Dexterity</button>
                         <td><input type="number" class="sheet-trait" name="attr_base-Dexterity" value="0" /></td>
                         <td><input type="number" class="sheet-trait" name="attr_mod-Dexterity" value="0" /></td>
-                        <td><button type='roll' class="sheet-trait_roll" value="/e rolls Dexterity [[@{base-Dexterity} + @{mod-Dexterity} + 1d10 + ?{Modifiers|0}]]">Difficult</button></td>
+                      <td><button type='roll' class="sheet-trait_roll" value="&{template:default} {{name=@{character_name} rolls difficult Dexterity }} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10+@{base-Dexterity}+@{mod-Dexterity}+ ?{Modifiers|0}]] ]] ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}}">Difficult</button>
                     </tr>
                     <tr>
-                        <td><button type='roll' class="sheet-trait_roll" value="/e rolls Constitution [[(@{base-Constitution}*2) + @{mod-Constitution} + 1d10 + ?{Modifiers|0}]]">Constitution</button></td>
+                           <td><button type='roll' class="sheet-trait_roll" value="&{template:default} {{name=@{character_name} rolls Constitution}} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10+@{base-Constitution}*2+@{mod-Constitution}+ ?{Modifiers|0}]] ]] ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}}">Constitution</button>
                         <td><input type="number" class="sheet-trait" name="attr_base-Constitution" value="0" /></td>
                         <td><input type="number" class="sheet-trait" name="attr_mod-Constitution" value="0" /></td>
-                        <td><button type='roll' class="sheet-trait_roll" value="/e rolls Constitution [[@{base-Constitution} + @{mod-Constitution} + 1d10 + ?{Modifiers|0}]]">Difficult</button></td>
+                        <td><button type='roll' class="sheet-trait_roll" value="&{template:default} {{name=@{character_name} rolls difficult Constitution }} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10+@{base-Constitution}+@{mod-Constitution}+ ?{Modifiers|0}]] ]] ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}}">Difficult</button>
                     </tr>
                     <tr>
-                        <td><button type='roll' class="sheet-trait_roll" value="/e rolls Intelligence [[(@{base-Intelligence}*2) + @{mod-Intelligence} + 1d10 + ?{Modifiers|0}]]">Intelligence</button></td>
+                         <td><button type='roll' class="sheet-trait_roll" value="&{template:default} {{name=@{character_name} rolls Intelligence}} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10+@{base-Intelligence}*2+@{mod-Intelligence}+ ?{Modifiers|0}]] ]] ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}}">Intelligence</button>
                         <td><input type="number" class="sheet-trait" name="attr_base-Intelligence" value="0" /></td>
                         <td><input type="number" class="sheet-trait" name="attr_mod-Intelligence" value="0" /></td>
-                        <td><button type='roll' class="sheet-trait_roll" value="/e rolls Intelligence [[@{base-Intelligence} + @{mod-Intelligence} + 1d10 + ?{Modifiers|0}]]">Difficult</button></td>
+                         <td><button type='roll' class="sheet-trait_roll" value="&{template:default} {{name=@{character_name} rolls difficult Intelligence }} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10+@{base-Intelligence}+@{mod-Intelligence}+ ?{Modifiers|0}]] ]] ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}}">Difficult</button>
                     </tr>
                     <tr>
-                        <td><button type='roll' class="sheet-trait_roll" value="/e rolls Perception [[(@{base-Perception}*2) + @{mod-Perception} + 1d10 + ?{Modifiers|0}]]">Perception</button></td>
+                     <td><button type='roll' class="sheet-trait_roll" value="&{template:default} {{name=@{character_name} rolls Perception}} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10+@{base-Intelligence}*2+@{mod-Perception}+ ?{Modifiers|0}]] ]] ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}}">Perception</button>
                         <td><input type="number" class="sheet-trait" name="attr_base-Perception" value="0" /></td>
                         <td><input type="number" class="sheet-trait" name="attr_mod-Perception" value="0" /></td>
-                        <td><button type='roll' class="sheet-trait_roll" value="/e rolls Perception [[@{base-Perception} + @{mod-Perception} + 1d10 + ?{Modifiers|0}]]">Difficult</button></td>
+                       <td><button type='roll' class="sheet-trait_roll" value="&{template:default} {{name=@{character_name} rolls difficult Perception }} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10+@{base-Perception}+@{mod-Perception}+ ?{Modifiers|0}]] ]] ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}}">Difficult</button>
                     </tr>
                     <tr>
-                        <td><button type='roll' class="sheet-trait_roll" value="/e rolls Willpower [[(@{base-Willpower}*2) + @{mod-Willpower} + 1d10 + ?{Modifiers|0}]]">Willpower</button></td>
+                         <td><button type='roll' class="sheet-trait_roll" value="&{template:default} {{name=@{character_name} rolls Willpower}} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10+@{base-Willpower}*2+@{mod-Perception}+ ?{Modifiers|0}]] ]] ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}}">Willpower</button>
                         <td><input type="number" class="sheet-trait" name="attr_base-Willpower" value="0" /></td>
                         <td><input type="number" class="sheet-trait" name="attr_mod-Willpower" value="0" /></td>
-                        <td><button type='roll' class="sheet-trait_roll" value="/e rolls Willpower [[@{base-Willpower} + @{mod-Willpower} + 1d10 + ?{Modifiers|0}]]">Difficult</button></td>
+                       <td><button type='roll' class="sheet-trait_roll" value="&{template:default} {{name=@{character_name} rolls difficult Willpower }} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10+@{base-Willpower}+@{mod-Willpower}+ ?{Modifiers|0}]] ]] ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}}">Difficult</button>
                     </tr>
                 </table>
             </div>
@@ -338,7 +338,7 @@
                     </tr>
                     <!-- Acrobatics -->
                     <tr>
-                        <td><button type='roll' class="sheet-skillbutton" value="/e rolls @{Acrobatics} [[(@{Acrobatics_rating}) + @{Acrobatics_attribute_select} + ?{Modifiers|0} + 1d10]]"></button></td>
+                        <td><button type='roll' class="sheet-skillbutton" value="&{template:default} {{name=@{character_name} rolls @{Acrobatics} }} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10 + @{Acrobatics_rating}+ @{Acrobatics_attribute_select}+?{Modifiers|0}]] ]]  ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}}"></button>
                         <td><input type="hidden" class="sheet-textbox" value="Acrobatics" disabled="true" name="attr_Acrobatics"
                             />&nbsp;&nbsp;&nbsp;Acrobatics</td>
                         <td><input type="number" class="sheet-numberbox" name="attr_Acrobatics_rating" value="0" /></td>
@@ -353,7 +353,7 @@
                     </tr>
                     <!-- Art -->
                     <tr>
-                        <td><button type='roll' class="sheet-skillbutton" value="/e rolls @{Art} [[(@{Art_rating}) + @{Art_attribute_select} + ?{Modifiers|0} + 1d10]]"></button></td>
+                        <td><button type='roll' class="sheet-skillbutton" value="&{template:default} {{name=@{character_name} rolls @{Art} }} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10 + @{Art_rating}+ @{Art_attribute_select}+?{Modifiers|0}]] ]]  ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}}"></button>
                         <td><input type="hidden" class="sheet-textbox" value="Art" disabled="true" name="attr_Art" />&nbsp;&nbsp;&nbsp;Art</td>
                         <td><input type="number" class="sheet-numberbox" name="attr_Art_rating" value="0" /></td>
                         <td><select class="sheet-skill_select" name="attr_Art_attribute_select" />
@@ -365,7 +365,7 @@
                     </tr>
                     <!-- Computer -->
                     <tr>
-                        <td><button type='roll' class="sheet-skillbutton" value="/e rolls @{Computer} [[(@{Computer_rating}) + @{Computer_attribute_select} + ?{Modifiers|0} + 1d10]]"></button></td>
+                       <td><button type='roll' class="sheet-skillbutton" value="&{template:default} {{name=@{character_name} rolls @{Computer} }} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10 + @{Computer_rating}+ @{Computer_attribute_select}+?{Modifiers|0}]] ]]  ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}}"></button>
                         <td><input type="hidden" class="sheet-textbox" value="Computer" disabled="true" name="attr_Computer"
                             />&nbsp;&nbsp;&nbsp;Computer</td>
                         <td><input type="number" class="sheet-numberbox" name="attr_Computer_rating" value="0" /></td>
@@ -377,7 +377,7 @@
                     </tr>
                     <!-- Crime -->
                     <tr>
-                        <td><button type='roll' class="sheet-skillbutton" value="/e rolls @{Crime} [[(@{Crime_rating}) + @{Crime_attribute_select} + ?{Modifiers|0} + 1d10]]"></button></td>
+                        <td><button type='roll' class="sheet-skillbutton" value="&{template:default} {{name=@{character_name} rolls @{Crime} }} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10 + @{Crime_rating} + @{Crime_attribute_select}+?{Modifiers|0}]] ]]  ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}}"></button>
                         <td><input type="hidden" class="sheet-textbox" value="Crime" disabled="true" name="attr_Crime" />&nbsp;&nbsp;&nbsp;Crime</td>
                         <td><input type="number" class="sheet-numberbox" name="attr_Crime_rating" value="0" /></td>
                         <td><select class="sheet-skill_select" name="attr_Crime_attribute_select" />
@@ -391,7 +391,7 @@
                     </tr>
                     <!-- Doctor -->
                     <tr>
-                        <td><button type='roll' class="sheet-skillbutton" value="/e rolls @{Doctor} [[(@{Doctor_rating}) + @{Doctor_attribute_select} + ?{Modifiers|0} + 1d10]]"></button></td>
+                       <td><button type='roll' class="sheet-skillbutton" value="&{template:default} {{name=@{character_name} rolls @{Doctor} }} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10 + @{Doctor_rating} + @{Doctor_attribute_select}+?{Modifiers|0}]] ]]  ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}}"></button>
                         <td><input type="hidden" class="sheet-textbox" value="Doctor" disabled="true" name="attr_Doctor"
                             />&nbsp;&nbsp;&nbsp;Doctor</td>
                         <td><input type="number" class="sheet-numberbox" name="attr_Doctor_rating" value="0" /></td>
@@ -406,7 +406,7 @@
                     </tr>
                     <!-- Drive -->
                     <tr>
-                        <td><button type='roll' class="sheet-skillbutton" value="/e rolls @{Drive} [[(@{Drive_rating}) + @{Drive_attribute_select} + ?{Modifiers|0} + 1d10]]"></button></td>
+                      <td><button type='roll' class="sheet-skillbutton" value="&{template:default} {{name=@{character_name} rolls @{Drive} }} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10 + @{Drive_rating}++ @{Drive_attribute_select}+?{Modifiers|0}]] ]]  ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}}"></button>
                         <td><input type="hidden" class="sheet-textbox" value="Drive" disabled="true" name="attr_Drive" />&nbsp;&nbsp;&nbsp;Drive</td>
                         <td><input type="number" class="sheet-numberbox" name="attr_Drive_rating" value="0" /></td>
                         <td><select class="sheet-skill_select" name="attr_Drive_attribute_select" />
@@ -436,7 +436,7 @@
                     </tr>
                     <!-- Influence -->
                     <tr>
-                        <td><button type='roll' class="sheet-skillbutton" value="/e rolls @{Influence} [[(@{Influence_rating}) + @{Influence_attribute_select} + ?{Modifiers|0} + 1d10]]"></button></td>
+                       <td><button type='roll' class="sheet-skillbutton" value="&{template:default} {{name=@{character_name} rolls @{Influence} }} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10 + @{Influence_rating}+ @{Influence_attribute_select}+ ?{Modifiers|0}]] ]]  ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}}"></button>
                         <td><input type="hidden" class="sheet-textbox" value="Influence" disabled="true" name="attr_Influence"
                             />&nbsp;&nbsp;&nbsp;Influence</td>
                         <td><input type="number" class="sheet-numberbox" name="attr_Influence_rating" value="0" /></td>
@@ -448,7 +448,7 @@
                     </tr>
                     <!-- Wildcard2 -->
                     <tr>
-                        <td><button type='roll' class="sheet-skillbutton" value="/e rolls @{Wildcard2} [[(@{Wildcard2_rating}) + @{Wildcard2_attribute_select} + ?{Modifiers|0}+ 1d10]]"></button></td>
+                       <td><button type='roll' class="sheet-skillbutton" value="&{template:default} {{name=@{character_name} rolls @{Wildcard2} }} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10 + @{Wildcard2_rating}+ @{Wildcard2_attribute_select}+ ?{Modifiers|0}]] ]]  ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}}"></button>
                         <td><input type="text" class="sheet-textbox" value="Wildcard" name="attr_Wildcard2" /></td>
                         <td><input type="number" class="sheet-numberbox" name="attr_Wildcard2_rating" value="0" /></td>
                         <td><select class="sheet-skill_select" name="attr_Wildcard2_attribute_select" />
@@ -480,7 +480,7 @@
                     </tr>
                     <!-- Knowledge -->
                     <tr>
-                        <td><button type='roll' class="sheet-skillbutton" value="/e rolls @{Knowledge} [[(@{Knowledge_rating}) + @{Knowledge_attribute_select} + ?{Modifiers|0} + 1d10]]"></button></td>
+                      <td><button type='roll' class="sheet-skillbutton" value="&{template:default} {{name=@{character_name} rolls @{Knowledge} }} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10 + @{Knowledge_rating}+ @{Influence_attribute_select}+ ?{Modifiers|0}]] ]]  ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}}"></button>
                         <td><input type="hidden" class="sheet-textbox" value="Knowledge" disabled="true" name="attr_Knowledge"
                             />&nbsp;&nbsp;&nbsp;Knowledge</td>
                         <td><input type="number" class="sheet-numberbox" name="attr_Knowledge_rating" value="0" /></td>
@@ -500,7 +500,7 @@
                     </tr>
                     <!-- Languages -->
                     <tr>
-                        <td><button type='roll' class="sheet-skillbutton" value="/e rolls @{Languages} [[(@{Languages_rating}) + @{Languages_attribute_select} + ?{Modifiers|0} + 1d10]]"></button></td>
+                         <td><button type='roll' class="sheet-skillbutton" value="&{template:default} {{name=@{character_name} rolls @{Languages} }} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10 + @{Languages_rating}+ @{Languages_attribute_select}+ ?{Modifiers|0}]] ]]  ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}}"></button>
                         <td><input type="hidden" class="sheet-textbox" value="Languages" disabled="true" name="attr_Languages"
                             />&nbsp;&nbsp;&nbsp;Languages</td>
                         <td><input type="number" class="sheet-numberbox" name="attr_Languages_rating" value="0" /></td>
@@ -512,7 +512,7 @@
                     </tr>
                     <!-- Mr Fix It -->
                     <tr>
-                        <td><button type='roll' class="sheet-skillbutton" value="/e rolls @{Mr_Fix_It} [[(@{Mr_Fix_It_rating}) + @{Mr_Fix_It_attribute_select} + ?{Modifiers|0} + 1d10]]"></button></td>
+                         <td><button type='roll' class="sheet-skillbutton" value="&{template:default} {{name=@{character_name} rolls @{Mr_Fix_It} }} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10 + @{Mr_Fix_It_rating}+ @{Languages_attribute_select}+ ?{Modifiers|0}]] ]]  ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}}"></button>
                         <td><input type="hidden" class="sheet-textbox" value="Mr Fix It" disabled="true" name="attr_Mr_Fix_It"
                             />&nbsp;&nbsp;&nbsp;Mr Fix It</td>
                         <td><input type="number" class="sheet-numberbox" name="attr_Mr_Fix_It_rating" value="0" /></td>
@@ -527,7 +527,7 @@
                     </tr>
                     <!-- Notice -->
                     <tr>
-                        <td><button type='roll' class="sheet-skillbutton" value="/e rolls @{Notice} [[(@{Notice_rating}) + @{Notice_attribute_select} + ?{Modifiers|0} + 1d10]]"></button></td>
+                       <td><button type='roll' class="sheet-skillbutton" value="&{template:default} {{name=@{character_name} rolls @{Notice} }} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10 + @{Notice_rating}+ @{Notice_attribute_select}+ ?{Modifiers|0}]] ]]  ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}}"></button>
                         <td><input type="Hidden" class="sheet-textbox" value="Notice" disabled="true" name="attr_Notice"
                             />&nbsp;&nbsp;&nbsp;Notice</td>
                         <td><input type="number" class="sheet-numberbox" name="attr_Notice_rating" value="0" /></td>
@@ -542,7 +542,7 @@
                     </tr>
                     <!-- Occultism -->
                     <tr>
-                        <td><button type='roll' class="sheet-skillbutton" value="/e rolls @{Occultism} [[(@{Occultism_rating}) + @{Occultism_attribute_select} + ?{Modifiers|0} + 1d10]]"></button></td>
+  			<td><button type='roll' class="sheet-skillbutton" value="&{template:default} {{name=@{character_name} rolls @{Occultism} }} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10 + @{Occultism_rating}+ @{Occultism_attribute_select}+ ?{Modifiers|0}]] ]]  ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}}"></button>
                         <td><input type="hidden" class="sheet-textbox" value="Occultism" disabled="true" name="attr_Occultism"
                             />&nbsp;&nbsp;&nbsp;Occultism</td>
                         <td><input type="number" class="sheet-numberbox" name="attr_Occultism_rating" value="0" /></td>
@@ -557,7 +557,7 @@
                     </tr>
                     <!-- Science -->
                     <tr>
-                        <td><button type='roll' class="sheet-skillbutton" value="/e rolls @{Science} [[(@{Science_rating}) + @{Science_attribute_select} + ?{Modifiers|0} + 1d10]]"></button></td>
+                       <td><button type='roll' class="sheet-skillbutton" value="&{template:default} {{name=@{character_name} rolls @{Science} }} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10 + @{Science_rating}+ @{Science_attribute_select}+ ?{Modifiers|0}]] ]]  ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}}"></button>
                         <td><input type="hidden" class="sheet-textbox" value="Science" disabled="true" name="attr_Science"
                             />&nbsp;&nbsp;&nbsp;Science</td>
                         <td><input type="number" class="sheet-numberbox" name="attr_Science_rating" value="0" /></td>
@@ -571,7 +571,7 @@
                     </tr>
                     <!-- Sports -->
                     <tr>
-                        <td><button type='roll' class="sheet-skillbutton" value="/e rolls @{Sports} [[(@{Sports_rating}) + @{Sports_attribute_select} + ?{Modifiers|0} + 1d10]]"></button></td>
+                      <td><button type='roll' class="sheet-skillbutton" value="&{template:default} {{name=@{character_name} rolls @{Sports} }} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10 + @{Sports_rating}+ @{Sports_attribute_select}+ ?{Modifiers|0}]] ]]  ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}}"></button>
                         <td><input type="hidden" class="sheet-textbox" value="Sports" disabled="true" name="attr_Sports"
                             />&nbsp;&nbsp;&nbsp;Sports</td>
                         <td><input type="number" class="sheet-numberbox" name="attr_Sports_rating" value="0" /></td>
@@ -586,7 +586,7 @@
                     </tr>
                     <!-- Wildcard1 -->
                     <tr>
-                        <td><button type='roll' class="sheet-skillbutton" value="/e rolls @{Wildcard1} [[(@{Wildcard1_rating}) + @{Wildcard1_attribute_select} + ?{Modifiers|0} + 1d10]]"></button></td>
+ 			<td><button type='roll' class="sheet-skillbutton" value="&{template:default} {{name=@{character_name}  rolls @{Wildcard1} }} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10 + @{Wildcard1_rating}+ @{Wildcard1_attribute_select}+ ?{Modifiers|0}]] ]]  ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}}"></button>
                         <td><input type="text" class="sheet-textbox" value="Wildcard" name="attr_Wildcard1" /></td>
                         <td><input type="number" class="sheet-numberbox" name="attr_Wildcard1_rating" value="0" /></td>
                         <td><select class="sheet-skill_select" name="attr_Wildcard1_attribute_select" />
@@ -600,7 +600,7 @@
                     </tr>
                     <!-- Wildcard3 -->
                     <tr>
-                        <td><button type='roll' class="sheet-skillbutton" value="/e rolls @{Wildcard3} [[(@{Wildcard3_rating}) + @{Wildcard3_attribute_select} + ?{Modifiers|0} + 1d10]]"></button></td>
+		<td><button type='roll' class="sheet-skillbutton" value="&{template:default} {{name=@{character_name}  rolls @{Wildcard3} }} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10 + @{Wildcard3_rating}+ @{Wildcard3_attribute_select}+ ?{Modifiers|0}]] ]]  ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}}"></button>
                         <td><input type="text" class="sheet-textbox" value="Wildcard" name="attr_Wildcard3" /></td>
                         <td><input type="number" class="sheet-numberbox" name="attr_Wildcard3_rating" value="0" /></td>
                         <td><select class="sheet-skill_select" name="attr_Wildcard3_attribute_select" />
@@ -1084,13 +1084,13 @@
             <!-- Knock-Out / Head Butt -->
             <tr>
                 <!-- Knockout -->
-                <th><button type='roll' class="sheet-skillbutton" value="&{template:default} {{name=@{character_name} tries to @{Knockout_name-1} }} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10+ @{Knockout_attack_rating-1}?{Modifiers|0}]] ]]  +@{Knockout_damage_base}]] {{Roll=$[[0]]}} {{Levels=$[[1]]}} {{Damage=$[[3]]}}"></button>
+                <th><button type='roll' class="sheet-skillbutton" value="&{template:default} {{name=@{character_name} tries to @{Knockout_name-1} }} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10+ @{Knockout_attack_rating-1}+?{Modifiers|0}]]/2 ]]  +@{Knockout_damage_base}]] {{Roll=$[[0]]}} {{Levels=$[[1]]}} {{Damage=$[[3]]}}"></button>
                 <td><input type="hidden" class="sheet-textbox" style="width:200px" value="Knockout" disabled="true" name="attr_Knockout_name-1"
                     />&nbsp;&nbsp;&nbsp;Knockout</td>
                 <!-- Max Parry is the max of Getting Medieval or Kung Fu. So the following agrees with pg 132 -->
                 <th><input type="number" class="sheet-numberbox" name="attr_Knockout_attack_rating-1" value="@{base-Dexterity} + @{mod-Dexterity} + @{Kung_Fu_rating}-2"
                         disabled="true" /></th>
-                <th class="sheet-lb"><input type="number" name="attr_Knockout_damage_base" value="2*([[@{base-Strength} + @{mod-Strength}]])"
+                <th class="sheet-lb"><input type="number" name="attr_Knockout_damage_base" value="([[@{base-Strength} + @{mod-Strength}]])"
                         disabled="true" /></th>
                     /></th>
                 <th class="sheet-lb"></th>