diff --git a/CP-Unofficial-Persona-TTRPG/crimsonparcelsupttrpg.html b/CP-Unofficial-Persona-TTRPG/crimsonparcelsupttrpg.html
index 3783abf606..e43922e88c 100644
--- a/CP-Unofficial-Persona-TTRPG/crimsonparcelsupttrpg.html
+++ b/CP-Unofficial-Persona-TTRPG/crimsonparcelsupttrpg.html
@@ -63,7 +63,7 @@
                   <input type="number" name="attr_athletics" step="1" value="0">
                 </div>
                 <div class="sheet-col-1-4">
-                <button type="roll" class="sheet-roll" name="testathletcis" value="&amp;{template:default} {{name=@{character_name} tests @{PUgenderpronoun} athletics!}} {{@{character_name} rolled a =[[2d6+{0d0+4, 0d0+@{athleticscalc}}dh1]]!}}">Athleti.</button>
+                <button type="roll" class="sheet-roll" name="testathletcis" value="&amp;{template:default} {{name=@{character_name} tests @{PUgenderpronoun} athletics!}} {{@{character_name} rolled a =[[2d6+{0d0+4, 0d0+@{athleticscalc}}dh1]]!}}">Ath.</button>
               </div>
               <div class="sheet-col-3-16">
                   <input type="number" name="attr_axpathletics" step="1" value="0">
@@ -75,26 +75,24 @@
                   <input type="number" name="attr_athleticstemp" step="1" value="0">
                 </div>
                   <input type="hidden" name="attr_athleticscalc" value="@{athletics}+@{athleticstemp}">
-                  
-                <div class="sheet-row">
+                   <div class="sheet-row">
                 <div class="sheet-col-1-4">
-                  <input type="number" name="attr_charm" step="1" value="0">
+                  <input type="number" name="attr_proficiency" step="1" value="0">
                 </div>
                 <div class="sheet-col-1-4">
-                <button type="roll" class="sheet-roll" name="testcharm" value="&amp;{template:default} {{name=@{character_name} tests @{PUgenderpronoun} charm!}} {{@{character_name} rolled a =[[2d6+{0d0+4, 0d0+@{charmcalc}}dh1]]!}}">Charm</button>
+                <button type="roll" class="sheet-roll" name="testproficiency" value="&amp;{template:default} {{name=@{character_name} tests @{PUgenderpronoun} proficiency!}} {{@{character_name} rolled a =[[2d6+{0d0+4, 0d0+@{proficiencycalc}}dh1]]!}}">Prof.</button>
               </div>
               <div class="sheet-col-3-16">
-                  <input type="number" name="attr_axpcharm" step="1" value="0">
+                  <input type="number" name="attr_axpproficiency" step="1" value="0">
                 </div>
                 <div class="sheet-col-3-16">
-                  <input type="number" name="attr_axpcharm_max" step="1" value="0">
+                  <input type="number" name="attr_axpproficiency_max" step="1" value="0">
                 </div>
                 <div class="sheet-col-1-8">
-                  <input type="number" name="attr_charmtemp" step="1" value="0">
+                  <input type="number" name="attr_proficiencytemp" step="1" value="0">
                 </div>
-                  <input type="hidden" name="attr_charmcalc" value="@{charm}+@{charmtemp}">
-                  
-                  <div class="sheet-row">
+                  <input type="hidden" name="attr_proficiencycalc" value="@{proficiency}+@{proficiencytemp}">
+                                <div class="sheet-row">
                 <div class="sheet-col-1-4">
                   <input type="number" name="attr_guts" step="1" value="0">
                 </div>
@@ -117,7 +115,7 @@
                   <input type="number" name="attr_knowledge" step="1" value="0">
                 </div>
                 <div class="sheet-col-1-4">
-                <button type="roll" class="sheet-roll" name="testknowledge" value="&amp;{template:default} {{name=@{character_name} tests @{PUgenderpronoun} knowledge!}} {{@{character_name} rolled a =[[2d6+{0d0+4, 0d0+@{knowledgecalc}}dh1]]!}}">Knowl.</button>
+                <button type="roll" class="sheet-roll" name="testknowledge" value="&amp;{template:default} {{name=@{character_name} tests @{PUgenderpronoun} knowledge!}} {{@{character_name} rolled a =[[2d6+{0d0+4, 0d0+@{knowledgecalc}}dh1]]!}}">Know.</button>
               </div>
               <div class="sheet-col-3-16">
                   <input type="number" name="attr_axpknowledge" step="1" value="0">
@@ -129,29 +127,32 @@
                   <input type="number" name="attr_knowledgetemp" step="1" value="0">
                 </div>
                   <input type="hidden" name="attr_knowledgecalc" value="@{knowledge}+@{knowledgetemp}">
-                  
-                      <div class="sheet-row">
+                    
+                
+                <div class="sheet-row">
                 <div class="sheet-col-1-4">
-                  <input type="number" name="attr_proficiency" step="1" value="0">
+                  <input type="number" name="attr_charm" step="1" value="0">
                 </div>
                 <div class="sheet-col-1-4">
-                <button type="roll" class="sheet-roll" name="testproficiency" value="&amp;{template:default} {{name=@{character_name} tests @{PUgenderpronoun} proficiency!}} {{@{character_name} rolled a =[[2d6+{0d0+4, 0d0+@{proficiencycalc}}dh1]]!}}">Profici.</button>
+                <button type="roll" class="sheet-roll" name="testcharm" value="&amp;{template:default} {{name=@{character_name} tests @{PUgenderpronoun} charm!}} {{@{character_name} rolled a =[[2d6+{0d0+4, 0d0+@{charmcalc}}dh1]]!}}">Charm</button>
               </div>
               <div class="sheet-col-3-16">
-                  <input type="number" name="attr_axpproficiency" step="1" value="0">
+                  <input type="number" name="attr_axpcharm" step="1" value="0">
                 </div>
                 <div class="sheet-col-3-16">
-                  <input type="number" name="attr_axpproficiency_max" step="1" value="0">
+                  <input type="number" name="attr_axpcharm_max" step="1" value="0">
                 </div>
                 <div class="sheet-col-1-8">
-                  <input type="number" name="attr_proficiencytemp" step="1" value="0">
+                  <input type="number" name="attr_charmtemp" step="1" value="0">
                 </div>
-                  <input type="hidden" name="attr_proficiencycalc" value="@{proficiency}+@{proficiencytemp}">
-                
+                  <input type="hidden" name="attr_charmcalc" value="@{charm}+@{charmtemp}">
+                  
+
+                     
                       </div>
           <div class="sheet-row">
             <div class="sheet-col-1 sheet-padr">
-                      <h4 class="sheet-center">Persona's Stats</h4>
+                      <h4 class="sheet-center">Persona Stats</h4>
               <div class="sheet-row sheet-sub-header">
                 <div class="sheet-col-1-4 sheet-center sheet-small-label">Current</div>
                 <div class="sheet-col-1-4 sheet-center sheet-small-label">&nbsp;</div>
@@ -163,7 +164,7 @@
                   <input type="number" name="attr_strength" step="1" value="0">
                 </div>
                 <div class="sheet-col-1-4">
-                <button type="roll" class="sheet-roll" name="teststrength" value="&amp;{template:default} {{name=@{persona_name} tests @{Pgenderpronoun} strength!}} {{@{persona_name} rolled a =[[2d6+{0d0+4, 0d0+@{strengthcalc}}dh1]]!}}">Stren.</button>
+                <button type="roll" class="sheet-roll" name="teststrength" value="&amp;{template:default} {{name=@{persona_name} tests @{Pgenderpronoun} strength!}} {{@{persona_name} rolled a =[[2d6+{0d0+4, 0d0+@{strengthcalc}}dh1]]!}}">STR</button>
               </div>
               <div class="sheet-col-1-4">
                   <input type="number" name="attr_strengthtotal" step="1" value="0">
@@ -172,43 +173,13 @@
                   <input type="number" name="attr_strengthtemp" step="1" value="0">
                 </div>
                   <input type="hidden" name="attr_strengthcalc" value="@{strength}+@{strengthtemp}">
-                  
-                <div class="sheet-row">
-                <div class="sheet-col-1-4">
-                  <input type="number" name="attr_magic" step="1" value="0">
-                </div>
-                <div class="sheet-col-1-4">
-                <button type="roll" class="sheet-roll" name="testmagic" value="&amp;{template:default} {{name=@{persona_name} tests @{Pgenderpronoun} magic!}} {{@{persona_name} rolled a =[[2d6+{0d0+4, 0d0+@{magiccalc}}dh1]]!}}">Magic</button>
-              </div>
-              <div class="sheet-col-1-4">
-                  <input type="number" name="attr_magictotal" step="1" value="0">
-                </div>
-                <div class="sheet-col-1-4">
-                  <input type="number" name="attr_magictemp" step="1" value="0">
-                </div>
-                  <input type="hidden" name="attr_magiccalc" value="@{magic}+@{magictemp}">
-                  
-                  <div class="sheet-row">
-                <div class="sheet-col-1-4">
-                  <input type="number" name="attr_endurance" step="1" value="0">
-                </div>
-                <div class="sheet-col-1-4">
-                <button type="roll" class="sheet-roll" name="testendurance" value="&amp;{template:default} {{name=@{persona_name} tests @{Pgenderpronoun} endurance!}} {{@{persona_name} rolled a =[[2d6+{0d0+4, 0d0+@{endurancecalc}}dh1]]!}}">Endur.</button>
-              </div>
-              <div class="sheet-col-1-4">
-                  <input type="number" name="attr_endurancetotal" step="1" value="0">
-                </div>
-                <div class="sheet-col-1-4">
-                  <input type="number" name="attr_endurancetemp" step="1" value="0">
-                </div>
-                  <input type="hidden" name="attr_endurancecalc" value="@{endurance}+@{endurancetemp}">
-                  
+                                    
                     <div class="sheet-row">
                 <div class="sheet-col-1-4">
                   <input type="number" name="attr_agility" step="1" value="0">
                 </div>
                 <div class="sheet-col-1-4">
-                <button type="roll" class="sheet-roll" name="testagility" value="&amp;{template:default} {{name=@{persona_name} tests @{Pgenderpronoun} agility!}} {{@{persona_name} rolled a =[[2d6+{0d0+4, 0d0+@{agilitycalc}}dh1]]!}}">Agility</button>
+                <button type="roll" class="sheet-roll" name="testagility" value="&amp;{template:default} {{name=@{persona_name} tests @{Pgenderpronoun} agility!}} {{@{persona_name} rolled a =[[2d6+{0d0+4, 0d0+@{agilitycalc}}dh1]]!}}">AGI</button>
               </div>
               <div class="sheet-col-1-4">
                   <input type="number" name="attr_agilitytotal" step="1" value="0">
@@ -218,12 +189,42 @@
                 </div>
                   <input type="hidden" name="attr_agilitycalc" value="@{agility}+@{agilitytemp}">
                   
+                  <div class="sheet-row">
+                <div class="sheet-col-1-4">
+                  <input type="number" name="attr_endurance" step="1" value="0">
+                </div>
+                <div class="sheet-col-1-4">
+                <button type="roll" class="sheet-roll" name="testendurance" value="&amp;{template:default} {{name=@{persona_name} tests @{Pgenderpronoun} endurance!}} {{@{persona_name} rolled a =[[2d6+{0d0+4, 0d0+@{endurancecalc}}dh1]]!}}">END</button>
+              </div>
+              <div class="sheet-col-1-4">
+                  <input type="number" name="attr_endurancetotal" step="1" value="0">
+                </div>
+                <div class="sheet-col-1-4">
+                  <input type="number" name="attr_endurancetemp" step="1" value="0">
+                </div>
+                  <input type="hidden" name="attr_endurancecalc" value="@{endurance}+@{endurancetemp}">
+
+                <div class="sheet-row">
+                <div class="sheet-col-1-4">
+                  <input type="number" name="attr_magic" step="1" value="0">
+                </div>
+                <div class="sheet-col-1-4">
+                <button type="roll" class="sheet-roll" name="testmagic" value="&amp;{template:default} {{name=@{persona_name} tests @{Pgenderpronoun} magic!}} {{@{persona_name} rolled a =[[2d6+{0d0+4, 0d0+@{magiccalc}}dh1]]!}}">MAG</button>
+              </div>
+              <div class="sheet-col-1-4">
+                  <input type="number" name="attr_magictotal" step="1" value="0">
+                </div>
+                <div class="sheet-col-1-4">
+                  <input type="number" name="attr_magictemp" step="1" value="0">
+                </div>
+                  <input type="hidden" name="attr_magiccalc" value="@{magic}+@{magictemp}">
+                  
                       <div class="sheet-row">
                 <div class="sheet-col-1-4">
                   <input type="number" name="attr_luck" step="1" value="0">
                 </div>
                 <div class="sheet-col-1-4">
-                <button type="roll" class="sheet-roll" name="testluck" value="&amp;{template:default} {{name=@{persona_name} tests @{Pgenderpronoun} luck!}} {{@{persona_name} rolled a =[[2d6+{0d0+4, 0d0+@{luckcalc}}dh1]]!}}">Luck</button>
+                <button type="roll" class="sheet-roll" name="testluck" value="&amp;{template:default} {{name=@{persona_name} tests @{Pgenderpronoun} luck!}} {{@{persona_name} rolled a =[[2d6+{0d0+4, 0d0+@{luckcalc}}dh1]]!}}">LUC</button>
               </div>
               <div class="sheet-col-1-4">
                   <input type="number" name="attr_lucktotal" step="1" value="0">
@@ -498,20 +499,20 @@
           </div>
            </div>
                                <div class="sheet-col-1 sheet-padr">
-            <h4 class="sheet-center">Spells</h4>
+            <h4 class="sheet-center">Skills</h4>
             <div class="sheet-row sheet-padb">
               <div class="sheet-col-1-1 sheet-small-label sheet-center">
                 <div class="sheet-row sheet-sub-header">
                                   <div class="sheet-row sheet-sub-header">
-                  <div class="sheet-col-1-8 sheet-center sheet-small-label">Spell's Name</div>
+                  <div class="sheet-col-1-8 sheet-center sheet-small-label">Skill's Name</div>
                   <div class="sheet-col-1-16 sheet-center sheet-small-label">SP Cost</div>
-                  <div class="sheet-col-1-8 sheet-center sheet-small-label">Spell's Aspect</div>
+                  <div class="sheet-col-1-8 sheet-center sheet-small-label">Skill's Aspect</div>
                   <div class="sheet-col-1-16 sheet-center sheet-small-label">Bonus to Hit</div>
-                  <div class="sheet-col-1-8 sheet-center sheet-small-label">Spell's Damage</div>
+                  <div class="sheet-col-1-8 sheet-center sheet-small-label">Skill's Damage</div>
                   <div class="sheet-col-1-16 sheet-center sheet-small-label">Bonus to Damage</div>
                   <div class="sheet-col-1-8 sheet-center sheet-small-label">Damage Type</div>
-                  <div class="sheet-col-1-8 sheet-center sheet-small-label">Spell's Targets</div>
-                  <div class="sheet-col-1-8 sheet-center sheet-small-label">Spell's Effect</div>
+                  <div class="sheet-col-1-8 sheet-center sheet-small-label">Skill's Targets</div>
+                  <div class="sheet-col-1-8 sheet-center sheet-small-label">Skill's Effect</div>
                   <div class="sheet-col-1-16 sheet-center sheet-small-label">Attack!</div>
                 </div>
               </div>
@@ -523,7 +524,7 @@
               <input type="text" spellcheck="false" name="attr_spellname1">
             </div>
             <div class="sheet-col-1-16">
-              <input type="number" spellcheck="false" name="attr_spellsp1">
+              <input type="number" value="0" spellcheck="false" name="attr_spellsp1">
             </div>
            <div class="sheet-col-1-8">
                 <select name="attr_spellaspect1" size="1">
@@ -535,14 +536,14 @@
                   <option name="attr_spellaspect1" value="@{luckcalc}">Luck</option>
             </div>
             <div class="sheet-col-1-16">
-              <input type="number" name="attr_bonusspelltohit1">
+              <input type="number" value="0" name="attr_bonusspelltohit1">
             <input type="hidden" name="attr_spellhitcalc1" value="@{spellaspect1}+@{bonusspelltohit1}">
             </div>
             <div class="sheet-col-1-8">
-              <input type="text" spellcheck="false" name="attr_spelldamage1">
+              <input type="text" value="0" spellcheck="false" name="attr_spelldamage1">
             </div>
                         <div class="sheet-col-1-16">
-              <input type="number" name="attr_bonusspelltodamage1">
+              <input type="number" value="0" name="attr_bonusspelltodamage1">
             <input type="hidden" name="attr_spelldamagecalc1" value="@{spelldamage1}+@{spellaspect1}+@{bonusspelltodamage1}">
             </div>
             <div class="sheet-col-1-8">
@@ -619,49 +620,34 @@
               <div class="sheet-col-1-1 sheet-small-label sheet-center">
                 <div class="sheet-row sheet-sub-header">
                                   <div class="sheet-row sheet-sub-header">
-                  <div class="sheet-col-1-12 sheet-center sheet-small-label">Item's Name</div>
+                  <div class="sheet-col-1-3 sheet-center sheet-small-label">Item's Name</div>
                   <div class="sheet-col-1-12 sheet-center sheet-small-label">Qty.</div>
-                  <div class="sheet-col-1-4 sheet-center sheet-small-label">Description</div>
-                  <div class="sheet-col-1-12 sheet-center sheet-small-label">Roll</div>
-                  <div class="sheet-col-1-12 sheet-center sheet-small-label">Item's Name</div>
-                  <div class="sheet-col-1-12 sheet-center sheet-small-label">Qty.</div>
-                  <div class="sheet-col-1-4 sheet-center sheet-small-label">Description</div>
+                  <div class="sheet-col-1-2 sheet-center sheet-small-label">Description</div>
                   <div class="sheet-col-1-12 sheet-center sheet-small-label">Roll</div>
                 </div>
               </div>
             </div>
           </div>
           
-                <fieldset class="repeating_items"> 
-          <div class="sheet-row">
-            <div class="sheet-col-1-12">
-              <input type="text" spellcheck="false" name="attr_itemnamea">
-            </div>
-           <div class="sheet-col-1-12">
-              <input type="number" name="attr_itemquantitya">
-            </div>
-            <div class="sheet-col-1-4">
-              <input type="text" spellcheck="false" name="attr_itemeffecta">
-            </div>
-                 <span style="padding-left:8px">
-            <div class="sheet-col-1-13">
-            <button type="roll" class="sheet-roll" name="itemrolla" value="&amp;{template:default} {{name=@{character_name} shows off @{PUgenderpronoun} @{itemnamea}!}} {{@{character_name} owns =[[@{itemquantitya}]] @{itemnamea}!}} {{@{itemnamea} =@{itemeffecta}}}"></button></div>
-            <div class="sheet-col-1-12">
-              <input type="text" spellcheck="false" name="attr_itemnameb">
-            </div>
-           <div class="sheet-col-1-12">
-              <input type="number" name="attr_itemquantityb">
-            </div>
-            <div class="sheet-col-1-4">
-              <input type="text" spellcheck="false" name="attr_itemeffectb">
-            </div>
-                 <span style="padding-left:8px">
-            <div class="sheet-col-1-24">
-            <button type="roll" class="sheet-roll" name="itemrollb" value="&amp;{template:default} {{name=@{character_name} shows off @{PUgenderpronoun} @{itemnameb}!}} {{@{character_name} owns =[[@{itemquantityb}]] @{itemnameb}!}} {{@{itemnameb} =@{itemeffectb}}}"></button></div>
+<fieldset class="repeating_items">
+         <div class="sheet-row">
+           <div class="sheet-col-1-3">
+             <input type="text" spellcheck="false" name="attr_itemnamea">
+           </div>
+          <div class="sheet-col-1-12">
+             <input type="number" name="attr_itemquantitya">
+           </div>
+           <div class="sheet-col-1-2">
+             <input type="text" spellcheck="false" name="attr_itemeffecta">
+           </div>
+                <span style="padding-left:8px">
+           <div class="sheet-col-1-24">
+           <button type="roll" class="sheet-roll" name="itemrolla" value="&amp;{template:default} {{name=@{character_name} shows off @{PUgenderpronoun} @{itemnamea}!}} {{@{character_name} owns =[[@{itemquantitya}]] @{itemnamea}!}} {{@{itemnamea} =@{itemeffecta}}}"></button></div>
+
 
 </div>
-            </div>
-          </div></fieldset>
+           </div>
+         </div></fieldset>
           </div>
            </div>          </div>
   <!-- SUPPORT -->
@@ -705,7 +691,7 @@
             </div>
                  <span style="padding-left:16px">
            <div class="sheet-col-1-18">
-            <button type="roll" class="sheet-roll" name="slink" value="&amp;{template:default} {{name=@{slinkname} grants @{character_name} power!}} {{This bond is=rank @{slinkrank}!}} {{@{slinkname}'s arcana is=the @{slinkarcana}!}} {{@{PUgenderpronoun2} have @{slinksxp} SXP=of the @{slinksxprequired} needed.}}"></button></div>
+            <button type="roll" class="sheet-roll" name="slink" value="&amp;{template:default} {{name=@{slinkname} grants @{character_name} power!}} {{This bond is=rank @{slinkrank}!}} {{@{slinkname}'s arcana is=@{slinkarcana}!}} {{@{PUgenderpronoun2} @{PUgenderhave} @{slinksxp} SXP=of the @{slinksxprequired} needed.}}"></button></div>
 
 </div></fieldset>
             </div>
@@ -843,14 +829,17 @@
               <div class="sheet-row sheet-sub-header">
                 <div class="sheet-col-1 sheet-center sheet-small-label">Player's Gender Pronoun</div>
               </div>
-    <div class="sheet-col-3-4 sheet-padr">
-            <span class="ILfuVd">In this area you can denote your character's correct gender pronoun. This will change your pronoun in rolls. The first box is for the character's determiner. The second is for the character's pronoun.</span>
+    <div class="sheet-col-7-13 sheet-padr">
+            <span class="ILfuVd">In this area you can denote your character's correct gender pronoun. This will change your pronoun in rolls. The first box is for the character's determiner. The second is for the character's pronoun. The third is for the character's matching conjugation of have.</span>
             </div>
-                    <div class="sheet-col-1-10">
+                    <div class="sheet-col-1-7">
             <input class="sheet-underlined sheet-center" value="their" type="text" spellcheck="false" name="attr_PUgenderpronoun">
 </div>
-                    <div class="sheet-col-1-10">
+                    <div class="sheet-col-1-7">
             <input class="sheet-underlined sheet-center" value="they" type="text" spellcheck="false" name="attr_PUgenderpronoun2">
+</div>
+                    <div class="sheet-col-1-7">
+            <input class="sheet-underlined sheet-center" value="have" type="text" spellcheck="false" name="attr_PUgenderhave">
 </div>
               <div class="sheet-row sheet-sub-header">
                 <div class="sheet-col-1 sheet-center sheet-small-label">Persona's Gender Pronoun</div>