diff --git a/Star Wars Saga Edition/StarWarsSagaEdition.css b/Star Wars Saga Edition/StarWarsSagaEdition.css
index dbf7181f4a..a075651a32 100644
--- a/Star Wars Saga Edition/StarWarsSagaEdition.css	
+++ b/Star Wars Saga Edition/StarWarsSagaEdition.css	
@@ -212,6 +212,8 @@
 .immuneShow:not(:checked) ~ .immuneBody,
 .DefArmorLevelShow:not(:checked) ~ .DefArmorLevelBody,
 .PerceptionShow:not(:checked) ~ .PerceptionBody,
+.athleticsShow:not(:checked) ~ .athleticsBody,
+.athleticsShow:checked ~ .noathleticsBody,
 .sectAttack-show:checked ~ .sectAttack,
 .sect-show:not(:checked) ~ .sect {
     display: none;
diff --git a/Star Wars Saga Edition/StarWarsSagaEdition.html b/Star Wars Saga Edition/StarWarsSagaEdition.html
index 885051da80..53489ca71f 100644
--- a/Star Wars Saga Edition/StarWarsSagaEdition.html	
+++ b/Star Wars Saga Edition/StarWarsSagaEdition.html	
@@ -101,7 +101,7 @@
 						<td width="15px" rowspan="7"></td>
 						<td>&nbsp;&nbsp;</td>
 						<td><div class="sheet-textHead"><span data-i18n="condition">Condition</span></div></td>	</tr>
-				<tr><th>Current</th>		<th></th>	<th>Total</th> <th>Bonus</th>
+				<tr><th><span data-i18n="current">Current</span></th>		<th></th>	<th><span data-i18n="total">Total</span></th> <th>Bonus</th>
 					<td></td>
 					<td>&nbsp;&nbsp;</td>
 					<!-- rowspan placholder -->
@@ -121,7 +121,7 @@
 					<td></td>
 				</tr>
 				<tr>	<td colspan="4"><div class="sheet-textHead" style="margin-top:2px"><span data-i18n="second-wind">Second Wind</span></div> </td>			</tr>
-				<tr><th></th>		<th></th>	<th>Current</th> <th>Total</th>
+				<tr><th></th>		<th></th>	<th><span data-i18n="current">Current</span></th> <th><span data-i18n="total">Total</span></th>
 				<tr>
 						<input type="hidden" name="attr_hidden_second_wind" value="1" />
 						<td><button type="action" name="act_SecondWind" title="Take second wind">Take</button></td>
@@ -382,7 +382,7 @@
 								<span class="sheet-table-header" style="min-width:44px"></span>
 								<span class="sheet-table-header" style="min-width:55px;"></span>
 							<input type="checkbox" class="sectAttack-show sheet-hidden" name="attr_AttackDamage-show" value="1"/>	
-								<span class="sheet-table-header sectAttack not-show" style="min-width:130px">Total</span>
+								<span class="sheet-table-header sectAttack not-show" style="min-width:130px" data-i18n="total">Total</span>
 								<span class="sheet-table-header sectAttack"></span>
 								<span class="sheet-table-header sectAttack" style="min-width:80px">Mod</span>					
 								<span class="sheet-table-header sectAttack"></span>
@@ -411,7 +411,7 @@
 						<div class="sheet-table-row sect">
 							<span class="sheet-table-data" style="min-width:44px">		</span> 
 							<span class="sheet-table-data atkFormula">
-								<span class="sheet-small"><b>Attack Modifier Total Formula</b></span>	<br />
+								<span class="sheet-small"><b><span data-i18n="attack">Attack</span> <span data-i18n="modifier_total_formula">Modifier Total Formula</span></b></span>	<br />
 								<textarea type="text" name="attr_AttackTotal" class="atkFormula" title="Attack Total formula @{repeating_attack_X_AttackTotal}" >@{BAB}[BAB] + @{attackMod}[Mod] + @{attackModMisc}[Misc] +@{CT}[CT] +@{ArmorType|max}[Armor Penalty] </textarea> 							
 								<span class="sheet-small"><b>Attack Roll Formula</b></span>	<br />
 								<textarea type="text" name="attr_WeaponAttack" class="atkFormula" title="Attack formula @{repeating_attack_X_WeaponAttack}" >1d20cs>@{WeaponCrit}[Critical Range] + @{attackTotal} + ?{Other Modifiers (Attack)|0}[Other]</textarea> 
@@ -447,7 +447,7 @@
 						<div class="sheet-table-row sect">
 							<span class="sheet-table-data" style="width:44px">		</span> 
 							<span class="sheet-table-data atkFormula">	
-								<span class="sheet-small"><b>Damage Modifier Total Formula</b></span>	<br />						
+								<span class="sheet-small"><b><span data-i18n="damage">Damage</span> <span data-i18n="modifier_total_formula">Modifier Total Formula</span></b></span>	<br />						
 								<textarea type="text" name="attr_DamageTotal" class="atkFormula" title="Damage Total formula @{repeating_attack_X_DamageTotal}" >[[(floor(@{level}/2))]][Half Level] + @{damageMod}[Mod] + @{damageMisc}[Misc]</textarea> 	
 								<span class="sheet-small"><b>Damage Roll Formula</b></span>	<br />					
 								<textarea type="text" name="attr_WeaponDamage" class="atkFormula" title="Damage formula @{repeating_attack_X_WeaponDamage}" >@{damage}[Damage] + @{DamageTotal}</textarea> 
@@ -491,21 +491,22 @@
 		</div>	
 		<div class="sheet-col">
 <!--			<input type="checkbox" class="forceShow sheet-hidden" value="1" name="attr_force-Show" />			-->
-			<div class="sheet-textHead2Col">Skills</div>
+			<div class="sheet-textHead2Col"><span data-i18n="skills">Skills</span></div>
 			<div class="sheet-table">
+				<!-- ACROBATICS SKILL -->	
 				<div class="sheet-table-row"><div class="sheet-table">
 					<div class="sheet-table-row">
 						<span class="sheet-table-header sheet-skillsCol1"></span>
 						<span class="sheet-table-header"></span>
-						<span class="sheet-table-header">Total</span>
+						<span class="sheet-table-header" data-i18n="total">Total</span>
 						<span class="sheet-table-header"></span>
-						<span class="sheet-table-header">Mod</span>					
+						<span class="sheet-table-header" data-i18n="mod">Mod</span>					
 						<span class="sheet-table-header sheet-skillsFeats" title="Training (+5)">T</span>
 						<span class="sheet-table-header sheet-skillsFeats" title="Focus (+5)">F</span>
-						<span class="sheet-table-header">Misc</span>
+						<span class="sheet-table-header" data-i18n="misc">Misc</span>
 					</div>
 					<div class="sheet-table-row">
-						<span class="sheet-table-data sheet-skillsCol1"><span>Acrobatics</span>	
+						<span class="sheet-table-data sheet-skillsCol1"><span data-i18n="acrobatics">Acrobatics</span>	
 							<input type="checkbox" class="sect-show  sheet-skillsHideCheckbox" style="width: 66px;  margin-left: -69px;" value="1" name="attr_Skill-Acrobatics-Show" title="Show/Hide Acrobatics Notes" checked="checked"></span>
 						<span class="sheet-table-data"><button type="roll" name="roll_AcrobaticsCheck" value="@{AcrobaticsFormula|max}"></button></span>
 						<span class="sheet-table-data"><input type="number" name="attr_Acrobatics" value="@{AcrobaticsFormula}" disabled="true" title="Acrobatics Total @{Acrobatics}" class="skills" /></span> 
@@ -545,10 +546,55 @@
 							</span>
 						</div>
 					</div>	</div>
-				</div>					
-				<div class="sheet-table-row"><div class="sheet-table">
+				</div>	
+				<!-- ATHLETICS SKILL -->	
+				<input type="checkbox" class="athleticsShow sheet-hidden" value="1" name="attr_athletics-Show" />
+				<div class="sheet-table-row athleticsBody"><div class="sheet-table">
+					<div class="sheet-table-row">	
+					<span class="sheet-table-data sheet-skillsCol1">	<span data-i18n="athletics">Athletics</span>	<input type="checkbox" class="sect-show  sheet-skillsHideCheckbox" style="width: 85px; margin-left: -88px;" value="1" name="attr_Skill-Athletics-Show" title="Show/Hide Athletics Notes" /></span>
+					<span class="sheet-table-data"><button type="roll" name="roll_AthleticsCheck" value="@{AthleticsFormula|max}" title="Roll Athletics %{AthleticsCheck}"></button></span>
+					<span class="sheet-table-data"><input type="number" class="skills" name="attr_Athletics" value="@{AthleticsFormula}" disabled="true" title="Athletics Total @{Athletics}" /></span> 
+					<span class="sheet-table-data">&nbsp;=&nbsp;</span>	
+					<span class="sheet-table-data"><select name="attr_AthleticsMod" class="modtype" title="Athletics Mod (default STR)">
+						  <option value="@{str|max}" data-i18n="str" selected>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">CHA</option>
+						</select></span>
+					<span class="sheet-table-data sheet-skillsFeats"><input type="checkbox" value="5" name="attr_AthleticsFeat" title="Trained in Athletics?" /></span> <!-- Skill Training -->
+					<span class="sheet-table-data sheet-skillsFeats"><input type="checkbox" value="5" name="attr_AthleticsFeat_max" title="Focused in Athletics?" /></span> <!-- Skill Focus -->
+					<span class="sheet-table-data"><input type="number" class="skills" name="attr_AthleticsMisc" title="Athletics Miscellaneous Modifier" value="0" />
+					</div>
+				</div>
+				<div>		
+					<!-- Athletics Notes -->	<input type="checkbox" class="sect-show sheet-hidden" value="1" name="attr_Skill-Athletics-Show" />
+					<div class="sheet-table-row sect"><div class="sheet-table">
+						<div class="sheet-table-row">
+							<span class="sheet-table-data" style="min-width:50px">	</span>
+							<span class="sheet-table-data">	<input class="skillsNotes" type="text" name="attr_Athletics_max" placeholder="Athletics Notes" title="Athletics Notes @{Athletics|max}" />	</span>
+							<span class="sheet-table-data" style="min-width:15px">	</span>
+							<span class="sheet-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-Athletics-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>	
+					<!-- Athletics Formula -->	<input type="checkbox" class="sect-show sheet-hidden" value="1" name="attr_Skill-Athletics-Formula-Show" />	
+					<div class="sheet-table-row sect">	<div class="sheet-table">
+						<div class="sheet-table-row">
+							<span class="sheet-table-data" style="min-width:50px">	</span>
+							<span class="sheet-table-data skillFormula">							
+								<span class="sheet-small"><b>Skill Modifier Total Formula</b></span>	<br />
+								<input type="text" name="attr_AthleticsFormula" class="skillFormula" title="Skill Total formula @{AthleticsFormula}" value="@{level|max}[Half Level]+@{AthleticsMod}[Mod]+@{AthleticsFeat}[Training]+@{AthleticsFeat|max}[Focus]+@{AthleticsMisc}[Misc]+@{CT}[CT]" /> 
+								<span class="sheet-small"><b>Template Formula</b></span>	<br />
+								<input type="text" name="attr_AthleticsFormula_max" class="skillFormula" title="Skill Template formula @{AthleticsFormula|max}" value="&{template:skill} {{name= Athletics}} {{skill=[[1d20 + @{Athletics} + ?{Other Modifiers|0}[Other]]]}} {{notes=@{Athletics|max}}}" />
+							</span>
+						</div>
+					</div>	</div>
+				</div>	</div>
+				<!-- CLIMB SKILL -->	
+				<div class="sheet-table-row noathleticsBody"><div class="sheet-table">
 					<div class="sheet-table-row">
-						<span class="sheet-table-data sheet-skillsCol1">	<span>Climb</span>	
+						<span class="sheet-table-data sheet-skillsCol1">	<span data-i18n="climb">Climb</span>	
 							<input type="checkbox" class="sect-show  sheet-skillsHideCheckbox" style="width: 37px;  margin-left: -40px;" value="1" name="attr_Skill-Climb-Show" title="Show/Hide Climb Notes" /></span>
 						<span class="sheet-table-data"><button type="roll" name="roll_ClimbCheck" value="@{ClimbFormula|max}"></button></span>
 						<span class="sheet-table-data"><input type="number" name="attr_Climb" value="@{ClimbFormula}" disabled="true" title="Climb Total @{Climb}" class="skills" /></span> 
@@ -565,7 +611,7 @@
 						<span class="sheet-table-data sheet-skillsFeats"><input type="checkbox" value="5" name="attr_ClimbFeat_max" title="Focused in Climb?" /></span> <!-- Skill Focus -->
 						<span class="sheet-table-data"><input type="number" name="attr_ClimbMisc" title="Climb Miscellaneous Modifier" value="0" class="skills" /></span>
 					</div>
-				</div></div>
+				</div>
 				<div>		
 					<!-- Climb Notes -->	<input type="checkbox" class="sect-show sheet-hidden" value="1" name="attr_Skill-Climb-Show" />
 					<div class="sheet-table-row sect"><div class="sheet-table">
@@ -588,10 +634,11 @@
 							</span>
 						</div>
 					</div>	</div>
-				</div>								
+				</div>	</div>
+				<!-- DECEPTION SKILL -->	
 				<div class="sheet-table-row"><div class="sheet-table">
 					<div class="sheet-table-row">
-						<span class="sheet-table-data sheet-skillsCol1">	<span>Deception</span>	
+						<span class="sheet-table-data sheet-skillsCol1">	<span data-i18n="deception">Deception</span>	
 							<input type="checkbox" class="sect-show  sheet-skillsHideCheckbox" style="width: 62px;  margin-left: -65px;" value="1" name="attr_Skill-Deception-Show" title="Show/Hide Deception Notes" /></span>
 						<span class="sheet-table-data"><button type="roll" name="roll_DeceptionCheck" value="@{DeceptionFormula|max}"></button></span>
 						<span class="sheet-table-data"><input type="number" name="attr_Deception" value="@{DeceptionFormula}" disabled="true" title="Deception Total @{Deception}" class="skills" /></span> 
@@ -631,10 +678,11 @@
 							</span>
 						</div>
 					</div>	</div>
-				</div>					
+				</div>
+				<!-- ENDURANCE SKILL -->	
 				<div class="sheet-table-row"><div class="sheet-table">
 					<div class="sheet-table-row">
-						<span class="sheet-table-data sheet-skillsCol1">	<span>Endurance</span>	
+						<span class="sheet-table-data sheet-skillsCol1">	<span data-i18n="endurance">Endurance</span>	
 							<input type="checkbox" class="sect-show  sheet-skillsHideCheckbox" style="width: 67px;  margin-left: -70px;" value="1" name="attr_Skill-Endurance-Show" title="Show/Hide Endurance Notes" /></span>
 						<span class="sheet-table-data"><button type="roll" name="roll_EnduranceCheck" value="@{EnduranceFormula|max}"></button></span>
 						<span class="sheet-table-data"><input type="number" name="attr_Endurance" value="@{EnduranceFormula}" disabled="true" title="Endurance Total @{Endurance}" class="skills" /></span> 
@@ -674,10 +722,11 @@
 							</span>
 						</div>
 					</div>	</div>
-				</div>					
+				</div>	
+				<!-- GATHER INFORMATION SKILL -->	
 				<div class="sheet-table-row"><div class="sheet-table">
 					<div class="sheet-table-row">
-						<span class="sheet-table-data sheet-skillsCol1">	<span>Gather Information</span>	
+						<span class="sheet-table-data sheet-skillsCol1">	<span data-i18n="gather_info">Gather Information</span>	
 							<input type="checkbox" class="sect-show  sheet-skillsHideCheckbox" style="width: 117px; margin-left: -120px;" value="1" name="attr_Skill-GatherInformation-Show" title="Show/Hide Gather Information Notes" /></span>
 						<span class="sheet-table-data"><button type="roll" name="roll_GatherInformationCheck" value="@{GatherInformationFormula|max}"></button></span>
 						<span class="sheet-table-data"><input type="number" name="attr_GatherInformation" value="@{GatherInformationFormula}" disabled="true" title="Gather Information Total @{GatherInformation}" class="skills" /></span> 
@@ -717,10 +766,11 @@
 							</span>
 						</div>
 					</div>	</div>
-				</div>					
+				</div>	
+				<!-- INITIATIVE SKILL -->	
 				<div class="sheet-table-row"><div class="sheet-table">
 					<div class="sheet-table-row">
-						<span class="sheet-table-data sheet-skillsCol1">	<span>Initiative</span>	
+						<span class="sheet-table-data sheet-skillsCol1">	<span data-i18n="initiative">Initiative</span>	
 							<input type="checkbox" class="sect-show  sheet-skillsHideCheckbox" style="width: 66px; margin-left: -66px;" value="1" name="attr_Skill-Initiative-Show" title="Show/Hide Initiative Notes" /></span>
 						<span class="sheet-table-data"><button type="roll" name="roll_InitiativeCheck" value="@{InitiativeFormula|max}"></button></span>
 						<span class="sheet-table-data"><input type="number" name="attr_Initiative" value="@{InitiativeFormula}" disabled="true" title="Initiative Total @{Initiative}" class="skills" /></span> 
@@ -760,10 +810,11 @@
 							</span>
 						</div>
 					</div>	</div>
-				</div>					
-				<div class="sheet-table-row"><div class="sheet-table">
+				</div>		
+				<!-- JUMP SKILL -->				
+				<div class="sheet-table-row noathleticsBody"><div class="sheet-table">
 					<div class="sheet-table-row">
-						<span class="sheet-table-data sheet-skillsCol1">	<span>Jump</span>	
+						<span class="sheet-table-data sheet-skillsCol1">	<span data-i18n="jump">Jump</span>	
 							<input type="checkbox" class="sect-show  sheet-skillsHideCheckbox" style="width: 48px;  margin-left: -48px;" value="1" name="attr_Skill-Jump-Show" title="Show/Hide Jump Notes" /></span>
 						<span class="sheet-table-data"><button type="roll" name="roll_JumpCheck" value="@{JumpFormula|max}"></button></span>
 						<span class="sheet-table-data"><input type="number" name="attr_Jump" value="@{JumpFormula}" disabled="true" title="Jump Total @{Jump}" class="skills" /></span> 
@@ -780,7 +831,7 @@
 						<span class="sheet-table-data sheet-skillsFeats"><input type="checkbox" value="5" name="attr_JumpFeat_max" title="Focused in Jump?" /></span> <!-- Skill Focus -->
 						<span class="sheet-table-data"><input type="number" name="attr_JumpMisc" title="Jump Miscellaneous Modifier" value="0" class="skills" /></span>
 					</div>
-				</div></div>
+				</div>
 				<div>		
 					<!-- Jump Notes -->	<input type="checkbox" class="sect-show sheet-hidden" value="1" name="attr_Skill-Jump-Show" />
 					<div class="sheet-table-row sect"><div class="sheet-table">
@@ -803,13 +854,13 @@
 							</span>
 						</div>
 					</div>	</div>
-				</div>	
-				
+				</div>	</div>	
+				<!-- KNOWLEDGE (BUREAUCRACY) SKILL -->
 				<div class="sheet-table-row"><div class="sheet-table">
 					<div class="sheet-table-row">
-						<span class="sheet-table-data sheet-skillsCol1">	<span>	Bureaucracy		</span>		
+						<span class="sheet-table-data sheet-skillsCol1">	<span data-i18n="bureaucracy">Bureaucracy</span>		
 							<input type="checkbox" class="sect-show  sheet-skillsHideCheckbox" style="width: 94px;  margin-left: -94px;" value="1" name="attr_Skill-Knowledge-Bureaucracy-Show" title="Show/Hide Knowledge (Bureaucracy) Notes" />
-							<div class="sheet-sheet-smallSkills">Knowledge</div></span>
+							<div class="sheet-smallSkills"><span data-i18n="knowledge">Knowledge</span></div></span>
 						<span class="sheet-table-data"><button type="roll" name="roll_Knowledge-BureaucracyCheck" value="@{Knowledge-BureaucracyFormula|max}"></button></span>
 						<span class="sheet-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="sheet-table-data">&nbsp;=&nbsp;</span>	
@@ -849,11 +900,12 @@
 						</div>
 					</div>	</div>
 				</div>
+				<!-- KNOWLEDGE (GALACTIC LORE) SKILL -->
 				<div class="sheet-table-row"><div class="sheet-table">
 					<div class="sheet-table-row">
-						<span class="sheet-table-data sheet-skillsCol1">	<span>Galactic Lore</span>			
+						<span class="sheet-table-data sheet-skillsCol1">	<span data-i18n="galactic_lore">Galactic Lore</span>			
 							<input type="checkbox" class="sect-show  sheet-skillsHideCheckbox" style="width: 99px;  margin-left: -99px;" value="1" name="attr_Skill-Knowledge-GalacticLore-Show" title="Show/Hide Knowledge (Galactic Lore) Notes" />
-							<div class="sheet-smallSkills">Knowledge</div></span>
+							<div class="sheet-smallSkills"><span data-i18n="knowledge">Knowledge</span></div></span>
 						<span class="sheet-table-data"><button type="roll" name="roll_Knowledge-GalacticLoreCheck" value="@{Knowledge-GalacticLoreFormula|max}"></button></span>
 						<span class="sheet-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="sheet-table-data">&nbsp;=&nbsp;</span>	
@@ -893,11 +945,12 @@
 						</div>
 					</div>	</div>
 				</div>
+				<!-- KNOWLEDGE (LIFE SCIENCES) SKILL -->
 				<div class="sheet-table-row"><div class="sheet-table">
 					<div class="sheet-table-row">
-						<span class="sheet-table-data sheet-skillsCol1">	<span>Life Sciences</span>
+						<span class="sheet-table-data sheet-skillsCol1">	<span data-i18n="life_sciences">Life Sciences</span>
 							<input type="checkbox" class="sect-show  sheet-skillsHideCheckbox" style="width: 100px; margin-left: -100px;" value="1" name="attr_Skill-Knowledge-LifeSciences-Show" title="Show/Hide Knowledge (Life Sciences) Notes" />
-							<div class="sheet-smallSkills">Knowledge</div>	</span>	
+							<div class="sheet-smallSkills"><span data-i18n="knowledge">Knowledge</span></div>	</span>	
 						<span class="sheet-table-data"><button type="roll" name="roll_Knowledge-LifeSciencesCheck" value="@{Knowledge-LifeSciencesFormula|max}"></button></span>
 						<span class="sheet-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="sheet-table-data">&nbsp;=&nbsp;</span>	
@@ -937,11 +990,12 @@
 						</div>
 					</div>	</div>
 				</div>
+				<!-- KNOWLEDGE (PHYSICAL SCIENCES) SKILL -->
 				<div class="sheet-table-row"><div class="sheet-table">
 					<div class="sheet-table-row">
-						<span class="sheet-table-data sheet-skillsCol1">	<span>Physical Science</span>	
+						<span class="sheet-table-data sheet-skillsCol1">	<span data-i18n="physical_sciences">Physical Sciences</span>	
 							<input type="checkbox" class="sect-show  sheet-skillsHideCheckbox" style="width: 106px; margin-left: -109px;" value="1" name="attr_Skill-Knowledge-PhysicalScience-Show" title="Show/Hide Knowledge (Physical Science) Notes" />
-							<div class="sheet-smallSkills">Knowledge</div>	</span>
+							<div class="sheet-smallSkills"><span data-i18n="knowledge">Knowledge</span></div>	</span>
 						<span class="sheet-table-data"><button type="roll" name="roll_Knowledge-PhysicalScienceCheck" value="@{Knowledge-PhysicalScienceFormula|max}"></button></span>
 						<span class="sheet-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="sheet-table-data">&nbsp;=&nbsp;</span>	
@@ -981,11 +1035,12 @@
 						</div>
 					</div>	</div>
 				</div>
+				<!-- KNOWLEDGE (SOCIAL SCIENCES) SKILL -->
 				<div class="sheet-table-row"><div class="sheet-table">
 					<div class="sheet-table-row">
-						<span class="sheet-table-data sheet-skillsCol1">		<span>Social Science</span>	
+						<span class="sheet-table-data sheet-skillsCol1">		<span data-i18n="social_sciences">Social Sciences</span>	
 							<input type="checkbox" class="sect-show  sheet-skillsHideCheckbox" style="width: 105px; margin-left: -105px;" value="1" name="attr_Skill-Knowledge-SocialScience-Show" title="Show/Hide Knowledge (Social Science) Notes" />	
-							<div class="sheet-smallSkills">Knowledge</div>	</span>	
+							<div class="sheet-smallSkills"><span data-i18n="knowledge">Knowledge</span></div>	</span>	
 						<span class="sheet-table-data"><button type="roll" name="roll_Knowledge-SocialScienceCheck" value="@{Knowledge-SocialScienceFormula|max}"></button></span>
 						<span class="sheet-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="sheet-table-data">&nbsp;=&nbsp;</span>	
@@ -1025,11 +1080,12 @@
 						</div>
 					</div>	</div>
 				</div>
+				<!-- KNOWLEDGE (TACTICS) SKILL -->
 				<div class="sheet-table-row"><div class="sheet-table">
 					<div class="sheet-table-row">
-						<span class="sheet-table-data sheet-skillsCol1">	<span>Tactics</span>		
+						<span class="sheet-table-data sheet-skillsCol1">	<span data-i18n="tactics">Tactics</span>		
 							<input type="checkbox" class="sect-show  sheet-skillsHideCheckbox" style="width: 57px; margin-left: -57px;" value="1" name="attr_Skill-Knowledge-Tactics-Show" title="Show/Hide Knowledge (Tactics) Notes" />					
-							<div class="sheet-smallSkills">Knowledge</div>	</span>
+							<div class="sheet-smallSkills"><span data-i18n="knowledge">Knowledge</span></div>	</span>
 						<span class="sheet-table-data"><button type="roll" name="roll_Knowledge-TacticsCheck" value="@{Knowledge-TacticsFormula|max}"></button></span>
 						<span class="sheet-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="sheet-table-data">&nbsp;=&nbsp;</span>	
@@ -1069,11 +1125,12 @@
 						</div>
 					</div>	</div>
 				</div>
+				<!-- KNOWLEDGE (TECHNOLOGY) SKILL -->
 				<div class="sheet-table-row"><div class="sheet-table">
 					<div class="sheet-table-row">
-						<span class="sheet-table-data sheet-skillsCol1">	<span>Technology	</span>		
+						<span class="sheet-table-data sheet-skillsCol1">	<span data-i18n="technology">Technology</span>		
 							<input type="checkbox" class="sect-show  sheet-skillsHideCheckbox" style="width: 90px; margin-left: -90px;" value="1" name="attr_Skill-Knowledge-Technology-Show" title="Show/Hide Knowledge (Technology) Notes" />
-							<div class="sheet-smallSkills">Knowledge</div></span>
+							<div class="sheet-smallSkills"><span data-i18n="knowledge">Knowledge</span></div></span>
 						<span class="sheet-table-data"><button type="roll" name="roll_Knowledge-TechnologyCheck" value="@{Knowledge-TechnologyFormula|max}"></button></span>
 						<span class="sheet-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="sheet-table-data">&nbsp;=&nbsp;</span>	
@@ -1113,10 +1170,10 @@
 						</div>
 					</div>	</div>
 				</div>
-				
+				<!-- MECHANICS SKILL -->
 				<div class="sheet-table-row"><div class="sheet-table">
 					<div class="sheet-table-row">
-						<span class="sheet-table-data sheet-skillsCol1">	<span>Mechanics</span>	
+						<span class="sheet-table-data sheet-skillsCol1">	<span data-i18n="mechanics">Mechanics</span>	
 							<input type="checkbox" class="sect-show  sheet-skillsHideCheckbox" style="width: 79px; margin-left: -79px;" value="1" name="attr_Skill-Mechanics-Show" title="Show/Hide Mechanics Notes" />	</span>
 						<span class="sheet-table-data"><button type="roll" name="roll_MechanicsCheck" value="@{MechanicsFormula|max}"></button></span>
 						<span class="sheet-table-data"><input type="number" name="attr_Mechanics" value="@{MechanicsFormula}" disabled="true" title="Mechanics Total @{Mechanics}" class="skills" /></span> 
@@ -1157,9 +1214,10 @@
 						</div>
 					</div>	</div>
 				</div>
+				<!-- PERCEPTION SKILL -->
 				<div class="sheet-table-row"><div class="sheet-table">
 					<div class="sheet-table-row">
-						<span class="sheet-table-data sheet-skillsCol1"><span>Perception</span>		
+						<span class="sheet-table-data sheet-skillsCol1"><span data-i18n="perception">Perception</span>		
 							<input type="checkbox" class="sect-show  sheet-skillsHideCheckbox" style="width: 67px; margin-left: -70px;" value="1" name="attr_Skill-Perception-Show" title="Show/Hide Perception Notes" /></span>
 						<span class="sheet-table-data"><button type="roll" name="roll_PerceptionCheck" value="@{PerceptionFormula|max}"></button></span>
 						<span class="sheet-table-data"><input type="number" name="attr_Perception" value="@{PerceptionFormula}" disabled="true" title="Perception Total @{Perception}" class="skills" /></span> 
@@ -1200,9 +1258,10 @@
 						</div>
 					</div>	</div>
 				</div>
+				<!-- PERSUASION SKILL -->
 				<div class="sheet-table-row"><div class="sheet-table">
 					<div class="sheet-table-row">
-						<span class="sheet-table-data sheet-skillsCol1">	<span>Persuasion</span>	
+						<span class="sheet-table-data sheet-skillsCol1">	<span data-i18n="persuasion">Persuasion</span>	
 							<input type="checkbox" class="sect-show  sheet-skillsHideCheckbox" style="width: 70px; margin-left: -73px;" value="1" name="attr_Skill-Persuasion-Show" title="Show/Hide Persuasion Notes" /></span>
 						<span class="sheet-table-data"><button type="roll" name="roll_PersuasionCheck" value="@{PersuasionFormula|max}"></button></span>
 						<span class="sheet-table-data"><input type="number" name="attr_Persuasion" value="@{PersuasionFormula}" disabled="true" title="Persuasion Total @{Persuasion}" class="skills" /></span> 
@@ -1243,9 +1302,10 @@
 						</div>
 					</div>	</div>
 				</div>
+				<!-- PILOT SKILL -->
 				<div class="sheet-table-row"><div class="sheet-table">
 					<div class="sheet-table-row">
-						<span class="sheet-table-data sheet-skillsCol1">	<span>Pilot</span>	
+						<span class="sheet-table-data sheet-skillsCol1">	<span data-i18n="pilot">Pilot</span>	
 						<input type="checkbox" class="sect-show  sheet-skillsHideCheckbox" style="width: 29px; margin-left: -32px;" value="1" name="attr_Skill-Pilot-Show" title="Show/Hide Pilot Notes" /></span>
 						<span class="sheet-table-data"><button type="roll" name="roll_PilotCheck" value="@{PilotFormula|max}"></button></span>
 						<span class="sheet-table-data"><input type="number" name="attr_Pilot" value="@{PilotFormula}" disabled="true" title="Pilot Total @{Pilot}" class="skills" /></span> 
@@ -1286,9 +1346,10 @@
 						</div>
 					</div>	</div>
 				</div>
+				<!-- RIDE SKILL -->
 				<div class="sheet-table-row"><div class="sheet-table">
 					<div class="sheet-table-row">
-						<span class="sheet-table-data sheet-skillsCol1">	<span>Ride</span>	
+						<span class="sheet-table-data sheet-skillsCol1">	<span data-i18n="ride">Ride</span>	
 							<input type="checkbox" class="sect-show  sheet-skillsHideCheckbox" style="width: 28px; margin-left: -31px;" value="1" name="attr_Skill-Ride-Show" title="Show/Hide Ride Notes" /></span>
 						<span class="sheet-table-data"><button type="roll" name="roll_RideCheck" value="@{RideFormula|max}"></button></span>
 						<span class="sheet-table-data"><input type="number" name="attr_Ride" value="@{RideFormula}" disabled="true" title="Ride Total @{Ride}" class="skills" /></span> 
@@ -1329,9 +1390,10 @@
 						</div>
 					</div>	</div>
 				</div>
+				<!-- STEALTH SKILL -->
 				<div class="sheet-table-row"><div class="sheet-table">
 					<div class="sheet-table-row">
-						<span class="sheet-table-data sheet-skillsCol1">	<span>Stealth</span>	
+						<span class="sheet-table-data sheet-skillsCol1">	<span data-i18n="stealth">Stealth</span>	
 							<input type="checkbox" class="sect-show  sheet-skillsHideCheckbox" style="width: 43px; margin-left: -46px;" value="1" name="attr_Skill-Stealth-Show" title="Show/Hide Stealth Notes" /></span>
 						<span class="sheet-table-data"><button type="roll" name="roll_StealthCheck" value="@{StealthFormula|max}"></button></span>
 						<span class="sheet-table-data"><input type="number" name="attr_Stealth" value="@{StealthFormula}" disabled="true" title="Stealth Total @{Stealth}" class="skills" /></span> 
@@ -1373,9 +1435,10 @@
 						</div>
 					</div>	</div>
 				</div>
+				<!-- SURVIVAL SKILL -->
 				<div class="sheet-table-row"><div class="sheet-table">
 					<div class="sheet-table-row">
-						<span class="sheet-table-data sheet-skillsCol1">	<span>Survival</span>	
+						<span class="sheet-table-data sheet-skillsCol1">	<span data-i18n="survival">Survival</span>	
 							<input type="checkbox" class="sect-show  sheet-skillsHideCheckbox" style="width: 51px; margin-left: -54px;" value="1" name="attr_Skill-Survival-Show" title="Show/Hide Survival Notes" /></span>
 						<span class="sheet-table-data"><button type="roll" name="roll_SurvivalCheck" value="@{SurvivalFormula|max}"></button></span>
 						<span class="sheet-table-data"><input type="number" name="attr_Survival" value="@{SurvivalFormula}" disabled="true" title="Survival Total @{Survival}" class="skills" /></span> 
@@ -1416,9 +1479,10 @@
 						</div>
 					</div>	</div>
 				</div>
-				<div class="sheet-table-row"><div class="sheet-table">
+				<!-- SWIM SKILL -->
+				<div class="sheet-table-row noathleticsBody"><div class="sheet-table">
 					<div class="sheet-table-row">
-						<span class="sheet-table-data sheet-skillsCol1">	<span>Swim</span>	
+						<span class="sheet-table-data sheet-skillsCol1">	<span data-i18n="swim">Swim</span>	
 							<input type="checkbox" class="sect-show  sheet-skillsHideCheckbox" style="width: 35px; margin-left: -38px;" value="1" name="attr_Skill-Swim-Show" title="Show/Hide Swim Notes" /></span>
 						<span class="sheet-table-data"><button type="roll" name="roll_SwimCheck" value="@{SwimFormula|max}"></button></span>
 						<span class="sheet-table-data"><input type="number" name="attr_Swim" value="@{SwimFormula}" disabled="true" title="Swim Total @{Swim}" class="skills" /></span> 
@@ -1435,7 +1499,7 @@
 						<span class="sheet-table-data sheet-skillsFeats"><input type="checkbox" value="5" name="attr_SwimFeat_max" title="Focused in Swim?" /></span> <!-- Skill Focus -->
 						<span class="sheet-table-data"><input type="number" name="attr_SwimMisc" title="Swim Miscellaneous Modifier" value="0" class="skills" /></span>
 					</div>
-				</div></div>
+				</div>
 				<div>		
 					<!-- Swim Notes -->	<input type="checkbox" class="sect-show sheet-hidden" value="1" name="attr_Skill-Swim-Show" />
 					<div class="sheet-table-row sect"><div class="sheet-table">
@@ -1458,10 +1522,11 @@
 							</span>
 						</div>
 					</div>	</div>
-				</div>
+				</div></div>
+				<!-- TREAT INJURY SKILL -->
 				<div class="sheet-table-row"><div class="sheet-table">
 					<div class="sheet-table-row">
-						<span class="sheet-table-data sheet-skillsCol1">	<span>Treat Injury</span>	
+						<span class="sheet-table-data sheet-skillsCol1">	<span data-i18n="treat_injury">Treat Injury</span>	
 							<input type="checkbox" class="sect-show  sheet-skillsHideCheckbox" style="width: 71px; margin-left: -74px;" value="1" name="attr_Skill-TreatInjury-Show" title="Show/Hide Treat Injury Notes" /></span>
 						<span class="sheet-table-data"><button type="roll" name="roll_TreatInjuryCheck" value="@{TreatInjuryFormula|max}"></button></span>
 						<span class="sheet-table-data"><input type="number" name="attr_TreatInjury" value="@{TreatInjuryFormula}" disabled="true" title="Treat Injury Total @{TreatInjury}" class="skills" /></span> 
@@ -1502,9 +1567,10 @@
 						</div>
 					</div>	</div>
 				</div>
+				<!-- USE COMPUTER SKILL -->
 				<div class="sheet-table-row"><div class="sheet-table">
 					<div class="sheet-table-row">
-						<span class="sheet-table-data sheet-skillsCol1">	<span>Use Computer</span>	
+						<span class="sheet-table-data sheet-skillsCol1">	<span data-i18n="use_computer">Use Computer</span>	
 							<input type="checkbox" class="sect-show  sheet-skillsHideCheckbox" style="width: 88px; margin-left: -91px;" value="1" name="attr_Skill-UseComputer-Show" title="Show/Hide UseComputer Notes" /></span>
 						<span class="sheet-table-data"><button type="roll" name="roll_UseComputerCheck" value="@{UseComputerFormula|max}"></button></span>
 						<span class="sheet-table-data"><input type="number" name="attr_UseComputer" value="@{UseComputerFormula}" disabled="true" title="Use Computer Total @{UseComputer}" class="skills" /></span> 
@@ -1546,9 +1612,10 @@
 					</div>	</div>
 				</div>
 				<input type="checkbox" class="forceShow sheet-hidden" value="1" name="attr_force-Show" />
+				<!-- USE THE FORCE SKILL -->
 				<div class="sheet-table-row forceBody"><div class="sheet-table">
 					<div class="sheet-table-row">	
-					<span class="sheet-table-data sheet-skillsCol1">	<span>Use the Force</span>	<input type="checkbox" class="sect-show  sheet-skillsHideCheckbox" style="width: 85px; margin-left: -88px;" value="1" name="attr_Skill-UsetheForce-Show" title="Show/Hide Use the Force Notes" /></span>
+					<span class="sheet-table-data sheet-skillsCol1">	<span data-i18n="use_the_force">Use the Force</span>	<input type="checkbox" class="sect-show  sheet-skillsHideCheckbox" style="width: 85px; margin-left: -88px;" value="1" name="attr_Skill-UsetheForce-Show" title="Show/Hide Use the Force Notes" /></span>
 					<span class="sheet-table-data"><button type="roll" name="roll_UsetheForceCheck" value="@{UsetheForceFormula|max}" title="Roll Use the Force %{UsetheForceCheck}"></button></span>
 					<span class="sheet-table-data"><input type="number" class="skills" name="attr_UsetheForce" value="@{UsetheForceFormula}" disabled="true" title="Use the Force Total @{UsetheForce}" /></span> 
 					<span class="sheet-table-data">&nbsp;=&nbsp;</span>	
@@ -1588,19 +1655,19 @@
 						</div>
 					</div>	</div>
 				</div>	</div>
-				
+				<span class="sheet-small">Athletics skill house rule?</span>&nbsp;<input type="checkbox" class="athleticsShow" value="1" name="attr_athletics-Show"  title="Replace Climb, Jump, and Swim skills with Athletics skill?"/>
 			</div>
 			<br />			
-			<div class="sheet-textHead2Col">Attack Options</div>
+			<div class="sheet-textHead2Col" data-i18n="attack_options">Attack Options</div>
 				<textarea type="text" name="attr_AttackOptions" rows="2" class="ActionNotes" title="Attack Options @{AttackOptions}"></textarea>
-			<div class="sheet-textHead2Col">Special Actions</div>
+			<div class="sheet-textHead2Col" data-i18n="special_actions">Special Actions</div>
 				<textarea type="text" name="attr_SpecialActions" rows="2" class="ActionNotes" title="Special Actions @{SpecialActions}"></textarea>
 			<input type="checkbox" class="forceShow sheet-hidden" value="1" name="attr_force-Show" />  				
 				<div class="sheet-textHead2Col forceBody">Force Powers	
 					<button type="roll" name="roll_UsetheForceCheck" class="small-roll-button" value="@{UsetheForceFormula|max}" title="Roll Use the Force %{UsetheForceCheck}">Use the Force</button></div>
 				<textarea type="text" name="attr_ForcePowers" rows="2" class="ActionNotes  forceBody" title="Force Power Suite @{ForcePowers}"></textarea>
 			<input type="checkbox" class="sect-show sheet-hidden" value="1" name="attr_StarshipManeuvers-Show" />  				
-				<div class="sheet-textHead2Col sect">Starship Maneuvers	
+				<div class="sheet-textHead2Col sect" data-i18n="starship_maneuvers">Starship Maneuvers	
 					<button type="roll" name="roll_PilotCheck" class="small-roll-button" value="@{PilotFormula|max}" title="Roll Pilot %{PilotCheck}">Pilot</button></div>
 				<textarea type="text" name="attr_StarshipManeuvers" rows="2" class="ActionNotes sect" title="Starship Maneuvers @{StarshipManeuvers}"></textarea>
 		</div>		
@@ -1883,7 +1950,7 @@
 		<div class="sheet-col">
 			<table>		
 				<tr>	<td colspan="3"><div class="sheet-textHead"><span data-i18n="hit-points">Hit Points</span></div> </td>	<td colspan="4"></td>	<td><div class="sheet-textHead">Condition</div></td>	</tr>
-				<tr><th>Current</th>		<th></th>	<th><span data-i18n="total">Total</span></th>	
+				<tr><th><span data-i18n="current">Current</span></th>		<th></th>	<th><span data-i18n="total">Total</span></th>	
 					<td colspan="3"></td>
 					<td>&nbsp;&nbsp;</td>
 					<td rowspan="4" style="text-align:left">		
@@ -2527,7 +2594,7 @@
 	<div class="sheet-col">
 		<table>		
 			<tr>	<td colspan="3"><div class="sheet-textHead">Hit Points</div> </td>	<td rowspan="5" width="10"></td>	<td><div class="sheet-textHead">Condition</div></td>	</tr>
-			<tr><th>Current</th>		<th></th>	<th>Total</th>	
+			<tr><th><span data-i18n="current">Current</span></th>		<th></th>	<th><span data-i18n="total">Total</span></th>	
 				<!-- rowspan placeholder -->
 				<td rowspan="4" style="text-align:left">		
 					<input type="radio" value="0" name="attr_vehicle-CT" checked="true" /> Normal<br />
@@ -2562,7 +2629,7 @@
 	<div class="sheet-col">
 		<table>			
 			<tr>	<td colspan="5"><div class="sheet-textHead">Threshold</div> </td></tr>
-			<tr><th>Total</th>	<th></th>	<th>Fort</th> <th></th> <th>Misc</th>		</tr>
+			<tr><th><span data-i18n="total">Total</span></th>	<th></th>	<th>Fort</th> <th></th> <th>Misc</th>		</tr>
 			<tr>	
 				<td><input type="number" name="attr_vehicle-DT" value="@{vehicle-Fortitude}+@{vehicle-DTSizeMod}[Size Mod]+@{vehicle-DamageThresholdMisc}[Misc]"  disabled="true" title="Damage Threshold" /></td>
 				<td>&nbsp;=&nbsp;</td>
@@ -2614,7 +2681,7 @@
 			<thead>
 				<tr>
 					<th></th>
-					<th>Total</th>
+					<th><span data-i18n="total">Total</span></th>
 					<th></th>
 					<th>Mod</th>
 					<th></th>
@@ -2725,7 +2792,7 @@
 				<tr>
 					<th></th>
 					<th></th>
-					<th>Total</th>
+					<th><span data-i18n="total">Total</span></th>
 					<th></th>					
 					<th>Skill<br>Check</th>
 					<th></th>
diff --git a/Star Wars Saga Edition/translation.json b/Star Wars Saga Edition/translation.json
index f1a60e0c6d..e27bac6dff 100644
--- a/Star Wars Saga Edition/translation.json	
+++ b/Star Wars Saga Edition/translation.json	
@@ -70,6 +70,7 @@
 "trained":"T",
 "focused":"F",
 "acrobatics":"Acrobatics",
+"athletics":"Athletics",
 "climb":"Climb",
 "deception":"Deception",
 "endurance":"Endurance",