diff --git a/Starcraft RPG/starcraft.html b/Starcraft RPG/starcraft.html
index d7dbea3403..6dad92d9b6 100644
--- a/Starcraft RPG/starcraft.html	
+++ b/Starcraft RPG/starcraft.html	
@@ -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}+[[(@{Strikes}-1)*4]]]]}} {{Base Damage:=@{Damage}}}'></button>
         <input type="text" name="attr_weapon" />
         
     </div>
@@ -156,7 +156,7 @@
 </div>
     
     <h3 style="margin-bottom: 10px;">Special Traits</h3>
-    <textarea name="attr_traits"></textarea>
+    <textarea></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}+[[(@{Strikes}-1)*4]]]]}} {{Base Damage:=@{Damage}}}'></button>
             <input type="text" name="attr_weapon" />
             
         </div>
@@ -208,7 +208,7 @@
         </div>
             
         <h3 style="margin-bottom: 10px;">Special Traits</h3>
-        <textarea name="attr_traits"></textarea>
+        <textarea></textarea>
         
     </fieldset>
         
@@ -457,12 +457,12 @@
 <hr />
 
 <h3 style="margin-bottom: 10px;">Specializations/ Evolutions/ Classes/ Directives/ Mutations:</h3>
-<textarea name="attr_specs"></textarea>
+<textarea></textarea>
 
 <hr />
 
 <h3 style="margin-bottom: 10px;">Talents</h3>
-<textarea name="attr_talents"></textarea>
+<textarea></textarea>
 
 <hr />
 
@@ -483,16 +483,14 @@
         <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>
         <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>
-	<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><br />
     </div>
     
     <div class="sheet-col">
         
         <h2 style="margin-bottom: 10px;"><br /></h2>
         <label>Powers</label><strong class='psionics'></strong>
-        <textarea name="attr_powers"></textarea>
+        <textarea></textarea>
         
     </div>
     
@@ -505,15 +503,15 @@
     <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+@{Accuracy}]]}} {{Effect:=@{Effect}}}'></button>
         <input type="text" name="attr_power" />
         
     </div>
     
     <div class="sheet-col">
         
-        <h3 style="margin-bottom: 10px;">DC</h3>
-        <input type="number" name="attr_psi_dc" />
+        <h3 style="margin-bottom: 10px;">Acc.</h3>
+        <input type="number" name="attr_psi_accuracy" />
         
     </div>
     
@@ -526,7 +524,7 @@
     
     <div class="sheet-col">
         
-        <h3 style="margin-bottom: 10px;">Energy Cost</h3>
+        <h3 style="margin-bottom: 10px;">PP Cost</h3>
         <input type="text" name="attr_cost" />
         
     </div>
@@ -541,15 +539,15 @@
         <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+@{Accuracy}]]}} {{Effect:=@{Effect}}}'></button>
             <input type="text" name="attr_power" />
             
         </div>
         
         <div class="sheet-col">
             
-            <h3 style="margin-bottom: 10px;">DC</h3>
-            <input type="number" name="attr_psi_dc" />
+            <h3 style="margin-bottom: 10px;">Acc.</h3>
+            <input type="number" name="attr_psi_accuracy" />
             
         </div>
         
@@ -562,7 +560,7 @@
         
         <div class="sheet-col">
             
-            <h3 style="margin-bottom: 10px;">Energy Cost</h3>
+            <h3 style="margin-bottom: 10px;">PP Cost</h3>
             <input type="text" name="attr_cost" />
             
         </div>
@@ -641,24 +639,24 @@
 <h2 style="margin-bottom: 10px;">Equipment</h2>            
 <label>Carry Weight <input type="number" name='attr_current_weight' class='sheet-short'>/<input type="number" name='attr_max_weight' class='sheet-short'></label><strong class='carry'></strong><br />
 <label>Backpack <input type="number" name='attr_current_backpack' class='sheet-short'>/<input type="number" name='attr_max_backpack' class='sheet-short'></label><strong class='carry'></strong>
-<textarea name="attr_pack"></textarea>
+<textarea></textarea>
 <label>Equipment Belt <input type="number" name='attr_current_belt1' class='sheet-short'>/<input type="number" name='attr_max_belt1' class='sheet-short'></label><strong class='carry'></strong>
-<textarea name="attr_belt1"></textarea>
+<textarea></textarea>
 <label>Equipment Belt <input type="number" name='attr_current_belt2' class='sheet-short'>/<input type="number" name='attr_max_belt2' class='sheet-short'></label><strong class='carry'></strong>
-<textarea name="attr_belt2"></textarea>
+<textarea></textarea>
 <label>Equipment Belt <input type="number" name='attr_current_belt3' class='sheet-short'>/<input type="number" name='attr_max_belt3' class='sheet-short'></label><strong class='carry'></strong>
-<textarea name="attr_belt3"></textarea>
+<textarea></textarea>
 <label>Carrying Case <input type="number" name='attr_current_case' class='sheet-short'>/<input type="number" name='attr_max_case' class='sheet-short'></label><strong class='carry'></strong>
-<textarea name="attr_case"></textarea>
+<textarea></textarea>
 <label>Equipped Items</label><strong class='carry'></strong>
-<textarea name="attr_equipped"></textarea>
+<textarea></textarea>
 
 <hr />
 
 <label>Special Traits and Abilities</label><strong class='traits'></strong>
-<textarea name="attr_special"></textarea>
+<textarea></textarea>
 
 <hr />
 
 <label>Other</label><strong class='other'></strong>
-<textarea name="attr_other"></textarea>
\ No newline at end of file
+<textarea></textarea>
\ No newline at end of file