diff --git a/conan-2d20/conan 2d20.html b/conan-2d20/conan 2d20.html
index 6182f50896..17b1f181a5 100644
--- a/conan-2d20/conan 2d20.html	
+++ b/conan-2d20/conan 2d20.html	
@@ -343,63 +343,66 @@
 
     <div class="sheet-header">Attibutes & Skills</div>
      <table border="1" style="width:100%">
-    <tr><td><label>Agility<td><td><input style=width:60px type="text" name="attr_Agility" value = "0" /><td>Unskilled<td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacf19cf20<[[@{Agility}]]]] Unskilled Agility skill.'></button></td></label>
-    <tr><td style=width:120px>Acrobatics<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Acrobatics" ><td>Expertise<input style=width:60px type="text" name="attr_Acrobatics_Expertise" value = "0"/><td>Focus<input style=width:60px type="text" name="attr_Acrobatics_Focus" value = "0"><td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacs<@{Acrobatics_Focus}cf20<[[@{Agility}+@{Acrobatics_Expertise}]]]] Acrobatics skill.'></button></td>
-    <tr><td>Melee<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Melee" ><td>Expertise<input style=width:60px type="text" name="attr_Melee_Expertise" value = "0"/><td>Focus<input style=width:60px type="text" name="attr_Melee_Focus" value = "0"><td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacs<@{Melee_Focus}cf20<[[@{Agility}+@{Melee_Expertise}]]]] Melee skill.'></button></td>
-    <tr><td>Stealth<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Stealth" ><td>Expertise<input style=width:60px type="text" name="attr_Stealth_Expertise" value = "0"/><td>Focus<input style=width:60px type="text" name="attr_Stealth_Focus" value = "0"><td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacs<@{Stealth_Focus}cf20<[[@{Agility}+@{Stealth_Expertise}]]]] Stealth skill.'></button></td>
+    <tr>
+		<td><label>Agility<td><td><input style=width:60px type="text" name="attr_Agility" value = "0" /><td>Unskilled<td><button type='roll' name='roll_agility' value='/me rolls [[ ?{Dice|2}d20sacf19cf20<[[@{Agility}]]]] Unskilled Agility skill.'></button></td></label>
+    <tr><td style=width:120px>Acrobatics<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Acrobatics" ><td>Expertise<input style=width:60px type="text" name="attr_Acrobatics_Expertise" value = "0"/><td>Focus<input style=width:60px type="text" name="attr_Acrobatics_Focus" value = "0"><td><button type='roll' name='roll_acrobatics' value='/me rolls [[ ?{Dice|2}d20sacs<@{Acrobatics_Focus}cf20<[[@{Agility}+@{Acrobatics_Expertise}]]]] Acrobatics skill.'></button></td>
+    <tr><td>Melee<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Melee" ><td>Expertise<input style=width:60px type="text" name="attr_Melee_Expertise" value = "0"/><td>Focus<input style=width:60px type="text" name="attr_Melee_Focus" value = "0"><td><button type='roll' name='roll_melee' value='/me rolls [[ ?{Dice|2}d20sacs<@{Melee_Focus}cf20<[[@{Agility}+@{Melee_Expertise}]]]] Melee skill.'></button></td>
+    <tr>
+		<td>Stealth<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Stealth" ><td>Expertise<input style=width:60px type="text" name="attr_Stealth_Expertise" value = "0"/>
+		<td>Focus<input style=width:60px type="text" name="attr_Stealth_Focus" value = "0">
+			<td><button type='roll' name='roll_stealth' value='/me rolls [[ ?{Dice|2}d20sacs<@{Stealth_Focus}cf20<[[@{Agility}+@{Stealth_Expertise}]]]] Stealth skill.'></button></td>
+		</td>
+    </tr>
+    </table>
+    
+            <table border="1" style="width:100%">
+    <tr><td><label>Awareness<td><td><input style=width:60px type="text" name="attr_Awareness" value = "0"/><td>Unskilled<td><button type='roll' name='roll_awareness' value='/me rolls [[ ?{Dice|2}d20sacf19cf20<[[@{Awareness}]]]] Unskilled Awareness skill.'></button></td></label>
+    <tr><td style=width:120px>Insight<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Insight" ><td>Expertise<input style=width:60px type="text" name="attr_Insight_Expertise" value = "0"/><td>Focus<input style=width:60px type="text" name="attr_Insight_Focus" value = "0"><td><button type='roll' name='roll_insight' value='/me rolls [[ ?{Dice|2}d20sacs<@{Insight_Focus}cf20<[[@{Awareness}+@{Insight_Expertise}]]]] Insight skill.'></button></td>
+    <tr><td>Observation<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Observation" ><td>Expertise<input style=width:60px type="text" name="attr_Observation_Expertise" value = "0"/><td>Focus<input style=width:60px type="text" name="attr_Observation_Focus" value = "0"><td><button type='roll' name='roll_observation' value='/me rolls [[ ?{Dice|2}d20sacs<@{Observation_Focus}cf20<[[@{Awareness}+@{Observation_Expertise}]]]] Observation skill.'></button></td>
+    <tr><td>Survival<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Survival" ><td>Expertise<input style=width:60px type="text" name="attr_Survival_Expertise" value = "0"/><td>Focus<input style=width:60px type="text" name="attr_Survival_Focus" value = "0"><td><button type='roll' name='roll_survival' value='/me rolls [[ ?{Dice|2}d20sacs<@{Survival_Focus}cf20<[[@{Awareness}+@{Survival_Expertise}]]]] Survival skill.'></button></td>
+    <tr><td>Thievery<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Thievery" ><td>Expertise<input style=width:60px type="text" name="attr_Thievery_Expertise" value = "0"/><td>Focus<input style=width:60px type="text" name="attr_Thievery_Focus" value = "0"><td><button type='roll' name='roll_thievery' value='/me rolls [[ ?{Dice|2}d20sacs<@{Thievery_Focus}cf20<[[@{Awareness}+@{Thievery_Expertise}]]]] Thievery skill.'></button></td>
+    
+    </td>
+    </tr>
+    </table>
+    <table border="1" style="width:100%">
+    <tr><td><label>Brawn<td><td><input style=width:60px type="text" name="attr_Brawn" value = "0"/><td>Unskilled<td><button type='roll' name='roll_brawn' value='/me rolls [[ ?{Dice|2}d20sacf19cf20<[[@{Brawn}]]]] Unskilled Brawn skill.'></button></td></label>         
+    <tr><td style=width:120px>Athletics<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Athletics" ><td>Expertise<input style=width:60px type="text" name="attr_Athletics_Expertise" value = "0"/><td>Focus<input style=width:60px type="text" name="attr_Athletics_Focus" value = "0"><td><button type='roll' name='roll_athletics' value='/me rolls [[ ?{Dice|2}d20sacs<@{Athletics_Focus}cf20<[[@{Brawn}+@{Athletics_Expertise}]]]] Athletics skill.'></button></td>
+    <tr><td>Resistance<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Resistance" ><td>Expertise<input style=width:60px type="text" name="attr_Resistance_Expertise" value = "0"/><td>Focus<input style=width:60px type="text" name="attr_Resistance_Focus" value = "0"><td><button type='roll' name='roll_resistance' value='/me rolls [[ ?{Dice|2}d20sacs<@{Resistance_Focus}cf20<[[@{Brawn}+@{Resistance_Expertise}]]]] Resistance skill.'></button></td>
    
     </td>
     </tr>
     </table>
     
             <table border="1" style="width:100%">
-    <tr><td><label>Awareness<td><td><input style=width:60px type="text" name="attr_Awareness" value = "0"/><td>Unskilled<td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacf19cf20<[[@{Awareness}]]]] Unskilled Awareness skill.'></button></td></label>
-    <tr><td style=width:120px>Insight<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Insight" ><td>Expertise<input style=width:60px type="text" name="attr_Insight_Expertise" value = "0"/><td>Focus<input style=width:60px type="text" name="attr_Insight_Focus" value = "0"><td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacs<@{Insight_Focus}cf20<[[@{Awareness}+@{Insight_Expertise}]]]] Insight skill.'></button></td>
-    <tr><td>Observation<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Observation" ><td>Expertise<input style=width:60px type="text" name="attr_Observation_Expertise" value = "0"/><td>Focus<input style=width:60px type="text" name="attr_Observation_Focus" value = "0"><td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacs<@{Observation_Focus}cf20<[[@{Awareness}+@{Observation_Expertise}]]]] Observation skill.'></button></td>
-    <tr><td>Survival<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Survival" ><td>Expertise<input style=width:60px type="text" name="attr_Survival_Expertise" value = "0"/><td>Focus<input style=width:60px type="text" name="attr_Survival_Focus" value = "0"><td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacs<@{Survival_Focus}cf20<[[@{Awareness}+@{Survival_Expertise}]]]] Survival skill.'></button></td>
-    <tr><td>Thievery<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Thievery" ><td>Expertise<input style=width:60px type="text" name="attr_Thievery_Expertise" value = "0"/><td>Focus<input style=width:60px type="text" name="attr_Thievery_Focus" value = "0"><td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacs<@{Thievery_Focus}cf20<[[@{Awareness}+@{Thievery_Expertise}]]]] Thievery skill.'></button></td>
-    
-    </td>
-    </tr>
-    </table>
-             <table border="1" style="width:100%">
-    <tr><td><label>Brawn<td><td><input style=width:60px type="text" name="attr_Brawn" value = "0"/><td>Unskilled<td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacf19cf20<[[@{Brawn}]]]] Unskilled Brawn skill.'></button></td></label>         
-    <tr><td style=width:120px>Athletics<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Athletics" ><td>Expertise<input style=width:60px type="text" name="attr_Athletics_Expertise" value = "0"/><td>Focus<input style=width:60px type="text" name="attr_Athletics_Focus" value = "0"><td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacs<@{Athletics_Focus}cf20<[[@{Brawn}+@{Athletics_Expertise}]]]] Athletics skill.'></button></td>
-    <tr><td>Resistance<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Resistance" ><td>Expertise<input style=width:60px type="text" name="attr_Resistance_Expertise" value = "0"/><td>Focus<input style=width:60px type="text" name="attr_Resistance_Focus" value = "0"><td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacs<@{Resistance_Focus}cf20<[[@{Brawn}+@{Resistance_Expertise}]]]] Resistance skill.'></button></td>
-   
-    </td>
-    </tr>
-    </table>
-    
-            <table border="1" style="width:100%">
-    <tr><td><label>Coordination<td><td><input style=width:60px type="text" name="attr_Coordination" value = "0"/><td>Unskilled<td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacf19cf20<[[@{Coordination}]]]] Unskilled Coordination skill.'></button></td></label>
-    <tr><td style=width:120px>Parry<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Parry" ><td>Expertise<input style=width:60px type="text" name="attr_Parry_Expertise" value = "0"/><td>Focus<input style=width:60px type="text" name="attr_Parry_Focus" value = "0"><td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacs<@{Parry_Focus}cf20<[[@{Coordination}+@{Parry_Expertise}]]]] Parry skill.'></button></td>
-    <tr><td>Ranged Weapons<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Ranged_Weapons" ><td>Expertise<input style=width:60px type="text" name="attr_Ranged_Weapons_Expertise" value = "0"/><td>Focus<input style=width:60px type="text" name="attr_Ranged_Weapons_Focus" value = "0" ><td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacs<@{Ranged_Weapons_Focus}cf20<[[@{Coordination}+@{Ranged_Weapons_Expertise}]]]] Ranged Weapons skill.'></button></td>
-    <tr><td>Sailing<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Sailing" ><td>Expertise<input style=width:60px type="text" name="attr_Sailing_Expertise" value = "0"/><td>Focus<input style=width:60px type="text" name="attr_Sailing_Focus" value = "0"><td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacs<@{Sailing_Focus}cf20<[[@{Coordination}+@{Sailing_Expertise}]]]] Sailing skill.'></button></td>
+    <tr><td><label>Coordination<td><td><input style=width:60px type="text" name="attr_Coordination" value = "0"/><td>Unskilled<td><button type='roll' name='roll_coordination' value='/me rolls [[ ?{Dice|2}d20sacf19cf20<[[@{Coordination}]]]] Unskilled Coordination skill.'></button></td></label>
+    <tr><td style=width:120px>Parry<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Parry" ><td>Expertise<input style=width:60px type="text" name="attr_Parry_Expertise" value = "0"/><td>Focus<input style=width:60px type="text" name="attr_Parry_Focus" value = "0"><td><button type='roll' name='roll_parry' value='/me rolls [[ ?{Dice|2}d20sacs<@{Parry_Focus}cf20<[[@{Coordination}+@{Parry_Expertise}]]]] Parry skill.'></button></td>
+    <tr><td>Ranged Weapons<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Ranged_Weapons" ><td>Expertise<input style=width:60px type="text" name="attr_Ranged_Weapons_Expertise" value = "0"/><td>Focus<input style=width:60px type="text" name="attr_Ranged_Weapons_Focus" value = "0" ><td><button type='roll' name='roll_ranged_weapons' value='/me rolls [[ ?{Dice|2}d20sacs<@{Ranged_Weapons_Focus}cf20<[[@{Coordination}+@{Ranged_Weapons_Expertise}]]]] Ranged Weapons skill.'></button></td>
+    <tr><td>Sailing<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Sailing" ><td>Expertise<input style=width:60px type="text" name="attr_Sailing_Expertise" value = "0"/><td>Focus<input style=width:60px type="text" name="attr_Sailing_Focus" value = "0"><td><button type='roll' name='roll_sailing' value='/me rolls [[ ?{Dice|2}d20sacs<@{Sailing_Focus}cf20<[[@{Coordination}+@{Sailing_Expertise}]]]] Sailing skill.'></button></td>
     
     </td>
     </tr>
     </table>
             <table border="1" style="width:100%">
-    <tr><td><label>Intelligence<td><td><input style=width:60px type="text" name="attr_Intelligence" value = "0"/><td>Unskilled<td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacf19cf20<[[@{Intelligence}]]]] Unskilled Intelligence skill.'></button></td></label>         
-    <tr><td style=width:120px>Alchemy<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Alchemy" ><td>Expertise<input style=width:60px type="text" name="attr_Alchemy_Expertise" value = "0"/><td>Focus<input style=width:60px type="text" name="attr_Alchemy_Focus" value = "0" ><td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacs<@{Alchemy_Focus}cf20<[[@{Intelligence}+@{Alchemy_Expertise}]]]] Alchemy skill.'></button></td>
-    <tr><td>Craft<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Craft" ><td>Expertise<input style=width:60px type="text" name="attr_Craft_Expertise" value = "0"/><td>Focus<input style=width:60px type="text" name="attr_Craft_Focus" value = "0"><td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacs<@{Craft_Focus}cf20<[[@{Intelligence}+@{Craft_Expertise}]]]] Craft skill.'></button></td>
-    <tr><td>Healing<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Healing" ><td>Expertise<input style=width:60px type="text" name="attr_Healing_Expertise" value = "0"/><td>Focus<input style=width:60px type="text" name="attr_Healing_Focus" value = "0"><td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacs<@{Healing_Focus}cf20<[[@{Intelligence}+@{Healing_Expertise}]]]] Healing skill.'></button></td>
-    <tr><td>Linguistics<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Linguistics" ><td>Expertise<input style=width:60px type="text" name="attr_Linguistics_Expertise" value = "0"/><td>Focus<input style=width:60px type="text" name="attr_Linguistics_Focus" value = "0"><td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacs<@{Linguistics_Focus}cf20<[[@{Intelligence}+@{Linguistics_Expertise}]]]] Linguistics skill.'></button></td> 
-    <tr><td>Lore<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Lore" ><td>Expertise<input style=width:60px type="text" name="attr_Lore_Expertise" value = "0"/><td>Focus<input style=width:60px type="text" name="attr_Lore_Focus" value = "0"><td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacs<@{Lore_Focus}cf20<[[@{Intelligence}+@{Lore_Expertise}]]]] Lore skill.'></button></td>
-    <tr><td>Warfare<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Warfare" ><td>Expertise<input style=width:60px type="text" name="attr_Warfare_Expertise" value = "0"/><td>Focus<input style=width:60px type="text" name="attr_Warfare_Focus" value = "0"><td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacs<@{Warfare_Focus}cf20<[[@{Intelligence}+@{Warfare_Expertise}]]]] Warfare skill.'></button></td>
+    <tr><td><label>Intelligence<td><td><input style=width:60px type="text" name="attr_Intelligence" value = "0"/><td>Unskilled<td><button type='roll' name='roll_intelligence' value='/me rolls [[ ?{Dice|2}d20sacf19cf20<[[@{Intelligence}]]]] Unskilled Intelligence skill.'></button></td></label>         
+    <tr><td style=width:120px>Alchemy<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Alchemy" ><td>Expertise<input style=width:60px type="text" name="attr_Alchemy_Expertise" value = "0"/><td>Focus<input style=width:60px type="text" name="attr_Alchemy_Focus" value = "0" ><td><button type='roll' name='roll_alchemy' value='/me rolls [[ ?{Dice|2}d20sacs<@{Alchemy_Focus}cf20<[[@{Intelligence}+@{Alchemy_Expertise}]]]] Alchemy skill.'></button></td>
+    <tr><td>Craft<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Craft" ><td>Expertise<input style=width:60px type="text" name="attr_Craft_Expertise" value = "0"/><td>Focus<input style=width:60px type="text" name="attr_Craft_Focus" value = "0"><td><button type='roll' name='roll_craft' value='/me rolls [[ ?{Dice|2}d20sacs<@{Craft_Focus}cf20<[[@{Intelligence}+@{Craft_Expertise}]]]] Craft skill.'></button></td>
+    <tr><td>Healing<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Healing" ><td>Expertise<input style=width:60px type="text" name="attr_Healing_Expertise" value = "0"/><td>Focus<input style=width:60px type="text" name="attr_Healing_Focus" value = "0"><td><button type='roll' name='roll_healing' value='/me rolls [[ ?{Dice|2}d20sacs<@{Healing_Focus}cf20<[[@{Intelligence}+@{Healing_Expertise}]]]] Healing skill.'></button></td>
+    <tr><td>Linguistics<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Linguistics" ><td>Expertise<input style=width:60px type="text" name="attr_Linguistics_Expertise" value = "0"/><td>Focus<input style=width:60px type="text" name="attr_Linguistics_Focus" value = "0"><td><button type='roll' name='roll_linguistics' value='/me rolls [[ ?{Dice|2}d20sacs<@{Linguistics_Focus}cf20<[[@{Intelligence}+@{Linguistics_Expertise}]]]] Linguistics skill.'></button></td> 
+    <tr><td>Lore<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Lore" ><td>Expertise<input style=width:60px type="text" name="attr_Lore_Expertise" value = "0"/><td>Focus<input style=width:60px type="text" name="attr_Lore_Focus" value = "0"><td><button type='roll' name='roll_lore' value='/me rolls [[ ?{Dice|2}d20sacs<@{Lore_Focus}cf20<[[@{Intelligence}+@{Lore_Expertise}]]]] Lore skill.'></button></td>
+    <tr><td>Warfare<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Warfare" ><td>Expertise<input style=width:60px type="text" name="attr_Warfare_Expertise" value = "0"/><td>Focus<input style=width:60px type="text" name="attr_Warfare_Focus" value = "0"><td><button type='roll' name='roll_warfare' value='/me rolls [[ ?{Dice|2}d20sacs<@{Warfare_Focus}cf20<[[@{Intelligence}+@{Warfare_Expertise}]]]] Warfare skill.'></button></td>
     
     </td>
     </tr>
     </table>
         
         <table border="1" style="width:100%">
-    <tr><td><label>Personality<td><td><input style=width:60px type="text" name="attr_Personality" value = "0"/><td>Unskilled<td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacf19cf20<[[@{Personality}]]]] Unskilled Personality skill.'></button></td></label>         
-    <tr><td style=width:120px>Animal Handling<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Animal_Handling" ><td>Expertise<input style=width:60px type="text" name="attr_Animal_Handling_Expertise" value = "0"/><td>Focus<input style=width:60px type="text" name="attr_Animal_Handling_Focus" value = "0"><td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacs<@{Animal_Handling_Focus}cf20<[[@{Personality}+@{Animal_Handling_Expertise}]]]] Animal Handling skill.'></button></td>
-    <tr><td>Command<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Command" ><td>Expertise<input style=width:60px type="text" name="attr_Command_Expertise" value = "0"/><td>Focus<input style=width:60px type="text" name="attr_Command_Focus" value = "0"><td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacs<@{Command_Focus}cf20<[[@{Personality}+@{Command_Expertise}]]]] Command skill.'></button></td>
-    <tr><td>Counsel<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Counsel" ><td>Expertise<input style=width:60px type="text" name="attr_Counsel_Expertise" value = "0"/><td>Focus<input style=width:60px type="text" name="attr_Counsel_Focus" value = "0"><td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacs<@{Counsel_Focus}cf20<[[@{Personality}+@{Counsel_Expertise}]]]] Counsel skill.'></button></td>
-    <tr><td>Persuade<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Persuade" ><td>Expertise<input style=width:60px type="text" name="attr_Persuade_Expertise" value = "0"/><td>Focus<input style=width:60px type="text" name="attr_Persuade_Focus" value = "0"><td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacs<@{Persuade_Focus}cf20<[[@{Personality}+@{Persuade_Expertise}]]]] Persuade skill.'></button></td>
-    <tr><td>Society<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Society" ><td>Expertise<input style=width:60px type="text" name="attr_Society_Expertise" value = "0"/><td>Focus<input style=width:60px type="text" name="attr_Society_Focus" value = "0"><td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacs<@{Society_Focus}cf20<[[@{Personality}+@{Society_Expertise}]]]] Society skill.'></button></td>
+    <tr><td><label>Personality<td><td><input style=width:60px type="text" name="attr_Personality" value = "0"/><td>Unskilled<td><button type='roll' name='roll_personality' value='/me rolls [[ ?{Dice|2}d20sacf19cf20<[[@{Personality}]]]] Unskilled Personality skill.'></button></td></label>         
+    <tr><td style=width:120px>Animal Handling<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Animal_Handling" ><td>Expertise<input style=width:60px type="text" name="attr_Animal_Handling_Expertise" value = "0"/><td>Focus<input style=width:60px type="text" name="attr_Animal_Handling_Focus" value = "0"><td><button type='roll' name='roll_animal_handling' value='/me rolls [[ ?{Dice|2}d20sacs<@{Animal_Handling_Focus}cf20<[[@{Personality}+@{Animal_Handling_Expertise}]]]] Animal Handling skill.'></button></td>
+    <tr><td>Command<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Command" ><td>Expertise<input style=width:60px type="text" name="attr_Command_Expertise" value = "0"/><td>Focus<input style=width:60px type="text" name="attr_Command_Focus" value = "0"><td><button type='roll' name='roll_command' value='/me rolls [[ ?{Dice|2}d20sacs<@{Command_Focus}cf20<[[@{Personality}+@{Command_Expertise}]]]] Command skill.'></button></td>
+    <tr><td>Counsel<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Counsel" ><td>Expertise<input style=width:60px type="text" name="attr_Counsel_Expertise" value = "0"/><td>Focus<input style=width:60px type="text" name="attr_Counsel_Focus" value = "0"><td><button type='roll' name='roll_counsel' value='/me rolls [[ ?{Dice|2}d20sacs<@{Counsel_Focus}cf20<[[@{Personality}+@{Counsel_Expertise}]]]] Counsel skill.'></button></td>
+    <tr><td>Persuade<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Persuade" ><td>Expertise<input style=width:60px type="text" name="attr_Persuade_Expertise" value = "0"/><td>Focus<input style=width:60px type="text" name="attr_Persuade_Focus" value = "0"><td><button type='roll' name='roll_persuade' value='/me rolls [[ ?{Dice|2}d20sacs<@{Persuade_Focus}cf20<[[@{Personality}+@{Persuade_Expertise}]]]] Persuade skill.'></button></td>
+    <tr><td>Society<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Society" ><td>Expertise<input style=width:60px type="text" name="attr_Society_Expertise" value = "0"/><td>Focus<input style=width:60px type="text" name="attr_Society_Focus" value = "0"><td><button type='roll' name='roll_society' value='/me rolls [[ ?{Dice|2}d20sacs<@{Society_Focus}cf20<[[@{Personality}+@{Society_Expertise}]]]] Society skill.'></button></td>
    
     </td>
     </tr>
@@ -407,9 +410,9 @@
     
     
                   <table border="1" style="width:100%">
-    <tr><td><label>Willpower<td><td><input style=width:60px type="text" name="attr_Willpower" value = "0"/><td>Unskilled<td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacf19cf20<[[@{Willpower}]]]] Unskilled Willpower skill.'></button></td></label>         
-    <tr><td style=width:120px>Discipline<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Discipline" ><td>Expertise<input style=width:60px type="text" name="attr_Discipline_Expertise" value = "0" /><td>Focus<input style=width:60px type="text" name="attr_Discipline_Focus" value = "0"><td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacs<@{Discipline_Focus}cf20<[[@{Willpower}+@{Discipline_Expertise}]]]] Discipline skill.'></button></td>
-    <tr><td style=width:120px>Sorcery<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Sorcery" ><td>Expertise<input style=width:60px type="text" name="attr_Sorcery_Expertise" value = "0"/><td>Focus<input style=width:60px type="text" name="attr_Sorcery_Focus" value = "0"><td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacs<@{Sorcery_Focus}cf20<[[@{Willpower}+@{Sorcery_Expertise}]]]] Sorcery skill.'></button></td>
+    <tr><td><label>Willpower<td><td><input style=width:60px type="text" name="attr_Willpower" value = "0"/><td>Unskilled<td><button type='roll' name='roll_willpower' value='/me rolls [[ ?{Dice|2}d20sacf19cf20<[[@{Willpower}]]]] Unskilled Willpower skill.'></button></td></label>         
+    <tr><td style=width:120px>Discipline<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Discipline" ><td>Expertise<input style=width:60px type="text" name="attr_Discipline_Expertise" value = "0" /><td>Focus<input style=width:60px type="text" name="attr_Discipline_Focus" value = "0"><td><button type='roll' name='roll_discipline' value='/me rolls [[ ?{Dice|2}d20sacs<@{Discipline_Focus}cf20<[[@{Willpower}+@{Discipline_Expertise}]]]] Discipline skill.'></button></td>
+    <tr><td style=width:120px>Sorcery<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Sorcery" ><td>Expertise<input style=width:60px type="text" name="attr_Sorcery_Expertise" value = "0"/><td>Focus<input style=width:60px type="text" name="attr_Sorcery_Focus" value = "0"><td><button type='roll' name='roll_sorcery' value='/me rolls [[ ?{Dice|2}d20sacs<@{Sorcery_Focus}cf20<[[@{Willpower}+@{Sorcery_Expertise}]]]] Sorcery skill.'></button></td>
    
        
    </td>
@@ -448,7 +451,7 @@
         <option  value='@{NPCCoordination'>Coordination</option>
 
         </select>
-        <td><button style=width:30px type='roll' name='roll_skill' value='@{NPCcharacter_name} rolls [[ ?{Dice|2}d20sacs<@{NPCCombatDice}cf20<[[@{NPCCombat}+@{NPCCombatDice}]]]] Combat Expertise.'></button></td>
+        <td><button style=width:30px type='roll' name='roll_combat' value='@{NPCcharacter_name} rolls [[ ?{Dice|2}d20sacs<@{NPCCombatDice}cf20<[[@{NPCCombat}+@{NPCCombatDice}]]]] Combat Expertise.'></button></td>
         
      <td>Fortitude<td><input style=width:20px type="text" name="attr_NPCFortitudeDice" value = "0"/>
          <td>Uses<td><select style="width: 100px;color: black;" name="attr_NPCFortitude" title="Fortitude">
@@ -460,7 +463,7 @@
         <option  value='@{NPCBrawn}' selected>Brawn</option>
         <option  value='@{NPCCoordination'>Coordination</option>
         </select>
-        <td><button style=width:30px type='roll' name='roll_skill' value='@{NPCcharacter_name} rolls [[ ?{Dice|2}d20sacs<@{NPCFortitudeDice}cf20<[[@{NPCFortitude}+@{NPCFortitudeDice}]]]] Fortitude Expertise.'></button></td>
+        <td><button style=width:30px type='roll' name='roll_fortitude' value='@{NPCcharacter_name} rolls [[ ?{Dice|2}d20sacs<@{NPCFortitudeDice}cf20<[[@{NPCFortitude}+@{NPCFortitudeDice}]]]] Fortitude Expertise.'></button></td>
          
         
         <td>Knowledge<td><input style=width:20px type="text" name="attr_NPCKnowledgeDice" value = "0"/>
@@ -473,7 +476,7 @@
         <option  value='@{NPCBrawn}' >Brawn</option>
         <option  value='@{NPCCoordination'>Coordination</option>
         </select>
-       <td><button style=width:30px type='roll' name='roll_skill' value='@{NPCcharacter_name} rolls [[ ?{Dice|2}d20sacs<@{NPCKnowledgeDice}<[[@{NPCKnowledge}+@{NPCKnowledgeDice}]]]] Knowledge Expertise.'></button></td>
+       <td><button style=width:30px type='roll' name='roll_knowledge' value='@{NPCcharacter_name} rolls [[ ?{Dice|2}d20sacs<@{NPCKnowledgeDice}<[[@{NPCKnowledge}+@{NPCKnowledgeDice}]]]] Knowledge Expertise.'></button></td>
          
         <tr>
 
@@ -487,7 +490,7 @@
         <option  value='@{NPCBrawn}' >Brawn</option>
         <option  value='@{NPCCoordination'>Coordination</option>
         </select>
-       <td><button style=width:30px type='roll' name='roll_skill' value='@{NPCcharacter_name} rolls [[ ?{Dice|2}d20sacs<@{NPCMovementDice}<[[@{NPCMovement}+@{NPCMovementDice}]]]] Movement Expertise.'></button></td>
+       <td><button style=width:30px type='roll' name='roll_movement' value='@{NPCcharacter_name} rolls [[ ?{Dice|2}d20sacs<@{NPCMovementDice}<[[@{NPCMovement}+@{NPCMovementDice}]]]] Movement Expertise.'></button></td>
          
         
         <td>Senses<td><input style=width:20px type="text" name="attr_NPCSensesDice" value = "0"/>
@@ -500,7 +503,7 @@
         <option  value='@{NPCBrawn}' >Brawn</option>
         <option  value='@{NPCCoordination'>Coordination</option>
         </select>
-         <td><button style=width:30px type='roll' name='roll_skill' value='@{NPCcharacter_name} rolls [[ ?{Dice|2}d20sacs<@{NPCSensesDice}<[[@{NPCSenses}+@{NPCSensesDice}]]]] Senses Expertise.'></button></td>
+         <td><button style=width:30px type='roll' name='roll_senses' value='@{NPCcharacter_name} rolls [[ ?{Dice|2}d20sacs<@{NPCSensesDice}<[[@{NPCSenses}+@{NPCSensesDice}]]]] Senses Expertise.'></button></td>
         
         
         <td>Social<td><input style=width:20px type="text" name="attr_NPCSocialDice" value = "0"/>
@@ -513,7 +516,7 @@
         <option  value='@{NPCBrawn}' >Brawn</option>
         <option  value='@{NPCCoordination'>Coordination</option>
         </select>
-       <td><button style=width:30px type='roll' name='roll_skill' value='@{NPCcharacter_name} rolls [[ ?{Dice|2}d20sacs<@{NPCSocialDice}<[[@{NPCSocial}+@{NPCSocialDice}]]]] Social Expertise.'></button></td>
+       <td><button style=width:30px type='roll' name='roll_social' value='@{NPCcharacter_name} rolls [[ ?{Dice|2}d20sacs<@{NPCSocialDice}<[[@{NPCSocial}+@{NPCSocialDice}]]]] Social Expertise.'></button></td>
          
 </table>
 </td>
@@ -634,7 +637,7 @@
                         <option value="Sorcery">Sorcery</option>
                             
                         </select>
-                        <button type='roll' name='roll_skill' value='@{character_name} Uses the @{ATallent_Name2} Tallent which is linked to @{tallentroll2} and @{tallentbase2} , this has an effect of @{ATallent_Effect2} and a Rank of @{ATallent_Rank2}.'></button>                        
+                        <button type='roll' name='roll_skill1' value='@{character_name} Uses the @{ATallent_Name2} Tallent which is linked to @{tallentroll2} and @{tallentbase2} , this has an effect of @{ATallent_Effect2} and a Rank of @{ATallent_Rank2}.'></button>                        
                         </td><tr> </td><tr>
                 
 </table>
@@ -692,7 +695,7 @@
                         <option value="Discipline">Discipline</option>
                         <option value="Sorcery">Sorcery</option>
                         </select>
-                        <button type='roll' name='roll_skill' value='@{character_name} Uses the @{ATallent_Namerep1} Tallent which is linked to @{tallentrollrep1} and @{tallentbaserep1}, this has an effect of @{ATallent_Effectrep1} and a Rank of @{ATallent_Rankrep1}.'></button>                        
+                        <button type='roll' name='roll_skill2' value='@{character_name} Uses the @{ATallent_Namerep1} Tallent which is linked to @{tallentrollrep1} and @{tallentbaserep1}, this has an effect of @{ATallent_Effectrep1} and a Rank of @{ATallent_Rankrep1}.'></button>                        
                         
                            
                      </td></table></tr></fieldset>
@@ -742,7 +745,7 @@
                              <table border="1" style="width:100%">
             <tr>
             <td>Qualities&nbsp;<input style=width:720px type="text" name="attr_weapon_Notes_rep" value='None'/>
-            <td>Roll&nbsp;<button type='roll' name="attr_Combat-Dice" value="/me rolls  @{weapon_Name_rep} [[(?{Modifier to Damage Dice|0}+@{weapon_Damage_rep}+@{weapon_Attribute_rep})t[Combat-Dice]]]+@{weapon_Damagebonus_rep} Hits , Hover mouse over result to get full result"></button>
+            <td>Roll&nbsp;<button type='roll' name="roll_Combat-Dice" value="/me rolls  @{weapon_Name_rep} [[(?{Modifier to Damage Dice|0}+@{weapon_Damage_rep}+@{weapon_Attribute_rep})t[Combat-Dice]]]+@{weapon_Damagebonus_rep} Hits , Hover mouse over result to get full result"></button>
             </td></tr>
 
             </table>