diff --git a/D6StarWars/D6StarWars.html b/D6StarWars/D6StarWars.html
index ff435600a7..d8abe0ebe5 100644
--- a/D6StarWars/D6StarWars.html
+++ b/D6StarWars/D6StarWars.html
@@ -83,7 +83,7 @@
                         </div>
                     </div>
                     <fieldset class="repeating_percskills"> <!---Perc Skills --->
-                        <button class="sheet-d6-dice"  type="roll" value="&{template:default} {{name=@{perc_skillname}}} {{Roll=[[(@{perc_skilldice} -1 +@{WoundStatus} +@{Force_ControlPain_ResistStun} + @{Force_Up} + ?{Dice mods|0})d6cf0cs7 + @{perc_skillpip} + ?{Other Mods(pip)|0} + 1d6!cf1cs6]]}}"></button>
+                        <button class="sheet-d6-dice"  type="roll" value="&{template:default} {{name=@{percskillname}}} {{Roll=[[(@{percskilldice} -1 +@{WoundStatus} +@{Force_ControlPain_ResistStun} + @{Force_Up} + ?{Dice mods|0})d6cf0cs7 + @{percskillpip} + ?{Other Mods(pip)|0} + 1d6!cf1cs6]]}}"></button>
                           <input class="sheet-skilltext" type="text" name="attr_percskillname"/> 
                           <div class="sheet-right">
                           <input type="number" name="attr_percskilldice" class="sheet-smallnumber sheet-shortnumber" min="1" value="@{percskilldice}"/>D+<input type="number" name="attr_percskillpip" class="sheet-smallnumber sheet-shortnumber" min="0" max="2" value="@{percskillpip}"/> 
@@ -97,10 +97,10 @@
                         </div>
                     </div>
                     <fieldset class="repeating_strskills"> <!---Str Skills --->
-                        <button class="sheet-d6-dice" type="roll" value="&{template:default} {{name=@{str_skillname}}} {{Roll=[[(@{str_skilldice} -1 +@{WoundStatus} +@{Force_ControlPain_ResistStun} + @{Force_Up} + ?{Dice mods|0})d6cf0cs7 + @{str_skillpip} + ?{Other Mods(pip)|0} + 1d6!cf1cs6]]}}"></button>
-                          <input class="sheet-skilltext" type="text" name="attr_str_skillname"/> 
+                        <button class="sheet-d6-dice" type="roll" value="&{template:default} {{name=@{strskillname}}} {{Roll=[[(@{strskilldice} -1 +@{WoundStatus} +@{Force_ControlPain_ResistStun} + @{Force_Up} + ?{Dice mods|0})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_str_skilldice" class="sheet-smallnumber sheet-shortnumber" min="1" value="@{strength}"/>D+<input type="number" name="attr_str_skillpip" class="sheet-smallnumber sheet-shortnumber" min="0" max="2" value="@{strengthpip}"/> 
+							<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}"/> 
                           </div>
                     </fieldset>
                 </td> 
@@ -111,10 +111,10 @@
                         </div>
                     </div>
                     <fieldset class="repeating_techskills">  <!---Tech Skills --->
-                        <button class="sheet-d6-dice"  type="roll" value="&{template:default} {{name=@{tech_skillname}}} {{Roll=[[(@{tech_skilldice} -1 +@{WoundStatus} +@{Force_ControlPain_ResistStun} + @{Force_Up} + ?{Dice mods|0})d6cf0cs7 + @{tech_skillpip} + ?{Other Mods(pip)|0} + 1d6!cf1cs6]]}}"></button>
-                          <input class="sheet-skilltext" type="text" name="attr_tech_skillname"/> 
+                        <button class="sheet-d6-dice"  type="roll" value="&{template:default} {{name=@{techskillname}}} {{Roll=[[(@{techskilldice} -1 +@{WoundStatus} +@{Force_ControlPain_ResistStun} + @{Force_Up} + ?{Dice mods|0})d6cf0cs7 + @{techskillpip} + ?{Other Mods(pip)|0} + 1d6!cf1cs6]]}}"></button>
+                          <input class="sheet-skilltext" type="text" name="attr_techskillname"/> 
                           <div class="sheet-right">
-                          <input type="number" name="attr_tech_skilldice" class="sheet-smallnumber sheet-shortnumber" min="1" value="@{technical}"/>D+<input type="number" name="attr_tech_skillpip" class="sheet-smallnumber sheet-shortnumber" min="0" max="2" value="@{technicalpip}"/> 
+                          <input type="number" name="attr_techskilldice" class="sheet-smallnumber sheet-shortnumber" min="1" value="@{technical}"/>D+<input type="number" name="attr_techskillpip" class="sheet-smallnumber sheet-shortnumber" min="0" max="2" value="@{technicalpip}"/> 
                           </div>
                     </fieldset>
                 </td class="sheet-tdborder"> 
@@ -127,10 +127,10 @@
                         </div>
                     </div>
                     <fieldset class="repeating_dexskills"> <!---Dex Skills --->
-                        <button class="sheet-d6-dice"  type="roll" value="&{template:default} {{name=@{dex_skillname}}} {{Roll=[[(@{dex_skilldice} -1 +@{WoundStatus} +@{Force_ControlPain_ResistStun} + @{Force_Up} + ?{Dice mods|0})d6cf0cs7 + @{dex_skillpip} + ?{Other Mods(pip)|0} + 1d6!cf1cs6]]}}"></button>
-                          <input class="sheet-skilltext" type="text" name="attr_dex_skillname"/>
+                        <button class="sheet-d6-dice"  type="roll" value="&{template:default} {{name=@{dexskillname}}} {{Roll=[[(@{dexskilldice} -1 +@{WoundStatus} +@{Force_ControlPain_ResistStun} + @{Force_Up} + ?{Dice mods|0})d6cf0cs7 + @{dexskillpip} + ?{Other Mods(pip)|0} + 1d6!cf1cs6]]}}"></button>
+                          <input class="sheet-skilltext" type="text" name="attr_dexskillname"/>
                           <div class="sheet-right">		
-                          <input type="number" name="attr_dex_skilldice" class="sheet-smallnumber sheet-shortnumber" min="1" value="@{dexterity}"/>D+<input type="number" name="attr_dex_skillpip" class="sheet-smallnumber sheet-shortnumber" min="0" max="2" value="@{dexteritypip}"/>
+                          <input type="number" name="attr_dexskilldice" class="sheet-smallnumber sheet-shortnumber" min="1" value="@{dexterity}"/>D+<input type="number" name="attr_dexskillpip" class="sheet-smallnumber sheet-shortnumber" min="0" max="2" value="@{dexteritypip}"/>
                           </div>
                     </fieldset>
                 </td>
@@ -141,10 +141,10 @@
                         </div>
                     </div>
                     <fieldset class="repeating_knowskills">  <!---Know Skills --->
-                        <button class="sheet-d6-dice"  type="roll" value="&{template:default} {{name=@{know_skillname}}} {{Roll=[[(@{know_skilldice} -1 +@{WoundStatus} +@{Force_ControlPain_ResistStun} + @{Force_Up} + ?{Dice mods|0})d6cf0cs7 + @{know_skillpip} + ?{Other Mods(pip)|0} + 1d6!cf1cs6]]}}"></button>
-                          <input class="sheet-skilltext" type="text" name="attr_know_skillname"/> 
+                        <button class="sheet-d6-dice"  type="roll" value="&{template:default} {{name=@{knowskillname}}} {{Roll=[[(@{knowskilldice} -1 +@{WoundStatus} +@{Force_ControlPain_ResistStun} + @{Force_Up} + ?{Dice mods|0})d6cf0cs7 + @{knowskillpip} + ?{Other Mods(pip)|0} + 1d6!cf1cs6]]}}"></button>
+                          <input class="sheet-skilltext" type="text" name="attr_knowskillname"/> 
                           <div class="sheet-right">
-                          <input type="number" name="attr_know_skilldice" class="sheet-smallnumber sheet-shortnumber" min="1" value="@{knowledge}"/>D+<input type="number" name="attr_know_skillpip" class="sheet-smallnumber sheet-shortnumber" min="0" max="2" value="@{knowledgepip}"/> 
+                          <input type="number" name="attr_knowskilldice" class="sheet-smallnumber sheet-shortnumber" min="1" value="@{knowledge}"/>D+<input type="number" name="attr_knowskillpip" class="sheet-smallnumber sheet-shortnumber" min="0" max="2" value="@{knowledgepip}"/> 
                           </div>
                     </fieldset>
                 </td> 
@@ -155,10 +155,10 @@
                         </div>
                     </div>
                     <fieldset class="repeating_mechskills">  <!---Mech Skills --->      
-                        <button class="sheet-d6-dice"  type="roll" value="&{template:default} {{name=@{mech_skillname}}} {{Roll=[[(@{mech_skilldice} -1 +@{WoundStatus} +@{Force_ControlPain_ResistStun} + @{Force_Up} + ?{Dice mods|0})d6cf0cs7 + @{mech_skillpip} + ?{Other Mods(pip)|0} + 1d6!cf1cs6]]}}"></button>
-                         <input class="sheet-skilltext" type="text" name="attr_mech_skillname"/> 
+                        <button class="sheet-d6-dice"  type="roll" value="&{template:default} {{name=@{mechskillname}}} {{Roll=[[(@{mechskilldice} -1 +@{WoundStatus} +@{Force_ControlPain_ResistStun} + @{Force_Up} + ?{Dice mods|0})d6cf0cs7 + @{mechskillpip} + ?{Other Mods(pip)|0} + 1d6!cf1cs6]]}}"></button>
+                         <input class="sheet-skilltext" type="text" name="attr_mechskillname"/> 
                          <div class="sheet-right">
-                         <input type="number" name="attr_mech_skilldice" class="sheet-smallnumber sheet-shortnumber" min="1" value="@{mechanicalpip}"/>D+<input type="number" name="attr_mech_skillpip" class="sheet-smallnumber sheet-shortnumber" min="0" max="2" value="@{mechanicalpip}"/> 
+                         <input type="number" name="attr_mechskilldice" class="sheet-smallnumber sheet-shortnumber" min="1" value="@{mechanicalpip}"/>D+<input type="number" name="attr_mechskillpip" class="sheet-smallnumber sheet-shortnumber" min="0" max="2" value="@{mechanicalpip}"/> 
                          </div>
                     </fieldset>
                 </td>