diff --git a/Tephra/Tephra.html b/Tephra/Tephra.html
index f73f20a7c5..29257b134b 100644
--- a/Tephra/Tephra.html
+++ b/Tephra/Tephra.html
@@ -62,14 +62,14 @@
         <div class='sheet-col'>
             <table class="sheet-table">
                 <tr>
-                    <th><button type="roll" class="sheet-attribute" name="attr_Brute_roll" value="&{template:skill}{{attribute= Brute}} {{character= @{character_name}}} {{Roll= [[@{Brute}+d12!]]}}">Brute</button></th>
+                    <th><button type="roll" class="sheet-attribute" name="attr_Brute_roll" value="&{template:skill}{{attribute= Brute}} {{character= @{character_name}}} {{Roll= [[@{Brute}+@{Brute_mod}+d12!]]}}">Brute</button></th>
                     <td><input type="number" class="sheet-skill" name="attr_Brute" value="[[@{Brawl}+@{Frenzy}+@{Overpower}+@{Resilience}]]" disabled="true"/></td>
                     <th><button type="roll" class="sheet-skillbtn" name="attr_Brawl_roll" value="&{template:skill}{{attribute= Brawl}} {{character= @{character_name}}} {{Roll= [[@{Brawl}+d12!]]}}">Brawl</button></th>
                     <td><input type="number" class="sheet-skill" name="attr_Brawl" value="0"/></td>
                 </tr>
                 <tr>
-                    <td></td>
-                    <td></td>
+                    <th>Atribute Mod</th>
+                    <td><input type="number" class="sheet-skill" name="attr_Brute_mod" value="0"/></td></td>
                     <th><button type="roll" class="sheet-skillbtn" name="attr_Frenzy_roll" value="&{template:skill}{{attribute= Frenzy}} {{character= @{character_name}}} {{Roll= [[@{Frenzy}+d12!]]}} ">Frenzy</button></th>
                     <td><input type="number" class="sheet-skill" name="attr_Frenzy" value="0"/></td>
                 </tr>
@@ -89,14 +89,14 @@
                     <td><br></td>
                 </tr>
                 <tr>
-                    <th><button type="roll" class="sheet-attribute" name="attr_Cunning_roll" value="&{template:skill}{{attribute= Cunning}} {{character= @{character_name}}} {{Roll= [[@{Cunning}+d12!]] }}">Cunning</button></th>
+                    <th><button type="roll" class="sheet-attribute" name="attr_Cunning_roll" value="&{template:skill}{{attribute= Cunning}} {{character= @{character_name}}} {{Roll= [[@{Cunning}+@{Cunning_mod}+d12!]] }}">Cunning</button></th>
                     <td><input type="number" class="sheet-skill" name="attr_Cunning" value="@{Espionage}+@{Expertise}+@{Showmanship}+@{Tactical}" disabled="true"/></td>
                     <th><button type="roll" class="sheet-skillbtn" name="attr_Espionage_roll" value="&{template:skill}{{attribute= Espionage}} {{character= @{character_name}}} {{Roll= [[@{Espionage}+d12!]]}}">Espionage</button></th>
                     <td><input type="number" class="sheet-skill" name="attr_Espionage" value="0"/></td>
                 </tr>
                 <tr>
-                    <td></td>
-                    <td></td>
+                    <th>Atribute Mod</th>
+                    <td><input type="number" class="sheet-skill" name="attr_Cunning_mod" value="0"/></td></td>
                     <th><button type="roll" class="sheet-skillbtn" name="attr_Expertise_roll" value="&{template:skill}{{attribute= Expertise}} {{character= @{character_name}}} {{Roll= [[@{Expertise}+d12!]]}}">Expertise</button></th>
                     <td><input type="number" class="sheet-skill" name="attr_Expertise" value="0"/></td>
                 </tr>
@@ -116,14 +116,14 @@
                     <td><br></td>
                 </tr>
                 <tr>
-                    <th><button type="roll" class="sheet-attribute" name="attr_Dexterity_roll" value="&{template:skill}{{attribute= Dexterity}} {{character= @{character_name}}} {{Roll= [[@{Dexterity}+d12!]]}}">Dexterity</button></th>
+                    <th><button type="roll" class="sheet-attribute" name="attr_Dexterity_roll" value="&{template:skill}{{attribute= Dexterity}} {{character= @{character_name}}} {{Roll= [[@{Dexterity}+@{Dexterity_mod}+d12!]]}}">Dexterity</button></th>
                     <td><input type="number" class="sheet-skill" name="attr_Dexterity" value="@{Ace}+@{Agility}+@{Marksmanship}+@{Swashbuckling}" disabled="true"/></td>
                     <th><button type="roll" class="sheet-skillbtn" name="attr_Ace_roll" value="&{template:skill}{{attribute= Ace}} {{character= @{character_name}}} {{Roll= [[@{Ace}+d12!]]}}">Ace</button></th>
                     <td><input type="number" class="sheet-skill" name="attr_Ace" value="0"/></td>
                 </tr>
                 <tr>
-                    <td></td>
-                    <td></td>
+                    <th>Atribute Mod</th>
+                    <td><input type="number" class="sheet-skill" name="attr_Dexterity_mod" value="0"/></td></td>
                     <th><button type="roll" class="sheet-skillbtn" name="attr_Agility_roll" value="&{template:skill}{{attribute= Agility}} {{character= @{character_name}}} {{Roll= [[@{Agility}+d12!]]}}">Agility</button></th>
                     <td><input type="number" class="sheet-skill" name="attr_Agility" value="0"/></td>
                 </tr>
@@ -144,14 +144,14 @@
         <div class='sheet-col'>
             <table class="sheet-table">
                 <tr>
-                    <th><button type="roll" class="sheet-attribute" name="attr_Spirit_roll" value="&{template:skill}{{attribute= Spirit}} {{character= @{character_name}}} {{Roll= [[@{Spirit}+d12!]]}}">Spirit</button></th>
+                    <th><button type="roll" class="sheet-attribute" name="attr_Spirit_roll" value="&{template:skill}{{attribute= Spirit}} {{character= @{character_name}}} {{Roll= [[@{Spirit}+@{Spirit_mod}+d12!]]}}">Spirit</button></th>
                     <td><input type="number" class="sheet-skill" name="attr_Spirit" value="@{Faith}+@{Grace}+@{Luck}+@{Shamanism}" disabled="true"/></td>
                     <th><button type="roll" class="sheet-skillbtn" name="attr_Faith_roll" value="&{template:skill}{{attribute= Faith}} {{character= @{character_name}}} {{Roll= [[@{Faith}+d12!]]}}">Faith</button></th>
                     <td><input type="number" class="sheet-skill" name="attr_Faith" value="0"/></td>
                 </tr>
                 <tr>
-                    <td></td>
-                    <td></td>
+                    <th>Atribute Mod</th>
+                    <td><input type="number" class="sheet-skill" name="attr_Spirit_mod" value="0"/></td></td>
                     <th><button type="roll" class="sheet-skillbtn" name="attr_Grace_roll" value="&{template:skill}{{attribute= Grace}} {{character= @{character_name}}} {{Roll= [[@{Grace}+d12!]]}}">Grace</button></th>
                     <td><input type="number" class="sheet-skill" name="attr_Grace" value="0"/></td>
                 </tr>
@@ -171,14 +171,14 @@
                     <td><br></td>
                 </tr>
                 <tr>
-                    <th><button type="roll" class="sheet-attribute" name="attr_Science_roll" value="&{template:skill}{{attribute= Science}} {{character= @{character_name}}} {{Roll= [[@{Science}+d12!]]}}">Science</button></th>
+                    <th><button type="roll" class="sheet-attribute" name="attr_Science_roll" value="&{template:skill}{{attribute= Science}} {{character= @{character_name}}} {{Roll= [[@{Science}+@{Science_mod}+d12!]]}}">Science</button></th>
                     <td><input type="number" class="sheet-skill" name="attr_Science" v value="@{Alchemy}+@{Armsmith}+@{Automata}+@{Bio-Flux}+@{Engineer}+@{Gadgetry}" disabled="true"/></td>
                     <th><button type="roll" class="sheet-skillbtn" name="attr_Alchemy_roll" value="&{template:skill}{{attribute= Alchemy}} {{character= @{character_name}}} {{Roll= [[@{Alchemy}+d12!]]}}">Alchemy</button></th>
                     <td><input type="number" class="sheet-skill" name="attr_Alchemy" value="0"/></td>
                 </tr>
                 <tr>
-                    <td></td>
-                    <td></td>
+                    <th>Atribute Mod</th>
+                    <td><input type="number" class="sheet-skill" name="attr_Science_mod" value="0"/></td></td>
                     <th><button type="roll" class="sheet-skillbtn" name="attr_Armsmith_roll" value="&{template:skill}{{attribute= Armsmith}} {{character= @{character_name}}} {{Roll= [[@{Armsmith}+d12!]]}}">Armsmith</button></th>
                     <td><input type="number" class="sheet-skill" name="attr_Armsmith" value="0"/></td>
                 </tr>
@@ -460,13 +460,13 @@
         <div class='sheet-col'>
             <table class="sheet-table" style="width:100%">
                 <tr>
-                    <th><button type="roll" class="sheet-skillbtn" name="attr_Evade_roll" style="margin-left:auto;margin-right:auto;" value="/em Evades [[1d12+[[@{Evade}]] + [[@{Specialty-Evade-total}]] + @{armor-EvadePenalty}]], and plus @{Evade_Bonus} @{Evaded}">Evade</button></th>
+                    <th><button type="roll" class="sheet-skillbtn" name="attr_Evade_roll" style="margin-left:auto;margin-right:auto;" value="/em Evades [[1d12!+[[@{Evade}]] + [[@{Specialty-Evade-total}]] + @{armor-EvadePenalty}]], and plus @{Evade_Bonus} @{Evaded}">Evade</button></th>
                 </tr>
                 <tr>
                     <th><input type="number" class="sheet-Specialty" name="attr_Evade" value="0"/></th>
                 </tr>
                 <tr>
-                    <th><button type="roll" class="sheet-skillbtn" name="attr_Defense_roll" style="margin-left:auto;margin-right:auto;"value="/em Evades [[1d12+[[@{Defense}]] + [[@{Specialty-Defense-total}]] + [[@{armor-Soak}]] ]]">Defense</button></th>
+                    <th><button type="roll" class="sheet-skillbtn" name="attr_Defense_roll" style="margin-left:auto;margin-right:auto;"value="/em uses Defense [[1d12!+[[@{Defense}]] + [[@{Specialty-Defense-total}]] ]] and has an armor soak of @{armor-Soak}">Defense</button></th>
                 </tr>
                 <tr>
                     <th><input type="number" class="sheet-Specialty" name="attr_Defense" value="0"/></th>
@@ -522,8 +522,7 @@
                     <td><input type="number" class="sheet-Specialty" name="attr_AP" value="3"/></td>
                 </tr>
                 <tr>
-                    <td></td>
-                    <th>Priority</th>
+                    <th colspan="3"><button type="roll" class="sheet-skillbtn" name="attr_Priority_roll" style="margin-left:auto;margin-right:auto;" value="/em uses Priority [[1d12!+[[@{Priority}]] ]] ">Priority</button></th>
                 </tr>
                 <tr>
                     <td></td>
@@ -644,10 +643,10 @@
                     <th class="sheet-left">AP to Ready</th>
                 </tr>
                 <tr>
-                    <th><button type="roll" class="sheet-skillbtn" name="attr_Accuracy_roll-1" value="&{template:attack}{{weapon= @{weapon-name-1}}} {{character= @{character_name}}} {{roll= [[1d12+[[@{weapon-Accuracy-1}]] + [[@{Specialty-Accuracy-total}]]]] }} {{damage= @{weapon-DamageClassTier1-1}/@{weapon-DamageClassTier2-1}/@{weapon-DamageClassTier3-1}/@{weapon-DamageClassTier4-1}}} {{notes= @{weapon-notes-1} }}">Accuracy</button></th>
+                    <th><button type="roll" class="sheet-skillbtn" name="attr_Accuracy_roll-1" value="&{template:attack}{{weapon= @{weapon-name-1}}} {{character= @{character_name}}} {{roll= [[1d12!+[[@{weapon-Accuracy-1}]] + [[@{Specialty-Accuracy-total}]]]] }} {{damage= @{weapon-DamageClassTier1-1}/@{weapon-DamageClassTier2-1}/@{weapon-DamageClassTier3-1}/@{weapon-DamageClassTier4-1}}} {{notes= @{weapon-notes-1} }}">Accuracy</button></th>
                     <th><input type="number" class="sheet-Specialty" name="attr_weapon-Accuracy-1" value="0"/></th>
                     <th><input type="number" class="sheet-Specialty" name="attr_weapon-Strike-1" value="0"/></th>
-                    <th><button type="roll" class="sheet-skillbtn" name="attr_Accuracy_roll-1" value="&{template:attack}{{weapon= @{weapon-name-1}}} {{character= @{character_name}}} {{roll= [[1d12+[[@{weapon-Strike-1}]] + [[@{Specialty-Strike-total}]]]] }} {{damage= @{weapon-DamageClassTier1-1}/@{weapon-DamageClassTier2-1}/@{weapon-DamageClassTier3-1}/@{weapon-DamageClassTier4-1}}} {{notes= @{weapon-notes-1} }}">Strike</button></th>
+                    <th><button type="roll" class="sheet-skillbtn" name="attr_Strike_roll-1" value="&{template:attack}{{weapon= @{weapon-name-1}}} {{character= @{character_name}}} {{roll= [[1d12!+[[@{weapon-Strike-1}]] + [[@{Specialty-Strike-total}]]]] }} {{damage= @{weapon-DamageClassTier1-1}/@{weapon-DamageClassTier2-1}/@{weapon-DamageClassTier3-1}/@{weapon-DamageClassTier4-1}}} {{notes= @{weapon-notes-1} }}">Strike</button></th>
                 </tr>
                 <tr>
                     <th colspan="4">Damage Class</th>
@@ -691,10 +690,10 @@
                     <th class="sheet-left">AP to Ready</th>
                 </tr>
                 <tr>
-                    <th><button type="roll" class="sheet-skillbtn" name="attr_Accuracy_roll-2" value="&{template:attack}{{weapon= @{weapon-name-2}}} {{character= @{character_name}}} {{roll= [[1d12+[[@{weapon-Accuracy-2}]] + [[@{Specialty-Accuracy-total}]]]] }} {{damage= @{weapon-DamageClassTier1-2}/@{weapon-DamageClassTier2-2}/@{weapon-DamageClassTier3-2}/@{weapon-DamageClassTier4-2}}} {{notes= @{weapon-notes-2} }}">Accuracy</button></th>
+                    <th><button type="roll" class="sheet-skillbtn" name="attr_Accuracy_roll-2" value="&{template:attack}{{weapon= @{weapon-name-2}}} {{character= @{character_name}}} {{roll= [[1d12!+[[@{weapon-Accuracy-2}]] + [[@{Specialty-Accuracy-total}]]]] }} {{damage= @{weapon-DamageClassTier1-2}/@{weapon-DamageClassTier2-2}/@{weapon-DamageClassTier3-2}/@{weapon-DamageClassTier4-2}}} {{notes= @{weapon-notes-2} }}">Accuracy</button></th>
                     <th><input type="number" class="sheet-Specialty" name="attr_weapon-Accuracy-2" value="0"/></th>
                     <th><input type="number" class="sheet-Specialty" name="attr_weapon-Strike-2" value="0"/></th>
-                    <th><button type="roll" class="sheet-skillbtn" name="attr_Accuracy_roll-2" value="&{template:attack}{{weapon= @{weapon-name-2}}} {{character= @{character_name}}} {{roll= [[1d12+[[@{weapon-Strike-2}]] + [[@{Specialty-Strike-total}]]]] }} {{damage= @{weapon-DamageClassTier1-2}/@{weapon-DamageClassTier2-2}/@{weapon-DamageClassTier3-2}/@{weapon-DamageClassTier4-2}}} {{notes= @{weapon-notes-2} }}">Strike</button></th>
+                    <th><button type="roll" class="sheet-skillbtn" name="attr_Strike_roll-2" value="&{template:attack}{{weapon= @{weapon-name-2}}} {{character= @{character_name}}} {{roll= [[1d12!+[[@{weapon-Strike-2}]] + [[@{Specialty-Strike-total}]]]] }} {{damage= @{weapon-DamageClassTier1-2}/@{weapon-DamageClassTier2-2}/@{weapon-DamageClassTier3-2}/@{weapon-DamageClassTier4-2}}} {{notes= @{weapon-notes-2} }}">Strike</button></th>
                 </tr>
                 <tr>
                     <th colspan="4">Damage Class</th>