diff --git a/Deathwatch/Deathwatch.html b/Deathwatch/Deathwatch.html
index b9919feb13..baa88988bc 100644
--- a/Deathwatch/Deathwatch.html
+++ b/Deathwatch/Deathwatch.html
@@ -586,7 +586,7 @@
                                         </div>
                                         <div class="sheet-item" style="width:45%">
                                             <select class="charaselect" name="attr_AcrobaticsCharacteristic">
-                                                <option value="@{Agility}">(Ag)</option>
+                                                <option value="@{Agility} + @{advanceAg}">(Ag)</option>
                                                 </select>
                                         </div>
                                     </div>
@@ -609,7 +609,7 @@
                                     </div>
                                     <div class="sheet-item" style="width:45%">
                                         <select class="charaselect" name="attr_AwarenessCharacteristic">
-                                            <option value="@{Perception}">(Per)</option>
+                                            <option value="@{Perception} + @{advancePer}">(Per)</option>
                                             </select>
                                     </div>
                                 </div>
@@ -632,7 +632,7 @@
                                     </div>
                                     <div class="sheet-item" style="width:45%">
                                         <select class="charaselect" name="attr_BlatherCharacteristic">
-                                            <option value="@{Fellowship}">(Fel)</option>
+                                            <option value="@{Fellowship} + @{advanceFel}">(Fel)</option>
                                             </select>
                                     </div>
                                 </div>
@@ -655,7 +655,7 @@
                                     </div>
                                     <div class="sheet-item" style="width:45%">
                                         <select class="charaselect" name="attr_CarouseCharacteristic">
-                                            <option value="@{Toughness}">(T)</option>
+                                            <option value="@{Toughness} + @{advanceT}">(T)</option>
                                             </select>
                                     </div>
                                 </div>
@@ -678,7 +678,7 @@
                                     </div>
                                     <div class="sheet-item" style="width:45%">
                                         <select class="charaselect" name="attr_CharmCharacteristic">
-                                            <option value="@{Fellowship}">(Fel)</option>
+                                            <option value="@{Fellowship} + @{advanceFel}">(Fel)</option>
                                             </select>
                                     </div>
                                 </div>
@@ -701,7 +701,7 @@
                                     </div>
                                     <div class="sheet-item" style="width:45%">
                                         <select class="charaselect" name="attr_Chem_UseCharacteristic">
-                                            <option value="@{Intelligence}">(Int)</option>
+                                            <option value="@{Intelligence} + @{advanceInt}">(Int)</option>
                                             </select>
                                     </div>
                                 </div>
@@ -724,7 +724,7 @@
                                     </div>
                                     <div class="sheet-item" style="width:45%">
                                         <select class="charaselect" name="attr_ClimbCharacteristic">
-                                            <option value="@{Strength}">(S)</option>
+                                            <option value="@{Strength} + @{advanceS}">(S)</option>
                                             </select>
                                     </div>
                                 </div>
@@ -747,7 +747,7 @@
                                     </div>
                                     <div class="sheet-item" style="width:45%">
                                         <select class="charaselect" name="attr_CommandCharacteristic">
-                                            <option value="@{Fellowship}">(Fel)</option>
+                                            <option value="@{Fellowship} + @{advanceFel}">(Fel)</option>
                                             </select>
                                     </div>
                                 </div>
@@ -770,7 +770,7 @@
                                     </div>
                                     <div class="sheet-item" style="width:45%">
                                         <select class="charaselect" name="attr_ConcealmentCharacteristic">
-                                            <option value="@{Agility}">(Ag)</option>
+                                            <option value="@{Agility} + @{advanceAg}">(Ag)</option>
                                             </select>
                                     </div>
                                 </div>
@@ -793,7 +793,7 @@
                                     </div>
                                     <div class="sheet-item" style="width:45%">
                                         <select class="charaselect" name="attr_ContortionistCharacteristic">
-                                            <option value="@{Agility}">(Ag)</option>
+                                            <option value="@{Agility} + @{advanceAg}">(Ag)</option>
                                             </select>
                                     </div>
                                 </div>
@@ -816,7 +816,7 @@
                                     </div>
                                     <div class="sheet-item" style="width:45%">
                                         <select class="charaselect" name="attr_DeceiveCharacteristic">
-                                            <option value="@{Fellowship}">(Fel)</option>
+                                            <option value="@{Fellowship} + @{advanceFel}">(Fel)</option>
                                             </select>
                                     </div>
                                 </div>
@@ -839,7 +839,7 @@
                                     </div>
                                     <div class="sheet-item" style="width:45%">
                                         <select class="charaselect" name="attr_DemolitionCharacteristic">
-                                            <option value="@{Intelligence}">(Int)</option>
+                                            <option value="@{Intelligence} + @{advanceInt}">(Int)</option>
                                             </select>
                                     </div>
                                 </div>
@@ -863,7 +863,7 @@
                                     </div>
                                     <div class="sheet-item" style="width:45%">
                                         <select class="charaselect" name="attr_DisguiseCharacteristic">
-                                            <option value="@{Fellowship}">(Fel)</option>
+                                            <option value="@{Fellowship} + @{advanceFel}">(Fel)</option>
                                             </select>
                                     </div>
                                 </div>
@@ -886,7 +886,7 @@
                                     </div>
                                     <div class="sheet-item" style="width:45%">
                                         <select class="charaselect" name="attr_DodgeCharacteristic">
-                                            <option value="@{Agility}">(Ag)</option>
+                                            <option value="@{Agility} + @{advanceAg}">(Ag)</option>
                                             </select>
                                     </div>
                                 </div>
@@ -909,7 +909,7 @@
                                     </div>
                                     <div class="sheet-item" style="width:45%">
                                         <select class="charaselect" name="attr_EvaluateCharacteristic">
-                                            <option value="@{Intelligence}">(Int)</option>
+                                            <option value="@{Intelligence} + @{advanceInt}">(Int)</option>
                                             </select>
                                     </div>
                                 </div>
@@ -932,7 +932,7 @@
                                     </div>
                                     <div class="sheet-item" style="width:45%">
                                         <select class="charaselect" name="attr_GambleCharacteristic">
-                                            <option value="@{Intelligence}">(Int)</option>
+                                            <option value="@{Intelligence} + @{advanceInt}">(Int)</option>
                                             </select>
                                     </div>
                                 </div>
@@ -955,7 +955,7 @@
                                     </div>
                                     <div class="sheet-item" style="width:45%">
                                         <select class="charaselect" name="attr_InquiryCharacteristic">
-                                            <option value="@{Fellowship}">(Ag)</option>
+                                            <option value="@{Fellowship} + @{advanceFel}">(Fel)</option>
                                             </select>
                                     </div>
                                 </div>
@@ -978,7 +978,7 @@
                                     </div>
                                     <div class="sheet-item" style="width:45%">
                                         <select class="charaselect" name="attr_InterrogationCharacteristic">
-                                            <option value="@{Willpower}">(WP)</option>
+                                            <option value="@{Willpower} + @{advanceWP}">(WP)</option>
                                             </select>
                                     </div>
                                 </div>
@@ -1001,7 +1001,7 @@
                                     </div>
                                     <div class="sheet-item" style="width:45%">
                                         <select class="charaselect" name="attr_IntimidateCharacteristic">
-                                            <option value="@{Strength}">(S)</option>
+                                            <option value="@{Strength} + @{advanceS}">(S)</option>
                                             </select>
                                     </div>
                                 </div>
@@ -1024,7 +1024,7 @@
                                     </div>
                                     <div class="sheet-item" style="width:45%">
                                         <select class="charaselect" name="attr_InvocationCharacteristic">
-                                            <option value="@{Willpower}">(WP)</option>
+                                            <option value="@{Willpower} + @{advanceWP}">(WP)</option>
                                             </select>
                                     </div>
                                 </div>
@@ -1047,7 +1047,7 @@
                                     </div>
                                     <div class="sheet-item" style="width:45%">
                                         <select class="charaselect" name="attr_LiteracyCharacteristic">
-                                            <option value="@{Intelligence}">(Int)</option>
+                                            <option value="@{Intelligence} + @{advanceInt}">(Int)</option>
                                             </select>
                                     </div>
                                 </div>
@@ -1070,7 +1070,7 @@
                                     </div>
                                     <div class="sheet-item" style="width:45%">
                                         <select class="charaselect" name="attr_LogicCharacteristic">
-                                            <option value="@{Intelligence}">(Int)</option>
+                                            <option value="@{Intelligence} + @{advanceInt}">(Int)</option>
                                             </select>
                                     </div>
                                 </div>
@@ -1093,7 +1093,7 @@
                                     </div>
                                     <div class="sheet-item" style="width:45%">
                                         <select class="charaselect" name="attr_MedicaeCharacteristic">
-                                            <option value="@{Intelligence}">(Int)</option>
+                                            <option value="@{Intelligence} + @{advanceInt}">(Int)</option>
                                             </select>
                                     </div>
                                 </div>
@@ -1116,7 +1116,7 @@
                                     </div>
                                     <div class="sheet-item" style="width:45%">
                                         <select class="charaselect" name="attr_PsyniscienceCharacteristic">
-                                            <option value="@{Perception}">(Per)</option>
+                                            <option value="@{Perception} + @{advancePer}">(Per)</option>
                                             </select>
                                     </div>
                                 </div>
@@ -1139,7 +1139,7 @@
                                     </div>
                                     <div class="sheet-item" style="width:45%">
                                         <select class="charaselect" name="attr_ScrutinyCharacteristic">
-                                            <option value="@{Perception}">(Per)</option>
+                                            <option value="@{Perception} + @{advancePer}">(Per)</option>
                                             </select>
                                     </div>
                                 </div>
@@ -1162,8 +1162,8 @@
                                     </div>
                                     <div class="sheet-item" style="width:45%">
                                         <select class="charaselect" name="attr_SearchCharacteristic">
-                                            <option value="@{Perception}">(Per)</option>
-                                            <option value="@{Fellowship}">(Fel)</option>
+                                            <option value="@{Perception} + @{advancePer}">(Per)</option>
+                                            <option value="@{Fellowship} + @{advanceFel}">(Fel)</option>
                                             </select>
                                     </div>
                                 </div>
@@ -1186,7 +1186,7 @@
                                     </div>
                                     <div class="sheet-item" style="width:45%">
                                         <select class="charaselect" name="attr_SecurityCharacteristic">
-                                            <option value="@{Agility}">(Ag)</option>
+                                            <option value="@{Agility} + @{advanceAg}">(Ag)</option>
                                             </select>
                                     </div>
                                 </div>
@@ -1209,7 +1209,7 @@
                                     </div>
                                     <div class="sheet-item" style="width:45%">
                                         <select class="charaselect" name="attr_ShadowingCharacteristic">
-                                            <option value="@{Agility}">(Ag)</option>
+                                            <option value="@{Agility} + @{advanceAg}">(Ag)</option>
                                             </select>
                                     </div>
                                 </div>
@@ -1232,7 +1232,7 @@
                                     </div>
                                     <div class="sheet-item" style="width:45%">
                                         <select class="charaselect" name="attr_Silent_MoveCharacteristic">
-                                            <option value="@{Agility}">(Ag)</option>
+                                            <option value="@{Agility} + @{advanceAg}">(Ag)</option>
                                             </select>
                                     </div>
                                 </div>
@@ -1255,8 +1255,8 @@
                                     </div>
                                     <div class="sheet-item" style="width:45%">
                                         <select class="charaselect" name="attr_SleightOfHandCharacteristic">
-                                            <option value="@{Agility}">(Ag)</option>
-                                            <option value="@{Intelligence}">(Int)</option>
+                                            <option value="@{Agility} + @{advanceAg}">(Ag)</option>
+                                            <option value="@{Intelligence} + @{advanceInt}">(Int)</option>
                                             </select>
                                     </div>
                                 </div>
@@ -1279,7 +1279,7 @@
                                     </div>
                                     <div class="sheet-item" style="width:45%">
                                         <select class="charaselect" name="attr_SurvivalCharacteristic">
-                                            <option value="@{Intelligence}">(Int)</option>
+                                            <option value="@{Intelligence} + @{advanceInt}">(Int)</option>
                                             </select>
                                     </div>
                                 </div>
@@ -1302,8 +1302,8 @@
                                     </div>
                                     <div class="sheet-item" style="width:45%">
                                         <select class="charaselect" name="attr_SwimCharacteristic">
-                                            <option value="@{Strength}">(S)</option>
-                                            <option value="@{Perception}">(Per)</option>
+                                            <option value="@{Strength} + @{advanceS}">(S)</option>
+                                            <option value="@{Perception} + @{advancePer}">(Per)</option>
                                             </select>
                                     </div>
                                 </div>
@@ -1326,8 +1326,8 @@
                                     </div>
                                     <div class="sheet-item" style="width:45%">
                                         <select class="charaselect" name="attr_TechUseCharacteristic">
-                                            <option value="@{Intelligence}">(Int)</option>
-                                            <option value="@{Agility}">(Ag)</option>
+                                            <option value="@{Intelligence} + @{advanceInt}">(Int)</option>
+                                            <option value="@{Agility} + @{advanceAg}">(Ag)</option>
                                             </select>
                                     </div>
                                 </div>
@@ -1350,8 +1350,8 @@
                                     </div>
                                     <div class="sheet-item" style="width:45%">
                                         <select class="charaselect" name="attr_TrackingCharacteristic">
-                                            <option value="@{Intelligence}">(Int)</option>
-                                            <option value="@{Agility}">(Ag)</option>
+                                            <option value="@{Intelligence} + @{advanceInt}">(Int)</option>
+                                            <option value="@{Agility} + @{advanceAg}">(Ag)</option>
                                             </select>
                                     </div>
                                 </div>
@@ -1374,8 +1374,8 @@
                                     </div>
                                     <div class="sheet-item" style="width:45%">
                                         <select class="charaselect" name="attr_WranglingCharacteristic">
-                                            <option value="@{Intelligence}">(Int)</option>
-                                            <option value="@{Agility}">(Ag)</option>
+                                            <option value="@{Intelligence} + @{advanceInt}">(Int)</option>
+                                            <option value="@{Agility} + @{advanceAg}">(Ag)</option>
                                             </select>
                                     </div>
                                 </div>
@@ -1398,15 +1398,15 @@
                                     </div>
                                     <div class="sheet-item" style="width:45%">
                                         <select class="charaselect" name="attr_OtherCharacteristic">
-                                            <option value="@{WeaponSkill}">(WS)</option>
-                                            <option value="@{BallisticSkill}">(BS)</option>
-                                            <option value="@{Strength}">(S)</option>
-                                            <option value="@{Toughness}">(T)</option>
-                                            <option value="@{Agility}">(Ag)</option>
-                                            <option value="@{Intelligence}">(Int)</option>
-                                            <option value="@{Perception}">(Per)</option>
-                                            <option value="@{Willpower}">(WP)</option>
-                                            <option value="@{Fellowship}">(Fel)</option>
+                                            <option value="@{WeaponSkill} + @{advanceWS}">(WS)</option>
+                                            <option value="@{BallisticSkill} + @{advanceBS}">(BS)</option>
+                                            <option value="@{Strength} + @{advanceS}">(S)</option>
+                                            <option value="@{Toughness} + @{advanceT}">(T)</option>
+                                            <option value="@{Agility} + @{advanceAg}">(Ag)</option>
+                                            <option value="@{Intelligence} + @{advanceInt}">(Int)</option>
+                                            <option value="@{Perception} + @{advancePer}">(Per)</option>
+                                            <option value="@{Willpower} + @{advanceWP}">(WP)</option>
+                                            <option value="@{Fellowship} + @{advanceFel}">(Fel)</option>
                                             </select>
                                     </div>
                                 </div>
@@ -1431,9 +1431,9 @@
                                     <div class="sheet-item" style="width:60%"><label>Ciphers</label></div>
                                     <div class="sheet-item" style="width:40%">
                                         <select class="charaselect" name="attr_CiphersCharacteristic">
-                                            <option value="@{Intelligence}">(Int)</option>
-                                            <option value="@{Agility}">(Ag)</option>
-                                            <option value="@{Fellowship}">(Fel)</option>
+                                            <option value="@{Intelligence} + @{advanceInt}">(Int)</option>
+                                            <option value="@{Agility} + @{advanceAg}">(Ag)</option>
+                                            <option value="@{Fellowship} + @{advanceFel}">(Fel)</option>
                                         </select>
                                     </div>
                                 </div>    
@@ -1487,7 +1487,7 @@
                                     <div class="sheet-item" style="width:60%"><label>Drive</label></div>
                                     <div class="sheet-item" style="width:40%">
                                         <select class="charaselect" name="attr_DriveCharacteristic">
-                                            <option value="@{Agility}">(Ag)</option>
+                                            <option value="@{Agility} + @{advanceAg}">(Ag)</option>
                                         </select>
                                     </div>
                                 </div>    
@@ -1543,8 +1543,8 @@
                                     <div class="sheet-item" style="width:60%"><label>Linguistics</label></div>
                                     <div class="sheet-item" style="width:40%">
                                         <select class="charaselect" name="attr_LinguisticsCharacteristic">
-                                            <option value="@{Intelligence}">(Int)</option>
-                                            <option value="@{Fellowship}">(Fel)</option>
+                                            <option value="@{Intelligence} + @{advanceInt}">(Int)</option>
+                                            <option value="@{Fellowship} + @{advanceFel}">(Fel)</option>
                                         </select>
                                     </div>
                                 </div>    
@@ -1619,7 +1619,7 @@
                                     <div class="sheet-item" style="width:60%"><label>Navigation</label></div>
                                     <div class="sheet-item" style="width:40%">
                                         <select class="charaselect" name="attr_NavigationCharacteristic">
-                                            <option value="@{Intelligence}">(Int)</option>
+                                            <option value="@{Intelligence} + @{advanceInt}">(Int)</option>
                                         </select>
                                     </div>
                                 </div>    
@@ -1674,7 +1674,7 @@
                                     <div class="sheet-item" style="width:60%"><label>Performer</label></div>
                                     <div class="sheet-item" style="width:40%">
                                         <select class="charaselect" name="attr_PerformerCharacteristic">
-                                            <option value="@{Fellowship}">(Fel)</option>
+                                            <option value="@{Fellowship} + @{advanceFel}">(Fel)</option>
                                         </select>
                                     </div>
                                 </div>    
@@ -1708,7 +1708,7 @@
                                     <div class="sheet-item" style="width:60%"><label>Pilot</label></div>
                                     <div class="sheet-item" style="width:40%">
                                         <select class="charaselect" name="attr_PilotCharacteristic">
-                                            <option value="@{Agility}">(Ag)</option>
+                                            <option value="@{Agility} + @{advanceAg}">(Ag)</option>
                                         </select>
                                     </div>
                                 </div>    
@@ -1763,9 +1763,9 @@
                                     <div class="sheet-item" style="width:60%"><label>Tactics</label></div>
                                     <div class="sheet-item" style="width:40%">
                                         <select class="charaselect" name="attr_TacticsCharacteristic">
-                                            <option value="@{Intelligence}">(Int)</option>
-                                            <option value="@{Agility}">(Ag)</option>
-                                            <option value="@{Fellowship}">(Fel)</option>
+                                            <option value="@{Intelligence} + @{advanceInt}">(Int)</option>
+                                            <option value="@{Agility} + @{advanceAg}">(Ag)</option>
+                                            <option value="@{Fellowship} + @{advanceFel}">(Fel)</option>
                                         </select>
                                     </div>
                                 </div>    
@@ -1800,9 +1800,9 @@
                                     <div class="sheet-item" style="width:60%"><label>Trade</label></div>
                                     <div class="sheet-item" style="width:40%">
                                         <select class="charaselect" name="attr_TradeCharacteristic">
-                                            <option value="@{Intelligence}">(Int)</option>
-                                            <option value="@{Agility}">(Ag)</option>
-                                            <option value="@{Fellowship}">(Fel)</option>
+                                            <option value="@{Intelligence} + @{advanceInt}">(Int)</option>
+                                            <option value="@{Agility} + @{advanceAg}">(Ag)</option>
+                                            <option value="@{Fellowship} + @{advanceFel}">(Fel)</option>
                                         </select>
                                     </div>
                                 </div>    
@@ -1838,8 +1838,8 @@
                                     <div class="sheet-item" style="width:60%"><label>Common</label></div>
                                     <div class="sheet-item" style="width:40%">
                                         <select class="charaselect" name="attr_CommonLoreCharacteristic">
-                                            <option value="@{Intelligence}">(Int)</option>
-                                            <option value="@{Fellowship}">(Fel)</option>
+                                            <option value="@{Intelligence} + @{advanceInt}">(Int)</option>
+                                            <option value="@{Fellowship} + @{advanceFel}">(Fel)</option>
                                         </select>
                                     </div>
                                 </div>    
@@ -1954,8 +1954,8 @@
                                     <div class="sheet-item" style="width:60%"><label>Scholastic</label></div>
                                     <div class="sheet-item" style="width:40%">
                                         <select class="charaselect" name="attr_ScholasticLoreCharacteristic">
-                                            <option value="@{Intelligence}">(Int)</option>
-                                            <option value="@{Fellowship}">(Fel)</option>
+                                            <option value="@{Intelligence} + @{advanceInt}">(Int)</option>
+                                            <option value="@{Fellowship} + @{advanceFel}">(Fel)</option>
                                         </select>
                                     </div>
                                 </div>    
@@ -2030,8 +2030,8 @@
                                     <div class="sheet-item" style="width:60%"><label>Forbidden</label></div>
                                     <div class="sheet-item" style="width:40%">
                                         <select class="charaselect" name="attr_ForbiddenLoreCharacteristic">
-                                            <option value="@{Intelligence}">(Int)</option>
-                                            <option value="@{Fellowship}">(Fel)</option>
+                                            <option value="@{Intelligence} + @{advanceInt}">(Int)</option>
+                                            <option value="@{Fellowship} + @{advanceFel}">(Fel)</option>
                                         </select>
                                     </div>
                                 </div>