diff --git a/Unisystem-Buffy or Angel/Buffy_or_Angel.html b/Unisystem-Buffy or Angel/Buffy_or_Angel.html
index 2703fd8486..12b7f455eb 100644
--- a/Unisystem-Buffy or Angel/Buffy_or_Angel.html	
+++ b/Unisystem-Buffy or Angel/Buffy_or_Angel.html	
@@ -3,7 +3,6 @@
 <!-- Buffy/Angel RPG, made from All Flesh Must Be Eaten -->
 <!-- Version 1.03 -->
 
-
 <div class="sheet-all">
 
     <input type="radio" name="attr_tab" class="sheet-tab sheet-tab1" value="1" title="Character" checked="checked" /><span></span>
@@ -16,17 +15,20 @@
 <br>
     <div class="sheet-tab-content sheet-tab1">
         <div class="sheet-center">
-<br>
-            <input type="text" class="sheet-bigname" name="attr_character_name" placeholder="Character Name" /><br> Character
-            Type:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-            <input type="text" class="sheet-mediumname" name="attr_character_type" /><br> Character Archetype:&nbsp;<input
-                type="text" class="sheet-mediumname" name="attr_character_archetype" />
+<br><input type="text" class="sheet-bigname" name="attr_character_name" placeholder="Character Name" />
+<br>Character Type: &nbsp;<input type="text" class="sheet-textbox" style="width:300px " name="attr_character_type" />&nbsp;Personality:&nbsp;<input type="text" class="sheet-textbox" style="width:300px " name="attr_character_personality" />
+<br>Romantic Interest:<input type="text" class="sheet-textbox" style="width:100px " name="attr_character_romantic" />
+Sex:<input type="text" class="sheet-textbox" style="width:50px " name="attr_character_sex" />Height:<input type="text" class="sheet-textbox" style="width:50px " name="attr_character_height" />Weight:<input type="text" class="sheet-textbox" style="width:50px " name="attr_character_weight" />Age:<input type="text" class="sheet-textbox" style="width:50px " name="attr_character_age" />Eyes:<input type="text" class="sheet-textbox" style="width:100px " name="attr_character_eyes" /> Hair:<input type="text" class="sheet-textbox" style="width:100px " name="attr_character_hair" />
+<br>Short Goals:&nbsp;<input type="text" class="sheet-textbox" style="width:300px " name="attr_character_sgoal" />&nbsp;Long Goals:&nbsp;&nbsp;&nbsp;<input type="text" class="sheet-textbox" style="width:300px " name="attr_character_goal" />
+<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Strenght:&nbsp;<input type="text" class="sheet-textbox" style="width:300px " name="attr_character_strgd" />&nbsp;Weaknesses:&nbsp;<input type="text" class="sheet-textbox" style="width:300px " name="attr_character_weak" />
+
+
         </div>
         <br>
         <table class="sheet-center sheet-black">
             <tr>
                 <td colspan="6">
-                    <h3> Character points</h3>
+                    <h3> Experience points</h3>
                 </td>
             </tr>
             <tr>
@@ -104,7 +106,7 @@
                     <tr>
                         <td></td>
                         <td>
-                            <h3>Life max</h3>
+                            <h3>Life Points</h3>
                         </td>
                         <td><input type="number" class="sheet-trait" name="attr_trait_base-Life_Points" value="0" /></td>
                     </tr>
@@ -114,7 +116,7 @@
                                            <tr>
                     <td></td>
                     <td>
-                        <h3>Life Points</h3>
+                        <h3>Wounds</h3>
                     </td>
                     <td><input type="number" class="sheet-trait" name="attr_trait_wounds_Points" value="0" /></td>
                 </tr>
@@ -134,9 +136,9 @@
                     <tr>
                         <td></td>
                         <td>
-                            <h3>Speed</h3>
+                            <h3>Actions</h3>
                         </td>
-                        <td><input type="number" class="sheet-trait" name="attr_trait_base-Speed" value="0" /></td>
+                        <td><input type="number" class="sheet-trait" name="attr_trait_base-Actions" value="0" /></td>
                     </tr>
                     <tr>
                         <td><br></td>
@@ -152,6 +154,7 @@
                 </table>
             </div>
         </div>
+
         <br>
         <!-- Qualities -->
         <div class='sheet-2colrow'>
@@ -340,8 +343,10 @@
                     <tr>
                         <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="hidden" class="sheet-textbox" value="Acrobatics" title="Character" disabled="true" name="attr_Acrobatics"
+                            />&nbsp;&nbsp;&nbsp;Acrobatics </td>
+
+
                         <td><input type="number" class="sheet-numberbox" name="attr_Acrobatics_rating" value="0" /></td>
                         <td><select class="sheet-skill_select" name="attr_Acrobatics_attribute_select">
                                 <option value="@{base-Strength} + @{mod-Strength}">Str</option>
@@ -647,7 +652,9 @@
                 <div class='sheet-col'>
                     <table>
                         <tr>
-                            <td><button type='roll' class="sheet-skillbutton" value="/e rolls @{WildcardRepeating2} [[(@{WildcardRepeating2_rating}) + @{WildcardRepeating2_attribute_select} + ?{Modifiers|0}+ 1d10]]"></button></td>
+ 
+
+<td><button type='roll' class="sheet-skillbutton" value="/e rolls @{WildcardRepeating2} [[(@{WildcardRepeating2_rating}) + @{WildcardRepeating2_attribute_select} + ?{Modifiers|0}+ 1d10]]"></button></td>
                             <td><input type="text" class="sheet-textbox" value="Wildcard" name="attr_WildcardRepeating2"
                                 /></td>
                             <td><input type="number" class="sheet-numberbox" name="attr_WildcardRepeating2_rating" value="0"
@@ -718,70 +725,71 @@
                         <td></td>
                     </tr>
                     <tr>
-                        <td><button type='roll' class="sheet-skillbutton" value="/e rolls @{Power-1} [[(@{base-Willpower} + @{mod-Willpower}) + @{Occultism_rating} + @{Sorcery_min_xy}+ ?{Modifiers|0} + 1d10]] (Compare Success Levels of Roll to Power Level of Spell)"></button></td>
+
+  <th><button type='roll' class="sheet-skillbutton" value="&{template:default} {{name=@{character_name} casts @{Power-1}}} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10+ @{base-Willpower} + @{mod-Willpower}+@{Occultism_rating}+ @{Sorcery_min_xy}+ ?{Modifiers|0}]] ]]  ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}} "></button></td>
                         <td><input type="text" class="sheet-textbox" name="attr_Power-1" /></td>
                         <td><input type="number" class="sheet-numberbox" name="attr_Power_level-1" /></td>
                         <td style="text-align:center;"><input type="checkbox" class="sheet-melee_toggle" name="attr_Power_quick_cast-1"
                                 value="1" /></td>
                     </tr>
                     <tr>
-                        <td><button type='roll' class="sheet-skillbutton" value="/e rolls @{Power-2} [[(@{base-Willpower} + @{mod-Willpower}) + @{Occultism_rating} + @{Sorcery_min_xy}+ ?{Modifiers|0} + 1d10]] (Compare Success Levels of Roll to Power Level of Spell)"></button></td>
-                        <td><input type="text" class="sheet-textbox" name="attr_Power-2" /></td>
+  <th><button type='roll' class="sheet-skillbutton" value="&{template:default} {{name=@{character_name} casts @{Power-2}}} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10+ @{base-Willpower} + @{mod-Willpower}+@{Occultism_rating}+ @{Sorcery_min_xy}+ ?{Modifiers|0}]] ]]  ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}} "></button></td>
+			<td><input type="text" class="sheet-textbox" name="attr_Power-2" /></td>
                         <td><input type="number" class="sheet-numberbox" name="attr_Power_level-2" /></td>
                         <td style="text-align:center;"><input type="checkbox" class="sheet-melee_toggle" name="attr_Power_quick_cast-2"
                                 value="1" /></td>
                     </tr>
                     <tr>
-                        <td><button type='roll' class="sheet-skillbutton" value="/e rolls @{Power-3} [[(@{base-Willpower} + @{mod-Willpower}) + @{Occultism_rating} + @{Sorcery_min_xy} + ?{Modifiers|0}+ 1d10]] (Compare Success Levels of Roll to Power Level of Spell)"></button></td>
+  <th><button type='roll' class="sheet-skillbutton" value="&{template:default} {{name=@{character_name} casts @{Power-3}}} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10+ @{base-Willpower} + @{mod-Willpower}+@{Occultism_rating}+ @{Sorcery_min_xy}+ ?{Modifiers|0}]] ]]  ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}} "></button></td>
                         <td><input type="text" class="sheet-textbox" name="attr_Power-3" /></td>
                         <td><input type="number" class="sheet-numberbox" name="attr_Power_level-3" /></td>
                         <td style="text-align:center;"><input type="checkbox" class="sheet-melee_toggle" name="attr_Power_quick_cast-3"
                                 value="1" /></td>
                     </tr>
                     <tr>
-                        <td><button type='roll' class="sheet-skillbutton" value="/e rolls @{Power-4} [[(@{base-Willpower} + @{mod-Willpower}) + @{Occultism_rating} + @{Sorcery_min_xy}+ ?{Modifiers|0} + 1d10]] (Compare Success Levels of Roll to Power Level of Spell)"></button></td>
+  <th><button type='roll' class="sheet-skillbutton" value="&{template:default} {{name=@{character_name} casts @{Power-4}}} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10+ @{base-Willpower} + @{mod-Willpower}+@{Occultism_rating}+ @{Sorcery_min_xy}+ ?{Modifiers|0}]] ]]  ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}} "></button></td>
                         <td><input type="text" class="sheet-textbox" name="attr_Power-4" /></td>
                         <td><input type="number" class="sheet-numberbox" name="attr_Power_level-4" /></td>
                         <td style="text-align:center;"><input type="checkbox" class="sheet-melee_toggle" name="attr_Power_quick_cast-4"
                                 value="1" /></td>
                     </tr>
                     <tr>
-                        <td><button type='roll' class="sheet-skillbutton" value="/e rolls @{Power-5} [[(@{base-Willpower} + @{mod-Willpower}) + @{Occultism_rating} + @{Sorcery_min_xy} +  ?{Modifiers|0} + 1d10]] (Compare Success Levels of Roll to Power Level of Spell)"></button></td>
+  <th><button type='roll' class="sheet-skillbutton" value="&{template:default} {{name=@{character_name} casts @{Power-5}}} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10+ @{base-Willpower} + @{mod-Willpower}+@{Occultism_rating}+ @{Sorcery_min_xy}+ ?{Modifiers|0}]] ]]  ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}} "></button></td>
                         <td><input type="text" class="sheet-textbox" name="attr_Power-5" /></td>
                         <td><input type="number" class="sheet-numberbox" name="attr_Power_level-5" /></td>
                         <td style="text-align:center;"><input type="checkbox" class="sheet-melee_toggle" name="attr_Power_quick_cast-5"
                                 value="1" /></td>
                     </tr>
                     <tr>
-                        <td><button type='roll' class="sheet-skillbutton" value="/e rolls @{Power-6} [[(@{base-Willpower} + @{mod-Willpower}) + @{Occultism_rating} + @{Sorcery_min_xy} + ?{Modifiers|0}+  1d10]] (Compare Success Levels of Roll to Power Level of Spell)"></button></td>
+  <th><button type='roll' class="sheet-skillbutton" value="&{template:default} {{name=@{character_name} casts @{Power-6}}} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10+ @{base-Willpower} + @{mod-Willpower}+@{Occultism_rating}+ @{Sorcery_min_xy}+ ?{Modifiers|0}]] ]]  ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}} "></button></td>
                         <td><input type="text" class="sheet-textbox" name="attr_Power-6" /></td>
                         <td><input type="number" class="sheet-numberbox" name="attr_Power_level-6" /></td>
                         <td style="text-align:center;"><input type="checkbox" class="sheet-melee_toggle" name="attr_Power_quick_cast-6"
                                 value="1" /></td>
                     </tr>
                     <tr>
-                        <td><button type='roll' class="sheet-skillbutton" value="/e rolls @{Power-7} [[(@{base-Willpower} + @{mod-Willpower}) + @{Occultism_rating} + @{Sorcery_min_xy} + ?{Modifiers|0} + 1d10]] (Compare Success Levels of Roll to Power Level of Spell)"></button></td>
+  <th><button type='roll' class="sheet-skillbutton" value="&{template:default} {{name=@{character_name} casts @{Power-7}}} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10+ @{base-Willpower} + @{mod-Willpower}+@{Occultism_rating}+ @{Sorcery_min_xy}+ ?{Modifiers|0}]] ]]  ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}} "></button></td>
                         <td><input type="text" class="sheet-textbox" name="attr_Power-7" /></td>
                         <td><input type="number" class="sheet-numberbox" name="attr_Power_level-7" /></td>
                         <td style="text-align:center;"><input type="checkbox" class="sheet-melee_toggle" name="attr_Power_quick_cast-7"
                                 value="1" /></td>
                     </tr>
                     <tr>
-                        <td><button type='roll' class="sheet-skillbutton" value="/e rolls @{Power-8} [[(@{base-Willpower} + @{mod-Willpower}) + @{Occultism_rating} + @{Sorcery_min_xy} + ?{Modifiers|0} + 1d10]] (Compare Success Levels of Roll to Power Level of Spell)"></button></td>
+  <th><button type='roll' class="sheet-skillbutton" value="&{template:default} {{name=@{character_name} casts @{Power-8}}} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10+ @{base-Willpower} + @{mod-Willpower}+@{Occultism_rating}+ @{Sorcery_min_xy}+ ?{Modifiers|0}]] ]]  ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}} "></button></td>
                         <td><input type="text" class="sheet-textbox" name="attr_Power-8" /></td>
                         <td><input type="number" class="sheet-numberbox" name="attr_Power_level-8" /></td>
                         <td style="text-align:center;"><input type="checkbox" class="sheet-melee_toggle" name="attr_Power_quick_cast-8"
                                 value="1" /></td>
                     </tr>
                     <tr>
-                        <td><button type='roll' class="sheet-skillbutton" value="/e rolls @{Power-9} [[(@{base-Willpower} + @{mod-Willpower}) + @{Occultism_rating} + @{Sorcery_min_xy}+ ?{Modifiers|0} + 1d10]] (Compare Success Levels of Roll to Power Level of Spell)"></button></td>
+  <th><button type='roll' class="sheet-skillbutton" value="&{template:default} {{name=@{character_name} casts @{Power-9}}} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10+ @{base-Willpower} + @{mod-Willpower}+@{Occultism_rating}+ @{Sorcery_min_xy}+ ?{Modifiers|0}]] ]]  ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}} "></button></td>
                         <td><input type="text" class="sheet-textbox" name="attr_Power-9" /></td>
                         <td><input type="number" class="sheet-numberbox" name="attr_Power_level-9" /></td>
                         <td style="text-align:center;"><input type="checkbox" class="sheet-melee_toggle" name="attr_Power_quick_cast-9"
                                 value="1" /></td>
                     </tr>
                     <tr>
-                        <td><button type='roll' class="sheet-skillbutton" value="/e rolls @{Power-10} [[(@{base-Willpower} + @{mod-Willpower}) + @{Occultism_rating} + @{Sorcery_min_xy}+ ?{Modifiers|0} + 1d10]] (Compare Success Levels of Roll to Power Level of Spell)"></button></td>
+  <th><button type='roll' class="sheet-skillbutton" value="&{template:default} {{name=@{character_name} casts @{Power-10}}} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10+ @{base-Willpower} + @{mod-Willpower}+@{Occultism_rating}+ @{Sorcery_min_xy}+ ?{Modifiers|0}]] ]]  ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}} "></button></td>
                         <td><input type="text" class="sheet-textbox" name="attr_Power-10" /></td>
                         <td><input type="number" class="sheet-numberbox" name="attr_Power_level-10" /></td>
                         <td style="text-align:center;"><input type="checkbox" class="sheet-melee_toggle" name="attr_Power_quick_cast-10"
@@ -808,7 +816,7 @@
                         <td></td>
                     </tr>
                     <tr>
-                        <td><button type='roll' class="sheet-skillbutton" value="/e rolls @{Power-11} [[(@{base-Willpower} + @{mod-Willpower}) + @{Occultism_rating} + @{Sorcery_min_xy}+ ?{Modifiers|0} + 1d10]] (Compare Success Levels of Roll to Power Level of Spell)"></button></td>
+  <th><button type='roll' class="sheet-skillbutton" value="&{template:default} {{name=@{character_name} casts @{Power-11}}} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10+ @{base-Willpower} + @{mod-Willpower}+@{Occultism_rating}+ @{Sorcery_min_xy}+ ?{Modifiers|0}]] ]]  ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}} "></button></td>
                         <td><input type="text" class="sheet-textbox" name="attr_Power-11" /></td>
                         <td><input type="number" class="sheet-numberbox" name="attr_Power_level-11" /></td>
                         <td style="text-align:center;"><input type="checkbox" class="sheet-melee_toggle" name="attr_Power_quick_cast-11"
@@ -816,63 +824,63 @@
 
                     </tr>
                     <tr>
-                        <td><button type='roll' class="sheet-skillbutton" value="/e rolls @{Power-12} [[(@{base-Willpower} + @{mod-Willpower}) + @{Occultism_rating} + @{Sorcery_min_xy}+ ?{Modifiers|0} + 1d10]] (Compare Success Levels of Roll to Power Level of Spell)"></button></td>
+  <th><button type='roll' class="sheet-skillbutton" value="&{template:default} {{name=@{character_name} casts @{Power-12}}} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10+ @{base-Willpower} + @{mod-Willpower}+@{Occultism_rating}+ @{Sorcery_min_xy}+ ?{Modifiers|0}]] ]]  ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}} "></button></td>
                         <td><input type="text" class="sheet-textbox" name="attr_Power-12" /></td>
                         <td><input type="number" class="sheet-numberbox" name="attr_Power_level-12" /></td>
                         <td style="text-align:center;"><input type="checkbox" class="sheet-melee_toggle" name="attr_Power_quick_cast-12"
                                 value="1" /></td>
                     </tr>
                     <tr>
-                        <td><button type='roll' class="sheet-skillbutton" value="/e rolls @{Power-13} [[(@{base-Willpower} + @{mod-Willpower}) + @{Occultism_rating} + @{Sorcery_min_xy}+ ?{Modifiers|0} + 1d10]] (Compare Success Levels of Roll to Power Level of Spell)"></button></td>
+  <th><button type='roll' class="sheet-skillbutton" value="&{template:default} {{name=@{character_name} casts @{Power-13}}} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10+ @{base-Willpower} + @{mod-Willpower}+@{Occultism_rating}+ @{Sorcery_min_xy}+ ?{Modifiers|0}]] ]]  ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}} "></button></td>
                         <td><input type="text" class="sheet-textbox" name="attr_Power-13" /></td>
                         <td><input type="number" class="sheet-numberbox" name="attr_Power_level-13" /></td>
                         <td style="text-align:center;"><input type="checkbox" class="sheet-melee_toggle" name="attr_Power_quick_cast-13"
                                 value="1" /></td>
                     </tr>
                     <tr>
-                        <td><button type='roll' class="sheet-skillbutton" value="/e rolls @{Power-14} [[(@{base-Willpower} + @{mod-Willpower}) + @{Occultism_rating} + @{Sorcery_min_xy}+ ?{Modifiers|0} + 1d10]] (Compare Success Levels of Roll to Power Level of Spell)"></button></td>
+  <th><button type='roll' class="sheet-skillbutton" value="&{template:default} {{name=@{character_name} casts @{Power-14}}} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10+ @{base-Willpower} + @{mod-Willpower}+@{Occultism_rating}+ @{Sorcery_min_xy}+ ?{Modifiers|0}]] ]]  ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}} "></button></td>
                         <td><input type="text" class="sheet-textbox" name="attr_Power-14" /></td>
                         <td><input type="number" class="sheet-numberbox" name="attr_Power_level-14" /></td>
                         <td style="text-align:center;"><input type="checkbox" class="sheet-melee_toggle" name="attr_Power_quick_cast-14"
                                 value="1" /></td>
                     </tr>
                     <tr>
-                        <td><button type='roll' class="sheet-skillbutton" value="/e rolls @{Power-15} [[(@{base-Willpower} + @{mod-Willpower}) + @{Occultism_rating} + @{Sorcery_min_xy}+ ?{Modifiers|0} + 1d10]] (Compare Success Levels of Roll to Power Level of Spell)"></button></td>
+  <th><button type='roll' class="sheet-skillbutton" value="&{template:default} {{name=@{character_name} casts @{Power-15}}} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10+ @{base-Willpower} + @{mod-Willpower}+@{Occultism_rating}+ @{Sorcery_min_xy}+ ?{Modifiers|0}]] ]]  ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}} "></button></td>
                         <td><input type="text" class="sheet-textbox" name="attr_Power-15" /></td>
                         <td><input type="number" class="sheet-numberbox" name="attr_Power_level-15" /></td>
                         <td style="text-align:center;"><input type="checkbox" class="sheet-melee_toggle" name="attr_Power_quick_cast-15"
                                 value="1" /></td>
                     </tr>
                     <tr>
-                        <td><button type='roll' class="sheet-skillbutton" value="/e rolls @{Power-16} [[(@{base-Willpower} + @{mod-Willpower}) + @{Occultism_rating} + @{Sorcery_min_xy}+ ?{Modifiers|0} + 1d10]] (Compare Success Levels of Roll to Power Level of Spell)"></button></td>
+  <th><button type='roll' class="sheet-skillbutton" value="&{template:default} {{name=@{character_name} casts @{Power-16}}} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10+ @{base-Willpower} + @{mod-Willpower}+@{Occultism_rating}+ @{Sorcery_min_xy}+ ?{Modifiers|0}]] ]]  ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}} "></button></td>
                         <td><input type="text" class="sheet-textbox" name="attr_Power-16" /></td>
                         <td><input type="number" class="sheet-numberbox" name="attr_Power_level-16" /></td>
                         <td style="text-align:center;"><input type="checkbox" class="sheet-melee_toggle" name="attr_Power_quick_cast-16"
                                 value="1" /></td>
                     </tr>
                     <tr>
-                        <td><button type='roll' class="sheet-skillbutton" value="/e rolls @{Power-17} [[(@{base-Willpower} + @{mod-Willpower}) + @{Occultism_rating} + @{Sorcery_min_xy}+ ?{Modifiers|0} + 1d10]] (Compare Success Levels of Roll to Power Level of Spell)"></button></td>
+  <th><button type='roll' class="sheet-skillbutton" value="&{template:default} {{name=@{character_name} casts @{Power-17}}} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10+ @{base-Willpower} + @{mod-Willpower}+@{Occultism_rating}+ @{Sorcery_min_xy}+ ?{Modifiers|0}]] ]]  ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}} "></button></td>
                         <td><input type="text" class="sheet-textbox" name="attr_Power-17" /></td>
                         <td><input type="number" class="sheet-numberbox" name="attr_Power_level-17" /></td>
                         <td style="text-align:center;"><input type="checkbox" class="sheet-melee_toggle" name="attr_Power_quick_cast-17"
                                 value="1" /></td>
                     </tr>
                     <tr>
-                        <td><button type='roll' class="sheet-skillbutton" value="/e rolls @{Power-18} [[(@{base-Willpower} + @{mod-Willpower}) + @{Occultism_rating} + @{Sorcery_min_xy}+ ?{Modifiers|0} + 1d10]] (Compare Success Levels of Roll to Power Level of Spell)"></button></td>
+  <th><button type='roll' class="sheet-skillbutton" value="&{template:default} {{name=@{character_name} casts @{Power-18}}} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10+ @{base-Willpower} + @{mod-Willpower}+@{Occultism_rating}+ @{Sorcery_min_xy}+ ?{Modifiers|0}]] ]]  ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}} "></button></td>
                         <td><input type="text" class="sheet-textbox" name="attr_Power-18" /></td>
                         <td><input type="number" class="sheet-numberbox" name="attr_Power_level-18" /></td>
                         <td style="text-align:center;"><input type="checkbox" class="sheet-melee_toggle" name="attr_Power_quick_cast-18"
                                 value="1" /></td>
                     </tr>
                     <tr>
-                        <td><button type='roll' class="sheet-skillbutton" value="/e rolls @{Power-19} [[(@{base-Willpower} + @{mod-Willpower}) + @{Occultism_rating} + @{Sorcery_min_xy}+ ?{Modifiers|0} + 1d10]] (Compare Success Levels of Roll to Power Level of Spell)"></button></td>
+  <th><button type='roll' class="sheet-skillbutton" value="&{template:default} {{name=@{character_name} casts @{Power-19}}} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10+ @{base-Willpower} + @{mod-Willpower}+@{Occultism_rating}+ @{Sorcery_min_xy}+ ?{Modifiers|0}]] ]]  ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}} "></button></td>
                         <td><input type="text" class="sheet-textbox" name="attr_Power-19" /></td>
                         <td><input type="number" class="sheet-numberbox" name="attr_Power_level-19" /></td>
                         <td style="text-align:center;"><input type="checkbox" class="sheet-melee_toggle" name="attr_Power_quick_cast-19"
                                 value="1" /></td>
                     </tr>
                     <tr>
-                        <td><button type='roll' class="sheet-skillbutton" value="/e rolls @{Power-20} [[(@{base-Willpower} + @{mod-Willpower}) + @{Occultism_rating} + @{Sorcery_min_xy}+ ?{Modifiers|0} + 1d10]] (Compare Success Levels of Roll to Power Level of Spell)"></button></td>
+  <th><button type='roll' class="sheet-skillbutton" value="&{template:default} {{name=@{character_name} casts @{Power-20}}} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10+ @{base-Willpower} + @{mod-Willpower}+@{Occultism_rating}+ @{Sorcery_min_xy}+ ?{Modifiers|0}]] ]]  ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}} "></button></td>
                         <td><input type="text" class="sheet-textbox" name="attr_Power-20" /></td>
                         <td><input type="number" class="sheet-numberbox" name="attr_Power_level-20" /></td>
                         <td style="text-align:center;"><input type="checkbox" class="sheet-melee_toggle" name="attr_Power_quick_cast-20"
@@ -888,7 +896,9 @@
                 <div class='sheet-col'>
                     <table>
                         <tr>
-                            <td><button type='roll' class="sheet-skillbutton" value="/e rolls @{PowerRepeat-1} [[(@{base-Willpower} + @{mod-Willpower}) + @{Occultism_rating} + @{Sorcery_min_xy}+ ?{Modifiers|0} + 1d10]] (Compare Success Levels of Roll to Power Level of Spell)"></button></td>
+
+
+  <th><button type='roll' class="sheet-skillbutton" value="&{template:default} {{name=@{character_name} casts @{PowerRepeat-1}}} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10+ @{base-Willpower} + @{mod-Willpower}+@{Occultism_rating}+ @{Sorcery_min_xy}+ ?{Modifiers|0}]] ]]  ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}} "></button></td>
                             <td><input type="text" class="sheet-textbox" name="attr_PowerRepeat-1" /></td>
                             <td><input type="number" class="sheet-numberbox" name="attr_PowerRepeat_level-1" value="0" /></td>
                             <td style="padding-left:13px"><input type="checkbox" class="sheet-melee_toggle" name="attr_PowerRepeat_quick_cast-1"
@@ -900,7 +910,7 @@
                 <div class='sheet-col'>
                     <table>
                         <tr>
-                            <td><button type='roll' class="sheet-skillbutton" value="/e rolls @{PowerRepeat-11} [[(@{base-Willpower} + @{mod-Willpower}) + @{Occultism_rating} + @{Sorcery_min_xy}+ ?{Modifiers|0} + 1d10]] (Compare Success Levels of Roll to Power Level of Spell)"></button></td>
+  <th><button type='roll' class="sheet-skillbutton" value="&{template:default} {{name=@{character_name} casts @{PowerRepeat-11}}} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10+ @{base-Willpower} + @{mod-Willpower}+@{Occultism_rating}+ @{Sorcery_min_xy}+ ?{Modifiers|0}]] ]]  ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}} "></button></td>
                             <td><input type="text" class="sheet-textbox" name="attr_PowerRepeat-11" /></td>
                             <td><input type="number" class="sheet-numberbox" name="attr_PowerRepeat_level-11" value="0" /></td>
                             <td style="padding-left:13px"><input type="checkbox" class="sheet-melee_toggle" style="padding-left:13px"
@@ -1146,25 +1156,7 @@
  <!-- Aim / Knockout -->
             </tr>
 
-<tr>
 
-
-            <!-- Combat Maneuver1 / Combat Maneuver2 -->
-            <tr>
-                <!-- Combat Maneuver1 -->
-                <th><button type='roll' class="sheet-skillbutton" value="&{template:default} {{name=@{character_name} attacks with @{Combat_Maneuver1_name-1} }} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10+@{Combat_Maneuver1_attack_rating-1}+?{Modifiers|0}]] ]]+ @{Combat_Maneuver1_damage_base} ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}} {{Damage=$[[2]]}}"></button>
-                <td><input type="text" class="sheet-textbox" style="width:200px" name="attr_Combat_Maneuver1_name-1" /></td>
-                <th><input type="number" class="sheet-numberbox" name="attr_Combat_Maneuver1_attack_rating-1" /></th>
-                <th class="sheet-lb"><input type="number" class="sheet-textbox" style="width:70px" name="attr_Combat_Maneuver1_damage_base"
-                    /></th>
-                <th class="sheet-lb"></th>
-                <!-- Combat Maneuver2 -->
-                <th class="sheet-lb"><button type='roll' class="sheet-skillbutton" value="&{template:default} {{name=@{character_name} attacks with @{Combat_Maneuver2_name-1} }} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10+@{Combat_Maneuver2_attack_rating-1}+?{Modifiers|0}]] ]]+ @{Combat_Maneuver2_damage_base} ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}} {{Damage=$[[2]]}}"></button>
-                <td><input type="text" class="sheet-textbox" style="width:200px" name="attr_Combat_Maneuver2_name-1" /></td>
-                <th><input type="number" class="sheet-numberbox" name="attr_Combat_Maneuver2_attack_rating-1" /></th>
-                <th class="sheet-lb"><input type="number" class="sheet-textbox" style="width:70px" name="attr_Combat_Maneuver2_damage_base"
-                    /></th>
-            </tr>
         </table>
         <br>
         <!-- Melee Weapons -->
@@ -1176,7 +1168,7 @@
                     <h5>Weapon</h5>
                 </td>
                 <th>Maneuver<br>Rating</th>
-                <th class="sheet-lb" title="Base Damage should already include the Damage Multiplier">Base<br>Damage</th>
+                <th class="sheet-lb">Base<br>Damage</th>
                 <th>Multiplier</th>
                 <th class="sheet-rb" title="Bash or Slash/Stab">Type</th>
                                <th class="sheet-lb"></th>
@@ -1185,7 +1177,7 @@
                     <h5>Weapon</h5>
                 </td>
                 <th>Maneuver<br>Rating</th>
-                <th class="sheet-lb" title="Base Damage should already include the Damage Multiplier">Base<br>Damage</th>
+                <th class="sheet-lb">Base<br>Damage</th>
                 <th>Multiplier</th>
                 <th class="sheet-rb" title="Bash or Slash/Stab">Type</th>
                           </tr>
@@ -1412,7 +1404,7 @@
                 </td>
                 <th>ROF</th>
                 <th>Maneuver<br>Rating</th>
-                <th class="sheet-lb" title="Base Damage should already include the Damage Multiplier">Base<br>Damage</th>
+                <th class="sheet-lb">Base<br>Damage</th>
                 <th class="sheet-rb">Multiplier</th>
                 <th>Short</th>
                 <th>Medium</th>
@@ -1520,7 +1512,7 @@
                 </td>
                 <th>ROF</th>
                 <th>Maneuver<br>Rating</th>
-                <th class="sheet-lb" title="Base Damage should already include the Damage Multiplier">Base<br>Damage</th>
+                <th class="sheet-lb">Base<br>Damage</th>
                 <th class="sheet-rb">Multiplier</th>
                 <th>Short</th>
                 <th>Medium</th>