diff --git a/Starcraft RPG/starcraft.html b/Starcraft RPG/starcraft.html
index c309d4238f..412990bcc6 100644
--- a/Starcraft RPG/starcraft.html	
+++ b/Starcraft RPG/starcraft.html	
@@ -65,15 +65,15 @@
 
 		<h2 style="margin-bottom: 10px;">Ability Scores</h2>
 
-		<label>Strength</label><strong class='ability'></strong><input type="number" name='attr_strength' class='sheet-short'><button type='roll' name='roll_strength' value='&{template:default} {{name=Strength}} {{Result:=[[1d20+@{Strength}]]}}'></button><br />
-		<label>Instinct</label><strong class='ability'></strong><input type="number" name='attr_instinct' class='sheet-short'><button type='roll' name='roll_instinct' value='&{template:default} {{name=Instinct}} {{Result:=[[1d20+@{Instinct}]]}}'></button><br />
-		<label>Agility</label><strong class='ability'></strong><input type="number" name='attr_agility' class='sheet-short'><button type='roll' name='roll_agility' value='&{template:default} {{name=Agility}} {{Result:=[[1d20+@{Agility}]]}}'></button><br />
-		<label>Fortitude</label><strong class='ability'></strong><input type="number" name='attr_fortitude' class='sheet-short'><button type='roll' name='roll_fortitude' value='&{template:default} {{name=Fortitude}} {{Result:=[[1d20+@{Fortitude}]]}}'></button><br />
-		<label>Intelligence</label><strong class='ability'></strong><input type="number" name='attr_intelligence' class='sheet-short' ><button type='roll' name='roll_intelligence' value='&{template:default} {{name=Intelligence}} {{Result:=[[1d20+@{Intelligence}]]}}'></button><br />
-		<label>Willpower</label><strong class='ability'></strong><input type="number" name='attr_willpower' class='sheet-short'><button type='roll' name='roll_willpower' value='&{template:default} {{name=Willpower}} {{Result:=[[1d20+@{Willpower}]]}}'></button><br />
+		<label>Strength</label><strong class='ability'></strong><button type='roll' name='roll_strength' value='&{template:default} {{name=Strength}} {{Result:=[[1d20+@{Strength}+@{Temp_Strength]]}}'></button><input type="number" name='attr_strength' class='sheet-short'>+<input type="number" name='attr_temp_strength' class='sheet-short'><br />
+		<label>Instinct</label><strong class='ability'></strong><button type='roll' name='roll_instinct' value='&{template:default} {{name=Instinct}} {{Result:=[[1d20+@{Instinct}+@{Temp_Instinct}]]}}'></button><input type="number" name='attr_instinct' class='sheet-short'>+<input type="number" name='attr_temp_instinct' class='sheet-short'><br />
+		<label>Agility</label><strong class='ability'></strong><button type='roll' name='roll_agility' value='&{template:default} {{name=Agility}} {{Result:=[[1d20+@{Agility}+@{Temp_Agility}]]}}'></button><input type="number" name='attr_agility' class='sheet-short'>+<input type="number" name='attr_temp_agility' class='sheet-short'><br />
+		<label>Fortitude</label><strong class='ability'></strong><button type='roll' name='roll_fortitude' value='&{template:default} {{name=Fortitude}} {{Result:=[[1d20+@{Fortitude}+@{Temp_Fortitude}]]}}'></button><input type="number" name='attr_fortitude' class='sheet-short'>+<input type="number" name='attr_temp_fortitude' class='sheet-short'><br />
+		<label>Intelligence</label><strong class='ability'></strong><button type='roll' name='roll_intelligence' value='&{template:default} {{name=Intelligence}} {{Result:=[[1d20+@{Intelligence}+@{Temp_Intelligence}]]}}'></button><input type="number" name='attr_intelligence' class='sheet-short' >+</button><input type="number" name='attr_temp_intelligence' class='sheet-short' ><br />
+		<label>Willpower</label><strong class='ability'></strong><button type='roll' name='roll_willpower' value='&{template:default} {{name=Willpower}} {{Result:=[[1d20+@{Willpower}+@{Temp_Willpower}]]}}'></button><input type="number" name='attr_willpower' class='sheet-short'>+<input type="number" name='attr_temp_willpower' class='sheet-short'><br />
 
 	</div>
-
+	
 	<div class="sheet-col">
 	    
 		<h2 style="margin-bottom: 10px;">Statistics</h2>
@@ -113,7 +113,7 @@
     <div class="sheet-col">
         
         <h3 style="margin-bottom: 10px;">Weapon</h3>
-        <button type='roll' name='roll_attack' value='&{template:default} {{name=@{Weapon}}} {{Attack:=[[1d20+@{Accuracy}+[[(@{Strikes}-1)*4]]]]}} {{Base Damage:=@{Damage}}} {{Range:=@{Range}}}'></button>
+        <button type='roll' name='roll_attack' value='&{template:default} {{name=@{Weapon}}} {{Attack:=[[1d20+@{Accuracy}+@{Temp_Acc}+[[(@{Strikes}-1)*4]]]]}} {{Base Damage:=@{Damage}+@{Temp_Dmg}}} {{Traits:=@{Traits}}}'></button>
         <input type="text" name="attr_weapon" />
         
     </div>
@@ -121,14 +121,14 @@
     <div class="sheet-col">
         
         <h3 style="margin-bottom: 10px;">Acc.</h3>
-        <input type="number" name="attr_accuracy" />
+        <input type="number" name="attr_accuracy" />+<input type="number" name="attr_temp_acc" />
         
     </div>
     
     <div class="sheet-col">
         
         <h3 style="margin-bottom: 10px;">Dmg.</h3>
-        <input type="number" name="attr_damage" />
+        <input type="number" name="attr_damage" />+<input type="number" name="attr_temp_dmg" />
         
     </div>
     
@@ -148,15 +148,15 @@
     
     <div class="sheet-col">
         
-        <h3 style="margin-bottom: 10px;">Range</h3>
-        <input type="text" name="attr_range" />
+        <h3 style="margin-bottom: 10px;">Traits</h3>
+        <input type="text" name="attr_traits" />
         
     </div>
     
 </div>
     
     <h3 style="margin-bottom: 10px;">Special Traits</h3>
-    <textarea name="attr_traits"></textarea>
+    <textarea name="attr_weapon_traits"></textarea>
 
 <div class="sheet-6colrow">
     
@@ -167,7 +167,7 @@
         <div class="sheet-col">
             
             <h3 style="margin-bottom: 10px;">Weapon</h3>
-            <button type='roll' name='roll_attack' value='&{template:default} {{name=@{Weapon}}} {{Attack:=[[1d20+@{Accuracy}+[[(@{Strikes}-1)*4]]]]}} {{Base Damage:=@{Damage}}} {{Range:=@{Range}}}'></button>
+            <button type='roll' name='roll_attack' value='&{template:default} {{name=@{Weapon}}} {{Attack:=[[1d20+@{Accuracy}+@{Temp_Acc}+[[(@{Strikes}-1)*4]]]]}} {{Base Damage:=@{Damage}+@{Temp_Dmg}}} {{Traits:=@{Traits}}}'></button>
             <input type="text" name="attr_weapon" />
             
         </div>
@@ -175,17 +175,17 @@
         <div class="sheet-col">
             
             <h3 style="margin-bottom: 10px;">Acc.</h3>
-            <input type="number" name="attr_accuracy" />
+            <input type="number" name="attr_accuracy" />+<input type="number" name="attr_temp_acc" />
             
         </div>
         
         <div class="sheet-col">
             
             <h3 style="margin-bottom: 10px;">Dmg.</h3>
-            <input type="number" name="attr_damage" />
+            <input type="number" name="attr_damage" />+<input type="number" name="attr_temp_dmg" />
             
         </div>
-        
+
         <div class="sheet-col">
             
             <h3 style="margin-bottom: 10px;">Strikes</h3>
@@ -202,13 +202,13 @@
         
         <div class="sheet-col">
             
-            <h3 style="margin-bottom: 10px;">Range</h3>
-            <input type="text" name="attr_range" />
+            <h3 style="margin-bottom: 10px;">Traits</h3>
+            <input type="text" name="attr_traits" />
             
         </div>
             
         <h3 style="margin-bottom: 10px;">Special Traits</h3>
-        <textarea name="attr_traits"></textarea>
+        <textarea name="attr_weapon_traits"></textarea>
         
     </fieldset>
         
@@ -481,10 +481,10 @@
     <div class="sheet-col">
         
         <h2 style="margin-bottom: 10px;"><br /></h2>
-        <button type='roll' style="margin-bottom: 2px;" name='roll_overload' value='&{template:default} {{name=Overload}} {{Result:=[[1d20+[[(@{Boost}*3)-@{Willpower}]]]]}}'>Overload</button>
+        <button type='roll' style="margin-bottom: 2px;" name='roll_overload' value='&{template:default} {{name=Overload}} {{Result:=[[1d20+[[(@{Boost}*3)-(@{Willpower}+@{Temp_Willpower})]]]]}}'>Overload</button>
         <input type="number" name='attr_boost' class='sheet-short'>(Enter Psi Boost)<br />
-        <button type='roll' style="margin-bottom: 2px;" name='roll_recovery' value='&{template:default} {{name=Recover}} {{Result (DC 10):=[[1d20+@{Willpower}]]}} {{Recovery:=[[@{Willpower}]] + (Result-10)}}'>Recover</button>
-	<button type='roll' style="margin-bottom: 2px;" name='roll_psi_attack' value='&{template:default} {{name=Psi Attack}} {{Result:=[[1d20+@{Psionics}+@{Intelligence}]]}}'>Psi Attack</button>
+        <button type='roll' style="margin-bottom: 2px;" name='roll_recovery' value='&{template:default} {{name=Recover}} {{Result:=[[1d20+@{Willpower}+@{Temp_Willpower})]]}} {{Recovery:=[[@{Willpower}+@{Temp_Willpower}]] + (Result-10)}}'>Recover</button><br />
+	<button type='roll' style="margin-bottom: 2px;" name='roll_psi_attack' value='&{template:default} {{name=Psi Attack}} {{Result:=[[1d20+@{Ranks_Psionics}+@{Intelligence}+@{Temp_Intelligence}]]}}'>Psi Attack</button>
 	<br />
     </div>
     
@@ -505,7 +505,7 @@
     <div class="sheet-col">
         
         <h3 style="margin-bottom: 10px;">Power</h3>
-        <button type='roll' name='roll_power' value='&{template:default} {{name=@{Power}}} {{Manifestation:=[[1d20+(@{Psi Bonus}-@{Psi Fatigue})]]}} {{DC:=@{Psi Dc}}} {{Range:=@{Psi Range}}} {{Energy Cost:=@{Cost}}}'></button>
+        <button type='roll' name='roll_power' value='&{template:default} {{name=@{Power}}} {{Manifestation:=[[1d20+(@{Psi_Bonus}-@{Psi_Fatigue})]]}} {{DC:=@{Psi_Dc}}} {{Energy Cost:=@{Cost}}}'></button>
         <input type="text" name="attr_power" />
         
     </div>
@@ -541,7 +541,7 @@
         <div class="sheet-col">
             
             <h3 style="margin-bottom: 10px;">Power</h3>
-            <button type='roll' name='roll_power' value='&{template:default} {{name=@{Power}}} {{Manifestation:=[[1d20+(@{Psi Bonus}-@{Psi Fatigue})]]}} {{DC:=@{Psi Dc}}} {{Range:=@{Psi Range}}} {{Energy Cost:=@{Cost}}}'></button>
+            <button type='roll' name='roll_power' value='&{template:default} {{name=@{Power}}} {{Manifestation:=[[1d20+(@{Psi_Bonus}-@{Psi_Fatigue})]]}} {{DC:=@{Psi_Dc}}} {{Energy Cost:=@{Cost}}}'></button>
             <input type="text" name="attr_power" />
             
         </div>