diff --git a/Star Wars Saga Edition/StarWarsSagaEdition.html b/Star Wars Saga Edition/StarWarsSagaEdition.html
index 0839f62ab8..24fd154c3a 100644
--- a/Star Wars Saga Edition/StarWarsSagaEdition.html	
+++ b/Star Wars Saga Edition/StarWarsSagaEdition.html	
@@ -5,43 +5,43 @@
 
 <div class="tab-content tab1">
     <div class="record"><img height="100px" width="300px" src="http://i.imgur.com/DzKBH23.png"/> <br />
-            	Character Record Sheet</div>
+            	<span data-i18n="character-sheet">Character Record Sheet</span></div>
     <div class="table left classHeader">
         <div class="table-row">
-			<span class="table-data long">	<label>Class:</label>		</span>
+			<span class="table-data long">	<label><span data-i18n="rank">Class:</span></label>		</span>
 			<span class="table-data">		<input type="text" name="attr_rank" title="List of class levels @{rank}" style="width:100%" />	</span>	
 		</div>
 	</div>
 	<div class="table left classHeader">
 		<div class="table-row">
-			<span class="table-data long"><label>Level:</label>		</span>
+			<span class="table-data long"><label><span data-i18n="level">Level:</span></label>		</span>
 			<span class="table-data">	<input type="number" name="attr_level" title="Total number of Heroic levels @{level}" value="1" /> <input type="number" name="attr_level_max" value="[[(floor((@{level}+@{nonlevel})/2))]]"  title="Half Level @{level|max}" disabled="true" /></span>
 			<span class="table-data" style="width:15px"></span>	
-			<span class="table-data"><label>Background:</label>		</span>
+			<span class="table-data"><label><span data-i18n="background">Background:</span></label>		</span>
 			<span class="table-data">	<input type="text" name="attr_background" title="Background @{Background}" class="header" /></span>
 		</div>
 		<div class="table-row">
-			<span class="table-data"><label>Species:</label>		</span>
+			<span class="table-data"><label><span data-i18n="species">Species:</span></label>		</span>
             <span class="table-data">	<input type="text" name="attr_species" title="Species @{Species}" class="header" /></span>
 			<span class="table-data"></span>
-			<span class="table-data"><label>Destiny:</label>		</span>
+			<span class="table-data"><label><span data-i18n="destiny">Destiny:</span></label>		</span>
             <span class="table-data">	<input type="text" name="attr_destiny" title="Destiny @{Destiny}" class="header" /></span>
 		</div>
 		<div class="table-row">
-			<span class="table-data"><label>Gender:</label>		</span>
+			<span class="table-data"><label><span data-i18n="gender">Gender:</span></label>		</span>
             <span class="table-data">	<input type="text" name="attr_gender" title="Gender @{Gender}" class="header" /></span>
 			<span class="table-data"></span>
-			<span class="table-data"><label>Size:</label>		</span>
+			<span class="table-data"><label><span data-i18n="size">Size:</span></label>		</span>
             <span class="table-data">	<select name="attr_Size" style="width:100%" title="Racial size. @{Size}">
-					<option value="Colossal">Colossal</option>                
-					<option value="Gargantuan">Gargantuan</option>
-					<option value="Huge">Huge</option>
-					<option value="Large">Large</option>
-					<option value="Medium" selected>Medium</option>
-					<option value="Small">Small</option>
-					<option value="Tiny">Tiny</option>
-					<option value="Diminutive">Diminutive</option>
-					<option value="Fine">Fine</option>
+					<option value="Colossal" data-i18n="size-colossal">Colossal</option>                
+					<option value="Gargantuan" data-i18n="size-gargantuan">Gargantuan</option>
+					<option value="Huge" data-i18n="size-huge">Huge</option>
+					<option value="Large" data-i18n="size-large">Large</option>
+					<option value="Medium" data-i18n="size-medium" selected>Medium</option>
+					<option value="Small" data-i18n="size-small">Small</option>
+					<option value="Tiny" data-i18n="size-tiny">Tiny</option>
+					<option value="Diminutive" data-i18n="size-diminutive">Diminutive</option>
+					<option value="Fine" data-i18n="size-fine">Fine</option>
 			</select>	</span> 
 			
 		</div>
@@ -51,39 +51,39 @@
 	<div class="3colrow">
 		<div class="col">
 			<table class="spacing">
-				<tr><div class="textHead">Attributes</div>	</tr>
+				<tr><div class="textHead"><span data-i18n="attributes">Attributes</div>	</tr>
 				<tr>
-					<td class="col1">STR<br><div class="small">Strength</div></td>
+					<td class="col1">STR<br><div class="small"><span data-i18n="strength">Strength</span></div></td>
 					<td><input type="number" name="attr_STR" value="8" title="Strength Score @{STR}" /></td>
 					<td><input type="number" name="attr_STR_max" value="[[floor(@{STR}/2-5)]]" disabled="true" title="Strength Modifier @{STR|max}" /></td>
 					<td><button type="roll" name="roll_STRCheck" value="&{template:skill} {{name=Strength}} {{skill=[[1d20+@{STR|max}[STR]+@{CT}[CT]]]}}" title="Roll Strength %{STRCheck}"></button></td>
 				</tr>
 				<tr>
-					<td class="col1">DEX<br><div class="small">Dexterity</div></td>
+					<td class="col1">DEX<br><div class="small"><span data-i18n="dexterity">Dexterity</span></div></td>
 					<td><input type="number" name="attr_DEX" value="8" title="Dexterity Score @{DEX}" /></td>
 					<td><input type="number" name="attr_DEX_max" value="[[floor(@{DEX}/2-5)]]" disabled="true" title="Dexterity Modifier @{DEX|max}" /></td>
 					<td><button type="roll" name="roll_DEXCheck" value="&{template:skill} {{name=Dexterity}} {{skill=[[1d20+@{Dex|max}[DEX]+@{CT}[CT]]]}}" title="Roll Dexterity  %{DEXCheck}"></button></td>
 				</tr>
 				<tr>
-					<td class="col1">CON<br><div class="small">Constitution</div></td>
+					<td class="col1">CON<br><div class="small"><span data-i18n="constitution">Constitution</span></div></td>
 					<td><input type="number" name="attr_CON" value="8" title="Constitution Score @{CON}" /></td>
 					<td><input type="number" name="attr_CON_max" value="[[floor(@{CON}/2-5)]]" disabled="true" title="Constitution Modifier @{CON|max}" /></td>
 					<td><button type="roll" name="roll_CONCheck" value="&{template:skill} {{name=Constitution}} {{skill=[[ 1d20+@{Con|max}[CON]+@{CT}[CT]]]}}" title="Roll Constitution %{CONCheck}"></button></td>
 				</tr>
 				<tr>
-					<td class="col1">INT<br><div class="small">Intelligence</div></td>
+					<td class="col1">INT<br><div class="small"><span data-i18n="intelligence">Intelligence</span></div></td>
 					<td><input type="number" name="attr_INT" value="8" title="Intelligence Score @{INT}" /></td>
 					<td><input type="number" name="attr_INT_max" value="[[floor(@{INT}/2-5)]]" disabled="true" title="Intelligence Modifier @{INT|max}}" /></td>
 					<td><button type="roll" name="roll_INTCheck" value="&{template:skill} {{name=Intelligence}} {{skill=[[ 1d20+@{INT|max}[INT]+@{CT}[CT]]]}}" title="Roll Intelligence %{INTCheck}"></button></td>
 				</tr>
 				<tr>
-					<td class="col1">WIS<br><div class="small">Wisdom</div></td>
+					<td class="col1">WIS<br><div class="small"><span data-i18n="wisdom">Wisdom</span></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="&{template:skill} {{name=Wisdom}} {{skill=[[ 1d20+@{WIS|max}[WIS]+@{CT}[CT]]]}}" title="Roll Wisdom %{WISCheck}"></button></td>
 				</tr>
 				<tr>
-					<td class="col1">CHA<br><div class="small">Charisma</div></td>
+					<td class="col1">CHA<br><div class="small"><span data-i18n="charisma">Charisma</span></div></td>
 					<td><input type="number" name="attr_CHA" value="8" title="Charisma Score @{CHA}" /></td>
 					<td><input type="number" name="attr_CHA_max" value="[[floor(@{CHA}/2-5)]]" disabled="true" title="Charisma Modifier @{CHA|max}" /></td>
 					<td><button type="roll" name="roll_CHACheck" value="&{template:skill} {{name=Charisma}} {{skill=[[ 1d20+@{CHA|max}[CHA]+@{CT}[CT]]]}}" title="Roll Charisma %{CHACheck}"></button></td>
@@ -92,50 +92,50 @@
 		</div>
 		<div class="col">
 			<table>		
-				<tr>	<td colspan="3"><div class="textHead">Hit Points</div> </td>	
+				<tr>	<td colspan="3"><div class="textHead"><span data-i18n="hit-points">Hit Points</span></div> </td>	
 						<td></td> 	
 						<td width="15px" rowspan="7"></td>	
-						<td><div class="textHead">Condition</div></td>	</tr>
+						<td><div class="textHead"><span data-i18n="condition">Condition</span></div></td>	</tr>
 				<tr><th>Current</th>		<th></th>	<th>Total</th>
 					<td></td>
 					<!-- rowspan placholder -->
 					<td rowspan="5" style="text-align:left">		
-						<input type="radio" value="0" name="attr_CT" checked="true" /> Normal<br />
+						<input type="radio" value="0" name="attr_CT" checked="true" /> <span data-i18n="ct_normal">Normal</span><br />
 						<input type="radio" value="-1" name="attr_CT" /> -1<br />
 						<input type="radio" value="-2" name="attr_CT" /> -2<br />
 						<input type="radio" value="-5" name="attr_CT" /> -5<br />
 						<input type="radio" value="-10" name="attr_CT" /> -10<br />
-						<input type="radio" value="-10[Helpless]" name="attr_CT" /> Helpless</td>		
+						<input type="radio" value="-10[Helpless]" name="attr_CT" /><span data-i18n="ct_helpless">Helpless</span></td>		
 				</tr>
 				<tr>	
 					<td> <input type="number" name="attr_HP" value="0" title="Current HP @{HP}" /></td>
 					<td>&nbsp;/&nbsp;</td>
 					<td><input type="number" name="attr_HP_max" value="0" title="Max HP @{HP|max}" /></td>
 				</tr>
-				<tr>	<td colspan="4"><div class="textHead">Threshold</div> </td>			</tr>
-				<tr>	<th>Total</th>	<th></th>	<th>Defense</th> 	<th>Misc</th>		</tr>
+				<tr>	<td colspan="4"><div class="textHead"><span data-i18n="threshold">Threshold</span></div> </td>			</tr>
+				<tr>	<th><span data-i18n="total">Total</span></th>	<th></th>	<th><span data-i18n="defense">Defense</span></th> 	<th><span data-i18n="misc">Misc</span></th>		</tr>
 				<tr>	
 					<td><input type="number" name="attr_DT" value="@{DamageThresholdDefense}+@{DamageThresholdSize}[Size]+@{DamageThresholdMisc}[Misc]"  disabled="true" title="Damage Threshold @{DT}" /></td>
 					<td>&nbsp;=&nbsp;</td>
 					<td> <select name="attr_DamageThresholdDefense" class="modtype" title="Damage Threshold Defense @{DamageThresholdDefense}">
-					  <option value="[[@{Fortitude}+@{CTIgnoreDT}]][Fortitude]" selected>Fort</option>
-					  <option value="[[@{Will}+@{CTIgnoreDT}]][Will]">Will</option>
+					  <option value="[[@{Fortitude}+@{CTIgnoreDT}]][Fortitude]" data-i18n="fortitude" selected>Fort</option>
+					  <option value="[[@{Will}+@{CTIgnoreDT}]][Will]" data-i18n="will">Will</option>
 					</select></td>
 					<td><input type="number" name="attr_DamageThresholdMisc" value="0"  title="Damage Threshold Miscellaneous Modifier @{DamageThresholdMisc}" />
 						<input type="number" value="0" name="attr_DamageThresholdSize" class="hidden" /></td>
 				</tr>
 			</table>
-			<p>Ignore CT? <input type="checkbox" value="[[@{CT}*-1]][CT Ignore]" name="attr_CTIgnoreDT"  title="Does Damage Threshold ignore decrease from the Condition Track? @{CTIgnoreDT}" /></p>
+			<p><span data-i18n="ignore_ct">Ignore CT?</span> <input type="checkbox" value="[[@{CT}*-1]][CT Ignore]" name="attr_CTIgnoreDT"  title="Does Damage Threshold ignore decrease from the Condition Track? @{CTIgnoreDT}" /></p>
 			
-			<span class="displayInline-block"><label>Damage Reduction</label></span>
+			<span class="displayInline-block"><label><span data-i18n="damage_reduction">Damage Reduction</span></label></span>
 				<input type="checkbox" class="DRShow hideCheckbox" style="width:140px; margin-left:-156px;" value="1" name="attr_DR-Show" title="Show/Hide Damage Reduction" />	
 				<span class="DRBody not-sheet-show"><input type="number" name="attr_DR" value="0" title="Damage Reduction @{DR}" />	</span>
 			<br />
-			<span class="displayInline-block"><label>Shield Rating</label></span>
+			<span class="displayInline-block"><label><span data-i18n="shield_rating">Shield Rating</span></label></span>
 				<input type="checkbox" class="SRShow hideCheckbox" style="width:102px; margin-left:-118px;"" value="1" name="attr_SR-Show" title="Show/Hide Shield Rating" />			
 					<span class="not-sheet-show SRBody"><input type="number" name="attr_SR" value="0" title="Current Shield Rating @{SR}" /> / <input type="number" name="attr_SR_max" value="0" title="Max Shield Rating @{SR|max}" /></span>
 			<br />
-			<span class="displayInline-block"><label>Immune</label></span>
+			<span class="displayInline-block"><label><span data-i18n="immune">Immune</span></label></span>
 				<input type="checkbox" class="immuneShow hideCheckbox" style="width:64px; margin-left:-80px;" value="1" name="attr_immune-Show"  title="Show/Hide Immunities"  />
 				<span class="not-sheet-show immuneBody"><input type="text" name="attr_Immune" value="" title="Immunities @{Immune}" style="width:75%" /> </span>
 			<span></span>	
@@ -146,8 +146,8 @@
 		<div class="col">				
 			<table class="spacing">
 				<tr>			
-					<td colspan="4"><div class="textHead">Force Points</div></td>			
-					<td colspan="2"><div class="textHead">Destiny Pts</div></td>
+					<td colspan="4"><div class="textHead"><span data-i18n="force_points">Force Points</span></div></td>			
+					<td colspan="2"><div class="textHead"><span data-i18n="destiny_points">Destiny Pts</span></div></td>
 				</tr>
 				<tr>
 					<td colspan="4"><input type="number" name="attr_FP" value="5" title="Current Force Points @{FP}" />  
@@ -156,9 +156,9 @@
 					<td colspan="2"><input type="number" name="attr_DP" value="0" title="Destiny Points" /></td>						
 				</tr>
 				<tr>						
-					<td colspan="2"><div class="textHead">BAB</div></td>
-					<td colspan="2"><div class="textHead">Speed</div></td>	
-					<td colspan="2"><div class="textHead">Dark Side Pts</div></td>		
+					<td colspan="2"><div class="textHead"><span data-i18n="bab">BAB</span></div></td>
+					<td colspan="2"><div class="textHead"><span data-i18n="speed">Speed</span></div></td>	
+					<td colspan="2"><div class="textHead"><span data-i18n="dark_side_points">Dark Side Pts</span></div></td>		
 				</tr>
 				<tr>	
 					<td colspan="2"><input type="number" name="attr_BAB" value="0" title="Base Attack Bonus @{BAB}" /></td>
@@ -170,8 +170,8 @@
 			<div class="table left">			
 				<div class="table-row">
 					<span class="table-data">	
-						<button type="roll" name="roll_PerceptionCheck" value="@{PerceptionFormula|max}}}" title="Roll Perception  %{PerceptionCheck} "></button>
-						<label>Perception</label>
+						<button type="roll" name="roll_PerceptionCheck" value="@{PerceptionFormula|max}" title="Roll Perception  %{PerceptionCheck} "></button>
+						<label><span data-i18n="perception">Perception</span></label>
 						<input type="checkbox" class="PerceptionShow hideCheckbox" style="width:84px; margin-left:-100px;" value="1" name="attr_Perception-Show"  title="Show/Hide Perception Notes" />	
 						<br />
 						<input class="PerceptionBody" style="margin-left:50px" type="text" name="attr_Perception_max" placeholder="Senses Notes" title="Senses Notes @{Perception|max}" />	 	</span>
@@ -180,27 +180,27 @@
 				<div class="table-row">
 					<span class="table-data">	
 						<button type="roll" name="roll_InitiativeTurn" value="&{template:skill} {{name=Rolling for Turn Order}} {{skill=[[1d20+@{Initiative}+@{InitiativeDecimal}[Dex Decimal]+?{Other Modifiers|0}[Other] &{tracker}]]}}" title="Roll Initiative to Turn Order window %{InitiativeTurn}" ></button>		
-						<label>Initiative</label>	 <span class="small" style="margin-left:10px;"><input type="checkbox" value="[[0.01 * @{dex}]]" name="attr_InitiativeDecimal" title="Add Dex Score to roll as a decimal for easier sorting @{InitiativeDecimal}" checked />Dex Score as Decimal
+						<label><span data-i18n="initiative">Initiative</span></label>	 <span class="small" style="margin-left:10px;"><input type="checkbox" value="[[0.01 * @{dex}]]" name="attr_InitiativeDecimal" title="Add Dex Score to roll as a decimal for easier sorting @{InitiativeDecimal}" checked /><span data-i18n="init_dex_decimal">Dex Score as Decimal</span>
 					</span>
 				</div>
 			</div>
 			<table>
 				<tr>		
-					<td colspan="6"><div class="textHead">Grapple</div></td>		
+					<td colspan="6"><div class="textHead"><span data-i18n="grapple">Grapple</span></div></td>		
 				</tr>
 				<tr>		
 					<th colspan="3"></th>
-					<th>Mod</th>		
+					<th><span data-i18n="mod">Mod</span></th>		
 					<th></th>
-					<th>Misc</th>
+					<th><span data-i18n="misc">Misc<span></th>
 				</tr>			
 				<tr>
 					<td><button type="roll" name="roll_GrappleCheck" value="&{template:skill} {{name=Grapple}} {{skill=[[1d20+@{Grapple}+?{Other Modifiers|0}[Other]]]}}" title="Roll Grapple %{GrappleCheck}"></button></td>		
 					<td><input type="number" name="attr_Grapple" value="@{BAB}[BAB]+@{GrpMod}[Mod]+@{GrappleSize}[Size]+@{GrpMod|max}[Misc]+@{CT}[CT]" disabled="true" title="Grapple @{Grapple}" /></td>
 					<td>&nbsp;=&nbsp;</td>
 					<td> <select name="attr_GrpMod" class="modtype" title="Choose the highest modifier @{GrpMod}">
-					  <option value="@{str|max}">STR</option>
-					  <option value="@{dex|max}">DEX</option>
+					  <option value="@{str|max}" data-i18n="str">STR</option>
+					  <option value="@{dex|max}" data-i18n="dex">DEX</option>	
 					</select></td>				
 					<td>&nbsp;+&nbsp;</td>
 					<td><input type="number" value="0" name="attr_GrappleSize" class="hidden" />	<input type="number" name="attr_GrpMod_max" value="0" title="Miscellaneous Grapple Modifier @{GrpMod|max}" /></td>
@@ -213,38 +213,38 @@
 	<div class="2colrow">
 		<div class="col">
 			<table class="spacing">
-				<tr><div class="textHead2Col">Defenses</div></tr>
+				<tr><div class="textHead2Col"><span data-i18n="defenses">Defenses</span></div></tr>
 				<thead>
 					<tr>
 						<th></th>
-						<th>Total</th>
+						<th><span data-i18n="total">Total<span></th>
 						<th></th>
-						<th style="min-width:50px"><span>Level /<br />Armor</span>	<input type="checkbox" class="DefArmorLevelShow skillsHideCheckbox" title="Show/Hide Armor / Level Formulas" name="attr_levelarmor-show" value="1" style="width: 41px; height: 41px; margin-left: -43px; margin-top: -25px;" /></th>
-						<th>Class</th>					
-						<th>Mod</th>
-						<th>Misc</th>
+						<th style="min-width:50px">	<span><span data-i18n="level">Level</span> /<br /><span data-i18n="armor">Armor</span></span>	</th>
+						<th><span data-i18n="class">Class</span></th>					
+						<th><span data-i18n="mod">Mod</span></th>
+						<th><span data-i18n="misc">Misc</span></th>
 					</tr>
 				</thead>	
 			  <tbody>
 				<tr>
-					<td class="col1" rowspan="2">Reflex</td>
+					<td class="col1" rowspan="2"><span data-i18n="reflex">Reflex</span></td>
 					<td><input type="number" name="attr_Reflex" value="10+@{RefMod}[Mod]+@{RefLevel}[Level]+@{RefClass}[Class]+@{RefMisc}[Misc]+@{RefSizeMod}[Size Mod]+@{CT}[CT]" disabled="true"  title="Reflex @{Reflex}" /></td> 
 					<td>&nbsp;=&nbsp;10&nbsp;+&nbsp;</td>
-					<td><input type="number" name="attr_RefLevel" value="@{RefLevel|max}"  disabled="true" title="Reflex Level / Armor bonus @{RefLevel} | To change, click on the Armor/Level header to reveal manual calculation field"/></td>	
+					<td><input type="number" name="attr_RefLevel" value="@{RefLevel|max}"  disabled="true" title="Reflex Level / Armor bonus @{RefLevel}"/>	<input type="text" name="attr_RefLevel_max" value="@{level}" title="Reflex Level Formula @{RefLevel|max}"  class="hidden" /></td>	
 					<td><input type="number" name="attr_RefClass" value="0" title="Reflex Class bonus @{RefClass}" /></td>
 					<td> <select name="attr_RefMod" class="modtype" title="Reflex Ability Modifier (default DEX) @{RefMod}">
-					  <option value="@{str|max}">STR</option>
-					  <option value="@{dex|max}" selected>DEX</option>					  
-					  <option value="@{ArmorDex}">DEX (Max Armor)</option>
-					  <option value="@{con|max}">CON</option>
-					  <option value="@{int|max}">INT</option>
-					  <option value="@{wis|max}">WIS</option>
-					  <option value="@{cha|max}">CHA</option>
+					  <option value="@{str|max}" data-i18n="str">STR</option>
+					  <option value="@{dex|max}" data-i18n="dex" selected>DEX</option>					  
+					  <option value="@{ArmorDex}" data-i18n="dex_max">DEX (Max Armor)</option>
+					  <option value="@{con|max}" data-i18n="con">CON</option>
+					  <option value="@{int|max}" data-i18n="int">INT</option>
+					  <option value="@{wis|max}" data-i18n="wis">WIS</option>
+					  <option value="@{cha|max}" data-i18n="cha">CHA</option>
 					</select></td>
 					<td><input type="number" name="attr_RefMisc" value="0" title="Reflex Miscellaneous Modifier @{RefMisc}" /></td>
 				</tr>
 				<tr>
-					<td class="col1"><div class="small">Flatfooted</div></td>
+					<td class="col1"><div class="small"><span data-i18n="flatfooted">Flatfooted</span>/div></td>
 					<td><input type="number" name="attr_ReflexFlatFooted" value="10+@{RefLevel}[Level]+@{RefClass}[Class]+@{RefFlatFootedMisc}[Misc]+@{RefSizeMod}[Size Mod]+@{CT}[CT]" disabled="true"  title="Reflex Flat Footed @{ReflexFlatFooted}" /></td>
 					<td></td>
 					<td colspan="2" align="right">
@@ -252,50 +252,39 @@
 					</td>
 					<td><input type="number" name="attr_RefFlatFootedMisc" value="0" title="Reflex Flat Footed Miscellaneous Modifier @{RefFlatFootedMisc}" /></td>
 				</tr>
-				<tr>	<td colspan="7" align="right">
-						<input type="checkbox" class="DefArmorLevelShow hidden" value="1" name="attr_levelarmor-show" /><span class="DefArmorLevelBody not-sheet-show">		<input type="text" name="attr_RefLevel_max" value="@{level}" title="Reflex Level Formula @{RefLevel|max}" style="width:95%" />	</span>
-					</td>
-				</tr>
+						
 				<tr>
-					<td class="col1">Fortitude</td>
+					<td class="col1"><span data-i18n="fortitude">Fortitude</span></td>
 					<td><input type="number" name="attr_Fortitude" value="10+@{FortMod}[Mod]+@{FortLevel}[Level]+@{FortClass}[Class]+@{FortMisc}[Misc]+@{CT}[CT]" disabled="true" title="Fortitude  @{Fortitude}" />
 					<td>&nbsp;=&nbsp;10&nbsp;+&nbsp;</td>
-					<td><input type="number" name="attr_FortLevel" value="@{FortLevel|max}"  disabled="true"  title="Fortitude Level / Armor bonus @{FortLevel} | To change, click on the Armor/Level header to reveal manual calculation field" /></td>	
+					<td><input type="number" name="attr_FortLevel" value="@{FortLevel|max}"  disabled="true"  title="Fortitude Level / Armor bonus @{FortLevel}" />	<input type="text" name="attr_FortLevel_max" value="@{level}" title="Fortitude Level Formula @{FortLevel|max}" class="hidden" /></td>	
 					<td><input type="number" name="attr_FortClass" value="0" title="Fortitude Class bonus @{FortClass}" /></td>
 					<td> <select name="attr_FortMod" class="modtype " title="Fortitude Ability Modifier (default CON) @{FortMod}">
-					  <option value="@{str|max}">STR</option>
-					  <option value="@{dex|max}">DEX</option>
-					  <option value="@{con|max}" selected>CON</option>
-					  <option value="@{int|max}">INT</option>
-					  <option value="@{wis|max}">WIS</option>
-					  <option value="@{cha|max}">CHA</option>
+					  <option value="@{str|max}" data-i18n="str">STR</option>
+					  <option value="@{dex|max}" data-i18n="dex">DEX</option>	
+					  <option value="@{con|max}" data-i18n="con" selected>CON</option>
+					  <option value="@{int|max}" data-i18n="int">INT</option>
+					  <option value="@{wis|max}" data-i18n="wis">WIS</option>
+					  <option value="@{cha|max}" data-i18n="cha">CHA</option>
 					</select></td>
 					<td><input type="number" name="attr_FortMisc" value="0" title="Fortitude Miscellaneous Modifier @{FortMisc}" /></td>
 				</tr>
-				<tr>	<td colspan="7" align="right">	
-						<input type="checkbox" class="DefArmorLevelShow hidden" value="1" name="attr_levelarmor-show" /> <span class="DefArmorLevelBody not-sheet-show">		<input type="text" name="attr_FortLevel_max" value="@{level}" title="Fortitude Level Formula @{FortLevel|max}" style="width:95%" />	</span>
-					</td>
-				</tr>
 				<tr>
-					<td class="col1">Will</td>
+					<td class="col1"><span data-i18n="will">Will</span></td>
 					<td><input type="number" name="attr_Will" value="10+@{WillMod}[Mod]+@{WillLevel}[Level]+@{WillClass}[Class]+@{WillMisc}[Misc]+@{CT}[CT]" disabled="true" title="Will @{Will}" /></td>
 					<td>&nbsp;=&nbsp;10&nbsp;+&nbsp;</td>
-					<td><input type="number" name="attr_WillLevel" value="@{WillLevel|max}"  disabled="true" title="Will Level / Armor bonus @{WillLevel} | To change, click on the Armor/Level header to reveal manual calculation field"/></td>		
+					<td><input type="number" name="attr_WillLevel" value="@{level}"  disabled="true" title="Will Level / Armor bonus @{WillLevel}"/></td>		
 					<td><input type="number" name="attr_WillClass" value="0" title="Will Class bonus @{WillClass}" /></td>
 					<td> <select name="attr_WillMod" class="modtype" title="Will Ability Modifier (default WIS) @{WillMod}">
-					  <option value="@{str|max}">STR</option>
-					  <option value="@{dex|max}">DEX</option>
-					  <option value="@{con|max}">CON</option>
-					  <option value="@{int|max}">INT</option>
-					  <option value="@{wis|max}" selected>WIS</option>
-					  <option value="@{cha|max}">CHA</option>
+					  <option value="@{str|max}" data-i18n="str">STR</option>
+					  <option value="@{dex|max}" data-i18n="dex">DEX</option>	
+					  <option value="@{con|max}" data-i18n="con">CON</option>
+					  <option value="@{int|max}" data-i18n="int">INT</option>
+					  <option value="@{wis|max}" data-i18n="wis" selected>WIS</option>
+					  <option value="@{cha|max}" data-i18n="cha">CHA</option>
 					</select></td>
 					<td><input type="number" name="attr_WillMisc" value="0" title="Will Miscellaneous Modifier @{WillMisc}" /></td>
 				</tr>
-				<tr>	<td colspan="7" align="right">
-						<input type="checkbox" class="DefArmorLevelShow hidden" value="1" name="attr_levelarmor-show" /><span class="DefArmorLevelBody not-sheet-show">	<input type="text" name="attr_WillLevel_max" value="@{level}" title="Fortitude Level Formula @{WillLevel|max}" style="width:95%" /> </span>	
-					</td>
-				</tr>
 			  </tbody>
 			</table>
 			<br />			
@@ -348,23 +337,27 @@
 						<div class="table">	
 							<div class="table-row">												
 								<span class="table-data">	<button  type="roll" name="roll_WeaponCheck" value="@{AttackFormula}" title="Attack Roll"> </button>	</span>
-								<span class="table-data" style="width:55%">	<input type="text" name="attr_WeaponName" placeholder="Weapon Name" style="width:100%"  title="Weapon Name @{repeating_attack_X_WeaponName}" />	</span>
+								<span class="table-data" style="width:50%">	<input type="text" name="attr_WeaponName" placeholder="Weapon Name" style="width:100%"  title="Weapon Name @{repeating_attack_X_WeaponName}" />	</span>
 								<span class="table-data">	<input type="text" name="attr_WeaponName_max" placeholder="Type" style="width:100%" title="Weapon Type @{repeating_attack_X_WeaponName|max}" />	</span>
-							</div>
+								<span class="table-data" style="width:35px">		&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" class="sectAttack-show" title="Show/Hide Attack & Damage" name="attr_AttackDamage-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;" /><span></span>	</span>
+							</div>							
 						</div>						
-					</div>				
+					</div>
+					<input type="checkbox" class="sectAttack-show hidden" name="attr_AttackDamage-show" value="1"/>						
 					<div class="table-row">
 						<span class="table-data">	<div class="table">	
 							<div class="table-row">
 								<span class="table-header" style="min-width:44px"></span>
-								<span class="table-header" style="min-width:55px"></span>
-								<span class="table-header" style="min-width:130px">Total</span>
-								<span class="table-header"></span>
-								<span class="table-header" style="min-width:80px">Mod</span>					
-								<span class="table-header"></span>
-								<span class="table-header" style="min-width:50px">Misc</span>
-							</div>	
-							<div class="table-row">
+								<span class="table-header" style="min-width:55px;"></span>
+							<input type="checkbox" class="sectAttack-show hidden" name="attr_AttackDamage-show" value="1"/>	
+								<span class="table-header sectAttack not-sheet-show" style="min-width:130px">Total</span>
+								<span class="table-header sectAttack"></span>
+								<span class="table-header sectAttack" style="min-width:80px">Mod</span>					
+								<span class="table-header sectAttack"></span>
+								<span class="table-header sectAttack" style="min-width:50px">Misc</span>
+							</div>
+							<input type="checkbox" class="sectAttack-show hidden" name="attr_AttackDamage-show" value="1"/>		
+							<div class="table-row sectAttack">
 								<span class="table-data" style="min-width:44px">		</span>
 								<span class="table-data col1"  style="min-width:55px">	<span>Attack</span>	<input type="checkbox" class="sect-show skillsHideCheckbox" title="Show/Hide Attack Formula" name="attr_attack-show" value="1" style="width: 38px; margin-left: -41px;" />	</span>
 								<span class="table-data center" style="min-width:130px">
@@ -372,9 +365,9 @@
 								<span class="table-data center">	&nbsp;|&nbsp;</span>
 								<span class="table-data center" style="min-width:80px">
 									<select name="attr_attackMod" class="modtype" title="Attack Modifier @{repeating_attack_X_attackMod}">           
-									  <option value="@{str|max}">STR</option>
-									  <option value="@{dex|max}">DEX</option>
-									  <option value="@{cha|max}">CHA</option>
+									  <option value="@{str|max}" data-i18n="str">STR</option>
+									  <option value="@{dex|max}" data-i18n="dex">DEX</option>	
+									  <option value="@{cha|max}" data-i18n="cha">CHA</option>
 									</select>	</span>
 								<span class="table-data center">	&nbsp;+&nbsp;	</span>
 								<span class="table-data center" style="min-width:50px">
@@ -393,24 +386,24 @@
 							</span>
 						</div>
 					</div>				
-					<div class="table-row">
+					<div class="table-row sectAttack">
 						<span class="table-data">	<div class="table">	
 							<div class="table-row">
 								<span class="table-data" style="min-width:44px">		</span>
 								<span class="table-data col1"  style="min-width:55px">	<span>Damage</span>	<input type="checkbox" class="sect-show skillsHideCheckbox" title="Show/Hide Attack Formula" name="attr_damage-show" value="1" style="width: 50px; margin-left: -53px;" />	</span>
 								<span class="table-data" style="min-width:130px">	
-									<input type="text" name="attr_damage" placeholder="2d8"  style="width:60px" title="Weapon Damage @{repeating_attack_X_damage}"/>
+									<input type="text" name="attr_damage" placeholder="2d8" value="2d8"  style="width:60px" title="Weapon Damage @{repeating_attack_X_damage}"/>
 									&nbsp;+&nbsp;	
 									<input type="number" name="attr_DamageTotal_max" value="@{damageTotal}" disabled="true"  title="Damage Total  @{repeating_attack_X_DamageTotal|max}" />	</span>
 								<span class="table-data center">	&nbsp;|&nbsp;</span>
 								<span class="table-data center" style="min-width:80px">	
 									<select name="attr_damageMod" class="modtype" title="Weapon Damage modifier @{repeating_attack_X_damageMod}">
 									  <option value="0" selected>None</option>                
-									  <option value="@{str|max}">STR</option>
+									  <option value="@{str|max}" data-i18n="str">STR</option>
 									  <option value="[[@{str|max}*2]]">STRx2</option>
-									  <option value="@{dex|max}">DEX</option>
+									  <option value="@{dex|max}" data-i18n="dex">DEX</option>	
 									  <option value="[[@{dex|max}*2]]">DEXx2</option>
-									  <option value="@{cha|max}">CHA</option>
+									  <option value="@{cha|max}" data-i18n="cha">CHA</option>
 									  <option value="[[@{cha|max}*2]]">CHAx2</option>
 									</select>	</span>
 								<span class="table-data center">	&nbsp;+&nbsp;	</span>
@@ -429,7 +422,7 @@
 							</span>
 						</div>
 					</div>
-					<div class="table-row">
+					<div class="table-row  sectAttack">
 						<span class="table-data">	<div class="table">	
 							<div class="table-row">
 								<span class="table-data" style="min-width:44px">		</span>
@@ -486,12 +479,12 @@
 						<span class="table-data"><input type="number" name="attr_Acrobatics" value="@{AcrobaticsFormula}" disabled="true" title="Acrobatics Total @{Acrobatics}" class="skills" /></span> 
 						<span class="table-data">&nbsp;=&nbsp;</span>	
 						<span class="table-data"><select name="attr_AcrobaticsMod" class="modtype" title="Acrobatics Mod (default DEX)">
-							  <option value="@{str|max}">STR</option>
-							  <option value="@{dex|max}" selected>DEX</option>
-							  <option value="@{con|max}">CON</option>
-							  <option value="@{int|max}">INT</option>
-							  <option value="@{wis|max}">WIS</option>
-							  <option value="@{cha|max}">CHA</option>
+							  <option value="@{str|max}" data-i18n="str">STR</option>
+							  <option value="@{dex|max}" data-i18n="dex"  selected>DEX</option>	
+							  <option value="@{con|max}" data-i18n="con">CON</option>
+							  <option value="@{int|max}" data-i18n="int">INT</option>
+							  <option value="@{wis|max}" data-i18n="wis">WIS</option>
+							  <option value="@{cha|max}" data-i18n="cha">CHA</option>
 							</select></span>
 						<span class="table-data skillsFeats"><input type="checkbox" value="5" name="attr_AcrobaticsFeat" title="Trained in Acrobatics?" /></span> <!-- Skill Training -->
 						<span class="table-data skillsFeats"><input type="checkbox" value="5" name="attr_AcrobaticsFeat_max" title="Focused in Acrobatics?" /></span> <!-- Skill Focus -->
@@ -530,11 +523,11 @@
 						<span class="table-data">&nbsp;=&nbsp;</span>	
 						<span class="table-data"><select name="attr_ClimbMod" class="modtype" title="Climb Mod (default STR)">
 							  <option value="@{str|max}" selected>STR</option>
-							  <option value="@{dex|max}">DEX</option>
-							  <option value="@{con|max}">CON</option>
-							  <option value="@{int|max}">INT</option>
-							  <option value="@{wis|max}">WIS</option>
-							  <option value="@{cha|max}">CHA</option>
+							  <option value="@{dex|max}" data-i18n="dex">DEX</option>	
+							  <option value="@{con|max}" data-i18n="con">CON</option>
+							  <option value="@{int|max}" data-i18n="int">INT</option>
+							  <option value="@{wis|max}" data-i18n="wis">WIS</option>
+							  <option value="@{cha|max}" data-i18n="cha">CHA</option>
 							</select></span>
 						<span class="table-data skillsFeats"><input type="checkbox" value="5" name="attr_ClimbFeat" title="Trained in Climb?" /></span> <!-- Skill Training -->
 						<span class="table-data skillsFeats"><input type="checkbox" value="5" name="attr_ClimbFeat_max" title="Focused in Climb?" /></span> <!-- Skill Focus -->
@@ -572,12 +565,12 @@
 						<span class="table-data"><input type="number" name="attr_Deception" value="@{DeceptionFormula}" disabled="true" title="Deception Total @{Deception}" class="skills" /></span> 
 						<span class="table-data">&nbsp;=&nbsp;</span>	
 						<span class="table-data"><select name="attr_DeceptionMod" class="modtype" title="Deception Mod (default CHA)">
-							  <option value="@{str|max}">STR</option>
-							  <option value="@{dex|max}">DEX</option>
-							  <option value="@{con|max}">CON</option>
-							  <option value="@{int|max}">INT</option>
-							  <option value="@{wis|max}">WIS</option>
-							  <option value="@{cha|max}" selected>CHA</option>
+							  <option value="@{str|max}" data-i18n="str">STR</option>
+							  <option value="@{dex|max}" data-i18n="dex">DEX</option>	
+							  <option value="@{con|max}" data-i18n="con">CON</option>
+							  <option value="@{int|max}" data-i18n="int">INT</option>
+							  <option value="@{wis|max}" data-i18n="wis">WIS</option>
+							  <option value="@{cha|max}" data-i18n="cha" selected>CHA</option>
 							</select></span>
 						<span class="table-data skillsFeats"><input type="checkbox" value="5" name="attr_DeceptionFeat" title="Trained in Deception?" /></span> <!-- Skill Training -->
 						<span class="table-data skillsFeats"><input type="checkbox" value="5" name="attr_DeceptionFeat_max" title="Focused in Deception?" /></span> <!-- Skill Focus -->
@@ -615,12 +608,12 @@
 						<span class="table-data"><input type="number" name="attr_Endurance" value="@{EnduranceFormula}" disabled="true" title="Endurance Total @{Endurance}" class="skills" /></span> 
 						<span class="table-data">&nbsp;=&nbsp;</span>	
 						<span class="table-data"><select name="attr_EnduranceMod" class="modtype" title="Endurance Mod (default CON)">
-							  <option value="@{str|max}">STR</option>
-							  <option value="@{dex|max}">DEX</option>
-							  <option value="@{con|max}" selected>CON</option>
-							  <option value="@{int|max}">INT</option>
-							  <option value="@{wis|max}">WIS</option>
-							  <option value="@{cha|max}">CHA</option>
+							  <option value="@{str|max}" data-i18n="str">STR</option>
+							  <option value="@{dex|max}" data-i18n="dex">DEX</option>	
+							  <option value="@{con|max}" data-i18n="con" selected>CON</option>
+							  <option value="@{int|max}" data-i18n="int">INT</option>
+							  <option value="@{wis|max}" data-i18n="wis">WIS</option>
+							  <option value="@{cha|max}" data-i18n="cha">CHA</option>
 							</select></span>
 						<span class="table-data skillsFeats"><input type="checkbox" value="5" name="attr_EnduranceFeat" title="Trained in Endurance?" /></span> <!-- Skill Training -->
 						<span class="table-data skillsFeats"><input type="checkbox" value="5" name="attr_EnduranceFeat_max" title="Focused in Endurance?" /></span> <!-- Skill Focus -->
@@ -658,12 +651,12 @@
 						<span class="table-data"><input type="number" name="attr_GatherInformation" value="@{GatherInformationFormula}" disabled="true" title="Gather Information Total @{GatherInformation}" class="skills" /></span> 
 						<span class="table-data">&nbsp;=&nbsp;</span>	
 						<span class="table-data"><select name="attr_GatherInformationMod" class="modtype" title="GatherInformation Mod (default CHA)">
-							  <option value="@{str|max}">STR</option>
-							  <option value="@{dex|max}">DEX</option>
-							  <option value="@{con|max}">CON</option>
-							  <option value="@{int|max}">INT</option>
-							  <option value="@{wis|max}">WIS</option>
-							  <option value="@{cha|max}" selected>CHA</option>
+							  <option value="@{str|max}" data-i18n="str">STR</option>
+							  <option value="@{dex|max}" data-i18n="dex">DEX</option>	
+							  <option value="@{con|max}" data-i18n="con">CON</option>
+							  <option value="@{int|max}" data-i18n="int">INT</option>
+							  <option value="@{wis|max}" data-i18n="wis">WIS</option>
+							  <option value="@{cha|max}" data-i18n="cha" selected>CHA</option>
 							</select></span>
 						<span class="table-data skillsFeats"><input type="checkbox" value="5" name="attr_GatherInformationFeat" title="Trained in Gather Information?" /></span> <!-- Skill Training -->
 						<span class="table-data skillsFeats"><input type="checkbox" value="5" name="attr_GatherInformationFeat_max" title="Focused in Gather Information?" /></span> <!-- Skill Focus -->
@@ -701,12 +694,12 @@
 						<span class="table-data"><input type="number" name="attr_Initiative" value="@{InitiativeFormula}" disabled="true" title="Initiative Total @{Initiative}" class="skills" /></span> 
 						<span class="table-data">&nbsp;=&nbsp;</span>	
 						<span class="table-data"><select name="attr_InitiativeMod" class="modtype" title="Initiative Mod (default DEX)">
-							  <option value="@{str|max}">STR</option>
-							  <option value="@{dex|max}" selected>DEX</option>
-							  <option value="@{con|max}">CON</option>
-							  <option value="@{int|max}">INT</option>
-							  <option value="@{wis|max}">WIS</option>
-							  <option value="@{cha|max}">CHA</option>
+							  <option value="@{str|max}" data-i18n="str">STR</option>
+							  <option value="@{dex|max}" data-i18n="dex"  selected>DEX</option>	
+							  <option value="@{con|max}" data-i18n="con">CON</option>
+							  <option value="@{int|max}" data-i18n="int">INT</option>
+							  <option value="@{wis|max}" data-i18n="wis">WIS</option>
+							  <option value="@{cha|max}" data-i18n="cha">CHA</option>
 							</select></span>
 						<span class="table-data skillsFeats"><input type="checkbox" value="5" name="attr_InitiativeFeat" title="Trained in Initiative?" /></span> <!-- Skill Training -->
 						<span class="table-data skillsFeats"><input type="checkbox" value="5" name="attr_InitiativeFeat_max" title="Focused in Initiative?" /></span> <!-- Skill Focus -->
@@ -745,11 +738,11 @@
 						<span class="table-data">&nbsp;=&nbsp;</span>	
 						<span class="table-data"><select name="attr_JumpMod" class="modtype" title="Jump Mod (default STR)">
 							  <option value="@{str|max}" selected>STR</option>
-							  <option value="@{dex|max}">DEX</option>
-							  <option value="@{con|max}">CON</option>
-							  <option value="@{int|max}">INT</option>
-							  <option value="@{wis|max}">WIS</option>
-							  <option value="@{cha|max}">CHA</option>
+							  <option value="@{dex|max}" data-i18n="dex">DEX</option>	
+							  <option value="@{con|max}" data-i18n="con">CON</option>
+							  <option value="@{int|max}" data-i18n="int">INT</option>
+							  <option value="@{wis|max}" data-i18n="wis">WIS</option>
+							  <option value="@{cha|max}" data-i18n="cha">CHA</option>
 							</select></span>
 						<span class="table-data skillsFeats"><input type="checkbox" value="5" name="attr_JumpFeat" title="Trained in Jump?" /></span> <!-- Skill Training -->
 						<span class="table-data skillsFeats"><input type="checkbox" value="5" name="attr_JumpFeat_max" title="Focused in Jump?" /></span> <!-- Skill Focus -->
@@ -789,12 +782,12 @@
 						<span class="table-data"><input type="number" name="attr_Knowledge-Bureaucracy" value="@{Knowledge-BureaucracyFormula}" disabled="true" title="Knowledge (Bureaucracy) Total @{Knowledge-Bureaucracy}" class="skills" /></span> 
 						<span class="table-data">&nbsp;=&nbsp;</span>	
 						<span class="table-data"><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>
-							  <option value="@{con|max}">CON</option>
-							  <option value="@{int|max}" selected>INT</option>
-							  <option value="@{wis|max}">WIS</option>
-							  <option value="@{cha|max}">CHA</option>
+							  <option value="@{str|max}" data-i18n="str">STR</option>
+							  <option value="@{dex|max}" data-i18n="dex">DEX</option>	
+							  <option value="@{con|max}" data-i18n="con">CON</option>
+							  <option value="@{int|max}" data-i18n="int" selected>INT</option>
+							  <option value="@{wis|max}" data-i18n="wis">WIS</option>
+							  <option value="@{cha|max}" data-i18n="cha">CHA</option>
 							</select></span>
 						<span class="table-data skillsFeats"><input type="checkbox" value="5" name="attr_Knowledge-BureaucracyFeat" title="Trained in Knowledge (Bureaucracy)?" /></span> <!-- Skill Training -->
 						<span class="table-data skillsFeats"><input type="checkbox" value="5" name="attr_Knowledge-BureaucracyFeat_max" title="Focused in Knowledge (Bureaucracy)?" /></span> <!-- Skill Focus -->
@@ -833,12 +826,12 @@
 						<span class="table-data"><input type="number" name="attr_Knowledge-GalacticLore" value="@{Knowledge-GalacticLoreFormula}" disabled="true" title="Knowledge (Galactic Lore) Total @{Knowledge-GalacticLore}" class="skills" /></span> 
 						<span class="table-data">&nbsp;=&nbsp;</span>	
 						<span class="table-data"><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>
-							  <option value="@{con|max}">CON</option>
-							  <option value="@{int|max}" selected>INT</option>
-							  <option value="@{wis|max}">WIS</option>
-							  <option value="@{cha|max}">CHA</option>
+							  <option value="@{str|max}" data-i18n="str">STR</option>
+							  <option value="@{dex|max}" data-i18n="dex">DEX</option>	
+							  <option value="@{con|max}" data-i18n="con">CON</option>
+							  <option value="@{int|max}" data-i18n="int" selected>INT</option>
+							  <option value="@{wis|max}" data-i18n="wis">WIS</option>
+							  <option value="@{cha|max}" data-i18n="cha">CHA</option>
 							</select></span>
 						<span class="table-data skillsFeats"><input type="checkbox" value="5" name="attr_Knowledge-GalacticLoreFeat" title="Trained in Knowledge (Galactic Lore)?" /></span> <!-- Skill Training -->
 						<span class="table-data skillsFeats"><input type="checkbox" value="5" name="attr_Knowledge-GalacticLoreFeat_max" title="Focused in Knowledge (Galactic Lore)?" /></span> <!-- Skill Focus -->
@@ -877,12 +870,12 @@
 						<span class="table-data"><input type="number" name="attr_Knowledge-LifeSciences" value="@{Knowledge-LifeSciencesFormula}" disabled="true" title="Knowledge (Life Sciences) Total @{Knowledge-LifeSciences}" class="skills" /></span> 
 						<span class="table-data">&nbsp;=&nbsp;</span>	
 						<span class="table-data"><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>
-							  <option value="@{con|max}">CON</option>
-							  <option value="@{int|max}" selected>INT</option>
-							  <option value="@{wis|max}">WIS</option>
-							  <option value="@{cha|max}">CHA</option>
+							  <option value="@{str|max}" data-i18n="str">STR</option>
+							  <option value="@{dex|max}" data-i18n="dex">DEX</option>	
+							  <option value="@{con|max}" data-i18n="con">CON</option>
+							  <option value="@{int|max}" data-i18n="int" selected>INT</option>
+							  <option value="@{wis|max}" data-i18n="wis">WIS</option>
+							  <option value="@{cha|max}" data-i18n="cha">CHA</option>
 							</select></span>
 						<span class="table-data skillsFeats"><input type="checkbox" value="5" name="attr_Knowledge-LifeSciencesFeat" title="Trained in Knowledge (Life Sciences)?" /></span> <!-- Skill Training -->
 						<span class="table-data skillsFeats"><input type="checkbox" value="5" name="attr_Knowledge-LifeSciencesFeat_max" title="Focused in Knowledge (Life Sciences)?" /></span> <!-- Skill Focus -->
@@ -921,12 +914,12 @@
 						<span class="table-data"><input type="number" name="attr_Knowledge-PhysicalScience" value="@{Knowledge-PhysicalScienceFormula}" disabled="true" title="Knowledge (Physical Science) Total @{Knowledge-PhysicalScience}" class="skills" /></span> 
 						<span class="table-data">&nbsp;=&nbsp;</span>	
 						<span class="table-data"><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>
-							  <option value="@{con|max}">CON</option>
-							  <option value="@{int|max}" selected>INT</option>
-							  <option value="@{wis|max}">WIS</option>
-							  <option value="@{cha|max}">CHA</option>
+							  <option value="@{str|max}" data-i18n="str">STR</option>
+							  <option value="@{dex|max}" data-i18n="dex">DEX</option>	
+							  <option value="@{con|max}" data-i18n="con">CON</option>
+							  <option value="@{int|max}" data-i18n="int" selected>INT</option>
+							  <option value="@{wis|max}" data-i18n="wis">WIS</option>
+							  <option value="@{cha|max}" data-i18n="cha">CHA</option>
 							</select></span>
 						<span class="table-data skillsFeats"><input type="checkbox" value="5" name="attr_Knowledge-PhysicalScienceFeat" title="Trained in Knowledge (Physical Science)?" /></span> <!-- Skill Training -->
 						<span class="table-data skillsFeats"><input type="checkbox" value="5" name="attr_Knowledge-PhysicalScienceFeat_max" title="Focused in Knowledge (Physical Science)?" /></span> <!-- Skill Focus -->
@@ -965,12 +958,12 @@
 						<span class="table-data"><input type="number" name="attr_Knowledge-SocialScience" value="@{Knowledge-SocialScienceFormula}" disabled="true" title="Knowledge (Social Science) Total @{Knowledge-SocialScience}" class="skills" /></span> 
 						<span class="table-data">&nbsp;=&nbsp;</span>	
 						<span class="table-data"><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>
-							  <option value="@{con|max}">CON</option>
-							  <option value="@{int|max}" selected>INT</option>
-							  <option value="@{wis|max}">WIS</option>
-							  <option value="@{cha|max}">CHA</option>
+							  <option value="@{str|max}" data-i18n="str">STR</option>
+							  <option value="@{dex|max}" data-i18n="dex">DEX</option>	
+							  <option value="@{con|max}" data-i18n="con">CON</option>
+							  <option value="@{int|max}" data-i18n="int" selected>INT</option>
+							  <option value="@{wis|max}" data-i18n="wis">WIS</option>
+							  <option value="@{cha|max}" data-i18n="cha">CHA</option>
 							</select></span>
 						<span class="table-data skillsFeats"><input type="checkbox" value="5" name="attr_Knowledge-SocialScienceFeat" title="Trained in Knowledge (Social Science)?" /></span> <!-- Skill Training -->
 						<span class="table-data skillsFeats"><input type="checkbox" value="5" name="attr_Knowledge-SocialScienceFeat_max" title="Focused in Knowledge (Social Science)?" /></span> <!-- Skill Focus -->
@@ -1009,12 +1002,12 @@
 						<span class="table-data"><input type="number" name="attr_Knowledge-Tactics" value="@{Knowledge-TacticsFormula}" disabled="true" title="Knowledge (Tactics) Total @{Knowledge-Tactics}" class="skills" /></span> 
 						<span class="table-data">&nbsp;=&nbsp;</span>	
 						<span class="table-data"><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>
-							  <option value="@{con|max}">CON</option>
-							  <option value="@{int|max}" selected>INT</option>
-							  <option value="@{wis|max}">WIS</option>
-							  <option value="@{cha|max}">CHA</option>
+							  <option value="@{str|max}" data-i18n="str">STR</option>
+							  <option value="@{dex|max}" data-i18n="dex">DEX</option>	
+							  <option value="@{con|max}" data-i18n="con">CON</option>
+							  <option value="@{int|max}" data-i18n="int" selected>INT</option>
+							  <option value="@{wis|max}" data-i18n="wis">WIS</option>
+							  <option value="@{cha|max}" data-i18n="cha">CHA</option>
 							</select></span>
 						<span class="table-data skillsFeats"><input type="checkbox" value="5" name="attr_Knowledge-TacticsFeat" title="Trained in Knowledge (Tactics)?" /></span> <!-- Skill Training -->
 						<span class="table-data skillsFeats"><input type="checkbox" value="5" name="attr_Knowledge-TacticsFeat_max" title="Focused in Knowledge (Tactics)?" /></span> <!-- Skill Focus -->
@@ -1053,12 +1046,12 @@
 						<span class="table-data"><input type="number" name="attr_Knowledge-Technology" value="@{Knowledge-TechnologyFormula}" disabled="true" title="Knowledge (Technology) Total @{Knowledge-Technology}" class="skills" /></span> 
 						<span class="table-data">&nbsp;=&nbsp;</span>	
 						<span class="table-data"><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>
-							  <option value="@{con|max}">CON</option>
-							  <option value="@{int|max}" selected>INT</option>
-							  <option value="@{wis|max}">WIS</option>
-							  <option value="@{cha|max}">CHA</option>
+							  <option value="@{str|max}" data-i18n="str">STR</option>
+							  <option value="@{dex|max}" data-i18n="dex">DEX</option>	
+							  <option value="@{con|max}" data-i18n="con">CON</option>
+							  <option value="@{int|max}" data-i18n="int" selected>INT</option>
+							  <option value="@{wis|max}" data-i18n="wis">WIS</option>
+							  <option value="@{cha|max}" data-i18n="cha">CHA</option>
 							</select></span>
 						<span class="table-data skillsFeats"><input type="checkbox" value="5" name="attr_Knowledge-TechnologyFeat" title="Trained in Knowledge (Technology)?" /></span> <!-- Skill Training -->
 						<span class="table-data skillsFeats"><input type="checkbox" value="5" name="attr_Knowledge-TechnologyFeat_max" title="Focused in Knowledge (Technology)?" /></span> <!-- Skill Focus -->
@@ -1097,12 +1090,12 @@
 						<span class="table-data"><input type="number" name="attr_Mechanics" value="@{MechanicsFormula}" disabled="true" title="Mechanics Total @{Mechanics}" class="skills" /></span> 
 						<span class="table-data">&nbsp;=&nbsp;</span>	
 						<span class="table-data"><select name="attr_MechanicsMod" class="modtype" title="Mechanics Mod (default INT)">
-							  <option value="@{str|max}">STR</option>
-							  <option value="@{dex|max}">DEX</option>
-							  <option value="@{con|max}">CON</option>
-							  <option value="@{int|max}" selected>INT</option>
-							  <option value="@{wis|max}">WIS</option>
-							  <option value="@{cha|max}">CHA</option>
+							  <option value="@{str|max}" data-i18n="str">STR</option>
+							  <option value="@{dex|max}" data-i18n="dex">DEX</option>	
+							  <option value="@{con|max}" data-i18n="con">CON</option>
+							  <option value="@{int|max}" data-i18n="int" selected>INT</option>
+							  <option value="@{wis|max}" data-i18n="wis">WIS</option>
+							  <option value="@{cha|max}" data-i18n="cha">CHA</option>
 							</select></span>
 						<span class="table-data skillsFeats"><input type="checkbox" value="5" name="attr_MechanicsFeat" title="Trained in Mechanics?" /></span> <!-- Skill Training -->
 						<span class="table-data skillsFeats"><input type="checkbox" value="5" name="attr_MechanicsFeat_max" title="Focused in Mechanics?" /></span> <!-- Skill Focus -->
@@ -1140,12 +1133,12 @@
 						<span class="table-data"><input type="number" name="attr_Perception" value="@{PerceptionFormula}" disabled="true" title="Perception Total @{Perception}" class="skills" /></span> 
 						<span class="table-data">&nbsp;=&nbsp;</span>	
 						<span class="table-data"><select name="attr_PerceptionMod" class="modtype" title="Perception Mod (default WIS)">
-							  <option value="@{str|max}">STR</option>
-							  <option value="@{dex|max}">DEX</option>
-							  <option value="@{con|max}">CON</option>
-							  <option value="@{int|max}">INT</option>
-							  <option value="@{wis|max}" selected>WIS</option>
-							  <option value="@{cha|max}">CHA</option>
+							  <option value="@{str|max}" data-i18n="str">STR</option>
+							  <option value="@{dex|max}" data-i18n="dex">DEX</option>	
+							  <option value="@{con|max}" data-i18n="con">CON</option>
+							  <option value="@{int|max}" data-i18n="int">INT</option>
+							  <option value="@{wis|max}" data-i18n="wis" selected>WIS</option>
+							  <option value="@{cha|max}" data-i18n="cha">CHA</option>
 							</select></span>
 						<span class="table-data skillsFeats"><input type="checkbox" value="5" name="attr_PerceptionFeat" title="Trained in Perception?" /></span> <!-- Skill Training -->
 						<span class="table-data skillsFeats"><input type="checkbox" value="5" name="attr_PerceptionFeat_max" title="Focused in Perception?" /></span> <!-- Skill Focus -->
@@ -1183,12 +1176,12 @@
 						<span class="table-data"><input type="number" name="attr_Persuasion" value="@{PersuasionFormula}" disabled="true" title="Persuasion Total @{Persuasion}" class="skills" /></span> 
 						<span class="table-data">&nbsp;=&nbsp;</span>	
 						<span class="table-data"><select name="attr_PersuasionMod" class="modtype" title="Persuasion Mod (default CHA)">
-							  <option value="@{str|max}">STR</option>
-							  <option value="@{dex|max}">DEX</option>
-							  <option value="@{con|max}">CON</option>
-							  <option value="@{int|max}">INT</option>
-							  <option value="@{wis|max}">WIS</option>
-							  <option value="@{cha|max}" selected>CHA</option>
+							  <option value="@{str|max}" data-i18n="str">STR</option>
+							  <option value="@{dex|max}" data-i18n="dex">DEX</option>	
+							  <option value="@{con|max}" data-i18n="con">CON</option>
+							  <option value="@{int|max}" data-i18n="int">INT</option>
+							  <option value="@{wis|max}" data-i18n="wis">WIS</option>
+							  <option value="@{cha|max}" data-i18n="cha" selected>CHA</option>
 							</select></span>
 						<span class="table-data skillsFeats"><input type="checkbox" value="5" name="attr_PersuasionFeat" title="Trained in Persuasion?" /></span> <!-- Skill Training -->
 						<span class="table-data skillsFeats"><input type="checkbox" value="5" name="attr_PersuasionFeat_max" title="Focused in Persuasion?" /></span> <!-- Skill Focus -->
@@ -1226,12 +1219,12 @@
 						<span class="table-data"><input type="number" name="attr_Pilot" value="@{PilotFormula}" disabled="true" title="Pilot Total @{Pilot}" class="skills" /></span> 
 						<span class="table-data">&nbsp;=&nbsp;</span>	
 						<span class="table-data"><select name="attr_PilotMod" class="modtype" title="Pilot Mod (default DEX)">
-							  <option value="@{str|max}">STR</option>
-							  <option value="@{dex|max}" selected>DEX</option>
-							  <option value="@{con|max}">CON</option>
-							  <option value="@{int|max}">INT</option>
-							  <option value="@{wis|max}">WIS</option>
-							  <option value="@{cha|max}">CHA</option>
+							  <option value="@{str|max}" data-i18n="str">STR</option>
+							  <option value="@{dex|max}" data-i18n="dex"  selected>DEX</option>	
+							  <option value="@{con|max}" data-i18n="con">CON</option>
+							  <option value="@{int|max}" data-i18n="int">INT</option>
+							  <option value="@{wis|max}" data-i18n="wis">WIS</option>
+							  <option value="@{cha|max}" data-i18n="cha">CHA</option>
 							</select></span>
 						<span class="table-data skillsFeats"><input type="checkbox" value="5" name="attr_PilotFeat" title="Trained in Pilot?" /></span> <!-- Skill Training -->
 						<span class="table-data skillsFeats"><input type="checkbox" value="5" name="attr_PilotFeat_max" title="Focused in Pilot?" /></span> <!-- Skill Focus -->
@@ -1269,12 +1262,12 @@
 						<span class="table-data"><input type="number" name="attr_Ride" value="@{RideFormula}" disabled="true" title="Ride Total @{Ride}" class="skills" /></span> 
 						<span class="table-data">&nbsp;=&nbsp;</span>	
 						<span class="table-data"><select name="attr_RideMod" class="modtype" title="Ride Mod (default DEX)">
-							  <option value="@{str|max}">STR</option>
-							  <option value="@{dex|max}" selected>DEX</option>
-							  <option value="@{con|max}">CON</option>
-							  <option value="@{int|max}">INT</option>
-							  <option value="@{wis|max}">WIS</option>
-							  <option value="@{cha|max}">CHA</option>
+							  <option value="@{str|max}" data-i18n="str">STR</option>
+							  <option value="@{dex|max}" data-i18n="dex"  selected>DEX</option>	
+							  <option value="@{con|max}" data-i18n="con">CON</option>
+							  <option value="@{int|max}" data-i18n="int">INT</option>
+							  <option value="@{wis|max}" data-i18n="wis">WIS</option>
+							  <option value="@{cha|max}" data-i18n="cha">CHA</option>
 							</select></span>
 						<span class="table-data skillsFeats"><input type="checkbox" value="5" name="attr_RideFeat" title="Trained in Ride?" /></span> <!-- Skill Training -->
 						<span class="table-data skillsFeats"><input type="checkbox" value="5" name="attr_RideFeat_max" title="Focused in Ride?" /></span> <!-- Skill Focus -->
@@ -1312,12 +1305,12 @@
 						<span class="table-data"><input type="number" name="attr_Stealth" value="@{StealthFormula}" disabled="true" title="Stealth Total @{Stealth}" class="skills" /></span> 
 						<span class="table-data">&nbsp;=&nbsp;</span>	
 						<span class="table-data"><select name="attr_StealthMod" class="modtype" title="Stealth Mod (default DEX)">
-							  <option value="@{str|max}">STR</option>
-							  <option value="@{dex|max}" selected>DEX</option>
-							  <option value="@{con|max}">CON</option>
-							  <option value="@{int|max}">INT</option>
-							  <option value="@{wis|max}">WIS</option>
-							  <option value="@{cha|max}">CHA</option>
+							  <option value="@{str|max}" data-i18n="str">STR</option>
+							  <option value="@{dex|max}" data-i18n="dex"  selected>DEX</option>	
+							  <option value="@{con|max}" data-i18n="con">CON</option>
+							  <option value="@{int|max}" data-i18n="int">INT</option>
+							  <option value="@{wis|max}" data-i18n="wis">WIS</option>
+							  <option value="@{cha|max}" data-i18n="cha">CHA</option>
 							</select></span>
 						<span class="table-data skillsFeats"><input type="checkbox" value="5" name="attr_StealthFeat" title="Trained in Stealth?" /></span> <!-- Skill Training -->
 						<span class="table-data skillsFeats"><input type="checkbox" value="5" name="attr_StealthFeat_max" title="Focused in Stealth?" /></span> <!-- Skill Focus -->
@@ -1356,12 +1349,12 @@
 						<span class="table-data"><input type="number" name="attr_Survival" value="@{SurvivalFormula}" disabled="true" title="Survival Total @{Survival}" class="skills" /></span> 
 						<span class="table-data">&nbsp;=&nbsp;</span>	
 						<span class="table-data"><select name="attr_SurvivalMod" class="modtype" title="Survival Mod (default WIS)">
-							  <option value="@{str|max}">STR</option>
-							  <option value="@{dex|max}">DEX</option>
-							  <option value="@{con|max}">CON</option>
-							  <option value="@{int|max}">INT</option>
-							  <option value="@{wis|max}" selected>WIS</option>
-							  <option value="@{cha|max}">CHA</option>
+							  <option value="@{str|max}" data-i18n="str">STR</option>
+							  <option value="@{dex|max}" data-i18n="dex">DEX</option>	
+							  <option value="@{con|max}" data-i18n="con">CON</option>
+							  <option value="@{int|max}" data-i18n="int">INT</option>
+							  <option value="@{wis|max}" data-i18n="wis" selected>WIS</option>
+							  <option value="@{cha|max}" data-i18n="cha">CHA</option>
 							</select></span>
 						<span class="table-data skillsFeats"><input type="checkbox" value="5" name="attr_SurvivalFeat" title="Trained in Survival?" /></span> <!-- Skill Training -->
 						<span class="table-data skillsFeats"><input type="checkbox" value="5" name="attr_SurvivalFeat_max" title="Focused in Survival?" /></span> <!-- Skill Focus -->
@@ -1400,11 +1393,11 @@
 						<span class="table-data">&nbsp;=&nbsp;</span>	
 						<span class="table-data"><select name="attr_SwimMod" class="modtype" title="Swim Mod (default STR)">
 							  <option value="@{str|max}" selected>STR</option>
-							  <option value="@{dex|max}">DEX</option>
-							  <option value="@{con|max}">CON</option>
-							  <option value="@{int|max}">INT</option>
-							  <option value="@{wis|max}">WIS</option>
-							  <option value="@{cha|max}">CHA</option>
+							  <option value="@{dex|max}" data-i18n="dex">DEX</option>	
+							  <option value="@{con|max}" data-i18n="con">CON</option>
+							  <option value="@{int|max}" data-i18n="int">INT</option>
+							  <option value="@{wis|max}" data-i18n="wis">WIS</option>
+							  <option value="@{cha|max}" data-i18n="cha">CHA</option>
 							</select></span>
 						<span class="table-data skillsFeats"><input type="checkbox" value="5" name="attr_SwimFeat" title="Trained in Swim?" /></span> <!-- Skill Training -->
 						<span class="table-data skillsFeats"><input type="checkbox" value="5" name="attr_SwimFeat_max" title="Focused in Swim?" /></span> <!-- Skill Focus -->
@@ -1442,12 +1435,12 @@
 						<span class="table-data"><input type="number" name="attr_TreatInjury" value="@{TreatInjuryFormula}" disabled="true" title="Treat Injury Total @{TreatInjury}" class="skills" /></span> 
 						<span class="table-data">&nbsp;=&nbsp;</span>	
 						<span class="table-data"><select name="attr_TreatInjuryMod" class="modtype" title="Treat Injury Mod (default WIS)">
-							  <option value="@{str|max}">STR</option>
-							  <option value="@{dex|max}">DEX</option>
-							  <option value="@{con|max}">CON</option>
-							  <option value="@{int|max}">INT</option>
-							  <option value="@{wis|max}" selected>WIS</option>
-							  <option value="@{cha|max}">CHA</option>
+							  <option value="@{str|max}" data-i18n="str">STR</option>
+							  <option value="@{dex|max}" data-i18n="dex">DEX</option>	
+							  <option value="@{con|max}" data-i18n="con">CON</option>
+							  <option value="@{int|max}" data-i18n="int">INT</option>
+							  <option value="@{wis|max}" data-i18n="wis" selected>WIS</option>
+							  <option value="@{cha|max}" data-i18n="cha">CHA</option>
 							</select></span>
 						<span class="table-data skillsFeats"><input type="checkbox" value="5" name="attr_TreatInjuryFeat" title="Trained in Treat Injury?" /></span> <!-- Skill Training -->
 						<span class="table-data skillsFeats"><input type="checkbox" value="5" name="attr_TreatInjuryFeat_max" title="Focused in Treat Injury?" /></span> <!-- Skill Focus -->
@@ -1485,12 +1478,12 @@
 						<span class="table-data"><input type="number" name="attr_UseComputer" value="@{UseComputerFormula}" disabled="true" title="Use Computer Total @{UseComputer}" class="skills" /></span> 
 						<span class="table-data">&nbsp;=&nbsp;</span>	
 						<span class="table-data"><select name="attr_UseComputerMod" class="modtype" title="Use Computer Mod (default INT)">
-							  <option value="@{str|max}">STR</option>
-							  <option value="@{dex|max}">DEX</option>
-							  <option value="@{con|max}">CON</option>
-							  <option value="@{int|max}" selected>INT</option>
-							  <option value="@{wis|max}">WIS</option>
-							  <option value="@{cha|max}">CHA</option>
+							  <option value="@{str|max}" data-i18n="str">STR</option>
+							  <option value="@{dex|max}" data-i18n="dex">DEX</option>	
+							  <option value="@{con|max}" data-i18n="con">CON</option>
+							  <option value="@{int|max}" data-i18n="int" selected>INT</option>
+							  <option value="@{wis|max}" data-i18n="wis">WIS</option>
+							  <option value="@{cha|max}" data-i18n="cha">CHA</option>
 							</select></span>
 						<span class="table-data skillsFeats"><input type="checkbox" value="5" name="attr_UseComputerFeat" title="Trained in Use Computer?" /></span> <!-- Skill Training -->
 						<span class="table-data skillsFeats"><input type="checkbox" value="5" name="attr_UseComputerFeat_max" title="Focused in Use Computer?" /></span> <!-- Skill Focus -->
@@ -1528,12 +1521,12 @@
 					<span class="table-data"><input type="number" class="skills" name="attr_UsetheForce" value="@{UsetheForceFormula}" disabled="true" title="Use the Force Total @{UsetheForce}" /></span> 
 					<span class="table-data">&nbsp;=&nbsp;</span>	
 					<span class="table-data"><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>
-						  <option value="@{con|max}">CON</option>
-						  <option value="@{int|max}">INT</option>
-						  <option value="@{wis|max}">WIS</option>
-						  <option value="@{cha|max}" selected>CHA</option>
+						  <option value="@{str|max}" data-i18n="str">STR</option>
+						  <option value="@{dex|max}" data-i18n="dex">DEX</option>	
+						  <option value="@{con|max}" data-i18n="con">CON</option>
+						  <option value="@{int|max}" data-i18n="int">INT</option>
+						  <option value="@{wis|max}" data-i18n="wis">WIS</option>
+						  <option value="@{cha|max}" data-i18n="cha" selected>CHA</option>
 						</select></span>
 					<span class="table-data skillsFeats"><input type="checkbox" value="5" name="attr_UsetheForceFeat" title="Trained in Use the Force?" /></span> <!-- Skill Training -->
 					<span class="table-data skillsFeats"><input type="checkbox" value="5" name="attr_UsetheForceFeat_max" title="Focused in Use the Force?" /></span> <!-- Skill Focus -->
@@ -1700,7 +1693,8 @@
 				<span class="table-data">	<textarea type="text" name="attr_EquipmentNotes" class="atkNotes" title="Item Notes @{repeating_equipment_X_EquipmentNotes}"  placeholder="Item Notes"></textarea>	</span>
 			</div>
 		</div>
-		</fieldset>			<input type="number" value="0" name="attr_EquipmentWtRunningTotal" class="hidden" /> <input type="number" value="0" name="attr_EquipmentCostRunningTotal" class="hidden" />
+		</fieldset>			<input type="number" value="0" name="attr_EquipmentWtRunningTotal" class="hidden" /> <input type="number" value="0" name="attr_EquipmentCostRunningTotal" class="hidden" />	 <input type="text" value="" name="attr_inventoryrunningsummary" class="hidden" />
+		<input type="text" value="" name="attr_inventory" class="hidden" />	
 	</div>
 	<div class="clear"></div>
 	<hr>
@@ -1749,9 +1743,9 @@
 		</div>
 		<div class="col">
 			<div class="textHead2Col">Reveal Sections</div>
-				<label>Force&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</label><input type="checkbox" class="forceShow" value="1" name="attr_force-Show"  title="Force Sensitive character?"  style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;" /><span></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-				<label>Droid&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</label><input type="checkbox" class="sect-show" value="1" name="attr_droid-Show"  title="Droid character?"  style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;" /><span></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-				<label>Starship Maneuvers&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</label><input type="checkbox" class="sect-show" value="1" name="attr_StarshipManeuvers-Show"  title="Starship Maneuvers"  style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;" /><span></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+				<label>Force</label>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" class="forceShow" value="1" name="attr_force-Show"  title="Force Sensitive character?"  style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;" /><span></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+				<label>Droid</label>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" class="sect-show" value="1" name="attr_droid-Show"  title="Droid character?"  style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;" /><span></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+				<label>Starship Maneuvers</label>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" class="sect-show" value="1" name="attr_StarshipManeuvers-Show"  title="Starship Maneuvers"  style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;" /><span></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 		</div>
 	</div>
 		<div class="clear"></div>
@@ -1870,7 +1864,7 @@
 				<tr>	<td colspan="5"><div class="textHead">Threshold</div> </td>		<td width="15px"></td>	</tr>
 				<tr><th>Total</th>	<th></th>	<th>Defense</th> <th>Misc</th>		</tr>
 				<tr>	
-					<td><input type="number" name="attr_NPC-DT" value="@{NPC-DamageThresholdDefense}+@{DamageThresholdMisc}[Misc]+@{NPC-CTIgnoreDT}"  disabled="true" title="Damage Threshold" /></td>
+					<td><input type="number" name="attr_NPC-DT" value="@{NPC-DamageThresholdDefense}+@{DamageThresholdMisc}[Misc]+@{DamageThresholdSize}[Size]+@{NPC-CTIgnoreDT}"  disabled="true" title="Damage Threshold" /></td>
 					<td>&nbsp;=&nbsp;</td>
 					<td><select name="attr_NPC-DamageThresholdDefense" class="modtype" title="Damage Threshold Defense">
 					  <option value="@{NPC-Fortitude}" selected>Fort</option>
@@ -1932,11 +1926,11 @@
 				</tr>
 				<tr>
 					<td><button type="roll" name="roll_NPC-GrappleCheck" value="&{template:skill} {{name=Grapple}} {{skill=[[1d20+@{NPC-Grapple}+?{Other Modifiers|0}[Other]]]}}" title="Roll Grapple"></button></td>
-					<td><input type="number" name="attr_NPC-Grapple" value="@{BAB} + @{GrpMod}[Mod] + @{GrpMod|max} +@{npc-ct}" disabled="true" title="Grapple" /></td>
+					<td><input type="number" name="attr_NPC-Grapple" value="@{BAB} + @{GrpMod}[Mod] + @{GrpMod|max} + @{GrappleSize} +@{npc-ct}" disabled="true" title="Grapple" /></td>
 					<td>&nbsp;=&nbsp;</td>
 					<td> <select name="attr_GrpMod" class="modtype" title="Choose the highest modifier">
-					  <option value="@{str|max}">STR</option>
-					  <option value="@{dex|max}">DEX</option>
+					  <option value="@{str|max}" data-i18n="str">STR</option>
+					  <option value="@{dex|max}" data-i18n="dex">DEX</option>	
 					</select></td>
 					<td>&nbsp;+&nbsp;</td>
 					<td><input type="number" name="attr_GrpMod_max" value="0" title="Miscellaneous Grapple Modifier" /></td>
@@ -1959,13 +1953,13 @@
 					<td class="col1" rowspan="2">Reflex</td>
 					<td></td>
 					<td><input type="number" name="attr_NPC-Reflex" value="@{RefTotal}+@{npc-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}[Half Level]+@{Dex|max} or enter the total Defence Score)"/></td>
+					<td><input type="text" name="attr_RefTotal" value="10+@{level}+@{Dex|max}+@{RefSizeMod}"  title="Reflex Total (You can use formulas, for example: 10+@{level|max}[Half Level]+@{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_NPC-ReflexFlatFooted" value="@{RefTotal|max}+@{npc-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>
+					<td><input type="text" name="attr_RefTotal_max" value="10+@{level}+@{RefSizeMod}"  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>
@@ -2042,7 +2036,7 @@
 							<span class="table-data" style="width:44px">		</span> 
 							<span class="table-data atkFormula">							
 								<span class="small"><b>Template Formula</b></span>	<br />						
-								<textarea type="text" name="attr_AttackFormula" class="atkFormula" title="Attack Template formula @{repeating_npc-attack_X_AttackFormula}" >&{template:attack} {{name=@{WeaponName}}} {{type=@{WeaponName|max}}} {{attack=[[1d20cs>@{WeaponCrit} + @{AttackTotal} + ?{Other Modifiers (Attack)|0}]]}} {{atkeffect=@{WeaponNotes|max}}} {{damage=[[@{damage}+@{damageTotal}]]}} {{dmgcrit=[[(@{damage}+@{damageTotal})*@{WeaponCrit|max}}}</textarea> 
+								<textarea type="text" name="attr_AttackFormula" class="atkFormula" title="Attack Template formula @{repeating_npc-attack_X_AttackFormula}" >&{template:attack} {{name=@{WeaponName}}} {{type=@{WeaponName|max}}} {{attack=[[1d20cs>@{WeaponCrit} + @{AttackTotal} + ?{Other Modifiers (Attack)|0}]]}} {{atkeffect=@{WeaponNotes|max}}} {{damage=[[@{damage}+@{damageTotal}]]}} {{dmgcrit=[[(@{damage}+@{damageTotal})*@{WeaponCrit|max}]]}}</textarea> 
 							</span>
 						</div>	</span>
 					</div>
@@ -2081,12 +2075,12 @@
 						<span class="table-data"><input type="number" name="attr_Initiative" value="@{InitiativeFormula}" disabled="true" title="Initiative Total @{Initiative}" class="skills" /></span> 
 						<span class="table-data">&nbsp;=&nbsp;</span>	
 						<span class="table-data"><select name="attr_InitiativeMod" class="modtype" title="Initiative Mod (default WIS)">
-							  <option value="@{str|max}">STR</option>
-							  <option value="@{dex|max}" selected>DEX</option>
-							  <option value="@{con|max}">CON</option>
-							  <option value="@{int|max}">INT</option>
-							  <option value="@{wis|max}">WIS</option>
-							  <option value="@{cha|max}">CHA</option>
+							  <option value="@{str|max}" data-i18n="str">STR</option>
+							  <option value="@{dex|max}" data-i18n="dex"  selected>DEX</option>	
+							  <option value="@{con|max}" data-i18n="con">CON</option>
+							  <option value="@{int|max}" data-i18n="int">INT</option>
+							  <option value="@{wis|max}" data-i18n="wis">WIS</option>
+							  <option value="@{cha|max}" data-i18n="cha">CHA</option>
 							</select></span>
 						<span class="table-data skillsFeats"><input type="checkbox" value="5" name="attr_InitiativeFeat" title="Trained in Initiative?" /></span> <!-- Skill Training -->
 						<span class="table-data skillsFeats"><input type="checkbox" value="5" name="attr_InitiativeFeat_max" title="Focused in Initiative?" /></span> <!-- Skill Focus -->
@@ -2109,7 +2103,7 @@
 							<span class="table-data" style="min-width:50px">	</span>
 							<span class="table-data atkFormula">
 								<span class="small"><b>Skill Modifier Total Formula</b></span>	<br />
-								<textarea type="text" name="attr_InitiativeFormula" class="atkFormula" title="Skill Total formula @{InitiativeFormula}" >@{level|max}[Half Level]+@{InitiativeMod}[Mod]+@{InitiativeFeat}[Training]+@{InitiativeFeat|max}[Focus]+@{InitiativeMisc}[Misc]+@{CT}[CT]</textarea> 							
+								<textarea type="text" name="attr_InitiativeFormula" class="atkFormula" title="Skill Total formula @{InitiativeFormula}" >@{level|max}[Half Level]+@{InitiativeMod}[Mod]+@{InitiativeFeat}[Training]+@{InitiativeFeat|max}[Focus]+@{ArmorType|max}[Armor Penalty]+@{EquipmentLoad}[Heavy Load]+@{InitiativeMisc}[Misc]+@{CT}[CT]</textarea> 							
 								<span class="small"><b>Template Formula</b></span>	<br />
 								<textarea type="text" name="attr_InitiativeFormula_max" class="atkFormula" title="Skill Template formula @{InitiativeFormula|max}" >&{template:skill} {{name=Initiative}} {{skill=[[1d20 + @{Initiative} + ?{Other Modifiers|0}[Other]]]}}</textarea> 
 							</span>
@@ -2124,12 +2118,12 @@
 						<span class="table-data"><input type="number" name="attr_Perception" value="@{PerceptionFormula}" disabled="true" title="Perception Total @{Perception}" class="skills" /></span> 
 						<span class="table-data">&nbsp;=&nbsp;</span>	
 						<span class="table-data"><select name="attr_PerceptionMod" class="modtype" title="Perception Mod (default DEX)">
-							  <option value="@{str|max}">STR</option>
-							  <option value="@{dex|max}">DEX</option>
-							  <option value="@{con|max}">CON</option>
-							  <option value="@{int|max}">INT</option>
-							  <option value="@{wis|max}" selected>WIS</option>
-							  <option value="@{cha|max}">CHA</option>
+							  <option value="@{str|max}" data-i18n="str">STR</option>
+							  <option value="@{dex|max}" data-i18n="dex">DEX</option>	
+							  <option value="@{con|max}" data-i18n="con">CON</option>
+							  <option value="@{int|max}" data-i18n="int">INT</option>
+							  <option value="@{wis|max}" data-i18n="wis" selected>WIS</option>
+							  <option value="@{cha|max}" data-i18n="cha">CHA</option>
 							</select></span>
 						<span class="table-data skillsFeats"><input type="checkbox" value="5" name="attr_PerceptionFeat" title="Trained in Perception?" /></span> <!-- Skill Training -->
 						<span class="table-data skillsFeats"><input type="checkbox" value="5" name="attr_PerceptionFeat_max" title="Focused in Perception?" /></span> <!-- Skill Focus -->
@@ -2167,12 +2161,12 @@
 						<span class="table-data"><input type="number" name="attr_Pilot" value="@{PilotFormula}" disabled="true" title="Pilot Total @{Pilot}" class="skills" /></span> 
 						<span class="table-data">&nbsp;=&nbsp;</span>	
 						<span class="table-data"><select name="attr_PilotMod" class="modtype" title="Pilot Mod (default DEX)">
-							  <option value="@{str|max}">STR</option>
-							  <option value="@{dex|max}" selected>DEX</option>
-							  <option value="@{con|max}">CON</option>
-							  <option value="@{int|max}">INT</option>
-							  <option value="@{wis|max}">WIS</option>
-							  <option value="@{cha|max}">CHA</option>
+							  <option value="@{str|max}" data-i18n="str">STR</option>
+							  <option value="@{dex|max}" data-i18n="dex"  selected>DEX</option>	
+							  <option value="@{con|max}" data-i18n="con">CON</option>
+							  <option value="@{int|max}" data-i18n="int">INT</option>
+							  <option value="@{wis|max}" data-i18n="wis">WIS</option>
+							  <option value="@{cha|max}" data-i18n="cha">CHA</option>
 							</select></span>
 						<span class="table-data skillsFeats"><input type="checkbox" value="5" name="attr_PilotFeat" title="Trained in Pilot?" /></span> <!-- Skill Training -->
 						<span class="table-data skillsFeats"><input type="checkbox" value="5" name="attr_PilotFeat_max" title="Focused in Pilot?" /></span> <!-- Skill Focus -->
@@ -2202,6 +2196,49 @@
 						</div>
 					</div>	</div>
 				</div>
+				<div class="table-row"><div class="table">
+					<div class="table-row">
+						<span class="table-data skillsCol1">	<span>Stealth</span>	
+							<input type="checkbox" class="sect-show skillsHideCheckbox" style="width: 37px;  margin-left: -40px;" value="1" name="attr_Skill-Stealth-Show" title="Show/Hide Stealth Notes" /></span>
+						<span class="table-data"><button type="roll" name="roll_StealthCheck" value="@{StealthFormula|max}"></button></span>
+						<span class="table-data"><input type="number" name="attr_Stealth" value="@{StealthFormula}" disabled="true" title="Stealth Total @{Stealth}" class="skills" /></span> 
+						<span class="table-data">&nbsp;=&nbsp;</span>	
+						<span class="table-data"><select name="attr_StealthMod" class="modtype" title="Stealth Mod (default DEX)">
+							  <option value="@{str|max}" data-i18n="str">STR</option>
+							  <option value="@{dex|max}" data-i18n="dex"  selected>DEX</option>	
+							  <option value="@{con|max}" data-i18n="con">CON</option>
+							  <option value="@{int|max}" data-i18n="int">INT</option>
+							  <option value="@{wis|max}" data-i18n="wis">WIS</option>
+							  <option value="@{cha|max}" data-i18n="cha">CHA</option>
+							</select></span>
+						<span class="table-data skillsFeats"><input type="checkbox" value="5" name="attr_StealthFeat" title="Trained in Stealth?" /></span> <!-- Skill Training -->
+						<span class="table-data skillsFeats"><input type="checkbox" value="5" name="attr_StealthFeat_max" title="Focused in Stealth?" /></span> <!-- Skill Focus -->
+						<span class="table-data"><input type="number" name="attr_StealthMisc" title="Stealth Miscellaneous Modifier" value="0" class="skills" /></span>
+					</div>
+				</div></div>
+				<div>		
+					<!-- Stealth Notes -->	<input type="checkbox" class="sect-show hidden" value="1" name="attr_Skill-Stealth-Show" />
+					<div class="table-row sect"><div class="table">
+						<div class="table-row">
+							<span class="table-data" style="min-width:50px">	</span>
+							<span class="table-data">	<input class="skillsNotes" type="text" name="attr_Stealth_max" placeholder="Stealth Notes" title="Stealth Notes @{Stealth|max}" />	</span>
+							<span class="table-data" style="min-width:15px">	</span>
+							<span class="table-data">	<b>Formula</b>	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" class="sect-show" title="Show/Hide Skill Template Formula_max" name="attr_Skill-Stealth-Formula-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;" /><span></span>	</span>							
+						</div>
+					</div>	</div>	
+					<!-- Stealth Formula -->	<input type="checkbox" class="sect-show hidden" value="1" name="attr_Skill-Stealth-Formula-Show" />	
+					<div class="table-row sect">	<div class="table">
+						<div class="table-row">
+							<span class="table-data" style="min-width:50px">	</span>
+							<span class="table-data atkFormula">							
+								<span class="small"><b>Skill Modifier Total Formula</b></span>	<br />
+								<textarea type="text" name="attr_StealthFormula" class="atkFormula" title="Skill Total formula @{StealthFormula}" >@{level|max}[Half Level]+@{StealthMod}[Mod]+@{StealthFeat}[Training]+@{StealthFeat|max}[Focus]+@{StealthSize}[Size]+@{ArmorType|max}[Armor Penalty]+@{EquipmentLoad}[Heavy Load]+@{StealthMisc}[Misc]+@{CT}[CT]</textarea> 
+								<span class="small"><b>Template Formula</b></span>	<br />
+								<textarea type="text" name="attr_StealthFormula_max" class="atkFormula" title="Skill Template formula @{StealthFormula|max}" >&{template:skill} {{name=Stealth}} {{skill=[[1d20 + @{Stealth} + ?{Other Modifiers|0}[Other]]]}}</textarea> 
+							</span>
+						</div>
+					</div>	</div>
+				</div>
 				<input type="checkbox" class="forceShow hidden" value="1" name="attr_force-Show" />
 				<div class="table-row forceBody"><div class="table">
 					<div class="table-row">	
@@ -2210,12 +2247,12 @@
 					<span class="table-data"><input type="number" class="skills" name="attr_UsetheForce" value="@{UsetheForceFormula}" disabled="true" title="Use the Force Total @{UsetheForce}" /></span> 
 					<span class="table-data">&nbsp;=&nbsp;</span>	
 					<span class="table-data"><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>
-						  <option value="@{con|max}">CON</option>
-						  <option value="@{int|max}">INT</option>
-						  <option value="@{wis|max}">WIS</option>
-						  <option value="@{cha|max}" selected>CHA</option>
+						  <option value="@{str|max}" data-i18n="str">STR</option>
+						  <option value="@{dex|max}" data-i18n="dex">DEX</option>	
+						  <option value="@{con|max}" data-i18n="con">CON</option>
+						  <option value="@{int|max}" data-i18n="int">INT</option>
+						  <option value="@{wis|max}" data-i18n="wis">WIS</option>
+						  <option value="@{cha|max}" data-i18n="cha" selected>CHA</option>
 						</select></span>
 					<span class="table-data skillsFeats"><input type="checkbox" value="5" name="attr_UsetheForceFeat" title="Trained in Use the Force?" /></span> <!-- Skill Training -->
 					<span class="table-data skillsFeats"><input type="checkbox" value="5" name="attr_UsetheForceFeat_max" title="Focused in Use the Force?" /></span> <!-- Skill Focus -->
@@ -2355,9 +2392,9 @@
 		</div>
 		<div class="col">
 			<div class="textHead2Col">Reveal Sections</div>
-				<label>Force&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</label><input type="checkbox" class="forceShow" value="1" name="attr_force-Show"  title="Force Sensitive character?"  style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;" /><span></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-				<label>Droid&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</label><input type="checkbox" class="sect-show" value="1" name="attr_droid-Show"  title="Droid character?"  style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;" /><span></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-				<label>Starship Maneuvers&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</label><input type="checkbox" class="sect-show" value="1" name="attr_StarshipManeuvers-Show"  title="Starship Maneuvers"  style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;" /><span></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+				<label>Force</label>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" class="forceShow" value="1" name="attr_force-Show"  title="Force Sensitive character?"  style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;" /><span></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+				<label>Droid</label>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" class="sect-show" value="1" name="attr_droid-Show"  title="Droid character?"  style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;" /><span></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+				<label>Starship Maneuvers</label>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" class="sect-show" value="1" name="attr_StarshipManeuvers-Show"  title="Starship Maneuvers"  style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;" /><span></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 		</div>
 	</div>
 		<div class="clear"></div>
@@ -2479,7 +2516,7 @@
 				<td><input type="number" name="attr_vehicle-DTFort" value="@{vehicle-Fortitude}"  disabled="true" title="Damage Threshold Fortitude Defence" /></td>				
 				<td>&nbsp;+&nbsp;</td>
 				<td><input type="number" value="0" name="attr_vehicle-DTSizeMod" class="hidden" />	
-					<input type="number" name="attr_vehicle-DamageThresholdMisc" value="20"  title="Damage Threshold Miscellaneous Modifier" /></td>
+					<input type="number" name="attr_vehicle-DamageThresholdMisc" value="0"  title="Damage Threshold Miscellaneous Modifier" /></td>
 			</tr>	
 		</table>
 		<br />
@@ -2669,7 +2706,7 @@
 				</tr>
 				<tr>
 					<td class="skillsCrewCol1">Pilot</td>
-					<td><button type="roll" name="roll_vehicle-PilotCheck" value="&{template:skill} {{crewname=@{vehicle-CrewName} in @{character_name}}} {{name=Pilot}}} {{skill=[[ 1d20+@{vehicle-Pilot}+@{vehicle-CT}+?{Other Modifiers|0}[Other]]]}}" title="Roll Pilot"></button></td>
+					<td><button type="roll" name="roll_vehicle-PilotCheck" value="&{template:skill} {{crewname=@{vehicle-CrewName} in @{character_name}}} {{name=Pilot}} {{skill=[[ 1d20+@{vehicle-Pilot}+@{vehicle-CT}+?{Other Modifiers|0}[Other]]]}}" title="Roll Pilot"></button></td>
 					<td><input type="number" name="attr_vehicle-pilot" value="@{vehicle-sizeMod}[Size]+@{vehicle-dex|max}[Dex]+@{vehicle-pilotMod}[Pilot]+@{vehicle-pilotMisc}[Misc]" disabled="true" title="Pilot Total (includes Vehicle Size Mod and Dex Mod)" />	</td>
 					<td>&nbsp;=&nbsp;</td>	
 					<td><input type="number" name="attr_vehicle-pilotmod" value="0" title="Crew Member's Pilot Check" /></td>
@@ -2784,7 +2821,7 @@
 <!-- start help section --> 
 <div> 
 For Help, please see the wiki page. <input type="text" name="attr_vehicle-EquipmentLocation" style="width:30em" title="Wiki URL" value="https://wiki.roll20.net/Star_Wars_Saga_Edition_Character_Sheet"/> <br/>
-<b>Last updated</b>12/28/2015
+<b>Last updated</b>Oct 3, 2016
 </div>
 
 <!-- start roll templates --> 
@@ -2795,17 +2832,17 @@ For Help, please see the wiki page. <input type="text" name="attr_vehicle-Equipm
 		<tr><th>{{name}}</th></tr>
 		<tr>{{#type}}<td class="subheader">{{type}}{{/type}}</td></tr>
 		{{#attack}}<tr><td><span class="tcat">Attack: </span>{{attack}}</td></tr>{{/attack}}
-		{{#damage}}		
-			<tr><td>
-				<span class="tcat">Damage: </span>{{damage}}	
-				{{#dmgcrit}}					
-					{{#rollWasCrit() attack}}
-						<span class="tcat"> | Crit: </span>{{dmgcrit}}
-					{{/rollWasCrit() attack}}	
-				{{/dmgcrit}}
-			</td></tr>
-		{{/damage}}
 		
+		{{#damage}}<tr><td>				
+				{{#^rollWasCrit() attack}}		
+					<span class="tcat">Damage: </span>{{damage}}		
+				{{/^rollWasCrit() attack}}
+				{{#rollWasCrit() attack}}
+					{{^dmgcrit}}	<span class="tcat">Damage: </span>{{damage}}	{{/dmgcrit}}
+					{{#dmgcrit}}	<span class="tcat">Crit Damage: </span>{{dmgcrit}}	{{/dmgcrit}}
+				{{/rollWasCrit() attack}}			
+		</td></tr>{{/damage}}	
+				
 		{{#allprops() header type atkeffect attack damage dmgcrit}}
 			<tr><td><span class="tcat">{{key}} </span>{{value}}</td></tr>
 		{{/allprops() header type atkeffect attack damage dmgcrit}}
@@ -3543,8 +3580,8 @@ on("change:vehicle-size", function() {
 on("change:repeating_equipment remove:repeating_equipment",function(){
     //TAS.repeatingSimpleSum('equipment','equipmentwt','equipmentrunningtotal');	
 	TAS.repeating('equipment')
-        .attrs('equipmentwtrunningtotal','equipmentcostrunningtotal')  
-        .fields('equipmentqty','equipmentwt','equipmenttotalwt','equipmentcost','equipmenttotalcost',"equipmentcarry") 		
+        .attrs('equipmentwtrunningtotal','equipmentcostrunningtotal', "inventoryrunningsummary")  
+        .fields('equipmentqty','equipmentwt','equipmenttotalwt','equipmentcost','equipmenttotalcost',"equipmentcarry", "equipmentitem", "equipmentnotes") 		
         .reduce(function(m,r){
 			m.weightTotal=(r.F.equipmentwt*r.I.equipmentqty)
 			m.costTotal=(r.I.equipmentcost*r.I.equipmentqty)
@@ -3553,11 +3590,14 @@ on("change:repeating_equipment remove:repeating_equipment",function(){
 			m.cost+=m.costTotal;
 			r.D[0].equipmenttotalcost=m.costTotal;
 //			console.log("== Equipment Row Check ==" + '\n' +"equipmentqty = " + r.I.equipmentqty + '\n' +"carryCheck = " + r.equipmentcarry + '\n' +"Weight (base | total) = " + r.equipmentwt + " | " +m.weightTotal + '\n' +"Cost (base | total) = " + r.equipmentcost+ ' | ' + m.costTotal);
+			m.desc.push(r.equipmentitem+(r.I.equipmentqty>1 ? ' (x'+r.S.equipmentqty+')' : '')+(r.equipmentnotes ? ' ['+r.equipmentnotes+']' : '') );
 			return m;
-        },{weight:0,cost:0},function(m,r,a){
+        },{weight:0,cost:0, desc: []},function(m,r,a){
+			a.inventoryrunningsummary = m.desc.join(', ');
 			console.log("===== Equipment Running Totals =====" + '\n' +"EquipmentWtRunningTotal = " + m.weight + '\n' +"EquipmentCostRunningTotal = " + m.cost);
             a.D[1].equipmentwtrunningtotal=m.weight;
             a.I.equipmentcostrunningtotal=m.cost;
+			
         })
         .execute(); 
 });
@@ -3577,11 +3617,28 @@ on("change:equipmentwtrunningtotal change:armorwt change:armorcarry change:str",
 });
 on("change:equipmentcostrunningtotal change:armortotalcost",function(){	
 	getAttrs(["EquipmentCostRunningTotal", "ArmorTotalCost"], function(v) {
-		TotalCost = parseInt(v["EquipmentCostRunningTotal"]) + parseInt(v["ArmorTotalCost"]);
+		if(v["ArmorTotalCost"]){ArmorCost = parseInt(v["ArmorTotalCost"])} else {ArmorCost = 0}
+		TotalCost = parseInt(v["EquipmentCostRunningTotal"]) + ArmorCost;
 		console.log("===== Equipment Worth Totals =====" + '\n' +"EquipmentCostRunningTotal = " + v["EquipmentCostRunningTotal"] + '\n' +"TotalCost = " + TotalCost);
-		setAttrs({"TotalEquipmentWorth": TotalCost});	;
+		setAttrs({"TotalEquipmentWorth": TotalCost});
 	});
 });
+on("change:inventoryrunningsummary change:ArmorWorn",function(){	
+	getAttrs(["inventoryrunningsummary", "ArmorWorn", "ArmorNotes", "ArmorRef", "ArmorFort"], function(v) {
+		armorAttr = " ("+v["ArmorRef"] +" armor, +"+ v["ArmorFort"] +" equipment)"
+		if(v["ArmorWorn"] && v["ArmorNotes"] ) {armorDesc = v["ArmorWorn"] + armorAttr + " ["+ v["ArmorNotes"] +"]"}
+		else if(v["ArmorWorn"]) {armorDesc = v["ArmorWorn"] + armorAttr}
+		else {armorDesc = ""}
+		
+		if (v["inventoryrunningsummary"].length > 0 && armorDesc.length > 0) {summary = armorDesc +", " + v["inventoryrunningsummary"]}
+		else if(v["inventoryrunningsummary"].length == 0 && armorDesc.length > 0) {summary = armorDesc}
+		else if(v["inventoryrunningsummary"].length > 0 && armorDesc.length == 0) {summary = v["inventoryrunningsummary"]}
+		else {summary = ""}
+		console.log("===== Equipment Summary =====" + '\n' + summary);
+		setAttrs({"inventory": summary});
+	});
+});
+
 
 // ====== Functions ====== \\
 var ArmorPerception = function() {