diff --git a/Star Wars Saga Edition/StarWarsSagaEdition.css b/Star Wars Saga Edition/StarWarsSagaEdition.css
index f542dbe77b..b3f6a248e5 100644
--- a/Star Wars Saga Edition/StarWarsSagaEdition.css	
+++ b/Star Wars Saga Edition/StarWarsSagaEdition.css	
@@ -41,7 +41,7 @@
     width: 160px; 
 }
 
-.charsheet input[type=number] {
+.charsheet input.sheet-skills{
     width:42px !important; 
 }
     
diff --git a/Star Wars Saga Edition/StarWarsSagaEdition.html b/Star Wars Saga Edition/StarWarsSagaEdition.html
index 0a237d0fa7..2fd5b4f149 100644
--- a/Star Wars Saga Edition/StarWarsSagaEdition.html	
+++ b/Star Wars Saga Edition/StarWarsSagaEdition.html	
@@ -346,7 +346,7 @@
 					<tr>
 						<td class="skillsCol1">Acrobatics</td>
 						<td><button type="roll" name="roll_AcrobaticsCheck" value="Acrobatics [[1d20 + @{Acrobatics} + ?{Other Modifiers|0}]]" title="Roll Acrobatics"></button></td>
-						<td><input type="number" name="attr_Acrobatics" value="@{level|max}+@{AcrobaticsMod}+@{AcrobaticsFeat}+@{AcrobaticsFeat|max}+@{AcrobaticsMisc}+@{CT}" disabled="true" title="Acrobatics Total" /></td> <td>&nbsp;=&nbsp;</td>	
+						<td><input type="number" name="attr_Acrobatics" value="@{level|max}+@{AcrobaticsMod}+@{AcrobaticsFeat}+@{AcrobaticsFeat|max}+@{AcrobaticsMisc}+@{CT}" disabled="true" title="Acrobatics Total" class="skills" /></td> <td>&nbsp;=&nbsp;</td>	
 						<td><select name="attr_AcrobaticsMod" class="modtype" title="Acrobatics Mod (default DEX)">
 							  <option value="@{str|max}">STR</option>
 							  <option value="@{dex|max}" selected>DEX</option>
@@ -357,12 +357,12 @@
 							</select></td>
 						<td><input type="checkbox" value="5" name="attr_AcrobaticsFeat" title="Trained in Acrobatics?" /></td> <!-- Skill Training -->
 						<td><input type="checkbox" value="5" name="attr_AcrobaticsFeat_max" title="Focused in Acrobatics?" /></td> <!-- Skill Focus -->
-						<td><input type="number" name="attr_AcrobaticsMisc" title="Acrobatics Miscellaneous Modifier" value="0" /></td>
+						<td><input type="number" name="attr_AcrobaticsMisc" title="Acrobatics Miscellaneous Modifier" value="0" class="skills" /></td>
 					</tr>				
 					<tr>
 						<td class="skillsCol1">Climb</td>
 						<td><button type="roll" name="roll_ClimbCheck" value="Climb [[ 1d20 + @{Climb} + ?{Other Modifiers|0}]]" title="Roll "></button></td>
-						<td><input type="number" name="attr_Climb" value="@{level|max}+@{ClimbMod}+@{ClimbFeat}+@{ClimbFeat|max}+@{ClimbMisc}+@{CT}" disabled="true" title="Climb Total" /></td> <td>&nbsp;=&nbsp;</td>
+						<td><input type="number" class="skills name="attr_Climb" value="@{level|max}+@{ClimbMod}+@{ClimbFeat}+@{ClimbFeat|max}+@{ClimbMisc}+@{CT}" disabled="true" title="Climb Total" /></td> <td>&nbsp;=&nbsp;</td>
 						<td><select name="attr_ClimbMod" class="modtype" title="Climb Mod (default STR)">
 							  <option value="@{str|max}" selected>STR</option>
 							  <option value="@{dex|max}">DEX</option>
@@ -373,12 +373,12 @@
 							</select></td>
 						<td><input type="checkbox" value="5" name="attr_ClimbFeat" title="Trained in Climb?" /></td> <!-- Skill Training -->
 						<td><input type="checkbox" value="5" name="attr_ClimbFeat_max" title="Focused in Climb?" /></td> <!-- Skill Focus -->
-						<td><input type="number" name="attr_ClimbMisc" title="Climb Miscellaneous Modifier" value="0" /></td>
+						<td><input type="number" class="skills" name="attr_ClimbMisc" title="Climb Miscellaneous Modifier" value="0" /></td>
 					</tr>				
 					<tr>
 						<td class="skillsCol1">Deception</td>
 						<td><button type="roll" name="roll_DeceptionCheck" value="Deception [[ 1d20 + @{Deception} + ?{Other Modifiers|0}]]" title="Roll Deception"></button></td>
-						<td><input type="number" name="attr_Deception" value="@{level|max}+@{DeceptionMod}+@{DeceptionFeat}+@{DeceptionFeat|max}+@{DeceptionMisc}+@{CT}" disabled="true" title="Deception Total" /></td> <td>&nbsp;=&nbsp;</td>	
+						<td><input type="number" class="skills name="attr_Deception" value="@{level|max}+@{DeceptionMod}+@{DeceptionFeat}+@{DeceptionFeat|max}+@{DeceptionMisc}+@{CT}" disabled="true" title="Deception Total" /></td> <td>&nbsp;=&nbsp;</td>	
 						<td><select name="attr_DeceptionMod" class="modtype" title="Deception Mod (default DEX)">
 							  <option value="@{str|max}">STR</option>
 							  <option value="@{dex|max}" selected>DEX</option>
@@ -389,12 +389,12 @@
 							</select></td>
 						<td><input type="checkbox" value="5" name="attr_DeceptionFeat" title="Trained in Deception?" /></td> <!-- Skill Training -->
 						<td><input type="checkbox" value="5" name="attr_DeceptionFeat_max" title="Focused in Deception?" /></td> <!-- Skill Focus -->
-						<td><input type="number" name="attr_DeceptionMisc" title="Deception Miscellaneous Modifier" value="0" /></td>
+						<td><input type="number" class="skills name="attr_DeceptionMisc" title="Deception Miscellaneous Modifier" value="0" /></td>
 					</tr>
 					<tr>
 						<td class="skillsCol1">Endurance</td>
 						<td><button type="roll" name="roll_EnduranceCheck" value="Endurance [[ 1d20 + @{Endurance} + ?{Other Modifiers|0}]]" title="Roll Endurance"></button></td>
-						<td><input type="number" name="attr_Endurance" value="@{level|max}+@{EnduranceMod}+@{EnduranceFeat}+@{EnduranceFeat|max}+@{EnduranceMisc}+@{CT}" disabled="true" title="Endurance Total" /></td> <td>&nbsp;=&nbsp;</td>	
+						<td><input type="number" class="skills" name="attr_Endurance" value="@{level|max}+@{EnduranceMod}+@{EnduranceFeat}+@{EnduranceFeat|max}+@{EnduranceMisc}+@{CT}" disabled="true" title="Endurance Total" /></td> <td>&nbsp;=&nbsp;</td>	
 						<td><select name="attr_EnduranceMod" class="modtype" title="Endurance Mod (default CON)">
 							  <option value="@{str|max}">STR</option>
 							  <option value="@{dex|max}">DEX</option>
@@ -405,12 +405,12 @@
 							</select></td>
 						<td><input type="checkbox" value="5" name="attr_EnduranceFeat" title="Trained in Endurance?" /></td> <!-- Skill Training -->
 						<td><input type="checkbox" value="5" name="attr_EnduranceFeat_max" title="Focused in Endurance?" /></td> <!-- Skill Focus -->
-						<td><input type="number" name="attr_EnduranceMisc" title="Endurance Miscellaneous Modifier" value="0" /></td>
+						<td><input type="number" class="skills" name="attr_EnduranceMisc" title="Endurance Miscellaneous Modifier" value="0" /></td>
 					</tr>
 					<tr>
 						<td class="skillsCol1">Gather Information</td>
 						<td><button type="roll" name="roll_GatherInformationCheck" value="Gather Information [[ 1d20 + @{GatherInformation} + ?{Other Modifiers|0}]]" title="Roll "></button></td>
-						<td><input type="number" name="attr_GatherInformation" value="@{level|max}+@{GatherInformationMod}+@{GatherInformationFeat}+@{GatherInformationFeat|max}+@{GatherInformationMisc}+@{CT}" disabled="true" title="Gather Information Total" /></td> <td>&nbsp;=&nbsp;</td>	
+						<td><input type="number" class="skills" name="attr_GatherInformation" value="@{level|max}+@{GatherInformationMod}+@{GatherInformationFeat}+@{GatherInformationFeat|max}+@{GatherInformationMisc}+@{CT}" disabled="true" title="Gather Information Total" /></td> <td>&nbsp;=&nbsp;</td>	
 						<td><select name="attr_GatherInformationMod" class="modtype" title="GatherInformation Mod (default CHA)">
 							  <option value="@{str|max}">STR</option>
 							  <option value="@{dex|max}">DEX</option>
@@ -421,12 +421,12 @@
 							</select></td>
 						<td><input type="checkbox" value="5" name="attr_GatherInformationFeat" title="Trained in Gather Information?" /></td> <!-- Skill Training -->
 						<td><input type="checkbox" value="5" name="attr_GatherInformationFeat_max" title="Focused in Gather Information?" /></td> <!-- Skill Focus -->
-						<td><input type="number" name="attr_GatherInformationMisc" title="Gather Information Miscellaneous Modifier" value="0" /></td>
+						<td><input type="number" class="skills" name="attr_GatherInformationMisc" title="Gather Information Miscellaneous Modifier" value="0" /></td>
 					</tr>
 					<tr>
 						<td class="skillsCol1">Initiative</td>
 						<td><button type="roll" name="roll_InitiativeCheck" value="Initiative [[ 1d20 + @{Initiative} + ?{Other Modifiers|0}]]"  title="Roll Initiative"></button></td>
-						<td><input type="number" name="attr_Initiative" value="@{level|max}+@{InitiativeMod}+@{InitiativeFeat}+@{InitiativeFeat|max}+@{InitiativeMisc}+@{CT}" disabled="true" title="Initiative Total" /></td> <td>&nbsp;=&nbsp;</td>	
+						<td><input type="number" class="skills" name="attr_Initiative" value="@{level|max}+@{InitiativeMod}+@{InitiativeFeat}+@{InitiativeFeat|max}+@{InitiativeMisc}+@{CT}" disabled="true" title="Initiative Total" /></td> <td>&nbsp;=&nbsp;</td>	
 						<td><select name="attr_InitiativeMod" class="modtype" title="Initiative Mod (default DEX)">
 							  <option value="@{str|max}">STR</option>
 							  <option value="@{dex|max}" selected>DEX</option>
@@ -437,12 +437,12 @@
 							</select></td>
 						<td><input type="checkbox" value="5" name="attr_InitiativeFeat" title="Trained in Initiative?" /></td> <!-- Skill Training -->
 						<td><input type="checkbox" value="5" name="attr_InitiativeFeat_max" title="Focused in Initiative?" /></td> <!-- Skill Focus -->
-						<td><input type="number" name="attr_InitiativeMisc" title="Initiative Miscellaneous Modifier" value="0" /></td>
+						<td><input type="number" class="skills" name="attr_InitiativeMisc" title="Initiative Miscellaneous Modifier" value="0" /></td>
 					</tr>
 					<tr>
 						<td class="skillsCol1">Jump</td>
 						<td><button type="roll" name="roll_JumpCheck" value="Jump [[ 1d20 + @{Jump} + ?{Other Modifiers|0}]]" title="Roll Jump"></button></td>
-						<td><input type="number" name="attr_Jump" value="@{level|max}+@{JumpMod}+@{JumpFeat|max}+@{JumpFeat}+@{JumpMisc}+@{CT}" disabled="true" title="Jump Total" /></td> <td>&nbsp;=&nbsp;</td>	
+						<td><input type="number" class="skills" name="attr_Jump" value="@{level|max}+@{JumpMod}+@{JumpFeat|max}+@{JumpFeat}+@{JumpMisc}+@{CT}" disabled="true" title="Jump Total" /></td> <td>&nbsp;=&nbsp;</td>	
 						<td><select name="attr_JumpMod" class="modtype" title="Jump Mod (default STR)">
 							  <option value="@{str|max}" selected>STR</option>
 							  <option value="@{dex|max}">DEX</option>
@@ -453,12 +453,12 @@
 							</select></td>
 						<td><input type="checkbox" value="5" name="attr_JumpFeat" title="Trained in Jump?" /></td> <!-- Skill Training -->
 						<td><input type="checkbox" value="5" name="attr_JumpFeat_max" title="Focused in Jump?" /></td> <!-- Skill Focus -->
-						<td><input type="number" name="attr_JumpMisc" title="Jump Miscellaneous Modifier" value="0" /></td>
+						<td><input type="number" class="skills" name="attr_JumpMisc" title="Jump Miscellaneous Modifier" value="0" /></td>
 					</tr>
 					<tr>
 						<td class="skillsCol1">Bureaucracy<br /><div class="small">Knowledge</div></td>
 						<td><button type="roll" name="roll_Knowledge-BureaucracyCheck" value="Knowledge (Bureaucracy) [[ 1d20 + @{Knowledge-Bureaucracy} + ?{Other Modifiers|0}]]" title="Roll Knowledge (Bureaucracy)"></button></td>
-						<td><input type="number" name="attr_Knowledge-Bureaucracy" value="@{level|max}+@{Knowledge-BureaucracyMod}+@{Knowledge-BureaucracyFeat}+@{Knowledge-BureaucracyFeat|max}+@{Knowledge-BureaucracyMisc}+@{CT}" disabled="true" title="Knowledge (Bureaucracy) Total" /></td> <td>&nbsp;=&nbsp;</td>	
+						<td><input type="number" class="skills" name="attr_Knowledge-Bureaucracy" value="@{level|max}+@{Knowledge-BureaucracyMod}+@{Knowledge-BureaucracyFeat}+@{Knowledge-BureaucracyFeat|max}+@{Knowledge-BureaucracyMisc}+@{CT}" disabled="true" title="Knowledge (Bureaucracy) Total" /></td> <td>&nbsp;=&nbsp;</td>	
 						<td><select name="attr_Knowledge-BureaucracyMod" class="modtype" title="Knowledge (Bureaucracy) Mod (default INT)">
 							  <option value="@{str|max}">STR</option>
 							  <option value="@{dex|max}">DEX</option>
@@ -469,12 +469,12 @@
 							</select></td>
 						<td><input type="checkbox" value="5" name="attr_Knowledge-BureaucracyFeat" title="Trained in Knowledge (Bureaucracy)?" /></td> <!-- Skill Training -->
 						<td><input type="checkbox" value="5" name="attr_Knowledge-BureaucracyFeat_max" title="Focused in Knowledge (Bureaucracy)?" /></td> <!-- Skill Focus -->
-						<td><input type="number" name="attr_Knowledge-BureaucracyMisc" title="Knowledge (Bureaucracy) Miscellaneous Modifier" value="0" /></td>
+						<td><input type="number" class="skills" name="attr_Knowledge-BureaucracyMisc" title="Knowledge (Bureaucracy) Miscellaneous Modifier" value="0" /></td>
 					</tr>
 					<tr>
 						<td class="skillsCol1">Galactic Lore<br /><div class="small">Knowledge</div></td>
 						<td><button type="roll" name="roll_Knowledge-GalacticLoreCheck" value="Knowledge (Galactic Lore) [[ 1d20 + @{Knowledge-GalacticLore} + ?{Other Modifiers|0}]]" title="Roll "></button></td>
-						<td><input type="number" name="attr_Knowledge-GalacticLore" value="@{level|max}+@{Knowledge-GalacticLoreMod}+@{Knowledge-GalacticLoreFeat}+@{Knowledge-GalacticLoreFeat|max}+@{Knowledge-GalacticLoreMisc}+@{CT}" disabled="true" title="Knowledge (Galactic Lore) Total" /></td> <td>&nbsp;=&nbsp;</td>	
+						<td><input type="number" class="skills" name="attr_Knowledge-GalacticLore" value="@{level|max}+@{Knowledge-GalacticLoreMod}+@{Knowledge-GalacticLoreFeat}+@{Knowledge-GalacticLoreFeat|max}+@{Knowledge-GalacticLoreMisc}+@{CT}" disabled="true" title="Knowledge (Galactic Lore) Total" /></td> <td>&nbsp;=&nbsp;</td>	
 						<td><select name="attr_Knowledge-GalacticLoreMod" class="modtype" title="Knowledge (Galactic Lore) Mod (default INT)">
 							  <option value="@{str|max}">STR</option>
 							  <option value="@{dex|max}">DEX</option>
@@ -485,12 +485,12 @@
 							</select></td>
 						<td><input type="checkbox" value="5" name="attr_Knowledge-GalacticLoreFeat" title="Trained in Knowledge (Galactic Lore)?" /></td> <!-- Skill Training -->
 						<td><input type="checkbox" value="5" name="attr_Knowledge-GalacticLoreFeat_max" title="Focused in Knowledge (Galactic Lore)?" /></td> <!-- Skill Focus -->
-						<td><input type="number" name="attr_Knowledge-GalacticLoreMisc" title="Knowledge (Galactic Lore) Miscellaneous Modifier" value="0" /></td>
+						<td><input type="number" class="skills" name="attr_Knowledge-GalacticLoreMisc" title="Knowledge (Galactic Lore) Miscellaneous Modifier" value="0" /></td>
 					</tr>
 					<tr>
 						<td class="skillsCol1">Life Sciences<br /><div class="small">Knowledge</div></td>
 						<td><button type="roll" name="roll_Knowledge-LifeSciencesCheck" value="Knowledge (Life Sciences) [[ 1d20 + @{Knowledge-LifeSciences} + ?{Other Modifiers|0}]]" title="Roll Knowledge (Life Sciences)"></button></td>
-						<td><input type="number" name="attr_Knowledge-LifeSciences" value="@{level|max}+@{Knowledge-LifeSciencesMod}+@{Knowledge-LifeSciencesFeat}+@{Knowledge-LifeSciencesFeat|max}+@{Knowledge-LifeSciencesMisc}+@{CT}" disabled="true" title="Knowledge (Life Sciences) Total" /></td> <td>&nbsp;=&nbsp;</td>	
+						<td><input type="number" class="skills" name="attr_Knowledge-LifeSciences" value="@{level|max}+@{Knowledge-LifeSciencesMod}+@{Knowledge-LifeSciencesFeat}+@{Knowledge-LifeSciencesFeat|max}+@{Knowledge-LifeSciencesMisc}+@{CT}" disabled="true" title="Knowledge (Life Sciences) Total" /></td> <td>&nbsp;=&nbsp;</td>	
 						<td><select name="attr_Knowledge-LifeSciencesMod" class="modtype" title="Knowledge (Life Sciences) Mod (default INT)">
 							  <option value="@{str|max}">STR</option>
 							  <option value="@{dex|max}">DEX</option>
@@ -501,12 +501,12 @@
 							</select></td>
 						<td><input type="checkbox" value="5" name="attr_Knowledge-LifeSciencesFeat" title="Trained in Knowledge (Life Sciences)?" /></td> <!-- Skill Training -->
 						<td><input type="checkbox" value="5" name="attr_Knowledge-LifeSciencesFeat_max" title="Focused in Knowledge (Life Sciences)?" /></td> <!-- Skill Focus -->
-						<td><input type="number" name="attr_Knowledge-LifeSciencesMisc" title="Knowledge (Life Sciences) Miscellaneous Modifier" value="0" /></td>
+						<td><input type="number" class="skills" name="attr_Knowledge-LifeSciencesMisc" title="Knowledge (Life Sciences) Miscellaneous Modifier" value="0" /></td>
 					</tr>
 					<tr>
 						<td class="skillsCol1">Physical Science<br /><div class="small">Knowledge</div></td>
 						<td><button type="roll" name="roll_Knowledge-PhysicalScienceCheck" value="Knowledge (Physical Science) [[ 1d20 + @{Knowledge-PhysicalScience} + ?{Other Modifiers|0}]]" title="Roll Knowledge (Physical Science)"></button></td>
-						<td><input type="number" name="attr_Knowledge-PhysicalScience" value="@{level|max}+@{Knowledge-PhysicalScienceMod}+@{Knowledge-PhysicalScienceFeat}+@{Knowledge-PhysicalScienceFeat|max}+@{Knowledge-PhysicalScienceMisc}+@{CT}" disabled="true" title="Knowledge (Physical Science) Total" /></td> <td>&nbsp;=&nbsp;</td>	
+						<td><input type="number" class="skills" name="attr_Knowledge-PhysicalScience" value="@{level|max}+@{Knowledge-PhysicalScienceMod}+@{Knowledge-PhysicalScienceFeat}+@{Knowledge-PhysicalScienceFeat|max}+@{Knowledge-PhysicalScienceMisc}+@{CT}" disabled="true" title="Knowledge (Physical Science) Total" /></td> <td>&nbsp;=&nbsp;</td>	
 						<td><select name="attr_Knowledge-PhysicalScienceMod" class="modtype" title="Knowledge (Physical Science) Mod (default INT)">
 							  <option value="@{str|max}">STR</option>
 							  <option value="@{dex|max}">DEX</option>
@@ -517,12 +517,12 @@
 							</select></td>
 						<td><input type="checkbox" value="5" name="attr_Knowledge-PhysicalScienceFeat" title="Trained in Knowledge (Physical Science)?" /></td> <!-- Skill Training -->
 						<td><input type="checkbox" value="5" name="attr_Knowledge-PhysicalScienceFeat_max" title="Focused in Knowledge (Physical Science)?" /></td> <!-- Skill Focus -->
-						<td><input type="number" name="attr_Knowledge-PhysicalScienceMisc" title="Knowledge (Physical Science) Miscellaneous Modifier" value="0" /></td>
+						<td><input type="number" class="skills" name="attr_Knowledge-PhysicalScienceMisc" title="Knowledge (Physical Science) Miscellaneous Modifier" value="0" /></td>
 					</tr>
 					<tr>
 						<td class="skillsCol1">Social Science<br /><div class="small">Knowledge</div></td>
 						<td><button type="roll" name="roll_Knowledge-SocialScienceCheck" value="Knowledge (Social Science) [[ 1d20 + @{Knowledge-SocialScience} + ?{Other Modifiers|0}]]" title="Roll "></button></td>
-						<td><input type="number" name="attr_Knowledge-SocialScience" value="@{level|max}+@{Knowledge-SocialScienceMod}+@{Knowledge-SocialScienceFeat}+@{Knowledge-SocialScienceFeat|max}+@{Knowledge-SocialScienceMisc}+@{CT}" disabled="true" title="Knowledge (Social Science) Total" /></td> <td>&nbsp;=&nbsp;</td>	
+						<td><input type="number" class="skills" name="attr_Knowledge-SocialScience" value="@{level|max}+@{Knowledge-SocialScienceMod}+@{Knowledge-SocialScienceFeat}+@{Knowledge-SocialScienceFeat|max}+@{Knowledge-SocialScienceMisc}+@{CT}" disabled="true" title="Knowledge (Social Science) Total" /></td> <td>&nbsp;=&nbsp;</td>	
 						<td><select name="attr_Knowledge-SocialScienceMod" class="modtype" title="Knowledge (Social Science) Mod (default INT)">
 							  <option value="@{str|max}">STR</option>
 							  <option value="@{dex|max}">DEX</option>
@@ -533,12 +533,12 @@
 							</select></td>
 						<td><input type="checkbox" value="5" name="attr_Knowledge-SocialScienceFeat" title="Trained in Knowledge (Social Science)?" /></td> <!-- Skill Training -->
 						<td><input type="checkbox" value="5" name="attr_Knowledge-SocialScienceFeat_max" title="Focused in Knowledge (Social Science)?" /></td> <!-- Skill Focus -->
-						<td><input type="number" name="attr_Knowledge-SocialScienceMisc" title="Knowledge (Social Science) Miscellaneous Modifier" value="0" /></td>
+						<td><input type="number" class="skills" name="attr_Knowledge-SocialScienceMisc" title="Knowledge (Social Science) Miscellaneous Modifier" value="0" /></td>
 					</tr>
 					<tr>
 						<td class="skillsCol1">Tactics<br /><div class="small">Knowledge</div></td>
 						<td><button type="roll" name="roll_Knowledge-TacticsCheck" value="Knowledge (Tactics) [[ 1d20 + @{Knowledge-Tactics} + ?{Other Modifiers|0}]]" title="Roll Knowledge (Tactics)"></button></td>
-						<td><input type="number" name="attr_Knowledge-Tactics" value="@{level|max}+@{Knowledge-TacticsMod}+@{Knowledge-TacticsFeat}+@{Knowledge-TacticsFeat|max}+@{Knowledge-TacticsMisc}+@{CT}" disabled="true" title="Knowledge (Tactics) Total" /></td> <td>&nbsp;=&nbsp;</td>	
+						<td><input type="number" class="skills" name="attr_Knowledge-Tactics" value="@{level|max}+@{Knowledge-TacticsMod}+@{Knowledge-TacticsFeat}+@{Knowledge-TacticsFeat|max}+@{Knowledge-TacticsMisc}+@{CT}" disabled="true" title="Knowledge (Tactics) Total" /></td> <td>&nbsp;=&nbsp;</td>	
 						<td><select name="attr_Knowledge-TacticsMod" class="modtype" title="Knowledge (Tactics) Mod (default INT)">
 							  <option value="@{str|max}">STR</option>
 							  <option value="@{dex|max}">DEX</option>
@@ -549,12 +549,12 @@
 							</select></td>
 						<td><input type="checkbox" value="5" name="attr_Knowledge-TacticsFeat" title="Trained in Knowledge (Tactics)?" /></td> <!-- Skill Training -->
 						<td><input type="checkbox" value="5" name="attr_Knowledge-TacticsFeat_max" title="Focused in Knowledge (Tactics)?" /></td> <!-- Skill Focus -->
-						<td><input type="number" name="attr_Knowledge-TacticsMisc" title="Knowledge (Tactics) Miscellaneous Modifier" value="0" /></td>
+						<td><input type="number" class="skills" name="attr_Knowledge-TacticsMisc" title="Knowledge (Tactics) Miscellaneous Modifier" value="0" /></td>
 					</tr>
 					<tr>
 						<td class="skillsCol1">Technology<br /><div class="small">Knowledge</div></td>
 						<td><button type="roll" name="roll_Knowledge-TechnologyCheck" value="Knowledge (Technology) [[ 1d20 + @{Knowledge-Technology} + ?{Other Modifiers|0}]]" title="Roll Knowledge (Technology)"></button></td>
-						<td><input type="number" name="attr_Knowledge-Technology" value="@{level|max}+@{Knowledge-TechnologyMod}+@{Knowledge-TechnologyFeat}+@{Knowledge-TechnologyFeat|max}+@{Knowledge-TechnologyMisc}+@{CT}" disabled="true" title="Knowledge (Technology) Total" /></td> <td>&nbsp;=&nbsp;</td>	
+						<td><input type="number" class="skills" name="attr_Knowledge-Technology" value="@{level|max}+@{Knowledge-TechnologyMod}+@{Knowledge-TechnologyFeat}+@{Knowledge-TechnologyFeat|max}+@{Knowledge-TechnologyMisc}+@{CT}" disabled="true" title="Knowledge (Technology) Total" /></td> <td>&nbsp;=&nbsp;</td>	
 						<td><select name="attr_Knowledge-TechnologyMod" class="modtype" title="Knowledge (Technology) Mod (default INT)">
 							  <option value="@{str|max}">STR</option>
 							  <option value="@{dex|max}">DEX</option>
@@ -565,12 +565,12 @@
 							</select></td>
 						<td><input type="checkbox" value="5" name="attr_Knowledge-TechnologyFeat" title="Trained in Knowledge (Technology)?" /></td> <!-- Skill Training -->
 						<td><input type="checkbox" value="5" name="attr_Knowledge-TechnologyFeat_max" title="Focused in Knowledge (Technology)?" /></td> <!-- Skill Focus -->
-						<td><input type="number" name="attr_Knowledge-TechnologyMisc" title="Knowledge (Technology) Miscellaneous Modifier" value="0" /></td>
+						<td><input type="number" class="skills" name="attr_Knowledge-TechnologyMisc" title="Knowledge (Technology) Miscellaneous Modifier" value="0" /></td>
 					</tr>
 					<tr>
 						<td class="skillsCol1">Mechanics</td>
 						<td><button type="roll" name="roll_MechanicsCheck" value="Mechanics [[ 1d20 + @{Mechanics} + ?{Other Modifiers|0}]]" title="Roll Mechanics"></button></td>
-						<td><input type="number" name="attr_Mechanics" value="@{level|max}+@{MechanicsMod}+@{MechanicsFeat|max}+@{MechanicsFeat}+@{MechanicsMisc}+@{CT}" disabled="true" title="Mechanics Total" /></td> <td>&nbsp;=&nbsp;</td>	
+						<td><input type="number" class="skills" name="attr_Mechanics" value="@{level|max}+@{MechanicsMod}+@{MechanicsFeat|max}+@{MechanicsFeat}+@{MechanicsMisc}+@{CT}" disabled="true" title="Mechanics Total" /></td> <td>&nbsp;=&nbsp;</td>	
 						<td><select name="attr_MechanicsMod" class="modtype" title="Mechanics Mod (default INT)">
 							  <option value="@{str|max}">STR</option>
 							  <option value="@{dex|max}">DEX</option>
@@ -581,12 +581,12 @@
 							</select></td>
 						<td><input type="checkbox" value="5" name="attr_MechanicsFeat" title="Trained in Mechanics?" /></td> <!-- Skill Training -->
 						<td><input type="checkbox" value="5" name="attr_MechanicsFeat_max" title="Focused in Mechanics?" /></td> <!-- Skill Focus -->
-						<td><input type="number" name="attr_MechanicsMisc" title="Mechanics Miscellaneous Modifier" value="0" /></td>
+						<td><input type="number" class="skills" name="attr_MechanicsMisc" title="Mechanics Miscellaneous Modifier" value="0" /></td>
 					</tr>
 					<tr>
 						<td class="skillsCol1">Perception</td>
 						<td><button type="roll" name="roll_PerceptionCheck" value="Perception [[ 1d20 + @{Perception} + ?{Other Modifiers|0}]]" title="Roll Perception"></button></td>
-						<td><input type="number" name="attr_Perception" value="@{level|max}+@{PerceptionMod}+@{PerceptionFeat|max}+@{PerceptionFeat}+@{PerceptionMisc}+@{CT}" disabled="true" title="Perception Total" /></td> <td>&nbsp;=&nbsp;</td>	
+						<td><input type="number" class="skills" name="attr_Perception" value="@{level|max}+@{PerceptionMod}+@{PerceptionFeat|max}+@{PerceptionFeat}+@{PerceptionMisc}+@{CT}" disabled="true" title="Perception Total" /></td> <td>&nbsp;=&nbsp;</td>	
 						<td><select name="attr_PerceptionMod" class="modtype" title="Perception Mod (default WIS)">
 							  <option value="@{str|max}">STR</option>
 							  <option value="@{dex|max}">DEX</option>
@@ -597,12 +597,12 @@
 							</select></td>
 						<td><input type="checkbox" value="5" name="attr_PerceptionFeat" title="Trained in Perception?" /></td> <!-- Skill Training -->
 						<td><input type="checkbox" value="5" name="attr_PerceptionFeat_max" title="Focused in Perception?" /></td> <!-- Skill Focus -->
-						<td><input type="number" name="attr_PerceptionMisc" title="Perception Miscellaneous Modifier" value="0" /></td>
+						<td><input type="number" class="skills" name="attr_PerceptionMisc" title="Perception Miscellaneous Modifier" value="0" /></td>
 					</tr>
 					<tr>
 						<td class="skillsCol1">Persuasion</td>
 						<td><button type="roll" name="roll_PersuasionCheck" value="Persuasion [[ 1d20 + @{Persuasion} + ?{Other Modifiers|0}]]" title="Roll Persuasion"></button></td>
-						<td><input type="number" name="attr_Persuasion" value="@{level|max}+@{PersuasionMod}+@{PersuasionFeat|max}+@{PersuasionFeat}+@{PersuasionMisc}+@{CT}" disabled="true" title="Persuasion Total" /></td> <td>&nbsp;=&nbsp;</td>	
+						<td><input type="number" class="skills" name="attr_Persuasion" value="@{level|max}+@{PersuasionMod}+@{PersuasionFeat|max}+@{PersuasionFeat}+@{PersuasionMisc}+@{CT}" disabled="true" title="Persuasion Total" /></td> <td>&nbsp;=&nbsp;</td>	
 						<td><select name="attr_PersuasionMod" class="modtype" title="Persuasion Mod (default CHA)">
 							  <option value="@{str|max}">STR</option>
 							  <option value="@{dex|max}">DEX</option>
@@ -613,12 +613,12 @@
 							</select></td>
 						<td><input type="checkbox" value="5" name="attr_PersuasionFeat" title="Trained in Persuasion?" /></td> <!-- Skill Training -->
 						<td><input type="checkbox" value="5" name="attr_PersuasionFeat_max" title="Focused in Persuasion?" /></td> <!-- Skill Focus -->
-						<td><input type="number" name="attr_PersuasionMisc" title="Persuasion Miscellaneous Modifier" value="0" /></td>
+						<td><input type="number" class="skills" name="attr_PersuasionMisc" title="Persuasion Miscellaneous Modifier" value="0" /></td>
 					</tr>
 					<tr>
 						<td class="skillsCol1">Pilot</td>
 						<td><button type="roll" name="roll_PilotCheck" value="Pilot [[ 1d20 + @{Pilot} + ?{Other Modifiers|0}]]" title="Roll "></button></td>
-						<td><input type="number" name="attr_Pilot" value="@{level|max}+@{PilotMod}+@{PilotFeat|max}+@{PilotFeat}+@{PilotMisc}+@{CT}" disabled="true" title="Pilot Total" /></td> <td>&nbsp;=&nbsp;</td>	
+						<td><input type="number" class="skills" name="attr_Pilot" value="@{level|max}+@{PilotMod}+@{PilotFeat|max}+@{PilotFeat}+@{PilotMisc}+@{CT}" disabled="true" title="Pilot Total" /></td> <td>&nbsp;=&nbsp;</td>	
 						<td><select name="attr_PilotMod" class="modtype" title="Pilot Mod (default DEX)">
 							  <option value="@{str|max}">STR</option>
 							  <option value="@{dex|max}" selected>DEX</option>
@@ -629,12 +629,12 @@
 							</select></td>
 						<td><input type="checkbox" value="5" name="attr_PilotFeat" title="Trained in Pilot?" /></td> <!-- Skill Training -->
 						<td><input type="checkbox" value="5" name="attr_PilotFeat_max" title="Focused in Pilot?" /></td> <!-- Skill Focus -->
-						<td><input type="number" name="attr_PilotMisc" title="Pilot Miscellaneous Modifier" value="0" /></td>
+						<td><input type="number" class="skills" name="attr_PilotMisc" title="Pilot Miscellaneous Modifier" value="0" /></td>
 					</tr>
 					<tr>
 						<td class="skillsCol1">Ride</td>
 						<td><button type="roll" name="roll_RideCheck" value="Ride [[ 1d20 + @{Ride} + ?{Other Modifiers|0}]]" title="Roll Ride"></button></td>
-						<td><input type="number" name="attr_Ride" value="@{level|max}+@{RideMod}+@{RideFeat}+@{RideFeat|max}+@{RideMisc}+@{CT}" disabled="true" title="Ride Total" /></td> <td>&nbsp;=&nbsp;</td>	
+						<td><input type="number" class="skills" name="attr_Ride" value="@{level|max}+@{RideMod}+@{RideFeat}+@{RideFeat|max}+@{RideMisc}+@{CT}" disabled="true" title="Ride Total" /></td> <td>&nbsp;=&nbsp;</td>	
 						<td><select name="attr_RideMod" class="modtype" title="Ride Mod (default STR)">
 							  <option value="@{str|max}" selected>STR</option>
 							  <option value="@{dex|max}">DEX</option>
@@ -645,12 +645,12 @@
 							</select></td>
 						<td><input type="checkbox" value="5" name="attr_RideFeat" title="Trained in ?" /></td> <!-- Skill Training -->
 						<td><input type="checkbox" value="5" name="attr_RideFeat_max" title="Focused in Ride?" /></td> <!-- Skill Focus -->
-						<td><input type="number" name="attr_RideMisc" title="Ride Miscellaneous Modifier" value="0" /></td>
+						<td><input type="number" class="skills" name="attr_RideMisc" title="Ride Miscellaneous Modifier" value="0" /></td>
 					</tr>
 					<tr>
 						<td class="skillsCol1">Stealth</td>
 						<td><button type="roll" name="roll_StealthCheck" value="Stealth [[ 1d20 + @{Stealth} + ?{Other Modifiers|0}]]" title="Roll Stealth"></button></td>
-						<td><input type="number" name="attr_Stealth" value="@{level|max}+@{StealthMod}+@{StealthFeat}+@{StealthFeat|max}+@{StealthMisc}+@{CT}" disabled="true" title="Stealth Total" /></td> <td>&nbsp;=&nbsp;</td>	
+						<td><input type="number" class="skills" name="attr_Stealth" value="@{level|max}+@{StealthMod}+@{StealthFeat}+@{StealthFeat|max}+@{StealthMisc}+@{CT}" disabled="true" title="Stealth Total" /></td> <td>&nbsp;=&nbsp;</td>	
 						<td><select name="attr_StealthMod" class="modtype" title="Stealth Mod (default DEX)">
 							  <option value="@{str|max}">STR</option>
 							  <option value="@{dex|max}" selected>DEX</option>
@@ -661,12 +661,12 @@
 							</select></td>
 						<td><input type="checkbox" value="5" name="attr_StealthFeat" title="Trained in Stealth?" /></td> <!-- Skill Training -->
 						<td><input type="checkbox" value="5" name="attr_StealthFeat_max" title="Focused in Stealth?" /></td> <!-- Skill Focus -->
-						<td><input type="number" name="attr_StealthMisc" title="Stealth Miscellaneous Modifier" value="0" /></td>
+						<td><input type="number" class="skills" name="attr_StealthMisc" title="Stealth Miscellaneous Modifier" value="0" /></td>
 					</tr>
 					<tr>
 						<td class="skillsCol1">Survival</td>
 						<td><button type="roll" name="roll_SurvivalCheck" value="Survival [[ 1d20 + @{Survival} + ?{Other Modifiers|0}]]" title="Roll Survival"></button></td>
-						<td><input type="number" name="attr_Survival" value="@{level|max}+@{SurvivalMod}+@{SurvivalFeat}+@{SurvivalFeat|max}+@{SurvivalMisc}+@{CT}" disabled="true" title="Survival Total" /></td> <td>&nbsp;=&nbsp;</td>	
+						<td><input type="number" class="skills" name="attr_Survival" value="@{level|max}+@{SurvivalMod}+@{SurvivalFeat}+@{SurvivalFeat|max}+@{SurvivalMisc}+@{CT}" disabled="true" title="Survival Total" /></td> <td>&nbsp;=&nbsp;</td>	
 						<td><select name="attr_SurvivalMod" class="modtype" title="Survival Mod (default WIS)">
 							  <option value="@{str|max}">STR</option>
 							  <option value="@{dex|max}">DEX</option>
@@ -677,12 +677,12 @@
 							</select></td>
 						<td><input type="checkbox" value="5" name="attr_SurvivalFeat" title="Trained in Survival?" /></td> <!-- Skill Training -->
 						<td><input type="checkbox" value="5" name="attr_SurvivalFeat_max" title="Focused in Survival?" /></td> <!-- Skill Focus -->
-						<td><input type="number" name="attr_SurvivalMisc" title="Survival Miscellaneous Modifier" value="0" /></td>
+						<td><input type="number" class="skills" name="attr_SurvivalMisc" title="Survival Miscellaneous Modifier" value="0" /></td>
 					</tr>
 					<tr>
 						<td class="skillsCol1">Swim</td>
 						<td><button type="roll" name="roll_SwimCheck" value="Swim [[ 1d20 + @{Swim} + ?{Other Modifiers|0}]]" title="Roll Swim"></button></td>
-						<td><input type="number" name="attr_Swim" value="@{level|max}+@{SwimMod}+@{SwimFeat}+@{SwimFeat|max}+@{SwimMisc}+@{CT}" disabled="true" title="Swim Total" /></td> <td>&nbsp;=&nbsp;</td>	
+						<td><input type="number" class="skills" name="attr_Swim" value="@{level|max}+@{SwimMod}+@{SwimFeat}+@{SwimFeat|max}+@{SwimMisc}+@{CT}" disabled="true" title="Swim Total" /></td> <td>&nbsp;=&nbsp;</td>	
 						<td><select name="attr_SwimMod" class="modtype" title="Swim Mod (default STR)">
 							  <option value="@{str|max}" selected>STR</option>
 							  <option value="@{dex|max}">DEX</option>
@@ -693,12 +693,12 @@
 							</select></td>
 						<td><input type="checkbox" value="5" name="attr_SwimFeat" title="Trained in Swim?" /></td> <!-- Skill Training -->
 						<td><input type="checkbox" value="5" name="attr_SwimFeat_max" title="Focused in Swim?" /></td> <!-- Skill Focus -->
-						<td><input type="number" name="attr_SwimMisc" title="Swim Miscellaneous Modifier" value="0" /></td>
+						<td><input type="number" class="skills" name="attr_SwimMisc" title="Swim Miscellaneous Modifier" value="0" /></td>
 					</tr>
 					<tr>
 						<td class="skillsCol1">Treat Injury</td>
 						<td><button type="roll" name="roll_TreatInjuryCheck" value="Treat Injury [[ 1d20 + @{TreatInjury} + ?{Other Modifiers|0}]]" title="Roll Treat Injury"></button></td>
-						<td><input type="number" name="attr_TreatInjury" value="@{level|max}+@{TreatInjuryMod}+@{TreatInjuryFeat}+@{TreatInjuryFeat|max}+@{TreatInjuryMisc}+@{CT}" disabled="true" title="Treat Injury Total" /></td> <td>&nbsp;=&nbsp;</td>	
+						<td><input type="number" class="skills" name="attr_TreatInjury" value="@{level|max}+@{TreatInjuryMod}+@{TreatInjuryFeat}+@{TreatInjuryFeat|max}+@{TreatInjuryMisc}+@{CT}" disabled="true" title="Treat Injury Total" /></td> <td>&nbsp;=&nbsp;</td>	
 						<td><select name="attr_TreatInjuryMod" class="modtype" title="Treat Injury Mod (default WIS)">
 							  <option value="@{str|max}">STR</option>
 							  <option value="@{dex|max}">DEX</option>
@@ -709,12 +709,12 @@
 							</select></td>
 						<td><input type="checkbox" value="5" name="attr_TreatInjuryFeat" title="Trained in Treat Injury?" /></td> <!-- Skill Training -->
 						<td><input type="checkbox" value="5" name="attr_TreatInjuryFeat_max" title="Focused in Treat Injury?" /></td> <!-- Skill Focus -->
-						<td><input type="number" name="attr_TreatInjuryMisc" title="Treat Injury Miscellaneous Modifier" value="0" /></td>
+						<td><input type="number" class="skills" name="attr_TreatInjuryMisc" title="Treat Injury Miscellaneous Modifier" value="0" /></td>
 					</tr>
 					<tr>
 						<td class="skillsCol1">Use Computer</td>
 						<td><button type="roll" name="roll_UseComputerCheck" value="Use Computer [[ 1d20 + @{UseComputer} + ?{Other Modifiers|0}]]" title="Roll Use Computer"></button></td>
-						<td><input type="number" name="attr_UseComputer" value="@{level|max}+@{UseComputerMod}+@{UseComputerFeat}+@{UseComputerFeat|max}+@{UseComputerMisc}+@{CT}" disabled="true" title="Use Computer Total" /></td> <td>&nbsp;=&nbsp;</td>	
+						<td><input type="number" class="skills" name="attr_UseComputer" value="@{level|max}+@{UseComputerMod}+@{UseComputerFeat}+@{UseComputerFeat|max}+@{UseComputerMisc}+@{CT}" disabled="true" title="Use Computer Total" /></td> <td>&nbsp;=&nbsp;</td>	
 						<td><select name="attr_UseComputerMod" class="modtype" title="Use Computer Mod (default INT)">
 							  <option value="@{str|max}">STR</option>
 							  <option value="@{dex|max}">DEX</option>
@@ -725,12 +725,12 @@
 							</select></td>
 						<td><input type="checkbox" value="5" name="attr_UseComputerFeat" title="Trained in Use Computer?" /></td> <!-- Skill Training -->
 						<td><input type="checkbox" value="5" name="attr_UseComputerFeat_max" title="Focused in Use Computer?" /></td> <!-- Skill Focus -->
-						<td><input type="number" name="attr_UseComputerMisc" title="Use Computer Miscellaneous Modifier" value="0" /></td>
+						<td><input type="number" class="skills" name="attr_UseComputerMisc" title="Use Computer Miscellaneous Modifier" value="0" /></td>
 					</tr>
 					<tr>
 						<td class="skillsCol1">Use the Force</td>
 						<td><button type="roll" name="roll_UsetheForceCheck" value="Use the Force [[ 1d20 + @{UsetheForce} + ?{Other Modifiers|0}]]" title="Roll Use the Force"></button></td>
-						<td><input type="number" name="attr_UsetheForce" value="@{level|max}+@{UsetheForceMod}+@{UsetheForceFeat}+@{UsetheForceFeat|max}+@{UsetheForceMisc}+@{CT}" disabled="true" title="Use the Force Total" /></td> <td>&nbsp;=&nbsp;</td>	
+						<td><input type="number" class="skills" name="attr_UsetheForce" value="@{level|max}+@{UsetheForceMod}+@{UsetheForceFeat}+@{UsetheForceFeat|max}+@{UsetheForceMisc}+@{CT}" disabled="true" title="Use the Force Total" /></td> <td>&nbsp;=&nbsp;</td>	
 						<td><select name="attr_UsetheForceMod" class="modtype" title="Use the Force  Mod (default CHA)">
 							  <option value="@{str|max}">STR</option>
 							  <option value="@{dex|max}">DEX</option>
@@ -741,7 +741,7 @@
 							</select></td>
 						<td><input type="checkbox" value="5" name="attr_UsetheForceFeat" title="Trained in Use the Force?" /></td> <!-- Skill Training -->
 						<td><input type="checkbox" value="5" name="attr_UsetheForceFeat_max" title="Focused in Use the Force?" /></td> <!-- Skill Focus -->
-						<td><input type="number" name="attr_UsetheForceMisc" title="Use the Force Miscellaneous Modifier" value="0" /></td>
+						<td><input type="number" class="skills" name="attr_UsetheForceMisc" title="Use the Force Miscellaneous Modifier" value="0" /></td>
 					</tr>
 				</tbody>
 			</table>
@@ -867,37 +867,37 @@
 					<td class="col1">STR<br><div class="small">Strength</div></td>
 					<td><input type="number" name="attr_STR" value="8" title="Strength Score" /></td>
 					<td><input type="number" name="attr_Str_max" value="floor(@{STR}/2-5)" disabled="true" title="Strength Modifier" /></td>
-					<td><button type="roll" name="roll_STRCheck" value="Strength [[ 1d20 + @{Str|max} +{CT} + ?{Other Modifiers|0}]]" title="Roll Strength"></button></td>
+					<td><button type="roll" name="roll_NPC-STRCheck" value="Strength [[ 1d20 + @{Str|max} +{CT} + ?{Other Modifiers|0}]]" title="Roll Strength"></button></td>
 				</tr>
 				<tr>
 					<td class="col1">DEX<br><div class="small">Dexterity</div></td>
 					<td><input type="number" name="attr_DEX" value="8" title="Dexterity Score" /></td>
 					<td><input type="number" name="attr_DEX_max" value="floor(@{DEX}/2-5)" disabled="true" title="Dexterity Modifier" /></td>
-					<td><button type="roll" name="roll_DEXCheck" value="Dexterity [[ 1d20 + @{dex|max} +{CT} + ?{Other Modifiers|0}]]" title="Roll Dexterity"></button></td>
+					<td><button type="roll" name="roll_NPC-DEXCheck" value="Dexterity [[ 1d20 + @{dex|max} +{CT} + ?{Other Modifiers|0}]]" title="Roll Dexterity"></button></td>
 				</tr>
 				<tr>
 					<td class="col1">CON<br><div class="small">Constitution</div></td>
 					<td><input type="number" name="attr_CON" value="8" title="Constitution Score" /></td>
 					<td><input type="number" name="attr_CON_max" value="floor(@{CON}/2-5)" disabled="true" title="Constitution Modifier" /></td>
-					<td><button type="roll" name="roll_CONCheck" value="Constitution [[ 1d20 + @{con|max} +{CT} + ?{Other Modifiers|0}]]" title="Roll Constitution"></button></td>
+					<td><button type="roll" name="roll_NPC-CONCheck" value="Constitution [[ 1d20 + @{con|max} +{CT} + ?{Other Modifiers|0}]]" title="Roll Constitution"></button></td>
 				</tr>
 				<tr>
 					<td class="col1">INT<br><div class="small">Intelligence</div></td>
 					<td><input type="number" name="attr_INT" value="8" title="Intelligence Score" /></td>
 					<td><input type="number" name="attr_INT_max" value="floor(@{INT}/2-5)" disabled="true" title="Intelligence Modifier" /></td>
-					<td><button type="roll" name="roll_INTCheck" value="Intelligence [[ 1d20 + @{int|max} +{CT} + ?{Other Modifiers|0}]]" title="Roll Intelligence"></button></td>
+					<td><button type="roll" name="roll_NPC-INTCheck" value="Intelligence [[ 1d20 + @{int|max} +{CT} + ?{Other Modifiers|0}]]" title="Roll Intelligence"></button></td>
 				</tr>
 				<tr>
 					<td class="col1">WIS<br><div class="small">Wisdom</div></td>
 					<td><input type="number" name="attr_WIS" value="8" title="Wisdom Score" /></td>
 					<td><input type="number" name="attr_WIS_max" value="floor(@{WIS}/2-5)" disabled="true" title="Wisdom Modifier" /></td>
-					<td><button type="roll" name="roll_WISCheck" value="Wisdom [[ 1d20 + @{wis|max} +{CT} + ?{Other Modifiers|0}]]" title="Roll Wisdom"></button></td>
+					<td><button type="roll" name="roll_NPC-WISCheck" value="Wisdom [[ 1d20 + @{wis|max} +{CT} + ?{Other Modifiers|0}]]" title="Roll Wisdom"></button></td>
 				</tr>
 				<tr>
 					<td class="col1">CHA<br><div class="small">Charisma</div></td>
 					<td><input type="number" name="attr_CHA" value="8" title="Charisma Score" /></td>
 					<td><input type="number" name="attr_CHA_max" value="floor(@{CHA}/2-5)" disabled="true" title="Charisma Modifier" /></td>
-					<td><button type="roll" name="roll_CHACheck" value="Charisma [[ 1d20 + @{cha|max} +{CT} + ?{Other Modifiers|0}]]" title="Roll Charisma"></button></td>
+					<td><button type="roll" name="roll_NPC-CHACheck" value="Charisma [[ 1d20 + @{cha|max} +{CT} + ?{Other Modifiers|0}]]" title="Roll Charisma"></button></td>
 				</tr>
 			  </tbody>
 			</table>
@@ -916,7 +916,7 @@
 						<input type="radio" value="20" name="attr_CT" /> Helpless</td>		
 				</tr>
 				<tr>	
-					<td> <input type="number" name="attr_HP" value="0" title="Current HP" /></td>
+					<td> <input type="number" name="attr_HP" value="0" title="Current HP"/></td>
 					<td>&nbsp;/&nbsp;</td>
 					<td><input type="number" name="attr_HP_max" value="0" title="Max HP" /></td>
 				</tr>
@@ -1017,25 +1017,25 @@
 				<tr>
 					<td class="col1" rowspan="2">Reflex</td>
 					<td></td>
-					<td><input type="number" name="attr_Reflex" value="@{RefTotal}+@{CT}" disabled="true"  title="Reflex" /></td> 
+					<td><input type="number" name="attr_NPC-Reflex" value="@{RefTotal}+@{CT}" disabled="true"  title="Reflex" /></td> 
 					<td><input type="text" name="attr_RefTotal" value="10+@{level}+@{Dex|max}"  title="Reflex Total (You can use formulas, for example: 10+@{level|max}+@{Dex|max} or enter the total Defence Score)"/></td>
 				</tr>
 				<tr>
 					<!-- rowspan placeholder -->
 					<td class="col1"><div class="small">Flatfooted</div></td>
-					<td><input type="number" name="attr_ReflexFlatFooted" value="@{RefTotal|max}+@{CT}" disabled="true"  title="Reflex Flat Footed" /></td>					 
+					<td><input type="number" name="attr_NPC-ReflexFlatFooted" value="@{RefTotal|max}+@{CT}" disabled="true"  title="Reflex Flat Footed" /></td>					 
 					<td><input type="text" name="attr_RefTotal_max" value="10+@{level}"  title="FlatFooted Reflex Total (You can use formulas, for example: 10+@{level} or enter the total Defence Score)"/></td>
 				</tr>
 				<tr>
 					<td class="col1">Fortitude</td>
 					<td rowspan="2"></td>
-					<td><input type="number" name="attr_Fortitude" value="@{FortTotal}+@{CT}" disabled="true" />					 
+					<td><input type="number" name="attr_NPC-Fortitude" value="@{FortTotal}+@{CT}" disabled="true" />					 
 					<td><input type="text" name="attr_FortTotal" value="10+@{level}+@{CON|max}"  title="Fortitude Total (You can use formulas, for example: 10+@{level} or enter the total Defence Score)"/></td>
 				</tr>
 				<tr>
 					<td class="col1">Will</td>					
 					<!-- rowspan placeholder -->
-					<td><input type="number" name="attr_Will" value="@{WillTotal}+@{CT}" disabled="true" /></td>					 
+					<td><input type="number" name="attr_NPC-Will" value="@{WillTotal}+@{CT}" disabled="true" /></td>					 
 					<td><input type="text" name="attr_WillTotal" value="10+@{level}+@{Wis|max}"  title="Will Total (You can use formulas, for example: 10+@{level} or enter the total Defence Score)"/></td>
 				</tr>
 			</table>
@@ -1060,7 +1060,7 @@
 						<tr>				
 							<!-- rowspan placholder -->
 							<td class="col1">Damage</td>
-							<td><input type="text" name="attr_damage" Value="2d8+(@{STR|max}*2)+@{level|max}"  style="width:100%" title="Weapon Damage (You can use formulas, for example: 2d8+(@{STR|max}*2)+@{level|max} or enter the entire Damage modifier)"/>	</td>
+							<td><input type="text" name="attr_damage" value="2d8+(@{STR|max}*2)+@{level|max}"  style="width:100%" title="Weapon Damage (You can use formulas, for example: 2d8+(@{STR|max}*2)+@{level|max} or enter the entire Damage roll for example 2d8+6)"/>	</td>
 							<td></td>		
 							<!-- rowspan placholder -->
 						</tr>
@@ -1123,7 +1123,7 @@
 				<table class="spacing">
 					<tr>
 						<td class="skillsCol1"><input type="text" name="attr_Skill" placeholder="Skill Name" title="Skill Name" /></td>
-						<td><button type="roll" name="roll_SkillCheck" value="<!-- @{gm-roll} -->@{SkillName} [[1d20+@{skill|max}+@{CT}+?{Other Modifiers|0}]]" title="Roll Skill"></button></td>
+						<td><button type="roll" name="roll_SkillCheck" value="<!-- @{gm-roll} -->@{Skill} [[1d20+@{skill|max}+@{CT}+?{Other Modifiers|0}]]" title="Roll Skill"></button></td>
 						<td><input type="number" name="attr_SkillTotal" value="@{skill|max}+@{CT}"  disabled="true" title="Skill Total Preview" /></td>
 					</tr>
 					<tr>