diff --git a/Palladium-Rifts/Palladium-Rifts.html b/Palladium-Rifts/Palladium-Rifts.html
index 4467aff3cf..8b34645bfd 100644
--- a/Palladium-Rifts/Palladium-Rifts.html
+++ b/Palladium-Rifts/Palladium-Rifts.html
@@ -79,11 +79,11 @@
     <h6 class="sheet-SectionHeader">Skills</h6>
     <h5 class="sheet-CharacterOverview">
         IQ Bonus to Skill:
-        <input type="number" style="width:40px;" name="attr_IQSkillBonus" value=0/>
+        <input type="number" style="width:40px;" name="attr_IQ_max" value=0/>
         Trust/Intimidate:
-        <input type="number" style="width:40px;" name="attr_TrustIntimidate" value=0/>
+        <input type="number" style="width:40px;" name="attr_MA_max" value=0/>
         Charm/Impress:
-        <input type="number" style="width:40px;" name="attr_CharmImpress" value=0>
+        <input type="number" style="width:40px;" name="attr_PB_max" value=0>
     </h5>
     <table frame="box">
         <tr>
@@ -99,8 +99,8 @@
                 </table>
                 <table style="border: 1px solid grey;">
                     <tr>
-                        <fieldset class="repeating_OCCSkill">
-                            <input float="left" type="text" style="width:60%;" name="attr_OCCSkillName"><input float="left" type="number" style="width:13%;" name="attr_OCCSkillBase" value=0><input float="left" type="number" style="width:13%;" name="attr_OCCSkillPerLevel" value = 0><input float="left" type="text" style="width:14%;" name="attr_OCCSkillTotal" value="@{OCCSkillBase}+(@{OCCSkillPerLevel}*(@{Level}-1))+@{IQSkillBonus}" disabled="true">
+                        <fieldset class="repeating_OCCSK">
+                            <input float="left" type="text" style="width:60%;" name="attr_OCCSK"><input float="left" type="number" style="width:13%;" name="attr_OCCSKP" value=0><input float="left" type="number" style="width:13%;" name="attr_OCCSKPL" value = 0><input float="left" type="text" style="width:14%;" name="attr_OCCT" value="@{OCCSKP}+(@{OCCSKPL}*(@{Level}-1))+@{IQ_max}" disabled="true">
                         </fieldset>
                     </tr>
                 </table>
@@ -117,8 +117,8 @@
                 </table>
                 <table style="border: 1px solid grey;">
                     <tr>
-                        <fieldset class="repeating_OCCRelatedSkill">
-                            <input float="left" type="text" style="width:60%;" name="attr_OCCRelatedSkillName"><input float="left" type="number" style="width:12%;" name="attr_OCCRelatedSkillBase" value=0><input float="left" type="number" style="width:12%;" name="attr_OCRelatedSkillPerLevel" value=0><input float="left" type="text" style="width:14%;" name="attr_OCCSkillTotal" value="@{OCCRelatedSkillBase}+(@{OCCRelatedSkillPerLevel}*(@{Level}-1))+@{IQSkillBonus}" disabled="true">
+                        <fieldset class="repeating_OCRCSK">
+                            <input float="left" type="text" style="width:60%;" name="attr_OCRCSK"><input float="left" type="number" style="width:13%;" name="attr_OCRCSKP" value=0><input float="left" type="number" style="width:13%;" name="attr_OCRCSKPL" value = 0><input float="left" type="text" style="width:14%;" name="attr_OCRCT" value="@{OCRCSKP}+(@{OCRCSKPL}*(@{Level}-1))+@{IQ_max}" disabled="true">
                         </fieldset>
                     </tr>
                 </table>
@@ -135,8 +135,8 @@
                 </table>
                 <table style="border: 1px solid grey;">
                     <tr>
-                        <fieldset class="repeating_SecondarySkill">
-                            <input float="left" type="text" style="width:60%;" name="attr_SecondarySkillName"><input float="left" type="number" style="width:12%;" name="attr_SecondarySkillBase" value=0><input float="left" type="number" style="width:12%;" name="attr_SecondarySkillPerLevel" value=0><input float="left" type="text" style="width:14%;" name="attr_SecondarySkillTotal" value="@{SecondarySkillBase}+(@{SecondarySkillPerLevel}*(@{Level}-1))+@{IQSkillBonus}" disabled="true">
+                        <fieldset class="repeating_SECSK">
+                            <input float="left" type="text" style="width:60%;" name="attr_SECSK"><input float="left" type="number" style="width:13%;" name="attr_SECSKp" value=0><input float="left" type="number" style="width:13%;" name="attr_SECSKpl" value = 0><input float="left" type="text" style="width:14%;" name="attr_SECT" value="@{SECSKp}+(@{SECSKpl}*(@{Level}-1))+@{IQ_max}" disabled="true">
                         </fieldset>
                     </tr>
                 </table>
@@ -154,31 +154,31 @@
                 <table frame="box">
                     <tbody>
                         <tr>
-                            <td colspan="2">Type: <input class="sheet-HandToHandTextInput" type="text" value="Basic" name="attr_H2HType"/></td>
+                            <td colspan="2">Type: <input class="sheet-HandToHandTextInput" type="text" value="Basic" name="attr_ATT"/></td>
                         <tr>
                             <td class="sheet-CombatLabel">Attacks per Melee:</td>
-                            <td><input class="sheet-CombatInput" type="number" value=0 name="attr_HTHAttacksPerMelee"></td>
+                            <td><input class="sheet-CombatInput" type="number" value=0 name="attr_APM"></td>
                         <tr>
                             <td class="sheet-CombatLabel">Initiative:</td>
-                            <td><input class="sheet-CombatInput" type="number" value=0 name="attr_HTHInitiative"></td>
+                            <td><input class="sheet-CombatInput" type="number" value=0 name="attr_INIT"></td>
                         <tr>
                             <td class="sheet-CombatLabel">Damage:</td>
-                            <td><input class="sheet-CombatInput" type="number" value=0 name="attr_HTHDamage"></td>
+                            <td><input class="sheet-CombatInput" type="number" value=0 name="attr_DAM"></td>
                         <tr>
                             <td class="sheet-CombatLabel">Strike:</td>
-                            <td><input class="sheet-CombatInput" type="number" value=0 name="attr_HTHStrike"></td>
+                            <td><input class="sheet-CombatInput" type="number" value=0 name="attr_STRK"></td>
                         <tr>
                             <td class="sheet-CombatLabel">Parry:</td>
-                            <td><input class="sheet-CombatInput" type="number" value=0 name="attr_HTHParry"></td>
+                            <td><input class="sheet-CombatInput" type="number" value=0 name="attr_PARRY"></td>
                         <tr>
                             <td class="sheet-CombatLabel">Dodge:</td>
-                            <td><input class="sheet-CombatInput" type="number" value=0 name="attr_HTHDodge"></td>
+                            <td><input class="sheet-CombatInput" type="number" value=0 name="attr_DODGE"></td>
                         <tr>
                             <td class="sheet-CombatLabel">Pull/Roll:</td>
-                            <td><input class="sheet-CombatInput" type="number" value=0 ="attr_HTHRollWithImpact"></td>
+                            <td><input class="sheet-CombatInput" type="number" value=0 ="attr_ROLL"></td>
                         <tr>
                             <td class="sheet-CombatLabel">Perception:</td>
-                            <td><input class="sheet-CombatInput" type="number" value=0 name="attr_Perception"></td>
+                            <td><input class="sheet-CombatInput" type="number" value=0 name="attr_PERC"></td>
                         <tr>
                             <td><input class="sheet-CombatLabel" type="text" name="attr_HTHMiscName1"></td>
                             <td><input class="sheet-CombatInput" type="number" name="attr_HTHMiscValue1"></td>
@@ -204,48 +204,48 @@
                     <tbody>
                         <tr>
                             <td class="sheet-CombatLabel">Spell:</td>
-                            <td><input class="sheet-CombatInput" disabled="true" type="text" name="attr_SpellMagicSave" value=12></td>
-                            <td><input class="sheet-CombatInput" type="number" name="attr_SpellMagicSaveBonus"></td>
+                            <td><input class="sheet-CombatInput" disabled="true" type="text" name="attr_STSPELL" value=12></td>
+                            <td><input class="sheet-CombatInput" type="number" name="attr_STSPELL_max"></td>
                         <tr>
                             <td class="sheet-CombatLabel">Ritual:</td>
-                            <td><input class="sheet-CombatInput" disabled="true" type="text" name="attr_RitualMagicSave" value=16></td>
-                            <td><input class="sheet-CombatInput" type="number" name="attr_RitualMagicSaveBonus"></td>
+                            <td><input class="sheet-CombatInput" disabled="true" type="text" name="attr_STRITUAL" value=16></td>
+                            <td><input class="sheet-CombatInput" type="number" name="attr_STRITUAL_max"></td>
                         <tr>
                             <td class="sheet-CombatLabel">Psionics:</td>
-                            <td><input class="sheet-CombatInput" disabled="true" type="text" name="attr_PsionicsSave" value="10+@{PsionicLevel}"></td>
-                            <td><input class="sheet-CombatInput" type="number" name="attr_PsionicsSaveBonus"></td>
+                            <td><input class="sheet-CombatInput" disabled="true" type="text" name="attr_STPSI" value="10+@{PsionicLevel}"></td>
+                            <td><input class="sheet-CombatInput" type="number" name="attr_STPSI_max"></td>
                         <tr>
                             <td class="sheet-CombatLabel">Drug/Poison:</td>
-                            <td><input class="sheet-CombatInput" disabled="true" type="text" name="attr_DrugsPoisonsSave" value=15></td>
-                            <td><input class="sheet-CombatInput" type="number" name="attr_DrugsPoisonsSaveBonus"></td>
+                            <td><input class="sheet-CombatInput" disabled="true" type="text" name="attr_STTOXIC" value=15></td>
+                            <td><input class="sheet-CombatInput" type="number" name="attr_STTOXIC_max"></td>
                         <tr>
                             <td class="sheet-CombatLabel">Insanity:</td>
-                            <td><input class="sheet-CombatInput" disabled="true" type="text" name="attr_InsanitySave" value=12></td>
-                            <td><input class="sheet-CombatInput" type="number" name="attr_InsanitySaveBonus"></td>
+                            <td><input class="sheet-CombatInput" disabled="true" type="text" name="attr_STINSAN" value=12></td>
+                            <td><input class="sheet-CombatInput" type="number" name="attr_STINSAN_max"></td>
                         <tr>
                             <td class="sheet-CombatLabel">Possession:</td>
-                            <td><input class="sheet-CombatInput" disabled="true" type="text" name="attr_PossessionSave" value=12></td>
-                            <td><input class="sheet-CombatInput" type="number" name="attr_PossessionSaveBonus"></td>
+                            <td><input class="sheet-CombatInput" disabled="true" type="text" name="attr_STPOSS" value=12></td>
+                            <td><input class="sheet-CombatInput" type="number" name="attr_STPOSS_max"></td>
                         <tr>
                             <td class="sheet-CombatLabel">Horror Factor:</td>
-                            <td><input class="sheet-CombatInput" disabled="true" type="text" name="attr_HorrorFactorSave" value="Varies"></td>
-                            <td><input class="sheet-CombatInput" type="number" name="attr_HorrorFactorSaveBonus"></td>
+                            <td><input class="sheet-CombatInput" disabled="true" type="text" name="attr_STHF" value="Varies"></td>
+                            <td><input class="sheet-CombatInput" type="number" name="attr_STHF_max"></td>
                         <tr>
                             <td class="sheet-CombatLabel">Death:</td>
-                            <td><input class="sheet-CombatInput" disabled="true" type="text" name="attr_ComaDeathSave" value="Varies"></td>
-                            <td><input class="sheet-CombatInput" type="number" name="attr_ComaDeathSaveBonus"></td>
+                            <td><input class="sheet-CombatInput" disabled="true" type="text" name="attr_STDEATH" value="Varies"></td>
+                            <td><input class="sheet-CombatInput" type="number" name="attr_STDEATH_max"></td>
                         <tr>
                             <td><input class="sheet-CombatLabel" type="text" name="attr_MiscSaveName1"></td>
                             <td><input class="sheet-CombatInput" type="number" name="attr_MiscSave1"></td>
-                            <td><input class="sheet-CombatInput" type="number" name="attr_MiscSaveBonus1"></td>
+                            <td><input class="sheet-CombatInput" type="number" name="attr_MiscSave1_max"></td>
                         <tr>
                             <td><input class="sheet-CombatLabel" type="text" name="attr_MiscSaveName2"></td>
                             <td><input class="sheet-CombatInput" type="number" name="attr_MiscSave2"></td>
-                            <td><input class="sheet-CombatInput" type="number" name="attr_MiscSaveBonus1"></td>
+                            <td><input class="sheet-CombatInput" type="number" name="attr_MiscSave2_max"></td>
                         <tr>
                             <td><input class="sheet-CombatLabel" type="text" name="attr_MiscSaveName3"></td>
                             <td><input class="sheet-CombatInput" type="number" name="attr_MiscSave3"></td>
-                            <td><input class="sheet-CombatInput" type="number" name="attr_MiscSaveBonus1"></td>
+                            <td><input class="sheet-CombatInput" type="number" name="attr_MiscSave3_max"></td>
                     </tbody>
                 </table>
             </td>
@@ -264,8 +264,8 @@
                 </table>
                 <table frame="box">
                     <tr>
-                        <fieldset class="repeating_ModernWeapon">
-                            <input float="left" type="text" style="width:50%;" name="attr_ModernWeaponName" ><input float="left" type="text" style="width:10%;" name="attr_ModernWeaponDamage"><input float="left" type="text" style="width:10%;" name="attr_ModernWeaponAmmo"><input float="left" type="text" style="width:10%;" name="attr_ModernWeaponStrike"><input float="left" type="text" style="width:10%;" name="attr_ModernWeaponRange"><input float="left" type="text" style="width:10%;" name="attr_ModernWeaponSpecial">
+                        <fieldset class="repeating_WEAP">
+                            <input float="left" type="text" style="width:50%;" name="attr_WEAP" ><input float="left" type="text" style="width:10%;" name="attr_WEAPd"><input float="left" type="text" style="width:10%;" name="attr_WEAPc"><input float="left" type="text" style="width:10%;" name="attr_WEAPb"><input float="left" type="text" style="width:10%;" name="attr_WEAPr"><input float="left" type="text" style="width:10%;" name="attr_WEAPs">
                         </fieldset>
                     </tr>
                 </table>
@@ -282,8 +282,8 @@
                 </table>
                 <table frame="box">
                     <tr>
-                        <fieldset class="repeating_AncientWeapon">
-                            <input float="left" type="text" style="width:50%;" name="attr_AncientWeaponName" ><input float="left" type="text" style="width:10%;" name="attr_AncientWeaponDamage"><input float="left" type="text" style="width:10%;" name="attr_AncientWeaponAmmo"><input float="left" type="text" style="width:10%;" name="attr_AncientWeaponStrike"><input float="left" type="text" style="width:10%;" name="attr_AncientWeaponParry"><input float="left" type="text" style="width:10%;" name="attr_AncientWeaponSpecial">
+                        <fieldset class="repeating_AWEAP">
+                            <input float="left" type="text" style="width:50%;" name="attr_AWEAP" ><input float="left" type="text" style="width:10%;" name="attr_AWEAPd"><input float="left" type="text" style="width:10%;" name="attr_AWEAPc"><input float="left" type="text" style="width:10%;" name="attr_AWEAPb"><input float="left" type="text" style="width:10%;" name="attr_AWEAPr"><input float="left" type="text" style="width:10%;" name="attr_AWEAPs">
                         </fieldset>
                     </tr>
                 </table>
@@ -302,41 +302,41 @@
                     <tbody>
                         <tr>
                             <td class="sheet-CombatLabel">MainBody:</td>
-                            <td><input class="sheet-CombatInput" type="number" name="attr_ArmorBody"></td>
-                            <td><input class="sheet-CombatInput" type="number" name="attr_ArmorBody_max"></td>
+                            <td><input class="sheet-CombatInput" type="number" name="attr_A-BODY"></td>
+                            <td><input class="sheet-CombatInput" type="number" name="attr_A-BODY_max"></td>
                         <tr>
                             <td class="sheet-CombatLabel">Head:</td>
-                            <td><input class="sheet-CombatInput" type="number" name="attr_ArmorHead"></td>
-                            <td><input class="sheet-CombatInput" type="number" name="attr_ArmorHead_max"></td>
+                            <td><input class="sheet-CombatInput" type="number" name="attr_A-HEAD"></td>
+                            <td><input class="sheet-CombatInput" type="number" name="attr_A-HEAD_max"></td>
                         <tr>
                             <td class="sheet-CombatLabel">Left Arm:</td>
-                            <td><input class="sheet-CombatInput" type="number" name="attr_ArmorLeftArm"></td>
-                            <td><input class="sheet-CombatInput" type="number" name="attr_ArmorLeftArm_max"></td>
+                            <td><input class="sheet-CombatInput" type="number" name="attr_A-LARM"></td>
+                            <td><input class="sheet-CombatInput" type="number" name="attr_A-LARM_max"></td>
                         <tr>
                             <td class="sheet-CombatLabel">Right Arm:</td>
-                            <td><input class="sheet-CombatInput" type="number" name="attr_ArmorRightArm"></td>
-                            <td><input class="sheet-CombatInput" type="number" name="attr_ArmorRightArm_max"></td>
+                            <td><input class="sheet-CombatInput" type="number" name="attr_A-RARM"></td>
+                            <td><input class="sheet-CombatInput" type="number" name="attr_A-RARM_max"></td>
                         <tr>
                             <td class="sheet-CombatLabel">Left Leg:</td>
-                            <td><input class="sheet-CombatInput" type="number" name="attr_ArmorLeftLeg"></td>
-                            <td><input class="sheet-CombatInput" type="number" name="attr_ArmorLeftLeg_max"></td>
+                            <td><input class="sheet-CombatInput" type="number" name="attr_A-LLEG"></td>
+                            <td><input class="sheet-CombatInput" type="number" name="attr_A-LLEG_max"></td>
                         <tr>
                             <td class="sheet-CombatLabel">Right Leg:</td>
-                            <td><input class="sheet-CombatInput" type="number" name="attr_ArmorRightLeg"></td>
-                            <td><input class="sheet-CombatInput" type="number" name="attr_ArmorRightLeg_max"></td>
+                            <td><input class="sheet-CombatInput" type="number" name="attr_A-RLEG"></td>
+                            <td><input class="sheet-CombatInput" type="number" name="attr_A-RLEG_max"></td>
                         <tr>
-                            <td><input class="sheet-CombatLabel" type="text" name="attr_ArmorMiscName"></td>
-                            <td><input class="sheet-CombatInput" type="number" name="attr_ArmorMisc"></td>
-                            <td><input class="sheet-CombatInput" type="number" name="attr_ArmorMisc_max"></td>
+                            <td><input class="sheet-CombatLabel" type="text" name="attr_A-MISCName1"></td>
+                            <td><input class="sheet-CombatInput" type="number" name="attr_A-MISC1"></td>
+                            <td><input class="sheet-CombatInput" type="number" name="attr_A-MISC1_max"></td>
                         <tr>
-                            <td><input class="sheet-CombatLabel" type="text" name="attr_ArmorMiscName2"></td>
-                            <td><input class="sheet-CombatInput" type="number" name="attr_ArmorMisc2"></td>
-                            <td><input class="sheet-CombatInput" type="number" name="attr_ArmorMisc2_max"></td>
+                            <td><input class="sheet-CombatLabel" type="text" name="attr_A-MISCName2"></td>
+                            <td><input class="sheet-CombatInput" type="number" name="attr_A-MISC2"></td>
+                            <td><input class="sheet-CombatInput" type="number" name="attr_A-MISC2_max"></td>
                     </tbody>
                 </table>
             </td>
             <td>
-                <h3 class="sheet-CombatHeader">Armor</h3>
+                <h3 class="sheet-CombatHeader">Armor 2</h3>
                 <table frame="box">
                     <thead>
                         <tr>
@@ -346,38 +346,39 @@
                         </tr>
                     </thead>
                     <tbody>
+                        
                         <tr>
                             <td class="sheet-CombatLabel">MainBody:</td>
-                            <td><input class="sheet-CombatInput" type="number" name="attr_Armor2Body"></td>
-                            <td><input class="sheet-CombatInput" type="number" name="attr_Armor2Body_max"></td>
+                            <td><input class="sheet-CombatInput" type="number" name="attr_A2-BODY"></td>
+                            <td><input class="sheet-CombatInput" type="number" name="attr_A2-BODY_max"></td>
                         <tr>
                             <td class="sheet-CombatLabel">Head:</td>
-                            <td><input class="sheet-CombatInput" type="number" name="attr_Armor2Head"></td>
-                            <td><input class="sheet-CombatInput" type="number" name="attr_Armor2Head_max"></td>
+                            <td><input class="sheet-CombatInput" type="number" name="attr_A2-HEAD"></td>
+                            <td><input class="sheet-CombatInput" type="number" name="attr_A2-HEAD_max"></td>
                         <tr>
                             <td class="sheet-CombatLabel">Left Arm:</td>
-                            <td><input class="sheet-CombatInput" type="number" name="attr_Armor2LeftArm"></td>
-                            <td><input class="sheet-CombatInput" type="number" name="attr_Armor2LeftArm_max"></td>
+                            <td><input class="sheet-CombatInput" type="number" name="attr_A2-LARM"></td>
+                            <td><input class="sheet-CombatInput" type="number" name="attr_A2-LARM_max"></td>
                         <tr>
                             <td class="sheet-CombatLabel">Right Arm:</td>
-                            <td><input class="sheet-CombatInput" type="number" name="attr_Armor2RightArm"></td>
-                            <td><input class="sheet-CombatInput" type="number" name="attr_Armor2RightArm_max"></td>
+                            <td><input class="sheet-CombatInput" type="number" name="attr_A2-RARM"></td>
+                            <td><input class="sheet-CombatInput" type="number" name="attr_A2-RARM_max"></td>
                         <tr>
                             <td class="sheet-CombatLabel">Left Leg:</td>
-                            <td><input class="sheet-CombatInput" type="number" name="attr_Armor2LeftLeg"></td>
-                            <td><input class="sheet-CombatInput" type="number" name="attr_Armor2LeftLeg_max"></td>
+                            <td><input class="sheet-CombatInput" type="number" name="attr_A2-LLEG"></td>
+                            <td><input class="sheet-CombatInput" type="number" name="attr_A2-LLEG_max"></td>
                         <tr>
                             <td class="sheet-CombatLabel">Right Leg:</td>
-                            <td><input class="sheet-CombatInput" type="number" name="attr_Armor2RightLeg"></td>
-                            <td><input class="sheet-CombatInput" type="number" name="attr_Armor2RightLeg_max"></td>
+                            <td><input class="sheet-CombatInput" type="number" name="attr_A2-RLEG"></td>
+                            <td><input class="sheet-CombatInput" type="number" name="attr_A2-RLEG_max"></td>
                         <tr>
-                            <td><input class="sheet-CombatLabel" type="text" name="attr_Armor2MiscName"></td>
-                            <td><input class="sheet-CombatInput" type="number" name="attr_Armor2Misc"></td>
-                            <td><input class="sheet-CombatInput" type="number" name="attr_Armor2Misc_max"></td>
+                            <td><input class="sheet-CombatLabel" type="text" name="attr_A2-MISCName1"></td>
+                            <td><input class="sheet-CombatInput" type="number" name="attr_A2-MISC1"></td>
+                            <td><input class="sheet-CombatInput" type="number" name="attr_A2-MISC1_max"></td>
                         <tr>
-                            <td><input class="sheet-CombatLabel" type="text" name="attr_Armor2MiscName2"></td>
-                            <td><input class="sheet-CombatInput" type="number" name="attr_Armor2Misc2"></td>
-                            <td><input class="sheet-CombatInput" type="number" name="attr_ArmorMisc2_max"></td>
+                            <td><input class="sheet-CombatLabel" type="text" name="attr_A2-MISCName2"></td>
+                            <td><input class="sheet-CombatInput" type="number" name="attr_A2-MISC2"></td>
+                            <td><input class="sheet-CombatInput" type="number" name="attr_A2-MISC2_max"></td>
                     </tbody>
                 </table>
             </td>
@@ -392,37 +393,37 @@
                 <table frame="box">
                     <tbody>
                         <tr>
-                            <td colspan="2">Type: <input class="sheet-HandToHandTextInput" type="text" value="Basic" name="attr_PAH2HType"/></td>
+                            <td colspan="2">Type: <input class="sheet-HandToHandTextInput" type="text" value="Basic" name="attr_PA-H2HType"/></td>
                         <tr>
                             <td class="sheet-CombatLabel">Attacks per Melee:</td>
-                            <td><input class="sheet-CombatInput" type="number" value=0 name="attr_PAHTHAttacksPerMelee"></td>
+                            <td><input class="sheet-CombatInput" type="number" value=0 name="attr_PATT"></td>
                         <tr>
                             <td class="sheet-CombatLabel">Initiative:</td>
-                            <td><input class="sheet-CombatInput" type="number" value=0 name="attr_PAHTHInitiative"></td>
+                            <td><input class="sheet-CombatInput" type="number" value=0 name="attr_PINIT"></td>
                         <tr>
                             <td class="sheet-CombatLabel">Damage:</td>
-                            <td><input class="sheet-CombatInput" type="number" value=0 name="attr_PAHTHDamage"></td>
+                            <td><input class="sheet-CombatInput" type="number" value=0 name="attr_PDAM"></td>
                         <tr>
                             <td class="sheet-CombatLabel">Strike:</td>
-                            <td><input class="sheet-CombatInput" type="number" value=0 name="attr_PAHTHStrike"></td>
+                            <td><input class="sheet-CombatInput" type="number" value=0 name="attr_PSTRK"></td>
                         <tr>
                             <td class="sheet-CombatLabel">Parry:</td>
-                            <td><input class="sheet-CombatInput" type="number" value=0 name="attr_PAHTHParry"></td>
+                            <td><input class="sheet-CombatInput" type="number" value=0 name="attr_PPARRY"></td>
                         <tr>
                             <td class="sheet-CombatLabel">Dodge:</td>
-                            <td><input class="sheet-CombatInput" type="number" value=0 name="attr_PAHTHDodge"></td>
+                            <td><input class="sheet-CombatInput" type="number" value=0 name="attr_PDODGE"></td>
                         <tr>
                             <td class="sheet-CombatLabel">Pull/Roll:</td>
-                            <td><input class="sheet-CombatInput" type="number" value=0 ="attr_PAHTHRollWithImpact"></td>
+                            <td><input class="sheet-CombatInput" type="number" value=0 ="attr_PRollWithImpact"></td>
                         <tr>
-                            <td><input class="sheet-CombatLabel" type="text" name="attr_PAHTHMiscName1"></td>
-                            <td><input class="sheet-CombatInput" type="number" name="attr_PAHTHMiscValue1"></td>
+                            <td><input class="sheet-CombatLabel" type="text" name="attr_PMiscName1"></td>
+                            <td><input class="sheet-CombatInput" type="number" name="attr_PMiscValue1"></td>
                         <tr>
-                            <td><input class="sheet-CombatLabel" type="text" name="attr_PAHTHMiscName2"></td>
-                            <td><input class="sheet-CombatInput" type="number" name="attr_PAHTHMiscValue2"></td>
+                            <td><input class="sheet-CombatLabel" type="text" name="attr_PMiscName2"></td>
+                            <td><input class="sheet-CombatInput" type="number" name="attr_PMiscValue2"></td>
                         <tr>
-                            <td><input class="sheet-CombatLabel" type="text" name="attr_PAHTHMiscName3"></td>
-                            <td><input class="sheet-CombatInput" type="number" name="attr_PAHTHMiscValue3"></td>
+                            <td><input class="sheet-CombatLabel" type="text" name="attr_PMiscName3"></td>
+                            <td><input class="sheet-CombatInput" type="number" name="attr_PMiscValue3"></td>
                     </tbody>
                 </table>
             </td>
@@ -439,36 +440,36 @@
                     <tbody>
                         <tr>
                             <td class="sheet-CombatLabel">MainBody:</td>
-                            <td><input class="sheet-CombatInput" type="number" name="attr_PAArmorBody"></td>
-                            <td><input class="sheet-CombatInput" type="number" name="attr_PAArmorBody_max"></td>
+                            <td><input class="sheet-CombatInput" type="number" name="attr_PA-BODY"></td>
+                            <td><input class="sheet-CombatInput" type="number" name="attr_PA-BODY_max"></td>
                         <tr>
                             <td class="sheet-CombatLabel">Head:</td>
-                            <td><input class="sheet-CombatInput" type="number" name="attr_PAArmorHead"></td>
-                            <td><input class="sheet-CombatInput" type="number" name="attr_PAArmorHead_max"></td>
+                            <td><input class="sheet-CombatInput" type="number" name="attr_PA-HEAD"></td>
+                            <td><input class="sheet-CombatInput" type="number" name="attr_PA-HEAD_max"></td>
                         <tr>
                             <td class="sheet-CombatLabel">Left Arm:</td>
-                            <td><input class="sheet-CombatInput" type="number" name="attr_PAArmorLeftArm"></td>
-                            <td><input class="sheet-CombatInput" type="number" name="attr_PAArmorLeftArm_max"></td>
+                            <td><input class="sheet-CombatInput" type="number" name="attr_PA-LARM"></td>
+                            <td><input class="sheet-CombatInput" type="number" name="attr_PA-LARM_max"></td>
                         <tr>
                             <td class="sheet-CombatLabel">Right Arm:</td>
-                            <td><input class="sheet-CombatInput" type="number" name="attr_PAArmorRightArm"></td>
-                            <td><input class="sheet-CombatInput" type="number" name="attr_PAArmorRightArm_max"></td>
+                            <td><input class="sheet-CombatInput" type="number" name="attr_PA-RARM"></td>
+                            <td><input class="sheet-CombatInput" type="number" name="attr_PA-RARM_max"></td>
                         <tr>
                             <td class="sheet-CombatLabel">Left Leg:</td>
-                            <td><input class="sheet-CombatInput" type="number" name="attr_PAArmorLeftLeg"></td>
-                            <td><input class="sheet-CombatInput" type="number" name="attr_PAArmorLeftLeg_max"></td>
+                            <td><input class="sheet-CombatInput" type="number" name="attr_PA-LLEG"></td>
+                            <td><input class="sheet-CombatInput" type="number" name="attr_PA-LLEG_max"></td>
                         <tr>
                             <td class="sheet-CombatLabel">Right Leg:</td>
-                            <td><input class="sheet-CombatInput" type="number" name="attr_PAArmorRightLeg"></td>
-                            <td><input class="sheet-CombatInput" type="number" name="attr_PAArmorRightLeg_max"></td>
+                            <td><input class="sheet-CombatInput" type="number" name="attr_PA-RLEG"></td>
+                            <td><input class="sheet-CombatInput" type="number" name="attr_PA-RLEG_max"></td>
                         <tr>
-                            <td><input class="sheet-CombatLabel" type="text" name="attr_PAArmorMiscName"></td>
-                            <td><input class="sheet-CombatInput" type="number" name="attr_PAArmorMisc"></td>
-                            <td><input class="sheet-CombatInput" type="number" name="attr_PAArmorMisc_max"></td>
+                            <td><input class="sheet-CombatLabel" type="text" name="attr_PA-MISCName1"></td>
+                            <td><input class="sheet-CombatInput" type="number" name="attr_PA-MISC1"></td>
+                            <td><input class="sheet-CombatInput" type="number" name="attr_PA-MISC1_max"></td>
                         <tr>
-                            <td><input class="sheet-CombatLabel" type="text" name="attr_PAArmorMiscName2"></td>
-                            <td><input class="sheet-CombatInput" type="number" name="attr_PAArmorMisc2"></td>
-                            <td><input class="sheet-CombatInput" type="number" name="attr_PAArmorMisc2_max"></td>
+                            <td><input class="sheet-CombatLabel" type="text" name="attr_PA-MISCName2"></td>
+                            <td><input class="sheet-CombatInput" type="number" name="attr_PA-MISC2"></td>
+                            <td><input class="sheet-CombatInput" type="number" name="attr_PA-MISC2_max"></td>
                     </tbody>
                 </table>
             </td>
@@ -486,8 +487,8 @@
                 </table>
                 <table frame="box">
                     <tr>
-                        <fieldset class="repeating_PAWeapon">
-                            <input float="left" type="text" style="width:50%;" name="attr_PAWeaponName" ><input float="left" type="text" style="width:10%;" name="attr_PAWeaponDamage"><input float="left" type="text" style="width:10%;" name="attr_PAWeaponAmmo"><input float="left" type="text" style="width:10%;" name="attr_PAWeaponStrike"><input float="left" type="text" style="width:10%;" name="attr_PAWeaponRange"><input float="left" type="text" style="width:10%;" name="attr_PAWeaponSpecial">
+                        <fieldset class="repeating_pWEAP">
+                            <input float="left" type="text" style="width:50%;" name="attr_pWEAP" ><input float="left" type="text" style="width:10%;" name="attr_pWEAPd"><input float="left" type="text" style="width:10%;" name="attr_PWEAPc"><input float="left" type="text" style="width:10%;" name="attr_PWEAPb"><input float="left" type="text" style="width:10%;" name="attr_PWEAPr"><input float="left" type="text" style="width:10%;" name="attr_PWEAPSpecial">
                         </fieldset>
                     </tr>
                 </table>
@@ -512,8 +513,8 @@
     </table>
     <table frame="box" width="100%">
         <tr>
-            <fieldset class="repeating_Powers">
-                <input type="text" float="left" style="width:12%;" name="attr_PowerName"><input type="text" float="left" style="width:6%;" name="attr_PowerCost"><input type="text" float="left" style="width:6%;" name="attr_PowerRange"><input type="text" float="left" style="width:8%;" name="attr_PowerSavingThrow"><input type="text" float="left" style="width:8%;" name="attr_PowerDamage"><input type="text" float="left" style="width:8%;" name="attr_PowerDuration"><input type="text" float="left" style="width:52%;"name="attr_PowerDuration">
+            <fieldset class="repeating_CAST">
+                <input type="text" float="left" style="width:12%;" name="attr_CAST"><input type="text" float="left" style="width:6%;" name="attr_CASTc"><input type="text" float="left" style="width:6%;" name="attr_CASTr"><input type="text" float="left" style="width:8%;" name="attr_CASTst"><input type="text" float="left" style="width:8%;" name="attr_CASTd"><input type="text" float="left" style="width:8%;" name="attr_CASTdur"><input type="text" float="left" style="width:52%;"name="attr_CASTdesc">
             </fieldset>
         </tr>
     </table>
@@ -539,7 +540,7 @@
                             <td><input class="sheet-MiscInput" type="number" name="attr_BlackMarkCredits"></td>
                         <tr>
                             <td class="sheet-MiscLabel">Universal Trade Credits:</td>
-                            <td><input class="sheet-MiscInput" type="number" name="attr_UniversalCredits"></td>
+                            <td><input class="sheet-MiscInput" type="number" name="attr_CREDITS"></td>
                         <tr>
                             <td class="sheet-MiscLabel">Gold/Silver:</td>
                             <td><input class="sheet-MiscInput" type="number" name="attr_GoldSilverCredits"></td>