diff --git a/D6StarWars/D6StarWars.html b/D6StarWars/D6StarWars.html
index 023e414826..98459fde6b 100644
--- a/D6StarWars/D6StarWars.html
+++ b/D6StarWars/D6StarWars.html
@@ -71,7 +71,7 @@
             <tr>
                 <td class="sheet-tdborder">
                     <div class="sheet-bold">
-                        <button type='roll' class="astext" value='&{template:default} {{name=Perception}} {{Roll=[[{(((@{perception} -1 +@{WoundStatus} +@{Force_ControlPain_ResistStun} + ?{Multiple action penalty|No, ?{Force Concentration&#124;No&#44; 0 &#124; Yes&#44; 4 &#125;|-1|-2|-3|-4})*?{Force point|No,1)|Yes,2)+1})d6cf0cs7 + @{perceptionpip} + ?{Other Mods(pip)|0} + 1d6!cf1cs6}}]]}}' >Perception</button>
+                        <button type='roll' class="astext" value='&{template:default} {{name=Perception}} {{Roll=[[{(((@{perception} -1 +@{WoundStatus} +@{Force_ControlPain_ResistStun} + @{Force_Up} + ?{Multiple action penalty|No, ?{Force Concentration&#124;No&#44; 0 &#124; Yes&#44; 4 &#125;|-1|-2|-3|-4})*?{Force point|No,1)|Yes,2)+1})d6cf0cs7 + @{perceptionpip} + ?{Other Mods(pip)|0} + 1d6!cf1cs6}}]]}}' >Perception</button>
                         <div style="float:right;">
                             <input type="number" name="attr_perception" class="sheet-smallnumber"  min="1" value="3"/>D+<input type="number" name="attr_perceptionpip" class="sheet-smallnumber" min="0" max="2" value="0"/>
                         </div>
@@ -87,13 +87,13 @@
                 </td>
                 <td class="sheet-tdborder">
                     <div class="sheet-bold">
-                        <button type='roll' class="astext" value='&{template:default} {{name=Strength}} {{Roll=[[{(((@{strength} -1 +@{WoundStatus} +@{Force_ControlPain_ResistStun} + ?{Multiple action penalty|No, ?{Force Concentration&#124;No&#44; 0 &#124; Yes&#44; 4 &#125;|-1|-2|-3|-4})*?{Force point|No,1)|Yes,2)+1})d6cf0cs7 + @{strengthpip} + ?{Other Mods(pip)|0} + 1d6!cf1cs6}}]]}}' >Strength</button>
+                        <button type='roll' class="astext" value='&{template:default} {{name=Strength}} {{Roll=[[{(((@{strength} -1 +@{WoundStatus} +@{Force_ControlPain_ResistStun} + @{Force_Up} + ?{Multiple action penalty|No, ?{Force Concentration&#124;No&#44; 0 &#124; Yes&#44; 4 &#125;|-1|-2|-3|-4})*?{Force point|No,1)|Yes,2)+1})d6cf0cs7 + @{strengthpip} + ?{Other Mods(pip)|0} + 1d6!cf1cs6}}]]}}' >Strength</button>
                         <div style="float:right;">
                             <input type="number" name="attr_strength" class="sheet-smallnumber" min="1" value="3"/>D+<input type="number" name="attr_strengthpip" class="sheet-smallnumber" min="0" max="2" value="0"/>  
                         </div>
                     </div>
                     <fieldset class="repeating_strskills"> <!---Str Skills --->
-                        <button  type="roll" value="&{template:default} {{name=@{strskillname}}} {{Roll=[[{(((@{strskilldice} -1 +@{WoundStatus} +@{Force_ControlPain_ResistStun} + ?{Multiple action penalty|No, ?{Force Concentration&#124;No&#44; 0 &#124; Yes&#44; 4 &#125;|-1|-2|-3|-4})*?{Force point|No,1)|Yes,2)+1})d6cf0cs7 + @{strskillpip} + ?{Other Mods(pip)|0} + 1d6!cf1cs6}}]]}}"></button>
+                        <button  type="roll" value="&{template:default} {{name=@{strskillname}}} {{Roll=[[{(((@{strskilldice} -1 +@{WoundStatus} +@{Force_ControlPain_ResistStun} + @{Force_Up} + ?{Multiple action penalty|No, ?{Force Concentration&#124;No&#44; 0 &#124; Yes&#44; 4 &#125;|-1|-2|-3|-4})*?{Force point|No,1)|Yes,2)+1})d6cf0cs7 + @{strskillpip} + ?{Other Mods(pip)|0} + 1d6!cf1cs6}}]]}}"></button>
                           <input class="sheet-skilltext" type="text" name="attr_strskillname"/> 
                           <div class="sheet-right">
                           <input type="number" name="attr_strskilldice" class="sheet-smallnumber sheet-shortnumber" min="1" value="@{strength}"/>D+<input type="number" name="attr_strskillpip" class="sheet-smallnumber sheet-shortnumber" min="0" max="2" value="@{strengthpip}"/> 
@@ -102,7 +102,7 @@
                 </td> 
                 <td class="sheet-tdborder">
                     <div class="sheet-bold">
-                        <button type='roll' class="astext" value='&{template:default} {{name=Technical}} {{Roll=[[{(((@{technical} -1 +@{WoundStatus} +@{Force_ControlPain_ResistStun} + ?{Multiple action penalty|No, ?{Force Concentration&#124;No&#44; 0 &#124; Yes&#44; 4 &#125;|-1|-2|-3|-4})*?{Force point|No,1)|Yes,2)+1})d6cf0cs7 + @{technicalpip} + ?{Other Mods(pip)|0} + 1d6!cf1cs6}}]]}}' >Technical</button>
+                        <button type='roll' class="astext" value='&{template:default} {{name=Technical}} {{Roll=[[{(((@{technical} -1 +@{WoundStatus} +@{Force_ControlPain_ResistStun} + @{Force_Up} + ?{Multiple action penalty|No, ?{Force Concentration&#124;No&#44; 0 &#124; Yes&#44; 4 &#125;|-1|-2|-3|-4})*?{Force point|No,1)|Yes,2)+1})d6cf0cs7 + @{technicalpip} + ?{Other Mods(pip)|0} + 1d6!cf1cs6}}]]}}' >Technical</button>
                         <div style="float:right;">
                             <input type="number" name="attr_technical" class="sheet-smallnumber" min="1" value="3"/>D+<input type="number" name="attr_technicalpip" class="sheet-smallnumber" min="0" max="2" value="0"/>    
                         </div>
@@ -119,7 +119,7 @@
             <tr>
                 <td class="sheet-tdborder">
                     <div class="sheet-bold">
-                        <button type='roll'value='&{template:default} {{name=Dexterity}} {{Roll=[[{(((@{dexterity} -1 +@{WoundStatus} +@{Force_ControlPain_ResistStun} + ?{Multiple action penalty|No, ?{Force Concentration&#124;No&#44; 0 &#124; Yes&#44; 4 &#125;|-1|-2|-3|-4})*?{Force point|No,1)|Yes,2)+1})d6cf0cs7 + @{dexteritypip} + ?{Other Mods(pip)|0} + 1d6!cf1cs6}}]]}}' >Dexterity</button>
+                        <button type='roll'value='&{template:default} {{name=Dexterity}} {{Roll=[[{(((@{dexterity} -1 +@{WoundStatus} +@{Force_ControlPain_ResistStun} + @{Force_Up} + ?{Multiple action penalty|No, ?{Force Concentration&#124;No&#44; 0 &#124; Yes&#44; 4 &#125;|-1|-2|-3|-4})*?{Force point|No,1)|Yes,2)+1})d6cf0cs7 + @{dexteritypip} + ?{Other Mods(pip)|0} + 1d6!cf1cs6}}]]}}' >Dexterity</button>
                         <div style="float:right;">
                             <input type="number" name="attr_dexterity" class="sheet-smallnumber" min="1" value="3"/>D+<input type="number" name="attr_dexteritypip" class="sheet-smallnumber" min="0" max="2" value="0"/>
                         </div>
@@ -134,7 +134,7 @@
                 </td>
                 <td class="sheet-tdborder">
                     <div class="sheet-bold">
-                        <button type='roll' value='&{template:default} {{name=Knowledge}} {{Roll=[[{(((@{knowledge} -1 +@{WoundStatus} +@{Force_ControlPain_ResistStun} + ?{Multiple action penalty|No, ?{Force Concentration&#124;No&#44; 0 &#124; Yes&#44; 4 &#125;|-1|-2|-3|-4})*?{Force point|No,1)|Yes,2)+1})d6cf0cs7 + @{knowledgepip} + ?{Other Mods(pip)|0} + 1d6!cf1cs6}}]]}}' >Knowledge</button>
+                        <button type='roll' value='&{template:default} {{name=Knowledge}} {{Roll=[[{(((@{knowledge} -1 +@{WoundStatus} +@{Force_ControlPain_ResistStun} + @{Force_Up} + ?{Multiple action penalty|No, ?{Force Concentration&#124;No&#44; 0 &#124; Yes&#44; 4 &#125;|-1|-2|-3|-4})*?{Force point|No,1)|Yes,2)+1})d6cf0cs7 + @{knowledgepip} + ?{Other Mods(pip)|0} + 1d6!cf1cs6}}]]}}' >Knowledge</button>
                         <div style="float:right;">
                             <input type="number" name="attr_knowledge" class="sheet-smallnumber" min="1" value="3"/>D+<input type="number" name="attr_knowledgepip" class="sheet-smallnumber" min="0" max="2" value="0"/>
                         </div>
@@ -149,7 +149,7 @@
                 </td> 
                 <td class="sheet-tdborder">
                     <div class="sheet-bold">
-                        <button  type='roll' value='&{template:default} {{name=Mechanical}} {{Roll=[[{(((@{mechanical} -1 +@{WoundStatus} +@{Force_ControlPain_ResistStun} + ?{Multiple action penalty|No, ?{Force Concentration&#124;No&#44; 0 &#124; Yes&#44; 4 &#125;|-1|-2|-3|-4})*?{Force point|No,1)|Yes,2)+1})d6cf0cs7 + @{mechanicalpip} + ?{Other Mods(pip)|0} + 1d6!cf1cs6}}]]}}' >Mechanical</button>
+                        <button  type='roll' value='&{template:default} {{name=Mechanical}} {{Roll=[[{(((@{mechanical} -1 +@{WoundStatus} +@{Force_ControlPain_ResistStun} + @{Force_Up} + ?{Multiple action penalty|No, ?{Force Concentration&#124;No&#44; 0 &#124; Yes&#44; 4 &#125;|-1|-2|-3|-4})*?{Force point|No,1)|Yes,2)+1})d6cf0cs7 + @{mechanicalpip} + ?{Other Mods(pip)|0} + 1d6!cf1cs6}}]]}}' >Mechanical</button>
                         <div style="float:right;">
                             <input type="number" name="attr_mechanical" class="sheet-smallnumber" min="1" value="3"/>D+<input type="number" name="attr_mechanicalpip" class="sheet-smallnumber" min="0" max="2" value="0"/>
                         </div>
@@ -193,7 +193,7 @@
 			<input class="sheet-smallnumber sheet-shortnumber" type="number" name="attr_ROF"/>
 			<input class="sheet-smallnumber sheet-shortnumber" type="number" name="attr_Ammo"/>
 			
-						<button  type="roll" value="/r (@{damagedice} - 1)d6 + 1d6! + @{damagepip}">Damage</button>		  
+						<button  type="roll" value="&{template:default} {{name=@{weapon}}} {{Roll=[[({@{damagedice}- 1)d6cf0cs7 + @{damagepip},1d6!cf1cs6}]]}}">Damage</button>		  
     </div>
 
 	<div id="Armor" class="sheet-section">
@@ -211,8 +211,7 @@
 			<input class="sheet-skilltext" type="text" name="attr_armor1_other"/>
 			<button  type="roll" value="&{template:default} {{name=Damage Soak (Physical)}} {{Roll=[[({@{armor1PhDice} +@{strength} +@{WoundStatus} +@{Force_ControlPain_ResistStun} - 1)d6cf0cs7 + @{armor1PhPip},1d6!cf1cs6}]]}}">Soak Physical</button>
 			<button  type="roll" value="&{template:default} {{name=Damage Soak (Energy)}} {{Roll=[[({@{armor1EnDice} +@{strength} +@{WoundStatus} +@{Force_ControlPain_ResistStun} - 1)d6cf0cs7 + @{armor1EnPip},1d6!cf1cs6}]]}}">Soak Energy</button>
-			<button  type="roll" value="&{template:default} {{name=Damage Soak (Energy)}} {{Roll=[[({@{strength} +@{WoundStatus} +@{Force_ControlPain_ResistStun} - 1)d6cf0cs7,1d6!cf1cs6}]]}}">Soak</button>
-        	  
+			<button  type="roll" value="&{template:default} {{name=Damage Soak}} {{Roll=[[({@{strength} +@{WoundStatus} +@{Force_ControlPain_ResistStun} - 1)d6cf0cs7,1d6!cf1cs6}]]}}">Soak</button>	  
     </div>
 	
     <div id="Force" class="sheet-section" style="text-align: Left; position:relative;">
@@ -223,7 +222,7 @@
                     <tr>
                         <td style="width:260px;">
                             <div class="sheet-bold">
-                                <button class="sheet-forcebutton" type='roll' class="astext" value='&{template:default} {{name=Force: Control}} {{Roll=[[{(((@{control} -1 +@{WoundStatus} +@{Force_ControlPain_ResistStun} + ?{Multiple action penalty|No, ?{Force Concentration&#124;No&#44; 0 &#124; Yes&#44; 4 &#125;|-1|-2|-3|-4})*?{Force point|No,1)|Yes,2)+1})d6cf0cs7 + @{controlpip} + ?{Other Mods(pip)|0} + @{Force_Emptiness} + 1d6!cf1cs6}}]]}}' > Control</button>
+                                <button class="sheet-forcebutton" type='roll' class="astext" value='&{template:default} {{name=Force: Control}} {{Roll=[[{(((@{control} -1 +@{WoundStatus} +@{Force_ControlPain_ResistStun} + @{Force_Up} + ?{Multiple action penalty|No, ?{Force Concentration&#124;No&#44; 0 &#124; Yes&#44; 4 &#125;|-1|-2|-3|-4})*?{Force point|No,1)|Yes,2)+1})d6cf0cs7 + @{controlpip} + ?{Other Mods(pip)|0} + @{Force_Emptiness} + 1d6!cf1cs6}}]]}}' > Control</button>
                                 <div style="float:right;">
                                     <input type="number" name="attr_control" class="sheet-smallnumber"  min="0" value="0"/>D 
                                     +<input type="number" name="attr_controlpip" class="sheet-smallnumber" min="0" max="2" value="0"/>
@@ -234,7 +233,7 @@
                     <tr>
                         <td style="width:260px;">
                             <div class="sheet-bold">
-                                <button class="sheet-forcebutton" type='roll' class="astext" value='&{template:default} {{name=Force: Sense}} {{Roll=[[{(((@{sense} -1 +@{WoundStatus} +@{Force_ControlPain_ResistStun} + ?{Multiple action penalty|No, ?{Force Concentration&#124;No&#44; 0 &#124; Yes&#44; 4 &#125;|-1|-2|-3|-4})*?{Force point|No,1)|Yes,2)+1})d6cf0cs7 + @{sensepip} + ?{Other Mods(pip)|0} + @{Force_Emptiness} + 1d6!cf1cs6}}]]}}' > Sense</button>
+                                <button class="sheet-forcebutton" type='roll' class="astext" value='&{template:default} {{name=Force: Sense}} {{Roll=[[{(((@{sense} -1 +@{WoundStatus} +@{Force_ControlPain_ResistStun} + @{Force_Up} + ?{Multiple action penalty|No, ?{Force Concentration&#124;No&#44; 0 &#124; Yes&#44; 4 &#125;|-1|-2|-3|-4})*?{Force point|No,1)|Yes,2)+1})d6cf0cs7 + @{sensepip} + ?{Other Mods(pip)|0} + @{Force_Emptiness} + 1d6!cf1cs6}}]]}}' > Sense</button>
                                 <div style="float:right;">
                                     <input type="number" name="attr_sense" class="sheet-smallnumber" style="margin-left=100px;"  min="0" value="0"/>D
                                     +<input type="number" name="attr_sensepip" class="sheet-smallnumber" min="0" max="2" value="0"/>  
@@ -245,7 +244,7 @@
                     <tr>    
                         <td style="width:260px;">
                             <div class="sheet-bold">
-                                <button class="sheet-forcebutton" type='roll' class="astext" value='&{template:default} {{name=Force: Alter}} {{Roll=[[{(((@{alter} -1 +@{WoundStatus} +@{Force_ControlPain_ResistStun} + ?{Multiple action penalty|No, ?{Force Concentration&#124;No&#44; 0 &#124; Yes&#44; 4 &#125;|-1|-2|-3|-4})*?{Force point|No,1)|Yes,2)+1})d6cf0cs7 + @{alterpip} + ?{Other Mods(pip)|0} + @{Force_Emptiness} + 1d6!cf1cs6}}]]}}' > Alter</button>
+                                <button class="sheet-forcebutton" type='roll' class="astext" value='&{template:default} {{name=Force: Alter}} {{Roll=[[{(((@{alter} -1 +@{WoundStatus} +@{Force_ControlPain_ResistStun} + @{Force_Up} + ?{Multiple action penalty|No, ?{Force Concentration&#124;No&#44; 0 &#124; Yes&#44; 4 &#125;|-1|-2|-3|-4})*?{Force point|No,1)|Yes,2)+1})d6cf0cs7 + @{alterpip} + ?{Other Mods(pip)|0} + @{Force_Emptiness} + 1d6!cf1cs6}}]]}}' > Alter</button>
                                 <div style="float:right;">
                                     <input type="number" name="attr_alter" class="sheet-smallnumber" min="0" value="0"/>D 
                                     +<input type="number" name="attr_alterpip" class="sheet-smallnumber" min="0" max="2" value="0"/>    
@@ -272,6 +271,16 @@
 					  <option value="0" selected="selected">No</option>
 					  <option value="-@{WoundStatus}">Yes</option>
 					</select>
+            </div>
+			<div class='sheet-col'>
+                <label style="padding-top:8px; padding-bottom:12px;">Force powers active?</label><!---gives penalty to all rolls thanks to concentration/distraction --->
+					<select name="attr_Force_Up" class="sheet-smallselect">
+					  <option value="0" selected="selected">No</option>
+					  <option value="-1">1</option>
+					  <option value="-2">2</option>
+					  <option value="-3">3</option>
+					  <option value="-4">4</option>
+					</select>
             </div>
         </div>
     </div>